reinit the tree, so we can have metadata

7370 files changed, 203125 insertions, 0 deletions

diff --git a/dev-python/3to2/3to2-1.1.1-r1.ebuild b/dev-python/3to2/3to2-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..d45b2e5c5e74
--- /dev/null
+++ b/dev-python/3to2/3to2-1.1.1-r1.ebuild
@@ -0,0 +1,34 @@
+# 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
+
+DESCRIPTION="Tool to refactor valid 3.x syntax into valid 2.x syntax"
+HOMEPAGE="https://pypi.python.org/pypi/3to2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+
+python_prepare() {
+	# https://bitbucket.org/amentajo/lib3to2/issues/50/testsuite-fails-with-new-python-35
+	# Remove failing test
+	sed -i -e "/test_argument_unpacking/a \\        return"\
+		lib3to2/tests/test_print.py || die
+	sed -i -e "s/Exception, err/Exception as err/" lib3to2/build.py || die
+	distutils-r1_python_prepare_all
+
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	# the standard test runner fails to properly return failure
+	"${PYTHON}" -m unittest discover || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/3to2/3to2-1.1.1.ebuild b/dev-python/3to2/3to2-1.1.1.ebuild
new file mode 100644
index 000000000000..445f48e5af2c
--- /dev/null
+++ b/dev-python/3to2/3to2-1.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit distutils-r1
+
+DESCRIPTION="Tool to refactor valid 3.x syntax into valid 2.x syntax"
+HOMEPAGE="https://pypi.python.org/pypi/3to2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	# the standard test runner fails to properly return failure
+	"${PYTHON}" -m unittest discover || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/3to2/Manifest b/dev-python/3to2/Manifest
new file mode 100644
index 000000000000..70509c79c131
--- /dev/null
+++ b/dev-python/3to2/Manifest
@@ -0,0 +1,6 @@
+DIST 3to2-1.1.1.zip 78779 SHA256 fef50b2b881ef743f269946e1090b77567b71bb9a9ce64b7f8e699b562ff685c SHA512 7580f174409420556f89ae78eba07cc95b95aee9d062586d0862bd41980ae31bf4ac82a43855e160eec745fcdd3b4aff614f68e77da1bfc5f9f404413cab1492 WHIRLPOOL 39b8b8c2da3f759c93488888d4ccf9eae123302a5b7ae5861fdf4ad1be75a31e57dc752e382cb3ebc49b46921ab12d95d7837948e78c3c96dd98f4701805bf14
+EBUILD 3to2-1.1.1-r1.ebuild 944 SHA256 c48c7ee47b42c7c051942990186fd9ac68b12e40490e2b77dcc95d15a586ff6a SHA512 1e8299a4e04147da3eefc2d9e49d1b0857a80ac06649dc8563e98227e094404752abe173790ad05a99e1ed6a66c28cfacb3acf46499d52141cb3a56bc6be5e7c WHIRLPOOL 0d071b0369ed33867507b4c91bac8a2fa4dd0dc63f7d08f22a17b706fbc493088452abb0c10b23d62ac15e7b0acd3e04e18a0d28c7787ebe478154ea5d44caee
+EBUILD 3to2-1.1.1.ebuild 605 SHA256 58575969666d60d53f504316017a06805e45d9d341f0233050dc569d32b9f34a SHA512 1b274c5b141392b2eca6b3f93a95f66f0a46a4034a31e7d6c942e4a8ba30943030e61ce7d072b4b173773b2f68f74b08d28d38fc35d5888128fe6e3190407d3a WHIRLPOOL ba20d4fb4721f57ff664a7d57bbe3dc240d489d05f63505a13968adf203ef6406af8f3d71aa0d09a3af40e4ff32fe5bcc0bb9143b3fab63f8ad573117338e286
+MISC ChangeLog 3145 SHA256 c9f314f178afa0395e0fa31abc21359e2769dd37a5c7e245d80367a39f35fcd7 SHA512 9201b5646db8a937f6adc8b16a11959415f70f1f5cee722fc0c6dd269981c4dba12fcf29f73970fec3abbfa4a7f6be1b2b896e051b7019dc25a02b8381bb0640 WHIRLPOOL cbda80d0744c7c9626394820da7d666e366da5730e588a08a93367ed7ecfb70a18f196831125988077b04eb8ff3b24769441af4a61f50bd65b6564600df9e51b
+MISC ChangeLog-2015 1474 SHA256 5b7d3cc18baac8a78f1e8f1697f010c112489bb883bf4a3d85925233eecf8ff7 SHA512 8a2d38fded416368cd91297608feedde586aa7493391705cdba2bdc71437766b12f74501111468c8dd5a256366127a3874af51be8cd99948acde73f320bc25cc WHIRLPOOL 569dcb0e2f3660724643391cb9da078f8de93812083cf006d5f110fd2d5f74ee131f7caa273718a9b017148e4315032e80ab75f4a3897a23fcb3a43f32f808b3
+MISC metadata.xml 433 SHA256 5b06e8f65d106eb0248a907b38ddd172fb48ad17526c075388c61613fdf6ec27 SHA512 fbf01ed6fe0bfdf49ba985e62e8694d7152129e0d46a3701fe39dd11ed7d48641efaea848694a271f39b9ae7e6b805b0ac535945cf33d455e0745d1f66ad3c04 WHIRLPOOL 5c1f912c75e56150610c1b25304e2ad1e34ad7d5c1ee03ee93eba29abf5ae91f89b80143f293b6f0ad37dfce111b0832b15c7a3a70081fab39476bca3972837d
diff --git a/dev-python/3to2/metadata.xml b/dev-python/3to2/metadata.xml
new file mode 100644
index 000000000000..57a9d13fae65
--- /dev/null
+++ b/dev-python/3to2/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">3to2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/APScheduler/APScheduler-3.1.0.ebuild b/dev-python/APScheduler/APScheduler-3.1.0.ebuild
new file mode 100644
index 000000000000..fd9bb5cf0110
--- /dev/null
+++ b/dev-python/APScheduler/APScheduler-3.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="In-process task scheduler with Cron-like capabilities"
+HOMEPAGE="https://bitbucket.org/agronholm/apscheduler"
+SRC_URI="mirror://pypi/A/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-1.2[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -i -e /setuptools_scm/d setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# 3 known failures due to caplog.set_level not existing
+	py.test || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/APScheduler/APScheduler-3.2.0.ebuild b/dev-python/APScheduler/APScheduler-3.2.0.ebuild
new file mode 100644
index 000000000000..fd9bb5cf0110
--- /dev/null
+++ b/dev-python/APScheduler/APScheduler-3.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="In-process task scheduler with Cron-like capabilities"
+HOMEPAGE="https://bitbucket.org/agronholm/apscheduler"
+SRC_URI="mirror://pypi/A/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-1.2[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -i -e /setuptools_scm/d setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# 3 known failures due to caplog.set_level not existing
+	py.test || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/APScheduler/APScheduler-3.3.1.ebuild b/dev-python/APScheduler/APScheduler-3.3.1.ebuild
new file mode 100644
index 000000000000..f6de479066c2
--- /dev/null
+++ b/dev-python/APScheduler/APScheduler-3.3.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="In-process task scheduler with Cron-like capabilities"
+HOMEPAGE="https://bitbucket.org/agronholm/apscheduler"
+SRC_URI="mirror://pypi/A/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-1.2[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -i -e /setuptools_scm/d setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# 3 known failures due to caplog.set_level not existing
+	py.test || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/APScheduler/Manifest b/dev-python/APScheduler/Manifest
new file mode 100644
index 000000000000..cc41b6cf70ba
--- /dev/null
+++ b/dev-python/APScheduler/Manifest
@@ -0,0 +1,9 @@
+DIST APScheduler-3.1.0.tar.gz 79124 SHA256 96a7ca40dbfb16502b44740c31c935943532f5a13be114e75419ca86fa264486 SHA512 8f8b1a997dffd8ebc090113f3edd6ba1c18514e2583e1bca52ed54b28c7965d146e082fa64de968f44b18b39aa5ead7e3114e3e049102aaab35c52245f37497c WHIRLPOOL d18137ad77485e4ae9439c344b7c53c03b9d3e474aa813891e48005c1e5784b7c85d358561dbc31e5be3cbc583ba56694f726ad4e2f80b3039c9b1ad231b4964
+DIST APScheduler-3.2.0.tar.gz 80946 SHA256 5baa1195ba711868fae257612cf80372ff1124014ca896884bf132f75636f638 SHA512 451e03e01a5b01126c8ab21acb6b053099271056372a5a66cf302a6aac02f5d4d9b033a0551d1029d82dee32b74db01518fc21c8bc718bbd38cf6417f68234e0 WHIRLPOOL 6effe49733a384b9e020f74ed7882972022a97c66584c56da87e769d34770705e9db5df2c51b8d90b5e45b5c90ee5a4b4483803526e2f90f03c60dd175f3bac5
+DIST APScheduler-3.3.1.tar.gz 84198 SHA256 f68874dff1bdffcc6ce3adb7840c1e4d162c609a3e3f831351df30b75732767b SHA512 af861bff47f881200d97551d60a6d3210c9bf864fa83a37da7fbff31d24e9fce5d64d965ffefe6f8678320ad6dcf86dbdc65b611991b14fd8edd18efbf7e6bbd WHIRLPOOL 7e0f9b20722956f1982393fcf65b89f03a563893406878ecead33b09a034f1bbff6f9073ca4db52433504b4acbfc7dd7d27118531e506db2eae9614d472039ce
+EBUILD APScheduler-3.1.0.ebuild 1007 SHA256 f0f680b3a22080a22b17c7722dded2c31e60071757814a921b937efb5c729558 SHA512 0d9b1078d54117bdb1390dc5c0c84be97904faa3eaf220a75292470aeeb5d6e87271ed5f99302c2ae4b1733db06d0f8322eddc3e26f68752d4ad92792ae1f85d WHIRLPOOL 8c6c742738657ffdc3628614f24fe704bc01b1e532a8c715e39b7fb53db2b83f412de4ee3ba6816c3f05a0400026d22da5be3e5876207cb372252a7c5839e919
+EBUILD APScheduler-3.2.0.ebuild 1007 SHA256 f0f680b3a22080a22b17c7722dded2c31e60071757814a921b937efb5c729558 SHA512 0d9b1078d54117bdb1390dc5c0c84be97904faa3eaf220a75292470aeeb5d6e87271ed5f99302c2ae4b1733db06d0f8322eddc3e26f68752d4ad92792ae1f85d WHIRLPOOL 8c6c742738657ffdc3628614f24fe704bc01b1e532a8c715e39b7fb53db2b83f412de4ee3ba6816c3f05a0400026d22da5be3e5876207cb372252a7c5839e919
+EBUILD APScheduler-3.3.1.ebuild 1011 SHA256 55bf942f0876bb86351bf6d1cd28e3deb1b0145bc9b54b8892bb98daa384d647 SHA512 d1ff5b8a6d3b598db81b77004b5d9ce6535e4498223cac6b1c465d6d63858abd1713350be7180164c558cb816a1c2977b0720205f05a42a612adedb7d2f21f34 WHIRLPOOL 4ff890572501b2683a686098a26c66430f4bf905b3286e01db5db5a43a9242f9e3d0be096f7889746b0687ef8a7c34c4b73e0b483b90e7956fc1b498ff0237a0
+MISC ChangeLog 2890 SHA256 01c88365801833e0040d81a596eb3a5176530a9c6ae93973ae2109c50d1774e0 SHA512 85e1ca6a28fec95989e9a98d0c030ef9c2f3b654227b427a5da1f45703910e02dee26bb71531b7a35f671a94816d6065ec43ad2f48c6ad076772235b7c5e65fc WHIRLPOOL a34875e2a284a7256a9f8a80a38a9a69bbcbd805a803b6c1cd6bf67490108a319b0d36d4b4ce7c1810fb2260c8710404e8456a1623431bd1c862981af1d2ff8e
+MISC ChangeLog-2015 699 SHA256 4945a0e15bc3f81d269ff150406f6164bde747d03d7beeef3030709acdeb9092 SHA512 5337f9072a40b253af4e5cf46e4d9cbe9eea71e33cb52d8a199a198b8062b1b6b701d20c782fb927dde60cf6a53f66978cf18b816343c4d7754dc85cc175abb4 WHIRLPOOL 6bf65fe560629449895d054a4ea7cd448adb3619d8efe8d3e8ae27b04139640becd89d5112f985d6a147a92781eddead04852b4ed16e077331105f7edb458519
+MISC metadata.xml 356 SHA256 28b18f7ec07896c891546eb2117c369816f6953452c3f6358d8a9aa8698b9357 SHA512 b27ea801d372a434340acb5fe301493c1a9d5759d9a5277837e67acb8c2b5c513e020450c80ed17a687a2c72855274a1a61455f1c2495f4c56cbd1539da2c1e2 WHIRLPOOL badd52894657efd2bcc7a8e1eec9ef36edada49e28e58b28df81ee1feb3de8a086303615b358be7d873fa9edafa4afed6c38e18cbf01fee93ec38b544543be24
diff --git a/dev-python/APScheduler/metadata.xml b/dev-python/APScheduler/metadata.xml
new file mode 100644
index 000000000000..eaa1b36d6b09
--- /dev/null
+++ b/dev-python/APScheduler/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">APScheduler</remote-id>
+		<remote-id type="bitbucket">agronholm/apscheduler</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/Babel/Babel-2.1.1.ebuild b/dev-python/Babel/Babel-2.1.1.ebuild
new file mode 100644
index 000000000000..8d2b76ef7aba
--- /dev/null
+++ b/dev-python/Babel/Babel-2.1.1.ebuild
@@ -0,0 +1,49 @@
+# 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 pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of tools for internationalizing Python applications"
+HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Make the tests use implementation-specific datadir,
+	# because they try to write in it.
+	sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
+		-i tests/messages/test_frontend.py || die
+	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Create implementation-specific datadir for tests.
+	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
+	export BUILD_DIR
+	py.test || die
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/Babel/Babel-2.3.4.ebuild b/dev-python/Babel/Babel-2.3.4.ebuild
new file mode 100644
index 000000000000..c333bf32f4e1
--- /dev/null
+++ b/dev-python/Babel/Babel-2.3.4.ebuild
@@ -0,0 +1,52 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of tools for internationalizing Python applications"
+HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/2.3-Fix-the-way-local-time-is-constructed-in-tests.patch
+)
+
+python_prepare_all() {
+	# Make the tests use implementation-specific datadir,
+	# because they try to write in it.
+	sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
+		-i tests/messages/test_frontend.py || die
+	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Create implementation-specific datadir for tests.
+	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
+	py.test || die
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/Babel/Babel-2.4.0.ebuild b/dev-python/Babel/Babel-2.4.0.ebuild
new file mode 100644
index 000000000000..9ec087d4bd7e
--- /dev/null
+++ b/dev-python/Babel/Babel-2.4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools for internationalizing Python applications"
+HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Make the tests use implementation-specific datadir,
+	# because they try to write in it.
+	sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
+		-i tests/messages/test_frontend.py || die
+	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Create implementation-specific datadir for tests.
+	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
+	py.test || die
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/Babel/Babel-2.5.0.ebuild b/dev-python/Babel/Babel-2.5.0.ebuild
new file mode 100644
index 000000000000..a126cf190d9e
--- /dev/null
+++ b/dev-python/Babel/Babel-2.5.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools for internationalizing Python applications"
+HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Make the tests use implementation-specific datadir,
+	# because they try to write in it.
+	sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
+		-i tests/messages/test_frontend.py || die
+	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Create implementation-specific datadir for tests.
+	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
+	py.test || die
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
new file mode 100644
index 000000000000..281316bc011b
--- /dev/null
+++ b/dev-python/Babel/Manifest
@@ -0,0 +1,12 @@
+AUX 2.3-Fix-the-way-local-time-is-constructed-in-tests.patch 1297 SHA256 9a408f99a8dda51105b57bbde07eccab7fd81cce6e28bd4090a6f00be42b4c5f SHA512 271219651c716d5224887de5ea2c1f49cba9d4a9f2177a3f902bf59cb32a639803db39cb5b4af4e4fc201d1188ca94d0a27bd0ec0a583562eb02bbfc263e4147 WHIRLPOOL ea08cc2e472a45ae52ae4e43721396a98f2e64867e9af27e26fb1fc26b750733535122ff124b8dd3ef6ded76626c51c420404cda4358792b7eaffb60557217ba
+DIST Babel-2.1.1.tar.gz 3437647 SHA256 7fb6d50effe88a087feb2036cb972fd7a893bf338361516f1a55a820bf7b5248 SHA512 ec7ebb8648101588eecc72913adc45c0593ed6ee5f10874edcd4b932959f9552edcecc8e2ec966dae6ef5e8adb23341f1a4f87ea2d9e6cbba57a9b8b0a352a94 WHIRLPOOL 812badf14a74fa391851aaae048ec5d815d6d8f7abce8b918f036243cc45d91ca97281614c2ef139797719077ef4880cfafce88e9d718b3cd633ed7303e4cfd7
+DIST Babel-2.3.4.tar.gz 6866920 SHA256 c535c4403802f6eb38173cd4863e419e2274921a01a8aad8a5b497c131c62875 SHA512 1fdba01946e7a8ebe3fef23843e23707cd060b0a179d775e29f938318d824e8779df2852fb8bbd18f61fc47de33af5d988c509dc67f54ea4cb3a4a66767869a5 WHIRLPOOL ea265abb1a9f6de890c6fa8e78ef49eab2adbd47916f30d19d3d807220c6598c14a93527ba85b92b8e6fbc40571c706cf233d17d7ee65448e3270ead38b7c71a
+DIST Babel-2.4.0.tar.gz 6607513 SHA256 8c98f5e5f8f5f088571f2c6bd88d530e331cbbcb95a7311a0db69d3dca7ec563 SHA512 4e1341144dfb319c172a446facc47204c9b9f49972c8646b62e082975d8ec41c35e503e610d7114ef5346a5c073e87ed8d40a65a60d9540fb7ca947681cc0beb WHIRLPOOL 58184100c060640316a1517ce70db2b5f9143fa10fb24b2b9d4069c8ecb638b914fbe405d0ab8a51628b98a00a7db4c462d6faff8b2b98a4cb5cd4ca3e7f5abf
+DIST Babel-2.5.0.tar.gz 6612353 SHA256 754177ee7481b6fac1bf84edeeb6338ab51640984e97e4083657d384b1c8830d SHA512 b24b74121695e0068fb28a6294d4b5b2065e94dcd62ca0d70c8fde3a00cb5ff111480505594460989c6f67a75935f55e153b1b493f917317d2c5ee0f0d7921fc WHIRLPOOL a13f570ba56282699eb71825c4210b0f57b731e5d105109a2fbd4b92bb3929c5435fe7defdf9121f071cf4129d5bbdd93a8a9633f6dd7e8762df1b1a6b5fb788
+EBUILD Babel-2.1.1.ebuild 1495 SHA256 15f12cf7b13f2cab4e5f7aa4530db3e3813c750524fdb0730b6ded7495169419 SHA512 85b81166d42016f337e903680a762f4eb7affc4eda2318b59cdc96552ba75185486eaa1071a82a13a60946e8a90fcbd7fb89cadfb538310bdd8fb2cd6c7fb5dc WHIRLPOOL ca9b6544b816967d05d2a283969ac9a83eaa75d73b3817b21547ef6cc0a77750c3cad3c4fcc04a2cb1641b5b5d5261e70d1ce7a1b38b7ea22b4dfd6802a5b68c
+EBUILD Babel-2.3.4.ebuild 1560 SHA256 772044f20b33d47022458cbc331d94155082f28273e65c5a162c7df9b7334589 SHA512 a88248213a2e4aaf0a9573b361fc1630546ffc2a2663dccba5ca069532a58196b05e144be534a26f20a11cc1b4ae3683ec42f035d4ae1bacaebf80c92221da7e WHIRLPOOL ee161d098d84481a0a024e494d4b02983d1a874904d4863431058c94a5b39d942a36a78f0e2ebd36b339ff775b64b2329bd07120e585248c947ae6f0c6ff5b52
+EBUILD Babel-2.4.0.ebuild 1474 SHA256 928436341df76d87e8cbfe09c20b4095d11da9a564e4d28d4dfdb606df625c27 SHA512 1afd189043b07ad3881de87fd5c38c1432dfae22b4375457dc7135d420a4fd3e0f12062f7011828835ce580de81263865255c83ee25ecaf66e1742005388f93d WHIRLPOOL 2fa54b13307db50a7860547cbd2fcaba020c49015049c8ee5ee6d3ddbc32d5eccdc198e44e63ddadc7f70ebd459c8db4cfbf5e15c92ca2d425f871b66cd6a687
+EBUILD Babel-2.5.0.ebuild 1478 SHA256 8acd82e6691122d20b4a8156057772ce681d50db9af35cdb59b617e74973f912 SHA512 ba5ca1a1b6f0d2c4fcb9cd99c2b884e1b2538e6da545cc3d7b5d20c2ae7b2e4aedcfd910ba128401a970215d21851a6919765008e37e38e4ad1e1fa38160abc4 WHIRLPOOL b4795b93bfa11103e2c0ec1bd08dc11c9969ba5d3073694be16ce0d1aac5420d07679f6f942b226d1006f4e1f894966f6cbf712cac0ebcb780f1f9db8556dbef
+MISC ChangeLog 6102 SHA256 87748b8a8870e0bb618efbad76e80d2a0bbfa9346959e3f65eaa3bd14cb60696 SHA512 632d4605205c5cfd82b561c35a51c00ba2cefa3d60c30829a108b7c001642663228ef63ec8b54d39ac2d23482d9bd6f6d62bd760280e580f649e19ecd989096e WHIRLPOOL c797ddb6a88883a0f971e812266eef59998b796e52cfa1e303468f89113270689d88cf7ee7b7e60185668dcaa897a0b2c842092ffa0c9a4bedc83a7368758c4f
+MISC ChangeLog-2015 8689 SHA256 ecc462e7e34189d36faa9ea697605f1244348b67f11ffb6cd7d583a745abdf86 SHA512 857b2c63f47d46918241e51a8eca25d53cc13a2c0335775a3314fa3e15d819c05fe3cd7708ee8be2f7be0bc88a8abe913d61f403726efc94a6412d654e114409 WHIRLPOOL e22a0a1136f0e01d76ea94aaa4106dfb208bf42757f676177f595716c3401f36c7e744123d9664a4062acaf4da9a2c4804a32432cd7e14e946953bd7cddf98c8
+MISC metadata.xml 691 SHA256 11a8c01d89f13c9d7bbb9a48bcfd473dd13a189c149b8e4c611d2600a2ceba59 SHA512 91b4f1fa5ceebae1ded51ef3bee9a5c47380709eb3ededd83f8cbb20a85c45acd0603fb8c7244910c15037036056047b074b79c5d6668f68c44d29cb507e76e7 WHIRLPOOL 863e24d10729a4622ed94fb85f2305ebe291bba75b729869f91d34514eb3585a903e907ec7a4543b2e33e2cad49b1d1fea74c3774ed42d407e1ecd340d65c651
diff --git a/dev-python/Babel/files/2.3-Fix-the-way-local-time-is-constructed-in-tests.patch b/dev-python/Babel/files/2.3-Fix-the-way-local-time-is-constructed-in-tests.patch
new file mode 100644
index 000000000000..fdfb31d7c62a
--- /dev/null
+++ b/dev-python/Babel/files/2.3-Fix-the-way-local-time-is-constructed-in-tests.patch
@@ -0,0 +1,30 @@
+From 476515c2418039e471656f47efbfc43e5230c1fd Mon Sep 17 00:00:00 2001
+From: Isaac Jurado <diptongo@gmail.com>
+Date: Sun, 29 May 2016 10:50:42 +0200
+Subject: [PATCH] Fix the way local time is constructed in tests
+
+In summer time zones, the test for "get_timezone_name" failed because the
+construct used to obtain a local time did not deal properly with DST offsets.
+As recommended by pytz, it is better to convert to local time from UTC.
+---
+ tests/test_dates.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test_dates.py b/tests/test_dates.py
+index 3bb9e8b..b0d093e 100644
+--- a/tests/test_dates.py
++++ b/tests/test_dates.py
+@@ -624,8 +624,9 @@ def test_get_timezone_name():
+     assert dates.get_timezone_name(tz, locale='en', width='long',
+                                    zone_variant='daylight') == u'Pacific Daylight Time'
+ 
++    localnow = datetime.utcnow().replace(tzinfo=timezone('UTC')).astimezone(dates.LOCALTZ)
+     assert (dates.get_timezone_name(None, locale='en_US') ==
+-            dates.get_timezone_name(datetime.now().replace(tzinfo=dates.LOCALTZ), locale='en_US'))
++            dates.get_timezone_name(localnow, locale='en_US'))
+ 
+     assert (dates.get_timezone_name('Europe/Berlin', locale='en_US') == "Central European Time")
+ 
+-- 
+2.13.0
+
diff --git a/dev-python/Babel/metadata.xml b/dev-python/Babel/metadata.xml
new file mode 100644
index 000000000000..c57331eb483e
--- /dev/null
+++ b/dev-python/Babel/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		A collection of tools for internationalizing Python applications
+		Babel is composed of two major parts:
+			- tools to build and work with gettext message catalogs
+			- a Python interface to the CLDR (Common Locale Data Repository),
+			providing access to various locale display names, localized number
+			and date formatting, etc.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">Babel</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/BitVector/BitVector-3.4.4.ebuild b/dev-python/BitVector/BitVector-3.4.4.ebuild
new file mode 100644
index 000000000000..9bac10b49484
--- /dev/null
+++ b/dev-python/BitVector/BitVector-3.4.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure-Python memory-efficient packed representation for bit arrays"
+HOMEPAGE="http://cobweb.ecn.purdue.edu/~kak/dist/ https://pypi.python.org/pypi/BitVector"
+SRC_URI="http://cobweb.ecn.purdue.edu/~kak/dist/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+python_test() {
+	"${PYTHON}" TestBitVector/Test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/BitVector/BitVector-3.4.6.ebuild b/dev-python/BitVector/BitVector-3.4.6.ebuild
new file mode 100644
index 000000000000..24ce353995d9
--- /dev/null
+++ b/dev-python/BitVector/BitVector-3.4.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure-Python memory-efficient packed representation for bit arrays"
+HOMEPAGE="http://cobweb.ecn.purdue.edu/~kak/dist/ https://pypi.python.org/pypi/BitVector"
+SRC_URI="http://cobweb.ecn.purdue.edu/~kak/dist/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+python_test() {
+	"${PYTHON}" TestBitVector/Test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/BitVector/Manifest b/dev-python/BitVector/Manifest
new file mode 100644
index 000000000000..a324988ed903
--- /dev/null
+++ b/dev-python/BitVector/Manifest
@@ -0,0 +1,7 @@
+DIST BitVector-3.4.4.tar.gz 121822 SHA256 e528ec6e03bcabe6d7e10d4a13459d644dd6577b73e225f7a686bd1902734186 SHA512 b2310ef712c97538e29d008688efdc10269030bfdf7656733093dd4580ff4dfa171f6d58683c3a6336e909a020ba5100474e18997c1b2a0873a0da2e622ba9ff WHIRLPOOL 0cdae2ec0503f2ba2d704ba2d992c0b8c176da1fd940690bc30483f3db3c4f23dbc7d395aed5a2db548f8da53df381222858932d1a1541c156b178f5518cbbb4
+DIST BitVector-3.4.6.tar.gz 125137 SHA256 2dc160d433eafb154eb3e2b5d419417fe9a819070e58ada685c1c14e3485841e SHA512 56994692b7cd62f5790a1629d6a653f66f147e674dbc1a5f256dac4462c3eedf6363551165de940e4823d78462f63a44dce03ccd28073db1d93f2e2af436d0ab WHIRLPOOL 9bb405dfac2674c3d42e4483602d42d2c481073d145c33f49a5fb252cf5fac9aa1ae6715d6752fc9ecca200020af5de00b09a437c294373052f044cd4d3345a1
+EBUILD BitVector-3.4.4.ebuild 547 SHA256 04b4da68932f37679066cfcc54fe550ef43898d92cc84de19fcfd53ac175f041 SHA512 08cd5e4f4fe358bda76068dd755831294d40b5c554b18179a11d542eb44ef7a9647923910e98dfbf91976dcb7d8052e24af9d68bb69b11d25c310f07305a582b WHIRLPOOL 6ebe03131279a090a08e2502d7f00ac7103df01a3f8e583372ed84b015beb82cff8f85276eae200865213a2b60ccae823e5bf360c46226a9f8526488be6d3262
+EBUILD BitVector-3.4.6.ebuild 549 SHA256 65d9e43b70898e1be6c08a558f337de679c2503c5ddf8dbb03986f280ea1fdcc SHA512 4fd28952545a810260066210f5abe3fac2a4602689f520af1263fc146df5b565573b9250f537ec4d22af4c6ce851b43bc71934dca9effa89cb16476f4c95da08 WHIRLPOOL eeae18acc4cdb3a0960bfbb648a9bcefe92d5999ec9b164d6eea683fc2bd4c08d0427940fb64a64cc98ae5e5e9471b6a67f3c5bba324000678c68a78a1d1a2af
+MISC ChangeLog 3048 SHA256 2da9ad7f901a2d71d91a8ae74b246b832705df5fca7ab1120d9e1683f205987a SHA512 ef2f16204632c4c969cfa2264bfa871753b2617d58a0d2be672f5aae5143c8936afcc4da5db0399a19c9898d70b163720d7784e9bc2c48dd0270ec55388748cd WHIRLPOOL 69eb08b678e863936ef2372abcd59969ab240cef93409ab2775a81c2c63333449277b2dc45084afc21d02c53ae81908528701a46ee3ed674a8354b0b279258e8
+MISC ChangeLog-2015 2023 SHA256 d2c2f0c955342037c4f7a41d0b98f28733ca80e2e5b08a17c15c34b81189fd72 SHA512 64df571a3ca032f0eaca4a571bdad8b63d69674a257c3e9b02a9116697a38cac3545b65a64a8a181b87e51ff4022b0e2a86068d92fe2fc9448450bd43a5464b1 WHIRLPOOL 5973f291e9b031c3e50d0aba941e4a2be3958312a1670a72c2ac546615d77b9ef92065f32df3d781ff577504c63318062710ca0d65e1840574801488416bad92
+MISC metadata.xml 457 SHA256 2ecccc8c83dba818caa5a391adecc6bb521c40b6f8c3c9c67475d501b9ea256b SHA512 ec79bcfc7eb9e6462ed93a6cb3c939668b720e6c7dac05adbd2dede09eb958b46b0244ac1d190b35c1ba901eae1bc12058079276b077e5e9d5129f7635b75b63 WHIRLPOOL 9e8c924a75f719deaef64a39e333e8f12db5aaf4a085e363d0767fa3dcd4fa4bb8f5a27189ea76d11406543f88d7cd199d96e2658ce17d1888a065e4e5fbc07e
diff --git a/dev-python/BitVector/metadata.xml b/dev-python/BitVector/metadata.xml
new file mode 100644
index 000000000000..663d4916d15e
--- /dev/null
+++ b/dev-python/BitVector/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grozin@gentoo.org</email>
+		<name>Andrey Grozin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+	  A pure-Python memory-efficient packed representation for bit arrays
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/CacheControl/CacheControl-0.11.5.ebuild b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
new file mode 100644
index 000000000000..2251e541e473
--- /dev/null
+++ b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
@@ -0,0 +1,36 @@
+# 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 pypy3 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="The httplib2 caching algorithms packaged up for use with requests"
+HOMEPAGE="https://github.com/ionrock/cachecontrol https://pypi.python.org/pypi/cachecontrol/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/lockfile-0.9[${PYTHON_USEDEP}]"
+DEPENDS="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (	dev-python/pytest[${PYTHON_USEDEP}]	)
+"
+
+# Not included
+RESTRICT=test
+
+python_test() {
+	py.test -v -v || die
+}
+
+pkg_postinst() {
+	optfeature "Redis based caches" dev-python/redis-py
+}
diff --git a/dev-python/CacheControl/CacheControl-0.11.7.ebuild b/dev-python/CacheControl/CacheControl-0.11.7.ebuild
new file mode 100644
index 000000000000..32bda26542db
--- /dev/null
+++ b/dev-python/CacheControl/CacheControl-0.11.7.ebuild
@@ -0,0 +1,36 @@
+# 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 pypy3 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="The httplib2 caching algorithms packaged up for use with requests"
+HOMEPAGE="https://github.com/ionrock/cachecontrol https://pypi.python.org/pypi/cachecontrol/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/lockfile-0.9[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (	dev-python/pytest[${PYTHON_USEDEP}]	)
+"
+
+# Not included
+RESTRICT=test
+
+python_test() {
+	py.test -v -v || die
+}
+
+pkg_postinst() {
+	optfeature "Redis based caches" dev-python/redis-py
+}
diff --git a/dev-python/CacheControl/Manifest b/dev-python/CacheControl/Manifest
new file mode 100644
index 000000000000..c09306853e47
--- /dev/null
+++ b/dev-python/CacheControl/Manifest
@@ -0,0 +1,6 @@
+DIST CacheControl-0.11.5.tar.gz 13104 SHA256 b78484d6feb17b501267f4048c364a8fc26fcef35ca3ff62bdba63d41fa4cf42 SHA512 2acce5a8be2e409a1a18254cfe71314074037bce3341f8b8fdec52c43500c90bfdb6063b2121c5cf6c8a2fc7c0903e4fd0c15813ffdfa547810b33571d211deb WHIRLPOOL 5e12640ba5c952ee8a83f5271bbbd105f148cd080bf6ae5c2cbc9c6cc20361005aa5cf1a95feaa1a808c56c26b7abdfbde3b7bffc873f26072d23262c12b49ca
+DIST CacheControl-0.11.7.tar.gz 13902 SHA256 8f7829d92584f1f2360ebfff4517ee359787d5b7dfa2ef9579f871b628745a1e SHA512 fad1f93140dd6fcedb3797f4dbc1587045ade8dafe6cbc6774bf62bd635fbc1ba08b2dec124745cffed5259606b55f0e2edee036b5b5e34156d3114f6bf63493 WHIRLPOOL 736a503fae24d8ba1ecc13a1d47d8f51b0f478f1890de52747b56b3aba770e44aba4eae48bd6140a0611931fa1cdfb5ee5315f833abb997aa69143ee9b84b9e4
+EBUILD CacheControl-0.11.5.ebuild 899 SHA256 27fdf3c06a987c430b60aed1c7fee5fd6416bf5d1ec4c22f283162f4b451896a SHA512 c9906e082893ab15edca724ed14007ded9bafec5d2cd22f9517284a9777722d481027a050b963f277885cd7fa2c6078935987c98e25037c09244de80855062e4 WHIRLPOOL 08baa76e442cb1250b8657736729111df6ddbf941fb12b5873632c190df45198d818662fce33ef4e76bb32ae7db5d9c943ba46e5d7179d00558bfe347547e726
+EBUILD CacheControl-0.11.7.ebuild 907 SHA256 5e2bfbd24f02c88334ed339cbbb6f9ebcca190eecd4c9ad21d456813a85d7e0b SHA512 f83ade5f30ebd6e15f06322bf865a5d174d1acd8e66a849ce671c46e808586ebd7fc7de77e3dbef3140c76b413f8fc97bac8cbf49f5825b918864c33d9d02b7e WHIRLPOOL c2fa6fd01bdfb5a6bafdb977254305bee5a619cf53812d5f0f63eb1290d316f1f50688af649a3c846f11002602be07a146690b0bced5b49154a088bf45c6ef4e
+MISC ChangeLog 5489 SHA256 c37192cdf6cb9429ca232e1865da23066f928439329dcbac8010426d34a1e65a SHA512 a66163fd2f87fd88d2d30bc829f4d909d80be23f0d3be973a3dcce4a32cff80a1d9779f6014cf3d3b764c54710cec1482ded78aa94aa0c2981d82deb97989283 WHIRLPOOL aa04bf146db18049f384576aca4e569ca70e012234fe0020df2241d776bff0cf1815db24ff574695f6c03fd6aa572275082002d1fca18cfa27d70985cccfffac
+MISC metadata.xml 387 SHA256 2489e872a5c0fe2c69017187eb092455259e344699bf597870bc50e2c3ed606c SHA512 c80bc300402e7cac33d5350aafda6c93579b3d14094ea34bfe4dd898ca498ab0139c428f01e4917544df64a1aef0022a4868650e2bb66f2cf9606c28fe885f65 WHIRLPOOL 85d1c45a9d00892d1c45ec1143488c644f94c42190de5d235dcd5477536a7f144a21c65065ba64c79b0b8680f2ada86bab24c12a8827d2e5f536006d3e6ad97f
diff --git a/dev-python/CacheControl/metadata.xml b/dev-python/CacheControl/metadata.xml
new file mode 100644
index 000000000000..54195ee03e79
--- /dev/null
+++ b/dev-python/CacheControl/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ionrock/cachecontrol</remote-id>
+    <remote-id type="pypi">CacheControl</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/Coffin/Coffin-2.0.1.ebuild b/dev-python/Coffin/Coffin-2.0.1.ebuild
new file mode 100644
index 000000000000..757933b9c612
--- /dev/null
+++ b/dev-python/Coffin/Coffin-2.0.1.ebuild
@@ -0,0 +1,27 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Jinja2 adapter for Django"
+HOMEPAGE="https://pypi.python.org/pypi/Coffin"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_prepare_all() {
+	# Req'd to avoid file collisions
+	sed -e s":find_packages():find_packages(exclude=['tests']):" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+# Tests attempt to import an abandoned module
diff --git a/dev-python/Coffin/Manifest b/dev-python/Coffin/Manifest
new file mode 100644
index 000000000000..ccfbd2f003ee
--- /dev/null
+++ b/dev-python/Coffin/Manifest
@@ -0,0 +1,5 @@
+DIST Coffin-2.0.1.tar.gz 9858 SHA256 b1cfb44b1ef7daabc7c607a937f85e4b89b63bd9536ee3b817461747a476a65c SHA512 e618c74a91f84e7f41411c8e34b2c97fad1a59bc5124f0f5b3439abf1b0c2972d5f59d4b71f49393e843cd588ec143c08d659e90d2cfd006d55b5244b5727ccc WHIRLPOOL a1c745eca498ac5e7877c0ce20433d22c647d9e419b5269eb1a167d9ab478c068acfd6d2d59f485e8cb2f2fe7b440aa84c34ccefdc7595fb43a9d320e08d12cd
+EBUILD Coffin-2.0.1.ebuild 655 SHA256 b105cd835c35761ceb5286968dfea1297733131ecf65bc1819bf88542b425aef SHA512 2b6b28d3dcb0aff2193628e038cf143fc4db11844e9838113e17099afe14d02b22b1757d1d95126c177651dae7630537a912e6a95434523a39cfa82dd3fd5d4a WHIRLPOOL b6f15f9f4d82110354e9de5a75550ccfe78d9ffb4d69a6e6038d6b6f287b76e2dc461e52774acf42654d1acbbeec61234817a63acc01ad272c8accb1cd57c680
+MISC ChangeLog 2914 SHA256 9122827418159764533529e0a237121b8e1d4c782104e86e6817b4dc62187380 SHA512 844b34775c3126b4962f39b8a67822a52da44be78a024513b74dfb1d523e9a5fae458e3f41e19300c0925dc405bfcfcaee6571077f69d30a3873c808b2654a25 WHIRLPOOL 315e939c478d1552766bf3f525b0c591850fd5f02b1479406394d6a2763b4e1608c9cc4501446cc4ac76887e708aedcaf15fe569d1cfeb1694c066d51e292684
+MISC ChangeLog-2015 869 SHA256 6d6d0617b02cc45f58f5acfab280110ee6a23c26b5e1f2eb7df7128a86b22107 SHA512 17556c6daec2adc5f7c61c09a9fa3e44ee2638b130c7bcf82af076e0556555cf3c40087bc5e2974193e3a848989d7964af126c27503588566ec3056f614165fb WHIRLPOOL 2c6554dc3ba6fcc26f7e4bc39f6929802b3986a9e1b804e15a19bd62880479da93f04ffbee00ada63b46d654c8dca131bd01dcc2e4b235f455b14fe17ba837b5
+MISC metadata.xml 374 SHA256 03ac024686e46827796e49d78230eabfc49c3b3f27482c52b53069ae89e9778e SHA512 647ea636d9b5338cf85abe493dc107eb0845024a0af8b99df071bd960e8662308ab1e5c45f655ff68c58acb9a6b8ea51405040eb73e16c263be42bab7ce531d1 WHIRLPOOL ea25b16d9b261c5f7a5f6b2fd0ca40d1c43ad8a5d02ae4063e2d51d39cf32a16ebf6ee1d75f7807cc8fb37b35f924d8505f390075f168ef10c4674dc0a7ce434
diff --git a/dev-python/Coffin/metadata.xml b/dev-python/Coffin/metadata.xml
new file mode 100644
index 000000000000..4573224f605f
--- /dev/null
+++ b/dev-python/Coffin/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Coffin</remote-id>
+    <remote-id type="github">coffin/coffin</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/CommonMark/CommonMark-0.5.4.ebuild b/dev-python/CommonMark/CommonMark-0.5.4.ebuild
new file mode 100644
index 000000000000..e25cf425023e
--- /dev/null
+++ b/dev-python/CommonMark/CommonMark-0.5.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python parser for the CommonMark Markdown spec"
+HOMEPAGE="https://github.com/rtfd/CommonMark-py"
+LICENSE="BSD"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+RDEPEND="
+	dev-python/future[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/hypothesis[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# unrestrict for versions >= 0.7.2
+RESTRICT=test
+
+python_test() {
+	LC_ALL='en_US.utf8' LC_CTYPE='en_US.utf8' LANG=en_US.utf8 PYTHONIOENCODING=UTF-8 \
+		  esetup.py test
+}
diff --git a/dev-python/CommonMark/CommonMark-0.7.3.ebuild b/dev-python/CommonMark/CommonMark-0.7.3.ebuild
new file mode 100644
index 000000000000..95f715545b5d
--- /dev/null
+++ b/dev-python/CommonMark/CommonMark-0.7.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python parser for the CommonMark Markdown spec"
+HOMEPAGE="https://github.com/rtfd/CommonMark-py"
+LICENSE="BSD"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+RDEPEND="
+	dev-python/future[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/flake8[${PYTHON_USEDEP}]
+	dev-python/hypothesis[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	PYTHONIOENCODING='utf8' \
+	esetup.py test
+}
diff --git a/dev-python/CommonMark/CommonMark-0.7.4.ebuild b/dev-python/CommonMark/CommonMark-0.7.4.ebuild
new file mode 100644
index 000000000000..bd4fc9bf81bd
--- /dev/null
+++ b/dev-python/CommonMark/CommonMark-0.7.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python parser for the CommonMark Markdown spec"
+HOMEPAGE="https://github.com/rtfd/CommonMark-py"
+LICENSE="BSD"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="test"
+RDEPEND="
+	dev-python/future[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/flake8-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.7.1[${PYTHON_USEDEP}]
+	)
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	PYTHONIOENCODING='utf8' \
+	esetup.py test
+}
+
+src_prepare() {
+	default
+	# Fix file collision with app-text/cmark, see bug #627034
+	sed -i -e "s:'cmark\( = CommonMark.cmark\:main'\):'cmark.py\1:" \
+		setup.py || die
+}
+
+pkg_postinst() {
+	ewarn "/usr/bin/cmark has been renamed to /usr/bin/cmark.py due file"
+	ewarn "collision with app-text/cmark (see bug #627034)"
+}
diff --git a/dev-python/CommonMark/Manifest b/dev-python/CommonMark/Manifest
new file mode 100644
index 000000000000..fda464fb309f
--- /dev/null
+++ b/dev-python/CommonMark/Manifest
@@ -0,0 +1,7 @@
+DIST CommonMark-0.5.4.tar.gz 120316 SHA256 34d73ec8085923c023930dfc0bcd1c4286e28a2a82de094bb72fabcc0281cbe5 SHA512 1983714a50a627f30f86af0d02dad9e52cb7b0ffce29691d0e740f587e599ead6de2412d72b895b7df772e1c81e171e56dfecaf593e611af65bd5798632a98ad WHIRLPOOL f375b772faff450af98d73b3559dabe7b7369951cd8cf9ea45046bf5de875022212b7e92daee3fa7d3fb63d44894a301991a4561ac8a8b0c78eef64c83062fad
+DIST CommonMark-0.7.3.tar.gz 85177 SHA256 5f20ebd91614c8d339d4cded314894feb5d9a54c3b52c1ff9883794557149ea8 SHA512 34ddf0539b54d79cd16356124a15e4f51076a7afdde78fbaa0cab06658279357c5523d89bdfa7d595d85da9df9b194491ddac22b78444b230f53298ffd11c8cf WHIRLPOOL 41b1da6e2c1479b8b47b048d529282a8618f455653ad88e65f1460c55c74ccb7df563e159470ae8d912deede190d5da18b88111420a0d48fe264724e993871ef
+DIST CommonMark-0.7.4.tar.gz 87841 SHA256 24678b72094398df96312fb927e274ccaf5148f25e47aca9f7fc062693ae7577 SHA512 7c76a5f0dec02e9ae8c2f73ebd2980a5a684b43ee8a82ea23b72c7f2332e1d4316a7b2d7b66ad8fe912803115a57e03b2ae4c7b042cc53e1205e579093053b89 WHIRLPOOL 22a9ce7fd17dbf2b441b870b458a0cd257f6e343aeae837ebad452d4ada58dceaede631409c11ba87d81ba4fce14d68d2c6e9e9d3e0a42de2b3aac790b4adf75
+EBUILD CommonMark-0.5.4.ebuild 745 SHA256 e3dd4f6acf36d0253c36442740205bfe15bdf4dd4fa6b8e742f2ed21c6e7703f SHA512 ef3f8cd93fd9d24d576a53837747b7c41bdfca3ff6b98e16975b0b91dd993c115e21fba3a0dccb83ba9a6db7e8c7fb3f2840578557819f7fd8c5f0fd965fbac3 WHIRLPOOL c9f7d0926ee5684224a7494bfeaf18cdd545a7627c44855e6c132b0db6445b77269d527d5bbff738a14f6b4ca99aebd7060ae5259d9c1669bcea67224b9c0867
+EBUILD CommonMark-0.7.3.ebuild 674 SHA256 a443bfce3005ce5e6ccfba9a60be17ee42797bf88c365ea6d0c1c9c36877af1c SHA512 c12aaa35eab159bd46736ba914a0b5828e8a8660fd2e6d321905a42178ff06e8fa61eb3cd59cd5dcbadcd492bc26e6a4589c4a595a66e1326fdfe6b6f7e907f0 WHIRLPOOL 5d1b5e0ec7366c6934fb5f42246fd0fabb6ddba4a425436fbb6d0646a980b9946231eee48287c76daa9a9224cb07057c64e7568825e1c13484baa13612274749
+EBUILD CommonMark-0.7.4.ebuild 1028 SHA256 a57d7e7c5118427d181356d1e2f70c362cf8156972b080c84dad9b2898638291 SHA512 6346dd647dd2a40844c0b9521fd15d4658c79db46e52c6456f5802de305a28201cc33a565a2a29699cd79f602867079a83a84ec007889d0014f1d2474105896a WHIRLPOOL ba71d1534578dd9f8ed47ad3a7680c9eb2ada0415f4bed291ba9fc38bf8b2d74af1ba1ad5680e18ebe2c50e622ce161ae81b940503741b17e8111a44bd4ac881
+MISC metadata.xml 756 SHA256 cb2d2b45347118348704b7b8fb2df45e22b6361eb8545839ff90444823dc0af7 SHA512 1a28755c041abef9cb797c8d9ea448a62a500a915ae9c4002a22f85886fbae62c2574675926e80e5ffdcacf3a3257fc9065a14d6495574c556288b334274b03c WHIRLPOOL a9a537dfcff3a3deff48af9f9aff9333705095a27658429ca59aa6ec87b5614eff2e7d8bef6a91004e3afa219ad06c990e802582cfc43e73b0c86215ff5a260a
diff --git a/dev-python/CommonMark/metadata.xml b/dev-python/CommonMark/metadata.xml
new file mode 100644
index 000000000000..fc5b696a8da1
--- /dev/null
+++ b/dev-python/CommonMark/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Pure Python port of jgm’s commonmark.js, a Markdown parser and
+    renderer for the CommonMark specification, using only native
+    modules. Once both this project and the CommonMark specification
+    are stable we will release the first 1.0 version and attempt to
+    keep up to date with changes in commonmark.js.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">CommonMark</remote-id>
+    <remote-id type="github">rtfd/CommonMark.py</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/CoverageTestRunner/CoverageTestRunner-1.10.ebuild b/dev-python/CoverageTestRunner/CoverageTestRunner-1.10.ebuild
new file mode 100644
index 000000000000..c579894027b5
--- /dev/null
+++ b/dev-python/CoverageTestRunner/CoverageTestRunner-1.10.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 python-r1
+
+MY_PN="python-coverage-test-runner"
+DESCRIPTION="fail Python program unit tests unless they test everything"
+HOMEPAGE="http://liw.fi/coverage-test-runner/"
+SRC_URI="http://code.liw.fi/debian/pool/main/p/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/coverage"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/CoverageTestRunner/CoverageTestRunner-1.11.ebuild b/dev-python/CoverageTestRunner/CoverageTestRunner-1.11.ebuild
new file mode 100644
index 000000000000..51e3aa40571f
--- /dev/null
+++ b/dev-python/CoverageTestRunner/CoverageTestRunner-1.11.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 python-r1
+
+MY_PN="python-coverage-test-runner"
+DESCRIPTION="fail Python program unit tests unless they test everything"
+HOMEPAGE="http://liw.fi/coverage-test-runner/"
+SRC_URI="http://code.liw.fi/debian/pool/main/p/${MY_PN}/${MY_PN}_${PV}.orig.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/coverage"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/CoverageTestRunner/CoverageTestRunner-1.9-r1.ebuild b/dev-python/CoverageTestRunner/CoverageTestRunner-1.9-r1.ebuild
new file mode 100644
index 000000000000..dc7bb339a021
--- /dev/null
+++ b/dev-python/CoverageTestRunner/CoverageTestRunner-1.9-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 python-r1
+
+MY_PN="python-coverage-test-runner"
+DESCRIPTION="fail Python program unit tests unless they test everything"
+HOMEPAGE="http://liw.fi/coverage-test-runner/"
+SRC_URI="http://code.liw.fi/debian/pool/main/p/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/coverage"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/CoverageTestRunner/Manifest b/dev-python/CoverageTestRunner/Manifest
new file mode 100644
index 000000000000..e0cb9304bdf2
--- /dev/null
+++ b/dev-python/CoverageTestRunner/Manifest
@@ -0,0 +1,9 @@
+DIST python-coverage-test-runner_1.10.orig.tar.gz 19149 SHA256 550fbffe220007608e6aa41904134321d2fb32af11078cc280fe39d84b251300 SHA512 041896468863d1f06a932da4a4113d9afe952ca88004feb3ac872cc8352a94e5f4b5d7444f8b5dce49e5dc3ccfc727553d540b9865e8bf00724ae312ff1be2e6 WHIRLPOOL 3d11391e7624e8e3743d3d01cfb915523361f9cae3dbae1709eb45b6c467f4bbbbe83eacb7f093e74b25f82c2ce6e982bf921c748b73a233e96bc19cd99a4eae
+DIST python-coverage-test-runner_1.11.orig.tar.xz 19056 SHA256 11630209fbb02a86c0cea898daf3094f463ead256f83d05a742fa41be7972639 SHA512 669947608636a46614022d8dee42d144e9a4ca4986efbaeff503c2b68c3612e60fb03fb255893dbe9bbf4b1df3c6e375e2d93f333cb79b1bbb2b63a64e59c866 WHIRLPOOL 897a5b993a46d7a22092202926d955ee2f3e27416cf57310f06ceb7fe8d466453fbb3971e7eb86eb9c1ff9b0e8fe1104768df2cc7136745d2cf71bcd154fe196
+DIST python-coverage-test-runner_1.9.orig.tar.gz 19175 SHA256 d3bf062e6f7797a71e8958f2cf1b879e2037c0b2cb9b4deb73c769bafe295437 SHA512 7793fc4eed0eb92a53a4dd1662a92dc131ebefe1194196f9a8e022d8d63da779aa8f978c056e981629324465f919869b5dc31cc9b31fe5e3173f1ac3f3f5c83e WHIRLPOOL f54e309fd0526740c8b580ac2d1eea4858af313564fa59ce92b812f771199a5b6b8dc4b36d235554939db45d18d4671287e1ab7bace37fdce136c0c52c215931
+EBUILD CoverageTestRunner-1.10.ebuild 590 SHA256 c12bdf5d92fdfafc99afbcd19f877bc3b29bf2a44989df53f4070b5c93dc19ec SHA512 7066d3bdd2f86b0204cfaa1ea5eec6d19941f76c30beaf0dbf8a89357fbd3070772b8bd4bce52b31f36a8c0a30f6ea54aedf272e1f31b0b436be55e470328026 WHIRLPOOL d5c061533e0f74f772f42d827b3135200a30b368340fa44dfb3ac414c8039121ade902a1e81719965af14a765ce64d28c23d92b6c7c5a5a1ff925a7e285c8d29
+EBUILD CoverageTestRunner-1.11.ebuild 621 SHA256 aa278c43835a6af3bd1306b9e5caf86095d9aa66fcbb6ea448143a91ab59c266 SHA512 05cda3d36c82e1b73ad1c809e9d18bcee3b57398298c06907e6cb34a76e9aaee9250faf2bff89ab78e9df3a0ff4c45f96ff4a692cb6a50e683873df00f53ae7d WHIRLPOOL 534ebb3d38b00ec9dcf5dceb5c81547e4c34f657ba44bd476e6270b09888d2a574b553e1303cba45b158d61fe9b3b9a5ca14c3ab60155f5333ca4cf0b89a2ebf
+EBUILD CoverageTestRunner-1.9-r1.ebuild 572 SHA256 92e19a38563a16e50d67eac615cde6a8621cfbc975d1f78325abc78341c41a03 SHA512 2bf2a2267483a3f0cbaa41f40fbc58092983833d0cf7a2da23b2417740878ff4bdae7b88c50ff1d87e618b4427ac419801f8bd87be8c3edb7af5449002e313c6 WHIRLPOOL cc4754684283d8f1222c2abbed7faea0a8aee1a7b65a605158bd53d69ab7396c12d227d579afd98e6cce3652a68693d6ca6530097b8792b532830e518c8732a0
+MISC ChangeLog 2287 SHA256 fdda1ad074370ec22f1de119e8c6bd8b4f3fd299565241480b4a308acdde876e SHA512 a07c1a8210b462fd64a041540efcde756aaf070e5ab19f276fd58a1789d269b12cd86fce09c6faebabeb18c2b22bb5a937c86b7222be6d51cac1c54c2403f721 WHIRLPOOL c3ae259b0fd276ac8e47ded7191cd76c3a95743e979ae1ef993685ebb64d67af684687f60e954128e6065e06c91263f7e2bf8e3d661602088346fa8b0d2cc1a3
+MISC ChangeLog-2015 2047 SHA256 901c7c54768249476696583f901412eeca9f410b206acc2ef5e3cbca1f84f815 SHA512 873c82a73a97aaeb8d9f5183e52340ee4ff0912d73d3b5bacbc92255b08d31b2091aeae56dd13256b2b9939934d209b3b7ea620b65f5e4c4dd2e2cf10cdbab8e WHIRLPOOL 63fa0a860839c991b1a7a116bb7f05ad6938d0a0b5a5a47403330a0d6620f711ee51c83ea2058d274d2c74c2df922ddb5c1248ad7e8a0fc232cfc87bdcccd9fd
+MISC metadata.xml 250 SHA256 dc7996b965794cc38ecefc226a6b05400ff49c69553249c3d0ac69fd277b7906 SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de WHIRLPOOL e00ced8aee67f075273a4c498a4c69671eef224f7b41ef8c194ae72404c242bb93bf31a48fcf94065ab6fe8afbfb667238deba4ea4eb9bec406ace4bfcdcdc8c
diff --git a/dev-python/CoverageTestRunner/metadata.xml b/dev-python/CoverageTestRunner/metadata.xml
new file mode 100644
index 000000000000..ea6b59e79026
--- /dev/null
+++ b/dev-python/CoverageTestRunner/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>mschiff@gentoo.org</email>
+		<name>Marc Schiffbauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/Flask-KVSession/Flask-KVSession-0.6.1.ebuild b/dev-python/Flask-KVSession/Flask-KVSession-0.6.1.ebuild
new file mode 100644
index 000000000000..2f0e3092540c
--- /dev/null
+++ b/dev-python/Flask-KVSession/Flask-KVSession-0.6.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Transparent server-side session support for flask"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-KVSession https://github.com/mbr/flask-kvsession"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/simplekv-0.9.1[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-0.20[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/Flask-KVSession/Flask-KVSession-0.6.2.ebuild b/dev-python/Flask-KVSession/Flask-KVSession-0.6.2.ebuild
new file mode 100644
index 000000000000..e70a5abc821c
--- /dev/null
+++ b/dev-python/Flask-KVSession/Flask-KVSession-0.6.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Transparent server-side session support for flask"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-KVSession https://github.com/mbr/flask-kvsession"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/simplekv-0.9.1[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-0.20[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/Flask-KVSession/Manifest b/dev-python/Flask-KVSession/Manifest
new file mode 100644
index 000000000000..2d3805202de7
--- /dev/null
+++ b/dev-python/Flask-KVSession/Manifest
@@ -0,0 +1,7 @@
+DIST Flask-KVSession-0.6.1.tar.gz 37725 SHA256 19a5d44aca843999f5f6f87a618dab44272db227a959867a4c6c64ae3a743a55 SHA512 a0de01d546996c0f09d1cfa2c537fb3868717bcfcdbd3f3f93c2102349bdd1e9fd00d1efcf1c3a80f9cddf173ed43781774e75c7cf1114a1aff549c1f98160da WHIRLPOOL 8f08cc60e26699352199fb479cc6eac7ac0c224d2cee5089dc2d45cfb29380842444bd90662175357f35ee0414c8d418d3c8f172ce303602499946250f80f3e4
+DIST Flask-KVSession-0.6.2.tar.gz 38037 SHA256 9c0ee93fae089c45baeda0a3fd3ae32a96ee81c34996017749f8b3fd06df936c SHA512 11cbb4ee74dc2a1b44dd1f91729dfb65fc9beb9d93c86ce06a861eba8bd87139897a9f6dca0b5f7f8249034b5eeb3c93327e956b4ea34cd409adfc889b75e33b WHIRLPOOL 2f1363edbb93fbbe33b4e1e08247a717ac45c4cad50554e8ecf824590376e77aa645cfb5e6e37d200cd561db69840d0f986797f519c74f4adf0dc562ea6db3ea
+EBUILD Flask-KVSession-0.6.1.ebuild 715 SHA256 e76046b15b645b71667df393ad15e56da93e0b256e9f8a0230c89fe3132e8311 SHA512 487a800e2ab585a8760f5bcf8010bc70f99e74585f15efc2c7d19953b8901dd1c606b1175883d00d1ed2d06a21086ea85d4c400901bff1f3c0ff986825efd5ab WHIRLPOOL 12ff22005cb10e6a54670bfcb1febcd1d27368a4b32542425ba6ca41df3e4f2afb0b42a13707382edff81e5e92f91530dac8daeffd362a76008d524b85c8b9da
+EBUILD Flask-KVSession-0.6.2.ebuild 716 SHA256 59e68fe9445d58d3591a22551311c2dc9f03c7fb840930167003ea981ec756c0 SHA512 954a839e6d6736ebf7d58dc28bc4edc25d6d120ffac5fde3222338868de73d7d3c77cfb8059150a07f897c3584812adfc07319f5b2fbc57750c1e1843a41210c WHIRLPOOL 16be055d7d5dbabbda107a0aa356734f67225cf0c4228b0b90c7bfeac67ee94f447798037152265c27f5bf79088c8a7c706fe06798d53bc9236f4a9bc041ffbc
+MISC ChangeLog 2521 SHA256 e8ba20c083ca83e4648ec922def6b5549ccfd82871683aafc96c80fce784d847 SHA512 f59f9ce2ae2744ab6f0d2b255eb09c208c30de3feb5c81dda9db80104894ca613c147b7723ba67b62fca49eaf40683fafe22162ea2c6b87767c6517302cc12ed WHIRLPOOL ecf5dbfe222d5fa69f68a71daff35dbca8a583a4105d5e22256b6b76aaa5e9a7577a436caf48b53c356293fa502c44d32eebaf4f769b195b55cfcfc1895bb27a
+MISC ChangeLog-2015 951 SHA256 7b86a84ed7fb56835d855dcd687ac17eada7cfb961a9fc6a4149e31ea080f8e3 SHA512 435831bd2ba7b7e86c4d2c0ae79453d01cd521a94f892d9fc43e47ed0e054700e067b785b834e0783a8b1a10aef0c537d61b5bd44c35ee881218355947f81fd5 WHIRLPOOL da2baea2eb14f5ada8e98eca788478109a79d5106ac45b69f77afb332500c125c3ead5c79ee7ad78e442fccc7b94d43c8332e8b3cdd92586a277b8cfbbf9f1d9
+MISC metadata.xml 583 SHA256 a80ceabedb688736d667afd087d446f89a03efeb75045cebe01f8f5e2c8dc29e SHA512 e1fabb6bb89099468f692683e24d314afaed946913f76f62c22c951cd21c237c9f1353151329bc871634dc8b70c43b9efbc296f16b20b3a34d919deed57fe052 WHIRLPOOL fc87b12c5f95e78489b70bc16783f64efd6efce2c037842ff830870e61ade0b3d6795fcbd4ce8a7290b0f866bb0905120fc4170ceab86906a8f321994c1eba28
diff --git a/dev-python/Flask-KVSession/metadata.xml b/dev-python/Flask-KVSession/metadata.xml
new file mode 100644
index 000000000000..babcc32e8924
--- /dev/null
+++ b/dev-python/Flask-KVSession/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+    <description>Python team can take the package if they wish.</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Flask-KVSession</remote-id>
+    <remote-id type="github">mbr/flask-kvsession</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/GridDataFormats/GridDataFormats-0.2.2.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.2.2.ebuild
new file mode 100644
index 000000000000..55117dc51759
--- /dev/null
+++ b/dev-python/GridDataFormats/GridDataFormats-0.2.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Reading and writing of data on regular grids in Python"
+HOMEPAGE="https://pypi.python.org/pypi/GridDataFormats"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/numpy-1.0.3[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]"
diff --git a/dev-python/GridDataFormats/GridDataFormats-0.2.5.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.2.5.ebuild
new file mode 100644
index 000000000000..de2813acc0a1
--- /dev/null
+++ b/dev-python/GridDataFormats/GridDataFormats-0.2.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Reading and writing of data on regular grids in Python"
+HOMEPAGE="https://pypi.python.org/pypi/GridDataFormats https://github.com/MDAnalysis/GridDataFormats"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/numpy-1.0.3[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]"
diff --git a/dev-python/GridDataFormats/Manifest b/dev-python/GridDataFormats/Manifest
new file mode 100644
index 000000000000..04feb413450d
--- /dev/null
+++ b/dev-python/GridDataFormats/Manifest
@@ -0,0 +1,7 @@
+DIST GridDataFormats-0.2.2.tar.gz 42363 SHA256 8305897bb291b5cd4e6513e54225f149fab2f5ad13b3437dff77aa6d6c02a383 SHA512 671ed6da8a4447f90f6a95b8fdec53ba793134bbe0adac0b12d97b66ea7e36754a14b64a21926438e8c901d7e9171e56a82fab8d8989fa09fa6bae512bbac229 WHIRLPOOL 2a2bdb3267faed86264297bb5933af7b2d3308587341c905bc091d214dfa9d11bdce3b9efc7c13baae234a291d93374f38326bd8585c75c0de0fe8848414c17b
+DIST GridDataFormats-0.2.5.tar.gz 40725 SHA256 f13d8412433d625fa8dfb17152f3593ec5364f771d2157a387f1abda9d1eeefb SHA512 aa16f9046855417f9878b8f7d59fd7ec96025f7c4696c6025fad520f55a5684881966ba3e8a6189c746dcfb57ac969ed62acdcc38d758fe6bea1b20d45b8fa85 WHIRLPOOL a80f19025c01a76f937d636d4d18dad1604a6a60f7cac27aacec5d6d0f81cbd077d01e702dffeae2e8429746465c185def42380a967cc9c08c9049fb065e01f0
+EBUILD GridDataFormats-0.2.2.ebuild 563 SHA256 47db9a47cd0dc3add793bd3df49bd5941266fe0bc57704d4863320404e17ab83 SHA512 0dd03af69b174e69974e35b2d6c0f48570b4e8ae462cbae1ecf1d8e3feea02d10817ef9e10e61c981ea08420739b13230d2cf832f2f1bc6bcaf1d73aa9296e63 WHIRLPOOL 285b347d13d5f86a343312e3b2f2c958e9e0d2dcc6d78a33f2c86e6ef96b16ec59fc203dfb1a1d0a4f2a1284e006679347114b02b4bff3283599e0bb62a83972
+EBUILD GridDataFormats-0.2.5.ebuild 610 SHA256 8d3584ce99c0b759cf5a533d5adf6be5adb6b33c4541691d1782fb2c8f8bf57b SHA512 bd7b368492df031b90b5721588037e13397f0229a4335168bd62da4c15994a3b73dfab78db9fd4a05929c759e095c3d94b18498372c775f4074ef56b3a8196be WHIRLPOOL ac8d2dee4e99cef4fd83b4c14773a443db578ac8eb687029d50f1280f16015bd277e48c110256c859d868e8db475c48be0d43fb8941c3d0d4b67889be7144406
+MISC ChangeLog 2661 SHA256 c31040b04f231dbb6557c265595813045df6a62721f30ff19e19bd3d31a486b9 SHA512 32699f53461d3c031d2f07d6e960b16fa898eb235c107899864d2764b5ae6db0528a3a656de729b627feb0a11c8bbb5080a6ea6cbe9d937e12aa089748f583bb WHIRLPOOL f795b240d4a50a32a3e2ef0526a2ad8ce9453ffcd1999596d084e054185f552d2cd6df2bef9babed7911f7d556a92fcff7545a1244f14d3d343311ac62e0bb66
+MISC ChangeLog-2015 773 SHA256 712602d0792a9be4435ce783bbf689f60fc035fc56c8534b4d9075903824f6a6 SHA512 440ef17a5d7dc4314c7d19f0862bac4a1067b5f895b1d88bd429d4529ab51c214862423627dcc225e52af798f38be95e8075cd581c0895774d2f1a2910b201b5 WHIRLPOOL feefb715192be4d8bbd5fc8c10b10ba6877181d292ab6e3c19f58515116c1d9be0a83f1a10c9bd2ae2a234dbe59d497beabc2d0756f94544a08b3b21b8303951
+MISC metadata.xml 409 SHA256 604236e12da67ffb8dfab4bdf94287275f5c58963ee3fe81a4d5d59c315a429f SHA512 df3e3ac019c5e6c7f40fc2ff42f22d43c2b70c1a4af159e3c05fe828148cbb2d0d48223201a7a35526a5fdb9bb289bb851d61479dfa6d1bd56f0ff830b35ec6d WHIRLPOOL 8c055a964b1a353d34b9b85accac539b37a8beb25dd39a3cb2fb9d9f470b822538c4cd7ab4d5849ccfe7d9a4706bd35bd60ef23be892c1be03f028a9a405abe6
diff --git a/dev-python/GridDataFormats/metadata.xml b/dev-python/GridDataFormats/metadata.xml
new file mode 100644
index 000000000000..cc867877923b
--- /dev/null
+++ b/dev-python/GridDataFormats/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="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">GridDataFormats</remote-id>
+    <remote-id type="github">MDAnalysis/GridDataFormats</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/HeapDict/HeapDict-1.0.0.ebuild b/dev-python/HeapDict/HeapDict-1.0.0.ebuild
new file mode 100644
index 000000000000..bcc1e17ee916
--- /dev/null
+++ b/dev-python/HeapDict/HeapDict-1.0.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Heap with decrease-key and increase-key operations"
+HOMEPAGE="http://stutzbachenterprises.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/HeapDict/Manifest b/dev-python/HeapDict/Manifest
new file mode 100644
index 000000000000..646c5626eff4
--- /dev/null
+++ b/dev-python/HeapDict/Manifest
@@ -0,0 +1,3 @@
+DIST HeapDict-1.0.0.tar.gz 7713 SHA256 40c9e3680616cfdf942f77429a3a9e0a76f31ce965d62f4ffbe63a83a5ef1b5a SHA512 1210acd3a6f3e091132d8b87963ec46c81d3141e1788c2a127fe348a9052d73225036aeabffc6a2089c7811b8571a43477055b746df6b128a645123862076bb5 WHIRLPOOL ad5ea24622e8a78688ee6a7e4e0bca188fbccf477d521fc42b223319ca610fd7c255c0ad817e31e0c0ef429645e71bc650089bd16e45698a4df1d16b97613927
+EBUILD HeapDict-1.0.0.ebuild 484 SHA256 870652ad01ef35ebf3f8e0f6c39d876d988991244e247e1270c52a0d88f91b87 SHA512 e9d18962b815e64e9603b68c02b58077b3095583c645be7dbbd678e6a7b3bed2bf8643b963555adb0e01c35634ee980fb4b0c3930e36af1e3c657d43436f1381 WHIRLPOOL b0b698ce2b05c5a575feebfa6f9e6771232b2359d714b78592d0bf31dda17c6f3e65e5809a3c909c10dd6ddcbbc29b4d7485c5143e91c4ebd7fe7a68a18fdc79
+MISC metadata.xml 522 SHA256 1f5161966b6e74d5dcc4285864c8291ccfbc2c958619ca9a4a68a459d56ac9b6 SHA512 aca6d43cfb9d6eee3f47079bc26874f12e95f8efbdd4bdcf2685b65374b5a6500de2f12d065bdbce12b82496b931c3c00ff9ffb7aa1e040c11ea033e12304be8 WHIRLPOOL 1b8720370884ca89fea200d4803be47435f9a4c84975b14ed7ae852334c4b42f54c875fc8ba38f9511c902855969ef7ac07e3271cc9bc39d507aedf60b677372
diff --git a/dev-python/HeapDict/metadata.xml b/dev-python/HeapDict/metadata.xml
new file mode 100644
index 000000000000..a59ab0464cae
--- /dev/null
+++ b/dev-python/HeapDict/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+    heapdict implements the MutableMapping ABC, meaning it works pretty much like a regular Python dict.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">HeapDict</remote-id>
+    <remote-id type="github">dask/zict</remote-id>    
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ImageHash/ImageHash-3.4.ebuild b/dev-python/ImageHash/ImageHash-3.4.ebuild
new file mode 100644
index 000000000000..56f5b8037e90
--- /dev/null
+++ b/dev-python/ImageHash/ImageHash-3.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Image Hashing library"
+HOMEPAGE="https://github.com/JohannesBuchner/imagehash"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pywavelets[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/ImageHash/Manifest b/dev-python/ImageHash/Manifest
new file mode 100644
index 000000000000..c89dc4c8d2d2
--- /dev/null
+++ b/dev-python/ImageHash/Manifest
@@ -0,0 +1,3 @@
+DIST ImageHash-3.4.tar.gz 290881 SHA256 22d5afa8089cfd08807e8133c2f03c81272e959f1dc922a2dc924c612f419841 SHA512 a4ba260988d81135f073bfc9a1b1253a69e8736da61e09ac93f8403ca237bfe85c3f0b4791546af601d62a306dd3346ecccf8ebd00d5cd8f4c6ca717b9d89dba WHIRLPOOL 0f4d837197db6a2407c0901403cb8c0effffb167d2517be0a7264fbec108d6f70739c980c00a648fe94b471273d2c6d52bd4f4e371cf9392e7c1177467077a08
+EBUILD ImageHash-3.4.ebuild 681 SHA256 c2427af0ccf5e075c3c0a6720c35422c4e1d3aab620bac372d36b7f59486c97d SHA512 0212aae2cd9aa0c45bbcd0993acd4a90101a51f4392ef7f1cbc36bf99f98db11f069a6cd41dddcd5cf01e36eaa0cbf7caa3797ec07404cf22ab7feaa8f8a67a4 WHIRLPOOL 608585eacd0d0b481ebad34d33eaccce190b4ad886ba311cc3abed378d635ef3d39a9de13db92d7e14c22ec5ba270db51aa733562154eb1814f78e41cb5ac70e
+MISC metadata.xml 706 SHA256 226536fc73812ab3886142ee1df1956db1db43dd1bb1a572be338738d38638fc SHA512 289175e72c831818e13e1011c2a4908b6bb60ae5f2cdb91b81765f4386215283648694a7ef1f293dd91f11f9b5177156de9617cb081f1e31d42e6c1ff3f5ddf5 WHIRLPOOL c3901388cb9930fcbd6aeac26b1c4afbe07e2d75fb743e36baf341033d5f2edfd59a0df39f5249af99eaba72bbe11630ede535ba2eefe789f0d9519957bfd72d
diff --git a/dev-python/ImageHash/metadata.xml b/dev-python/ImageHash/metadata.xml
new file mode 100644
index 000000000000..5a0f60123ed1
--- /dev/null
+++ b/dev-python/ImageHash/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marbre@linux.sungazer.de</email>
+		<name>Marius Brehler</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+		A image hashing library written in Python. ImageHash supports:
+		average hashing (aHash)
+		perception hashing (pHash)
+		difference hashing (dHash)
+		wavelet hashing (wHash)
+.</longdescription>
+	<upstream>
+		<remote-id type="github">JohannesBuchner/imagehash</remote-id>
+		<remote-id type="pypi">ImageHash</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/Kivy/Kivy-1.10.0.ebuild b/dev-python/Kivy/Kivy-1.10.0.ebuild
new file mode 100644
index 000000000000..8e2cb32ef0b7
--- /dev/null
+++ b/dev-python/Kivy/Kivy-1.10.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications"
+HOMEPAGE="http://kivy.org/"
+SRC_URI="https://github.com/kivy/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo camera doc examples garden gstreamer +sdl spell test"
+
+RDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
+	camera? ( media-libs/opencv:0/2.4[$(python_gen_usedep 'python2_7')] )
+	garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
+	gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+	sdl? ( media-libs/libsdl2
+		media-libs/sdl2-ttf
+		media-libs/sdl2-image
+		media-libs/sdl2-mixer )
+	!sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )
+	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${P,,}"
+
+python_prepare_all() {
+# 	sed -e '/data_files=/d' -i "${S}/setup.py" || die
+# 	sed -e 's/PYTHON = python/PYTHON ?= python/' -i Makefile || die
+
+	export USE_SDL2=$(usex sdl 1 0)
+	export USE_GSTREAMER=$(usex gstreamer 1 0)
+	export KIVY_USE_SETUPTOOLS=1
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	esetup.py build_ext --inplace
+	esetup.py build
+}
+
+python_compile_all() {
+	use doc && emake html
+}
+
+python_test() {
+	emake test PYTHON="${PYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/build/html/. )
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/examples/${f}/"
+		doins "${S}/examples"/* "${S}/examples"/*/*
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/Kivy/Kivy-1.9.1-r1.ebuild b/dev-python/Kivy/Kivy-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..e21b01c75f51
--- /dev/null
+++ b/dev-python/Kivy/Kivy-1.9.1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications"
+HOMEPAGE="http://kivy.org/"
+SRC_URI="https://pypi.io/packages/source/${PN:0:1}/${PN}/${P,,}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo camera doc examples garden gstreamer +sdl spell test"
+
+RDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
+	camera? ( media-libs/opencv:0/2.4[$(python_gen_usedep 'python2_7')] )
+	garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
+	gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+	sdl? ( media-libs/libsdl2
+		media-libs/sdl2-ttf
+		media-libs/sdl2-image
+		media-libs/sdl2-mixer )
+	!sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )
+	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${P,,}"
+
+python_prepare_all() {
+	sed -e '/data_files=/d' -i "${S}/setup.py" || die
+	sed -e 's/PYTHON = python/PYTHON ?= python/' -i Makefile || die
+
+	export USE_SDL2=$(usex sdl 1 0)
+	export USE_GSTREAMER=$(usex gstreamer 1 0)
+	export KIVY_USE_SETUPTOOLS=1
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	esetup.py build_ext --inplace
+	esetup.py build
+}
+
+python_compile_all() {
+	use doc && emake html
+}
+
+python_test() {
+	emake test PYTHON="${PYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/build/html/. )
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/examples/${f}/"
+		doins "${S}/examples"/* "${S}/examples"/*/*
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/Kivy/Kivy-1.9.1.ebuild b/dev-python/Kivy/Kivy-1.9.1.ebuild
new file mode 100644
index 000000000000..e6bbc4a844ff
--- /dev/null
+++ b/dev-python/Kivy/Kivy-1.9.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications"
+HOMEPAGE="http://kivy.org/"
+SRC_URI="https://pypi.io/packages/source/${PN:0:1}/${PN}/${P,,}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="cairo camera doc examples garden gstreamer +sdl spell test"
+
+RDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
+	camera? ( media-libs/opencv:0/2.4[$(python_gen_usedep 'python2_7')] )
+	garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
+	gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+	sdl? ( media-libs/libsdl2
+		media-libs/sdl2-ttf
+		media-libs/sdl2-image
+		media-libs/sdl2-mixer )
+	!sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )
+	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${P,,}"
+
+python_prepare_all() {
+	sed -e '/data_files=/d' -i "${S}/setup.py" || die
+	sed -e 's/PYTHON = python/PYTHON ?= python/' -i Makefile || die
+
+	export USE_SDL2=$(usex sdl 1 0)
+	export USE_GSTREAMER=$(usex gstreamer 1 0)
+	export KIVY_USE_SETUPTOOLS=1
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	esetup.py build_ext --inplace
+	esetup.py build
+}
+
+python_compile_all() {
+	use doc && emake html
+}
+
+python_test() {
+	emake test PYTHON="${PYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/build/html/. )
+	use examples && EXAMPLES=( examples )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/Kivy/Manifest b/dev-python/Kivy/Manifest
new file mode 100644
index 000000000000..41c24fa7cbaa
--- /dev/null
+++ b/dev-python/Kivy/Manifest
@@ -0,0 +1,8 @@
+DIST Kivy-1.10.0.tar.gz 24266702 SHA256 ca925bf29dc9d2324f00ceb0727fafd7796c369e7dba2ae13c1c9001ae8ea7d4 SHA512 8049c92407e464558ecff913ff076c1b8f125b85a35b9eba64af49b35df545402ec2bac907ee545265a368b8cdbb33e02d74429dce13c53dd6feac735ace9cb4 WHIRLPOOL 6edb4d9d3cd83d5823268ecf2836e02b69be96e04d951a2b3b3f38abe2e4fab0fa1ae4804ccfc6673db7222f3d813e0cca35101cf7b1d091c2c5e060df42c83e
+DIST kivy-1.9.1.tar.gz 16363833 SHA256 29bc45be34c26a8acb1dafdd329145f997a473be344cd052659f821f6478637e SHA512 1ae3ff3979a89e41c0af6493b7523835c1d01ee36fcd524f15d329b8fa875c6ca9bd25db3a844597fbc5370ff86b55ce177d3e66cc169223b02eb114c88c9989 WHIRLPOOL f2eebf64f3abc2b63d307d8aadc87d0beb980e9bf5f85ff664e973b5c014ccb4f3fed58d24e2ca1e416e959ece1c094e34c0d75630003c89ab3a36237137042d
+EBUILD Kivy-1.10.0.ebuild 1886 SHA256 e908a1b5f96658bf28b927814eaa8dd38ab4537f7988acee5a4ccffe33c4a0bd SHA512 05e85109be9d060906c163135a1a03b1a3271d2501960509ea902df497f039664fe8c0700a7c5536631dac2ff29acd587944014b3dffd687999d39ce33a4e0c1 WHIRLPOOL 61b38a261a0d5875e9696a7a2cf1445ee94cc8f74314e7c882ebfa3aa46b0dbbbcf0e760c3ec0381d1b25a64fe1d38d0db69b0eaaf42545384d46ffe978ea71d
+EBUILD Kivy-1.9.1-r1.ebuild 1878 SHA256 36f283bbc227fb0c5aeea561d5a4bf199bcf38aee2e63ab87c5328eb47b861f3 SHA512 ec4a0bed0781244d0bc16730c7ceb7584a182a60b326dc1f8063963157089bf727bf2a5504f1c0bed2d265d3883c6a2d21d7f348cd9ccd05dd0195b11734fa11 WHIRLPOOL 113ade952ea6e53afd5386f8bb790d06457dbd01c65bd38d110d9580ae51ea83dd397cd4fc8f064da6368f3964e17998e03bae5f6fa32399d822cb4749684742
+EBUILD Kivy-1.9.1.ebuild 1794 SHA256 de33d0794bce1f23fb8e77ebd7084131b47e022406b11001e8ba79aa14f913ac SHA512 7d50f1e6cf0553c2cae357a2a50881961a94a061cfaae27b60f3d7ab159f306902a23fe26ee5fe193ffb2e045cb7e88273151a0a4aff4fb16a2c0f1e3ca139a8 WHIRLPOOL 990907f9420d7845e68320a5e5687624334cfffa1c89e3747ab552a9345701e3218f814e80a74827f29625dbcb2be5f55cee870df309d35741fd7e04a237d07c
+MISC ChangeLog 3956 SHA256 13b16cc0d095a40f47a1d0d2c6e300632a73f62a944b66283b77b4a0be255ec4 SHA512 bdff2b946e752a53d961e4a0f26ecdabdd11e46d2352133a13ff64984c216f303e668ca21bcfde5de5cc378d302966c581193d287fb54ae2e7705047dd20eb0a WHIRLPOOL ea54e4fe14554f554273b3d64d9c4ac0347002cdda1a5efb22a4de9071de3f2d7839563d5cb71b01a5b6c536c681105b078e8c7e43bce68b90975891248018b6
+MISC ChangeLog-2015 1748 SHA256 18ad642eb277579a92a03941faec55184cc7964f1c21bbec3a2d209bf8aed926 SHA512 3cc2451811083069746f0362cb5320090efa036253d0b1ab32ceeff8c89e1c06bf2c397b574784e2d6623d98a3c46c92ca90900e8ba6ad35b9010d3fb4b0efc4 WHIRLPOOL 414d312e5f476be78832073907d1345789ba368075ac16384e9462bf05c979ba6e55524cf9102df9850260a16f572670af776fc46bb068672c894b6bb28ee831
+MISC metadata.xml 490 SHA256 965113a44eb05de3110fdddc1ccb8d0847dd5dafc0d90aa2ee0b8ea5bec42344 SHA512 a29aa0e59c1d02423643bf9bcccca5860c981a81f45b2aec030355f566b9690b8e7e8f6339acfbb5c51436e9298b99d4b53b5e3bdb410fa4f030177f9abe2ccb WHIRLPOOL 4b46adc8bda344a0074f3fdab80e7b36febd3674d91a9de2407bcf3e2cd00c6e6f2b9a4a7dc8a8807d694f481b5d5e42b8cde9d171fd3c706ff417789f5b003c
diff --git a/dev-python/Kivy/metadata.xml b/dev-python/Kivy/metadata.xml
new file mode 100644
index 000000000000..c0c869933573
--- /dev/null
+++ b/dev-python/Kivy/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="camera">
+      Install libraries needed to support camera
+    </flag>
+    <flag name="garden">
+      Install garden tool to manage user maintained widgets
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">Kivy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/MechanicalSoup/Manifest b/dev-python/MechanicalSoup/Manifest
new file mode 100644
index 000000000000..966bd378ba5e
--- /dev/null
+++ b/dev-python/MechanicalSoup/Manifest
@@ -0,0 +1,3 @@
+DIST MechanicalSoup-0.6.0.zip 5286 SHA256 e2b950c11fc5414d246b3c82024272d7ba729ab1f90534fc65fc445a63b7434d SHA512 cc413723514f3beee1267c57c16f6de2c19eb1f64535a60b546d289c7c18d8c4ba752ea61ab0b4a2aead2b56b12639cd226cb32662622515cb40262b7e619c24 WHIRLPOOL 8a36b65b234cecdec5e334d04fce8fcf8b306c205ae7b4b9acb815dc40db63ab3f7e0fc64ac4862295bfe3939a1eeaa189065f6bd57e1a158e2f4e1e168cb6f8
+EBUILD MechanicalSoup-0.6.0.ebuild 754 SHA256 cb7338b32926fdaba9d0d8862320c60a43f898276397d7bdaf93cdf74ab19c94 SHA512 b16d3a2175db0044b95cd468d3448936304823be372f5f581089ac3767e880c425d3322b87ae662e359b53670e29956ee87a66a87a816516310818a8bb83b438 WHIRLPOOL 31f60522a958e68eb532e7f6924a261d6b682111b97da0ed202ea95a35ac57a533d750803b3e97ed26b46db8a973c2b8afae71538c51a2d67b1e5a8606827ca2
+MISC metadata.xml 404 SHA256 c73196bc29f51b1ce9265917a72a5013db51f3533175bcbfa599934738e7447a SHA512 0122189a9c3d583a036158886a7e6d744cfc72659e9b202e26548ca4065ddb24658c554460e9dbd2eb39bbbab805978410db68b6a862285db6f332bb1c6da867 WHIRLPOOL e8a43b40062a74b52e58594aa9efea6b47597b9032d00dc3821aa45dbb9c290fef6c8b99ac974a44e3e47aa9b35a4939970e1092b0f5e425dccc52b0fce85762
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild
new file mode 100644
index 000000000000..d1e1817b2c4f
--- /dev/null
+++ b/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/hickford/MechanicalSoup"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A python library for automating interaction with web sites"
+HOMEPAGE="https://pypi.python.org/pypi/MechanicalSoup"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/beautifulsoup-4.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/MechanicalSoup/metadata.xml b/dev-python/MechanicalSoup/metadata.xml
new file mode 100644
index 000000000000..4f81f0257d4e
--- /dev/null
+++ b/dev-python/MechanicalSoup/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">MechanicalSoup</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/Ming/Manifest b/dev-python/Ming/Manifest
new file mode 100644
index 000000000000..7c4dde80c563
--- /dev/null
+++ b/dev-python/Ming/Manifest
@@ -0,0 +1,4 @@
+DIST Ming-0.5.4.tar.gz 62412 SHA256 13536785354f5014d642f47cf5c5195a5dc262e3991c00bc7ea9da216b8a32e2 SHA512 93e280da04feaab2d7162a4b5d7da4b781d4a4140e114bc1512f695e1deee206397e5bff7ad3338eefd224e4646958e021353a323b809f45bbe7d56c43bf14c4 WHIRLPOOL fb3ac33e44a31f4fbd44d9809dae0283ce2041f950d6941a6300905e693a44ea3d96e60efdc206bb599bb55a11a791b72a8b6e3a6f9cabb76e0fdf9405507c7e
+EBUILD Ming-0.5.4.ebuild 856 SHA256 0c5267f4bc670b3d77cf0f7aab9201f9e275c802d50e43f35fa03be4b55859f1 SHA512 7d7b31421a8b1b1e3d3fbcba2a3a027d72d5fed2b6f07a0a7e160609c3112a1a86bdc56b7bc1032ea1e2449ba9c5d19d879a269bc6f0cfd897fad994a9bf2010 WHIRLPOOL 1dd367e9a663d207271d049d9330c6078cd73e9444168005ff673e2d5d22608c502619342c16e807eaea72b4cff44a09c5f4f5081fb5d44349241df0088d39fa
+MISC ChangeLog 271 SHA256 6d0e756bcd50e8f7e433b4a2e45a77627ad92f03d0c226cf3a04bd12c6ae1952 SHA512 a5825dd2bdd51fee90cb0f18c37e029fa86b24e39c32aa906f13b585aabe91d93d9ce10bb9bf543fc0aa4c38aeb9d95d849df0d34fe6742d8aa9a2f2c8918106 WHIRLPOOL d4357ae456ea4aae46825f3edbfffd19fcd4342c09fb057a90153adcd9654c94850d29db4a41c691607cfabf31b1d28dbd34c7ba701b3cd44d11f0362ba4c99e
+MISC metadata.xml 384 SHA256 1f70bd324dd2514764dd1dc3324f24231797412feda6bf091333138ba5d4b6f9 SHA512 bc9ffecb046f8e54b61eb2b7df7380c9286bf6212d55c4c655e3ad936267c5b79ea263a6a0f1ee413ac1d5ea41726949b56f3f435c95761e52953fdca8d9d1b9 WHIRLPOOL 6b403cad25ef6c25d713ba0598de54259f08c37ef3b87c6d07d459e1d104c7c4c0741bd6605666d4841688315ebbd15f10a517de77f7d713a20fe744721b2cfd
diff --git a/dev-python/Ming/Ming-0.5.4.ebuild b/dev-python/Ming/Ming-0.5.4.ebuild
new file mode 100644
index 000000000000..e0460d4c7c9f
--- /dev/null
+++ b/dev-python/Ming/Ming-0.5.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=(python2_7)
+inherit distutils-r1
+
+DESCRIPTION="Database mapping layer for MongoDB on Python"
+HOMEPAGE="http://merciless.sourceforge.net/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/mock-0.8.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/webob[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND=">=dev-python/formencode-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pymongo-2.4[${PYTHON_USEDEP}]
+	>=dev-python/pytz-1.6.1[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/Ming/metadata.xml b/dev-python/Ming/metadata.xml
new file mode 100644
index 000000000000..ebe3f844e640
--- /dev/null
+++ b/dev-python/Ming/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>wizardedit@gentoo.org</email>
+    <name>Austin English</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Ming</remote-id>
+    <remote-id type="sourceforge">merciless</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/Numdifftools/Manifest b/dev-python/Numdifftools/Manifest
new file mode 100644
index 000000000000..6e44d82b3d0f
--- /dev/null
+++ b/dev-python/Numdifftools/Manifest
@@ -0,0 +1,11 @@
+DIST numdifftools-0.9.12.zip 236823 SHA256 eee07f03eaa9531c34949bfbb27b0fade7b1e927dd9daf18342d13fc1ee88eaa SHA512 00c78abac0c08beb72ec11bcddd74165db773a0fa9b4eee10290a27c4c143f1593254e058898dc12aee1afc6bad5bb2849451e6018129aa32e808eee1b97420c WHIRLPOOL aef074b9aaf4caecfad8bff75ccb8bd95e36373e2dd4e1dfc4b700fa1925b9b8652d6c483f81133c82e857abae6f2628e9166c77d6b102db3f9bb58c72e682a7
+DIST numdifftools-0.9.13.zip 225820 SHA256 1aad0d9eba96846f5c3b82e6a8df0b1eaf4cd13e0b665cba64646756a0f2add6 SHA512 e16fe167cbcc7995e5f7b1784822b94bc82261821ebf35f8b9f774ef1fd601ef13a23a72670f28b54b5f288b509a9ffccbde09033bdec6a88e8a4ef78ed74b25 WHIRLPOOL f32e93f54a883a751f0efb987b81fc7f187c8b6e4c327de2166f4c30afb7f3cb1b076047036deced7b98b551cb9085483c2e22a08881a7730689a5bbbfae5926
+DIST numdifftools-0.9.14.zip 350053 SHA256 8b17629fa9877f19517014095b12d7145f8cd5d9568421e202d777c97d9f04e4 SHA512 a69c878a31fa96c0b3f65c486ac75359242b6215868f24f3554be9ca104ac477bc786df7046bc830120d8fabbc475de40ab3db77c21c0d54756ccec1829fd8ae WHIRLPOOL b890871115d2f4ab65450272a8ec14e36f3379a6cbb2783bb9257e94e5b627a1cc0fc90b1a801f3655eba7ef4ac76b9690ad2ca41a9cf2f9e5b1e8ce20c11625
+DIST numdifftools-0.9.17.zip 363422 SHA256 5583260d77fe58f719077bb15098e70aba344e4d88eb77c8103ec9587ae15a92 SHA512 acef3865861c76f0850b6f1c5ca5633f695603a7458c79569bbe887404c8490845d935693c57ea18468fe3cb7f864fe5481285f731dc933b6c0b521e3b888328 WHIRLPOOL 1431ae67c54e9f3adb2920f0cc50e85d7e9a03f0e60d73c629e4e04cf5c8509d66270b00a14fb903d5be65eb484399abb21b44220caf073d20e4397ee17a9897
+EBUILD Numdifftools-0.9.12.ebuild 1275 SHA256 5cc7d3ed4483e7257a181855e0d9728c35e69f100a5427d1fd838eec30b5e565 SHA512 cfe9c890567155c674e5764aff4e09cc0eb89c10405707c21e8e9c2fe33b49e92e68a17dd34151a6131baa18122d8280ca717396738bc16254cd64c33a3a502f WHIRLPOOL 438212cd174db2a8339cebc95a6062a4975a696d991c333f0b7195dc9ce0388fd3aa1d08ddff45a858a0415761715198ee9fdea3058f0300f64b25e4d1a0e6aa
+EBUILD Numdifftools-0.9.13.ebuild 1215 SHA256 044f6d7a2ea9b22c904cc7d0cd80b3c031bb5b23b009ffb60ec78763ec4f4c53 SHA512 e02f17a0326a418adac1d97ee90b7a3a1583495a80e33bdd3ddac0c699f1a5a3ab67f6acf0cdcd1a3fa5b13cd82853d00b8399a690ff22ac5d8e4f942a80c2f1 WHIRLPOOL 83a3ec414cfcbf7f03b53bbb04216aa3b1ac48d601560d3d9ab04f4516fe3f16269dbf883c21ee36d19cda11f47cc1649b1c6cc993c19fb971b648d1a45b6b17
+EBUILD Numdifftools-0.9.14.ebuild 1198 SHA256 217dcdb8b3e72886555e77e0d769493cc1d3b19e5ec69dcdd86bcd855e881173 SHA512 2bab69f36419fc2e38344c2bc71b805ab2b7c87d9c4565ee2b8d59b644600211bb2dc7cefac5960f37ac047493f2d0e84d503aeba0f13ffc6ff61234c28b240d WHIRLPOOL a154349b339d641573eef9545f783c5cdc589e3f1c44636561dd3d8f710b8ae2a82332b5aeff2bc84c4d1a5fe5f646880be59b371d9c28d7723af46330d606e2
+EBUILD Numdifftools-0.9.17.ebuild 1203 SHA256 43821f2008108c22870b0dc7b48fb8e35c7e56c5ebe129d46d258d193575c4b8 SHA512 5b9770d594c9d6048fda0db02911cee6f6017b9e694cc6019831a0feaac1f9247e8458a0ab6e0d9eb3c156445dc6fa925b796deb904c32792d7b3c6ed00275c1 WHIRLPOOL 98df7955b4df09e7d0899ef6010b20e7a061fc3902fddc34b3ed1476b4fdea80b4df02e11eb7fcfe8ade27fa64390e6e57cb8bac0e0031d1c2a2ddb8516da24d
+MISC ChangeLog 4506 SHA256 488a356205e852d04bf1671f32da0235eeb14eb045db3e545ca0e729f2a00942 SHA512 7edda838bc1152c5a25809e6ac355f4a4a4ba3479da6b6affac2d878b3c8cb9a4e8367ce8104cb115454850fdfef831bbdde7ffa7a1cb8e408d8cfd1771ec9fb WHIRLPOOL ec271e7b455fcf986775d2a97c8708621787f2b564ecd3d773765f2931f38ebd74e768b39ae70b2f4564a028db5c59a6dd8261d8a44efc12a1539bdc268bbb81
+MISC ChangeLog-2015 809 SHA256 fe54a7d1af7c7f1558dd10e084246955901a2991a316bfed5823d7e3c6266f82 SHA512 6c15b433b7963a1c64e9df2227759f51857b05f3b8ee14d19d074a4d1254ad454c34906eb662553b9978c4025d06645f3bdbbc8045b8d76d0b2bd4cdca91f6a7 WHIRLPOOL 31dff134555c3ee952db0e1f13bccd9eef15fa7699063a90fc699a881540494526463b8fbd0a067c605a7a9beb60c14b8374103dd23bfce655381e6e3bc6df24
+MISC metadata.xml 398 SHA256 4af47cc69fc535f9c1e0aeaef71728842c4be03417d1c8280a8410edbf9b87a0 SHA512 a56df8a9f061f0ee318e5ab2297caa7a3e8001e61dad2425c6d70104ceef999f12468fdc1e20d714aad33a56c980e1cff0677f815375ce7adbb639137016ab35 WHIRLPOOL accfcbe3ee35d24bf18a85795c0d6856754643ae8673f85c932c50ad30a0267cb0dec47edb97de674e89363561563a189b73fef7950d7a09e8b4ee5fdfb70e68
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild
new file mode 100644
index 000000000000..3a5ad48cc3c9
--- /dev/null
+++ b/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+MY_PN=numdifftools
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
+HOMEPAGE="https://pypi.python.org/pypi/Numdifftools https://github.com/pbrod/numdifftools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/algopy-0.4[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.8[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	>=dev-python/setuptools-0.9[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+# Seems to be broken
+# https://github.com/pbrod/numdifftools/issues/11
+# https://github.com/pbrod/numdifftools/issues/12
+RESTRICT="test"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	sed \
+		-e "/numpydoc/d" \
+		-i requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild
new file mode 100644
index 000000000000..f480b978ef85
--- /dev/null
+++ b/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+MY_PN=numdifftools
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
+HOMEPAGE="https://pypi.python.org/pypi/Numdifftools https://github.com/pbrod/numdifftools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/algopy-0.4[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.8[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	>=dev-python/setuptools-0.9[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/pyscaffold[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	sed \
+		-e "/numpydoc/d" \
+		-e "/wheel/d" \
+		-i requirements.txt *egg*/requires.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.14.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.14.ebuild
new file mode 100644
index 000000000000..3d10d2f32fc7
--- /dev/null
+++ b/dev-python/Numdifftools/Numdifftools-0.9.14.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+MY_PN=numdifftools
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
+HOMEPAGE="https://pypi.python.org/pypi/Numdifftools https://github.com/pbrod/numdifftools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/algopy-0.4[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.8[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	>=dev-python/setuptools-0.9[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/pyscaffold[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	# pulls coverage test
+	sed \
+		-e '/tests_require/d' \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.17.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.17.ebuild
new file mode 100644
index 000000000000..dd2afadc4eb7
--- /dev/null
+++ b/dev-python/Numdifftools/Numdifftools-0.9.17.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+MY_PN=numdifftools
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
+HOMEPAGE="https://pypi.python.org/pypi/Numdifftools https://github.com/pbrod/numdifftools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/algopy-0.4[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.8[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	>=dev-python/setuptools-0.9[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/pyscaffold[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	# pulls coverage test
+	sed \
+		-e '/tests_require/d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/Numdifftools/metadata.xml b/dev-python/Numdifftools/metadata.xml
new file mode 100644
index 000000000000..0f633d69c9fd
--- /dev/null
+++ b/dev-python/Numdifftools/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="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Numdifftools</remote-id>
+    <remote-id type="github">pbrod/numdifftools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/PyContracts/Manifest b/dev-python/PyContracts/Manifest
new file mode 100644
index 000000000000..de80a6893973
--- /dev/null
+++ b/dev-python/PyContracts/Manifest
@@ -0,0 +1,6 @@
+DIST PyContracts-1.7.15.tar.gz 89602 SHA256 24bf3ab5cfd61d0e296af82fb8b73ba875ea09733a8ca562f53016cf980dc469 SHA512 db52b0de04e28913068b072eb9bcd2913b121c65a975a2d5b27cb093f1c131aecb0c36360b4e1a34ec16890dc1055a4bd64f1a88e8f581b804d65536d878e717 WHIRLPOOL 268726b54025833e2667377de06d137bda671b777c29c35339ee6c71a8adc2cd8152c1dadd782a210fb89cc7529b84a80c7a3ffc39144462bc4949197226c6e1
+DIST PyContracts-1.7.9.tar.gz 61033 SHA256 0ebb8c434700d1a990bd4f53dbbf1caec297b3a783c9af26de052104fe4dac65 SHA512 1db6491d4be3df96753dcdd6f85329d47409a2424177a52d1e35f5a1d58f671290d22d807b70f632f0376c86c58c093118f7223b7ad59893a85dccdb91d29f50 WHIRLPOOL 520a0836e1f65e389e1c09f74e52ddf2ab42c315de25cda34cb31332de245309fd38649fd30a6ee737a6e3ec189d3241340747ed111e3b84b92325bc5d22a9cf
+EBUILD PyContracts-1.7.15.ebuild 1083 SHA256 e9d3dd12c52c800df62d90a3092296d495f5b7758a90a5bef6a2d47fab45c59d SHA512 078e6b88ac948424b846d3ed471ba4037158b3aa3602cefdc60a87869c22a9a12ef792f7f1737a1b459bc451c5b7b74d7853041d6e0e1082a88523400ca9cd05 WHIRLPOOL 701f7315b11d0909e8bd28efc68b0b3a86241758c14f6905559534fea0da94889bcac2934d26ac40a98ad8a7592f55387fc41715263c2c7ccbf5b813b3407b97
+EBUILD PyContracts-1.7.9.ebuild 1073 SHA256 ef45696b06695f42a94bd897854d6d94d0b10aadf280cf175e874fbc116587a8 SHA512 584c68b750dca3c839b5892b4d4324be67ee981f754c39d5cfdc3039a64793357c5ffd0f234a9f80867b1421f3c514f0a8d22d80cdfb66153b2148ad458a3d5a WHIRLPOOL 1fbf76d2177bba5d8cd9b71482d5954f662b99e0b47e5d7c38c89b103922065f9eeb61070b05b1fce6b38f804c968c901aa8284b5325fa23c8e146637aa62c9e
+MISC ChangeLog 2414 SHA256 5e057ba69281bc43563cfa8d734cda03cb071c4070742240e500618db558719c SHA512 c27211c3a89c58f47e08fe44c8dfb6e0e70ddd0efc6e6e113d7f63c20b59aec461e562954b32d90c9812900901319bd1a1cd38fdf2a537b5830f070593a7fb84 WHIRLPOOL cb30442b85ed135271dadb03de5c01eb4e3dcb5bcdbac512fcc93fc5ef29c2dcfb2b9dba0cfc2a39b1ef0eee71e6d24f756478780a77d84d6278e6a8f95030b7
+MISC metadata.xml 387 SHA256 d5775bde1c0fa22ab71de408668c6681ef3802c0e9e6492fdf30a4493048bd6c SHA512 b4c9caf597b04617af6bc61357be01e6687ba5b45258dc2f76bf02e3dbc126afe2f44e1298bf62ef502110a56cf6f0932fbe7b1a043a99a61a4d56a87ca17b27 WHIRLPOOL c347cb4681452ec863ac6aa5670ba9d61d9c42fca0b9e918d905e06e36f97cb9c1f026b46bcdb589d88504cc5c0aaf149ba606e1566f4b2feb59c54572e7847a
diff --git a/dev-python/PyContracts/PyContracts-1.7.15.ebuild b/dev-python/PyContracts/PyContracts-1.7.15.ebuild
new file mode 100644
index 000000000000..d3cb547abe47
--- /dev/null
+++ b/dev-python/PyContracts/PyContracts-1.7.15.ebuild
@@ -0,0 +1,36 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Declare constraints on function parameters and return values"
+HOMEPAGE="http://andreacensi.github.com/contracts/ https://pypi.python.org/pypi/PyContracts/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+# Upstream allows tests to fail
+RESTRICT=test
+
+python_test() {
+	nosetests \
+		$(python_is_python3 || echo "--ignore-files=test_py3k_annotations.py") \
+		|| die
+}
diff --git a/dev-python/PyContracts/PyContracts-1.7.9.ebuild b/dev-python/PyContracts/PyContracts-1.7.9.ebuild
new file mode 100644
index 000000000000..676c1d51fcb3
--- /dev/null
+++ b/dev-python/PyContracts/PyContracts-1.7.9.ebuild
@@ -0,0 +1,36 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Declare constraints on function parameters and return values"
+HOMEPAGE="http://andreacensi.github.com/contracts/ https://pypi.python.org/pypi/PyContracts/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+# Upstream allows tests to fail
+RESTRICT=test
+
+python_test() {
+	nosetests \
+		$(python_is_python3 || echo "--ignore-files=test_py3k_annotations.py") \
+		|| die
+}
diff --git a/dev-python/PyContracts/metadata.xml b/dev-python/PyContracts/metadata.xml
new file mode 100644
index 000000000000..cdd65e542f71
--- /dev/null
+++ b/dev-python/PyContracts/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">PyContracts</remote-id>
+    <remote-id type="github">AndreaCensi/contracts</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/PyDbLite/Manifest b/dev-python/PyDbLite/Manifest
new file mode 100644
index 000000000000..18845c709d0d
--- /dev/null
+++ b/dev-python/PyDbLite/Manifest
@@ -0,0 +1,4 @@
+DIST PyDbLite-3.0.4.tar.gz 510241 SHA256 79ed97d17b5954c6fa8927d9f36033cb4486d1304005057d506ac1dee999bad6 SHA512 7708d6cf391f18dbc644cfe6af34868d2eb59aae47ffb67cdb77d468d605b14c0dccfb159229035984d0dd9dbaa5ce706068ed23a09a5ece2f58565afdfad69f WHIRLPOOL efae1719fcde5dd6630f68d82b5d1216d4d8f2c3da2e891bd5166f371ea77c3a58145d4c8002cdc3c92e7f78db9bdd2f57e6cb9243d56a18e32c88f155312c46
+EBUILD PyDbLite-3.0.4.ebuild 437 SHA256 bab0a6452e0b75383194fad8425abb483bd5ffec8178cc7fa03e0c8ad084b890 SHA512 d3dcd70fd3a7b61e004ea2e5e8206d3e21d89f0257ca060e85aabb22f3df961dcb704283d458baf93bf822233fe1a271c2bffb8219be02063cefe1dacb5e0009 WHIRLPOOL 0d1589b7de71b3fe4b28c78da18916fbccdb7553f0d20878827122bf2a358858142f4ca4c01318af41192b34bb33aac50968c0b38d2083130ad630dc9b6c57eb
+MISC ChangeLog 426 SHA256 173250bcef29ba0305f14e2df33cdbab0397d5bc80a6c0793cc98cb17cd64d27 SHA512 df006dedbd644d5933651ead298659b517fb52e15c6a93213334d18f4ad91714c728b475eedbce757d2c0360e30a9cc70cca980193c3f139876ee84e69405e2f WHIRLPOOL 5a65f2fa065ee944fdf758d58080378e97ab599304b56e73e94b29d192b951a3657f437844a2a3e418a31696957a485e71746d353719231c9fd8fd92d292eea9
+MISC metadata.xml 332 SHA256 4b46f30a010a815d1e1fc45c8e9874114ebf2ecefd80c414bfcc668da124cb0c SHA512 a1ccefa4e703e7b041015712807ef972394a8c75d0efa8aa8609ac280356a74787daa693fd92124d076c889aedc6bec08b62d64391a470c9a9f803631191ae0a WHIRLPOOL 1220efc40801ef399edc581d17cfa3ca64ef452f7ad68e40ff4ad94600aabfb1d7659d162d205738a505f26b038c4ee7203d3346e3ebacbb7b06d70e1a2d3ea5
diff --git a/dev-python/PyDbLite/PyDbLite-3.0.4.ebuild b/dev-python/PyDbLite/PyDbLite-3.0.4.ebuild
new file mode 100644
index 000000000000..a55e711c0401
--- /dev/null
+++ b/dev-python/PyDbLite/PyDbLite-3.0.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3)
+
+inherit distutils-r1
+
+DESCRIPTION="A fast, pure-Python in-memory database"
+HOMEPAGE="https://pypi.python.org/pypi/PyDbLite"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/PyDbLite/metadata.xml b/dev-python/PyDbLite/metadata.xml
new file mode 100644
index 000000000000..cec6d63f5886
--- /dev/null
+++ b/dev-python/PyDbLite/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>klausman@gentoo.org</email>
+    <name>Tobias Klausmann</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">PyDbLite</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/PyECLib/Manifest b/dev-python/PyECLib/Manifest
new file mode 100644
index 000000000000..9474b0225701
--- /dev/null
+++ b/dev-python/PyECLib/Manifest
@@ -0,0 +1,7 @@
+DIST pyeclib-1.4.0.tar.gz 6682441 SHA256 f5c49956eaef84ff8fe76378d215a21e6f46fdbea4872facc0c97e503f8b5d2c SHA512 849da9ad32e26ca4e923bc00482734d6431bdcf402eff6b0c5ead4264c7be9e8502eb0bea6e60fa8565d361d9d7d81e01e38fd3c85c4e87c4d6b8b30be328e0c WHIRLPOOL 93333c44e1cb630c27975d29e4913025dcd802eacba7eec38c7015e4dff48353564b07d2134e660b66f59fec88d0ae4ba57923306938aac838d572e0a95467ba
+DIST pyeclib-1.5.0.tar.gz 6682493 SHA256 a201f2d3d4b925e1e54443cb251432809a59eeae50e9b85693ca0047c8ec9023 SHA512 89831fc8b04a1488504b632f75da8f2f29bc6b4e33b35d0d4305b4d5ec4bc25c0e16d149580badb15be7dbf8aeb2bdebef81f78f7b7871233afaaf96823e3a3e WHIRLPOOL 0cbddec5f949e9c7ca97c97edbb4dbe2210fbc4b0f282e2632a95c20d84fbe99b42eeaed10d07853af2e0ea585a450bcf6ef60c56f6fa8224b56c8ff4b3370a2
+EBUILD PyECLib-1.4.0.ebuild 604 SHA256 3120fea369a2d546f60a7c7c0fd24039f7c106d34a3ef04f0d96f3894ef19215 SHA512 ee5df1fa0a999108b737c1c0e9a247d049ac0eb1783e316f4d97d28321989eee86b2908db8e93207fda8b4dffe7736828d593627eeb8bf01ee725549889d9159 WHIRLPOOL 0c65ab6e998b1af2860a35062377ce2e9b8066bbaccb2995ccced456ede341a84d4ea271a1e8713adda21e73459e064954291d307e4fa66f0fe637a07ed22dae
+EBUILD PyECLib-1.5.0.ebuild 604 SHA256 3120fea369a2d546f60a7c7c0fd24039f7c106d34a3ef04f0d96f3894ef19215 SHA512 ee5df1fa0a999108b737c1c0e9a247d049ac0eb1783e316f4d97d28321989eee86b2908db8e93207fda8b4dffe7736828d593627eeb8bf01ee725549889d9159 WHIRLPOOL 0c65ab6e998b1af2860a35062377ce2e9b8066bbaccb2995ccced456ede341a84d4ea271a1e8713adda21e73459e064954291d307e4fa66f0fe637a07ed22dae
+MISC ChangeLog 4410 SHA256 b57075f9f0b2461eb2ce6d94ac4a5ced2da1dda5cb0f66a86871ca9128790040 SHA512 570e5e11d573c1c3b5d2869bc57b131f55e5c26fbda84eb159fcb6c2d6dcf14f8a47449789359d2e8f0038d568eb9d7a9f2e7d15e96ca2859c15e92c08168cbf WHIRLPOOL 711649f0ab7dd7430d53fd0debd90da6a88949a2949453298f68ddc00b2cb8a2e16d2a1f55c1dbaf90bb50b0506072274c43b84c7ca83b474821b2e4eebbb5aa
+MISC ChangeLog-2015 827 SHA256 049e4c758c2e2fa664b6d4e1048a72ceeda6ce710ab4543bbbe0b58e8e60c372 SHA512 17a19766991d995d1358c625b12d3980402e44b7134aa3bcd9f56509c3f5027df6584d5ed12dbc7c361a7d83e5a7eb5a1bfe56d30701e55f519254c1577f6eb0 WHIRLPOOL 1af451c51f48f445453eb90eb0fa7b7bee1ce26fa14b25a24e439365bc62f4943032afbadf8f178d3dcda3601ac1239f2146e97342fb4e4796d4876b1d0eefef
+MISC metadata.xml 674 SHA256 2b12773f78e6ba011129bc6c46022ca5db266414f9292ecce834334efa858c58 SHA512 864d9c85e024752e0060644f9feca3b0d81c6f64610ca60be06c3218e1efc82be66b24bb61b966de238ab6e9278618013f613693fa1fca082287d4f53b4f98e5 WHIRLPOOL eb19a77d21e3e77bdc42d44b1bd834d7362ccc205c1678512215aa49c49fe546622a1a50fd7538460f83c442fc650b94889cc159ff45bce966a41c2037c70ec4
diff --git a/dev-python/PyECLib/PyECLib-1.4.0.ebuild b/dev-python/PyECLib/PyECLib-1.4.0.ebuild
new file mode 100644
index 000000000000..7d57a5c8f14a
--- /dev/null
+++ b/dev-python/PyECLib/PyECLib-1.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils multilib
+
+DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
+HOMEPAGE="https://pypi.python.org/pypi/PyECLib"
+SRC_URI="mirror://pypi/p/pyeclib/pyeclib-${PV}.tar.gz"
+S="${WORKDIR}/pyeclib-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND="dev-libs/jerasure"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="dev-libs/liberasurecode
+	${CDEPEND}"
diff --git a/dev-python/PyECLib/PyECLib-1.5.0.ebuild b/dev-python/PyECLib/PyECLib-1.5.0.ebuild
new file mode 100644
index 000000000000..7d57a5c8f14a
--- /dev/null
+++ b/dev-python/PyECLib/PyECLib-1.5.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils multilib
+
+DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
+HOMEPAGE="https://pypi.python.org/pypi/PyECLib"
+SRC_URI="mirror://pypi/p/pyeclib/pyeclib-${PV}.tar.gz"
+S="${WORKDIR}/pyeclib-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND="dev-libs/jerasure"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="dev-libs/liberasurecode
+	${CDEPEND}"
diff --git a/dev-python/PyECLib/metadata.xml b/dev-python/PyECLib/metadata.xml
new file mode 100644
index 000000000000..661e1e310a9f
--- /dev/null
+++ b/dev-python/PyECLib/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    This library provides a simple Python interface for implementing erasure codes. To obtain the best possible performance, the underlying erasure code algorithms are written in C.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">PyECLib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/PyFoam/Manifest b/dev-python/PyFoam/Manifest
new file mode 100644
index 000000000000..1e213df3c6cc
--- /dev/null
+++ b/dev-python/PyFoam/Manifest
@@ -0,0 +1,5 @@
+DIST PyFoam-0.5.4.tar.gz 4492783 SHA256 c6bab9d1772a86a704c732e938419be453430e15447b6be676ddb4fa3d1157dc SHA512 97ba7f8a10e6d408f4fd4bff0e28ccda36ffced6c6c945d1c20737a1251e61331b9fdd3c4e60b5fd95a4d80bb9816cd384b72d1f39fda8da32c4cbd776dec642 WHIRLPOOL 037c009dfba7d0616bd745d60941ee92e7f24feaad5273dcb54e6619a1bc7e22969f5fb9cde81325c1fb783dbdd17e231337fc58a94125aa91c1e7e492740c85
+EBUILD PyFoam-0.5.4-r2.ebuild 731 SHA256 e86c85de25fdcba0c103b72c4111990b555614802cc2f7a43eab8c06f029ebaf SHA512 34d30128728866d7146daa86b917794bba451fe85a6c9d8df44452839d0a9c47d656275dfe4346f2e67742c35d58eb7fb6834efb60e235909d86265fed5cb8bb WHIRLPOOL 61db00937aa8efa69f5a938c7d31dff6b9e9702bfea7bd86f42b187015804e8d9ff479b95c44428c1ac608d399da4a760cf845610f4b31322f2a9e4ff8394e14
+MISC ChangeLog 2825 SHA256 4c3950f8f4e8c9d5d77253a91eddae1ac6ee44f7b0e39d882cb551e0c34be983 SHA512 5bdf15dcee45f99eadddf3d9a85993d9cebe533034ab7ef4c9a6a4310c89d33225d5e7cf07fa49d85d4b6d85573aa68c7320cd5489088db83d1a07e6a7f5f806 WHIRLPOOL b46e46d731600ebb87711156937ada937152935e90dce2ed730f8979e549035915f49fbb9fa807f93174cea8fed08dd8285d6e55aeea2ed578366e355d5016df
+MISC ChangeLog-2015 2621 SHA256 f961621d0bcd01fe6956c6496879dab383eb50e36c53cfafbbe644434c2e18c0 SHA512 3c62929f3f3bbc6f49890bf240e75a78b75be6293dbdd4e2d83abd2b438f990f829feec2a9444de5fc8a09e83c69b09bbd4b6ab1610717afdbca99cf2c0276e2 WHIRLPOOL 1ad2ddc167795191141fdf767d7093b0894a4e4834035743a0f3c588e02a3ea115784ef2187da83f8f6254168e0daf89012af9d95d4aee465c2257c45a1b29df
+MISC metadata.xml 651 SHA256 3f4a8a78b13397e284ca544771f70ffc0f4781d69a543cb607821087c48a4d30 SHA512 6acb0ce4bb58a8e642c9cd2934249dd06ef43e6485c24a09535e40e3fc225a6ad20c0487603c2cb99c39117ac3d7eeebce0d20f55ab896ec69c895f11262879f WHIRLPOOL 3476b907c8b71f3f75aa94d1676e470083a37d242e920a459f84162e458a625ef22117b04b6703bad549a14384995dad00a64b1e55938e97d75f386c6007fbc7
diff --git a/dev-python/PyFoam/PyFoam-0.5.4-r2.ebuild b/dev-python/PyFoam/PyFoam-0.5.4-r2.ebuild
new file mode 100644
index 000000000000..7b864da0de4c
--- /dev/null
+++ b/dev-python/PyFoam/PyFoam-0.5.4-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Tool to analyze and plot the residual files of OpenFOAM computations"
+HOMEPAGE="http://openfoamwiki.net/index.php/Contrib_PyFoam"
+SRC_URI="http://openfoamwiki.net/images/a/ae/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="extras"
+
+DEPEND="sci-visualization/gnuplot
+	|| ( sci-libs/openfoam sci-libs/openfoam-bin )
+	extras? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/ply[${PYTHON_USEDEP}]
+		dev-python/PyQt4[${PYTHON_USEDEP}]
+		sci-libs/vtk[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="${DEPEND}"
diff --git a/dev-python/PyFoam/metadata.xml b/dev-python/PyFoam/metadata.xml
new file mode 100644
index 000000000000..57b50152d7d9
--- /dev/null
+++ b/dev-python/PyFoam/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>oli.borm@web.de</email>
+		<name>Oliver Borm</name>
+	</maintainer>
+	<maintainer type="project">
+  		<email>python@gentoo.org</email>
+  		<name>Python</name>
+	</maintainer>
+	<maintainer type="project">
+  		<email>proxy-maint@gentoo.org</email>
+  		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+  		<flag name="extras">Enable optional dependencies</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
new file mode 100644
index 000000000000..3d0eca4887a3
--- /dev/null
+++ b/dev-python/PyGithub/Manifest
@@ -0,0 +1,7 @@
+DIST PyGithub-1.28.tar.gz 2662625 SHA256 44feab87eefcdf311fe4ad9c356c279b56ba0fc4dd90baeaec1a52e9875cad76 SHA512 e1d9f6f473d757074220f4ec6a96f0e0a6de89af6436b8f0ab30ed22eb24b0955f0b64e6b25eae36bfe19bce580677552aedc82a7749520c5b1baac03428db7d WHIRLPOOL 6a17617816b90120b358b0181ea5743f5380367cc4b725452bf281d2f313d2bac67edff0e50178afff2a87f312befdc1809ee7494d51299d02d694f8b2ded110
+DIST PyGithub-1.35.tar.gz 2677633 SHA256 cbcddf4584c264d7b09f4e308d13f9729fa065d963adc0d3eebf0f51e0ec9908 SHA512 d852f459e5514310ac7bbb3cd9742a7269f9ea5c3e0fdfb0f385616fa31d35b72b19f63b650c60241c5e2f29860ddc35caa907a623c661bc77a29dfe4da3613b WHIRLPOOL 53acbcb05437f59a616b4450a46ee35cf66a474a852008317751769f1979de81e949fe0d2f8fbe27e7c038fdb05b2871b753c4945e883c7a101fc7500dea2a07
+EBUILD PyGithub-1.28.ebuild 548 SHA256 15f558768863e4a35155f49799637e97a06bdb6eceb5ea3d02be2521235f3d03 SHA512 0e84d2ed8b517e48113443ba17054558eec90509e124de6d400c7ecdd047dcbdc1626da257d63cd31249ed7a24be7bfc71746594bb175cd6111c48b7107d83cc WHIRLPOOL e84746946fb060254bf67212d76f60e083bd5784b51fa4b91e3106b230a3775e993ec790cef7f9fd9d374207fd7a0592b1aee277969e76b299f0551782f3abcb
+EBUILD PyGithub-1.35.ebuild 600 SHA256 debb543b11361cd4eafa1a3559ac7c563e5154ad77ae22b2ce8ac6499632355d SHA512 2741d9e431c6271acf3aba3e7c8d1d878e7bbd3fa388e60d2bb0b40edf20ae3ff0f3fa5c5186eaa7bd9ed9142f8d97c661782870dd6734fb12c7abc5f3d2cbc6 WHIRLPOOL 451248c061911ec09b6d5a0fa49241c259fb24a5585677fcf50112df8e4769f08a671050f1ae4a2e99f79f97af2793cc88e707aa8cc9141c32b678808e3f90f0
+MISC ChangeLog 3118 SHA256 948a8874468573609b34a452a542e05a24305e07c0d6f5fe951ae25144166e19 SHA512 af4f7a4fc73d3158e9d4c021460807b62e6120ad81601c8ea4dd246c8e7bfe78d01cd90fc952a8d87bc02037751169ed85e90c8c188388cf96bd3b498e9b1054 WHIRLPOOL cc3cc5e17164fe7625c8c24e67e62611898d3f069c67ea860b15947ab9d292a641eed411e4b615ce2df40a427d057043e8095f07f444e0b096b74a28f2b8d707
+MISC ChangeLog-2015 4113 SHA256 b3be217b4c914af568a45cc56e41f1a72e385a4c3df05de30f362e5a0b7c66f6 SHA512 b61f37687d16d7846002e64fb21325662dd143eb268bcf825e96d78fc728bac30912d484e39c44e65f62ecc52191f632a4e2d67f471f699347d7dd650f58eb3a WHIRLPOOL 2cf30352aa6f8ef018fcdb7b51f086e4e63820f2a54128f46765f9d5bd235fd30e4479ca6d33ef7649271e0fd5551ce140850676bbc0b4c6056de8aa5d120727
+MISC metadata.xml 332 SHA256 e819f4fa273db8ce2e67581ab57dba1cbfac0c26aceb841d3a770045c46a95d3 SHA512 d83bdb94f8dd9715f1ed517ed5e24d3e4751e26a565ff191971a3f3d553b12a5851806301d45213481d1c6c8fa26ac76db0b3676c37b4e0f871044deb1adbd0b WHIRLPOOL d1f17269af561f104441eda09d7080de62dbe49306512d7a029e854d6de7e201460c31269adb16c2262d4e579e65812ddd042fdcd9f3134066d53d37cbeab97b
diff --git a/dev-python/PyGithub/PyGithub-1.28.ebuild b/dev-python/PyGithub/PyGithub-1.28.ebuild
new file mode 100644
index 000000000000..bd692f441262
--- /dev/null
+++ b/dev-python/PyGithub/PyGithub-1.28.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to access the Github API v3"
+HOMEPAGE="https://github.com/jacquev6/PyGithub/"
+# Use github since pypi is missing test data
+SRC_URI="https://github.com/jacquev6/PyGithub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/PyGithub/PyGithub-1.35.ebuild b/dev-python/PyGithub/PyGithub-1.35.ebuild
new file mode 100644
index 000000000000..f7c3a670c22c
--- /dev/null
+++ b/dev-python/PyGithub/PyGithub-1.35.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to access the Github API v3"
+HOMEPAGE="https://github.com/PyGithub/PyGithub/"
+# Use github since pypi is missing test data
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/pyjwt[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/PyGithub/metadata.xml b/dev-python/PyGithub/metadata.xml
new file mode 100644
index 000000000000..4b210b57b573
--- /dev/null
+++ b/dev-python/PyGithub/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">PyGithub/PyGithub</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
new file mode 100644
index 000000000000..ed64daffa56d
--- /dev/null
+++ b/dev-python/PyPDF2/Manifest
@@ -0,0 +1,8 @@
+AUX PyPDF2-1.26.0-py3-tests.patch 1452 SHA256 0f3fd81e8353d24f27465a8aaca3b60bf5de8d5c4c4c3aa277757134640d4fd7 SHA512 434d1cb0fb934149054d16521ca414291cbb83618de1468a2a9e630e75fddad4c33c3ba254ae00315b2075faad333b9b027625adda3a0cf064df3366989ea399 WHIRLPOOL 11010a5c750f85e62b5eb912017f2476ac4f110a8f78d2b59ee013d0d4acd26802bd777fb7115a28fea8894ffec06f967d6098c24027f9a8469e299118385924
+DIST PyPDF2-1.24.tar.gz 59891 SHA256 aca40d5155524120fceaf2eb4ae054480b8a2b6ffcfa0a2e77e3e45666428c64 SHA512 91a9338b0338eee1cfddc25dd0f21494f73696e630b08a71ff9195fe7b0fc77cf6c07b38a0c6aa4856536be6fe0a474c3b292c13fdd0187b62cb8848e69b29f9 WHIRLPOOL b5d33c209d5e0ce7d2d567d9266faacbbc6c1e49ac714e0063eeeb3879f400482a3fa887bd165b364a7216b4240b5236dec1954683ade632ea802a36a5272303
+DIST PyPDF2-1.26.0.tar.gz 77556 SHA256 e28f902f2f0a1603ea95ebe21dff311ef09be3d0f0ef29a3e44a932729564385 SHA512 7b427f1d099dcd687a718fb8d86e6f677ad45257414c6367e4dfacd8dfef7e3dbe3816027359868764981f36a30721f1731b4c23cbe2f35cfab1c64fb290b034 WHIRLPOOL 0f96818874f77bfef9d60e3bb84a648ec5366911fbb365d2e9ce965ef7321df845a85fede714e14dcb73e87d85bdc72af38ce40c2ed3ae096bd9daf07a7204b2
+EBUILD PyPDF2-1.24.ebuild 530 SHA256 cb2bbfdc2b0dad6de840edcae310e52998cfbf70c5d13e296c15062a68413f79 SHA512 7cbc92890486dc3c906f0ef41f525ffa9a53eacae98fddbafd8f3d17d3893bc0179dd0ef1dcedfb60678aa20de90c41e5ec0e53c0fa8bd8d12aba3c78863a7b5 WHIRLPOOL ba630ea4d5496bfa38580475c231db90bd2625a0b68d539088e49ad482807af29eb8f249341e2a171573a1044db8eb4e2a3d32fc532752ab42ec4e7408434175
+EBUILD PyPDF2-1.26.0.ebuild 750 SHA256 0cccb0631546a15c482d4f821fb527519aafaed1c02b8b038ebdf0f3c2c1feb4 SHA512 5cad2921a1cf55c56d3efaf02e9e6531aab4c62ef0ae4ecdb4e83a92301a72882a51aafe1799df307fbb12f7e3b3e9ad597e49bcad2add608c6ce335bcedf572 WHIRLPOOL 8abda7cce54e4b4113d20d1d22bb48286dbf81a15488a4b999e0184e0b31af3f29c255caa13e4ccdebeadfa5b2a42c5985cf0f9d20e24f9dc38a986bfa85cae0
+MISC ChangeLog 3739 SHA256 4f60018a7edc526e0711f8e766a9c47f19924f0b52d7f5d71697c0aeedd212c1 SHA512 543188dacd9dedb1514d4d61ae87a2e89fd777c9801017aaf92da65f2f0308773b66d3627bf93d46309bd168b3b9634e161bb734b862fbfa0d9323776d115181 WHIRLPOOL 48b48db6aafb343e25f2fe88876edda2c84ddfad4b40c2b2db53cd3a6ac289c06a734d7b2bf8888399e7c29a13644088a8aebfc342b134332f2dc715f3eb7bf3
+MISC ChangeLog-2015 893 SHA256 abf37acddf61c2bce90aaf24f15d9ef77b7661c590d1d6c9b5b38f12c1287ef8 SHA512 adbe760a519c675d59716ea91530a191f325c6a2fb251a545da03142f2a502b2bf9f05f764e9fd11c950636f69e480419c532ed2b3cfffdb9e55291612a5a949 WHIRLPOOL 3aff6f09178eb58194a2e08063b46a1cd4e560f7059b4f12260e62dec6eef4122462b4714fd509b31512444b9c577f1571ec3d8f2c52cb6ec64340c9a958752d
+MISC metadata.xml 375 SHA256 58f6dbefe2ab40ebf233a8ef60f81403bff0d6727c8c01e083d1cf7577353359 SHA512 9da6355a60e212e6e5ee3ac1c5cd1c357b243ab3131b2f6d261a4039c6cbc67c1e375be8685c900c533a0273b017b6d4428c7521539b917a2c380f9435b3cefa WHIRLPOOL a46741f32910e9fb4d63648af45c2937d51d396c5afd917a507e02d3b31899adf9b02a8bdae54063230afad736f551df04e2d48ad8e79849ff4c3bd2ce6f86ee
diff --git a/dev-python/PyPDF2/PyPDF2-1.24.ebuild b/dev-python/PyPDF2/PyPDF2-1.24.ebuild
new file mode 100644
index 000000000000..598db4a46387
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-1.24.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to work with pdf files"
+HOMEPAGE="https://pypi.python.org/pypi/${PN}/ https://mstamy2.github.com/PyPDF2"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples"
+
+python_install_all() {
+	use examples && local EXAMPLES=( Sample_Code/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/PyPDF2/PyPDF2-1.26.0.ebuild b/dev-python/PyPDF2/PyPDF2-1.26.0.ebuild
new file mode 100644
index 000000000000..00942735a066
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-1.26.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to work with pdf files"
+HOMEPAGE="https://pypi.python.org/pypi/${PN}/ https://github.com/mstamy2/PyPDF2"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples"
+
+PATCHES=( "${FILESDIR}/${P}-py3-tests.patch" )
+
+python_test() {
+	"${EPYTHON}" -m unittest Tests.tests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r Sample_Code/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/PyPDF2/files/PyPDF2-1.26.0-py3-tests.patch b/dev-python/PyPDF2/files/PyPDF2-1.26.0-py3-tests.patch
new file mode 100644
index 000000000000..c74491b964a3
--- /dev/null
+++ b/dev-python/PyPDF2/files/PyPDF2-1.26.0-py3-tests.patch
@@ -0,0 +1,35 @@
+From 6b46d03ee3a5bd5c2c18fae8aec8a0020ee68add Mon Sep 17 00:00:00 2001
+From: Venelin Stoykov <vkstoykov@gmail.com>
+Date: Sat, 26 Dec 2015 17:26:00 +0200
+Subject: [PATCH 2/3] Fix tests for Python 3
+
+---
+ Tests/tests.py | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/Tests/tests.py b/Tests/tests.py
+index fa93c10..83b5951 100644
+--- a/Tests/tests.py
++++ b/Tests/tests.py
+@@ -27,14 +27,15 @@ def test_PdfReaderFileLoad(self):
+             ipdf_p1 = ipdf.getPage(0)
+ 
+             # Retrieve the text of the PDF
+-            pdftext_file = open(os.path.join(RESOURCE_ROOT, 'crazyones.txt'), 'r')
+-            pdftext = pdftext_file.read()
+-            ipdf_p1_text = ipdf_p1.extractText().replace('\n', '')
++            with open(os.path.join(RESOURCE_ROOT, 'crazyones.txt'), 'rb') as pdftext_file:
++                pdftext = pdftext_file.read()
++
++            ipdf_p1_text = ipdf_p1.extractText().replace('\n', '').encode('utf-8')
+ 
+             # Compare the text of the PDF to a known source
+-            self.assertEqual(ipdf_p1_text.encode('utf-8', errors='ignore'), pdftext,
++            self.assertEqual(ipdf_p1_text, pdftext,
+                 msg='PDF extracted text differs from expected value.\n\nExpected:\n\n%r\n\nExtracted:\n\n%r\n\n'
+-                    % (pdftext, ipdf_p1_text.encode('utf-8', errors='ignore')))
++                    % (pdftext, ipdf_p1_text))
+ 
+ 
+ class AddJsTestCase(unittest.TestCase):
+
diff --git a/dev-python/PyPDF2/metadata.xml b/dev-python/PyPDF2/metadata.xml
new file mode 100644
index 000000000000..ad27f68ce22a
--- /dev/null
+++ b/dev-python/PyPDF2/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">PyPDF2</remote-id>
+    <remote-id type="github">mstamy2/PyPDF2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
new file mode 100644
index 000000000000..b484c66cc51e
--- /dev/null
+++ b/dev-python/PyQt4/Manifest
@@ -0,0 +1,9 @@
+AUX PyQt4-4.11.2-phonon.patch 897 SHA256 0e0f5ff891fce64e9d8b6e743e2807c622921456e08af35f7f20085281ab2737 SHA512 e6e0364a24e43682c829da0a3d2ece8fdf54df00ee4fb00927a0530f3d5b62177877452058ab67cd9006ef8902d72f863e69d9ffb3b98b49f407566f96430bee WHIRLPOOL ebc3f8da193764195f63b4306a7d8f240d95bb276f4702f0dd81af6cd766b4a0f984cee153ff0ae153481464724a53246f009bd21d6b2503a3c212076849a424
+AUX PyQt4-4.7.3-qreal_float_support.patch 5954 SHA256 e2f86905d0d648eda5bebf50b165120bcb0f4c83e99742eeb2ed17568a6429ec SHA512 5431778103c333c1f13850f4b5fe982f4fe8e04c6cabb013ab8fff7d6117f9d0d5b8c7bbc6d5ceaceaa84fa8984276dda373e989ef3a8d90d3a1ae2220a97af2 WHIRLPOOL 83f8c3d00fb92099414a03492d40ddbee362e53be75b180f3842980e0dec69e1a3094e3ea7d951140de028e75c36acb040ca159d710c4a20d20da9c04e6a31dd
+DIST PyQt4_gpl_x11-4.12.1.tar.gz 11328010 SHA256 45d724461ae58b019b9be95076ca07e212eb73084aec9125bb254825c3a05383 SHA512 0651816ed5a371c24827e182eac5b2a2afe67928d95a09f63bd8158117aacd3e835b1efa06d4fc0c147a28038613a5bc088bd736a1348de68199da7952299af1 WHIRLPOOL 4b216d1d4598363d9107a2ed5df6537a9fd1e36c37b7fbb6ccefc22bd4fd93f96f9ac72799bb028259bc80f2216c81ccb738df978d8a48e1f37e7fc2ac146676
+DIST PyQt4_gpl_x11-4.12.tar.gz 11325395 SHA256 3c1d4b55314adb3e1132de8fc2a92eed216d37e58aceed41294dbca210ca88db SHA512 bc5ee53e6ab8d32e240bbbd85aec9ce18a398848c0ee73d874763156256f7942a4a452a26f34fe035fdbeba5fb1df060910688f8a1bc7f7f183543d3dd0fd731 WHIRLPOOL 001df301c9620873794c33f5294ae30ec9d4a32359d26a8607377fe2468dd33a313ef09e96d2491056cdc066edc5d80b4e80afa19976dfb2a7d291cd829e2791
+EBUILD PyQt4-4.12.1.ebuild 4732 SHA256 ff43d6e06c31044f4433009ca2b80f48b21dce3e55e9a31fdcdd7bf869e905ec SHA512 0ec2700f17c11740e883bce2126833fa81a1e99c57ed0b6e4d5c977e023d29f97b8ef396cc9fad755a6051e1c403110e40041170fc98f058ad192dc25f72a0e5 WHIRLPOOL 03b831cad3aee8026d55c943b70af20a50ea8a1a85d4124f1e5f50c5d67bd72e9a8fae9d47c0ca0a05dea2f7e2ad4b868037f8fb81acd92a7ecec466caccd6bf
+EBUILD PyQt4-4.12.ebuild 4723 SHA256 169b3e61865def91376f7b3a4aa45b5b61e2fd3c73a0ea8e95ce022454dc4650 SHA512 04a5e08557d5f44c247105c9a52b3b524dc03f02e4798c7f3833bb6455ccc511ece323d3341c2e9e6213d9bd5f3d09b51258b006195a73072f5dc797ec448236 WHIRLPOOL 17138966dca1b6b16243a1fda5ce85d2028c1069667ab62a6b43320c3e417a37b3fb7760d38181677067ae1c5f8b072f304fe07d784c1564c2f10e8476d006ee
+MISC ChangeLog 5436 SHA256 72e2896cbd0d40eee0a9da0420740d7168a3e8da88b3db8a1f9b3747d9c4b3cb SHA512 11cb8c64dd656bdd0f46493918726b0830d354ab15b3cbee2f1ecfdf9578de42c662b617acdedfa70ddb7ed97f9047b9f270571f6e8d38f89bb4ee4c5a920c25 WHIRLPOOL 8a46b31fa8522951ae07459d8296705a36b20a5c32f92c358b67e8e6c765847c4934a2419e176062962200fe8f65f5083f38e3bea125874a9db9912fcb180ae4
+MISC ChangeLog-2015 40285 SHA256 a116d408d2dd7fda518a8c809ff1550fca142a0a4488f9274e315ddb069bf67a SHA512 c8861b44fd1142724d99b95c9bcd38d156c1182510e2825bd84e440bfab9162b274c78e3cf5ee77079c77ccc8d020f3a04b647651076885c3c0a0e9a84fd12a0 WHIRLPOOL e3984f7f1f04246879cadbe8e3ac437ff2e52f7ed537c6018d52e10b43adaa2894e4bc5e425a5a16cbb18aef9b3b0d89c6af8d5612926c7e318fbb920bf22bcb
+MISC metadata.xml 1770 SHA256 2962ade1ceeff1cef76e7c965155f7893fe38e3cf9f1bc6d1b13ab31016038b0 SHA512 6c6671ad8dd20f4d1701facd3b7de794b4eca907ba273f5c6626b691753ea26c0679cd4d91c1847beebcc298341ddf19d71bb4d3eb203e10720c64c54a2ee559 WHIRLPOOL 6f1b840f68b3680b5cd78566d04c8962c5a4a026cb9f1450cb2308e7d40922ea42d9d8e1ef4c421a099dec057e8b2e284076e40e196a8ac77c43ad5b1f53889e
diff --git a/dev-python/PyQt4/PyQt4-4.12.1.ebuild b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
new file mode 100644
index 000000000000..d632d951e8d7
--- /dev/null
+++ b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit multibuild python-r1 qmake-utils toolchain-funcs
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
+
+MY_P=${PN}_gpl_x11-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
+else
+	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="X compat dbus debug declarative designer doc examples help multimedia
+	opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	sql? ( X )
+	testlib? ( X )
+"
+
+# Minimal supported version of Qt.
+QT_PV="4.8.5:4"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.19.1:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	X? ( >=dev-qt/qtgui-${QT_PV} )
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-qt/qtdbus-${QT_PV}
+	)
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	help? ( >=dev-qt/qthelp-${QT_PV} )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
+	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+	phonon? ( >=media-libs/phonon-4.7[qt4] )
+	script? ( >=dev-qt/qtscript-${QT_PV} )
+	scripttools? ( >=dev-qt/qtgui-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	testlib? ( >=dev-qt/qttest-${QT_PV} )
+	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( "${S}"/{ChangeLog,NEWS,THANKS} )
+PATCHES=(
+	# Allow building against KDE's phonon (bug 525354)
+	"${FILESDIR}/${PN}-4.11.2-phonon.patch"
+)
+
+src_prepare() {
+	# Support qreal on arm architecture (bug 322349)
+	use arm && PATCHES+=("${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch")
+
+	default
+}
+
+pyqt_run() {
+	echo "$@"
+	"${PYTHON}" "$@"
+}
+
+pyqt_use_enable() {
+	use "$1" || return
+
+	echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}}
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			$(usex debug '--debug --trace' '')
+			--verbose
+			--confirm-license
+			--qmake="$(qt4_get_bindir)"/qmake
+			--bindir="${EPREFIX}/usr/bin"
+			--destdir="$(python_get_sitedir)"
+			--qsci-api
+			--enable=QtCore
+			--enable=QtNetwork
+			--enable=QtXml
+			$(pyqt_use_enable X QtGui)
+			$(pyqt_use_enable dbus QtDBus)
+			$(pyqt_use_enable declarative)
+			$(pyqt_use_enable designer)
+			$(usex designer '' --no-designer-plugin)
+			$(pyqt_use_enable help)
+			$(pyqt_use_enable multimedia)
+			$(pyqt_use_enable opengl QtOpenGL)
+			$(pyqt_use_enable phonon phonon)
+			$(pyqt_use_enable script)
+			$(pyqt_use_enable scripttools QtScriptTools)
+			$(pyqt_use_enable sql)
+			$(pyqt_use_enable svg)
+			$(pyqt_use_enable testlib QtTest)
+			$(pyqt_use_enable webkit QtWebKit)
+			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
+		)
+
+		if use compat; then
+			local compat_build_dir=${BUILD_DIR%/}-compat
+			cp -Rp "${S}" "${compat_build_dir}" || die
+			pushd "${compat_build_dir}" >/dev/null || die
+
+			local mycompatconf=(
+				"${myconf[@]}"
+				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=
+			)
+			pyqt_run configure.py "${mycompatconf[@]}" || die
+
+			popd >/dev/null || die
+		fi
+
+		myconf+=(
+			--sip-incdir="$(python_get_includedir)"
+			$(usex dbus '' --no-python-dbus)
+		)
+		pyqt_run "${S}"/configure-ng.py "${myconf[@]}" || die
+
+		eqmake4 -recursive ${PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		local tmp_root=${D%/}/tmp
+		emake INSTALL_ROOT="${tmp_root}" install
+
+		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
+		if python_is_python3; then
+			rm -r "${uic_dir}"/port_v2 || die
+		else
+			rm -r "${uic_dir}"/port_v3 || die
+		fi
+
+		python_doexe "${tmp_root}${EPREFIX}"/usr/bin/pyuic4
+		rm "${tmp_root}${EPREFIX}"/usr/bin/pyuic4 || die
+
+		multibuild_merge_root "${tmp_root}" "${D}"
+
+		if use compat; then
+			local compat_build_dir=${BUILD_DIR%/}-compat
+			python_moduleinto ${PN}
+			python_domodule "${compat_build_dir}"/pyqtconfig.py
+		fi
+
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+	use doc && dodoc -r doc/html
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/PyQt4/PyQt4-4.12.ebuild b/dev-python/PyQt4/PyQt4-4.12.ebuild
new file mode 100644
index 000000000000..979f8323a03b
--- /dev/null
+++ b/dev-python/PyQt4/PyQt4-4.12.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit multibuild python-r1 qmake-utils toolchain-funcs
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
+
+MY_P=${PN}_gpl_x11-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
+else
+	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+
+IUSE="X compat dbus debug declarative designer doc examples help multimedia
+	opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	sql? ( X )
+	testlib? ( X )
+"
+
+# Minimal supported version of Qt.
+QT_PV="4.8.5:4"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	X? ( >=dev-qt/qtgui-${QT_PV} )
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-qt/qtdbus-${QT_PV}
+	)
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	help? ( >=dev-qt/qthelp-${QT_PV} )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
+	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+	phonon? ( >=media-libs/phonon-4.7[qt4] )
+	script? ( >=dev-qt/qtscript-${QT_PV} )
+	scripttools? ( >=dev-qt/qtgui-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	testlib? ( >=dev-qt/qttest-${QT_PV} )
+	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( "${S}"/{ChangeLog,NEWS,THANKS} )
+PATCHES=(
+	# Allow building against KDE's phonon (bug 525354)
+	"${FILESDIR}/${PN}-4.11.2-phonon.patch"
+)
+
+src_prepare() {
+	# Support qreal on arm architecture (bug 322349)
+	use arm && PATCHES+=("${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch")
+
+	default
+}
+
+pyqt_run() {
+	echo "$@"
+	"${PYTHON}" "$@"
+}
+
+pyqt_use_enable() {
+	use "$1" || return
+
+	echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}}
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			$(usex debug '--debug --trace' '')
+			--verbose
+			--confirm-license
+			--qmake="$(qt4_get_bindir)"/qmake
+			--bindir="${EPREFIX}/usr/bin"
+			--destdir="$(python_get_sitedir)"
+			--qsci-api
+			--enable=QtCore
+			--enable=QtNetwork
+			--enable=QtXml
+			$(pyqt_use_enable X QtGui)
+			$(pyqt_use_enable dbus QtDBus)
+			$(pyqt_use_enable declarative)
+			$(pyqt_use_enable designer)
+			$(usex designer '' --no-designer-plugin)
+			$(pyqt_use_enable help)
+			$(pyqt_use_enable multimedia)
+			$(pyqt_use_enable opengl QtOpenGL)
+			$(pyqt_use_enable phonon phonon)
+			$(pyqt_use_enable script)
+			$(pyqt_use_enable scripttools QtScriptTools)
+			$(pyqt_use_enable sql)
+			$(pyqt_use_enable svg)
+			$(pyqt_use_enable testlib QtTest)
+			$(pyqt_use_enable webkit QtWebKit)
+			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
+		)
+
+		if use compat; then
+			local compat_build_dir=${BUILD_DIR%/}-compat
+			cp -Rp "${S}" "${compat_build_dir}" || die
+			pushd "${compat_build_dir}" >/dev/null || die
+
+			local mycompatconf=(
+				"${myconf[@]}"
+				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=
+			)
+			pyqt_run configure.py "${mycompatconf[@]}" || die
+
+			popd >/dev/null || die
+		fi
+
+		myconf+=(
+			--sip-incdir="$(python_get_includedir)"
+			$(usex dbus '' --no-python-dbus)
+		)
+		pyqt_run "${S}"/configure-ng.py "${myconf[@]}" || die
+
+		eqmake4 -recursive ${PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		local tmp_root=${D%/}/tmp
+		emake INSTALL_ROOT="${tmp_root}" install
+
+		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
+		if python_is_python3; then
+			rm -r "${uic_dir}"/port_v2 || die
+		else
+			rm -r "${uic_dir}"/port_v3 || die
+		fi
+
+		python_doexe "${tmp_root}${EPREFIX}"/usr/bin/pyuic4
+		rm "${tmp_root}${EPREFIX}"/usr/bin/pyuic4 || die
+
+		multibuild_merge_root "${tmp_root}" "${D}"
+
+		if use compat; then
+			local compat_build_dir=${BUILD_DIR%/}-compat
+			python_moduleinto ${PN}
+			python_domodule "${compat_build_dir}"/pyqtconfig.py
+		fi
+
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+	use doc && dodoc -r doc/html
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch b/dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch
new file mode 100644
index 000000000000..e3449b3b4bfc
--- /dev/null
+++ b/dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch
@@ -0,0 +1,25 @@
+From e8931ed7f49eb55d6259328a5a78f3fc18472d48 Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <pesa@gentoo.org>
+Date: Tue, 14 Oct 2014 04:30:29 +0200
+Subject: [PATCH] Support building against KDE's phonon variant.
+
+---
+ configure-ng.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure-ng.py b/configure-ng.py
+index a80cb57..fd2c56c 100644
+--- a/configure-ng.py
++++ b/configure-ng.py
+@@ -2256,6 +2256,8 @@ def generate_sip_module_code(target_config, verbose, no_timestamp, parts, tracin
+         if mname == 'QtCore':
+             includepath = target_config.vend_inc_dir
+             libs = '-L%s -lvendorid' % target_config.vend_lib_dir
++    if mname == 'phonon':
++        includepath = os.path.join(sys.prefix, 'include', 'phonon')
+ 
+     generate_module_makefile(target_config, verbose, mname,
+             includepath=includepath, libs=libs, qpy_sources=qpy_sources,
+-- 
+2.1.2
+
diff --git a/dev-python/PyQt4/files/PyQt4-4.7.3-qreal_float_support.patch b/dev-python/PyQt4/files/PyQt4-4.7.3-qreal_float_support.patch
new file mode 100644
index 000000000000..37e1e69eb3f4
--- /dev/null
+++ b/dev-python/PyQt4/files/PyQt4-4.7.3-qreal_float_support.patch
@@ -0,0 +1,239 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_qreal_float_support.dpatch by Michael Casadevall <sonicmctails@gmail.com>
+##
+## DP: Corrects a configure test, and adds explicate double handling
+##     to qlist.sip on architectures where qreal != double
+
+@DPATCH@
+Index: python-qt4-4.7.2/sip/QtCore/qlist.sip
+===================================================================
+--- python-qt4-4.7.2.orig/sip/QtCore/qlist.sip	2010-03-17 19:29:26.000000000 +0100
++++ python-qt4-4.7.2/sip/QtCore/qlist.sip	2010-03-25 23:53:55.468631945 +0100
+@@ -749,3 +749,227 @@
+     return sipGetState(sipTransferObj);
+ %End
+ };
++
++// If we're on an architecture where qreal != double, then we need to also
++// explicately handle doubles. On architectures where qreal == double, they
++// will automaticially be cast upwards
++
++%If (!PyQt_qreal_double)
++
++%If (Qt_4_3_0 -)
++// QList<QPair<double, double> > is implemented as a Python list of 2-element tuples.
++%MappedType QList<QPair<double, double> >
++{
++%TypeHeaderCode
++#include <qlist.h>
++#include <qpair.h>
++%End
++
++%ConvertFromTypeCode
++    // Create the list.
++    PyObject *l;
++
++    if ((l = PyList_New(sipCpp->size())) == NULL)
++        return NULL;
++
++    // Set the list elements.
++    for (int i = 0; i < sipCpp->size(); ++i)
++    {
++        const QPair<double, double> &p = sipCpp->at(i);
++        PyObject *pobj;
++
++        if ((pobj = Py_BuildValue((char *)"dd", p.first, p.second)) == NULL)
++        {
++            Py_DECREF(l);
++
++            return NULL;
++        }
++
++        PyList_SET_ITEM(l, i, pobj);
++    }
++
++    return l;
++%End
++
++%ConvertToTypeCode
++    SIP_SSIZE_T len;
++
++    // Check the type if that is all that is required.
++    if (sipIsErr == NULL)
++    {
++        if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0)
++            return 0;
++
++        for (SIP_SSIZE_T i = 0; i < len; ++i)
++        {
++            PyObject *tup = PySequence_ITEM(sipPy, i);
++
++            if (!PySequence_Check(tup) || PySequence_Size(tup) != 2)
++                return 0;
++        }
++
++        return 1;
++    }
++
++    QList<QPair<double, double> > *ql = new QList<QPair<double, double> >;
++    len = PySequence_Size(sipPy);
++ 
++    for (SIP_SSIZE_T i = 0; i < len; ++i)
++    {
++        PyObject *tup = PySequence_ITEM(sipPy, i);
++
++        double first = PyFloat_AsDouble(PySequence_ITEM(tup, 0));
++        double second = PyFloat_AsDouble(PySequence_ITEM(tup, 1));
++ 
++        ql->append(QPair<double, double>(first, second));
++    }
++ 
++    *sipCppPtr = ql;
++ 
++    return sipGetState(sipTransferObj);
++%End
++};
++%End
++%If (Qt_4_3_0 -)
++// QList<QPair<double, TYPE> > is implemented as a Python list of 2-element tuples.
++template<double, TYPE>
++%MappedType QList<QPair<double, TYPE> >
++{
++%TypeHeaderCode
++#include <qlist.h>
++#include <qpair.h>
++%End
++
++%ConvertFromTypeCode
++    // Create the list.
++    PyObject *l;
++
++    if ((l = PyList_New(sipCpp->size())) == NULL)
++        return NULL;
++
++    // Set the list elements.
++    for (int i = 0; i < sipCpp->size(); ++i)
++    {
++        const QPair<double, TYPE> &p = sipCpp->at(i);
++        TYPE *t = new TYPE(p.second);
++        PyObject *pobj;
++
++        if ((pobj = sipBuildResult(NULL, "(dB)", p.first, t, sipClass_TYPE, sipTransferObj)) == NULL)
++        {
++            Py_DECREF(l);
++            delete t;
++
++            return NULL;
++        }
++
++        PyList_SET_ITEM(l, i, pobj);
++    }
++
++    return l;
++%End
++
++%ConvertToTypeCode
++    SIP_SSIZE_T len;
++
++    // Check the type if that is all that is required.
++    if (sipIsErr == NULL)
++    {
++        if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0)
++            return 0;
++
++        for (SIP_SSIZE_T i = 0; i < len; ++i)
++        {
++            PyObject *tup = PySequence_ITEM(sipPy, i);
++
++            if (!PySequence_Check(tup) || PySequence_Size(tup) != 2)
++                return 0;
++
++            if (!sipCanConvertToInstance(PySequence_ITEM(tup, 1), sipClass_TYPE, SIP_NOT_NONE))
++                return 0;
++        }
++
++        return 1;
++    }
++
++    QList<QPair<double, TYPE> > *ql = new QList<QPair<double, TYPE> >;
++    len = PySequence_Size(sipPy);
++ 
++    for (SIP_SSIZE_T i = 0; i < len; ++i)
++    {
++        PyObject *tup = PySequence_ITEM(sipPy, i);
++        double d;
++        int state;
++
++        d = PyFloat_AsDouble(PySequence_ITEM(tup, 0));
++        TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PySequence_ITEM(tup, 1), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
++ 
++        if (*sipIsErr)
++        {
++            sipReleaseInstance(t, sipClass_TYPE, state);
++
++            delete ql;
++            return 0;
++        }
++
++        ql->append(QPair<double, TYPE>(d, *t));
++
++        sipReleaseInstance(t, sipClass_TYPE, state);
++    }
++ 
++    *sipCppPtr = ql;
++ 
++    return sipGetState(sipTransferObj);
++%End
++};
++%End
++
++// QList<double> is implemented as a Python list of doubles.
++%MappedType QList<double>
++{
++%TypeHeaderCode
++#include <qlist.h>
++%End
++
++%ConvertFromTypeCode
++    // Create the list.
++    PyObject *l;
++
++    if ((l = PyList_New(sipCpp->size())) == NULL)
++        return NULL;
++
++    // Set the list elements.
++    for (int i = 0; i < sipCpp->size(); ++i)
++    {
++        PyObject *pobj;
++
++        if ((pobj = PyFloat_FromDouble(sipCpp->value(i))) == NULL)
++        {
++            Py_DECREF(l);
++
++            return NULL;
++        }
++
++        PyList_SET_ITEM(l, i, pobj);
++    }
++
++    return l;
++%End
++
++%ConvertToTypeCode
++    // Check the type if that is all that is required.
++    if (sipIsErr == NULL)
++        return (PySequence_Check(sipPy) && PySequence_Size(sipPy) >= 0);
++
++    QList<double> *ql = new QList<double>;
++    SIP_SSIZE_T len = PySequence_Size(sipPy);
++ 
++    for (SIP_SSIZE_T i = 0; i < len; ++i)
++        ql->append(PyFloat_AsDouble(PySequence_ITEM(sipPy, i)));
++ 
++    *sipCppPtr = ql;
++ 
++    return sipGetState(sipTransferObj);
++%End
++};
++
++%End
diff --git a/dev-python/PyQt4/metadata.xml b/dev-python/PyQt4/metadata.xml
new file mode 100644
index 000000000000..7cc6900ee958
--- /dev/null
+++ b/dev-python/PyQt4/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="X">Build bindings for the QtGui module</flag>
+		<flag name="compat">Install the deprecated pyqtconfig module for backward compatibility</flag>
+		<flag name="dbus">Build bindings for the QtDBus module</flag>
+		<flag name="declarative">Build bindings for the QtDeclarative module</flag>
+		<flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
+		<flag name="help">Build bindings for the QtHelp module</flag>
+		<flag name="multimedia">Build bindings for the QtMultimedia module</flag>
+		<flag name="opengl">Build bindings for the QtOpenGL module</flag>
+		<flag name="phonon">Build bindings for the phonon module</flag>
+		<flag name="script">Build bindings for the QtScript module</flag>
+		<flag name="scripttools">Build bindings for the QtScriptTools module</flag>
+		<flag name="sql">Build bindings for the QtSql module</flag>
+		<flag name="svg">Build bindings for the QtSvg module</flag>
+		<flag name="testlib">Build bindings for the QtTest module</flag>
+		<flag name="webkit">Build bindings for the QtWebKit module</flag>
+		<flag name="xmlpatterns">Build bindings for the QtXmlPatterns module</flag>
+	</use>
+	<upstream>
+		<maintainer status="active">
+			<email>phil@riverbankcomputing.com</email>
+			<name>Phil Thompson</name>
+		</maintainer>
+		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
+		<doc>http://pyqt.sourceforge.net/Docs/PyQt4/</doc>
+		<remote-id type="pypi">PyQt4</remote-id>
+		<remote-id type="sourceforge">pyqt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
new file mode 100644
index 000000000000..85640cdaffd0
--- /dev/null
+++ b/dev-python/PyQt5/Manifest
@@ -0,0 +1,7 @@
+DIST PyQt5_gpl-5.7.1.tar.gz 3733746 SHA256 be849f212a074049b9ebc10b6c07dddefb86e6d30e8df8a5c715cbb2cf7fad14 SHA512 7498713f73807522e58ae38ff58548cf80c2f2c418d6c55e20ce613cdc997e4ee7139076f1f152c7c3edb970bde14febc3496009f934e31ff71f01a1605f558f WHIRLPOOL 9322ccaaebf78a9e177703bae26f002cdfe9ad3ba45a9c7b9ccdd3b73cca96550e479b243b302d59eefdc1520a6e5b5f18ac5fabc1f8eff36f7f76d71b7dea11
+DIST PyQt5_gpl-5.8.2.tar.gz 3744907 SHA256 ebd70515b30bbd6098fee29e6271a6696b1183c5530ee30e6ba9aaab195536e8 SHA512 8b765b9ae6210b7312a2dc6ed94d2664ae569625fe8a27443bae4230d9d9c00e0cf3b4be6904c66ebceff5cd5bbd19a5a9794a0b3222c8098a55f0b94fc8d89b WHIRLPOOL a2cf7d65f73b0cba7d37339e22b4bb8d3a4a924dbbd4d093943e299cf4d96dfd66e81ecfc4a5bf570f37f33eaad458849d7ef93ea22b115eece88866067f2e22
+EBUILD PyQt5-5.7.1.ebuild 5612 SHA256 9cc63dfe3053a665263019919056c4ff654e97483fac58f7b4ce6bd9cdb12c45 SHA512 1bf9de7a46d07740e91d5497767b226435d20bc98eca0cce901e5b7f2e7de3f41a4e34b073f4d3280e0184387d8d07d06f7e0a002196659c1a9da8e3745dd366 WHIRLPOOL 36494a100fb28ba04e7de4dc80dc53f48efdb05eb0fd3aa645d82ffb90369a577580d7397cee2edd36cb245aaabb5b5d42d5de86ea05c5b8d76893fe4bd83823
+EBUILD PyQt5-5.8.2.ebuild 5636 SHA256 5d636464a9dbcaebfbab6e0b1032400f92b85882dbe2e9a7a7dee21a589c16d1 SHA512 71c23f5ce7c44be2252cba0efd8687591ac6e4980626d9d880a5a54a31d8b721697ca9a80990ac38481d54ab12036457e020cc7afca7e01a265472a05e106f5b WHIRLPOOL 65e2a1c3988004e80b8a308f2463629a323a6ef3cb056a3cf9b7bbce23ba452220da3fd7fcc5f0b13aed029d1dc09b91ffe334821e0a1e1d656ba2b1aa6f8dbe
+MISC ChangeLog 5945 SHA256 bc33b54e774fca6c280fea23679a5e301d9b0e579000bc279fefa1e6cd4e22ae SHA512 36ca5033cba177eaac511fb501a9dc7db91ea8ed00ba412b93611261546c1b1c73d06e9fc65e20d76f1043c3ef73c776d9674f57ffc4b465efc979ef09ee6714 WHIRLPOOL 6261d3e758bb7fdc5e61df408f408794036b05116d4895492d5e1d5e59346996d788b49fa6da5a3e8453f87df8d1f04fa388bf1b1e9b0b0822354268b544afaa
+MISC ChangeLog-2015 2530 SHA256 c0f5fb7e518d57246a272e1850019d5c6b17295aeb6be532c3ea0531993066ce SHA512 e84858c3d2dfc44e35eca767822dbdf42396f0df1c2b6676bfcd624be232ec4ead7daadc71dcadf204ac10bd91dddf0c37decea272f3e6130ae2b36aad6cb18f WHIRLPOOL 67f2ecb4cd02db99f6ffc1e0e1bb404c5067015cb85846704e285122c5074b286103ecaf9ef17e9874afad4784d18492808f192e60e363438f375408c1af45cd
+MISC metadata.xml 2458 SHA256 76c968147d7a2e8135e38306261729f31498e340584f4442b119b0a46b5f3bd0 SHA512 8554c97aeb873a2a7e1d50b8aacc3638a87fdc0fdc367d61123b63bd506b1376873d88a967773e8f1050f0e8c35ae180d61c7eb2c213c345e5b17a3c0e4c7df8 WHIRLPOOL 2731d8a5af652bc6b372b12ed8ee714487abc542a2a1673a80b97110f800f453fcbd648124742a17463da6abb586359601016b70b2006bd8d68604e031b4bf5d
diff --git a/dev-python/PyQt5/PyQt5-5.7.1.ebuild b/dev-python/PyQt5/PyQt5-5.7.1.ebuild
new file mode 100644
index 000000000000..0de6722265f6
--- /dev/null
+++ b/dev-python/PyQt5/PyQt5-5.7.1.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit multibuild python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
+
+MY_P=${PN}_gpl-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
+else
+	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm ~ppc64 x86"
+
+# TODO: QtNfc
+IUSE="bluetooth dbus debug declarative designer doc examples gles2 gui help location
+	multimedia network opengl positioning printsupport sensors serialport sql svg
+	testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns"
+
+# The requirements below were extracted from configure.py
+# and from the output of 'grep -r "%Import " "${S}"/sip'
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( gui )
+	declarative? ( gui network )
+	designer? ( widgets )
+	help? ( gui widgets )
+	location? ( positioning )
+	multimedia? ( gui network )
+	opengl? ( gui widgets )
+	positioning? ( gui )
+	printsupport? ( gui widgets )
+	sensors? ( gui )
+	serialport? ( gui )
+	sql? ( widgets )
+	svg? ( gui widgets )
+	testlib? ( gui widgets )
+	webchannel? ( network )
+	webengine? ( network widgets? ( webchannel ) )
+	webkit? ( gui network printsupport widgets )
+	websockets? ( network )
+	widgets? ( gui )
+	xmlpatterns? ( network )
+"
+
+# Minimal supported version of Qt.
+QT_PV="5.6.0:5"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-qt/qtdbus-${QT_PV}
+	)
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
+	help? ( >=dev-qt/qthelp-${QT_PV} )
+	location? ( >=dev-qt/qtlocation-${QT_PV} )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
+	network? ( >=dev-qt/qtnetwork-${QT_PV} )
+	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
+	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
+	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
+	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	testlib? ( >=dev-qt/qttest-${QT_PV} )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
+	webkit? ( >=dev-qt/qtwebkit-${QT_PV}[printsupport] )
+	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
+	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( "${S}"/{ChangeLog,NEWS} )
+
+pyqt_use_enable() {
+	use "$1" || return
+
+	if [[ $# -eq 1 ]]; then
+		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
+	else
+		shift
+		echo ${@/#/--enable=}
+	fi
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			$(usex debug '--debug --trace' '')
+			--verbose
+			--confirm-license
+			--qmake="$(qt5_get_bindir)"/qmake
+			--bindir="${EPREFIX}/usr/bin"
+			--destdir="$(python_get_sitedir)"
+			--sip-incdir="$(python_get_includedir)"
+			--qsci-api
+			--enable=QtCore
+			--enable=QtXml
+			$(pyqt_use_enable bluetooth)
+			$(pyqt_use_enable dbus QtDBus)
+			$(usex dbus '' --no-python-dbus)
+			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
+			$(usex declarative '' --no-qml-plugin)
+			$(pyqt_use_enable designer)
+			$(usex designer '' --no-designer-plugin)
+			$(pyqt_use_enable gui)
+			$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
+			$(pyqt_use_enable help)
+			$(pyqt_use_enable location)
+			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
+			$(pyqt_use_enable network)
+			$(pyqt_use_enable opengl QtOpenGL)
+			$(pyqt_use_enable positioning)
+			$(pyqt_use_enable printsupport QtPrintSupport)
+			$(pyqt_use_enable sensors)
+			$(pyqt_use_enable serialport QtSerialPort)
+			$(pyqt_use_enable sql)
+			$(pyqt_use_enable svg)
+			$(pyqt_use_enable testlib QtTest)
+			$(pyqt_use_enable webchannel QtWebChannel)
+			$(pyqt_use_enable webengine QtWebEngineCore $(usex widgets QtWebEngineWidgets ''))
+			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
+			$(pyqt_use_enable websockets QtWebSockets)
+			$(pyqt_use_enable widgets)
+			$(pyqt_use_enable x11extras QtX11Extras)
+			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		eqmake5 -recursive ${PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		local tmp_root=${D%/}/tmp
+		emake INSTALL_ROOT="${tmp_root}" install
+
+		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
+		local exe
+		for exe in pylupdate5 pyrcc5 pyuic5; do
+			python_doexe "${bin_dir}/${exe}"
+			rm "${bin_dir}/${exe}" || die
+		done
+
+		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
+		if python_is_python3; then
+			rm -r "${uic_dir}"/port_v2 || die
+		else
+			rm -r "${uic_dir}"/port_v3 || die
+		fi
+
+		multibuild_merge_root "${tmp_root}" "${D}"
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+	use doc && dodoc -r doc/html
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/PyQt5/PyQt5-5.8.2.ebuild b/dev-python/PyQt5/PyQt5-5.8.2.ebuild
new file mode 100644
index 000000000000..3eab65c36a65
--- /dev/null
+++ b/dev-python/PyQt5/PyQt5-5.8.2.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit multibuild python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
+
+MY_P=${PN}_gpl-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
+else
+	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# TODO: QtNfc
+IUSE="bluetooth dbus debug declarative designer doc examples gles2 gui help location
+	multimedia network opengl positioning printsupport sensors serialport sql svg
+	testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns"
+
+# The requirements below were extracted from configure.py
+# and from the output of 'grep -r "%Import " "${S}"/sip'
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( gui )
+	declarative? ( gui network )
+	designer? ( widgets )
+	help? ( gui widgets )
+	location? ( positioning )
+	multimedia? ( gui network )
+	opengl? ( gui widgets )
+	positioning? ( gui )
+	printsupport? ( gui widgets )
+	sensors? ( gui )
+	serialport? ( gui )
+	sql? ( widgets )
+	svg? ( gui widgets )
+	testlib? ( gui widgets )
+	webchannel? ( network )
+	webengine? ( network widgets? ( webchannel ) )
+	webkit? ( gui network printsupport widgets )
+	websockets? ( network )
+	widgets? ( gui )
+	xmlpatterns? ( network )
+"
+
+# Minimal supported version of Qt.
+QT_PV="5.6.0:5"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.19.1:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-qt/qtdbus-${QT_PV}
+	)
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
+	help? ( >=dev-qt/qthelp-${QT_PV} )
+	location? ( >=dev-qt/qtlocation-${QT_PV} )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
+	network? ( >=dev-qt/qtnetwork-${QT_PV} )
+	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
+	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
+	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
+	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	testlib? ( >=dev-qt/qttest-${QT_PV} )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
+	webkit? ( >=dev-qt/qtwebkit-${QT_PV}[printsupport] )
+	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
+	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( "${S}"/{ChangeLog,NEWS} )
+
+pyqt_use_enable() {
+	use "$1" || return
+
+	if [[ $# -eq 1 ]]; then
+		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
+	else
+		shift
+		echo ${@/#/--enable=}
+	fi
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			$(usex debug '--debug --qml-debug --trace' '')
+			--verbose
+			--confirm-license
+			--qmake="$(qt5_get_bindir)"/qmake
+			--bindir="${EPREFIX}/usr/bin"
+			--destdir="$(python_get_sitedir)"
+			--sip-incdir="$(python_get_includedir)"
+			--qsci-api
+			--enable=QtCore
+			--enable=QtXml
+			$(pyqt_use_enable bluetooth)
+			$(pyqt_use_enable dbus QtDBus)
+			$(usex dbus '' --no-python-dbus)
+			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
+			$(usex declarative '' --no-qml-plugin)
+			$(pyqt_use_enable designer)
+			$(usex designer '' --no-designer-plugin)
+			$(pyqt_use_enable gui)
+			$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
+			$(pyqt_use_enable help)
+			$(pyqt_use_enable location)
+			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
+			$(pyqt_use_enable network)
+			$(pyqt_use_enable opengl QtOpenGL)
+			$(pyqt_use_enable positioning)
+			$(pyqt_use_enable printsupport QtPrintSupport)
+			$(pyqt_use_enable sensors)
+			$(pyqt_use_enable serialport QtSerialPort)
+			$(pyqt_use_enable sql)
+			$(pyqt_use_enable svg)
+			$(pyqt_use_enable testlib QtTest)
+			$(pyqt_use_enable webchannel QtWebChannel)
+			$(pyqt_use_enable webengine QtWebEngineCore $(usex widgets QtWebEngineWidgets ''))
+			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
+			$(pyqt_use_enable websockets QtWebSockets)
+			$(pyqt_use_enable widgets)
+			$(pyqt_use_enable x11extras QtX11Extras)
+			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		eqmake5 -recursive ${PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		local tmp_root=${D%/}/tmp
+		emake INSTALL_ROOT="${tmp_root}" install
+
+		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
+		local exe
+		for exe in pylupdate5 pyrcc5 pyuic5; do
+			python_doexe "${bin_dir}/${exe}"
+			rm "${bin_dir}/${exe}" || die
+		done
+
+		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
+		if python_is_python3; then
+			rm -r "${uic_dir}"/port_v2 || die
+		else
+			rm -r "${uic_dir}"/port_v3 || die
+		fi
+
+		multibuild_merge_root "${tmp_root}" "${D}"
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+	use doc && dodoc -r doc/html
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/PyQt5/metadata.xml b/dev-python/PyQt5/metadata.xml
new file mode 100644
index 000000000000..6540bb21471f
--- /dev/null
+++ b/dev-python/PyQt5/metadata.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="bluetooth">Build bindings for the QtBluetooth module</flag>
+		<flag name="dbus">Build bindings for the QtDBus module</flag>
+		<flag name="declarative">Build bindings for the QtQml/QtQuick modules and enable the qmlscene plugin</flag>
+		<flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
+		<flag name="gui">Build bindings for the QtGui module</flag>
+		<flag name="help">Build bindings for the QtHelp module</flag>
+		<flag name="location">Build bindings for the QtLocation module</flag>
+		<flag name="multimedia">Build bindings for the QtMultimedia module</flag>
+		<flag name="network">Build bindings for the QtNetwork module</flag>
+		<flag name="opengl">Build bindings for the QtOpenGL module</flag>
+		<flag name="positioning">Build bindings for the QtPositioning module</flag>
+		<flag name="printsupport">Build bindings for the QtPrintSupport module</flag>
+		<flag name="sensors">Build bindings for the QtSensors module</flag>
+		<flag name="serialport">Build bindings for the QtSerialPort module</flag>
+		<flag name="sql">Build bindings for the QtSql module</flag>
+		<flag name="svg">Build bindings for the QtSvg module</flag>
+		<flag name="testlib">Build bindings for the QtTest module</flag>
+		<flag name="webchannel">Build bindings for the QtWebChannel module</flag>
+		<flag name="webengine">Build bindings for the QtWebEngine module</flag>
+		<flag name="webkit">Build bindings for the QtWebKit module</flag>
+		<flag name="websockets">Build bindings for the QtWebSockets module</flag>
+		<flag name="widgets">Build bindings for the QtWidgets module</flag>
+		<flag name="x11extras">Build bindings for the QtX11Extras module</flag>
+		<flag name="xmlpatterns">Build bindings for the QtXmlPatterns module</flag>
+	</use>
+	<upstream>
+		<maintainer status="active">
+			<email>phil@riverbankcomputing.com</email>
+			<name>Phil Thompson</name>
+		</maintainer>
+		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
+		<doc>http://pyqt.sourceforge.net/Docs/PyQt5/</doc>
+		<remote-id type="pypi">PyQt5</remote-id>
+		<remote-id type="sourceforge">pyqt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/PyRSS2Gen/Manifest b/dev-python/PyRSS2Gen/Manifest
new file mode 100644
index 000000000000..abe073225231
--- /dev/null
+++ b/dev-python/PyRSS2Gen/Manifest
@@ -0,0 +1,7 @@
+DIST PyRSS2Gen-1.0.0.tar.gz 8819 SHA256 61a15ee50d7bccafb5f6bc2ecc59f18963f45425b3836da637a2121b415ed11e SHA512 0c8dfeed8cff3b1985e439d60083a16515883b2884310df7ea6af6f2f8cb32a5540373413b27ada0a7c5f56692c9cf61be04818d45030f2f888da33848b5a68c WHIRLPOOL 2d842bb9d8cc570dd0dc07ea97ef6081b72044be0cd0be4c45706adc5155ae3244363556c73a01aa24b6608dfa443e185b5f92cadfad2eeac5612cc3dacee435
+DIST PyRSS2Gen-1.1.tar.gz 9149 SHA256 2a9a3ee7c8e30cb40434ef3a295f9a60166f7d8c3eaefac9f46f7ed4b27c2269 SHA512 2240686914c87984626eb739676927fcd53488158bdebf589e07e8a778e6d24305964e032581c61836f0fabc1264e42d05c88eac8f4c5f6536c31c775434ce02 WHIRLPOOL 4ee5f7fefc942600f00a07bd081bc2c0324c6e651d3008f591608dc537dceaf22029d887dd04360ef381975fcab12d8ed6fa5858c526c7c9467a475a48971a5d
+EBUILD PyRSS2Gen-1.0.0-r1.ebuild 440 SHA256 d2e7b95876f753ad6d527897037e867b6e0e4fc082c6de85a93bf9c227707714 SHA512 200c73469208230d676ff7694488a793c62bae620018187fdb95c1d8a076bdb48c906c65f6f6207fdea9fa66bff9238a05bf86a1de88037b79068df67712a13f WHIRLPOOL 8c49cee3753e1372b0f511d14979221921df479ffff61a0314ed5d7f11d1d7a7a9e08ac3d895c9c5419fa1e8a2dc3a02a319ecfe15df03cda706992a4a73258f
+EBUILD PyRSS2Gen-1.1.ebuild 452 SHA256 51532075747bdfa04b7f78df98f217f8b7f759a850a5c081b4f7afe05607043a SHA512 68f7b2e5f95cd7f221b62b10ec37659e7c7c77f2e80f031329c0b0a1e1a897f3e4dbf77bde81daef70f817a1e1f4dabfb1720f0767bab866b6aaf7cd0c3a1375 WHIRLPOOL e41aec4a3c12e95fb8fd3cf3e3acefb412783f82c18194b20d004047b859bd9196868122fb2a4a6b9fc701d6db3ad3fd23b10e2f2c9a7b9c81c153d1582707cc
+MISC ChangeLog 2921 SHA256 05db0fce0c074b84aaaba47ade91f5cb3354e7a9e077696c7715fe2033feb76c SHA512 75ff12c261d2faf727283a1906852a22c07e0bf0aa3c4102887fa41e0c993203311d545b9694166478b250ad7b43af858c8be81ddc7337ef4016bd68ecaecde1 WHIRLPOOL c976528907044062a0cd38b2f14645af9316962a59fcdff803412f1cee7061409a74261c203bd2bfba1512b7b8b4c2f3f931e94e4d6b8276820d6ac7d1a15478
+MISC ChangeLog-2015 1548 SHA256 2eecf39aad270518860e877732455abde2181d09a9c5e72751c2d9db5ecf06db SHA512 4f2c702d7b55180749eafc902ef9357268de6dbc5a41c4f8e96cd61d6621cfa76bac7eb17315e5f0375badfab651b4bddbe30146fe6e2fe4daff8f464a8ebc33 WHIRLPOOL 1cfa82bf62106f5331d6f64c8aa51d0c27f0368a50e4bafb09af3646f01cef7a306775292cc3663dd80c43a50de5e4bf0150beb3e7e841e927e749c0fe6385d0
+MISC metadata.xml 167 SHA256 5fe493e76bba84455c54b3a46adfae5a1bfe01c764ef0d9e5f6d3e8a1d142188 SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 WHIRLPOOL dc6c3dfc7fd7f0d76c97f0786cb76a55b8564f8437f96d4ccebf985817b9f6dcc4c61830aa5df80d725e4a54b281ea2e03d6b0859214af081112cba15025e64b
diff --git a/dev-python/PyRSS2Gen/PyRSS2Gen-1.0.0-r1.ebuild b/dev-python/PyRSS2Gen/PyRSS2Gen-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..8ba6b616de54
--- /dev/null
+++ b/dev-python/PyRSS2Gen/PyRSS2Gen-1.0.0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="RSS feed generator written in Python"
+HOMEPAGE="http://www.dalkescientific.com/Python/PyRSS2Gen.html https://pypi.python.org/pypi/PyRSS2Gen"
+SRC_URI="http://www.dalkescientific.com/Python/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild
new file mode 100644
index 000000000000..095b56540415
--- /dev/null
+++ b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="RSS feed generator written in Python"
+HOMEPAGE="http://www.dalkescientific.com/Python/PyRSS2Gen.html https://pypi.python.org/pypi/PyRSS2Gen"
+SRC_URI="http://www.dalkescientific.com/Python/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
diff --git a/dev-python/PyRSS2Gen/metadata.xml b/dev-python/PyRSS2Gen/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/dev-python/PyRSS2Gen/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/dev-python/PySensors/Manifest b/dev-python/PySensors/Manifest
new file mode 100644
index 000000000000..dbec73b1b33c
--- /dev/null
+++ b/dev-python/PySensors/Manifest
@@ -0,0 +1,3 @@
+DIST PySensors-0.0.3.tar.gz 5109 SHA256 b735dada5318ce50f2d141d29b102e7a116a5934509583f86302d4b59399e961 SHA512 b9ae61ee9049e1edd3fdee7b122c0f9aa19677aee401c910fcaec5a6bc95a0628d6b7eb2b59f1d14196bee22395819f4980d328d60dd69b0a413f7d08041f159 WHIRLPOOL b7642c2ebfb21f14186cc54c322945397943e27bab53bc2221bfd38db2b10927d7786922d294bd9cb9dac864cb171e5680728f1eb3024fb124e052fc1ac98d67
+EBUILD PySensors-0.0.3.ebuild 469 SHA256 2dc75ed4c92cbe2cf531d5a460950f9e4962d5a295abdb2548e718215ee42b5b SHA512 aa6dc7f2297333cd8404980c2ab5d48f717adc01a92cb9d43b99d19eed8b89b550a9ce3b111fb66713298bd0476ac8482dbb6d09de66193321df8fdc562f0304 WHIRLPOOL 3bb194f38bac1322c6c01d5b7d1868827bf62c48aa59930471f31bc27ccdac0b87ff9408f1cc80150f8f3b9c04b4194a3066e9519bac503a57f969a7178b2ac5
+MISC metadata.xml 437 SHA256 59598177da6569c8d29679945af1ef1fc9020d24bb6598ef1bc32ee52ec2be8b SHA512 63f7823890f90ae6049539ba3b15ddd3beade8e75ade4b06835ca7f04d64f1744e752eb2e7bd2b66e9cde29a4a1e79467a0046bc01ea34e50c1753b4a2ee811f WHIRLPOOL 27d1bb112cc0b9dab377d1ee36313f9aca1df809f26aa6a30f51138141fe617b0e754b0367744c1e92fd1b195e69f33a469f9565f5dc66b6d589cd0c4b1d8481
diff --git a/dev-python/PySensors/PySensors-0.0.3.ebuild b/dev-python/PySensors/PySensors-0.0.3.ebuild
new file mode 100644
index 000000000000..1713ee787e94
--- /dev/null
+++ b/dev-python/PySensors/PySensors-0.0.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings to libsensors (via ctypes)"
+HOMEPAGE="http://pypi.python.org/pypi/PySensors/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=sys-apps/lm_sensors-3"
diff --git a/dev-python/PySensors/metadata.xml b/dev-python/PySensors/metadata.xml
new file mode 100644
index 000000000000..ca91dcd4d1f1
--- /dev/null
+++ b/dev-python/PySensors/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grobian@gentoo.org</email>
+    <name>Fabian Groffen</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">PySensors</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/PySocks/Manifest b/dev-python/PySocks/Manifest
new file mode 100644
index 000000000000..80848967c5f1
--- /dev/null
+++ b/dev-python/PySocks/Manifest
@@ -0,0 +1,6 @@
+DIST PySocks-1.5.6.tar.gz 9189 SHA256 a62b35b13968ba3642a973d115ae6a11be886b5f5ae0841a3ecad4b4f1d7deb1 SHA512 3255591864c532f9ce3c0304d7b33165bb09c0a332fb0d126f61315e98f50e1af0f792517533166558fe457dce2d08f2b320adf9dd87b58618e0941d72daee49 WHIRLPOOL fd2b797c863aef1258b7f3e9f8e1abfa83df8d9387274f084cf731e5ae7b5d01230eb793d5d0f60734bdf178761eaec47a6c87634943c90f6a1fab7cca9d82df
+DIST PySocks-1.6.7.tar.gz 282874 SHA256 d00329f27efa157db7efe3ca26fcd69033cd61f83822461ee3f8a353b48e33cf SHA512 e49ce2f4ce23fd84ce30a62a5585af3c63980db46e7d427571d8fb8f6b85f4b6aeb37066863491496dd322555a5ce261123d613b8e5819dbdcef8a4e17e5dca0 WHIRLPOOL c9c63030b90fce42cb9f3d5478d3fa201926c89258c1c6c1bb5b5077fcb799a8f7ed5c0246235b0b92304e831d3b7f4e50f94c0f19e1a025cb16015c8dc24811
+EBUILD PySocks-1.5.6.ebuild 495 SHA256 ade55add80645781e4f4351fe0ea7c4bed529f435d2b43a36848268f848654d7 SHA512 a3af1e5e7ce367a389ce73f7252623531911108d4bb6b5cd526b45d63acd1ffd332f103accfe6c51650c0d769ed8f215f2b27808e819206ed5eb6276504a2251 WHIRLPOOL 56ea3f69759ecd6383ad976eea0736e42e40aea886477f476fb921f792ebc73f44977d707883753fe5fd03f56cc193893e0a2813a8155401abe1df35522d9f77
+EBUILD PySocks-1.6.7.ebuild 574 SHA256 7e2752398bedeb717693ac9b86aa006176db78eba3927797a9bc0baae56372bd SHA512 fdfb0e14767e95243a160987cecafeb77a6daef62f03d7b0c45784970181ec97545548a6a0522c326e2f4b3a587f35afd597abaaec8ae420e6780dad408f06f8 WHIRLPOOL 7653b7c57d8a089fb2ff64861cd7cc5e352cc466c965d1029c293c62ba2679affd54a74b2f6fc7e55ee5b295915ad70e6f0512c3de26d484833dea26609a22aa
+MISC ChangeLog 1567 SHA256 49131e52fc5a5939cf8573cd5bc4fca05b98e520789da768f5ab3c99281a2c9c SHA512 055a6a9ad210cf4419b37f84300aa012f57532c80111c0a1c20c9b212b94cf691e5b3df96bde45fbdb332c005a8632cb515fa8575e227ab438206c832f5bd283 WHIRLPOOL 112cd5b5cff53a09b7b39aaa6f2d6ccb568dd1cdd5a28c33fb51e00ede7262b41a25c37703166b4a3feda1a6046e09a462de37f7b12d8d753ffc900714752aec
+MISC metadata.xml 499 SHA256 48f4e2ce7cf989a343f53fea7f520630e469e1b3dcae293efbaf98031e9f892c SHA512 ec9cc3e4f9a050f78cb0c073efd3698b47aee2ce14d438163b5037509a5d8076509b4954bec0afc7f1e05bc790f26a6a520bb671b1c8590db966456dcf53b9aa WHIRLPOOL fda2020a7bcca8cca4d694da5552f35ddd20c84405a6ff5a214f088e601f1af0dd13f8c84c39eb3104567eb04ee96527ec9f02f632bd594ab9e6d5ab0078220d
diff --git a/dev-python/PySocks/PySocks-1.5.6.ebuild b/dev-python/PySocks/PySocks-1.5.6.ebuild
new file mode 100644
index 000000000000..dfbcd5cbc53c
--- /dev/null
+++ b/dev-python/PySocks/PySocks-1.5.6.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="SOCKS client module"
+HOMEPAGE="https://github.com/Anorov/PySocks http://pypi.python.org/pypi/PySocks"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/PySocks/PySocks-1.6.7.ebuild b/dev-python/PySocks/PySocks-1.6.7.ebuild
new file mode 100644
index 000000000000..aa40cc6b1ddd
--- /dev/null
+++ b/dev-python/PySocks/PySocks-1.6.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="SOCKS client module"
+HOMEPAGE="https://github.com/Anorov/PySocks http://pypi.python.org/pypi/PySocks"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/PySocks/metadata.xml b/dev-python/PySocks/metadata.xml
new file mode 100644
index 000000000000..ecba000b419e
--- /dev/null
+++ b/dev-python/PySocks/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">PySocks</remote-id>
+    <maintainer status="unknown">
+      <email>anorov.vorona@gmail.com</email>
+      <name>Anorov</name>
+    </maintainer>
+    <remote-id type="github">Anorov/PySocks</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/PyZilla/Manifest b/dev-python/PyZilla/Manifest
new file mode 100644
index 000000000000..c1ba87808c78
--- /dev/null
+++ b/dev-python/PyZilla/Manifest
@@ -0,0 +1,5 @@
+DIST PyZilla-0.1.0.tar.gz 14686 SHA256 43b814f897c7cc518965db1ff4e315d3cf21bcd3dce4f556d7538b7d50b8f02f SHA512 20f893e1251eb9f3c62ee702c12064eb3d560c82131cf4b228d11426f2b8a7c9cf08b8d45439445b381f9c23861f75b5c11c71ef59c50fbca7c0ef952a4fe5e5 WHIRLPOOL 9793b25f56774ac0585baed48ca12c4c11e541210ed8b3a280b55d110b3566c1f5557b8f817817df9202da31c22920ab3055990a5bd0ad8a5660da7207429c4d
+EBUILD PyZilla-0.1.0-r1.ebuild 404 SHA256 c122d555bdd7017438fd1cffea399a993dff6299c964e46538e5f72a48c6ae56 SHA512 c073c5027025c313aa23998f38114a6ed4809c548601beaa361d54cf2b6271d0b12740fc9ad51d2fbcdafb9559d309ffbcf36bc6ae314c9770b281e2851732a3 WHIRLPOOL 17cfc8aca38bd24cfa367a7b1544028680f96ca5ef475710a6c2a7e1cbf62b0f3f90720ea808d330365e863600b6c64f677a25f0e75c1e3c04568473c5c6fe3e
+MISC ChangeLog 2330 SHA256 2aadc721cbd30a900cd8c1b1b6f94f1d449872053eaff9b5039bc0cc866490ce SHA512 e8a4534f6660f46e516e440dfc6222e97357c01f7aacc65a4abcb26420de981a366365d366b2351b7585b828c86f71da23909c31f0e3029bbff5df170932fce3 WHIRLPOOL 50576f578fffd389394be1d0bc5603864461a9e14e03cff5a20bd23b4ed0c2106e89706fe8b0c4062a2cd4b891971e91bb405766f115e3de5173e8cab662ddfc
+MISC ChangeLog-2015 773 SHA256 c1166d0e017ef4a2033adc14eb101352ce6467d97a6f50807c7598efaba36eab SHA512 c5d3d950df16dac9f5e6c33c9947714f9d9ebd19e47a0e95cc7bc9b94f8cb2538c32af4cd42cbe8491a38146060626122cae44f22a862a528b631d147ca2d2ed WHIRLPOOL 44cc5b886cff0d011e113e41d500032c016f23f52a9b7533bdee8856f7066f481652afc19e3cd12af4e1e20e80105ff7d4f03ff593d1633c1cb0e9e40ff4a5a1
+MISC metadata.xml 289 SHA256 82a9d2ace9ba6072b210acc4cc72320d92683a65bee8a5b9bb55fd21ef6e38ff SHA512 8d1840c315abfadc3081d55b8bfc0838740ada22749645b445536867cb90a7ce3949615d47c0ef170ae7bbbb305738c9224c943b0bf38b83ec3339c7f6f82b41 WHIRLPOOL d98b9ba3e31c1fdc74e2fc3d1df48df977f6f1104da303af0a7520dba66cae3d11de429d8b733f2dda6abaa782f8829e9037d907cf82a3fcec89b754bc84ab83
diff --git a/dev-python/PyZilla/PyZilla-0.1.0-r1.ebuild b/dev-python/PyZilla/PyZilla-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..22d8f5aaa914
--- /dev/null
+++ b/dev-python/PyZilla/PyZilla-0.1.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for the BugZilla XML-RPC API"
+HOMEPAGE="https://pypi.python.org/pypi/PyZilla"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/PyZilla/metadata.xml b/dev-python/PyZilla/metadata.xml
new file mode 100644
index 000000000000..772d4a8cac6c
--- /dev/null
+++ b/dev-python/PyZilla/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">PyZilla</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/PythonQt/Manifest b/dev-python/PythonQt/Manifest
new file mode 100644
index 000000000000..3f8f1b262e56
--- /dev/null
+++ b/dev-python/PythonQt/Manifest
@@ -0,0 +1,6 @@
+AUX PythonQt-3.1-commit-433-441.patch 15025 SHA256 c431a1f1b3ca4866a8b94f61c101d1bb15c1daec384e80f4cc4eb19c0c7382c8 SHA512 c1cc65defa0b34df3299f6c6c2c36daa1c3e205fbbb1ee8d9a6e3a2571b58be2ea4e101a137dc867598ef289222c94f26f5142dbd2ec3fff226ddea47cf3ec59 WHIRLPOOL 988fb405eb5fb811dc01fd872f869a8bc453239faf113cacae6caf89c52bce58f9be76ba9418e30915e85b84310e13aa94bfbe4ef417c36a0591a1a82012c795
+DIST PythonQt3.1.zip 4526699 SHA256 2fcb07f6e3e63bc5299ff968b64ca35e05c3f599fe0965285ae92b2317f0f940 SHA512 b3c208e3f909ebb15d40a6e83385f03e6196a8439e39cad4f924e7b1e774edbce83680298ab032161619d1358696a0d073028860f68540aadd8028b712ae8fc1 WHIRLPOOL f21d5c44bae648a33011b30b70d4064f872d7637f89b40f8f907da33ae0bdca6812f880832e33b8f623e6a398bd5d6e7e5a9bea0df8c29efe5d96e31fbeb5d03
+EBUILD PythonQt-3.1.ebuild 1950 SHA256 ebd286874b7e5c4e937f42ff01cad0e82e961bd57fe082356bbbfa3d1d16a930 SHA512 fd3b6db4306fb00df4be264a8bcc37390cf5cbe549177c0739e6a7be89c22c66935123a98640a1dd8ed37ccbd51088a25633bbddc6b3d69a84c64cf8a9908555 WHIRLPOOL 5536906d5e6cd8e3f9d396650c98506819f3faba582282736214a53ebb6df0fe734df3face84900272c1c476b5b52aeb3427ab5798d61970208b31f7bb8a0418
+EBUILD PythonQt-9999.ebuild 1864 SHA256 cfff4dc117fb89c9b15a0555f3e99b1e64fc41fd8ab4d37b53700ec45d8870c2 SHA512 3120052842008e64193375e20573194b637161534ba8a9a08e3572b6c777c3240724e28619bd80b9d6fbed8ff7fc6efe14005b4c690f0197c811cce8ecc0bb46 WHIRLPOOL 7596e7522b3c4ebdfd93afeb58859648e95f8f00ec38c13d312682d97e80904254425304ad87ef82486faa4198675ceed92ae228c3c1a2f220eee36e0705d7f7
+MISC ChangeLog 951 SHA256 157f0f3028648ffbf574b42b823d138298dbbbd3191d475d1d0f87c58d609f19 SHA512 057cd8421f08ba88c903c04372dda95334b4f2905f6e9ad1fa72c56be6833802915701a1ba07394046ef21b24dc37a2a1a9abb45e8f16063001098c88ff67a03 WHIRLPOOL d4d0aa035792206343245df4b0c72e601bf6ad3474d56e3ff32dd50b8a952b3f6c68b8412da7ce92ed5101f7bb9e291ce12cdf6c0ac70d1161d772796af05b45
+MISC metadata.xml 1048 SHA256 2ffe88cb79279f6e76cb31860eb71d2ae10a53b5d380a79e8fc2d8bf59fa34c7 SHA512 b4cc9a0c286e86ec38cc6745a9c6f769e65226f3504eb83ce3893b50e3f31fab5e9152343515e12ffcb43a2fa051af43b6ec58f45e1aff0002c38d4db563763d WHIRLPOOL c0e0576b10184449142ff02d54884141e4062b0ffc2537f8629a0415cace0cfea3fd3239210e9c377c63089079df4afb28626d93e93afbe2541f5b50f3c7c8a6
diff --git a/dev-python/PythonQt/PythonQt-3.1.ebuild b/dev-python/PythonQt/PythonQt-3.1.ebuild
new file mode 100644
index 000000000000..147196f81ea7
--- /dev/null
+++ b/dev-python/PythonQt/PythonQt-3.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+MY_P=${PN}${PV}
+
+inherit qmake-utils python-single-r1
+
+DESCRIPTION="A dynamic Python binding for the Qt framework"
+HOMEPAGE="http://pythonqt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pythonqt/pythonqt/${P}/${MY_P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +extensions webkit"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	extensions? (
+		dev-qt/designer:5
+		dev-qt/qtdeclarative:5[widgets]
+		dev-qt/qtmultimedia:5[widgets]
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtsql:5
+		dev-qt/qtsvg:5
+		dev-qt/qtxml:5
+		dev-qt/qtxmlpatterns:5
+		webkit? ( dev-qt/qtwebkit:5 )
+	)"
+DEPEND="${RDEPEND}
+	dev-qt/qtxml:5
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="webkit? ( extensions ) ${PYTHON_REQUIRED_USE}"
+
+# Bring uitools back, backport other fixes from trunk
+PATCHES=( "${FILESDIR}/${P}-commit-433-441.patch" )
+
+src_prepare() {
+	default
+
+	if ! use extensions ; then
+		sed -i '/SUBDIRS/s/extensions//' PythonQt.pro || die "sed for extensions"
+	fi
+	if ! use webkit ; then
+		# Remove webkit support if not used
+		sed -i '/qtHaveModule(webkit):CONFIG += PythonQtWebKit/d' \
+			extensions/PythonQt_QtAll/PythonQt_QtAll.pro \
+			|| die "sed for webkit"
+	fi
+
+	# Unset python version to use python-config
+	sed -i "/unix:PYTHON_VERSION=/s/2.7//" build/python.prf \
+		|| die "sed for python version"
+}
+
+src_configure() {
+	eqmake5 PREFIX="${ED%/}"/usr
+}
+
+src_install() {
+	einstalldocs
+
+	# Includes
+	insinto /usr/include/PythonQt
+	doins -r src/*.h
+	insinto /usr/include/PythonQt/gui
+	doins -r src/gui/*.h
+
+	if use extensions ; then
+		insinto /usr/include/PythonQt/extensions/PythonQt_QtAll
+		doins -r extensions/PythonQt_QtAll/*.h
+	fi
+
+	# Libraries
+	dolib.so lib/libPythonQt*
+}
diff --git a/dev-python/PythonQt/PythonQt-9999.ebuild b/dev-python/PythonQt/PythonQt-9999.ebuild
new file mode 100644
index 000000000000..78f9df35233f
--- /dev/null
+++ b/dev-python/PythonQt/PythonQt-9999.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+MY_P=${PN}${PV}
+
+inherit qmake-utils python-single-r1 subversion
+
+DESCRIPTION="A dynamic Python binding for the Qt framework"
+HOMEPAGE="http://pythonqt.sourceforge.net/"
+SRC_URI=""
+ESVN_REPO_URI="https://pythonqt.svn.sourceforge.net/svnroot/pythonqt/trunk"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc +extensions webkit"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	extensions? (
+		dev-qt/designer:5
+		dev-qt/qtdeclarative:5[widgets]
+		dev-qt/qtmultimedia:5[widgets]
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtsql:5
+		dev-qt/qtsvg:5
+		dev-qt/qtxml:5
+		dev-qt/qtxmlpatterns:5
+		webkit? ( dev-qt/qtwebkit:5 )
+	)"
+DEPEND="${RDEPEND}
+	dev-qt/qtxml:5
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="webkit? ( extensions ) ${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	default
+
+	if ! use extensions ; then
+		sed -i '/SUBDIRS/s/extensions//' PythonQt.pro || die "sed for extensions"
+	fi
+	if ! use webkit ; then
+		# Remove webkit support if not used
+		sed -i '/qtHaveModule(webkit):CONFIG += PythonQtWebKit/d' \
+			extensions/PythonQt_QtAll/PythonQt_QtAll.pro \
+			|| die "sed for webkit"
+	fi
+
+	# Unset python version to use python-config
+	sed -i "/unix:PYTHON_VERSION=/s/2.7//" build/python.prf \
+		|| die "sed for python version"
+}
+
+src_configure() {
+	eqmake5 PREFIX="${ED%/}"/usr
+}
+
+src_install() {
+	einstalldocs
+
+	# Includes
+	insinto /usr/include/PythonQt
+	doins -r src/*.h
+	insinto /usr/include/PythonQt/gui
+	doins -r src/gui/*.h
+
+	if use extensions ; then
+		insinto /usr/include/PythonQt/extensions/PythonQt_QtAll
+		doins -r extensions/PythonQt_QtAll/*.h
+	fi
+
+	# Libraries
+	dolib.so lib/libPythonQt*
+}
diff --git a/dev-python/PythonQt/files/PythonQt-3.1-commit-433-441.patch b/dev-python/PythonQt/files/PythonQt-3.1-commit-433-441.patch
new file mode 100644
index 000000000000..90d3cb9d2ec9
--- /dev/null
+++ b/dev-python/PythonQt/files/PythonQt-3.1-commit-433-441.patch
@@ -0,0 +1,301 @@
+diff -uprNEBZ --suppress-blank-empty a/extensions/PythonQt_QtAll/PythonQt_QtAll.cpp b/extensions/PythonQt_QtAll/PythonQt_QtAll.cpp
+--- a/extensions/PythonQt_QtAll/PythonQt_QtAll.cpp	2016-06-09 06:46:16.000000000 -0500
++++ b/extensions/PythonQt_QtAll/PythonQt_QtAll.cpp	2016-07-25 06:06:45.000000000 -0500
+@@ -45,6 +45,7 @@ void PythonQt_init_QtXmlPatterns(PyObjec
+ void PythonQt_init_QtMultimedia(PyObject*);

+ void PythonQt_init_QtQml(PyObject*);

+ void PythonQt_init_QtQuick(PyObject*);

++void PythonQt_init_QtUiTools(PyObject*);
+ 

+ #ifdef PYTHONQT_WITH_WEBKIT

+ void PythonQt_init_QtWebKit(PyObject*);

+@@ -67,6 +68,7 @@ namespace PythonQt_QtAll
+     PythonQt_init_QtMultimedia(0);

+     PythonQt_init_QtQml(0);

+     PythonQt_init_QtQuick(0);

++    PythonQt_init_QtUiTools(0);
+   };

+ };

+ 

+diff -uprNEBZ --suppress-blank-empty a/extensions/PythonQt_QtAll/PythonQt_QtAll.pro b/extensions/PythonQt_QtAll/PythonQt_QtAll.pro
+--- a/extensions/PythonQt_QtAll/PythonQt_QtAll.pro	2016-06-09 07:00:18.000000000 -0500
++++ b/extensions/PythonQt_QtAll/PythonQt_QtAll.pro	2016-07-25 06:06:45.000000000 -0500
+@@ -21,7 +21,7 @@ SOURCES +=                \
+ 

+ QT += gui svg sql network xml xmlpatterns opengl

+ QT += widgets printsupport multimedia multimediawidgets

+-QT += quick qml quickwidgets

++QT += quick qml quickwidgets uitools
+ 

+ include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_core/com_trolltech_qt_core.pri)

+ include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_gui/com_trolltech_qt_gui.pri)

+@@ -34,6 +34,7 @@ include ($$PYTHONQT_GENERATED_PATH/com_t
+ include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_multimedia/com_trolltech_qt_multimedia.pri)

+ include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_qml/com_trolltech_qt_qml.pri)

+ include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_quick/com_trolltech_qt_quick.pri)

++include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_uitools/com_trolltech_qt_uitools.pri)
+ 

+ PythonQtWebKit {

+   QT += webkit webkitwidgets

+diff -uprNEBZ --suppress-blank-empty a/generator/abstractmetalang.cpp b/generator/abstractmetalang.cpp
+--- a/generator/abstractmetalang.cpp	2015-06-18 08:32:57.000000000 -0500
++++ b/generator/abstractmetalang.cpp	2016-08-03 02:16:08.000000000 -0500
+@@ -838,14 +838,24 @@ AbstractMetaFunctionList AbstractMetaCla
+     return returned;

+ }

+ 

+-bool AbstractMetaClass::hasDefaultIsNull() const 

++QString AbstractMetaClass::getDefaultNonZeroFunction() const
+ {

++  foreach(const AbstractMetaFunction* fun, queryFunctionsByName("isEmpty")) {
++    if (fun->actualMinimumArgumentCount()==0 && fun->isPublic()) {
++      return "isEmpty";
++    }
++  }
++  foreach(const AbstractMetaFunction* fun, queryFunctionsByName("isValid")) {
++    if (fun->actualMinimumArgumentCount() == 0 && fun->isPublic()) {
++      return "isValid";
++    }
++  }
+   foreach(const AbstractMetaFunction* fun, queryFunctionsByName("isNull")) {

+-    if (fun->actualMinimumArgumentCount()==0) {

+-      return true;

++    if (fun->actualMinimumArgumentCount() == 0 && fun->isPublic()) {
++      return "isNull";
+     }

+   }

+-  return false;

++  return QString();
+ }

+ 

+ /*******************************************************************************

+diff -uprNEBZ --suppress-blank-empty a/generator/abstractmetalang.h b/generator/abstractmetalang.h
+--- a/generator/abstractmetalang.h	2014-09-25 05:51:32.000000000 -0500
++++ b/generator/abstractmetalang.h	2016-08-01 04:12:32.000000000 -0500
+@@ -800,7 +800,8 @@ public:
+     void setHasCloneOperator(bool on) { m_has_clone_operator = on; }

+     bool hasCloneOperator() const { return m_has_clone_operator; }

+ 

+-    bool hasDefaultIsNull() const;

++    QString getDefaultNonZeroFunction() const;
++
+     void addPropertySpec(QPropertySpec *spec) { m_property_specs << spec; }

+     QList<QPropertySpec *> propertySpecs() const { return m_property_specs; }

+ 

+diff -uprNEBZ --suppress-blank-empty a/generator/merge.sh b/generator/merge.sh
+--- a/generator/merge.sh	1969-12-31 18:00:00.000000000 -0600
++++ b/generator/merge.sh	2010-03-05 16:03:37.000000000 -0600
+@@ -0,0 +1,11 @@
++#!/bin/sh
++
++xsltproc -o typesystem_core.xml --stringparam source 'typesystem_core-qtscript.xml'  merge.xsl typesystem_core-common.xml
++xsltproc -o typesystem_gui.xml --stringparam source 'typesystem_gui-qtscript.xml'  merge.xsl typesystem_gui-common.xml
++xsltproc -o typesystem_opengl.xml --stringparam source 'typesystem_opengl-qtscript.xml'  merge.xsl typesystem_opengl-common.xml
++xsltproc -o typesystem_network.xml --stringparam source 'typesystem_network-qtscript.xml'  merge.xsl typesystem_network-common.xml
++xsltproc -o typesystem_xml.xml --stringparam source 'typesystem_xml-qtscript.xml'  merge.xsl typesystem_xml-common.xml
++xsltproc -o typesystem_webkit.xml --stringparam source 'typesystem_webkit-qtscript.xml'  merge.xsl typesystem_webkit-common.xml
++xsltproc -o typesystem_sql.xml --stringparam source 'typesystem_sql-qtscript.xml'  merge.xsl typesystem_sql-common.xml
++xsltproc -o typesystem_svg.xml --stringparam source 'typesystem_svg-qtscript.xml'  merge.xsl typesystem_svg-common.xml
++xsltproc -o typesystem_xmlpatterns.xml --stringparam source 'typesystem_xmlpatterns-qtscript.xml'  merge.xsl typesystem_xmlpatterns-common.xml
+\ No newline at end of file
+diff -uprNEBZ --suppress-blank-empty a/generator/setupgenerator.cpp b/generator/setupgenerator.cpp
+--- a/generator/setupgenerator.cpp	2016-05-03 04:25:38.000000000 -0500
++++ b/generator/setupgenerator.cpp	2016-08-01 04:12:32.000000000 -0500
+@@ -105,7 +105,7 @@ static QStringList getOperatorCodes(cons
+       r.insert("PythonQt::Type_InplaceXor");

+     }

+   }

+-  if (cls->hasDefaultIsNull()) {

++  if (!cls->getDefaultNonZeroFunction().isEmpty()) {
+     r.insert("PythonQt::Type_NonZero");

+   }

+ 

+diff -uprNEBZ --suppress-blank-empty a/generator/shellheadergenerator.cpp b/generator/shellheadergenerator.cpp
+--- a/generator/shellheadergenerator.cpp	2016-05-10 10:01:30.000000000 -0500
++++ b/generator/shellheadergenerator.cpp	2016-08-09 07:20:29.000000000 -0500
+@@ -267,7 +267,11 @@ void ShellHeaderGenerator::write(QTextSt
+   QList<FlagsTypeEntry*> flags;

+   foreach(AbstractMetaEnum* enum1, enums1) {

+     // catch gadgets and enums that are not exported on QObjects...

+-    if ((enum1->wasProtected() || enum1->wasPublic()) && (!meta_class->isQObject() || !enum1->hasQEnumsDeclaration())) {

++    // since we don't parse Q_FLAG(S), we also need to generate for Q_ENUM which might
++    // have a missing Q_FLAG(S) declaration.
++    if ((enum1->wasProtected() || enum1->wasPublic()) && 
++      (!meta_class->isQObject() || !enum1->hasQEnumsDeclaration() || enum1->typeEntry()->flags()))
++    {
+       enums << enum1;

+       if (enum1->typeEntry()->flags()) {

+         flags << enum1->typeEntry()->flags();

+@@ -395,8 +399,13 @@ void ShellHeaderGenerator::write(QTextSt
+   if (meta_class->hasDefaultToStringFunction() || meta_class->hasToStringCapability()) {

+     s << "    QString py_toString(" << meta_class->qualifiedCppName() << "*);" << endl; 

+   }

+-  if (meta_class->hasDefaultIsNull()) {

+-    s << "    bool __nonzero__(" << meta_class->qualifiedCppName() << "* obj) { return !obj->isNull(); }" << endl; 

++  QString nonZeroFunc = meta_class->getDefaultNonZeroFunction();
++  if (!nonZeroFunc.isEmpty()) {
++    s << "    bool __nonzero__(" << meta_class->qualifiedCppName() << "* obj) { return ";
++    if (nonZeroFunc != "isValid") {
++      s << "!";
++    }
++    s << "obj->" << nonZeroFunc << "(); }" << endl;
+   }

+ 

+   AbstractMetaFieldList fields = meta_class->fields();

+diff -uprNEBZ --suppress-blank-empty a/generator/typesystem_core.xml b/generator/typesystem_core.xml
+--- a/generator/typesystem_core.xml	2016-05-30 07:33:59.000000000 -0500
++++ b/generator/typesystem_core.xml	2016-06-13 04:54:38.000000000 -0500
+@@ -550,6 +550,8 @@
+   <rejection class="QObject" function-name="disconnectNotify"/>

+   <rejection class="QObject" function-name="registerUserData"/>

+   <rejection class="QProcess" function-name="pid"/>

++  <rejection class="QProcess" function-name="setInheritHandles"/>
++  <rejection class="QProcess" function-name="inheritHandles"/>
+   <rejection class="QRegion" function-name="cleanUp"/>

+   <rejection class="QSettings" function-name="registerFormat"/>

+   <rejection class="QVector" function-name="back"/>

+diff -uprNEBZ --suppress-blank-empty a/generator/typesystem_gui.xml b/generator/typesystem_gui.xml
+--- a/generator/typesystem_gui.xml	2016-06-01 03:20:27.000000000 -0500
++++ b/generator/typesystem_gui.xml	2016-06-20 04:58:59.000000000 -0500
+@@ -1307,6 +1307,17 @@ PyObject* constScanLine(QImage* image, i
+   <object-type name="QWizard">

+     <!-- ### Requires correct class name in meta object -->

+     <modify-function signature="setDefaultProperty(const char *, const char *, const char *)" remove="all"/>

++    
++    <modify-function signature="addPage(QWizardPage*)">
++      <modify-argument index="1">
++        <define-ownership owner="c++" />
++      </modify-argument>
++    </modify-function>
++    <modify-function signature="setButton(QWizard::WizardButton, QAbstractButton*)">
++      <modify-argument index="2">
++        <define-ownership owner="c++" />
++      </modify-argument>
++    </modify-function>
+   </object-type>

+   <object-type name="QWizardPage">

+   </object-type>

+diff -uprNEBZ --suppress-blank-empty a/src/PythonQtConversion.cpp b/src/PythonQtConversion.cpp
+--- a/src/PythonQtConversion.cpp	2016-06-02 07:30:53.000000000 -0500
++++ b/src/PythonQtConversion.cpp	2016-07-21 08:36:40.000000000 -0500
+@@ -746,9 +746,14 @@ QString PythonQtConv::PyObjGetRepresenta
+ QString PythonQtConv::PyObjGetString(PyObject* val, bool strict, bool& ok) {

+   QString r;

+   ok = true;

++#ifndef PY3K
++  // in Python 3, we don't want to convert to QString, since we don't know anything about the encoding
++  // in Python 2, we assume the default for str is latin-1
+   if (val->ob_type == &PyBytes_Type) {

+-    r = QString(PyBytes_AS_STRING(val));

+-  } else if (PyUnicode_Check(val)) {

++    r = QString::fromLatin1(PyBytes_AS_STRING(val));
++  } else
++#endif
++  if (PyUnicode_Check(val)) {
+ #ifdef PY3K

+     r = QString::fromUtf8(PyUnicode_AsUTF8(val));

+ #else

+@@ -976,8 +981,15 @@ QVariant PythonQtConv::PyObjToQVariant(P
+ #endif

+     ) {

+     // no special type requested

+-    if (PyBytes_Check(val) || PyUnicode_Check(val)) {

+-      // NOTE: for compatibility reasons between Python 2/3 we don't use ByteArray for PyBytes_Type

++    if (PyBytes_Check(val)) {
++#ifdef PY3K
++      // In Python 3, it is a ByteArray
++      type = QVariant::ByteArray;
++#else
++      // In Python 2, we need to use String, since it might be a string
++      type = QVariant::String;
++#endif
++    } else if (PyUnicode_Check(val)) {
+       type = QVariant::String;

+     } else if (val == Py_False || val == Py_True) {

+       type = QVariant::Bool;

+@@ -1117,6 +1129,14 @@ QVariant PythonQtConv::PyObjToQVariant(P
+     }

+ 

+   case QVariant::ByteArray:

++    {
++      bool ok;
++#ifdef PY3K
++      v = QVariant(PyObjGetBytes(val, false, ok));
++#else
++      v = QVariant(PyObjGetString(val, false, ok));
++#endif
++    }
+   case QVariant::String:

+     {

+       bool ok;

+@@ -1504,7 +1524,7 @@ QByteArray PythonQtConv::getCPPTypeName(
+ bool PythonQtConv::isStringType(PyTypeObject* type)

+ {

+ #ifdef PY3K

+-  return type == &PyUnicode_Type

++  return type == &PyUnicode_Type;
+ #else

+   return type == &PyUnicode_Type || type == &PyString_Type;

+ #endif

+diff -uprNEBZ --suppress-blank-empty a/src/PythonQt.cpp b/src/PythonQt.cpp
+--- a/src/PythonQt.cpp	2016-05-23 02:31:11.000000000 -0500
++++ b/src/PythonQt.cpp	2016-06-20 03:26:33.000000000 -0500
+@@ -1977,6 +1977,7 @@ void PythonQtPrivate::buildDynamicMetaOb
+   // Now look for slots: (this is a bug in QMetaObjectBuilder, all signals need to be added first)

+   while (PyDict_Next(dict, &pos, &key, &value)) {

+     if (PythonQtProperty_Check(value)) {

++      needsMetaObject = true;
+       PythonQtProperty* prop = (PythonQtProperty*)value;

+       QMetaPropertyBuilder newProp = builder.addProperty(PyString_AsString(key), prop->data->cppType);

+       newProp.setReadable(true);

+diff -uprNEBZ --suppress-blank-empty a/src/PythonQtSlotDecorator.cpp b/src/PythonQtSlotDecorator.cpp
+--- a/src/PythonQtSlotDecorator.cpp	2016-05-19 10:22:41.000000000 -0500
++++ b/src/PythonQtSlotDecorator.cpp	2016-07-21 08:36:40.000000000 -0500
+@@ -42,9 +42,9 @@ int PythonQtSlotDecorator_init(PyObject
+   char* argName = 0;

+   PyObject* argResult = 0;

+ 

+-  static char* kwlist[] = {"name", "result", 0};

++  static const char* kwlist[] = {"name", "result", 0};
+   static PyObject* emptyTuple = PyTuple_New(0);

+-  if (!PyArg_ParseTupleAndKeywords(emptyTuple, kw, "|sO:QtCore.Slot", kwlist, &argName, &argResult)) {

++  if (!PyArg_ParseTupleAndKeywords(emptyTuple, kw, "|sO:QtCore.Slot", (char**) kwlist, &argName, &argResult)) {
+     return 0;

+   }

+ 

+diff -uprNEBZ --suppress-blank-empty a/src/PythonQtStdDecorators.cpp b/src/PythonQtStdDecorators.cpp
+--- a/src/PythonQtStdDecorators.cpp	2016-06-06 06:45:45.000000000 -0500
++++ b/src/PythonQtStdDecorators.cpp	2016-06-20 03:26:33.000000000 -0500
+@@ -153,12 +153,12 @@ QVariant PythonQtStdDecorators::property
+   return o->property(name);

+ }

+ 

+-QString PythonQtStdDecorators::tr(QObject* obj, const QByteArray& text, const QByteArray& ambig, int n)

++QString PythonQtStdDecorators::tr(QObject* obj, const QString& text, const QString& ambig, int n)
+ {

+ #if( QT_VERSION >= QT_VERSION_CHECK(5,0,0) )

+-  return QCoreApplication::translate(obj->metaObject()->className(), text.constData(), ambig.constData(), n);

++  return QCoreApplication::translate(obj->metaObject()->className(), text.toUtf8().constData(), ambig.toUtf8().constData(), n);
+ #else

+-  return QCoreApplication::translate(obj->metaObject()->className(), text.constData(), ambig.constData(), QCoreApplication::CodecForTr, n);

++  return QCoreApplication::translate(obj->metaObject()->className(), text.toUtf8().constData(), ambig.toUtf8().constData(), QCoreApplication::CodecForTr, n);
+ #endif

+ }

+ 

+diff -uprNEBZ --suppress-blank-empty a/src/PythonQtStdDecorators.h b/src/PythonQtStdDecorators.h
+--- a/src/PythonQtStdDecorators.h	2016-06-06 06:45:45.000000000 -0500
++++ b/src/PythonQtStdDecorators.h	2016-06-20 03:26:33.000000000 -0500
+@@ -106,10 +106,10 @@ public Q_SLOTS:
+   int static_Qt_qrand() { return qrand(); }

+   void static_Qt_qsrand(uint a) { qsrand(a); }

+ 

+-  QString tr(QObject* obj, const QByteArray& text, const QByteArray& ambig = QByteArray(), int n = -1);

++  QString tr(QObject* obj, const QString& text, const QString& ambig = QString(), int n = -1);
+ 

+-  QByteArray static_Qt_SIGNAL(const QByteArray& s) { return QByteArray("2") + s; }

+-  QByteArray static_Qt_SLOT(const QByteArray& s) { return QByteArray("1") + s; }

++  QString static_Qt_SIGNAL(const QString& s) { return QString("2") + s; }
++  QString static_Qt_SLOT(const QString& s) { return QString("1") + s; }
+ 

+   void static_QTimer_singleShot(int msec, PyObject* callable);

+ 

diff --git a/dev-python/PythonQt/metadata.xml b/dev-python/PythonQt/metadata.xml
new file mode 100644
index 000000000000..7176d61f5f48
--- /dev/null
+++ b/dev-python/PythonQt/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>spiderx@spiderx.dp.ua</email>
+		<name>Vladimir Pavljuchenkov</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+PythonQt is a dynamic Python binding for the Qt framework.
+It offers an easy way to embed the Python scripting language into your C++ Qt applications.
+The focus of PythonQt is on embedding Python into an existing C++ application,
+not on writing the whole application completely in Python.
+	</longdescription>
+	<use>
+		<flag name="extensions">Install extensions</flag>
+	</use>
+	<upstream>
+		<changelog>https://sourceforge.net/p/pythonqt/news/</changelog>
+		<doc>http://pythonqt.sourceforge.net/index.html</doc>
+		<remote-id type="sourceforge">pythonqt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
new file mode 100644
index 000000000000..bf682812a647
--- /dev/null
+++ b/dev-python/QtPy/Manifest
@@ -0,0 +1,6 @@
+DIST QtPy-1.2.1.tar.gz 29210 SHA256 5803ce31f50b24295e8e600b76cc91d7f2a3140a5a0d526d40226f9ec5e9097d SHA512 7f9609b479a11daf1d8302040552f3926aa869eb775d23e32282a80ae9f5a39bf9be6b18cd62a6094a176ee8e7b4aef896fa8687eb2ce9ab9486f02aeeb756d7 WHIRLPOOL c598789661a43c96b3b4db8fb766fbfdcc746a8c6bdf270175b4e3f2733b666939e44921a056c1f77d2d6683ec73a4221ab409c320c840cdc7ee2d00ccec6184
+DIST QtPy-1.3.1.tar.gz 25061 SHA256 08af2525d59f9eb639946d5ed7a72b002103c5b7369c0ef0dd70ad2696845313 SHA512 3d06359b2793a57d8da715384b83e332cbc40d9f55699a2ddff0ebb04f527b9c629ea74b385103fd2ca98a79b02c8a582d16fa594048e7d56a32bda743da2008 WHIRLPOOL 7bd85d95fcbcea6f93d781d2c8e12252f4eff17dcfec269f24d97998d5aad50dec24f702641d1b5432c1235ba13f9ed5ec43f2ef20ff0b23d00873af8410e340
+EBUILD QtPy-1.2.1.ebuild 1046 SHA256 bf791cb5374ca77b32cc0e57b5f70567aab8617dcc53ecd98f50d32c52db8c85 SHA512 2a2eb52286a6f55b14cf8ab36243f526d5f6a9a9dad9734d1ad41139a92673eec9c4ac714854e0c52fded3d839d2867f42bba75f3e7aac6e7d40550ceb8f90f8 WHIRLPOOL 940be50c920bb97756b44e7ac7b59057b09114a52bbb8c4aea7c97643b089d7a0b9ad26e0604dc0ea30f5c4e1951e6e8530d6e1ee46c87a278933e1ca05b10e8
+EBUILD QtPy-1.3.1.ebuild 1580 SHA256 875ff4a73bbba58bb8ed7480615af77e8ad9593f57ba42cf9a19c446e8c21225 SHA512 04bb66f6fd55fe589440d87f101308789e17b83b03d0ec27fbc7abb85efc886413a5f854775d4cedc99d84408fbf6ef48591b79ce50ee2d794dd141d259bc321 WHIRLPOOL 1a3e87f4f990a1acfd50341da3e9b9b413242c444bd896d48888cccc1176b8d7af40760c571b034250b2340974037a9c03832ec334047d97cd74c96b1901dbcb
+MISC ChangeLog 306 SHA256 9c42b8b57b614e1393711ebca625b114e697e9b8c396a1963c42227a68c331e5 SHA512 ef90e0e8de842a964b98304cef134fd8f746f0f0b3eeff67f1cc8afc034fb1597a0f71df4e336de84b85a3787a075387fdf78bfe4a2f6377936edce6d243f490 WHIRLPOOL 01ae8a7970ba4a10a41c02a801ad783c64b54c95ed0b2a7047e2b066af655a0d399027f711c2f2e7155dbc9b1839bf9929e9673e8542571563aa264583e324a9
+MISC metadata.xml 1495 SHA256 46b09f6eb7fd10b31f41a97968d369bb912d0a3768d64a2fda838deb32d39b6d SHA512 c3313293f62965020192201cabe53607657d8c5a3cc67cc420d7ae20d3d58aa2c12e1493181fe591733d0b2587c2702b05b225327e6269427a3d6a067d633521 WHIRLPOOL 2a26f7fc9d3295eeca1220f2eec3941d7436a5e2a2ed8be1e39a7f73c747e86a9c8a9724368d1de08484e201b0a3a1352b928ef7a1ec2ad5d0ed846aab7da1d7
diff --git a/dev-python/QtPy/QtPy-1.2.1.ebuild b/dev-python/QtPy/QtPy-1.2.1.ebuild
new file mode 100644
index 000000000000..86fa7592ebdc
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abtraction layer for PyQt5/PyQt4/PySide"
+HOMEPAGE="https://github.com/spyder-ide/qtpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+IUSE="designer gui opengl svg testlib webkit"
+
+RDEPEND="
+	|| (
+		  dev-python/PyQt5[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=]
+		  dev-python/PyQt4[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=]
+		  dev-python/pyside[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=]
+	   )
+	gui? ( || (
+		  dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+		  dev-python/PyQt4[${PYTHON_USEDEP},X]
+		  dev-python/pyside[${PYTHON_USEDEP},X]
+	) )
+	testlib? ( || (
+		  dev-python/PyQt5[${PYTHON_USEDEP},testlib]
+		  dev-python/PyQt4[${PYTHON_USEDEP},testlib]
+		  dev-python/pyside[${PYTHON_USEDEP},X]
+	) )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/QtPy/QtPy-1.3.1.ebuild b/dev-python/QtPy/QtPy-1.3.1.ebuild
new file mode 100644
index 000000000000..5d5c3d3f23c8
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.3.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abtraction layer for PyQt5/PyQt4/PySide"
+HOMEPAGE="https://github.com/spyder-ide/qtpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="designer gui opengl pyqt4 +pyqt5 pyside svg testlib webkit"
+
+REQUIRED_USE="|| ( pyqt4 pyqt5 pyside )"
+
+RDEPEND="
+	pyqt4? (
+		dev-python/PyQt4[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
+		gui? ( dev-python/PyQt4[${PYTHON_USEDEP},X] )
+		testlib? ( dev-python/PyQt4[${PYTHON_USEDEP},testlib] )
+	)
+	pyqt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
+		gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
+		testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
+	)
+	pyside? (
+		dev-python/pyside[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
+		gui? ( dev-python/pyside[${PYTHON_USEDEP},X] )
+		testlib? ( dev-python/pyside[${PYTHON_USEDEP},X] )
+	)
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	if ! use pyqt4; then
+		sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+
+	if ! use pyqt5; then
+		sed -i -e "s/from PyQt5.Qt import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+
+	if ! use pyside; then
+		sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
+		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+}
diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
new file mode 100644
index 000000000000..85ca2f8aaa37
--- /dev/null
+++ b/dev-python/QtPy/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Gentoo Python Project</name>
+  </maintainer>
+  <longdescription>
+     QtPy is a small abstraction layer that lets you write
+     applications using a single API call to either PyQt or
+     PySide. QtPy also provides a set of additional QWidgets. It
+     provides support for PyQt5, PyQt4 and PySide using the PyQt5
+     layout (where the QtGui module has been split into QtGui and
+     QtWidgets).
+     Basically, you write your code as if you were using PyQt5 but
+     import qt from QtPy instead of PyQt5.
+  </longdescription>
+  <use>
+    <flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
+    <flag name="gui">Build bindings for the QtGui module</flag>
+    <flag name="pyqt4">Enable the <pkg>dev-python/PyQt4</pkg> backend</flag>
+    <flag name="pyqt5">Enable the <pkg>dev-python/PyQt5</pkg> backend</flag>
+    <flag name="pyside">Enable the <pkg>dev-python/pyside</pkg> backend</flag>
+    <flag name="svg">Build bindings for the QtSvg module</flag>
+    <flag name="testlib">Build bindings for the QtTest module</flag>
+    <flag name="webkit">Build bindings for the QtWebKit module</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">spyder-ide/qtpy</remote-id>
+    <remote-id type="pypi">QtPy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ReParser/Manifest b/dev-python/ReParser/Manifest
new file mode 100644
index 000000000000..78e792ec8718
--- /dev/null
+++ b/dev-python/ReParser/Manifest
@@ -0,0 +1,3 @@
+DIST ReParser-1.4.3.tar.gz 4560 SHA256 e69caf58a29d6e04723f6a7a456d304b7acfcf413957dafcd90ee49eccc2d15a SHA512 db02caa6f4f1997cfc7a79283b1b90d3ff96e7fa2e7ba5b119e0060b97d1dd2604640c7d0a8503dbc05613b9b507e7d8732e9448c3ecb59ba85cf340ff1a5e2b WHIRLPOOL dd14ed07b663558a0701ff26b14bb98288c13874e66d1399af98444f65302630148a289590f739d4950fcfb5a5a5825c7173da7215d307e474c57032b70524ae
+EBUILD ReParser-1.4.3.ebuild 554 SHA256 e4442caa410747b5b8883f81295771bf09196e1d4dd7e3d790cf1b4be11a50e6 SHA512 d22ce9807bcbbe97b4eb35588a00f622a2223f96ed19f868262bacbead63c0a6d3ac45c8d48944bd73d9b0cd130929cb02c50531db9e311b9ad3ae81879eef68 WHIRLPOOL bb6c20f0b224bc256b073f1e378aa985ad7b3c0e01bb74a6519cff444b5e784e1739f7a98a1ed99c00c0cbd3595a5a1860f8a833f62f5b0c425239b2c06e03cf
+MISC metadata.xml 398 SHA256 215267693dc931a429ea05b77f4cbf8755f84d9d19430f543ebf17599f35ed05 SHA512 5a538c39f6f84d8ffd0a465694f34b22737b944c7226fb01abff08b4627276337688dc3d9255ee219cd75e066c4ba30e66b072af8d56ff288d2eeebf906b39f1 WHIRLPOOL a2c517bc14e62f394e0d5289f48f1afcd8932a4468b890297bdf60d53d5b0f37d11c356fbe8455783e7728ca29c39ada6da8c8d1457c5149cdaa719c3b48ebfe
diff --git a/dev-python/ReParser/ReParser-1.4.3.ebuild b/dev-python/ReParser/ReParser-1.4.3.ebuild
new file mode 100644
index 000000000000..d32e469cd441
--- /dev/null
+++ b/dev-python/ReParser/ReParser-1.4.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/hickford/MechanicalSoup"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Simple regex-based lexer/parser for inline markup"
+HOMEPAGE="https://pypi.python.org/pypi/ReParser"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ReParser/metadata.xml b/dev-python/ReParser/metadata.xml
new file mode 100644
index 000000000000..25d6f600a268
--- /dev/null
+++ b/dev-python/ReParser/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ReParser</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/RecSQL/Manifest b/dev-python/RecSQL/Manifest
new file mode 100644
index 000000000000..3ee5e503c73d
--- /dev/null
+++ b/dev-python/RecSQL/Manifest
@@ -0,0 +1,5 @@
+DIST RecSQL-0.7.8.tar.gz 140025 SHA256 1b74b7c177e51a39d4889740ca015d793d48d1026c380e77fdbcc84919188c18 SHA512 bbe5dc547d8e254eac2513c66cdcbf564e491212ee549cafd5051caf545c4b8b7c6d9f728807ab1fff98a55a5c617f4736dd67b1c5a2ab882408d9289340c33c WHIRLPOOL 470bc80dfcb631cf9b5e4bf4844a606fa1aec4409bbee58227bd575c0a18748bf8956e7f6a75c1fce94a6870b7a8477a48e4694b972485c62fc58eef0918734a
+EBUILD RecSQL-0.7.8.ebuild 683 SHA256 058505ef250c1925eb046e388640d27900c4b80628ccd1518133d95e6ad224aa SHA512 8e8dfe1f96793f3c5b6031e1f8d49851e2629086f9627c095069ccc17878889b09b927eae3f299c916e75bfbd3cdf38110ceabcb915e9eaddb24d23111562e1c WHIRLPOOL 1d6ccf88ed737f26f6c7741eb8070f60be3e63c918c2953f7b35f170dcec863d145a6ded776891f87d00ab2d7fea5ca1d81e09b03b18c53e95ebbe2921231b6e
+MISC ChangeLog 2652 SHA256 9fedbfb5d138fe23452db66ac329c3f66d7b82eb4518da13f097ca76d621614e SHA512 8090e03f845f54ecce3d7af8e4144581375de6b3f5a64b9355aed6bba1464810463a1e90fd6d8aa6577a44d6172b66406629e77ed823f88c9677424452ebc05b WHIRLPOOL eef96cb35a66470496bdeaf90180378e050e1b3f8c8ee867ecbe687578e2740142e65c08a432bc4f54a878b7eabf04275842303cbfee6c1ac72b40cf582fd589
+MISC ChangeLog-2015 879 SHA256 800bc0334b547976e0de9d926c3419a857da5c45d2809dc2535b8e665bac15e9 SHA512 54f2dc49f5079e9aba4a96f5a5e96c90a8d67faf19c2bcfcc68699885337b65592484347c7ffc519bf54371c3698421507de290c48a1c0033410b40c8d80da5b WHIRLPOOL 21e1f44e955d3bf5bd6486792ba61b2a6abe6cd2d38426765f2d3eebea78c88f254efe920827307ca6373cff53725ef43507912a9a45d66f1fc4c60ff6ede2d5
+MISC metadata.xml 458 SHA256 f3dcaece506c3d9a6c88e949e24c4cc924bfd3d166ef3767391a916a18144599 SHA512 28380450131ce260ddba649be54b15115115bd150124fe11dab164f54a39146cb021468e15467e33868d8ddd99cc788535f7de5300b4dfc247984fbfffe13703 WHIRLPOOL ba27adcbc8d6e3f84c34426dcec928443c9487930bbd05ec1995771765ef6ef6f970a6d22a85ef2a7b4489c55ab0a6f9f3293162008bbc601b8099dbbbf55697
diff --git a/dev-python/RecSQL/RecSQL-0.7.8.ebuild b/dev-python/RecSQL/RecSQL-0.7.8.ebuild
new file mode 100644
index 000000000000..6df5fe8e285b
--- /dev/null
+++ b/dev-python/RecSQL/RecSQL-0.7.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-2
+	EGIT_REPO_URI="https://github.com/orbeckst/${PN}.git"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	scm_eclass=vcs-snapshot
+	SRC_URI="https://github.com/orbeckst/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit eutils distutils-r1 ${scm_eclass}
+
+DESCRIPTION="Simple SQL analysis of python records"
+HOMEPAGE="https://orbeckst.github.com/RecSQL/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/RecSQL/metadata.xml b/dev-python/RecSQL/metadata.xml
new file mode 100644
index 000000000000..c0ad26b50241
--- /dev/null
+++ b/dev-python/RecSQL/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>alexxy@gentoo.org</email>
+    <name>Alexey Shvetsov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">orbeckst/RecSQL</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/SaltTesting/Manifest b/dev-python/SaltTesting/Manifest
new file mode 100644
index 000000000000..c5202d577682
--- /dev/null
+++ b/dev-python/SaltTesting/Manifest
@@ -0,0 +1,9 @@
+DIST SaltTesting-2015.7.10.tar.gz 77163 SHA256 908c15e830bc124c01c121e53a94b38b686b5b7233bcc8320a3ade73d6441e5c SHA512 8f8979fcbb13ff6f56c67d726aaa95a5e9fb0e73338487b87d72acdf4621f327bdc6944f5e27baee46f15d3537c7b37321aa5535d1b6d4b88c79c0c72acfb099 WHIRLPOOL bdcdd67a422696946d60fe0317650d0cac537b2641462085d0ab05ae9468e5bd237a45020b22c551cd44d27902114cd0ae8c636f64c09d4b844f4b12c3732fe2
+DIST SaltTesting-2017.2.23.tar.gz 91715 SHA256 24daa65834e8db141698ef7908aac0433480b36ff1fed6eb9dbfbea1a03ad942 SHA512 d45085463dadcce3ab91b496cd580c5d091d875258e791d7c9c60746d8c1367471aea6ea855551116f505a43afbead83d14a44e2f40f1acd0d55d5367bcccd03 WHIRLPOOL 4b8ba85c9dcabf0466541d3bf8fc225a498c1a352f9b605e148b11b6ed02ef8e6609cfdc6f4b433170aeb90d8dbd50542bc870eb7f85f95d68d9a760b7909005
+DIST SaltTesting-2017.6.1.tar.gz 90438 SHA256 9fbd8b3c2f345b8524b808426d7f732363ef859c690ebc5d5efd9980860972f8 SHA512 1d1a33385e9313450a17912440671567c957b74bfe6fea2e11921c8fde30ad5fc54b147b2c9d12763b946eac89e37346e1e5547fe310ee6a8bdb17ca601a09fb WHIRLPOOL 5c8618c329f9567d8697245c4b6c4f4d06d97f9ea4bfbd2ff8dc6f1b18e372db8468611703aea40e5da83a321c460756508e4c4ad10024847d00214cb19a3a63
+EBUILD SaltTesting-2015.7.10.ebuild 647 SHA256 904a0b1c77b945666b796ef5bed86f9c38fe375eee2057ad04db7272e658e9b1 SHA512 03e3246de4ac6eaf1af587d4c9142c3ae6ee9b89e8791fcacfd2e3ff887d14da682250e27c9f29d614895ccb87c78908f175d59a7fd99b44cfe1f5437686334e WHIRLPOOL 516b32f7d49456a0e82f827f44061f2378af35fbec7a326ff06713dc9f95ae07a4033cbfd8bd73f5c37e7774260f1b537f5991cb3f53d69f76305ba29d46f505
+EBUILD SaltTesting-2017.2.23.ebuild 687 SHA256 e55bb9e2805580e872e66532b6ca1559c638dc1d9e9ea6ac72b67da22e7a36f5 SHA512 d6dd18cf26f2c81555d180efb11da36254cf813cd489729e4b03225e5bf136fdc276aff1460be21669c7a15842ba210809a0bdf900df9ab34a607a66867c5984 WHIRLPOOL fb87af07a314d72aa7ce07e41fab216f3c30811692deaa276aa868a479181ce321fcdb1eab627c0ca07572ac6e4728eefaf5d62b4258449e28f6903327c7acda
+EBUILD SaltTesting-2017.6.1.ebuild 687 SHA256 e55bb9e2805580e872e66532b6ca1559c638dc1d9e9ea6ac72b67da22e7a36f5 SHA512 d6dd18cf26f2c81555d180efb11da36254cf813cd489729e4b03225e5bf136fdc276aff1460be21669c7a15842ba210809a0bdf900df9ab34a607a66867c5984 WHIRLPOOL fb87af07a314d72aa7ce07e41fab216f3c30811692deaa276aa868a479181ce321fcdb1eab627c0ca07572ac6e4728eefaf5d62b4258449e28f6903327c7acda
+MISC ChangeLog 3420 SHA256 1db511aab254a55f3f0248fe4e789db3c72336e1334444f5826668a3b247ef17 SHA512 ae9374057a27da15d42ce7ec45aa6fbf5737041ad79af642c252b6394be897a1b71a5b5ea1578bff73a03801c1a95740ead93a7a8f711dd46069e8d0c7f987c1 WHIRLPOOL 16e495e83f6dfa1bdf515e69ac8d587dfc5fb1f06fd0cd70807716de1b969d6463d3c8cc0cf2d23098ced48b376a813318c8732f7177e089ca4e5d601f84416c
+MISC ChangeLog-2015 1864 SHA256 839f85fee877f820399b34ba633aa2e2a7250a44de7a16e5f7c1a83f08ba63c3 SHA512 2c0a5b1664f24f803864060050c7db5cdb2d55cb7b14eb5f9af344b6db66565b13f189abee59677a4cdd3b9b29295ecfc291edf02e5e9343d7a5c4ddaae803fe WHIRLPOOL 78cf4800dff73de5825fe5db9d4aaa43e8a707d17dd123030913cf983b75f0fea742f8d5780dc6b02aabbef3c3dec9f715e529774e5e3995eb3730c757bc254f
+MISC metadata.xml 440 SHA256 99e5297ae79b2c41f635d58ce7af4ccbc1c4746bd9fa9a3e8cd157311de26876 SHA512 66e2e15e61bff62daa00dd1462249b7631b213fb1abd1da2deca72114cd16d296cb7add9eaacad0851a31a9cab01311bb83a8ae09e9741e3b3401b22c054264c WHIRLPOOL 4629bbd7cd71eb06adeadff1d3e5160c76027a9c333e93b61a6dcaefe1e648382aba5bf93133187329219cc3959d80fa8dd156b3a718a210e29295402939ce3a
diff --git a/dev-python/SaltTesting/SaltTesting-2015.7.10.ebuild b/dev-python/SaltTesting/SaltTesting-2015.7.10.ebuild
new file mode 100644
index 000000000000..f0d8be21ad05
--- /dev/null
+++ b/dev-python/SaltTesting/SaltTesting-2015.7.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="Required testing tools needed in the several Salt Stack projects"
+HOMEPAGE="https://saltstack.com/community/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/saltstack/salt-testing.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="
+	>=dev-python/requests-2.4.2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/SaltTesting/SaltTesting-2017.2.23.ebuild b/dev-python/SaltTesting/SaltTesting-2017.2.23.ebuild
new file mode 100644
index 000000000000..8c61110b76c0
--- /dev/null
+++ b/dev-python/SaltTesting/SaltTesting-2017.2.23.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="Required testing tools needed in the several Salt Stack projects"
+HOMEPAGE="https://saltstack.com/community/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/saltstack/salt-testing.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4.2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/SaltTesting/SaltTesting-2017.6.1.ebuild b/dev-python/SaltTesting/SaltTesting-2017.6.1.ebuild
new file mode 100644
index 000000000000..8c61110b76c0
--- /dev/null
+++ b/dev-python/SaltTesting/SaltTesting-2017.6.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="Required testing tools needed in the several Salt Stack projects"
+HOMEPAGE="https://saltstack.com/community/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/saltstack/salt-testing.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4.2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/SaltTesting/metadata.xml b/dev-python/SaltTesting/metadata.xml
new file mode 100644
index 000000000000..59007b4ca048
--- /dev/null
+++ b/dev-python/SaltTesting/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">SaltTesting</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/SchemaObject/Manifest b/dev-python/SchemaObject/Manifest
new file mode 100644
index 000000000000..5f69db36f547
--- /dev/null
+++ b/dev-python/SchemaObject/Manifest
@@ -0,0 +1,7 @@
+DIST SchemaObject-0.5.3.tar.gz 19921 SHA256 8d63dde2ed6a6773b7a10cdb3aa9c43e05c6e16a7b3cc59b42ad71b80511d4e0 SHA512 5f46672b6e069979db47aa96c4b1989f2575853803db84e27a4e15d40219829866e3aaf9e2a7f6f59a24cea7e6e166b8f310941a86f4f459cbe331ac6b3564d2 WHIRLPOOL 4c040c4ac382a3ec8cb0a5fba4605003674cea795186c693a5331f74649f803cb005852990ab88abdf4cc1f026d5986d45d7dff46f628e74549578ecb1ca799f
+DIST SchemaObject-0.5.7.tar.gz 13943 SHA256 9dde377c2bf7ed08974ae308efeedd5752f7ac5f87d886fbbdd5ce914ce4eae3 SHA512 b9ffd0a0927fd274440473d604ccc2fa58931c2c8c3594c53b6665d096ff9052c1dbcbe201548f3e38ea0a64807371cf7c606913df098cf2c7d5dcfd119be4ba WHIRLPOOL f6d2505768a197448e0b609b186939d494e3002d1c3e282b991d0cb4b9adb7d460884ef2093c66d3dce3031cc606c4ca33b6d7c4aa2bc304e4fab14c39348995
+EBUILD SchemaObject-0.5.3-r1.ebuild 499 SHA256 7a4e6b34fe9c78bdfce5bedde99eabae54b0e5e81c12d84021e2c0d1055e13ac SHA512 97c4758472ba1a08381ec03d03fd931e7dfd6e99f8df6fa77ae2d5d338ed08b8d347a8b58ad8f7bc45bbfad03b6d6da7035f29aeda0592c658cf1573716e5eef WHIRLPOOL 5a2437da35cfb743ea641ee35ecdf25a34481427778d0fc4a1fb3d824657702bc4d65070d1d33be1680b4e1bde92642af312267535cdeed2b2c16c63eab81856
+EBUILD SchemaObject-0.5.7.ebuild 456 SHA256 498ef769ffde4babb91fd30ca6424fb9f0bd3da1f3759a196a3bb2a0fa0d6b1e SHA512 26c0f9f66c438977258ae3bc5d3ed40ff6c441cf88e5f0b7e1607124ffd8b9f8cef1f0da33f48c4857f5431a89779254207d4067ccee6d7fb8135113a5a3410f WHIRLPOOL c3d1c88d8ee1abaf152ce413b4e2b01bf07ab38548b8f7332968f46cd107ba2a535d21552f496c38f3a4c691f51d7353f99c173ccb9d4c752535fbec1f4c15e2
+MISC ChangeLog 2454 SHA256 bd99ce8c5da5907f6cd75b2b841fb8183a8a565881aaacb78454d53367fb27fa SHA512 ec7c2c003b2767cec2199e2a5571482ed73af2e41d960a698b7e59fdd31ca9e19b6c6a53b33020e9926a8247ec652d56d9c617db6780f1e96e313387d984f0de WHIRLPOOL 9240c6aa3b343cac318bcad307300bd653384d654fc45c0ef07b15282ffb587eac691b0ed0c5e62eb5da452a5acf06b94da7d0f4884156666b4633bdb177e626
+MISC ChangeLog-2015 614 SHA256 3a9e66ab56dafb3e7a84bed7a6fed6fb8b228e8971988656106b147944da4dbf SHA512 cee2db927377bd8d11be56ba32a9abfc8a65eb4543f8268ed01b09bf2d0ad114aef9a01db30956347d2cc76b8471227bcf331ffa12ba09c5fd7ba75ebcfab5cf WHIRLPOOL 2f5dc774abca47e197990f435d2bd6b48707e48ce81757ed68422e6ec88303f46347a27103e3c14aac0e2f1f7bd062109382c030308785c4e55e2deebb9227d7
+MISC metadata.xml 388 SHA256 46c8f4e9fdc78ff49bc8d8104c687449df31eb32883a1954e7e04d6bec68d0b7 SHA512 b0630ad281d27b9422ccde414e8a5990eb437b14a1f1fd1152cb83794617fed59f2cd9b593e57a70948b386921e9b2c9e40ab879fc39d25402837c278c165e82 WHIRLPOOL d9a16e8bd6722a0d780eba834b52a6ffa8c89a0f1c4141f054015e5860de58ee452e4e58d7a8dd09bdf6d59e90d2479a98f7739be316412ad35ef49c6438e652
diff --git a/dev-python/SchemaObject/SchemaObject-0.5.3-r1.ebuild b/dev-python/SchemaObject/SchemaObject-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..31fc0c2d9da0
--- /dev/null
+++ b/dev-python/SchemaObject/SchemaObject-0.5.3-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple Python object interface to a MySQL database schema"
+HOMEPAGE="https://github.com/mmatuson/SchemaObject"
+# old download location is down
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${PN,,}"
diff --git a/dev-python/SchemaObject/SchemaObject-0.5.7.ebuild b/dev-python/SchemaObject/SchemaObject-0.5.7.ebuild
new file mode 100644
index 000000000000..ff742456ffa7
--- /dev/null
+++ b/dev-python/SchemaObject/SchemaObject-0.5.7.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple Python object interface to a MySQL database schema"
+HOMEPAGE="https://github.com/mmatuson/SchemaObject"
+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}]"
diff --git a/dev-python/SchemaObject/metadata.xml b/dev-python/SchemaObject/metadata.xml
new file mode 100644
index 000000000000..74a7c51f5345
--- /dev/null
+++ b/dev-python/SchemaObject/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mmatuson/SchemaObject</remote-id>
+		<remote-id type="pypi">SchemaObject</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/URLObject/Manifest b/dev-python/URLObject/Manifest
new file mode 100644
index 000000000000..db5f3931d499
--- /dev/null
+++ b/dev-python/URLObject/Manifest
@@ -0,0 +1,6 @@
+DIST URLObject-2.4.0.tar.gz 12533 SHA256 f51272b12846db98af530b0a64f6593d2b1e8405f0aa580285b37ce8009b8d9c SHA512 1334c8d8dbb93f50fb6672ae5c2e1dbb8c880af65c18c96c7bc65bb46ae894ab0696d36236036c1e4434a6e75b692ecd0b37055ef9b55fb50ffbaf13197b1701 WHIRLPOOL 41de6cca4dccb45221d01d772ab7d5799a8ed8d797e2adc440e2b09f503f7ce324f647748318e85768f9528d75363a322e7030fd0056772443e1c18f0c52767e
+DIST urlobject-2.4.2.tar.gz 25457 SHA256 6ea091b1a9e2500c2bdaf1201c8169529a7170a26f6fe6932648751ecd4209ac SHA512 970c5900171fa64624cd2ed2ba7f3a761057eda5c1fc07f881e8b7c74bde0cbbb7fc6c7c8694d8b8be0e991322da148528d99ff6fb2d4b75e1ddd1c2f474b4f3 WHIRLPOOL c8c6d3856169d796a87847d5e21c6f9a97ae82b248c0cf809aacca38bb49715837bbf67885ff216da205291b069ff98802aadb5358592fb74c8f14ee441efe72
+EBUILD URLObject-2.4.0.ebuild 442 SHA256 a4569ff1c2a4b357ecab4b70d156809975db621f0ae880482c8e476623206ef6 SHA512 9653a80114aae1597c1b7062ab85c1955f7b31f1aad9dea612eb34d74d88a917cba3ca8fd3d77ef1090daee62f4692b82ee7f52d78e345f410d186eba5a8d1f9 WHIRLPOOL 8055c2be910165fe2e0fe628250791d46e01c3135cef4b6b955866cab4fe61f57cfe5da9a2478fcb088215b9adc729d0af59c07be49a23146848e0fdb3ea0c71
+EBUILD URLObject-2.4.2-r1.ebuild 757 SHA256 7192ef99fc078bd7091c6b653092bb47be32766bebefea3912583d6700ccfc1f SHA512 690c91ce125972e0e1f274765c7e793dadddd943225a9fff3afd368a9a028afa2b3988023be5f30814e556791a1ebfe8d4f7311aebde4f367cbc995c28b0e289 WHIRLPOOL 306603b4c706011bc35f663279aa69a33ac35ab473d1db85110eabe1ec0a05220e97c23f504e458b11c30bce90a22fd8101028419edb301cde1fa07c8ae25ca9
+MISC ChangeLog 613 SHA256 ae4f35e48a09cc4e99a8931b82c035fb5ea76045f5c13abd20bb1b2c4d9d4bc8 SHA512 02b229b5d8bc9f23d99c1337ef81cadad7f03f304cb5f6947f2a75df7ea79864ff7db8c00459fec2e96598425ec5af36e35746d9789e81dc7b368d096b5bc7a4 WHIRLPOOL 38683c69f2443b017d0d94dd845b5e2ea96d5d785597d97f01395053c41ffd9ef16fb11eb052bd34e59e272a57bfabae7872a3be09006524b49465151d3cf4ba
+MISC metadata.xml 359 SHA256 99053572a0524436086f64238fe7729e73760cd01d06ab4b273e6e69a60857b3 SHA512 dacc5d5ba44600cd31a8f4980af6dcb28d00b98ef32e411a8845d6241d4eddc3ed30597d64f925dac219026fe1ad250e6b3b38ae00e912499cf3393dace020c4 WHIRLPOOL 56cbc56d956901fb343ac1ca89ff4dffdb48cb3458851537dd79c5613c709b000ddef10310304af18e4a18d76ef2cde6914563e2945176c3290be3f3389d8538
diff --git a/dev-python/URLObject/URLObject-2.4.0.ebuild b/dev-python/URLObject/URLObject-2.4.0.ebuild
new file mode 100644
index 000000000000..6a766ff291c3
--- /dev/null
+++ b/dev-python/URLObject/URLObject-2.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A utility class for manipulating URLs"
+HOMEPAGE="https://pypi.python.org/pypi/URLObject"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
diff --git a/dev-python/URLObject/URLObject-2.4.2-r1.ebuild b/dev-python/URLObject/URLObject-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..a1fa7caa07bd
--- /dev/null
+++ b/dev-python/URLObject/URLObject-2.4.2-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+GITHUB_P=${P,,}
+DESCRIPTION="A utility class for manipulating URLs"
+HOMEPAGE="https://pypi.python.org/pypi/URLObject"
+# note: pypi tarball lacks tests
+# https://github.com/zacharyvoase/urlobject/issues/39
+SRC_URI="https://github.com/zacharyvoase/urlobject/archive/v${PV}.tar.gz -> ${GITHUB_P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+S=${WORKDIR}/${GITHUB_P}
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/URLObject/metadata.xml b/dev-python/URLObject/metadata.xml
new file mode 100644
index 000000000000..ba221ccd4b9c
--- /dev/null
+++ b/dev-python/URLObject/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">URLObject</remote-id>
+    <remote-id type="github">zacharyvoase/urlobject</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/WSME/Manifest b/dev-python/WSME/Manifest
new file mode 100644
index 000000000000..93b29b36ccc2
--- /dev/null
+++ b/dev-python/WSME/Manifest
@@ -0,0 +1,9 @@
+DIST WSME-0.8.0.tar.gz 121619 SHA256 00241e4e4e40d6183f6354a8f5659b601753d49e28b6e5aca332bdf2e31188db SHA512 a0fb92a16bf3a3df75c71ad8756a18e97ee6ab381ad954898970a5eec93cae5469a8fa07a8724cfc64e53d3ad3c3d7d7feaaa55b92176bfb24fc566bd7f415a7 WHIRLPOOL 542f46ffab012f83d18c7c10d4e681f2ae775d0995d48c29a68b7c0b4a7f1cff7fc16d88251f73c4bf04740947d35dc7b5f6c68391e0d05ae5e29cee9bc4ea82
+DIST WSME-0.9.1.tar.gz 123187 SHA256 afdd3ba14f815837239d6dead652de460bd61a869e39430b459be77d1a928197 SHA512 795cd780f54e4b4b25d7ae5bee75f3b8d1513b315dbd8f056051452181be4f2067b06db9e695585c0d2b00474c2e2d7c75bbf4ec57519f9343c8cc184389ca4f WHIRLPOOL 945fa54af366cedd25e5cf463464aa178ffc08ec5f13d25449630b80a18716bbabd5598379feba389c956120d3136c82ecff23f7782afda5924220cc09daaf61
+DIST WSME-0.9.2.tar.gz 122620 SHA256 e790ac755a7e36eaa796d3966d3878677896dbc7d1c2685cb85c06b744c21976 SHA512 7817e5c90a18223a317b6d1e437796fd87ba4b70f4f4ea4873c305b796fae00bc8bad20f30d736ac50317eb45e2aec0e4e819f7fb9b22b1b116983837af58cc8 WHIRLPOOL 75ee5864c8fe507f23ecad0b0d1aa9e79d271dd7e18bbfcb171c0e5d4318586af60c9771fe34bd8a198bd32aac7903df54a18bcc5d1c8558bc43b9811f8ad2ac
+EBUILD WSME-0.8.0.ebuild 781 SHA256 7fec62963e6409a55855bf26c54c3b604d1ac33d59c17c54d270ea65103f112d SHA512 dc2ce577d5f38b437a08d161648886adadde934663e175cbde743163fc7b6f2160a7d91995beca345fe8c29d096593c91d37297d031261e099140ba98d3bc327 WHIRLPOOL 917a5d2532a1b64c0661cd897a6c73c11635b8743f76df162aaba442c6fd29766d8b5dd5185bfa29ba1894d20e81f20a7958a693a3c017ccd2ba46afe08a9043
+EBUILD WSME-0.9.1.ebuild 781 SHA256 1f7f2cc70e09d27c445971f34f63a3f5122e1647c08ede6cd7ae2314a7253d30 SHA512 0e5812a3840cdf8fef4a27aca378858c94401d092727111d34c0b60671403533530fdd7742e8abef578d15b8ce89b1acf76f296d178984a7d41c34a176ce7442 WHIRLPOOL 951555bf11278d7c9acd2484bcc885fcc6384d53dd48fc73966c2892192a9b666fcc3c28381b7c58c2a5929c9c2677aa3d706b8b39ab98799d928f17bedce681
+EBUILD WSME-0.9.2.ebuild 791 SHA256 07a546f5ac6a20c3e0844aa5be1ec676ae4d5363d37fa5326474a6c1ece77cd9 SHA512 295ede199c22065240378856d0d284d4ee424e901857862e6f7e771cc1fd90535cb766a24081d0dae13b21fc2d3d610c2f2a294df4dc71506184c2b3013a0de7 WHIRLPOOL 52056a591b5004b53229903c0dc1a625ff3fd0f41d68fb24fe83a3968b2ae6374be17424653f14b2c1fb6856b267164a5a980a434de8eb1494a1260c8962f324
+MISC ChangeLog 3428 SHA256 913273e7d594bcea44649b2a6dfdf3a7e9dd3811e68dbe154423553e889641d6 SHA512 5b2f94fc5f51431e9363cda07926d96368f3d424be08c47646a276f64b53806c5b432e734ef8c8f27b17276b5ba657a78ce31b5b5f7a2805f377e8ffc319ba36 WHIRLPOOL edc1cb5e7ed2bd86d188809601fcd1bf789e1c6e149ed951cf4af1ff7cb8c575377bee41c41cc82e643e27bc97ae7cfad31532779a93842cf1f4595d71b3e006
+MISC ChangeLog-2015 972 SHA256 1ac2c3e0d87cc9a9248eb373d340cf82f3067398aff83b2611575985fef1b74c SHA512 56caf9c1b7e263cee76f32bc1c003081eeba47270311148462d4eb26d021f08870d1a0e487fa07b81519d1744342599096dbb104c5375740ea1c3514171b4ba3 WHIRLPOOL 170164046d30193444107fd83d47a5810723daaa0ba2428a0ac7635399f715c210d92fb6fdf49a8194e2585cab87bed85884de891800189ec6f83cf268c30cef
+MISC metadata.xml 575 SHA256 dd4ae571037a8b1f1ee7af47a5e53b6886e086a33227a61db0cc61f64e878bc0 SHA512 d57f5520e1f102f496ac66c0f9b2842ee4511ce96e9fca3d4e166ee81307d8033d36ed1d0d90fd91a8285d9516a268691dd3502beefb398e7b1303b0af0111af WHIRLPOOL db9e164421f26354377edf7f0ee242dcdd82458262a344f6a58c7c2e28d7a605d5f48576560663c8924bf0d3779ff8b0677070c1b6a7a4098b3132fe228a98d9
diff --git a/dev-python/WSME/WSME-0.8.0.ebuild b/dev-python/WSME/WSME-0.8.0.ebuild
new file mode 100644
index 000000000000..a554239a35bd
--- /dev/null
+++ b/dev-python/WSME/WSME-0.8.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simplify the writing of REST APIs, and extend them with additional protocols."
+HOMEPAGE="http://pythonhosted.org//WSME"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	dev-python/simplegeneric[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/WSME/WSME-0.9.1.ebuild b/dev-python/WSME/WSME-0.9.1.ebuild
new file mode 100644
index 000000000000..12bed14e2b99
--- /dev/null
+++ b/dev-python/WSME/WSME-0.9.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simplify the writing of REST APIs, and extend them with additional protocols."
+HOMEPAGE="http://pythonhosted.org//WSME"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	dev-python/simplegeneric[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/WSME/WSME-0.9.2.ebuild b/dev-python/WSME/WSME-0.9.2.ebuild
new file mode 100644
index 000000000000..5adb61776601
--- /dev/null
+++ b/dev-python/WSME/WSME-0.9.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simplify the writing of REST APIs, and extend them with additional protocols."
+HOMEPAGE="http://pythonhosted.org//WSME"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	dev-python/simplegeneric[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/WSME/metadata.xml b/dev-python/WSME/metadata.xml
new file mode 100644
index 000000000000..370ecc10214e
--- /dev/null
+++ b/dev-python/WSME/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+  Simplify the writing of REST APIs, and extend them with additional protocols.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">WSME</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/XenAPI/Manifest b/dev-python/XenAPI/Manifest
new file mode 100644
index 000000000000..e1e9a377952a
--- /dev/null
+++ b/dev-python/XenAPI/Manifest
@@ -0,0 +1,5 @@
+DIST XenAPI-1.2.tar.gz 3901 SHA256 b981924e1449eb24a1f0eea5bd1d11179c78be5c3f9bf32e98a486c43d513645 SHA512 24b0fd6591d5bca0ac2b17808afa8c762a3fdefdb44fac41cc223aaa16a58073a4160ecedeef0e1490df18fba8b20e2072b6dc68cbe0f53145351f76d9d1e621 WHIRLPOOL 9d7352502f1fb0f342d0b13ca992775c3e5010770586fb302eade96c40c27df451ce7d8ddb1a76defdbae7b7a5b694380ec7713015d0eedfe0cbf8dae97b802a
+EBUILD XenAPI-1.2.ebuild 459 SHA256 368ad8d6fd8cbb8c1cd8acca8f4e7265426e0ce3debe46d9d30d0f58e8576f98 SHA512 0063b1e6fd34c1c5cc8bb38b50c0a06c0882b54caac6b548bc05720aabce8e9310630cd362879f11acd256c35f971e5a377c8e4e86ab2c494c9ecb3d9f45369f WHIRLPOOL e935d566013e7e3206274451bf2331f11db4b0f2a0350e9edcc5641673f2f2c06e38a700884198ac442a3c3646282e0f8c49c08ec6132728580deb46d45bbe30
+MISC ChangeLog 2546 SHA256 66f5a3c758a8ff3ff301ed3336b1473b9cf476e8d807d116766145f7d55b69c4 SHA512 04fc96fdd7f5b7128887666c4339e0c55302a3ab284ff97774cc4ea14eff970bfe4ad218102c541c1abd3b62ff120be27fd2c3eb86f607d0f056954a9a90cc89 WHIRLPOOL 143f38d6d5e6715cf835aab40af5cfd6d369650b560561eeb323b62791f8c9aa18b8bb96df6b8ffa96fc516d03a8a98310c844f532f9c2c1e2fc9fcdbad4d68c
+MISC ChangeLog-2015 810 SHA256 7a3f3d898f25d33e4700cd0c8c41c88682ac8fe1dded0780d912dbbf7fc12eb8 SHA512 42fa5b7836ddcd291f85237dcc2c6d46b1a450b895f99a3ac030f33dc56acc718378b6fe7f83e81e9ef5baed3e5f39026aa6f66aaefc79186542e979feb0dd30 WHIRLPOOL 5bf427f3d5f12ea827013e8d78345fd87e0f345d0dddfcf5b3f7d7afa75b534dd5fafac8dc6af208093a4691d13ea88bcfee8bb862267a51216ee3e36780a45c
+MISC metadata.xml 328 SHA256 5be9472058524388d407900b24924f8dc9e07b6911a528e6d60cea84051bcf98 SHA512 c9cf99e35ff5cb0d55bf111931d907b7773d3d919d7886d10b295ab02f3c32d2d8506050aa14738a9baa226f71e2f493edfff28c83231458131c1493ac3b6398 WHIRLPOOL 1d6737e58340878cd7e6509b66cbe187bcd5e77c2ca356312a93a65bf8b1c7af77690a60868c5b63398b16bdb96a952e2c7a6f605af3b1eefb15c2803a1133e2
diff --git a/dev-python/XenAPI/XenAPI-1.2.ebuild b/dev-python/XenAPI/XenAPI-1.2.ebuild
new file mode 100644
index 000000000000..627ce1eb6f10
--- /dev/null
+++ b/dev-python/XenAPI/XenAPI-1.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Xen API SDK, for communication with Citrix XenServer and Xen Cloud Platform"
+HOMEPAGE="http://community.citrix.com/display/xs/Download+SDKs"
+SRC_URI="mirror://pypi/X/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/XenAPI/metadata.xml b/dev-python/XenAPI/metadata.xml
new file mode 100644
index 000000000000..1103fc7c2107
--- /dev/null
+++ b/dev-python/XenAPI/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xen@gentoo.org</email>
+    <name>Gentoo Xen Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">XenAPI</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/YURL/Manifest b/dev-python/YURL/Manifest
new file mode 100644
index 000000000000..914271ee946a
--- /dev/null
+++ b/dev-python/YURL/Manifest
@@ -0,0 +1,4 @@
+DIST YURL-0.13.tar.gz 16555 SHA256 a8ba9c065da393704fc029f13d2d7d850a9dfd6b8deae6960749eecea282693d SHA512 4eb6f12b266a8905ec56131fecf6d6c44a18258c3d76df4d2d758a2053065abe3695d7ed627da274e7a5aa30e9e1af49beee1a537b8f22aa8022ca926c78ab0b WHIRLPOOL 70892a9c6a6bd11cde68877855e04ced84d06641db0db84a8a8d1706116347a86df706a91363981d307c72626ffe57c45a141153f569e99cae0b213995c2d1df
+EBUILD YURL-0.13.ebuild 470 SHA256 02a181597a819274797cf37087df0e9a267975715d2f4c9d4086c88ec28e5385 SHA512 613417e291f8cb748ef9c8454463d319d7caff9196df53861619a88d52820ef9d1868d9e5ed2747da90d1073a20bdfadbf7365ac89379b4980cae63cbc077ee6 WHIRLPOOL a77a5659735b1f047af16465b447c650570e48a07fd85922567697752abcdf69af8fd70e268602d2665117e87801cefdad2bdb411f3c96dc673c8a9c4bb5ad74
+MISC ChangeLog 303 SHA256 39437955f706a0f2334fc1cfee1048b6960206eac3822b26e71280c8fc743567 SHA512 8bac3c7577c65cf1dc2b6576d3ca87989a293c876782e2eb200b15e08e3ea71c3b16d1cc5d2dd4c4f688054c4e23a7d686b213f91d84dac15d0f56a283a235a1 WHIRLPOOL aa427236b390e0df330db95200593b8bdaf10dea94f8e44359510023e0ce09ce264c2a9f9ac88af7c0533cd1e6b97974870da477249efee61e8e7b25e7c10af5
+MISC metadata.xml 290 SHA256 f76664daf2c985da70eaa2a05a60c6e14c3d9a4319ee2ddd940f6e38d9853f00 SHA512 e1dcf749d70b6344e5575bfbad113d58fc88ddfbfd474c4c5debdbaf920a827765ca6652085c6f99acd9a90254792226356b96f7628aedb0d1be2a807a098511 WHIRLPOOL b901a049b5b1e5021c0c5e3773a598beeac6af173eacaa732d0d8d32836113dd03ab04118655205c937503df570627a6af7c9f27435be1716e4a13459e1da78b
diff --git a/dev-python/YURL/YURL-0.13.ebuild b/dev-python/YURL/YURL-0.13.ebuild
new file mode 100644
index 000000000000..7fa3083f81d4
--- /dev/null
+++ b/dev-python/YURL/YURL-0.13.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Yurl is the replacement of built in python urlparse module"
+HOMEPAGE="https://pypi.python.org/pypi/YURL"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/YURL/metadata.xml b/dev-python/YURL/metadata.xml
new file mode 100644
index 000000000000..09fe84a1e843
--- /dev/null
+++ b/dev-python/YURL/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">YURL</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/aadict/Manifest b/dev-python/aadict/Manifest
new file mode 100644
index 000000000000..41937cac0e46
--- /dev/null
+++ b/dev-python/aadict/Manifest
@@ -0,0 +1,4 @@
+DIST aadict-0.2.3.tar.gz 16511 SHA256 a77328ac55dbb5735da99441870251befe135f687ab707a7a178561363b27704 SHA512 16f3ff59f41d5dd1f9504ed11d660636766758332a0317544253daef9d76f2fdfc654add6346ad809e56e2be51c1f19a645c1047ef01e1e4aee8db24afcab113 WHIRLPOOL d6923d762cf858955cfec7d8bb806dac425ba5a01565c81a0f6970a0e71bee2ee4397c4bc1ed25f0cd123174962903d175ee9c2c2a615e2a461b8a53ccd170c1
+EBUILD aadict-0.2.3.ebuild 717 SHA256 fe9b1dcb0fcf55ea61b3498dcdec5897ee7500e0ebd2b0a842ed118d982af457 SHA512 ad5037d1ec869864ecc805a600a139d064e1a4f2afcbd1398d1bad9e6ff0ddd66ff649f1ab8ab44c163fec14d2eb92ee47c0cbd50a41eedc2ebcfa27d452492e WHIRLPOOL 5431ebca7b16dd7364403787b914f9be6c881d3422aa72f066241e6746b6c279b2bd70b55c20ccbad1d37c0708f9db73ba71e2742c1332dbac01a10eb33c82f9
+MISC ChangeLog 2366 SHA256 ae42b3d9b341215e96a4b6f438cc0bb4b455068aa79efd92ee10e98369e5860a SHA512 ac7fad7737b2a93fdfd58e504e17f314f84188f1e462b59ed5fc94ecb8aa5965a936037a4d2f69afe12e03a5f230860af7ee5b0133d413601d04aa452dd4b1ef WHIRLPOOL e577c7867a18c31482f5640b4fb1340ae354f0515c8e214f18c945bd33cd9c2c530cf887daa2add94a397e512d86db08fe9974c61293de9d82549a3c1bd955b4
+MISC metadata.xml 503 SHA256 bb90b121a4218ef285ea1a147be9181548e8f40158e53f887f162344e615507d SHA512 31dd3aecd967835f84c7f6449b1adaf8c8e6cbd2f8513dcb2b0d3193c97b8588f58fd881f27c7b766e072cead538f6327492977d2d03ae54654756b04ab9b5fc WHIRLPOOL 0ad969819a47eab006537a7bda95256e3d3edf1ed85ad42ea38b4a2f74b77cf2813f4471f7b7f3310e87981f55914d9e17bcf8edd0b320ac7fda53c4cd25640a
diff --git a/dev-python/aadict/aadict-0.2.3.ebuild b/dev-python/aadict/aadict-0.2.3.ebuild
new file mode 100644
index 000000000000..6b3efc9f648c
--- /dev/null
+++ b/dev-python/aadict/aadict-0.2.3.ebuild
@@ -0,0 +1,30 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="An auto-attribute dict (and a couple of other useful dict functions)"
+HOMEPAGE="https://github.com/metagriffin/aadict http://pypi.python.org/pypi/aadict"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/six-1.6.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/aadict/metadata.xml b/dev-python/aadict/metadata.xml
new file mode 100644
index 000000000000..ee0f9630bccc
--- /dev/null
+++ b/dev-python/aadict/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">aadict</remote-id>
+    <maintainer status="unknown">
+      <email>mg.pypi@uberdev.org</email>
+      <name>metagriffin</name>
+    </maintainer>
+    <remote-id type="github">metagriffin/aadict</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/abstract_rendering/Manifest b/dev-python/abstract_rendering/Manifest
new file mode 100644
index 000000000000..9b3e00f771b1
--- /dev/null
+++ b/dev-python/abstract_rendering/Manifest
@@ -0,0 +1,4 @@
+DIST abstract_rendering-0.5.1.tar.gz 33753 SHA256 3ce054236a83e2d4375ca2b323d19ff970435e01eeb3e736ecb82a11519def37 SHA512 6e687bbcbf8017d58667c92f6199e037abfbd2d787167f2ed457dcc174bc99f3bef19e94be67c41937df52d5efa72e605d6649151d8d9b19880895f7f4d4a792 WHIRLPOOL a4a674bb2b299b201e5b602b7902059f6991158ff56fafec3fe4479be222a972d0cc22141b29d8ac2c82031c1f3d0353284d5e4fb8c557ae62cac25511ae2221
+EBUILD abstract_rendering-0.5.1.ebuild 696 SHA256 4b3cf8b6497b0a6a56a379bc0b9668f7917dc12bf9fddc57ea61551fc3493aef SHA512 78818a8cbb517feaddbf67caf0eae98c1af6e148d119eee41237b38516793afb32488ca3fe6a9aa621afbeecee0e85454093a921e0c69be3310daa87a8efac06 WHIRLPOOL 4fdfe9aaaf82f9e481c9bd713f05d48a933ed09688be2f83a1da9e2549f98bca256c307f3440b4ef2d580cf88af404d437dff256f59b25b02c96c82343ae5bec
+MISC ChangeLog 1825 SHA256 474645dd55192720f1d70ec2371430286104d5a339511bb23605c093b4728ff3 SHA512 06b8d2aacd2589f51087519ca4230106115a1fa2193f6d0cd768977a659f56862876fc0a9a0c965a27646e000d27cf09dd6e24bedc8e64002872cf64ddbb3296 WHIRLPOOL 9cb298eddd6b8381abfc514c73d72e04f334312043a3cfb54b295fc01df6eaf38df60f185251066fd899c2e88403b74f4b105e374369ce61d3d8a5d5f23b60b9
+MISC metadata.xml 529 SHA256 a8196501a63f485ae1a9a5f4d6d038c021d5180a6f615e97d2a4158ec2aaecd2 SHA512 50f3fde9e223c863a61075398545e7816a637f060d3a1b08b1687f92d0a80f1c517d7dd922e2a1c81f399fbc05e4e7ad251874f31d29e8c23091e41cb8d7faed WHIRLPOOL 32c20974ae3471ab3e75c5564fbeb94a536d9ddac7f8954630334bed3dad7053c43149c6c61a5833a41d6ba892f7483130e90ba13563443080353b10d3a833e6
diff --git a/dev-python/abstract_rendering/abstract_rendering-0.5.1.ebuild b/dev-python/abstract_rendering/abstract_rendering-0.5.1.ebuild
new file mode 100644
index 000000000000..dc40f1201e28
--- /dev/null
+++ b/dev-python/abstract_rendering/abstract_rendering-0.5.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Rendering as a binning process"
+HOMEPAGE="
+	https://github.com/ContinuumIO/abstract_rendering
+	http://pypi.python.org/pypi/abstract_rendering
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="uni_indiana"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed \
+		-e 's:"-O3",::g' \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/abstract_rendering/metadata.xml b/dev-python/abstract_rendering/metadata.xml
new file mode 100644
index 000000000000..063b6ff32a22
--- /dev/null
+++ b/dev-python/abstract_rendering/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">abstract_rendering</remote-id>
+    <maintainer status="unknown">
+      <email>jcottam@indiana.edu</email>
+      <name>Joseph Cottam</name>
+    </maintainer>
+    <remote-id type="github">ContinuumIO/abstract_rendering</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/addons/Manifest b/dev-python/addons/Manifest
new file mode 100644
index 000000000000..2ae0dae3d424
--- /dev/null
+++ b/dev-python/addons/Manifest
@@ -0,0 +1,5 @@
+DIST addons-0.7.zip 34220 SHA256 4d5f248c31db312081a3d562d1de433971e6cd2e94aeb00c4ebc08e22ea8f15c SHA512 4847508aebfac56586878e987eafc852bf41abb5734efbd4c0f12480a871e9820449f0c56a2da82060234a36b3b5b359d908283e6d830df56b759dd39661adb4 WHIRLPOOL 3a4cd4d4bafed479e8abb52ba904af8935a6592d9e479f03af11869f2046d50257e0f29a0e47d2fcc95720764b75fc17f793605ee047c97f4c618a5d0c602fa7
+EBUILD addons-0.7.ebuild 679 SHA256 63959644762b18dd8b6aa737caf293c816c5a5c55dbc31217a54601e7607a845 SHA512 0896af0d9f64b136c8002f7d089b638e3ccdbdcc545a54ef2c5eb59e6a2e6af1f955e3b961b0b8a9a1993daa9f62db1c8fd559d97f0c1d4255bec2c79833c129 WHIRLPOOL be7e5b9f5e77c9eae47a1e7f11c5b4cd05b1d54e4bd04a61d3c1691d3cede9b919e4e7e14c5d86591616ef85420bb4b4e3a8c44de8a2b55e45edf21e8450e0ee
+MISC ChangeLog 2562 SHA256 a35d82dfd73eb7be92127a33beff94a36d52d7c192d5911f218779071818b050 SHA512 bdd0935295e2517485f819c5b39b60ce58989fd966e26d0cc352036ebce52b811e5f999df0ed8fc2c2d9e584a4eadf316569316529644329f2b59204b8d3bdcb WHIRLPOOL f79e937bee24a4ec72b1efbc8cc0cc6fcce0d089de9892c78bf7d9ace53b7593be5b92981f954aa7b09a6f906e4c5fab21f43f09b496425eb0e5595e93042c0f
+MISC ChangeLog-2015 994 SHA256 fe385512883cb8c774e7fd4aef9f38aa4f27e14d3a5c0fdb0ea056b393dabbef SHA512 397dd11907f425c2b6589489f4b9946ee7b7f678f45cd759a73889a141ab28d8bc535109a2c896f3fa4ec0148c168a256c4e517abe4744ada959f1f6bb44dc70 WHIRLPOOL b3a1674a4c6f288486ef35290a3d57592c9c4775e8ee2fde4c26bfd3a2076b5c45c227c6421a92c23b40dedf5417a27cf4068e10409b06100bc7e050d7485657
+MISC metadata.xml 319 SHA256 651513dd01370d91ffa3c1aa3abbfc814f919408afadf06b69bd8ad125fa0e31 SHA512 bce746eb0779e7aa417d2ec6787005851afd8446308cf5ce6c9f19624d3771b778cc6be1fed45f47054b2bb5b13438517f360de236a200bded8da95cd5ff7db9 WHIRLPOOL 6b6a926ad6ebbb992bb671254dd0fc28459429e63adaab1d923c89ba611d8b6cdfcc5e0a092693987ab476ed5eee7204a2ee27672706656eeb6c9f237577308b
diff --git a/dev-python/addons/addons-0.7.ebuild b/dev-python/addons/addons-0.7.ebuild
new file mode 100644
index 000000000000..d65e930301af
--- /dev/null
+++ b/dev-python/addons/addons-0.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_PN="AddOns"
+
+DESCRIPTION="Dynamically extend other objects (formerly ObjectRoles)"
+HOMEPAGE="https://pypi.python.org/pypi/AddOns/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+LICENSE="ZPL"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+python_test() {
+	"${PYTHON}" peak/util/addons.py && einfo "Tests passed under ${EPYTHON}" \
+		|| die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/addons/metadata.xml b/dev-python/addons/metadata.xml
new file mode 100644
index 000000000000..05ef109d0ecb
--- /dev/null
+++ b/dev-python/addons/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">AddOns</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/adodb-py/Manifest b/dev-python/adodb-py/Manifest
new file mode 100644
index 000000000000..9d13c9684f88
--- /dev/null
+++ b/dev-python/adodb-py/Manifest
@@ -0,0 +1,6 @@
+AUX adodb-py_sandbox_violation.patch 801 SHA256 eb64c8bc401f734ce6b31876d0c878dcc7e2aff314adea165e6a8a71fd67f585 SHA512 10c0f87dcf832587ced130177183459581347fa30cafc3adff3211be59a4114f7ca373990d99864265b0668c6647f1a312199233bd0ab18c4feeb995852b1a07 WHIRLPOOL d2b8765c1e142ead7835bae97286ae0bc32b261999a7e01bcabb6c36637d6ad2e91e03b26ec3e1ef826441da7d1648e3f0cc1c3628ad269b652ffbe1e7cd864a
+DIST adodb-220.zip 32438 SHA256 92dd475b96853f4932da64c1833cd5247e83cd61196dce67827b4b682d1fa50b SHA512 7aba87a32835b51639240194bc0745d58fd713fe2d6d5d5145f82eb1acb192377bc5dae904fa013b323f38ccd9d8dff77d99c0a8c91e1ee38c21e6a6b05a81d8 WHIRLPOOL d2d3f882c4f10d9a3771b69b40174481a5fed458a3e1d044a4d493b868c5152efdf8e2af67794738979e199a29267e085dbac3b25c954577b7865a38c01d8246
+EBUILD adodb-py-2.20-r1.ebuild 808 SHA256 efc9d3fb57a6d662bd44ed0824bc37bf9c876cca47fd1666757a6c119dd3601c SHA512 53e61628510e1b1fbe4290056000db8c134b1ae3a59601e82b51971025f8f0ba983234bcc1aa99981bbbd473b408917302689756cf13bd3729ab6a27efd32829 WHIRLPOOL 0b5179acc36f9be2dd77b38955da95257d815a740578cee4f2ea7a5356237db9a8b6d18f9c834821eacb192d0efb19618a36985fd71f5a5c375afff01d49d5b9
+MISC ChangeLog 2477 SHA256 2af0e01acdc46b2b5f0f557db0b8c39f034b36576e7121932067091224b19858 SHA512 9933f0a2d99c9c744ffa5e5a5d2d42f714ae10eab4b5d2ac1f1ae2ea6c9d71154cd165b0e1f5a657fd52c93cee6477cae6851b35b917573cca645bc2a3d27bb5 WHIRLPOOL 879629a011d6115dbd1e34f06d890014487b5eda509a84eb7d736dee6f937691bb56d7462a3818a57afaf2afb219b259ecd4d5954d28ad359d81ffc4b8aaa6ba
+MISC ChangeLog-2015 5492 SHA256 8a649d6a06b00507f7b703310ca80e06067735dac6644143f96a704e652a378c SHA512 929e35f3ab46c504797a993276f724502c46425dc9c124bea8ceea7ccd52687f3b463dacaaaac226dd0bd4386489b490f1864c9daa8180ead92e1a185924e149 WHIRLPOOL b56ea1f9c5dffad7ecb396b2d887ef09806c2e19e7077d1d40d44b4a80cff9244d5e1eb9f2eaf5d5ca6d09d347ac1a25feb2ad4f3a4e8ae8f20787d2475ec846
+MISC metadata.xml 506 SHA256 d2485db6ab5e1a059352c6d2ab1feb5537295dc0cd6d9c1ec01c3899424d295a SHA512 f7691dd3dac55ff707ede331262f954976236f6d8e6ab7d5a021230b17d360913af30d6f613fa0d7dc58ef2772eaca0b3f7814fa50da30d9cc99c6959f7ccda9 WHIRLPOOL 1b242e3d834371ce21efa734fb70b45fad5e530d809e41ba70d3c325909bf3ecfbed249c6a65a16aa5fbe3c7ccad472b10005b46c53d1e4713b1a2739cf94d8b
diff --git a/dev-python/adodb-py/adodb-py-2.20-r1.ebuild b/dev-python/adodb-py/adodb-py-2.20-r1.ebuild
new file mode 100644
index 000000000000..c945d58692c6
--- /dev/null
+++ b/dev-python/adodb-py/adodb-py-2.20-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite?'
+
+inherit distutils-r1
+
+MY_P=${PN/-py/}-${PV//./}
+
+DESCRIPTION="Active Data Objects Data Base library for Python"
+HOMEPAGE="http://adodb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/adodb/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ia64 ppc ppc64 x86"
+IUSE="mysql postgres sqlite"
+
+RDEPEND="postgres? ( dev-python/psycopg:0[${PYTHON_USEDEP}] )
+	mysql? ( >=dev-python/mysql-python-0.9.2[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}_sandbox_violation.patch"
+)
+
+python_install_all() {
+	local HTML_DOCS=( adodb-py-docs.htm *.gif )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/adodb-py/files/adodb-py_sandbox_violation.patch b/dev-python/adodb-py/files/adodb-py_sandbox_violation.patch
new file mode 100644
index 000000000000..ca79eb5a7db6
--- /dev/null
+++ b/dev-python/adodb-py/files/adodb-py_sandbox_violation.patch
@@ -0,0 +1,22 @@
+diff -uNtr adodb-220.orig/setup.py adodb-220/setup.py
+--- adodb-220.orig/setup.py	2008-07-16 15:28:26.000000000 -0430
++++ adodb-220/setup.py	2009-09-19 00:01:24.000000000 -0430
+@@ -25,17 +25,3 @@
+     except:

+         pass

+ 

+-

+-for p in sys.path:

+-    if p.find('site-packages')>0:

+-        trydel(p+os.sep+'adodb.py')

+-        trydel(p+os.sep+'adodb_access.py')

+-        trydel(p+os.sep+'adodb_mssql.py')

+-        trydel(p+os.sep+'adodb_mxodbc.py')

+-        trydel(p+os.sep+'adodb_mxoracle.py')

+-        trydel(p+os.sep+'adodb_mysql.py')

+-        trydel(p+os.sep+'adodb_oci8.py')

+-        trydel(p+os.sep+'adodb_odbc.py')
+-        trydel(p+os.sep+'adodb_odbc_mssql.py')

+-        trydel(p+os.sep+'adodb_postgres.py')

+-        trydel(p+os.sep+'adodb_vfp.py')
+\ No newline at end of file
diff --git a/dev-python/adodb-py/metadata.xml b/dev-python/adodb-py/metadata.xml
new file mode 100644
index 000000000000..8b3824a4c38f
--- /dev/null
+++ b/dev-python/adodb-py/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>Database abstraction library for Python</longdescription>
+	<longdescription lang="ja">
+Python言語用データベース抽象化ライブラリ��。
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">adodb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/aiodns/Manifest b/dev-python/aiodns/Manifest
new file mode 100644
index 000000000000..67531429e7d4
--- /dev/null
+++ b/dev-python/aiodns/Manifest
@@ -0,0 +1,4 @@
+DIST aiodns-1.1.1.tar.gz 6084 SHA256 d8677adc679ce8d0ef706c14d9c3d2f27a0e0cc11d59730cdbaf218ad52dd9ea SHA512 4bd8b80a10f84b82b13ba4ff6abbb1afd13ba6cfececc4db7c4bd303569473316f1c0e083f1017a450875fc8994a70c30c9a1b3fb2278fee5e27158973bc3810 WHIRLPOOL e4e45bc4b9ad7ce290e1c9039bfdf8858f1fc3e6e33e5e8b35a373c1193f4f70c9de44afe4d99ad8bcef85673e4bcd075b7896e62cba49f52c6e7a15a3f0696f
+EBUILD aiodns-1.1.1.ebuild 713 SHA256 bfc0b24e0b1b4a3ce8563e6a8543988dcbfb6ea49200189c7cd19e1ec03ace23 SHA512 11f0dc70e18db198c934400d47e74d8e9183b248ba4f81e7aa85a1d5ecf5969628bf6a183298b2de66f82076a10a22e1b5f8a4a5bc3e800a3acd3c7f5647a8d6 WHIRLPOOL 46a3d1776234e904799928356cda71a1459aa042e0957fcdc0e1e2f2c3ae00285a4710075583ac9bdfca232da8aa560a963cf8028bce74781fe044df3e1eed75
+MISC ChangeLog 314 SHA256 0afab352d8500e26cf9265adadb896d47bf19193d879d95b004c419b4e0f8724 SHA512 429863bdff6e5cc23bfe8aba270fb8db758ff7d6baee3197cd79b37e6a95d29ceb106fdbb9094d7246e2d05b82c897b9a0748f0370e4a1baf886edbb99b279ac WHIRLPOOL 188e28d18023070336f14976e0dc3383061e59bc2878d0a0c594ef2a5b981a9bf94ce5c97949d2921652f783b1197312659d2cf2100c5e8e944e568cc7c19bff
+MISC metadata.xml 340 SHA256 1b0e2a08273aa1a375f60d9db8d8e9b3b7c2215fc242f13923377432e8967b4a SHA512 b77ba4eb56072b4801832400361bcc80e73c2f0f1507e9abfd8c9beaa255594554b4a2555e3304307af6c515bea097311c70f515f875a7a98cc197e5cf538ce3 WHIRLPOOL 7d57036bfc8a2532a7fe777f5627c97bfcba6e76780d3a3d100b1653d11444b04a5467047f1b61015635bb96fa7193eadc17b9399f87cb64061c0422d966e121
diff --git a/dev-python/aiodns/aiodns-1.1.1.ebuild b/dev-python/aiodns/aiodns-1.1.1.ebuild
new file mode 100644
index 000000000000..bee1a51b31d0
--- /dev/null
+++ b/dev-python/aiodns/aiodns-1.1.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple DNS resolver for asyncio"
+HOMEPAGE="https://github.com/saghul/aiodns/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# Tests fail with network-sandbox, since they try to resolve google.com
+RESTRICT="test"
+
+RDEPEND="dev-python/pycares[${PYTHON_USEDEP}]
+	python_targets_python2_7? (
+		dev-python/trollius[python_targets_python2_7]
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON:-python}" tests.py || die
+}
diff --git a/dev-python/aiodns/metadata.xml b/dev-python/aiodns/metadata.xml
new file mode 100644
index 000000000000..8d8dfc10de75
--- /dev/null
+++ b/dev-python/aiodns/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">aiodns</remote-id>
+		<remote-id type="github">saghul/aiodns</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/aioeventlet/Manifest b/dev-python/aioeventlet/Manifest
new file mode 100644
index 000000000000..352a73e3efc5
--- /dev/null
+++ b/dev-python/aioeventlet/Manifest
@@ -0,0 +1,6 @@
+DIST aioeventlet-0.5.1.tar.gz 62371 SHA256 cecb51ea220209e33b53cfb95124d90e4fcbee3ff8ba8a179a57120b8624b16a SHA512 b89d99c2ac1f59ed599f01bfaee6b1eb60fc7f3332cb64b7061e67b0c1de15c38b3787100c176995750b7f8debd04bc8651362c6c2d43beff6af35bc15b64204 WHIRLPOOL 7040a207163cf01c7325c6ad05b641a14b8b28e6b7170e21fb37bcafb14584b4b766193a24845e24ba99cf3430bd56a090a17587ad4158c92ae46a17f21a470d
+EBUILD aioeventlet-0.5.1-r1.ebuild 927 SHA256 88244edc44e8f52125d53380898420f0a14b38272cb600c18c2727b026b7085d SHA512 225460af14ccf66c75fc36d0c038dacfc75776ed6e0348dcb8e98751dbb819da24126491b90b9f77a2141f13b21d395643067868ce5da02aac84f78982bb1491 WHIRLPOOL f9a3f584f2ccd17ff5369c484b81a632482b69fe640270c6b14f2c261acee06918b322c21f546af042e447388fcae7b3a3f3215a5abd13b514ce8ff6411e6bea
+EBUILD aioeventlet-0.5.1.ebuild 628 SHA256 30918ac035407ebc609b8902ea02dc76c911122d70e3fc890718479e40633da8 SHA512 2d6da5b2e581fe304b875a5e6fd9f0a1d0019464b841e39b8d0aaf265d8af258beced65c8301ba468f6851b54195a608054a3959a2b66c76655dba4e7c5c65ea WHIRLPOOL bcd88a20851105aaa9c30c7d6ec8f6a92a60c7a5c08028618ad7a54d207c9c8b636a4bc2f65eaf4d22145ddc6718df968935e45b0a6ed2ecacfd0b96cfab28ae
+MISC ChangeLog 3354 SHA256 8ecc0533a705d750aa08e701e43d36bdb36e55b0187db3cdef9084c6a2fddbab SHA512 54f88930d35f953ed6918234e0a52d2628bc10a5eeb0a1930716b573088dbbae82bd78366b8becee4f94243ff6901e87d1a2446416e8094535e688df30de28a1 WHIRLPOOL 6e92afb16bedff16742e44c4b23c994866180f0e622772cda225a519f638883bd4642a79dc3de2e31073e15cc70bded80fdec142db070bc22cfed96c946c8755
+MISC ChangeLog-2015 912 SHA256 4c7f3745b1f6b579284f8317faf2d5c192250b5be3a6cc2ee7900e447f675012 SHA512 6b08329cf0f3f2124e64faac8c3cd636457c73c0f6ab662e471fead0d49182df7d09746e69ee9d674af8176a8d6c462e70b0645e2e3ef83d2cd7c7c00946faf9 WHIRLPOOL bd4d4e90f4f6f4d2f9e4c4f84d4e152e5092b6eb5d7f10eef74080c9a5522d94a1d3ff9f99d1c388883592ed66897900e22011ba80ef12c850cbd92b41638835
+MISC metadata.xml 711 SHA256 7d32c751a21b9bf9ee4e9a64f73259aa33723a773f64a08596f908e8bde8dcd6 SHA512 8d3f849a43a211485e664c422ef5cc290c80bbbdf027fa6c5a551ca1848103acc0b2ae81055f274a88f49c38054708036bc92aa44dd5b8684ed3077647ee3738 WHIRLPOOL 121a122637053cfcf4421e44cf09c32465ee55e3355817a9606b9b0c1c8807e708ababdc2eb37d8d21be0e28dad69e885f5697b6ff2b9a80f020f91211dff7b6
diff --git a/dev-python/aioeventlet/aioeventlet-0.5.1-r1.ebuild b/dev-python/aioeventlet/aioeventlet-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..3da0ef3a9b68
--- /dev/null
+++ b/dev-python/aioeventlet/aioeventlet-0.5.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="asyncio event loop scheduling callbacks in eventlet"
+HOMEPAGE="https://pypi.python.org/pypi/aioeventlet https://bitbucket.org/haypo/aioeventlet"
+SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/eventlet[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/trollius-0.3[${PYTHON_USEDEP}]' 'python2_7')"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/aiotest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2_7') )"
+
+python_test() {
+	# from tox.ini
+	"${PYTHON}" runtests.py -v || die "Tests fail with ${EPYTHON}"
+	"${PYTHON}" run_aiotest.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/aioeventlet/aioeventlet-0.5.1.ebuild b/dev-python/aioeventlet/aioeventlet-0.5.1.ebuild
new file mode 100644
index 000000000000..8aa4acca7073
--- /dev/null
+++ b/dev-python/aioeventlet/aioeventlet-0.5.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="asyncio event loop scheduling callbacks in eventlet"
+HOMEPAGE="https://pypi.python.org/pypi/aioeventlet https://bitbucket.org/haypo/aioeventlet"
+SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/eventlet[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/trollius-0.3[${PYTHON_USEDEP}]' 'python2_7')"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/aioeventlet/metadata.xml b/dev-python/aioeventlet/metadata.xml
new file mode 100644
index 000000000000..990d0af00632
--- /dev/null
+++ b/dev-python/aioeventlet/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+aioeventlet implements the asyncio API (PEP 3156) on top of eventlet. It makes possible to write asyncio code in a project currently written for eventlet.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">aioeventlet</remote-id>
+    <remote-id type="bitbucket">haypo/aioeventlet</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest
new file mode 100644
index 000000000000..81d7e8224249
--- /dev/null
+++ b/dev-python/aiohttp-cors/Manifest
@@ -0,0 +1,5 @@
+DIST aiohttp-cors-0.5.0.tar.gz 40018 SHA256 7d0c682657db4f3265337875be75e5f222aef644e780e125267e98a690ff9d85 SHA512 86c24a1fe18fb3b2b8fca38ef9aa7ebf07fc1b202d353a540b7d651cbf618c57c5afbe125d91c0d72aee937909dbea0cfb1baa182eebdc5402b66f9800706bee WHIRLPOOL 0a73c3c737caced9222600a1ff22c58dcdb60624773d3947de3ea706a7725e1cf677c60254e860f67be336435be58477e620d45011f7d84a857420b20526717f
+DIST aiohttp-cors-0.5.1.tar.gz 40081 SHA256 207c29a5ba1270f42aea2d657db08b6049046cc3e5e7717fd2253d1189c4f916 SHA512 a06f65a479bbed50022394d51345e08bdf98a099f4b6efe355f4a4762155a564eee3d4e10ddb417daa7498ebc1abb93a3437b1a2cc6af9c2ad5fe8a8714c237c WHIRLPOOL 4d5a6669b16d601f190348880dcd718a1c1fd7a5812a3a78d05c88a62e1cc49518faf2aebf201b5da7e55758900db973d9c709bc6280b20127f70e142d8ea649
+EBUILD aiohttp-cors-0.5.0.ebuild 1160 SHA256 080ad22f74b1959d3539ab9d908a05fd38369f3450a457afc6c1a9e570ddab88 SHA512 85a4063f92210c47539b42ab05691c23af1bc9c70868057d635ec27419b0da48e7c63250f02586baa0534ddfd2ef245d4e14d795a3334d15cea2201d85bb3764 WHIRLPOOL 6567dade529813bc214fd6372b378b6c84f084fb4bb60e1548e6d8faaba60f1d79394c302e2ae6eade648bb10c8b011b0c3792a0eea096225f9b8533fb094d38
+EBUILD aiohttp-cors-0.5.1.ebuild 1165 SHA256 e3f83030fb5b03f34def070114b72e412c3bd9dcf2d495dd48d21e8a28b92b4a SHA512 0f71d31846275cf8b7998367f2f897f34dc6ce409633004faf31a3ebb6b09825f9efcd4d21a7c5f39766743fd68ce307668b6bdb4ce8dd52ae3070e636cfa050 WHIRLPOOL d4dd879aeddcd510cf4c3ae5291e3038c87b5f33a319af0b101fd2089a3fafd003510d27c0a1d7dcb9efdd25963832b9cf30cbf2100a53cf730279d2c11ba4cc
+MISC metadata.xml 253 SHA256 6ca8dd26c3d8b87979a7baa8c959955b110828585720b147089a959a02021182 SHA512 bf75301ff2098e846a7d6dc9166d1c8b6e77b4f92327e5c5aad0edcde6274e6aa224d89c2c5ed7efc6fb7fcc7258a2a01a24591a43688679c4109f8cc89fd9b1 WHIRLPOOL 78d90625a26dbd96674417aa3d1491ce9601bed2673b4d168a57147d5686107226ee7850188a23376959a012a76b44d8b3768b88746204ca0f5f32d0cdd57a00
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.5.0.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.5.0.ebuild
new file mode 100644
index 000000000000..f0c5fa8cee4e
--- /dev/null
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.5.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Implements CORS support for aiohttp asyncio-powered asynchronous HTTP server"
+HOMEPAGE="https://github.com/aio-libs/aiohttp-cors"
+SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/aio-libs/aiohttp-cors"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python3_4)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-pylint[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# for some reason, it is installed by 'setup.py test' on py!=3.4
+	# TODO: investigate
+	sed -i -e '/typing/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.5.1.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.5.1.ebuild
new file mode 100644
index 000000000000..280963ec1976
--- /dev/null
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.5.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Implements CORS support for aiohttp asyncio-powered asynchronous HTTP server"
+HOMEPAGE="https://github.com/aio-libs/aiohttp-cors"
+SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/aio-libs/aiohttp-cors"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python3_4)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-pylint[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# for some reason, it is installed by 'setup.py test' on py!=3.4
+	# TODO: investigate
+	sed -i -e '/typing/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/aiohttp-cors/metadata.xml b/dev-python/aiohttp-cors/metadata.xml
new file mode 100644
index 000000000000..90e51cd48781
--- /dev/null
+++ b/dev-python/aiohttp-cors/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-needed -->
+	<upstream>
+		<remote-id type="github">aio-libs/aiohttp-cors</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
new file mode 100644
index 000000000000..a5bc236abe6c
--- /dev/null
+++ b/dev-python/aiohttp/Manifest
@@ -0,0 +1,27 @@
+DIST aiohttp-0.21.5.tar.gz 529005 SHA256 bac5c883721e0818e405597d2778f08a38cc097df01f574462de2cc4f8090559 SHA512 4958d7c58988a95fc5b1e94e4eb7247f59b55e5ba439391c7b072a7ec267491159e1c8c7c6f05e6f7f72e4de5c12784c8d437665c01e6d9fb1e87a3334c1d35c WHIRLPOOL 135368db11316c8f99f39bbf317f791e433a779f61e45070166bab12b4e97165d2c6e732e8da96a848b431c1f26de45e416009bca4e75456025187ea7a41e04e
+DIST aiohttp-1.0.3.tar.gz 499693 SHA256 5ec0fdf17868bcabfef4effa3ce53c4cfa6108b481585bda88498f46435d5eaa SHA512 1fd915d04bf978826863c06a3a9ef5c23fd11c3b6a65b71828a7be4301e24421483717af6181319ba8461a22351decda4fb776765d18843e4ab1f436f5319d73 WHIRLPOOL 8e6b2503833c98d0d5e341275cc82a0a943e3f69b8b2a0c478c826775aff35b343af6d786b919d75f46a920e09b33eca3d24ba1bec316db82d16a1006cd71e0c
+DIST aiohttp-1.0.4.tar.gz 562803 SHA256 7e2d4282b2031ca2aaef35d4291743f37a8840821e8b3c6b491fcd903ad853c0 SHA512 437bed5e5f8729e8809411213cdb8f6a7de08879841c0cc89e88eec6de1883702903ecfb1b8e32ecf3701415fd6757545a0aafd44738681050425d5df44bef56 WHIRLPOOL 4ccb55b93fba2774ea65adcf3b5b00c3bc8bc72f05ac2a07bc84d50dbf07c34b4f3ee75265b800ef59aa9c7deb61e23c7662b3226f8aa0c40918c17295085568
+DIST aiohttp-1.0.5.tar.gz 563623 SHA256 053a16d03672cb3055cfac06650d238f55205702207be4a3b40c42333df0ebeb SHA512 f6fe77729a54d817046f0cc952d8906524c2dfe6712dd1972d696680fe34310b6dba9a3b48b6e27c52d3fedd3fa0f541a7c1ac45488b3358e39e3768a01749d9 WHIRLPOOL 51c609bed1bad59e8c1761fa412ed36031da7b80dff03f5edffd84763044cdb570c49d7b9970d133c9b1b224cc293e73004b00447f5b242d91c8286cc21e87c9
+DIST aiohttp-1.1.1.tar.gz 575872 SHA256 6f624d2b340a2c622949e5585540373a86349d31c2f6d46cd4d7b8446cf35f4a SHA512 38636ce4547688ade569ebfc0dbc62b769379500451954c528cd5dddfc7e6c25e6397a56382959ecd43c85c2f344039f4140bf91551e90b288fbd2aefdc94823 WHIRLPOOL d08ba4a51ddb8f66ceed6a64b304192635fccca31f9982484d17f4beaee3cb60d341a3101db6fda8d45231bd99e82ee18b3b86270edbbb9312bd9504f360ac43
+DIST aiohttp-1.1.2.tar.gz 576160 SHA256 8be33ad39522d5fbc06ce527da4615bf93e6c5d4f933173072bc51fa27ea0cf4 SHA512 ccba7a8e9a2cebaa0afadcfa927fbe9113577b2c69165cd64d8f1169d6cdb4efca252a228ad8d4780b20fcc94fffb9fa8217cbd0d49cbe9c5560a81e4423be41 WHIRLPOOL ea3f9d74f7c4a0d266b56a2cd5a8655734fd8c9043a7b8f5423f960ff90cbaec1b1d6f3965b089d1cb4db7e1abb39a58dd7d5f627e6f88fb292c822ae75ab77a
+DIST aiohttp-1.1.5.tar.gz 577346 SHA256 8f4c31a10b0a96667ac8a13e3756a3505e040c423c3c4075b99745056b3537d8 SHA512 44b1474a64ce150164045f30734da119a1848a3677d885493f99f2d724d20884dac9a24adce4b90017e203fc67b295443f91d14f1af9eb20d657a3cd4b69d747 WHIRLPOOL 036265681123f902aaa2000fd6ddd83980c3b1a48d67b583b5e1da7e7079d381a9c92669c12040c1494ba3890c2a849cd1f190003a1ec611df7a72843242bcec
+DIST aiohttp-1.2.0.tar.gz 589818 SHA256 b2fa11df067207ff15813be84b78910f6f9d897f02e9c345993b9962802a6bea SHA512 4101f0aad0d6bb8caf931dbd7f9e07bfdaa445796af92c84ea999538c2767f3cd62740ea9c7e07f255eb57b52e967e5343461809a5d5f4e8b12cd4383753bd77 WHIRLPOOL 239f802ce1dde24b3e1c6fba39357822564256f1aae167b44164d9bab3e67113400534df0835ca6b5245b8229dcab752149774c7adde1e1aef2a0f549d2d33ad
+DIST aiohttp-1.3.3.tar.gz 526273 SHA256 103433f594442b98ed4af9db02331e548a0ef2d4cfd02207ea24ed9eb85862e4 SHA512 39342270f615f7e5e01889ad50ccb60335151e94631007b105acda9930038d2fb66128469ca44043280c9f737130e2361129e2fa1c857a7654a1151b98a19a69 WHIRLPOOL c6689d990f31ce45e012ca26a459993505d264fdb36f87481588eb747e5cd5c5aa38dd2e08c10f2d9b7bfd16622a7b312e08c7fb7c33929e0bdf872fac2e92bf
+DIST aiohttp-1.3.5.tar.gz 527432 SHA256 cd14a45da385b5e860849ffaff3ecee56f9b37bf9e7f3f7bc5ce3f17556cf842 SHA512 b99630fa9006163d61e0e010972aee8daad021c5ad0152b04fb6f8b661f18ea03fcfa8d35603ecfcdaef4ecbaff0159b49e2f40164241bb5def48b2847e2d966 WHIRLPOOL b39e5a5081cadb497aa982b8bee1a24615a2e382071755586c52855529c7984c9140c04239fe9ef81e51f3e11a1ea7b1c021f6b8a4dd58c4d826f934394b5576
+DIST aiohttp-2.1.0.tar.gz 748642 SHA256 3e80d944e9295b1360e422d89746b99e23a99118420f826f990a632d284e21df SHA512 bd8eea366d380b88ba2c88d2aab722cd0970d2239dd0057cf4596f472a1b1bf38aebbd6cc707379ad9b5f901f93a56c1c4dd32584cb2636af0e013aa11388e25 WHIRLPOOL 45cf17ea7db2eb385d922cd4cdf5aac40244939066a6632f453fa2545fe1a73dfe0d0c43c3dcd60936a403174a69a8fd027dae2e55fc901594d388bd4b5c4cc3
+DIST aiohttp-2.2.0.tar.gz 781951 SHA256 1558ba6896c2ed4e1b3cbdc4ba479b4a03a0c1433af2fe23704d2959a0c5191e SHA512 547f7484651aa5df43174cede2537c120ebf10b913ab506cdcbbe8d8702492a9e3374cf772c5d11969ca7a7e3d2602d794e98878ed43d05ae4a8324613138ea4 WHIRLPOOL 5c97f0ccbc2015e6fb7ac31ff0539d123c445673b4444d7ab3b5098c94496b42b8880b8612e6bf3ee0604309aed4ec5d80c3020ed940cd28df0adac5cff28720
+EBUILD aiohttp-0.21.5.ebuild 1286 SHA256 5f73623fe551d536bae6ca6c2031b5c300c5f022b4e825cbefe5ee61422d900c SHA512 1bbc7803a1576871d0f7f81407088ce4e7af0b4f8b9efa9118644fbce529da054a8acc3d351d07f5f5d242acda22ddf4fdbcf61c6ff676c9739de33467a8df18 WHIRLPOOL 01489deb900df7e3c5433eb819d4e9d6eec3625e66877148bee5cae0fc5213bda44ba4854eaa10f4b5e0b99c0cfb86fd28c4e353aa93973cb19ad13283a30c9d
+EBUILD aiohttp-1.0.3.ebuild 1481 SHA256 335156de0c2f255797dea89a56c6732acea15f0269302b1219ef9bb9bd5ccae8 SHA512 3a95a6d6a2cac5bedccec21e7536584fd08862897659a4bc1e4e14217498df0776be24ae399f79bb751a58a36157aaa217c898dca2b08574dd2f9861d3aed91a WHIRLPOOL 3fab61c6e6d94cfd8faa7993764c0c99d3194699179de496eb72107c6f31385c388e6e7e0316fa397a6ea4ae1418ffde3901e056c40f629d340190889918fe67
+EBUILD aiohttp-1.0.4.ebuild 1479 SHA256 38c3e3aa827fe5ffaf08339c4b6c8d18bdcf62f66c60e115d3fdb693e6aab0cf SHA512 bb4bc3db386e769cb4035bb12fe676b43c69224a6269ca3f0da97f8212f90f07428557e9c21215cbafa70085c7f30f45f90bb4fba98a112b77ffb6ac07d8cc62 WHIRLPOOL fc7ddeb9f5fbe0367cdea62f4637ef5c82b6a7dffcc44995951ef3f08cd67e3063d444c9cd5d88f7df41dbe9c60c458b43ef77ea4b33e114b6c42e756ca7b30c
+EBUILD aiohttp-1.0.5.ebuild 1479 SHA256 38c3e3aa827fe5ffaf08339c4b6c8d18bdcf62f66c60e115d3fdb693e6aab0cf SHA512 bb4bc3db386e769cb4035bb12fe676b43c69224a6269ca3f0da97f8212f90f07428557e9c21215cbafa70085c7f30f45f90bb4fba98a112b77ffb6ac07d8cc62 WHIRLPOOL fc7ddeb9f5fbe0367cdea62f4637ef5c82b6a7dffcc44995951ef3f08cd67e3063d444c9cd5d88f7df41dbe9c60c458b43ef77ea4b33e114b6c42e756ca7b30c
+EBUILD aiohttp-1.1.1.ebuild 1514 SHA256 4b9dd5a32054864c3ded025f4c74f8766adbd8fc719d0519bd9aaa758e95cea3 SHA512 17ee6ef88e3adaa0dc3898c56dae91a1572508bd62a5f8ae53d74951d9c5099e38e8cb624cbab53db32327eb07e0b52db16be6de8e198c777cd6c5bb4aa78ff0 WHIRLPOOL cde8e0398c8d70cf91ced6b32e9d6309325a9297a8fb43bab0f9a9542d4c6ca374324fda3a89074126904f102989b121a764c3f62e8a5324807be76527e983ae
+EBUILD aiohttp-1.1.2.ebuild 1514 SHA256 4b9dd5a32054864c3ded025f4c74f8766adbd8fc719d0519bd9aaa758e95cea3 SHA512 17ee6ef88e3adaa0dc3898c56dae91a1572508bd62a5f8ae53d74951d9c5099e38e8cb624cbab53db32327eb07e0b52db16be6de8e198c777cd6c5bb4aa78ff0 WHIRLPOOL cde8e0398c8d70cf91ced6b32e9d6309325a9297a8fb43bab0f9a9542d4c6ca374324fda3a89074126904f102989b121a764c3f62e8a5324807be76527e983ae
+EBUILD aiohttp-1.1.5.ebuild 1514 SHA256 4b9dd5a32054864c3ded025f4c74f8766adbd8fc719d0519bd9aaa758e95cea3 SHA512 17ee6ef88e3adaa0dc3898c56dae91a1572508bd62a5f8ae53d74951d9c5099e38e8cb624cbab53db32327eb07e0b52db16be6de8e198c777cd6c5bb4aa78ff0 WHIRLPOOL cde8e0398c8d70cf91ced6b32e9d6309325a9297a8fb43bab0f9a9542d4c6ca374324fda3a89074126904f102989b121a764c3f62e8a5324807be76527e983ae
+EBUILD aiohttp-1.2.0.ebuild 1512 SHA256 2a4e154f1eed70af3d462653a8395bdd5a6911574b513f695a9b1346a0708bb1 SHA512 e02e170a278cf30549e75df5d3c1d025369fe4ba6899815187a16bcb8cc9757deec14dfa8b64e7b4c22945da8d30bdd85e71820b320ae3dcf5a1b9dfd5a2b015 WHIRLPOOL 952df89a1d0ca7f138da5dfa7ecbd9ccde6440867b4d38617470a8060ca42000baceb131e319ab0bad2f7e550c3c624f72c6378f8a5d7714b6b932935077fa36
+EBUILD aiohttp-1.3.3.ebuild 1546 SHA256 b45a351a031b21163e58b3db13485b66c50c62a0651b3c217b4ab128c1cb6f97 SHA512 8b12d96faa49923a7ad541b5de41dc8cb2aa47ebff0b7203d422f6b0f7fe0ef2ab2dfa2d04e74aa03aed99833c202c3fa99f56fe35e6e762c5bf03dab048037d WHIRLPOOL 6b793e3fd6441504a5efadcf169bacb2e315c59c1edc7c33c07689f9576c214b4430dd0b8be1edc78e31ea03d099da523e0a298ce21e5ca045c8af71da6a638b
+EBUILD aiohttp-1.3.5.ebuild 1546 SHA256 b45a351a031b21163e58b3db13485b66c50c62a0651b3c217b4ab128c1cb6f97 SHA512 8b12d96faa49923a7ad541b5de41dc8cb2aa47ebff0b7203d422f6b0f7fe0ef2ab2dfa2d04e74aa03aed99833c202c3fa99f56fe35e6e762c5bf03dab048037d WHIRLPOOL 6b793e3fd6441504a5efadcf169bacb2e315c59c1edc7c33c07689f9576c214b4430dd0b8be1edc78e31ea03d099da523e0a298ce21e5ca045c8af71da6a638b
+EBUILD aiohttp-2.1.0.ebuild 1504 SHA256 bda72186dc2db4565b9f3f270a853f5689f2e139a11d1eb15e4d83b9c92aa7f2 SHA512 8206f8ac9e70b3674aebe3ab5dd4e970e97e3ed8cf93cf23e4279a7c0a149e3f536d502b2ef78dea83fde3b0bee2088f2ce8f923255bfe8082f7261f05929f54 WHIRLPOOL 76dd81f59c2fe2e815954e7a26817d7de8cb1a282c6a12173c97601e6daab97b1df2ff01767141bda1a7fc5fc246ebb49bd8d6c6a677deb3ace3a366bc8df547
+EBUILD aiohttp-2.2.0.ebuild 1504 SHA256 bda72186dc2db4565b9f3f270a853f5689f2e139a11d1eb15e4d83b9c92aa7f2 SHA512 8206f8ac9e70b3674aebe3ab5dd4e970e97e3ed8cf93cf23e4279a7c0a149e3f536d502b2ef78dea83fde3b0bee2088f2ce8f923255bfe8082f7261f05929f54 WHIRLPOOL 76dd81f59c2fe2e815954e7a26817d7de8cb1a282c6a12173c97601e6daab97b1df2ff01767141bda1a7fc5fc246ebb49bd8d6c6a677deb3ace3a366bc8df547
+MISC ChangeLog 8010 SHA256 fd1c0233f840c348bd2f34553a22d51399fea4045fe10e4b4d406d501cb75be4 SHA512 f489d81b008a861b88362489800d7781c524d0e7d350dbd78634585902c241dbb2d5dc4fef81b55167a238476a5ae14f2d2279c684c005e309a237c0d2e135bb WHIRLPOOL 083d50e94337b9f00e43784540f256528ff33a2b3b693a62a583caa4463f45ded5ec6bd361edbffd953e13759beb03ffaea5bfe213386f1cdaf8e862035ca776
+MISC ChangeLog-2015 773 SHA256 d43f314774d7dbdd4eceb98ac5ff6be35cae9a05255707bd0750b3fc4858f205 SHA512 ff5e07adfbf1d13edd6dc91154cc7f012b34856b73805db577691c8c804e29feab3e4ef855a19427ba8371dc387dbf62b8f3f451d4c10a35823bedaaf538cd91 WHIRLPOOL 4e4526554a53a38bc1b88243db60b7af3168341dd35e9917b6ada7bdc9ea1a9d3aa540f5581d50e6ea4a6f8e8216b43761b9cf636a8d7d18e7aaa11629a89baf
+MISC metadata.xml 384 SHA256 a9033b04e31243c4ff866b401304c2c79d2e62d0d264c59010e975ba61428445 SHA512 847d38f07065fd335d999121a723660f1bf04b434c4796d8a468a30af5ea9bd82f3f7ea1bfaebd19ea5820e3a90c3b2daa0ed0d967c831de75c988cffdb4bbce WHIRLPOOL b91a1c989de44971fbd550e812b60f5102641076a23bb4c025b62aa48f4de0c54a460aed3955fdbd5c333c972fd972afa1246cdd5d05cd3c3faeaae739492110
diff --git a/dev-python/aiohttp/aiohttp-0.21.5.ebuild b/dev-python/aiohttp/aiohttp-0.21.5.ebuild
new file mode 100644
index 000000000000..f066ee364797
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-0.21.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://github.com/KeepSafe/aiohttp https://pypi.python.org/pypi/aiohttp"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+CDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-raisesregexp[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="$(PWD):${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/aiohttp/aiohttp-1.0.3.ebuild b/dev-python/aiohttp/aiohttp-1.0.3.ebuild
new file mode 100644
index 000000000000..3bd9cd9de903
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-1.0.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/KeepSafe/aiohttp"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+CDEPEND="
+	dev-python/aiodns[${PYTHON_USEDEP}]
+	dev-python/async_timeout[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/multidict-2[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="$(pwd):${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/aiohttp/aiohttp-1.0.4.ebuild b/dev-python/aiohttp/aiohttp-1.0.4.ebuild
new file mode 100644
index 000000000000..80182deba751
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-1.0.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
+SRC_URI="https://github.com/KeepSafe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/KeepSafe/aiohttp"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="
+	dev-python/async_timeout[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/multidict-2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/aiohttp/aiohttp-1.0.5.ebuild b/dev-python/aiohttp/aiohttp-1.0.5.ebuild
new file mode 100644
index 000000000000..80182deba751
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-1.0.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
+SRC_URI="https://github.com/KeepSafe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/KeepSafe/aiohttp"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="
+	dev-python/async_timeout[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/multidict-2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/aiohttp/aiohttp-1.1.1.ebuild b/dev-python/aiohttp/aiohttp-1.1.1.ebuild
new file mode 100644
index 000000000000..ef190393107d
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-1.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
+SRC_URI="https://github.com/KeepSafe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/KeepSafe/aiohttp"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="
+	dev-python/async_timeout[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/multidict-2.0[${PYTHON_USEDEP}]
+	dev-python/yarl[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/aiohttp/aiohttp-1.1.2.ebuild b/dev-python/aiohttp/aiohttp-1.1.2.ebuild
new file mode 100644
index 000000000000..ef190393107d
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-1.1.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
+SRC_URI="https://github.com/KeepSafe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/KeepSafe/aiohttp"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="
+	dev-python/async_timeout[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/multidict-2.0[${PYTHON_USEDEP}]
+	dev-python/yarl[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/aiohttp/aiohttp-1.1.5.ebuild b/dev-python/aiohttp/aiohttp-1.1.5.ebuild
new file mode 100644
index 000000000000..ef190393107d
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-1.1.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
+SRC_URI="https://github.com/KeepSafe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/KeepSafe/aiohttp"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="
+	dev-python/async_timeout[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/multidict-2.0[${PYTHON_USEDEP}]
+	dev-python/yarl[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/aiohttp/aiohttp-1.2.0.ebuild b/dev-python/aiohttp/aiohttp-1.2.0.ebuild
new file mode 100644
index 000000000000..e06eb89cf813
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-1.2.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
+SRC_URI="https://github.com/KeepSafe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/KeepSafe/aiohttp"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="
+	dev-python/async_timeout[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/multidict-2.1.4[${PYTHON_USEDEP}]
+	dev-python/yarl[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/aiohttp/aiohttp-1.3.3.ebuild b/dev-python/aiohttp/aiohttp-1.3.3.ebuild
new file mode 100644
index 000000000000..739051416f14
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-1.3.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="
+	dev-python/async_timeout[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/multidict-2.1.4[${PYTHON_USEDEP}]
+	>=dev-python/yarl-0.9.8[${PYTHON_USEDEP}]
+	<dev-python/yarl-0.10[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/aiohttp/aiohttp-1.3.5.ebuild b/dev-python/aiohttp/aiohttp-1.3.5.ebuild
new file mode 100644
index 000000000000..739051416f14
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-1.3.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="
+	dev-python/async_timeout[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/multidict-2.1.4[${PYTHON_USEDEP}]
+	>=dev-python/yarl-0.9.8[${PYTHON_USEDEP}]
+	<dev-python/yarl-0.10[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/aiohttp/aiohttp-2.1.0.ebuild b/dev-python/aiohttp/aiohttp-2.1.0.ebuild
new file mode 100644
index 000000000000..c19a47198dac
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-2.1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="
+	dev-python/async_timeout[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/multidict-2.1.4[${PYTHON_USEDEP}]
+	>=dev-python/yarl-0.10[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/aiohttp/aiohttp-2.2.0.ebuild b/dev-python/aiohttp/aiohttp-2.2.0.ebuild
new file mode 100644
index 000000000000..c19a47198dac
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-2.2.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="
+	dev-python/async_timeout[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/multidict-2.1.4[${PYTHON_USEDEP}]
+	>=dev-python/yarl-0.10[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/aiohttp/metadata.xml b/dev-python/aiohttp/metadata.xml
new file mode 100644
index 000000000000..e5671a7088b1
--- /dev/null
+++ b/dev-python/aiohttp/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>alunduil@gentoo.org</email>
+    <name>Alex Brandt</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">aiohttp</remote-id>
+    <remote-id type="github">aio-libs/aiohttp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/aiotest/Manifest b/dev-python/aiotest/Manifest
new file mode 100644
index 000000000000..ca4b5ca1fa7d
--- /dev/null
+++ b/dev-python/aiotest/Manifest
@@ -0,0 +1,3 @@
+DIST aiotest-0.3.tar.gz 10146 SHA256 1c6e3e8d210d1a37b74b4264df26ae744d9f20762701c592c2b17b85632221f0 SHA512 6af65e283dfae1ff0f09fb09498f1a5be971daef4907c5079acc1c7ad353f4aa415e03f3fb18d9fac28c54abe35c9db917584082a56b4b43cd80cbf5fa689d59 WHIRLPOOL 6606a9151b5298a03f71eb6b6b8f4f5f21b0daae175e88951b0e0c992f79d2341d82919aa7e2d356b1938a63635596e50bf9c76341c9b32bc878d62b8ca09bd6
+EBUILD aiotest-0.3.ebuild 811 SHA256 87f92abccfa8dd513dc2bf80f00222b611c96e6436f0c691a9d29424438b1e43 SHA512 150171bf89b2720c0b382d6cbbcc6d1759db5420e003b8e627c18daca27c3c957294be187cc143d7b09ff3637eca0dd9bc2d6ef0ed06cfb58abcb4cb23e5b3ee WHIRLPOOL cb6fd1f912e7a1c2de234602d63823d50acba24be747a485aaea1f0b70fa50f771577b7ae0661f4f8250fc302629ce8d76d0e103734b161a2f99bbb3d78b9137
+MISC metadata.xml 344 SHA256 d2c722e09b3273ca44432a7f3d3ce1cede1cfe7c31ddf36b4bb6f6babce18375 SHA512 da7c8a88e3043b5148eed4f1de62acd094f7e0f791cbb7d9707a97ba5fc85a1833c9754ab3beac904ccfca500b20196999b1381a8f5bdafb5375f2c9b7689819 WHIRLPOOL 7562f9970196f0c70ec88bba6353067fde8f04dabfa337f6554875bfebd0e83f287543998a9d15f5c787a6f49ba0c8bdc2d8c41dd282a43b0fdc73546ee51bd9
diff --git a/dev-python/aiotest/aiotest-0.3.ebuild b/dev-python/aiotest/aiotest-0.3.ebuild
new file mode 100644
index 000000000000..716fa573f86e
--- /dev/null
+++ b/dev-python/aiotest/aiotest-0.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="Test suite for an implementation of asyncio (PEP 3156)"
+HOMEPAGE="https://bitbucket.org/haypo/aiotest"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	local suite
+	python_is_python3 && suite=asyncio || suite=trollius
+	"${PYTHON}" "test_${suite}.py" || die "Tests fail with ${EPYHON} (${suite})"
+}
diff --git a/dev-python/aiotest/metadata.xml b/dev-python/aiotest/metadata.xml
new file mode 100644
index 000000000000..4966bdb115fa
--- /dev/null
+++ b/dev-python/aiotest/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">haypo/aiotest</remote-id>
+		<remote-id type="pypi">aiotest</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
new file mode 100644
index 000000000000..1e70913c2c62
--- /dev/null
+++ b/dev-python/alabaster/Manifest
@@ -0,0 +1,7 @@
+DIST alabaster-0.7.10.tar.gz 10486 SHA256 37cdcb9e9954ed60912ebc1ca12a9d12178c26637abdf124e3cde2341c257fe0 SHA512 e2391079360e050e532f878619e70a120f141a3e84d1e213e508e4be25ff2ac704717fe8398dfaf016dfb6dd3ad1105a67e1d5438737f45064f7602a5ce5fda8 WHIRLPOOL e9dfa14007ace0750fa113892bdb58531de2e50b2cd404c4adbdddb98dadbfbe7184f03c458bc930802e09d813dd9687adca30035900a77843b59605316aed14
+DIST alabaster-0.7.9.tar.gz 10485 SHA256 47afd43b08a4ecaa45e3496e139a193ce364571e7e10c6a87ca1a4c57eb7ea08 SHA512 b1286c4d5d17d172baaacbc40ba6a435d433f0880e31416c37ac88df8787bf522f1c28b6903fe92c88414f54286734508860eab86ff7f12da72315bf9ae0e6c8 WHIRLPOOL 01e49ebeedde34be62d4bea18da669120cae07ea803aee9c8d4eca8f8718ee60b20576475898859cd6bf82d75cb8207d4d3a7cc7dbe5e6809d75176dd8e8b681
+EBUILD alabaster-0.7.10.ebuild 537 SHA256 159f53ee821e03637c10c570ab4dd31cc5d2ffb28c1507f2b15915ddb8a23ffd SHA512 102a49f4b00fe0015c22106de56b5d599e6b5a74123ef72e16f15ff3aee6bf2ba2c0170804c8d5ee77124502d9b86bdb89b69628cb0bd3a283a6f10a693674e8 WHIRLPOOL d8075fca5d4ee5c0dda08929b8d0aca76b16169514cc14b768619fb61070716d22a3e231fba106a0ba3a4ca3e67e474ca6926d7be3b5e64a9fd6d3e454aeaf7e
+EBUILD alabaster-0.7.9.ebuild 515 SHA256 350612c5d34ef0d434e4f14f38866fe665bed75001e9f24245766baa6ea0195f SHA512 9c9803df27349ff8c2b859f6c89feb8a7c0b5505ce68b4b1c61b0a65a14eb2fb1a64c65e2ab19c4954cfdfd8fe8a08eed4f34eaf656cab6ec79d1adb4e25e59f WHIRLPOOL 5ce5d97cdc632500df642ebdbbe15f37d5c9c37375ee9d5a0222e1434be76c80df7c884c803181fc764c80102e27fbd566f5596e73fa1212b7e514338610764a
+MISC ChangeLog 5210 SHA256 c6f81038a2c7cd90cb13e766738ae99db257686aae66bd01316e04d9b02448da SHA512 8bb5800dff3cffc6e04bdea6e616bb187457f36036864ac85e25c2d4537a7e9ab7e42b3080ee31cb0cb78b0bb19a0d5f7e312b8d859c6359dbd97f988eea0f5f WHIRLPOOL 296d0b485330c7c2a9b9b1f4a761c248d8d95a57cb5721d26b55115b200d739cd3a5a4e3f89770cda2fab0f565aec4b9d17869126f4bada9e4bd79f1ecbf8abd
+MISC ChangeLog-2015 1723 SHA256 3a0d21bad81e5503241f5558582dbfc48897e62b119c02eb0ea926f2b760dbff SHA512 6171685e51b0a46fda8dbbf53282b2b7f329e8faabc1e662bb5142f21d668d064ea0ef4e115385f994e8927ec775824b6805ce4356932955cf2806d7d4459af9 WHIRLPOOL d5fd07122891cb7f285712189bc8f023049bdd02d8d7f0ec62acd5b82c8460b05743d2b0ccab23aa62894ad0598aae926d3bfa4bdaf56c13e1199d21b85d5831
+MISC metadata.xml 384 SHA256 b12ba4189771c4abb047942614b38c71baf84673c4783eac14f7d72e8af5bbb6 SHA512 7464f7780562e6a8aff5a243e0a87e08740b06210a25c83ec82649974b0b50aabcab46f6c35b5e568b898ae8a4d10087961ae8953785f4dab33b62cf782e4657 WHIRLPOOL 976bc1f781d639a49f9de1b2c6f4a18a39c1d7e7313400adb072362c77076ea57d77c1c9bfbb0c4f7fed0443ced5a3c3dc40c6c43781bc6932addf5e90074ed9
diff --git a/dev-python/alabaster/alabaster-0.7.10.ebuild b/dev-python/alabaster/alabaster-0.7.10.ebuild
new file mode 100644
index 000000000000..f96d9ed9f732
--- /dev/null
+++ b/dev-python/alabaster/alabaster-0.7.10.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
+HOMEPAGE="https://github.com/bitprophet/alabaster"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-solaris"
+SLOT="0"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/alabaster/alabaster-0.7.9.ebuild b/dev-python/alabaster/alabaster-0.7.9.ebuild
new file mode 100644
index 000000000000..436ff10457d7
--- /dev/null
+++ b/dev-python/alabaster/alabaster-0.7.9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
+HOMEPAGE="https://github.com/bitprophet/alabaster"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+SLOT="0"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/alabaster/metadata.xml b/dev-python/alabaster/metadata.xml
new file mode 100644
index 000000000000..06a80d0db0ed
--- /dev/null
+++ b/dev-python/alabaster/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">alabaster</remote-id>
+    <remote-id type="github">bitprophet/alabaster</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/aldryn-boilerplates/Manifest b/dev-python/aldryn-boilerplates/Manifest
new file mode 100644
index 000000000000..f1d1f152476d
--- /dev/null
+++ b/dev-python/aldryn-boilerplates/Manifest
@@ -0,0 +1,4 @@
+DIST aldryn-boilerplates-0.7.5.tar.gz 8550 SHA256 c4ac45b0c76d23cec1f014523e0ab3e74a8c1aa3aa77acf984d493813669ba95 SHA512 63aabe996bb89433bfd649890c0bfddd39d7a65efe4e6a5d1141caad2a87df8b0078c72a48d2fec02794d976cf92804fc5ddc549b31ad83184c93f8d24e0c936 WHIRLPOOL a7f047eb5fdcd0b20a624379fd2c17d597590ff5a2f0f59b677c22df691d08ab2d13b5897daaa24aa3d4f03be658824464e6dad8c8789c89e5b1c96e7420875b
+EBUILD aldryn-boilerplates-0.7.5.ebuild 628 SHA256 25d3c4b4f07e4b2e7439f8605590d3f56fc74051060ef6ff3c4064fdee50b158 SHA512 35a0cda1dc8bdfe301aa0457df69580a48dd370635189f0ba41dc17f4dab1f0b509b727b5cbb2f3d57c755331b4921da8b26c99ecc0eebbbcabfd433b95a90c1 WHIRLPOOL 957abdaf25889a3ee76fe65396c17a9d2683e4280b412cd627eb2c6e0253b02a3698d4afc471e245c58186f29f6e5b54ada08d73974c1b6733b286fb3d0d0543
+MISC ChangeLog 490 SHA256 5fc207654d87481dea5891466f1255c7141e41d78329d63d46a3e9c38448a4fe SHA512 0163658ffe4d533dc0b67e4962160fe2827f9ef53654661a39172d2a13ab290edf99d2c0110e9b08fa34439417f07f8985593ffce7736204978e4239ef300ec5 WHIRLPOOL 14719d0495f5d983a07edb92903846bc1cdae130abffb16d4588bceee52f1b728e1de8c1554c4eaf9a8757da2d8158ce7eb04c1ada032f51612c7c726b90a43b
+MISC metadata.xml 305 SHA256 7840e9949ce22412b568878dd17eec8c1429f11b24cd10f815a1fa1b102dfd86 SHA512 56fdc7c1e64e04f49c0f7050ad39da0648f8e54281a3cb95f054b44909122c7a1fc01691f8c63cff3ed3b661bfe726780682cc6328afdfa0de225a63435071db WHIRLPOOL b0e903dc5b7da12586bb788c82f8d6ca43434b955b2e5d09d3e99d0bf694bb1978fa9a477cba22ff308767a56d8697cd68d9148f6596835832c539ffc30013d7
diff --git a/dev-python/aldryn-boilerplates/aldryn-boilerplates-0.7.5.ebuild b/dev-python/aldryn-boilerplates/aldryn-boilerplates-0.7.5.ebuild
new file mode 100644
index 000000000000..f950f41697c9
--- /dev/null
+++ b/dev-python/aldryn-boilerplates/aldryn-boilerplates-0.7.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Allows re-usable apps to provide sets of templates and staticfiles"
+HOMEPAGE="https://pypi.python.org/pypi/aldryn-boilerplates"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.5[${PYTHON_USEDEP}]
+	dev-python/django-appconf[${PYTHON_USEDEP}]
+	>=dev-python/YURL-0.13[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/aldryn-boilerplates/metadata.xml b/dev-python/aldryn-boilerplates/metadata.xml
new file mode 100644
index 000000000000..ade9e83b4ba6
--- /dev/null
+++ b/dev-python/aldryn-boilerplates/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">aldryn-boilerplates</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/aldryn-bootstrap3/Manifest b/dev-python/aldryn-bootstrap3/Manifest
new file mode 100644
index 000000000000..d88952990072
--- /dev/null
+++ b/dev-python/aldryn-bootstrap3/Manifest
@@ -0,0 +1,4 @@
+DIST aldryn-bootstrap3-1.2.2.tar.gz 699492 SHA256 d7b70d795350eec6b7793c6b2519b034c9a11c5b524d9a36df6199ca5fc55f7c SHA512 d99a8b734911e2f1d8c23fae074690687f5f41a9ae179ea93aef38ddb46a6fe97135d76c81159509eb00d6095ef88b870a672eef692ed05f378bd991fe9aca57 WHIRLPOOL c1705ae42091aedfdfd8d849f4829bdaeff621ed51067c26a8ff83b52bd96d80c7b98b0ec042598d799f30feb334f966ac1cbdbdbb0c01c635aec0fd7de13337
+EBUILD aldryn-bootstrap3-1.2.2.ebuild 835 SHA256 5744cfbac639339ddffa2f1725eca93e703b3d685eda9659140edb70ec4defa7 SHA512 eac4c005f813a8043740218018f7161daa3548d87558accf440816f5509251de0b786c02173388ad673454ff03a5cb6efa9f6bb6c16452212d52a75e2cc5c829 WHIRLPOOL 927a2a0880876d8c96102c28e34753be2c1883615188fa7ffac673bbc99ea1e315905dbef1900c4f401d35854b3bc9cab4ac36a4b96b6bdf386c785a855c74cd
+MISC ChangeLog 1859 SHA256 330eb649f2d9e60f92fc99afc7051ba084b3419c8cbe02a92586f2376c4562f3 SHA512 1d65a38ce943ae22d253397832d07721314ff7250b821c87e5bd89c2250c40af44a3c87d47609f2ade61d627dc9c0c00785536f99b49710a478f619f8b31afa8 WHIRLPOOL c5a95ce76d37994ce0fb1803593efcad77723a77278698c438d0bfa6b086d3b8354c60491beaabaac5bb92aa84fa521a7516f75064b6c249f5660c15204a0635
+MISC metadata.xml 312 SHA256 ffd50fdb4cdb0f24472d493ec48fbfdb092b0447c08a586b26f983f3a88659f7 SHA512 9884d6d44e9edff3a3e9480ef157fe3315eff1c413a2519b12c0b8db1c669ec167f64666ec4fa5dcbcf2760bbba346f09fd88e9ab6b293fa090ec133066866de WHIRLPOOL a822c15eec7cc3b5a9e30d4000a240ddcb09a87fb18847a9f5e0f6826c9fd45e16d535a4e458c482ad086e5332aa8d767ed15157e909bd50f7425d131959baea
diff --git a/dev-python/aldryn-bootstrap3/aldryn-bootstrap3-1.2.2.ebuild b/dev-python/aldryn-bootstrap3/aldryn-bootstrap3-1.2.2.ebuild
new file mode 100644
index 000000000000..d6bd9261255e
--- /dev/null
+++ b/dev-python/aldryn-bootstrap3/aldryn-bootstrap3-1.2.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="django CMS plugins for bootstrap3 markup"
+HOMEPAGE="https://github.com/aldryn/aldryn-bootstrap3/"
+SRC_URI="https://github.com/aldryn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-cms-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/django-appconf-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/django-filer-0.9.11[${PYTHON_USEDEP}]
+	>=dev-python/djangocms-attributes-field-0.1.1[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
+	eapply_user
+}
diff --git a/dev-python/aldryn-bootstrap3/metadata.xml b/dev-python/aldryn-bootstrap3/metadata.xml
new file mode 100644
index 000000000000..29783cfca9b5
--- /dev/null
+++ b/dev-python/aldryn-bootstrap3/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">aldryn/aldryn-bootstrap3</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/aldryn-common/Manifest b/dev-python/aldryn-common/Manifest
new file mode 100644
index 000000000000..7664364f352e
--- /dev/null
+++ b/dev-python/aldryn-common/Manifest
@@ -0,0 +1,4 @@
+DIST aldryn-common-1.0.4.tar.gz 13789 SHA256 3f7ce7d24dd76582879e0ad6b4c0365fe65212ef3e23cda2659e70a3934e84e2 SHA512 6c95cd0ec4ab19e2802fbb5d40a1644eb5c87c0aeae40eed5645cdedb3bde130201067b8c116d86bb68e24a3c6b4c321d7a7d99f3a312493b4c9d2fb4c3eddbb WHIRLPOOL 16cfdf6b4c3e2fbed784d46de6f65c51ce6ca3bc6ceb63725e09d475402f2ca64d9b25cb4d3bd1f8000b3af686d02dbab0af8a53caa85b9332a7f0a88f6b2955
+EBUILD aldryn-common-1.0.4.ebuild 713 SHA256 4b37a49ed8710f82f27a8780802b87944170f22f953035548cb7672df35d5b63 SHA512 d48a23d0e81c0ff745961942f53894f58fa8e5c4a970baecebf3aef31c99e6b53ada250d55c65743e778766a05ca975e157afdb16c43c7f67481d101c83b42be WHIRLPOOL f4a6a649ed17e9f0a795345dae96a18260864059d73c89a08f0e6fe6043beaffc61299a3413f67010fae7112c93aeb105c9c148fac26de3bc8b49342501e8dd8
+MISC ChangeLog 703 SHA256 49d9e73940c4b94ca4cea8fb66a50d75f713cb2b4527659dcc722c7ef89d1814 SHA512 f135cf5777190358175f585c649c1fcb7dd8e138bf4f0a4efa623f3db54add03465011af4d37727fe1a7238d0570dca22926db4d0e676761d0369ed84e19b60c WHIRLPOOL dd6e1bc8d7ce874f64d12a45b90b2429d8e45087f888e7fc3254b59c7f53c03414e865c5acecc21bd142239998db6fd95f6e796975c7d3911ccd02686687d94f
+MISC metadata.xml 299 SHA256 f8f85aba85c979af6f6a372aaac15dadde24a9722b28271ac007e4583085ed00 SHA512 94bfd8d44bf7f1b62155b6324ce5fff9e7028096bb9247667db80363594f5d487f8a7fde211866d8225b045066cda01a33e4daf91c77214388737617cee3ced2 WHIRLPOOL f1c476b50288a1a6904eae1fc24e04e93e928052e43bb0ed9c21f87527eaeacdf145ae6f5f220d5210b2b0ab02736aca1fee514096f5b0e08194c159c179d8af
diff --git a/dev-python/aldryn-common/aldryn-common-1.0.4.ebuild b/dev-python/aldryn-common/aldryn-common-1.0.4.ebuild
new file mode 100644
index 000000000000..8c54a7d53b79
--- /dev/null
+++ b/dev-python/aldryn-common/aldryn-common-1.0.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="django CMS plugins with common utilities"
+HOMEPAGE="https://pypi.python.org/pypi/aldryn-common"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/aldryn-boilerplates[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/django-sortedm2m-1.2.2[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
+	eapply_user
+}
diff --git a/dev-python/aldryn-common/metadata.xml b/dev-python/aldryn-common/metadata.xml
new file mode 100644
index 000000000000..66ca2240eece
--- /dev/null
+++ b/dev-python/aldryn-common/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">aldryn-common</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/aldryn-search/Manifest b/dev-python/aldryn-search/Manifest
new file mode 100644
index 000000000000..55939d00cbe7
--- /dev/null
+++ b/dev-python/aldryn-search/Manifest
@@ -0,0 +1,4 @@
+DIST aldryn-search-0.3.0.tar.gz 26548 SHA256 5476aed80763f1b95845aaa7d6f5aa3f8d0c35fa322bacb51703e5b43eb41648 SHA512 ce428ca844798c938964be4412ad87fc9f6c152f4d9bb711e23d0eea4d2c1cb9d2e2e0590648d2f29beb60273562c995f18a5c754107c61db3a19bc139f55c67 WHIRLPOOL 0ca1d2bc9cead929da0ba51ea93fdf1b8f668521b83eb5c9a9f4ccf148211415d5591773f975037b4d8a1cf528102078bb52ebfd5936f61b0a7df6d20f4ad0aa
+EBUILD aldryn-search-0.3.0.ebuild 885 SHA256 fdc5a4bf8672018b0d7828d8ba5ea49fc6677f933f70b1c0c9021f44582db1d7 SHA512 f72c20cee270732e57e3613e0096be6217fba9adb84361abdde2ac11b68934039fcfe22da5fbf34df7f3f54add241910388ce05d301ec521621f79f3e8ea1a23 WHIRLPOOL af2c898be065d15e56d2f733eb6cbe039fdabbfa1a630dc5124539658289c7aec7b5186174189b53a5f906d76cd96c239d9cb934c6fb1e0d4a307f85ed28d62e
+MISC ChangeLog 678 SHA256 34d25963dd3f829ee72a4a0202e5e13e29950c584a4ba61b9b96690993057272 SHA512 d210b192d880e9c21569ca20eaf4517b5e563a856c9e6e41dded65f628803b47c09736619ba2e04ee6ab679f47c4cec492e4245ecad95064c757e30763874447 WHIRLPOOL f9d192c1b482cb77ee54025ca9f2067ee3ac421ff52323a3beb3dbd323adac1a24d7add533a0d16869a793ab797645997f202f925f4c9f8ec83b61bac37efd4d
+MISC metadata.xml 361 SHA256 d8dfd3ee61b44f65bb98fbbb37885d219b033f6a622758930f785b8ea4f3d6de SHA512 dcb9fb6f30d2cdb87dc6ec0a57640728ad10070a62ec344fc20cf2da4d9c843ce787e32acf0a4bb9547714dbe4b68ca2f9c529e8f852729245acc909fe4ed31a WHIRLPOOL 76beb433e2f751176a1906091919092159d1cb11d03b29222f5cfd95e6ca8a5217a761e343cdbf34e65c3323c680f5d9e7abc44394e35f66d29009ad6771f8e0
diff --git a/dev-python/aldryn-search/aldryn-search-0.3.0.ebuild b/dev-python/aldryn-search/aldryn-search-0.3.0.ebuild
new file mode 100644
index 000000000000..f799ed83fa63
--- /dev/null
+++ b/dev-python/aldryn-search/aldryn-search-0.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="An extension to django CMS to provide multilingual Haystack indexes"
+HOMEPAGE="https://pypi.python.org/pypi/aldryn-search"
+SRC_URI="https://github.com/aldryn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	>=dev-python/django-1.4[${PYTHON_USEDEP}]
+	dev-python/django-appconf[${PYTHON_USEDEP}]
+	>=dev-python/django-cms-3.0[${PYTHON_USEDEP}]
+	>=dev-python/django-haystack-2.0.0[${PYTHON_USEDEP}]
+	dev-python/django-spurl[${PYTHON_USEDEP}]
+	dev-python/django-standard-form[${PYTHON_USEDEP}]
+	>=dev-python/aldryn-common-1.0.2[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/aldryn-search/metadata.xml b/dev-python/aldryn-search/metadata.xml
new file mode 100644
index 000000000000..9a396b038d02
--- /dev/null
+++ b/dev-python/aldryn-search/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">aldryn-search</remote-id>
+    <remote-id type="github">aldryn/aldryn-search</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
new file mode 100644
index 000000000000..f57598d8e918
--- /dev/null
+++ b/dev-python/alembic/Manifest
@@ -0,0 +1,9 @@
+DIST alembic-0.8.10.tar.gz 976028 SHA256 0e3b50e96218283ec7443fb661199f5a81f5879f766967a8a2d25e8f9d4e7919 SHA512 28456eb41a2b2d0d870f34cfddf46c25ed01fd1ee99b1a3697e6c0c5369f49245e54db0d7232cc839cf03a5c48efb48a8b967586b3a81ba9462b485b6782a415 WHIRLPOOL 7aeac48eb5fa81c91bfbf9c601875fe3329f1f899f5c20321574bc7141f82aa4dee8c7388cad67d28f6a13ad5d016a14beb7e84386f8a641d10c00cec1839cb1
+DIST alembic-0.9.3.tar.gz 991744 SHA256 57f2ede554c0b18f1cf811cfbb3b02c586a5422df94922e3821883ba0b8c616c SHA512 1f39521a1cc9e1e8f8d344f2e48e1f656aed2ffda8e0608b9c5a9a7a1f0e4d16865ae0fba903023512a198afc70e72c683b0ff2bd1bc2e9ba6667009e940a63e WHIRLPOOL 3ffc0bac46b4e0e89fa1e2afff2c1f2a6df5f9e3e9af3a4245ea4d048024b7b34896910db79d7bfc7be73fa9cb182d8a52425b67d5f57402984b6f3db39dc085
+DIST alembic-0.9.5.tar.gz 990808 SHA256 8bdcb4babaa16b9a826f8084949cc2665cb328ecf7b89b3224b0ab85bd16fd05 SHA512 7588a681a6cf50a58ad697cb879d465d259880a473647d598242609c6321a8be7f53fc0d9a24fe976c4c65750eb0acc1a8e60253d4ccda33c87319ac9985e8b8 WHIRLPOOL a402d2294169243d97461500d4ef06af536c319ad1e957f282b59aa2c8756c512e67dff7b9887706994fbfc29b5d46af3a0f1df79d5ca76772524f43796c0ea5
+EBUILD alembic-0.8.10.ebuild 1350 SHA256 573fa14b305df94543380732e4f328476ccbbb76b7f89e616161715e81329713 SHA512 0f35458bdfa151de6095bcc4e234f7014ff7b11ded3652b3faef410a025167cf3884da59a506435e6cff338d61e3bbed67b6c958adb6ace2771c0a08e5b9bca7 WHIRLPOOL 74e03f4af3f323f08001d590939941ad765931ceb1adf287dfed6776a69ad82130e48a1cea9f7ca58ed1a974bf1ceada8c2a8eee020a4c705e894d7272c1b379
+EBUILD alembic-0.9.3.ebuild 1396 SHA256 7cc5e0a41cd708d5489ee76a4797748d4e837d47fe69c97cdbd028005fcdaf1a SHA512 194f68fb4364bf625f414dfee1e3aff268f24f4d2505a0d201ebd466563a5e8a7a86a617a790eb6a369df078c8f7f3d9545978dd5a739aecebc9ff3bf5d6e19b WHIRLPOOL f2ef26692fd9be0fd19f96ee5a8d704797803371fe48f369bb67079af2751a93473d030be3bbbf24cdae36d67a0948d125faf55cef04708503de2bc278c58c33
+EBUILD alembic-0.9.5.ebuild 1398 SHA256 bf07215268c08b342962001f4cfe547a43524a6c9caa8c5ab6ace4f73ae8fb28 SHA512 52e82d8a19e6112df9ceec510b35c0a7f5c46ba3e1e75d5a1940bc4292be510ec98604be584f50a44dd67d36d771ae9f398dec0b1f1c12ef34e1fcd2660b0b0e WHIRLPOOL e013fd5e76d937467626682bce9e8e9d1bafd1ea8d2e2eb11bf862259a65a41e2b6bfa9dc6afd2235f7a73c28b113614b2fb1ae6ca390afd3e7dfd75350b1461
+MISC ChangeLog 5409 SHA256 d210656502c084518bcd7b8d0bf21af273368ad6c481a7b4eea771a3322daaea SHA512 e38f1a9f4383a7458017a7819addf24fcbb9d189dc64fb67d9ee0e79c10aa678ddf0831f5522111e7ab4bb62b889499c9deb404ce539becf4ba57b3f28347c31 WHIRLPOOL 615de82805b3da4833915f1da5ffcf3ee96ceef19717b76a5734a4f1f6dab38becdf6275ee823ae20efbe3d08532006b0444cad6d21d576071d6cd574c8b4820
+MISC ChangeLog-2015 3069 SHA256 8870f735ce578ac69b5b3110759881a7a71d24ef5183508ab2805d90f05b56c1 SHA512 410b377fc222e433f0d3bb953e12fe27a56d68c5a72d27f04ebee0673d1185df08665976b5680a657bbcc43fcd911646a9b86b9e689ed0135e59fd85558a61de WHIRLPOOL eaf4a36ab84d2760667874c91f6cc868be4ac554fed288a36240921e1f893f9308bbc3aff19f01f08f97ee1ba0b4af8e6f19c5f91c2b3d19801aa3dde1467bf3
+MISC metadata.xml 379 SHA256 e824e61f5185fa092d0315aef8555ee2eb6cf207c14532935ec3062f5f8341fe SHA512 809c3f1585e85726feefc7f8493ec83ee31a9f7aa99aacf82026742f278726ad960a63b40c701a1a2453d46fd64d8245b83f2bd7511b5cc077c44bc62dda3e83 WHIRLPOOL a8f46005f4d593a9cc01a7945b5e2bb925ef51e3c63cef5e0c5d8027c9f07fdfa63c2ace60d9eacaae6d3b45479c2cb2fb591a907e1bbb113f908676fd6f30e5
diff --git a/dev-python/alembic/alembic-0.8.10.ebuild b/dev-python/alembic/alembic-0.8.10.ebuild
new file mode 100644
index 000000000000..0d136584e356
--- /dev/null
+++ b/dev-python/alembic/alembic-0.8.10.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="https://bitbucket.org/zzzeek/alembic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test doc"
+
+# requires.txt cites 'SQLAlchemy>=0.7.3' which is really both old and silly
+# because it shatters the testsuite.  If 'someone' cares to adhere to correct form
+# and edit to -0.7.3, feel free, and then pick up the pieces.
+RDEPEND=">=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}] )"
+# For test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# suite passes all if run from source. The residual fail & error are quite erroneous
+	rm tests/test_script_consumption.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${EPYTHON} run_tests.py || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/alembic/alembic-0.9.3.ebuild b/dev-python/alembic/alembic-0.9.3.ebuild
new file mode 100644
index 000000000000..f9b9dab7aeef
--- /dev/null
+++ b/dev-python/alembic/alembic-0.9.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="https://bitbucket.org/zzzeek/alembic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test doc"
+
+# requires.txt cites 'SQLAlchemy>=0.7.3' which is really both old and silly
+# because it shatters the testsuite.  If 'someone' cares to adhere to correct form
+# and edit to -0.7.3, feel free, and then pick up the pieces.
+RDEPEND=">=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}] )"
+# For test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# suite passes all if run from source. The residual fail & error are quite erroneous
+	rm tests/test_script_consumption.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${EPYTHON} run_tests.py || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/alembic/alembic-0.9.5.ebuild b/dev-python/alembic/alembic-0.9.5.ebuild
new file mode 100644
index 000000000000..d031f72bfdea
--- /dev/null
+++ b/dev-python/alembic/alembic-0.9.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="https://bitbucket.org/zzzeek/alembic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test doc"
+
+# requires.txt cites 'SQLAlchemy>=0.7.3' which is really both old and silly
+# because it shatters the testsuite.  If 'someone' cares to adhere to correct form
+# and edit to -0.7.3, feel free, and then pick up the pieces.
+RDEPEND=">=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}] )"
+# For test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# suite passes all if run from source. The residual fail & error are quite erroneous
+	rm tests/test_script_consumption.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${EPYTHON} run_tests.py || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/alembic/metadata.xml b/dev-python/alembic/metadata.xml
new file mode 100644
index 000000000000..4d8c6d6bf676
--- /dev/null
+++ b/dev-python/alembic/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">alembic</remote-id>
+    <remote-id type="bitbucket">zzzeek/alembic</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/algopy/Manifest b/dev-python/algopy/Manifest
new file mode 100644
index 000000000000..2087fd3cbace
--- /dev/null
+++ b/dev-python/algopy/Manifest
@@ -0,0 +1,6 @@
+AUX algopy-0.5.3-fix-test-cast-ufunc.patch 1216 SHA256 41bb25fc70e9639aeeeb31540fd3bbc2e8852705c992423bf27bf8271a21691f SHA512 760f2d9ccba579079992b59a8334a1606ac8481c7164637640916418d7ffa1fb989b81dcf1445c205b832f476ef883f1f0f18cb540909526e8b1a05e6c897442 WHIRLPOOL 763897bed4a8e30544f216b720ed27539e4952cd9b9ec194dc509e5eee8d695394c0fd703c7a7447ef3822a2ad4f7401e0e1b65cae57bed53c3cd3be036cb50b
+DIST algopy-0.5.3.tar.gz 149560 SHA256 2380bafeeeca4e07012d4b0017e163fce260dc50f2d8593ca883b2d761338aed SHA512 43b3cd4f17fa821fc61898534f595202097cd56d57133a1d13e23743c794166a0f8877947cc6eae6d2ac2fd7400e2a6527ee8229ec1b26ea660ac9c01cd22912 WHIRLPOOL d81ae613354879d99bdfc60b962ee5be7b6a2eeef1f7da7c76a2e90cd0ae187abd860f658c379e945b10fbf82b3972eae9ef2036ccd8f251c618a58f0cf09969
+EBUILD algopy-0.5.3.ebuild 730 SHA256 885595063cfc15d2b8ae32161db153cb91aa570b33edcf73fa901efad6a6d36d SHA512 c0b3185bd493f6e18c609b2b4e54dd30166df48a97c9d564c8895710885e2995c1c044dd1592c2449054806d1852b0a0c984bcf4581ff857e773df21a16ff418 WHIRLPOOL 3762a6915c7f2193cd232db9fad806042633e841351481969a0b4a18fd52c58ece03724d895e66bf0492a84cc1ad406bf50ddbc81ac3d8c212fb85332510730b
+MISC ChangeLog 3172 SHA256 f773fc82d07b2a23ad24a372e8717d9a633443fbb206578f27691454c035bb8f SHA512 87c89fbb8e45834832b32fa0c756849aede64151ea751b219b29da349c1fc3bd8687c2bb11921a10babbbb223151714f569ac6d42ed8d653423ac95c2d691381 WHIRLPOOL 901ddb07e492bc57b83b7eab1690fad054cb3dc7e0dcd981a67f57cb853b703917733df8b0e6c51b0a6c29b67068c227a843166e3e532ea9290ca8c90e409fef
+MISC ChangeLog-2015 680 SHA256 c5a7abdeef7b7f17dbc2453c5a99aa02e3e47d9827486b26e863c1ccbcdf6c87 SHA512 c23cd368ea13b1f329301ac585ff6f1a7cb3b44cf93033be22c3474293d84241be7ad433f429a329834f682aaa1c80a52a1ca83e2001e0eb73f8c7e063d9bb7a WHIRLPOOL 470332420828089c44ec2004616bdb45cab6a4596401bbe9ed226a24e18566ca053cabcdcc6feee8fa286fa1d69f6df62949a5fe3e94e061700a46891f35798d
+MISC metadata.xml 319 SHA256 f25d713b738d2bbe12643806aae23469282ba748b19c92b7c19792c8087f3ca1 SHA512 032311a0f7e860ef5e890c30458a03beaebb7911d412642208e1bf60f26088e981ef99bce52a637048512eacb3460e740a7d969d5c83ad42e64cb0c584151477 WHIRLPOOL 3bb53aa0c6b06bd514388f984afd54ba12ccb3397c09220f4e96e3db93f7de48ae4a57e7696ed43bcdf35dd2d8aa9b430fe49c8516c17686132d98f98f2e5ac7
diff --git a/dev-python/algopy/algopy-0.5.3.ebuild b/dev-python/algopy/algopy-0.5.3.ebuild
new file mode 100644
index 000000000000..8c997c090206
--- /dev/null
+++ b/dev-python/algopy/algopy-0.5.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Taylor Arithmetic Computation and Algorithmic Differentiation"
+HOMEPAGE="https://pypi.python.org/pypi/algopy http://packages.python.org/algopy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+PATCHES=( "${FILESDIR}/${P}-fix-test-cast-ufunc.patch" )
+
+python_test() {
+	${EPYTHON} run_tests.py || die
+}
diff --git a/dev-python/algopy/files/algopy-0.5.3-fix-test-cast-ufunc.patch b/dev-python/algopy/files/algopy-0.5.3-fix-test-cast-ufunc.patch
new file mode 100644
index 000000000000..0b8a0eda5080
--- /dev/null
+++ b/dev-python/algopy/files/algopy-0.5.3-fix-test-cast-ufunc.patch
@@ -0,0 +1,29 @@
+From f563d86e72b32caa296ac77b0836ce0e36a5f6ab Mon Sep 17 00:00:00 2001
+From: Sebastian Walter <sebastian.walter@iwr.uni-heidelberg.de>
+Date: Thu, 30 Jun 2016 15:11:19 +0200
+Subject: [PATCH] Problem: numpy raised TypeError: Cannot cast ufunc add output
+ from dtype('complex128') to dtype('float64') with casting rule 'same_kind'
+ Solution: use numpy.add(x,y,out=x, casting='unsafe') to cast from complex to
+ float if necessary
+
+---
+ algopy/utpm/algorithms.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/algopy/utpm/algorithms.py b/algopy/utpm/algorithms.py
+index ccf7ca4..5f2651e 100644
+--- a/algopy/utpm/algorithms.py
++++ b/algopy/utpm/algorithms.py
+@@ -1190,9 +1190,9 @@ def _dot(cls, x_data, y_data, out = None):
+         for d in range(D):
+             for p in range(P):
+                 for c in range(d+1):
+-                    z_data[d,p,...] += numpy.dot(
+-                            x_data[c,p,...],
+-                            y_data[d-c,p,...])
++                    tmp = numpy.dot(x_data[c,p,...],
++                                    y_data[d-c,p,...])
++                    numpy.add(z_data[d,p,...], tmp, out=z_data[d,p, ...], casting='unsafe') 
+ 
+         return out
+ 
diff --git a/dev-python/algopy/metadata.xml b/dev-python/algopy/metadata.xml
new file mode 100644
index 000000000000..d57568e5a1b7
--- /dev/null
+++ b/dev-python/algopy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">algopy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/amodem/Manifest b/dev-python/amodem/Manifest
new file mode 100644
index 000000000000..cc54333bf5a9
--- /dev/null
+++ b/dev-python/amodem/Manifest
@@ -0,0 +1,7 @@
+DIST amodem-1.12.0.tar.gz 19926 SHA256 725a9a57f8f636ba61083b557ee36cfb9b2d30b9a226e1ebd23f15c398357199 SHA512 7707545f77c0680959e6df398cf48c6600d2b9f94e26f6752a47a8434475cc4dff4147a00c7a8a89740d203aed4974ea4cb034921c2da93838bac5faf02816c5 WHIRLPOOL ad25d9ffd1979128396bacaad359974db2ba4d2f2d1d9e79dda61ca1108a6909f37ede43f1d12c7c27025486074fcad955caedff599a466a1fa58bfd57290447
+DIST amodem-1.13.tar.gz 20171 SHA256 e24145268ffd0540754d5ce17a21b2602488cd6f0b7be2907f1734e60f73ccc1 SHA512 daf1d86fd201153da46e5b0f31d07c0fdea2dc55aa3136d72de894e6ae6c9ddb753d4cd8227b5e3ac44a6803aff00c3299045ebd620b95d1ee8fb4945e7958b4 WHIRLPOOL cd1c74a9edf2691fa41cec96ac2db66119602fb7a1836b3f87de0c157365fd61c3c259e2a13762dcd756df021bb09e95d7f6ec8cec3ac0f3f0b75596497a4254
+EBUILD amodem-1.12.0.ebuild 468 SHA256 e8ac29ef37d28dfac92df304868d9b70bb5a3342c7a9854c8157a77a34977e21 SHA512 af961e425848fbf126749d6c39ab5d8bc87431ed258cc2cfb22d02d7dfee6095d70b1fc0d2729b7618576ab69120448a454cf296e78588dcd1f9e1c7c8bf5dd8 WHIRLPOOL aa9db62803238c83ce9494468b6a500e4e7afc3778e864afce5104f4e225bbcf1c8893dd0e460b8303ea022c4eb6a3f380fc5671c3464e597bad7659072b67ab
+EBUILD amodem-1.13.ebuild 476 SHA256 acdabee7395ceb776e4ee526e0da99d74adf1074f1cc35c9de8073e311af9639 SHA512 76b022c7de85f0a5c5940fb9223042b2a99d518d971270865133a1a2823a39613001181b3e9136fd6c7bd92fbf0dad373c5c96d3faab6b5c2ff6f8b2e619bf86 WHIRLPOOL eaff42445e6b898526ddddf9d3534a4e8666e4da2447a94a514ecf4d82b9e9caf343f68a400451995fcd4ae968993df42cade70e0c6aa992b2b466c26d9b1e1f
+MISC ChangeLog 3740 SHA256 b22fe27764615aade89ffcc8ee1fbcaa5a2b6c42967cf6f257da4f2b6b59e075 SHA512 e3d2d1b68f090b13113218542a7d666b53000105c32b1a19efafca76ef3e90f170b07d2f56b205bf56aea4ab37c2a95c3a2c297a55323b70577e1955b2c99ca1 WHIRLPOOL 27eeccda4b8b9b934b9650cdd802fd52319e4a8885d597e2267b7723f3d8aef4308efd92f6c4c71e197c3c5c11e4f911ef5934a2678819f56a3099ff14b60b02
+MISC ChangeLog-2015 911 SHA256 1281effb1694321a8abda2dc1db0d295072321c560c6c178e657c7d2f10bc83c SHA512 519281aaa90e6142e0a0a4d0f0b4febcf504b5c65bc8719120d5520bd9c703072313ddafdb1ee3fc2f6438bb9f0c24447322e30dfd28aadd00cea8a231201965 WHIRLPOOL 10a0ef9bd8d06f0bf0df5c3649ed4142477f9f56c842e6e57f9bf55b96711fd93ec4df1af0115c2afa6d71a4f4ee38bf6c6eba8bc637328d7e4be99fe0019282
+MISC metadata.xml 633 SHA256 05350bb37098ecf9e66ed1b3f88f9f917288d8eb0ec4aca7588b623c865bf1cd SHA512 f08c5cfb56bc47822c398189e67ce9cfac32564a715eb1e802c467fbde9e893566bada4fca093e5d99c2dd991cefb940b7e7f6ba3e904b2642a8f8a9c5398bf2 WHIRLPOOL 6ffc34f5ec9eedca36b8a3392202419ab1b8d99d7d8a94c9dbf0388fc3fdab4a7ba16b2ac5b8ca2b49d53e3b0b5096af0f1c494bc14c5c76d7c6c1a7615bf1b4
diff --git a/dev-python/amodem/amodem-1.12.0.ebuild b/dev-python/amodem/amodem-1.12.0.ebuild
new file mode 100644
index 000000000000..6f4201669439
--- /dev/null
+++ b/dev-python/amodem/amodem-1.12.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Transmit data between two computers using audio"
+HOMEPAGE="https://github.com/romanz/amodem"
+SRC_URI="https://github.com/romanz/amodem/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/amodem/amodem-1.13.ebuild b/dev-python/amodem/amodem-1.13.ebuild
new file mode 100644
index 000000000000..6e52b5ece685
--- /dev/null
+++ b/dev-python/amodem/amodem-1.13.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Transmit data between two computers using audio"
+HOMEPAGE="https://github.com/romanz/amodem"
+SRC_URI="https://github.com/romanz/amodem/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/amodem/metadata.xml b/dev-python/amodem/metadata.xml
new file mode 100644
index 000000000000..119339804385
--- /dev/null
+++ b/dev-python/amodem/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>luke-jr+gentoobugs@utopios.org</email>
+    <name>Luke Dashjr</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">amodem</remote-id>
+    <remote-id type="github">romanz/amodem</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/amqplib/Manifest b/dev-python/amqplib/Manifest
new file mode 100644
index 000000000000..5fdea4afc344
--- /dev/null
+++ b/dev-python/amqplib/Manifest
@@ -0,0 +1,7 @@
+AUX amqplib-0.6.1_disable_socket_tests.patch 652 SHA256 420e8a5e4f89357288af95080fa5e5f6f3b59c9334628cfb354bee4f6e458f4e SHA512 9808f03c281a1384c2753441355fc563663579c178e59a65140146ca670e2e90a2a486eec1760dfdf5dd0f91f522cb427094c758bac04c6f0f06b9e9c7ea2434 WHIRLPOOL fc1d98e7f128f391499fb4f996b8cd952b3948ebbb532b7c8ccb215f1991d7fc3ca7d9648576d405fc80fa75a2db155fe12959016a7f624e07f55bafa6a9ef36
+AUX amqplib-1.0.2-unicode_tests_py3.patch 1943 SHA256 16fcde28424f0f4015e5f6f02cdc885d5e8b7ce2cda3bf6014da381e95abea30 SHA512 8f7f0896593d5fc166de14116e6e67924e41332ae7cedf83501697fa64b847f9f6decd5bb9c6a3af6921607c0ec62b972be74f961a9e616de60d50a01f8ed482 WHIRLPOOL c2308b55b11bdb5f58b1f8ab32de99cc5f729250a2941b661f9ef9c573869fb1686fb03c4ecb74b96e6cef829a661bba1b11a8275fa9a5ac21ef822901009e37
+DIST amqplib-1.0.2.tgz 58544 SHA256 843d69b681a60afd21fbf50f310404ec67fcdf9d13dfcf6e9d41f3b456217e5b SHA512 6c8c9fd7fd68fd6a1eb944962094e57f89525bc78dd002dc0dadd491b262293367a86569dfc52f0701723b4327b7c290150dc2e69e3ac1a28613578d9e0d0710 WHIRLPOOL f3584906a9f6407271335d838cd3b49d3d04b1ec9da04cbc0483272c6f3a73c7307f6bacd6ef8f4a6cf64a348eae631619c1ab09a951d0f3aaa69a1271964cb2
+EBUILD amqplib-1.0.2-r1.ebuild 863 SHA256 db853885d7053a1163d55212c3eb0e28f6a90cd26a9e7816301ddbdcd582fbe3 SHA512 551d0c231b3d08affca5034666cc00feefb54de8f953aaacc675066509a499ecc1822129f588c42d74907c7eec7e6be13aaaae1f104ede63155b1c5f5577944d WHIRLPOOL bd0fea8c96552191a34e60712f7bb6d5adb9cc0aad5be6a87cfe4d30d76b5cbb9b620857f16baa5171aaa2a5bbe28b92a83c5f379a91144c172bb9c8f6fd7fd2
+MISC ChangeLog 3520 SHA256 920a5eb8d287651c9ff8cb56119153c9a6f05ed6b56b76f4f94549c18bf9be16 SHA512 1cb7d8cdc5b5acbe650ecb48d1f7aa919607c3a80e80e8b432224e83260e8509aae9dd1dfe474781b779ddcb6b825324a2c6435bc8eab96651fbd5ab66575aa7 WHIRLPOOL 4105d807e77d83a0501f375a2b5a0c53a0ee6d5cbb424a2bd89b428c78bd59519e093eb190dd57fda9c48c7afc32e8d53b67bc060dc2e04d776357e73c50b6db
+MISC ChangeLog-2015 2063 SHA256 ce81eb425b4e35b68afccdb3eea8e3072498bad0db675080503fab1bae7004ee SHA512 42100c48032657453fa3b4b9bcd942d30cd1b24a78faa308e386ab8ad3dab4557a3e8b32060c6578d65275f5ffd9c9154312fff3e6bb83ed21918e1426669d33 WHIRLPOOL 132c25fe0bd664ab415557176a5537e8862d741c1c09c20991c8632ff05404230ac8e1e6f07d8ff74ad760f604be33bd2df579733e882d2432f7380de06c4651
+MISC metadata.xml 485 SHA256 e6b026e96e8a18d50384878c068184a3cb8a453f9d4080e749e2fba79c36b9b9 SHA512 95c41cbe50f47f275c9e746bc7a7a90ecc63d17f02d7f94dd0eec0cc58de3ef8083a5f96cde53dd284e4ca0c218789b36766d798ba63ad0064838e308431e3ac WHIRLPOOL c6be344ea8e9246c261643ca54bdd43500872bffb50f58e5340af6a27301663dd1e86ce3eadd24b6bb92fe25bcd2dc4a38893551baf0f6bbc603335b114978df
diff --git a/dev-python/amqplib/amqplib-1.0.2-r1.ebuild b/dev-python/amqplib/amqplib-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..4b11bc8dc954
--- /dev/null
+++ b/dev-python/amqplib/amqplib-1.0.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for the Advanced Message Queuing Procotol (AMQP)"
+HOMEPAGE="https://barryp.org/software/py-amqplib/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tgz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="examples extras test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.1_disable_socket_tests.patch"
+	"${FILESDIR}/${P}-unicode_tests_py3.patch"
+)
+
+python_test() {
+	"${PYTHON}" tests/client_0_8/run_all.py \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc -r docs/.
+	if use examples; then
+		docinto examples
+		dodoc -r demo/.
+	fi
+	if use extras; then
+		insinto /usr/share/${PF}
+		doins -r extras
+	fi
+}
diff --git a/dev-python/amqplib/files/amqplib-0.6.1_disable_socket_tests.patch b/dev-python/amqplib/files/amqplib-0.6.1_disable_socket_tests.patch
new file mode 100644
index 000000000000..c92e3cba64f4
--- /dev/null
+++ b/dev-python/amqplib/files/amqplib-0.6.1_disable_socket_tests.patch
@@ -0,0 +1,17 @@
+diff -uNr amqplib-0.6.1.org/tests/client_0_8/run_all.py amqplib-0.6.1/tests/client_0_8/run_all.py
+--- amqplib-0.6.1.org/tests/client_0_8/run_all.py	2011-07-06 16:21:22.000000000 -0400
++++ amqplib-0.6.1/tests/client_0_8/run_all.py	2011-07-06 16:21:38.000000000 -0400
+@@ -28,13 +28,8 @@
+         'test_exceptions',
+         'test_serialization',
+         'test_basic_message',
+-        'test_connection',
+-        'test_channel',
+         ]
+ 
+-if sys.version_info >= (2, 5):
+-    TEST_NAMES.append('test_with')
+-
+ def main():
+     suite = unittest.TestLoader().loadTestsFromNames(TEST_NAMES)
+     unittest.TextTestRunner(**settings.test_args).run(suite)
diff --git a/dev-python/amqplib/files/amqplib-1.0.2-unicode_tests_py3.patch b/dev-python/amqplib/files/amqplib-1.0.2-unicode_tests_py3.patch
new file mode 100644
index 000000000000..14252a678203
--- /dev/null
+++ b/dev-python/amqplib/files/amqplib-1.0.2-unicode_tests_py3.patch
@@ -0,0 +1,63 @@
+--- a/tests/client_0_8/test_serialization.py	2011-07-18 00:11:48.000000000 -0400
++++ b/tests/client_0_8/test_serialization.py	2012-03-02 16:54:35.000000000 -0500
+@@ -32,6 +32,18 @@
+     # Python 2.5 and lower
+     bytes = str
+ 
++#Unicode Strings for py3 tests
++uni_strings = {
++    'u0100' : '\u0100',
++    'hello' : 'hello',
++    'a' : 'a',
++    'another' : 'And something in unicode'
++}
++
++if hasattr(str, 'decode'):
++    for wk, wv in uni_strings.iteritems():
++        uni_strings[wk] = wv.decode("utf-8")
++
+ import settings
+ 
+ from amqplib.client_0_8.serialization import AMQPReader, AMQPWriter, GenericContent
+@@ -232,12 +244,12 @@
+ 
+     def test_shortstr_unicode(self):
+         w = AMQPWriter()
+-        w.write_shortstr(u'hello')
++        w.write_shortstr(uni_strings['hello'])
+         s = w.getvalue()
+         self.assertEqualBinary(s, '\x05hello')
+ 
+         r = AMQPReader(s)
+-        self.assertEqual(r.read_shortstr(), u'hello')
++        self.assertEqual(r.read_shortstr(),uni_strings['hello'])
+ 
+     def test_long_shortstr(self):
+         w = AMQPWriter()
+@@ -245,7 +257,7 @@
+ 
+     def test_long_shortstr_unicode(self):
+         w = AMQPWriter()
+-        self.assertRaises(ValueError, w.write_shortstr, u'\u0100' * 128)
++        self.assertRaises(ValueError, w.write_shortstr, uni_strings['u0100'] * 128)
+ 
+ 
+     #
+@@ -273,7 +285,7 @@
+         self.assertEqual(r.read_longstr(), str(val))
+ 
+     def test_longstr_unicode(self):
+-        val = u'a' * 512
++        val = uni_strings['a'] * 512
+         w = AMQPWriter()
+         w.write_longstr(val)
+         s = w.getvalue()
+@@ -324,7 +336,7 @@
+             'foo': 7,
+             'bar': Decimal('123345.1234'),
+             'baz': 'this is some random string I typed',
+-            'ubaz': u'And something in unicode',
++            'ubaz': uni_strings['another'],
+             'dday_aniv': datetime(1994, 6, 6),
+             'more': {
+                         'abc': -123,
diff --git a/dev-python/amqplib/metadata.xml b/dev-python/amqplib/metadata.xml
new file mode 100644
index 000000000000..1846993fbe99
--- /dev/null
+++ b/dev-python/amqplib/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="extras">Install extra tools to generate initial Python mod 
+		from an AMQP XML file</flag>
+	</use>
+	<upstream>
+		<remote-id type="google-code">py-amqplib</remote-id>
+		<remote-id type="pypi">amqplib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/aniso8601/Manifest b/dev-python/aniso8601/Manifest
new file mode 100644
index 000000000000..cbc0987389fb
--- /dev/null
+++ b/dev-python/aniso8601/Manifest
@@ -0,0 +1,7 @@
+DIST aniso8601-1.2.0.tar.gz 59998 SHA256 502400f82574afa804cc915d83f15c67533d364dcd594f8a6b9d2053f3404dd4 SHA512 1918ee5a22c0ca3fd7cf331ca4f06dff93b73cc7865276e0e276b70e7ade7db0cbc10020619be23d73d646dc15764cb597084e0b5d632c1ee5dd21d29fb33311 WHIRLPOOL 3e62c9b82ef54132fabc4ba20b2ce8711926cb2e162cdd083de1ffdb986b46dfa2608a928e7f0231552507d4c4c144dcd1458491e269ed81283c06ac23414bee
+DIST aniso8601-1.2.1.tar.gz 62369 SHA256 e7ba4f42d3aea75909c79b1f4c4614768b4f13fbb98fc658a7b6061ddb0be47c SHA512 92a323ee4d275437a02936c396da483dd064e0756fc38f869f5e3fa3b1dde59bd1b285f5602efb4ea7c6ced1a633008898c832d6fcd3b9d7f996dbaf25e061e7 WHIRLPOOL fb75d112c30aa951d7c44a00a86fc231e359e6c2a5b2457219ff8214de528a651304044d92414e066ce48a400f31fea139abe6f04d7a88c20fd22e492e2ded50
+EBUILD aniso8601-1.2.0.ebuild 645 SHA256 f94d311a6ec2c68d9a9639edee5920776489f76382bbc73481b1e063e73c98d8 SHA512 2f5f129e6b2d04ea52ec3c3cf4a10cd96689485c0e7fef9d1db254e33b91ebb17e389b651bd61e01ffbbff656ea12789d316a9b4fc7c52be3755d0ce61b69311 WHIRLPOOL 46a10482c0d296953d6e26a539eaea64a7f66fc4398e3060e0c6cd1a25ed8cc2215e01929ec6d4f62e8dabc88b4c16f343bffdb60fbd8b0e9c038b861625be04
+EBUILD aniso8601-1.2.1.ebuild 647 SHA256 26f96c9834e0b0fb084042f2587ccf2aa1e57a0aa35bebce4d297610c797d48e SHA512 afb82a5ebe5fdd437c8ae0eadb7dc2ca8dd76e567baa1a72073527bda770e0fa53f8b83aee73c172b3c4ff8557bf1f906481d06f53b8ee59b9b720a900ef27ea WHIRLPOOL e36df752fbe119471e7e4d97af0ae2b21ea50656726b38ecb2d428730df9146881f152a2b126e04b1157c271eaa2fcedbc194e6bb28185070764d928b7688f1f
+MISC ChangeLog 3446 SHA256 52e503f732ea9a0585cf9eada81f009ed6706f5185a6c87a57ef67e5f3a8c4ce SHA512 496651812fc30ee8aee110a71304c2b4d542282c320fafea310ec5a759b09d205275451643d75bf8db6d6424bd527f83257a87d75c45fc76e9a94a2c0d4a6684 WHIRLPOOL e916adb9ebd069f979641038cf4756b94b824e913481e4e14a608458d7c346be1a1f409cd381a3bcc531c7ae63981aee1913bcc4e687dbad781e5162694a9360
+MISC ChangeLog-2015 1225 SHA256 ddc0b03f16c3915d78e5d8aaaa91dc89e3b3e1f65cdd0f51af541dbbc4252cd9 SHA512 22fd65ac1571ccdb29a45455b3309bc76aed6b0d42b88717468b4b73917b7adb3fa1147ce720e33e6a0ce00984c5bb0f83777d969d49b7bbf2bdc655f4971660 WHIRLPOOL 4aa22531cf9e5feb07b14fdb223c3133eb97f404a3d948b0a2dfdfe00acc36d73c65eedcd74ea03f865b196428fa265f21d24277df17d81b3d92262ca2862df9
+MISC metadata.xml 385 SHA256 139ab95500b28028dbd297f502d1dbb500d93e35d8a1c6136f2e908e37a3890d SHA512 43b38fe6bef338dd41825197e7d3d0bfd3f040ce52073a6db93592f1b49bea4141a58ecc55e71b742c498a62000a2666c456b08d15bf25888858dce310e38121 WHIRLPOOL 9fbb06fd6ab35e23a45432d7746f8032b81de305bbac23ad346443cfd2c091de4415615bb83374b62962e609725cc71e6b2753db5d8e865aca0829ff795d85f7
diff --git a/dev-python/aniso8601/aniso8601-1.2.0.ebuild b/dev-python/aniso8601/aniso8601-1.2.0.ebuild
new file mode 100644
index 000000000000..cfeacc131dbe
--- /dev/null
+++ b/dev-python/aniso8601/aniso8601-1.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for parsing ISO 8601 strings"
+HOMEPAGE="https://bitbucket.org/nielsenb/aniso8601/ https://pypi.python.org/pypi/aniso8601/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" -m unittest discover ${PN}/tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/aniso8601/aniso8601-1.2.1.ebuild b/dev-python/aniso8601/aniso8601-1.2.1.ebuild
new file mode 100644
index 000000000000..97eb7aae14be
--- /dev/null
+++ b/dev-python/aniso8601/aniso8601-1.2.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for parsing ISO 8601 strings"
+HOMEPAGE="https://bitbucket.org/nielsenb/aniso8601/ https://pypi.python.org/pypi/aniso8601/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" -m unittest discover ${PN}/tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/aniso8601/metadata.xml b/dev-python/aniso8601/metadata.xml
new file mode 100644
index 000000000000..3543616a84e9
--- /dev/null
+++ b/dev-python/aniso8601/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">aniso8601</remote-id>
+    <remote-id type="bitbucket">nielsenb/aniso8601</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
new file mode 100644
index 000000000000..0a490c2488a2
--- /dev/null
+++ b/dev-python/ansi2html/Manifest
@@ -0,0 +1,7 @@
+DIST ansi2html-1.1.1.tar.gz 46591 SHA256 5c8a482e92fd49005c083d5ed5aa946d424a71eda60be27fda005bbb5ed8c53f SHA512 5f08e6e3e89797f23759da7aac8cbd17e86ffcac37af8db8c345423c69744d88a1517cb0f17dc9c366b509b972484d25877cce8c7466a7a463eea24af17133de WHIRLPOOL 3d2555784c7077b6541df30b485af5f7f4884c40018b11c8a78afaac8c942f7f0903bf2fe442cdc75ddbb09b7be77cf58cc6a1f980617ded3b6eb68324d441d1
+DIST ansi2html-1.2.0.tar.gz 46748 SHA256 3e5d5ada557e0bbe3e204a686f959de17f76c86c20615c034767e5ebdc0740f1 SHA512 3106488da19cd093d7ae2a7499a66baf77877f47da0e497791cea2a63079c184f1d36743e78116b3faf08ab145ca97b5774151114b9ca193020578c8a3bdc860 WHIRLPOOL d19a79d21c630ccbb5ad7a66fd076c47d93d06879f493cb1e6c2e2eed5b66f8a9208c38ada9ef37159d9d27bc2915abdbdec5869b53cb8678c8316c98eedf04d
+EBUILD ansi2html-1.1.1.ebuild 977 SHA256 84d9e9c0e9325105bf0d44af574ebfbb2b09dd08b7fa3e0dc220efdeb7521b70 SHA512 8c19c40da749aa75813b08e479fc316baa63a21d86068094f9f0397872e485348a8c9e252583abb789a8d9de8576870e41f98e4d5e9bbb6dc795bd734402068a WHIRLPOOL a58ff8f01368e2ea625ca6efa27effa7a60a3143cc49460f2a196ba9a3f58448d3be8f0faf75dd5abc89066932604436da55dce771eab3309a657e75b7ef2bda
+EBUILD ansi2html-1.2.0.ebuild 980 SHA256 cfeaf6bed42704482e02311b49b00733f64220d0c4528f3e83cdb967e8f2a0a7 SHA512 04b1a15ab92cbdc757ddab504da3492ba6ae710f9f8314c0919632c065ac301ccff506b00693648c5ff8f3fc185d0e9f57f85a21f6e1d5f47bd77e0cc2db1b8a WHIRLPOOL 5c7e1f499b5e04bfb64098aa0169ced1d0594dca9ea984eea0fcdb56507fa076a9fe8d5f89967a9a86592d7fc7c8dbe0ecaa511b30f8968c4415fe4569bf476f
+MISC ChangeLog 3911 SHA256 06eb34a0ca16795bfa8b8758b84a220f20646ed1543fcf46ec4b1ad1c894aa46 SHA512 1566727ab0d7a2a056e29413cc4b6ae494e6cdc8a12554ce41596ae61cdaf0ba0c4e0028395de03f0a9425faf6345dad5d96dfe30d188ee3b99055ef64eb12c9 WHIRLPOOL 17f1af91726cbf8fe4a3b57b8c7927cad3e53a986101b1fad48437497803aa595816266d2ac96b5c592656069021f700690d3ea0bd8735f2734c2d69b8945c8e
+MISC ChangeLog-2015 3750 SHA256 7cd4679516f36a5d50be347dcdff243c168ff68bc715d2ac1065671eaf579ee6 SHA512 9ee6e4f4b04467839be5b56a5a418e1875742d086cdab24756bcd68a5831d745bdfdfef4ed269ff70e3251304c2d3fa0709c10e5e009c140a0cd4323216e3da6 WHIRLPOOL b29e80d7ecaade3756902acb4c92b2309cb8cb613c01f169571f393c65fe1f74456283412486955910dec2d08ccfc94d6c4d370d802172652f9e50808d2ca2da
+MISC metadata.xml 392 SHA256 ca5725d1f2571621d98e412da66891aab1713fb79c45365cde97eddb910dd2d0 SHA512 a17684f5bd76762a832cba99a1edcd2b2ebb1abdd27f36528fb4d2ded639b6223f60495c6dd2ee548826f3a2e177238318c02962d2300ace37eaa881e76cf095 WHIRLPOOL 6544e7c36f11a33cab6d15024f46ca8425bea13d36978e8669aac7af6b16b3a0048f23e3b46a9473659041c67161c5a99024c624e0d0c3d464efc6a009f57f2c
diff --git a/dev-python/ansi2html/ansi2html-1.1.1.ebuild b/dev-python/ansi2html/ansi2html-1.1.1.ebuild
new file mode 100644
index 000000000000..4d9daf980e3e
--- /dev/null
+++ b/dev-python/ansi2html/ansi2html-1.1.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Convert text with ANSI color codes to HTML"
+HOMEPAGE="https://pypi.python.org/pypi/ansi2html https://github.com/ralphbean/ansi2html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="test"
+
+# They miserably fail.
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
+
+python_test() {
+	chmod -x "${S}"/tests/* || die
+	esetup.py check
+	esetup.py test
+}
+
+python_install_all() {
+	doman man/"${PN}.1"
+	DOCS=(  README.rst man/"${PN}".1.txt )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ansi2html/ansi2html-1.2.0.ebuild b/dev-python/ansi2html/ansi2html-1.2.0.ebuild
new file mode 100644
index 000000000000..7abb9dc442a2
--- /dev/null
+++ b/dev-python/ansi2html/ansi2html-1.2.0.ebuild
@@ -0,0 +1,44 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Convert text with ANSI color codes to HTML"
+HOMEPAGE="https://pypi.python.org/pypi/ansi2html https://github.com/ralphbean/ansi2html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+# They miserably fail.
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
+
+python_test() {
+	chmod -x "${S}"/tests/* || die
+	esetup.py check
+	esetup.py test
+}
+
+python_install_all() {
+	doman man/"${PN}.1"
+	DOCS=(  README.rst man/"${PN}".1.txt )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ansi2html/metadata.xml b/dev-python/ansi2html/metadata.xml
new file mode 100644
index 000000000000..6d3ac65af5f1
--- /dev/null
+++ b/dev-python/ansi2html/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>sping@gentoo.org</email>
+    <name>Sebastian Pipping</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">ansi2html</remote-id>
+    <remote-id type="github">ralphbean/ansi2html</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ansicolor/Manifest b/dev-python/ansicolor/Manifest
new file mode 100644
index 000000000000..d3a8f6e85068
--- /dev/null
+++ b/dev-python/ansicolor/Manifest
@@ -0,0 +1,7 @@
+DIST ansicolor-0.2.1.tar.gz 5678 SHA256 f5a5e105cf2457112df3cb2fe0200803129fa5dde86395a680e95b0e951b3956 SHA512 334b90eaf3f21469062ff4f70043fa902c1cfd53e7d73d22e4df63dbeb55db1f33d71b5a88ef6ba4481a9144ee7652ea68d9554f5155e129f462872d064430b5 WHIRLPOOL 38b24fc0880ace1d632e932fcfd3fbe805e7139f40410709477c17659839ca8b0cf909e0ef7f594ec9bde7b51ae3016486b4931d63b50cc9b63e28e2012636e7
+DIST ansicolor-0.2.4.tar.gz 5971 SHA256 30f889b330f611271e97d850fd09d911d5389deec8b6cfa1f6c576034e9a937e SHA512 1f20955a5ddf6a2125146fab220884b3dace2faef5b06c637c396b1769ad60e69ef7ae8a4ae3ecd49d0b849efdbd388b611eb738dc7c1b7f19027afc3f30e57c WHIRLPOOL 83ee2de115d02f38bf45a12cf0b3b9930516fd189b7947d4c1d05ae71d1e406feab4ff003f495a14d4e17a9e7f3c18f60b8271d47df6a007731861ddbe0aafc4
+EBUILD ansicolor-0.2.1.ebuild 565 SHA256 1e2700777aadf92d05688e173c7922a71bb9ab794b259e10029bb88b015b786c SHA512 73a812bb0baf9eaceb625967ca2433cf71f73d977c2309ef829e60546e48e71668b048afb6534eb7c9f15bba6a873897da5de7abac183287318c517e59878f31 WHIRLPOOL 4bffeab23ba2043e88b6e4ccf9700e513a58deb84703ed9f129ff2e508217f4d7e2b88361731b0edec54f98a51e9b8545cb47f0e47a1e81c87adb3e9d4227a3b
+EBUILD ansicolor-0.2.4.ebuild 573 SHA256 7420d41280f4a2af75e4b848b9b17f60662f6f9567b888cce9a0d331dd58bc83 SHA512 caf3fd1ebbc8c6bac308bcee477e3cdf14ad3f0ed531b01be34102b5f96a5e37f3f75fff0c2cad99532767bac4c9d655169110028b3ca6f3e435e042828a7336 WHIRLPOOL ed3e5e53dbd89bf59f03c5d5fe5c7d73c33dde43a5bce9a880c78de714ddd2d3ebda11215a13c0f1b7288b35728b25729127942a0bb6ce2a5eaa9eafd2664519
+MISC ChangeLog 2787 SHA256 8213df997e3384a12e33ce57bdb64c1f4950202413964105c123d5a4ecef6059 SHA512 d2f4c023b3db25ed4435d20dea978feb00305e7a15e408dc837b10375d02a47fe7b63cf3e458533478e465472f840e503a244aef76818cf036574ed7be7fb614 WHIRLPOOL d64e4ee8c4cc914c20693d75b18fb01be77c6e5ca852e955c0564095c9e59825deca938cd03f3083321a3fe34fbe634d095d441152d90948906b7a01cf9359c8
+MISC ChangeLog-2015 1137 SHA256 0994cd825fa4337af8004626f31b869bae5138b5a06419c651694ddac1543170 SHA512 c0b1131d54ce02c66b5dcdbc845137a3d2a9a995b1bb4b9c393c0c9cb34b14212d64298ccd00191de0d5c89bd90a60bf8de9091b3678f1cce5507abd91673d39 WHIRLPOOL 7b4ef86203d0a191cde56b6e3135d2da86432528a1d25e5b5ceb4f90e463b62c9b2b9efc4fdbfa06c4fd3513990273c2b1350abc8ac06a6975db48e6e3c29494
+MISC metadata.xml 305 SHA256 f13f60dbf71369d3fe5b2f17384418aef13cead014e2c40ee62735c67c40b933 SHA512 9de4b49f53061b8ed45073bbad59a8f577ca075f271eba90c1822655da1310e212b31774ade66a9e318478f92aad2e863e46bff4ab067288e7d8c2b4f37e6913 WHIRLPOOL 3dbc61ba9ef3090a4088b53f1c305ded1bfa3c176a94fd258d9ce0222210967d7fb69a187e62f5b260789aa1d03340444d8685787a3fdbae75e0fe5ae1e9fd48
diff --git a/dev-python/ansicolor/ansicolor-0.2.1.ebuild b/dev-python/ansicolor/ansicolor-0.2.1.ebuild
new file mode 100644
index 000000000000..e042e1b6f104
--- /dev/null
+++ b/dev-python/ansicolor/ansicolor-0.2.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Produce ansi color output and colored highlighting and diffing"
+HOMEPAGE="https://github.com/numerodix/ansicolor"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://github.com/numerodix/ansicolor/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ansicolor/ansicolor-0.2.4.ebuild b/dev-python/ansicolor/ansicolor-0.2.4.ebuild
new file mode 100644
index 000000000000..552bcb87be0f
--- /dev/null
+++ b/dev-python/ansicolor/ansicolor-0.2.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Produce ansi color output and colored highlighting and diffing"
+HOMEPAGE="https://github.com/numerodix/ansicolor"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://github.com/numerodix/ansicolor/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ansicolor/metadata.xml b/dev-python/ansicolor/metadata.xml
new file mode 100644
index 000000000000..74b262541d0c
--- /dev/null
+++ b/dev-python/ansicolor/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="pypi">ansicolor</remote-id>
+    <remote-id type="github">numerodix/ansicolor</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/anyjson/Manifest b/dev-python/anyjson/Manifest
new file mode 100644
index 000000000000..b45a905c36a6
--- /dev/null
+++ b/dev-python/anyjson/Manifest
@@ -0,0 +1,5 @@
+DIST anyjson-0.3.3.tar.gz 8332 SHA256 37812d863c9ad3e35c0734c42e0bf0320ce8c3bed82cd20ad54cb34d158157ba SHA512 9e70df3cb8bfe2348fdb0eb03cf3c33ca5a1171aca6467787fc28c161354b5ebe89b2f73badfa00708774d6825799860493ddcac7f5da8cc9c251b92b5a343bc WHIRLPOOL 9a17b6296ddf6359c217a7deea989a6dd3c07c2f11125f934c5c4325a909b9a923c08b03fd49a96c30df8ed06c81cdba54ae5391240c7d288edaafb9c44b50a7
+EBUILD anyjson-0.3.3-r1.ebuild 956 SHA256 26d0fd47f04c483486048d580cd2c775989a56606739e90841bc30c083efcdfd SHA512 4b4503f4babd9007132ee36f2fbf7e82f3e94abdd7bae179d6a0a6bb82dac967b5e78b7209dfc03567e41d3d978455999340f50aefdfd2194d40196f05726c85 WHIRLPOOL 7f912088c5c90a95a03bd3f34ca8108b60e404e7d3757e0bb1f8991afcb468e02d0a4b5fd4df9219b5c88d80107df20a1fb213b735ee4c81eaa9b42ae74af71e
+MISC ChangeLog 3003 SHA256 507ed1d466963423b12ee6e29f30efd351e99f13f931cc8e49fd2ac1f8e62fe9 SHA512 971b5c8e8ef2d2d0eef9f5f9ddf92f07e23a3abf84d85d8f08b6889ab8076caf588363a64b5bb77cdfdecb2530bf0c1ececc8c7e385cc523f3158c66831c3f1e WHIRLPOOL 2a99ddf96fe877a75faea7fa43ba1d1a93563cde8540dd65936d086e86365aeb61c9e99c8ea0b05826a2a7301cda36f2b4293903a0d962dd291052d98d9b0c5d
+MISC ChangeLog-2015 2437 SHA256 fd85ee2af04f9c12461234693ff227fa139d1f1e3fcbe381b028cc76b41e0a01 SHA512 b0c93d6b5805a39c6dae8fa410eab5136f57f2f8505fb1e1e1dc179e1d081ac006cae0985fc7b766ea0d47f821605c549ff3f8a3431272f93a1ae0fd3683d4ae WHIRLPOOL eb17ae79b88593b3e7f2bb068f6eeb6b1f5999bfeecf1e9085369cb7a1b7868feefb2067c939544fe588f109ebf57319fb5e9f9c6252d788c2a2a47cb138a3ff
+MISC metadata.xml 378 SHA256 bef5db4b89dab7992966a55977959f57327d8cf9a308aea2e9881970227e1f42 SHA512 51bd7728ffa457fe04c22c66f497e5cbc1cbad3ead97525a8b443616801338d49100d77d57c33eca873fff567e86ba73e319d66c9d117e246bdebd36d30cab0e WHIRLPOOL 135ea18de83a09228961992d732bde8bafd0dc940f3aec0a0ecdb1cdfab553fa3d7765e7d241d02abf270acf95f456ade4b932a29a3598949ae1f25745851b9d
diff --git a/dev-python/anyjson/anyjson-0.3.3-r1.ebuild b/dev-python/anyjson/anyjson-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..f616e72b6266
--- /dev/null
+++ b/dev-python/anyjson/anyjson-0.3.3-r1.ebuild
@@ -0,0 +1,35 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Wraps the best available JSON implementation available in a common interface"
+HOMEPAGE="https://bitbucket.org/runeh/anyjson"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+# please keep all supported implementations in 'test?'
+# to make sure the package is used in the widest way
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/simplejson[$(python_gen_usedep 'python2*' python3_3 'pypy*')]
+	)"
+
+python_test() {
+	cp -r -l tests "${BUILD_DIR}" || die
+	if [[ ${EPYTHON} == python3* ]]; then
+		2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
+	fi
+
+	nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/anyjson/metadata.xml b/dev-python/anyjson/metadata.xml
new file mode 100644
index 000000000000..f0196f208881
--- /dev/null
+++ b/dev-python/anyjson/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">anyjson</remote-id>
+    <remote-id type="bitbucket">runeh/anyjson</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/anyqt/Manifest b/dev-python/anyqt/Manifest
new file mode 100644
index 000000000000..4fdfd7f6662c
--- /dev/null
+++ b/dev-python/anyqt/Manifest
@@ -0,0 +1,3 @@
+DIST anyqt-0.0.8.tar.gz 43519 SHA256 0424953b6917fba633febe7d91b2c90bca410de6342103f880e2a7356beabf05 SHA512 8bff488972703385bb0506fce7b33e2c62a0c6469e0284062b0882dda0842d5488621c722e00c2005aa1f8ff18307e823e146aca92c16f5116d2bc974b194641 WHIRLPOOL fee2256d81daee988df08fb4c49c5399995f21c146a4f359f7d5b41a8413d2808d95244717ccb59c1c0878e59148a617e2c161e170f12844048672562b5f49fb
+EBUILD anyqt-0.0.8.ebuild 444 SHA256 d30306ad0f1783902628edd4ea02407fca10d3a4fb927a3636db51017f1f0ae6 SHA512 7dffb40505c60f1b5929d5ea5009a199e01089784feab9adf2c022fe230ed510e4ffa97a716a18f761d694e841f5d833de44f762a7d1d3136083a6c5467b28d1 WHIRLPOOL 073fbf6d17c1592f239db46263777e3d57bf768c66c255b917da0ef7d7c7654985f8d1ee7e6f300b35ff8da94d568d2820ac480167395221835676aaa40f370f
+MISC metadata.xml 217 SHA256 b44fe96231d5bd401d4a5d1c9831c1b45aa0f7898c11587e2cea12a900d84dfb SHA512 9611c83ea0155f3d39afee524c6425ae6d7e07cebc4ee489a45e39ab80e97fc2bff56fd9a8d97536a5bc415da147eb587b20ccffa5baa61440df65bd26576e8a WHIRLPOOL 5144ddf9ab1a4754ef7ecd982ac1023d44f7e662db1cd97638ca54aa66d097a314ec56dbd15b33612e352555ef7969942649b602b3019e92e6c0c52e31dc6760
diff --git a/dev-python/anyqt/anyqt-0.0.8.ebuild b/dev-python/anyqt/anyqt-0.0.8.ebuild
new file mode 100644
index 000000000000..6d732a48e557
--- /dev/null
+++ b/dev-python/anyqt/anyqt-0.0.8.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="PyQt4/PyQt5 compatibility layer"
+HOMEPAGE="https://github.com/ales-erjavec/anyqt"
+SRC_URI="https://github.com/ales-erjavec/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}"
diff --git a/dev-python/anyqt/metadata.xml b/dev-python/anyqt/metadata.xml
new file mode 100644
index 000000000000..f728eac91cc9
--- /dev/null
+++ b/dev-python/anyqt/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>amynka@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/anyvc/Manifest b/dev-python/anyvc/Manifest
new file mode 100644
index 000000000000..1ac95347d234
--- /dev/null
+++ b/dev-python/anyvc/Manifest
@@ -0,0 +1,5 @@
+DIST anyvc-0.3.7.1.tar.gz 45890 SHA256 264ccd659269ff62ca983d48c7affd27194992880d094e32fff58225a9b6311c SHA512 90151133b4da41acb10c2d8e421963e5ccb1e8da1e5327d5a69a77ccc647086683f1ff8ef600c69e01cfda28193c69166fa5717af3dbd13761d95ab3f1c7be46 WHIRLPOOL 5f6500d069eafa56434d57c225e566e55aedadaad0c1d4afc7ff76c0481f3e797f6ea64e88d3001e06d6a529dc01d6c38cbb9e2324245c103d7031b7ef00278a
+EBUILD anyvc-0.3.7.1-r1.ebuild 1398 SHA256 aa1932d170923974c2987ff7d2ba038d8ac5086926171bf8f8765c14f5a71908 SHA512 fc67dced2b214f0536bd832db428e66c3758af2274bc1fc40606f44480c04453dfda2a2cec9300b9b704034475317ddf875022c9d0ad61df31c272a26a4d1b72 WHIRLPOOL 2a03aab0db9274df3bd6904ed2afa67e00975f769e06666ac9cf52a6612f0559960d4ded223dd53b709027834e0d42c547f0698488b10afd418e939d014d132a
+MISC ChangeLog 2579 SHA256 365586045fabb84e3572c293d80ea3ac2d11f0224e03b39a8dab2e8653484b5c SHA512 6ee29149d2d7c05a8f94f192a46c3009c0ce5c8034fd10acd40f36c1cace193f79b3fca92b0952bc3d9e51989434782f1cb56a51113ec8261d809a7551cd513e WHIRLPOOL 593bb0f274dae4196d1d8ecdef4958436680b92f8b536917ca924e03b6b5771f3f1d149f907a8559ede20c79de65e1a7db2b11ee2094e59d90c9434492ccf92b
+MISC ChangeLog-2015 1797 SHA256 1b7c8084adc6f10e9db1676255945159956302d82d269fbe25bb8f6463a31c09 SHA512 59a0dad08b3d08b99115eccf5d346a669bf2e081abc2ca19045d357f1e6faa751056da27cf5baba5d0a6496e2f009ad6347cc4b6d3e3da6806331ea90841fc9e WHIRLPOOL c121603941a68395e36fbf27debd66f5e3a366ad0c2bd166daac8e2e836a9d3342faab1c8d147898d81dd5b2fa3f42597cc61616a21e99366b87efb56e31fa5f
+MISC metadata.xml 433 SHA256 20406813bdac7001862eeada73a3e918c7424f34633b1e9364176f3ee8851635 SHA512 fae34b68b323e879e3867ae5410242856a4b2cff5ccc17c8007eaabc6546e17460fb910208610ca36114d284626eb937bb080cb953e9b9f55c0d27d881338d6c WHIRLPOOL d8a1efbf77ba757e94fc8ccc38b97f607be544f4d137a515c3857c0fe7ce36125bebe226d19d8a71ba99bf0d5bd60d6c0ca54eadbd64226ef9d565b763da8bc0
diff --git a/dev-python/anyvc/anyvc-0.3.7.1-r1.ebuild b/dev-python/anyvc/anyvc-0.3.7.1-r1.ebuild
new file mode 100644
index 000000000000..b0d4c17e2bd5
--- /dev/null
+++ b/dev-python/anyvc/anyvc-0.3.7.1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to access any version control system"
+HOMEPAGE="https://pypi.python.org/pypi/anyvc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="bazaar doc git mercurial subversion"
+
+RDEPEND="dev-python/apipkg[${PYTHON_USEDEP}]
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	bazaar? ( dev-vcs/bzr )
+	git? ( dev-python/dulwich[${PYTHON_USEDEP}] )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? ( dev-python/subvertpy )"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/hgdistver[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+#		dev-python/hgdistver )"
+
+python_prepare_all() {
+	# Do not use unsupported theme options.
+	sed -e "/'tagline':/d" \
+		-e "/'bitbucket_project':/d" \
+		-i docs/conf.py
+		distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html docs docs_output || die "Generation of documentation failed"
+	fi
+}
+
+python_install_all() {
+	if use doc; then
+		pushd docs_output > /dev/null
+		docinto html
+		cp -R [a-z]* _static "${ED}usr/share/doc/${PF}/html" || die "Installation of documentation failed"
+		popd > /dev/null
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/anyvc/metadata.xml b/dev-python/anyvc/metadata.xml
new file mode 100644
index 000000000000..8177266e4c5c
--- /dev/null
+++ b/dev-python/anyvc/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="bazaar">Add support for Bazaar</flag>
+		<flag name="mercurial">Add support for Mercurial</flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">anyvc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/aodhclient/Manifest b/dev-python/aodhclient/Manifest
new file mode 100644
index 000000000000..e29611e8193e
--- /dev/null
+++ b/dev-python/aodhclient/Manifest
@@ -0,0 +1,8 @@
+DIST aodhclient-0.6.0.tar.gz 40827 SHA256 eb33dd5b215a137d052cdbf12d9c7a2ab3d1fe52702ffd2323e57d2fa759363d SHA512 daa3f568cc2c59a010024beecf2917bf7e3ee64a0a18851e19c92dba159fcd2f36e64dd418ac4a36ee93b0a06c8c00b1f222aebfa915e9bddeaca074a12568bc WHIRLPOOL 2e71b890b392f6c00abe2c5fb45dfdf98215403612de2d50f19c4c9a82cde91c5cd7691fe51c3838ab6a7009824dfa01ca1430b95c86a9ac41fdea005758e915
+DIST aodhclient-0.7.0.tar.gz 42096 SHA256 17afd102aea3711e9315bb6d8f7d176c7ef37e8ee60ea2e9302c5763bf41c979 SHA512 96c454e7ada9b8032f74f928dbb868c23a8a1d358b86d804f190eedeab78af041dd0fa673924da3b51785ef670634787cee91aec308381a2797125650cf79087 WHIRLPOOL 3ded0d4e36a2f9b85c3d05ecd0c6b3bcb5de6ad114fcbd2993e8ec4d679b5c03f90fe3a27bf1fc506af9fdf848a9f31fe73c328dead7f836e0138852da95bdb3
+DIST aodhclient-0.8.0.tar.gz 41676 SHA256 36d2bed63f581183a9dba66553440d3ece4c466137875a546540f2ae65db71ae SHA512 8cb6ccd3fee3e2abecd5f9eb1b00c67ec4476f85498a9b23f4818c80e787d5373899eb90217e03b5baa376dcdf3c5aed9da8f369a0d6e562c3d97fd22b5b8850 WHIRLPOOL 1be5a3a93fc32ca6420e41b9f4128aaacafc27aa1ae18dd83c59c6fa5789887ca10c89cb1fd50c897ebc3ddb4807afe06034c3a324e668bbf8c0a40ac19db88c
+EBUILD aodhclient-0.6.0.ebuild 1127 SHA256 7971a3b3816dec82dfcf84fecd0865ab02f86e7c067fbe528100a530abf80921 SHA512 863deffd3faede99f4ce5ec523b105b9af80da580f2ff54436eb25d3028d31d77497f8d73a9d907a7b6787a89922899cb9657ab71441775cc0bff161b31e8298 WHIRLPOOL c8795d9334fbb6ec5da60b8b8f3bd0e9d64fb506c8b321f2165b0edf38aed5db88ca25f866e2a92b8ce9cfc8a8e56fef79f91181111a1c25e5d039cc307498e9
+EBUILD aodhclient-0.7.0.ebuild 1127 SHA256 7971a3b3816dec82dfcf84fecd0865ab02f86e7c067fbe528100a530abf80921 SHA512 863deffd3faede99f4ce5ec523b105b9af80da580f2ff54436eb25d3028d31d77497f8d73a9d907a7b6787a89922899cb9657ab71441775cc0bff161b31e8298 WHIRLPOOL c8795d9334fbb6ec5da60b8b8f3bd0e9d64fb506c8b321f2165b0edf38aed5db88ca25f866e2a92b8ce9cfc8a8e56fef79f91181111a1c25e5d039cc307498e9
+EBUILD aodhclient-0.8.0.ebuild 1042 SHA256 820b0ca4f7102db0843e257557102e377382f5ec12b24cb5cdd6dc2aa7949085 SHA512 7da4ef3079c4197edbbdca0a21271c537f58f2158f674dca57079bb18d864b3c58036d55225fb66f4549deb0e200124899ae5c39d2e8c538a4d7cfea374f1d0f WHIRLPOOL 4b4c1c3ba192d3d9b012300f84cf897dc8cbceccf3fa3733aaaa5e5c9d7790aa91cd1a2e52c12902b28ee654bfaaf8e12104074a96a2e9b220afcc00ad7dd41e
+MISC ChangeLog 634 SHA256 dad51d917c58e8eed2bf23e786172220aa9e3251aca5be65a20d7b985f595924 SHA512 0d667eb8ddb73b601b6708186fde2a781936fa647739e637e352767fa90b59cc60af2dad22fcfa36d28cea00bffaf416207168efe56cc0ded490cf50e1c05572 WHIRLPOOL 970f3d10d9f9d1a2c0ff6eafba1273cf5ba2ca872192d406fa1842a77df65d0e6fe2afe691376b8a8ac27e9dbb4fa4af526ca77cff17d9312f4f0be985ac924d
+MISC metadata.xml 607 SHA256 29d58469509da65321f19b458f1c2960afb28fff65c0b1d16bdc1956f2ba77b2 SHA512 92704b4f1f7bfe8fba4eee0680cbf8e8b9c6aacc33fc97500ae4cef6d7b87540abfa9bf13486ad026ceaabd29e4911d38958712610880b6315233df3271e6813 WHIRLPOOL fdd1d2f68bc8c244ca700f4d3ac56ee6e78086cc9f6d9e844c388ae64293db7dd1a359a60edeb056293b4814ef3dfb3138408daa928070b3aeec5d5d0d56dc76
diff --git a/dev-python/aodhclient/aodhclient-0.6.0.ebuild b/dev-python/aodhclient/aodhclient-0.6.0.ebuild
new file mode 100644
index 000000000000..35ad1a5b87b1
--- /dev/null
+++ b/dev-python/aodhclient/aodhclient-0.6.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Aodh API"
+HOMEPAGE="https://github.com/openstack/python-aodhclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.3.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/aodhclient/aodhclient-0.7.0.ebuild b/dev-python/aodhclient/aodhclient-0.7.0.ebuild
new file mode 100644
index 000000000000..35ad1a5b87b1
--- /dev/null
+++ b/dev-python/aodhclient/aodhclient-0.7.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Aodh API"
+HOMEPAGE="https://github.com/openstack/python-aodhclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.3.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/aodhclient/aodhclient-0.8.0.ebuild b/dev-python/aodhclient/aodhclient-0.8.0.ebuild
new file mode 100644
index 000000000000..b25c298fd486
--- /dev/null
+++ b/dev-python/aodhclient/aodhclient-0.8.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Aodh API"
+HOMEPAGE="https://github.com/openstack/python-aodhclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.3.0[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/aodhclient/metadata.xml b/dev-python/aodhclient/metadata.xml
new file mode 100644
index 000000000000..b28e1b0716b5
--- /dev/null
+++ b/dev-python/aodhclient/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+    This is a client for the OpenStack Aodh API.
+  </longdescription>
+	<upstream>
+		<remote-id type="pypi">python-aodhclient</remote-id>
+		<remote-id type="github">openstack/python-aodhclient</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest
new file mode 100644
index 000000000000..2c9a4ad8a04f
--- /dev/null
+++ b/dev-python/apipkg/Manifest
@@ -0,0 +1,5 @@
+DIST apipkg-1.4.tar.gz 11224 SHA256 2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6 SHA512 118f806706944513f50d3cdef596b32f8ce585cfaf94d2531a6d260f90a0e2147177161aaa6f5d6823150e6182d0f73be3dc01259b8a2f8d710733a22ea54789 WHIRLPOOL b0162094ee5209fb06727b5ad6d346e5738af9999f4fa21081cfedd4607d6025dd1d20621fe6c2e7801e5b405757987a6c0d63f698d74497401053847a9109bd
+EBUILD apipkg-1.4.ebuild 802 SHA256 95c746974db47183d848d9f2cdfc6fddb5801fe436b0bab6be10cfa0cb6dbab6 SHA512 7a9eefe364830df78a968a425bb2640cdec2f703e25ab06ff2b84200e7ccfb252d545ae4489f97feb02e6d2ed74c0abf01c46df083ac42adaf875b8ddce2db0c WHIRLPOOL 6d970bfe3f0638c4bbcc87a82997ca99b774d239d762bcbb6e21ad6809e1f119199d8f9117b1ba776a3d023b60fc82bf4f9526417b29e675d9660eef4384cf1a
+MISC ChangeLog 3061 SHA256 6baed433ea12e5a81cc4465eb6ab169d5a9507539c7c3a79eca3c6b062bcd9b9 SHA512 2608e471d9f328aa37bc2cedade254c922f5bc0eb17ed252699d8e2ca73819c4d905bf7b72812ea3fc9a5a228a8d8ebadc75f4f1d5ebcb92b7d9c96587560cd5 WHIRLPOOL bd5beca4e6492ebfbf4a5b81a9063d31ae8515278c7a1e5f2bed2003e87c9f25ee55826c56729821b5493aa0b85254b8d9ad683773a74aceb51af394fa7bc35c
+MISC ChangeLog-2015 2205 SHA256 81381b50df52a558880cdd01a8c476edd8e0d613983bf7ae5ed41c67fb0bc76c SHA512 ef809eb2b0f860f7fe671ab3da0568c4708a2b754b2116a51c84992d33c8fce2845c1edfdd7c98acf3b47648812a1e4af6981b58971b098c6b898aae3fbee9e7 WHIRLPOOL b70f1295ff952c183189c9d1accf54c06bde6b8878fe7c2e134f6661f041b135380eac0be2f3c1040300f52c2f0828219b77b0374194b64db6c12abffb39b7b4
+MISC metadata.xml 309 SHA256 08c0f71223ff1a4f2521e062ad9574fb55ee2bc1d996148850486cc56d2491af SHA512 0f74900faac286382377f2233aaafc9a6e8d7b49c017f60c7c451728d67cb9b9505f57903901a56f67327364951e2e7ab7dae7c852ad70b16070ce48ff3f93cb WHIRLPOOL 2651b86d235ad7fe539bbbb9682871f6ba5adfc04c4f0be856ff3165d778215fa91aedaff4b55a264ea89f4d0ddce7fbb2084eca50a8f1179bda3911935eedbd
diff --git a/dev-python/apipkg/apipkg-1.4.ebuild b/dev-python/apipkg/apipkg-1.4.ebuild
new file mode 100644
index 000000000000..7dfec3243247
--- /dev/null
+++ b/dev-python/apipkg/apipkg-1.4.ebuild
@@ -0,0 +1,29 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="namespace control and lazy-import mechanism"
+HOMEPAGE="https://pypi.python.org/pypi/apipkg"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="examples test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/hgdistver[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test test_apipkg.py || die "Tests fail under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( example/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/apipkg/metadata.xml b/dev-python/apipkg/metadata.xml
new file mode 100644
index 000000000000..02f47007f298
--- /dev/null
+++ b/dev-python/apipkg/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">apipkg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/aplpy/Manifest b/dev-python/aplpy/Manifest
new file mode 100644
index 000000000000..0ca5e0e1340d
--- /dev/null
+++ b/dev-python/aplpy/Manifest
@@ -0,0 +1,9 @@
+AUX aplpy-1.0-fix-dependencies.patch 456 SHA256 4bf7e8b4d7e6a0ec43d0b898c7803bfc53914ca32c5c5cf2b55afe35b1b4c0c4 SHA512 b0b0ac53fe6702947d21fbe1cbe60c6dfe5047fd74e54cb5ff02e2adfc8f6c53a3da14681cc6aa5f441a90aa3478555b558be6a1be96111d380c0b8da55c5185 WHIRLPOOL c4ca48f64508fce3f71ac069a7eb3d64431d8ea6d58f9f31e19b6a3c7b94acb38e5798323748844ddb0c96ffc3b01a300eca82db76b0635ef28e751b3896946e
+AUX aplpy-1.0-mark-known-failures.patch 3738 SHA256 3622f6a89f8c618d2206f4de3834d5f75bdbbecbce82f00d27af608be70b0adf SHA512 e076921616ecb528844b79f330b1901958ed12e4985063ee2829ff361b93cc457b23caa9107c79c58028a53e97b085033b8666681d2ece7ef24b9bdd9d955ce8 WHIRLPOOL 64c45ad395ca1db68cab86b501855aa696ac0f8065122c990bfc8ea6f8336e7c93168a9dd4b6dcb346b9e17f3c8b752bc54a113f3929bb5c20090bc594fbf96f
+DIST APLpy-1.0.tar.gz 1169280 SHA256 09a8a24b46b93a1eacdbc0e6fd480fa38e4dd890a24963136d76185924602ff0 SHA512 658b626c2a94c73cc8ba45fde86409659555ed3ec065d07313f08b67c0bcdc596c8dc94562c924de2f3f32d6884051e6756e22384d9594c4538578b482fa7590 WHIRLPOOL 0c884cecbbc9a7cd4ca4ba48cee4e03f039fa2edf4aa5aa4ac945b58c889084acb762f9cff2014911b383b0b14ebd2e51d2ce28b01b87eb0053ba06c3cc6c5c3
+DIST APLpy-1.1.1.tar.gz 938943 SHA256 1c3bc9972da5f738435449e5e8483824129f2a18e7426f0a8c2c06a1ef3b4b4b SHA512 accc355fb56145db33a931b77b9d5b56e5e0f5a486a3a8d776b0645991883df4b78fae58cfe87c1575dad7f02baa5c68c95427c1de18c2435abd13c4a85eee93 WHIRLPOOL 38539eb997fb804717553988eddbebbe15b5fc74d61f8a87153ed27560b0e4bc0671053f0c0fa829ded6c81ea651c798f09bcadc223c8d7c5c09aa7de943717d
+EBUILD aplpy-1.0.ebuild 1212 SHA256 8f21ed1b10b343fad84fa4fd6d6ad2ae34dbddbc1091eda145cf5c4274ebc76e SHA512 e91e5a43b697fff15c14e7b3e29f5b3cf59bc054199a52cb8cc04082eb1022b0a94f5ebe652e55daf772d7c1dcb524ab8df7f310b39ef16d5bff661da2f28931 WHIRLPOOL 20c48bf173228deaa751694203aab03a5fa2c571b36de53f4bf55897d6f5463be94368e204a4dc9a74f44c7c5870a682e1919d3cc5264ad8c19888f7f89338fc
+EBUILD aplpy-1.1.1.ebuild 1456 SHA256 8d44960e2e42013dd6b6e9551f53ecfa6ec9e6b9543a48bebdad78bcb880d184 SHA512 3aab3a4a1f4f5f63bfc022640c446d07634de82b0d49cd7f9cd49a2a119513e561168d729113e05e06bee681e20d5d124d44a4f18b97668dec4fb265684cd9fc WHIRLPOOL 78453dce48c0f7b9b580837d07ace6c737ea25bc61958a4b439827130c122bad0ec4b3dd6191af2fb7d7170b32a42c018d8656537444f655f321002ae5bc83f0
+MISC ChangeLog 3690 SHA256 e0206df99b528ab5abf590fbd7a303bf4d2573daa63472af65d663a7d5239b2e SHA512 06f39438b3191b2da00b3ba95d36b0e874e18b4a9e5c01635162e79f73085a3f4df806055819d7a8336235356799ec2d8814d29bd39517c4e66897df4af206a3 WHIRLPOOL 45c4d806da7070dce3e60107b4a0387fd8818d20e3b343c635c0431b269dbd60dce9cc179c16b3542c410c54da630f21da8a2594dee474f3c4fa7dcb723343c6
+MISC ChangeLog-2015 3066 SHA256 52dbd7494eaaeef31cd279333a4ed05870e51e4a09c902f27a001afccde07346 SHA512 050b08915d2b9b8e9aec5cf381eadc83fbbf155a27d6839c07829df8f71086be355c18d5c9113563473a7dfcd98f2e53c2e46c352812dea6dff864a9c58ed69a WHIRLPOOL ab7275596acc4181ed73a061a75c34c8397f0b86f8866488e3b8e83fe381611f8fab504586c26520b1d0ed9fe97da955466a24b630786294fa098fc19f2a4a1e
+MISC metadata.xml 698 SHA256 872cac563bd9ac2aa5a444193308b092cb4d508be1af75579cae5cd2dfb0f625 SHA512 33e925cde2dd0ff56a158426d35d5f498fddcb352042c4acd868b577ca00893fa2bf2f9ff33b8931578af4841ba08abfea159003bc33be4c579bf51ac8cad1df WHIRLPOOL 8403170a6265b8a26b9239b146a0798a0d0ed4e4e35b4ebe52064aadae793290677ad01f1b45a27711537a3dd55517520b35d5d09a16d984482c48d59fcf74af
diff --git a/dev-python/aplpy/aplpy-1.0.ebuild b/dev-python/aplpy/aplpy-1.0.ebuild
new file mode 100644
index 000000000000..8f9f5bd54fe3
--- /dev/null
+++ b/dev-python/aplpy/aplpy-1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+MYPN=APLpy
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="Astronomical Plotting Library in Python"
+HOMEPAGE="https://aplpy.github.com/"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pyavm[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0-mark-known-failures.patch"
+	"${FILESDIR}/${PN}-1.0-fix-dependencies.patch"
+)
+
+python_prepare_all() {
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	xdg_environment_reset
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile --use-system-libraries
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}" || die
+	virtx "${EPYTHON}" -c "import aplpy, sys;r = aplpy.test();sys.exit(r)"
+}
diff --git a/dev-python/aplpy/aplpy-1.1.1.ebuild b/dev-python/aplpy/aplpy-1.1.1.ebuild
new file mode 100644
index 000000000000..295c6eeef5e9
--- /dev/null
+++ b/dev-python/aplpy/aplpy-1.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+MYPN=APLpy
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="Astronomical Plotting Library in Python"
+HOMEPAGE="https://aplpy.github.com/"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest-mpl[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0-fix-dependencies.patch"
+)
+
+python_prepare_all() {
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	xdg_environment_reset
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile --use-system-libraries
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}" || die
+	echo "backend: Agg" > matplotlibrc
+	virtx "${EPYTHON}" -c "import aplpy, sys;r = aplpy.test();sys.exit(r)"
+}
+
+pkg_postinst() {
+	optfeature "Interact with Montage"				dev-python/montage-wrapper
+	optfeature "Read DS9 regions files"				dev-python/pyregion
+	optfeature "Extend image i/o formats"			dev-python/pillow
+	optfeature "Astronomy Visualization Metadata tagging" dev-python/pyavm
+}
diff --git a/dev-python/aplpy/files/aplpy-1.0-fix-dependencies.patch b/dev-python/aplpy/files/aplpy-1.0-fix-dependencies.patch
new file mode 100644
index 000000000000..b5708c8971bc
--- /dev/null
+++ b/dev-python/aplpy/files/aplpy-1.0-fix-dependencies.patch
@@ -0,0 +1,14 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Change requires to install_requires
+--- a/setup.py
++++ b/setup.py
+@@ -94,8 +94,7 @@
+       version=VERSION,
+       description=DESCRIPTION,
+       scripts=scripts,
+-      requires=['astropy', 'numpy', 'matplotlib'],
+-      install_requires=['astropy'],
++      install_requires=['astropy', 'numpy', 'matplotlib'],
+       provides=[PACKAGENAME],
+       author=AUTHOR,
+       author_email=AUTHOR_EMAIL,
diff --git a/dev-python/aplpy/files/aplpy-1.0-mark-known-failures.patch b/dev-python/aplpy/files/aplpy-1.0-mark-known-failures.patch
new file mode 100644
index 000000000000..cf1aa92190d4
--- /dev/null
+++ b/dev-python/aplpy/files/aplpy-1.0-mark-known-failures.patch
@@ -0,0 +1,121 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Mark tests that are known to fail with matplotlib-1.5
+--- a/aplpy/tests/test_images.py
++++ b/aplpy/tests/test_images.py
+@@ -61,6 +61,8 @@
+ 
+ class TestBasic(BaseImageTests):
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     # Test for showing grayscale
+     def test_basic_image(self, generate):
+         f = FITSFigure(self.filename_2)
+@@ -68,6 +70,8 @@
+         self.generate_or_test(generate, f, 'basic_image.png')
+         f.close()
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     def test_ticks_labels_options(self, generate):
+         f = FITSFigure(self.filename_2)
+         f.ticks.set_color('black')
+@@ -84,6 +88,8 @@
+         self.generate_or_test(generate, f, 'tick_labels_options.png')
+         f.close()
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     # Test for showing colorscale
+     def test_show_colorbar_scalebar_beam(self, generate):
+         f = FITSFigure(self.filename_1)
+@@ -96,6 +102,8 @@
+         self.generate_or_test(generate, f, 'colorbar_scalebar_beam.png')
+         f.close()
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     # Test for overlaying shapes
+     def test_overlay_shapes(self, generate):
+         f = FITSFigure(self.filename_1)
+@@ -112,6 +120,8 @@
+         self.generate_or_test(generate, f, 'overlay_shapes.png')
+         f.close()
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     # Test for grid
+     def test_grid(self, generate):
+         f = FITSFigure(self.filename_1)
+@@ -125,6 +135,8 @@
+         self.generate_or_test(generate, f, 'grid.png')
+         f.close()
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     # Test recenter
+     def test_recenter(self, generate):
+         f = FITSFigure(self.filename_2)
+@@ -135,6 +147,8 @@
+         self.generate_or_test(generate, f, 'recenter.png')
+         f.close()
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     # Test overlaying contours
+     def test_contours(self, generate):
+         data = np.arange(256).reshape((16, 16))
+@@ -144,6 +158,8 @@
+         self.generate_or_test(generate, f, 'contours.png')
+         f.close()
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     # Test cube slice
+     def test_cube_slice(self, generate):
+         f = FITSFigure(self.filename_3, dimensions=[2, 0], slices=[10])
+--- a/aplpy/tests/test_rgb.py
++++ b/aplpy/tests/test_rgb.py
+@@ -6,6 +6,7 @@
+ 
+ import numpy as np
+ from astropy.io import fits
++from astropy.tests.helper import pytest
+ 
+ from .. import FITSFigure
+ from ..rgb import make_rgb_image
+@@ -17,6 +18,8 @@
+ 
+ class TestRGB(BaseImageTests):
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     def test_rgb(self, generate, tmpdir):
+ 
+         # Regression test to check that RGB recenter works properly
+--- a/aplpy/tests/test_vectors.py
++++ b/aplpy/tests/test_vectors.py
+@@ -1,4 +1,5 @@
+ import numpy as np
++from astropy.tests.helper import pytest
+ 
+ from ..core import FITSFigure
+ 
+@@ -15,6 +16,8 @@
+ 
+ class TestVectors(BaseImageTests):
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     def test_default(self, generate):
+         f = FITSFigure(IMAGE, figsize=(4,4))
+         f.show_grayscale()
+@@ -22,6 +25,8 @@
+         self.generate_or_test(generate, f, 'vectors_default.png', tolerance=2.5)
+         f.close()
+ 
++# see https://github.com/aplpy/aplpy/issues/278
++    @pytest.mark.xfail()
+     def test_step_scale(self, generate):
+         f = FITSFigure(IMAGE, figsize=(4,4))
+         f.show_grayscale()
diff --git a/dev-python/aplpy/metadata.xml b/dev-python/aplpy/metadata.xml
new file mode 100644
index 000000000000..8fa6a8c707bb
--- /dev/null
+++ b/dev-python/aplpy/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  APLpy (the Astronomical Plotting Library in Python) is a Python
+  module aimed at producing publication-quality plots of astronomical
+  imaging data in FITS format. The module uses Matplotlib. It is
+  capable of creating output files in several graphical formats,
+  including EPS, PDF, PS, PNG, and SVG.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">APLpy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/appdirs/Manifest b/dev-python/appdirs/Manifest
new file mode 100644
index 000000000000..acd6b96bce1b
--- /dev/null
+++ b/dev-python/appdirs/Manifest
@@ -0,0 +1,8 @@
+AUX appdirs-1.4.3-distutils.patch 495 SHA256 c9807574a368f1fad9a6ce1eccc9870d56eda5506d86e077ace02232b32d2532 SHA512 605a59544c6b9ca1ef5ddac524c3b699b667c9001b1e720af5b94740c1c5467dace55432b8d3524710a98a5861f638623fb8b6dfa4db8915ae06b21c8466eaee WHIRLPOOL 0325825ca5ed0313b5e86481e57cab7117a0cf87766e56535958c5d47bcc8b035dd0b6951e0845f0f863203ccd8a0d5e083af395229a8364e37a8683e1937dbc
+DIST appdirs-1.4.0.tar.gz 14358 SHA256 8fc245efb4387a4e3e0ac8ebcc704582df7d72ff6a42a53f5600bbb18fdaadc5 SHA512 a16fbad419e593acf1b58a3f8f893d206b3fc1a269757213a34d129e6fc39aa041efacb7964d326b82376373315357c93e85b272f374a096d9a63e73e3ce1dac WHIRLPOOL 0e12bf1875e489fbfb2ed48b125917bb6e176b90051a0afe2b64f431bbd1f5be499b7c0631302513387c440a05b2eb067fefaf54141424c260834cba854b7e6f
+DIST appdirs-1.4.3.tar.gz 9641 SHA256 5ce44e43c3fd537ce1aaf72141c525aa67032a5af0a14dcf755621e69d72414b SHA512 787f551ef5af355bbc77ffb3059553fab77614cce466b4145e4b55fecb8553d329f8748865fd69005d13451a9b11229a65721095a122db83a8433a2661503dfc WHIRLPOOL 4e88de235789556a220134c9b6cc1741d6fb65070c62e278c94585e3adc464562e3dc259340a8147b33de417e9533b7bc40cc66eb558d04ec3b197f5a092980e
+EBUILD appdirs-1.4.0.ebuild 746 SHA256 188034bcc17fa21ae3ae94a4b22a6c1973011f63598a9c0427cf863153ac7489 SHA512 2c665d99c5767e12395d4e8f2efd65c5976c1e865d75d475e830cffb467d9be0d84b31004277d0967af57f1ade0bcd828c89087d6e48814ecbdffc9e81357408 WHIRLPOOL 800da74a173f8b549cdfa71e47d2dd860353973ff1e929f1b836290b7f33afdde39a296533369f1931b8539d01570021bdcc11d3d5bb42813a2e03d5662d084c
+EBUILD appdirs-1.4.3.ebuild 783 SHA256 fd84fa6c50c738ca92d80420c91a1bd0e0bb711351c25a842c5582d8a7e1d22b SHA512 b4411e01521d035cc81fb4c7e8972b9d7ea5ce76e0d84cd89a9a957fdecc97f2f4a21e698ac36d1c868d404aa47a58467c74a8349cf8a82fa417d27ca3914b17 WHIRLPOOL 091e1ab1f6192531c34d43e776db1950671adc8b76015d5e47f0f36ca38d869e230c5cb086b1b73839dab1ec152c2a74cb0f7186cca7c06c30f8a8121d548a91
+MISC ChangeLog 4776 SHA256 512954640d96815c58b8341f1bb9c31781006c092734f087b98928b243a2513c SHA512 7fece91943608f31114720212fc871ef058eeb9052a7bda04f1b06cf81d893b4be475b40e5cb653cbfff9d081694cce5a8285c44909c44b3d7aab79119f95b1f WHIRLPOOL 94989083cd08c178fb4bc44c28c458ed41b9a1262fe600ed7ee7fcc13d0593b3fd2d82abf070eaf757705f87e68b8ff791a1e4d3023a8cda7d5574f2539b6bf3
+MISC ChangeLog-2015 2482 SHA256 f8d935c1933b277db608569e66ba68699848be195ca64be1706a6715acf2cd3f SHA512 16e38dcda182cf93cb961133af2f36c2d533aa92a0ccb36572fedf4277087c9a6bbb715b703b5194aedae6203d97de7fb46e8ea212ba610b954d71e36bd16b02 WHIRLPOOL c0c8ac19eb5d058ffb7e8337c2f1dc6d6004955f4928f50ec02cab878a36ad308d8e7288275c8475e9b5a517838e4f89f135f6db7b1b2615936a104062e80c4b
+MISC metadata.xml 742 SHA256 a0282df36eb24a932324bc237085f02e1a1557726dac40c954cc8af8bfe04b8a SHA512 c1e35e090d6e3af99b8879a8a553c89989b149617857696fccecb4ea0435979f547049db2cdb7c505b50c20dc9f081233990f6fc0ee05de8ee27c7629292244e WHIRLPOOL a586b85f519a57cac9e462ffb77b3f826d56be0454979fc32aa1cceedcb849f55100f22681d4d3365afe71b888819c2d847152d92418c2bc13734fda097f6ac2
diff --git a/dev-python/appdirs/appdirs-1.4.0.ebuild b/dev-python/appdirs/appdirs-1.4.0.ebuild
new file mode 100644
index 000000000000..5bee3f5d4868
--- /dev/null
+++ b/dev-python/appdirs/appdirs-1.4.0.ebuild
@@ -0,0 +1,30 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for determining appropriate platform-specific dirs"
+HOMEPAGE="https://github.com/ActiveState/appdirs"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# api.doctests is missing in the dist zipfile
+# and the 'internal' doctest does nothing
+RESTRICT=test
+
+python_test() {
+	cd test || die
+	"${PYTHON}" test.py \
+		|| die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/appdirs/appdirs-1.4.3.ebuild b/dev-python/appdirs/appdirs-1.4.3.ebuild
new file mode 100644
index 000000000000..b809f43510ff
--- /dev/null
+++ b/dev-python/appdirs/appdirs-1.4.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for determining appropriate platform-specific dirs"
+HOMEPAGE="https://github.com/ActiveState/appdirs"
+SRC_URI="https://github.com/ActiveState/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/${PN}-1.4.3-distutils.patch )
+
+python_test() {
+	"${PYTHON}" test/test_api.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/appdirs/files/appdirs-1.4.3-distutils.patch b/dev-python/appdirs/files/appdirs-1.4.3-distutils.patch
new file mode 100644
index 000000000000..11ce163d14ca
--- /dev/null
+++ b/dev-python/appdirs/files/appdirs-1.4.3-distutils.patch
@@ -0,0 +1,13 @@
+Force setup.py to use distutils in order to break setuptools cyclic dependency.
+
+--- appdirs-1.4.0/setup.py
++++ appdirs-1.4.0/setup.py
+@@ -38,8 +38,6 @@
+         Programming Language :: Python :: 3.2
+         Topic :: Software Development :: Libraries :: Python Modules
+         """.split('\n') if c.strip()],
+-    test_suite='test.test_api',
+-    tests_require=tests_require,
+     keywords='application directory log cache user',
+     author='Trent Mick',
+     author_email='trentm@gmail.com',
diff --git a/dev-python/appdirs/metadata.xml b/dev-python/appdirs/metadata.xml
new file mode 100644
index 000000000000..b0d682902c1b
--- /dev/null
+++ b/dev-python/appdirs/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		A small Python module for determining appropriate platform-specific
+		dirs, e.g. a "user data dir".
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">appdirs</remote-id>
+		<remote-id type="github">ActiveState/appdirs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/apptools/Manifest b/dev-python/apptools/Manifest
new file mode 100644
index 000000000000..6de2c966f5bd
--- /dev/null
+++ b/dev-python/apptools/Manifest
@@ -0,0 +1,7 @@
+DIST apptools-4.2.1.tar.gz 274521 SHA256 66f4d61e4be80fd0b153f4a8c1d680c45d5b2e0734899695cb6e918f3f594369 SHA512 03f89b431db496082ac404456f97792f68b580ee77451e6f003b5a2830cd2f698124487045b6cd5fc15b700fbf7467553a384d6e638a322627f8dad7c0b45fc6 WHIRLPOOL 0b0d99b11e251be730b9e5772cce8cfdd0c654fb02ab031fe122f82f8e4555223142e65186c9f3c0068d9b4266f71d6c3209072c3b6939b67daa5ddbc14c3ede
+DIST apptools-4.3.0.tar.gz 291137 SHA256 f36bfc61c37d1e6da87b4fec51592d276d0aaecc8254a68a24e580161fa1d6da SHA512 ba3ad2c157bd1837522d8edbb834cded0dd6d9c2440ff54af0abfa0716f0485b3519edf79a74c64133d963b1afc769e743688a3bf60fd1d2fa384e8e3bc399cd WHIRLPOOL 58bff19978c314bc70acdc7932ecefe0a5d2f20b550418dbb35167400704e25c30af48d26a6e7fc8b84fd5d75185ee88073acf14b8a779605913a4afc2a9a422
+EBUILD apptools-4.2.1.ebuild 1314 SHA256 dfea3cd9db8cedb6024b26a8c2b5a983612150e66737283d904f04170c96075d SHA512 5968fa10ea3b75c4542b65e90afc813f3a2b6051f58ce974135819dc312f5ebd3561d72b23a70eb43d6df959a0cd5cd785a9ad55b67f032d7a4ecabd8ed2f60a WHIRLPOOL 07e7c5adba26ffbedb3eb5ce0a8127b91b76e74702512eee5bab9ec2dbcbed98f7543d7b5a88ea4994b1dbb3861a60bf8bbd5500e5f1779ae5296594380e0e18
+EBUILD apptools-4.3.0.ebuild 1355 SHA256 ffbdd824a676330e5be7c790d03389b811da3a6b245134494b4f902a009bce79 SHA512 7d6e6f1bff4ea2573ed48f7ee6d1ba1dc053f0c015f30e99455171623346b3b26e82eb01d803d0a38558ade37866a0c2fa053c45b884a628a231cd37cfc62e78 WHIRLPOOL 9dc382cc5f2a55895e0acb246898a88b124d5283dd7ea165f6563483301cd0307366b43c603d52d878539e08c5eb21e4abc519b9cd7773c9eb59ef28e2265012
+MISC ChangeLog 3807 SHA256 aacd60902d94e72a38bb00fdda936b13958624c0193822783732b85c714f1bdb SHA512 d1b9b2471f4e7887bd97aad220b51209bafd34679491f02a5c42da4d2f204101c9707e8d97b62dc9be01cffb2ac68a49e1d6e7f8908948d29768c6107f6a3934 WHIRLPOOL 2af8aad319f710801e80c85db29a0056f1c6ae98707956d4cd8b3bbc3625446ad90d3f258eafdec6d76369126b3bdc40ef9ce572eebab2db0acbc91cf0641873
+MISC ChangeLog-2015 4001 SHA256 29b343a1cfae6d112a38ac8a1341535ba9483129fb2caaa5d109affd41bca6d1 SHA512 d3e4d6fcd3bde579339317fa54012c9de0433aec63813c3932517b4710b5667cb3c08ba6de3ac171c2944173b73a92eca051dd7a3baf27da281765376ba4859f WHIRLPOOL c097a5236e184efa34f643f5b3ff167e61da318414f92ee0affd3328ef82df41eecd7f816efc310e4ed545d6c62af08fe1dc126ff221e2575aff7f2ba99d8dcb
+MISC metadata.xml 602 SHA256 74d7a5f4babd0b346125bb595a3db178ced5adf3897937f564a4e8a3e5633c66 SHA512 ec43d8ab0d29a36c105ee552cce9e1c7eda8051a74a7ca757d9b65f7822a34c481d7ea2ec181f40a972f195b9175c855f10a47e648550670cfde8cd37487619e WHIRLPOOL db02289a4c2bceae40368aa0700438f9a6909295eb0ff83d188502a007ff3c43aa6e5a4ce5d92ae32dc72c07b025ec57e5aa7620758bbc09fd55a7458beb7a17
diff --git a/dev-python/apptools/apptools-4.2.1.ebuild b/dev-python/apptools/apptools-4.2.1.ebuild
new file mode 100644
index 000000000000..1c057eb88322
--- /dev/null
+++ b/dev-python/apptools/apptools-4.2.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Enthought Tool Suite: Application tools"
+HOMEPAGE="http://code.enthought.com/projects/app_tools/ https://pypi.python.org/pypi/apptools"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/traits-4[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		>=dev-python/pyface-4[${PYTHON_USEDEP}]
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		sci-visualization/mayavi[${PYTHON_USEDEP}]
+		dev-python/traits[${PYTHON_USEDEP}]
+		dev-python/traitsui[${PYTHON_USEDEP}]
+	)"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Ignore test file that imports a long deprecated module of traits
+	VIRTUALX_COMMAND="nosetests -I test_state_pickler.py" virtualmake
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/apptools/apptools-4.3.0.ebuild b/dev-python/apptools/apptools-4.3.0.ebuild
new file mode 100644
index 000000000000..211fc991992c
--- /dev/null
+++ b/dev-python/apptools/apptools-4.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Enthought Tool Suite: Application tools"
+HOMEPAGE="http://code.enthought.com/projects/app_tools/ https://pypi.python.org/pypi/apptools"
+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"
+
+RDEPEND="
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/traitsui[${PYTHON_USEDEP}]
+	>=dev-python/traits-4[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		>=dev-python/pyface-4[${PYTHON_USEDEP}]
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		sci-visualization/mayavi[${PYTHON_USEDEP}]
+		dev-python/traits[${PYTHON_USEDEP}]
+		dev-python/traitsui[${PYTHON_USEDEP}]
+	)"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Ignore test file that imports a long deprecated module of traits
+	VIRTUALX_COMMAND="nosetests -I test_state_pickler.py" virtualmake
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/apptools/metadata.xml b/dev-python/apptools/metadata.xml
new file mode 100644
index 000000000000..561eda2611bd
--- /dev/null
+++ b/dev-python/apptools/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    The Enthought Tool Suite AppTools project includes a set of
+    packages that Enthought has found useful in creating a number of
+    applications. They implement functionality that is commonly needed
+    by many applications.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">apptools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/apse/Manifest b/dev-python/apse/Manifest
new file mode 100644
index 000000000000..8b75c08c3a0e
--- /dev/null
+++ b/dev-python/apse/Manifest
@@ -0,0 +1,5 @@
+DIST Apse-0.2.tar.gz 18005 SHA256 cacdb5fa76bc63998bae65c858797423d8b5c047290a762ab9e299097faa983f SHA512 accad6d4fa4056e5dd0ac1036b47b6e258ceea9b458ca91065b0a8411d5e3a3461cd8e87bebbf884982d02bc0f6cc996a3df800fe74a0567a336ee79e05a9837 WHIRLPOOL 912327a3d5ca2f8a20c41604a67323f7c97c71aa1a4120498420bb335eb081e33c39b5bab1de80d0a693b54cefbd91eeefca644fba100182d45e27454bd70b8e
+EBUILD apse-0.2-r3.ebuild 881 SHA256 d04507b2adf19da9e8eee089509d5965a0e6b222583d0fb92ae17f394e8dc2b9 SHA512 3f4c4795f6ebe0e102e7e6cb3bb276f502e63989fb14bcea077ec20dc9ccf8908671eccfcb6931e50bc72792b7f9496f2de73e6b5a5e0303fdfe4284d3721f22 WHIRLPOOL 76c503146a403373093ea052786a45ad41cfec1f888a207f9eddf0635070b41904fac44fdf9a0d5a92c26519067b18c3550bda364d558b216f17d472d1f6fa4b
+MISC ChangeLog 2815 SHA256 8d9be2ce9b18f44fe5c05f6027f494218d5dee5a4ead1c46e184bf972caf09ea SHA512 7d5a692de507e36d119ca5e5afc65ebb60da3687b8e0fa37477ef516fea0aef7d393ba95c2356894f918ae1dfbe123eb868c897e6000112955bfa975f93677c0 WHIRLPOOL 01ab50966c613c66c853547f47cc9e0242fb9f559668cac5530b8b837cfe41d17f8c80f61e773d246c1f209e9712ae2c39d50738c503dbe148bd405d6e5beb56
+MISC ChangeLog-2015 2988 SHA256 8c61c0b0112c1d98c00f04e98f8d8078c2e00f76678352ce0f6bd994e3a912d4 SHA512 c73c27d6da666232bd54c7e8c7fe1fc9e007a4b26a7d936442080738e3eb844243e77b9d52d192f0f9563dc707dcb62d1263bfd65f951505f6d98afba8e7818e WHIRLPOOL 8f142bb4fd085a4ae989927a9f055a8c1ed5e1ba5fc7e5c977716fe20c56e478af80c6eb4b1cbae23b3dd400d4799db4851c4f360570a724ad0b01710bbf4249
+MISC metadata.xml 1115 SHA256 3325bab79b17961b1e5aebca74f0f528cd5fb3b626b6679e9965237e6a1dfcf0 SHA512 18be72bd7a6340856103bd1a49c53966e8b25eedd551fb118929786ad5a09a558b64f598df05aede3c19a77bcc5a21f30ac990e19e70c63ecf30ec78bfb60f2b WHIRLPOOL 62f6cd21ad7be8722a482d7e947421e5e7d5892c05d615bcefe10b72f7f5cb7529a98c18843e3ccfb8747f8a13734bc3eeb0ea1efc00b2caac6ad8a09997d436
diff --git a/dev-python/apse/apse-0.2-r3.ebuild b/dev-python/apse/apse-0.2-r3.ebuild
new file mode 100644
index 000000000000..a2843e778096
--- /dev/null
+++ b/dev-python/apse/apse-0.2-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_P="Apse-${PV}"
+
+DESCRIPTION="Approximate String Matching in Python"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://www.personal.psu.edu/staff/i/u/iua1/python/${PN}/dist/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ia64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-lang/swig:1"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Prevent the build system from calling swig over and over again.
+	sed -i -e 's:Apse.i:Apse_wrap.c:' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	set -- swig1.3 -python -o Apse_wrap.c Apse.i
+	echo "${@}" >&2
+	"${@}" || die
+}
+
+python_test() {
+	"${PYTHON}" test/test_Apse.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/apse/metadata.xml b/dev-python/apse/metadata.xml
new file mode 100644
index 000000000000..e3518cf8565b
--- /dev/null
+++ b/dev-python/apse/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Approximate String Matching in Python: identifies typing and spelling
+		errors, closely related vocabularies, genetic mutations (GAG ACT),
+		abbreviations. While it implements the same algorithm as the agrep
+		program, Apse lets the user choose how many edits (substitutions,
+		deletions, additions) will be acceptable as 'match'.
+	</longdescription>
+	<longdescription lang="ja">
+		Python言語�近似��文字列�一致を判断����。タイピング・エラー�スペリング・
+		エラー�ボキャブラリ的�近��語�一般的���語(GAG ACT)�略語を�一視����&gt;。agrepプログラム��一�アルゴリズムを用���Apse�ユーザー�"一致�る"�判断&gt;��場��処�(置��削除�追加)を何回行��を�����。
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
new file mode 100644
index 000000000000..667a9b84aee9
--- /dev/null
+++ b/dev-python/apsw/Manifest
@@ -0,0 +1,8 @@
+AUX apsw-3.6.20.1-fix_tests.patch 340 SHA256 bb8c5b2af794f3905b9ae614d00a7a357eb9ab8b92e33046e5aa6a03ebcf1ffa SHA512 386cae12d949a6f4dd55dc7e3e1bc176c43c5001f10acc75261c92fbe14bb09c0e054dfa4087d285496dec4cbd4a9add5733742dbfa82c6e10ee1c8d0f43fb0a WHIRLPOOL 13df8b0ea95a9512e0d0d37161292b28b6e3919eedbbec86a195fe3770d9627389acba0caf0da7c6b8e98a2fd28ce7837e8d39ca0163da9f9b3aa54fd3e87e2f
+DIST apsw-3.19.3_p1.zip 678966 SHA256 355b66379e9e44c1f32bc67421e4ad0a348a19bf279a4256a49d0eb83fff404e SHA512 9f9e05c865a19e7b6e6b37e6228027c027ba683be2d5ff7a1767bb3bbeb090bf66879a0eead4fc9e34fc4d84c1edc98137b2839f84ffab9bd36330d05435ab4e WHIRLPOOL 6703b13f42711f95a86a1c4a0e20bfc378823c24ee78c1ad7bb4e956bd9a927abe777a0c8c9b81c7d24130b76ba2019e048465e0cc59575a8e419f1b97847d7a
+DIST apsw-3.20.1_p1.zip 680035 SHA256 3ea97084f76049328a5d40eee8c6c86ae303e5be66d2900b521bbc6ebfefaf0a SHA512 12284a99efba13abe417a786939e2ab10d677014feb9393e41cc7b127fb974cb961f371c142904bbe48a96038d49605c885fa43739a14ef8e11fb37ea274ce92 WHIRLPOOL d679e4c016d2041c95c9e331e02864ac4eb9308748ca1122b6faf4acaaad087840702cffbe01d21c4e4345d505750911a6d0611d469c94af995416de4af2dbf8
+EBUILD apsw-3.19.3_p1.ebuild 1055 SHA256 f3c5ca4984145e0948802abdd21402febe9b2da3fc86e28ce001dc7a7ae7cd77 SHA512 f8a332998543699139d5ca8357f5cb9c7ea5ea7c07dddb142058a906bb28005f451136cb8c7774bf47ba4bd7c8e76091e35843206f53434632cf0ba275f615ef WHIRLPOOL c1fd817530a1de4b879602b7a25da42b905ef03e7edda51ab41400ccced9b3df0c83099b67bad7a7d88cd31231d375cb899822611fcbea20786c5698547714a2
+EBUILD apsw-3.20.1_p1.ebuild 1057 SHA256 5f605c5f64f987667c43957d25c0841fa79c41de2aafec742373b525b4314a7a SHA512 f818ef35546e3d46a2f42f0506cedb4d3aedcdca46a151a56cc8b68ee8958cbfdd82a874c78bb1a8d79db144d85509602009985c2367fcd1df64c2c6cdce2b53 WHIRLPOOL 37c350ffe5fb4e34518c5b5b1484eda0f870e73eca522f67875dcb938194f7795f734a995efe4323204ecf8836dfe43b4437b282a9cba54a0a1827f15d25d84c
+MISC ChangeLog 5313 SHA256 65f4be6509df48baff9a5b1790470cbd46e00f4f33334f00ab69c07040c2a1ec SHA512 d2532cac95e9ecd456148a346e096e4a9665d0e4d7740238f8010eda4c6da306f163eea8c5283549d68922e0e2fa67937d7ab64e788f6f9ceccd977c2035a7d2 WHIRLPOOL a657737d6b73232ec5a6988956b944c27c24f676e0f808ffc35446ad0ad769348594fcf7e31c88cc3e5f53c88e510a09b5ffd4a1402e84cffb6c83d862616ab5
+MISC ChangeLog-2015 11038 SHA256 12295b0f2f48036852f2425413c2ba912ad450efd2220255be9cd09ee373c648 SHA512 fb1ee0d203ec3fe0842412f2ddf8fa1c400fbaeef6872cbb097b5ed4b16ad25055f200e14b08ff06db1710b0ab183b0e8006dcff4d0f3016714247ab02d6fb79 WHIRLPOOL 241a136b92309e23e5f0c5670a59325eda7c5eb31dc32374af77b75f3e97eef34bbe8b35287bd1df566b211dfdd9f1b12427d0f2bf9d4aa66bcb3241f7bcd4a4
+MISC metadata.xml 677 SHA256 462ad1f1be64fa8477a19a24bfaa4ad9cc1a69de7d702cec5a6f577c3df17b60 SHA512 970eb7e730f147bbe24fbe377f6b9a1557f56d536ce462aef5ccba23059295c4c8d88bb384a7b7ec3f401a512e04134ebe19efa03473a90841d7c6246e2eb244 WHIRLPOOL 5c2ecf0e1eff13fef9e1bed6432a762db95351f2cf5250591fc4158470cb8b2568d0b22d6d4bf2e28287b8fb4165d906fa3ae856bf4c0be9089019c05ba34dba
diff --git a/dev-python/apsw/apsw-3.19.3_p1.ebuild b/dev-python/apsw/apsw-3.19.3_p1.ebuild
new file mode 100644
index 000000000000..21e24d9891e4
--- /dev/null
+++ b/dev-python/apsw/apsw-3.19.3_p1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV=${PV/_p/-r}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="APSW - Another Python SQLite Wrapper"
+HOMEPAGE="https://github.com/rogerbinns/apsw/"
+SRC_URI="https://github.com/rogerbinns/apsw/releases/download/${MY_PV}/${MY_P}.zip -> ${P}.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
+IUSE="doc"
+
+RDEPEND=">=dev-db/sqlite-${PV%_p*}"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}/${PN}-3.6.20.1-fix_tests.patch" )
+
+python_compile() {
+	python_is_python3 || append-cflags -fno-strict-aliasing
+	distutils-r1_python_compile --enable=load_extension
+}
+
+python_test() {
+	"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
+	"${PYTHON}" tests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/apsw/apsw-3.20.1_p1.ebuild b/dev-python/apsw/apsw-3.20.1_p1.ebuild
new file mode 100644
index 000000000000..f2bb6b9990b9
--- /dev/null
+++ b/dev-python/apsw/apsw-3.20.1_p1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV=${PV/_p/-r}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="APSW - Another Python SQLite Wrapper"
+HOMEPAGE="https://github.com/rogerbinns/apsw/"
+SRC_URI="https://github.com/rogerbinns/apsw/releases/download/${MY_PV}/${MY_P}.zip -> ${P}.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-db/sqlite-${PV%_p*}"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}/${PN}-3.6.20.1-fix_tests.patch" )
+
+python_compile() {
+	python_is_python3 || append-cflags -fno-strict-aliasing
+	distutils-r1_python_compile --enable=load_extension
+}
+
+python_test() {
+	"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
+	"${PYTHON}" tests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/apsw/files/apsw-3.6.20.1-fix_tests.patch b/dev-python/apsw/files/apsw-3.6.20.1-fix_tests.patch
new file mode 100644
index 000000000000..e252bf3f26a6
--- /dev/null
+++ b/dev-python/apsw/files/apsw-3.6.20.1-fix_tests.patch
@@ -0,0 +1,11 @@
+--- a/tests.py
++++ b/tests.py
+@@ -5480,7 +5480,7 @@
+         testnasty()
+ 
+         # What happens if db cannot be opened?
+-        s.process_args(args=["/"])
++        s.process_args(args=["src"])
+         reset()
+         cmd("select * from sqlite_master;\n.bail on\nselect 3;\n")
+         self.assertRaises(apsw.CantOpenError, s.cmdloop)
diff --git a/dev-python/apsw/metadata.xml b/dev-python/apsw/metadata.xml
new file mode 100644
index 000000000000..bd25419f6171
--- /dev/null
+++ b/dev-python/apsw/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+    APSW provides an SQLite 3 wrapper that provides the thinnest layer over SQLite 3 possible.
+    Everything you can do from the C API to SQLite 3, you can do from Python.
+    Although APSW looks vaguely similar to the DBAPI, it is not compliant with that API and instead
+    works the way SQLite 3 does.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">rogerbinns/apsw</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/aquarium/Manifest b/dev-python/aquarium/Manifest
new file mode 100644
index 000000000000..da07a73507e5
--- /dev/null
+++ b/dev-python/aquarium/Manifest
@@ -0,0 +1,5 @@
+DIST aquarium-2.3.tar.gz 200341 SHA256 89c8fab11dd6022cf1ac13fe4c4b4090f7da24af6fed296c67db03e2653fef07 SHA512 d4d31d390a9f121c869dfb893ceea57130f3d51bccd61506a5b9e8f749388bc4834e6399eb1576948ac7d105572982c9d02f633fee2c16a7891c5845fb15b35d WHIRLPOOL 5004dde4f619ae481486d4fcffbc3c837584d9caad68f4d1a43876adcfee5f42c70f91e8b9955188ba4f6a895267f08a6446a91ccd5ca07068270e018dfbe0c9
+EBUILD aquarium-2.3-r1.ebuild 469 SHA256 bbcca175b9d7c46cd592cbdf7bc506d1cc84927d28089162525a07df1a627d04 SHA512 d5945d3fe1798d1a8664dd3a908e888b7f8ee2b6f5e8836432ccdef70a7eee5203995133d4eb9f63c4fd36d2793e73ae94d2b81a6453ff4f5a26a2400ad17d28 WHIRLPOOL de3d5602c02d6196cccd198d61c9a29ec6be11e5216ae321e2f7d400c549b034cde705024ff18d3c7e46153caf9b223d6fb9a63d37e962f40ecec3f036bb82d0
+MISC ChangeLog 2579 SHA256 7635502d47cded812da70de693910990782a6a416ca3e7a6d0e46e26a898269c SHA512 c0dd35ead01319ba02675ac6a8db81dd9c507f9c9c17e4c344618d9e6059981d7cd2b2b4f191571fa15305df4063f6db9de575e0d7df92b8de2cba7d4820cc75 WHIRLPOOL 18c463606cabe19027ebe5785a3bded1a4f5882d588d458cd07b86068722dba0c2165f43c5b513370673d87e43be8113e6e2d337f12594e178a32b05ee96c641
+MISC ChangeLog-2015 985 SHA256 97700c4f79f796318acbe05387bc565c2854406bc9c31d45a6b3783841bc0308 SHA512 a877c02f5a1347f42bc03cab0f4573b5786913caed4c20e08b23965979fb48c24d147eec6315f02693c8a2882d29ef9ef1f15cca60ee90594bc8488840f3dbe7 WHIRLPOOL 707446d43ff2f20acd2235f3baee7130d4ec4260e78e1fd2f863e9fbcae4c4b6cd5077df6ed22cc0b882897a05feecd8a3b26d43ee3b78a9dcf6951ccb1b3fdf
+MISC metadata.xml 318 SHA256 4abc07e427886acb74b2bbfc61a1d52e65978f3dbf418ed59f7d641549f1b986 SHA512 38690bb9c0014ee2808f475d2d50afb41a96edffdc599ec8eef268e980e23ee518a5785b4118ca8c90ce29c88b18ac03e6a0c44520a25af82265db7dcfd1df0d WHIRLPOOL 4ec4641490e3ac36caf208a83b825c0275805ca4c7d4ceb135c7782f0c576fbfdb0a6b491088692724f47c6449629424e8b67fd42587df3094406baf4bed0d3f
diff --git a/dev-python/aquarium/aquarium-2.3-r1.ebuild b/dev-python/aquarium/aquarium-2.3-r1.ebuild
new file mode 100644
index 000000000000..5b951c0883b9
--- /dev/null
+++ b/dev-python/aquarium/aquarium-2.3-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Aquarium web application framework"
+HOMEPAGE="http://aquarium.sourceforge.net/ https://pypi.python.org/pypi/aquarium"
+SRC_URI="mirror://sourceforge/aquarium/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/cheetah[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/aquarium/metadata.xml b/dev-python/aquarium/metadata.xml
new file mode 100644
index 000000000000..d02e6b2a4ba6
--- /dev/null
+++ b/dev-python/aquarium/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">aquarium</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
new file mode 100644
index 000000000000..32d172b0e26c
--- /dev/null
+++ b/dev-python/argcomplete/Manifest
@@ -0,0 +1,12 @@
+AUX argcomplete-1.8.2-disable-tcsh-tests.patch 1294 SHA256 e1dcf6f627087954ad2420e9f45c93baf92b8602a367ecccf4e0e7558886988c SHA512 44c61d79dd23eac102fc437d9778f56d0a44b24af228b20fb2958d28962919718cb9a401a42f8a688eed655da85571b777136c4e5ea7d34f6634aa5381287b3e WHIRLPOOL d7be8aa38edb142fa044b358c036f8a485e7cc9da8493f5ff39d59318d9ffeb9bf16814a59a9d0756729e6c7a130b40a256bdd3704ff682982d032f7190aa2d9
+DIST argcomplete-1.4.1.tar.gz 37219 SHA256 a7b5fa8d1acb69e49b3c6b3f6225bc709092e0c7f621311bac507a4f6efe609d SHA512 3e9fa64fca93baf14fddd653947ff0269004e8783de0567931dafb9e4d0dfff2e2450ef6df331a4d648f5ce1d817a422f52d8d30b94315cd54fd82102467ded5 WHIRLPOOL ee11a1f16f44b204502bc0a1246626305cbdddf8633608fbb5575270e3568b4995ae449ccf309f12225f29099dac117aa21c66cd14f53d0d90fd6abfc637d7e7
+DIST argcomplete-1.6.0.tar.gz 39685 SHA256 d37abde525436465a5126084a89630887bdafd03fddb1bd7b40efc01dbcff9f0 SHA512 6a2a6a4af3ddb5bea0022bf5e2acb123d4c0505d979887ebb82ed5c8a591d59d35b57084483428d030e0507f3cd149953146f49d4a7b0290bc88648cea3eb7a3 WHIRLPOOL 106a23798ebe624ed9548023f00d970bb119b7b35d763f57be694a032dddaba933622eee5c655b6ce321d7c7297604219ae2a0dd681e5ef836aac53db03713ad
+DIST argcomplete-1.8.2.tar.gz 53626 SHA256 7a2ccde074eb6631232b2f91f8d8d5985d5bebf0e36b091113096e3a0385546b SHA512 ed3ddfe402bd89b81da1935a105dcc1914e9c7b98590624ba1140647ce1322a71d790bf3d0e29fe745ca676aa22f99b9834b58a97c2b1c08ca4a32bab7f4c914 WHIRLPOOL 60f3aa3cb468ee34cbf0766628e927f85bb1693db4ce9d48db3e4610952e413197a794e096675879b4d0cc5b27f3c147f2db357ef03f04e2c7c40d2e259c0597
+DIST argcomplete-1.9.2.tar.gz 46445 SHA256 d6ea272a93bb0387f758def836e73c36fff0c54170258c212de3e84f7db8d5ed SHA512 174a4f7f1e24944472567c7cf2959b1bf1bf1d57f9c9d36469837f568d9e5db89d7055a2b93ff58e72fa5a78acb498833833a465da2b69bcf09fcfa2ecdad742 WHIRLPOOL d2259d7befbb4b5a0ad22b17e6a81b039bd9fd5798843b14566c7066b335b92c61758e4c4475dbcc377aa85bfd519418c98f81eb3c73ca84db00e172e8d9c349
+EBUILD argcomplete-1.4.1.ebuild 969 SHA256 00ee0182ece1e462d7123ef51c3012840680787e7500f9620bea51c41847b01e SHA512 0318d5717d2586a1090e660a8efc46a56066046e85862e022bf69c22fb7a4ba0acd9da58d51ea75fc38f3d4ae982698257967777c8324acc4ab97c0191b473a2 WHIRLPOOL cde2a7af0578244cc2318f16a5ee2374029c20519ca5dacccd00906a29e49f952274776e0b7a6337fd353e702dc3a5b8bb2b1b8454a05c27d620fbee9398ad15
+EBUILD argcomplete-1.6.0.ebuild 753 SHA256 f70aaaf60f8cdddbed3d55a34950e561e5e14c482bbd6ab26974acfa8c9ebe29 SHA512 d2b6de83703f36e1a98611610b132eee793f684f3b0826530c9319e1b11503c9991efbee673145a3bb78478b225f56b57fda5adeac76a6ab5e9f7ba71f0f1f4b WHIRLPOOL 80d3d13ed558f87c4fc5444d29794e790cea771042567d5d08667393828f1d5db74c65f0f6fd5dca6ceefa74842f3e999f20ba44ab88c77de001f0b8b665bbd9
+EBUILD argcomplete-1.8.2.ebuild 812 SHA256 6fbe6ced7641891a8e895a565d93c9c9cc4b8864d6ae27ae4a35b74f8075993c SHA512 2f9f68b9f6241c71cd4932613b8441ba5c4520ddbebe20163de962489bc985349914b90af3a7245cdd225d9777e9af4246af3f0fa8af0a2b8bbedf5c407ebcba WHIRLPOOL bc9ad27a7432c187cb824576483624720049350ec6716aef2576cf8c4f53aeb15374ab747798e6d31f10ce825fc8ef2a060c23c26d761b5fd55c6b544f21ad6b
+EBUILD argcomplete-1.9.2.ebuild 773 SHA256 dfa27b2e423056c9d882201fe06bc8698423271e174c8e821f704cda159a1117 SHA512 15eaee33df92399e24ec42b504735f577f0336780a1ffac591f04b8b5a083a58774dc530c77404113e87fe81de4c28671aca2cd73358c4d84fa73c7d6dc8a78c WHIRLPOOL 8704fa5478a16320fd8498c468a9197deeed27c0fcb7040b9296a543139d55e3052b14c36f4fd55efaaf457ab8a0a8065de8fceb8400ab5d7cb5510833b1e33a
+MISC ChangeLog 4276 SHA256 fcd4d6167221014866afa6804b629f0778092998fe930645fc05426bf1861be3 SHA512 2d8953a3f009c1ca4c05d9c7ee119ce2528c17f31f212bea19dd9a37ba7232bfdf6b0207d895cdb4eb60be7a62c3f37fb0d49eb082082bccb8c167f4225518f5 WHIRLPOOL 33358fce131c174eefdb69469f38a58453a57f4cc1cd312bb33a897d5023bd26e62f5a245110e12910ac4947fb376f298e7776f268e2f4f27611af9f131ecf8e
+MISC ChangeLog-2015 2243 SHA256 b4989afdb79ca125bfa748a239a7191a4158680d156d15cdd8750b52e0ca5bdb SHA512 99ae064aaaef3ddeb2c4a5fff2fdc69c593e6cf586fb7d88b36bac1615971382843825ef8eb14cdac9d1d0c075b5a9e4c4760885b61af6ec0fa6143074ab94de WHIRLPOOL 76291ff5bf67682ae2c67d61f629c32f54f98bd5fa3539458a6a81cb46baa292a49fc2782f426545777a24d0acc7b54710055ec4ebe2dbce0a147ccdb4e8a38c
+MISC metadata.xml 385 SHA256 0c336eb52193d785ea1d0eba3a37339ee308538d26fc144e6a657a8ff93f6a38 SHA512 125cccb9f83bacb68944c893b76905ca6db26c41f0e843bc3b2ed4fd8b18df4247696c0fb34acff77c41bd57fce517669878e071db6dcdcedde42f85cc012e5d WHIRLPOOL f08941cb18a6ae769a87ed3ef09e01174feb46267642b936785cd2a9e980ad8feda696782a63b513f58e2a7b23ba02f45539d89801b2c7ead393768c3a57a2d2
diff --git a/dev-python/argcomplete/argcomplete-1.4.1.ebuild b/dev-python/argcomplete/argcomplete-1.4.1.ebuild
new file mode 100644
index 000000000000..1713ddf9103c
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-1.4.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 bash-completion-r1
+
+DESCRIPTION="Bash tab completion for argparse"
+HOMEPAGE="https://pypi.python.org/pypi/argcomplete"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# purge test folder to avoid file collisions
+	sed -e "s:find_packages():find_packages(exclude=['test','test.*']):" -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${EPYTHON} test/test.py || die
+}
+
+python_install_all() {
+	sed \
+		-e "/complete /d" \
+		-i argcomplete/bash_completion.d/python-argcomplete.sh || die
+
+	distutils-r1_python_install_all
+	newbashcomp "${S}"/${PN}/bash_completion.d/python-argcomplete.sh python-${PN}
+}
diff --git a/dev-python/argcomplete/argcomplete-1.6.0.ebuild b/dev-python/argcomplete/argcomplete-1.6.0.ebuild
new file mode 100644
index 000000000000..259a9c1101cd
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-1.6.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Bash tab completion for argparse"
+HOMEPAGE="https://pypi.python.org/pypi/argcomplete"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~arm ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pexpect[${PYTHON_USEDEP}] )"
+
+python_test() {
+	"${EPYTHON}" test/test.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newbashcomp "${S}"/${PN}/bash_completion.d/python-argcomplete.sh python-${PN}
+}
diff --git a/dev-python/argcomplete/argcomplete-1.8.2.ebuild b/dev-python/argcomplete/argcomplete-1.8.2.ebuild
new file mode 100644
index 000000000000..6ed17da9c813
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-1.8.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Bash tab completion for argparse"
+HOMEPAGE="https://pypi.python.org/pypi/argcomplete"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~arm ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pexpect[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/${P}-disable-tcsh-tests.patch" )
+
+python_test() {
+	"${EPYTHON}" test/test.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newbashcomp "${S}"/${PN}/bash_completion.d/python-argcomplete.sh python-${PN}
+}
diff --git a/dev-python/argcomplete/argcomplete-1.9.2.ebuild b/dev-python/argcomplete/argcomplete-1.9.2.ebuild
new file mode 100644
index 000000000000..d5626745f23f
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-1.9.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Bash tab completion for argparse"
+HOMEPAGE="https://pypi.python.org/pypi/argcomplete"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~arm ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pexpect[${PYTHON_USEDEP}]
+		app-shells/tcsh )"
+
+python_test() {
+	"${EPYTHON}" test/test.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newbashcomp "${S}"/${PN}/bash_completion.d/python-argcomplete.sh python-${PN}
+}
diff --git a/dev-python/argcomplete/files/argcomplete-1.8.2-disable-tcsh-tests.patch b/dev-python/argcomplete/files/argcomplete-1.8.2-disable-tcsh-tests.patch
new file mode 100644
index 000000000000..ee866c39d117
--- /dev/null
+++ b/dev-python/argcomplete/files/argcomplete-1.8.2-disable-tcsh-tests.patch
@@ -0,0 +1,35 @@
+--- a/test/test.py	2017-07-10 21:18:13.701472836 +0000
++++ b/test/test.py	2017-07-10 21:18:44.021473430 +0000
+@@ -1041,32 +1041,6 @@
+             self.assertEqual(self.sh.run_command('python ./prog basic f\t'), 'foo\r\n')
+ 
+ 
+-class TestTcsh(_TestSh, unittest.TestCase):
+-    expected_failures = [
+-        'test_unquoted_space',
+-        'test_quoted_space',
+-        'test_continuation',
+-        'test_parse_special_characters',
+-        'test_parse_special_characters_dollar',
+-    ]
+-
+-    def setUp(self):
+-        sh = Shell('tcsh')
+-        path = ' '.join([os.path.join(BASE_DIR, 'scripts'), TEST_DIR, '$path'])
+-        sh.run_command('set path = ({0})'.format(path))
+-        sh.run_command('setenv PYTHONPATH {0}'.format(BASE_DIR))
+-        output = sh.run_command('eval `register-python-argcomplete --shell tcsh prog`')
+-        self.assertEqual(output, '')
+-        self.sh = sh
+-
+-    def tearDown(self):
+-        # The shell wrapper is fragile; exactly which exception is raised
+-        # differs depending on environment.
+-        with self.assertRaises((pexpect.EOF, OSError)):
+-            self.sh.run_command('exit')
+-            self.sh.run_command('')
+-
+-
+ class Shell(object):
+     def __init__(self, shell):
+         self.child = pexpect.spawn(shell, encoding='utf-8')
diff --git a/dev-python/argcomplete/metadata.xml b/dev-python/argcomplete/metadata.xml
new file mode 100644
index 000000000000..ae11391891a7
--- /dev/null
+++ b/dev-python/argcomplete/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">argcomplete</remote-id>
+    <remote-id type="github">kislyuk/argcomplete</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/argh/Manifest b/dev-python/argh/Manifest
new file mode 100644
index 000000000000..e1b784ef7537
--- /dev/null
+++ b/dev-python/argh/Manifest
@@ -0,0 +1,6 @@
+DIST argh-0.26.2.tar.gz 32913 SHA256 e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65 SHA512 90382900d5cec9629dacb4459a2c9491d1425b66fa3f90d7cbf511dec846a99dbb9424f3e08f0c006da48fbf9c067078705be70b314700541fd800630e4b1707 WHIRLPOOL 1bf82170a097584f92e6a59f5a0a0d97544cc7dfc909e847faa6c84de0ee782d51601d09aec14ef99a70c39699d6b1686562b3ca71cb39d20fdd179c57e81201
+EBUILD argh-0.26.2-r1.ebuild 691 SHA256 0e0079fc5d86612d20270ecaa5de2103b84eb9cbac7a59d9bd4cca87233be674 SHA512 cbc07fe0969f2f4a506da78fa346793204d339f981e9d2690559f243c7d3216f5ea641f5574849ed460954b3b4730fc4eef6c5e9f598a3a710fc851894bdc920 WHIRLPOOL faae98477f40cc05d3b243e735a911385708b225a1615e9f5105706513fb156fd44fdffb94838cfc196285c8887cf0e15815baaf46c29333909caec8a8b93f1b
+EBUILD argh-0.26.2.ebuild 685 SHA256 dce73e057647c28e40ae12adcd99e0359e649b02a4c14fd917b370a4e7fe7e3f SHA512 68a8986975e1cc71e4b13be245ee16d4c9fe05727e46f790c9920dc731b818f97c64803a04ca19358a3d2a9e66e2576ea520c86609e621dff2ed0c7e3285a482 WHIRLPOOL d2d060d3c92294ff24625e76261605505a5acf31988b574f4b262948a16616c3bda28e15c27f08a9722877ff248e472fa6a1be959546184200d7292c6cb7f973
+MISC ChangeLog 3098 SHA256 7e74846d763a0de81459db0ca80e0eae20f7673b6819df790075141c753bf83a SHA512 d9da6efb0421b0a1c94999fed802ca39c2e61564c27c6799b192e6627cf7c943e3b613728b8aa52bfb3c2d95b6f8c3956878720371b288a53eb802dd22db51d9 WHIRLPOOL 6ba9aa89bd0ee2f56442bbb887b641e987b381816a0a51fcb9890fbf56029b61a304edc834943506df01d50563c71453fdcc7a47bd3bb66621c48561aef944c8
+MISC ChangeLog-2015 3900 SHA256 b9ca184affea7782c385f0a8fe61cbce7e0fe1994f616284f2280b2aa8383be1 SHA512 a3cbcb9f593d6db3561fb7c47ed1bab622669741803c9a7fb30188eae7da5a35c6a20d066bb2e8f996e2cbeccd1e288388c5206a8fc98bc2bb5910f5104f2cd7 WHIRLPOOL 2cffcc576d185722ef13d1113a22a9a98a9cc94da3211d961a2e1bc99f454f9c49fbff8badbf56bce865c2e6871132b691c9d627e35078e746ad297985cf4cb9
+MISC metadata.xml 307 SHA256 b6b297dbec6264dd30781d8ecc07616de26e7d71cc8b580eea5a5da972eaa0f1 SHA512 6236f4f54de93e831341d268725741e3a46e4a4cd815ead1d5751ab551ec06fd58acb410d2cff973c992d564b69f21e6e56168ad567fe3e7c810eca5c2a83712 WHIRLPOOL 1ed26bfeee3ea7e891ef6f1d726e2232fe2bd43b9e4e8df99069219b76287c5a16ca51237027295a1ac032b904e9700d289d919b77ad9282433b76cf9e30bb28
diff --git a/dev-python/argh/argh-0.26.2-r1.ebuild b/dev-python/argh/argh-0.26.2-r1.ebuild
new file mode 100644
index 000000000000..fed4b80bb851
--- /dev/null
+++ b/dev-python/argh/argh-0.26.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple argparse wrapper"
+HOMEPAGE="http://packages.python.org/argh/"
+SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+LICENSE="LGPL-3"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/iocapture[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+		${RDEPEND}
+	)"
+
+python_test() {
+	py.test || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/argh/argh-0.26.2.ebuild b/dev-python/argh/argh-0.26.2.ebuild
new file mode 100644
index 000000000000..a4a1febe622e
--- /dev/null
+++ b/dev-python/argh/argh-0.26.2.ebuild
@@ -0,0 +1,30 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple argparse wrapper"
+HOMEPAGE="http://packages.python.org/argh/"
+SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+LICENSE="LGPL-3"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/iocapture[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+		${RDEPEND}
+	)"
+
+python_test() {
+	py.test || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/argh/metadata.xml b/dev-python/argh/metadata.xml
new file mode 100644
index 000000000000..0e0938894bcc
--- /dev/null
+++ b/dev-python/argh/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">argh</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/args/Manifest b/dev-python/args/Manifest
new file mode 100644
index 000000000000..c25cbf81eb18
--- /dev/null
+++ b/dev-python/args/Manifest
@@ -0,0 +1,5 @@
+DIST args-0.1.0.tar.gz 3048 SHA256 a785b8d837625e9b61c39108532d95b85274acd679693b71ebb5156848fcf814 SHA512 664d33386af2ac0b9d30344db5fb5cea4210f600df28708ada19266afec237d6e6d9d57f03c8b64cfdbb6a17eff05f633a2cc4ddbfedc320dd133be246aee033 WHIRLPOOL 0f410bf8cc2d3c226bfc15dd3adc848f1139ec0f22ffdd77fbb921d64b5eb2b370059d07ef847f4161a020b7928ff32895b4ba0216b9fc633f0347d4195376fc
+EBUILD args-0.1.0.ebuild 439 SHA256 8af37671e863016401be2f396e584797dd91f0508d811ecdfae44e6f779ee085 SHA512 719bc77044aaefb73d71015e416b9083f024fcb3ea7051cacbbcf7993f6c6942f730d3dd249d50919b03585d1dd20b76879289a749fb2158c6d145c9551bd2c0 WHIRLPOOL c3d12ced621fba90d7d4e91d231e86271f62f3f2e619bfc2796cf4cb5e3ce4046062c62d8ab6b9dfa0d8773464cc4fccee379e343f91d5d3f8aaad7c522c60f9
+MISC ChangeLog 2410 SHA256 ddca3499f26d57973fd44b1184a79928886da6ba664f7deb156e0d9179e9cab2 SHA512 d8e45cdcbf60981b07b45dc1a80751d8016fd270e464ebe6f30d4159154533f15673b25300c61d8dda1611dab749a6becb230c2549e6a6a09ae7874a81e31690 WHIRLPOOL 954ed3d1af66a8bcca569ecdcc59c5ac69a28e7313c7e21e917707ea04725a0d7bfb5ce41c1df073566bcbcd989c9dbccf474564b1119ba20b622441737d12f8
+MISC ChangeLog-2015 636 SHA256 e7c7a77022c28f657ce97714e83b4074f14d52d6eea0eed28a99dd37faa1c8db SHA512 1c8a7801af1051c867686e0a676352b567c2bbaba1e5f98cfad2263c379d9c4510ad5ba3d3294be1c33f09728aa1d9c30c464f712ddcb8c0ce83f18b0f8a225a WHIRLPOOL cbfe21fdfafc8a7b37c3ee632c342bcfe4c70b9483bfb0fbc7452d5def3d27b636eb0734dfc0d8f730b677757629c04ee5c3a98e6e8ba8777cc9e0f3c0678474
+MISC metadata.xml 370 SHA256 00b880d7ef0bc4376bff9ba5763e97ccc603d9959c6d993516e613735f20bd48 SHA512 e548bddbd2c5f72fcdb6b7548bf8ce896a4a8c184946d1a40a7524bb3b50aa77c4b4e1b577b4098501d5fbb90851780c198a84eff8c71078a415ca79f6274698 WHIRLPOOL a195c00b3b580e8909d5008811fd8fd15ff17ff4f36ed86d2d2f028d5c42ed63245948b79f13281b4d27150292ad1e97359e558cdabaeac73ac15d59dc8fe1ae
diff --git a/dev-python/args/args-0.1.0.ebuild b/dev-python/args/args-0.1.0.ebuild
new file mode 100644
index 000000000000..f6305894d7f3
--- /dev/null
+++ b/dev-python/args/args-0.1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command Arguments for Humans"
+HOMEPAGE="https://github.com/kennethreitz/args"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/args/metadata.xml b/dev-python/args/metadata.xml
new file mode 100644
index 000000000000..8773fc0cee04
--- /dev/null
+++ b/dev-python/args/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">args</remote-id>
+		<remote-id type="github">kennethreitz/args</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/arpeggio/Manifest b/dev-python/arpeggio/Manifest
new file mode 100644
index 000000000000..63363bf2c04f
--- /dev/null
+++ b/dev-python/arpeggio/Manifest
@@ -0,0 +1,4 @@
+DIST Arpeggio-1.5.tar.gz 18856 SHA256 56c3550852fa8a1d24806fe0ab60cae6649460c6194d0d5fd1382c5bf050859c SHA512 533c59635556a3446c04c8b14f53e8ad6a7a39869f39d958bdd52b5a55ad43c533bc42a41999cc149015b34470d8ff0eca295ff1942c75b33a58a403a604c449 WHIRLPOOL 137243048317eb3716ada2ebb2b51382d0e7fafe4d8895c6a1f8b0067060edc277fcffc38869c32174e07a9113a12a3bbd513887e3eeb62dea9c0f3751380467
+EBUILD arpeggio-1.5.ebuild 720 SHA256 7aac763add7c9b323ce5f05318c1fab908a4ee63b67aeda2a0ed5894267b5192 SHA512 84f5671daf74424a9e5feead08693ca960ff9eec43f9367ab84cd0d7cd54c06d451c07d8c023e600da4b9f20601d783a59932fbc234af2f84c0d9d4399f870f6 WHIRLPOOL 4073e2ea4e5f03087f7f0e346496411630064cf1d065436748127e661fb5ea0b5c3ba7207c03f91caed708696c6ea832d9da575b074056d6ab905748d1600b16
+MISC ChangeLog 303 SHA256 232eeedbacaa155c9fe614f9e09290aac0a8f3a56c132ffe7384a71baedb78da SHA512 3de51f439cbdbc4c495bababcddb1467b36b6c04d037b302964daa01138d29eeecc8c719709eb7391a86b0fd749867b77df4fee57f71f6544c32f509503bb57f WHIRLPOOL a6170906bc0355a0352196dcc43aa0dcc94d2a6d2c3c4e4ac02d6e391ff70f6e7bb69b63cf8df729289e81d0a4ad58871f6fc2c4a79a9f1d35bc2cd01b0c4675
+MISC metadata.xml 351 SHA256 74db8baf0fa1dcf813b9cfbd32b17b03b22b044f69e0763a4e591aa6c88bc6a6 SHA512 cad3a1cb94dacf951a07d5a98a35bd723b00ba6745f52f1ff2f5d20c5c63fa9c1e875617a0833f822a1177cba0805b07964eb6ca0abbfa74f93dcd42f601a935 WHIRLPOOL 2316d1dd404fb878f564babb47794e0235f05b12d4d14879e823f281494efa728684863abbc8b73d7d83cf24226c9d4f02f601b1421924279b07f225518e9226
diff --git a/dev-python/arpeggio/arpeggio-1.5.ebuild b/dev-python/arpeggio/arpeggio-1.5.ebuild
new file mode 100644
index 000000000000..ca6482ac4d18
--- /dev/null
+++ b/dev-python/arpeggio/arpeggio-1.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN=Arpeggio
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Parser interpreter based on PEG grammars"
+HOMEPAGE="https://pypi.python.org/pypi/${MY_PN} https://github.com/igordejanovic/${MY_PN}"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+# pypi tarball omits tests
+RESTRICT="test"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	py.test -v tests || die "tests failed"
+}
diff --git a/dev-python/arpeggio/metadata.xml b/dev-python/arpeggio/metadata.xml
new file mode 100644
index 000000000000..91634f41522f
--- /dev/null
+++ b/dev-python/arpeggio/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Arpeggio</remote-id>
+		<remote-id type="github">igordejanovic/Arpeggio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/arrayterator/Manifest b/dev-python/arrayterator/Manifest
new file mode 100644
index 000000000000..366ceea1ee2f
--- /dev/null
+++ b/dev-python/arrayterator/Manifest
@@ -0,0 +1,5 @@
+DIST arrayterator-1.0.1.tar.gz 7840 SHA256 ec38a888adf2c8f7d78ad9cc5dc455a7a92c41c9ca4e42f9aa67fc1bc6a69d6e SHA512 91d560f1aac1e64cda6feaf6ead5ab8ac59555e046760b6caa8cd80c47b7c96f032bde064eee82b9d5e287e8845afa2a17b3460c68561d8ff3c6fe7eecb69cb4 WHIRLPOOL 03ff14a0750dd24195207f61720a47fa6a21523875248c2b54b3c8a47601041524ae5767298bba1b24e9266118ef204d0416cba6fe201aa1ccb0e2cd2c27d38b
+EBUILD arrayterator-1.0.1-r1.ebuild 664 SHA256 0c06fa077a00e1bf5bb6dd15553cab80d1691716503555d8eb38aafe6da11080 SHA512 9b56a7e320110b7c15867910d2c45e28459effed8f99e575662f35189911feccf3a39a799a007a87f0a59c4e59a1ad894bf88d388b5d0c893b164ce2f6c9283e WHIRLPOOL e26aad8607481dcd6062a587bb68d394554bd4bd81653b7c6d480659a3e341c7942acd805f4d5098118f30ec9a2484600b7640f7a0507517880f11d13ecb1b25
+MISC ChangeLog 2601 SHA256 4e086630c674a7b5ad5a2207b53bb7f1d098ac7d4aedfa151bf96d528f1bf8af SHA512 7d706c5f703c421eae76e524ece0610e6549209029c4bdf143962d46c70844dd340526919e06e9b1320400a8084737eb48baa518fab5ba0afceb15741ddb6a80 WHIRLPOOL 71e6bf8e8e991858d8e416db76fbc42f61749d99c39203938b4938cf5e56a6a6480973a60bc242d9fbba566a9ab57b51480920c6795e57d65a2e785264d80f64
+MISC ChangeLog-2015 1500 SHA256 24532b6442a5353f78d3738a08a4a97536421b951912cf7d95955ac459b8aca8 SHA512 9a7baec12c88bce904b776b20618aeb073198d62db743212a0715138b3ff043a994c5917cecaf88e2c82019eb3293a207018b1466154656d1a3a99e29c3b6c6a WHIRLPOOL 9e2444f36d86376960df63233b3027810b7ee33a7052f8f1f9ecc60fe387fe1357b619a3928c4ea27df3cb5b487336dcbd98dd4e8e9d47408cb646cb7d210d5f
+MISC metadata.xml 315 SHA256 56265c211f010ef5c5de9b215dc4a0b281a7d2f7f7a28b4fbb0289522982ac1f SHA512 ffe338d470a70adefae552059ffae9658594cb62a5dd946c3616286bf53963a3116ce0f1c5ec1aeb65753cd2dc8544db192a7a80c2039f0bfd839113fa026289 WHIRLPOOL 3bb13fc4c24bc0eb9b8cc5e0193c0deaa45d0807f1178bd4623531e768135212b6851d40434f5a6ddd1515eeb3c52841326964351fd1b7b5d0c5a9a3e96e2ee1
diff --git a/dev-python/arrayterator/arrayterator-1.0.1-r1.ebuild b/dev-python/arrayterator/arrayterator-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..dd2cf2fc735a
--- /dev/null
+++ b/dev-python/arrayterator/arrayterator-1.0.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A buffered iterator for reading big arrays in small contiguous blocks"
+HOMEPAGE="https://pypi.python.org/pypi/arrayterator"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+RDEPEND=">=dev-python/numpy-1.0_rc1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	cd tests || die
+
+	"${PYTHON}" -c "import test_stochastic; test_stochastic.test()" \
+		|| die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/arrayterator/metadata.xml b/dev-python/arrayterator/metadata.xml
new file mode 100644
index 000000000000..b7763250cf5a
--- /dev/null
+++ b/dev-python/arrayterator/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">arrayterator</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
new file mode 100644
index 000000000000..4f00ee18deb5
--- /dev/null
+++ b/dev-python/arrow/Manifest
@@ -0,0 +1,4 @@
+DIST arrow-0.10.0.tar.gz 86506 SHA256 805906f09445afc1f0fc80187db8fe07670e3b25cdafa09b8d8ac264a8c0c722 SHA512 a2baa23f1424b21506f3b664f0ef02d09f91b9cfaf6e0badfa544f42c750ed51136ae0e8910ac24207c0265a1b233f10a6f3cbafee3124b5f5c4fd965cfd01c0 WHIRLPOOL 25ed084436718040d0d516d5f2bfa87760770329d90e93771bd0c86761de44a39699d9b55889a5598499162674b3323e7246471f05076154d35dde460110108f
+EBUILD arrow-0.10.0.ebuild 706 SHA256 59fd4fc53e04d5fb67e30633fb409a0b675de051e4b9e5e6fff59356ccb778c7 SHA512 7a05fefaea943bd37c4cc60eeddf6e7cef78e83d5ff7da36be1cfed31626820a45827569f823478173bfd65b3554c7549c1e16802620b157fb8fe1db19abb8dc WHIRLPOOL aa7e23f49a2eda53ef8a5bbd425ca950d19fe433de91fccc16a2cd81fefc8cac6fc31fab85963813963cfdd74c38ae1de969db2531bfec2baf0f21deaad3134c
+MISC ChangeLog 303 SHA256 b996d15a3b0f51e53bfed3736c42c9d87f32c07be2cd824f345e6b3a16ebfb0c SHA512 64d324fcc95b077031f2d80d8fe32e7ef67da87cf16389ac5d721f1199ea741e85fd25bedff7f48f2bfc64e7e2033df3b1973b10183102555006433c8482c46b WHIRLPOOL 5f317047cedfb377754cc92c56e08b6981eecb981cacc9ed7bc91ce53b1de400700944e9653ff7aef5340440b39dab983fb3d7c292ee393e93255bf10967f4a9
+MISC metadata.xml 364 SHA256 82141becff0486ecb1925748520846deeb8fa56f96bf31197272e04ac8c70471 SHA512 4288f06ad48ba051749472da3ff12ab53d50226c053764c9c175ac13a24b8817c731350ae153ef83ee02db04aa6ba7735cb30b8e35339badc0e46b6998773015 WHIRLPOOL 6df5253017e645ace33c87f451120c30a799060a428988a7d0bbdf3c644924a8e412daf3e40fe199013588bd2e3ba864be61589601b0e403f873b8f808b96558
diff --git a/dev-python/arrow/arrow-0.10.0.ebuild b/dev-python/arrow/arrow-0.10.0.ebuild
new file mode 100644
index 000000000000..89e2ce52f689
--- /dev/null
+++ b/dev-python/arrow/arrow-0.10.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 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 distutils-r1
+
+DESCRIPTION="Better dates and times for Python"
+HOMEPAGE="https://github.com/crsmithdev/arrow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]"
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/chai[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	${RDEPEND} )"
+
+python_prepare() {
+	sed -i -e "/with-coverage/d" setup.cfg || die
+}
+
+python_test() {
+	nosetests -v || die
+}
diff --git a/dev-python/arrow/metadata.xml b/dev-python/arrow/metadata.xml
new file mode 100644
index 000000000000..2115d1102a30
--- /dev/null
+++ b/dev-python/arrow/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">crsmithdev/arrow</remote-id>
+		<remote-id type="pypi">arrow</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/asciitable/Manifest b/dev-python/asciitable/Manifest
new file mode 100644
index 000000000000..0de9e271a8ef
--- /dev/null
+++ b/dev-python/asciitable/Manifest
@@ -0,0 +1,5 @@
+DIST asciitable-0.8.0.tar.gz 299640 SHA256 dc2ff63e2c2182f3fa92e54f08c20b0cd4eed1e81a4e4363994dc3eb3f6ab612 SHA512 a74dfcc3515a9959af8a0ec0906e440aaabd402ba8987a581c774bc97344abece0fbb62957b0a5af89e290a505acc4df1dad5a22c08ca2ea8c7c65ca0a582a22 WHIRLPOOL 57e76bd8de820325f41412ae763be9191af8e0bbf34cb861f16f211cb2d38065eed08a696ee11df9c6e9ca5c47c32a4c8af7ba12e7b217413a28178a8610cd30
+EBUILD asciitable-0.8.0-r1.ebuild 587 SHA256 d733a88c852cd6154e550b9821c1aa3735da7fcda5142440b12cf6dcad6888b7 SHA512 9d134f61eda24aca6c634d772bbfaa215aa6e544ab85f5e8ac5c6a8674aded600df00e0aabbdf96e7339e19b7b66ba86da435383233a1b261ecbc8b4172f08ab WHIRLPOOL 5f2310d7e9e8f03c7e7b339ce4f5bfe84102d7d20a58a07ad02f9b4b0c184e5617995f0dbc17fbea81e9eb1861bb6f355e411469b25208d211fcc942c926b1fd
+MISC ChangeLog 2578 SHA256 0b4c4bb5d3c6d90925d96a72ba74df6d2ae032a7905f27e0cd4b035fb824faac SHA512 75b7d0a50622e6b3c4301600f8d03df6f8ae10568566db82b593ff5b008c680355f2b92208679f6720134cfb94247f3129ec07e885a276ef70dfcb741a98f2f6 WHIRLPOOL 69501c7e718963037bc19c1889cb29d5886f63d93a9644f6e0025a4f15c44ddf4c507834a240513d4653a2b777c2b704770fe94568490e8eabce9ebbdda68a5d
+MISC ChangeLog-2015 3093 SHA256 8dd4002044972804e3612fdf08d06637d90db224c4d1731fc00026777bd9bfcb SHA512 39a44bc93d3c42f16e2a6d471c88603c5599cd1fce7b1b3ada5c679308b1e6631b5f5ce1747971f88890fd3feb7e6a8f3d6c1e1f5d704e6ba79946ec3b7c4e51 WHIRLPOOL cc0beb69f1314738e6e55a62bd402c824e65bc9a5a03de2f811bcd7344890cee4c8f1dcf8af72654d90e2c1393b23da18ff6dbebce0915c8e43c49d58b3aa5d6
+MISC metadata.xml 525 SHA256 62b19de0bc14b3e01bfc4d678bdb79ff15a7e1b6ea4111d554c4bd7adf9333d3 SHA512 1d2a6f8011dbd066f835120db3bcd6e71e57da7b1c5241409220bd3410c9c2f55a0dba0d88c336dae753fbca72a9c99977bea51a2e3813cfafee587432a90f6b WHIRLPOOL f725836eb03cf805204042818cb9f33f748f37894dbddb048ab29ec2cd0777a76137d1a67d597cfe8bbcda61895fb862c554e8f423fc6b3b37c9f6c76780e994
diff --git a/dev-python/asciitable/asciitable-0.8.0-r1.ebuild b/dev-python/asciitable/asciitable-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..40213172e135
--- /dev/null
+++ b/dev-python/asciitable/asciitable-0.8.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="An extensible ASCII table reader"
+HOMEPAGE="http://cxc.harvard.edu/contrib/asciitable"
+SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/asciitable/metadata.xml b/dev-python/asciitable/metadata.xml
new file mode 100644
index 000000000000..d05a47d3a219
--- /dev/null
+++ b/dev-python/asciitable/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>sci-astronomy@gentoo.org</email>
+  <name>Gentoo Astronomy Project</name>
+</maintainer>
+<longdescription lang="en">
+  asciitable is a Python module that can read a wide range of ASCII
+  table formats used in astronomy, via a built-in extension reader
+  class.
+</longdescription>
+<upstream>
+  <remote-id type="pypi">asciitable</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/asdf/Manifest b/dev-python/asdf/Manifest
new file mode 100644
index 000000000000..30a8d0115923
--- /dev/null
+++ b/dev-python/asdf/Manifest
@@ -0,0 +1,5 @@
+AUX asdf-1.2.1-Disable-test-that-require-http-server.patch 2043 SHA256 a6739732d42e7ec285b9932dc3eab50004fa06c3a270788afe982a86860c6a42 SHA512 0bd18603e37027d4daf9227fb7c34b48dfca47bd01771dac6be894938c625b0753769764e7ac7b9b23463c6f1d52f7732b960764ccf3ca8d3904e0d5de88e2e7 WHIRLPOOL 82d4b50485776943b735ecfeb3e40fa693c09f60214258c0ed733edac2bf03280488de65a15736331837366785ac890bf5a483dbab8b2c62b109091280f1ba0a
+DIST asdf-1.2.1.tar.gz 320828 SHA256 6e197f20683e050ab54769dcce22cf251d587b6dc38be011ca7b9dca21d81dec SHA512 ac8b94ee1c0e2f1d99d55e38d13cd78e7fb14fbf8b5e15a725c61560e14ab96401a53909954ac6cde825121c6a1205b2d3b8ca474499b90461a2f0ebb5db4638 WHIRLPOOL d93ea1d7dfb2b2b67ebf742af8979dab61cdf15b22672c7b4cecbde6da69b777cfd5a6cbd91afa0af6b9ded748f0a14e7d8bfe05bc3fb3f2ecd75b55e5b85a97
+EBUILD asdf-1.2.1.ebuild 1324 SHA256 56609dcaa7f6a3250f246d246a71f0bd736b99de1841450d5421ef3f6d0df4ed SHA512 c5d1d0f7feb791d14fb07c15b82fe88865e68043b49a95f02cf6f4ac9bbd6012cc4934a466b53bd1ef6c970e92b5db174214141da4c255f44e939b28f63c3ba3 WHIRLPOOL f4122837cd92e54176aaa760c73a5cc977aed8e142ec469ca41732f5f481e2f376b64fea4191f5180c53e0cfdc8f97699e2fa3eea01c5351ffd3b92b05fe54ee
+MISC ChangeLog 371 SHA256 c6c21f49314bbac884f43b9b2f7b75c90ad701df9a5a25b56212f6f992aaa367 SHA512 06e641dad5b2c6e09d28ead1076d0b11d5ea1e7be3955d7d75590812dc1a02dfd0c7905bd4df0d2ebc210584c1532245ed3a97b38c3e537a9c85b6f30638e062 WHIRLPOOL 0bec34a2ee3d8f444954739803babadcc803c2e9d389ee0c76c95332c1bd311b2bc1748726dac5e328e66a857a126103544d6a890573a28a8b1c175c8dc0f295
+MISC metadata.xml 912 SHA256 e0dc49a8d62741386e2c41c155736fb06acde0a0ad312bf991227d60b854fb6e SHA512 3594bcaf9bb04369baeeea29f728653efbbe2e77b2b77127a34d6b0bc03e5cfb7405f21341df351e86accd774838808aafd73c533c8995d875882436cc898c66 WHIRLPOOL d35f9617573b4e9034a8fcdea499cecea740306ab80b18b6b54d6eafa82220ef695524e0a592e233f5ddf501ad2348952249ac48da092bf829f1a99974de8113
diff --git a/dev-python/asdf/asdf-1.2.1.ebuild b/dev-python/asdf/asdf-1.2.1.ebuild
new file mode 100644
index 000000000000..c97ed0c6b5f9
--- /dev/null
+++ b/dev-python/asdf/asdf-1.2.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for the Advanced Scientific Data Format"
+HOMEPAGE="http://asdf.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Disable-test-that-require-http-server.patch
+)
+
+python_prepare_all() {
+	# use system astropy-helpers instead of bundled one
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		PYTHONPATH="${BUILD_DIR}"/lib \
+				  esetup.py build_sphinx --no-intersphinx
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/asdf/files/asdf-1.2.1-Disable-test-that-require-http-server.patch b/dev-python/asdf/files/asdf-1.2.1-Disable-test-that-require-http-server.patch
new file mode 100644
index 000000000000..e59d48246000
--- /dev/null
+++ b/dev-python/asdf/files/asdf-1.2.1-Disable-test-that-require-http-server.patch
@@ -0,0 +1,53 @@
+From: Ole Streicher <olebole@debian.org>
+Date: Sat, 5 Nov 2016 14:03:24 +0100
+Subject: Disable test that require http server
+
+Network connections are not available in pbuilder.
+---
+ asdf/tests/test_generic_io.py | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/asdf/tests/test_generic_io.py b/asdf/tests/test_generic_io.py
+index 3f48eab..b90ca7e 100644
+--- a/asdf/tests/test_generic_io.py
++++ b/asdf/tests/test_generic_io.py
+@@ -241,8 +241,7 @@ def test_streams2():
+     assert len(x) == 60
+ 
+ 
+-@pytest.mark.skipif(sys.platform.startswith('win'),
+-                    reason="Windows firewall prevents test")
++@pytest.mark.skipif(True, reason="pbuilder prevents test")
+ def test_urlopen(tree, httpserver):
+     path = os.path.join(httpserver.tmpdir, 'test.asdf')
+ 
+@@ -260,8 +259,7 @@ def test_urlopen(tree, httpserver):
+         assert isinstance(next(ff.blocks.internal_blocks)._data, np.ndarray)
+ 
+ 
+-@pytest.mark.skipif(sys.platform.startswith('win'),
+-                    reason="Windows firewall prevents test")
++@pytest.mark.skipif(True, reason="pbuilder prevents test")
+ def test_http_connection(tree, httpserver):
+     path = os.path.join(httpserver.tmpdir, 'test.asdf')
+ 
+@@ -284,8 +282,7 @@ def test_http_connection(tree, httpserver):
+         ff.tree['science_data'][0] == 42
+ 
+ 
+-@pytest.mark.skipif(sys.platform.startswith('win'),
+-                    reason="Windows firewall prevents test")
++@pytest.mark.skipif(True, reason="pbuilder prevents test")
+ def test_http_connection_range(tree, rhttpserver):
+     path = os.path.join(rhttpserver.tmpdir, 'test.asdf')
+     connection = [None]
+@@ -348,8 +345,7 @@ def test_exploded_filesystem_fail(tree, tmpdir):
+                 helpers.assert_tree_match(tree, ff.tree)
+ 
+ 
+-@pytest.mark.skipif(sys.platform.startswith('win'),
+-                    reason="Windows firewall prevents test")
++@pytest.mark.skipif(True, reason="pbuilder prevents test")
+ def test_exploded_http(tree, httpserver):
+     path = os.path.join(httpserver.tmpdir, 'test.asdf')
+ 
diff --git a/dev-python/asdf/metadata.xml b/dev-python/asdf/metadata.xml
new file mode 100644
index 000000000000..d9905abb5f0e
--- /dev/null
+++ b/dev-python/asdf/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="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+     ASDF (Advanced Scientific Data Format) is a proposed
+     next generation interchange format for scientific data. ASDF aims to
+     exist in the same middle ground that made FITS so successful, by
+     being a hybrid text and binary format: containing human editable
+     metadata for interchange, and raw binary data that is fast to load
+     and use. Unlike FITS, the metadata is highly structured and is
+     designed up-front for extensibility.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">asdf</remote-id>
+    <remote-id type="github">spacetelescope/asdf</remote-id>    
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
new file mode 100644
index 000000000000..5a5294cd41d0
--- /dev/null
+++ b/dev-python/asn1crypto/Manifest
@@ -0,0 +1,3 @@
+DIST asn1crypto-0.22.0.tar.gz 84508 SHA256 cbbadd640d3165ab24b06ef25d1dca09a3441611ac15f6a6b452474fdf0aed1a SHA512 fdc98f71ec3b744e69a75909b5b0a8381fb82d448941a6e1059823af47ca107218e1dbe6ff192e2173f11fc2454be1afcd387d801dc8e716451179857d71f8b8 WHIRLPOOL 83422e7f17c5e8c5ff5dff4e6e295596d4649f163bab8151b6885df48cdb2e61730b7abba5af5b5d44781078af69fe6495a1d1a20bc1fd1927f64f726bbdfdb1
+EBUILD asn1crypto-0.22.0.ebuild 609 SHA256 bd0665cad449318a7a125adc4d934730fa3bc83509969c6bf186642dffabbef9 SHA512 7fc7d0a4c1ead7bbeef4d6f54a5b0f52d714c942a29fdd41beb87fc629e9a72505e9436f25e2e597d9a0a02d5583f6b44822662a0ea1af18c12a2f9b2a04caf1 WHIRLPOOL 28e7cf73e54795a5c031274f2ef1575f9e033140c48299da13b800841025db4e1ebc1fd48202b1f65b2cc5df417170ad8f8a052d7a4dcf2b332ee767e18c4444
+MISC metadata.xml 384 SHA256 1eb9fe441314061b742ab80221c14c78f22fb93cb64f7eab4f3c89c6b95eadcf SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7 WHIRLPOOL b29d989556a30a69dd73203ee4fb22e15cefa78d441e10f153e0924f4666817530c703e44047f551379c5fa31666d5856c4b3684883064d130913fa9732f6c92
diff --git a/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
new file mode 100644
index 000000000000..ec5211d69f06
--- /dev/null
+++ b/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python ASN.1 library with a focus on performance and a pythonic API"
+HOMEPAGE="https://github.com/wbond/asn1crypto/ https://pypi.python.org/pypi/asn1crypto/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 hppa ia64 mips ppc ppc64 x86 ~x64-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/asn1crypto/metadata.xml b/dev-python/asn1crypto/metadata.xml
new file mode 100644
index 000000000000..2dfa57bc0fb6
--- /dev/null
+++ b/dev-python/asn1crypto/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">cryptography</remote-id>
+    <remote-id type="github">pyca/cryptography</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/asset/Manifest b/dev-python/asset/Manifest
new file mode 100644
index 000000000000..cf3d1f3d0ef7
--- /dev/null
+++ b/dev-python/asset/Manifest
@@ -0,0 +1,5 @@
+DIST asset-0.6.11.tar.gz 28071 SHA256 985bf10e0123911ce5ca549598f84b483a908588c7e57d89fa70627d252d391e SHA512 b9c002febd234d1342de92279a0e1fbaf30d53e9efa46e3ca2cfced43f4a9582bf731545185f868752a20d97c5ab0f7b5fbb453c1fdfe4e67d6bfcab222d0bc7 WHIRLPOOL 96b4860c5351cc899ddc74569182ebf90f43296963d401e15c4b136e9de8cd6908c0ff1a12575f5203d696b0179d6520d1b1d22140bb4c13d6f1b2dbbb2cbf37
+EBUILD asset-0.6.11.ebuild 798 SHA256 774143855309cca7ea6bcf3786865362b17853f793da823a08fbffef71f5a4e7 SHA512 3ad4839a7a03a69104ed0918e0b381dc05e9893d6c3110e83d75a0767a25c4d2b0e3f0ecb81fab49adff0138a85637615a383f7989131937d416a441c2868bd1 WHIRLPOOL e95475d611007d3008a7eb564ffa018dbd722f95547e800d9a22911c73c92d00c86f8e832e6538f3ec98b90b9d0d11178527bdda718bda5a3a03917488998b80
+MISC ChangeLog 4088 SHA256 21701b327657be8a5f9ab1ab5afe4f0f9fc0d1e573126ada396363a67bd49178 SHA512 b045a353c19ca3110c9d24cd09d342f5d0dcba722fa6eba21cc1b616ea95cc30713ab3745bb16322217a23b4cff87579193c4b8d0f7be676f68a658e6beed995 WHIRLPOOL f7df1222294eafb053acb629ee3b83d4708fb92526aaa1d0360eae183580c895d2fc94848ee9bacbca245a1feda52a8a57c8b86d1fae7ef5688426590446853c
+MISC ChangeLog-2015 553 SHA256 d74c42cdb425d9c1a18a1e3e0ec08af8fc95fa05bcccd2c216f3b018644a6c90 SHA512 9f2712fb127e86bb1dd99f840d5a6477a783f01caeb3d1ae389121b0658c566db26411401ad3e9dcc295c8788fb869aecdc3310142ea2db80985210e09b54a6e WHIRLPOOL 6e31f91ad2f20840b469277f624946e1a3675d797b89be522870101f17d66b87986c206b38c9039c5a2583cb6f6b6d9710f0d2a55bf79b705525a985fa51c712
+MISC metadata.xml 365 SHA256 2e03452daa8e6d21ccc576020a08161fcbeec810bc40453c3532d108f089c2a8 SHA512 2a64c1ef39be430881823d5ccfd8a3b9b18a7b9fa59947eee0479d392fea9eda6c6402e40eac77c72296a1ff49c7b0962134fb60c357511a821096e6b3e78d70 WHIRLPOOL f56c23ef4df126fa496798b680f0360271f32f951fd7b00021d7f6f108a9e80d79579d7c7bbf1a81c8539ac993747714bab5661c66892779e8a2e22b3ecc7589
diff --git a/dev-python/asset/asset-0.6.11.ebuild b/dev-python/asset/asset-0.6.11.ebuild
new file mode 100644
index 000000000000..cb84e9863a95
--- /dev/null
+++ b/dev-python/asset/asset-0.6.11.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="A package resource and symbol loading helper library"
+HOMEPAGE="https://pypi.python.org/pypi/asset https://github.com/metagriffin/asset"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/aadict-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/globre-0.0.5[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pxml-0.2.11[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/asset/metadata.xml b/dev-python/asset/metadata.xml
new file mode 100644
index 000000000000..862cfb8a93c7
--- /dev/null
+++ b/dev-python/asset/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">asset</remote-id>
+		<remote-id type="github">metagriffin/asset</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/assets/Manifest b/dev-python/assets/Manifest
new file mode 100644
index 000000000000..fead29e85fb4
--- /dev/null
+++ b/dev-python/assets/Manifest
@@ -0,0 +1,5 @@
+DIST assets-0.1.1.tar.gz 29938 SHA256 c057112d731096c3856bc1121eaaa7341b3fd576b559657810bb0dfa18edd019 SHA512 373dfababd91bf28929dbc5562027c2bad14dac84d822c65e899137f5f5f9dfe3041b16dac08bc811be9b3fb2f553869643fc200ae9198eb046cd02b420714c8 WHIRLPOOL 8a580b2928c3c169425fdc886dbdc2401aeae27e0e5a19d73e4136e6d711be80b6c561ed96f2d88cd607065a4b4e09bf6c4c2b8d1bcb31ffb7f74467ec44b29e
+EBUILD assets-0.1.1-r1.ebuild 634 SHA256 6c1ba83badd6f47362f342d4af41e1cdf48bff7e75fb23ca11f080d149989f2c SHA512 d480b4b601398a6708dae0ee1e649913a8669ad64c8e58e5212f63a925f5728b0458ca325f50943b73455106b9821046b805ad761f74cc736355bc33a35b21df WHIRLPOOL f885397808efb6065242a2039d52a0540d1881654d31169c669e4a739200310688d5463a4f0089f696a0e1277320e90c7166156e1e1d20856a9d9e9d38e1872f
+MISC ChangeLog 2432 SHA256 179c3c0818894eb39427a2318c9ea5db00372dce4ec8525a2454fb7f36c87cb7 SHA512 00a133efa729988cd96c1b53b9f7fc98b86a830d83507163116071e41b7cd4880637ad7cc89fca2800243a81ad8f63964a9f9940831cebb45241ccb65145abec WHIRLPOOL 8515898598c96ab779d931c607554743e89340a46419255ebe6772a7a7ff190bd524645ff53c7b329e853880e4f37a4eb8346e34a98d94524fe07e1acf2bb833
+MISC ChangeLog-2015 1299 SHA256 49688695fcda1b42f215af49c8bd3f14c07c4aadd84019ecedb5e2fc30b36ad4 SHA512 1655337690ea22ecedfca13ada89eb0b7997db89aa70a911b56e82a952c028973cdc19e4db3710e7b46a3520b8f2412f9edae53facdddad77b8824f7c18f5b1a WHIRLPOOL 463464ccefcb585f74512ca9ecce82eb4250c07cf9fae60059e7bd1a36530eaaf7bc08769bb6483c7b30d266879cc40aca5afc408305b0dadee1bc091910cbb1
+MISC metadata.xml 806 SHA256 37e260fa7aa9e46b334da24dd840bc4e6239a66f8ebc7fdb93f9137d9050dcd8 SHA512 4cbfc3aa5ef56026ed27e1482dafd3bbb68c1aafc821a707dce7fb266cae57153963b2532a13b3c614a1f898e4401a5f5699ec45e79a63db564260676aae6826 WHIRLPOOL 96868270f6b253ed8d8dc4275ec0683cc18928bcc2e493609767d3809ad1454a9190c2d13bc7851ad11f2d85d3e8e7403566628f8a3580cf5cd41cbd4d8fef04
diff --git a/dev-python/assets/assets-0.1.1-r1.ebuild b/dev-python/assets/assets-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..90fb8ed2e423
--- /dev/null
+++ b/dev-python/assets/assets-0.1.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cache-friendly asset management via content-hash-naming"
+HOMEPAGE="https://launchpad.net/web-assets"
+SRC_URI="https://launchpad.net/web-assets/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	# The package tests assert on '/tmp', bug #450540
+	local -x TMPDIR=/tmp
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/assets/metadata.xml b/dev-python/assets/metadata.xml
new file mode 100644
index 000000000000..919f6b2529a4
--- /dev/null
+++ b/dev-python/assets/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+	The assets package does content-hash-naming (aka URL fingerprinting) so
+	you can use aggressive caching headers without risking that a client might
+	have an out-of-date version of an asset in its cache. If the content
+	changes, the content-hash-name also changes, resulting in a different URL
+	for each bytewise-unique version of an asset
+</longdescription>
+	<upstream>
+		<remote-id type="launchpad">web-assets</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/astlib/Manifest b/dev-python/astlib/Manifest
new file mode 100644
index 000000000000..2978036c4213
--- /dev/null
+++ b/dev-python/astlib/Manifest
@@ -0,0 +1,5 @@
+AUX astlib-0.8.0-system-wcstools.patch 1129 SHA256 12752b04257ff260747be1ef2b2ff68eeba9c92c0f99f61d8202a5f5390a8c02 SHA512 8e6684cc1899aa5f5c995ea128643cbf07adb114901a07c30c45a8718f8f031aff2f67c91bca802caa2049463f41f1e064cd000a51a00f79c82a921d05f7cee8 WHIRLPOOL ba61f0c8e294f8c6691b400e5783cc5577fa8591a4a022bb637be682b22ce9d850a7e3533d20d317850bc2e2d7a966c9f971e3246a0589335afe9655b4ee0a14
+DIST astLib-0.8.0.tar.gz 708939 SHA256 82561909296bc7f461846c984f2c02f0c7e0dcd62a5547573b1352d5328ffa8e SHA512 44e3903c1353fa69841a28e61e52f9cb7165edfffa2eba17cbf6bfd671ed8e8745cf2364b418a3f012bb56088fa7912ef0b00d8c9d96f7b4ce196881b4b05a31 WHIRLPOOL 3dd12e47d03fc712f61f35963ad8f3935657420b1bdff12f59a9c41cfecf755096a22cfb184610127f7869d0bd4e12f7afe48ad95b4d301e054b705a77552c32
+EBUILD astlib-0.8.0.ebuild 988 SHA256 1d347e7a57a3f0c16b436fa05342be81f5174ee5130db8a9a1b7d0ddae2b25c3 SHA512 f8d928e2bddbfb13dd86063b54270d4f9aafbe5f38f1b4c3a2d3c58010e651249de355c3a33e5969d3717312dd3e8705a9c944ed2290d43457e636192aaff24d WHIRLPOOL 2fb127195a25e99a31530f0e5641fd025854876bcfb76eec381f8e576f1687283d229d3e597cabbea57d7eec0d854caea167938a4c95299994a51c4105a79ed2
+MISC ChangeLog 356 SHA256 554f30c43b86fa43c19b2329fa9dd4ef9f31dfacbab3a509e7ce6771692fe0bf SHA512 601a91340ea568b167d87390a7967225b3c4ca37ce0f539b16af2ab261314f935796c58c9835e88fcdc21565cc03d75362bb3c6129a00d606b8e4859e3f2e8f1 WHIRLPOOL 17f5920a0d51ea305dcc2f935c99d533166ddaa9e26378de6d39f7a758bea48e04afa2dca4e1a4c114ffc285de19f5ad45f4d2d4a90cd9af0a8e23dca5dcdd88
+MISC metadata.xml 870 SHA256 dd84fba55f1dd47256d1f1a62fef38f2387089e3ea58331f9e45249affb066cd SHA512 015e4d3a47a6ca0bcf94d9926d13f46c2787967c0aa3c8c0ca89b7bf52f70841cd5c81f800b96426c03343126c33698b0ed2064d59094405a4d7ae108b4477dd WHIRLPOOL 8daf76c7b2ad09c721c5c7101aea707ccbfcb39a74ba5ca41e811ac304c51c94a35b8448e0a0d627ffa974b6a2430058142ee1dbcffdcb12f1ac68649d5e2474
diff --git a/dev-python/astlib/astlib-0.8.0.ebuild b/dev-python/astlib/astlib-0.8.0.ebuild
new file mode 100644
index 000000000000..0ce207391bf0
--- /dev/null
+++ b/dev-python/astlib/astlib-0.8.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MYPN=astLib
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="Python astronomy modules for image and coordinate manipulation"
+HOMEPAGE="http://astlib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2 LGPL-2.1"
+
+IUSE="doc examples"
+
+PATCHES=( "${FILESDIR}/${P}-system-wcstools.patch" )
+
+DEPEND="sci-astronomy/wcstools"
+RDEPEND="${DEPEND}
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MYP}"
+
+python_install_all() {
+	dodoc CHANGE_LOG RELEASE_NOTES
+	insinto /usr/share/doc/${PF}/html
+	use doc && doins -r docs/${MYPN}/*
+	insinto /usr/share/doc/${PF}
+	use examples && doins -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/astlib/files/astlib-0.8.0-system-wcstools.patch b/dev-python/astlib/files/astlib-0.8.0-system-wcstools.patch
new file mode 100644
index 000000000000..5b8746fe07d1
--- /dev/null
+++ b/dev-python/astlib/files/astlib-0.8.0-system-wcstools.patch
@@ -0,0 +1,33 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Use system provided libwcstools instead of local copy
+ Also, build the swig wrapper from its source file.
+--- a/setup.py
++++ b/setup.py
+@@ -84,12 +84,11 @@
+     PyWCSTools is distributed (and developed) as part of astLib.""",
+     packages=['astLib', 'PyWCSTools'],
+     package_data={'astLib': ['data/*']},
+-    cmdclass={"build_ext": build_PyWCSTools_ext},
+     scripts=exampleScripts,
+     ext_modules=[
+-        Extension('PyWCSTools._wcscon', [sourceDir+"wcscon_wrap.c"],
+-        extra_objects=oFiles),
+-        Extension('PyWCSTools._wcs', [sourceDir+"wcs_wrap.c"],
+-        extra_objects=oFiles)
++        Extension('PyWCSTools._wcscon', [sourceDir+"wcscon.i"],
++        swig_opts=['-outdir', 'PyWCSTools/'], libraries=['wcstools']),
++        Extension('PyWCSTools._wcs', [sourceDir+"wcs.i"],
++        swig_opts=['-outdir', 'PyWCSTools/'], libraries=['wcstools'])
+     ]
+ 	)
+--- a/PyWCSTools/wcssubs-3.8.7/wcs.i
++++ b/PyWCSTools/wcssubs-3.8.7/wcs.i
+@@ -14,7 +14,7 @@
+ /* %feature("autodoc", "1") */
+ 
+ %{
+-#include "wcs.h"
++#include <wcs/wcs.h>
+ %}
+ 
+ /* WORKING */
diff --git a/dev-python/astlib/metadata.xml b/dev-python/astlib/metadata.xml
new file mode 100644
index 000000000000..acde5aed73f9
--- /dev/null
+++ b/dev-python/astlib/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="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  astLib is a set of Python modules that provides some tools for
+  research astronomers. It can be used for simple plots, statistics,
+  common calculations, coordinate conversions, and manipulating FITS
+  images with World Coordinate System (WCS) information through
+  PyWCSTools - a simple wrapping of WCSTools by Doug Mink. PyWCSTools
+  is distributed (and developed) as part of astLib.
+  In Gentoo, PyWCSTools is using the stock library instead of the
+  bundled one.
+</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">astlib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/astng/Manifest b/dev-python/astng/Manifest
new file mode 100644
index 000000000000..e40e8248f5d0
--- /dev/null
+++ b/dev-python/astng/Manifest
@@ -0,0 +1,7 @@
+AUX pypy-test.patch 1863 SHA256 261e06853dab43c55def0dc86a8380a80faf3e3364287850f6b9764d801419da SHA512 474805cd55ae930b3d2f0595549b74f8a718ad21de016204367f5513d69afc5a6ad4f43b44162a5b752a820f642ef5600c2c3f7e7111839b1d3ef0d95a7819ad WHIRLPOOL 14c14112d7c9def7096f97a44fedd82b5b042c96e098210cc4c6fb07502a702f5c86130e134d291f8754e8cc00a74733b972ebc84b36496bc74be945add2060b
+DIST logilab-astng-0.24.3.tar.gz 106660 SHA256 e08fba39689e5a4dfa175749874811e516f019656544874defe05154073f69d4 SHA512 fb1e46ebf7111d727cd9d187968cb349dc23dfba0d4d8c6c793a8c081d4506f11e488074cc51b632c525aa264cfa50279dda90f0cf35dc2120ebbf4714902525 WHIRLPOOL 75941724a2c4448a27b37750a83dbc04e4a02540233418b0eab364a3ddfdc3a5e03efacc58422d7fb6f68609f126e269c662aa17dbc395067b45182155559589
+EBUILD astng-0.24.3-r1.ebuild 1574 SHA256 15c8f317f715ad99ca5e58b492cdc1c2ce8d110839c16c0e1807ea27320d442c SHA512 5188cd9656a0bd967691bbbc4a28c091de93cc2044fdd4bf60668d4f5ac69c61575214f67485dbdfd1ee01364c6be23b608877a7cdfaa810e91418993e188a1f WHIRLPOOL ec3f784337a38b2ba9e985d0dd712345a8c4b6c8ff7ce313b36f5220ca144ef432d49a99442be62c764db730e104c856c95ec02fb2e21d9127d217e8a2bc0581
+EBUILD astng-0.24.3.ebuild 1470 SHA256 522e6094ab307ca758c6f6735d74f6c0c4bdaf16e9793dfcb645f50106ae2ce4 SHA512 d9023e522a2d1961150f5b14f96b290497f1ccb70166846860f585de6d8c7b063124e214c335e74938b364342c3bb58239bfee7615853712efd2adc6e3b49b71 WHIRLPOOL 1662120f92ead832edeaa033b0b0d783d1b8ada1fc10083e47fad90fcc05ae38346586bf4d51bf319524e18ff3734283c5fd3120f6a03a35f92a8e209ae483c9
+MISC ChangeLog 2718 SHA256 82bf6c1466a737d504f60c57b1c4fcecb9cce06a74137887a5943aa40038120b SHA512 30a3a4a29d14e2ab173ebcdccab77f970cf7834831ad74d43e6d3609a60a06d84c9a1fb01104fc5475911a21c6eb225f8d2826862753d0ee1e66de62ddb046d0 WHIRLPOOL d31d1ec225f646ad18f6ada54aa5b1bb282daebe8698cddb407b623b7ba63f544ed0321541874e6a9cf40133ab2cdb55e4ada66b6900cb219cc75d4c1fc18f7e
+MISC ChangeLog-2015 11553 SHA256 7b1f5e7f02aa7b6f089102d59c0b0506a7480d1b3186ac10b312874710ccb580 SHA512 ae2ea264f0e7d588f84107bd4e85b3cb970b1515b6fcb84bf2d2ac77c1b6a62cd8bd9187620913a52b4221a3bd5d9a68e3202020c4dc7c229aaae195f9bedfdc WHIRLPOOL 107957bb3a95c57df29b29e2cffb85058e1e544324db4adf55237cb8510685b68e66859c505b8a7cdb325cc114cf33fff24f127e1ea82eaa1bdea7bb0bb94c93
+MISC metadata.xml 1068 SHA256 805aa8de63143d3ad9be5539436bb67a5b8ed8f53a27571c39e5bff838de30dc SHA512 c31304cd3895351242c47fef547bc6277421cc634b63862bbb84de081b0638a3020a6347510fff386d78aad432ee6382f8d7f4e1766aa1af32c2b44e83425cc2 WHIRLPOOL ef1441f5ccdea220f5e2838cfda96a0ae22740213fbd0c1a18ebb9c45757fb5818c40af60873a714b744b4e8acc9638bd5e28b3c2ed2eef15dfeba1ea0ac2df6
diff --git a/dev-python/astng/astng-0.24.3-r1.ebuild b/dev-python/astng/astng-0.24.3-r1.ebuild
new file mode 100644
index 000000000000..3355475067af
--- /dev/null
+++ b/dev-python/astng/astng-0.24.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="http://www.logilab.org/project/logilab-astng https://pypi.python.org/pypi/logilab-astng"
+SRC_URI="ftp://ftp.logilab.org/pub/astng/logilab-${P}.tar.gz mirror://pypi/l/logilab-astng/logilab-${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+IUSE="test"
+
+# 1.2.2-r1 for namespace files
+RDEPEND=">=dev-python/logilab-common-1.2.2-r1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/egenix-mx-base-3.0.0[$(python_gen_usedep 'python2*')] )"
+
+S="${WORKDIR}/logilab-${P}"
+RESTRICT="test"		# erroneous failures
+
+# a wit; pypy reports astng modules differently
+PATCHES=( "${FILESDIR}"/pypy-test.patch )
+
+python_test() {
+	distutils_install_for_testing
+	# test target needs unpacked test directories, doesn't like binary egg
+	esetup.py install_lib --install-dir="${TEST_DIR}"/lib
+	#https://bitbucket.org/logilab/astroid/issue/1/test-suite-fails-in-0243-under-py32-pypy
+	# Make sure that the tests use correct modules.
+	cd "${TEST_DIR}"/lib || die
+	pytest -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	rm "${D}$(python_get_sitedir)/logilab/__init__.py" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/astng/astng-0.24.3.ebuild b/dev-python/astng/astng-0.24.3.ebuild
new file mode 100644
index 000000000000..3026a1ad64d0
--- /dev/null
+++ b/dev-python/astng/astng-0.24.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="http://www.logilab.org/project/logilab-astng https://pypi.python.org/pypi/logilab-astng"
+SRC_URI="ftp://ftp.logilab.org/pub/astng/logilab-${P}.tar.gz mirror://pypi/l/logilab-astng/logilab-${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
+IUSE="test"
+
+# Version specified in __pkginfo__.py.
+RDEPEND=">=dev-python/logilab-common-0.59.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/egenix-mx-base-3.0.0[$(python_gen_usedep 'python2*')] )"
+
+S="${WORKDIR}/logilab-${P}"
+RESTRICT="test"		# erroneous failures
+
+# a wit; pypy reports astng modules differently
+PATCHES=( "${FILESDIR}"/pypy-test.patch )
+
+python_test() {
+	distutils_install_for_testing
+	# test target needs unpacked test directories, doesn't like binary egg
+	esetup.py install_lib --install-dir="${TEST_DIR}"/lib
+	#https://bitbucket.org/logilab/astroid/issue/1/test-suite-fails-in-0243-under-py32-pypy
+	# Make sure that the tests use correct modules.
+	cd "${TEST_DIR}"/lib || die
+	pytest -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	rm "${D}$(python_get_sitedir)/logilab/__init__.py" || die
+}
diff --git a/dev-python/astng/files/pypy-test.patch b/dev-python/astng/files/pypy-test.patch
new file mode 100644
index 000000000000..42cb3864b43b
--- /dev/null
+++ b/dev-python/astng/files/pypy-test.patch
@@ -0,0 +1,36 @@
+diff -ur logilab-astng-0.24.3.orig/test/unittest_builder.py logilab-astng-0.24.3/test/unittest_builder.py
+--- test/unittest_builder.py	2013-04-17 17:38:31.000000000 +0800
++++ test/unittest_builder.py	2013-06-19 02:13:51.425269363 +0800
+@@ -62,8 +62,12 @@
+         self.assertEqual(name.tolineno, 4)
+         strarg = callfunc.args[0]
+         self.assertIsInstance(strarg, nodes.Const)
+-        self.assertEqual(strarg.fromlineno, 5) # no way for this one (is 4 actually)
+-        self.assertEqual(strarg.tolineno, 5)
++        if hasattr(sys, 'pypy_version_info'):
++            self.assertEqual(strarg.fromlineno, 4) # no way for this one (is 4 actually)
++            self.assertEqual(strarg.tolineno, 4)
++        else:
++            self.assertEqual(strarg.fromlineno, 5) # no way for this one (is 4 actually)
++            self.assertEqual(strarg.tolineno, 5)
+         namearg = callfunc.args[1]
+         self.assertIsInstance(namearg, nodes.Name)
+         self.assertEqual(namearg.fromlineno, 5)
+diff -ur logilab-astng-0.24.3.orig/test/unittest_inference.py logilab-astng-0.24.3/test/unittest_inference.py
+--- test/unittest_inference.py	2013-04-17 17:38:31.000000000 +0800
++++ test/unittest_inference.py	2013-06-19 02:52:41.618270007 +0800
+@@ -710,8 +710,12 @@
+         node = get_name_node(astng, 'open', -1)
+         infered = list(node.infer())
+         self.assertEqual(len(infered), 1)
+-        self.assertIsInstance(infered[0], nodes.Function)
+-        self.assertEqual(infered[0].name, 'open')
++        if hasattr(sys, 'pypy_version_info'):
++            self.assertIsInstance(infered[0], nodes.Class)
++            self.assertEqual(infered[0].name, 'file')
++        else:
++            self.assertIsInstance(infered[0], nodes.Function)
++            self.assertEqual(infered[0].name, 'open') 
+ 
+     def test_callfunc_context_func(self):
+         code = '''
diff --git a/dev-python/astng/metadata.xml b/dev-python/astng/metadata.xml
new file mode 100644
index 000000000000..b7ac41e3d53b
--- /dev/null
+++ b/dev-python/astng/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">The aim of this module is to provide a common base representation of
+  python source code for projects such as pychecker, pyreverse,
+  pylint... Well, actually the development of this library is
+  essentially governed by pylint's needs.
+  It provides a compatible representation which comes from the _ast
+  module. It rebuilds the tree generated by the builtin _ast module by
+  recursively walking down the AST and building an extended ast (let's
+  call it astng ;). The new node classes have additional methods and
+  attributes for different usages. They include some support for static
+  inference and local name scopes. Furthermore, astng builds partial
+  trees by inspecting living objects.</longdescription>
+  <upstream>
+    <remote-id type="pypi">logilab-astng</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/astor/Manifest b/dev-python/astor/Manifest
new file mode 100644
index 000000000000..99c7878d988a
--- /dev/null
+++ b/dev-python/astor/Manifest
@@ -0,0 +1,5 @@
+DIST astor-0.5.tar.gz 10999 SHA256 4abff251d3f03cbe99106cc16e0dc94adc4f88d580c34a717741c7090b76aab9 SHA512 7c940371a6c3ddbc4a6691edb6ee17eef61436912bb873c5c0cba4f3865c9d4f8e077674b14ccc7e319b749898782aaf87e085eedd9ba7f8638130deb67f549b WHIRLPOOL fcc82e25305a291f6884b2d18c8316b55902c6334962203c8b504e79a563e09173b7fa0da29276c12cf42e646a268d71b5dd6365990517379f211d1da343562e
+EBUILD astor-0.5.ebuild 710 SHA256 984f7a1d99b3305be59e8fede550e6b6ec15165927481f5f14554b542a393c07 SHA512 a7ef07b64b675c8356543100a5ecceb111d8d2c19267e0b70e99a77194ad68316ccbf3dbf10ac73c844dacff8638b290ecd973b7ea1f3ed85877b841c5018448 WHIRLPOOL daf26ace2a384d4391ba2ca105d6ab45e7515384448ad6235b0e74e264cd3529c62e388d47584cf2b3e8e71ec935ae6d1c5e5cfa50a2746535ceec9aad74572f
+MISC ChangeLog 3049 SHA256 821197d284ddea95e23afa25041c460366a62a602ed88ebf187a3a7c5d80cfa2 SHA512 f1698b55358943671f1ea872a759cb39adaae94fced1db781e325e9fef5102bb466edc403247a12845f2b24cd816a7c997eb2bf69a014e7e068615759457e76f WHIRLPOOL b87ee3e97635d52919f458af3c9a23e47f8460d86287e8a8e64693f6b944a777aefbb26d1185e859a085d46e33132345ed356d80ecb5e3b10b9a75159a7a534d
+MISC ChangeLog-2015 1068 SHA256 31814b38f6d633b18954bcf25f42d65fa55f866a99ba4b8e036cf51f3c8f2caf SHA512 9746c99f7250250925dd5e045bc1e2876247e9552b87c5f99f9fda4816498d351322385d4d7a9c1157f992df0fbc666be44ff2cfb92cf044c3bcaff6d54349bf WHIRLPOOL b4c602676667a32e487d163dde5b8c9fb483ae34ed957a7b83fb1d5d24e796d581bc398a04b25d216a33030ec148255f2f6ccb95b6c8907363313efd9a72cce2
+MISC metadata.xml 308 SHA256 b20d9c005869543ccd9e4bbee4a9d8815f6170f54ddeab369cedef5659df34ca SHA512 86cbc23c8c077f9849004214ba32c5096e64ea8092ff1940f3fb4c9bf4fd420f2883aed76a7b96774f639cb98ef14429a9e55993db07173443ee16b3ac393aab WHIRLPOOL 754b5ed6110f5a587e910183c2baa787ac05c7b343924ceb5bcf5cc209fd9070d7b088ac33d7168300d9f6e7d1cb6a943e94fb21112109d1a722fbe06756b550
diff --git a/dev-python/astor/astor-0.5.ebuild b/dev-python/astor/astor-0.5.ebuild
new file mode 100644
index 000000000000..312f4548ffb4
--- /dev/null
+++ b/dev-python/astor/astor-0.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Read/rewrite/write Python ASTs"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="https://pypi.python.org/pypi/astor"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	#avoid file collisions picked up by the eclass
+	sed -e s":find_packages():find_packages(exclude=['tests']):" -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" -m unittest discover || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/astor/metadata.xml b/dev-python/astor/metadata.xml
new file mode 100644
index 000000000000..d860d8c96b03
--- /dev/null
+++ b/dev-python/astor/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">astor</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/astrodendro/Manifest b/dev-python/astrodendro/Manifest
new file mode 100644
index 000000000000..b2a590fdf271
--- /dev/null
+++ b/dev-python/astrodendro/Manifest
@@ -0,0 +1,3 @@
+DIST astrodendro-0.2.0.tar.gz 4594802 SHA256 fa4fe942d1c6d80224bb8930fb5455275c70cd10211412634139bdd91fa1fce8 SHA512 2079e2844537b74b8c40a5e2d9c04a2e7940f12fa0ac77dc95f39d7ea623ad43d8635043336f5cedff6076599a44c4b8908dbd0b67d33c47310408496bce1b1d WHIRLPOOL 6cc56dcf8af8e7ea889c6c266e80de155eb1e10c38fc11c4e4b328bc78f23895a38bee45488499ed2a08b8cb3662e14a9a8d0b1adc6d5b29a850e0c70a7944bb
+EBUILD astrodendro-0.2.0.ebuild 1363 SHA256 cc2d3d6f33140851d70f1226d68a1bc1c1b7a29271dc1f8cfcb6620803e6bb47 SHA512 ae654fe0c9af5b33d407d5e3f457434209c957ead1a391310e2dc956dd3cca4abc81ca3ec64a5301dca042a5490d4cd361487ebb455fe3be66a8797564fed86f WHIRLPOOL f23ab76a4bb606c94def09d6873f67ee54ffaab3b886f480b5867ec30223bc50fd19bdcfb10ba9ff12dfdcfbf52db0917c744300946a4310117ad1d42559d572
+MISC metadata.xml 530 SHA256 3579b686589c3932e0558c8b4934c1bad21eb0eb2193db2e62a7ddfe045044e4 SHA512 939a42e5c9eca1901749e5ab2242cdd375df94cc85a68076825023a4bd48d7866400023b74d2ae7271d638bb706155cebb049b9e190aed0b286055937b9f8aa4 WHIRLPOOL ad440fbe815a5ac566c012559372a16fcaece88bb7e99181a1b847fa73bcfa367813a490c746ebab4b5398e56dc0245c0fe86ebcf20d433231ba00e16d0ddb67
diff --git a/dev-python/astrodendro/astrodendro-0.2.0.ebuild b/dev-python/astrodendro/astrodendro-0.2.0.ebuild
new file mode 100644
index 000000000000..44e8df2fdff0
--- /dev/null
+++ b/dev-python/astrodendro/astrodendro-0.2.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 xdg-utils virtualx
+
+DESCRIPTION="Python package for computation of astronomical dendrograms"
+HOMEPAGE="http://www.dendrograms.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/h5py[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+	   dev-python/matplotlib[${PYTHON_USEDEP}]
+	   dev-python/mock[${PYTHON_USEDEP}]
+	   dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# use system astropy-helpers instead of bundled one
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	xdg_environment_reset
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_sphinx --no-intersphinx
+	fi
+}
+
+python_test() {
+	virtx esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/astrodendro/metadata.xml b/dev-python/astrodendro/metadata.xml
new file mode 100644
index 000000000000..ea17c673072e
--- /dev/null
+++ b/dev-python/astrodendro/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    The astrodendro package provides an easy way to compute
+    dendrograms of observed or simulated Astronomical data in Python.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">astrodendro</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
new file mode 100644
index 000000000000..3d8e26dc286a
--- /dev/null
+++ b/dev-python/astroid/Manifest
@@ -0,0 +1,13 @@
+DIST astroid-1.3.8.tar.gz 155302 SHA256 3971c35c675dc7acfceb636eb1758b7df9fc3ad75b5f81ca89f57ccf51719442 SHA512 316d3a6a12d95b3bebe7ffe47de840cbff96f357c7c324f6684bb713bca191cfaf87fe226c3c1145049611a2035890bdf11845bf923f7d0087a0d1e565d5d5c5 WHIRLPOOL 456ebef20c278047ae0e85fb1386f63eb7c13dda295ddace9704df5255b5004887f6f5201097b2337cc678a9891f33aa5628cbf7acc01c4eb9ff3dc3c091408a
+DIST astroid-1.4.8.tar.gz 184091 SHA256 5f064785a7e45ed519285f2eb30b795e58a4932a0736b32030da6fef3394ddb3 SHA512 54bb20edf5518b417470a2d63210802b267fe727f9d30e1ac5000db00a7894739b1c4249468fb55df81b55d382f3a5bbe019876141f7ee4d94040fd699dc0c2c WHIRLPOOL 1d1d4ea2c14057a42023d776cc65e50c965f20cc0b37ad62fbf77446a8bba07669b5a3aae92c9987c232e9a639fe330d0a0dd05980c030a531dbda3040de0c48
+DIST astroid-1.4.9.tar.gz 189315 SHA256 a483e7891ce3a06dadfc6cb9095b0938aca58940d43576d72e4502b480c085d7 SHA512 9091afbeffeae3f10a5f4b0dfb476ed5515661744508dde159bb3faa4af032c6359f4544cc3766a6613974f7725e6f8e28bad45bc68e3282764def019a233303 WHIRLPOOL 296973dbbf853766e424a5bd5f5ac7a1eae29f2e4d28efe75eeb4751e4265038c425f20fb186a5038c53b33c862a6610605af673706e0c62e871450b33872b00
+DIST astroid-1.5.2.tar.gz 240007 SHA256 271f1c9ad6519a5dde2a7f0c9b62c2923b55e16569bdd888f9f9055cc5be37ed SHA512 e8e4facc34f7a5ca1128961c3134d3adb0e59437aa38ef567bfe777b94215fedc32ae524135c6d376a3bc648c851d59315f4caadac684d7576e582e5d9e3b2fe WHIRLPOOL 084cfcd38379df10193bcf32ddb2b70737a10f058847f02c9b26bb6971d32bba2a031bb2f26a09fc52748bca84f525381c56168edc03220d9fba588c7213d111
+DIST astroid-1.5.3.tar.gz 240617 SHA256 492c2a2044adbf6a84a671b7522e9295ad2f6a7c781b899014308db25312dd35 SHA512 2a224d9bf8e41059a1316d80738cdc0f1e4c4e0f987baf3969710bae7192466b708c7942cd7e4eeccea55582ce70bb687c96b9e7dece3229ae4cffc558aa2319 WHIRLPOOL e1843a668b6a13bbbd9428c1e0b7399d7fa0ce79496edd7ee490f465930703e25c6a814eb8bf500833de2306c0e3a19162bd675ec01c546e33e3827557f1af68
+EBUILD astroid-1.3.8.ebuild 1073 SHA256 8e7c791ed0ef139a4dd186bc6dcd7935848d4b5c61e3b380c3f790ad7b5f499b SHA512 149f2808e81d785545f3397f064e02af6bc0d94964f8de1ef241a9645ed539d1ad1593edbb13ea5b6c82c95ac7efe1ccde29cd3d36494fe9a750b267e25bdff1 WHIRLPOOL 411b996f18f2a767cff5ee5e0d1bb0c97381753c5de1d20bea8f86fdba0033407a7d4d98b0f53898f3f6ff05bb627c3c6a82d3f17ca27daaf3ec347ffd96d5b9
+EBUILD astroid-1.4.8.ebuild 1096 SHA256 b8c794daca57d5cca556b3a2e01cab3091c90cc1f59a41e76817edd18aefe36e SHA512 149b74ed93283dd9ace74311b313e93ad200e08c5056135c69da7117770361e7f0d958d309c482e8ef580665d4fc4c0ca41113deaabdd119c1df33904ce471b4 WHIRLPOOL 08e290df2c6e8ac72d531c6bcb4e88da31a46b592000e6ab0c4523045591279f001edc00e873f5f4bd536d6fec91b082732308e5755405c93d417b61e322e761
+EBUILD astroid-1.4.9.ebuild 1220 SHA256 7e3be670c8327129e1b48026340324f787e1cddad54909cf0424de7f8a1812fc SHA512 db99782868dfac9a4af91f5dfef17091f7e9a1c42ce1f2495f2a3ca1bf0b6f1bba0b82ea0c70d97e2d6d29bf54f1198c31158f4b47f1ba0a95d0978aab5c9539 WHIRLPOOL 5162dd410c532fb66cf3ffcd44ce1a9fd56071d7189d2547231e7bedc793e52c9c2a41225a0f04c60a41ddcc56f03bbbc170556d22bb51621fe84ae3b134b4f3
+EBUILD astroid-1.5.2-r1.ebuild 1642 SHA256 5198167620aa8c9109a5e5ceed9e431b42d9de8fdf84d8fb8cc809165515b8f6 SHA512 7508cb4682695048538ea7e267fd986f6559d9063791c3543a0daeb44c2469ef1896bc52f5685742c8d5d4e4d8b608302f2598f57d0ccabb19582766fede03ae WHIRLPOOL 38cab1c3ae8c0f8a8b8499d534af90f835504a98592d3c8abe44c74bbd7efd68a1d15be5ff913eb0abd40cc7d4eb518f79f8ca62cbf343c7ec4aa64a3db5e588
+EBUILD astroid-1.5.3.ebuild 1662 SHA256 19ba3b13ea0aa15a80c04998a53b210e516ead02f920e1fd1d58067f123867a9 SHA512 0b6b2716cce18d524a1b5a656246ef5e0f83e451ea3e1f21a649392bcc7aa9e45e005b0e3a733a40844afa7d299507b4fdf3b99f0cd52cf2fc133b346699d4f0 WHIRLPOOL c5d273c37e0246038fd9d54740fc82c1b31159a428e7a9a0f60ce94102c9d35673a445add72bb5f88422a553d14a68608f458a53a73f5c89d65a64cf0d79ca1c
+MISC ChangeLog 5322 SHA256 224f6635132e7361368d7d0cbe2a1f609380cacfba270a5e63f3c60408d7e7a1 SHA512 05c3e717a7c2b4112dbaccba612241c69b7518aa665a62ecfce236bf3d55019725ed75e2f12a954b288efb48edb9ec37dd5e9fc4d32f9819b4b68529e497d9da WHIRLPOOL e10f839dc4d6637f1bb97b00be3d47dc10b2e454d6233cc38e0443503d0ab8aaeeda12fffaf2d3f39d123abedc3694e3de5a6e0a0de401b6d465f9ce8b843e9b
+MISC ChangeLog-2015 3582 SHA256 d8e592b7da34c554ea37ccdc2e231215bd0fc6859b6d415849c8cdbb157b8085 SHA512 1fad591458cbb1329badb577b4d71131a98ecc7a3481f15ac4e43a3520d85d85437badb8f9bab69609ef8fe3f10ade3b10c9cf503627c9c93e8b1c8cca7d74f8 WHIRLPOOL 038702ea2d918679e1c8c7b3ae6f3a3e03f33fa1e948edb0d9986627872e02b250e29c03735500f117c5ad40f68585b16db0a18a89ae12cd86fe3288c302f807
+MISC metadata.xml 1122 SHA256 931dc9518f2fbb777ec424769d47977252b30453f11bf47faf8388e062a8f01d SHA512 34a45382d84c03057ba59b40905138c2e048da4d602e5a26dab4b156c1a3697369e11ef66f451f3f823ec827f3771eb58c077c056f9609e5b55a27841fd5bf9d WHIRLPOOL 60303c70b000289bced472310ab29a80980f9918a72b8919f704b0f04919e593e9d705123c11ca36f08995b77485a3696d10bc7cacdd926d13f9523c1e0d0668
diff --git a/dev-python/astroid/astroid-1.3.8.ebuild b/dev-python/astroid/astroid-1.3.8.ebuild
new file mode 100644
index 000000000000..e8fc068acbd7
--- /dev/null
+++ b/dev-python/astroid/astroid-1.3.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.python.org/pypi/astroid"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
+IUSE="test"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/logilab-common-0.63.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pylint-1.4.0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7)
+	)"
+# Required for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	pushd build/lib > /dev/null || die
+	PYTHONPATH=. pytest || die "Tests fail with ${EPYTHON}"
+	popd > /dev/null || die
+}
diff --git a/dev-python/astroid/astroid-1.4.8.ebuild b/dev-python/astroid/astroid-1.4.8.ebuild
new file mode 100644
index 000000000000..a036950a5464
--- /dev/null
+++ b/dev-python/astroid/astroid-1.4.8.ebuild
@@ -0,0 +1,41 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.python.org/pypi/astroid"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
+IUSE="test"
+
+# still broken
+RESTRICT=test
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]"
+DEPEND="
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+#	test? (
+#		${RDEPEND}
+#		>=dev-python/pylint-1.4.0[${PYTHON_USEDEP}]
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#		$(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7)
+#	)"
+# Required for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	${EPYTHON} -m unittest discover -p "unittest*.py" --verbose || die
+}
diff --git a/dev-python/astroid/astroid-1.4.9.ebuild b/dev-python/astroid/astroid-1.4.9.ebuild
new file mode 100644
index 000000000000..d79526270f5a
--- /dev/null
+++ b/dev-python/astroid/astroid-1.4.9.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.python.org/pypi/astroid"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+IUSE="test"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pylint-1.5.0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		virtual/python-singledispatch[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7 )
+		$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 )
+	)"
+# Required for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	${EPYTHON} -m unittest discover -p "unittest*.py" --verbose || die
+}
diff --git a/dev-python/astroid/astroid-1.5.2-r1.ebuild b/dev-python/astroid/astroid-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..971e558cca36
--- /dev/null
+++ b/dev-python/astroid/astroid-1.5.2-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.python.org/pypi/astroid"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x64-macos ~x86-macos"
+IUSE="test"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' -2)"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' 'python*')
+		>=dev-python/pylint-1.6.0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Disable failing tests
+	# TODO: investigate if it's our fault and how can we fix it
+	sed -i -e "s/test_namespace_package_pth_support/_&/" \
+		astroid/tests/unittest_manager.py || die
+	# we hack xml module, so it does not match what they expect...
+	sed -i -e "s/test_module_model/_&/" \
+		astroid/tests/unittest_object_model.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${EPYTHON} -m unittest discover -p "unittest*.py" --verbose || die
+}
diff --git a/dev-python/astroid/astroid-1.5.3.ebuild b/dev-python/astroid/astroid-1.5.3.ebuild
new file mode 100644
index 000000000000..69627547ec30
--- /dev/null
+++ b/dev-python/astroid/astroid-1.5.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.python.org/pypi/astroid"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' -2)"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' 'python*')
+		>=dev-python/pylint-1.6.0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Disable failing tests
+	# TODO: investigate if it's our fault and how can we fix it
+	sed -i -e "s/test_namespace_package_pth_support/_&/" \
+		astroid/tests/unittest_manager.py || die
+	# we hack xml module, so it does not match what they expect...
+	sed -i -e "s/test_module_model/_&/" \
+		astroid/tests/unittest_object_model.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${EPYTHON} -m unittest discover -p "unittest*.py" --verbose || die
+}
diff --git a/dev-python/astroid/metadata.xml b/dev-python/astroid/metadata.xml
new file mode 100644
index 000000000000..0ca30562d0fd
--- /dev/null
+++ b/dev-python/astroid/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">The aim of this module is to provide a common base representation of
+  python source code for projects such as pychecker, pyreverse,
+  pylint... Well, actually the development of this library is
+  essentially governed by pylint's needs.
+  It provides a compatible representation which comes from the _ast
+  module. It rebuilds the tree generated by the builtin _ast module by
+  recursively walking down the AST and building an extended ast (let's
+  call it astng ;). The new node classes have additional methods and
+  attributes for different usages. They include some support for static
+  inference and local name scopes. Furthermore, astng builds partial
+  trees by inspecting living objects.</longdescription>
+  <upstream>
+    <remote-id type="pypi">astroid</remote-id>
+    <remote-id type="bitbucket">logilab/astroid</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/astroml-addons/Manifest b/dev-python/astroml-addons/Manifest
new file mode 100644
index 000000000000..21a221c27131
--- /dev/null
+++ b/dev-python/astroml-addons/Manifest
@@ -0,0 +1,4 @@
+DIST astroML_addons-0.2.2.tar.gz 51052 SHA256 c4b6e9d9f86550e1a59b54ddedf6666c7293bd7ad7b99549170e3053e57cb0cb SHA512 97c61c731d3dd8cadbfcb36defd1a678f776a2012fda1159621d3e364e25ca74cd0d284980f52095a2df31973cefba09f9b3efe72ba95b4f65ca13e4aaec5e20 WHIRLPOOL d8c7650692cbbb90f4f820804603dfdc87f5bb063ff0a1977f51c0f4c40313c4a98c50385027e35ce01ed9f02b59cc009f081c8da168397f2bb141c4f867262c
+EBUILD astroml-addons-0.2.2.ebuild 640 SHA256 b4a65d85a631178ac7cc3eaf22b54776fe6d64eb5b3aa1c70634b1c25288f8df SHA512 f5335a9f9a54fa49e1f84c6febe5c9d16e037035ddf5ff4baea176ac21db9d8f8c93c6064c20b4b8d8dad2f2fe396f4d66cf40cb4f3c311ef8522df10aab1cb9 WHIRLPOOL 445a12e8c95ff6753723d4f8abcf759f390f0b64dd1b9cfd79035afdf5980fba1c2fea6554567d4255be3ecfa90dbde98766385adf7d63307cea30f02c952469
+MISC ChangeLog 337 SHA256 926a88cc31c7f3be79a54a7710666f0aaa068a5202bb9748602c0acf068768e0 SHA512 4afec5cd66da7d0637e8beb8d4aa5a8834f52181525f6740cd0702d34bac3aa3a0b96e0713d1060c0e5d3669149989b6c8e01e7649a437800ae3a3e250c7a286 WHIRLPOOL 87780f77951dfccdd22887c7444967471144c955d24a7afd7ae48cb070d23d6eadbc0862d7221a1bc0d6cf53ff739504a8255637756e1b573759e9f14951eea6
+MISC metadata.xml 1161 SHA256 41bfbe4b0480700f44dafd1c2eb8b15bc622f94711803f461f011b8e7a107be2 SHA512 3010f13652915ec0a1daca8a0bf090e7e9e7522485080492b3fd932b2154752d56c95a586ec693bca1f6c6062e8c49e35336daf987b9119c5c97c1a8350f64e4 WHIRLPOOL bae64183c007f1af7f7c58af5e0585c4a975640314af044e89fc6f502df7b9527ea4c06d62d421337a56245b17934d34f8f06aa23c3b8620ef4b278cbc97797e
diff --git a/dev-python/astroml-addons/astroml-addons-0.2.2.ebuild b/dev-python/astroml-addons/astroml-addons-0.2.2.ebuild
new file mode 100644
index 000000000000..a5b8f5357a63
--- /dev/null
+++ b/dev-python/astroml-addons/astroml-addons-0.2.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MYPN=astroML_addons
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="Performance add-ons for the astroML package"
+HOMEPAGE="https://github.com/astroML/astroML_addons"
+SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/astroml[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MYP}"
+
+DOCS=( README.rst )
diff --git a/dev-python/astroml-addons/metadata.xml b/dev-python/astroml-addons/metadata.xml
new file mode 100644
index 000000000000..c9e92bac1f13
--- /dev/null
+++ b/dev-python/astroml-addons/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    astroML is split into two components. The core astroML library is written
+    in python only, and is designed to be very easy to install for any users,
+    even those who don't have a working C or fortran compiler. A companion library,
+    astroML_addons, can be optionally installed for increased performance on
+    certain algorithms. Every algorithm in astroML_addons has a pure python
+    counterpart in the core astroML implementation, but the astroML_addons library
+    contains faster and more efficient implementations in compiled code.
+    Furthermore, if astroML_addons is installed on your system, the core astroML
+    library will import and use the faster routines by default.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">astroML_addons</remote-id>
+    <remote-id type="github">astroML/astroML_addons</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/astroml/Manifest b/dev-python/astroml/Manifest
new file mode 100644
index 000000000000..0880211069a5
--- /dev/null
+++ b/dev-python/astroml/Manifest
@@ -0,0 +1,4 @@
+DIST astroML-0.3.tar.gz 242925 SHA256 ea6d0119593aed0e0dadc79c613ac0bddad95e6f12151237562a4fd67552b2b8 SHA512 7b9c6824ec1c09c35a0e9ea10674c93c7f301a3b15c5104357d9749534b78203c33eaac82c8ec1d1c51bdf30e1408d21002d1d2e7e243aa08c28cc7b1f1ab74a WHIRLPOOL 9f2bcc6bc9e56f7b513d7d5dc1367b3d8b1e1ae6ee4ddf9f8b917ff1f2d3952fd9d7101a876b6b820a7f30a3607997e45d0435c4929085998724c64657867cb7
+EBUILD astroml-0.3.ebuild 971 SHA256 5f73779ef9f659f7c9a14f899d19e8540e1b762be6f0ece90668c0ead391264d SHA512 20c3a938cb703ab3bb4c1c0d4b1696657ada7d36f5d7d674461e3cacb82085a73b17035e8ff05d8c5206cd74ac6c26302eed6fb937fb4856272aeec51cec8e09 WHIRLPOOL 0a5d21d575823e983427b74f6772fbd519009a2f4048d0b644f3a34cdbea78e63d1368836b62f843550fa47c8ae1c149b778b8dae2f132ef01dce8b2cb5ae68b
+MISC ChangeLog 312 SHA256 d4ce36fd239649b30013e91e8223974baa418613cb520d214866a55ff49b2f6a SHA512 cb1d2fe009aef760a62524ac5bda756cb0701b86e29f5a93e689056503f998ea9009b6adde12eb6130d2795e6636288c9906f8eb4b7b51d8127f50daf624f8de WHIRLPOOL be1c58fa6b1e200342b8b57dcc5425abca204e2b02bb50a9f41da59f712573319c627642fccb8128edbda75ff3603726466ed2f5ca6e50cd70410d0a06ee0cb5
+MISC metadata.xml 770 SHA256 7465e54566a245aaa9aa5e5a88c9652653495308a5a41d8a4719589d49f0a6a5 SHA512 b1134c879b3a47608584621255916dd406a1de7f14b4ee4cb4a6e0f241f83dc86e4e48c54075b574e063f569049f0c793293fdb13098d874be75f0860ed0c082 WHIRLPOOL 8139d9b411551fde4d583964be922303dcc87496546ed9966cd7e406a516b7ef35d738e64cabf0de221bc938b10e5920da04770967041aa9512482c2d10803d9
diff --git a/dev-python/astroml/astroml-0.3.ebuild b/dev-python/astroml/astroml-0.3.ebuild
new file mode 100644
index 000000000000..fee62f375ff5
--- /dev/null
+++ b/dev-python/astroml/astroml-0.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 virtualx
+
+MYPN=astroML
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="Python Machine Learning library for astronomy"
+HOMEPAGE="http://www.astroml.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	sci-libs/scikits_learn[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MYP}"
+
+DOCS=( CHANGES.rst README.rst )
+
+python_test() {
+	virtx nosetests --verbose || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	insinto /usr/share/doc/${PF}
+	use examples && doins -r examples
+}
diff --git a/dev-python/astroml/metadata.xml b/dev-python/astroml/metadata.xml
new file mode 100644
index 000000000000..ce125c4d77e8
--- /dev/null
+++ b/dev-python/astroml/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+ AstroML is a Python module for machine learning and data mining built on
+ numpy, scipy, scikit-learn, and matplotlib. It contains a growing library of
+ statistical and machine learning routines for analyzing astronomical data in
+ Python, loaders for several open astronomical datasets, and a large suite of
+ examples of analyzing and visualizing astronomical datasets.    
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">astroML</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/astroplan/Manifest b/dev-python/astroplan/Manifest
new file mode 100644
index 000000000000..b120428348e2
--- /dev/null
+++ b/dev-python/astroplan/Manifest
@@ -0,0 +1,7 @@
+AUX astroplan-0.2-ephem-import.patch 505 SHA256 61f9e8a3b25d18cc39eab86de9ec85ae6cd668a442d85dfebd840b3d41895440 SHA512 9ea80ff153f9da458d377eb99fefa5f0dfdf448af196150e47bd19d3c5071f975b7746c6fe91c0042e92b3349a44d7c0843025d8069084bd779ebdb7160f0d74 WHIRLPOOL 187fa28f5234569132f8d792c2fc741099cdec1160f29eb6ddfaf006165cffcda76102d79a3dcecc0b8c0b950281d150a01f88831d3ef839cf886adff01e3c0d
+DIST astroplan-0.2.1.tar.gz 270482 SHA256 eec6c517f46a881e9b24e53afca34b5313e11728739b8f2d32053775bb62befb SHA512 baa585ce2b651753b45c6bda78a93b22340b380197338ce3d27d36509c82c29053da237f1f1daf5c12ba08e0da27f7c3cc98daebedb703c944a3e225444f3aff WHIRLPOOL a58611d7b4099b24209dbeea84078794f594a3ee5d088d41ce93ce74c1904c3a4396ea030b0c013973249d53df2d67068f652cf28275d359ba63fb022fbb51e8
+DIST astroplan-0.2.tar.gz 264623 SHA256 427d6a890ea7bc4df0b8d0a4b607d060e6e2b230fa1224a648217790d8c1cba7 SHA512 ab98402d2b0daf64aea4a10934c8e33097b92d3b7de9a2346fa3e318e672c85966c050f560bb3fc4c247e2fdd4c94a4b158d6a0dff6af9c83d6411613c663bd9 WHIRLPOOL 6ab4ca9daf2daa8a6a16b06b7287473f149cf3261b2ef35a8f29a24f67e7c0d32edeef59c03fd1fe77f3050670a4c9488b4defe6e417f4925581ca300ca6a8f1
+EBUILD astroplan-0.2.1.ebuild 1475 SHA256 12c92290f0761a948f7b5f17ee16975fdccc278a28e968b13bcb3e6ea491d1c7 SHA512 3ca8b8adab62180568c7a45bdc18b9bc38c0286384cc6bfbd214e2a6b31fb30c0b96456eb2272a1878fef74009fa81ef9684d9c690dae7c8577e46489ef29598 WHIRLPOOL 3f67e88ff823ee316ee17fb3f9479ad12bd2e589479deeb48f0a901d0f665bc52e98b6fdaada61ef513b699bcdb89bea048223a4bc144a850010d9a15ebbe83c
+EBUILD astroplan-0.2.ebuild 1466 SHA256 b81deda1d11c693d018a5bdaa9e356ce052193f61bd6e7564f2b150d2b6d9db0 SHA512 09e98ddf77eb2d54edf399ebe711d0fcc87b85b19be63a162b467336e623b9a7e1880c25d3a73632fd512fb8da3c8edd308f057351e2750c2b5108a4f137c8f5 WHIRLPOOL 5466fbc56231b032f718ce577da1325bb1ae925ed6a9df29e46886b0e68cce810bf9db8786ace91f9d047d6f5e3488ff795208d8ed003b3e85d815da428d6068
+MISC ChangeLog 358 SHA256 780369f4f848a0447f102a2b2e0ccd59e0295c5292a622b2c7bb36735b130f51 SHA512 11b4d98b0ef2df1f88692d9330009d15cdef91b6a8eee27f146e1663ee0964879702d696f6595ccac1b814a7b544c5963ad7a6a290e3d6a947ba48aa222b3fe3 WHIRLPOOL 8640c3aa50c97a01ac597f704ba09407d78ed93200e2d2dc1868ba95e991ae25baeace5f31a23a800305b5085c9544d444bebd96f6b84d3f570a036f9660b7fc
+MISC metadata.xml 580 SHA256 edd6856050bd434d4305069934f9cf8a1788b9820def83c19cf6ff11bd94684c SHA512 16cb9da0545ab48966ee589d6f6ed9dbf011efbecf5eeddd3cbca35d1369ea35fe7dee7cf89ea735ca83058b1e2ab8232d2f404cba35d100798fdcc0ab46a083 WHIRLPOOL 72fc6e5c5c9d5d81e4e084a74b9986c643375e12202fce6d9040f12124bff056bcbd56e4188389c65eef7cb1ed0d4683758799f1a0514bec200168bcd245b12a
diff --git a/dev-python/astroplan/astroplan-0.2.1.ebuild b/dev-python/astroplan/astroplan-0.2.1.ebuild
new file mode 100644
index 000000000000..9ed8a4959bf3
--- /dev/null
+++ b/dev-python/astroplan/astroplan-0.2.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Observation planning package for astronomers"
+HOMEPAGE="https://astroplan.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+	  dev-python/sphinx[${PYTHON_USEDEP}]
+	  dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest-mpl[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.2-ephem-import.patch )
+
+python_prepare_all() {
+	# use system astropy-helpers instead of bundled one
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	xdg_environment_reset
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_sphinx --no-intersphinx
+	fi
+}
+
+python_test() {
+	echo 'backend: Agg' > "${WORKDIR}"/matplotlibrc || die
+	MATPLOTLIBRC="${WORKDIR}" virtx esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/astroplan/astroplan-0.2.ebuild b/dev-python/astroplan/astroplan-0.2.ebuild
new file mode 100644
index 000000000000..83166f96c41b
--- /dev/null
+++ b/dev-python/astroplan/astroplan-0.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Observation planning package for astronomers"
+HOMEPAGE="https://astroplan.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+	  dev-python/sphinx[${PYTHON_USEDEP}]
+	  dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest-mpl[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${P}-ephem-import.patch )
+
+python_prepare_all() {
+	# use system astropy-helpers instead of bundled one
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	xdg_environment_reset
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_sphinx --no-intersphinx
+	fi
+}
+
+python_test() {
+	echo 'backend: Agg' > "${WORKDIR}"/matplotlibrc || die
+	MATPLOTLIBRC="${WORKDIR}" virtx esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/astroplan/files/astroplan-0.2-ephem-import.patch b/dev-python/astroplan/files/astroplan-0.2-ephem-import.patch
new file mode 100644
index 000000000000..59328290c07f
--- /dev/null
+++ b/dev-python/astroplan/files/astroplan-0.2-ephem-import.patch
@@ -0,0 +1,11 @@
+--- a/astroplan/conftest.py.orig	2016-11-30 23:17:49.057492656 +0000
++++ b/astroplan/conftest.py	2016-11-30 23:18:11.076451659 +0000
+@@ -38,7 +38,7 @@
+ try:
+     PYTEST_HEADER_MODULES['Astropy'] = 'astropy'
+     PYTEST_HEADER_MODULES['pytz'] = 'pytz'
+-    PYTEST_HEADER_MODULES['pyephem'] = 'pyephem'
++    PYTEST_HEADER_MODULES['pyephem'] = 'ephem'
+     PYTEST_HEADER_MODULES['matplotlib'] = 'matplotlib'
+     PYTEST_HEADER_MODULES['nose'] = 'nose'
+     PYTEST_HEADER_MODULES['pytest-mpl'] = 'pytest_mpl'
diff --git a/dev-python/astroplan/metadata.xml b/dev-python/astroplan/metadata.xml
new file mode 100644
index 000000000000..b320e5789d60
--- /dev/null
+++ b/dev-python/astroplan/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Astroplan is an observation planning package for astronomers that can help
+    you plan for everything but the clouds.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">astroplan</remote-id>
+    <remote-id type="github">astropy/astroplan</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/astropy-helpers/Manifest b/dev-python/astropy-helpers/Manifest
new file mode 100644
index 000000000000..fe41645eab37
--- /dev/null
+++ b/dev-python/astropy-helpers/Manifest
@@ -0,0 +1,9 @@
+DIST astropy-helpers-1.2.tar.gz 134346 SHA256 623a9efdd1f34ce4fc71effb225bf5b8ff06ff515bd8e6b751aba2c7ff207661 SHA512 c343b2d8a2f37f8baa94a4920c458b23fe28e5afa812937559cd10c1f6750bacc21aec38b8f52367ec68e2ea3ffeea85125290c320288888b3076abebb8f2e7e WHIRLPOOL 528ac9acb02bc03f3af61649be08ecc5cc39c26c7fc408664b38d4b662a64ef5350e6f9127bcbd5c9c8765d196c6b90221e0e192b70c70953d8e6b9dcbfe5aa4
+DIST astropy-helpers-1.3.1.tar.gz 136460 SHA256 7640c5582e518a3ed2f2b5a209d188f1d5099ab33cc1e861a2c123e0e80c9fcd SHA512 796e9827a6c29e148474180c9c8f934a51a8ed455991d84a096025ed5d8aecf764a8152a8b24aa1aec6c254b39ca3f13ebfc764717bd0109022b86c384ebaa99 WHIRLPOOL e0091adbc7f081d5a64823443fe1fc58f7d4c1d3d10d0ff6e066f409c70224fd39dcdf0d651261b6a2133a821e1e4dede989c95c79d63fcbf69b9556f73078a8
+DIST astropy-helpers-2.0.1.tar.gz 122118 SHA256 42427a1b3f027b2bfeb528610bc3d82d182053323b51a97403a4ce09fa3bbc82 SHA512 ce0fb8bccc11b4e26ae9455f156274a4fbdf82bb1b6bf6c8322b0cb218502bcf291c175149e71ebd31cbd0434455a3c974cccd38c38f9263ae624cf2edffd475 WHIRLPOOL 37d1fae20b1cf72282ab302e13ee7eaad62f5be26b218161c6eaf4ffc71ea194e9078eef0077c059934606cd581596052f89aaab36f5ec6c684217dc70e7c863
+EBUILD astropy-helpers-1.2.ebuild 598 SHA256 abba5debc9c72d8f2fe297060bdee35873900711be7f2034214c621a1fa3ebb8 SHA512 f0999f0722c52da20d165b50441bb9bd9e9ecca4eadf0952d87ab9702d90874d87bb23c956f83bce2e5944dd271497ce4c3971f1612e95abb00d79426fae9448 WHIRLPOOL 6f88734105b5d497335fa4df353db86dcb9989ac18bb39962a92d1654be9117a9491d17b2fb8515d514822eb19180804bbdcd6283e032e8d9690bab599ea626d
+EBUILD astropy-helpers-1.3.1.ebuild 601 SHA256 70ae84002616a0e7ee01e2567bc5685d65c648665809459c00798426d1213394 SHA512 553a44a4b48969c997d7fb49703a9e1565df9f2f802f8ab95aef8382aa59edcfe75b4644e25a9a38631b8ff2c835d9fc8758ebd3724335a194d81374b93c1287 WHIRLPOOL 8f904fa27f3c495b5d3c827f4efe0f3bbbe2d09cb219ad8098828130743a1d17962867420e4e491d0eff76d4e558c63962c64e2bc76ed7fdf74d5b7461417bb0
+EBUILD astropy-helpers-2.0.1.ebuild 656 SHA256 c3e46c86d253dc376ee8ecbd0f76162ddc2a6174c5e1ee6f27bf06cff65aa487 SHA512 309cfdeda6b3a34615c7df1a180403e27fa3c0c47f4195abe31e746db52035182541e85d2124cdb4365f754e8080bf09f94cec4985cbdba4247345cb4ebdeb2b WHIRLPOOL cf608a7316f85e1e8450a923cd3ec9f808d0cd1f5b3e2b42b24371821fd97d29288d6823fa20de44409352cc19a386ebfb2a49f86d5fd928846521eb36a6c1a6
+MISC ChangeLog 4416 SHA256 d6044394305b4f7d79f4c698cf389f7c43da3ce48382c9ac1c86ea86011ef03b SHA512 30baaaaf199c5e69539a81a0b2e02d5c16f2ca99cd0b747a62081675b50c06fe7ec3684b31a9a72fc0b2421a50a002786f2419b5ffec05ea48d59c3036aadddd WHIRLPOOL 918ad7a9942ab12383c0eb30252fe965d2e23b2b35371297b31217ae248403a7c2d688a9d539f761d7ee5ddfb5e6846955e05c021f90d04e383064c3508c0bb0
+MISC ChangeLog-2015 754 SHA256 454727f071e60c56ef14dbc09dea476598b4b54ec26af04610e46beb71e1d036 SHA512 d7c522134126a06650cc83530ce4b6a6f10821aaf4af8e7b82719b6aebe30a108eb5bb5f4aa38f80696a46feb0939e8f7b5a5f146cd1736fd3c9c2936c0ea8d1 WHIRLPOOL 7716911c464e56c978f76b71cbf672f1cf9e16973a5f8a1b3fc2b4a4e4ae7067767e7d274e25dcec72519494a801c0e3a1d057eabcc424e53fbbf109845b3ed9
+MISC metadata.xml 558 SHA256 2a806bf747d2eab10beda4d7f2997950438de201bf8066a799b74d5c8036fea1 SHA512 89de5e5c1557ac63fe6147d8208ac796a740c818477590968ab25ca11ac3b90433c946f73459990bf431c840ce7c85c0bfb282ab2b93266cb8f66058ef0046a9 WHIRLPOOL 96458b0528774d027b1b48ae0a4f68e08fa3ba09b899efd13ee0f5b6588a05e13e9f45f87e9c0b173d900256c8f3004e20f1a3a86d83e3d2943946becb54a073
diff --git a/dev-python/astropy-helpers/astropy-helpers-1.2.ebuild b/dev-python/astropy-helpers/astropy-helpers-1.2.ebuild
new file mode 100644
index 000000000000..79aa9bac20fd
--- /dev/null
+++ b/dev-python/astropy-helpers/astropy-helpers-1.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Helpers for Astropy and Affiliated packages"
+HOMEPAGE="https://github.com/astropy/astropy-helpers"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+
+python_prepare_all() {
+	sed -e '/import ah_bootstrap/d' -i setup.py || die "Removing ah_bootstrap failed"
+	xdg_environment_reset
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/astropy-helpers/astropy-helpers-1.3.1.ebuild b/dev-python/astropy-helpers/astropy-helpers-1.3.1.ebuild
new file mode 100644
index 000000000000..f7e6f1eb6f85
--- /dev/null
+++ b/dev-python/astropy-helpers/astropy-helpers-1.3.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Helpers for Astropy and Affiliated packages"
+HOMEPAGE="https://github.com/astropy/astropy-helpers"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+python_prepare_all() {
+	sed -e '/import ah_bootstrap/d' -i setup.py || die "Removing ah_bootstrap failed"
+	xdg_environment_reset
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/astropy-helpers/astropy-helpers-2.0.1.ebuild b/dev-python/astropy-helpers/astropy-helpers-2.0.1.ebuild
new file mode 100644
index 000000000000..68cb890bf330
--- /dev/null
+++ b/dev-python/astropy-helpers/astropy-helpers-2.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 xdg-utils
+
+MYPV=${PV/_/}
+S=${WORKDIR}/${PN}-${MYPV}
+
+DESCRIPTION="Helpers for Astropy and Affiliated packages"
+HOMEPAGE="https://github.com/astropy/astropy-helpers"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MYPV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+python_prepare_all() {
+	sed -e '/import ah_bootstrap/d' \
+		-i setup.py || die "Removing ah_bootstrap failed"
+	xdg_environment_reset
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/astropy-helpers/metadata.xml b/dev-python/astropy-helpers/metadata.xml
new file mode 100644
index 000000000000..845f41eee17a
--- /dev/null
+++ b/dev-python/astropy-helpers/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci-astronomy@gentoo.org</email>
+		<name>Gentoo Astronomy Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		astropy-helpers is a collection of build tools used by astropy
+		that may be used by other projects.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">astropy-helpers</remote-id>
+		<remote-id type="github">astropy/astropy-helpers</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/astropy/Manifest b/dev-python/astropy/Manifest
new file mode 100644
index 000000000000..76f0e0dcedda
--- /dev/null
+++ b/dev-python/astropy/Manifest
@@ -0,0 +1,16 @@
+AUX astropy-1.0.4-system-configobj.patch 601 SHA256 6caadc044d0f64b5f372344371f9c0dd05c8f414746348474c55d42307c73817 SHA512 9cb9bbb65fb4c1e3f45256643cde6e2c3f5d9cf60bd3ce2d1aab7e1f4d1fc82581e85059b1f8f50af1217836928bec83db5d87633c1252448ddfdbb3ec3b819e WHIRLPOOL 7bfcb31e2938f8792a753bb70a9d59bfe7ee246680c178a6832a275e659f80074c17b47e05ddfeb30a0ccdf5b004fd2f9fedc8a0ee2c751a987b58f68edfc1c8
+AUX astropy-1.0.4-system-six.patch 568 SHA256 0bb273644ec20180ed6e6a27d48341161ddd2d84079d06c21e28bf78548a166d SHA512 7687cd3fb2dc8f9d491ec15cc848c53aa58df2405bb1a48d68c384b5a3595502abcf2413bef95963c4fdf30470f95b0906a3fd991ad3b72f54a82ea2da3c8594 WHIRLPOOL 8a14d11c3c9431e124ac46699240454ffdc85bfcb68e6e9e865de67693f6a7ffd635706dfc81a5046b98844643ea775405997995b337860354acebba07246ae1
+AUX astropy-1.1.1-mark-kown-failures.patch 3418 SHA256 59bc0b993b64999a1665aea58ed4634d9838997fbc305d1398c7b9160fc994ac SHA512 0b8b29c5cd9c9781c4f64c4595fba11efe1bd6d06be56a80fc8832a295b9c95993281014c642b21d40f3be18835de6d83796977c495a8c2ce1029c935d555962 WHIRLPOOL 6921e905d03c29033376ce2020576da05cb9ea8f93b84c869516f06491f181ce32d05eebb197cac3545c5dd2984fc23132c72940668cdb80d6e825aa960f5cc2
+AUX astropy-1.2.1-cfitsio-338.patch 667 SHA256 3280d270dd75acba713b162a60e5873a97c3c389c55c932b45859b962dfb9fad SHA512 4422dc794e2ad3ff91342b521b447115157c464883b928970ccba6a999bd7a1ceea2d5fc48f3c39769be4b9a174d571bd57ba58d1a08d90fa72f626932d60668 WHIRLPOOL 6e2f6e4e6623c6bfb9c1755e2e43ebd6c70fbb5995ab717b205921283f0f502ca9b87166bbae41fa34488cfcfc769d544f78ae456cc79170ca56350136a5d6e4
+AUX astropy-1.3.3-external-python-pkgs.patch 4890 SHA256 58398bb5e03e5eb8881586fe13142e31d051a9afc94f49574b6d66d7b41de7c0 SHA512 57aecc6768f4e7e3522fd3ec9bf39dbf769be0219df5780d1f535e4b228e9e90f3bc2330c6d8f3c4fab50a435abbfbe1478ca70f8067e5ffd11048783b7379a8 WHIRLPOOL 33daf737e17dfb0788c24d7c9325f8d91ba6b7eb819924c5560d8c67fff5cb94876909b65b97f5c2450e782ea6f66718003d46b7bcffd88cf230d3ac57a4ff79
+AUX astropy-1.3.3-mark-known-failures.patch 3374 SHA256 77aa14ba69b3df9f11ac1895b5d7f667c6213e2bafebb258a28c21641743e824 SHA512 7a2b9bb3a97ed99efe5c61d98e141e53775a1c106c758d662e22f7f6651b05e1d2ac429983b7fe431a07c9b94a93a43b158d68251a03220d3138683c52083a06 WHIRLPOOL 15861ec446d3ad34106daca334b785b53dc7b2861db7a538660ba76f20b12a5f318488ad15bfafcfd51afb139f526060ece4e5fdd1892e769685841896db0a56
+AUX astropy-ply.py 1674 SHA256 9f58bcd0f6491aaebc6b6778314c8f3ac95f2dd10d01ff63c417ba77e5fd05c8 SHA512 ebf5a7ec8df3c62b2f7ba91a4c5138558583186dfb945c89cc1454f9cafadc0e11bb5390c2aa57a993ca98e04dd06167e94d54fb1acc4b49c16e90dbab6b63d7 WHIRLPOOL f3edcb0ca04d47e8368b9a287fcd1a55af7293230c37750ba0e4f7dbfb82efd33a6d1b1c284417707344a9ecc63dc4c958c79f151c7749f8b3e98272586061e0
+DIST astropy-1.2.1.tar.gz 8179665 SHA256 0d7ef702166f26fed239b59fc12edcd5243ca5bf562a36202fd8c6b0270d6e48 SHA512 2ef37537a4c6b2ec50a1d898f600978475c9c5d2cb66ba19d06782656e9ddcb4aa6a8e53217e318448cedac45dac0dce0d8cc2fe94cddc15ebb306b3b0794595 WHIRLPOOL d37374f23a0121fdc92fa572facc248f0a571dacb8edcf1a9d0987d6a40287de199262ec01f654bd6ea5aece826e5588d2869558152adffe9ab490fa46f2e36d
+DIST astropy-1.3.3.tar.gz 8427036 SHA256 ed093e033fcbee5a3ec122420c3376f8a80f74663214560727d3defe82170a99 SHA512 15956d488a390ab3b4091146bffe6f192f22e7598d00e302c2bcf0ec9728911f48bef3ee4c71d331f58e57aec86292421d27f915ea16027a7f62c5d43f6a12e5 WHIRLPOOL a9246b1ba56ecda5eec42e89998f18da4987f611d1154ba8ef5d3480d398fd77c0fdad6c15614885ae722454b9c284b9281ee926fed0f39c314864a015bf658f
+DIST astropy-2.0.1.tar.gz 8220097 SHA256 25e0881a392a2e03b4a705cf9592f01894d23f64797323b21387efa8ea9ec03e SHA512 0677b4f22a9eb7d3334109a639ec14ce904935dc58925d303dc98c27cbac2be7d0e95bd873cc21d3cd92e8e553481d203382c281f91cb7a4e41c27d1ff83aac7 WHIRLPOOL af4d78b88cf9ea7f536eb2d6b6a0cc46068ae5312de3f8f83f0ad3bea539112868f3704f6898be6da6e1a0a60caadd2d88335523c242f6156723dfd849c6ef76
+EBUILD astropy-1.2.1.ebuild 2722 SHA256 31000b83ca542af0b2e98b1538baf25e0d70f0e179c6c9fc2e94cf44cbacfd17 SHA512 5bfc876359230883412b57d3de9fa99d88d83cf5c3bf5df5a74e24e10a5e729bd8445a2a8cc3f20792c81cd9a4efead673c39272ef31acfe6c68f3e784d8717b WHIRLPOOL 71bf6cdf56ea37c2de9528a9b5406be17ea5e89e881260375987987082e4dcaf91287038e0f2badf93f717e81abcfe4c5511d6f3cee8a6945e1cf82126be5b31
+EBUILD astropy-1.3.3.ebuild 2517 SHA256 4a94397354f7a363b22630fad09a261da5859f79f6e413684f903d67430b9627 SHA512 e1a26616f59e57377acce5dac0e06ffa83cb2a627a7fc5143a7a8b1f9445ddad2d9833680bb29b39bd9a74b6f25321c3b3e616d59b30c3d65869db9327a2694c WHIRLPOOL c842940dbff2e3322a62dd051f64ee58c4fa64ebbce36924ba959b0b7ea1403d0013053230a15f0815c8ce5458b507f07ccbc4b31e7900a8638a7df83d1eaeeb
+EBUILD astropy-2.0.1.ebuild 2490 SHA256 1249f4b42c25985d26a9425d7aa75266a3734effc5ecf403f824815c828d2b9b SHA512 480cd8e1d9ed9813eb42aea7b1839c421b67c2cb3f27ced79007ce5ea9bf47a73d28cd10f5af8ae1f1ae9f9baad3cbdcba779fabceffcaa7f330df1ee8a4a574 WHIRLPOOL a2eb41b972df05d84ebb4a307167c03a93145b10ee71bc1bfced353ecb64843a851b13d31fa515f3dd64b2d6292a66c295f2d056880e86b46d61ca150733ea19
+MISC ChangeLog 6917 SHA256 444c267ce4e2dbff8d0d2a3b072786dcc2ff2009c30ea7bb2c33c5eb40c2fadf SHA512 44ca7409313bd23606f4501470168a19f71da9976f050f700a19513051fd3793383c9f8dbf9604c293bde989962933e2cef674aa62af87a8b7e0cea3eda66f7e WHIRLPOOL 1febdd98889a209ae584cedf67ae4ed2de39da74dbc47710bb13397dd234f3093754bd68d0325bdfad0b19b9b163006fd7bfa18aa4c74bf0e8332eec7f6352ba
+MISC ChangeLog-2015 3905 SHA256 0caa97d13b7b0a80d2f5b4ea1d60ab6ad79b751e13e86694e83b0d77a083936f SHA512 d1321808335b50433e13c3238130153bbf5803b22145796ccbbdccd58d4636bea2d762fa0f71eb799293227e4124cb5ef1fee769f05b70201c48120c7a008914 WHIRLPOOL d06117b036c97da9f9abd4b8b525b0d17fa4d508fccc2b079ca6adcd2cb5e48334f8e95a514b29ccf61615d4fbc6685996e39e323aa8b1137546f8806f6e9742
+MISC metadata.xml 573 SHA256 bdd68bcb0bf0c3ca0e5ebdb00f7b04b6c22f60cc4958eeeacfc9f0657683d5da SHA512 a8054d4eb431348c9840e37a5877c2ce7cd4b73f213c1a24f9d3548dfc63a6756d80ffb9f96f78a053fb4ae2a39a424dbe46257be2e9f892f42ec18ff44fad17 WHIRLPOOL 87d8d5f608325797299e4c6ed130f76b7446535d4355ec7b338dc5ce834ab7224f489519b5e27ce73b273a3f19226232a0be2e6e06bb4a2e9a9330d5f37c668d
diff --git a/dev-python/astropy/astropy-1.2.1.ebuild b/dev-python/astropy/astropy-1.2.1.ebuild
new file mode 100644
index 000000000000..2f2c8fcdb9d2
--- /dev/null
+++ b/dev-python/astropy/astropy-1.2.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Core functionality for performing astrophysics with Python"
+HOMEPAGE="http://astropy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-libs/expat:0=
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.10[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-astronomy/erfa-1.2:0=
+	>=sci-astronomy/wcslib-5:0=
+	sci-libs/cfitsio:0=
+	sys-libs/zlib:0="
+DEPEND="${RDEPEND}
+	>=dev-python/astropy-helpers-1.1[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		media-gfx/graphviz
+		$(python_gen_cond_dep 'dev-libs/libxml2[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/h5py[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/matplotlib[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/wcsaxes[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'sci-libs/scipy[${PYTHON_USEDEP}]' python2_7)
+	)
+	test? (
+		dev-libs/libxml2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/h5py[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.4-system-six.patch"
+	"${FILESDIR}/${PN}-1.0.4-system-configobj.patch"
+	"${FILESDIR}/${PN}-1.1.1-mark-kown-failures.patch"
+	"${FILESDIR}/${PN}-1.2.1-cfitsio-338.patch"
+)
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_prepare_all() {
+	export mydistutilsargs="--offline"
+	export ASTROPY_USE_SYSTEM_PYTEST=True
+	rm -r ${PN}_helpers || die
+	cp "${FILESDIR}"/astropy-ply.py astropy/extern/ply.py || die
+	rm -r cextern/{expat,erfa,cfitsio,wcslib} || die
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	cat >> setup.cfg <<-EOF
+	[build]
+	use_system_libraries=1
+	EOF
+	xdg_environment_reset
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup "python2*"
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_sphinx
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/astropy/astropy-1.3.3.ebuild b/dev-python/astropy/astropy-1.3.3.ebuild
new file mode 100644
index 000000000000..784a43072ae8
--- /dev/null
+++ b/dev-python/astropy/astropy-1.3.3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Core functionality for performing astrophysics with Python"
+HOMEPAGE="http://astropy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+# ply-3.10 incompatible, keep bundled (bug #622802)
+#rdep: dev-python/ply[${PYTHON_USEDEP}]
+#prep: cp "${FILESDIR}"/astropy-ply.py astropy/extern/ply.py || die
+
+RDEPEND="
+	dev-libs/expat:0=
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.10[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-astronomy/erfa-1.3:0=
+	>=sci-astronomy/wcslib-5:0=
+	>=sci-libs/cfitsio-3.410:0=
+	sys-libs/zlib:0="
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		media-gfx/graphviz
+		dev-libs/libxml2[${PYTHON_USEDEP}]
+		dev-python/h5py[${PYTHON_USEDEP}]
+		dev-python/jplephem[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},jpeg]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/sphinx-gallery[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-libs/libxml2[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},jpeg]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mpl[${PYTHON_USEDEP}]
+		dev-python/h5py[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.3-mark-known-failures.patch
+	"${FILESDIR}"/${PN}-1.3.3-external-python-pkgs.patch
+)
+
+python_prepare_all() {
+	export mydistutilsargs="--offline"
+	export ASTROPY_USE_SYSTEM_PYTEST=True
+	#rm -r ${PN}_helpers || die
+	rm -r cextern/{expat,erfa,cfitsio,wcslib} || die
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	cat >> setup.cfg <<-EOF
+	[build]
+	use_system_libraries=1
+	EOF
+	xdg_environment_reset
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		mkdir -p examples
+		touch examples/README.txt || die
+		python_setup
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_docs --no-intersphinx
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/astropy/astropy-2.0.1.ebuild b/dev-python/astropy/astropy-2.0.1.ebuild
new file mode 100644
index 000000000000..65cd60ea569d
--- /dev/null
+++ b/dev-python/astropy/astropy-2.0.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 xdg-utils
+
+MYPV=${PV/_/}
+S=${WORKDIR}/${PN}-${MYPV}
+
+DESCRIPTION="Core functionality for performing astrophysics with Python"
+HOMEPAGE="http://astropy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MYPV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-libs/expat:0=
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/h5py[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	dev-python/jplephem[${PYTHON_USEDEP}]
+	dev-libs/libxml2[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/mpmath[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.10[${PYTHON_USEDEP}]
+	dev-python/objgraph[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP},jpeg]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-astronomy/erfa-1.3:0=
+	>=sci-astronomy/wcslib-5:0=
+	>=sci-libs/cfitsio-3.410:0=
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	sci-libs/scikits_image[${PYTHON_USEDEP}]
+	sys-libs/zlib:0=
+"
+DEPEND="
+	>=dev-python/astropy-helpers-2[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.10[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		${RDEPEND}
+		media-gfx/graphviz
+		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.1.9[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mpl[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	export mydistutilsargs="--offline"
+	export ASTROPY_USE_SYSTEM_PYTEST=True
+	rm -r ${PN}_helpers || die
+	rm -r cextern/{expat,erfa,cfitsio,wcslib} || die
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	cat >> setup.cfg <<-EOF
+
+		[build]
+		use_system_libraries=1
+	EOF
+	xdg_environment_reset
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		VARTEXFONTS="${T}"/fonts MPLCONFIGDIR="${T}" PYTHONPATH="${BUILD_DIR}"/lib \
+				   esetup.py build_docs --no-intersphinx
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/astropy/files/astropy-1.0.4-system-configobj.patch b/dev-python/astropy/files/astropy-1.0.4-system-configobj.patch
new file mode 100644
index 000000000000..9578c0d43571
--- /dev/null
+++ b/dev-python/astropy/files/astropy-1.0.4-system-configobj.patch
@@ -0,0 +1,14 @@
+diff -ur astropy-0.4.1/astropy/config/configuration.py astropy-0.4.1.configobj/astropy/config/configuration.py
+--- astropy-0.4.1/astropy/config/configuration.py	2014-09-01 22:41:30.066853605 +0200
++++ astropy-0.4.1.configobj/astropy/config/configuration.py	2014-09-01 22:40:50.793528942 +0200
+@@ -23,7 +23,8 @@
+ import types
+ from warnings import warn
+ 
+-from ..extern.configobj import configobj, validate
++import configobj
++import validate
+ from ..utils.exceptions import AstropyWarning, AstropyDeprecationWarning
+ from ..utils import find_current_module
+ from ..utils.misc import InheritDocstrings
+
diff --git a/dev-python/astropy/files/astropy-1.0.4-system-six.patch b/dev-python/astropy/files/astropy-1.0.4-system-six.patch
new file mode 100644
index 000000000000..8bfab98124b3
--- /dev/null
+++ b/dev-python/astropy/files/astropy-1.0.4-system-six.patch
@@ -0,0 +1,12 @@
+diff -ur astropy-0.4.1/astropy/extern/six.py astropy-0.4.1.six/astropy/extern/six.py
+--- astropy-0.4.1/astropy/extern/six.py	2014-09-01 21:57:56.663393218 +0200
++++ astropy-0.4.1.six/astropy/extern/six.py	2014-09-01 21:59:02.940933294 +0200
+@@ -13,7 +13,7 @@
+ # Update this to prevent Astropy from using its bundled copy of six
+ # (but only if some other version of at least _SIX_MIN_VERSION can
+ # be provided)
+-_SIX_SEARCH_PATH = ['astropy.extern.bundled.six', 'six']
++_SIX_SEARCH_PATH = ['six', 'astropy.extern.bundled.six']
+ 
+ 
+ def _find_module(name, path=None):
diff --git a/dev-python/astropy/files/astropy-1.1.1-mark-kown-failures.patch b/dev-python/astropy/files/astropy-1.1.1-mark-kown-failures.patch
new file mode 100644
index 000000000000..2e2c82af5416
--- /dev/null
+++ b/dev-python/astropy/files/astropy-1.1.1-mark-kown-failures.patch
@@ -0,0 +1,99 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Mark all known test failures as xfail.
+ These failures have been discussed with upstream.
+--- a/astropy/io/fits/tests/test_connect.py
++++ b/astropy/io/fits/tests/test_connect.py
+@@ -136,6 +136,8 @@
+         # while reading is to check whether col.null is present. For float columns, col.null
+         # is not initialized
+ 
++# see https://github.com/astropy/astropy/issues/3415
++    @pytest.mark.xfail()
+     def test_read_from_fileobj(self, tmpdir):
+         filename = str(tmpdir.join('test_read_from_fileobj.fits'))
+         hdu = BinTableHDU(self.data)
+@@ -172,6 +174,8 @@
+     def setup_method(self, method):
+         warnings.filterwarnings('always')
+ 
++# see https://github.com/astropy/astropy/issues/3415
++    @pytest.mark.xfail()
+     def test_read(self, tmpdir):
+         filename = str(tmpdir.join('test_read.fits'))
+         self.hdus.writeto(filename)
+@@ -189,6 +193,8 @@
+             Table.read(filename, hdu=0)
+         assert exc.value.args[0] == 'No table found in hdu=0'
+ 
++# see https://github.com/astropy/astropy/issues/3415
++    @pytest.mark.xfail()
+     @pytest.mark.parametrize('hdu', [1, 'first'])
+     def test_read_with_hdu_1(self, tmpdir, hdu):
+         filename = str(tmpdir.join('test_read_with_hdu_1.fits'))
+--- a/astropy/wcs/wcs.py
++++ b/astropy/wcs/wcs.py
+@@ -84,6 +84,8 @@
+ if six.PY3 or platform.system() == 'Windows':
+     __doctest_skip__ = ['WCS.all_world2pix']
+ 
++# see https://github.com/astropy/astropy/issues/3380
++__doctest_skip__ = ['WCS.all_world2pix']
+ 
+ if _wcs is not None:
+     WCSBase = _wcs._Wcs
+--- a/astropy/tests/tests/test_socketblocker.py
++++ b/astropy/tests/tests/test_socketblocker.py
+@@ -66,8 +66,8 @@
+ def _square(x):
+     return x ** 2
+ 
+-
+-@pytest.mark.skipif('not PY3_4 or sys.platform == "win32" or sys.platform.startswith("gnu0")')
++# see https://github.com/astropy/astropy/issues/4193
++@pytest.mark.skipif(True, reason="Blocks on Debian CI test")
+ def test_multiprocessing_forkserver():
+     """
+     Test that using multiprocessing with forkserver works.  Perhaps
+--- a/astropy/coordinates/tests/test_api_ape5.py
++++ b/astropy/coordinates/tests/test_api_ape5.py
+@@ -319,7 +319,8 @@
+     # coordinate object, and one that returns a cartesian matrix but does *not*
+     # require `newobj` or `fk5frame` - this allows optimization of the transform.
+ 
+-
++# Temporary mark until scipy/numpy is fully on 3.5
++@pytest.mark.xfail()
+ def test_highlevel_api():
+     J2001 = time.Time('J2001', scale='utc')
+ 
+--- a/astropy/visualization/tests/test_histogram.py
++++ b/astropy/visualization/tests/test_histogram.py
+@@ -50,6 +50,8 @@
+     assert patches2[0].axes is ax[1]
+ 
+ 
++# see https://github.com/astropy/astropy/issues/4329
++@pytest.mark.xfail()
+ @pytest.mark.skipif('not HAS_PLT')
+ def test_hist_autobin(rseed=0):
+     rng = np.random.RandomState(rseed)
+--- a/astropy/table/tests/test_info.py
++++ b/astropy/table/tests/test_info.py
+@@ -6,6 +6,7 @@
+ import warnings
+ import numpy as np
+ 
++from ...tests.helper import pytest
+ from ...extern import six
+ from ... import units as u
+ from ... import time
+@@ -225,7 +226,8 @@
+         t.info(out=out)
+         assert out.getvalue().splitlines() == exp
+ 
+-
++# see https://github.com/astropy/astropy/issues/4336
++@pytest.mark.xfail()
+ def test_ignore_warnings():
+     t = table.Table([[np.nan, np.nan]])
+     with warnings.catch_warnings(record=True) as warns:
diff --git a/dev-python/astropy/files/astropy-1.2.1-cfitsio-338.patch b/dev-python/astropy/files/astropy-1.2.1-cfitsio-338.patch
new file mode 100644
index 000000000000..9a688d959851
--- /dev/null
+++ b/dev-python/astropy/files/astropy-1.2.1-cfitsio-338.patch
@@ -0,0 +1,16 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Make TFORMx check more flexible
+ The maximal column length in cfitsio changed between version 3370 and 3380.
+ This patch checks their syntax, without a specific length.
+Bug: https://github.com/astropy/astropy/issues/4646
+--- a/astropy/io/fits/tests/test_image.py
++++ b/astropy/io/fits/tests/test_image.py
+@@ -1070,7 +1070,7 @@
+         hdu.writeto(self.temp('test.fits'))
+ 
+         with fits.open(self.temp('test.fits')) as hdul:
+-            assert (hdul['SCI'].data == cube).all()
++            assert np.abs(hdul['SCI'].data - cube).max() < 1./15.
+ 
+     def test_subtractive_dither_seed(self):
+         """
diff --git a/dev-python/astropy/files/astropy-1.3.3-external-python-pkgs.patch b/dev-python/astropy/files/astropy-1.3.3-external-python-pkgs.patch
new file mode 100644
index 000000000000..5c69704df9b0
--- /dev/null
+++ b/dev-python/astropy/files/astropy-1.3.3-external-python-pkgs.patch
@@ -0,0 +1,119 @@
+Edit: bicatali@gentoo.org, ply-3.10 incompatible, so keep bundled.
+
+From: Ole Streicher <olebole@debian.org>
+Date: Thu, 12 Jan 2017 11:37:47 +0100
+Subject: Use external python modules instead of convenience copies
+
+---
+ astropy/coordinates/angle_utilities.py |  2 +-
+ astropy/extern/configobj.py            |  5 ++++-
+ astropy/extern/six.py                  |  2 +-
+ astropy/table/jsviewer.py              | 14 ++++++++------
+ astropy/table/tests/test_jsviewer.py   |  6 +++---
+ astropy/tests/helper.py                |  2 +-
+ astropy/units/format/cds.py            |  4 ++--
+ astropy/units/format/generic.py        |  4 ++--
+ astropy/units/format/ogip.py           |  4 ++--
+ 9 files changed, 24 insertions(+), 19 deletions(-)
+
+diff --git a/astropy/extern/configobj.py b/astropy/extern/configobj.py
+index 8d1bd8c..e3bb0e0 100644
+--- a/astropy/extern/configobj.py
++++ b/astropy/extern/configobj.py
+@@ -7,5 +7,8 @@ currently installed version of python.
+ Also, this should actually never actually show up as a docstring, because
+ it should get overwritten by the appropriate configobj docstring.
+ """
++from __future__ import absolute_import
++import validate
++import configobj
++
+ 
+-from .configobj import configobj, validate, __doc__
+diff --git a/astropy/extern/six.py b/astropy/extern/six.py
+index 5398fc0..fb3a30c 100644
+--- a/astropy/extern/six.py
++++ b/astropy/extern/six.py
+@@ -13,7 +13,7 @@ _SIX_MIN_VERSION = StrictVersion('1.10.0')
+ # Update this to prevent Astropy from using its bundled copy of six
+ # (but only if some other version of at least _SIX_MIN_VERSION can
+ # be provided)
+-_SIX_SEARCH_PATH = ['astropy.extern.bundled.six', 'six']
++_SIX_SEARCH_PATH = ['six']
+ 
+ 
+ def _find_module(name, path=None):
+diff --git a/astropy/table/jsviewer.py b/astropy/table/jsviewer.py
+index d0cc380..9f686ea 100644
+--- a/astropy/table/jsviewer.py
++++ b/astropy/table/jsviewer.py
+@@ -30,8 +30,8 @@ class Conf(_config.ConfigNamespace):
+ conf = Conf()
+ 
+ 
+-EXTERN_JS_DIR = abspath(join(dirname(extern.__file__), 'js'))
+-EXTERN_CSS_DIR = abspath(join(dirname(extern.__file__), 'css'))
++EXTERN_JS_DIR = '/usr/share/javascript'
++EXTERN_CSS_DIR = EXTERN_JS_DIR
+ 
+ _SORTING_SCRIPT_PART_1 = """
+ var astropy_sort_num = function(a, b) {{
+@@ -134,22 +134,24 @@ class JSViewer(object):
+     @property
+     def jquery_urls(self):
+         if self._use_local_files:
+-            return ['file://' + join(EXTERN_JS_DIR, 'jquery-3.1.1.min.js'),
+-                    'file://' + join(EXTERN_JS_DIR, 'jquery.dataTables.min.js')]
++            return ['file://' + join(EXTERN_JS_DIR, 'jquery', 'jquery.min.js'),
++                    'file://' + join(EXTERN_JS_DIR, 'jquery-datatables',
++                                     'jquery.dataTables.min.js')]
+         else:
+             return [conf.jquery_url, conf.datatables_url]
+ 
+     @property
+     def css_urls(self):
+         if self._use_local_files:
+-            return ['file://' + join(EXTERN_CSS_DIR,
++            return ['file://' + join(EXTERN_CSS_DIR, 'jquery-datatables', 'css',
+                                      'jquery.dataTables.css')]
+         else:
+             return conf.css_urls
+ 
+     def _jstable_file(self):
+         if self._use_local_files:
+-            return 'file://' + join(EXTERN_JS_DIR, 'jquery.dataTables.min')
++            return 'file://' + join(EXTERN_JS_DIR, 'jquery-datatables',
++                                    'jquery.dataTables.min')
+         else:
+             return conf.datatables_url[:-3]
+ 
+diff --git a/astropy/table/tests/test_jsviewer.py b/astropy/table/tests/test_jsviewer.py
+index 6a8b033..5018bd4 100644
+--- a/astropy/table/tests/test_jsviewer.py
++++ b/astropy/table/tests/test_jsviewer.py
+@@ -145,9 +145,9 @@ def test_write_jsviewer_local(tmpdir):
+         table_id='test',
+         length='50',
+         display_length='10, 25, 50, 100, 500, 1000',
+-        datatables_css_url='file://' + join(EXTERN_DIR, 'css', 'jquery.dataTables.css'),
+-        datatables_js_url='file://' + join(EXTERN_DIR, 'js', 'jquery.dataTables.min.js'),
+-        jquery_url='file://' + join(EXTERN_DIR, 'js', 'jquery-3.1.1.min.js')
++        datatables_css_url='file:///usr/share/javascript/jquery-datatables/css/jquery.dataTables.css',
++        datatables_js_url='file:///usr/share/javascript/jquery-datatables/jquery.dataTables.min.js',
++        jquery_url='file:///usr/share/javascript/jquery/jquery.min.js'
+     )
+     with open(tmpfile) as f:
+         assert f.read().strip() == ref.strip()
+diff --git a/astropy/tests/helper.py b/astropy/tests/helper.py
+index 9e88d1f..94bd40a 100644
+--- a/astropy/tests/helper.py
++++ b/astropy/tests/helper.py
+@@ -40,7 +40,7 @@ __all__ = ['raises', 'enable_deprecations_as_exceptions', 'remote_data',
+            'pickle_protocol', 'generic_recursive_equality_test']
+ 
+ 
+-if os.environ.get('ASTROPY_USE_SYSTEM_PYTEST') or '_pytest' in sys.modules:
++if True:
+     import pytest
+ 
+ else:
diff --git a/dev-python/astropy/files/astropy-1.3.3-mark-known-failures.patch b/dev-python/astropy/files/astropy-1.3.3-mark-known-failures.patch
new file mode 100644
index 000000000000..1a30bc1d10ab
--- /dev/null
+++ b/dev-python/astropy/files/astropy-1.3.3-mark-known-failures.patch
@@ -0,0 +1,84 @@
+From: Ole Streicher <olebole@debian.org>
+Date: Tue, 13 Dec 2016 09:41:39 +0100
+Subject: Mark all known test failures as xfail. These failures have been
+ discussed with upstream.
+
+---
+ astropy/table/tests/test_info.py                                      | 4 +++-
+ astropy/tests/tests/test_socketblocker.py                             | 4 ++--
+ astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py | 4 ++++
+ astropy/vo/samp/tests/test_standard_profile.py                        | 2 ++
+ 4 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/astropy/table/tests/test_info.py b/astropy/table/tests/test_info.py
+index 2bbcc7a..50fbdb4 100644
+--- a/astropy/table/tests/test_info.py
++++ b/astropy/table/tests/test_info.py
+@@ -8,6 +8,7 @@ from collections import OrderedDict
+ 
+ import numpy as np
+ 
++from ...tests.helper import pytest
+ from ...extern import six
+ from ...extern.six.moves import cStringIO as StringIO
+ from ... import units as u
+@@ -229,7 +230,8 @@ def test_class_attribute():
+         t.info(out=out)
+         assert out.getvalue().splitlines() == exp
+ 
+-
++# see https://github.com/astropy/astropy/issues/4336
++@pytest.mark.xfail()
+ def test_ignore_warnings():
+     t = table.Table([[np.nan, np.nan]])
+     with warnings.catch_warnings(record=True) as warns:
+diff --git a/astropy/tests/tests/test_socketblocker.py b/astropy/tests/tests/test_socketblocker.py
+index c362fa5..783defe 100644
+--- a/astropy/tests/tests/test_socketblocker.py
++++ b/astropy/tests/tests/test_socketblocker.py
+@@ -66,8 +66,8 @@ PY3_4 = sys.version_info[:2] >= (3, 4)
+ def _square(x):
+     return x ** 2
+ 
+-
+-@pytest.mark.skipif('not PY3_4 or sys.platform == "win32" or sys.platform.startswith("gnu0")')
++# see https://github.com/astropy/astropy/issues/4193
++@pytest.mark.skipif(True, reason="Blocks on Debian CI test")
+ def test_multiprocessing_forkserver():
+     """
+     Test that using multiprocessing with forkserver works.  Perhaps
+diff --git a/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py b/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py
+index 53436dd..4c710e7 100644
+--- a/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py
++++ b/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py
+@@ -3,6 +3,8 @@ from ..core import WCSAxes
+ import matplotlib.pyplot as plt
+ from matplotlib.backend_bases import KeyEvent
+ 
++import pytest
++
+ from ....wcs import WCS
+ from ....extern import six
+ from ....coordinates import FK5
+@@ -93,6 +95,8 @@ class TestDisplayWorldCoordinate(BaseImageTests):
+ 
+         assert string_world5 == six.u('267.652 -28\xb046\'23" (world, overlay 3)')
+ 
++    # See https://github.com/astropy/astropy/issues/5601
++    @pytest.mark.xfail()
+     def test_cube_coords(self, tmpdir):
+         wcs = WCS(self.cube_header)
+ 
+diff --git a/astropy/vo/samp/tests/test_standard_profile.py b/astropy/vo/samp/tests/test_standard_profile.py
+index 325ac96..ac25e55 100644
+--- a/astropy/vo/samp/tests/test_standard_profile.py
++++ b/astropy/vo/samp/tests/test_standard_profile.py
+@@ -62,6 +62,8 @@ class TestStandardProfile(object):
+ 
+         self.hub.stop()
+ 
++    # see https://github.com/astropy/astropy/issues/5460
++    @pytest.mark.skipif(True, reason="Setup fails due to SSL problems")
+     def test_main(self):
+ 
+         self.client1_id = self.client1.get_public_id()
diff --git a/dev-python/astropy/files/astropy-ply.py b/dev-python/astropy/files/astropy-ply.py
new file mode 100644
index 000000000000..19eb104c4ca0
--- /dev/null
+++ b/dev-python/astropy/files/astropy-ply.py
@@ -0,0 +1,58 @@
+# Licensed under a 3-clause BSD style license - see LICENSE.rst
+
+"""
+Handle loading ply package from system or from the bundled copy
+"""
+
+import imp
+from distutils.version import StrictVersion
+
+
+def _find_module(name, path=None):
+    """
+    Alternative to `imp.find_module` that can also search in subpackages.
+    """
+
+    parts = name.split('.')
+
+    for part in parts:
+        if path is not None:
+            path = [path]
+
+        fh, path, descr = imp.find_module(part, path)
+
+    return fh, path, descr
+
+_PLY_MIN_VERSION = StrictVersion('3.4')
+
+# Update this to prevent Astropy from using its bundled copy of ply
+# (but only if some other version of at least _PLY_MIN_VERSION can
+# be provided)
+_PLY_SEARCH_PATH = ['ply']
+
+
+for mod_name in _PLY_SEARCH_PATH:
+    try:
+        mod_info = _find_module(mod_name)
+        #mod_lex_info = _find_module(mod_name + '.lex')
+    except ImportError:
+        continue
+
+    mod = imp.load_module(__name__, *mod_info)
+    #mod_lex = imp.load_module(__name__ + '.lex', *mod_lex_info)
+
+    try:
+    #    if StrictVersion(mod_lex.__version__) >= _PLY_MIN_VERSION:
+    #        break
+        break
+    except (AttributeError, ValueError):
+        # Attribute error if the ply module isn't what it should be and doesn't
+        # have a .__version__; ValueError if the version string exists but is
+        # somehow bogus/unparseable
+        continue
+else:
+    raise ImportError(
+        "Astropy requires the 'ply' module of minimum version {0}; "
+        "normally this is bundled with the astropy package so if you get "
+        "this warning consult the packager of your Astropy "
+        "distribution.".format(_PLY_MIN_VERSION))
diff --git a/dev-python/astropy/metadata.xml b/dev-python/astropy/metadata.xml
new file mode 100644
index 000000000000..85615ff002ce
--- /dev/null
+++ b/dev-python/astropy/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  Astropy is a community-driven package intended to contain much of
+  the core functionality and some common tools needed for performing
+  astronomy and astrophysics with Python.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">astropy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/astroquery/Manifest b/dev-python/astroquery/Manifest
new file mode 100644
index 000000000000..7ded2fea345e
--- /dev/null
+++ b/dev-python/astroquery/Manifest
@@ -0,0 +1,4 @@
+DIST astroquery-0.3.6.tar.gz 2879493 SHA256 80a8cc8a2b614b3e00357d32e551b01ce1a06a4029e6c620332e19e71ea47b88 SHA512 631e42ef2c50b7a876efeff5a498707734a3ce29e9b5ad7074150272db4928b4f32572d1bfef37c10cb26c2f8fa39e4c7cc268d61320ba399f8479507b1a2fcd WHIRLPOOL 0282141ab710cf4c6b58370f061a5960cccc19360cce8e994d6659702a5d7b1e8d2afa1267f286ca96480bfe88a4b728d3941d06c70aa44a4b75819ddd987097
+EBUILD astroquery-0.3.6.ebuild 1550 SHA256 3492e02acfb4f1f01400e04856b3284f01fa04b73ef8023f5d26d0607cda9c26 SHA512 dfe5fa773075575eda80a88c10a0e5e3bebaa4d4c6e52587b03f567f144bc75381b388280775d039de859a7911ce2c2067eca3e1e018452b4e46988210812926 WHIRLPOOL 376f423a777f14b27d0eb4735b997d3e9261c9347751759c3cddf20cfded512853a4b42ae1d8eb621ac3b5a06e5c879eae45a181ef44a8841ef48686fb18e987
+MISC ChangeLog 666 SHA256 b068b447f0ce63ec4b38cbdf3826013ae92f03dd7cf97399f902eb171b780135 SHA512 686e35d6816daaec67f27e67fe53eb32fbec31b0c2bf36ac86c2aa63a477a95391bb91b2e43f93b2e0d2cfaa3a72086005949c640efed4039c937dd20a7f0769 WHIRLPOOL 21bf34560edceb80db6b5b7eaa449b06dfdf83c9004f1e19644142199e760903dacdb6f2226f6631961bd7b7a12316f123612b5a61f866878b0ff4f33918784e
+MISC metadata.xml 647 SHA256 75dc7e4d89141824a66aefedf3e23b5cb59786b8ea7ae04a70e7fe73a15bec52 SHA512 d677c42414e0271d73748505e577ec2dcedaf9fccf92413a8f3ad8f47c4823c1c0ea7856e977862581b0ee9e88ac12f1cf25e0e336293feed1f51597a4c6875f WHIRLPOOL 38d38f603aa68d9c1aa19b9cdd2eaab039a84e41e7ba36fccdd6287d40489006d46c4e34ea0122d182138ed6ff917e2c7ee3d338150c47dc21b4ea8468170ec5
diff --git a/dev-python/astroquery/astroquery-0.3.6.ebuild b/dev-python/astroquery/astroquery-0.3.6.ebuild
new file mode 100644
index 000000000000..1923b8dd52a1
--- /dev/null
+++ b/dev-python/astroquery/astroquery-0.3.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 xdg-utils virtualx
+
+DESCRIPTION="Collection of packages to access online astronomical resources"
+HOMEPAGE="https://github.com/astropy/astroquery"
+SRC_URI="https://github.com/astropy/astroquery/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+
+DOCS=( README.rst )
+
+PYTHON_REQ_USE="test? ( tk )"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/aplpy[${PYTHON_USEDEP}]
+			dev-python/pyregion[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	xdg_environment_reset
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	virtx esetup.py test
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_sphinx
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/astroquery/metadata.xml b/dev-python/astroquery/metadata.xml
new file mode 100644
index 000000000000..c634ebada8b3
--- /dev/null
+++ b/dev-python/astroquery/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Astroquery is a package containing a collection of tools to use
+    online astronomical databases. It integrates with Astropy and aims
+    to support many services with a uniform API.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">astropy/astroquery</remote-id>
+    <remote-id type="pypi">astroquery</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/astroscrappy/Manifest b/dev-python/astroscrappy/Manifest
new file mode 100644
index 000000000000..6bbd17a0a50e
--- /dev/null
+++ b/dev-python/astroscrappy/Manifest
@@ -0,0 +1,11 @@
+AUX astroscrappy-1.0.3-dont-install-binary.patch 460 SHA256 9363bc8a2b76147d1366c1d448fc5738a4ca13109165f45aab7f83f1394dd06d SHA512 b18ce0be8e2dc7c4e9c2334ae8987b5e3cfaf51c31de8e5be88a4f49436ddeb2de71caabaffda2441fbd59dc43697386ef0653c3210f8a728d175609d96226d1 WHIRLPOOL f2dbc0c9b50780134a9afdbcc2e31d7c8f03bf2a563f62663540b0708b6f0bef65cf7c7bacc8b53b39af20ff75eb8d4bbf58c40705276620bfb0a5f7381d7b65
+AUX astroscrappy-1.0.3-endian-fix-tests.patch 3941 SHA256 e596f2b6c7e9a6a248d4b7238f10a7d562106c7b3f47a52f7a1b5fb90a29ec5e SHA512 0439a414c87428e05c68677248b3bd37a9981aecf89d891c9d7b9c0d96d0f1e62f547cf88e4a8f3f1e71183aca607e407662bdc087bd4cc676bbc075f8653472 WHIRLPOOL 0942e4a4961ed358e60e1980885cf8bf0be060cff59e46a5b2bbe020d4d755cbcdba6150ced31a8bcc4ea7c1dc9a8f428253ca57cf5d09247926994f27626048
+AUX astroscrappy-1.0.3-numpy-fix-tests.patch 933 SHA256 f7ec6b3d5461c7fd0a2e9e830f1011c796df4edffed237ffb6e0f26d06912aba SHA512 1917d7d89550d6303f4faadb498c61669f5590edd836a49a21b4c419b92972244a6a1f90aa73add85e17bc0e336f04b13239948994dee53c57f48ba0a1c6e5a5 WHIRLPOOL 6631624c9faa1f002852975dd677c0b37aea8ac6d0b42862b0d72308889942677152efecb15cc6c72dab63216f4f36d89e7394593afe2b153a687439bd34b802
+AUX astroscrappy-1.0.3-respect-user-flag.patch 1639 SHA256 cfc46d7e8d32fb5b17b17375ef8c3eff3c9ac2992ccecb1460a7b7d99e7cce7f SHA512 5d39c2e0dac5647ff624680fdc8f369b92e6b325a3da55ea112d9df31af9534a164cf598a90a369dc0d753782802bfcc6927a8f4e8ca6f347e608a133584a148 WHIRLPOOL 6927819883724a091c31175579704eabd68c1fe93c05c326bfca20d090b4e036b05d5c91f41161b5c7db5781cdb34d2bbb75822d830f91a437fb2b811afc7a10
+AUX astroscrappy-1.0.5-respect-user-flag.patch 1417 SHA256 94230015c19e9c6d958a10c303593981c295566dac06010f681a1e82a6cb6731 SHA512 9bb2420c761bc11c4add8d058a216ba5995be0c8bcaa11d408b1c8cc51d9e86e70e52744238a760c4cb415248b0a0a7be09207dc2ebe3affd9c26442bb214e91 WHIRLPOOL 3144eaac19c857692f355fcecd7666884614c40640a14cdddcc061967312bc0ad8c0eced64b4ac13ca5ce4ad08cfec6043ecfef61627a54e9929e3649ff82621
+DIST astroscrappy-1.0.3.tar.gz 422209 SHA256 843af0ec1fb7439a886f05690a52d96342c3bd505dfdef42e922a66b67a89776 SHA512 2e96e8e62f81c770802a3c7699ca4455c640bb000aa4bffc22149745eed4e7e33cc4b297649020a601ff7fb242c0545cf9391c19ee2687adab26ac494d37dbb2 WHIRLPOOL 8ee318233639617608a4c4aea0a75227317f3ca695430c49882a1396178eb3655bd80169291de2631c752c81d41016dcda85653eb1caa372cfd7c0d49080fd67
+DIST astroscrappy-1.0.5.tar.gz 421910 SHA256 29f6ab8809fb404c369f0a63c74ec72a11fbe872650dd08906caf6ab801c2920 SHA512 bad648140abe3032aa76f43b4c61a15bc49b825bb8333d0e2dc6ba244542e5d6b283824336de82c73aefdfd62b952c9089c3237c913faf17874af13725345064 WHIRLPOOL d3e63f2e4fd352b85095149efa06a3bee11daaab723fbd041a6375772ca2d23b72759a0698d512198cd38086e2a20a5984b9a04346ab2814f455c45f831676fb
+EBUILD astroscrappy-1.0.3.ebuild 1414 SHA256 6f49b4aa9c637ba025e13f2bc94d8f8f2e3cb665f3abe01e34f606af3821dcff SHA512 21daa270a72eab60d03aa5317429925d0fcf16d9ea96bace1d11fffd2b3c165e7255d324b79387f70c8b57febefee7705c37e5ca9841e13d8559e2a9c05cd8cb WHIRLPOOL 9109cb626533b2295ab9577f3e7f6ef7cb6a7a628d34fca9b0c5789faaa8c8e28cc269360770adf1b9e8927ad6a77316d26e3ba1f61e2153264963ee60de7de6
+EBUILD astroscrappy-1.0.5.ebuild 1431 SHA256 cc72c549c97b58d1798bd8a3d444cd90e1a3bbefec48ffd903de128c69d315b8 SHA512 b4c47a3791ca838257e3e6e287725b7e3d4c5fd878ac9f3d869d442a792606c9d9e497dc3d8cc6fc2d8b336ca39f7a4e6aaf2b35d47f5a5e6f80060b6968b2bd WHIRLPOOL c7881459bfcda97085958e078c3a81254ff26cc3bc40f8014891059aeba533361b05aeaed056d25634aeb24a1ab7619320b7d3659224df94aa010a49b297e21c
+MISC ChangeLog 909 SHA256 947492287cf95f771d38d4396e1f828444fe848e48686aa5cea0cb05136fc3df SHA512 7f3e3eea08c0b80fc0abf1c35a20407961a8651c597fb1e441f104f1604b1576ed97d5666970bde44bb6645f6ffc7d3c429bed75ff05aaf2ca9ae6d3b932f75c WHIRLPOOL 3a136e60f7c4da7ccc977358a139ed977dfbc9b62ada2a21aea291c0c9f9897c64d60a7d5f6cb8d827f36437ac1111d135170f8807c0630cee1022b9eb5ec050
+MISC metadata.xml 642 SHA256 38f44b51d8e21eb00839ef793361361f909f49835c4afe736dc2847572e2ce40 SHA512 803d99c24952fb6bc3e118234c4e2c7c78dcd82717e0240104f042fd305d3e1c675b9b67a7cdedd5a3d0d71967b460b3c32174eaeff6d8b523d6e57dd961d298 WHIRLPOOL 6fa55be48b010d7b5a5d0692355e3985a18b6ca12972e2c7bc3409678582bee1da25df04e4dea7abd08706abd2dc94c2cc49db9c91109cf765398b7b3f24b223
diff --git a/dev-python/astroscrappy/astroscrappy-1.0.3.ebuild b/dev-python/astroscrappy/astroscrappy-1.0.3.ebuild
new file mode 100644
index 000000000000..fea8b1aceccc
--- /dev/null
+++ b/dev-python/astroscrappy/astroscrappy-1.0.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 toolchain-funcs flag-o-matic
+
+DESCRIPTION="Optimized cosmic ray annihilation astropy python module"
+HOMEPAGE="https://github.com/astropy/astroscrappy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc openmp test"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-dont-install-binary.patch"
+	"${FILESDIR}/${P}-endian-fix-tests.patch"
+	"${FILESDIR}/${P}-numpy-fix-tests.patch"
+	"${FILESDIR}/${P}-respect-user-flag.patch"
+)
+
+DOCS=( CHANGES.rst )
+
+python_prepare_all() {
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	use openmp && tc-has-openmp && append-flags -fopenmp
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/astroscrappy/astroscrappy-1.0.5.ebuild b/dev-python/astroscrappy/astroscrappy-1.0.5.ebuild
new file mode 100644
index 000000000000..6f21b4291b6a
--- /dev/null
+++ b/dev-python/astroscrappy/astroscrappy-1.0.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Optimized cosmic ray annihilation astropy python module"
+HOMEPAGE="https://github.com/astropy/astroscrappy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc openmp test"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+DOCS=( CHANGES.rst )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.5-respect-user-flag.patch"
+)
+
+python_prepare_all() {
+	# use astropy-helpers from system
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	# if the user explicitely does not want openmp, do not forcefully use it
+	if ! use openmp; then
+		sed -e 's/if has_openmp/if False/' \
+			-i astroscrappy/utils/setup_package.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/astroscrappy/files/astroscrappy-1.0.3-dont-install-binary.patch b/dev-python/astroscrappy/files/astroscrappy-1.0.3-dont-install-binary.patch
new file mode 100644
index 000000000000..4c69f00cc88d
--- /dev/null
+++ b/dev-python/astroscrappy/files/astroscrappy-1.0.3-dont-install-binary.patch
@@ -0,0 +1,14 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Don't install example/template binary
+--- a/setup.py
++++ b/setup.py
+@@ -80,9 +80,6 @@
+ 
+ # Define entry points for command-line scripts
+ entry_points = {}
+-entry_points['console_scripts'] = [
+-    'astropy-package-template-example = packagename.example_mod:main',
+-]
+ 
+ # Include all .c files, recursively, including those generated by
+ # Cython, since we can not do this in MANIFEST.in with a "dynamic"
diff --git a/dev-python/astroscrappy/files/astroscrappy-1.0.3-endian-fix-tests.patch b/dev-python/astroscrappy/files/astroscrappy-1.0.3-endian-fix-tests.patch
new file mode 100644
index 000000000000..7a2bbb6299c6
--- /dev/null
+++ b/dev-python/astroscrappy/files/astroscrappy-1.0.3-endian-fix-tests.patch
@@ -0,0 +1,100 @@
+From 5b5ce99c63d03e60b6027f09f72231db11a87bf2 Mon Sep 17 00:00:00 2001
+From: Curtis McCully <cmccully@lcogt.net>
+Date: Thu, 3 Dec 2015 12:02:38 -0800
+Subject: [PATCH] Made tests not endian specific.
+--- a/astroscrappy/tests/test_utils.py
++++ b/astroscrappy/tests/test_utils.py
+@@ -56,7 +56,7 @@
+ 
+ 
+ def test_medfilt5():
+-    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
++    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
+     npmed5 = ndimage.filters.median_filter(a, size=(5, 5), mode='nearest')
+     npmed5[:2, :] = a[:2, :]
+     npmed5[-2:, :] = a[-2:, :]
+@@ -68,7 +68,7 @@
+ 
+ 
+ def test_medfilt7():
+-    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
++    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
+     npmed7 = ndimage.filters.median_filter(a, size=(7, 7), mode='nearest')
+     npmed7[:3, :] = a[:3, :]
+     npmed7[-3:, :] = a[-3:, :]
+@@ -80,7 +80,7 @@
+ 
+ 
+ def test_sepmedfilt3():
+-    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
++    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
+     npmed3 = ndimage.filters.median_filter(a, size=(1, 3), mode='nearest')
+     npmed3[:, :1] = a[:, :1]
+     npmed3[:, -1:] = a[:, -1:]
+@@ -95,7 +95,7 @@
+ 
+ 
+ def test_sepmedfilt5():
+-    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
++    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
+     npmed5 = ndimage.filters.median_filter(a, size=(1, 5), mode='nearest')
+     npmed5[:, :2] = a[:, :2]
+     npmed5[:, -2:] = a[:, -2:]
+@@ -110,7 +110,7 @@
+ 
+ 
+ def test_sepmedfilt7():
+-    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
++    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
+     npmed7 = ndimage.filters.median_filter(a, size=(1, 7), mode='nearest')
+     npmed7[:, :3] = a[:, :3]
+     npmed7[:, -3:] = a[:, -3:]
+@@ -125,7 +125,7 @@
+ 
+ 
+ def test_sepmedfilt9():
+-    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
++    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
+     npmed9 = ndimage.filters.median_filter(a, size=(1, 9), mode='nearest')
+     npmed9[:, :4] = a[:, :4]
+     npmed9[:, -4:] = a[:, -4:]
+@@ -174,7 +174,7 @@
+ 
+ 
+ def test_subsample():
+-    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
++    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
+     npsubsamp = np.zeros((a.shape[0] * 2, a.shape[1] * 2), dtype=np.float32)
+     for i in range(a.shape[0]):
+         for j in range(a.shape[1]):
+@@ -189,8 +189,8 @@
+ 
+ def test_rebin():
+     a = np.ascontiguousarray(np.random.random((2002, 2002)), dtype=np.float32)
+-    a = a.astype('<f4')
+-    nprebin = np.zeros((1001, 1001), dtype=np.float32).astype('<f4')
++    a = a.astype('f4')
++    nprebin = np.zeros((1001, 1001), dtype=np.float32).astype('f4')
+     for i in range(1001):
+         for j in range(1001):
+             nprebin[i, j] = (a[2 * i, 2 * j] + a[2 * i + 1, 2 * j] +
+@@ -202,7 +202,7 @@
+ 
+ 
+ def test_laplaceconvolve():
+-    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
++    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
+     k = np.array([[0.0, -1.0, 0.0], [-1.0, 4.0, -1.0], [0.0, -1.0, 0.0]])
+     k = k.astype('<f4')
+     npconv = ndimage.filters.convolve(a, k, mode='constant', cval=0.0)
+@@ -211,8 +211,8 @@
+ 
+ 
+ def test_convolve():
+-    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('<f4')
+-    k = np.ascontiguousarray(np.random.random((5, 5))).astype('<f4')
++    a = np.ascontiguousarray(np.random.random((1001, 1001))).astype('f4')
++    k = np.ascontiguousarray(np.random.random((5, 5))).astype('f4')
+     npconv = ndimage.filters.convolve(a, k, mode='constant', cval=0.0)
+     cconv = convolve(a, k)
+     assert_allclose(cconv, npconv, rtol=0, atol=1e-5)
diff --git a/dev-python/astroscrappy/files/astroscrappy-1.0.3-numpy-fix-tests.patch b/dev-python/astroscrappy/files/astroscrappy-1.0.3-numpy-fix-tests.patch
new file mode 100644
index 000000000000..d7a1c93a5740
--- /dev/null
+++ b/dev-python/astroscrappy/files/astroscrappy-1.0.3-numpy-fix-tests.patch
@@ -0,0 +1,21 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Cast the numpy arrays in the test to the same data type
+Bug: https://ci.debian.net/data/packages/unstable/amd64/a/astroscrappy/20160112_151253.autopkgtest.log.gz
+--- a/astroscrappy/tests/test_astroscrappy.py
++++ b/astroscrappy/tests/test_astroscrappy.py
+@@ -36,7 +36,7 @@
+     imdata += gaussian(imdata.shape, x, y, brightness, 3.5)
+ 
+ # Add the poisson noise
+-imdata = np.random.poisson(imdata)
++imdata = np.float32(np.random.poisson(imdata))
+ 
+ # Add readnoise
+ imdata += np.random.normal(0.0, 10.0, size=(1001, 1001))
+@@ -60,4 +60,4 @@
+     # contrast that we can turn our detection threshold up.
+     mask, _clean = detect_cosmics(imdata, readnoise=10., gain=1.0,
+                                   sigclip=6, sigfrac=1.0)
+-    assert (mask == expected_crmask).sum() == (1001 * 1001)
+\ No newline at end of file
++    assert (mask == expected_crmask).sum() == (1001 * 1001)
diff --git a/dev-python/astroscrappy/files/astroscrappy-1.0.3-respect-user-flag.patch b/dev-python/astroscrappy/files/astroscrappy-1.0.3-respect-user-flag.patch
new file mode 100644
index 000000000000..fb7bca64ce7f
--- /dev/null
+++ b/dev-python/astroscrappy/files/astroscrappy-1.0.3-respect-user-flag.patch
@@ -0,0 +1,35 @@
+--- astroscrappy/astroscrappy/utils/setup_package.py.orig	2016-03-09 22:50:34.304043122 +0000
++++ astroscrappy/astroscrappy/utils/setup_package.py	2016-03-09 22:54:53.560783823 +0000
+@@ -43,30 +43,11 @@
+                     sources=med_sources,
+                     include_dirs=include_dirs,
+                     libraries=libraries,
+-                    language="c",
+-                    extra_compile_args=['-g', '-O3', '-funroll-loops',
+-                                        '-ffast-math'])
++                    language="c")
+     ext_im = Extension(name=str("astroscrappy.utils.image_utils"),
+                     sources=im_sources,
+                     include_dirs=include_dirs,
+                     libraries=libraries,
+-                    language="c",
+-                    extra_compile_args=['-g', '-O3', '-funroll-loops',
+-                                        '-ffast-math'])
+-
+-    has_openmp, outputs = check_openmp()
+-    if has_openmp:
+-        ext_med.extra_compile_args.append('-fopenmp')
+-        ext_im.extra_compile_args.append('-fopenmp')
+-        ext_med.extra_link_args = ['-g', '-fopenmp']
+-        ext_im.extra_link_args = ['-g', '-fopenmp']
+-    else:
+-        log.warn('OpenMP was not found. '
+-                 'astroscrappy will be compiled without OpenMP. '
+-                 '(Use the "-v" option of setup.py for more details.)')
+-        log.debug(('(Start of OpenMP info)\n'
+-                   'compiler stdout:\n{0}\n'
+-                   'compiler stderr:\n{1}\n'
+-                   '(End of OpenMP info)').format(*outputs))
++                    language="c")
+ 
+     return [ext_med, ext_im]
diff --git a/dev-python/astroscrappy/files/astroscrappy-1.0.5-respect-user-flag.patch b/dev-python/astroscrappy/files/astroscrappy-1.0.5-respect-user-flag.patch
new file mode 100644
index 000000000000..b3638e1bffc3
--- /dev/null
+++ b/dev-python/astroscrappy/files/astroscrappy-1.0.5-respect-user-flag.patch
@@ -0,0 +1,36 @@
+From f3acf99e65f58e2ee2f409d33f44a3abb1ba90c4 Mon Sep 17 00:00:00 2001
+From: Sébastien Fabbro <bicatali@gentoo.org>
+Date: Wed, 31 Aug 2016 22:19:12 +0000
+Subject: [PATCH] respect user compiling flags Depending on compilers, -O3
+ -funroll-loops is not the fastest.
+
+---
+ astroscrappy/utils/setup_package.py | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/astroscrappy/utils/setup_package.py b/astroscrappy/utils/setup_package.py
+index 3e1fba2..c271613 100644
+--- a/astroscrappy/utils/setup_package.py
++++ b/astroscrappy/utils/setup_package.py
+@@ -73,16 +73,12 @@ def get_extensions():
+                     sources=med_sources,
+                     include_dirs=include_dirs,
+                     libraries=libraries,
+-                    language="c",
+-                    extra_compile_args=['-g', '-O3', '-funroll-loops',
+-                                        '-ffast-math'])
++                    language="c")
+     ext_im = Extension(name=str("astroscrappy.utils.image_utils"),
+                     sources=im_sources,
+                     include_dirs=include_dirs,
+                     libraries=libraries,
+-                    language="c",
+-                    extra_compile_args=['-g', '-O3', '-funroll-loops',
+-                                        '-ffast-math'])
++                    language="c")
+ 
+     has_openmp, outputs = check_openmp()
+     if has_openmp:
+-- 
+2.9.3
+
diff --git a/dev-python/astroscrappy/metadata.xml b/dev-python/astroscrappy/metadata.xml
new file mode 100644
index 000000000000..6a303f8428d9
--- /dev/null
+++ b/dev-python/astroscrappy/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Astro-SCRAPPY is designed to detect cosmic rays in images (numpy arrays),
+    based on Pieter van Dokkum's L.A.Cosmic algorithm. Parallelization is
+    achieved using OpenMP.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">astroscrappy</remote-id>
+    <remote-id type="github">astropy/astroscrappy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/async/Manifest b/dev-python/async/Manifest
new file mode 100644
index 000000000000..c2a5995ba8c4
--- /dev/null
+++ b/dev-python/async/Manifest
@@ -0,0 +1,5 @@
+DIST async-0.6.2.tar.gz 30177 SHA256 ac6894d876e45878faae493b0cf61d0e28ec417334448ac0a6ea2229d8343051 SHA512 6d3376e2d40e07a402cdcc17d0b1789883d5aa5fa24931ed0bfd98bf32454fd126b3591e3c0dc3acea37c0bfe0d27cc65df42a44c92f0bd13e4bbb7a477ff69c WHIRLPOOL 553c9d18fd38daa9bd7e5f8246c181ba429e1a346be5e85ebd9a611c8ce61beab09db172705ee6afd58bf3cc5e6434ebe97924d7adcd7a6322b0e82d6a2dcd71
+EBUILD async-0.6.2.ebuild 571 SHA256 09717dcab3f09be3cc5e6fc3fda9174e6a70bfe8defa39002e3ebb9897ca2b3d SHA512 5bf31cf33dd7f1b610be0a350c3fc7e726df66e3cfca5a7ed58a0b1726a052d6c8a4c0f504f09645c3b27952cf6fa4074e0604212786c2aaf3cb4d8c82554fbe WHIRLPOOL dba5ca289ccb768f47951cdccebbffb9cb513fa9d0e733af419dbea19811d220c690ad1f24ab3501779ea3b7970b64abb28e2549be5d21bed48892e770e245ac
+MISC ChangeLog 3479 SHA256 9ca97f2a35151a09f5985064aa05bf4823950991f9ddb31e6d45cad3691b0e01 SHA512 5ed7e57f89d62a93573e226fc12104cecfce831b382dbd7090d12f6f9619a1e1594036c786f29143e0f2a0b1784ed9e90b8b5977055f0e5d84201119b6e29767 WHIRLPOOL c74b98abcc699a223081185bf6dde8721036fceb3642163dcedfc27f895c6919bca866b5c91c05761b9cc14b05cbdb410c58665346feccbbafcb3f72ea249fc0
+MISC ChangeLog-2015 1146 SHA256 e48511a74b015c419190a03e72f22f7b3e54e314dd0e1a68b65c768174886340 SHA512 3930d24b72044bd5e06dc49a372ccacaf9947dc694ef7f3b80545ce79050f366167e7c63b9f84ab608ccaafbd604a1cfaabf60b3ada0e4c0867a4ee599b4aa2e WHIRLPOOL 3fe071abfe9a62181ee90f97c33071a1525aaf094a826d5a1fea091f8777f8662a74aea090037494161aa44424f69957cd738e25641560f77aca243f57bf6489
+MISC metadata.xml 308 SHA256 5438629567493277fcef004a6a59b6972a4478a2c8dc2c5c5cb8edf51aa77c2f SHA512 1cb5441758b509cbf1e2b04eb2c4cf8cf9e945475ae296fcc1cc895fb93a604d4acd9a70b9905239aaa97ffe8ea3872bcf8d247b05fa67a7aff1eed2cc67ec54 WHIRLPOOL ad8424fbc0eaa99c17753c515d9984009b98cd4a36b2d93b3767b3c9f6a77301a6ef0f7b0fb135b194d96c545fd6b174d2c8693546c2ed697e38d39cf624c9d7
diff --git a/dev-python/async/async-0.6.2.ebuild b/dev-python/async/async-0.6.2.ebuild
new file mode 100644
index 000000000000..cf9973078f4e
--- /dev/null
+++ b/dev-python/async/async-0.6.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Async Framework"
+HOMEPAGE="
+	http://gitorious.org/git-python/async
+	https://pypi.python.org/pypi/async"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	"
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/async/metadata.xml b/dev-python/async/metadata.xml
new file mode 100644
index 000000000000..c73b93b6a491
--- /dev/null
+++ b/dev-python/async/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">async</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
new file mode 100644
index 000000000000..a5630c49561c
--- /dev/null
+++ b/dev-python/async_timeout/Manifest
@@ -0,0 +1,10 @@
+DIST async-timeout-1.1.0.tar.gz 7590 SHA256 b88bd1fe001b800ec23c7bf27a81b32819e2a56668e9fba5646a7f3618143081 SHA512 7132b0616052623c17d7a541051f3e759f8dc87f9ff1730585a1010bc6e139c24d5b8835431749d695fde56fb465f22094ec3f98f5f95b0b7664ec9e1f990cac WHIRLPOOL d629fb4f0bf85b5d9123ffc364da058dbeb67c07c63071fa12a57f926a8735bdbff52c4146fe16934adc60dd560e080a2e9bf39478651a2ca078b5db66802c73
+DIST async-timeout-1.2.0.tar.gz 7700 SHA256 0652d108c0156ae5ac94d99f53a6bdd039b0c076346ff8f58c9a1551fac17a19 SHA512 81a8d3fd8a6756335ce7ea292afd0ba508ea120482dfc4526017dbf6ee809e6828818653be25dee123e8626fc89cc49cfbcff41748ec950b8797b2bb21f262db WHIRLPOOL d68180af72dbd2d70de77796183a55f78aeb4e96a183bc115f68cfc5b40baa7924a117c6f3245fef6998f24e968466519f04596d4a2a4de419935fedbabb9d35
+DIST async-timeout-1.2.1.tar.gz 7797 SHA256 380e9bfd4c009a14931ffe487499b0906b00b3378bb743542cfd9fbb6d8e4657 SHA512 2072caeb65a74f1a24b59a4ea905ef96d70f8fb117e3dd9c95c1107b1d67ffaa4d76b68f00364049e6e29cdb0a6d247ba0c3638ccd0a8db27bd6ee0f180f9ccb WHIRLPOOL f51d6db3e1531b91a240f325707a380e428d7958fb9b2ef9ae3d8a4c55bbd8663fd861fae3b44a11d9e6ae6e7e58af586fc3365f2878dda28705ed1c0d35a6b6
+DIST async_timeout-1.0.0.tar.gz 7554 SHA256 c7afd7355b93fca0aecc15811aa53eea57f6fd7307b5bff2336b01419ebeda36 SHA512 b02fa2f9558d23e6e1cc076f8d144dcfee7adeaad67c023ce747c99935c2809e2a2223f72b0a12274f11bacadc9b69a6bc3a2914c305ef05d483dc29908e9c97 WHIRLPOOL 4f2fb79330827e17acfb141fcc846207cfee303321367921e08d5c1da7a5e0ce496774e92ac81b84b7d773eb6d83c4f702c9a41d04ae0b7a2663f32d8bd1a12c
+EBUILD async_timeout-1.0.0.ebuild 645 SHA256 e8178636e3e941a73e9bdcd9a883871f42e96652d7eb7260534a94091dce5e27 SHA512 2e7baa4d0c31f481a7addd27a6bbb789aa70c302f45eb30571023694672215ba5c6fc8e1da3b81ff140479c9f698998d449860e0dc27b128d8c5c96a14045132 WHIRLPOOL 57907ef15beb9582d76ae9541b5df58f91766e92760e596bebb53e6a086cef72e8d3a471958b9a8dd2806d49218c2605eb2afd4806a623062f726089b344f023
+EBUILD async_timeout-1.1.0.ebuild 692 SHA256 060fd9999da96b223434fdb2e281afbf0aba91a1fc1430db5838408daf8d5c2a SHA512 e171d352b5fd194b83538fe4e229c6770b214674981cfcdfc9edae4c91fb4066c482416d7e19323035bde258db7e84326ce0b98b6dbc05e9475eb6e3ebe2f0c2 WHIRLPOOL a84e35bf811481401eae8f72afbbbb2558501b4f140e77cac0d68e1e303f982eab8800d13aaac4818a4f6b7c0456062ec5a4a2d5099343b52e906109b05c78b9
+EBUILD async_timeout-1.2.0.ebuild 684 SHA256 8586e93b0a205c5ed0ae0a7c5232ea378118c50e6abe297b0aaf594fd46a5a2c SHA512 7018d92dc2d63324016b3c84508bbac0faab5a45bdf60d27273f0768dc8c8178c3fb1533bad2e9fd9cb0a66b8e8312421e158ddafc26cb7dd62b51a77aca04df WHIRLPOOL 235f041a2e5476e0e80df7573c3e7a83b5a1dd46fb2bd34e338ac9a0cdf3144185d4e6ffd93c18131aec4439a6c8aede5558dc50ca5cf805f897730e12b1286a
+EBUILD async_timeout-1.2.1.ebuild 774 SHA256 d81ba9652148d795ebf2673a7d1d42f3348d343a646bc4ba01ac69b06e845bf1 SHA512 8ed85a92f4cb51697122dbcddc1373d47441c86ecf468338c61fe282f9760caf7e3de4828e4513edd15ef94d64fedbbb1599a558f96ff08fde6de57c490106f1 WHIRLPOOL b3fec8d47f2dd5017061bb8ff4dac7b345aec20b3f147e50232c1609f825bddf3507fc42267380bab63eb3024303c98c6e3689e8e64b258f3ef1c81f459c635a
+MISC ChangeLog 493 SHA256 9e5b4eda838e351203a3d17d11b0522d2de22f2dfbd3cb519a4f0ca1b4d984ac SHA512 4c0e5c089191205cecdf5b993aa819824ee8723f8e9716dd6f016bf60ca5129d6cc34a7e0be78019e84626bce9d145fe74d61d7e0d90de68d2c85efcd75dfa92 WHIRLPOOL 25ad781e89652546f62711113f557bcda3c0ef9e0db8c60ca3d1acd319e74d2f254ebf487edc85bea05d851229151460fd9875450fb93c08cd8dd0d2daa94b0e
+MISC metadata.xml 356 SHA256 a984f8d92cc154c95bf0fe5ca84eb2b6103ca8c6b1be15c0515ae5b2566ea7ee SHA512 efb996fac98f1e12c041fc6828732ec61f5e85f7d4762faf7387a0a0f59c60b64ffdb0b0c4d29f2f9f8c125f30b1462650be1bb13b09aca70e555c139fb6316d WHIRLPOOL 37f8116c9c3ce2d0f485fed513a88a0dd54797b7ef772a0070a307eb09e9d6b3156a0f8669369bcfe89892859c9aef358320f421b3fb39279e9da655eda518e8
diff --git a/dev-python/async_timeout/async_timeout-1.0.0.ebuild b/dev-python/async_timeout/async_timeout-1.0.0.ebuild
new file mode 100644
index 000000000000..e6d3e2d4bc9b
--- /dev/null
+++ b/dev-python/async_timeout/async_timeout-1.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Timeout context manager for asyncio programs"
+HOMEPAGE="https://github.com/aio-libs/async_timeout/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# tests introduce a circular dependency on aiohttp
+RESTRICT="test"
+
+DEPEND="dev-python/pytest-runner[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test || die
+}
diff --git a/dev-python/async_timeout/async_timeout-1.1.0.ebuild b/dev-python/async_timeout/async_timeout-1.1.0.ebuild
new file mode 100644
index 000000000000..db1c83a27cc1
--- /dev/null
+++ b/dev-python/async_timeout/async_timeout-1.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_P=${PN/_/-}-${PV}
+DESCRIPTION="Timeout context manager for asyncio programs"
+HOMEPAGE="https://github.com/aio-libs/async_timeout/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# tests introduce a circular dependency on aiohttp
+RESTRICT="test"
+S=${WORKDIR}/${MY_P}
+
+DEPEND="dev-python/pytest-runner[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test || die
+}
diff --git a/dev-python/async_timeout/async_timeout-1.2.0.ebuild b/dev-python/async_timeout/async_timeout-1.2.0.ebuild
new file mode 100644
index 000000000000..6785e3411e4c
--- /dev/null
+++ b/dev-python/async_timeout/async_timeout-1.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_P=${PN/_/-}-${PV}
+DESCRIPTION="Timeout context manager for asyncio programs"
+HOMEPAGE="https://github.com/aio-libs/async_timeout/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+S=${WORKDIR}/${MY_P}
+
+DEPEND="dev-python/pytest-runner[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest-aiohttp[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test || die
+}
diff --git a/dev-python/async_timeout/async_timeout-1.2.1.ebuild b/dev-python/async_timeout/async_timeout-1.2.1.ebuild
new file mode 100644
index 000000000000..b779d8703ece
--- /dev/null
+++ b/dev-python/async_timeout/async_timeout-1.2.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_P=${PN/_/-}-${PV}
+DESCRIPTION="Timeout context manager for asyncio programs"
+HOMEPAGE="https://github.com/aio-libs/async-timeout"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+S=${WORKDIR}/${MY_P}
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest-aiohttp[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -i "s:, 'pytest-runner'::" -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/async_timeout/metadata.xml b/dev-python/async_timeout/metadata.xml
new file mode 100644
index 000000000000..94ccc65f454f
--- /dev/null
+++ b/dev-python/async_timeout/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">async_timeout</remote-id>
+		<remote-id type="github">aio-libs/async_timeout</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/atom/Manifest b/dev-python/atom/Manifest
new file mode 100644
index 000000000000..d3b8009f6d15
--- /dev/null
+++ b/dev-python/atom/Manifest
@@ -0,0 +1,5 @@
+DIST atom-0.3.10.zip 102102 SHA256 461ffb57ff9448242b66e08d367f9c65bfd9bf04215591e7e9580f289139debf SHA512 ae22747f96e42b9cc4f7c92ddb7d7b8af647e17b917481cd267d4162bd9260b906a019a73de2ca6e3c72a9430dacd535001da7dcb809c1c3dc18c7297be14b76 WHIRLPOOL 23a39d1dddb6c42850925244a8d6da1f589690e7c73416773e954f9ee74665e75c9686f5517af93711a226f828364b483497a98bbf054e4c97f75178ff77adce
+EBUILD atom-0.3.10.ebuild 1235 SHA256 edd4daa521da9f9cff85a7764275b152ab159d7d96f7954b9283341f124aebf9 SHA512 364b84a9c1a310efea4b5d996e7cf521589a2a0c4f66c78d4c1c20d5085657156d16f932dd9dee795145347d4b7bfd62024ee85a2402f12c7415387fbe36ef40 WHIRLPOOL f0f5c438348cc982416eaa66128b98913ac79dd74f4133ea9f93e8898cf19066e330d06e50f9b5f5f6c28a5c6a063b714324f1d210f38465653c9908e6f79a31
+MISC ChangeLog 2422 SHA256 119ccb0d09b8b92a23752c0c7e12d869c0be41cef8fce0a968aa93182412bbd6 SHA512 8dd6d2c052ca8c561051f555e7495e3dc906b1a247ff33709d98e7f00920dca222d6dbbdb183ffc1944cef82016b949a80354b16650d1fb780b2398a77d425e8 WHIRLPOOL 387b46d1b32c114c5a5ff3fb831637e0c3799d85bce058d10c4e1d56bc78da432aca249c51f98d7d03bd74a5174203596648ca99159c834316c58712a6176f4f
+MISC ChangeLog-2015 761 SHA256 5e5c9e0db1798af3f9040b9f924d94e8b2fc93e3d96f2839d74cf448f60954e7 SHA512 4172a03ef88188a85284ac136c7b5f0812790312daae110b1b9820f42b8e38409b1861ad94d93d362a9180fc71aad24f6b016a51fa340fd4d01ffbfc20fdc3f2 WHIRLPOOL f2b9345171292f5530d293abc4c65fdbd6fa30052d4618206081e6054b3efa83d63e7d24fa90a11f050faa1386912ac1cf5cd36131a25087fdb01a3a698ed3c2
+MISC metadata.xml 371 SHA256 bae11ad6418a3d6c609a8c8ac9d080ac34f0161550ec0f39f8f09aee31f64b2c SHA512 1914ed5cf60c1815a0bd9639e7af0a85b6dc2bf9952cb0ad00e69fd3e3a529a0fa6215079f8ca56b1fda49d36f34190a4c011afe41b11d81d0bb58e0674e466e WHIRLPOOL 4969d343e5d74f32b67034751c596240e22d0a61ff06010245f0187d5a2098398079aa49f09b1fcd512dfde04b4b6495c05e3f41b96f145fc18c0861ab096b8c
diff --git a/dev-python/atom/atom-0.3.10.ebuild b/dev-python/atom/atom-0.3.10.ebuild
new file mode 100644
index 000000000000..d98b0c8d4f64
--- /dev/null
+++ b/dev-python/atom/atom-0.3.10.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Memory efficient Python objects"
+HOMEPAGE="https://github.com/nucleic/atom"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="Clear-BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		app-arch/unzip
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Required to avoid file collisions at install
+	sed -e "s:find_packages():find_packages(exclude=['tests']):" -i setup.py || die
+
+	# Reset from use of local paths
+	if use test; then
+		sed -e 's:from .catom:from catom:g' -i ${PN}/*.py || die
+	fi
+
+	append-flags -fno-strict-aliasing
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}"/lib:"${BUILD_DIR}"/lib/${PN} \
+		nosetests || die "Tests failed"
+	pushd "${BUILD_DIR}"/lib > /dev/null
+	# Change the state back to original ready for installing
+	sed -e 's:from catom:from .catom:g' -i ${PN}/*.py
+	popd > /dev/null
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/atom/metadata.xml b/dev-python/atom/metadata.xml
new file mode 100644
index 000000000000..c53bd21714ed
--- /dev/null
+++ b/dev-python/atom/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">atom</remote-id>
+    <remote-id type="github">nucleic/atom</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
new file mode 100644
index 000000000000..9d8857e41ea1
--- /dev/null
+++ b/dev-python/atomicwrites/Manifest
@@ -0,0 +1,8 @@
+DIST atomicwrites-0.1.8.tar.gz 14440 SHA256 3274adb52bd3ae91d87ba923e0f21fd86c05b71bbaefe2ec0d6679c01f98dc8e SHA512 51c03f875adec409663badb94e3214858e6cd190aa07b8ffb4c35be1f3acaa8b5a341f62b45f814308dbfbd391fd32df24618df70c36f27737853852963af25a WHIRLPOOL 036304b72b6b7d45bf109f6c46a2eb4249c25cbd4aabeda93fc1c4761b13acf7a00c7b4be57990f5d9167a6851cde4bc5c98b4249411e4e361f1ea653b0aed16
+DIST atomicwrites-0.1.9.tar.gz 14475 SHA256 7cdfcee8c064bc0ba30b0444ba0919ebafccf5b0b1916c8cde07e410042c4023 SHA512 d7bf742c3cb1d5eee4921fca225b5d22e0fe18f2948fb7af44bc6817fc2b5d267fca0d42371d44730d3b557a400f9d6ce250ac3a05e1ce1d3600ec6569fa7aa6 WHIRLPOOL 583b60d20d06126bff40cf73f560995c4ccb1c5becc686dac946f0542c74e1373edf3d9f9f67042f2eb3697ad68601fcc8f9b505482c085da7fb07ca1eab8d51
+DIST atomicwrites-1.1.5.tar.gz 18951 SHA256 240831ea22da9ab882b551b31d4225591e5e447a68c5e188db5b89ca1d487585 SHA512 4de8ab93dcb226c55e8ae1b0ef883c2e1eeae50ac6596afe036ca51dbf6b094c13dbf2d792972312d4c53551886aaa2713aac54bfab42b85abef4d1146e039ac WHIRLPOOL e9bfb96ddd365bf8db69678fb79404743de125e2bca1b072db7a66ad345e04620c66ef2938efed5035e40f4c4fad04636c0f1a464bf79872b26f4d4a1fc5b391
+EBUILD atomicwrites-0.1.8.ebuild 425 SHA256 b72e95b20cbb5acd7566d7530d79386414c2c47e03d50d5f758003f82c3f8eba SHA512 d3fdd8a8bec8c859d42540a4723c72c621573e69f24cd2ddd4579c34ea4fc171f0a2113c4f299baf2167ca6ddb2ce2e5183986c7900b9f10b881d31a7999cb1d WHIRLPOOL fad3b6f901822a082f84efead351e97b58a14557650df58e917e6379040ef64abf74361458160b771b074a5662029cd59ec33f5a417a1e2201039563e5054747
+EBUILD atomicwrites-0.1.9.ebuild 425 SHA256 20f9d260c091a39b643f07c1809963961aabe92c3213e2c43bd154b73895855b SHA512 d8ee56c5aef3661f87dee755562ec32b5ef223355f0f4d9dcb5f944936669ad80a278479efec9f162b85a59e3a2ea9acbc45a000b3718669017aea4635d1257f WHIRLPOOL b05ecb5c3712dfcc41d362040ec74d9608fff1b1c16953b90085fe04e367d46cbb914b107197ca4939f005fa3203a4017b001f417d965d9a8d716f982164d52b
+EBUILD atomicwrites-1.1.5-r2.ebuild 567 SHA256 3e6a9033c808c38f11ada1323a8e9d8cd600640d6860e62eed1967f0098cc864 SHA512 bb7a44b1501e2fca358d3ef1a7e8b96b5b83460bf430bf6f3e8ba6fcef60be6a382851df58540d3ee4eb32a7cd2cc8f228e893729c00fdd856c002d4b4895f57 WHIRLPOOL 1d9b28982c0e80049cda1b5914560ff572ebef3d9262f0342c132498a7f0f75832195ddad0ec37f8b3caa74ca06400250023399eef9c1030cc908e6c2042dd1b
+MISC ChangeLog 866 SHA256 c0a081d1dc8d771781326f17c029259faf842c73f766c14732b2e0e7f89069b0 SHA512 45fbcd51dc0ab081b85db1fe00cf731b2f755b6ea5e932a450a2a38b545ed757210e937e0d69e5bdeef2c89ba3a8aef8128b6a7f2361af79022daa137bfda31a WHIRLPOOL 6e66ab5a4156f67b739aef4b0ab6561240b3d124e1fea4d7d522f9b504f72f589c2acb0c94dfc446b4d3a19cb7543316ff150a714ce126d8207b05241d39cb4d
+MISC metadata.xml 361 SHA256 c687c9ac0db6e55dcf3672391fd2a089216e28dc3a0282f105e3ef3ceac6e74f SHA512 133ca39503eb471d6391e849430c41ab9ca2ae66c367f8843b221ea2e5535967ca4a09cf94364558f65d61f8a6ffd43a98af0f8a70f4c46a46936b83a0d18f59 WHIRLPOOL 0dbc9b671c114a2b632870ee46c566d2f6d1192ef25e94d24af5e0d0c178742ff9016b150347fbe5f5dc33231745024873472dad246b11a2adc09cadcc89e999
diff --git a/dev-python/atomicwrites/atomicwrites-0.1.8.ebuild b/dev-python/atomicwrites/atomicwrites-0.1.8.ebuild
new file mode 100644
index 000000000000..930016f9b05c
--- /dev/null
+++ b/dev-python/atomicwrites/atomicwrites-0.1.8.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Atomic file writes."
+HOMEPAGE="https://github.com/untitaker/python-atomicwrites"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+DOCS=( README.rst )
diff --git a/dev-python/atomicwrites/atomicwrites-0.1.9.ebuild b/dev-python/atomicwrites/atomicwrites-0.1.9.ebuild
new file mode 100644
index 000000000000..a26fe910895c
--- /dev/null
+++ b/dev-python/atomicwrites/atomicwrites-0.1.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Atomic file writes."
+HOMEPAGE="https://github.com/untitaker/python-atomicwrites"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+DOCS=( README.rst )
diff --git a/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild b/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild
new file mode 100644
index 000000000000..d916b495da11
--- /dev/null
+++ b/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Atomic file writes"
+HOMEPAGE="https://github.com/untitaker/python-atomicwrites"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+DOCS=( README.rst )
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/atomicwrites/metadata.xml b/dev-python/atomicwrites/metadata.xml
new file mode 100644
index 000000000000..362e3c538894
--- /dev/null
+++ b/dev-python/atomicwrites/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>amynka@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">untitaker/python-atomicwrites</remote-id>
+		<remote-id type="pypi">atomicwrites</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/atpy/Manifest b/dev-python/atpy/Manifest
new file mode 100644
index 000000000000..b261c54f9f6d
--- /dev/null
+++ b/dev-python/atpy/Manifest
@@ -0,0 +1,5 @@
+DIST ATpy-0.9.7.tar.gz 663163 SHA256 4286bb0e4de30df16d6ffd14eb92e4bd47cba2b486834ca95db512c830d0693c SHA512 4cd078625fd4fc83d267cf3aff4728ec8b2de927dd0a748dba47030216b141aa0c266f34bbf708211ec829a363b3b8e5eed36bf538efbe170ae316a271b36bb4 WHIRLPOOL 6e86375725c203b5351c0111a5e10fa6905c9add682b26275f2538e97e3e1b16884c40794809b0b02a0e4f64bd1f3f5d56f474ef5efc5bbd8622dcd639360ecc
+EBUILD atpy-0.9.7.ebuild 822 SHA256 60cdeb5f0e33907ccc36fccbc27578df9736bf62e8999fc60d07d1fd3d9d1575 SHA512 f23b363e86beed375fd92c624d5b8f60fdcbe5350dfe9df9c73c578a65648d9976225dfe13780fd5671223137028438d169616070a4e5469f6903e268c9636a4 WHIRLPOOL cdec9b5f589479bc5b01d64e216863833f9b662ba413b9bbbe9b2c76f09387416fc5e878c0881cb8eb285ec518b892fe905af5c81c61460e928926fac930228c
+MISC ChangeLog 2420 SHA256 11a67c47448db61477b1c22907b79b20fb27262502b6804aeb1e83725653c0f6 SHA512 6b7ad09c27f18cae2a925d104846551f2aa3ef07a4ef77c06b9bc1e3305f7ae5a1d8c4e6b9e425adc05e379ac3c2b98717467e3d145ede152709a3d0e3141201 WHIRLPOOL 79925aee9d2192a8abb72877f66810abc15b52c29f3ea9918689bc07cc8a300f95df604d83a9baeb2f8554c4b1886ae55a9d7ea4521443c838a96f3713459ed3
+MISC ChangeLog-2015 3000 SHA256 8fe05a3335995e8d35e43c0301b46e10538f98aa668babf1e40f5e20f5606ca5 SHA512 60a5d6b71888cdbfa0ac2305d2a5b6b4c550c21430c4ad0d8bb643b087542fcc1061fbfca1e08453c7fb6de78c7f16ebf827aec6d6d763326aacaf5ded7c7731 WHIRLPOOL 4633d4589881709e0c5fcfef57f7a821ea2899989d59e7ed03ea0678b3ee5e29182fe7a7c1381bd1ef6cc2ba58c27d72a2ea74de82747a720285b0cc22af1d19
+MISC metadata.xml 932 SHA256 49c080f2a0e5a1edaad5d2283dff76d0e322d985a510bb5ecbe62023535bca01 SHA512 a9bbb7bdaa05f7bf9a6c0a9b58579de1ff120779788e562993dd1acd8b6fc28f87402f55aa39db871b3e0888619a8077a6556e163658450469f54b3cc28faca3 WHIRLPOOL 65cd8d8e265c73b9cb3b6baae9d90a34e03b85a2624332ff70b3c93e6186672a02ebd49d33664f2b44172e7eea1bfce6b1d24cf0eb4be3e0d5530395a3d2d773
diff --git a/dev-python/atpy/atpy-0.9.7.ebuild b/dev-python/atpy/atpy-0.9.7.ebuild
new file mode 100644
index 000000000000..e9e43608e6c4
--- /dev/null
+++ b/dev-python/atpy/atpy-0.9.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+MYPN=ATpy
+MYP="${MYPN}-${PV}"
+
+DESCRIPTION="Astronomical tables support for Python"
+HOMEPAGE="http://atpy.readthedocs.org/"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/astropy[${PYTHON_USEDEP}]
+	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	postgres? ( dev-python/pygresql )"
+
+IUSE="hdf5 mysql postgres sqlite"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-3"
+
+S="${WORKDIR}/${MYP}"
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" "${EPYTHON}" runtests.py || die
+}
diff --git a/dev-python/atpy/metadata.xml b/dev-python/atpy/metadata.xml
new file mode 100644
index 000000000000..0a36a95e13c5
--- /dev/null
+++ b/dev-python/atpy/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>sci-astronomy@gentoo.org</email>
+  <name>Gentoo Astronomy Project</name>
+</maintainer>
+<longdescription lang="en">
+  Astronomical Tables in Python (ATpy) is a high-level package
+  providing a way to manipulate tables of astronomical data in a
+  uniform way. A table is defined by any number  of columns of data,
+  each characterized by a column name, unit, null value, and
+  description (the last three being optional), and can be supplemented
+  with metadata in the form of keywords or comments. ATpy can be used
+  to manipulate single tables as well as sets of tables. Table formats
+  supported are FITS, VO, IPAC. Database supported are SQLite, MySQL
+  and PostgreSQL.
+</longdescription>
+<upstream>
+  <remote-id type="pypi">ATpy</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/attrdict/Manifest b/dev-python/attrdict/Manifest
new file mode 100644
index 000000000000..23b8a5590da1
--- /dev/null
+++ b/dev-python/attrdict/Manifest
@@ -0,0 +1,5 @@
+DIST attrdict-2.0.0.tar.gz 8994 SHA256 86aeb6d3809e0344409f8148d7cac9eabce5f0b577c160b5e90d10df3f8d2ad3 SHA512 6dd363eb3bca83c84dcbcdd04fb2a7f5360ff5c97b7e52159c4efe61856a37bb6a9427da00da07cb9222f3cef6de18b94bf2da5d0192372f9252a130fa476b7d WHIRLPOOL 35a9a2ec820756d640990e6cbcd1bbed1145dbcd14a4e099bde618fab3a4a74d5d419a01bb43e7d55a59c295f9a8ae77e5f091c4263f2282d50dcc1a0002c90d
+EBUILD attrdict-2.0.0.ebuild 611 SHA256 31cbb1d9c03cb55a84fb9450235dcd1dcddbfa73fafc2081564bab56e770e056 SHA512 c00f5f1066430e47575ca0816722d0438092d0e8d1d40e5c56bad21dfe608affffb1d6caceb5f1ff59c6ab1b0b61329e5f825d13a7e65eb24db8fe096f36f06d WHIRLPOOL af701de8c0b8b23d397ba077b49c28615332c4636bba23737fc41bdd5355c14738548ece307d61e596c4c244f7f3f2114ad0571acb82f3fd3618898b89d020db
+MISC ChangeLog 2489 SHA256 2797ec5c6eb09aa8766f94d157d4d6890f4dea32573b70f9a113da2bb6bf6e9d SHA512 69ca90c6c0c8a5ed8ea615fd4377d8291831dde8f3a36fa26b44d4e94106ecd4df24b53877e324f949676e2eb22e66f34aa967b273023a6324e1b0a9a821e936 WHIRLPOOL e3d858cf6a2cacfbe833dd3e4af3bca25da979297323ae813f6a70383ca001b14c1eee17e2920b146d3cf272af867619bc9a55ada667063d838b67a4b711226f
+MISC ChangeLog-2015 354 SHA256 ed7d22fff17f899deeb992ce47fa8ad91bd374edb4419f2b5c4a4e46995f0a97 SHA512 666a45eac14cb3090d2ba84fe748cb7831b732dea407f526e321f0e483c28df023a7a79f2563339aecf8f5c8e70704343d91d8dc787d6e13211e658bc1533a69 WHIRLPOOL fd99b2d759354bcc40c0e775604d45bb160b44225fe267e89e545ee568803e3bad4ac3446c1db31c22407e927125fd844d699db73caa9d8f24941e37176d49f2
+MISC metadata.xml 369 SHA256 a4c569bf3dfb584b2cb106ab65e1a170787ccaff096f05abcccf8d6b05b879c0 SHA512 14b20248976ff5704b7c26dccf3ca57962ccca23e9a4fee620347a8d1c01950cece4ef586d0a59614724baa21fb7d6ecc39c964406f02e554bb93b47e9e84436 WHIRLPOOL b5835956bf6bcd3bf7efeb83ebbd4e7282767ddc695560a7aebc4d5dc1b7c9e874fcf01391068977cafc48790eb8e9f9d764c76418024f4280c9298fe002f36e
diff --git a/dev-python/attrdict/attrdict-2.0.0.ebuild b/dev-python/attrdict/attrdict-2.0.0.ebuild
new file mode 100644
index 000000000000..8c9ab3e48326
--- /dev/null
+++ b/dev-python/attrdict/attrdict-2.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A dict with attribute-style access"
+HOMEPAGE="https://github.com/bcj/AttrDict"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py nosetests
+}
diff --git a/dev-python/attrdict/metadata.xml b/dev-python/attrdict/metadata.xml
new file mode 100644
index 000000000000..270f40624b78
--- /dev/null
+++ b/dev-python/attrdict/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">attrdict</remote-id>
+		<remote-id type="github">bcj/AttrDict</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
new file mode 100644
index 000000000000..5458bc207ecb
--- /dev/null
+++ b/dev-python/attrs/Manifest
@@ -0,0 +1,7 @@
+AUX test_funcs-too-slow.patch 735 SHA256 08e952c2959186ba8f1734ba49428e1c0ffb941e439dc64fc4596c304b992678 SHA512 b6fee394c95a9c46dd822c8f36261b909a3a3de905e5b057d5026b9d204c01edc01f566336f3c06ee4f5b85da32f2dcd30fc73849d454c6446c63a0b08413140 WHIRLPOOL 2e222af72ee1c5cd46b4c80ac15e001c1533738e2e7f7eb5403ef26bbd8bfd27effb9e36d259821f3a386ff3f5115e1108f794aa325a435c945c8070efb2bff9
+DIST attrs-16.3.0.tar.gz 57512 SHA256 80203177723e36f3bbe15aa8553da6e80d47bfe53647220ccaa9ad7a5e473ccc SHA512 1a91e6f27ecaf20c409c3abf88ffed5c6cfdbba8cff44637399b713271ff838a054f5859dd29440b2780d81b40673033e3f8e43dd491bece72e0a4f08c4ef688 WHIRLPOOL 85d53df74265b6db36171ad84c21321fd8f4b3c345ea65c46b627a25e586399c8cd7d3231417c7450ea9bb8237286434828f1c795759bdcf4d459f63555c8636
+DIST attrs-17.2.0.tar.gz 73733 SHA256 5d4d1b99f94d69338f485984127e4473b3ab9e20f43821b0e546cc3b2302fd11 SHA512 02243e59ff417deddb330e841d42c0f43d3bea4435f114d3a9a8f4c3bd424c2ef565c630d179db7b3687d22091bf6e619de661171248c0ff0a0e5ec5f9bf7e21 WHIRLPOOL 422abbabec76ca9932f071c5f8ca77afecbbbc08b0cc7e199588a945afe215aa9509922a667fd1a2da7e8fd79b8abd29c366c42c4dad2d538f2487729c4450bb
+EBUILD attrs-16.3.0-r1.ebuild 872 SHA256 95308a7dbe1139d29ae178ec834c2e12c862c004008bac34bbfc908a71c67894 SHA512 0dc1492fe4e01f0ea6296b2ec19dd0f231b47967a00623a38e2f53d0ee92c1bda8fbc8fdd46662aa2acbe43ac4f656cb067c7186f73e80dd57ec0963c42c4c89 WHIRLPOOL 21faf80f7748d0c93b52490da178748c4873ddb6af23bfebda863bf8071b85c4a83c5047f88c3b418e9ca2c201200f8de421ac9064b8bec0a6ecd03e26064c77
+EBUILD attrs-17.2.0.ebuild 859 SHA256 bede9e2a834db58302589c420fc72296e82a3de2e456af4ff25982dd9ec52eac SHA512 3e563089041386f811f779bc7d5178df7c1fd8409749bdd84fa6efe04543c24cf61d4da231fd658f0a8b74c332b8c7ff8f6482c868986e14e13dca6e051f0d69 WHIRLPOOL 4d88f62dd2134196bd6cf98e441082fde1de2e6796092c241503ffdd478534421c811e828f616528da5276b2388677e6fa40626c58fbedb06a6dabc028faaaa5
+MISC ChangeLog 851 SHA256 fd78a5f76e806dadc226c364b7164813c830812f3e2bb4a8990b0384a500fee3 SHA512 70095dfa30df08d05f372b239ce7771d827e88ed50ff7dca81c305d3838b91bd76f2f34d9b46c7e5a0a0d3e08509cb3cb3294f54818c2aaf9473e7a87331cc8b WHIRLPOOL 4ca24ac7b1454cfaa3d1b75bc1baad322856f63f4afbcdf4a8191b4bda70f7f2f907d2c3742e54a72463bc4c442c5a635c11ffda372dcf8510745dd0dc1fcd9a
+MISC metadata.xml 488 SHA256 fb0296355f64263cbd723fb549bb4c95ab2ff9588270c72771a581871788a676 SHA512 d8336a60cb0b2b8d51a9833c0ba3d47acb29ec4942b2f03b750d407bcbb65461d867470226bee962a8e585cfd4ff11bfff67b66ed2270f9efbf35d3c46bbdda1 WHIRLPOOL 2d3ae426ddadf78cc86918259522e47ad71e763c45b215056e5f249be52d78ef8f0cee9e0947d3f37c2674938fc204a9f8479fdbf8b1f4df190058897a1525cc
diff --git a/dev-python/attrs/attrs-16.3.0-r1.ebuild b/dev-python/attrs/attrs-16.3.0-r1.ebuild
new file mode 100644
index 000000000000..dac2d9e2c39c
--- /dev/null
+++ b/dev-python/attrs/attrs-16.3.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Attributes without boilerplate"
+HOMEPAGE="
+	https://github.com/hynek/attrs
+	https://attrs.readthedocs.org/
+	http://pypi.python.org/pypi/attrs"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-lang/python[sqlite]
+		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/test_funcs-too-slow.patch
+)
+
+python_test() {
+	py.test -v -v || die
+}
diff --git a/dev-python/attrs/attrs-17.2.0.ebuild b/dev-python/attrs/attrs-17.2.0.ebuild
new file mode 100644
index 000000000000..ad915df95f6d
--- /dev/null
+++ b/dev-python/attrs/attrs-17.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Attributes without boilerplate"
+HOMEPAGE="
+	https://github.com/hynek/attrs
+	https://attrs.readthedocs.org/
+	http://pypi.python.org/pypi/attrs"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-lang/python[sqlite]
+		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/attrs/files/test_funcs-too-slow.patch b/dev-python/attrs/files/test_funcs-too-slow.patch
new file mode 100644
index 000000000000..4d0698ed7de5
--- /dev/null
+++ b/dev-python/attrs/files/test_funcs-too-slow.patch
@@ -0,0 +1,21 @@
+diff --git a/tests/test_funcs.py b/tests/test_funcs.py
+index 36969c7..00da655 100644
+--- a/tests/test_funcs.py
++++ b/tests/test_funcs.py
+@@ -8,7 +8,7 @@ from collections import OrderedDict, Sequence, Mapping
+ 
+ import pytest
+ 
+-from hypothesis import assume, given, strategies as st
++from hypothesis import assume, given, strategies as st, settings, HealthCheck
+ 
+ from .utils import simple_classes, nested_classes
+ 
+@@ -57,6 +57,7 @@ class TestAsDict(object):
+         ), dict_factory=dict_class)
+ 
+     @given(nested_classes, st.sampled_from(MAPPING_TYPES))
++    @settings(suppress_health_check=[HealthCheck.too_slow])
+     def test_recurse_property(self, cls, dict_class):
+         """
+         Property tests for recursive asdict.
diff --git a/dev-python/attrs/metadata.xml b/dev-python/attrs/metadata.xml
new file mode 100644
index 000000000000..773a1e1640a2
--- /dev/null
+++ b/dev-python/attrs/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">attrs</remote-id>
+    <maintainer status="unknown">
+      <email>hs@ox.cx</email>
+      <name>Hynek Schlawack</name>
+    </maintainer>
+    <remote-id type="github">hynek/attrs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/audioread/Manifest b/dev-python/audioread/Manifest
new file mode 100644
index 000000000000..40e4cd20ee55
--- /dev/null
+++ b/dev-python/audioread/Manifest
@@ -0,0 +1,6 @@
+AUX 0001-Use-the-print-function-instead-of-the-print-keyword.patch 981 SHA256 0c887e92b7a0d940833cf0c953929b18733222c85b2cf6b8a4c04cf6d04ce24d SHA512 6dbd099bf334af6674b24b87f17d7f97d00978c5817d852608b5e835efaa988897c9713e55f04ab9e567595686459a4e5e840aba61df6bfd80d9b80d18622c8a WHIRLPOOL b7eddbc10a5503b0359a5aedb333532448fbc4668a25dfd313b69725633f079e876cb609056e8228c5f8355f65b63ea0a0cf46dd71aa4f5773f656d02dc8327d
+DIST audioread-1.0.1.tar.gz 13004 SHA256 19d1a8c55b00875235a198cb9119c2163394000ebbb0f05a074a356f71a96b04 SHA512 18e9e696785fe2f1b1d6ad7fe64e2878bf490d72aef7500998bb48b0733b382cf0b171d26c5b1465947de1d5f6ded25e2b57947402c31a440e8f346722fdc533 WHIRLPOOL 9489c01f54135677a01d2511d80150bd5f134b8b08ee20b55f78f708a788e604c282f43ea5ffbc669f2a00b3c2ae14f9062fe6752b21e14d1c50f4d36c3e2c6b
+EBUILD audioread-1.0.1-r1.ebuild 775 SHA256 93c77691a87bf0e6d3f45d85c5d6dd63f0718bc30819eb84f9b64baf2c4c60b9 SHA512 dd31fef40c0f209be59109cc09633555d7c6540de2221b8aa7a9a4fffde32814b98f0e8bba5b666c1e1fcf9bdac6edaf7fd34e893f80dedafa46f1552545e4e6 WHIRLPOOL 437577519dc514f003a133832d5fb120a9f09e82b3f9a88e84d08ddb48e740b293e3265dfbf7dfd955c95c1faae8ed8ce3f51b22b098221aec6013da2b7f307d
+MISC ChangeLog 2878 SHA256 d0cd922a5f0c7920b69a391cddae363ac6f10f0ea0ec102c59a9ae584ca49f10 SHA512 e224421d509134b9fa58a035a2c383a6f3d78977e3b11a67c951988804d0efd2786cc27e2e4a78f73dd81221958aa7b4676cc861303ebd05722ade4ee54acf12 WHIRLPOOL 977e6a467dd7f38e2241d8ee99a2bce9847f9d3d67b73615157e5f08b71b00542791de4a13595feb9736dc4984a69b080b9396f7aa23dc8cb218a23fd85592cf
+MISC ChangeLog-2015 1614 SHA256 9cfefc955b30ad65cc30de317dfbc630a3655c0178eb739b3743bb459dc83e77 SHA512 e8e8bb0965d488664724555580a50f5cef6d2465492ecd99401260688fefdd7fab02c88d4e5c2bf1989591e6346be44ef2a8bb3b2eff4f0b1663187e87bbed24 WHIRLPOOL c202b31b60ce4a10fc6b90c1c2381b995ed8b4976f616013c5f530d55b17f189a9d60010867d01b9312c82ce0c60ef176e1c45416faeb0b6d9d682f9af8e4bd2
+MISC metadata.xml 557 SHA256 b28220068a25df3879fb622399be4db6031abec10fe6441a2ed90a4a2b440395 SHA512 1c5f505d0512c0eabe2e1fbedcf62421fca6d6e12a479aec0ac71384377e032e2697858b06efc9196a35e96b2f795682730fbed7153c610b1057fda376d00460 WHIRLPOOL d07c2d9ea3efee485e5b623b18f2566b03cd6cb25bc659c9a4e73fb33de099c547c05e07fd6ff3f5e0e6710f20f465f90d7dfcf994f6df3daf240c7b48c3d259
diff --git a/dev-python/audioread/audioread-1.0.1-r1.ebuild b/dev-python/audioread/audioread-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..5c8a480f88b7
--- /dev/null
+++ b/dev-python/audioread/audioread-1.0.1-r1.ebuild
@@ -0,0 +1,31 @@
+# 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
+
+DESCRIPTION="Module for decoding audio files using whichever backend is available"
+HOMEPAGE="https://pypi.python.org/pypi/audioread"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="|| ( dev-python/pymad media-video/ffmpeg )"
+
+PATCHES=(
+	"${FILESDIR}/0001-Use-the-print-function-instead-of-the-print-keyword.patch"
+	)
+
+pkg_postinst() {
+		einfo "You might need to enable additional USE flags in backends to"
+		einfo "decode some types of audio files. Priority of backends:"
+		einfo "   * mad"
+		einfo "   * ffmpeg"
+}
diff --git a/dev-python/audioread/files/0001-Use-the-print-function-instead-of-the-print-keyword.patch b/dev-python/audioread/files/0001-Use-the-print-function-instead-of-the-print-keyword.patch
new file mode 100644
index 000000000000..8feb9d0ca9b6
--- /dev/null
+++ b/dev-python/audioread/files/0001-Use-the-print-function-instead-of-the-print-keyword.patch
@@ -0,0 +1,30 @@
+From 3f86133d37d5cc5c8712730de67c23b0d33ce082 Mon Sep 17 00:00:00 2001
+From: Simon Chopin <chopin.simon@gmail.com>
+Date: Tue, 14 May 2013 12:46:50 +0200
+Subject: [PATCH] Use the print() function instead of the print keyword
+
+Python3 doesn't have the `print foo` statement.
+---
+ audioread/gstdec.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/audioread/gstdec.py b/audioread/gstdec.py
+index 78285db..fa8078f 100644
+--- a/audioread/gstdec.py
++++ b/audioread/gstdec.py
+@@ -366,8 +366,8 @@ if __name__ == '__main__':
+     for path in sys.argv[1:]:
+         path = os.path.abspath(os.path.expanduser(path))
+         with GstAudioFile(path) as f:
+-            print f.channels
+-            print f.samplerate
+-            print f.duration
++            print(f.channels)
++            print(f.samplerate)
++            print(f.duration)
+             for s in f:
+-                print len(s), ord(s[0])
++                print(len(s), ord(s[0]))
+-- 
+1.8.1.5
+
diff --git a/dev-python/audioread/metadata.xml b/dev-python/audioread/metadata.xml
new file mode 100644
index 000000000000..805c723460fd
--- /dev/null
+++ b/dev-python/audioread/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription lang="en">
+Decode audio files using whichever backend is available. The library currently supports:
+ * Gstreamer via gst-python.
+ * MAD via the pymad bindings.
+ * FFmpeg via its command-line interface.
+ * The standard library wave and aifc modules (for WAV and AIFF files).
+	</longdescription>
+  <upstream>
+    <remote-id type="pypi">audioread</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/authres/Manifest b/dev-python/authres/Manifest
new file mode 100644
index 000000000000..f0f60db2b7aa
--- /dev/null
+++ b/dev-python/authres/Manifest
@@ -0,0 +1,7 @@
+DIST authres-0.701.tar.gz 18878 SHA256 4536c485ab8da667be84361b040e626d025cc8b3cb5ad7ef156a7764bf9a9b12 SHA512 e4482a8c5494a550a76a0d0b8b0d406d257da271d8fae901569a960d2f90ec616c5de48a578240e831c29f9345d128ecc9cba6f05befbb03f5cd90b4c26af422 WHIRLPOOL cbca8127df9ac573bdb653f22869450184cfd05221aa17a28726183e17572f4cde85b255b6e3583336aa87383e34a1999f4a647c1bac8eb91bc70075b0d0669e
+DIST authres-0.800.tar.gz 19863 SHA256 d28e3976a7d418917cbbf384018aa0e8a0489e41bfd9847309c5f8efb19f6efd SHA512 d9e73309064e396c51ed55394ce505c21869d267922df55b6723cb6b2409282c7827d35d381877b5f08e037042e015d59246603d51219c829df7b81011499fe7 WHIRLPOOL 4316f18f3237e710baac2ee4701c32778139a805e2f0464aa26bf673dd5889dfe225372fdf0ff0da5b1cd0ef62c90f4bf2d41cdecb619fa5fead9682e1dbea5a
+EBUILD authres-0.701.ebuild 602 SHA256 c79698bdf018808c892e4318529f61da5d267a238afb45310fecd2440ef035b5 SHA512 ff79dd071fb0ab48f970d8d7f6c052111e9805083b244fa55188c4cb3350e05313d6edaa3f8eb47245c6364888958e1e194a5cbc94c11bf2bc415a92453f7f92 WHIRLPOOL 9c2b02534b8149743e12d3a7aa3f165d7d5414c500bdf08fc9ef935c060a6e5d4ff131c0a202a8458f154c9d775ec86ce9776caf9a4e181705d2715037336b2b
+EBUILD authres-0.800.ebuild 611 SHA256 da4a9609729a6ffaf24dce5a8fe272d6ea98c4fd673e3b1a6a61e4d78b5d8904 SHA512 9d499251c91245a5461166b6fa91c7e7bc466777e642c9a112c2a9339a6ff5fb7791526f107b936ccb6b39c1a2c79bea5e5e631ced1a5d93710b24c333fee10a WHIRLPOOL e505d06a1c79fa71312d4f221438294ceff71787d524f2fb846906c9071d6ae013da6ed006b432faa855e449b8313ba9593b089db47d413755c850c53f710754
+MISC ChangeLog 2896 SHA256 bdcc00341687d388b60384e87f7321f23a9104c51fc96201c91d4393fb89dd44 SHA512 6fcbd6943f225e53271bb8b147ad7cd7dc2a7392049689f7478686f607f3ee813cc8781bce33ebac78fd020c0f6569e12bf0ff5af7f4f34ba754e6957c1870a1 WHIRLPOOL c8ee41cf335dd52f1996d4274634ddb630185ae341c4b42fa07ceea5e55c2edf4e346662b8717b4ee590a0cb328be419fa637307244d5784618a87ff595ab923
+MISC ChangeLog-2015 3590 SHA256 571fe1a4daf10718afedd092600e4834032ee7f106875e2be089e8c7fe536625 SHA512 5d096c9639b4e59bb0337c4235fefb041b92dd27f7c1be18632e9ea482d92242526412afec90bd0e25e5736c0fe1cc8b5e9e4c78fccbdb55287f0439ffd7d3bc WHIRLPOOL 1aed6ef672731e8ccf9737d543801775ebb9624d9cdd67152c549cc2da000cb5ffa8a18b7de2b44fd9b73dc4b3647566c75a2fe91b14e1d3c76f2672c78a3755
+MISC metadata.xml 659 SHA256 a3a2fb668caa300366653c5a5981da7bc0a8d64a275f5d03d90f8ebccbe57bad SHA512 166514ed6b7ff4e3a3acb703da72e72865ef51b067595375f36bc45541483629582828980befba2711d7b7555f571b91c777162a0996ce57f735a0934c4dfb9d WHIRLPOOL d8ece99f8c2087bdae08651a291cdffd19e85e83c4b835762763cea18f24a6194685e9ab5d656fd74e4b80a3992180b93a5b49523bd82f102ee9b6aa9441fcb4
diff --git a/dev-python/authres/authres-0.701.ebuild b/dev-python/authres/authres-0.701.ebuild
new file mode 100644
index 000000000000..36c972c7dc80
--- /dev/null
+++ b/dev-python/authres/authres-0.701.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Authentication Results Header Module"
+HOMEPAGE="https://launchpad.net/authentication-results-python https://pypi.python.org/pypi/authres"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE=""
+
+DOCS=( CHANGES README )
+
+python_test() {
+	"${PYTHON}" -c "import sys, ${PN}, doctest; f, t = doctest.testfile('${PN}/tests'); \
+		sys.exit(bool(f))" || return
+}
diff --git a/dev-python/authres/authres-0.800.ebuild b/dev-python/authres/authres-0.800.ebuild
new file mode 100644
index 000000000000..a0fe736507b7
--- /dev/null
+++ b/dev-python/authres/authres-0.800.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Authentication Results Header Module"
+HOMEPAGE="https://launchpad.net/authentication-results-python https://pypi.python.org/pypi/authres"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE=""
+
+python_test() {
+	"${PYTHON}" -c "import sys, ${PN}, doctest; f, t = doctest.testfile('${PN}/tests'); \
+		sys.exit(bool(f))" || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/authres/metadata.xml b/dev-python/authres/metadata.xml
new file mode 100644
index 000000000000..3772cef1634f
--- /dev/null
+++ b/dev-python/authres/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+	RFC 5451 Authentication-Results Headers generation and parsing for Python.
+	It also supports Authentication Results extensions:
+		RFC 5617 DKIM/ADSP
+		RFC 6008 DKIM signature identification (header.b)
+		RFC 6212 Vouch By Reference (VBR)
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">authres</remote-id>
+		<remote-id type="launchpad">authentication-results-python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
new file mode 100644
index 000000000000..cb3baa4b6d93
--- /dev/null
+++ b/dev-python/autobahn/Manifest
@@ -0,0 +1,15 @@
+DIST autobahn-0.16.0.tar.gz 185053 SHA256 a1dcb4315a0914da56ec484659816de72dfad229be4ac19fa61bbc0111ada884 SHA512 8873202a33c7b68577e89cc91503b8002aa19638836ff39ef99022e3b0ddcfb613154ddf0c373bf315eeb8b6c36f31afc20eb0164c47caa087b2a1b28449d3a8 WHIRLPOOL b5f5f80c1d88b3b031fab0837f0d191d4d71e21798aeec6ae1ee718bad0e21cb403a1b2ecb199615b4c8351522be8d4882781fd02de95e422203cee14f1c01ef
+DIST autobahn-0.9.4-2.zip 175894 SHA256 5bb64191cfdd1cbdd90d8e359b389ef62c0acdffd2f68d16ec01fa0a287262f0 SHA512 7e0d4246b8b1c552b25c2ae36f1923ed9931e3d3ca684039a422773fecd92ca04734a0b24394a9bbc787f245c72b5552522351a7c1c8e500128e7c46c740a3d5 WHIRLPOOL aa0f06b82acbebb97ca2e3c424429ada7169dca5b39237ce082a17440ec9701a307e9fc7f162f957023cfc4c067f8e8b82b9923cb056ffcab7b3e64a61a4aae8
+DIST autobahn-17.5.1.tar.gz 205144 SHA256 2a32fa76a11f8aa8de482e99ad2b7a8acc8f6c0d430c48aebd4666f080e85d5c SHA512 904f8f4c527a6c1c7840ea8634d0c0a47141458500c6d29f4aa1f05ff51f91c65a451b7c447201cbdf5e255c4c2d07509efa106790217b09398e7d50c1d85382 WHIRLPOOL 28b9608110ecfd058b9bfc3a3c587e7d33c7538f62b4ada1969efc2d434dcbcd9b1d3b1711448a09b425016c2622d2135ce789ae1edeaf7f0a1dc96fcdfb7acd
+DIST autobahn-17.7.1.tar.gz 211238 SHA256 801a318d5bf6776a60f7a93d715f83f7f12204b470019a339e4e7e14087c17e6 SHA512 592c4e21a7986fc9ac992fdfd24055654c5db7a3b8963fb5814bc32bdfbcdd7e3271bc84ed35faaf50755022a115a5f026de825ba5c35dacad4cfa2cf776d50f WHIRLPOOL 5c521d3e2c65c30ef8e96683d25b1aa4d862461a53f1c59608f3d5065d899f5ad39b58c38048c6cff126af436108093d10f04563ce0a5ef45c27a1f999fd95bf
+DIST autobahn-17.9.1.tar.gz 209230 SHA256 01378f51a9ff0c99e64482dbb69a39e617f9b520bfeb5f708edd5e36f5899df4 SHA512 036508c1170f53b01be360083bbf9f569fbaf216d984b34e10ad18e5f5e156e74bd4c8979bdd977a8e23deff0332e16d3d606716d32f3987ff37c7707eac0f86 WHIRLPOOL 67f683ab4ff3d752728318661ebe6c659db90cca8053e80a036660df259929b5e79106bf8d57710a93aebe1a356c0bf3082326e1e5eed974ae67050e62b35d28
+DIST autobahn-17.9.2.tar.gz 209442 SHA256 15758e1f507d191a0b56dca911eba780d12e603e0a4567bd2ec0ec08bf08cd4c SHA512 de73a4cc99616802d280887ef8a9971c532f974dd43cda933da953d7bcc45da3fd9d0c91763c6a80371f582f0acc9741134b1ba1b98035ef0f63e4971aaff79f WHIRLPOOL cb78970772f770ac732d6d30619f5d18cb24b130566abc741659ffa09ab07ee3f92c4636041d1cfc04c61ac44f02565102954639203ad13d83d69cd68e71e6bf
+EBUILD autobahn-0.16.0-r1.ebuild 3808 SHA256 9fe25b2d925c0f21001e7274ae9c2f4134d744b535d6b10b720dccdc7296e3b5 SHA512 a433ad1e8e5746b355a1a3728440d0e0e32fe549979ec6dcda1133c8878dbfa3c73c09ebc07c9524b56ad84de9977b48937e9e69f0fd8dbcc21d4bbbcc7a4c06 WHIRLPOOL ea274fd42f5f122d74dbcdee00564d046889e97d7d884b8c60a3002d67906af5ebbb562f6f8d0c1531315863859bb7cc06a34d6439c50388d6f1847760f25726
+EBUILD autobahn-0.9.4.2.ebuild 2928 SHA256 482d10413e7a20bf51e3fd82afd8a2076c809847d078df38ed32317fd2874138 SHA512 2b0d5897dbb3e659e2c02a9267cfc8847c636d5898ba59ea33786d1ead74b2a0d62a51e869c08e913c00c08694dc15ec4ce0b9a473ce1855de4da9a0a85035f6 WHIRLPOOL 3fe829e1a1da4871531af2fc232f5831403048b61f19afe0dfeda1392994ba38ebdb1e2743a297e9d789420aad13c49e28b9bd0f9ee5d22ec6c2cefffe321483
+EBUILD autobahn-17.5.1-r2.ebuild 1855 SHA256 aa76cc6184666a6d804cbb476e05ba0796c0221cf4d7a245c27c4233e43db099 SHA512 370231757473b8bca2df5598e8d741b52dc4f20268eb1497da7e96073519a6d92890aaaedd822741deffb2b562cea8e5c766a41d80d51b350e9edc5655427ccc WHIRLPOOL 2a1b58f74013d6a2e72879be109f7dce74d442e9d6dbca1084d7b4085e4e50f0713d9a438bf899ddab15304cb9bc9d0ec817fc002151447253d0b73f0ba6c0d8
+EBUILD autobahn-17.7.1.ebuild 1862 SHA256 61069e39a2b2d2b442c89a4e292a64831180f7247af90465a6472717cb65568c SHA512 3edfab0daa669f4b4e4b83a771a841b495fd9d76f2ad7b5699c338aac59b1456656eb59025381961833193e24ae2451821ef188d28c4ec010a44ca6efbae5a68 WHIRLPOOL eab1c210a7ee8aa8f28733c031fd8b7dcdbf7f56998ba3a7182aa67b33f46522d36f32f3422b30e2574a47ae10ac509244fb1a9013b1e0aae43647ba8bcae134
+EBUILD autobahn-17.9.1.ebuild 1862 SHA256 e16c5981241629f24b210d4240f6124f5b9e114bc6a01162bbbfc58fe9236839 SHA512 6fe74281a793e5ae17ca66c9ecd453fa143d82de9639cfa43525beee8953038322dde5e5ef29b9f66b885cf7a81857ce3a91ef05ee4a561fd71efadc9f066191 WHIRLPOOL 2c92646430705db1f97328eb747785b1ba25518111c74e5b8a84f7f016526e038d02751c4bae07ca39f2876f8005ce7f58f052ae07bdd571004271f6af704af7
+EBUILD autobahn-17.9.2.ebuild 1862 SHA256 e16c5981241629f24b210d4240f6124f5b9e114bc6a01162bbbfc58fe9236839 SHA512 6fe74281a793e5ae17ca66c9ecd453fa143d82de9639cfa43525beee8953038322dde5e5ef29b9f66b885cf7a81857ce3a91ef05ee4a561fd71efadc9f066191 WHIRLPOOL 2c92646430705db1f97328eb747785b1ba25518111c74e5b8a84f7f016526e038d02751c4bae07ca39f2876f8005ce7f58f052ae07bdd571004271f6af704af7
+MISC ChangeLog 4206 SHA256 7cae29bdc5c82b1527184f6684cebc2ce2620aaed626802c16c2f9a2175e991d SHA512 5f7f201b6831c81ae4ec6182eee9bd080b1c8ee78f67e21a697a69bf308ac0d3e84e6af49cf248a6568b31f17ac119fbe2fbc3bfc7327ff6bbc2aeaf9fb037ff WHIRLPOOL 5a700356e310c3b8703e13c139d57bb25409c926205523034a9340b4a0a1ace2248d738ac3a3c5b29be7b23dea1f51cd153109515b048f9c776091531d17af7e
+MISC ChangeLog-2015 1543 SHA256 f7377d9fac22291fe78fb3d82550f907983742371afe9363d0259e294d714dd0 SHA512 1a61580a78a2b9c647eb0dff511a79182a3cd1c124fd16b6d40c8f79df118a3fc5e9ebc8c5c00d0dc5b058523899d28d71f51d797b85075060d705e1fa94d26f WHIRLPOOL 92c153d388bfbe4b3b651f916806acbf0305d5557c0b56c716aa61f555b1ec55f811fa62e97413391e8524318710d344e0ca06b7533157ad956c2fbca1cc5334
+MISC metadata.xml 321 SHA256 7b9db294b7bd2762043fe22b204fe7b0be7c746867a43656c005d97ee60b5a59 SHA512 fd00829f66750d3d54b7bfb472179639fbe453840e7c3056b406af546acb952d3fb8d4552973a68ff0966f25bead8dfd4501888cbd68721e54207b5a7628ac36 WHIRLPOOL cf8122ab0175f7cbb7da0a5e0cdafaf1a307ad445bc038800c67c5ae4df100dff89890ddeddce22fc3cf3768220068a8523a871f6af344fe35006ca9c759a70b
diff --git a/dev-python/autobahn/autobahn-0.16.0-r1.ebuild b/dev-python/autobahn/autobahn-0.16.0-r1.ebuild
new file mode 100644
index 000000000000..e33d8c71c8ae
--- /dev/null
+++ b/dev-python/autobahn/autobahn-0.16.0-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 versionator
+
+MY_P="${PN}-$(replace_version_separator 3 -)"
+
+DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/autobahn http://autobahn.ws/python/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt test"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/trollius-2.0[${PYTHON_USEDEP}]' 'python2_7')
+	$(python_gen_cond_dep '>=dev-python/futures-3.0.4[${PYTHON_USEDEP}]' 'python2_7')
+	$(python_gen_cond_dep '>=dev-python/asyncio-3.4.3[${PYTHON_USEDEP}]' 'python3_3')
+	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/lz4-0.7.0[${PYTHON_USEDEP}]
+	crypt? (
+		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
+	|| (
+		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+		>=dev-python/twisted-core-12.1[$(python_gen_usedep 'python2*')]
+	)
+	>=dev-python/txaio-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/u-msgpack-2.1[${PYTHON_USEDEP}]
+	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
+	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_P}
+
+python_test() {
+	esetup.py test
+}
+
+# TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE is now
+# set in make.defaults. so update the plugin cache
+
+# copy of the twisted-r1 eclass cache update functions
+# for the older split twisted releases
+
+# @ECLASS-VARIABLE: TWISTED_PLUGINS
+# @DESCRIPTION:
+# An array of Twisted plugins, whose cache is regenerated
+# in pkg_postinst() and pkg_postrm() phases.
+#
+# If no plugins are installed, set to empty array.
+declare -p TWISTED_PLUGINS &>/dev/null || TWISTED_PLUGINS=( twisted.plugins )
+
+# @FUNCTION: _twisted-r1_create_caches
+# @USAGE: <packages>...
+# @DESCRIPTION:
+# Create dropin.cache for plugins in specified packages. The packages
+# are to be listed in standard dotted Python syntax.
+_twisted-r1_create_caches() {
+	# http://twistedmatrix.com/documents/current/core/howto/plugin.html
+	"${PYTHON}" -c \
+"import sys
+sys.path.insert(0, '${ROOT}$(python_get_sitedir)')
+
+fail = False
+
+try:
+	from twisted.plugin import getPlugins, IPlugin
+except ImportError as e:
+	if '${EBUILD_PHASE}' == 'postinst':
+		raise
+else:
+	for module in sys.argv[1:]:
+		try:
+			__import__(module, globals())
+		except ImportError as e:
+			if '${EBUILD_PHASE}' == 'postinst':
+				raise
+		else:
+			list(getPlugins(IPlugin, sys.modules[module]))
+" \
+		"${@}" || die "twisted plugin cache update failed"
+}
+
+# @FUNCTION: twisted-r1_update_plugin_cache
+# @DESCRIPTION:
+# Update and clean up plugin caches for packages listed
+# in TWISTED_PLUGINS.
+twisted-r1_update_plugin_cache() {
+	[[ ${TWISTED_PLUGINS[@]} ]] || return
+
+	local subdirs=( "${TWISTED_PLUGINS[@]//.//}" )
+	local paths=( "${subdirs[@]/#/${ROOT}$(python_get_sitedir)/}" )
+	local caches=( "${paths[@]/%//dropin.cache}" )
+
+	# First, delete existing (possibly stray) caches.
+	rm -f "${caches[@]}" || die
+
+	# Now, let's see which ones we can regenerate.
+	_twisted-r1_create_caches "${TWISTED_PLUGINS[@]}"
+
+	# Finally, drop empty parent directories.
+	rmdir -p "${paths[@]}" 2>/dev/null
+}
+
+pkg_postinst() {
+	_distutils-r1_run_foreach_impl twisted-r1_update_plugin_cache
+}
+
+pkg_postrm() {
+	_distutils-r1_run_foreach_impl twisted-r1_update_plugin_cache
+}
diff --git a/dev-python/autobahn/autobahn-0.9.4.2.ebuild b/dev-python/autobahn/autobahn-0.9.4.2.ebuild
new file mode 100644
index 000000000000..fcd86156deb5
--- /dev/null
+++ b/dev-python/autobahn/autobahn-0.9.4.2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 versionator
+
+MY_P="${PN}-$(replace_version_separator 3 -)"
+
+DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/autobahn http://autobahn.ws/python/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 arm ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/snappy[${PYTHON_USEDEP}]
+	dev-python/lz4[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/twisted-core[$(python_gen_usedep 'python2*')]
+	dev-python/ujson[${PYTHON_USEDEP}]
+	dev-python/wsaccel[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+# TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE is now
+# set in make.defaults. so update the plugin cache
+
+# copy of the twisted-r1 eclass cache update functions
+# for the older split twisted releases
+
+# @ECLASS-VARIABLE: TWISTED_PLUGINS
+# @DESCRIPTION:
+# An array of Twisted plugins, whose cache is regenerated
+# in pkg_postinst() and pkg_postrm() phases.
+#
+# If no plugins are installed, set to empty array.
+declare -p TWISTED_PLUGINS &>/dev/null || TWISTED_PLUGINS=( twisted.plugins )
+
+# @FUNCTION: _twisted-r1_create_caches
+# @USAGE: <packages>...
+# @DESCRIPTION:
+# Create dropin.cache for plugins in specified packages. The packages
+# are to be listed in standard dotted Python syntax.
+_twisted-r1_create_caches() {
+	# http://twistedmatrix.com/documents/current/core/howto/plugin.html
+	"${PYTHON}" -c \
+"import sys
+sys.path.insert(0, '${ROOT}$(python_get_sitedir)')
+
+fail = False
+
+try:
+	from twisted.plugin import getPlugins, IPlugin
+except ImportError as e:
+	if '${EBUILD_PHASE}' == 'postinst':
+		raise
+else:
+	for module in sys.argv[1:]:
+		try:
+			__import__(module, globals())
+		except ImportError as e:
+			if '${EBUILD_PHASE}' == 'postinst':
+				raise
+		else:
+			list(getPlugins(IPlugin, sys.modules[module]))
+" \
+		"${@}" || die "twisted plugin cache update failed"
+}
+
+# @FUNCTION: twisted-r1_update_plugin_cache
+# @DESCRIPTION:
+# Update and clean up plugin caches for packages listed
+# in TWISTED_PLUGINS.
+twisted-r1_update_plugin_cache() {
+	[[ ${TWISTED_PLUGINS[@]} ]] || return
+
+	local subdirs=( "${TWISTED_PLUGINS[@]//.//}" )
+	local paths=( "${subdirs[@]/#/${ROOT}$(python_get_sitedir)/}" )
+	local caches=( "${paths[@]/%//dropin.cache}" )
+
+	# First, delete existing (possibly stray) caches.
+	rm -f "${caches[@]}" || die
+
+	# Now, let's see which ones we can regenerate.
+	_twisted-r1_create_caches "${TWISTED_PLUGINS[@]}"
+
+	# Finally, drop empty parent directories.
+	rmdir -p "${paths[@]}" 2>/dev/null
+}
+
+pkg_postinst() {
+	_distutils-r1_run_foreach_impl twisted-r1_update_plugin_cache
+}
+
+pkg_postrm() {
+	_distutils-r1_run_foreach_impl twisted-r1_update_plugin_cache
+}
diff --git a/dev-python/autobahn/autobahn-17.5.1-r2.ebuild b/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
new file mode 100644
index 000000000000..d3c184e4a4b3
--- /dev/null
+++ b/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 versionator
+
+MY_P="${PN}-$(replace_version_separator 3 -)"
+
+DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/autobahn http://autobahn.ws/python/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+IUSE="crypt test"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/trollius-2.0[${PYTHON_USEDEP}]' 'python2_7')
+	$(python_gen_cond_dep '>=dev-python/futures-3.0.4[${PYTHON_USEDEP}]' 'python2_7')
+	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/lz4-0.7.0[${PYTHON_USEDEP}]
+	crypt? (
+		>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/service_identity-16.0.0
+	)
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
+	>=dev-python/twisted-16.6.0-r2[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/u-msgpack-2.1[${PYTHON_USEDEP}]
+	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
+	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_P}
+
+python_test() {
+	#esetup.py test
+	cd "${BUILD_DIR}"/lib || die
+	py.test -v || die
+}
+
+pkg_postinst() {
+	python_foreach_impl twisted-regen-cache || die
+}
+
+pkg_postrm() {
+	python_foreach_impl twisted-regen-cache || die
+}
diff --git a/dev-python/autobahn/autobahn-17.7.1.ebuild b/dev-python/autobahn/autobahn-17.7.1.ebuild
new file mode 100644
index 000000000000..886abb73a070
--- /dev/null
+++ b/dev-python/autobahn/autobahn-17.7.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 versionator
+
+MY_P="${PN}-$(replace_version_separator 3 -)"
+
+DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/autobahn http://autobahn.ws/python/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="crypt test"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/trollius-2.0[${PYTHON_USEDEP}]' 'python2_7')
+	$(python_gen_cond_dep '>=dev-python/futures-3.0.4[${PYTHON_USEDEP}]' 'python2_7')
+	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/lz4-0.7.0[${PYTHON_USEDEP}]
+	crypt? (
+		>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/service_identity-16.0.0
+	)
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
+	>=dev-python/twisted-16.6.0-r2[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/u-msgpack-2.1[${PYTHON_USEDEP}]
+	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
+	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_P}
+
+python_test() {
+	#esetup.py test
+	cd "${BUILD_DIR}"/lib || die
+	py.test -v || die
+}
+
+pkg_postinst() {
+	python_foreach_impl twisted-regen-cache || die
+}
+
+pkg_postrm() {
+	python_foreach_impl twisted-regen-cache || die
+}
diff --git a/dev-python/autobahn/autobahn-17.9.1.ebuild b/dev-python/autobahn/autobahn-17.9.1.ebuild
new file mode 100644
index 000000000000..8999f3d609a2
--- /dev/null
+++ b/dev-python/autobahn/autobahn-17.9.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 versionator
+
+MY_P="${PN}-$(replace_version_separator 3 -)"
+
+DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/autobahn http://autobahn.ws/python/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="crypt test"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/trollius-2.0[${PYTHON_USEDEP}]' 'python2_7')
+	$(python_gen_cond_dep '>=dev-python/futures-3.0.4[${PYTHON_USEDEP}]' 'python2_7')
+	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/lz4-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
+	>=dev-python/twisted-16.6.0-r2[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/u-msgpack-2.1[${PYTHON_USEDEP}]
+	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
+	crypt? (
+		>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/service_identity-16.0.0
+	)
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_P}
+
+python_test() {
+	#esetup.py test
+	cd "${BUILD_DIR}"/lib || die
+	py.test -v || die
+}
+
+pkg_postinst() {
+	python_foreach_impl twisted-regen-cache || die
+}
+
+pkg_postrm() {
+	python_foreach_impl twisted-regen-cache || die
+}
diff --git a/dev-python/autobahn/autobahn-17.9.2.ebuild b/dev-python/autobahn/autobahn-17.9.2.ebuild
new file mode 100644
index 000000000000..8999f3d609a2
--- /dev/null
+++ b/dev-python/autobahn/autobahn-17.9.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 versionator
+
+MY_P="${PN}-$(replace_version_separator 3 -)"
+
+DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/autobahn http://autobahn.ws/python/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="crypt test"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/trollius-2.0[${PYTHON_USEDEP}]' 'python2_7')
+	$(python_gen_cond_dep '>=dev-python/futures-3.0.4[${PYTHON_USEDEP}]' 'python2_7')
+	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/lz4-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
+	>=dev-python/twisted-16.6.0-r2[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/u-msgpack-2.1[${PYTHON_USEDEP}]
+	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
+	crypt? (
+		>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/service_identity-16.0.0
+	)
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_P}
+
+python_test() {
+	#esetup.py test
+	cd "${BUILD_DIR}"/lib || die
+	py.test -v || die
+}
+
+pkg_postinst() {
+	python_foreach_impl twisted-regen-cache || die
+}
+
+pkg_postrm() {
+	python_foreach_impl twisted-regen-cache || die
+}
diff --git a/dev-python/autobahn/metadata.xml b/dev-python/autobahn/metadata.xml
new file mode 100644
index 000000000000..72571f3f3a07
--- /dev/null
+++ b/dev-python/autobahn/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">autobahn</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
new file mode 100644
index 000000000000..3e4a49781e17
--- /dev/null
+++ b/dev-python/automat/Manifest
@@ -0,0 +1,5 @@
+DIST Automat-0.5.0.tar.gz 32599 SHA256 4889ec6763377432ec4db265ad552bbe956768ea3fff39014855308ba79dd7c2 SHA512 7b4fc64e1b3cc514e3513c4be7387309a9e0c6d59ef091131404642b517a324b4a0eb677bee99da038664bd6713f2d2078c621f056e98b35966caf324741eeeb WHIRLPOOL 5d3d258cb0eae2393edd4b12860b4312522c4a0eff7c17724ecf13032b633e1803b3817bd095f5e24a680d6d006ea4a389bd038022ac21376ba4e969e3bc4200
+DIST Automat-0.6.0.tar.gz 31767 SHA256 3c1fd04ecf08ac87b4dd3feae409542e9bf7827257097b2b6ed5692f69d6f6a8 SHA512 94f2fa06b0e0e1c0538bcf4bd9046ea40600a018bdd1da2d5bed479877807ad56e448c4f1d7ec87341f80013ae6c35b01201cbe3c4ecae1105419038ed43024d WHIRLPOOL 2e394600dcecd31a362fcd6e8c88a1d228567a85df6c6312eadf00d854f0f5c4a89adaabb319ba57c2aa8fdda110eb3c36f20bca6509585cc14d60670db7c193
+EBUILD automat-0.5.0.ebuild 1213 SHA256 b32cba5db863a33cfca996c72dd5df00b602a380b88bcd6cf91beffcdcf2e316 SHA512 9853c60b750e0d99a7ffc17a472fd99b32f41f4e63d6a542e6da240415de051b22cadca20706c52cc47170a20fd5431aaf7a85258578b2741bc777b29ffd72d9 WHIRLPOOL 7e48b00b16c0a331a5d1f717386e590aef91fbb68ef26b4559bb8560a9b0311cea3a94c3fdb3cf63b89299a51f5e8b2351c8dc1ab635e9d57a6ac4e1d4d76181
+EBUILD automat-0.6.0.ebuild 1213 SHA256 b32cba5db863a33cfca996c72dd5df00b602a380b88bcd6cf91beffcdcf2e316 SHA512 9853c60b750e0d99a7ffc17a472fd99b32f41f4e63d6a542e6da240415de051b22cadca20706c52cc47170a20fd5431aaf7a85258578b2741bc777b29ffd72d9 WHIRLPOOL 7e48b00b16c0a331a5d1f717386e590aef91fbb68ef26b4559bb8560a9b0311cea3a94c3fdb3cf63b89299a51f5e8b2351c8dc1ab635e9d57a6ac4e1d4d76181
+MISC metadata.xml 670 SHA256 6900bf9025f133768e1ce7dac4273b58679d0c476306ad692183562f14c7ae6f SHA512 6bad7c2d6473eba74b27fef1eed2d9c1bfeba0dc811504349096e9764d3a1a8af2cb365ff60d12bb0aaf21213f9b6a853b3d47a6096e62d951efe980d383ac22 WHIRLPOOL 261eeaff956637c69d548e7e9c801e074e7b89c8ae8a4bfe48050fc8486575adc7a0e0dae990ab3e276caaf6c7d055bcb9b31b8bf2b28396919fcd5ee9cfdfcb
diff --git a/dev-python/automat/automat-0.5.0.ebuild b/dev-python/automat/automat-0.5.0.ebuild
new file mode 100644
index 000000000000..71866e63edef
--- /dev/null
+++ b/dev-python/automat/automat-0.5.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+MYPN="Automat"
+MYP="${MYPN}-${PV}"
+
+DESCRIPTION="Self-service finite-state machines for the programmer on the go"
+HOMEPAGE="https://github.com/glyph/automat https://pypi.python.org/pypi/Automat"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="examples test"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/m2r[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+S=${WORKDIR}/${MYP}
+
+python_test() {
+	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" py.test -v || die "Tests failed under ${EPYTHON}"
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc docs/examples/*.py
+	fi
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	einfo "For additional visualization functionality install these optional dependencies"
+	einfo "    >=dev-python/twisted-16.1.1"
+	einfo "    media-gfx/graphviz[python]"
+}
diff --git a/dev-python/automat/automat-0.6.0.ebuild b/dev-python/automat/automat-0.6.0.ebuild
new file mode 100644
index 000000000000..71866e63edef
--- /dev/null
+++ b/dev-python/automat/automat-0.6.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+MYPN="Automat"
+MYP="${MYPN}-${PV}"
+
+DESCRIPTION="Self-service finite-state machines for the programmer on the go"
+HOMEPAGE="https://github.com/glyph/automat https://pypi.python.org/pypi/Automat"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="examples test"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/m2r[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+S=${WORKDIR}/${MYP}
+
+python_test() {
+	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" py.test -v || die "Tests failed under ${EPYTHON}"
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc docs/examples/*.py
+	fi
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	einfo "For additional visualization functionality install these optional dependencies"
+	einfo "    >=dev-python/twisted-16.1.1"
+	einfo "    media-gfx/graphviz[python]"
+}
diff --git a/dev-python/automat/metadata.xml b/dev-python/automat/metadata.xml
new file mode 100644
index 000000000000..23af373d81e5
--- /dev/null
+++ b/dev-python/automat/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>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>glyph@twistedmatrix.com</email>
+			<name>Glyph</name>
+		</maintainer>
+		<remote-id type="pypi">Automat</remote-id>
+		<remote-id type="github">glyph/automat</remote-id>
+	</upstream>
+	<longdescription>
+		Automat is a library for concise, idiomatic Python expression of
+		finite-state automata (particularly deterministic finite-state
+		transducers).
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/automaton/Manifest b/dev-python/automaton/Manifest
new file mode 100644
index 000000000000..7adcdac578df
--- /dev/null
+++ b/dev-python/automaton/Manifest
@@ -0,0 +1,4 @@
+DIST automaton-0.8.0.tar.gz 24784 SHA256 ca8bfbea03b9f39a536b4b261d90fbe8b1b0e1766bff5d8222e35691f8e11910 SHA512 1e167cd99ba427485d73f30ff55fe7f2d5f978d6e012a35ac104e611f5e37cc9a39f45dc93540fcb07b5ef0179790e9539a2cce74c88514701e8ce418ff6394b WHIRLPOOL 71850063c9be87358a1857497dd279b2a8f1a127f6a3e2d5ddd4c6bb05f9ad79d8d9dcb5c0f53b213cb9f953b702c1ca94fa1c650a31ce097db06ece4c5bbaa3
+EBUILD automaton-0.8.0.ebuild 730 SHA256 72e9cb26892ef113f1237f6a6778afaaed2eed60784bddbd2ab965f91240beb8 SHA512 a43a60191f9e07e145dd5095a56ab57eda60b3cd5959507bfc268a396388c7c6a4a7f216139e05d2198f7b36a8c5dc36b9b16675d057801e928ab56664f1ae0a WHIRLPOOL fcf65c72d68a0075f158f9be1c5d92ab3d9530bcea6173eed4b37bd77d298cbeeb779e7b9ed428f0706d287d54a1dda08f8206b7c3559c5e5a7ebe2610f000b6
+MISC ChangeLog 1768 SHA256 01c7700f016a12a57f802c2cd7b57b6efca168f5aeedfb2f3299e631e11ac452 SHA512 33ddd5b7419f1339855894df54e4f230fe9bd9b79d21d4397dcfa7dc8c922f004045289b15012f480598ef6b1d0834cc94eccec8594c4dbc37ad21e0651e7891 WHIRLPOOL 419d08d1912e72fa23ab51ef092fa097b93e114dfcf9edcd2e185f294fde92469d7a95086029770b2129db310c2dca6700879f55a9cb6c3d0b120978449c94ce
+MISC metadata.xml 326 SHA256 12cfe8ea79f9937a997078c8f6ed354a9c9d1bba8b06bd88f6a7ea78159de072 SHA512 d11557577fad543f40098af61ee4d40223e14a68de91dcfc92e595fba7c149c0c621081655e8c14e79d6cf9d0b6a17596096a74c8ac90f0f2c89e96d563797d6 WHIRLPOOL 458dfffce639e11dbcc3b3d4ffdd30d454350c5733bb95c84d4e69c912294b5c751cdb568438bfc91be89b7a37722597975443ed0950bf353a30928f715d8d77
diff --git a/dev-python/automaton/automaton-0.8.0.ebuild b/dev-python/automaton/automaton-0.8.0.ebuild
new file mode 100644
index 000000000000..e2daf3b32f74
--- /dev/null
+++ b/dev-python/automaton/automaton-0.8.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Friendly state machines for python."
+HOMEPAGE="https://pypi.python.org/pypi/automaton"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/automaton/metadata.xml b/dev-python/automaton/metadata.xml
new file mode 100644
index 000000000000..1c232583b7b3
--- /dev/null
+++ b/dev-python/automaton/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">automaton</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
new file mode 100644
index 000000000000..8cbe9968204d
--- /dev/null
+++ b/dev-python/autopep8/Manifest
@@ -0,0 +1,6 @@
+DIST autopep8-1.3.2.tar.gz 107915 SHA256 7e82590bf366b4d891ac5c1535554c46a5f79e4400a190a8493e92e75c5037dd SHA512 cb9a5e297ce705722d5e65472dbe749e57fa12fe8dee0d4c3dc20d9e885e0d885339627667110318c89c6bf7e337203a7831c0e2217e5a5d7951edcb98d3df4f WHIRLPOOL 8e1d4a9a71e4cc790060a393f5512913d567855d886776b4e32db4ffcef0bb82c793b3af833ddec1dc0f08e585f2d9163ec1c8ee67f118f4b982740ffec89f6e
+EBUILD autopep8-1.3.2.ebuild 924 SHA256 ab42ac26d026e7cbc6244c6a936a3a94db33d44324694f8cfc877baccb52589b SHA512 f6fdc70395872297a118867f6a0aad98882ac51e1808d04a144dd5b30e8684bf50b1ba7924b5b8fa3c6cf866831d831c67fe84065163b2460242291dc8ece49f WHIRLPOOL 159af13d25877085b4f7b2d15d50564baf92160b9218904d05b3df632e57f6da95fd7c5d5c05620f76b1526d9d25c14f9a72f25c2b9253c5b49fbe8e5cd8a24d
+EBUILD autopep8-9999.ebuild 727 SHA256 f18c504af9e88bc23a45d1e0024fd08180e11e2ce109b2d1be667c41d36a1733 SHA512 21692eee175575acf3521fd83331b81c522c3523458658c3409ab7ee71c9620333ff82ce3c0264ce7ccf2fb91222a88c2984972d8b997848e1bdf700cde4b2ed WHIRLPOOL d8e6297b22e058826e0081ce2755848819feca9046e1f8446b7dc1aaa8c360db9cf63d4fbd31af316d4110775e6674cc8c89331ab0818256dc756125fdae529c
+MISC ChangeLog 4459 SHA256 98afaceb89cbcbc6dede9095e716fe7e23e611b677f1262bda38b4fa98d165c7 SHA512 2c954c08bf4cc1a29fba5eb86e300e0d905301b155421f5ee65824091821b4135ad7ec5725fd6b06e2b70554d24b540963beb3400e19308ae0d5855b4240c271 WHIRLPOOL 120dbe3e2ae820716c8f58f339c4ee6976c3bf3248dd9698b0e967a793439409294ea7a9fb9a9bbafbf385572b054e3c5d6884e8f032b6627d576bebd88e3ba0
+MISC ChangeLog-2015 9146 SHA256 92ef0f58b77add17031041d66fa9e40bb6928d071d27cd010b2b3e2b46214e0f SHA512 519587c599ee2d7a4877e99d15a76ad6782bb6ce6bef8b3f115805d92eadfa7f4cf139e510156662ca4569169b3f306e69d2cf5fd310b55fd8553f1bca27d3b1 WHIRLPOOL 2005b64a1cfe7c80742a04f94cad103fc29093980d0c8e4855c0c651261c7c5570fe3919cb46a822f5be2dee9f426cb164864b6fe04f69a8c3684cf05e5e66f1
+MISC metadata.xml 484 SHA256 23d8457d4caaa75f92808c96c2e19901a124ecc9619100b0b5f647f1b8cccd9b SHA512 7542d6e1738ad7d333fc2ef8d6072e6963dfbc07f731f3e9137e49936165ef26145185a34cdfb6dfa5df16ac4a73bff3c8e6fde8c9f0477e1545ee5e2c6b605c WHIRLPOOL 9612f8ef789b5ab5aea16a090b65b7459d51001c48eb2c2e9036d3f57cf75a1d54834f6b372cb676646b919013425ecdc54b94b1409173de46416815626d68d6
diff --git a/dev-python/autopep8/autopep8-1.3.2.ebuild b/dev-python/autopep8/autopep8-1.3.2.ebuild
new file mode 100644
index 000000000000..feb7d88b55a6
--- /dev/null
+++ b/dev-python/autopep8/autopep8-1.3.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
+HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.python.org/pypi/autopep8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.3[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pydiff-0.1.2[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Prevent UnicodeDecodeError with LANG=C
+	sed -e "/e�/d" -i MANIFEST.in || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/autopep8/autopep8-9999.ebuild b/dev-python/autopep8/autopep8-9999.ebuild
new file mode 100644
index 000000000000..82b8a5ea9078
--- /dev/null
+++ b/dev-python/autopep8/autopep8-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 git-2
+
+DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
+HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.python.org/pypi/autopep8"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	test? ( >=dev-python/pydiff-0.1.2[${PYTHON_USEDEP}] )"
+
+python_test() {
+	"${PYTHON}" setup.py test || die
+}
diff --git a/dev-python/autopep8/metadata.xml b/dev-python/autopep8/metadata.xml
new file mode 100644
index 000000000000..ab844e107fb5
--- /dev/null
+++ b/dev-python/autopep8/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>autopep8 formats Python code based on the output of the pep8 utility</longdescription>
+  <upstream>
+    <remote-id type="pypi">autopep8</remote-id>
+    <remote-id type="github">hhatto/autopep8</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
new file mode 100644
index 000000000000..091f641d6ef2
--- /dev/null
+++ b/dev-python/awscli/Manifest
@@ -0,0 +1,16 @@
+DIST awscli-1.10.51.tar.gz 474702 SHA256 98690bcc6d6ecc10212ab7b838a45940b25c01e240409c3d03f172cb9dc9c7a6 SHA512 55b002023f05cd6a1761b87d80a6c68664f91ac9d70724f51dadff053797766a9f407f1c5edff52ddd22c5e537a39a60f03e7c46bc8e5f912e3d39babe57171a WHIRLPOOL beee371326aecaa33074fcf0e81a0acd912a58eac3e844973b847a103b98083534a6125df8cb27792fe635dbf7f75702feb173de8437c7d276842b231a9eeece
+DIST awscli-1.10.53.tar.gz 474558 SHA256 c925e734d23dd082142b7815e1aa870f1cca93c507e63e742ae0503c7f7b0c12 SHA512 6735055c1b9d79eee9832532dd6a284fe6bdaf08bec10872458d44ce2a549bd0833c1908e1e236282f2b197cc7d4817173c4911e057e301e350fb195f96c1acc WHIRLPOOL 7b0995b0788ba299c852cd1e026354cc2a719cafe036c995983eb466d9bb7f083aef2a3321e218e0302dcb6ee25d105bf70daf68c2c58ddfb75ef3bacf2bc0b5
+DIST awscli-1.10.59.tar.gz 484020 SHA256 270b8d7626f398e5867d777b75d16d0d48154d28e45dd309ac96597fa35c15f9 SHA512 b0329ec01a160527e6eb47bd877f102be4f6f53ca89007e1d6ba5012dc31c8fa907728b151b6daf8ed49d9abac48fa741bb4617d689eeeacf880404fe1b4919a WHIRLPOOL 5baf900600a7fbf177fb60e474352bde29fc5873ba9f7620b01bd3c0c2cc6b247075ce8a4ede24dc4b19a8e38d1789064167f424521477677ef83bb754797794
+DIST awscli-1.11.0.tar.gz 497631 SHA256 48f26765be66689ef073e086873b016885f443471e542156d46376b527aa2d63 SHA512 db695a9b5d052d872f50883dbd716668b95c3ae6aee85b94ba5fb96aabfd8853cf2c6cdff76b7a2d8e7d006ae1dc65353bc6818999bf02c619dd0c4aa4d3dbbe WHIRLPOOL 3809581a03300f45d2d82f6e21f6f3a8a6d225421d0d4a69b1c6ecb5c6d332e30390837061d65b0b4a19e6905eeda5ca0392f5150247972c386bee86bd0fa810
+DIST awscli-1.11.154.tar.gz 553172 SHA256 b11cd09c5fb39637801be277f7aa39d73e63fa5528d04dd90f25e4ed8e28c0e0 SHA512 cb4d0159c816a3abd750e1531f280aa1145fdac6b3b0106fcc913f1f9ab97ff92b5dc8778af2b15f55f94c7ffd64f5a5f5ec3189a062ea99e5e696d991abd8f1 WHIRLPOOL 6e0a72632b37a0d8b1de05a230949d696a515d5088dd832976c79d91e4a90603e7c5835b54cde176a645fe897831ab4dabeea128ed2828b985aa36ed2a6132f7
+DIST awscli-1.11.158.tar.gz 553030 SHA256 3028d5abb5b8d826ef127e848a384d4da6d4e8f187e0841001616a5cd536c652 SHA512 25c9a3636e7a83e0f9e090906354d2f4a8e44bc1de262987eb3f071b303d64056f2b149954097e57678e0a5553a136a1289c81999ea19a757ff3bea15fad215c WHIRLPOOL 31c8236a36dac1550efa58438b74e67976b538e18f79be5abb2066e47b9582e5b249e2022fda0cde7f3a7483893cb6c465a41dcdbb460613bb0be24cad50bf36
+DIST awscli-1.11.81.tar.gz 544970 SHA256 61022acd60f130c85953d46d47bf4aa3b60d03835eb5e731e2bf533e9ddf5533 SHA512 61b355247d75939d2814ca0594fb1b4498d7a1dc008e27302328c09bbe4ce72a6eddff64712410bd2023663436fd41d405a6a19a1c53c872a0ae6e68a0718175 WHIRLPOOL fd8424e37900ce7c1942595f280468be71c965a95ad270904de89e9bedae656926de6159e79c64599d4a70bd996ba6a30309164c8aa599351aaa350b5a825143
+EBUILD awscli-1.10.51.ebuild 673 SHA256 3f2d7b06b88547bce7e02b267378d674296950ded41fd9173b67ae5946110455 SHA512 e6bc2f4ca40c10deed7fcbf49d66930530a362e00bd2c5404445f39f06125c70f8abbd2e153d509f275efc04ec754dd3501bd6266813462f56640cdc409a1eca WHIRLPOOL dfb4c030eec679d64de9a94c27c142a20092abd0bb4abd22a3eabdd07ef35f28d1ee411f6161da1435a18798a065675f92bd02db67df73bf4bef17a0d87a4fa5
+EBUILD awscli-1.10.53.ebuild 673 SHA256 3f2d7b06b88547bce7e02b267378d674296950ded41fd9173b67ae5946110455 SHA512 e6bc2f4ca40c10deed7fcbf49d66930530a362e00bd2c5404445f39f06125c70f8abbd2e153d509f275efc04ec754dd3501bd6266813462f56640cdc409a1eca WHIRLPOOL dfb4c030eec679d64de9a94c27c142a20092abd0bb4abd22a3eabdd07ef35f28d1ee411f6161da1435a18798a065675f92bd02db67df73bf4bef17a0d87a4fa5
+EBUILD awscli-1.10.59.ebuild 673 SHA256 3f2d7b06b88547bce7e02b267378d674296950ded41fd9173b67ae5946110455 SHA512 e6bc2f4ca40c10deed7fcbf49d66930530a362e00bd2c5404445f39f06125c70f8abbd2e153d509f275efc04ec754dd3501bd6266813462f56640cdc409a1eca WHIRLPOOL dfb4c030eec679d64de9a94c27c142a20092abd0bb4abd22a3eabdd07ef35f28d1ee411f6161da1435a18798a065675f92bd02db67df73bf4bef17a0d87a4fa5
+EBUILD awscli-1.11.0.ebuild 681 SHA256 93697eaabaf42b64433fabca7d75b3c92da4fc0cf69abe962ba1eacdf86dcf81 SHA512 b886a434ff4b057e11be9d46faaae6f5e2847f1cb24cee87fb21fac8fd8d9ee6a9553eb308fa6a22681ede683581485d2a4df0d7b71f5e64b0cd2baa56a701df WHIRLPOOL e65851a7eded1d6a0c2c48be728286f675fe379ce95f2d34d9621517c32b8e4e9a8a35a4f09f29ff22138821825cac1820a22b9d8fbe2b5572b54efa0399ecb7
+EBUILD awscli-1.11.154.ebuild 726 SHA256 25d8cd7539a34a67849b491948914b8149fd75fbc1754e1c275ff9afa0989c8c SHA512 d52c7b261680789f9160dd6801520d0f4e8b933aee72e309729f7917b10aa4f5389a7e1272456e39f583257dcac86f6cbf18244f15e4c3b828e0b3b45143c8ad WHIRLPOOL 21b8534faa62be356fc51a18cdf13b6c39c68563487e4b97b0645d6655fadf52cd9c24fda0b8f7849230868fdc1cd7a26a2774a872a612bfe751b00c416f8be0
+EBUILD awscli-1.11.158.ebuild 726 SHA256 25d8cd7539a34a67849b491948914b8149fd75fbc1754e1c275ff9afa0989c8c SHA512 d52c7b261680789f9160dd6801520d0f4e8b933aee72e309729f7917b10aa4f5389a7e1272456e39f583257dcac86f6cbf18244f15e4c3b828e0b3b45143c8ad WHIRLPOOL 21b8534faa62be356fc51a18cdf13b6c39c68563487e4b97b0645d6655fadf52cd9c24fda0b8f7849230868fdc1cd7a26a2774a872a612bfe751b00c416f8be0
+EBUILD awscli-1.11.81.ebuild 681 SHA256 93697eaabaf42b64433fabca7d75b3c92da4fc0cf69abe962ba1eacdf86dcf81 SHA512 b886a434ff4b057e11be9d46faaae6f5e2847f1cb24cee87fb21fac8fd8d9ee6a9553eb308fa6a22681ede683581485d2a4df0d7b71f5e64b0cd2baa56a701df WHIRLPOOL e65851a7eded1d6a0c2c48be728286f675fe379ce95f2d34d9621517c32b8e4e9a8a35a4f09f29ff22138821825cac1820a22b9d8fbe2b5572b54efa0399ecb7
+MISC ChangeLog 1306 SHA256 f40ef5a846f361c6710d2f1716a05ee9311da22d59a654d653b9046b8d4d1c25 SHA512 dc53c63df75470aab18a71228119fe087e7897f47dcbd73c808f855d1cb3db5dc2d59a8b6db51550f11e66d20c5466f84c0d885d198874f6d8cbd15be6eee872 WHIRLPOOL ddb742de8de8287b0d9d2d367b6932913130c2d169d055a9e69bc8cfb4388192805805f64aa4bb0935d2efa194736f5c5a070c4ac2bcbc47d63ef9bbd5e541f0
+MISC metadata.xml 316 SHA256 e7fddf7f90dace00d75cdb917a6562bf244c4ee7fbb7de8ac69788ebfccc00de SHA512 86b3359e64e41ac4f2216e5bbcee6468100df3cd6e9c25595527d6819a2c27ce327797163a3a43bab11516a4826cff47825449cb797d7fe845794700a3a2bed0 WHIRLPOOL 75368d124844b033f3cce523f36f4682ae7d6b91879ee6de02f7481a3f0ce43bbf0b397034b77cad61210797d12d170c2151cdfbf371e78c21f3e6cbc93e15e0
diff --git a/dev-python/awscli/awscli-1.10.51.ebuild b/dev-python/awscli/awscli-1.10.51.ebuild
new file mode 100644
index 000000000000..e3944893caae
--- /dev/null
+++ b/dev-python/awscli/awscli-1.10.51.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.python.org/pypi/awscli"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+	<=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
+	dev-python/s3transfer[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/awscli/awscli-1.10.53.ebuild b/dev-python/awscli/awscli-1.10.53.ebuild
new file mode 100644
index 000000000000..e3944893caae
--- /dev/null
+++ b/dev-python/awscli/awscli-1.10.53.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.python.org/pypi/awscli"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+	<=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
+	dev-python/s3transfer[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/awscli/awscli-1.10.59.ebuild b/dev-python/awscli/awscli-1.10.59.ebuild
new file mode 100644
index 000000000000..e3944893caae
--- /dev/null
+++ b/dev-python/awscli/awscli-1.10.59.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.python.org/pypi/awscli"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+	<=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
+	dev-python/s3transfer[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/awscli/awscli-1.11.0.ebuild b/dev-python/awscli/awscli-1.11.0.ebuild
new file mode 100644
index 000000000000..d52c26c522bb
--- /dev/null
+++ b/dev-python/awscli/awscli-1.11.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.python.org/pypi/awscli"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+	<=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.5[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/awscli/awscli-1.11.154.ebuild b/dev-python/awscli/awscli-1.11.154.ebuild
new file mode 100644
index 000000000000..b4f55ea2c62f
--- /dev/null
+++ b/dev-python/awscli/awscli-1.11.154.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.python.org/pypi/awscli"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+	<=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.5[${PYTHON_USEDEP}]
+	<=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/awscli/awscli-1.11.158.ebuild b/dev-python/awscli/awscli-1.11.158.ebuild
new file mode 100644
index 000000000000..b4f55ea2c62f
--- /dev/null
+++ b/dev-python/awscli/awscli-1.11.158.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.python.org/pypi/awscli"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+	<=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.5[${PYTHON_USEDEP}]
+	<=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/awscli/awscli-1.11.81.ebuild b/dev-python/awscli/awscli-1.11.81.ebuild
new file mode 100644
index 000000000000..d52c26c522bb
--- /dev/null
+++ b/dev-python/awscli/awscli-1.11.81.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.python.org/pypi/awscli"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+	<=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.5[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/awscli/metadata.xml b/dev-python/awscli/metadata.xml
new file mode 100644
index 000000000000..07a14144d9eb
--- /dev/null
+++ b/dev-python/awscli/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">awscli</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/axiom/Manifest b/dev-python/axiom/Manifest
new file mode 100644
index 000000000000..253049c58dc5
--- /dev/null
+++ b/dev-python/axiom/Manifest
@@ -0,0 +1,8 @@
+AUX axiom-0.5.30-sqlite3_3.6.4.patch 1526 SHA256 1ec993226d9e71008780a0d17aac830ffc169d3b86c66031c970157741cecf2a SHA512 a147cc8a221f05bdfc7bca0f84a273d6fda94404c16e8d6bccf89bb7762ccf4dcbe7e84b4c459843900ebb7a9f82c82b564222b570774fcf0fdf57f468eaa999 WHIRLPOOL 2a3bf8d53f10db5ccfe84afc10449cca887dabaebc491d4d41b63b0c02142543382e78beeb75ea8f92c6a80fd1eecf7446928e33f79d322d8e3c6ebe08c4e53b
+DIST Axiom-0.7.2.tar.gz 201850 SHA256 a9e82a2288ac8b465bbeb2b97b567f5eea7d4856924c3e9bb74dcbad466e2ff6 SHA512 b8aba9b1b69141ad93759255f8eb169d815565d4b5b5f813b9afadb1158960ead859c896c2f26797fa1953c5cc35729dfbbb942077530402372030f85e85f3a5 WHIRLPOOL 9dd38b9f2d1f7fb3c245c6f829c6075ed09515dc9b5b88ba4ad881ad633a91ef24b021a2bbab198d77ed58f19a2ce9e89e5846b6865ede8adb7844cf3a18f1ed
+DIST Axiom-0.7.5.tar.gz 203526 SHA256 82b227cb8ab270d8132416ddfe2c98c662cf548f3f741d73ac077c52aa08af8d SHA512 6a868fce245c64f791b8340e5f04a87e18ee1b528ff248b0b3f54f5ddf8a3b68903946dfa7291c4d902b76e7240abd864166463949cfd913a9d38b1439fa2f9f WHIRLPOOL 8f18bfee60e4446296cebe1c07e138b04a7570f031b59e4e2b903de03b9f73b23d17370fdf86003351c67ada9f8ff1cad4c30043885f89a49f08edc18cf85c4c
+EBUILD axiom-0.7.2.ebuild 818 SHA256 8e11a8f6b2c0b9c3cbf20fff842e22113bbc6bf0b36811f57f0b00f78b020b5e SHA512 23e6e9532ce3397789630dbd924a76e2b61e64bc3369b7ffa9045124f93afc661b6e79e9c086201286e328a0d0cb5a8f04821bd8addc245b7fb610f08c6558d5 WHIRLPOOL 2c6d8ad44ca7d5ee92769c3f0b0d0f232225916b97c177dfa09846879416235a33f3baa58a3e040c77414673ec8a5fbcf2447d7fe969691912226aa2b8f567e1
+EBUILD axiom-0.7.5.ebuild 872 SHA256 82e9e7e978b9e4cc5c742657f7b1a787cc404c0ca3cf4ce1dc59ce0bed183072 SHA512 8876b4b2147791661ee0619cbbb6c9923f39a3917d16713d2d1cb40f15143755b844e04413b6a7228b977c2eb6849d45b60044635f2fca0a657022a419a6c7db WHIRLPOOL d76afb8ec0f317c7eb1b799c356c73006a1e156f217a5faef5782869d542b8eb6e8d44e69de1d246ff4ae9a312f0c6a7bba0a081e5e32ff9b2a87b9371dd89cc
+MISC ChangeLog 3366 SHA256 6be21e9ce05c735aab24216b5e980676ead030f8ef7198d24399796753b290ca SHA512 08bf539a4a9897789156d7cf58d3c03e9b96eeded1d1bdaec1e4d9823f58186f11be3fcc8a0ab9022e90bc0f3fbc687aa07189696e80e66e762e723a8dfc8a0f WHIRLPOOL cccb0bc1cae4aa902310cdcbba4aa9c4d845eace0c3aed08c98472007e93007f3bd3d56ac57845c16b8f90f46dafbdd012eaf330a91724f19bf2d85d9c30c50d
+MISC ChangeLog-2015 7507 SHA256 3be007682377a386dab6f5dd57073c03a3f2f400a1f8d1a504cd33cc5504755f SHA512 3d251d41d42b6af88b32ba182c6ee9802a73f6cc111e6e545a71a76a1016e99e2f53c10422da92f14aa6f74c4e0ad136c14357a60a0ad0b2982c960b1cc1786b WHIRLPOOL 62c8e1ae9aaf6ac838f897e703a8c88accd57b90fb6342d86e0d302de993589a050c51c4c302bbe3d9a4f2fea43949ecc45bec53cb64c644f0a22fd3fa7d36c4
+MISC metadata.xml 789 SHA256 9a5da6f8958588368d6354695fd2fb2485554a10c09f4eea9a2b7e3f51eaf9df SHA512 f96f0c754b752a1a298385b8d6b1238eb3ae9c22fb36a53ab8dcebdc8da84f1a9a61c0e18e6ce66e39d8ca0a7c1c78d581a7f86c2660dca95d2718cacef497ed WHIRLPOOL 22da08885a92c3cf1f6df590c4e4de6702e509850a33283292c63b41d154916eff8d11e06eae152ade2597a692b048d4f6db7935d4879d0770d068ed84c1e23b
diff --git a/dev-python/axiom/axiom-0.7.2.ebuild b/dev-python/axiom/axiom-0.7.2.ebuild
new file mode 100644
index 000000000000..4acc9f2a7e40
--- /dev/null
+++ b/dev-python/axiom/axiom-0.7.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit twisted-r1
+
+DESCRIPTION="Object database implemented on top of SQLite"
+HOMEPAGE="https://github.com/twisted/axiom https://pypi.python.org/pypi/Axiom"
+SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-python/epsilon-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-core-13.2.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.5.30-sqlite3_3.6.4.patch" )
+
+TWISTED_PLUGINS+=( axiom.plugins )
+
+python_install() {
+	distutils-r1_python_install
+
+	touch "${D}$(python_get_sitedir)"/axiom/plugins/dropin.cache || die
+}
diff --git a/dev-python/axiom/axiom-0.7.5.ebuild b/dev-python/axiom/axiom-0.7.5.ebuild
new file mode 100644
index 000000000000..65bc7c38689b
--- /dev/null
+++ b/dev-python/axiom/axiom-0.7.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit twisted-r1
+
+DESCRIPTION="Object database implemented on top of SQLite"
+HOMEPAGE="https://github.com/twisted/axiom https://pypi.python.org/pypi/Axiom"
+SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/epsilon-0.7.0[${PYTHON_USEDEP}]
+	|| (
+		dev-python/twisted[${PYTHON_USEDEP}]
+		>=dev-python/twisted-core-13.2.0[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.5.30-sqlite3_3.6.4.patch" )
+
+TWISTED_PLUGINS+=( axiom.plugins )
+
+python_install() {
+	distutils-r1_python_install
+
+	touch "${D}$(python_get_sitedir)"/axiom/plugins/dropin.cache || die
+}
diff --git a/dev-python/axiom/files/axiom-0.5.30-sqlite3_3.6.4.patch b/dev-python/axiom/files/axiom-0.5.30-sqlite3_3.6.4.patch
new file mode 100644
index 000000000000..cfa465ce656c
--- /dev/null
+++ b/dev-python/axiom/files/axiom-0.5.30-sqlite3_3.6.4.patch
@@ -0,0 +1,36 @@
+--- axiom/_schema.py	(revision 17031)
++++ axiom/_schema.py	(working copy)
+@@ -28,7 +28,7 @@
+ CREATE TABLE *DATABASE*.axiom_attributes (
+     type_id INTEGER,
+     row_offset INTEGER,
+-    indexed BOOLEAN,
++    "indexed" BOOLEAN,
+     sqltype VARCHAR,
+     allow_none BOOLEAN,
+     pythontype VARCHAR,
+@@ -47,13 +47,13 @@
+ HAS_SCHEMA_FEATURE = ("SELECT COUNT(oid) FROM *DATABASE*.sqlite_master "
+                       "WHERE type = ? AND name = ?")
+ 
+-IDENTIFYING_SCHEMA = ('SELECT indexed, sqltype, allow_none, attribute '
++IDENTIFYING_SCHEMA = ('SELECT "indexed", sqltype, allow_none, attribute '
+                       'FROM *DATABASE*.axiom_attributes WHERE type_id = ? '
+                       'ORDER BY row_offset')
+ 
+ ADD_SCHEMA_ATTRIBUTE = (
+     'INSERT INTO *DATABASE*.axiom_attributes '
+-    '(type_id, row_offset, indexed, sqltype, allow_none, attribute, docstring, pythontype) '
++    '(type_id, row_offset, "indexed", sqltype, allow_none, attribute, docstring, pythontype) '
+     'VALUES (?, ?, ?, ?, ?, ?, ?, ?)')
+ 
+ ALL_TYPES = 'SELECT oid, module, typename, version FROM *DATABASE*.axiom_types'
+@@ -61,7 +61,7 @@
+ GET_GREATER_VERSIONS_OF_TYPE = ('SELECT version FROM *DATABASE*.axiom_types '
+                                 'WHERE typename = ? AND version > ?')
+ 
+-SCHEMA_FOR_TYPE = ('SELECT indexed, pythontype, attribute, docstring '
++SCHEMA_FOR_TYPE = ('SELECT "indexed", pythontype, attribute, docstring '
+                    'FROM *DATABASE*.axiom_attributes '
+                    'WHERE type_id = ?')
+ 
diff --git a/dev-python/axiom/metadata.xml b/dev-python/axiom/metadata.xml
new file mode 100644
index 000000000000..b01dd3db29a6
--- /dev/null
+++ b/dev-python/axiom/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">Axiom is an object database, or alternatively, an object-relational
+		mapper. Its primary goal is to provide an object-oriented layer with
+		what we consider to be the key aspects of OO, i.e. polymorphism and
+		message dispatch, without hindering the power of an RDBMS. It is
+		designed to "feel pythonic", without encouraging the typical ORM
+		behavior such as potato programming.</longdescription>
+	<upstream>
+		<remote-id type="pypi">Axiom</remote-id>
+		<remote-id type="github">twisted/axiom</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/babelfish/Manifest b/dev-python/babelfish/Manifest
new file mode 100644
index 000000000000..874b319aba92
--- /dev/null
+++ b/dev-python/babelfish/Manifest
@@ -0,0 +1,6 @@
+DIST babelfish-0.5.5.tar.gz 90398 SHA256 8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104 SHA512 71504dd0203ad85a6a69107d67df3bd5ae4193515e74c05b346a8bd0aab425fc1534d54d1c74b14e48580ee5e76f04705e35c2d359fbe46254bee37e41cb4bfa WHIRLPOOL 53f3a5620a0d4affdb7248883166a44bada2e7824a4ea38ecb40dba9ffc49c696c1247ffd195118b5abdc338c3e29d8b5c9def85059180036a76a7b90c7ac694
+EBUILD babelfish-0.5.5-r1.ebuild 548 SHA256 5b427814d9d2f503ff07e1dcc79d05e7a6f351649db23f3c0fb8e9e217327cec SHA512 2510c9f4e372a7e9a80d96daa01d461d5cc47f37c9aaf1bce7f875061cb6ae5fb2202a86dfcffc6d62ce4aad188190d13f2b90063858330df0e08898701b3ccf WHIRLPOOL 4027761c500bc3af090c56bb10dc3b55c7f7d8868a5176c15d1bb3c43e4f192bd2794958bc209b2576f5393fec7ed8524e40e86537e32380441687c1b959f344
+EBUILD babelfish-9999.ebuild 546 SHA256 34171cab429af9518a56d96c5bee450d97bd4318a1e64b353e617edbf7f071e1 SHA512 7f9498dceeaaf5914bff7889f90ffd9d66e741d080918230ab85eed2904f9511991ec0c821ac61f42308b980534ce0a3f7250f347e5d0c3448e3a4dea066c056 WHIRLPOOL 134408d128061ef6848d4713643238ac4098de634dc518e096ae2fab34c5a2653e0e07a9518328623cc6acde24d5ce33e3d441660786f13d907aa616111a498c
+MISC ChangeLog 4339 SHA256 8c50a0a128db554544cfba17b870695267eb616c2b1e5f04876055794b9f3bd9 SHA512 3d65636a5f0c4ec28d5f7c95ead70eda724926b7cf59f329f04f79412d2bc476b274a680058dcc9cc416541bbc5c328b2f20a1f0a3b26aa8c5b4f2d5b204bcdf WHIRLPOOL c8fd7ce084b2d0fcb9b98ee19f65ace5b659a7af315bac0b70a5ae9241f4f308aea32e7c67baec6ff03a51b367f944cf61dd79ab0ab442c57fd9fbba9a1824db
+MISC ChangeLog-2015 1572 SHA256 6103eb068a2270e261c198c229cd90a4448c65b7ccf47a4e1816ba2d5aa6238b SHA512 d5a1f09636b9c57ceb87c1501e5e49ff01ec6d4000294272df718215120b278d20683fd0032302e55dfeb916fc682ec26b57d575508765846ee09814de470c49 WHIRLPOOL 6fda07d7a3b7d04403e968162882a11f0f6338748b0495a9512e8a4165c225db86e325f5adadae3c2fd2517bd54fdf0f92471441de3507d86f0780564730973e
+MISC metadata.xml 494 SHA256 88f653b01315d423b903e1eaa58832b9ac4fcac57e4f3f72f3a6a555289a34de SHA512 cf95470b83784111dd64035a8daf50fb5e3b81e0707e0392aa0e71ac74185dba2f38994d58491d750d9e4b6dd463d06248a17ac734e4106f2354978df75ae34a WHIRLPOOL 196e5a8e42809e295c0ff387da5ec067f462e860b8a962a7d366dff5b60049e1dce9fa6014dab984c5960ac7648f9c4b664e5ad88dbef98fc33df64deadc9edd
diff --git a/dev-python/babelfish/babelfish-0.5.5-r1.ebuild b/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
new file mode 100644
index 000000000000..45a530fbae29
--- /dev/null
+++ b/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to work with countries and languages"
+HOMEPAGE="https://github.com/Diaoul/babelfish https://pypi.python.org/pypi/babelfish"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/babelfish/babelfish-9999.ebuild b/dev-python/babelfish/babelfish-9999.ebuild
new file mode 100644
index 000000000000..9cdc6f9ff39c
--- /dev/null
+++ b/dev-python/babelfish/babelfish-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Python library to work with countries and languages"
+HOMEPAGE="https://github.com/Diaoul/babelfish https://pypi.python.org/pypi/babelfish"
+EGIT_REPO_URI="https://github.com/Diaoul/${PN}.git"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/babelfish/metadata.xml b/dev-python/babelfish/metadata.xml
new file mode 100644
index 000000000000..688507b73f4a
--- /dev/null
+++ b/dev-python/babelfish/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>itumaykin+gentoo@gmail.com</email>
+		<name>Coacher</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Diaoul/babelfish</remote-id>
+		<remote-id type="pypi">babelfish</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/backports-abc/Manifest b/dev-python/backports-abc/Manifest
new file mode 100644
index 000000000000..0f3cf5feb3e3
--- /dev/null
+++ b/dev-python/backports-abc/Manifest
@@ -0,0 +1,6 @@
+DIST backports_abc-0.4.tar.gz 5593 SHA256 8b3e4092ba3d541c7a2f9b7d0d9c0275b21c6a01c53a61c731eba6686939d0a5 SHA512 0b7f9cc1d12db16a0c0eaf658fd874bf9fe09959fab65d1b0104d337fb20cceb2e3e9213be895df5951876846eccac85012c270e34197d625ce128b688e847ae WHIRLPOOL acc7b78e0dae1f533778513a5a92cc03ebd42906e84a5f4266fbe911fa54b56ca0e65e670730b2afab2d48cbea26a8ea1207ff5bccae56aa20191aaebd9b00d9
+DIST backports_abc-0.5.tar.gz 9807 SHA256 033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde SHA512 5c2bc01bce8d3ed482bf5d8361a20f9afa3edc1c50280f0a01ffb890690b92296fcbfa68f79677fc3ebba851617f339cb6367ccdd0fadf1127a4e3c030784b7d WHIRLPOOL 582c107ddeab83c682940bfdaf4b850dcc73b79ff6e4968215c03d34c475fe5db2d9bf836c9aae5170fedef74f2a30216abaed0f275967ffa839122725cdbbc5
+EBUILD backports-abc-0.4.ebuild 704 SHA256 dd9f77200b29854c69b8e798b732e8ec21af873b293356b1f9130708d4d6d0c2 SHA512 7c3e113f6d12c99a0be8e8dba675d162e27bbe9f8a41ee50f5fd3ab64af6618e12e18594be9bdaf37d1dd1d956a4e4ab7173f39d74df6ed4cc1d99ca86805de9 WHIRLPOOL da3e26c431e679499a6afbcb1bc35d7278ed21824dd813b14a4134f719361e3fd9dd33399d7ff5a832868dcea94d9c36cbd38489f0b980bc45a66879f5c2ada6
+EBUILD backports-abc-0.5.ebuild 714 SHA256 6a498b806c58a98db888acc5a5f9bcace102190445709ff8a0bcf5b5e9fce0cb SHA512 6218187d6c18bb272c33e6353bcd6ee8186639d18c8962c50fcfdae447c37407502b9dd3ad3e7fe92c91f61455cbab2a1c50bca5c334b139758b6ca6dbeb8338 WHIRLPOOL 90eb22a6792598e3199470fee8f1ff470a359353450e36c7b55fd764e4e6006113f7c55ec56fb38f01bd712e800a74c75c14e8f4c534a209212f518e96ae9879
+MISC ChangeLog 5012 SHA256 72f3ab2bfd6cd385d7a0a67b0dfaa6838eb0a5033f1d151749e115f49b29fc6a SHA512 0592c6b209f8d17173c753ccd76456c43b76e7628581ce12b593998db29d1838b423dd45e7f77c7568caa2281dbbc6a9f5527e787145c37bb0ddcb35f87e86b7 WHIRLPOOL 72188e3678d94692391293f5f92c147fc24d57de456c04fb737739852d28fba0353d0ebc45204876bf90a0d6c07926261edc7f4f23e7eb3bc50df184723bb293
+MISC metadata.xml 388 SHA256 04625fc596d0aafb7587c8dc35856652bcaa3e7fa6191ece708852ee711cfd41 SHA512 8172e10d53d5946f0756fe81fde64eaad10e2e2313941a8d98665639afb2248fbff9821915abed5f696f33f38fa779caa233467c991207d47f6cf57f3241334f WHIRLPOOL b594f1fe8f938d2da5607e2cd4dbb174e8364a8c4646114abc52d9cf3352ac797e1f71433432f41769be72837fb843f691615a0dc9aa9e3e19a40898694a2a36
diff --git a/dev-python/backports-abc/backports-abc-0.4.ebuild b/dev-python/backports-abc/backports-abc-0.4.ebuild
new file mode 100644
index 000000000000..16df573270ad
--- /dev/null
+++ b/dev-python/backports-abc/backports-abc-0.4.ebuild
@@ -0,0 +1,26 @@
+# 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} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Backport of Python 3.5's 'collections.abc' module"
+HOMEPAGE="https://github.com/cython/backports_abc https://pypi.python.org/pypi/backports_abc/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" "${PYTHON}" tests.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/backports-abc/backports-abc-0.5.ebuild b/dev-python/backports-abc/backports-abc-0.5.ebuild
new file mode 100644
index 000000000000..ff185701e5b9
--- /dev/null
+++ b/dev-python/backports-abc/backports-abc-0.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Backport of Python 3.5's 'collections.abc' module"
+HOMEPAGE="https://github.com/cython/backports_abc https://pypi.python.org/pypi/backports_abc/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" "${PYTHON}" tests.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/backports-abc/metadata.xml b/dev-python/backports-abc/metadata.xml
new file mode 100644
index 000000000000..f968a3faa0f9
--- /dev/null
+++ b/dev-python/backports-abc/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">cython/backports_abc</remote-id>
+    <remote-id type="pypi">backports_abc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/backports-functools-lru-cache/Manifest b/dev-python/backports-functools-lru-cache/Manifest
new file mode 100644
index 000000000000..8039cd2ed17c
--- /dev/null
+++ b/dev-python/backports-functools-lru-cache/Manifest
@@ -0,0 +1,7 @@
+DIST backports.functools_lru_cache-1.3.tar.gz 6685 SHA256 444a21bcec4ae177da554321f81a78dc879eaa8f6ea9920cb904830585d31e95 SHA512 946156266d4b1bccb3eb444d1cceff6568b8c2a62e09bc9197281bdafe912069efa4c857089a7e6ea0247ab9407256a7a7c92485599692e0c0159c428137a342 WHIRLPOOL a4cccbfd49acc640c1e15949919e10343c00f966e22bac7a2dc82af776f35cadce825a7757c5dca32b189797303abedc93aecf3000203819ee869bbb37ac4a03
+DIST backports.functools_lru_cache-1.4.tar.gz 6927 SHA256 31f235852f88edc1558d428d890663c49eb4514ffec9f3650e7f3c9e4a12e36f SHA512 78dcd12f392bc110d1556f567a9f8fe977fa4ddc98a2121ceaf43606687171866832b8d32220dfb4ca335f53e89acecabda9e48ad48571f1741b21ab2d3b8a21 WHIRLPOOL a223576df439818a247784e49d1d401807955a64eee4fdae9b937daaa96afc42e535819b4f6bbd0aaf04a0764a241809a79909ecda359ede60891dfb33305414
+EBUILD backports-functools-lru-cache-1.3-r1.ebuild 1184 SHA256 3d632fc1c0954356afbd9cd0b2fefecdb93b040a16bd8820d9e62b05a6bf1530 SHA512 a624a2120b590a0444cd79fc0292354574f1e875fb8c3e973584539255236dd99821b96ab80992e802883b1faf788b7c4bcf7d651deb064404897570e415c6ff WHIRLPOOL 40ff9de5107b95dbc1d1e6d7d61dc0c618acd9ee58bdc3763f59cb5986324a9a7902c9b5a12a0a096437f56365d39f586e09f04f5987da47bccb33735bccd545
+EBUILD backports-functools-lru-cache-1.3.ebuild 1081 SHA256 64be30432fb739edbe677aadf5473216d919bbbb56b83e2f20e16a2095fa64b2 SHA512 46b2852ab07fbce2b7945b9b93b9aeff58999448f6cb040e52f0097c3664576ea55717c268df2794b2cb391ae5d23128a01736fa36239605aeaa5438d5886f67 WHIRLPOOL 250050afe1a1ab57e26e08c568f77d6c6c9d70b5c988ebeeda35e489e28b271a72a03a57a9b4daa2182342e53dfed32763607b0cc02120dc56587f97192aaa6d
+EBUILD backports-functools-lru-cache-1.4-r1.ebuild 1276 SHA256 1c5a860f7122d1f62ba2d37b8b338e7c3da60ec5e640b69b1a6bc4cfcadfe5ee SHA512 20caf4f6f9b280299adb4e8ae1f5ae82a6fded7729a0af76e0af4c0304ed9284e2aac74715fe2f3f6ccba839d7805b2fbb223385bd0d7af3ec017b1a3acde1e1 WHIRLPOOL 06924a1898c1cbe83309a2753abf03748f5496ce23ad5c34baa0cc1ae18b78ecf7e488d9832e94c757a83b0ed9ab51c976c291aae61cf5e644602d65e53608fb
+MISC ChangeLog 1372 SHA256 317c753b80f1c142a12a7317436a117f50968b87988dd3df588097159ff50d2c SHA512 ed0677553ff8414febbc8eeac1d232592cf4f01867cabc2bad7226df738923a2b4c878a18913d6b0f4b119a777ac2b9cd0df8fdbc7e0fb1990031c369a9c3e04 WHIRLPOOL 127a7236fb8759128086b044037ed5a2a33e5154085daa8f0d0fbd5b9668ed820c9e101388414d77505a616c053730f82d4d1c07a18e6b586a3ce7aef5a7b4b4
+MISC metadata.xml 803 SHA256 988749c9ceb2ae71874997dc20ab83235108e974e27e180203e333d441566fba SHA512 c8ee92d957a9af691eaf06ba40124ec7ffa668ccd98e77d5cc8972b3d18be145fb33c672b36150cd350274d753bc9a53b8b7d15525fc59ba17ec2235d006b11e WHIRLPOOL 6a3950cc272516f71d2f9c6ad1f4d196501eb93432f439367a6fbc3c964347623b9d9156c90a0a3b63c2acca353dfaa460e32b5ba3d2c98366358cb27b6cd114
diff --git a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3-r1.ebuild b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3-r1.ebuild
new file mode 100644
index 000000000000..d4dc56b0f2fe
--- /dev/null
+++ b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+MY_PN="${MY_PN//-/_}"
+DESCRIPTION="Backport of functools.lru_cache from Python 3.3"
+HOMEPAGE="https://github.com/jaraco/backports.functools_lru_cache"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild
new file mode 100644
index 000000000000..c94bc757da0a
--- /dev/null
+++ b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+MY_PN="${MY_PN//-/_}"
+DESCRIPTION="Backport of functools.lru_cache from Python 3.3"
+HOMEPAGE="https://github.com/jaraco/backports.functools_lru_cache"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild
new file mode 100644
index 000000000000..be136551e498
--- /dev/null
+++ b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+MY_PN="${MY_PN//-/_}"
+DESCRIPTION="Backport of functools.lru_cache from Python 3.3"
+HOMEPAGE="https://github.com/jaraco/backports.functools_lru_cache"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux"
+IUSE="doc test"
+
+RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build . _build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	# avoid a collision with dev-python/backports
+	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/backports-functools-lru-cache/metadata.xml b/dev-python/backports-functools-lru-cache/metadata.xml
new file mode 100644
index 000000000000..b22cae5ee290
--- /dev/null
+++ b/dev-python/backports-functools-lru-cache/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">backports.functools_lru_cache</remote-id>
+		<remote-id type="github">jaraco/backports.functools_lru_cache</remote-id>
+		<bugs-to>https://github.com/jaraco/backports.functools_lru_cache/issues</bugs-to>
+		<changelog>https://github.com/jaraco/backports.functools_lru_cache/blob/master/CHANGES.rst</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/backports-lzma/Manifest b/dev-python/backports-lzma/Manifest
new file mode 100644
index 000000000000..202ac50c298f
--- /dev/null
+++ b/dev-python/backports-lzma/Manifest
@@ -0,0 +1,7 @@
+DIST backports.lzma-0.0.6.tar.gz 34475 SHA256 c9c97b10fb1941abdd896b9447e3745da59b32750b27c015ddb8eaf3654daaea SHA512 6196e64e81c2427d07844dab984113021ae97ba9d0c136cfd20b7213cdb8cda8b9a2643c8df21c799d338031cd49d4cbfd7f9ba9c30efd6cd28e63e8772a032b WHIRLPOOL 3d0f8a5f34d18c2f1e0072a0b6fa4ab22bfd61031ca521d423b4007b8702ec7d901560dc5416389f1e9839590a2326ac7ad2850d1a39e7603cb66f598a2de66c
+DIST backports.lzma-0.0.8.tar.gz 36111 SHA256 200584ad5079d8ca6b1bfe14890c7be58666ab0128d8ca26cfb2669b476085f3 SHA512 bc5e7672a0ac53b7cf97ea52a566e96d92a3dd334a8321699585225e32ad7c723b4ffd6e4b153bd2ae3ead2a2cd6a48678b915257de4952ddca8389032db48ad WHIRLPOOL 1aaa4ac5b0a2d25a932577ed52843a99a92ef152e1eaf5795bbdd9ec13cb048acd0f01a99eef1182392b33ae62aa2b4f61fb0e801e44eb729d665d707ca71ebf
+EBUILD backports-lzma-0.0.6.ebuild 930 SHA256 7da306b03a702909856311f24719f6dc6c994f5dd6790f858fcad5d64a0655b4 SHA512 21d6fcaf62639d5109f0531eb5b675b7ace6bea85a9ec5d4a7eb9c1df3e9bb92734350126b481c83a755f2f130421b64f4c2f510b6decd37600ad6a3c3b2ac90 WHIRLPOOL a63def4e825ceb16004b6967771d1ef1d9bfd9cb9e447e04e6d9b7386de049e3017dc3012b423a93270c5d88128e98bde047a0eaf61272d8e049c0cf6292f9d0
+EBUILD backports-lzma-0.0.8.ebuild 932 SHA256 ee06cc8866a6e0a81b6d769e499d1192a42031a2ba651cf491c1f02bbea05617 SHA512 a52fb1f912bf43e69c164d643aa692eb39cecf6aeee4970d64184846b85cccbf8d064e79e34c61de488652ade88bec50e313e5415d09c4c503c7f556b034aae1 WHIRLPOOL 9961e702cf920685ab03cd2e004f624026d878d18a2f5b79b14cc02c525960b6ba9dea51794c2f708b8fc51e23cfd5d82b9a8b023cb01cbf87d9d247118c3296
+MISC ChangeLog 3097 SHA256 8c79122a7ec7356d8d08357949342e35e59e4c92d1621d5b51e7e75f0e78cfa2 SHA512 c45bf127991cfd24af0b59cf427c7bb6c482b10c6bad82bac9970dbe620cfa9dfa55d06bd587a07f2327b6ca0a2a814a84c2dbb751cc7ee8f97ab11c3e80f937 WHIRLPOOL 33cebfb8eaf6610c1e4ae5beece9c0cc94230ed5d9c33c61ff28cb3f320f96d49d6a44eb4727fb8b9f2d59d9da2b3fd0d7adf0e5c7ec85399a88ef2be170b353
+MISC ChangeLog-2015 2508 SHA256 8b5ea831f1f1841f4dd155528aa716d0ef968d5586eb2723440ea7da5c37b0a6 SHA512 982bd85e339ce2a8ba7dd5849d08d3cd27cf4a24ee2893f89a8dccca8a1d196ddebe6d484e519dd4c670eaa7032356f25c557358d8b8882e9741caa4a81ab1e2 WHIRLPOOL 92ed5140b3d43650075e2e0ddb9ad3aa5976bbc0f620f0add8244cdeeef26477be7b475b3dfb4ddc63d143addad2fc81f64b3fab00954bdacd19d110dcd70b90
+MISC metadata.xml 391 SHA256 3203bb6e516bbae3b38e333008530655dea2a2136ab7751ca51431a51107d480 SHA512 382866a463cef16a42a0a89b3f1af18565a8e72858ab1c55d7c89e9c8bf87224b3d5beed52beb46ed83b8e8f55bb02a5aaccf15fe027d21de138fed5f9798cd7 WHIRLPOOL bf176d573d94f5043fdb143d2762ab16063886e2c7023db0626683c1d78c5ae21b68985ee1e3cd083c52d64bd88825915e4dc94f50ac57460a6fafa876daaf43
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.6.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.6.ebuild
new file mode 100644
index 000000000000..eafe17743b95
--- /dev/null
+++ b/dev-python/backports-lzma/backports-lzma-0.0.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Backport of Python 3.3's lzma module for XZ/LZMA compressed files"
+HOMEPAGE="https://github.com/peterjc/backports.lzma/ https://pypi.python.org/pypi/backports.lzma/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="app-arch/xz-utils
+	dev-python/backports[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" "${PYTHON}" test/test_lzma.py || die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	# main namespace provided by dev-python/backports
+	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
+	rm -f backports/__init__.py || die
+
+	distutils-r1_python_install
+}
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
new file mode 100644
index 000000000000..90c977ca8a57
--- /dev/null
+++ b/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Backport of Python 3.3's lzma module for XZ/LZMA compressed files"
+HOMEPAGE="https://github.com/peterjc/backports.lzma/ https://pypi.python.org/pypi/backports.lzma/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="app-arch/xz-utils
+	dev-python/backports[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" "${PYTHON}" test/test_lzma.py || die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	# main namespace provided by dev-python/backports
+	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
+	rm -f backports/__init__.py || die
+
+	distutils-r1_python_install
+}
diff --git a/dev-python/backports-lzma/metadata.xml b/dev-python/backports-lzma/metadata.xml
new file mode 100644
index 000000000000..c58f6b910a2a
--- /dev/null
+++ b/dev-python/backports-lzma/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">peterjc/backports.lzma</remote-id>
+    <remote-id type="pypi">backports.lzma</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/backports-shutil_get_terminal_size/Manifest b/dev-python/backports-shutil_get_terminal_size/Manifest
new file mode 100644
index 000000000000..def5a1f04438
--- /dev/null
+++ b/dev-python/backports-shutil_get_terminal_size/Manifest
@@ -0,0 +1,5 @@
+DIST backports.shutil_get_terminal_size-1.0.0.tar.gz 4279 SHA256 713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80 SHA512 b74341c6616f9aace5abcc7fd657fc33801b558b6227c533002ccaf588734490b465a4a27d2bdc8047a385771afdcded610edef832dfa5ef24632f4541729050 WHIRLPOOL a04b702aba3b9892ca5b86b284e6945e1980e135946c04abef2b95a3e12a230eb7c99b20418a4dc21f8c3f7b20715daa75d89d61fbea248d788f0aef5326cd07
+EBUILD backports-shutil_get_terminal_size-1.0.0-r1.ebuild 894 SHA256 6cd76fd24f78628bc3f7a46ec08e819df5b8f015662d8e2701b2228ba2bb87ff SHA512 4d27c925cb42b10840aeca3061b41a80d8ef39cdd5968ee8192e7bd4407db6af6ce9c71283692d588bac443cbb23ecaeb10ba10c909b30e7ae07f7b388b9a4bd WHIRLPOOL 6a507b8d9ba6e249deb44633d49876a48a33389fff7b606e1e8dee23b3661e7f2d4fcb659f58d2ff41ef808b361cde3ba7b421220c072a0dbe5a1920ff818c22
+MISC ChangeLog 2814 SHA256 90754b7d4a5f864b9df210d35fba13874982b4745966a5574fe52d1eb32a4fbb SHA512 301e2c58cdae3fc600ec7ff1e19e31cb2c0c84695cd75d7b3ee8cfc9e3993fb9ed93523b94942e1ae151ad6072567a028f5c848a6b4b07dee3bd56d2709abffb WHIRLPOOL 947c142e76754c662b8250bdf0dbe24106a7c182f1f4b904fca2bc9c3d2c66b04615ee48c20769af5de3e0498859effad366a25640d1b736e5d94ed06ded1483
+MISC ChangeLog-2015 764 SHA256 1eec1874570df0c3692fa5c871cf92cd38ef539ae7094b44de64c2d5ad837d95 SHA512 80616e799e46c2f7e123df630c41965fb6b22e57deaa0b5913e3967f520b35d9fcdbddeae9b1fe4dc36501fd4c9eea21d1a09408165fc700108914c31a8f8d84 WHIRLPOOL 14ff13c470980615e86614630374ae2ddd5cf795cb99915fa0738b181c4026f34a202ceb8fd4ad3598709be2c9e916eed6174bec44a3b9958ac7dbf4608ce362
+MISC metadata.xml 421 SHA256 67381bca0372a6b704677f776ad6331155e1d906ce53c75841b4fdfd1342a257 SHA512 e8dfe8e4d613e805fcc9127e433db4b2af234cd5895d529bdbbe3f3ea66f00f5b051120ad708ab8b59689e1fc21aba246569768a95f09c8266f91cd5c1ba860d WHIRLPOOL c78c152829818362d446abd15e523d7471a03a054c974a89c231c3df846db48b008e3afd824b6f787988b585727cf131450ba3e335116252aa01dcd90bf38ff5
diff --git a/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild b/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..8ca00bf3d01a
--- /dev/null
+++ b/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="backports.shutil_get_terminal_size"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A backport of the get_terminal_size function from Python 3.3's shutil"
+HOMEPAGE="https://pypi.python.org/pypi/backports.shutil_get_terminal_size/ https://github.com/chrippa/backports.shutil_get_terminal_size"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_install() {
+	distutils-r1_python_install
+
+	# main namespace provided by dev-python/backports
+	rm "${D}$(python_get_sitedir)"/backports/__init__.py* || die
+}
diff --git a/dev-python/backports-shutil_get_terminal_size/metadata.xml b/dev-python/backports-shutil_get_terminal_size/metadata.xml
new file mode 100644
index 000000000000..beb1cd168727
--- /dev/null
+++ b/dev-python/backports-shutil_get_terminal_size/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+  </maintainer>
+	<upstream>
+		<remote-id type="pypi">backports.shutil_get_terminal_size</remote-id>
+		<remote-id type="github">chrippa/backports.shutil_get_terminal_size</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/backports-shutil_which/Manifest b/dev-python/backports-shutil_which/Manifest
new file mode 100644
index 000000000000..6d740fa60301
--- /dev/null
+++ b/dev-python/backports-shutil_which/Manifest
@@ -0,0 +1,3 @@
+DIST backports.shutil_which-3.5.1.tar.gz 3020 SHA256 dd439a7b02433e47968c25a45a76704201c4ef2167deb49830281c379b1a4a9b SHA512 066096f6cde0d245f2a8ff27b8e99bcec7088a2c9667c6b3dc73dd8866ea98acfb32c63222e8349eb906460b8ade864b18cf88a627070e20e28d5c00aded3ae4 WHIRLPOOL d5d57ecc6a5d37027079576d6dd1fe405eaba60e07fb7ba83852f23379de398ce8e5fc4c458e4a63860cae8c1e63b19c56fab4817efe7cdee2e256bffe0084ed
+EBUILD backports-shutil_which-3.5.1.ebuild 811 SHA256 492db18cab35db48b0d15ed85848a8a8146a033b84351c41c8b7ae24ebe9192b SHA512 b74c9729339b4782d91e88d4f23996803b11859f85aabbbb560d079312be49f7b8567f5692ef7c7c7413496a5ad301c05689aa027586466e062c2ce2c6f31f16 WHIRLPOOL 7826dabbc9af42b3435637c7534585140fc545d1c3f9babfc3ac5b2582a5715ca071ccede1be8a4d75b6672c11d8f5ffea2275bddbb9c9031faea13aa1181cc9
+MISC metadata.xml 393 SHA256 42cf8adf7e617eb1b4b361caaa08ea97dbadb9b053d77ceddee4d5e6f1841b10 SHA512 4f7226cd237eba03096ef2e45113c0d38a65c66fe45f81c2aa0063c590b9c5a426bc9291b436fa9d21d658fc6ab854116968825c4f5431c9dd954ba8b5090079 WHIRLPOOL 99d9f9175ecedd09698f8f7b2c626f02c16657cdcfd4dd094dfc10057e10a5782b4dac51f3bc232e45443415e28d6aae567915965f75c9feebc340b7cfd4488a
diff --git a/dev-python/backports-shutil_which/backports-shutil_which-3.5.1.ebuild b/dev-python/backports-shutil_which/backports-shutil_which-3.5.1.ebuild
new file mode 100644
index 000000000000..0cd9c8c8822a
--- /dev/null
+++ b/dev-python/backports-shutil_which/backports-shutil_which-3.5.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="backports.shutil_which"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Backport of shutil.which from Python 3.3"
+HOMEPAGE="https://pypi.python.org/pypi/backports.shutil_which/ https://github.com/minrk/backports.shutil_which"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_install() {
+	distutils-r1_python_install
+
+	# main namespace provided by dev-python/backports
+	rm "${D}$(python_get_sitedir)"/backports/__init__.py* || die
+}
diff --git a/dev-python/backports-shutil_which/metadata.xml b/dev-python/backports-shutil_which/metadata.xml
new file mode 100644
index 000000000000..bb2287b53848
--- /dev/null
+++ b/dev-python/backports-shutil_which/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">backports.shutil_which</remote-id>
+		<remote-id type="github">minrk/backports.shutil_which</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/backports-ssl-match-hostname/Manifest b/dev-python/backports-ssl-match-hostname/Manifest
new file mode 100644
index 000000000000..7f1e02bc87d0
--- /dev/null
+++ b/dev-python/backports-ssl-match-hostname/Manifest
@@ -0,0 +1,5 @@
+DIST backports.ssl_match_hostname-3.5.0.1.tar.gz 5605 SHA256 502ad98707319f4a51fa2ca1c677bd659008d27ded9f6380c79e8932e38dcdf2 SHA512 414c2b6f302a4655c3db3ef09e1dca4916ae4e8c4aa69e43c63bbb920303ea4b2618150c2c35d8a2e1e1283b1d65ccd10a350888fd771addda533c19c20b7e82 WHIRLPOOL 9bcdd09f1e37fc4c76613ffc08ac76d4721900591a58ba81bcd9acc4f64e8243d1da6f798e0d096cb92cbe1b877f372ac261e6f73d9139e717640da6b862c974
+EBUILD backports-ssl-match-hostname-3.5.0.1-r1.ebuild 1060 SHA256 8c692e3ca0aad2aab415037396b724f6037e33c71fa657b10c163091bfa96e33 SHA512 03903ab848784a2db0664e73231ba4396dd482eca73c6b2e90c0313a5a7c1a6264ee73a0c7ffd045a47b053e2b20338cf685c3656f227ecf90e7f68c4764e11c WHIRLPOOL 8377a6d81427f5e7a47262bdf7e89a56841e22956c2141774818d9dd1b35365493e9ae0f90091dcd1fcd8708767834274792c3de3e2b3ff426122a1493c98761
+MISC ChangeLog 5638 SHA256 8ceeb8906033390da7e2631ac767e72214476c04a68ebc1d9fb662062288c8b1 SHA512 7a2d142612339def95108d7f6cb6d00d4a71ebaec8ab539f2bb0fc13a9c1e8012a1d188444d8f79bdbbc1f56c5db681f9eacdac505ee9dc9febf5c166d4175d0 WHIRLPOOL 1452826e7f5a6a4404faf520a492710b5bfe9b18d686068ca58f9295eb0b2760d76442b51f7b720098f771699a10422c789b1d2b7e294425315b330bd3930cba
+MISC ChangeLog-2015 2163 SHA256 11ff5d658bf9869733942edde9481de7a147653b4995a35b643cce5e5f31e700 SHA512 bf47415fa2d1bdff537398c2e55d2b66ab2183fbd2fc38978b1a87abaca957bf92bf7ce7815a06df34e9ec128d061a520268e949af4280de00ad78d864fb350d WHIRLPOOL 21bc739d2e9206ad102ff5faf986184e379b61eaa49a7598104ed6d5725c2d6b7d7995b01e5ddddc0dd3c457da677267c6472ac199d1855d9540715363b92c73
+MISC metadata.xml 331 SHA256 d3cf8ada89ec0c7201ee7b4cb7afc5f00a6363e1745770bfa705cd9c13230556 SHA512 e536e9be47c0b879e669145ca18650e86ac94375d9c9451e7b54cc9e9b8aa1f854611f5e427c13970e6735cb59bea7515a0f7bbcd6c5dbfafbe72d02d64101df WHIRLPOOL a99e922856582ad77cb52c3a7eae0c98defc4fdd06d29274cf5993a043c21cdf8fa047bde7d331b77496dcf556f05b71a8f1a0a705fe035da28e8075a84cbc7a
diff --git a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
new file mode 100644
index 000000000000..fbc3b731ea54
--- /dev/null
+++ b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+# This is a backport from python3.5+
+# Do not add python3.5 or later support here, there's no need for it.
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_PN=${MY_PN//-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Backport of the ssl.match_hostname function"
+HOMEPAGE="https://pypi.python.org/pypi/backports.ssl_match_hostname/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="PYTHON"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_install_all() {
+	local DOCS=( backports/ssl_match_hostname/README.txt )
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	# main namespace provided by dev-python/backports
+	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/backports-ssl-match-hostname/metadata.xml b/dev-python/backports-ssl-match-hostname/metadata.xml
new file mode 100644
index 000000000000..3a0e0db9e926
--- /dev/null
+++ b/dev-python/backports-ssl-match-hostname/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">backports.ssl_match_hostname</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/backports-unittest-mock/Manifest b/dev-python/backports-unittest-mock/Manifest
new file mode 100644
index 000000000000..9b8e9aa2c1d7
--- /dev/null
+++ b/dev-python/backports-unittest-mock/Manifest
@@ -0,0 +1,7 @@
+DIST backports.unittest_mock-1.2.1.tar.gz 4580 SHA256 3a333a7a7641e4c7657c6086d117f88c61c96249b80dd7aa66eba0806a55a393 SHA512 36218fe1117d62cc1aeea576c6220be7b8dd76b800776001756d157528ff7760791c513751a221ba84790c5b60b8ce62ab2ef17f4d359dd026211dc9c5cbcd5e WHIRLPOOL 1ef33a0537331a2564498e7240bb27c0128fa42ed94f76ec6876e83ea0a0ee27e7b425f44a642b4fe9609d4dcf086bd099ba8666aeaeed589d56d1cd263ed1f5
+DIST backports.unittest_mock-1.3.tar.gz 4687 SHA256 c6d964d75112051576daa60746cc6a66afcdc43f13ea2bda175ca8e278e9b375 SHA512 71741db5c2e43beac8c72dbffa0efd4bbae140177f56c3b2bca3e13a3aebd8a418b5ad7654421899980f73b8dbfb3b02d85d2dfcd7b3827047fa6ba84a8dcfff WHIRLPOOL bd20ee64f45d84274e1ab51aa3df50c66068517f4cd144bea381648433ba62d2fb91b4def06d06403e9d2435980c08d2ca6ddd37270c45ace735401085470f8f
+EBUILD backports-unittest-mock-1.2.1-r1.ebuild 1327 SHA256 8e10311c4b0a5990b4151eb5674a8ce2d3b168a78691d291bd1d5ce678a093f5 SHA512 c97899d949bdff414b6c714989cbc673a1e4639003033dda61c85555deb8ca90446230a714cbfaaa87130b702c4b5becde1e9f8b36100657c5d38d9f89646876 WHIRLPOOL 781f694ab275563ec327cc6bd0e85245f54d32dbd9d9609bfb7aef871ceb229f12657012323cffcb46167a8fc305b743e90d471bfe0367862f53f26e02961353
+EBUILD backports-unittest-mock-1.2.1.ebuild 1227 SHA256 2798481d8fdb915abc821bee5fa7ac83165add650ffa5ad3c3482ae668ad3035 SHA512 682fd1d5f7ea37c91328657dd06b89e72d88fc6109b7da3b05f4c08d115389e81e67a8e988cbc7e81258d771159cc4134d44d18234c4f6d756fe09dc8a37e122 WHIRLPOOL 75348772746ba12001c0bb950009b1b17fc22dcef92bf9234b53a87f2c9ced5bb84ac7b1598a04350e5ab89c28d54aebbbdea26acf70718a6647985c5d4fdd26
+EBUILD backports-unittest-mock-1.3.ebuild 1420 SHA256 f0bfb5a933f7064572b6ea5b090dbd878e89d485c556735a5b6d27868c27df86 SHA512 e760e1c0695d24eba9939890e9d951a72ffadbe936a6544686a79984fed83c202d90e2d06688c8b7675cc106f912e47a2fdbd5611073a288997c07a442f1ea23 WHIRLPOOL aa867621eba849fd569c7ff38d05b3b1f2040183127502efd43ce6fb2ca4b88ab8ffb693a22d3c4d5e29542ac8d9e7aaae65fce2c1f86e578cfc20b017e7d563
+MISC ChangeLog 1143 SHA256 b66c0df9b12e6b04f003655a9553a17656ce7a2bf97221cc878d8bd67fd526fb SHA512 24e4e9f6d42a0af9bb1164871357004b552a3f438094bb07de1a101e4c7d84457fd28f52904969f0d3055ec8fbdcd251fdfb2be7635370ba8aaeaa603879816e WHIRLPOOL 6e7131a3e47124947176c09da42a9154ff7079ec45e53116bb127d8ab822b8b769a68c9401b123fb283aa9d3b96b214a0bd0748a578381ea7ac7c45649c70157
+MISC metadata.xml 858 SHA256 2281f088ef4b4a4f06f4c5e77aaa0d640cd810a329e89f190d43cf4d792b6066 SHA512 076bb148f419c52a09fa1a89cebd65c0e581828a261da7e62eeab3c30a4e8db4db95af4ee6a5fb1e117a1815ec2e7b4bace522879d9e2773e37ba8b10b247eff WHIRLPOOL dc152d16cf57dca1c705eb6b330775245298e0d84438cd39b84abccc0a6f56f5c73d6c0576cfaf345c1ed47d0caa2ca6223e708276650bd853d74deed9492b3e
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.2.1-r1.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..2918bb734376
--- /dev/null
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.2.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# It is the developer's intention that backports.unittest_mock will be
+# used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+MY_PN="${MY_PN//-/_}"
+DESCRIPTION="Backport of unittest.mock"
+HOMEPAGE="https://github.com/jaraco/backports.unittest_mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/backports[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build . _build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	py.test -v || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.2.1.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.2.1.ebuild
new file mode 100644
index 000000000000..b672aade0145
--- /dev/null
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.2.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# It is the developer's intention that backports.unittest_mock will be
+# used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+MY_PN="${MY_PN//-/_}"
+DESCRIPTION="Backport of unittest.mock"
+HOMEPAGE="https://github.com/jaraco/backports.unittest_mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/mock[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build . _build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	py.test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
new file mode 100644
index 000000000000..f8fd45a134d6
--- /dev/null
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# It is the developer's intention that backports.unittest_mock will be
+# used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+MY_PN="${MY_PN//-/_}"
+DESCRIPTION="Backport of unittest.mock"
+HOMEPAGE="https://github.com/jaraco/backports.unittest_mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/backports[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/jaraco-packaging[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build . _build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	py.test -v || die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	# avoid a collision with dev-python/backports
+	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/backports-unittest-mock/metadata.xml b/dev-python/backports-unittest-mock/metadata.xml
new file mode 100644
index 000000000000..990ba3292766
--- /dev/null
+++ b/dev-python/backports-unittest-mock/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">backports.unittest_mock</remote-id>
+		<remote-id type="github">jaraco/backports.unittest_mock</remote-id>
+		<bugs-to>https://github.com/jaraco/backports.unittest_mock/issues</bugs-to>
+		<changelog>https://github.com/jaraco/backports.unittest_mock/blob/master/CHANGES.rst</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/backports/Manifest b/dev-python/backports/Manifest
new file mode 100644
index 000000000000..80ffbdf8e15c
--- /dev/null
+++ b/dev-python/backports/Manifest
@@ -0,0 +1,5 @@
+DIST backports-1.0.tar.gz 2070 SHA256 ee43d5b7bf4e79e04fbab30a09421cb5cbf4f56e7c14769393a7d1c34ea5e740 SHA512 069e155209d6036dec09000e4543abea9383f13b229a7259b1d3d02fff4b51be1a32c766dee434215c8a5209afc5e7d24163d188a77cec7d354d34170665bd37 WHIRLPOOL 105962b9fd92a4ae9cf6b9c54a2306b92460971efa0bec7885167c9197fa286be01f077e0ed35f56f6c341223a42f4e2ab217f745283ae1a0ffb70544e1a5d50
+EBUILD backports-1.0.ebuild 566 SHA256 f25d096120300df23f4edbd4a9cccf0bfe1939b0308e8abaf245f620b33a0bc4 SHA512 09f54c9f2a7feeb2220a4d7487d9ec1e1baa10ff63bb6d4844be54f8fca0665e000fe4b02a47e3bee0aafdb20c4bbce4ef231265f9bf2daad8350b40a3d7fbb5 WHIRLPOOL 0a8dd8ef9ff7395ec16350503453aa368b21c6082e88b16e3b3c367b1af830d475325fc8af1e74ed96feb65a81e6272d2d159df5b5618b3e11f19faa952d35a4
+MISC ChangeLog 4021 SHA256 c2b228335d83c7208c43c092605fc2958c7d2f0ace829548e70f3668a0dc2629 SHA512 a1de9498f57d6d69fd2cc1565e37582f43a26729bf04784988b1c5d4b060e31356d0e00f4c2b07481ae05774c0ba3043cb1d04e7cb336bc250a4e6a54c9c39e8 WHIRLPOOL eb88dc1e02215d1f7a8c2546a4034d6f0bd0db511016f98bf8f1e75760f87bf4f2f07d2dbf7190978ad3649de46cda8e067f3d4a8a9b119ed6764917635bf717
+MISC ChangeLog-2015 1720 SHA256 f05a66180f1562ba8a0131591aeaaacee2e7d1f429e9c983a5238ddce0f6aa53 SHA512 3de605ba80fabf3623eaf87001105c235ad0fee92f81bb67d431076b749064bc9122261fae639099706fd4ab8eb3f3664e49d091c292acdb8f16eddfa4422aeb WHIRLPOOL a52ad2ff4299191ad6791404a888db296703db1de0cd5931300d2c7d4b943a360f4a5af9cf505d194ebb1f59df5f0d839255ae6c2f8453f90dcc6730a06ec4a4
+MISC metadata.xml 335 SHA256 8c297412d7ebdced16132c0d65dbc0c20a05fc11c69e5de64a7211ab213077bc SHA512 d0432bc56a1e591a0f699d61f2195872cb62e591027212cba00a127c89d9a2c29a54da495436233ad93c3868f98b184c73da9057be26ce9abada2516be518e30 WHIRLPOOL c2b40560afd76c189ae1d1d9e9392dec3333d41c0279bfccc47a40a0fbb84ddec00a145d72e8bf16f7278526b336dfef5056a572208e05b7c06a329481e429d8
diff --git a/dev-python/backports/backports-1.0.ebuild b/dev-python/backports/backports-1.0.ebuild
new file mode 100644
index 000000000000..5572d6a1e019
--- /dev/null
+++ b/dev-python/backports/backports-1.0.ebuild
@@ -0,0 +1,17 @@
+# 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="Namespace for backported Python features"
+HOMEPAGE="https://bitbucket.org/brandon/backports https://pypi.python.org/pypi/backports/"
+SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
+
+LICENSE="PYTHON"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="!<dev-python/backports-lzma-0.0.2-r1"
diff --git a/dev-python/backports/metadata.xml b/dev-python/backports/metadata.xml
new file mode 100644
index 000000000000..a138879cbf49
--- /dev/null
+++ b/dev-python/backports/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="bitbucket">brandon/backports</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
new file mode 100644
index 000000000000..ac66fc1e3019
--- /dev/null
+++ b/dev-python/bandit/Manifest
@@ -0,0 +1,15 @@
+DIST bandit-0.13.2.tar.gz 68888 SHA256 ef78c4dda20f758f95aca467fbb6609a696b6df13104d324b329b1bca963e30d SHA512 0809b7bca2f88e579760c7dcd3fedd1bdd394930eb0cd203ec24d75a18cc8007fa0db304a378f2d99d9cfd5e8b1f34a4ebe427a4bcb5daadf3d29acf0a26da42 WHIRLPOOL c91c140a79816d55f46b4b81e8554e2e36ff47b217da0258cc8ca220b59fd1b0622bd938956280ee111ee994cee81a442da3148fc1be9f0ff8c7d1ea2cdc305d
+DIST bandit-1.0.1.tar.gz 130662 SHA256 3d3a88bf82375cd18ab889c2bf86dcf840798c74a1a6b8d3015071d9ebf2dcd7 SHA512 47e82de934d1f7b28d4d9acbc33b7cd704bab9332b1ef5815e8f6f8b6c99763b758716782ae0a6b0a7db393e0ec6d619c9c3c70e2e645f23dff28b0de04250d2 WHIRLPOOL f0df1e05bce8c6ee0909ceae6bba0c5f7591a229f99c7c38a726460fb363720a28d87fc47aaa197d00b84c01b3b570a61da82c1902f4b4611b332e2b6d0fb9ad
+DIST bandit-1.1.0.tar.gz 135333 SHA256 b5a011ab77bb9d9f7aca349732db7b9789ebe86a57a9cb49314abcb41161a15e SHA512 0344be4c98b4f1df056761f7735fa0b23dc234c64ca0090d3e665899905eaac9d49750a7ebe6f7f9e4c39d07f3c2cb0d653cc65c0e56dfadac0caeac5799af94 WHIRLPOOL 3df6eb26693d2d0b40ebbcb6774e2a0bba2cda8fad62952467a3b18b1cf538758fefeb2b2281c0c3c5d5de5674ab177ed38263c50451c250502b740df8f1545b
+DIST bandit-1.2.0.tar.gz 138040 SHA256 cb2265e740ab2290f8621dc9d6cd0ef22b53c85f986ef6285b1867338192da87 SHA512 f2119bb7b920ca7b4254fed433ee0e41bbbde51a45cd88283fac1a9ac8f60ce621fffecca676bdb8db7ea5cb925851e50176014405425c30b5991e17f57f294a WHIRLPOOL fceed98c132887b0d85e7c926a5e71dc92b43ec75401cbb12127cb6c42111a5506ba800130b2a1bfd0f0340ca7b15045842c566d0f02bfa44a65f9c8510d65c8
+DIST bandit-1.3.0.tar.gz 139075 SHA256 5e2df346b8036b413046f6163a877ba6de9d71407d6b08fe446924d55874b60f SHA512 24341cc837fa6a8bb095c7fdc684a81b3c06834b408c6328c6b3425d5cc5c63dcb119cadf54c8cea302a108923638839626f1f8c6d401ce66cd112a776a8363f WHIRLPOOL 3301f6a9a369e351968e0652eeba6da4307beb3a995f0696040176a7cef759e83a7a89f2d023860a0522957b54a7ca2edb82fb8443d8e20c04af959830b52bb7
+DIST bandit-1.4.0.tar.gz 138019 SHA256 cb977045497f83ec3a02616973ab845c829cdab8144ce2e757fe031104a9abd4 SHA512 e5ae412e3b13c89f8c4a85d318b0504c2d5b9aa4ca81652266a13d96f859705c2d0112dc534373cd7fd1020790369e3fe6b55da57773fa7821e663c37fe98817 WHIRLPOOL e96d8dbe427309b6415927714863af05080b17224fdd4e5e0dbf1ba72c7b801617292b5044ee223fa4950422f08c0d278941a3fe8acb3ffcc86ba6298e7bef93
+EBUILD bandit-0.13.2-r1.ebuild 1559 SHA256 e92354d3bf2bba72e5ed3b5366bf8b85797c107866680240496d2afd85b489b9 SHA512 bfba294b2669ca2f5681a2f74100139ea0ae1536332324c77d4deb05aada511f6a7569961ffeae2951ded0d2f9163b2dc1e0e5de27b1d54491fcf4a1d68693eb WHIRLPOOL fc6a39406069ba43c4bf4865c71a2659a27486b4c3cfed50ce905df67a95a55ce0d8b58dca963b9c9b23b76ade29194de5aba69cc03b542b94302a9c9f18d2dc
+EBUILD bandit-1.0.1.ebuild 1536 SHA256 15a26b983477d14432eac586e930e21ff778ff3e2f9478ea265805324434c888 SHA512 e17ba0bba48d0cc3a50173d921d6ca3f8cf87e5d9fe9c30f626f8fa27f7a4a8c42454399791b9a9239a3bb1a5857c7cf8ec932aac1f8a98a013ce8c870485973 WHIRLPOOL 5d3d84f674b08746f153ddb6c02ece88e8222c0ba85df29dca67262b5ecadea2d85c7194ee9bc374c2f2cf7001e2a489a5fe3b3825316a8795b19bef0880c7d8
+EBUILD bandit-1.1.0.ebuild 1583 SHA256 6a696aea185b9bcf6090bb9124b4e8c6dbba5cd4303765731c3f3d10f479c18f SHA512 db641a424ea1731abc76abcf6b57a2446b10b5bd1c5605f6dcae44ed8f015a3831a6e7286b56527243799ec5b037b27f3539449d97fa2d2335dd0a3b77bd166b WHIRLPOOL ff6de48acdfcf473b74ddd6cc55e79d4609649143f035c4c269cfa2071bdf77989fa97e7074b59665a9143801fe12f6f518a5c0ba50cc9d2b3f2b1e90c92c9c7
+EBUILD bandit-1.2.0.ebuild 1489 SHA256 0fb5f3c434a7cecff6ff4cfba243fb212dba9e9974edc61e0a7ed1361c6a495c SHA512 a2c5de842d3cbda61c043750f404f906c6dbfc72d569bbec56ad689d9423cff6cc90e157e5deb6590481ecc26bbb8ea20034a685fd54355f64d0cd3c910ac4c3 WHIRLPOOL 3847d45bb5ef8ade21a60483577d2fb8c1cad3e675c1adfaf2950c1fa29001aac77c3d9a76d1f94b970e5bc0e1893d56d9f78e1aea28ed0b57c9bf27354c2647
+EBUILD bandit-1.3.0.ebuild 1535 SHA256 1d037061bc41a810ffd02866e2bedbc7163038e81e5af6684252ce33969ee476 SHA512 989ad9434bd25a0b885afe08a4df0cbb9ba9ef4b54b14d4ce19709866f1a1cda7451295a02fb9b5214eea4d9f0656b07b1394307b7487a0827623a0f8774eeb3 WHIRLPOOL 8cb2740e8fe62c37ae13ff2faa11f132c4ffb6283767dd666286c2856223fb2260998c30e1cff8fa9ac20ebf03834937bebbc58232a52baa45d29b7afaedc834
+EBUILD bandit-1.4.0.ebuild 1539 SHA256 1c3fae6af776f97198e9c2d719465959d678dafc720a84f315b486b97c094163 SHA512 5690281069a2f1a74f8d675782bee0c13b37bd3a8d9b9c7230490c01b1d6f598d050c850247d5a34ddd4c531b1e48747ca0a7fc4798f1d773ef404e66e411ef4 WHIRLPOOL befbf944769b295b4f5e3a6f12414c2c7dda910a72f18d805eb084a661b26afc02c7c80fa833bd01e5c6682f3cf34ce169b7dd6dfaede735aae17985c7e2cb8b
+MISC ChangeLog 6289 SHA256 a6ba4d1210f36a147395601a746fb45df083e1e77baddf2add459b9e3ca5f83d SHA512 fd8a5bc77af0c8b60c378e1becdc7022f3b22a0bf9ba20c1f603d54f405533d7a5d1b44250f74c6bc87238c8bdebc100b9206ef0e09cd21f7ca2b53d86ae5fd7 WHIRLPOOL 06d82091eb0c8afd79ff29538788273375ddddaaeaae050a7689acba2ea561c9cd5fe01a3a414d35c2888d3fc503b3f4ba98dcccf90a6b4aec5265466c66f9c4
+MISC ChangeLog-2015 500 SHA256 944de843c681563e48c1d83994b1c137fe5a6382e21171148d15fa1c536bc486 SHA512 43381b6ad9bcd72a603a328674c86d4d803a536182c787fc0d44cebc2be8678730c8c1d3c604fa8b545635947bda45a515777dc86a0626931c0c7a441f5e8af4 WHIRLPOOL b4e5c93ea01bfe9f58bbaaf598e75b7534496a64c0388565c3274ef3351cedbe8543e6d50d0de6fd12a9c3b344e0047ce808f57338649db6efe01d36de924736
+MISC metadata.xml 437 SHA256 b68d2f79c21bf3148612c6eb09f797feb41cbcaf550ece330a386482381d2b8f SHA512 3e34e842afdbdf7c90b6a9ed8f11d4b4955c03f7f3b3a9cde02b2fa33bcba39a00556e62c5c29b721e3d25d33de8396b5dd9737037f9000b1fc3e707ab9fd9bd WHIRLPOOL 6b501af6bd5cf127608807ae88a37367bed07fccf84a1b1258d640679d39292cca37da106b8579a63603744e7beb9fdda6ff17c32308895f9df946f84ffe4be7
diff --git a/dev-python/bandit/bandit-0.13.2-r1.ebuild b/dev-python/bandit/bandit-0.13.2-r1.ebuild
new file mode 100644
index 000000000000..b09000a31928
--- /dev/null
+++ b/dev-python/bandit/bandit-0.13.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A security linter from OpenStack Security"
+HOMEPAGE="https://openstack.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]"
+
+python_test() {
+	testr init
+	testr run || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${D}/usr/etc" "${D}/"
+}
diff --git a/dev-python/bandit/bandit-1.0.1.ebuild b/dev-python/bandit/bandit-1.0.1.ebuild
new file mode 100644
index 000000000000..0df3671bac00
--- /dev/null
+++ b/dev-python/bandit/bandit-1.0.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A security linter from OpenStack Security"
+HOMEPAGE="https://openstack.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/git-python-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]"
+
+python_test() {
+	testr init
+	testr run || die
+}
diff --git a/dev-python/bandit/bandit-1.1.0.ebuild b/dev-python/bandit/bandit-1.1.0.ebuild
new file mode 100644
index 000000000000..a6bc900087fb
--- /dev/null
+++ b/dev-python/bandit/bandit-1.1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A security linter from OpenStack Security"
+HOMEPAGE="https://openstack.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/git-python-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]"
+
+python_test() {
+	testr init
+	testr run || die
+}
diff --git a/dev-python/bandit/bandit-1.2.0.ebuild b/dev-python/bandit/bandit-1.2.0.ebuild
new file mode 100644
index 000000000000..8ea1e3acd19e
--- /dev/null
+++ b/dev-python/bandit/bandit-1.2.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A security linter from OpenStack Security"
+HOMEPAGE="https://openstack.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/git-python-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]"
+
+python_test() {
+	testr init
+	testr run || die
+}
diff --git a/dev-python/bandit/bandit-1.3.0.ebuild b/dev-python/bandit/bandit-1.3.0.ebuild
new file mode 100644
index 000000000000..00fc491f4f6a
--- /dev/null
+++ b/dev-python/bandit/bandit-1.3.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A security linter from OpenStack Security"
+HOMEPAGE="https://openstack.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-1.4.5[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/git-python-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]"
+
+python_test() {
+	testr init
+	testr run || die
+}
diff --git a/dev-python/bandit/bandit-1.4.0.ebuild b/dev-python/bandit/bandit-1.4.0.ebuild
new file mode 100644
index 000000000000..e21a23deb921
--- /dev/null
+++ b/dev-python/bandit/bandit-1.4.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A security linter from OpenStack Security"
+HOMEPAGE="https://openstack.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-1.4.5[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/git-python-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]"
+
+python_test() {
+	testr init
+	testr run || die
+}
diff --git a/dev-python/bandit/metadata.xml b/dev-python/bandit/metadata.xml
new file mode 100644
index 000000000000..8ee1f52b6c10
--- /dev/null
+++ b/dev-python/bandit/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		A tool designed to find common security issues in Python code.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">bandit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/basemap/Manifest b/dev-python/basemap/Manifest
new file mode 100644
index 000000000000..09e6b951d1f4
--- /dev/null
+++ b/dev-python/basemap/Manifest
@@ -0,0 +1,5 @@
+DIST basemap-1.0.7.tar.gz 129694711 SHA256 e07ec2e0d63b24c9aed25a09fe8aff2598f82a85da8db74190bac81cbf104531 SHA512 dc8ef8f02127813c9460c6a9c22c593616bbe8ff39f6507abb786d344c710b296bf4f21759b5c1e6fc8ccf3f478d8fb6f546429528575d13f732c4233aaf9c20 WHIRLPOOL 7da55c32cdcea897e71367ec7d2b916a66973a7a761b001c0be5a9a5d97347a51c51e57828fb46f8c70b3a6576c562377657d129dc6fb54333e76897aaf76f6e
+EBUILD basemap-1.0.7-r1.ebuild 2111 SHA256 0877fcc35c5969e961a8e326794dd785d32345b99f3e76cad8eaa60a764f1855 SHA512 c0e07fea6e6270dfcd92aedf2a7c639788f564dae1a789c3b1860d7d202eb9bbc992d71b50f75f362065a887d0fa363ba4328f4f7936a37b6731a939c52f6f4a WHIRLPOOL fd7835debf03af20f64d5697f08b171f2f9e73c84595ab910033eb530123b64891ec6f8dd6244916c09d13afdc694d774860cecc3882101084d6536ab5a08368
+MISC ChangeLog 2581 SHA256 c9a14afdfedbdeeb794e7c685fbc84bd87b90cc4468fb3dba54aa07eb8ae9c71 SHA512 21163be2e7124ad13903488eec6bc9e5b8c26b1d70c4d2a28e58ffd23f9404917083d8bc6cea246bb6104588dc2911421a19cda21e238241326dfdc21f40dc32 WHIRLPOOL ede26d165bce449849d5bcc830ea613389ab4693d941f41582895c5201d07599435516d8eabf60af97892bfef2145dd42e0bdda2f7d0fa809827efe3680311dc
+MISC ChangeLog-2015 6501 SHA256 c8a24557aec40952be6450fa3397ab5e0c018f2553030dc24365a9b6dc8dda49 SHA512 e999dcf63f167214a477792ca67d23082698e9d4cf877a1b9424a89dfa51be28eec8ea505c93b22616fe6aad1be56adb124dcd2bd0f3b202056cccc21f2d1a3d WHIRLPOOL 8f6c52b999f05a90aa3c4ac8f67362759c37deee1761f04af72c2823babb65d97e8e9cd1502ca0e155b449d6b266d9289a3270e0ba06763b9a98c33cb8991d80
+MISC metadata.xml 612 SHA256 25cf307de12e430b3a9192df2989e7de314a87864c8b7eadba0134874fb57bcb SHA512 c4aca7fba6e4b7c746b775b00629ff3388b6bfbe7a1045fc85f25649444afd945fc97ad2085d8119458e69e23cb73beeb4e04e85e25d9debc8c2f93573f0e0ca WHIRLPOOL f5051c47d830166ea4ef32bfded7d121bc32306abf511e3bc11101a8fd37702c8af6232c4823db36257f131cc287505cc44f294a0598d0269181e03acfb24cbe
diff --git a/dev-python/basemap/basemap-1.0.7-r1.ebuild b/dev-python/basemap/basemap-1.0.7-r1.ebuild
new file mode 100644
index 000000000000..4c9f746eb7c3
--- /dev/null
+++ b/dev-python/basemap/basemap-1.0.7-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="matplotlib toolkit to plot map projections"
+HOMEPAGE="http://matplotlib.org/basemap/ https://pypi.python.org/pypi/basemap"
+SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
+
+IUSE="examples test"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+LICENSE="MIT GPL-2"
+
+CDEPEND="sci-libs/shapelib
+	>=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]
+	>=sci-libs/geos-3.3.1[python,${PYTHON_USEDEP}]"
+
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="${CDEPEND}
+	>=dev-python/pupynere-1.0.8[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/dap[${PYTHON_USEDEP}]"
+
+DOCS="FAQ API_CHANGES"
+#REQUIRED_USE="test? ( examples )"
+# The test phase ought never have been onvoked according to the above.
+# The test phase appears to require the package to fist be emerged, which ...
+# Until the distutils_install_for_testing func refrains from failing with
+# mkdir: cannot create directory ‘/test’: Permission denied
+# reluctantly this phase is assigned
+RESTRICT="test"
+
+src_prepare() {
+	sed -i \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		setup.py || die
+	# use /usr/share/data
+	sed -i \
+		-e "/_datadir.*=.*join/s|\(.*datadir.*=\).*|\1'${EROOT}usr/share/${PN}'|g" \
+		"${S}"/lib/mpl_toolkits/basemap/*.py || die
+	distutils-r1_src_prepare
+	append-flags -fno-strict-aliasing
+}
+
+#src_test() {
+#	distutils_install_for_testing
+#}
+
+python_install() {
+	distutils-r1_python_install
+	#  --install-data="${EPREFIX}/usr/share/${PN}" on testing is found not to work;
+	# setup.py is a mess. Someone care to patch setup.py please proceed; substitute with
+	insinto usr/share/basemap/
+	doins  lib/mpl_toolkits/basemap/data/*
+
+	# clean up collision with matplotlib
+	rm -f "${D}$(python_get_sitedir)/mpl_toolkits/__init__.py"
+	# respect FHS
+	rm -fr "${D}$(python_get_sitedir)/mpl_toolkits/basemap/data"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/basemap/metadata.xml b/dev-python/basemap/metadata.xml
new file mode 100644
index 000000000000..003ba68e1467
--- /dev/null
+++ b/dev-python/basemap/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
+	<longdescription>
+  basemap is a matplotlib toolkit. It allows to plot data on map
+  projections (with continental and political boundaries).
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">matplotlib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/bashate/Manifest b/dev-python/bashate/Manifest
new file mode 100644
index 000000000000..6e4bf130596d
--- /dev/null
+++ b/dev-python/bashate/Manifest
@@ -0,0 +1,5 @@
+DIST bashate-0.3.1.tar.gz 16016 SHA256 2398140c35fcb03249640708aa7de652f9cbe680ad6cb09074a89255f6a30419 SHA512 dfa3e8f98879169cef445cc9a788b4ed051630330e2270c721e472f080899d6742cd3deb571049ba6b943ada0fc77a70f5a7e4742a54d1ca6d5f075a92a00ffb WHIRLPOOL d35e19ee324aa419e855ab4093b3b57f0420a5d9fcc15ff64c32935865e8680b21278f529f87ec0338807d7e903af5918f78a0c780ca7a89f672c0cc87b884bc
+EBUILD bashate-0.3.1.ebuild 699 SHA256 7f383ba1b0f2e95ef5512d9b53d812b4288ef49b6f548b3fca6f0e54e31ac835 SHA512 3c92e60685dd73a84a74376517f347da035e643f46bbf5df854604357da46d4e48ac1fda12e0c9e2f61e65da78ac6a4f957dd79130f1b747fd7e6a1841956a7f WHIRLPOOL 79f8286df6e76a0d6c08caa0c0732e23235903c7381796a15dcd893f298105ecc3415e097617166c25bc311dd1f7571a7b5f8734566188946961abb5395e02c9
+MISC ChangeLog 2706 SHA256 c98222c0e30342eb91eef098776ea745990597ad90441b9a7bb772452a38d7b4 SHA512 481bb7978b6dedba2a9fe86cfacf327cd939d477743a02011d1e4684d4a1c0b27a36c07c234e8e819beaa716d42bf61b9987d08f977fa369a768de1012744c7b WHIRLPOOL a08453a58f0776a4056475a5513db26fbb47878e24375ad2a32ead69f733bfae0e55357b9cc85c83f1c2bc2f661e5aa634257ce5b1546996d2bbd7bf6d8c0f8c
+MISC ChangeLog-2015 777 SHA256 8a6cb85c69e90db334439494caea4abaa3c64dbe7d2a63514999c80864d165cd SHA512 30102306190c0896a3149b0818a2629b18f1cf22f47083949417c5cbb214abdeba148c054712e1bf9abe4535d44afa7d92910aa4b185893836988a01af97f52d WHIRLPOOL 538c2ebca1649b7df773808003c024c94e2782d5e41333ab62058b663231728440830aae7014cad1e817b62b61265834c50c4ef4b2c244463dc43ac41cc41230
+MISC metadata.xml 533 SHA256 d387920625999db992a84d58e8111996e3ab2d8eff147a8eda9d82e9df4d4613 SHA512 91d42adc7c811753968709bc4b4c0d613ec4ae7bf0925418474b46a35cc075a917330f6e09b603f23040f4e4662766f098ff72829bf71e0e335090f6d5f0b382 WHIRLPOOL 1eff4c5759a3ede9d6bd23ffe13cc8316b46b853ee7cb7a16b41b736b96320fcc64c9beafbcbdfa508e615f33a94ff66e157700ab65b1eae7807cd04f7ce1f3a
diff --git a/dev-python/bashate/bashate-0.3.1.ebuild b/dev-python/bashate/bashate-0.3.1.ebuild
new file mode 100644
index 000000000000..e49ef7048d41
--- /dev/null
+++ b/dev-python/bashate/bashate-0.3.1.ebuild
@@ -0,0 +1,33 @@
+# 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} )
+DISTUTILS_IN_SOURCE_BUILD=TRUE
+
+# time
+RESTRICT="test"
+
+inherit distutils-r1
+
+DESCRIPTION="A pep8 equivalent for bash scripts"
+HOMEPAGE="https://pypi.python.org/pypi/bashate"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/bashate/metadata.xml b/dev-python/bashate/metadata.xml
new file mode 100644
index 000000000000..4872e1f5ad8f
--- /dev/null
+++ b/dev-python/bashate/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+	A pep8 equivalent for bash scripts
+	</longdescription>
+  <upstream>
+    <remote-id type="pypi">bashate</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/basho-erlastic/Manifest b/dev-python/basho-erlastic/Manifest
new file mode 100644
index 000000000000..76b95a7adfe0
--- /dev/null
+++ b/dev-python/basho-erlastic/Manifest
@@ -0,0 +1,3 @@
+DIST basho-erlastic-2.1.1.tar.gz 9298 SHA256 d1596a881437f2be71a8426efed1566b7faefb97234cb21440700ecc8367c545 SHA512 bc8666b2e9ffba3e5c7105d1502423a1b0861047218ad18524ad77853137dea5f17c64d6cbb9cdbc6ac6e207b0a2f9a57d65e5c4cac67172654c5eb92ac7ae2e WHIRLPOOL be0c5bd6a4c5b6e553ec782937089e2f81a90b0192bbb92c9481c27a4b0b10ddf8527e7316ea31818ff416bb52e6c693767f2cb8ac9eb4591d81b4297c1bce3c
+EBUILD basho-erlastic-2.1.1.ebuild 562 SHA256 61f9cc106b717259905624705d6d94d53be5f5576ef411c13dbbe999e3485846 SHA512 fff65e76077d8188ab9336afb874ead05597c623f5d8192dce43227db973a674ae2cf4b8206345eaeb4c94ecbd7a1b666c03eb3a185bdd458749e96544881fc5 WHIRLPOOL 2bfb711e62669667da42beba18c50309903aa4d5160af32a8382f1ac072213a3a3266f09c10247bdb0780c09d2f457a62ba11b751e526d42515601cf1f0902e6
+MISC metadata.xml 356 SHA256 ac906e43c07e5167d404235f90a630b865b57adad61616234c87633876c5dfb6 SHA512 cbd8ab52f7ab3e2b9627d745405f21c19e9918cd765005628415626d0598e216ad53744988e343f2d03bbb71d92b3cd62c085ad4288393f016950c8dcda7f09a WHIRLPOOL ee68e0b3f0ab833a689c8429625f8a1511dbdabb6e477c5e05ba6d3aae2d369fa3ad4a792ff6b5e5d4bd064e00561a9d85d8a32e1c7daf1bcb5c9da1715d3978
diff --git a/dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild b/dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild
new file mode 100644
index 000000000000..1343d4db951a
--- /dev/null
+++ b/dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Erlang binary term codec and port interface."
+HOMEPAGE="https://github.com/basho/python-erlastic/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON:-python}" tests.py || die
+}
diff --git a/dev-python/basho-erlastic/metadata.xml b/dev-python/basho-erlastic/metadata.xml
new file mode 100644
index 000000000000..d1732d51c867
--- /dev/null
+++ b/dev-python/basho-erlastic/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">basho-erlastic</remote-id>
+		<remote-id type="github">basho/python-erlastic</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/batinfo/Manifest b/dev-python/batinfo/Manifest
new file mode 100644
index 000000000000..95e5be321cb2
--- /dev/null
+++ b/dev-python/batinfo/Manifest
@@ -0,0 +1,4 @@
+DIST batinfo-0.3.tar.gz 3951 SHA256 2991715439e7b48300eb539e2cf3faffe3c9d8a876197078c68616b97f9fdf3f SHA512 822e8e70f14a7f08713028ebc8b41aef6d9256984a6a381af11e5b36980a355636bc21d8b21753f4dabd20e38becf6152c623134a65109593ccba019afe3f3f3 WHIRLPOOL 85ce789aca7806ae07856b1e3a64afd07c2ab3a91627a7266ddfc1bde49068d62a1b970dd9dc329d6d696f923d3b019e83047329a0686ae8b26907b70d4b2883
+EBUILD batinfo-0.3.ebuild 544 SHA256 771e373020ef59714664c6c72a20b397f0c82f4064b9414d9a60da4bc1621e7b SHA512 7746bfd44cebba50eacf1f6187108b9373f09da7c633beaf1c4f42e97d136ef5feb04723834abd50336f31a9dab53f4218dada35b15ba47e7f36814d4533b309 WHIRLPOOL 0ab9b0e1af7dd079e0a8458a7db8ad65745591e0c74bedae04f20fd3d4cfed432a2401ec3440b4e17a103113dbda4692183bb8bf5537f69ff61c8a9b808dc5ff
+MISC ChangeLog 709 SHA256 02ffafbf3e7ffdd7ae85308700e79cd0fb920ac61f1f4d296a24dcf79db94413 SHA512 13194a1bcc596ec1023b6e208b53ddf420a28c3eb55ae8477d46fc2c3c0d37473c29ca1ac1bad3966e65a6bf3e8e5a30de65f789fc2534f78d1de1c28a43c8b4 WHIRLPOOL ccf2e7fa4a5672eac223d76c8393446d3c1a1fba34eb5ec7aaa62dd503421e04cd6a0e6aa6d391f2a649cec888701d8a3b682a3203af6415f32d649f65484392
+MISC metadata.xml 509 SHA256 d1069ecbccb3bbc9fbe306045c8bc13fc2d1de642c4dcb05727e3d9d3f2d23f9 SHA512 78a20df6c5c2ff4b32a8d54da4d1c5eb8fa5b4ea8149d3ab5a2fa999ec0b0134cb41d9255517e867ac47e3e4656e76eae926418ec572253c4d0f439d629cfbb8 WHIRLPOOL 11fb068ccca0d83fb1d0210882597d39424f74de9a03f40456e74d4db168c0e187cf415ce94a8fc0dce43422de52a172b0b08dec34005bc7f29cbf21e25d66e8
diff --git a/dev-python/batinfo/batinfo-0.3.ebuild b/dev-python/batinfo/batinfo-0.3.ebuild
new file mode 100644
index 000000000000..9e19ade20652
--- /dev/null
+++ b/dev-python/batinfo/batinfo-0.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple Python lib to retreive battery information"
+HOMEPAGE="https://github.com/nicolargo/batinfo http://pypi.python.org/pypi/batinfo"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/batinfo/metadata.xml b/dev-python/batinfo/metadata.xml
new file mode 100644
index 000000000000..9d04c280a072
--- /dev/null
+++ b/dev-python/batinfo/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">batinfo</remote-id>
+    <maintainer status="unknown">
+      <email>nicolas@nicolargo.com</email>
+      <name>Nicolas Hennion</name>
+    </maintainer>
+    <remote-id type="github">nicolargo/batinfo</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/bcolz/Manifest b/dev-python/bcolz/Manifest
new file mode 100644
index 000000000000..acbe4bdc2423
--- /dev/null
+++ b/dev-python/bcolz/Manifest
@@ -0,0 +1,7 @@
+DIST bcolz-1.1.0.tar.gz 914616 SHA256 1fe2e3da6321e6644fe310b5ecb6b3073fa9fb7a99ac666b97a4e64d084d6463 SHA512 77d3cb45658304036273ebe7ff006d3770d86745e8bd1dbdb07db0a2a1ffcd3268ceef2cbdec0579e8e65560706eb3ed43664c90078fe2811a497b4abe01e511 WHIRLPOOL d029dd8ef78e71c423440a30e09183a36adaa7e6eff88fb1c35cf8d63645a2641128e4d649006eaa2aebe5986470a7fd1910622ff4511f9ede56a38a1d6a5269
+DIST bcolz-1.1.2.tar.gz 1271418 SHA256 42b733692cfb194df867f19168da1a9e468145a50c557758ecec911c6e5a4073 SHA512 cc0149b5a8a0ded7653c4f1e2232fbf8501027538a3e5d8de4be0eed096e17e7d3845f19cb687a533a4c385b31f5a5262fe140a27ac63b434b57667ec5a55e66 WHIRLPOOL 6e53da135136a28ec6e074a57ae4b81de375a6f4964609d80c0125486cea186a15a2d024d6dc143d2452ca9673b445f10c5a8e57fb8c290fdb452d3c95cdad51
+EBUILD bcolz-1.1.0.ebuild 1401 SHA256 b61d26746a31cdfa9e354e37505ca54f274907a02d5314bf5dbb43ea9ad3892a SHA512 77fc5b1c56372ab79690793194d22d7bc8b86bd2b9fdd2cd2592a4bc8e0980d65d583895708bc21dad28fd557178fb36e82009fac673156281cd2c207019cc78 WHIRLPOOL 069c5e42ac799c32894d60b374a762ced5a96f271d9cb819ea86ce5ff9bc99de6358f9b2e8527adde8e4312bc45e0b5a30f259945c819920720adfefadb4e317
+EBUILD bcolz-1.1.2.ebuild 1142 SHA256 ff7dafdec60ec53fe37131358a7775d7ca82a442237e1150eb92adf9b75dfc6f SHA512 7b141e3ce16af333c270a03023b1aa80f5bf941855d55c898e1a6790bb1e36c5f32459b3ddebd252fee06182ec1b756c650333a27b1c32738ae38649cc0c5d1b WHIRLPOOL e5f4071e60a74dc23751ea15a9a8452c347cd1e086d7288fe467377192202e07f626b100f7c13a4afa90f2f655740469678cbd1e8ab1488bc37472503305d131
+MISC ChangeLog 3735 SHA256 63592869b72ae50f8c08cc14b9e18c9a56d881196eaaaa6cae493d4a3553c4aa SHA512 1a9594a78731f7a22ab267fde98b9ac1afc31edfa14a4ab71bedb68db3cb2731617321e8ac2d4d797a8aab3aafe7da9043c0ff612dbe53e6a8b8042e2cd2aa31 WHIRLPOOL b34f9c1ef6f56fe28fdf010d35784d229bcd04a21acd2eeb3c7d23ead355ff2f590be76bfb32c872566230cefdb1a6264823b7b9e7a07ef89088fda0bd860332
+MISC ChangeLog-2015 792 SHA256 a8a24821e3714bf7c0a57f2c851e4b54525028b67c2bccf46eb9ae4e2ac66f34 SHA512 7f89d026cd109c0d3b55855b24bb529578bbdfa7e9cc00fa108ff2c8ee21f8243d4fd97c4b8fbf91778b31579c8f703ea51e85cb26bb2863ccaea698de89f56d WHIRLPOOL 5b10de79cdac799239d172ac5a64bae3545ef37d22df007d530837f69bb238007a0fd9b769a1485567ed296b8d95d8ddcea3b47a25c4545537fa31a4649b9fc9
+MISC metadata.xml 853 SHA256 1da92d45b2780e2b863bae91ec1b56ac3c975143c9dab1d0c3852bc2cd94a2b6 SHA512 65bee839731be99ae673f86f4d5b791bc115cd5b65f3fbfc79c7e2df35dc08af59bb2fad4ab3b9ee2588582644b10153f2d932d2c292ab0e1fb0db92d88a631a WHIRLPOOL 55c00ba7c7ed9840dd2320a11eec5e69aea7f37f05dfe3e98af0fb2184e063cf9692b402dbc9153ae7a9d4f7f575f62e97727ed8459e2e163abf7e87fd83ca79
diff --git a/dev-python/bcolz/bcolz-1.1.0.ebuild b/dev-python/bcolz/bcolz-1.1.0.ebuild
new file mode 100644
index 000000000000..26d44a19a4a2
--- /dev/null
+++ b/dev-python/bcolz/bcolz-1.1.0.ebuild
@@ -0,0 +1,57 @@
+# 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
+
+DESCRIPTION="Provides columnar and compressed data containers"
+HOMEPAGE=" https://github.com/Blosc/bcolz"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+# numexpr is optional but set hard rdepend
+RDEPEND="
+	>=dev-python/numpy-1.7[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-1.4.1[${PYTHON_USEDEP}]"
+DEPEND="
+	>=dev-python/setuptools-0.18[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.22[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7)
+	)"
+
+python_prepare_all() {
+	if use doc; then
+		mkdir doc/_static || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && sphinx-build -b html -c doc/ doc/ doc/html
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib > /dev/null
+	"${PYTHON}" -m unittest discover || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/bcolz/bcolz-1.1.2.ebuild b/dev-python/bcolz/bcolz-1.1.2.ebuild
new file mode 100644
index 000000000000..0e2e061028f4
--- /dev/null
+++ b/dev-python/bcolz/bcolz-1.1.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides columnar and compressed data containers"
+HOMEPAGE="http://bcolz.blosc.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-libs/c-blosc:=
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+	)
+	test? (	dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+python_compile() {
+	distutils-r1_python_compile --blosc="${EPREFIX}/usr"
+}
+
+python_compile_all() {
+	use doc && sphinx-build -b html -N docs/ docs/_build/html
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib
+	"${PYTHON}" -c 'import bcolz; bcolz.test()' || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+	dodoc *.rst
+}
diff --git a/dev-python/bcolz/metadata.xml b/dev-python/bcolz/metadata.xml
new file mode 100644
index 000000000000..e880df52308b
--- /dev/null
+++ b/dev-python/bcolz/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+    bcolz provides columnar and compressed data containers. Column
+    storage allows for efficiently querying tables with a large number of
+    columns. It also allows for cheap addition and removal of column. In
+    addition, bcolz objects are compressed by default for reducing
+    memory/disk I/O needs. The compression process is carried out
+    internally by Blosc, a high-performance compressor that is optimized
+    for binary data.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">bcolz</remote-id>
+    <remote-id type="github">Blosc/bcolz</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
new file mode 100644
index 000000000000..5ca256db7a4f
--- /dev/null
+++ b/dev-python/bcrypt/Manifest
@@ -0,0 +1,9 @@
+DIST bcrypt-3.1.1.tar.gz 40103 SHA256 0309a4a72bd1dc314279cf1ee14e277227732f14c9b63ab96715654e13fe9321 SHA512 1fe7408262cdbe8d9f4f6f1e13e44688bd459aac98a2b73b491e9d8194109cbe0fe05a2fbec62b8d483985f59cd955c186be071675038d51ffea5c14a4452367 WHIRLPOOL fdd98f5e5f6dff531732f22a0cd56c48fb729d67b9e91abfcf9df5e399db7b41ba0500f0b7d305219782e0061a436cf2becaed39ea754a266a23abc697c535f2
+DIST bcrypt-3.1.2.tar.gz 40365 SHA256 346e175c820a111c17d4c2def181a96e1826652edb0bb16e565085ed542785aa SHA512 bab4fb2ef44f7a8c64f2f71832c52840ad64630af58c4d5019b4679123eb17421eecdd75ff1df108d3789ca12e68c07ea9fe9acdc76b909f01de1de924645c58 WHIRLPOOL b452584e045829fbf693a8b218299e75926a6864b74be1919eb13de9177087bb7f9d81cfe43d8e2ee8ace07263d5a03f15a716cfd9894afad6f1c2ec34edaf48
+DIST bcrypt-3.1.3.tar.gz 40806 SHA256 6645c8d0ad845308de3eb9be98b6fd22a46ec5412bfc664a423e411cdd8f5488 SHA512 1fe80a156cd3707c27d4d3b6495caede3404acfdcd238d0461fdd83249601a0b0f2945e0f531dd4422f19e9cd47107245d8e40eb8b47b78e5c679e7e6b37a92c WHIRLPOOL 603aba9bd33946d9bc35af1a0dbb379047854734d0dbb28080799fec9971d1e6a4aa6411505251006bbc9a672bff0c8f30a5a1d3f30af8cf5120d3990dfd29bd
+EBUILD bcrypt-3.1.1.ebuild 903 SHA256 bbf78bda8301dd704db548bfa037ccb82d1914e27dce292bdc5d71903ba54c9d SHA512 413898097ff85b779de4c24ddcdb10f000a8c254c425b5524b8d2ac4b576b55827d6d27b88cdaa4bd77317af8e444127bfd301e9fd29814dcbe4d3c71fe13e8c WHIRLPOOL c34b604ecfadf64e5bf457995eb2039e3e14f5fcf32eb8c5b2263196d1a22cc60b3629404526885dd772ed123d592ea491db5e0cdae9d946e2ad783d3d6e9b54
+EBUILD bcrypt-3.1.2.ebuild 915 SHA256 39e77db3d0ec233daecc86ae6319050011c4d2eb5da7213632aefc2d2153b2b4 SHA512 b91f2ea8bdbd9f8ba8ac8e616e5ce828cc7e562350015b1643fc29cd14536eb7b4fb188df2f2a3d30b97aed3af0db80b04aebdec4d4f66eabf00826451d2dc7b WHIRLPOOL c8b84fbcd0d60779312955915e6f67ad5c20f29aa95be32326138e43101b333118fceb610df896744a1c9dd0a84845bdbd028d11bcb99c8760cf56d8075ef63b
+EBUILD bcrypt-3.1.3.ebuild 866 SHA256 c30d99bf85d7eb10367f6a645c8f2566d573b23ad0229365cc87a71ad0db31d5 SHA512 e50d62e9d86d26ca1fe1f618a747614875d0e83b2a92458f7e5bd05dd9087708f5d36e397b3ff833f4a8134cda5b6e5911dc39cf0fc220323fbe8c826d093b13 WHIRLPOOL 6f15ac9d8db1c669e7fee493bd5122ceeba58e7c3410bb0e9826b49bde03313a5e00da18429553d38fa632003d15b620a859c105a5eb6d80d6f9b78263e89404
+MISC ChangeLog 4537 SHA256 c03010dc65008e284eb5f6d4ba1e1475216300a975ae78f616026ef6ee5219fd SHA512 e2b01a93053811f0cead9134990795ff6d9765d691bfdb8c35dbe65556fc3f8e167cfa689ebab87d95915ec9cb4d36ec48385c6861fed32044661d3b8e622853 WHIRLPOOL 71282631d493824a7beec22cfcfce9824ff88e6fe0686fbaa686fbbe3908593db37acda5f24732bd7d91cf4cc186d615cc79e302263aeaaed36363aa455e9e99
+MISC ChangeLog-2015 2614 SHA256 5fd9a7d11a0579c5bdca9922642cb8931eff05025a1194c9b6a4085f1a2ff3ba SHA512 06f2802809a3aa4c2829e1351f91c9223e2006c6ed819a9b4172eb32f6162440f5032efbd0f43984078cf6f5e23ab62dce81e1013d2b0427620ec3959a2067be WHIRLPOOL 849d5058fee270a11401c62535db30f9cfbf176b06e91567ee7307577812c548e00be2318bd72533ff0109dd82e78ac94cd74a01f1dc1a3897a48755d9d9407e
+MISC metadata.xml 485 SHA256 6b52b7edf6ca80ad924c2dce986881195ea918593719c2501316dcab91080db7 SHA512 3b4fb489f9d1ecdee3dedc58dda61aa86c6bc30f29aba50de6dc4faa499276d83fe15518088e4d0e76c98ca30188b2f1b921807821fc73b5dfc592490e6fdb46 WHIRLPOOL 149c3feabcd677e6de2da92add2dc41c4308bcc8f57ab160fc70dfc3baf361a7d316cc31e7aba7e24e9c7fe976e2b5dff274a399e728b3dff195b78897dcd2ef
diff --git a/dev-python/bcrypt/bcrypt-3.1.1.ebuild b/dev-python/bcrypt/bcrypt-3.1.1.ebuild
new file mode 100644
index 000000000000..dae3fb0df199
--- /dev/null
+++ b/dev-python/bcrypt/bcrypt-3.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Modern password hashing for software and servers"
+HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.python.org/pypi/bcrypt/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 ~arm64 ia64 ppc ppc64 x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
+	"
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	!dev-python/py-bcrypt"
+
+# The testsuite is not included in the tarball
diff --git a/dev-python/bcrypt/bcrypt-3.1.2.ebuild b/dev-python/bcrypt/bcrypt-3.1.2.ebuild
new file mode 100644
index 000000000000..0a89678c1348
--- /dev/null
+++ b/dev-python/bcrypt/bcrypt-3.1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Modern password hashing for software and servers"
+HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.python.org/pypi/bcrypt/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
+	"
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	!dev-python/py-bcrypt"
+
+# The testsuite is not included in the tarball
diff --git a/dev-python/bcrypt/bcrypt-3.1.3.ebuild b/dev-python/bcrypt/bcrypt-3.1.3.ebuild
new file mode 100644
index 000000000000..5f7222090ec1
--- /dev/null
+++ b/dev-python/bcrypt/bcrypt-3.1.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Modern password hashing for software and servers"
+HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.python.org/pypi/bcrypt/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 x86"
+IUSE="test"
+
+COMMON_DEPEND="
+	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-python/py-bcrypt"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/bcrypt/metadata.xml b/dev-python/bcrypt/metadata.xml
new file mode 100644
index 000000000000..10dc187c9f98
--- /dev/null
+++ b/dev-python/bcrypt/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">bcrypt</remote-id>
+    <remote-id type="github">pyca/bcrypt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/beaker/Manifest b/dev-python/beaker/Manifest
new file mode 100644
index 000000000000..51d3d6bd9513
--- /dev/null
+++ b/dev-python/beaker/Manifest
@@ -0,0 +1,9 @@
+DIST Beaker-1.6.4.tar.gz 54480 SHA256 5b06dcc9f7b1921bc962235c4051aa5f3f5d3609f42faa6064dc614ace031a3a SHA512 5a6835d01d0b1bee57844525f1223d74edd26f07cc769df6a8cfa77f44dda4435eb96639175928a1caf7c4f927ac3a674c0fd0e7f50f1aea91da7880de3a6704 WHIRLPOOL 13162d6733b69966133c17171b6725e0a2e7c2f56942bbc591ff3992dee50d7a5e91cc11a6a4ae775a9ec3dab805c2ae352982f0b1670190325b11d06a2e52a9
+DIST beaker-1.8.0.tar.gz 77211 SHA256 a2e275390c60e5097eac5478ebb2bac0e8a5b0825c50b9563859c31a9bfa7918 SHA512 5018b96058a6dc892350eb1fea0e1a44f872616444049e38a19f302b7e39a4710ecf3ddcc62361213f2663d3ecfa72823ce431f29f837e4a49ec556cf69fd88f WHIRLPOOL 342982dea87b09241ca0faba6ea6e7c346cc690f12c5727dc6266fba1188fbef127abd2c7e8b8a68c68f865f6975de092b1249a39e630e7eda5fe30893ba4e6a
+DIST beaker-1.8.1.tar.gz 80541 SHA256 1b72df92918be4a72c732ed9a28f0d77fb46f4449bd8bf58eaf394ecbf0aab6f SHA512 bd9c4a4bbf21749a59c50ffff1d1dbff8bc9116394f79924efc6be637fb8c1ffef91a8363da3375bffdcb0ba291b71b57f75303f3fbe111e8670a390058e9fa5 WHIRLPOOL 8da210bd13a53f6fb856ef88bac3f751d64beb0af182ac6997195a1c5ad98906902265254811930e1fa7b4d6230442ceea3f8516affe42977608fa6fdbbce7c4
+EBUILD beaker-1.6.4-r1.ebuild 1229 SHA256 b0017aeed847b33e72ccd1571e72634fef803efd32ba266275c163ac6890092a SHA512 6d242a75d4807003321ec17adfc3cb647e1f4c1b40576cf0546a6c175275c383fa25966205e77bd34163b66a146a1a099da969a21ab0ecb16c3927e6d337097e WHIRLPOOL 6f2415e6b134eef5b07c35b1b1842b0918ebb5893d77286f044acadce925077ec312e6b721379d1f60c5b08711f1d45374dd091ea3518c42d2bbabc043d7ae55
+EBUILD beaker-1.8.0-r1.ebuild 1078 SHA256 0b6a2ab8e152eebc57bfb3c3adbc06783918e4b0509930bb90364f6027dbf228 SHA512 7c8b8760a1f76a6182612a45c2f71f531748441d45b59db4b5243b29fac81e78e03afa47dfb9a5a70aa110aff127868eccd1bfc8e046f737f667ccfc3c888829 WHIRLPOOL 2eb0f71773c36919e3439c192bb9e566d636d8200193dba44a9d81194e5ade2ab3be78ba6310d8af267a90a432d9239d67686dbe64ab0caa759c8c742b90db9d
+EBUILD beaker-1.8.1.ebuild 1305 SHA256 1c8f3283a6fc74fb0046c25cb78a56fec93276b17e7011bd954f9f595103fa5b SHA512 15298245549fa0a9a20034a8080fbfce30fe147df68ec8ed720ff6085d9c4f1218fdbe00b6ad14a30563730bc8c8f75c4190d850151416d2afd585ca1c0fb410 WHIRLPOOL dc305be6f1a84ed0fd6aab7948231847d8005504085686ce372416519a132e58e788476c1e3c65a4b6ba144cf5561c606bec46aacaca00d427146f5a72c2ff93
+MISC ChangeLog 3797 SHA256 ab258b00979a4c1971710224a9cfab4619877010d487a88ee8f24354484f68ad SHA512 ca14f4cfee508cdc3b3003608f286a96d14b7f9841f22f9b5ba5d47d52709694ee6598be84f1b0c8dc40e49140883322d9941d363b201b1245e39f897fbe13b7 WHIRLPOOL a19fa75b09c5dce7dfdc564159b94e877d18c4f5bf981c2a169aa1009ddc1fe78497ef7369464bf9904b9691eac3011f1a1e06081385dfda0e5091baeef19f1e
+MISC ChangeLog-2015 8135 SHA256 fbc3410dce0bc0f5cfa2cfb4942889df44939e9394a89ab00de253ce440e590e SHA512 2c368a3a27b9b8680f26a7cd7469927d6098f57e38395d881c7fa0e572ab03836e38ca0b89de4be23a97d6d3a528c3324e9784650fc3e938d9c10d5b5b76edb7 WHIRLPOOL 5b16e872aa6bf3c382e8b9ab7ce1203815f36a9eefcc132758c22afc25138cd33f08aa2b368a3b3a390e556002d1c00a9ce56f5e38880e945542ed555f0c8083
+MISC metadata.xml 376 SHA256 b28bf9f04e18fec8c6780bb2100523355a2dc37c4aba7b43c6214c497c69f2f1 SHA512 09586c7ae4aa5259c0776ef77713538e8b8dc730da802d95b3de5501aa6c88c96c1967740ff77a124821bbd93b13e9547879f452d46325916237aeaddf58c353 WHIRLPOOL 6e45ea2d85588574349699a7c0eacf10dc2c5d3f906996ef66a14ec05ad9e376bb9ba5a93117206b1368137290cd216773ff45acf244192bd505c0d8fc4b2dd8
diff --git a/dev-python/beaker/beaker-1.6.4-r1.ebuild b/dev-python/beaker/beaker-1.6.4-r1.ebuild
new file mode 100644
index 000000000000..236d2b83db9c
--- /dev/null
+++ b/dev-python/beaker/beaker-1.6.4-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# py3.3 unfit with some types
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Beaker"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A Session and Caching library with WSGI Middleware"
+HOMEPAGE="http://beaker.groovie.org/ https://pypi.python.org/pypi/Beaker"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+# webtest-based tests are skipped when webtest is not installed
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Workaround for http://bugs.python.org/issue11276.
+	sed -e "s/import anydbm/& as anydbm/;/import anydbm/a dbm = anydbm" \
+		-i beaker/container.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cp -r -l tests "${BUILD_DIR}"/ || die
+	pushd  "${BUILD_DIR}"/tests > /dev/null
+	nosetests || die "Tests fail with ${EPYTHON}"
+	popd > /dev/null
+}
diff --git a/dev-python/beaker/beaker-1.8.0-r1.ebuild b/dev-python/beaker/beaker-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..76ad4a3b3b75
--- /dev/null
+++ b/dev-python/beaker/beaker-1.8.0-r1.ebuild
@@ -0,0 +1,39 @@
+# 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,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Session and Caching library with WSGI Middleware"
+HOMEPAGE="https://github.com/bbangert/beaker https://pypi.python.org/pypi/Beaker"
+# pypi tarball lacks tests
+SRC_URI="https://github.com/bbangert/beaker/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="virtual/python-funcsigs[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_impl_dep sqlite)
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	elog "beaker also has optional support for packages"
+	elog "pycrypto and pycryptopp"
+}
diff --git a/dev-python/beaker/beaker-1.8.1.ebuild b/dev-python/beaker/beaker-1.8.1.ebuild
new file mode 100644
index 000000000000..c44df31f8d96
--- /dev/null
+++ b/dev-python/beaker/beaker-1.8.1.ebuild
@@ -0,0 +1,48 @@
+# 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,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Session and Caching library with WSGI Middleware"
+HOMEPAGE="https://github.com/bbangert/beaker https://pypi.python.org/pypi/Beaker"
+# pypi tarball lacks tests
+SRC_URI="https://github.com/bbangert/beaker/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="virtual/python-funcsigs[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_impl_dep sqlite)
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		|| (
+			dev-python/pycryptodome[${PYTHON_USEDEP}]
+			dev-python/pycrypto[${PYTHON_USEDEP}]
+		)
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# disarm pycrypto dep to allow || ( pycryptodome pycrypto )
+	sed -i -e "/TEST/s:'pycrypto'::" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	elog "beaker also has optional support for packages"
+	elog "pycrypto and pycryptopp"
+}
diff --git a/dev-python/beaker/metadata.xml b/dev-python/beaker/metadata.xml
new file mode 100644
index 000000000000..708dfb0218b6
--- /dev/null
+++ b/dev-python/beaker/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Beaker</remote-id>
+    <remote-id type="github">bbangert/beaker</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/beanstalkc/Manifest b/dev-python/beanstalkc/Manifest
new file mode 100644
index 000000000000..aab75ab2ffe5
--- /dev/null
+++ b/dev-python/beanstalkc/Manifest
@@ -0,0 +1,6 @@
+DIST beanstalkc-0.4.0.tar.gz 13921 SHA256 98978e57797320146f4b233286d9a02f65d20bad0168424118839fc608085280 SHA512 30485aed4036549c524982bbabe5a27af5fe6f0547175622019b4469fc1fef32d013cbef5e38a1928ab92a3acf6aba9bc7607c3e8e9f2f3c6f65631d39471a7b WHIRLPOOL ca43ca379ed87046f926185d43caeab8f29ffb4388bdc0e6184cf59f98016537e68f8f63188199c895b45d9da39df59cdf34b39372faffbc5499300c5f919a2d
+EBUILD beanstalkc-0.4.0-r1.ebuild 536 SHA256 832658a6669c1457f89ddc55f5c9da2a9ab5f8f4aec758fe8356386f67610f5b SHA512 7844d831fc39a6c9a04d2e3b5ee18615478f8aa2617d06c5ec24309576d9ff7f719895a25d0ba9e7cabb0e85e88376d1a0ef1c9c89e4e2b94c7be42b4e48fe73 WHIRLPOOL c629e2a3446599815967617b1787c9b6f8158f00683c01cc4b3628b2dc22ceff39d73d51e5266ecf2bfc9b293499ca7068a7e719a2ee4a1344584829148464ba
+EBUILD beanstalkc-0.4.0.ebuild 522 SHA256 36a94c10e7264500a150a67a4993ebad280a8dd137092ff8a84a415576f1c2e4 SHA512 4f345932e676d4ab3dc11bab459c0b2ad8d89e1119fd7a37bed70093ea6ab84647753d5278a26e371b9560b90352c1c28cc9c2aa91cb4b6345a56a889daa95a4 WHIRLPOOL d6e71284385d58a7cba5d29200fb0cc494385807710b2a90073bd6b40b49ace2550b4989c5ef8abf018bb7a850de3db1e02696f7a51e17ba0163693873b9d7f8
+MISC ChangeLog 2678 SHA256 68f91e364fef80d6c328438247475ea77495e0cb7b9e0851be877f358466242f SHA512 b1a0c3102979362fad23d845004c4232f7f4194724dc572bbe28386ca9c08da0dea833164c1377afaca0421b3812498a5f0471f9e91f5c5f4d68335767df13d5 WHIRLPOOL 98ff1197ccf3e3af9912d5664ac171f37bee5737f9f10330e7b069da384489471a71cb887ebf4ab2068ec81763f02b21d1005eb59ae4acecd7fd63114acbc19a
+MISC ChangeLog-2015 2501 SHA256 e211f440b3bef759f9dd1edb8e2b9835291a5fa3ad0e199cc6d89f19115ef891 SHA512 1f0c3339c7d17afdc254ff25acca063adb1b78305acb68c4b324b20bb93a002b45d1c9de4103ff66cc8e7dc154b739810b968697853801e3d9e7fccd0415556b WHIRLPOOL f8c958bc1000f7424a786f4cc0db387f672eb1427089b4efa5979e57a3fdbd44c3601d4ee9889f28dd888d90d24c49b58faff04c0985b6b964e3dd01c9fcf5c5
+MISC metadata.xml 380 SHA256 71528b2956f39eef0fe15514385e1a61765a607df1776453dde6695860b898f6 SHA512 9af0543dce24d2c9bd0016c5c357c39c2bbd42b08459ca3a08072a420e1e77e9814458498af0574ee8152693d9512c458312bec81ffbba4e318e079c50594f74 WHIRLPOOL 899b52b06f408687de0b15ff55527b6113ba5340ec3cbac0dcd268bbde84297b16aee1eea66c96e9ee17a0458d5bd428eb59e245f58db9b82819036f375ec4b6
diff --git a/dev-python/beanstalkc/beanstalkc-0.4.0-r1.ebuild b/dev-python/beanstalkc/beanstalkc-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..912483f07876
--- /dev/null
+++ b/dev-python/beanstalkc/beanstalkc-0.4.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple beanstalkd client library"
+HOMEPAGE="https://github.com/earl/beanstalkc https://pypi.python.org/pypi/beanstalkc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/beanstalkc/beanstalkc-0.4.0.ebuild b/dev-python/beanstalkc/beanstalkc-0.4.0.ebuild
new file mode 100644
index 000000000000..0edc55a36c3c
--- /dev/null
+++ b/dev-python/beanstalkc/beanstalkc-0.4.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple beanstalkd client library"
+HOMEPAGE="https://github.com/earl/beanstalkc https://pypi.python.org/pypi/beanstalkc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/beanstalkc/metadata.xml b/dev-python/beanstalkc/metadata.xml
new file mode 100644
index 000000000000..de6bdc505c0e
--- /dev/null
+++ b/dev-python/beanstalkc/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">beanstalkc</remote-id>
+    <remote-id type="github">earl/beanstalkc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
new file mode 100644
index 000000000000..aa77951b991a
--- /dev/null
+++ b/dev-python/beautifulsoup/Manifest
@@ -0,0 +1,11 @@
+DIST BeautifulSoup-3.2.1.tar.gz 31224 SHA256 f5ba85e907e7dfd78e44e4000b3eaef3a650aefc57831e8a645702db2e5b50db SHA512 365b7b045a2069cf437877543577bc0aa99256a6dc4c9743670b46bfceab5494a06628012d6eccecfe99c25d5c9e0c65814964b47026f15ba1a538444cfb7789 WHIRLPOOL c2f84b29421d0153fb1fecc87d63e00a61182e03bc0683132babca5d6c94143b4875a60a19124a36e4e6e78ce80bff9e1e81b37335700efc14084da933307e26
+DIST beautifulsoup4-4.5.1.tar.gz 158039 SHA256 3c9474036afda9136aac6463def733f81017bf9ef3510d25634f335b0c87f5e1 SHA512 d560d7f743507084ec546708d29bb3764512f5b2c380004280dde813350bf48d1697fddce3bd3f95186407bf5142941d7adc7d0de8e7962eb5ca1278dbc7e93f WHIRLPOOL bf971596707c2ff69e93528164be01254258aa45601763c543246b67c5d31024b0e4de618382775a3cf313d255d8d1d6268a47542773531aacee9a2643412661
+DIST beautifulsoup4-4.5.3.tar.gz 159185 SHA256 b21ca09366fa596043578fd4188b052b46634d22059e68dd0077d9ee77e08a3e SHA512 d31db0e3bb778a78c37882fcd55dc580eb5eeadfd48744eae6e2e0d0ef5983b216a4682af84a4971611b05fb99c45012ce094475f2d7c39a5b90dad99906ec84 WHIRLPOOL f8dbffd8e4a1dbee0a7ad8a4bcbe22a984f524474f0241a4c03ef5c37b291f9834a6ff1d076421c0cf1087588df1e49f5b99cd9afd7e81591c9063d92d4d097d
+DIST beautifulsoup4-4.6.0.tar.gz 160846 SHA256 808b6ac932dccb0a4126558f7dfdcf41710dd44a4ef497a0bb59a77f9f078e89 SHA512 1a7eee4218e58cc3852e71fe4f0892f673bb46a851941264766a38eff8ef05d612d88b4641fcb478ce8f66ac50dc987ca039923c4bbb11867c74813289f7e578 WHIRLPOOL 46809fd612cd90533fbf4252d1c2ee19c571301306c549526b355b4a7ad17090aa1e505268f25a521ed0d2c90c7686a6a2c1144a934a16823754aac5f599ac2c
+EBUILD beautifulsoup-3.2.1-r1.ebuild 859 SHA256 ed5c8a76b1dbeeda89efc57d32645461bb62eda231f846c42215040d90c1905d SHA512 aa3b7d3bd0161f7ea00bdedf48160023513686461012b93e62d635183e668271d7b6e3f275d2f6a368f74abb741494c58978a00c6884df65ebc791006065d2dc WHIRLPOOL 6d0f228c8a50bd6790a30bc181ae24d9d48efc2f1f54d1cd4f4e35a04c376135cd52c9c378d45c04fa094db2401c1424afc1b29ef009c52e2a07701fc8504555
+EBUILD beautifulsoup-4.5.1.ebuild 1362 SHA256 a7ffb53b50e4b269685add9ae6ff96170041c46265b37632ee5c21a735fe1878 SHA512 78b6092f6806324b91fe73a554bdc94ec258d8ce461331b276864ab99492b78eaef07e745a90b9f1400c34028a28ce206d2ec57f8d3f295b951541affd4b2114 WHIRLPOOL 21078e3c97b693c91034371bc73f923f134bf07a89f497b1427638b20b748dd2824f2d782507d363ce24afcce4e1c211b4ac16e69cf946a786de7b6739b0476e
+EBUILD beautifulsoup-4.5.3.ebuild 1371 SHA256 8ccf77c711c048a05a14ce51f538e1618017906d429e7ce9f25b3b5cd9f17039 SHA512 e637971890f68ce4f485be1c4e3fb7bc10812080b427e9c929e5f02208606e754c70b024f00b98cf2efe854c11554b60a0a3f03930996a87d722649361965053 WHIRLPOOL 3826c352b44f2440f04816d03d1c1b0998472f4ad3d50768715267baea76ca4e5ea537161c00e6ab0fa365c37f8367e0e1879c197fbe0de939d8f3c7db1c2de5
+EBUILD beautifulsoup-4.6.0.ebuild 1327 SHA256 8720248a45b18e6807d6dac3a10fa70da6795cc283bd22fefaf91e57b6c4ac48 SHA512 e7a259c6a3ffc73f4e7bfab7eb44bf44b05011bc1de15ba5d86a3bff2aa630fa5d45a789421800028c035d7298ca80b9c416a606c0a4611740210de61d3fb385 WHIRLPOOL e543c73cd7664f40677690f4429ce6c16bb3f3f818f963234be19494f12b313a7e3b2115207140bea50d4007cd9ff7327a98059d691c5825097685197e552b53
+MISC ChangeLog 5040 SHA256 0276750bc9f88c0cddc9d699b49dc825c5d462303292edd6fd101e417d1a0a9a SHA512 5c0a72e2d60e4645a5097ca8841ad3f510c97453c5e82aba4ab696959e9baaafd2c2af338a7fafa40b4ffc53fd90cfe07475e51872a3665a1e514d4a5d5a9242 WHIRLPOOL ebd194800471c2542b740b4dffb6051e7c6a25f1046fec3a7a461fa1f6970321327accdeef0da0911df5f865ff912d75efb08a926d12fedf517fe7d727bdb727
+MISC ChangeLog-2015 18871 SHA256 f7c4f4239e577dcc3cdb88738e5040eeb59f388eca2e72071af545dc936bb843 SHA512 97860287bae63869b9a2a44b4df0dde981d1757f9e2bf6990fe717bf80250eba73bf80fe3a2488439e6a0f58c7a0135bec05921c5594d6968491e59a254ad15d WHIRLPOOL 8f7d28203ef3bce32d883d9db0d0b499b990cc89a5dff5ff2eee6fa1865b4a8238fd42fc1ef5a7b52562bddb581f8ab58971eecc616def382ffea847ae9d9da4
+MISC metadata.xml 720 SHA256 33d514bd597448d6cf2172b3b8ade1be835290b6f01ff708bec167934d4c5c6b SHA512 94493d30b0e0e55b94d08f9a56841c54088469a86b706b73e8efe9c0f9a0da598feececd01f5f14d7e28bfe6fea5d7b017fb84a2df680335f519803450c6f578 WHIRLPOOL 3cafaf2b783533cf8a7d8631accd99ca7afb04b45d6b32a14ad84fd5039759d982019b22a605701552efe979db1f51f8eb4d0ec8d2a76d781f411fec5eb5941f
diff --git a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..94e8fdfc00c6
--- /dev/null
+++ b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_PN="BeautifulSoup"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="HTML/XML parser for quick-turnaround applications like screen-scraping"
+HOMEPAGE="http://www.crummy.com/software/BeautifulSoup/ https://pypi.python.org/pypi/BeautifulSoup"
+SRC_URI="http://www.crummy.com/software/${MY_PN}/download/3.x/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="python-2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!dev-python/beautifulsoup:0"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	"${PYTHON}" BeautifulSoupTests.py || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild
new file mode 100644
index 000000000000..df69b8e49ddf
--- /dev/null
+++ b/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN}4
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Provides pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
+HOMEPAGE="https://bugs.launchpad.net/beautifulsoup/
+	https://pypi.python.org/pypi/beautifulsoup4"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="doc test"
+
+# html5lib is optional however hard coding since its use is actively discouraged in the devmanual
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/html5lib[${PYTHON_USEDEP}]' python2_7 pypy)
+	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' python2_7 'python3*')"
+DEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	"
+
+S=${WORKDIR}/${MY_P}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	nosetests --verbose -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.5.3.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.5.3.ebuild
new file mode 100644
index 000000000000..82ee5a047f3e
--- /dev/null
+++ b/dev-python/beautifulsoup/beautifulsoup-4.5.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN}4
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Provides pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
+HOMEPAGE="https://bugs.launchpad.net/beautifulsoup/
+	https://pypi.python.org/pypi/beautifulsoup4"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="doc test"
+
+# html5lib is optional however hard coding since its use is actively discouraged in the devmanual
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/html5lib[${PYTHON_USEDEP}]' python2_7 pypy)
+	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' python2_7 'python3*')"
+DEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	"
+
+S=${WORKDIR}/${MY_P}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	nosetests --verbose -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.6.0.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.6.0.ebuild
new file mode 100644
index 000000000000..d321b00e57a9
--- /dev/null
+++ b/dev-python/beautifulsoup/beautifulsoup-4.6.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN}4
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
+HOMEPAGE="http://www.crummy.com/software/BeautifulSoup/bs4/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="doc test"
+
+# html5lib is optional however hard coding since its use is actively discouraged in the devmanual
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/html5lib[${PYTHON_USEDEP}]' python2_7 pypy)
+	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' python2_7 'python3*')"
+DEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	nosetests --verbose -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/beautifulsoup/metadata.xml b/dev-python/beautifulsoup/metadata.xml
new file mode 100644
index 000000000000..1a865dd3b27d
--- /dev/null
+++ b/dev-python/beautifulsoup/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Beautiful Soup is a Python HTML/XML parser designed for quick
+		turnaround projects like screen-scraping. Two features make it
+		powerful: it won't choke if you give it bad markup and it provides a
+		few simple methods and Pythonic idioms for navigating and searching
+		a parse tree: a toolkit for dissecting a document and extracting
+		what you need.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">beautifulsoup4</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/behave/Manifest b/dev-python/behave/Manifest
new file mode 100644
index 000000000000..1eca30c2f1aa
--- /dev/null
+++ b/dev-python/behave/Manifest
@@ -0,0 +1,8 @@
+DIST behave-1.2.4.tar.gz 343050 SHA256 24542aadd9eeb3a471076f9d880a69250052153df93122d9991938db917759ec SHA512 98360202fdccaa6cdfaf70a2a658db06b8de0017fbaeb5bd8d33ae8f009444a29f9e75eab8a4b363eb7719ef10566fad5521372285f2998cfb6e3037df706a1c WHIRLPOOL 2278500709733f9715ada2e6e178d6bb32c566c8df8ae6bc8ac3400ec66e37d9a1559c58e869becc89a8861407c658f22c695416d3617d7651629a5f2eadd6b5
+DIST behave-1.2.5.tar.gz 385738 SHA256 81b731ac5187e31e4aad2594944fa914943683a9818320846d037c5ebd6d5d0b SHA512 137ede0baed9df154087249df8dcae81ab0cdf1de91a5790fca7ccf3231ba2ba4e64623abd2b8c9bfc459ab6575f68b9ef7e03e33ef79e524d9443a8489ec7fe WHIRLPOOL 07b603da98220f35d82f11ea07042e5962c6be4ba1442c27a491c00b3260a57880bb26fbf89b510d898457675be28e63ff0c37dd5568d5905ff5e41ccb4b400d
+EBUILD behave-1.2.4.ebuild 1534 SHA256 72cf5518a1c8846f3c1fbce8b735632a5a76df79d8b890c016500e5414967328 SHA512 4657569dc4ce605056acb857cbe9849fda3c46bf44ba247e5de33d6e4ef4792c63d282cda88d537121f011400b4ff799912c6c68aab28f43b4056dac031c40c1 WHIRLPOOL 9ce575d9e6ebc21096340baf3790ff258cbd951cc9d9721e7da0caee51a8484ab4bbd4fc0f91fde5323fd0936dee2c898c0a9db05666a3b39e36f7c2c995da36
+EBUILD behave-1.2.5-r1.ebuild 1412 SHA256 dec62a8d0f9f03e2d045e4f6b73c141a91d1240de15842ac1f99bd27ec1a7167 SHA512 0319d6fa4e829418a77d209489c204942c36364062ae5d1b71bac7415f6955dee1d49bc8631934bb65b50b668b1ed8cf92de715d66cd5d1941a74910d8fa6049 WHIRLPOOL e77b675c85b2ec96f588c5285ff262b45cb5d8baa741dfff103a90ad225ca84d2e412f9bd9b109bc273c540761b7113509cec0f8db78b4eb0de85da7ab42dc04
+EBUILD behave-1.2.5.ebuild 1402 SHA256 cc90cbca7702374e4aa3e3b0742a67083491f46da8fc00a5784ff786a0e70d31 SHA512 c22a7780fdcf0ecc9bfe8cb8e4d5bd4cbcbb11521ea59305f0a36db44f3de529abafc90247120898a3d0e269c34246331484f27a66a43317047d7c42daed6936 WHIRLPOOL 872220c1ed72f3029bd74d0228cfbac606cdc1efa23411ca2d4b0251400dd598d4d0a3b4598fc9060b458ada81ea463c0d43bf119a3844b32eb7aae226f74e77
+MISC ChangeLog 2882 SHA256 62796bc2197255b392a7cc86da6b93ee6a70d6f6e1d4b03ed9eded1c21c1624f SHA512 bd6b0db3365ca3db052089de6a5197a3667e96753e2f652a18685fe5921c2794b73d922aeb75ff742e7dfc8f3daccbe2acccd189b1eb1d371fda48fbcc2da553 WHIRLPOOL 71c9f1d07dbb64c398558b0ca1ad0a4f6295ce910e67a73960311735cc81e5216f75711038e8f7692a6ffef187f0c7970fcdcbcc1fce7b6714580c433e8c48bb
+MISC ChangeLog-2015 692 SHA256 8ae512a244b14ab2fa39a561bebfb5508ae803fba8cdf83f38a682a880bb6350 SHA512 d8961d978fb1ed198b8dfff1cb7fd40be3914ec1cbdcdb1e4337939245657e8dd61f163ce5c86b280c399d93b65b901c70f365b9a2e40bd4a7ed443e6f4af696 WHIRLPOOL deb89419042b23c10d4ff9b45eaf29dd9e23a146ccc12eb597b8b53fbf9453d0444f3785fe8d633f9062a130f7c398b597324d0c227fd368f8f9a23c99d1f87c
+MISC metadata.xml 368 SHA256 166fe79e3ae84cfb74e20cee36dda3db4d3d9d714f5f31b68242d564a5343c1c SHA512 f29d96a30ae4dc3d48e38f9242e5b4fd048e61922f792615ac114ef8f1111a718318205413970217779ab77b640ac7491359e50ef57b66e00095214c46ebcd82 WHIRLPOOL 063637dd647bcff2447290ac95a156476e151f894c1b255129f2594f55d6a43b7c160458397e6ff241f5a805da4b2a2895d996c7ff2ea5f8ca0b2c1b4db249e1
diff --git a/dev-python/behave/behave-1.2.4.ebuild b/dev-python/behave/behave-1.2.4.ebuild
new file mode 100644
index 000000000000..92b9cdd4e69d
--- /dev/null
+++ b/dev-python/behave/behave-1.2.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="behaviour-driven development, Python style"
+HOMEPAGE="https://github.com/behave/behave"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+	doc? (
+		>=dev-python/sphinx-1.2.2[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-cheeseshop-0.2[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.1[${PYTHON_USEDEP}]
+		>=dev-python/pyhamcrest-1.8[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/parse-1.6.3[${PYTHON_USEDEP}]
+	>=dev-python/parse-type-0.3.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests || die "nosetests failed under ${EPYTHON}"
+
+	rm -f "${HOME}"/.pydistutils.cfg || die "Couldn't remove pydistutils.cfg"
+
+	distutils_install_for_testing
+
+	${TEST_DIR}/scripts/behave -f progress --junit --tags=~@xfail features/ || die "behave features failed under ${EPYTHON}"
+	${TEST_DIR}/scripts/behave -f progress --junit --tags=~@xfail tools/test-features/ || die "behave test-festures failed under ${EPYTHON}"
+	${TEST_DIR}/scripts/behave -f progress --junit --tags=~@xfail issue.features/ || die "behave issue.features failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( build/docs/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/behave/behave-1.2.5-r1.ebuild b/dev-python/behave/behave-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..42e5dd0ddefd
--- /dev/null
+++ b/dev-python/behave/behave-1.2.5-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="behaviour-driven development, Python style"
+HOMEPAGE="https://github.com/behave/behave"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/parse-1.6.3[${PYTHON_USEDEP}]
+	>=dev-python/parse-type-0.3.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.2.2[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-cheeseshop-0.2[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3[${PYTHON_USEDEP}]
+		>=dev-python/pyhamcrest-1.8[${PYTHON_USEDEP}]
+	)"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests || die "nosetests failed under ${EPYTHON}"
+
+	${PYTHON} -m behave --tags='~@xfail' features/ || die "behave features failed under ${EPYTHON}"
+	${PYTHON} -m behave --tags='~@xfail' tools/test-features/ || die "behave test-festures failed under ${EPYTHON}"
+	${PYTHON} -m behave --tags='~@xfail' issue.features/ || die "behave issue.features failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( build/docs/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/behave/behave-1.2.5.ebuild b/dev-python/behave/behave-1.2.5.ebuild
new file mode 100644
index 000000000000..431484a18584
--- /dev/null
+++ b/dev-python/behave/behave-1.2.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="behaviour-driven development, Python style"
+HOMEPAGE="https://github.com/behave/behave"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.2.2[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-cheeseshop-0.2[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3[${PYTHON_USEDEP}]
+		>=dev-python/pyhamcrest-1.8[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/parse-1.6.3[${PYTHON_USEDEP}]
+	>=dev-python/parse-type-0.3.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests || die "nosetests failed under ${EPYTHON}"
+
+	${PYTHON} -m behave --tags='~@xfail' features/ || die "behave features failed under ${EPYTHON}"
+	${PYTHON} -m behave --tags='~@xfail' tools/test-features/ || die "behave test-festures failed under ${EPYTHON}"
+	${PYTHON} -m behave --tags='~@xfail' issue.features/ || die "behave issue.features failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( build/docs/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/behave/metadata.xml b/dev-python/behave/metadata.xml
new file mode 100644
index 000000000000..96b3ac49e9a5
--- /dev/null
+++ b/dev-python/behave/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">behave</remote-id>
+		<remote-id type="github">behave/behave</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/betamax/Manifest b/dev-python/betamax/Manifest
new file mode 100644
index 000000000000..469cea489a9a
--- /dev/null
+++ b/dev-python/betamax/Manifest
@@ -0,0 +1,3 @@
+DIST betamax-0.8.0.tar.gz 78398 SHA256 82c480852a70a1bb57bd3f505107ffc293185e26fdaf45e538478e675fd9c8a1 SHA512 52b330747b6add52390b50dd63c05851adc01ccd238fdb5c3401efdfc26be363a3f61145dc0e1f3cc43ff520e1457e33fa47952d2929c7c3e12c3e2612621f95 WHIRLPOOL 70b69ad2df7e01b6bdf4cde60c18a723a95b24805f07c790cefa4e462d59c24d3c63a184e9021eefc1572496ec4d218a92ab467f0d953aaf982ea78f025f6806
+EBUILD betamax-0.8.0.ebuild 752 SHA256 a7abafe99b29cbb6a1a1459c5f8f79c1ad49d94151164b79b94517fd8cc4bc98 SHA512 7201645e3c0eea52b2259b28a08e9992bae7de57d1d82286e71035cd7490968d7d9ee7c5c25084b3acbafc91afed146902691a4066c336e6d5a3da7028ef83c6 WHIRLPOOL 8dca62a08df0fe75a5c6d36d6aacf0fe36572b7fda90e559759e4e64cd1a70deaf5d1a108b2330b4440296c3f64ec74e2f94c7b1076296340c35bcde3caf860b
+MISC metadata.xml 218 SHA256 ddc25240b08f34a11ec40b8f89b0465343135e80dd8762624858e383651e9363 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781 WHIRLPOOL e5a7ee851a7d7a5d30327c10ae6ea910afd395771a1ee35607ba1c183882c6c2257ff637cde344befa2388038b1546a7a9df0502939d26a58ebbb1e920c4ecdc
diff --git a/dev-python/betamax/betamax-0.8.0.ebuild b/dev-python/betamax/betamax-0.8.0.ebuild
new file mode 100644
index 000000000000..e39b5dd1f255
--- /dev/null
+++ b/dev-python/betamax/betamax-0.8.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="python-requests HTTP exchanges recorder"
+HOMEPAGE="https://github.com/sigmavirus24/betamax"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+
+# Tests require Internet access
+RESTRICT=test
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/betamax/metadata.xml b/dev-python/betamax/metadata.xml
new file mode 100644
index 000000000000..266e3f19ca59
--- /dev/null
+++ b/dev-python/betamax/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/bibtexparser/Manifest b/dev-python/bibtexparser/Manifest
new file mode 100644
index 000000000000..9de2b87a9407
--- /dev/null
+++ b/dev-python/bibtexparser/Manifest
@@ -0,0 +1,4 @@
+DIST bibtexparser-0.6.2.tar.gz 50876 SHA256 af6d4802de27cc40d4d65656dd5e269ac05cabb7816be6b520e6ea08c6a626c8 SHA512 43a1c0475bc9e97c201a850e944f082e9eb316ac475cce4128b821008fc5b1597317f28c594f5462daee992b455fb4254fdf76a5baa02ff8e8a0e36f43c52491 WHIRLPOOL 4dcfe250f9319c0910d4076a6ef509b6e914f5c7ee49690dfd91881cbfc208dcbdb59b0f733567f6c3460b53f0785c6ad09ef392a527ca7252e9e109e275d1bf
+EBUILD bibtexparser-0.6.2.ebuild 689 SHA256 fd64f91bbcd5b44cea1977000114cfc02bbb0c4e45f7566cdd243d8774393a9c SHA512 eefc86d84f1942056f45d5889199d11f606c03c61c5d0231c45cf3dc5d4d45b9c8171802d943be2fc261d1072fafe6d00d23bbb5f6e2b62df7db92fadbf353ee WHIRLPOOL ddd4c251ed7ba95f2dfc1c53114981d7a11ea43dff0dfa5ac55d11b84e547861867cc133f8f134439671c3e2edd2c9964f1e0aa9da7df28bbb99c6ce64c6ee14
+MISC ChangeLog 674 SHA256 1d3ff583f3d57f1a4ea51cdbb23ac21a5588acc0ccd3349ef4040996a7a0e583 SHA512 e68a094d06f693b6c226b8170251a10ac059b53210846b6e3edd9a44bf73c0ed0fff90b6a725b175901e945c39df2f47c1ca0101fc8aa3fe8d61244bac90db23 WHIRLPOOL 92529f686e36feaaf6bea2df6b0f5a5f2ba1e9650fa6a8470a38caaf086cf277e2f519b8e28c9972f957af70ec884e2065c7c3109356abf171ebd0230a833f65
+MISC metadata.xml 345 SHA256 034c8ae5a35cb81d5385c38718019c773a3e740a252e932075f4a285932d2592 SHA512 d2ed1034bf79aeb9c8bb102618e5c5478a526a8567dd8e232126f35919b1e6ab6b27bc02f01d61a475c8ec3488450968fabe4548539d61a70b61459e0b1e1615 WHIRLPOOL 9515d8f26e73818064af03bcc13506cf809205e5aef0e41a3737b887519c94b683e1968352b446a5a2fbe3fa6d2d70c5238853bda0bd6610ad2dbf02c506f9e7
diff --git a/dev-python/bibtexparser/bibtexparser-0.6.2.ebuild b/dev-python/bibtexparser/bibtexparser-0.6.2.ebuild
new file mode 100644
index 000000000000..b446cf5e141b
--- /dev/null
+++ b/dev-python/bibtexparser/bibtexparser-0.6.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 python-r1
+
+DESCRIPTION="A BibTeX parser written in python"
+HOMEPAGE="https://github.com/sciunto-org/python-bibtexparser"
+SRC_URI="https://github.com/sciunto-org/python-bibtexparser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/python-${P}"
+
+src_test() {
+	python_foreach_impl nosetests
+}
diff --git a/dev-python/bibtexparser/metadata.xml b/dev-python/bibtexparser/metadata.xml
new file mode 100644
index 000000000000..30d601c0f423
--- /dev/null
+++ b/dev-python/bibtexparser/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">sciunto-org/python-bibtexparser</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/bicyclerepair/Manifest b/dev-python/bicyclerepair/Manifest
new file mode 100644
index 000000000000..42a3e4d99340
--- /dev/null
+++ b/dev-python/bicyclerepair/Manifest
@@ -0,0 +1,8 @@
+AUX 50bicyclerepair-gentoo.el 196 SHA256 37e59786c0046262b09d5f2a3bd70d5a1bb52ceef4bae5942be5b34729ca87a0 SHA512 adaada9d49a5ecfbed6a1e478f0cd7cddad774d02f0c9f4e0ba3cfd1fabd56d80496e869f5a2c33f6883937b7c5c7b20e61d09730faee3a5babd6a91063b4709 WHIRLPOOL b0d73cf7eba7a034ec2e833215d40450ba311f8877873451812a4c359dba0bd2c93bbe2272449e5d02cc85402e3700b795437ceb32ba61b0c8310d0f9d40857b
+AUX bicyclerepair-0.9-idle.patch 1525 SHA256 536dd7cde301c2c2049081ab258001fdd3ea75f6427cd0e4f38af278b5bdd0fc SHA512 986021b98639c9cc2838244c7000b9cc4617d6638a9971d1260c0a594483604e7a3d2af95ba8eab96ab61c485a4de4ebd7b976cc75529c0af754825426f856e3 WHIRLPOOL ccefb3d2af478ede2aaf36ae8cee9d391e11c2e26c90b305864a3516c0ab77ddc5ebddcafc37c419b61c09792c17039bf7058a9fbf816eae1864a6e5dca37297
+AUX bicyclerepair-0.9-invalid-syntax.patch 340 SHA256 97f74cf713336da9e092823acfe31bf285535c30d1fbcf462ab6afec5a2a50ca SHA512 5204519af71984c9bc183ade57531955f3449d77f6e234d425f976c35c3a249a6d4dd90ad8e96a3f5d5ddb337612e68c241f0c56933f8ea2f3c4b5bb772df77d WHIRLPOOL 1b807937be1e2a1fdac87805eb4beece15f5553067bcafbe53b73abdc2d18872b09aad5056cf0e22ac14625b9f3b8a5f66498cc4dac9a15257834d35ea9fbc89
+DIST bicyclerepair-0.9.tar.gz 165025 SHA256 69509eebaeb595ad1d14291b47c6236df97abd5893352965055d91b0cfaea116 SHA512 e80495ccd01d72964eaf3dc8cc4430215ffb563710893c52141e8393125dafd085ba485a2228fed0ceb364515efe08db1947201e73f318498788a9e3581765ff WHIRLPOOL e5472d56559ce1a8ece9c07509cf7a27218d3bf73a25be23d9e8031e8e77d51f1cf14c8dc96e92d90280ffccd19633425a48589363d098cdbf3e6b91b48ac71c
+EBUILD bicyclerepair-0.9-r3.ebuild 1127 SHA256 3e0d8b8f08026f40c9cfd381f4e7d798f4167808ac30c2bcf506608a4bbc7356 SHA512 6a5baca6802600f4c0317ff4dc51f812c27cbc93a55a987b28a680947a39b766924feb81ad46a0ea3c850e11c80c2bbd2c8da45562e102b1ef4a23de76738181 WHIRLPOOL 1c636447746ba09a2bc17ef890c6132b4cb7571e76d4b5b7096ee0d1c457febd1a9937da1fca81fdb4118d85392ebb1f7d8e24415ff53d7dcc58080213094818
+MISC ChangeLog 3441 SHA256 0adcfb433d54e8a22495c63f80ed8363e2062070b401b093e9f46ba24116ef04 SHA512 15d577e33787b761a9b064be4bccaa5409d083841592b123a72ebdc2f5429b29e2e05c9b47df3ec19f98cc64c027e1f4b19122ed27c5d18a455ac294c7e14885 WHIRLPOOL 1f87b42ed1756810a3dafc8007b4ee59e0796b14a67e015c99b7d2640b8cf5ad5eee3dcaccb87649bc68d9e730f102928bb1b58f508bf0a6225945181e9a1253
+MISC ChangeLog-2015 4508 SHA256 11b88fae81f49cf96dde8f71177181c84d11086b7a30fcf56d468b92a01614c5 SHA512 a0a81daa2ce0d7a4ad289c2a9ecc4cdfa5b80e817dfdf74190deeb4da6a305fab59d3cf0438bd72f43205bc29b934d8c3f1a47a032a1887861a92d0fa9845a06 WHIRLPOOL 3aa9f6d618fdf8023ddfc1d51395860c80806ee2ae75c6cc9e9a1c0c66d1994446c3c21d4e01489da2a844de539c425fcd43e8a0ee96d6ac390ee226de3749af
+MISC metadata.xml 323 SHA256 cda253026179004c74c3f5bcdf78db606ae2d505ad4956a827627ee57a44d975 SHA512 37257b3ff5caf7b347efa06a5a3f53df261f1b29e1c93f828a9e1847551cf4db09854ec8979c66e6f54e38a2b1de4d3d7e381a892d3065ca8b3b1a5e5708da3b WHIRLPOOL 6def82542e6cde6437bbc42f1fa887046f7a04682b7fe91c5467e4842378346335447adf9df0c40217836a7718cda6cf2a6e8f4a46442d74c1dd84b18676c61b
diff --git a/dev-python/bicyclerepair/bicyclerepair-0.9-r3.ebuild b/dev-python/bicyclerepair/bicyclerepair-0.9-r3.ebuild
new file mode 100644
index 000000000000..32c6a6c8f2ce
--- /dev/null
+++ b/dev-python/bicyclerepair/bicyclerepair-0.9-r3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 elisp-common
+
+DESCRIPTION="Bicycle Repair Man is the Python Refactoring Browser"
+HOMEPAGE="http://bicyclerepair.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bicyclerepair/${P}.tar.gz"
+
+LICENSE="icu GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
+IUSE="emacs"
+
+DEPEND="
+	emacs? (
+		app-emacs/pymacs[${PYTHON_USEDEP}]
+		app-emacs/python-mode
+	)"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	"${FILESDIR}/${P}-idle.patch"
+	"${FILESDIR}/${P}-invalid-syntax.patch"
+)
+
+python_prepare_all() {
+	# bikeemacs.py contains non-ASCII characters in comments.
+	sed -e '1s/$/\t-*- coding: latin-1 -*-/' -i ide-integration/bikeemacs.py || die "sed failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" testall.py || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/bicyclerepair/files/50bicyclerepair-gentoo.el b/dev-python/bicyclerepair/files/50bicyclerepair-gentoo.el
new file mode 100644
index 000000000000..edad427b54e0
--- /dev/null
+++ b/dev-python/bicyclerepair/files/50bicyclerepair-gentoo.el
@@ -0,0 +1,10 @@
+
+;;; bicyclerepair site-lisp configuration
+
+(add-hook
+ 'python-mode-hook
+ (lambda ()
+   (unless (fboundp 'brm-menu)
+     (require 'pymacs)
+     (pymacs-load "bikeemacs" "brm-")
+     (brm-init))))
diff --git a/dev-python/bicyclerepair/files/bicyclerepair-0.9-idle.patch b/dev-python/bicyclerepair/files/bicyclerepair-0.9-idle.patch
new file mode 100644
index 000000000000..ff7e6f8d80bd
--- /dev/null
+++ b/dev-python/bicyclerepair/files/bicyclerepair-0.9-idle.patch
@@ -0,0 +1,41 @@
+=== modified file 'ide-integration/BicycleRepairMan_Idle.py'
+--- ide-integration/BicycleRepairMan_Idle.py	2008-07-21 20:08:33 +0000
++++ ide-integration/BicycleRepairMan_Idle.py	2008-07-21 20:15:02 +0000
+@@ -300,21 +300,21 @@
+         return 1
+ 
+ 
+-    def confirm_buffer_is_saved(self, editwin):
+-        if not editwin.get_saved():
+-            name = (editwin.short_title()or
+-            editwin.long_title()or
+-            "Untitled")
+-            reply = tkMessageBox.askokcancel("Bicycle Repair Man",
+-                "The buffer for %s is not saved.\n\n"%name+
+-                "Save it and continue?",
+-                master = self.editwin.text)
+-          &nbs p; self.editwin.text.focus_set()
+-            if reply:
+-                editwin.io.save(None)
+-            else:
+-                return 0
+-        return 1
++    def confirm_buffer_is_saved(self, editwin):
++        if not editwin.get_saved():
++            name = (editwin.short_title()or
++            editwin.long_title()or
++            "Untitled")
++            reply = tkMessageBox.askokcancel("Bicycle Repair Man",
++                "The buffer for %s is not saved.\n\n"%name+
++                "Save it and continue?",
++                master = self.editwin.text)
++            self.editwin.text.focus_set()
++            if reply:
++                editwin.io.save(None)
++            else:
++                return 0
++        return 1
+ 
+     def errorbox(self, title, message):
+         tkMessageBox.showerror(title, message, master = self.editwin.text)
+
diff --git a/dev-python/bicyclerepair/files/bicyclerepair-0.9-invalid-syntax.patch b/dev-python/bicyclerepair/files/bicyclerepair-0.9-invalid-syntax.patch
new file mode 100644
index 000000000000..c32fdb621217
--- /dev/null
+++ b/dev-python/bicyclerepair/files/bicyclerepair-0.9-invalid-syntax.patch
@@ -0,0 +1,11 @@
+=== modified file 'bike/query/getPackageDependencies.py'
+--- bike/query/getPackageDependencies.py	2008-07-21 19:37:44 +0000
++++ bike/query/getPackageDependencies.py	2008-07-21 19:38:11 +0000
+@@ -2,5 +2,5 @@
+ 
+ # fileInPackage is the filename of a file in the package hierarchy
+ def getPackageDependencies(fileInPackage):
+-    
++    pass
+ 
+
diff --git a/dev-python/bicyclerepair/metadata.xml b/dev-python/bicyclerepair/metadata.xml
new file mode 100644
index 000000000000..7bf4b4e5aa51
--- /dev/null
+++ b/dev-python/bicyclerepair/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">bicyclerepair</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/billiard/Manifest b/dev-python/billiard/Manifest
new file mode 100644
index 000000000000..7c63c7b87e9f
--- /dev/null
+++ b/dev-python/billiard/Manifest
@@ -0,0 +1,9 @@
+DIST billiard-3.3.0.23.tar.gz 151675 SHA256 692a2a5a55ee39a42bcb7557930e2541da85df9ea81c6e24827f63b80cd39d0b SHA512 2ab83512f5317230066f6f82615bda97c1fe6c0cf98281dc3ed486055584c6899695e6b9905d5825d657111c65c7f3552cf3fc7934ad2e4d4b3da09b538b09ca WHIRLPOOL 704a2b37f5bc176c273dd08509a7330d38ce79d0db98ffc1d18b649fa9b0b4fbcce81ec80fdf43acfeb7cc74e444fd29b1cadaaee88c37e56a234876b610bbfc
+DIST billiard-3.5.0.0.tar.gz 155959 SHA256 800fa0ac7b362585d43d2d4b8d6aeb5ada25796121956e15dc1e68cfe5319234 SHA512 c73adb0cd470e66cc6aaca848f24a991df3eda44e7adf0e83d2a7a1e87bba4381b165842e8cd297d43a4d01d4c006953107354b841cdad9fdde4e00e7a80c4f1 WHIRLPOOL 8b63cfd62dcf7f33c6441a6cc0f9fc6b668bef694c823ff6b3ffec3e6ea2d8c183639011d791038c621d83991ae686f9cfae50d8ece87b6c9ff373e935f55740
+DIST billiard-3.5.0.2.tar.gz 157299 SHA256 3eb01a8fe44116aa6d63d2010515ef1526e40caee5f766f75b2d28393332dcaa SHA512 581e1ac361324b36d79e280072952e490ef3470709b094f001c579feda54578c8e7b3e5afc93a5f878a6118c56afff7e59e13b3d3f2ccb2564b9b27cc810dae7 WHIRLPOOL fac0985819710e88d689f2aad628e6ed749f088b980fa09f169f74b962145d4a9cbbe10f5d290fdb0f62ea5b5a2e6d074c30c4a45a3a44db750c2b44e78b8f5a
+EBUILD billiard-3.3.0.23.ebuild 1491 SHA256 7cfa0e344892646767ef483a3f64e7544d595c27e0c5938979932fc2f5236197 SHA512 598c57c2272b62f0e32dde0178a10c16376a29686bed87c7fbf85ae3482c0b8e9cc826b7eb5347f73f6cf7dd5f2c0f45e0589c44b14f43b83ebebd95e22dc128 WHIRLPOOL 5fe5f48be274376f951a735b9c76eca4f66c4a715ef52137cb01fcfc1ec95ad56b4e186dd0ea8908ca445f6a9c2a824df39c8674bcd0fc671f19b65c811037f2
+EBUILD billiard-3.5.0.0.ebuild 1529 SHA256 99b60b803ac05f831ec5a0075fe9089be60704c6829214a82231c8b9bab28efd SHA512 5d8964784e0c43d99fa1dc137151b0ecd07dccffed6d06b87a78b8487c6f8469a11ea2043698baaab851582a2467a733a97dbe752f7bcb987535925fd0c6df02 WHIRLPOOL df00b86e09bd8f38a5c0c4ea26c77f9737b7c5bc9ffdbc5e3b3d259da9b0c7c662ac1436633b659ffae48f8bc443262cb38d44b252fa40c8dc7c745990c6000d
+EBUILD billiard-3.5.0.2.ebuild 1057 SHA256 21a0ac323c82bfe0636010902b5744754d9607822d09db45636f5870cb39cadc SHA512 fda43bbe0b76eaf2485604cbbc73cc1f6c4deaeb5908aa586377a15c4351c2b3a04025c1e589fcfa000cf7e9aee5b8018fb01c2234dd8c9e8029ca2165716de8 WHIRLPOOL 1a3c8cac102d8a2bcd33494df7c73b06739670f7f887149234e25f8fe6d88a37a27c2932d36766a45ddc8f47452d40cbd9654f1ebd7c606160e56bdbfd142bbd
+MISC ChangeLog 3886 SHA256 202ccd49055b8ae548e485a2470d6701368b1b39291bd03f55accd41ce2e7cdc SHA512 2ce71a4b7d457bbf0a389a3d255d7592b195d9dc5536db23a2aab1a310e70608573d044dbbe3d637483b2ba82108b73dc2df21c2d28f65ef58fabd67009abb0f WHIRLPOOL 5d90d2694188690a434c11de5dc5509665398dd6a5d3d9a937269c8b51c649dfa47b1745fb32995134df80d2b6c68de2d2d3d429edc175b9ca65bf998cd75731
+MISC ChangeLog-2015 5059 SHA256 085333549ebdfc34c01a82b54094ac25eeef18414cc376278a8acd3bf87afbd5 SHA512 8f529d8cd6e7cfdb798dfa3353bfb9111ae0ae81ae75698fa435cfbdac4a223e9d2d5595d5fcacc967bc8d3272707670d84a2ae7aeb69ba0d82e3eae599f699e WHIRLPOOL 5a5355dae150cce3965e7117ed170668f43428f0eb84298e9f558f4be93f4fc85f6a4a7644b9c4777ac54b5184133ce3fc1f6c1bade5308dfa7a1916d8b2919c
+MISC metadata.xml 366 SHA256 ba905787c4a0e5b90a11feb849c8a5564047d2a779a80801bb689068aefe0a8b SHA512 f9784ef6cb7607efaced1b96745e9fcbfb13cff64d2be2cefe2e28e5475d8386daa675592f22d8f7fa23949cb015de73583dd8ab392aa9b6383e0befe30dc8d4 WHIRLPOOL e03eb5b297cc0a690408c1af6ef3602243839d38d2d4716b7f19f5a5b8e30da246e66e6d47ca23bfd17341249b996bd202fab47a57b84eadbda6fce3cabc8dae
diff --git a/dev-python/billiard/billiard-3.3.0.23.ebuild b/dev-python/billiard/billiard-3.3.0.23.ebuild
new file mode 100644
index 000000000000..1aacacb2ae69
--- /dev/null
+++ b/dev-python/billiard/billiard-3.3.0.23.ebuild
@@ -0,0 +1,56 @@
+# 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} pypy pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Python multiprocessing fork"
+HOMEPAGE="https://pypi.python.org/pypi/billiard https://github.com/celery/billiard"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/unittest2-0.4.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.4[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy pypy3 )
+	)"
+# The usual req'd for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile() {
+	if !  python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx --builder="html" --source-dir=Doc/
+}
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	# The teardown in __init__.py breaks pypy's installed nose
+	if [[ "${EPYTHON}" == pypy ]]; then
+		rm lib/billiard/tests/__init__.py || die
+		echo "from __future__ import absolute_import" >> ./lib/billiard/tests/__init__.py || die
+	fi
+	nosetests billiard.tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( build/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/billiard/billiard-3.5.0.0.ebuild b/dev-python/billiard/billiard-3.5.0.0.ebuild
new file mode 100644
index 000000000000..c5b009379680
--- /dev/null
+++ b/dev-python/billiard/billiard-3.5.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Python multiprocessing fork"
+HOMEPAGE="https://pypi.python.org/pypi/billiard https://github.com/celery/billiard"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/case[${PYTHON_USEDEP}]
+		>=dev-python/unittest2-0.4.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.4[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy pypy3 )
+	)"
+# The usual req'd for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile() {
+	if !  python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx --builder="html" --source-dir=Doc/
+}
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	# The teardown in __init__.py breaks pypy's installed nose
+	if [[ "${EPYTHON}" == pypy ]]; then
+		rm lib/billiard/tests/__init__.py || die
+		echo "from __future__ import absolute_import" >> ./lib/billiard/tests/__init__.py || die
+	fi
+	nosetests billiard.tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( build/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/billiard/billiard-3.5.0.2.ebuild b/dev-python/billiard/billiard-3.5.0.2.ebuild
new file mode 100644
index 000000000000..c5625cdcc13a
--- /dev/null
+++ b/dev-python/billiard/billiard-3.5.0.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Python multiprocessing fork"
+HOMEPAGE="https://pypi.python.org/pypi/billiard https://github.com/celery/billiard"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
+	)"
+# The usual req'd for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile() {
+	if !  python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx --builder="html" --source-dir=Doc/
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( build/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/billiard/metadata.xml b/dev-python/billiard/metadata.xml
new file mode 100644
index 000000000000..cfb82b1ed07c
--- /dev/null
+++ b/dev-python/billiard/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">billiard</remote-id>
+		<remote-id type="github">celery/billiard</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/binaryornot/Manifest b/dev-python/binaryornot/Manifest
new file mode 100644
index 000000000000..e9db9fb6a896
--- /dev/null
+++ b/dev-python/binaryornot/Manifest
@@ -0,0 +1,6 @@
+DIST binaryornot-0.4.1.tar.gz 372095 SHA256 813e3d11a889b166ea210833b732651e2ed05df3b7a4f9c9cd3cd38be9bac723 SHA512 49732b725e7adc58fccc591c56bf4df65d1adaf3e5ce98e9f0a8aa2164e0f9bffcbcd6e793ae2cfc1ed90a5d74fb5899ec99de1b15bd3878a15c33f283319a45 WHIRLPOOL 53f7a2a3e108d4962f650b915e276a5cb6892670d6d26ac25672cbd3c9b7384916ad6e764231f83ba1b6bc1b6050806b0def666b7b7f2435d1f481c1a6fcf6fb
+DIST binaryornot-0.4.3.tar.gz 372299 SHA256 895aa79017f6924d888bf477d894de6871e17b0a909d790963c479ade34603c7 SHA512 bdb918b921fc46d056572b84126dbdc6605ec98cf13aac84f6f64ce07d083839be40bf7a08185eaabfbe136a9bcf0c1acc8041a23a6bb2843e8e72981222ebaa WHIRLPOOL 602dc06d8c4268e8df00adae18bc0acc2a413048e1f581bfa9d4877a0382908fbc0efe8886b852fe76282d18f58f51be93ffcb301ebc60f07adbaf784b988d8a
+EBUILD binaryornot-0.4.1.ebuild 673 SHA256 181078414d49a64455e18b2aa735f84802fe377c7bf29621019c6f9f41ecfdd7 SHA512 bb1f3d5d378559bad56e5884e87fb1f2090aa8afe4bbc5d8e2e720a4b58b970bf51d3252f7d8e8c3df44e279d34e09edf2e8ad122a2b9575b570f07a9436d1d6 WHIRLPOOL 07bff46b017f2cb61cedd580a0561ccda110920ec5ea842694689cb1a1228c9aec35b00f56bfb56111061069049489c1a77452380d37ff0889fb3c578f943f22
+EBUILD binaryornot-0.4.3.ebuild 677 SHA256 24d8a14b22f3e5655f3b98b654f0b54f59414078946430f5a4eeaccabe92847f SHA512 89231391bc20744b9409098dc27e94d95d41c42c620241713a9b86b21869d9cef758e04557833376e9dc663b59f2bacd2ec52e8f3d63baa4df51831a79bae253 WHIRLPOOL 4ac7892bfb0589f79dc3e177eab820dfd866292d8f30d2658e44d032e86b7f66c4ba6a0d75f0295c4a6519ab0cc7ad04a0cf6dc6c6fd1513e654a363a0d3e4e9
+MISC ChangeLog 321 SHA256 3a9a885120e35fb2efba7d87ce36a549fa8de753d9e4020aeacb41c0388c158c SHA512 3417f8827b7a36dd327bc2fd53db648d2c8a34c1c4f33dc65bb34b4aff0996c74b5893cee853eb68574603a56a959139a85f6914642a28bb93d19af526069311 WHIRLPOOL 63605dc2631aefcd4457e00cd3120d7e291ae798f7a717aa3ecf6bfbd6e2ead15461253509466b1693004a1f618071d84b478c8ac6c8545e334503257fee9f95
+MISC metadata.xml 324 SHA256 50f2bb0652f2b7dd264e29a1806a66decb65822f7384c48c6a82ec0388c59b4d SHA512 f20343e29c9a1d2bb354ecb3c308d5b21985deed5368d27dc144c3a6f2e236f30f7516e27a56e55be48fda32bd59ae9af96ff3b90ecf641bf57dc5b61a4267c6 WHIRLPOOL 25ec8a076c940d0b863ad55b029c88f749eaf17a224571c9db4e25a9414341570cc36e95192a44c787d7432644848e07ffd4477ec89376b6ffb9dac6f3301b90
diff --git a/dev-python/binaryornot/binaryornot-0.4.1.ebuild b/dev-python/binaryornot/binaryornot-0.4.1.ebuild
new file mode 100644
index 000000000000..c9713e935782
--- /dev/null
+++ b/dev-python/binaryornot/binaryornot-0.4.1.ebuild
@@ -0,0 +1,27 @@
+# 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
+
+DESCRIPTION="Ultra-lightweight pure Python package to guess whether a file is binary or text"
+HOMEPAGE="https://github.com/audreyr/binaryornot"
+SRC_URI="https://github.com/audreyr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=">=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/hypothesis[${PYTHON_USEDEP}] )"
+
+DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst )
+
+python_test() {
+	esetup.py test || die
+}
diff --git a/dev-python/binaryornot/binaryornot-0.4.3.ebuild b/dev-python/binaryornot/binaryornot-0.4.3.ebuild
new file mode 100644
index 000000000000..91e5e8d9d504
--- /dev/null
+++ b/dev-python/binaryornot/binaryornot-0.4.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Ultra-lightweight pure Python package to guess whether a file is binary or text"
+HOMEPAGE="https://github.com/audreyr/binaryornot"
+SRC_URI="https://github.com/audreyr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=">=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/hypothesis[${PYTHON_USEDEP}] )"
+
+DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst )
+
+python_test() {
+	esetup.py test || die
+}
diff --git a/dev-python/binaryornot/metadata.xml b/dev-python/binaryornot/metadata.xml
new file mode 100644
index 000000000000..64d17e0e40e9
--- /dev/null
+++ b/dev-python/binaryornot/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">audreyr/binaryornot</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/biplist/Manifest b/dev-python/biplist/Manifest
new file mode 100644
index 000000000000..06b547350caa
--- /dev/null
+++ b/dev-python/biplist/Manifest
@@ -0,0 +1,7 @@
+DIST biplist-1.0.1.tar.gz 16251 SHA256 41843579a531958bf0df88b471cf8d446723e640c73c469374e4ac313c33b6a8 SHA512 017bbea254f74d2c647322044a7b9a6006a0d69ecd44d1cd0281a3f30b38fd0feeef1b07272b9495440d3cd4434e2d4802681959b4185e2c354999884605a657 WHIRLPOOL d533fcfb05f52682bd309128463adb876a99d803c86118bdf92a90e6155b56a012b7bc60b7e1a309bca7169a560d500b2508e7b43bd5272f6780bc209ca96eb3
+DIST biplist-1.0.2.tar.gz 16246 SHA256 d2f974dd0972a70af6b8ff3b50ad165982bdba49ad8bcc47a58b28b9cc20ec34 SHA512 2418d24b2d9e36aad76ac6626e82b8f60f0c167636142a054b02de3437d117fa1ccfeb9c104801fe106fec2d7a31c2bdeaab27fd519f1bce3bdf8a3b90b42c27 WHIRLPOOL 02f0ba8a2e1209be947ff5a283e194b354c600a4d4bb32f23003c452ce100ed3483d41bfd2b4b3c2510744c5c530f59a0301613663debb7b22bbe2ffe9852f0d
+EBUILD biplist-1.0.1.ebuild 788 SHA256 44152265cb897dbe2290c3527f7518ab234d259551406c6c188ee62a32acd04e SHA512 396bc38d55128a32b01a1c716ed9e6fc8400e0d9aa182a1aeeed87c23c05b0f090a91e666522bfd1c58ab65f25c0f616ade8d9eebcee68ef17125d89e6ad5d24 WHIRLPOOL b5fc7f29418cf57587c2d75c54249ac2cbf811f1853600cb205461ea6ec66ff8f532a11a78b3f7c57d813a1fe6a03e9ca03ef4815fe50a2d0f74af312f3573f1
+EBUILD biplist-1.0.2.ebuild 795 SHA256 171d9f0501d1763af325704a39dd6dd0d76fd06e6a1e0b419d380b6623054cd4 SHA512 8db28bf8ffbed847490af822025d081055c6d9cf2034aaea8dc85408c31783be43f1235b18be09a92ae2004ad91c18d802b0d5b1f9ac7ac72ae84ede3efbe522 WHIRLPOOL f51db23477e427b88d35b5a7b9c72dba9c9da5cc659cfa39c7068babda7332880042ba3554662a5ae24eecec4be20f89c10c60f899ce6a7cca84b9dbb0d203f8
+MISC ChangeLog 3231 SHA256 600bece90dc15e7ed3dc26e1271f11df849e172e36eb1faf78deb077ef14a8ee SHA512 a33f8a75fdb60926a4f6d353ae1f0dce15563d70ff7d019959a4b73ec6546cf584782721d3037b9b71930fc120a92d497764f3ad6eba08156b64ab3219a0829b WHIRLPOOL 9c57b6affbfbadd05c8c6655cc35994470e4e5aecdc010c2697965be878a82d672143e5f8ce7f74fc86216233002a314b18872439d7733d197912bfa387004e4
+MISC ChangeLog-2015 1631 SHA256 3b4c04d6c525c88434f5bfc69b3c8b8fd62dfb3553a7e3df0ab05b7b9b4ee47e SHA512 82ced6e906cda2868a2c7da66d1ef97517da3cef34bb3df7645399ca62ed9f4792ac149df03a86f4e497a969c5fdb87872a0f93e4b86030d8b2c835e5d6ff7af WHIRLPOOL 4c0ded08d3da631f9603860e49aa40b7445a7a411e2bd90d899339dc678a426eec571603df93edc519e794067b7f4610870c064c90f0c3d203b45c3a2cd44d0e
+MISC metadata.xml 377 SHA256 6a3659ee15b83edf74dd61fcaac61170bace2f274f94918285428dde2fe6b173 SHA512 4adf5d21a3565339161bfcc8685e00ba88df7588f9a844d79572f7258fe38777fb99385377a175b7a52ce4815f38c8f54f0e1567e0637775dcbf1d8ff059dfd4 WHIRLPOOL c5fd48e172991a977b581018ad1a394ee895125e48d5d76d6bdb600f79b5427b1814dd86749ec102b3dfc03962e06d173168e3d962131df7b20e99bab14043ad
diff --git a/dev-python/biplist/biplist-1.0.1.ebuild b/dev-python/biplist/biplist-1.0.1.ebuild
new file mode 100644
index 000000000000..7a2b1df19f83
--- /dev/null
+++ b/dev-python/biplist/biplist-1.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A binary plist parser/generator for Python"
+HOMEPAGE="https://pypi.python.org/pypi/biplist/ https://github.com/wooster/biplist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		${RDEPEND} )"
+
+python_test() {
+	# This failure still occurs, after 18 momths
+	# https://github.com/wooster/biplist/issues/8
+	nosetests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/biplist/biplist-1.0.2.ebuild b/dev-python/biplist/biplist-1.0.2.ebuild
new file mode 100644
index 000000000000..d3a18dd6d5a8
--- /dev/null
+++ b/dev-python/biplist/biplist-1.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A binary plist parser/generator for Python"
+HOMEPAGE="https://pypi.python.org/pypi/biplist/ https://github.com/wooster/biplist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+python_test() {
+	# This failure still occurs, after 18 momths
+	# https://github.com/wooster/biplist/issues/8
+	nosetests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/biplist/metadata.xml b/dev-python/biplist/metadata.xml
new file mode 100644
index 000000000000..a90b0adc60cc
--- /dev/null
+++ b/dev-python/biplist/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">biplist</remote-id>
+    <remote-id type="github">wooster/biplist</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
new file mode 100644
index 000000000000..2aa1b2c4f961
--- /dev/null
+++ b/dev-python/bitarray/Manifest
@@ -0,0 +1,5 @@
+DIST bitarray-0.8.1.tar.gz 46877 SHA256 7da501356e48a83c61f479393681c1bc4b94e5a34ace7e08cb29e7dd9290ab18 SHA512 10f4872243b92cd5a1a77e1e2aca80135d31904e17cb3de4eb2c3f2c4d3f00ad0573b6bc4b9c9379594e2912cb0e5d5870fb4e59eb298e269ecb3778fbae7d1f WHIRLPOOL 93baffe0494872933e4726e9e8c37c3ae7969d621356e2a1b68b7056992d7bcb1e5362c9ae78265884c25398faddaaa7447a3e7c40b82a0528504a728ad8ada3
+EBUILD bitarray-0.8.1.ebuild 528 SHA256 32a9c7ca404a0abcdd0b591e70a9298aa4d2146c7f132433160ac6bc361ed291 SHA512 260f474143288cb752dc90ced359979f534b0b28f8a54aac5c2029dcee1703bb95cc63294ad2ad16cd7f103013d0765ada5061deb39ba42ce273273ad98f9295 WHIRLPOOL de4592b706b0652097029423e1f0f51320d9ee760a4052376a1befacb407c6b4ad8ef8aa14bf191e6895f2bae7f36d30c96dc01e2cd62ba62a409dbe07e578f2
+MISC ChangeLog 2705 SHA256 abda5f19e9b605cfc90d9d0f3c0210de1ad0d3ee57ec8690f4250b10d6e81a23 SHA512 be37b8f3cca4a120c4520a74908bb59d6aef064ac7ef22be4ba28a7015bad9b1c26b515d317277c6286c423cee18605cb385533ebfb49adc9fc463286c777436 WHIRLPOOL 749b96ce4cde238f2daf105753131d090cde6c6ea53d90d9474b460e1bd6b052b1693ff344730402901610adf103cde2d1f031a067c0ae6f35487decd22579b6
+MISC ChangeLog-2015 1391 SHA256 e2ec293908480ba840938d1ca76625ce851360a5c07243d0dfd7dfdeb8a54816 SHA512 a20567c61e76711f6658102b1c73dd69004dc846df35090a2c264bd0d4805260b5dec1e25175521e8b3aa740f7e511e2ee57a119611ba97be9ed9ba8ab9a76ab WHIRLPOOL ab0c40f8c432460243862b6306850dc5fce245481cc3fe326a5fad5001d9e15d04663efe25d9c4b0c2625f40e20a48f7d495fc01e46b99e459b6ecf0be82db75
+MISC metadata.xml 1194 SHA256 5e79dba29b0113d03571f3d2281ddb62e557113174559c9267cd5fb7d3dd79c4 SHA512 4a7db25dff2f2a47f76e52cbedb983b1b4514a8779a61c0ce9bd63955d67ca20ce4ea4c20cc4a71c5b0fbbbc0d98a65f8394479dc0a26bc843f3d0d830958d7d WHIRLPOOL ae1f3e9632e1836a28f54c749121b3aabb2015c36f0f903b9110245b5f2ce1d167ffa8392cbfde37d12c3910e84b482d7013f0b17e37ed9fe76c3d10ce0b2eca
diff --git a/dev-python/bitarray/bitarray-0.8.1.ebuild b/dev-python/bitarray/bitarray-0.8.1.ebuild
new file mode 100644
index 000000000000..13dc3ca656d8
--- /dev/null
+++ b/dev-python/bitarray/bitarray-0.8.1.ebuild
@@ -0,0 +1,19 @@
+# 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
+
+DESCRIPTION="efficient arrays of booleans -- C extension"
+HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.python.org/pypi/bitarray"
+SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	"${PYTHON}" ${PN}/test_${PN}.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/bitarray/metadata.xml b/dev-python/bitarray/metadata.xml
new file mode 100644
index 000000000000..a2a0e40b9ab6
--- /dev/null
+++ b/dev-python/bitarray/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+This module provides an object type which efficiently represents an array of 
+booleans. Bitarrays are sequence types and behave very much like usual lists. 
+Eight bits are represented by one byte in a contiguous block of memory. The 
+user can select between two representations; little-endian and big-endian. 
+Most of the functionality is implemented in C. Methods for accessing the 
+machine representation are provided. This can be useful when bit level access 
+to binary files is required, such as portable bitmap image files (.pbm). Also, 
+when dealing with compressed data which uses variable bit length encoding, 
+you may find this module useful.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">bitarray</remote-id>
+    <remote-id type="github">ilanschnell/bitarray</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest
new file mode 100644
index 000000000000..2a79784996c9
--- /dev/null
+++ b/dev-python/bitstring/Manifest
@@ -0,0 +1,5 @@
+DIST bitstring-3.1.5.tar.gz 761527 SHA256 b769620c1b52d6c1548c6c4f055613f4eee3120ed8a5cff4ba4ffbbc8a582286 SHA512 2c98768c98fc5ab99eeb4ac089ec66f091949e5e4f326563b1b480981ac2aa40258fe0065809eed9c08a71fae3cf09254a8a2465e86635db5287c0d2f241d75f WHIRLPOOL c059af1f54e46cc92acfbc40ef3e7461f6bd55739e552a8cc58dabe3bbd0140ad8d1084cd85540aebdfaf3fe68c98471679bc6db684190740cd55931285241d2
+EBUILD bitstring-3.1.5.ebuild 646 SHA256 e64314232ff3da089168218f6fd6150d3733ce00033619ec68208fd1188e8658 SHA512 1f6ccc08ed1c31fd3af653cd2773f65b2dc2ab0b414e2b2c78be40f0474ef9a01fffdccfb33a9f510463afd6ef6f8d60bb4142168b1fb67053906d4d35ab5d9b WHIRLPOOL 032d9c67889a9e9ebb3edb00cb4464f0edd64b5b7c0cad5503fa7f1322d30565007f453904c0e41a79ffa47772cca985511e01d7a8401fbf6bd37a2007fda519
+MISC ChangeLog 3445 SHA256 9753411cab38e522bce777fd3d37458832c0ccb3fba49146fb572072a13028f5 SHA512 097a509d8c29f4e714db6caf1cd6ef9f3dd0f24ee87d956054b477783e8b0fa597020ac8c2b058b43470116cf24211320de9f316291a68085c25f609ab221d4b WHIRLPOOL 4b405836c1894856f64d924c6461e5c71631ab6511b239694d60168c92e01436ab128a5e7eed31f1c0f1435a1df592e7514eb7d29e267cc915c3f32fe63f2b36
+MISC ChangeLog-2015 2719 SHA256 20af0ac894347ad55f3d777bbe14c5b7b2ce6a63f771b132ca416e579e43c620 SHA512 3654bb12dedf658ba0f8e6028eafde9f42931d63ca8797fdbb5b9bf4ac957bb51982fb28dbeb659dc21c2e83c51a925f939b118dbc85daaa2e65bac797af7f99 WHIRLPOOL 1c1e5a57c49168d411e44a4ef68ecb93cd4dbce00d5cbd0ce51a6df0ec9c220e4619f4f410d85e2c6c754cdd8782f7f03f8b545c1264f8ca4f2676c120e59fbe
+MISC metadata.xml 658 SHA256 b654acec7aa10e7b1b3fb899f884089529fb4ecfb7552cb321a74b726a69763e SHA512 aa31457d8e56b1feeb730b844e7845d9d1e9ebf46d36e5da57055e98c5887def1060e70574cbe5ca25a65e6b6ec2b7963241094f6c0e4d981b536b3190fee9ed WHIRLPOOL 71b4251d8cc3d3ee258cd9525a67386be02e90edb7e575668faf6c98eab5343517345bc5ba51486eaf8ca21fd92a20b38c7a2cd8c1527faff951c7de3d94c267
diff --git a/dev-python/bitstring/bitstring-3.1.5.ebuild b/dev-python/bitstring/bitstring-3.1.5.ebuild
new file mode 100644
index 000000000000..d783f7b9e9df
--- /dev/null
+++ b/dev-python/bitstring/bitstring-3.1.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="A pure Python module for creation and analysis of binary data"
+HOMEPAGE="https://github.com/scott-griffiths/bitstring"
+SRC_URI="https://github.com/scott-griffiths/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}-${P}
+
+DOCS=( README.rst release_notes.txt )
+
+python_test() {
+	pushd test >/dev/null || die
+	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/bitstring/metadata.xml b/dev-python/bitstring/metadata.xml
new file mode 100644
index 000000000000..0f0375681f84
--- /dev/null
+++ b/dev-python/bitstring/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grozin@gentoo.org</email>
+		<name>Andrey Grozin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>A pure Python module designed to help make
+	  the creation and analysis of binary data
+	  as simple and natural as possible</longdescription>
+	<upstream>
+		<remote-id type="google-code">python-bitstring</remote-id>
+		<remote-id type="github">scott-griffiths/bitstring</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/bjoern/Manifest b/dev-python/bjoern/Manifest
new file mode 100644
index 000000000000..7a9b528baf02
--- /dev/null
+++ b/dev-python/bjoern/Manifest
@@ -0,0 +1,7 @@
+DIST bjoern-1.3.2.tar.gz 25878 SHA256 bb272517760897a96b3fbf0564236a4f9e0e14e05d8cdcc5f9ac2957ff0c89c0 SHA512 f96ab7f6bfdd158da398c56555a47944f30ac505ed3cb8610a3fc12fe15d5a7bbb0cdba27c858e5ccac28213504b2c68aefd0c252591e3e4d63ce70c8ac840cc WHIRLPOOL 1121cc2088686532dca96b3db4116272c162b23c327a33335763237a45fd1b12a9b0e16b5f4e901fdd162ad923238f7637b29d3190ba6fb6538cb46cd809be83
+DIST bjoern-1.4.3.tar.gz 28824 SHA256 9361dc1e8ef22eb749fcf3d16b9023bb1d1c59916b4e32400902648b4805fffd SHA512 a044067b18aa7ad9159a8682005137afbe99774804da8dddda4a4dab0ab34f52581e6bf9d9a5a7a9a13775408de2b88204f8c9f5a64f7e72bd21fa97d1e52b58 WHIRLPOOL 577d5216163a3c233fd068a8f3b392114da19eace76de078f989a93bdcfedc575f39c9aaf1c4d1ee0bb88671539a56ad71c3bb57d97478358c3955062f365045
+EBUILD bjoern-1.3.2.ebuild 489 SHA256 b09f4710d6e70308d29ce3bfcc6cb716624c92e80b804f26d202c011ad33585e SHA512 fc24eac57b675fb46222e2efd2f6ed38457bbf86615c0556a29aaa4ddd40845317acf6e7f5b018d38bdeb78c1cd4a597d9ae0a61b5e07ef5aba209705578f678 WHIRLPOOL 05de60e24afea63adc7d88a7521de84b236865499781d7b630e98d219a6c0b2e2092cfbbcb319e6d178c2448a7e01657fc3b3bd2161cb0c0d6157e3242cde45e
+EBUILD bjoern-1.4.3.ebuild 491 SHA256 48f5605144e19ae324c13339df2d1f5810edcf33191226e7957d03a09c13bb2c SHA512 dbfc47e9edec7fc969570f8bad57abf91ea10cb73675f06b5de78af6b4b68b53d0e063eb41432a4a312493db8d9fda56326900588973c00cc896441657744518 WHIRLPOOL 6a055a3a84028ef574521f512c09690d7677fc33e2f9a9699c4677e35cd0446d57e58f3337951a84854543bcd32f39dd9dbd04e8ca9e7e915e7535ae6faae0d1
+MISC ChangeLog 2623 SHA256 4301f289641c1868ce1ff57c65ff2cee639fadc06cd4ee3588ad49ccad5b3131 SHA512 42e56282f6d40055fd186895aae7f16013ffe5ca8937dc623249290be4c856d7fd69e111fe9c3567df701b31abdff0ab4bbf42075724db1e31e7db6e87b4658b WHIRLPOOL 8a3496aa43e4718232774dccbc57889b75b78b4304d910bfa90e5a723269f10cfccb1d9357b622cd0d688a1ff0da1522469410a6f4243b56a62455400eec2c73
+MISC ChangeLog-2015 1091 SHA256 0bfd572f665453511599f1aef1ac8fe81ffecaeb3ee1c1aef9aa06f07e98641b SHA512 d0c2b699a7533f776eb4fcf9b87e17da0b08ba520bb5eaa7c3ac4b71dad3aabd5faf6e38edea3c07734844d40673a7abdd309b0d2d58627f8912774df611636e WHIRLPOOL 21d2bce7a530611b2befc6bd828d21b6c6c32657a67920fb3cff230fed950a4409fd4e9c64208ba673d74640c1ae07677d8daf94e89f84a511a9a811392ceaca
+MISC metadata.xml 377 SHA256 a19e56dd072846d0a0d9354b57c3f10a34e5829a271832d90708d548416a758b SHA512 d7ce5899f15015e2683744f01807d0f452f8935508fbc2d2372ae0e1e6a71be9673ba9a71b4edaffba95c1c499e9226392fa77f7a38f9a8029344554ddbf9b83 WHIRLPOOL e63b9ceb5fc54cc9623d8f9f29e455f6e8867af8156b460c82d5dff77e23f3eca633c44cc006e7459a9d95005e8df5d1985c670311f5a66d1384c5e707525473
diff --git a/dev-python/bjoern/bjoern-1.3.2.ebuild b/dev-python/bjoern/bjoern-1.3.2.ebuild
new file mode 100644
index 000000000000..b9cc33557175
--- /dev/null
+++ b/dev-python/bjoern/bjoern-1.3.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="A screamingly fast Python WSGI server written in C"
+HOMEPAGE="https://github.com/jonashaag/bjoern https://pypi.python.org/pypi/bjoern/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-libs/libev
+	net-libs/http-parser"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/bjoern/bjoern-1.4.3.ebuild b/dev-python/bjoern/bjoern-1.4.3.ebuild
new file mode 100644
index 000000000000..39a4def0e528
--- /dev/null
+++ b/dev-python/bjoern/bjoern-1.4.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="A screamingly fast Python WSGI server written in C"
+HOMEPAGE="https://github.com/jonashaag/bjoern https://pypi.python.org/pypi/bjoern/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libev
+	net-libs/http-parser"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/bjoern/metadata.xml b/dev-python/bjoern/metadata.xml
new file mode 100644
index 000000000000..366764578b3b
--- /dev/null
+++ b/dev-python/bjoern/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">bjoern</remote-id>
+    <remote-id type="github">jonashaag/bjoern</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/blaze/Manifest b/dev-python/blaze/Manifest
new file mode 100644
index 000000000000..df41f9400576
--- /dev/null
+++ b/dev-python/blaze/Manifest
@@ -0,0 +1,9 @@
+DIST blaze-0.10.2.tar.gz 9681767 SHA256 c525fe93b35f1bb755cfc06f8c6094b16f8255ca870026a008d0a5fb3f440834 SHA512 01b7c5563f928c336f13eb13c6397f1089bca7c1cf0824da672acdabf28b18356c52678c58b2fa7af303601c6013e9d6f4fe26359ee6ab9a01f8b735c7d24a56 WHIRLPOOL 7dee091947694a6145fdfbb78539099c517701f4d4a696141c761ca2672bd622ed3f8aea15f743a37805769341f37e8a28765eeafb89943f9f8c568c071e160c
+DIST blaze-0.11.2.tar.gz 9687465 SHA256 9ea0f73f59e5f426d34ad1f63bf26b1df89853fd926469aff82b1ef892bac5d0 SHA512 aa4e6a06ed8456d73f98bd2a06c236f9a7cc212ce23d53f9212331045e904faa1ecd7998111a7f58b4d76c3c0cb72a0904f829d6dd729f43e91a284b0f3f9819 WHIRLPOOL 2138f19c37d32abc181843f3dc2c255179b7e9bc5dcd65c69a341ec8ca5e4e1ea8eaac98cbcf10ea439554a48122448ba1dd991cbedb57fd27314b5413c61861
+DIST blaze-0.11.3.tar.gz 9691443 SHA256 9c3725759d20ecf164b38c125a0417c2d294f0fa657367c92748bcd312c3af1c SHA512 030079e5d3f17355dac588154ffb7ba7993935dfd39bce141341b6e2b9a17f812982ce83776ac1e4224649a343b58615621347ba65e5aba2ca2e568d755f276f WHIRLPOOL 69858f0ec062e84ffc791e7fde474b6cd8d7fb4ceb0ab070414a395c2a1b703291aeaa22658d365495f41508fda574f5e785ab3da9e7dd0b2c6cdcd8bd5074c6
+EBUILD blaze-0.10.2.ebuild 3169 SHA256 f5ee3ffa97c77110b28f19eae8a8bc0dde1e728d8ed793dab74025300b78d6ae SHA512 53c7041857c51de3cc55485f4a235f92c44320ac1c802fa37b6bd716ff0a2e5e275d2814eb7324da169761f096f440d2601b504ecbd2ed5ae50ca90a4778dd98 WHIRLPOOL 00f0fcfcc322a8b1e411bd4c2c91038a9813a1ac145f78c3171f75e68c08b86959c05a55ca851f3dead5d7bd4c7ed33e0cd54f0a2a1152505e85db7f69ccef25
+EBUILD blaze-0.11.2.ebuild 2165 SHA256 d9db74fd4c85109e40f4c9cabebe5785dd2ced48e1eddab92d6b1094a170f98b SHA512 efbfd0dacc0fd89f53be928061ce9ed31ad0b3ce77a07eba213b0e8fb33aaf2c28b32405ce78c8b5150ad2b893a393bffe54446ee5f0fca7d734b021544cdb2b WHIRLPOOL 4a8bbc1ca34ef3b416b638b293f235fff10a48379486ea07f1210208025f3a0cddc983bd6689326dfe2386f16b0209ebea73fdd6b01805af0d11cd3ff3149534
+EBUILD blaze-0.11.3.ebuild 2171 SHA256 598e7343c29dc57789042f16e8b59acb9dfe44838e6e17e3d357eed221dbde35 SHA512 2ffaccda982d3a34f5ea2cf19298f724e533541700af2b0b5a7a0e7a6840f3a59300846a72a32ed9eba06f0fe747d91d1bdc54d1b94b7643db907f968863b3a3 WHIRLPOOL 6b4aa60a1706e128916fba6bcd1b2f5d1b6f6a58c2064e12ce1590e4ff72be393f70fa75e3351380e8b9ba8329dd8d60b68662aaccf80b61c4e75c56eb2ed8c9
+MISC ChangeLog 3278 SHA256 68d939caf88e5f503ab2b5e86ed54c8bdbb47f548d29730540884b8adb16eb1c SHA512 e3f38ec31033f34c1eb41aa0511c61fe079052d0bb01c56cd16b9f5ea849bb574688ac4f71380f93d17a748cbe66fa1f627dac7f9f72590651fa60791be277a1 WHIRLPOOL 27ad5c842ddaf6d9afed0adc2cf1d29bac55e353ecde7da49a384224a1239a187d737b0370dd0e4275548a7f85cea84cab1d8894c177732db86d055cf1f8ea91
+MISC ChangeLog-2015 3555 SHA256 2189eeafdca9bd8b3b9e803c285f01629ef57bac07a51b18e20258376bfcbc6b SHA512 520223f140dec5f1cc1648bbaee0907de6398b8a7ab483b82aaf588a3a3a70eb8ced86d0f490f06e1bece2a604e801d5f7bc3802070ee1978d9562258ce3764d WHIRLPOOL 0c95428e0e008b257c041999482aefb6549ef4f4ebea1715aa70645967d1a108633c2165c0c96a48d445a66a8c03fed2663e3d1bf1f952769e0dd5db1e38dd55
+MISC metadata.xml 619 SHA256 83aaf883bc946c1a6a784bd7621be6ffe5dec3c1f12ee295a0f2132ff2d8b3c2 SHA512 2fe8804a4e526991e088834f7d3a49a1273c8da255df259a3552b4a4613bf0386bf464e025e191eb0087258b53a003efb0b6ed1afdb5ceb5e9e7c1c9ebeda7b8 WHIRLPOOL f96ff4b77ad2dd84743b163e60fb13e95b32e338d4614af0fb9b13dad88a1a3c09c777af908fd1439b7be20072a01838d06782b45472c457814a69edccd0da12
diff --git a/dev-python/blaze/blaze-0.10.2.ebuild b/dev-python/blaze/blaze-0.10.2.ebuild
new file mode 100644
index 000000000000..8acdc8f11a4a
--- /dev/null
+++ b/dev-python/blaze/blaze-0.10.2.ebuild
@@ -0,0 +1,84 @@
+# 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
+
+DESCRIPTION="Next generation Python numpy"
+HOMEPAGE="http://blaze.pydata.org/"
+SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+# Currently doc build fails, reason now, attempt to import mystery modules in datashape
+# Leaving doc build content in case this is fixed
+IUSE="examples test"
+
+# pyspark appears an optional dep not in portage. pyskit appears to be dropped
+# some packages including pyparsing appear required despite their absence from requirements.txt
+
+RDEPEND="
+	dev-python/datashape[${PYTHON_USEDEP}]
+	>=dev-python/dynd-python-0.6.5[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.7[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/toolz[${PYTHON_USEDEP}]
+	dev-python/cytoolz[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.15.0[${PYTHON_USEDEP}]
+	dev-python/h5py[${PYTHON_USEDEP}]
+	dev-python/unicodecsv[${PYTHON_USEDEP}]
+	>=dev-python/multipledispatch-0.4.7[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pymongo-2.8[${PYTHON_USEDEP}]
+	dev-python/xlrd[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/into[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numba[${PYTHON_USEDEP}]
+	dev-python/bcolz[${PYTHON_USEDEP}]
+	>=dev-python/odo-0.4[${PYTHON_USEDEP}]"
+DEPEND="
+	>=dev-python/cython-0.18[${PYTHON_USEDEP}]
+	test? (  ${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/contextlib2[${PYTHON_USEDEP}]
+		dev-python/dask[${PYTHON_USEDEP}] )
+	"
+# It was found on testing that dev-python/chardet is required for tests
+# despite not being inlcuded in requirements.txt
+# The doc build now fails due to dep bokeh failing to emerge. Deleted.
+
+python_test() {
+	# https://github.com/ContinuumIO/blaze/issues/1117
+	# skip test requiring a server daemon
+	# Tally of known failure reduced to one under py2.7 (test_highly_nested_repr)
+	# and 2 under py3. The failure of test_query_with_strings persists
+	# under python3 and appears to be unaddressed upstream.
+	# Changes in the suite in this version require PYTHONPATH set to ${S}
+	# to avoid spurious errors resulting from the change of path set by the eclass.
+
+	einfo "The test suite has 4 additional failures with package numba installed"
+	einfo "Upstream have been informed via /blaze/issues/1117 @ github.com/"
+	einfo "For optimum results, uninstall numba, but it counters protocol to exclude"
+	einfo "dev-python/numba from dependencies in the ebuild"
+
+	PYTHONPATH="${S}" py.test --ignore blaze/compute/tests/test_mongo_compute.py blaze \
+		|| die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( blaze/examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/blaze/blaze-0.11.2.ebuild b/dev-python/blaze/blaze-0.11.2.ebuild
new file mode 100644
index 000000000000..99732c0b7060
--- /dev/null
+++ b/dev-python/blaze/blaze-0.11.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Next generation Python numpy"
+HOMEPAGE="http://blaze.readthedocs.io/"
+SRC_URI="https://github.com/blaze/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="examples test"
+
+RDEPEND="
+	dev-python/bcolz[${PYTHON_USEDEP}]
+	dev-python/cytoolz[${PYTHON_USEDEP}]
+	dev-python/dask[${PYTHON_USEDEP}]
+	dev-python/datashape[${PYTHON_USEDEP}]
+	dev-python/dynd-python[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/h5py[${PYTHON_USEDEP}]
+	dev-python/into[${PYTHON_USEDEP}]
+	dev-python/multipledispatch[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numba[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/odo[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pymongo[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/pytables[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/toolz[${PYTHON_USEDEP}]
+	dev-python/unicodecsv[${PYTHON_USEDEP}]
+	dev-python/xlrd[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/contextlib2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	cd "${BUILD_DIR}"/lib
+	# trying to skip a few tests which spill errors
+	py.test \
+		--ignore blaze/compute/tests/test_mongo_compute.py \
+		--ignore blaze/compute/tests/test_core_compute.py \
+		--ignore blaze/tests/test_interactive.py \
+		blaze || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r blaze/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	rm -r ${ED}usr/lib*/*/*/blaze/examples || die
+}
diff --git a/dev-python/blaze/blaze-0.11.3.ebuild b/dev-python/blaze/blaze-0.11.3.ebuild
new file mode 100644
index 000000000000..57b775b4bf4b
--- /dev/null
+++ b/dev-python/blaze/blaze-0.11.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Next generation Python numpy"
+HOMEPAGE="http://blaze.readthedocs.io/"
+SRC_URI="https://github.com/blaze/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="examples test"
+
+RDEPEND="
+	dev-python/bcolz[${PYTHON_USEDEP}]
+	dev-python/cytoolz[${PYTHON_USEDEP}]
+	dev-python/dask[${PYTHON_USEDEP}]
+	dev-python/datashape[${PYTHON_USEDEP}]
+	dev-python/dynd-python[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/h5py[${PYTHON_USEDEP}]
+	dev-python/into[${PYTHON_USEDEP}]
+	dev-python/multipledispatch[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numba[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/odo[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pymongo[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/pytables[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/toolz[${PYTHON_USEDEP}]
+	dev-python/unicodecsv[${PYTHON_USEDEP}]
+	dev-python/xlrd[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/contextlib2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	cd "${BUILD_DIR}"/lib
+	# trying to skip a few tests which spill errors
+	py.test \
+		--ignore blaze/compute/tests/test_mongo_compute.py \
+		--ignore blaze/compute/tests/test_core_compute.py \
+		--ignore blaze/tests/test_interactive.py \
+		blaze || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r blaze/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	rm -r "${ED}"usr/lib*/*/*/blaze/examples || die
+}
diff --git a/dev-python/blaze/metadata.xml b/dev-python/blaze/metadata.xml
new file mode 100644
index 000000000000..28e878b0bff7
--- /dev/null
+++ b/dev-python/blaze/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  Blaze is the next-generation of NumPy. It is designed as a
+  foundational set of abstractions on which to build out-of-core and
+  distributed algorithms over a wide variety of data sources and to
+  extend the structure of NumPy itself.
+</longdescription>
+  <upstream>
+    <remote-id type="github">ContinuumIO/blaze</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
new file mode 100644
index 000000000000..d16c84f6c0c4
--- /dev/null
+++ b/dev-python/bleach/Manifest
@@ -0,0 +1,7 @@
+DIST bleach-1.5.0.tar.gz 36502 SHA256 978e758599b54cd3caa2e160d74102879b230ea8dc93871d0783721eef58bc65 SHA512 572a089691af61f096716d96517a96755fe674cc471bdbcff80615ae903eaeff72c47b918ee28a1db60ee5c0253c0c52ba02544f8535ae4f283a3a87a3061124 WHIRLPOOL 9003f026686cd4fbff6c12c16359114df7414ca7e9363ed16197137aea8da43aa8374ddd6f0f26258ac89d4edcb7a82b2a252cde031432e6770781116c2f8e4e
+DIST bleach-2.0.0.tar.gz 46083 SHA256 b9522130003e4caedf4f00a39c120a906dcd4242329c1c8f621f5370203cbc30 SHA512 78237c72224fc8facd0c247671c0e2deb66dc8dc46c446cfa7e8b83cce5ca99a52fec320ef59ae0ece47c54a48120de16e4393e269db9c74542c8165eeb96d2e WHIRLPOOL 59636a228cbfedc7eca076a4f3e67d42d49c3d51134528c6e051573a5ef5d2921a488248dca26f6af5c88a1342d10e57fb8a543644f31b7bf3146823b42c4b79
+EBUILD bleach-1.5.0.ebuild 776 SHA256 5fbea00109dbe43273619ce9b366fb9fbe324dd9a494b742fa5035076affe6d8 SHA512 582628df9c3cab952ecf07ea10fd7ba74debe71ad8ae261ab9a49dacedd76245a408a9a0319730ea484bab161a779f992bdadbd0447ca4b2c59dba755e2af484 WHIRLPOOL 0c738ba23c2f732457b849dae832802571e87f91f00e1ff1fc47571facaf636ead3542177157ce9995209d14a3a570a96b9bea611964e2cd7d5f297f68ed350c
+EBUILD bleach-2.0.0.ebuild 777 SHA256 7c628665222a724d1ccfed3929e0e26d3f20c959c5142b6dfc5654476fa820b4 SHA512 05035206b491762829c539d75a92d3516292560f9ee3f4dd354892db00c5c94eab4e2a71bf3a42efc04437863d3e7b4625783fab9f2e986221783fbec76c90fb WHIRLPOOL 48d3e6428c1357b990cef0d5d474f0fb43370b807540831e391eb952ee720ec9431088535970de1cd682ec37350154b96f46d436dc1d0b567806aa35384b8036
+MISC ChangeLog 3275 SHA256 be17b256b673f55023c80e178558a9d953ee38d6b83703de45db331eab478650 SHA512 9082441fb5a7f8f694563860d8ab77a996d4056f176f5bb1909b6eee7e1c9cbad469367194bc5751edafb515e6519942b0a272de9c82447ba5f821f597879630 WHIRLPOOL 4a85fa993584a91e2fe70dc0021ee3e9befb57096e3dd92f7969377c4042bdb6dba4c8291348d810b6be9d3effc9cac7e07c1cf2535b226db015377336bb2395
+MISC ChangeLog-2015 827 SHA256 61dfa937024850a217970e390f7c288c3e2cfed28d5de4cd40a3a5f7b9a3625b SHA512 0ff6260070e27e16fbf822f712b22dde01bbff0f0bfd949103e4a9edf47817ed34e083e012fa75736bb9b183c73870771522ff5c4e76b45108430a516997fb75 WHIRLPOOL f8ab52f8d9414371fb5d16d19daece621d0503424cadd04ebd9eebacf9bc431c0145b4bcc201df80242983c19c942a420ef939bf6993b1c77ebf816b3a061c2d
+MISC metadata.xml 375 SHA256 7e2c378b43f9487b853f919176fc6fb401f31d94c8d75463f136cbf25b4ba64b SHA512 9f8329e1fe0a9a7a6268dee15c098bdd7893da00a3c4f4dcab207586dccc5f6b471754be0eacb21fbd7fcce5e3130a631fbf1fe60a27ea525552d7ef2d9c173a WHIRLPOOL e0acb2979df522512ef421985850c63ffda3c80b861aa009c3a259d6b3c81c51efa9c0c6c200752e9b2aef3464c5b100942469f3439eefb979db01556a77ca9b
diff --git a/dev-python/bleach/bleach-1.5.0.ebuild b/dev-python/bleach/bleach-1.5.0.ebuild
new file mode 100644
index 000000000000..d2ba5b19dee3
--- /dev/null
+++ b/dev-python/bleach/bleach-1.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
+HOMEPAGE="https://github.com/mozilla/bleach https://pypi.python.org/pypi/bleach"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/html5lib-0.999[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-3.0.3[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	py.test -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/bleach/bleach-2.0.0.ebuild b/dev-python/bleach/bleach-2.0.0.ebuild
new file mode 100644
index 000000000000..1d0c20cec345
--- /dev/null
+++ b/dev-python/bleach/bleach-2.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
+HOMEPAGE="https://github.com/mozilla/bleach https://pypi.python.org/pypi/bleach"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/html5lib-0.99999999[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-3.0.3[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	py.test -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/bleach/metadata.xml b/dev-python/bleach/metadata.xml
new file mode 100644
index 000000000000..31fa019aef43
--- /dev/null
+++ b/dev-python/bleach/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">bleach</remote-id>
+    <remote-id type="github">mozilla/bleach</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/blessings/Manifest b/dev-python/blessings/Manifest
new file mode 100644
index 000000000000..97e7d13a2414
--- /dev/null
+++ b/dev-python/blessings/Manifest
@@ -0,0 +1,6 @@
+DIST blessings-1.6.tar.gz 19974 SHA256 edc5713061f10966048bf6b40d9a514b381e0ba849c64e034c4ef6c1847d3007 SHA512 5d0fc365416bf2b36b6de72f6b8c01bf0ab8df4a0148f492c80056a9ebd5d569e9c01966481e0d70a25add16da2bc3e73be933226369abca533ce019f97479f2 WHIRLPOOL 44dc96c1da174465b5dc3dd38c4d7ccc17408d072d290819c52d33e7e249bbbf428c7ee217faf3ec6acbe1e620b5e0cb2627c4dc3f0162cb21a810ce50e8b1c6
+EBUILD blessings-1.6-r1.ebuild 806 SHA256 26feeaec40913c05fd269d89212b4c90ccb76d659dc096665ce8f2de4358f1b2 SHA512 12c6fbf795832a7c7beaec8937cc1e42dd9a936d74fbc2c924579af922a25859541bea7d790641dcfd0297727cf226813528c177e2440868d506d2b1af81a21d WHIRLPOOL 6d47d5ce2fcf5f268faa8ee74399b4439720d7ac7a905f36506d35f4cde8869bcbf9115c80e1036ecd3ecf35bd6129277c978413e4950b67c71c295afa994161
+EBUILD blessings-1.6.ebuild 758 SHA256 a42df8d0703e356edfa8f93ce9566c9b20d761996b280609876e33835affcb16 SHA512 28a4985262effff9489e7d22a2ae54949d5db3e718bcfaa866a921ade80451205346f09f367ede77bb68ad6bb38135636b73d6edd1bf5d32724cb975ea300bd1 WHIRLPOOL a74b9eaf6027457b1f0fb74e444b82f6f2b42ea5c4cba988ac5c0c77ceb883364800febc0f05f73d9373d24f6f596310df2e9f332c07339f5caf77c8999b9c0b
+MISC ChangeLog 2835 SHA256 bd37f2819af8f76d97b8e888a165f1ddbeff619965318c54d2ae0082787c87f4 SHA512 d49f37d40dc127b172aa76bfbf76a559a51f27543019857b091ecfab9d112ae1f09758bfa8acd21b7510440b4a36b7b2f8cd9378e4539443e8b1f0abf328e520 WHIRLPOOL 44258342d910eba2155a03435daff53604066aa82258225903e3db733b91ecfb9ed9bc9ea3adba7a28074518bad4d7b8d62535fd68bfa2f33f1703797712d502
+MISC ChangeLog-2015 684 SHA256 e1b88cda02b494799da8d76fd702549a4b4beb13f610c3aa3b0b27571a05fdd4 SHA512 0e1106119acdfbea1418f75e1e4562390a6a90394350334c4206fe924638ebf203ba1a43bc4d7bf1f18406078b1b254e1c82d4aaa2b553777c320f606fff1e61 WHIRLPOOL a2ec12d15ba84dcb26866c6dd2d27969637a2c56b47178f78d7f857d4817fa93caefc572e707722cfbbffc7e3352dd0958d8c5b6b0363719b7de35877fcebc14
+MISC metadata.xml 450 SHA256 e9202497c4a58f981789a28abd6cb20bd7729a205955a60b879e07f31caf695e SHA512 8851fc3ed67dbdbe0efb8fd1712101644793086e6d84fe52fd54d741d81f4c30bb666e1aa82bfc111e2f264e3a238c6059d8be6844a05819b285cc913ade0231 WHIRLPOOL 1bcec333be5ede1f44a98b93d611ce55ac2f2fc152a768bd4768e34f52d4f533fde441483ccb67c2466456e9aef607bbd000cd963a3b7460012db28e432deae5
diff --git a/dev-python/blessings/blessings-1.6-r1.ebuild b/dev-python/blessings/blessings-1.6-r1.ebuild
new file mode 100644
index 000000000000..359099b28654
--- /dev/null
+++ b/dev-python/blessings/blessings-1.6-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A thin, practical wrapper around terminal coloring, styling, and positioning"
+HOMEPAGE="https://github.com/erikrose/blessings https://pypi.python.org/pypi/blessings/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	# The tests need an interactive terminal
+	# https://github.com/erikrose/blessings/issues/117
+	script -eqc "nosetests -w \"${BUILD_DIR}\"" /dev/null \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/blessings/blessings-1.6.ebuild b/dev-python/blessings/blessings-1.6.ebuild
new file mode 100644
index 000000000000..ac8948b45395
--- /dev/null
+++ b/dev-python/blessings/blessings-1.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A thin, practical wrapper around terminal coloring, styling, and positioning"
+HOMEPAGE="https://github.com/erikrose/blessings https://pypi.python.org/pypi/blessings/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	# The tests need an interactive terminal
+	# https://github.com/erikrose/blessings/issues/117
+	script -eqc "nosetests -w \"${BUILD_DIR}\"" /dev/null \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/blessings/metadata.xml b/dev-python/blessings/metadata.xml
new file mode 100644
index 000000000000..b873a1b476ed
--- /dev/null
+++ b/dev-python/blessings/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">blessings</remote-id>
+    <remote-id type="github">erikrose/blessings</remote-id>
+    <bugs-to>https://github.com/erikrose/blessings/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/blinker/Manifest b/dev-python/blinker/Manifest
new file mode 100644
index 000000000000..b081b6408ac6
--- /dev/null
+++ b/dev-python/blinker/Manifest
@@ -0,0 +1,5 @@
+DIST blinker-1.4.tar.gz 111476 SHA256 471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6 SHA512 2f5f71b05c7cc27f5761ba698b05c78c8a491f5285c120e532d24be0c8256daa14e075f3f30e15fb18e7c3f16579af9378a155d058f170e3af9ffdb89e49f56e WHIRLPOOL f9554c6476310c82d8e66cea7d57297478373543b894ba8993bd3b390078ccc0b997eaa4ddfc849acfdf7687be3e61ce89303161a4117dcd02f9363440c4cf6a
+EBUILD blinker-1.4.ebuild 736 SHA256 07691736841109fc54b9f2d846b8eefadefa11aa23e8c3e9b7593adca20b00bc SHA512 578144d18da05e8a65e3204641c621b08b0f85277f0be7b8878739c3377337de48e0bf2424d6cc7337bf0e500d3c6c6cfe21b7f7d1514ff5fed4eb9f62a96c5f WHIRLPOOL 5c9629a926766072b5aa5ea89f47f14291afaa30239001ff3436dc10e7d430bf6183d3efe7e6ced9a79b15d8270d2e55a4aab446ea5bb10c6461189fa664e2ef
+MISC ChangeLog 3459 SHA256 f8610f6b810bb135536a843321cc28f4a466efcce7b7f9ee9f8b86532ebcc627 SHA512 b3fdf55f0c7b6e0c47309ac5b5890ac5fa0ca36250d0ba4f108c6bbf39316e9002bd5f798517f9df095601f02404c503d9403e30f8ef7764cd11875a9501f45c WHIRLPOOL 007d09885ce4d27e9c6b57a696a117115fff6405ac82e2fc70d2d2d46c6d9aaa6bb374f8e44aef805f722b8f51c8663bf72fd6d5abd58466ade4b491b924f5c4
+MISC ChangeLog-2015 2096 SHA256 850150db408b91e18d6b254f45730f2eed3deccf56e3f8941481be0cf9a932af SHA512 971a765e0901a1c66043cd388dded4abadcdf9095aab3c8789621a8ee33098d639548f5b23ccf18922c801293a892a266e49b62e05b756de36acc2c943721566 WHIRLPOOL 0ee29ff52c5e19539f8f9fd304158d40aeb6c980d1c634eb154a9dce259408b3784a7834a82e492bff32638354944fc8831d56927c0695f3c8c838e1f8a5f096
+MISC metadata.xml 310 SHA256 899782fa5baac3abd36d69e5d7b482bec3e17bfb10abc883088f9e89ac8fcbaf SHA512 4712a1a048dd03c070785ebbefb637eade345c4959994d74643f9f521ebbc3c5477e38ad7628de967c13ceab3c906fd54db6322f8a32a43a47f3223cf8783250 WHIRLPOOL 22f36f803d5e47c3ed5da2eff623610c6541a802dee46f740ef4e3e5e6dd61643e1c8093bb432e7c1bb18fc594bc99ea6fb0784fcc5b46ff1502832a6ca1509d
diff --git a/dev-python/blinker/blinker-1.4.ebuild b/dev-python/blinker/blinker-1.4.ebuild
new file mode 100644
index 000000000000..aa0ab2c9d210
--- /dev/null
+++ b/dev-python/blinker/blinker-1.4.ebuild
@@ -0,0 +1,28 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast, simple object-to-object and broadcast signaling"
+HOMEPAGE="http://discorporate.us/projects/Blinker/ https://pypi.python.org/pypi/blinker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/blinker/metadata.xml b/dev-python/blinker/metadata.xml
new file mode 100644
index 000000000000..45a585359f8f
--- /dev/null
+++ b/dev-python/blinker/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">blinker</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/blockcanvas/Manifest b/dev-python/blockcanvas/Manifest
new file mode 100644
index 000000000000..2baefc0862e9
--- /dev/null
+++ b/dev-python/blockcanvas/Manifest
@@ -0,0 +1,5 @@
+DIST blockcanvas-4.0.3.tar.gz 1125887 SHA256 8cbd5d19cbb2008596ef0deb554988f9af480d81328ec58f1225dc1170517b9e SHA512 c74bebceafca28646186c72efd20168113cc62ac17b598e12074d029dce1803a601aafba31b5a305bdbf6d74d5d7bf29614b917e21bd54df7db123701ea770c1 WHIRLPOOL b1bae62c91d3d35ebe3cdaeca375ab2568951c97c4d7541a57dc64557565749968b99b615cf4f7bd37c30293bc642bcc544e697fb17efe580e6e0b9b9f6909fc
+EBUILD blockcanvas-4.0.3-r1.ebuild 1437 SHA256 3436fff32da24eca3e2a18d1505fb8a5aae01e42cd26030718b87ca67ba4a46a SHA512 1f4e42c369d6adde591ef566f4e6b850b971fd31aaa7d0a5e6a3887fab81d923033edd1cb766ddea75b38a43d3236dc002e4db25f55540444eb3775ce90835e7 WHIRLPOOL 1f52681c8c4caf02a870f2f361802fd09aab12ddc23d4eeed4a11b253aa4ecab6b4478ee9c95b451d6a41da79b7bd6c4c081ca20a894e2fc1368dd612cbf06d5
+MISC ChangeLog 2789 SHA256 cda4d57d2340a6a96f172eb9aad596591bd7d0123760852f8164383f29bca8a0 SHA512 40b936893a092a2263649a8885ea4fb0c35125253da30b060284f83cb865520340f8b9a010712011490846b7dfdf80a755973f720dbce53f06644a59dbf1e067 WHIRLPOOL 6ad2a8a39fe34f108621cb5656a96f8ea5c080f7bea9e76e91446c5de2e82b10c0da64e35b0710f33681f0da7544c35537f7cf829cfb89103163747d533e5da6
+MISC ChangeLog-2015 3167 SHA256 a9dc0d6f7571847b5dc40c2c4ac69d902c39035f7492a5a23fbea8e06b52c957 SHA512 8fe9cb119eb5440579e412deca24786241d086b7c492170ecc93f48f4d13ae5549d75aaa800745c37f37096bac4ff96dbbe313a739a60d4f04938306b20fd2b9 WHIRLPOOL 400f106e73306bc8d572007e189bdef117485ec36f1a7bacd24993dbc72e9d8757dec1560e43af80857c0475eeaf362279cfcd73ea1ba09be3864a982e68f840
+MISC metadata.xml 847 SHA256 67a9853322723550c7651029b67f255d16e2a330aa36429bc430803fa2bbb751 SHA512 aa9c1d28a95f75584467973e86b0c8a1a74480beb96c008375234df1ef3e0293423bda6e3920ffb2a2621c06763625a886e417296b330d4e6bb5d79125377d1e WHIRLPOOL b68ad83579093921ace893e1badf770237ab33a1eef0776a17eb9892ed573f41ff7aecabeda7e9fa773ec2fc8f3888211341dd8ab3bea8acb2433c27fb463fa2
diff --git a/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild b/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild
new file mode 100644
index 000000000000..7c60f5684645
--- /dev/null
+++ b/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Enthought Tool Suite: Numerical modeling"
+HOMEPAGE="http://code.enthought.com/projects/block_canvas/ https://pypi.python.org/pypi/blockcanvas"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT=test
+
+RDEPEND=">=dev-python/apptools-4[${PYTHON_USEDEP}]
+	>=dev-python/chaco-4[${PYTHON_USEDEP}]
+	>=dev-python/codetools-4[${PYTHON_USEDEP}]
+	>=dev-python/etsdevtools-4[${PYTHON_USEDEP}]
+	>=dev-python/pyface-4[${PYTHON_USEDEP}]
+	>=dev-python/scimath-4[${PYTHON_USEDEP}]
+	>=dev-python/traitsui-4[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)"
+
+DOCS=( docs/{notes.txt,readme.txt} )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	VIRTUALX_COMMAND="nosetests -v" virtualmake
+}
+
+python_install_all() {
+	use doc && local DOHTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/blockcanvas/metadata.xml b/dev-python/blockcanvas/metadata.xml
new file mode 100644
index 000000000000..62fa5efea714
--- /dev/null
+++ b/dev-python/blockcanvas/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    The Enthought Tool Suite BlockCanvas project provides a visual
+    environment for creating simulation experiments, where function
+    and data are separated. Thus, you can define your simulation
+    algorithm by visually connecting function blocks into a data flow
+    network, and then run it with various data sets (known as
+    "contexts"); likewise, you can use the same context in a different
+    functional simulation.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
new file mode 100644
index 000000000000..6b379cd89472
--- /dev/null
+++ b/dev-python/blockdiag/Manifest
@@ -0,0 +1,5 @@
+AUX blockdiag-1.5.3-py2_7-test-fix.patch 551 SHA256 fad975fcd696dec4692359dfb864ca9a53b522ddcdc613d08f869c5b34a1b73a SHA512 08273d2d3ed14a88082ca1c21b9eed73bd7e878473509d2d00eff89f0be1b15441e9d60123f41f29afc7752d10a357a9457100ac2cc0f8f9daaaf76bdd24f659 WHIRLPOOL d1278bd03441b796a3336cf86f7248a6879208fb39ac36d9195b79cef887d92d9b534b51b6950ae6695764a3af2d47851bfb30a54603056f58e437146ab2c3b2
+DIST blockdiag-1.5.3.tar.gz 2704391 SHA256 5ea3501fca0ca40fbacccc6f4ca177750e4b610009e021faa4868c0f6480ae8b SHA512 11ff6334d1ae50c103158db6ef9acce76116a17cfb8e0066581c234138f17fabfddd183b154f407fe95dcd414b0054aebdc22682e82a8e7595905f1ee2fd6222 WHIRLPOOL 40897fffa4c6e78d0d665123ca68c7864f4de4e1e16440a47c163ed8ac74713bff8ce4f6f1ce8d1f1d60fb02f4cc92cc2eaac1a14e1367bb7b8f1586ad220183
+EBUILD blockdiag-1.5.3-r1.ebuild 1534 SHA256 9488cd2186aa2b31913358837010cb52902b5b535e80f639d3c6e17d4f66e558 SHA512 a50bf2aa565bc7ff4d616a98b5fd0c094669416dbaee1b4faaa5bd7589468042837df41a49739561acbe4ae14071cbedaa9fab864d84d42fe3118232a10ae5d8 WHIRLPOOL ece7336c4849a1a7cbaa2c1f15f48cad2fb7e139f7f32bec2bb9f773581395e1a7bec428686ed1e595809c65b48764242efbd877cd125a4f9ca7629e837a71e2
+MISC ChangeLog 604 SHA256 579b09508e13110ff603cf929fa49dcdb4f938f8a38f34bd3045630664ad637a SHA512 433a4c4829999b355790fb7c5747dc1eb06492caa0b549737f3a064eac8fd9aaf0f7c5daf5b9d7e0fa73db76922e4f8c31506545184882197abdff95bd2cc38c WHIRLPOOL 7630aef2265f7f579d3b04a57d6e18224d20581b891f9c03ad48e10305125cb580d8da439e77e7f3747e5522213166d24261faf539f5565c2d002bb13c79bb42
+MISC metadata.xml 878 SHA256 49fb830182d95dc4001b9219dedce712249d44bea097f40a84ecd9cb1a6b47ea SHA512 da7d2853420eb78c9e95fd1c8e9200d7ccdfc1d353757f3f9ead84e068fc0fc79cf7a0eed9b0b97fd303fab6cc5a0008b919550078d575b54107ad8977763c1a WHIRLPOOL f6198eb1f40c2797bc44d753c9d31cb4da52ee07e282a99b124eafd130734102d3806d0b0649c0a1a8ced55170f77f793805fd6cb9acf26268d6037eceef9c1e
diff --git a/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild b/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild
new file mode 100644
index 000000000000..3f571f97e942
--- /dev/null
+++ b/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="blockdiag generates block-diagram image from text"
+HOMEPAGE="http://blockdiag.com/ https://pypi.python.org/pypi/blockdiag/ https://bitbucket.org/blockdiag/blockdiag/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
+	>=dev-python/pillow-2.2.1[${PYTHON_USEDEP}]
+	dev-python/webcolors[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/reportlab[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		>=dev-python/pep8-1.3[${PYTHON_USEDEP}]
+		media-fonts/ja-ipafonts
+	)
+"
+
+PATCHES=( "${FILESDIR}/blockdiag-1.5.3-py2_7-test-fix.patch")
+python_prepare_all() {
+	sed -i -e /build-base/d setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# NOTE: requires FEATURES="-network-sandbox" for some tests to pass
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	einfo "For additional functionality, install the following optional packages:"
+	einfo "    dev-python/reportlab for pdf format"
+	einfo "    media-gfx/imagemagick"
+	einfo "    wand: https://pypi.python.org/pypi/Wand"
+	einfo "          Ctypes-based simple MagickWand API binding for Python"
+}
diff --git a/dev-python/blockdiag/files/blockdiag-1.5.3-py2_7-test-fix.patch b/dev-python/blockdiag/files/blockdiag-1.5.3-py2_7-test-fix.patch
new file mode 100644
index 000000000000..e9ccfc82b9a0
--- /dev/null
+++ b/dev-python/blockdiag/files/blockdiag-1.5.3-py2_7-test-fix.patch
@@ -0,0 +1,12 @@
+diff -r 07f96892bfda src/blockdiag/tests/test_utils_fontmap.py
+--- a/src/blockdiag/tests/test_utils_fontmap.py	Sat Aug 22 13:38:35 2015 +0900
++++ b/src/blockdiag/tests/test_utils_fontmap.py	Mon Apr 10 05:56:48 2017 -0700
+@@ -223,7 +223,7 @@
+         _config = u("[fontmap]\nsansserif: %s\nsansserif: %s\n") % \
+                   (self.fontpath[0], self.fontpath[1])
+         config = StringIO(_config)
+-        if sys.version_info[0] == 2:
++        if sys.version_info < (2, 7):
+             fmap = FontMap(config)
+ 
+             font1 = fmap.find()
diff --git a/dev-python/blockdiag/metadata.xml b/dev-python/blockdiag/metadata.xml
new file mode 100644
index 000000000000..979aeac9bea8
--- /dev/null
+++ b/dev-python/blockdiag/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>i.tkomiya@gmail.com</email>
+			<name>Takeshi Komiya</name>
+		</maintainer>
+		<remote-id type="pypi">blockdiag</remote-id>
+		<remote-id type="bitbucket">blockdiag/blockdiag</remote-id>
+	</upstream>
+	<longdescription>blockdiag generate block-diagram image file from spec-text
+	file.  Additional functionality is available with dev-python/reportlab
+	(pdf's), media-gfx/imagemagick and an imagemagic python bindings package
+	named wand (available from pypi).
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
new file mode 100644
index 000000000000..541e2cf0d0fd
--- /dev/null
+++ b/dev-python/blosc/Manifest
@@ -0,0 +1,11 @@
+DIST blosc-1.2.8.tar.gz 259299 SHA256 fc8996733de73d70cc2482f98972a38a908ca7286d30429fe828390b1bb010c3 SHA512 8349a7b401e3b55b066efa4d647255dc7bc735a1de0eca5e33b2deb4ca90e317b90d6ea42433ed06f2680bccb2198e0e4bbdbf5a0fd1c22db900aa896c88427e WHIRLPOOL 1139c9f167565df0fd22fdddf20416db2bf214c6a58e45f0c3bd2118142d9782ff53e9e263f1fafbb79bb69ae17c9fad925accdaa009d7087c725c113e039d18
+DIST blosc-1.4.4.tar.gz 613097 SHA256 76ae6e1cecddb320b5567ba78ee9a2ee31895ecba838fdf05fdb9131939a4705 SHA512 0a7da71086eda4fb7851a3ad1f3cbfe231a9b97d0177e6cc085f2b600d33ce0a71cc361bcfd682a526002465d375e89b7397270953ecf163db1922a9d51ac8e4 WHIRLPOOL dd2404ecd5fd592fb38e3fd68bd06f48025e28543cf0119713a8575044db13c592818b7da753f55092aaef6c0ed488fd4cf4b64e25f050580a26440e43bf050a
+DIST blosc-1.5.0.tar.gz 617120 SHA256 0ffddbae63f44aa35e4ac707f2e05e421df813c08bde8c5a419776a45de4ab84 SHA512 75121989880dff6c2ab9142b02ccf45efac9eb442e4a3db42099047f1f5b86973ec5339314d867c3213ebb10fa883d993523a6469b3a3f6a230dbdc8a6ba03f2 WHIRLPOOL f1fbaeed5d4f08668bd8c9e1f8917ab8f19e49432da8dd43b09e678c6530ee66b13214aefd7e05fc879a6b5883ddd1de308938c3437e23a514c2ba63a2a19a0e
+DIST blosc-1.5.1.tar.gz 641172 SHA256 5c16d39ea7baa5b4f726e1bb06869356c5f8564988e85585a23e0c920d0ba9b2 SHA512 76d8c5d9e0e3485aacd5646970ce62e34d6ef3ff04e134342544ab044c4d1925a537187b4ce8b7ef3f6cd327e26d47dbdf1bf04233186a8baedbc7c839071cf8 WHIRLPOOL c675e81d99f71cdce95089860680442c19884dda8b6c7bd45d062c08c2b7bff93955c19f9c008c020755af3888372d871003ceabf312d28ab3df976fbea73466
+EBUILD blosc-1.2.8.ebuild 852 SHA256 139f530f3207b01994c40e4e79b59c9c17f0d96e2df302f383f2a2fcf19b9bbd SHA512 ded44889e629f384adc1ed5576e1f8f92dff50fa2a958381fdf7fb89c1d426c3bced3bd1947cd211bdc844ec3c497ef759e034a2847ead808dda4cffcc92fa82 WHIRLPOOL 1da0503afcc8dab8daf8b647967e7671f8e8142ae1a4b11296c164b4ee77739e8022bcd0b0a3bf05db3e61c0c71ee048cf34a6f09d050bad2233991e38ada041
+EBUILD blosc-1.4.4.ebuild 727 SHA256 5a10f66cef88f96e2840106b481e9cd4429a4a4be926b59e1cbd2afe94048579 SHA512 e82e189b5509a0960ab866c254b5c262fe4415c556cc355c71c8d46e668805ebdbf869fe7308a671ebfebbc5839b70d70e756f5f273034555aab41aee1df2a6c WHIRLPOOL cad12a92eba847e125824f537fda0b33559824ff3ca708243ce23a5a3b012f9b5e3d8cf6d8efa8eff4b9d4b7ed7e3e2e4df3da8099f5ba94808ae57d774bc8dd
+EBUILD blosc-1.5.0.ebuild 794 SHA256 64d203b053fac371a885f28891520120ec14a67717527ca57808486d5d7fccd3 SHA512 f6fa3e8d0a2b3c714eaa0f91883e91ec65c29ed1bf40c42781b855abb18fefda0fbbbbdb18f49a021c2797821464c5349b54fc93d03b9d232af43b55ccdda871 WHIRLPOOL eec3c6d30f0cf661e7b9a1e2f09b13e7717e5b422e888a29a56657c029b37bef63f8a30e63f0e3d8333e1996298d75390b97db0956db01ca8ef3d723dc9f7790
+EBUILD blosc-1.5.1.ebuild 794 SHA256 64d203b053fac371a885f28891520120ec14a67717527ca57808486d5d7fccd3 SHA512 f6fa3e8d0a2b3c714eaa0f91883e91ec65c29ed1bf40c42781b855abb18fefda0fbbbbdb18f49a021c2797821464c5349b54fc93d03b9d232af43b55ccdda871 WHIRLPOOL eec3c6d30f0cf661e7b9a1e2f09b13e7717e5b422e888a29a56657c029b37bef63f8a30e63f0e3d8333e1996298d75390b97db0956db01ca8ef3d723dc9f7790
+MISC ChangeLog 3809 SHA256 808909fc2bdad7b5475d3cb18102baac146b5b1bf04a654b272eff7e94d8c005 SHA512 57ddccca336dd4af5b18404174502abb7aa0848e38ffac9e075ce05ffd58e96cdc4eecd8d97991a0abdb44a219e794b0d91e47f510db46068393f02841019805 WHIRLPOOL a1aa8155e0eed792a3515d74c7d4d5d327a6652469409c37ed00420f7faeca57043d8764aba4949005e92bff124f2565b53c6156cbd6af38c1e2459af9c1d1bc
+MISC ChangeLog-2015 818 SHA256 fb6e4934ec5c58c9f279ed98ca6c3e0fe5edb2b566a6c2fcf7e9a164a10e805c SHA512 cc6b2ad1829d7c29102abcf3eabd98a14b9f280fa2062a1e6e780d533243ec189fd87584e3ac9e890aee81d5a413e3425723a6941b4d7840031ad1fcbfba7d48 WHIRLPOOL 0918a0d29c4a535de8fa8c8b84bb3b96b8b985d056843842dacf117ababadbd7d368acc5cbaee6dc35b1c09a4ae23ee753ba4d4238ac7fb8202832a0182fddf3
+MISC metadata.xml 891 SHA256 c82836b0b931d3a539b3327db2e88c1b6abe8b9313ea0ac4c6f595bd99ed00d5 SHA512 e4ece5eb12f91e4416a8a685260f6bfdfee12ca64b7f2ad4ce0cdaa81287a24b1f51a156c7502b1e16341088743d7df9fdd36aa9095ab9d02e0bfa28536bb9f5 WHIRLPOOL 42ff4b236ecb62123c7c260662e457631b9fcacafa644894aec7fc2ab7a43431ce8abced778678b9d7d9bc9e88b01595fa2ddcb08f113a13f467e97f1832a75e
diff --git a/dev-python/blosc/blosc-1.2.8.ebuild b/dev-python/blosc/blosc-1.2.8.ebuild
new file mode 100644
index 000000000000..eb4a02fb989c
--- /dev/null
+++ b/dev-python/blosc/blosc-1.2.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="High performance compressor optimized for binary data"
+HOMEPAGE="http://python-blosc.blosc.org https://github.com/Blosc/python-blosc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=">=dev-libs/c-blosc-1.3.5"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# remove forced sse2
+	sed -i "s|CFLAGS\.append(\"-msse2\")|pass|" setup.py || die
+	export BLOSC_DIR="${EPREFIX}/usr"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	nosetests -v || die
+}
diff --git a/dev-python/blosc/blosc-1.4.4.ebuild b/dev-python/blosc/blosc-1.4.4.ebuild
new file mode 100644
index 000000000000..b90edd8a4876
--- /dev/null
+++ b/dev-python/blosc/blosc-1.4.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="High performance compressor optimized for binary data"
+HOMEPAGE="http://python-blosc.blosc.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-libs/c-blosc:="
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	export BLOSC_DIR="${EPREFIX}/usr"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	nosetests -v || die
+}
diff --git a/dev-python/blosc/blosc-1.5.0.ebuild b/dev-python/blosc/blosc-1.5.0.ebuild
new file mode 100644
index 000000000000..0fa8281da8af
--- /dev/null
+++ b/dev-python/blosc/blosc-1.5.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="High performance compressor optimized for binary data"
+HOMEPAGE="http://python-blosc.blosc.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-libs/c-blosc:="
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	export BLOSC_DIR="${EPREFIX}/usr"
+	distutils-r1_python_prepare_all
+	DOCS=( ANNOUNCE.rst  README.rst  RELEASE_NOTES.rst )
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	PYTHONPATH=. nosetests -v || die
+}
diff --git a/dev-python/blosc/blosc-1.5.1.ebuild b/dev-python/blosc/blosc-1.5.1.ebuild
new file mode 100644
index 000000000000..0fa8281da8af
--- /dev/null
+++ b/dev-python/blosc/blosc-1.5.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="High performance compressor optimized for binary data"
+HOMEPAGE="http://python-blosc.blosc.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-libs/c-blosc:="
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	export BLOSC_DIR="${EPREFIX}/usr"
+	distutils-r1_python_prepare_all
+	DOCS=( ANNOUNCE.rst  README.rst  RELEASE_NOTES.rst )
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	PYTHONPATH=. nosetests -v || die
+}
diff --git a/dev-python/blosc/metadata.xml b/dev-python/blosc/metadata.xml
new file mode 100644
index 000000000000..05e88ce58aa7
--- /dev/null
+++ b/dev-python/blosc/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="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    blosc is a high performance compressor optimized for binary
+    data. It has been designed to transmit data to the processor cache
+    faster than the traditional, non-compressed, direct memory fetch
+    approach via a memcpy() OS call. Blosc works well for compressing
+    numerical arrays that contains data with relatively low entropy,
+    like sparse data, time series, grids with regular-spaced values,
+    etc. This is the python wrapper.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">blosc</remote-id>
+    <remote-id type="github">Blosc/python-blosc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/bluelet/Manifest b/dev-python/bluelet/Manifest
new file mode 100644
index 000000000000..1e89e644697c
--- /dev/null
+++ b/dev-python/bluelet/Manifest
@@ -0,0 +1,5 @@
+DIST bluelet-0.2.0.tar.gz 14182 SHA256 4af029c8247be0b4852c8e92a745178882fa7fe5d4e669e1788184581fad3f01 SHA512 58bd8df4b61f23a53f9310b68e5754155c00d598c9bcb7724e90ef6722ee5d6017751c2e056eaaa64cca71b89c391d248c14477457f30ebf2b28841a3fdc98fa WHIRLPOOL b29994733f5d6735adc9e97a83bfa86d9ca56c39ef090003923dd7ed1bedc3528ca9dea80d86fd1e429dfec09f01b6f0bee2006377c7af03ce103ed68c374f7a
+EBUILD bluelet-0.2.0.ebuild 584 SHA256 032a75fbcd225c86ed217a298d6f8b2e8a3eab681e188538d2f7dd1ce26a71e4 SHA512 b396730a2145806c21360b93c20d506587d15533f1a87a434e8e97270a57650ed9049f614ba0bbcf72f7956fff2d14be7baf2364a2cbde7ac2aead957544a611 WHIRLPOOL d34e7f17def33603a4607aa8afae4bc13c21f1409fe777b829e067288a2469d12c214c4df38ec59956a49f541cac24dd784ec4568f0b44ead99254478741ba30
+MISC ChangeLog 2795 SHA256 f770a76853cd94814cf1ac1c5560473a81b66f024f4e925d823a23115d0298cf SHA512 72a63368292cbde024a03aa26c702a6b836b5b3ceb23acad216e63b3c295443af624a653c93fd7d687f1021818dcbaeacabd76b16d62b9b584f2b2a3a921d65f WHIRLPOOL ef2839ed5e603df52f2c7ced2d03f815bb875eada1607ef4e5e7df1abfd2fdc82258a74a7900b41ae2260dec5c5d59f138028d88f57931e8db497161f93696d2
+MISC ChangeLog-2015 1329 SHA256 2a297333df997217d0fbfda421814bba5ff25b8c67736526ced3ea94ba3bc6b8 SHA512 a8e68b0086f53d18e1ec52d5db20dd068e6eb373576711108aa431c5a9f178b9cbdfbda271c2bd6fd37820d7c1ecc452b5cfc527efc8c231f6105dafb01b59bb WHIRLPOOL ce967f9ee4eef3a4d8d810e2aea6610856ee3fec99c34270ea99851e96048c7baa9699f3130c6b4a9f935956e12087fcd655b20a4998b8ca9d7450b2c5bb0628
+MISC metadata.xml 969 SHA256 be498d7ad8fbc3b4c3d22e68047e17fea2c4e22cf2724d688bd4a3e0b7cbcce8 SHA512 98ec10adf32ffc4b2adcaa10f08e3e8f24e06aa22b66cb9a372952583153688349b11bb99654b8c53901b073085dcfbba6fe11b943b6ada86116d36163b89908 WHIRLPOOL bf1a56c73e12886162d40761299a71c612622a3a9336c4fd2ed62dfc30d90f54b2a220687af0de34618a579351dba8f64a005aef5b1baa9b8dd733c6c854f51f
diff --git a/dev-python/bluelet/bluelet-0.2.0.ebuild b/dev-python/bluelet/bluelet-0.2.0.ebuild
new file mode 100644
index 000000000000..87bcd6aafa8e
--- /dev/null
+++ b/dev-python/bluelet/bluelet-0.2.0.ebuild
@@ -0,0 +1,27 @@
+# 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
+
+DESCRIPTION="Module for pure Python asynchronous I/O using coroutines"
+HOMEPAGE="https://pypi.python.org/pypi/bluelet"
+SRC_URI="https://github.com/sampsyo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	if use examples; then
+		docompress -x usr/share/doc/${P}/demo
+		dodoc -r demo/
+	fi
+}
diff --git a/dev-python/bluelet/metadata.xml b/dev-python/bluelet/metadata.xml
new file mode 100644
index 000000000000..770a684c6260
--- /dev/null
+++ b/dev-python/bluelet/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+Bluelet is a simple, pure-Python solution for writing intelligible asynchronous socket applications. It uses PEP 342 coroutines to make concurrent I/O look and act like sequential programming.
+
+In this way, it is similar to the Greenlet green-threads library and its associated packages Eventlet and Gevent. Bluelet has a simpler, 100% Python implementation that comes at the cost of flexibility and performance when compared to Greenlet-based solutions. However, it should be sufficient for many applications that don't need serious scalability; it can be thought of as a less-horrible alternative to asyncore or an asynchronous replacement for SocketServer (and more).		
+	</longdescription>
+	<upstream>
+		<remote-id type="github">sampsyo/bluelet</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/bokeh/Manifest b/dev-python/bokeh/Manifest
new file mode 100644
index 000000000000..39916be472ae
--- /dev/null
+++ b/dev-python/bokeh/Manifest
@@ -0,0 +1,9 @@
+DIST bokeh-0.11.1.tar.gz 3383140 SHA256 34a73d8f68e7d6faaecc9f785cac8e9f76b88a7e7aacf66307076b03b4d3c472 SHA512 18cfee85698f1ba548c34fb223dc57e36584951064e65fac83cb8388b129914a8f67970a133ef2d1a67c06e50cbfb565a27d33dc9c90f5027a1739d400894706 WHIRLPOOL 5f8aa63f90e95945b7c1e1770d869ee7b8aee34d07f6f254586de5d30561b1688f5390f688f9792627809229fb93fcf607a012dc5e070a5c8f7c95b84dd8db4d
+DIST bokeh-0.12.4.tar.gz 5584657 SHA256 4fa2360f4492785d47c898be72374f0123bf8e8a939824ed1d1610f1ce30b2a0 SHA512 bab043278cf580a7d6df9749d7ceca763fc77849de37a8ea7e5a674714a5e49c240ea41ec964fd00cb6d71901fd349f10ee732df5dc5a853e0a2ea8a9c97b1ef WHIRLPOOL 112e87e14c72a690ce5a979d53015b0e5753992e95906d8c93ba69a6b66d25315a1e57d3a6b7801d1706720879e495280f42d80ac7876be4a17ca0784ee0dbb0
+DIST bokeh-0.12.6.tar.gz 13720124 SHA256 a2ddcc694c387440a2b361e741d2fa9a18ad0508a879a71f524a2f0ff7803181 SHA512 7a293169521b690bb2cdcefe3667f869e75f2b718d6122af63201e2fb2e530eba931b3fa2ee3474a8ead758039cbb7d756acc0349e2f0820d72a4f754b9301b2 WHIRLPOOL 0a2c46e1cef3e44c81d965f70a82129286308a19175c4ae4bc2c5861a1b2d699782229569c2f32137169d6e295b2c2b17d15f06630d56d4772b3de1bb018d7d2
+EBUILD bokeh-0.11.1.ebuild 1965 SHA256 7b790f2a8e31e0c55f598bc46e971c216769f07ec1926eb58df2a49f1ef21e69 SHA512 b2ca4f2eae7e88ad77c34d8954fc3e5ff04976cae64acc550da410762636591b1990b608a884632dee5c5362b31f066d4ad3e9c52250bc30eda154cb5e9dfc37 WHIRLPOOL 395ec6da70ec16a9593e5c6553066e03fc34a84a4f9772360b765fd66e582ec66bc06dbaf4051d1f1bde956f242cd636125ff0b06f15a74903b7a1f63e7f4ee2
+EBUILD bokeh-0.12.4.ebuild 1978 SHA256 723fc9e0a8f677c4efdabc5f12ff74b33a274ff3d12cb73a848e0e0ba85bebab SHA512 c185306981f2fe4361aa58f83773344e2203e35e2a6fa347a0676acffe7748486855cd1cbe43c84cfdee8eb9ddab3047bd32a42085008ee8ee98644e5f42ebb1 WHIRLPOOL 03b8059c0f36cb8690fa5c0c68394ef34cc0ce210f9f70d2b8348a2ed62eba21f65c6b0a388a311b75fdcbecb630b2a0b0af236414679d3cbb873716eb9218c3
+EBUILD bokeh-0.12.6.ebuild 1980 SHA256 f375bc6d2945e85ed7fc2887bb4792387f98a952d2c53cfe3690ca33dd133772 SHA512 6cf8c17b0144fd7bd0732a70585dfab442e9b6d9aaa874878174db691fc54fab496119032b0af3f55d69d3d63ed9abc7045d802d2e4893466c3c4631eed0b166 WHIRLPOOL 05706120c404815fa54e4baccf862167eb2427c3b187364f365e23c01bccb28430ec3fbe7da0bf17679ade2d9b09271bb48893068908b665fcbf33de8d61bdaa
+MISC ChangeLog 5745 SHA256 59df620490347855e9a2cc449047ac93b361619d68aa0b7e68839234709affd2 SHA512 46f7d57bd1402647cd84bf21f47f1af643c06d014e0ca1530e19a8f78390d14208be1df154d570e76237c767a3d1ba41bf41f9a00dff76e3a10fe88b2234cb6c WHIRLPOOL bd3c01de8669a9ea28a92db6ba642b2f968706fe2652444677deb4760fef198a4a77371a6700b809dc749f9b4df5b43aafc6208a1367fdeb79bcb97b78e0d02c
+MISC ChangeLog-2015 2621 SHA256 332fff3552d5e8a44f74af28f5c8202cddb95853bc160b4f6293a6cccde0c276 SHA512 79d191034ead75e66bb0fa8dda0cfcd030a716c887e5488c37e1e1ce514c3f84a12d57b7f2483fe8de364cbc83ab046bde2186f0f41ce7c7ecb034889250b262 WHIRLPOOL 5ea2d7be10429b769fe52b77d7477555fb3c6c1650e8c455753f29a6b064ab3c583095ce2cf055b0c3e37a0c4d0835f0199dd00ec9e8db102ea8c76aaca47785
+MISC metadata.xml 879 SHA256 5cdc849eb18f4605c14fdf1dc8847fb6818b19b88916688e73d0d87011452d51 SHA512 46419cc11f266c9e5d51b35c4bd4a75c4c82446dc8a9f06b6ac7ef3c742a371334b56e98a4bc831bc4f5ccee0222ba7f2b36a44d32fc4ea3aaa092b32c7429c9 WHIRLPOOL d3cc1f2899adff5f920112708004286ac614073eeaba086f0b7f46020880abada28406cff7ed4960c5e0d4ac95ca0e2fc5cc408dc18ce6fe0708a17d163a0004
diff --git a/dev-python/bokeh/bokeh-0.11.1.ebuild b/dev-python/bokeh/bokeh-0.11.1.ebuild
new file mode 100644
index 000000000000..b8746d68cb55
--- /dev/null
+++ b/dev-python/bokeh/bokeh-0.11.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Statistical and novel interactive HTML plots for Python"
+HOMEPAGE="http://bokeh.pydata.org/ https://github.com/bokeh/bokeh http://pypi.python.org/pypi/bokeh"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+# A doc build requires napoleon sphinx extension which will be included in sphinx release 1.3
+# Therefore refraining from adding the doc build for now
+RDEPEND="
+	dev-python/abstract_rendering[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.2.7[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.11[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-2.7.6[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.9.1[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0.1[${PYTHON_USEDEP}]
+	"
+# testing server: needs websocket not in portage yet
+# websocket is in pypi for the adding
+# hdf5 backend: needs array management not in portage yet
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2*')
+		$(python_gen_cond_dep 'dev-python/flexx[${PYTHON_USEDEP}]' 'python3*')
+	)"
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	py.test -m 'not (js or examples or integration)' -vv || die
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/bokeh/bokeh-0.12.4.ebuild b/dev-python/bokeh/bokeh-0.12.4.ebuild
new file mode 100644
index 000000000000..92224a4b2402
--- /dev/null
+++ b/dev-python/bokeh/bokeh-0.12.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Statistical and interactive HTML plots for Python"
+HOMEPAGE="http://bokeh.pydata.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=net-libs/nodejs-4.1
+	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
+	test? (
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/boto[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/flexx[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile() {
+	esetup.py build --build-js
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	py.test -m 'not (js or examples or integration)' -vv || die
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/bokeh/bokeh-0.12.6.ebuild b/dev-python/bokeh/bokeh-0.12.6.ebuild
new file mode 100644
index 000000000000..9d2c39b2d3d5
--- /dev/null
+++ b/dev-python/bokeh/bokeh-0.12.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Statistical and interactive HTML plots for Python"
+HOMEPAGE="http://bokeh.pydata.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=net-libs/nodejs-4.1
+	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
+	test? (
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/boto[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/flexx[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile() {
+	esetup.py build --build-js
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	py.test -m 'not (js or examples or integration)' -vv || die
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/bokeh/metadata.xml b/dev-python/bokeh/metadata.xml
new file mode 100644
index 000000000000..da849fdc2a30
--- /dev/null
+++ b/dev-python/bokeh/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  Bokeh is a Python interactive visualization library for large
+  datasets that natively uses the latest web technologies. Its goal is
+  to provide elegant, concise construction of novel graphics in the
+  style of Protovis/D3, while delivering high-performance
+  interactivity over large data to thin clients.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">bokeh</remote-id>
+    <remote-id type="github">ContinuumIO/bokeh</remote-id>
+    <maintainer status="unknown">
+      <email>info@continuum.io</email>
+      <name>Continuum Analytics</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/boto/Manifest b/dev-python/boto/Manifest
new file mode 100644
index 000000000000..3a8bcd4df09d
--- /dev/null
+++ b/dev-python/boto/Manifest
@@ -0,0 +1,11 @@
+DIST boto-2.38.0.tar.gz 1423863 SHA256 d9083f91e21df850c813b38358dc83df16d7f253180a1344ecfedce24213ecf2 SHA512 577672007348db846d041c0906806c62eb77653b1335645cc852c603f5d32991ca648aacb884676af02043914c91ab6f41666b36b5b1ae23a3a354bdf9f3f75a WHIRLPOOL de704484ed38a0d0322ef289fd0657b6d1141c0f77aa6725e338dd51d78bed39a7ef1ebdec54a659d83dae30c14196f2410507d9aeec070126bbe13565b210ba
+DIST boto-2.41.0.tar.gz 1440323 SHA256 c638acdecb0a2383b517c15ac2a6ccf15a2f806aee923cc4448a59b9b73b52e0 SHA512 ffb503e8f7ec84ec973e109ae9524e1db2ef5f34d9424c380eed9a85871f07f8c9c798ca358fefd772ff45a72226bb02eebbbf6ab2d56b2442c41ede736f6f5e WHIRLPOOL b87f8af16224187b1b9fd294491f2bd1b9222d32e1718fdedeb5d3efb6cc89f24de9984481597cb6317d90ff70a2f984ddb67f57b86fad8c7eb1410f9e41b70d
+DIST boto-2.42.0.tar.gz 1442326 SHA256 dcf140d4ce535bb8f5266d1750c16def4d50f6c46eff27fab38b55d0d74d5ac7 SHA512 5f45d56ef0d5b64f1f585f4d144cafd1bd2b05f1b0ec02748c27057f91ed9d94228ea2c24f4f081d4424285eecd1b749ca65952e769c4e94db0b944d79670076 WHIRLPOOL e81a77d5c4891eec1ce980fdf599433cc6866e3aaccf1eaf59e13843559dd29c9bcd6c83090361f1e89698e9a6f8d33fe0da71dd816bf318dc54860ac6e60252
+DIST boto-2.48.0.tar.gz 1461372 SHA256 deb8925b734b109679e3de65856018996338758f4b916ff4fe7bb62b6d7000d1 SHA512 ce8e302b059ef31e81078ef21999b96b8770d2ef0c70358624c8cc6a79b1a43a78e1c206cbcba50eafb9c964c4eda5b9b0b127ea9523dcf7438453b4b2293f9f WHIRLPOOL 1ce451f75ae68b9c2fd7c0687c2f35aba369db3c4d4d0c7c51f4da6fdd239e41831f669a8303359df5c435d95d048e8cfdb2f53c82f593dc0267530b3f96cb1a
+EBUILD boto-2.38.0.ebuild 1280 SHA256 781e359669bbd8ffc0c6a7d38c6a94dd2a31823c5fcf65e472f9ec63ef258a83 SHA512 043dec8773ed11cb5b8f703d790eb7454205fcbc86e6aade8c4e09866f8d0341d92249f365dacbb81339b295259ba0f3b58082c28ede0635a84bfe597e138343 WHIRLPOOL 682eae66d4b0ba96419496b5ea93461ff3ef691bcfd678109b1e63e4ad916cbf49cabec28884994800a9b17fc77df96ecc60905e6f706f064b8dfff1d472c6b6
+EBUILD boto-2.41.0.ebuild 1410 SHA256 931095af006d904e270af1999c0fabcf9be1b7e14b1522c4eff9060155291959 SHA512 73f219dbc55bff52c6f950290d36aae287883d140fba9ab7bdc6d222e00de1da53208007a4237951b49d11a70db3e29cb1cad32ea31260c3dae78a4d95b7d15c WHIRLPOOL e3690a446b3e2b2d91e4a4358d2497641a0c7af3b08f1cce59e30bd98e88210acf1ab56298b06d2db95fa515e71005f96e1e2515bca0c5d5244b55ea94caaaf8
+EBUILD boto-2.42.0.ebuild 1422 SHA256 a3a513c68b5f87081bb1c44ba6091f0f74550f665eda52fdf5de3bdce7d57817 SHA512 a305ab8f19107375c069b23d9501b9e64160d2bc372756ea1acdbb279aa0cf10074b62c537950303a12ac261baa3006c4c72276e7a55b98ce170d269eda584fc WHIRLPOOL 014cb25ed452ac5c3fea9ca3950498ff7045af9ec4a1c2cd0bfeeb8530ee520832aa91a95b158c22bfc7f4926a2ab10c5a60c9794036749cb1f6a9afddd47a5a
+EBUILD boto-2.48.0.ebuild 1422 SHA256 ce057fb81e0cff3bd60adf14467f4736da238a22df0cea1d0dff62bfc97e8008 SHA512 effd5dbc08d52f02dfb46d289b2d4a6e6b11ca47b72dca0b41b3934e8d515a8833fa3af52bf2dd49bd15cd24728003c0105fb83e5704045c70383aaee8a1fb70 WHIRLPOOL 30ef8b737c59a066a0f00b555393e9b0ddcbc8c6fc8e3869d8c8f41a10962999dff543f8a56c5dfee088a55594b100bb81644141d0df75c53f0e85e3923871bc
+MISC ChangeLog 4434 SHA256 aeae957dfa32d55a184399487f6742400aea93db937a1a71a3be98ee91e28f35 SHA512 956f9cae17616add48340de4942c81c7211c623593742b8c20cc944ecdc843c07071a394c1c662da66cbfbb5f580dee42a6f165eae63cff059d0dd92eebcdc85 WHIRLPOOL 72945b7b3e29e8463f95058af6da52396b0cf03a6751312027e40ec6990120c98eb970381ef5e78ff318b70fad887054b026d7c8ae94cd0f2120a9688869651a
+MISC ChangeLog-2015 14215 SHA256 0d08f640442ca674ccd26357d14842f8c0e79836d2a3d98a661525f7200ba8a2 SHA512 2f369ba0735f22a78af209c90ea25ac5f1336a065af523964b4fec526211489143de46295840c626f8f1bd2479a684c14d98d9250c35ad7cb0556d94bd24f32a WHIRLPOOL 14681b465a797765293787ebac3bfea6f488731c10b87e9acb025a9a4baccee09e6f3c3330e195c1ae70704158dc2558885535e553f96015057d8062d991ae2f
+MISC metadata.xml 501 SHA256 04f5ab8d0d4ccac47021395da140053406b305645659688fe72d666d40e8b106 SHA512 fb6369463e66cbb83fe610123bc978f10387a550d51c2f08b6ee3e45225d47fa2db3be3fc73a4e3176a57c47ddd4c9eaa74cf8173ca518c04590d9a9faca1bc9 WHIRLPOOL c67b95b3f5a0db0b2d01c8c3bf65c3ad2f78c7c7c0fe6111cc6929b8483b1e3f82bb0eb01b5316011916bf4a9a1856d4b6199baa02f140bf566870437366e680
diff --git a/dev-python/boto/boto-2.38.0.ebuild b/dev-python/boto/boto-2.38.0.ebuild
new file mode 100644
index 000000000000..8d7ac9a20b85
--- /dev/null
+++ b/dev-python/boto/boto-2.38.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Amazon Web Services API"
+HOMEPAGE="https://github.com/boto/boto https://pypi.python.org/pypi/boto"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# requires Amazon Web Services keys to pass some tests
+RESTRICT="test"
+
+python_test() {
+	"${PYTHON}" tests/test.py -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		# Appease the doc build and supply a file for _static
+		# the usual emake -C docs doesn't work under this authorship
+		cd docs && mkdir source/_static  || die
+		emake html
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/boto/boto-2.41.0.ebuild b/dev-python/boto/boto-2.41.0.ebuild
new file mode 100644
index 000000000000..892bcceee51d
--- /dev/null
+++ b/dev-python/boto/boto-2.41.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Amazon Web Services API"
+HOMEPAGE="https://github.com/boto/boto https://pypi.python.org/pypi/boto"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# requires Amazon Web Services keys to pass some tests
+RESTRICT="test"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_test() {
+	"${PYTHON}" tests/test.py -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		# Appease the doc build and supply a file for _static
+		# the usual emake -C docs doesn't work under this authorship
+		cd docs && mkdir source/_static  || die
+		emake html
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/boto/boto-2.42.0.ebuild b/dev-python/boto/boto-2.42.0.ebuild
new file mode 100644
index 000000000000..95e096af80a7
--- /dev/null
+++ b/dev-python/boto/boto-2.42.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Amazon Web Services API"
+HOMEPAGE="https://github.com/boto/boto https://pypi.python.org/pypi/boto"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# requires Amazon Web Services keys to pass some tests
+RESTRICT="test"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_test() {
+	"${PYTHON}" tests/test.py -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		# Appease the doc build and supply a file for _static
+		# the usual emake -C docs doesn't work under this authorship
+		cd docs && mkdir source/_static  || die
+		emake html
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/boto/boto-2.48.0.ebuild b/dev-python/boto/boto-2.48.0.ebuild
new file mode 100644
index 000000000000..9ba557074b50
--- /dev/null
+++ b/dev-python/boto/boto-2.48.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Amazon Web Services API"
+HOMEPAGE="https://github.com/boto/boto https://pypi.python.org/pypi/boto"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# requires Amazon Web Services keys to pass some tests
+RESTRICT="test"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_test() {
+	"${PYTHON}" tests/test.py -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		# Appease the doc build and supply a file for _static
+		# the usual emake -C docs doesn't work under this authorship
+		cd docs && mkdir source/_static  || die
+		emake html
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/boto/metadata.xml b/dev-python/boto/metadata.xml
new file mode 100644
index 000000000000..f162873b8114
--- /dev/null
+++ b/dev-python/boto/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>vapier@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">boto</remote-id>
+    <remote-id type="pypi">boto</remote-id>
+    <remote-id type="github">boto/boto</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
new file mode 100644
index 000000000000..ef50dc31fc50
--- /dev/null
+++ b/dev-python/boto3/Manifest
@@ -0,0 +1,11 @@
+DIST boto3-1.3.1.tar.gz 176717 SHA256 b3dbde6445ab04c3d0de9b962a3cc8ed9bc22ccce5ed4c8c4f8a1c1f653667f0 SHA512 10fa396e8896a157e80d028b590056dd8e967afec37062056d94fab45652d4adedbe5e98f1cc67c6c8b9ae9282145367b4e1973fd7506170e486b026b57db9f5 WHIRLPOOL 7a89936f8fde0c1138b330cee2184b40948838466aa44e78e35dfa6440c120ed8abfca9b76e28355173b8c571f0124af462eaa506990ef09bcdeaa0219e45788
+DIST boto3-1.4.0.tar.gz 183263 SHA256 8fdd3743e34a32e5cb8636fb33dafe7336b7a341583653f52c6c20f7fe764472 SHA512 9e678b26993f48f156a5acdb33aec3488d263230517e6b5e1e608cb007fbf4f29a3c33290e460eb7cf1031f87894f3daca03bf80048139435979f23dd2fd61b8 WHIRLPOOL 5eb3703b11b4a0b3a4c873aed78f9c8b6588b5a83cacbd673f27cc4460822772745abcbc6698f680968ed37318d76bd812a491a83caa7b04b1e4a663def4a271
+DIST boto3-1.4.1.tar.gz 188341 SHA256 a7f10245b3ff947019963963b73911c515debed89709740586503ac22f5dfb97 SHA512 525f2db50d0a9d6f452c0261e934ecd9f06b576154b128d209a729b0fe96190e641369c00e13700f2aba5fe4a0c02f80248e25bc3d716cb72752d645e880eb23 WHIRLPOOL 195e5dcd59152ef09ae1f32aa9f321ea1f57c2ac20f7a233673c4f2a4529c062f78af0641efe8ac0632188e8e85e1e687eeb7c6932de89d3c49e110df2958eb4
+DIST boto3-1.4.4.tar.gz 194721 SHA256 c760ca47a34fb54e44b90fc28d87a50353df527b39e815f399c481bab7d351c6 SHA512 948d753809e41bad39fdf3da9646b62ff2fbc9d23966cdd0e46b2df18b07ff8c8af11bb777aa0cd1fea5bcdbc2d43f3f3d06012e30327e3c55b36f7bba815a61 WHIRLPOOL e650e194d507dd405034ffb7907ab4a7e22765f290bf0bd8d866bbd0f94afb5fb64a6395aef24ea2196700be3d893bcf6cc86223a5073577875e451aed75724e
+EBUILD boto3-1.3.1.ebuild 1440 SHA256 4fa2e0db3fe091f69320d7c04ce10a141daf47c14ac45bf647900869fb3a8514 SHA512 db1347d961624cb0ad838d7bf23f1d54ad9b7743c0e75b203c0d32c25689eeedbef9c400f04d5b7e1759ffebdc9d3304cdbf479b5ef3be947f819173ae8154e8 WHIRLPOOL 6cd84dbd47f4725a30342c99b5c0e4918189558e6f9f8c8de55b4151d53ae09f9293a6f571eb2eb0159c9b48f97898fc37a1e48672c646f12fd55e06c457cf60
+EBUILD boto3-1.4.0.ebuild 1372 SHA256 bcb68a53ef3fc481b72f4242c5abefd2a09adffb75d41fb9f39d7f8243cd32ef SHA512 8cb149b97b7acf75c8543ef8969b8d82fec5a4b4b2cc624e179fd5fd0f08bb2db6084ff78bb945137a9fe3a7580f4d42305786fabca9454472f5926548e6c1c9 WHIRLPOOL 0fb57461b6683c9539b7d09dff2c9c857d3355a05e6ff492a327f4d136836fe96ece26636c7e4c47a16658b36a7c8f2688befb6f4d70903a0f12621113b73535
+EBUILD boto3-1.4.1.ebuild 1372 SHA256 bcb68a53ef3fc481b72f4242c5abefd2a09adffb75d41fb9f39d7f8243cd32ef SHA512 8cb149b97b7acf75c8543ef8969b8d82fec5a4b4b2cc624e179fd5fd0f08bb2db6084ff78bb945137a9fe3a7580f4d42305786fabca9454472f5926548e6c1c9 WHIRLPOOL 0fb57461b6683c9539b7d09dff2c9c857d3355a05e6ff492a327f4d136836fe96ece26636c7e4c47a16658b36a7c8f2688befb6f4d70903a0f12621113b73535
+EBUILD boto3-1.4.4.ebuild 1413 SHA256 d96efb2b2a1c2ff43983c70cc8eb904c86a165685cc079f7521cd62d8299cd82 SHA512 4dfd9bffdc5e5be744fc636748be1f67f0ca75931960f4f23217f2fe0e96976573a24d3d8fb7dbb043e549f27c42a4a3d08fd879dd6af5707e1fa5ec184f6881 WHIRLPOOL 34b6f04a3380c6f2d7165ce4e6370302dfd2dfbf8845b0a2bc22988878311bc0672d894f1968f931c68ffb183861c681a454d93a14094e4aea579a08aa9d2939
+MISC ChangeLog 4860 SHA256 02976b35d1af10396e395af30890f1f2b86108b0a89db760ca9e1bcbab56acbb SHA512 c3bafc46ba2dd2d7a99a886a29299c95c98d5137224c51851571ee857a287caa1e9074ed633beacb37e2bf5934598475692cf954866ed7d35eb02cae037075ef WHIRLPOOL ee447d852385e9fe6278804c7d51b64fa9ebefd75b94d534ac2b8a449b6e90d87039fa59796f33b46f2d5940c788e97f18faa4a064c59b5d3376d2e27bb6f0bb
+MISC ChangeLog-2015 342 SHA256 5dfd8461e6063ffa6ec58951764580c8b0f60f141a4a6af67edb963248d95ef7 SHA512 2ab699aaaf13ad684c60f36042e139757ae6d547ad46282a2c4435448fef9f7f56427ead687c5e904a8373dc5b8bf2c2fbae1c8df8ca6460d50841b444bf1f97 WHIRLPOOL a2bc6090846e26bc92443834a3d1995a85ca1a267cdb5c99de839c0c7b0e35ebddb0a4cdce3d091743606398f2cf11630d67747be434d02c40f87096126bc89d
+MISC metadata.xml 321 SHA256 bae86fd8bc5622bea90c01eb1e558b0489e01ff5e00f0417edd3d0c2984372ab SHA512 49dc710da53307ae5c4d7680ee417c52937587fedb2e0f8d23a88ad55b7aed030db1079db16625efcc28f79303c324b94c749a6edbdc37893c2a9bb04935840f WHIRLPOOL a269d8bef3f279bb5b38a340b5053b87d0d43a1a8091175f235fa6bdff93569e4302bd71901f434c734bf8454c2a4087f530d02f351b165c1e8c308d67e2ad67
diff --git a/dev-python/boto3/boto3-1.3.1.ebuild b/dev-python/boto3/boto3-1.3.1.ebuild
new file mode 100644
index 000000000000..3067c8a13510
--- /dev/null
+++ b/dev-python/boto3/boto3-1.3.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/botocore-1.4.1[${PYTHON_USEDEP}]
+	<dev-python/botocore-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/futures-2.2.0[${PYTHON_USEDEP}]' 'python2_7')
+	$(python_gen_cond_dep '<dev-python/futures-4.0.0[${PYTHON_USEDEP}]' 'python2_7')
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/boto3/boto3-1.4.0.ebuild b/dev-python/boto3/boto3-1.4.0.ebuild
new file mode 100644
index 000000000000..997ce9dc64d3
--- /dev/null
+++ b/dev-python/boto3/boto3-1.4.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/botocore-1.4.1[${PYTHON_USEDEP}]
+	<dev-python/botocore-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.0[${PYTHON_USEDEP}]
+	<dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/boto3/boto3-1.4.1.ebuild b/dev-python/boto3/boto3-1.4.1.ebuild
new file mode 100644
index 000000000000..997ce9dc64d3
--- /dev/null
+++ b/dev-python/boto3/boto3-1.4.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/botocore-1.4.1[${PYTHON_USEDEP}]
+	<dev-python/botocore-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.0[${PYTHON_USEDEP}]
+	<dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/boto3/boto3-1.4.4.ebuild b/dev-python/boto3/boto3-1.4.4.ebuild
new file mode 100644
index 000000000000..0db70e9542c2
--- /dev/null
+++ b/dev-python/boto3/boto3-1.4.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/botocore-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/botocore-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.10[${PYTHON_USEDEP}]
+	<dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/boto3/metadata.xml b/dev-python/boto3/metadata.xml
new file mode 100644
index 000000000000..ae5159bc61bf
--- /dev/null
+++ b/dev-python/boto3/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">boto/boto3</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
new file mode 100644
index 000000000000..18bee4347a13
--- /dev/null
+++ b/dev-python/botocore/Manifest
@@ -0,0 +1,15 @@
+DIST botocore-1.4.60.tar.gz 2908934 SHA256 b091e12a6bba367f147631d3fdc4891567d260f79a09bce8a76f15647da0a2bf SHA512 77fb9e20d54455e1a200ef53db64491383e361f318ce903350beb13ce81edc438dc75642afa3c6825a1c5d3d517bd456ce362a7c917a6c725b2fe3638007858f WHIRLPOOL 17dd5a81f8ac8da7b62cfa91b2c202c6360eac760ebb9ed85b8633f4b7cb740bd5178df126052e36b142e48f47f0c1e749e1ed8d2684238df19ac22de643096e
+DIST botocore-1.4.62.tar.gz 2912358 SHA256 9286305627019c6ecba580085046ed9ad5b26a4abdb095da1174258f39fdacff SHA512 bdef1da605541831592c25ccd99fb42e2bbf0a713cce650dcc8bfc04df816af88eaa56875fbb06d2f6efb8cf7b42cadc67cae566e892653e897d2e2625d5ea97 WHIRLPOOL 7486ba04ef97829456f0456a80d483a8c3dcfbfcc4f39659d1217ed649f2d2c180e7b37ed1c582d8347baf66d99b028dfa55824a305e21f783d99f8aabf95819
+DIST botocore-1.4.65.tar.gz 2946032 SHA256 9b4e2d54ad89294e3866888b9711b58ad9923a7850e2ad3245a96e5bf5ec9e6d SHA512 ee3cf9c8b6fd0d6adb7f423c2a72a2d5ac2e7efd314c07c2d5014580b700f26bacb6bc09a75a295b5d508234446640cfed641d39515a8d658ba8c35df3240358 WHIRLPOOL b49274619ec8f06d94e07592e4ba21a83f39241d4aa28c61ef514ec95993ec9769661470ace44778738fd72644fb96954fd3f67077e2ff467643352a5598e311
+DIST botocore-1.4.93.tar.gz 3306809 SHA256 3954b0c3bf67473181e9f6e3347154ba8ac6e66fab9bc07a25bb9e4e165d9726 SHA512 ce4ac735e5413932d5545b6319f63e6080cee8f4e511e3886bd47a6785bf1986236eb8ed48248836b29fc433a015807fae8dfbc3b6dc1f7e94088e380c7b0332 WHIRLPOOL fd29a6ad15ddd8a7dfe6cffafc72b2a83b7b45304bd122d7ddde26f4bb529805396bad3dd261fefc977fac4c004991b03553792a11fa78dc1197107a1892182e
+DIST botocore-1.5.52.tar.gz 3606403 SHA256 bd232581d8720f87d49d14c134b2f563dbb7c4fa887467720bff76e08858a01b SHA512 f8a1ed1b768cbe26e9fc75a81b08dbb012b37576342452acde21f48e9c314093ce1dd7ec8eabcc8c8a14e2209d809450bd4798eddb55215dcc387130243d8bf4 WHIRLPOOL 0c719fb1e7be68f59a76e7394615b836df9ebcf9ac1dda7c2fee1ff468437f6e33d34f5fd2b809680158bf32f0eebf63c8a90a10ed90883354347a8cc758280b
+DIST botocore-1.5.90.tar.gz 3707524 SHA256 675f894c0ba91c8bb94be6954a40272e8c9d1ac9ddab2bee33acb1576fcaaedd SHA512 2a241c29c4874f632932f453954ca15469087b467ed36453db05fa219e81b6aa924aca672f01747de071091ffe6d55fa731ec124f7b47783176c79cf141dc82d WHIRLPOOL d42ec9a4d167d31edd9e65ee6a2cfa65c1ed80d8260f3fbe2fafe2e66f28d0d28f363f0b311e275589b065d2d43151381090b16d61e13aba1d4f4dac487cca35
+EBUILD botocore-1.4.60.ebuild 1297 SHA256 6f2e65401af74097b89ebd7a8661a53f7cb6c258d84c2e51860e20091a7ca8ca SHA512 d5594eb19f14c93b9abe323629c0f1befe84e51070f46e311ec7c7fe9f71d1f44b24d07766f959d04dc997890c93648925e07043e3ee3481ef29089f628c4f85 WHIRLPOOL 72d62985323a85c11a0bef5b9f9055c19fb81255d7b959c912d9b3b4e88eeb944d4ac789e6b00a052fa41d5f565d61b112c72eb448bb22da4a06568e177ea144
+EBUILD botocore-1.4.62.ebuild 1297 SHA256 6f2e65401af74097b89ebd7a8661a53f7cb6c258d84c2e51860e20091a7ca8ca SHA512 d5594eb19f14c93b9abe323629c0f1befe84e51070f46e311ec7c7fe9f71d1f44b24d07766f959d04dc997890c93648925e07043e3ee3481ef29089f628c4f85 WHIRLPOOL 72d62985323a85c11a0bef5b9f9055c19fb81255d7b959c912d9b3b4e88eeb944d4ac789e6b00a052fa41d5f565d61b112c72eb448bb22da4a06568e177ea144
+EBUILD botocore-1.4.65.ebuild 1297 SHA256 6f2e65401af74097b89ebd7a8661a53f7cb6c258d84c2e51860e20091a7ca8ca SHA512 d5594eb19f14c93b9abe323629c0f1befe84e51070f46e311ec7c7fe9f71d1f44b24d07766f959d04dc997890c93648925e07043e3ee3481ef29089f628c4f85 WHIRLPOOL 72d62985323a85c11a0bef5b9f9055c19fb81255d7b959c912d9b3b4e88eeb944d4ac789e6b00a052fa41d5f565d61b112c72eb448bb22da4a06568e177ea144
+EBUILD botocore-1.4.93.ebuild 1310 SHA256 023c230a2cd4a80a83811c9c038642fd9bc7a05edbde42dd557fac9f28104ad6 SHA512 095a3b695c6e5d0fdd4ab7068804eb0beed585f1881992afea50123288493f0476b3b8dad18e9e1d6277b37232aa5ca55404e40e15537ddd57b6a509af7e543d WHIRLPOOL e7ef9bf63ca3260d839865153c76793bac1f2330527dd9139a800f117174b60140006d1aaedf0c283c2cc3ff301ad1c90cd72dcb2952c7cd2587f0445f0daee1
+EBUILD botocore-1.5.52.ebuild 1310 SHA256 023c230a2cd4a80a83811c9c038642fd9bc7a05edbde42dd557fac9f28104ad6 SHA512 095a3b695c6e5d0fdd4ab7068804eb0beed585f1881992afea50123288493f0476b3b8dad18e9e1d6277b37232aa5ca55404e40e15537ddd57b6a509af7e543d WHIRLPOOL e7ef9bf63ca3260d839865153c76793bac1f2330527dd9139a800f117174b60140006d1aaedf0c283c2cc3ff301ad1c90cd72dcb2952c7cd2587f0445f0daee1
+EBUILD botocore-1.5.90.ebuild 1344 SHA256 4b09109964c05f1fd36fa5501f77133dc020ff7fcc1004180419d1c8f2191bdb SHA512 dd834f7e2462a374ff49fa07398679152e02e01f61432332f22b9275e239577481573ccebc79db7355281b66deb3445c97d2f88187784a6328da39b07b9375a2 WHIRLPOOL 925c09e6f5039eb709171ffde518cda5635785fc7c4350c775fee8ae30a71a6f58e1685dcd3a00580250e71843e4bcaf1c3ee24ae686649475f67d30ac9204d3
+MISC ChangeLog 15229 SHA256 ad4ef5f6ea2181365fbe8d679dbcd2734e77d25d1fbaa3402a146add5500f017 SHA512 2d23d22a0016dd8afe1f7d3b8639c5ffe1ee651a7c46e7749425bdf0d5cf0a9e3dcfd8b20a30ad9ca53cda5aef0c5714f0a90db67c08e8b7c773ba4f32923455 WHIRLPOOL 7700bbf842bb82b2efec114ec1cdf5977e577123110589b592615e17b36f9b419f89db2952b253fbb7e7deaf42f5624daf64c46dc818aa560c59fbc0a16015b0
+MISC ChangeLog-2015 479 SHA256 3e53c9fa4c06129b6bcab3ffdbc61c3a57b2efe4e07d3b4ecb798cacd4d72f2a SHA512 2fa2e5d33cef27149e736e44651b86b46c94c1b8df8b8c12f89bc4a7ae8df6d14e7f3556e1083210bb0e93be5298d1906eb065b6aeb39ece66f2fbdb227a8597 WHIRLPOOL f7472f145114fc9323e8a8c3064cd5efe78020aa7f6812620495d4642e3835e6ddd893c49d4a38f26768b53aab9bb49ad3068f03ef973bc73b09621aada99815
+MISC metadata.xml 370 SHA256 f02aa751bdf1340a1fd7d97fe1e5576a1d5526a7f46372cc0d162034a3a3dd2a SHA512 a5f40ad748a356a1f97cadb153c81a3bd1cf1e31b0e3cd98ff808ae1f4be1a7a9425e89340ad4fb4a5de8969be30d9c8c39b518ad50d68d1f757373d80b91abc WHIRLPOOL a2ac4006829209701159a69845ea5a1df9294535f816362d51c8766bad5fdd78c7bc57e53cfd6ebcd033f0065deecaffcef5ddefaf9bf7c445d6812e6215f367
diff --git a/dev-python/botocore/botocore-1.4.60.ebuild b/dev-python/botocore/botocore-1.4.60.ebuild
new file mode 100644
index 000000000000..c664e9bbee76
--- /dev/null
+++ b/dev-python/botocore/botocore-1.4.60.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/botocore/botocore-1.4.62.ebuild b/dev-python/botocore/botocore-1.4.62.ebuild
new file mode 100644
index 000000000000..c664e9bbee76
--- /dev/null
+++ b/dev-python/botocore/botocore-1.4.62.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/botocore/botocore-1.4.65.ebuild b/dev-python/botocore/botocore-1.4.65.ebuild
new file mode 100644
index 000000000000..c664e9bbee76
--- /dev/null
+++ b/dev-python/botocore/botocore-1.4.65.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/botocore/botocore-1.4.93.ebuild b/dev-python/botocore/botocore-1.4.93.ebuild
new file mode 100644
index 000000000000..322ce139a38e
--- /dev/null
+++ b/dev-python/botocore/botocore-1.4.93.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -v tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/botocore/botocore-1.5.52.ebuild b/dev-python/botocore/botocore-1.5.52.ebuild
new file mode 100644
index 000000000000..322ce139a38e
--- /dev/null
+++ b/dev-python/botocore/botocore-1.5.52.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -v tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/botocore/botocore-1.5.90.ebuild b/dev-python/botocore/botocore-1.5.90.ebuild
new file mode 100644
index 000000000000..f9c2630ae401
--- /dev/null
+++ b/dev-python/botocore/botocore-1.5.90.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -v tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/botocore/metadata.xml b/dev-python/botocore/metadata.xml
new file mode 100644
index 000000000000..fcdd4a519ecd
--- /dev/null
+++ b/dev-python/botocore/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">boto/botocore</remote-id>
+		<remote-id type="pypi">botocore</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
new file mode 100644
index 000000000000..a2d790f65368
--- /dev/null
+++ b/dev-python/bottle/Manifest
@@ -0,0 +1,8 @@
+AUX bottle-0.12.8-py3.5-backport.patch 1720 SHA256 6555279b83b8dae80b38fc0c45549c1dc8e2fb367a7f6efc8e6b6dde99dd2bc8 SHA512 10f8b95d77d35db582be9bb937ca0c52050c22faa191f373b34039c6ddec24a8e71ce26f6bc9c3f3af7973670343b2f3131c02ed626e3d161a636f8c9e4cdd2b WHIRLPOOL 42ce896786b4f16736fc0e0ae96a7cd5a4b7ea86c5257f6bbcee1db7051d60aacb8f735e4472a1192f8b4fbf75b23f477e42187cbb252b9180296e0c68b876a8
+DIST bottle-0.12.12.tar.gz 71554 SHA256 3d4b6b0e22f67b421c273105b30d9a21fd147eaf0c1576172378ee034fbf5313 SHA512 cdba3859129680f08b8c641708fd884ccf46d404786cbf48435d752fece998a446f49799e4e05e979b967843866f3e966a35a6cac7aed3270df55fae508bae31 WHIRLPOOL 68bd9399c55409139bd93b588240a3569ff9773b30949d86b5a9bba7882dd6d824cb22883c922f3f910764c9655e0e91fb40b3c9675790a67e1b6330122ab741
+DIST bottle-0.12.13.tar.gz 70870 SHA256 39b751aee0b167be8dffb63ca81b735bbf1dd0905b3bc42761efedee8f123355 SHA512 86d106eb08e0b736a85aa69871f2d1e23c1d6f71948b85718daf131002c53c000e092ffdfe5b36c60460473467a2ca2b5af19767344689ffe638245e6859a80b WHIRLPOOL 4193ca33071e0d87a430f24bf2adaf2a0b02bb576bba4483ce6ef848f91a0202d028f8982e60d3c8946abdc2230ddf63a737346e006b8880c0c5a436b67bb01a
+EBUILD bottle-0.12.12.ebuild 1398 SHA256 12856a543a7af1467d241a991850e5c1ce8400abee806d3165c92a5af078cf9c SHA512 2f188388a75f910aa83e6ca4f92629bf5dad50fc5c6354fbfb925e237345423a277d912fd72470e32ecd3bfe890b051410a637c2eb99c9e5e901a43b95c5ea61 WHIRLPOOL 3c4df50395837bc71c0093409967534c96ba19ac422d804373e66853f50380dbb34c35a691167fa00c3cff8150df50ee9486cc361afabc0ae4d9897135e7417f
+EBUILD bottle-0.12.13.ebuild 1407 SHA256 daa31ee8d03930633c055d0f01e720f77fd59f1ade8861265a8b91b104bd093a SHA512 62fcec603a3d971dcaff9fb0def085f714481f66bef950a0db8c4fcf1a53d5c309af4f7d304542a314949aafe172b7cec6eea649adfbae8ad7a97269f7082731 WHIRLPOOL 871002825906ac25a5941ea915ef9c8e8acee1ceb8deb0a3b36570dfc750966905d73d90bf5e27c967c3c4670602581304ed6dbde8044c3d582c2b73f65f421f
+MISC ChangeLog 3544 SHA256 c812c1d2cd73c2dd37e451531be581b7d7fdd93752d5d361db7e53d9530936cf SHA512 b8aa16dd1b7728fcf8f99ed01cadc28c43c8438c4cc5dd37e81133b5866a572cb88b5f7a45aeafa1137dc425064494001ddfcc76ed95182d7eebddfa2b024cde WHIRLPOOL 7aef496b34adfc61c8d6dcc8d85e362d39b121a4205f8a1f48f04f06925bd5fff4f5ae48761b53e2e1c040a02ca7effd4a38480677e76297b61ae0f28dcb8f87
+MISC ChangeLog-2015 6764 SHA256 a7db6ab906b1c1eab6ed4a5e68661f0c7cb392efd580b7cb1437ddf985851695 SHA512 2091f57661d7fde150e89539beb0ee4a07270ae2ebc224a2411f99f7074deed8a9d8a40bd5397dabfd14611d5897015f584ecfc0ebf1006a9090d7beacd5d208 WHIRLPOOL ab95985e3d917b91eec50acea3997b949f5b1eb1c79ab98fb52c49fbf8cc156872c069801937d665315a003e608b5be2bec38a51adce73125f28f8e39f12814a
+MISC metadata.xml 319 SHA256 c68401be807c9c0b76131bd67a9e63009d04faa20d3311e43315ed1684353b70 SHA512 2ff50f032ea6042a32a7d391906ff95d00115367770423874aa6ee638b1db03fc0b7fabc484e1ecc002eff1e5abf5d45075463b76b7d512535d4820c46b56251 WHIRLPOOL 186df464fcb578f2fdb8ca9e9dae71fb30b5ce43283c25a1fc83c2b494fd713db8e3887f28c38f264b72a31f01d3a5c2b7405ec54bd93b15258c8d22c29b223a
diff --git a/dev-python/bottle/bottle-0.12.12.ebuild b/dev-python/bottle/bottle-0.12.12.ebuild
new file mode 100644
index 000000000000..fb49855fb507
--- /dev/null
+++ b/dev-python/bottle/bottle-0.12.12.ebuild
@@ -0,0 +1,47 @@
+# 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 pypy3 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A fast and simple micro-framework for small web-applications"
+HOMEPAGE="https://pypi.python.org/pypi/bottle http://bottlepy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( dev-python/mako[$(python_gen_usedep 'python*')] )"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.12.8-py3.5-backport.patch
+)
+
+python_prepare_all() {
+	sed -i -e '/scripts/d' setup.py || die
+
+	# Remove test file requring connection to network
+	rm test/test_server.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# A few odd fails in the suite under pypy
+	# https://github.com/bottlepy/bottle/issues/714
+	"${PYTHON}" test/testall.py || die "tests failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "Templating support" dev-python/mako
+	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
+	elog "we do as most other distros and do not install the script anymore."
+	elog "If you do want/have to call it directly rather than through your app,"
+	elog "please use the following instead:"
+	elog '  `python -m bottle`'
+}
diff --git a/dev-python/bottle/bottle-0.12.13.ebuild b/dev-python/bottle/bottle-0.12.13.ebuild
new file mode 100644
index 000000000000..9c67c5945c15
--- /dev/null
+++ b/dev-python/bottle/bottle-0.12.13.ebuild
@@ -0,0 +1,47 @@
+# 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 pypy3 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A fast and simple micro-framework for small web-applications"
+HOMEPAGE="https://pypi.python.org/pypi/bottle http://bottlepy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( dev-python/mako[$(python_gen_usedep 'python*')] )"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.12.8-py3.5-backport.patch
+)
+
+python_prepare_all() {
+	sed -i -e '/scripts/d' setup.py || die
+
+	# Remove test file requring connection to network
+	rm test/test_server.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# A few odd fails in the suite under pypy
+	# https://github.com/bottlepy/bottle/issues/714
+	"${PYTHON}" test/testall.py || die "tests failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "Templating support" dev-python/mako
+	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
+	elog "we do as most other distros and do not install the script anymore."
+	elog "If you do want/have to call it directly rather than through your app,"
+	elog "please use the following instead:"
+	elog '  `python -m bottle`'
+}
diff --git a/dev-python/bottle/files/bottle-0.12.8-py3.5-backport.patch b/dev-python/bottle/files/bottle-0.12.8-py3.5-backport.patch
new file mode 100644
index 000000000000..86e1ac04bc41
--- /dev/null
+++ b/dev-python/bottle/files/bottle-0.12.8-py3.5-backport.patch
@@ -0,0 +1,36 @@
+ test/test_environ.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/test/test_environ.py b/test/test_environ.py
+old mode 100755
+new mode 100644
+index 2b8079b..2feebe3
+--- a/test/test_environ.py
++++ b/test/test_environ.py
+@@ -592,7 +592,7 @@ class TestResponse(unittest.TestCase):
+         r.set_cookie('name2', 'value', max_age=datetime.timedelta(days=1))
+         cookies = sorted([value for name, value in r.headerlist
+                    if name.title() == 'Set-Cookie'])
+-        self.assertEqual(cookies[0], 'name1=value; Max-Age=5')
++        self.assertEqual(cookies[0].lower(), 'name1=value; max-age=5')
+         self.assertEqual(cookies[1], 'name2=value; Max-Age=86400')
+ 
+     def test_set_cookie_expires(self):
+@@ -602,7 +602,7 @@ class TestResponse(unittest.TestCase):
+         r.set_cookie('name2', 'value', expires=datetime.datetime(1970,1,1,0,0,43))
+         cookies = sorted([value for name, value in r.headerlist
+                    if name.title() == 'Set-Cookie'])
+-        self.assertEqual(cookies[0], 'name1=value; expires=Thu, 01 Jan 1970 00:00:42 GMT')
++        self.assertEqual(cookies[0].lower(), 'name1=value; expires=thu, 01 jan 1970 00:00:42 gmt')
+         self.assertEqual(cookies[1], 'name2=value; expires=Thu, 01 Jan 1970 00:00:43 GMT')
+ 
+     def test_delete_cookie(self):
+@@ -611,7 +611,7 @@ class TestResponse(unittest.TestCase):
+         response.delete_cookie('name')
+         cookies = [value for name, value in response.headerlist
+                    if name.title() == 'Set-Cookie']
+-        self.assertTrue('name=;' in cookies[0])
++        self.assertTrue('Max-Age=-1' in cookies[0])
+ 
+     def test_set_header(self):
+         response = BaseResponse()
diff --git a/dev-python/bottle/metadata.xml b/dev-python/bottle/metadata.xml
new file mode 100644
index 000000000000..0701f0aad2af
--- /dev/null
+++ b/dev-python/bottle/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">bottle</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
new file mode 100644
index 000000000000..8e63ce33cdbe
--- /dev/null
+++ b/dev-python/bottleneck/Manifest
@@ -0,0 +1,7 @@
+DIST Bottleneck-0.8.0.tar.gz 1634340 SHA256 f0a980510239f685ebaf4dbc8c9f0e55ac964312e0d11c551208c250d22cc64b SHA512 5b03ce2d0df9d177534d3f1fa02f147b12b23f5fbaa3b2685d1e8b86848c96c54832e0b0b6364479841742785c0b23bcccb51a0ac95675c72efc39693121dcaf WHIRLPOOL 873559617ad5114b953b9824da57bf7d393aa04372ad3c44307fecd875a076864d2509bed4b214372549db97a6c617f5471d1e723ff1a668a3240b7c6ed84a25
+DIST Bottleneck-1.0.0.tar.gz 363223 SHA256 8d9b7ad4fadf9648acc924a6ee522c7cb5b474e75faaad9d90dfd55e2805b495 SHA512 b3edeec0b4c2beeebb08eed8cb7aabb92f736e47c657f1fa580ec36d839941d3d1955209b2286fd9d41c4941b46b97a27049c51bcf5a098d27a19881f570d2d6 WHIRLPOOL f8f0d008b06a701f8c6b1690d5b74c180108d55ea9e8a467c62f76455eff2cf650be6ce676001a4bf7f18d650e1b238d437e5d9bbf60d5b4175af34997b8411d
+EBUILD bottleneck-0.8.0.ebuild 831 SHA256 614512e76081fe814db826c809b367f88f0f64bde90e47f8b7de062a5c86040d SHA512 7db15dfec34df6b82db102aa665ae8b7c5dc19e220ba74ca7cb15d70fb04b989c300dcb57aaa8de003202583e9dcb917be2c80b07f78d3b1f554f46e0093e84e WHIRLPOOL f9ac00f330711d91be691d2349ed305dcf8ed5d00fdc31f6b464b084256843365b03f24bf8a82c7f4fc3ff4305ccbece319ed5ca22ab00b905c98e887306b794
+EBUILD bottleneck-1.0.0.ebuild 863 SHA256 30da9c5231a6e4b62fd63f40b146492404971001f110711cc2a6927934ab0934 SHA512 959d7c17a2c92bfd9b9ea4ebebc03e23ca36faf08af6a9c125154ac1f3cef0b5f5a8e07b45970fd6f9c0df0404d353ccfc8e8a76c853a3d735f7ef5a2ab6972b WHIRLPOOL 3433f130f76d270f0d9d70cabef34a53c11719d56cfcaf32ff9154f37044c2a6c8ba04e87e93332c9daf14dcdcf164af91687eb6da26ff8b4f930dcc04a8d705
+MISC ChangeLog 2835 SHA256 bbafe98612708684b044446b582c1c38db14b2d4c3166824f0fb7e577dbb28dc SHA512 b7d33e33179580e7a8e33ab4f4c123277196c2613734990dc7c65e2035a87779772e5b0466cce5fa33cd5e21ee7cbcb1084b9305d3fd76b41d58c3b4938d224f WHIRLPOOL 97cabac45edee96c5e127fffa70574c4b3a9df6132d161f46b0cc3d43d43c2bc2e5e9732b7d71545381dd75561e588fca4e30f76690e3c0bc860d74ca593486d
+MISC ChangeLog-2015 1408 SHA256 1ea353919e8547b1739b64f02cbb0d341e39a9ae681e634ea320eebcd7d51374 SHA512 cafdd3db1b1e43164287ec97ff46f55f59cd470b4a4cb163891a328dab4887a3a607468292821f7586103a07f60a32c0d5f747b119903cdc6592dfd0508874e5 WHIRLPOOL 105884a0f5fb0137b3f8139418b994325142df26310bca7ae8979df6b0b99dea4a12b9a0ea23b4e9ac638523b4ce4fc43fd94c3e6cb6b430430eac101bba98fb
+MISC metadata.xml 471 SHA256 e569f02eb0f36182f1ce477599ec858cc692aa2f28d232bce5d18f33084e003b SHA512 9f31d5257385cb237ee675671473fcb8e932cb792fadb30bcccccdfad9f1372207e54abc3ec2712735e2250b9a583578d2a3e7e8a32ade30d634f620644c3def WHIRLPOOL f07e4d68adde2e6fc89d6362e969f4d5c2346eb8c740af588e3fa825dac41ddb6bf739e767e48af4d332f410ae409f4d1b815541e62a368e07e5abe1157840b2
diff --git a/dev-python/bottleneck/bottleneck-0.8.0.ebuild b/dev-python/bottleneck/bottleneck-0.8.0.ebuild
new file mode 100644
index 000000000000..c23ccfffde69
--- /dev/null
+++ b/dev-python/bottleneck/bottleneck-0.8.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="Bottleneck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Fast NumPy array functions written in Cython"
+HOMEPAGE="http://berkeleyanalytics.com/bottleneck"
+SRC_URI="mirror://pypi/B/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	emake cfiles
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	${PYTHON} -c "import bottleneck;bottleneck.test(extra_argv=['--verbosity=3'])" || die
+}
diff --git a/dev-python/bottleneck/bottleneck-1.0.0.ebuild b/dev-python/bottleneck/bottleneck-1.0.0.ebuild
new file mode 100644
index 000000000000..3a9f09cbd62a
--- /dev/null
+++ b/dev-python/bottleneck/bottleneck-1.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="Bottleneck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Fast NumPy array functions written in Cython"
+HOMEPAGE="http://berkeleyanalytics.com/bottleneck"
+SRC_URI="mirror://pypi/B/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	emake PYTHONPATH=. pyx
+	emake cfiles
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	${PYTHON} -c "import bottleneck;bottleneck.test(extra_argv=['--verbosity=3'])" || die
+}
diff --git a/dev-python/bottleneck/metadata.xml b/dev-python/bottleneck/metadata.xml
new file mode 100644
index 000000000000..6a33c44cf7c8
--- /dev/null
+++ b/dev-python/bottleneck/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
+  <longdescription>
+  Bottleneck is a collection of fast NumPy array functions written in
+  Cython.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">Bottleneck</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
new file mode 100644
index 000000000000..84b6826c7f5a
--- /dev/null
+++ b/dev-python/bpython/Manifest
@@ -0,0 +1,9 @@
+AUX bpython-desktop.patch 374 SHA256 ce2a6de9b55f40a5dd0cf8177d405af740f58272a4b3cdd5c1ce70164e3ab991 SHA512 41e6e74bc1edb4631d4926588aa361234560b95d63d07c4d7005ea1577a6d324f49ae9dcd0ede2ecaec9532a3e48075040c53deeeaf9e1a97ab7749fedecc0bb WHIRLPOOL 66e8e114cd4ae9fd94f474deb29a380497103049876049f7fe64c9a1aea95307828ebb8732fd82980d0021954e83f1c66793f1c19a23b3023af285539c7657ea
+DIST bpython-0.13.2.tar.gz 158551 SHA256 a1870a78e44ed6ef54aa906c58234cb0d12011f2e9a49dc29bd5d9423abfbde2 SHA512 6bf74c9618bf92fc6ca23c9020b17219c64b16f159773624b67f87875c962857bde2dd4b03da621da7c8d50622739f95a880638c7c536f5f0dbf510c71f5a874 WHIRLPOOL 71da7518100bd73868ab53e1d13cb8831b0f6629713b993729948f38df52262537b8605f9304ff0edeca5e4f4d3435677c61e84b2d6fc54b2d66df74e756318c
+DIST bpython-0.16.tar.gz 201898 SHA256 faf3ddf602bd8ad7f133011778966333b9dcefbc3100df27a200b648906f655f SHA512 1173d720aa679e4a6079c7febd36abbffa901604c99c6d1ce1e940a8fbcf8a4ba7bc526de0ef5290e3859a4384d1cd5cbef62fd9f056ddcb545b64d69d103a5b WHIRLPOOL 13aaebc84f9685cd617d5d88fcb48531020925412fa1a0ecda223907b441279bb7639938f06d21a216cf9c4137d3bd1c122f00dcfa8a88d03abba0471c2124c2
+EBUILD bpython-0.13.2.ebuild 1845 SHA256 e58088929b4a7530fee8553ded851228d60890747d1436b7469a2baf7435d429 SHA512 b71f202e0dfc74117e6ee776aa7f9e811c8ab5ce4a901f2539d7857d71b2c63a80f2af54b203f2d30e50b613189e02fd05f69ae2632c3801d1ef89f116e56b5c WHIRLPOOL 51ee9e1e13ac2184c413e2699d61b91e939b385a1cd152f877dfb3382484969070a1d1efea52e2ec2def8fd0a1efab04dcc0711211939e0f1dd8023d3670541d
+EBUILD bpython-0.16-r1.ebuild 1487 SHA256 82cf7176d3c2dab267fe24fdf59680e67702e551853392f078750c7eda8eea3d SHA512 21e61a4b6d34837c71b40b3248d48c37a547f966d28f429ae6742c173589808afc27b28441287e0c40312bab5a3a56fec25223de70ceb9d949f49c544bed0563 WHIRLPOOL 6b6e32d443d30bb5bf8a12f3fba28937083af26f54d8f853a97a0b368681de32c92dabce742f01627f211b0cf02c3bf9ae0dc812186d697b80fb938174b11ef6
+EBUILD bpython-0.16.ebuild 1483 SHA256 db5345a6754ed2dc84340e554cfef37712c884b5ffb14f5e450b886c01c205a3 SHA512 cd22c5d6ad08bc534255b5a58d9593fa75505b4b05064b520cb6653ff224a56e76e0e2bf37f55de4ea2254d2dbbf744a90b40f02c82978393feece634217bcab WHIRLPOOL 143908f8d5f3c67a3d9d73b82a79e1358dcf7640bcd6216a4f6dcf873c604d1483c029c25272b5b0bf36ed4ed06018f3111223d656c8e55e026c708748f17728
+MISC ChangeLog 5474 SHA256 3fafbeda290d63f0cb19ae1e773708077b7a5c2a91f700c1da5fe18d9a86ae03 SHA512 80027d6ac72838e277c6b38a53e0683d984e433e6e7ef3d7003769a54719e67d53185f5e7b20ea053eecdbe78d242a57fce8ed27d82f0e406d8b014f30149b23 WHIRLPOOL 49426da98a8b4da25f7c6c39aa1b631ee14af0351b33924155937997d52fe5b411ad697c13538b5b397190b18d982c04eaaf72055861db21da52fa61fca7dbb9
+MISC ChangeLog-2015 7599 SHA256 3ca81c103dd35b21dc80c41de171a09c2e20117c4f9cb4b1d5eb8903e15d1445 SHA512 b4e7f17fde19109c81cf6fa4cfc45b6ab6b8889b72ae22bf56e2fca2e8acdd052dc4537edd324649df646adc1ae7111c9d4aa3f38e63be5f348475ebe6c6a88a WHIRLPOOL 89a3383f596f952191db4656619d58eaf95b6fd2504cd2868715d0333a53cd33e79b76da0c1a7244185ec3ed513cb98eb1589c2d13a35214b7c0369dc1834dfc
+MISC metadata.xml 634 SHA256 9a680b22590c325f1646f792b3287fe52f2043cdfb000eb1b5d5d9b373975be4 SHA512 931f1b6bd0d78d5fdc74ee6a6fa77027280015235dbf9ae4ffce127965bf353505c28876ca74edd6d071b8f4cff0f46be2f7622467e74710ac3cd66c998ad847 WHIRLPOOL ab207affc3c6a2ecc5d83ec610a5038f6be55381f3afd63eaea269c858909d6d94248f4b9e2bf2e851187bf6e8cc9e3073a4f72242763d34a9c8c6648c416171
diff --git a/dev-python/bpython/bpython-0.13.2.ebuild b/dev-python/bpython/bpython-0.13.2.ebuild
new file mode 100644
index 000000000000..7241d07a77d8
--- /dev/null
+++ b/dev-python/bpython/bpython-0.13.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
+HOMEPAGE="http://www.bpython-interpreter.org/ https://bitbucket.org/bobf/bpython/ https://pypi.python.org/pypi/bpython"
+SRC_URI="http://www.bpython-interpreter.org/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc gtk test"
+
+RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	gtk? ( dev-python/pygobject:2[$(python_gen_usedep python2_7)]
+		dev-python/pygtk[$(python_gen_usedep python2_7)] )
+	dev-python/urwid[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+DOCS=( AUTHORS  CHANGELOG  TODO sample-config sample.theme light.theme )
+
+PATCHES=( "${FILESDIR}"/${PN}-desktop.patch )
+
+# Req'd for clean build by each impl
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html -c doc/sphinx/source/ \
+			doc/sphinx/source/ doc/sphinx/source/html || die "docs build failed"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use gtk; then
+		rm -f "${D}"usr/bin/bpython-gtk*
+		# delete_unneeded_modules() {
+		rm -f "${D}$(python_get_sitedir)/bpython/gtk_.py"
+	fi
+}
+
+python_test() {
+	pushd build/lib > /dev/null
+	# https://bitbucket.org/bobf/bpython/issue/289/test-failures-in-latest-release-py27-py33
+	sed -e s':test_enter:_&:' -i bpython/test/test_repl.py || die
+
+	"${PYTHON}" -m unittest discover || die
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/sphinx/source/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/bpython/bpython-0.16-r1.ebuild b/dev-python/bpython/bpython-0.16-r1.ebuild
new file mode 100644
index 000000000000..1d5312b81354
--- /dev/null
+++ b/dev-python/bpython/bpython-0.16-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
+HOMEPAGE="http://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.python.org/pypi/bpython"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/curtsies-0.2.11[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
+
+# Req'd for clean build by each impl
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html -c doc/sphinx/source/ \
+			doc/sphinx/source/ doc/sphinx/source/html || die "docs build failed"
+	fi
+}
+
+python_test() {
+	pushd build/lib > /dev/null
+	"${PYTHON}" -m unittest discover || die
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/sphinx/source/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/bpython/bpython-0.16.ebuild b/dev-python/bpython/bpython-0.16.ebuild
new file mode 100644
index 000000000000..ac6d639be794
--- /dev/null
+++ b/dev-python/bpython/bpython-0.16.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
+HOMEPAGE="http://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.python.org/pypi/bpython"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/curtsies-0.2.10[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
+
+# Req'd for clean build by each impl
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html -c doc/sphinx/source/ \
+			doc/sphinx/source/ doc/sphinx/source/html || die "docs build failed"
+	fi
+}
+
+python_test() {
+	pushd build/lib > /dev/null
+	"${PYTHON}" -m unittest discover || die
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/sphinx/source/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/bpython/files/bpython-desktop.patch b/dev-python/bpython/files/bpython-desktop.patch
new file mode 100644
index 000000000000..8598679089c9
--- /dev/null
+++ b/dev-python/bpython/files/bpython-desktop.patch
@@ -0,0 +1,8 @@
+diff -r -U1 bpython-0.11.orig/data/bpython.desktop bpython-0.11/data/bpython.desktop
+--- bpython-0.11.orig/data/bpython.desktop	2012-04-05 04:06:42.000000000 +0700
++++ bpython-0.11/data/bpython.desktop	2012-11-15 17:20:09.000000000 +0700
+@@ -7,3 +7,3 @@
+ Type=Application
+-Categories=Development;Utility;ConsoleOnly;
++Categories=Development;ConsoleOnly;
+ StartupNotify=true
diff --git a/dev-python/bpython/metadata.xml b/dev-python/bpython/metadata.xml
new file mode 100644
index 000000000000..982839606a08
--- /dev/null
+++ b/dev-python/bpython/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grozin@gentoo.org</email>
+		<name>Andrey Grozin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>Syntax highlighting and autocompletion
+	  for the python interpreter
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">bpython</remote-id>
+		<remote-id type="bitbucket">bobf/bpython</remote-id>
+		<remote-id type="github">bpython/bpython</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
new file mode 100644
index 000000000000..2c574b4a7602
--- /dev/null
+++ b/dev-python/breathe/Manifest
@@ -0,0 +1,3 @@
+DIST breathe-4.6.0.tar.gz 67655 SHA256 9db2ba770f824da323b9ea3db0b98d613a4e0af094c82ccb0a82991da81b736a SHA512 8e26a102c38a916818ecf1a5d6a0f6f01de4285a98dce7abda6f2a401f8e5db380150b24bd2bf6f430a53324be5f1da28d084d8d4ae3969ec03914b88bc3908f WHIRLPOOL 7db736ed8f9219595c9a75977c6f019c335c26f91684a787cb296ecbeb2e6d5f02ab64966df1085758a5301ea05a034e25bf4003db6146c3beac3781a92e70e2
+EBUILD breathe-4.6.0.ebuild 591 SHA256 b9cf112dffa3e474ee1c1898fdd97ef4fdc2126d0dc88ca9aa0dc1a5fba21d3f SHA512 701fce44df1caf89a1fd72b49a15e151a9e246fe420a0712a5a1bae3fbf13d3fc99a199a48284279f4345b93022964369a180c2a671261b8a57e5e30ba38c3c1 WHIRLPOOL 659cab104012b3f888d9b48b9fc5932db8dda78c83e70f149357923a8a31ce2d2a375b912cc69f57fde2052df0c47a17ea2a90c3b2c332cb22af3fb9e1e1ac03
+MISC metadata.xml 796 SHA256 f1660cbade87a3735e7f95017bfed514d83bdeb55d2d5bf33fcd7568b50889bb SHA512 734fa318039a2831c3cd35fa9f710739406b627f1e0f1d34c772d1d9dae53ea6921c21a236cabf00e3a1d3d2e95f053ea39436b1f539d9fa0c2bf1abbaf9018f WHIRLPOOL 063adfea2f4e17aba6c2276d61c77ebcb16475c2e697235ff7bc9e50c951897974e3952d74d66ea7183dfc89b1946f177c3bf49e42537cd1c5340919b4e3aa00
diff --git a/dev-python/breathe/breathe-4.6.0.ebuild b/dev-python/breathe/breathe-4.6.0.ebuild
new file mode 100644
index 000000000000..ed1e407e4760
--- /dev/null
+++ b/dev-python/breathe/breathe-4.6.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx Doxygen renderer"
+HOMEPAGE="http://breathe.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	app-doc/doxygen[latex]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/breathe/metadata.xml b/dev-python/breathe/metadata.xml
new file mode 100644
index 000000000000..c4975d2a8a68
--- /dev/null
+++ b/dev-python/breathe/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+    Breathe provides a bridge between the Sphinx and Doxygen
+    documentation systems. 
+    It is an easy way to include Doxygen information in a set of
+    documentation generated by Sphinx. The aim is to produce an autodoc
+    like support for people who enjoy using Sphinx but work with languages
+    other than Python. The system relies on the Doxygen’s xml output.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">breathe</remote-id>
+    <remote-id type="github">michaeljones/breathe</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/brython/Manifest b/dev-python/brython/Manifest
new file mode 100644
index 000000000000..1320aab51f73
--- /dev/null
+++ b/dev-python/brython/Manifest
@@ -0,0 +1,7 @@
+DIST brython-3.3.2.zip 10140819 SHA256 396326912d311d56ec6e2ba413f059e8f2242cd6ebb43154031f427df917a98c SHA512 bfe93b238805de90a4421a3a0c210ed5bc863cf4609949252813d61b96bd1b52aa927eeac621932bec68ac8b23be793adee53327be387bae6a95db7ea89b5155 WHIRLPOOL b25c136e30a943e188987a556d600006e7b54adf4243109d1ca27747e2b16f6201b504ea35f5f4ddc22ad32d66ad4ab02e0ccef306439b8a6ef7f5b7149dc826
+DIST brython-3.3.3.zip 10040987 SHA256 b48f236a55a220520ca98b5c1caf705d8eff1742e622c8440d7bc23632ca6984 SHA512 e182a6c859cd18b90b205f751260b0b5c8d250746e48844c59cd61608dfdaf0fd6f0f25b8061de9505b7c5d094ac68fe57536c52cb31adb48f04c2cc5624e249 WHIRLPOOL b604b4a0bba610fc84ca059696ed37fe8b6735a806c7616fb1f41a378271ab16e76f4f063a51568ec774af2ff694551ea4f67970a77230551223aaa1071c4be8
+EBUILD brython-3.3.2-r1.ebuild 742 SHA256 2e92caf867908cd054caedfcd7b478091d57806645d17b05d434df55af780242 SHA512 55d34698e55243e8b757cdb141b1ec445c54520039b09f54f829d0319d90767f76a8af2356c9599fba9121ac6c15710d7a114f9f1465c628f27ac606e58a6c60 WHIRLPOOL afccfb3cdb5da9946c7ed5fab8d285c10e37d2b7c06bed7f08787af3c783fb30c4d3884540babd31f48792d491679cd52e0198a43048fc475de6bc9903f9e631
+EBUILD brython-3.3.2.ebuild 629 SHA256 b814117347e7fea9165721d5bd8ede12c68f3abfefd6958b56b2725fe1980805 SHA512 f5a1a99ce16b6f699ec1884b572cbed011c1cb07eebf1600e335211e4f9ec8f0ab03e9b56edcf3bfc8a84270092c7a2058917ea3ec34acfb2adff0c8785f772e WHIRLPOOL ad386a249fbadd0b17e1769610fe571ec15a92b7c04d53dfb25aeca05327f3650a5a8a5024f2c498c91e27510c2de27ce026e67733f61b4557af52ad266f1342
+EBUILD brython-3.3.3.ebuild 742 SHA256 2e92caf867908cd054caedfcd7b478091d57806645d17b05d434df55af780242 SHA512 55d34698e55243e8b757cdb141b1ec445c54520039b09f54f829d0319d90767f76a8af2356c9599fba9121ac6c15710d7a114f9f1465c628f27ac606e58a6c60 WHIRLPOOL afccfb3cdb5da9946c7ed5fab8d285c10e37d2b7c06bed7f08787af3c783fb30c4d3884540babd31f48792d491679cd52e0198a43048fc475de6bc9903f9e631
+MISC ChangeLog 1339 SHA256 af02bf87f0fd711b68b70489fd54424bdf3a012a37a7b9040e3022e2649a22fa SHA512 f5651ea91c4b92c41c28d108b15bea0f5a544ea4047a14ea81f28f5e3a825f68b9fde24535827ce11774e429b4119751964a50357633c2fde99409b42756c660 WHIRLPOOL 90a96158e10582a9a7ad875cf8623e2b518dbc46296545b53b0a2a58471df7221f3baf2539eee221907259220fb14dd8463e0f230bf2310bb03726b14a437796
+MISC metadata.xml 467 SHA256 5f8066c489d7fdeed7170a4fb2d2ce1fae46de5275969d7e03ef522301fc7caf SHA512 a9c3c34e617cc5a3ea80f30c8de8964712af694d8048197662ce2c68d521279761751824a55c68bde5b75444495f176cbcc7d867c46924729391d3488fc3100a WHIRLPOOL 1ab2f1e9001cf664ca5e632effdc17a5ce5e34d5374e87343e4044793f3a0a94a97ca3277acdddc7ccf07233571c41364a73d280b9b9931bb17e0f7e66f5bf2d
diff --git a/dev-python/brython/brython-3.3.2-r1.ebuild b/dev-python/brython/brython-3.3.2-r1.ebuild
new file mode 100644
index 000000000000..ca62031b60cc
--- /dev/null
+++ b/dev-python/brython/brython-3.3.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit webapp python-single-r1
+
+DESCRIPTION="A Python 3 implementation for client-side web programming"
+HOMEPAGE="http://www.brython.info"
+SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+need_httpd_cgi
+
+pkg_setup() {
+	webapp_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	dodoc LICENCE.txt README.md
+	rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
+
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_src_install
+}
diff --git a/dev-python/brython/brython-3.3.2.ebuild b/dev-python/brython/brython-3.3.2.ebuild
new file mode 100644
index 000000000000..230fd50c5231
--- /dev/null
+++ b/dev-python/brython/brython-3.3.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+DESCRIPTION="A Python 3 implementation for client-side web programming"
+HOMEPAGE="http://www.brython.info"
+SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="dev-lang/python:*"
+DEPEND="${RDEPEND}"
+
+need_httpd_cgi
+
+src_install() {
+	dodoc LICENCE.txt README.md
+	rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
+
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_src_install
+}
diff --git a/dev-python/brython/brython-3.3.3.ebuild b/dev-python/brython/brython-3.3.3.ebuild
new file mode 100644
index 000000000000..ca62031b60cc
--- /dev/null
+++ b/dev-python/brython/brython-3.3.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit webapp python-single-r1
+
+DESCRIPTION="A Python 3 implementation for client-side web programming"
+HOMEPAGE="http://www.brython.info"
+SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+need_httpd_cgi
+
+pkg_setup() {
+	webapp_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	dodoc LICENCE.txt README.md
+	rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
+
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_src_install
+}
diff --git a/dev-python/brython/metadata.xml b/dev-python/brython/metadata.xml
new file mode 100644
index 000000000000..cd18966fc62c
--- /dev/null
+++ b/dev-python/brython/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Gentoo Python Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+    <name>Patrice Clement</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">brython-dev/brython</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
new file mode 100644
index 000000000000..441094e5cb42
--- /dev/null
+++ b/dev-python/bsddb3/Manifest
@@ -0,0 +1,7 @@
+DIST bsddb3-6.1.1.tar.gz 450571 SHA256 6f21b0252125c07798d784c164ef135ad153d226c01b290258ee1c5b9e7c4dd3 SHA512 f5e95edf2d18f04f4a306450a67ad675902b102cde9fdebd870727c2649ba7dd759206708c9225af871e0811e17812ef46c90ea6854eb3209ba36c86900ffb01 WHIRLPOOL c8552008d8de272ef665ca54ec134a8bf64e31c41b4738c9ff461d5d2f6c045f20bc9604bff2acbb86222d838649297d8e96060ec060f2da342ce0314e0b2211
+DIST bsddb3-6.2.4.tar.gz 242397 SHA256 4866aa32ad6ec6d5ff401d9aec8da07c4e84502298dc27f7c758545e243550e6 SHA512 15bb714242b05649a7c40ccd153979e596340ef039c89549b215fc5438a12fedb44150195063d2783c6c06ede3552506e31e8013b6b0431d27dd7e14975c08b0 WHIRLPOOL e835c62753bed8fb26a82452b0b1946be169ea863c3fa532e05e1cbeab21eae34291175fdcc73fa376924cdd577606dcddb5b560b560735cb39a81b3d3e01bb2
+EBUILD bsddb3-6.1.1.ebuild 1949 SHA256 c248c5c5090bc725fec3e0ac4dcf2c7ac4c6e36cd8d5d10085bc9f015560b722 SHA512 4288d31c4c38a8f4d8e2319b6a8a81712fb6fe77f8b4baa87a3d65459abacad1fa8c28b437c9fde8035404c518949f65229e0a545a37f35f21d3ffac2c40febf WHIRLPOOL 6931ddd4f3e89157a7d0898b714bbbcf9d6dde4e35096f20f60fa0851c617944e682b3f9d8c026673f91f49a92241a78587e89788f75443bf21dcdc36d171293
+EBUILD bsddb3-6.2.4.ebuild 1939 SHA256 969cb8b7797aac2245d6fe6b9ffe43831175948292d81f150e0608dc7ff755e6 SHA512 181bacbcbe8e688e007543c09b4166d00f3d21b336a0a1e047d10d1a4d3dab7bbb693f0737ad575adcfb48903305d9424b3daca42f8f1aa7d9f1e588fe39ed91 WHIRLPOOL c12144e9dfea29ac9708b822561482386eaac7c8ef8fb9352c968cbb3e742f9062ab3983df5c6413f643422bdb79d92270999b0b2345aa8e8eaeebb17d9ab3de
+MISC ChangeLog 5721 SHA256 ec4f5d57c439b29e8e9f727f797d15e4916d5940b4cf7589c8ec593bf85c1bc4 SHA512 367b6589989b044332e79b16f51f327bf61e8d4055040d5e64f7c185939fdcf08607b4fce2e602667a5827d591574db09a4023ebfabf4c344ef9dcb63be13eec WHIRLPOOL 24208602b2a5b56e62ae05c6eb30f76bf7d669a013b871b9973d3d33d437c86e993aabb91a27d9fbe06440d29c0705d4144e16d82ecfae1d3355bf9b0d10d8d3
+MISC ChangeLog-2015 15337 SHA256 2fd0b3f84c3882480b302e525b108ef7b4bd5b5f130b6abb085e1adb028d8258 SHA512 90adeb34d36a03d3b0e946755143ac073e09527aecbbf42f71ccbe46b2008b7ecceed2cfefa5686764535c2e1d963e3caa1eab4559cfdc6c1f6ff610582fb830 WHIRLPOOL c3e57e4764e86e0bef9bdcd7fb514dc9e5de1edf469f7ddc183760497cb912a2d61492f27efeced48bda509f77e40209abb1c02ddb29a5d5e7f2814e8f86e886
+MISC metadata.xml 309 SHA256 cd2d29268ad77f7d8783f368387bc54e6168f311ed010662fd82d72554e51728 SHA512 edf575ec4a06047d837caffa6c8c8a35d53c5236d806e6d2b4804943617000d8f745f1b94fecfe2af117be823821669e6b7e9aea2a427aa2d97b1eb6ec11eb20 WHIRLPOOL 6f176f5a8a7cd15d9677a904be3dd1997a76ff53570adba32933c224f6901a1664c0e22e045ac895f4ce6d0e50e147ae318ea65cfb2587cfa5f46a28fad33190
diff --git a/dev-python/bsddb3/bsddb3-6.1.1.ebuild b/dev-python/bsddb3/bsddb3-6.1.1.ebuild
new file mode 100644
index 000000000000..335bb3826ac8
--- /dev/null
+++ b/dev-python/bsddb3/bsddb3-6.1.1.ebuild
@@ -0,0 +1,75 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit db-use distutils-r1 multilib
+
+DESCRIPTION="Python bindings for Berkeley DB"
+HOMEPAGE="http://www.jcea.es/programacion/pybsddb.htm https://pypi.python.org/pypi/bsddb3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	>=sys-libs/db-4.7:=
+	<sys-libs/db-6.2:=
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	# This list should be kept in sync with setup.py.
+	if [[ -z ${DB_VER} ]]; then
+		for DB_VER in 6.1 6.0 5.3 5.2 5.1 5.0 4.8 4.7; do
+			has_version "sys-libs/db:${DB_VER}" && break
+		done
+	fi
+
+	# Force version.
+	sed -e "s/db_ver = None/db_ver = (${DB_VER%.*}, ${DB_VER#*.})/" \
+		-e "s/dblib = 'db'/dblib = '$(db_libname ${DB_VER})'/" \
+		-i setup2.py setup3.py || die
+
+	# Adjust test.py to look in build/lib.
+	sed -e "s/'lib.%s' % PLAT_SPEC/'lib'/" \
+		-i test2.py test3.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	# These are needed for both build and install.
+	export BERKELEYDB_DIR="${EPREFIX}/usr"
+	export BERKELEYDB_INCDIR="$(db_includedir ${DB_VER})"
+	export BERKELEYDB_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export YES_I_HAVE_THE_RIGHT_TO_USE_THIS_BERKELEY_DB_VERSION=1
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	if python_is_python3; then
+		PYTHONPATH=Lib3 "${PYTHON}" test3.py -v || die "Testing failed with ${EPYTHON}"
+	else
+		PYTHONPATH=Lib "${PYTHON}" test.py -v || die "Testing failed with ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/bsddb3/bsddb3-6.2.4.ebuild b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
new file mode 100644
index 000000000000..debbad654805
--- /dev/null
+++ b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit db-use distutils-r1
+
+DESCRIPTION="Python bindings for Berkeley DB"
+HOMEPAGE="http://www.jcea.es/programacion/pybsddb.htm https://pypi.python.org/pypi/bsddb3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<sys-libs/db-6.3:=
+	|| (
+		sys-libs/db:6.2
+		sys-libs/db:6.1
+		sys-libs/db:5.3
+		sys-libs/db:5.1
+		sys-libs/db:4.8
+		sys-libs/db:4.7
+	)
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# This list should be kept in sync with setup.py.
+	if [[ -z ${DB_VER} ]]; then
+		for DB_VER in 6.2 6.1 5.3 5.1 4.8 4.7; do
+			has_version "sys-libs/db:${DB_VER}" && break
+		done
+	fi
+
+	# Force version.
+	sed -e "s/db_ver = None/db_ver = (${DB_VER%.*}, ${DB_VER#*.})/" \
+		-e "s/dblib = 'db'/dblib = '$(db_libname ${DB_VER})'/" \
+		-i setup2.py setup3.py || die
+
+	# Adjust test.py to look in build/lib.
+	sed -e "s/'lib.%s' % PLAT_SPEC/'lib'/" \
+		-i test2.py test3.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	# These are needed for both build and install.
+	export BERKELEYDB_DIR="${EPREFIX}/usr"
+	export BERKELEYDB_INCDIR="$(db_includedir ${DB_VER})"
+	export BERKELEYDB_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export YES_I_HAVE_THE_RIGHT_TO_USE_THIS_BERKELEY_DB_VERSION=1
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	if python_is_python3; then
+		PYTHONPATH=Lib3 "${PYTHON}" test3.py -v || die "Testing failed with ${EPYTHON}"
+	else
+		PYTHONPATH=Lib "${PYTHON}" test.py -v || die "Testing failed with ${EPYTHON}"
+	fi
+}
diff --git a/dev-python/bsddb3/metadata.xml b/dev-python/bsddb3/metadata.xml
new file mode 100644
index 000000000000..f91cbe0b667a
--- /dev/null
+++ b/dev-python/bsddb3/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">bsddb3</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/buzhug/Manifest b/dev-python/buzhug/Manifest
new file mode 100644
index 000000000000..4452702505cf
--- /dev/null
+++ b/dev-python/buzhug/Manifest
@@ -0,0 +1,5 @@
+DIST buzhug-1.8.zip 26529 SHA256 0f8453de32424abd2e0dea963a1d0adc7ec893c6c1311887d3ce87231a8e62a7 SHA512 e2354980f175485223b68ca0afee4ec07505a6f7f874e16e04b99b91e19930acda6005834dbf8c2ee318d357716f3fa7c8a0db3c15fc17ffd7c880a4c378ab66 WHIRLPOOL cd491baa3c9c5d6239417d93a24caccb063e42036d5f179e4d3faf400f218ccef2d661ca2944466ddf1dc8fb48f2e864c813b0ce0b5985a981ec805fd61235eb
+EBUILD buzhug-1.8-r1.ebuild 532 SHA256 cadaefb3b18409766c61013e8d90f9bae5eb618c90f808d2093b12aa06133d7f SHA512 3603a8aeba4a72b34d560150ee1d077411890ba3bd5fa535733cd586d50191b542df13eb70d7c33717fe47f1aa6e17474962655a0ba24d36966efb2e63c1cad0 WHIRLPOOL 90afe6a9c51f2e844b51d8d74e16774a61170f157c77d30eef92abb0450f52b2b3806af7faeb590f0a8f597c4196ab5da3c33d29690e5f5c73852edcd5878123
+MISC ChangeLog 2571 SHA256 1cc98eae38e55a99120a03d4f2b511e92066a51895101947b5f536dcb09a3907 SHA512 c159b3ea6016d613e7a5b4776d5e724a29bf42a8c545290f9b05ccfeaeb21f0aac74b0e957b6ec5036e6f05985c88e3e4a6e986c7eefb7e7243b25d968e3fce2 WHIRLPOOL 659f664feca3f10952c24cf0281ec7d57ae935aeb9a70485a269d8f7cb12ef17455069e0a015b8b2cff95ef57f950d4391bcccbc2a38252162bc2a309b4b934b
+MISC ChangeLog-2015 2754 SHA256 9254ad16484fd9cb11f4cb07fa3ab0b773934dc8bbcdeb2ae379e3f7ed665e70 SHA512 fe0e6bb035dc7c67aaf74274de4ba3b777579b953be237394a5fe0b0bf7c8695c1109f946122a35f9a2782cd88c281c6bd5c70d84cc1c2470e9156dffd1d08b3 WHIRLPOOL ea8bf25f6bedda9336abe5cb70cf38524d68c624c6508690add708f6376965e6b8ad875fe5927f5e87b8e2652e20beb677c2c4de0b2a20f4664faab802e6bd91
+MISC metadata.xml 316 SHA256 06057ffe7ebce0019b72b5fbaa701ea743b25c19f973c4b176dff1892f49843b SHA512 2d36baac74fd2759305463b0caa7718043fcf0cb5c18a57ea2b7ddfffd9aef34bd3d8c617c9be97369988715ca465b8c6b80aaadcea2dda0147c3c61e9c853b3 WHIRLPOOL adf689ecad71a511dc41f306005e2dab7fb43ad32d2b46404f8af2b38cc0b0c0849009973cdc3ec1622c7ca51421a43727af0e9872bac7c6aa84cde7f6987a73
diff --git a/dev-python/buzhug/buzhug-1.8-r1.ebuild b/dev-python/buzhug/buzhug-1.8-r1.ebuild
new file mode 100644
index 000000000000..85e223a52328
--- /dev/null
+++ b/dev-python/buzhug/buzhug-1.8-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast, pure-Python database engine"
+HOMEPAGE="http://buzhug.sourceforge.net/ https://pypi.python.org/pypi/buzhug"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND="app-arch/unzip
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/buzhug/metadata.xml b/dev-python/buzhug/metadata.xml
new file mode 100644
index 000000000000..6e68ab46d677
--- /dev/null
+++ b/dev-python/buzhug/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">buzhug</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/bytecodeassembler/Manifest b/dev-python/bytecodeassembler/Manifest
new file mode 100644
index 000000000000..1196b82948cc
--- /dev/null
+++ b/dev-python/bytecodeassembler/Manifest
@@ -0,0 +1,5 @@
+DIST bytecodeassembler-0.6.zip 52734 SHA256 05d56f7ed3eb7c85912380c31bfe3622063176418d63d5bbd74ce99e5456ae0f SHA512 95f90a1b6e1a307d8754eea301ae187783460fa8df3163f26253b8ebec16b31a8899a1d27c13158c5cb97763c7057f83b1dc1f642b5e2e9e5b844837a5208363 WHIRLPOOL 8d41029dc6a8aecfbe2faec72a3e0e70a279a96d5994a658e9d1a8514f8edf8987cad2a32b80d414d5b09c090e74b2ab1e36ce4e03f0f66cb664466b83a71b0e
+EBUILD bytecodeassembler-0.6.ebuild 751 SHA256 43cc58c3056d59664f687b94553c7dda50d25b5d9cbc6819d176eb070917b71c SHA512 7d9a5ee9e11c537ed49d90c88b57b0bb294ff670c7e0b09eb950a53c6ef762b2297400c05168cd89c12b5f6883caa7b28064dfa49005fec37cb5e57f57d5a9c2 WHIRLPOOL b5dcb5dbf090593f49d702551eec872fe0b1f538b38eae1a61d743eb83b4a64b68b512ede27bd81c165c1372e8e4901db6834534286248abcc0f0f132b226934
+MISC ChangeLog 2606 SHA256 cd15fc8373ca97a53e501f9d066977dc10ec6d47a2033e8b71ce38b180620d17 SHA512 611700d64dd54150f283c614fcf172b8391956cdf76a572a62b384d6d3aeaf9544cd85378fe60f4fadbee4490b756bf3fb96ddfd69defdc04de9c0c8e82c8c54 WHIRLPOOL dc063cc8d1d7f2ccede50edebaa7d2f7d61871fcb84aff0ce6d36e6f6fd85875b969dd53664887ae00fb6ec9dfb323ce919aac7f0174ff0b7ab67a4acd6b92f3
+MISC ChangeLog-2015 1093 SHA256 9a760735af775f5081609d225232890e055bb0fc2194fc5fb8babaa4868b330f SHA512 b203558305127db29b012957b8990943e770ca3c98a3fc4b6446bdc9c12738a11fd61f58a16dc55217f8a2c790920718451972e0b59b73c70de271499467eacd WHIRLPOOL e87e22d6491b3ffc221b01fd50dbfca68e5721252cd07ce70ea6a09e1e3dece878069991b214d29144849b8c9e3114fa63f3b4b00e0de8ed1c8421f7bf3c2256
+MISC metadata.xml 330 SHA256 5394c15d99e1ed57c628e0ca0d985a5bd1397c23f73f982203261fa55d7720f0 SHA512 82d945c76a9881e9c5f8ffd049bb95889c6d44dc378c360dfc2f45140c27f41fb99169bf42b111eccfdf87801734fc2174dd9e6f1cf47cd6e4505f3524c64c4d WHIRLPOOL d9898bf611d4c963da1c3aa52b8ca4245e557e252e961dda848b8b8318f020731cb01cf19b33faa458416e7377a2edbb5d1dc6c1d8ae97ff658320dbf5a519fe
diff --git a/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild b/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild
new file mode 100644
index 000000000000..8a63991f0910
--- /dev/null
+++ b/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_PN="BytecodeAssembler"
+
+DESCRIPTION="Generate Python code objects by "assembling" bytecode"
+HOMEPAGE="https://pypi.python.org/pypi//BytecodeAssembler"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="app-arch/unzip
+	>=dev-python/symboltype-1.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+python_test() {
+	"${PYTHON}" test_assembler.py && einfo "Tests passed under ${EPYTHON}" \
+		|| die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/bytecodeassembler/metadata.xml b/dev-python/bytecodeassembler/metadata.xml
new file mode 100644
index 000000000000..05fbea0b3259
--- /dev/null
+++ b/dev-python/bytecodeassembler/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">BytecodeAssembler</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cached-property/Manifest b/dev-python/cached-property/Manifest
new file mode 100644
index 000000000000..6fff43c96e0a
--- /dev/null
+++ b/dev-python/cached-property/Manifest
@@ -0,0 +1,11 @@
+DIST cached-property-0.1.5.tar.gz 7434 SHA256 2d07bd19af2ba5eb1d3c042e2b81c2cd02dc5b0890253cb14ae10f1d34f7f86b SHA512 f5a01e64eed78cc3377bd053b0662dc4f904db7c1ea47b155e1613e6ed413fb6693e4893916518f9e53589373ebe099724d296306a9854d8d8df66b62ed9ce1b WHIRLPOOL cd5faae8024124ddd50f77fd6ee6dd6599756c7e5509d73ebcf4dea2867b066f61c40cc7f9be3144ff3295cd590f3b35925e586f1d9bbf97f40a0416ea7a5f8d
+DIST cached-property-1.0.0.tar.gz 8210 SHA256 041a60a616d59b13026c98b8e1f2b82b7f4ea049bcff44a86d4a0253ba1e2768 SHA512 771615418853d3a2a24567fa3f6dc931a02d0013abd38c26a2822cc0ab3228972e7f03e51a69478defc617491f81b76040d34a0e6683719b09b485c85196d948 WHIRLPOOL d557cadfa246a62feebac8eb81eed52d5087d38ccb0528a37492a4b83fe93278df458589cadab4238527c421e270d841c971e40c2a4ff25d8cf875f709799922
+DIST cached-property-1.2.0.tar.gz 9162 SHA256 e3081a8182d3d4b7283eeade76c382bcfd4dfd644ca800598229c2ef798abb53 SHA512 0d05bad187d30b4354d8fa93d181d753c6e27e43a84891bd3bcc1c1449fe6d57d7fc1eecdbdc097f8c25e4cfa331811db5a6e23f77891848edc2817162259cd6 WHIRLPOOL 21667352edb4a763cabfbdc73dec7d6d464632207eb960eb5fa80b97b93aa964e09ba01bb226465ef6edc2737757ee57369fe0048520a22d5f91d5267baf436f
+DIST cached-property-1.3.1.tar.gz 9648 SHA256 6562f0be134957547421dda11640e8cadfa7c23238fc4e0821ab69efdb1095f3 SHA512 3349751d442ca6e7d4e792c8b076735d5308d68244af9c03044f3d72d619a5c3d7d5dbef434caa954db4b983245bfe646d4a25c99aec39f32d99751edd9e233f WHIRLPOOL 75f0c2f8ff2b5892ad93825b8d02c18bc5e58199d13209b7e1fe3bf7ff9dfe17d5579c1748676614b4699ca8693a29dbb8e919c626afd7f8ef4e0a9fd2f5b226
+EBUILD cached-property-0.1.5.ebuild 591 SHA256 aee7c3b88dc5aa20e3a4835c87936da4b001adef056abbe5b5e027f94e58d17f SHA512 eaf5d64c5842b120f8b5442ac4efbc0d089edadc591983e4d28029c45f50149f75615b450e01129ef896ad2e377e2facb010e93a162a01e6e0ba675444637b98 WHIRLPOOL 309f33403584d09a911d5181eb9ae6ca7c67585b30b6e4aa28d52c0cdcc2ccd85b2237c5c5712d384d366c0244cacd15f0c8e454952145211aadfd1f1d163c14
+EBUILD cached-property-1.0.0.ebuild 591 SHA256 aee7c3b88dc5aa20e3a4835c87936da4b001adef056abbe5b5e027f94e58d17f SHA512 eaf5d64c5842b120f8b5442ac4efbc0d089edadc591983e4d28029c45f50149f75615b450e01129ef896ad2e377e2facb010e93a162a01e6e0ba675444637b98 WHIRLPOOL 309f33403584d09a911d5181eb9ae6ca7c67585b30b6e4aa28d52c0cdcc2ccd85b2237c5c5712d384d366c0244cacd15f0c8e454952145211aadfd1f1d163c14
+EBUILD cached-property-1.2.0.ebuild 591 SHA256 aee7c3b88dc5aa20e3a4835c87936da4b001adef056abbe5b5e027f94e58d17f SHA512 eaf5d64c5842b120f8b5442ac4efbc0d089edadc591983e4d28029c45f50149f75615b450e01129ef896ad2e377e2facb010e93a162a01e6e0ba675444637b98 WHIRLPOOL 309f33403584d09a911d5181eb9ae6ca7c67585b30b6e4aa28d52c0cdcc2ccd85b2237c5c5712d384d366c0244cacd15f0c8e454952145211aadfd1f1d163c14
+EBUILD cached-property-1.3.1.ebuild 626 SHA256 05d00c7167b1fc373c9d2d76b0d6da97c6b791a0025e5827c533073c067ea94a SHA512 690af4b5aa5a8c0a0e4e516bf4ce983f7ccf28847f22d7f45f97e287ff657661672268573ae9702da6c429bfe3b8c0aee9a30c0c1bdadfff3eb9854ded2df6ff WHIRLPOOL 5cd045c7d18f23c1f13a691e77e7a29f9231b87b253e183acb85c600be2e81770d46b384bf323f6cd0e843ea9eec2091e20eb91620c7f3845e9244cb7409887c
+MISC ChangeLog 2874 SHA256 438ca8f878476cbc141f03d683f309e8b4ac023274f503353277b1bf435d5634 SHA512 2d20f66e5554858edaab215dddb106addbd42d64d4a2b604de5494ee992596e9337649ffbd24e81d47af0492ba5bcd512a466b6a36de3f9fa843ec85eeb650c7 WHIRLPOOL fc2a484f2f914df7682813d3a6b83395b4a6677ed1afacf61f7a968188979930af4cbf00fb4b6be136f06f350d8e752108f37f04a31a703ed50f46464ddd3087
+MISC ChangeLog-2015 1161 SHA256 668a0d0bf388d77a8d33f4b152543518845443bae0cb47a4260889d06bd2403b SHA512 85648058b5b70218283e756dd2f246e66256b57d41c764ce5e0a53f01799a461805f3ba15abd99d421eda86057aef35046f5d6aead10194773366370a756e9d8 WHIRLPOOL 8be0e7019b1b732a327353a67091810f32ebaca10f5afc025765912384edff791294d578eca1d1d95612f87d9516192b6979518b6156bfe04db217830bfb7b99
+MISC metadata.xml 489 SHA256 80b784b6cdb6c94bf8a3ffc0c528758c94eb46c347aaf6c4d6ee6109931fd002 SHA512 cecc6d43fcd54d1a949a60380d91a313d0464e0858be0fd544a76232f04961eca2530ebddaf6daabc5f050bdfe12092c99028c4a9cd33a14f23c0b43befe7def WHIRLPOOL 596ca1e2b0da0d52b0d1a701bd61102398cad7959f8c3a96d480a0e21a83ed4af48378a9c27300528ae24e261e06a278951d861343af68f8ba420afc1b772b11
diff --git a/dev-python/cached-property/cached-property-0.1.5.ebuild b/dev-python/cached-property/cached-property-0.1.5.ebuild
new file mode 100644
index 000000000000..b8d189a859a6
--- /dev/null
+++ b/dev-python/cached-property/cached-property-0.1.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A cached-property for decorating methods in classes"
+HOMEPAGE="https://github.com/pydanny/cached-property"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/pytest )"
+RDEPEND=""
+
+src_install() {
+	distutils-r1_src_install
+	dodoc README.rst HISTORY.rst CONTRIBUTING.rst AUTHORS.rst
+}
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/cached-property/cached-property-1.0.0.ebuild b/dev-python/cached-property/cached-property-1.0.0.ebuild
new file mode 100644
index 000000000000..b8d189a859a6
--- /dev/null
+++ b/dev-python/cached-property/cached-property-1.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A cached-property for decorating methods in classes"
+HOMEPAGE="https://github.com/pydanny/cached-property"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/pytest )"
+RDEPEND=""
+
+src_install() {
+	distutils-r1_src_install
+	dodoc README.rst HISTORY.rst CONTRIBUTING.rst AUTHORS.rst
+}
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/cached-property/cached-property-1.2.0.ebuild b/dev-python/cached-property/cached-property-1.2.0.ebuild
new file mode 100644
index 000000000000..b8d189a859a6
--- /dev/null
+++ b/dev-python/cached-property/cached-property-1.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A cached-property for decorating methods in classes"
+HOMEPAGE="https://github.com/pydanny/cached-property"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/pytest )"
+RDEPEND=""
+
+src_install() {
+	distutils-r1_src_install
+	dodoc README.rst HISTORY.rst CONTRIBUTING.rst AUTHORS.rst
+}
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/cached-property/cached-property-1.3.1.ebuild b/dev-python/cached-property/cached-property-1.3.1.ebuild
new file mode 100644
index 000000000000..e4264f287693
--- /dev/null
+++ b/dev-python/cached-property/cached-property-1.3.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A cached-property for decorating methods in classes"
+HOMEPAGE="https://github.com/pydanny/cached-property"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? (
+		dev-python/pytest
+		dev-python/freezegun
+		)"
+RDEPEND=""
+
+src_install() {
+	distutils-r1_src_install
+	dodoc README.rst HISTORY.rst CONTRIBUTING.rst AUTHORS.rst
+}
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/cached-property/metadata.xml b/dev-python/cached-property/metadata.xml
new file mode 100644
index 000000000000..39f7deddac0c
--- /dev/null
+++ b/dev-python/cached-property/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cedk@gentoo.org</email>
+		<name>Cédric Krier</name>
+	</maintainer>
+	<longdescription lang="en">
+		A cached-property for decorating methods in classes.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">cached-property</remote-id>
+		<remote-id type="github">pydanny/cached-property</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
new file mode 100644
index 000000000000..3b3eba60f223
--- /dev/null
+++ b/dev-python/cachetools/Manifest
@@ -0,0 +1,8 @@
+DIST cachetools-1.1.5.tar.gz 13378 SHA256 9810dd6afaec9e9eaae5ec33f2aa7117214a7a3f8427e70ab23939fe4d1bf279 SHA512 2565fa8666dffe5cbc349f80e719e0ae0df3ec36de3843f368fa67777b4e957c81f8c32f7d6eb704ea1fda5c2851bf57d68e563afa63ed0f7664d3615671f998 WHIRLPOOL 6118a940e3eea2b13a8c0544da87089cdb548b85de5c176f1449bb17e335b7fd975be66e6a33c2b5eb8cd04ad0f15f8e84810c3431dcfeab61627d28158780a7
+DIST cachetools-2.0.0.tar.gz 18592 SHA256 715a7202240dc20dbe83abdb2d804d543e2d4f07af146f53c82166bd75f3a628 SHA512 b1e7a6ed87a82a981f6c9b27bc96f26fdae241a12db85ff890538935e957d7ea88688e20a000691466bdb7db053f8c2145385dfcec6f5f4d84dd812ca419752d WHIRLPOOL 1ea550d341b6586381b83b672eac41411b041a04ee579d5424215d69d0a3ac603f79b98165d97100abf64ee1e15aab100cbb0c50082a0ad65446e5b552d34e23
+DIST cachetools-2.0.1.tar.gz 18790 SHA256 ede01f2d3cbd6ddc9e35e16c2b0ce011d8bb70ce0dbaf282f5b4df24b213bc5d SHA512 4caad0676dab2a2ab922138c8305c7e40ac671aaec59ce502428608217976045af7a714c51567ff020987d3bf90f0c9c51645a59bb4f68d377e1f8dbed24bade WHIRLPOOL 372a28e0f01087bae226ffdde9e7f9d4858f94046d390859faca702ddc19f62da17fb2faff16b9651f7646c498cb865d2eda846a32f0c1b2be7520b67202a264
+EBUILD cachetools-1.1.5.ebuild 443 SHA256 c43a62e73809f054c562d716d8d01fcee6b75cf91dc1d4a0259cb083caa9d1e3 SHA512 902e1c8c6149da1318d4a585052e009bd7fea4a90d2544a343b7640348ac2bb535685c74e3779a79e0a35d860ea0c1167c6e6a493c2aec88dc1208ef2def35aa WHIRLPOOL 48202f3fc2cb1bb51dd76d18ad62dd45d5de34265e736ee2f1ddae0dbcdb74d9230514f1bd901c38c55712eeeed24181f9a608711ae48d2a1f7ccb88157881a4
+EBUILD cachetools-2.0.0.ebuild 571 SHA256 a0034e010cfe60627abfe20abb05be0dc82e9e2d66cea5720f91c68d9e6ae25b SHA512 2b9ba5970d3730b88baea3a981493cee8504f9444b23aca0a3563e6ca9318fe7ddf38dfb9e962fd5f997cc01107b2a878fa2e92a8ce2c94b5f1ccf5e33fc16fd WHIRLPOOL e1fce14bed930072fa58536c5aa0cbe794b3516d879cf860491db5967d623c7b44ab6b0a0b6b4a135619f07c07acdac13de84ac669a797c3aa469e7a544d7eb3
+EBUILD cachetools-2.0.1.ebuild 571 SHA256 a0034e010cfe60627abfe20abb05be0dc82e9e2d66cea5720f91c68d9e6ae25b SHA512 2b9ba5970d3730b88baea3a981493cee8504f9444b23aca0a3563e6ca9318fe7ddf38dfb9e962fd5f997cc01107b2a878fa2e92a8ce2c94b5f1ccf5e33fc16fd WHIRLPOOL e1fce14bed930072fa58536c5aa0cbe794b3516d879cf860491db5967d623c7b44ab6b0a0b6b4a135619f07c07acdac13de84ac669a797c3aa469e7a544d7eb3
+MISC ChangeLog 1650 SHA256 ff6644db8f1e1dc6e25d4a34ad2badc19dc3a292b9e7d0dc4d4d37cad7abad81 SHA512 3af318503cdc7078c6d7a2f95e444e9cb8423a48b7617c33a9e52fbaa869b1d75f84a8281bca20a6c28f965d7d3d4e2bd3e84876705d968ba59ad328b1a11493 WHIRLPOOL 8aa8cbc18425335be1eacb2a8ba6576a75c6ba565fe9914e03974701a41b0487596ff99e5a972c143fa157f7ddd5948f58011bcf103ca9d0adb3efda54857938
+MISC metadata.xml 327 SHA256 f00fce31f119e991fa4da7be413b6748e8f96301dbe7179f4f7879b9fdfcd68f SHA512 7eb94b86c09ed93f498beb76dbdf7217a1bcf48ac817c44ae197e20285b18a336f7cae113ab48a52900eb214be133cde6b52760386d10b75ad8810921a127a7c WHIRLPOOL 123a9ebbef80ac154984886ef87ca7b6bdb47bfd9eb4e5bf1df40ddce847c6f589b4c9991e8d49f938159be7d1fa12704d62ac648ed5d2f0f5d9f1fed7aa81b2
diff --git a/dev-python/cachetools/cachetools-1.1.5.ebuild b/dev-python/cachetools/cachetools-1.1.5.ebuild
new file mode 100644
index 000000000000..29819db959e8
--- /dev/null
+++ b/dev-python/cachetools/cachetools-1.1.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible memoizing collections and decorators"
+HOMEPAGE="https://pypi.python.org/pypi/cachetools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/cachetools/cachetools-2.0.0.ebuild b/dev-python/cachetools/cachetools-2.0.0.ebuild
new file mode 100644
index 000000000000..cd68328fa25f
--- /dev/null
+++ b/dev-python/cachetools/cachetools-2.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible memoizing collections and decorators"
+HOMEPAGE="https://pypi.python.org/pypi/cachetools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/cachetools/cachetools-2.0.1.ebuild b/dev-python/cachetools/cachetools-2.0.1.ebuild
new file mode 100644
index 000000000000..cd68328fa25f
--- /dev/null
+++ b/dev-python/cachetools/cachetools-2.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible memoizing collections and decorators"
+HOMEPAGE="https://pypi.python.org/pypi/cachetools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/cachetools/metadata.xml b/dev-python/cachetools/metadata.xml
new file mode 100644
index 000000000000..a0193029a637
--- /dev/null
+++ b/dev-python/cachetools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">cachetools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
new file mode 100644
index 000000000000..da0d5bf607c8
--- /dev/null
+++ b/dev-python/cairocffi/Manifest
@@ -0,0 +1,10 @@
+AUX cairocffi-0.7.1-test.patch 2041 SHA256 76a48bb068836e7fd61985b6e97d93f1c0dd7d1a6a0d05c8a71863c328928a78 SHA512 b9191efa17f28becb4bf1f296b80bbd63d024c80d01e4211b334953272bf27e6029bcd113c0adc17d77bf27a31b609fe51b5b9374158d6a10763a9235e57a3a0 WHIRLPOOL dc7d7825215c8b793d8d5fdfe35bceb3b55140b9997ab48520a7d0af2c9e7de8cc117b3b29540d979ddf61daf74dffdd026e7b95cd72764494f21a72b74ae32d
+AUX cairocffi-0.8.0-tests.patch 751 SHA256 f9e4f3a48672e0083c84789a7a761b71fbd43da3f0765f671787dce2e6bdb278 SHA512 8e852c5769c726e85e8144c48fa78ba569d5c2e6d499bc92e37f5565dbebe6bcbc6e6a07ef3ecf8bf072a1fa2f83b614d01567ec198cfa86bf40a8b384462501 WHIRLPOOL 81e0792075601429080848c442071e1dd054e6c9cc4bb7c6b1a1add756009f53dbe623e036b023871e98e151690fdd928090ba1d62e146177ab30bacb1ff6b64
+AUX mapping.patch 426 SHA256 f45c749473bee0128b08db6dee6721397997f5ef804cb4f15969796678f8e8d6 SHA512 ba09a19ff80b14275db9bcec51a372779adb6b2d969a9c07c11d9ba23de094460f2a84a837add9cb1f77084e0cfb791437fcf6c9bb67ea3958d2a006969b6d2c WHIRLPOOL 58d9c303eefaf49144caec5e1a06912ebe332b1f889fce999ce95f7c8af9ace4973b0fb1b8c8e58b563435d6f4c1f9366c2bdecc80b0aa7b959d4f973c91f974
+DIST cairocffi-0.7.2.tar.gz 75337 SHA256 e42b4256d27bd960cbf3b91a6c55d602defcdbc2a73f7317849c80279feeb975 SHA512 a4b5798ee713a8847ebd21ef328b3e0a94403ce1e80ac108f6d8e4abffbf96551542bb5c848550d82bcebb3d9f645c90ea87fc3eb254bd8e9d57b6a55db76de1 WHIRLPOOL e907633b46dce856df4777598250e40da7a39ee4b6621376d30698237fb0a463d7f8bdf8e8838aa104d0751de62b6172057a0f8d1f53ce8315b419d3b3f64c5c
+DIST cairocffi-0.8.0.tar.gz 79217 SHA256 65f21e6786e2b255ab1d3fda53a365a3565bb1808cabbbe59d99a797c61d3545 SHA512 70179e05ca4a4efeaa39ade1ee1a96d280d198ecff5ae8c8fc634c24d8922ea6a3e1eb6cf5f55c5fc9d3f5b2fc3131a53051690eb86712762d8b6400df8a630a WHIRLPOOL 9ed0f3fbe1a70f4b0137617855f74a4390f936cfe6e69a86a7893f4ebde2453813e36409d113cf6a9036b90319886c3c269682518fdac86776c5d87adadd4bd2
+EBUILD cairocffi-0.7.2.ebuild 1357 SHA256 94f0963cd897f864d66f42ba19c07af1023ade094a6f45233f97678c8edf2af3 SHA512 aeb5df8305885f8ef3cdd129da957c5adc8776d113003d5cc248663a971d08f693bd675b3da85c057ae5ad6f54ee9e1498b499a9e6e4bd74da2d7e60300d4949 WHIRLPOOL e6dddbcb4110e653fd5f0c99cf59297b4e3d450af075409b3bfc4a910fcf54d63ca207f3298ea2078597e03d585a60adc4f5e7327a4c6a11784c7f3d7f4828f8
+EBUILD cairocffi-0.8.0.ebuild 1263 SHA256 ba5b6c099a156914795a061e5229e914fe84da48a19853339c68453dad0885a5 SHA512 d9d8d11e79691f661ac209d8454097043606d350c0e82f5e032493a6004db7ff3f3d54cfdaa2ac6faf14d517fd266d2f0129a781a8e285edd996e55627c91de2 WHIRLPOOL 3e5fcf40a90301a8da62b03f371ea91a67721089b01e260b268af9b9fb3aae35d47ab50ca4a12c8bc1854ef15faefef3875861d44f054f1528165647178a7903
+MISC ChangeLog 4299 SHA256 4311b3d717152310ee2b91b5f12045b2b3521d38e00970a4cd4ed994ff060fe0 SHA512 37cdb879f76281f047f52e6feaabaa66eb38b7eced122913e457931814b5bb42ad0a27864874337a290fbbd24fce9aa16d680ff1f03e432ec964ac06ebf01312 WHIRLPOOL 7e19e633e279de52d727a0e26992f3269b962628313ed6aa2d08b15370c6a434ee214b9f798af16417c2d2148952b85e61f83e23f1cf55b4f089afe820bb729a
+MISC ChangeLog-2015 2260 SHA256 5387e57f7f018ba49e3efd81b65b403cd427332aac488705c0cde734fd124ef8 SHA512 c0ce0d467c2674c4cc8689893ee27ab87b08839c935af8637c6406a1f1af236dcdb873f88115f9dd509fa850740c41224708b7d20811aac5028fe1a6faddaa37 WHIRLPOOL dd03a0f58c3be6412e97378190a696e6db9f2530bff7e5b5aa28056bebb1ac84b54a3017d704ddcad53e3728204e2e2acdf6c64706c1ef26eed4a0402b41f952
+MISC metadata.xml 379 SHA256 0c264a1c71c095ced1251210322848bdd1c5243b8c09194a86165edbeff94206 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215 WHIRLPOOL 37c7fead5cd3153a19c69cb5362832c96015784480d7e5f7614a8560ec2a0e4cd4b2355fed3a337a2fca507ac08e90b1e48805242082f109ece2ff8c4db205d0
diff --git a/dev-python/cairocffi/cairocffi-0.7.2.ebuild b/dev-python/cairocffi/cairocffi-0.7.2.ebuild
new file mode 100644
index 000000000000..25ff30599269
--- /dev/null
+++ b/dev-python/cairocffi/cairocffi-0.7.2.ebuild
@@ -0,0 +1,57 @@
+# 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 )
+
+inherit distutils-r1
+
+MY_PN="${PN}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
+HOMEPAGE="https://github.com/Kozea/cairocffi"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
+IUSE="doc test"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
+	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
+	x11-libs/cairo:0=
+	x11-libs/gdk-pixbuf[jpeg]
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
+
+PATCHES=(
+	# Intersphinx cause the usual d'loading of objects.inv from TWO online sites
+	 "${FILESDIR}"/mapping.patch
+	 "${FILESDIR}"/${PN}-0.7.1-test.patch
+	 )
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	py.test -v --pyargs cairocffi || die "testsuite failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cairocffi/cairocffi-0.8.0.ebuild b/dev-python/cairocffi/cairocffi-0.8.0.ebuild
new file mode 100644
index 000000000000..00e16dec7530
--- /dev/null
+++ b/dev-python/cairocffi/cairocffi-0.8.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1 virtualx
+
+MY_PN="${PN}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
+HOMEPAGE="https://github.com/Kozea/cairocffi"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
+	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
+	x11-libs/cairo:0=
+	x11-libs/gdk-pixbuf[jpeg]
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	virtx py.test -v --pyargs cairocffi || die "testsuite failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cairocffi/files/cairocffi-0.7.1-test.patch b/dev-python/cairocffi/files/cairocffi-0.7.1-test.patch
new file mode 100644
index 000000000000..b5a2b4530fb8
--- /dev/null
+++ b/dev-python/cairocffi/files/cairocffi-0.7.1-test.patch
@@ -0,0 +1,58 @@
+ cairocffi/test_cairo.py |  3 +--
+ cairocffi/test_xcb.py   | 13 +++++++------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/cairocffi/test_cairo.py b/cairocffi/test_cairo.py
+index 6b19ee1..542103d 100644
+--- a/cairocffi/test_cairo.py
++++ b/cairocffi/test_cairo.py
+@@ -1049,7 +1049,7 @@ def test_font_options():
+     options_1.merge(options_2)
+     assert options_2 == options_1
+ 
+-
++#@pytest.skip("https://github.com/SimonSapin/cairocffi/issues/65")
+ def test_glyphs():
+     surface = ImageSurface(cairocffi.FORMAT_ARGB32, 100, 20)
+     context = Context(surface)
+@@ -1064,7 +1064,6 @@ def test_glyphs():
+     assert 5 == x1 < x2 < x3
+     assert clusters == [(2, 1), (1, 1), (1, 1)]
+     assert is_backwards == 0
+-    assert font.glyph_extents(glyphs) == font.text_extents(text)
+     assert font.glyph_extents(glyphs) == context.glyph_extents(glyphs)
+ 
+     assert context.copy_path() == []
+diff --git a/cairocffi/test_xcb.py b/cairocffi/test_xcb.py
+index c8a6e70..0c6bab9 100644
+--- a/cairocffi/test_xcb.py
++++ b/cairocffi/test_xcb.py
+@@ -118,14 +118,14 @@ def test_xcb_pixmap(xcb_conn):
+     gc = create_gc(xcb_conn)
+ 
+     # create XCB surface on pixmap
+-    root_visual = find_root_visual(xcb_conn)
+-    surface = XCBSurface(xcb_conn, pixmap, root_visual, width, height)
+-    assert surface
++    # root_visual = find_root_visual(xcb_conn)
++    # surface = XCBSurface(xcb_conn, pixmap, root_visual, width, height)
++    # assert surface
+ 
+     # use xcb surface to create context, draw white
+-    ctx = Context(surface)
+-    ctx.set_source_rgb(1, 1, 1)
+-    ctx.paint()
++    # ctx = Context(surface)
++    # ctx.set_source_rgb(1, 1, 1)
++    # ctx.paint()
+ 
+     # map the window and wait for it to appear
+     xcb_conn.core.MapWindow(wid)
+@@ -157,6 +157,7 @@ def test_xcb_pixmap(xcb_conn):
+ 
+ @pytest.mark.xfail(cairo_version() < 11200,
+                    reason="Cairo version too low")
++@pytest.skip("https://github.com/SimonSapin/cairocffi/issues/65")
+ def test_xcb_window(xcb_conn):
+     width = 10
+     height = 10
diff --git a/dev-python/cairocffi/files/cairocffi-0.8.0-tests.patch b/dev-python/cairocffi/files/cairocffi-0.8.0-tests.patch
new file mode 100644
index 000000000000..04839fd08efd
--- /dev/null
+++ b/dev-python/cairocffi/files/cairocffi-0.8.0-tests.patch
@@ -0,0 +1,23 @@
+--- cairocffi-0.8.0/cairocffi/test_xcb.py
++++ cairocffi-0.8.0/cairocffi/test_xcb.py
+@@ -118,14 +118,14 @@
+     gc = create_gc(xcb_conn)
+ 
+     # create XCB surface on pixmap
+-    root_visual = find_root_visual(xcb_conn)
+-    surface = XCBSurface(xcb_conn, pixmap, root_visual, width, height)
+-    assert surface
++    #root_visual = find_root_visual(xcb_conn)
++    #surface = XCBSurface(xcb_conn, pixmap, root_visual, width, height)
++    #assert surface
+ 
+     # use xcb surface to create context, draw white
+-    ctx = Context(surface)
+-    ctx.set_source_rgb(1, 1, 1)
+-    ctx.paint()
++    #ctx = Context(surface)
++    #ctx.set_source_rgb(1, 1, 1)
++    #ctx.paint()
+ 
+     # map the window and wait for it to appear
+     xcb_conn.core.MapWindow(wid)
diff --git a/dev-python/cairocffi/files/mapping.patch b/dev-python/cairocffi/files/mapping.patch
new file mode 100644
index 000000000000..14cae286617c
--- /dev/null
+++ b/dev-python/cairocffi/files/mapping.patch
@@ -0,0 +1,10 @@
+diff -ur cairocffi-0.5.3.orig/docs/conf.py cairocffi-0.5.3/docs/conf.py
+--- docs/conf.py	2013-05-24 10:33:32.000000000 +0800
++++ docs/conf.py	2014-04-08 16:09:39.648229837 +0800
+@@ -14,6 +14,3 @@
+ exclude_patterns = ['_build']
+ autodoc_member_order = 'bysource'
+ autodoc_default_flags = ['members']
+-intersphinx_mapping = {
+-    'http://docs.python.org/': None,
+-    'http://cairographics.org/documentation/pycairo/2/': None}
diff --git a/dev-python/cairocffi/metadata.xml b/dev-python/cairocffi/metadata.xml
new file mode 100644
index 000000000000..53244c2d5005
--- /dev/null
+++ b/dev-python/cairocffi/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">cairocffi</remote-id>
+    <remote-id type="github">Kozea/cairocffi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cangjie/Manifest b/dev-python/cangjie/Manifest
new file mode 100644
index 000000000000..61fd8fc48e1d
--- /dev/null
+++ b/dev-python/cangjie/Manifest
@@ -0,0 +1,6 @@
+AUX cangjie-1.2-cython-022.patch 1161 SHA256 f4a3c053840ce84edbc20db5f91a56a21aefbcb14ebc72261d53b193fab75637 SHA512 5aec7c8128ef2be30449550385a41949a69b0316bf4e6c7695143d67c5d2b07d261dd7c8a17b5e3eabc2e041beea995fdf81d1e413123f9f0f2f735e33c66d78 WHIRLPOOL 3bde9c20811fbf587b7e905e68e34e4c28f4e39ef3440b5dc78a452d1e7e7e460f2d70dcde72a3b9388e5e7c76aa109d1ef50a59367ce2117a207e5f511ddc61
+DIST cangjie-1.2.tar.xz 221524 SHA256 bc9115904f65581a11e43044c83e999e583468d1bb98c04b33ea059205e07c10 SHA512 4cc3e0e4a77b671c93fe39f17c970d458d6d935c1efa33f9d8de0a0311ed6c3a444fd41431d553f70f3e96065f8136801128d8b16c86d0340c78ab560bd9e63f WHIRLPOOL 72f3b532bf149df0740fc9d3fd137416cb29a0db81285fd67cd51d3a47d34fd2a32655302a912d5caf8666ef55550d2f84242021163bfff12d5734b2d820f13c
+EBUILD cangjie-1.2-r1.ebuild 1095 SHA256 7f252cd9ba6e7838d4dd593b66ca8cc538ddb02681c3844871cfc806f2aedee5 SHA512 05eed5385a68209fa6806c107ebcf12ecf8e518ae59c95fa9caaa8f8a9acc2d663e0c0fdb92b2d7ce69a0da178f962e1d497aa65da4354d7a0b510ac3157858a WHIRLPOOL f709a6b6b595f5e54dc0a4598ca2e8c6ccd33f5dbb319aabc62ebb93b43ec2c147df210393462af3afc629e3d00580c82263ea4e4fd54fb5f37a355a907bf05b
+MISC ChangeLog 3159 SHA256 659abcf463f0d08227d2cdcccb9b27d7eac1b0052279d9ad2be9927d42235074 SHA512 a6bfc8a169d69735d3fb1fdce2c2b5c9fd06bd887301dd0a6acca463a262c66d4aa5797b3cb4800ceee120f0360f2e3514577a6177041fe491c4344e3c18a59a WHIRLPOOL 90532af85bbb0859a20385fc30537e3ebaca9ad31d2e360fa05df8957790e6b656d4ec20853cf3d02c7b81e9981d83f9402d97de2a5beabbef19667c68a35531
+MISC ChangeLog-2015 928 SHA256 68c48af9ad8170907669a4835b0613384670f7ed39358646e5f7f3f4e6f8cf46 SHA512 56f0af45f2d1ddc58c18a58e51c568836cae45fbd263670560c24bb28c33be251adee67ea345dc4d1de81503ca8afc8d8a270cded48f17b68ba4b80df1fc0d07 WHIRLPOOL b96ebc05b411a3117879f9ee59023fd38b6244c77eedcb3a2330d75c8daf913b7468ebbbfa65f9289d9d43ae5f1fc19f9371b994283c446df1ebadce432d2fb6
+MISC metadata.xml 633 SHA256 ecb33be2d30d3f322d20f42335ee9409930648cca728257314f9257655f102c4 SHA512 e32e7bf621dc38f1f885563f51db880874b1d350a36f3a2d568e6ca7c95a59f819d969e9e4f3cf451232cab4c324cdd9e0a652b3d02b462f7cf8cdfb913fd991 WHIRLPOOL 3f2e342ec6ffeec63d86be42c518c02ab516aa5b278a3c288d92ced79d584570fb43177c472861485d626dedcda14c1284ab35f5628804cf4397d9c35063a6ef
diff --git a/dev-python/cangjie/cangjie-1.2-r1.ebuild b/dev-python/cangjie/cangjie-1.2-r1.ebuild
new file mode 100644
index 000000000000..d3daf09ed18c
--- /dev/null
+++ b/dev-python/cangjie/cangjie-1.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit autotools python-r1
+
+DESCRIPTION="The Python bindings to libcangjie"
+HOMEPAGE="http://cangjians.github.io"
+SRC_URI="https://github.com/Cangjians/pycangjie/releases/download/v${PV}/cangjie-${PV}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	app-i18n/libcangjie
+	${PYTHON_DEPS}"
+DEPEND="
+	${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-cython-022.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	myeconf() {
+		ECONF_SOURCE="${S}" econf PYTHON="${PYTHON}"
+	}
+	python_foreach_impl run_in_build_dir myeconf
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+	einstalldocs
+
+	# package only installs python modules
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-python/cangjie/files/cangjie-1.2-cython-022.patch b/dev-python/cangjie/files/cangjie-1.2-cython-022.patch
new file mode 100644
index 000000000000..ac2695c9e139
--- /dev/null
+++ b/dev-python/cangjie/files/cangjie-1.2-cython-022.patch
@@ -0,0 +1,25 @@
+diff --git a/Makefile.am b/Makefile.am
+index 6762b97..c0cc699 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -47,19 +47,19 @@ pkgpyexecdir = $(pyexecdir)/cangjie
+ 
+ src/cangjie/_core.c: src/cangjie/_core.pyx src/cangjie/_core.pxd
+ 	$(MKDIR_P) src/cangjie
+-	$(CYTHON) -3 --verbose -o $@ $(srcdir)/src/cangjie/_core.pyx
++	$(CYTHON) -3 --verbose -o $@ -I $(srcdir)/src/cangjie $(srcdir)/src/cangjie/_core.pyx
+ 
+ src/cangjie/errors.c: src/cangjie/errors.pyx src/cangjie/_core.pxd
+ 	$(MKDIR_P) src/cangjie
+-	$(CYTHON) -3 --verbose -o $@ $(srcdir)/src/cangjie/errors.pyx
++	$(CYTHON) -3 --verbose -o $@ -I $(srcdir)/src/cangjie $(srcdir)/src/cangjie/errors.pyx
+ 
+ src/cangjie/filters.c: src/cangjie/filters.pyx src/cangjie/_core.pxd
+ 	$(MKDIR_P) src/cangjie
+-	$(CYTHON) -3 --verbose -o $@ $(srcdir)/src/cangjie/filters.pyx
++	$(CYTHON) -3 --verbose -o $@ -I $(srcdir)/src/cangjie $(srcdir)/src/cangjie/filters.pyx
+ 
+ src/cangjie/versions.c: src/cangjie/versions.pyx src/cangjie/_core.pxd
+ 	$(MKDIR_P) src/cangjie
+-	$(CYTHON) -3 --verbose -o $@ $(srcdir)/src/cangjie/versions.pyx
++	$(CYTHON) -3 --verbose -o $@ -I $(srcdir)/src/cangjie $(srcdir)/src/cangjie/versions.pyx
diff --git a/dev-python/cangjie/metadata.xml b/dev-python/cangjie/metadata.xml
new file mode 100644
index 000000000000..202f50ca4500
--- /dev/null
+++ b/dev-python/cangjie/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>brendan@horan.hk</email>
+    <name>Brendan Horan</name>
+    <description>Proxy - Maintainer. Assign bugs to him</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">Cangjians/pycangjie</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/capturer/Manifest b/dev-python/capturer/Manifest
new file mode 100644
index 000000000000..4a297e7491c1
--- /dev/null
+++ b/dev-python/capturer/Manifest
@@ -0,0 +1,4 @@
+DIST capturer-2.3.tar.gz 18380 SHA256 3e4a1edbe96275e33bdf5836fe5c244202bc7acbc675dce73b0f082240cacb69 SHA512 267c6238ab143894f3d74002334b99e3d1a59a3bf30f5ad04d6f1a81c9439b1369fe161859f86924280e3b9e47536e53a0a80045acda9ae471ded7d751e01470 WHIRLPOOL 59d84da0b34740381ff138d8179a75f025b3ecb2714ff1255a4cef294d8ec42fea81fd02d392874d0b09bd1d0ed00186fbb9db1e7a431c7a4d5d4ebdabbc8a38
+EBUILD capturer-2.3.ebuild 820 SHA256 c3def32f2d98c742f10a5f32468b549506ce123cc9d723ea5b238d7c8b6e382a SHA512 a2a6b94919b7ececc69d21ca5e05effa2b957401f0d7d120521aa548642ec82d85a28a78905bce5d7c1689cea3832bbbbc1a77c101995635fec9b6d43f56791c WHIRLPOOL dcdf694fa34811893564bcea73ae34482794926ae454b6132b09a49a58eec5ba9b80a87bb5c19343d745c2d6dc85f5b761c3d86b2b178142e092cdc1d6487e96
+MISC ChangeLog 1423 SHA256 5330c835329baf9bc1de3bb69f4a1a36f7c8b09a73f45bfa919310a493ea3fdc SHA512 4b471d47607bf69b0b121601a9e9a5f4305e8d19649effacccc5dc87f76209f87776b496971c7a440a1984be51ea257a6f227e1078a21ee54ea187f5bf4eba21 WHIRLPOOL 2c548473bc41b897b2113029621a0e51bba95a0141932a806bc271b8f235219ba9f9a812efbd9bfdf63196c79309250757e2c4d38e1cbf5c061946b99e44b4cf
+MISC metadata.xml 390 SHA256 a9bd1a43de2f39c73411ab7a43f259af6cd72803110c03000ea297c27b9e0174 SHA512 4df2d5312905b2be06239d81f2274ae4e6517f48d62ec54d5d755bb08cccaaece3531b391f45097590f039db10b8bcf6ff265a28506a0f8096f121fda85e498c WHIRLPOOL 0969108380f3b533cbd6195d324ca1cebefb5bd4054a1d00d8b0ed5df1e4c71d4eefecbfd37678a19e55da6059ea4c326f0c6bc29219f97572f4de8328856a2b
diff --git a/dev-python/capturer/capturer-2.3.ebuild b/dev-python/capturer/capturer-2.3.ebuild
new file mode 100644
index 000000000000..52d6f3a24dc7
--- /dev/null
+++ b/dev-python/capturer/capturer-2.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easily capture stdout/stderr of the current process and subprocesses"
+HOMEPAGE="https://capturer.readthedocs.org/ https://pypi.python.org/pypi/capturer https://github.com/xolox/python-capturer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/humanfriendly-2.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+# Test fails only ebuild, but works manually
+# Can't find out what it is
+RESTRICT=test
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/capturer/metadata.xml b/dev-python/capturer/metadata.xml
new file mode 100644
index 000000000000..42593b5baca9
--- /dev/null
+++ b/dev-python/capturer/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">coloredlogs</remote-id>
+    <remote-id type="github">xolox/python-coloredlogs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
new file mode 100644
index 000000000000..b57cf7bca5ea
--- /dev/null
+++ b/dev-python/carbon/Manifest
@@ -0,0 +1,16 @@
+AUX carbon-0.9.12-no-data-files.patch 817 SHA256 e0f40bb173b4687238a6bf003baab74a5d5b1f6c9bc948a1afd10bb805ca2d4d SHA512 549499d5f1963f2eadc9858e0744a1b2b30830e4069f6881d3d912b9709e3cc0f0c3c01730790c975a57209b671c6592c1dd650028a8a63dcab84fe960f5ed58 WHIRLPOOL a41b7f90c124740eaaf2ed7220247d1c4f8620a27083c4851b5fa707768a1921419b569279b71d7958ab676ea04fe11bb5478df929a3c3b39078f014e548a586
+AUX carbon-0.9.14-no-data-files.patch 1074 SHA256 77bcdb736f77a8da9991c9e21b3af9cf59d880c33681255b53d3b5964517a285 SHA512 11d8108c712d777d5b5930ce7ac3d6efe5b2307f670f19e0420ab26c695b0ec306aded2cc1e5ca2d7e262046689197b9f0b60f609d4f7dba435d36be44358749 WHIRLPOOL 6a37b2da11b7783a7e0a560992d5238b09b412808a19bdf3470733a27bfe9cc88fa3c1238645af9e0ff979d2d6536c17a75ec82efe23ad3f985d0d8527a0dc65
+AUX carbon.confd 119 SHA256 d03e9aad2764b4b5d55a10a0802fcbd0047408c6fd520abd768c230abc858ec7 SHA512 049d2e3c9e9ae9375f485568185b14fb326a85f13a5f40e19a5d26aaecd0b98a61f011dbe4335110b6e3314ec52d308fea8f577df8b29b5d675fd7763a02788f WHIRLPOOL e04bc43c0270fcf3d8eccda61066da1183722d1f8ebddae7c2e02abaac45a33cd7e9969d660c88f4e56854770d610574932009c4078c781dd52dccbfb4ba9d2c
+AUX carbon.initd 1259 SHA256 273effa64e4f8496492f78fc540848fe4b765a4c7e8e1dec2bf56961685554cb SHA512 f6ccd3a3abdd8b8e1eff55aa6a0cd0b26e5cd6789ff6f8f795890e61adfac7369c101788a0db2e7d6fdaeace622cf8313a331aa6e0f54e9dda7ec8194351019a WHIRLPOOL 4543810905fdb78993fd5abbfdbd18975a33048887616a2bc3f233e65cb920055e1a83d80cebf2b1d81ebd2feed63d566e565e6e1d9fc257402022c632d50ae6
+AUX carbon.initd2 1329 SHA256 d42bbf0ce764513a3d980ad7ec17c9c40f1646a35e84a4fd5b98fdf519851abe SHA512 08d9a7ddc763bb49763b1c873504b0dfb45763ed871f22632885692f41d5d8c86616677c2669b0b8c2160170a7c507c2415571d300e2045675c7002556a4063e WHIRLPOOL b06476b281639aab9d0fa1ef23aff29a2eb789c1635914f5483503c26ca1377b461a24e7e7778f1d700ea539001be90f01bb7f08f5f0ec0335827fd62ee4c352
+AUX no-data-files.patch 881 SHA256 d8d5b61c21df35042a51433d72495040cfa172f82fbe4b2ef5e54fb8b41cff63 SHA512 13c2e946c42bfabc643ec39a0d384b887fb1ceaee9791e0f7c2ed037069492aa80ff4f4b593dbba7253c6e5f553e0a7d1677333a896067219df4206f742d64d7 WHIRLPOOL ca8040abfdefb1ff6ecb8737de40f303cb869c618dca41f0d09d1c065e60c65a17709adadce057b8c779a0dfa24a3ea6df045e858681bf207f6db6be7fe6ac06
+DIST carbon-0.9.13.tar.gz 47509 SHA256 75aecd8114435430e06803ebaf1e9cac81f58fb231fc93d8904d667d971ae6cd SHA512 89c843ac67ed4b68c28273459e5a96594851e5d2694fdefdfb71cebcdc6555d4aac8c45c1c6d2ca61a15405bac7ba3d27836470fe152d5d7a4936bb2d00e6776 WHIRLPOOL 40000d912f3881dc4f197e1290d3e0fd092ec23bc6574a97fa31d0ffa77fa651abc4d4da529e45d88d74ea763f18cde20daf5fd70549d6afd38f4c5b88d1becb
+DIST carbon-0.9.14.tar.gz 50285 SHA256 e12539ca855f0777e326028a32fbff5022d75b7c3e6fcc7e4704305a650aee9a SHA512 e70275c0acce17287b3036668e45c75b9da9b54523faca0f5bdceda4b6b98c71ebf773740e85063ee3ea4e0bc64adee913bb7f8eab1f7016eb504b06f0b589e3 WHIRLPOOL 998c6a3d0b6cc9aa86cc9b79719e762610cf47012f2eebfd575a6bac3aeb78b64c34e94c5fedc5c88074400920268890e8b84e2f1b32ee4ba24bdd0bef31602d
+DIST carbon-0.9.15.tar.gz 50321 SHA256 f01db6d37726c6fc0a8aaa66a7bf14436b0dd0d62ef3c20ecb31605a4d365d2e SHA512 e8ed8ac9b247d0f5bbe0331de50d929f918ee7968ad5053d2532f4d09e49215eaecae95a79f6b8360aa0f73fc7e68a73d86886e0329b3f5ccb569136658f6562 WHIRLPOOL fe7aa0da11cbf0cd504d4ae48b4ba5e89f4e6c4cb41e46884971769a45077dd09d056c2f1613cfc4a139dd78ecd140b06d2c25b96e8ba9644c4d7b6636649083
+EBUILD carbon-0.9.13-r1.ebuild 1850 SHA256 f400a7bf71a600d88cea97b2110a760bd7289cc12033c7c2033c3a389d8835ad SHA512 4d3121f3c8a2d6c04a3b8cd5153ad9132e3e573ef9b8c621f015b3eb3b46833a8720e8f3f0c36af142eaca6cf8d950352949038cc3cf3a05e6f064281b69b673 WHIRLPOOL acb294088eb090fe1c6473667a3a45708f7664598c3c143350242ee25dd8a971bd9513943f560b7d0c4205de23b3722ba85ee6dfd6e87404d23c22cd78da9dfb
+EBUILD carbon-0.9.13.ebuild 1845 SHA256 063614ed505339eebe1561a33df0518536d7b06ed82f74c348ae6ff13181ec8b SHA512 19be871a4fb56b058990eedce3bcb70eae0b913c0b6bdb4c46236aa9e65bcd8b9bce3b2790ee591fc9494ea36e008ea98f904a5c6dd99fe7e55cc6d63c3d5182 WHIRLPOOL b04539d3ea389753c821151c2e3b2f3a385ee2248823d6a98aa3473a44bef7b7628948461f04beb245d34f6f387064aac2889d7da770fe56b5e3034a877c8497
+EBUILD carbon-0.9.14-r1.ebuild 2039 SHA256 dbd1b34f3bc26530416eab9cf7e6e68cb03ba40c4ab8065db8ae01d5b02242dc SHA512 0370b1b716adca976ca799f3968d52491eeb02a3ea0e5dbd384efc6360ef8d0f0fe708d24aaf53a1dc8923eb83dbfea6c7a40dfecaa15aed5f53877d48dd6163 WHIRLPOOL 16f91e7527b3d942fad35f0585063b671c58ec4db0e60954aa9e6efad0dfb63a910d36ba40e7fa355906df05f7569530fe86de4325426dfc002b006afc5e6d69
+EBUILD carbon-0.9.15-r1.ebuild 2047 SHA256 70771c421285d8d6a5fa20dab1b16dda286f28a9b255fc131819f2f7e5a9c748 SHA512 64f1250fbcf3bfe024e3a6b9be3abcace36cd2ddf4b933ef6c132d7e78d1edfefa8b68d658a52f9139e6c35486ab59f4510d07ab4ebd13e217c118b9bb8969fc WHIRLPOOL 71991fa3a54453e26358308702b73b6fe9b1880f887f33ca1ddc637ed2868067e6aada2063a195782eaa0821bb410cbff87d937b7469f9b9bf5629608b9f81af
+MISC ChangeLog 4123 SHA256 2ff008f67816b03b17d7efa0c757172c760970b5ea3cf5eaa0cf1b9fafaf723f SHA512 89b69a800ecb241d38cb579ed794cc1af85f3c33f327a0697103ce8ffc2419dede68bfdb41e036b0b09092c7120da504cb8ff96844f0665a5a5eea98441161e9 WHIRLPOOL 19bfb8feb44fef5cd6449fa129e6c31f2a9a32632daf36ce749ccbd66dbda5cda8d935281d3e48bd31f8b31c912c40c898bf25f25dfaf7ddaa25b72ec9a74f06
+MISC ChangeLog-2015 2094 SHA256 5e5da7626eacfc3cf78835ebe69d27009bb0f43a0900a730fdb815b550df1758 SHA512 7ebc310944175f760f48c7ebc6bbe55757e60f4d6cc5fe818e16de5a9d37ba3b4324d210ca724ad2fd178e9c9ce6dce312c58568f10963c673970d886546c0cf WHIRLPOOL 718ee38d2cac272e40e3698c7939a17b024a038987e77d3c4f883b3a3bc9baf50c1a236dae7db823895db4587051a469880c2071ca6a8491e8b6425861e607d8
+MISC metadata.xml 441 SHA256 a65a0dae26cc36b69c2073c855e7c5ec8cb5effc08267f65f80b5c46c0a9eede SHA512 b6a65d642333fb19a34c4f1342b58ee9eadb9824f078a7cd9faac06d3d9e731ea67aa138a8e36db797b755dd382873583808aa6460375ebedf61443be962fc5d WHIRLPOOL a4e5691aa8451644ee9663e13e9ad568c85927109a505e9dd9040b7432e83e46909201449f67b4b6352728dfabfdb985037953ff48bf9c00f8af3fd885efaa19
diff --git a/dev-python/carbon/carbon-0.9.13-r1.ebuild b/dev-python/carbon/carbon-0.9.13-r1.ebuild
new file mode 100644
index 000000000000..b861686a53d5
--- /dev/null
+++ b/dev-python/carbon/carbon-0.9.13-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend data caching and persistence daemon for Graphite"
+HOMEPAGE="http://graphite.wikidot.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/whisper[${PYTHON_USEDEP}]
+	dev-python/txAMQP[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	# Do not install the configuration and data files. We install them
+	# somewhere sensible by hand.
+	"${FILESDIR}"/${PN}-0.9.12-no-data-files.patch
+	)
+
+python_prepare_all() {
+	# This sets prefix to /opt/graphite. We want FHS-style paths instead.
+	rm setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/carbon
+	doins conf/*
+
+	dodir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
+
+	newinitd "${FILESDIR}"/carbon.initd2 carbon-cache
+	newinitd "${FILESDIR}"/carbon.initd2 carbon-relay
+	newinitd "${FILESDIR}"/carbon.initd2 carbon-aggregator
+
+	newconfd "${FILESDIR}"/carbon.confd carbon-cache
+	newconfd "${FILESDIR}"/carbon.confd carbon-relay
+	newconfd "${FILESDIR}"/carbon.confd carbon-aggregator
+}
+
+pkg_postinst() {
+	einfo 'This ebuild installs carbon into FHS-style paths.'
+	einfo 'You will probably have to set GRAPHITE_CONF_DIR to /etc/carbon'
+	einfo 'and GRAPHITE_STORAGE_DIR to /var/lib/carbon to make use of this'
+	einfo '(see /etc/carbon/carbon.conf.example).'
+	einfo ' '
+	einfo 'OpenRC init script supports multiple instances !'
+	einfo 'Example to run an instance b of carbon-cache :'
+	einfo '    ln -s /etc/init.d/carbon-cache /etc/init.d/carbon-cache.b'
+	einfo '    cp /etc/conf.d/carbon-cache /etc/conf.d/carbon-cache.b'
+}
diff --git a/dev-python/carbon/carbon-0.9.13.ebuild b/dev-python/carbon/carbon-0.9.13.ebuild
new file mode 100644
index 000000000000..e30fd7dff586
--- /dev/null
+++ b/dev-python/carbon/carbon-0.9.13.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend data caching and persistence daemon for Graphite"
+HOMEPAGE="http://graphite.wikidot.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/whisper[${PYTHON_USEDEP}]
+	dev-python/txAMQP[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	# Do not install the configuration and data files. We install them
+	# somewhere sensible by hand.
+	"${FILESDIR}"/${PN}-0.9.12-no-data-files.patch
+	)
+
+python_prepare_all() {
+	# This sets prefix to /opt/graphite. We want FHS-style paths instead.
+	rm setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/carbon
+	doins conf/*
+
+	dodir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
+
+	newinitd "${FILESDIR}"/carbon.initd carbon-cache
+	newinitd "${FILESDIR}"/carbon.initd carbon-relay
+	newinitd "${FILESDIR}"/carbon.initd carbon-aggregator
+
+	newconfd "${FILESDIR}"/carbon.confd carbon-cache
+	newconfd "${FILESDIR}"/carbon.confd carbon-relay
+	newconfd "${FILESDIR}"/carbon.confd carbon-aggregator
+}
+
+pkg_postinst() {
+	einfo 'This ebuild installs carbon into FHS-style paths.'
+	einfo 'You will probably have to set GRAPHITE_CONF_DIR to /etc/carbon'
+	einfo 'and GRAPHITE_STORAGE_DIR to /var/lib/carbon to make use of this'
+	einfo '(see /etc/carbon/carbon.conf.example).'
+	einfo ' '
+	einfo 'OpenRC init script supports multiple instances !'
+	einfo 'Example to run an instance b of carbon-cache :'
+	einfo '    ln -s /etc/init.d/carbon-cache /etc/init.d/carbon-cache.b'
+	einfo '    cp /etc/conf.d/carbon-cache /etc/conf.d/carbon-cache.b'
+}
diff --git a/dev-python/carbon/carbon-0.9.14-r1.ebuild b/dev-python/carbon/carbon-0.9.14-r1.ebuild
new file mode 100644
index 000000000000..5ef85c12f72d
--- /dev/null
+++ b/dev-python/carbon/carbon-0.9.14-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend data caching and persistence daemon for Graphite"
+HOMEPAGE="http://graphite.wikidot.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~x64-solaris"
+
+# whisper appears to have been missed from listing in install_requires in setup.py
+RDEPEND="
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/whisper[${PYTHON_USEDEP}]
+	dev-python/txAMQP[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	# Do not install the configuration and data files. We install them
+	# somewhere sensible by hand. Patch for this vn. 0.9.14 has been extended
+	# due to redhat's init scripts set to install unconditionally in setup.py
+	"${FILESDIR}"/${P}-no-data-files.patch
+	)
+
+python_prepare_all() {
+	# This sets prefix to /opt/graphite. We want FHS-style paths instead.
+	rm setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/carbon
+	doins conf/*
+
+	dodir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
+
+	newinitd "${FILESDIR}"/carbon.initd2 carbon-cache
+	newinitd "${FILESDIR}"/carbon.initd2 carbon-relay
+	newinitd "${FILESDIR}"/carbon.initd2 carbon-aggregator
+
+	newconfd "${FILESDIR}"/carbon.confd carbon-cache
+	newconfd "${FILESDIR}"/carbon.confd carbon-relay
+	newconfd "${FILESDIR}"/carbon.confd carbon-aggregator
+}
+
+pkg_postinst() {
+	einfo 'This ebuild installs carbon into FHS-style paths.'
+	einfo 'You will probably have to set GRAPHITE_CONF_DIR to /etc/carbon'
+	einfo 'and GRAPHITE_STORAGE_DIR to /var/lib/carbon to make use of this'
+	einfo '(see /etc/carbon/carbon.conf.example).'
+	einfo ' '
+	einfo 'OpenRC init script supports multiple instances !'
+	einfo 'Example to run an instance b of carbon-cache :'
+	einfo '    ln -s /etc/init.d/carbon-cache /etc/init.d/carbon-cache.b'
+	einfo '    cp /etc/conf.d/carbon-cache /etc/conf.d/carbon-cache.b'
+}
diff --git a/dev-python/carbon/carbon-0.9.15-r1.ebuild b/dev-python/carbon/carbon-0.9.15-r1.ebuild
new file mode 100644
index 000000000000..faf2c6aefcb9
--- /dev/null
+++ b/dev-python/carbon/carbon-0.9.15-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend data caching and persistence daemon for Graphite"
+HOMEPAGE="http://graphite.wikidot.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~x64-solaris"
+
+# whisper appears to have been missed from listing in install_requires in setup.py
+RDEPEND="
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/whisper[${PYTHON_USEDEP}]
+	dev-python/txAMQP[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	# Do not install the configuration and data files. We install them
+	# somewhere sensible by hand. Patch for this vn. 0.9.14 has been extended
+	# due to redhat's init scripts set to install unconditionally in setup.py
+	"${FILESDIR}"/${PN}-0.9.14-no-data-files.patch
+	)
+
+python_prepare_all() {
+	# This sets prefix to /opt/graphite. We want FHS-style paths instead.
+	rm setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/carbon
+	doins conf/*
+
+	dodir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
+
+	newinitd "${FILESDIR}"/carbon.initd2 carbon-cache
+	newinitd "${FILESDIR}"/carbon.initd2 carbon-relay
+	newinitd "${FILESDIR}"/carbon.initd2 carbon-aggregator
+
+	newconfd "${FILESDIR}"/carbon.confd carbon-cache
+	newconfd "${FILESDIR}"/carbon.confd carbon-relay
+	newconfd "${FILESDIR}"/carbon.confd carbon-aggregator
+}
+
+pkg_postinst() {
+	einfo 'This ebuild installs carbon into FHS-style paths.'
+	einfo 'You will probably have to set GRAPHITE_CONF_DIR to /etc/carbon'
+	einfo 'and GRAPHITE_STORAGE_DIR to /var/lib/carbon to make use of this'
+	einfo '(see /etc/carbon/carbon.conf.example).'
+	einfo ' '
+	einfo 'OpenRC init script supports multiple instances !'
+	einfo 'Example to run an instance b of carbon-cache :'
+	einfo '    ln -s /etc/init.d/carbon-cache /etc/init.d/carbon-cache.b'
+	einfo '    cp /etc/conf.d/carbon-cache /etc/conf.d/carbon-cache.b'
+}
diff --git a/dev-python/carbon/files/carbon-0.9.12-no-data-files.patch b/dev-python/carbon/files/carbon-0.9.12-no-data-files.patch
new file mode 100644
index 000000000000..129c7189f3b0
--- /dev/null
+++ b/dev-python/carbon/files/carbon-0.9.12-no-data-files.patch
@@ -0,0 +1,24 @@
+diff -ur carbon-0.9.12.orig/setup.py carbon-0.9.12/setup.py
+--- /setup.py	2013-08-22 00:53:16.000000000 +0800
++++ /setup.py	2014-01-26 11:20:59.705864697 +0800
+@@ -13,12 +13,6 @@
+   setup_kwargs = dict()
+ 
+ 
+-storage_dirs = [ ('storage/whisper',[]), ('storage/lists',[]),
+-                 ('storage/log',[]), ('storage/rrd',[]) ]
+-conf_files = [ ('conf', glob('conf/*.example')) ]
+-
+-install_files = storage_dirs + conf_files
+-
+ # If we are building on RedHat, let's use the redhat init scripts.
+ if platform.dist()[0] == 'redhat':
+     init_scripts = [ ('/etc/init.d', ['distro/redhat/init.d/carbon-cache',
+@@ -39,7 +33,6 @@
+   package_dir={'' : 'lib'},
+   scripts=glob('bin/*'),
+   package_data={ 'carbon' : ['*.xml'] },
+-  data_files=install_files,
+   install_requires=['twisted', 'txamqp'],
+   **setup_kwargs
+ )
diff --git a/dev-python/carbon/files/carbon-0.9.14-no-data-files.patch b/dev-python/carbon/files/carbon-0.9.14-no-data-files.patch
new file mode 100644
index 000000000000..858d362d296d
--- /dev/null
+++ b/dev-python/carbon/files/carbon-0.9.14-no-data-files.patch
@@ -0,0 +1,32 @@
+diff -ur carbon-0.9.14.orig/setup.py carbon-0.9.14/setup.py
+--- setup.py	2015-11-07 13:50:29.000000000 +0800
++++ setup.py	2015-12-27 08:43:46.575905408 +0800
+@@ -13,20 +13,6 @@
+   setup_kwargs = dict()
+ 
+ 
+-storage_dirs = [ ('storage/whisper',[]), ('storage/lists',[]),
+-                 ('storage/log',[]), ('storage/rrd',[]) ]
+-conf_files = [ ('conf', glob('conf/*.example')) ]
+-
+-install_files = storage_dirs + conf_files
+-
+-# Let's include redhat init scripts, despite build platform
+-# but won't put them in /etc/init.d/ automatically anymore
+-init_scripts = [ ('examples/init.d', ['distro/redhat/init.d/carbon-cache',
+-                                      'distro/redhat/init.d/carbon-relay',
+-                                      'distro/redhat/init.d/carbon-aggregator']) ]
+-install_files += init_scripts
+-
+-
+ setup(
+   name='carbon',
+   version='0.9.14',
+@@ -39,7 +25,6 @@
+   package_dir={'' : 'lib'},
+   scripts=glob('bin/*'),
+   package_data={ 'carbon' : ['*.xml'] },
+-  data_files=install_files,
+   install_requires=['twisted', 'txamqp'],
+   **setup_kwargs
+ )
diff --git a/dev-python/carbon/files/carbon.confd b/dev-python/carbon/files/carbon.confd
new file mode 100644
index 000000000000..b1875e134678
--- /dev/null
+++ b/dev-python/carbon/files/carbon.confd
@@ -0,0 +1,5 @@
+# Use the given config file
+CARBON_CONFIG="/etc/carbon/carbon.conf"
+
+# Add extra parameters
+CARBON_EXTRA_PARAMETERS=""
diff --git a/dev-python/carbon/files/carbon.initd b/dev-python/carbon/files/carbon.initd
new file mode 100644
index 000000000000..a33a70c60f93
--- /dev/null
+++ b/dev-python/carbon/files/carbon.initd
@@ -0,0 +1,51 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+export GRAPHITE_CONF_DIR=/etc/carbon
+export GRAPHITE_STORAGE_DIR=/var/lib/carbon
+
+INSTANCE=${SVCNAME/#*.}
+if [ "${INSTANCE}" == "${SVCNAME}" ]; then
+	INSTANCE="a"
+fi
+
+PIDFILE="/var/run/${SVCNAME}.pid"
+PROGRAMNAME=${SVCNAME/.*}
+
+CARBON_CONFIG=${CARBON_CONFIG:-/etc/carbon/carbon.conf}
+
+depend() {
+	use net
+}
+
+
+start_pre() {
+	if [ ! -f ${CARBON_CONFIG} ] ; then
+		eend "Missing ${CARBON_CONFIG}"
+	fi
+	case "${PROGRAMNAME}" in
+		"carbon-relay" )
+			[ -f /etc/carbon/relay-rules.conf ] || eend "Missing relay-rules.conf"
+			;;
+		"carbon-aggregator" )
+			[ -f /etc/carbon/aggregation-rules.conf ] || eend "Missing missing aggregation-rules.conf"
+			;;
+	esac
+}
+
+start() {
+	ebegin "Starting ${PROGRAMNAME} instance ${INSTANCE}"
+	start-stop-daemon --start --exec /usr/bin/${PROGRAMNAME}.py \
+	    --pidfile ${PIDFILE} \
+	    -- --pidfile ${PIDFILE} --instance ${INSTANCE} \
+		--logdir /var/log/carbon/ --config ${CARBON_CONFIG} start >/dev/null
+	eend $? "Failed to start ${SVCNAME}"
+}
+
+stop() {
+	ebegin "Stopping ${PROGRAMNAME} instance ${INSTANCE}"
+	start-stop-daemon --stop \
+		--pidfile ${PIDFILE}
+	eend $? "Failed to stop ${SVCNAME}"
+}
diff --git a/dev-python/carbon/files/carbon.initd2 b/dev-python/carbon/files/carbon.initd2
new file mode 100644
index 000000000000..ff1509747ef1
--- /dev/null
+++ b/dev-python/carbon/files/carbon.initd2
@@ -0,0 +1,53 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+export GRAPHITE_CONF_DIR=/etc/carbon
+export GRAPHITE_STORAGE_DIR=/var/lib/carbon
+
+INSTANCE=${SVCNAME#*.}
+if [ "${INSTANCE}" = "${SVCNAME}" ]; then
+	INSTANCE="a"
+fi
+
+PIDFILE="/var/run/${SVCNAME}.pid"
+PROGRAMNAME=${SVCNAME%%.*}
+
+CARBON_CONFIG=${CARBON_CONFIG:-/etc/carbon/carbon.conf}
+
+depend() {
+	use net
+}
+
+
+start_pre() {
+	if [ ! -f ${CARBON_CONFIG} ] ; then
+		eend "Missing ${CARBON_CONFIG}"
+	fi
+	case "${PROGRAMNAME}" in
+		"carbon-relay" )
+			if `grep -q "^RELAY_METHOD = rules$" ${CARBON_CONFIG}`; then
+				[ -f /etc/carbon/relay-rules.conf ] || eend "Missing relay-rules.conf"
+			fi
+			;;
+		"carbon-aggregator" )
+			[ -f /etc/carbon/aggregation-rules.conf ] || eend "Missing missing aggregation-rules.conf"
+			;;
+	esac
+}
+
+start() {
+	ebegin "Starting ${PROGRAMNAME} instance ${INSTANCE}"
+	start-stop-daemon --start --exec /usr/bin/${PROGRAMNAME}.py \
+	    --pidfile ${PIDFILE} \
+	    -- --pidfile ${PIDFILE} --instance ${INSTANCE} \
+		--logdir /var/log/carbon/ --config ${CARBON_CONFIG} start >/dev/null
+	eend $? "Failed to start ${SVCNAME}"
+}
+
+stop() {
+	ebegin "Stopping ${PROGRAMNAME} instance ${INSTANCE}"
+	start-stop-daemon --stop \
+		--pidfile ${PIDFILE}
+	eend $? "Failed to stop ${SVCNAME}"
+}
diff --git a/dev-python/carbon/files/no-data-files.patch b/dev-python/carbon/files/no-data-files.patch
new file mode 100644
index 000000000000..7b0c52f3948b
--- /dev/null
+++ b/dev-python/carbon/files/no-data-files.patch
@@ -0,0 +1,26 @@
+Do not install the empty storage dirs and config files to the wrong
+location (the ebuild installs them to the right location by hand).
+
+See Gentoo bug #417221.
+
+--- setup.py
++++ setup.py
+@@ -12,9 +12,6 @@
+   setup_kwargs = dict()
+ 
+ 
+-storage_dirs = [ ('storage/whisper',[]), ('storage/lists',[]),
+-                 ('storage/log',[]), ('storage/rrd',[]) ]
+-conf_files = [ ('conf', glob('conf/*.example')) ]
+ #XXX Need a way to have these work for bdist_rpm but be left alone for everything else
+ #init_scripts = [ ('/etc/init.d', ['distro/redhat/init.d/carbon-cache',
+ #                                  'distro/redhat/init.d/carbon-relay',
+@@ -32,7 +29,6 @@
+   package_dir={'' : 'lib'},
+   scripts=glob('bin/*'),
+   package_data={ 'carbon' : ['*.xml'] },
+-  data_files=storage_dirs + conf_files, # + init_scripts,
+   install_requires=['twisted', 'txamqp'],
+   **setup_kwargs
+ )
+
diff --git a/dev-python/carbon/metadata.xml b/dev-python/carbon/metadata.xml
new file mode 100644
index 000000000000..652e85d0ce90
--- /dev/null
+++ b/dev-python/carbon/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>patrick@gentoo.org</email>
+    <name>Patrick Lauer</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>grobian@gentoo.org</email>
+    <name>Fabian Groffen</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">carbon</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/carrot/Manifest b/dev-python/carrot/Manifest
new file mode 100644
index 000000000000..7167db987368
--- /dev/null
+++ b/dev-python/carrot/Manifest
@@ -0,0 +1,5 @@
+DIST carrot-0.10.7.tar.gz 62069 SHA256 cb46374f3c883c580d142a79d2609883713a867cc86e0514163adce784ce2468 SHA512 3814089acc0b4ec51fc67470f0c3f21b740c5b7ed284d61919d6796f6e0529cb3d5e9c1a4cbf8360f98c76b520e5b73b43fa744775f4c6e3a629d77a46a10f3f WHIRLPOOL 0148953c40008002c8c4c95454918840c086d9215e25cdfd6dae7579d81544f57533902409af8f0caab9b1a5c72d72a9505e846d9e738804668f7dcd7af7b7a9
+EBUILD carrot-0.10.7-r1.ebuild 701 SHA256 2ad73544a1b607fbb21488cb5ef78d243fb208636cdc246f4fc684972bd1ba52 SHA512 1c8567d333e76e519ae1198f07602569f0a2afab1379f578904c2c4cff8ef4905724d898dcc475618c29eafdaf653e8f6b8a5c7a097657b2e31e3ed2ed996dda WHIRLPOOL 9115079f502b7bcf91342d8ca4e155c04e361788b2ef46fed32d83f1e88cd27636d12990df2bbfde0aa6dac65606008df1cdfa95a9914bf5133f77144d67c0cc
+MISC ChangeLog 2580 SHA256 df820feedf7488c6a400f57d45adcd74901265209e4fd5312fc2ef6051888bbe SHA512 0b8d1ef4b1a4ac102db56fe325fbe76af92479b031dcb9455e4c15727b2507d184f6e940a0b8003e0e9683072eebf2bf1719f977d3ce80ec5d0c15b9f20d6853 WHIRLPOOL d727df8d899fcc66f68a09520d2587fda7444bd2dfc1478e5182634db5be43b37321a5165f370507b6ede092ddbd69de562ebf80bdf00e73c0c2d4d8c2486d44
+MISC ChangeLog-2015 982 SHA256 024e69e0440a6a91c3e3018b3c2e5e605c4b2df03907e49ee743a1629424666f SHA512 bc6fa447bd83d37479de75d90f09020c71531f8031e6153dfc0cb887ffb1e472494c05b4dcec40c866cbcef712a335acec66cf0cefe8425bef77b61b5600e763 WHIRLPOOL f43e13f9887e5d24d7e3d4b9a4d3a1ae2ccb45a75890f7941a5376421d493b801ed4ff76accc1e34c6462ee83f931230bf587ffbf3713dd66136a7975ecedee0
+MISC metadata.xml 371 SHA256 c7755297c2db00aea315a5745464b7e694ad7c102019339b5011c15abcab55e2 SHA512 d72f0dcf63d0b7e94b2766256156206c42a471f5828e6fbccb2073276c22db002523b3c40c0d8b145545d161e6820ca575e63b08ff69eb7a4ddc5a590056efa4 WHIRLPOOL 9f92e713b044e966bf1063b64889867765bb3f6b19c58afc13d731108248145250777319a4aed59050b350a820656d8a60e3da2a5b96807b9b39c741a4668130
diff --git a/dev-python/carrot/carrot-0.10.7-r1.ebuild b/dev-python/carrot/carrot-0.10.7-r1.ebuild
new file mode 100644
index 000000000000..26f4797bd611
--- /dev/null
+++ b/dev-python/carrot/carrot-0.10.7-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="AMQP Messaging Framework for Python"
+HOMEPAGE="https://github.com/ask/carrot/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+RDEPEND="dev-python/anyjson[${PYTHON_USEDEP}]
+	>=dev-python/amqplib-0.6[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+# Half of tests fail
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/carrot/metadata.xml b/dev-python/carrot/metadata.xml
new file mode 100644
index 000000000000..30229b1cffcf
--- /dev/null
+++ b/dev-python/carrot/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">carrot</remote-id>
+    <remote-id type="github">ask/carrot</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/case/Manifest b/dev-python/case/Manifest
new file mode 100644
index 000000000000..35de975d1ee3
--- /dev/null
+++ b/dev-python/case/Manifest
@@ -0,0 +1,6 @@
+DIST case-1.2.3.tar.gz 55405 SHA256 6e6a6b824ee2641657415305a343fa66d3cf9c29f25202ba749957b4f17f5051 SHA512 7dcc2fc593e4c5382879b9f09aecc35c0937d1070d945688e641d08611ecc263531a9d87eef730685cab41ed32a0e770b06ff36060b212d288752442814700e0 WHIRLPOOL c88f5e70cd2f377d3b0ff68110610d4a15ee76067b2bd5ea3243a667c9ff0baf2d6d235e555dd4c7a6da4e0c26aa81f3f9325672695f64603cdeedcf6b3079c1
+DIST case-1.5.2.tar.gz 58382 SHA256 8a0dcf26d382b407c71b185720f414fa26938f12833cbc73929dfd78105f70fd SHA512 82c0ed9a788fb57c4109cdbe24822fdaeb59fdfd5d7ebe0c93a39e8e2a2745e911d6dc1b679ac46e263eb6041bbc0ab46b20f3850c12f8f63324cabe145ebdd6 WHIRLPOOL 53340f73fd9ae011e36f3c13668f56c6ef1603cc754aa1339ba17126d7259c78821e73b3eb7cc6595688bb1d061d424c9b00d78388d692d42dfabc2d6ec90854
+EBUILD case-1.2.3.ebuild 478 SHA256 5c9d3ca82b881814d4f9441fd74cc3ed5c0fb13d307e45c6a06f954e5d26aa25 SHA512 c2387dd726f0487a0126727e13a8dc882b24fb37430bd42ead6c63c6323237468cdb16875140ff5427069cbe8cfbc850ef4ba2b7ce655d43fd60540e989b85b6 WHIRLPOOL 03c01dbb6cbdc02a788f84324ea7ff70accc9b3721ef540d4eb86ed6b485671a230bfac13077c4a445392641700e1872f6b9c4f01b5bbb5ac633e073cd7efa68
+EBUILD case-1.5.2.ebuild 485 SHA256 57a6b405821f1d2033323c9a9f31b693ea81d084438dd3a349da55e8b8315bf5 SHA512 3cc6959bd5fddad4430327e32e0f2f0539e875827901884c30e9b9a79b9eeb8b2fe9cd477958d007e65f1771eb16f08550e9b7a4e0f2f6290148caef09b5da63 WHIRLPOOL ce84c3bbb00e745c6ac0e3469981082578ce950c458ca4f2728bc5191402d03667ce54f35f08db7f5f4f657487220834e6207218c0e88fc1d48d52bb875b3312
+MISC ChangeLog 552 SHA256 ec85d8c1d539e75ee2eb69b233f7062a24ee831f25fe969b61b3dd8633afbb75 SHA512 2d946f68bca1803b8b45ac8c2735166fa09e01f8578b18460ddcd403d65b065b0733ccaf57fe5b008d4239d658c086e2331fbffb720162109a4b698aff869123 WHIRLPOOL 7db031a90ccd370d051595091afb578ca5f05da36cf802ad6fefd1a4641ba7a117ee0d77c22868ec941b553a5fd31efc0953383cfce9d54e995733c98d9d4f5d
+MISC metadata.xml 336 SHA256 e76aab41ce7eee4fcf186cae9324abfaa6a389edfcc01e413c115be1e9c62ede SHA512 c0fdd3bfed03072c578a781b4aeb08728b17c8f9b22f4ac346cd993604fd634de8f94b7803c73f7285f87bc4f0a2245536f9a9bab8a254052bf10b8c979a3a28 WHIRLPOOL 22abadfa02a1fc503b097a939792a4f8bbda526696474139ed323a3f47d97edb424a9826cde9d9a44ada0148ac138c6b305f6fa386361272e7070864e80294bf
diff --git a/dev-python/case/case-1.2.3.ebuild b/dev-python/case/case-1.2.3.ebuild
new file mode 100644
index 000000000000..fba062f03121
--- /dev/null
+++ b/dev-python/case/case-1.2.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python unittest Utilities"
+HOMEPAGE="https://pypi.python.org/pypi/${PN} https://github.com/celery/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/case/case-1.5.2.ebuild b/dev-python/case/case-1.5.2.ebuild
new file mode 100644
index 000000000000..22e93c2a6318
--- /dev/null
+++ b/dev-python/case/case-1.5.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python unittest Utilities"
+HOMEPAGE="https://pypi.python.org/pypi/${PN} https://github.com/celery/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/case/metadata.xml b/dev-python/case/metadata.xml
new file mode 100644
index 000000000000..8b0594a5c767
--- /dev/null
+++ b/dev-python/case/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">case</remote-id>
+		<remote-id type="github">celery/case</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/castellan/Manifest b/dev-python/castellan/Manifest
new file mode 100644
index 000000000000..0f1f675848a7
--- /dev/null
+++ b/dev-python/castellan/Manifest
@@ -0,0 +1,6 @@
+DIST castellan-0.12.0.tar.gz 50497 SHA256 22194a1f2084b939652b28deca0f62312636442b0ab50511aff69a4902cf77d4 SHA512 9fe47f9678dc2528cbca652029263db89b71939e70c4f5fddffd1769271c04bec3cad0a7c29a800b646098b3df89fc064049c4fe3887695fe0b5dd6b3146835a WHIRLPOOL fe5d0e43dee622ae84210b21f68e54ef4988433a420554a925c465fcd0abedcfb2aa3f50be11085565239c56acb373800759ae3684c4bb53aac3914fa04573dc
+DIST castellan-0.4.0.tar.gz 49026 SHA256 2ccefefc2036ed0d6c76d735fb70b813e2a02f7adb7fd57e0640d064dce1c883 SHA512 2ccb2a757810c6ec125dbb8832cd09f918f9fbf84836ff69c79872471c7e4e40bc8030e305336ad9821de7c3b93617d39917387a6ab8f68443fb09d3f74d4dd5 WHIRLPOOL 972ef43c96356b4dfd69a5716aa996c6b0ac4ab54a989f8e38e3036e63043a33148e0e475224cfc9c4d7e2e5f122af476553015fc840b6326f599bd472f2f936
+EBUILD castellan-0.12.0.ebuild 1437 SHA256 077e88ce14d8327831f74fda17ec0e693b246f4567e072631317692b934decf7 SHA512 aa3a0b44173a59d3c44007fe0ad573edc2affd4aeb765eda18bc7d208ef15828a61dca39ff5ad234a4a696cdaf26b45ebce726f15bc494bfca9ced57aac4e76c WHIRLPOOL 74688ff04cd855dc2e92bea4c07a8e23f043d978f5e4fcf4183ddcfb2866eef00d0c8d2a78b05aa12b6eace5cdf6c8c20f8f11e33be1754ce19d93a7dbda9b24
+EBUILD castellan-0.4.0.ebuild 927 SHA256 8e38fe10c11312f3b53ff33a28e229e84d0987608e93823b0920a034bc2a9eb8 SHA512 a7e4cf2a25a51e3b2ddf54a182b229ef441e6c2f5925b62c1efd4a457376cc36c0b8cef52691abe0e113c53913a13a0e649ecc3551ddf8c0ffe2529238a379c1 WHIRLPOOL e00c9790f9f7de3ed317f722ce7edaf170e650e83cddf3b8eb38874ab3a9c6219e9a74df6aab613a3dd17303a83a3054a329be21288d9b70139007ec727e69bf
+MISC ChangeLog 2065 SHA256 a44d9c3a6bbe0b73f5d1de7820d2720d084282d0afce1bea2946edccc6c0d1f7 SHA512 0d0c30e22bd695b36108c9127a8d82d26db3739b9b8a1ce7ed3c4e91cdfa7aec5d02ae836805a72332326525b647487940d001a173ec60270b76f785fc1512f7 WHIRLPOOL 8dbcf4b438e06af138947493c6446da2c62c70935a763374db407b65b01b1f44a133a13d16e001d350727fc72c2c96b6cc6a5e907e97cb57649f545aeae4151a
+MISC metadata.xml 326 SHA256 de8ce15e80767b211d050a84d9740a9daa5181d73ef31993901af1890dc0af98 SHA512 f8d928ab94ac70a7a3c2548b67a6296b8e86b5e239a9c74cc4b1a120f64c1e2e2084612b025e26fa3c02099f543ce156e5419a5f6ea165eff79b2dd77e9a2d66 WHIRLPOOL 35d0587e4523e938864a1994931d900749436334d5d193e483cffba3bcf26d6307321dc5985fd803a456c1527176385174bdc0f8cd63b764a431971ef5252d1c
diff --git a/dev-python/castellan/castellan-0.12.0.ebuild b/dev-python/castellan/castellan-0.12.0.ebuild
new file mode 100644
index 000000000000..b2400c1455a3
--- /dev/null
+++ b/dev-python/castellan/castellan-0.12.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Generic Key Manager interface for OpenStack"
+HOMEPAGE="https://pypi.python.org/pypi/castellan"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
+	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/castellan/castellan-0.4.0.ebuild b/dev-python/castellan/castellan-0.4.0.ebuild
new file mode 100644
index 000000000000..aa1c79087c71
--- /dev/null
+++ b/dev-python/castellan/castellan-0.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Generic Key Manager interface for OpenStack"
+HOMEPAGE="https://pypi.python.org/pypi/castellan"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND="	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3
+	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/castellan/metadata.xml b/dev-python/castellan/metadata.xml
new file mode 100644
index 000000000000..c9cdba5de5c2
--- /dev/null
+++ b/dev-python/castellan/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">castellan</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/casuarius/Manifest b/dev-python/casuarius/Manifest
new file mode 100644
index 000000000000..0387136f2dee
--- /dev/null
+++ b/dev-python/casuarius/Manifest
@@ -0,0 +1,5 @@
+DIST casuarius-1.1.tar.gz 139555 SHA256 8ebec38cb8ced80e8a1def9a7e5cb07a4a2a5fca723e26008ff5cecc030c1ab5 SHA512 d0a77b285b923f72274b13240ab4ae079c4f69587093c43bb7375c8ba24517ba6a7e2ba429b3e9a6ee9c73736efafff00da9cde7d533f05de0c7675de1e62080 WHIRLPOOL 1ff87430bc933973a445d7dde3af4854d796ead5bc1998a6cc56e10886b259cf0d5c8f08612894ce68ecf32e0e81227b7e8e030af69180c9dca2c373fabdfb2d
+EBUILD casuarius-1.1.ebuild 535 SHA256 31098713df1f814db1a06aff0254665cdea9b510869dd8e312683efa56aee2b6 SHA512 84ebc2975b07213c366a0060e3be067ae5f4375ef2a8fb53932c46c68a112f61c01ecb18667b0a2f93358d316fab82ce232cae80725c50c79b791de0e78925cd WHIRLPOOL 92aa20c6f377eeef5143b96bcde6626dfefd8159b42c6de920c24fbaea4ce7a35dd49b990a2e5e52af2466a293154a0201f22159f0082b86920d83cbcab2e5fe
+MISC ChangeLog 2431 SHA256 881871f0b331e669115ac6e07d29bd06228831b6ba9d7a4deb0c98cca2d861e0 SHA512 d8f58228eff0556ec8b759e7ca1b9e6def3bbabe1e1f3d999b01cd2d14f88ff7cf44a189f35e6cf9e9a19b59505510218123f9d4db0cee42a4a53b3f256b9ddc WHIRLPOOL 538bfe81f006ddc98ab856db94b4115936e36760cd7d87fe7753c08e241b26cef58b2a04134ad9f00ff73358024e3f42d73e4bc2e4919fefc880ee414964ca9c
+MISC ChangeLog-2015 973 SHA256 6d0a26c31968507e675eae8b16dd9a199ab6f92a1973512109b0d06bcde31430 SHA512 2f92c2dc7a94c40b05beaf907f2c19dc07dab8dd3ac5c7f1e8186177ac389b273c4e2e4e297f18f038cba982827218a75114541b9a37d44428328165fce1ab01 WHIRLPOOL 6bfa431392a91626591a33b0ebc67aeeabe73cf59b896038e5757452e23b932c9a1730fa501ca9f47942a21e21cdfcc6f44e6a237848f561f036d2dbb681fe3a
+MISC metadata.xml 643 SHA256 1f75b68d320486c6aa99d10453c34bc6caac5f1490d870252e158f576adf8b7e SHA512 ef2e8f6954e1b8324991cb0cbb0ac1b39e46745c92b698cf80c155571b86a4a8984557ca56ed61e1881228db883d7fd9ce189ae0dcf98b4481780bac48bc122a WHIRLPOOL 2e55d6962d58f4eddf23398dce30168ef06bae31b1b21010c395349faf6e3285341690927933932fa3423684c3b713f46ad91db7fd708a509e95abbcbfddc7f6
diff --git a/dev-python/casuarius/casuarius-1.1.ebuild b/dev-python/casuarius/casuarius-1.1.ebuild
new file mode 100644
index 000000000000..ca9ad6dc37d0
--- /dev/null
+++ b/dev-python/casuarius/casuarius-1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cython wrapper for the Cassowary incremental constraint solver"
+HOMEPAGE="https://github.com/enthought/casuarius"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.15.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/casuarius/metadata.xml b/dev-python/casuarius/metadata.xml
new file mode 100644
index 000000000000..e70d82229cc1
--- /dev/null
+++ b/dev-python/casuarius/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  Casuarius is a Cython binding for Cassowary incremental constraint solver.
+  The solver source code is derived from the 0.6 release of
+  Cassowary. It has been modified by Svilen Dobrev to remove memory
+  leaks.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">encore</remote-id>
+    <remote-id type="github">enthought/casuarius</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
new file mode 100644
index 000000000000..a11326490b7f
--- /dev/null
+++ b/dev-python/catkin_pkg/Manifest
@@ -0,0 +1,9 @@
+AUX argparse.patch 408 SHA256 6d8c796c4a1dbfeab2ea3bf1e86c31bd2fbb50319c6b36b2b988a87eb344a86b SHA512 c5a5067d3f7477935d775f5c9c39f9b5c9636e97ab567c6b7a5d34cb06f5fac58a4dff94868f2d856d792c270bc6d727fe3ec60cf8825b7ae2b4519aed999b90 WHIRLPOOL 560795db2a6a4b8116375f2b3677a382a90966957bc5fb3da3fe26c18a7ae41562de3686a498869d72b1d9d98fc31f567a1f96a9fc421ed7fb616a244ac7ef2f
+AUX catkin_prefix.patch 1619 SHA256 ca7f0d3febd5e86cc0a57d5f2eb0aa2c6954c9d835d07c47cdd8cc5039c93bec SHA512 c90f004db36fdbcc46c47fab5d800bcbc7f3b5237eaa78ceb4b47eaae0c1eba858a92d3fb673bfb9b4cd107675f8551eda4477cc419b26279bda4d55fa78f7f1 WHIRLPOOL 0e1ca510410aa67f24738e91fe709d874712611d86a655a35579928451aa725f4a33d23b7708ae68ad8045bb187ceb86c91d79faba2bda5e54c4bf914fb95d89
+AUX infinite_loop2.patch 1274 SHA256 545df24d04998671cd82ba130f8a1d69cf2576a3515b022fcdb2b04ddf45e662 SHA512 a736242c2e42d0e3c97556f565d7ebc3b06c203a21b805fa13db789ffcc396b5f79793874418c389dd0013c36f9ba6f5674026d03d26653ea2a69fb0a95bab9a WHIRLPOOL cf2dea7bf38538cbcf294a71c4a75dcc7ed8a8aec6066ab5e7ec5b22fc2c0f4b207c9ccd1e605a124c524520d2fdf6bce3bfb8cc0f09a8668e735267fecb88ff
+AUX ros_packages.patch 621 SHA256 950e261d19b15444034c1984e14878eb11ee9df5d6d6291d2aca2dd8347dd123 SHA512 446c19801306f2f0116a4bdfe228ddc192a84458fe0803bd5ce9b99d58620bf2c3bf31bcc3f078a4c18281f64f7e68cbfb711d683959e71457b05b7aa63a6ecf WHIRLPOOL 4052d22449e7f8ec48946a030c15a998fb724c2b25de727235e673618d4616edaa0d184c1e59edc291f3deac613bf3b632c61cd113ccbdab26aa860f8170f0d9
+DIST catkin_pkg-0.3.6-gh.tar.gz 47637 SHA256 b05797352a89986a6c637ef33685a8cd004a8e5138b553f42a82065bc02f808b SHA512 191ed93271c9e592040110c92a572570fa8dec328ae3203dfea9e1fb6a1cb906350c436d3a9416d6826e57a1d59ef42200797d6a5bdc390aa77d352f716e0cc8 WHIRLPOOL 83f73ddaad17b5cfef4945a4d0c900855586877c47962b903e68f821772f4281f7658d82c4adfdf8067889e82f1264d843f1c4f336876ac8afa1bdfe48edeb37
+EBUILD catkin_pkg-0.3.6.ebuild 1106 SHA256 bcc9ad16fdf1f91c3d3012202a17eba9b7333a293da9d1e293182c181310d7bb SHA512 98685de96bb42b0c36173fb4a03d2a28709469a9d63a6923beb1caf14e07fcd6e881511e79bb5f453558975b4fbe5d284d1ed2e8c965da4ab4beb3e97c54aef6 WHIRLPOOL 6df237d8c380e2c5f8fa545adb50f1b9fba07a41f868f98abf59d5c56b3ca4de65fff4924a150366fde9a5fe6413cb5ac0fdc8f300af97a27c43e7f40d841947
+EBUILD catkin_pkg-9999.ebuild 1106 SHA256 bcc9ad16fdf1f91c3d3012202a17eba9b7333a293da9d1e293182c181310d7bb SHA512 98685de96bb42b0c36173fb4a03d2a28709469a9d63a6923beb1caf14e07fcd6e881511e79bb5f453558975b4fbe5d284d1ed2e8c965da4ab4beb3e97c54aef6 WHIRLPOOL 6df237d8c380e2c5f8fa545adb50f1b9fba07a41f868f98abf59d5c56b3ca4de65fff4924a150366fde9a5fe6413cb5ac0fdc8f300af97a27c43e7f40d841947
+MISC ChangeLog 2147 SHA256 04a5fa7473218dc80a59d3d87d86663506564c00ca736c2a00be0756a36936c5 SHA512 1312dcb18e7ae5c84a8654fa8e336b34baa98492ce58fe9c790daff4522bc303ce4661e3561cc175790c1cc66dfb94cd11ff622f421d4c81d2e9e2c2f158dd16 WHIRLPOOL 1da74529ea3775f1eeed4cc6bf764777e95aab26acfa86e2e110b66d822e61b725720bf455495194eea8b90b31ca95bf9c49461fdb58882f1cf08486d470ca21
+MISC metadata.xml 343 SHA256 8e283f2089b6cb4306afba398198483765592713058d3ecffcd44157015973ee SHA512 3ca5d78edb7c7dd2283944af93b7a8b6b3bb176ffa9e0df31881c8b5d66a4abc7e080e11f25f285e0b8735b16ed1598cf032a37d62b7fbb0b5adb3296e9b5862 WHIRLPOOL 99cc69cbf235b08f27c40b2409ea3216a71d1cf9d663b5f3683d2e38e0828fd04468886d99249b0722a98bef55d67252d4cfe1ab49f6286afe7cdda136742f52
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.3.6.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.3.6.ebuild
new file mode 100644
index 000000000000..0967bd6ff8e6
--- /dev/null
+++ b/dev-python/catkin_pkg/catkin_pkg-0.3.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the catkin package system"
+HOMEPAGE="http://wiki.ros.org/catkin_pkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
+"
+PATCHES=(
+	"${FILESDIR}/catkin_prefix.patch"
+	"${FILESDIR}/argparse.patch"
+	"${FILESDIR}/ros_packages.patch"
+	"${FILESDIR}/infinite_loop2.patch"
+)
+
+python_test() {
+	nosetests -s --tests test || die
+}
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
new file mode 100644
index 000000000000..0967bd6ff8e6
--- /dev/null
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the catkin package system"
+HOMEPAGE="http://wiki.ros.org/catkin_pkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
+"
+PATCHES=(
+	"${FILESDIR}/catkin_prefix.patch"
+	"${FILESDIR}/argparse.patch"
+	"${FILESDIR}/ros_packages.patch"
+	"${FILESDIR}/infinite_loop2.patch"
+)
+
+python_test() {
+	nosetests -s --tests test || die
+}
diff --git a/dev-python/catkin_pkg/files/argparse.patch b/dev-python/catkin_pkg/files/argparse.patch
new file mode 100644
index 000000000000..f39df4a40565
--- /dev/null
+++ b/dev-python/catkin_pkg/files/argparse.patch
@@ -0,0 +1,12 @@
+Index: catkin_pkg-0.3.1/setup.py
+===================================================================
+--- catkin_pkg-0.3.1.orig/setup.py
++++ catkin_pkg-0.3.1/setup.py
+@@ -31,7 +31,6 @@ kwargs = {
+     'long_description': 'Library for retrieving information about catkin packages.',
+     'license': 'BSD',
+     'install_requires': [
+-        'argparse',
+         'docutils',
+         'python-dateutil'
+     ],
diff --git a/dev-python/catkin_pkg/files/catkin_prefix.patch b/dev-python/catkin_pkg/files/catkin_prefix.patch
new file mode 100644
index 000000000000..c5f40db51cd1
--- /dev/null
+++ b/dev-python/catkin_pkg/files/catkin_prefix.patch
@@ -0,0 +1,28 @@
+Allow CATKIN_PREFIX_PATH to work as CMAKE_PREFIX_PATH:
+When building with SYSROOT!=/, CMAKE_PREFIX_PATH is the same as with SYSROOT=/
+but we need to find packages in SYSROOT.
+
+Index: catkin_pkg-0.2.8/src/catkin_pkg/workspaces.py
+===================================================================
+--- catkin_pkg-0.2.8.orig/src/catkin_pkg/workspaces.py
++++ catkin_pkg-0.2.8/src/catkin_pkg/workspaces.py
+@@ -42,15 +42,16 @@ CATKIN_WORKSPACE_MARKER_FILE = '.catkin_
+ 
+ def get_spaces(paths=None):
+     """
+-    Return a list of spaces based on the CMAKE_PREFIX_PATH or passed in list of workspaces.
++    Return a list of spaces based on the CMAKE_PREFIX_PATH/CATKIN_PREFIX_PATH or passed in list of workspaces.
+     It resolves the source space for each devel space and ignores non-catkin paths.
+     :param paths_to_order: list of paths
+     :param prefix_paths: list of prefixes, must not end with '/'
+     """
+     if paths is None:
+-        if 'CMAKE_PREFIX_PATH' not in os.environ:
+-            raise RuntimeError('Neither the environment variable CMAKE_PREFIX_PATH is set nor was a list of paths passed.')
++        if 'CMAKE_PREFIX_PATH' not in os.environ and 'CATKIN_PREFIX_PATH' not in os.environ :
++            raise RuntimeError('None of the environment variables CMAKE_PREFIX_PATH or CATKIN_PREFIX_PATH are set nor was a list of paths passed.')
+         paths = os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep) if os.environ['CMAKE_PREFIX_PATH'] else []
++        paths += os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep) if os.environ['CATKIN_PREFIX_PATH'] else []
+ 
+     spaces = []
+     for path in paths:
diff --git a/dev-python/catkin_pkg/files/infinite_loop2.patch b/dev-python/catkin_pkg/files/infinite_loop2.patch
new file mode 100644
index 000000000000..7c5edba2b50c
--- /dev/null
+++ b/dev-python/catkin_pkg/files/infinite_loop2.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/show_bug.cgi?id=612860
+By Tim Rakowski
+We os.walk /usr with followlinks=True, but at least nodejs contains a "recursive" link in /usr/include/node
+
+Index: catkin_pkg-0.3.6/src/catkin_pkg/packages.py
+===================================================================
+--- catkin_pkg-0.3.6.orig/src/catkin_pkg/packages.py
++++ catkin_pkg-0.3.6/src/catkin_pkg/packages.py
+@@ -56,7 +56,9 @@ def find_package_paths(basepath, exclude
+     """
+     paths = []
+     real_exclude_paths = [os.path.realpath(p) for p in exclude_paths] if exclude_paths is not None else []
++    visited = set()
+     for dirpath, dirnames, filenames in os.walk(basepath, followlinks=True):
++        visited.add(dirpath)
+         if 'CATKIN_IGNORE' in filenames or \
+             os.path.realpath(dirpath) in real_exclude_paths or \
+                 (exclude_subspaces and '.catkin' in filenames):
+@@ -67,7 +69,7 @@ def find_package_paths(basepath, exclude
+             del dirnames[:]
+             continue
+         # filter out hidden directories in-place
+-        dirnames[:] = [d for d in dirnames if not d.startswith('.')]
++        dirnames[:] = [d for d in dirnames if not d.startswith('.') and not os.path.realpath(os.path.join(dirpath, d)) in visited]
+     return paths
+ 
+ 
diff --git a/dev-python/catkin_pkg/files/ros_packages.patch b/dev-python/catkin_pkg/files/ros_packages.patch
new file mode 100644
index 000000000000..6c9855d627c9
--- /dev/null
+++ b/dev-python/catkin_pkg/files/ros_packages.patch
@@ -0,0 +1,13 @@
+Index: catkin_pkg-0.3.1/src/catkin_pkg/packages.py
+===================================================================
+--- catkin_pkg-0.3.1.orig/src/catkin_pkg/packages.py
++++ catkin_pkg-0.3.1/src/catkin_pkg/packages.py
+@@ -59,7 +59,7 @@ def find_package_paths(basepath, exclude
+             del dirnames[:]
+             continue
+         elif PACKAGE_MANIFEST_FILENAME in filenames:
+-            paths.append(os.path.relpath(dirpath, basepath))
++            paths.append(os.path.relpath(dirpath.replace('ros_packages/',''), basepath))
+             del dirnames[:]
+             continue
+         for dirname in dirnames:
diff --git a/dev-python/catkin_pkg/metadata.xml b/dev-python/catkin_pkg/metadata.xml
new file mode 100644
index 000000000000..23a932120133
--- /dev/null
+++ b/dev-python/catkin_pkg/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ros-infrastructure/catkin_pkg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cbor/Manifest b/dev-python/cbor/Manifest
new file mode 100644
index 000000000000..8696e63bb820
--- /dev/null
+++ b/dev-python/cbor/Manifest
@@ -0,0 +1,4 @@
+DIST cbor-1.0.0.tar.gz 20096 SHA256 13225a262ddf5615cbd9fd55a76a0d53069d18b07d2e9f19c39e6acb8609bbb6 SHA512 996b61c7d16cbe8bd7b056d09286a17f3a6a29cb97ef9e5ca1d1bfe8c53393ae3d2b7565c937a283cb78f377af14c070bd663aabbce995dc7e5b9d2f69a6ba73 WHIRLPOOL 5384cf292f08edb15e53d35ab86feeac6e25c967a5a3a0e1e21d3f0a7460feca4b2e27d3ace58a05c4a0d751b0f5719a24d174e5d899818c6890ad139e1cbd36
+EBUILD cbor-1.0.0.ebuild 475 SHA256 3eeca865b6e5abec490cf3f06a227d8427fa91aef0c1506efbe7d67e76667587 SHA512 dd6d95543572af1c58e684660586111eb84a080f1c69b4f957517b3d2ed54c046f96c96edf551d195915a750425ef03eefc240bf18699abcfcc1c47b3110afd5 WHIRLPOOL 5f854b944ee72cb495c2eebe91056a3d666814b43b5b2d6f61257420b3703b9411331f1dd622ada52b4ae866dbadea29a858a21e137312bae95e592c905a344c
+MISC ChangeLog 466 SHA256 e3ef3a8f33e01901c6763648b023939c3a1d7be6cce0a1cb25bb41d0b3f8439d SHA512 f3209976fa8bcf6ebd6bb925df611b9803656071f9fbdd43a5a810d576dc54542e4abcfef75729e5fe706f2abcb84b820194a7c8f61195a1943124a946d16e04 WHIRLPOOL 4897e06334a0fc9a01520e559d3338d1c8b4b210cde394d112577165248f319e461202035bcd26617f214fd9681e2196b89822a8f1dd2e010daf547cb324b666
+MISC metadata.xml 1122 SHA256 ff87d188a4f3a21c351d072061787feea0d88206245dd1e1d2ffc39cc36d20fb SHA512 1ed4417585efa79ba5b548ac90336ca7a9ca9d6e1adc7a53641d0e48840bb97532f718bab5cf4b7b36b487015c1d7cbf7e8f5d6491e698b99269ff6ec0fbf5e8 WHIRLPOOL a00f1f4ca30e0d94f33993115b3ce2d8ae7aef320283d3780e5cdbe383c402adef2b4fb614596e6a325f5f12e47c24f18043f07977671869c288eb84352383ea
diff --git a/dev-python/cbor/cbor-1.0.0.ebuild b/dev-python/cbor/cbor-1.0.0.ebuild
new file mode 100644
index 000000000000..c651b7d6be55
--- /dev/null
+++ b/dev-python/cbor/cbor-1.0.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
+HOMEPAGE="https://bitbucket.org/bodhisnarkva/cbor https://pypi.python.org/pypi/cbor"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/cbor/metadata.xml b/dev-python/cbor/metadata.xml
new file mode 100644
index 000000000000..0108109a8853
--- /dev/null
+++ b/dev-python/cbor/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>bolson@bolson.org</email>
+			<name>Brian Olson</name>
+		</maintainer>
+		<remote-id type="pypi">cbor</remote-id>
+		<remote-id type="bitbucket">bodhisnarkva/cbor</remote-id>
+	</upstream>
+	<longdescription>An implementation of RFC 7049 - Concise Binary Object
+		Representation (CBOR).  CBOR is comparable to JSON, has a superset of
+		JSON's ability, but serializes to a binary format which is smaller and
+		faster to generate and parse.  The two primary functions are
+		cbor.loads() and cbor.dumps().  This library includes a C implementation
+		which runs 3-5 times faster than the Python standard library's
+		C-accelerated implementanion of JSON. This is also includes a 100%
+		Python implementation.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/ccdproc/Manifest b/dev-python/ccdproc/Manifest
new file mode 100644
index 000000000000..4e26275f73ee
--- /dev/null
+++ b/dev-python/ccdproc/Manifest
@@ -0,0 +1,6 @@
+DIST ccdproc-1.1.0.tar.gz 493426 SHA256 e3d5c65770840ab7bfa267caa429cda92d68a433b2b60620d9efd70b8a641397 SHA512 72c55df91e2ede41898af0631d83121f7e13f468c16da570e6fca5742f431914be7da5e030f62041fb59b2d8c721b4250205d7b733d8bbb2becb15d9b98607be WHIRLPOOL 51ed8ab822df17885961c474389f2a6f77068d54ee2e43e722920f05997f2a3899e67391636d3bebdbf0a5122a672f9b3bc0346104cd9e0ffc44076a54642ef3
+DIST ccdproc-1.2.0.tar.gz 504810 SHA256 d96fcb6c45c2d060ef915380ed75d230693befa3f9427fdeed0ec8463abfac38 SHA512 f9f400aedf46ea7614e5a958f65e058dc081604b3bed499cdabe6abf4df3c4d1457469aaa15511edf1a2518f98e6d6fe8677a5b89b01b2dde4c0d0817d8c64df WHIRLPOOL 662f9bcab2379f34735902e40e97deb604589d5c81dbe2505dfd0700dccf4fb19de17e671bae0982846ad0e4dd3dda079b300623c075ea1a78be348920895b51
+EBUILD ccdproc-1.1.0.ebuild 1191 SHA256 d7cb25ae72bde461134a10ce6bd45b951f721a234ccc1d0cb1b15851fff6b86b SHA512 670e41003d9512f4079af8e2041ca5d92dd8d513c1f0011f913f4a534b8bcd834d9291b5b44fdffe2098f641adef91b51c60c2c8e06db45ae11f7a73ba49ada4 WHIRLPOOL 39083a17b6802595fc6103c03ff47c8dfb2b5f340ef39b5b0e0539dba51b5e11c8707c6d3660d442286760f0136712b75287f97e66e9e73729be052510f1c28b
+EBUILD ccdproc-1.2.0.ebuild 1235 SHA256 3028f38df371d06c19c5968ad4ddc33af69da499e40770735b23d93663e21a9a SHA512 9957a1fc3e9ce31dd0591e2c97b06670e43e427e462cdcf6f58d92b15760756f23922d7e46a0a7e852cf1e19df6ceafd04ca6680446dcd4787c5d4efd27e2aef WHIRLPOOL 335017ede2702daf99b2f8ddf54996abbe5afc4260e485b007036a1861a1961eae739741c39940a89421f92c50910868aa05fade5287d0ac47951ed194101674
+MISC ChangeLog 763 SHA256 bc884d2f658bdfbfae36d1dee08dbf82bb1b9fee9cf72ec546b1bf4f1a40065f SHA512 f6ac9decdbc911f40b1e37291726ab231811196cf9209ec6cfbc08567a64d74d5dd1ad91b990ba56ba2bce74045e7641917385d1476004f417e464168363dbc4 WHIRLPOOL b8630cfc60c2ae9ea286fac66142ae90afbc2d6f294836450072f6c69d7710e12331fa8dcf7280e92259f421cbf8b2ac5deabcc6b05222df5c9b0d985a9ac8aa
+MISC metadata.xml 656 SHA256 f3d92eb49d4ffff6d806fcbabc269a1a9e96a48111c4a8662c67428e66e13907 SHA512 49c3ba25e1411c6a55a1adf61ebb6ff13f2843b5e66a7672d4359bcf5c21710b946b78693a55665eab835629fff37fa60c41a473f757ddb8a4d5cbe2e3cdce81 WHIRLPOOL 42628afbb0b6a110c66ac1edccea0c1e3279999b4cc3f374e8beb5772db94619a751ac2b30638368ef0d6992831d761048165988bf3fee80693a679c66e04b01
diff --git a/dev-python/ccdproc/ccdproc-1.1.0.ebuild b/dev-python/ccdproc/ccdproc-1.1.0.ebuild
new file mode 100644
index 000000000000..02ee1a9cca6a
--- /dev/null
+++ b/dev-python/ccdproc/ccdproc-1.1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Astropy affiliated package for reducing optical/IR CCD data"
+HOMEPAGE="https://github.com/astropy/ccdproc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+
+DOCS=( README.rst )
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+			dev-python/astroscrappy[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/reproject[${PYTHON_USEDEP}]
+		  )"
+
+python_prepare_all() {
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ccdproc/ccdproc-1.2.0.ebuild b/dev-python/ccdproc/ccdproc-1.2.0.ebuild
new file mode 100644
index 000000000000..72bcd5ea3796
--- /dev/null
+++ b/dev-python/ccdproc/ccdproc-1.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Astropy affiliated package for reducing optical/IR CCD data"
+HOMEPAGE="https://github.com/astropy/ccdproc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+
+DOCS=( README.rst )
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+			dev-python/astroscrappy[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/reproject[${PYTHON_USEDEP}]
+			sci-libs/scikits_image[${PYTHON_USEDEP}]
+		  )"
+
+python_prepare_all() {
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ccdproc/metadata.xml b/dev-python/ccdproc/metadata.xml
new file mode 100644
index 000000000000..8c6cd2dde78c
--- /dev/null
+++ b/dev-python/ccdproc/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    ccdproc is a AstroPy-affliated package for the basic reduction of
+    CCD images. It provides a framework for accounting for error propagation
+    and bad pixel tracking through the reduction steps.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">ccdproc</remote-id>
+    <remote-id type="github">astropy/ccdproc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cddb-py/Manifest b/dev-python/cddb-py/Manifest
new file mode 100644
index 000000000000..536add3b0954
--- /dev/null
+++ b/dev-python/cddb-py/Manifest
@@ -0,0 +1,5 @@
+DIST CDDB-1.4.tar.gz 39562 SHA256 bcd0f2f21848f2fcd692c542f124ec3e1414391ddeb6114f6f7bc5724a831d25 SHA512 578ef74313cd164f28682ed7e8b26e7c4e7fbac972f7c3c2fecfe31e6bc2ea8dff0c79adf9b6fda77402f9855d809819f56c23e4ffa68404d8cde479a15f740a WHIRLPOOL 9838ae4168c63b003ba686d57fccbfa84d85cd5dbffb5c603bb7065d05f5e419fa3fc55f70edcec30255dd4fdbdbad7bf7c36416c3edadf4004005147378105b
+EBUILD cddb-py-1.4-r1.ebuild 447 SHA256 aa941751c3631b133dbbccb9cf1283bc39ecc2736c7afcd169f1a8262509af2d SHA512 4a24a41298c1c30bd9091a24c3d7b6d193a755da2879f3e33ae0551d19af8f83bfb863b4d3f149de15f4fa5137f5ac60daa09ba0f40e0b86031e82bb8693d05a WHIRLPOOL fa766251d45d71b6ae26a84e8ac53fe8d3cd6a7a4cfbe4bd488420880285a69fc63dccae22ca5b3429ea6f6305dd612aec4e138a5be8bb6996221f38b7f1d056
+MISC ChangeLog 3701 SHA256 2389cacad4a69dbbfca99bf48a5b3037611039c443649b05de757962e3250c0b SHA512 67766df4dab94b469e42a6525b3b0e0cde609349d3b09cf083a889380aada91a5be18161c29de5be0924d030aa203c8beb506776d13fbac106a104f575545ba7 WHIRLPOOL f4d194216afe4c771c4113d0151aca2f6c414b95026ed6d8743bd4af7de46c8eedf582ca0fc9583ac96ed69da2b294b09442f51335181545729689caa7e9ecc1
+MISC ChangeLog-2015 1929 SHA256 d161be0be04ed281954dbe39b0dabb372f14d53a78a555ecbeab53cd4e9d5e67 SHA512 f1fb5a4eedeaaa667e3c49356caf5a5a6e17dd586143893eb9c01f86788f80a6bbffafe78f458a7d3f82e97590df5718c5d3f3303a02e683ef628d8a6edb9530 WHIRLPOOL 855a82c6ef7596f5b515b779daf0520ad7ec5a91adcbf3ea2b24e7130e30b0d681dd1c4371e7a4be32680013acf27a9eb2ac49c5306843fde776c86bbfc4f764
+MISC metadata.xml 317 SHA256 5f7979a9de4a5b75965a1d059b97eaf9bc87f76f0f49b02cf564015d9502ec5c SHA512 0d75c20dea50472709d216688b12e2e3781ce50bd863b7d90d9e42f5044dd723913cc874e3098c18aa52e26521c5ef533284ddd1e59e78abd8760dac4bede756 WHIRLPOOL fb04b232ca8c007d24a95979c3f6c875ada8d0fdd3e3a11bdc2b3a46e7cab31408bb385aaf1c9348fb03855f89e11f1a9714f4a36fac8da6bd8cadce3d7f157e
diff --git a/dev-python/cddb-py/cddb-py-1.4-r1.ebuild b/dev-python/cddb-py/cddb-py-1.4-r1.ebuild
new file mode 100644
index 000000000000..b29da045509d
--- /dev/null
+++ b/dev-python/cddb-py/cddb-py-1.4-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="CDDB"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="CDDB Module for Python"
+HOMEPAGE="https://sourceforge.net/projects/cddb-py/"
+SRC_URI="mirror://sourceforge/cddb-py/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/cddb-py/metadata.xml b/dev-python/cddb-py/metadata.xml
new file mode 100644
index 000000000000..e2b55b3f3ece
--- /dev/null
+++ b/dev-python/cddb-py/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cddb-py</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/celementtree/Manifest b/dev-python/celementtree/Manifest
new file mode 100644
index 000000000000..6ffef0013084
--- /dev/null
+++ b/dev-python/celementtree/Manifest
@@ -0,0 +1,7 @@
+AUX celementtree-1.0.5-setuptools.patch 322 SHA256 24f1f9d7a28247bc0237f2d598dfdcbad579bceb4fb1d0fd09f91c1932175638 SHA512 d72e17afb23f9070797a0d8a88cb48df8c59de8c4f8db04cfcff7499e68d97f37e79569c1a763aa1670af8a99c9efe3013396a458a33ac8a338079fa25d4d792 WHIRLPOOL 738bfece12f2ac204929f473aeb7debb7c25f71a99502cbbdc23e749988fbbc620e644c5bd55a54162836bdd35599863f1801a4a51fd80997f8d697734016ddc
+AUX celementtree-1.0.5-use_system_expat.patch 1069 SHA256 aec7cc96f85d621f68df442533b5964d5517f5922b7d1c1f9bdbdf7629fb11ea SHA512 2b343a2aa5f30c1aa63acdc47cc89417f3622d837e846e2756098123f8491d140660c123d4dfabb4947e82b9561fbc424e31d3685e223db337a1b451bf2008c1 WHIRLPOOL 7be4729ec5aefed99768ec6a47a57e7f17560f802f8c57964fb6adef4bd0b59c94805196599352c385e63edc8839f12cba996f9ca8af2c6757f69018c2b29e90
+DIST cElementTree-1.0.5-20051216.tar.gz 93766 SHA256 b2e528c99837124b32598bde7a19da579203c600d71f22f4c84da0933ba09751 SHA512 2cb99e4980580f186eb9b8740bc5a3e6e85e714a5d1f613850a8f12f7dbc125c8aa7770f7fe70480fb96999212c11181ab681822c74429882c1dfe91c20e2af9 WHIRLPOOL 2788c2eb7ab7bb3a654b535d273cb198eaf15d2265b00e4a9da3b1aa097041db34ce3ebd7b393e75a806957dca3b5c712e5256bc69f0eceb0c11c99bdb9bbce2
+EBUILD celementtree-1.0.5-r2.ebuild 1126 SHA256 f5cd900a057808ba5cff7be421b2409d12b659babad386791c42afcade36fec4 SHA512 46ca7225edb11a9a7b0b1df2adb7d3cae776e1debbe6591140ef9d06ffb1347c5fda6baafd0c1e7e1fbc28b0a74ed15d000aadf7f5d9a22b9d3e5528cb6ab47b WHIRLPOOL 2e2dedff3b4ae3a14087c3f789012f56b0b56aadd7dd345775c95d384c0af8b22609d6173786629fa07e2a1d10ac2f7968b8cb83adfabf322b334642be1ab730
+MISC ChangeLog 2697 SHA256 25fe07dda0a55225bc0bfb08f0f833c33cb12779369731d8f6e7b296ed825f3f SHA512 f133ed39b5af0567bf887f513eaf07c55422b7d2de1c8f94518f167cb499a7ebb4b5fa98a5a0410879d9d45a275d08dcbb1600fd0cbf2a0586a214d16133e94b WHIRLPOOL d898ba4cab4ca2d163d5bfc015820b23c287b28c62d23423c7d3cfde5f3081149ce13aa10a0fc49a329dcd9e365dedb2ba352dbb4ffe38b171a59dfad5800340
+MISC ChangeLog-2015 5877 SHA256 112b438d2759f24a3d6bfd9eb787acc4812fb8061493df08156ed54a5ac11964 SHA512 38c5c6834cf28bf73ecc740b4e1bafecad4d68d97800794236af92c09ec6c085b24345949ee54c90f437a069b0a2032cf56923ba4d4f4a74874a919d9adc8878 WHIRLPOOL 25f3edba8c7527b175e736706140e92f1026e4c9ad9782679732e63ee91fc136006ac3bc961c19e9b6167054205a72392355756345601948266f48b86fcb1fa9
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/celementtree/celementtree-1.0.5-r2.ebuild b/dev-python/celementtree/celementtree-1.0.5-r2.ebuild
new file mode 100644
index 000000000000..ffe294af978c
--- /dev/null
+++ b/dev-python/celementtree/celementtree-1.0.5-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P="cElementTree-${PV}-20051216"
+
+DESCRIPTION="The cElementTree module is a C implementation of the ElementTree API"
+HOMEPAGE="http://effbot.org/zone/celementtree.htm https://pypi.python.org/pypi/cElementTree"
+SRC_URI="http://effbot.org/downloads/${MY_P}.tar.gz"
+
+LICENSE="ElementTree"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="examples"
+
+RDEPEND=">=dev-python/elementtree-1.2[${PYTHON_USEDEP}]
+	>=dev-libs/expat-1.95.8"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${P}-use_system_expat.patch"
+		"${FILESDIR}/${P}-setuptools.patch"
+	)
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" selftest.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( samples/. selftest.py )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/celementtree/files/celementtree-1.0.5-setuptools.patch b/dev-python/celementtree/files/celementtree-1.0.5-setuptools.patch
new file mode 100644
index 000000000000..d70dfab1a519
--- /dev/null
+++ b/dev-python/celementtree/files/celementtree-1.0.5-setuptools.patch
@@ -0,0 +1,12 @@
+--- setup.py.orig	2007-07-04 23:05:19.000000000 -0700
++++ setup.py	2007-07-04 23:05:58.000000000 -0700
+@@ -6,7 +6,8 @@
+ # Usage: python setup.py install
+ #
+ 
+-from distutils.core import setup, Extension
++from setuptools import setup
++from distutils.core import Extension
+ from distutils import sysconfig
+ import sys, os
+ 
diff --git a/dev-python/celementtree/files/celementtree-1.0.5-use_system_expat.patch b/dev-python/celementtree/files/celementtree-1.0.5-use_system_expat.patch
new file mode 100644
index 000000000000..fb90e59a4492
--- /dev/null
+++ b/dev-python/celementtree/files/celementtree-1.0.5-use_system_expat.patch
@@ -0,0 +1,44 @@
+diff -u a/selftest.py b/selftest.py
+--- a/selftest.py	2005-12-16 23:57:47.000000000 +0200
++++ b/selftest.py	2007-07-03 08:07:45.000000000 +0300
+@@ -176,8 +176,6 @@
+     </ns0:root>
+ 
+     >>> parser = ElementTree.XMLParser()
+-    >>> parser.version
+-    'Expat 1.95.8'
+     >>> parser.feed(open("samples/simple.xml").read())
+     >>> print serialize(parser.close())
+     <root>
+diff -u a/setup.py b/setup.py
+--- a/setup.py	2005-12-16 23:57:47.000000000 +0200
++++ b/setup.py	2007-07-03 08:00:57.000000000 +0300
+@@ -23,16 +23,6 @@
+ # --------------------------------------------------------------------
+ # expat library
+ 
+-sources = [
+-    "expat/xmlparse.c",
+-    "expat/xmlrole.c",
+-    "expat/xmltok.c",
+-    ]
+-
+-includes = [
+-    "expat",
+-    ]
+-
+ defines = [
+     ("XML_STATIC", None),
+     ]
+@@ -63,9 +53,9 @@
+ 
+ ext_modules.append(
+     Extension(
+-        "cElementTree", ["cElementTree.c"] + sources,
++        "cElementTree", ["cElementTree.c"],
+         define_macros=defines,
+-        include_dirs=includes,
++        libraries=['expat'],
+         )
+     )
+ 
diff --git a/dev-python/celementtree/metadata.xml b/dev-python/celementtree/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/celementtree/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest
new file mode 100644
index 000000000000..4a79ada4594e
--- /dev/null
+++ b/dev-python/celery/Manifest
@@ -0,0 +1,14 @@
+AUX celery-3.1.19-test.patch 767 SHA256 3b042d6dc83d1b39fb15e048c0153a55f6b6b6ac7f979ecba85d78605a69fca5 SHA512 c9737f8d38bc039d88a02f3666dd872624d96fb0e0d02ceff5313d2379a708aec84755fbd9b5883766b29957838385efd5963e175a20350484d3f77e7bb6c9c7 WHIRLPOOL c77d36914ea6b8d910d4b94ebddf0138c9eb8141e46c94d33caf26d3686b290a5a735ac4b682991f906077204084aa3b1e3ba756c4464a6852df04bb64135981
+AUX celery-4.0.2-log-endless-loop.patch 811 SHA256 dae15ec5708b21cf447cfb2844fa98fb685db0001a60b14fbba33164abc7a5e9 SHA512 c6ddc3a5ec8f76affa953747b6f5b00627132f19cc74a89e6f9b0d24a5831722f7110d3cec7e4a4f7b58a575bcc2454406e486faa0a50c03cc80a3c82c94b282 WHIRLPOOL 471c0ed1ac33d7ab91cf3fc79f690a35667f5a4780a7cbd85426c4dd04328ac59b2a00864f00455c82e48987ab50766fc0a2b6367186bec9649b82eb491b1e79
+AUX celery-docs.patch 779 SHA256 7fe9c7458abc6dd62f076c5904cf219aec2e42425758e59881d786e1536c5039 SHA512 813d3a772ce0ab19854519915f770d5785371f9d8b0c916e93a286383c4262f0c6a9e554c5d76fc0d81e53efbdc8ed4a7a7009ae07c71489e30464d7b0de6ef1 WHIRLPOOL 4935c4c8d812e486e33b33d67913a91c2c86c0093ed4f4b8aa808ad191c2c3aa427ae52c1c8357a5a8c36cbe1d77185f5b28332f3762589740240704e6a3902f
+AUX celery.confd-r2 1442 SHA256 130426bb8ffdfe79ce5b560960a50a952c44c8972ec7383771beccc78cf0a828 SHA512 ba3172e56a18df963b5886497c51b8aaf5298b5f3055214217561c8c691678b44c762d4f68f96e597807630af4d9185b7a9d557d13f7ffe25fc0092abcd09354 WHIRLPOOL 259dd09a78d217f7bc4ebfc825a3981469225967fab19911491218e6f4944671985ae35c798f4209f423f8d2a873331b050a7e2984e05714cfd87a95d8de4e26
+AUX celery.initd-r2 4303 SHA256 92e34a1eb88ffa22df1f0dcd12dfe862c6b5631e957d542564675c6a40e7f03e SHA512 722b5d526cad15589a4c26c4871c11255f8f1550b6d6a9d503962c07a6c60167d411f47135d55408acb6320636f885fff28e7691d74831ec1c2bb9d5dc48f3e2 WHIRLPOOL 465c4141b6eae67b2035177ca1c1eb65f9b05021470506b13804086eebb8e39042d10f183f404e28bc9669b30c710efc8702544f97dcbd2ffafd4afd998c3f41
+DIST celery-3.1.24.tar.gz 1330180 SHA256 99b8085ff3013c8cebb9211857fadf5f402882ccada863d67c4d74db60be027a SHA512 6f2e1c5fe417183bc44f39deee669957800b805790475bea1c93d9efb37e0bb6db5aed9606ff79350f404c145908e3af6fa5ce94d86fb70238f2c2f2425ddd3c WHIRLPOOL cc16895b3641a78cfe6de4f5012520ec78a5c5e831e39b1d2a75897a12cb9ec18ea3366f682650d86620d10b27898bbefa7f2b8ed81a7649a97f40b1ab7fb57c
+DIST celery-4.0.2.tar.gz 1337804 SHA256 e3d5a6c56a73ff8f2ddd4d06dc37f4c2afe4bb4da7928b884d0725ea865ef54d SHA512 1110b634cafa13f9d9ab0b0a7a17042325271bd5ea45a5f442e36e871db87b87e3f496d54b771d274a1676900d9dfdc7e21887943dfd1a299a9fcd8b3f6d2189 WHIRLPOOL 050a041d32a4fb2a9b9658b2e70972cd5606fb13f848fdb7848faeb0116be7d1e061ed8e1d631be46b2740a4307d474396fe1599daea2c20ac58111fb6c99d55
+DIST celery-4.1.0.tar.gz 1331689 SHA256 77ff3730198d6a17b3c1f05579ebe570b579efb35f6d7e13dba3b1368d068b35 SHA512 5232adc43ba55d01f2b030382075750033e0c5c2abdc8308903e0cef7a465513b7765e2ae495da6555b377452ae233500530ef9d57e584a5352a54c5f4731c64 WHIRLPOOL febd876eff4e5b62be9f08da5712d3b76c366b279e2296ea8e5c5b00728ba1fcbfeb1eb9ca6d5a53abf31953f28c51ef9116cd50cff0ec541a417c5d9f59c54b
+EBUILD celery-3.1.24-r1.ebuild 3485 SHA256 b7ed62815dc3c70224532f211dcbe0091e40be185782d79d599ad089dc977e72 SHA512 c8157f442295fc1e3e82bff9d5b35802b7cd6a1644fb45a6e7abb806f402a5a79292b003620d6b2ddedf58d2d3c8212bd3578494569a32024bceb8e7e8d4e543 WHIRLPOOL 0e5497d266e77022205ac3507944fb73bfadd72f93eb37203ef667549cca012f4e4679a854165589b1da6579336ec4e6b8adad6cb5037e659ff95263f1540a39
+EBUILD celery-4.0.2.ebuild 3556 SHA256 e7bc98ea47cd14a5ae0ffd391659e98791a46d53b6948c9cad4fb641350988ff SHA512 e305024afcae9ff7246cb3be694a3f6b51139e6e2159c295db76ae5c7cf713dabc09879c0de343ec8cf749fc3ad94812e81fa5fb2187ffcb2078176a393fd200 WHIRLPOOL 7e143fc172264b3ab12f1341815ed071433f33c8b102b40617ed7ed82965d2fce05c776dad12b2711c96ec079cfdfa41d309950f659f90b70232d053c04da1a6
+EBUILD celery-4.1.0.ebuild 3499 SHA256 6e522d78d2d413381d35ece23c334bae35ab6b2703b92a734253dd5794c50e70 SHA512 c4ff9d34e5c6bd17aa4b0594c9c7474dc4b301c22085ac9f35a5885da2a3d18d8c00c7ac10d9eef3ff39a0f8cba5d5e22310f1203f304ddaa901354eac7bf482 WHIRLPOOL 325fdfd1bfb358e739a5eae13f230a38648c5685880e8665cd63fa71983e8a2f4ff5175b77796a666f5a0ce482df4f1d9a246805f8a35cbd09c5711aea4164ce
+MISC ChangeLog 5515 SHA256 82f13ab17747b3ef528c0f1992e26a0d484bb665345e6aba68aed4d2cdb5394c SHA512 10dffa1946ce7e0bfc854efd4026cce63261d7f4041d9f8df061b577ae95430973564bca5a4e1df03da33913fbd435566c43fd9eb2153eebf242d339da6e6515 WHIRLPOOL 792b62475f144b700a3f2789527de7e295e51be7bb1cd358aca9d1f714010875b669b1c42fe9786db6af53b038c36b384c7646f315ba728fce1e3882090348ce
+MISC ChangeLog-2015 8296 SHA256 860d5f70477195599335c7cb77105295f4d20767e34ffb28c42985c40b15ff98 SHA512 6611bca33b8eaabd5dcae5c1e29b7bb1e039be0f77f75481d2a2ebc9c976413273bd040c3511037b5f72e7e88390d8f5ddc30306747b8066a1370f60b217621c WHIRLPOOL 342240aaeeda4757a904965e19c82c16491fd8b04cdae9942dcae35bdb1a8fe79136f2b0a97c02356f541670dee4111959d46607114f7c85619fa38e69867b03
+MISC metadata.xml 598 SHA256 ba0baf5d4c915e2000223406991a6aec062c2bff3fc94493d08a1a0b55998f0b SHA512 3edfde62756b7f2ab3d138fd297bf7335b238d027dd1d6a261533979f48b05fa4913b0f43a766075fc106c59b1ddd43cb6ba21aaf9c67311b0ba3df00f20975c WHIRLPOOL 960cea5dc288f23b851238770bbeb53b4a3426371b4e1b4da5dc3e0da7f05ab72a9bf24529ec66a0c4cd2a804adc0bfa15c617b10d906a90e9cbc19a88e76c49
diff --git a/dev-python/celery/celery-3.1.24-r1.ebuild b/dev-python/celery/celery-3.1.24-r1.ebuild
new file mode 100644
index 000000000000..40dec9afa9c8
--- /dev/null
+++ b/dev-python/celery/celery-3.1.24-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 bash-completion-r1
+
+DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing"
+HOMEPAGE="http://celeryproject.org/ https://pypi.python.org/pypi/celery"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+# There are a number of other optional 'extras' which overlap with those of kombu, however
+# there has been no apparent expression of interest or demand by users for them. See requires.txt
+IUSE="doc examples redis sqs test yaml zeromq"
+
+RDEPEND="
+	<dev-python/kombu-3.1[${PYTHON_USEDEP}]
+	>=dev-python/kombu-3.0.36[${PYTHON_USEDEP}]
+	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/billiard-3.3.0.23[${PYTHON_USEDEP}]
+	<dev-python/billiard-3.4[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/gevent[$(python_gen_usedep python2_7)]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-2.6.2[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/redis-py[${PYTHON_USEDEP}]
+		>=dev-db/redis-2.8.0
+		>=dev-python/boto-2.13.3[${PYTHON_USEDEP}]
+		>=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		)"
+
+PATCHES=(
+	"${FILESDIR}"/celery-docs.patch
+	"${FILESDIR}"/${PN}-3.1.19-test.patch
+)
+
+# testsuite needs it own source
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	if use doc; then
+		mkdir docs/.build || die
+		emake -C docs html
+	fi
+}
+
+python_test() {
+	nosetests --verbose || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	# Main celeryd init.d and conf.d
+	newinitd "${FILESDIR}/celery.initd-r2" celery
+	newconfd "${FILESDIR}/celery.confd-r2" celery
+
+	use examples && local EXAMPLES=( examples/. )
+
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+
+	newbashcomp extra/bash-completion/celery.bash ${PN}
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "zookeper support" dev-python/kazoo
+	optfeature "msgpack support" dev-python/msgpack
+	#optfeature "rabbitmq support" dev-python/librabbitmq
+	#optfeature "slmq support" dev-python/softlayer_messaging
+	optfeature "eventlet support" dev-python/eventlet
+	#optfeature "couchbase support" dev-python/couchbase
+	optfeature "redis support" dev-db/redis dev-python/redis-py
+	optfeature "couchdb support" dev-db/couchdb dev-python/couchdb-python
+	optfeature "gevent support" dev-python/gevent
+	optfeature "auth support" dev-python/pyopenssl
+	optfeature "pyro support" dev-python/pyro:4
+	optfeature "yaml support" dev-python/pyyaml
+	optfeature "beanstalk support" dev-python/beanstalkc
+	optfeature "memcache support" dev-python/pylibmc
+	#optfeature "threads support" dev-python/threadpool
+	optfeature "mongodb support" dev-python/pymongo
+	optfeature "zeromq support" dev-python/pyzmq
+	optfeature "sqlalchemy support" dev-python/sqlalchemy
+	optfeature "sqs support" dev-python/boto
+	#optfeature "cassandra support" dev-python/pycassa
+}
diff --git a/dev-python/celery/celery-4.0.2.ebuild b/dev-python/celery/celery-4.0.2.ebuild
new file mode 100644
index 000000000000..fc0a3fd8e298
--- /dev/null
+++ b/dev-python/celery/celery-4.0.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 bash-completion-r1
+
+DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing"
+HOMEPAGE="http://celeryproject.org/ https://pypi.python.org/pypi/celery"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# There are a number of other optional 'extras' which overlap with those of kombu, however
+# there has been no apparent expression of interest or demand by users for them. See requires.txt
+IUSE="doc examples redis sqs test yaml"
+
+RDEPEND="
+	<dev-python/kombu-5.0[${PYTHON_USEDEP}]
+	>=dev-python/kombu-4.0.2[${PYTHON_USEDEP}]
+	>=dev-python/billiard-3.5.0.2[${PYTHON_USEDEP}]
+	<dev-python/billiard-3.6.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	dev-python/vine[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/gevent[$(python_gen_usedep python2_7)]
+		>=dev-python/pymongo-2.6.2[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/redis-py[${PYTHON_USEDEP}]
+		>=dev-db/redis-2.8.0
+		>=dev-python/boto-2.13.3[${PYTHON_USEDEP}]
+		>=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+		>=dev-python/unittest2-0.5.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		>=dev-python/sphinx_celery-1.3[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python2_7 python3_4)
+		)"
+
+# testsuite needs it own source
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${P}-log-endless-loop.patch
+	)
+
+python_compile_all() {
+	if use doc; then
+		mkdir docs/.build || die
+		emake -C docs html
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	# Main celeryd init.d and conf.d
+	newinitd "${FILESDIR}/celery.initd-r2" celery
+	newconfd "${FILESDIR}/celery.confd-r2" celery
+
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	newbashcomp extra/bash-completion/celery.bash ${PN}
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "zookeeper support" dev-python/kazoo
+	optfeature "msgpack support" dev-python/msgpack
+	#optfeature "rabbitmq support" dev-python/librabbitmq
+	#optfeature "slmq support" dev-python/softlayer_messaging
+	optfeature "eventlet support" dev-python/eventlet
+	#optfeature "couchbase support" dev-python/couchbase
+	optfeature "redis support" dev-db/redis dev-python/redis-py
+	optfeature "couchdb support" dev-db/couchdb dev-python/couchdb-python
+	optfeature "gevent support" dev-python/gevent
+	optfeature "auth support" dev-python/pyopenssl
+	optfeature "pyro support" dev-python/pyro:4
+	optfeature "yaml support" dev-python/pyyaml
+	optfeature "memcache support" dev-python/pylibmc
+	#optfeature "threads support" dev-python/threadpool
+	optfeature "mongodb support" dev-python/pymongo
+	optfeature "sqlalchemy support" dev-python/sqlalchemy
+	optfeature "sqs support" dev-python/boto
+	#optfeature "cassandra support" dev-python/pycassa
+}
diff --git a/dev-python/celery/celery-4.1.0.ebuild b/dev-python/celery/celery-4.1.0.ebuild
new file mode 100644
index 000000000000..4b4b550110c5
--- /dev/null
+++ b/dev-python/celery/celery-4.1.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 bash-completion-r1
+
+DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing"
+HOMEPAGE="http://celeryproject.org/ https://pypi.python.org/pypi/celery"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# There are a number of other optional 'extras' which overlap with those of kombu, however
+# there has been no apparent expression of interest or demand by users for them. See requires.txt
+IUSE="doc examples redis sqs test yaml"
+
+RDEPEND="
+	<dev-python/kombu-5.0[${PYTHON_USEDEP}]
+	>=dev-python/kombu-4.0.2[${PYTHON_USEDEP}]
+	>=dev-python/billiard-3.5.0.2[${PYTHON_USEDEP}]
+	<dev-python/billiard-3.6.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	dev-python/vine[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/gevent[$(python_gen_usedep python2_7)]
+		>=dev-python/pymongo-2.6.2[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/redis-py[${PYTHON_USEDEP}]
+		>=dev-db/redis-2.8.0
+		>=dev-python/boto-2.13.3[${PYTHON_USEDEP}]
+		>=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+		>=dev-python/unittest2-0.5.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		>=dev-python/sphinx_celery-1.3[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python2_7 python3_4)
+		)"
+
+# testsuite needs it own source
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	if use doc; then
+		mkdir docs/.build || die
+		emake -C docs html
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	# Main celeryd init.d and conf.d
+	newinitd "${FILESDIR}/celery.initd-r2" celery
+	newconfd "${FILESDIR}/celery.confd-r2" celery
+
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	newbashcomp extra/bash-completion/celery.bash ${PN}
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "zookeeper support" dev-python/kazoo
+	optfeature "msgpack support" dev-python/msgpack
+	#optfeature "rabbitmq support" dev-python/librabbitmq
+	#optfeature "slmq support" dev-python/softlayer_messaging
+	optfeature "eventlet support" dev-python/eventlet
+	#optfeature "couchbase support" dev-python/couchbase
+	optfeature "redis support" dev-db/redis dev-python/redis-py
+	optfeature "couchdb support" dev-db/couchdb dev-python/couchdb-python
+	optfeature "gevent support" dev-python/gevent
+	optfeature "auth support" dev-python/pyopenssl
+	optfeature "pyro support" dev-python/pyro:4
+	optfeature "yaml support" dev-python/pyyaml
+	optfeature "memcache support" dev-python/pylibmc
+	#optfeature "threads support" dev-python/threadpool
+	optfeature "mongodb support" dev-python/pymongo
+	optfeature "sqlalchemy support" dev-python/sqlalchemy
+	optfeature "sqs support" dev-python/boto
+	#optfeature "cassandra support" dev-python/pycassa
+}
diff --git a/dev-python/celery/files/celery-3.1.19-test.patch b/dev-python/celery/files/celery-3.1.19-test.patch
new file mode 100644
index 000000000000..25b41456a0ce
--- /dev/null
+++ b/dev-python/celery/files/celery-3.1.19-test.patch
@@ -0,0 +1,16 @@
+https://github.com/celery/celery/commit/fb48b1f357f7a416d1413d0056158a74191185af.diff
+diff --git a/celery/tests/backends/test_mongodb.py b/celery/tests/backends/test_mongodb.py
+index f7546d3..a32d9ed 100644
+--- a/celery/tests/backends/test_mongodb.py
++++ b/celery/tests/backends/test_mongodb.py
+@@ -253,8 +253,8 @@ def test_restore_group(self, mock_get_database):
+         mock_collection.find_one.assert_called_once_with(
+             {'_id': sentinel.taskset_id})
+         self.assertItemsEqual(
+-            ['date_done', 'result', 'task_id'],
+-            list(ret_val.keys()),
++            list(sorted(['date_done', 'result', 'task_id'])),
++            list(sorted(ret_val.keys())),
+         )
+ 
+     @patch('celery.backends.mongodb.MongoBackend._get_database')
diff --git a/dev-python/celery/files/celery-4.0.2-log-endless-loop.patch b/dev-python/celery/files/celery-4.0.2-log-endless-loop.patch
new file mode 100644
index 000000000000..bf9396e45a39
--- /dev/null
+++ b/dev-python/celery/files/celery-4.0.2-log-endless-loop.patch
@@ -0,0 +1,22 @@
+From 9c950b47eca2b4e93fd2fe52cf80f158e6cf97ad Mon Sep 17 00:00:00 2001
+From: George Psarakis <giwrgos.psarakis@gmail.com>
+Date: Mon, 23 Jan 2017 11:49:38 +0200
+Subject: [PATCH] AWS DynamoDB result backend (#3736)
+
+* Fix endless loop in logger_isa (Python 3.6)
+
+https://github.com/celery/celery/pull/3736#issuecomment-274155454
+
+diff --git a/celery/utils/log.py b/celery/utils/log.py
+index 2fb15e6..00df476 100644
+--- a/celery/utils/log.py
++++ b/celery/utils/log.py
+@@ -82,7 +82,7 @@ def logger_isa(l, p, max=1000):
+         else:
+             if this in seen:
+                 raise RuntimeError(
+-                    'Logger {0!r} parents recursive'.format(l),
++                    'Logger {0!r} parents recursive'.format(l.name),
+                 )
+             seen.add(this)
+             this = this.parent
diff --git a/dev-python/celery/files/celery-docs.patch b/dev-python/celery/files/celery-docs.patch
new file mode 100644
index 000000000000..5e09718feb2c
--- /dev/null
+++ b/dev-python/celery/files/celery-docs.patch
@@ -0,0 +1,19 @@
+# Prevent un-needed objects.inv files
+diff -ur celery-3.0.19.orig/docs/conf.py celery-3.0.19/docs/conf.py
+--- docs/conf.py	2013-04-15 22:51:46.000000000 +0800
++++ docs/conf.py	2013-04-27 21:46:25.070423582 +0800
+@@ -74,14 +74,6 @@
+ # If true, '()' will be appended to :func: etc. cross-reference text.
+ add_function_parentheses = True
+ 
+-intersphinx_mapping = {
+-    'python': ('http://docs.python.org/dev', None),
+-    'kombu': ('http://kombu.readthedocs.org/en/latest/', None),
+-    'djcelery': ('http://django-celery.readthedocs.org/en/latest', None),
+-    'cyme': ('http://cyme.readthedocs.org/en/latest', None),
+-    'amqp': ('http://amqp.readthedocs.org/en/latest', None),
+-}
+-
+ # The name of the Pygments (syntax highlighting) style to use.
+ pygments_style = 'colorful'
+ 
diff --git a/dev-python/celery/files/celery.confd-r2 b/dev-python/celery/files/celery.confd-r2
new file mode 100644
index 000000000000..d5ba2f7c9951
--- /dev/null
+++ b/dev-python/celery/files/celery.confd-r2
@@ -0,0 +1,51 @@
+# /etc/conf.d/celery
+
+##############################################################################
+# GLOBAL CONFIGURATION
+
+# User and group
+#CELERY_USER="celery"
+#CELERY_GROUP="celery"
+
+# This is generaly a good idea to set the environment correctly
+# because a lot of python package try to use HOME on init
+#export HOME="/var/lib/myproject"
+
+# Full path to the python project directory.
+#CELERY_PROJDIR="/var/lib/myproject"
+
+##############################################################################
+# CELERYD
+
+# Start the Celery worker daemon
+#CELERYD_ENABLED="yes"
+
+# celeryd notes
+#CELERYD_NODES="celery"
+
+# celeryd options
+# Example: set a 5 minute hard time limit for tasks, disable queue process prefetching and specify an app module from CELERY_PROJDIR
+#CELERYD_OPTS="--time-limit=300 -Ofair -A celeryapp"
+
+# Location and level of the celeryd log file
+#CELERYD_LOG_FILE=/var/log/celery/celeryd@%n.log
+#CELERYD_LOG_LEVEL="INFO"
+
+# Location of the celeryd pid file
+#CELERYD_PID_FILE=/run/celery/celeryd@%n.pid
+
+##############################################################################
+# CELERYBEAT
+
+# Start the Celery task scheduler daemon
+#CELERYBEAT_ENABLED="yes"
+
+# celerybeat options
+#CELERYBEAT_OPTS=""
+
+# Location and level of the celerybeat log file
+#CELERYBEAT_LOG_FILE=/var/log/celery/celerybeat.log
+#CELERYBEAT_LOG_LEVEL="INFO"
+
+# Location of the celerybeat pid file
+#CELERYBEAT_PID_FILE=/run/celery/celerybeat.pid
diff --git a/dev-python/celery/files/celery.initd-r2 b/dev-python/celery/files/celery.initd-r2
new file mode 100644
index 000000000000..f34c136691b0
--- /dev/null
+++ b/dev-python/celery/files/celery.initd-r2
@@ -0,0 +1,205 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the BSD license
+
+extra_started_commands="reload"
+
+depend() {
+	need net
+	use rabbitmq redis logger dns
+}
+
+CELERYD_ENABLED=${CELERYD_ENABLED:-"no"}
+CELERYD_PID_FILE=${CELERYD_PID_FILE:-"/run/celery/celeryd@%n.pid"}
+CELERYD_LOG_FILE=${CELERYD_LOG_FILE:-"/var/log/celery/celeryd@%n.log"}
+CELERYD_LOG_LEVEL=${CELERYD_LOG_LEVEL:-"INFO"}
+CELERYD_NODES=${CELERYD_NODES:-"celery"}
+
+CELERYBEAT_ENABLED=${CELERYBEAT_ENABLED:-"no"}
+CELERYBEAT_PID_FILE=${CELERYBEAT_PID_FILE:-"/run/celery/celerybeat.pid"}
+CELERYBEAT_LOG_FILE=${CELERYBEAT_LOG_FILE:-"/var/log/celery/celerybeat.log"}
+CELERYBEAT_LOG_LEVEL=${CELERYBEAT_LOG_LEVEL:-"INFO"}
+
+export CELERY_LOADER
+
+CELERYD_MULTI=${CELERYD_MULTI:-"celery multi"}
+CELERYCTL=${CELERYCTL:-"celery"}
+CELERYBEAT=${CELERYBEAT:-"celery beat"}
+
+CELERYD_OPTS="${CELERYD_OPTS}"
+CELERYBEAT_OPTS="${CELERYBEAT_OPTS} -f ${CELERYBEAT_LOG_FILE} -l ${CELERYBEAT_LOG_LEVEL}"
+
+create_dirs() {
+	local logfile="${1}"
+	local pidfile="${2}"
+	local logdir=$(dirname ${logfile})
+	local piddir=$(dirname ${pidfile})
+
+	checkpath -d -q -m 0750 -o ${CELERY_USER:-"root"}:${CELERY_GROUP:-"root"} ${logdir} ${piddir}
+}
+
+[ -n "${CELERY_USER}" ] && DAEMON_OPTS="${DAEMON_OPTS} --uid=${CELERY_USER}"
+[ -n "${CELERY_GROUP}" ] && DAEMON_OPTS="${DAEMON_OPTS} --gid=${CELERY_GROUP}"
+
+checkconfig() {
+	if [ ! -c /dev/null ]; then
+		eerror "/dev/null is not a character device!"
+		return 1
+	fi
+
+	if [ -z "${CELERY_PROJDIR}" ]; then
+		eerror "Missing CELERY_PROJDIR variable"
+		return 1
+	fi
+
+	yesno "${CELERYD_ENABLED}" && \
+		create_dirs "${CELERYD_LOG_FILE}" "${CELERYD_PID_FILE}"
+
+	yesno "${CELERYBEAT_ENABLED}" && \
+		create_dirs "${CELERYBEAT_LOG_FILE}" "${CELERYBEAT_PID_FILE}"
+
+	return 0
+}
+
+celery_chdir() {
+	[ -n "${CELERY_PROJDIR}" ] && cd "${CELERY_PROJDIR}"
+}
+
+wait_pid () {
+	local pidfile=${1}
+	local timeout=${STOPTIMEOUT:-"10"}
+	local PID=$(cat "${pidfile}" 2>/dev/null)
+
+	while [ -n "${PID}" ] && [ "${timeout}" -ge 1 ]; do
+		kill -0 ${PID} 2>/dev/null || break
+		kill -TERM "${PID}"
+		timeout=$((${timeout} - 1))
+		sleep 0.5
+	done
+
+	[ "${timeout}" -lt 1 ] && return 1
+	[ -f ${pidfile} ] && rm -f ${pidfile}
+	return 0
+}
+
+# celeryd
+start_workers() {
+	yesno "${CELERYD_ENABLED}" || return 0
+
+	${CELERYD_MULTI} start ${CELERYD_NODES} ${DAEMON_OPTS} \
+				--pidfile="${CELERYD_PID_FILE}" \
+				--logfile="${CELERYD_LOG_FILE}" \
+				--loglevel="${CELERYD_LOG_LEVEL}" \
+				${CELERYD_OPTS}
+}
+
+stop_workers() {
+	yesno "${CELERYD_ENABLED}" || return 0
+
+	local timeout=${STOPTIMEOUT:-"10"}
+
+	${CELERYD_MULTI} stop ${CELERYD_NODES} --pidfile="${CELERYD_PID_FILE}" || return 1
+
+	# Wait for each node
+	for node in ${CELERYD_NODES}; do
+		local pidfile=${CELERYD_PID_FILE/\%n/${node}}
+		local PID=$(cat "${pidfile}" 2>/dev/null)
+		while [ -n "${PID}" ] && [ "${timeout}" -ge 1 ]; do
+		kill -0 ${PID} 2>/dev/null || break
+		timeout=$((${timeout} - 1))
+		sleep 0.5
+		done
+	done
+
+	[ "${timeout}" -lt 1 ] && return 1
+	return 0
+}
+
+restart_workers() {
+	yesno "${CELERYD_ENABLED}" || return 0
+
+	${CELERYD_MULTI} restart ${CELERYD_NODES} ${DAEMON_OPTS} \
+		--pidfile="${CELERYD_PID_FILE}" \
+		--logfile="${CELERYD_LOG_FILE}" \
+		--loglevel="${CELERYD_LOG_LEVEL}" \
+		${CELERYD_OPTS}
+}
+
+# celerybeat
+start_beat() {
+	yesno "${CELERYBEAT_ENABLED}" || return 0
+
+	ebegin "Starting celerybeat"
+	${CELERYBEAT} ${CELERYBEAT_OPTS} ${DAEMON_OPTS} --detach \
+		--pidfile="${CELERYBEAT_PID_FILE}"
+	eend ${?}
+}
+
+
+stop_beat() {
+	yesno "${CELERYBEAT_ENABLED}" || return 0
+
+	ebegin "Stopping celerybeat"
+	if [ -f "${CELERYBEAT_PID_FILE}" ]; then
+		wait_pid "${CELERYBEAT_PID_FILE}"
+	else
+		ewarn "not running"
+	fi
+	eend ${?}
+}
+
+
+start() {
+	local cr=0
+
+	checkconfig || return 1
+
+	ebegin "Starting ${SVCNAME}"
+	eindent
+
+	celery_chdir && \
+		start_workers && \
+		start_beat || cr=1
+
+	eoutdent
+	eend ${cr}
+}
+
+stop() {
+	local cr=0
+
+	checkconfig || return 1
+
+	ebegin "Stopping ${SVCNAME}"
+	eindent
+
+	celery_chdir
+	stop_workers || cr=1
+	stop_beat || cr=1
+
+	eoutdent
+	eend ${cr}
+}
+
+reload() {
+	local cr=0
+
+	checkconfig || return 1
+
+	ebegin "Restarting ${SVCNAME}"
+	eindent
+
+	celery_chdir
+	restart_workers || cr=1
+	stop_beat && start_beat || cr=1
+
+	eoutdent
+	eend ${cr}
+}
+
+status() {
+	checkconfig || return 1
+
+	celery_chdir && \
+		${CELERYCTL} status
+}
diff --git a/dev-python/celery/metadata.xml b/dev-python/celery/metadata.xml
new file mode 100644
index 000000000000..a398d248e37d
--- /dev/null
+++ b/dev-python/celery/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">celery</remote-id>
+	</upstream>
+	<use>
+		<flag name="redis">Enables redis support</flag>
+		<flag name="sqs">Enables Amazon SQS transport module for celery</flag>
+		<flag name="zeromq">Enable logging and deployment via ZeroMQ</flag>
+		<flag name="yaml">Enable support of yaml as a configuration file format</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-python/cement/Manifest b/dev-python/cement/Manifest
new file mode 100644
index 000000000000..a914e559ddeb
--- /dev/null
+++ b/dev-python/cement/Manifest
@@ -0,0 +1,9 @@
+AUX cement-2.6.2-exmples.patch 518 SHA256 babfc49d20b4e3b1a9d7d310a32c4d99b467fee57de65bf83498c89c7f44cd96 SHA512 3a1fc644346dc8cf5001be298e73734b729b31c8e0bff57b131247e768b9e6b91c4bb8b9206d94e211599796916732af105a0b5aedadbd8087e2e5eae80e2a4a WHIRLPOOL 026104ed8f872145a243ca48d04de68a3e2d3b9a11f35c649e821104fdaad2144cc32cef4398c57a9bfd97fdd82184183b18b9bd45f1083c591dd9dd159be91b
+AUX tests-installation.patch 595 SHA256 b78fbb534ba01364031468b1f4725e3bd0dbb206430182f9115c696fc98b8982 SHA512 3f6273a5843c19873ea05f8f61afb00d43281210d523b2260f5e3bf8e84c64c9a8193c1ddfbb09662352e5a92cb291441b3e2bc8e92c1d6d8ade13cdc3c496ff WHIRLPOOL 8ab0bfe7ef6bc50360e663cacb6429bedb2f2b1fbcae552ffe9d48c393600d9445763f1ba12a9fd8fe79a4c53c6d0c116f8d92e4ce23f0f15195fa3c54204563
+DIST cement-2.0.2.tar.gz 81009 SHA256 af788557a1f4ebcbd0e0949f0ee0b627f8e03844f7e76902c3cdb3959cf11e38 SHA512 5df35bdaa714a9b11d5b0154658333ea28a8e50e8910ee7d900cc7342dda8ce547d5400990240b89b6c808bb91c72b785f66c31c057cf7b782d16efd0c21a4b9 WHIRLPOOL c7997e238ac698f8e067586783f187ef6d5c0a8f175dc46a961205397f77fd8b9bce6f8e5b4aea87d5456007a43e18de585589df90799ea94f98f1ac8c4fa312
+DIST cement-2.10.0.tar.gz 179564 SHA256 226d3d21eb123142066f62deb2462df5c32a1d8c9caed31530eb76e9031df270 SHA512 99fc93fd67d85763a57b551553f7046d8b6c0a1a37623a6f8e761adb15f598dce20a61ab86f98f1b3ce35c2a295e0087a5493b385d4ac2fd89eed2b2174b7628 WHIRLPOOL 4158fdf1a707dcbc52dbf0c5bcf575c65ac6526d3c238be7a255590cc9979e94e9ab5844950c1713ee2ecf5eb1aaecf4a1cf9b52884951f8375533dab30625b7
+EBUILD cement-2.0.2.ebuild 1044 SHA256 1d2f687e69891e65bfbdf017c12538a3760d8b38e664576bafb7b5697512d24c SHA512 345d5d2aa047a55f611ef16a72ef40e4018d234d9b13551f0ab60b605bd333390de6cc5c47a4adb4ceae8ca138f6e4d336e0f46a57a9edbd5cd4350a8059c3ce WHIRLPOOL ed4f4a1caa58696c6874177bdcec2ac1f790e2c97680b211320bca056fdcec9cbf4a539522b931241b20f838f3555f005253be0d4db610cea952cd4e59621303
+EBUILD cement-2.10.0.ebuild 1383 SHA256 276ddd0de6ab648413970e30b029c2f14e4cfbfda92fcf21781d679de6f63811 SHA512 eb9c8a705d7a702bfc5877da61d5f43ac405228688af23be5483afceaf4b739ffeed345338a3aa4f778fed8ee1e7fac409509cbf4995cee1d615f0e103330324 WHIRLPOOL efe6df3a984dae8e0073472a2cd50c5695148360996582cfb48ea923701c53fa797ade41018c088024b9029df0396798e22b2b2a0ff0ef24df1fdf707f551278
+MISC ChangeLog 3479 SHA256 7785baf1fc19cc6cefab3b99e1e0be8d53121c262e6ec8dce154be47c86d36d2 SHA512 f00dc837ae1a472f599a514fe55cdb30f4a89c916e40ed852dc36f0ad61c2984fdc9c95c7036ab0a9051ead5d534322c0b257129f875c5df3df3a80202fd366e WHIRLPOOL 0709943b4c0dcbb2a1732d793f0df19ce0fe852764d68ca1a10557454699cb8574644f044a69c7b458b2e9c8a182ecdbb419b60a5882d4a078b1533d7cf1c898
+MISC ChangeLog-2015 1736 SHA256 ac34c80eee826926e14dc00e366e6fd3762f71738497af30000b6d16b93d01cb SHA512 f81be60139173074c0170be8ade25781c3f8548a44fe41f180eb745e613ebc5e1500192041a68418784dba7f512c3861ba4faca6b2a2178eece12a6bcee4e1a9 WHIRLPOOL 8c57f4d2b4935e2bd9fe84a1b1fc032b6776d858a1cbcd85549ec681680c40a1241ae40fa7b468172f38b4d02e46daf1f55e4bd66b6b97c302271c0a41afa3d5
+MISC metadata.xml 540 SHA256 394fa007ff1a6f099bc1ccc5e7b2b5fba00e638f63d7b2778bd6902461aa3369 SHA512 58b32c0757712b4e28667d921159e847285bd63c712fee382fa1c83e890a183fea8ffae22bdf088eed936dec152013e8c2bfa63ccfb05a601ed5e43ccfdab4ab WHIRLPOOL f26bce2fe010f88c259a6f1aa745eacdaff824ebb1158cae79568243d847337ee93e9ab2be3963f47f4c1cb917d6df82c3031a5245d7b0ea69378a678ec208a4
diff --git a/dev-python/cement/cement-2.0.2.ebuild b/dev-python/cement/cement-2.0.2.ebuild
new file mode 100644
index 000000000000..c43f43fc72c1
--- /dev/null
+++ b/dev-python/cement/cement-2.0.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+PV_MAJOR_MINOR=$(get_version_component_range 1-2)
+
+DESCRIPTION="CLI Application Framework for Python"
+HOMEPAGE="http://builtoncement.com/"
+SRC_URI="http://builtoncement.com/${PN}/${PV_MAJOR_MINOR}/source/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test doc"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( ChangeLog CONTRIBUTORS README.md )
+PATCHES=( "${FILESDIR}"/tests-installation.patch )
+# https://github.com/cement/cement/issues/185
+
+python_test() {
+	nosetests --verbose || die "Tests fail with ${EPYTHON}"
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cement/cement-2.10.0.ebuild b/dev-python/cement/cement-2.10.0.ebuild
new file mode 100644
index 000000000000..3184a3a458ad
--- /dev/null
+++ b/dev-python/cement/cement-2.10.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+PV_MAJOR_MINOR=$(get_version_component_range 1-2)
+
+DESCRIPTION="CLI Application Framework for Python"
+HOMEPAGE="http://builtoncement.com/"
+SRC_URI="http://builtoncement.com/${PN}/${PV_MAJOR_MINOR}/source/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test doc examples"
+
+RDEPEND="
+	dev-python/pystache[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/pylibmc[${PYTHON_USEDEP}]
+	dev-python/genshi[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( ChangeLog CONTRIBUTORS README.md )
+
+PATCHES=( "${FILESDIR}/${PN}"-2.6.2-exmples.patch )
+
+#https://github.com/datafolklabs/cement/issues/331
+RESTRICT=test
+
+python_test() {
+	nosetests --verbose || die "Tests fail with ${EPYTHON}"
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/build/html/. )
+	use examples && EXAMPLES=( examples )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cement/files/cement-2.6.2-exmples.patch b/dev-python/cement/files/cement-2.6.2-exmples.patch
new file mode 100644
index 000000000000..09348898c74d
--- /dev/null
+++ b/dev-python/cement/files/cement-2.6.2-exmples.patch
@@ -0,0 +1,16 @@
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index d1318e7..ee184b5 100644
+--- a/setup.py
++++ b/setup.py
+@@ -40,7 +40,7 @@ setup(name='cement',
+     author_email='team@datafolklabs.com',
+     url='http://builtoncement.org',
+     license='BSD',
+-    packages=find_packages(exclude=['ez_setup', 'tests*']),
++    packages=find_packages(exclude=['ez_setup', 'tests*', 'examples']),
+     include_package_data=True,
+     zip_safe=False,
+     test_suite='nose.collector',
diff --git a/dev-python/cement/files/tests-installation.patch b/dev-python/cement/files/tests-installation.patch
new file mode 100644
index 000000000000..d93926b2100d
--- /dev/null
+++ b/dev-python/cement/files/tests-installation.patch
@@ -0,0 +1,19 @@
+commit a952b0a202e05dd2a1222840be70da77a62095b5
+Author: yac <yac@blesmrt.net>
+Date:   Fri Mar 29 20:21:49 2013 +0100
+
+    fixes 185
+
+diff --git a/setup.py b/setup.py
+index 31225f7..4544edd 100644
+--- a/setup.py
++++ b/setup.py
+@@ -29,7 +29,7 @@ setup(name='cement',
+     author_email='derks@bjdierkes.com',
+     url='http://builtoncement.org',
+     license='BSD',
+-    packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
++    packages=find_packages(exclude=['ez_setup', 'examples', 'tests*']),
+     include_package_data=True,
+     zip_safe=False,
+     test_suite='nose.collector',
diff --git a/dev-python/cement/metadata.xml b/dev-python/cement/metadata.xml
new file mode 100644
index 000000000000..9ece43a263d5
--- /dev/null
+++ b/dev-python/cement/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Cement is an advanced CLI Application Framework for Python. Its goal is to introduce a standard, and feature-full platform for both simple and complex command line applications as well as support rapid development needs without sacrificing quality.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
new file mode 100644
index 000000000000..6663db1e458a
--- /dev/null
+++ b/dev-python/certifi/Manifest
@@ -0,0 +1,11 @@
+DIST certifi-2016.9.26.tar.gz 374637 SHA256 8275aef1bbeaf05c53715bfc5d8569bd1e04ca1e8e69608cc52bcaac2604eb19 SHA512 e89c07dab0d926754012c89e12fff9ee59f771a5edd24130c8adb7ab32076971f4ea6d266ed9f3ed2010c1aba403505f5b5e97af3b5efcf3d039ddc7a7b2af39 WHIRLPOOL 52412b9cf57544ac19e89a493bf65dc212a06f053778b7c5de3d6254a7189fed9f051af99e0176efec6d7c318760f9a9fca51d1ddcf56024c973a6ffbe803496
+DIST certifi-2017.1.23.tar.gz 380397 SHA256 81877fb7ac126e9215dfb15bfef7115fdc30e798e0013065158eed0707fd99ce SHA512 8e7a03236458567545739bdef1526f81f4cef61d6cc708048f2411a0387a9b1b38d21a83739cc5207bd590d67c876e99ef1e22916065a371dae30b4a94cc1e49 WHIRLPOOL df50f3c715802cdff496a482d97d3431b79db629de3708eeac910c423c0b59c5222f73937f349dad114a7fc311f4c31fde39d1a4c0632d7f2486dd463815ff26
+DIST certifi-2017.4.17.tar.gz 373512 SHA256 f7527ebf7461582ce95f7a9e03dd141ce810d40590834f4ec20cddd54234c10a SHA512 0bd054bb2eaa8c196a94a0b7865d2488aea1fcb5e66ddc8c776c68cfa518a198a8c67bed5b485bf55db3f55d26c0ab2b4fc07839bb9175a50cb525e25d3869a5 WHIRLPOOL f949eefd72c41900202944315f058c0f8bab88883a0be1283bddadec4a273b138d012f37cda61d0f5656baadb304d7340816d953db53f624c9bd5c8545ebdf86
+DIST certifi-2017.7.27.1.tar.gz 348217 SHA256 40523d2efb60523e113b44602298f0960e900388cf3bb6043f645cf57ea9e3f5 SHA512 2873c17144e09ba506c62743efa4fda05350d48fcb19a1b8eb895829df2fa276eed86b31c9f7f18636f62ea5acb4bc6b9dee8b69ed8e0ccd1286ebfaa27d02a1 WHIRLPOOL e2f7b58e195951c720da12a277eea0b076b16a9ca57c23074bfc2836cfcda04d86ad5e522a030002f5fe0b7479b16e8ff795123b0b1b95a9bb32fb9937cf20eb
+EBUILD certifi-2016.9.26.ebuild 724 SHA256 d26632de3d3a95fd411cdd835a29d10a31be7367674c4fd19fa0fae1ef8e8bd1 SHA512 acbcfcafaafc2b257018df09ebea8680900b69bd82209a21ce0ae9f462f166daae14e1e0d93d7e1104d7c9dc85595a522b87d14bd6f0991efe096b6f642499b7 WHIRLPOOL 94df0e089f83d4992994bc0d2065003967da5311e634a65ba1e74ee0afe296cd62c1e647762ca7821d2a54928488c653f2b6904eec65351a6ef22c5264d89de9
+EBUILD certifi-2017.1.23.ebuild 740 SHA256 1a4865c8f09785ee74c4c686e526d110483d33db95021ca519d33a0ba3534698 SHA512 d1e7e8c1d981084796ec441656414ba40b83ccf41313e5dd68eadb3da86cf65cb2f0758f5479ee23b4d1b6f4bbcfbbf4215ac45c53fac4f57e32574fe27b683d WHIRLPOOL 37e506958fe0713755965baa6a5485e8b8e5688715804e3747e930cfd5f29f38cef08b7941fa03769b7ad597ea2a4b165691459463059c11b57c70078f928d10
+EBUILD certifi-2017.4.17.ebuild 739 SHA256 df601c628b0713ce3cc21b897dd6720a9811aa12f12c3658d19f6d9b4f19b345 SHA512 885694b67b712fe63e16c3e4543972eed00ec37da8c732a54d05e222ac361f7f5b0113ad7b261c3fa41f03191a74614e9df7cde4bbae211e6d0d91760793e68d WHIRLPOOL eb7dd2728ac034d543b06200f3e34120b9fc36ce25c45d7a174caabd021c8110a1a12c900d2697a06e393741cfd99ec2a61a522ba302c8c030ee480f873fbef7
+EBUILD certifi-2017.7.27.1.ebuild 748 SHA256 27349c090b7ae03f71a759770ac217bef495a3bdafb035ad204e90682f70bd3a SHA512 7fa014910bac4fd96e0544072ec075edc5950b60087bf75601a1b0023cd4c787113519823de10a7cdff005816ff14883fba73a568e5e1b11b5eeffa5977a73b4 WHIRLPOOL 4fc1c499c2e8913415888bcc2c36d6ee0c7250763de95d9b50f60d8609981807324b8514ffcec834827e8d483e3643e4c5a4144c39798dc665713a915c4885fb
+MISC ChangeLog 8110 SHA256 3dd557deaecbb5a90035cc4de72f417965549679e52ef69b8e61d6e65b8473c8 SHA512 474e5fa1135a22de1e251807d49b3d9c8422375bbef9024159958581bd19c18c0b7ba170fb7342dce205fe8d52dfd42f225ba309ddfac869be9867420be81c8f WHIRLPOOL e14382ff91ecd97d88d74bb250d63d1d47247b9c4dad1f464d57457859f9461d3c16bcfc0b0ba7acf938e4123a5544db80cc3a0c74ab811200547668697d8e39
+MISC ChangeLog-2015 1269 SHA256 7f03c766028c0a93b71ea9473b1da396493355a0c331925225b1921f1f48f811 SHA512 c37a4995e51cd9016e3ac7d51580161268f6d9c1a9dd427f4645e84a8ab1a6663da1970ae43bbc5af80be74624e060a72fa35be8b0c5c6660563a6132236c74b WHIRLPOOL d6103146e2677da460d722e33f5ed663da6f5b368a3ca3d366107336eb043bab7e840963f50b30356aa9ec65b6bb4a2c2093cfa7e8a3e9d26e75f238349b53a5
+MISC metadata.xml 320 SHA256 9efa83da8ded9fa37cec1a22436f3f38b1c92fd3796de28404612f4d3dd7c4c0 SHA512 0e99564887f0a0b314056b2e1f4b6e3afcaf908de6824a2cc87deab9d1832566e97b8ba88cc7d2bdc5d11e7f1c8532830fc59602efd8c2f1a6061c0ad4853fdd WHIRLPOOL d100397d0568108f6856d147e4aaf96f22f33fa2916242454812ee968caddb3528efc26bd15331c437d4a184efdc9d61b3b7f4fce9b003fc85539a42bea3343f
diff --git a/dev-python/certifi/certifi-2016.9.26.ebuild b/dev-python/certifi/certifi-2016.9.26.ebuild
new file mode 100644
index 000000000000..5a1633b1f3b9
--- /dev/null
+++ b/dev-python/certifi/certifi-2016.9.26.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package for providing Mozilla's CA Bundle"
+HOMEPAGE="http://certifi.io/ https://pypi.python.org/pypi/certifi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/certifi/certifi-2017.1.23.ebuild b/dev-python/certifi/certifi-2017.1.23.ebuild
new file mode 100644
index 000000000000..e6d923189be6
--- /dev/null
+++ b/dev-python/certifi/certifi-2017.1.23.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package for providing Mozilla's CA Bundle"
+HOMEPAGE="http://certifi.io/ https://pypi.python.org/pypi/certifi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/certifi/certifi-2017.4.17.ebuild b/dev-python/certifi/certifi-2017.4.17.ebuild
new file mode 100644
index 000000000000..5d86bae9c5b5
--- /dev/null
+++ b/dev-python/certifi/certifi-2017.4.17.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package for providing Mozilla's CA Bundle"
+HOMEPAGE="http://certifi.io/ https://pypi.python.org/pypi/certifi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/certifi/certifi-2017.7.27.1.ebuild b/dev-python/certifi/certifi-2017.7.27.1.ebuild
new file mode 100644
index 000000000000..906cb099e0b5
--- /dev/null
+++ b/dev-python/certifi/certifi-2017.7.27.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package for providing Mozilla's CA Bundle"
+HOMEPAGE="http://certifi.io/ https://pypi.python.org/pypi/certifi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/certifi/metadata.xml b/dev-python/certifi/metadata.xml
new file mode 100644
index 000000000000..85d50281c54b
--- /dev/null
+++ b/dev-python/certifi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">certifi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
new file mode 100644
index 000000000000..553ade640327
--- /dev/null
+++ b/dev-python/cffi/Manifest
@@ -0,0 +1,9 @@
+DIST cffi-1.10.0.tar.gz 418131 SHA256 b3b02911eb1f6ada203b0763ba924234629b51586f72a21faacc638269f4ced5 SHA512 02c9987c44698708dcb7e0aa17637df6b15f81732dc25b03e54563ca5664a817863b87daf7a782a62c7b6150388cdca858ef496a975ab289c86f05e5492465ef WHIRLPOOL 577cd975c6937537184b19432d185461964e5b66e851b1e3c4a8a3cc4a6a3329689dc15da717fb1921380af7479ca4dc9cb98c92a3763fe982abc582c012f474
+DIST cffi-1.5.2.tar.gz 388793 SHA256 da9bde99872e46f7bb5cff40a9b1cc08406765efafb583c704de108b6cb821dd SHA512 3c707db85032bc13287beec0211d85a7b9f9dfcb87844adba3a86b23211acd495e88072ec23f22e7c7626d25cadd5b9843c34255d4080eefb171020ad0a2d552 WHIRLPOOL 35cfd86d06dcc2bb2a0e8e196f06d5df0eeaa6dd65d13dc4489284108fa596a88f46918c5b70e38584965290d141f5cbf0e2bcb469c3316cd1962109d77889dd
+DIST cffi-1.9.1.tar.gz 407108 SHA256 563e0bd53fda03c151573217b3a49b3abad8813de9dd0632e10090f6190fdaf8 SHA512 6e76f181b6b7b760a14ad70338edd104a8b8e2eac5680e336d3868e0bd031a1665608e29a65dc0c56806afb8a8c03811586f151f3acef11e54e60c1bfcf902e3 WHIRLPOOL 12f9c044b7552520e5fe373fe85b0437734cee79a3f9a7eb1ec107ee877c85830e7f5d327d4a4a9504176cdb207a44e169ab52896a78459f00af285fd660c106
+EBUILD cffi-1.10.0.ebuild 1480 SHA256 6a37ff9df3a062934cce8babf3f4a45796cae07677f3eaecb42e10150d12bb94 SHA512 53a7ffd66b39c0913db5fb8a1d299964311243282a0adb95b3a909fa1875777d5a4d0fa730805a1f488a157f27083f6221884662ed6e57d6772e752421a62b5c WHIRLPOOL cfc976b39c431bfe0683f6f8b3c609f06d5f6de25085dac087de56eeffb5b681bdce0f546d24709861cde86c4b14bdcdb65abe71a4161947ec15eec07859d685
+EBUILD cffi-1.5.2.ebuild 1455 SHA256 9749edbd69a91b95709048e6a305bc4ea7ba5d29c812ad4649b80631853cb14d SHA512 645a517547580caa1198202297c741f4fdf39711f2db34eb6bbd3d8e1d11482baaeee704f9c2d9a48565221c78d4ee279a90171164dabc46d31937e67f9d71ca WHIRLPOOL de14d8753d4c667c6f03a8ba42ff0ea461d53cccc647872c22de65a310443ecf4c01599658ef47015e550c11cc2832980f57e6aa0eea3107330dd5e2956f3ccf
+EBUILD cffi-1.9.1.ebuild 1470 SHA256 df18dc7557446b432afafca07e6d63125ac471310f3069bf9f1e304c522af44d SHA512 54dce8ee5a318e032fe01e6e47682674a7f9c0f5d04f56e96ffd028902d19e2bceecef123cfca68f3c0048ca40193fc49ebaac555ada72847642331d85ccd7c3 WHIRLPOOL aec65e37623392ade75056c8a0c73a9f917baf67a134b9937ef441557ae9eabe95142130a599dff14dee9801be6f18d58793d50a63968bd1ba834c58dbb2b8b7
+MISC ChangeLog 12470 SHA256 43b0a91647f5b908f4a76d094235858a90e4683ed9b23098426ebbece68c122d SHA512 1632b347a58423975514e9d7cb73257dfa5596dfc2acc88923b918a2775bab074b737b89520aa8476837d77d331d78130e3ca8602cef43a0c9ca80cb82957dce WHIRLPOOL 25ac62b089d47c43bd54791dc7470f4c6c714c7a7ffd8e8429467949a45be96594ae4b22bfda01c032746da38588faf517bf224bc4363379ba007839e5a171af
+MISC ChangeLog-2015 9260 SHA256 6943a2239cac702562be97df74fac84a2622640d97bbcf63aeb82a87851178ac SHA512 57e87eb46ac94c5d3edc4c680d8fca3b314c56f04699a243a43a09e6eb1cb8af7f761be83734df2e40f23fbc18d4d8e24a97aee40972c6499fd510c1f1e9886e WHIRLPOOL 2986a562f36c64795dfec0333fc68e1c82b7c71f48fc7009a9d01046f48f7519a787289e7023ae3eae34c36a24b593d9cd1c3db755fca2a200282ec2ad1478fd
+MISC metadata.xml 317 SHA256 ecd115059cb499ffcf24c227b9402d626f83fd03396e85c2d469b1dc9997713c SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6 WHIRLPOOL 06213aab975170a5b3bc6975d41c53ed2eac57bec261c87318b8d9d757f067d890903874be7a2ef83bb0db1bd12b1e1ec6316a43bda16d9d055fcea2b600671a
diff --git a/dev-python/cffi/cffi-1.10.0.ebuild b/dev-python/cffi/cffi-1.10.0.ebuild
new file mode 100644
index 000000000000..63bcc3190973
--- /dev/null
+++ b/dev-python/cffi/cffi-1.10.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# DO NOT ADD pypy to PYTHON_COMPAT
+# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Foreign Function Interface for Python calling C code"
+HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.python.org/pypi/cffi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="doc test"
+
+RDEPEND="
+	virtual/libffi
+	dev-python/pycparser[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	einfo "$PYTHONPATH"
+	$PYTHON -c "import _cffi_backend as backend" || die
+	PYTHONPATH="${PYTHONPATH}" \
+	py.test -x -v \
+		--ignore testing/test_zintegration.py \
+		--ignore testing/embedding \
+		c/ testing/ \
+		|| die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cffi/cffi-1.5.2.ebuild b/dev-python/cffi/cffi-1.5.2.ebuild
new file mode 100644
index 000000000000..e347372cd913
--- /dev/null
+++ b/dev-python/cffi/cffi-1.5.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# DO NOT ADD pypy to PYTHON_COMPAT
+# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Foreign Function Interface for Python calling C code"
+HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.python.org/pypi/cffi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="doc test"
+
+RDEPEND="
+	virtual/libffi
+	dev-python/pycparser[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	einfo "$PYTHONPATH"
+	$PYTHON -c "import _cffi_backend as backend" || die
+	PYTHONPATH="${PYTHONPATH}" \
+	py.test -x -v \
+		--ignore testing/test_zintegration.py \
+		--ignore testing/embedding \
+		c/ testing/ \
+		|| die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cffi/cffi-1.9.1.ebuild b/dev-python/cffi/cffi-1.9.1.ebuild
new file mode 100644
index 000000000000..ecbc3943b5c9
--- /dev/null
+++ b/dev-python/cffi/cffi-1.9.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# DO NOT ADD pypy to PYTHON_COMPAT
+# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Foreign Function Interface for Python calling C code"
+HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.python.org/pypi/cffi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="doc test"
+
+RDEPEND="
+	virtual/libffi
+	dev-python/pycparser[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	einfo "$PYTHONPATH"
+	$PYTHON -c "import _cffi_backend as backend" || die
+	PYTHONPATH="${PYTHONPATH}" \
+	py.test -x -v \
+		--ignore testing/test_zintegration.py \
+		--ignore testing/embedding \
+		c/ testing/ \
+		|| die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cffi/metadata.xml b/dev-python/cffi/metadata.xml
new file mode 100644
index 000000000000..4d873fed8927
--- /dev/null
+++ b/dev-python/cffi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">cffi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cfgio/Manifest b/dev-python/cfgio/Manifest
new file mode 100644
index 000000000000..39eb6acf230e
--- /dev/null
+++ b/dev-python/cfgio/Manifest
@@ -0,0 +1,5 @@
+DIST cfgio-0.1.2.tar.gz 17221 SHA256 4247ccbb38fce0de7601ab04d05e39789c661efaed7e891e0cc76ea12529377e SHA512 62b3d93097e088ca6a54efbeedfc42f2b565ec0692b2ed7b1f2ea028b087e3fea1d109ca4d268aa8d9cb499eecbd4c0b10c3092c8754809bf74ee62c03b947cc WHIRLPOOL 7e3b98da25d37439030966e3fc59e50040dff98bdf54925af54594aac5eaba87e2002354a26a836ce32af9ad9961e20a2a113f0c4f493e3e67ad96bd1104fa79
+EBUILD cfgio-0.1.2.ebuild 557 SHA256 a3f185fa99f305d9d4b5e2783dc3028eecc4cd4e5271bdfb4f075a678b114264 SHA512 13c7cac9c478a9b30ce77e52fd5bce8f01588a4287d7795dbc99d094d9bd958633b7299c13850c7aa98cfea33a585c026233b1d15dc452d6de8da8f74e5379b4 WHIRLPOOL 3eef01ad95b2016bf6778854234dd5d56b9e8b2656d457f088b47e38c32e24b9c24677feb3cd985def076eb19b8e229fa76ffccdea1d79c22a6f1d7f603edeef
+MISC ChangeLog 2298 SHA256 01999e01e1dd7345f5274a4c23e598baec9c9b7020801cc50d1a7942e6ea8249 SHA512 21d0053efffa1bef6a3b4259369ee6a75d085b7551296b3693a0d1a63a5182724bda140e7b1450cd3aab65b16ef2834459e9e3e0d1c88bcdeefd82c3f3cbe3c0 WHIRLPOOL b173f99c89b6aae819cec9056bc9036de503c5efe26c2d34561d47c970f1c7ab335775e0c514ab6f2e576e89ea35e1bb5c6d7f146777741d56f5665d2c1a9625
+MISC ChangeLog-2015 535 SHA256 adccd9cdad24e62666d4fdf11f1abe0314cd0dcece2bf440d9834d51e6c080f8 SHA512 382b4c6a04c3e942da7ef0ec1d5adb40f27fdbd3eb1ca28c8912300595a3e9d3647b4ea062b434fdc18090e2c50b240d7a21cc9e70573c31e9b3cf10d8f75a4e WHIRLPOOL 308239f8fe1be97e832132f7a86b6775b5d6b8f5da349984136157824415bd66af8bd38d4a2640238cde6b6b5ece0891213e6397c631c31ec9381bb1d067d28f
+MISC metadata.xml 340 SHA256 af77edbdc129ed9ae0357e106cfe5f2ff4b4dbcd98d8e6f13e2f270168b508ea SHA512 e7419e26bf745099ab9863e348dcd808cd2147694ef6cdf15fa5e2a2ef93765f257625fe6405a6824bb2b6a70e58ddf3cdade414dedec69533f635bb3e5b86c7 WHIRLPOOL d402c2fa76b19c875e602b9830d9ff6a3b726453e849f5a5a8cea0cb8d01281eb8247bbc86376a4228c11d96994c7ae695903f46b32bd3021be091123f45cfe9
diff --git a/dev-python/cfgio/cfgio-0.1.2.ebuild b/dev-python/cfgio/cfgio-0.1.2.ebuild
new file mode 100644
index 000000000000..0a3e2bc56add
--- /dev/null
+++ b/dev-python/cfgio/cfgio-0.1.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for reading and writing configuration file formats"
+HOMEPAGE="https://github.com/ercpe/cfgio"
+SRC_URI="https://github.com/ercpe/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/cfgio/metadata.xml b/dev-python/cfgio/metadata.xml
new file mode 100644
index 000000000000..a24f0895edd8
--- /dev/null
+++ b/dev-python/cfgio/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ercpe@gentoo.org</email>
+    <name>Johann Schmitz (ercpe)</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ercpe/cfgio</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cfgparse/Manifest b/dev-python/cfgparse/Manifest
new file mode 100644
index 000000000000..12d2762009c5
--- /dev/null
+++ b/dev-python/cfgparse/Manifest
@@ -0,0 +1,5 @@
+DIST cfgparse-1.3.zip 98401 SHA256 adc830323e4d9872af1a81364dd18e958b5550c3cc2d1f05929ec2634147f2f9 SHA512 95d5396f5ca681f67ab701edf6ddd45776f8433c4b5ca08ee7796fd5ac866a709436257e4ddaaaf010dd6b5917d553dc4edceda05fb15720b03691d7c663a55d WHIRLPOOL a8c99dbeed598e6d4b4464c105080480091798529f7c66000072f972d54308918d73b7907fe9f8f05a5876b8bebbb4c8e138bcce3f1393212cef66ddd98ce78a
+EBUILD cfgparse-1.3-r1.ebuild 477 SHA256 7b2bfe92a0aadb0d6f4f10a9e1c730f1699cce999173b851caf4ba3944da9318 SHA512 030ea0e430703beea791afa04c205d230fdc38f102ed167f04d3987485355a04eb8c95aa7ff43a541fa2c132eef4b32d01634a813a891f5692eb7ce002bdd5a7 WHIRLPOOL cb2b2c78965360331885f90ac8498ea63e1adde9714cc4d2a653bf3531768c49b0e454500df1f6c64affdf5c67784f13f549c4c9d0137150e25a6db93b1261b1
+MISC ChangeLog 3125 SHA256 5573037b0c9e0b84a0a52fe3fe708c3ce4007cfd33f0c7800b34ccb68044ad21 SHA512 8daed288f1836ac102a52ece1dadd48c7a763515dbdf6c9fb70eb4fde99d0f356bc002f0649b46f6fb95741c651555ff961d3627d078e9f28fbdd5cce03c9eb4 WHIRLPOOL fe622e4716074f6d639c45c080faf8f9de05ae1a30546f6cf0fedf679b26a1ff6f5ca06d4357270ae48cad8d41093c484b0879eceb53113c2868221ab299b935
+MISC ChangeLog-2015 1377 SHA256 662d7d893f363066f683704080e9f674a9ea753faa04721e7217821180f9005a SHA512 bc1506ee7141cb3f529bc89e977cdaa528cd1915f0169c1cdcee6e65d6ef022dd3105ae6745a9f84c58ed1774896263200a8c3ecb7b1af44bfa233e6fe5986cc WHIRLPOOL 8edc7afa3e234ed8149f51d4b116a4f98428f2c5cfbe671e2c2803e2956602e2d3824dbae7dce8fb97c615067b248c3d01a01fd5e853462a7e3bc2f64fb192c5
+MISC metadata.xml 364 SHA256 0405e9164d14cecd5dba457e737647542ef525ca82e7c94907c1adaee8803808 SHA512 7e82a6bdd1a4d56250e53013773097610cbcd3e8e7c1ad4240733c050d8c3a846d6fe31f7b57b46e8eb84833ec4cf4cc1b3d0072fcce652f93de11bd44c1eb32 WHIRLPOOL d7f8d0caed7a71c03d61d595e703a02fafa22dba708805022c4e21b5684a6290b7e2d1ce24f87a5fdb765d473c1b46b4bc77426f57d9a83c93d4c3651747080e
diff --git a/dev-python/cfgparse/cfgparse-1.3-r1.ebuild b/dev-python/cfgparse/cfgparse-1.3-r1.ebuild
new file mode 100644
index 000000000000..0835058e5954
--- /dev/null
+++ b/dev-python/cfgparse/cfgparse-1.3-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Config File parser for Python"
+HOMEPAGE="http://cfgparse.sourceforge.net https://pypi.python.org/pypi/cfgparse"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="PSF-2.3"
+SLOT="0"
+KEYWORDS="amd64 ia64 x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+DOCS="README.txt docs/cfgparse.pdf"
diff --git a/dev-python/cfgparse/metadata.xml b/dev-python/cfgparse/metadata.xml
new file mode 100644
index 000000000000..17d447f0d7da
--- /dev/null
+++ b/dev-python/cfgparse/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">cfgparse</remote-id>
+		<remote-id type="sourceforge">cfgparse</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cgkit/Manifest b/dev-python/cgkit/Manifest
new file mode 100644
index 000000000000..f5b9f8c2b3c7
--- /dev/null
+++ b/dev-python/cgkit/Manifest
@@ -0,0 +1,10 @@
+AUX cgkit-2.0.0-fix-build-system.patch 1202 SHA256 ba8a2ad9101dac42d46cf2e60c5cf71b4a3a66c1aac9f214da5a16ddea80968b SHA512 1bb685b9a26e81005ebcb21381cbe855a26bc6a4ac5ddb2ef42a054b5b7753a9f3aaf4bfc669ca2ab944e332f8aa01025473c8eed2118d1b48e047622d4c2b5c WHIRLPOOL 3543dc184ef8f88220dbcd73b5ca6449dfc365fd17d87fffd8bb00f3ce1bb2847cffec0bd0c80996d6e5305acfb6be741b57d0e1db5af6e1366d08c721934233
+AUX cgkit-2.0.0-fix-c++14.patch 1200 SHA256 98537c45dd03a5831ebdcd7cdf1f364939f56428918ec241f1c18f0fd7a6228a SHA512 0ff1f9e613e44f9b4ab97bce7b83360c22652e1b0374a2b772e8971fcddb4386d49b1df23d7617a2a0c8e824f24eaad5c8c26e82380da50fba8a5f834f6257a2 WHIRLPOOL 4a85e102e13b3c02c6cd50d501e0ab491c9ce3ca4107eb362e68d42266858d09a0401d9c8da9e1ee90d05592674253d5041d93b98226fbee66a8b048b9cee41b
+AUX cgkit-py2k-pillow.patch 2021 SHA256 968de552cc9b8f8f41f3dfdf0290486dae877430a92a86632e461da6e45289bb SHA512 32d03359acb6d890d28f1e8fee8f62d136c52624313c65381fdde1f835f5d96c0337d310a22b7449508cc41be9af9c2215287b641a99f4f4c231593d948dc9bf WHIRLPOOL 9ab2347c2b3e37f4bca60c2d36920b945295de69735ca9a31bb4510b358858051ddb6c017d98a6586bad7b7fbec60700f9a70944e36c8e98284fc9efbad064e2
+AUX cgkit-py3k-pillow.patch 2025 SHA256 1599751ff15ea47b0354290e44a3cc648a3d783b1f73ae22f2f3362f2ae3e3d2 SHA512 163f0e13d9aa960a64beaaac2211b8e854f70bb18fdd1529a4d368ccd60d3c432ec33489c9de3438502409a7a530ee1131c0360992cac30fee5d549e7c88fc4e WHIRLPOOL 2e0f7a76bf590870cdd22fdc536bb44216571f323318f99d50111cadcc475d2122af02e20404afd5bf25e397b1a209f895689c391d7d9f29fd81301a122232d5
+DIST cgkit-2.0.0-py2k.tar.gz 885682 SHA256 a665037f06bd64dcdb519bb0baa7a8d577b788860a627fd850d5b72a08a3746f SHA512 44e57cafc3ba3aa824c44fe4ad04f350dfe053cafa09523acab220e8a5db45dde042b4fcc3e444dc3c248a43ddd94faac6875f579c2063e6c8feba7841472f7c WHIRLPOOL 0507024920bf84dec311e617c932b6ea2827b4609c915f38fce2baa0ac948b96b3fa51ec82a2770796081f88b3bf0d81f72439e65a87a6e0db4d24ef874b4b9b
+DIST cgkit-2.0.0-py3k.tar.gz 885012 SHA256 6d3fb3f02b4a55544c0698b6627054796d36d338704eb1788228cb6523ec2846 SHA512 0c721d728e2cacb3a5518bfdf49810793a7e4a7efdec54a95d9b8b64099996452a08193c90e1b76f57852c3593bf07e4361ba20c17ea3565413d4997e9cf6c2e WHIRLPOOL 95d53d7fb4b5db2ef680051f0d4bcd86bbd189594a4ca99379104d2b306877806a1a4d4de9a8bcb55aa870ffbd52cd2ef8754cb9857b5561e6f6ca5a26b2d1d0
+EBUILD cgkit-2.0.0-r1.ebuild 2124 SHA256 3b4efc51b6c2c494fd83dc9aa9349cf840ffca945faadfa4da747d0dd9ffca0d SHA512 0c65a4469d9324c1e6574b3511969b251601982b3b94364d929c24b37640302c3e9af86df6f90e151a2b31da6ceed7e4b716535e1e6c9d9a3eefcef88eb7286a WHIRLPOOL 789314c648f64c832af72c701507ead6b23a59caca40254f60bd6291fefd1b595f6356b9697627cc293c7aec58a22a8f9d8861df57ff131724e67a4b44a4b969
+MISC ChangeLog 3921 SHA256 c9ab0cbde4d96be350dc9e31f2c368afaa9ce3d6692ab73f837814a1994f3678 SHA512 dd176525498f874ea9d5d09725b3dedec70f17b54db5d98d22b051a1ed9371769a7aa9da6e3f7b63c1c8295c551298fc45713ab82ea76532d7757988c74041e7 WHIRLPOOL 354bfcbad163127552509627b248af0ec0dab74a5986c3fae714ab54c7830ee499630293c4236778358500bf3814f3461357983a5a32ebdf14242d841324e057
+MISC ChangeLog-2015 6537 SHA256 1e7a0c06106b94a44c58ae96d8ad3a5fee01e3aa4b9daf52e11699db02137388 SHA512 e83f9f831942da0edaf139aa82a04fc8517ace7575b8ffd37b7dd053403627fe2b5fa126d31b437a37ff264b9daa55d14dd3c827c81e954e820ba981ea7b0b61 WHIRLPOOL 10bdfeeeabf3aaa21542ca901cbcdd11a577751d7d7418aaf0238fc0850c16c599f9636ef8f8a70ccc2ce316e464b222849aba68c8af0057baa43d4b0bf2ee67
+MISC metadata.xml 613 SHA256 47180bf07d18888f0733a93f19964b02afae05fb584a4f3e15879842b24b58a8 SHA512 276fc1ce3f5ef82f91499436866d31a2807c1d753eabc5bf5494af756086327320f671cd30e4628b4fd4740774a3d7bc83e14175157375abcf01b496589fc85b WHIRLPOOL 386a8ddfb6957ead0bf2759ccf79c2c4774cb5f26bb482a3691eb34a9d9bb0f70beb88b1941ac90eed5a9fab41107f6438df2819a0e8bc8ee9ba2613c7d517cb
diff --git a/dev-python/cgkit/cgkit-2.0.0-r1.ebuild b/dev-python/cgkit/cgkit-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..346af45d30ab
--- /dev/null
+++ b/dev-python/cgkit/cgkit-2.0.0-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1 scons-utils toolchain-funcs
+
+MY_P="${P/_/}"
+
+DESCRIPTION="Python library for creating 3D images"
+HOMEPAGE="http://cgkit.sourceforge.net"
+SRC_URI="
+	$(python_gen_cond_dep mirror://sourceforge/${PN}/${PN}/${P}/${P}-py2k.tar.gz 'python2*')
+	$(python_gen_cond_dep mirror://sourceforge/${PN}/${PN}/${P}/${P}-py3k.tar.gz 'python3*')"
+
+LICENSE="LGPL-2.1 MPL-1.1 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="3ds"
+
+RDEPEND="
+	>=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pyprotocols[${PYTHON_USEDEP}]' 'python2*')
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	dev-python/pygame[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	3ds? ( ~media-libs/lib3ds-1.3.0 )"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	cgkit_unpack() {
+		local tarball
+		if python_is_python3; then
+			tarball=${P}-py3k.tar.gz
+		else
+			tarball=${P}-py2k.tar.gz
+		fi
+		mkdir "${BUILD_DIR}" || die
+		tar -C "${BUILD_DIR}" -x --strip-components 1 -f "${DISTDIR}/${tarball}" || die
+	}
+	python_foreach_impl cgkit_unpack
+	mkdir "${S}" || die
+}
+
+python_prepare() {
+	eapply \
+		"${FILESDIR}"/${PN}-2.0.0-fix-build-system.patch \
+		"${FILESDIR}"/${PN}-2.0.0-fix-c++14.patch
+	if python_is_python3; then
+		eapply "${FILESDIR}"/${PN}-py3k-pillow.patch
+	else
+		eapply "${FILESDIR}"/${PN}-py2k-pillow.patch
+	fi
+
+	cp config_template.cfg config.cfg || die
+	cat >> config.cfg <<- _EOF_ || die
+		BOOST_LIB = 'boost_python-${EPYTHON#python}'
+		LIBS += ['GL', 'GLU', 'glut']
+		LIB3DS_AVAILABLE = $(usex 3ds True False)
+	_EOF_
+
+	# Remove invalid test
+	rm -f unittests/test_pointcloud.py || die
+}
+
+python_configure_all() {
+	tc-export AR CXX
+}
+
+python_compile() {
+	pushd supportlib >/dev/null || die
+	CXXFLAGS="${CXXFLAGS} -fPIC" escons
+	popd >/dev/null || die
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pushd unittests >/dev/null || die
+	mkdir tmp || die
+	"${EPYTHON}" all.py || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/cgkit/files/cgkit-2.0.0-fix-build-system.patch b/dev-python/cgkit/files/cgkit-2.0.0-fix-build-system.patch
new file mode 100644
index 000000000000..2b62071380c1
--- /dev/null
+++ b/dev-python/cgkit/files/cgkit-2.0.0-fix-build-system.patch
@@ -0,0 +1,40 @@
+Make scons respect user variables
+
+--- a/setup.py
++++ b/setup.py
+@@ -214,7 +214,7 @@
+ 
+ # The following variables are used to customize the compile process
+ 
+-INC_DIRS = []
++INC_DIRS = ['/usr/include']
+ LIB_DIRS = []
+ LIBS     = []
+ CC_ARGS  = []
+--- a/supportlib/SConstruct
++++ b/supportlib/SConstruct
+@@ -30,19 +30,11 @@
+ # Add the local 'include' directory...
+ env.Append(CPPPATH = ["include"])
+ 
+-# Do platform specific stuff...
+-if sys.platform=="win32":
+-    env.Append(CCFLAGS = ["/GX", "/GR", "/MD", "/W3"])
+-    env.Append(CPPDEFINES = ["WIN32", "_LIB"])
+-elif sys.platform=="darwin":
+-    env.Append(CCFLAGS = ["-arch", "x86_64"])
+-    env.Append(CCFLAGS = ["-arch", "i386"])
+-#    env.Append(CCFLAGS = ["-arch", "ppc"])
+-    env.Append(CPPPATH = ["/opt/local/include"])
+-    env.Append(CCFLAGS = ["-fPIC"])
+-else:
+-    env.Append(CPPPATH = ["/opt/local/include"])
+-    env.Append(CCFLAGS = ["-fPIC"])
++env.Append(CPPPATH = ['/usr/include'])
++env['AR'] = os.environ.get('AR', 'ar')
++env['CXX'] = os.environ.get('CXX', 'g++')
++env['CXXFLAGS'] = os.environ.get('CXXFLAGS', '-fPIC')
++env['CPPFLAGS'] = os.environ.get('CPPFLAGS', '')
+ 
+ # Setup the help message
+ Help(vars.GenerateHelpText(env))
diff --git a/dev-python/cgkit/files/cgkit-2.0.0-fix-c++14.patch b/dev-python/cgkit/files/cgkit-2.0.0-fix-c++14.patch
new file mode 100644
index 000000000000..70f794664e81
--- /dev/null
+++ b/dev-python/cgkit/files/cgkit-2.0.0-fix-c++14.patch
@@ -0,0 +1,33 @@
+Fix building in C++14 mode
+
+--- a/wrappers/py_geoms1.cpp
++++ b/wrappers/py_geoms1.cpp
+@@ -142,7 +142,7 @@
+       string name = it->first;
+       const PrimVarInfo& info = it->second;
+       it++;
+-      return make_tuple(name, info.storage, info.type, info.multiplicity);
++      return boost::python::make_tuple(name, info.storage, info.type, info.multiplicity);
+     }
+   }
+   
+@@ -163,7 +163,7 @@
+   }
+   else
+   {
+-    return make_tuple(name, info->storage, info->type, info->multiplicity);
++    return boost::python::make_tuple(name, info->storage, info->type, info->multiplicity);
+   }    
+ }
+ 
+--- a/wrappers/py_slot.h
++++ b/wrappers/py_slot.h
+@@ -40,7 +40,7 @@
+ //    .def("onValueChanged", &Slot<double>::onValueChanged, &SlotWrapper<double>::base_onValueChanged) 
+ 
+ // This macro can be used to create a new Python array slot type
+-#define ARRAYSLOT(sname,stype) class_<_ArraySlotIterator<stype> >("_"sname"_Iterator", init<ArraySlot<stype>&>()) \
++#define ARRAYSLOT(sname,stype) class_<_ArraySlotIterator<stype> >("_" sname "_Iterator", init<ArraySlot<stype>&>()) \
+     .def("__iter__", &_ArraySlotIterator<stype>::__iter__) \
+     .def("next", &_ArraySlotIterator<stype>::next) \
+   ; \
diff --git a/dev-python/cgkit/files/cgkit-py2k-pillow.patch b/dev-python/cgkit/files/cgkit-py2k-pillow.patch
new file mode 100644
index 000000000000..0cddbd60b868
--- /dev/null
+++ b/dev-python/cgkit/files/cgkit-py2k-pillow.patch
@@ -0,0 +1,82 @@
+From 83cb693954f6f56e50a1aa90d935e94e9e8bac8e Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 5 Jun 2013 20:39:05 -0400
+Subject: [PATCH] Update PIL imports for compatibility with Pillow
+
+---
+ cgkit/_Image.py       | 2 +-
+ cgkit/_ImageDraw.py   | 2 +-
+ cgkit/riutil.py       | 2 +-
+ utilities/checkenv.py | 2 +-
+ utilities/postbake.py | 3 ++-
+ 5 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/cgkit/_Image.py b/cgkit/_Image.py
+index 7266d4b..0122cd2 100644
+--- a/cgkit/_Image.py
++++ b/cgkit/_Image.py
+@@ -38,7 +38,7 @@
+ try:
+ 
+     # Try to import the original module...
+-    from Image import *
++    from PIL.Image import *
+     
+ except ImportError:
+ 
+diff --git a/cgkit/_ImageDraw.py b/cgkit/_ImageDraw.py
+index dfd6cf8..d1d3cff 100644
+--- a/cgkit/_ImageDraw.py
++++ b/cgkit/_ImageDraw.py
+@@ -38,7 +38,7 @@
+ try:
+ 
+     # Try to import the original module...
+-    from ImageDraw import *
++    from PIL.ImageDraw import *
+     
+ except ImportError:
+ 
+diff --git a/cgkit/riutil.py b/cgkit/riutil.py
+index 301e0f6..ae373c3 100644
+--- a/cgkit/riutil.py
++++ b/cgkit/riutil.py
+@@ -38,7 +38,7 @@ import types, sys, getpass
+ from cgtypes import vec3
+ from ri import *
+ try:
+-    import Image
++    from PIL import Image
+     _PIL_installed = 1
+ except ImportError:
+     _PIL_installed = 0
+diff --git a/utilities/checkenv.py b/utilities/checkenv.py
+index b95dbf7..c93235e 100644
+--- a/utilities/checkenv.py
++++ b/utilities/checkenv.py
+@@ -96,7 +96,7 @@ visualize them. You can obtain PyOpenGL at http://pyopengl.sourceforge.net/
+ # Check PIL
+ chkmsg("PIL")
+ try:
+-    import Image
++    from PIL import Image
+     print "is installed"
+ except:
+     print "missing"
+diff --git a/utilities/postbake.py b/utilities/postbake.py
+index cadd11d..74f894a 100644
+--- a/utilities/postbake.py
++++ b/utilities/postbake.py
+@@ -34,7 +34,8 @@
+ #
+ # ***** END LICENSE BLOCK *****
+ 
+-import sys, optparse, Image
++import sys, optparse
++from PIL import Image
+ 
+ # shift
+ def shift(img, dx, dy):
+-- 
+1.8.2.1
+
diff --git a/dev-python/cgkit/files/cgkit-py3k-pillow.patch b/dev-python/cgkit/files/cgkit-py3k-pillow.patch
new file mode 100644
index 000000000000..734ff6eb356a
--- /dev/null
+++ b/dev-python/cgkit/files/cgkit-py3k-pillow.patch
@@ -0,0 +1,82 @@
+From 1953081269ce1cfdf29023a8590db40312c43194 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 5 Jun 2013 20:39:05 -0400
+Subject: [PATCH] Update PIL imports for compatibility with Pillow
+
+---
+ cgkit/_Image.py       | 2 +-
+ cgkit/_ImageDraw.py   | 2 +-
+ cgkit/riutil.py       | 2 +-
+ utilities/checkenv.py | 2 +-
+ utilities/postbake.py | 3 ++-
+ 5 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/cgkit/_Image.py b/cgkit/_Image.py
+index 7266d4b..0122cd2 100644
+--- a/cgkit/_Image.py
++++ b/cgkit/_Image.py
+@@ -38,7 +38,7 @@
+ try:
+ 
+     # Try to import the original module...
+-    from Image import *
++    from PIL.Image import *
+     
+ except ImportError:
+ 
+diff --git a/cgkit/_ImageDraw.py b/cgkit/_ImageDraw.py
+index dfd6cf8..d1d3cff 100644
+--- a/cgkit/_ImageDraw.py
++++ b/cgkit/_ImageDraw.py
+@@ -38,7 +38,7 @@
+ try:
+ 
+     # Try to import the original module...
+-    from ImageDraw import *
++    from PIL.ImageDraw import *
+     
+ except ImportError:
+ 
+diff --git a/cgkit/riutil.py b/cgkit/riutil.py
+index b51f192..ae0fba2 100644
+--- a/cgkit/riutil.py
++++ b/cgkit/riutil.py
+@@ -38,7 +38,7 @@ import types, sys, getpass
+ from .cgtypes import vec3
+ from .ri import *
+ try:
+-    import Image
++    from PIL import Image
+     _PIL_installed = 1
+ except ImportError:
+     _PIL_installed = 0
+diff --git a/utilities/checkenv.py b/utilities/checkenv.py
+index dda600f..8b6f74e 100644
+--- a/utilities/checkenv.py
++++ b/utilities/checkenv.py
+@@ -96,7 +96,7 @@ visualize them. You can obtain PyOpenGL at http://pyopengl.sourceforge.net/
+ # Check PIL
+ chkmsg("PIL")
+ try:
+-    import Image
++    from PIL import Image
+     print("is installed")
+ except:
+     print("missing")
+diff --git a/utilities/postbake.py b/utilities/postbake.py
+index 90e3140..27728c2 100644
+--- a/utilities/postbake.py
++++ b/utilities/postbake.py
+@@ -34,7 +34,8 @@
+ #
+ # ***** END LICENSE BLOCK *****
+ 
+-import sys, optparse, Image
++import sys, optparse
++from PIL import Image
+ 
+ # shift
+ def shift(img, dx, dy):
+-- 
+1.8.2.1
+
diff --git a/dev-python/cgkit/metadata.xml b/dev-python/cgkit/metadata.xml
new file mode 100644
index 000000000000..b5c29ce8fc23
--- /dev/null
+++ b/dev-python/cgkit/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <use>
+    <flag name="3ds">Enable support for importing 3D Studio models</flag>
+  </use>
+  <longdescription>Python library for creating 3D images</longdescription>
+  <longdescription lang="ja">
+  3D画�を作��る���Python言語ライブラリ��。
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">cgkit</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cgroup-utils/Manifest b/dev-python/cgroup-utils/Manifest
new file mode 100644
index 000000000000..314278ce84a9
--- /dev/null
+++ b/dev-python/cgroup-utils/Manifest
@@ -0,0 +1,5 @@
+DIST cgroup-utils-0.6.tar.gz 33845 SHA256 71c8f783140c21f39454a23854e2e1668543e6a6b38cb29aec63791385f53ba6 SHA512 5751ad7979812117cd75fc74282fb24f3ee041cc08eaac986544a5f12b7e83c806f0d1bb4c92c32314c5c8af4995dc4f36e023037ed7617907c8f42f97dbf6b5 WHIRLPOOL c7c4bfab327b63ad7e4bbe2194671f1e10c99a2b7d9b152fe0dabc0ddc352ece6c8dc270742257e77610de9ff57c0df7ddfa721fc69c843bb318310edea269d1
+EBUILD cgroup-utils-0.6.ebuild 480 SHA256 f13ebc671b6e7e33091bf4635b925156913dfd7c17c654e248b366df07ccaa32 SHA512 f5a06eeaa99eadc629e31c6f95302a9de3223a3746ad0c1b6c507dc26c9d2f410d2038e8144a2bb34e8d707405419a8a605ff2ec202a5cd7c7d52f60e8e09836 WHIRLPOOL c1b2614ec9c745d8d4f775af8adf08944a9d567808ea6aec5415f5eb378b5b253a4270ae8e706cfc9272ee2ace5bc46ed8106214ed26dfcc630cd8b39dbae5d6
+MISC ChangeLog 2571 SHA256 b48586afb5512903fdc5c6db3e82e7f0ff1c8168b4e01c5d7de00e2d6b4fa384 SHA512 567debfa2767613698deef192164f08572bfb9082d6106d20c09a4f3c7721ce9b411dd9ab7f4e63d49e9fd76697c89e1448918c4fc4ad38f19bc929aa1643f48 WHIRLPOOL 191c4037ca3732fd5bb9177039a8592ef533dfbabd4abb1671cd6ad290e6f0f8089e32facc83d95cd1e58cd4b39f04203a21c14b4e46e5e04c86f42e20c33bc7
+MISC ChangeLog-2015 470 SHA256 4886d787caec6683e6d21dda2656942b2d9bbb21902a8357cb8f948b60b20746 SHA512 49cdef179dab23e846ec15031d8f6d3eff473c1f31b2a50bbb16611d3e5e0172543b500eed08557a63d6d1295cb97b21091047dd32d5d25585a99cf8034744e0 WHIRLPOOL 1cee649e30de22f377d0ef0024aa1d3e2a03690f5b56de7fd08d4e3886b873bb3b2220662a0043688bfc4a1f744321e433d6209ffbf15444abd34588aa2ad8b6
+MISC metadata.xml 451 SHA256 654e190a109092c139eccb4e824c5edb4c71ce8003f58121382a98c116865d6b SHA512 79e6b6e146a3cb3ad322dffe5a299ed92c800988b943d9fb2080ba2c0572d5adf376948f7f88c529b7d98db3952e295fb2528f235025c841f0df7ed7d01e4484 WHIRLPOOL aa617da86a6a239c098f93e52649daccfbed12b335481a4de8eeebb13eccc5be645152142d66d71a34acc2fbd28b611ca3324882f306c38746124056e251c856
diff --git a/dev-python/cgroup-utils/cgroup-utils-0.6.ebuild b/dev-python/cgroup-utils/cgroup-utils-0.6.ebuild
new file mode 100644
index 000000000000..646e9faded1e
--- /dev/null
+++ b/dev-python/cgroup-utils/cgroup-utils-0.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools and libraries for control groups of Linux"
+HOMEPAGE="https://github.com/peo3/cgroup-utils"
+SRC_URI="https://github.com/peo3/cgroup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/cgroup-utils/metadata.xml b/dev-python/cgroup-utils/metadata.xml
new file mode 100644
index 000000000000..e4905993c028
--- /dev/null
+++ b/dev-python/cgroup-utils/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">peo3/cgroup-utils</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/chaco/Manifest b/dev-python/chaco/Manifest
new file mode 100644
index 000000000000..d5d20bb4fe01
--- /dev/null
+++ b/dev-python/chaco/Manifest
@@ -0,0 +1,5 @@
+DIST chaco-4.5.0.tar.gz 409562 SHA256 809674bdbdaf1a363b180366c6eaa70d9c49aa2c93b1933ee5c481e0a072da9c SHA512 66e1d82bbbf74e143e42f92eec7c83abc6f0eef488629947422a8ab2140a5a5bacf0f4e2a79f2acb8670417c9a620c9e85f295729525e011b8a09a1ff916e8c6 WHIRLPOOL 4e1187fc6cf1fa7aa3b4b86ec5d3d10917067303614615cce225aa90194ced492ea0d0e99a1088fa48959bb5fabae3e44545fde10754802a1cc2b21ffbafc342
+EBUILD chaco-4.5.0.ebuild 895 SHA256 f94a92719539cc077de912613afba4c9e61bc519fbdcad6a4cb96e4da77ade39 SHA512 e00db8bd63e4b9d1af086204c4c8542d08437c3a771380e0a0b7cdbade897c5e2e717ac82d8dbc9d1972376a273e5ddde8a3635c4e06ba50ced7ff1c2f45fe3a WHIRLPOOL 886dad8345fe3ae774da1c4c289df23051ac79a65245437bb48190d068627ec07e9279b485324454baef9a4ece40523a3110d295ef81d5764cdde3eefaceeee4
+MISC ChangeLog 2423 SHA256 c7b0cca350b0aa30c05f19240a1c86c352681b97ecb6c54fee93dc7f9be9b513 SHA512 24863808eba399969d87951a5c82d47bbe13010fc606ec89be6892d699ddd5920788b821856a14671cfb92cb0bd7f1c56fe79412ac1460b992410d2923100eed WHIRLPOOL fc5f2c133d78e0dd3fb297587e7b015b498fd6afabcd64b209910b781cba2b50f88727904a5c0ee4c78cc8fdf3a606031ae2036f0168a7ffc1a17e2f8a3e0f07
+MISC ChangeLog-2015 3578 SHA256 cf12fe9a32993f331a14a8ac3ef7326ef39b2cabf654ce85750fcfcb55d5228e SHA512 966b7bea438801cbf8d9b0e2ff4fa6d92a6d1a0edc794ce5d6ef50ebdb46427c1f69aaf4c1ab617c423b50e86efa16b4a40592559258dce5287f707a18dce400 WHIRLPOOL 21e2637d7b07b1cbc3aa6fc2e5c67289eb8261653b10e49fa12dd8ae1342672adc5b4084f03cd5701eaadf8f5f1339a37b20c821ed16150dd6dc9b180fd89249
+MISC metadata.xml 849 SHA256 1ce0c2792894b7305a4bdf24056eb3035d0abc1f3c5f1105c5b6a848dd896dda SHA512 df5e0437b3092c13295fcf8a386ebeebb2d5a961c5f976d3b2879ca1480844a6b217280592f627f8a9d196b55260848bc4ac8e1f83e996dd7841a16e6d137949 WHIRLPOOL 5540856bb1baac9d627340958b89ddf2f0531f303661b43e1e308b21cf90824afc58d695a1c3f80a22b2e64da376582f9c0a8aae745e1921bb10f41968ef3ad4
diff --git a/dev-python/chaco/chaco-4.5.0.ebuild b/dev-python/chaco/chaco-4.5.0.ebuild
new file mode 100644
index 000000000000..a9e21a8662ae
--- /dev/null
+++ b/dev-python/chaco/chaco-4.5.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 virtualx flag-o-matic
+
+DESCRIPTION="Enthought Tool Suite: Interactive plotting toolkit"
+HOMEPAGE="http://code.enthought.com/projects/chaco/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/enable-4.4.0[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/traitsui-4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)"
+
+python_prepare_all() {
+	append-cflags -fno-strict-aliasing
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	VIRTUALX_COMMAND="nosetests" virtualmake
+}
diff --git a/dev-python/chaco/metadata.xml b/dev-python/chaco/metadata.xml
new file mode 100644
index 000000000000..24312648935b
--- /dev/null
+++ b/dev-python/chaco/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="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+</maintainer>
+<longdescription lang="en">
+  Chaco is a Python plotting application toolkit and a part of
+  Enthought Tool Suite. It is meant to facilitate writing plotting
+  applications of all levels of complexity, from simple scripts with
+  hard-coded data to large plotting programs with complex data
+  interrelationships and a multitude of interactive tools. While Chaco
+  generates nice static plots for publication and presentation
+  purposes, its components are all designed to be work well for
+  interactive data visualization.    
+</longdescription>
+<upstream>
+  <remote-id type="pypi">chaco</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/chai/Manifest b/dev-python/chai/Manifest
new file mode 100644
index 000000000000..9a4ad37fda21
--- /dev/null
+++ b/dev-python/chai/Manifest
@@ -0,0 +1,4 @@
+DIST chai-1.1.1.tar.gz 81684 SHA256 7489a1124c780972ef383b2930fc9307afe8667d009fcaf69d97b29ce370d304 SHA512 f51406258327d9a49e820f0489d60e87f576c72232c701e99f96945932ed300582e6dd81608e5b262e2645c4e9c5216ec8f52e98d454c994beac8d1d8137dc87 WHIRLPOOL d9d8468745be52dff15194440b8f32cef7832d5bffe0453ac3d15e4c7e1948344936c467d9832ed2db441a74b6d5d32ad2792d9735976ce18eaf37a913abdca8
+EBUILD chai-1.1.1.ebuild 508 SHA256 57fd54a8e90bb5de81f6dc840f47b6c497af6c7a372a8358f5a872b1036a8b19 SHA512 d154f144a219b7fbc24c7237309491403b7e732e7ecbb8ce2f0c51dda0278aa0d58dbbec8cf5d7b749ed752e24cbf951851313ad3bc0e145accf97602c26075d WHIRLPOOL fcb93a0bf33b9b22ea013419b6f7cfe7e3ff8f7f499efd2485098458d79f55c19b6795e497d6399f8ae873863c83bb00a6b69a9baa7298af3a8b57d8297a3117
+MISC ChangeLog 300 SHA256 5f22aed7d7638e10f3d61525a97b00c23518ee3452a9446a81820be99d0d7f83 SHA512 f696565456fe16ec12e17f7bbdc96aaa69cbcd24fa252197048793dcc45a82b99bc2e4f3ed66c55940b0ca1ea2a76f21c89c4518ee4dc4d9965341fa6363d5af WHIRLPOOL 0e79b33c74456832a00baae2253f836cc257d81bf5dc43f1b14904412b938c0c4870a94aa551eb6feb04e06ea54e666c47ce69ab103e304f712edf83c682d17d
+MISC metadata.xml 362 SHA256 73671f8d03440d7a2b194da702f0ae47523e388ab10210334ac83b845340010c SHA512 3adf8064d0528af8205ca600f4f3be089872be7a37cdcb0374f9a8fe9589fe3b807e02a194e0cf08a5dfd08855951c842329b6b81aacf5146465e84cdeef6176 WHIRLPOOL 0194bc439cfc5e109654eb3dddb51fd7920c94a0980c5a6accc942e790cd719803b602d6d50d1cfc206e6c7b0f71ed562ba8e8ee618b870822c3196ab9f9867c
diff --git a/dev-python/chai/chai-1.1.1.ebuild b/dev-python/chai/chai-1.1.1.ebuild
new file mode 100644
index 000000000000..090f1dea7dea
--- /dev/null
+++ b/dev-python/chai/chai-1.1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python{3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Easy to use mocking, stubbing and spying framework"
+HOMEPAGE="https://github.com/agoragames/chai"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests -v tests || die
+}
diff --git a/dev-python/chai/metadata.xml b/dev-python/chai/metadata.xml
new file mode 100644
index 000000000000..14b6b0db498f
--- /dev/null
+++ b/dev-python/chai/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">agoragames/chai</remote-id>
+		<remote-id type="pypi">chai</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
new file mode 100644
index 000000000000..d365cfb2b2ac
--- /dev/null
+++ b/dev-python/chameleon/Manifest
@@ -0,0 +1,7 @@
+DIST Chameleon-2.16.tar.gz 200838 SHA256 87c82d657fbc1b47decbe605a6f6105d9190cb19e924b59262cfdfa03e7a512d SHA512 a6f1491a11e55231ed5304b297d749dd590f1d0340732e00d20e4af1b311df297df2a72cc79f0e4949e5ac00acb9dec29dcb50423facb2b3bcff6ad3d1d75350 WHIRLPOOL 7ed76fbb05f3c413d86f42b45ef73d5b333718031434273e512db43eae69900abfee7b10deff78f360131d50a1093e22786ca01b8eb5984ac5ac5330ba1f7eb1
+DIST Chameleon-2.25.tar.gz 193965 SHA256 6b2740e077626306c10a659bb9fe80d2eb8b6ceb89b521dfbed2f1432b2b496d SHA512 b2ffc05c6ab5268757ae6a93a0579d8031dfe7e09882f0f3f0b9a25677ecf896af99a8e7cf6bec98648e9c8526365e7e517bc174d36137734968d80f3f14a05d WHIRLPOOL a5c043c92d7a4f2da79a49d82507d92613427edae10b044bd90154a614384ed7c2d97606332be5ec937121c244dfa1e04bc685d8dd27b1a2c3adb8b3e7e69d4a
+EBUILD chameleon-2.16.ebuild 815 SHA256 41feacfb2e38acedb088d2774949707c7cf6410ba20bf0a0ced68a6ff9895fbf SHA512 4fef67ab4d9f34ee81567dd23ab99c6c046933fe199f0f3120b8434da672a3f2afb8de5ae6fea1ddbaabc5c74cbae6dbfdeb873d3fb3f7c54c314028980d7110 WHIRLPOOL f1c383d666574ce7078d90951d7d166d3cdb7af339dc5e99c63a72254e5f259e6406253920bf8f7f903bf1a3045349a235a0e5b1ba04dc9060461d4e07a030ca
+EBUILD chameleon-2.25.ebuild 829 SHA256 579b6221b77cef4e17da22b97686bba0dbf7f7ebb9133bca57ddbe647b824e6d SHA512 2f9936993c8fa58664b6c05bc9177797634256b173faca66ce3dfc55774713575b9fb25dbad622e377f77eb8a1bff220f506bcbf5af3053a94c65abde722474e WHIRLPOOL cf7d983ef1b671e1506ff80e8093a9bae158c6b594a710c5d916ce598c12a62f63eb7fe076d6af11df29039670c4f4bddde160f870b765fc751cbdba28c38d71
+MISC ChangeLog 3355 SHA256 0de19b1e0854cd84e4fe09e2d2f0a73a7c6182c343163ec7aa1eed04ffe13756 SHA512 ea843840116f04b499de4f2b754f5b008e1410f9e8a4822ef8818ea0f4ee9e9ae3ae7af4b80a5f46d0087a79cb9d426d26b6ce7680086e587ecd72693a228785 WHIRLPOOL ca20bcb1c5f6d5fd4ad6e1437562ed187516cc390484d2cfc4661053b2aa8275c00a58cecdb1a2a4128d425c27385cad0e9089c51487acea51210f4fb8fec7b2
+MISC ChangeLog-2015 4730 SHA256 d34659496c319b7ffe5458cb51435ffca5b9298c889b46c71e7c02f5f538a334 SHA512 5296890fdf2d3149c86fd2183d01d5206b82a3b91ae4e246077abf3d5591f4f16420065211806fd459b5841540f5bcc14903d060d6c7ef6186911e03626ce1dc WHIRLPOOL d87f645f88e3b811d3469ebdb6d8dd97ba890a5d73e1b3a42ce13452ba117b9b7d1152e5d6c3a0c36b2b4b59305c7345b02306f606c26dda69d1b8c3e57ac21a
+MISC metadata.xml 312 SHA256 a5d187b261dd8d750b74685bcbf897faba0f322e0c6673a9f1935752297dc3e7 SHA512 12c503e809af190746a7f59c4367083bf566e1d908e0166d109cfb507e1b7472ef8574d790d6f9403d9bb6d4246eafa2cdf77ece46dde74ced493c91acf52f1c WHIRLPOOL 25b4cb02cd2229135c03b27a115385cda4f50951e3141370e89e87d0eda408d492bf9419faf1977bf98a26d3bd7b019ee305c007f0e5bfd0ba47cb58931d06c9
diff --git a/dev-python/chameleon/chameleon-2.16.ebuild b/dev-python/chameleon/chameleon-2.16.ebuild
new file mode 100644
index 000000000000..5d3e5de5d410
--- /dev/null
+++ b/dev-python/chameleon/chameleon-2.16.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+MY_PN="Chameleon"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Fast HTML/XML template compiler for Python"
+HOMEPAGE="http://chameleon.repoze.org https://pypi.python.org/pypi/Chameleon"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && emake html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( _build/html/{[a-z]*,_static} )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/chameleon/chameleon-2.25.ebuild b/dev-python/chameleon/chameleon-2.25.ebuild
new file mode 100644
index 000000000000..0f7af7061eeb
--- /dev/null
+++ b/dev-python/chameleon/chameleon-2.25.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Chameleon"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Fast HTML/XML template compiler for Python"
+HOMEPAGE="http://chameleon.repoze.org https://pypi.python.org/pypi/Chameleon"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && emake html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( _build/html/{[a-z]*,_static} )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/chameleon/metadata.xml b/dev-python/chameleon/metadata.xml
new file mode 100644
index 000000000000..dc901a1bf844
--- /dev/null
+++ b/dev-python/chameleon/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Chameleon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/characteristic/Manifest b/dev-python/characteristic/Manifest
new file mode 100644
index 000000000000..611cf1f2dddb
--- /dev/null
+++ b/dev-python/characteristic/Manifest
@@ -0,0 +1,7 @@
+DIST characteristic-14.1.0.tar.gz 24612 SHA256 91e254948180678dd69e6143202b4686f2fa47cce136936079bb4d9a3b82419d SHA512 21bb40814f405c73471a83e15d1cfb07f74ebd157e647799bedffffd3909271145347eaec8ec09470dddad7224d1a15e8984a75f1fce00bbe20f9e1cb385f9b9 WHIRLPOOL d8044dfcbb7d75a383834bee842bd619b4bec65c8a0f467a563b9a80ee908bcf5c7de791eb220f9ba3b35a259a9ea6c6985f743518e2677d8a03a62db70ad98c
+DIST characteristic-14.3.0.tar.gz 26993 SHA256 ded68d4e424115ed44e5c83c2a901a0b6157a959079d7591d92106ffd3ada380 SHA512 e13a86f453cd3688a74188005b82a661a9c73d9f0408d9afe9e0575e69ffe87a5327f51e2c16a9c0a653b738e7c014d5aa08e353835f0aca7897714b7ae56e83 WHIRLPOOL e32b2801c1a56a9e6093c82ec9db3c8250756dd6ba80c0d63ca522c0a304e48920bf9cefc14c8491276365123c95f0e311be58f5cdba28dbab93391ed1455ba6
+EBUILD characteristic-14.1.0.ebuild 1106 SHA256 5199e4376d2a46ffebc219e16958163815cb54c9a8e2b9142ab7092cf9163497 SHA512 04cfa207d49779dd3edb9878de28cded4d9cefe55b6cdeb610bdf2d048601bebbabfe028624bfc0d6d541c2bbf6d9e27833c82c569bbe80759052bcf0cf8aecb WHIRLPOOL 97f236f90bb493e9c040b5606ab4bc5c0b1706b87a2e5e731cc144d16a320815b07e6a8a4c46f3f19b3f6da4ea780ab0017a9f9cc0f736321c37ccffd5e2336b
+EBUILD characteristic-14.3.0-r1.ebuild 1034 SHA256 773fbe8cbd66f7111dba704904243433413dd93604c7fa92b081105d7e3b4342 SHA512 8b35b3de964529feec6611b74e3ea593cecb893e9c31b244b501e44a282c4b0e08cc34d083d66dc0bc3be4cf616d8e0e19af286420a9d9c4722b656d0ebe8d5e WHIRLPOOL d8d2b9bdf3a2eaf199523e98000880670ca7c153c19068d401af98b986a59e1b44619f01acc3faa3d32396b2ff525780bbb77e4a1c1841d1dda0ea6be8727f1a
+MISC ChangeLog 3429 SHA256 d0ccddc80fc7661e0643c6cf65d014796b55d28373f1c7d8cf723c4d626076df SHA512 3842b743900e17b2989e93c996dfde5521c4feea006c2b12ef24ae651c0ae873304481a8710f188a49ff5f34179a779f516a64e3973b56a7fa726915efd65c28 WHIRLPOOL 455608a9c39456814c1855cbcd59d65f37300c74f1eb7a0c3c117b5f45bcf5f5c689e3351fa8111439bdd90fcd3cf4482785176628d38ca0bb7f93d5e7b03742
+MISC ChangeLog-2015 1689 SHA256 0198ccb168e43e26db3751394262c000aaedf93642252b7876a4c462e502af30 SHA512 949b82635834574f904497906a397f6dbfca4bda40d46bc37a4173a4b4f164dcd9539e5fe7c4a997ebd99dbc8d6cd88fc671fc97530a6e99bc555fb70aa7d13a WHIRLPOOL 170976341023e5dc6809fd54ad1e9e02e00178e537966a534a345d5d2c79290878addf1f014d020be4742f26b4f645991b8bdee7379bfc35eff7e050719ac936
+MISC metadata.xml 389 SHA256 770a52193d6fb33dd3d1255db9233d4f483b139ceda6c7b28abd45d59e266469 SHA512 291bc593113bd6fa148fcb5f978ec1630808a0a6b4ec7fb40b00596c9cd2bd56357fa792af91243d96ac21fdab420d370c0d1f59570e739be22d81b8add56676 WHIRLPOOL 5cb6de3214f8062e98d85f512f6e6c0301dc17c96daa149d3b4cbb38dc7c6cdca9b7279aa39871863aef83b43ef82445038c8ec8ddde0f5410adf75dd1382ab3
diff --git a/dev-python/characteristic/characteristic-14.1.0.ebuild b/dev-python/characteristic/characteristic-14.1.0.ebuild
new file mode 100644
index 000000000000..fb2a02327729
--- /dev/null
+++ b/dev-python/characteristic/characteristic-14.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python attributes without the boilerplate"
+HOMEPAGE="https://characteristic.readthedocs.org/ https://github.com/hynek/characteristic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh x86"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent un-needed download during 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() {
+	esetup.py test -a "--cov characteristic --cov-report term-missing"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/characteristic/characteristic-14.3.0-r1.ebuild b/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
new file mode 100644
index 000000000000..e0f24b01e2eb
--- /dev/null
+++ b/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python attributes without the boilerplate"
+HOMEPAGE="https://characteristic.readthedocs.org/ https://github.com/hynek/characteristic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent un-needed download during 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() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/characteristic/metadata.xml b/dev-python/characteristic/metadata.xml
new file mode 100644
index 000000000000..4e9bbbdfe8d4
--- /dev/null
+++ b/dev-python/characteristic/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">characteristic</remote-id>
+    <remote-id type="github">hynek/characteristic</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/chardet/Manifest b/dev-python/chardet/Manifest
new file mode 100644
index 000000000000..ee7572592eda
--- /dev/null
+++ b/dev-python/chardet/Manifest
@@ -0,0 +1,5 @@
+DIST chardet-3.0.4.tar.gz 1872214 SHA256 d5620025cfca430f6c2e28ddbc87c3c66a5c82fa65570ae975c92911c2190189 SHA512 b433ea0e15e200df968e6d61c671c42fbd77e519eb033035c4a5c241e1f98e1dfaea6747af632788507583b3ef85b00d510b3f6ef5cf58589ceca1b3a088b357 WHIRLPOOL cece99a2ed4a48f66232efc5d91ce228fcd83d3012a90099054bf214ad6f39e2b6250b139fb21b66469ccfd5b4bf8845846b50097f6fffda74c39fb742198355
+EBUILD chardet-3.0.4.ebuild 1002 SHA256 08d63bc9fc4dc0484eb98835d6108e76f147e8bbfdc82fc6bfe59a4a385b970b SHA512 f983d7fe1ba8c365e97f5bb8b7d6db6c8688d7aa4dd74fadcfdc442d9a1c7480860868b061a42d45d64f4bd8fcade255080fb1ecf9ee52df1fdbe6e88fa710c4 WHIRLPOOL e055aa6dd73227231e874b2ad30b6eec132b6e5b92de5b4c8ecdc542594899cc0e9615de45657d7998e66d7bba90e08edf46579e28536fa151d1a6ac06d37a97
+MISC ChangeLog 4103 SHA256 9476f4f0dc812c95d2e0e44b12028ab63f3401c011462462bc8048cea46a96ac SHA512 73750e9f5ef2de28d26b77ce56f3f9b70bc2d42b8e04c20dcd2077c47620b921997bd600905e98716d09aa22656c0e54822ac6f93cfeb4388928b1df0bc690bf WHIRLPOOL 9116cb0acd1e174bd6397d3473d363d7af4b64ed571a694d1b5145e9b3fb7547ccf79102864b0a80a2ccbe1ea73122c51545c0584a63337eedd244dcd02643df
+MISC ChangeLog-2015 6001 SHA256 fb68a71e0e80c09e0f07a039adc7ffd2108422ee1f9a49879a5014a1d08e210d SHA512 2126c7e8fb3b01d5d7823bc4f1010630fb6f5167a9fc37ec160d3ca127fc592ec9a8598d74339a3237c04dbe89d1f45be9012716ac16da1838e880733b1907a9 WHIRLPOOL 92b33cd4f5d0e5cb16d4d68a3528c1f99461c187e8e672d16ed70242957e99ba7c7d0ab6101a497944866b4c734ea22c2e11f8b0d8aea69ad190fdb959363477
+MISC metadata.xml 377 SHA256 8f2648c65256a47b684040071b98107948a772b26b16b1f5731f6950b1b40c8a SHA512 c48c3874a248049fc2845d0a64ee5b94c705ef58158f882f30bbdc561f311a7203cd8979e067a5b0f3f034c95cc4b6da373cea6efc9616f3dabc574772874650 WHIRLPOOL 76e8432647fa8d653d843e146184b63cfc3ccad77218387977a17876ce5999f76d31daeeec5c48cd4be01f5d1b5e0c58d9e2df2bcbb9028c86615185a63f809b
diff --git a/dev-python/chardet/chardet-3.0.4.ebuild b/dev-python/chardet/chardet-3.0.4.ebuild
new file mode 100644
index 000000000000..1bba5d43f786
--- /dev/null
+++ b/dev-python/chardet/chardet-3.0.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal encoding detector"
+HOMEPAGE="https://github.com/chardet/chardet https://pypi.python.org/pypi/chardet"
+SRC_URI="https://github.com/chardet/chardet/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+# SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+# PyPI tarball is missing test.py: https://github.com/chardet/chardet/pull/118
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/chardet/metadata.xml b/dev-python/chardet/metadata.xml
new file mode 100644
index 000000000000..4b05c8d0960c
--- /dev/null
+++ b/dev-python/chardet/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">chardet</remote-id>
+    <remote-id type="github">chardet/chardet</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cheetah-docs/Manifest b/dev-python/cheetah-docs/Manifest
new file mode 100644
index 000000000000..445d0910b96a
--- /dev/null
+++ b/dev-python/cheetah-docs/Manifest
@@ -0,0 +1,5 @@
+DIST CheetahDocs-0.9.16a1.tgz 1031641 SHA256 031850997efdd0b221b9f6bfa1783755bc6a92819c97065d14d61d36b0bf08eb SHA512 b0628e85200c4231fefd5eb770bd797d5eef3d6d85eac9b1da6d34d9dfb755a028a50a224bf9202d43a3458e15059ed7f5d4a55c49d484eed2b4caf1c7af835d WHIRLPOOL c7e8287577ffa7a6c9716dccdf1e5458a64af16c65cd29b1f242800f45f3f33577bd3230cf141fc44e64660445edb19f3a3214033a286f42c57f0daee2212c29
+EBUILD cheetah-docs-0.9.16_alpha1.ebuild 719 SHA256 88b3767f39b14f149d657de7d2cfa1df16b1961688ec6909a0ef60d4380a1b44 SHA512 b90118f12c24ee8ed6a12c4c74a2ade90b47d265301b1f0adf658cd39c2ece821de932b29f5cd39d5b4e88e2675c6285c3f31c41492de2785dc3860f769f224e WHIRLPOOL 4a5ed0dc9611a7a92c8b70ee8793be9e76052ec94ba34ca95a724a53d5ba0f07afd2b90a95f22d39466a128fc58a051210a78e0d2eb2e9318be61c41c4517783
+MISC ChangeLog 2460 SHA256 ca0f5f6e657ca39246319e45534deec64556cbe71a632b2c3df7cc4e4b9b8737 SHA512 d81f6655fdd8e10b5cb1028dd1397ec4b846ed111925883c439f7917582b0e663bd235232e4737bf46a06ab65cea2e34333b7becde126ae8e0baf673ae8617c4 WHIRLPOOL c7994c6bbd978a49f2937a72a60d63ecc4d295d0a55a2cb4a3c96d0b4a4c7c34d256d46332110ba6399e403839361bccf3c7f8803cc8c3cc92d9ead273f04e69
+MISC ChangeLog-2015 2090 SHA256 f6617232e5aff22077dd27f6b7158dbf8dfb1c04e49dbbae6ddc0863bf7560a5 SHA512 b0fe7a444192b34a43357998a9552705ed391fcfbecc6f85f9a5b59aca682f686dc3a903f1115bff4e2e7fbbf527e8ca32adf2892cc1ba4279e8754fda7541f3 WHIRLPOOL 4418dbe6067262d8919ff4e4e8c9d5cf998c723e990c8c6deaf236e575e46b3af6187114c1569bdaf5b2b9bc14216b6b66bd0b58042091520ab93c216722d8c1
+MISC metadata.xml 325 SHA256 50cb6d588db33afb64afea3de2cd4511b815fc63bc499122d3ad5483dc0ef438 SHA512 98a1f6fbdf321900f9bd0d3357ae65cb94e70572cbb6d2919fdcc779a39020db51c8b2191e52e4258c89bf01a9db47db18d000d946c14671b2148a57856da9d0 WHIRLPOOL f17826ca11272b3b09c370c223465bf0662e8d8d034a5e89bea350a5265ea94736193550f6d70e0238ad9e2662ccc08acb6090929f513b6570fabb8a9e4b0fe9
diff --git a/dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.ebuild b/dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.ebuild
new file mode 100644
index 000000000000..608379b1d81d
--- /dev/null
+++ b/dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Documentation for Cheetah templates"
+HOMEPAGE="http://www.cheetahtemplate.org/"
+SRC_URI="mirror://sourceforge/cheetahtemplate/CheetahDocs-${PV/_alpha/a}.tgz"
+
+IUSE=""
+LICENSE="OPL"
+KEYWORDS="~amd64 ~ia64 ppc x86"
+SLOT="0"
+
+S=${WORKDIR}/CheetahDocs
+
+RESTRICT="binchecks strip"
+
+src_install() {
+	ecvs_clean
+
+	dodoc *.txt TODO
+	dohtml -r devel_guide_html devel_guide_html_multipage \
+		users_guide_html users_guide_html_multipage \
+		OnePageTutorial.html
+
+	# Install the source code.
+	insinto /usr/share/doc/${PF}
+	doins -r devel_guide_src users_guide_src
+
+	doins *.ps *.pdf
+}
diff --git a/dev-python/cheetah-docs/metadata.xml b/dev-python/cheetah-docs/metadata.xml
new file mode 100644
index 000000000000..78706b259690
--- /dev/null
+++ b/dev-python/cheetah-docs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cheetahtemplate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cheetah/Manifest b/dev-python/cheetah/Manifest
new file mode 100644
index 000000000000..33d3b84a55cc
--- /dev/null
+++ b/dev-python/cheetah/Manifest
@@ -0,0 +1,5 @@
+DIST Cheetah-2.4.4.tar.gz 190989 SHA256 be308229f0c1e5e5af4f27d7ee06d90bb19e6af3059794e5fd536a6f29a9b550 SHA512 11b8cbf7d71789d6ae83596b133ddbe0bf1ccf2bca4c59562e7cd1d9bb75fa9d3208c0021d7d77edafdb03fd399cf1a26c003267fbffb94f27bf4457b0f9234c WHIRLPOOL 41261459eb8063344a27f2f26c28c97f79e06c002efaff437b6a0810954aaf4ed0ae7cbb08fa21cd3e79ef22e30c00888cbd9056e85cce2b13abb185df63e2c9
+EBUILD cheetah-2.4.4-r1.ebuild 1196 SHA256 ca34901876b1f4a8040760c36420bdfb6667de41a9706dacf4e02bff95e9c5b0 SHA512 f9194278d04d6d4c2cca54c39504629eaf76c28104aa7b8b8ed823d958eb53bfba6f797b2d139fdc841643d9a0fa07cc3b35d8fecbe7696065f086a8883bd0ed WHIRLPOOL a8860ab9e9cb9daa718dc5d6f595e6ebe44446b3252c804df2aabf1530c98da3fd1848525c97fd5975214208440c319be4881cbaf44f0b16f413fbe53ef92bdd
+MISC ChangeLog 2811 SHA256 1b17abebbbe686e391308c02d20477099d3866526ba9d5a371c756e7c91fa1b5 SHA512 d01f4fd96c2a3ddbf8351e0c4e7ba9457ec418262e5e52d4b9c85d040a95723dac4440e369a8ebce2ea90583f93c5b88f65c15b142be304d40ae685960aa1c70 WHIRLPOOL 89d8e72cdaf36ea13ae1050316725baf3769ce6f896fd1f15f3a503926e2565b7e1e34083e097cff3fbb90086c7102355d4f1ac0c89cc01248e87d90672e814f
+MISC ChangeLog-2015 13077 SHA256 0904d3a2ede9ab6b1e086488807f0495acaa3451ac0964fd77a2057824891fee SHA512 dedeb546211e53ddd7bc2339fa4e620c5c1f3090015e93da99e33ef2ac807607327f1ae6f4f493dabe5757c384c9db1f1f483bf62964d06ca77c9fbc87be067a WHIRLPOOL 4c4525b591571b01f0fa1b700cac783e00a04ff9c18d523d65e3c4dd2415d94fa1f0e91fb3e0e63725bb45114b5181ae0ce9b7f16e0046ae922354e66d013a53
+MISC metadata.xml 661 SHA256 169195455f099d632ea253d9268896267d37832e7be4987425c2efe07fc89a00 SHA512 7c0f9ab56f056a5b878572b16991039ef79e009a50afc44e7e9745051d58d99f4c3f7c3c427f8a165a9a54e76983cb9cc5cd16f0e3629d85e5288b71eb0f38b6 WHIRLPOOL 3b8172713009a5a06651f7475782815fadc72cc92229b40ba9a2391b9c14ec72158a6b3b862a00af82fc062a2a7d623b87ba77a4c9d8560c3eab6fc9a9d77134
diff --git a/dev-python/cheetah/cheetah-2.4.4-r1.ebuild b/dev-python/cheetah/cheetah-2.4.4-r1.ebuild
new file mode 100644
index 000000000000..f68e4546f575
--- /dev/null
+++ b/dev-python/cheetah/cheetah-2.4.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Cheetah"
+MY_P="${MY_PN}-${PV/_}"
+
+DESCRIPTION="Python-powered template engine and code generator"
+HOMEPAGE="http://www.cheetahtemplate.org/ https://rtyler.github.com/cheetah/ https://pypi.python.org/pypi/Cheetah"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+IUSE=""
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+SLOT="0"
+
+RDEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGES README.markdown TODO )
+# Race in the test suite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Disable broken tests.
+	sed \
+		-e "/Unicode/d" \
+		-e "s/if not sys.platform.startswith('java'):/if False:/" \
+		-e "/results =/a\\    sys.exit(not results.wasSuccessful())" \
+		-i cheetah/Tests/Test.py || die "sed failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" cheetah/Tests/Test.py || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/cheetah/metadata.xml b/dev-python/cheetah/metadata.xml
new file mode 100644
index 000000000000..af1e88f2ab32
--- /dev/null
+++ b/dev-python/cheetah/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>Cheetah is a Python-powered template engine and code generator. It can be used
+as a standalone utility or it can be combined with other tools. Web developers
+are its principle user group, but it has many potential uses and is also being
+used to generate C++ game code, Java, SQL, form emails, and even Python code.</longdescription>
+	<upstream>
+		<remote-id type="pypi">Cheetah</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
new file mode 100644
index 000000000000..28bce184904a
--- /dev/null
+++ b/dev-python/cherrypy/Manifest
@@ -0,0 +1,5 @@
+DIST CherryPy-3.8.0.tar.gz 433711 SHA256 ffcdb43667d4098247efaf8c82dd36d3dd4f8e5dc768ef5e90b480899e523bea SHA512 25f84093e30d814c0980f7d77b98492113470c3297c66ee8652e40650757f8e2b7db01bb8de6d7a1ea9b4bed8b764502b1f563ac6f0d082970bc2d46739d19c2 WHIRLPOOL 9e484fb5589e219108c48281f34bbe64d4767796a391dfb7f194f57dda89774d4517a6acd032fb492879a7bae2d0373e843e4b8aad53bf7b606b1b60dc2bfe56
+EBUILD cherrypy-3.8.0.ebuild 1661 SHA256 9e266df1796b4b2ee6d59417e59d8f62f70b1cfa326aa5e6e3b0ae0e5bb1a0a9 SHA512 7149cfa87ee95bed2f95e0107425e476155902f411a7261b4b05e8eb002aa3f4730d3c3469aad48ead90fe5838baa14b2e4e441e0d1848e013c88e9e8ecbf195 WHIRLPOOL 131d8b2e7902bc6b9baecb4fab83007ad212ec4d41a72b5a35cbc030b48cfae36a55c65d90db57a56acd250b840b871950c91c7f4eb9d03646dcaf35d82420be
+MISC ChangeLog 3089 SHA256 56cbe357b081048638fd6608a4aa6068627f38fb3671f30ee2367ffc97290e2e SHA512 bbaabd6f81640129beb855e3f2885db70261d725be262b1f443bbbb862ee23344eeecb52664ed53cd31be21fa0372f41888819d94f95f925dc8cf0e2f28c888c WHIRLPOOL 18a62d457097cc0edc8a839fa5b86af970fc858a361a8a0f9064156c29b3be85812d9e13bb6becc07847eff2c02687912d81f74a00d40f9e9772827a7ecdc57e
+MISC ChangeLog-2015 11295 SHA256 eada0e80e782b2a01dfd17ccb910906f3317d5c4f114c6c25076dc0c6341d7ea SHA512 ada3f7c1c34320f735330bb012eeda181e17c2a2ea15fef5bc85b2c6395ce14e2dd3356a3ca34432b59392bcd7edb7678e593c766bb3c0c289db09ca0164fad7 WHIRLPOOL c811020382852a6dc56b8bc340848eaef22e4236d77506ef0543aa126dacde0859bccc677e02bbe31b6cde1ac001010aaf9f5bd6db30b23c2dfbaff01cb41515
+MISC metadata.xml 321 SHA256 9eb1098052e5bce4d1d6d09363aea9d573c3672914aeb939200c635457c87206 SHA512 c777da5d545e3d626d663830437ec91a8f228c58734c7df4e4a16f0609904a5ad4613310d2d05b4e8ea89053371ad0bd4f0624137afe54ff6c4f5d9eef734d10 WHIRLPOOL a4de1510c9aa327636b7ac4a2d6d7f8e5f40ae26000dc3ca26c42c06cd99a1788e7e4e03def655147c9a5fffca769618a49c68d7ef4a31546ee62f1698ea8889
diff --git a/dev-python/cherrypy/cherrypy-3.8.0.ebuild b/dev-python/cherrypy/cherrypy-3.8.0.ebuild
new file mode 100644
index 000000000000..60c1baed6ec9
--- /dev/null
+++ b/dev-python/cherrypy/cherrypy-3.8.0.ebuild
@@ -0,0 +1,51 @@
+# 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,5,6}} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_P="CherryPy-${PV}"
+
+DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
+HOMEPAGE="http://www.cherrypy.org/ https://pypi.python.org/pypi/CherryPy"
+SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ia64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/nose-1.3.3[${PYTHON_USEDEP}] )"
+RDEPEND=""
+S="${WORKDIR}/${MY_P}"
+
+# testsuite predominantly connects to the network
+RESTRICT="test"
+
+python_prepare_all() {
+	# Prevent interactive failures (hangs) in the test suite
+	sed -i -e "s/interactive = True/interactive = False/" cherrypy/test/webtest.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# suite requires current latest nose-1.3.3
+	# https://bitbucket.org/cherrypy/cherrypy/issue/1308
+	# https://bitbucket.org/cherrypy/cherrypy/issue/1306
+	local exclude=(
+		-e test_file_stream -e test_4_File_deletion -e test_3_Redirect
+		-e test_2_File_Concurrency -e test_0_Session -e testStatic
+	)
+
+	# This really doesn't sit well with multiprocessing
+	# The issue 1306 tells us some tests are subject to the deleterious effects of
+	# the 'race condition'.  Both the issues are unresolved / open
+#	if [[ "${EPYTHON}" == pypy ]]; then
+		nosetests "${exclude[@]}" -I test_logging.py || die "Testing failed with ${EPYTHON}"
+#	else
+#		nosetests "${exclude[@]}" < /dev/tty || die "Testing failed with ${EPYTHON}"
+#	fi
+}
diff --git a/dev-python/cherrypy/metadata.xml b/dev-python/cherrypy/metadata.xml
new file mode 100644
index 000000000000..b1a626fc10bf
--- /dev/null
+++ b/dev-python/cherrypy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">CherryPy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cherrytemplate/Manifest b/dev-python/cherrytemplate/Manifest
new file mode 100644
index 000000000000..35624d07f8c4
--- /dev/null
+++ b/dev-python/cherrytemplate/Manifest
@@ -0,0 +1,5 @@
+DIST CherryTemplate-1.0.0.tar.gz 6227 SHA256 b1fc5b055e38ef9ff5c7b5b0cfcbd7f322092acfd0c47771dd029ab9b5a31feb SHA512 275a18b29d31fa5a95fa1cc5b72adb923f34fa787fd3ab8c2f2d87c7c32399fd2e1a7b408124320b86d651713fe769a5f81fc76a1ccd9a87d4481bad9111e821 WHIRLPOOL 2c15a954fbec012d9fe1c9d553b0d7fee55dcc04473a374b244a9d70524557982d551eae96da4c445883055269822679612b54240aac60dc5677b1af9de86fa9
+EBUILD cherrytemplate-1.0.0-r1.ebuild 489 SHA256 8c0c7c01ada165e8f79ec57e744dee32a9e0053d39acf7b866fb7a1e1cc6419b SHA512 f4e5e459475c3fdcb1723ce1135d99f9f75738f5145656cbe575fac7f77e3106abf761a7714395f259c55ed37177b9ba7fb5fe3cd00d5b34f6cc93fd50028f40 WHIRLPOOL c54d29752429819c448d44c8a5f8d93119be8e9aa0b4cb3b177b3240761c42976977a380edb9ae76c91d1f856fa31f981b85c66c059d49eddeaad123d0be3713
+MISC ChangeLog 2456 SHA256 acb78d45c2865922a2e8b57947efd0bede4376e455ed51aebbe1a899dac7fa9f SHA512 3c801e17d9d7287957bb79fe4dddb6254884e8db654e5d73a3ff3b60a6ba1e0940ed548546be735127b4c6eabaca9db04bf60fee14437fcc80c9778cf40b7b8b WHIRLPOOL 358a2403c46013c52f4408b1b21388a4b276566256377978ff35b727e607b6f75bcf95e1afe564ee5f2d92d6b1f626f37cc2b2652894e8f654c8ad0e032ddee6
+MISC ChangeLog-2015 1845 SHA256 8ac316f7814d81a71e82c3b49e50b80947067ae5aa2e1e52cd01f503ca4a11e7 SHA512 7b512f319b25db116fb24bdc5127afe90e44d90fbce0abca6bec87c751a70e80c406fdc2063063f77fba107e39a2a2c30dda63b7f7a3332206fcccc1e5c792cc WHIRLPOOL c37538e2aa305ed97e26a4affb12bf957b4105a0d9e48d0f0348c8f769b1a61f515e82ab470185a03fdd0ea71ff5706ef946c1391beef21819cd2888cd760cbb
+MISC metadata.xml 318 SHA256 219405cb0914bfdf58a8e436cf57e97b4f87c35b7d6fc0b897c40d4829a95b3d SHA512 e57e8bcf4af42d06a554dc8b074c20e4b384476c36bacb51475fa53ab600d8a81d3da04b189596063a0b5e372bbc71e362ba6942c9527dae5cccb379732244c6 WHIRLPOOL b6bccca89c05b3ae4bdcb9d1779c5ec1ba10dc52f27e918be0336b25ee8cb0a401db3531a76384d15f84ef90672a72f7ed14d7af92883812a93cbf58b8588ec9
diff --git a/dev-python/cherrytemplate/cherrytemplate-1.0.0-r1.ebuild b/dev-python/cherrytemplate/cherrytemplate-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..758b3150cd3e
--- /dev/null
+++ b/dev-python/cherrytemplate/cherrytemplate-1.0.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="CherryTemplate"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Easy and powerful templating module for Python"
+HOMEPAGE="http://cherrytemplate.python-hosting.com/"
+SRC_URI="mirror://sourceforge/cherrypy/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ia64 ppc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/cherrytemplate/metadata.xml b/dev-python/cherrytemplate/metadata.xml
new file mode 100644
index 000000000000..d0393a0e0717
--- /dev/null
+++ b/dev-python/cherrytemplate/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cherrypy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/chump/Manifest b/dev-python/chump/Manifest
new file mode 100644
index 000000000000..16f3a29e0ce3
--- /dev/null
+++ b/dev-python/chump/Manifest
@@ -0,0 +1,6 @@
+DIST chump-1.5.1.tar.gz 9370 SHA256 5aa5a1a4a0c0baa610e742018f5cce508fa4c980b15188664de0d3834e76b857 SHA512 778e043e4641b433a03860f1b1b144cdd34d0f79fb20ec0801cea1e1473eade8dd5211ffca391a57eb1f01456ec33cef4db6359839e7e39eab169411d00471e3 WHIRLPOOL dd78cd570060e75ab74e9e42e311dc3b0f096cc0fec588ad6c8378be314ec675b1557f172db945091d09caf10e26b04ec1ff92ffeb30a32df8254b2048728089
+DIST chump-1.5.2.tar.gz 12920 SHA256 e2274993917373dc2a25c52fb4c23d26e11d11c987d882ece8683d4f55eb64d3 SHA512 6b836bac1ab38c88084f9d6608a9ed88b305847faabcf5de6c13d587e91dc92b21334877cb9290dd56873de40be92f31f2bab3a345c7a7e62259004f5762cda4 WHIRLPOOL 442bd78fb5ad9f506ef903f1193ae98a66c29a5a10321512a40c64cca326b324ec8717538f0ba5542d26f4523badd5d4f0dd0b99e123918c6862d4214fd5be63
+EBUILD chump-1.5.1.ebuild 419 SHA256 23b0db36d9b1c885dbd2db0836e3f3d83863cdccbedb8ea7c7b49563751ced6e SHA512 8baaa8979f9a129254de02747d06f8300def23aefdeccb1a3c10c68eec07f996ccef683aeeb1ec5006c4b5704208b519dbff4f430430018d07dc322f875f96da WHIRLPOOL d401ba568a593ade447f2f3150ded83163613279341b4392dd98e51722b2f32f1d7d9af0dd2d9e8a42b0d99ad5229c6c47659595294ac4507ec61d7deccec61a
+EBUILD chump-1.5.2.ebuild 1074 SHA256 113756bc7709c211784988629587946e5d71180d9185aebafafab60015b6fe4e SHA512 70e318e19a6586333dc3abf574ed9f71d377e32ca9dd58e9d1794429793501cff55b0095b78898c1ac9c0a71d0a7c853c919e0afd86e44e7891215bbea8bdf9c WHIRLPOOL 77a5dcaea68939225b5b51a44e94e7db2cd03d6a23c55d05db25d90ba8b19051c3f6d72d7c7ff6491956e82ab0c36d5d3e00a4648be035b05b0931e344bd37b4
+MISC ChangeLog 683 SHA256 80c7288fa8bb36021ccac4a3c9e3c409196f150357d528a7df185b01213bab4c SHA512 d4d54331e7c4b266d88d67e667384b39530ce3225db84259e9d167517cd3afdc17adfd8e7cabc6a70d20068aed20f7fd76be31bf67593604f7b9c34cb0a2e4d4 WHIRLPOOL 26881a56825005cc61f275a346a8a0debab7262aae0c49662fdcf38af415a189b2cdcb8e165381bd8d3a3847bda4464c9c33ef7cb95d17426ad1bc4d4cd8c25f
+MISC metadata.xml 642 SHA256 59759c0f4b69cb520d29d49813d59339bb6caa9816321559bba6c174972d4f31 SHA512 905df2be7eb01ea16546f358169faed780f33e8f65d7b3266527b43ed46ff8bf49e25040206db62c5ede545e74bc947f588a3bb94a31c92dbd8f9e7cebf4d704 WHIRLPOOL 273ccb63f6eb313dc876966476189ce430c36d39f57ca73b0de86514e464998cdbe760cab59ad3c4f90fdb34066653114cba73fc8abba4ea4e1593e85cf7a057
diff --git a/dev-python/chump/chump-1.5.1.ebuild b/dev-python/chump/chump-1.5.1.ebuild
new file mode 100644
index 000000000000..d30f5ec3555d
--- /dev/null
+++ b/dev-python/chump/chump-1.5.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="API wrapper for Pushover"
+HOMEPAGE="https://github.com/karanlyons/chump"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/chump/chump-1.5.2.ebuild b/dev-python/chump/chump-1.5.2.ebuild
new file mode 100644
index 000000000000..e799f566f49c
--- /dev/null
+++ b/dev-python/chump/chump-1.5.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="API wrapper for Pushover"
+HOMEPAGE="https://github.com/karanlyons/chump"
+# PyPI tarballs currently don't contain docs
+# https://github.com/karanlyons/chump/pull/10
+# Releases are not tagged on GitHub
+# https://github.com/karanlyons/chump/issues/9
+SRC_URI="https://github.com/karanlyons/${PN}/archive/0cd59e14267858ab6623d7aa42badc6caa9b8edf.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# Force sphinx to use the standard theme
+	use doc && READTHEDOCS=True emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/chump/metadata.xml b/dev-python/chump/metadata.xml
new file mode 100644
index 000000000000..577981393aed
--- /dev/null
+++ b/dev-python/chump/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">chump</remote-id>
+		<remote-id type="github">karanlyons/chump</remote-id>
+		<bugs-to>https://github.com/karanlyons/chump/issues</bugs-to>
+		<changelog>https://github.com/karanlyons/chump/blob/master/HISTORY.rst</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
new file mode 100644
index 000000000000..eaeb1cc50efd
--- /dev/null
+++ b/dev-python/clang-python/Manifest
@@ -0,0 +1,7 @@
+DIST cfe-4.0.1.src.tar.xz 10933628 SHA256 61738a735852c23c3bdbe52d035488cdb2083013f384d67c1ba36fabebd8769b SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964 WHIRLPOOL 1cb56b36e21eab8004eec43d9c0f7377588cdbcd1d654cd0e6d836d43bc68dc0759993215439c1607e09ed3fa1f68b80504a222f73c1b76d3841cdf638dcbef2
+DIST cfe-5.0.0.src.tar.xz 11437024 SHA256 019f23c2192df793ac746595e94a403908749f8e0c484b403476d2611dd20970 SHA512 14acdd622310122b544c952ee5b932b7006d9d8424319f0e3974f2503d40a0cec4200fdd3d813a32ce0d877bcfbb9a5bd5c36f6142b4330e6c814f113ca2efe8 WHIRLPOOL 9d2fff35324621be191cc69b45db472681c9ebdf05aead09510f3178853ac8a179f2c454c2e6513e57f84a99980052671cd9a23d38d6d14b42dfda1853a7844a
+EBUILD clang-python-4.0.1.ebuild 864 SHA256 17b2d7993fa0e03dcc678c9813e2e67a14b49ab9b6b96846dc797809e1c384b4 SHA512 d2900dfa55a69965e146800f097f8be256d022aca8d85f54db205f75b30cf72015d27c4e8f4981725d50c7a1c2a14c15454f009b2d8a3636103d6d133b0a2324 WHIRLPOOL f773ad78a27d8b899d5c25b9280bb9c33b5f3b39645aad364becf7bda4794369ad866e37859ae83aa20bcf2a682b6c8cd3bb2b14dbeb33ed7feb3e5b774c1fdd
+EBUILD clang-python-5.0.0.ebuild 1028 SHA256 4c25f18e595adbb7031d2b89cf7d98a59806cc228c8a1d204a411daae3bb5a03 SHA512 7c5a20034ae0deb3820692f651a8a3a69741b00b71f8465656a59fc2ad17009555420dddb8105d2353ffbfdd1a32f4f377ca412fbe3c4f15a0e9b0e1d90b29eb WHIRLPOOL b625cb854b1e5a3e03db98e5b53b04a031934d6ae12d592d14c6ac28dc88fe32cad6f63d44dc362ebc3168b1158302e53af87071c9e1c901556daac4c302ac6b
+EBUILD clang-python-5.0.9999.ebuild 900 SHA256 315c3e1cfba2b384853cbf4e0e97070bfdc437cfdb0c73c377046693a1b5916f SHA512 589aabd4f0f8e8adaa54b010c153246bbbd95c0a357f009d94f9127a6a4cdb73e3cd8d2c254119eb3336ab386bc0552dbf1bdb560492cf1086cf2c0a40bc8a05 WHIRLPOOL ccc8c8644a1ae3003c96e8f0cef5b55668312a669b38e41787b771b111f291e10264cd7b4aaea7bade2df55a8dd86fbb71ba309aa772c1cdf3d8d5b37a960aa5
+EBUILD clang-python-9999.ebuild 875 SHA256 5bd7c93dab13d30f1e419a08c1aba8c35b89d73c5bb59f619d4fc879f7b829f6 SHA512 629ae85fcf4e451fec077d5f42aad97409e28153e038c53da57edc98d0d93840525cd4d57ec76b51dd7069e189978cc0bbbb1fe0d0f166abd83a1bdb75f7cfdf WHIRLPOOL 6e106b5dd241b4a192853e71180affd26f0663c45d66ccf1414cfe3cba27d614355b7ff6a87026713cb51dab2fa31a01cc0faa734f98e05943b981584c8fd0dd
+MISC metadata.xml 216 SHA256 e94ba81dd2791908508a3993afdebf723cc617314c53c273b9bcca15a9c48327 SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5 WHIRLPOOL 29145f5721e079e0548c5ef22424c65e6a5b2bfc4428918e923fcfdfc37e9b8749fb63e3c2eb5773c17fab276f7513dd66e326b906f1848911dceba7ae4b419a
diff --git a/dev-python/clang-python/clang-python-4.0.1.ebuild b/dev-python/clang-python/clang-python-4.0.1.ebuild
new file mode 100644
index 000000000000..c77ee951ec2f
--- /dev/null
+++ b/dev-python/clang-python/clang-python-4.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://releases.llvm.org/${PV/_//}/cfe-${PV/_/}.src.tar.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/cfe-${PV/_/}.src/bindings/python
+
+src_test() {
+	python_foreach_impl nosetests -v || die
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/clang-python/clang-python-5.0.0.ebuild b/dev-python/clang-python/clang-python-5.0.0.ebuild
new file mode 100644
index 000000000000..20a45b1a0c78
--- /dev/null
+++ b/dev-python/clang-python/clang-python-5.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://releases.llvm.org/${PV/_//}/cfe-${PV/_/}.src.tar.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/cfe-${PV/_/}.src/bindings/python
+
+src_prepare() {
+	default
+
+	# move to the correct subdirectory
+	# https://reviews.llvm.org/D37378
+	mv tests/{,cindex/}test_exception_specification_kind.py || die
+}
+
+src_test() {
+	python_foreach_impl nosetests -v || die
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/clang-python/clang-python-5.0.9999.ebuild b/dev-python/clang-python/clang-python-5.0.9999.ebuild
new file mode 100644
index 000000000000..3310c5b2e313
--- /dev/null
+++ b/dev-python/clang-python/clang-python-5.0.9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit git-r3 python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/clang.git
+	https://github.com/llvm-mirror/clang.git"
+EGIT_BRANCH="release_50"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${P}/bindings/python
+
+src_test() {
+	python_foreach_impl nosetests -v || die
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/clang-python/clang-python-9999.ebuild b/dev-python/clang-python/clang-python-9999.ebuild
new file mode 100644
index 000000000000..dbdb74a06f05
--- /dev/null
+++ b/dev-python/clang-python/clang-python-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit git-r3 python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/clang.git
+	https://github.com/llvm-mirror/clang.git"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${P}/bindings/python
+
+src_test() {
+	python_foreach_impl nosetests -v || die
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/clang-python/metadata.xml b/dev-python/clang-python/metadata.xml
new file mode 100644
index 000000000000..89c4bdb96049
--- /dev/null
+++ b/dev-python/clang-python/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>llvm@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/cli_helpers/Manifest b/dev-python/cli_helpers/Manifest
new file mode 100644
index 000000000000..4fdc27d479e3
--- /dev/null
+++ b/dev-python/cli_helpers/Manifest
@@ -0,0 +1,4 @@
+DIST cli_helpers-0.2.0.tar.gz 33855 SHA256 cbaeaf5da217d5cbc53d7750aaec75eab14410510c3c4afefc2d809015af4fab SHA512 7dfa9791f472ccba3d49d0e87daf859257e74349cfbd8920a624f3e8d6905d8c8b7fa7be70eda97091963e548fa16dfbb1171e198cbbaa9d7810bff2321ebe54 WHIRLPOOL 8c73ff8f3fe4f248bd90319519928ecf76582a69d5f68b7cee4c15cf2deefbafac612107602af55d83362cb35bd18c4a015aca9045df367dd035ea92f1b1e0f5
+EBUILD cli_helpers-0.2.0.ebuild 553 SHA256 948dff95608ec67dd1c24e8c7ad138f81df5af5f67e71ff2c6701352ee893fe6 SHA512 a89d1c2935ecb3ca96757e2c553e1db960af6452a214245ff426335a134e66bc082831d2d05af3df7f096f918969b472255eb42185f087e9ce5a67737e51d65c WHIRLPOOL d4cbd6584a22b27f29636fd133337076a93c78f24c082cc7ae6202615f8bba1ee352b40638e9c3b1b710fa7dfa0bfc8b311a18f20a4386f9102c303d34a40b2c
+EBUILD cli_helpers-9999.ebuild 533 SHA256 0d00037327619fe1433bad170b913868ee1d04e4800620ca9ffc26322a2df227 SHA512 84351878f15a177bbaf1a0eccbe8c0020c494d401c6f1e233d2360a6dacf97875c01b44edb7aa9255336a737c20da5e276bfa379909e371c71b95846469cb015 WHIRLPOOL 4f342a61fc92076f21ad7d11f215eac25e21c516c0ce763731585e1cc4f4d55f1698d28faa2f97e217fae145bd62f164a79b8d173d6a55b9869e10b218e9333f
+MISC metadata.xml 322 SHA256 d4524ef56bca926d08996b7a59b54e4f92ea2b658fe09c0343733f2db112272e SHA512 ae5215f13b457aa43dc95d67bacc371292f0c8f6540dcb49633f0120232dbde7fe12479c3ff16c203b20ac96700be12c187444a768f50e319320684553509dd1 WHIRLPOOL dbf5fa6725d51a3f584dcb8d8088688ba546b7f4e6e132c50c9748c3abaf2634ea123aa3a54b5c0a71c4b5a9432ad82957892fb9ab4e72e602920a85bc585834
diff --git a/dev-python/cli_helpers/cli_helpers-0.2.0.ebuild b/dev-python/cli_helpers/cli_helpers-0.2.0.ebuild
new file mode 100644
index 000000000000..7c09520e873d
--- /dev/null
+++ b/dev-python/cli_helpers/cli_helpers-0.2.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Python helpers for common CLI tasks"
+
+HOMEPAGE="http://cli-helpers.rtfd.io/"
+SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/terminaltables[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/cli_helpers/cli_helpers-9999.ebuild b/dev-python/cli_helpers/cli_helpers-9999.ebuild
new file mode 100644
index 000000000000..95d68a34211d
--- /dev/null
+++ b/dev-python/cli_helpers/cli_helpers-9999.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+EGIT_REPO_URI="https://github.com/dbcli/${PN}.git"
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Python helpers for common CLI tasks"
+
+HOMEPAGE="http://cli-helpers.rtfd.io/"
+SRC_URI=""
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/terminaltables[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/cli_helpers/metadata.xml b/dev-python/cli_helpers/metadata.xml
new file mode 100644
index 000000000000..c80f94490085
--- /dev/null
+++ b/dev-python/cli_helpers/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grknight@gentoo.org</email>
+		<name>Brian Evans</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dbcli/mycli</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cliapp/Manifest b/dev-python/cliapp/Manifest
new file mode 100644
index 000000000000..e99b3a2b2777
--- /dev/null
+++ b/dev-python/cliapp/Manifest
@@ -0,0 +1,9 @@
+DIST cliapp-1.20150305.tar.gz 55133 SHA256 09865ea3b2e63b41f4399997651d2c19c918922745b570530ff7dd5f77e49bd9 SHA512 a32e987bfc6e401672dc1e94fb29034b96fec5bba5864e1001d52460ecdd6cb903ad1bbbe52cfb6d8d880abd029c98f26c3edca8ed79ec10f77e86bfff595aa3 WHIRLPOOL 2286e990958f5012146ac07635f9ce4f1adf96b34cc4d47d4e2d21f472d576cd71a3633591f1e855eb79e3155c1d942cacabc1e96e1413d851f2b78f1d8a3578
+DIST cliapp-1.20160724.tar.gz 59871 SHA256 8e1cbe19578090cc5d7ac96fd51ad47af2efc86f682b48ea82cff75d4ef4ac08 SHA512 9c38a063b2a77143fce47dd462be00d254600efcc7c8eac3488243f79257e1a465ebc6800a16658f5c894db17ca456f38b3a538be03d7fa72ead93f3ead83e93 WHIRLPOOL e3d59824d6c32b909c48370a383800020c16917ff15b16738ae30e74624546e8a7fdb2fd76f4978d01d5e40d1c0258f0ebca9461619007b66680af219522a00b
+DIST python-cliapp_1.20140315.orig.tar.gz 51107 SHA256 55bec495881ba6759c07f1b94658e3b3b21fa3f04c8bbac2c5fe8b8ce1bf862d SHA512 ce538baec212d5d5149b0aa0ab542919e465fee6700104079842022bc47ef42e65d42179689e998d524feb6b7981e3e396f30266a4a8aa7373ebf1ae8013c2d9 WHIRLPOOL 3237ee51e1c8c15355e1b8a24e25f5c70eb242783e7be226bc400e750e98f708ccf3eb004a2bae4a6b8dc7ba4d39f512de8db4577123a5433e3ffc4f50bf7c71
+EBUILD cliapp-1.20140315.ebuild 619 SHA256 896c2317b914bae72cce37b098d068507b968c0172fae8d3b1d5376addb821db SHA512 1c1d1e3b682ae148e5111004fddc77dbf8ee710165409e484a7cad2e9d086334a7d17d601c68d294c3c2ba28b6adda6a3df8b1ee26b46287dfde7102be2a2a76 WHIRLPOOL fda912d36ba91bfe4837a18f940687991e1f513e76f950589d7cadb158ff7f753615fc3afd2efb63cfa06e366e5e0d534ca2056115d9dfab6e7762a32b669fe0
+EBUILD cliapp-1.20150305.ebuild 605 SHA256 6c0f7099420211ccebe64745ba0065477ab363c9c2dfc1e9f9f29ae82b4b1664 SHA512 64d7a3a2f2af67354eab0d78a092e04fb9b7d9640e587d76681578f13d9feab832b567328c30f92ec8653d7d4759cdca37f9c39fa899f130348d28348aab61f3 WHIRLPOOL ca2f5f46eab45b385591540f89a7dbd0014c61239a540f71d556313d0c8e80890cdb753e7c844009f72d1130daec6b4b4809818597f0f211c52aed8f2d5124aa
+EBUILD cliapp-1.20160724-r1.ebuild 732 SHA256 a261b95f61a540eb18b5f22dd6182011dff25862d323c3b775e424af265aafdf SHA512 4d2221382e5484e5f65723f05f4081975d603e11d2ac44186bfd800fa160d49c444134cbb7c0781f422006d630685879a58ec0d8e2f206c998e6c831f475783d WHIRLPOOL 812f164f8b62efa64ab4abef27194b13f10e3ee18c9fc53ccd79ceddcf5af58a2579c716773fae8a903cbbbdb8e8f60e794d2528144ebfe6f22d22de86618f12
+MISC ChangeLog 3112 SHA256 ba182b14597f7451f7ceb2d8a39cbd8bef90e41c5a83dbb3ecc73aaf7883d4ab SHA512 552f1ff4ec912caf02c3cf1df0df5ab5cb2072ceef1d5a28862248468677f6ee6422f7c4cdf183dcc608b312e5948789eb879d58dcaa846343da6343a83d28a4 WHIRLPOOL 8911670234c36e9d28701ee7766dd089a1a5b4b1db55b0822f964a2d107fa8d0a718af7cddac7712cf9a0d13f49e89e17063b1c2c1803a8d05d08e02106fc357
+MISC ChangeLog-2015 2810 SHA256 d303dddfa89f473dec5d1813cc76e38cda2034650310a5a8fc536f50c54da48a SHA512 8889d3549bf046e63c69903b751354ffec95e4b837193673fc7dfb8a40610b5c7d4b5a90912a9e02ce8ef73c4411b0c892215bbd5c3783bd2c8ccec6a6c44058 WHIRLPOOL 5ccda4615fcb43a081b0f8bcd4684c56626df52af4c67adee4302afde95d8d62d3964336bf3ec2eac435f43430962a257507aafdc0fa2468ad84471a2d6138b0
+MISC metadata.xml 250 SHA256 dc7996b965794cc38ecefc226a6b05400ff49c69553249c3d0ac69fd277b7906 SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de WHIRLPOOL e00ced8aee67f075273a4c498a4c69671eef224f7b41ef8c194ae72404c242bb93bf31a48fcf94065ab6fe8afbfb667238deba4ea4eb9bec406ace4bfcdcdc8c
diff --git a/dev-python/cliapp/cliapp-1.20140315.ebuild b/dev-python/cliapp/cliapp-1.20140315.ebuild
new file mode 100644
index 000000000000..365f5f2bc4f5
--- /dev/null
+++ b/dev-python/cliapp/cliapp-1.20140315.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Framework for Unix-like command line programs"
+HOMEPAGE="http://liw.fi/cliapp/"
+SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+DEPEND="${PYTHON_DEPS}
+	test? ( dev-python/CoverageTestRunner )"
+
+src_test() {
+	addwrite /proc/self/comm
+	distutils-r1_src_test
+}
+
+python_test() {
+	emake check
+}
diff --git a/dev-python/cliapp/cliapp-1.20150305.ebuild b/dev-python/cliapp/cliapp-1.20150305.ebuild
new file mode 100644
index 000000000000..508b93d7d42f
--- /dev/null
+++ b/dev-python/cliapp/cliapp-1.20150305.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Framework for Unix-like command line programs"
+HOMEPAGE="http://liw.fi/cliapp/"
+SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+DEPEND="${PYTHON_DEPS}
+	test? ( dev-python/CoverageTestRunner )"
+
+src_test() {
+	addwrite /proc/self/comm
+	distutils-r1_src_test
+}
+
+python_test() {
+	emake check
+}
diff --git a/dev-python/cliapp/cliapp-1.20160724-r1.ebuild b/dev-python/cliapp/cliapp-1.20160724-r1.ebuild
new file mode 100644
index 000000000000..c3daf94d0458
--- /dev/null
+++ b/dev-python/cliapp/cliapp-1.20160724-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Framework for Unix-like command line programs"
+HOMEPAGE="http://liw.fi/cliapp/"
+SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+MY_DEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	"
+
+DEPEND="${PYTHON_DEPS}
+	${MY_DEPEND}
+	test? ( >=dev-python/CoverageTestRunner-1.11 dev-python/pep8 )
+	"
+
+RDEPEND="
+	${MY_DEPEND}
+	"
+
+src_test() {
+	addwrite /proc/self/comm
+	distutils-r1_src_test
+}
+
+python_test() {
+	emake check
+}
diff --git a/dev-python/cliapp/metadata.xml b/dev-python/cliapp/metadata.xml
new file mode 100644
index 000000000000..ea6b59e79026
--- /dev/null
+++ b/dev-python/cliapp/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>mschiff@gentoo.org</email>
+		<name>Marc Schiffbauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/click-log/Manifest b/dev-python/click-log/Manifest
new file mode 100644
index 000000000000..e910abc929c7
--- /dev/null
+++ b/dev-python/click-log/Manifest
@@ -0,0 +1,8 @@
+DIST click-log-0.1.3.tar.gz 3377 SHA256 fd8dc8d65947ce6d6ee8ab3101fb0bb9015b9070730ada3f73ec761beb0ead4d SHA512 7accdd5be62c7c76ec9b862d8dc91710473a46669778f39cb7e8e5fa56020ce0bd619fbe30453338a05d87cef971916f2c4f6d5c9cb9e4982ae32e7a885bd722 WHIRLPOOL 0c21711ced16b4263470e43765fd5787a0e3776150e7f0188a0eddc005c9d9d330c196565c273974a1e8b65d7ba42ca99b24ce3a4000bb5aeab431d7ecb78f90
+DIST click-log-0.1.4.tar.gz 9004 SHA256 dc6275b7d8f87512a22d9806ccc845f474825edd82ad37925a36ba156c887570 SHA512 0bd81c5ef8c5636b0321807f5bbfb1318480da865a5bde0235679dc053ff5ac7a662bf014cb2d444ccf8b7d840b576756536de2702ae4e43afe91a72653b678c WHIRLPOOL 6aee5b5df76f3873dfe7e8af53816b85edf795bf49e7f8061461eb6cb4a72fe0b1af35bd1b38d73ac08f714beed393d20849f6d760150d75297ff7fb1cdfd2d5
+DIST click-log-0.1.8.tar.gz 9277 SHA256 57271008c12e2dc16d413373bedd7fd3ff17c57434e168650dc27dfb9c743392 SHA512 35baaabc54502f203da2fee02f6f63478f4f902bf333331b6ef9ae4b9d1677020ef0dce9f24f64e6e48bfc31280b72882f7cdf1f42ecf2cd941256d2e96a40e1 WHIRLPOOL 6c03c54f52b770cd1f61f6066c36ff963b2bc89e25b12d25cebb899731693ca9cd82f97d0b254a6fd0b49d9f2b3e4522294ae192eb728c3949483a5338355755
+EBUILD click-log-0.1.3.ebuild 485 SHA256 7422f47eb9182c5c013566fe0716ecc70d108320f86c0d71eec7b6bb4efb1054 SHA512 5c3d2193fb1c2fb3065821f6249146d07b752a873d545ae46b7855fa5c2b82acadd5eb7eca8b30bb166d532892655d409c176c0bcd72d623b027bf404f840aab WHIRLPOOL 62f4b3b5037eb74a153c80d3b732b2bb906dae234f3a9593bf76bd295b5f8da93634768a5fcbd723a33d0a7a90f455a5cbc90526ab1f84d9d307c8ad4302ed6c
+EBUILD click-log-0.1.4.ebuild 485 SHA256 a42cc6ccad09824627d26e3690e13664a32514b5806cd6b914739b534329b20f SHA512 18a497fd3962d82888772140ad0a74fe586cf59752605ad347bdf4aa6b8aeea2182bdd404d32566d9d3691a4fb02e2a02b6f01661ba0e9a5653ecd029ef4d9b6 WHIRLPOOL a6b487674172df556f0bff6252ee09230cce8ac20ed7689d709f93d29b3fd3495411c966e98112923b1faf581516d9d71086197f860bb40ab925790b4158fe65
+EBUILD click-log-0.1.8.ebuild 630 SHA256 576455872bc87c9c9692f1dc96e72ecede0400cd5f2dfa3f0dfba4406c0cecdc SHA512 4b16151dc28dca7512f83ea761d79afbb12a0b5698d1627de1de7ecd143622ba7cb1a5abe2f2b338a52f0c0ba253b9ed1885299297b0fff26ad11742fb5f3d7f WHIRLPOOL e734a6a4b5a111af2ade32ce167ecc33c495e4164717da921f9b2117c30b322387baa6a64d7920c7a0d3c51f59b3405d38a71fa2d750cbc42fd0a32949131d4c
+MISC ChangeLog 651 SHA256 b6b02d72573196999bbfa1487c029d4d8e2ff57f077dc39da51a648014b9525a SHA512 4ed164599c3b577e6579d62634ec73de003b2ff34fcef2af94985e31a5a7f0411603e9848ce4cc9178558ec7bf3a58f46bed5dfb54ba0ee6324abe904bb2bb21 WHIRLPOOL 735c02040294c467d195f960c696db23709ce87e5f4b165562b7034fdf9e04105e16933e942a1b4c0c04f37c0910e4b1e9c9358351cb75de65eabf6d1a430499
+MISC metadata.xml 352 SHA256 9560c555ad20a8c92850c336e9fc092c3bcbbc1cdc0768f54bfe1a84c991c0a5 SHA512 20b7009e52be3fdfd67690972c9ad09d77a505a59bc2a4c65ede59a72e33e7ffeb7c6a663487e01c94aa73507ad5fe4154ee2f9e336c85d8e173c971644e77d4 WHIRLPOOL a124d886d880b857c335722b58a11f9fa44555c0826d3032c9cbab06785dd70bc615bfd2a4c3e666c3ab44fbf8b890382b0701744e117ad69985e1114c3d4455
diff --git a/dev-python/click-log/click-log-0.1.3.ebuild b/dev-python/click-log/click-log-0.1.3.ebuild
new file mode 100644
index 000000000000..5bb650e9352b
--- /dev/null
+++ b/dev-python/click-log/click-log-0.1.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Logging integration for Click."
+HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.python.org/pypi/click-log"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/click"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.rst )
diff --git a/dev-python/click-log/click-log-0.1.4.ebuild b/dev-python/click-log/click-log-0.1.4.ebuild
new file mode 100644
index 000000000000..8393885b7c54
--- /dev/null
+++ b/dev-python/click-log/click-log-0.1.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Logging integration for Click."
+HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.python.org/pypi/click-log"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/click"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.rst )
diff --git a/dev-python/click-log/click-log-0.1.8.ebuild b/dev-python/click-log/click-log-0.1.8.ebuild
new file mode 100644
index 000000000000..9aafa8433b1c
--- /dev/null
+++ b/dev-python/click-log/click-log-0.1.8.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Logging integration for Click."
+HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.python.org/pypi/click-log"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+DOCS=( README.rst )
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/click-log/metadata.xml b/dev-python/click-log/metadata.xml
new file mode 100644
index 000000000000..7e29ce9dfb6b
--- /dev/null
+++ b/dev-python/click-log/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>amynka@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">click-contrib/click-log</remote-id>
+		<remote-id type="pypi">click-log</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/click-plugins/Manifest b/dev-python/click-plugins/Manifest
new file mode 100644
index 000000000000..7848fa23b0b9
--- /dev/null
+++ b/dev-python/click-plugins/Manifest
@@ -0,0 +1,3 @@
+DIST click-plugins-1.0.3.tar.gz 7950 SHA256 7acc5e7eedd2dfd719714e8d53ae99030b5357aed661d0b06dacd6c2d583d7c5 SHA512 1eac03d57931bdf8e2f387164490436b3b921738936ee6cd9a58246e05e84133e77c47dd606a00d1b3e238a806bf83ffe7dc7c758a92d789cc229a94ed26e17f WHIRLPOOL c06f7a943af5074db94b45d77b0ceb85b3601616c64b46c3495b8729005f8d691795efba39e773c247f26d9a658ce48f4cb1fcadc10394dd57cfc6de027db569
+EBUILD click-plugins-1.0.3.ebuild 514 SHA256 e032af2a1ae5f5f1f4ce2d5d16e9ba794b1dbaee2413d44438d52a8e2cf56569 SHA512 93d68a5939916dd72f7d9159074c55cfaf9bb686c375fae2ee71ebc9dd8fd2ef46631fcafbccb29f1d543eb7d8fd89fd9812e72c9a5a3eaa0152a938061f232d WHIRLPOOL 2dcddaaad603fce597e88d827a29f161b102282f670e5aee297ec29bc5f63c0de67d42824ea7ceabf4fe8cde602007bc9654019e2ad0a1e48204c18ddd07216b
+MISC metadata.xml 299 SHA256 8b7e28829cfbff959ca8963fa87c123272117b6ea58849f9cf1eef9090e0dffa SHA512 b37fff24719eed45df0c672912037dff92cd7c820316fd17ac532d8aa3d6b04103c837fa436fb4863b4dcaecde2fab4fb35b0e86e2f7c083364be723dc979e61 WHIRLPOOL 17ab19e8a4785a4e760b9b300fde54e96da0f3feb5a4c9893636296384f815a1dc0f67eb0984b34d724808db656eaa5e074e3a4b01de324a29db9059234ae61a
diff --git a/dev-python/click-plugins/click-plugins-1.0.3.ebuild b/dev-python/click-plugins/click-plugins-1.0.3.ebuild
new file mode 100644
index 000000000000..4eda8ac36e21
--- /dev/null
+++ b/dev-python/click-plugins/click-plugins-1.0.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for click to enable registering CLI commands via setuptools entry-points"
+HOMEPAGE="https://pypi.python.org/pypi/click-plugins"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/click-plugins/metadata.xml b/dev-python/click-plugins/metadata.xml
new file mode 100644
index 000000000000..fc6c3094d657
--- /dev/null
+++ b/dev-python/click-plugins/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">click-plugins</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/click-threading/Manifest b/dev-python/click-threading/Manifest
new file mode 100644
index 000000000000..1d7ba5461cb2
--- /dev/null
+++ b/dev-python/click-threading/Manifest
@@ -0,0 +1,6 @@
+DIST click-threading-0.1.2.tar.gz 3232 SHA256 85045457e02f16fba3110dc6b16e980bf3e65433808da2b550dd513206d9b94a SHA512 4612c5314800a76e65468fb80c9495e14605bbda8b5e25e8d78e8baaa9392e424d673d942bd7d0f3955e0241ddc4b87aa348dcb7f3b9516ba94fb8352c0400b6 WHIRLPOOL b821aaca4566cdb6e58ae3eb9dd5892521dd393c8e472399193aa12d9e8754930e778595fe80f3ea6dacc61e4a2ff8f3e68c2f3cbfd0226ecf103309b02ed6eb
+DIST click-threading-0.3.0-gh.tar.gz 3759 SHA256 e4e266b1800e9b58f52a16ca9358c43e290a5a92836fd68fa1938464c5e6e26d SHA512 ca535a54f5d88c70c3f8f05f2d423e1b9b0f0b3793a1c04cdc90b61d4fa99f6906a327143dacb2b946ba8c1a9977d9c96ce9caeac9638521641d574316a0bad6 WHIRLPOOL 3b272c181b42b0e51e17f84ad2d79e6e373eec11f623f4e22a24a2b587ae66af5785d94929073868e9c7145491150b2d161e3938b7159dadcc65da7befbdc110
+EBUILD click-threading-0.1.2.ebuild 508 SHA256 ebcca097c35b2938b1f5bfec8c30931e2221564f32640bd6dc9391408eba85a1 SHA512 2fd9a6354e4488d4d88850380ce67e1121bce6730d61efd1b7d0bc29d77711b4bfabdaa513b5636a66ff32111b363c78c27218e751f168168bb99e7db481542a WHIRLPOOL f6aa5aba5a450df431bed8589fa503039867c98a42f1f7d8e71706519522d39f7d0638ef9a534ddb858c45a7c75f25f7bf5312cfe2e7fd187393241b8af19a64
+EBUILD click-threading-0.3.0.ebuild 689 SHA256 e797b806a83d6cd1a5c4a9ddd966f1315712146378bd62b09a49581dd22c09f6 SHA512 af87fd35aa65724bb4d3ee4acc5ac02256d5ab04d7092993589c21cb4c1a2199d85d3ecb520e44259e049be140647d8e941e4413589b0d5106b7a08257fcd033 WHIRLPOOL 4f387a7f66bf84b20f5d6f70fe538bf4a962d8b342cb5f747935b2deb1e04d6b23d784bb5f04ee09ca413d0f2c1c86198e9b09c8ab977a8ab1ad3a244cee322b
+MISC ChangeLog 693 SHA256 6f855ffe3bb915b17419ff156e35a2081e3d0006eedbd2587f2d4b9b63a2f5b0 SHA512 070646111018328d2a71909585f98b4eb53faba7b1214de0d4913e51d6b002e0bc580969405cfb555eaad0b1031d8bf16bb70258e1efc05888986e8c932ce21f WHIRLPOOL 89a255fbacfb286f411452e3df8154bd499cb7cb0cacfe4c3cacb4c8548748ed3d728e8868e368044bcd8a1039b4e31199121b6a11a1999e60fd9e345b6370b7
+MISC metadata.xml 364 SHA256 bc1e0b04d9331aeaff730c04fe429f054c56ca3e6e89a35a5773afb8df878103 SHA512 bdc9d9789f853bc0bb5a1cf03141f34baff1dcd7d4d169256213b08df47487ffd29edfc5e567239881b00fa81c6452ec50b19670676039044b80d6ee5dcbbbbb WHIRLPOOL cf91d23f79813af35abbd000e7a0c2ba298373ab2c489eb025a8f54874bd47665d528e5632931ad0d207ca495257bdef8a81f45ae676072bbe6305f1603a1c6d
diff --git a/dev-python/click-threading/click-threading-0.1.2.ebuild b/dev-python/click-threading/click-threading-0.1.2.ebuild
new file mode 100644
index 000000000000..45c34890883b
--- /dev/null
+++ b/dev-python/click-threading/click-threading-0.1.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Multithreaded Click apps made easy."
+HOMEPAGE="https://github.com/click-contrib/click-threading https://pypi.python.org/pypi/click-threading"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-python/click-5.0"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.rst )
diff --git a/dev-python/click-threading/click-threading-0.3.0.ebuild b/dev-python/click-threading/click-threading-0.3.0.ebuild
new file mode 100644
index 000000000000..5511d653a9a7
--- /dev/null
+++ b/dev-python/click-threading/click-threading-0.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Multithreaded Click apps made easy."
+HOMEPAGE="https://github.com/click-contrib/click-threading https://pypi.python.org/pypi/click-threading"
+SRC_URI="https://github.com/click-contrib/${PN}/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+DOCS=( README.rst )
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/click-threading/metadata.xml b/dev-python/click-threading/metadata.xml
new file mode 100644
index 000000000000..954de9756124
--- /dev/null
+++ b/dev-python/click-threading/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>amynka@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">click-contrib/click-threading</remote-id>
+		<remote-id type="pypi">click-threading</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
new file mode 100644
index 000000000000..21080baac029
--- /dev/null
+++ b/dev-python/click/Manifest
@@ -0,0 +1,7 @@
+DIST click-6.6.tar.gz 283420 SHA256 cc6a19da8ebff6e7074f731447ef7e112bd23adf3de5c597cf9989f2fd8defe9 SHA512 5650cfe6c8b55a7e823e22248964143278d61383dac63497508a864807f1950f9dd5d76ce6a501e589dd81fed6e2a1248d3f8973be25a91950896b7408dc88bc WHIRLPOOL db9f36bb86599599b95ae350659f75f387d15196261acaef1e069769ca8e2f29be8dc3ae5cdd94d8303907f94b90ed00209a3410da863afcce74d393a2f48d3c
+DIST click-6.7.tar.gz 279019 SHA256 f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b SHA512 d454369fe1acb01c2210a61e15f45ac9cc77102c93345257f4ef3090bd8f31f1ccc49d9fd6ea670cddca9f715ad5db29368b4eecd95abff50d1033c4f7a967d6 WHIRLPOOL c85fd3d8dff735eda63ca78cbd7bb09e8bd11e237d681f9d07cc3788e05191c4fc81a05ac813c176ef5966fa3cbd7d4eac0391633d5672b1ace8581663bef7d6
+EBUILD click-6.6.ebuild 1195 SHA256 e6a31154a8b9ed69db05564bd0c143bfbee390dcc66ce932742f9c818c190d88 SHA512 bf17a9ef65d5dc3b31a46f76282b7a860ac4689590e3836517fd74e81763731ad890f7084b397b453242f136604901c1f38cbe1214d314598239e34d0274c221 WHIRLPOOL d0d9bdc109c9a661a4a8f7309e2251b5460879003b7a897df32fa265eb966e3b41748c986615e04f67347c817cb921d63d845c270c9486eb91548e8befe8d8ab
+EBUILD click-6.7.ebuild 1208 SHA256 8b2d1ff5b0237d2b234eb431a124456478bae3cf62fda705768985cea54696e6 SHA512 6919058bbf373995ab0cfb95e7a6282249dccb52f0873e56e098ad6d50f546fa1f216e2d2592b272f47eed2f36640d9985ca9fff8c053658e3c4e46a5871dbbc WHIRLPOOL f9b4b3873c0159b1e4f2ecbf768672ab899665ec33feed9cb770b92c510da399831b2801bd3ef122ff77a4f0610ca692e9419702579aadbf8cab1a3d475dbeca
+MISC ChangeLog 9247 SHA256 f669b485c4ab68582e0facc8b30d034ee97c3d92043300967f036b8d8895b5c4 SHA512 d99b2ba2d3be44309cb1656ae6caee2e203fd5134a16d3a723e624239f2254b931c0c81202d31ee02e54643d784b1e90a8c3b4a981d511271342028cbafde193 WHIRLPOOL f1c4bb1cd89fedea81c875d829d32c82c4104f721221ae8155deedede1c8f33f10bae838a5883332d1a40f4d0e5063c15591010f994826d5c9397504039f66d4
+MISC ChangeLog-2015 2454 SHA256 8e8b700763da2a86efa78490d2cfa400c822455a26a0be9325f7f831dc20ff33 SHA512 8cd0b1cb292676f013bf614c93a2f165402e481630fec94dbaf5488cc3fae1ccfbf0cad485ad10ec11ff0b19f27a8fbab67eb311bf1aaa4a3b98a655459deef2 WHIRLPOOL 03c10ff8974fa6ad444d9ab4de78e57a4631687a97da9ffeea9e85ad2cee6b4660795cba5dbffc7abd6915e4712192e3e8129530e44718bed8c468b7bc079a90
+MISC metadata.xml 308 SHA256 0a69e4d88f2e5aa6e415b5645e1e1763045c392c8308bc7272a1f856d167b1d9 SHA512 6dd2c4334b6ad8b0942f5cbd443e7bd5cefdcadf2541d341f46fa153a28a6ab5f074270638796efe6a7df48a20be9abcb3f41bfa19c58b1e30ed13fe56b1d6d1 WHIRLPOOL 994c1bda36ffc3bf80501cd01f53cfb86cf04402848a8d09f37e43acfb7801e0f1ca01c6015cbf4af87d243bc13f47990f8e24fd3a86163bdd8c7105e4b98edb
diff --git a/dev-python/click/click-6.6.ebuild b/dev-python/click/click-6.6.ebuild
new file mode 100644
index 000000000000..e312f7b9c17f
--- /dev/null
+++ b/dev-python/click/click-6.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package for creating beautiful command line interfaces"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE="doc examples test"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/click/click-6.7.ebuild b/dev-python/click/click-6.7.ebuild
new file mode 100644
index 000000000000..13d7fa705823
--- /dev/null
+++ b/dev-python/click/click-6.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package for creating beautiful command line interfaces"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc examples test"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/click/metadata.xml b/dev-python/click/metadata.xml
new file mode 100644
index 000000000000..54aeaa8ab488
--- /dev/null
+++ b/dev-python/click/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">click</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/clientcookie/Manifest b/dev-python/clientcookie/Manifest
new file mode 100644
index 000000000000..6e378f5634c3
--- /dev/null
+++ b/dev-python/clientcookie/Manifest
@@ -0,0 +1,5 @@
+DIST ClientCookie-1.3.0.tar.gz 130974 SHA256 cd51a411ffbbce76a4046a42f43711fc2674db05201e649c6035aa8178874797 SHA512 3a42660557bbcda76f7e63fb4fea0ccaa15967e8e6991d65dc72921efb8cec475f7ebfbfe963e5577f7dfbacebb84488b7bb5e6e4e913e863e54c0faf0b4e9f5 WHIRLPOOL 892e206238d5954b2f16610bfc52d89c8c8f82fecddc6ee519c931a007ed9d261dd5cb7e0832c3175bb696888fbb7d488b1a04094bba3d940a5b57344f3b78c6
+EBUILD clientcookie-1.3.0-r1.ebuild 654 SHA256 e28f36e49da799038119b8a98474bf336d3e08c5a1a7e987d8ad610f252187ba SHA512 276d71519bc9b147db3b0e0cd91bb870f277831d4198be2bb3b71f7a77df86e4cb0f597421d2562000353f0cae4ec4e28a7f7419c0208df86e8140fc3bf422bc WHIRLPOOL 9547a1b258532186ea8ea9f7ee8f8a0247ed30d99aa1d78107b624a9d51fb4a448b158ecc1c9d365bd42d81f86f56f16b2bdd53bf4cab4369488c8f01758d878
+MISC ChangeLog 3147 SHA256 fb5c49a8e17c9d451973ef39b2222638612b242e0b3103ab1ba719d4ab3bf063 SHA512 e75b7e2b7c50dd515bd7e407b97c66d4052b58d7dabadb488fbb3b705132ae17df38600c2277f25decb9fc865b1568f2e8c2296583e2d43165ef8fca4005fa3c WHIRLPOOL e08d77d149b1cb0da8fd81851e9d6c09a898b08f9597c443d5a7779a26ba5244b71e8e38cc65102dfd268a77581c2553c6be6e2f807cd3463de4f1c4e9734ce6
+MISC ChangeLog-2015 3329 SHA256 7fab2fa8134703b931c5959d75dd7620c40752146cdf22f0e5cd4da338894936 SHA512 46edc09de4c94a2781d94b952f736c5b7be57bc170e79dd79e18b2745f82d3c82c9bb5e29810d989cfe7e3968f2736b0034f44229c31a428a4cd28bac865c591 WHIRLPOOL 7b5e2f229a5fd67131e3299cf9516896e8aa57e05f7c774c75ffbaa8aa23b3181d4a97dae83b282678a9dc0751adc083ef4a08aff92b0f74d4a10d5825d64642
+MISC metadata.xml 929 SHA256 bde1e55d6420f704d7d647d5d3723746fd8ca3b1abd2a70e69ba131bb30bf30b SHA512 3cfdde23672ae821a27cd5aa40597dd313ebdb915afae22f014e25f3fa86bda64330502cbe7a2535519b94bf60c1acc2a22d45529330517224fde6c9023f1a5f WHIRLPOOL c596d1acb1def7e9b0affb33a89ade65817aef51a854c6bf984f1d4e30ba39c5d54e9af53601f1e08594f763b86a03fed5d308ce06dfa6b30945f425f6145c4d
diff --git a/dev-python/clientcookie/clientcookie-1.3.0-r1.ebuild b/dev-python/clientcookie/clientcookie-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..329d0d3a3664
--- /dev/null
+++ b/dev-python/clientcookie/clientcookie-1.3.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P="ClientCookie-${PV}"
+
+DESCRIPTION="Python module for handling HTTP cookies on the client side"
+HOMEPAGE="http://wwwsearch.sourceforge.net/ClientCookie/ https://pypi.python.org/pypi/ClientCookie"
+SRC_URI="http://wwwsearch.sourceforge.net/ClientCookie/src/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="*.txt"
diff --git a/dev-python/clientcookie/metadata.xml b/dev-python/clientcookie/metadata.xml
new file mode 100644
index 000000000000..76ae290ba533
--- /dev/null
+++ b/dev-python/clientcookie/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+ClientCookie is a Python module for handling HTTP cookies on the client
+side, useful for accessing web sites that require cookies to be set and
+then returned later. It also provides some other (optional) useful stuff:
+HTTP-EQUIV and Refresh handling, automatic adding of the Referer [sic]
+header, automatic observance of robots.txt and lazily-seek()able responses.
+These extras are implemented using an extension that makes it easier to add
+new functionality to urllib2. It has developed from a port of Gisle Aas'
+Perl module HTTP::Cookies, from the libwww-perl library.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">wwwsearch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cliff-tablib/Manifest b/dev-python/cliff-tablib/Manifest
new file mode 100644
index 000000000000..1d6f70a82568
--- /dev/null
+++ b/dev-python/cliff-tablib/Manifest
@@ -0,0 +1,5 @@
+DIST cliff-tablib-1.1.tar.gz 80508 SHA256 4a8ed81f6678e76d0e0497f2708d0fe5d2b83ec442a03f982aaa711a08c74139 SHA512 26beea20ca1ba5c96276ce974c24bab572c6efebfe44ef45bd3ee6197593a34bf29843676a4e37fe400272f3ff59f703d60ff1abda22a1ca28c2434c0f224aac WHIRLPOOL e4aabd11f43d21f47ae281dcdfad4f0c40a85cf4e51e3e344e4ba7bb3f99148f89e285e3ad4a6f8cbab854539803d0ed11b2e943da18b57fbbc81c366f58e54f
+EBUILD cliff-tablib-1.1.ebuild 783 SHA256 f70b89edfca3523a9252f99d40d366e7aee2ee8eff9443ba721d5b2cc2fc4eaf SHA512 a5a9944931fa2e4b11aa06c8661d4ef35c6c064c41d32b41d9526678bd7182c4e31f73412b9727cdd64ea6853c4e1196c7bf239e0c7588ee27b6d6d14b3c5235 WHIRLPOOL 662cd4a0e367a4d35c13449d8427f24aa78120cb985abcb4abcd84f523f4bdb9579929ad72bacd5a39a35d5ab6f7de6eefe91171b7727808d476b065af716579
+MISC ChangeLog 2941 SHA256 867b15a2938078288c06db5a00057268c7c6dc0b3c78d506d4d60178278364c4 SHA512 3b2b632237b27510f203efec16117970a361057b7c4a98ff5f662333add28151e25986191a950def3ec4eb4ecfd16814f855b415c6d4655377316b59622ef29f WHIRLPOOL 61e4c5a3315483a707cecc8a0a6a4a844de15908d093db58ceda03f063df297f25260b8b6210eb2f6bb30e4c68643ea640e35e3e66c7cd0ba116171114c72be4
+MISC ChangeLog-2015 760 SHA256 28c8d40fde74f63f3354c42ba63d87fa8caaa80acba34c4a4caee7eb1d68d544 SHA512 a0dd662687099e32d6643c96ba5e69c52643383314f1440dffbfb2001a7339df84567a6d984ac5b6bac6588acdb37aef3c05be036776bce6237ce161bb6d5563 WHIRLPOOL 32bddc6477c3598f7dfce648c242c607c55f28656a4d8331bd1e08f1cad80920fc196a3c5ec810a095591cc561ac75cff7cdc4de32d9915ff9843fd8d4f6350f
+MISC metadata.xml 395 SHA256 9cc3e50af2eec8d0a6952996066e506bbb301c67bb8f20874ca9e0e915f5dc7c SHA512 874e5cc1c3b1c7341127ab43fde400a9341d9475f6c32f44b3f0faedd8e422324d703eaa814b9cbb4a5fe0ac13a09320c60f83f236cd51bd6247def77005e71e WHIRLPOOL 9ac3f9a7a90daf2f90c4236d593ba6d9026d5b177adbc8a28eb52927ddc6c93442d71ff2b38b2ce8e5761bbdb57f7334efc8edb38e9ed8b3fd20379dbb2ff442
diff --git a/dev-python/cliff-tablib/cliff-tablib-1.1.ebuild b/dev-python/cliff-tablib/cliff-tablib-1.1.ebuild
new file mode 100644
index 000000000000..69bd1a347ff9
--- /dev/null
+++ b/dev-python/cliff-tablib/cliff-tablib-1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Formatter extensions of JSON, YAML, and HTML output for the cliff framework"
+HOMEPAGE="https://github.com/dreamhost/cliff-tablib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="dev-python/tablib[${PYTHON_USEDEP}]
+		dev-python/cliff[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	# Use IUSE examples for installing the demoapp
+	use examples && local EXAMPLES=( demoapp/. )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cliff-tablib/metadata.xml b/dev-python/cliff-tablib/metadata.xml
new file mode 100644
index 000000000000..997d971b0284
--- /dev/null
+++ b/dev-python/cliff-tablib/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="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">cliff-tablib</remote-id>
+    <remote-id type="github">dreamhost/cliff-tablib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
new file mode 100644
index 000000000000..fbd0f08e0fbd
--- /dev/null
+++ b/dev-python/cliff/Manifest
@@ -0,0 +1,7 @@
+DIST cliff-2.4.0.tar.gz 58088 SHA256 cc9175e3c2a42bc06343290a1218bc6b70f36883520b2948f743c5f9ae917675 SHA512 2683e9c0ba56a473abfb08a4def07a1025930b9af100ba18ade7dccf1c73f2d4ddec1cd109ce948e379e41481556791c7620289af910243885a52273d936aef4 WHIRLPOOL b762fffc735ad70cc91f1dfb7a67bc62d07b1e71150e86ddbce8b8ca67ae6fce2de8fa6181b429bb616f421846dc08cc0f519b66b6717cc7ffadc4f2c2d52f45
+DIST cliff-2.8.0.tar.gz 71815 SHA256 a4fd35b3d98f5f806b6f38c97559ad671376f7d54d1e29015dbd6d805a13ff46 SHA512 a371916945ee71ec519aeb923ca44b0a0e10fe6e460d236434c5c2946ad2b517050bf9d0430bdde506bdf2d28ba60bd45941d9ce21d77a83e2d5541b088d04b3 WHIRLPOOL d2b2f0a0f0afc811a1d9df7c57dc473967bb79ab15debf6d61ca758914efa86f7d7d54308b7882ca688724462e06e72305650665b13959d33fe917e7077290a0
+EBUILD cliff-2.4.0.ebuild 1563 SHA256 3e2fc1c0747cf103f43c98d63daee4eae7185a4f165a51d5587613bb7f685c5c SHA512 3b2bb31bdafefa030869e8151ed4a5c8e78b6767c64a81b65f622cda8fabe057a1fd975d8a745e9dfea7586d49a27d69f7aa2ec106ea7dffe0e5d9b50128555b WHIRLPOOL f939debf1649f3a5e3a448970890c9fc39cc14c3855d7c262ef8f3ede3db836f8579d751a7004d8ac8ed27498203c4588d903c3f656104125430bf480817010c
+EBUILD cliff-2.8.0.ebuild 1803 SHA256 d005bdef2a90fde609cd45e63dd82f39fe6c620103690e17fe5b5fe220043488 SHA512 714dcf939b7044a111e7e40fd8efa141907ea852d4f763ebc4b39fd4bb792445d078f85132ede9171d237af386025c5743236fdb0d19daa3a59a70a17fc15001 WHIRLPOOL f230aeb89097d6df3291d144b49f012d52179741c313c7764e0823bc6274c04a454ee133f66de6be13a85ca486c91193117b301aaa42d83b04ba870a67ab6226
+MISC ChangeLog 4131 SHA256 0a0e162a87d119e894d8c02403eaf472f81a2c30268668564b61815b7b6a7619 SHA512 0c765b4b3ff7688c8c7feefd93d4ce07a336212e5506a4ede9ed65835762ff06d41c0518584e439ee70f79112e4a1881e9ee3a30c1c1e907ef329f4b93b3ed10 WHIRLPOOL c2ffc6c92add88c8f7797c18ed7a11035d2dbc8e68369ed3c1381f3f7a4f96449effc7b2007b5aae6f6d7cd3f5e0353a5620d369e19dc9a5a51cb2c089733c5e
+MISC ChangeLog-2015 3162 SHA256 a92bab088d7b7f245a34c061a1424a43decfa777b7d3422f3604458c30c68ef3 SHA512 5e27d5712f8009a88c624927aedce1f9bb444c8b9055e99c6a0bf0464f8857d82831591983d9869f63b53360034872fe0cc17951e0cc5a1167cbdc127c62faf7 WHIRLPOOL cb648eae0d09ad6d9aa679349ec0bb84ec5131788739d76df7479bc29f1b8582f9593d348cb20594c6d541bd17c98aae7170ecfcb916c2047b1b8008ddd86633
+MISC metadata.xml 709 SHA256 961ab702c18073b4fa28c2d3688adfaad01cb75b481fd8229a5d28305a4a87f2 SHA512 f031fa34d06b4c12c8eba5a046c07f1e391fd84bd29d6a4ca8c769c2d774262d66d7bac12d05cb8ef669db7e2713d6862b6a118e9f9ca810e9ae0fa9fb881892 WHIRLPOOL 26f1b36e9f649b7cc1eb263dc3849838170f068d5ad09509651efd6dd907038ae304b810042bf38e09c8f827540db2a91637ed07e8cc201841a82a482f1cea22
diff --git a/dev-python/cliff/cliff-2.4.0.ebuild b/dev-python/cliff/cliff-2.4.0.ebuild
new file mode 100644
index 000000000000..f84e3bbca81b
--- /dev/null
+++ b/dev-python/cliff/cliff-2.4.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command Line Interface Formulation Framework"
+HOMEPAGE="https://github.com/dreamhost/cliff"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+	)
+"
+# source files stipulate <sphinx-1.3 however build effected perfectly with sphinx-1.3.1
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cmd2-0.6.7[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.0.7[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+	>=dev-python/unicodecsv-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	"
+
+python_compile() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	nosetests ${PN}/tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cliff/cliff-2.8.0.ebuild b/dev-python/cliff/cliff-2.8.0.ebuild
new file mode 100644
index 000000000000..2e42d79a7e28
--- /dev/null
+++ b/dev-python/cliff/cliff-2.8.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command Line Interface Formulation Framework"
+HOMEPAGE="https://github.com/dreamhost/cliff"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
+	)
+"
+# source files stipulate <sphinx-1.3 however build effected perfectly with sphinx-1.3.1
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cmd2-0.6.7[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/unicodecsv-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	"
+
+python_compile() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	nosetests ${PN}/tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cliff/metadata.xml b/dev-python/cliff/metadata.xml
new file mode 100644
index 000000000000..79cf3eb1a5d3
--- /dev/null
+++ b/dev-python/cliff/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>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Cliff is a framework for building command line programs.
+  It uses setuptools entry points to provide subcommands,
+  output formatters, and other extensions.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">cliff</remote-id>
+    <remote-id type="github">dreamhost/cliff</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cligj/Manifest b/dev-python/cligj/Manifest
new file mode 100644
index 000000000000..0d3222388969
--- /dev/null
+++ b/dev-python/cligj/Manifest
@@ -0,0 +1,3 @@
+DIST cligj-0.4.0.tar.gz 7281 SHA256 12ad07994f5c1173b06087ffbaacec52f9ebe4687926e5aacfc22b6b0c8b3f54 SHA512 35c075192f39c7c756a5abce2cc706818a5c40ed91d25a5763483b01acfffa29b50ce58e758b0ca42431978e436ad45a93049e05c6dd0a98da40d74c4a329669 WHIRLPOOL 4068e6e54cfd064e5ab76f3653556070f5fdfaffc9fa8a3aa57d97a8020c01173e471873524f47d119ec7e624cf97386cd63db7c1c03f6aa96816f3fa9d27759
+EBUILD cligj-0.4.0.ebuild 540 SHA256 a9c63dd6c73c73baa348663b2e3808372973069d44ca2ece531a046742d8c0ad SHA512 2623854723f00fa734e24bdffd09839a309ded159b5a59a01ea5698c36d1ae221d3b46aa843ac1b9a712081e8cf48fc230a8a17a4e46341349f2936a9e75241a WHIRLPOOL ce5779acda6f4480d1d6603100649aab34cfebad120dd2d3f02124a5d174d33a62b434cb94ff7e6e17c17decb14393495f7576e23b991e448256d116744d698a
+MISC metadata.xml 345 SHA256 8249b55cc7d776f7be9a2af687c5c2ce2476f9180f0230715db824a9c91562ed SHA512 a9339c6f4320ad67867db9436b328856a253450f2e10ce5ddb11c62ad1fabe60434bd74213877efcfd390ae424b3276bdf0efa28a1c050cbf76d4d24b391354d WHIRLPOOL eb467bc4de53f98c9f068d71f83e2b37dff2b0e3791179d67f667b067ef2a1f9856be935ba398ca0cbeb31315e88e9c920988a9a3ed96198c81dc7d15c0f907c
diff --git a/dev-python/cligj/cligj-0.4.0.ebuild b/dev-python/cligj/cligj-0.4.0.ebuild
new file mode 100644
index 000000000000..9ccb035f27d1
--- /dev/null
+++ b/dev-python/cligj/cligj-0.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Click-based argument and option decorators for Python GIS command line programs"
+HOMEPAGE="https://github.com/mapbox/cligj"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/cligj/metadata.xml b/dev-python/cligj/metadata.xml
new file mode 100644
index 000000000000..40d5bc01d252
--- /dev/null
+++ b/dev-python/cligj/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">cligj</remote-id>
+    <remote-id type="github">mapbox/cligj</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/clint/Manifest b/dev-python/clint/Manifest
new file mode 100644
index 000000000000..fe3e59438c34
--- /dev/null
+++ b/dev-python/clint/Manifest
@@ -0,0 +1,10 @@
+AUX clint-setup.patch 472 SHA256 5a0dc4cf2176f2ce8df4123728969747766e308bc2d625e1e30a97f7a0b78b3c SHA512 724359b3c5b5de60c8ba9c396361c584b09de48c3df0fd8e65dc8de0c1cabb6a9aa5ad7aa1e4f19ae9c97bc17f8f74ba84f47e2a0ce9ddf92627b501c66a20e6 WHIRLPOOL 2e212a65da1a7554f36c43b8a971c74dd4e145b044f7bc35d7d94ed2ec81c0d5d9bd9411026ba0fa25868c162fa6b0f4f7c5f440e986401873692a696b511450
+DIST clint-0.3.1.tar.gz 147154 SHA256 faa94e073e1c8d26e67b34ef1d69d6cd92bd06e87a94cc451d587b4c8b965e1e SHA512 c7a1ccca82d1530e9501f2f854a90f4840cdb4bc2536c8eca30832f156c0898d02d9b839be6b9bf0425b1fa0f94940ef223c55cfd50c183c89b3822ca90b4aba WHIRLPOOL 2da1e651c8b9f038261de3c8908cbbc737debea6475c9268d1b1c48bef8bfe5795ba6b931bbc614431e7798823db6e1ab1e7aead3db91141a3b9752076f24b0c
+DIST clint-0.4.1.tar.gz 80383 SHA256 6709b638fd13fc2395284d0d42fe857ce97fdb6f03929ceb7ece28393933b4ea SHA512 8ee4fb8d7e5416c0c1c6c23abddb255521a7d682cb855a9fe2446137e83f739a1c44c135a05803632b896fa39400c33f44e5a78442af21bebd3cf66d28fbc9fc WHIRLPOOL 0dd5c062d025bc6ebfd304b056f75294eaac5868afec2c0c2403f380c6e2043478280b2c5ce575060af3939cdcae71d4ebc62b40edb011216535b115ef29c379
+DIST clint-0.5.1.tar.gz 81140 SHA256 cc2ac47fca097d6235fd12e70a4984a63c4ea1992eb0cee04fe8ed13c88544cd SHA512 3ad8bfc587acb1322c7d7c3e73756a07c98f3b4215a3d4dc409b5a2067bc70dce2dd98d19250b8122b319b7bcf5e2859251de2829780345de06f93b35447c4e8 WHIRLPOOL 46d92ae120ffc6b36237d13e3b8036f7d0a8d8f5b79ae9a0f9a3cbfa7c6f4853a5d4227efaa74d451525fd07df9cc3992c7d99309e08af44ff173b174105d0e7
+EBUILD clint-0.3.1-r1.ebuild 930 SHA256 97d157f8cd430b4f0dad6ac2c422889be7d4d4ffd288d318fa2ebfdfc125d307 SHA512 c0e48dc14c8188113467164a762106d9d623f0e41a4a04fd7fd26807894154c3964fbaf51a8f665f6bea30ed38d580517c25182735dbaab3939e8675dbd0399e WHIRLPOOL 140e774f39071baa94dbd21154f92763f148e0f2113896fff595b48d0a00b2a3a25db1ce64f0286e29d1a2b9811e3954db1986c060cb10b2722c4f996372b933
+EBUILD clint-0.4.1.ebuild 878 SHA256 556190980f60916e73f5f79f2e3d2e91b25eb2a3092af11eb175c9f4c74f4b1c SHA512 b56bfbcd0f365d5c5384036c5aeb38e93a5d802f29397d4cdb1b983013c2b11f49764f7f0835d8bec2605aa3cb7422767130a518e631cbed86b5e50b8c0e16f9 WHIRLPOOL dcec1042ba43ffeee8b4b652326988622343941460518cbcf7fcf22fa99c883ad5bfceb7f26badcf7c2212ab06be2c87e0ad56537786fb8429f79614671e4356
+EBUILD clint-0.5.1.ebuild 923 SHA256 6804d1405e28233c45e2a59a991aba7490a19443ba4d3eb81c5a04aa4f9b7d03 SHA512 b1b3c507dc548aac6160de1caed265e4b3c09bd37e730934e87f1b3feb578f4733c26ca545ed5703a5dc1d58a97baf9378f4836e445e11841edf45bb0832bcb9 WHIRLPOOL 082b331ac534f1eb4fc50e69660b038370555db8bf8963e2b2f6c61daf7f97bcf753af7a6a6bce25674ccbc928a410206e5a8d1a866b1b24f038652894226518
+MISC ChangeLog 2877 SHA256 ebba64a523afedf47a7c339807b11d8c8e69477df3d3700f1276cb8b32aef92d SHA512 178a6d8d22b5b373b30af8e70c4d1cfc6b7ba7b6e03a56066f157608b01970e11eb789f2e2a6870cf59d3816d87b7bf4ff28ad3851d524a58437093235adb1ae WHIRLPOOL cf57db9b74f736e9d886e590fcc8d21251a196cd6ece69705d9848e10cbb4697beefd4dc938e2487844cb5f9ae5aac79452f5c5d90cda197cf0f0906fd3942df
+MISC ChangeLog-2015 1183 SHA256 2b82b4563b13428e01673dfd2e739b82f7e5eeeae464f889c82e12a246c06901 SHA512 f8e1d7c26a61f057ef2bba8b1838215795de9069a985a80ceaf67db7f201235a134fb09a68442739be621bbacfc93e970ff24f044079349a2c0bd774dbb41634 WHIRLPOOL abc475d5eb8c052c0449d3bbf31bb388d0c74614ea28ec657c52899de9e9bf01e249574198866ac3272cfcfcfdd99ccddd4ff37a4f05e2aab35daca932ae85c5
+MISC metadata.xml 329 SHA256 b3d86baa07a1501291db0beb8147239324d7c43deddef5b5aca2b4764b85d39b SHA512 e6bba4e5404f386a333388d79a8f4b614d577c75bee743b9d181c131f0a5bed7c9474820cbbaea0ce276e065cb463e047292e05e05244ae7ffadcd182965bcba WHIRLPOOL abdf1a4171649866d892bbb8731c858958ecad3a2d01b73639efb463243d41b1794de0afbb39bac09f3b6aadc98c0f5e3cf3093b7312070fc2aad9dd693a303c
diff --git a/dev-python/clint/clint-0.3.1-r1.ebuild b/dev-python/clint/clint-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..3293dc7c5aa1
--- /dev/null
+++ b/dev-python/clint/clint-0.3.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python Command-line Application Tools"
+HOMEPAGE="https://github.com/kennethreitz/clint"
+SRC_URI="https://github.com/kennethreitz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples test"
+
+DEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+# Prevent install of files to wrong location
+PATCHES=( "${FILESDIR}"/${PN}-setup.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/clint/clint-0.4.1.ebuild b/dev-python/clint/clint-0.4.1.ebuild
new file mode 100644
index 000000000000..f62ce78024e5
--- /dev/null
+++ b/dev-python/clint/clint-0.4.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python Command-line Application Tools"
+HOMEPAGE="https://github.com/kennethreitz/clint"
+SRC_URI="https://github.com/kennethreitz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc examples test"
+
+DEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND="dev-python/args[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/clint/clint-0.5.1.ebuild b/dev-python/clint/clint-0.5.1.ebuild
new file mode 100644
index 000000000000..a7d30299689d
--- /dev/null
+++ b/dev-python/clint/clint-0.5.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python Command-line Application Tools"
+HOMEPAGE="https://github.com/kennethreitz/clint"
+SRC_URI="https://github.com/kennethreitz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc examples test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND="dev-python/args[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/clint/files/clint-setup.patch b/dev-python/clint/files/clint-setup.patch
new file mode 100644
index 000000000000..960dc99be429
--- /dev/null
+++ b/dev-python/clint/files/clint-setup.patch
@@ -0,0 +1,15 @@
+setup.py installs data files to /usr/ !!!??!!
+diff -ur clint-0.3.1.orig/setup.py clint-0.3.1/setup.py
+--- setup.py	2012-01-16 22:25:54.000000000 +0800
++++ setup.py	2014-10-11 12:20:29.174133572 +0800
+@@ -29,10 +29,6 @@
+     author='Kenneth Reitz',
+     author_email='me@kennethreitz.com',
+     url='https://github.com/kennethreitz/clint',
+-    data_files=[
+-        'README.rst',
+-        'HISTORY.rst',
+-    ],
+     packages= [
+         'clint',
+         'clint.textui',
diff --git a/dev-python/clint/metadata.xml b/dev-python/clint/metadata.xml
new file mode 100644
index 000000000000..8113e80dffde
--- /dev/null
+++ b/dev-python/clint/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kennethreitz/clint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cloudlib/Manifest b/dev-python/cloudlib/Manifest
new file mode 100644
index 000000000000..5ad42721afdc
--- /dev/null
+++ b/dev-python/cloudlib/Manifest
@@ -0,0 +1,5 @@
+DIST cloudlib-0.5.0.tar.gz 117422 SHA256 e4dbd5293254d11c382ce511701be5c3aa81deb1e993be27d0744226fc7335b8 SHA512 fc400b89045706638fddfed5a6bc5e48995106dc02a216bbe8ae32e7a01c1d4d4fd2a22c7aa914a7fdc8197639f82d41cc2d7071873234e171d3fb7f434cdabc WHIRLPOOL 91d0b51f9cf78e34f647f912d1e56561ac1529d8ff598c1dd893fb9d728fdae4cac4bac4b1d01d3b90660a5523834259e8f6a42c834ac7f41e1ad4bf8294bcc7
+EBUILD cloudlib-0.5.0.ebuild 646 SHA256 136cbeff02ef56a084cc022d8b65eb7eeec6eab5e609d07d22a882e957c64440 SHA512 52a37dfdcbea55db9809a11b77d82cd8f3f381091e7268bcd520a65b2db20473124feb1aab63b16ba2b29d8e813fe21805be904c3d85df7c528a813ec9e3c9bf WHIRLPOOL 62d9516e30b86c5606ce4a41bb3378e52243be44909464172965d52f669aee7ae2a48292d7a45c1f693042e9ab2f0f5fc5bafe32f33232f76ec66f951497934a
+MISC ChangeLog 2691 SHA256 f56c9864b453a59b312b0eb40fdb88be4d6e8c5ff787eb18cc7a649cc341648c SHA512 7a66be310143db616547679bb531aba15ebe19c18090003b60fbf57564af74390fb45fb1677d7acde7c697201f5fa2f88dc34948a708036a0f0251f2447e3466 WHIRLPOOL 65b785642733b08e0c05843de365860c466b82a85b9bb0368f6e0d59c8f696dcb1605f2a23c076254cddc5fa5581177a7a21642f28b2c91d07389b91a549df29
+MISC ChangeLog-2015 694 SHA256 819ef19c47a1af06ec7d4bd23bf683c8e055a5517ebf45bb2483880d6bf4b188 SHA512 7c252c7f28737129a215d1c92f81be67899e8aee5617e2d0bb3797abd572e4a9b599761b0474661cbb12b059b14871595b2ce4fecbf35719ee750f9fb2f4cdcb WHIRLPOOL 9b637cb3aab6864dc7d84bbda0dfecd3e6a1e663d7b1619cac788cc141e0bb02eb5dd6e823b2eebae9c26ecf561f5a8fa27d4c95af4e624e359397777528becc
+MISC metadata.xml 597 SHA256 fb8acf70c3736fb77e5153b715ffa77e0babd4f977c98cae2ab953d67d1245ed SHA512 94c2a4bbbc2e6d33444e1afc6f18923a35fd8c3794cbb59ef5d08fcf8bd9ac029901b0b4b78ff75563eed0afa707083e9188408d2b54f137da710e3cbaba0074 WHIRLPOOL 6cdbd145ffe0c91cb87495e6863c9b50783224cb1af7697cca366ad656e5ae7336eb11663969856a26fe9e021a52befae34242e43997da8c68500d138cdc11a0
diff --git a/dev-python/cloudlib/cloudlib-0.5.0.ebuild b/dev-python/cloudlib/cloudlib-0.5.0.ebuild
new file mode 100644
index 000000000000..e09914447d70
--- /dev/null
+++ b/dev-python/cloudlib/cloudlib-0.5.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Cloud middleware for in application use."
+HOMEPAGE="https://github.com/cloudnull/cloudlib"
+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}]"
+RDEPEND=">=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]"
+
+python_prepare() {
+	sed -i "s/required.append\(\'argparse\'\)/pass/g" setup.py || die
+}
diff --git a/dev-python/cloudlib/metadata.xml b/dev-python/cloudlib/metadata.xml
new file mode 100644
index 000000000000..ddb35c23b3eb
--- /dev/null
+++ b/dev-python/cloudlib/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+Cloud middleware for in application use
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">cloudlib</remote-id>
+    <remote-id type="github">cloudnull/cloudlib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
new file mode 100644
index 000000000000..1bb92c7d1e1d
--- /dev/null
+++ b/dev-python/cloudpickle/Manifest
@@ -0,0 +1,8 @@
+DIST cloudpickle-0.2.1.tar.gz 15514 SHA256 eea4b655e6aed3dba39b104ad1872226e3f9e23d8d202fc003f3e65f2d125c3b SHA512 ab098186c04db1947fb6c4c92bb4708b0c45122adf0435f5da70a0cb24c08cf6d36ce627ea112a8ad8d0107a28b12259435c3e1aa2ab7a6f8f4122e5ca756e2c WHIRLPOOL 66c3b735e592b05bdacb8fecc75a0d4e81751670f06eac2049a5d02b2a8dc1e1fbb66ef039d7de6f85175ff6dd7f6f635290f25937af02d6d640894a959778dc
+DIST cloudpickle-0.2.2.tar.gz 17020 SHA256 9da26af07a25431d8a3c412d4c8e78823c1298655d354f4f570ece1b995f8e74 SHA512 798b745d4059c34026a785fa32e6ac68aea689b3f4f8fa08d625eebe65651eca55211d104e9eab315c7c22dc720cbbad88cb1a444dac51ff457bff8d26c43756 WHIRLPOOL 05dd06818f6d53a2abbd936244ce6efdeaac49df0caa9a6dcabaacacd11157126f09f6432263d8eca94b913b6ff1a510c5310d56241e8ced32a4fefcf2329c1c
+DIST cloudpickle-0.3.1.tar.gz 18927 SHA256 c93a2684080011bb72fb59210c48b7259da8241bdcc6fa3f425ecca090e8c17e SHA512 81ea17181710f3428bc9c80e2e4b1fa57eadd6781528ed92ce5854ce86cded0b754d98afccd322408786ce4e3a77a1c758be73f197d809dad07c24e9dbb7c68d WHIRLPOOL caa3462abe4b131aed016918525674bd3831910dffcf435f96163573ab19d71b6d0fd671a94e9b24fa1acd97cb7c8a98f2fbc2f9a9c5f16b009d4963d08c1572
+EBUILD cloudpickle-0.2.1.ebuild 652 SHA256 fbeffbae6b1e4e4128a16fdddbc2457dc8abd756c221eacc5fa955ca889fb26d SHA512 26ea3a68f21cdf9c179d1feb96417968e85d4994e52cc361557d736577f67fad65cfc69dcb5619f250170842a5f692f6a5222066be0314cb5f3081203b48859b WHIRLPOOL a780718a722fda6be6570440fb96556ecb37ccb95683f36f497500e2f320d05144d2d088c1578cccfb54d6700802cd65dfb97a770e90736f3bb7cf31377aba21
+EBUILD cloudpickle-0.2.2.ebuild 658 SHA256 060690df56735267d05d110b16f6763ab016c28fcc97fd48c3db993f14d6783e SHA512 6b1a3466b80b75e801fd08421327933b1b402de789e66ff0b07b8f47c2c69bf76986e5594107fcec3cfabb0f9b9544611cbfa7e8b74ae4449eded5b3c34ac6da WHIRLPOOL faf2283e1581a10db09367518cdef0312ce8b5a7ff8005b58ab4a244546d4876a4dfd21126e01652d9c1c4cefba3ba4df35833326ecc797a256b8bf792e8b7d9
+EBUILD cloudpickle-0.3.1.ebuild 658 SHA256 060690df56735267d05d110b16f6763ab016c28fcc97fd48c3db993f14d6783e SHA512 6b1a3466b80b75e801fd08421327933b1b402de789e66ff0b07b8f47c2c69bf76986e5594107fcec3cfabb0f9b9544611cbfa7e8b74ae4449eded5b3c34ac6da WHIRLPOOL faf2283e1581a10db09367518cdef0312ce8b5a7ff8005b58ab4a244546d4876a4dfd21126e01652d9c1c4cefba3ba4df35833326ecc797a256b8bf792e8b7d9
+MISC ChangeLog 964 SHA256 cb076a7c1f078027173f6b0f2e4b818006b3b08c103472a02d6abe3ccedbe578 SHA512 118f1b5769607b97563c3683776faaeb8d40562d0ed5dbc6d6e508c2ea350353c1e8f47921a005029d06f9b60cbf0163486d8fdcf2527a35b24fb32df93221a0 WHIRLPOOL 506aebbeb69fe8bf66ef0eba4763ccaae38b569ddb4823e34f1209ddadb410678156b3173eb601e3ca891a733363d6cbae4a81d10fbfb06224d27a95841c502a
+MISC metadata.xml 324 SHA256 d3b6989805fa53a4cdea817701466f32a99a5ca5b196c24484ccf840f80f837f SHA512 2f331643b833ea7d97a6e24c21c6583e590204a38cb9ce77361ed7833e35e8c23dfc2b1b430d0e0cf2e45c0781b624f31deb4df6df8044b8dd34a5be16c3b3be WHIRLPOOL 6d6be7c85ba78bb8a8eaac825cdd79888f69efba924384745e6e63b8ff4de69f0eb6e0e138af1ad332d38064b55ffdbe9f6ffe16049aa4c9c7001744711bc752
diff --git a/dev-python/cloudpickle/cloudpickle-0.2.1.ebuild b/dev-python/cloudpickle/cloudpickle-0.2.1.ebuild
new file mode 100644
index 000000000000..0552d56b4a30
--- /dev/null
+++ b/dev-python/cloudpickle/cloudpickle-0.2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+inherit eutils distutils-r1
+
+DESCRIPTION="Extended pickling support for Python objects"
+HOMEPAGE="https://pypi.python.org/pypi/cloudpickle/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+IUSE="test"
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+	  dev-python/mock[${PYTHON_USEDEP}]
+	  dev-python/pytest[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+python_test() {
+	PYTHONPATH='.:tests' py.test || die
+}
diff --git a/dev-python/cloudpickle/cloudpickle-0.2.2.ebuild b/dev-python/cloudpickle/cloudpickle-0.2.2.ebuild
new file mode 100644
index 000000000000..3c344a15bc7d
--- /dev/null
+++ b/dev-python/cloudpickle/cloudpickle-0.2.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+inherit eutils distutils-r1
+
+DESCRIPTION="Extended pickling support for Python objects"
+HOMEPAGE="https://pypi.python.org/pypi/cloudpickle/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="test"
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+	  dev-python/mock[${PYTHON_USEDEP}]
+	  dev-python/pytest[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+python_test() {
+	PYTHONPATH='.:tests' py.test || die
+}
diff --git a/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild b/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild
new file mode 100644
index 000000000000..3c344a15bc7d
--- /dev/null
+++ b/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+inherit eutils distutils-r1
+
+DESCRIPTION="Extended pickling support for Python objects"
+HOMEPAGE="https://pypi.python.org/pypi/cloudpickle/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="test"
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+	  dev-python/mock[${PYTHON_USEDEP}]
+	  dev-python/pytest[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+python_test() {
+	PYTHONPATH='.:tests' py.test || die
+}
diff --git a/dev-python/cloudpickle/metadata.xml b/dev-python/cloudpickle/metadata.xml
new file mode 100644
index 000000000000..82e3626e0383
--- /dev/null
+++ b/dev-python/cloudpickle/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">cloudpickle</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
new file mode 100644
index 000000000000..811996fbcc75
--- /dev/null
+++ b/dev-python/cmd2/Manifest
@@ -0,0 +1,9 @@
+DIST cmd2-0.6.7.tar.gz 20558 SHA256 8e98c7a1cfd106183559240b269e7cd9fe97e8342b5c05295f591aab6fd2f4f0 SHA512 a37393bd9ef6c3ece02249b5a4293a25889ebd68120ee592d2ccd77a8e3e4ab3ba724e0be7f3c98a453dbba30c1851c7f690fbe69711df8a723545f8dbe38607 WHIRLPOOL 9da375c5ab0e1cd0f13e67b1b168b5f87be7f56bc758589b1e41959f3e14b07ad1e055fc2fce6d44ded77f806217b6bbe590009fec27c9179922ea764db0b86d
+DIST cmd2-0.7.0.tar.gz 371786 SHA256 5ab76a1f07dd5fd1cc3c15ba4080265f33b80c7fd748d71bd69a51d60b30f51a SHA512 13f9777908dabcbf9c81c0aea371c7c55e413616dfecc75b51b18e38b286656c9fc2b7368c859585a70d574c9c04413b1e65a5a58aa878f90283c31a54d49465 WHIRLPOOL bc3e65aed413a8b243de8b5a770a8ab4ffd1ba5d0c2db2e1ad619eb051fe5ff6b6e3485e121e2a8aa8d0c7a0c51633de1a23220f0189f0f17fa75ccdf7a14c5a
+DIST cmd2-0.7.5.tar.gz 64939 SHA256 7a47afafc5ad45649a2998df8d96f39d8e1d0686f55c785285889e45151ff75f SHA512 14376ee283ac1c153ab0194a5dfa168eca36174783322ff72e190ed96b8c315518fef4f3ef09d77633851cb53b32f71fe380042ee3c0ef8ef2cbdfa16dabf704 WHIRLPOOL e8955c7d237111fe6486575ed1e22db132ee1f3959b0737c41667b3bda65256610cabd9a1ba64c9766e07a81afcae0d2780e196a739ac14bcd615ecc940c4792
+EBUILD cmd2-0.6.7.ebuild 648 SHA256 6dc3f2c559368ab3b3a530aa9d64ec3613ba3bf2da7117e79e264603fe489eb0 SHA512 5956c34777cb991ae9b2335b7d9de24f4fe04e01fe20ef4c9e03e1d31377432298057597b442f013bba633ff2199b9935f311aa5d49b3e803c16def38258194f WHIRLPOOL 550920361faf11909eb64b5ace66f0e5304fe7cfbc0ae128ea02f6bf243d30478aea57798fc7275a79892cbd74d33e6624bb79644b6c395b2a294e6b1e5ecfad
+EBUILD cmd2-0.7.0.ebuild 1019 SHA256 147e582093333e243f7e0e97502a7c01d87918b8bd619dc77c9d66306541695f SHA512 f6444262e02581ec916146b70fb33f3a9deb724bb20a325d064f84d3da4a093aa8f4c1906d32bf14e6d2833b9c02b90f2352496610d353aea5f7d897e9d89e9e WHIRLPOOL 645b00d0a113bfdc2017c6492c5bee20c12fe86e4863b0f28a30329abf50aea6a67a9b2d59e323771beb73bd8aae344dfa42244a873529fe1dcb2be322746943
+EBUILD cmd2-0.7.5.ebuild 903 SHA256 92876a6508c8a5da4f88fbd4c92f058c3e1376868f7e6f7dd66b7aecf76e151e SHA512 e99f600e4ac11649242aa8155245e109cfee733915b59edc48f76c2eb48cbc0c6649b21781760ef5f6d006418e5e1dc6c4069d6943613881533d25a63dcdbe39 WHIRLPOOL 5e01e301fcc6674e7f239737b20590387da91158dfbc71f360abbe6dcfbcf19a16de5fdb4e490a330b17ffb4672e7c3d269c4737ab991583312c25e8f51c59fd
+MISC ChangeLog 2892 SHA256 d6b70c95c92783bd78235a4ad1cd0d2d8cce5537e08870711b88560b2ceca3cd SHA512 fed6f19cd5542f1c45ad976edc17ee4fac462115e3c11ca9c5e46b74cb91e0bcd9f87b603b731d71ccc3451dfea9e72696d451f00bb098703d0280095e723fa4 WHIRLPOOL 4a2e03ecea307d77ad9b8b410b2053d2d505900bd9c0e1612b5c3c0558b3ac55165cc06077585f45cc30db91450528308a5c6e11063bb1f2a9bc19e3a8636366
+MISC ChangeLog-2015 1907 SHA256 5e6bd89d05a272f8c3e6fbac03a8aff2ee1cc74a7f8d182d6683868d6470013e SHA512 2b864d2b9d62852eec0361f00fafc7de6465ba99719ed3fa8c7da08712be26b9d01eb8e11136b6770106099c8855412426afacc180591fe5f1134919159fbc6e WHIRLPOOL 61b7c898ad4a95a74b7005b04a4338536e07b31c7871fd658a47a38f3e897a8e0e8cfa8a4eb2054994b7717c5bf766e12cd6e3a34a3a4a141d80afe2e1a38d68
+MISC metadata.xml 665 SHA256 2af2c9713f2c8e46eaad44fe604c5dae7c6a71a01b55bf012d6f4655b59f495f SHA512 64183ffbb33f229d4295e6fb34d98603d38da0241c6d1593704da866c17e04c9fe7f9500a1256b6e83c919eae019f71da93fdec7f09db99e073dbd809144b735 WHIRLPOOL 0a8c518c5d49917d47f80e85e446e58b306bf41586c68f2afc13e06dbb8091c5dc91b784be8b224eeaeb63d463d9f28891a57f2e234c25cf0a47545b8fffc651
diff --git a/dev-python/cmd2/cmd2-0.6.7.ebuild b/dev-python/cmd2/cmd2-0.6.7.ebuild
new file mode 100644
index 000000000000..7b9f19dd3fd1
--- /dev/null
+++ b/dev-python/cmd2/cmd2-0.6.7.ebuild
@@ -0,0 +1,25 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	"${PYTHON}" -m cmd2 -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cmd2/cmd2-0.7.0.ebuild b/dev-python/cmd2/cmd2-0.7.0.ebuild
new file mode 100644
index 000000000000..f78dccb5941f
--- /dev/null
+++ b/dev-python/cmd2/cmd2-0.7.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Disable failing test
+	[[ ${PV} == 0.7.0 ]] || die "Please remove the sed from python_prepare_all"
+	sed -i -e 's:test_input_redirection:_&:' tests/test_cmd2.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -vv || die
+	${EPYTHON} example/example.py --test example/exampleSession.txt || die
+}
diff --git a/dev-python/cmd2/cmd2-0.7.5.ebuild b/dev-python/cmd2/cmd2-0.7.5.ebuild
new file mode 100644
index 000000000000..ec6f08da2a32
--- /dev/null
+++ b/dev-python/cmd2/cmd2-0.7.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# restrict tests because pyperclip is fairly unstable...
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]
+	dev-python/pyperclip[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test -vv || die
+	${EPYTHON} example/example.py --test example/exampleSession.txt || die
+}
diff --git a/dev-python/cmd2/metadata.xml b/dev-python/cmd2/metadata.xml
new file mode 100644
index 000000000000..826d87260797
--- /dev/null
+++ b/dev-python/cmd2/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Extra features for standard library's cmd module
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">cmd2</remote-id>
+    <remote-id type="bitbucket">catherinedevlin/cmd2</remote-id>
+    <remote-id type="github">python-cmd2/cmd2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/codetools/Manifest b/dev-python/codetools/Manifest
new file mode 100644
index 000000000000..59d476bd6bea
--- /dev/null
+++ b/dev-python/codetools/Manifest
@@ -0,0 +1,5 @@
+DIST codetools-4.2.0.tar.gz 117891 SHA256 a93452b3f421bb5f9f18a74d404661433e189e29de3a4b9cfe92544e69be9c2c SHA512 8b63b9cb65966db72f3d2b054559fadf3008a4f4a7fc66ff12b046ca18568694c9d11066d6450e38b053b73df31c8a136729d7052bf8e21f287eac220ddf5dbb WHIRLPOOL adf4f8f3a516cf14cb8c71a4874b80c09814b017872be5dbb7768e506fecfc76d59805763d1cf3dbfdf941f86efd3893545e314932bad93c461a4468cee5c15e
+EBUILD codetools-4.2.0.ebuild 884 SHA256 cef4204e6dd94ed12cf9140f8f3507fa790edbdf692156959148361a4a00686a SHA512 8dc27482d89ebeb4e8c038e04dac0b0c7cdd5389010fdc96d1464a3936074f050fb5590cca91953e77dddeeadbda3e2fc9a44125539acc375b649f4bc06ba857 WHIRLPOOL 37f98d480213298a39797b1b07011347f2583048c20a3a4e2ba6cdcf49eaf04b968e04511797fbdb1aae81a601cd15dabba1d657994cc215fab8ec1efbaef695
+MISC ChangeLog 2435 SHA256 8f4b5b7323e3e86ffc2a9e3ff4a5be95546b9912705a89c17315e95c924b4c65 SHA512 e44c59a512b6965a40213e4310784bce9b845bd27c0dfdef9d107ade3630a9f1536852020d5a0776d689ff8107573c6521c7bd85b47abeb1abd0062b5ef78f69 WHIRLPOOL 260657e6a635421c4ffca3f8927738379ba2820c62767e037920d13879f6e3a5289f83f3a893c9ad470848618ae87c3f265194fb09f48fc90fdb6fde07ee457b
+MISC ChangeLog-2015 2881 SHA256 6cf806648dbfc08b0d2233dcad94ebd7446133da891d87287d5a5c48e19d4760 SHA512 7f3f8c51b9e237d67ade01cc5d19970a81d1700e74133bd916d7983294bf45da0a6ea3962fd2ee1fd44990435945f510174a7524297fa6f3ff4eac27520abc5c WHIRLPOOL 651d21a8af3965ce86ef7093cdc3c442bf437cf998e45bfbdf02cb17dc765e3043d9cd2638cb65a4ba1495d00fb684058509462f2d49939a4e00dea1dd7d19f2
+MISC metadata.xml 1134 SHA256 0760803d0d877ea19e643f08e8ef54cb3b946fb60067d3c2b95a438286d4fc4c SHA512 764080f26934d139d4fbb11a55c40d4342d1fe2132b4291dfe5fb0f558ca3ed26f3e61d335b343c4edd8812bafbb084098f5f0622cd78af785a21f6f6b4c668c WHIRLPOOL 9623652f4eebec688de5c6979d07c75fedbca2573205436387d449d344cb5e8d98c871e7052008dd846af16859e42d6d133a61ffc9769ac7671b5c008a70777a
diff --git a/dev-python/codetools/codetools-4.2.0.ebuild b/dev-python/codetools/codetools-4.2.0.ebuild
new file mode 100644
index 000000000000..cf645d00d48c
--- /dev/null
+++ b/dev-python/codetools/codetools-4.2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Enthought Tool Suite: Code analysis and execution tools"
+HOMEPAGE="http://code.enthought.com/projects/code_tools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+IUSE="test"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/scimath-4[${PYTHON_USEDEP}]
+	>=dev-python/traits-4[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/blockcanvas[${PYTHON_USEDEP}]
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		virtual/python-futures[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	VIRTUALX_COMMAND="nosetests" virtualmake -e with_mask_test_case
+}
diff --git a/dev-python/codetools/metadata.xml b/dev-python/codetools/metadata.xml
new file mode 100644
index 000000000000..50a6152a5ba7
--- /dev/null
+++ b/dev-python/codetools/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+</maintainer>
+<longdescription lang="en">
+  The CodeTools project from the Enthought Tool Suite 
+  includes packages that simplify meta-programming
+  and help the programmer separate data from code in Python. This
+  library contains classes that allow defining simple snippets, or
+  "blocks", of Python code, analyze variable dependencies in the code
+  block, and use these dependencies to construct or restrict an
+  execution graph. These (restricted) code blocks can then be executed
+  in any namespace. However, this project also provides a
+  Traits-event-enhanced namespace, called a "context", which can be used
+  in place of a vanilla namespace to allow actions to be performed
+  whenever variables are assigned or retrieved from the namespace. This
+  project is used as the foundation for the BlockCanvas project.
+</longdescription>
+<upstream>
+  <remote-id type="pypi">codetools</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/colander/Manifest b/dev-python/colander/Manifest
new file mode 100644
index 000000000000..fe53454add44
--- /dev/null
+++ b/dev-python/colander/Manifest
@@ -0,0 +1,5 @@
+DIST colander-1.3.1.tar.gz 119999 SHA256 48bdbb5e8f50fcf2f05aab6bb2c0ab58d6ec7eed81a72b7d0272744fe72fafc2 SHA512 0aa9063e6f88ef63b5378cd93d3b121c8323e4632dcff31f143d2ee6dd33edb93a7fedfa06ca250288f7bc194a534f1027b89c9c6cc92765cf4348709e539da5 WHIRLPOOL 2fc505646f21d0519cfef99665e168eba6e3b47f875b27f183d75f5abb474e227022fed2a196d7ef41ba79ec81e27720a2ad39134731fc55010ba7a70bca3cf8
+EBUILD colander-1.3.1.ebuild 1533 SHA256 abca3cc9d210ed20fc305c451d6346d0a695f5bd20560a4d301dd86485576247 SHA512 eda1324b47b2bc1bd4309dd25b35c714d3c81af746e61ade6b8695dd8878f23328992f9e773d835984fc55168765225fa5d50ffcc8bf8913df4da5e830b13d50 WHIRLPOOL 70db95a6814d8c97ecd4d44c921f66a8e9312dd9de7ca395c78bf220b87f11ddbbc8be7f72b9cc53c568e47a7f431d0907c9cc5987c084c57a46ef440dd58063
+MISC ChangeLog 3011 SHA256 a1cd23a834ee03abe158c638d6164898f9e3721e30389bba9fca0ca83b010232 SHA512 09b5942808467f97a6f6c1e8e897c38abd9c04eab50ac0bf3d58a7cfb98cd632fd101ffc157b98456cde9e13973ee2f3619c205671671b7f405c620339455474 WHIRLPOOL 7c9737ab1ede4dab39bf8420707b558cb9f116e31326c908e15add45775bf7fd8f9b3a4951a4413c5dd4e9ccee457e524c2b02ee1960608e0fad062de3492653
+MISC ChangeLog-2015 2421 SHA256 1daf24f0e2a7b57ca900766b1f52d56735d75f82edeed6e5426f5b56eaa914ab SHA512 a7a4b0751ba0fd7aa41bc3ed53518094961dc4e91c8f34dd83f0557576745182271bd4b802a91930f53ebd73b2abcd05aa552d0e33e3e08241f819e312dcfc98 WHIRLPOOL 808fe47c502f46dc7db66dd1df2f77a4ab02abb05f6c1339db53fb2b6d4c735b9b483956f4389d4934085bd590a6f66c5280f019d6d62290d2116e818142bdaa
+MISC metadata.xml 311 SHA256 f72279c7fa423c1597366facb719bf50742c42c97d8a0795bfad64129cc09b49 SHA512 c0fe889c10d25c88c37e781c6e355c51f1c2c24615d616170da287c6bce490f6cd6b501a783c5a4e98f7c00c945fb686e066422271d5f43495c5c68e459c7f7f WHIRLPOOL 0d3e0cb279d78008fa3369a77cb3ac4f75225fac5ba48ffe2359b5d2c9005c8cf4ae7dab8eb5db735148453a4b6674ad3d503bfab52f3390564aa3595babcbe5
diff --git a/dev-python/colander/colander-1.3.1.ebuild b/dev-python/colander/colander-1.3.1.ebuild
new file mode 100644
index 000000000000..89b151c03bed
--- /dev/null
+++ b/dev-python/colander/colander-1.3.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple schema-based serialization and deserialization library"
+HOMEPAGE="http://docs.pylonsproject.org/projects/colander/en/latest/ https://pypi.python.org/pypi/colander"
+MY_P=${P/_beta1/b1}
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+# MIT license is used by included (modified) iso8601.py code.
+LICENSE="repoze MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+# Depend on an ebuild of translationstring with Python 3 support.
+RDEPEND=">=dev-python/translationstring-1.1[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}] )"
+
+# Include COPYRIGHT.txt because the license seems to require it.
+DOCS=( CHANGES.rst COPYRIGHT.txt README.rst )
+
+python_prepare_all() {
+	# Remove pylons theme since it's not included in source
+	sed -e "/# Add and use Pylons theme/,+37d" -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		# https://github.com/Pylons/colander/issues/38
+		emake -C docs html SPHINXOPTS=""
+	fi
+}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/colander/metadata.xml b/dev-python/colander/metadata.xml
new file mode 100644
index 000000000000..bef772ba1b90
--- /dev/null
+++ b/dev-python/colander/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">colander</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/colorama/Manifest b/dev-python/colorama/Manifest
new file mode 100644
index 000000000000..c291a8797491
--- /dev/null
+++ b/dev-python/colorama/Manifest
@@ -0,0 +1,9 @@
+DIST colorama-0.3.3.tar.gz 22765 SHA256 eb21f2ba718fbf357afdfdf6f641ab393901c7ca8d9f37edd0bee4806ffa269c SHA512 8e6177ea60ab8f1267ce982f23803a9d2eb0c4550d7eac4776416d62a99d1ce03254fc64cc959ca95e2409ceeff081d4d19359c383e969dfb921b44c56914495 WHIRLPOOL e5fe6c0046b558abdde260d9d89e3cbe197165f99fb4f7134c14fff95e6c1e92b3472a95001d847ab58e8445c87f21774a71f629771593934ea070838c765461
+DIST colorama-0.3.8.tar.gz 25043 SHA256 66c0470b1aab193890761e959103a1d99d609a2158f14ab27fb1afedc99aacc9 SHA512 daccbae90c986bbb23d87b6fce97e53fafce0284ee5578b642d925bcd8f162919e61065494a5b31ed3d2c6b28b6543fdbf84c477745f6540ea607e2d13cde319 WHIRLPOOL a20c6dda74ad54e7deed0cab9cd4a228f29028f9afe225a428f26f2b04e3efdc02bc2eedf90b9ad46cd5f0d94b92917d6aacfff92e9a0fa406d268e69ee1ad6e
+DIST colorama-0.3.9.tar.gz 25053 SHA256 48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1 SHA512 248e3d3d1f95cb85baf55ef4d705508213b81edfb04b39fe9a7bc9c7ac564986726ab6e9d9f73d64ee02e1c9b86d4c6bba40543590dbd170180a37d69e07b627 WHIRLPOOL 14ac071dd8737b9a61433fe75c54bc1734162896c0dbbccf7d572185944279fcc9961d19fa713158282c28c137afba344584ab4c9f3412889eeb993688c01af4
+EBUILD colorama-0.3.3.ebuild 680 SHA256 feb9724106c0c21b2d2bb014f392b8e471d7627716299ea5598fd5588d66e36a SHA512 9f13c66dc9660376b7705ea3aa28d22902b528c8dcd97ab25e3074f67b077fc062f609f26e04e19f2e8846fd3a12548d8ddb27d9fb5c9cee6addf0e40e7be239 WHIRLPOOL a971e76cfcac96e38561c00a2277e2dc190733a9b8ba804b62b27312841ed7590b8e949cdad3870d5454fd51da53c771fe6aba690f33833b8c99bcfcfe96b407
+EBUILD colorama-0.3.8.ebuild 778 SHA256 12f6c4fd54b66110751fad4edf7c65c6d8417d828f18bc231a090ea10e7cfa7a SHA512 daa6c0d11119580a8437a29efa29fec6d7030ea85b1db31efdc4637ad32d0d7841f08a311093bf28628321aff803047557f9ca1dbd5599f141973cf36e9afe64 WHIRLPOOL 85469a5009dbf6a1f78e9de720cfeaed6abeca3f9f27254e660551a1b2c9f48b81cfbb6f74305355ce0dab5803fcdfe3614b65ef9afbc3fef8501c9a8412c696
+EBUILD colorama-0.3.9.ebuild 778 SHA256 12f6c4fd54b66110751fad4edf7c65c6d8417d828f18bc231a090ea10e7cfa7a SHA512 daa6c0d11119580a8437a29efa29fec6d7030ea85b1db31efdc4637ad32d0d7841f08a311093bf28628321aff803047557f9ca1dbd5599f141973cf36e9afe64 WHIRLPOOL 85469a5009dbf6a1f78e9de720cfeaed6abeca3f9f27254e660551a1b2c9f48b81cfbb6f74305355ce0dab5803fcdfe3614b65ef9afbc3fef8501c9a8412c696
+MISC ChangeLog 8028 SHA256 519489ea95d3712f7f81ee8a1d5eaf7d0f7113998b126253f16e53941fc24ceb SHA512 afc0ddef4ac794cb187ad4a82727b63c7b62e6a310e1d8b078692923243ec3a18ef33eb3792109ad548016e25a434cf4bbbfc0093afc374217e067fa561fbf2f WHIRLPOOL e42f93435b9f1b1357645d84f428693bd79504c0fb7b941901315d1de6f76c2acbfd173492df628d8f79a4b99c9e902589116d18d9519658bc9866e91f762509
+MISC ChangeLog-2015 2536 SHA256 14308186bf4ffdd545192184a2ecba3c9367cce4e2a1f88d84646a7cf4f7103d SHA512 a67d9a6e45c5fc9bf8cf5d73574cf2984a3efc6409c978e5f885eefbcc21f4d9c97bb16350bebf776d6c0c93a46c29319f464a6eea2b1d5d58a8f20a44e27cdd WHIRLPOOL 53d7d993cf77b4b69d82d41289cbbe4d7d93e793bef0e2007ab9e9cf145a70fad70d1e12a6635ee192e22377bfce932c9870e10fdd8090590083a9e4f8380dc9
+MISC metadata.xml 682 SHA256 eadaa957bcb3be1906acfee152f5576e88ef663f7a97bbd8033cdc492bd01191 SHA512 0a9144ad52b490c2e607eae85aced164f4c2f15c152592ca67a588d659c34c3baa16105746fd4a6894c49ca31ee4b0e1b18957cb7c421fc788cbc933afb3e895 WHIRLPOOL aabadbbb1b897c94d1abb0b59cc9df8cb7c04b709866fd90021e6ed2625ae9275f7f131fa32393d551312b6bde07e6fa922e4f0b67dabbbd12f735b6664efa61
diff --git a/dev-python/colorama/colorama-0.3.3.ebuild b/dev-python/colorama/colorama-0.3.3.ebuild
new file mode 100644
index 000000000000..d402e7518c2b
--- /dev/null
+++ b/dev-python/colorama/colorama-0.3.3.ebuild
@@ -0,0 +1,24 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
+HOMEPAGE="
+	https://pypi.python.org/pypi/colorama
+	https://github.com/tartley/colorama"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+python_install_all() {
+	use examples && local EXAMPLES=( demos/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/colorama/colorama-0.3.8.ebuild b/dev-python/colorama/colorama-0.3.8.ebuild
new file mode 100644
index 000000000000..3dd40613fdd1
--- /dev/null
+++ b/dev-python/colorama/colorama-0.3.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
+HOMEPAGE="
+	https://pypi.python.org/pypi/colorama
+	https://github.com/tartley/colorama"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r demos/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/colorama/colorama-0.3.9.ebuild b/dev-python/colorama/colorama-0.3.9.ebuild
new file mode 100644
index 000000000000..3dd40613fdd1
--- /dev/null
+++ b/dev-python/colorama/colorama-0.3.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
+HOMEPAGE="
+	https://pypi.python.org/pypi/colorama
+	https://github.com/tartley/colorama"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r demos/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/colorama/metadata.xml b/dev-python/colorama/metadata.xml
new file mode 100644
index 000000000000..993d1023b88b
--- /dev/null
+++ b/dev-python/colorama/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Makes ANSI escape character sequences, for producing colored terminal text
+    and cursor positioning, works under MS Windows.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">colorama</remote-id>
+    <remote-id type="github">tartley/colorama</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/coloredlogs/Manifest b/dev-python/coloredlogs/Manifest
new file mode 100644
index 000000000000..0a54b8d3e94e
--- /dev/null
+++ b/dev-python/coloredlogs/Manifest
@@ -0,0 +1,6 @@
+AUX coloredlogs-2.0-skip-cli-test.patch 842 SHA256 525b0dd850d9324d28c9473debf9cf7e28d7153294a8e07928dc1b9296d369f4 SHA512 98e5e8d207de67abf22d0de5729cf6926802329e1a32977dc95155490cf32c6b94b69f8e78a410a718bae073e4d6d618c515dcd7318b057671bb91fcf84c4424 WHIRLPOOL 6ed9ed91a666f5ab432b27e82f5c8eee9a8a3b3771243c50e53da6e57281ca130d3e0b10e8b9c4ce0c18c88dacff4646cb7058c75d4ddf922ec392f90c2c0564
+DIST coloredlogs-6.1.tar.gz 28057 SHA256 4cc35158baab0a495736eca84020a1a29f8ea470b98133bb94aabd3212d7f3f7 SHA512 834cf993e7ffd3328644d334912fcf5a5156a441c6184643b38e5f356d46d7b5c48e02ee1e1b432265052c7a5ab1071ba456e575217a4a762f8387131059c405 WHIRLPOOL 71f8632736c0c280bd19d1662d9cebfa04c85e70058953f0ff88d5e45c0e9daa189447e9b2053cbf4293e1a3708ddaea6a2b51d7688b2182617a38a6b2cbcf1c
+EBUILD coloredlogs-6.1.ebuild 1198 SHA256 0e2b32e0fc728c068df962ad61564e316440cbdad525a19ecab1d0bd5d6ec291 SHA512 0f5425853481e4b4f488554190ddda6157bb62a840ff10ca6e42466225ed7dec96b6ba975be8f3fcc0e79ebfafaa38bf1a42e6274f32f0da9b48bac0d4b44a08 WHIRLPOOL 26d6a704204f5435f127cf5ebbb89093a0b9b477dc13f2dc958c5af50144535bd259c9f5876451829526bdbfcd89f40076eccd0906241988ec5bb2889750d2cd
+MISC ChangeLog 4394 SHA256 285f034bfd30c52b4108f8910b0747c7c48ff1760056aeafffe5ade59c2d7794 SHA512 eb1712abcaea5e175939bd57cdb020da106b5de7ebffcc23684a7a74d670646cc999ff222b676f1e54ef1c191ec4f5f4913f91fc7cd74a2fb72ad36942802e55 WHIRLPOOL 92bc94ecf053bd7a7b97ab490912b0548dff518558315b42b9fd88fbb13693392e69f1296d40237ca329578eb38b896b67b3886c8f1bf0aef74e22290eaf9f72
+MISC ChangeLog-2015 945 SHA256 50be230195ec6f2168263f07322a1256c20cb86ee017cf8ace7da203d334aa42 SHA512 10e4609b6b324446fd1dbf79b14e77fadfc1c5106d8c7b952ca43bb07df4eed8c4edcc94d5eb56b5929a58aa173f426ba98fd7d2624f2d51503a9c73169cbe19 WHIRLPOOL 12e8849d4315cf11e3fee385d6f1ef89def1dcd5814fef391f20a7666545d46baa13c0215eb6a3c3a591be1bb9e202236c9980b8bc6d343820c61aad3fd53086
+MISC metadata.xml 390 SHA256 a9bd1a43de2f39c73411ab7a43f259af6cd72803110c03000ea297c27b9e0174 SHA512 4df2d5312905b2be06239d81f2274ae4e6517f48d62ec54d5d755bb08cccaaece3531b391f45097590f039db10b8bcf6ff265a28506a0f8096f121fda85e498c WHIRLPOOL 0969108380f3b533cbd6195d324ca1cebefb5bd4054a1d00d8b0ed5df1e4c71d4eefecbfd37678a19e55da6059ea4c326f0c6bc29219f97572f4de8328856a2b
diff --git a/dev-python/coloredlogs/coloredlogs-6.1.ebuild b/dev-python/coloredlogs/coloredlogs-6.1.ebuild
new file mode 100644
index 000000000000..49ae56fe7514
--- /dev/null
+++ b/dev-python/coloredlogs/coloredlogs-6.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Colored stream handler for the logging module"
+HOMEPAGE="
+	https://pypi.python.org/pypi/coloredlogs
+	https://github.com/xolox/python-coloredlogs
+	http://coloredlogs.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/humanfriendly-2.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/capturer-2.2[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.2[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0.3[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/verboselogs-1.5[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( README.rst )
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0-skip-cli-test.patch )
+
+python_test() {
+	# Sandbox violations
+	sed \
+		-e 's:test_system_logging:_&:g' \
+		-e 's:test_syslog_shortcut_simple:_&:g' \
+		-e 's:test_syslog_shortcut_enhanced:_&:g' \
+		-i ${PN}/tests.py || die
+	esetup.py test
+}
diff --git a/dev-python/coloredlogs/files/coloredlogs-2.0-skip-cli-test.patch b/dev-python/coloredlogs/files/coloredlogs-2.0-skip-cli-test.patch
new file mode 100644
index 000000000000..cacd016159e9
--- /dev/null
+++ b/dev-python/coloredlogs/files/coloredlogs-2.0-skip-cli-test.patch
@@ -0,0 +1,20 @@
+ coloredlogs/tests.py | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/coloredlogs/tests.py b/coloredlogs/tests.py
+index 2010b12..7ab18a8 100644
+--- a/coloredlogs/tests.py
++++ b/coloredlogs/tests.py
+@@ -160,12 +160,6 @@ class ColoredLogsTestCase(unittest.TestCase):
+         for name in 'debug', 'info', 'warning', 'error', 'critical':
+             assert name.upper() in output
+ 
+-    def test_cli_conversion(self):
+-        """Test the command line HTML conversion."""
+-        output = main('coloredlogs', '--convert', 'coloredlogs', '--demo', capture=True)
+-        # Make sure the output is encoded as HTML.
+-        assert '<span' in output
+-
+     def test_implicit_usage_message(self):
+         """Test that the usage message is shown when no actions are given."""
+         assert 'Usage:' in main('coloredlogs', capture=True)
diff --git a/dev-python/coloredlogs/metadata.xml b/dev-python/coloredlogs/metadata.xml
new file mode 100644
index 000000000000..42593b5baca9
--- /dev/null
+++ b/dev-python/coloredlogs/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">coloredlogs</remote-id>
+    <remote-id type="github">xolox/python-coloredlogs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/colorlog/Manifest b/dev-python/colorlog/Manifest
new file mode 100644
index 000000000000..249f75040622
--- /dev/null
+++ b/dev-python/colorlog/Manifest
@@ -0,0 +1,5 @@
+DIST colorlog-2.7.0.tar.gz 10153 SHA256 8e197dae35398049965293021dd69a9db068efe97133597f128e5ef69392f33e SHA512 765923004a2e2b0c0e34f7cbf2d79ac7232a13e9aba68166c8ba295303cd7187317d9a34a405a78cc5f7ca0281fc3b653848e419c0b3a0dd473ad0b859216703 WHIRLPOOL 1369aef4535b75e48218e4f3b6884a1718af014d31a9e5408d001f40b01194824a0e14589e168ac6d53faf252635e2e9d3324a7138578a65510d6df279423311
+EBUILD colorlog-2.7.0.ebuild 682 SHA256 9f346a109faa312631d8545eba16bb7d9c3069705df2122d9542f4683c7e37c7 SHA512 87cab3dd6c8f5c1f5d46e210bf502f3eacc18aced86452578f43f6f11a6fd1b6a4b05f15f54fd02b82f9e1a9df3a2aa53b3e14afe4accdd26a537ba2d0e00eb4 WHIRLPOOL c707e772c7e083453a837e029456af21ac40900bd043753064564f781c9751132e7ee25b81627fc268609eb093e573703685ffd9f609854c8089d5516b913629
+MISC ChangeLog 3831 SHA256 601835b2eb1059bd347f8621f0f30d83205ebdaf174f797884c8a93c06ce2cb6 SHA512 8c97e86935ed036982c353d43cc81d3c292e2c8fdc0b410cb9b76e240624c9b728d3776f2e0be43b0f79c21b923a8f87aa400251048ceeeb6e29bb4dae27a99d WHIRLPOOL 2b276e636a2dd7d5e85c064ccb8b6debe4c66d904ede8d591251656826ea2f2149589a3a9a5f9dd613b0a87a3d37aa8cfe435ecdcbc164579f172458082a9f44
+MISC ChangeLog-2015 570 SHA256 8e5aac21afb6cb2336ef70510ce0983d735566064283e3936543ab5708d2eb0d SHA512 eab4a7a0a3ce998a3e8c529ffeb928ecde7f3134343de93731f5b4c7df09385c9d4a5d7a2e6a0763729da2fddb4491a99a38dd4202395c4151b36acdf40e1ec4 WHIRLPOOL cd6e49f89d6c5b426841546ad7245fe0d04e6506f47795c91b4a96a873c497bfc3bc63e9ac50a778de1da500908321e90587deaffa1c12419c4e0e47db69bb43
+MISC metadata.xml 389 SHA256 2c406884b19c984e35140d953475959cc9b9336960868817583336a84af11154 SHA512 04b339e2ca89bfd8862d5491081c7b66f5211dc490b650140499f5a4fc6f66e705a5ab805a6c0bc4d867183e699c3c73a199a750d156862346cb68e3647f8390 WHIRLPOOL a0e1a0cab41ee932597b0075e296a528787fff3927a916713766337b74897fdcaf86729acc1e4514e3824fd2bfdd7971459fc76f8883f2e94b3ec4cbea6cfb72
diff --git a/dev-python/colorlog/colorlog-2.7.0.ebuild b/dev-python/colorlog/colorlog-2.7.0.ebuild
new file mode 100644
index 000000000000..eea828124d7f
--- /dev/null
+++ b/dev-python/colorlog/colorlog-2.7.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Log formatting with colors"
+HOMEPAGE="https://pypi.python.org/pypi/colorlog https://github.com/borntyping/python-colorlog"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+DOCS=( README.md )
+
+# https://github.com/borntyping/python-colorlog/issues/28
+RESTRICT=test
+
+python_test() {
+	py.test -v -v || die
+}
diff --git a/dev-python/colorlog/metadata.xml b/dev-python/colorlog/metadata.xml
new file mode 100644
index 000000000000..4569d1b46a83
--- /dev/null
+++ b/dev-python/colorlog/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">colorlog</remote-id>
+    <remote-id type="github">borntyping/python-colorlog</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/colorspacious/Manifest b/dev-python/colorspacious/Manifest
new file mode 100644
index 000000000000..1bcbbdabe707
--- /dev/null
+++ b/dev-python/colorspacious/Manifest
@@ -0,0 +1,3 @@
+DIST colorspacious-1.1.0.zip 698745 SHA256 7fd83cdb22224335c51c1f85e54a55f18568660452680d21f4b306d4454aec56 SHA512 b4267cab679d581f2072f5a315aeccd78cc68e325e16f14675cb17133cd411a28f376f150aee7822e1568b84571d5d149adff10e9c5a7fd9f41927153967e2ef WHIRLPOOL ea4c14a616933cf5646ccc9c311d12f23daec03615468976cfd555f9a1104c4d64460ac4c6c5b6cc52bf9b878f46b7be2dc6dece9be1ea17ab11001d3ecdcea7
+EBUILD colorspacious-1.1.0.ebuild 648 SHA256 25a6787d200518137a14e3e54abfa1b442cf9a74c6aaf475f7caa684d8c6dff5 SHA512 ae8ee254b0ed719abee981eaf84096d9bd2ebf98c6d261944327a91d325bb82f6c9ff5286cc4db4083fc8edcedc98afc0a0ac7c5cd0677baed06b4a3dbe6751a WHIRLPOOL 6114334bd8ac42c7cd4bd445422eb466b010a24a20fafb9f747518cceb18834b980eb6a30ef919fa9c940415d17c303b7c9a2a9b6e2860a99777af4b6160d720
+MISC metadata.xml 386 SHA256 5eacda7e0667f5e00b89ef42b7ee059412837bf3f2deb5556ba78aa1fb96893f SHA512 3e17885bfa7b670023d76e53463d1543841ce35c690c7d0e34abf4b86c5d92d1d5dd40954ef6524f50430bcde13b38c2ba43d688e802d043c6653ac7cf523d29 WHIRLPOOL 45c6d287e1da9a259f15de79fb61e9e9e6d71795f1f0f666c7e987b6708b4943b1a3cd442e14953960cdac6f449bdb4759e220d7dfe1b43d4ac0ad2644ec518b
diff --git a/dev-python/colorspacious/colorspacious-1.1.0.ebuild b/dev-python/colorspacious/colorspacious-1.1.0.ebuild
new file mode 100644
index 000000000000..7f827107069f
--- /dev/null
+++ b/dev-python/colorspacious/colorspacious-1.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Powerful, accurate, and easy-to-use Python library for colorspace conversions"
+HOMEPAGE="http://colorspacious.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test () {
+	nosetests --all-modules || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/colorspacious/metadata.xml b/dev-python/colorspacious/metadata.xml
new file mode 100644
index 000000000000..9062040d1f19
--- /dev/null
+++ b/dev-python/colorspacious/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">colorspacious</remote-id>
+	<remote-id type="github">njsmith/colorspacious</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/columnize/Manifest b/dev-python/columnize/Manifest
new file mode 100644
index 000000000000..a67bbef84caa
--- /dev/null
+++ b/dev-python/columnize/Manifest
@@ -0,0 +1,9 @@
+AUX columnize-0.3.5-nose.patch 425 SHA256 9e18ce0ac928f992e0bbb6094b40659d0bf3d1e020d9133545cfd9eebd109181 SHA512 93a495010eda573a32e402690beee5f708da5d8b809f83f17f26d2c44f356fcf6dc887c4f7220c3fcc102bcc70322353d954b012c85c9d41873bf22d5acce6d1 WHIRLPOOL 12a2d827cc3793f7c13deeaee7fe9dff16a68be4c341d5a659211dd350b2c233310767db9080692797bedbe3c112f0aea5781da3b0781d1b649d16bc3e1b6363
+AUX columnize-0.3.8-nose.patch 435 SHA256 94b176cf84328a1517e1097250fef2d40fd309f4cfdf02cf872d8a3d82c72a0e SHA512 5db32976721850538986523fc0a17f8f4c7d95b5bae077644b093d63e1a03ae9c08ae01742b4057a13588347ca5f2ab6be35a00b53a9a0abd9006edde4757ee6 WHIRLPOOL fe66d52566d0590c261bd36cc65fe4408944597292d1c2d702507da8b26d96e6fa2427d1981cfb18a4a194c0272948131246dac17715b92f2fe7fa8ff2463c1e
+DIST columnize-0.3.5.tar.gz 8841 SHA256 a6f2d3b7c3ee154c2245f523a581d25cf5465ba8ff16b936ef4ce394ff0abc36 SHA512 b3090f6588ace5c204a6e31a93ad4bd659df81a0b5568003a970a04b456c946fd1c6adf13122a3327b7032e54e04f0410c06d8c377854de51017842ce58cc360 WHIRLPOOL f904da128e0d91d72a3f4519590fe7a39df508800ba27444d19c8a1ea10281f3b80d5583f69fa11056803c07652ad3431b94dc6800154043a2376a487038ce91
+DIST columnize-0.3.9.tar.gz 8581 SHA256 fabb8e0e3a2241b18f31bf2416934f338c6ca1d3bbbaf434979813bf2a3e442b SHA512 2bb9a25200a1574cc6471ce06dfb2b4b62c5a23fa0e4fabad515dd2939b3f67ca61132121e4326dd820691691dce67d664302d99248ea2d5c5f25357203d9d08 WHIRLPOOL cda86155e7df2b7b46f372c78fb681733e2a0bcd1a837bb8b009d1c9ebeb73cb07ca92c71abbf67431a5970f354bf98b90c8682c0c410bd89a8e57f96d5767de
+EBUILD columnize-0.3.5-r1.ebuild 639 SHA256 16c9a708459c78edbb158d1e1e367dcd1eac7d91d386251dd28196f0475d1882 SHA512 7d68b1d58de8bb912de6eedb8060795934bdb18c837fe9867298aacc1b872ea852eab6007f24062a779615d47dcb87029c4cd42f60ef62debea2256f3ffff916 WHIRLPOOL 29602449b2247f8cd31c49e17dcab37f264b8f2f05574a1da9884b42cde8d258dced6b2dafa9abc78a6f5d1c47dfd5a9030a0c7648486873127a47cfd315190d
+EBUILD columnize-0.3.9.ebuild 642 SHA256 bbc433388a32bcfbc4cd2c4ca0e0b89baf1f373a7cfd035e4559e4c4b446ced2 SHA512 ae0c31d0be29c38ef428436aa14e7da490778ce8c85f8262c1601b0f9305cd96e2403279b74d2fcf58212dd45921cefe0fe6f2103a09e03717e27ef1ca2b988a WHIRLPOOL f7b89e00553f9674539b231b83ccd884d9102dc9ab0e7d3230060a67413e960111c4e0b81c0f0a1b3a393e3a80b46c7ae9b78772d4c56986e7287026e0883eaf
+MISC ChangeLog 4101 SHA256 7ae3028bc3f41feafddf816e6feb39348dae1cd91e5120fe0a73a29dae617580 SHA512 814aab276b04a23c39d63e21acaaf7b87280b2d38fd327eee739a73804d086c9ad8845f48f0debe714edbae6eaad6d73bd0ae97a8c6090a0f6f1e95d32f72cfb WHIRLPOOL 9f7d3ef5b26899b895301b6c746a98fa46dffa0290a85b95ed2c6343ad0144e1e976cf4db416262e9a26c0858fcf5d6bb9d065bbbfa5afeecb8da5c08bfe14d3
+MISC ChangeLog-2015 1753 SHA256 4646a18bc2e733cda345439094b4754a434fe4a22129b56151ba8ecf55d1e658 SHA512 30d125749298a25caf151bb97a062895d2e1a7fa54f3c5f993912da160c4e83b1ebe3164f8f4df54bf7cb1ca281dccbdadfffd0c6319cbd57622a6affd1b35b4 WHIRLPOOL ed53aa4f1631f66ccc9df30002ecab89367b8fb2f5c6592f759a0969588b5de13695eb2196a79b6317a253ac32cba9dd2d2fd7913a8c9dd1c49e8f171ac7b679
+MISC metadata.xml 425 SHA256 72a3213aa4ad2dbbd7c244b309415c8ca99e65b134f7f5e5372ac8fd6635934f SHA512 8b1e38b3f56187d7f003c4a3c232fb386e146dc70501387cf3e25a21b9b630eadde4ea2e022599f7fad88e8719e51422e53675d4fcb8526a93198c89cd5f9e1d WHIRLPOOL ab6edd4547dc96c17a237a0b815fccf4740152fe92cbcd17b7c239dc19048be351e05b279f447261719d8621bcd79c9fe4153d24af1f2da7a2e1a7c521a0c459
diff --git a/dev-python/columnize/columnize-0.3.5-r1.ebuild b/dev-python/columnize/columnize-0.3.5-r1.ebuild
new file mode 100644
index 000000000000..dd0bb7224743
--- /dev/null
+++ b/dev-python/columnize/columnize-0.3.5-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Format a simple (i.e. not nested) list into aligned columns"
+HOMEPAGE="https://github.com/rocky/pycolumnize https://pypi.python.org/pypi/columnize"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-nose.patch )
+
+python_test() {
+	nosetests || die "tests failed"
+}
diff --git a/dev-python/columnize/columnize-0.3.9.ebuild b/dev-python/columnize/columnize-0.3.9.ebuild
new file mode 100644
index 000000000000..06816336025a
--- /dev/null
+++ b/dev-python/columnize/columnize-0.3.9.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Format a simple (i.e. not nested) list into aligned columns"
+HOMEPAGE="https://github.com/rocky/pycolumnize https://pypi.python.org/pypi/columnize"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/backports-shutil_get_terminal_size[$(python_gen_usedep 'python2*')]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.3.8-nose.patch )
diff --git a/dev-python/columnize/files/columnize-0.3.5-nose.patch b/dev-python/columnize/files/columnize-0.3.5-nose.patch
new file mode 100644
index 000000000000..f09f7704cbab
--- /dev/null
+++ b/dev-python/columnize/files/columnize-0.3.5-nose.patch
@@ -0,0 +1,15 @@
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index e1035eb..bb8eaf6 100755
+--- a/setup.py
++++ b/setup.py
+@@ -26,6 +26,6 @@ setup(
+       url                = web,
+       version            = VERSION,
+       py_modules         = py_modules,
+-      setup_requires     = ['nose>=1.0'],
++      tests_requires     = ['nose>=1.0'],
+       zip_safe           = zip_safe
+       )
diff --git a/dev-python/columnize/files/columnize-0.3.8-nose.patch b/dev-python/columnize/files/columnize-0.3.8-nose.patch
new file mode 100644
index 000000000000..956e033b729d
--- /dev/null
+++ b/dev-python/columnize/files/columnize-0.3.8-nose.patch
@@ -0,0 +1,15 @@
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 4a4b238..854d3e1 100755
+--- a/setup.py
++++ b/setup.py
+@@ -33,6 +33,6 @@ setup(
+       version            = VERSION,
+       py_modules         = py_modules,
+       install_requires   = install_requires,
+-      setup_requires     = ['nose>=1.0'],
++      tests_requires     = ['pytest'],
+       zip_safe           = zip_safe
+       )
diff --git a/dev-python/columnize/metadata.xml b/dev-python/columnize/metadata.xml
new file mode 100644
index 000000000000..e45bddd008ec
--- /dev/null
+++ b/dev-python/columnize/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">pycolumnize</remote-id>
+		<remote-id type="pypi">columnize</remote-id>
+		<remote-id type="github">rocky/pycolumnize</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/common/Manifest b/dev-python/common/Manifest
new file mode 100644
index 000000000000..65340245be98
--- /dev/null
+++ b/dev-python/common/Manifest
@@ -0,0 +1,7 @@
+DIST common-0.1.1.tar.gz 2695 SHA256 197638d6146898400c5d0f1549bdef990503fa004a21bcfa0d157cf898bd9f21 SHA512 9bc76b762bf58599f8bd15c0e66fc5eb5898b7e3401d7a4908ca6a58a4f8040bb3fa44f016de62a129db2cb932ee724dfc59f42213f65f61a1fd399d3738eec0 WHIRLPOOL b038231708624ee582a46ba7f04a218c08e3415b743470539d0a5b996bc34b22f40defdbc326dc462283322a85a3d612eac6b147724e20ebc9fc25e6fda0d283
+DIST common-0.1.2.tar.gz 3541 SHA256 3dfa982670abefc870043b239eaa0ecd860be7aa952b1931c1356b426ff8c76a SHA512 2cba2602fde34ced5b6fe603eea0aaa6810981089c9484f25ede16f6910896e783312f4d7bfc411d4eb8c278967c21ce000c3d1eb2a775d2bd76728eeebe80dc WHIRLPOOL ef5e9f4f34f2307578ecb1ceb0e6934bdae777a9096cde930ba3d28aa05633cdeded45b5566845ea116e92636e90ff5d333778f45b2c6fa0fb36c640fac96a82
+EBUILD common-0.1.1.ebuild 466 SHA256 001019f6f946c5cb3372c2e43e764031d35ea4f938d490dfd2b960dfbf05c5dd SHA512 3e607062ba6f8961f65ff0157c5daba8364600c9e7fb80febe4570e52de0b2fbcfef1dc2b32de086ea1c438315050110541b404ebe16009e4937b8bcdf927441 WHIRLPOOL d2083c02992f58e903495aae5ceb149bb9c4c550d7bdc0e7c6b629c03357691cd4d1acb7fc63191bb84b88cc0dc9c9977c03fa197a22d273a293dfd402ed9190
+EBUILD common-0.1.2.ebuild 474 SHA256 37b5dfcdb8a4b32e71df50ebae4a41d5c5089beb0d6d29eb63f9fdbfef208146 SHA512 c7d7b2509e40741fd17c623666cb942ede58bbb0ae5e7a1fcca2852a9e9ea77138cbd52bca97fb810d3af4a6e694ae8d97fddc1b177502ab2a112b2688f0fc6e WHIRLPOOL dff429bdc2a986ebd36df8a9a86f98a9fce3bafb3a997e6758a9f25d8c876ac9858087d9188c99aa100a1c7cdce63f33b156a752dbad64ab4de937ed7b5b152e
+MISC ChangeLog 2859 SHA256 dd352f553434801838594349347f7c5f579861d81ef9d46fc7c6465e41b031ef SHA512 1df09baa1bfa680adb57a6040799872f349a1ed82331aa14e1df19c96f0cbbea856b75a0b0e3a8f4287de465f63b64898961ece26c9d92649b9dc2b07212f81e WHIRLPOOL 1fabb0297c4e3b9cae0478a2bc7ae711bb5cf2be6e84030e2b4f4e60bc9524d12df7613cfea3b56ad166603fa27d8141b3626de15a22dbecd3f2e4ff3d473dfe
+MISC ChangeLog-2015 866 SHA256 88d8eb02556ae4f20fb2820d2c71fc4c55443a5bd741cf4c1cd7ae0f0e05e92a SHA512 920a10e3bf83104e84a6f46b4b225c2c13922cd4127b2ddbf19990cf654783db8b35fef54ef8da59009eb6c087071850c5a52d5510f53524ea437674556a36e4 WHIRLPOOL cf12e6ee5c2c8362dc54c34569aeb9132a3307a272f06a580cea4275ed7f7a83f17276d8be3aa6a6cd8cab89433d59803a6be1dd486b917328b84b0c9e1f399a
+MISC metadata.xml 319 SHA256 bb9914c6605dfee107e787dc534ea4c8e1bb7292ca5895f2d9ac7ad3bff97327 SHA512 b3e0c5dadbc5227193b6ee672f8e8d7671d1aa20f5b77e7efe01873d6a47432d19855243a3de17c3589988efd7127ce654995c75032db4a889fbab1982c0ab5d WHIRLPOOL b5634c73037965ab7d8cf15990604ee6aded7563efd63e1a7979474f4a5648c9f6dd567ea41505a707e0fa7c2966c009ccdabc792fb20d31562246a915ec6fbf
diff --git a/dev-python/common/common-0.1.1.ebuild b/dev-python/common/common-0.1.1.ebuild
new file mode 100644
index 000000000000..a3482b7fa037
--- /dev/null
+++ b/dev-python/common/common-0.1.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Common tools and data structures implemented in pure python"
+HOMEPAGE="https://pypi.python.org/pypi/common"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="all-rights-reserved"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RESTRICT="mirror bindist"
diff --git a/dev-python/common/common-0.1.2.ebuild b/dev-python/common/common-0.1.2.ebuild
new file mode 100644
index 000000000000..fb790dd7dfb6
--- /dev/null
+++ b/dev-python/common/common-0.1.2.ebuild
@@ -0,0 +1,19 @@
+# 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
+
+DESCRIPTION="Common tools and data structures implemented in pure python"
+HOMEPAGE="https://pypi.python.org/pypi/common"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="all-rights-reserved"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RESTRICT="mirror bindist"
diff --git a/dev-python/common/metadata.xml b/dev-python/common/metadata.xml
new file mode 100644
index 000000000000..1aa53a30e445
--- /dev/null
+++ b/dev-python/common/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">common</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/compizconfig-python/Manifest b/dev-python/compizconfig-python/Manifest
new file mode 100644
index 000000000000..b4fdbff04f19
--- /dev/null
+++ b/dev-python/compizconfig-python/Manifest
@@ -0,0 +1,5 @@
+DIST compizconfig-python-0.8.4.tar.bz2 269812 SHA256 6734ae35ee69d081f35f98a89cd3bccb411a4db7c5b35fbd226270d95ac76f5a SHA512 3cd20014a7d0b186c9659ce104576d8e08e9e9f1f60bed4b7f4097c12ca4c49392621d2328abb50017c7d9f86af5b43675468b1cd4b5d128e23c24371c4af9ef WHIRLPOOL d2b92846acc25a134604a8773f96b5745b65864f4365e864b9a43e72bbaa7a277592911932886ca3e0af052240f3a56d89ff66799bba0afad58bc8b6d33ba2ac
+EBUILD compizconfig-python-0.8.4-r5.ebuild 884 SHA256 415b03516fbec21e16327f58c07c7632086ed9239ff5038fea1621de692dfec7 SHA512 accbdb988081170a31608d41e754ac2c7937018d5836e49a222546b952b572956163316f4eacfa313f9160c8e8084aec3dc3f9ee6008eb80ca1b40f082022181 WHIRLPOOL da8cee57517b9a9c39327cea671ca1cc2a478a9e294e4c20eb5bdd32fc8e156a175b2df13bfef19314859b49f655824dff745944ac7e2a2c27fe9f76f3b74f83
+MISC ChangeLog 2864 SHA256 24ea443340e5561a3cf23f2021944957f7a661e111dbaa7bfffb2a9d0d2e8cdb SHA512 7a376cdedbc7d40512758f63e0e5652a559041c71fce35a458d128bced2723d8a5dbe0be800ff329af2ffa0cf6f26f314a0fc0f2a5e0a91eba858fa4234f18b2 WHIRLPOOL 9815381054d2fc64c5eb6c4640b577589d4c4d1585e972f5ff0e83da75bdf2b4bee54297c6e8f024ee2c887aa1189685bad2d38d91b8dfa17beb50b6d4c94253
+MISC ChangeLog-2015 5071 SHA256 5da4ab8fec9f5a9460caf5036d7dd9595db517326b82927c0077263b4e0185a7 SHA512 1a817b27cd6479c5acc2d7527b9a1a08289946799092e994caac0b4b6d93ffeec4da3dd0c093cfb1286cc7f3be9400286cf51c3d4f5ca291bb328009364ea7ae WHIRLPOOL 1892864af7bd4da283433208850641558fef46106c83769e62b2aa57a58bfdaf219c0ca14481585807e0ce592b331f5e4cdc06191f56f826675b8868e19f2031
+MISC metadata.xml 250 SHA256 35dc90f6e30ad896b1cd6e2c566bb0aa408b75c5e81e3877338b0a7a9521af7d SHA512 2cd5f332f8267721b0daa24b3a1fdab910067f557f4c75b3daff53feae330215b28f7b3763b7c14821c058e72d9c914ab4a069b7f16c2309a07dccf52ef80d76 WHIRLPOOL 7c00c954d992cee643104d6ccc1129085da12b15b001512cb6d44dfaab1d01fb7ee80b9de218ab3469166ce69f0a25134d0eb8c54be0b6ffbc4535b1d2ad4e10
diff --git a/dev-python/compizconfig-python/compizconfig-python-0.8.4-r5.ebuild b/dev-python/compizconfig-python/compizconfig-python-0.8.4-r5.ebuild
new file mode 100644
index 000000000000..bb7fa86eca1d
--- /dev/null
+++ b/dev-python/compizconfig-python/compizconfig-python-0.8.4-r5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils autotools-utils python-r1
+
+DESCRIPTION="Compizconfig Python Bindings"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.6
+	>=x11-libs/libcompizconfig-${PV}"
+
+DEPEND="${RDEPEND}
+	dev-python/pyrex[${PYTHON_USEDEP}]
+	virtual/pkgconfig"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	local myeconfargs=(
+		--enable-fast-install
+		--disable-static
+	)
+	python_foreach_impl autotools-utils_src_configure
+}
+
+src_compile() {
+	python_foreach_impl autotools-utils_src_compile
+}
+
+src_install() {
+	python_foreach_impl autotools-utils_src_install
+	prune_libtool_files --modules
+}
diff --git a/dev-python/compizconfig-python/metadata.xml b/dev-python/compizconfig-python/metadata.xml
new file mode 100644
index 000000000000..e24b832e3550
--- /dev/null
+++ b/dev-python/compizconfig-python/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">Python bindings for libcompizconfig.</longdescription>
+</pkgmetadata>
diff --git a/dev-python/configargparse/Manifest b/dev-python/configargparse/Manifest
new file mode 100644
index 000000000000..dd5644f42ed3
--- /dev/null
+++ b/dev-python/configargparse/Manifest
@@ -0,0 +1,7 @@
+DIST ConfigArgParse-0.11.0.tar.gz 40863 SHA256 6c8ae823f6844b055f2a3aa9b51f568ed3bd7e5be9fba63abcaf4bdd38a0ac89 SHA512 f97d37b5d1c0f5ebfdec4c55e9a8d20d0943a41d16b80fe1b2cfdd6acfa210e0cc7bae49340498c1b31dcc76704e8291892b97415137ec90cf49e24f261c62e9 WHIRLPOOL 88858bd22cd4efc5c32c75f611e33a7f2892a89143c6930fcec4bdc93898c3f666d4ffceedf0c8d22c224b3fbc67565cc2cb94fdc898463238dc0ec73b0ab197
+DIST ConfigArgParse-0.12.0.tar.gz 41524 SHA256 28cd7d67669651f2a4518367838c49539457504584a139709b2b8f6c208ef339 SHA512 d06f969088fb93479decffd984efed61070a663a652b06a3ac8198e64b5d681423f693ac6fdb58390eddc392ded9cf1e45056dad83256a84773c5f558f6788e8 WHIRLPOOL 3107392cd56efdf827871c05fd4849188c0129eb9ee5af3c9922edf6e6f918c08aef3b4da55da80f115438b9056ae5aaccd719b2f069a012b0a25fca777fd421
+EBUILD configargparse-0.11.0.ebuild 623 SHA256 1d4564218e703fb4f0aaa7d582eacdcbb211bab622ab6981f4cf0b99b60b11f5 SHA512 4baaf9c5f93c74cbdce58e8828b571759443ad0e46590a5add58bb6f4db6ae5bdf2bfd4ab47302d7b96f62cbd5c773f841674504fcdf3dbead6052e33729c1d1 WHIRLPOOL 2e4fa06475b3081ff77484f92ce5410ffe2d6eb2b85539e49fe8d4aab0d88eeb4007a742e2b5b73e1f78d5d1b998ac3a11fc7017cd5a376e6efff9d1149e0fb2
+EBUILD configargparse-0.12.0.ebuild 639 SHA256 49a27f2f0b04e404548d0691e8dbf48f4ee9058c437da51c2da278ead6428947 SHA512 5713cf4996ed9ef2eed527fe429059ed3f09d82b27d669ae5fac3c99c84e2b1da2b70526c6492f3b54bc9a7ab335ee75835715786bbe87eda2e2ccb65ad48324 WHIRLPOOL fdf59e2cb5ad096dad0a4b868df009f90654e191689ce3af72ad5d7e10ff809e6c04616babc2f2722651aec7ea24d35bb2d2751b1dca4f23b392d627f4e84dd7
+MISC ChangeLog 3105 SHA256 dbc7e2b3879878b458fb0f47fb351294f54c34dd2bd04e11ddc1b3d71a6ab5bc SHA512 b70aaf6f2abe4b10513b2d0f77d70e0405c7bfb90a1621681c88147f9a1f950236b40869be60632750758fbafb94b44f1e5b5e030bf0967244dd248a92636d9f WHIRLPOOL 58513bdd56b2f03f49c84fc3b77a56f569551e7683f1e64cd0af73461acc7df7f36a3b3ed7da35d9fca66aa96da51cc9e0a97875cdc27310b25668bdd9dc2e37
+MISC ChangeLog-2015 875 SHA256 91c65b35662c7698e1ac9349e2cf49e7aa939630b15c04c6980372bc99431d97 SHA512 5dd1d1a5ed90114f9373f2a3aa5f8bd6570efc82069da480523e4df6c1342bb9212821d395c25f33707908f48b62f0e0e80032dce88d4fd55264f335d7617209 WHIRLPOOL ea2d76a9f89e3e70660a2c0f628462ac094f2fb008fc42331520255b61df0b2714df7e15129f282cfe2675933fce21e8559f5df2e563563ee907a10b8a0e9a1c
+MISC metadata.xml 390 SHA256 c4bbe5b655a16e278ff21bc5302be97926b900e7c8bb1f308ac975914089e476 SHA512 c86e84a3a252aa257c332d7bc64601286733ed107af52d71c86b5d073f2ae3d40be839f28894ce2e33ae257fdd57f038834630219b932088b397082c48d401d4 WHIRLPOOL 75711a7e14b443916fd43419069b20c87b4837c3df5219fe590485dce4f0ff4879c62741a5a188336e8d6496fa97401177febe6d37f56302b494d4d2481f2515
diff --git a/dev-python/configargparse/configargparse-0.11.0.ebuild b/dev-python/configargparse/configargparse-0.11.0.ebuild
new file mode 100644
index 000000000000..234d651e595b
--- /dev/null
+++ b/dev-python/configargparse/configargparse-0.11.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+MY_PN=ConfigArgParse
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
+HOMEPAGE="https://github.com/zorro3/ConfigArgParse https://pypi.python.org/pypi/ConfigArgParse"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} tests/test_configargparse.py || die
+}
diff --git a/dev-python/configargparse/configargparse-0.12.0.ebuild b/dev-python/configargparse/configargparse-0.12.0.ebuild
new file mode 100644
index 000000000000..13c1e37edeac
--- /dev/null
+++ b/dev-python/configargparse/configargparse-0.12.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+MY_PN=ConfigArgParse
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
+HOMEPAGE="https://github.com/zorro3/ConfigArgParse https://pypi.python.org/pypi/ConfigArgParse"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} tests/test_configargparse.py || die
+}
diff --git a/dev-python/configargparse/metadata.xml b/dev-python/configargparse/metadata.xml
new file mode 100644
index 000000000000..de30b3cdd04d
--- /dev/null
+++ b/dev-python/configargparse/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">ConfigArgParse</remote-id>
+    <remote-id type="github">zorro3/ConfigArgParse</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/configclass/Manifest b/dev-python/configclass/Manifest
new file mode 100644
index 000000000000..8e4dd9342093
--- /dev/null
+++ b/dev-python/configclass/Manifest
@@ -0,0 +1,5 @@
+DIST configclass-0.1.0.tar.gz 3246 SHA256 e10b26d2476089d3c98e7dd3b535a93df86a3c6c86a3d08ec047f4d730f9dd1c SHA512 d3a83c742916a9d345a3e8b2fb29d8742cff67a110f9bbaaee6e04fc1134faa6eee13f7344a95f133107afcdfccd394f6a3b5fc516b21dbfd7ac38a5bed00d34 WHIRLPOOL 9b2acce86aab20fc0d1c4a99081b184252a71c6f3df6d5c6efded84f2113c161dad8e15a2a34843962aa61064f43e241ccf9d4aa4b42e20eed7d22cf655574c0
+EBUILD configclass-0.1.0.ebuild 514 SHA256 124600654717299d87a1880f7c3b79924febae87d75ba91c13398db86e6de4cb SHA512 a102ddc65b0c2891ea8cf9a92bce62cc4f603a7a852cddd8a8fd80ce54bcb5cc48874265d9eeffa6718451e547dd1c460981e4450b95f1b8edc78be4f1233ffe WHIRLPOOL c7f3c0037fb5d69553c2e047a6d917bc20b05bbead03938728c840af09f4823436c7d131846e0b470232a3a90d09b3b74d27a2785a2e6d10598c8ffc052760c3
+MISC ChangeLog 2573 SHA256 927b9905d5e992b13309dc75fa6722e8d3e59f72c10fbb2d348eed909141bf01 SHA512 6ef8ef4fe614e72938053607e3d1f90815b25df5a1712f002faa0b6ab0ae3acb2a9d6ead316bee49c90e40c5faf79ff0adcbd8f15d0c942436eaffff05e79f4c WHIRLPOOL efaa10bdfb3c3254af36cf59fe3853bbc7014976e957226818efe93397e1121b52ea6f4a5010f7efdae63283b447d2d6a172ff234ee575d64718b887cfb3e447
+MISC ChangeLog-2015 398 SHA256 1e19b1a0e9f605f7a6ac3dac8f98cba022c520ca2cf1fbceb4ab239ea1d63f78 SHA512 1ce12392803df84948cb4870d391b253234a449c693a1ce568d122393f03a3d142004963e90a5342ed28fbd02e62e06c381b939604ac952bc69776b7791bf845 WHIRLPOOL 6dfb53953001513202fb3126cfdccf28ca1ff28e1a63a192fa2b47f57f520a4ec20b0ad768c85145805549f77d8135688832c93dd56e67d3156efd3c1145716a
+MISC metadata.xml 377 SHA256 19a6c66b571d9b8a61af604a702d0259ed2990a0142a4c3c5327e867523d8ba1 SHA512 6307100bf5465c429ee480c4157953a4a7b24a5429197bb43ec7141b846247c13570f946dcf1795afe2d3c97039d103ad796e1626c0ad80ae7b19814cdbe44a7 WHIRLPOOL 091a67f3deee1de417c572e38f70f793c59551c23c50d8853b59c750741c03dbc9b19c7602cab1519b3c83be796b5403a9e61f4d9c563d420985e2543ec1feff
diff --git a/dev-python/configclass/configclass-0.1.0.ebuild b/dev-python/configclass/configclass-0.1.0.ebuild
new file mode 100644
index 000000000000..d86ce568187b
--- /dev/null
+++ b/dev-python/configclass/configclass-0.1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python to class to hold configuration values"
+HOMEPAGE="https://github.com/schettino72/configclass/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/mergedict-0.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/configclass/metadata.xml b/dev-python/configclass/metadata.xml
new file mode 100644
index 000000000000..9ff657383f52
--- /dev/null
+++ b/dev-python/configclass/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">configclass</remote-id>
+		<remote-id type="github">schettino72/configclass</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/configobj/Manifest b/dev-python/configobj/Manifest
new file mode 100644
index 000000000000..accf457bbdc7
--- /dev/null
+++ b/dev-python/configobj/Manifest
@@ -0,0 +1,5 @@
+DIST configobj-5.0.6.tar.gz 33248 SHA256 a2f5650770e1c87fb335af19a9b7eb73fc05ccf22144eb68db7d00cd2bcb0902 SHA512 f253fdd0bc3fcd37f56c9ceb28f5c8c739b0861e099b07a3929645907c97b2261f0529850a95c1a42507846f72d88a0992fcd1e1d6fa8654dc713d120f769963 WHIRLPOOL fc8472d7fd161f4ccd09e3d99c6e97d3ecfe008b3cd16d623ef6ecd598148a41b4658c6ce7488f30eb581e2fcc09bbb8887240e77582d3c272b88c8da87ebb08
+EBUILD configobj-5.0.6.ebuild 1008 SHA256 41f649e39b77a8b49bde50c19e1b1df4a17c9a28a31e5bdbbcd239f67f433c8b SHA512 e380df6790587f175cf02d33b5f400f57704603b41e2cd0b2c3d012017195750439f770fec6dc1dafa4bd362cd5a62e9165a7ab6e98860645c30377c63fa9edc WHIRLPOOL d61241380d49fca293d484cde69b8a0b0b7b7646f832ede8dc30fb70587890c734b5b64a5c2ea6ad9a2730d4f2242f58b08ffd0e2b12cb30910b53e9fe517ea6
+MISC ChangeLog 3652 SHA256 ffdb4c9023da1f0a90d6dafc8ec6afa43469cf94746a7ed775305510a684938c SHA512 71f80cab63c8fb9e96af761a7b664facbbc60ba7c4107fc12b9f7ef4623f30921514f73da5960370c56d285ef50fadb36d1175e57a835f49747ee8b144b7b2ed WHIRLPOOL 8a17f5903cbdb1006253eeba238656fdae09439f4f3e89c8045818c995f1c7957ebd3ec37cf8e3a9ed1fdb5fc792f140205c64f3815f7e6270849945e105c6f1
+MISC ChangeLog-2015 7889 SHA256 47f1d41a74dcbc91c3c2a6e413f7e5120f54585f01ff0a5689c87eb5a9e2668c SHA512 39b6a71180aec75428389ade29742c42c29a8c820f4b4588c62451fa41e411f959061136a353d88a6ec9e0208aa09fbe4fdd890ec1e9e6d8d03628fc133792ac WHIRLPOOL 06ac4b352337a29f4fb3b0ee81ea4a02038969815d9ed3e135055710305ee91aaff92d42117737f1ce705d0b7e95d649119bb83f1ac76818398619367b36ce31
+MISC metadata.xml 663 SHA256 c5034388cf37d374657b70fcf6e65fccdeb32a30f1c73997396b6a5830bae0d8 SHA512 c8c5d8bd7b5efd97310af1bc9dc172f3623f01b45b44c20ca33f92ad0d09845bcab10e6afd704df1188a747660ee4e7f519a55dc40ca5945c189611740e9c480 WHIRLPOOL 1443d5cf59c55a865576fc856bdc8544f1357278594f05ea65cae17caf475e37d68699d85b24aeee51fd1cc322821d3497c1f6fc58cce7017346fa1643e49731
diff --git a/dev-python/configobj/configobj-5.0.6.ebuild b/dev-python/configobj/configobj-5.0.6.ebuild
new file mode 100644
index 000000000000..e446e5f037d8
--- /dev/null
+++ b/dev-python/configobj/configobj-5.0.6.ebuild
@@ -0,0 +1,32 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple config file reader and writer"
+HOMEPAGE="http://www.voidspace.org.uk/python/configobj.html https://code.google.com/p/configobj/ https://pypi.python.org/pypi/configobj"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# Not to install un-needed _version.py
+	sed -e "/^MODULES =/s/, '_version'//" -i setup.py || die
+	sed \
+		-e "s/^from _version import __version__$/__version__ = '${PV}'/" \
+		-i configobj.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" validate.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/configobj/metadata.xml b/dev-python/configobj/metadata.xml
new file mode 100644
index 000000000000..6d4c52e673c5
--- /dev/null
+++ b/dev-python/configobj/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  ConfigObj is a simple but powerful config file reader and writer: an
+  ini file round tripper. Its main feature is that it is very easy to
+  use, with a straightforward programmer's interface and a simple syntax
+  for config files.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">configobj</remote-id>
+    <remote-id type="sourceforge">configobj</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/configparser/Manifest b/dev-python/configparser/Manifest
new file mode 100644
index 000000000000..664ba2c5d926
--- /dev/null
+++ b/dev-python/configparser/Manifest
@@ -0,0 +1,8 @@
+DIST configparser-3.3.0r2.tar.gz 32885 SHA256 6a2318590dfc4013fc5bf53c2bec14a8cb455a232295eb282a13f94786c4b0b2 SHA512 86c095bb64766e87ba59462a99d0287ec52073f27a1c9be7d37568516bc0cc4af6f362ca90a1b90f52aaa4342dc275d769c77f18d80c0efb114ba6fce37fff5f WHIRLPOOL 125ea0a2f1632c599e30d2e196f463139248b9fe1d0e24945b15f3497646b5e87dd0659c9ba78625d8fbaeac7ea5a7f8fd4124c0ad52e64ebbf4ec06533fe9b8
+DIST configparser-3.5.0.tar.gz 39573 SHA256 5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a SHA512 490b9f7807bce02667f41a48389b51f550818d2bd4296b528833d65d4b04bdbe5b906e7584e55eee4495405267a697ba26a056e6504fe6b3f8cf07ea8f55f7d3 WHIRLPOOL b10b1bf1b605d7da4cac44c0feb53e50b7aa1005d06be218e84e502387b32469bd566a68c1d2e0420eb880a90bb754c6e8875771bdcd7d9207553afed0a1ca9d
+EBUILD configparser-3.3.0.2.ebuild 500 SHA256 f99cdb1056df7a6641ade5d7bf43f5908652082f9456e93c1f8be1523d2168dc SHA512 16602bb08b32942017d65476aea2599975e1aae9cdef2cf883d4e7be1521ab9cf2d6a92c4e4e556893d9c10fb5ee9a1df40d3e45e1f6e77aa1d0550f77589d95 WHIRLPOOL 266d58d69e5d7df6e8fcf8fef7127cba2367b5ea16955dc2b35177fa92e0b39ae6803c35af2d5e9277c21dd0f02d65c8e0f8a54adf6dc5f6e18c896afef521d5
+EBUILD configparser-3.5.0-r1.ebuild 644 SHA256 10370706645fce1521d0b3757e714a8736cc11d952ddd521f6f6b2bc2fddcaae SHA512 7d3778916a5695be57261605937ada38120279ac12f56e4a3768bd39347c2119f9bda942a98cd1a0d80a60e5ab553c2155085938a3f857568dda45895a581ed7 WHIRLPOOL 0aa725ebf21b0562e1b574d3d4e39c17291e51cba1129b22a214a9adc972befc22deaa7d03fe4ff6edb79b88854951a0b085fccf5e9b0a412fb05b6787c715ef
+EBUILD configparser-3.5.0.ebuild 475 SHA256 2651ab7f3c4b8531331764ae11ce69ab99d9ddd909f35b266c6e18bb8f61c977 SHA512 43b4a14010cf5bf4816ac9781e3bd624e947091dd5e44f9bf057906f9e323777864c3c6b98b727c68dcf20d8797c9d12e3a890b3f27febc72f0eb315310d1ea6 WHIRLPOOL 6b60f18f9ce4a661452899b0f1a6caf7833a803736e9d5b2fd4dff73f5f19ecb7f9f611ec36ae79ed054346aab52013b56ebe879ca2fa6ef243653dd89ed1807
+MISC ChangeLog 3285 SHA256 a694072441d5ce0adc7a3ce029e66b0a6ad4eb270db1b4390dc811fad6d70f5d SHA512 b1d0a336ac2aa5062a5ac0a44ca09474dc3b91901c105979aafdcbd8442d06971fdff26908a580d7d791c17295f1806d8975713c549f855272de3ec8a6b46bc2 WHIRLPOOL bc5653dfc3c8e85fb0c59a03e50f04363ff701b4153f3937737f64125a25902869bd82dbec6b0e16d68076dcaf5297b1c17262609dd4dd8837fb491bf4eedbd6
+MISC ChangeLog-2015 1170 SHA256 4920ac13f9f7fe1d01bb069c82ed38a2fef5412c932e95589c0a975561d669b6 SHA512 bfdbfd217a90cdb5e3f748ffc086b284d0ddb3413172c322af6069953b34dcf9f865ce85d0d69e69698ec0c99ce1071804aede1eb76fa915eb098e9a44c01fd8 WHIRLPOOL 9414705bb7866cbc424ecdcec12dddea0f748697b50a51b1cfdfe0c8b9733ceeccb12e4e7c37ed08eff0685cb8c6324c8d7d2567076d402e1f095cf37f368f1c
+MISC metadata.xml 325 SHA256 c0971e4e61a10f01ba17c310d3713b630cae0c8c96c6764a1a5f512626949c28 SHA512 84ae4fb022faa7158c67ee9be02019edf93a84b0f97d56e9bc4384bb57abc4f7c93db747627cd87696506383922101f3f5c58ed8509111b75eb6f3574cabc75e WHIRLPOOL a0e2680969e8906d929e16f10d81545d8a3966039af5e2180902996e2a2763a639d73cbd19bc947da9859f657dadf87900294b4b8566d48bc5d6707c62a8b711
diff --git a/dev-python/configparser/configparser-3.3.0.2.ebuild b/dev-python/configparser/configparser-3.3.0.2.ebuild
new file mode 100644
index 000000000000..e428e301cff2
--- /dev/null
+++ b/dev-python/configparser/configparser-3.3.0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+inherit distutils-r1
+
+MY_PV=${PV%.*}r${PV##*.}
+DESCRIPTION="Backport of Python-3 built-in configparser"
+HOMEPAGE="https://pypi.python.org/pypi/configparser/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/dev-python/configparser/configparser-3.5.0-r1.ebuild b/dev-python/configparser/configparser-3.5.0-r1.ebuild
new file mode 100644
index 000000000000..ec17276bae39
--- /dev/null
+++ b/dev-python/configparser/configparser-3.5.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 pypy )
+inherit distutils-r1
+
+DESCRIPTION="Backport of Python-3 built-in configparser"
+HOMEPAGE="https://pypi.python.org/pypi/configparser/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/configparser/configparser-3.5.0.ebuild b/dev-python/configparser/configparser-3.5.0.ebuild
new file mode 100644
index 000000000000..a79ec9022e03
--- /dev/null
+++ b/dev-python/configparser/configparser-3.5.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 pypy )
+inherit distutils-r1
+
+DESCRIPTION="Backport of Python-3 built-in configparser"
+HOMEPAGE="https://pypi.python.org/pypi/configparser/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/configparser/metadata.xml b/dev-python/configparser/metadata.xml
new file mode 100644
index 000000000000..77871955dc0c
--- /dev/null
+++ b/dev-python/configparser/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">configparser</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/configshell-fb/Manifest b/dev-python/configshell-fb/Manifest
new file mode 100644
index 000000000000..5bf11a1acc58
--- /dev/null
+++ b/dev-python/configshell-fb/Manifest
@@ -0,0 +1,6 @@
+DIST configshell-fb-1.1.22.tar.gz 34383 SHA256 a20b95791cdba6f7587869f4fa4337e8e4effbdec102ac6f7de349fe3b5bc612 SHA512 be6fa988ec42014da7e33c5610c2075c04ac7024e64f1c5665a0178d1390356505d69f93d58cc43b602bd26cb4ca28d085b55feafbce90a5dfb57ab26438eea8 WHIRLPOOL 2d6f0767600728c6803c61b63b4910ad56b349cc62cc74b130fb4e0f94440ec808983ee6b4e9470c00393c45bc95f10033124ef06a6dab573c47477018bf66fd
+DIST configshell-fb-1.1.23.tar.gz 56112 SHA256 927887539d25ad481b6247ab6a3f97c4ca78737b9d8a5e51c187bf95c18a47d5 SHA512 f657c885889d8714817e6b726aabe13909bc74410d00cdd5aa6c6fba773da3eddfeb7c08699292406d0c1f58bb0417da41fdfeadeff8de5107c52d953bb9e468 WHIRLPOOL 4e13fa33d15819d9b85d600f36b75f468aa5794b9f7ca3891ed7e2579d3d2e52912d7cf8cac3f677b688066bcc48c675e13b57274a21f0331626fdfbbadc3634
+EBUILD configshell-fb-1.1.22.ebuild 731 SHA256 9911c2b4432f8ded48368f8f30cb24bbedefc9eab2247b8121babe0bc74e521e SHA512 5ea64151bdde030d5704022ad73c08143642d22bd6a79326fff14e7af28ed3f5be5c381276f2a86eebb127a5d761872d5aa59a815118bf14835ca3be45018e26 WHIRLPOOL 9f531a53f8c3669fe75d1461727993d53cd3dc79a8615db092952daa095a258d3cd4945231df6576d6f5c932aceeda8c4e259d5a56d7c3cd44600dd0909beed9
+EBUILD configshell-fb-1.1.23.ebuild 604 SHA256 edc56b0a192d46b04ec13b25e6605e302ec2bdce153d856008a7d5bd9e79f507 SHA512 20ef1369e9c4eeae235c552fb654acfd3506c536b4bc1772c88332a36a12dd7f122f0da2caa9ba24880824e664d0f19fedd35c8715338ce3a5cbf4713edef6c0 WHIRLPOOL aa3677c61dca85aaa5a860d8a08eaa5c8f838a7f59c71179532c0235a516920626fd1dc0495acffc4d61fb56ffcce6c034dcbc11a5707d0fe0985b6e86af07ec
+MISC ChangeLog 523 SHA256 e2d403b2beece05bd23ebaf050d6e5599adc3dd33b7ea0c959b7554c42753c6d SHA512 0904af600f025365b709c6012e5ad0748e74be3f56adc6735c9b135b7566534d4ad4e2bd6f66ba1eae219c067f4fa8c55698a121939675aae9b84a565b861a46 WHIRLPOOL bdf89235310be944db82948c9a2bd54873953594b3119930c80bedd16bad03b8d120f6e9ba6c0c79c1ba925f3849570681ecd1363921617da18150bec7359243
+MISC metadata.xml 838 SHA256 26c33cfdd2edba7410f170db5adc1714f958e16f50901c90e65f51c51b8f6d70 SHA512 426228139c7da514e5debf7e6b393af66c78b38d3cc36135866e05e0751aed60c44ffd230e1d8a2c06cce44b173444c9f88f0a2175c6a5a96636ec730a53a5de WHIRLPOOL 3b7ddb45a73e6da5e4e274a25d653c1a6e5fdc4e8718423e45c1a55e4535a4289d95d212e559c69c1afdab2524bf547242272d30bfa775f5b276bf2a4806b11f
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.22.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.22.ebuild
new file mode 100644
index 000000000000..a9d5765390a5
--- /dev/null
+++ b/dev-python/configshell-fb/configshell-fb-1.1.22.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 versionator
+
+MY_PV=$(replace_version_separator 2 '.fb' ${PV})
+
+DESCRIPTION="A Python library for building configuration shells"
+HOMEPAGE="https://github.com/open-iscsi/configshell-fb"
+SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	!dev-python/configshell"
+
+S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.23.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.23.ebuild
new file mode 100644
index 000000000000..818f1a60a00b
--- /dev/null
+++ b/dev-python/configshell-fb/configshell-fb-1.1.23.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python library for building configuration shells"
+HOMEPAGE="https://github.com/open-iscsi/configshell-fb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	!dev-python/configshell"
diff --git a/dev-python/configshell-fb/metadata.xml b/dev-python/configshell-fb/metadata.xml
new file mode 100644
index 000000000000..3815d8aec77e
--- /dev/null
+++ b/dev-python/configshell-fb/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>sir.suriv@gmail.com</email>
+	<name>Diogo Pereira</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<longdescription lang="en">
+	configshell-fb is a Python library that provides a framework
+	for building simple but nice CLI-based applications.
+</longdescription>
+<upstream>
+	<maintainer status="active">
+		<email>agrover@redhat.com</email>
+		<name>Andy Grover</name>
+	</maintainer>
+	<remote-id type="github">open-iscsi/configshell-fb</remote-id>
+	<remote-id type="pypi">configshell-fb</remote-id>
+	<bugs-to>https://github.com/open-iscsi/configshell-fb/issues</bugs-to>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/configshell/Manifest b/dev-python/configshell/Manifest
new file mode 100644
index 000000000000..333a40d2ecef
--- /dev/null
+++ b/dev-python/configshell/Manifest
@@ -0,0 +1,6 @@
+DIST configshell-1.6.tar.gz 37246 SHA256 e132fefa763b01c9443f299ae7b124041ffb7cc9c529e419d9c4116a94b85dd9 SHA512 04eeabfbe36f8845eb21cfe2b41a6a82d029ca23fe821ecfbf94d321fb8c9cc20f3d374b385cb20e00fd34a59feb364400d724e973174d9be90dad35813da0e0 WHIRLPOOL 6ebdb8d9b511945c8c065264d15c75ba2cf2bbfffac8b82c1c6b97bc224725898a6c7da9f65638a490a7d547f913a664b796eeda06658cf83982c408af2f8984
+EBUILD configshell-1.6.ebuild 688 SHA256 577815ea5e620acc53e8a3231be95c901ead3ff31ba40c8c3c4c6eb954fd8139 SHA512 9c2075738ce0edeac353a1e6ca02b7dd8762ae6b8c17e9c4f3c99691789a5d0fec7ad218581044ff86127cb20fc6d68a0dc6ab02751991464dc791df3c2557e5 WHIRLPOOL 661478b54d6410c0dbeeeb0fd5adeba9d30d3d6b4e3ba2dfed8f32aee2b2f681c3e091aca1605a1b64c19a69962c4ba8a4ec31d9ffe34995da984521c76dfa74
+EBUILD configshell-9999.ebuild 688 SHA256 577815ea5e620acc53e8a3231be95c901ead3ff31ba40c8c3c4c6eb954fd8139 SHA512 9c2075738ce0edeac353a1e6ca02b7dd8762ae6b8c17e9c4f3c99691789a5d0fec7ad218581044ff86127cb20fc6d68a0dc6ab02751991464dc791df3c2557e5 WHIRLPOOL 661478b54d6410c0dbeeeb0fd5adeba9d30d3d6b4e3ba2dfed8f32aee2b2f681c3e091aca1605a1b64c19a69962c4ba8a4ec31d9ffe34995da984521c76dfa74
+MISC ChangeLog 3326 SHA256 0a6bc22e464b4cd0c2d8dc732e95dadaf1d23915b9b7cf0bbff09f5b4d924d04 SHA512 1dacf5210af213225dfb01666b7156f1228cb32a8089958137a718c55030286335fdfe80971335ff72a3e1f4e466184f8e3603a357b124417cfcc41c88dda616 WHIRLPOOL 1d8c199e1508dbdd591003222563655df98dbd4f1084441370936e7bfa05e635e1f309dddb8481657c5943e85b3949ea954e95ae82fa6fd809d4714b8d9ec9f8
+MISC ChangeLog-2015 587 SHA256 5d4d9ab7669a801b35268c27dd093bb917514ce8f9a714d8bd3b1e068130251e SHA512 e88a797af3299df96d75cc07f36448a086847c23f00cb05f736f71a06d6a73d757a29774f14870f67332d49b61be2a1de15b2f965f02a1de020db8d6f0c65cc6 WHIRLPOOL 6dee057a1140a94b2275c35cb7693c35d5df2df6404043febc86945127b507a71c1bb1f873378ff01abdaeadb56f03c2bfa9c779358bcadb80d15e8f8a3f3b94
+MISC metadata.xml 340 SHA256 bc82d0398b6e4e47a7d7ed987d7cf955bc5f148fb2ac052418e064afea64814f SHA512 cd22fb2356a647fbb63189446497d03dc3f39c6d657bb91ee9c74d3c3c5db97136e280460a9dd8b8694489514e66585a01cfea73984aa24dd66bd1139cdb3f27 WHIRLPOOL a89f165d0d28d7c9818882dd57419dd83d7bbe452131d997e7117f9d2483ff8890017050e35ff7809e3295db99dde93eab1541ddd1646f875cd9cc0d2055152f
diff --git a/dev-python/configshell/configshell-1.6.ebuild b/dev-python/configshell/configshell-1.6.ebuild
new file mode 100644
index 000000000000..01c369dd1a66
--- /dev/null
+++ b/dev-python/configshell/configshell-1.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="ConfigShell Community Edition for target_core_mod/ConfigFS"
+HOMEPAGE="http://linux-iscsi.org/wiki/targetcli"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Datera/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/Datera/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="dev-python/epydoc[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/urwid[${PYTHON_USEDEP}]"
diff --git a/dev-python/configshell/configshell-9999.ebuild b/dev-python/configshell/configshell-9999.ebuild
new file mode 100644
index 000000000000..01c369dd1a66
--- /dev/null
+++ b/dev-python/configshell/configshell-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="ConfigShell Community Edition for target_core_mod/ConfigFS"
+HOMEPAGE="http://linux-iscsi.org/wiki/targetcli"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Datera/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/Datera/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="dev-python/epydoc[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/urwid[${PYTHON_USEDEP}]"
diff --git a/dev-python/configshell/metadata.xml b/dev-python/configshell/metadata.xml
new file mode 100644
index 000000000000..c6e531475cdd
--- /dev/null
+++ b/dev-python/configshell/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Datera/configshell</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/constantly/Manifest b/dev-python/constantly/Manifest
new file mode 100644
index 000000000000..cf6aec448863
--- /dev/null
+++ b/dev-python/constantly/Manifest
@@ -0,0 +1,3 @@
+DIST constantly-15.1.0.tar.gz 21465 SHA256 586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35 SHA512 ccc6f41b0bd552d2bb5346cc9d64cd7b91a59dd30e0cf66b01e82f7e0e079c01c34bc6c66b69c5fee9d2eed35ae5455258d309e66278d708d5f576ddf2e00ac3 WHIRLPOOL 0d8225c0dbef4ca71997ae46eb55da02fde8cd31e9d315667b14daf330a9806e0331e8640f2495d190053bb40c4cc357ba99a5dff8a853535b0271089e705037
+EBUILD constantly-15.1.0.ebuild 564 SHA256 58877967725e85aaacdf2b715355df790ac9fdd9ecf434400d62c2a0c1ca8f18 SHA512 89cac107f1368435fb92b35deeea351d915b2bd5095b83ed602453ec1e7dc61bb70357162cf723b6d2bb6d2c2f860358c5447cba2b3885bc1923c5e63e802196 WHIRLPOOL 338d5df766762f16bcf87a57240beda2b208c7a53270cd15c2eecc17cf8bda042a70cf26a47157811a86996444e5e3223fcc306bd7a66eb62c7238d5d02b91d3
+MISC metadata.xml 762 SHA256 c10b78629fcd6e5ec8c4111ae65962faf397a193ffd42c5c6cd201cd5c8a4028 SHA512 512de83e894e7e6f4c22888f66f7d0f27374f8fe76ca87d645d3cf9272091dcff71dac93c084c1d8733fcee07d5281cde5eae17cf27aa94257485f969a967a98 WHIRLPOOL 3b4a4e28376ea7afec72db3f771dc157477b417e69ee402fdf4b670785f01bb324b9d71285b50bb85f7bfb1ac4e929246a1f4d7bf62be87f3b8a95ab67cb8a08
diff --git a/dev-python/constantly/constantly-15.1.0.ebuild b/dev-python/constantly/constantly-15.1.0.ebuild
new file mode 100644
index 000000000000..ba161fe3857f
--- /dev/null
+++ b/dev-python/constantly/constantly-15.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Symbolic constants in Python"
+HOMEPAGE="https://github.com/twisted/constantly https://pypi.python.org/pypi/constantly"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+#S=${WORKDIR}/${P}
diff --git a/dev-python/constantly/metadata.xml b/dev-python/constantly/metadata.xml
new file mode 100644
index 000000000000..087df162e084
--- /dev/null
+++ b/dev-python/constantly/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>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>twisted-python@twistedmatrix.com</email>
+			<name>Twisted Matrix Labs Developers</name>
+		</maintainer>
+		<remote-id type="pypi">constantly</remote-id>
+		<remote-id type="github">twisted/constantly</remote-id>
+	</upstream>
+	<longdescription>
+		A library that provides symbolic constant support. It includes
+		collections and constants with text, numeric, and bit flag values.
+		Originally twisted.python.constants from the Twisted project.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
new file mode 100644
index 000000000000..db1b3caa3750
--- /dev/null
+++ b/dev-python/construct/Manifest
@@ -0,0 +1,7 @@
+DIST construct-2.5.2.tar.gz 58373 SHA256 665b6271eeadf15219c726b180c8d7a641d026784d72ca3dad90a20aae009020 SHA512 dbfa28f58821811fa28ef170818d74212e76389a017c4073acd24025ace292285828506cb44387ff07c1c05ae70766a3a0679baea25deb3b0dcc31c85b24340b WHIRLPOOL ebe5ac0a09e317a2d8c123f24c110b3ea303c179710da6112c8f376bbf1d526c4c29ebf7f60c12f8873f74ec4ebabf010b4e537173fe28f166da6f49b79635cc
+DIST construct-2.8.12.tar.gz 720277 SHA256 67ee2c69a11bdadc0705c7e0de0ff16ef74b730932537e22ac1f64f479240ffa SHA512 4d0f59623a62eeab3c10e95b4e8153a1593219bcbcbbe5f87e75ba0a010b62021a9502faf715623faa78b4e397f1a74b41e9bffd1ede92dbebf87b0d4a59b66b WHIRLPOOL a73a2ad27c32e0ec59eb2b04fb45eb9f16e93460f722c3d19007840e141dd846695659adff3f6d50581fbf4ecaa37b982317722fda847bf3eb298432146ec19d
+DIST construct-2.8.14.tar.gz 719633 SHA256 7ca89f47a6e3e702465aa360ac3a2c578728cbd7b6c82659ab2f7f48aae4f0e3 SHA512 ada1853ff9559f19dbb153ef4b60a6daf58dadaf0524fcb35c4a38e8c0a476acfbeec2f4d02ebfa1858c9d2660ffc8695d7ff8055a23e8dc40aca8290c53ac69 WHIRLPOOL 9feb7940e160949ed5ce3db246297c5b563f2a10bce7f79866ae6bcc2b18728201aacca76592e5806e08f724217e32026c1bcfcac74df862f96e68fde571c0ad
+EBUILD construct-2.5.2.ebuild 519 SHA256 f8939addc6183072c1a95fc391e6217298d3fc5fa9536adca8a100dc2cedfa25 SHA512 0e2eb4269033e5eddc6862748f239b1932f54908768ab18a6c168528acdf0ecacc3a7f386b9dabe7fa953a9c04cbe4a5e5df9563d16a0b736fe6b9ef531b7dfc WHIRLPOOL 754896abafbce6ec2f23141da1d8707c3333537c84a99c5a1ba1bb34de6efe9c3448fea3d3d324713b6952618e42a916b5c1d6c514bbe0ce507216b274fc81a8
+EBUILD construct-2.8.12.ebuild 927 SHA256 588989c537e88323a2df354d88f428a05f6e183c62b3b8f275435c66ab2f1641 SHA512 7ac7dfa0f8d833b8c4dbe16193594d04587cb3a7a8fd87b7fbff4cb042dbd671e85c25bae7a1b15f203836dfe406421090959330672ee3775b2660b5fe3c781c WHIRLPOOL 401005946e9399b3d2f0e932c59d846ffbabd432ea2a97e0295313ac9acf9787d9320c8dc53ae9b0aa781d95eeb82267e40f172197fba7c004b7090d9d7c0f19
+EBUILD construct-2.8.14.ebuild 927 SHA256 588989c537e88323a2df354d88f428a05f6e183c62b3b8f275435c66ab2f1641 SHA512 7ac7dfa0f8d833b8c4dbe16193594d04587cb3a7a8fd87b7fbff4cb042dbd671e85c25bae7a1b15f203836dfe406421090959330672ee3775b2660b5fe3c781c WHIRLPOOL 401005946e9399b3d2f0e932c59d846ffbabd432ea2a97e0295313ac9acf9787d9320c8dc53ae9b0aa781d95eeb82267e40f172197fba7c004b7090d9d7c0f19
+MISC metadata.xml 371 SHA256 b74a9f9527403b89a2d47c44b27645a3c938da1b17f02e2302659ff94001aedf SHA512 76ffb705910eb725b471bb199767caff4b6d34317fb0d3d0c9697be343c71e13491db6ebcd307472d441f49775e2dce01930c89f798cef815c88aed0b0bb001a WHIRLPOOL 5aeb4549b036d4b5f149509dad5781f170edf817b47a07f6386f4fcfabecc23e31d4ceee8f497e45c5c4973939fa72823b136c9c0d20c244449b1f03a8d16781
diff --git a/dev-python/construct/construct-2.5.2.ebuild b/dev-python/construct/construct-2.5.2.ebuild
new file mode 100644
index 000000000000..620b2f41beb3
--- /dev/null
+++ b/dev-python/construct/construct-2.5.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A powerful declarative parser for binary data"
+HOMEPAGE="http://construct.wikispaces.com/ https://pypi.python.org/pypi/construct"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/construct/construct-2.8.12.ebuild b/dev-python/construct/construct-2.8.12.ebuild
new file mode 100644
index 000000000000..ceeedd6f36d5
--- /dev/null
+++ b/dev-python/construct/construct-2.8.12.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A powerful declarative parser for binary data"
+HOMEPAGE="http://construct.readthedocs.io/ https://pypi.python.org/pypi/construct"
+SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -vv || die "Tests failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+	ewarn "Version 2.8.x has significant API and implementation changes from"
+	ewarn "previous 2.5.x releases. Please read the documentation at"
+	ewarn "http://construct.readthedocs.io/ for more info."
+}
diff --git a/dev-python/construct/construct-2.8.14.ebuild b/dev-python/construct/construct-2.8.14.ebuild
new file mode 100644
index 000000000000..ceeedd6f36d5
--- /dev/null
+++ b/dev-python/construct/construct-2.8.14.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A powerful declarative parser for binary data"
+HOMEPAGE="http://construct.readthedocs.io/ https://pypi.python.org/pypi/construct"
+SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -vv || die "Tests failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+	ewarn "Version 2.8.x has significant API and implementation changes from"
+	ewarn "previous 2.5.x releases. Please read the documentation at"
+	ewarn "http://construct.readthedocs.io/ for more info."
+}
diff --git a/dev-python/construct/metadata.xml b/dev-python/construct/metadata.xml
new file mode 100644
index 000000000000..db2f49e944c6
--- /dev/null
+++ b/dev-python/construct/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">construct/construct</remote-id>
+		<remote-id type="pypi">construct</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/contextlib2/Manifest b/dev-python/contextlib2/Manifest
new file mode 100644
index 000000000000..dce54c73b881
--- /dev/null
+++ b/dev-python/contextlib2/Manifest
@@ -0,0 +1,7 @@
+DIST contextlib2-0.5.4.tar.gz 28523 SHA256 710626cde569f51a87f216ff757fe60f5cd13ae8f8114706590510cd5649ce88 SHA512 c8bb5bf9dbbf5bfd882663813f2a456d82215be7ace55aed1d5047ce7f21f26d5518982ec26344b1e950d3aea27cd8a5c48627730bb28f8b3cfb6a331fd7ba66 WHIRLPOOL bae1717340b05362ae2e55b995920d39e01a37fb147e19838e6a79176809daa39e3fe5774ce74811614fcdadf8f1b28ea757cdda5e4811543dbc2d4b230b132a
+DIST contextlib2-0.5.5.tar.gz 28755 SHA256 509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48 SHA512 d5c97ff8eef7d8b14da0bfdc3515f8019bcc05e24cb922ce08ca2366d5182b029d873bbf172e9e6791297df05e24f6faf40868550063dcdb54f451b14c9e505d WHIRLPOOL e8b79b9df04541756de5575ff69aa048e285fd4bed2345346932ee0938f85bd73f791d4ac86e836237a2dc865166f8d1ef703c120d9580a616bc2f53b9f0eacc
+EBUILD contextlib2-0.5.4.ebuild 571 SHA256 6a586a73c24fa7f3152bcaa789b63d16930305fa33f23cfbab29b799c7ebcc10 SHA512 64806c9de5ec417a1e71a0eec86ef9a39031d9e8b51429d27ec210176e2156b7c2f42cf32c05fb488a7a217164011e283c108626ac5aedb913f5daa5faa8b247 WHIRLPOOL 5e47cc94881f3363c7e6020f225c2b7199a97c4ea932442b3ce4b34fb2cee346b41d559baa667661f76e044a78eaf1f2e7706298acc588402e23c4178612e1af
+EBUILD contextlib2-0.5.5.ebuild 595 SHA256 6c90fc06edd6e4f39ce1e8b8c3deec02786d1930476273e4d2a2d342708e389a SHA512 814caad8b882ee491ac6ca5f99b5c37dbdd495e924c568a28e8bf1b94f40e44568b9eca04f2c6efc6b621297328ada39f0098ad7dd425afef0f98da17729fdb3 WHIRLPOOL f0dfd782d1a1d6c8ecdc93e7328471d1da8d37a92944747bde226bf0e93e5580b489cfbe56405204cf6c201b48dfc18f587798f1d9ffda668c3160378ea4ee29
+MISC ChangeLog 3350 SHA256 e3d28eb052309109e8c2a672d33b4b10024a214d3d4d6d363512c4a987952d80 SHA512 3f87f0ec25ed30cf250efb3c587fa34ecb0177171def401ccc50c643a430a33efc15841722ca94b8194f89760a80f1ba20703a101242e1e7a4654fb3a80be352 WHIRLPOOL f63f84604aaa67a35b73fa8db8422ba9a01cf21262ed5e65bfc3246d10324d24a5f04adf257bf09dcc886adbc3e620c2be2551c6acef3f9aa996bb17126a2ddf
+MISC ChangeLog-2015 1450 SHA256 f9acfe21a789e20ccd47b0638dc9ec19cb56f6c6527c9a1fb0f974ed508b9926 SHA512 b622007c6e4cc171ffb1fda620fb3f95820f53ae8b28001e372da83539589f25c21f82bbf2df8a7dbb1450b934b5061cd1ae0b2499f4a633564b1d484ab7c31e WHIRLPOOL 16281c8a3086109f644f1fc72e09be25a7dd61618ee9faacc19b12ed7666fb910256bf91678646691653b76a80bcf0b595b0ee0e4fe48784b971ec3e360f12bf
+MISC metadata.xml 324 SHA256 e12c9aa8dc0a7117124885df9c369ad2535f726a07eb932ff8acf2f07cd9bce6 SHA512 616fe24d7cf8c1e1c52add7d9a8fc15d6e41cf20c116e73997b1e3a732110f6305e5ec50de9a4be75d58c588f55da30980bbdcbd65078c05a6da0dccd89cb36d WHIRLPOOL a07aeb1ec61efad422c718776138462da119d9f1931452511fb8ad982e293f1d4fe674b24e953c07b19740c0008c13d0b572b75d272cf4d9b5424203e965a320
diff --git a/dev-python/contextlib2/contextlib2-0.5.4.ebuild b/dev-python/contextlib2/contextlib2-0.5.4.ebuild
new file mode 100644
index 000000000000..6884affba34d
--- /dev/null
+++ b/dev-python/contextlib2/contextlib2-0.5.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Backports and enhancements for the contextlib module"
+HOMEPAGE="https://pypi.python.org/pypi/contextlib2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2.4"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
+
+python_test() {
+	"${PYTHON}" test_contextlib2.py || die "Tests fail for ${EPYTHON}"
+}
diff --git a/dev-python/contextlib2/contextlib2-0.5.5.ebuild b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
new file mode 100644
index 000000000000..cb4c36f11536
--- /dev/null
+++ b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backports and enhancements for the contextlib module"
+HOMEPAGE="https://pypi.python.org/pypi/contextlib2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2.4"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
+
+python_test() {
+	"${PYTHON}" test_contextlib2.py || die "Tests fail for ${EPYTHON}"
+}
diff --git a/dev-python/contextlib2/metadata.xml b/dev-python/contextlib2/metadata.xml
new file mode 100644
index 000000000000..834a2b7e152e
--- /dev/null
+++ b/dev-python/contextlib2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">contextlib2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cookies/Manifest b/dev-python/cookies/Manifest
new file mode 100644
index 000000000000..5a08ae7703ad
--- /dev/null
+++ b/dev-python/cookies/Manifest
@@ -0,0 +1,4 @@
+DIST cookies-2.2.1.tar.gz 40704 SHA256 d6b698788cae4cfa4e62ef8643a9ca332b79bd96cb314294b864ae8d7eb3ee8e SHA512 76f362a9a1d74b87c90c5b91ad806d872612d31f487e4067a627409316f6099602c9e5a429f85ce20adcb0a7b63dd131b9e1ecc5c0c6444d1569367432a719de WHIRLPOOL cbce32475c9496adb50519a147d41264c2bcc21005ff5e1d4566ea8475ac7c642349638104489b91d4a8264df1d0882f8d22100e6195841e4ef0f44fed1c68c1
+EBUILD cookies-2.2.1.ebuild 560 SHA256 7d723cde3620aee5af2339a73611daee2010d0617353a4c6fe8250bd1def3117 SHA512 6e9227a8e102445ac7feb3c260ecd305a5ed2c02ea94bbf480fe47d8ef0fa4d58162095e0570e58b67ab6b3d15b83ffc50068d988f3ec454a0d6cf2ee1ad7099 WHIRLPOOL 9d43f88726db98ef42767741d849913c1d2d3ec8d04f88e897010ef5428d44d56c3b7904c96baccd3f9d69de936f2af0e9e1444397b2049af389336e2da3b317
+MISC ChangeLog 849 SHA256 0d202b9b08d1bf47adbd5cf2ef59d173cb4d14bcc4db2f4c94398c325c41bde6 SHA512 babc2df05fc5842ceac939b8e6191b28c4bcf9247cc7f3b1d581cbd933fd14321c8e2573fbb3fb9326d83f9486e203a275e7e04a78e11f969a1a622aadfd9ab0 WHIRLPOOL 12496b8b7e7b453e8657aab5a5db6077deb4a99212cd751e24c0528fb1443089521982e8fa2825a12ec18b05f39743b5b04af972201c48b1e305d8d62360203d
+MISC metadata.xml 310 SHA256 18788e7057b13070ab7cd7b5bc4e5d28d2ffc2626fbaa95d4d54074265c3d627 SHA512 b98da30bc8b8f3deb352a59ca73a88a9640cadbc20b3049523930f6e671cd057d19b4dbd559702efdac09ba1ed238b7df95502e9203f1d34147fdea5a308c82b WHIRLPOOL cfadfda7477bbef198135a0e5e9079d63fccc5d417b51fb96274441611d7b67d4f7f52244c39d34badf0588d71bcbcad3be2bab57c7926ccb7428ed74627e438
diff --git a/dev-python/cookies/cookies-2.2.1.ebuild b/dev-python/cookies/cookies-2.2.1.ebuild
new file mode 100644
index 000000000000..fe9f88b08eee
--- /dev/null
+++ b/dev-python/cookies/cookies-2.2.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+inherit distutils-r1
+
+DESCRIPTION="Friendlier RFC 6265-compliant cookie parser/renderer"
+HOMEPAGE="https://gitlab.com/sashahart/cookies"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/cookies/metadata.xml b/dev-python/cookies/metadata.xml
new file mode 100644
index 000000000000..b89761ecf56f
--- /dev/null
+++ b/dev-python/cookies/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">cookies</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/corner/Manifest b/dev-python/corner/Manifest
new file mode 100644
index 000000000000..2fd3b0926800
--- /dev/null
+++ b/dev-python/corner/Manifest
@@ -0,0 +1,3 @@
+DIST corner-2.0.1.tar.gz 10534 SHA256 102e22797ee75d1432b6dc66aa2850f61388996ece66fd6600508742d2a7b88f SHA512 ebd625ab1e4591b4c21d25ec706c35d37f560b727e1e0d6a79948c4a112ee6f21d3ca30162901a27715074e1345f3bdee1a0345c63e5fec24113e495fb094127 WHIRLPOOL c485239f8b810ff46b29eee9e204537c256a3d9786ef6f885854bb82e0554403ca7a68d37c2a4f1f46bf4064cea09ad4f87d15838563435183c4946e10fc3110
+EBUILD corner-2.0.1.ebuild 582 SHA256 1f1cbe81fd9142a305e00498c5ce1444a7a5a5e15f2aaeb46ea0b0b3d6aecef3 SHA512 4dae7ec6b28af0d4ea35fcd386eab2fea40b5f879058e69bd3be0479024bd617d3234510b472d863996f5aaad7be4475257aeec3cd377b3581ccd7566a87cb18 WHIRLPOOL 132c5c806ef8342912fbb052ed5ede45a7af66fc468834c3f73cdbabe95af6627a1219dde3a04966ebc768b6b0c30af021976918e7a52fb33068ec7ab8b5601f
+MISC metadata.xml 906 SHA256 4e7d65a2fe5807e850f41f87d42113b9eacbdaa6ae9a9e58b8e62e5db16992f2 SHA512 aa1c5cdff441cd455b25ee307f2afcf274eae44fdf5b6cb65d1e5492c39509d5a6edafa32309545c387619f95773bc93d799be160d432cf33bec6eb34d820e2d WHIRLPOOL 530712bc165a27a0523bcabfa8ff8f25cd82d60f89164a78eaf65899858936069c356d22b5e13a6e8fcf47aece25e13583635d9136985a9219ea8670a9f76a58
diff --git a/dev-python/corner/corner-2.0.1.ebuild b/dev-python/corner/corner-2.0.1.ebuild
new file mode 100644
index 000000000000..a5d1404dabd2
--- /dev/null
+++ b/dev-python/corner/corner-2.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Make scatter matrix corner plots"
+HOMEPAGE="http://corner.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/matplotlib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# missing expected test images in tar ball (2.0.1)
+RESTRICT=test
diff --git a/dev-python/corner/metadata.xml b/dev-python/corner/metadata.xml
new file mode 100644
index 000000000000..b8f3109ff572
--- /dev/null
+++ b/dev-python/corner/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="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    This Python module uses matplotlib to visualize multidimensional
+    samples using a scatterplot matrix. In these visualizations, each
+    one- and two-dimensional projection of the sample is plotted to
+    reveal covariances. corner was originally conceived to display the
+    results of Markov Chain Monte Carlo simulations and the defaults
+    are chosen with this application in mind but it can be used for
+    displaying many qualitatively different samples.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">corner</remote-id>
+    <remote-id type="github">dfm/corner.py</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cosmolopy/Manifest b/dev-python/cosmolopy/Manifest
new file mode 100644
index 000000000000..e634861a2cff
--- /dev/null
+++ b/dev-python/cosmolopy/Manifest
@@ -0,0 +1,5 @@
+DIST CosmoloPy-0.1.104.tar.gz 65162 SHA256 f70486c362230ece215a974ef12ba7c9969598a220ecba64de19d0fcd5674e75 SHA512 b79b5b264a6bdd68082fc3f62f40957421d9a6914d1623cc89bac9b64598e5fca5d52290632ab55878c893223aeb3283c9b088987a0927d2c22160bc521359fa WHIRLPOOL 7155a20339a3548b5c194dc22efe62bf30b45c626c13d8a6e2c4a76ab37cbf097cda2ce94bff435f387bb8ed303c83a70cefc3e979f1a04e1b0b14726a4db978
+EBUILD cosmolopy-0.1.104-r1.ebuild 1036 SHA256 441d42cdc0ddc20fc74172893a4b464f81698cb8e37410670fa364004206ff15 SHA512 baa2bc93d405317dad39f814c2b7e4d3dce2b296e49d49d419b8da80fad984bce2ced46e634675242ab1e78e86976d215f9d3e1a27a2911894dc037fffda5575 WHIRLPOOL dbddf59e817dba09b086dca17c30a2f5980d9cb2a702b90ca8a0252ebe991f4671c898c38963321092b1fd99efefa555fd8687d87abfc305cd7cd8cd537dc9e5
+MISC ChangeLog 2829 SHA256 0b52bd3f9649a7bc7dc472cdbe5804698536297ca1fd5863b0421bbc67647b2a SHA512 48081885ace4a7eb38b172a8adb1534c04026058402fb1f22e65fa81f59eec4610cbc5118934a2c3dc6bb13071f15028827193ee31fe6f525118664bbede91cc WHIRLPOOL 67c936e3b84fbfd77592d6d7ffbd7f769b0b8fc4026c25943d90fa38f9b09ac8ec9acf27c14955ded288ad998b050e937922048e0413c4445342edfcc4d3aecb
+MISC ChangeLog-2015 2183 SHA256 e9b2911d2bee6945bc675b9d9a11fe179dbd7cea381eb4c8d87b32d191e3440b SHA512 6fe66d7b82f6405b942a622faf18d319bb790e9348d32bfe89f0830619952cfdfb08c48ecab12d9f4bf73cfbce16fe360b0315fcb0198aaea734eaddb4e2423f WHIRLPOOL 6fc204bffd149e9b9049df6da9af3e22d33600c6e8d6d18004e55a34915fc1ba42c757219af1a12f0119df4c5b9f8480ed6b492a182795426e706cc004487935
+MISC metadata.xml 551 SHA256 2caba0a6aeb2c7e33b0504508daeb9ae088233cd9cd704e99034970d6e2a50ab SHA512 0f6da8ea89687a2ad518e19a53e6814cc26d96c4451e7d968ee103c66f2a4515b80cecb698ebea0c7e9fbcf00e571fb45b72311cef9e1e0dea18b94a025d18b0 WHIRLPOOL b611aaa360cd9d9471bc2d1998535ec29d86ce1427e19408d5f20a2a052a1ebce6a2ae286f54aba1abfd1d0c5c671a12cc8010f6665ddaa4f7f513cb2c072aa8
diff --git a/dev-python/cosmolopy/cosmolopy-0.1.104-r1.ebuild b/dev-python/cosmolopy/cosmolopy-0.1.104-r1.ebuild
new file mode 100644
index 000000000000..320cdb9bc988
--- /dev/null
+++ b/dev-python/cosmolopy/cosmolopy-0.1.104-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7)
+
+inherit distutils-r1
+
+MY_PN=CosmoloPy
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Cosmology routines built on NumPy/SciPy"
+HOMEPAGE="https://roban.github.com/CosmoloPy/ https://pypi.python.org/pypi/CosmoloPy"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND="dev-python/nose[${PYTHON_USEDEP}]
+	dev-lang/swig
+	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )"
+RDEPEND="sci-libs/scipy[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_compile_all() {
+	if use doc; then
+		epydoc -n "CosmoloPy - Cosmology routines built on NumPy/SciPy" \
+			--exclude='cosmolopy.EH._power' --exclude='cosmolopy.EH.power' \
+			--no-private --no-frames --html --docformat restructuredtext \
+			cosmolopy/ -o docAPI/ || die
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docAPI/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cosmolopy/metadata.xml b/dev-python/cosmolopy/metadata.xml
new file mode 100644
index 000000000000..27c8bab416bc
--- /dev/null
+++ b/dev-python/cosmolopy/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci-astronomy@gentoo.org</email>
+		<name>Gentoo Astronomy Project</name>
+	</maintainer>
+	<longdescription lang="en">CosmoloPy is a package of cosmology routines built on NumPy/SciPy.</longdescription>
+	<upstream>
+		<remote-id type="pypi">CosmoloPy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/couchdb-python/Manifest b/dev-python/couchdb-python/Manifest
new file mode 100644
index 000000000000..1b4ce02ca99e
--- /dev/null
+++ b/dev-python/couchdb-python/Manifest
@@ -0,0 +1,5 @@
+DIST CouchDB-1.1.tar.gz 60839 SHA256 9503ea413956c33b5e2af248235afb5e0f011f33f816a32e872f8ff9b0a0e710 SHA512 f68a0bb04f74cf91ae7d190eedec2a9c24c03dd0ef333c27cca7ef7abc95d3d355f78d653d68371a0d27dcc9a8d69f5886627f0eb0c6af49b632becf6bd0668f WHIRLPOOL 44f51ab1a2f05edd8cf2219ce6fb108d99264f4dd952cf71ae89030fe97c2adf54350ae7352271200be2861e4f1e33a199aa072cebd0e16d9f489b8657470f59
+EBUILD couchdb-python-1.1.ebuild 957 SHA256 21d990cd0e5df731b7101503b5bec8bb1b07c845296f7bd989e58dc58002f4ef SHA512 2b3aeada200b3db93c0da0b35fb92d92649da1198d0262d95d70902268c9ca5dc7335a5440a67bf36931e771a68bb6e8d224fb7b3aa83e8f69fcd1e734f91b28 WHIRLPOOL c05232360cc97f0a16d86cf0a9cfab8fca5614ef77194369807a9c3b8556e3438942ffd8a3e749c633230304dbf86b3b8ea81e4b0de66ebba25e1c5d1f1d21cb
+MISC ChangeLog 3889 SHA256 9db3215019117b77449821a6b2f4ae102a9065410799ae09a3ffc4a523458b3f SHA512 e1beb022d3ea6710a934bbfc6278ffede91c9ba08322d9b30ec30a72e1ce453bf456ae7956c187e21b4c17c0ced5d8d1208b0a1c19c5f35126dfb848b613f58f WHIRLPOOL 30f41dd933709df33633cee3e1fe970333e075f64209d6fc0f851edc07586f49cd80ca87ff54957758f1525cdae508b7fe64759920e128edb2bbf5c6e46cd28a
+MISC ChangeLog-2015 5187 SHA256 8a86de75fc77684b67d5ed5257aac384ab85cafdce6a5620ab83e75a8a01c3f9 SHA512 8ecbdd36ed39981eea330d332aab8c6452e6795d1ee8ea7288dfeecbdf82f5ff62895f15dab3da7cdf7bff46fda0dffa3c5e128be11e8244f1e40839d93af351 WHIRLPOOL eba64b66deef11d3238722622a23a46d5fc0b7f14c616e37a8cbc64a133d6bde840550c4e8ad4c2d34d7cdfc39832e5ec9c89573b4444e4e868e922eb43fa25c
+MISC metadata.xml 492 SHA256 1183c959b5c18be387479fb15e1292d95ee0645151a3322d21aa77cdd6863d0e SHA512 69b7bd6ace846417beb252df5372a01726879e839a14c8586deb33a6ff53a2279b088f822cd30d86af58197d9202526eac40d9394f74dbc4093b1dc23277b10f WHIRLPOOL 68b0016bd099f27edbb968fcc3dc34fb2b1d8fb22d0d7070b0a6b1fd478c909a873d5508a72e749dc7a6d4928a2f319ac1c24b11668656e3e84dc4f03a89fd0c
diff --git a/dev-python/couchdb-python/couchdb-python-1.1.ebuild b/dev-python/couchdb-python/couchdb-python-1.1.ebuild
new file mode 100644
index 000000000000..ad0a9c93f976
--- /dev/null
+++ b/dev-python/couchdb-python/couchdb-python-1.1.ebuild
@@ -0,0 +1,43 @@
+# 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 )
+
+inherit distutils-r1
+
+MY_PN="CouchDB"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python library for working with CouchDB"
+HOMEPAGE="https://github.com/djc/couchdb-python https://pypi.python.org/pypi/CouchDB"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+# Tests require connectivity to a couchdb server.
+# Re-enable when the ebuild is capable of starting a local couchdb
+# instance.
+RESTRICT=test
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/couchdb-python/metadata.xml b/dev-python/couchdb-python/metadata.xml
new file mode 100644
index 000000000000..20b3c9795df2
--- /dev/null
+++ b/dev-python/couchdb-python/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>djc@gentoo.org</email>
+    <name>Dirkjan Ochtman</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">CouchDB</remote-id>
+    <remote-id type="github">djc/couchdb-python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cov-core/Manifest b/dev-python/cov-core/Manifest
new file mode 100644
index 000000000000..5d28c045760f
--- /dev/null
+++ b/dev-python/cov-core/Manifest
@@ -0,0 +1,7 @@
+DIST cov-core-1.15.0.tar.gz 5890 SHA256 4a14c67d520fda9d42b0da6134638578caae1d374b9bb462d8de00587dba764c SHA512 1b962a6a7253c1f6530248f3a71058e7709ee5cca274166807f040163c9cc240e9e85e42820063476c1c0f6dfca81d45277738663ed818fe715b30db151ace16 WHIRLPOOL 8a4198b8914507aeeb44c66ece4397c98c86cb7a5206d5b69cfea34bda2399f6c37ad46935839a86edadafecbf534dbe8a275801f9b217e994576f399f0a884a
+DIST cov-core-1.7.tar.gz 5972 SHA256 8050c226fa73234b88e62630d64e0416c879202891309cbcdbb8b556222c3020 SHA512 8e1744f686262c5affc6e2d7b08ce6277b60e79156a4c2491f805325048702f765b64c40acd53d59b5fd7358d85bf3ab367270eef4a12ad209db5f661612b140 WHIRLPOOL cb85a234560bae9628853958a88e15abb85a570710fdfaf627b1a3c0242bf3d6b46bdecd14972744df5331d884c1b592266143f4ececa0b795fb4a682d1156a6
+EBUILD cov-core-1.15.0.ebuild 614 SHA256 ac4faf2b5151b351f845f8200174e876f3fda5f5079e2c1cde6cdd1f37253d8e SHA512 5c1bd3bb2f43fb0d79126334c905960ddedeaf184c7450dac1da0f1a7242a709a3d5976a8d0d7db10fa7c80c78dc4e6cad46068b12754b669af54d793ad34caf WHIRLPOOL fef48a2c26bcb74f03e4d8a3da8496a3b56877d16387dc91ae67faa56c079b62d657fb50daa6acf61d03704a1f5055fcdb638c9833cbdc6521da79610c43f692
+EBUILD cov-core-1.7.ebuild 539 SHA256 378b789980ea15054676fa960b4d010e90fa458661eaf2dd6ef1144b8b46d2d7 SHA512 0eda3e44548bc3124604ecb640f0f5c3c29b89e7d1836c3a5689ba2229803b4ea5dda521033c23b5b134a9d958684e2ef97af6c77e37abdf313a988b0ec0726d WHIRLPOOL b44fa4c274e0086e5fe35125ac8a9283a6a6350af01424902b41fe70044de5a5af4296e046fe9b5b1dac16de3357211067afce6d7aa26373a8fad1d6f4cda760
+MISC ChangeLog 2889 SHA256 b884b53f7a4221a7802604d5417a02cb894c45694e1e480962ce8210ea962b56 SHA512 265f02c324d7aa2448093ca8418fcdd2801ae9068b8f2205918750acdf99ee97bd6013ea2dd1ab5f2172546ac271eb4f97786b3e2a93972a6e209c805e6db96d WHIRLPOOL 4157999763c7ef362f4debcac350fb66d1a0feead60d35069f878540c95e4c1ddccfab783c1a131aac7e149d9bf269f8d3719c903c655c54aec678862278f8c7
+MISC ChangeLog-2015 2448 SHA256 0277f2c827a8d34d17e3b064d447cd086a475692875ace2b89091432fcbebd65 SHA512 abd2102c4affada7f12c40b2e7bda01fa3697b71f33dc93a1e17b65793876dc8ba3cde1756f98bc46733b3157b14028b510316e3763221645611d28954ed3106 WHIRLPOOL 6422c2d913c2300eeb34a5a736f5c997e156109abde4fdf6b7b5083e2ab9d6b55488f8dd87dbac1715f4025f75d909a33b714b49c1064aa7273c4a319eef671e
+MISC metadata.xml 393 SHA256 e920619722b8d2ae2d0efc44b16e06be54cbd87eb69ebef28b4edc04adc07528 SHA512 6b76948ec29858288c7604b9153e30d347f6b718cac4d367170694ec7d57fabb48f3d07ef1478e87924bd39f07be9c1da7a07a393818ddf5d9c9762f44a757fc WHIRLPOOL 750e8b40efc0cf69147e85c2192452000fea63d50ec95b721a8fb0ad670bc02775a7ef9e3d07841ed04cb9a68fb1b844df486c7adf9f8fd196d4f63dfbcec796
diff --git a/dev-python/cov-core/cov-core-1.15.0.ebuild b/dev-python/cov-core/cov-core-1.15.0.ebuild
new file mode 100644
index 000000000000..84102c7187bc
--- /dev/null
+++ b/dev-python/cov-core/cov-core-1.15.0.ebuild
@@ -0,0 +1,19 @@
+# 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 pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="plugin core for use by pytest-cov, nose-cov and nose2-cov"
+HOMEPAGE="https://bitbucket.org/memedough/cov-core/overview"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-python/coverage-3.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cov-core/cov-core-1.7.ebuild b/dev-python/cov-core/cov-core-1.7.ebuild
new file mode 100644
index 000000000000..bf9b6e9f067f
--- /dev/null
+++ b/dev-python/cov-core/cov-core-1.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="plugin core for use by pytest-cov, nose-cov and nose2-cov"
+HOMEPAGE="https://bitbucket.org/memedough/cov-core/overview"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha ~amd64 arm hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/coverage[${PYTHON_USEDEP}]"
+DEPEND=""
diff --git a/dev-python/cov-core/metadata.xml b/dev-python/cov-core/metadata.xml
new file mode 100644
index 000000000000..02d7c7dc74b5
--- /dev/null
+++ b/dev-python/cov-core/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>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">cov-core</remote-id>
+    <remote-id type="bitbucket">memedough/cov-core</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
new file mode 100644
index 000000000000..0c4f24ae7c92
--- /dev/null
+++ b/dev-python/coverage/Manifest
@@ -0,0 +1,7 @@
+DIST coverage-3.7.1.tar.gz 284735 SHA256 d1aea1c4aa61b8366d6a42dd3650622fbf9c634ed24eaf7f379c8b970e5ed44e SHA512 d198b06db938119fad8c13b9a7bbf018a5406c29327c943014e3b9b33ea85f0fbadaef6565fba26a461a3f1ee31f4cbfb42503420cc587c846ce499e80fd5133 WHIRLPOOL f07d239053bf357fe3dca7bec04d390db9b6610060fd848c9f15ea9de2f0a141d66e68cba5833a63bde860f4377c9029574e6ea7ed76ffe2fda332703e3100ab
+DIST coverage-4.2.tar.gz 359873 SHA256 e312776d3ef04632ec742ce2d2b7048b635073e0245e4f44dfe8b08cc50ac656 SHA512 17c508e65e8494bda51dc301eb99e24f39392cc3efe54eee5d94bf45021f91cb5e1acc192981974eb1725e01cd4590c80308bf9bb237a129c2de067bd4556e23 WHIRLPOOL b54816038c8137e49b5d11797357f2fabe0eb11c0f27bad60634081386cf04dab742e2fa4ab78c9473b14ecfe132e6ff31f550e629521a0056b0baebd4cce895
+EBUILD coverage-3.7.1.ebuild 884 SHA256 12282f611c0c00f27ed74f3df2c27ec6fb76c149039753946cffdce16c0518b4 SHA512 893ee73a6a179ce8744c980c298b3c72f9a2d990b27d8bc340eaef5798dc8dff08b1f9cf1460754559a07271a180c7ed1746f2bed57a5e4874c2439358fe1b36 WHIRLPOOL 0872760b527c7772b829e0f8ee7fc36c808f09513209fd8840746b7f8623f32c5ab2e27e1e56b247bdc8c3180cf5dfc0f17dd384b55da6e3858782d61072524f
+EBUILD coverage-4.2.ebuild 1246 SHA256 39ddde004e45c5abf7ed536b400880267951cfe973dfa78ab89d56c294f6ce3f SHA512 7479203e616a242b59548738840d843396c2119d1b64109b7f52be39907c8d68552684688d91f680cb7c658dab47b20cb12af15576e057b9e826dcf053b51c4a WHIRLPOOL b4adc9d5f3ab679d045c8dac2a640a39f0ab319b98459ac3d7acfefbc42ea098f9293113696d21bbea1b733d90de4877a7c6b16caee88a248b7ee75ad68b79f2
+MISC ChangeLog 6492 SHA256 f9893a0d0775442b9713089a4c8b4afa9495c202f896e7f1e2b419ae56a50216 SHA512 9d968f73d3699673414174b7f0bb53e78f90b0b719f1d76de853ec5b73bac11f5c73e8f2675fead87068a8b2fef623faaa6361be5cda579930ffaaa955684150 WHIRLPOOL f16edfd0ab0407318c77b6c2c1ef7cf0554d44ffc37fc86eefcb159f4f8a37678ad38e2464fb5934d66e6fa9ba6ede665b6edd15e27afc40b37043a96833bbf8
+MISC ChangeLog-2015 14655 SHA256 c31d8e2d7443a6a993a269bc8d6742f2b4c392cc3cf60db9c9faf88f02fa8ca0 SHA512 c1a084e5dbf8ab2dbc264922cab9eb120047e907147e9398ce56659fde8dfc5ec19689018b389bc9114011ca7e3bd47d2b3f1fdcd218b37abd9ae06768180967 WHIRLPOOL e7d98df8e69d15175eaeeddaacab3308d40132a13bbb364c213c59f55f0b9849e21edeccb5be9f7a56ab7728c4c19c81289b6cdb0b41669539c4c295c339f1d4
+MISC metadata.xml 713 SHA256 ed60e93f638fb1111de18999761e570438f48c8ee9a21175f4b197a9ede8f1de SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5 WHIRLPOOL 4085b1dcf1d40dfe999717e0c4897544ea1027d5609d822b4b03e7c4e5fcaff6b504a3d61511a05a05f45f0ee39a4198382018801794dd884c1b35886390a550
diff --git a/dev-python/coverage/coverage-3.7.1.ebuild b/dev-python/coverage/coverage-3.7.1.ebuild
new file mode 100644
index 000000000000..29a12d5775cf
--- /dev/null
+++ b/dev-python/coverage/coverage-3.7.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="http://nedbatchelder.com/code/coverage/ https://pypi.python.org/pypi/coverage"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_compile() {
+	if [[ ${EPYTHON} == python2.7 ]]; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+
+	distutils-r1_python_compile
+}
diff --git a/dev-python/coverage/coverage-4.2.ebuild b/dev-python/coverage/coverage-4.2.ebuild
new file mode 100644
index 000000000000..61e628913751
--- /dev/null
+++ b/dev-python/coverage/coverage-4.2.ebuild
@@ -0,0 +1,44 @@
+# 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 pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="http://nedbatchelder.com/code/coverage/ https://pypi.python.org/pypi/coverage"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	>=dev-python/setuptools-18.4[${PYTHON_USEDEP}]
+	test? (
+		dev-python/PyContracts[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile() {
+	if [[ ${EPYTHON} == python2.7 ]]; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	[[ "${PYTHON}" =~ pypy ]] && export COVERAGE_NO_EXTENSION=no
+	${PYTHON} "${S}"/igor.py test_with_tracer py || die
+	${PYTHON} "${S}"/igor.py test_with_tracer c || die
+}
diff --git a/dev-python/coverage/metadata.xml b/dev-python/coverage/metadata.xml
new file mode 100644
index 000000000000..b3249862a84e
--- /dev/null
+++ b/dev-python/coverage/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">Coverage.py is a Python module that measures code coverage during Python
+execution. It uses the code analysis tools and tracing hooks provided in the
+Python standard library to determine which lines are executable, and which have
+been executed.</longdescription>
+	<upstream>
+		<remote-id type="pypi">coverage</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/crcmod/Manifest b/dev-python/crcmod/Manifest
new file mode 100644
index 000000000000..ba88764cf81b
--- /dev/null
+++ b/dev-python/crcmod/Manifest
@@ -0,0 +1,5 @@
+DIST crcmod-1.7.tar.gz 89670 SHA256 dc7051a0db5f2bd48665a990d3ec1cc305a466a77358ca4492826f41f283601e SHA512 3c2f65004761c84f19d6ba95a0af74512108bad5007d9e20f8e684822e4196ce17073e58b47d2fa997e058e3d82782f3393458b6f0e86935418f38877d319a31 WHIRLPOOL 17b05332b71c5043ff870146714e49c84ce58fd9c408c040fcfdc4e9ebd3a340326da7cbc900f7ebf43f3b68e9cd4666ae5f0089aa327b47a0fda5a56ae89591
+EBUILD crcmod-1.7-r2.ebuild 502 SHA256 e2d3218ba488d0e67b762913ec89df6a274405d3d66fb84d73a66bb876162991 SHA512 a9efea8431d90d7053423e70fae59e692d8bf7a0e69aa091bb70cf49f5f5b6cdd7b1c8222094fe9b32e981e8feef6baa11c72b2a41c66a4f6b23bd2f80202c26 WHIRLPOOL 78cd998b1609f647c44b6b6b2a45c489d1fbac2dc1ec2d907b93d00b90c3705a5b875e8e3f5aac7ce29f382111b15aebe291e21dec56a8416f5ea87786bce80b
+MISC ChangeLog 2556 SHA256 c3460f6379267594ae4d868b87b668e59bfda405cfc96612179a9bcd9b927846 SHA512 28022156c3880a130399c3093b60ec631e098bfef897ac95660fd3c5b48b723f204fb518c40070271ccba39bbf747cf629ba0f7aa84288752c490811e57e5854 WHIRLPOOL 2fb797c452bc4ab82bc6d90d183119f41a403dd0cc66fd2a25ea71c12c7bb6415b6aa04451070aca2329f3ba5fada9ed701775c46d05a112ba2381915f25447a
+MISC ChangeLog-2015 1654 SHA256 e4cda1bd381255dac71c39bc55ce59938b38ea37e20c964453d992e8c9e74976 SHA512 423babc1ec0b891c881c567c6c42bc6393e29b128b8d64770c308667db40a4811b35a7249ab5a9ec20a559ace587b5c7ef22bad4abac559b69b6423015cbc583 WHIRLPOOL 429687d4c6261d83f57be982d5dc6f9a90eceebddd4eba5c6215883ffc2313685ea088eeed9e09fe0aa5a2e00b3069293015bd208831f2b0d880a40a95defbc6
+MISC metadata.xml 592 SHA256 cb346771dbba233885dedefe4b82f212865c73f9c10de9dd736ac27a3629ed7b SHA512 b2cd4011048abcfd7853c8411820b7f5d8ca69ec9c12f121f4c2f406989a8a829bb998c05019e68c0dd702f32ccdae94e83d4897d174c4e09a99177ae3a89433 WHIRLPOOL be7ecfba8b3685ea8ec06b38c1e6c6efe1e147fa52542af2937dbec42fefd4d9f5bf5e3883597bac1be90a3991b491ea3bf9795fe676e22c27cb4d1e252c4672
diff --git a/dev-python/crcmod/crcmod-1.7-r2.ebuild b/dev-python/crcmod/crcmod-1.7-r2.ebuild
new file mode 100644
index 000000000000..66b1a3f2c5e3
--- /dev/null
+++ b/dev-python/crcmod/crcmod-1.7-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python CRC Generator module"
+HOMEPAGE="http://crcmod.sourceforge.net/"
+SRC_URI="mirror://sourceforge/crcmod/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+DOCS=( changelog test/examples.py )
+
+python_test() {
+	"${PYTHON}" test/test_crcmod.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/crcmod/metadata.xml b/dev-python/crcmod/metadata.xml
new file mode 100644
index 000000000000..1ca4db946408
--- /dev/null
+++ b/dev-python/crcmod/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		The software in this package is a Python module for generating objects
+		that compute the Cyclic Redundancy Check (CRC). It includes a (optional)
+		C extension for fast calculation, as well as a pure Python
+		implementation.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">crcmod</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
new file mode 100644
index 000000000000..fe0a38cdcaa4
--- /dev/null
+++ b/dev-python/croniter/Manifest
@@ -0,0 +1,8 @@
+DIST croniter-0.3.11.tar.gz 13647 SHA256 38fa316e95990a2d7f45bc7c29edb0c4777e87ac5dd49b102e67d0dae304492b SHA512 3413df2df1ad19e15a6914b387f841112bb65c87e9c315cb70a7b4b83ba737e17b1663950d4d5a758d231e1ac3a2dfda92814fb4506b0c5291641d64a0a79be1 WHIRLPOOL 68233a5844f645ee096d1967eb0b00f9bc593b0e4c2e92e29636140b705c683c32c9cb2d361c95cb0f879c2a0f88f24c3fc159fcc2068044ff06fec0e56c5e3f
+DIST croniter-0.3.15.tar.gz 15953 SHA256 ac0c9811ebdecd27bc29eb0711e2d87c8c280a53d0e92c48b600654d23b1d541 SHA512 88ade63242cc5f0038809c67ba3e5adf36457628eb01f1db8dc99a2d59db8f36b1b0beb9e1ecfa4d8d2bdd1c4f7d9b1cb6d7677851489f64b55ee5fd3fa91304 WHIRLPOOL 5a6bde0eafb737e6971c3fde74e23eb5d2c984d7bba22925e7bfabbd470b67d68e98c5b162a32055534566ea8c36063c05cdbcf3a89171fe21f8fd882a0f8b37
+DIST croniter-0.3.17.tar.gz 17362 SHA256 9db0f313db21e38c6861e88f3649cb828dfc0d450994fb1ed20c279727fc811b SHA512 4215fc7461843cc2c62fca05424d5eb7d0c80c21cc1e637f5ce3c4891da458cd609d6ed501fab7fe244bbb234e9834ec8a12b76289eec10808ed6c30c1b4d45a WHIRLPOOL 740739a439222f8629bd2b05e8a04c6132c9e95c4dea53c7fee4ac02375ed15b4c541b12ac7044e4927fbd6ad1ba1b4de30a80e6b795800b35811c388d6aee0c
+EBUILD croniter-0.3.11.ebuild 497 SHA256 5fc63d7b58faf573b1e591879857515acb8bc98d5e1efc1a51ace02dc63f8c98 SHA512 c4592c0ed03c730fd845ac332b4926c0520abb733c0a6a5d20d9a9f7ad8e6767a69c8562ba6fdef07e2759cc19c6d26264f6b6dfc3782d022f83f575a3072111 WHIRLPOOL 102c57962044fe399acb0ec9433e2f8e0263d6adb7ed70d94bed1175b8af0e6c988ca0bc369a8652e0c6b347ff553ff7585740d1b41f42b3edd28c80cd158d53
+EBUILD croniter-0.3.15.ebuild 622 SHA256 b61ad4143a06cccaabbad513f0c0c2ec0e552b4bb1515d9fd1019666c48d3845 SHA512 e4e6e6ef1a46f4625e6d994f4e640161e1b950ac5562bfa91ab95915e8b27019148c33642901a3b133e1219e9c00a92bde712e1ebcab02c589f7c1063626041a WHIRLPOOL f8486e71a986420dbe0175819ac91cd065ac338b602944907efa3236976248e1876172e65f8d051b5323cf7e3ead90f8015eadc309f6baaeda87505b123097bf
+EBUILD croniter-0.3.17.ebuild 674 SHA256 62c627952db38c880b11b5539f27e40f9c314fb0e4f1d52bf4a77e8f840304ab SHA512 f2ca6abf592c52b78bf4605fc4b67326c26b1d70086000d9fbd51a9ab7e2d4ed966cce828ae21b6c7007ec44d91bafa10304cdf85223616519c6886f17a5b7f1 WHIRLPOOL 33573ab4e9422856617a8e9c400d1067e6cb0e084e663ed7a2a3a5dde8784dc5e711816bbda85e1199e9775a3f12c224d9d40361b7b60ee3aa14c166dedd3b6b
+MISC ChangeLog 591 SHA256 793b267ea25e8447264af668ee9b05735cf2c39a47d8e46072d12fe624821c54 SHA512 3db43c2113955943084da0409bb7ca5056ae58cf87c72f6d00a2c41a776e3b052333c66f8a8415051cc544481554758f8b971fd942d0d68df05a2e29cdd8a676 WHIRLPOOL 036e75545b1784b8bf21ce38daead6604547bd31de50561660791859253c44e4fc660a375f10ea4d83dc744c41ea9318f152b2ac972e31c0680f8cc2c853ecc1
+MISC metadata.xml 344 SHA256 46b988085f15d90d1f4a4fc7ed8b5fe642b1aaee07149527109100950098e903 SHA512 13584ced1986613a6ab7550b050531bb5049b8f0bafc6dd59045620744513d785635aef91f5300cf9eb302b385e6049107691201a866d51061ef2411a24e9a2b WHIRLPOOL 850e8b69446eefa51ab17ee0a6be78c5fb03fef3f21b77d40bd0393eb63e7a0d5fc109155344b916cb057e8ab6b6136aa9e9cea5c6069e59c03ccb390ef554b1
diff --git a/dev-python/croniter/croniter-0.3.11.ebuild b/dev-python/croniter/croniter-0.3.11.ebuild
new file mode 100644
index 000000000000..86580fd4d81c
--- /dev/null
+++ b/dev-python/croniter/croniter-0.3.11.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module to provide iteration for datetime object"
+HOMEPAGE="https://github.com/kiorky/croniter https://pypi.python.org/pypi/croniter"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/croniter/croniter-0.3.15.ebuild b/dev-python/croniter/croniter-0.3.15.ebuild
new file mode 100644
index 000000000000..dd97eb03c90c
--- /dev/null
+++ b/dev-python/croniter/croniter-0.3.15.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module to provide iteration for datetime object"
+HOMEPAGE="https://github.com/kiorky/croniter https://pypi.python.org/pypi/croniter"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v src/croniter/tests || die "tests failed"
+}
diff --git a/dev-python/croniter/croniter-0.3.17.ebuild b/dev-python/croniter/croniter-0.3.17.ebuild
new file mode 100644
index 000000000000..7b852035ae2c
--- /dev/null
+++ b/dev-python/croniter/croniter-0.3.17.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module to provide iteration for datetime object"
+HOMEPAGE="https://github.com/kiorky/croniter https://pypi.python.org/pypi/croniter"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]"
+python_test() {
+	py.test -v src/croniter/tests || die "tests failed"
+}
diff --git a/dev-python/croniter/metadata.xml b/dev-python/croniter/metadata.xml
new file mode 100644
index 000000000000..991d5ec4bde5
--- /dev/null
+++ b/dev-python/croniter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">croniter</remote-id>
+		<remote-id type="github">kiorky/croniter</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/crumbs/Manifest b/dev-python/crumbs/Manifest
new file mode 100644
index 000000000000..615fd1fbdbfa
--- /dev/null
+++ b/dev-python/crumbs/Manifest
@@ -0,0 +1,5 @@
+DIST crumbs-2.1.0.tar.gz 19968 SHA256 f1343b0e8096adc3717a9606d570457ec025677aa75f3abb34c9b7d1aab79fbf SHA512 f68a7d0eb4375db6172ce714cf9350d236320e9a37b732f96cb6fa35f11b14ff19dcb233ae5062cadede625470e777ade12ddebe669d1ab7fccf9425a31a6087 WHIRLPOOL 73f806bbdccca68c1581200cd58c106cdbdbfb19d4ced68776c0c35e368e252ddf92348191fed39818facf79bbe726d1b5a298e5518cff2a4c858d9b53d89fd6
+EBUILD crumbs-2.1.0.ebuild 951 SHA256 1a7168893af41f773d24bb799994ff70daed560aa9ca7483e185aa96ce6e49cc SHA512 6390c9f2ee7e21eee4e7bbef1537db7012b6222e81d111902ef37d5cc554b78e50f0f4ca7e2003ca010d82b6c3b27cc0beecafa0dd4f7e9063e4b112469ffa5c WHIRLPOOL f80bc12f62d0127b8e4e69c75aac3aeb134864efeb56190a9df174f488424aad8cc25aff6363b888bd71c5b4a00861f73f5f20b3c6c01fcb9963874f9fcb210e
+MISC ChangeLog 3174 SHA256 c99ba0e8ad00f411d12dba9fdbf49503cb3c4ff7c8dace14ce00e39b16bb9865 SHA512 dc6de44aec8f1e447ec19d2fbaffec0da4bf3ac3b70b78af653d09f53a5ff682fa7d8a8d09c80979e6bba38694c8174bd18ee8b8cd34e21baa64f0f96a888e5b WHIRLPOOL 6f8e45bfb81ab7bc3fc402f036691cb2cac113f03302e3846cc4ed8ee15bb4e80beabf00859fb4fbcf1f8697e545323814c376cb44cbbce3cecc49979e8897dc
+MISC ChangeLog-2015 1675 SHA256 4f55f464a7be236bdc206e57dbcf2d9f13baa1cf61b0b89c3f98d04c9285c024 SHA512 b99c01eb9db8969c005523f633c4167e8b695afa033379d5e198ef67f35df9df3a97bfcb7a02ab74a7e7a13e2df0ff05b44010d6df4ed8c2dd87b97bfe454eda WHIRLPOOL a9a249fdf74b1b8f4cbd9503dc0dac2c28401e24d6953e06c227bc3404586e2e6390f20f35c1247f0b987e30d3f0cd5b0651ad450b4be17af66abbfa3131c78d
+MISC metadata.xml 471 SHA256 6272c6e24bacc702839b67b35666476045d50736ce2f40251a1dd17ae320a4f0 SHA512 83bdabd1f9a882182cf0ede6bd4ddcf60fed83f80f194ac1fcfb6e5d86869353f6a2592c5f136903d38b8483f0f5bc720800396b45a015210c330a74acebe51e WHIRLPOOL c4a1c893de755c6c4d12a6adba66e6c92f7d94fe8cb3eccab6c1a845b1003c4c27320ffddb51b7b2e6ce46218141c5c8264ad8d0e963106f27266c64d0e9952c
diff --git a/dev-python/crumbs/crumbs-2.1.0.ebuild b/dev-python/crumbs/crumbs-2.1.0.ebuild
new file mode 100644
index 000000000000..5a4c27d1f898
--- /dev/null
+++ b/dev-python/crumbs/crumbs-2.1.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Generalized all-in-one parameters module"
+HOMEPAGE="https://github.com/alunduil/crumbs"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="doc test"
+
+CDEPEND="dev-python/pyinotify[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	nosetests || die "Tests failed on ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/crumbs/metadata.xml b/dev-python/crumbs/metadata.xml
new file mode 100644
index 000000000000..1af7a82afab9
--- /dev/null
+++ b/dev-python/crumbs/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">crumbs</remote-id>
+		<remote-id type="github">alunduil/crumbs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
new file mode 100644
index 000000000000..83503b9a7f33
--- /dev/null
+++ b/dev-python/cryptography-vectors/Manifest
@@ -0,0 +1,15 @@
+DIST cryptography_vectors-1.7.1.tar.gz 26652514 SHA256 47e91b70bbf6852cb96a478cb715ca9234e5ff049c1956088c45c9f738f955f4 SHA512 2edaa91198adcf5e2523ea8d3d25a8cd7df85e6f6c06618301f87af6f0133f5d4672721082205a9a3c0c648390ee772e6107eb6ba76e96649bc2832676df8283 WHIRLPOOL 56e880f97605676dab714ef36bdf93032772b28b977a2ea74101179a20f704645cdb2670613d68eff340149142323d6ef6adf1fe066fd31e85e5e0ccacec34d6
+DIST cryptography_vectors-1.7.2.tar.gz 26652633 SHA256 4be4eee8a11deee5c2f00e389b49de8ce2642130282d1cd0adffb2f7dbe0acdc SHA512 997aa703649cb4b1dc7df37ed2843a6c06a3871df3d1bcf9ebde6466c32103512225d668e6eee62c89e20b74a5885aa2974d82b2cbf3065a902d059268bf1137 WHIRLPOOL 41f9aad77f27c0a0c6bb14ac2b87606a2a316640369e1abccaab82b827759f9f67519b320fade72ea12c46ea4306e8fce4cd5604c9174d62f475d859199b52ac
+DIST cryptography_vectors-1.8.1.tar.gz 26653746 SHA256 2fd61facea08800ca98ac923f6d02f48a7ae6648025b29cdeb51987c1532add6 SHA512 78cf2a50ebbf0b11c57a53ac683a7ee39f157c7ad04d6374cfe5448bc474964ef61f74d0edd63b5a6b871b4efacc0b3fb9ea8d6025a99567ad2e6a5ec744255d WHIRLPOOL e982e3ed38e2b2c6ba5de4f65d86e13360b6418cdfc2b6191d3b4ef63ed740f3a59de8386f45b21149f11801bccf85e500462c1138af06db2754ef29d11a5c6d
+DIST cryptography_vectors-1.9.tar.gz 26653563 SHA256 bbf767727ad1b9d4cb684fb2b36db4cc78bd420fa6999e7e6ca1aab8c30d78f3 SHA512 3c37dc39496b66539f54bf377b4653b59abaa81fc9fbd68e2d337acbfe9c7fd80801b37ddddc2f7698356b22fb9bcd9f8a41ff95ee405b208c267c0fcba56ead WHIRLPOOL 801a6e58cf48b68422905de1a2ccc4ce5955799df505cfcb2a0870a7826acaa29d5f1de0c0752c8b326ea5d3c0530cee660ba030255da47650862eb3425f64da
+DIST cryptography_vectors-2.0.2.tar.gz 27011827 SHA256 512f1e699dfbb41376e938e6dc6d7f1f40b9578f873438f002e2e5212e13717b SHA512 ab14bdf664e6df08c8436eb24c4465d3080aacd4e6cb47a0113b0877f869cd91d4184ad9122a428b323e91316b686eeb167c4e932773cac1e7b2adbc9309ca36 WHIRLPOOL 9c699e29a636ac56afcd12d938a316d4c89ebf55330fb747d61cf24d77273694e91bc5cc212e80c13497b72d24668ef738ecbb47eaefaf7891c046d20d729064
+DIST cryptography_vectors-2.0.3.tar.gz 27011810 SHA256 beb831aa73663a224f4d7520483ed02da544533bb03b26ec07a5f9a0dd0941e1 SHA512 a944ca7781d47e6e81d69c32a717a19c2f461412e38f4d2b93cb02309bacdf01d766f7227a20b520faae2db20cf3dca194ed3c34363dcc70866d9ef6200f65cc WHIRLPOOL c2f35a4421fab2744daa3be10a2eedb461bd8db148b088df94fa3a473bcb4df46312a3e88dadac9df7ae1276e1fe16c38788b946cae2789c093b04ef1aea00ff
+EBUILD cryptography-vectors-1.7.1.ebuild 632 SHA256 fa053ef9730cbb0999a32412179d0efef2d776236695ffdac57a385b2cb314f6 SHA512 652b04cd22ce0aedac1904acbb292355622fbee31da765b4acc2ca7f2e8de577e196acb935eb1335459d11a9fc7367c8ed448eec76538a22ac6151f5b152b27b WHIRLPOOL 9b01cae34ee2785f33740b35316de23ade23fee07f601f3830a032a5dbf84e39c91bbbea14992b4fb3f65df86aad1cc0e798729a5b46c1a738bbb3052593bf20
+EBUILD cryptography-vectors-1.7.2.ebuild 642 SHA256 1c37c9c1ce3dcf6edd4e680d4b62e3e589db298126645c2328b7b5ae2b73e7c4 SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a WHIRLPOOL 4ae022051d04c53286f8e5ef103cef460d13caded51fb19eda3bf7ea5b73da74de99b401f30f3e9eeaa186f68475dd0a48d4ffb128790a15530b5b571f89806d
+EBUILD cryptography-vectors-1.8.1.ebuild 642 SHA256 1c37c9c1ce3dcf6edd4e680d4b62e3e589db298126645c2328b7b5ae2b73e7c4 SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a WHIRLPOOL 4ae022051d04c53286f8e5ef103cef460d13caded51fb19eda3bf7ea5b73da74de99b401f30f3e9eeaa186f68475dd0a48d4ffb128790a15530b5b571f89806d
+EBUILD cryptography-vectors-1.9.ebuild 642 SHA256 1c37c9c1ce3dcf6edd4e680d4b62e3e589db298126645c2328b7b5ae2b73e7c4 SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a WHIRLPOOL 4ae022051d04c53286f8e5ef103cef460d13caded51fb19eda3bf7ea5b73da74de99b401f30f3e9eeaa186f68475dd0a48d4ffb128790a15530b5b571f89806d
+EBUILD cryptography-vectors-2.0.2.ebuild 633 SHA256 a4d7596ffbd52479423f10da1e3092263c14690245a650730f498f0458dc1e85 SHA512 245ab5c5b17930fa85039307428ba2138484831b8dea4afb382425ce13043d66addc3d4616e5b40aec13d11dc8870c9e0b244d2b5abff87ca43b4b6660662ba6 WHIRLPOOL 6fa09f3c3ceacd3bb07431c965a0b324ee457caf99466c29b80b676db41dff32b78c97c5106ba3b3db1a24759e8ea108cede8a2f1ecd705e4fdcfc5b014c7206
+EBUILD cryptography-vectors-2.0.3.ebuild 642 SHA256 1c37c9c1ce3dcf6edd4e680d4b62e3e589db298126645c2328b7b5ae2b73e7c4 SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a WHIRLPOOL 4ae022051d04c53286f8e5ef103cef460d13caded51fb19eda3bf7ea5b73da74de99b401f30f3e9eeaa186f68475dd0a48d4ffb128790a15530b5b571f89806d
+MISC ChangeLog 14548 SHA256 c5f2de1c17990451376eda24dc0d0e9a1b45819c8c8a11cc1de604740f47bf7d SHA512 1e2c9f6273ffb60905f5dd30dcaf94a4c37c32a20af4807acec00593062f14c89dffd48f0f75fe7c5cbd9d91a33ca8051119c7e62e0a99539aa9c0fe4e216918 WHIRLPOOL 0a784e2f313a5d0a8bafea45048c6f66bf50c17cd9490cde8da997f742fd9203bd4f881ca7d280cf519964db5591e3ae002c64c5025860de0faa0ba2e64e33fb
+MISC ChangeLog-2015 5384 SHA256 7e6854358fbe448569b7ef469923057f58b6fa344e315581578f0e209422be36 SHA512 c727701a17221d31216b7e8f3f83349f778630571ec8807c4da9e5a9daa611fbdc932ce94566bdf2c45879158b26201f3d03ae5bd5a806c4f153f387f9d0e719 WHIRLPOOL 1e5323c11ada642b1e86995b5b5b53d8aac94355ca2df42e3b97b56ac0077f7ea6696d66ce19c7c0eacc6690295883438ac673c21d70cb2a288f8c7e07c325d5
+MISC metadata.xml 333 SHA256 bc80b1372c77a6b09ebc055f777e2d16f12b51f439489abeebddd4929a7fce1a SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a WHIRLPOOL 71727a286773144d80ff7fdcb1becf6326e347382c6f07dc44598770628ba5f174e9dcce2f25d51f0ec9e22d2e28634d0f3df45bc351b7a161d121adb017ccf1
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.7.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.7.1.ebuild
new file mode 100644
index 000000000000..78377730dffc
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-1.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Test vectors for the cryptography package"
+HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.7.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.7.2.ebuild
new file mode 100644
index 000000000000..711276fa7749
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-1.7.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Test vectors for the cryptography package"
+HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.8.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.8.1.ebuild
new file mode 100644
index 000000000000..711276fa7749
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-1.8.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Test vectors for the cryptography package"
+HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.9.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.9.ebuild
new file mode 100644
index 000000000000..711276fa7749
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-1.9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Test vectors for the cryptography package"
+HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.0.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.0.2.ebuild
new file mode 100644
index 000000000000..926b73996f8a
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Test vectors for the cryptography package"
+HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.0.3.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.0.3.ebuild
new file mode 100644
index 000000000000..711276fa7749
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.0.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Test vectors for the cryptography package"
+HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/metadata.xml b/dev-python/cryptography-vectors/metadata.xml
new file mode 100644
index 000000000000..95a300692f26
--- /dev/null
+++ b/dev-python/cryptography-vectors/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">cryptography-vectors</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
new file mode 100644
index 000000000000..86dbec8c4cf6
--- /dev/null
+++ b/dev-python/cryptography/Manifest
@@ -0,0 +1,16 @@
+AUX cryptography-1.7.2-libressl-2.5.1.patch 851 SHA256 6f04a456afbc5a6b2a25f1ebf1654485be3ffcc7152480dbc7a8023a1e502c17 SHA512 f2817b03d888201b32fe2fceec568f9df3addf172e699b5e8a7f4cc94a80c88c0b1e8408fba52d253c53d0efa1c3eaa978470a45439b02422f623edbaa351933 WHIRLPOOL 9b092faf482c41bdee35288e9f9aa9a763e73571d761bf54908a63683dc235fab62d30afd397b6f1a4a3d00a3d1aaef87465cfd4f46e2f57996a9bd971ae835e
+DIST cryptography-1.7.1.tar.gz 420673 SHA256 953fef7d40a49a795f4d955c5ce4338abcec5dea822ed0414ed30348303fdb4c SHA512 fb88b0ee9e314526fcdbb6d35da409b7335c7408a69d2350c58379471d2b9d76021010955629cf776d26312f22d4f8aa3f135955a19dfbff9d602176c9bbfd40 WHIRLPOOL 24b705889b95b568000600662ec82e3f5571582525db3571f3285b99f985b0a21eefd14dccc577700bc082891f7d3c563ac78a8bfd8d810da3ff38914ae5a86d
+DIST cryptography-1.7.2.tar.gz 420867 SHA256 878cb68b3da3d493ffd68f36db11c29deee623671d3287c3f8d685117ffda9a9 SHA512 8ddd119385064e1f8288ff318ec16f500b5c125a3811ccb306aeb2664fac495fcdd3cb5a7cbacd10156505c9526b9cdbd66860b35bbcd2f9a6bb285dd6cba8c5 WHIRLPOOL 531265115a6573c54e2cf85a03f1ed0ebe033fd7818168a3bcda938458f9a32464d7de0c226f46a300635ee52e4995285889bb693bc56f77f816bc81d52bfc61
+DIST cryptography-1.8.1.tar.gz 423560 SHA256 323524312bb467565ebca7e50c8ae5e9674e544951d28a2904a50012a8828190 SHA512 273c8ca4ad6c9d1151a8a731d148d02e619e14e37df25dc26030b0a90f895b88fbf4d3e320aec5ea7af4a8fcc58f720c61f48968f912c69156d4e0e794743345 WHIRLPOOL ff760c9dc7dfbba355afde726a9154bcf45102e135b95b431aab5ac34c8003edccafa646b51ca02296aa55f244b0ff752d8d1b775cb76a1c9f15d347d505e8ce
+DIST cryptography-1.9.tar.gz 409664 SHA256 5518337022718029e367d982642f3e3523541e098ad671672a90b82474c84882 SHA512 815e9c09366935f8603a3e6e74c28ce79175596d00dbcd19d3792505237bd1cf953a4f401c2b97e4beaa7f2bbdcf9d7f95c4753d001a07fa816830af97cdd24e WHIRLPOOL b79a10de82b2cf98b27535f0b018f651038ed235f5e63eed48da52a87efaf672057e147b9c1b23701da0505d52cc85558ad3b6e692670a9f9e63061b381500d8
+DIST cryptography-2.0.2.tar.gz 427303 SHA256 3780b2663ee7ebb37cb83263326e3cd7f8b2ea439c448539d4b87de12c8d06ab SHA512 a71219ff52006a7c8bf1553d0f132c747566c630281ef89aac40c65b193b1f0074fc9cda1de7057c76b452113dfb6188c83baef3ed9c05ff18adbc8b7bba646b WHIRLPOOL 2c3b3da3d2d578c0ba29230c0955fd48688fd5039f08eacefc4017c5cd357d1096cdc79a271ff4e7319c1bb344edee12f8c184c33f12569226612a4dccfb6d11
+DIST cryptography-2.0.3.tar.gz 427544 SHA256 d04bb2425086c3fe86f7bc48915290b13e798497839fbb18ab7f6dffcf98cc3a SHA512 fa569c4f5a994e2bd90810649fdf48115bfd5ff46790c849991e8f7a7c8b5435402f92453e4365426ee645623b3bb509c9bb781657c4b4e81e3a36b58ba5461c WHIRLPOOL 4bbbfb4c57a5c4de7c84654d6474bd9b7b0d1eb9ed1f63d91a360b2987187f7bb1910ff4ca540b37fd3e98a00b37d5963a92b2d6ae0acfaab1636f512e887ca3
+EBUILD cryptography-1.7.1.ebuild 1666 SHA256 07c512a796db87de7a6e3ee3fdd6425dd9574478c64ddf9088bb11d67ec5b42e SHA512 d30f513b2b76fb1fa100b9c9a06adf3330e66f6fcc18ca62d01dc493fa70aa6e84e6cc902e0d2d537d456c8fe8b963b25142bedd5d1185d476c032d0c50b7950 WHIRLPOOL c778fbf6714de843212ce33b5233647ae4d2859f41270eebd4c06b353ac383bb873e18fde0102eacb1acc37343ad0cf0ca0b6da8e7f61333a80a9f5befec5a94
+EBUILD cryptography-1.7.2.ebuild 1748 SHA256 d186c9abdd5f89e682598e1c2f6166fbc4041be7d71402f2d88317835c241036 SHA512 f6d6768259d982e8c2f933bd61fd103384110258bb7133184f54ec48a6c91593a6261cef15b4208330192a7678be45e53170ecb16ef3f64b761ae9d258ef7ae9 WHIRLPOOL ef1899c94574e4011964b1bbd6f3a70fe0c1a80273b63b818c8fa9cd36d365c94a92d6c28e398fa9212fe01fcfee8863dd34ae8dc4209a0801aaccd9eed6ac15
+EBUILD cryptography-1.8.1.ebuild 1675 SHA256 653083b45ac8b5e11eff9a8b5742d67fe5b55f45282ea462699d9db62f30291e SHA512 dc74e12777b873ebad3a97d7f8b205e0d200fac1479bc0d8c7e5b13aa8714d3d8866f42380540b6c81e48d83640abbe87582694097f8145e4c88ad0da314ca4b WHIRLPOOL be672028ab6564197e73d618879ea9c5d7015152ddc8d6d67ca5abec972498b2061af21f9216d2a5b8868d5831d46d67b6e197ed86dc72341245ecb2b574d1ee
+EBUILD cryptography-1.9.ebuild 1646 SHA256 2535199d50fafda5a6e5e87c540a253292cee6179fe769e183fbc24c9f7886fa SHA512 a239da1f7e7397cf9153d9ecc5edd49e8a1c18eeaa884a73fe2f592408bf514f19af738202aa81905f55997e5e70b5643a71856db7ff4ea4be63151eda3bfeb0 WHIRLPOOL 53ccfbf3cc57cc2e7b96f45e170f01457aab8080d81b9eec03868df84d0356a9d565c3a1b66d289a600c9e9a7a7c16121d7b6090838ba88b72d96ebf0d125db8
+EBUILD cryptography-2.0.2.ebuild 1542 SHA256 07db5ba031dece262de146cc6a3d4f6e8bf17f2c4458e09def15a86326916374 SHA512 51a737cf880345dc75a7973870dba1971e8f35fba61b744bc4c352a643feedd9f342729e483383dbe4c0dd2b729d3564274bf57c77a35343143b70bffafdca1b WHIRLPOOL ebda0e16cf84820e8317f114277dcddc2edd3822100aa62646083c6fd0c7a725805c90f9b239dbda24a7f168a8b679dd43657be2e469cd252f96b7128741a674
+EBUILD cryptography-2.0.3.ebuild 1564 SHA256 4b39deb3b161c700b2e6ff45e2fe328b4f62ac766449eeaa7e84fa14d0fe28a5 SHA512 b7fa37cd4ec9b9f0a6146c3f83b9987654ee178a990bad5afd4f738c16a4c8a2343cf76e6da90862385d74dcc4e7f77d0a8de99f5971d15790b751f3baa305c2 WHIRLPOOL 9c45e27703a86354749857fde8c342cc7f603c1e384d39aac0a692d10a271f37670a52df8af217a6097c890fe91b815ae8cf52d817c842ec280edb98961f5008
+MISC ChangeLog 18416 SHA256 1c2c81e70a455fcf401bb7c0d61cf38f3de9e7a2cc5ba5c18865038dfd43cea2 SHA512 b327d91034d2141d3c39cc406a0d74ff019994a92dd8f35e8b1715d5f0ba00930a15f42e601013dd7d14a81de0a30fd3b0dbf66a00a2c555f6015b8a6eea9943 WHIRLPOOL 5f09b6aa83487c428ced79af0f2c4d5d85db223f74298a1216b3cc248494f0c7f85ef98aa8461666420006fed1caf61f18679985b75998cfd4dd8ed82be8d1a0
+MISC ChangeLog-2015 8237 SHA256 c22eb0f4c94dd39980a8ce9b7d3b7149bc4ce59a7496f87c7e34951715c94e4a SHA512 b11fd6ecb95dd1265087e007ead9245b577ae76591343ed8f9bbf7c730344f0f31e3562edb87768a4a4dc3ab78a982b31bcbdae52b0060f805a7c4d0d64ec798 WHIRLPOOL 5e148ed158f1a68f8c1580c0ed5ccd3b50a6c88ce2a6228c80f5354eac95f8cfbf31ea6c2e2cc65633b1ef7332eb181efac8eaeb1a954a3004b081b3ed162286
+MISC metadata.xml 384 SHA256 1eb9fe441314061b742ab80221c14c78f22fb93cb64f7eab4f3c89c6b95eadcf SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7 WHIRLPOOL b29d989556a30a69dd73203ee4fb22e15cefa78d441e10f153e0924f4666817530c703e44047f551379c5fa31666d5856c4b3684883064d130913fa9732f6c92
diff --git a/dev-python/cryptography/cryptography-1.7.1.ebuild b/dev-python/cryptography/cryptography-1.7.1.ebuild
new file mode 100644
index 000000000000..2f2ecc9b905e
--- /dev/null
+++ b/dev-python/cryptography/cryptography-1.7.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="libressl test"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl )
+	$(python_gen_cond_dep '>=dev-python/cffi-1.4.1:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy{,3})
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_test() {
+	distutils_install_for_testing
+
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cryptography/cryptography-1.7.2.ebuild b/dev-python/cryptography/cryptography-1.7.2.ebuild
new file mode 100644
index 000000000000..8bd074b43526
--- /dev/null
+++ b/dev-python/cryptography/cryptography-1.7.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+IUSE="libressl test"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2:0= )
+	libressl? ( dev-libs/libressl )
+	$(python_gen_cond_dep '>=dev-python/cffi-1.4.1:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy{,3})
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+PATCHES=( "${FILESDIR}"/${P}-libressl-2.5.1.patch )
+
+python_test() {
+	distutils_install_for_testing
+
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cryptography/cryptography-1.8.1.ebuild b/dev-python/cryptography/cryptography-1.8.1.ebuild
new file mode 100644
index 000000000000..abe8fa0ffb93
--- /dev/null
+++ b/dev-python/cryptography/cryptography-1.8.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="libressl test"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2:0= )
+	libressl? ( dev-libs/libressl )
+	$(python_gen_cond_dep '>=dev-python/cffi-1.4.1:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy{,3})
+	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
+	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_test() {
+	distutils_install_for_testing
+
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cryptography/cryptography-1.9.ebuild b/dev-python/cryptography/cryptography-1.9.ebuild
new file mode 100644
index 000000000000..bf2d5c3f6d58
--- /dev/null
+++ b/dev-python/cryptography/cryptography-1.9.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="libressl test"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
+	libressl? ( dev-libs/libressl )
+	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy{,3})
+	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
+	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_test() {
+	distutils_install_for_testing
+
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cryptography/cryptography-2.0.2.ebuild b/dev-python/cryptography/cryptography-2.0.2.ebuild
new file mode 100644
index 000000000000..c9d042f541e8
--- /dev/null
+++ b/dev-python/cryptography/cryptography-2.0.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 hppa ia64 mips ppc ppc64 x86"
+IUSE="libressl test"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
+	libressl? ( dev-libs/libressl )
+	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
+	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
+	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_test() {
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cryptography/cryptography-2.0.3.ebuild b/dev-python/cryptography/cryptography-2.0.3.ebuild
new file mode 100644
index 000000000000..1e50265eb332
--- /dev/null
+++ b/dev-python/cryptography/cryptography-2.0.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x64-solaris"
+IUSE="libressl test"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
+	libressl? ( dev-libs/libressl )
+	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
+	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
+	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_test() {
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cryptography/files/cryptography-1.7.2-libressl-2.5.1.patch b/dev-python/cryptography/files/cryptography-1.7.2-libressl-2.5.1.patch
new file mode 100644
index 000000000000..38fce99a5ef6
--- /dev/null
+++ b/dev-python/cryptography/files/cryptography-1.7.2-libressl-2.5.1.patch
@@ -0,0 +1,16 @@
+diff -urN cryptography-1.7.2.orig/src/_cffi_src/openssl/x509_vfy.py cryptography-1.7.2/src/_cffi_src/openssl/x509_vfy.py
+--- cryptography-1.7.2.orig/src/_cffi_src/openssl/x509_vfy.py	2017-01-27 15:09:52.000000000 +0000
++++ cryptography-1.7.2/src/_cffi_src/openssl/x509_vfy.py	2017-02-26 15:15:09.889855740 +0000
+@@ -221,10 +221,12 @@
+ static const long X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM = 0;
+ static const long X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED = 0;
+ static const long X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 = 0;
++#ifndef X509_V_ERR_HOSTNAME_MISMATCH
+ static const long X509_V_ERR_HOSTNAME_MISMATCH = 0;
+ static const long X509_V_ERR_EMAIL_MISMATCH = 0;
+ static const long X509_V_ERR_IP_ADDRESS_MISMATCH = 0;
+ #endif
++#endif
+
+ /* OpenSSL 1.0.2beta2+ verification parameters */
+ #if CRYPTOGRAPHY_OPENSSL_102BETA2_OR_GREATER && \
diff --git a/dev-python/cryptography/metadata.xml b/dev-python/cryptography/metadata.xml
new file mode 100644
index 000000000000..2dfa57bc0fb6
--- /dev/null
+++ b/dev-python/cryptography/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">cryptography</remote-id>
+    <remote-id type="github">pyca/cryptography</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cssselect/Manifest b/dev-python/cssselect/Manifest
new file mode 100644
index 000000000000..cc2a1a9c20da
--- /dev/null
+++ b/dev-python/cssselect/Manifest
@@ -0,0 +1,7 @@
+DIST cssselect-0.9.1.tar.gz 32952 SHA256 0535a7e27014874b27ae3a4d33e8749e345bdfa62766195208b7996bf1100682 SHA512 c4cd2c8d6fbfa99b836554685dd59e1e794e1fab06fcf4419a226b0608a05d58be5af54e507003f2a233a22f03d59d3d63c0bf19b3314f15c95ab3ce5f4db6cc WHIRLPOOL 0fabe49d4f504069eb782ba98c93a34fa9433fd4d10a545f46f5aa1a5fb3a898580f4e17d744052590e18fe7a0f06feca0527d86ac243282e826caddfb410324
+DIST cssselect-1.0.1.tar.gz 21849 SHA256 73db1c054b9348409e2862fc6c0dde5c4e4fbe4da64c5c5a9e05fbea45744077 SHA512 060c4b8d427a935b851b4b20d10ef89b9d6f685692b7144afc8f848e318abaa182ed60538355ea3f25050e358f24904fa0d9c01fe77e3d2428e2ef2a825e2928 WHIRLPOOL e89bcbbd08ed35490d9e79e8d6f5c290e4a9e73dc7cdc2217324fb06e1e1bdc18a16c08dbbe8ca4407c0eb77b4c74ff3fbabf9b3307b94b66aae421d33ef8e29
+EBUILD cssselect-0.9.1.ebuild 1122 SHA256 70d21cd09d6d665d2d848ad53f76405d1c8de8ca29638d93aeaf371cfdac3bd0 SHA512 144a4a15f50f477a2dec6ab27216412298e52a98776cfb609bc1955caf4dc347e6fb087ae731b0dafff1e170008ae4b4175cb0154aa85a04cb9416b167241143 WHIRLPOOL a9fefdc8f22063538fd261a0f46b11e9182c7d528ea49c1849c09ccb1a8d3f2ba95f9a33e0a0aa825e3bdbc0f4b0e797b99dbe051aa3aeaf4225b9df5252ef6a
+EBUILD cssselect-1.0.1.ebuild 1246 SHA256 19aa2fb97e81d572dcc5a12a4d5472ce007a4f78ba2261ddd317cac69bc08642 SHA512 b12f567a7904c05e7baf690e80edf663c154bd54e2360bdc43b29ee5be16725467d7ec0bdb8ea95af18ecb533f25da60e520f3ea83384afa507ef54ba38ce688 WHIRLPOOL 57443f71f58104371e75cc6d7c0f023edc8368df63180794dbb2034a243e1ef28f61cba5aef050680fd8b84701a0af92bced8b8f7fa84ff278b258834d95ff89
+MISC ChangeLog 3872 SHA256 47052bf3c44fc9ad895c07454cd1ab743dd6b0af4a4aded201a2db1d590694f1 SHA512 0fc0a9929d2965f0c139b77318677679fef1722316c9775f2cb278baeb17143c8df8ab127f074524a79538a9e8ddee76bb3ca00f00e7b10f8281830d11e07cd1 WHIRLPOOL 0dd457156319b445e7f9995aaca7d9e4f66f12dccfe6a5dcfcd38dbf5d42175778081d6655b12a86af63a76a441f288832229b09d38ebf5e298067e2a6ce9695
+MISC ChangeLog-2015 4377 SHA256 be4928ed320cbea45c82932cdceb6f252e5be201294d78f494c072060b3a2dc5 SHA512 171212b2aabedc6fe397cc9f33aa5b495f23c069ba913a42874ace17392e20a31823ae14bc8d22fdab79b32d5660e2f5674cb1c7ff44936e322823bc6834a876 WHIRLPOOL 09dc9a6f1f2706c997fdf558435e89f89b797964419b5d4cacd6736f2b9c480041e1c0f07c69e7cc80967952fd2298c3210fcbdff10a3a98a8ea541d487f4449
+MISC metadata.xml 322 SHA256 2c18fd95d8fa810aa1111b844ac59f0771286e388507cb60dd1df7653bbe33f7 SHA512 9933f17432e27a6a708ad4c9ec1e5f65197c4c0048fe2deadf3ba66d878f98510e150dfdb83cf935294a529e505b261808b33503f5d6acb622ae1821e065d798 WHIRLPOOL c732e5fb780176d961de84f16ca3958ef0a03f84a6124816e79a74f986a3a91fafd18fea07da092a71bdbcac3ab1b0998da58a608171dff8d7fca7f285a33f6c
diff --git a/dev-python/cssselect/cssselect-0.9.1.ebuild b/dev-python/cssselect/cssselect-0.9.1.ebuild
new file mode 100644
index 000000000000..fa52ddb9446b
--- /dev/null
+++ b/dev-python/cssselect/cssselect-0.9.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="parses CSS3 Selectors and translates them to XPath 1.0"
+HOMEPAGE="http://packages.python.org/cssselect/ https://pypi.python.org/pypi/cssselect"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+python_prepare_all() {
+	# prevent non essential d'load of files in doc build
+	sed -e 's:intersphinx_:#&:' -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc ; then
+		"${PYTHON}" setup.py build_sphinx || die
+	fi
+}
+
+python_test() {
+	"${PYTHON}" ${PN}/tests.py -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cssselect/cssselect-1.0.1.ebuild b/dev-python/cssselect/cssselect-1.0.1.ebuild
new file mode 100644
index 000000000000..628dd49879ca
--- /dev/null
+++ b/dev-python/cssselect/cssselect-1.0.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="parses CSS3 Selectors and translates them to XPath 1.0"
+HOMEPAGE="http://packages.python.org/cssselect/ https://pypi.python.org/pypi/cssselect"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc test"
+
+# No tests.py file in this release.
+# Please check on version bumps if it's still missing.
+RESTRICT="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+python_prepare_all() {
+	# prevent non essential d'load of files in doc build
+	sed -e 's:intersphinx_:#&:' -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc ; then
+		"${PYTHON}" setup.py build_sphinx || die
+	fi
+}
+
+python_test() {
+	"${PYTHON}" ${PN}/tests.py -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cssselect/metadata.xml b/dev-python/cssselect/metadata.xml
new file mode 100644
index 000000000000..702fdf02b1a8
--- /dev/null
+++ b/dev-python/cssselect/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">cssselect</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cssselect2/Manifest b/dev-python/cssselect2/Manifest
new file mode 100644
index 000000000000..82f972062661
--- /dev/null
+++ b/dev-python/cssselect2/Manifest
@@ -0,0 +1,3 @@
+DIST cssselect2-0.2.0.tar.gz 28197 SHA256 d539662218df5db06feaa6688db88c0737a4f9d6a64554a0dba1e8e0d7488ad2 SHA512 18069dd22892d8457865c2960630e984e791c6779b8d3a6ce4542c3ae92535a8ab23fc964e59776095a999a38ad2c40facce3b9164fef68870bb54167b6dc49b WHIRLPOOL b886e2fd8a66f04e9baed5efe7c6b049caf9bde524acd49e3ab1b1692fce40489dcf5a86463ac4ea8156e513118fa17ff82182d02ae48733adb93fe55fc2d1af
+EBUILD cssselect2-0.2.0.ebuild 507 SHA256 514c73aa1dc24331f7e21b314175528550575193c0857dd164b3f73e4ae75d4e SHA512 c3d9c2677c3a269bbdddd5b8e0f14bacba1aca4024088dfd1c9b7bb372f53fe5ce39f3d5bc676ee5b149de01898c8c73fd844ff1216892656f4e6a0d092e81cd WHIRLPOOL 7afd293906d7719e3db192c44dc9f14614b0455852dea9cef0af49efa4d181ad39e3e87663b7a1288a3af9269b029cc504f5e625b7fd91f5dd6a6d26598c1f84
+MISC metadata.xml 323 SHA256 7ef09a19d22901a41f45390c5695cbd356b7a993506cd8e22806e0be78565599 SHA512 977631018db4c06abc89d7eeb92640e7a045c64fdc96ef9d69a4191a6e3e07f6ecea37c779b9fef2e01a433dfcb311e991b31fe4656119fd445154628789c005 WHIRLPOOL 13429bf0dd874049ddd6c5ffec3e92da3950172e68f99bf3f0fb1c820a8a6c07885b77007ad45e40b95f4f4c826a075cba4efdd7a54af0731bca744ac6726dd0
diff --git a/dev-python/cssselect2/cssselect2-0.2.0.ebuild b/dev-python/cssselect2/cssselect2-0.2.0.ebuild
new file mode 100644
index 000000000000..2a92f39f6873
--- /dev/null
+++ b/dev-python/cssselect2/cssselect2-0.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="parses CSS3 Selectors and translates them to XPath 1.0"
+HOMEPAGE="http://packages.python.org/cssselect/ https://pypi.python.org/pypi/cssselect"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
+RDEPEND=""
diff --git a/dev-python/cssselect2/metadata.xml b/dev-python/cssselect2/metadata.xml
new file mode 100644
index 000000000000..5e93d5bcc827
--- /dev/null
+++ b/dev-python/cssselect2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">cssselect2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
new file mode 100644
index 000000000000..2a71da9490cb
--- /dev/null
+++ b/dev-python/cssutils/Manifest
@@ -0,0 +1,8 @@
+AUX cssutils-1.0.1-pypy-test-backport.patch 1215 SHA256 380dc6d6e1dacbb4dc5b332b99d4dd730776a47dcf131eea21851fdca62ccc1d SHA512 a0072d67f034b066a30ec9cd35b5f618ce8e0beea2b1236b6900d7e028b1ed7d6095ca0beaf0eacb3f7e8a4649e22b98951df9a303d4761f15d7472e2e57b41e WHIRLPOOL b92e961b09042d1deb1625f4a6685691b7e61b3c33e033d57fee219e7b07066fcc2b2a90285b0013adb59e182fc390c4ac3116a15912c36c19e10a75e8cd7477
+DIST cssutils-1.0.1.tar.gz 353621 SHA256 d8a18b2848ea1011750231f1dd64fe9053dbec1be0b37563c582561e7a529063 SHA512 932a128443cc31f689d91c7c75a04ddc79824b4e5c0779e48d30fa0a3a760cad82d8208264ec95a3b120c38962f2eabf6b3456aa8f81d24e9c9718e95fd6bf83 WHIRLPOOL b3cf4f4e94671a7cef49956f40b6ea67264fdeb305197e125d059c8fa815747a872bd5e15c2745c6fc602dc7d27881a2258219817b2abc7b9953bb3bb371e808
+DIST cssutils-1.0.2.tar.gz 367038 SHA256 a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf SHA512 4988893875a03923d3127e334654799e5c2ebcdc0a7f5b3fb5c9ab27d1b331caa5bf197161312a298531e0757843aa3259ceba5fa19947353eea24a5da53ceda WHIRLPOOL ffabc8132b9fdc4f3bf6748f8c1892641d0552df4a7ad99b8679fb970903215481d62468a68b151c4f964d05ee2bf589ef00baa7df9de33b8f4aad512bfcc441
+EBUILD cssutils-1.0.1.ebuild 1307 SHA256 a6b3491fa2e9b5cc6771700efb2adcfc1098c50b6afd5a2a371aeb997a7bbf63 SHA512 084e4279202b1453fa14a33e7e584b79926b5e9ce0b2bc0f82de16e62d47d1bf092a457d2fc620688d2bd7b0c2449d93e5ab38c422f184824e8d4e2716e801ef WHIRLPOOL e09ee271459a4de62dbac735c851667903787c3fe452a582258970085a2c4675a083297f686c3fbda215c0e3d1fcf202c4a3c73588126173a0d48672b4077328
+EBUILD cssutils-1.0.2.ebuild 1254 SHA256 b055f9214805234d951f2faa20241c3d32976b7169962f4f4797bf49d1df9944 SHA512 7b825cdefd5caa1623bd238ed8f8b99026717896ecd9a84d0625264414a4f795c53ed968039f4ba68aef3649b075c5949b9ba1b2bc1b5942e2d6783fc5a96e72 WHIRLPOOL 244d9ddcc81c5eb753e0767dee70001e33a01d9ed61bb280efb0130bbf2396457a1d3ddd32cee4d04dd705843191df84b5db66b3555e8d13b3c9fb0a2c01393d
+MISC ChangeLog 4235 SHA256 37473ccc2d70731c8b8e17e60085288c24b824e5a9cc091ec9e391027893fc07 SHA512 ef03eb47b7584c8945f76c14f18e8bfd89cef7b4ff806f39ee525cb5fab3ffad06925c73c757eb91d11591b133f6b7a6378a0486ac43689de3112f3e0cbdb0ee WHIRLPOOL f3265342c6b16ee853fd61a39233316e60ef91289b78ca4e1e5b97217d466523d9176fd24ff5e2cf5e588f29e87f0c148c3835946475ebcaf00b4284faad04f0
+MISC ChangeLog-2015 6774 SHA256 6f189a1893e278df2963eae7a7fefaa3f7cccd7624476830fb7d4008e5dcf97b SHA512 180ed17fbf11174ed6bc433711c80081fdee1abe5ec875f53f06fd20247fe147a013d2766a17461af232a603b59c98c729269662d236d7ff82630fe50c4a8f11 WHIRLPOOL a80393a8a360b2ed32c11178b1ea27fe6bbead6c400cdd3c87fbdf06fce6eb0cae9bc917a31614a22aaf86787d7c8a0b3cde25a35cf06b06a8aa11eaed899d48
+MISC metadata.xml 669 SHA256 4d7c2ebe59f83d7d8531eb64a4a6525622e48b2ba2e84ddf8eea40606de59fa3 SHA512 3fe0661179833d29c8a5e5ae2b7d872ad860354c58bff8e18935f5876fd95cf8fdfbb4ebda9719198dfce891647d04f263d213b74eca635005098a89a0402294 WHIRLPOOL 1fa2ccb67261e43ec37afac5d27a179a55b59320f375256b79eadefb008d0613718cc87d51a0a9ecbd4129ad8b9d1438cf7ea6d675566e61305385fc7f43c8bd
diff --git a/dev-python/cssutils/cssutils-1.0.1.ebuild b/dev-python/cssutils/cssutils-1.0.1.ebuild
new file mode 100644
index 000000000000..dc4289b6fe2b
--- /dev/null
+++ b/dev-python/cssutils/cssutils-1.0.1.ebuild
@@ -0,0 +1,53 @@
+# 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,5,6}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A CSS Cascading Style Sheets library"
+HOMEPAGE="https://pypi.python.org/pypi/cssutils/ https://bitbucket.org/cthedot/cssutils http://cthedot.de/cssutils/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm ppc x86"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pypy-test-backport.patch
+)
+
+python_prepare_all() {
+	# Disable test failing with dev-python/pyxml installed.
+	if has_version dev-python/pyxml; then
+		sed -e "s/test_linecol/_&/" -i src/tests/test_errorhandler.py
+	fi
+
+	# requires old pbr, does it really?
+	sed \
+		-e '/tests_require/d' \
+		-i setup.py || die
+
+	EPATCH_OPTS="--binary"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	ln -s "${S}/sheets" "${BUILD_DIR}/sheets" || die
+	# esetup.py test
+	# exclude tests that connect to the network
+	set --  nosetests \
+		-e test_parseUrl -e test_handlers -P "${BUILD_DIR}/lib/cssutils/tests"
+	echo "$@"
+	"$@" || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/cssutils/cssutils-1.0.2.ebuild b/dev-python/cssutils/cssutils-1.0.2.ebuild
new file mode 100644
index 000000000000..c07182ec400e
--- /dev/null
+++ b/dev-python/cssutils/cssutils-1.0.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A CSS Cascading Style Sheets library"
+HOMEPAGE="https://pypi.python.org/pypi/cssutils/ https://bitbucket.org/cthedot/cssutils http://cthedot.de/cssutils/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Disable test failing with dev-python/pyxml installed.
+	if has_version dev-python/pyxml; then
+		sed -e "s/test_linecol/_&/" \
+			-i src/cssutils/tests/test_errorhandler.py \
+			|| die
+	fi
+
+	# requires old pbr, does it really?
+	sed \
+		-e '/tests_require/d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	ln -s "${S}/sheets" "${BUILD_DIR}/sheets" || die
+	# esetup.py test
+	# exclude tests that connect to the network
+	set --  nosetests \
+		-e test_parseUrl -e test_handlers -P "${BUILD_DIR}/lib/cssutils/tests"
+	echo "$@"
+	"$@" || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch b/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch
new file mode 100644
index 000000000000..f5f1bda3516d
--- /dev/null
+++ b/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch
@@ -0,0 +1,32 @@
+# HG changeset patch

+# User Daniel <kingdread@gmx.de>

+# Date 1448482419 -3600

+# Node ID 01a19d494b6f31e91c54ae39c5a6f43f6292a85d

+# Parent  3a01bd18118a6466ad93aa23caaa4164528b59ac

+Fix tests on PyPy 2

+

+Tests fail because of the extra "u" prefix in the error message

+

+diff --git a/src/cssutils/tests/test_profiles.py b/src/cssutils/tests/test_profiles.py

+--- a/src/cssutils/tests/test_profiles.py

++++ b/src/cssutils/tests/test_profiles.py

+@@ -2,6 +2,7 @@

+ __version__ = '$Id: test_cssvalue.py 1443 2008-08-31 13:54:39Z cthedot $'

+ 

+ import sys

++import platform

+ import basetest

+ import cssutils

+ 

+@@ -124,6 +125,11 @@

+             expmsg = u"invalid literal for int(): x" 

+         elif sys.platform.startswith('java'):

+             expmsg = u"invalid literal for int() with base 10: x"

++        # PyPy adds the u prefix, but only in versions lower than Python 3

++        elif (platform.python_implementation() == "PyPy" and

++              sys.version_info < (3, 0)):

++            expmsg = u"invalid literal for int() with base 10: u'x'"

++

+             

+         self.assertRaisesMsg(Exception, expmsg, 

+                              cssutils.profile.validate, u'-test-funcval', u'x')

diff --git a/dev-python/cssutils/metadata.xml b/dev-python/cssutils/metadata.xml
new file mode 100644
index 000000000000..fbd9010455e4
--- /dev/null
+++ b/dev-python/cssutils/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lordvan@gentoo.org</email>
+    <name>Thomas Raschbacher</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+A Python package to parse and build CSS Cascading Style Sheets.
+</longdescription>
+  <upstream>
+    <remote-id type="google-code">cssutils</remote-id>
+    <remote-id type="pypi">cssutils</remote-id>
+    <remote-id type="bitbucket">cthedot/cssutils</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ctypesgen/Manifest b/dev-python/ctypesgen/Manifest
new file mode 100644
index 000000000000..a14fb15fa435
--- /dev/null
+++ b/dev-python/ctypesgen/Manifest
@@ -0,0 +1,5 @@
+DIST ctypesgen-0_p72.tar.bz2 85694 SHA256 1a43b7db43034fc88908c156ce701cb0a4c4f21b023f9e3fa46d488307c92b24 SHA512 eab85c71a2f98fd03ae582899de680bd861e7e6e20841ac087520f8b844dc686ea519b0510382cedec09ff3fa1d87fcc1c79878a2eb9219d7cc092423813e2e5 WHIRLPOOL b15e11d8d24280f4bdaf22fd3e6c8e13b36830e846774832ca584c0c816a0c814021ee95750b79df4a9ea701d99f0b1eda69f5e945a02184f788872aff409c95
+EBUILD ctypesgen-0_p72-r1.ebuild 827 SHA256 a89bc828cf1f843d8715f2c89cc83083910d224cbb2dc12751b677c32ab88088 SHA512 41f75aa9f6ef7ea850bdaf111816dfbff825f134b8f5545f8114193f8c7df8b008b4f261104eece9a73f01811095b1112098e16f797532ace088ca2a1e125c9b WHIRLPOOL 73f4b66acf44e8523e68cc0bf20cfea9acd73f1ca370b7fd6a154b34ca48504a69415c96ed8f30107c610f7fc670ef55e31d0bbff552c1de9b3c995aab5866e3
+MISC ChangeLog 4536 SHA256 2d1038b877ab866720421fe4ffabfce6dcedfc8ef0b41519e50504f5f0fab451 SHA512 c979ba82cea870a67b1e54b5aac6096f6e3c72cfb1abd8b7611d09e592517f8a8e3a5943ff0a67fae52f8cc6db1f2ed81dd35d0b87b8ae65dcb2164b327dc2d1 WHIRLPOOL 196b40330df949794a435963a98861e5ec61d41cfe8a835d549f38aea505a72e23b019355ee254ed97437c6dc5dd29df372a79af506016e3fd3aa91d04db3f0d
+MISC ChangeLog-2015 3213 SHA256 b13acd0423b9fda512b71df20f3d63412d8b304bc1fc95ca7ac085f4e0802287 SHA512 e4def1d6ddae32c011a21e6a7a3cd0ca851b043ef140376f39fae7984a5367cfe2155f84677fa989cfebc6b6d695e5295540e318f7298c6aca3ceb2ff68ae293 WHIRLPOOL b893c4424a97baa27d303a320401d46ad49966861b6ad5e3c4e4b181bd5aebc49b9f0739b47c8d94880ced70f9f4e184d1b8fbba85a2678b0966c73402172d66
+MISC metadata.xml 327 SHA256 0c208fa8dea43942ac0fa34759ad328142a4f5187d47c78e3e985d593610bfcb SHA512 3cc32b4405bb86fec917d9fb3ff5aef6ebc1d4f73474a1cddb34dd6861e7916315a09f5171ddff9e35d61d1aab29cf0be47fa20c347fc8b93e2db6ca8323cb6c WHIRLPOOL 6177b6d6a0f93f5faf8fe63889ef529ae0929267c70cea0c8936c63aacc1e4255476a4f17c231ebe4dd6b384bcc3da41afb2ebfdccf871848ae536ad05b4913e
diff --git a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
new file mode 100644
index 000000000000..5e0843d1709c
--- /dev/null
+++ b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper generator for ctypes"
+HOMEPAGE="https://github.com/davidjamesca/ctypesgen"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+python_prepare_all() {
+	# r73 upstream
+	sed -i -e 's:libc:libm.so.6:' test/math_functions.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cp -r -l test "${BUILD_DIR}"/ || die
+
+	cd "${BUILD_DIR}"/test || die
+	local f
+	for f in {math_functions,simple_macros,structures}.py; do
+		"${PYTHON}" "${f}" || die "Test ${f} fails with ${EPYTHON}"
+	done
+}
diff --git a/dev-python/ctypesgen/metadata.xml b/dev-python/ctypesgen/metadata.xml
new file mode 100644
index 000000000000..64f7f4e7715f
--- /dev/null
+++ b/dev-python/ctypesgen/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">davidjamesca/ctypesgen</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cursive/Manifest b/dev-python/cursive/Manifest
new file mode 100644
index 000000000000..a343ed91fd8f
--- /dev/null
+++ b/dev-python/cursive/Manifest
@@ -0,0 +1,6 @@
+DIST cursive-0.1.1.tar.gz 18522 SHA256 751745b868f6450d928749c9d08b0040bd13f82bcf7c4ed414a57da66b2bc104 SHA512 3a6ae804c010ae2b596eac8fbc3c9be6d7994ea8984513617f1eaa7c77c8335ce2c36419d8e6acadb305210d96d51ead8470a79e8425f2c00ef0dc9ead59929b WHIRLPOOL 8c5705780deb037fb61e9a511fecda55673fa069cda0d4e605c7387266a18bc6eefb3992910f44464268a86f6fd26580f381e8e96847eb04f1d51fef9deaacfe
+DIST cursive-0.1.2.tar.gz 18620 SHA256 6d36beccc3fcfb0ad0a0f38e5474775b91676116736a1cd158318f2a40a81103 SHA512 e8957df9de252435a534bef3b84c6b96de369036515e74614433f4d270aa8cb0bc4f467591a839ddb3b5f76ab7f302b18d6af5f79c7554f027a3cfb4e0571fba WHIRLPOOL 596cc56836bfc76c2f95100faa82d386f600e0862ca63ce325eac467df80318ae7724d6674c92fa08a9cc790a4191c5e36546c4163e00cb9592f5d8cf5f2f5f4
+EBUILD cursive-0.1.1.ebuild 1037 SHA256 90cc1547a0b3569d93b6eba8e62da30efb00dbd1b750b20b07bdca5058bac216 SHA512 0a6ee0f9e349c1c16ab65a6c404f479d64a85970f750d8a8b476b0f90186eae3c0886a0963dde41017d09e16bf82cd3dec67b9d33830b7db8057708775063942 WHIRLPOOL 86e4bc70fdc369e41bf2155233f5c431315ee04ad5c2b5c917f71b45034a84c520377164d225d4d028d67c6ba1f59118daa4e65cc39072fd04910b3066119496
+EBUILD cursive-0.1.2.ebuild 1085 SHA256 e91640af824e557876dddf0d3f6db9e138e7d17947ab5fb8d8d4510c13ae0eea SHA512 a39541d510d607dc00d5c4c8bd2420e8ddc77384c07e63380c7e97a246db0c054dfe867da72b0703d85faf36dd9b15c2ef320ee736d962260e61307e3ec5d32c WHIRLPOOL 649b90990892acbd99ef609fa4fa8f20c1ce52d1488e09e6aa6ad5c357a999f9c3abae94cd77685905348566717c372e043c8a21275ef57be9209ce73f46091c
+MISC ChangeLog 461 SHA256 11b34b40c5f4337dace1e02c5badff24692f67a96ce6dddfed745a9ebb949946 SHA512 3e8dc52ba375e0dd17d0af81c4581bcc482d23b121f0762be7b1a5eb613d5087a569867591edaae19adef3009725b16cd2d10acd32b7a366c6cf7e0cbe2c3f35 WHIRLPOOL 6e13817dd8183064486934873517cb4c2ad47a7853839a648574b8c99be4edc7dbe6bce8342b614618e3382f25abbd08064c35226944f3c7aadfd41b2b2d51e5
+MISC metadata.xml 633 SHA256 62dac07d5587a2ff87bab98d823c2d564669f0b0b32a1737ef4f667916af4d47 SHA512 0ab2f1ce6ef8d6e2a53a9dad20c26a26beddb6738857e3cd360362e0c1ad1c562eca6551cc88bb8ad4a8e08f621224934a4476b1ff22aee805dfe6f1ce352c6c WHIRLPOOL d5555fa267d830f56dc78363018954fd3115a3b0517a750f2d4a914b9bcb368db3143694661cd9cdc0c4ff8371809559c7b9769a0f06c4ac8780e82a6a39ff9a
diff --git a/dev-python/cursive/cursive-0.1.1.ebuild b/dev-python/cursive/cursive-0.1.1.ebuild
new file mode 100644
index 000000000000..10c5464071a6
--- /dev/null
+++ b/dev-python/cursive/cursive-0.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cursive implements OpenStack-specific validation of digital signatures."
+HOMEPAGE="https://github.com/openstack/cursive"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/cursive/cursive-0.1.2.ebuild b/dev-python/cursive/cursive-0.1.2.ebuild
new file mode 100644
index 000000000000..a3cfaf8f9e62
--- /dev/null
+++ b/dev-python/cursive/cursive-0.1.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cursive implements OpenStack-specific validation of digital signatures."
+HOMEPAGE="https://github.com/openstack/cursive"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/cursive/metadata.xml b/dev-python/cursive/metadata.xml
new file mode 100644
index 000000000000..c1128eadb030
--- /dev/null
+++ b/dev-python/cursive/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+    Cursive implements OpenStack-specific validation of digital signatures.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">cursive</remote-id>
+    <remote-id type="github">openstack/cursive</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
new file mode 100644
index 000000000000..57892288c8ae
--- /dev/null
+++ b/dev-python/curtsies/Manifest
@@ -0,0 +1,7 @@
+DIST curtsies-0.2.10.tar.gz 46320 SHA256 26d5c3356bf318443f57866903dda3c66a10da3b86a79bc3e9b2719bb5272715 SHA512 0e4349e460dd9d8ec5c900d1b3dd98ede7c7462f9842cb4bb22e1f1a2a0048090593af2c1cddf26a1239db00060429b27785e05de84ff9b4199fe3b8d4973fc3 WHIRLPOOL dca8883f43fd062205b4864976cedd53095b0d769b385e8c0370ed0fce1eb78903d4b42de99b9622d2599fd2e9dc70bb10e69e87c181b22afcbb388109cfb782
+DIST curtsies-0.2.11.tar.gz 46740 SHA256 ec4639df654357944c201abd0d791d9dfd3ac27ce4f90ba1c2991aaf07af92ee SHA512 1fd71d9bc4125a427a5990c6fcef4f73f6e677096eda8d29f7dfee7fe6fc3a350fc66c4383d5e9370a3ed19dfa211285f8b99c425b154e22d3cb4718e1f1d05e WHIRLPOOL 4d1003cf0f3c49907cd13bb67bfead8ba044c69d7ad88de7210482780aeb2c6f19d82cae0ac05121302828130bdbf91b348816210f5c861a70cd3d0205709f74
+EBUILD curtsies-0.2.10.ebuild 809 SHA256 22ef1b10217b73fcba1def1bb16e6beb13f1bbe69d7a39998a11da0e1dd46a6c SHA512 34ab6cc55fd9fabbc744408b9e28c650bbec769f488df5851e8d2f226366ce65c6ac44886922f94683fc9b224f5c80951e7f53becb13f1eeef90ac54260ac8b8 WHIRLPOOL 95afd5a93a50239001a7fdb23a7ea79da478e46a440bc68a8b23dc4f7e3ef8e485493b6520d7ff5185aeeabe449f6d06d96e551df4f3e6bbffb07318a766bb41
+EBUILD curtsies-0.2.11.ebuild 813 SHA256 cf37006ec8f2d95e7d3beac31119c244da2465f28d32770da474695de4c42f14 SHA512 0ecdd277243f2c2a739c46a34690640feaccf9c7f9e3ab5db9cd5c061eab368e42543033f2a4d95753965ae486ac27be496a0a22a59e2962f88e13f0738338cb WHIRLPOOL aa601bb3d48dd945140b5743b05e75581e36d1ff8b4c2e702a9624dc6bd805b004a44fbd1e6d8a2bd3320fbc8c07a87c4100755e98700b14d961187fe4155932
+MISC ChangeLog 4413 SHA256 53c9e1cf098363ec991eeb86d1458b0fbde0286cba91e074417b56204ee34c57 SHA512 4efb07afa52736b8fbdc828f9451239d5121967a4a82c9622e40fe6279cbf11f513f597518b0719062497fad75a8a7408a494c013543539969dbde08832ee634 WHIRLPOOL 732fb27940d456b06cb40edd558d89048cc30b6f8d06f93e94b508f9d3fdca4077daedfce517a410b15d76ae255f9577fc07283a41afb4a45c8838007690f0f9
+MISC ChangeLog-2015 714 SHA256 7e2d17f1edb9d11c3310df7dfcd66a73b35973a80f9f21f4c153597a202a68c1 SHA512 82fd673fbbcf1fbc244858dda049bd11e8618a60373ce841eeaa1cca7f4fab06e815fa97db028f8945dd5b68e48e9cd72ebc364dcfe5e76039d96d716eac5dc0 WHIRLPOOL 00eddf9f4a92a7c5ffa43802f6443b121a3c9bf40c931d8ffb5b248d18d0963051070ed395c94d32df11788b2352978c4a1e1a2351629e63aace273edbce0a6f
+MISC metadata.xml 387 SHA256 7091cba76d345845d5fcb6cc048f712f9f952eb15b0ad8b9cd2764ad2b6d8445 SHA512 c5e6232c1d85452c22de8bb1b112abe47881e3d0c4fcdda8b7e22ac7544222b63b48becaa225d40ce2a3025966474a0f9bae126f0348b1ada65c1447921dc714 WHIRLPOOL 654d59e6d732ccd7b13dd40d00573df869d800957dda2b5ea7155784286798420341fa11ee9559ace4cd142e33227a0895bf8eb8f8529610c4c58d7b8de1569e
diff --git a/dev-python/curtsies/curtsies-0.2.10.ebuild b/dev-python/curtsies/curtsies-0.2.10.ebuild
new file mode 100644
index 000000000000..b2c7e2fb6434
--- /dev/null
+++ b/dev-python/curtsies/curtsies-0.2.10.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Curses-like terminal wrapper, with colored strings"
+HOMEPAGE="https://github.com/thomasballinger/curtsies"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
+	dev-python/pyte[${PYTHON_USEDEP}]
+	>=dev-python/wcwidth-0.1.4[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pyte[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --verbose tests || die
+}
diff --git a/dev-python/curtsies/curtsies-0.2.11.ebuild b/dev-python/curtsies/curtsies-0.2.11.ebuild
new file mode 100644
index 000000000000..b6c030de8ddd
--- /dev/null
+++ b/dev-python/curtsies/curtsies-0.2.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Curses-like terminal wrapper, with colored strings"
+HOMEPAGE="https://github.com/thomasballinger/curtsies"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
+	dev-python/pyte[${PYTHON_USEDEP}]
+	>=dev-python/wcwidth-0.1.4[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pyte[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --verbose tests || die
+}
diff --git a/dev-python/curtsies/metadata.xml b/dev-python/curtsies/metadata.xml
new file mode 100644
index 000000000000..8a2b8d2a7ae6
--- /dev/null
+++ b/dev-python/curtsies/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">curtsies</remote-id>
+    <remote-id type="github">thomasballinger/curtsies</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest
new file mode 100644
index 000000000000..acd3a4412ade
--- /dev/null
+++ b/dev-python/cvxopt/Manifest
@@ -0,0 +1,12 @@
+AUX cvxopt-1.1.6-glpk449.patch 39362 SHA256 0289f6b4d726dc39b9a8ef1a8542ab355262fa291f14b0e6b33e14270fe72f59 SHA512 e494dbf0e6426f06fdbfc289caa541fdbc01451213e7700f9b51cc87f0d349eb869706112d8485149ba529f50f35e9b3cd0125ec2c0f27fd809b34b2f79d1dde WHIRLPOOL 5b7ba0067fbd582b55ef17c5400a795921cf6e96f5e01b741e74670cb3cd119cba88d4b09cfa111829816ab9b01d862f655c5fb95e267a9b5295c493d0a626e2
+AUX cvxopt-1.1.6-setup.patch 6312 SHA256 72a6c35b3bb20d655bbe1eb96e0abf1f9c253d82a1ae7094ef74eafd150b636b SHA512 ac89c43dafa66e41ef5608d1a8bdba2d94919303222778d8ca5fb266bd405e80f3ed7ca3ed7278ea0dfb65461d11c8adf0ce78772494aa8c0524d6eaca6456d9 WHIRLPOOL 55e6dc351f2e64fa88df8d3d72def2a87a2e8a78627118f73010839cfb0be707db8f0ab99ce3d0efdbcae964dac55ff5a2b63cd1e2b7ed197165942f012a6b8a
+AUX cvxopt-1.1.8-setup.patch 4586 SHA256 084b203e1bc9a477dbf6b1340da8ad8160ec5f9448f2afbf20f1e72dc2f1396f SHA512 b48179544527584fbed368b7140097bac81ca95327df3dc1a1d43d071c23c9c0745a4ccd0f4dd297c698f5b0cb44180b68f044a39dafbb8482ffba511b2c6d40 WHIRLPOOL d2c8e895d0b642cd6f9f38ca44cbccb648eaa65c3158bc730ce7200c46d2a10db6a1bdceeac14ac9686c303a4fd38405b551df6e816d012bfe2958129314e498
+DIST cvxopt-1.1.6.tar.gz 3352996 SHA256 7b4ccf3ed896dde6624623431c0b1f5e32d874384329ed716f51babcbf416227 SHA512 b9f5fd7870412423b60068d205efb99d3630012509cb659fb67a10d6175906768846d7c906cf2fcac4be29afd558619b71e2dca730041329195a2365dd1d722c WHIRLPOOL d43cf090ee0396a77851fb71e6e34c980152bccdd5fdb3ecc53d0a464a505ac87a1e7198d313ec669443970bcf8a2d616f03c2f861b7df2f620bd583a97ea140
+DIST cvxopt-1.1.8.tar.gz 5354013 SHA256 c96f8d01ae31a5bdec36a65b0587f50cfbf8139335adb70442350a8042da2025 SHA512 fdf047f203275e687c51b88575639ab0383207f8748969939ecf2939f9a2acc9f5d0e97c68377466fce81eb979b5eb058834f75134cc56df5dbb01805cb98c93 WHIRLPOOL 65c8a246e03a7136c2bce3c7ef831f9f82c4cc84b7a1e5db6a2643127ea9164c35782fb1013c0eaf7ac190d036887a131c705fa56b78bda179792eca9d016d8b
+DIST cvxopt-1.1.9.tar.gz 1872932 SHA256 09997fec809179c9bb9fe8cdd202ad6ecb675f890658219022f492e0797122ee SHA512 bb0982cd1489157df4c7cd0dd92bf83b1692dc3a27d6b9a7a465dda9f9daea4ea5ef69e48642a879d036679bd0b0fe0dfd782433ce4cc570e90e11823733e58b WHIRLPOOL c9ba8b674dbcf1799a99559f3794db2cf8f57f5584865294fea5ee6932d59a9d9980e10197e8e4cd291d591bad9d92b24737a909b5bac6f6617597afa057c171
+EBUILD cvxopt-1.1.6-r2.ebuild 2521 SHA256 53267571e617eefd11203731a13db2f7f5a8e63f60681170f5054ffabdc50632 SHA512 f3121534347fb0fa66fa74986c169cf09236b6f193f26b18127fd76bac877583fbe6c2fd3123471eaac5df58249aaa9bbb4a82245d5e7c9b5b646a84488b868b WHIRLPOOL 6495278f900f534b7ba3c5d5e6035a2c62c75761f60730124ead9879f9e6614b903a23bb9e868043994d3b7a37438747423fe4fdca48346f458b2e6992565b65
+EBUILD cvxopt-1.1.8.ebuild 2572 SHA256 2e0af090496e210c1e55f82ff5323974c523f39ed1f5bccb6625cb51a97d7a0c SHA512 464be47edb5993512da0cf9f94ed40a767d6806cb5b99427e202d1e89c893c89c45111f11643496ae606a4a73538a4f17a8a0562440b9f26d86d9874a568d453 WHIRLPOOL fe6de5bbfb96961277b6cc44fab4d1cc2542ff5fdc22fe3a421764f8ddf130341b8d83dddefaa01ec672f4a0d306478316bb97f9d5b7fc60fcf0127c794b6ab4
+EBUILD cvxopt-1.1.9.ebuild 2887 SHA256 9c98caa3c4de9355c3b5fd2e448187012f291250a91ae4af9f43e72db936e3e6 SHA512 647370781d4b3bcaadcd6b08b25c17340f73c428ccf1da6d659955e52d762694404028e61bf5cb0572778dc11b11185b57538c19078537e61c53cf47fd0a5a90 WHIRLPOOL 17735a78d7952cb124bbc56f38a0ac7346784cc67421de51c38ca2548de5b8abb98a3404f0da46074584c7f636e30df50348b9fb04d8d12646af136754aa25b5
+MISC ChangeLog 3698 SHA256 ecd2235276d2052d192048730e4d6f7e10d39525b07224cb6e0f4b750a38670a SHA512 fd1ca459df6abfa79925f33b677d38742650cd3f6702b5acb0467a390afd73cc00a5fc76be163748e3808376c33bcd72ffaa2751745344d361839730806c48f8 WHIRLPOOL 032d10228d17c8ec458ca9bc02566f61a76fbf2cba322e5a43fae177b003511fbc6fc34091450eb4fbf59eaee96b46b7706c5a4f4724cc9ab6681bbf7a822387
+MISC ChangeLog-2015 5833 SHA256 5e1397f9388b0ae89ad699fe7b5e7fd743292144ecd77f2bb72f1398b2534935 SHA512 9d1577314be6b3a5f26e7c16bcd8f01577d3bec9994fbc0e49b27550c9e2e152099eb8263cfe29c6da4009f0c1204ffb8741963ed520f86a1b5e95567c9e27cd WHIRLPOOL 2e650decef5f7fc0a656caf806c46a6d113c5c1a6211383ea85178aa38c3aa1e65f186ed634bdb51320cf099ac15d81fe30a716fddd9e61073bacedbcf4c15aa
+MISC metadata.xml 805 SHA256 607cadf1804415f92f442f404dbebd5fd444ce24e7f855f222aa82c50e242b66 SHA512 52bdd0bdc12807d7a3d2d820af3167b0768225167377bdf42e5f7218d5154deab2bee8bbcfdd173301e4b1d87f268bfb4bf6c1f884113c2d1f3fbf7fa1dc2ab6 WHIRLPOOL a6a9abee6437bcf1f880678c79acf7f973a989bf1baf6a15e2a2eedd853f5363b029abad12358d8e499a3957ce4a4dcd903590889393c51214c52eb80508352b
diff --git a/dev-python/cvxopt/cvxopt-1.1.6-r2.ebuild b/dev-python/cvxopt/cvxopt-1.1.6-r2.ebuild
new file mode 100644
index 000000000000..c83a21f9e4b9
--- /dev/null
+++ b/dev-python/cvxopt/cvxopt-1.1.6-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1 toolchain-funcs eutils
+
+DESCRIPTION="Python package for convex optimization"
+HOMEPAGE="http://cvxopt.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc +dsdp examples fftw +glpk gsl"
+
+RDEPEND="
+	virtual/blas
+	virtual/cblas
+	virtual/lapack
+	sci-libs/cholmod:0=
+	sci-libs/umfpack:0=
+	dsdp? ( sci-libs/dsdp:0= )
+	fftw? ( sci-libs/fftw:3.0= )
+	glpk? ( sci-mathematics/glpk:0= )
+	gsl? ( sci-libs/gsl:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )"
+
+python_prepare_all(){
+	epatch "${FILESDIR}"/${PN}-1.1.6-setup.patch
+
+	has_version ">=sci-mathematics/glpk-4.49" && \
+		epatch "${FILESDIR}"/${PN}-1.1.6-glpk449.patch
+
+	rm -r src/C/SuiteSparse*/ || die
+
+	pkg_lib() {
+		local pkg=$(echo $1 | tr '[:lower:]' '[:upper:]')
+		local libs="$($(tc-getPKG_CONFIG) --libs-only-l $1 | \
+			sed -e 's:[ ]-l*\(pthread\|m\)\([ ]\|$\)::g' -e 's:[ ]*$::' | \
+			tr ' ' '\n' | sort -u | sed -e "s:^-l\(.*\):'\1':g" | \
+			tr '\n' ',' | sed -e 's:,$::')"
+		local libdir="$($(tc-getPKG_CONFIG) --libs-only-L $1 | \
+			sed -e 's:[ ]*$::' | \
+			tr ' ' '\n' | sort -u | sed -e "s:^-L\(.*\):'\1':g" | \
+			tr '\n' ',' | sed -e 's:,$::')"
+		local incdir="$($(tc-getPKG_CONFIG) --cflags-only-I $1 | \
+			sed -e 's:[ ]*$::' | \
+			tr ' ' '\n' | sort -u | sed -e "s:^-L\(.*\):'\1':g" | \
+			tr '\n' ',' | sed -e 's:,$::')"
+		sed -i \
+			-e "/${pkg}_LIB[ ]*=/s:\(.*[ ]*=[ ]*\[\).*${1}.*:\1${libs}\]:" \
+			-e "s:\(${pkg}_INC_DIR[ ]*=\).*$:\1 ${incdir}:" \
+			-e "s:\[ BLAS_LIB_DIR \]:\[ ${libdir} \]:g" \
+			setup.py || die
+	}
+
+	use_cvx() {
+		local flag=$1
+		if use ${flag} ; then
+			# Switch to ^^ when we switch to EAPI=6.
+			#local uflag=${flag^^}
+			local uflag=$(tr '[:lower:]' '[:upper:]' <<<"${flag}")
+			sed -i \
+				-e "s/\(BUILD_${uflag} =\) 0/\1 1/" \
+				setup.py || die
+		fi
+	}
+
+	pkg_lib blas
+	pkg_lib lapack
+
+	use_cvx gsl
+	use_cvx fftw
+	use_cvx glpk
+	use_cvx dsdp
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && export VARTEXFONTS="${T}/fonts" && emake -C doc -B html
+}
+
+python_test() {
+	cd examples/doc/chap8
+	"${EPYTHON}" lp.py || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/build/html/. )
+	insinto /usr/share/doc/${PF}
+	use examples && doins -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cvxopt/cvxopt-1.1.8.ebuild b/dev-python/cvxopt/cvxopt-1.1.8.ebuild
new file mode 100644
index 000000000000..a4a23ecac408
--- /dev/null
+++ b/dev-python/cvxopt/cvxopt-1.1.8.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 eutils toolchain-funcs
+
+DESCRIPTION="Python package for convex optimization"
+HOMEPAGE="http://cvxopt.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc +dsdp examples fftw +glpk gsl"
+
+RDEPEND="
+	virtual/blas
+	virtual/cblas
+	virtual/lapack
+	sci-libs/amd:0=
+	sci-libs/cholmod:0=
+	sci-libs/colamd:0=
+	sci-libs/suitesparseconfig:0=
+	sci-libs/umfpack:0=
+	dsdp? ( sci-libs/dsdp:0= )
+	fftw? ( sci-libs/fftw:3.0= )
+	glpk? ( >=sci-mathematics/glpk-4.49:0= )
+	gsl? ( sci-libs/gsl:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )"
+
+python_prepare_all(){
+	epatch "${FILESDIR}"/${P}-setup.patch
+
+	rm -r src/C/SuiteSparse*/ || die
+
+	pkg_lib() {
+		local pkg=$(echo $1 | tr '[:lower:]' '[:upper:]')
+		local libs="$($(tc-getPKG_CONFIG) --libs-only-l $1 | \
+			sed -e 's:[ ]-l*\(pthread\|m\)\([ ]\|$\)::g' -e 's:[ ]*$::' | \
+			tr ' ' '\n' | sort -u | sed -e "s:^-l\(.*\):'\1':g" | \
+			tr '\n' ',' | sed -e 's:,$::')"
+		local libdir="$($(tc-getPKG_CONFIG) --libs-only-L $1 | \
+			sed -e 's:[ ]*$::' | \
+			tr ' ' '\n' | sort -u | sed -e "s:^-L\(.*\):'\1':g" | \
+			tr '\n' ',' | sed -e 's:,$::')"
+		local incdir="$($(tc-getPKG_CONFIG) --cflags-only-I $1 | \
+			sed -e 's:[ ]*$::' | \
+			tr ' ' '\n' | sort -u | sed -e "s:^-L\(.*\):'\1':g" | \
+			tr '\n' ',' | sed -e 's:,$::')"
+		sed -i \
+			-e "/${pkg}_LIB[ ]*=/s:\(.*[ ]*=[ ]*\[\).*${1}.*:\1${libs}\]:" \
+			-e "s:\(${pkg}_INC_DIR[ ]*=\).*$:\1 ${incdir}:" \
+			-e "s:\[ BLAS_LIB_DIR \]:\[ ${libdir} \]:g" \
+			setup.py || die
+	}
+
+	use_cvx() {
+		local flag=$1
+		if use ${flag} ; then
+			# Switch to ^^ when we switch to EAPI=6.
+			#local uflag=${flag^^}
+			local uflag=$(tr '[:lower:]' '[:upper:]' <<<"${flag}")
+			sed -i \
+				-e "s/\(BUILD_${uflag} =\) 0/\1 1/" \
+				setup.py || die
+		fi
+	}
+
+	pkg_lib blas
+	pkg_lib lapack
+
+	use_cvx gsl
+	use_cvx fftw
+	use_cvx glpk
+	use_cvx dsdp
+
+	sed \
+		-e '/SUITESPARSE_EXT_LIB/s:0:1:g' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && export VARTEXFONTS="${T}/fonts" && emake -C doc -B html
+}
+
+python_test() {
+	cd examples/doc/chap8
+	"${EPYTHON}" lp.py || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/build/html/. )
+	insinto /usr/share/doc/${PF}
+	use examples && EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cvxopt/cvxopt-1.1.9.ebuild b/dev-python/cvxopt/cvxopt-1.1.9.ebuild
new file mode 100644
index 000000000000..34b3f873e26e
--- /dev/null
+++ b/dev-python/cvxopt/cvxopt-1.1.9.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Python package for convex optimization"
+HOMEPAGE="http://cvxopt.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc +dsdp examples fftw +glpk gsl"
+
+RDEPEND="
+	virtual/blas
+	virtual/lapack
+	sci-libs/amd:0=
+	sci-libs/cholmod:0=
+	sci-libs/colamd:0=
+	sci-libs/suitesparseconfig:0=
+	sci-libs/umfpack:0=
+	dsdp? ( sci-libs/dsdp:0= )
+	fftw? ( sci-libs/fftw:3.0= )
+	glpk? ( >=sci-mathematics/glpk-4.49:0= )
+	gsl? ( sci-libs/gsl:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )"
+
+python_prepare_all(){
+	pkg_libs() {
+		$(tc-getPKG_CONFIG) --libs-only-l $* | \
+			sed -e 's:[ ]-l*\(pthread\|m\)\([ ]\|$\)::g' -e 's:[ ]*$::' | \
+			tr ' ' '\n' | sort -u | sed -e "s:^-l\(.*\):\1:g" | \
+			tr '\n' ';' | sed -e 's:;$::'
+	}
+	pkg_libdir() {
+		$(tc-getPKG_CONFIG) --libs-only-L $* | \
+			sed -e 's:[ ]*$::' | \
+			tr ' ' '\n' | sort -u | sed -e "s:^-L\(.*\):\1:g" | \
+			tr '\n' ';' | sed -e 's:;$::'
+	}
+	pkg_incdir() {
+		$(tc-getPKG_CONFIG) --cflags-only-I $* | \
+			sed -e 's:[ ]*$::' | \
+			tr ' ' '\n' | sort -u | sed -e "s:^-I\(.*\):\1:g" | \
+			tr '\n' ';' | sed -e 's:,$::'
+	}
+
+	# mandatory dependencies
+	export CVXOPT_BLAS_LIB="$(pkg_libs blas)"
+	export CVXOPT_BLAS_LIB_DIR="$(pkg_libdir blas)"
+	export CVXOPT_LAPACK_LIB="$(pkg_libs lapack)"
+	export CVXOPT_SUITESPARSE_LIB_DIR="$(pkg_libdir umfpack cholmod amd colamd suitesparseconfig)"
+	export CVXOPT_SUITESPARSE_INC_DIR="$(pkg_incdir umfpack cholmod amd colamd suitesparseconfig)"
+
+	# optional dependencies
+	use dsdp && \
+		export CVXOPT_BUILD_DSDP=1 && \
+		export CVXOPT_DSDP_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" && \
+		export CVXOPT_DSDP_INC_DIR="${EPREFIX}/usr/include"
+
+	use fftw && \
+		export CVXOPT_BUILD_FFTW=1 && \
+		export CVXOPT_FFTW_LIB_DIR="$(pkg_libdir fftw3)" && \
+		export CVXOPT_FFTW_INC_DIR="$(pkg_incdir fftw3)"
+
+	use glpk && \
+		export CVXOPT_BUILD_GLPK=1 && \
+		export CVXOPT_GLPK_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" && \
+		export CVXOPT_GLPK_INC_DIR="${EPREFIX}/usr/include"
+
+	use gsl && \
+		export CVXOPT_BUILD_GSL=1 && \
+		export CVXOPT_GSL_LIB_DIR="$(pkg_libdir gsl)" && \
+		export CVXOPT_GSL_INC_DIR="$(pkg_incdir gsl)"
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && VARTEXFONTS="${T}/fonts" emake -C doc -B html
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}"/lib nosetests -v || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/build/html/. )
+	insinto /usr/share/doc/${PF}
+	distutils-r1_python_install_all
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/cvxopt/files/cvxopt-1.1.6-glpk449.patch b/dev-python/cvxopt/files/cvxopt-1.1.6-glpk449.patch
new file mode 100644
index 000000000000..2a1cc6737be4
--- /dev/null
+++ b/dev-python/cvxopt/files/cvxopt-1.1.6-glpk449.patch
@@ -0,0 +1,1082 @@
+--- src/C/glpk.c.orig	2014-03-24 09:39:39.510214726 -0700
++++ src/C/glpk.c	2014-03-24 09:38:41.251897138 -0700
+@@ -23,75 +23,271 @@
+ #include "misc.h"
+ #include "glpk.h"
+ 
++
+ PyDoc_STRVAR(glpk__doc__,
+     "Interface to the simplex and mixed integer LP algorithms in GLPK.\n\n"
+     "The GLPK control parameters have the default values listed in \n"
+-    "the GLPK documentation, except for 'LPX_K_PRESOL', which is set\n"
++    "the GLPK documentation, except for 'presolve', which is set\n"
+     "to 1 and cannot be modified.  The other parameters can be\n"
+-    "modified by making an entry in the dictionary glpk.options.\n"
+-    "For example, the command glpk.options['LPX_K_MSGLEV'] = 0 turns\n"
+-    "off the printed output during execution of glpk.simplex().\n"
++    "modified by passing a smcp or iocp object to the appropriate function\n"
++    "For example,  the commands param = glpk.smcp(msg_lev = 0), or \n"
++    "param=glpk.smcp(); param.msg_lev=1 turn off the printed output during"
++    " execution of glpk.simplex().\n"
+     "See the documentation at www.gnu.org/software/glpk/glpk.html for\n"
+     "the list of GLPK control parameters and their default values.");
+ 
+ static PyObject *glpk_module;
+ 
+-typedef struct {
+-    char  name[20];
+-    int   idx;
+-    char  type;
+-}   param_tuple;
+-
+-static const param_tuple GLPK_PARAM_LIST[] = {
+-    {"LPX_K_MSGLEV",    LPX_K_MSGLEV,   'i'}, 
+-    {"LPX_K_SCALE",     LPX_K_SCALE,    'i'},
+-    {"LPX_K_DUAL",      LPX_K_DUAL,     'i'},
+-    {"LPX_K_PRICE",     LPX_K_PRICE,    'i'},
+-    {"LPX_K_RELAX",     LPX_K_RELAX,    'f'},
+-    {"LPX_K_TOLBND",    LPX_K_TOLBND,   'f'},
+-    {"LPX_K_TOLDJ",     LPX_K_TOLDJ,    'f'},
+-    {"LPX_K_TOLPIV",    LPX_K_TOLPIV,   'f'},
+-    {"LPX_K_ROUND",     LPX_K_ROUND,    'i'},
+-    {"LPX_K_OBJLL",     LPX_K_OBJLL,    'f'},
+-    {"LPX_K_OBJUL",     LPX_K_OBJUL,    'f'},
+-    {"LPX_K_ITLIM",     LPX_K_ITLIM,    'i'},
+-    {"LPX_K_ITCNT",     LPX_K_ITCNT,    'i'}, 
+-    {"LPX_K_TMLIM",     LPX_K_TMLIM,    'f'},
+-    {"LPX_K_OUTFRQ",    LPX_K_OUTFRQ,   'i'},
+-    {"LPX_K_OUTDLY",    LPX_K_OUTDLY,   'f'},
+-    {"LPX_K_BRANCH",    LPX_K_BRANCH,   'i'},
+-    {"LPX_K_BTRACK",    LPX_K_BTRACK,   'i'},
+-    {"LPX_K_TOLINT",    LPX_K_TOLINT,   'f'},
+-    {"LPX_K_TOLOBJ",    LPX_K_TOLOBJ,   'f'},
+-    {"LPX_K_MPSINFO",   LPX_K_MPSINFO,  'i'},
+-    {"LPX_K_MPSOBJ",    LPX_K_MPSOBJ,   'i'},
+-    {"LPX_K_MPSORIG",   LPX_K_MPSORIG,  'i'},
+-    {"LPX_K_MPSWIDE",   LPX_K_MPSWIDE,  'i'},
+-    {"LPX_K_MPSFREE",   LPX_K_MPSFREE,  'i'},
+-    {"LPX_K_MPSSKIP",   LPX_K_MPSSKIP,  'i'},
+-    {"LPX_K_LPTORIG",   LPX_K_LPTORIG,  'i'},
+-    {"LPX_K_PRESOL",    LPX_K_PRESOL,   'i'},
+-}; /* 28 paramaters */
++/* Wrappers around the option glpk structs */
++typedef struct{
++  PyObject_HEAD
++  glp_smcp obj;
++} pysmcp;
+ 
++/* Deallocation of smcp object */
++static void smcp_dealloc(pysmcp* self)
++{
++    Py_TYPE(self)->tp_free((PyObject*)self);
++}
+ 
+-#if PY_MAJOR_VERSION >= 3
+-static int get_param_idx(const char *str, int *idx, char *type)
+-#else
+-static int get_param_idx(char *str, int *idx, char *type)
+-#endif
++/* New smcp method */
++static PyObject *
++smcp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+ {
+-    int i;
++    pysmcp *self;
++    self = (pysmcp *)type->tp_alloc(type, 0);
++    return (PyObject *)self;
++}
++
++/* Initialisation of smcp object */
++static int
++smcp_init(pysmcp *self, PyObject *args, PyObject *kwds)
++{
++    /*static char *kwlist[] = {"number", NULL};*/
++    static char *kwlist[] = { "msg_lev", "meth", "pricing", "r_test", "tol_bnd", "tol_dj", "tol_piv", "obj_ll", "obj_ul", "it_lim", "tm_lim", "out_frq", "out_dly", "presolve" };
++    glp_init_smcp(&self->obj);
++    if (! PyArg_ParseTupleAndKeywords(args, kwds, "|iiiidddddiiiii", kwlist,
++                &self->obj.msg_lev,
++                &self->obj.meth,
++                &self->obj.pricing,
++                &self->obj.r_test,
++                &self->obj.tol_bnd,
++                &self->obj.tol_dj,
++                &self->obj.tol_piv,
++                &self->obj.obj_ll,
++                &self->obj.obj_ul,
++                &self->obj.it_lim,
++                &self->obj.tm_lim,
++                &self->obj.out_frq,
++                &self->obj.out_dly,
++                &self->obj.presolve))
++        return -1;
+ 
+-    for (i=0; i<28; i++) {
+-        if (!strcmp(GLPK_PARAM_LIST[i].name, str)) {
+-            *idx =  GLPK_PARAM_LIST[i].idx;
+-            *type = GLPK_PARAM_LIST[i].type;
+-            return 1;
+-        }
+-    }
+     return 0;
+ }
+ 
++/* smcp members declaration */
++static PyMemberDef smcpMembers[] = {
++  {"msg_lev", T_INT, offsetof(pysmcp,obj)+offsetof(glp_smcp,msg_lev), 0, "message level: "},
++  {"meth", T_INT, offsetof(pysmcp,obj)+offsetof(glp_smcp,meth), 0, "simplex method option: "},
++  {"pricing", T_INT, offsetof(pysmcp,obj)+offsetof(glp_smcp,pricing), 0, "pricing technique: "},
++  {"r_test", T_INT, offsetof(pysmcp,obj)+offsetof(glp_smcp,r_test), 0, "ratio test technique: "},
++  {"tol_bnd", T_DOUBLE, offsetof(pysmcp,obj)+offsetof(glp_smcp,tol_bnd), 0, "spx.tol_bnd "},
++  {"tol_dj", T_DOUBLE, offsetof(pysmcp,obj)+offsetof(glp_smcp,tol_dj), 0, "spx.tol_dj "},
++  {"tol_piv", T_DOUBLE, offsetof(pysmcp,obj)+offsetof(glp_smcp,tol_piv), 0, "spx.tol_piv "},
++  {"obj_ll", T_DOUBLE, offsetof(pysmcp,obj)+offsetof(glp_smcp,obj_ll), 0, "spx.obj_ll "},
++  {"obj_ul", T_DOUBLE, offsetof(pysmcp,obj)+offsetof(glp_smcp,obj_ul), 0, "spx.obj_ul "},
++  {"it_lim", T_INT, offsetof(pysmcp,obj)+offsetof(glp_smcp,it_lim), 0, "spx.it_lim "},
++  {"tm_lim", T_INT, offsetof(pysmcp,obj)+offsetof(glp_smcp,tm_lim), 0, "spx.tm_lim (milliseconds) "},
++  {"out_frq", T_INT, offsetof(pysmcp,obj)+offsetof(glp_smcp,out_frq), 0, "spx.out_frq "},
++  {"out_dly", T_INT, offsetof(pysmcp,obj)+offsetof(glp_smcp,out_dly), 0, "spx.out_dly (milliseconds) "},
++  {"presolve", T_INT, offsetof(pysmcp,obj)+offsetof(glp_smcp,presolve), 0, "enable/disable using LP presolver "},
++};
++
++static PyTypeObject smcp_t = {
++    PyVarObject_HEAD_INIT(NULL, 0)
++    "glpk.smcp",               /* tp_name */
++    sizeof(pysmcp),            /* tp_basicsize */
++    0,                         /* tp_itemsize */
++    (destructor)smcp_dealloc,  /* tp_dealloc */
++    0,                         /* tp_print */
++    0,                         /* tp_getattr */
++    0,                         /* tp_setattr */
++    0,                         /* tp_reserved */
++    0,                         /* tp_repr */
++    0,                         /* tp_as_number */
++    0,                         /* tp_as_sequence */
++    0,                         /* tp_as_mapping */
++    0,                         /* tp_hash  */
++    0,                         /* tp_call */
++    0,                         /* tp_str */
++    0,                         /* tp_getattro */
++    0,                         /* tp_setattro */
++    0,                         /* tp_as_buffer */
++    Py_TPFLAGS_DEFAULT |
++        Py_TPFLAGS_BASETYPE,   /* tp_flags */
++    "simplex method control parameters",           /* tp_doc */
++    0,                         /* tp_traverse */
++    0,                         /* tp_clear */
++    0,                         /* tp_richcompare */
++    0,                         /* tp_weaklistoffset */
++    0,                         /* tp_iter */
++    0,                         /* tp_iternext */
++    0,                         /* tp_methods */
++    smcpMembers,               /* tp_members */
++    0,                         /* tp_getset */
++    0,                         /* tp_base */
++    0,                         /* tp_dict */
++    0,                         /* tp_descr_get */
++    0,                         /* tp_descr_set */
++    0,                         /* tp_dictoffset */
++    (initproc)smcp_init,       /* tp_init */
++    0,                         /* tp_alloc */
++    smcp_new,                 /* tp_new */
++};
++
++
++/* Wrappers around the option glpk structs */
++typedef struct{
++  PyObject_HEAD
++  glp_iocp obj;
++} pyiocp;
++
++/* Deallocation of iocp object */
++static void iocp_dealloc(pysmcp* self)
++{
++    Py_TYPE(self)->tp_free((PyObject*)self);
++}
++
++/* New iocp method */
++static PyObject *
++iocp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
++{
++    pyiocp *self;
++    self = (pyiocp *)type->tp_alloc(type, 0);
++    return (PyObject *)self;
++}
++
++/* Initialisation of iocp object */
++static int
++iocp_init(pyiocp *self, PyObject *args, PyObject *kwds)
++{
++    /*static char *kwlist[] = {"number", NULL};*/
++    static char *kwlist[] = { "msg_lev", "br_tech", "bt_tech", "tol_int", "tol_obj", "tm_lim", "out_frq", "out_dly", "cb_size", "pp_tech", "mip_gap", "mir_cuts", "gmi_cuts", "cov_cuts", "clq_cuts", "presolve", "binarize", "fp_heur", "ps_heur", "ps_tm_lim", "use_sol", "save_sol", "alien",NULL};
++    glp_init_iocp(&self->obj);
++
++    if (! PyArg_ParseTupleAndKeywords(args, kwds, "|iiiddiiiiidiiiiiiiiiisi", kwlist,
++                &self->obj.msg_lev,
++                &self->obj.br_tech,
++                &self->obj.bt_tech,
++                &self->obj.tol_int,
++                &self->obj.tol_obj,
++                &self->obj.tm_lim,
++                &self->obj.out_frq,
++                &self->obj.out_dly,
++                &self->obj.cb_size,
++                &self->obj.pp_tech,
++                &self->obj.mip_gap,
++                &self->obj.mir_cuts,
++                &self->obj.gmi_cuts,
++                &self->obj.cov_cuts,
++                &self->obj.clq_cuts,
++                &self->obj.presolve,
++                &self->obj.binarize,
++                &self->obj.fp_heur,
++                &self->obj.ps_heur,
++                &self->obj.ps_tm_lim,
++                &self->obj.use_sol,
++                &self->obj.save_sol,
++                &self->obj.alien))
++                    return -1;
++
++    return 0;
++}
++
++/* iocp members declaration */
++static PyMemberDef iocpMembers[] = {
++  {"msg_lev", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,msg_lev), 0, "message level (see glp_smcp) "},
++  {"br_tech", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,br_tech), 0, "branching technique: "},
++  {"bt_tech", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,bt_tech), 0, "backtracking technique: "},
++  {"tol_int", T_DOUBLE, offsetof(pysmcp,obj)+offsetof(glp_iocp,tol_int), 0, "mip.tol_int "},
++  {"tol_obj", T_DOUBLE, offsetof(pysmcp,obj)+offsetof(glp_iocp,tol_obj), 0, "mip.tol_obj "},
++  {"tm_lim", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,tm_lim), 0, "mip.tm_lim (milliseconds) "},
++  {"out_frq", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,out_frq), 0, "mip.out_frq (milliseconds) "},
++  {"out_dly", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,out_dly), 0, "mip.out_dly (milliseconds) "},
++  /*void (*cb_func)(glp_tree *T, void *info); [> mip.cb_func <]*/
++  /*void *cb_info;          [> mip.cb_info <]*/
++  {"cb_size", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,cb_size), 0, "mip.cb_size "},
++  {"pp_tech", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,pp_tech), 0, "preprocessing technique: "},
++  {"mip_gap", T_DOUBLE, offsetof(pysmcp,obj)+offsetof(glp_iocp,mip_gap), 0, "relative MIP gap tolerance "},
++  {"mir_cuts", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,mir_cuts), 0, "MIR cuts       (GLP_ON/GLP_OFF) "},
++  {"gmi_cuts", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,gmi_cuts), 0, "Gomory's cuts  (GLP_ON/GLP_OFF) "},
++  {"cov_cuts", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,cov_cuts), 0, "cover cuts     (GLP_ON/GLP_OFF) "},
++  {"clq_cuts", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,clq_cuts), 0, "clique cuts    (GLP_ON/GLP_OFF) "},
++  {"presolve", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,presolve), 0, "enable/disable using MIP presolver "},
++  {"binarize", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,binarize), 0, "try to binarize integer variables "},
++  {"fp_heur", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,fp_heur), 0, "feasibility pump heuristic "},
++  {"ps_heur", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,ps_heur), 0, "proximity search heuristic "},
++  {"ps_tm_lim", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,ps_tm_lim), 0, "proxy time limit, milliseconds "},
++  {"use_sol", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,use_sol), 0, "use existing solution "},
++  {"save_sol",T_STRING,offsetof(pysmcp,obj)+offsetof(glp_iocp,save_sol),0, "filename to save every new solution"},
++  {"alien", T_INT, offsetof(pysmcp,obj)+offsetof(glp_iocp,alien), 0, "use alien solver "},
++};
++
++static PyTypeObject iocp_t = {
++    PyVarObject_HEAD_INIT(NULL, 0)
++    "glpk.iocp",             /* tp_name */
++    sizeof(pyiocp),            /* tp_basicsize */
++    0,                         /* tp_itemsize */
++    (destructor)iocp_dealloc, /* tp_dealloc */
++    0,                         /* tp_print */
++    0,                         /* tp_getattr */
++    0,                         /* tp_setattr */
++    0,                         /* tp_reserved */
++    0,                         /* tp_repr */
++    0,                         /* tp_as_number */
++    0,                         /* tp_as_sequence */
++    0,                         /* tp_as_mapping */
++    0,                         /* tp_hash  */
++    0,                         /* tp_call */
++    0,                         /* tp_str */
++    0,                         /* tp_getattro */
++    0,                         /* tp_setattro */
++    0,                         /* tp_as_buffer */
++    Py_TPFLAGS_DEFAULT |
++        Py_TPFLAGS_BASETYPE,   /* tp_flags */
++    "integer optimizer control parameters",           /* tp_doc */
++    0,                         /* tp_traverse */
++    0,                         /* tp_clear */
++    0,                         /* tp_richcompare */
++    0,                         /* tp_weaklistoffset */
++    0,                         /* tp_iter */
++    0,                         /* tp_iternext */
++    0,                         /* tp_methods */
++    iocpMembers,             /* tp_members */
++    0,                         /* tp_getset */
++    0,                         /* tp_base */
++    0,                         /* tp_dict */
++    0,                         /* tp_descr_get */
++    0,                         /* tp_descr_set */
++    0,                         /* tp_dictoffset */
++    (initproc)iocp_init,       /* tp_init */
++    0,                         /* tp_alloc */
++    iocp_new,                 /* tp_new */
++};
++
++
++
++/* Small helper function to generate the output string of the simplex function */
++inline static void set_output_string(PyObject* t,const char s[]) {
++            PyTuple_SET_ITEM(t, 0, (PyObject *)
++#if PY_MAJOR_VERSION >= 3
++                PyUnicode_FromString(s));
++#else
++                PyString_FromString(s));
++#endif
++    }
++
+ 
+ static char doc_simplex[] =
+     "Solves a linear program using GLPK.\n\n"
+@@ -126,21 +322,16 @@
+     PyObject *kwrds)
+ {
+     matrix *c, *h, *b=NULL, *x=NULL, *z=NULL, *y=NULL;
+-    PyObject *G, *A=NULL, *t=NULL, *param, *key, *value;
+-    LPX *lp;
+-    int m, n, p, i, j, k, nnz, nnzmax, *rn=NULL, *cn=NULL, param_id;
+-    int_t pos=0;
++    PyObject *G, *A=NULL, *t=NULL;
++    glp_prob *lp;
++    glp_smcp *options = NULL;
++    pysmcp *smcpParm = NULL;
++    int m, n, p, i, j, k, nnz, nnzmax, *rn=NULL, *cn=NULL;
+     double *a=NULL, val;
+-    char param_type, err_str[100]; 
+-#if PY_MAJOR_VERSION >= 3
+-    const char *keystr;
+-#else
+-    char *keystr;
+-#endif
+-    char *kwlist[] = {"c", "G", "h", "A", "b", NULL};
++    char *kwlist[] = {"c", "G", "h", "A", "b","options", NULL};
+ 
+-    if (!PyArg_ParseTupleAndKeywords(args, kwrds, "OOO|OO", kwlist, &c,
+-        &G, &h, &A, &b)) return NULL;
++    if (!PyArg_ParseTupleAndKeywords(args, kwrds, "OOO|OOO!", kwlist, &c,
++        &G, &h, &A, &b,&smcp_t,&smcpParm)) return NULL;
+ 
+     if ((Matrix_Check(G) && MAT_ID(G) != DOUBLE) ||
+         (SpMatrix_Check(G) && SP_ID(G) != DOUBLE) ||
+@@ -182,19 +373,30 @@
+         PyErr_SetString(PyExc_ValueError, "incompatible dimensions");
+         return NULL;
+     }
++    if(!smcpParm) 
++    {
++      smcpParm = (pysmcp*)malloc(sizeof(*smcpParm));
++      glp_init_smcp(&(smcpParm->obj));
++    }
++    if(smcpParm) 
++    {
++      Py_INCREF(smcpParm);
++      options = &smcpParm->obj;
++      options->presolve = 1;
++    }
+ 
+-    lp = lpx_create_prob();
+-    lpx_add_rows(lp, m+p);
+-    lpx_add_cols(lp, n);
++    lp = glp_create_prob();
++    glp_add_rows(lp, m+p);
++    glp_add_cols(lp, n);
+ 
+     for (i=0; i<n; i++){
+-        lpx_set_obj_coef(lp, i+1, MAT_BUFD(c)[i]);
+-        lpx_set_col_bnds(lp, i+1, LPX_FR, 0.0, 0.0);
++        glp_set_obj_coef(lp, i+1, MAT_BUFD(c)[i]);
++        glp_set_col_bnds(lp, i+1, GLP_FR, 0.0, 0.0);
+     }
+     for (i=0; i<m; i++)
+-        lpx_set_row_bnds(lp, i+1, LPX_UP, 0.0, MAT_BUFD(h)[i]);
++        glp_set_row_bnds(lp, i+1, GLP_UP, 0.0, MAT_BUFD(h)[i]);
+     for (i=0; i<p; i++)
+-        lpx_set_row_bnds(lp, i+m+1, LPX_FX, MAT_BUFD(b)[i],
++        glp_set_row_bnds(lp, i+m+1, GLP_FX, MAT_BUFD(b)[i],
+             MAT_BUFD(b)[i]);
+ 
+     nnzmax = (SpMatrix_Check(G) ? SP_NNZ(G) : m*n ) +
+@@ -203,7 +405,7 @@
+     rn = (int *) calloc(nnzmax+1, sizeof(int));
+     cn = (int *) calloc(nnzmax+1, sizeof(int));
+     if (!a || !rn || !cn){
+-        free(a);  free(rn);  free(cn);  lpx_delete_prob(lp);
++        free(a);  free(rn);  free(cn);  glp_delete_prob(lp);
+         return PyErr_NoMemory();
+     }
+ 
+@@ -242,84 +444,18 @@
+             nnz++;
+         }
+ 
+-    lpx_load_matrix(lp, nnz, rn, cn, a);
++    glp_load_matrix(lp, nnz, rn, cn, a);
+     free(rn);  free(cn);  free(a);
+ 
+     if (!(t = PyTuple_New(A ? 4 : 3))){
+-        lpx_delete_prob(lp);
++        glp_delete_prob(lp);
+         return PyErr_NoMemory();
+     }
+ 
+-    if (!(param = PyObject_GetAttrString(glpk_module, "options"))
+-        || !PyDict_Check(param)){
+-            lpx_delete_prob(lp);
+-            PyErr_SetString(PyExc_AttributeError,
+-                "missing glpk.options dictionary");
+-            return NULL;
+-    }
+-
+-    while (PyDict_Next(param, &pos, &key, &value))
+-#if PY_MAJOR_VERSION >= 3
+-        if ((PyUnicode_Check(key)) && 
+-            get_param_idx(_PyUnicode_AsString(key), &param_id, 
+-            &param_type)){
+-            keystr = _PyUnicode_AsString(key);
+-#else
+-        if ((keystr = PyString_AsString(key)) && get_param_idx(keystr,
+-            &param_id, &param_type)){
+-#endif
+-	    if (param_type == 'i'){
+-#if PY_MAJOR_VERSION >= 3
+-	        if (!PyLong_Check(value)){
+-#else
+-	        if (!PyInt_Check(value)){
+-#endif
+-                    sprintf(err_str, "invalid value for integer "
+-                        "GLPK parameter: %-.20s", keystr);
+-                    PyErr_SetString(PyExc_ValueError, err_str);
+-	            lpx_delete_prob(lp);
+-	            Py_DECREF(param);
+-                    return NULL;
+-	        }
+-                if (!strcmp("LPX_K_PRESOL", keystr) &&
+-#if PY_MAJOR_VERSION >= 3
+-                    PyLong_AS_LONG(value) != 1){
+-#else
+-                    PyInt_AS_LONG(value) != 1){
+-#endif
+-                    PyErr_Warn(PyExc_UserWarning, "ignoring value of "
+-                        "GLPK parameter 'LPX_K_PRESOL'");
+-                }
+-                else lpx_set_int_parm(lp, param_id,
+-#if PY_MAJOR_VERSION >= 3
+-                    PyLong_AS_LONG(value));
+-#else
+-                    PyInt_AS_LONG(value));
+-#endif
+-	    }
+-	    else {
+-#if PY_MAJOR_VERSION >= 3
+-	        if (!PyLong_Check(value) && !PyFloat_Check(value)){
+-#else
+-	        if (!PyInt_Check(value) && !PyFloat_Check(value)){
+-#endif
+-                    sprintf(err_str, "invalid value for floating point "
+-                        "GLPK parameter: %-.20s", keystr);
+-                    PyErr_SetString(PyExc_ValueError, err_str);
+-	            lpx_delete_prob(lp);
+-	            Py_DECREF(param);
+-                    return NULL;
+-	        }
+-	        lpx_set_real_parm(lp, param_id,
+-                    PyFloat_AsDouble(value));
+-	    }
+-    }
+-    lpx_set_int_parm(lp, LPX_K_PRESOL, 1);
+-    Py_DECREF(param);
+ 
+-    switch (lpx_simplex(lp)){
++    switch (glp_simplex(lp,options)){
+ 
+-        case LPX_E_OK:
++        case 0:
+ 
+             x = (matrix *) Matrix_New(n,1,DOUBLE);
+             z = (matrix *) Matrix_New(m,1,DOUBLE);
+@@ -329,65 +465,70 @@
+                 Py_XDECREF(z);
+                 Py_XDECREF(y);
+                 Py_XDECREF(t);
+-                lpx_delete_prob(lp);
++                Py_XDECREF(smcpParm);
++                glp_delete_prob(lp);
+                 return PyErr_NoMemory();
+             }
+ 
+-            PyTuple_SET_ITEM(t, 0, (PyObject *)
+-#if PY_MAJOR_VERSION >= 3
+-                PyUnicode_FromString("optimal"));
+-#else
+-                PyString_FromString("optimal"));
+-#endif
++            set_output_string(t,"optimal");
+ 
+             for (i=0; i<n; i++)
+-                MAT_BUFD(x)[i] = lpx_get_col_prim(lp, i+1);
++                MAT_BUFD(x)[i] = glp_get_col_prim(lp, i+1);
+             PyTuple_SET_ITEM(t, 1, (PyObject *) x);
+ 
+             for (i=0; i<m; i++)
+-                MAT_BUFD(z)[i] = -lpx_get_row_dual(lp, i+1);
++                MAT_BUFD(z)[i] = -glp_get_row_dual(lp, i+1);
+             PyTuple_SET_ITEM(t, 2, (PyObject *) z);
+ 
+             if (A){
+                 for (i=0; i<p; i++)
+-                    MAT_BUFD(y)[i] = -lpx_get_row_dual(lp, m+i+1);
++                    MAT_BUFD(y)[i] = -glp_get_row_dual(lp, m+i+1);
+                 PyTuple_SET_ITEM(t, 3, (PyObject *) y);
+             }
+ 
+-            lpx_delete_prob(lp);
++            Py_XDECREF(smcpParm);
++            glp_delete_prob(lp);
+             return (PyObject *) t;
+-
+-        case LPX_E_NOPFS:
+-
+-            PyTuple_SET_ITEM(t, 0, (PyObject *)
+-#if PY_MAJOR_VERSION >= 3
+-                PyUnicode_FromString("primal infeasible"));
+-#else
+-                PyString_FromString("primal infeasible"));
+-#endif
++        case GLP_EBADB:
++            set_output_string(t,"incorrect initial basis");
+             break;
+-
+-        case LPX_E_NODFS:
+-
+-            PyTuple_SET_ITEM(t, 0, (PyObject *)
+-#if PY_MAJOR_VERSION >= 3
+-                PyUnicode_FromString("dual infeasible"));
+-#else
+-                PyString_FromString("dual infeasible"));
+-#endif
++        case GLP_ESING:
++            set_output_string(t,"singular initial basis matrix");
++            break;
++        case GLP_ECOND:
++            set_output_string(t,"ill-conditioned initial basis matrix");
++            break;
++        case GLP_EBOUND:
++            set_output_string(t,"incorrect bounds");
++            break;
++        case GLP_EFAIL:
++            set_output_string(t,"solver failure");
++            break;
++        case GLP_EOBJLL:
++            set_output_string(t,"objective function reached lower limit");
++            break;
++        case GLP_EOBJUL:
++            set_output_string(t,"objective function reached upper limit");
++            break;
++        case GLP_EITLIM:
++            set_output_string(t,"iteration limit exceeded");
++            break;
++        case GLP_ETMLIM:
++            set_output_string(t,"time limit exceeded");
++            break;
++        case GLP_ENOPFS:
++            set_output_string(t,"primal infeasible");
++            break;
++        case GLP_ENODFS:
++            set_output_string(t,"dual infeasible");
+             break;
+-
+         default:
+-
+-            PyTuple_SET_ITEM(t, 0, (PyObject *)
+-#if PY_MAJOR_VERSION >= 3
+-                PyUnicode_FromString("unknown"));
+-#else
+-                PyString_FromString("unknown"));
+-#endif
++            set_output_string(t,"unknown");
++            break;
+     }
+ 
+-    lpx_delete_prob(lp);
++    Py_XDECREF(smcpParm);
++    glp_delete_prob(lp);
+ 
+     PyTuple_SET_ITEM(t, 1, Py_BuildValue(""));
+     PyTuple_SET_ITEM(t, 2, Py_BuildValue(""));
+@@ -427,21 +568,28 @@
+ {
+     matrix *c, *h, *b=NULL, *x=NULL;
+     PyObject *G, *A=NULL, *IntSet=NULL, *BinSet = NULL;
+-    PyObject *t=NULL, *param, *key, *value;
+-    LPX *lp;
+-    int m, n, p, i, j, k, nnz, nnzmax, *rn=NULL, *cn=NULL, param_id;
+-    int_t pos=0;
++    PyObject *t=NULL;
++    pyiocp *iocpParm = NULL;;
++    glp_iocp *options = NULL;
++    glp_prob *lp;
++    int m, n, p, i, j, k, nnz, nnzmax, *rn=NULL, *cn=NULL;
+     double *a=NULL, val;
+-    char param_type, err_str[100]; 
+-#if PY_MAJOR_VERSION >= 3
+-    const char *keystr;
+-#else
+-    char *keystr;
+-#endif
+-    char *kwlist[] = {"c", "G", "h", "A", "b", "I", "B", NULL};
++    char *kwlist[] = {"c", "G", "h", "A", "b", "I", "B","iocp", NULL};
++
++    if (!PyArg_ParseTupleAndKeywords(args, kwrds, "OOO|OOOOO!", kwlist, &c,
++	    &G, &h, &A, &b, &IntSet, &BinSet,iocp_t,&iocpParm)) return NULL;
+ 
+-    if (!PyArg_ParseTupleAndKeywords(args, kwrds, "OOO|OOOO", kwlist, &c,
+-	    &G, &h, &A, &b, &IntSet, &BinSet)) return NULL;
++    if(!iocpParm) 
++    {
++      iocpParm = (pyiocp*)malloc(sizeof(*iocpParm));
++      glp_init_iocp(&(iocpParm->obj));
++    }
++    if(iocpParm) 
++    {
++      Py_INCREF(iocpParm);
++      options = &iocpParm->obj;
++      options->presolve = 1;
++    }
+ 
+     if ((Matrix_Check(G) && MAT_ID(G) != DOUBLE) ||
+         (SpMatrix_Check(G) && SP_ID(G) != DOUBLE) ||
+@@ -490,18 +638,18 @@
+     if ((BinSet) && (!PyAnySet_Check(BinSet)))
+       PY_ERR_TYPE("invalid binary index set");
+ 
+-    lp = lpx_create_prob();
+-    lpx_add_rows(lp, m+p);
+-    lpx_add_cols(lp, n);
++    lp = glp_create_prob();
++    glp_add_rows(lp, m+p);
++    glp_add_cols(lp, n);
+ 
+     for (i=0; i<n; i++){
+-        lpx_set_obj_coef(lp, i+1, MAT_BUFD(c)[i]);
+-        lpx_set_col_bnds(lp, i+1, LPX_FR, 0.0, 0.0);
++        glp_set_obj_coef(lp, i+1, MAT_BUFD(c)[i]);
++        glp_set_col_bnds(lp, i+1, GLP_FR, 0.0, 0.0);
+     }
+     for (i=0; i<m; i++)
+-        lpx_set_row_bnds(lp, i+1, LPX_UP, 0.0, MAT_BUFD(h)[i]);
++        glp_set_row_bnds(lp, i+1, GLP_UP, 0.0, MAT_BUFD(h)[i]);
+     for (i=0; i<p; i++)
+-        lpx_set_row_bnds(lp, i+m+1, LPX_FX, MAT_BUFD(b)[i],
++        glp_set_row_bnds(lp, i+m+1, GLP_FX, MAT_BUFD(b)[i],
+             MAT_BUFD(b)[i]);
+ 
+     nnzmax = (SpMatrix_Check(G) ? SP_NNZ(G) : m*n ) +
+@@ -510,7 +658,7 @@
+     rn = (int *) calloc(nnzmax+1, sizeof(int));
+     cn = (int *) calloc(nnzmax+1, sizeof(int));
+     if (!a || !rn || !cn){
+-        free(a);  free(rn);  free(cn);  lpx_delete_prob(lp);
++        free(a);  free(rn);  free(cn);  glp_delete_prob(lp);
+         return PyErr_NoMemory();
+     }
+ 
+@@ -549,79 +697,14 @@
+             nnz++;
+         }
+ 
+-    lpx_load_matrix(lp, nnz, rn, cn, a);
++    glp_load_matrix(lp, nnz, rn, cn, a);
+     free(rn);  free(cn);  free(a);
+ 
+     if (!(t = PyTuple_New(2))) {
+-        lpx_delete_prob(lp);
++        glp_delete_prob(lp);
+         return PyErr_NoMemory();
+     }
+ 
+-    if (!(param = PyObject_GetAttrString(glpk_module, "options"))
+-        || !PyDict_Check(param)){
+-            lpx_delete_prob(lp);
+-            PyErr_SetString(PyExc_AttributeError,
+-                "missing glpk.options dictionary");
+-            return NULL;
+-    }
+-
+-    while (PyDict_Next(param, &pos, &key, &value))
+-#if PY_MAJOR_VERSION >= 3
+-        if ((PyUnicode_Check(key)) && (keystr = PyUnicode_AS_DATA(key)) 
+-            && get_param_idx(keystr, &param_id, &param_type)){
+-#else
+-        if ((keystr = PyString_AsString(key)) && get_param_idx(keystr,
+-            &param_id, &param_type)){
+-#endif
+-	    if (param_type == 'i'){
+-#if PY_MAJOR_VERSION >= 3
+-	        if (!PyLong_Check(value)){
+-#else
+-	        if (!PyInt_Check(value)){
+-#endif
+-                    sprintf(err_str, "invalid value for integer "
+-                        "GLPK parameter: %-.20s", keystr);
+-                    PyErr_SetString(PyExc_ValueError, err_str);
+-	            lpx_delete_prob(lp);
+-	            Py_DECREF(param);
+-                    return NULL;
+-	        }
+-                if (!strcmp("LPX_K_PRESOL", keystr) &&
+-#if PY_MAJOR_VERSION >= 3
+-                    PyLong_AS_LONG(value) != 1){
+-#else
+-                    PyInt_AS_LONG(value) != 1){
+-#endif
+-                    PyErr_Warn(PyExc_UserWarning, "ignoring value of "
+-                        "GLPK parameter 'LPX_K_PRESOL'");
+-                }
+-                else 
+-#if PY_MAJOR_VERSION >= 3
+-                    lpx_set_int_parm(lp, param_id, PyLong_AS_LONG(value));
+-#else
+-                    lpx_set_int_parm(lp, param_id, PyInt_AS_LONG(value));
+-#endif
+-	    }
+-	    else {
+-#if PY_MAJOR_VERSION >= 3
+-	        if (!PyLong_Check(value) && !PyFloat_Check(value)){
+-#else
+-	        if (!PyInt_Check(value) && !PyFloat_Check(value)){
+-#endif
+-                    sprintf(err_str, "invalid value for floating point "
+-                        "GLPK parameter: %-.20s", keystr);
+-                    PyErr_SetString(PyExc_ValueError, err_str);
+-	            lpx_delete_prob(lp);
+-	            Py_DECREF(param);
+-                    return NULL;
+-	        }
+-	        lpx_set_real_parm(lp, param_id,
+-                    PyFloat_AsDouble(value));
+-	    }
+-    }
+-    lpx_set_int_parm(lp, LPX_K_PRESOL, 1);
+-    Py_DECREF(param);
+-
+     if (IntSet) {
+       PyObject *iter = PySequence_Fast(IntSet, "Critical error: not sequence");
+ 
+@@ -633,7 +716,7 @@
+ #else
+ 	if (!PyInt_Check(tmp)) {
+ #endif
+-	  lpx_delete_prob(lp);
++	  glp_delete_prob(lp);
+ 	  Py_DECREF(iter);
+ 	  PY_ERR_TYPE("non-integer element in I");
+ 	}
+@@ -643,7 +726,7 @@
+ 	int k = PyInt_AS_LONG(tmp);
+ #endif
+ 	if ((k < 0) || (k >= n)) {
+-	  lpx_delete_prob(lp);
++	  glp_delete_prob(lp);
+ 	  Py_DECREF(iter);
+ 	  PY_ERR(PyExc_IndexError, "index element out of range in I");
+ 	}
+@@ -664,7 +747,7 @@
+ #else
+ 	if (!PyInt_Check(tmp)) {
+ #endif
+-	  lpx_delete_prob(lp);
++	  glp_delete_prob(lp);
+ 	  Py_DECREF(iter);
+ 	  PY_ERR_TYPE("non-binary element in I");
+ 	}
+@@ -674,7 +757,7 @@
+ 	int k = PyInt_AS_LONG(tmp);
+ #endif
+ 	if ((k < 0) || (k >= n)) {
+-	  lpx_delete_prob(lp);
++	  glp_delete_prob(lp);
+ 	  Py_DECREF(iter);
+ 	  PY_ERR(PyExc_IndexError, "index element out of range in B");
+ 	}
+@@ -686,114 +769,85 @@
+     }
+ 
+ 
++      switch (glp_intopt(lp,options)){
+ 
+-    switch (lpx_intopt(lp)){
++          case 0:
+ 
+-        case LPX_E_OK:
++              x = (matrix *) Matrix_New(n,1,DOUBLE);
++              if (!x) {
++                  Py_XDECREF(iocpParm);
++                  Py_XDECREF(t);
++                  glp_delete_prob(lp);
++                  return PyErr_NoMemory();
++              }
++              set_output_string(t,"optimal");
++              set_output_string(t,"optimal");
+ 
+-            x = (matrix *) Matrix_New(n,1,DOUBLE);
+-            if (!x) {
+-                Py_XDECREF(t);
+-                lpx_delete_prob(lp);
+-                return PyErr_NoMemory();
+-            }
+-            PyTuple_SET_ITEM(t, 0, (PyObject *)
+-#if PY_MAJOR_VERSION >= 3
+-                PyUnicode_FromString("optimal"));
+-#else
+-                PyString_FromString("optimal"));
+-#endif
++              for (i=0; i<n; i++)
++                  MAT_BUFD(x)[i] = glp_mip_col_val(lp, i+1);
++              PyTuple_SET_ITEM(t, 1, (PyObject *) x);
+ 
+-            for (i=0; i<n; i++)
+-                MAT_BUFD(x)[i] = lpx_mip_col_val(lp, i+1);
+-            PyTuple_SET_ITEM(t, 1, (PyObject *) x);
++              Py_XDECREF(iocpParm);
++              glp_delete_prob(lp);
++              return (PyObject *) t;
+ 
+-            lpx_delete_prob(lp);
+-            return (PyObject *) t;
++          case GLP_ETMLIM:
+ 
+-        case LPX_E_TMLIM:
++              x = (matrix *) Matrix_New(n,1,DOUBLE);
++              if (!x) {
++                  Py_XDECREF(t);
++                  Py_XDECREF(iocpParm);
++                  glp_delete_prob(lp);
++                  return PyErr_NoMemory();
++              }
++              set_output_string(t,"time limit exceeded");
+ 
+-            x = (matrix *) Matrix_New(n,1,DOUBLE);
+-            if (!x) {
+-                Py_XDECREF(t);
+-                lpx_delete_prob(lp);
+-                return PyErr_NoMemory();
+-            }
+-            PyTuple_SET_ITEM(t, 0, (PyObject *)
+-#if PY_MAJOR_VERSION >= 3
+-                PyUnicode_FromString("time limit exceeded"));
+-#else
+-                PyString_FromString("time limit exceeded"));
+-#endif
++              for (i=0; i<n; i++)
++                  MAT_BUFD(x)[i] = glp_mip_col_val(lp, i+1);
++              PyTuple_SET_ITEM(t, 1, (PyObject *) x);
+ 
+-            for (i=0; i<n; i++)
+-                MAT_BUFD(x)[i] = lpx_mip_col_val(lp, i+1);
+-            PyTuple_SET_ITEM(t, 1, (PyObject *) x);
+-
+-            lpx_delete_prob(lp);
+-            return (PyObject *) t;
++              Py_XDECREF(iocpParm);
++              glp_delete_prob(lp);
++              return (PyObject *) t;
+ 
+ 
+-        case LPX_E_FAULT:
+-            PyTuple_SET_ITEM(t, 0, (PyObject *)
+-#if PY_MAJOR_VERSION >= 3
+-                PyUnicode_FromString("invalid MIP formulation"));
+-#else
+-                PyString_FromString("invalid MIP formulation"));
+-#endif
+-            break;
++          case GLP_EBOUND:
++              set_output_string(t,"incorrect bounds");
++              break;
++          case GLP_EFAIL:
++              set_output_string(t,"invalid MIP formulation");
++              break;
+ 
+-	case LPX_E_NOPFS:
+-            PyTuple_SET_ITEM(t, 0, (PyObject *)
+-#if PY_MAJOR_VERSION >= 3
+-                PyUnicode_FromString("primal infeasible"));
+-#else
+-                PyString_FromString("primal infeasible"));
+-#endif
+-            break;
++          case GLP_ENOPFS:
++              set_output_string(t,"primal infeasible");
++              break;
+ 
+-	case LPX_E_NODFS:
++          case GLP_ENODFS:
++              set_output_string(t,"dual infeasible");
++              break;
+ 
+-            PyTuple_SET_ITEM(t, 0, (PyObject *)
+-#if PY_MAJOR_VERSION >= 3
+-                PyUnicode_FromString("dual infeasible"));
+-#else
+-                PyString_FromString("dual infeasible"));
+-#endif
+-            break;
++          case GLP_EMIPGAP:
++              set_output_string(t,"Relative mip gap tolerance reached");
++              break;
+ 
+-        case LPX_E_ITLIM:
++              /*case LPX_E_ITLIM:
+ 
+-            PyTuple_SET_ITEM(t, 0, (PyObject *)
+-#if PY_MAJOR_VERSION >= 3
+-                PyUnicode_FromString("maxiters exceeded"));
+-#else
+-                PyString_FromString("maxiters exceeded"));
+-#endif
+-            break;
++                set_output_string(t,"maxiters exceeded");
++                break;*/
+ 
+-	case LPX_E_SING:
++              /*case LPX_E_SING:
+ 
+-            PyTuple_SET_ITEM(t, 0, (PyObject *)
+-#if PY_MAJOR_VERSION >= 3
+-                PyUnicode_FromString("singular or ill-conditioned basis"));
+-#else
+-                PyString_FromString("singular or ill-conditioned basis"));
+-#endif
+-            break;
++                set_output_string(t,"singular or ill-conditioned basis");
++                break;*/
+ 
+ 
+-        default:
++          default:
+ 
+-            PyTuple_SET_ITEM(t, 0, (PyObject *)
+-#if PY_MAJOR_VERSION >= 3
+-                PyUnicode_FromString("unknown"));
+-#else
+-                PyString_FromString("unknown"));
+-#endif
+-    }
++              set_output_string(t,"unknown");
++      }
+ 
+-    lpx_delete_prob(lp);
++      Py_XDECREF(iocpParm);
++    glp_delete_prob(lp);
+ 
+     PyTuple_SET_ITEM(t, 1, Py_BuildValue(""));
+     return (PyObject *) t;
+@@ -819,10 +873,94 @@
+     NULL, NULL, NULL, NULL
+ };
+ 
++void addglpkConstants (void)
++{
++  PyModule_AddIntMacro(glpk_module, GLP_ON);
++  PyModule_AddIntMacro(glpk_module,GLP_OFF);
++
++  /* reason codes: */
++  PyModule_AddIntMacro(glpk_module,GLP_IROWGEN);
++  PyModule_AddIntMacro(glpk_module,GLP_IBINGO);
++  PyModule_AddIntMacro(glpk_module,GLP_IHEUR);
++  PyModule_AddIntMacro(glpk_module,GLP_ICUTGEN);
++  PyModule_AddIntMacro(glpk_module,GLP_IBRANCH);
++  PyModule_AddIntMacro(glpk_module,GLP_ISELECT);
++  PyModule_AddIntMacro(glpk_module,GLP_IPREPRO);
++
++  /* branch selection indicator: */
++  PyModule_AddIntMacro(glpk_module,GLP_NO_BRNCH);
++  PyModule_AddIntMacro(glpk_module,GLP_DN_BRNCH);
++  PyModule_AddIntMacro(glpk_module,GLP_UP_BRNCH);
++
++  /* return codes: */
++  PyModule_AddIntMacro(glpk_module,GLP_EBADB);
++  PyModule_AddIntMacro(glpk_module,GLP_ESING);
++  PyModule_AddIntMacro(glpk_module,GLP_ECOND);
++  PyModule_AddIntMacro(glpk_module,GLP_EBOUND);
++  PyModule_AddIntMacro(glpk_module,GLP_EFAIL);
++  PyModule_AddIntMacro(glpk_module,GLP_EOBJLL);
++  PyModule_AddIntMacro(glpk_module,GLP_EOBJUL);
++  PyModule_AddIntMacro(glpk_module,GLP_EITLIM);
++  PyModule_AddIntMacro(glpk_module,GLP_ETMLIM);
++  PyModule_AddIntMacro(glpk_module,GLP_ENOPFS);
++  PyModule_AddIntMacro(glpk_module,GLP_ENODFS);
++  PyModule_AddIntMacro(glpk_module,GLP_EROOT);
++  PyModule_AddIntMacro(glpk_module,GLP_ESTOP);
++  PyModule_AddIntMacro(glpk_module,GLP_EMIPGAP);
++  PyModule_AddIntMacro(glpk_module,GLP_ENOFEAS);
++  PyModule_AddIntMacro(glpk_module,GLP_ENOCVG);
++  PyModule_AddIntMacro(glpk_module,GLP_EINSTAB);
++  PyModule_AddIntMacro(glpk_module,GLP_EDATA);
++  PyModule_AddIntMacro(glpk_module,GLP_ERANGE);
++
++  /* condition indicator: */
++  PyModule_AddIntMacro(glpk_module,GLP_KKT_PE);
++  PyModule_AddIntMacro(glpk_module,GLP_KKT_PB);
++  PyModule_AddIntMacro(glpk_module,GLP_KKT_DE);
++  PyModule_AddIntMacro(glpk_module,GLP_KKT_DB);
++  PyModule_AddIntMacro(glpk_module,GLP_KKT_CS);
++
++  /* MPS file format: */
++  PyModule_AddIntMacro(glpk_module,GLP_MPS_DECK);
++  PyModule_AddIntMacro(glpk_module,GLP_MPS_FILE);
++
++  /* simplex method control parameters */
++  /* message level: */
++  PyModule_AddIntMacro(glpk_module,GLP_MSG_OFF);
++  PyModule_AddIntMacro(glpk_module,GLP_MSG_ERR);
++  PyModule_AddIntMacro(glpk_module,GLP_MSG_ON);
++  PyModule_AddIntMacro(glpk_module,GLP_MSG_ALL);
++  PyModule_AddIntMacro(glpk_module,GLP_MSG_DBG);
++  /* simplex method option: */
++  PyModule_AddIntMacro(glpk_module,GLP_PRIMAL);
++  PyModule_AddIntMacro(glpk_module,GLP_DUALP);
++  PyModule_AddIntMacro(glpk_module,GLP_DUAL);
++  /* pricing technique: */
++  PyModule_AddIntMacro(glpk_module,GLP_PT_STD);
++  PyModule_AddIntMacro(glpk_module,GLP_PT_PSE);
++  /* ratio test technique: */
++  PyModule_AddIntMacro(glpk_module,GLP_RT_STD);
++  PyModule_AddIntMacro(glpk_module,GLP_RT_HAR);
++
++  /* interior-point solver control parameters */
++  /* ordering algorithm: */
++  PyModule_AddIntMacro(glpk_module,GLP_ORD_NONE);
++  PyModule_AddIntMacro(glpk_module,GLP_ORD_QMD);
++  PyModule_AddIntMacro(glpk_module,GLP_ORD_AMD);
++  PyModule_AddIntMacro(glpk_module,GLP_ORD_SYMAMD);
++}
++
+ PyMODINIT_FUNC PyInit_glpk(void)
+ {
+   if (!(glpk_module = PyModule_Create(&glpk_module_def))) return NULL;
+-  PyModule_AddObject(glpk_module, "options", PyDict_New());
++  if (PyType_Ready(&iocp_t) < 0 || (PyType_Ready(&smcp_t) < 0)) return NULL;
++  /*  Adding macros */
++  addglpkConstants();
++  /* Adding  option lists as objects */
++  Py_INCREF(&smcp_t);
++  PyModule_AddObject(glpk_module,"smcp",(PyObject*)&smcp_t);
++  Py_INCREF(&iocp_t);
++  PyModule_AddObject(glpk_module,"iocp",(PyObject*)&iocp_t);
+   if (import_cvxopt() < 0) return NULL;
+   return glpk_module;
+ }
+@@ -832,8 +970,13 @@
+ PyMODINIT_FUNC initglpk(void)
+ {
+     glpk_module = Py_InitModule3("cvxopt.glpk", glpk_functions, 
+-        glpk__doc__);
+-    PyModule_AddObject(glpk_module, "options", PyDict_New());
++            glpk__doc__);
++    if (PyType_Ready(&iocp_t) < 0 || (PyType_Ready(&smcp_t) < 0)) return NULL;
++    addglpkConstants();
++    Py_INCREF(&smcp_t);
++    PyModule_AddObject(glpk_module,"smcp",(PyObject*)&smcp_t);
++    Py_INCREF(&iocp_t);
++    PyModule_AddObject(glpk_module,"iocp",(PyObject*)&iocp_t);
+     if (import_cvxopt() < 0) return;
+ }
+ 
diff --git a/dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch b/dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch
new file mode 100644
index 000000000000..c95f31bf6048
--- /dev/null
+++ b/dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch
@@ -0,0 +1,176 @@
+--- setup.py.orig	2013-05-16 21:36:29.616510963 +1200
++++ setup.py	2013-05-16 21:51:08.456347311 +1200
+@@ -2,7 +2,7 @@
+ from glob import glob
+ 
+ # Modifiy this if BLAS and LAPACK libraries are not in /usr/lib.
+-BLAS_LIB_DIR = '/usr/lib'
++BLAS_LIB_DIR = ''
+ 
+ # Default names of BLAS and LAPACK libraries
+ BLAS_LIB = ['blas']
+@@ -18,37 +18,37 @@
+ BUILD_GSL = 0
+ 
+ # Directory containing libgsl (used only when BUILD_GSL = 1).
+-GSL_LIB_DIR = '/usr/lib'
++GSL_LIB_DIR = ''
+ 
+ # Directory containing the GSL header files (used only when BUILD_GSL = 1).
+-GSL_INC_DIR = '/usr/include/gsl'
++GSL_INC_DIR = ''
+ 
+ # Set to 1 if you are installing the fftw module.
+ BUILD_FFTW = 0 
+ 
+ # Directory containing libfftw3 (used only when BUILD_FFTW = 1).
+-FFTW_LIB_DIR = '/usr/lib'
++FFTW_LIB_DIR = ''
+ 
+ # Directory containing fftw.h (used only when BUILD_FFTW = 1).
+-FFTW_INC_DIR = '/usr/include'
++FFTW_INC_DIR = ''
+ 
+ # Set to 1 if you are installing the glpk module.
+ BUILD_GLPK = 0 
+ 
+ # Directory containing libglpk (used only when BUILD_GLPK = 1).
+-GLPK_LIB_DIR = '/usr/lib'
++GLPK_LIB_DIR = ''
+ 
+ # Directory containing glpk.h (used only when BUILD_GLPK = 1).
+-GLPK_INC_DIR = '/usr/include'
++GLPK_INC_DIR = ''
+ 
+ # Set to 1 if you are installing the DSDP module.
+ BUILD_DSDP = 0
+ 
+ # Directory containing libdsdp (used only when BUILD_DSDP = 1).
+-DSDP_LIB_DIR = '/usr/lib'
++DSDP_LIB_DIR = ''
+  
+ # Directory containing dsdp5.h (used only when BUILD_DSDP = 1).
+-DSDP_INC_DIR = '/usr/include/dsdp'
++DSDP_INC_DIR = ''
+ 
+ # No modifications should be needed below this line.
+ 
+@@ -61,39 +61,32 @@
+ # optional modules
+ 
+ if BUILD_GSL:
+-    gsl = Extension('gsl', libraries = ['m', 'gsl'] + BLAS_LIB,
+-        include_dirs = [ GSL_INC_DIR ],
+-        library_dirs = [ GSL_LIB_DIR, BLAS_LIB_DIR ],
+-        extra_link_args = BLAS_EXTRA_LINK_ARGS,
++    gsl = Extension('gsl', libraries = ['gsl'],
++        library_dirs = [ GSL_LIB_DIR ],
+         sources = ['src/C/gsl.c'] )
+     extmods += [gsl];
+ 
+ if BUILD_FFTW:
+-    fftw = Extension('fftw', libraries = ['fftw3'] + BLAS_LIB,
+-        include_dirs = [ FFTW_INC_DIR ],
+-        library_dirs = [ FFTW_LIB_DIR, BLAS_LIB_DIR ],
+-        extra_link_args = BLAS_EXTRA_LINK_ARGS,
++    fftw = Extension('fftw', libraries = ['fftw3'],
++        library_dirs = [ FFTW_LIB_DIR ],
+         sources = ['src/C/fftw.c'] )
+     extmods += [fftw];
+ 
+ if BUILD_GLPK:
+     glpk = Extension('glpk', libraries = ['glpk'],
+-        include_dirs = [ GLPK_INC_DIR ],
+         library_dirs = [ GLPK_LIB_DIR ],
+         sources = ['src/C/glpk.c'] )
+     extmods += [glpk];
+ 
+ if BUILD_DSDP:
+-    dsdp = Extension('dsdp', libraries = ['dsdp'] + LAPACK_LIB + BLAS_LIB,
+-        include_dirs = [ DSDP_INC_DIR ],
+-        library_dirs = [ DSDP_LIB_DIR, BLAS_LIB_DIR ],
+-        extra_link_args = BLAS_EXTRA_LINK_ARGS,
++    dsdp = Extension('dsdp', libraries = ['dsdp'],
++        library_dirs = [ DSDP_LIB_DIR ],
+         sources = ['src/C/dsdp.c'] )
+     extmods += [dsdp];
+ 
+ # Required modules
+ 
+-base = Extension('base', libraries = ['m'] + LAPACK_LIB + BLAS_LIB,
++base = Extension('base', libraries = ['m'] + LAPACK_LIB,
+     library_dirs = [ BLAS_LIB_DIR ],
+     define_macros = MACROS,
+     extra_link_args = BLAS_EXTRA_LINK_ARGS,
+@@ -105,61 +98,36 @@
+     extra_link_args = BLAS_EXTRA_LINK_ARGS,
+     sources = ['src/C/blas.c'] )
+ 
+-lapack = Extension('lapack', libraries = LAPACK_LIB + BLAS_LIB,
++lapack = Extension('lapack', libraries = LAPACK_LIB,
+     library_dirs = [ BLAS_LIB_DIR ],
+     define_macros = MACROS,
+     extra_link_args = BLAS_EXTRA_LINK_ARGS,
+     sources = ['src/C/lapack.c'] )
+ 
+ umfpack = Extension('umfpack', 
+-    include_dirs = [ 'src/C/SuiteSparse/UMFPACK/Include',
+-        'src/C/SuiteSparse/AMD/Include', 
+-        'src/C/SuiteSparse/AMD/Source', 
+-        'src/C/SuiteSparse/SuiteSparse_config' ],
+     library_dirs = [ BLAS_LIB_DIR ],
+     define_macros = MACROS + [('NTIMER', '1'), ('NCHOLMOD', '1')],
+-    libraries = LAPACK_LIB + BLAS_LIB,
++    libraries = [ 'umfpack' ],
+     extra_compile_args = ['-Wno-unknown-pragmas'],
+-    extra_link_args = BLAS_EXTRA_LINK_ARGS,
+-    sources = [ 'src/C/umfpack.c',
+-        'src/C/SuiteSparse/UMFPACK/Source/umfpack_global.c',
+-        'src/C/SuiteSparse/UMFPACK/Source/umfpack_tictoc.c' ] +
+-        ['src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config.c'] +
+-        glob('src/C/SuiteSparse_cvxopt_extra/umfpack/*'))
++    sources = [ 'src/C/umfpack.c' ])
+ 
+ # Build for int or long? 
+ import sys
+ if sys.maxsize > 2**31: MACROS += [('DLONG',None)]
+ 
+ cholmod = Extension('cholmod',
+-    library_dirs = [ BLAS_LIB_DIR ],
+-    libraries = LAPACK_LIB + BLAS_LIB,
+-    include_dirs = [ 'src/C/SuiteSparse/CHOLMOD/Include', 
+-        'src/C/SuiteSparse/COLAMD', 
+-        'src/C/SuiteSparse/AMD/Include', 
+-        'src/C/SuiteSparse/COLAMD/Include',
+-        'src/C/SuiteSparse/SuiteSparse_config' ],
+-    define_macros = MACROS + [('NPARTITION', '1'), ('NTIMER', '1')],
+-    extra_link_args = BLAS_EXTRA_LINK_ARGS,
+-    sources = [ 'src/C/cholmod.c' ] + 
+-        ['src/C/SuiteSparse/AMD/Source/' + s for s in ['amd_global.c',
+-            'amd_postorder.c', 'amd_post_tree.c', 'amd_2.c']] +
+-        ['src/C/SuiteSparse/COLAMD/Source/' + s for s in ['colamd.c',
+-            'colamd_global.c']] +
+-        ['src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config.c'] +
+-        glob('src/C/SuiteSparse/CHOLMOD/Core/c*.c') +
+-        glob('src/C/SuiteSparse/CHOLMOD/Cholesky/c*.c') +
+-        ['src/C/SuiteSparse/CHOLMOD/Check/cholmod_check.c'] +
+-        glob('src/C/SuiteSparse/CHOLMOD/Supernodal/c*.c') )
++    library_dirs = [ BLAS_LIB_DIR ],
++    libraries = ['cholmod'] + BLAS_LIB,
++    define_macros = MACROS + [('NPARTITION', '1'), ('NTIMER', '1')],
++    sources = [ 'src/C/cholmod.c' ])
+ 
+ amd = Extension('amd', 
+-    include_dirs = [ 'src/C/SuiteSparse/AMD/Include', 
+-        'src/C/SuiteSparse/SuiteSparse_config' ],
+     define_macros = MACROS,
+-    sources = [ 'src/C/amd.c' ] + glob('src/C/SuiteSparse/AMD/Source/*.c') )
++    libraries = ['amd'],
++    sources = [ 'src/C/amd.c' ])
+ 
+ misc_solvers = Extension('misc_solvers',
+-    libraries = LAPACK_LIB + BLAS_LIB,
++    libraries = LAPACK_LIB,
+     library_dirs = [ BLAS_LIB_DIR ],
+     define_macros = MACROS,
+     extra_link_args = BLAS_EXTRA_LINK_ARGS,
diff --git a/dev-python/cvxopt/files/cvxopt-1.1.8-setup.patch b/dev-python/cvxopt/files/cvxopt-1.1.8-setup.patch
new file mode 100644
index 000000000000..1b53f7535117
--- /dev/null
+++ b/dev-python/cvxopt/files/cvxopt-1.1.8-setup.patch
@@ -0,0 +1,136 @@
+ setup.py | 45 +++++++++++++++++++--------------------------
+ 1 file changed, 19 insertions(+), 26 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 031ad53..e5c56af 100644
+--- a/setup.py
++++ b/setup.py
+@@ -6,7 +6,7 @@ from glob import glob
+ import os
+ 
+ # Modifiy this if BLAS and LAPACK libraries are not in /usr/lib.
+-BLAS_LIB_DIR = '/usr/lib'
++BLAS_LIB_DIR = ''
+ 
+ # Default names of BLAS and LAPACK libraries
+ BLAS_LIB = ['blas']
+@@ -22,37 +22,37 @@ BLAS_NOUNDERSCORES = False
+ BUILD_GSL = 0
+ 
+ # Directory containing libgsl (used only when BUILD_GSL = 1).
+-GSL_LIB_DIR = '/usr/lib'
++GSL_LIB_DIR = ''
+ 
+ # Directory containing the GSL header files (used only when BUILD_GSL = 1).
+-GSL_INC_DIR = '/usr/include/gsl'
++GSL_INC_DIR = ''
+ 
+ # Set to 1 if you are installing the fftw module.
+ BUILD_FFTW = 0 
+ 
+ # Directory containing libfftw3 (used only when BUILD_FFTW = 1).
+-FFTW_LIB_DIR = '/usr/lib'
++FFTW_LIB_DIR = ''
+ 
+ # Directory containing fftw.h (used only when BUILD_FFTW = 1).
+-FFTW_INC_DIR = '/usr/include'
++FFTW_INC_DIR = ''
+ 
+ # Set to 1 if you are installing the glpk module.
+ BUILD_GLPK = 0 
+ 
+ # Directory containing libglpk (used only when BUILD_GLPK = 1).
+-GLPK_LIB_DIR = '/usr/lib'
++GLPK_LIB_DIR = ''
+ 
+ # Directory containing glpk.h (used only when BUILD_GLPK = 1).
+-GLPK_INC_DIR = '/usr/include'
++GLPK_INC_DIR = ''
+ 
+ # Set to 1 if you are installing the DSDP module.
+ BUILD_DSDP = 0
+ 
+ # Directory containing libdsdp (used only when BUILD_DSDP = 1).
+-DSDP_LIB_DIR = '/usr/lib'
++DSDP_LIB_DIR = ''
+  
+ # Directory containing dsdp5.h (used only when BUILD_DSDP = 1).
+-DSDP_INC_DIR = '/usr/include/dsdp'
++DSDP_INC_DIR = ''
+ 
+ # Set to 1 to use external SuiteSparse library
+ SUITESPARSE_EXT_LIB = 0
+@@ -98,39 +98,32 @@ if BLAS_NOUNDERSCORES: MACROS.append(('BLAS_NO_UNDERSCORE',''))
+ # optional modules
+ 
+ if BUILD_GSL:
+-    gsl = Extension('gsl', libraries = ['m', 'gsl'] + BLAS_LIB,
+-        include_dirs = [ GSL_INC_DIR ],
+-        library_dirs = [ GSL_LIB_DIR, BLAS_LIB_DIR ],
+-        extra_link_args = BLAS_EXTRA_LINK_ARGS,
++    gsl = Extension('gsl', libraries = ['gsl'],
++        library_dirs = [ GSL_LIB_DIR ],
+         sources = ['src/C/gsl.c'] )
+     extmods += [gsl];
+ 
+ if BUILD_FFTW:
+-    fftw = Extension('fftw', libraries = ['fftw3'] + BLAS_LIB,
+-        include_dirs = [ FFTW_INC_DIR ],
+-        library_dirs = [ FFTW_LIB_DIR, BLAS_LIB_DIR ],
+-        extra_link_args = BLAS_EXTRA_LINK_ARGS,
++    fftw = Extension('fftw', libraries = ['fftw3'],
++        library_dirs = [ FFTW_LIB_DIR ],
+         sources = ['src/C/fftw.c'] )
+     extmods += [fftw];
+ 
+ if BUILD_GLPK:
+     glpk = Extension('glpk', libraries = ['glpk'],
+-        include_dirs = [ GLPK_INC_DIR ],
+         library_dirs = [ GLPK_LIB_DIR ],
+         sources = ['src/C/glpk.c'] )
+     extmods += [glpk];
+ 
+ if BUILD_DSDP:
+-    dsdp = Extension('dsdp', libraries = ['dsdp'] + LAPACK_LIB + BLAS_LIB,
+-        include_dirs = [ DSDP_INC_DIR ],
+-        library_dirs = [ DSDP_LIB_DIR, BLAS_LIB_DIR ],
+-        extra_link_args = BLAS_EXTRA_LINK_ARGS,
++    dsdp = Extension('dsdp', libraries = ['dsdp'] + LAPACK_LIB,
++        library_dirs = [ DSDP_LIB_DIR ],
+         sources = ['src/C/dsdp.c'] )
+     extmods += [dsdp];
+ 
+ # Required modules
+ 
+-base = Extension('base', libraries = ['m'] + LAPACK_LIB + BLAS_LIB,
++base = Extension('base', libraries = ['m'] + LAPACK_LIB,
+     library_dirs = [ BLAS_LIB_DIR ],
+     define_macros = MACROS,
+     extra_link_args = BLAS_EXTRA_LINK_ARGS,
+@@ -142,7 +135,7 @@ blas = Extension('blas', libraries = BLAS_LIB,
+     extra_link_args = BLAS_EXTRA_LINK_ARGS,
+     sources = ['src/C/blas.c'] )
+ 
+-lapack = Extension('lapack', libraries = LAPACK_LIB + BLAS_LIB,
++lapack = Extension('lapack', libraries = LAPACK_LIB,
+     library_dirs = [ BLAS_LIB_DIR ],
+     define_macros = MACROS,
+     extra_link_args = BLAS_EXTRA_LINK_ARGS,
+@@ -177,7 +170,7 @@ if sys.maxsize > 2**31: MACROS += [('DLONG',None)]
+ 
+ if SUITESPARSE_EXT_LIB:
+     cholmod = Extension('cholmod',
+-        libraries = ['amd','colamd','suitesparseconfig','cholmod'],
++        libraries = ['amd','colamd','suitesparseconfig','cholmod'] + LAPACK_LIB,
+         include_dirs = [SUITESPARSE_INC_DIR],
+         library_dirs = [SUITESPARSE_LIB_DIR],
+         sources = [ 'src/C/cholmod.c' ])
+@@ -218,7 +211,7 @@ else:
+         glob('src/C/SuiteSparse/AMD/Source/*.c') )
+ 
+ misc_solvers = Extension('misc_solvers',
+-    libraries = LAPACK_LIB + BLAS_LIB,
++    libraries = ['m'] + LAPACK_LIB,
+     library_dirs = [ BLAS_LIB_DIR ],
+     define_macros = MACROS,
+     extra_link_args = BLAS_EXTRA_LINK_ARGS,
diff --git a/dev-python/cvxopt/metadata.xml b/dev-python/cvxopt/metadata.xml
new file mode 100644
index 000000000000..73822eb2153b
--- /dev/null
+++ b/dev-python/cvxopt/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  CVXOPT is a software for convex optimization based on
+  the Python programming language. Its main purpose is to make the
+  development of software for convex optimization applications
+  straightforward.
+</longdescription>
+  <use>
+    <flag name="dsdp">Use interior point library
+  <pkg>sci-libs/dsdp</pkg></flag>
+    <flag name="glpk">Use GNU Linear Programming Kit
+  <pkg>sci-mathematics/glpk</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">cvxopt/cvxopt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
new file mode 100644
index 000000000000..94dccaa44497
--- /dev/null
+++ b/dev-python/cx_Freeze/Manifest
@@ -0,0 +1,9 @@
+AUX cx_Freeze-4.3.4-buildsystem.patch 543 SHA256 dd46f4d702d646c129a6bbf17ab088a0ae21ea265241472c66dbd1879959009a SHA512 263ff5b148bc0054ed92fc96ad73a310b506b40d7b6cdb73c342f4cc25b4f5c7916cc7d84eddd3fa3cb2ae393918c1434a70019f9680ce410ca566c3c88a7e3c WHIRLPOOL 5e4c44640bebbe48087b3bfc11b49fe24d7b2ad0a82e92a10565edfde2b04ed61f965f4d9bcd2e2cec355bf07f93ad44a8f94e9137f807418daa5e7f42aab364
+AUX cx_Freeze-5.0.2-buildsystem.patch 531 SHA256 325ccc55abb08629489260cd0d48ea792de6a445646129cbf2399f1f25689e9f SHA512 ecec5ba92d669267c98a980722c5ac17e5ff6f92ba34b25bf7d2827cbc2e7022262baef42596fb84d4b101481d1377a2a2f3ff13069476f9c37c2da7fd6bf8ed WHIRLPOOL 3f936a9c328eff66343c3ac095486a50ad2a59de9b415cb4f3a7c086814405d069b3eacac34f9395cba1dc192b490848d4203e0306573a81df0e75b6bd0eb09c
+DIST cx_Freeze-4.3.4.tar.gz 60172 SHA256 40c7bbfa107e139d105fdf79d1a7540dbb9f84aaf0fecdd03420bf37f0031be2 SHA512 b523322c8199757245f3af2d9e3d68397708cfc8f318761f1eec6e011bd07ec12d3b748a60d33f43f0849f68ec064a729fb3250747216b90b8dd700d0a83699f WHIRLPOOL 829c5c017bdb0b07bbe3e941426d01e798db173fd68ce9b3ad2b96b610bb07262e71fb378fce83857233fd319fa1eb7fdb44477a354b39aa0a9bd1085897ba9c
+DIST cx_Freeze-5.0.2.tar.gz 60104 SHA256 253466f0acde1661d67aead4fe2493ffd496e0b17b63baf95e06d0f28b4c7d7d SHA512 eac1a5cfd5b73f43a9447f3fce8a6ba513e253da10f44a74e4fbcd5b83068a57316e215aa03acac6807dee235e6f690b4bbba1447667bb2cba33b1182cb87d29 WHIRLPOOL a8a23574667852cadf0a19814677924c9191da4850a04395e585ab8ea648c09ee095b865d9fd7168c832b21fe28e2d14da59d204b277bc107955cc97514e87bd
+EBUILD cx_Freeze-4.3.4.ebuild 496 SHA256 0f7d484979b6421b73e728490b18ba69890f214e162280d9301e0b79c054b731 SHA512 73d77125f1a971abfb29438056b18f34f7f262fe3836feaccde06d4d2fcc72796ed2fec3f01d284bfc563c0143759bb4f2c0fdc8d35e7948bc7426b3437fb9d7 WHIRLPOOL 98f44615525be99bd99f080266595ea7d77c0393985db69181c50ac7028af965e9171739601b181f3a7d9375fe2ab906d1d435c7a71ac24726324939362fbbad
+EBUILD cx_Freeze-5.0.2.ebuild 502 SHA256 fade9541088424f296677fb1afc4f8169cf8dc76e90f9fa0381a0bbfd82aecf2 SHA512 8ab5043c93d094892d4f04e3da5c7d485257813b15d14bb036d33f8289f60fbc8445646fd9e53cf368e5afa8c2921dbd533f74248196f72be6fc6e23ba04d98c WHIRLPOOL ac0b727b763fe332e72b9eb60b260143045193b3a691c2d68f15afdbede479b6a53c92a70eb58436b4710ac5afe834e9d145449544cb5416dfe2cd1854215ae6
+MISC ChangeLog 3092 SHA256 952eb8c572a8d51e203e069a962e7ef6e9f4f5daefceea5c8804a2b46bcd1868 SHA512 274775a873befb0ea980d493936b80fb08ee51b6dae03a467eeded49ceb52e41a8f53519729ffba0000bfcfb58b9549aa78c1138215a1d22174975d20939b444 WHIRLPOOL 4fd1ccd704cd35dfcd7169b6f2e9f51c44a56b114396710d423e7d30de4c3748f16027e407e2ed52a68bf9342f3c6b6427d283dc92567125f752c9ae2431ba5d
+MISC ChangeLog-2015 2110 SHA256 b3547f0c594eb8cd843ff2fb527b5dc665d1eba529ce9427c8f137f49a7c2b10 SHA512 90ad58358af9d30ed590a61e764cc6c67afaea6fc044cfbef2066b9ab9a0be1997d0100cdbe3d6f7d40e4a27f0b67d6cb72f90a31efb44891791a040edf59a4a WHIRLPOOL c64fd0726b93bfe6ae74e915bf5f410ac5dc5c03e4c90853785afeb7e1d1534e94bfc412e89fa89d81f3bab9e60ea07fc52d0c5c448b948e5d6a5b31558f7422
+MISC metadata.xml 474 SHA256 11bcd0444b10017ed215d2a6df4f34d6a4a56fa99242278b3641c1903e309656 SHA512 ad0429814e187ecb959811bed818f16c573940b4ee1c6671f967c2ac8673f0661404bc33fcb975f0a14e3841d8a9c376ec52ff1704d8bc33bc23a1d7232f3529 WHIRLPOOL 71666eb7668c02b7b372af3aaefdc456175097f9363bf0635cd25d67cd3dab02170bb5841f6aeeaae49a275aedc8cbc0ca006f168af1196ed69f2f643cefd19e
diff --git a/dev-python/cx_Freeze/cx_Freeze-4.3.4.ebuild b/dev-python/cx_Freeze/cx_Freeze-4.3.4.ebuild
new file mode 100644
index 000000000000..2209df51a71c
--- /dev/null
+++ b/dev-python/cx_Freeze/cx_Freeze-4.3.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit distutils-r1
+
+DESCRIPTION="Create standalone executables from Python scripts"
+HOMEPAGE="http://cx-freeze.sourceforge.net"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PYTHON"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+PATCHES=(
+	"${FILESDIR}/${P}-buildsystem.patch" # bug #491602
+)
+# test folder missing half the source content.
diff --git a/dev-python/cx_Freeze/cx_Freeze-5.0.2.ebuild b/dev-python/cx_Freeze/cx_Freeze-5.0.2.ebuild
new file mode 100644
index 000000000000..7e0398b64530
--- /dev/null
+++ b/dev-python/cx_Freeze/cx_Freeze-5.0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Create standalone executables from Python scripts"
+HOMEPAGE="http://cx-freeze.sourceforge.net"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PYTHON"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${P}-buildsystem.patch" # bug #491602
+)
+# test folder missing half the source content.
diff --git a/dev-python/cx_Freeze/files/cx_Freeze-4.3.4-buildsystem.patch b/dev-python/cx_Freeze/files/cx_Freeze-4.3.4-buildsystem.patch
new file mode 100644
index 000000000000..e55d0d324c30
--- /dev/null
+++ b/dev-python/cx_Freeze/files/cx_Freeze-4.3.4-buildsystem.patch
@@ -0,0 +1,16 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Tue Nov 19 11:20:21 UTC 2013
+
+Respect LDFLAGS, remove stripping.
+Fixes Gentoo bug #491602
+
+--- a/setup.py
++++ b/setup.py
+@@ -94,7 +94,6 @@
+                     extraArgs.extend(vars["BASEMODLIBS"].split())
+                 if vars["LOCALMODLIBS"]:
+                     extraArgs.extend(vars["LOCALMODLIBS"].split())
+-            extraArgs.append("-s")
+         self.compiler.link_executable(objects, fullName,
+                 libraries = libraries,
+                 library_dirs = libraryDirs,
diff --git a/dev-python/cx_Freeze/files/cx_Freeze-5.0.2-buildsystem.patch b/dev-python/cx_Freeze/files/cx_Freeze-5.0.2-buildsystem.patch
new file mode 100644
index 000000000000..6289bb2df2c2
--- /dev/null
+++ b/dev-python/cx_Freeze/files/cx_Freeze-5.0.2-buildsystem.patch
@@ -0,0 +1,16 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Tue Nov 19 11:20:21 UTC 2013
+
+Respect LDFLAGS, remove stripping.
+Fixes Gentoo bug #491602
+
+--- a/setup.py
++++ b/setup.py
+@@ -95,7 +95,6 @@
+                 extraArgs.extend(vars["BASEMODLIBS"].split())
+             if vars["LOCALMODLIBS"]:
+                 extraArgs.extend(vars["LOCALMODLIBS"].split())
+-            extraArgs.append("-s")
+         self.compiler.link_executable(objects, fullName,
+                 libraries = libraries,
+                 library_dirs = libraryDirs,
diff --git a/dev-python/cx_Freeze/metadata.xml b/dev-python/cx_Freeze/metadata.xml
new file mode 100644
index 000000000000..de69d316513e
--- /dev/null
+++ b/dev-python/cx_Freeze/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cx-freeze</remote-id>
+		<remote-id type="pypi">cx_Freeze</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cycler/Manifest b/dev-python/cycler/Manifest
new file mode 100644
index 000000000000..3a6a35f029ed
--- /dev/null
+++ b/dev-python/cycler/Manifest
@@ -0,0 +1,4 @@
+DIST cycler-0.10.0.tar.gz 16553 SHA256 cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8 SHA512 b7d2ba19861ffaf4dea0444bfe68b5a6264a022d7b3f02c9ff5e5859e3901de12a90f8dc7469e995e09c418515b3df55dbf05a0cfe5368d40790a2c878a74819 WHIRLPOOL 59c42f5b1d3fcf917cd19d8a9365614f07257d74135d8ee7dc231599bc600d1cf9e0c9a6e822c8aa1a932a31603e2a044b61143d648138e7e549d46a2f1b58f6
+EBUILD cycler-0.10.0.ebuild 834 SHA256 190cead5f2eba8c9e39829402eef263c45e844ca4f40657f49891f8025b37b85 SHA512 424944237088a25e4380074fe639edf226dc64782998f37efa0f277a5f9caa503a8cefb9c5f51ee3588944fd19e08ef78fd4769128714bec9e5c0ac59a20fcf8 WHIRLPOOL f1ead691b76a008ed17a7a8a37494d3ecc4db57e4d32d8161cc9d65fd4236b4c07bd6d1f9fda7bf1d82a005b54aa7ef3bbf0420ff27130605e918bed0e6965c8
+MISC ChangeLog 2451 SHA256 bfffafaaf8c05280e6030d474864bb738ee008a9d4fd02a9be695026d91b963b SHA512 15ccc1491c6c94b1bee72b67f939e73837df11e1621c09d49269f9cfc9b77cbb5abefc2224c26454dadc0ad945308672db4f15046694aa982a4bfddfc95af770 WHIRLPOOL c48d80532c39648b19013ea8e0e797fe904291f33fb4c52ea4dc2739bd54a5a872ce9fa6df326705a4ec9b283d6a1ed7b0f94aca3aa0002e8f1280f9a0eaa65a
+MISC metadata.xml 366 SHA256 303aa07dd52b0d074917e7dbd4771bcffcc9f3ff56d80e4d309a6ba00fc4e217 SHA512 43c46a3af153f4b58f305632cac2a699eccc74417ea468b1f85810ea90e843979a9c360231d6762acfb1402270ff27491dd0927f762143e354925637dc24df5f WHIRLPOOL 1be0ba65afbea92b1d3ae2f9ddd4bce02b129a3b78e5a96af302f781b0b008eb50ea04d64d4403c7ca20c5b11b26edd80d15bc192db963ca70ad810bb37735e6
diff --git a/dev-python/cycler/cycler-0.10.0.ebuild b/dev-python/cycler/cycler-0.10.0.ebuild
new file mode 100644
index 000000000000..a172a5ff9138
--- /dev/null
+++ b/dev-python/cycler/cycler-0.10.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="Cycler"
+
+DESCRIPTION="Composable style cycles"
+HOMEPAGE="
+	http://matplotlib.org/cycler/
+	https://pypi.python.org/pypi/Cycler/
+	https://github.com/matplotlib/cycler"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+# Not shipped
+# https://github.com/matplotlib/cycler/issues/21
+RESTRICT=test
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
diff --git a/dev-python/cycler/metadata.xml b/dev-python/cycler/metadata.xml
new file mode 100644
index 000000000000..d646bee57584
--- /dev/null
+++ b/dev-python/cycler/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">matplotlib/cycler</remote-id>
+		<remote-id type="pypi">Cycler</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
new file mode 100644
index 000000000000..217e443d50d6
--- /dev/null
+++ b/dev-python/cython/Manifest
@@ -0,0 +1,15 @@
+AUX 0.25.2-test-cpdef_enums-L-suffix.patch 586 SHA256 9ac2ff74927e95f8deb7b8d7c18d5459ea73fb19e7e828db0969fed0d55c10bd SHA512 95e4d94250720161da9a08441201e76aaaf5477325950ccc1cb9df209b8e5eb77572d81b75ddb9f5733973578fcf44c17f5b2d8f7338badb664cb2f5659be6b9 WHIRLPOOL 264b18c234631810fba85d3c16b043e8cac307fabba2844cfd0f2a5150522308d4a2ad86e6622a86d4d7d4cc3020dedd3c4076f3f8f05f46929e564946379a7b
+AUX 50cython-gentoo.el 388 SHA256 7dc8a6b8003478873ac5f276691f1e805dbba3352efd36640a1cc5ddb443ef54 SHA512 dd554d0d6cc220988552b06a20337af20b847e75bee76c90eb92ea979d9c2ae9d64ffa849266ff403d857b3737981de451bf40061bea0533600476bc57661c18 WHIRLPOOL c69767958f4c44b9ae56815c800635b695c3cd7800172d66908a78a362d76acf0292ecd03d50d83d608919c5da30f4fc9ce75b067acc7b30a564893012b6ac19
+DIST Cython-0.22.tar.gz 1584483 SHA256 14307e7a69af9a0d0e0024d446af7e51cc0e3e4d0dfb10d36ba837e5e5844015 SHA512 856220fa579e272ac38dcef091760f527431ff3b98df9af6e68416fcf77d9659ac5abe5c7dee41331f359614637a4ff452033085335ee499830ed126ab584267 WHIRLPOOL d9919e1fe33f7ea02833c485e10667d8470d7c69901b2419c6c4c1d464f9ef2444795e14903cc66b6fee40ec5a4c20308c331ad93fd8818f207d0a21cccf9b2b
+DIST Cython-0.24.1.tar.gz 1703756 SHA256 84808fda00508757928e1feadcf41c9f78e9a9b7167b6649ab0933b76f75e7b9 SHA512 c5a3e884edd782c47c81aef29708035bbcd1c14d17e005668da8a4e26fdbba9af9ec283fd46ceaa2cab6fc4ec0d42f7d409832d7cc0a3ec00e84b968b1bf27ea WHIRLPOOL 14224a56c5a6f5cd3f389225c440c65b30a5d1b92c63587c4e9af258b23b1bed1c01330830931c5aba596649d19b0aafd0e559aed5ad7b577a59417463fc3b4a
+DIST Cython-0.25.2.tar.gz 1703315 SHA256 f141d1f9c27a07b5a93f7dc5339472067e2d7140d1c5a9e20112a5665ca60306 SHA512 1974b9374aeedb030307dc95aa6560ce9d5e1652783cd4552e96ef11663c73dd263e3521b68e7712abbb31628011e2e66320c5ee2577968684e2679eb80726e1 WHIRLPOOL bb12d06fddb30d99527e3a62e8788b7aee92787aec9c46e927658f7ee60c8f3e32acb34b2deee1d0cf6ece7f4b06288008082ac609b8cb4b101a1348b1017865
+DIST Cython-0.26.1.tar.gz 1725133 SHA256 c2e63c4794161135adafa8aa4a855d6068073f421c83ffacc39369497a189dd5 SHA512 cdf31afaba78209c37a224345471c5c822b78c6d26c51583c46669b6b2b57b4952b33a839a51d06c3330fdff889345ac611fbaa2b2f17498cb02f3b5675f7948 WHIRLPOOL 1ef093c41f06249ee4fc40ae39078f20ae14b80b6a9dca382dfa9198a600928ddd0bc20fc42ec398b041b5f97c3c78003725467b26b9cc3a8b68405a288f0f87
+DIST Cython-0.26.tar.gz 1692039 SHA256 4c24e2c22ddaed624d35229dc5db25049e9e225c6f64f3364326836cad8f2c66 SHA512 58b7dbdca3b1bdfcb8b968cb1b59826b793656bb7f1203a80b59b3fae2d3174cc99f19f88fc2ec175aa98c9daeca0eb3c52674a7889ba1e914fd20d19ef92aed WHIRLPOOL 650a7db807afb11403b4850d6ec387cd5fdc528bf854f2eb4ec5b804a3b142895cbaf085fe82563374f586090e4cf5a40def6e1d410a8bea85cfa7003c44efe0
+EBUILD cython-0.22.ebuild 1773 SHA256 8edfbbe3f6bc4f1167b2ed7d0249832440dd5a00aa62275d6db138b5b9a3577d SHA512 97ccebe31f21bef76efdedf686395afe23524aa692697c1b3ccc58db36cec26fa008d2bda9542193905c89e7205706e75bd1b633999f9ddfad8696e0461790ca WHIRLPOOL 01e16d70f7947697072ac4dd45be92574da6ca2c07cdadccaa3a5279245fabb9edccf8abafb9197942c86a4395b84e1b97a99126ad0213e482ef61f5d0c792fb
+EBUILD cython-0.24.1.ebuild 2078 SHA256 14f91000cdcfbd19fdf28d99ed082843b2029e89022f91e8a2fd743b1ae81f20 SHA512 90c92bf91dd95b555d10eb46736927d0d06c0f6f919c931f778873821c20fefabb9b717b2e08965d68ede1d9e8d371aaf5ba4432e010f7764dca2d3db53731dd WHIRLPOOL 412e957b9865a3bb10fce664cfe159a10c2b387da9b9219bc9cc432d819d4234255a8c08cf84b7f42451a2cbd7758c28569c2f5314130f87da0f5ac4922079e4
+EBUILD cython-0.25.2.ebuild 2145 SHA256 284b75661a7a4547206e373e73c2e1ef14e6998768f7c7ddb044424900988013 SHA512 e8a5842dffcfb0b53680f2b717bb001aa416ea4eb94bc45ba6e79629801688e9d4059bc46223d8e66081d167a0c01913f6e9e48efac4d3dc05c55be20fd77cd2 WHIRLPOOL 0bf4da72f1f1d0f5c4ce27b4f23a54cda889c38d4752614aa9c3f78ff2d9ccfb3a045e046f68d438252e48dbb9d02b9fbac85c6d91204fd5a3091e9b3aecdc1b
+EBUILD cython-0.26.1.ebuild 2087 SHA256 02114fb6be6c5414f94dbe84f2599d29711abd2f0b65ed63e5576a8dcb4410e9 SHA512 c0a9731653608723a577f0fc53b3f418bb9f20d6300bfd0992a6767bc1353c640c2004f7f2df0f60b2b7fe404e4b5cb91ace10bb874293d7288cca4664280116 WHIRLPOOL 663b2b22e90e351bb1ee25b7fff1aa1102bd05ae8629d8f604aa63d3a3fe4c56232d166330b87f549f59afbcbcb0824acd501266e4cdb6e4cbe23adec077ca71
+EBUILD cython-0.26.ebuild 2087 SHA256 02114fb6be6c5414f94dbe84f2599d29711abd2f0b65ed63e5576a8dcb4410e9 SHA512 c0a9731653608723a577f0fc53b3f418bb9f20d6300bfd0992a6767bc1353c640c2004f7f2df0f60b2b7fe404e4b5cb91ace10bb874293d7288cca4664280116 WHIRLPOOL 663b2b22e90e351bb1ee25b7fff1aa1102bd05ae8629d8f604aa63d3a3fe4c56232d166330b87f549f59afbcbcb0824acd501266e4cdb6e4cbe23adec077ca71
+MISC ChangeLog 7241 SHA256 45c29e2c847432f739e2b1384421f24dfdd9bd37875a1bae85616fbde1e58e1c SHA512 160b823c273608b4a1d40bc5e997464c9cbb053eea24271bdbdc4a8eb5190714583616f131b85cc2db229ad2cdade42cf3ca6deff0cce07c4b61dfe04053f6f4 WHIRLPOOL c8e10dcf8347a482aaeac6d85331473adc3bd5b59f3b492fdb7fa5fc7bc387b18db27d42df85bd3b441aadb733efebfc9d836a8023e2c321af9a2c0f14355240
+MISC ChangeLog-2015 20882 SHA256 b28001e470dd06b228c1b604f7208646eb6b1615c5a7bac34f09e48b6ae99efc SHA512 6aff62c5177687862bb877541960f6b4eb428f4124e7e21708f6919414488212b44c570c04ee650810ae113c884d0846c123363ecb4370bf3e69c2a77724266f WHIRLPOOL ea2177eedd40952fd53e2c8de10bb58cb7b19b44641cd357a212b75c06e4fd8228bc2b9d5c2ccf9fccb110de1aec33d7b3066c5a84e3eff2197fa931995ba64a
+MISC metadata.xml 570 SHA256 5d651cb7914454f8fc582df9fffe8065a11bed42d0733b3db0fe6ca5941d50a7 SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad WHIRLPOOL 72cdba315014848743a52b50d28c07a714a6a46cd7670b96392b907d0df7a4026910842bec9f9da06d6c73b129769b2daa744a4a0e870d3baa7abcf95e125dd4
diff --git a/dev-python/cython/cython-0.22.ebuild b/dev-python/cython/cython-0.22.ebuild
new file mode 100644
index 000000000000..ad25b03c6954
--- /dev/null
+++ b/dev-python/cython/cython-0.22.ebuild
@@ -0,0 +1,62 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic toolchain-funcs
+
+MY_PN="Cython"
+MY_P="${MY_PN}-${PV/_/}"
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="http://www.cython.org/ https://pypi.python.org/pypi/Cython"
+SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+
+RDEPEND=""
+# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs
+# spanning several packages. This bug has been fixed in the recent release of version 9.1
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-9.1[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV%_*}"
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS}"
+		local CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	# Python gets confused when it is in sys.path before build.
+	local PYTHONPATH=
+	export PYTHONPATH
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && unset XDG_CONFIG_HOME && emake -C docs html
+}
+
+python_test() {
+	tc-export CC
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	use examples && local EXAMPLES=( Demos/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cython/cython-0.24.1.ebuild b/dev-python/cython/cython-0.24.1.ebuild
new file mode 100644
index 000000000000..1b46d1f93fd8
--- /dev/null
+++ b/dev-python/cython/cython-0.24.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic toolchain-funcs elisp-common
+
+MY_PN="Cython"
+MY_P="${MY_PN}-${PV/_/}"
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="http://cython.org https://pypi.python.org/pypi/Cython"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="doc emacs test"
+
+RDEPEND="
+	emacs? ( virtual/emacs )
+"
+# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs
+# spanning several packages. This bug has been fixed in the recent release of version 9.1
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-9.1[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+
+SITEFILE=50cython-gentoo.el
+S="${WORKDIR}/${MY_PN}-${PV%_*}"
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS}"
+		local CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	# Python gets confused when it is in sys.path before build.
+	local PYTHONPATH=
+	export PYTHONPATH
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+
+	use doc && unset XDG_CONFIG_HOME && emake -C docs html
+}
+
+python_test() {
+	tc-export CC
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/cython/cython-0.25.2.ebuild b/dev-python/cython/cython-0.25.2.ebuild
new file mode 100644
index 000000000000..740a984cb59f
--- /dev/null
+++ b/dev-python/cython/cython-0.25.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic toolchain-funcs elisp-common
+
+MY_PN="Cython"
+MY_P="${MY_PN}-${PV/_/}"
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="http://cython.org https://pypi.python.org/pypi/Cython"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="doc emacs test"
+
+RDEPEND="
+	emacs? ( virtual/emacs )
+"
+# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs
+# spanning several packages. This bug has been fixed in the recent release of version 9.1
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-9.1[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+
+SITEFILE=50cython-gentoo.el
+S="${WORKDIR}/${MY_PN}-${PV%_*}"
+
+PATCHES=(
+	"${FILESDIR}"/0.25.2-test-cpdef_enums-L-suffix.patch
+)
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS}"
+		local CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	# Python gets confused when it is in sys.path before build.
+	local PYTHONPATH=
+	export PYTHONPATH
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+
+	use doc && unset XDG_CONFIG_HOME && emake -C docs html
+}
+
+python_test() {
+	tc-export CC
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/cython/cython-0.26.1.ebuild b/dev-python/cython/cython-0.26.1.ebuild
new file mode 100644
index 000000000000..7599fb5e7e1f
--- /dev/null
+++ b/dev-python/cython/cython-0.26.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic toolchain-funcs elisp-common
+
+MY_PN="Cython"
+MY_P="${MY_PN}-${PV/_/}"
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="http://cython.org https://pypi.python.org/pypi/Cython"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="doc emacs test"
+
+RDEPEND="
+	emacs? ( virtual/emacs )
+"
+# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs
+# spanning several packages. This bug has been fixed in the recent release of version 9.1
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-9.1[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+
+SITEFILE=50cython-gentoo.el
+S="${WORKDIR}/${MY_PN}-${PV%_*}"
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS}"
+		local CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	# Python gets confused when it is in sys.path before build.
+	local PYTHONPATH=
+	export PYTHONPATH
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+
+	use doc && unset XDG_CONFIG_HOME && emake -C docs html
+}
+
+python_test() {
+	tc-export CC
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/cython/cython-0.26.ebuild b/dev-python/cython/cython-0.26.ebuild
new file mode 100644
index 000000000000..7599fb5e7e1f
--- /dev/null
+++ b/dev-python/cython/cython-0.26.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic toolchain-funcs elisp-common
+
+MY_PN="Cython"
+MY_P="${MY_PN}-${PV/_/}"
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="http://cython.org https://pypi.python.org/pypi/Cython"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="doc emacs test"
+
+RDEPEND="
+	emacs? ( virtual/emacs )
+"
+# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs
+# spanning several packages. This bug has been fixed in the recent release of version 9.1
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-9.1[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+
+SITEFILE=50cython-gentoo.el
+S="${WORKDIR}/${MY_PN}-${PV%_*}"
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS}"
+		local CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	# Python gets confused when it is in sys.path before build.
+	local PYTHONPATH=
+	export PYTHONPATH
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+
+	use doc && unset XDG_CONFIG_HOME && emake -C docs html
+}
+
+python_test() {
+	tc-export CC
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/cython/files/0.25.2-test-cpdef_enums-L-suffix.patch b/dev-python/cython/files/0.25.2-test-cpdef_enums-L-suffix.patch
new file mode 100644
index 000000000000..3a8b9d9d1e71
--- /dev/null
+++ b/dev-python/cython/files/0.25.2-test-cpdef_enums-L-suffix.patch
@@ -0,0 +1,19 @@
+From d92a718a26c9354fbf35f31a17de5c069865a447 Mon Sep 17 00:00:00 2001
+From: Robert Bradshaw <robertwb@gmail.com>
+Date: Tue, 24 Jan 2017 16:57:00 -0800
+Subject: [PATCH] Normalize possible L suffix.
+
+---
+ tests/run/cpdef_enums.pyx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/run/cpdef_enums.pyx b/tests/run/cpdef_enums.pyx
+index 167c762..c264ec5 100644
+--- a/tests/run/cpdef_enums.pyx
++++ b/tests/run/cpdef_enums.pyx
+@@ -93,4 +93,4 @@ def verify_resolution_GH1533():
+     3
+     """
+     THREE = 100
+-    return PyxEnum.THREE
++    return int(PyxEnum.THREE)
diff --git a/dev-python/cython/files/50cython-gentoo.el b/dev-python/cython/files/50cython-gentoo.el
new file mode 100644
index 000000000000..e6dcc6a6d7fb
--- /dev/null
+++ b/dev-python/cython/files/50cython-gentoo.el
@@ -0,0 +1,11 @@
+;;; site-lisp configuration for cython-mode
+
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload  'cython-mode "cython-mode" "Major mode for editing Cython files" t)
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.pyx\\'" . cython-mode))
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.pxd\\'" . cython-mode))
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.pxi\\'" . cython-mode))
diff --git a/dev-python/cython/metadata.xml b/dev-python/cython/metadata.xml
new file mode 100644
index 000000000000..6fed3f622bc9
--- /dev/null
+++ b/dev-python/cython/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Cython is a language that makes writing C extensions for the Python
+    language as easy as Python itself. It's based on Pyrex, but supports
+    more cutting edge functionality and optimizations.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">Cython</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/cytoolz/Manifest b/dev-python/cytoolz/Manifest
new file mode 100644
index 000000000000..c96e3e8d8e8a
--- /dev/null
+++ b/dev-python/cytoolz/Manifest
@@ -0,0 +1,7 @@
+DIST cytoolz-0.8.0.tar.gz 349493 SHA256 2239890c8fe2da3eba82947c6a68cfa406e5a5045911c9ab3de8113462372629 SHA512 08a97312602b3bd71cb9a3b6f879121f739c73065210bcbac227e366112b2157d479912040296d58c5aa79d3fab8496fb92b12e0ee8df0cca15f46f151312b73 WHIRLPOOL 857501b3806f00ff65240ed2b301e62202d92ae535879a952782d6d81950d0c2c6721bfe08d581d4fda699209a624a1ca667509c4901910444099b23d5741637
+DIST cytoolz-0.8.2.tar.gz 386259 SHA256 476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552 SHA512 b75408db5c13c1142fe71f37c43e7b3dd73cba294571ddaf5dc1bf03ae0e18fb7b6d37f42980db65a4e074b923ac1243a90f1dd30302f0f9be3d7b1904014082 WHIRLPOOL 213d812bc49af13019836c779eee0f701ad5afdcdaf46af521efeb9379fb2396f7980540c28681453331dc0baec1389af322ae6ee1cd7249aac5d7d4d638702e
+EBUILD cytoolz-0.8.0.ebuild 1026 SHA256 66ab7ee9d1c2bcfa8d599319fc38cc195cb255aee6011b472beab63b15ab2437 SHA512 029523884af3e55556fd66c273681f4d573f2e02a27b020ba7201804c4b2978245e3eaa2d8bad9eab1ca59fe97a4a654ebfd57a82ccac2df49f9bf21710eea62 WHIRLPOOL 12e59f945ddd5d28957f511b3bf67a2d3987ef5c606377cdec1d33fe6e61eb0e177562af2ed941bdc270655cbe44824f8f723762699d390e67b6401cb55ed294
+EBUILD cytoolz-0.8.2.ebuild 1052 SHA256 b9d1e107283807e659de02f4062b26d8200921d9fa6ee01c35e0407a5bdb38d8 SHA512 eaa517684b73ea54b175e83bfa10d1fd8dac23c06bf64d83f4f222389efe1996ea687ffdc7785997ef78cf8d2bb0f4bce348380461762da903c4b2cede1f81d9 WHIRLPOOL ceab54f3542653abddf4042e94e1ad19304308beba21b67a3cbf2a7d7bcebb59b284089c58445c63bbd3ebd3d8bd1739020ae949c3ce16f8ef353e26c4c16e5b
+MISC ChangeLog 3480 SHA256 393eb0baca3f8d8f32aabdf297c35238869bf366b654b57f6c9f0b7fe5d68ebd SHA512 4f6a2f32678860bd8eb7dbd67d43cb61565de15b9a300b5ea8299c40fd4de410fe1addf1c34a49912829884853b69b9b45c1b611f664c6c290500cc0a088d615 WHIRLPOOL 5dde2be19a05592f1919976f4098d8db0fc7beb8811840ffdca2c0611713b41e24fb93e7a58d31a8ac8367a285dbc9ac4f6fef4872a8ffbba2bef0d9b756a49a
+MISC ChangeLog-2015 1582 SHA256 57162792b6476c0a81c1b003a658878f426a5ef140f443b438dee139edef3220 SHA512 28f1b5988c606fe6ee79f45299b40ef6dfce8d93aff6b75abb8243c25b6ff5b725acfb676d15f49d892a3d150e762e44f23a5b1c22f7ea94ef0631f35b9f3eeb WHIRLPOOL bed63c1e205d487d03867486370c722461f6a3220ab7cf1d6455cc7d24127bfd01ccd153f25fbf138a3ba592ff3af6d72dcdad372985828f440898d66c8ddb39
+MISC metadata.xml 310 SHA256 81235652103ff14be72d7b10b63e061e67155e3b6004c6c3e3c538321ce6b40c SHA512 3858eac51c768acb385d86f38529d983b781efcc4cb0ce8b6bc326962df9541d13f21881c4deffa19b5575ae7fbd1b97da58a3ab65dc724eac7144a050de540f WHIRLPOOL 7516deb2fb32fe245a2884971115768e73670af7a3620b15f4ba395108e582b67e812b7d91f5d0b85855bae75fbe10e532f63892eed8e7f0486d2e46dc58fd69
diff --git a/dev-python/cytoolz/cytoolz-0.8.0.ebuild b/dev-python/cytoolz/cytoolz-0.8.0.ebuild
new file mode 100644
index 000000000000..5290b6ba45bb
--- /dev/null
+++ b/dev-python/cytoolz/cytoolz-0.8.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Cython implementation of Toolz: High performance functional utilities"
+HOMEPAGE="https://pypi.python.org/pypi/cytoolz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+# Informed by author the dep in toolz is not only required but the
+# tests are version sensitive.
+# https://github.com/pytoolz/cytoolz/issues/57
+RDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/toolz-0.8[${PYTHON_USEDEP}] )"
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib/ > /dev/null || die
+	PYTHONPATH=.:${PN} nosetests --with-doctest ${PN} || die "tests failed under ${EPYTHON}"
+	popd > /dev/null || die
+}
diff --git a/dev-python/cytoolz/cytoolz-0.8.2.ebuild b/dev-python/cytoolz/cytoolz-0.8.2.ebuild
new file mode 100644
index 000000000000..fb229fab00fd
--- /dev/null
+++ b/dev-python/cytoolz/cytoolz-0.8.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Cython implementation of Toolz: High performance functional utilities"
+HOMEPAGE="https://pypi.python.org/pypi/cytoolz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# Informed by author the dep in toolz is not only required but the
+# tests are version sensitive.
+# https://github.com/pytoolz/cytoolz/issues/57
+RDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/toolz-0.8[${PYTHON_USEDEP}] )"
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib/ > /dev/null || die
+	PYTHONPATH=.:${PN} nosetests --with-doctest ${PN} || die "tests failed under ${EPYTHON}"
+	popd > /dev/null || die
+}
diff --git a/dev-python/cytoolz/metadata.xml b/dev-python/cytoolz/metadata.xml
new file mode 100644
index 000000000000..0f122a12b4d8
--- /dev/null
+++ b/dev-python/cytoolz/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">cytoolz</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/d2to1/Manifest b/dev-python/d2to1/Manifest
new file mode 100644
index 000000000000..a64d250a1ff5
--- /dev/null
+++ b/dev-python/d2to1/Manifest
@@ -0,0 +1,5 @@
+DIST d2to1-0.2.12.post1.tar.gz 35973 SHA256 49ef2d16862b3efdc81fc5c32eac373b984945cde5fc02bb01a0a11ff03dd825 SHA512 89890afc78b21d78f42ef5c920d377cd58075829e025c512d86138d52943ce8b71d1245bf267f76f775c6a69bf81bf9881322bd64b0e75ae088134e6b66f4d2d WHIRLPOOL 4470129450781e8fdb17bfecb4354f80215ae72216f3d903bb94099bcd361638bf38bc8e3d29f4ae1bae1b6c09daa8a09e870371469745fac424f7ad5e32e2bb
+EBUILD d2to1-0.2.12_p1.ebuild 904 SHA256 3d267ad6e1a9a9f12091a6cd9669aaeaef9a9b61af1400ecc1759523101949a9 SHA512 98dc5ae61a5e7faa8817fdd30b02f9dbd7320528af715d3d1006b74ff82bdae11bcd482ba2223e87cfe66c413c4711cf3f2b1f2189f286256b787750806c352e WHIRLPOOL b0c5d20e53948240a32a5a4eabb9a70fc359306979056a049796edfd7201aec0323f355f039585e03232f7fa6bc91f6766fdd656d5740697d4bdf7fe44ad4566
+MISC ChangeLog 3704 SHA256 304aa394dfecef9e676a91a2901391c4647abdab4014216cde46d039e0ff6b04 SHA512 bfca3c11b06dfd3687274c6c47a1b0aefa3daedc7e9cb44415f61bb529e0c77647a17d18e4405353bfe1d91225089244e4e59773970dcba3546296ca2fa9e9d8 WHIRLPOOL eb0190794cb7312da4f0395f800f400387834b0f034bddf96b389ca09c966b215877ffdecdc6175ec581bff5e095814fa97345498d35f636d4221ad83144c39f
+MISC ChangeLog-2015 2126 SHA256 0d08bfed20bf39ace868fa244eb933d4268f1d3cf69c6d1c97d6fefb8aa8c19d SHA512 4f437ff891b8a124d246a7da0b161b9c3e102adbd42d54ba0a0fad792f246ed11b98783e326f8c08d745d835f9ff8a494912c3d74faffaa7e7f1e66a62089f37 WHIRLPOOL a4a9c0d5cd5f21cbfee0c66357a97a1ac640e944869bbdf8e0639d7e68d1d5f20b0ae73d0161990284bb58662fbc153cac2412847bf11a2ee18bfa0712665fd1
+MISC metadata.xml 734 SHA256 3b3194b5b6077d586dc9465a00f5ccc4fe29e895a3b9d15e1c3baabc246296e1 SHA512 b31816f24d91b5eca6cd55019cbb9442e33b110f35899d0a6b1118b4611d80d2914e2242ed62ef4154a499cb33b5f1866b17eadb5c4b9d1505d3d6cb226fd02b WHIRLPOOL a1b7d89f8648f0af77da319f92c952ccbc6848a7f575c3aff732512a001dc1188bf95cb44e9a8912430d6e76580757f5a074227dfbb4de02868859d59ec4dfb1
diff --git a/dev-python/d2to1/d2to1-0.2.12_p1.ebuild b/dev-python/d2to1/d2to1-0.2.12_p1.ebuild
new file mode 100644
index 000000000000..070e6c3ae51e
--- /dev/null
+++ b/dev-python/d2to1/d2to1-0.2.12_p1.ebuild
@@ -0,0 +1,41 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+MY_P="${P/_p/.post}"
+
+DESCRIPTION="Allows using distutils2-like setup.cfg files for a package metadata"
+HOMEPAGE="https://pypi.python.org/pypi/d2to1 https://github.com/embray/d2to1"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	rm ${PN}/extern/six.py || die
+	cat > ${PN}/extern/__init__.py <<- EOF
+	import six
+	EOF
+	sed \
+		-e 's:.extern.six:six:g' \
+		-i ${PN}/*py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/d2to1/metadata.xml b/dev-python/d2to1/metadata.xml
new file mode 100644
index 000000000000..55a860b4f781
--- /dev/null
+++ b/dev-python/d2to1/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>d2to1 (the 'd' is for 'distutils') allows using distutils2-like
+		setup.cfg files for a package's metadata with a distribute/setuptools
+		setup.py script. It works by providing a distutils2-formatted setup.cfg
+		file containing all of a package's metadata, and a very minimal setup.py
+		which will slurp its arguments from the setup.cfg.</longdescription>
+	<upstream>
+		<remote-id type="pypi">d2to1</remote-id>
+		<remote-id type="github">embray/d2to1</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/dap/Manifest b/dev-python/dap/Manifest
new file mode 100644
index 000000000000..1e07c7f2194e
--- /dev/null
+++ b/dev-python/dap/Manifest
@@ -0,0 +1,5 @@
+DIST dap-2.2.6.7.tar.gz 54055 SHA256 89601cb351681e7cdc621c2aa9d8788d180d2f16f6d341f55f513c489af8701a SHA512 8b9ee3fbbe15777f050f067be29a8d4e8e8b58aa8b430f69330da262593808838c8e0b3946a6f7932dc5d4d1b9dad12be73b98f82a6c399f7383f2630ad6ce47 WHIRLPOOL f5f055bfa3f303643ac0593a972b732f4b431284e8c959c49ca3e41182d3a8b0bfb844ba9471318308a54408fb08ee19525679c0d9460ce29753ecc616883894
+EBUILD dap-2.2.6.7-r1.ebuild 922 SHA256 66b8d459671c78eeca0f328ed2169f6c45ed6596a9bfc72c43acd5309f070a2a SHA512 76b501d3d308f64cd15a26044687a99fe47e1586bdcb15fc19a261359b1de0958c492f660f9c96b9da838d9b458aa193e58b7511d4d09beb5712638fa31d4af9 WHIRLPOOL c8389f682569a566d1fb4e698f65c35aaa66f96432de29ecd80f3883036c6075837e2b9884009322bd9696a78257059a6c2b9dd3dfa423398b50016d51c4e11a
+MISC ChangeLog 2571 SHA256 4d3c3fc569004f2035111b801f9f39554b813c688d774919631718741de84bfa SHA512 a3310fc407f361805215bf3efbbf7284320a5684a34a35b009e1d6ce07d84cac3ea05d3d9c1fe8b30c30df476715709066c3981e51bec83b037923975cbf6a5c WHIRLPOOL ef17c0ce86eddbf5caeefd680e5efd6045c5512d2b8c37225ae9480777bf83b7d9a1efc83b6132d5ec598c02664e32be514a8a553ab688a8746c2f7325c722d9
+MISC ChangeLog-2015 2103 SHA256 b226509a8161ea878497c6d50acab371d39a6f1165c30c08c60e428a38a732e3 SHA512 f5c53df44da1b27dbba57bf51fcf76857b60a148619aed8eb7dbe8dfd66bd19e317285c5578682d98f2eef8cc42a44892c856644a3c6e598049c59ca05b18184 WHIRLPOOL 9e6a89b8ceb51ef186dadeef5d20df44085c679de0d9ff41ca77fe3a4fae87f4390bfa76257add837a945c5a5db1437b5e2b24d9e38f9131a77c428e45e60f99
+MISC metadata.xml 785 SHA256 c0743306161c2bb195bbaa11b6866bed87eb840170e6d0a3d6cf17780dfb1707 SHA512 6ceab6d92c0b6a1ca339deba49015878602727c795e4a63d24dcf81dfe4456b0fc6c20876a6a35a5052172e0b7dd3f2b1271eb8682d2b3f13fb0f098327cdf9f WHIRLPOOL b00c8e6c6c2292495fba230bbfa1cb0c5f30db9a03e7d92a56d3ba4f12775cb133a6532ddf15dd4af2ad242bfdcb9a599db557b2875d9c379620b19770c821cb
diff --git a/dev-python/dap/dap-2.2.6.7-r1.ebuild b/dev-python/dap/dap-2.2.6.7-r1.ebuild
new file mode 100644
index 000000000000..cc9a0959438a
--- /dev/null
+++ b/dev-python/dap/dap-2.2.6.7-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Data Access Protocol client and server"
+HOMEPAGE="http://pydap.org https://pypi.python.org/pypi/dap https://pypi.python.org/pypi/Pydap"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="server"
+
+RDEPEND="dev-python/httplib2[${PYTHON_USEDEP}]
+	server? (
+		dev-python/cheetah[${PYTHON_USEDEP}]
+		dev-python/paste[${PYTHON_USEDEP}]
+		dev-python/pastedeploy[${PYTHON_USEDEP}]
+		dev-python/pastescript[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( docs/bugs docs/Changelog docs/history README TODO )
+
+src_prepare() {
+	sed -e "s/'dap.plugins'/'dap', 'dap.plugins'/" -i setup.py || die "sed failed"
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/dap/metadata.xml b/dev-python/dap/metadata.xml
new file mode 100644
index 000000000000..34ec26873bae
--- /dev/null
+++ b/dev-python/dap/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="server">Enable OpenDAP server support</flag>
+	</use>
+	<longdescription lang="en">pydap is a Python implementation of the Data Access Protocol
+  a.k.a. DODS or OPeNDAP. Using pydap as a client you can access
+  hundreds of scientific datasets. You can also use it to serve your
+  data from a variety of formats.</longdescription>
+	<upstream>
+		<remote-id type="pypi">dap</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
new file mode 100644
index 000000000000..4c0e96b6fd6b
--- /dev/null
+++ b/dev-python/dask/Manifest
@@ -0,0 +1,10 @@
+DIST dask-0.10.2.tar.gz 357356 SHA256 dbc80f7cbf51abee4dc49e5da188c57e2f816898165cbc1ddfe44b2c640036ca SHA512 92bd671ff1483fe87edd34330dce321b88362d80ef4d836ab4eede87fdad5f657c51d03a9885a53924fb3becb504a8843cf852be08c88f5389f04c3f1b8aefe2 WHIRLPOOL 91d910130edfe3595d5f3f54aeb63a12bafd89f8d6bb68ca70dd72b98cf5ed465955154eef7ee2f7caf0f2d4145648cd48663b680c847e0f2b9600c0d5131b25
+DIST dask-0.14.1.tar.gz 500509 SHA256 46c8ef9aa41a5755f2194b535bff7fdef1343d3993ab294b198caf95155ec94e SHA512 a0f49e5337ea30bf5344a7e34ffdd2e1b64afb256372aa4b1095ad016f2c840d00672233da0840e25030c7a57c3841eca8bff9a4182a412b33351280bd03c0f3 WHIRLPOOL f15326d30180fc58a5605b0a99fd07acacf120e1f26aec8b82a408d6172b83f99ef236f6ad41bbeebf59c6d570c6589333d0d37afa2150151c143b52467c5264
+DIST dask-0.15.0.tar.gz 2141796 SHA256 812bbf7f4420f02556f76b8c67f06354237ae1b22bd0b6af54b5ba91f9548a67 SHA512 676dd33276f229aef088f168e71ab792a4ee8aa48dc3236fde647b8d6fdc1f29075664c65ae05008217fa3602472e2eb1de0fc51ab872f37c9257505bd8da086 WHIRLPOOL eb4522ed97cc5b58a681210cfa65258f028616218373e532148cbf99bbf8a533df25329f33f5649a7bc178e38d6be8f2d14e23e58bb34d8d4d6a5e7d5cf90be8
+DIST dask-0.15.1.tar.gz 2147022 SHA256 f62f19ab5958b13d0ee733db18218c28a9d452a3554446a3dfb5ac3d4a5f7e34 SHA512 44e7119c2a8d15efb89e265e5752edb117dd06da8a5e7511b68c5859e9068aedb3595540645304f0322f869c83df79a497d731bcade79612f8fd3f4eaaf3763b WHIRLPOOL 87edda7d74abf7f01ab69756fe43e1ca55dea2698625e5e4ac7413f30d38142f8f70ef4b1f7f6f6b5a124398ed626edc1d54e55dee934d2a601e03cbe5b95c05
+EBUILD dask-0.10.2.ebuild 946 SHA256 9d03f412281f226678e2a8f01bb524513dbd02e9d47227989d10f124eae0e8f5 SHA512 611c1b6d68e0f6c74f90d2063d69e3b3e149aa0b95596c71b1cece2f8c1fb5e9fb5ef971ac857943d2e19eb52924152acc82150a45ed2bad59e2d14ed1ba46a9 WHIRLPOOL c4daf79f0260d8bb28283b6579a0ad8c4ba7cc4bf21d3498b5a19485a11f69f15cf339cc5ea025e0b2472f847db821297f4c31e34221e68159e8db745bea1808
+EBUILD dask-0.14.1.ebuild 953 SHA256 a5f895bd6ffed2e567d5c2794d33d1b6d9912f49b1f368c0a6b3aaca477c897d SHA512 b00ecdf7cb0a0189a2a015f3775dda0a68cef7e7241cb72d9be5c6d49f9e208a50992ac403a012bd8b93db45fb893ff3cdde48d118d71a22d0ddb8cc24e214d4 WHIRLPOOL f6b6aeba109bd426d15819ed75ecd930fcc420ecb238a21c42f33891e831f169181fee01c34615ea1bbf544c9f9079e04af7dd66677078fe8cb9249667a2c6c5
+EBUILD dask-0.15.0.ebuild 1020 SHA256 e1c8abaa55e7af9055d7023adc5792603a01ab046e3a52c503f75e6b67cf9dab SHA512 d3854894ce73c6477456b93358114c03a3650feed25ebe0a830ad96a4f9a5c19ea50bcb9e1511ab4236659241047979134245c946a773a803d8f29aa5a74fa43 WHIRLPOOL 2067d3f4bfec10aea698d02361e61b68bfd524e961a0485fa288c19119694d5081a89adff064f620fef5ab502d747727e26969653c885570080d8d0918366743
+EBUILD dask-0.15.1.ebuild 1094 SHA256 1733ad235184c13f3df859111bfa043a83e199ea7863d44711d017023d1f33c4 SHA512 2c93a8711136504fc736fd1b16171b741485b37ad095095aa78e26046e4c742f6f33fafa2eb54158e95914d4ff5b777815fa8637ab77f493904737971223c38a WHIRLPOOL 21f5095a9597cea1cb767176cff1d71829ff37a7fa6a5a75d4dbfd19ec261981a260be312141ca0be299164b1861fdea2f3edf408a18a746cf935f8e8024d1e4
+MISC ChangeLog 452 SHA256 6decbc1bcee30aac7ef68640138591410641719aa9926028f02c50ada2e0fe57 SHA512 c4287eb404db8af603d41341c6c854d578fb58faac7b0fdade4540f9211a1688423f1c8292eca061cdc71b6528c7456dec414d758225544297b92bc8ad49b646 WHIRLPOOL a2c3f15b8871d9dc71237bf9bda8047748a833498a44f28a9f453062a093894bdd3390acadac6696444a5081a687147e59de5044fbf410169df73b755750de66
+MISC metadata.xml 777 SHA256 78557eb094a57360f5273522cceb8bfaa83ff3a73318f62c3982fc7d10cc25ed SHA512 0ec3d7886c54dce68d7aa90cca45e54b37a000617d4bddd88c1d06ef7db50c23a077b8967acbfdc475cfafe444edd2584500867f45f9e89721f259d3dd330850 WHIRLPOOL 9ee88c168b7318cce0f804b26f9774fa8892a3634b15c704442e7981f956e9b3c78e21ebcc08138efb3a810645315fdd2679aa030d62e6495fa532ab6afbd508
diff --git a/dev-python/dask/dask-0.10.2.ebuild b/dev-python/dask/dask-0.10.2.ebuild
new file mode 100644
index 000000000000..49e11ea9e0f0
--- /dev/null
+++ b/dev-python/dask/dask-0.10.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="http://dask.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/bokeh[${PYTHON_USEDEP}]
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/partd[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/toolz[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		 dev-python/pytest[${PYTHON_USEDEP}]
+		 dev-python/numexpr[${PYTHON_USEDEP}]
+		 sci-libs/scipy[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/dask/dask-0.14.1.ebuild b/dev-python/dask/dask-0.14.1.ebuild
new file mode 100644
index 000000000000..2ddd31089de4
--- /dev/null
+++ b/dev-python/dask/dask-0.14.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="http://dask.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/bokeh[${PYTHON_USEDEP}]
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/partd[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/toolz[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+	   dev-python/pytest[${PYTHON_USEDEP}]
+	   dev-python/numexpr[${PYTHON_USEDEP}]
+	   sci-libs/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/dask/dask-0.15.0.ebuild b/dev-python/dask/dask-0.15.0.ebuild
new file mode 100644
index 000000000000..e020242bf401
--- /dev/null
+++ b/dev-python/dask/dask-0.15.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="http://dask.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/bokeh[${PYTHON_USEDEP}]
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	dev-python/distributed[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.19[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.7[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.7.2[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+	   dev-python/pytest[${PYTHON_USEDEP}]
+	   dev-python/numexpr[${PYTHON_USEDEP}]
+	   sci-libs/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/dask/dask-0.15.1.ebuild b/dev-python/dask/dask-0.15.1.ebuild
new file mode 100644
index 000000000000..bb208eb98ad4
--- /dev/null
+++ b/dev-python/dask/dask-0.15.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="http://dask.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="distributed test"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.1[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.19[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.8[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.7.3[${PYTHON_USEDEP}]
+	distributed? (
+		  >=dev-python/distributed-1.16[${PYTHON_USEDEP}]
+		  >=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+	   ${RDEPEND}
+	   dev-python/pytest[${PYTHON_USEDEP}]
+	   dev-python/numexpr[${PYTHON_USEDEP}]
+	   sci-libs/scipy[${PYTHON_USEDEP}]
+	)
+"
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/dask/metadata.xml b/dev-python/dask/metadata.xml
new file mode 100644
index 000000000000..f0bc14a57bb9
--- /dev/null
+++ b/dev-python/dask/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Dask is a simple task scheduling system that uses directed acyclic
+    graphs (DAGs) of tasks to break up large computations into many
+    small ones.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">dask</remote-id>
+  </upstream>
+  <use>
+    <flag name="distributed">Add support for distributed computing with <pkg>dev-python/distributed</pkg></flag>
+  </use>  
+</pkgmetadata>
diff --git a/dev-python/datashape/Manifest b/dev-python/datashape/Manifest
new file mode 100644
index 000000000000..083e83347086
--- /dev/null
+++ b/dev-python/datashape/Manifest
@@ -0,0 +1,5 @@
+DIST datashape-0.5.4.tar.gz 99343 SHA256 c266c5803dde48b9fa8d8ee51b5b5979ef77443060e32db2d225b72648c638a5 SHA512 3640c3871e6a00ad5c9961586821c0aab94ed10e82f5c2d361707c66853025aec70793f74f057c30a7bbc58d4645791b33df2916732e703586fd6bb84e91bdfa WHIRLPOOL b3ceec74c95329dbe9ac041344babeaa2b7f4df82de18797fffad590a57b00088e833cf79adf031effc7350e1772b5cd4210fc1a121eebe4749b8bfee6886117
+EBUILD datashape-0.5.4.ebuild 1164 SHA256 bb3da2d67f8fd511388ae7bdd4ba4afc1d725099520775ef742bcd3e88934723 SHA512 d18b18b3f2cc44f18442ee2487f8c0987b7596e901350ecd59db9669145a5befd22e6564ab946ce89d84a1e2ad5d4d9bf1eb90c278b8a30d9b5e42bbd42b8adb WHIRLPOOL 7a6b1ff43f767b029b24b673cf808078c2cc18960367baccb0b68654197f55e700206e90443e34c4581a2597f4bf8817e3a7542ccdd2aa0ed566a3fc59d3ef38
+MISC ChangeLog 3681 SHA256 e9f140c22690e09125f0b53fd8848fc27eb4529db51984cd468d6bf2b71d579f SHA512 7a68a75cf552f623f51f52e61db11d96723705fa4b22a59db1a461471258d14f7832f5f672ced7ec2a07b5c9faaca15f1a07cbd8ce950df98d490ebcd2b658b4 WHIRLPOOL e4eaa64ac6e7c717e30538bd36e7e7beeda82652aa6579a80307f59a5eda6f57fc7216d812a37e70dfc2c31058f2125404672d4698cc6bb20566fd0520788ac5
+MISC ChangeLog-2015 2631 SHA256 c921adb0444104d0bafc09165f6cb603b2c69d637aa0cad777a9ed29dab2f060 SHA512 9cfdc6bc740a5fbebb4f8f6857c01a284f8b169009376669d087961ec75b610f38885dd428d12783d236a0a0239b8bb5f051a1c989cd4ef576e32f96fc05cede WHIRLPOOL 7f5b484b1c81410616b5be0ccac5f6b7339c9450f26a85ca5c7e72d5b07bde9c26fa25d7c055824d40ed1fb732e9b122db5e7f590d98dfb194f250a02e4b6c9a
+MISC metadata.xml 510 SHA256 9312c7299a7ab757a11d67a5d71292888773e03d5ac80fa07263454ba82cc06d SHA512 7216551730e65c069c1315ccaaad65434106876e4a33304b9f7214610fdda9919a44bfce6e8f4cff680976ff51ca10ab23ee11abf5987e7b25cdaeac8a174bb8 WHIRLPOOL 631ef0b6beba631f980409d2f9d57ffd708bdef25c011e165f38eb95de9a0b8a44633309f06f1fc7985b0d1576fbea597dedd406403a8c5978044a249b0c377a
diff --git a/dev-python/datashape/datashape-0.5.4.ebuild b/dev-python/datashape/datashape-0.5.4.ebuild
new file mode 100644
index 000000000000..0162b78b8102
--- /dev/null
+++ b/dev-python/datashape/datashape-0.5.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Language defining a data description protocol"
+HOMEPAGE="https://github.com/blaze/datashape"
+SRC_URI="https://github.com/blaze/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/numpy-1.7[${PYTHON_USEDEP}]
+	>=dev-python/multipledispatch-0.4.7[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="
+	doc? ( ${RDEPEND} dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/'sphinx.ext.intersphinx', //" -i docs/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/datashape/metadata.xml b/dev-python/datashape/metadata.xml
new file mode 100644
index 000000000000..fa8c7de680ee
--- /dev/null
+++ b/dev-python/datashape/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  DataShape is a language for describing data. It is an extension of
+  the NumPy dtype with an emphasis on cross language support.
+</longdescription>
+  <upstream>
+    <remote-id type="github">blaze/datashape</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
new file mode 100644
index 000000000000..579bbbbaa36e
--- /dev/null
+++ b/dev-python/dbus-python/Manifest
@@ -0,0 +1,7 @@
+DIST dbus-python-1.2.0.tar.gz 602426 SHA256 e12c6c8b2bf3a9302f75166952cbe41d6b38c3441bbc6767dbd498942316c6df SHA512 013b23e08fa1ed43f53a756587fefbc9770f7c51e93510e555acbd77230b7200693419bba9a69680d790bbaf123f4a195afa38b3eee1143da950fee0b5130bce WHIRLPOOL 2b505646c21afd6238f32cda7aaf5f4b770d3c82b0d5c2c254f044729d6e06d3eab89cf816dbd22e96b8d8e1550297521dcb49fc90bb4825fdafd12d5beba5ee
+DIST dbus-python-1.2.4.tar.gz 612112 SHA256 e2f1d6871f74fba23652e51d10873e54f71adab0525833c19bad9e99b1b2f9cc SHA512 efdd9d96a8b56e813c93208d34777f1ca2db96c076d31f13afbcaec3c7770a16a623d5531fe23443130c555240949802503f171f2064d45eee97546d6251304b WHIRLPOOL aa855733df07bf22b5ca9fe24506b6417c202777110dddba4227c6833148fb169f3afeb9c219b366d0f207f7ce65ac17ac23c143bc38242cac3dffaecedb251a
+EBUILD dbus-python-1.2.0-r1.ebuild 2210 SHA256 f5754534b1e302b87f8847d5ea591af6aedc8c9149918f0bb709c1985decaeda SHA512 a7bd731d00b142fdd0dcc90c8c2b3e87ad4766ca4725cf10d2418b13de82e87df1931cb76fa40e1808fe0a8d1be3012e855e126f0b398f5aaa308118a67a9c0a WHIRLPOOL 040ef9217bad17820390e4b2c3542500d21d9b2a6ee015034fa2f59b4cc996a812079061d1c1794667b66397d38063971feb103734012a269d4d3b4504370577
+EBUILD dbus-python-1.2.4.ebuild 2229 SHA256 05e9894c570d761dbd55cd43b1cb268ed810029deddf1289f32182f4a4d31496 SHA512 591ea483d5f3ba0dcd818b04bd2f8a6282e98e84a83e7631f75b38b06249e6b4820d40affb4990940a6d5c968dd94bb155c232fca47e65ceb63545027d467b3f WHIRLPOOL af6cad50acf389ab6c5e1352b0f3f2039a8a1a7b967272b5a424835d61d60db1fcc47080f23e1e9e79163d263b9f8e54e8cd3b2bb92ce867bf2413afa963fa15
+MISC ChangeLog 4584 SHA256 b6cec175ef318974b2981ef0c10f955a75d6c171ca1a538c89c9789ea43566c6 SHA512 b6e16735740b2463afdee0a67433cdc781626fe4a8c116c9c2b4047cbb589d213f20dc493fcd5e1140abc00e10d03dd03a6523878c5760447396117fd4481211 WHIRLPOOL 3209094ec9ba4462ff3f8e6b5a3d501601f17089ee05606cde35e60ce47858ed02312ac7316c39e42355c82fe70f1f3536bcf4988aaab45bb5a527ddb5aba179
+MISC ChangeLog-2015 17324 SHA256 a9207608a1922609867feae91c4477b5470857828c5ab606d6c2540ca2ef19d4 SHA512 e28888841a37df41d247d266e38033ba035445ad86bc4de98e901bc30142b9e2f20527d89cb7a10c99bd907e08f1e27b489968488887eb44b23c505bd38f5591 WHIRLPOOL b606e890039f46664b47d7500639df177591a75e95020491431e6e8bab227afc8c220401b0ed853c87e1d2e9b397415b20345efc3998b9369e84421cfc08ce90
+MISC metadata.xml 337 SHA256 8d9c6ea433a8808637447231b080f614f49c64a7f7ac4d146f84df127a2f2512 SHA512 633761250e946af99fcbcbf813b70fa0b1e03a0d89102faa3f324c418f0e749371aa931d253dc5a6f69369c25acc2d50a0f5e2155bd727766bc70f4bc3933d65 WHIRLPOOL c3990389262e3ea8c68cae26a9fa2f20f5641c55cbffcc51310d27e8a1f1afa74f63930631ca7e257d2a89eb0101f4288ff1410667d9014d841d23ef7986b2f7
diff --git a/dev-python/dbus-python/dbus-python-1.2.0-r1.ebuild b/dev-python/dbus-python/dbus-python-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..4022908f9d8f
--- /dev/null
+++ b/dev-python/dbus-python/dbus-python-1.2.0-r1.ebuild
@@ -0,0 +1,88 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit autotools eutils python-r1
+
+DESCRIPTION="Python bindings for the D-Bus messagebus"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/"
+SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+IUSE="doc examples test"
+# API docs generated with epydoc, which is python2-only
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	doc? ( python_targets_python2_7 )"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.100:=
+	>=sys-apps/dbus-1.6:=
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		dev-python/docutils[python_targets_python2_7?]
+		=dev-python/epydoc-3*[python_targets_python2_7?] )
+	test? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	# Update py-compile, bug 529502.
+	eautoreconf
+	python_copy_sources
+}
+
+src_configure() {
+	configuring() {
+		local PYTHON_CONFIG
+		python_export PYTHON_CONFIG
+
+		# epydoc is python2-only, bug #447642
+		local apidocs=--disable-api-docs
+		[[ ${EPYTHON/.*} = "python2" ]] && apidocs=$(use_enable doc api-docs)
+
+		econf \
+			--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+			--disable-html-docs \
+			${apidocs} \
+			PYTHON_INCLUDES="$(${PYTHON_CONFIG} --includes)" \
+			PYTHON_LIBS="$(${PYTHON_CONFIG} --ldflags)"
+		# configure assumes that ${PYTHON}-config executable exists :/
+	}
+	python_foreach_impl run_in_build_dir configuring
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installing() {
+		default
+		[[ ${EPYTHON/.*} = "python2" ]] && use doc && dohtml -r api/*
+	}
+	python_foreach_impl run_in_build_dir installing
+	prune_libtool_files --modules
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null
+}
diff --git a/dev-python/dbus-python/dbus-python-1.2.4.ebuild b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
new file mode 100644
index 000000000000..317140e3e735
--- /dev/null
+++ b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit autotools eutils python-r1
+
+DESCRIPTION="Python bindings for the D-Bus messagebus"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/"
+SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+IUSE="doc examples test"
+# API docs generated with epydoc, which is python2-only
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	doc? ( python_targets_python2_7 )"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.100:=
+	>=sys-apps/dbus-1.6:=
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		dev-python/docutils[python_targets_python2_7?]
+		=dev-python/epydoc-3*[python_targets_python2_7?] )
+	test? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	default
+	# Update py-compile, bug 529502.
+	eautoreconf
+	python_copy_sources
+}
+
+src_configure() {
+	configuring() {
+		local PYTHON_CONFIG
+		python_export PYTHON_CONFIG
+
+		# epydoc is python2-only, bug #447642
+		local apidocs=--disable-api-docs
+		[[ ${EPYTHON/.*} = "python2" ]] && apidocs=$(use_enable doc api-docs)
+
+		econf \
+			--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+			--disable-html-docs \
+			${apidocs} \
+			PYTHON_INCLUDES="$(${PYTHON_CONFIG} --includes)" \
+			PYTHON_LIBS="$(${PYTHON_CONFIG} --ldflags)"
+		# configure assumes that ${PYTHON}-config executable exists :/
+	}
+	python_foreach_impl run_in_build_dir configuring
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installing() {
+		default
+		[[ ${EPYTHON/.*} = "python2" ]] && use doc && dohtml -r api/*
+	}
+	python_foreach_impl run_in_build_dir installing
+	prune_libtool_files --modules
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null
+}
diff --git a/dev-python/dbus-python/metadata.xml b/dev-python/dbus-python/metadata.xml
new file mode 100644
index 000000000000..5bb287759c58
--- /dev/null
+++ b/dev-python/dbus-python/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>freedesktop-bugs@gentoo.org</email>
+  </maintainer>
+<maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
new file mode 100644
index 000000000000..139d6e51bcc4
--- /dev/null
+++ b/dev-python/dbusmock/Manifest
@@ -0,0 +1,8 @@
+AUX 0.16.7-disable-pyflakes-test.patch 676 SHA256 40152b44aa335bf06dd5571288d955b0756f9a873d190cd7461a61b812c68bc2 SHA512 c3990b256754277d2c0c3c313284f3b41cf39df039cafc6e6b1b99b22d1594fe2851e7f98dc2b93179175981d4fde653dcc85acabdc076dd71994e0277231924 WHIRLPOOL f947a40e3f7931f0aca5b105685e7419c12ffb013b89943a9859d1d075115332c8a93f1a9a622a2d8ae30cda1d386646d0d08dfa662f6d9e726eb1d2704fbc91
+AUX 0.16.9-disable-style-tests.patch 502 SHA256 0cca8f2b3c74bf86cec2584bfd23c4a5df50e893dd976d81639856c597bc0f34 SHA512 1d9f957a74b767db9355380437233167e1c2e6957dd993843ad7eaac3f0cfb9fad739b9238207d60db203bf6daed6f1b5ce9373ef1a4085431845e8f8f9b6147 WHIRLPOOL 771dcca1f55eba0ba6a813de09dbd1af43ebbbabc821ac02ba5079f1668afc9aa91964a3485965febfcbfcb872e4def4fe7a3d58b87b5584bbaa778d4de5192d
+AUX 0.16.9-replace-dbus-launch.patch 2851 SHA256 80c05e59f38c1e64ca8eadf955e828810530f4bc459175e2dc2c731429e98b24 SHA512 43fc52f453b086b59f854677eafda955ddd1e6a448579ac60de7288f6f1c8e8e029f5af12486ef6c14ba01f41fd10785c7bb076dcf4968349811be47c0b56073 WHIRLPOOL c14432074503bcfe4ebdbb40e316082fbfcf2b56a598efb797477316f51fef862e2e3174c6d7f23798e384f4d57f5137e8de5174d8fe5a25224bb4d0e6c98529
+DIST dbusmock-0.16.7.tar.gz 70544 SHA256 2d2ea892fa4633c3ec6ac1e912120ec493047a5c6522849b7d1c95ad755bce75 SHA512 749728b966b1e067a0a8bd61ee64c1c7ff22751ccb48e15096d041e78c6e779d787160ee191e90daa3177b92c0ee45c66af74b2dd4e4bcb570892b431ec13467 WHIRLPOOL 921c47fb0b86a6a3368c3b37c27f30b75edacefb46f1a726e39f35eb7b1ea7d0f78c3a7e04b218016c558578625ff28188bfece7cbc7aa06405effe4ab614f92
+DIST dbusmock-0.16.9.tar.gz 71014 SHA256 892b770a7f6c800fd6c0a9d102ef085a9371cc4eaed95dabbd740913dc08dd9b SHA512 3aa91f6ede054ed3d3a69f68f3886094e881d266a8f09c7d08a34d10b080a77facde8aae01e75232472c2e643574fe897dae2c3588f5ad9ecf4ec4e67f404f54 WHIRLPOOL 192d522a79b365630d0ef2069b5cf1cdae3ddb7896ad9db590ff8e7a180d44ac101ed123c035c272c27cc96cb33bbed1a9e00bf08ab0e248554f3ed374ead1ee
+EBUILD dbusmock-0.16.7.ebuild 1009 SHA256 694161f210f88d97065cafe4119ee96e611fa27b1589e43e01f216a4341fca48 SHA512 2ea59870f377a3c5f0c4cd126ead42275356a576f88e7512ba045dc2258fb37d22bb0df8dd0be0f7d62316e919c31661cde9406a1df56d30b2d43ee8771f90ae WHIRLPOOL e550396b2b4440c9dfa0c444732a46f79a9034e59e48d56e3d8ac522f7ad23489185608f6a3a8b61dfcafff4eb1b0d65a76f0209d3cfe1e8ebd0e3160a829a08
+EBUILD dbusmock-0.16.9.ebuild 1061 SHA256 b81584c0d5fe107868364a4ce3801f8291135400d21c9e6ea12a0f7a4cc421e8 SHA512 d1c9bdebfabd11e0db1f7dbf7f9a477c90b53737f1a147e43916b01e286e3b302c8f0d127b98fc5f90dce5caeaff90cc479b60b891886c735965b88150e91d43 WHIRLPOOL 3b3801d8fc7066f3ad76a0b00bbed2e037ba6189867277aa437ec03107c050f2ca8855dd2021edf8f6e1b23383cd7a3f2080c85e60a2c683f003d5f9acf3dce0
+MISC metadata.xml 253 SHA256 8f92439176f4cd2ba6a060c523c6b29ab210cd9aab7903b6db6eecc6654b1e21 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 WHIRLPOOL d5d853bd8a39a54c45728e16a1aa295e014e0a3a105a01ec6b3c93a4f53d7b7055644708301751b7f5be68543056d3f0bd611d5ce0be442eb5d06f5e032fe154
diff --git a/dev-python/dbusmock/dbusmock-0.16.7.ebuild b/dev-python/dbusmock/dbusmock-0.16.7.ebuild
new file mode 100644
index 000000000000..dbb59680d73a
--- /dev/null
+++ b/dev-python/dbusmock/dbusmock-0.16.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+MY_PN="python-${PN}"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Easily create mock objects on D-Bus for software testing"
+HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64"
+IUSE="test"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-disable-pyflakes-test.patch
+)
+
+python_test() {
+	nosetests --verbose || die "tests fail under ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( NEWS README.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dbusmock/dbusmock-0.16.9.ebuild b/dev-python/dbusmock/dbusmock-0.16.9.ebuild
new file mode 100644
index 000000000000..1ec19dbae4f0
--- /dev/null
+++ b/dev-python/dbusmock/dbusmock-0.16.9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+MY_PN="python-${PN}"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Easily create mock objects on D-Bus for software testing"
+HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/0.16.9-disable-style-tests.patch
+	"${FILESDIR}"/0.16.9-replace-dbus-launch.patch
+)
+
+python_test() {
+	nosetests --verbose || die "tests fail under ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( NEWS README.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dbusmock/files/0.16.7-disable-pyflakes-test.patch b/dev-python/dbusmock/files/0.16.7-disable-pyflakes-test.patch
new file mode 100644
index 000000000000..160003ce5eac
--- /dev/null
+++ b/dev-python/dbusmock/files/0.16.7-disable-pyflakes-test.patch
@@ -0,0 +1,20 @@
+https://github.com/martinpitt/python-dbusmock/issues/28
+
+--- a/tests/test_code.orig
++++ b/tests/test_code.py
+@@ -17,6 +17,7 @@
+ 
+ 
+ class StaticCodeTests(unittest.TestCase):
++    """
+     @unittest.skipIf(subprocess.call(['which', 'pyflakes'],
+                                      stdout=subprocess.PIPE) != 0,
+                      'pyflakes not installed')
+@@ -25,6 +26,7 @@
+                                     universal_newlines=True)
+         (out, err) = pyflakes.communicate()
+         self.assertEqual(pyflakes.returncode, 0, out)
++    """
+ 
+     @unittest.skipIf(subprocess.call(['which', 'pep8'],
+                                      stdout=subprocess.PIPE) != 0,
diff --git a/dev-python/dbusmock/files/0.16.9-disable-style-tests.patch b/dev-python/dbusmock/files/0.16.9-disable-style-tests.patch
new file mode 100644
index 000000000000..cb7febdb4e53
--- /dev/null
+++ b/dev-python/dbusmock/files/0.16.9-disable-style-tests.patch
@@ -0,0 +1,14 @@
+These tests are bound to fail dependending on QA tools updates
+
+https://github.com/martinpitt/python-dbusmock/issues/28
+
+--- a/tests/test_code.py	2017-08-16 09:20:43.848503995 +0200
++++ b/tests/test_code.py	2017-08-16 09:20:54.410177037 +0200
+@@ -21,6 +21,7 @@
+     pycodestyle = None
+ 
+ 
++@unittest.skip('style tests')
+ class StaticCodeTests(unittest.TestCase):
+     @unittest.skipIf(subprocess.call(['which', 'pyflakes'], stdout=subprocess.PIPE) != 0,
+                      'pyflakes not installed')
diff --git a/dev-python/dbusmock/files/0.16.9-replace-dbus-launch.patch b/dev-python/dbusmock/files/0.16.9-replace-dbus-launch.patch
new file mode 100644
index 000000000000..54149ed033aa
--- /dev/null
+++ b/dev-python/dbusmock/files/0.16.9-replace-dbus-launch.patch
@@ -0,0 +1,76 @@
+From 9470c54a2836795974e83e55ea859e4653b20b37 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin@piware.de>
+Date: Mon, 19 Jun 2017 16:31:28 +0200
+Subject: [PATCH] Call dbus-daemon directly instead of dbus-launch
+
+dbus-launch is X11 specific and being deprecated.
+
+Adjust documentation to use dbus-run-session instead.
+
+https://bugs.debian.org/836053
+---
+ NEWS                 |  4 ++++
+ README.rst           |  6 +++---
+ dbusmock/testcase.py | 18 ++++++++++--------
+ 3 files changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index c1250ea..181a4df 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,3 +1,7 @@
++0.17 (UNRELEASED)
++-----------------
++ - Call dbus-daemon directly instead of dbus-launch. (Debian #836053)
++
+ 0.16.9 (2017-06-19)
+ -------------------
+  - NetworkManager template: Fix type of 'State' property in AddActiveConnection()
+diff --git a/README.rst b/README.rst
+index 3dc4552..310e1ac 100644
+--- a/README.rst
++++ b/README.rst
+@@ -118,9 +118,9 @@ Let's walk through:
+ Simple example from shell
+ -------------------------
+ 
+-We use the actual session bus for this example. You can use ``dbus-launch`` to
+-start a private one as well if you want, but that is not part of the actual
+-mocking.
++We use the actual session bus for this example. You can use
++``dbus-run-session`` to start a private one as well if you want, but that is
++not part of the actual mocking.
+ 
+ So let's start a mock at the D-Bus name ``com.example.Foo`` with an initial
+ "main" object on path /, with the main D-Bus interface
+diff --git a/dbusmock/testcase.py b/dbusmock/testcase.py
+index 825c61f..49787e2 100644
+--- a/dbusmock/testcase.py
++++ b/dbusmock/testcase.py
+@@ -97,16 +97,18 @@ def start_dbus(klass, conf=None):
+         Normally you do not need to call this directly. Use start_system_bus()
+         and start_session_bus() instead.
+         '''
+-        argv = ['dbus-launch']
++        argv = ['dbus-daemon', '--fork', '--print-address=1', '--print-pid=1']
+         if conf:
+             argv.append('--config-file=' + conf)
+-        out = subprocess.check_output(argv, universal_newlines=True)
+-        variables = {}
+-        for line in out.splitlines():
+-            (k, v) = line.split('=', 1)
+-            variables[k] = v
+-        return (int(variables['DBUS_SESSION_BUS_PID']),
+-                variables['DBUS_SESSION_BUS_ADDRESS'])
++        else:
++            argv.append('--session')
++        lines = subprocess.check_output(argv, universal_newlines=True).strip().splitlines()
++        assert len(lines) == 2, 'expected exactly 2 lines of output from dbus-daemon'
++        # usually the first line is the address, but be lenient and accept any order
++        try:
++            return (int(lines[1]), lines[0])
++        except ValueError:
++            return (int(lines[0]), lines[1])
+ 
+     @classmethod
+     def stop_dbus(klass, pid):
diff --git a/dev-python/dbusmock/metadata.xml b/dev-python/dbusmock/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/dev-python/dbusmock/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="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/dbutils/Manifest b/dev-python/dbutils/Manifest
new file mode 100644
index 000000000000..0729a56abb47
--- /dev/null
+++ b/dev-python/dbutils/Manifest
@@ -0,0 +1,5 @@
+DIST DBUtils-1.1.tar.gz 109943 SHA256 d62d1abaafdbd9245a53e9c901f4162125d0258ef8a489233dba4689cea0bff7 SHA512 34e2dd85e94bbf13804deb7a40707ed2d83174758af7282702e1614d34924a6ae085bca620da0233bfd8972a00332c022fe764e6e5efa642c3365879cdedf88e WHIRLPOOL d1ae1126c00acef91fbd01b6048adac5f81bec07ca523ef73684fcc0879e5b90e42d74c4e901eb65166cad4767f9d6c97ceca0434b971bd6606e62a2f2d0e818
+EBUILD dbutils-1.1-r1.ebuild 961 SHA256 0a9ef17e6c506fd3fb2c69178e908ef771112307fae185c7b1a1c9fa5341c4d0 SHA512 ffa422bd776a08b2f8e79533efebe647335b0b347b38123584da7ebc2f0c7ee561a787ad143cf11d58819cafb364720840352aaff6ff10da3641e9e54ad5ec38 WHIRLPOOL 810cc2a93589d9399e7233fa9aacbcc84c6c05c6a37b8ad6e0484f2c04305bdb7a4cca1a282e8e6e88f131a4815eab734a4192f64f58f3bad23c67e7edfd9495
+MISC ChangeLog 2968 SHA256 c63e606190427fe7e795c4b065fd2e4ec064d533a13ea76d8daca72f563fb368 SHA512 b8e7859d4b79036a28083c42a28e551aef0177aab8f131ebe9808e6152677e211ae83d0ff25da39f8b31dfe7b2ec8c0dfcb009bcc11b1a667a4e685d56b4c69b WHIRLPOOL b801bf50ef5474351b3e545433bc682c04f81bcf2c50f77cc0c24b42af9f59d72b60a43963b5c9f93ea7628b0cb2429bde75b6d9a2d566b53e53c955f476d8fb
+MISC ChangeLog-2015 1669 SHA256 97ccf66ffca9e32b04b1ca38975986a70ee35d80ab7a93c842daf58438b7f87a SHA512 fda53a8c76ce9065cdffdccb6e3efd1bbb16283bc2db5217f4eb5652eefdf94bbc0c307800cb58cbf6c22c2cb63da36f01192318d5270b279587d11ab3791204 WHIRLPOOL 274110f49233e929bad3ab1106b10193212ff4fad9e577a7b3b76d61af6e04ee0ccc7a440b740db3cc1b1a94842fd291236b0d5837ba470420d58c58b70c1da2
+MISC metadata.xml 692 SHA256 538fa550c3d5ec7e0c25d1b8d5537d274efe5a3ba1e4123851bf5973bf2574bc SHA512 d441db855c228932b5eb74e85a9406e730605f7bd23ee7e0505adccb18839e21caa3c50fc88ff9bf07eb400cfc0a0005704548e4bb46ac155572a8e16a6a378f WHIRLPOOL 44945303413fa3dfa8884e30d6c7fe29ff5c82a2404757f7df32f0bc9b13894e243dab305c4ffc16d122751fe4c781a6677c962c73fb7d4aa5a2445776c9c912
diff --git a/dev-python/dbutils/dbutils-1.1-r1.ebuild b/dev-python/dbutils/dbutils-1.1-r1.ebuild
new file mode 100644
index 000000000000..bfc3136922a9
--- /dev/null
+++ b/dev-python/dbutils/dbutils-1.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="DBUtils"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Database connections for multi-threaded environments"
+HOMEPAGE="http://www.webwareforpython.org/DBUtils https://pypi.python.org/pypi/DBUtils"
+SRC_URI="http://www.webwareforpython.org/downloads/DBUtils/${MY_P}.tar.gz"
+
+LICENSE="OSL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="doc examples"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed -i -e "s/, 'DBUtils.Tests'//" \
+		-e "s/, 'DBUtils.Examples'//" \
+		-e "/package_data=/d" \
+		setup.py || die "sed failed"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -s ${MY_PN}/Tests
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${S}/${MY_PN}"/Docs/. )
+	use examples && local EXAMPLES=( "${MY_PN}"/Examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dbutils/metadata.xml b/dev-python/dbutils/metadata.xml
new file mode 100644
index 000000000000..caa310978e96
--- /dev/null
+++ b/dev-python/dbutils/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>robbat2@gentoo.org</email>
+<name>Robin H. Johnson</name>
+</maintainer>
+<maintainer type="project">
+<email>python@gentoo.org</email>
+<name>Python</name>
+</maintainer>
+<longdescription lang="en">
+DBUtils is a suite of tools providing solid, persistent and pooled connections
+to a database that can be used in all kinds of multi-threaded environments
+like Webware for Python or other web application servers. The suite supports
+DB-API 2 compliant database interfaces and the classic PyGreSQL interface.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
new file mode 100644
index 000000000000..7a5970216991
--- /dev/null
+++ b/dev-python/ddt/Manifest
@@ -0,0 +1,7 @@
+DIST ddt-1.1.0.tar.gz 6155 SHA256 1ab0d77e5ecfae9a2b4244dd8079d8e248a69eae0260238516c260ac5e2bd007 SHA512 86e8ffa8fa3a4d2c550898bd64201c3ea26de7692063e3076f5339d5731b9fdeb2d0aea772ff0702c2c359a291836e6486d97e8faa8874e1ebdb7ac9ac3b0385 WHIRLPOOL 7fd9b02ecee7976e39e5112898316fd1f9c1fb768da60397734070b622a0aac4aa1d348352d16ba96ddacb74bf4b9266933784890f253c398ae3495fd934dccb
+DIST ddt-1.1.1.tar.gz 10021 SHA256 d6dc0fc0ec23c369090456ceaaf8baa43df8171a6906c44e52909edce78c00b0 SHA512 3839ac0448292bde07d676456640cd9466353e8c4481e60cb51e33704c21f92fdf840901430aa7f5276ccf579a7cd70b277fa2ceae03bce183e2422d514897a9 WHIRLPOOL 0c10f49c7238edaf115d481e66ba716fed54aac4aa23bdfbe56da8354d8136a236154d4795c723f13aa46fd57654b7423632338d4d810d9bbe33101a3809df0e
+EBUILD ddt-1.1.0.ebuild 464 SHA256 7d48fc110a59361e6f6459ed1d356434e68daf0c43158e760ef7fdcfb337620d SHA512 38a46566d3aae3133cad85aa2eb0e764dc2a12021fc939a494ec48ec1b62bc9c2873384b88ff09468a30e71433dd786a5ca5afdd06ac7632ff3adc7aea5f0279 WHIRLPOOL a25e5db95e78db64c0f96644b2dde80546c78435809f95ea74a94923df79124ffdc953fd31368d50e4c808d1b94688d75bac3423b29a5eb579c6ce34dbfc627e
+EBUILD ddt-1.1.1.ebuild 625 SHA256 1f08821a7d7e8deeda65fc80776e4bbdaff9c68bf70d48397b44934398ce6253 SHA512 3102b6e00df0cfe4946cf510d8e7402b89383198e3b82903e31b8b1b09669256fb1802cbbf7dceaf1a8e6dbf1c623b330c17ddda71a1cb6a4efbb2b5676b0963 WHIRLPOOL 438d27ba3a0b870e4b47a8edc204cae3d4c4ed51f8992fb25c9bea02f8fdf33bca406a447973cda4f8e334efd4e255812e5e35b798bc3ad4b60b66eb4ded0043
+MISC ChangeLog 3618 SHA256 fdde01376874ec347ba582a8763f3ecc66975803741a6938c5c88e6de09b92cd SHA512 219a6bbcaf2f07dd1ae7891029ba897f8df2a6910216e710366b8c3aa1ee3652908cff1bb9353651ad951162dcb79d3397cedc8f3d2e433b9319dbec9483771c WHIRLPOOL bf36d15786fb669ebdf7975c41d765fa34fb0323de387b350b7113c02419908498fc6845c9615b72d0d6591f717e78d0e303670ce6a1ea11f6db9ee370c9ca28
+MISC ChangeLog-2015 555 SHA256 fe4f9c54c16f33b29c7043ce437fdfa490b356e130c9dbd15f69bb522043880c SHA512 a9b79f025dcd288977981c0a9c04462fe34197cc751c26d163e38b3badcaf4df84cf1c015f1c746e19cc7e4a0e09e70f83f1bf2664c75a94beca9a8af3abf897 WHIRLPOOL 153f8d904bf4a96a10a3df328a5c4709e4f14118ada4e3f4c6a9a8f08710eeb3c60728a5cf0201e379f25a186ccbe37b3a5a0798e095fc2bd7e5fc2ff536b05c
+MISC metadata.xml 731 SHA256 640647dd30b6d22b942c77c5947842b70576fd60f1df6d357f314993765ebe05 SHA512 71dcc2ff9b9b0f152a361e56cff5151c43d16a7517c26982e0af5133fd2ed953f38976ec75fdfa7e2b138e8d8d3d983777392438f2495a188ed9a5fda9ed4538 WHIRLPOOL 883f2789a4bce438f98567ea91dcddbce207642b77fa28a868576cf2bec35d8c32b1868585d69df0503e29e1d79f5f83014c6dd798967d78dcda3f36a11d901d
diff --git a/dev-python/ddt/ddt-1.1.0.ebuild b/dev-python/ddt/ddt-1.1.0.ebuild
new file mode 100644
index 000000000000..8195ce682ad4
--- /dev/null
+++ b/dev-python/ddt/ddt-1.1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to multiply test cases"
+HOMEPAGE="https://pypi.python.org/pypi/ddt https://github.com/txels/ddt"
+SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ddt/ddt-1.1.1.ebuild b/dev-python/ddt/ddt-1.1.1.ebuild
new file mode 100644
index 000000000000..f8e895e7841b
--- /dev/null
+++ b/dev-python/ddt/ddt-1.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to multiply test cases"
+HOMEPAGE="https://pypi.python.org/pypi/ddt https://github.com/txels/ddt"
+SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --with-cov --cover-package=ddt -v || die
+}
diff --git a/dev-python/ddt/metadata.xml b/dev-python/ddt/metadata.xml
new file mode 100644
index 000000000000..18ae3584efaa
--- /dev/null
+++ b/dev-python/ddt/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+Data-Driven/Decorated Tests - long_description='A library to multiply test cases
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">ddt</remote-id>
+    <remote-id type="github">txels/ddt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest
new file mode 100644
index 000000000000..756f0669418a
--- /dev/null
+++ b/dev-python/debtcollector/Manifest
@@ -0,0 +1,8 @@
+DIST debtcollector-1.11.0.tar.gz 26266 SHA256 733afa881c844a40ef4623ab73ce1862e505bc4655635da3a91d8f3482677785 SHA512 9dcbfdaec5d16714d17eca2bfce7049c0a042b2370b1be5a4a0c0057dc28bf060ba570639581ceb5e5c27f2117f9001e4b2bb350899bdab0c0c7cdc3098a9bb2 WHIRLPOOL 3456da61c660b4102c391c38910158fcc3907c41cd7a5ed079bfa8366af42bbff9291c42e5e00a14b495c2443a0d4febd5be1da536901eb184bec9cb0c9142e7
+DIST debtcollector-1.17.0.tar.gz 28122 SHA256 71e3350b6b97acede200f30b3858749b21303a70fde4ded26e4cbe599a3b0466 SHA512 8c35cdc00f9161cf940ff22a4b155e281adf66bb2dd16870a40017b05553387e37d9bd988bb4adcb89c5f75ca63d626a9de949986caa877d4d70d8cbf90daf63 WHIRLPOOL a2c36051735d0c2a9ffbd839518c7b467a7f60f73598e9c26dfa0dc7c86c031b00fdd68759993450c8e61374e5549cc305d34bf5110e015e8c227d50d22449e4
+DIST debtcollector-1.3.0.tar.gz 21853 SHA256 9a65cf09239eab75b961ef609b3176ed2487bedcfa0a465331661824e1c8db8f SHA512 b53ef131599fb04abb9f11e8abe3dc8447a595695bab505be642c03925e0da625e6a10944ec10863526645080ed3ce43b9a5138a1f7ba91511ade6daf42d018a WHIRLPOOL 04c6ee34a48955a86535c3161005417f5c5dfca9152e092c3856d61a4707f6249245398006d0da0c31ffa7103ab69a566bf84d7321b70362d59f359b5225622f
+EBUILD debtcollector-1.11.0.ebuild 1856 SHA256 e6c18c977f0afcbf2a63b06fbf3536588fac92154ad2d07dfe0d45411af09eaa SHA512 df6e094e314ae712d6ccf9a622f6a8141cb1aa972edc6386ce632f64e0ba368cd6477c66d24444fe71ecde640ecaa9f9fa0a79b0543e8d17e99e2c67fc0c6233 WHIRLPOOL fe85d2e5642a2476b54910892f308ca5285d09e89c46870cd749ec6cf7c0e8a24aff9a21992f54d3e706545112893c0c97414f0b6ee5df739bdff17710c98323
+EBUILD debtcollector-1.17.0.ebuild 1948 SHA256 475a980dd170536db36542c2f6274aa3491f1c6dd487eb532af29e02b0853d24 SHA512 a3db1ed22534066d748c58497b458bc9100198a1db5909b272a86d5b463b0e73393195c3f0ccdaacc53f7ac421c93b0bc0ea50c4e2840c3e0243d5b3e360d9a0 WHIRLPOOL 3d8537accac0f8c29a13687b02d32e9061ef2e990556ec8f7e40f09c392415e0912a9ba5d96f90cdbaaeb27f8e2d2c0014ae759cc24fc2f1af920ce6810130e8
+EBUILD debtcollector-1.3.0.ebuild 1856 SHA256 463e2ad82ee085a2c5e802c038447d90cae7035d72db4f6ee49f2820a5d2443c SHA512 82101ceac61a1b4a6fe7baead86a994666be9c7285e3b43675682b6b021d673735aaac4a66644e9dc2a37c64e38622cbaff996dad2a707610c908a64286ac04a WHIRLPOOL 02e6d69981507ce941d88c1907f7115bb9b2e15aac496f9b89b89b01d25d7139326eea757fad912fd9eaedc984bb99294ece7a19c0ed04921f89f5e3f5aa8deb
+MISC ChangeLog 2232 SHA256 76cbdc547a0ecd1be7908b5729937a7c1bca3d438697ab0fb49599d77a1afa18 SHA512 4b02555727a027f55657d53958c2648b954a9c423ffe83240e0803b3e74851a27b17728d6dcc5b720d1c6401165336806eec08dd67962280a53fa9e6a04230c3 WHIRLPOOL c845c356157a681e9db6a2d08c74f16b6152886b634fb573ccff4d75412a01cdab6a94c7c1c105dca83a5056494152d3e82123317dab0d76fc5521747fe48ccb
+MISC metadata.xml 330 SHA256 9b562bbb206531a7ac136e1cc6f8cb1a749fefca019ade8a0a73ba5f1e97a43e SHA512 b7a055d8cce134695b3443f4c361636ec4b6741080671b65b47cb7823384370caefb825ab3851cd8cb4852a696d2ded714087917cb565e381aac7ce53e537268 WHIRLPOOL 0431687192f657c68e32855868882d95667905e3f59fe1824e761d866a72a34681687f2860cbb458e3536742edf70f35298faeae406d413af3f01cac56b229ec
diff --git a/dev-python/debtcollector/debtcollector-1.11.0.ebuild b/dev-python/debtcollector/debtcollector-1.11.0.ebuild
new file mode 100644
index 000000000000..5eb92d9dd8a3
--- /dev/null
+++ b/dev-python/debtcollector/debtcollector-1.11.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python deprecation patterns and strategies that collect technical debt"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		dev-python/doc8[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || di
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/debtcollector/debtcollector-1.17.0.ebuild b/dev-python/debtcollector/debtcollector-1.17.0.ebuild
new file mode 100644
index 000000000000..97960ad6ff06
--- /dev/null
+++ b/dev-python/debtcollector/debtcollector-1.17.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python deprecation patterns and strategies that collect technical debt"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		dev-python/doc8[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || di
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/debtcollector/debtcollector-1.3.0.ebuild b/dev-python/debtcollector/debtcollector-1.3.0.ebuild
new file mode 100644
index 000000000000..b9d019759a59
--- /dev/null
+++ b/dev-python/debtcollector/debtcollector-1.3.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python deprecation patterns and strategies that collect technical debt"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		dev-python/doc8[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || di
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/debtcollector/metadata.xml b/dev-python/debtcollector/metadata.xml
new file mode 100644
index 000000000000..ba8168cba2de
--- /dev/null
+++ b/dev-python/debtcollector/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">debtcollector</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
new file mode 100644
index 000000000000..aa70b8a3ee68
--- /dev/null
+++ b/dev-python/decorator/Manifest
@@ -0,0 +1,11 @@
+DIST decorator-4.0.10.tar.gz 68560 SHA256 9c6e98edcb33499881b86ede07d9968c81ab7c769e28e9af24075f0a5379f070 SHA512 612c2eafe16536c9b5eda07ea44999d868decbc38beb4207ab3f82325bafd346c431f9c9028f63bbf24573300a81dfb9446a51dee50bb34dc8b478088a541f73 WHIRLPOOL 8d4b4496c8066d352692e88ba86053ced436a595d4a7d8dbade6b81c8e4d7da294a26270a9723e35c511b1d213b71409c3d01af59979a5d10ead044cd67ecda8
+DIST decorator-4.0.11.tar.gz 70616 SHA256 953d6bf082b100f43229cf547f4f97f97e970f5ad645ee7601d55ff87afdfe76 SHA512 acce545d26c05ad03e4a3889214c3e94d1d47a9ccba42318ff8acb4d9384e676839fdcdb8d501a808f9332f532e4087a60398c273a58e07dfbc02f04f04af69c WHIRLPOOL 11594eef9ab15e2b1d3c42b812fc5f411524cab57b831e5c6f3f1651f8c1d5d3ed2748753965edf89af65ee0c9cb0a4478227677c73ab7834926f380aea175f8
+DIST decorator-4.0.2.tar.gz 64850 SHA256 1a089279d5de2471c47624d4463f2e5b3fc6a2cf65045c39bf714fc461a25206 SHA512 9f135c9c624557a90619e46002f12d54f8c53045420f524bbc52dee0b488268501467b207ea8f4445a8aa7d119af3e615cd76cbc25c1d1335d3bb581a1045ab3 WHIRLPOOL 1a4a31fe67d4cdfc58cb5486f83ee059a9211af5c5e48d57c9b22a24e08e5659a2e8b4519ecaba68fa603ef6e5a0756f69ee10fbe173d07ffe23204b579f2f18
+DIST decorator-4.1.2.tar.gz 32325 SHA256 7cb64d38cb8002971710c8899fbdfb859a23a364b7c99dab19d1f719c2ba16b5 SHA512 4a4b9dc39de9b3f00eae9b6829136f5d836355d3d719371440f69c33fdddf73636e9faaa8fc35829c64d5c5a61d968ea427267da944c524c22ad08b69fb6f0ff WHIRLPOOL 59ebb75e4d1eef0c9eadcc6135834311e284c0c97b05dea0c6b4c70cfedcd76d1206e89dff28591ae80f87b5cb650d5e4e2401054da47ddff433b9cbfe737b96
+EBUILD decorator-4.0.10.ebuild 810 SHA256 d6219f35b9328351efe1929303c5689e6557fbb2daea0311bdfeb129cac2e920 SHA512 c146e7fd6a27a049e749151f957e73ba20cb0d35373fa206f77d82fc9329a39578e1f8900c1d5d24f01ce2d7cb64ced0f174398d30fcd9c47bf0fdb84c20b2ee WHIRLPOOL 3a1dc88e9cb76e2db727aca5954205fc513eb29043f19efc3e153a7ba94ead79383487547622c643f7177b819679a170854c792d5715854e025d06142d0c9093
+EBUILD decorator-4.0.11.ebuild 825 SHA256 3aca6e07063d4a7afac902a6adab57fe1524a13db0ea5f3368b646c0490ade02 SHA512 ee2ff15f8f5dc1bb00625a0b9847f9c04e4bcd35a3ca18454c909ab785c910e0cc10a7b7855c35ed4f70b209fb42d31ff5c943a782d9f713e2c4bf985f3d41eb WHIRLPOOL 225e194912076d9f69a994555a221acfb0ebfc2e5ce0c8879dc227967f403a83e32a9a8c3796c45bf819f8e35fd53c4baa2a2c73334ce180c86b8a08374cc264
+EBUILD decorator-4.0.2.ebuild 794 SHA256 82391f86071d613abe34b3b370c10ecf19cd85801e55186819c2420a8bb4b189 SHA512 90091d12081d46d90a9d59128b84405c54f92b2236410ec0386bb514c4162c442ab0369ebd16fb56aefe40ec872ba7cb005c704ff8695d5ef6738844c8d8c2ba WHIRLPOOL 53f3035e5e10d6601c75eca93850c29f54c4ffae9569a7da06fcaf554e2c55159d40d0826b8541732db047f728ea90b1bf006e1323c55126f9ca7f146c2d61ab
+EBUILD decorator-4.1.2.ebuild 779 SHA256 fe8a96337b56e2cbf17508080e65a885d54a6649b8fbf687e19f08c009bf6e61 SHA512 3d7c25b08f05a10c23b8301e89008ec40f1855b569e083bcf110934927a4273ec27e9f888df186494131883a92429315e7ba2dfc24eb2340c72453b060f5f512 WHIRLPOOL 8aefe176e9448a6aec369c9331d5ff7a5aa1923f27046e7b93d9a870ff179cb5b334c202f967eaadc065d9d8e0472213dc44a52fc6ae9713aec616fde1340eaa
+MISC ChangeLog 6142 SHA256 e60405146c3272a05ed97e15bf8aad148bf4d3b9c2b487095b87caa43e391809 SHA512 394b50613de8276a9804304bb3ce3f24c708c1d3c813bdde4cf3732cf307ebbea5da4dd1989759c33dfb6cad04dcdae74339e2253e5fd2cdaacc4467f6626d3f WHIRLPOOL e4bb8d976c4f415799631c86c0f1b4d421e8220519f0e75dcb5462b403a665155799e710da7cf92a60705b9db19fb70cc043abaf93399a3c79a2fea2814d5f52
+MISC ChangeLog-2015 10231 SHA256 d98ab8d8ac5fc8eaa4fa5e994242fc1c23b3fdda15a7cb19647ba4b6aac0a6d7 SHA512 c5839427fcabd8fd722774ba34b0d0299b2a43d334874c3903a90f19c707e4d7f23347599645aaee8381ebc11f3c97a65e2b8dac0503f68c0fbdc8f48db6b33a WHIRLPOOL 90ffdf9b663b10b067e1459bb547413ecc0372c51ea901bf39872dbce3c4b69ef5ea616082c8b0400e74f31a9b2d31bcd07e1f4b25e21a7c8c9541983b6122c6
+MISC metadata.xml 665 SHA256 4e79dd71b92c4d524892837ca46e2e11f60f766c156346529f4f79f0b7fb8b13 SHA512 c368940486c27fe99f5ec094929db337680227ec74dcdc6a45a173d3163a1e0cee9d6830bb2ac531c17b48cb2f32f3dd7238d666748f856b01e3ed4af77d0aac WHIRLPOOL 9f3c8f988ec69228b0ccb2fa21ebd6f6a9737feb6747e11105fa8c66951ff488fbd565790d21f02d7486f231c8c2b8f5285bbeb4c65cec02c6070264357c05b1
diff --git a/dev-python/decorator/decorator-4.0.10.ebuild b/dev-python/decorator/decorator-4.0.10.ebuild
new file mode 100644
index 000000000000..9e4800ec9dc2
--- /dev/null
+++ b/dev-python/decorator/decorator-4.0.10.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simplifies the usage of decorators for the average programmer"
+HOMEPAGE="https://pypi.python.org/pypi/decorator https://github.com/micheles/decorator"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( docs/README.rst )
+
+python_test() {
+	"${PYTHON}" src/tests/test.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && dodoc documentation.pdf
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/decorator/decorator-4.0.11.ebuild b/dev-python/decorator/decorator-4.0.11.ebuild
new file mode 100644
index 000000000000..4fd7970cccc4
--- /dev/null
+++ b/dev-python/decorator/decorator-4.0.11.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simplifies the usage of decorators for the average programmer"
+HOMEPAGE="https://pypi.python.org/pypi/decorator https://github.com/micheles/decorator"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( docs/README.rst )
+
+python_test() {
+	"${PYTHON}" src/tests/test.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && dodoc documentation.pdf
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/decorator/decorator-4.0.2.ebuild b/dev-python/decorator/decorator-4.0.2.ebuild
new file mode 100644
index 000000000000..f438984520f9
--- /dev/null
+++ b/dev-python/decorator/decorator-4.0.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simplifies the usage of decorators for the average programmer"
+HOMEPAGE="https://pypi.python.org/pypi/decorator https://code.google.com/p/micheles/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( docs/README.rst )
+
+python_test() {
+	"${PYTHON}" src/tests/test.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && dodoc documentation.pdf
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/decorator/decorator-4.1.2.ebuild b/dev-python/decorator/decorator-4.1.2.ebuild
new file mode 100644
index 000000000000..5de0b38ebb3c
--- /dev/null
+++ b/dev-python/decorator/decorator-4.1.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simplifies the usage of decorators for the average programmer"
+HOMEPAGE="https://github.com/micheles/decorator https://pypi.python.org/pypi/decorator"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( docs/README.rst )
+
+python_test() {
+	"${PYTHON}" src/tests/test.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/decorator/metadata.xml b/dev-python/decorator/metadata.xml
new file mode 100644
index 000000000000..89e2810d4dc3
--- /dev/null
+++ b/dev-python/decorator/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		The aim of the decorator python module is to simplify the usage of
+		decorators for  the average programmer and to popularize decorators
+		usage giving examples of useful decorators, such as memoize, tracing,
+		redirecting_stdout, locked, etc.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">decorator</remote-id>
+		<remote-id type="github">micheles/decorator</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/decoratortools/Manifest b/dev-python/decoratortools/Manifest
new file mode 100644
index 000000000000..cb5fb596cbe5
--- /dev/null
+++ b/dev-python/decoratortools/Manifest
@@ -0,0 +1,5 @@
+DIST DecoratorTools-1.8.zip 29566 SHA256 da73f03a9fab80a205c8febcecee83f8a989eab8ce81affd7989210e4a3d9ea8 SHA512 b107b61d76c1c41ebe4f663d42fff3ecf184364fa46c234a8ad9df0d626bdd113c7527c6e1d97fc2d38c0fc76ff43dbe0190fc1297240c44d9ba490b11f6fa51 WHIRLPOOL efc61d822b3c8862fa2a927284e01b7c7e5d739afc576bc2bcca03f504b65d33119ba525de25f42d951291fc55279061998c8b9bca876185afdd88a2bbff42fb
+EBUILD decoratortools-1.8-r1.ebuild 825 SHA256 9163da329d38a3e49cbc08787dc2f2bb6462913fba02398596efe86f6a28f852 SHA512 909ca1cd22eca1bf12fa6c9215fb85e6f197ebd7d13bb5f9fd237e57fa264b36027f4658d0fec2d37dc1d682eca780e0ca1f52b8034f80d32a010ade4e0bd3c0 WHIRLPOOL ec41129000e7375dd6c52179ab1a69e5034431015151b94f16dc310d7afd58d555eff2da7b353123e7a471f88b3649733b3d92428d0d17e4e970ff2d068cc6fe
+MISC ChangeLog 2790 SHA256 75537e2b883bfe42c55ae03c182016cf1725e8bc7c15287abd0263f58b5f4c3e SHA512 00d49d96cb3dae6ed9222b9ce9848d4ac8233dcf4cf529f5dc3842ac3107e315fc854379f6e998c83d5ab6b4b3460be938ba978b79bc366d23284bae3d54da9c WHIRLPOOL 022239455355d114ec9b6646a168c69a86b71038306b2fe66f057abf3e97efd9d6ab8943bfa275eef336f7476b72572ddfe2d960c2b53850d6141303de662519
+MISC ChangeLog-2015 3619 SHA256 409d5b35dacbe0a461cdc2ea0e367693023671e3fdfbe6824b45676a1a7520fc SHA512 c239d7f6297c5fff90f0c643f9216b0d8cd78c969493746ba7467f37268c9b9bae5f611e06063e340a0af05ac4c41b9140495f8538ce9601724e04bfd83213b1 WHIRLPOOL d08246e37615b192bf625315f8326fe4f7ce9652876a4c0ebef7242fc96bb009cd6e8494874e95438e3ee4496a7b7be4c6affa536a4507e502b416a69e4227cd
+MISC metadata.xml 466 SHA256 2ac57758cd222c388f62c0ab19d0735be9eff76a924f5c80ba6a66f5f24233ce SHA512 23576433c2f58bd0f01a2946c4a619140b4903528145ae767c66bcf387e2203dcffd534bd56650d80ade21fd6b213e5261cafaf6036ad4a0845f183db0eebff8 WHIRLPOOL aedbbf9e79b7e7455261f00d5287caa567209367baad9c4836619bc36af954c709f9090a7b81f099a3cd39ea9935a3fcb0acb35f77bd9eab94150d6e6a81ba2e
diff --git a/dev-python/decoratortools/decoratortools-1.8-r1.ebuild b/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
new file mode 100644
index 000000000000..f869b727359e
--- /dev/null
+++ b/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_PN="DecoratorTools"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Class, function, and metaclass decorators"
+HOMEPAGE="https://pypi.python.org/pypi/DecoratorTools"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="|| ( PSF-2 ZPL )"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests broken with named tuples.
+	sed -e "s/additional_tests/_&/" -i test_decorators.py || die "sed failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/decoratortools/metadata.xml b/dev-python/decoratortools/metadata.xml
new file mode 100644
index 000000000000..2d2780528722
--- /dev/null
+++ b/dev-python/decoratortools/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">Use class and function decorators - even in Python 2.3 - now with source debugging for generated code.</longdescription>
+	<upstream>
+		<remote-id type="pypi">DecoratorTools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/deform/Manifest b/dev-python/deform/Manifest
new file mode 100644
index 000000000000..02cf9bc540f6
--- /dev/null
+++ b/dev-python/deform/Manifest
@@ -0,0 +1,5 @@
+DIST deform-0.9.9.tar.gz 1336829 SHA256 a0ddbeba3ed5f4b061a2c83423e00a421003600868d71021816897dfa1d4b77a SHA512 f0f615415696adba8add8f37c7ab8b8d213ec6d1eb68e2322961cef46df9e381b2368515b524d71eed110a33aa8a7f0aee8302e39b4d6a8871a0eb78108aca11 WHIRLPOOL fa3a2462ae3f9d5ec81305c15efb2ceca0335dde12f3ef801933caf306dcfd3c95d989f2c61e940a757b9a029e5a090fa05435b24b5d18b3665bdbfc6975c602
+EBUILD deform-0.9.9.ebuild 1296 SHA256 7da76822991fc1f07a177381b405d41f9739dedca091a1cf73bf61b5c2c14cf2 SHA512 2f174fee8e42a08499d27c36b7ed508c967c53f14b9cbba1e9c356df42122fd7ce2f84e69dd2b9badadadec13d2c2c9d0909d26673255523f1f15b5458c6cf6f WHIRLPOOL acf4deabff21e708f9e9dabfce2e372c83c3daa047431d859d672ef7dcea321e69c80bc3b15b669b2a8a20c8e8430afe808d4487336357d878153ac016b65a65
+MISC ChangeLog 2791 SHA256 dc9009a573b1efcd3bc233ddf617f37c605678dd14d63e75237a906d01147d00 SHA512 87b61abdbf083937dc186219dc6f5f6301c3839111e17aeec9ae995734fe30555b0fafdd8dfc7f60906356a1b0f478f2102fdf89a61b5c34f183a0d13e794218 WHIRLPOOL e401c34711bf42f7aeeb6ad5f1add9a84463d4170d646dce70bb380a3e89443c9319373ec83e8088bf5413836c3b61c7ccbdc154b573269a6133fbf7f3de63a2
+MISC ChangeLog-2015 2541 SHA256 4547adfa5af5aef2d5f1ae0bd0adec5a427412514debdbe72c6fa24d7d5ab4c2 SHA512 4002d3b4dc31837ff972290c6b6a78f232967f149548c9e5adb9f5daf2e7ac5062be4190c0a9c2b57205477477d7c5910cae6e59246af4febfc8ac87762b6c1d WHIRLPOOL ebc6b985ce6155db07f0206764023ebdb5c9ca934905bfad9a04ee905fd3660483454f3fdca2e6da8a8cb881f0436711f11f6868d8bdab0583fc200f8e5fab63
+MISC metadata.xml 374 SHA256 5753e651a36655d48557fd0883575dec66821e646d25521437a74c6a0068c1db SHA512 0a4ba9e4f6072f1fb583028f4c4ae34598d9663c380c0ddac4fa7c497cf5d3b44ed8c761777c4f5467ff2c1baa393699f2bd36d15a3cf9cce9a35c2ef00734bf WHIRLPOOL fc9b24d06f83e3e7f9e9170dfffacdc702a63972e207a9c06f72abe2a93bd4e56efd9df4b5513a3e44c7cde8cb4439b7cc028522d89ef472994720b5266c6760
diff --git a/dev-python/deform/deform-0.9.9.ebuild b/dev-python/deform/deform-0.9.9.ebuild
new file mode 100644
index 000000000000..98d8c81fdab6
--- /dev/null
+++ b/dev-python/deform/deform-0.9.9.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+inherit distutils-r1
+
+DESCRIPTION="Another form generation library"
+HOMEPAGE="http://docs.pylonsproject.org/projects/deform/en/latest/ https://pypi.python.org/pypi/deform https://github.com/Pylons/deform"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+# tests require zope.deprecation
+RESTRICT="test"
+
+RDEPEND=">=dev-python/translationstring-1.1[${PYTHON_USEDEP}]
+	>=dev-python/colander-1.0_alpha1[${PYTHON_USEDEP}]
+	>=dev-python/peppercorn-0.4[${PYTHON_USEDEP}]
+	>=dev-python/chameleon-1.2.3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/beautifulsoup:4[${PYTHON_USEDEP}] )"
+
+# Include COPYRIGHT.txt because the license seems to require it.
+DOCS=( CHANGES.txt COPYRIGHT.txt README.txt )
+
+src_install() {
+	distutils-r1_src_install
+
+	# Install only the .rst source, as sphinx processing requires
+	# a theme only available from git that contains hardcoded
+	# references to files on https://static.pylonsproject.org/ (so
+	# the docs would not actually work offline). Install the
+	# source, which is somewhat readable.
+	docinto docs
+	dodoc docs/*.rst || die
+}
diff --git a/dev-python/deform/metadata.xml b/dev-python/deform/metadata.xml
new file mode 100644
index 000000000000..50bfc6978916
--- /dev/null
+++ b/dev-python/deform/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">deform</remote-id>
+    <remote-id type="github">Pylons/deform</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest
new file mode 100644
index 000000000000..d6c04c9d332e
--- /dev/null
+++ b/dev-python/defusedxml/Manifest
@@ -0,0 +1,7 @@
+DIST defusedxml-0.4.1.tar.gz 48889 SHA256 cd551d5a518b745407635bb85116eb813818ecaf182e773c35b36239fc3f2478 SHA512 78a7a1f3d1eed9d7cda00afaaccf8153c7f616303c53d3918341d75970d532932b04effcfc8b1b8ed88ba6d730cb56400e9e4ecee8aa7d2181c7577f1d535783 WHIRLPOOL 9f3f51af296e3fd16b2cd94029481fbabb687c986f39810dcba331c9d3e5e30e0b294f9f1f5ce031ea28053f33be1a13e89d65ef7d0c6a3333e81dc764868d7e
+DIST defusedxml-0.5.0.tar.gz 60405 SHA256 24d7f2f94f7f3cb6061acb215685e5125fbcdc40a857eff9de22518820b0a4f4 SHA512 71e1a604df9be41ded454bcdfa63610e897eb405295d7365fcddfc5f50f7572c36f0bd91a4a1fdf47d1b097637bd9fdcf08f1cdb73e2fe64eea0320a7532e452 WHIRLPOOL c215dd919fba36de5e12443d556fb9a9c805d4d9aa3ddc75215c47c1b80861cef4bb564f25f67dbdc91927e5928a27c5585b8635a8bbd7d04c721b4db9b96410
+EBUILD defusedxml-0.4.1-r1.ebuild 634 SHA256 25287c5e17f39ea53b26dc0b7676ab0fd4ac60810e3ca5e892a68e52623e8281 SHA512 c9fe185beac58bccab22be9c73c8a3afc5dfb74572092e89b6947faa16eff6780e304ad83cf885eac9dd4c5f1c31b14112b55590b608d5e1c0a7caf789cbf892 WHIRLPOOL a423abe547702163896bbda64eed7e2e959cac3f76e4dff925ddc326071edfe98c5bba4caa3731465bf550a2dafb4a77d13b68b613bc9cd570cf4d642e918b25
+EBUILD defusedxml-0.5.0.ebuild 708 SHA256 93d0b6d3e88a7bcde8387663298b67ccfbc42844c789b4642de19eef9c4d1f98 SHA512 50b052c88289580f4d2f43a4a987caf970bedd73a3050698d6b00ed1ace6530cbedfea0d32f82a4b6e7752842d4cab265f342c7aa4bbc75cc6912b69b7d550bc WHIRLPOOL 6cf5be03707356c5f805d01f4c753f42d40a40e60261508620ead8cb5364a0ca89a6e2f15f31e251b6c55faf4d270fec8b743484cfe54a0c966000fb5196218f
+MISC ChangeLog 3114 SHA256 a9eb2120a16394c11ac73765388e0bf30158141c61b85e94c8cdbb8f53dced9a SHA512 5b950a5abc783075d095a264bad74b44570b216392f1852e0651c9833e93581d64f13da5394d7cfe9267cc143232212c8c6779c04eedab1cb5e1ca127086bef2 WHIRLPOOL 25859307708f0f13ecebd0db1107246086e8102610dc268dbc76f239859e76e7a0a0d0ea4cc7905559097a86ceaa0410fbc58a1c2c3d4ee006c438a80a5fb9b2
+MISC ChangeLog-2015 2206 SHA256 2e77249b77fca0fa9f5d8d9f3d0dd72068d8b05ee2317783b7d69d1b454fc21f SHA512 c51295bb5406c96f4be2cd7fa022cde0f69042f4563b00b1fb9e73105f194319619337614819902f8d4aaa0b9f2ca115f3f0f2f6c1d68bc6b8671840521029b0 WHIRLPOOL 7d7849d4beafa461982b784ce6a32cdb0de7d5507ebfa8306aa90adf59c4399c971ff5e80064093d3e581676f86d6a9e38885243d60c7430f91d6b6b86c178af
+MISC metadata.xml 384 SHA256 a057d32d7ab241147b0e740ebdf0229e69cdf257742752ed8feaa8010697d2f7 SHA512 377bdeac0f80c45f6f6f3387182e75c47e8cd526f563a1ce5305119113b4a1c4a99dc3a76bc91d81a967498645c9a23dc2746b62023dd0dc26e8d55d15424b6c WHIRLPOOL 28823740fa350c180142810d1489d76d801abb5c633f3a7d8ecedf0930480baad0350613f73bfc8fbd8029c0656796cb774d28bd4ee4a6716a07c8cc958815c3
diff --git a/dev-python/defusedxml/defusedxml-0.4.1-r1.ebuild b/dev-python/defusedxml/defusedxml-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..00117a49d053
--- /dev/null
+++ b/dev-python/defusedxml/defusedxml-0.4.1-r1.ebuild
@@ -0,0 +1,27 @@
+# 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} pypy )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
+HOMEPAGE="https://bitbucket.org/tiran/defusedxml"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="examples"
+
+LICENSE="PSF-2"
+SLOT="0"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( other/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/defusedxml/defusedxml-0.5.0.ebuild b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
new file mode 100644
index 000000000000..ae0c36e37a15
--- /dev/null
+++ b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
+HOMEPAGE="https://bitbucket.org/tiran/defusedxml"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="examples"
+
+LICENSE="PSF-2"
+SLOT="0"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( other/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/defusedxml/metadata.xml b/dev-python/defusedxml/metadata.xml
new file mode 100644
index 000000000000..3d589eb07db0
--- /dev/null
+++ b/dev-python/defusedxml/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">defusedxml</remote-id>
+    <remote-id type="bitbucket">tiran/defusedxml</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/demjson/Manifest b/dev-python/demjson/Manifest
new file mode 100644
index 000000000000..7832ffd6fe78
--- /dev/null
+++ b/dev-python/demjson/Manifest
@@ -0,0 +1,5 @@
+DIST demjson-2.2.4.tar.gz 131457 SHA256 31de2038a0fdd9c4c11f8bf3b13fe77bc2a128307f965c8d5fb4dc6d6f6beb79 SHA512 d8a1cde062d0b062bdae29b6d79ad69fb9cc185428718a0009ccbed544ed37bd354fbb86edadb56bd98183ac8636b2edae322ed19aa5f07a7b6df668c7aa0029 WHIRLPOOL 70e826739bc2ae7ca040e54fe651f021a1c7f08357d985a560a8560f5da694da0068d32e7a972525ba215a6fcda93abdebdf4d99c8e3f156a9f17600aa283973
+EBUILD demjson-2.2.4.ebuild 872 SHA256 dcfa1a9eb60fc5016c3175d2d75605503592c609570cdf0bd6033bc4030e404a SHA512 9c4addc117da10fc44564138fd52286c8982ebec53c373c04aaaf57fff2a5c4b710aa5cac13b9882f0bea9da1ca5e3741c6f4927bd23de81546b79d573a51d9e WHIRLPOOL c8f563d7fdc065970d813fc1ad19dcf99ea47bbd7faeb35948bd8fe2ea88607b31c1a4d57b098dbb6da753b8d3622474fec189d6de01903b65ab6c863100dc11
+MISC ChangeLog 3275 SHA256 f691edbd7def6a2c7a27089332e43906106638ae9d2f614cb0ed1b5ad200d505 SHA512 f69aa59c336d6cfd087eda07a3d09c119b1edd42c4b499391a956cd7fcf86d45324453cb8234cb9452d5fe752b645731e319599a4d78283ebe864522a1d32efa WHIRLPOOL e5d153d20c6ace8c613f27af0fb5e6b4934e3ef912d6f2fc7b066a58da82884d0c59d0e1c280396c8da09052182e0fbbc0cb36bce958c48fedf2c50fa614c893
+MISC ChangeLog-2015 2777 SHA256 ca93b9dd0d1ee7626f2618d39af1bb116928a1d17f7328b15e3ff50a8ae43985 SHA512 727963421be6387d8a799dea72ffadb74d27ce48ec36736aa7343f7038625dd099158aa748fb4eca4ec5ae6e74c628a8000b162eb5fe5284c8ad62459f83dd31 WHIRLPOOL c8e4c40d16d8088d477c5b14919152dc0263bad91d732f29fc698ff99d4f8f9510453d58c0619b6c0f2f125423381704114862b5ee8a9f386a2e616d476c82ef
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/demjson/demjson-2.2.4.ebuild b/dev-python/demjson/demjson-2.2.4.ebuild
new file mode 100644
index 000000000000..d76340b54032
--- /dev/null
+++ b/dev-python/demjson/demjson-2.2.4.ebuild
@@ -0,0 +1,35 @@
+# 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} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="encoder, decoder, and lint/validator for JSON (JavaScript Object Notation) compliant with RFC 4627"
+HOMEPAGE="http://deron.meranda.us/python/demjson/ https://pypi.python.org/pypi/demjson"
+SRC_URI="http://deron.meranda.us/python/${PN}/dist/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	cd test
+	if python_is_python3; then
+		2to3 -w --no-diffs test_demjson.py
+	fi
+	"${PYTHON}" test_demjson.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# Docs are .txt files
+	if use doc; then
+		dodoc docs/*.txt || die "Installation of documentation failed"
+	fi
+}
diff --git a/dev-python/demjson/metadata.xml b/dev-python/demjson/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/demjson/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
new file mode 100644
index 000000000000..77bab24659bc
--- /dev/null
+++ b/dev-python/denonavr/Manifest
@@ -0,0 +1,3 @@
+DIST denonavr-0.5.3.tar.gz 60941 SHA256 8904bda0f6de1d40f602a26f909b592c33a82df4f22963f908168f6e031af585 SHA512 709f1eb2c51ba193ec17d3dc20d43d1f632a6e8b387b962e15b9b573c4d539357b3fd48cc177dd701b4b7043afdbab7a06a808b34b44e8c971f2f72ef6383d9b WHIRLPOOL 519f46898e1af12be5733c8d4cf2c0d65ecb191c283ac9b77f467680076b12f2749b5c183f823fda879e2f5ec855a36b67af3a95fd01b61a28a60e4092a16d19
+EBUILD denonavr-0.5.3.ebuild 850 SHA256 e04b41bf6de459ab5f441854ee0dc82378d4d7b0da0756aba5102c6ecac94790 SHA512 d72f4c5747c6133b0cc205877e2c7aa1f67d05633c757b7df89a0bee38e9e7a35033a7f4c5cf116e1f93f94590e1a106f848cc5e82a470d6341dad23bf55fdad WHIRLPOOL d2e2a0acb896bced4baeea3d55351d505a16fa5792e679d002bd553e617e39f602dc194d1933219c0ef192e66e5fc981064d539fb9e040b83ce4b88a06541908
+MISC metadata.xml 572 SHA256 b128c4f7d3c785086b88e1ecfa1d49718f5ee39c20ad08ede23fe5a185db97c0 SHA512 009f44bf923f227dde48e3304ef2a3164f664b8736c872dd6e3fbf27a99ac67905e312a64c2389b9845295c164fcd0fe6125337ac6aa1c77097eb864b4cf3857 WHIRLPOOL f4ab1b6bc857fc41283a32d4104aa6c5ea47c25e486ae4b18b42bb6955add51404ba8a42f31599425cf50538520b18c420a6a30f2e15ab736c6c12b246077c34
diff --git a/dev-python/denonavr/denonavr-0.5.3.ebuild b/dev-python/denonavr/denonavr-0.5.3.ebuild
new file mode 100644
index 000000000000..8c66944fef00
--- /dev/null
+++ b/dev-python/denonavr/denonavr-0.5.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Automation Library for Denon AVR receivers"
+HOMEPAGE="https://github.com/scarface-4711/denonavr"
+# PyPI tarballs lack tests: https://github.com/scarface-4711/denonavr/pull/31
+SRC_URI="https://github.com/scarface-4711/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+python_test() {
+	py.test ||  die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/denonavr/metadata.xml b/dev-python/denonavr/metadata.xml
new file mode 100644
index 000000000000..aa718e5b87a3
--- /dev/null
+++ b/dev-python/denonavr/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">denonavr</remote-id>
+		<remote-id type="github">scarface-4711/denonavr</remote-id>
+		<bugs-to>https://github.com/scarface-4711/denonavr/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/deprecation/Manifest b/dev-python/deprecation/Manifest
new file mode 100644
index 000000000000..d4d3d2011d54
--- /dev/null
+++ b/dev-python/deprecation/Manifest
@@ -0,0 +1,3 @@
+DIST deprecation-1.0.1.tar.gz 9596 SHA256 b9bff5cc91f601ef2a8a0200bc6cde3f18a48c2ed3d1ecbfc16076b14b3ad935 SHA512 fc35e6516e1617e2baad598a91e5d83ca95ab8a2d6a2753751d6752675de93cb44210109450a2aad9eb52b3c772a8b753c1d42ab2356c6663d2a03c4f779f086 WHIRLPOOL ea13e9188272523512101c9336fc574ff7fc24118491ae6650e8e944ea96afc426f1351576366f5df5fe51ce897e666fc4a6558f645496ce7596e83df032e36f
+EBUILD deprecation-1.0.1.ebuild 480 SHA256 7acb0e60f8f693ce1b6f08113cdc6c2d9393ddfa1d70514e4f1a0e08f1c501d4 SHA512 c70f1c39c99fdbe7e182b5f9ff904614421a7ea5f00139d282bdcf383b6428a62843f47a8fa23bfb4c76c9cacb856285ebaaf9020c2d32ea32e2574b2a58caaf WHIRLPOOL 5c843adf51e0c430eecec9ccd5fec97a039152cdc7f7637bbba9a3aabc7837c2a047741820075a4478cbba4152ab35877fba69c1cd7f80b63ad8bf6dec7f9a91
+MISC metadata.xml 427 SHA256 f3a4b70e76026289ba323289344bff101cb7446e6707a11f6e2f529d9ca55262 SHA512 c69de16cd81869a341c8113ec6b89d639a038de10b9b96e9fc2ccea0593f7e6d3fd2969618c97631c1c9fb377f48d07f62c928bdc1fe1d880eba28fe4f9e7454 WHIRLPOOL 224485aec5a7ca95610a01950cdb59f513f493eecab1d772b01af05384f9dc1b656032b7524206cc24bcc5ce3ef39635338258f785a0be40c094d7e69e3f2744
diff --git a/dev-python/deprecation/deprecation-1.0.1.ebuild b/dev-python/deprecation/deprecation-1.0.1.ebuild
new file mode 100644
index 000000000000..6e17d1081460
--- /dev/null
+++ b/dev-python/deprecation/deprecation-1.0.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="A library to handle automated deprecations"
+HOMEPAGE="https://deprecation.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/deprecation/metadata.xml b/dev-python/deprecation/metadata.xml
new file mode 100644
index 000000000000..ff92bdf665f9
--- /dev/null
+++ b/dev-python/deprecation/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		A library to handle automated deprecations
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/dexml/Manifest b/dev-python/dexml/Manifest
new file mode 100644
index 000000000000..29d7e763f91f
--- /dev/null
+++ b/dev-python/dexml/Manifest
@@ -0,0 +1,4 @@
+DIST dexml-0.5.1.tar.gz 24359 SHA256 6ba83883ead5cc74ce8198daecc657b60bf9cdb3887b484a92dcde55c10e2cdf SHA512 b8ac2b9f875ac7cf699eb9ee17adb8678ed8d4a796130bbb60f05431207adb68f490b7a7a41600acbc16a3cc08d55f22d91a13e53fe3d835a322709ee3446c9f WHIRLPOOL 93d44efcf71fa7ffe91bdb95c287f5004c3abab1a2a5b7f95c26d5e4f0382896970ae05c8f19e56db6c821a90120ab3548be177fbb7c92ace306d58d3969853f
+EBUILD dexml-0.5.1.ebuild 602 SHA256 52d4abe0a9e2eb5faee3709e5362320199aaaf4f7fc59766d9969856bd0c814a SHA512 28a9f7ea0605a160ff0249418b28b4f40f324514ad76e22750f290a15f0dd5c7dccf257f576213c59bb8572795c0132e3ab87c9e8ead5193a121412389a21ea3 WHIRLPOOL fc0aaa22889e5f575ae197e20e6238cf4b0e9b4f161467cd304a85233c022c7de414088ce25846f0d9a8aaac6fbd9a79ce122312bc12b28e8593592a997e1cee
+MISC ChangeLog 662 SHA256 c57c3620f7708302b198244c43d53b211fb651d39345ab9ccd721c7532d0c4f5 SHA512 1c28a9be4cdf441eee7c2ad04901b4bed349962542a914185865144b14dd1c00e3af84e68f249b96187236fae36f540ced4ea6c3103fcd49b6d5d421d2dacd07 WHIRLPOOL 6937f8b06101a65c8df785adaadc91abfd233952ff0d819e4e3c8c7371bbb13478cfcb1797650845f744740719b5e5f3ed1faa2e5ab634310c2ad76d4b43d5ac
+MISC metadata.xml 482 SHA256 d7a74694d63b33af145470aacadccc4780fde877e706452021fc3ea6d986d7c7 SHA512 ab731eeb859d2eda21fc492a4c63c39001e49011e6d2b9fa661aa2b1b3a03874d0219b81e614ef371a42b6695847376c6880b349bb40862d3e23f6646be0096a WHIRLPOOL cde52f8b339155068838e2185b886cc8a0908617f1a5f54c2edea0f9df2d734c83d32b0a2e2727287bf7f15b71694420aeb9e3e964b4e35868d61b4985726331
diff --git a/dev-python/dexml/dexml-0.5.1.ebuild b/dev-python/dexml/dexml-0.5.1.ebuild
new file mode 100644
index 000000000000..beac023a6e25
--- /dev/null
+++ b/dev-python/dexml/dexml-0.5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Dead-simple Object-XML mapper for Python"
+HOMEPAGE="http://packages.python.org/dexml http://pypi.python.org/pypi/dexml"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/dexml/metadata.xml b/dev-python/dexml/metadata.xml
new file mode 100644
index 000000000000..513b30532c29
--- /dev/null
+++ b/dev-python/dexml/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">dexml</remote-id>
+    <doc>http://pythonhosted.org/dexml/</doc>
+    <maintainer status="unknown">
+      <email>ryan@rfk.id.au</email>
+      <name>Ryan Kelly</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/dib-utils/Manifest b/dev-python/dib-utils/Manifest
new file mode 100644
index 000000000000..3548c0db47f2
--- /dev/null
+++ b/dev-python/dib-utils/Manifest
@@ -0,0 +1,6 @@
+DIST dib-utils-0.0.10.tar.gz 9146 SHA256 680c4aa256d7a65dff4308716a1c23e6f0e09b1f74a34033ed3d0c0316290261 SHA512 7a73748ebea78f93136518fe599fcb10a27d8c9c432398fee7fd87a93207bc18154547f9af4f85c7c04d684d13c777f1a2da0287b0f3195303866fd541a18d68 WHIRLPOOL 6bb852c7f920998f0f6573fbd41063a54e2d5bbbadcf2378efe245b018a3ffd4925818eb6ded7925b114bc562053b35e604ccf6c013dbb29f15df97afde549df
+DIST dib-utils-0.0.8.tar.gz 7764 SHA256 f28042c47518b1e73ac430f8261057eb61126c43e7c3bebbeafdf8edf045c68a SHA512 a639a142156027ebe6ca9d5fba6458175b2db37dae14f8cde75d9c32c1903e5774a9cf69d1c251af17ce1c98a4ff28238a8abe75c32956b9605b23ff327f980c WHIRLPOOL 7bd819a5599aa0a31a8baabfb59947ff35e6fbdaf1331c9be408cfe1b464eef91a87fd516f7d2ff7a1398965c3287b8a5f2a196b6c9e087276855ed97a082f04
+EBUILD dib-utils-0.0.10.ebuild 564 SHA256 9ed830228fb56a747d5c24faf27aa3086605d6f46baa1f5d74a19af7ba7e1152 SHA512 f5481f80ffb47f019f654dac8f72abbe81fa325e8fe8c57c60f3ba4fbc91b23bdb2b948840a3c5c6a6772b78cd532535c9f62833d8817a974580295738c5e490 WHIRLPOOL 0ab87d8dcdf4110c125ebd558529e9c06a34a895479228ba04fb755c6aa545f966ebdc56ae4ace32ecd3c1d92841015b666278e354750646a625daca174e7daa
+EBUILD dib-utils-0.0.8.ebuild 566 SHA256 f5e0c610ef41a5db3d411ae8a368f980f81d3123122be2779385c16e13c1cbc5 SHA512 29f9ed47df2756949aaf2098cb287c36496dd373a136e74faaddf3b7b62a65999517037f651ea6bdf4b4e25405456c673536dc021250467647952df5089bb1cf WHIRLPOOL cf88667167d1956a5bc9be06af30556c6a0c968dc5b7be720adb53ac9b81c3fa634f4f771751a0d0920ddd05414d0bcd833b8f409347f029f3aae1dd20c91e95
+MISC ChangeLog 503 SHA256 35a3055db17bacd40b5b1656ef7da48dae26211d89ff0a21a4dc0020935cc278 SHA512 49c372ce9258f7ea42b89325b35c136e74f81bddb47018822521483c2ae4b3947de746a3d9147ec12323517edf990b5f6411aba841de8061f2061b32592ca533 WHIRLPOOL 690c53642ccb6ac342ac405cf3cfc197af3558ef1ca971b47a562f69777bdb6f701335e19e8d583fdf1151df34aec1b1ac69b2d038b793f497caddd77cc44bd9
+MISC metadata.xml 666 SHA256 8beae78f04147a8e381b2a29bbd76e86dceaddb886e9c838469c93ba17a2015a SHA512 3905d6028d0b680ddbb63b50491bf57a693b8b4a2473cc3204d87234a23fbe9a4c6c34a6a4811201ecfc2114b99406f7a745f57793ac4bd830aff6b6c30234e1 WHIRLPOOL bc5daa566d3f3a6e8bbe34dcd80d87fba7ce23e5e135d832547ac97c3ce6d6bf64cad215c708d6d9e31e3524f298f45429b53c481d0004746d090c55af3afcaf
diff --git a/dev-python/dib-utils/dib-utils-0.0.10.ebuild b/dev-python/dib-utils/dib-utils-0.0.10.ebuild
new file mode 100644
index 000000000000..3d036390f017
--- /dev/null
+++ b/dev-python/dib-utils/dib-utils-0.0.10.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Standalone tools related to diskimage-builder."
+HOMEPAGE="https://git.openstack.org/cgit/openstack/dib-utils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}"
diff --git a/dev-python/dib-utils/dib-utils-0.0.8.ebuild b/dev-python/dib-utils/dib-utils-0.0.8.ebuild
new file mode 100644
index 000000000000..3fb0870f6427
--- /dev/null
+++ b/dev-python/dib-utils/dib-utils-0.0.8.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Standalone tools related to diskimage-builder."
+HOMEPAGE="https://git.openstack.org/cgit/openstack/dib-utils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}"
diff --git a/dev-python/dib-utils/metadata.xml b/dev-python/dib-utils/metadata.xml
new file mode 100644
index 000000000000..f1ec9a48bdd3
--- /dev/null
+++ b/dev-python/dib-utils/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>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+		These tools were originally part of the
+		diskimage-builder project, but they have
+		uses outside of that project as well.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">dib-utils</remote-id>
+		<remote-id type="github">openstack/dib-utils</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/dicttoxml/Manifest b/dev-python/dicttoxml/Manifest
new file mode 100644
index 000000000000..55434115addb
--- /dev/null
+++ b/dev-python/dicttoxml/Manifest
@@ -0,0 +1,5 @@
+DIST dicttoxml-1.7.4.tar.gz 18190 SHA256 ea44cc4ec6c0f85098c57a431a1ee891b3549347b07b7414c8a24611ecf37e45 SHA512 91abcf2b9b248717618e9fc1c8694e881b9deaa16438dd4674f94a22b4aabfdab3b13f95c3d44a60577d49eca82fb268f59b33d1312cf5388bdaf949a2865cbf WHIRLPOOL a07a6115b76e56184ba3c4dae212638eb30e6e0ea7cd5135b991b567477a06349d06a39a9ea35b4bf838b411977f8ea6cca8fba6fc24f666ade1eda48b345e7d
+EBUILD dicttoxml-1.7.4.ebuild 456 SHA256 1d214f8b4398f6b6f063eae67b0b123e25c403a6d38a38f8e399af2d8194f26a SHA512 d539661ac1153733622499f968c2fd69206d985626e16cccab65fe5dcc91df0b3264e2ade4c238dfaf9d2948aaa691878d46181ed9034c4a8fe0cbac55e709bd WHIRLPOOL 3c6af57ac96cd1c71c6d52a22414ce6a7890a2c5e5731e1cbdb0453e476c1f1fcd5ab3a14056dfcc2a5fc1d10e1021a5e3623d1c153739597b4925138800d757
+MISC ChangeLog 3199 SHA256 11b7311b1196b3ca2914d300612d88716bf98b9f47fd0b27b1dfeda8739d8e67 SHA512 cb5928536f9c778b986766245d1d3e3c1ffffcccb1c5feda4f562a9158ecf37996768133eae48888154628cb934ece47195606a964a609484e584b4c6b024948 WHIRLPOOL 1f1421bcd62d939ad4bf87f4f73234de6d4e3d28cce966ae4a52b5304841a6085b7fe1a4e287fcace2515048ed9aec3aeb150b9eeaceac8e7a8ffe38be810ed6
+MISC ChangeLog-2015 949 SHA256 abfa5f37679e73a11a37ee712655a384bf6b39ce4b470ed43e9635f8d09d99d6 SHA512 151b70fb5d901db7349280a16081042cbdda5025b40b882b04319b211ddb8bb7709f09b4255a63bb7e643516faf8e76a41aa56e2a5ffd8a5a02ea0cb28dbc34e WHIRLPOOL 9c2c5c2208518948d1e59709c801eb2e4712a148eba1faeb1495222d8e26535072f218784d75a5fd1fffd8af031efdac498730aaf9342cd8bdc7ccfcd444e3fe
+MISC metadata.xml 503 SHA256 51e4faadffac6baf25aac19ecb0054a3baa6583d1ea17c365831dd517978993c SHA512 3bf0c6926f48f42ce8e81c3111a625f43d043af1a95fc74eeb2463f789a2226591cea81b5f1ec1f4c12bbf365f3002f5f652f2dc7ce0ae2bf26bee1eceef75b3 WHIRLPOOL 9be9e56fee5f251d9bc34454db72a49b908bcf867026ddc2e35207b6baa393af039efa7662cc62c059645c77790d114e2cc1e6fb86666c7fd9a5867945ae65e6
diff --git a/dev-python/dicttoxml/dicttoxml-1.7.4.ebuild b/dev-python/dicttoxml/dicttoxml-1.7.4.ebuild
new file mode 100644
index 000000000000..ea8acad65ff5
--- /dev/null
+++ b/dev-python/dicttoxml/dicttoxml-1.7.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converts a Python dictionary or other data type to a valid XML string"
+HOMEPAGE="https://github.com/quandyfactory/dicttoxml https://pypi.python.org/pypi/dicttoxml/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
diff --git a/dev-python/dicttoxml/metadata.xml b/dev-python/dicttoxml/metadata.xml
new file mode 100644
index 000000000000..a9cc4739239e
--- /dev/null
+++ b/dev-python/dicttoxml/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">dicttoxml</remote-id>
+    <remote-id type="github">quandyfactory/dicttoxml</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/diff-match-patch/Manifest b/dev-python/diff-match-patch/Manifest
new file mode 100644
index 000000000000..6bcf19e1f1fd
--- /dev/null
+++ b/dev-python/diff-match-patch/Manifest
@@ -0,0 +1,5 @@
+DIST diff-match-patch-20121119.tar.gz 54113 SHA256 9dba5611fbf27893347349fd51cc1911cb403682a7163373adacc565d11e2e4c SHA512 3daff80a6043a0413c515125a21839d9fa1d71f7e2441f4870ebefed35f1accea711814ad231c65de0e3468bbd01402c977fc063ab120b7d9f0e04ef555a8207 WHIRLPOOL ebd50cd7b86cb6c5b003f09d3c8efccda14cb1b2d158123b424f0c2bd40b37338ac8f13dcf464feb408d661db0ed6134fa9fc5c9954ebf35a3ebce206552b3aa
+EBUILD diff-match-patch-20121119.ebuild 523 SHA256 3b1ccf815a0104927a2c7dd6b6826fdfc70dc47ad3f6e44b24c628d006a5dbb3 SHA512 b5eff55fbf006d0da4e78b687d9ebb00922a901a0a3437850c0ec8717d59182e1dc57b7cb652493cf3c8cd20bc2079b1c16729679c997e7d15f2c5a610eb4b49 WHIRLPOOL fc441f898b566172c31e3ec8dc80a32e27d75502737096648f8da3f78555bd09dd8348ada3b4a24a327bd4621c41b55332f1a0c5e54e81cc468b7a35fec2ccb9
+MISC ChangeLog 3222 SHA256 2ec3e836b7b481a8a1ffe858b2a395e589e25134cb284f5a737ec443afb989eb SHA512 af25bce478b5e81446c82d053885ccd1329968b2fce4dac74c9b0ef9a181ee7cbe127a9355b8d1ddbb0164a452ef4641364febd967b78825de79f7977e1f509c WHIRLPOOL 1e09ce1fef9c85a8d8988fe7de477a3e78864abb3ece6b089ba13d954c5f3e8bd02648cc86afa3b11187f89d1cbc795ef8b0ad31669177d7061ab7be068c06b0
+MISC ChangeLog-2015 3062 SHA256 c49579374a6b32511d6feb7edf534a1591498803e3918fd7e1cd22a1c39c3fb6 SHA512 514566c1c79c0aeeade2997e318550d4ddc7375cb87c55346a5d5d371fb0c75e24969648b976036b979779a889a00554561c11f7603ea70e3c0b6dfee7fa5d8d WHIRLPOOL c0a9ceebe34b13b787e208c6da434911ce57a3758b391f76fc8a866a6eee3e8bccdd1e9d56634976f9539faada7934e12b4227d3e4b5f4e177e9c3a5083ba0a6
+MISC metadata.xml 1275 SHA256 3fe90cfbb424ecf6ade75bb6e3c59ecc38d7f73e092b62950b67dc0d9eb86668 SHA512 0a5e72080b845fe7ba9b0fb41b51aab1bdc9eb11e702027c9dc1a83c245e54c9b1c667f4e5726a026df75996bdf0ffacf6d3f68ea79705847f657f1b859ee556 WHIRLPOOL 531db020b6155bdd2ec10e4b58b73711eb7b64e57754bde9da3dd8ee3b3e5710c703a0b9898dd6e49b93d6873315c2fa6e78c664fe9b06d336789575a243565f
diff --git a/dev-python/diff-match-patch/diff-match-patch-20121119.ebuild b/dev-python/diff-match-patch/diff-match-patch-20121119.ebuild
new file mode 100644
index 000000000000..a0de8651a743
--- /dev/null
+++ b/dev-python/diff-match-patch/diff-match-patch-20121119.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Diff, match and patch algorithms for plain text"
+HOMEPAGE="https://pypi.python.org/pypi/diff-match-patch/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/diff-match-patch/metadata.xml b/dev-python/diff-match-patch/metadata.xml
new file mode 100644
index 000000000000..85b6549c5455
--- /dev/null
+++ b/dev-python/diff-match-patch/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aidecoe@gentoo.org</email>
+		<name>Amadeusz Żołnowski</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">The Diff Match and Patch libraries offer robust algorithms to perform
+		the operations required for synchronizing plain text.
+		Diff: Compare two blocks of plain text and efficiently return a list of
+		differences.
+		Match: Given a search string, find its best fuzzy match in a block of
+		plain text. Weighted for both accuracy and location.
+		Patch: Apply a list of patches onto plain text. Use best-effort to apply
+		patch even when the underlying text doesn't match.
+		Diff Match and Patch libraries are currently available in Java,
+		JavaScript, C++, C#, Objective C, Lua and Python, although this package
+		contains only Python implementation.  Regardless of language, each
+		library features the same API and the same functionality.  All versions
+		also have comprehensive test harnesses.</longdescription>
+	<upstream>
+		<remote-id type="pypi">diff-match-patch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/dill/Manifest b/dev-python/dill/Manifest
new file mode 100644
index 000000000000..56266e7d9f09
--- /dev/null
+++ b/dev-python/dill/Manifest
@@ -0,0 +1,6 @@
+AUX dill-0.2.5-avoid-installation-binaries.patch 784 SHA256 94a022411360c089d0a6fe1bc7fc8b9680a8428399f6cedef3e1cd206dda490b SHA512 cb944c7e4699a99a5040140f2dd1cf6bbe3148b0fe098c536200cddd4ed835545c7e8328072a188fc9a5d70b9b4f5d3a138108f934734ee9c8021b3e95126cc4 WHIRLPOOL c1065f9fb6393268eabf7c1c31ede92c7037c916a58213c39fbc2bdc4e8cc963b66c7c2cc874bef92c903c61a74215af46f5f9f483abb46452801b9f09f3cc1d
+AUX dill-0.2.5-remove-install_requires.patch 906 SHA256 5e87b1f2e89303e346e67c9489e5f1efbf8b80462391ca3878ea8269cbaa14ac SHA512 f984248a8280a1cf97bca6a8ad90f8d648da106a74c67dfe29f62e5d8591d7cfcb608bf827729430f0463f6ad0846dba094a030b5c2c3e3f8f387f39803f737e WHIRLPOOL 706b9669111e6d97051308f34cfaf91c1f877f1aad19836cce20e688fde030e24808af8ee7d2b763432817f4c1b49e2d6b36c8bea8b13b08917ab98877a15f7c
+DIST dill-0.2.5.tgz 60572 SHA256 431c9d46e190dcdf1397234cf659d66e2e22e33b0474ed6ee2d0b16c9c0ea319 SHA512 94942a736b4c2e1558eb9475f9bafe3a24f88a976abf9880beec386497a2bc769cb9be6bbfd2baac006c92578c372f5dfcfa165c5649876ea5076a3b207de6fc WHIRLPOOL b0af3e279ad937f36450f25711412b7e48928515e4721fee3d91663c4ec629357b6d8f3c661f1ac56d3f7343a3bef717a368386bd8983991e06a4ce0f78ae1f9
+EBUILD dill-0.2.5.ebuild 539 SHA256 08884a5f43da4ab13551eb9cd9dfe773890941d9ae064b051acb7547bf1b1915 SHA512 9c8527158c526a1f451d3c54382d735fdd49174abec661b62de6f1efe82c6b2322a692b56b52e7db14d7ed724a56472a08891fd88d4f8dc6d44729de39963508 WHIRLPOOL eb68466b364e8adcb15b097dd34175b6892bb81ffa86ebb3d0cfe8dba831e3a3397ac70fd1a8a2867c6cc1c54258845d02310e53e6b91191dcf31d22a90905fd
+MISC ChangeLog 584 SHA256 67faf3c55103290e2a9646ed06fdf87aa9bbb616421a15627b5fcf2fd9a282b0 SHA512 d61e9723a0bd2d1f30e9c3a9a08827da42938383a7db53e203fa0f33d78deab4130947d85687eff64ac42dd1a2558f7e0a0b78db31bb6416f4feb5534d27425d WHIRLPOOL 34aff99293e2d0089f48b56ec8197667d07e858a355ac0e6ec8f8fdde61d54cb197c479ac49b493c2ce8911e6cc0f3d9d645953abd7ad6f150d0e106b3bc13a3
+MISC metadata.xml 971 SHA256 ab1e928df07d5cb6379870e89c5c7543a42f132d0dd066a04f4a3794f82942c2 SHA512 6dbac6b4684df0f0ca183d998a8c8aaeaa5557d4f20652de04b263a9195b28e56adb7657ab12aebc63715efd2de242b55f3b17648a0337d689756fc4726e5094 WHIRLPOOL bb511abf04b29ac539657380fe2ae17d80fcda8a5e3e42ce074ad90970a18d00c5d8c3e0d051e601ddbab82796490a7a9647e4f2c1cc95f29f405f0e7c6e3a6b
diff --git a/dev-python/dill/dill-0.2.5.ebuild b/dev-python/dill/dill-0.2.5.ebuild
new file mode 100644
index 000000000000..d13dba401c3d
--- /dev/null
+++ b/dev-python/dill/dill-0.2.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Serialize all of python (almost)"
+HOMEPAGE="https://pypi.python.org/pypi/dill"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-avoid-installation-binaries.patch"
+	"${FILESDIR}/${P}-remove-install_requires.patch"
+)
diff --git a/dev-python/dill/files/dill-0.2.5-avoid-installation-binaries.patch b/dev-python/dill/files/dill-0.2.5-avoid-installation-binaries.patch
new file mode 100644
index 000000000000..16525c10b343
--- /dev/null
+++ b/dev-python/dill/files/dill-0.2.5-avoid-installation-binaries.patch
@@ -0,0 +1,29 @@
+From dfa34a34f09d0f868cc404d5c1ccf071f47fe63f Mon Sep 17 00:00:00 2001
+From: Josue Ortega <josueortega@debian.org.gt>
+Date: Sun, 1 Nov 2015 13:07:04 -0600
+Subject: Patch to avoid the installation of upstream binaries under the wrong
+ directories
+
+---
+ setup.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 8f91183..1ee6dcf 100644
+--- a/setup.py
++++ b/setup.py
+@@ -283,10 +283,10 @@ if has_setuptools:
+ """ % (ctypes_version)
+ 
+ # add the scripts, and close 'setup' call
+-setup_code += """    
+-      scripts=['scripts/unpickle.py','scripts/get_objgraph.py'])
+-"""
+-
++#setup_code += """    
++#      scripts=['scripts/unpickle.py','scripts/get_objgraph.py'])
++#"""
++setup_code += ")"
+ # exec the 'setup' code
+ exec(setup_code)
+ 
diff --git a/dev-python/dill/files/dill-0.2.5-remove-install_requires.patch b/dev-python/dill/files/dill-0.2.5-remove-install_requires.patch
new file mode 100644
index 000000000000..dfa5f0dd653d
--- /dev/null
+++ b/dev-python/dill/files/dill-0.2.5-remove-install_requires.patch
@@ -0,0 +1,28 @@
+From 9b32a0be077d5295a42fec7cb17810fa3e8aca45 Mon Sep 17 00:00:00 2001
+From: Josue Ortega <josueortega@debian.org.gt>
+Date: Sun, 1 Nov 2015 13:11:04 -0600
+Subject: Removes install_requires in order to avoid automatic package
+
+---
+ setup.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 1ee6dcf..dd90af5 100644
+--- a/setup.py
++++ b/setup.py
+@@ -277,10 +277,10 @@ if has_setuptools:
+       install_requires = ['pyreadline%s'],
+ """ % (pyreadline_version)
+     # verrrry unlikely that this is still relevant
+-    elif hex(sys.hexversion) < '0x20500f0':
+-        setup_code += """
+-      install_requires = ['ctypes%s'],
+-""" % (ctypes_version)
++#    elif hex(sys.hexversion) < '0x20500f0':
++#        setup_code += """
++#      install_requires = ['ctypes%s'],
++#""" % (ctypes_version)
+ 
+ # add the scripts, and close 'setup' call
+ #setup_code += """    
diff --git a/dev-python/dill/metadata.xml b/dev-python/dill/metadata.xml
new file mode 100644
index 000000000000..b277396800f0
--- /dev/null
+++ b/dev-python/dill/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Dill extends Python's 'pickle' module for serializing and de-serializing Python
+    objects to the majority of the built-in Python types.
+    Dill provides the user the same interface as the 'pickle' module, and also
+    includes some additional features. In addition to pickling Python objects,
+    dill provides the ability to save the state of an interpreter session in a
+    single command.
+    Dill can be used to store Python objects to a file, but the primary usage is to
+    send Python objects across the network as a byte stream.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">dill</remote-id>
+    <remote-id type="github">uqfoundation/dill</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/dingus/Manifest b/dev-python/dingus/Manifest
new file mode 100644
index 000000000000..4b23f56591b7
--- /dev/null
+++ b/dev-python/dingus/Manifest
@@ -0,0 +1,5 @@
+DIST dingus-0.3.4.tar.gz 6202 SHA256 eaacfcd17819eb9a0ee18c018be3a354a632a6e82b610d72f8a3bf33a1d7db35 SHA512 7fffe0a02037b8e85f4d58fac1b5e59af98a8fc4a298f67bf9cd813b369c469046dfbbdb07965df4aa8ada56de1f097c19ed448d99fc41047f02e5dec701e504 WHIRLPOOL a4fe81f496d81ca296a09f71e1aa18f9884f586c5343d7458fc2807fed5848e61080010a658c846720ae275f402e68a28b7c119776c4c95fb93adc654dd63e72
+EBUILD dingus-0.3.4-r1.ebuild 546 SHA256 1a917dc8dd439062fbc002f719b359af3a83cd19f18250adf3d0de9ec72b4d2e SHA512 4f8b4064f2f816c116a0f6d490028d1fe7aa0729395b889dd60a741f4915a47d6c6becd7205d02d22f9ee533a6e488bdb677d8fbe3d3bb3a67ba96f7edccf0f3 WHIRLPOOL 55f63f79cdba9b073317760372d3fd5cd90576910ecb03fe9f5cd9a5721fc433a43313a9bf55ae7ea5987267f664628ddef6599ce3f3a924ca8740eb851aa0e1
+MISC ChangeLog 2701 SHA256 e5129e045fb468a6c7f7cf6ace30e2fbf41abb79c355229b0549e87a1eff2edf SHA512 938e6c26598da9cf9e676ba42f0fec40200335635efc6184675668d6644bfce58a507eaa22d3a203e67a0b57f68c2111aa2dffc08bb0c730b5909c11fbdadc9c WHIRLPOOL e0f2837b4fff0879df5e9526ddb7f1be46b772c20cb2cbfb3b4543e2227d0615b26a3387dff053515bd47799853c5c1af782f6a7eb2044ffdfe1851e4d702f96
+MISC ChangeLog-2015 1479 SHA256 2073bd0d51741828006a80b80b7e77af6511440719fd5156401c71fea7df8569 SHA512 a221d6293bece8bae6e941185f12aab449f92de91ecff71a7f8dc6146416f114ec8a290eb13a049894b12bfb69aa884de4bec989b3b31162ffda59440d452b8b WHIRLPOOL beca6a7f8a0d9cf1c85ca4e09aa42a95a8864a9a8cada4509ad13e5c83b19a3a3bc233d8fdcde6d0b65e0eeaf17a78e5cd859ab97984de387b8f05b769828525
+MISC metadata.xml 319 SHA256 c4de42c00a9912481d80737c54def8fda34cd5a0a83f040422d4cf834550a882 SHA512 536932f1f602daa8324efe7288b378a2ecb6762dc0d9656efd473008352a60b700e368ff5749746f972954c68aaea7e3c9fcd84a234932909d19a31d88a04327 WHIRLPOOL cf2519a9c063933e8539e4f7b87a62ddb3da76d8b44c4d2f04b967fc2eb05cc8192e27bc6a66125e07c6be26196c3a8fd6e80e52e6993e41cad4787650c8f6d8
diff --git a/dev-python/dingus/dingus-0.3.4-r1.ebuild b/dev-python/dingus/dingus-0.3.4-r1.ebuild
new file mode 100644
index 000000000000..85b1a70ff0c0
--- /dev/null
+++ b/dev-python/dingus/dingus-0.3.4-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A record-then-assert mocking library"
+HOMEPAGE="https://pypi.python.org/pypi/dingus/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+KEYWORDS="amd64 x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_prepare_all() {
+	sed -i -e '/data_files/d' setup.py || die #413769
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/dingus/metadata.xml b/dev-python/dingus/metadata.xml
new file mode 100644
index 000000000000..40e1585aee2b
--- /dev/null
+++ b/dev-python/dingus/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">dingus</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/dirq/Manifest b/dev-python/dirq/Manifest
new file mode 100644
index 000000000000..0704394d5cb3
--- /dev/null
+++ b/dev-python/dirq/Manifest
@@ -0,0 +1,3 @@
+DIST dirq-1.7.1.tar.gz 32645 SHA256 258eac86de81fd013f11f309582bdff9f26c76e572214cf291c65c1bc667864c SHA512 8865f395e6ef81131c5e1df9f97cf1768557af06d446a79ece29e23b83c228cbb158099a7e85360423013cd8e5ead8970c5160865f065d16fcc288c2ce9d176f WHIRLPOOL dcd86acf6830f2e843a7691d816115aef7d1c9b9fa0a796bff4559a9d211779ce24ab03ced8ac7b917a35082aa34b1d2de90d480e94ae3db97c4a0e9dea28dd6
+EBUILD dirq-1.7.1.ebuild 572 SHA256 b87abdaf96e420cafd432545b5c86634c27d22f56590b0ab29892bf3730cea2c SHA512 098025f007af74b39e39aaab3f5c1e8e45c20725e65ae208a89dde2d3117c16aebf75ee421d08bced8899e34f69d123a782aaa0418eee1656658835de723bb35 WHIRLPOOL 9a9b2d6c1e40ed934da8d75a679074d240f98660b73a015aa4aab33bddf24da644cb638334698b67ae6a969ac00bfea99a97c9f0ad171f1ae5623f145d127a72
+MISC metadata.xml 737 SHA256 aa4e9a1fe44adc878e092fc91d2d6682b3685751927adfabf62449ef353dc1b3 SHA512 b5444242e60c9e2c847c91cdccaf43567bc9e77c6d6a89bc705af98c3eb2cc115f64abeeff191c9803ca50d73af89b6e91c0104d130c45087f11bd3f128a6459 WHIRLPOOL 9fd94a842044607cb865c91e7f1b875875cc4fa70e46bf2d434b94b102e491f96d80677d7d083dde9d9bb036d2d8cdcfb400d87a050001c4b11c3f90173376f0
diff --git a/dev-python/dirq/dirq-1.7.1.ebuild b/dev-python/dirq/dirq-1.7.1.ebuild
new file mode 100644
index 000000000000..5fd3db570d63
--- /dev/null
+++ b/dev-python/dirq/dirq-1.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python port of Perl module Directory::Queue"
+HOMEPAGE="https://github.com/cern-mig/python-dirq"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Note: as of 2017-03-22, dirq tests are known to fail in Docker containers
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/dirq/metadata.xml b/dev-python/dirq/metadata.xml
new file mode 100644
index 000000000000..2e025c6c0714
--- /dev/null
+++ b/dev-python/dirq/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="en">
+		The goal of this module is to offer a queue system using the underlying
+		filesystem for storage, security and to prevent race conditions via
+		atomic operations. It focuses on simplicity, robustness and scalability.
+
+		This module allows multiple concurrent readers and writers to interact
+		with the same queue.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">cern-mig/python-dirq</remote-id>
+		<remote-id type="pypi">dirq</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/discogs-client/Manifest b/dev-python/discogs-client/Manifest
new file mode 100644
index 000000000000..2477bc83753c
--- /dev/null
+++ b/dev-python/discogs-client/Manifest
@@ -0,0 +1,7 @@
+DIST discogs-client-2.0.2.tar.gz 25486 SHA256 7de2166ee4f7f5dc4cf1709b7a6abe6211a0046f2341874d2c67e5c6466351a8 SHA512 00634eb95018ccb2ece0adf4b7e3ea96674f0c8dd63d9bd151cdf9c871898fa24379f78065ebb677cc87eaffa31e91ba60051622a38c6bd774e010c20229b16e WHIRLPOOL ae54cdbb93d7fdfb26301f57a4ee3f0ec925a55a29c377c875221d62a0c54e54d957075ab04800fcc39aa3152317511ec775a66e6a5e25300558437c730faed5
+DIST discogs-client-2.2.1.tar.gz 24645 SHA256 9e32b5e45cff41af8025891c71aa3025b3e1895de59b37c11fd203a8af687414 SHA512 fa339b14d5655a36fdf252fd94c729ecb97e195c1f7eb2e5207355dc5f4fd89d0b738218ffbac71acab4f143870bdba5cf5ea02dff70166014f14c30481ae1e5 WHIRLPOOL 7eda6665ac149b96317b516f30ef5fa164422f46d0eb0e4281914b40346360c72e2db23b6bbf4891c555c2c18baffdc405144c7532c11577091634390d8f0e67
+EBUILD discogs-client-2.0.2.ebuild 904 SHA256 57ab89fdfeeece617bf0bcc5b0ddd41cd66f9d7397f0ac764acf6377535a9194 SHA512 bbb2cea98a2b1eaba304c2e2f116cf8f4129c17f06a216329a28945d507254e8419ea818dcba09df49e420f7634eb938e80cc46b79531c9e0b70657e755d213f WHIRLPOOL 4ab9b42f497e455a4cd3a7d116ccd63070fd122fdb9c768bd34ede3a1466800ece93182c3d224f7c6bf89b75cbbeb9fe3792aa7e61ef8b676a2587c89a1489e8
+EBUILD discogs-client-2.2.1.ebuild 833 SHA256 da19a482a99708e89d4033816cd37cc86fd362ba5b3b249aafa5d15db056f434 SHA512 75dca816850a24cc8a52ce722b4551be626651c4981f1e351f8f6f86346936f71831c4aed14d8e7439d3af22b667c4b4befdfacbed193e0924236cc7826ce08d WHIRLPOOL 93cff6df9a2bdf62aedc2f6bc8b15c92b8ef0ebe96fd180d2856303811946ee1e12980f3b9e2d14903ca250ec3207db2236282c526cd673c3528f8056a49c301
+MISC ChangeLog 2882 SHA256 bac10008d807ff286681cd9d887ce618165aa8185559f3e03baba1c703e61951 SHA512 9c7b334bea780c689fdd359096915364b6da00ba73e149a2333c780fad743a133ff2c946816cec589fc996826b5e9b0b6343a6798fda28b7f8d242afd60bd29c WHIRLPOOL 7e28d0d85f8c2e1def22250b6facf796eca9e63891d7ea98c39c15bfa06c2e0f48451d4b2f50c9385579781766e013f0a727e937b3456d38e43298b84ebc8235
+MISC ChangeLog-2015 1848 SHA256 4fc0378b9d1d729b0f3845ba32fee6dfc1cd3e003148220311cdeab78cb6e41a SHA512 a238062718b8e5d68064483e05d4e623d67ff3623e8879975e3504ca71fbdf3d1a37a645ac5077725d2576c0fc764f5dd41a7b4af4961f4c9e717f03fd395de6 WHIRLPOOL a61e9efadabe3895e832c0b2fe5e5622bc36eedd7c8faee8aa5c031d8508100cffc74e438858f55c6afdeb9047d8586b04743d345f30cb554265cd56c9278966
+MISC metadata.xml 510 SHA256 e11383e5d6ec4c773f68366f3a022cd85556f8353ef3e8cdce100cb82e781af0 SHA512 eb5c50a58b9047724cadf5435ade2ce815fd90d979a2e900becb98c1eba411a24e2087e6f691f5b54128419472bc15d8ece13a343e7335c1c4a007546dc57441 WHIRLPOOL 8ee9acb8812a81625b6b56a64fca2ff373fb27f30de37742c14aca2221ae0bbb997a7064a189b0348c887f253986059f060033e4a22b22be69ebf9ed5a7797fc
diff --git a/dev-python/discogs-client/discogs-client-2.0.2.ebuild b/dev-python/discogs-client/discogs-client-2.0.2.ebuild
new file mode 100644
index 000000000000..539985169673
--- /dev/null
+++ b/dev-python/discogs-client/discogs-client-2.0.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+# Not py3 capable due to oauth2 supports py2 pypy only
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Official Python API client for Discogs"
+HOMEPAGE="https://github.com/discogs/discogs_client https://pypi.python.org/pypi/discogs-client"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/discogs/${PN/-/_}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/oauth2[${PYTHON_USEDEP}]"
+# It's either this or make a test use flag to add RDEPEND behind it. Both work
+DEPEND="${RDEPEND}
+		dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${P/-/_}
+
+python_test() {
+	"${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/discogs-client/discogs-client-2.2.1.ebuild b/dev-python/discogs-client/discogs-client-2.2.1.ebuild
new file mode 100644
index 000000000000..62c0629bb3b6
--- /dev/null
+++ b/dev-python/discogs-client/discogs-client-2.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+# Not py3 capable due to oauth2 supports py2 pypy only
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Official Python API client for Discogs"
+HOMEPAGE="https://github.com/discogs/discogs_client https://pypi.python.org/pypi/discogs-client"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/oauth2[${PYTHON_USEDEP}]
+	dev-python/oauthlib[${PYTHON_USEDEP}]
+	"
+# It's either this or make a test use flag to add RDEPEND behind it. Both work
+DEPEND="${RDEPEND}
+		dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/discogs-client/metadata.xml b/dev-python/discogs-client/metadata.xml
new file mode 100644
index 000000000000..2ecbd1d91959
--- /dev/null
+++ b/dev-python/discogs-client/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>int.teo@gmail.com</email>
+    <name>Theofilos Intzoglou</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">discogs-client</remote-id>
+    <remote-id type="github">discogs/discogs_client</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/diskcache/Manifest b/dev-python/diskcache/Manifest
new file mode 100644
index 000000000000..b42d695f567a
--- /dev/null
+++ b/dev-python/diskcache/Manifest
@@ -0,0 +1,3 @@
+DIST diskcache-2.8.3.tar.gz 438587 SHA256 61ccc77a51a3e3b31abfb80de7163ba51ce09b1612e0d026f1c0457575c23002 SHA512 d96ac76dfb68cb817febd3f4ed8927a8409c02b13b4112a739528cade40f9a588c732dfc3148392dd12676380c3a2b006ee63b86f30ad70f5d205273003bf23d WHIRLPOOL 0ad78c98a64ae59661eb08c842cb363b42f076e856c1eca8c516bb6b14856c6391afc8a2d5e01bfe0e20fe88e20b8967dbd7cda51785e13e7c6b1dd9947930fd
+EBUILD diskcache-2.8.3.ebuild 835 SHA256 7acc3be261e89d05ead0ce7d08d90ea0c6c89485e19c231d8fe5198df478173f SHA512 6a4cf34d327443a155b22951f975bc9dba34d6c2da5cbc2ac6f620088147ad01fd35136051516d6c11aa1b31e8002ab7fe10e24067c16c6b1520e643ac5590ac WHIRLPOOL 86468ba7e6cd408c9a9d007aa07aee56c5a9217e267e5fcd1f5992de4a670c448d31206aa10d74657ed509f7732f0a7be6fbc075fc55f2cb5bc3500bdfc2ddef
+MISC metadata.xml 391 SHA256 cf1d3d976cf6eb05f2636e2c9d9064f85ec561d0fc55b72fb52c535275f41f16 SHA512 0d088c14dbbf7c11541b5f47d193280c0f92f8f1b3ec62c8aad49648b3fbcc393ce639b5b9ae18533a4d4b9cb5ad536a5a847b705e2b4bd385d3b90d48f812ec WHIRLPOOL 6d29118acc202a920f81dd62f05482a84ec03835bd34ea80cca93cca550e560d32d2c18bbda18c7b6f778de7817b29e0c7eefe4edd63ef29dd930d8cfe5b6821
diff --git a/dev-python/diskcache/diskcache-2.8.3.ebuild b/dev-python/diskcache/diskcache-2.8.3.ebuild
new file mode 100644
index 000000000000..8dba94ae6c0a
--- /dev/null
+++ b/dev-python/diskcache/diskcache-2.8.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+HOMEPAGE="http://www.grantjenks.com/docs/diskcache/"
+DESCRIPTION="Disk and file backed cache"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/django[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	nosetests -v || die "failed with ${PYTHON}"
+}
diff --git a/dev-python/diskcache/metadata.xml b/dev-python/diskcache/metadata.xml
new file mode 100644
index 000000000000..bda6b340bb5b
--- /dev/null
+++ b/dev-python/diskcache/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">diskcache</remote-id>
+    <remote-id type="github">grantjenks/python-diskcache</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/disqus-python/Manifest b/dev-python/disqus-python/Manifest
new file mode 100644
index 000000000000..d350f6cf18a6
--- /dev/null
+++ b/dev-python/disqus-python/Manifest
@@ -0,0 +1,5 @@
+DIST disqus-python-0.4.2.tar.gz 9751 SHA256 aac773ab21fdea9e525de3e43bab6714899575f8fdccb70d31688fe6bc68020f SHA512 ad55c5d95ff9b382a187cfa13b2cc41ec8e90acb6378ebe11a32fc2dc7b125e3e9ebd94d8f24d686f56e87808cda7642d1356c1dfa1e4b7f5d7e1ee9e7875b0a WHIRLPOOL fcb3bd9ec7bdefc338ab7a60b60f0841a2ec591b9a907b52c0f61be0e3f168e004ca6d9b91b71bedd28f44ea37e24a6e7b6ca063abc23c03bcd0f2e120c0e36b
+EBUILD disqus-python-0.4.2.ebuild 658 SHA256 ed552e1a606bb37609532c17a0239a832dfbf23ff68d97c457cc3c5f58c733b6 SHA512 b6941631eba5cf1711bf5709355a105957a0c982113aef3e6e42ec74816e5fa7ec85bc4fd7389a982dc7da7ea103d4afb26ad873f22753e9692826fc60903acd WHIRLPOOL ca9a113d78cce95b361866f61a5743b8812694414fe868ce37c54f35e526858ceddf1ada79d4cef28fd6b83e57b41e494394529f02d7ca6fe49dc7db6cfcdb68
+MISC ChangeLog 2447 SHA256 c7e538f782984681a979918be8c820ca554e2439139fb53780acb8f2d65e3f76 SHA512 a89e8207414306d01ab437127ec47faf6f28661cb73162fda330d4bd89cc2bfd01b267177785691d4a0b35454866815b929b1803e0384af61567ed39dad24736 WHIRLPOOL d144dc3b552057bccd30a78531790dd46b1707d946a9847a2b8d2510ae341210076c923f3831a90e1c43dd35b3d44bf2145b764677782e15195a66ddb7eb0e73
+MISC ChangeLog-2015 877 SHA256 1dede190a4177ed15dcc3d0dc6f501888f9f9e08548e2f80564af01301ee787d SHA512 90c7e98e5398f6310cac6e90762ea321ee788b8455fa090e56157a6bd02026274bc1edcda730c5c5b66f6cc3b45fd9da7b5fe0a3b79b06c2c70a7e3b8cbf9207 WHIRLPOOL d51e7f94afd23aaa72b5fe87277c2e99ee9d3b7170b1dc15f66508f28f294086622570718c05e1b12f0e35e565028886800e429ebf58d8d2a7c2bb6b6434ebbe
+MISC metadata.xml 501 SHA256 df43837b4034ea10777daf155b34f3ff5bfbf22942478f19dfa7abb9ec463a63 SHA512 ec25e4c639d55963c3caf191f808a797c220e4c79f98f2283dc322c0b144a41e89937dfb723a106838c5e420f86b74e57fa153d855545d67345147b37ec143aa WHIRLPOOL 334dd015c25aaffb94aa0d4f7543092f87c5b0b80f869d6383153a123aef98fbb34ea789ee13a0b7a0110e4bfd8ce461c4b929d16b92975b169299378072c28d
diff --git a/dev-python/disqus-python/disqus-python-0.4.2.ebuild b/dev-python/disqus-python/disqus-python-0.4.2.ebuild
new file mode 100644
index 000000000000..457a583e5641
--- /dev/null
+++ b/dev-python/disqus-python/disqus-python-0.4.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python client library for accessing the disqus.com API"
+HOMEPAGE="https://github.com/disqus/disqus-python"
+SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND="dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${EPYTHON}" "${S}/disqusapi/tests.py" || die
+}
diff --git a/dev-python/disqus-python/metadata.xml b/dev-python/disqus-python/metadata.xml
new file mode 100644
index 000000000000..303b73aa52c5
--- /dev/null
+++ b/dev-python/disqus-python/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ercpe@gentoo.org</email>
+    <name>Johann Schmitz</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">disqus/disqus-python</remote-id>
+    <remote-id type="pypi">disqus-python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
new file mode 100644
index 000000000000..1fffa6b30295
--- /dev/null
+++ b/dev-python/distlib/Manifest
@@ -0,0 +1,7 @@
+AUX distlib-0.2.2-unbundle.patch 1284 SHA256 f0a1535c8ebdb1cd288760d11f642f3d7e155e178ae94417000929e1a7513657 SHA512 90ae9177e09a4ae23a5e1a90e5599602466ede4b9fc2b19024c00a187f7393fc2fb84795bf5bb699bdbe071a97514bf86e8da556c8cacb49db0985f2ed8fe18c WHIRLPOOL add780400a458058f2f4f58f3065998857c49880e2f8c548809832be0ee4a0157012690c6beb20d78da2241f10b10c9c00b4f5966ad7c6ef25ab933cf5137c2d
+DIST distlib-0.2.1.zip 542424 SHA256 d91dc4a509ca50d1ba796ba1c4b23d5587f082d8a886856544546c88f4d9a685 SHA512 f6453585650db242ad4a176bbd468cc6069ee0941b6ea23f24fc32000778097d8a100de82eaad7b3d8d998dc153d25f537505c7eefcc6f98f37995cfc9d5be77 WHIRLPOOL 86c2eb318c9df8233847b5ded3370d77ed71fab22067f4fa039531d5a3df2ede463e1688d920401a0870e4359f18f8d765230c72e71be1458e5db14de153ad8d
+DIST distlib-0.2.4.zip 547411 SHA256 ee0966c613d04b19e425367b238c0a426ef34a43e1e0ffa6b16f781045d2a2a3 SHA512 03f9f9474578226e1a40a85a490aead3ec0509ba444856a263d4f25b3c86b5f919a3e18ff715a3a329d80a3f20a540b8c57a6e3dff55703c9cce730e2d021084 WHIRLPOOL 5dc9abf490bfccfc86c3092193d56963bef71a3f426f40b1e7dfdb9d2c45da7751488dff4213487e8a84871318a3379a7f122b1350f561cd7a195dd7ed7d45da
+EBUILD distlib-0.2.1.ebuild 720 SHA256 7c760a426869600ec5174577a068e15c40cc190edabddf6a67845a8ad8485a0a SHA512 ac1be4ba8cb1aa61a12f0abca4a4a07ae0923fbab36ddec91cde19026d7f2ca3935251c42bf0c5df0cb4e1c35832c1961df74c7131863c1a781e7f28ae331c5d WHIRLPOOL 95ad23c88c888681de52492564f133e2669805bcc2640f91032c325ea3ec2effb91ddb2c2afad1e2666496f3dc7cebf97da9e3072276e704ddb1d246a77471df
+EBUILD distlib-0.2.4.ebuild 1252 SHA256 36371b270a64d0bf378d885a3ff956a984bf320a2b4a0d498402f19853cf855f SHA512 bbe15c59a71efab4e5a9e5249e691d215ae24ad10666f60e9dd2914519a857d4ddf1e0d3699712670ccba6107470466fba2c1a9f8bae0205e954251dae2c1921 WHIRLPOOL a14fc32d1e769aebe49d71d7387fde3831fb88068c4f83458fb93b0f9ee9599334ba8d98469e6880a64209543f2f05e0c4cc60db7620ad90d12828b496a71c3c
+MISC ChangeLog 6453 SHA256 faecce24dae74a55220c237006b216da9ced703e21ddcd1179bd876709d67e63 SHA512 8931f52f4e7dbbc7ad2402cb054843cb41621e8ec3db8c7aff2a28608b05dd5f67566268c54ebe06e2beba17d84209914709b46d75fabff741d22859bb8a2b53 WHIRLPOOL 16f9d0366d5bf6cbc87df2fb16fd59d9ff25893b7ac8a5a4ce5b68d211a22864193ff554ac4c731fc8f01519527f13313d95944c8f6faa4f9f748ff2f7a5314e
+MISC metadata.xml 426 SHA256 cbd60016ebc93dcedc93393fe18a366ea8805441db94d01f3dabb2820b629f45 SHA512 08bab081b7287399834521ed7f3bad016a3c0be3b7b191875e23b4cb0577afc02ae9d553de80552212852ceb473a4ca424efecf226826eea80461a3fb028a36e WHIRLPOOL ebebf01999fa60907dd8cfc7a0eb9c910c5839d7e640ae8395322a05af043e21e6dd11e05524cc2e39b9ac5b17c8bf0eef377214966509835428bc135a6d1d13
diff --git a/dev-python/distlib/distlib-0.2.1.ebuild b/dev-python/distlib/distlib-0.2.1.ebuild
new file mode 100644
index 000000000000..60240223b527
--- /dev/null
+++ b/dev-python/distlib/distlib-0.2.1.ebuild
@@ -0,0 +1,27 @@
+# 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 pypy3  )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Distribution utilities"
+HOMEPAGE="https://pypi.python.org/pypi/distlib https://bitbucket.org/vinay.sajip/distlib https://github.com/vsajip/distlib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+
+python_test() {
+	sed \
+		-e '/PIP_AVAILABLE/s:True:False:g' \
+		-i tests/*py || die
+	PYTHONHASHSEED=0 esetup.py test
+}
diff --git a/dev-python/distlib/distlib-0.2.4.ebuild b/dev-python/distlib/distlib-0.2.4.ebuild
new file mode 100644
index 000000000000..81c0a6d1676b
--- /dev/null
+++ b/dev-python/distlib/distlib-0.2.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3  )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Distribution utilities"
+HOMEPAGE="https://pypi.python.org/pypi/distlib https://bitbucket.org/vinay.sajip/distlib https://github.com/vsajip/distlib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.2-unbundle.patch
+)
+
+python_prepare_all() {
+	rm -r \
+		distlib/*.exe \
+		distlib/_backport \
+		tests/test_shutil.py* \
+		tests/test_sysconfig.py* || die
+
+	distutils-r1_python_prepare_all
+
+	# Broken tests
+	# 1 fails due to it being sensitive to dictionary ordering
+	# inconsistency between code and test
+	sed \
+		-e 's:test_dependency_finder:_&:g' \
+		-i tests/*py || die
+
+	# Gentoo still doesn't report correct ABI
+	sed \
+		-e 's:test_abi:_&:g' \
+		-i tests/*py || die
+}
+
+python_test() {
+	sed \
+		-e '/PIP_AVAILABLE/s:True:False:g' \
+		-i tests/*py || die
+	SKIP_ONLINE=True PYTHONHASHSEED=0 esetup.py test
+}
diff --git a/dev-python/distlib/files/distlib-0.2.2-unbundle.patch b/dev-python/distlib/files/distlib-0.2.2-unbundle.patch
new file mode 100644
index 000000000000..5ee912905602
--- /dev/null
+++ b/dev-python/distlib/files/distlib-0.2.2-unbundle.patch
@@ -0,0 +1,35 @@
+--- distlib-0.1.9/distlib/compat.py.orig	2014-06-06 09:58:21.317560756 +0200
++++ distlib-0.1.9/distlib/compat.py	2014-06-06 09:58:29.955611427 +0200
+@@ -17,7 +17,7 @@ if sys.version_info[0] < 3:
+     from types import FileType as file_type
+     import __builtin__ as builtins
+     import ConfigParser as configparser
+-    from ._backport import shutil
++    import shutil
+     from urlparse import urlparse, urlunparse, urljoin, urlsplit, urlunsplit
+     from urllib import (urlretrieve, quote as _quote, unquote, url2pathname,
+                         pathname2url, ContentTooShortError, splittype)
+@@ -267,7 +267,7 @@ except ImportError: # pragma: no cover
+ try:
+     import sysconfig
+ except ImportError: # pragma: no cover
+-    from ._backport import sysconfig
++    import sysconfig
+ 
+ try:
+     callable = callable
+--- distlib-0.1.9/setup.py.orig	2014-06-06 10:19:13.971997156 +0200
++++ distlib-0.1.9/setup.py	2014-06-06 10:19:20.012034150 +0200
+@@ -62,12 +62,7 @@ distutils.core.setup(
+     platforms='any',
+     packages=[
+         'distlib',
+-        'distlib._backport',
+     ],
+-    package_data={
+-        'distlib._backport': ['sysconfig.cfg'],
+-        'distlib': ['t32.exe', 't64.exe', 'w32.exe', 'w64.exe'],
+-    },
+     cmdclass={
+         'test': TestCommand,
+     },
diff --git a/dev-python/distlib/metadata.xml b/dev-python/distlib/metadata.xml
new file mode 100644
index 000000000000..f095796ff078
--- /dev/null
+++ b/dev-python/distlib/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">distlib</remote-id>
+		<remote-id type="github">vsajip/distlib</remote-id>
+		<remote-id type="bitbucket">vinay.sajip/distlib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/distributed/Manifest b/dev-python/distributed/Manifest
new file mode 100644
index 000000000000..c52d39a8792d
--- /dev/null
+++ b/dev-python/distributed/Manifest
@@ -0,0 +1,5 @@
+DIST distributed-1.17.1.tar.gz 376088 SHA256 9c4f8b511ddb8d13851701deec1a15f64e75394dc6ae361fa8f6c41c9eeca0f1 SHA512 e3addbdd18165ca00879829e98993b5e5d466dfdfa9255a668725852256b2bc6bca80ca42c63744ef3988d66d61bfc43258a83e7445158733d511d27aa68c64a WHIRLPOOL f1a3526fcad512d0b78b64f03c3eb6cbde6f1580fb794819f80536e8778685ca02fa62bb0938e8c87a77be3cd92b6ed1ea55dbbacdbc5966a62664f059bf1546
+DIST distributed-1.18.0.tar.gz 395888 SHA256 eba0c3fdaf0ee460a052f8376caa2ae77b15e308ea0d1fd77240a451474d3d74 SHA512 3603b22a454c7010c64fceb79b4aa024476bd038f4c27585c8f2dd51a2e4ace1c900dfc7c3bf096d4274be985003b72e9bd16af7b351ec9a65c6712a1f5e39d4 WHIRLPOOL 9e3372c7e056647aa51f2f24dfeea9496b07f9d9e71a415f013aa5978fffad392d80b1d5bc9ef814d098505598a3c79a001a2b07d201db0b5dde74bd69cd6b82
+EBUILD distributed-1.17.1.ebuild 1294 SHA256 d3ae6a45fb83b124bfaf7c11c29459cec3f53fd549c646b51aba443ed6de1cfd SHA512 562b2c7df46655a93ed03217405cc45d8062b8e5ece3fa57d51c13dcf526f85285fc4d19de05e3cfa973c092d212a1c610ab9cdcbf1b2e1086cb0a8b92f087fe WHIRLPOOL 7a6786c3b2a3987b8f2fe056bc6e7e9bef1d43165835eac5226aef64deb93af49de52b8eccba1680d50e940e16895895e605a12afd726aa417a2e545e3c0a853
+EBUILD distributed-1.18.0.ebuild 1318 SHA256 ac0fba6521b3445c8b043c6fe6fcaa0fcba96d9d7a21807c07fc73fb9d7ca0ec SHA512 ffcdf66d5cea2b3c6178198052ccb6089c54fecba1b4f7cbff57177317314b78bb4e97e376f3f736238b52394ae350296b608fa14ab844f5ec6114e789f1fd26 WHIRLPOOL 2641c4a6ccf7e57dc7b61c0c7e20034080eb8f805e537725094d065d7f770f3988de73d3346ac0cf4260916892aab943ab98faa54e52fe59a356ab91b471d481
+MISC metadata.xml 511 SHA256 eb2fd49a61d0958346e887799377c0e153ac4dc1634c50f47b6f7ecfb5424d55 SHA512 b512481cca22a1dffd5620312825bdec9348b1a469be61874211dd25befb2111fab1ea79596087f5226b053a2ab660174508828d5300de9ff24119880995a296 WHIRLPOOL 5e5c6343d6582da397b5dc3dfb22f7a0701cd7cd56953c17542e7a86e44a075e3bd33ce6d4cdcf477b871767fcaadd7124fc463f56508b50319d59ddf5b36d61
diff --git a/dev-python/distributed/distributed-1.17.1.ebuild b/dev-python/distributed/distributed-1.17.1.ebuild
new file mode 100644
index 000000000000..0ed247fb69a0
--- /dev/null
+++ b/dev-python/distributed/distributed-1.17.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for distributed computation"
+HOMEPAGE="http://distributed.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/dask-0.14.1[${PYTHON_USEDEP}]
+	>=dev-python/joblib-0.10.2[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.7[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/sortedcollections[${PYTHON_USEDEP}]
+	dev-python/tblib[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.7.4[${PYTHON_USEDEP}]
+	dev-python/zict[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+	   ${RDEPEND}
+	   dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	py.test  -m "not avoid_travis" distributed --verbose -r s --timeout-method=thread --timeout=300 --durations=20 || die
+}
diff --git a/dev-python/distributed/distributed-1.18.0.ebuild b/dev-python/distributed/distributed-1.18.0.ebuild
new file mode 100644
index 000000000000..6c0ea4f46e0f
--- /dev/null
+++ b/dev-python/distributed/distributed-1.18.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for distributed computation"
+HOMEPAGE="http://distributed.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/dask-0.14.1[${PYTHON_USEDEP}]
+	>=dev-python/joblib-0.10.2[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.7[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/sortedcollections[${PYTHON_USEDEP}]
+	dev-python/tblib[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.7.4[${PYTHON_USEDEP}]
+	dev-python/zict[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+	   ${RDEPEND}
+	   dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	py.test  -m "not avoid_travis" distributed \
+			 --verbose -r s \
+			 --timeout-method=thread \
+			 --timeout=300 \
+			 --durations=20 || die
+}
diff --git a/dev-python/distributed/metadata.xml b/dev-python/distributed/metadata.xml
new file mode 100644
index 000000000000..f21b359c5020
--- /dev/null
+++ b/dev-python/distributed/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+
+  <upstream>
+    <remote-id type="pypi">distributed</remote-id>
+    <remote-id type="github">dask/distributed</remote-id>    
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/distro/Manifest b/dev-python/distro/Manifest
new file mode 100644
index 000000000000..fad14e818012
--- /dev/null
+++ b/dev-python/distro/Manifest
@@ -0,0 +1,5 @@
+DIST distro-1.0.2.tar.gz 27787 SHA256 77ec1f3695eed4dcda4e0e89d04dfcd91a20d3080d34f9294c5da47235382745 SHA512 df29ca40c1e7dd6e370396ceca684f5ce41fe50450faea104132d0e5dee05a91a525db715835c7efbca020e9c2e063bde9a6da07967eda6bfa8180856e175abb WHIRLPOOL 064c3ad4e0b82249a70dcb45d1b70ed3122209378fc83564060eeb815731b7454fa5952f794a4438a6f24b7cabfe6576c629598bc8f6f93ea2867a0f771856ee
+DIST distro-1.0.4.tar.gz 28772 SHA256 9b000b0d637bb0cbd130a7a4835681e6993e309a85564dfea9d884825fe46954 SHA512 466f2e14b169998e3ff7420e12bf270ad9f934962ae92c2d24bdd747897ad66cb348194dd1376b8b53ed298ea02039943c80d9ccc6b8a01c2bd0c6d2be82c7f6 WHIRLPOOL 61aac16fe7f4cf2ad6a28cbd45001424081dc5b931716883a7822318e06d189742651a3f7de09d7aeef1d792ffb7615dca4b3f2becd2b4f93a18fb0411467c11
+EBUILD distro-1.0.2.ebuild 464 SHA256 9f8dcbf646650773b5e7b8c005ecaa8932d32062cf4f120674f9aa184ea27bf2 SHA512 81cea1b6cd1b74144e0de8afab047065d5a7e3f61bdf5033f58c924441631294fcd2299f71a17dbed366585f59e540c6c5f3c1bd06f0c366b3d7417f8bb6b3f6 WHIRLPOOL 8f7de01592f19b420704e5320034738a80ffe77e1351bd0fbaa4fa9b7aad2ecb66567e5297be33af3413507ea915f0581b968a6ed5b0d25fe960b78757788558
+EBUILD distro-1.0.4.ebuild 584 SHA256 0d1ef62f841026e02e7fa70ea83d11c41313f3bf5c5b9e258ecba82cecbcd4e4 SHA512 d201207a85c964cf3e9f611ca57fbf7eab21301d78db413077e3f60ca072633a4c78583584fd740d0a4b186890f409df994913b3056ae535b8aee6ab8a8bf8c3 WHIRLPOOL 936b49af5382bfbffc51cd3e1697cfa19d585c47e5437957417ab503d58b60106d765035eefbac80862eb0b46bb0de6d94afabe2235d8deefeb05627f579a883
+MISC metadata.xml 813 SHA256 808db90a308e40a5eb35eb171a72df5c01de756617fbe59b373ab4b585019c65 SHA512 2d9fe5a2567f86d987d950a78d68f09ac45b1a50ff02d1f1c2849c381de1a5a2f164fd6850f427650789a0274af974e23c9b8ba7ef3b37c81ad653b3ba85e0b5 WHIRLPOOL d40657a782c3e7159d34f7cdb62bcab91928b635484177574a3ae6530ccbb93cc3fc19029d21205ea5f8287285d4c2f9413f77efa1266aadfe93b8e4577a26d5
diff --git a/dev-python/distro/distro-1.0.2.ebuild b/dev-python/distro/distro-1.0.2.ebuild
new file mode 100644
index 000000000000..eb08f5a4b8a5
--- /dev/null
+++ b/dev-python/distro/distro-1.0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Reliable machine-readable Linux distribution information for Python"
+HOMEPAGE="http://distro.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/distro/distro-1.0.4.ebuild b/dev-python/distro/distro-1.0.4.ebuild
new file mode 100644
index 000000000000..5953b7c8d536
--- /dev/null
+++ b/dev-python/distro/distro-1.0.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Reliable machine-readable Linux distribution information for Python"
+HOMEPAGE="http://distro.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+RESTRICT="test" # incomplete test resources
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/distro/metadata.xml b/dev-python/distro/metadata.xml
new file mode 100644
index 000000000000..ea74de39e0f3
--- /dev/null
+++ b/dev-python/distro/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+    distro (for: Linux Distribution) provides information about the
+    Linux distribution it runs on, such as a reliable machine-readable
+    ID, or version information. It is a renewed alternative
+    implementation for Python's original platform.linux_distribution
+    function, but it also provides much more functionality which isn't
+    necessarily Python bound like a command-line interface.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">distro</remote-id>
+    <remote-id type="github">nir0s/distro</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
new file mode 100644
index 000000000000..56588d127d37
--- /dev/null
+++ b/dev-python/dj-database-url/Manifest
@@ -0,0 +1,6 @@
+DIST dj-database-url-0.4.0.tar.gz 4015 SHA256 858312abb7b330ea875733a65806a36ad04d7b8451c6ce8835118a2fa10d6870 SHA512 eea9a095f135adf7a197db949cb1ca067ff920c73fe62f510da4decd92aad7e0051bbabee4b92f0848ffc23ce6ee87ddaf0fb284b0cfba78ba0e3b5a367cccf6 WHIRLPOOL ff56f7666aee983286a1faeabcbb4815e88857f1f10d2919963f7ac07b95916f363859ea22f284180e9828eb95e3a3c70c3e25eb614450c1ef0e463ee924a892
+DIST dj-database-url-0.4.2.tar.gz 4268 SHA256 a6832d8445ee9d788c5baa48aef8130bf61fdc442f7d9a548424d25cd85c9f08 SHA512 d18fe4e0cd4073689759c302c22e0f128d4ed1103af99a1db4dbe645fdea601837131a3f8d215143dabda64903aaeeb4706bd2082810f904cc8e74b564c5f2e3 WHIRLPOOL 08327f681e870c308a47f943be54a20c4c85cfc9c4c33f0d0473c96c31f55e7369621b601b98e94ff7318a7ffe47e77a75b02dc3546dc0831fe36d35c5d83aab
+EBUILD dj-database-url-0.4.0.ebuild 663 SHA256 c8bf61e17255ff0a625be1d5741ff6664a54925473f58f2f0450f2e7e14eaef4 SHA512 d5d02354864d9f3b55f00dff7195b50281b0956e2524da7b257c26ecc958cb26380aea392c5e815becaa989197c329ff1face7c7489200fc7fee05b0059b35c5 WHIRLPOOL ad8afc1c615c712ed8e93eeebe45c85e8c1e6e7d4dcca4df574644cccdce0dd90b59457ac95666e0099d9a39c721b640bdb3249e86ad1946378d3552bc0a3d47
+EBUILD dj-database-url-0.4.2.ebuild 666 SHA256 62b3e7d13c0f9c9fd997a6d957e66149e57d683ee9712525ee019ffcc9db88d1 SHA512 8404b8088cdf20c64a13c89240a860e0d0d7fd0b804c8cf36292d7574601d2fce00d80b81bc83dd241088d1d35b64fb384eea8fccf5d7de82716c7a17c2781bd WHIRLPOOL 5cc3b7c951c0d3b3147b84b508c94423ab97a5da3527fb9389ca1a6d1892ebb13f5885dcb31147fc3766ac8e3a017df6698f19fd0bbf0bab4c3d8a1a3b175390
+MISC ChangeLog 1626 SHA256 020e01068825e38baf4d9f5d9021211f11efed78dedd8a6a517ffe73a8f74336 SHA512 e2e2eccefc73d6c9a38b1c588a2d8c7b0b5d0929626734424590e956eca2fb83309b578212f29d67adbd5bed0df5c4aab49c2435ef9b70d603df4baf31ff3b8d WHIRLPOOL 848f7c31d5b47fa7f33d84941ec7995e2d3af9f3721f69dea0016fb9758e41e89916660a492b9eee50f34db9e1f9b7a3de647230ae1e3db715b67c2751b5f283
+MISC metadata.xml 398 SHA256 4ebaede6e3baa790eddaa937c70e829bb27db2ff66f928ea86826ddced4e8856 SHA512 c89283a38f9c6f8ac3cae38a7defbdfb1c5b9dc06f31ed8073fb12d879828976a57d4019a6bba5e7af74a19e9088ced1ca03e585d52c45cca67caac2839b64af WHIRLPOOL bec5c95f5e6e73ffd35a21bcc7b7bce5b2cce496b511748b50ee59a7ee2f9ecd1e84feb82c452e0a46ff56a5496cc4a0b6a705858d1757701c2c8fbc78ae569a
diff --git a/dev-python/dj-database-url/dj-database-url-0.4.0.ebuild b/dev-python/dj-database-url/dj-database-url-0.4.0.ebuild
new file mode 100644
index 000000000000..e0e150c7805d
--- /dev/null
+++ b/dev-python/dj-database-url/dj-database-url-0.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Use Database URLs in your Django Application"
+HOMEPAGE="https://pypi.python.org/pypi/dj-database-url https://github.com/kennethreitz/dj-database-url"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# Not contained in the tarball
+RESTRICT=test
+
+python_test() {
+	"${PYTHON}" test_dj_database_url.py || die
+}
diff --git a/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild b/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild
new file mode 100644
index 000000000000..f48d5a01d1fd
--- /dev/null
+++ b/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Use Database URLs in your Django Application"
+HOMEPAGE="
+	https://pypi.python.org/pypi/dj-database-url
+	https://github.com/kennethreitz/dj-database-url"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# Not contained in the tarball
+RESTRICT=test
+
+python_test() {
+	"${PYTHON}" test_dj_database_url.py || die
+}
diff --git a/dev-python/dj-database-url/metadata.xml b/dev-python/dj-database-url/metadata.xml
new file mode 100644
index 000000000000..8dd62fb8e9c7
--- /dev/null
+++ b/dev-python/dj-database-url/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">kennethreitz/dj-database-url</remote-id>
+    <remote-id type="pypi">dj-database-url</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-annoying/Manifest b/dev-python/django-annoying/Manifest
new file mode 100644
index 000000000000..ae0530906ef2
--- /dev/null
+++ b/dev-python/django-annoying/Manifest
@@ -0,0 +1,7 @@
+DIST django-annoying-0.7.7.tar.gz 7277 SHA256 498ba1ab00da56b939772913f7d5b3a29997990b63518acfa5305e8bf03fed7b SHA512 37435fb08110bc0e06a2a8b35d4f45d96d7fed3c03b87a541fcd96a76ed2e36281f1f7632654f3f5f64597203097ac7b5def1e8dc32e500e973fd81686a208ab WHIRLPOOL 14df887e05b9d1d47f80982a89ab719a2244dc38fa02ec9f0666484d79923ad7a1df047e261b5f70be8b408df30def2f70b9ca93ab7637278b5302e1eeb5e2f9
+DIST django-annoying-0.8.7.tar.gz 10170 SHA256 dd15478a686c64edd1829d2f2c0f1203167c1670fc19da0bbe101b0343913f9a SHA512 4654083ef0076837bc2cacec82c51faa3746cfb2f27002692c7552079e0f0e8d59e064ec4119366e0c452c102309513ff8bf12ec5d9785485e580b989c96517a WHIRLPOOL c76db9e2e50a26b7bf3c2e2d8099066cef8d40681b1544479d0a3ba9a10de08994a90ac21cfb8292482735f7bb20d81fba40228a34ad7818ff9428c0f11fe683
+EBUILD django-annoying-0.7.7.ebuild 533 SHA256 1c84f855b6913c589df082b79d89df49275d9f23cbe8edec350734fe79a73cca SHA512 915deae29cb39d2f3c987b32eb305c56cc6c535c764ffcd7b506e751af00746822f46ddd3dbe31bf4198c604ed86cf0192c72b8933eb7d7594753ec758741552 WHIRLPOOL 76d29d2f9323b6bb8f35fd5beef305a1448fe0ad24f07a181a9f7a5ec9aa92e74bf4069388a346eeb93864c1eca26d35b984fd28c77fff97905f16726e60be9e
+EBUILD django-annoying-0.8.7.ebuild 535 SHA256 54a7f2aa9e4caac3b190da674ee01381bd1a688be921a39879bca9df819ed5e1 SHA512 fc04c8cda1672b88701773bf5362fc49ff16d505ff93f6ed0a14b5603d61a86ef8c11533da2c5f85105b1ac3574675564478846cedc3b7d04ba98dec2fe13a89 WHIRLPOOL 39fabb7b35f1ca05954519544a7eeb87e62a30e97309c71548dec4865931b288d1ef2f532c0ee2a6c9250cd3f526967ac1e8e921ea041a0475460bf659db943e
+MISC ChangeLog 2979 SHA256 d7491b4560b8d67a0b6ce4cd42208d0bc6136eeca65d51c7b37e3220af341d3c SHA512 af7357583c42fb5f350c9ba4ca36c76b6b31f33b2085d3cbcedacacfb7bb58d2d25cbbf9d30cc606313ad50560afd735bdcc5ef28106cf849f05c59bd8d3381f WHIRLPOOL a91a7c088450f7b279864e640d03aa5d8475bb47a1fd0c373c614b16e775af57bf8112f17e1bdd7dd8fa0f5f151aa3f77effb4122a58bbe7a014944df8e94e0d
+MISC ChangeLog-2015 1836 SHA256 bb10adae15e432ecd348b5e5418ddb5ebd361892f2fdcd6eb17ceea4afe74078 SHA512 9af9821232d8b6c69e203b792e5522b485e10c313f8b3931b718a3261061fd652e31b1c9c0613568caf1ba5971549634612aea8dd20f20ced7235961a830bd58 WHIRLPOOL 3ad73a6ed342b950950f11ee9c9a6688bf0507fcd7498a5526782ef45320f46930ebd9316a4f9aff53f5bff4296321e15eda0295ddf5e6a9594044c071b75914
+MISC metadata.xml 396 SHA256 c2676d815dfe7c644af8896ccf5b043825d3f0d2f80de1c0ec9b948b884b5759 SHA512 55f423f46170c6f1ba1f3c611be68d643f5b4edb516f48c6e4be714a36fcb02beae3500d668074ecf6ee948109fc739c05ba5f2ea4600e96d6e52bf099747dff WHIRLPOOL 38d582ce9d5d8bb7ce8fd0007bd1a572ebb6b69e4cb173ff84478cf71dccc07638a87cd26af6f178f86ba0a477e186c930d47332fa74089de8da982fd5d1a17f
diff --git a/dev-python/django-annoying/django-annoying-0.7.7.ebuild b/dev-python/django-annoying/django-annoying-0.7.7.ebuild
new file mode 100644
index 000000000000..3113dc08480c
--- /dev/null
+++ b/dev-python/django-annoying/django-annoying-0.7.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="This is django application that try to eliminate annoying things in Django framework"
+HOMEPAGE="https://bitbucket.org/offline/django-annoying/wiki/Home"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-annoying/django-annoying-0.8.7.ebuild b/dev-python/django-annoying/django-annoying-0.8.7.ebuild
new file mode 100644
index 000000000000..dc41a21b36e0
--- /dev/null
+++ b/dev-python/django-annoying/django-annoying-0.8.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="This is django application that try to eliminate annoying things in Django framework"
+HOMEPAGE="https://bitbucket.org/offline/django-annoying/wiki/Home"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-annoying/metadata.xml b/dev-python/django-annoying/metadata.xml
new file mode 100644
index 000000000000..7895a89f5bed
--- /dev/null
+++ b/dev-python/django-annoying/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-annoying</remote-id>
+    <remote-id type="bitbucket">offline/django-annoying</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-appconf/Manifest b/dev-python/django-appconf/Manifest
new file mode 100644
index 000000000000..4dbc9dbe6c11
--- /dev/null
+++ b/dev-python/django-appconf/Manifest
@@ -0,0 +1,8 @@
+AUX docs.patch 713 SHA256 6d1b5078bb1b75e92a996a051d15f48ddef34253546dce8c7b2000e6627dbda4 SHA512 af930dfca53b0353c7d0af3671a924174b5c2d6dbf3da299a77dfd603e2a510724024e2d6b1d51cb2ad6d7edff3f1bef0813b7f12af1d7628f022e3ee4667996 WHIRLPOOL 55308fbf2e435a17be35a48ab0f10e64ac6c0db3ed0b9c2d8cbb69568d19f3bae64b31de02894d5b6411161989d29ca1eceb7d7cdcc70b69cc43b5ca2dc4ff1b
+DIST django-appconf-0.6.tar.gz 14072 SHA256 d3f4bcabcb3a9559775c5f4e94cef47f936b1df63703542bc8d912637452e75c SHA512 d2a4aea07eeabdc32ed85cf0625702f3e7861b82d1e47660f3761dedff42a3bd3bfcc54dc3d46072758bea1a34af160f7a908bf0925c05b7409f1224f4a7245d WHIRLPOOL f357a26a28476048ce97a1b85309c87382e750bb1ff9ea8552e194423e815b8945da5367200872096ede6177133094314e9a4a4ca4c5a058b273ab46aacb5091
+DIST django-appconf-1.0.1.tar.gz 16743 SHA256 ba1375fb1024e8e91547504d4392321795c989fde500b96ebc7c93884f786e60 SHA512 b6075bed0372f7f9da7c7af49124a08a2d119533ea15b284529166bcc09e61a541ce179a696dd426a9323ea1874c219880869ef7934345f4d40b1b3201eb2c6d WHIRLPOOL db6d03024b25442a3db71163f6c130c504756a52cf8454f38e4f0c4667c3e4a147b65f0b679a8300f83fd9aecdf1d5f35cb1b1879c988dd5536ab5976ddcb1c0
+EBUILD django-appconf-0.6.ebuild 1203 SHA256 ef04edca5b123048880b1e94a5b68c01e6a6488fdb813444f279284d4419dea3 SHA512 bacb1748c0bba3e98c3ea70cea1e31ccba8bebd90b86e29cd112845b5b4c5c6f05bdda5001ba3dd150d34234b5a25aed6e6f2dd484e0e8dc9a6a2359e899a9ad WHIRLPOOL 063b0521fcae14acc78474e1bae4be52cda29ea774589a7e7a044a1911f698f12b40298974141d97285ad2c95e9bde9845f7600a453a97365ab964293d8b0108
+EBUILD django-appconf-1.0.1.ebuild 916 SHA256 9b960ad28cb036496d67d5d3de0885a1da36c421c597b0c73991fdd640ba8205 SHA512 1329a248e4818466539a59a1714ae067a360ca06746c9c58703d267c883d3e8a4d253564b0b31b079c63933c43c4a02c20ad8ce23e0e75ff6b4cd54bdb7ce322 WHIRLPOOL ed2d66d6a4a947955ca359405e1e64e782a9905e26fbf50b8e22e4a5e4c7a1dd3b54ff448ab272aa79b1f9b0dfd339b03ba74a8bdfe1eddc0c37db066f3b4c84
+MISC ChangeLog 3123 SHA256 035efdcab940ffd0ec4455615618961cee6380c3069f4860011f83954c47d674 SHA512 9b182bcd95898f169ac4604854714683cc8ce6769edcff3864276e4ec7bdac9c483ad02bca1daf65030116867ae946098bc6b61e479e82465a2bafb19f2e62dd WHIRLPOOL 22f0cc863d416ebc3a549e6f481e85450719bc942b04fc6e4998c7deefd944ce5e38bfc13652aa123778f35f0a1641546596df8c69ea3999d3fab033a60e16f2
+MISC ChangeLog-2015 2056 SHA256 3f92c3e6d17c4c40cbf571babbbb2a607c2377fae486d4059c806abcab18e56f SHA512 e11aa60d741143226a99f69523626877d8e1b3afa13f91847ac4e4569e8381ec4b69851b3852dc05797c7cee551796a54d8cb23b740cefac4993f7b8958d5a3c WHIRLPOOL cc5e4925a3eceef452994145c761f2c54b3112b41bff45648cbb3f218c1704c158841d390ce01d13d223a430f8c9d80ab1d6dab9d0e770a1850ee3122a364556
+MISC metadata.xml 390 SHA256 bf80ef8417a70f48a6ec85f34bb88067660ca16c008550dfab69b7e26613ba87 SHA512 2fe634938c78aa61b5d8f2bbe6e5ef4144a5d15c3e7c91691048427fa604cfe7229b924a0196d5d95488ffaea568a4a4c218056ebd010a36ee2f6b339785c66f WHIRLPOOL 9d441e50cc9237a7566e0ec333ca31846c882430aea153d8094d72f8ee1a72f4defe026cae34b8e920af841bf63d7b68513aeec351a6f167084110310241cef6
diff --git a/dev-python/django-appconf/django-appconf-0.6.ebuild b/dev-python/django-appconf/django-appconf-0.6.ebuild
new file mode 100644
index 000000000000..864e276edf86
--- /dev/null
+++ b/dev-python/django-appconf/django-appconf-0.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A helper class for handling configuration defaults of packaged apps gracefully"
+HOMEPAGE="https://github.com/jezdez/django-appconf http://django-appconf.readthedocs.org/"
+SRC_URI="https://github.com/jezdez/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND=">=dev-python/django-1.4.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/django-discover-runner[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/docs.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cd appconf/tests || die
+	set -- django-admin.py test appconf --settings=appconf.test_settings
+	echo "$@"
+	"$@" || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-appconf/django-appconf-1.0.1.ebuild b/dev-python/django-appconf/django-appconf-1.0.1.ebuild
new file mode 100644
index 000000000000..92c6bd9ff805
--- /dev/null
+++ b/dev-python/django-appconf/django-appconf-1.0.1.ebuild
@@ -0,0 +1,36 @@
+# 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
+
+DESCRIPTION="A helper class for handling configuration defaults of packaged apps gracefully"
+HOMEPAGE="https://github.com/jezdez/django-appconf http://django-appconf.readthedocs.org/ https://pypi.python.org/pypi/django-appconf"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/django-1.4.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	"
+
+PATCHES=( "${FILESDIR}"/docs.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-appconf/files/docs.patch b/dev-python/django-appconf/files/docs.patch
new file mode 100644
index 000000000000..4b5d4861adfd
--- /dev/null
+++ b/dev-python/django-appconf/files/docs.patch
@@ -0,0 +1,16 @@
+Prevent unwanted d'loading of un-needed oject.inv files in doc build
+diff -ur django-appconf-0.6.orig/docs/conf.py django-appconf-0.6/docs/conf.py
+--- docs/conf.py	2013-01-29 01:45:50.000000000 +0800
++++ docs/conf.py	2013-05-18 21:40:38.737985957 +0800
+@@ -218,11 +218,3 @@
+     ('index', 'django-appconf', u'django-appconf Documentation',
+      [u'Jannis Leidel and individual contributors'], 1)
+ ]
+-
+-
+-# Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {
+-    'python': ('http://python.readthedocs.org/en/v2.7.2/', None),
+-    'django': ('http://django.readthedocs.org/en/latest/', None),
+-    'celery': ('http://celery.readthedocs.org/en/latest/', None),
+-}
diff --git a/dev-python/django-appconf/metadata.xml b/dev-python/django-appconf/metadata.xml
new file mode 100644
index 000000000000..67f844e48386
--- /dev/null
+++ b/dev-python/django-appconf/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jezdez/django-appconf</remote-id>
+    <remote-id type="pypi">django-appconf</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-auth-ldap/Manifest b/dev-python/django-auth-ldap/Manifest
new file mode 100644
index 000000000000..5407de2ccb9a
--- /dev/null
+++ b/dev-python/django-auth-ldap/Manifest
@@ -0,0 +1,8 @@
+AUX docs.patch 697 SHA256 fbf3dffdd07c6844b496599647d21ee08978548fd45d309cfa00367cfa6a4587 SHA512 e9f0607d6f770d451c53e851d6141cd0cdd63ee59e654eab0c3454b9f724f36086115760614470dd42e8f8afc63b018bd695cd596d2ac71530e4a5eaab379779 WHIRLPOOL 797a4983fadae766f33332fcb7236f78135fd5090b153900477897be67f86d218a1e56b5c7c9778095bd2e3679ab0b063d97a385ffb92c726ee13285d574d4bc
+DIST django-auth-ldap-1.2.2.tar.gz 131086 SHA256 faa067b073f6ea73c1ceeb5e244187ae1b3cf4ec79846ff366fa996428434264 SHA512 676d1114faeb9a2956ed51c586afea7618c1bf62867d3525596599391f8327b8f22a075c4203311df88279c317ca37b9097b59e55a64330afee6eb1c5a9c9ac3 WHIRLPOOL ae84405b4855ad9701244ab6cbd5e5154d2e173e04896c27e0869680bb4e030b6847293bcc59ef4f7f56969778c7d403721bae0d7099e2f3724186908c7abbbd
+DIST django-auth-ldap-1.2.7.tar.gz 131431 SHA256 ff6af43d5429fbd918f62c25a07e2bff916b053b46990c1b60e60de63d5f3f80 SHA512 2ca29bdceb4b2540f7c90c9dfdfd7a02f91e72cd44ae062cebff84199dab737ee69ada56269189ec0dd70ee7916c3373acba50866280ad080c4c68dd69dffb09 WHIRLPOOL 785f1155e03f80e1c84f62bd565455c079ccf326210ff45c5597d7ac344e362b54ffb4196b1bbbdb5568a1288c053ae0dc2531489c33da95511323ea345be399
+EBUILD django-auth-ldap-1.2.2.ebuild 1098 SHA256 3e93ed555c8b0d163aeaabe8d5213bc3440f13421bdf2e7c742c81c96ddad87b SHA512 4134787e88469787de32e760c3a371f8e21e8e828ea85cf02b7942033da7801069f60f9ae85ee17c2ba19de294d3a8fe427ba5f25efc5111d0300594a2c14c34 WHIRLPOOL 5ca19a29c0260058181862aecf2975143c999bc5936afcd4e9a8e8e37e7e95fb3bebffda25000db7fd754a254948532be11faf186aff617cc6d150b7f78f7198
+EBUILD django-auth-ldap-1.2.7.ebuild 1056 SHA256 4c7d04d54a06a9eb3b13100961d8f0f1f6c896e7c59ec453a197000fd233561d SHA512 bb5c58793991539be1307f22b3fcea3089926929906a53097faca50cd8058fa1b0e2dd85f791f12b7b75224ea6bde2234b472f77c22166170e9e289bce5cdc2a WHIRLPOOL 8b541bf86e5cfb9d6d7ebee903ca24769d7cb18081af93875545e42382ab7eaa1fd2a674813757dec2412873fcaf89474543b627ac1c5bc152d10953a0c908fa
+MISC ChangeLog 3083 SHA256 c40c913494f680dbd12f313b820d0e711d9d7d3ef9119a5e840209d0127b6430 SHA512 5be47242f1735d1a3844c54445d70b58353647329cbc95bf3a22c9b87e229b14cc3f0743aa018c33d11196f8160cb707154ce6291d30566b555832d7a2eed29e WHIRLPOOL c58015ca25fc7c5bcd7840a2ef57a099b2307081334c89a03064741b143d305af7a5f563ff057acd8d87198c314a4b79652743911323b225a58c3283f3e66b6b
+MISC ChangeLog-2015 3425 SHA256 680d23c37b8aa8da5c55e86d0f060dbd21cfcafb99ffb8d89a5c8ccf3377b44d SHA512 124ba96ff2f5f1c8d0ceca8ba0fc240914c6be9fe80e37b8ed9a0d4ca23a1772aeed6736738816d201574a9389f867ea383f4ba308c222f9c5a82af993211a1c WHIRLPOOL 31e406feb35f4d1735e4667debf1c2270f6500968c25c11bb690a169300a97c26caba77e7294663d85eb4487b6bc89594c80288a2e52fc20e6759c6dbcd940e2
+MISC metadata.xml 398 SHA256 a1cec17ce077f5b772ef71c003146b4ffd9e8d4f42f89463e9656447458e571e SHA512 e3350f6ab3d2c07965eb2c6ba1d82a929bea8e9974d8a2cdc12acde88aab50f2c20105e90e847a23e5dea5f97a7ab6a7a0c9eb75e193eb90ea5453c53eb36d41 WHIRLPOOL 032abebdfa6ab809dcda3ecf94fa89d3f876f9e61ad86c48689f2d8087ab4aa2604ecbe202987aca499eb01a9da8b284a43a4d4658994cf75a56686c23ee2768
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild
new file mode 100644
index 000000000000..017e164fbb9a
--- /dev/null
+++ b/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+# Although setup.py claims to support py3, python-ldap does not
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Django LDAP authentication backend"
+HOMEPAGE="https://pypi.python.org/pypi/django-auth-ldap https://bitbucket.org/psagers/django-auth-ldap/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]
+		>=dev-python/python-ldap-2.0[${PYTHON_USEDEP}]"
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/mockldap-0.2[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+#S="${WORKDIR}"/psagers-${PN}-80379ce59e6b
+
+PATCHES=( "${FILESDIR}"/docs.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH=. "${PYTHON}" test/manage.py test || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild
new file mode 100644
index 000000000000..f19cc7804088
--- /dev/null
+++ b/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+# Although setup.py claims to support py3, python-ldap does not
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Django LDAP authentication backend"
+HOMEPAGE="https://pypi.python.org/pypi/django-auth-ldap https://bitbucket.org/psagers/django-auth-ldap/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]
+		>=dev-python/python-ldap-2.0[${PYTHON_USEDEP}]"
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/mockldap-0.2[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/docs.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH=. "${PYTHON}" test/manage.py test || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-auth-ldap/files/docs.patch b/dev-python/django-auth-ldap/files/docs.patch
new file mode 100644
index 000000000000..c4e918fac538
--- /dev/null
+++ b/dev-python/django-auth-ldap/files/docs.patch
@@ -0,0 +1,18 @@
+Avoid unwanted d'loading for un-needed ojects.inv files
+diff -ur django-auth-ldap-1.1.4.orig/docs/source/conf.py django-auth-ldap-1.1.4/docs/source/conf.py
+--- docs/source/conf.py	2013-03-10 06:01:09.000000000 +0800
++++ docs/source/conf.py	2013-05-18 23:14:35.761187583 +0800
+@@ -29,13 +29,6 @@
+     'daldocs',
+ ]
+ 
+-intersphinx_mapping = {
+-    'python': ('http://docs.python.org/', None),
+-    'django': ('https://docs.djangoproject.com/en/dev/',
+-               'https://docs.djangoproject.com/en/dev/_objects/'),
+-    'pythonldap': ('http://python-ldap.org/doc/html/', None),
+-}
+-
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['../_templates']
+ 
diff --git a/dev-python/django-auth-ldap/metadata.xml b/dev-python/django-auth-ldap/metadata.xml
new file mode 100644
index 000000000000..cff59c60de52
--- /dev/null
+++ b/dev-python/django-auth-ldap/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-auth-ldap</remote-id>
+    <remote-id type="bitbucket">psagers/django-auth-ldap</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-baker/Manifest b/dev-python/django-baker/Manifest
new file mode 100644
index 000000000000..1e8b393d9b46
--- /dev/null
+++ b/dev-python/django-baker/Manifest
@@ -0,0 +1,7 @@
+AUX django-baker-0.11-py3-backport.patch 2127 SHA256 6ad6ff8459547917723d82a9ef469fd5e993dca88543954788eb5d516efb6f8b SHA512 bc5785df9258579b3f583f4573e8907f5794f2a09576e91f770fe2e19b74043db1068c493cf0c0d7f448a4d1cbc7774187b474dd3d3c1cf80a1a68e2d4d77c54 WHIRLPOOL 75fcf909cd457e3cd3ca9d77e91926f637e8099547aa980c2e56569511372ab4e13fdd3ad563c55521da89f0057d8dd0440635c8e50bb587413f79afbdbd6984
+AUX django-baker-0.11-py3-iter.patch 1820 SHA256 3f38e4539ab2e87cefec42649a92778fa5b441e0c8cfe579ac7c10763584ca72 SHA512 d20fbb4ae9de91c3af36a902a5600f3f4dbaae82e7c33285f157fc3a40cc416e3fd2ce0a453e6138d7381fdbe1834694eacb2214a49b9528dc0c8b26e5ac5f47 WHIRLPOOL 61c75a1a52ad9d6ef8545f30ce88c69db884b9f9748d590ce30ba7b291be8296a94e4a067a09fc2a7a97610951b39c5a2b650993a646c3a2fcf6da51b3c74805
+DIST django-baker-0.11.tar.gz 14920 SHA256 b656577f8234529374251ccf760a0e3e4cda613ea4a19ee17ae87647aeefc364 SHA512 98a64efec8a0cabe9c4091852f3dcbff95007c0ff2020b782f73ab6cc5e3d73cd52356546f1f64b55a69fefdf8f053d95d604584831cf07cb1b8037446892439 WHIRLPOOL 8feddec1f8dd57bdbfe7632c0da998ddaabdc0fb4711a84d9a31b1f0c4db15282311d41db323549a15fefebc41bde605b6f9052c215d756f56968c432529f33a
+EBUILD django-baker-0.11-r2.ebuild 602 SHA256 da7d74c014f0b85c39e69f750d192f3e1d062b88f0048457e740ba63acbf1fd4 SHA512 98b90447b36d917a39a9dc3a6a1adf6c1144e498378a00d9f7e6cff88a4041392125c3f2ec97af55f7f049bf5ee30375bd472411d1cfb87d149a50276c19bbdf WHIRLPOOL 89e18a60761ad49a658bff220a965ff578d44abea1aff067f37fe1e25fc2f156a42f92000a87d4ad59e9eafe63e6d47482aba68abcf885096ed8761ecbc1f469
+MISC ChangeLog 2811 SHA256 aa41645114e66d4f1adda22a73173b6e40deda891ac9286e9c8199ff36898fe6 SHA512 c37a33f703319418dea93a0afbd15ea4c5600047a1e8ad3d50f2caa2ec79d4244ac6d355592083b602092e16e2f625c49f183762aa5b9f54522d36290a943fc5 WHIRLPOOL 68ab173bebdb2102323b3255d5531097088ab225314fdd704eac357bb89719771cedd412216a706e5424418e34b8773dfa38ad99e9c5de7e41d4f44bd25f7ebf
+MISC ChangeLog-2015 1095 SHA256 3e9f039b826350935e31e9e59435fb4b878a52b3b4d09dfa00e1fcabaf087c07 SHA512 bb916b7103da9701f466baadf089b686172eb86081d821009290418ebf90c9451bc1b5b739a811a02e19fd56f99d9b98020ab09095145be8f686f4257f4c1497 WHIRLPOOL c6391ee7f99c0c8367655668bda5ac0e87546ba329fc7d384bdc0526ccab694aa0af5977c676f9c308741a0698511ab7907823d12a178da751e7e0a6cf56a2ad
+MISC metadata.xml 390 SHA256 6a1f0aae52cb3f058a6549d976b4503587f6b26ebd29d673d0966b1337bab690 SHA512 e36e22cfded440f5e241ac9ea3a4c1cc5a47155355001f5979dee66fc84618edc8c139ad7126d44a427f45e82c2fea5cc6d458ec01e6f1fad2d2c83eb94ed68c WHIRLPOOL 197b4b2bedcb541a7fe6b970ef515fad40cd28b025dc990e1dc3da3f278f3a333fe4e0d679fa9bd97f190ab1de2032ca1ae7d49afbdf77ae60cd214a7b69aefe
diff --git a/dev-python/django-baker/django-baker-0.11-r2.ebuild b/dev-python/django-baker/django-baker-0.11-r2.ebuild
new file mode 100644
index 000000000000..cd08ed5ad5f8
--- /dev/null
+++ b/dev-python/django-baker/django-baker-0.11-r2.ebuild
@@ -0,0 +1,22 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Management command that generates views, forms, urls, admin, and templates for models"
+HOMEPAGE="https://pypi.python.org/pypi/django-baker https://github.com/krisfields/django-baker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py3-backport.patch
+	"${FILESDIR}"/${P}-py3-iter.patch
+)
diff --git a/dev-python/django-baker/files/django-baker-0.11-py3-backport.patch b/dev-python/django-baker/files/django-baker-0.11-py3-backport.patch
new file mode 100644
index 000000000000..b2bc42859c2f
--- /dev/null
+++ b/dev-python/django-baker/files/django-baker-0.11-py3-backport.patch
@@ -0,0 +1,50 @@
+From baf971a58d310d6d3bfe7ddea81b33c810e3d3cf Mon Sep 17 00:00:00 2001
+From: Tim Kamanin <tim@timonweb.com>
+Date: Sat, 21 Feb 2015 18:42:45 +0100
+Subject: [PATCH] Added Python 3 support
+
+---
+ django_baker/bakery.py                   | 4 ++--
+ django_baker/management/commands/bake.py | 3 ++-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/django_baker/bakery.py b/django_baker/bakery.py
+index ff04ef3..7c0cbc2 100644
+--- a/django_baker/bakery.py
++++ b/django_baker/bakery.py
+@@ -4,7 +4,7 @@
+ import re
+ from django.template.loader import get_template
+ from django.template import Context
+-
++from django.utils.six import iteritems
+ 
+ class Baker(object):
+     """
+@@ -16,7 +16,7 @@ def bake(self, apps_and_models):
+         """
+             Iterates a dictionary of apps and models and creates all the necessary files to get up and running quickly.
+         """
+-        for app_label, models in apps_and_models.iteritems():
++        for app_label, models in iteritems(apps_and_models):
+             model_names = {model.__name__: self.get_field_names_for_model(model) for model in models}
+             self.create_directories(app_label)
+             self.create_init_files(app_label, model_names.keys(), models)
+diff --git a/django_baker/management/commands/bake.py b/django_baker/management/commands/bake.py
+index e602345..f7dc16a 100644
+--- a/django_baker/management/commands/bake.py
++++ b/django_baker/management/commands/bake.py
+@@ -1,3 +1,4 @@
++from __future__ import print_function
+ from django.core.management.base import BaseCommand, CommandError
+ from django.core.exceptions import ImproperlyConfigured
+ from django.db.models import get_app, get_models
+@@ -51,7 +52,7 @@ def get_selected_models(self, app, app_label, model_names):
+         """
+         if model_names:
+             try:
+-                print app_label, model_names
++                print(app_label, model_names)
+                 return [get_model(app_label, model_name) for model_name in model_names]
+             except:
+                 raise CommandError("One or more of the models you entered for %s are incorrect." % app_label)
diff --git a/dev-python/django-baker/files/django-baker-0.11-py3-iter.patch b/dev-python/django-baker/files/django-baker-0.11-py3-iter.patch
new file mode 100644
index 000000000000..a2902b8f487d
--- /dev/null
+++ b/dev-python/django-baker/files/django-baker-0.11-py3-iter.patch
@@ -0,0 +1,42 @@
+From c6c856c999cb9a9ce4ec8ecee714da7f6719019d Mon Sep 17 00:00:00 2001
+From: Matt Clement <mclement@savantgroup.com>
+Date: Tue, 3 Mar 2015 14:57:41 -0500
+Subject: [PATCH] Switch iteritems to items for Py3 compatibility
+
+---
+ django_baker/templates/django_baker/__init__urls | 2 +-
+ django_baker/templates/django_baker/forms        | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/django_baker/templates/django_baker/__init__urls b/django_baker/templates/django_baker/__init__urls
+index 1baf063..d6c9bec 100644
+--- a/django_baker/templates/django_baker/__init__urls
++++ b/django_baker/templates/django_baker/__init__urls
+@@ -1,6 +1,6 @@
+ from django.conf.urls import patterns, include
+ 
+ urlpatterns = patterns('',
+-{% for model_name_slug, plural_model_name_slug in model_names_dict.iteritems %}
++{% for model_name_slug, plural_model_name_slug in model_names_dict.items %}
+     (r'^{{ plural_model_name_slug }}/', include('{{ app_label }}.urls.{{ model_name_slug }}_urls')),{% if forloop.first %}  # NOQA{% endif %}{% endfor %}
+ )
+diff --git a/django_baker/templates/django_baker/forms b/django_baker/templates/django_baker/forms
+index 1f55c86..a21234d 100644
+--- a/django_baker/templates/django_baker/forms
++++ b/django_baker/templates/django_baker/forms
+@@ -1,7 +1,7 @@
+ from django import forms
+ from .models import {{ model_names|join:", " }}
+ 
+-{% for model_name, model_fields in model_names.iteritems %}
++{% for model_name, model_fields in model_names.items %}
+ class {{ model_name }}Form(forms.ModelForm):
+ 
+     class Meta:
+@@ -36,4 +36,4 @@ class {{ model_name }}Form(forms.ModelForm):
+     def save(self, commit=True):
+         return super({{ model_name }}Form, self).save(commit)
+ {% if not forloop.last %}
+-{% endif %}{% endfor %}
+\ No newline at end of file
++{% endif %}{% endfor %}
diff --git a/dev-python/django-baker/metadata.xml b/dev-python/django-baker/metadata.xml
new file mode 100644
index 000000000000..42030f97281b
--- /dev/null
+++ b/dev-python/django-baker/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-baker</remote-id>
+    <remote-id type="github">krisfields/django-baker</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-celery/Manifest b/dev-python/django-celery/Manifest
new file mode 100644
index 000000000000..08d7a28305ca
--- /dev/null
+++ b/dev-python/django-celery/Manifest
@@ -0,0 +1,5 @@
+DIST django-celery-3.1.17.tar.gz 79615 SHA256 254a95b0a4386df1fd949823942f6312c80fba3c88c5efad79cad8648bc5feb5 SHA512 fa68c85ee0eea778c5921c0373f3e7547bc644cd11d83e659fdf9bf4a80e317faca12ad3941225b073609a4716c5b9574d85c5c7063cff0fdb3deb0f1b86d225 WHIRLPOOL 6f01ab8aa28723720cd2ba516c9b2ecc30c28efe69fbdc72ddb18ed0fd2cfdaede6146133ec4a59f311e223a7146a7a190eaf8d9a6d8d831e46cafe668699fff
+EBUILD django-celery-3.1.17.ebuild 1537 SHA256 8dcbac60f4241cc8becb54a14d1101f6bfe356f6dd824139829cf60b1c5719ad SHA512 51f2135366e86ccc7aeacd833f7333b2d43c3ee34c03817cfcac315bcd1d2dbf655b630afbc170a310b7c8135c0bac2b118b908846e2eaf5533c3168436d041f WHIRLPOOL 68758c09cf55768a1bd11c2d21860a8f2ebd4a1b97e73826e81ed91912966a658d73a294e2cbe08003c8690be905617976f1338b5916873086d10dad84a347ae
+MISC ChangeLog 3703 SHA256 febbab52e0ccdce14b20302bc75a714137d4dd7ea4aafc2b1fd61ad2b79584c5 SHA512 d991843cd1081c01b88aa779f8d40172ba1919bce10d11bb631bab1758d11dffd47b2c9e9603a0fd493ede63db077211cf57c96a7882533092facf53a5c60988 WHIRLPOOL 034e9dd395a5cc32003f31600bfd75af1b2880723b5812df40563e69c754786ccd33cb6de6cec9091704364cfdde3a9a9cadf62064c260e258263e8d29a38a7a
+MISC ChangeLog-2015 3770 SHA256 9cda160e3eaca3edf828e2d61d265cefa37b8877e7f6fb520981cf44b3a6e397 SHA512 acd79f68b72791120a8db4d54fe88c98fc18cf226f59d486d1b01ceeae029df37dc7a6a2cce3d6f2612e60613e6b3a7d349ccb80adf5dbeeff157c47a31d09cb WHIRLPOOL 1db84445a67651aeec553f4bc14f2948000d19070bdb21c8ae9b46a0acaed0083dd6b71d02c78fc965042b057bb2379ff0ae358dec63f00d4d81ad30fad5b1d3
+MISC metadata.xml 376 SHA256 676a2aed3ac20e4f0aa1fa772d873095fe0a7f5d01853af3e9371d8389c0f6a9 SHA512 746bbf68f1ff393ab81b45679b0052a90aea4b31752190b9d047608f626f44c4a304ab150f11a2dd86a75cd98506bb4ca61c6d499cfa94afbbbb33b0e7c1a0ce WHIRLPOOL b01a32148babce7932f2524f059c15372e8d506a6c7318ecab66813f94b74219aedc01bcbb190e9388424c6e4f765b4a86318cfe9507ab907ae3ad517238ddf5
diff --git a/dev-python/django-celery/django-celery-3.1.17.ebuild b/dev-python/django-celery/django-celery-3.1.17.ebuild
new file mode 100644
index 000000000000..3092cb13fc84
--- /dev/null
+++ b/dev-python/django-celery/django-celery-3.1.17.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Celery Integration for Django"
+HOMEPAGE="http://celeryproject.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+# Python testsuite fails when built against dev-python/django-1.8.5
+# with ValueError: save() prohibited to prevent data loss due to
+# unsaved related object 'interval'.
+
+RDEPEND="
+	>=dev-python/celery-3.1.15[${PYTHON_USEDEP}]
+	>dev-python/django-1.4[${PYTHON_USEDEP}]
+	<dev-python/django-1.9[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/django-nose[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.0[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/python-memcached[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-issuetracker[${PYTHON_USEDEP}]
+		dev-python/python-memcached[${PYTHON_USEDEP}]
+	)"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# https://github.com/celery/django-celery/issues/342
+	"${PYTHON}" tests/manage.py test || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-celery/metadata.xml b/dev-python/django-celery/metadata.xml
new file mode 100644
index 000000000000..4697f0368c48
--- /dev/null
+++ b/dev-python/django-celery/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-celery</remote-id>
+		<remote-id type="github">github/django-celery</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/django-classy-tags/Manifest b/dev-python/django-classy-tags/Manifest
new file mode 100644
index 000000000000..1b9aea24484d
--- /dev/null
+++ b/dev-python/django-classy-tags/Manifest
@@ -0,0 +1,6 @@
+DIST django-classy-tags-0.7.2.tar.gz 17630 SHA256 068506291979ca973f74eb5744359fb319d4aa891cd0081c59da09b0e50ea094 SHA512 2a216a3245302dc2176ae1dd4f5557fed6677e7baab9f059daf66270ee9d8a6b26ee270225e84edcbfd893054c15d65a11fac9f1babc18020c6f7a3ad5c25c4d WHIRLPOOL 680d64d13173dc0088a52d5f6b9b340ec142eadffd8bd45e8dbea3f26b155894ada3aaec1b7799c25fee095b80975a8b83275ccaa80a155fc28b0ad87eb7221c
+DIST django-classy-tags-0.8.0.tar.gz 17911 SHA256 792f9161d0e22d55b4fab6fc297bab8ab072ffaa3075b227613a6d8473624db8 SHA512 9e1b32773eb4f73dc08c82038a4b3a46c59a8c1db73d33f4d8738bd91e8a102a552bff39113e9be15d1365967c3dd1bcf2190663d1e11d8d8d71cdb520eab579 WHIRLPOOL a2448bb94fdf7ee0a54aa693d9b6c45cac115c2bba686e67db95d313ec7cce9a02a41f9c1d80068ea8f032532a8ff0dd2ead9ca3039d68bedce7b25985b7a18d
+EBUILD django-classy-tags-0.7.2.ebuild 516 SHA256 15fb2acc0cd2cbc8695cbec7b640df6472513db3b411265772079379e4447fe5 SHA512 5012a70f656f5e9cfa2dc53ea1f65faae7c12431ec6825df26ab5a1aa8030e3cb57725f38e2b275f04ffcfbe3bc1e9ade22107e6fe1115088987a7a482252ed7 WHIRLPOOL 4727765d3d1099f927e8e60f3da2bf73227a6069750cf92d689ce275fbfe851e264004f6bcd5b7f671a1095330aa533f7a9518f7e9c0ab8f79a94c6f3c6202df
+EBUILD django-classy-tags-0.8.0.ebuild 561 SHA256 1af1d0c934a40138e3aaec916485dc01c9eda74a465de8c0833439a8741ab183 SHA512 bf9365abb4361111b0100acc4cf51fb84f92553ff1f19c0bbc26e6acbbce6c7b2884fc163bfdfecd01b0223c4ab850c5d5dbe681d11315e3fae105a74d26dd9f WHIRLPOOL 67060833368f5df5872fbc7ec138e689e47994791742c3845191657490c65549c3239f1f64d3667145fb0a53da3170ad0701de6f419e9b3c0a7e3cf44f5f0da2
+MISC ChangeLog 2103 SHA256 f45486494fb359c65772261206ceddb5e95878ae8f236914ad04867f63721c35 SHA512 ef33b2eec2229c153ce3583e3a2a44d58ae1da396b92769f104ec312fe56744b859b66895c72657e31a9e728acdc6784f3f9da00a88336fe1251442ec3145129 WHIRLPOOL 9fef240e6658d4b36a982fe9571c364bed9516aa4516efa4758f940b3c281f11042f852ce1d87a9a74c935f392fd889533fc455a3318630f2a705dcd09b10ab5
+MISC metadata.xml 369 SHA256 c45907f746886e4dd417a519aada00af11baed3d9aeb1301dd8934e7c96e2dd2 SHA512 e2be2ed5b8d60ae6e40419f4380e46f71440269609f7eadeacbaca9637bee3a493bedb65eede23e8acba811fe5e3280a803f2f934f0e00d8830009ab3bb59394 WHIRLPOOL 7dd6b5a104d23a85853902284477184e76a6ef7753e250627203bdfa856232a3286b8f084a948a0a4ed9acafecde8d9c5cbf1375a53c0e60a1c60df501eda9d7
diff --git a/dev-python/django-classy-tags/django-classy-tags-0.7.2.ebuild b/dev-python/django-classy-tags/django-classy-tags-0.7.2.ebuild
new file mode 100644
index 000000000000..7bbcb6331953
--- /dev/null
+++ b/dev-python/django-classy-tags/django-classy-tags-0.7.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Class based template tags for Django"
+HOMEPAGE="https://github.com/ojii/django-classy-tags https://pypi.python.org/pypi/django-classy-tags"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-python/django-1.6"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools"
diff --git a/dev-python/django-classy-tags/django-classy-tags-0.8.0.ebuild b/dev-python/django-classy-tags/django-classy-tags-0.8.0.ebuild
new file mode 100644
index 000000000000..6111c95884bb
--- /dev/null
+++ b/dev-python/django-classy-tags/django-classy-tags-0.8.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Class based template tags for Django"
+HOMEPAGE="https://github.com/ojii/django-classy-tags https://pypi.python.org/pypi/django-classy-tags"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-python/django-1.6[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/django-classy-tags/metadata.xml b/dev-python/django-classy-tags/metadata.xml
new file mode 100644
index 000000000000..05a535a96d12
--- /dev/null
+++ b/dev-python/django-classy-tags/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ojii/django-classy-tags</remote-id>
+    <remote-id type="pypi">django-classy-tags</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-cms/Manifest b/dev-python/django-cms/Manifest
new file mode 100644
index 000000000000..bee70155ed74
--- /dev/null
+++ b/dev-python/django-cms/Manifest
@@ -0,0 +1,4 @@
+DIST django-cms-3.4.3.tar.gz 5234748 SHA256 c60dcbc1dabd3ba0473478b01b5a58ee3553bf587d4da2f46cc6d9fae1d16850 SHA512 0c6b418bf025b042cefc4bb89fb663cc419a8e806a3c6e436198b7bb595d8012f79c7f02d08cee891e5e1ef83bd4f52f0e2adcc4ebd1d22325a674cbc7e69be9 WHIRLPOOL 14d97cb54a6f079b264d17f573bdacf9aa3f23e8cd72ea8c661f0ba559664c7e7f770ae56b01a74641f317a5db26d6c74aeddb33d6dbfc4fad7bb7fb10e2d94a
+EBUILD django-cms-3.4.3.ebuild 1532 SHA256 95ced6853cf833c0126c82c8b663ea9c13d225b034a856b1d216724fd27311fe SHA512 4e8f44faf3fa5a5f915546d1e1caaf7671ad441521ea9b2f95ec7e57fd3bc2488272b518a9f9e2226805164a075fb190a786f64bb3814c2beb95a03aab8dbc8a WHIRLPOOL f0b28fb50a1385197e13d9f981ad60dc3522c1acd9ab5e50b17677d8e31b3bb5490ecb1e3b8b45a4aa1325ba124952a8ec20699e1ea2f95cda341f7a47784354
+MISC ChangeLog 2041 SHA256 816847e1b19b0afc34e87bb86f19b78f16d55f9988f634e72df02530a73c4731 SHA512 1ff8a1dd7ae7aad03e53e70af64ad4e15398a1822e8221f7fd702e819cce1517cccb3c84c922dd460ab99fd35b4145edf08fe636a74f8c13bb562a1a8c43e917 WHIRLPOOL eb540cbf2cc2ec9762d8e483549480858eb498f75add6d8185e15713530111f3cf366fbaae52c0bffa733ad081daaafedacdca83f968b5846cb3fc0a20c42b9b
+MISC metadata.xml 1105 SHA256 3564e679dc836bde22b69f9eddf272304356d4f048359a6d2d2c82f859ce9e6e SHA512 fa258c0a01b621b05084c8da8ffa6be43ad44b511b6a4c62547589b7460d1ae3977da2983ba50bec7e33be456986d51aacadc9f65e4339f13e2b30b1500b6cce WHIRLPOOL 1c6da0e3cef14adf0fcd38d98df65aec2cc9dd144535bb728bb63230cb4f556449454dfd10d31aff9f55668582116b4d35995daba576132ec0473d52d773520f
diff --git a/dev-python/django-cms/django-cms-3.4.3.ebuild b/dev-python/django-cms/django-cms-3.4.3.ebuild
new file mode 100644
index 000000000000..3220966dcc95
--- /dev/null
+++ b/dev-python/django-cms/django-cms-3.4.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Django application for managing hierarchical pages of content"
+HOMEPAGE="https://www.django-cms.org/"
+SRC_URI="https://github.com/divio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="+admin-style +ckeditor file flash inherit link picture snippet teaser video"
+REQUIRED_USE="admin-style ckeditor"
+
+RDEPEND="
+	>=dev-python/django-1.8[${PYTHON_USEDEP}]
+	admin-style? ( >=dev-python/djangocms-admin-style-1.0[${PYTHON_USEDEP}] )
+	file? ( dev-python/djangocms-file[${PYTHON_USEDEP}] )
+	flash? ( dev-python/djangocms-flash[${PYTHON_USEDEP}] )
+	inherit? ( dev-python/djangocms-inherit[${PYTHON_USEDEP}] )
+	link? ( dev-python/djangocms-link[${PYTHON_USEDEP}] )
+	picture? ( dev-python/djangocms-picture[${PYTHON_USEDEP}] )
+	snippet? ( dev-python/djangocms-snippet[${PYTHON_USEDEP}] )
+	teaser? ( dev-python/djangocms-teaser[${PYTHON_USEDEP}] )
+	video? ( dev-python/djangocms-video[${PYTHON_USEDEP}] )
+	>=dev-python/django-classy-tags-0.7[${PYTHON_USEDEP}]
+	>=dev-python/django-formtools-1.0[${PYTHON_USEDEP}]
+	>=dev-python/django-sekizai-0.7[${PYTHON_USEDEP}]
+	ckeditor? ( >=dev-python/djangocms-text-ckeditor-3.2.0[${PYTHON_USEDEP}] )
+	>=dev-python/django-treebeard-4.0[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/django-cms/metadata.xml b/dev-python/django-cms/metadata.xml
new file mode 100644
index 000000000000..e40589909a8a
--- /dev/null
+++ b/dev-python/django-cms/metadata.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="admin-style">
+      Install plugin customizing admin panel styles
+    </flag>
+    <flag name="ckeditor">
+      Install text-ckeditor plugin for rich text editing
+    </flag>
+    <flag name="file">
+      Install djangocms file plugin
+    </flag>
+    <flag name="flash">
+      Install djangocms flash plugin
+    </flag>
+    <flag name="inherit">
+      Install djangocms inherit plugin
+    </flag>
+    <flag name="link">
+      Install djangocms link plugin
+    </flag>
+    <flag name="picture">
+      Install djangocms picture plugin
+    </flag>
+    <flag name="snippet">
+      Install djangocms snippet plugin
+    </flag>
+    <flag name="teaser">
+      Install djangocms teaser plugin
+    </flag>
+    <flag name="video">
+      Install djangocms video plugin
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">divio/django-cms</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-compressor/Manifest b/dev-python/django-compressor/Manifest
new file mode 100644
index 000000000000..f34787b8c555
--- /dev/null
+++ b/dev-python/django-compressor/Manifest
@@ -0,0 +1,7 @@
+DIST django-compressor-1.4.tar.gz 103414 SHA256 47790524c754c34c37d960ab34ec7a3ef85002e56978fea69a4102f2856a4561 SHA512 620618675585248a38040d91e3c33a534758cc87c4b2cab16ac3d55f82e37be6d4d7058226f6366e14305465a29235e89acba937019cd28fe4285614797179e2 WHIRLPOOL 597d5f7530dc4ad67bc7cff294d4a46cad53328670ce530bbd76e6596c4f35e61edc04e1bac71e9a3b61f4a8efd73fdae38ccfdded65be800e45a30374b36fac
+DIST django-compressor-1.5.tar.gz 105855 SHA256 2f094de9c061f38b741db9fc88d359abc424f077b324fe33f5e93ecf91f8f2eb SHA512 d6c7a04263895a4195754a49bd4831053186c99d6fdd07977c26059eb931c982bd3b60848311e8469ad0e0298204a5fc3f0e63697a5af5608abf0b76e521c797 WHIRLPOOL 6626ea41b6465516126fe1f9eb66871df11ce5de80c35dd3024ba5fcd69cb6aa745c684201991bedd8ffc8356e2fc19495ee81a5165122ca70f5419b0749e269
+EBUILD django-compressor-1.4.ebuild 1738 SHA256 d30f7a8cae4521a1735ef3117117450e7ad31ca0eca5f9f32a3bcbe88f0bea26 SHA512 508d4b808189e7b4bd6b5e77b8d27ad7e989c54d2be3f6561ffed7c07f43457c4b3f26155abb35debc7262203055f14eb269b7d9031b21f0e29532b99f4053c4 WHIRLPOOL 3b2080e6ff3b08c906bd1a44b5d87dd0d7455f9a675c61cc9699f031d9c94a44c8f1ac22f5b5da7db2fde9812b5833c31a8981bb9474b49ffdad50d38c008c39
+EBUILD django-compressor-1.5.ebuild 1742 SHA256 94c708220cbbf8a625a101dd805ede2785a3116d6c677ba113a869da0102191f SHA512 708665b08f576777dd3d666aa8bda2e07caadbb5c8d44f783aebe6c135d620ac4696a14630a41636fd3ef0570ec1f72fe40d947dcbc50ca8cd56aa80aaf7e867 WHIRLPOOL 35162b5372b4ec1d82703edf43838e3e1f113c18ec2842f33bce6c62aaec633a65220284268ef890df4c8b4c35618f9160854930b4b7f8728d90d605248f2395
+MISC ChangeLog 2951 SHA256 b733b9bb151f03c91c61e0cd952552d5b834c1cea329eb223dc62092a26b9e7a SHA512 ce543aae7340223fac9b4f1c467d64543d5b4da5abf1257bcff7c6503c6307d407cb3de0c20d8376900f797b5518f6e31c1804d62fd5b1fcb2f0e5536c601e76 WHIRLPOOL 4a75e33184a3120afa0660fff40bc1250abfb0ad7a23a091dc9593381baf9e95cc6bb02e16e1e3fa3b19ad196834f60c85d0c5aba01e7dee2ad4264c997367f1
+MISC ChangeLog-2015 2211 SHA256 b7ac2291c67a53dbc8364cc95090e2efb121dd61618ee18113b2a6a26aed23b3 SHA512 79a91a1aff047e7d6b0a003ea6d372d81bc04ac3a44e203b6789a37bcf69accd41eeaf2e915287b91bf14e1e317e72117d125aaa7da284d5e8e78191a0bbea5d WHIRLPOOL 5a1e87d1e794a0d5ad9ebed3d274eb44f52622a7e48cfd6a17dff31cce23442ed991c8027c08b335a671ea4ae1b8ac4091b6d1c4c4ea8e593642b04a3e2ae3d2
+MISC metadata.xml 339 SHA256 21263a75b051ed8827726d5af69374935716d8ec9673f4d1a69ab17f94237da7 SHA512 41051f6aacf5ae785a36c1606b2df505fd6120b9d2d9a9864ec15a5c8e72a5350b81510b5aeac28267f62310e8c192b3338001ada21c4b8fbe183f80f1043bb2 WHIRLPOOL 50fb4c22ba9d7e95d99493b3a6f66e7e677765e056c6bb0235549e6efda79cd6ee8366dffdafc57eb4a863f202bf73ffa72e80dcec90312144ae19b95ae655d5
diff --git a/dev-python/django-compressor/django-compressor-1.4.ebuild b/dev-python/django-compressor/django-compressor-1.4.ebuild
new file mode 100644
index 000000000000..ddef2f2c9f7d
--- /dev/null
+++ b/dev-python/django-compressor/django-compressor-1.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/_}"
+
+DESCRIPTION="Compresses linked and inline javascript or CSS into a single cached file"
+HOMEPAGE="https://github.com/django-compressor/django-compressor"
+SRC_URI="https://github.com/jezdez/django_compressor/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/django[${PYTHON_USEDEP}]
+	>=dev-python/django-appconf-0.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/versiontools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/django-discover-runner[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/Coffin[${PYTHON_USEDEP}]
+		dev-python/jingo[${PYTHON_USEDEP}]
+	)"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# https://github.com/django-compressor/django-compressor/issues/531 532
+	pushd "${BUILD_DIR}/lib" > /dev/null || die
+	if python_is_python3; then
+		sed -e s':test_cachekey:_&:' -e s':test_css:_&:g' \
+			 -i compressor/tests/test_base.py || die
+	fi
+	set -- django-admin.py test compressor --settings=compressor.test_settings
+	echo "$@"
+	"$@" || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-compressor/django-compressor-1.5.ebuild b/dev-python/django-compressor/django-compressor-1.5.ebuild
new file mode 100644
index 000000000000..2ddab7862b49
--- /dev/null
+++ b/dev-python/django-compressor/django-compressor-1.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/_}"
+
+DESCRIPTION="Compresses linked and inline javascript or CSS into a single cached file"
+HOMEPAGE="https://github.com/django-compressor/django-compressor"
+SRC_URI="https://github.com/jezdez/django_compressor/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/django[${PYTHON_USEDEP}]
+	>=dev-python/django-appconf-0.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/versiontools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/django-discover-runner[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/Coffin[${PYTHON_USEDEP}]
+		dev-python/jingo[${PYTHON_USEDEP}]
+	)"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# https://github.com/django-compressor/django-compressor/issues/531 532
+	pushd "${BUILD_DIR}/lib" > /dev/null || die
+	if python_is_python3; then
+		sed -e s':test_cachekey:_&:' -e s':test_css:_&:g' \
+			 -i compressor/tests/test_base.py || die
+	fi
+	set -- django-admin.py test compressor --settings=compressor.test_settings
+	echo "$@"
+	"$@" || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-compressor/metadata.xml b/dev-python/django-compressor/metadata.xml
new file mode 100644
index 000000000000..6e566e0fb330
--- /dev/null
+++ b/dev-python/django-compressor/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jezdez/django_compressor</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-crispy-forms/Manifest b/dev-python/django-crispy-forms/Manifest
new file mode 100644
index 000000000000..6df554c58b14
--- /dev/null
+++ b/dev-python/django-crispy-forms/Manifest
@@ -0,0 +1,5 @@
+DIST django-crispy-forms-1.6.0.tar.gz 118917 SHA256 67fbb7194bd9887d663161405c623f5f5cd3f9ee627515c4de7a50e16fa44ed1 SHA512 8fa46366d2f3376f4190c219a624eaf983c19243db25d6c1723917ab5f8c2d9087e2228f3208df8bd35ba26abe00f6cef46e1e3ca0c0097282d292a217f977f8 WHIRLPOOL 4b1ab48f49edf019151b8ca42e5d0ea34ad310690e929b6c8579773a7adadeffec685285f8310c20cbac4d71edcfebdd9f2ddd709ebcfef57a75f8f139e7aff6
+EBUILD django-crispy-forms-1.6.0.ebuild 768 SHA256 97f689dc81939464e7153fae306fb7bcec90de90a82ceab7a5183ecc96625420 SHA512 de8fa0615adc38ae5585ca2ab40f58d01e18187ff43cd58fa93a24c52a4e61a881390bcdbad3f3233bd02487666a329b620a4c6eed6426ab272e7b88199430a1 WHIRLPOOL e184b96c9c0176a1fa491893f0f0cd7ae57050135942a686a645df4c13c81dadf4770a198183dee54f4598faa682ef80cc72a09f66620be0bf96f5666a5bd30a
+MISC ChangeLog 4024 SHA256 1643a44d07b6a692a2ba910fb2e414e81d6cab83d66bdcc58d2d32fe2ee8b11e SHA512 179e7ce8ff641962423e9d6c6e0b2b900f665ff92324aecd708bf9bba62d3bd3643de71546390b03a242a3442ba37ac8ef05636adbc98310d7a5b093e809e137 WHIRLPOOL 9fb18f1f3b6f33d0690d6a8b861c37b38abd6b77569d9859c19eca0b31a0bf20af9a17d1f94b18628f37758caea8ff9a0473ff5863da0fbac0fbf54cdb3dcae1
+MISC ChangeLog-2015 606 SHA256 f2da353e22f5b0669f8f748e325a1f0137b6d148e3b52292af0ca242882b9ab1 SHA512 aab564719952e410e70111b5d61808957648c3c795ab3674eb918ac7fedf74032d089f3bd099880cdab080b45e3dd8a3fc030391ea96b68974acfbfb334e71b0 WHIRLPOOL 6d34e6b75d04d9c1bcb7a8324c74b521096ddb6ac8b923f8b3359b5766dc1af8133568748707a5c636b71a214addf7ccb43cbcd4f77401eb0dbcdb47b56f51f4
+MISC metadata.xml 402 SHA256 9f1eb0b1344bba1d017a850dd527484680fc0872d61b93d2826ef3da826868d9 SHA512 131cfc83f2e89f8bd0928d7663cb6272f20532b2a431a7a33171a9af76c6ab4edf02d2c81a4644ef132bc46cf7c0d997935bf34a665de8267120c11e09683ce9 WHIRLPOOL bb973a2b216934c59131f280bb09afd44dd8e53526714f8e6084f1ae42cd5e8e6d8188c4f2e1691559bf2567a10db6018466a33f63393b5c0f3b9b007d5f915d
diff --git a/dev-python/django-crispy-forms/django-crispy-forms-1.6.0.ebuild b/dev-python/django-crispy-forms/django-crispy-forms-1.6.0.ebuild
new file mode 100644
index 000000000000..083636da4530
--- /dev/null
+++ b/dev-python/django-crispy-forms/django-crispy-forms-1.6.0.ebuild
@@ -0,0 +1,32 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Best way to have Django DRY forms"
+HOMEPAGE="
+	https://pypi.python.org/pypi/django-crispy-forms/
+	https://github.com/maraujop/django-crispy-forms
+	https://django-crispy-forms.readthedocs.org/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# Seems to be incompletely packed
+RESTRICT=test
+
+python_test() {
+	DJANGO_SETTINGS_MODULE=crispy_forms.tests.test_settings py.test crispy_forms/tests || die
+}
diff --git a/dev-python/django-crispy-forms/metadata.xml b/dev-python/django-crispy-forms/metadata.xml
new file mode 100644
index 000000000000..9bff2ed0abef
--- /dev/null
+++ b/dev-python/django-crispy-forms/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-crispy-forms</remote-id>
+    <remote-id type="github">maraujop/django-crispy-forms</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-debug-toolbar/Manifest b/dev-python/django-debug-toolbar/Manifest
new file mode 100644
index 000000000000..696cff90a7ef
--- /dev/null
+++ b/dev-python/django-debug-toolbar/Manifest
@@ -0,0 +1,7 @@
+DIST django-debug-toolbar-1.3.2.tar.gz 316106 SHA256 3cb9128c17a672864b0daa16065c9d80ff910cbc3b344a3e5d82eb0fb30a185c SHA512 d1428f1f729a190ddbf3a260bc428d7a78421519be60c7f07ad3e7f3498414d4ac0ec64d5772fcf89d6521f83bd9226fae104c43b4f0ad4deaf7cfb427d24b1c WHIRLPOOL f088dc6c4fb766a9e38b2f736a66126bdb75bd3cd7762c8ba06650b401639a644831e848012bd001cbd8ffdaad6b823303765f5f44d8bc79688f2d9b7da4592d
+DIST django-debug-toolbar-1.5.tar.gz 315928 SHA256 10024b7850e4274f1d5762668da18ee05670054be43e497c8d8b12f7c655bee3 SHA512 9a421b80016bdaee8dd3ba2a9b7c3b788b54a4f464cdd5697e36536268e4d3d926bf77088a715e87f192dc8a20a100d8adac68c9c26a1191a5343e377240bf64 WHIRLPOOL 438beaa6b40ff3c91093203a26ffaac545056c4c74963254c1a86bd0fbf0d021744fd5c41e07eeb79b98adda4b92d7b2e261a6222032c417ae8180856de3bfee
+EBUILD django-debug-toolbar-1.3.2.ebuild 1319 SHA256 db04a3ddf4a75a8c1874e2a8212c59b6c24262ade278a3d833a4f5e53a626313 SHA512 65435949e68c09d600d8a2eda86430919ed8504b017e7913b0c33047c96f8d42c85b469a9410b34841566645597ad313a4ead3a49ff5433e0ef709111d5d75b9 WHIRLPOOL a2e3a82d97c2a038056d42d72ff5e8da4f61d49bd79abbe4f9db40fb81f9015a3eb90c1306465a70f2f1def17628eafe99837af6c9ea0fe99d573fec3d8d4afb
+EBUILD django-debug-toolbar-1.5.ebuild 1322 SHA256 aec7e85b110d0efc245e93f20a32f8c9e1a98ce783fd36d148a1bdefb19e3174 SHA512 11bab07318c7fbafedb623c20b858af66b23db2a7d11b9f9c13c0821b52b23a63c7af2f6819ff530f6f49647aa23f59fffd562f3202c0a819edc0fbc226fabd4 WHIRLPOOL 6bcbf10c06616c6e8ef14e5492a5c5671c0750b5dedfea11a538ccd08c39f072c0a544cb17404a48e93ab7a597cb178a0edc67b060e1566b2b8ac43b548e18e7
+MISC ChangeLog 3245 SHA256 ccece5f62ecf205d6bae6b59714ff27693cb2134253d4e27095358ef6e64e5d5 SHA512 224d7c71b86c376013986ce76aff5043556546bb57e3a932affe9fbdc2185b9519d7b362b7ce462b697bfde980175a20afbc096c8d732e019bb1913d20e69003 WHIRLPOOL adc9fe751654ecd1982bae4e79c45778c1e68881b4e99e93b614a19ae336ba80c7df04e33d1ba271c261c308151718ec74d8377e70bc6ab758168186856171b4
+MISC ChangeLog-2015 4094 SHA256 cc6b1adb653be6e389302affd2f642d77e17072f5d68c6227fe17a3e1faad27a SHA512 df3d10ce6c33238370eadf79be1cf8c96e4fc367d815e6a968a631881608f93e1680dc93d148ecc3ce998a67e375f77be0e03bfb6f3744d51caf639efc62a1e8 WHIRLPOOL e0571c2777e528c505516c21eeee761f8afd459b3fbc326d19d6fdb8230f47e8e5886d52229f2203a0a6c6b916b2e3615845475f31f70797bf91da207da9bbc4
+MISC metadata.xml 356 SHA256 6e282c94d4f6df2079c4d98508b9c7c8f912340d3e5e22667b04d5973704ae48 SHA512 12686662e852b0283d2212f0db83c832c1248723a7cd751990e43b1641ddbad2cc2c71c17ac4704c01beec9a9366fc726504c10e9a9e56456b544a800cfa7847 WHIRLPOOL d0e9b0e1db5332d03c4fdec8c7a55a1bd0096764d2b2cbec0e30baa9043e4e2020a65d39c655bccb51f6cdf99943f4c42989fa5946c67092dff39c3e2aba11ee
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-1.3.2.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-1.3.2.ebuild
new file mode 100644
index 000000000000..558b7505df84
--- /dev/null
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-1.3.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A configurable set of panels that display debug information"
+HOMEPAGE="
+	https://pypi.python.org/pypi/django-debug-toolbar/
+	https://github.com/django-debug-toolbar/django-debug-toolbar/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/django-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.1.10[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# Prevent non essential d'loading by intersphinx
+	sed -e 's:intersphinx_mapping:_&:' -i docs/conf.py || die
+
+	# This prevents distutils from installing 'tests' package, rm magic no more needed
+	sed -e "/find_packages/s:'tests':'tests.\*', 'tests':" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( example/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-1.5.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-1.5.ebuild
new file mode 100644
index 000000000000..b80879e83b4c
--- /dev/null
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-1.5.ebuild
@@ -0,0 +1,52 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="A configurable set of panels that display debug information"
+HOMEPAGE="
+	https://pypi.python.org/pypi/django-debug-toolbar/
+	https://github.com/django-debug-toolbar/django-debug-toolbar/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/django-1.8[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.2.0[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# Prevent non essential d'loading by intersphinx
+	sed -e 's:intersphinx_mapping:_&:' -i docs/conf.py || die
+
+	# This prevents distutils from installing 'tests' package, rm magic no more needed
+	sed -e "/find_packages/s:'tests':'tests.\*', 'tests':" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( example/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-debug-toolbar/metadata.xml b/dev-python/django-debug-toolbar/metadata.xml
new file mode 100644
index 000000000000..c3f31e955609
--- /dev/null
+++ b/dev-python/django-debug-toolbar/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">django-debug-toolbar/django-debug-toolbar</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-discover-runner/Manifest b/dev-python/django-discover-runner/Manifest
new file mode 100644
index 000000000000..a08f6d2e6f25
--- /dev/null
+++ b/dev-python/django-discover-runner/Manifest
@@ -0,0 +1,5 @@
+DIST django-discover-runner-1.0.tar.gz 9190 SHA256 0ba91fe722c256bcbfdeb36fac7eac0f27e5bfda55d98c4c1cf9ab62b5b084fe SHA512 669287ed7f801dbfe949e2affd9ee1861aa6a41fcc2e2403dc2e106dee3d23c8400d686ef750242bdc74d23eaf316fcf36071c82d7c458ff724305e5fe27410e WHIRLPOOL 67f0e6cf59f4aab1db1012f27e12cc0ea1e3101ed1c066cd1294ec2455f17ee5e4ce5afb3b381a4bd03cb4cd97863c284199ed77ba3c89d430668ab80d723528
+EBUILD django-discover-runner-1.0.ebuild 581 SHA256 de56b872e5e7a3d7ef7f6b285db90b73e97609cf8189ce16f42da4ed2199c2aa SHA512 af7f7e62890b558b00b974716e3b0d0f93dabdb3a611d8625abc53e1e63f8013c5c1135bca077d1a6bed6f1a46c7325722cfea4743de631e038e945e8c691639 WHIRLPOOL 93f43d8e84d307d7a65811870f14dd1ef10fc5d876be9526b41625cb0f4b0d4493676bc6131cf2f026d49a0da34f312034055d800fda6499b8612325c75fcbde
+MISC ChangeLog 2728 SHA256 bda086a77e318e7c6bd40b10367423f6326b4dec0449b3c49e1e89dfcc1aaeca SHA512 66a2de14852bca91e3e6395cbb8c2538719968ad035a72240b2ee4a85eab9eb8ccba823005f688199111df1a820b3858dc91668d1cb3e390c78a2ff9972136de WHIRLPOOL 33e905f658f07cce48767c9db83c22cf6b6f52006240cc365e466aa99000ac5c3f163a2ecd25a35cf90a04088c18c8ee3bc3a2dd741ae1e3e5b24718c56264df
+MISC ChangeLog-2015 1124 SHA256 85864e0c5bf2c47db7c2224401cd675e611ba156d928bd3c78c0be4dfce406bb SHA512 8a4b926a801e3fc05226a8bf5fbd53cfcff41b149d5cf555cbecaefce01291798aee57b09996d7df3fdbe6ad4fdc3a058528691b0828cf84463f04b6930112bf WHIRLPOOL 0b7a51017fbe17bd20977d4a26d92e305d15a6fec8db8260f5c787e62180fc88cbfc4764fb74ba30e82745139e64544ca8438dad3f6f075fdbc19a0397b0b399
+MISC metadata.xml 406 SHA256 051cb51c3cdbce073000d3cf46590b72eea7ae8ecaf6db3277878ffc2d41e791 SHA512 13d865780d9fe9e3eb890cf31edde99e0b4cf16aacdd1ec6347caffd427cb867a038b28221a1a8fb3a62d0933700c7aa8831d5ca52c6fd9a822e5a113feb99be WHIRLPOOL 8728b93ae54598dbf02ae083c463ed9be16002c7cd0d09ca6b94f21f5922c22e9014ae7dd7c285009dd78a096a184b97445eee4c628f489cb865960737ca5e4c
diff --git a/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild b/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild
new file mode 100644
index 000000000000..4f48bdc5583d
--- /dev/null
+++ b/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A Django test runner based on unittest2's test discovery"
+HOMEPAGE="https://github.com/jezdez/django-discover-runner
+	https://pypi.python.org/pypi/django-discover-runner"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/django[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/django-discover-runner/metadata.xml b/dev-python/django-discover-runner/metadata.xml
new file mode 100644
index 000000000000..6c69d43bb8ec
--- /dev/null
+++ b/dev-python/django-discover-runner/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-discover-runner</remote-id>
+    <remote-id type="github">jezdez/django-discover-runner</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-durationfield/Manifest b/dev-python/django-durationfield/Manifest
new file mode 100644
index 000000000000..f22fb1252358
--- /dev/null
+++ b/dev-python/django-durationfield/Manifest
@@ -0,0 +1,6 @@
+DIST django-durationfield-0.5.2.tar.gz 4324 SHA256 7fb097b4418c67284c99790e6927191e0fb5c014356d3e3d2b26e8919e37cdcf SHA512 de0ea6b9b86cf29d4a5813a80cf7a02f66d0774b58266799e83f8e734a1cf071352ae57d8f8ded8fb16f9a74dd284a4c146d98f75a78bf0463bf767e4156b3ad WHIRLPOOL 6607fb2a1169c963dcb798ce1d27cdf599f2c71bb6b6e8d55c549d502066c500c65b9bf497d8059158f4fef455705523b7270419d2cdbaa2de823c372af8492d
+DIST django-durationfield-0.5.4.tar.gz 4728 SHA256 29e3df5e28d2422b3ac5e5fd3129dc3285dba729df176c464e6ee73a0710a45a SHA512 84885ab7bb07ed3c5a64094a2beb7d4adcf8b0f9f2933ad2c1d4654789bd71aa7d2efd5c84931f22f81a51e8aaeb3ed9415a12c69dfd7354c2317ea912fdc610 WHIRLPOOL 7efb893bb62ed44e28022d691ed17cde1f779335d8923df851c1cc299df3cbce66d494911422ec306cca1890780b376c380118f8b859d38a1dedb49f266dfd9f
+EBUILD django-durationfield-0.5.2.ebuild 536 SHA256 d8c675a28f4f2cfe6088b033cb96b979633ff85da9f167e7207b7e55ed5fe06e SHA512 ed7d24187067e23369ce075ae87781cca63c9a4db2bbb1746318b9228723763937b41c88f8af98c0bd712af0fd7f977724b28dab1f3e42e0eae660a3bdf22e6f WHIRLPOOL 9421a21a7d9c388ca768f86ffacc66846b1f8d857200461d007fd7ce7bcb30e87776b758b11d9c1609731ef504106a4634eb39c5a58ca838ea9244cc85062fc8
+EBUILD django-durationfield-0.5.4.ebuild 540 SHA256 36bc90ebe6adaea384ae1a3fed9e17c2e1c91332838aa38e0e52605b9a188181 SHA512 b5fdf99b13689f4a91069100635c351377206d5851937b0f9646c524976232cb6d3ee9c399596ec27271e6806cd834efebb0f2fb63e02d2177d9030ce7d64e62 WHIRLPOOL 8dab8b2e1600d4a76d0a084631b3601618e0c8c8820c1f2187fd4c5fdc373df92f4c5f1083dcf6edf267a14e9184bf01173838fc47f595babf12473638e5b9b3
+MISC ChangeLog 1454 SHA256 acac618d43321e85ea10d4e8e0e87d7916e957594f23ed1033c2eb1b56c889fb SHA512 700703bb4c2ce621d8c157591c4ce28c9151230cfb583cb4f48645422aa1a7c48c93fa14b9c4eb48092ea8624bb884d32631fbb0d7d7b4990b8ae17760133e17 WHIRLPOOL e86bdeee0cc39924db78c9e4328d2e111ce245b9908f7cbeadf98b6997003e704cd85171b7e6c4a290f68f79230bf297690046f1f040ef6dc98f0f8f7266497c
+MISC metadata.xml 306 SHA256 3e1cc8a6aa574e02afc1c4ab98da30b91a09dd19f0c2931bd7d7979d6274d74a SHA512 cc5573cdf78e3e807e1a8b908b4f7f10d59b30410f9e36d4b441057b06e535be150990d8ff3b147ac4ac0ff36f37c392c78bfae259a4419a8469631c99c432c1 WHIRLPOOL 32513833bf7aea9fa166c60d0edea159175e413a841a3fd18f13bf0a0199df5a246fd656f6630f30e1ddb82f057a9e2f0b177ce5bf72b78bde253d53e74dc4fe
diff --git a/dev-python/django-durationfield/django-durationfield-0.5.2.ebuild b/dev-python/django-durationfield/django-durationfield-0.5.2.ebuild
new file mode 100644
index 000000000000..23c9e23b4cf2
--- /dev/null
+++ b/dev-python/django-durationfield/django-durationfield-0.5.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Reusable app for adding a DurationField to Django"
+HOMEPAGE="https://pypi.python.org/pypi/django-durationfield"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.4[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/django-durationfield/django-durationfield-0.5.4.ebuild b/dev-python/django-durationfield/django-durationfield-0.5.4.ebuild
new file mode 100644
index 000000000000..5a796ae34645
--- /dev/null
+++ b/dev-python/django-durationfield/django-durationfield-0.5.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Reusable app for adding a DurationField to Django"
+HOMEPAGE="https://pypi.python.org/pypi/django-durationfield"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.4[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/django-durationfield/metadata.xml b/dev-python/django-durationfield/metadata.xml
new file mode 100644
index 000000000000..1eb5e3f6f601
--- /dev/null
+++ b/dev-python/django-durationfield/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-durationfield</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-endless-pagination/Manifest b/dev-python/django-endless-pagination/Manifest
new file mode 100644
index 000000000000..3dff84e2a763
--- /dev/null
+++ b/dev-python/django-endless-pagination/Manifest
@@ -0,0 +1,5 @@
+DIST django-endless-pagination-2.0.tar.gz 61514 SHA256 a719f9d4e4fcd312774dcc3f260e85e9f5a4ad9a21c96d243b7cc048c3329c85 SHA512 d413c3e4f46c73c47e98eeb073bdbedaea3c03931c7147190594bc170489ae09325b43edae9c1eabe56f606b62bf93777f7444b0b174ff6303a5e30453578ac3 WHIRLPOOL 65929e5500e954ec9f8eaafc1c3519f2623148c1949b6ed39b00d172a3c4470e106e9fcea10925c9f21a254bf50be90e2c48281283e7235d00ed3e2bab0c7bfd
+EBUILD django-endless-pagination-2.0.ebuild 1287 SHA256 bf5957d85f79f150a566ce9bc299a99e4e3fa21a52a9565fff8cfedd816629f9 SHA512 c634c9f790a5cd3493d6c2c23ca2b2e47bcd5561816990ed34ea939ae15a22732c2ab276370762e64b00888a1ac5484349ad9934e6aa4340ecca1e4d16524b7b WHIRLPOOL 492ae2006a0bd28dfce7dc315f7098e73270ce15aa9f9ee7dfe1e9849d3241c7905df1afad6e19103ad940ff961af8aff6ce2e1d96090cc91d8b552b94b74f34
+MISC ChangeLog 2603 SHA256 20ccdc13967efa909c8a9630e106198cfd5d2fffa4d34441aefa9c5df29e21d5 SHA512 3704f4c65c46e0c2e3eb0f128f812672593ede9a95f35ce1bff42813a3df0db9911fb7ae124de52f69ace054eafe66b0f3a0a36cab7a35678b63fd80443e9f7c WHIRLPOOL a1c1dd2d2a15d931b168dd74f75adcb3b76931e75c0b45dd56377f2bdc3e562bf7dd8ea58d3b5507a896ac75f23c51e2a3e8850c25a89f15d864e8d4d0810d11
+MISC ChangeLog-2015 1641 SHA256 ac61bdbb60a259e793ea0c7bf81cc4b96331cb4bfd114b9fed98d000284f5b90 SHA512 e9ff725fb0d7040f199341a7559dff1646b9f9c7f5b9eedda4b011e437fa54ac445c03eae390665e1d5c551f8940bcaea5dbb3750f45a35f2129ece8a91674b7 WHIRLPOOL a218a07332e2aef42bc585462cc4a197e7cdfb4dd020c756459f13961551ed284f2d19dac2c2dedf1df13aec43ba490de14e8bfef6b0cc0bf55ccb87892a2692
+MISC metadata.xml 349 SHA256 6d51a99509b1a1788f38580aa7a7cb29e6e7341bc206154c62bcbf508a025116 SHA512 5aebc133700f4f4122b98ab3f547df221ab1c60fd0d78f88e52312dbef5c1b33783a5eee50b12e4c77ab8bfc74ea97218548393fb851df589b86183fb9e0ae02 WHIRLPOOL 6aa4d24e834d5d051876255e02692a3e7170de3696dfcc0f2a587d6bb303f7380e4114a6f20672fcceea506f04349c462cb060076000ff8508a5f2f89c4945a8
diff --git a/dev-python/django-endless-pagination/django-endless-pagination-2.0.ebuild b/dev-python/django-endless-pagination/django-endless-pagination-2.0.ebuild
new file mode 100644
index 000000000000..6e68885b9ba4
--- /dev/null
+++ b/dev-python/django-endless-pagination/django-endless-pagination-2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools supporting ajax, multiple and lazy pagination, Twitter-style and Digg-style pagination"
+HOMEPAGE="https://github.com/frankban/django-endless-pagination"
+SRC_URI="https://github.com/frankban/django-endless-pagination/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/django-1.3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/django-nose[${PYTHON_USEDEP}]
+		dev-python/ipdb[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xvfbwrapper[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	unset PYTHONPATH
+	"${PYTHON}" tests/manage.py test || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${S}"/doc/_build/html/. )
+
+	#rm all OSX fork files, Bug #450842
+	pushd "${ED}" > /dev/null
+	rm -f $(find . -name "._*")
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-endless-pagination/metadata.xml b/dev-python/django-endless-pagination/metadata.xml
new file mode 100644
index 000000000000..8ad15e74927e
--- /dev/null
+++ b/dev-python/django-endless-pagination/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">frankban/django-endless-pagination</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-evolution/Manifest b/dev-python/django-evolution/Manifest
new file mode 100644
index 000000000000..201037246203
--- /dev/null
+++ b/dev-python/django-evolution/Manifest
@@ -0,0 +1,7 @@
+DIST django_evolution-0.7.4.tar.gz 88467 SHA256 0b75bf163d5c859f171baf674503dfb3ca7d1d2ef082e5c5952d52b9ee6644e4 SHA512 6a6596211da7c0df1690e969b6116ee86ef2645886aab3d2026c1eadc0663f58f8c4025ffc30bb5b11f2f7ccedc687702396244c8fb12f1ea12b026521f90803 WHIRLPOOL e9f35d9c0ca8f8e199d1da3092904e38ec9e72e9602e342d7e5c0b20542d7f9ff591fae1b6a39b5703bb73a0822ae7f317d32f592301153aac7bbf7c56ef530b
+DIST django_evolution-0.7.5.tar.gz 89551 SHA256 db9ee54849ccce54736b18926bd3b839d5a0e61a713263851d3e220c49e96ce1 SHA512 f457fa53ff59bff09fa3fc3ad73ffc8f09ce306c756b022d2da097cba1f14b69dca03ff2c714ac470da7200f649c4765543a717a6ce851d1dbd4b0fc8fc84098 WHIRLPOOL 38cacf172047d97ef60cda119ca69bfada8b24687e21d7194c580bfff2def50e84c402223c086c9e870385b465d96556cc4b90ff9a0033937783529cab220be0
+EBUILD django-evolution-0.7.4.ebuild 987 SHA256 69f6e2f0a1e1e15097fc3881103a99b331d09008bb305fceee886c68f337ded6 SHA512 02fa638e39526e4af94ac28c6dd7fc8c96a2403b3e81035ada5aae672144f5c47c3c791e69ec73c5dce4d9e0dfd5af026dc95960e9aa8c792d8ae0bcbd285abf WHIRLPOOL af9a190dc78778253c32262a1feb5c8e6d10b0521061cdaea372c6aefaf872299b7e0fe5afb17efcf90a901fb867f54f69cd833aa771654a5e739ce400003828
+EBUILD django-evolution-0.7.5.ebuild 1019 SHA256 7cca333c0eff20f90e0c3f6b01b692cfc6751bf312d1adee0f8887a2158a514f SHA512 85155251613baaa781c6e9e9b99415d1deb33b07f8967c742f94ea74979636283ccc5a46d69b43c3403d36b751c1cd747e4cfc3c3f08b7702fb2a96939ac83cb WHIRLPOOL 6f0d50bb48667fc1110198fbdbfd5758bd219ad6d2c4bff7284081b43af482ac88ed7c3e0a190ecbdfc3d92e2344401043da2136b015d5e36683fb28c447718e
+MISC ChangeLog 3166 SHA256 19a8fe8e36b14829e883e68e3ce3530bcd639b2d8716ce1f3382cf26dd01a87e SHA512 8c8882957b093eb6002d13ada26b7640a48acff10688949cfe247f54053a21425d20d713eeb6d0579404427880314894680e84c0d7e60ee645b80e069d346351 WHIRLPOOL e9a140da593878913f5609e4a710f345a57d5ec3b7f996051ec56915faf9c74d6e83bc7651eac2a46de58a2825301572c2874eb694e33235eb563601aef6e16b
+MISC ChangeLog-2015 3379 SHA256 41614e01d2c2ecfce1fa65c477f26dfc4e4783e70758fedc3026d1a409655bfc SHA512 4c9f4b8d0f77e6364e1b2efecd1f173176a51dfd1b970f74b04a59523a6ecc4234bf06c5b094325be05e79e6d7cc541e4ecf78da656aa8096f05571a6bf1da8b WHIRLPOOL 33a236a25cfa3ef0b0c5891fae6143499fb940fc4e4c3e2d9e92e07d1a5a6d34cf2d8d7d09b5ad50faa4e9f7a3817953e00a93f76e035cdaf9fbd05c7db5ee11
+MISC metadata.xml 329 SHA256 83efc293371489b77d71b971c31b6bb80e5dadb851ea5586242a290fb6325ba1 SHA512 ae6479f3b337a222cb59d793152255434ffb5fa8f61c2cda7fd544a6e983d825efdd842ceb5f5d873cea9f5dd23ec2efd9316f46a6e9370fc88fbb457d6375ab WHIRLPOOL cfa2aaf96e17df65c12329550427abbfcd0c69140452af91ad9e22033d07c28226d585235379d6dd8fedb6eb842d8775e59ac7db795fc658b44dcd8cad4816de
diff --git a/dev-python/django-evolution/django-evolution-0.7.4.ebuild b/dev-python/django-evolution/django-evolution-0.7.4.ebuild
new file mode 100644
index 000000000000..fe8128f22f4c
--- /dev/null
+++ b/dev-python/django-evolution/django-evolution-0.7.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# This is now py3 compatible however is only re'd for Djblets which is py2.7 compat only
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+RELEASE="0.7"
+
+DESCRIPTION="A Django application that will run cron jobs for other django apps"
+HOMEPAGE="https://code.google.com/p/django-evolution/ https://pypi.python.org/pypi/django_evolution/"
+SRC_URI="http://downloads.reviewboard.org/releases/${PN}/${RELEASE}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+DOCS=( NEWS docs/{evolution.txt,faq.txt} )
+#DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	# Draws 1 trivial fail under django django-1.4.x
+	"${PYTHON}" tests/runtests.py || die
+}
diff --git a/dev-python/django-evolution/django-evolution-0.7.5.ebuild b/dev-python/django-evolution/django-evolution-0.7.5.ebuild
new file mode 100644
index 000000000000..2571729bdc57
--- /dev/null
+++ b/dev-python/django-evolution/django-evolution-0.7.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# This is now py3 compatible however is only re'd for Djblets which is py2.7 compat only
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+RELEASE="0.7"
+
+DESCRIPTION="A Django application that will run cron jobs for other django apps"
+HOMEPAGE="https://code.google.com/p/django-evolution/ https://pypi.python.org/pypi/django_evolution/"
+SRC_URI="http://downloads.reviewboard.org/releases/${PN}/${RELEASE}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+DOCS=( NEWS docs/{evolution.txt,faq.txt} )
+
+python_test() {
+	# Draws 1 trivial fail under django django-1.4.x
+	einfo "The testsuite is not compatible with >=django-1.7"
+	"${PYTHON}" tests/runtests.py || die
+}
diff --git a/dev-python/django-evolution/metadata.xml b/dev-python/django-evolution/metadata.xml
new file mode 100644
index 000000000000..0508c776956f
--- /dev/null
+++ b/dev-python/django-evolution/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django_evolution</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-extensions/Manifest b/dev-python/django-extensions/Manifest
new file mode 100644
index 000000000000..75b3ef5d054b
--- /dev/null
+++ b/dev-python/django-extensions/Manifest
@@ -0,0 +1,11 @@
+DIST django-extensions-1.5.6.tar.gz 404366 SHA256 65fb2d714fd5bdb9b08832993c2c8478b25d98c2a3e787696cfe762acae64544 SHA512 4925f1b3a511e554e160b183bab5f6396d7af4c7a4862c01b805fde296de7380416f578f2dc4cfce03b563ed310ced046a9107a688a0e2df382d559a6b0e3615 WHIRLPOOL ababa6595e187b20890830bd815a8c7d745e4c0ef7c613728dfa91fb89b4893596dcf5bff2a47dd3ea56e66987f6fe187446f870ad2ffe262c13926e5bab3b65
+DIST django-extensions-1.5.7.tar.gz 404240 SHA256 7061f4aeedd34e3290e31efa9fb76131c4f1235838e01cb1b28edda7f75945cf SHA512 5a22fb073d89b4dd04b1fdda83928c9e560511252c13652dbcced0ab678dc0f86482662ac63ec98ab5cd12f443c0aac3debe91ed6cfc139ae030cae64d3948eb WHIRLPOOL 2bebf02aed5c1ac98ec3367ba012502c209ad0a1cbe779aa540d9ac567c7d6aa1d8d8ded8803d68068c4d6e0507b31aa0622b952cdd1c4545193481fcb43b33a
+DIST django-extensions-1.5.9.tar.gz 405401 SHA256 59c12ad4dae6cb7a54deac626a0907d8b0d19b5757dc1d15b06374695131528b SHA512 6887df5406e74201fec0adc674176810fcbd93ef249b5433a38c9c783f5e23dfd384649901bf7dc8aa8f04accf731024887cf95fd335982ec84b3d4261a9712f WHIRLPOOL 6310470dbce5f8b728e680842e6d66e6d4150d53d25c58ea9205ac0c29b8735edcde525c1a505ed30e64860d916b62be5ac1de6f6d093b7cf7845c3ef86dde8b
+DIST django-extensions-1.6.1.tar.gz 371907 SHA256 4799534f35eba1c07cb6f9859aa5bb719886769f5d35d2a38e7490ce90c0ce69 SHA512 c16b99e64f4faaa6034ab343a44488d031fcc0e2ec4fe78c7cc426dd810988ebcfa28b8bcce6054188fad3fe2a30851d6df4968aa9518e540208e1af0089c6b5 WHIRLPOOL b1d2a14cb48491ad4d6cf3661d986d855189ede6b6d5b85ae0b33f2c96d9926857fbcfa51a762def175ba580ec290aeaa714d0b74afc08c76c4d7804ebb10fa5
+EBUILD django-extensions-1.5.6.ebuild 1722 SHA256 4bcaddbf7385db5df41c3391321f3f8a1b6ef21d0c55970949bf5de2afe85d30 SHA512 4fc2d2f8551aeb22a2383825c417791434fde3aba2be675d571e2d5006d28ed1340514021ac313aa80c0447499231249a15377382ecde807e734acf6c26c140e WHIRLPOOL 79b88eb4042de6114d52b613cd0341869bd0fd17dd625a63c11254acaaddd20ac04dba8f31b1e2fcb09acecda322ac3aa389e7d39cba48c1bc0d5c4e665da2dc
+EBUILD django-extensions-1.5.7.ebuild 1722 SHA256 4bcaddbf7385db5df41c3391321f3f8a1b6ef21d0c55970949bf5de2afe85d30 SHA512 4fc2d2f8551aeb22a2383825c417791434fde3aba2be675d571e2d5006d28ed1340514021ac313aa80c0447499231249a15377382ecde807e734acf6c26c140e WHIRLPOOL 79b88eb4042de6114d52b613cd0341869bd0fd17dd625a63c11254acaaddd20ac04dba8f31b1e2fcb09acecda322ac3aa389e7d39cba48c1bc0d5c4e665da2dc
+EBUILD django-extensions-1.5.9.ebuild 1722 SHA256 4bcaddbf7385db5df41c3391321f3f8a1b6ef21d0c55970949bf5de2afe85d30 SHA512 4fc2d2f8551aeb22a2383825c417791434fde3aba2be675d571e2d5006d28ed1340514021ac313aa80c0447499231249a15377382ecde807e734acf6c26c140e WHIRLPOOL 79b88eb4042de6114d52b613cd0341869bd0fd17dd625a63c11254acaaddd20ac04dba8f31b1e2fcb09acecda322ac3aa389e7d39cba48c1bc0d5c4e665da2dc
+EBUILD django-extensions-1.6.1.ebuild 1728 SHA256 9f48afb3265c512aa7398d7d4dcbfb012a2599ac46c7c82b4347d5615b4f6430 SHA512 5ead24b9d28206d9ab965855c5dba08eabe894d7704149b88bda1ea29d11d98f33156da47d77d1e00e928856701c215d02b4755327c05247bc29f75908df8ecf WHIRLPOOL e6c0dd3391b0ffa90c971adac36ed3132d08ea6cc8bdaf48e57dc983e33b3a03cad96c66601f9e1b65006dec23a41eb11daa9609c05b9abd02f2b7cce2755d2f
+MISC ChangeLog 4438 SHA256 d8da65f4712aeb83b1f980637d7f15c8619d20867a1d3da6aa00dcdeb235d770 SHA512 98306dbab98a17bd6813bc83f214c068bbb0af6e9a6e105bbb1d1c3f90aa658039c73d9bc06aa1c88c053023aee45523ea8b6e32a4e72d732c58852148c4d6f6 WHIRLPOOL d3d8e66bfc3889e89e00c4b76247f7a53b70480886d42114f25c5d351520687756aceca81c81f78c724f6fce1909cc5cc917c6478582a33d1668faf6640dbc1a
+MISC ChangeLog-2015 3287 SHA256 cee521400485c06dfe561f8ac1cb9c8ba780bf60ecff7193b20bd5a4fd01ce84 SHA512 af0f56476fca43715e10a19942dabfd7443a49d075a1296a22be8b86ecc890cf8b96cbde59a84e45305a6ac9d1bf1bd134ea8616862c92bb6a8e473eacfcf418 WHIRLPOOL c0f0fb3cb47e13e34f58bfdf84ae691455aa0ebc4d24c072592840f5f93c2051985208db938cd9a1d3e7a8f5f08b383e2e7a9403553953de70b7ec7473296e7f
+MISC metadata.xml 417 SHA256 ab653c0a4b7decda46760732e5c16bae0ab694cf931888cf2671551c6aaa7558 SHA512 c1989d806df2e1b9f9e12c7e8817032da3ee208b24bbe3c8c5c09064bd84bddc74433a4998f793a25ba6903ff697bd442a9143a3f460c3df67822b7c19a965a0 WHIRLPOOL d54e36caeaec3bbd9448d830e8b07071b1c1fefe2b6c6bd3f4f62d351f82ad6a4501809cc9d4e8d16f525103f85fad52d0b9db42844cd165e56606ed6a16103f
diff --git a/dev-python/django-extensions/django-extensions-1.5.6.ebuild b/dev-python/django-extensions/django-extensions-1.5.6.ebuild
new file mode 100644
index 000000000000..28110b301a0f
--- /dev/null
+++ b/dev-python/django-extensions/django-extensions-1.5.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Django Command Extensions"
+HOMEPAGE="https://github.com/django-extensions/django-extensions http://django-extensions.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD || ( MIT GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+# Req'd for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+RESTRICT=test
+
+RDEPEND="
+	>=dev-python/django-1.5.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		>=dev-python/django-1.5.4[${PYTHON_USEDEP}]
+		dev-python/shortuuid[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		)"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test -vv || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	echo ""
+	elog "Further enhancements can be achieved by installing the following packages:"
+	echo ""
+	optfeature "Use ipython in shell_plus" dev-python/ipython
+	optfeature "Use ptpython in shell_plus" dev-python/ptpython
+	optfeature "Renders a graphical overview of your project or specified apps." dev-python/pygraphviz
+	optfeature "sync your MEDIA_ROOT and STATIC_ROOT folders to S3" dev-python/boto
+	optfeature "RunServerPlus-typical runserver with Werkzeug debugger baked in" dev-python/werkzeug dev-python/watchdog
+}
diff --git a/dev-python/django-extensions/django-extensions-1.5.7.ebuild b/dev-python/django-extensions/django-extensions-1.5.7.ebuild
new file mode 100644
index 000000000000..28110b301a0f
--- /dev/null
+++ b/dev-python/django-extensions/django-extensions-1.5.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Django Command Extensions"
+HOMEPAGE="https://github.com/django-extensions/django-extensions http://django-extensions.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD || ( MIT GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+# Req'd for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+RESTRICT=test
+
+RDEPEND="
+	>=dev-python/django-1.5.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		>=dev-python/django-1.5.4[${PYTHON_USEDEP}]
+		dev-python/shortuuid[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		)"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test -vv || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	echo ""
+	elog "Further enhancements can be achieved by installing the following packages:"
+	echo ""
+	optfeature "Use ipython in shell_plus" dev-python/ipython
+	optfeature "Use ptpython in shell_plus" dev-python/ptpython
+	optfeature "Renders a graphical overview of your project or specified apps." dev-python/pygraphviz
+	optfeature "sync your MEDIA_ROOT and STATIC_ROOT folders to S3" dev-python/boto
+	optfeature "RunServerPlus-typical runserver with Werkzeug debugger baked in" dev-python/werkzeug dev-python/watchdog
+}
diff --git a/dev-python/django-extensions/django-extensions-1.5.9.ebuild b/dev-python/django-extensions/django-extensions-1.5.9.ebuild
new file mode 100644
index 000000000000..28110b301a0f
--- /dev/null
+++ b/dev-python/django-extensions/django-extensions-1.5.9.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Django Command Extensions"
+HOMEPAGE="https://github.com/django-extensions/django-extensions http://django-extensions.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD || ( MIT GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+# Req'd for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+RESTRICT=test
+
+RDEPEND="
+	>=dev-python/django-1.5.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		>=dev-python/django-1.5.4[${PYTHON_USEDEP}]
+		dev-python/shortuuid[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		)"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test -vv || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	echo ""
+	elog "Further enhancements can be achieved by installing the following packages:"
+	echo ""
+	optfeature "Use ipython in shell_plus" dev-python/ipython
+	optfeature "Use ptpython in shell_plus" dev-python/ptpython
+	optfeature "Renders a graphical overview of your project or specified apps." dev-python/pygraphviz
+	optfeature "sync your MEDIA_ROOT and STATIC_ROOT folders to S3" dev-python/boto
+	optfeature "RunServerPlus-typical runserver with Werkzeug debugger baked in" dev-python/werkzeug dev-python/watchdog
+}
diff --git a/dev-python/django-extensions/django-extensions-1.6.1.ebuild b/dev-python/django-extensions/django-extensions-1.6.1.ebuild
new file mode 100644
index 000000000000..ba406de0a4a0
--- /dev/null
+++ b/dev-python/django-extensions/django-extensions-1.6.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Django Command Extensions"
+HOMEPAGE="https://github.com/django-extensions/django-extensions http://django-extensions.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD || ( MIT GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+# Req'd for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+RESTRICT=test
+
+RDEPEND="
+	>=dev-python/django-1.5.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		>=dev-python/django-1.5.4[${PYTHON_USEDEP}]
+		dev-python/shortuuid[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		)"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test -vv || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	echo ""
+	elog "Further enhancements can be achieved by installing the following packages:"
+	echo ""
+	optfeature "Use ipython in shell_plus" dev-python/ipython
+	optfeature "Use ptpython in shell_plus" dev-python/ptpython
+	optfeature "Renders a graphical overview of your project or specified apps." dev-python/pygraphviz
+	optfeature "sync your MEDIA_ROOT and STATIC_ROOT folders to S3" dev-python/boto
+	optfeature "RunServerPlus-typical runserver with Werkzeug debugger baked in" dev-python/werkzeug dev-python/watchdog
+}
diff --git a/dev-python/django-extensions/metadata.xml b/dev-python/django-extensions/metadata.xml
new file mode 100644
index 000000000000..42c1614f9ee8
--- /dev/null
+++ b/dev-python/django-extensions/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>dev-zero@gentoo.org</email>
+    <name>Tiziano Müller</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-extensions</remote-id>
+    <remote-id type="github">django-extensions/django-extensions</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-filer/Manifest b/dev-python/django-filer/Manifest
new file mode 100644
index 000000000000..e20c0d76892b
--- /dev/null
+++ b/dev-python/django-filer/Manifest
@@ -0,0 +1,6 @@
+DIST django-filer-1.2.0.tar.gz 1100877 SHA256 2dd61aabfc36ce2ec516b81b3ac36bc8c65b7ffd8498af064d9b9c01498e250b SHA512 b3cf4d028f0e8fb3e8a43d18002e8f8a2659cb57281fbc8c6e2d1ce6cdcfa165f627d0e393f07eb0ce0aec86f7d99aaf6e6a418334faa6695644d8aef65f5993 WHIRLPOOL 1eb588616fefc34724e6b69166c745c8b06bab0392e6df34dc74b98f970759ad3c1d20f154e36832e3d62a2bfc3177728fdd4441e60de177347977baee209b4f
+DIST django-filer-1.2.7.tar.gz 1269205 SHA256 657685172466f1f63dfd8aba86a7ea732155b5e27a7514ff198686d2eb6d7e76 SHA512 681f31bf7d3c781e7ef0f1833cc666f993403da527ffa8862585b21b8ebef1eacb2c856abfb1b41028a500eb2fb6533a869da3660a4606ba0c435702fdc7ad9e WHIRLPOOL be7bd42f84125e148bdf9f0db2d5fdf8bcc45515aebce13f2b2fae95e35f7c27a494fc27a58d9311d31bde10066b28b7105ccd622b962e99ff3f5c4f217a6752
+EBUILD django-filer-1.2.0.ebuild 608 SHA256 591f66763af75a0d9026df21a14de878a30fd01f55b3e613475d0d2abfae3bd0 SHA512 ffb4971186d63c53546e1e2c37bb6107db207787f755aa4f12f11c43bfdaef6f4ce599aa3ec4435864bb4d30b000f210d870b4313f3775fa6f9f058dd7b66fb3 WHIRLPOOL f3eba230bf346e2ab6bfdde9e7c057320efec039553cec91ef7e4ae464b717f417064a6034a7df850ce147eebadd4055c2da930ac25ddc0c3375e1f16c8d031a
+EBUILD django-filer-1.2.7.ebuild 708 SHA256 a33df837a4c207956bd7d47e7e2e3b432b816eea07319693ee813da0e6bb4cf4 SHA512 909376d9d86ec1d231245f19a690b620d4962d09ba1108d3fe3f7d122639c9f6a841ba291e459196594447cfbbe66c77fc46ea958fb0d174304dceff3a5783bc WHIRLPOOL b663647e46ef2fcd2d3fb087ec5d4cca38180a0db34f74143a6c73e6843ce5c135b4a7d2566d8fa162b149315aa7131950b2232ca022456c886569211b09040a
+MISC ChangeLog 1910 SHA256 6e10bdb27757ade9dd519caed86260994b1902a1794cbe2292836a2954ef7464 SHA512 dbcfea2caae2b18adbc1b4cc68530b858ff268d400039d5c8bc1d806bc544963a9e9ad07876ce3b25c4d46cb63ff80d07610bebbf375958e4cfd5cf19952cfe8 WHIRLPOOL 9a77d23b9e866377baacd57c9276e68d436f13a37b1c323f063234700aecd26022d80e945277daa6e01d78a2041727d6eda4932ff4d547c454029de956cac8ce
+MISC metadata.xml 298 SHA256 9e31402dce3a7b92224141836638eac4179da8c095728dd1f1b3a3e1ba2b3961 SHA512 84755a8d4f4c0a76aa02e3815fd158356757561752bed22c836e7d16cf303683a0ce4f5558e615cb0745e28b5eeefddfd57bbf52b6cb3731becb2a0e6ed83058 WHIRLPOOL 7ba0790ddfcf0c36dcbbba29aba72b70fee5118112e72b16946f3056c9a17c53e83c17b8bcff4f214848bdceba6208e7addfc172f0a2c6eaa65ec1f150cda3f5
diff --git a/dev-python/django-filer/django-filer-1.2.0.ebuild b/dev-python/django-filer/django-filer-1.2.0.ebuild
new file mode 100644
index 000000000000..636bc3e68c9a
--- /dev/null
+++ b/dev-python/django-filer/django-filer-1.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="File management application for django that makes handling of files and images"
+HOMEPAGE="https://pypi.python.org/pypi/django-filer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.5
+	>=dev-python/django_polymorphic-0.2
+	>=dev-python/easy-thumbnails-1.0
+	dev-python/django-mptt
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
diff --git a/dev-python/django-filer/django-filer-1.2.7.ebuild b/dev-python/django-filer/django-filer-1.2.7.ebuild
new file mode 100644
index 000000000000..689e1625dbd8
--- /dev/null
+++ b/dev-python/django-filer/django-filer-1.2.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="File management application for django that makes handling of files and images"
+HOMEPAGE="https://pypi.python.org/pypi/django-filer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.5[${PYTHON_USEDEP}]
+	>=dev-python/django_polymorphic-0.2[${PYTHON_USEDEP}]
+	>=dev-python/easy-thumbnails-1.0[${PYTHON_USEDEP}]
+	dev-python/django-mptt[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/django-filer/metadata.xml b/dev-python/django-filer/metadata.xml
new file mode 100644
index 000000000000..108f02cb6d63
--- /dev/null
+++ b/dev-python/django-filer/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-filer</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-formtools/Manifest b/dev-python/django-formtools/Manifest
new file mode 100644
index 000000000000..8f0e48dabba7
--- /dev/null
+++ b/dev-python/django-formtools/Manifest
@@ -0,0 +1,5 @@
+DIST django-formtools-1.0.tar.gz 70505 SHA256 647a5855277dcf335902eeeeeba3056e439493e6b7de70b942c988a6d8d70e04 SHA512 828ea5f5057d7ec72ab6cc6613e8af950f16595115bba658892e15aec39498f6e7c3dcb5c50ac4fc7ef54e12a640ed93e76a968f41bec59388630cdc43c9e3ce WHIRLPOOL ef8371e2e41b52b7c58fae2a5c58eef63354fddeeeaa2eb7808df45d003998a955842cf395cb07ce8cb7ea003b01f16b5834c2441ebf8548cd5e21d4ee0f2797
+EBUILD django-formtools-1.0.ebuild 645 SHA256 bf4893cb84ef77eac523de64073a29ae7bc5147354e6406bd964087a19b514c1 SHA512 fe13993bdc72e7fb947983165784fbe7f831ba7c0210ed2ebb7e296e4315a41b6f826c69744477ca6b2377f9e8710b44cd75a9881acc8182546939c0aa7c2ba0 WHIRLPOOL c44ca2151c87378821326c7f76ee24d324b8bb06157a3ff59611412eaf1aee74c8c5affa34dd8b7b65d2c55bb6b73013c4bd7e3c960ead5a00146d53e408f9b5
+MISC ChangeLog 2727 SHA256 ca7f52819fc2412f5ee8567e4d14ed4db6d8439b5aed879e942e1207d95fcc47 SHA512 c982d89f89e0b18e6ff4df310cd98eb7a56841ce26b898085ef4eb393fc8fe59392a8b79d426ce4d25f439775de8d3f036e9d04abdcf33c418a2bdb1e579ce81 WHIRLPOOL a7b587985eaab6291bf0a35ff59dc336d5985ea6353929274b828721f506fafe0f01f00270f3464a42e635480a0eb9a67b7ce2fd481fe8e68a582c0d798c0e23
+MISC ChangeLog-2015 486 SHA256 45ecb7033d5157ba4ed89e57e4a2aaaac710a9ec5598b7cd0e28c41023b3c054 SHA512 b68f514bff2b98f35171cf5bb4e966eb1ab787633670112afce7c299c34f6e1d7353da2916087dbd65e04dae0f1afd714dec9eaf351ec6f7535b0383c573e9b6 WHIRLPOOL 5cf3df0e49802a1f6c9fabc3ff2aef923c494a45b3a663fa250d3e5fe7ac62104ea549ea4b7f3aeccf8951f1552ee494f4dab8de20641d1253637beea5902e56
+MISC metadata.xml 329 SHA256 7d9d7c103b5f4de4aa0a72a6bbd8bd7a375cc5db9da9baffd066e2b7e7f1b25e SHA512 fa9ff839567d05492ed9d6e53aa7bf4296c1235c9ebeefd75d3edc8f72353aa3844533b4d887975943ad0195ed5339524e411c04e964f8dd3e6bce07135951bd WHIRLPOOL b282776a6461cc0a0b68e6c5b43f10fc6cc39bad46e2401f1d377fb7be106ac5b850aec32e0d5523da83fe4d67a2d47c5e892d35ed4cd77c74a1f4f7d7a0e262
diff --git a/dev-python/django-formtools/django-formtools-1.0.ebuild b/dev-python/django-formtools/django-formtools-1.0.ebuild
new file mode 100644
index 000000000000..4ddb41e6194f
--- /dev/null
+++ b/dev-python/django-formtools/django-formtools-1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="High-level abstractions for Django forms"
+HOMEPAGE="http://django-formtools.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="!<dev-python/django-1.8"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/django-1.8[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	emake test
+}
diff --git a/dev-python/django-formtools/metadata.xml b/dev-python/django-formtools/metadata.xml
new file mode 100644
index 000000000000..cc21245f4343
--- /dev/null
+++ b/dev-python/django-formtools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-formtools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-grappelli/Manifest b/dev-python/django-grappelli/Manifest
new file mode 100644
index 000000000000..363827520ad1
--- /dev/null
+++ b/dev-python/django-grappelli/Manifest
@@ -0,0 +1,4 @@
+DIST django-grappelli-2.7.3.tar.gz 2288581 SHA256 230a9c83c28c9ba563df9583bd212354ef262689fb1467cb28d80229fd1f5ccf SHA512 92b252b49c63bda836cafc87f4910b7bb59072dd5ec44fb3c17140706a838257c7c5ba19170c69bc788988cd29e06af2d72278ef1732d5a94f39fb121cb28d61 WHIRLPOOL 25e4160be04185f7c74683b5f6db57e1de53b05234db3ae7925d4ac6f1e0e70e461d24f9fcf0860a833bc48a74df1f5087c4ceb9b8b71fa6c6aaf8afeeb49cf5
+EBUILD django-grappelli-2.7.3.ebuild 522 SHA256 e991e5c928a8b7b6a3bb0aaf17c4de3b79bef6b1cf87951cdeb2fe519c346dcc SHA512 f790756635fdff9c0cd0ed626523d6e9ee02304408abc9bef89dd875eb9d1f11ac901c38ad82cc92e782a5052de80a04b7991d259c75da82c5311c562b645704 WHIRLPOOL 81a6bee2442bbb2bcde59b0937e94b416d57a96578bd3e5035800324415f679fcedaedc885330beff2d2b63c60abb419ae4425177637d7144e155c04b2865440
+MISC ChangeLog 1593 SHA256 a64f84f1f48ac305e2cc62ff7655390f21123971d18c38396756548783510b17 SHA512 f4ccceb74e81d9acd4464212a31deb2012d5f089596cfb79ce8e0627cabc0aa803bef0378319385e233fbcb4de67caac9b209af58f62b5bdf226be17a57107f4 WHIRLPOOL 0c2fedb025a5f363116aae32cf604f5f8984e72d2224c9c3a12d9609dd639c67716bea7b6504a352ff530d3424339604371058e53c5632b4d2d0225827f71038
+MISC metadata.xml 387 SHA256 469e350683fd2288145b17bb41f7c7e0162b4177a28c9105804ea8260d09c91e SHA512 28da3373aa6c6d9353342e3ab185c4345ea881eb0b32e8b3b915d111d7a5425fed9fcf64b802d0bc399aee168f5f65649f05f46f398f3ea164e0a32be819d339 WHIRLPOOL 43df852776a88d4969dd0337b750e30ab50302ebca69a760716eadb837a04c6e8f2b7b49a355e955ff315bebcb2907e653b8eed88f54272fe64daa65c995d733
diff --git a/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild b/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild
new file mode 100644
index 000000000000..9c4cfe84f26b
--- /dev/null
+++ b/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A jazzy skin for the Django Admin-Interface"
+HOMEPAGE="
+	https://pypi.python.org/pypi/django-grappelli
+	https://django-grappelli.readthedocs.org
+	https://github.com/sehmaschine/django-grappelli"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/django-grappelli/metadata.xml b/dev-python/django-grappelli/metadata.xml
new file mode 100644
index 000000000000..0698bad1809c
--- /dev/null
+++ b/dev-python/django-grappelli/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-grappelli</remote-id>
+		<remote-id type="github">sehmaschine/django-grappelli</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/django-haystack/Manifest b/dev-python/django-haystack/Manifest
new file mode 100644
index 000000000000..9d10cdfb81d6
--- /dev/null
+++ b/dev-python/django-haystack/Manifest
@@ -0,0 +1,7 @@
+DIST django-haystack-2.2.0.tar.gz 155409 SHA256 31f5f08524dc46927a5ae1d4024d6496b5f990b0ed1012ad338293636d38fb78 SHA512 7bc27965650a759874c7e90b332994930a9318a4ca01245b04ade97559a6a125655c8a4fc182a3bcac63dbcd4bce76e71950218dff3116d3092d96f94e63e137 WHIRLPOOL 9869f57717a48edb3e27c7f7993ea03372620d81a71ee7f0dcbbd6a7e9bf09acda670b6d142f393ff242cb20af311962f99ca2f3821b161d92fe004dfc7d8d72
+DIST django-haystack-2.4.1.tar.gz 160757 SHA256 8eac12672ad081f35bde9f32fce16e649c53efe48d2c883f79b1a7f330529b11 SHA512 5d711e13abf3fa7db5cbac31ddcdc2842aafb844cfafd8bad792aca8dfae8f91fa7586af8aacf266bb12e02aa04ad9aecfe903ae40d10f72ba38e0c4b1b1b298 WHIRLPOOL d4aeb6e26266e53a33920f3dac24e69f25833e37925794b1fba095634eb7624cadf80ac7925e74f716dc99bc22fed16a9c560ba15372c2f978bed326ffe51083
+EBUILD django-haystack-2.2.0.ebuild 677 SHA256 d0e72a76ee101b1a0b32082ae403bbce85b819d32a658420aed965be43ad5112 SHA512 812a32e2457cd77d32be50aa4319edabc414a77ff7b841b4b339f2400fee7ab0e1f8cb461342fdca3b0ddb026df42d4323a93b946b17d106497926227695844b WHIRLPOOL 6d6a1fe95133bbe56d56488a03af03b42bae7512220519bab7eeb742a3c486d119c46aa7577b8b68e8a2d14e8be0ef3ceba161043e072386e48feb617517bfa3
+EBUILD django-haystack-2.4.1.ebuild 1232 SHA256 7b0738a627f08142a9f04f6b3d3f013cd8188433e4c8325b6316179c2c01df48 SHA512 f79a0fd78642369f918b8671505ffd453f1edd3e56f414d9345fd00ca35bed17a1fe4ac8ab90209f38b95e5b5183bd338c3d31d489f983fd7fb5888fdeeaab83 WHIRLPOOL dd2c50bb2bfae2c2cbf4206d4d79140466849812c89e0fae98534e20dbf8ee23ac1653f5bc2ec6c2709669f282cf66abbb1e7138aad0e67fb1703b646d3978fb
+MISC ChangeLog 3109 SHA256 ffbe04344e5c5f46c92571616faa7ba6b6421e3e2b3b8bbe24f6b38b36da7cce SHA512 e37b2241593272ecae3f369e4c8fd44b6c85605767169448c3b5785497f5e4bdd308d0f7fb5af27a5482386e2f82b85c73fb9c30422dbf01d739b716d562334b WHIRLPOOL 3312a94799338aea3b7a0039993b934ff40c07779b0464d1daf5aa52c2e0dce55cce53b2908a7f222f2c97483c3e0e87cb482fa16f157b72684399b6ac8dd738
+MISC ChangeLog-2015 1229 SHA256 5c54a9428e55bb9f9568ba8efdf192987de452c30eb27d04c21eaa047c20f0f9 SHA512 80b8b7017b5766bc6d94250706cc269447a283e2d7cbf53485f63ec594e1dca2c5d072fa4442a4fe0a64058956a7af31f6a33883721f947c36a116d2d30b0c07 WHIRLPOOL 604ab71e61945b21cc6697063733c5eacffe99efa2d5b24609be2d3f0649816c64bf8fe1d53c96d82d3526b15757816c61ac2337e44847315e20ae94e54f8f60
+MISC metadata.xml 328 SHA256 4d7d1aebab91b8b310117f27527e42fb6c740695646e9d8a77642ca3a4fbf184 SHA512 4e0c90a27864f5a2106e1b665b98a69de67b13bd03343b9c3b82eb2f7c8bca1f8cdc82245157d687148adca108ecaddfcb202440d4f049730375e4735ca92121 WHIRLPOOL e8efab8f3030a2a4ba3a9abf38018a7d18695fb3b5db72e0217c6c40395960898d5c94a86dfcf5ec707be6987a383b286dfc2b513679b563c3ea9d249d8351e0
diff --git a/dev-python/django-haystack/django-haystack-2.2.0.ebuild b/dev-python/django-haystack/django-haystack-2.2.0.ebuild
new file mode 100644
index 000000000000..8820d8c4ac27
--- /dev/null
+++ b/dev-python/django-haystack/django-haystack-2.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Pluggable search for Django"
+HOMEPAGE="http://haystacksearch.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+RDEPEND=">=dev-python/django-1.5.8[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-haystack/django-haystack-2.4.1.ebuild b/dev-python/django-haystack/django-haystack-2.4.1.ebuild
new file mode 100644
index 000000000000..6a13b9ad420f
--- /dev/null
+++ b/dev-python/django-haystack/django-haystack-2.4.1.ebuild
@@ -0,0 +1,50 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pluggable search for Django"
+HOMEPAGE="http://haystacksearch.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/django-1.6[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/elasticsearch-py[$(python_gen_usedep 'python*')]
+		dev-python/geopy[$(python_gen_usedep 'python*')]
+		dev-python/lxml[$(python_gen_usedep 'python*')]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/pysolr-3.2.0[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/whoosh[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	"
+
+RESTRICT="test"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	${EPYTHON} test_haystack/solr_tests/server/wait-for-solr
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-haystack/metadata.xml b/dev-python/django-haystack/metadata.xml
new file mode 100644
index 000000000000..c86b5e29ed9d
--- /dev/null
+++ b/dev-python/django-haystack/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-haystack</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-international/Manifest b/dev-python/django-international/Manifest
new file mode 100644
index 000000000000..03920857e436
--- /dev/null
+++ b/dev-python/django-international/Manifest
@@ -0,0 +1,5 @@
+DIST django-international-0.0.6.tar.gz 17104 SHA256 21e94cf90ac6befc267132916b8ca1b33100f95dab544184f42125968fb3b946 SHA512 a7ef5881467b88bd1d611476a8bc43ba54731f7bea8abd8790ca7b6912480c4b87ebc4d37a41859f60738d961b4a6c0221fabce5bc2d90c4fc83c8991567990c WHIRLPOOL 721196703beed43a88ee80a60a83ea037a75be07828eee787427018867b0ea0ab64ec1ad75b1a9a16e86bfd6460b8a393532c553b82bff78adf3e8e5f9a341b3
+EBUILD django-international-0.0.6.ebuild 550 SHA256 570a27fad6e80779370689000c0d539c9530e68de8b6b2bf7d1a224a6fff1fc7 SHA512 fede2ea78364c4ebe5c84e04ec64b0d9d1b3608f4725ba765ad3802e3880cfedb084ebcfd579c4ca9d2b34caf5c39484024d461ed8952fc120d4e29beeee384b WHIRLPOOL e0b66180333936aa205d537c980edf2ffb6ad45bcbd64195401aa4a53d8b84f5dd0cefd7bab83fb17134bf617819d3aea6bed44b9eb09991586629f19e9f9788
+MISC ChangeLog 2741 SHA256 fab160e96ec877cd0660aa69b2c618158d67ea8e2cf0c7b125297b87b6b03cf0 SHA512 0fd59ffc43d7e11adb80d7cad9d2c62146f8df67771455ff998798e41a61ae90f172d4c6e140abb6b487beb15a7c02118d578d1af8987dd053ee0a8120faabbb WHIRLPOOL 044f251331aee5798fe14eaaac3dad05d93a46fb05d2a0d43ca493495074294644420966d273b57d0268a0b6b6733807ab5b0cdaae8105f10b7a0b764b9a871a
+MISC ChangeLog-2015 1663 SHA256 4593c30f617db6d14cf2fe97efa9c2e005051504786a40e546e2b18518821ab2 SHA512 3644a85850ed12429246a1772cbb4d08c930a19c7783a14e83ee468172f41f4e11d9d30bbd8c8eba6c36a61d5f222423dbe96a3b25a24b1ae5316c42a1f2b6cd WHIRLPOOL 7cff57b4eee8677512c1be0c58110105916ace3a4422207c07b64d4fea24d653f6607ac1bc940d58028935f3f7c5c3a7f552d7dd6de3a173599b9bd8393025c3
+MISC metadata.xml 406 SHA256 d5192bec204987d97d09894b16bed1b2ae139378b23122cc14d20518683c9989 SHA512 9471858b805b4152c538ea1e615c0a7ddb08c967afa1b3a3dfcc268bf0defe66a3584f5245b436903a9aa7075fedeaf09e720902d264a9e42fa8c0eaa112c339 WHIRLPOOL de38dffa1737bdb60d05c9f186942edbf3e2c1f03b2ccc36cdf09c40e3bae99f641d18a2e7204fe73ebec7e9aa027d29de1ddb9da40c556489ec5b4db83eb9cc
diff --git a/dev-python/django-international/django-international-0.0.6.ebuild b/dev-python/django-international/django-international-0.0.6.ebuild
new file mode 100644
index 000000000000..c87ed9a74b40
--- /dev/null
+++ b/dev-python/django-international/django-international-0.0.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Country and currency data for Django projects"
+HOMEPAGE="https://pypi.python.org/pypi/django-international https://bitbucket.org/monwara/django-international"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-international/metadata.xml b/dev-python/django-international/metadata.xml
new file mode 100644
index 000000000000..eea49876508f
--- /dev/null
+++ b/dev-python/django-international/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-international</remote-id>
+    <remote-id type="bitbucket">monwara/django-international</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-ldap-groups/Manifest b/dev-python/django-ldap-groups/Manifest
new file mode 100644
index 000000000000..3b8f8410f25f
--- /dev/null
+++ b/dev-python/django-ldap-groups/Manifest
@@ -0,0 +1,5 @@
+DIST django-ldap-groups-0.1.3.tar.gz 8886 SHA256 39abf7f66e86163504055ae94ce2a58233b6dc6d50fedf2e436d63224090830a SHA512 0e9c5a1f1f38042f0a0dc9301c667a00b144ad0cbf15afd69cc44e241933626e0536752354ead4ae937ff3625c5ded86edaf0592a8e2c7b9f39ab86336e7d876 WHIRLPOOL b96a873d23632d1f8e3b94b6845094882beb994dfe3ff66e30d74b46137825ad2d0c99279846a869cbdb8cd1109c3c138f17cb9dcd7475f6e46e8ddf144a47b8
+EBUILD django-ldap-groups-0.1.3-r1.ebuild 534 SHA256 0363f288def60b11d6f78410490adaba5c52b01688d8528b4b5748402e341ea3 SHA512 850c74acf32f6518c1d57e30a0c86019c47e51263b9ce7aa194a5952c454d5a19713f9afd6a9c5060c81f42a1995e57c35f612b52b918c863b5113bf4c470684 WHIRLPOOL 663b3f1ac819bbacf34a4898a834ae3f68b0965999cc619c66bb0c67a08683c8320308842e470259585edba6c2b5fad2711329796e58c61c63852bcb73a902ea
+MISC ChangeLog 3487 SHA256 e8d6b2d208d6a2ddf7045b0d234de9ce859accf2ade95e945a58117c60b335d2 SHA512 e56602f763e0434cb8b8210c6a4b15c3e152d0d4bb49f39397eedcc7d114a5cb4e051088cff675d525603f02a0650d1702e14953651c9edf907a678dcdfd4f5d WHIRLPOOL 1825572cb1dc6ef696ef8be993d6759b497c9c2638e19acdb93df4c7b003d04682a7cf5483de9bad3e244ec04f3931f0261bea0f251c843ce7390d5f656babba
+MISC ChangeLog-2015 1077 SHA256 fed630290b32a1b9e8e4cb44893970b6b854667809a197f61833cb4dfb20b50a SHA512 d41394e104e9eb9e1f22adfd1facf798f3f6a02ee46ceebc5feb31992998edd23a4d1e2c98ae5f6140d3b1bc81226e6719b84d8f9b8ef2021690891831a749cd WHIRLPOOL 1dc44543fa177cb2d1509191321def22afe5f8839200f288ebf61b996548fcaf5920926e0a340754de85081b50f480cd4fb60abd31a887c75a10e48a14f84ec9
+MISC metadata.xml 321 SHA256 c92114f7117257add571acf2847da9e44527d098968860f77b68e74f7f5050f9 SHA512 e368492c1eaa49b914072c7069dd3a05226bdd6851fe43a099cc744330c3dc90d49cd94025ac229ff362f7564388ea9474f09df3658c1953c67ee21b62b2bc4e WHIRLPOOL 7e87cc75a85d5d2a8d873a56b38e6fa57e91830f617c4a4b042592fbad7eb80831388c761e606ebccba1912fc31b74aa4c68bd123608a4552eb9fda205c14517
diff --git a/dev-python/django-ldap-groups/django-ldap-groups-0.1.3-r1.ebuild b/dev-python/django-ldap-groups/django-ldap-groups-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..53cb862e9074
--- /dev/null
+++ b/dev-python/django-ldap-groups/django-ldap-groups-0.1.3-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A reusable application for the Django web framework"
+HOMEPAGE="https://pypi.python.org/pypi/django-ldap-groups"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="${RDEPEND} dev-python/django[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( ldap_groups/README )
diff --git a/dev-python/django-ldap-groups/metadata.xml b/dev-python/django-ldap-groups/metadata.xml
new file mode 100644
index 000000000000..c6206f119801
--- /dev/null
+++ b/dev-python/django-ldap-groups/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-ldap-groups</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/django-ldapdb/Manifest b/dev-python/django-ldapdb/Manifest
new file mode 100644
index 000000000000..202afe6b95e3
--- /dev/null
+++ b/dev-python/django-ldapdb/Manifest
@@ -0,0 +1,7 @@
+DIST django-ldapdb-0.3.2.tar.gz 11029 SHA256 b6bab3a4501419ff9ba1e50076b67c5f92e1c0b3d4b2c8c40014aadb5c06cc6d SHA512 d1f88f754bebda53b5f51c5120b070ce93e229a1c31d59bcdb5cbffdfdc1d590479ae5a2024805705d8bcf51bad8787d578a348ec78ffc5565bdeedb9ffa7b96 WHIRLPOOL 013869787a85a822712ea2331272651d43462320319256d5e07355502a7392cd601b084492f03fb40b2f12fa733ca0e87ecc283a4fc7ba71fd37bbdc9d1b0eb3
+DIST django-ldapdb-0.4.0.tar.gz 12068 SHA256 7d0946271c4e22e41b21b3bbaaf8695f00be73a9757da3cd16f8ddf59dea8dab SHA512 4527bf443bd72ad3adfbd4ac7333160ba80e8ec525787b01bc6e0cd9ad007e6d7742222d60cab65a3e3cfb70307e575f096f1f244bbfc350796890c23f10338a WHIRLPOOL dcc599389aa2f24b03dbc98f4de2367ec2cf79639daa385ef314f7851ff8d04fba3543f0ba76447a1e3c1f3bdfbf31311debf7b2bed161efcfaf976f16c18dbc
+EBUILD django-ldapdb-0.3.2.ebuild 520 SHA256 d4bcd54ccd6fd3f22b3aefb2a4ba50392058cb947d4174608f498b6074c6b310 SHA512 9821cc09607193b202e7c75a54480a7251f207e729fcab5b3abd894837758d2ee5b0f8a9dd2e294053a6e6b5e08aed644785984fd9449fea9a038ab2f789ed8a WHIRLPOOL af86ef8b053c67a3b1c5da6bc14bc91661df8411e115748f8431531562ca5a75f0894853c6a1e0f6255f94d689cd7d1ccfbf59971ed9999aa89128a4ff34315b
+EBUILD django-ldapdb-0.4.0.ebuild 522 SHA256 ed8d9471480d4b32bdeca260161b8a805d283f020dbf05346213faa4742cab04 SHA512 62f9644c4af77c8c6d39a528c4082c05a3e2e8832979cc157f138e89bca60ce4612d88c34c3680de624589cea55209fbe04e28a8683ebae629164835952944c6 WHIRLPOOL 7a2ab62fa4bb2d525d766353fb359dda76560dc67c4a99e04577b619084d0a2ea1390442874643d165035175af17b9c42a713bcbea2112e50868d6de2337aefe
+MISC ChangeLog 2747 SHA256 757a8371d3692d348e377dc4245721ce8f36ee9809a0cbed7b548f99f9f9b790 SHA512 c432198540304f8a513725d2aeb11cd9593b7a203c459ec3e680dad01dd647be3bad97e50bb3d52a7565d402c43a83ae6f14988b42236e1ca8135141992d6513 WHIRLPOOL b94c2530d642fe8a520266f1d4cf0c14337f9f326db32a6265fd69ef4bd5815e9ea0ff96ac996bd56d5166f463591242da277534ce661eaa10bd17a9c4f244b4
+MISC ChangeLog-2015 2998 SHA256 bb4b0b44cf4669910759fc4deeab42a4c53eaeef1056b58462ec3ad5c5625400 SHA512 14b6d5c264f0b521083483c490707b33c9238e0082d528af3220ee43717d0d2c90eb46ecf7efc3bff55777b411dee177a84f7bc8d7b4c818b7edb6514fd97649 WHIRLPOOL 5ff4fccda2313bd41c77e634382ce0309b33c2ef29a560e876eb613edbc566f57a6017c4d9f8aeb8f932759baf6329b17b232efc70959986b457ac1125eb580b
+MISC metadata.xml 388 SHA256 796b873fc21a171a5140137808dae194ea74e5c6a1b1a7d52ff4e6a72540943f SHA512 81ae290bb8b9f8ccd3ff8a5982f7829e5ec8c3fa3926cc786796f03461e77e4485a50c6ce9a88a65864a76976403eacfd6017510a6e9c9f637ef001d97c44027 WHIRLPOOL 9afd0deed88bed820ba9d35ead17bbcd3d40faf934bc348aed68edc816f2c1edb788f6cb68a4ef7e22376ea9d000f855631a85dd44abb7006ce9f8e44e282a07
diff --git a/dev-python/django-ldapdb/django-ldapdb-0.3.2.ebuild b/dev-python/django-ldapdb/django-ldapdb-0.3.2.ebuild
new file mode 100644
index 000000000000..456918d3543d
--- /dev/null
+++ b/dev-python/django-ldapdb/django-ldapdb-0.3.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="An LDAP database backend for Django"
+HOMEPAGE="https://github.com/jlaine/django-ldapdb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+IUSE="test"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]
+	>=dev-python/python-ldap-2.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-ldapdb/django-ldapdb-0.4.0.ebuild b/dev-python/django-ldapdb/django-ldapdb-0.4.0.ebuild
new file mode 100644
index 000000000000..9185d791ed8a
--- /dev/null
+++ b/dev-python/django-ldapdb/django-ldapdb-0.4.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="An LDAP database backend for Django"
+HOMEPAGE="https://github.com/jlaine/django-ldapdb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]
+	>=dev-python/python-ldap-2.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-ldapdb/metadata.xml b/dev-python/django-ldapdb/metadata.xml
new file mode 100644
index 000000000000..43d019398ba6
--- /dev/null
+++ b/dev-python/django-ldapdb/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-ldapdb</remote-id>
+    <remote-id type="github">jlaine/django-ldapdb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-mptt/Manifest b/dev-python/django-mptt/Manifest
new file mode 100644
index 000000000000..37e6f48aa4e8
--- /dev/null
+++ b/dev-python/django-mptt/Manifest
@@ -0,0 +1,7 @@
+AUX exclude_tests.patch 414 SHA256 5a0c9dcd81103e4e0aafe4c18fd4e672f432bccc8a3fc68a78e325f385581df3 SHA512 5f2137f73a4f258a5648a2c858a5180a38ee6094aec0fd815b0158aa38c49ad5a02fede40dd7a98623e44625752e30266346aea2014310ec565f56f8ff1111f3 WHIRLPOOL f3a103f20c3bcc4c7a547997041555772c50cac269645ac4f9737edf43d9f8788b0729dc81fd917faaed2f9291790e306376ae1fb9745a529b19ef26cf65d76e
+DIST django-mptt-0.7.4.tar.gz 133855 SHA256 8e986aaf458aaf78c87dc316095cc4a951f3ec1d73f81b237107161fa3ea4ad0 SHA512 596bb1b7f4a99b4b8788b3f4da59850bdaaed4214f877479a89ce9f749f9d217f2ccce488e7f67cd75780ace09d3b73fdca2b0d95a56225d63dfb9e6a1d290b6 WHIRLPOOL 26f68b368176868f051534e977a6f73612a8ddf7f54b8292e8ac67307a08aa1522eca68f0dde5c800ea2e0ea0538308955e0c3fd73ff50fc735c665669a797d4
+DIST django-mptt-0.8.4.tar.gz 119207 SHA256 11445b7b12922fe1d3205baf06e1420ec018bccb4ede486c4a5694cf303ee76e SHA512 c3f45813d3dcaf6ce2504941602b1d1fc2a33f13802b34a9c85685dd0e4066a3e8c6fc36be320c472d93efa54a2f10c493b536f45d16a5ab88a08f6baf0513d3 WHIRLPOOL 0c62341bb916bc91d37d08b6db432071dbdc1093ab9960463e0464cf393118719eec88ed4d42bb178674a114b8d8b7f7965575e92ac1cc3308204cd8ff4f8202
+EBUILD django-mptt-0.7.4.ebuild 493 SHA256 e6d842454607fc3090efcba118065c78f7bdcd08c790855167346771fb4574f6 SHA512 cacbd1d4ccaf1340869928f0582ef84c19e19757ba4846602604728bcba0f2db5c4642551ef09a51d97db5e631abec24bb9ecc30e7dcd4115690d98268b642b8 WHIRLPOOL e5244c646b4459383a56d9fae78011245842761d44bc0b7749f943c3067c487d366cf41c7d75759865ca04c39f184e0feca7340002151511c4d6c2233f63dc19
+EBUILD django-mptt-0.8.4.ebuild 564 SHA256 74615f2312d2700e2d0c5da62d2fee7726eae293f2674863309197be4bbf69a5 SHA512 7d4014a57b44e903795add799015c7e297a18fdefbc8f1c80e11c3a97f2d8d4c29c3d81d9b8907658dbad90c5ab7b0fda814be4a7b411642c5a0480b200131c1 WHIRLPOOL b928a79eb9a7bf0b1e1a0c34f2b7ab0dff5ee5679b1180ed2192da9262ce5a6f584ee9742d83bcbf61f41abf5f173fe69f05e859a2643b2c3b59baeb1daa499a
+MISC ChangeLog 1524 SHA256 eec3cd0e6a67a9eb49f352c7da3331615672f19909ed52eff4c292d27f7b7c0d SHA512 30f7e8d6bf2a2613bae00fd2a78dedd01888268b50f1c2eac6b3d1d11a7b68c5e911d44895f0d452f35084d692a470793547e87e143a8a4e7d131376472a73e5 WHIRLPOOL cf2b8468dd04eb9da099f772c7aee6babffb0973a92a27599402811bcbb5746694b3992e894e6c38ba4f8a2e2972dbd03e0cafbd561eb029893c23a6897ade73
+MISC metadata.xml 297 SHA256 89d940734cbbfb9d84f8e237eeae330489836edeea765e0365abad74ce933f67 SHA512 0cc4cb0f818d2e102e3d36faa3c257b86ac6b235d40ecbf17fa120dff0d57f3dacaf60821e1f0198d069ff14538cee099e96d38b50666fcea5266868bd7a9307 WHIRLPOOL 98a3c67af28b4e6e0d27e0e0349582f59a9cc7c553e94b8f43dc56d785c3a750dcc2f6447b8ad114862358c6f88b761e44672c2b15d61c6938dff8077d4d24e7
diff --git a/dev-python/django-mptt/django-mptt-0.7.4.ebuild b/dev-python/django-mptt/django-mptt-0.7.4.ebuild
new file mode 100644
index 000000000000..e13e2c94b030
--- /dev/null
+++ b/dev-python/django-mptt/django-mptt-0.7.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utilities for implementing Modified Preorder Tree Traversal"
+HOMEPAGE="https://pypi.python.org/pypi/django-mptt"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.4
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
diff --git a/dev-python/django-mptt/django-mptt-0.8.4.ebuild b/dev-python/django-mptt/django-mptt-0.8.4.ebuild
new file mode 100644
index 000000000000..e1e5cac83618
--- /dev/null
+++ b/dev-python/django-mptt/django-mptt-0.8.4.ebuild
@@ -0,0 +1,30 @@
+# 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,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utilities for implementing Modified Preorder Tree Traversal"
+HOMEPAGE="https://pypi.python.org/pypi/django-mptt"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/django-1.8
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
+
+src_prepare() {
+	epatch "${FILESDIR}/exclude_tests.patch"
+}
diff --git a/dev-python/django-mptt/files/exclude_tests.patch b/dev-python/django-mptt/files/exclude_tests.patch
new file mode 100644
index 000000000000..36b5ad493689
--- /dev/null
+++ b/dev-python/django-mptt/files/exclude_tests.patch
@@ -0,0 +1,11 @@
+--- setup.py.orig	2016-06-27 08:09:57.408674058 +0200
++++ setup.py	2016-06-27 08:10:31.112007190 +0200
+@@ -12,7 +12,7 @@
+     author_email='craig.ds@gmail.com',
+     url='http://github.com/django-mptt/django-mptt',
+     license='MIT License',
+-    packages=find_packages(),
++    packages=find_packages(exclude=('tests', 'tests.*',)),
+     include_package_data=True,
+     install_requires=(
+         'Django>=1.8',
diff --git a/dev-python/django-mptt/metadata.xml b/dev-python/django-mptt/metadata.xml
new file mode 100644
index 000000000000..f11f7a533802
--- /dev/null
+++ b/dev-python/django-mptt/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-mptt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-nose/Manifest b/dev-python/django-nose/Manifest
new file mode 100644
index 000000000000..692668e30091
--- /dev/null
+++ b/dev-python/django-nose/Manifest
@@ -0,0 +1,9 @@
+DIST django-nose-1.3.tar.gz 25149 SHA256 3667d26a41fec30364a0ef72580832ca5328802d553f6d6e72af5ac21cb36365 SHA512 0e7f18d32340f912fcde96c3ed4ff63caec71ad178f9bd01e61087a228d7e93ecfd87c5d320a66093bce438561638daacd586a4ecb3198573b28607d33eb853f WHIRLPOOL 0acbbe147c0e434ef641843d10f9781ef26f3dc428ba8e613165ed43d6f5d1dea27bf513d9efcbd551c38c7a1945ae3b06aafb0a6d01c8714479f0c4836f1863
+DIST django-nose-1.4.3.tar.gz 46035 SHA256 19b8daf4cd5e66603dc58018f0384117097de18714775338cdb76a94d48d8966 SHA512 448ecfd9759811dc123cbc4bdc2e58e697f0f4c17caf9277fb5e0eb9215205d7814d45e86b2008e8a1233ddaf14e12112cdf64b0f5d54464ce77cbf896a48981 WHIRLPOOL f1c1883c0f86621b9752f9374ce30f7f4d25de7740de5d6e5b59a95a92d6786a2fe21f2fff3f699cb2c81175e60ba84e84fabbfc7079252e20f291596259482f
+DIST django-nose-1.4.4.tar.gz 44266 SHA256 c0b904927fcc2f9d8c55ad1afa18c2e77d74f44ef162c35e07930af5a73ba4ba SHA512 b69af1e8539f7d792e6c9ef002cbeeee95bd144148d55850a49e2759784b68ce07e19587365beb06cc138136498c0e952f7b16067567a5a2eaa31e9f4d47b8da WHIRLPOOL 23831d4ddde1c46d5e8bced2803ad861d3ef8234dc97276dedd13c954d43ca44079056c8eb2d5cb1687bdfd5039a4ea0d2b7ab36abf1e1e319253ef7112f0318
+EBUILD django-nose-1.3.ebuild 677 SHA256 42ef805d4e0cae28790540ec9de6b9026cd5043f07293a0e0e1dc95dc1c3304c SHA512 ffb45665e298f7e6e807b3f68b81d0217971550a4ec8658f73da275a00f4dd4e27ff6e881cd69d96cfef0c0d4bc604637920c64039839b7ea063afe93baeedb7 WHIRLPOOL 32f43d541021aff9283e096b72673222f9d34c4ef8f9de54e2cdc8ff94264131f17562ea368d829ac1941cc8fd2c4dff21ec0d87b01d14510feebb0dcb48f66c
+EBUILD django-nose-1.4.3.ebuild 724 SHA256 09a3a8cf9b2c8472707ef8fe97a2303f123827692b6896378d0c239bf60d0397 SHA512 bea0a77896385718d26c0aacecf970980056fb91aa458478fbcf70244edfb4b0d0acaaf6bf6845e966b0c599db12edef019f38d31973b0daeb30c654331679ad WHIRLPOOL 4b0eeace37383d01068b42e986df3c8583f581fd45e4cb5421fa89ad513f6a4bc425015c88d97fb24ac541456e5acdcaf7fb5aba42efaa5d99cabfb41cee0f73
+EBUILD django-nose-1.4.4.ebuild 731 SHA256 81f187b54d06c0ccec552883e965c4d47af76a3a9b127acc15c0c66ee34272cd SHA512 1215cf5d44d48448cc9832a7534eab9da575ca68c48e9d45caa7327348b2c105588624e0718c7ffe22976c0538a537b630e278fbcf9b898b7c9108fe7a4659c4 WHIRLPOOL 2201a24aedc69d36adb11a4155f245a5b4c23bb18777899b59dd092f85d481a32e556ad8aa92a62ac44659b5878c83f135c504ef2f90b10ace9139ee0e63c5c2
+MISC ChangeLog 3151 SHA256 5c10e258892b1d48349b8af3263391df0cb3eaed55d10779b8cfdef626b2f5d1 SHA512 e09c06b0c514f9a34bcfd3e52d9ddd69cd3fc4995a12c86298a194d02bec06f15287152ea3c3aa9bcaa6b9db57e4cc7d788c7de06d04ce84add6257a53bb6090 WHIRLPOOL 35f1d9d4dc13e15f4fe65576efe1a6721677f3a1615d7eae3a6c26605409413773427c9009f6c48d02b8ea837ae136dc8fd54f0b29c5b3a7ccdc180fda7edbc1
+MISC ChangeLog-2015 2055 SHA256 c64e24116e1755ee3cd92386df18e540770a0ddfdbdc52afdfeb70ce13f41706 SHA512 a321d92a3e026203e4a38bd9bc3d52de5db68b78bd3f02ba1c997827102a45e3a22ced8a4a9ebbb1193d9df9a5b3d0aff191c2ac41def3284667f22381f36b3b WHIRLPOOL eed8acfdf52a1e1cd101c00f769d173560d48e11b05b10f7a0aa393ac103b10067192feffb9d2d4eb886af7542dbf74f0da528fa82e2753b963843e25d1b3558
+MISC metadata.xml 385 SHA256 52d4f1403fbfe9e7cc877bad6c83ff99efb5866c097d572b40f0c0b0ee9ec177 SHA512 39479b284469c8d29f60d39a8900ac5894c207706c4f141c565a52694b0fbf69b08ac77ca0dae44ec724e0548fee5a160a5d194033f06a53dea867787160a126 WHIRLPOOL 1f628ca95ff2002bdbd749b7f6d1e7611a9cb9003c51545593a072e269db6a8705991961eb0caab1e41d93d8a0109934d7c099c75063c9bffec201f4d505b9ef
diff --git a/dev-python/django-nose/django-nose-1.3.ebuild b/dev-python/django-nose/django-nose-1.3.ebuild
new file mode 100644
index 000000000000..592dbe0c0901
--- /dev/null
+++ b/dev-python/django-nose/django-nose-1.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+RESTRICT="test" # missing south
+
+inherit distutils-r1
+
+DESCRIPTION="Django test runner that uses nose"
+HOMEPAGE="https://github.com/jbalogh/django-nose"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/nose-1.2.1[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+#	test? ( ${RDEPEND}
+#		>=dev-python/south-0.7[${PYTHON_USEDEP}] )"
+
+python_test() {
+	"${PYTHON}" testapp/runtests.py
+}
diff --git a/dev-python/django-nose/django-nose-1.4.3.ebuild b/dev-python/django-nose/django-nose-1.4.3.ebuild
new file mode 100644
index 000000000000..2034487062cf
--- /dev/null
+++ b/dev-python/django-nose/django-nose-1.4.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Django test runner that uses nose"
+HOMEPAGE="https://github.com/jbalogh/django-nose"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+#RESTRICT="test"  # The testsuite currently broken See notes below
+
+RDEPEND="
+	>=dev-python/nose-1.2.1[${PYTHON_USEDEP}]
+	dev-python/django[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/dj-database-url-0.3.0[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	./runtests.sh --verbose || die
+}
diff --git a/dev-python/django-nose/django-nose-1.4.4.ebuild b/dev-python/django-nose/django-nose-1.4.4.ebuild
new file mode 100644
index 000000000000..08ba94458ee6
--- /dev/null
+++ b/dev-python/django-nose/django-nose-1.4.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Django test runner that uses nose"
+HOMEPAGE="https://github.com/jbalogh/django-nose"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+#RESTRICT="test"  # The testsuite currently broken See notes below
+
+RDEPEND="
+	>=dev-python/nose-1.2.1[${PYTHON_USEDEP}]
+	dev-python/django[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/dj-database-url-0.3.0[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	./runtests.sh --verbose || die
+}
diff --git a/dev-python/django-nose/metadata.xml b/dev-python/django-nose/metadata.xml
new file mode 100644
index 000000000000..e712187829fd
--- /dev/null
+++ b/dev-python/django-nose/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-nose</remote-id>
+    <remote-id type="github">jbalogh/django-nose</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-oauth-plus/Manifest b/dev-python/django-oauth-plus/Manifest
new file mode 100644
index 000000000000..3b1050b3eb8f
--- /dev/null
+++ b/dev-python/django-oauth-plus/Manifest
@@ -0,0 +1,5 @@
+DIST django-oauth-plus-2.2.8.tar.gz 25911 SHA256 a9b08d846e23ce0227de8ccce72d453d3618a3de4f83959da2ae75f76b627867 SHA512 9237a2e2e52923b2fdfd3b7feff63e11f2c06c871faca3455189edba233e2a6513169481092f413c3ddea1c919f4b995fb465a505935388f1d803d094942ee07 WHIRLPOOL 9bf83c5052314cc1174ba4080653992569672a7c47a5b78896d7220b099346ac40e1a0f4c81738ec2638b76e942083953eb11e37925c2582cae5a5d098d49132
+EBUILD django-oauth-plus-2.2.8.ebuild 925 SHA256 dd7c6c26ab6275f5ec2d04fec826af9baf4bc4ce34886f703365d304d1ea9ab7 SHA512 35ad0ca8ea9ede21685a9f078f2365c1bd76bb90b3a5a6f9ff7cd6ded1bc4344358faad55362fcbdb0f3f8cea791b089f2008ce862a2f3a3b1e3916163e14e2f WHIRLPOOL 46fe79076105f24b9c2025d86b458a3f7da23022a1ad5ecc5aa11b5840494d7b0defc3b85166bdd7e295c20916d7a38928002251b5f952aa4a3cfd27c367110b
+MISC ChangeLog 2612 SHA256 849731c4fd3a83145c7fef24f85e99cb8635295cf4cd277369c7f4eca480303d SHA512 5f888b6ff34479892846dbac85eba77bd1d8186931b651c5b219f2e5dc1a783a795788812f88ebaa9e403371ef8a6466d4148faaf969624c342c8610d6c61fd7 WHIRLPOOL 810488e4faf410d8e51ab0dbe2c374ae1e972d7423e9730c6f62e111e5b3833dd5473a8abdad2723655c0b7c98021992451f3bee7ba1c46cab6a6f02f31c4541
+MISC ChangeLog-2015 2557 SHA256 04917aed5ca1844882c32d4c351bac6b3d7b6f8748c5d448e63e53d267642c5b SHA512 2fef7ffa366b696fe86ffdd10b3476fa5fe4fa3bfda69e44448a9ed1080b57e6827423843b501653f53fde8196ccc56060b99ff217515ff49dec0ee017d0616e WHIRLPOOL 63be1e92fc0c1b6197851e3bd090dfa5fe839e07fd682aca29a4ffc3adbb731465b977bdc51c9c4bb3918ee96425c182e1c1db20230d8b546a0dc046cfc3dca5
+MISC metadata.xml 320 SHA256 203446184d39edc8a59ce9848f16a75b6fdb65ac7cbda485db36113ec81cea83 SHA512 c5ca167dfd305e47ddff6d68b5d473ec4c98cd869eba30148fd3cb82dd7d105717a70d5e50f519263c8fbac5e41108041df1ce972406262b170aeb2414406eb8 WHIRLPOOL 46e2fe76d1e2d37f880c4adc4857133a9e5dd4f98dd6e4c4dc849de956b9adadecfdd8be19b677b9767548b1fc1a62502ddda25f6f6bed70921dd1ade6fdd554
diff --git a/dev-python/django-oauth-plus/django-oauth-plus-2.2.8.ebuild b/dev-python/django-oauth-plus/django-oauth-plus-2.2.8.ebuild
new file mode 100644
index 000000000000..a3b9d827c509
--- /dev/null
+++ b/dev-python/django-oauth-plus/django-oauth-plus-2.2.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+# Testsuite written for py2 only, no indication given in source
+
+inherit distutils-r1
+
+DESCRIPTION="Support of OAuth 1.0a in Django using python-oauth2"
+HOMEPAGE="https://pypi.python.org/pypi/django-oauth-plus	http://code.welldev.org/django-oauth-plus/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/django-1.3[${PYTHON_USEDEP}]
+	>=dev-python/oauth2-1.5.170[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}] )"
+
+python_test() {
+	PYTHONPATH=.:oauth_provider
+	if "${PYTHON}" oauth_provider/runtests/runtests.py; then
+		einfo "Testsuite passed under ${EPYTHON}"
+	else
+		die "Testsuite failed under ${EPYTHON}"
+	fi
+}
diff --git a/dev-python/django-oauth-plus/metadata.xml b/dev-python/django-oauth-plus/metadata.xml
new file mode 100644
index 000000000000..5d603775593c
--- /dev/null
+++ b/dev-python/django-oauth-plus/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-oauth-plus</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/django-openid-auth/Manifest b/dev-python/django-openid-auth/Manifest
new file mode 100644
index 000000000000..33e1f4ccfd45
--- /dev/null
+++ b/dev-python/django-openid-auth/Manifest
@@ -0,0 +1,5 @@
+DIST django-openid-auth-0.5.tar.gz 32722 SHA256 2ceb25b16140d6ee02e1c65948c18aa184d62350452a2b4b2f44819b69866dfc SHA512 9d1444aa15d450acc6ffc1ddc8359253828b2cceeee57e98268c1ae25bbcb1e2facd1e065c9e29fa3b167efb86923d72408cc43442b18d6dbed4dca05c33548b WHIRLPOOL 56dc25394756e2dfaed1eca82db60b132ab5c728e08c898b3072f211044fbb6335c51dc11576f60a37f86b41e3fb7a8f8306029b0b559a3260ac57cbd1046d22
+EBUILD django-openid-auth-0.5.ebuild 598 SHA256 d4eee53cde02ae81e796d7f3da030b17c30ac2b3b84ba61fb136a44adbc5fa21 SHA512 a2df2b453f38c4a561d86f5cccbcfc07d5774124bbcde87c44ae8caa8545b880b9d362e8e149d8c7daa78f5ee1bdd66eb91bea6cb94e1bb3bb0045713432633c WHIRLPOOL dc260e446f03f480211b7215a6b0c0e559de582a7ec24fe947a3362f79475aa195c927b8cae1f167d6cae9283038f6bc0a6290b315978700c214640abef9aff6
+MISC ChangeLog 2643 SHA256 3f825dc8ebedef867b1b530e90a0c9f39d7a1fffcb43ce621439da86ec2bb47a SHA512 89f7df0a80932cbc622c420708eef1fb24a03779f6ce6d01a0f33b215b4bd4e9857ae6d3830a5207070731a5265d8a881e17482186403e192807d452d2aa6367 WHIRLPOOL 6ba2de6582c914a9a5ad1295c808f2d5620c9cf46adb25e62a207ad4f3cf727c3707bd1c2960b01aa4679fd99003100ee665b11777d827e8ccbd28448dfcecd4
+MISC ChangeLog-2015 884 SHA256 aaeb2aefe01cefd64e8882b1816fadf2952df8f1b6f9a5b8c506a87a957448bb SHA512 bd9643778572b6af401eadf295abb3998c02b19c442dc335792c5f96b8fd6eb820f9e7b1a63d30ba58efc5191319918ca88aef048e6e5ccb516f9176e7c72127 WHIRLPOOL b91e20e3d0f13835d93ccaeb86262d582851714d0c7e9803d9699287f0cf9942ac5848dd31ccf572a480c3c2eeb35b7a16a657fbbeabc6cecc734326559055b8
+MISC metadata.xml 492 SHA256 8223b2e30b45949c1ed3938a31d26a51f3862e2234d5ce99151a001dd7a4ca76 SHA512 e27494875cc35f53bc6131f9523aa8e2370b40c02edee49fe6f048572dc2454aba0b69cbb6e8779cc2209e1c2130146d27f07f62a3597f29bcc330995c599f99 WHIRLPOOL bbc991ba39d55bc2cf6f42037640281378a3fa338e5edac58ad94c8400712e37224b32e47299878ce364e452e0d1aa94b7c330931ead110930fe361b2a21d13a
diff --git a/dev-python/django-openid-auth/django-openid-auth-0.5.ebuild b/dev-python/django-openid-auth/django-openid-auth-0.5.ebuild
new file mode 100644
index 000000000000..4e41ee22118b
--- /dev/null
+++ b/dev-python/django-openid-auth/django-openid-auth-0.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library that can be used to add OpenID support to Django applications"
+HOMEPAGE="https://launchpad.net/django-openid-auth"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${PN}-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.3[${PYTHON_USEDEP}]
+	>=dev-python/python-openid-2.2.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+EXAMPLES=( example_consumer/ )
diff --git a/dev-python/django-openid-auth/metadata.xml b/dev-python/django-openid-auth/metadata.xml
new file mode 100644
index 000000000000..6c869455fed2
--- /dev/null
+++ b/dev-python/django-openid-auth/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ercpe@gentoo.org</email>
+		<name>Johann Schmitz</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ryanmcgrath/twython</remote-id>
+		<remote-id type="launchpad">django-openid-auth</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/django-opensearch/Manifest b/dev-python/django-opensearch/Manifest
new file mode 100644
index 000000000000..0a37a163c005
--- /dev/null
+++ b/dev-python/django-opensearch/Manifest
@@ -0,0 +1,7 @@
+DIST django-opensearch-0.2.4.tar.gz 15770 SHA256 483074213473a699b3b6558402bc1502bd378542f53fabeabf651304a0d25912 SHA512 6852f95b52a68cf1c48ceeaa365a691391e7a19363221e3bc32a9dd4c863e37a9611b1f31f91c342303b0e1b3418c4a27873d0a980e64aeab87ff2ccb1aba63d WHIRLPOOL c84fbd512905c081a82e513280e35f3cfb83bac0d47a2dd61c27d9b0af6952170d379dd7fddca9b69a54519f0eb284caf5624b1f60ddd5824f368d154e0ebad7
+DIST django-opensearch-0.2.5.tar.gz 15870 SHA256 1f353865b79019dd54b216f43dcea19356d7c03376c0d8a8ef9db262ded1a51e SHA512 70ec931de2687bd6e688fd60262a85de553700247c852a686fea422bb5208b5a3e0441b5778dead1838ae693a22103ed3db1677fe395f000531573bac5a501c7 WHIRLPOOL ab8492cac101c637e4e0d15d187d1cb2a56e0babac3e79af9cc6700ee1912188ae3e2c31a6c98c47f8a2ce5ae6c42c65fa22e0183b2c63f8a9ed2f54ad4087fd
+EBUILD django-opensearch-0.2.4.ebuild 487 SHA256 9bd76274dd83e6db0e5bf78edeaa8dba53b284020262cb7a603d53c3f9f3727b SHA512 3ed730b4ed928448dbc34cc7f291d9456bb2b619b6f070468984898287c976e41e02d710bb51cfda4bfc178a050fb55767ccadfe0c10f847ca236dd9f853f909 WHIRLPOOL da246b1f08f3647c09db28393a7aed4dee5e8dfbc935f9ada0f5f1b032b9510ea81bb9b5bafe12838001b10082de1a06ebd2a292f6d5dc2211fc9142bb770a72
+EBUILD django-opensearch-0.2.5.ebuild 495 SHA256 54fd9ac75da59c08e19eeae18bfadbb36b10074428bbf796c83a59b50e8b3563 SHA512 11acda47fae0e0b1be1ae922c55824766bdbe35f606adcd5826e89a56039065eed52ebee2cf9cfb2596c9ba803e2a1a65490f10f60bd0f098048331719ec37d7 WHIRLPOOL c53275d876002c9f9c717f32fb9c283afe07850c70511ee5cda2782b00380cf5863307e04f482e3612ead787931b8fdd276fba49a7eea24af19822704490f82f
+MISC ChangeLog 2566 SHA256 98fd7d2cf7182f49a436b45b77cc2a9fca3bc6b8d27ef05df2928c38d95dd6f0 SHA512 a93d01a1d389317540e4f3185dea2ad65352b2d3cff6cffe0abce1b30354af21d36a22bd88da3817c33bf4e6b82084b7c1dbe32507a9c8175db75c800fd0924d WHIRLPOOL f6ec0f94c37416e837453e285f0c044f43d6a32c3ea67282610e0b97febebee67379dd44a69227f3ee92965452878d13df1b8a9a9fe9357239dd7c921e17fed1
+MISC ChangeLog-2015 1361 SHA256 352a7318da04e211f619932de66fa95ff8539ba0b2abe4f1918b79e157969a3e SHA512 867dea97c6bf3df9981cecf11f46ba50cfa6656b41989ebd8c0a8a4780c13c3114b138cfa8fc4f87d6f018e617b4c063f70d89e0c6b5b65ab8914626db3758ec WHIRLPOOL 82500eb2065d6fd2397445765cde7ce9ada8361cfc32edeb11bb3218b1cc98ce674c9b40fdab24deee4d0d09d5ffb0c6dd421901e08e3a4d2d58e7cfc4e8b3df
+MISC metadata.xml 354 SHA256 a61803ed0a7b6ed9b869b52e66a7b77d73353f315cca798eb3649370235c8ae2 SHA512 ad0ecef3112b5816856ae9fdf28112630a7946a9ef5b4eea4abd401e16198ea20fb561edf40be045e35c2f05cbacb6a644eef9f4166848a124a26ddb112ac8ad WHIRLPOOL b00f27e100efec7c2af8d04388cbe5925135eb126bca4e644813f5f5af26d81a38800aa5d10c3ef429c7ce50f84505923768d486039e9024b24e129cf6dc0af9
diff --git a/dev-python/django-opensearch/django-opensearch-0.2.4.ebuild b/dev-python/django-opensearch/django-opensearch-0.2.4.ebuild
new file mode 100644
index 000000000000..33ea6109f7cd
--- /dev/null
+++ b/dev-python/django-opensearch/django-opensearch-0.2.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A django reusable application to handle opensearch.xml"
+HOMEPAGE="https://github.com/vint21h/django-opensearch"
+SRC_URI="https://github.com/vint21h/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/django-1.7[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-opensearch/django-opensearch-0.2.5.ebuild b/dev-python/django-opensearch/django-opensearch-0.2.5.ebuild
new file mode 100644
index 000000000000..c64ba4ae0468
--- /dev/null
+++ b/dev-python/django-opensearch/django-opensearch-0.2.5.ebuild
@@ -0,0 +1,19 @@
+# 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
+
+DESCRIPTION="A django reusable application to handle opensearch.xml"
+HOMEPAGE="https://github.com/vint21h/django-opensearch"
+SRC_URI="https://github.com/vint21h/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/django-1.7[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-opensearch/metadata.xml b/dev-python/django-opensearch/metadata.xml
new file mode 100644
index 000000000000..fb2493cc272e
--- /dev/null
+++ b/dev-python/django-opensearch/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ercpe@gentoo.org</email>
+    <name>Johann Schmitz (ercpe)</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">vint21h/django-opensearch</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-openstack-auth/Manifest b/dev-python/django-openstack-auth/Manifest
new file mode 100644
index 000000000000..ab9bf00d4c58
--- /dev/null
+++ b/dev-python/django-openstack-auth/Manifest
@@ -0,0 +1,5 @@
+DIST django_openstack_auth-3.2.0.tar.gz 69837 SHA256 e2a2970ddc73504afab477784c81f57c8c5c81daba55b0df30e1908acf5dd052 SHA512 43e8d19d73c934935f73b6dcb5a5ffbb0ca49c2c7dc892cadd9a04af94091e39bf35f1833d33474f7aeee9a94040424f6ee43c5fd355d8ad971c0b4ff971d4de WHIRLPOOL c7f3ca7a9ff016c8e8043d9a63f9092cb302b2db7b8c50d3d89b7384ace4a7e3a6dc9d594cc9f8e9993eafbdd91b01cd7e90a0a9caa3c987526f2c3b8a655802
+EBUILD django-openstack-auth-3.2.0.ebuild 2118 SHA256 996f28a31032d1942d92a66f4f9b368bbf4fceffc974564df151a509a7382f55 SHA512 330ee5fda7e82c1fef72696da8344582c89d2afebd28917a5eb795ab3fa099c314827dd136c65fd4b0da812461862a6f3afded42dd3d97af9d5e35e8417060a4 WHIRLPOOL 166c440070b540246fd2dcb5c84de6cd8e4bb2d51ee5e6ea404d00ea5923b7a9e55825ab9319a1c4fb969d966900879c67816c69d15210275e866d74e8db7065
+MISC ChangeLog 3524 SHA256 15cafed69c8b4b81e5d5e28c6ce6c405bc1cf2c7a592be83f86da98627445282 SHA512 ea8326689f04e2ef5801ef32bd6c107f8f16ce0f49c01011257fb8f30a0a74d10bfd379fb144061f2ec91b0474a327e160c904c4adf30aec819c5c70f2fe046b WHIRLPOOL 89b29166d9d3dd82097dc7f005302c4b16a8c57172b3826f6ed18de62c73c80e0bdd0666f9d02fb96f096e2e6805c613af727252704cc49cda598fc07925d311
+MISC ChangeLog-2015 1766 SHA256 43df3f0cc261c0ac46aae4419e2ac8b953ea065bc205dd083fbb3ddfb917a722 SHA512 64e93a04ae7315a72ca856b077d660fbb19bfe8b6b770cc20a57472f1a0804c98fb48bb2c6bc3f42793a6c658c6bdf6e2f8647b45d6cec19ad7781b4b2dbdb6b WHIRLPOOL ae1aa2058bcbd9f31e1d73b0097c37391cae1cb8d407afd56fdbbe177234afd55dab1384ceed7dea3ef269c234ce16c12185a047061116da4b53c5d4b6368b51
+MISC metadata.xml 596 SHA256 8947d3edf4b442594f164758a5c13ae5cbfe9908685feb89835ba215a5f37461 SHA512 84101c91533c60103627252f9392897cde375c39c26a66f72568b34feb1da4684f5ae63c6e83324b56bc5ea3efca97b4b22165bd0b93b5c9536e10916e695330 WHIRLPOOL 448e36b95a8d056dd8dee66d96f9d020a56c2bc17f99bce9153a1121c965cbfb9ec93c87b4a6e205d0729a8c3dda5a6acdbeee91a35152733eaf0460b2f39d41
diff --git a/dev-python/django-openstack-auth/django-openstack-auth-3.2.0.ebuild b/dev-python/django-openstack-auth/django-openstack-auth-3.2.0.ebuild
new file mode 100644
index 000000000000..9c8336ae2761
--- /dev/null
+++ b/dev-python/django-openstack-auth/django-openstack-auth-3.2.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+MY_PN=${PN//-/_}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Django authentication backend for use with OpenStack Keystone Identity backend"
+HOMEPAGE="http://django_openstack_auth.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+	!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hacking-0.12.0[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.14[${PYTHON_USEDEP}]
+		>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] )
+		${CDEPEND}
+		doc? ( ${CDEPEND} )
+	"
+RDEPEND="
+	>=dev-python/django-1.8[${PYTHON_USEDEP}]
+	<dev-python/django-1.10[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Avoid warning in doc build due to missed file
+	if use doc; then
+		mkdir doc/source/_static || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# under sphinx-1.3.1 the build outputs a harmless warning about change of
+	# html_theme setting in conf.py. priot versions will have the right setting
+	if use doc; then
+		sphinx-build -b html -c doc/source/ doc/source/ doc/source/html || die
+	fi
+}
+
+python_test() {
+	"${PYTHON}" -m openstack_auth.tests.run_tests || die "Testsuite failed"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/source/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-openstack-auth/metadata.xml b/dev-python/django-openstack-auth/metadata.xml
new file mode 100644
index 000000000000..a15856976eb6
--- /dev/null
+++ b/dev-python/django-openstack-auth/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    A Django authentication backend for use with the OpenStack Keystone Identity backend.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">django_openstack_auth</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-otp-yubikey/Manifest b/dev-python/django-otp-yubikey/Manifest
new file mode 100644
index 000000000000..ff27689b0ad6
--- /dev/null
+++ b/dev-python/django-otp-yubikey/Manifest
@@ -0,0 +1,7 @@
+DIST django-otp-yubikey-0.2.0.tar.gz 11264 SHA256 72a62d0a0cec9ccf1a1a029b04b6b620f30ec501c0115a52ef6472a6817ba808 SHA512 f0b18fb262caa76a25af0a063c85c07b41f7d211dacd1db2dc6cd55995bc505a1e70535b70a95cba722685a3b34c8a304e9b829b9c3f27caae67921f86f7ffde WHIRLPOOL ccd74c242715cd54436ac451b2d69b8a4a75291ac4f2d05ec3c4ead0dba61329ea720149e369799e3772da97ecc4a70139c0ffb7bf658213072c44b5a2cdc3c9
+DIST django-otp-yubikey-0.3.3.tar.gz 14233 SHA256 0e9f748abf2e380163f33b28de2a1a1a5bb06b8f0c6e91fabdea70d49f1cf58a SHA512 80c9ffb42a7109a04eca4fabca33294b3a65abeb12f408cb6d7c6c06644896629df43d32833d514e0a60ddd6352af073fb5b2f1174a07b370214a76ccc093c3e WHIRLPOOL 5954620768db812845ec017ecce880c9aeb84e0fda15d4cdf4e7ef45555fd06c4d29f21049c8abd1a0a588b219dfabe44fa9562c27b9e7e4a9da104627edef77
+EBUILD django-otp-yubikey-0.2.0.ebuild 550 SHA256 a17a1d4d32e8f6a421e5544e79ea59c2a46e5ce603cddd07d6a115669848a077 SHA512 533596a78445dd646a53ea7ad72b85cec6a453fd3a70aea48ee81819b79c25fc11a52f4ee121eefce5d61784e4d222fe297397c28b440ba20bfcd9c0321ded07 WHIRLPOOL 6a4bdd53af32f52a6ae6fb1e595bd3483ea7262f468f827498f37e3cc1b2ed068afb1e72425cb281d23d2f2d81eb7f80800d14327665f0fc0df1558eedf15bb3
+EBUILD django-otp-yubikey-0.3.3.ebuild 572 SHA256 b5c9c93cf5be57188ab28abc346b12fb9ee7c7a61a220fd593896f2d762a362e SHA512 4a8800b24cabba93de68ccd8416bb8aa77ef29db4bb2ae00a6e1402f23c8d2883a1fcbf176e094a044ba1016c9f03c57bb3b5aed8f08c93d00eff15e0e459d6f WHIRLPOOL c62a38bf94482790202a7fc7d26f48b03f1ede76a0133672367159c353c26740b1cbfc98eabc892be50e3dd491620e5757f9c0d5f788cd36d8e4c9ad3f74aadb
+MISC ChangeLog 2990 SHA256 896a3ffa44afd765b537711caea66e139b0024c6bae47f73859b0c1d48221423 SHA512 7c2b22217cb0aa14abb179416123afa66a98e90308b12a532f4f0d5e2e596475cac0447367a5aac64549f95240b60f9d2acf4d270fff5538138b64cd4000c4a4 WHIRLPOOL 09f9af304ff0326d89323d8ff24debe6ee6531fedb483bc9a8db5afaca1cd6fe21f2d88eff3bfc849cb6c805625e8acae51bfcbaf5c2ec0df6b67a07d10afab8
+MISC ChangeLog-2015 937 SHA256 8a39d567af21bf556a297d9b147a2b04a353772c8af634bac9d653d204e63600 SHA512 bac3134ddc0ba253fec0d53a095e3f0472487de0cdfe73e7ac6525bb845c383587e4a7095c49b9724e1a6892110a772de5afbc462259e62a89c603547f08ee9a WHIRLPOOL 21783479d9aa791e999f84f1cfe44d3f6c6ed3b00c88cb4c7609e879d072180f1f99ab150f20323ab54592fb7580d5bafc85ef8862c69523a453643744694aac
+MISC metadata.xml 408 SHA256 4acfab394735e49a0403df868f56543e3daca5ab977c316f50cd67f8c586e5b0 SHA512 09b07ec22fdebf40d37315530f77d4a369f40d1cdfd7b351604b4234be50849bcd79cac06c88e92d9d5fb3a53d29ebbc0a656048e40b05f2ad7b3438223887ea WHIRLPOOL ac84b212746336d57eb306e226219dd61dfb29f2fc69365b1bce1889e5a3e1662e9a080b20eb516828dfc460691e2aa3ee43e5ba323675144ef7ad47fa0e0cd1
diff --git a/dev-python/django-otp-yubikey/django-otp-yubikey-0.2.0.ebuild b/dev-python/django-otp-yubikey/django-otp-yubikey-0.2.0.ebuild
new file mode 100644
index 000000000000..ed54486e8a73
--- /dev/null
+++ b/dev-python/django-otp-yubikey/django-otp-yubikey-0.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="django-otp plugin that verifies YubiKey OTP tokens"
+HOMEPAGE="https://bitbucket.org/psagers/django-otp"
+SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/django-otp[${PYTHON_USEDEP}]
+	dev-python/yubiotp[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/django-otp-yubikey/django-otp-yubikey-0.3.3.ebuild b/dev-python/django-otp-yubikey/django-otp-yubikey-0.3.3.ebuild
new file mode 100644
index 000000000000..ddf4f69cfa45
--- /dev/null
+++ b/dev-python/django-otp-yubikey/django-otp-yubikey-0.3.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="django-otp plugin that verifies YubiKey OTP tokens"
+HOMEPAGE="https://bitbucket.org/psagers/django-otp"
+SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/django-otp-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/yubiotp-0.2.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/django-otp-yubikey/metadata.xml b/dev-python/django-otp-yubikey/metadata.xml
new file mode 100644
index 000000000000..4f87fbc55a4d
--- /dev/null
+++ b/dev-python/django-otp-yubikey/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>ercpe@gentoo.org</email>
+    <name>Johann Schmitz (ercpe)</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-otp-yubikey</remote-id>
+    <remote-id type="bitbucket">psagers/django-otp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
new file mode 100644
index 000000000000..7f84c7563b56
--- /dev/null
+++ b/dev-python/django-otp/Manifest
@@ -0,0 +1,7 @@
+DIST django-otp-0.2.7.tar.gz 76879 SHA256 dfc305aa894da2b7111c8846d90254b0d9099f415e14165f6e784f5ceddd5f3f SHA512 b48c6dd505ed06b4028a1d27213ea759a1a54ca5f4e5c8dc2aad826535a80295fcdde3a1da455256927d26906e53ee40c47a0ab89de5c6331c2f3567e43fdae7 WHIRLPOOL eb819e389d924953537f0f9db2dff56631b07ea50f898abd398f873dad0144255e14984f6f5aa2ab0d0bd296163c995c7837ab6fafefab87646189047b839f52
+DIST django-otp-0.3.4.tar.gz 39992 SHA256 5e002e6f63211f1d2babb525f3ba7ef07851239671c48c439ba4800099cb5a2e SHA512 62b6683050a9dbd0bcfc9a63bd965f19e5d088c3e53c5e45067f8a785aa7b2a7b540d0331742bf8b979ad95d308f944bfef250989d1f782849a71bbc79a7d53c WHIRLPOOL cab0e765007e68caaf79272452d9de74fbc11ccd84f436e506e3180e5ce20bec52ada1b7a75deab3f586bdda76207bc5ebf376288094568bdc0dcaae0389f10e
+EBUILD django-otp-0.2.7.ebuild 554 SHA256 64deab322efb4becbc613420b7be8e7ac7e84d543ef8fac64501e30eb519342c SHA512 d9661aad79a073b17f74ebe07d04d71b97bbc64e1db6a82260c1155b9555eb1e4994c07e90a8539e1b74352b362aa5003e8886cd301abe041f9b5d1d66f93ace WHIRLPOOL aa70229a5b70cdfccc7945bf74bc35442c95379e628017c09e0be055af1fcdce9a5f56f8ddbc305e3f69612db9f1314a735bcf6968c5f121448e68069d89b0c9
+EBUILD django-otp-0.3.4.ebuild 548 SHA256 e1672acffe7be4daeeca2dfc3796314efebf653a0c2a103899f769637c9c917e SHA512 14bbd14992e01a344d900b9ae43e6d6beeceb1380de82461ce0adbddf18744efd81de5fdf1cf7dcdf2f8b224f76546d03fef662e2ba81ffba983326df398d8e4 WHIRLPOOL 42db80aad10613f6702f45244e1c47cd565d1827a5bf7b9c1d57a381378dbd0de09a8d80b464c173581e86848697f4f66ec5dcfe137d233c9a5f66bb50388a5b
+MISC ChangeLog 2590 SHA256 b6bf3f22da863d04b690c14d8edceabfd1f9ef2c43c47856b9d2482b9f2d6191 SHA512 87f26043e9a041e3276973364e3d9d26647befe4cd6721f682e0406bc5c38f267929c9947843ba924d3ddae5b1e5f58554fdfb59dd1ed7023a6218da009275bc WHIRLPOOL 677d226e04a3bc9a228e0d299765f0514c9db9f1db1a29e1e0704baecc532d317eb8bd575f6187b1e4f56014dd41ef7ef84e4639e1b4da1d12e2c62cbb9eba72
+MISC ChangeLog-2015 848 SHA256 895dc5ea415b6b0914476bbb6ae156cbd8f25a9c36fb7af2ba3ca841a16070c8 SHA512 62df0b22f19d48fa859bf71e322141e0888b4afebcca6ddaf90cc5b52fc3d3f597089d7d3256891191c2644058bcb50c0ef85924f7d6d878db62e001dbe286c8 WHIRLPOOL daa8508ab91e62cf275359bb364a4b0ab2428e3a1c87f64f2fa915a34bd9b927614d7478bad28725e78c8edcc6678ba85fa1dd81afa1a48f2e2125aec46bffe6
+MISC metadata.xml 400 SHA256 adc3ab758727c7a373c57ef300546b660696f8cccaeeea0ff8b6f1802d1d5e40 SHA512 118076dadf13dc3ab4a1cb780dd49a399ff2e09f0afda93cbd7b4dd725216ab128f00fe6baf945edc30c4c586d18e2e200f84af2869ce87078daafa0c113aec3 WHIRLPOOL 80a3d506984bafa71db4c131f5ce29408e0ca88f268577f2f8dcd51853a38167453e00ab30db458ab1af014945ae2a82d955db2a562c17cd700f08af34b0e90e
diff --git a/dev-python/django-otp/django-otp-0.2.7.ebuild b/dev-python/django-otp/django-otp-0.2.7.ebuild
new file mode 100644
index 000000000000..5d3bb203538c
--- /dev/null
+++ b/dev-python/django-otp/django-otp-0.2.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A pluggable framework for adding two-factor authentication to Django using one-time passwords"
+HOMEPAGE="https://bitbucket.org/psagers/django-otp"
+SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.4.2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-otp/django-otp-0.3.4.ebuild b/dev-python/django-otp/django-otp-0.3.4.ebuild
new file mode 100644
index 000000000000..9a5fb3483f14
--- /dev/null
+++ b/dev-python/django-otp/django-otp-0.3.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Framework for adding two-factor authentication to Django using one-time passwords"
+HOMEPAGE="https://bitbucket.org/psagers/django-otp"
+SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.4.2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-otp/metadata.xml b/dev-python/django-otp/metadata.xml
new file mode 100644
index 000000000000..ee82c4d80662
--- /dev/null
+++ b/dev-python/django-otp/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>ercpe@gentoo.org</email>
+    <name>Johann Schmitz (ercpe)</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-otp</remote-id>
+    <remote-id type="bitbucket">psagers/django-otp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-phonenumber-field/Manifest b/dev-python/django-phonenumber-field/Manifest
new file mode 100644
index 000000000000..b58ebe008e68
--- /dev/null
+++ b/dev-python/django-phonenumber-field/Manifest
@@ -0,0 +1,8 @@
+DIST django-phonenumber-field-0.7.2.tar.gz 6208 SHA256 f3b23af290d0f800945c44e0737bd32f3ee38f63e7ad7076450778fe682a52fe SHA512 bdb48ac1fa22c959409ba37b28786fbb46220628bf88265dd3c13ab2c676816d0dd1ed9195ce614a8184937347c3c4760fbdd1f57e235758790881af9a44f504 WHIRLPOOL b83b276d18b4014657b8d0705f00358049ec242ad4552d7f679e8cca9d650f49bde0a2d11b91cd42b09f75783d74d480ccc18e70e8acf50b4fa2be514c97b2a2
+DIST django-phonenumber-field-1.1.0.tar.gz 12479 SHA256 1ebca1eb2dad258013b1158cfdf751bcc97ac6dd5a81a2c4c97018948f9635bd SHA512 7bd5271f807392412cf11b4a1e557693657f5751ffcc26e16c394f872799eb50f6bd87e2b302ac6a7e615c84a2876921ac2c6ac9bcbef3df4ad7b7274c3823fc WHIRLPOOL 5645988df75f4380760836bd924c87df3a6631d123bdbfd31cc10b537ee2fa9b2b804c48e33d8990f410c490cde725747a5586579066d386332a546619555750
+DIST django-phonenumber-field-1.3.0.tar.gz 14501 SHA256 8db9d2dc833678b163adabd593cda7ad1dede81a1c18f67c895701fc44dc44f1 SHA512 2a0065691f9874edef96e41c237d8a58b4ac5c3efe7a82c421dca269185962f518808083ce82e73a281c95675703b24820a7b5dae09a08474b6c2e3e7f529f1e WHIRLPOOL 263f34dc9dcd5c90737af3f4839d1f195e56530e20c0259383d0f2f2087e266f860821a00fc96c0f3a6d1b3a8267893b09c6f2ca582d29be4e3d7d905a990189
+EBUILD django-phonenumber-field-0.7.2.ebuild 632 SHA256 3cf6eeaa6cba6ab25e21b86f7947be75e80ddd6e93d6cbb639922db17fffb05d SHA512 423e44f3c8a80f8b9f7f9a431321ded59b6d613cc8fe6393d0bd6281e1933ac1627089a8bfcc36d9d93fd3d3def526bc25741422d3f01a66b5c8517bd5b456ae WHIRLPOOL 8fbf6956e50c277d7b3281dcc3b0311017afcd10e2264993a1f8f2919ce2703bc271e27a574a5aef9ed23198851667aa077dc415779fe53a31270997353b16b1
+EBUILD django-phonenumber-field-1.1.0.ebuild 636 SHA256 711f0c62b81efc9e3afd03705c677918685e1dafd33b10407d083be7eca4a819 SHA512 56a9cfef407fd0260d5db215424adf1c72d733f7585140ce4e13d05a3a5205ac9ed4acd6de7400905e7fda331794c691caa6fa424620cac0c90a59e9361f1729 WHIRLPOOL 3f45c9a6d53c60bfaa742eb1b1d123ca7e2c28d1ca0190c2251a5228ede56e4b431fbe4275d20da4626ba67a7ae5c93edb04ee20ee15f9a78abddd78b482b6f8
+EBUILD django-phonenumber-field-1.3.0.ebuild 638 SHA256 0542b6ddab5b38f15314742691e2e649cb8d7cd2c709f018873072c474a7e4b4 SHA512 0a0c455c695e91bab1a58729a732595f7701f6b6b32c3203335d242a8623323f29927f88a09b2bebfca6289b555c4edcb1c0b60a0d8cd5d4c96293414f658adc WHIRLPOOL 73f6dd200116e807a72de2cf4c11b27dd724ec58390dab435e5588e7c4edbb0a5de5eabdf69447e90ffec5d7cd7b1d888ccc448e69733d3467c23032e2622be8
+MISC ChangeLog 1190 SHA256 08ff462959bae5ffb9090c2239d4d5d8e068606144e583ba893747225b0897fc SHA512 68d7289bc683eef7a539dd12c5fbbdd3752700f6b0ff1d8142a3b91096a3a7d9dbae9dd0cbd5efdc280b2d480b7e769baa06264039e211bb839c5be57c95cdc2 WHIRLPOOL 2111fe4640e8f20e8f191dc4c696693aed9e75b49106bae7984abceba5786c88f95de6303942e1b75328aaf1a765cfd64ef8fd243ca540a5387524fff5179182
+MISC metadata.xml 430 SHA256 8236a1cfef548e2b5df199c9180024bb2b1d91d0752f6fb6c28f2c92acc0f196 SHA512 aff5f4e78379f8c7684f2721c8026efc56f543d3679a0f417aadffd8688eb419514429e82617b32ff9cd65075a7bc38138a2a9d5dda032b779554257dbb82402 WHIRLPOOL a089f6dd22d361b3c0320e61e291ca1e2f4a55d4e32aed531a29a2d37d092f6de883e65e2663f777c1ae72de9d38b967cd761f9507ad4d567d652944bbf58f5c
diff --git a/dev-python/django-phonenumber-field/django-phonenumber-field-0.7.2.ebuild b/dev-python/django-phonenumber-field/django-phonenumber-field-0.7.2.ebuild
new file mode 100644
index 000000000000..d2e537afd089
--- /dev/null
+++ b/dev-python/django-phonenumber-field/django-phonenumber-field-0.7.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Django model and form field for normalised phone numbers using python-phonenumbers"
+HOMEPAGE="https://github.com/stefanfoulis/django-phonenumber-field"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/Babel[${PYTHON_USEDEP}]
+		>=dev-python/phonenumbers-7.0.2[${PYTHON_USEDEP}]
+		>=dev-python/django-1.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-phonenumber-field/django-phonenumber-field-1.1.0.ebuild b/dev-python/django-phonenumber-field/django-phonenumber-field-1.1.0.ebuild
new file mode 100644
index 000000000000..807d25578bc2
--- /dev/null
+++ b/dev-python/django-phonenumber-field/django-phonenumber-field-1.1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django model and form field for normalised phone numbers using python-phonenumbers"
+HOMEPAGE="https://github.com/stefanfoulis/django-phonenumber-field"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/Babel[${PYTHON_USEDEP}]
+		>=dev-python/phonenumbers-7.0.2[${PYTHON_USEDEP}]
+		>=dev-python/django-1.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-phonenumber-field/django-phonenumber-field-1.3.0.ebuild b/dev-python/django-phonenumber-field/django-phonenumber-field-1.3.0.ebuild
new file mode 100644
index 000000000000..ad3dd41f6c95
--- /dev/null
+++ b/dev-python/django-phonenumber-field/django-phonenumber-field-1.3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django model and form field for normalised phone numbers using python-phonenumbers"
+HOMEPAGE="https://github.com/stefanfoulis/django-phonenumber-field"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/Babel[${PYTHON_USEDEP}]
+		>=dev-python/phonenumbers-7.0.2[${PYTHON_USEDEP}]
+		>=dev-python/django-1.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-phonenumber-field/metadata.xml b/dev-python/django-phonenumber-field/metadata.xml
new file mode 100644
index 000000000000..4be288e13588
--- /dev/null
+++ b/dev-python/django-phonenumber-field/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>ercpe@gentoo.org</email>
+    <name>Johann Schmitz (ercpe)</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">stefanfoulis/django-phonenumber-field</remote-id>
+    <remote-id type="pypi">django-phonenumber-field</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-picklefield/Manifest b/dev-python/django-picklefield/Manifest
new file mode 100644
index 000000000000..4069e5856059
--- /dev/null
+++ b/dev-python/django-picklefield/Manifest
@@ -0,0 +1,7 @@
+DIST django-picklefield-0.3.1.tar.gz 10410 SHA256 d99426be46fd92fe6b64b9f5c5926ea9859394e44ec3ef9e1f7c647d3a26657f SHA512 47e9aa8fda2374672c29dcb1068c9bddb0630bfc95cab401aa611123d1eeb3380f42efeee833542e187e052622d60aec1affb1c43cd96e9e69aadc187feba098 WHIRLPOOL eba9dc88dc688007568e5141e427eb9d49c80890d4da6df9487092471d52ab93556a919fda64e64d05e628f1715b03cba15b1cea7d225aba9f9546b35cf68ab1
+DIST django-picklefield-0.3.2.tar.gz 9715 SHA256 fab48a427c6310740755b242128f9300283bef159ffee42d3231a274c65d9ae2 SHA512 4a6f3c3cedf3d44d232e5801a6041309949dfe551429ddb06535c97148010b14dd40ef6a4a8f1c126a35185732ab319dff53d14da243933ac3de561ad15c0c2b WHIRLPOOL 0964598a40b1728cb02ac9b6e43b58e6ce867758281aa1ed161ae27d3a9f11a8ab8cfb2c99176d4c16b6b1168464428b9dbf0eedc706868f420714c058b049e3
+EBUILD django-picklefield-0.3.1.ebuild 559 SHA256 db197d124d2eb59aa180f5813a51f7ab06c2d8e796543df5393a72855b912dd5 SHA512 ba819da9e9dba0c4e12077b935b7b78435515233869fb8a93f2961e0a5131dd27044d6f62de8f059477e1467070d849c9baef8b5b91e9c6ca3ec75db2e39b6ed WHIRLPOOL 8b5f354583d6e862badb40187c8c5d94f98341a09cc22dca775fdb3e7dfba485555efa848c3a4841a35fd68bf7eeb7156ea854f3e75630398bc148567951a4c2
+EBUILD django-picklefield-0.3.2.ebuild 567 SHA256 86f38f690658546fc12605e0f73fe83d320a97dbb2611c55957c98350661a2a4 SHA512 8b844fa2a4fd33abc293fe455796a01df5e280af2b433dfa680b051b2ea06ef54a76fcaebe034feb0e5fdd0370bc0c96c0d59af83e029012b87f9e4cfab2e5ad WHIRLPOOL 5b3ac6e284b291c679cee21def629725bc1561f3f4b887812430ddbc877e493995255e875395e7506cd782968f24b6d0f8cace370a37de0e42cab1dd243e60f0
+MISC ChangeLog 3106 SHA256 c1515a07abfb720e89a49057dc2275d4f4447956a9cea9b116acc3d9ec282e09 SHA512 959ce57110212e8eec1edf354abc5e923582199f4215c285d01fe015848bdf67d36dfd0307adf55c1e4da0c64fc823e3e67319a97de786bccd7df9f256a975c1 WHIRLPOOL 57eb8065a122c467e77225025015a073c0ee479d128e3a5126f20483424cc0185610dcb64579780aa81018ad0716260d79e36444887728bd52b8064c073bca07
+MISC ChangeLog-2015 1531 SHA256 54f7a209ecf03f3bbc5ffef38665e4ecb601b1bc2faeb1436739a0074ebda535 SHA512 f3110ebcf7e645bfc2646cd40f6969e380fcd1a9a72f36e3ce65a7358b5cb51c358edf15d4f09443e0a1a34c6b79b3458d7917e200834f3ac80e25105b3ef60e WHIRLPOOL df597b0aef0ea16c46c53463e9e57d4990d90a72547a7063e5cf4be6ac920e0dd8892da353916a52f93ae53b890955ca638fca2d883f1f17ea98e979df517715
+MISC metadata.xml 405 SHA256 2f517e6d9b6ae1ab63de1e8f4c2a4f36a40c54535576957e264813ff980560a3 SHA512 4f45e449d39c68d5bc139928042b1f94bafa15caf2626c871d03168df95faf3da9b3ca21e16dc61dcc115027823d0a92c38ebe9269ccb7e1c9285ebcea04f449 WHIRLPOOL 3e8d6f1f8caf48dbf16bd5182b6181339b607dc91c7a41b886213604b05c0310f955a5b8afe3e50175a340514253e195cdd4b6d1ad4660832bb32f3140111f23
diff --git a/dev-python/django-picklefield/django-picklefield-0.3.1.ebuild b/dev-python/django-picklefield/django-picklefield-0.3.1.ebuild
new file mode 100644
index 000000000000..700cf57bfc8c
--- /dev/null
+++ b/dev-python/django-picklefield/django-picklefield-0.3.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Implementation of a pickled object field for django"
+HOMEPAGE="https://github.com/shrubberysoft/django-picklefield"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-python/django-1.1.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-picklefield/django-picklefield-0.3.2.ebuild b/dev-python/django-picklefield/django-picklefield-0.3.2.ebuild
new file mode 100644
index 000000000000..d26bff923fd9
--- /dev/null
+++ b/dev-python/django-picklefield/django-picklefield-0.3.2.ebuild
@@ -0,0 +1,22 @@
+# 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
+
+DESCRIPTION="Implementation of a pickled object field for django"
+HOMEPAGE="https://github.com/shrubberysoft/django-picklefield"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-python/django-1.1.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-picklefield/metadata.xml b/dev-python/django-picklefield/metadata.xml
new file mode 100644
index 000000000000..ccee7cbf8457
--- /dev/null
+++ b/dev-python/django-picklefield/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-picklefield</remote-id>
+    <remote-id type="github">shrubberysoft/django-picklefield</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-pipeline/Manifest b/dev-python/django-pipeline/Manifest
new file mode 100644
index 000000000000..4c9fdb88df49
--- /dev/null
+++ b/dev-python/django-pipeline/Manifest
@@ -0,0 +1,8 @@
+AUX 1.3.26-tests.patch 4195 SHA256 f7761a6758225a461e1571f63bd5b98df584cdc040f0bd65c98dfec856beae3f SHA512 1eef360d23f0647319aeb4f4157318c6b91f3ee0bce34f9afb9ea82f74d57aa02328bdde066d0e68b56194301dad483f962436fdd349694991d1f9334d9fc13a WHIRLPOOL 8ec3d58cef9faaaf7a2d2968e906491eab9bcbe0f70c83d11552b9b93a70c6d66b7efb1593a029ba35f3e37ffd0135f038243d6aeda238942bbf72705f9a48e3
+DIST django-pipeline-1.3.26.tar.gz 41054 SHA256 58433fc07cc81f213686b892caeb8d17d6ed4e00444ef95b35f21a5a3cc6357e SHA512 106c89e6a5509305548f6169f9b38d3a288bdf260c4b933ac1372c8471e897b8f6109cdecf70a4f77dff670e2b97abe4ed990903abfc188a59600189d0473284 WHIRLPOOL 7ead1f6dbc6df1a5c4b26869e6b4ae73cd416ed52f22ba1ff16b57a295f476c7973a56af9c05d1b50097e82dcd286207f648920b3acadd88fc40ad26aae10285
+DIST django-pipeline-1.6.0.tar.gz 41822 SHA256 de2b6b068576fd5f4d08cae6a2d7768a0a47b92e20d13a4dd39974dd5a6876ee SHA512 4cf89f34a56aeb7cd5042617c265fb4bccfe7a0c32c26d50a0820d35c18207cdbf68b43e8f51ef7145fc48576ae0fe0a21553a75ec8a0a21a3c62e7699268d73 WHIRLPOOL d357b7f207a4c695cbae3a57ef0916e5f66add06c2f9cb45d7e4046326c2cfbd1a6de43eff2af23ff9966099761868c6b9b8a87740e555201eca2c8e2b33f4d2
+EBUILD django-pipeline-1.3.26.ebuild 1481 SHA256 508f0d4c634bc95c868e615a2aed3e9d08682ee5477a8e44cb7bd65c3d44158f SHA512 c84cb9b8ccfe25850ad1d883b335ff1efa4f81dd1a538fa46c0bc8f06393b16b950634ec02774da851265b3bfb927492df4fa306601e047fff03cec4cc8d8d07 WHIRLPOOL 5e4f9efdb4911ede871829779b3c034f22a79e7234b7521eece8e2bca1794ef4cd6c776a797005018b1ef8dde42ab798bdc82a6ec54e6b1eb729a7b792db7b44
+EBUILD django-pipeline-1.6.0.ebuild 1444 SHA256 63db1f4b4102e3873cb5bbd48ad4fa25a143e4451777c211f1a325dddfc4950a SHA512 771b9af45df176258f07a850a21d87402bc1fb678f77ef5d784e41df66e38dfb648a10e302daf19d012012530bd310df1dffd3d16be7b673f363e4b7b7412cb8 WHIRLPOOL 8e8c6a2ce4177caca508c273063b8d7d995f58ce8820272a1d0d862ede4553bbe4fcc1f8aed77374f1a4eea2042195397a32503f122fec7c7ae9167b9647ac40
+MISC ChangeLog 3493 SHA256 bc2f044b9bfc750a07f537a9bfc2e7633219bab253c8cc724563c8540085914f SHA512 9b0fa4e197c3cae609480100ba1e55ead150d88c58f074d927435ad248fadc3955468d29e4a89cb8703f771260272deec549ae4d6c0891608230a300642088e2 WHIRLPOOL c340bf4e203cedde08a43bfa3c5a025d3559f7284bdab5aaf1acb60d3a317c9e9391eba382c2e0fd95842dd46f184cbcf5512383d9f060085b8ee394ffb18940
+MISC ChangeLog-2015 5304 SHA256 cdac87978081cea291a6fa34fdcde782e664f8683c04a3b02900d1f6af4ca5f3 SHA512 bfd928d8562ceae236d78969dd76521d2d2a6713df43aff62a78df476a4f54d912b66ec1117e355d71b8e3cf4faa9b1510126dffa2d179f73ec7609c385dede3 WHIRLPOOL feb0c5d32311e83b80b1ea1e8470b528d633d4b43a9b66398678c6526101d5656cd0f0c1bf756fd1a32d5b0308d4b5353b8b7dc48a5fc156b89527b2daaddea8
+MISC metadata.xml 341 SHA256 07db64550115261047978d6df1133656aaa3d3716c605f8fea5cc015c046a99f SHA512 7cef597f45253dd0e25392fbb3bd20090ef6a522d506380be2a925948275bbf2348c5d114f84020ad132e84c72d2dd125fd487d591eb33d45a137d0be215ff09 WHIRLPOOL 9d07ab0671feb8cd1b14b0276917302cefb2bb437ea78da64381e810c74d15954af4d86d52600f78a1a7f9e87efb55c39ca997304ef0e8fcbd8ef0f1b3b25e65
diff --git a/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild b/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild
new file mode 100644
index 000000000000..5f1e37ee8775
--- /dev/null
+++ b/dev-python/django-pipeline/django-pipeline-1.3.26.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="An asset packaging library for Django"
+HOMEPAGE="https://pypi.python.org/pypi/django-pipeline/ https://github.com/cyberdelia/django-pipeline"
+
+# PyPi releases lack docs/ subdir:
+# https://github.com/cyberdelia/django-pipeline/pull/254
+SRC_URI="https://github.com/cyberdelia/django-pipeline/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/django-1.5.8[${PYTHON_USEDEP}]
+	dev-python/jsmin[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${PV}-tests.patch )
+
+# As usual for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# https://github.com/cyberdelia/django-pipeline/issues/381
+	PYTHONPATH=. django-admin.py test --settings=tests.settings tests \
+		|| die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	export PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.jsmin.JSMinCompressor'
+	distutils-r1_python_install
+}
diff --git a/dev-python/django-pipeline/django-pipeline-1.6.0.ebuild b/dev-python/django-pipeline/django-pipeline-1.6.0.ebuild
new file mode 100644
index 000000000000..823a233eb199
--- /dev/null
+++ b/dev-python/django-pipeline/django-pipeline-1.6.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="An asset packaging library for Django"
+HOMEPAGE="https://pypi.python.org/pypi/django-pipeline/ https://github.com/cyberdelia/django-pipeline"
+
+# PyPi releases lack docs/ subdir:
+# https://github.com/cyberdelia/django-pipeline/pull/254
+SRC_URI="https://github.com/cyberdelia/django-pipeline/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/django-1.7[${PYTHON_USEDEP}]
+	dev-python/jsmin[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}] )"
+
+# As usual for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# https://github.com/cyberdelia/django-pipeline/issues/381
+	PYTHONPATH=. django-admin.py test --settings=tests.settings tests \
+		|| die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	export PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.jsmin.JSMinCompressor'
+	distutils-r1_python_install
+}
diff --git a/dev-python/django-pipeline/files/1.3.26-tests.patch b/dev-python/django-pipeline/files/1.3.26-tests.patch
new file mode 100644
index 000000000000..5cdf5e760c96
--- /dev/null
+++ b/dev-python/django-pipeline/files/1.3.26-tests.patch
@@ -0,0 +1,64 @@
+https://github.com/cyberdelia/django-pipeline/commit/ba7b8d0d1cb621521a2025fed3e60786a010836d
+diff --git a/docs/configuration.rst b/docs/configuration.rst
+index 4385e23..e200bc3 100644
+--- a/docs/configuration.rst
++++ b/docs/configuration.rst
+@@ -185,7 +185,7 @@ Other settings
+     (
+       (b'text/coffeescript', '.coffee'),
+       (b'text/less', '.less'),
+-      (b'application/javascript', '.js'),
++      (b'text/javascript', '.js'),
+       (b'text/x-sass', '.sass'),
+       (b'text/x-scss', '.scss')
+     )
+diff --git a/tests/tests/test_template.py b/tests/tests/test_template.py
+index 84b6957..a303d03 100644
+--- a/tests/tests/test_template.py
++++ b/tests/tests/test_template.py
+@@ -35,19 +35,19 @@ def test_package_css_disabled(self):
+ 
+     def test_package_js(self):
+         template = self.env.from_string(u"""{% compressed_js "scripts" %}""")
+-        self.assertEqual(u'<script type="application/javascript" src="/static/scripts.js" charset="utf-8"></script>', template.render())
++        self.assertEqual(u'<script type="text/javascript" src="/static/scripts.js" charset="utf-8"></script>', template.render())
+ 
+     def test_package_js_async(self):
+         template = self.env.from_string(u"""{% compressed_js "scripts_async" %}""")
+-        self.assertEqual(u'<script async type="application/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', template.render())
++        self.assertEqual(u'<script async type="text/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', template.render())
+ 
+     def test_package_js_defer(self):
+         template = self.env.from_string(u"""{% compressed_js "scripts_defer" %}""")
+-        self.assertEqual(u'<script defer type="application/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', template.render())
++        self.assertEqual(u'<script defer type="text/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', template.render())
+ 
+     def test_package_js_async_defer(self):
+         template = self.env.from_string(u"""{% compressed_js "scripts_async_defer" %}""")
+-        self.assertEqual(u'<script async defer type="application/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', template.render())
++        self.assertEqual(u'<script async defer type="text/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', template.render())
+ 
+ 
+ class DjangoTest(TestCase):
+@@ -64,16 +64,16 @@ def test_compressed_css(self):
+ 
+     def test_compressed_js(self):
+         rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts" %}""")
+-        self.assertEqual(u'<script type="application/javascript" src="/static/scripts.js" charset="utf-8"></script>', rendered)
++        self.assertEqual(u'<script type="text/javascript" src="/static/scripts.js" charset="utf-8"></script>', rendered)
+ 
+     def test_compressed_js_async(self):
+         rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts_async" %}""")
+-        self.assertEqual(u'<script async type="application/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', rendered)
++        self.assertEqual(u'<script async type="text/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', rendered)
+ 
+     def test_compressed_js_defer(self):
+         rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts_defer" %}""")
+-        self.assertEqual(u'<script defer type="application/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', rendered)
++        self.assertEqual(u'<script defer type="text/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', rendered)
+ 
+     def test_compressed_js_async_defer(self):
+         rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts_async_defer" %}""")
+-        self.assertEqual(u'<script async defer type="application/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', rendered)
++        self.assertEqual(u'<script async defer type="text/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', rendered)
+
diff --git a/dev-python/django-pipeline/metadata.xml b/dev-python/django-pipeline/metadata.xml
new file mode 100644
index 000000000000..df6b94927396
--- /dev/null
+++ b/dev-python/django-pipeline/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">cyberdelia/django-pipeline</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-piston/Manifest b/dev-python/django-piston/Manifest
new file mode 100644
index 000000000000..14c6db09ba3f
--- /dev/null
+++ b/dev-python/django-piston/Manifest
@@ -0,0 +1,6 @@
+DIST django-piston-0.2.3.tar.gz 34319 SHA256 fb015137ceb7934f4645f7eb91a05d7bd63ef6bb1bd84f557ce55fac38e38ae9 SHA512 205cb15b4e59e7cb4d744525e149480ce9f54afa6b514c038ecf20df9221b4193d5041963b7217f40454c34d77125a1e52f0e7bfed5a471b27b1694a3af2ef6a WHIRLPOOL 364c8273a7542c43e18059b9c0ea6a110577ae190d2faa8cb268045556cf9d1882771ae05d907c907467562994be1367435c498329515d554eb675618f3bc50f
+EBUILD django-piston-0.2.3-r1.ebuild 502 SHA256 86ed0477ef1c2ed22be256b9e84523f2ef8bcad3c74662707f6837796c7ef8c2 SHA512 63e745aaf7ce5e1df9c4a8cb81b9a2b0994399a2a8524eac8a42be3d8b6ccec5b68a3fc4c38d3e32f24b4d9da92194325ce2a386227524ee844fe0f4fb2c383c WHIRLPOOL abec9fd6cc7ebdd22e13648fdff3c0b00e5cfe0bfe494c5654b8232b4d379ab32a2d730e4ed980099c67b46ce82db8b32c1e1a78f22258dee88f0ec4a8f84e1b
+EBUILD django-piston-9999.ebuild 534 SHA256 29b24b4a9faf019241921586cf95b5ff842199c6dcfc9969ddeaa07473efa56c SHA512 ceb34dea8d18d53ef80b1bc7140e951290fe9d984d2f2685d14f3e3a7d6165bf54d0f2ebe23dc04e6a2f2ee4e2823fba549a0879d96fa7e2f51a6ec365872854 WHIRLPOOL 9a01feb67e1396003df41aae49bb74567fdcd97fcdf2bcf1c7da60988c113d4de905da3cf515d69f715ca0d2752f79cc3619304a36574dc164f7e32a5e49d8e3
+MISC ChangeLog 2696 SHA256 91b1b647c7c344b55321a637f695b797a48c7b5074f3da6e168b3fa693f13252 SHA512 26de6d0b56fea5f6770f52a8ddff887b5ecf7b5f44e277b694d47389ac3685c9e40c06b67832fe3b03a881786638c0102b786fa3b428b175e31871718a184290 WHIRLPOOL 5aed877ceff6c056174fcdef43332eefac8d3e461c4ce4b636501da188d46d996d823b13c50e94050c74568c11d7c57d8c9427038752bb4db506a4e08e1c6573
+MISC ChangeLog-2015 1990 SHA256 7b6309dcb73c89e37909c95af315026c3e6dcebd10188005d87c0eb64bb253ff SHA512 6f863cb04fdacebe743401a54686bc5089684d907447e6783c01e05e75026cc006c06ecef35fc785a484d008332059ae90af99708f5b359a29f7e901a0e14d3d WHIRLPOOL 6f1555ba54dd384d55318f9106ec4ad371b83713584f3fbe52e44b96778a9b4c78f568c232cc0bc3cea7a8053cd589b9c7c1659967083819fc7779c4d0cc4129
+MISC metadata.xml 509 SHA256 c9460c311b08083132e2743e37c5923bd2450aef24ef222fa6728dce89c1a2eb SHA512 85971f86267acc6b22bbfa53fe1bc026644bb1fa190a67fc4fdb96990e2288fdff43bdec9a4a337ad5dbdfc0899802491f7e8acf99a6395d2ae9d9a17a14217b WHIRLPOOL 75b95f48e05840c9df5c0d801ab91cc67e3378377f90f40e06cc316ffbdb505af8fc27dc181f9c87d78a9d71f27c227c38d076bd330bfc9fd43cdb85a3153c66
diff --git a/dev-python/django-piston/django-piston-0.2.3-r1.ebuild b/dev-python/django-piston/django-piston-0.2.3-r1.ebuild
new file mode 100644
index 000000000000..740a98826961
--- /dev/null
+++ b/dev-python/django-piston/django-piston-0.2.3-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A mini-framework for Django for creating RESTful APIs"
+HOMEPAGE="https://bitbucket.org/jespern/django-piston/wiki/Home"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-piston/django-piston-9999.ebuild b/dev-python/django-piston/django-piston-9999.ebuild
new file mode 100644
index 000000000000..dfbb04644206
--- /dev/null
+++ b/dev-python/django-piston/django-piston-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 mercurial
+
+DESCRIPTION="A mini-framework for Django for creating RESTful APIs"
+HOMEPAGE="https://bitbucket.org/jespern/django-piston/wiki/Home"
+EHG_REPO_URI="https://bitbucket.org/jespern/django-piston/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${PN}"
diff --git a/dev-python/django-piston/metadata.xml b/dev-python/django-piston/metadata.xml
new file mode 100644
index 000000000000..3c7fd0b88127
--- /dev/null
+++ b/dev-python/django-piston/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dev-zero@gentoo.org</email>
+    <name>Tiziano Müller</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-piston</remote-id>
+    <remote-id type="bitbucket">jespern/django-piston</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-recaptcha/Manifest b/dev-python/django-recaptcha/Manifest
new file mode 100644
index 000000000000..668a7823a9df
--- /dev/null
+++ b/dev-python/django-recaptcha/Manifest
@@ -0,0 +1,7 @@
+DIST django-recaptcha-1.0.3.tar.gz 11268 SHA256 ca47210207e81d8237ff0c5cf51ce07b95ff83dcf5f1e03bb813b6e0cb853af6 SHA512 9288ba1b4145dd6a08f39d226eeaa5f9ea6d9ff63714ff497fe808dfbe249918e4bb67790566044bceeb59ed293a8fcfe4fb41e279b17b2d7a0a0c5a53dd6463 WHIRLPOOL 079349c118a163c6ba6addd18001b1a50a3139c1ff7cd8729e0c77d51f2a798d6aa32e911fcdfc57727eddb5e9bde58639256ba254a759790a0077b6aeb766a5
+DIST django-recaptcha-1.0.5.tar.gz 12827 SHA256 62081dd411dfddcc0b7cb97c358fe449788f7974d19e6e95afd1487574852d6a SHA512 2ccf0a6c25d242d86ef7e89705d3f299c94c0ee2fc40853db9bb8cf1f7397650dcde85f1a6d995d452d432ce947bd8fa850d64334d4c124ddc9315cab6fe222c WHIRLPOOL a0759e1e717aaf34ecd000abc3c9978a965e3559eb1a51c522eb4f236616cb71046a4494d156e82a8ed8887e7fc1119dfe9226b9c2add5fb290c1eabc38599dc
+EBUILD django-recaptcha-1.0.3.ebuild 731 SHA256 b3456677aa7170b6ce42fb8b5555bbc31ad898f976ca795142c173850e87feac SHA512 62c612558d0b3a57f266cdbc81e2e9d9cc135e6f938aa9cd49bfa11424e1ffe1ea5340a7cfba4ed02575a8654ecdd6644292ba7664c60dc85b6b0c55fdb05d59 WHIRLPOOL 3059fc53563c6755286c0c94d98e03d46f6c47cf7a7e51d4349f020c982cd6afc32623845909023f5f326211f1ada5158365712986bb72af38024484a8113c15
+EBUILD django-recaptcha-1.0.5.ebuild 741 SHA256 5d763e65e77997e62f28e2bc816ca30ce0ed17218c61a5bb184416dd33657d5b SHA512 8769d828f12937749a27d2733ed5f7033dd1ff5e2ac0a316e18b85d8b9f218f760828a94554f9ebe044eb1786c51f93239d882793b7c535542a45db378a3474e WHIRLPOOL 8f9bc1ce58e4c223a2932158520beee7a6b6340b0ab820883fd85fbf8ec08b7a533600cf2b8c8f056f54281803a589ec3bb0b0acec5de260ecab04ca1d68a58e
+MISC ChangeLog 3470 SHA256 172852feb8eade28bb7c95b72c5df7189ec4b1f946b222856faf63e681b35163 SHA512 e35281f35e004e6c999f49bbca892b0ba90a0a44d8a77cf454788afc89ecd08286889085c46b27c42febb2bec1de8cdd69934511ce351f12af03374486a0492c WHIRLPOOL 61bb91fd4c70c3fd05b7fc77ba35cc071af179c0a8131261a480d196b7ebcb808fda58febe854c44e49f8c75971a3c47ddbfd2c427db2f64291feed51ffbfaf1
+MISC ChangeLog-2015 2853 SHA256 4f3b3eb8fe055f83afe54aea20b41fe7691cedbe7800813ebff17d297cb8c2a1 SHA512 c0217be828b64ce7c358288a1aabfd214455f5a028242400f1ab938d5cdb1d80d9e1345bd7558499bb0891cad11c1c33f82a34a3fe344282d1c5c1436b37c273 WHIRLPOOL 198bada30dc348cbd2558c28e53c1ea689be8651ddde80a514b7987b7cd29aa48eaebf2e65d60651620f0b15f66f79b62f7327dbc28d5da753c097e3a3ac4e0f
+MISC metadata.xml 384 SHA256 1449dcf6c97c6fcabbd6d12448117f2289cedd9cac90a2a0abd6b502c2811cc7 SHA512 ada7280319fd9fafeb8c9096a472bf88d1d49508733e7d847f08e33cc084f73dbd304af6be1725610127bc1ed054dbe66b74c6a3faf5c20520d4ea8d4e2087c8 WHIRLPOOL 99f9774a414cda0eff6ab96874b76844c7ba7626eb61dd8503d157967c646c37182b1e1c6ebf073d910bc21a08e67037f7c0132df6dc67c627c317c2beaa3d51
diff --git a/dev-python/django-recaptcha/django-recaptcha-1.0.3.ebuild b/dev-python/django-recaptcha/django-recaptcha-1.0.3.ebuild
new file mode 100644
index 000000000000..9e4ffcbabd3d
--- /dev/null
+++ b/dev-python/django-recaptcha/django-recaptcha-1.0.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+inherit distutils-r1
+
+DESCRIPTION="Django recaptcha form field/widget app"
+HOMEPAGE="https://github.com/praekelt/django-recaptcha https://pypi.python.org/pypi/django-recaptcha"
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/praekelt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/django-setuptest-0.1[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild b/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild
new file mode 100644
index 000000000000..6f66645fdf32
--- /dev/null
+++ b/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+inherit distutils-r1
+
+DESCRIPTION="Django recaptcha form field/widget app"
+HOMEPAGE="https://github.com/praekelt/django-recaptcha https://pypi.python.org/pypi/django-recaptcha"
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/praekelt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/django-setuptest-0.2.1[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/django-recaptcha/metadata.xml b/dev-python/django-recaptcha/metadata.xml
new file mode 100644
index 000000000000..4e397cbfaf98
--- /dev/null
+++ b/dev-python/django-recaptcha/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-recaptcha</remote-id>
+		<remote-id type="github">preakelt/django-recaptcha</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/django-registration/Manifest b/dev-python/django-registration/Manifest
new file mode 100644
index 000000000000..4199eae247c4
--- /dev/null
+++ b/dev-python/django-registration/Manifest
@@ -0,0 +1,5 @@
+DIST django-registration-1.0.tar.gz 276715 SHA256 f19112fa1c1f34eb46427afa280398d9f044a604d68d6d0d15047243e0a71d93 SHA512 53b191e4c75629d3ce93e4817a843bc1b056a14558be892aa95dc060b8b0542ddcae79f7cb0b37c4e758e8d9da093e59a57591294539acfed39b998b7087e0e6 WHIRLPOOL 8698a109a6eaf7926936b10f594be414793a36f27386b703d0abeee631da4fcff6f12231f24c3db0dd8468556fdc7e683b4f93286c759b3a0a89e5f1e7633ba2
+EBUILD django-registration-1.0.ebuild 527 SHA256 a588b866d7e9f6f77b5b48c3d25a64a0e2ef9bd59bcd9e54a7847fc2d105a23f SHA512 ca10de75a88f2e46800a1fe00ad43f0b71a0b4be4e15a17f04297fd77cb000be38d74776c4766174f072b0989da38fbdc7aef3039da49bfe2842e2edd38f3828 WHIRLPOOL 12afd5f2dea5ab93bf733337f53a5e57289185bceb80dae63564434be6cd7f32dee48ab1daef3c29e9e5aefd1ff8b5cb923f379c7ebc0a339b27483e90eb0eef
+MISC ChangeLog 3005 SHA256 f18687d3e260c9512605c3578a52cbe8dbc4ee5b54330b5c1b68d645d2e3d3c4 SHA512 7c7512561717f4569068f2220c5963d66c36920c9a7df38fa5055514c6ca36f214062afb8e4d77556cd837530e1412312db8dc8e51954e89820c76ad90976ad4 WHIRLPOOL a5f1961ec567e0f6e784db054082717b7051527fe3405df223a23a23e8b5d89742ce3762abbca38e1c57856055831a6a4e829382a166eafe3604a97808830822
+MISC ChangeLog-2015 1883 SHA256 beee87811532278119291ea7aa249d1ca659678f1a3a129810babad3bf3cbe24 SHA512 8d6a86668e055252a198d79ab5fe6eb721b58bc3c279e987f10cd4868adfaa8b5a3b0944048a7a7faefce1095720591faab90ee1894d879e306663c9ac778f83 WHIRLPOOL d26b944385130ad67b55ccbda83d17fd104a714112f6b273fb4077e90c0a2dc07e0ccd491a37b9545889d634f0e6a342076a14bab87d6057651bb4e7a29e3ad4
+MISC metadata.xml 447 SHA256 5a69124a61c7cdeb4ce362543f410cbd3b1f449355bdac44ae03b774c4f9cb36 SHA512 7cb148c092d0b5216321842041406d4191d1ab45fb0fc655ffdd2b02c3f50553b4561b45db8fd81549e4c567ba7ae0ffe7efc91cb73a250dd35ac2fe32928417 WHIRLPOOL cf99e26fe9d6fb71f2b09b05eba97cd453702985b62586f3a18ab8c3c8a56f4676746cfbaaf7d35a2e589d6341fd4ce3b50d4f4072dcc571c310645a5e7f9b46
diff --git a/dev-python/django-registration/django-registration-1.0.ebuild b/dev-python/django-registration/django-registration-1.0.ebuild
new file mode 100644
index 000000000000..f33429b58dfd
--- /dev/null
+++ b/dev-python/django-registration/django-registration-1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="An extensible user-registration application for Django"
+HOMEPAGE="https://www.bitbucket.org/ubernostrum/django-registration/wiki/ https://pypi.python.org/pypi/django-registration"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND="dev-python/django[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/django-registration/metadata.xml b/dev-python/django-registration/metadata.xml
new file mode 100644
index 000000000000..9f505df3e948
--- /dev/null
+++ b/dev-python/django-registration/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jmbsvicetto@gentoo.org</email>
+		<name>Jorge Manuel B. S. Vicetto</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-registration</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/django-sekizai/Manifest b/dev-python/django-sekizai/Manifest
new file mode 100644
index 000000000000..88b6c8d6e971
--- /dev/null
+++ b/dev-python/django-sekizai/Manifest
@@ -0,0 +1,4 @@
+DIST django-sekizai-0.10.0.tar.gz 18731 SHA256 39c5d16ad694aa78278ca84fdc7b9f953ebcf94e2fc95b68c875d02014303260 SHA512 f7e336fce652094394aa3d3f94f53dae0eb80bb3cc7715013f1c8d227b9f36b97746f572a8c5bfe278e41d73783b7a978f86967ec23a7a423f1c014d658347c2 WHIRLPOOL ffdaa0f6ace9e361f52bed0f977014f1e73530f721d6f99f55dbbec6335b9515e9575ed90f4f9307218e4793db81691163cf094cdb6a60bc5f9129a05d21d049
+EBUILD django-sekizai-0.10.0.ebuild 606 SHA256 f894cc0281ffc8b753b93b19a858f2afab49cbd9becc5971cfb046f240245a5c SHA512 5a539ec0f4125dc533cb38e3efb18e0cea183c1e25c3f420482a214717c44185416124f48fa5a5a04f0c0f493803ff67cfe67a6038a4f817eb3b2be803ffeff2 WHIRLPOOL 8e189aff152c4e5c238378a01cb495bacd953642552dbc9f0e7dcaf48a9eed5c7fd4736df854ad5c46f6d71d88fb31022f280aa7ecd67f2fb492a02939163884
+MISC ChangeLog 1801 SHA256 9e57c254b4b12373bada15321088438c73be93a83646264bf4131ca766f34c43 SHA512 3e76cb5ea40291c1190ad0ae29927887ad185b7831e7efb7a1e63b37440f19a39cad37e96663755483aa9bab8e95a95e5098f039deeccbcf8704a2809892b4c4 WHIRLPOOL 03f4630ccc79786c4c08799cce43f0f4e3e5d9cc1f4032aedf357384efa249b5844dff11e55e0260b3d08d7733bc722fd9b04bd9403fd96978d12bf162a8f5cb
+MISC metadata.xml 361 SHA256 34bb0859c5be8e474a52803a5a63e0a0687f69a94da7a9eb15a303a85625a77b SHA512 e6d062fe70d05e07e6d13c714abba9a031da50fa8678ec8f44dd3a376665e686a5db9880d4ebbf02e197aa138da043b18bff17f52de9cff83b495d8c59d3dbbf WHIRLPOOL 31f9120e9d570b6b8ce0419de331d401de41c3f75f0a64c56df690f8f294e4de83094edb720805403b3ae4351eee5444cf2e5d83bb3f2f59b65385931be295c7
diff --git a/dev-python/django-sekizai/django-sekizai-0.10.0.ebuild b/dev-python/django-sekizai/django-sekizai-0.10.0.ebuild
new file mode 100644
index 000000000000..c8c00c3bfe07
--- /dev/null
+++ b/dev-python/django-sekizai/django-sekizai-0.10.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django Template Blocks with extra functionality"
+HOMEPAGE="https://github.com/ojii/django-sekizai https://pypi.python.org/pypi/django-sekizai"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.6[${PYTHON_USEDEP}]
+	>=dev-python/django-classy-tags-0.3.1
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/django-sekizai/metadata.xml b/dev-python/django-sekizai/metadata.xml
new file mode 100644
index 000000000000..b54504275860
--- /dev/null
+++ b/dev-python/django-sekizai/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ojii/django-sekizai</remote-id>
+    <remote-id type="pypi">django-sekizai</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-select2/Manifest b/dev-python/django-select2/Manifest
new file mode 100644
index 000000000000..6c9de0b00ecc
--- /dev/null
+++ b/dev-python/django-select2/Manifest
@@ -0,0 +1,7 @@
+DIST Django-Select2-4.2.2.tar.gz 91269 SHA256 e0924aed8e9a35f6d755b464c44ea63396653b1dc82cdf1591d1a151e032aa70 SHA512 5262201804ac9cd9a13c228ba93d3753906d60bceb17ba860b855fb5106891223006acc79da9cf9d34ad32f6bcdf434f10d36135fab0305a8772f532d77982db WHIRLPOOL 25f9b3527bf023c737c9296311c1c9237cbe1ceee510d7036a44b71c7dd95d17e3c121e85d950e1b81fcc130bbee794bc2af4a004ee2d8d6668a0bb3adca50a5
+DIST Django-Select2-5.5.0.tar.gz 16591 SHA256 7068fe588561e4fdc896bb7102f775c203f4c38fd6a9fe73ed1e515830552c49 SHA512 c2b3fc97a520d729e8288647190042cd6e577649e9abbbd1d4ce39d9cb9a7d0c03da8f1e50f5377c67c0ea9f0d379c1f8c97da4cc477c365741a6c82bc8f1e03 WHIRLPOOL 438fd2c3d351bbd9a95a6bbc2b750444b86b0a465811b1c54ea57b670352a38c797e51ca9badb48513515e600881d973aad2dadda2a3cf6b58e45a89ab743152
+EBUILD django-select2-4.2.2.ebuild 533 SHA256 cfe3a9356b45365e9cd1efd8f9f8db5f97ff607349a13f3c1b983bc201d1355a SHA512 a33a57861fefed90647c26fd0c70b457d70302946a180d5938ba9e81c333597ac1b2ff4d79aec5e86a279ce9ecba66142f744cbbb81ccc4e3e545c967c7ab8de WHIRLPOOL 72a76b358a672a72d91498c85d08c773671d3614a1c53a9c4bd4133c199249a2a66f40da6697b5ac8faa7e35405b3c6fe14ed62ae8d8266e74e9c71333769525
+EBUILD django-select2-5.5.0.ebuild 597 SHA256 ceb75bab2a52f3acae9f078019a507c1447226d8ffb01f6cfac2c344429cef92 SHA512 9956363e0fc54147c9cd56314b3f17d12e12593266aef53c8f740dbabf7bf352ff2f226233c51c44f7eb7c646d69a063b0525124bfe8d06ae08ab5cf5291ea47 WHIRLPOOL 5a97747a706dfe9be46d5f197af71563f0e5da4e2421f992cf8e39b05e3ae71ea7a2df61ece415b544d08ba3f17399aa9aa4ddf5dd0dd90d2b011179981cbbd2
+MISC ChangeLog 3199 SHA256 b4cf0eccc62f20a25eb6170057191ee8691ec0cdc49c82262f1d81b03832adbe SHA512 533db2266873f010fd632014c0ba36a1b5b9278b9fa5e88d02a2b4232e140cad0b2b74336135eedfeaf434ca22bfbdfa3acf1b683a3d1c48b581e872d37a0548 WHIRLPOOL 6fa345c1aea7f2dd7894ba13637e1ea418a5c207c8d6ef7ec2d4184a8d04a0fa097be04c315b2506db33581d49ccb199a4bdf077993b3d2eb9cc39e01b970814
+MISC ChangeLog-2015 1188 SHA256 f18f4146b5a2ea4ae1624aee979c56404b1f67567d0b2d030ebc369c499d08ae SHA512 c6334e7fbf7820cd9eca992766bd66db473804231bb5de7e75ed72c00f5d16e11b23a8ec0c9326558a5f470bfadb1beda696c9817e840bb1dba279a961d6c89d WHIRLPOOL 9b0616174fd5e5d80489d4e90001b12579d3fbf5eb994be5049ba5b3bad2195a10840a09702222650e8e68a3b4d03492ee30f300619d97632cc102bb6b96faf5
+MISC metadata.xml 608 SHA256 ffd4863151b0aa3fb256416cea4e39405e7d337a017efbc236bbac4c1a4cca20 SHA512 f89e12acb996f10d549c6df88ee594c8fdab51e7beca0f6cd29595c8421daaadbb8a1ca2903ae6076991956d6901d51b4911e09a10cd175b288a926379dec7d7 WHIRLPOOL 10ef9d4f780a2388db2c94e245b4683c24b649074f72fc8aba665d77e420798c6a3f73af351dfdca36941d443d852e91db1df99b4f22c263f54158db4eb60d7a
diff --git a/dev-python/django-select2/django-select2-4.2.2.ebuild b/dev-python/django-select2/django-select2-4.2.2.ebuild
new file mode 100644
index 000000000000..df1503ebdff3
--- /dev/null
+++ b/dev-python/django-select2/django-select2-4.2.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Django-Select2"
+
+DESCRIPTION="A Django integration of Select2"
+HOMEPAGE="https://pypi.python.org/pypi/Django-Select2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-select2/django-select2-5.5.0.ebuild b/dev-python/django-select2/django-select2-5.5.0.ebuild
new file mode 100644
index 000000000000..354ff4e8d8e2
--- /dev/null
+++ b/dev-python/django-select2/django-select2-5.5.0.ebuild
@@ -0,0 +1,25 @@
+# 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
+
+MY_PN="Django-Select2"
+
+DESCRIPTION="A Django integration of Select2"
+HOMEPAGE="https://pypi.python.org/pypi/Django-Select2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/django[${PYTHON_USEDEP}]
+	dev-python/django-appconf[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-select2/metadata.xml b/dev-python/django-select2/metadata.xml
new file mode 100644
index 000000000000..9c87caca2b3b
--- /dev/null
+++ b/dev-python/django-select2/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    This is a Django integration of Select2
+	The app includes Select2 driven Django Widgets and Form Fields.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">Django-Select2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-setuptest/Manifest b/dev-python/django-setuptest/Manifest
new file mode 100644
index 000000000000..e333d80cceba
--- /dev/null
+++ b/dev-python/django-setuptest/Manifest
@@ -0,0 +1,7 @@
+DIST django-setuptest-0.1.6.tar.gz 6929 SHA256 bdce4cf9cfc485b6324b3847fb84af69bdc965370073bc1c983bbf0901902eed SHA512 c2f2c1329d3541ac2e8d5895ddde2e1d1d1c2a819b3cc7168d333894e15128ff49b973a1570917abf06152634c915dada6df9f27ec9463ef79f02411c022d80d WHIRLPOOL e1c45eb3658b75bc82d0b3a5397c4199f5339c19c95e76e2fba0dddd02928da3c3480dc51eb41cef39c283c534a73f90bfbf5edc3289d24f6a5e44aea71e81e5
+DIST django-setuptest-0.2.1.tar.gz 7131 SHA256 539dac135a8b3e7244e50b3b4859782ea5598b794741dc6691e890b779d14169 SHA512 de0ba14ca451974ffa10b2fe822e6a7a927f2009dd1cc345abd6d4b192a5d9dbd1c9034463cbfbc8b5b66ab35d694282513a33dc55e8c1b0385fa32619c3f31d WHIRLPOOL 508d16f928e715a7c583c5190768554c274ad5b4b84d6368f09b98f78bd9cbf4eab62281445159a39369b3a7b91218406bb9d89eac0214d9ae3e42fcec10f5a3
+EBUILD django-setuptest-0.1.6.ebuild 644 SHA256 d1bbbf9d04ef04c35a464cf4d560a89af6b69c9414130e255ef58d70ba6cd81b SHA512 ea01542e119c5c2d2ba48cda00a7894c001ca86e2cecfa866c5763800709b520aae7cd2d8828215d1c72b6e03b1e68e696b1f9f918c67711a8635613817b4820 WHIRLPOOL eba0f80353c76ee3922fb9f52abe3e1451b95c633e726e90518941517cf970847a401c87452600e580ab747e29b882c4f1f3c50a5e720e51a71c545577ba3e35
+EBUILD django-setuptest-0.2.1.ebuild 652 SHA256 057710dcdf9dc5f19cb5b556a14d1ac280b771d0714e0be80d7d27a232dd2390 SHA512 1e67b0c8e890c706d73a94c0b5f9f417c9a21985048c006267c247082e913028e57c2421682fb47b97a871ee71f9eccdf07c8dd83db702d3cb8b3a7c29ada50a WHIRLPOOL 84ceecc0ecb6c3a4f2f29b9912a08701c967e0b0437117571b59d5470a9a185de318b6ce39764eca869d4017b5e63906ad76aa45b0255d82dd490466a35deed6
+MISC ChangeLog 2916 SHA256 bff3deac3f9c8097098c925bd9f6570792bc8afc32a26f4116681c4c74f965ae SHA512 9c82def2ddfd1e469507f6a91159ca7ba28f8d9fe8417ba8de17850074a1ce73fcd2b6117e6aa735258461469e891bbd732bfb863365fbf1a2342e2c870b7812 WHIRLPOOL 51f4d5b20630b7f7fc6ce980c1360bead8466057733baefe6977b2807a0e88bdb879f5b643fa75cb8c807ab3c0587858bd5558721ac0495e16331dade8866cd3
+MISC ChangeLog-2015 1854 SHA256 838d71bc357284af5a7bdaa6e6ea41cd1a2a9f2cfd7ab3db34d3a54643df55a9 SHA512 a0d2a1d28f0002d9c07af5129479e3df37b6c7293efe10ef82fe946ff49955a254f5f1ec7789646dbcafd0825d578b2925695eb9a341aebd92fb655ccba645b6 WHIRLPOOL 8a9e3bba1b6d3fe9d405edb0e138073c5bef14d425005b972ec3fdc1beb547306d8c69a3f9cf81ad45ed362fa01d514ece9178e8caf7c017f48f7d3950d9a29c
+MISC metadata.xml 340 SHA256 d1a2977e5586b70e1e5f06401ed9457be7cde7dd5d04dc7c74cdfcc21d01be24 SHA512 8c5b08f7e63678f303781866e98bc65821f09f296810a1b3ee891adf7c3a6cbca4202a85b0f28490cb79f17e7e452cd977a874187d9f18bc6ce341d5819a1fde WHIRLPOOL 0c9f523a72fbeb5692b01996625d95f5351501bd9d6508bb439439e473abadc216af92c635881185d6e49eb5fe84949bd0b00859e2accd57ec57473344b7ab9e
diff --git a/dev-python/django-setuptest/django-setuptest-0.1.6.ebuild b/dev-python/django-setuptest/django-setuptest-0.1.6.ebuild
new file mode 100644
index 000000000000..b2656baad4a0
--- /dev/null
+++ b/dev-python/django-setuptest/django-setuptest-0.1.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple test suite enabling Django app testing via setup.py"
+HOMEPAGE="https://github.com/praekelt/django-setuptest"
+SRC_URI="https://github.com/praekelt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-python/pep8[${PYTHON_USEDEP}]
+	dev-python/coverage[${PYTHON_USEDEP}]
+	dev-python/django[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild b/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild
new file mode 100644
index 000000000000..b76fb76a6ed8
--- /dev/null
+++ b/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple test suite enabling Django app testing via setup.py"
+HOMEPAGE="https://github.com/praekelt/django-setuptest"
+SRC_URI="https://github.com/praekelt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-python/pep8[${PYTHON_USEDEP}]
+	dev-python/coverage[${PYTHON_USEDEP}]
+	dev-python/django[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-setuptest/metadata.xml b/dev-python/django-setuptest/metadata.xml
new file mode 100644
index 000000000000..d8675acbf521
--- /dev/null
+++ b/dev-python/django-setuptest/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">praekelt/django-setuptest</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-social-auth/Manifest b/dev-python/django-social-auth/Manifest
new file mode 100644
index 000000000000..7ed033d50c6e
--- /dev/null
+++ b/dev-python/django-social-auth/Manifest
@@ -0,0 +1,5 @@
+DIST django-social-auth-0.7.28.tar.gz 289666 SHA256 83bd23baa8011415af59bb76998697da758954204f47698073b8de51c95b20e9 SHA512 9215d8b50896553ad88029a0c89d2db6787468d657b8a34c6c120b3df8c909a42bc79fc54321c6b4dd386867e3479252976f8c0b36f211cc1270baf4b7cc4bf8 WHIRLPOOL 7a585fe7ed8e7d6addb2f4647a9314155131f68f27eefd95f067a580bbefcab21c92022a88b7e96dfefa5f5b346cfa60906557358f9d0a096b7db2f70c44c0ec
+EBUILD django-social-auth-0.7.28.ebuild 1248 SHA256 f1792dbf7535dd0cddb81616b6cea783c6168f129bb8ac119df322f827db2466 SHA512 b5f06f09e2762f7e3153132dd56138aa4cbeb8403637f17b38ea98d9a4f5bd61f8a34dc576202b7fe66e06939752e60cc7c558f67d9e82b0ba9e47e851489bf5 WHIRLPOOL 85ba78bc0e30b953749d24079231f678e4e05123e6c9ea94c60c2aa90e95d156f611a3e3cc3f94871df57eb7786ce45b85cbafdcb3eb574ef1daebd332705eb6
+MISC ChangeLog 2745 SHA256 97190f22482455e7343d6c1cc93dc10c97692341e150c1271288d62ede16c66f SHA512 07dd944299ad7afe358be4c6a9cf7092badb6c9cad57176833cc2f3e528dc7be98ada18ce7acad8e2ec9c9e9a37a99568291e4cc56b2663f9c54c453d925b567 WHIRLPOOL 51d19a537bddd1a5792837c9096fc932e1d1630c544720cbd97026da4f1575275dd2dd01b7ac7fddb5b01bfb440c108ca61925dea9b43b0dc04a42d39150c045
+MISC ChangeLog-2015 1502 SHA256 f82f1a30d712944466d05e898bff9ff689d7cc0a90fdd109975f4c6bd605f8ca SHA512 0daa0026d9e470a9f7a555de91447bd6a00578d0d51b56162a4ad623c67a109bef54514da2dedc9a32a5a446f7f3d9cbadd52f5c5a6b80dae1f9c425cbb1a06d WHIRLPOOL ed60e535a6a7387202e8f35a8df73374c2ba204bfc7510bb91bd1540374faf7f1bc3fb74b853165c8c4a4b0a0288b8362c2c214a097d0cb7f7cbb1823385b5aa
+MISC metadata.xml 338 SHA256 6ff84c8937c80d6881299b9f5b51294be608957a43bbb5dfc0e7b8acc4bb03bf SHA512 40acd038b94aad0a0b363d93af5ef3f47787955f7e90ad9dd40e57c70c1cb512255cbf144cc3039a53543c09b958600b0bd33182f4348cbee95d7a844f103140 WHIRLPOOL a430634a2ae0eb8a8a3148068f621e00b67eacc3b7f291f4a8bb18000cb2aad424317b0a7bbf449f6ebff33452b18b8ca9ea3745dd58cabf1906db6cc07c53ed
diff --git a/dev-python/django-social-auth/django-social-auth-0.7.28.ebuild b/dev-python/django-social-auth/django-social-auth-0.7.28.ebuild
new file mode 100644
index 000000000000..72a6faf6814b
--- /dev/null
+++ b/dev-python/django-social-auth/django-social-auth-0.7.28.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="An easy to setup social authentication/authorization mechanism for Django projects"
+HOMEPAGE="https://pypi.python.org/pypi/django-social-auth/"
+SRC_URI="https://github.com/omab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+LICENSE="BSD"
+SLOT="0"
+# Tests access and test logins to social media sites
+RESTRICT="test"
+
+RDEPEND=">=dev-python/django-1.2.5[${PYTHON_USEDEP}]
+	>=dev-python/oauth2-1.5.167[${PYTHON_USEDEP}]
+	>=dev-python/python-openid-2.2[${PYTHON_USEDEP}]
+	>=dev-python/selenium-2.29.0[${PYTHON_USEDEP}]
+	~dev-python/mock-1.0.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading in doc build
+	sed -e 's:^intersphinx:_&:' -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXAMPLES=( example/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-social-auth/metadata.xml b/dev-python/django-social-auth/metadata.xml
new file mode 100644
index 000000000000..6f106a3422df
--- /dev/null
+++ b/dev-python/django-social-auth/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">omab/django-social-auth</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-sortedm2m/Manifest b/dev-python/django-sortedm2m/Manifest
new file mode 100644
index 000000000000..28077d46ef28
--- /dev/null
+++ b/dev-python/django-sortedm2m/Manifest
@@ -0,0 +1,6 @@
+DIST django-sortedm2m-1.3.0.tar.gz 35519 SHA256 df67db5a71a780bff61a7a659b84a63ddf1a30fb6ed83dac4968add4cb6c165c SHA512 e829ad54fcc2ef6475864d6085ee011e5146da1821095d8e9abddacf45f71890c8bdf86b028086170b6a3d5c9cdb576fb6029aa7be379eba6b87460c2d93ee3d WHIRLPOOL 445cd518509d7fe8ef11445424216feccb54e3d0374834a16c7002d40c0201c3c7ea2c30b906061447afad9e54fb6c6c04bdc3f54d1ca3c4c8572c0d5424ff7e
+DIST django-sortedm2m-1.3.2.tar.gz 36246 SHA256 e1a4fbf55149b75460a9a1c5cb90a3600af28ec465251a98cb1a59dd637d6be1 SHA512 3695cc0a565a6e1d47e3573dce1f8c860f78c8d11d248634a8ffd6534c621e7575b2333b7a83e6c521e6e737d7ffc67ce1bbcc8504542751d3cfb254b3d98584 WHIRLPOOL ff209e50167186fbafdf8dfa2e0493e22e3de7583a2858fb6dcd374dff65dbe8ba2f7739477824ab71d7d11074011a8761bd6e5f7c5a3db9ea7618b387e53d39
+EBUILD django-sortedm2m-1.3.0.ebuild 485 SHA256 e602b5adfd9633aeb8fa92ce33ef7d0af3ef4876aacdf5a755512528606aefef SHA512 8b7a182926f7fcff8770ae9a7284da7a4467302f18bbb9d8a82b1958ad9d207d80323c70c465c1b82734103bd1043ac08a98e223935f6bc06f0770e96f6ecf6d WHIRLPOOL 513bbda3424d691243bb0c27f1105598d6f536915dfbda961fac97577cc2da557c6ee5c9da2ecbdbfc993cddc70c47cd7d8beaf9240b1f671fd0428b6fd0811f
+EBUILD django-sortedm2m-1.3.2.ebuild 507 SHA256 d84bce55018e1f72dd9d3813deabe38ed09d0157743e5a9bffb10485163171fb SHA512 473876e7b5cf69611def2e9f61a18cf05db0f94dabbe941dd796c98e3c41707cc3c57ab4859ecb3a80ef2c288ca8082ac007c03d13db969ad5a337ea83ebc6d3 WHIRLPOOL cd49408a39e4c34903c0e5c7fa9c6e75e4bac2ec23308a37025ce04a19b7f958575465f898751f784f8e9defe8b5f66a7ac3b46f605844e60bf3e9f825e8d8ce
+MISC ChangeLog 699 SHA256 2a1d13728cf41cb25ca3442877bbfe129b9bf49e6c73f998be2eed1c9a52774f SHA512 a8efcd2c1023261c113c1cfd375253de5fc249aa3ded8d005f4a5f12053ad210dc93932ee5bf9629e4f8d97e88422d040c4e6c0d6f0ed8d3170b5677d7637aa7 WHIRLPOOL 0dd1a2051f65298efd361eadf67538ca62334779abc54acc80475c1c0c90a3acb884cb5d97159abe6079adb2b992cb253bb099010419c064340327463a7300d8
+MISC metadata.xml 302 SHA256 cc1250bf45ec2413df596d8092754cd424ec4ebd469f0d217ea20bac50ed14d3 SHA512 6ba25bcd27645361c6a2d68c4d56e9d7043b03307a873b5e1fec765f6df54f35f82a74838c2126af3b523e9a4dfffa5cca433c96c09d57f68845aee5856d183a WHIRLPOOL bd985341041c6ec94e45107d16806e031b45db0c4c51c06018a00c2a297a4a5eb2fb4d715ef9f9e40a43c46f94125be700db761bb9e6e8f41ccafc8d01c27f27
diff --git a/dev-python/django-sortedm2m/django-sortedm2m-1.3.0.ebuild b/dev-python/django-sortedm2m/django-sortedm2m-1.3.0.ebuild
new file mode 100644
index 000000000000..60cd3c081bdf
--- /dev/null
+++ b/dev-python/django-sortedm2m/django-sortedm2m-1.3.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Drop-in replacement for django's many to many field with sorted relations"
+HOMEPAGE="https://pypi.python.org/pypi/django-sortedm2m"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
diff --git a/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild b/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild
new file mode 100644
index 000000000000..e187efd0072d
--- /dev/null
+++ b/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Drop-in replacement for django's many to many field with sorted relations"
+HOMEPAGE="https://pypi.python.org/pypi/django-sortedm2m"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/django-sortedm2m/metadata.xml b/dev-python/django-sortedm2m/metadata.xml
new file mode 100644
index 000000000000..a6873a39df5a
--- /dev/null
+++ b/dev-python/django-sortedm2m/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-sortedm2m</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-spurl/Manifest b/dev-python/django-spurl/Manifest
new file mode 100644
index 000000000000..60923645b6fc
--- /dev/null
+++ b/dev-python/django-spurl/Manifest
@@ -0,0 +1,4 @@
+DIST django-spurl-0.6.4.tar.gz 15076 SHA256 acc161f1242c2ea3746e700a015796d24f44ba811aedb0d69945e6524774b92f SHA512 8bf7c4d4e7e624280f87584f70e73504a11973a44294591d9dd58dd563d63dd1deb395e42bb1110e0a534ac16b59280d3b29f4293865cc465ee1fce20987d267 WHIRLPOOL d36c17bd9539a74bedc8523e519596dee87a1be39865bcfaea67026deceda8bdde8534c6eb9036e63830f66d0cac1e91d2167a26f5010613e856b115af5db54c
+EBUILD django-spurl-0.6.4.ebuild 544 SHA256 89a209377280737e0fae63e42de5b41122ce441e07755c59a1f74a6c590ee0c3 SHA512 1599176c46f1aa7a0377cecaafb9e7f00763b8cc169c8ca87a691e1b9bc0b7d06093c854cfd0ce97849a55ddd6e038ec3096e418f109f1b666cd4b7329d52f2c WHIRLPOOL 76bf5bdedab70283a07e60bf8636e7738b498b491170269030aab8e2d0b6ea1a6c6339b4d0311e51026aefb4816364c4cb98a3ecd47bfc5001aba548f2ad065d
+MISC ChangeLog 337 SHA256 e510965cef9179d51020a746fbeeef6333ccecc7f1a14fcdd01fef577c3c7b8b SHA512 c494755a4ed6ec2930209f645966710dd0cddb10e2db6f0e1d233a660d1ebb4bfa8d8585e72cc9fc6c53481dfd7d9a241882b0b0c8ab4c4d41522a51593c8544 WHIRLPOOL 86ef4e4807b5f92a67dfbcd21c77e63484128f2875b047fed67f2b9bb867925c0bb74ea973d27d35a835d004f932369fb2a8c0f1e37d4169bb3c12a905cdf9bb
+MISC metadata.xml 298 SHA256 32c4a2243aa1b1e2efee3989b46609a2d44983700ca0f8869cea22d003f1a3c3 SHA512 d4efdf7bb5f359e28303f9f16453e8ba64a376bf0b084803f0fbee8983d86fdc3d273379f3feb59855949861efcb41a4320195dcf4e7b0831cf473c14b05c762 WHIRLPOOL 87462e86724aada83b9e279445cafabfe5dfde2ad24117240b36d2f43081ec9c2f9afd54e4f617e67603cf968243e89a554094d2411f37c735a7fd4ee90101f7
diff --git a/dev-python/django-spurl/django-spurl-0.6.4.ebuild b/dev-python/django-spurl/django-spurl-0.6.4.ebuild
new file mode 100644
index 000000000000..e8dac12e7d77
--- /dev/null
+++ b/dev-python/django-spurl/django-spurl-0.6.4.ebuild
@@ -0,0 +1,28 @@
+# 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
+
+DESCRIPTION="A Django template library for manipulating URLs"
+HOMEPAGE="https://pypi.python.org/pypi/django-spurl"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.4
+	dev-python/six
+	dev-python/nose
+	dev-python/URLObject
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
diff --git a/dev-python/django-spurl/metadata.xml b/dev-python/django-spurl/metadata.xml
new file mode 100644
index 000000000000..0764416afcdc
--- /dev/null
+++ b/dev-python/django-spurl/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-spurl</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-standard-form/Manifest b/dev-python/django-standard-form/Manifest
new file mode 100644
index 000000000000..3ee5a928180d
--- /dev/null
+++ b/dev-python/django-standard-form/Manifest
@@ -0,0 +1,4 @@
+DIST django-standard-form-1.1.1.tar.gz 7504 SHA256 33d338e891ecf47ce2c6c892261ec2d62ae763c6b65a216e04edd9e69ccce3e4 SHA512 284ca81ff34f8e6344163a00043e7c23dcb7b98341b07a3113627bd9a8848e733335a1adb0ae3b458d3e63bf229d301abe36315d30e65ee9edb5472aede1a5c3 WHIRLPOOL 6d4fff57f159d8efbb2bfaa13c79f7c07a700417e0a7fc20d51cd37495ac44fedd8bdbf9e5a140b931c62efdb9306c8fc63bfb40ff6c4d3ef6999400f80ed8e8
+EBUILD django-standard-form-1.1.1.ebuild 590 SHA256 3d38da0c10160ae84eab6b8b34b5a59627a08a532d245c26318831da24fb2a2b SHA512 82054b136f24c4a7d820c5a0384e09788cddcbd5b8e1bf398de4af28277fe47ea2e7d950417690bccd807f365f975bb1d686f90c76ed29ace5a4c931494abcdd WHIRLPOOL a666c0f0ed4eba3df52139559831912162a90f13221caa4d40bff1946934b38c28cb93e2a57dba2ac84ae913acf259ea5df52bd8bf30dcc55949c319f04d94d0
+MISC ChangeLog 512 SHA256 e64206e63cad1e29113f951d2b7ba5eae93f4721a6ffc7c1b77e9b1323bd55ad SHA512 d4b94cb91042306ac677a86a0a881ce184b259dbac9f48afed83274f6bb8e0933ba03a8dc389b05ac1403fbff7611e15000366f84d9ef8aa7060e358ae7c8704 WHIRLPOOL 7ab238f4153f60652d0db02f573da1658b91ba1ceb18fbe1acafa2d1b5c70a03afd74244b1490781395a84fcc5e652dc33e10c2473ba85a7c03d71486bc0a1e7
+MISC metadata.xml 306 SHA256 4c81e55aa219a4793602bd4d0775782ae079285c0a1c55892aec75b144997122 SHA512 513b47adaa43c183816aeeb150e244d48bd229658b66b5a2cd4848ebaf1bffcf3040ad416064d96153504152261b8aa43322fb3350f1a3a2bc95892f54d21d60 WHIRLPOOL 67d834f40bffe390299a4705b521a79a4022d6ef5f722faf86a4ef918a0a6fd70e2e2467448758f5a6bbc871a8fe5f983cdb1eaf40204fb82da638be5da20e7f
diff --git a/dev-python/django-standard-form/django-standard-form-1.1.1.ebuild b/dev-python/django-standard-form/django-standard-form-1.1.1.ebuild
new file mode 100644
index 000000000000..c5c4fd68c8dd
--- /dev/null
+++ b/dev-python/django-standard-form/django-standard-form-1.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Quick and simple django templatetags for displaying forms"
+HOMEPAGE="https://pypi.python.org/pypi/django-standard-form"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.3[${PYTHON_USEDEP}]
+	>=dev-python/django-classy-tags-0.3.3[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/django-standard-form/metadata.xml b/dev-python/django-standard-form/metadata.xml
new file mode 100644
index 000000000000..4543b354f15c
--- /dev/null
+++ b/dev-python/django-standard-form/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-standard-form</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-tables2/Manifest b/dev-python/django-tables2/Manifest
new file mode 100644
index 000000000000..f532ab9cb85d
--- /dev/null
+++ b/dev-python/django-tables2/Manifest
@@ -0,0 +1,5 @@
+DIST django-tables2-1.1.2.tar.gz 966053 SHA256 804d8a6037b1a1c75064dc8bcc77fead031ba1885e644b9662d2996b6a683113 SHA512 b82d9a4fdd27e37056effc68b361dbb708d558fbc5aa0f90a09850a20f0bca34ac7965000e72368e1a792fc6a893f83c64910dfb6569b6016ef1e5b20be0e5f5 WHIRLPOOL 52c1ad71288ce97d1bd4e92cae08d618359f52ec310b1d77b1b0428246dc4e65ce49d4ca52704b6ae6e4f9aa9d5f873cc117f3da636d2fa9d3bbde8b7389823e
+EBUILD django-tables2-1.1.2.ebuild 580 SHA256 e7603ded13a8bfa319b1339abc7909c01f618a4c4ea6cf4034acdf86f5082340 SHA512 096a2b941a2d5ee53976039d64072b205c04ae44b8595003160bf17c9db281f401545e8db5dbe7c5f84a4e757745cda04faf49d5a170ff23a4c6c604efab7cc5 WHIRLPOOL d684f8a9348e3cfe51ab685d0f6e49bb430eff47d0e70471fdf75311d2b05cd361b89581a9297c722796a1eab3f4e062792cc0cd93306c89e2c6575a08802d03
+MISC ChangeLog 4669 SHA256 bfa9c7ce6d451d9f9dd05813209262487e6e086772bce78dc702394b0b06a02f SHA512 3c77e1675224d87c181084f699bd77013264800b273873518d9e6e0a945b8b05d0ba6b3d03c1a775eae6c0cbbaaddc3c28857af76f82c68acb09cb66a3af4dc0 WHIRLPOOL b467e6d0c17613c1ba86ebd0b642a0c452b8862ee55d637af4e1065902558fd82373908b93aa2cc8fe15f63044746ca48d5b90873ce0f59c6cfa979440b15114
+MISC ChangeLog-2015 944 SHA256 89ada2d9b5267c1721d0aa4f40c94c3357c24d065d20336df9cba5dce8bb3715 SHA512 7bedfda4db143f95ab5125ea76372be04702a68188ff2305742ffccb4aa3801515a7886969d92387e96570be1aecdda23925451fddfa025dd510c3a16f8075fa WHIRLPOOL 2614f086ba769bbb22add0e3fdfb0f55c6bb4c9aac547bef7eafe8d22b72283a84e84b581bb0eaefddfd8daa91301694f854e1181ea98e6f6283429c6efe448f
+MISC metadata.xml 396 SHA256 21cb52830ae3a8b30fc92e7ca166cbc28e8cef8878cfad23a96eb498ac64e270 SHA512 1a44a48bf619579066e29ec19bf060321dc7b20ddc15798b2a8744b33a882c06d33b17bbf46191d75168fde5785029f3289f0f78dee96b7e2bbc81475eaecff6 WHIRLPOOL b8efc186d9a2606372e89ac82eecb54f0fe0152021727fddbd3b0e5d7514c0461a40159e32cf710fa12f7545f23d24c2aab7133b690f96e2ec89f0fd7ff666fa
diff --git a/dev-python/django-tables2/django-tables2-1.1.2.ebuild b/dev-python/django-tables2/django-tables2-1.1.2.ebuild
new file mode 100644
index 000000000000..f626ce0557ca
--- /dev/null
+++ b/dev-python/django-tables2/django-tables2-1.1.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Table/data-grid framework for Django"
+HOMEPAGE="https://pypi.python.org/pypi/django-tables2/ https://github.com/bradleyayers/django-tables2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/django-tables2/metadata.xml b/dev-python/django-tables2/metadata.xml
new file mode 100644
index 000000000000..b5b9e1250194
--- /dev/null
+++ b/dev-python/django-tables2/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-tables2</remote-id>
+    <remote-id type="github">bradleyayers/django-tables2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-tagging/Manifest b/dev-python/django-tagging/Manifest
new file mode 100644
index 000000000000..cc613be25487
--- /dev/null
+++ b/dev-python/django-tagging/Manifest
@@ -0,0 +1,5 @@
+DIST django-tagging-0.4.1.tar.gz 44260 SHA256 35802daf35f90aa022d59f7d7d485c719c29c4efbde1bf966d44017e1e64602b SHA512 6f6899084fd5067ec2e49649bba4aad225ed738f39f999b7ea5156d38fa28c272d4a1f688d4de712db15fe8f2c2ecfd4532eb6e9c0c1de6dd530c09d7d767a26 WHIRLPOOL 491144cdd90fb7f9f8ea96b4e81d2b248fe7f2ee7d24bf2f6db6e1a2db2f48d8717c870fe3de927ff95f9f531ffd30fd4c5324424444df47c0a795a85273a31c
+EBUILD django-tagging-0.4.1.ebuild 544 SHA256 8fe092a1164f8a31fadbe8ec44626fbd98c9a7990e58863e6a7c91b7bfbc50f5 SHA512 ab39903ae712102ecf775747438eba9fee47c704fdcb330a11fd0bd6a7ad99987441747fce85104c3723e37986debcc84c7aabd2f7540f64d2333b785029b3d7 WHIRLPOOL ed31ad40fc164b08161a9b217c0e147ce68e11585443acefe282cd800494ee09c73b106ab15715b32ef6d1c78a1046abfbf9cd9796cd290f58a07e3c38bd02c9
+MISC ChangeLog 3185 SHA256 a5c8a89718473d0e9dd5b19f2cbb9c05bbdf2f44ad2a1042a11706d0d6469526 SHA512 4839671cc4583438e0e065fe662b01a493baf93d7607c5e15158a9c03f933cd5ebb1d861f46176b0404886acc2425dcb617c66eaf24bdb7419c98a51bea98072 WHIRLPOOL 5fec4a4d2dcb240dc06da3b351653e1584dd4c1bad235637910750415a103795dca0bced24ccafab1a5d885001cca04b62cafe72362fed146a4dc4e93f2daf6b
+MISC ChangeLog-2015 861 SHA256 c150dacb3b6d9d44c7e1a65c978de5b080ecf20db0c279b3558943a150a46641 SHA512 051b5da783efbe29b62ce795dbfa444bf5d639a0d8ab38918ace4fff54f4d17e582fff7c7739f6529a9f6cccb03dd497892d90d5f8963a2638910ab759a5e201 WHIRLPOOL a630ff116f7b26cb8963504116c888e459813b25a0a6625b62656e47c5f12cdfbb1d5ba0c61f8f1b01de003bba7de9a544a3c2760b22ba6db3b195c3aa471530
+MISC metadata.xml 327 SHA256 8ec47a514ef6ee369ab5068baefdd4b50c4fcc0f834e7b0b981025569123ad0a SHA512 6afa657b0532b75434459277723812da4210941034dac3e630b93556e90c86170a28dff6bfa279bb38123409ba252536cbe17dd2fa77c5db87684e2cf40d5097 WHIRLPOOL 2ac37485b58a22a052940d904f5d1223b613f704df65a056e7537bb9dd9aa2e2a289d6eafccc34f6380e8eb40ded9071f8c78a86da1b4822c5d384f00632d290
diff --git a/dev-python/django-tagging/django-tagging-0.4.1.ebuild b/dev-python/django-tagging/django-tagging-0.4.1.ebuild
new file mode 100644
index 000000000000..ba76163a9c19
--- /dev/null
+++ b/dev-python/django-tagging/django-tagging-0.4.1.ebuild
@@ -0,0 +1,23 @@
+# 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
+
+DESCRIPTION="Generic tagging application for Django"
+HOMEPAGE="https://code.google.com/p/django-tagging/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-python/django-1.0[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	use doc && dodoc docs/overview.txt
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-tagging/metadata.xml b/dev-python/django-tagging/metadata.xml
new file mode 100644
index 000000000000..1410662a219f
--- /dev/null
+++ b/dev-python/django-tagging/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-tagging</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-tastypie/Manifest b/dev-python/django-tastypie/Manifest
new file mode 100644
index 000000000000..a92ec375931f
--- /dev/null
+++ b/dev-python/django-tastypie/Manifest
@@ -0,0 +1,8 @@
+AUX runtests.patch 1660 SHA256 5fc83b5f0cb98c986a147955448948bd091e281ce0d4f1b4e7b48f64b5c1754a SHA512 6f092af9b4ab0f6e32920636f2e1c92d071503d625a99a892b2cdd0d05be4bc2d3c6701afb611a6e1ad598ab70d04d7a205a4b39a25d4f5d73848d5da773a58c WHIRLPOOL 084787dee147c549cf2eee7729d8edc720c1cd6549aa575a1502254f86784ec97ee266cf82b46dbf86840268358c0c7a58217f6b113b249b55c9dc2195221e68
+DIST django-tastypie-0.13.3.tar.gz 231373 SHA256 7a6aac94911a09823e9f9f865d11845bbc9d7627eb44fa010650595c54c4596b SHA512 a4497c2212e1ca6614d69c8c847aedd9b9bb88c7c9083c3eae8bd163e9f61f4402c6adc0a3b2a5632e9d2d7e14b2158bce66d8e62257493edfbd9ca9be9355fb WHIRLPOOL 2f70f71651d1208748745c81d9ddfc84420333397863f4f2635c9575a80ab307059ebdad14eb08cad6f30112dd649d413711abbc6cb6c8fc6afbc96a4f9f3da5
+DIST django-tastypie-0.9.15.tar.gz 206823 SHA256 1509d8a93d4f0e16434469c5af850d3c1c625da902b54216771cc7b25634216a SHA512 dcb26f7bb131e658ff6a2d11ca8eb74db064986cd48e536fb4987a1cfe4c4958e99f60cf173b1bbbbc051f3e55bc31ff28e645a52f526b3a98461daddd865a74 WHIRLPOOL 62503c0f05e429950b2aacdbaeacfa2cc71eee24fad9e365373fda473b7bf54e3a251ec0b3133f128436922abc4ed8182f7405eb4a62e1a40628b2b44b596243
+EBUILD django-tastypie-0.13.3.ebuild 1763 SHA256 e03f93211e942ca3924b1ca944209aa93457d4e0d73691164a000623b1cef133 SHA512 389240772a63b107c28686b1dc502a94de42c03d9db05af3aaed780ff79e5115fe0ca98909292e4b80886490066ef80efbf6e0a1a908396e1a7097c63eccd6a2 WHIRLPOOL 41137f71357a8dd9d1ee0741883638bebfb31cf29f496acef636b86f103d453a1d586c6a552d262427dadf5f980ee2741f3b9ef5bba79ec232320284a1a302b8
+EBUILD django-tastypie-0.9.15.ebuild 1646 SHA256 4989d4775d8fc17c320bc4cf81dce46a0aa4dd1022260a3ed5529f259aa5bcab SHA512 4d8bead0a1e1d3c4ef6c221abf9b253243a1ae20dcf1e7c3bf810dad7e9c41e1138c9f00c24a82b35ffa578dabf78d434ae4ec7ad00052734f42a68425bf5e86 WHIRLPOOL 2f6c76a9790411f7a567f487648d01c6433b7909f1cf8c0e55ec685cb8a5ae1cc5330ea6ba5b6b6057ebf8322f2b6a31a2366bdef02da8c7ff330609c2bf0945
+MISC ChangeLog 3480 SHA256 5e26211aa39e00f8ee18050c905beac04335d16dfcdc6d94b2470d12f237e19e SHA512 fdcf4a449ddb46308df63ea215b687cd497056e75253402f6a48f9c11b67dce5b90e12a73118f3f0b53f55ff2b131013d66e914e5bbbcd98e1df1c3dbea701d3 WHIRLPOOL 6a479990b5abd16632635c2434cc6c3f3a4ab4b337c3bc35b30f4e0505666ce6743851d0846184c752be225ec3d2288d81bc5fdb2e748295e76860967f71848d
+MISC ChangeLog-2015 2220 SHA256 cb09b43b39b1a7784f543fc66a2ce40c3ce349e404bae37d3bf14f9dd6103c63 SHA512 cfe2888891ce78fd520c33e3e95c797e495b2eb42e69af6b6b67766c9556a3532e6cf130a343b9498a46aa6057f2690146d43a37a8372600bed0309217276e94 WHIRLPOOL 3ba1cc2b9dfee2a97be5690503a2e5f0a182d41c3e70e8a2ff58bbf459d31552e81e8b703d6cca678f069cd80ca7897917cc552c02893f6cbd473c573df2a2c8
+MISC metadata.xml 654 SHA256 e0dc9cd87b692d73becec685f077c1888368b19e3fdbc80b7dd1efae516c3b22 SHA512 83f7c1ae59d1b3d82b11003df3b2cb818dcf3717df311f58c3052ed930b4f5a8405ca4bb3d47462c53cb3c721ab75a7a59ebeba012859cd4f887539582008160 WHIRLPOOL 6c2b0f4aa616f3824c5efa57473d6becf565dc36fed60b05df2139ffe7a2f20428396d1c61318a6cbe37b1ebe6a097a90e7a841bd6b855a64c2f32b6c0ac3dbf
diff --git a/dev-python/django-tastypie/django-tastypie-0.13.3.ebuild b/dev-python/django-tastypie/django-tastypie-0.13.3.ebuild
new file mode 100644
index 000000000000..5cdbffff0d5c
--- /dev/null
+++ b/dev-python/django-tastypie/django-tastypie-0.13.3.ebuild
@@ -0,0 +1,53 @@
+# 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
+
+DESCRIPTION="A flexible and capable API layer for django utilising serialisers"
+HOMEPAGE="https://pypi.python.org/pypi/django-tastypie/ https://github.com/toastdriven/django-tastypie"
+SRC_URI="https://github.com/toastdriven/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="bip doc test"
+
+LICENSE="BSD"
+SLOT="0"
+
+COMMON_DEPEND=">=dev-python/mimeparse-0.1.4[${PYTHON_USEDEP}]
+		!=dev-python/mimeparse-1.5[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+		!=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+		>=dev-python/django-1.7[${PYTHON_USEDEP}]
+		<dev-python/django-1.10[${PYTHON_USEDEP}]"
+
+RDEPEND="${COMMON_DEPEND}
+		bip? ( dev-python/biplist[${PYTHON_USEDEP}] )"
+
+#dev-python/pyyaml is pulled in with django itself
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (	${COMMON_DEPEND}
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/defusedxml[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/mock-1.1.0[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/pytz-2013b[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/django-1.9[${PYTHON_USEDEP}]
+		<dev-python/django-1.10[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/mock-1.1.0[${PYTHON_USEDEP}]' python2_7)
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="test? ( bip )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild b/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild
new file mode 100644
index 000000000000..1c2fb6c36ee2
--- /dev/null
+++ b/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+RESTRICT="test"
+
+DESCRIPTION="A flexible and capable API layer for django utilising serialisers"
+HOMEPAGE="https://pypi.python.org/pypi/django-tastypie/ https://github.com/toastdriven/django-tastypie"
+SRC_URI="https://github.com/toastdriven/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+IUSE="bip doc digest lxml test yaml"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND=">=dev-python/mimeparse-0.1.3[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	>=dev-python/django-1.3[${PYTHON_USEDEP}]
+	dev-python/pyxml[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	bip? ( dev-python/biplist[${PYTHON_USEDEP}] )
+	digest? ( dev-python/python-digest[${PYTHON_USEDEP}] )
+	lxml? ( dev-python/lxml[${PYTHON_USEDEP}] )
+	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/oauth2[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/python-digest[${PYTHON_USEDEP}]
+		dev-python/biplist[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		>=dev-python/mimeparse-0.1.3[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/runtests.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH=.:tests ./tests/run_all_tests.sh || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-tastypie/files/runtests.patch b/dev-python/django-tastypie/files/runtests.patch
new file mode 100644
index 000000000000..473d3338101a
--- /dev/null
+++ b/dev-python/django-tastypie/files/runtests.patch
@@ -0,0 +1,46 @@
+The run tests bash script keeps going on a fail. Patch corrects this for gentoo
+diff -ur django-tastypie-0.9.15.oirg/tests/run_all_tests.sh django-tastypie-0.9.15/tests/run_all_tests.sh
+--- tests/run_all_tests.sh	2013-05-03 10:36:43.000000000 +0800
++++ tests/run_all_tests.sh	2013-06-03 13:55:18.633474126 +0800
+@@ -10,9 +10,9 @@
+ 
+ #Don't run customuser tests if django's version is less than 1.5.
+ if [ $major -lt '2' -a $minor -lt '5' ]; then
+-  ALL="core basic alphanumeric slashless namespaced related validation gis content_gfk authorization"
++  ALL="core basic alphanumeric slashless namespaced related validation content_gfk authorization"
+ else
+-  ALL="core customuser basic alphanumeric slashless namespaced related validation gis content_gfk authorization"
++  ALL="core customuser basic alphanumeric slashless namespaced related validation content_gfk authorization"
+ fi
+ 
+ 
+@@ -26,15 +26,23 @@
+ fi
+ 
+ for type in $TYPES; do
+-    echo "** $type **"
++    echo "** running test $type **"
+ 
+     if [ $type == 'related' ]; then
+-        django-admin.py test ${type}_resource --settings=settings_$type
+-        continue
++	if django-admin.py test ${type}_resource --settings=settings_$type; then
++		continue
++	else
++		echo "Test ${type} failed"
++		exit 1
++	fi
+     elif [ $type == 'gis' ]; then
+-        createdb -T template_postgis tastypie.db
++	createdb -T template_posttastypie.db
+     fi
+ 
+-    django-admin.py test $type --settings=settings_$type
+-    echo; echo
++    if ! django-admin.py test $type --settings=settings_$type; then
++                echo "Test ${type} failed"     
++                exit 1
++    else
++        echo; echo
++    fi
+ done
diff --git a/dev-python/django-tastypie/metadata.xml b/dev-python/django-tastypie/metadata.xml
new file mode 100644
index 000000000000..604c1e998c1b
--- /dev/null
+++ b/dev-python/django-tastypie/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <use>
+    <flag name="bip">An optional serialiser dev-python/biplist</flag>
+    <flag name="digest">Library to aid in implementing HTTP Digest Authentication</flag>
+    <flag name="lxml">An optional serialiser dev-python/lxml</flag>
+    <flag name="yaml">An optional serialiser dev-python/yaml</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">toastdriven/django-tastypie</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-tinymce/Manifest b/dev-python/django-tinymce/Manifest
new file mode 100644
index 000000000000..3388384e1922
--- /dev/null
+++ b/dev-python/django-tinymce/Manifest
@@ -0,0 +1,5 @@
+DIST django-tinymce-1.5.3.tar.gz 2456745 SHA256 2c453782de95d38bb280c2e6a8e34cc0fc4783052c521c4000d73ea853d5d2d4 SHA512 1fae0e40f0d0803a723753e25160950d4a8bd3b443e2d7ad9101558ad20ab3b43f792aafaaf7c064636166860c445b3bec068317bab6203f346cac7753331eea WHIRLPOOL b1779f7464534d8910cc876ab59a264f6c70a3c74e9a60f965aa786881a9d5a320a9bdd2a4ead4ba278ed826b90e923a0b31ee7981e44327961aaff2a400f85b
+EBUILD django-tinymce-1.5.3.ebuild 557 SHA256 ad2dbaeeac9f7f6a67c079c6541e4b6a405c7402af7653f6fbe4b43ebbad47bd SHA512 01a3b32d2cea18cfc3291a4e1f5acc82952184276d42ed073c4928ba02271c8f8d67bb073f3a239ffa62fc035cd4ce303f3ab5e0bb2b199d34e9bdd26c965d7b WHIRLPOOL 2efa2214af7d779a49a06e4743cdc3b1861fd396c275411ffaf96db2f789c56b4c46e431600d246ede1929edb57f2ef0c4402c339b656d21f3e9aa75df9a2cd1
+MISC ChangeLog 2585 SHA256 45a28e06f7a1bbcb40bc69fa9bda622283756d4b8a7eb34c9689d08a2fadafdc SHA512 866796d52ed611ae849268cd913e9aa50792a03cff1f62cc7d3ac4eca3d1288137377c969ec80140456749b4c871923415ed1a91af9f7a6d9717cadb888c5294 WHIRLPOOL f4b132971b92d9dd2559092c29becfdb919be4f21129a36eebce4612eb7cf44f02ba5b5d4c2fef57c783327968947c3885a4cd8fd90ecfa7af57d4482b507fda
+MISC ChangeLog-2015 493 SHA256 da1ab347131a2e5a95d359682694b1e4837e3525bace564965634c0e18e24039 SHA512 8bd9d226134efca63a3f8d80e30335278b83733c539e8ae9f6524439ae82ac7b57467435f35d8e04e3cc2d712da7851a30d9ce863851a893a12e617d9e5bc4b3 WHIRLPOOL 4a1471d1d17b62026d3052e6aef378f13878ad8f0d0a3f1cd9aa60486ca00bdfb36e391baea14b2fc6cd28fe8ae99b85750de09dcc68ed04e506dbcb1e6f7ef3
+MISC metadata.xml 336 SHA256 3eec9aaf66367b77808bbf64aab6959cc94f9b80e9966c83346452c71b52450a SHA512 c3a4ad3da6a4d3f26697bea5bb54e789c8bac7b1f28155046e9e73f6a0485a925e0d9681e036a2041475343c5cf87fc4aee299a393202a759d0cf236b10b7326 WHIRLPOOL 9cd2e784ba51c2d648d7785ee63b36961e55cac00c11ae53d205768498e81c442d1b880595d69e6fc54947810cb31cd26e879df845b5f94338d6083e87fca92c
diff --git a/dev-python/django-tinymce/django-tinymce-1.5.3.ebuild b/dev-python/django-tinymce/django-tinymce-1.5.3.ebuild
new file mode 100644
index 000000000000..1c312996cf98
--- /dev/null
+++ b/dev-python/django-tinymce/django-tinymce-1.5.3.ebuild
@@ -0,0 +1,26 @@
+# 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
+
+DESCRIPTION="TinyMCE integration for Django"
+HOMEPAGE="https://github.com/aljosa/django-tinymce"
+SRC_URI="https://github.com/aljosa/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	dev-python/django[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${PN}-release-${PV}"
diff --git a/dev-python/django-tinymce/metadata.xml b/dev-python/django-tinymce/metadata.xml
new file mode 100644
index 000000000000..b93ed2623c12
--- /dev/null
+++ b/dev-python/django-tinymce/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">aljosa/django-tinymce</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-treebeard/Manifest b/dev-python/django-treebeard/Manifest
new file mode 100644
index 000000000000..06a11360da7c
--- /dev/null
+++ b/dev-python/django-treebeard/Manifest
@@ -0,0 +1,4 @@
+DIST django-treebeard-4.1.0.tar.gz 101292 SHA256 f13c9a612a554ee0784632961904870efcf05f58282cd158da84ee88120fbafb SHA512 261f4d91c5fd78b05346ea3a5e384e413b81a0cff5278c5bc4373bba3b7d7734c84a96529013f759a20ee46aa60f699ec552117d258a4da3a1d46aa6c1a1cdd6 WHIRLPOOL 1c7595609acd699b19f7eb4a482ab5dfe0cdfd0fcf4364e30c038878e7fd1d77a2840d5fd9cfad7a8c3810f2846de70cdcf27d0e97c833be590ace3b8eb7edb3
+EBUILD django-treebeard-4.1.0.ebuild 579 SHA256 7525ea86ea7334a40aa5bbf08184b1f695721dffa0cc6b5ef23875e9c974136d SHA512 25d7a7323dca90d77394c1509e26a19b1cccd92170b7703eeca11ae646b216aa79529cba3978139ca7413c88a71b807df7eeabbc0f9e2717ca5a63ae4d0be719 WHIRLPOOL 1eee1c78952e32673cb2a6e439415f8604af1ee6884936c4bc7963fcb696244b8a8dc90076ff11cffe31486f002f543df136f6ef8cb2ebdf3a7599bc9dfc69f1
+MISC ChangeLog 1293 SHA256 d1e1fa98a19650526c10d84e2b33ef3f7a33ee3d080f589ad05fb29ba10310b2 SHA512 656e545287f88c8c48f1399ce74dd55233dd313a4aeca151c4a8d360717c05f68072967667576c114e0371a74f297666d103d7828f5611d8a07208c9342ebe46 WHIRLPOOL 93e81b6a5d8652aa5d1643010da9799b47feabde2c2cadd482a4abdcfc1271ef1586a4cf30694d53351a0886cbeaf05d4bcab287c6325a8ab304e61e25a7fb25
+MISC metadata.xml 302 SHA256 7fa84f80f7152e216498601b8e348fb6719b4b1b1027b1752a2f069fd544913d SHA512 20137578f1921e8b585fd054c10fcfba1299122221690f62fb548c88e39dc05a0aad3a5dd2e607cbcb760fa755904e6c3bed890c018e1ca4eb743f862d8117de WHIRLPOOL c7dd88c1c9a724cc85e2a6fe1f8692da6022c5ab357df1edaf34882415b69983bf9fe7ca7a1b5172e63282f83bdcb08019bcbd402ba0f95c9759493c6c4de1c6
diff --git a/dev-python/django-treebeard/django-treebeard-4.1.0.ebuild b/dev-python/django-treebeard/django-treebeard-4.1.0.ebuild
new file mode 100644
index 000000000000..57a84875db9b
--- /dev/null
+++ b/dev-python/django-treebeard/django-treebeard-4.1.0.ebuild
@@ -0,0 +1,26 @@
+# 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
+
+DESCRIPTION="Efficient tree implementations for Django 1.6+"
+HOMEPAGE="https://tabo.pe/projects/django-treebeard/ https://pypi.python.org/pypi/django-treebeard"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.6[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/django-treebeard/metadata.xml b/dev-python/django-treebeard/metadata.xml
new file mode 100644
index 000000000000..da1c33ee9340
--- /dev/null
+++ b/dev-python/django-treebeard/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-treebeard</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-two-factor-auth/Manifest b/dev-python/django-two-factor-auth/Manifest
new file mode 100644
index 000000000000..c60045939744
--- /dev/null
+++ b/dev-python/django-two-factor-auth/Manifest
@@ -0,0 +1,7 @@
+DIST django-two-factor-auth-1.2.1.tar.gz 102165 SHA256 e98d6bea7f18d5667a2681e524739f60d8680f747e9aeb094c5175f7dcc540a6 SHA512 c7947318929a91096e329e21db81c798f6522050d45203dd2cdeb0708f03d06ab6c650305546cd5e53080cdc77f43c6bcedbc77ad7eb1c88ffa49da5957f40ff WHIRLPOOL 6393b76fdbd3020e73fd26b564793fe8944d57a1728b15253f8efd7d19253cb1f7a369fa94bf2b500ba618919a6914f766b25d852501db3defaed77a0a3b0a9a
+DIST django-two-factor-auth-1.3.0.tar.gz 98955 SHA256 874daf7b5aa0f9f9eb57a8a08a8730727940c38f8603caae77ade314e1c8cde8 SHA512 5876e82897b7b86663f12701652d266c20a9d4ea16da8722e96050ecf3a3997fb0bf3e08cbcc1ae12763f68e52d66d2749343f8b7757d4286da14e8ceb98c85b WHIRLPOOL 66282472cd3bce5359f724b0fa64a2be2f9ab9635db7862a023e4f1b58d2dd2a8f3e9bb5fa5d06d686ff7d794b010d2381541391c13c4879c389fb84f4565aba
+EBUILD django-two-factor-auth-1.2.1.ebuild 961 SHA256 aead99e36360491f7f9d0a9daa601f0c314f1eb53e26972d8bfb5d3b57706456 SHA512 863ccdaff622c767521032f07048632cfb60379c3a0ebaf367108570e7a2372007a044bc71d35e8cef16516ab0a720d906db822ad98b740c7f626dc2d4b509f3 WHIRLPOOL 5f102f0dfd38ac28985dfe2ee14fb32746258f090e0d7adec2fbbc8f3ff4c041b65c929924cff85fff0526aa0eb1b7847ca224b1974237b48bc9589da0419281
+EBUILD django-two-factor-auth-1.3.0.ebuild 1041 SHA256 ff690c2cc7f8f77575d042041dbace35c4c40232094ddbb8ca8af8a8641a8dca SHA512 e336545ecb1e6562559101f3005955cab138fac0549b0157dd4614895e0227f2f88a2994d7ea6bf3c0633b39c7dc0f51aae9f0ce5ec99894e681b1597d776b9d WHIRLPOOL 908f076724801f985b82108184547fe8fb820bf36a6dc407b27d86751d1f1e7fce7aa56eaed03262e0fe519ffbe2e2fc3b41121b5da764836b38190772201ee5
+MISC ChangeLog 3160 SHA256 5b9da320e492d5d8bf1f9d08524e936f69ffdbb92e8932ad4c20aff67213058c SHA512 f52286bf8aa52f341eb09ede9e50d91b30d608ca0d33dfb19102f3c7a72e5f00a91b5c99f2a09bc8b12df7a28a0fce485cedde4496f65d28625a337f41bee69e WHIRLPOOL 0c16bb7e8caa5c4962317165324836a728cb96a19f9a468c8a8444e79357a8d79efe012ff718f3bd7b8059d82228f3b422c08bbac863bd71c11b12aebb641882
+MISC ChangeLog-2015 1384 SHA256 0a781c589df0e83a380e7afff130566ed124f87c2677569ff1efe262581ca47e SHA512 8fde7f7cf526e11b383ffb60bb8e9c6deb4e6852f476ef541357fee9c0bea556027fb8e042e89bb7141b42b1a225aa162b49381c060570956aed3fc289a5346e WHIRLPOOL 0280cecf3f531bee07ba18450c3a4605df4f3038a7fe37d96895ae9a52e17046e0d268ada18a3e6c95d1a48db1aa3ef6e4dce332498e87c6a23423d92d643658
+MISC metadata.xml 455 SHA256 3e9b0f017c71b6628ee0284e70d04cdc9ba0edffa68d4a996adaecb3edcb5ffb SHA512 4be974d6f6d469532d9f984a754485c54294f34854eb4c6fbeda60226857204e050192200943ad31f2c74bf92731f0c672d684bb5e76082a32cf789e5e56dac6 WHIRLPOOL fd435de7305c57030bd36012fbe8336e83d5ba2565fde87424ca713b829d5ef2da5ea667293d71ed732e4147ccf3df9328525c2ecdb9f74023f053b0757dc402
diff --git a/dev-python/django-two-factor-auth/django-two-factor-auth-1.2.1.ebuild b/dev-python/django-two-factor-auth/django-two-factor-auth-1.2.1.ebuild
new file mode 100644
index 000000000000..baf534d1a7ac
--- /dev/null
+++ b/dev-python/django-two-factor-auth/django-two-factor-auth-1.2.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="User-friendly Two-Factor Authentication for Django"
+HOMEPAGE="https://github.com/Bouke/django-two-factor-auth"
+SRC_URI="https://github.com/Bouke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test yubikey"
+
+CDEPEND=">=dev-python/django-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/django-otp-0.2.0[${PYTHON_USEDEP}]
+		dev-python/qrcode[${PYTHON_USEDEP}]
+		dev-python/twilio[${PYTHON_USEDEP}]
+		yubikey? ( dev-python/django-otp-yubikey[${PYTHON_USEDEP}] )
+		"
+
+RDEPEND="${CDEPEND}"
+DEPEND="test? (
+			dev-python/flake8[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			${CDEPEND}
+		)"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -i "/'qrcode/s/^/#/" setup.py || die
+}
+
+python_test() {
+	emake test
+}
diff --git a/dev-python/django-two-factor-auth/django-two-factor-auth-1.3.0.ebuild b/dev-python/django-two-factor-auth/django-two-factor-auth-1.3.0.ebuild
new file mode 100644
index 000000000000..e2b29f2b94d0
--- /dev/null
+++ b/dev-python/django-two-factor-auth/django-two-factor-auth-1.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# would support 3_5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="User-friendly Two-Factor Authentication for Django"
+HOMEPAGE="https://github.com/Bouke/django-two-factor-auth"
+SRC_URI="https://github.com/Bouke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test yubikey"
+
+CDEPEND=">=dev-python/django-1.8[${PYTHON_USEDEP}]
+		>=dev-python/django-otp-0.3.3[${PYTHON_USEDEP}]
+		dev-python/qrcode[${PYTHON_USEDEP}]
+		dev-python/twilio[${PYTHON_USEDEP}]
+		>=dev-python/phonenumbers-7.0.9[${PYTHON_USEDEP}]
+		=dev-python/django-phonenumber-field-0.7.2[${PYTHON_USEDEP}]
+		dev-python/django-formtools[${PYTHON_USEDEP}]
+		yubikey? ( dev-python/django-otp-yubikey[${PYTHON_USEDEP}] )
+		"
+
+RDEPEND="${CDEPEND}"
+DEPEND="test? (
+			dev-python/flake8[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			${CDEPEND}
+		)"
+
+python_test() {
+	emake test
+}
diff --git a/dev-python/django-two-factor-auth/metadata.xml b/dev-python/django-two-factor-auth/metadata.xml
new file mode 100644
index 000000000000..0c5c87a23b02
--- /dev/null
+++ b/dev-python/django-two-factor-auth/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ercpe@gentoo.org</email>
+    <name>Johann Schmitz (ercpe)</name>
+  </maintainer>
+  <use>
+    <flag name="yubikey">Adds support for Yubikeys via django-otp-yubikey</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">Bouke/django-two-factor-auth</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django-xslt/Manifest b/dev-python/django-xslt/Manifest
new file mode 100644
index 000000000000..51ba4b847ad9
--- /dev/null
+++ b/dev-python/django-xslt/Manifest
@@ -0,0 +1,6 @@
+DIST django-xslt-0.4.5.tar.gz 15717 SHA256 db3bad334310e13a37391cbd52fc1b0432165d9a97494c9413008c0fc8023ccb SHA512 25f3268d5eae29326ee93b5c4189389577bbf282e9f9007798de2ce96c6420d240c07e6a2abbbc57ce0bb4abb3aef557b545948a02b36a118afaefb30ca5a2b4 WHIRLPOOL 9654a2a3d7baf8ed3de9061cc43872db9e0a72f9331cce5bd804d5395611a0421d2cbec7f7a94fd73f48d439a702b0fbb98424ce15274511183398e317289fab
+DIST django-xslt-demoapp-0.4.5_p20120427.tar.bz2 5506 SHA256 a448e2cb6db716199915a1bc3a49ab28388cdb41d4ad3e7c6a0127e82143766f SHA512 200832172eac9c2729816c800fc32376ae62be2d832a398538054dca875fbedc41a300618f37f4d2b1cc36f36be20a6cbd86cc7f66e5ada476309e734c3f578d WHIRLPOOL 1afabf88e61bdb1e545bd84a0890953cd59d6e2811760e1d4c3f93307fd2f01b915404867af42265e19daa58c10cdb7b0538e31c468b8852cd960107063f00c0
+EBUILD django-xslt-0.4.5-r1.ebuild 928 SHA256 feb5a6c4320308b796d532e6b20ee8c4453e7b179dda615381f12e65d947a4bd SHA512 1d4033e5cec4fc9861bf1546928b6e171c6d83754007a0655e5627240d26f4aaea0c925947ddf9443c91e73a5c7c32c2b0fcc60cb5bf6175b96a56c8e64d8c7c WHIRLPOOL 0d414dd1810d29003aca6cf5174d3cbc0043af317de2a98f7ca9e6e4a021000d369c7d91f1692489df29c9dc9edfa2d979ab9eccab6d6e07c01680410c40a3a2
+MISC ChangeLog 2752 SHA256 ceefb8db15f096484577b8cef28016662d0eb77dfaf275ffb855f218eb6725db SHA512 129fbb00159214d606bccb92389048198b167be7ad61b229a36b5ea1479c4ba8da6966c30b333fa8b717bc4a1863bc69f432a401cee3b469594bebad72217e9d WHIRLPOOL d22d8b331e0cd135482db255843762c6a9f90a7af174aff3c7ca27a39fa1badbdd48c1a6c8b0799f22067b6e0594c7c5ff52fde08c53339b41b5fff2558d0ba7
+MISC ChangeLog-2015 1200 SHA256 fc8f155a40dddb22712b4010f85e4725b958ac06b8e46d0ac0e91f3768925e4b SHA512 0e01e81fb84b07be88b6de4aea5ed3b888944425e42ee2ca56b7febdf71255236d23b5d57f3e42768ef2b14f79c45a8d86bcb2b0b90fca0215056ef11cf986ec WHIRLPOOL 61b419ecb4840002f76753916028a6c33109299b5904f64797354a6cfbd653da8699f279a3b892168d39bde464f310661bc2e57649baf33d416b9d22e83a8b3d
+MISC metadata.xml 324 SHA256 0947bdc38058793dd3db4c3995d4042273dc99a6c23b2bcdae404f6a623d22b4 SHA512 aa9db49e681665d1d2ef3b1f2681985e0d12f7df1a8e731f966e7a426fe92a7901adbf3cc761d7885c553af8629d524a83a8dc2afea1bd24f55fe21e6601d047 WHIRLPOOL d93f379155cca95872b59efb33bfb1261929f389276ff7106dbee79b81df8219110a6d48bff8f15cffbff28b3d5eef8a630d54f5a99e2097dc2dd8766eb8759e
diff --git a/dev-python/django-xslt/django-xslt-0.4.5-r1.ebuild b/dev-python/django-xslt/django-xslt-0.4.5-r1.ebuild
new file mode 100644
index 000000000000..ac5cf6036bc1
--- /dev/null
+++ b/dev-python/django-xslt/django-xslt-0.4.5-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? ( https://dev.gentoo.org/~tampakrap/tarballs/${PN}-demoapp-0.4.5_p20120427.tar.bz2 )"
+
+DESCRIPTION="an XSLT template system for Django"
+HOMEPAGE="https://pypi.python.org/pypi/django-xslt/"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/django[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
+
+python_test() {
+	export SECRET_KEY="green"
+	pushd "${WORKDIR}/demoapp" > /dev/null
+	if ! "${PYTHON}" -c "from django.conf import global_settings;global_settings.SECRET_KEY='$SECRET_KEY'" \
+		manage.py test; then
+		die "tests failed under ${EPYTHON}"
+	else
+		einfo "tests passed under ${EPYTHON}"
+	fi
+}
diff --git a/dev-python/django-xslt/metadata.xml b/dev-python/django-xslt/metadata.xml
new file mode 100644
index 000000000000..cd110bc1bcda
--- /dev/null
+++ b/dev-python/django-xslt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django-xslt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
new file mode 100644
index 000000000000..0aa48842fce9
--- /dev/null
+++ b/dev-python/django/Manifest
@@ -0,0 +1,26 @@
+AUX django-1.4.19-bashcomp.patch 1124 SHA256 08fa240a2991b7b89926ed14dc9a50992a5ca0e1b44f932d27d8ec7c68db4f2b SHA512 b1c2382f202dcf290cb8996ea174a1539783478fbf2feab18433f0cedc6c9dd0e088b3241131dc0fb1a5c621a45003ccb62146591ccac42218dbe38cf56f53d4 WHIRLPOOL a6805c97326853bf30f5c00906d13222532744cf07a182efc7bd0fecfb13a0076156517c1c31e88c4d44482a0db36ae3d666ac880fb4cdbdd78bfe93f1a84474
+AUX django-1.5-py3tests.patch 959 SHA256 62fbb00c8d919306b48c8fcc82c7fa5e8aa38589f5271c526757da0ff2acbaa7 SHA512 cc746d43c2cc1c7f88fbffbf07ffc1f3b3fdcb738547658623c763e302c69372f8c8c014ac2a7196382d21aee0ba2ede92860a59a76ad3e14541015969935a92 WHIRLPOOL 4da24b4006ff233fea8041127a2842485d7d178d5abba2b429f537a66feb21384a59678188451089429af355118f06fc7083cbdd61d12905f9dfdb4e831d668b
+AUX django-1.5.4-objects.patch 1467 SHA256 237d0ee4e9f2af1d98b0b230977a41d061cbdbefc153193bc1539c4ad82622ee SHA512 09bdaab452f692679a15d0fbadf3c044417aeda0ce65b30bd2994d86b33ae93c13eb159fdad373a031ab2e0563861e29d1f9935b52c33af34a6afd25461e904d WHIRLPOOL d8a18947bd826c28836ce5180a6f9de758722fcc45ba11ca6a887c65711e7fa23827dcab734b6bfe51c330dd05a2d67a5d82e6e2d85130cdb05fcb4ca0622f26
+AUX django-1.6-objects.patch 729 SHA256 ea217c069a28b19063fcf216433cab48bd693fa51db0585881905532575a0875 SHA512 e7dc3cc8e50b4b0d546983dd79f1fa2bf7680d04d1e401267334ce72ee065e0fac2b00f9287ccafc3fabca29bca4c1d6475021b5da19d145a2d90fd491bb7ae7 WHIRLPOOL 00b4f579809206c78ce1648059c56a3af146c883c1b36f4febede15b4d3075a3686b30a6feac8d03c1df5e45994da5a2fdece6bdb71afb8d16bb72e139d67931
+AUX django-1.6.10-bashcomp.patch 1090 SHA256 1bf3b71b231a0ed772fc47c21d41e97f72c0ba6e5a7108a851087be4bc35e7e4 SHA512 43e6a0a23d713dfb2b002ee89f68fc8cfe5f18bbfb84e9addd37ca0aa25aaa704238833c9be781da0b71fe708fbe2831ef61952638874fd3b6d10298d9076118 WHIRLPOOL d1ff83d8919b957df1491ef17d27f828ceb708cef07d483c7549fbf2106dcfb3f66178ab2a7a248bddc70814a130ca5e583e86f2f7e477f93547f1796d984548
+AUX django-1.7.6-bashcomp.patch 1090 SHA256 7097b55ef456d7bd228fc08ba7430b37b966170baafab521edcca5a1d2725556 SHA512 e7df516ea276eef06c79db2ec3694bbbbbe6724669281bc97311c9386f943f55bf65c4d41d07a4ecf2dc8abf11fddd0d07fc5a08f357365c67274c74280fc532 WHIRLPOOL 8a03ba9fd619acf6d1b041e84b26df436b594e952acea5c3cde7b62e83cbdc03ab75b28189b1bb49cba508e664976529d6e4403ceb475d0b36ecd70d948bc6b5
+AUX django-1.9-bashcomp.patch 1734 SHA256 4817d45314b10a35f2e323ef35e0c6894ff1704957a8b1c5d516d5f9d66188be SHA512 d3caa9b77d6c336e131b706411080aa129df83ac60293a2612eb268d08a6c40096b322715766801e16a641134762174ecefcf2b93698f47b022fc31421597403 WHIRLPOOL 96a099ce5545d5892d04268f60262ded5edaf7550dbeea47d8cd6b404847e3286802aa6a22ad5411f0e38d1fe90b179ef666a77f48a8039bd8c2714bf6caed57
+DIST Django-1.10.7.tar.gz 7737654 SHA256 593d779dbc2350a245c4f76d26bdcad58a39895e87304fe6d725bbdf84b5b0b8 SHA512 2b16de21a1c966942f0d912bde4f5be7004f250e5ce3c56a5ac462f81f82e911da19fa0aeb9058670d663caecc1016ce4bcd93c1fa058675150caa33cfeb0e3b WHIRLPOOL 0b3f9fffe9f6fa3c803cabc7e9b1e4f2f100f4ae08a98bd6d90841d743edad4ff19df162b6ace9442fe03ba2bf47193fb8a36cfbba12bac84b69b93937f3b863
+DIST Django-1.11.2.tar.gz 7865109 SHA256 3c5b070482df4f9e5750539dc1824d353729ee423fd410c579b8cd3dea5b0617 SHA512 0f1187fd03064b966241d6ed1a869d6f155af2598a7b9c8b2f902585265cb6df7236817e5f14907c362ce7420d08e881ff9461f14d673485be3b3e5c3d980e8e WHIRLPOOL 278865760b80956e48d37bf7e3f7d68860aaf72ff3a1383ce7d40dd9b67426236b4f4cc0e7cbb352871a40d668325bf698d48b598e059bbfed8f407674bd9cc8
+DIST Django-1.4.22.tar.gz 7802249 SHA256 d0e2c9d772fcab2cf9c09e1c05e711cf5fe5eb93225762b29f0739d65e0d1784 SHA512 03e833d95d8ffacf8cb753b8b8c15edc145830add322ad166c574a9a7428ed308082ffea7a73bcdb7315f489270fd84a38d1a8b12c090dfb9d68da5d281cef68 WHIRLPOOL 7c3999e05c31772b74dcca981b052d5e13621897490166f3c022bfd6db2d542c2eb7afb16b4fd4536a49b4834fc62e61010ad10949af1269c4363f1ef6ea7c9e
+DIST Django-1.5.12.tar.gz 8202839 SHA256 b3de77beb6e59b72071ca66f20c2ad34e1b90d39b0241e62c1f03c668ddd6ced SHA512 37736827618737c54e7b63f2376b915d8dc0cdaf1900a2f6c3c9e0edd69e50379f95e3b6a31c930efdca88793b6330e7226175af91951d8637e5db780bc9fd8d WHIRLPOOL a3d17e364b0f90ff3a059afbfb57fdb9988ad777048f3caa30244d7ae6b0c87f42e1e5af5bdcda8f09c713518e0fb2471e1e4da3a988f37e45e6bca7678ecafa
+DIST Django-1.6.11.tar.gz 6764000 SHA256 7e50e573e484435873b3515d7982d80093b2695aba17fd0ff024307454dc3a56 SHA512 de6024b49e0344bf153f73ec344180fb701e415e4f9c330118821744d0e579436cc265724f7ef7213c9551847022ba9570312633f317b9003db533d06deb9829 WHIRLPOOL 5de086952bda9449f85798e8fe3bac82f11e1b856c1d39e340399e71ca6bf183318eebf1f536714567036485637166a929082a1ba9d6c1816f07c53dcc12c72a
+DIST Django-1.7.11.tar.gz 7586798 SHA256 2039144fce8f1b603d03fa5a5643578df1ad007c4ed41a617f02a3943f7059a1 SHA512 2e3415295ee6b590e366b09adb261baccb750519b9bcef1bb09bd52a2db705c8082bfc13440c621a5f41dd4f9bd626792eba4a572e78de3b7caf93c951c406ee WHIRLPOOL 8797862021c6acdfcba5752f6f5f2d567a564812fc5089678a9d00b9d8f1cb13c03bd0cb9b369b68ce1d1f1dc1522f05d41778f5181aef9c7d49783afc280e7c
+DIST Django-1.8.18.tar.gz 7297986 SHA256 c7611cdd5e2539a443b7960c7cafd867d986c2720a1b44808deaa60ce3da50c7 SHA512 41959c1012feec579dc991129976a655bc2f1ff7298bd05951c925b3d0a86a67cc32bf8a78273236b3db05cc1eb841a7aba5091bd06a072dd73c55eb0f7ecee8 WHIRLPOOL c0a563f767878f6cea24246730933fd5e3ae489c343c4c36d13a711b8f77d91007b516d6e40646d3520a79abfdc6e187826b94047cbdc0c2bad0427172506e7f
+DIST Django-1.9.13.tar.gz 7498364 SHA256 c007dba5086061f7d0f4d88a3bc4016d881a7eede86d6c1c4fdbbaadddd53f1d SHA512 bf642d5c342dd523ceb7a580213255ddf91a24bd5506355325b72c0eb91774d120ddb89d728a4b432ef0a587f8448e915c3217adcaa8ff5aa816873fa01ae7c0 WHIRLPOOL 048c874a09052d1efa6c4ef591d5920e29b22d95ff46e6b92db36d12870f560fd55fff0f26df8ccc67b62abe3f63d53fdc3c30d32483cfc3f2e87df2527b638a
+EBUILD django-1.10.7.ebuild 3168 SHA256 77b21136beb89c5b64c7270f3bd42b2305f8214698442a23aeb653a47cd179b3 SHA512 0feb662ccc97294515bb1f3421154c266b3306efe3c63f4418aedb75bbc78afaafca82b52fc21dcf6b5c845bb5db90df56a8fbc0162baaa06418ebb62f6cccce WHIRLPOOL 01989086baf6662f797498ddbc196cbf5be0c6f6ef263a6286c0c31522a2a44fba42a733e5619bec5774ce75b0157fdc3d66a27d44a086aa132bc930f119d27f
+EBUILD django-1.11.2.ebuild 3174 SHA256 8a55d9c55143e124eeccf08a8daf004a558c57f4a5b002c1cfe1ae269d02d703 SHA512 ef38421c0fc3413292464d66b6ff1a7eab6281adde4d8def84c3d3a5512b438d92be8c580012c6aacdb61b02b6736b1a15d8b2033b018580788dc8d6491e33c5 WHIRLPOOL a101348202e953d777e843ba8ce96d88a87c89d163fd57ab6f8cdd7c859db0f4ca02c3b2440bd8916097a6513f86e12e1dab37b44539aea7774f0b72d669b619
+EBUILD django-1.4.22.ebuild 3016 SHA256 4e9bded6e2835b5ba5a0f71398867c504dd95670035a535951d4bea5077526c1 SHA512 5024c5e6e1def7b26a8901ad1252a14b5ed9261b6e7f299d004ca76608dbe2ba8170d5d74716f33176ca767c0d5d10ca1b6107eb9b0cc124834632445a4c579e WHIRLPOOL b37c1cefa9f81bbc73387be8eae942597c645ae0b0de7bee3294b1b42cd5b2634a08d411c33cc1d5506e1c1c85529301daee61318d89b4a01e0297b785b09aca
+EBUILD django-1.5.12.ebuild 2112 SHA256 adbd4e77800b80846881de67da3567b72720312474a9acae0527e2a63f9f8621 SHA512 fc6a5d6ab6c72eaba635d595defce2b56ceebf7fc057a691aede3810dcf1645bf8bbfdec83654a534f9a80882180471d0e55428a4e9dad6a3336ec2a8aef7513 WHIRLPOOL 290de5bd9286f87f6f09910ae52d948fec888ece136bca0bc4d4d77cb9d8d667ae66c990907637ce39e6fe4300236853e0f08e7f0eabdbf17015ebdfc7186bce
+EBUILD django-1.6.11.ebuild 2837 SHA256 31fa532e152dbe1ff8ea888678e9f5caf8ef0224809e0a80f8f1a51fe836538d SHA512 15f105811c1aab76bed2b6425d0122db51ca795446d46c818ba14f74fcd0224f3cdc18ab08c0b7a43de8cba8a6870a93c43e94125def7d7c60c7a03383471854 WHIRLPOOL 70624128ea890e7b1fb1c61430cfdac837ecdfdd34143e10007d893c43814eed6d34d3c2d605868384c2fcdb2a9894a94f93f13a96a5829a6627f0ea08e6ce61
+EBUILD django-1.7.11.ebuild 2843 SHA256 022947363a6dfbf9f5655db887535dee6fd82a2b3f865171055908c38831851c SHA512 ece16e2fc52217b07e7533ab50376a9605d76019441679b1695f37d03db0a3787832114ce233815382acbed5982cf7b5f8a325b4d668043b4c0332bcdaf8926a WHIRLPOOL a37c1cd3efa4142e23be6628a7364b5e7846611210d088a834c6d97d4d97538388693ab0239b4d8d14ed5698d870c0ea9db9c7790211feaa559ee0c26e8be9f1
+EBUILD django-1.8.18.ebuild 3039 SHA256 36631b39e2196722c7c5cab3092bf4be7387eb571c1b9281da5189414eaabcfe SHA512 a26a4d8f4019d994f6efba029d1e1e9caab1cf48b18e33df16736a2419483092ec806dc9eb87d64462de5e0d37c624ac13021717ad35c7f0d1717750012c23b3 WHIRLPOOL b1b19d64476638556bb84cadefeff310cc019b6014c5f629a09fd2a58c9804f9520bffa174c1b30e073b2b166ca887c47f5efdb0bec2c071c9d2be730d1b6efb
+EBUILD django-1.9.13.ebuild 3065 SHA256 d77d33ca98984efc36be95bc7c9e9f71016b1322b2cd1e693776873ae6143c55 SHA512 26fe0cd33692d03959c60f6b14359e826000d28caf596cf1c78b8bc62cc37827614950887bbfacc9639609b4fee4fe1e205ed69c727522d3d0732fc561dc51b2 WHIRLPOOL 412278713b0030e4634d80eb0f54b19d925701e89cb1bd651368aa6085ca4873d2b47c34fa93ae549ac611b736e6e517027f1ccdb2967b1a15a8c21f291134b9
+MISC ChangeLog 11126 SHA256 e2ebcea3cffe46bdf88f8045360f195c0f1083450e16d53e39bf2a5e165fc356 SHA512 2a3f9a5a05d8e25ff22c87181db80fef6b0ff71ea3c26ddb83b7d7ff8847a6703e121f35b61f3cd663ea1a88e41135cd3e6d97a461c684491c77a3603cc8a54f WHIRLPOOL fec2f8b854b67e1d1e5ba3fac47224cee9d31b6cb002647db2c0fc4a2309282867533df2746ecc0a213f9d84a22d447e4e7cf64969585d60de6359f9982f3d62
+MISC ChangeLog-2015 27759 SHA256 79ae77859ed419bd3841ea949154d3e49607e91ad3c346c5756fb199b4dc6557 SHA512 7ff4ec9160658c924c86d858ad47e83e25edfe10a0251d336e67ea7449bd7ec35286ccf4a767bb079ab9b9de45c6b0f73c59308ca1a51150f0cecc49d16b2510 WHIRLPOOL 1adf6d85ae7d453c85c659b83bdfe39dc6fd7373e730e9865efbef43a4c5619b8f9d77cebf0a817dbaa793c189b170c3db5194067d8efc65a757938d88b2c709
+MISC metadata.xml 374 SHA256 5cc06067c0ffea868efe5b303f2669631894cdd505246b1efbf4f159c179f4bd SHA512 9aa0b388987c115e18e0aaa8747605e67fc8c8b5125d2a634dfae2ba8c6627963029fe913401a0647026adaa4d0037d91075a46d20f924f4d4f8d45bff195cff WHIRLPOOL e07fd189e14139814b3d1da09c77aa8f1937d80d783eac87eb3fd9399cc12e69c091ea79a8a30b71b49ac86238e0f98fb6f7e21507cdb7b76ec844b770931600
diff --git a/dev-python/django/django-1.10.7.ebuild b/dev-python/django/django-1.10.7.ebuild
new file mode 100644
index 000000000000..0358f425c772
--- /dev/null
+++ b/dev-python/django/django-1.10.7.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils versionator webapp
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="http://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+SRC_URI="
+	https://www.djangoproject.com/m/releases/$(get_version_component_range 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 ~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/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/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${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-1.11.2.ebuild b/dev-python/django/django-1.11.2.ebuild
new file mode 100644
index 000000000000..dbfd745c4a7e
--- /dev/null
+++ b/dev-python/django/django-1.11.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils versionator webapp
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="http://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+SRC_URI="
+	https://www.djangoproject.com/m/releases/$(get_version_component_range 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}]
+		)"
+
+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-1.4.22.ebuild b/dev-python/django/django-1.4.22.ebuild
new file mode 100644
index 000000000000..987a81234ed6
--- /dev/null
+++ b/dev-python/django/django-1.4.22.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils versionator webapp
+
+MY_P="Django-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="http://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		<dev-python/numpy-1.9[$(python_gen_usedep 'python*')]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		)"
+
+#		app-text/pytextile[${PYTHON_USEDEP}]
+#		dev-python/markdown[${PYTHON_USEDEP}]
+#		dev-python/selenium[${PYTHON_USEDEP}]
+#		dev-python/py-bcrypt[${PYTHON_USEDEP}]
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.19-bashcomp.patch
+)
+
+python_prepare_all() {
+	# Disable tests requiring network connection.
+	sed \
+		-e "s/test_correct_url_value_passes/_&/" \
+		-e "s/test_correct_url_with_redirect/_&/" \
+		-i tests/modeltests/validation/tests.py || die
+	sed \
+		-e "s/test_urlfield_3/_&/" \
+		-e "s/test_urlfield_4/_&/" \
+		-e "s/test_urlfield_10/_&/" \
+		-i tests/regressiontests/forms/tests/fields.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+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 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+
+	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/mysql-connector-python
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	echo ""
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/static/admin/.
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "A copy of the admin media is available to"
+	elog "webapp-config for installation in a webroot,"
+	elog "as well as the traditional location in python's"
+	elog "site-packages dir for easy development"
+	elog
+	ewarn "If you build Django ${PV} without USE=\"vhosts\""
+
+	# XXX: call webapp_pkg_postinst? the old ebuild didn't do that...
+	ewarn "webapp-config will automatically install the"
+	ewarn "admin media into the localhost webroot."
+}
diff --git a/dev-python/django/django-1.5.12.ebuild b/dev-python/django/django-1.5.12.ebuild
new file mode 100644
index 000000000000..0414d5a296c8
--- /dev/null
+++ b/dev-python/django/django-1.5.12.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 versionator webapp
+
+MY_P="Django-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="http://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc mysql postgres sqlite test"
+
+PY2_USEDEP=$(python_gen_usedep 'python*')
+RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]
+	postgres? ( dev-python/psycopg:2[${PY2_USEDEP}] )
+	mysql? ( >=dev-python/mysql-python-1.2.3[${PY2_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? ( $(python_gen_impl_dep sqlite) )"
+
+REQUIRED_USE="mysql? ( $(python_gen_useflags 'python2*') )
+		postgres? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.5.4-objects.patch \
+		"${FILESDIR}"/${PN}-1.5-py3tests.patch )
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+	fi
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	# https://code.djangoproject.com/ticket/20514
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v1 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/static/admin/.
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	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-1.6.11.ebuild b/dev-python/django/django-1.6.11.ebuild
new file mode 100644
index 000000000000..e202cb41ed3f
--- /dev/null
+++ b/dev-python/django/django-1.6.11.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 pypy )
+
+PYTHON_REQ_USE='sqlite?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils versionator webapp
+
+MY_P="Django-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="http://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	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-1.9[$(python_gen_usedep 'python*')]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		)"
+
+#		dev-python/bcrypt[${PYTHON_USEDEP}]
+#		dev-python/selenium[${PYTHON_USEDEP}]
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5-py3tests.patch
+	"${FILESDIR}"/${PN}-1.6-objects.patch
+	"${FILESDIR}"/${PN}-1.6.10-bashcomp.patch
+)
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+python_prepare_all() {
+	# Disable tests requiring network connection.
+	sed \
+		-e "s:test_sensitive_cookie_not_cached:_&:g" \
+		-i tests/cache/tests.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 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+
+	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/mysql-connector-python
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	echo ""
+}
+
+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
+}
+
+pkg_postinst() {
+	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-1.7.11.ebuild b/dev-python/django/django-1.7.11.ebuild
new file mode 100644
index 000000000000..a5b531b97eb1
--- /dev/null
+++ b/dev-python/django/django-1.7.11.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 pypy )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils versionator webapp
+
+MY_P="Django-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="http://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	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/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		)"
+
+#		dev-python/python-sqlparse[${PYTHON_USEDEP}]
+#		dev-python/bcrypt[${PYTHON_USEDEP}]
+#		dev-python/selenium[${PYTHON_USEDEP}]
+#		sci-libs/gdal[geos,${PYTHON_USEDEP}]
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.6-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 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+
+	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
+	optfeature "GEO Django" sci-libs/gdal[geos]
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	echo ""
+}
+
+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
+}
+
+pkg_postinst() {
+	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-1.8.18.ebuild b/dev-python/django/django-1.8.18.ebuild
new file mode 100644
index 000000000000..9e8634ad60e3
--- /dev/null
+++ b/dev-python/django/django-1.8.18.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils versionator webapp
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="http://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+SRC_URI="
+	https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz
+	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+	"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~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/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/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		)"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.6-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 \
+		|| 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-1.9.13.ebuild b/dev-python/django/django-1.9.13.ebuild
new file mode 100644
index 000000000000..396bb4ced48d
--- /dev/null
+++ b/dev-python/django/django-1.9.13.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils versionator webapp
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="http://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+SRC_URI="
+	https://www.djangoproject.com/m/releases/$(get_version_component_range 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=""
+IUSE="doc sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	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/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${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/files/django-1.4.19-bashcomp.patch b/dev-python/django/files/django-1.4.19-bashcomp.patch
new file mode 100644
index 000000000000..26d5f7ee1405
--- /dev/null
+++ b/dev-python/django/files/django-1.4.19-bashcomp.patch
@@ -0,0 +1,37 @@
+ extras/django_bash_completion | 17 +----------------
+ 1 file changed, 1 insertion(+), 16 deletions(-)
+
+diff --git a/extras/django_bash_completion b/extras/django_bash_completion
+old mode 100755
+new mode 100644
+index 1c3887e..748227d
+--- a/extras/django_bash_completion
++++ b/extras/django_bash_completion
+@@ -37,7 +37,7 @@ _django_completion()
+                    COMP_CWORD=$COMP_CWORD \
+ 	               DJANGO_AUTO_COMPLETE=1 $1 ) )
+ }
+-complete -F _django_completion -o default django-admin.py manage.py django-admin
++complete -F _django_completion -o default django-admin.py django-admin
+ 
+ _python_django_completion()
+ {
+@@ -55,18 +55,3 @@ _python_django_completion()
+         fi
+     fi
+ }
+-
+-# Support for multiple interpreters.
+-unset pythons
+-if command -v whereis &>/dev/null; then
+-    python_interpreters=$(whereis python | cut -d " " -f 2-)
+-    for python in $python_interpreters; do
+-        pythons="${pythons} $(basename -- $python)"
+-    done
+-    pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
+-else
+-    pythons=python
+-fi
+-
+-complete -F _python_django_completion -o default $pythons
+-
diff --git a/dev-python/django/files/django-1.5-py3tests.patch b/dev-python/django/files/django-1.5-py3tests.patch
new file mode 100644
index 000000000000..16b2cc209c0c
--- /dev/null
+++ b/dev-python/django/files/django-1.5-py3tests.patch
@@ -0,0 +1,22 @@
+https://code.djangoproject.com/ticket/20514
+diff -ur Django-1.5.orig/django/contrib/gis/tests/test_measure.py Django-1.5/django/contrib/gis/tests/test_measure.py
+--- django/contrib/gis/tests/test_measure.py	2013-02-27 03:04:14.000000000 +0800
++++ django/contrib/gis/tests/test_measure.py	2013-05-28 04:40:18.983011224 +0800
+@@ -40,7 +40,7 @@
+         "Testing access in different units"
+         d = D(m=100)
+         self.assertEqual(d.km, 0.1)
+-        self.assertAlmostEqual(d.ft, 328.084, 3)
++        self.assertAlmostEqual(d.ft, 328.084, places=3)
+ 
+     def testAccessInvalid(self):
+         "Testing access in invalid units"
+@@ -172,7 +172,7 @@
+         "Testing access in different units"
+         a = A(sq_m=100)
+         self.assertEqual(a.sq_km, 0.0001)
+-        self.assertAlmostEqual(a.sq_ft, 1076.391, 3)
++        self.assertAlmostEqual(a.sq_ft, 1076.391, places=3)
+ 
+     def testAccessInvaliA(self):
+         "Testing access in invalid units"
diff --git a/dev-python/django/files/django-1.5.4-objects.patch b/dev-python/django/files/django-1.5.4-objects.patch
new file mode 100644
index 000000000000..48e649081d34
--- /dev/null
+++ b/dev-python/django/files/django-1.5.4-objects.patch
@@ -0,0 +1,31 @@
+Remove un-needed objects.inv files from d'loading during doc build
+diff -ur Django-1.5.1.orig/docs/conf.py Django-1.5.1/docs/conf.py
+--- docs/conf.py	2013-03-29 04:10:14.000000000 +0800
++++ docs/conf.py	2013-05-28 01:54:49.695008477 +0800
+@@ -91,12 +91,6 @@
+ 
+ # Links to Python's docs should reference the most recent version of the 2.x
+ # branch, which is located at this URL.
+-intersphinx_mapping = {
+-    'python': ('http://docs.python.org/2.7', None),
+-    'sphinx': ('http://sphinx.pocoo.org/', None),
+-    'six': ('http://pythonhosted.org/six/', None),
+-    'simplejson': ('http://simplejson.readthedocs.org/en/latest/', None),
+-}
+ 
+ # Python's docs don't change every week.
+ intersphinx_cache_limit = 90 # days
+# Fix creation of html docs on python 3
+# https://github.com/django/django/commit/a5733fcd7be7adb8b236825beff4ccda19900f9e
+diff -ur Django-1.5.1.orig/docs/_ext/djangodocs.py Django-1.5.1/docs/_ext/djangodocs.py
+--- docs/_ext/djangodocs.py	2013-03-29 04:07:21.000000000 +0800
++++ docs/_ext/djangodocs.py	2013-05-28 02:34:59.057009144 +0800
+@@ -204,7 +204,7 @@
+                         if t == "templatefilter" and l == "ref/templates/builtins"],
+         }
+         outfilename = os.path.join(self.outdir, "templatebuiltins.js")
+-        with open(outfilename, 'wb') as fp:
++        with open(outfilename, 'w') as fp:
+             fp.write('var django_template_builtins = ')
+             json.dump(templatebuiltins, fp)
+             fp.write(';\n')
diff --git a/dev-python/django/files/django-1.6-objects.patch b/dev-python/django/files/django-1.6-objects.patch
new file mode 100644
index 000000000000..597da6e6bb1c
--- /dev/null
+++ b/dev-python/django/files/django-1.6-objects.patch
@@ -0,0 +1,18 @@
+#Remove un-needed objects.inv files from d'loading during doc build
+diff -ur Django-1.6.1.orig/docs/conf.py Django-1.6.1/docs/conf.py
+--- docs/conf.py    2013-12-12 14:37:59.000000000 -0500
++++ docs/conf.py    2014-01-16 20:57:36.253670094 -0500
+@@ -109,12 +109,6 @@
+ 
+ # Links to Python's docs should reference the most recent version of the 2.x
+ # branch, which is located at this URL.
+-intersphinx_mapping = {
+-    'python': ('http://docs.python.org/2.7', None),
+-    'sphinx': ('http://sphinx.pocoo.org/', None),
+-    'six': ('http://pythonhosted.org/six/', None),
+-    'simplejson': ('http://simplejson.readthedocs.org/en/latest/', None),
+-}
+ 
+ # Python's docs don't change every week.
+ intersphinx_cache_limit = 90 # days
+
diff --git a/dev-python/django/files/django-1.6.10-bashcomp.patch b/dev-python/django/files/django-1.6.10-bashcomp.patch
new file mode 100644
index 000000000000..7c6ceff076a4
--- /dev/null
+++ b/dev-python/django/files/django-1.6.10-bashcomp.patch
@@ -0,0 +1,35 @@
+ extras/django_bash_completion | 17 +----------------
+ 1 file changed, 1 insertion(+), 16 deletions(-)
+
+diff --git a/extras/django_bash_completion b/extras/django_bash_completion
+index 8f85211..ab13755 100755
+--- a/extras/django_bash_completion
++++ b/extras/django_bash_completion
+@@ -37,7 +37,7 @@ _django_completion()
+                    COMP_CWORD=$COMP_CWORD \
+ 	               DJANGO_AUTO_COMPLETE=1 $1 ) )
+ }
+-complete -F _django_completion -o default django-admin.py manage.py django-admin
++complete -F _django_completion -o default django-admin.py django-admin
+ 
+ _python_django_completion()
+ {
+@@ -55,18 +55,3 @@ _python_django_completion()
+         fi
+     fi
+ }
+-
+-# Support for multiple interpreters.
+-unset pythons
+-if command -v whereis &>/dev/null; then
+-    python_interpreters=$(whereis python | cut -d " " -f 2-)
+-    for python in $python_interpreters; do
+-        pythons="${pythons} ${python##*/}"
+-    done
+-    pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
+-else
+-    pythons=python
+-fi
+-
+-complete -F _python_django_completion -o default $pythons
+-
diff --git a/dev-python/django/files/django-1.7.6-bashcomp.patch b/dev-python/django/files/django-1.7.6-bashcomp.patch
new file mode 100644
index 000000000000..ef76f8a873c7
--- /dev/null
+++ b/dev-python/django/files/django-1.7.6-bashcomp.patch
@@ -0,0 +1,34 @@
+ extras/django_bash_completion | 16 +---------------
+ 1 file changed, 1 insertion(+), 15 deletions(-)
+
+diff --git a/extras/django_bash_completion b/extras/django_bash_completion
+index 3e02d8e..5a33938 100755
+--- a/extras/django_bash_completion
++++ b/extras/django_bash_completion
+@@ -37,7 +37,7 @@ _django_completion()
+                    COMP_CWORD=$COMP_CWORD \
+                    DJANGO_AUTO_COMPLETE=1 $1 ) )
+ }
+-complete -F _django_completion -o default django-admin.py manage.py django-admin
++complete -F _django_completion -o default django-admin.py django-admin
+ 
+ _python_django_completion()
+ {
+@@ -55,17 +55,3 @@ _python_django_completion()
+         fi
+     fi
+ }
+-
+-# Support for multiple interpreters.
+-unset pythons
+-if command -v whereis &>/dev/null; then
+-    python_interpreters=$(whereis python | cut -d " " -f 2-)
+-    for python in $python_interpreters; do
+-        pythons="${pythons} ${python##*/}"
+-    done
+-    pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
+-else
+-    pythons=python
+-fi
+-
+-complete -F _python_django_completion -o default $pythons
diff --git a/dev-python/django/files/django-1.9-bashcomp.patch b/dev-python/django/files/django-1.9-bashcomp.patch
new file mode 100644
index 000000000000..8618dbef920d
--- /dev/null
+++ b/dev-python/django/files/django-1.9-bashcomp.patch
@@ -0,0 +1,46 @@
+ extras/django_bash_completion | 35 +----------------------------------
+ 1 file changed, 1 insertion(+), 34 deletions(-)
+
+diff --git a/extras/django_bash_completion b/extras/django_bash_completion
+index 06a2321..abe76e5 100755
+--- a/extras/django_bash_completion
++++ b/extras/django_bash_completion
+@@ -37,37 +37,4 @@ _django_completion()
+                    COMP_CWORD=$COMP_CWORD \
+                    DJANGO_AUTO_COMPLETE=1 $1 ) )
+ }
+-complete -F _django_completion -o default django-admin.py manage.py django-admin
+-
+-_python_django_completion()
+-{
+-    if [[ ${COMP_CWORD} -ge 2 ]]; then
+-        local PYTHON_EXE=${COMP_WORDS[0]##*/}
+-        echo $PYTHON_EXE | egrep "python([2-9]\.[0-9])?" >/dev/null 2>&1
+-        if [[ $? == 0 ]]; then
+-            local PYTHON_SCRIPT=${COMP_WORDS[1]##*/}
+-            echo $PYTHON_SCRIPT | egrep "manage\.py|django-admin(\.py)?" >/dev/null 2>&1
+-            if [[ $? == 0 ]]; then
+-                COMPREPLY=( $( COMP_WORDS="${COMP_WORDS[*]:1}" \
+-                               COMP_CWORD=$(( COMP_CWORD-1 )) \
+-                               DJANGO_AUTO_COMPLETE=1 ${COMP_WORDS[*]} ) )
+-            fi
+-        fi
+-    fi
+-}
+-
+-# Support for multiple interpreters.
+-unset pythons
+-if command -v whereis &>/dev/null; then
+-    python_interpreters=$(whereis python | cut -d " " -f 2-)
+-    for python in $python_interpreters; do
+-        [[ $python != *-config ]] && pythons="${pythons} ${python##*/}"
+-    done
+-    unset python_interpreters
+-    pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
+-else
+-    pythons=python
+-fi
+-
+-complete -F _python_django_completion -o default $pythons
+-unset pythons
++complete -F _django_completion -o default django-admin.py django-admin
diff --git a/dev-python/django/metadata.xml b/dev-python/django/metadata.xml
new file mode 100644
index 000000000000..ca9edb307f40
--- /dev/null
+++ b/dev-python/django/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Django</remote-id>
+    <remote-id type="github">django/django</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/django_polymorphic/Manifest b/dev-python/django_polymorphic/Manifest
new file mode 100644
index 000000000000..fff0bfc92425
--- /dev/null
+++ b/dev-python/django_polymorphic/Manifest
@@ -0,0 +1,8 @@
+DIST django-polymorphic-1.2.tar.gz 100149 SHA256 79e4f3f619fc6ea525c04fbe4963a7d5e97b7b20e17741b3314b741dc231e8af SHA512 71d7293b5eb49ae49801d5d3e60af7c9bcb8729237fb92016dc14800c1955cac1ae5a9029a1d37048cdfd7200e1ee38d15e13859345b1032f202ff90f75fd325 WHIRLPOOL 74f60ee18a86fea45daa83a0556a4b60e981431321fc52135fda0781eb15291621bf6bf9f01d86052fdfb9dcc96d4275349b0a012c48594923e4153952e2d679
+DIST django_polymorphic-0.7.2.tar.gz 36041 SHA256 f2f64fcf818b824316fb86fb1b5e8b18fa0b82c58eb881c05a0d06045cf4539a SHA512 afe391f635fcde0490a4bfd64d373794134a2e56066e07236299c07669eaa8afbef6f6d1a6116061716edb95ef1db0c0e4da91a7e8516f517206499d41051250 WHIRLPOOL dae7a2e6b7c29eab63de736498b9cb991e36a06df42df1da3632e0e257d0987ea1f1e9a7e3367e2e4b5b88efbe6bfd031759a94f94fa6400645db1075a52a393
+DIST django_polymorphic-0.9.2.tar.gz 39400 SHA256 fd8e88ed6b01b038fedf8eb63392f29a158143b36bde71424e194cbc382a447c SHA512 db22b880e042bf70ae215c95ce2cc5bca5f8622e7554af7c9e4b15daf10f45e70b255d9db2280a5de3a0c7a07dee3eb2b8cea5552b28c24ec8c301713165d993 WHIRLPOOL 35c51330c2ef1645ed6edebee941a3404fbc9414fd1edf29ac3c03e753672e20675a03940692402436bffcc887935795aba434201f1a087cc9785d44200b54c0
+EBUILD django_polymorphic-0.7.2.ebuild 485 SHA256 38fe7c1f4fb566b96d9b53bed3d13b9e552b9dac122359b03f23d5a186818524 SHA512 ed951fcd11f9d1935b6d73a000b9a8793848862497f680749b2843bd36050f4f5486c8284b48dba515381491bee52d3b02db63f3fbe631c0e84e949db4418e6a WHIRLPOOL 2ef4c2c4ac13531bd1cef614d7b9176397dafc9a889348a9c8f2fb0ddcd13ac403daec22ec5745bc15d6cb18c6972bd4a691c88f9372976f574bae36532a6b30
+EBUILD django_polymorphic-0.9.2.ebuild 485 SHA256 45702e07be33bc96c1edd5760e0d45c560cc1ce058bfe2d192ec79e123298660 SHA512 c974d4d12597b9619c2f30fa1876f3e1563be8a0857a26e1df9903b54f6ab8e51decc6f5737e9c3fcc2ba0ae1fef6099e946bf684c293164d31d93371af8334d WHIRLPOOL 2c9f97c2f57b04a087da3e3a977330743d0505222d586ed7345b61d87ef7564cb6d4d8993beb9ae4696efb546e7fa12209c9ba651042a52c4f6463b0d72403af
+EBUILD django_polymorphic-1.2.ebuild 572 SHA256 19c8eec5d4a06e810ec905eba055b5c8f0f271eccf5ca207d48f49598c685912 SHA512 91b9cb92c358cc8e8ed2eec2ca1b0719516924995e902d98659b1fbd9df232cfbf2e1e76c50f9209db432e5561f44e745f93c10a724d33fec29c00fc6c03b6ae WHIRLPOOL 77d5332c07dd9c48b451a5b3a77931e942316db362c196b1df7eb5bfab18c8914efe145ac82a65f0f5f4aeec7b372023929da10225f619159d5544ba67517aee
+MISC ChangeLog 1551 SHA256 f789505dde2d20701aff53a3cbed9ca32011c158f04908a43eb3ff59bfe137fe SHA512 c8e6ff6332577bbfa67f1c3adede5890c42f251a12c9f99952c65afec8c1a88b8ad308fa00eee1185d473e21ff824ea606f2c951231e5ce8f55e76ed00a674d9 WHIRLPOOL bf7f09b7c86de120324f7ca1d86b095f5976a9ee9c92472967e5ea1b6c0766efa33b91954fb41aa1e0056962f9ca933a29fbe18e4e0d6cda1141e3ce92e2aefa
+MISC metadata.xml 304 SHA256 1df359248ad83f2835330bca72d919433c692090ee58004488f80080e3e36346 SHA512 81aeecce6bddd294dd7d7e212af8f8d1942f88aa9cd0c89b040e7c43fdfc028ab6d86e0ce3d7a8766ccc361eb00ef1e067effd1607532a64100d085c2374a836 WHIRLPOOL 5f604709275f7d6bacf2d22adaab6e586c82c8675e870a9c71a44f37e05cf41a5c03957152504c42f6a9e9d1cf75230828c53cac47385635d93e8544067e2033
diff --git a/dev-python/django_polymorphic/django_polymorphic-0.7.2.ebuild b/dev-python/django_polymorphic/django_polymorphic-0.7.2.ebuild
new file mode 100644
index 000000000000..7d364044e5af
--- /dev/null
+++ b/dev-python/django_polymorphic/django_polymorphic-0.7.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
+HOMEPAGE="https://pypi.python.org/pypi/django-polymorphic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.4
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
diff --git a/dev-python/django_polymorphic/django_polymorphic-0.9.2.ebuild b/dev-python/django_polymorphic/django_polymorphic-0.9.2.ebuild
new file mode 100644
index 000000000000..2b78d2c4d596
--- /dev/null
+++ b/dev-python/django_polymorphic/django_polymorphic-0.9.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
+HOMEPAGE="https://pypi.python.org/pypi/django-polymorphic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.4
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
diff --git a/dev-python/django_polymorphic/django_polymorphic-1.2.ebuild b/dev-python/django_polymorphic/django_polymorphic-1.2.ebuild
new file mode 100644
index 000000000000..ef6b5345ef29
--- /dev/null
+++ b/dev-python/django_polymorphic/django_polymorphic-1.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
+HOMEPAGE="https://pypi.python.org/pypi/django-polymorphic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P//_/-}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.4[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${P//_/-}"
diff --git a/dev-python/django_polymorphic/metadata.xml b/dev-python/django_polymorphic/metadata.xml
new file mode 100644
index 000000000000..0743b91ed491
--- /dev/null
+++ b/dev-python/django_polymorphic/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">django_polymorphic</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-admin-style/Manifest b/dev-python/djangocms-admin-style/Manifest
new file mode 100644
index 000000000000..8ee6d8e2a455
--- /dev/null
+++ b/dev-python/djangocms-admin-style/Manifest
@@ -0,0 +1,4 @@
+DIST djangocms-admin-style-1.2.7.tar.gz 304105 SHA256 59dfe4ac535d6377e010c2e1b5e0dd5296b6177ef38e600d12ce8f19ff11e91f SHA512 e1476fcd07794f462870aa19e038e9f36f7181648008203b3cffed5fcd09e494397e275c8df49457d8cf742dbd845ba92a1561fc3b6725a5e834c113d5d81c74 WHIRLPOOL 08ff9b27877e84db86908aa0ebb6a0c2d4b31d57cd9ea5f8a9fc7ea5a6be5e0a37143902c840dfeb276ae866a411d385ff7b2726cb3b50b0a01b6c1481d6f109
+EBUILD djangocms-admin-style-1.2.7.ebuild 502 SHA256 381a66b4330a013e70ba275ae15e97181a447abe0ff26928bba4d876f11c0732 SHA512 3d989b381b9aa59a899bdd4b95acb07417e94c16d185ba8d156d5e581e6e3132382bc4808759720db01214d5afc447db7add52a217a1065965a93d16cda17fd2 WHIRLPOOL 281ce49e217d5b407358b98f13460aa0e89a396dc1749d6c7862f92fa13f32c6c235ae75e3d1d7fd26d22bb073c14443f1b55e28fbfa061958803bfaee62f6d5
+MISC ChangeLog 1869 SHA256 a31e8e7d12918d1ee712c39f336d3083ae12835e53a0dd52618f2474a8008caa SHA512 f5199b9077b6fb8bf3377af1e9d829b9fa5c8863a1fbb9bfcfa1661c01249d5c8fcd8518a5a555774ed2f47b17ad84163b3baecbf74a20353122f0229ab6f319 WHIRLPOOL b4d37658a98cd2500156104eea69e99384d9bdae4873b979c25a343ac0ca58cc7e122fc593f2877f36cefc5416c6120aaf19e76a6584537e193ab1d3c7b75c2f
+MISC metadata.xml 307 SHA256 87e718ec8ad99793931d5234ce8601e8401c0cbd3f85e0d3ef391cdc213dc7e3 SHA512 5211b58e7783644fcab006b67fd0eb83f293d2ccb1200193d35948f653388bb6219b69d35c1ec5cb761520d90c244acc0626500288423e8fac7ccd4b66aa3cbd WHIRLPOOL bde7f53a5e0d20d526dbe13eb3f9f40c5295cced6baf363d6a58f899935f5bc652562e85716cab4b985576b4264e0d66a362469d63093f6509655ba39cf0c079
diff --git a/dev-python/djangocms-admin-style/djangocms-admin-style-1.2.7.ebuild b/dev-python/djangocms-admin-style/djangocms-admin-style-1.2.7.ebuild
new file mode 100644
index 000000000000..d2703bdc8e08
--- /dev/null
+++ b/dev-python/djangocms-admin-style/djangocms-admin-style-1.2.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Adds pretty CSS styles for the django CMS admin interface."
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-admin-style"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/djangocms-admin-style/metadata.xml b/dev-python/djangocms-admin-style/metadata.xml
new file mode 100644
index 000000000000..5c2b06dd4410
--- /dev/null
+++ b/dev-python/djangocms-admin-style/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-admin-style</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-attributes-field/Manifest b/dev-python/djangocms-attributes-field/Manifest
new file mode 100644
index 000000000000..2613acab22ab
--- /dev/null
+++ b/dev-python/djangocms-attributes-field/Manifest
@@ -0,0 +1,4 @@
+DIST djangocms-attributes-field-0.2.0.tar.gz 27958 SHA256 924ce6ec5e4787c6593cd2be43f350036f4bda96fb47fed5c14e7d07add0a67d SHA512 2afb7ee05db12573d7f0a174334168ba9e9a9b96f8ac940d01694573f4711845d87995e60ba00af88626eb244f9fee7287328ac3a297c12a2a5d1d90425d897b WHIRLPOOL 2b3e1cb39a564430788ef4066a85bd1b4a5867e253bf3aa905d3c0fa23cc5e7ff27799b6d1fb2a4b2cf22a4ab4fe2c9fb6c3ce4858cbbd78118cb764088cc9c1
+EBUILD djangocms-attributes-field-0.2.0.ebuild 606 SHA256 9e7fe65dd30b600de07ca7647d6899d9ee24728df30ed57bce4704eaa15d2dc2 SHA512 d085d2dec6c4d69d5712655e7303f9024946e70a3c7a90a47c8b9ad3bb5e90a37212be4017feb60425616109627cb23756865c6de34f4ac50c6d9f9b63554e6b WHIRLPOOL 3068424af24ad1cbad146cae55cbc4c2d15d47ed3182863885e180f7c40c61a7b439ed4f6bc44491c45671d3e3c97f68cfef2318ba99b86bfea5d229dfdaf372
+MISC ChangeLog 511 SHA256 2af0668e904b61ba0f7c587679fe1dd7c755acfced1dde556a491a402f8c2aaa SHA512 07f96235fd217fda22aadaee2607b1503b654226f25f3ef10be1f7bae15790ec75bd2eb713de224ed9dd11e533a4cb5ba66f0d75c37f5553d7562ce6b9bd5aa2 WHIRLPOOL eb487f713c082263146f9ca20a597372228c3b932348cbb50c235f451007bcfb1d0f66e129c72d9b67cdd58c822121ff4aa85a6af840d77055fb70acee526f63
+MISC metadata.xml 386 SHA256 0a3d4907e4554e036acc64c312cb4afb16dcce23d543623217e305ad7e140278 SHA512 2ece860c10e6999cb835fef57b20352c441a60f53993b77a830db6b2c131727eaec3e864fea4f7254c3f7ea0ab63d61c5238ed9db80de24ceb38fab4a32ef21f WHIRLPOOL d0704c614c9d3fabcdb389511c647c44a379d3f508714074314af1be5fa39ccfc7514a675707c1ed76424c0c615d1bc4738536e00b6f30e7c9d4ce4852621d15
diff --git a/dev-python/djangocms-attributes-field/djangocms-attributes-field-0.2.0.ebuild b/dev-python/djangocms-attributes-field/djangocms-attributes-field-0.2.0.ebuild
new file mode 100644
index 000000000000..0267f28b4191
--- /dev/null
+++ b/dev-python/djangocms-attributes-field/djangocms-attributes-field-0.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="File plugin for django CMS"
+HOMEPAGE="https://github.com/divio/djangocms-attributes-field"
+SRC_URI="https://github.com/divio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
+	eapply_user
+}
diff --git a/dev-python/djangocms-attributes-field/metadata.xml b/dev-python/djangocms-attributes-field/metadata.xml
new file mode 100644
index 000000000000..1e23483f3d05
--- /dev/null
+++ b/dev-python/djangocms-attributes-field/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-attributes-field</remote-id>
+    <remote-id type="github">divio/djangocms-attributes-field</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-file/Manifest b/dev-python/djangocms-file/Manifest
new file mode 100644
index 000000000000..92d3c7e2094a
--- /dev/null
+++ b/dev-python/djangocms-file/Manifest
@@ -0,0 +1,4 @@
+DIST djangocms-file-2.0.1.tar.gz 66628 SHA256 3570896ffda998f3fa8b118ac9bf171d058f20af1086ef8aa075ba8f41978c73 SHA512 9b966955e958ae8c1a9962b65d45cc5a20c943d32bf13be67b443d5d084b6a982ee266e9894f1c1a68afc9a7e6f03acfedc98b6ecdaba050fc024b3e7fcc7921 WHIRLPOOL 02885d164b38b82c40be10652e5a375b04e44a2068b7e8c987b60436d3256f4cb573543409a5b421635ae4c4ef53f2b5194dc8aab2e044d82002bed50e246ec5
+EBUILD djangocms-file-2.0.1.ebuild 769 SHA256 bc4ee9ec505c59f9cf791e0e6a293a8948a11e65f06e830968853bd4378fdd98 SHA512 095138712cfacc4ff589c9867a5c80c93d92d3759307214be31b2256b10408bfb5e5aa468fdcf410f33bcf39f7203fc0d1c69d650b71afabba15bff347bf8d7a WHIRLPOOL 30fa77fc4f747c7e8a03f568d5e2247e12b533fe543d274f5fa59b955a4350421eb2c29c731c4caa486fbcdfaabd31b7d7c703f06067988483278a43ea2b4240
+MISC ChangeLog 1754 SHA256 e04688aec2ed62ee01f282b7a4351ea170bc8da7d3ebb739af8833dc0350425f SHA512 3ef6e446086ad666d04719de82d621fb57aae2b22c3a44bb896acf16134c0742ebdfbc3bb38341182f5d135f86eb1e610022cccfe4a6e2d680f5fb93124c617b WHIRLPOOL b656030dc4d8a5358780abaa1e104d574a77b2bab92e07424a7be2f3842abb4fbc75f3cb8e6c0c04937d65d1439cde71cdd66b7f716251de7424f86b15bfbe6f
+MISC metadata.xml 362 SHA256 2e8ea765eb4a388dfdc9297fb194c0a4fb79b7a28f5fe5b2872aacbabd162574 SHA512 06d7b7b3dae4e9d1f9cb9d2bddb9b779ebb30ac8a1adaaadfaa466e62d175e1fda4e69be6e6cc5dca8e401cd2b5be199aee00cbdbf36b3d2f2e725588053c5ec WHIRLPOOL f8dcfd56d0c148df3a0dce900ce140a21bb1cfd4f563b835529280e7a1dd0c85d7d60e094158eee9139e362d88b17c8604968f70ab68fbb8621d89650197fb04
diff --git a/dev-python/djangocms-file/djangocms-file-2.0.1.ebuild b/dev-python/djangocms-file/djangocms-file-2.0.1.ebuild
new file mode 100644
index 000000000000..7e5663eee855
--- /dev/null
+++ b/dev-python/djangocms-file/djangocms-file-2.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="File plugin for django CMS"
+HOMEPAGE="https://github.com/divio/djangocms-file"
+SRC_URI="https://github.com/divio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/djangocms-attributes-field-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/django-filer-1.2.4[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+PDEPEND=">=dev-python/django-cms-3.2.0[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
+	eapply_user
+}
diff --git a/dev-python/djangocms-file/metadata.xml b/dev-python/djangocms-file/metadata.xml
new file mode 100644
index 000000000000..577144f3169c
--- /dev/null
+++ b/dev-python/djangocms-file/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-file</remote-id>
+    <remote-id type="github">divio/djangocms-file</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-flash/Manifest b/dev-python/djangocms-flash/Manifest
new file mode 100644
index 000000000000..0868eeeaf974
--- /dev/null
+++ b/dev-python/djangocms-flash/Manifest
@@ -0,0 +1,6 @@
+DIST djangocms-flash-0.2.0.tar.gz 22506 SHA256 2ec0d5941bf62268d6af1343cc9dd8dbb4a43e5dd7100f0d7409345fd4dfe27a SHA512 4c1a4a52b930801b84032682f8cbb4a57d72d46ff8118ebc688d9146b0deb4aeb9309a64868554cdfd2ca5a7b70a52223655aad74014f292f7242b9e18afcafc WHIRLPOOL dcd30bcf3b4c22668b4bf75e418adad3ebf76d75500ce0f7cabc8330c0ea39141dd5a6535e94abdf95fb0f3d92aecb9398dd0690e2e3523f2d4145038c599f2b
+DIST djangocms-flash-0.3.0.tar.gz 21797 SHA256 ed827dcff35dae5ff90444c16c2c92cdba32f86fdf2dc6320eefd2c23a0b8ce2 SHA512 a24e6ea9be55cf6f9d9bda6e1e3b3934769c97295d053f792f8374e42023ce72c246a4ee2c06dab8c365c6fc6e6b56d38fdbf520d03e17000f080cf3a68f5c1c WHIRLPOOL 30b320e703025f3655dd7825372fdce4c307ca7006fd5ffef5fb2a2486fd62ec1640ab7f5021b0b8e5ba48f4fdd50ba6480ad6ff6fd5f20b2aaeb4ca2ad67442
+EBUILD djangocms-flash-0.2.0.ebuild 456 SHA256 edaf99e9cb47a22845b23406a8ee3bf33e63ea92c90cde1677faed246db698fd SHA512 ebd86eea630620974982eaee8c2c66f77029084942f285a4a3abb8a69c32fb159e9e5b1d547a958a42f21ab0ff4a294f576ff37e1bdb86379189efafc1148068 WHIRLPOOL 72c8b31d4b6d23d7e138d2a6dde055921144d057b8ca23c37c7182f2ed40f68650f5bc2cbae0d5a8c43414f97ad6d8d9b257b8f870acf6ebe9b248fbd7fff22f
+EBUILD djangocms-flash-0.3.0.ebuild 468 SHA256 16009ee4ae116f13430b8ebc9951ef195cfba93cc3d3e3bc8a557041fc59e590 SHA512 3c81b4c019cd48308551b4352ff32fa2445e070c62478b7d1974b878209baf3e0a01a52599e4c3c0035842b4a8584dd589d4a81878e7193ab2308fad7b7d6655 WHIRLPOOL 714e1fd62af7710b715066db2030c4661ad8f9307e67bf89b7c25c14f203ad698250593132ae11caf2f0d9aea98ff56c83ea1de568ab9f6f367ab0e489b4ef91
+MISC ChangeLog 1333 SHA256 5eb6ed7300cdb567fd19142ffdb19dd0f1e1c29a48b7ac11e999c4dc09dc8cd5 SHA512 d71b676412c79d3b49bc332fd62198a0b66129c4e824aa5bcc398bdddfe64e88a59f95ffbb8ae83694421594224162dcf7eca174c3832d79b6c9176f1f426da7 WHIRLPOOL 8081603ecfb4b06e26fc3fe27e42375e24e5211d944f2cdc652f9b8c36eafa72a132ebce321ac1ac2172a2b4a25f6d8562124e4a6e9f633f72ad0408bce3e7ce
+MISC metadata.xml 301 SHA256 880d955701c4846669556d345dd6032a5df74d8d25fd36908d3ee94302e17287 SHA512 39f741415521e7c890cfae9c7b88a812226cbdff8cdf8ce143b6bf350b37a4e64b24faf46f65346b0f7633023db0a63d5e8f4dd6a8f41c5c1c162f5fa2f541c9 WHIRLPOOL ce7a3acf902e06837232a48c5b66956d16775bf0c27cb0900c88a2132d8ef7a36cc14a4dbc46d887b6c4ec41d93dd4e93cb236b097f235425b40ed99674ff44d
diff --git a/dev-python/djangocms-flash/djangocms-flash-0.2.0.ebuild b/dev-python/djangocms-flash/djangocms-flash-0.2.0.ebuild
new file mode 100644
index 000000000000..92a82b6d9504
--- /dev/null
+++ b/dev-python/djangocms-flash/djangocms-flash-0.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Flash plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-flash"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/djangocms-flash/djangocms-flash-0.3.0.ebuild b/dev-python/djangocms-flash/djangocms-flash-0.3.0.ebuild
new file mode 100644
index 000000000000..9f18774a89a8
--- /dev/null
+++ b/dev-python/djangocms-flash/djangocms-flash-0.3.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Flash plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-flash"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/djangocms-flash/metadata.xml b/dev-python/djangocms-flash/metadata.xml
new file mode 100644
index 000000000000..9025089d5480
--- /dev/null
+++ b/dev-python/djangocms-flash/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-flash</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-inherit/Manifest b/dev-python/djangocms-inherit/Manifest
new file mode 100644
index 000000000000..8bab535e89d7
--- /dev/null
+++ b/dev-python/djangocms-inherit/Manifest
@@ -0,0 +1,4 @@
+DIST djangocms-inherit-0.2.2.tar.gz 24909 SHA256 fda204da550a7a877b7d61bdd86d87bfa69ea9bae6190f719e89e2e82ba80579 SHA512 f115568789b673a0ff05a3d9fac6ecaf1d7b85bb40fa6265239e0c7d3e68a64c8d163b71f2e75bec9fbb6fc7a70efbd6eb887fe027faf08c79e8052bb19fd466 WHIRLPOOL e1d9ff8218127bd7f18fad77384defec67fbf89a9f0a6d9597bc7e0bd6bc790c66ce14123dc01da53656f540bad989d25a116cf95ec9c48c80d168f3702ddab1
+EBUILD djangocms-inherit-0.2.2.ebuild 472 SHA256 a589f8383a7a4d202ccf7a1dfe5de06b1d666f349a7fd6a9b9c88d62912aa23f SHA512 ef7502f8acfe5a2018b5942546b14aff953d338c556b6a4fc017e65e7bee0fef60d9af42d4f017b8902d43cca9c0151ecd9f316301edb8559f341f77b9c1b7f2 WHIRLPOOL 10967f7cf8643e9aae917e2c158b75448a63a422184a31b79e5c7552d5695d19f1616641d416961a9899206eeaf6ac531bec47fb70857c8c68efbb4318aa9012
+MISC ChangeLog 1553 SHA256 d5f5e6453f6a15380e2da99e6e2219c9c8adfecd04186ecc19c8845ccbce2bb4 SHA512 b7b5c3499fe6f585e87e06b57a0307460748aa10a3bb7693fe5152ea5a7ea97d4436f8e3254bc4c80581c24c254faed432927d14434e723556d8752ca0664254 WHIRLPOOL 4338f24815c68622d6647ae162b222484de8a532b37588b3dc133e34b6abd5649d4b06e39414ebfb1e6a48a46af1a8b96c5db5876adaa962dd536ca0585bbec8
+MISC metadata.xml 303 SHA256 57f6b0b7b8e5e145b0df4ebace06d9ef643435541c1d5b50eb90103f965d522e SHA512 16198140105118ffd8982ecf655385ac129ffd53d1f6cb8a3edd40b1f28af671d35693cea0ff24b49c01ab8ae2dba049b00f8b901d76d34fea9388e217d4232e WHIRLPOOL 6ca57d82ac29c844307dcb65ce5f39a080a6b8ba01ce9522dbd7f67695598546700f1eb6097ea426e95552389be9bae8a426cf7e4616ba530ac06d28360fba67
diff --git a/dev-python/djangocms-inherit/djangocms-inherit-0.2.2.ebuild b/dev-python/djangocms-inherit/djangocms-inherit-0.2.2.ebuild
new file mode 100644
index 000000000000..f096aff9b76c
--- /dev/null
+++ b/dev-python/djangocms-inherit/djangocms-inherit-0.2.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Inherit plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-inherit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/djangocms-inherit/metadata.xml b/dev-python/djangocms-inherit/metadata.xml
new file mode 100644
index 000000000000..0d6e86a08b30
--- /dev/null
+++ b/dev-python/djangocms-inherit/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-inherit</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-link/Manifest b/dev-python/djangocms-link/Manifest
new file mode 100644
index 000000000000..39080e6eefb9
--- /dev/null
+++ b/dev-python/djangocms-link/Manifest
@@ -0,0 +1,4 @@
+DIST djangocms-link-2.1.2.tar.gz 32892 SHA256 210f5e8fd7cb814a808220a718a9b4446cf058d264e0817293b32d2f5dbc7baa SHA512 39c10472a5d21552e63aedbd556890bfd7da22199d1431caa5454f855c78cf02d71f6d9a01b4021cbb495c8369a7a538875630af85b515fcbefe36ddc45ca98a WHIRLPOOL e23bf26a8c2047d9005314676d6e55dc28103999ccc0c4cf048c80c64ee8fb9f1d9481ca7571ca3f08a2a3c2476ccc965bce8b205cf0f796ca4927b5c67d0365
+EBUILD djangocms-link-2.1.2.ebuild 742 SHA256 6e484942bd68016e45728609c3eb21d655d1dc89533dda0fd4df79b2d7d2dc34 SHA512 af0c1a3be6bf4740288ee34108e312cc5dc77ecb3d4b9ee41fb3603ac2e08bc3c341b553902d158675df36b2f8876465661177862adb34c4968bd14493ed36ac WHIRLPOOL 6bd1def1d362485a185c135b02b394b12ee606acc3b8e194452a2aa71babba3f39717db37e96c7172b14554c356ff7b1b4d4910d9917678e394fe86502d36e5c
+MISC ChangeLog 1747 SHA256 9f1103202430f62e72df042945fd19d044273b7ee2c15e810d1c7f0054493d45 SHA512 78060e8aa7e1b0a54aaaa7abe3ddb82f308772495872e3f5cf6c0488da0156757bfb4406d4d56c0a121dfa1212f697c3850621378296d5e6207eadd48b820bdc WHIRLPOOL 5f3a7d087789ce7aaaddee1f6a98890f076dc8aba2b51b7424f5a0ebaf29d9d566d64e3a1eb25f051acd3f68801d12c331718cba4738b4c521e35f03c6c07c54
+MISC metadata.xml 300 SHA256 39483a79e7092fc23349eb95157bf2d7f633f0364f6dc016f10d00d49be76384 SHA512 44629ac4f9ba23b9c90674bed6999c08aebc7469bb414527aa06bd84fd14c80c9cb7a5bc805fa32a165ea778b3fe8f3248ad508f42a4f0674152020635caaa53 WHIRLPOOL e8f82df91bdfbb3e46a4531cf40405d1b0822a8ae2c58e4c94af636450ffe3aba217ee59912c115afca0c50f380d7fd574ba38d737ffe7275529c5f4d8e9b732
diff --git a/dev-python/djangocms-link/djangocms-link-2.1.2.ebuild b/dev-python/djangocms-link/djangocms-link-2.1.2.ebuild
new file mode 100644
index 000000000000..2b67d8e4ac65
--- /dev/null
+++ b/dev-python/djangocms-link/djangocms-link-2.1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Link plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-link"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/djangocms-attributes-field-0.1.1[${PYTHON_USEDEP}]
+	dev-python/django-select2[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+PDEPEND=">=dev-python/django-cms-3.2.0[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
+	eapply_user
+}
diff --git a/dev-python/djangocms-link/metadata.xml b/dev-python/djangocms-link/metadata.xml
new file mode 100644
index 000000000000..ed2b593b2070
--- /dev/null
+++ b/dev-python/djangocms-link/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-link</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-picture/Manifest b/dev-python/djangocms-picture/Manifest
new file mode 100644
index 000000000000..00d1b9ed19e5
--- /dev/null
+++ b/dev-python/djangocms-picture/Manifest
@@ -0,0 +1,4 @@
+DIST djangocms-picture-2.0.5.tar.gz 32329 SHA256 8d890452dd2fdfbcc3d1601411deea6664b01ec870c2791d39d2b1d27db740c7 SHA512 df4ba02d06966d7cee38254baadea5eeb5197557cbda1e8a202e45420881b6216efcc49fa8a6e9f9af30507a93ee2f7110e14e5ae3a645b889c990dfaca3a499 WHIRLPOOL 228022352e3ec8486fcb2cce07130169586f5f92cdc2f7c2221f2fa5d798c72d85ea96a1ce728802b29643409091016e24a1851dcadd728672b0bf17c7b4be9e
+EBUILD djangocms-picture-2.0.5.ebuild 754 SHA256 2d35692f1e19193709e5d6865457ff00058bbc814b3a1a2f117bcfab854f84dc SHA512 3f0ff6cd0faad45bf069e194a7d4c70877ef1edda2077975351ff2e756ce12dbae77c94be26030a51e8be6b7094298ea7ea0a93f35e6be166b92f2baaec3309d WHIRLPOOL f3a8834f638318c15fbc4d7e030f9b3ec99556579943de259721c3623143b6a0ec95fea5fc4f5dbd8b94ae6014a72b81e975cf9681828b85a121a82a5e26973f
+MISC ChangeLog 2118 SHA256 6eeced405efdedc985bb2937144e20d53d67b691183d3c9404042c3d76ad0f5d SHA512 17c47e65d34d23999b333d2e7a2ae298365e35fc9751ddd052b48057c1022eab3e764fc068fdcdc990c6d1d390f09f78a212591aa89e1632c9a57f237d0fbd38 WHIRLPOOL 658aa9666b5bf45a6c1ee4c9befb2511493d26b7945e7496dab3e41055adba7c6ae1879f0777fbcefd78755ab87d3b4262001743f7a2db81a2753ec4a3f1c515
+MISC metadata.xml 303 SHA256 c2b1cd56f7f6ede0086894cad490df68631b7dde83bcc8979ead63dbd55505da SHA512 8f66c2172d20eaf54fd19875d994e8aa96ef22a83868ade0c53af4789cda3fb5058b12b24932d44120237e5cedafff9e626f4d3b875821fc48f845677879d81f WHIRLPOOL 078c2e4033af1012742fb907b7317337ae019f7d123b0f5e0b277005ae4c380494398f84245cbd90ce78d8fa282b12ab9f92d8967b156f0c8a4bf17bfe9b9e04
diff --git a/dev-python/djangocms-picture/djangocms-picture-2.0.5.ebuild b/dev-python/djangocms-picture/djangocms-picture-2.0.5.ebuild
new file mode 100644
index 000000000000..b6c4dbec8630
--- /dev/null
+++ b/dev-python/djangocms-picture/djangocms-picture-2.0.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Picture plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-picture"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/djangocms-attributes-field-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/django-filer-1.2.4[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+PDEPEND=">=dev-python/django-cms-3.2.0[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
+	eapply_user
+}
diff --git a/dev-python/djangocms-picture/metadata.xml b/dev-python/djangocms-picture/metadata.xml
new file mode 100644
index 000000000000..e76677692df2
--- /dev/null
+++ b/dev-python/djangocms-picture/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-picture</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-snippet/Manifest b/dev-python/djangocms-snippet/Manifest
new file mode 100644
index 000000000000..089627334497
--- /dev/null
+++ b/dev-python/djangocms-snippet/Manifest
@@ -0,0 +1,4 @@
+DIST djangocms-snippet-1.9.1.tar.gz 22643 SHA256 46f8dbf22341e1333b13fb0c36a8d937fdf625f2c785577c131d836567f8ca28 SHA512 0aba41e926e2220d94266958b255fe1a8b00cb1215bc7678aacd3ad96db8349a1b472c7e9b56eead3a722cd27b953d269717e6de7383c45b5511028dcff6b1bf WHIRLPOOL 08c3964ceb40e1f4916bae053459292f7b5dbb8151d1ed99c99b6dfac704030051b526d6fef7f080a89a5f241695149f7ceb920b19b18938707a146575c97328
+EBUILD djangocms-snippet-1.9.1.ebuild 579 SHA256 622d7da729a956dcf7ea9e09a263f4298076a1081f13f990813621aaa35f601e SHA512 a0b5b2e7da3f31001b864e890c6d33e6ed7f1ca69a8d9a5e695dadd9e467764272014e1a27083a4e7844586183f995044b4635329304deb181600f248e467143 WHIRLPOOL a01f8588b940733a00c3e55cd7ee05a3652e6ed349b8049810a82273efbafda5899b515f0f1ae3f1452dc77288dc9c3ce4ce6b04de139d7b820d829e50fea95d
+MISC ChangeLog 1553 SHA256 724709f7fcf142bd8854b0a717336b4f1b472f4c7983a830f44182999ff2fee5 SHA512 28f8b3aa5ca992b0ded0e3ba7f35093ac242409977fe4731fa9c68a99f6d7a69283b73d6fc9dc8fe657469e69405221998b0464dd6b6e1a70e964674e0fcf327 WHIRLPOOL 12d3d7abfcf640d8764e9d939107e193406648a5e3f94c3c3bdf2de96ab75ce87d2e26cd64e00cc57f581e06c723639e42870fc59d873e0c66b68823970b99c4
+MISC metadata.xml 303 SHA256 c242c22665598adc60220677628cf5a24152bd82a238fac3fde33a9471d56335 SHA512 dd9d727aa596ad273efe29c3c5ab4a70969ae5b1286399cfd1c21c6c8ecccd6e9679edac6357a3d25968a76dd44b17b20de6d181cf20225913c2c26cc6bba237 WHIRLPOOL 4a0b76e7f9ff8e25c25a23d94c477dec25a264d3805b25b79d61f0bb4bdbfbb367d4d1b3c94ecfa4262e9ae53897a34e1058b14f6276ac973d087dd26d43759c
diff --git a/dev-python/djangocms-snippet/djangocms-snippet-1.9.1.ebuild b/dev-python/djangocms-snippet/djangocms-snippet-1.9.1.ebuild
new file mode 100644
index 000000000000..dff18c961832
--- /dev/null
+++ b/dev-python/djangocms-snippet/djangocms-snippet-1.9.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Snippet plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-snippet"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
+	eapply_user
+}
diff --git a/dev-python/djangocms-snippet/metadata.xml b/dev-python/djangocms-snippet/metadata.xml
new file mode 100644
index 000000000000..81273ddbad3e
--- /dev/null
+++ b/dev-python/djangocms-snippet/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-snippet</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-teaser/Manifest b/dev-python/djangocms-teaser/Manifest
new file mode 100644
index 000000000000..ade9a7c29e99
--- /dev/null
+++ b/dev-python/djangocms-teaser/Manifest
@@ -0,0 +1,6 @@
+DIST djangocms-teaser-0.1.tar.gz 22600 SHA256 6d4bd695ac21a2cc53c6a3a01770cda75d808231ae411a6a86310b82a6b374d8 SHA512 5d313d9e6342da0d9148351ae55b60caf02fb26bff6ca459eb1e68072fbdf3d50ce67297e0644d84bd7615abc0ac1e9bc7e6d6a57e01487bd83e527d23a1f4cf WHIRLPOOL 4242ff072e1037244fff7d219e338135806eb39169377641cb0fd1cc6b60e39315ddcbb118a427c71af7e53eceb31e61731edbd9c35aaf16fad3c78de30732b2
+DIST djangocms-teaser-0.2.0.tar.gz 22315 SHA256 e4040ae64949e8297aa3653dff071ec61f2805b1744dac356b1ac0e7d31a8104 SHA512 4895b62048d00c87e57b2ffe8452fa7695bdaa7a37ba56dd952a645ed09b34866c05eb0f59dc2fb56c3cf6323f3f9218dcd934cb78a5a0141f4cfb403dbe1d8a WHIRLPOOL ed6772c31a90e96f43530ad88d91830a482d069b66d5115a9a8b1b769e54339199be44d2961768cd3104a52b89ad76b7162188deb2ace050c6129ad7e6113f16
+EBUILD djangocms-teaser-0.1.ebuild 458 SHA256 1ef9f24edf62a095670d08e1c337fe5dee1a03e68abf8fc862b69ac21a57dab9 SHA512 64c385e2a80636356314b28b495a1cfc5689f97edb87c21627156f6f4b5f6635db274e65e1893a4cd9b60460ef65f0657afca7c95ad5ba8a0b5f86e712338389 WHIRLPOOL 0ba6b7a7cc3066d77de6fdc4b911f312a78d0e1068321805ab6934db55dcaa79201bee20e3ad0e3afaa6d36611d214d17c0f100fd8db96b39eabcef27eea64cf
+EBUILD djangocms-teaser-0.2.0.ebuild 470 SHA256 17d7e05353aa5b434aee7748800c8686addd6c93b9f6903d49ca207fc35a3b1b SHA512 d64046da455184d8f88ab3bc5ec3197763d13c15888c42eeeb5126b93bbeb4827cfb775bf3fb01e74fb654a1619928596b75c4b1200ab84d53425ee39bc09dd8 WHIRLPOOL f831062210cd734ad70029c5c2fcd8815934da347b547d27914952b73a58c91625c82de2c35b8d6bd502b764b17560caace0475f43cb0b44cb128cafef30a749
+MISC ChangeLog 1333 SHA256 b2efaa9963e72f8cf08cc8b1b42218f8b6852872e43765b155f528c57f522d7b SHA512 00a758eb5a4e8bda3889bdce78ca19623ecfee43982a8f65dcf4e56510bdc171e28a1f6115c4ff0ea16511ebe67fa66a5f05c105a8d79014d5e3e1dd4fd00bc0 WHIRLPOOL 9198e16315376876b36ea6cc19f52c656fe367c6c6b6707efd643ec90c8bc19dd878b821c826fb920e31eec4b275c22c34d31a77196c4eb1b73b9fbfd21720cf
+MISC metadata.xml 302 SHA256 5066e11d96b5e87f609f21087dea7c6db7a263e16a82e566242d8294ce3fee6b SHA512 5757ade4a981eb73b8ee1ec407e55247d02273d18d65b64816c6815b36d8253014c97eabf327fb3fd26f677d83a9f96e70a98980cc9a27d8729ee948f83ebea0 WHIRLPOOL ef7d04b4ced7e692c1d593d6725fed3bb1a4950cec618d7742ba9f4b42ac50377d767c2ce95851bcd69e1af99d0603e88791671f56d721869082a3f6a93d4ac3
diff --git a/dev-python/djangocms-teaser/djangocms-teaser-0.1.ebuild b/dev-python/djangocms-teaser/djangocms-teaser-0.1.ebuild
new file mode 100644
index 000000000000..bacf7ac9e299
--- /dev/null
+++ b/dev-python/djangocms-teaser/djangocms-teaser-0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Teaser plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-teaser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/djangocms-teaser/djangocms-teaser-0.2.0.ebuild b/dev-python/djangocms-teaser/djangocms-teaser-0.2.0.ebuild
new file mode 100644
index 000000000000..a68702a525ad
--- /dev/null
+++ b/dev-python/djangocms-teaser/djangocms-teaser-0.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Teaser plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-teaser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/djangocms-teaser/metadata.xml b/dev-python/djangocms-teaser/metadata.xml
new file mode 100644
index 000000000000..a134c380d3f7
--- /dev/null
+++ b/dev-python/djangocms-teaser/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-teaser</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-text-ckeditor/Manifest b/dev-python/djangocms-text-ckeditor/Manifest
new file mode 100644
index 000000000000..6de6e313cb58
--- /dev/null
+++ b/dev-python/djangocms-text-ckeditor/Manifest
@@ -0,0 +1,6 @@
+DIST djangocms-text-ckeditor-3.3.1.tar.gz 1611710 SHA256 6c7bb0332734784afc5cfb75d63fb41c857dae567e9bcd5de71827633c1a3dc7 SHA512 eeadaf5b302669104c054112bfbb0aaa1113e8105202407fc5b39558a83914895576a2610536a2066042ec69eaa812ea9a772091420379cdf96c53464080589a WHIRLPOOL 93ac94bb83bd81deb6cfdbcac80999541c097d6248bf59f720ad415d0d4cbf016f6b4f4422064c86444e35a5b93070394f0c85b37ae9d4225827cd7b13b4b496
+DIST djangocms-text-ckeditor-3.5.0.tar.gz 1903581 SHA256 e6d29ec5c41a8ee73c611f3724ab0419da8dfac3d4508694484acb28f5613b53 SHA512 d861c0a41ea4d0fac7130433961473cd435549a167362b61e644c00bb3c4241847cce503abccef6f1bd2f83451f93a478c44dcd586104ce21559a91d4eb36435 WHIRLPOOL b3e688c9d198cbb6906abf6faebe9d57a7a9a8ce92726e6ee750273a5b0e29cc2ccbc28687362166c3d79888eeb90251eb2ccb05ea3ec825a397a4b784f37213
+EBUILD djangocms-text-ckeditor-3.3.1.ebuild 659 SHA256 26d9b838bc0d74511db5a9b6472d9ed86bd1df99c378bf62ece328a4020d6a10 SHA512 7fda3308c1c52299cdb7560b92672ee31640126b4d268799172c4ec2066c33eee592e0228cdbf656874ee825ab4c3c2cd6d1d76ca369e318723531b021b40aa2 WHIRLPOOL 57ced45d6889ef9404099e44051ad33928761deed110d8e57415316493a14424a3b1e7baeb7f6918eeddbbef8fff4db0de32d7842bf48d0f85d0036d42fc21ba
+EBUILD djangocms-text-ckeditor-3.5.0.ebuild 663 SHA256 d33532cc307f80b047256b504c335b5346b8452ccaa293ffec355fa677d7cc14 SHA512 3cc37e1997618af0e319c26f246c4fad26e2925131020bf8fd2ab62359c3e5c66b42ae1d38811abb4d7bd4d76de8837deadaa291e2a9213fcffed2ab66b93ef8 WHIRLPOOL 389683ea314ce80679e19451ddeda4d1aa515fbcdb63655c6fbb21184b229108d5e176f9ac8c4da9c95836439169151f2059bddb845c6d50d2405d95440e02f1
+MISC ChangeLog 2249 SHA256 7c2380c25b34c1f7145a7130de2fbbb8ab39e264f1082caf3442fe9f8d67b46f SHA512 ac37eb727ff0aa7059b1056bbbe512de75027ff2a31172b182ee5d5f50968c3c11058730192f9f7771a5959f6949bdaca174ad6b640cc97e796d7d0f8cd3b544 WHIRLPOOL 9e86585458a46c25c4448cd115241f0796f1ed028d075dd57d2c01e724f73a310eb4ce8f2c30dcbca86388f4e1bacffa8eece11c0d7a875682c9b86f8c66f1b4
+MISC metadata.xml 309 SHA256 a3129200cbc37c16ff10e087c64b2f0963c4c03437fe2a00193051638765a78d SHA512 feb5455bd3d41bc7f006e28005937c446a4a24f36a49c83a420971aae49fcf4dec63cca8258b6336ca545f5b3374a09453c6cd7eac1ef9547e9c063badcdc3fa WHIRLPOOL 7f5c0e7e3a870866c711dd5862c8549f745093f5dca8d24f148c8179a98b78fc181cae18b598307267141f6606fbb75cbad5e0f0cee8d1062ae1cfedcdb4e35c
diff --git a/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.3.1.ebuild b/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.3.1.ebuild
new file mode 100644
index 000000000000..402cb27c0aa4
--- /dev/null
+++ b/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.3.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Text Plugin for django CMS with CKEditor support"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-text-ckeditor/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+PDEPEND=">=dev-python/django-cms-3.2.0[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
+	eapply_user
+}
diff --git a/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.5.0.ebuild b/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.5.0.ebuild
new file mode 100644
index 000000000000..657b69467bc4
--- /dev/null
+++ b/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Text Plugin for django CMS with CKEditor support"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-text-ckeditor/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+PDEPEND=">=dev-python/django-cms-3.2.0[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
+	eapply_user
+}
diff --git a/dev-python/djangocms-text-ckeditor/metadata.xml b/dev-python/djangocms-text-ckeditor/metadata.xml
new file mode 100644
index 000000000000..0f0287d3e83c
--- /dev/null
+++ b/dev-python/djangocms-text-ckeditor/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-text-ckeditor</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/djangocms-video/Manifest b/dev-python/djangocms-video/Manifest
new file mode 100644
index 000000000000..75a1d06ede8f
--- /dev/null
+++ b/dev-python/djangocms-video/Manifest
@@ -0,0 +1,4 @@
+DIST djangocms-video-2.0.2.tar.gz 25416 SHA256 0bb08bbf067bffc227cd4349e9b67d52dccaf8d4397fcf96a08b68a577a0ca68 SHA512 d2ab6196a02c41f0995c5b4898f357dda215f7307675fe622b90c58cc14f0e3a8fe5a6e8da1df073bd9426d1186ba5f68de747797ac9b66ef98a32d46ba567e0 WHIRLPOOL 9035014d2d8608696badcead78837deac674f1d18c27ecf9c18ef717bf4eb42c768148e34d0657d10c63791a1fbe269c38f317aa14f3798e711b0c7857119b97
+EBUILD djangocms-video-2.0.2.ebuild 754 SHA256 a0e4c1a4486bbdfeff9239b7bb978ecd80e0dbda78ffea7b41cbac6b8c911e36 SHA512 ba998c881914c3c9881fd83b5e53eb4e02fe28e41a3ff1faf1cd44eb4a52b50f50f53ecf56d6ec41c27a6b4f4ba7821b148ac24eb3dbddaa52556552319bc779 WHIRLPOOL 05d7d42dc277184a7fa121be42e478aba04e1b301488109e75a25b435947cdbfbbf6e1c62fb8ecf06f309a5de9fd9a9f99fb92f38850e7a117351f4054ebb648
+MISC ChangeLog 1769 SHA256 1e01993af5b3ccd93ddf6044a7978105b7eb40bedc1aa221923f4bd31f7ea415 SHA512 6d89580f3e2dd9fe9441c361605ef1a0e89d2fab786fc16909fbf88f5c29d9ad10eda0d036b6c95c6e19eefed7a0513c47085544075e2593bb50a84949fff2b3 WHIRLPOOL e15027091a995c1ff35dd599239980ec0727c67cc6ceac0d4f4ec7df8f69f696be312bbe9c84f64f18594f8a5a97e1ae836d6c92bab13e8e62b0514d3fd02bb8
+MISC metadata.xml 301 SHA256 b5d9c4200b66388c8a0a02f49d19a76dcfab281e0c29471427c7e02dec48be14 SHA512 8d754aa30f488327636f75e8df23fd094789440f0338ecb01bd8c2f75b62ff58b1d5aa91a3da1c1e145e48dda4bf27e3b2e7d403b629260847fbd9516707a85c WHIRLPOOL 518336b386f61f3a1bc2396c290aab2150641b29211f3fbfdbb677ea154441b88832b75beae58ea8ed51f8c6fca54710cdcee0ed819d406ed01f7db32b9f740e
diff --git a/dev-python/djangocms-video/djangocms-video-2.0.2.ebuild b/dev-python/djangocms-video/djangocms-video-2.0.2.ebuild
new file mode 100644
index 000000000000..684a277c492a
--- /dev/null
+++ b/dev-python/djangocms-video/djangocms-video-2.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Video plugin for django CMS"
+HOMEPAGE="https://pypi.python.org/pypi/djangocms-video"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/djangocms-attributes-field-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/django-filer-1.2.4[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+PDEPEND=">=dev-python/django-cms-3.2.0[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
+	eapply_user
+}
diff --git a/dev-python/djangocms-video/metadata.xml b/dev-python/djangocms-video/metadata.xml
new file mode 100644
index 000000000000..bd362f2511ef
--- /dev/null
+++ b/dev-python/djangocms-video/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">djangocms-video</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/dnslib/Manifest b/dev-python/dnslib/Manifest
new file mode 100644
index 000000000000..2bf79a524e04
--- /dev/null
+++ b/dev-python/dnslib/Manifest
@@ -0,0 +1,4 @@
+DIST dnslib-0.9.6.tar.gz 60079 SHA256 6ba31ae2014644901a301727cc4e22844eb19295a959c362568f08aee9b3bfa8 SHA512 c733803a9b25356c82afb4ce853a681545aebdb5fbd4f8a544eea9bb61ff354acc044a43357435e02b8b787a17fec99ea7e9f01b1c1e93a2e39945657c495105 WHIRLPOOL e8ac5e7b97263e5a56ec47683052a2d00d4e340548f1d2241793d65738021ed4e6e2ac79907dc6f1bc9754bfaf0425d0dd22443cc152a20322cd1972c731413b
+EBUILD dnslib-0.9.6.ebuild 454 SHA256 6e7a5d78bed14669e4cef0b0d1da851a9cba76dfc8371af81aca922b59ee0342 SHA512 3fb409bf711c9096a2ad46c27f46822ec06d16c925bb337b17c6536f789610a73105c6cfae4fc395f6df2e830230ac963d9ddafc08c498254f9dbced746aa705 WHIRLPOOL 40ea87950fb2d33e894575c39e2bf9aabf4d4cd7604eec3801067bfed0cc68b9e88cd2066e78598784ec551675f8887458328d33ac106574f988381df4e3af7b
+MISC ChangeLog 509 SHA256 d4a8e403154b1fa39e5b9169ce52c95159ccc8cbaf37826a44b209f473d4a7a5 SHA512 2a3ca4461445d62382d0564429c2b9a6f94f253c68bf27cb13224cc686b202b1ec1b61dbeb147a604d2fb832076fb7ee25a7813cdd214c9ba65f97f2527dc5d9 WHIRLPOOL 73fca17713a9972fb68ad527011ef231371ddbddc95af43716e673c761515f6d961ea25cbd11335c5263e080776717a87e0efe860d52f0e2a61194963a896194
+MISC metadata.xml 330 SHA256 c0e54845fd8cd309884888383a9e5fc7048ef025529e68d23ae67bda733e7dcc SHA512 a3d016fa988a8e573fb13dc86ba726c2ccae234c23dac767166064f83f49da7ccd9bc1313753efdcd02d4bf1816c98483396e21addc1c5e9846045d59d420b50 WHIRLPOOL 628219ea91a6b5432237744a79a4294723c25ad2e9162a062ce25e998b19a3902f2aebf29eb9d508077624ee9b4dc531911402b31318f43e1b85f9d4b4499b10
diff --git a/dev-python/dnslib/dnslib-0.9.6.ebuild b/dev-python/dnslib/dnslib-0.9.6.ebuild
new file mode 100644
index 000000000000..de32ef40cb52
--- /dev/null
+++ b/dev-python/dnslib/dnslib-0.9.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple library to encode/decode DNS wire-format packets"
+HOMEPAGE="https://pypi.python.org/pypi/dnslib/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/dnslib/metadata.xml b/dev-python/dnslib/metadata.xml
new file mode 100644
index 000000000000..cbdef2ff5ef8
--- /dev/null
+++ b/dev-python/dnslib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>klausman@gentoo.org</email>
+    <name>Tobias Klausmann</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">dnslib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
new file mode 100644
index 000000000000..2948a917d168
--- /dev/null
+++ b/dev-python/dnspython/Manifest
@@ -0,0 +1,9 @@
+DIST dnspython-1.12.0.tar.gz 135164 SHA256 03fb82af866001c4afa58c48027bcc4b80bbf0a7f27e1d861cf06393eea4724f SHA512 583d069ed7ee9b20f16a964023fa0300f15032c27de6d084205f73394f19a2d5bb1641ef95b08a8ddf1f622eeb5fa8cbfa62b8a2ee478a49b0dff0995e4ae42e WHIRLPOOL abf515aad901b0c752a0f133c293654f60750522cee69985126547602f321f6577e135077cbfa330a30fbc838b125af30b75cbb4f8fdd60d1444b0bd2446bb39
+DIST dnspython-1.15.0.zip 252157 SHA256 40f563e1f7a7b80dc5a4e76ad75c23da53d62f1e15e6e517293b04e1f84ead7c SHA512 942f7cf083d1b0a9f03f040ceca194c38777f2e40862c388051986112b3f2a4a8426733ff46ec5a155319776e4a856412c3430b052b2f92f251f0e3260eb9bc1 WHIRLPOOL 83c43d0a53c514d91c096a3f7a761f47583ffb79dde9c233fd063f5b556287671d6012267239c1271696cf2b5e8965525b6612721781749bcdabb484f0dc5d5f
+DIST dnspython3-1.12.0.zip 226945 SHA256 e9630946207864c7a780798809cd2ec9c6bbde6ac88b97a2fda66f018eec1c8d SHA512 02c61eb91c2e872f2c8fa0e09b88d593a067130b5ac3ea6eabd0abec413ecb6d3b7d5472ca502334f4c441af249511109006ae6a7b41d36ba1db3e777971b3ae WHIRLPOOL d3624f8545c607441931dcc71a1e43c83df6e1bd938222d52c8d798b342c4faf15f200bf1da7ea1fd59d2fe96e82644b22c8815764bf7d6304573deee6261f5a
+EBUILD dnspython-1.12.0-r200.ebuild 929 SHA256 fb49aff7daaa28d6c449aeaefec6932f6ac0a74829781bf39d5c67b227aba7fc SHA512 6e1dfa45457da3a4a0876b8756f9454b9944be41dcce64ee0a0c699399010dcf7f5683083753c160caf74cf5fba0bd929552c471d6e45cf4f9b35bad60a6a92e WHIRLPOOL 0143a72d2c65571d85f096c5b47811786ffddd45b3640469dcc8ce9af52f498cd43d2e6359905f99678dee09c0123f958441818953d300dd45f2476c57fa51ac
+EBUILD dnspython-1.12.0-r301.ebuild 998 SHA256 680d3afc482772c4289b2ee963d96639ba1afed1e220c7ee89a1db6a269ac324 SHA512 5fadff98f9dcb3f690aa3d32b9a3f8402c7c42cb3806de4fa7bed39f8b895eb9aeabd0f44110147ef11e9f64601ec27bb2ab76aa6dc37287fdf5b4a9de935345 WHIRLPOOL 1c6369048c6bc20a75591be9782b54a195c9bb5614a454881879bfb7ef39461535846a0bc56aeb1a4c17d6210ca0e72c73796f07241e6a6a5b09b602655d981f
+EBUILD dnspython-1.15.0-r1.ebuild 1038 SHA256 0b412b32c24d7250e96415d87d0876cc901ba5b4a0bce7465e0bd73f9697386e SHA512 83b4c3118a567e7ae6cbdb67184312688cf0443c15e8af0575d19d604c59a760d7ddedd42e4a9ff81918dd4224b03a88982705679951f0d37839518f7a571e2b WHIRLPOOL 919de77384a75d282267b53fa6ad9e09db0201b3e9283489d56848d1f9074e764590dc3158db0c11813e6cb85d1f9a28c684af0a6898bb410900d5321b9eaeae
+MISC ChangeLog 5394 SHA256 f76353c4c7ab001209457c5fdc3d8c4b615fe952082c23ce4c9500fb765a5ba4 SHA512 6cb51329d5601aec08dc47f9bccebace9854c7ced7469182a20f3404888d259b06aa09ff4a1f06e6cac2d81de61fe1e11fea48423f604b81a6dac63e19d0d92e WHIRLPOOL a50a3058e0f99b8cd4de91bd30c14482433aa44ae04906472ac7fa4308c31b166c8240b37f4a34ad24503b0691e8a1b73dbf61146c6796b994966b03438923c9
+MISC ChangeLog-2015 11694 SHA256 3336de698a80b9819808683f34601571a8ad52e3df383ed8fe9e8a892b67a0cb SHA512 bde1584c98c197127441cbaf37ffb94bbd413912bde355f0044d60e83406abb3c9cc54a15ed98f333d93476eecf49a67d8cc082fe168678b299b4ae31dbbeb56 WHIRLPOOL 5281827ffcfffc1f3bac2ea0307788de30d5712cd86c8796e2c416de7cf263776bca71d79c0e86a4f052a5343c92bb66c528a032f85ea296a0bbb44cbf711721
+MISC metadata.xml 1458 SHA256 7f6f176564e4dd1d329017864db78405e3ab97c4ad619af46ab820c2305bbece SHA512 40c86234936ba4f0c01a98266e74d49a80a8a48d4761b887ec84fe3ff9b534e7b6daf3c317d299b1333132a6025e49abf63884e7d6d0634c876dc74b470e0a7d WHIRLPOOL 1dfbe82a19e8a7dff22437d9bff8ed85d36083ac7bc515fe756efedfeb822a68b5c87302a96b889b55a7d5915d03e1673bd82e1a11ec0111d304b3ae14069019
diff --git a/dev-python/dnspython/dnspython-1.12.0-r200.ebuild b/dev-python/dnspython/dnspython-1.12.0-r200.ebuild
new file mode 100644
index 000000000000..2e61d8d91ba7
--- /dev/null
+++ b/dev-python/dnspython/dnspython-1.12.0-r200.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="DNS toolkit for Python"
+HOMEPAGE="http://www.dnspython.org/ https://pypi.python.org/pypi/dnspython"
+SRC_URI="http://www.dnspython.org/kits/${PV}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="py2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="examples test"
+
+RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
+	!dev-python/dnspython:0"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+# For testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	cd tests || die
+	"${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
+	einfo "Testsuite passed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dnspython/dnspython-1.12.0-r301.ebuild b/dev-python/dnspython/dnspython-1.12.0-r301.ebuild
new file mode 100644
index 000000000000..a327618e6d53
--- /dev/null
+++ b/dev-python/dnspython/dnspython-1.12.0-r301.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="${PN}3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="DNS toolkit for Python"
+HOMEPAGE="http://www.dnspython.org/ https://pypi.python.org/pypi/dnspython"
+SRC_URI="http://www.dnspython.org/kits3/${PV}/${MY_P}.zip"
+
+LICENSE="ISC"
+SLOT="py3"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="examples test"
+
+RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
+	!dev-python/dnspython:0"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+# For testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	cd tests || die
+	"${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
+	einfo "Testsuite passed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dnspython/dnspython-1.15.0-r1.ebuild b/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
new file mode 100644
index 000000000000..7476d250c25f
--- /dev/null
+++ b/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="DNS toolkit for Python"
+HOMEPAGE="http://www.dnspython.org/ https://pypi.python.org/pypi/dnspython"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="examples test"
+
+RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
+	!dev-python/dnspython:py2
+	!dev-python/dnspython:py3"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	app-arch/unzip"
+
+# For testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	cd tests || die
+	"${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
+	einfo "Testsuite passed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/dnspython/metadata.xml b/dev-python/dnspython/metadata.xml
new file mode 100644
index 000000000000..e990a706f75a
--- /dev/null
+++ b/dev-python/dnspython/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+dnspython is a DNS toolkit for Python. It supports almost all of the record
+types. It can be used for queries, zone transfers, and dynamic updates. It
+supports TSIG authenticated messages and EDNS0.  dnspython provides both high
+and low level access to DNS. The high level classes perform queries for data
+of a given name, type, and class, and return an answer set. The low level
+classes allow direct manipulation of DNS zones, messages, names, and records.
+	</longdescription>
+	<longdescription lang="ja">
+DNSPython�Python言語用�DNSツールキット��。��ん��レコード・タイプをサ�ー
+ト���。クエリー�ゾーン・トランスファー�ダイナミック・アップデート�����
+。TSTGメッセージ�証�EDNS0をサ�ート���。DNSPython�高水準��アクセス�低水
+準��アクセス�両方を�供���。高水準���ーム�タイプ�クラス�クエリーを行
+����戻り値を使���。低水準�ゾーン�メッセージ��ーム�レコードを直接�作
+���。
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">dnspython</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest
new file mode 100644
index 000000000000..ca4dcf28abbc
--- /dev/null
+++ b/dev-python/doc8/Manifest
@@ -0,0 +1,4 @@
+DIST doc8-0.6.0.tar.gz 21547 SHA256 42ccb69e9240546afec6cdae00b134592942b8b135d7017a748fd5af41e2d590 SHA512 1858334d3a0247d4d30c311bd7f13be66a6cdb6131f9d24dc10e38efaed6e08c8c7d11b776ff5dac7d6ae5eeb1cb7ef03523bc3e244794625a8ac1346cc05d75 WHIRLPOOL 4f5ad6df20c70d358af8b14bfbe6f11c24da8c8b38b59d4b4af60ab319037e0a30a2997f114191d10365b071adc216cc26a500e9ccf911b84165ba5582c75ab4
+EBUILD doc8-0.6.0.ebuild 877 SHA256 5f880ea4658600c2cdbfe9f78a747423ef7843ecd2fe77f2480676c6eb9e1477 SHA512 eb523b4a582a02093faa4cd18091c178de6d8733ae5b400f6cd72a995f6d1b8f8d4df79e673e3ca82242f734314d5a5eb6a507dcfca597f3ec7a045679d7a987 WHIRLPOOL bc21c257216c92231f0d4b6bb6ef28bea6d8dba4e26501b2abd80da8d552be11339553c47de9f7bf4b777732f39f0189a4ef3b938fd45129b00a084b2f3149a1
+MISC ChangeLog 1586 SHA256 5e481f23eb2cc240fe504cd09be5119633944b2b0d20f8c17573d714d6d62d26 SHA512 1b283b9c24b6f8ffed587cb2b9f4d30f1126bd8f783046e37a82cf4e3efe9d65325d8801a5d870ee43d9adfeec76d371786d78acdf247af7cd6c237edfbf3709 WHIRLPOOL 4e8f36c1a07de8fc480ab2bc4adde3ec51557b1d18fd3ee4342e6cb2b68fb175bd2a453924335bb2875de676ebe77d321eea4dd8fb115bcfbf42cc9b72b25db5
+MISC metadata.xml 321 SHA256 6c13961c21cc22822ead2cfe664c8ff12e1b45e000a8234400d81bb3af75606b SHA512 ada3a7f942be7daceb700085466dfb812b457c8d1af21047cf359786e8d9d6f122b84481bfd5c05f3d07f02ced2e1b91b9edf079bc0c0655097e3884862ebfcb WHIRLPOOL f8def6ada1facc89627da7025a27df099db5cd9d4b4c09358529a1988e6391d0488b5b2b775d6f3dc28d9322e159e7a2ca01c311f24a65de9cc8b58d0be5abd8
diff --git a/dev-python/doc8/doc8-0.6.0.ebuild b/dev-python/doc8/doc8-0.6.0.ebuild
new file mode 100644
index 000000000000..654a966868e0
--- /dev/null
+++ b/dev-python/doc8/doc8-0.6.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Style checker for Sphinx (or other) RST documentation"
+HOMEPAGE="http://git.openstack.org/cgit/stackforge/doc8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	>=dev-python/restructuredtext-lint-0.7[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^argparse/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/doc8/metadata.xml b/dev-python/doc8/metadata.xml
new file mode 100644
index 000000000000..3fbfacff9690
--- /dev/null
+++ b/dev-python/doc8/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">doc8</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
new file mode 100644
index 000000000000..3755c6a1d099
--- /dev/null
+++ b/dev-python/docker-py/Manifest
@@ -0,0 +1,15 @@
+DIST docker-py-1.10.6.tar.gz 122462 SHA256 dd1aa55dbe507538318e51e5303077d146d5176abd6b05fe9bcde24c289410bc SHA512 6360f9743472c42b3b080204195a0ba62ec85503cc3d4053dca1fb68e8dbed54bd90ed530d9b6ed0b29367aecbe3731d076c89e8d49365c133754bc38c3f15b9 WHIRLPOOL 3f42a0e597e63d0b821c1887b680b2faa8f696b65aa0851acaf00ccbc3ed2b271b1bbcc5390b99f6402b56f6a1a116fe76bf6a5f542b8beb9f8213e81df18f08
+DIST docker-py-1.2.2.tar.gz 69685 SHA256 85284a5b1a965e01a5d0a91f9f639ad5069143a276c123198fdafc3659280b38 SHA512 bf00b19e0ab56e5c0e8459234d09722ca504ecd933bfba61cb4ab4805410f53f6ad6083f2e964ef5a6eded2ea05aa01a89c27621064386bae145c7258ed996ad WHIRLPOOL bd7ff4579f924e02d18581b1aca00790dcb84afda03e4cde70b349bfdb4ad43aa2e06da2bcbe780f6074d98f9af9b14fb9d2ab4da9265e56b73288902c9ede7a
+DIST docker-py-2.2.1.tar.gz 174907 SHA256 b84cda631daeaad532143b439af0235923647ed30da5fc4427e6929a637af122 SHA512 9eda776d0055587e68a8933969d0b540c6439dd26fe4dfc13ee50c46ccf55294c130d625f235a74bb48bc58aff93e0371b79cfeb971588e9f7d745a3b6930dc5 WHIRLPOOL 3e0b80cd2af690ed47010bd6cdc68b01b6e4e0d294f49326e3e51d6ab38c0d0fd159fea3d1e44b1f8ab31f591b33c136064b68aa471dadd66a693105bba55a1a
+DIST docker-py-2.3.0.tar.gz 177920 SHA256 56ca8acbe7f7e9cffbfc8e1a2a256ec0fbe322130b1d1ba432865c707fc9f33f SHA512 61800bfb9377abb6d59cf394902f98f51b374b3752e6c151b801d014090801559b6bb64e1da9081a2516076bbc41a47987013a1e98fa37771cf5e97f26f2737d WHIRLPOOL b5e0d89dc70b2944dbfb1cba7c324c80c0655276c5ad27e4c5590170481201248934c99f044473648dd81d4ae866ed267704b33778c9a4d5a69bcadd3acaf378
+DIST docker-py-2.4.2.tar.gz 180890 SHA256 53f72ae0c3329f48b2301eb64bc63ca0da2cdc9e8e24c87a76dab91da713ca2c SHA512 3367066b2acd96b85bef28aef00c91d752dc25b3055575b4f2f9c0b981eb4bca81a742bc6da5f97cf039cd9c7d818e3f80101997fe3a2e2c6f3a9c42fd3111c2 WHIRLPOOL f32495086c5b3a67bec365033d54b52ed77b156ec262239b10c5115e88e84be1bdd25562df9e04f93c18dbab68c378ef58e17d321ea54a2a0f8472381266b976
+DIST docker-py-2.5.1.tar.gz 183413 SHA256 136338dbe7b9d8d1c24a6f968f43566e23b79ce1dfbcd33c6a201985b702c4e0 SHA512 5862589fbb831c6960ce5e6d256c716b64c2ad28d9c3542fd290f80b0deeac3a4985a96f3a9e04f55b184b03498900d8d520085cbda223b54480db4bbf977d1e WHIRLPOOL 52a0338c4df311cc1d01194f2f50fb02fa6aba8dc818f1caffffbd0fe686a2e8ac8b0646c93d7ad5911129b24ade3fb3847eea3609b9aef188e7601596e6fe34
+EBUILD docker-py-1.10.6.ebuild 1431 SHA256 fcf0e900da089e0fa97a9223ff58e0ead3a59cf680f7a09000fa7e0cc88f15a7 SHA512 8e508e96b1271d3ef7f13870d0c1bc4fff322125cbc05ece6c5bf83726f636b102b0d73d5dca17e4cb1b1eef79e3a31848f7f6bc737f4b468302f56f059d6346 WHIRLPOOL 0bd697c409c99b1befe623950fcac1ac0263b2b67d93ff47d4efb5f6306d49916a4f9a4043a497a4be5601f6a9e00437c4e9e6b330278181c756892deb376580
+EBUILD docker-py-1.2.2.ebuild 1044 SHA256 54ce3bde579c56c76cc80cf2471549ddec2bfb39d2eaed8825bd0bb6db6dd40f SHA512 ed995a7481c4ca7558b6aa7b023b5b07b794f5db524ee6c440c605610db4b5ef26a97c1526f6a9af8ad729a2299bc8a7198ce3561d1af88a36ce25e452f16dd4 WHIRLPOOL aee0d022a1cffded10101b2c44617ab7ff26d33dae16d24c277b9afd0aca5f4eba24384f480618e00aca1e1c7b92e9e0bccdaafef234b83eed1db8785ea1ed9e
+EBUILD docker-py-2.2.1.ebuild 1526 SHA256 0901fbd6a7470a0a1441bd467e3e0eaebfc6a1e33a772a5b4c85a975b7edc5d7 SHA512 3d613687822437c99a3252bd0a5717e61175660378af8a56ce6996741af5767c09b16afae8174b106bcbeabd5bf8ecbacebf182fad4457fec9f889e3d9d5ea60 WHIRLPOOL 76667d5ef999a2850f2e07fa91b3e023b5a12c4533a864dd372d8da595378e0e3f4b431577ccda953bc9ce02245adb82b7d7b5d7c3641c518743634258a20e63
+EBUILD docker-py-2.3.0.ebuild 1527 SHA256 92ad3af090c55e6a5a233278add313ebf4cff2f517807de2ba1147a94deb639f SHA512 de9dd2a1aebb1938ed1914dd7087a3c23eef92e3e9eb572edd581400d5f0a8123162ce63575070c8fb5ea8feb80cfb58a555725e95cb3a1b8716c135c1aec38d WHIRLPOOL 00f67f0d99d2efde216b968f7f46b964161dce4adb857122036d07aa53a53b453cd7a80195bb17aa072b6c43895a0026e3e6499561210387a254fbb9c3604644
+EBUILD docker-py-2.4.2.ebuild 1585 SHA256 60d403023461cd28c224bc786781864746d938c39ca6fd8d6c12dd5ba42b082d SHA512 c9b91f286226af040062ec2be6d30e2960460b3fcf7d06ab0ce38d6364166477b638d29a3fdbf6f99ccd8085627c7fab318689d74b378c9b6acf45c9bf9071a7 WHIRLPOOL 17d809eb7f0d4797cd770c9a5a8dec5a095915f0e3fb5698eb22014ca028f27092f09381585e398f6d6a39ae96d693bf2c2208893b86655bbbfc8e7775656637
+EBUILD docker-py-2.5.1.ebuild 1587 SHA256 7a9d032df51e31130cfdab41c6e746dcbbfddbdb3ecdca129bc27b9da319cf94 SHA512 ab178c7cbb9b5266da850c3ea3617bd42e745bbbeda7be70d116ca4c459263b7e38802f30f161eb0e701a5149ab5009dc8f968189f3c23b8b56f8d1e60141175 WHIRLPOOL 5ba6abfb92c3794281fc09a99a9c6084c814aad39a0de6ee997087575d11a2bebafee0ac314eaccd672c1f0417288dc744f1951cb982a9bde1c7214ac4cfb81a
+MISC ChangeLog 8132 SHA256 3555bd18e5edce1bff98dc5c88d70f307bb43d2ec66435a6cd075b801d223d55 SHA512 14de0270d6d1026a905bb2d0c885d9bbc50493a8ec06740416c6062998cc8b09ac299548b7f826fcbc0fee751bcc024b4eb06446afe56b4f58b9a48d9bedde06 WHIRLPOOL 153c688188e10ca5db74f1ba3f2bd27eed57821b25e63afc8fd0317d82d7379810efb2d262ad1a4da55d5e9180c23d2ac09578b9a677c45cdea40fcffb070569
+MISC ChangeLog-2015 4931 SHA256 bb731371f5f8ff069b2d9288af740c946b96e808c6d886195594c75630002789 SHA512 0f3f52ec356ee461622bf9d1dde2ecfb636670f3905ae3d065b225be16d0912772c3fbe1adb6774dceacbfac8d31a14d14dfdf130aafc64e2105f1de2e070fc8 WHIRLPOOL b1614d7bbd5572b94d73ae05e2058b7b629223b214541792b2c5c76967a8cc8b534159aa6243a79d1e8fbf014e4748201e74a6fa06d4bbd8d201f636691df988
+MISC metadata.xml 403 SHA256 0410b5390159fa509e847e16878de2588f109c22a22df1650d50b28cfbca597f SHA512 3673893aec6cf4535b06c61808862507413fe2715c55da76ff408ac5f8ebc3ed304848190e1542c779ad02f5fff3ca48ff8449dcf254a7b547a00187da053af9 WHIRLPOOL 725155b52cc47d22d95412895e46dcb0d5e4acad30b50d4295761ad1eadbdc9846832df36a93c471cd8f36ccac9851565acb03fa72991857904ca1abaa8a5571
diff --git a/dev-python/docker-py/docker-py-1.10.6.ebuild b/dev-python/docker-py/docker-py-1.10.6.ebuild
new file mode 100644
index 000000000000..33df70bd9573
--- /dev/null
+++ b/dev-python/docker-py/docker-py-1.10.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] )
+	test? (
+		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		~dev-python/pytest-2.7.2[${PYTHON_USEDEP}]
+		~dev-python/pytest-cov-2.1.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/docker-pycreds-0.2.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.11.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+"
+
+python_compile_all() {
+	if use doc; then
+		mkdocs build -d 'mkdocs_site' || die "docs failed to build"
+	fi
+}
+
+python_test() {
+	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( mkdocs_site/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/docker-py/docker-py-1.2.2.ebuild b/dev-python/docker-py/docker-py-1.2.2.ebuild
new file mode 100644
index 000000000000..e86d866ffb3f
--- /dev/null
+++ b/dev-python/docker-py/docker-py-1.2.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/mkdocs-0.9[${PYTHON_USEDEP}] )
+	test? ( >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/websocket-client-0.11.0[${PYTHON_USEDEP}]' python2_7)
+"
+
+python_compile_all() {
+	if use doc; then
+		mkdocs build || die "docs failed to build"
+	fi
+}
+
+python_test() {
+	"${PYTHON}" tests/test.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( site/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/docker-py/docker-py-2.2.1.ebuild b/dev-python/docker-py/docker-py-2.2.1.ebuild
new file mode 100644
index 000000000000..6de9858dd974
--- /dev/null
+++ b/dev-python/docker-py/docker-py-2.2.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/docker-pycreds-0.2.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.11.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	sed -i -e "s/import pip//" -e "s/if 'docker-py'.*/if False:/" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die "docs failed to build"
+		HTML_DOCS=( html/. )
+	fi
+}
+
+python_test() {
+	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/docker-py/docker-py-2.3.0.ebuild b/dev-python/docker-py/docker-py-2.3.0.ebuild
new file mode 100644
index 000000000000..1e772e7721ca
--- /dev/null
+++ b/dev-python/docker-py/docker-py-2.3.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/docker-pycreds-0.2.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.11.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	sed -i -e "s/import pip//" -e "s/if 'docker-py'.*/if False:/" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die "docs failed to build"
+		HTML_DOCS=( html/. )
+	fi
+}
+
+python_test() {
+	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/docker-py/docker-py-2.4.2.ebuild b/dev-python/docker-py/docker-py-2.4.2.ebuild
new file mode 100644
index 000000000000..be34ebbd5bbe
--- /dev/null
+++ b/dev-python/docker-py/docker-py-2.4.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/docker-pycreds-0.2.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.11.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	sed -i -e "s/import pip//" -e "s/if 'docker-py'.*/if False:/" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die "docs failed to build"
+		HTML_DOCS=( html/. )
+	fi
+}
+
+python_test() {
+	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/docker-py/docker-py-2.5.1.ebuild b/dev-python/docker-py/docker-py-2.5.1.ebuild
new file mode 100644
index 000000000000..559c7b0e68d7
--- /dev/null
+++ b/dev-python/docker-py/docker-py-2.5.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/docker-pycreds-0.2.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.11.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	sed -i -e "s/import pip//" -e "s/if 'docker-py'.*/if False:/" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die "docs failed to build"
+		HTML_DOCS=( html/. )
+	fi
+}
+
+python_test() {
+	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/docker-py/metadata.xml b/dev-python/docker-py/metadata.xml
new file mode 100644
index 000000000000..def0cb671aeb
--- /dev/null
+++ b/dev-python/docker-py/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>alunduil@gentoo.org</email>
+    <name>Alex Brandt</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">docker/docker-py</remote-id>
+    <bugs-to>https://github.com/docker/docker-py/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/docker-pycreds/Manifest b/dev-python/docker-pycreds/Manifest
new file mode 100644
index 000000000000..9456a5b98940
--- /dev/null
+++ b/dev-python/docker-pycreds/Manifest
@@ -0,0 +1,4 @@
+DIST docker-pycreds-0.2.1.tar.gz 7555 SHA256 93833a2cf280b7d8abbe1b8121530413250c6cd4ffed2c1cf085f335262f7348 SHA512 04a2dbd00c4e0a02bee13eaf23255e660b0e8640ef4225eff94e6c2391e5ceaf539b373ef932737dbc8eb4383746b374aca5a018a1f21c1eebb2f53160662338 WHIRLPOOL 5a3ef7689cf3cd7f5a1811b14f00468ab9d2fdd35ac0d2953164e3d453eb05efda951e169e1d59561c2134f097c8875a378f57d6327f032c4ca6db11039315f4
+EBUILD docker-pycreds-0.2.1.ebuild 519 SHA256 a61187ed50092f8f9a576e7047f3b28903397d5b7015cc8253395655f2174fa5 SHA512 501d271e7349a89be824682c648ee49bd60b2415d05907ff27a2039042321a5fe77f38e997907cfdf5a3fb8858c48b521b4ed0eb21b1e1c598068ee8d1510d41 WHIRLPOOL 12c5dc7d00b9157952b7756d00eedb32efbb2538928a66f4b62d4a89f3ff2efee6d76372bb2bee933578a63b3c8f2f283107173b23eb5f0de2f28595d6212636
+MISC ChangeLog 596 SHA256 a866b251e94e2cbc04c39da13a1d33bad363e5110079383ccb7b57fc0581c408 SHA512 50fbeb0b3e1d969bec79ba39e90341447172ab542634c0b81c2bb486d9d886b98d9aef6a51cb6ce5275563368eabee1b18ebaafd12f05c37a7b6ccd19b880559 WHIRLPOOL 7a1137c91dc667ee4e5b8efb4aaed0e2fd754b617eb86af49553332f35be24ddda0447979a69a75e7cb7e2530aee16760f1bfa6965efaceb425407f058a7a28e
+MISC metadata.xml 462 SHA256 92f426bc08811ee381e45222f5d69910ca47d6a7bdd73df04d7dded46ebc667c SHA512 40263ed4ab7077460874be5826d0002c8e452d9301ab3e6fb423e5692b9036044eb84b33ed858830c00579fa28486420d65fbb4f2101292498f4885104a89f02 WHIRLPOOL 1657610a76cd2f233d66b2d00a3a2b59e82aeea5c1b1583b4e45ad0342673c0536c96c6ce24c0c589c3a950b3d03d7ba81a4be2dc055a169b3db025aed6a46d4
diff --git a/dev-python/docker-pycreds/docker-pycreds-0.2.1.ebuild b/dev-python/docker-pycreds/docker-pycreds-0.2.1.ebuild
new file mode 100644
index 000000000000..d4a016c4332e
--- /dev/null
+++ b/dev-python/docker-pycreds/docker-pycreds-0.2.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the docker credentials store API"
+HOMEPAGE="https://github.com/shin-/dockerpy-creds/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/docker-pycreds/metadata.xml b/dev-python/docker-pycreds/metadata.xml
new file mode 100644
index 000000000000..bdd2df55bde2
--- /dev/null
+++ b/dev-python/docker-pycreds/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">shin-/dockerpy-creds</remote-id>
+		<remote-id type="pypi">docker-pycreds</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/dockerpty/Manifest b/dev-python/dockerpty/Manifest
new file mode 100644
index 000000000000..c476e7273c96
--- /dev/null
+++ b/dev-python/dockerpty/Manifest
@@ -0,0 +1,5 @@
+DIST dockerpty-0.4.1.tar.gz 19608 SHA256 fd9acb9fa7a464b668dcc50612975f3c7f1485cc0213d19de8381cb641b49459 SHA512 1f27a1d1cf9bfa21a77f2c0695334ec09a81ed5b70190b16fb23ec0e2ab4cb84af334b5e9275265eff2d8014aac5f96890276bed5775bb805c3f30260c99da70 WHIRLPOOL 8ab9edfff1d1a795f548ae66ea71064138a91b5a3b9909dea079b872a0b38e662d1cf14c19b10dce5c5671290c983e03e13e879709e7900e53d3faa8af76d207
+EBUILD dockerpty-0.4.1.ebuild 786 SHA256 bf8e737f66fa17a675b0fa14e43f2d8096be365abb750a3173a04e75cd80f2a4 SHA512 3e14990815563229bad34bdd03f77cda1b82afec8057cc1ea366cc7f9ed1aae351f5ff22b4c7a679f83ab8872d61aa60b8ce161483d93b5b4617de7761910b0f WHIRLPOOL 5a7bcabbb10616bf9603506fd972d87d159d9d967e2f8ebdf58e32b4b18887f2b0b34158146d612ca64f50d3f2005736f5b7411ddc703a9870278d0bbe1a74b2
+MISC ChangeLog 2892 SHA256 3118ebd8bd7efe16dda9190e6febaec08d24ad6306ac5504c31be23843a9edf4 SHA512 1ec8b970131aae2bc6b4e5f8319f69ea44c506cb7ce94925f2da35e2503da1d60b050b59042d720a4c007baef19c839022e17cb7beb8e666fdeaa8068d6fe132 WHIRLPOOL 4b87b78d2fc2370dc9c4fbd54e26d74eadfa0e8580760c1e9f6a69782941132cebded69817e09a3e03b05df6c544e70604cd39eba4858ea88751674c2ddcdcd9
+MISC ChangeLog-2015 964 SHA256 bc7d8b51776d71b9991c4abd715c45d331249971adc160dd5a0f73d2682e4c12 SHA512 0267b86ce04922caad3a5bb10d7fb3754c74ff90a61b013b4f71082cee3c5e6345af21ecd68e39b88c066aa58c4d67c73dc4d4a8d245f88a390ea3755c844e10 WHIRLPOOL eed8f7cee80092d01ec98009ec739110ba7852a9e178a3bdcfd7b0aea02a42e5ff3298e9f0a4cc0bf01c28d5b426b99aa70dc47630c24e16e6dd908bd5ee9884
+MISC metadata.xml 327 SHA256 82f355e86ec0c7e72cd65b26ebef212df8d9ff389bbe434bc3fad2d4a2a1a39c SHA512 3e9c3ad9693f4ea86b92447bc03d0e721337df199750e324546f135f732782684342ad73dc181a4d9a3c2013f9557ceb5c1f158f8a8f7d4e899b526491b2045d WHIRLPOOL 70a06559e8aa8d41391ec94fe33772c94000988c6708173d1b409c1421934ce58b53e80e1d279adc8398fd4f877be963e9aae4d854720a8998aa1aa8c6697adc
diff --git a/dev-python/dockerpty/dockerpty-0.4.1.ebuild b/dev-python/dockerpty/dockerpty-0.4.1.ebuild
new file mode 100644
index 000000000000..1068fac1b819
--- /dev/null
+++ b/dev-python/dockerpty/dockerpty-0.4.1.ebuild
@@ -0,0 +1,30 @@
+# 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 vcs-snapshot
+
+DESCRIPTION="Python library to use the pseudo-tty of a docker container"
+HOMEPAGE="https://github.com/d11wtq/dockerpty"
+SRC_URI="https://github.com/d11wtq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/docker-py-0.7.0_rc2[${PYTHON_USEDEP}]
+		>=dev-python/expects-0.4[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.5.2[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND=">=dev-python/six-1.3.0[${PYTHON_USEDEP}]"
+
+python_test() {
+	py.test tests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/dockerpty/metadata.xml b/dev-python/dockerpty/metadata.xml
new file mode 100644
index 000000000000..8ff1c2f1e620
--- /dev/null
+++ b/dev-python/dockerpty/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">d11wtq/dockerpty</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
new file mode 100644
index 000000000000..c4c5188d43a8
--- /dev/null
+++ b/dev-python/docopt/Manifest
@@ -0,0 +1,6 @@
+DIST docopt-0.6.2.tar.gz 25901 SHA256 49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491 SHA512 af138feccf8c37b374ee44fcda4938a88107d434df13c173214021b1a3348b152a595095a86982b66ac03a11db8e0f1e9e6a3a65c98deea92330311daeb831a3 WHIRLPOOL d6d00dd8e6e1063ba6d12339b6e7744bd993270173260efe8ba808e71945d3ac26a22adb005563d626ffa1e253022b88bf0bd1f9dd729bf6634be73d20108541
+EBUILD docopt-0.6.2-r1.ebuild 770 SHA256 94a195c4e5e4b68a4f274d46dfc7d9064a5f991222ed7a799c63a752d0cfb9f1 SHA512 52bf84cd63cb4db19bd36f5e301737fd0553f3c7d016317bdf09aa14b36b5a790f9ab1a0c4e03d077966a31e4cdabb963c9f2ec673afb2e5a5c905415e6e4806 WHIRLPOOL e0896339e53ccfc3ee5eb77d726cefec0d7a0d72b88b389cdef29eafa85bae4190630f9528b053bf80dd0ebb5ef63e793f329dfdbd7cae506d5ca17fa881e8bf
+EBUILD docopt-0.6.2-r2.ebuild 775 SHA256 d593d5af18c6652d407cbcd6f1c3caa48bd6d19dfad161316f2d1be5d7ceb2ad SHA512 7c6dce2a69dbea2c3b08fb1c566cf9bb91e240632f872d1007208106758a6f4bff425eb8ed9153b8fec01b483c16f6a07ed79e912b644c71d8e240104e09d1ca WHIRLPOOL 141a6b7320295ea74988adc0e05628f6fb323d29e17af3ee244c92cf29dab344c75fcca1d82a0f61f44bba38b5504d33ae3c7ee63792b76fc137f83dc8fa0903
+MISC ChangeLog 3030 SHA256 80a144c438e217d2fdc9224c55d3bd0e0ec02849612186dd9926d6cccdae3dbf SHA512 15381811c2c0288ca92b7c8422f51e73d7602df8447795c64b8b6bbae2bebae156e4c502c74e4811d315adf39cc52eb0655b7a8bfe89e6dd01c55c0ac97552c8 WHIRLPOOL b122863b6dcad42e07cf39b55b0ae7c48cbea1b03e5869d5a9b5b0c0630fa3239bb455f39f9fd039a3d9deec8c2cea65606ffc11310894ddd406343016e6cf9e
+MISC ChangeLog-2015 1360 SHA256 1adc9ba6ac8bb7e2417792d59cc5c94f4e8bac175687fba875f1d17ee5c667ca SHA512 dad5bd1f97702b69e0767dd0f4fd926e1f6cb362249414b81a1bfafcc65cb1fd77e5e3f3fe3a96bb4120d53a8cfac8400756ef6615f9ab4e8b908f6c0a1db669 WHIRLPOOL c9566d2c69288ade559d97199350a22d507240fa2c97626969a9bba63efff5999ea54737914111ca762675ead01c4686fcd6334a4dd8ed121934a337fd302339
+MISC metadata.xml 374 SHA256 b334c1221e4c80becddda0b62be56cb14fe11b66a1eb35bd68e32653211b8e71 SHA512 a54f0d59a3cda28748bc2ec5546b29de60dc4dba144b57014636fef7b20c97d2b7b20f0ea8166cd8c9970b7434e43707359ceb76efb015a8a00d06a0786252b5 WHIRLPOOL 9b3397a734b3a52855ab6581d345130479813ab24903ac98f2f9fa6bf8eef8f3160aefafd82705bd11134d5373984c0431a3a9112bafd675ee0599df3b4c881c
diff --git a/dev-python/docopt/docopt-0.6.2-r1.ebuild b/dev-python/docopt/docopt-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..92f692dab4e0
--- /dev/null
+++ b/dev-python/docopt/docopt-0.6.2-r1.ebuild
@@ -0,0 +1,31 @@
+# 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} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pythonic argument parser, that will make you smile"
+HOMEPAGE="https://pypi.python.org/pypi/docopt https://github.com/docopt/docopt"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://github.com/docopt/docopt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# not implemented in this version, git already has it
+RESTRICT=test
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/docopt/docopt-0.6.2-r2.ebuild b/dev-python/docopt/docopt-0.6.2-r2.ebuild
new file mode 100644
index 000000000000..7fa8b5592349
--- /dev/null
+++ b/dev-python/docopt/docopt-0.6.2-r2.ebuild
@@ -0,0 +1,31 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pythonic argument parser, that will make you smile"
+HOMEPAGE="https://pypi.python.org/pypi/docopt https://github.com/docopt/docopt"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://github.com/docopt/docopt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# not implemented in this version, git already has it
+RESTRICT=test
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/docopt/metadata.xml b/dev-python/docopt/metadata.xml
new file mode 100644
index 000000000000..47bf1c002ed6
--- /dev/null
+++ b/dev-python/docopt/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">docopt</remote-id>
+    <remote-id type="github">docopt/docopt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/doctest-ignore-unicode/Manifest b/dev-python/doctest-ignore-unicode/Manifest
new file mode 100644
index 000000000000..5fa6421179cd
--- /dev/null
+++ b/dev-python/doctest-ignore-unicode/Manifest
@@ -0,0 +1,4 @@
+DIST doctest-ignore-unicode-0.1.2.tar.gz 2270 SHA256 fc90b2d0846477285c6b67fc4cb4d6f39fcf76d8752f4df0a241486f31512ad5 SHA512 ac88d1cc90b1db21b21b121cddde246314d8a3e399ea0e96f1cd4f7812949cebdd0850566a90d47da01ea159bb8d69c8a73ee05c62cc40d0839d4701f2f330d3 WHIRLPOOL 5769ff459cee4b55d325061158b4b7726c15489bd3acd45ef6028cf10748c2e0f70ebe4f5a99c59a17cbd800a4edf927eec924ed73297bab0b1c5a6edceeb0ea
+EBUILD doctest-ignore-unicode-0.1.2.ebuild 641 SHA256 eeb661c9b7af22a760370f8dcd3218305b9867176afaead846c791a69997555c SHA512 3ac4d37c453e73ab697c4234bb6ce076d1347d743f1992882c4591a7b758f4a70bf23b6d12e44d46f893334e08c545a686b8cc20b264c4af5cc119339a9176c8 WHIRLPOOL 4862e86ee13f994b6ef41893c899db0eeabf1cd76db699228de85ce880bf95818f1a086f2776eb88dc92e6a1414578ae195eaef6411386a672bc9131ebaa30b2
+MISC ChangeLog 2953 SHA256 74f3b7036f1cf8ec7f0274c60d9c19fc03384971d187a457d27eb67ea9bd403c SHA512 deb1c1333f5da92371cc375433ca8ccdc942f954fe3bfa3d4955d446721f40f5049d8c8fbc4b6fe462418a714621a10bf2e945ef31d3d62ea5f35af157c70bdf WHIRLPOOL 26912200ae195b2a350a3f75cab9d4e789ecbd50d6710ec19be004fecff06cfaa638faa1de5cc3fea395d16d094b0a7d4a76b6542e399e2998369e372d5d1e18
+MISC metadata.xml 396 SHA256 dee3f0578dd2cf8dff87191f9c265e5e27f9c6fe05f7e52c9a2abd20b0b5a96c SHA512 da8a39b0f46893a69b4e53ef6b62845f70b1ebdb0ff1c339f52b61b69c6a6e730ecc26d3f99db16a259c73ff454685faf546babc7afc9e804170a0e738cd7d1d WHIRLPOOL a6a1b73c5cfd42d883456aa3cc82ba61df1a08eb8f7ed7211f95e930fa03864344012b827a78d792ed0c2041f23bcdfb751ea11e676e193b34fea7d87eda204c
diff --git a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
new file mode 100644
index 000000000000..7fd8b39e3499
--- /dev/null
+++ b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
@@ -0,0 +1,24 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Add flag to ignore unicode literal prefixes in doctests"
+HOMEPAGE="https://pypi.python.org/pypi/doctest-ignore-unicode https://github.com/gnublade/doctest-ignore-unicode"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/nose[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/doctest-ignore-unicode/metadata.xml b/dev-python/doctest-ignore-unicode/metadata.xml
new file mode 100644
index 000000000000..bfeaa471bce2
--- /dev/null
+++ b/dev-python/doctest-ignore-unicode/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">doctest-ignore-unicode</remote-id>
+		<remote-id type="github">gnublade/doctest-ignore-unicode</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
new file mode 100644
index 000000000000..caa55b7b4f41
--- /dev/null
+++ b/dev-python/docutils-glep/Manifest
@@ -0,0 +1,6 @@
+DIST glep-0.4-r1.tbz2 4667 SHA256 d0b421869fb3437e96484687fd57f34d4f5cdd5a1fbdb2314f1474b1f9afa058 SHA512 098d9f5043a60af9dfac63f6472b576e66ffeda924902ca825ed63f573aeb8bad7c9f9a6853fd99e648683488ee6db2ee55c139df3dde06983b72cfb5dd8cdd3 WHIRLPOOL 277cdf4a7fe70990864a4f0fd592561bcf5edc1de8d4830da96c75093d47d8d64214b95ac5ae7960670a8520650a5e23355df248f61bddcd9cd5dc23cab0fe19
+EBUILD docutils-glep-0.4-r1.ebuild 1172 SHA256 ff9bd99d963b051b812813652f26a57ca1998b9f7dc4846e9b116aa1a6707bf1 SHA512 28f60c997dfd07a32141ead50c9367d7448b9fef9056a8e138df28d8ce47fd58961d2bd0521654a6fe31623d85f4ce2cef17d2ae5439a2419482d2f14e1f4a48 WHIRLPOOL 6fe9dc143885766452a05a550121dae75d59393a9566460179ed0c360241a53ab998a8a5202c4f8af4a4b9e46a68c21c448504925159a8aa9d790ccd81c8c741
+EBUILD docutils-glep-9999.ebuild 473 SHA256 9eee472f5b277b0414e8e000084d549219825e64f645062ded0f0b46fcdc5a0d SHA512 800fd67fa88a322b80ddf7cd33f6b25458e5b9f15bbf92c950c57a61be04033035fd244cc899b089f47a257fdccbd49d5fd319558d6124b383b3e5202e976783 WHIRLPOOL 09c2a052b07e3000f6da423c887b04628b92fbe5ebcd552422d0e64ba6af4c32c8e405cf286c6eed8be5aa6fa3d2c0444ce5714c5a0e29cbb37abb44404d3ec8
+MISC ChangeLog 2615 SHA256 51733d83d6941641ed5289ebe6ae0561b9b6e5561d3e7e32435ae054afded62d SHA512 46b391f5b932c8faa6cf081afca4101ee6309da6ae41011a2411a20f3c2f702fe6cedaa015d26f5009ff0e4d4e5c6abcef06579f61ec361221ccf88c06edd6bf WHIRLPOOL b7a62bddc156a88b3712b745242c18c826de26534ae9bea463d677fcb59cd31fcfc9c1b165e75bf855d98ef16f93e37c127640d7248cc6d0dde5de019399153d
+MISC ChangeLog-2015 2339 SHA256 e89d9ad2bad6c86a72b182f0f6c0b98e916b24d14dbedaed9475665953af1f42 SHA512 12c6ec91ab976a3150aef81a07a3baf94fea3f459c7aae15eab3b2d536ffa23ade428f681ce1b4efc64c144d47b43af49160222f6165740a38753f9fecbbac1e WHIRLPOOL b28f7ba3f3c7cfae2dc69fbdc8721dbda1b37da506fe13ce74b1158c612af1cf3d6e0d712a711ba300ff779da3f3e2027d521407d940e8056a05cf16ca69da1f
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild b/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild
new file mode 100644
index 000000000000..3fc69600a5dd
--- /dev/null
+++ b/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit python-r1
+
+MY_P=${PF/docutils-/}
+
+DESCRIPTION="Gentoo GLEP support for docutils"
+HOMEPAGE="https://www.gentoo.org/proj/en/glep/"
+SRC_URI="mirror://gentoo/${MY_P}.tbz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# It's easier to move them around now.
+	# TODO: add python_newmodule?
+	mkdir {readers,transforms,writers} || die
+	mv {glepread,readers/glep}.py || die
+	mv {glepstrans,transforms/gleps}.py || die
+	mv glep_html writers/ || die
+}
+
+src_install() {
+	inst() {
+		python_doscript glep.py
+
+		python_moduleinto docutils
+		python_domodule readers transforms writers
+	}
+
+	python_foreach_impl inst
+}
diff --git a/dev-python/docutils-glep/docutils-glep-9999.ebuild b/dev-python/docutils-glep/docutils-glep-9999.ebuild
new file mode 100644
index 000000000000..e6476c34c896
--- /dev/null
+++ b/dev-python/docutils-glep/docutils-glep-9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+EGIT_REPO_URI="https://github.com/gentoo/docutils-glep.git"
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Gentoo GLEP support for docutils"
+HOMEPAGE="https://github.com/gentoo/docutils-glep/"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils-glep/metadata.xml b/dev-python/docutils-glep/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/docutils-glep/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
new file mode 100644
index 000000000000..caad85a235bc
--- /dev/null
+++ b/dev-python/docutils/Manifest
@@ -0,0 +1,12 @@
+AUX docutils-0.11-python3.3-odt-writer.patch 1057 SHA256 4a25fb0e5cd8cd7f94963a389f2f6c2efad6cd5830cbdeba9d25ff6484a45e77 SHA512 c92a00f5bf2b44f66a1aed1df21280e3f190f3a9d8f87cdbce6851068eb31feeed04c0b057b0685cf2783e0a2bf0a2daef9cb1c4a5dba57b09bc32a5c199398f WHIRLPOOL b6b1a11b874b16378fb6ef630b389087d9bfd074bcf9ae5a06b01626f0a411f2a8337184dcc244509c9adb7bbe45baea8f8531911fc34f36a344b678f1c965b2
+DIST docutils-0.11.tar.gz 1611755 SHA256 9af4166adf364447289c5c697bb83c52f1d6f57e77849abcccd6a4a18a5e7ec9 SHA512 8e87581b27ce4fb5e97dcef56047f4bf3a076b98e9e42f5dc66f4c370e5893d1571e46f00fee6f1c8b9f8c8a79e128e4599b9ee213ad1dee2bf16a0246e187df WHIRLPOOL 0231e34e8c84a29f52f244dfe8d3fdbb8f2db9f6e5f26d0a5953c109a2620b15f86874e3b7604aeccf805f789abef7e7af5cc076dde25f2e2947bad11d2ae58c
+DIST docutils-0.12.tar.gz 1618353 SHA256 c7db717810ab6965f66c8cf0398a98c9d8df982da39b4cd7f162911eb89596fa SHA512 0087433f8b76e1d0302d2fab77fdbda941132d16ac1fcecb26ca66119687eefd9e2f6901e05d705f857fa31e2526136c9827dfd57c44cd295bd10dcce3faebf9 WHIRLPOOL 9b9d9d7315351e4b803195a157836df13a10fc706c0aea2c6ac7c6d01bd034870106d0ceedfbd7e9fae17420f3d116df30cc222ad5b3c7205d5eca767d550564
+DIST docutils-0.13.1.tar.gz 1735216 SHA256 718c0f5fb677be0f34b781e04241c4067cbd9327b66bdd8e763201130f5175be SHA512 6a68b27dac3705ff532cb79d6b6808071206544a1c653e6a24d46971a5e10edffc7d275834eec4e80d948eb066bb099cae0195c0ab674e68747820e54f0ea64e WHIRLPOOL 08fb2511bbf60b8b7e7cb160c5a04ebc7c4bd7a8b29263a63ab8fe4506d6655e8649af3d7bfd93097c463e2a0da8995de416689895228dab1bfadb0d41e56d90
+DIST docutils-0.14.tar.gz 1727105 SHA256 51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274 SHA512 1ed72c2ef7d2ca38d1c6f3154b7986ea46f599d9bd826405a5257fdd7740c8626957d6298aa95fb0edea8a24515de22f1ad9b2ecbd59341a1ab7a2bab30f500c WHIRLPOOL f415ca2492bc4ccece104e69e9e2b611c0f5c86530906f2a1110ee6a53d4020b245ba973fda236dbd432877556c16f07aaffab69fa8c2cf6bb4c70e92ffbee37
+EBUILD docutils-0.11.ebuild 1880 SHA256 27736ac1de08bffef8135fbf175fedcc8302ee94d070eb067c7c629163f9b1b1 SHA512 46663d7ddab4817db565b0c45893796f09535d8f529e93758ecceace6a6c8b4b3fc7f466ffbc596cd20deb393bed8c9b347e8a0adc285c380d80eb16eefa5d3b WHIRLPOOL cad8063e4fbf9ad50ab16518627f46d04d3b69a9c0d082062b55bab57e1ce1b93781aa8806ca36529f022e276ee32afbf9eeab50156f8069baf9df16786e1289
+EBUILD docutils-0.12.ebuild 1830 SHA256 cfe32ae466035032e050dc1df926187609d952b06d7dfa52e018698ff7527d4c SHA512 d6fe937fda326cc62b6e747f5e9dee812309539ccc3990b74d8ccfff66e8c8a470e57872dd46c8dba93dbc3cb721ab490765704998ad75087c1b602449f1f64f WHIRLPOOL cfa5eda74d291930491430cb27161859e2a171f0fb7e273c27cd01746118e55835dc365a30a74eb3ed3d0254c053ae2b545e4936dd3779f293d2709f118f1d4b
+EBUILD docutils-0.13.1.ebuild 1844 SHA256 cee7a7e0bb5cd493835e319e627062a008722c36c83afc3521beb3e54413f076 SHA512 f72cd90c9d34825a1a310759cde12e9b1b815e2a6ff7680410e8f3a2fe0acc3975a73356c67596b412074b4d576cf26fedaeabdca3c7149b815072a978028fe3 WHIRLPOOL 2c96e52235c8327610a1688524d6b32488dcf9d029b044b185701f530257cc3af158c458034cf8016123c171b2a4e117ce8007c3a9065c1a33051b9bf3988872
+EBUILD docutils-0.14.ebuild 1854 SHA256 7f64c129090c1afcf4e87ff1f8272110aa6526dbe39d766321713431bfa23970 SHA512 66e6f8afc471b48ce3719cb435fdcc450e997b2af9a97b595662cf89f8622fb2593591a8d425972e9d074cdbef68a9f7f1304c67a86b55ef1a5cb0bda1cce7c1 WHIRLPOOL 8a44568dad393f45b4dd1282f5a3c65abee4071962deacfd6ae456a122732853cb412c37f215b7f63b11ba8c59e7c333a11556f63c1d2a9656217cfe71be1210
+MISC ChangeLog 5944 SHA256 df2f6b6e3af310258f402eade9aa37ee8f2543e4ec60c821261a6b96ad63435f SHA512 9fc0b017832f75d26823b74c1899b80b4c40534a08f94b53661ac0b2666c5125023f5c877178a7c6c5402a43a6cf4a988181bbd3d0a2d11a19bc12956d1c2286 WHIRLPOOL 7dc29fc52c17a8d5cbaf047bea7d2d9b9499f831457f216027cd4881281ccc516b5a37660f1d4be2317b24665a04cde8a54ffa7ab14ace2eeedf0b336b794219
+MISC ChangeLog-2015 29096 SHA256 7f00344a2d694a55ddc99915c727ce6ac92d1e53d375443dc00a5ed45537ca3b SHA512 346423f639b788cdb1b6e5bbc54b7100f077650893f05fdcb02d839e9feb1c81808c0a7b7f1e792f5d8e64da280d0a2500e20b7c5e1b74e13585f32a9161bc97 WHIRLPOOL 190c76721de345eb9437b806826a862f34862ba2f49c2fd96cf02de3ebc8b564fd64b4a805387226482945c47b9acbbb10b2031852dea4dd4c3c9028de6f8d1b
+MISC metadata.xml 318 SHA256 5c7c673cfaeff6380c8de04c083277ada036db3bf4440a40c7f3c4560a039b3f SHA512 3cf09c6d943288ec0fd9fa92d4475ac184a87b47b7bc8df80fc24a712d8bf0363d4c2a08efb2ace4d94adcd59fdd6f82ae9fd9bbe58561ead5715f7daf84a96f WHIRLPOOL a1f69ea092eace7fed4da95313f7a2698d3a31c93dd98b28d93137e2a7340499aced6a98735a6f466f778a0aebb03eb1e27a60c15231b959bd76f8b629db6488
diff --git a/dev-python/docutils/docutils-0.11.ebuild b/dev-python/docutils/docutils-0.11.ebuild
new file mode 100644
index 000000000000..74f4ef82f19b
--- /dev/null
+++ b/dev-python/docutils/docutils-0.11.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Documentation Utilities"
+HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.python.org/pypi/docutils"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/docutils-0.11-python3.3-odt-writer.patch )
+
+python_compile_all() {
+	# Generate html docs from reStructured text sources.
+
+	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
+	cp docutils/writers/html4css1/html4css1.css . || die
+
+	cd tools || die
+	"${PYTHON}" buildhtml.py --input-encoding=utf-8 \
+		--stylesheet-path=../html4css1.css, --traceback ../docs || die
+}
+
+python_test() {
+	if python_is_python3; then
+		pushd test3 > /dev/null || die
+	else
+		pushd test > /dev/null || die
+	fi
+	"${PYTHON}" alltests.py || die "Testing failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Install tools.
+	python_doscript tools/{buildhtml,quicktest}.py
+}
+
+install_txt_doc() {
+	local doc="${1}"
+	local dir="txt/$(dirname ${doc})"
+	docinto "${dir}"
+	dodoc "${doc}"
+}
+
+python_install_all() {
+	local DOCS=( *.txt )
+	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
+
+	distutils-r1_python_install_all
+
+	local doc
+	while IFS= read -r -d '' doc; do
+		install_txt_doc "${doc}"
+	done < <(find docs tools -name '*.txt' -print0)
+}
diff --git a/dev-python/docutils/docutils-0.12.ebuild b/dev-python/docutils/docutils-0.12.ebuild
new file mode 100644
index 000000000000..76c56c7b0a09
--- /dev/null
+++ b/dev-python/docutils/docutils-0.12.ebuild
@@ -0,0 +1,67 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Documentation Utilities"
+HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.python.org/pypi/docutils"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_compile_all() {
+	# Generate html docs from reStructured text sources.
+
+	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
+	cp docutils/writers/html4css1/html4css1.css . || die
+
+	cd tools || die
+	"${PYTHON}" buildhtml.py --input-encoding=utf-8 \
+		--stylesheet-path=../html4css1.css, --traceback ../docs || die
+}
+
+python_test() {
+	if python_is_python3; then
+		pushd test3 > /dev/null || die
+	else
+		pushd test > /dev/null || die
+	fi
+	"${PYTHON}" alltests.py || die "Testing failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Install tools.
+	python_doscript tools/{buildhtml,quicktest}.py
+}
+
+install_txt_doc() {
+	local doc="${1}"
+	local dir="txt/$(dirname ${doc})"
+	docinto "${dir}"
+	dodoc "${doc}"
+}
+
+python_install_all() {
+	local DOCS=( *.txt )
+	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
+
+	distutils-r1_python_install_all
+
+	local doc
+	while IFS= read -r -d '' doc; do
+		install_txt_doc "${doc}"
+	done < <(find docs tools -name '*.txt' -print0)
+}
diff --git a/dev-python/docutils/docutils-0.13.1.ebuild b/dev-python/docutils/docutils-0.13.1.ebuild
new file mode 100644
index 000000000000..2822eef75a65
--- /dev/null
+++ b/dev-python/docutils/docutils-0.13.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Documentation Utilities"
+HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.python.org/pypi/docutils"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_compile_all() {
+	# Generate html docs from reStructured text sources.
+
+	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
+	cp docutils/writers/html4css1/html4css1.css . || die
+
+	cd tools || die
+	"${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
+		--stylesheet-path=../html4css1.css, --traceback ../docs || die
+}
+
+python_test() {
+	if python_is_python3; then
+		pushd test3 > /dev/null || die
+	else
+		pushd test > /dev/null || die
+	fi
+	"${EPYTHON}" alltests.py || die "Testing failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Install tools.
+	python_doscript tools/{buildhtml,quicktest}.py
+}
+
+install_txt_doc() {
+	local doc="${1}"
+	local dir="txt/$(dirname ${doc})"
+	docinto "${dir}"
+	dodoc "${doc}"
+}
+
+python_install_all() {
+	local DOCS=( *.txt )
+	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
+
+	distutils-r1_python_install_all
+
+	local doc
+	while IFS= read -r -d '' doc; do
+		install_txt_doc "${doc}"
+	done < <(find docs tools -name '*.txt' -print0)
+}
diff --git a/dev-python/docutils/docutils-0.14.ebuild b/dev-python/docutils/docutils-0.14.ebuild
new file mode 100644
index 000000000000..47f8bb06d9fa
--- /dev/null
+++ b/dev-python/docutils/docutils-0.14.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Documentation Utilities"
+HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.python.org/pypi/docutils"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_compile_all() {
+	# Generate html docs from reStructured text sources.
+
+	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
+	cp docutils/writers/html4css1/html4css1.css . || die
+
+	cd tools || die
+	"${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
+		--stylesheet-path=../html4css1.css, --traceback ../docs || die
+}
+
+python_test() {
+	if python_is_python3; then
+		pushd test3 > /dev/null || die
+	else
+		pushd test > /dev/null || die
+	fi
+	"${EPYTHON}" alltests.py || die "Testing failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Install tools.
+	python_doscript tools/{buildhtml,quicktest}.py
+}
+
+install_txt_doc() {
+	local doc="${1}"
+	local dir="txt/$(dirname ${doc})"
+	docinto "${dir}"
+	dodoc "${doc}"
+}
+
+python_install_all() {
+	local DOCS=( *.txt )
+	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
+
+	distutils-r1_python_install_all
+
+	local doc
+	while IFS= read -r -d '' doc; do
+		install_txt_doc "${doc}"
+	done < <(find docs tools -name '*.txt' -print0)
+}
diff --git a/dev-python/docutils/files/docutils-0.11-python3.3-odt-writer.patch b/dev-python/docutils/files/docutils-0.11-python3.3-odt-writer.patch
new file mode 100644
index 000000000000..e84256f3dc43
--- /dev/null
+++ b/dev-python/docutils/files/docutils-0.11-python3.3-odt-writer.patch
@@ -0,0 +1,30 @@
+--- a/docutils/writers/odf_odt/__init__.py
++++ b/docutils/writers/odf_odt/__init__.py
+@@ -88,16 +88,20 @@
+ #   that support for the ability to get the parent of an element.
+ #
+ if WhichElementTree == 'elementtree':
+-    class _ElementInterfaceWrapper(etree._ElementInterface):
++    import weakref
++    _parents = weakref.WeakKeyDictionary()
++    if isinstance(etree.Element, type):
++        _ElementInterface = etree.Element
++    else:
++        _ElementInterface = etree._ElementInterface
++    class _ElementInterfaceWrapper(_ElementInterface):
+         def __init__(self, tag, attrib=None):
+-            etree._ElementInterface.__init__(self, tag, attrib)
+-            if attrib is None:
+-                attrib = {}
+-            self.parent = None
++            _ElementInterface.__init__(self, tag, attrib)
++            _parents[self] = None
+         def setparent(self, parent):
+-            self.parent = parent
++            _parents[self] = parent
+         def getparent(self):
+-            return self.parent
++            return _parents[self]
+ 
+ 
+ #
diff --git a/dev-python/docutils/metadata.xml b/dev-python/docutils/metadata.xml
new file mode 100644
index 000000000000..6ee5bb862e04
--- /dev/null
+++ b/dev-python/docutils/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">docutils</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
new file mode 100644
index 000000000000..4111a83fb5cf
--- /dev/null
+++ b/dev-python/dogpile-cache/Manifest
@@ -0,0 +1,9 @@
+DIST dogpile.cache-0.6.1.tar.gz 324046 SHA256 69b52dc56bb52d974e9e9fb2764e1311abcd1fd625de07b4e5c05550ac9b40c0 SHA512 c4743a88688d8f596469f2b3adf0cd862dd32891ae8c50d0c0421a984dfec872cbbecf936f704cf4351ae26b3ab4a26ae3b416f7c7f2ce3c41f8da2c9223178b WHIRLPOOL 3e9d4f8475efd34786f8722a9073cbb434bef8a8f5ada22e0309b143fda2a3909af91d69fb2092f6443a1e4ede9650529afbae2514c1374739582eecf05e1ffc
+DIST dogpile.cache-0.6.2.tar.gz 329762 SHA256 73793471af07af6dc5b3ee015abfaca4220caaa34c615537f5ab007ed150726d SHA512 5882e0a355db0bec9c1a0836034481d39008051ff42f48c85679ac70a42c6366d1bcbd01ecd3ca868d7ad725197e626e52b004d62269827e2605a4ecd491ce99 WHIRLPOOL c88f0c503b157c65aae4881b7339c7af7f5b5b045d812220e59736fc78737ae7004bbc0595b5cfed590e5b7d76331b156fa0f28805981bee49ff666a3172ee78
+DIST dogpile.cache-0.6.4.tar.gz 315533 SHA256 a73aa3049cd88d7ec57a1c2e8946abdf4f14188d429c1023943fcc55c4568da1 SHA512 0e86ed6aacbfbbbefdc3622ac956679c4986c77989daa3c3e845d4b8dbbf7945b4d0764789f03540b2ff59712e2ee86c8283cc3ee8d9e950f9ef1772db7ea137 WHIRLPOOL ede8bff7a2d742a75b6d7aa40d42d17366379009d5cc9ac6313fe0523f906646e381537f7079564db14126db5314aede7b7d7c91818c707aee107dcefa47ea73
+EBUILD dogpile-cache-0.6.1.ebuild 1039 SHA256 6a3445215ee40a1ad2dda0356737c7172cffbad9b38f1da97221af1851cdca2a SHA512 a0aaa04ecd6d43f47443ea055aaf3279334fcac414a2922f757556c383dd6392038beb46b8223277276efaaf733d2c660f084ad22261e177438ccbb7a4bd839e WHIRLPOOL 02bc2304546de5d085b7f07400a5689b03287011978877c0f03807b615034c7ce4a30307dd52d5057b61c81755bff71c17d55795a4fb6559b5a00f64f9a6e7da
+EBUILD dogpile-cache-0.6.2.ebuild 1039 SHA256 6a3445215ee40a1ad2dda0356737c7172cffbad9b38f1da97221af1851cdca2a SHA512 a0aaa04ecd6d43f47443ea055aaf3279334fcac414a2922f757556c383dd6392038beb46b8223277276efaaf733d2c660f084ad22261e177438ccbb7a4bd839e WHIRLPOOL 02bc2304546de5d085b7f07400a5689b03287011978877c0f03807b615034c7ce4a30307dd52d5057b61c81755bff71c17d55795a4fb6559b5a00f64f9a6e7da
+EBUILD dogpile-cache-0.6.4.ebuild 899 SHA256 c995fbe42270c1266243f7c93c0915284b60078086285cb3b34964c05e4d2c32 SHA512 7a0dccbeb56f36889a536840124fdf4fe5e29846ca23df10ad864d1e5c06f2e53d691617f2e2bc34fdd5784026b4beee63e6a2a7a605eb79f3f592d81aec7ddb WHIRLPOOL 08e05da3f1b8783a8bc3cff6ed06392123e47c501b6528270722e6232792ef08a8b8ef6bd50123129f6a21226fa6d64e14ec1a336222512dd7f65563b5da97f6
+MISC ChangeLog 4474 SHA256 57a31ee3c68c49f80ba6448cee7200bcd72cb05d87c47e7b4a9c045c13e4cd7f SHA512 4bb4e391234688e9bc22e36e6e89d1ea8ed47352fbfde537fab82f7f5316b2e20a5885d2ae8cceabc3942dad61d27feb862d7a67fe9e9260bf2dca0ad57ecea9 WHIRLPOOL 187d2ab6a52cdc3c006ac447b1554f9072ce7824b0498424b20f30133d2a8c04cd2979eecf61801cdfcbc39d72844800ecd95fdf560f73a181a2ce0409a974a8
+MISC ChangeLog-2015 1899 SHA256 432f66fa1c2c18206eb12f006ff4c3a9f26f24a31110144aaae9c18da0988e60 SHA512 7cc8391e5f47589a8481eb7efe4b2b4567b11138b6b70c40251eabe4de0a45fe51e62dd7958758fee4ae50199e8f41970c196c00fa748077e5e2de111ddcfa71 WHIRLPOOL 110519dff33523c057548bd8ed93a48f0c64118632080c62f5555e67b1b0f94d1bbd94984d5d42caed523479e9df7267bc5afb9d6750fc0850f191d297bb3b89
+MISC metadata.xml 716 SHA256 f42de3e68e76b9fd3cdb0e9017caca9becf29a665ff8a8664471134f138171d3 SHA512 7d260f1511dd2507f67149e1dda7a5ef5e5fee21bdd45832d141cfda5794b32b5b99a31e0f351da5f076fe481f14c7b420cf11f5b14587a1858b61325f4ff59b WHIRLPOOL 9176ee449f8be836085401fd4b648559a4b8a922382639838b5ee80ab43e2e67149cbe342e59a2000dd2e51082c1b193a91fe70b3c2f651132bf05c86709f65b
diff --git a/dev-python/dogpile-cache/dogpile-cache-0.6.1.ebuild b/dev-python/dogpile-cache/dogpile-cache-0.6.1.ebuild
new file mode 100644
index 000000000000..30e5999d26fa
--- /dev/null
+++ b/dev-python/dogpile-cache/dogpile-cache-0.6.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A locking API for expiring values while a single thread generates a new value."
+HOMEPAGE="https://bitbucket.org/zzzeek/dogpile.cache"
+SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
+S="${WORKDIR}/dogpile.cache-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/pytest[${PYTHON_USEDEP}]
+				dev-python/pytest-cov[${PYTHON_USEDEP}]
+				dev-python/mock[${PYTHON_USEDEP}]
+				dev-python/mako[${PYTHON_USEDEP}] )"
+
+# This time half the doc files are missing; Do you want them? toss a coin
+
+python_test() {
+	# crikey. testsuite written for py3, 5 tests fail under py2.7
+	if [[ "${EPYTHON}" != "python2.7" ]]; then
+		nosetests || die "test failed under ${EPYTHON}"
+	else
+		einfo "testsuite restricted for python2.7"
+	fi
+}
diff --git a/dev-python/dogpile-cache/dogpile-cache-0.6.2.ebuild b/dev-python/dogpile-cache/dogpile-cache-0.6.2.ebuild
new file mode 100644
index 000000000000..30e5999d26fa
--- /dev/null
+++ b/dev-python/dogpile-cache/dogpile-cache-0.6.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A locking API for expiring values while a single thread generates a new value."
+HOMEPAGE="https://bitbucket.org/zzzeek/dogpile.cache"
+SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
+S="${WORKDIR}/dogpile.cache-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/pytest[${PYTHON_USEDEP}]
+				dev-python/pytest-cov[${PYTHON_USEDEP}]
+				dev-python/mock[${PYTHON_USEDEP}]
+				dev-python/mako[${PYTHON_USEDEP}] )"
+
+# This time half the doc files are missing; Do you want them? toss a coin
+
+python_test() {
+	# crikey. testsuite written for py3, 5 tests fail under py2.7
+	if [[ "${EPYTHON}" != "python2.7" ]]; then
+		nosetests || die "test failed under ${EPYTHON}"
+	else
+		einfo "testsuite restricted for python2.7"
+	fi
+}
diff --git a/dev-python/dogpile-cache/dogpile-cache-0.6.4.ebuild b/dev-python/dogpile-cache/dogpile-cache-0.6.4.ebuild
new file mode 100644
index 000000000000..a0d8073bb391
--- /dev/null
+++ b/dev-python/dogpile-cache/dogpile-cache-0.6.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A locking API for expiring values while a single thread generates a new value."
+HOMEPAGE="https://bitbucket.org/zzzeek/dogpile.cache"
+SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
+S="${WORKDIR}/dogpile.cache-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/pytest[${PYTHON_USEDEP}]
+				dev-python/pytest-cov[${PYTHON_USEDEP}]
+				dev-python/mock[${PYTHON_USEDEP}]
+				dev-python/mako[${PYTHON_USEDEP}] )"
+
+# This time half the doc files are missing; Do you want them? toss a coin
+
+python_test() {
+	"${EPYTHON}" ./setup.py test || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/dogpile-cache/metadata.xml b/dev-python/dogpile-cache/metadata.xml
new file mode 100644
index 000000000000..823622b3f9e7
--- /dev/null
+++ b/dev-python/dogpile-cache/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>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+		A caching API built around the concept of a "dogpile lock", which allows
+		continued access to an expiring data value while
+		a single thread generates a new value.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">dogpile.cache</remote-id>
+		<remote-id type="bitbucket">zzzeek/dogpile.cache</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/dogpile-core/Manifest b/dev-python/dogpile-core/Manifest
new file mode 100644
index 000000000000..85a1223bf0bb
--- /dev/null
+++ b/dev-python/dogpile-core/Manifest
@@ -0,0 +1,5 @@
+DIST dogpile.core-0.4.1.tar.gz 99534 SHA256 af2555702811d56846778d39451cf822b04b3f13347080c121a4977fefdfcbff SHA512 f4c37297788677afe6ab17ba5aa928f9770b0edbd1a675cd4ad512ef0c15cf1e2d765d9b7a9fe3638f0a646e0ad51d54c9b4ded33611022744226bfde1aa9896 WHIRLPOOL 09677b564eee99202e66bba97b9e8db36a75aa1c3e86616a043db8b6bff318031c2afe72f9c243e19cc106e546aa9cc422820aeee505a7f5627f64c808af1eec
+EBUILD dogpile-core-0.4.1.ebuild 713 SHA256 1972eb3149de495dd749376beea4b24d384162928924ad78d0fe7ab566a0db2e SHA512 ae41d927b327bd100746ee62dfb4101a940dd2853f289426e9b7e47ddca08ddfb08a6c67b401ed1a50571acf2224e3494d8175790edb9f6ce218f17a3f2ce5d5 WHIRLPOOL a982797119bde8885be687d09a16454e5fb1a27ea4dc80eef014eaa493b715fded1c2441008fc5932c1e3e7ad52d8ffdb14a76a375c04485e5c8fe229eca3bb9
+MISC ChangeLog 2875 SHA256 d8c0f57bb01120a7a0f3d0c81f32edca9f1767a9cf424fafa321e54c8421f8d3 SHA512 45b6f6f779920373c9b53267317e7d2c4f3ef6b86d21066baafe7f63e5ed78459c76d0c9d263976958e0e3d11a0d551a31b363892e55fead736112cdd0e5f59e WHIRLPOOL ef7beb4a78f006933408e4fd3350ea1081c16de46eff3fc9cf0e63b1e1e5a74c4b90555584510f31e600cbb6728ecb8f2d434c43860396de1531580c4bc0a41d
+MISC ChangeLog-2015 1044 SHA256 f064d254e8c748f75b754cf07547f308da5af76ca218c7c4ae98e58d7162ff4d SHA512 7426fac53ad70c0b815b5149b9410ffd3a98e83cedaeb3fdb06716d4d650c4d45936fdc444d3a3d4738e0084af1000652b725032af753b1e843398fe50903cae WHIRLPOOL 7c3497d5a15c7bdb835ec191f05693d6e8b251f0e67879e4fed1b9c40b890f8f8e1ca849f6a8c40a70afa3ca4e3451671d6b830afbb3d977572bdbcc85c83d6e
+MISC metadata.xml 706 SHA256 8ca3b9aa30a931526cf86d57ede2eb1cd3c1139696db3c345f40f663ab166b0b SHA512 f9f31e16e884b6bb95fba57193764d8328d8a8807587b0e38dbd7951268e2db733be355315cca7527ca49b60acdd7f0702ffe6b6f06331b64999d93856fd8a40 WHIRLPOOL 29476f6b4481b2eb6b24afd071af87869516b9b09f2fd6bc304b7af8eed3b9bf7ea23bd157439199dc18c154c4b4fb61a5710a03f93f6b7ab984de0627989226
diff --git a/dev-python/dogpile-core/dogpile-core-0.4.1.ebuild b/dev-python/dogpile-core/dogpile-core-0.4.1.ebuild
new file mode 100644
index 000000000000..5ca90cb5533e
--- /dev/null
+++ b/dev-python/dogpile-core/dogpile-core-0.4.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A lock which allows a thread to generate an expensive resource while other threads use the old value"
+HOMEPAGE="https://bitbucket.org/zzzeek/dogpile.core"
+SRC_URI="mirror://pypi/${PN:0:1}/dogpile.core/dogpile.core-${PV}.tar.gz"
+S="${WORKDIR}/dogpile.core-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (	dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/dogpile-core/metadata.xml b/dev-python/dogpile-core/metadata.xml
new file mode 100644
index 000000000000..202081ef2752
--- /dev/null
+++ b/dev-python/dogpile-core/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>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+    A "dogpile" lock, one which allows a single thread to generate an
+	expensive resource while other threads use the "old" value,
+	until the "new" value is ready.
+  </longdescription>
+	<upstream>
+		<remote-id type="pypi">dogpile.core</remote-id>
+		<remote-id type="bitbucket">zzzeek/dogpile.core</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/doit-py/Manifest b/dev-python/doit-py/Manifest
new file mode 100644
index 000000000000..70dcac78c97b
--- /dev/null
+++ b/dev-python/doit-py/Manifest
@@ -0,0 +1,5 @@
+DIST doit-py-0.4.0.tar.gz 16534 SHA256 46896bbb592ecb954397de5dc525e74f46dfb578ecfb53b7c57d7f798d57e2be SHA512 72aa850928c99bf43eefd827334b361243da3b26283fa358ed3f7fba72d1916b1cbe50e581d3d62ed3b4f0efb9b5d1e7f59c3dc913b2ee27e6503bf4e47def33 WHIRLPOOL 0c9180a92e29d4bf2338c33af6e4fa3f23cfe6b5a35ee3c8eb060961a311796b8d1c342074a917bfc373f068e28a3c883fcb9bcb9be45057d44c35ef9838b6a6
+EBUILD doit-py-0.4.0.ebuild 1041 SHA256 2e868aa7038ea9189c84b403111a3a6f92d86c18f6f3459c791a788be53c404c SHA512 77df24c362ae3e0fc9d5cc7655aa3184a20c8eed10db8e1c431a57eb5b77b25f2e86b201090fa7047f1b961f2d2e66399a87a69109e071ae12947a67d46c71da WHIRLPOOL bd491035f1566141654aaf87b2ba8f360b51a15370c9e89d8e9d4eaa3058f1d5ed682f19abd44049a97731e72406da33b88e813a197aefe0b5c7cbfce979ba55
+MISC ChangeLog 2879 SHA256 67e6c8120f3719c9ad0f8e7aaf89571e5f924ed32cf9a4c7b83cf58ad63942d0 SHA512 fa52c501cbed8baa81e9238a0731078fce7ed6fe5be78274d2e7c3fe551049092e26d070fd8b67c0451b6890170d1feb6c1cea2d5395ff82ec26f3edb9939ca6 WHIRLPOOL 90d5f4738c0b63b1dc3e5213742e0e63e57803a143c9323ee54dbc46be9ef3a3a065382455b3bde7ebc7eec9abd81111329d4d526858f6bff0edee0950184c87
+MISC ChangeLog-2015 379 SHA256 0de703eab13e3459584375519879f0d8457883e9f06030d840cae3245698a49d SHA512 cc5c6c6986ed217396d4aaa9ecfb9eae05c6ff9808507c90d2e2ef0edc2eba98315cccb9cfc6b8411f7dc31e6769b9df47a90a97c9a5086535b3127352aa8134 WHIRLPOOL fb9ee114bb5874b907357d00770d0d5e8140e642b5490b17541d3b177aa665cf20f292935ab9644933220bcbe22649c57645123914a4ab71a7e19e67cf13820c
+MISC metadata.xml 237 SHA256 a26db6d31a921cb8c29a5263758b1118b41cbe60f61e13b1b789780f6ce58f71 SHA512 f87674e3eea3a9ea242100ba88aabe10df84aada9aa7e6e2b4b89f0103b20dc5b4d52fa43bbbb0fd2c5356bc0e544e1955a8fa0cbfd06503b51752d571bfae1c WHIRLPOOL b50fd77b578bca3306fe8fedae5ad5544d276cd82613ab7f676d393770ec177c6ce7c3f77922d5c29e4d002e5982f0cfa6ffad4de106c7f2dcf06b69def5d567
diff --git a/dev-python/doit-py/doit-py-0.4.0.ebuild b/dev-python/doit-py/doit-py-0.4.0.ebuild
new file mode 100644
index 000000000000..e9ce37e88770
--- /dev/null
+++ b/dev-python/doit-py/doit-py-0.4.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="doit tasks for python stuff"
+HOMEPAGE="http://pythonhosted.org/doit-py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		virtual/python-singledispatch[${PYTHON_USEDEP}]
+		app-text/hunspell )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND="
+	virtual/python-pathlib[${PYTHON_USEDEP}]
+	dev-python/doit[${PYTHON_USEDEP}]
+	dev-python/configclass[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/doit-py/metadata.xml b/dev-python/doit-py/metadata.xml
new file mode 100644
index 000000000000..db54c8a506f1
--- /dev/null
+++ b/dev-python/doit-py/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-needed -->
+	<upstream>
+		<remote-id type="pypi">doit-py</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
new file mode 100644
index 000000000000..7acc794ca15e
--- /dev/null
+++ b/dev-python/doit/Manifest
@@ -0,0 +1,7 @@
+DIST doit-0.23.0.tar.gz 316588 SHA256 5d0421be6e5528e3be11bd0ede5c232e0c91f2b98b55688d7db1ce0638e1efbb SHA512 f2298d76d9ce3e7ed5f356bfdeeef8d5d99ebae74571666a3d2b3843fc63f5a8f76cd6cdedcfe8fc81bc653ecf04951c11f50abd16e9aa8fc7539e3c224b0e4c WHIRLPOOL cfb09484e25cfbc9618ef5b4a750010d16281a13772a37a8da59f2f6e1ebed77bbc40c06f263062c0464e6689415aeac695c0ef9e5cfe561349efea61f8be8e3
+DIST doit-0.29.0.tar.gz 222341 SHA256 fcb479482644de3e83d6faed9b29373f1f38942b79b991a7432943a84416d5cd SHA512 a686457df31b414d0c3797789e0ae1ae5cdfa3674025236419cb59b254f342cd2db07911ef18b2cb576d8d817b44035b9372265b34b786b2779fb7074b394de1 WHIRLPOOL 64e5cedb8d3ce0b99287713c05041da477182d63f745c7abc10cb72fd3d856fee62514cfa97c4ae6a433e12dd43d70bf4dea751eff99b91430b538dbf0ab7012
+EBUILD doit-0.23.0-r1.ebuild 1943 SHA256 6828d90eb24fffaa547209d487b525f85f799e3fd6d74988b7fa228a57a7bd5d SHA512 458b643e432806e13a88e119c3a0621b7296ee3e1babca1031085f6a0d884c17fa3ccb0f3ab7bf912f7de2c649170389830f3b4332dc8b17b7b4906caf4dd538 WHIRLPOOL 6dd8f3dbb8e81df9d31570d946e4d500c07a0b829ef54c5a2b244f7aa8f4608f67b7417cd97cd702976386bc93f09222ce3b2555d2938ac5ae1055e059e36119
+EBUILD doit-0.29.0.ebuild 1969 SHA256 c34cc20f3292bafe5e5b5eef797c659e758e5bcddce4446cc42a52f4f194803c SHA512 eddc795927da520eb12fa5ad1a360951c281897d874a48ba54fb52f498216ef5f750eac5425b95cb70d9bfbe704f40681d735332ac5aa07742606a1e1fbc5c12 WHIRLPOOL 163ceac00bca1845c4df791eba613e416a23d49e6bbf8a8f18aa86c11a9506e79ea6545318380c69f0efb2214d2224cc02e29bab93586640401f8f9658104b8f
+MISC ChangeLog 3765 SHA256 867075f972cd8fb039e44af830faedef03d7628de9e70210932b4b96731308a9 SHA512 7665c5e4bafb3a3acb21754e907d556bfba77bec48371f37b939eb3cd9b30d77389b2226f1160e34f9e80c8581bfdb3896b3837804a9327498fdede03a1b9ec9 WHIRLPOOL 26dbafce650fa7af634541d8d8745aa6a3f94d7442ee191325e4cfb85f27e32e87cce5e2417df0101c03220a3132338f41b36f27106a80cd6e2cc70c18d0664d
+MISC ChangeLog-2015 2516 SHA256 7fa4f94214c75eb6bf0b487046ba8a3cfd1bcb7ee53441c4db75c1718ffffbb8 SHA512 fa230cd29866b2353ab9bdb0d19d5f3387e2fb07bfa9b061c94852e3fd9314d83c4ad2de9878a067b8a73e4653d6060713847177ad77a3f3e32d42866fdf700b WHIRLPOOL 1bf54dcf77eaa4a4f576be34f024445b37913dbdfa1f1fe8db93c4a9724745f52e78bd5026f5f89940c4ea2da01206a1944b3e9637c2e4c2b63b4afbe345e7e8
+MISC metadata.xml 268 SHA256 71383dc4357a8683e8d73cbf6d0e5cab662bba98b0d61d58c0a1854dca07730c SHA512 7318c022300ab1ccfddb09bbf4789f64185dba13c3e4befa77f0e7aaaea4fa650508f66cf39d00c760ceea31872022d40523af05ecaac1c6b59005bc23f5bc42 WHIRLPOOL ada7be43e06656ee767f07b5e0fe702c20efd0f4fc0680fab81fcc71d884459af1468baf4d376541fc9a15ad2238d9aa5ba5457d0672603df86ec74ad0dbc206
diff --git a/dev-python/doit/doit-0.23.0-r1.ebuild b/dev-python/doit/doit-0.23.0-r1.ebuild
new file mode 100644
index 000000000000..1987991014c9
--- /dev/null
+++ b/dev-python/doit/doit-0.23.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+inherit eutils distutils-r1
+
+DESCRIPTION="Automation tool"
+HOMEPAGE="http://python-doit.sourceforge.net/ https://pypi.python.org/pypi/doit"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="test"
+
+RDEPEND="dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}] )"
+# Required for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+DOCS=( AUTHORS CHANGES README TODO.txt dev_requirements.txt )
+
+python_prepare_all() {
+	use test && DISTUTILS_IN_SOURCE_BUILD=1
+	# Tests of this file fail due to setting of a tmp dir which can be fixed.
+	# This known spurious cause does not warrant halting a testsuite
+	rm -f tests/test_cmd_strace.py || die
+
+	# These 2 tests succeed on running the suite a second time, so they are NOT broken
+	# A gentoo test phase is run only once, so these unbroken tests can be safely skipped.
+	sed -e s':testInit:_&:' -e s':testLoop:_&:' \
+		-i tests/test_filewatch.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Testsuite is designed to be run by py.test, called by runtests.py
+	# https://bitbucket.org/schettino72/doit/issue/78/tests-that-fail-under-pypy
+	if [[ "${EPYTHON}" == pypy-c2.0 ]]; then
+		sed -e 's:test_corrupted_file:_&:' \
+			-e 's:test_corrupted_file_unrecognized_excep_pdep:_&:' \
+			-i tests/test_dependency.py || die
+	elif [[ "${EPYTHON}" == python2.6 ]]; then
+		rm -f tests/test___main__.py || die
+		sed -e 's:test_invalid_param_stdout:_&:' \
+			-i tests/test_action.py || die
+		sed -e 's:test_run_wait:_&:' \
+			-i tests/test_cmd_auto.py || die
+	fi
+	"${PYTHON}" runtests.py
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	dodoc -r doc
+	docompress -x /usr/share/doc/${PF}/doc
+}
diff --git a/dev-python/doit/doit-0.29.0.ebuild b/dev-python/doit/doit-0.29.0.ebuild
new file mode 100644
index 000000000000..2bef51932ca1
--- /dev/null
+++ b/dev-python/doit/doit-0.29.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+inherit eutils distutils-r1
+
+RESTRICT="test" # can't work as it imports nonexistant modules from coverage
+
+DESCRIPTION="Automation tool"
+HOMEPAGE="http://python-doit.sourceforge.net/ https://pypi.python.org/pypi/doit"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7 pypy)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+DEPEND="test? ( ${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}] )
+"
+PDEPEND=">=dev-python/doit-py-0.3.0[${PYTHON_USEDEP}]"
+
+# Required for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Disable test failing due to impact on PATH run in a sandbox
+	sed -e s':test_target:_&:' -i tests/test_cmd_strace.py || die
+
+	# Test requires connection to an absent database
+	sed -e s':testIgnoreAll:_&:' -i tests/test_cmd_ignore.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	local -x TMPDIR="${T}"
+	# disable tests where pypy's treatment of some tests' use of a db is incompatible
+
+	if [[ "${EPYTHON}" == pypy ]]; then
+		sed -e 's:test_remove_all:_&:' -i tests/test_dependency.py || die
+		sed -e 's:testForgetAll:_&:' -i tests/test_cmd_forget.py || die
+		sed -e 's:test_not_picklable:_&:' \
+			-e 's:test_task_not_picklabe_multiprocess:_&:' \
+			-i tests/test_runner.py || die
+	fi
+
+	py.test || die "Tests failed under ${EPYTHON}"
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_src_install
+}
diff --git a/dev-python/doit/metadata.xml b/dev-python/doit/metadata.xml
new file mode 100644
index 000000000000..aa35e52686ed
--- /dev/null
+++ b/dev-python/doit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="pypi">doit</remote-id>
+    <remote-id type="sourceforge">python-doit</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/dominate/Manifest b/dev-python/dominate/Manifest
new file mode 100644
index 000000000000..161249042f58
--- /dev/null
+++ b/dev-python/dominate/Manifest
@@ -0,0 +1,6 @@
+DIST dominate-2.2.1.zip 46460 SHA256 4aa6a2f458461541f9ceeb58b49da9b42320f80aa2a6f692baea2817431d9953 SHA512 3f79fa4258f98708b1e169693e83f919179c1148f440300426f907e28c26b28c21a1098793a14f7e89e5aba0de61f93c889a4908f0eb6e3641ffe234e215e597 WHIRLPOOL 18b57dfc4d0f825be45a1b248e434a8a013d5b76f065b854c47aab9d99c00f5d1854fbcd3c520de50b11b5d7f079f6e57b2e7167249b7e71ff980ac02dfd8100
+DIST dominate-2.3.1.tar.gz 27887 SHA256 4b8ce6f33633c9dd9175b228d21c00c801b6bd0327747cd5e17fc2da934c3a69 SHA512 599147cd9aabc7c3bc24e6c82a13b690808899107999a3b0d7d3f2f113b38c90f2c720298ffdcdf1933d2573cced05d730dab53265397b7fc010e57feabc10b3 WHIRLPOOL 258b490620bf358829a74bb7586864a078004268e7bd140322d27126484824ccff0533a87f41948bb13ce19cd47b020d16181a4ea7d74c3f12bf18479b047939
+EBUILD dominate-2.2.1.ebuild 662 SHA256 e2036945dd802436b66055157de74374eca62602bde8732a4e7374941daf9897 SHA512 e35a3f04d9673cc915f2776e828c12be6654fd552537f7ed64f02106fdefada4836a3c12ce35b6227786c614ddb62b4b907e13778e34b0e347e9120ac48897dc WHIRLPOOL 41b56939df384b81882a08083892ec82895d533c7dbc3409a9430cb3548689e31e7c72928b8fbbd6158661de632e45f7d642f33d15893349200c99bc4d605c2e
+EBUILD dominate-2.3.1.ebuild 644 SHA256 6906942c65255403a7cbd6007c93fd3a7e9654435eceb80af345a4b22be29291 SHA512 b9b84c0d793f09f3535bb41ea8c1ba2eadeaaf21603d81283f7c20d1e232d96f45f8c5eb68206db5cf5a06475a72b88530ede477e716a54afb0f3637a16c56e3 WHIRLPOOL 3de612b96b06943247dba5a2d0ddf0a66d65d3b79d23aa1f66210fa0651ae31b9cb724f4899645fe0864f678a97bd280181993b666a93d520fde69d70ee2f338
+MISC ChangeLog 1445 SHA256 f18e651a469f457b794eb062f682b415a7a1789fabd131dce200d60bdf744a62 SHA512 6145560ee09a4e372f0a32e412c71c9dec4279baf3670bee5281bd098790b8c622b510f2a9d1c654db717b01c77572d70d6a290bab6cecf84de4cbc283515d98 WHIRLPOOL 6b9c9b53b183d4e79a6249917a3cebeb13999fb4a212807ba725ed029f0af7ea4668f63005c0fb6b00b0b2f0aab0703cfc45a5ab30994e76d855bb46ec3121c4
+MISC metadata.xml 895 SHA256 3a1d014a7235e7cf1e25a4d543159734c1f02280892214d80039ff99ca060fab SHA512 97da1b81046a4ca19ff4cd66eaae0b0f49dc04e9d1368498e03ee577222f6a754eb467500ac1f47e26f6098aaaafaaa805da5d72b14202a48288c31391420738 WHIRLPOOL 6f89da042c99d5a3c64f6a752d39115b08e1f5e4f0ee9d4392b57f2e979fd93140904b14de6df757277b7d6de79efb1b71483de1aafcd586a0e183f54bea568a
diff --git a/dev-python/dominate/dominate-2.2.1.ebuild b/dev-python/dominate/dominate-2.2.1.ebuild
new file mode 100644
index 000000000000..12751f810ead
--- /dev/null
+++ b/dev-python/dominate/dominate-2.2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="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"
+
+LICENSE="GPL-3+"
+SLOT="0"
+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}]
+	)
+"
+RDEPEND=""
+
+python_test() {
+	py.test || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/dominate/dominate-2.3.1.ebuild b/dev-python/dominate/dominate-2.3.1.ebuild
new file mode 100644
index 000000000000..d149b940eab5
--- /dev/null
+++ b/dev-python/dominate/dominate-2.3.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+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}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/dominate/metadata.xml b/dev-python/dominate/metadata.xml
new file mode 100644
index 000000000000..3f517fafb3d4
--- /dev/null
+++ b/dev-python/dominate/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">dominate</remote-id>
+		<remote-id type="github">Knio/dominate</remote-id>
+		<bugs-to>https://github.com/Knio/dominate/issues</bugs-to>
+	</upstream>
+	<longdescription lang="en">
+		Dominate is a Python library for creating and manipulating HTML documents using an elegant DOM API. It allows you to write HTML pages in pure Python very concisely, which eliminate the need to learn another template language, and to take advantage of the more powerful features of Python. 
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/doublex-expects/Manifest b/dev-python/doublex-expects/Manifest
new file mode 100644
index 000000000000..6a246266b0da
--- /dev/null
+++ b/dev-python/doublex-expects/Manifest
@@ -0,0 +1,5 @@
+DIST doublex-expects-0.7.0_rc2.tar.gz 6151 SHA256 b98548b71cbfd0bf0b84b21094714d56f76896b69ca7824208ce3a6aa94538d9 SHA512 94e499f01fbdc73f3f97bbfb64f299d43e3b767f8eb00eecb7c05e062cedd8fa84569cc97ef48aeca24df5ff94b1bfbb330a786500641c857039c2e7d287e952 WHIRLPOOL 1f3c70b94b74d2ea85c70129b6519e67cf257d0c48b84b5191ef84efaeb066f45c8803921ccf9c3a03c5ed50ddd844ab26449dbc6c4498cd3aae663720531f49
+EBUILD doublex-expects-0.7.0_rc2.ebuild 758 SHA256 1786e6a0edd16b890152dcbfa3d5eff0c231ef03b919daa5853299b8b8c0dd50 SHA512 7d3971161703180dc9db7793aae03ef50449e7549e13c6257dd2cc3d92b5b1ca2cc76d6d21d90e09c1779e89dd66a775d241cd73930719c852a83b9fd54b4807 WHIRLPOOL 2155e33591acccd6053ff740162255f897106cfc8cd0c61b0fd06bda5f50293ba17c72c5b1cfb833748187d0b0116d404207058020f4ee8b7d40a02d14f27610
+MISC ChangeLog 3125 SHA256 f8ab54e27170f67c8d2005b42ce37f0c704bf6323b74d92be56c564be7c414f9 SHA512 14eb001d5f7d99a28c1d13aaa31e1236486a22fe7be7e1d105cf3e33cf715bd607cc2a004ff31a19ebc16394bdc8cbfafb757a708f1ccb6a5e3906266198e956 WHIRLPOOL e5758f396ce70e23a9b379a01f1ef7b41705cf71fee8b41a73c791f70632c14d852c0357ba7657ceda8c16310562c32e6b59b48fe3a1a8c4abc50ef45286daaa
+MISC ChangeLog-2015 587 SHA256 1d197d97e4a44baea96a57947e641ed6c45052d5244624fac6dd4269711dc3c0 SHA512 6569c14174f88810be1f730f8a9617a2445df1c40f68054143be39aff8f6b233ce8090675f37ce5953725f1de5d267df865b1f7f820a7cea9c9b1e0032c289c1 WHIRLPOOL c1e5f79a62f4a1c4bf2d5400896432247361cc672475fc7505d3425aa67c4aa4d91a9a4de8b7911f51d751a97038cc40e04504082fbf426f2ad0b925a1557c55
+MISC metadata.xml 344 SHA256 35039d557e484e753cc5da42b41af555e02ed82cf7215acec0891787fe91e2bb SHA512 807e55717822aecf7cd98314d19c48cc1ec4f0264a1a35a19083cc79301f094d26606fc75e7bde1de1d21e526478e077ce874427542e4d020f73c56288ab867d WHIRLPOOL c95247c3b6ea325fe6de57f6feb2fbc0f414742c4454b40ea1257dfa9b1f8c7030cb6ea4aaa15d8f1415a18233c76c9607091218f6edeca7138b75cd73a08aac
diff --git a/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild b/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild
new file mode 100644
index 000000000000..9ebcc2039ad9
--- /dev/null
+++ b/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Expects matchers for Doublex test doubles assertions"
+HOMEPAGE="https://github.com/jaimegildesagredo/doublex-expects"
+SRC_URI="https://github.com/jaimegildesagredo/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mamba[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	dev-python/doublex[${PYTHON_USEDEP}]
+	>=dev-python/expects-0.8.0_rc1[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	mamba || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/doublex-expects/metadata.xml b/dev-python/doublex-expects/metadata.xml
new file mode 100644
index 000000000000..76ba3dce6404
--- /dev/null
+++ b/dev-python/doublex-expects/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jaimegildesagredo/doublex-expects</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/doublex/Manifest b/dev-python/doublex/Manifest
new file mode 100644
index 000000000000..bab6b09b0f4d
--- /dev/null
+++ b/dev-python/doublex/Manifest
@@ -0,0 +1,7 @@
+DIST doublex-1.7.tar.gz 28964 SHA256 b8488c08cae47039671a343d54346e28ba7532f55963b5fd78a03cdae6a60391 SHA512 053d195abc8bc725eb04dda312b3e69bdddbb965f2936f93b624118046ea98fcea4b3163c48593354ff6ccacbdea9826799147b7dee0e4ce14e0899604c3809e WHIRLPOOL 85e16c1647fd9ae338f797dadea88c9d75b51e5d658c9e381b5b3420fc74e61f52b5e1346968238091d0f8ea0c6540f1b070c3591b779e92b416a90b112cb6d3
+DIST doublex-1.8.1.tar.gz 69685 SHA256 80e01004c744615b308c745068bf8df3425551037cbea6d97a3d91477765d65a SHA512 30d2b572862370da8402cc2cfa5481d3278f0fefd2d5b2f5be126a793c8e165df0e2ae6089ba321e71d994f14024b882933c1523f7a0b9e341bf75644b49e073 WHIRLPOOL 81283c427df9347c65e58ac82c9b2b87555cd47b3047672b2af59b354944e7ace7e48030d71335fcea570e5e34834d4aed7c38984eb91141565e94c70d4de631
+EBUILD doublex-1.7.ebuild 687 SHA256 d6c44e82613e11fb8ddf5b2b4420e73caf6b154c082e164240575e71e7f9fd84 SHA512 3f439a93d243a2d4e6aa71929d095e76cc42c3a26e98db6f70080bdb7f7fda86247655d6003f78f579a81fbc47bbf068b1b4c1ddb82e7d472d18169e50b14885 WHIRLPOOL b944f364e4b649fef957f73ea7582d77bfd954022f1f9ac8843d5d87fd08f19475ebdb97945b03ade52e455251148c6fa57c75f54c518608b588a511c55ea981
+EBUILD doublex-1.8.1.ebuild 973 SHA256 1582859ffda366d9afa901d879acf5031efaa1ba21ac687fb0be55cdfa16bf65 SHA512 d0c171a71f27c15a81dc6f0f2c856f43c606c8ed09ac9125b7d9ad35bdca125fcd4bcce99a887d7864421411e9d12d8ac707874a8de1f933fe029dba98222e23 WHIRLPOOL ed09a6d1d2232ff00d403a70aed60f9c8764f4cccebd1727658f06f26b23672cc8d076312bcf746d991e35e977c7e797f2035a35c31d0f1b2159211b0ddbc81f
+MISC ChangeLog 2555 SHA256 09e9864db4c051e920ccae4f2c28eac43556f80440de4a9c78a2d2a3c87257c3 SHA512 cae5f53477ac5150e85f5d0c44cd7fba3a45572a8b9819e2e5ca7e3570240839f4426efc611a6ffe49e5968d69d28ee36ebebe57f9fc37bafd2d214061f61c72 WHIRLPOOL 863b7fee9dc9d815658abee4ee411cc2cf69f87f91de6fb7057529be2a8e759aaeae07ccd5a3344b6ff47618f28e611ecfe8e8c19df1d89e42dc6f6723d537c9
+MISC ChangeLog-2015 700 SHA256 1651da63062291afb2bb61388475e840d33ca92c3dd2e1eb48ba2f3191331bde SHA512 2adc579df3109f0f3f6891507257c77410bd21e213b7c544489acf4e2f0414bcca1358f269c3724b610798a533436670a434c6d4258eabdb8fc43d603996ee76 WHIRLPOOL 0b0f2f367b52bfc27de54decd98128fc43049f49e88b1990b05ab271f8b80d8d9141613c2d6b1ed5cfed4b56b5c316dae842323fe56e862c45ffd102bf3ada10
+MISC metadata.xml 384 SHA256 c666ddd4b1b0d521ea69c0d2c58da2dafc0b6488cb7410a586e7632fe3fd321c SHA512 fcba4553b6ec5b883458ada74ffb7551b45378d64a40f3223398c2f992a4849bf36f0b12accc83be5df5006ed51df4392d43eecfef143276dffe8e678be4621a WHIRLPOOL 764b5a6c5534948e177a485b0fa7d37c755614098ff1dfc5c58845ea42bdfcd65d41c82874449b71c316264c403a4145b095b6d8bfd1131796161b5bc74d82df
diff --git a/dev-python/doublex/doublex-1.7.ebuild b/dev-python/doublex/doublex-1.7.ebuild
new file mode 100644
index 000000000000..33c48685bfdd
--- /dev/null
+++ b/dev-python/doublex/doublex-1.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Test doubles for Python"
+HOMEPAGE="https://bitbucket.org/DavidVilla/python-doublex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' 'python2*')
+	)
+"
+RDEPEND=""
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/README.rst || die "Couldn't remove spurious README.rst"
+}
diff --git a/dev-python/doublex/doublex-1.8.1.ebuild b/dev-python/doublex/doublex-1.8.1.ebuild
new file mode 100644
index 000000000000..9b04f90054f2
--- /dev/null
+++ b/dev-python/doublex/doublex-1.8.1.ebuild
@@ -0,0 +1,44 @@
+# 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 vcs-snapshot
+
+DESCRIPTION="Python test doubles"
+HOMEPAGE="https://bitbucket.org/DavidVilla/python-doublex"
+SRC_URI="https://bitbucket.org/DavidVilla/python-${PN}/get/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="dev-python/pyhamcrest[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' 'python2*')
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/README.rst || die "Couldn't remove spurious README.rst"
+}
diff --git a/dev-python/doublex/metadata.xml b/dev-python/doublex/metadata.xml
new file mode 100644
index 000000000000..3843202ccb7d
--- /dev/null
+++ b/dev-python/doublex/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">doublex</remote-id>
+		<remote-id type="bitbucket">DavidVilla/python-doublex</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/dpkt/Manifest b/dev-python/dpkt/Manifest
new file mode 100644
index 000000000000..a7a3029093f8
--- /dev/null
+++ b/dev-python/dpkt/Manifest
@@ -0,0 +1,7 @@
+DIST dpkt-1.8.8.tar.gz 102074 SHA256 d99525e534266818ecd122052f4086c684a88491c8073a848193bbf13ed69800 SHA512 c557b3b22462273ce40119ef045a2b15df1b87538de13de9b2183545e16cc4200545e08f2efe42a5af01d820cc48fde28e1155cc78b1d06a44482706ab485392 WHIRLPOOL 2c415c56e0c6ab700b930dfb8233d76d8beb2fadff243e76b0098f2be2e8bd6f749e9d655a4b0524d9ea8560dafa31131520d7374f6c19b34a7eae04fdca9b6a
+DIST dpkt-1.8.tar.gz 76311 SHA256 c56de2f9dc2f4654a356de0f0d458bb7b1c86c374988e8b4f358556f7dbe0507 SHA512 25af49a7b79d192382103e056e762e2933f37b6c72f490c9c6740883e18fdde6c983d640aa27514f15f77ac27e2f037b1943adcaa6046872f53d92e08de73cb3 WHIRLPOOL ede240f2a30f8fe9176784feb40b69e1f1f07ce8b88f75817b12c18193b1f6d227fab95f2f57e475c69aa137466863172dda07221cc203cc0d0e816f4a5c4962
+EBUILD dpkt-1.8-r1.ebuild 605 SHA256 d97b3e17d40019d96bb95a76d34ea7d78c027dd767044cacdd89f0f5b15d271c SHA512 cbc390676a7aa4a70128606136b351afa6e4938fa200761b728247dda25a2860ea87fedc77d78e4ad1167dfed248c70502a650f7aa19d266f2cc2ee3c3a9b130 WHIRLPOOL 3a5ac9a282744afe6e3de9afa2d6542e5201051a9cd17a473fcdabbc0e2708c1dd29c9813ccc9c93f9360b81c11eaeefe4a48c581a5e7e1961ba3e3d06177baa
+EBUILD dpkt-1.8.8.ebuild 366 SHA256 b8f312267078485606c2c7cd9e86a3f66034b36160aa3a11fc1c1a06e9e0df7a SHA512 13b20c29fc935f64323f1ff40291facc4d52be6f2774505e63f7b5007e7242c6565d43711cf3cf3fd4d6e546c2d49503d1c81be2d26b31fbb3f0f3bdf74c3b26 WHIRLPOOL 2e43d4aed746e192d19a5df2fa5cadcbfbe7cf93926e1af59c0b0b957ee6084f5d86d1ab71b2e47765c86232a5216bc43f365a779b230b7632a39a38def41dc5
+MISC ChangeLog 3386 SHA256 dcafd9228423e8291b3f02f720e2ba8ca07e62904fd3f2ee7ed7fae73edceca3 SHA512 566e4299b43196410ccc8923e01c96b01799c46c302efd2cfb1a290e1edbfc11557ed36d8bf6cbcec0c05ef75ba76bad8c24f337862d8ea8ed5e9e0582e235a4 WHIRLPOOL e36d157a21ee1bf52263f9ea1fbaa01e2236ec653add1601fa955dda94e65f04684e6b8a9dc442046a0355ff302501c00dd4e8de2f6b3456f70e0deff805259c
+MISC ChangeLog-2015 1498 SHA256 3b8cdb2a3ef552f6af8363266f045182d91b2f65be8e2e578d636b8f06e8dff2 SHA512 1cbd7e53b0c9ef6a77d2eaaf9eda7a546bb26b72dfa7364f3b69989b46dc27704f52ce7407da15aaaf1a1f1caa627bfb7cf76ea59d7b024f4600d0da01af1255 WHIRLPOOL 0d6ebbcfcd0751864521284fa740dcaf5dd0c317f2dfebbb08601eda5c9cefc930a1e60c1484c7ce3e0e2877ed196f59ddec655de97d6b8297a6a99a972e07b8
+MISC metadata.xml 359 SHA256 54be6f6dc67f000174247b11a9941386b292244c290ac9e464bc90e2fd14fdb1 SHA512 af89531dcefb76f23847300ab5ca0ccafdad16cb2c7fcf74b555165c7654536de7d232b027d6fde02f793a8daccb398643887329cecba7e6e1420bdcc02e14bb WHIRLPOOL 97d7ce95362df5a2aef2005396ad0b62e6c085042ffb6c0f713b791a2d1baac1423073d8669756bc4b327104afa65884d7851d8b5284edd1fdb33b696789811a
diff --git a/dev-python/dpkt/dpkt-1.8-r1.ebuild b/dev-python/dpkt/dpkt-1.8-r1.ebuild
new file mode 100644
index 000000000000..c52665d91e19
--- /dev/null
+++ b/dev-python/dpkt/dpkt-1.8-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast, simple packet creation / parsing"
+HOMEPAGE="https://github.com/kbandla/dpkt"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND=""
+
+DOCS=( AUTHORS CHANGES HACKING )
+
+python_test() {
+	"${PYTHON}" tests/test-perf2.py || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/dpkt/dpkt-1.8.8.ebuild b/dev-python/dpkt/dpkt-1.8.8.ebuild
new file mode 100644
index 000000000000..41443d806c5a
--- /dev/null
+++ b/dev-python/dpkt/dpkt-1.8.8.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast, simple packet creation / parsing"
+HOMEPAGE="https://github.com/kbandla/dpkt"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
diff --git a/dev-python/dpkt/metadata.xml b/dev-python/dpkt/metadata.xml
new file mode 100644
index 000000000000..c68aa9b04b19
--- /dev/null
+++ b/dev-python/dpkt/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kbandla/dpkt</remote-id>
+		<remote-id type="pypi">dpkt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/dreampie/Manifest b/dev-python/dreampie/Manifest
new file mode 100644
index 000000000000..45ecb51b0aaa
--- /dev/null
+++ b/dev-python/dreampie/Manifest
@@ -0,0 +1,5 @@
+DIST dreampie-1.2.1.tar.gz 168980 SHA256 8e82093f2f02a5c552715259d43931ae3128873643aa39958ace232235eac6c2 SHA512 e29d4b767985515c36d72c70d75a80985b8caf1c81ecb3126960998bca5cfe99f34ff8c5b2ce6a273a08761889718ed64b566f93642016a60c4ae6ac839b3a07 WHIRLPOOL 13081f106de2633488e3dfc232d5435b0f4959482274487663a7c1a1674c63c4d41adf3294f4b8016ca13615f7b4e1e0054b9eef753af7decdee6e97df262b4b
+EBUILD dreampie-1.2.1.ebuild 473 SHA256 d43c50ab79c4431a71f1e24b05903d30f059c060ceacae87e935229167e0dcd7 SHA512 6a3b66209265a12c87f67d34139fe9997327d0c891408cae1ad350b2b8398e9db7306aa93f74fb885733b14e6862311cbb5bf28d3eeab8330dc86e752feebd99 WHIRLPOOL 2eca7c5238d7d18879459ea69203737438ff32e3a289701b232bb7addafc1b6ce8006b4417cc39079749c64288663db893754910d21077752b114a016851e8dc
+MISC ChangeLog 2432 SHA256 956474911d1ca23706a441b081af25a4a035d5472d8e4b1564d0264c2ac17ade SHA512 9df1406fed18f39b9c115a8502f50a6d82c52a22e8a54657348a345f03cf1a11506f25990af7144b5a91ef9f47d9bf35fe6d657b6c74827e0ef0140acaa9f104 WHIRLPOOL 035d4c9dec3dc5314a454f8bb4db693aa10e634ec80e52f1b4bbac1c49eab109357715a804e9a2fb41ad13e3fb469e619530669e063848baf421c610bdbe365a
+MISC ChangeLog-2015 1396 SHA256 260a64d78f55fef5144660fa40fb55e7723f79339c4f352da47832786075854b SHA512 1b949561a77810cc51adf26db1724beebbc5416e2d32cf43cced5bac23a13b9b01fc7660c87e45be1566794cd3ebfe16f9cb8d162c434b8ef27c2577a15afa0a WHIRLPOOL 5eef0c115449e8c11588d42f2ab6e6f5caaaf4805f7ddd45e0f75d01b0708ad672ca9095b6291bfddc966d4ab6e8cbd1cebc4bc32d4c0bc3e948e82b3c6671fc
+MISC metadata.xml 520 SHA256 fdf406f5b07fd4233042d7a6f2e297ce8e17e7b0f9c1a8425df07192b946a69a SHA512 a5d1bafdaa1d30834bb3de32ac83710d33f546576332ba56c51c1c444de3d7a80ca24d99cbaee9d7dde9f77a5f13bb1501eda23b5f1c7e09299e6ee32b84e7aa WHIRLPOOL d003de8cbfcd050a107d2fba40b33e91da99c6451ac08d38d9c878caf15a2d0ff6d21c1001fd4be24aa79c23bba83972604f12216586b8fa684b09291abbafd0
diff --git a/dev-python/dreampie/dreampie-1.2.1.ebuild b/dev-python/dreampie/dreampie-1.2.1.ebuild
new file mode 100644
index 000000000000..03a964024d2a
--- /dev/null
+++ b/dev-python/dreampie/dreampie-1.2.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="pygtk-based python shell"
+HOMEPAGE="http://dreampie.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pygtksourceview[${PYTHON_USEDEP}]"
+DEPEND=""
diff --git a/dev-python/dreampie/metadata.xml b/dev-python/dreampie/metadata.xml
new file mode 100644
index 000000000000..2befb35ec10f
--- /dev/null
+++ b/dev-python/dreampie/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+  pygtk-based python shell with autocompletion
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">dreampie</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/drpython/Manifest b/dev-python/drpython/Manifest
new file mode 100644
index 000000000000..9a2ec6eb2bb4
--- /dev/null
+++ b/dev-python/drpython/Manifest
@@ -0,0 +1,6 @@
+AUX drpython-165-wxversion.patch 362 SHA256 d72248dad02415adbc54f355c59eef92ef1d4e208081ed327e35113a22dc3601 SHA512 f9b76986a46be5d3671646345b6d48e9dea902065a7ac3724008e5bc742b5962248d1d6806fdd8ab0aad8d6a377e70874b810872b670abd9d5ffda0c60405701 WHIRLPOOL 9e3ae8d6adfaf1cae56bb0051e64db99d8a908c6a7105613d8036ec7a2475f4a59916e752474bae375c6a4656e385edefda1fd5af06e8e62650748d731603460
+DIST DrPython_3.11.4.zip 824982 SHA256 37a2e4873fb6accd1145f89518db101458c2f43fbc3ea7cf3e2de446bf353f42 SHA512 13943eb28d7155e99e0ffb57903ddde25c964c908ac848f14041c456bc6aa71bab7cad1101e489c09ba5efb5af35e33895a518021bb607f5047844927bcebf2b WHIRLPOOL 56fd68e4abda8f39bbd86060eb397d4bd9360547e26cbca875f8256cadc19efd5de4bedb6d61f116cf63b3cd5167bf0dec9e21bddbbd0d75fdb6c246350ba483
+EBUILD drpython-3.11.4.ebuild 1128 SHA256 159673c3c3673b5e742827f91402d4b4fb8c3b08472f6a8313baee4602fcd103 SHA512 dc447cfaf48e7ee23edeac52fcec264b559a898c912530ca19ae26c57d9caf8ee79e3297320d2c09f350451109bb1107bafb94e3b4a2e059d7fa52ac1b48aee9 WHIRLPOOL 5d89cf9ff4f1711fb64a0a88bb27a55adf693002a74788e7e8a0c1d684978812ea9e1f2d4082d6b641067d83f5c95335dc6c3c1976c9b5515482a7f9014b06b1
+MISC ChangeLog 2585 SHA256 e588f53adc20dd249b1bff89b33328d1786e0df879e931c5705158b1b7cffa70 SHA512 7441b2f4b9e770f9a8f0080e50d2892b70f3f02f5c648adf346b2ef82cee8963cc7b7af0bc311c300f3070196e13e854d1eb8d87702da6e987475f6a05974366 WHIRLPOOL 01096fa5b4487fafe95089171bc98ed5886d5f53d2c856fac3a6874291e9fad6682316d174526d95a473cce8e7fd05a3ba7cf02d6f126d9dd41b82725d7fc106
+MISC ChangeLog-2015 4217 SHA256 07a9fef0d95c5428aeb99bb89076f816df47d058bd9f7fdb1734e3e616dbebf0 SHA512 03757eb5af108809583f467fbb1ba208c3024d0356ef51bb8d226e119dabc8caac9bbc5cf62c0b69e1f2f2feaeeb5733f6cd82b15dce79bc0da69b62f2764c0a WHIRLPOOL bd88afdf45c7ad51aa15b2512cfffc28cde2364cd9ea6615c3abe4104a3f8a73a8f1d97b3c8a44e57ad9aab272be66243410f8f95c97b95fb7ba98f140f6d6f6
+MISC metadata.xml 777 SHA256 ccfe92e19b6f898976ca05c00b3efa0be1ff3ea70a039a42d7dd6e43b6ee89d7 SHA512 baf982a19727f07a800dc71741af9ccfa5a3727d9695403bcc99eb8cde1a8ccbc5a704e68f82497eaae5558007985d33cba7f8d70b94700977db8fff99be6f00 WHIRLPOOL c0a519a334079e20078079d0d4463716a4fe57548e9b97c7360a64aac0024ee95b15e8d70f53d45b732d0d5e600ecd0f643bc5f204683df3bf15f30a9861e75a
diff --git a/dev-python/drpython/drpython-3.11.4.ebuild b/dev-python/drpython/drpython-3.11.4.ebuild
new file mode 100644
index 000000000000..f59c877bf5d8
--- /dev/null
+++ b/dev-python/drpython/drpython-3.11.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="DrPython"
+MY_P="${MY_PN}_${PV}"
+
+DESCRIPTION="A powerful cross-platform IDE for Python"
+HOMEPAGE="http://drpython.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ia64 ppc x86"
+IUSE=""
+
+RDEPEND=">=dev-python/wxpython-2.6"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/${PN}"
+
+PAYTCHES=( "${FILESDIR}/${PN}-165-wxversion.patch" )
+
+python_prepare_all() {
+	sed \
+		-e "/'drpython.pyw', 'drpython.lin'/d" \
+		-e "/scripts=\['postinst.py'\],/d" \
+		-i setup.py || die "sed failed"
+	sed -e "s/arguments)c/arguments)/" -i examples/DrScript/SetTerminalArgs.py || die "sed failed"
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	make_wrapper drpython "${PYTHON}" $(python_get_sitedir)/${PN}/drpython.py
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	elog "DrPython plugins are available on DrPython homepage:"
+	elog "https://sourceforge.net/projects/drpython/files/DrPython%20Plugins/"
+}
diff --git a/dev-python/drpython/files/drpython-165-wxversion.patch b/dev-python/drpython/files/drpython-165-wxversion.patch
new file mode 100644
index 000000000000..bab247c2110c
--- /dev/null
+++ b/dev-python/drpython/files/drpython-165-wxversion.patch
@@ -0,0 +1,12 @@
+diff -Naur drpython-orig/drpython_wx26.py drpython/drpython_wx26.py
+--- drpython_wx26.py	2007-03-23 19:20:02.000000000 -0600
++++ drpython_wx26.py	2007-12-03 18:36:01.000000000 -0600
+@@ -34,7 +34,7 @@
+ 
+ ## testfile for older version
+ import wxversion
+-wxversion.select("2.60-msw-ansi")
++wxversion.select("2.6")
+ 
+ if __name__ == '__main__':
+     import drpython
diff --git a/dev-python/drpython/metadata.xml b/dev-python/drpython/metadata.xml
new file mode 100644
index 000000000000..ac5d572905b7
--- /dev/null
+++ b/dev-python/drpython/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+DrPython is a highly customizable, simple, and clean  
+editing environment for developing Python  programs. It 
+is intended primarily for use in schools, and is a tribute to 
+DrScheme.
+</longdescription>
+	<longdescription lang="ja">
+DrPython�Python言語プログラム用��柔軟��簡���安定��開発環境��。DrScheme�触発�れ�学校��教���る事�念頭��り��。
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">drpython</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/dugong/Manifest b/dev-python/dugong/Manifest
new file mode 100644
index 000000000000..5f60b5cb864c
--- /dev/null
+++ b/dev-python/dugong/Manifest
@@ -0,0 +1,8 @@
+AUX dugong-3.7-test-html-escape.patch 1765 SHA256 16f992c7afbd58616874d0fa16633e91f7614b5d624dbda09baa2f4ebcee4a77 SHA512 8a341199805baef25e4d8316e7a5f290b5e33c97b53a53f19da03eb55035feed2ba7709e3429ac69c906af86c63dbc21835c3ccef4aa713ffd09b3d1643b7f3d WHIRLPOOL 8f6539010cfc1e817f9e83eeaf18d28626af89f23014c2a701ed24a7b594373cc051f26c4802bfca4914b4f58281c0b5016edacc6e748dcb22daf68bb78b8b3d
+DIST dugong-3.7.1.tar.bz2 194243 SHA256 3bf01631c4ccd1be2b07aa0adcda94b8627457207cd5cd7f8438c0d7fad63509 SHA512 85c276bba85d650bf0baa6257bf0872cb2da546a23d19e0c94cc15c95721a8d9f6392db0e64b38ab2e801803e3ab7908e6a931d18736d33c87138eca35b4f27c WHIRLPOOL 5d229cc20ce27f295068ce92d77092e69f21ce72ddd511478b902e421e9061d79df1325b67abe0205ca21b1bec559a5069f74c56ed0fa1cbb60213b473c15f07
+DIST dugong-3.7.tar.bz2 193975 SHA256 68f7810742e1c54a5cddfa49992d416704c13b25263bd3278f7581cbc2adb2e1 SHA512 f6e637946ec5f402a21dc40f08ab187bed281b4b7c27c056651eac049d9aaf4c952bfa5e19c05db6cac2d284cf7dbd47250b82cdbcac998971fd10466a47fe21 WHIRLPOOL 3ee51fc0f085f94f64d04b6ef04fb69db8f4a569347eee4fbb1e18727343752dbf6b7df080776ca38b87f49d8495b5bd6361eb25f3cd12b4bc54b911be96a87c
+EBUILD dugong-3.7.1.ebuild 780 SHA256 540ee7c6a906bbe70c31a40108555abb8890b320a584d0b765aa5350f8bc85bf SHA512 6fbab44fee8b135c83fd1223cb1e4aa41db5461819daff48deee4d6347528f0612ed05d91b343782ea1d8a5817e56a4cef102ef5e1b4a3af5502a2c016653283 WHIRLPOOL 4b78fa26229d6897798855b3716ce8d9b2f8ac6ae6183f3cbb327bb5c688b6b07c67522818073666941c0efb91def8791d90c6b1cca4d25f40cf9cf1d4788a92
+EBUILD dugong-3.7.ebuild 834 SHA256 bf914ef793ac2d92d83a64ded4d5100c4b93c0c7e9c3db1c48e2f7e5a476e1b2 SHA512 598b1e257aa1fa05c5135ba138fdf99b3f47f2a2855614206aa67095d27b6ad538dd24d2670b572abed386db3f5e2e691a6130a70b03a523c2af0eb7ab1d2211 WHIRLPOOL 21bde836b9ae13944bdd84efce452d34e812830f4bd39e3d1e25b0f22a5a03334f9f07cf3887a24fc4423b5fe9fe4d075b060373604a1218d9c6c86ea56ef4e1
+MISC ChangeLog 3240 SHA256 4068be61818a79fd9e8276f097f4432deb3014c22148d038dd68064d3da7a81f SHA512 bf537c076185f11030d7ae11c78c1fd8a2cfe861147acf1a9cf743ef33f7471c68cd4181463e21f753eca42f4954a914687e0a07db64a221e108ede6b27f362a WHIRLPOOL 91ba998cc672c43a098c8a5528e821368d6aa1e53282b22f6c2d664db954b00a9800d121f7508d117a89b2685a200105438aa7fb6503f18c75d0de72f1aac32c
+MISC ChangeLog-2015 2001 SHA256 03fe06b256da708ce56dac8ce84a39aa221b79067d27dff103344732d0fb7edb SHA512 98edb7674ed32f5e6fa62a856d956c2dc1cbe1455acc759569fa2190a1a1d15df6aca48718cc797b6e8234b0911243f89b1db0022c45a02d160f94ca085ce335 WHIRLPOOL bad3116519cb90b9204894846aabbdadd5ebdfe4f685eb7a14dfcfdbbb49524338aa1c1ddee7d11c35f0547666c5439047007a8d08a819f69bfcedf9130c87e0
+MISC metadata.xml 386 SHA256 45b08ac16905a92aee10b7201cef39990c03168d03e6a45072fe3925f04632a1 SHA512 9ac2081eb11077d2d9d7318410053fca1855abc8fe288bc18de829c1874e38c649620c56e2a7eb9fe29e41bed8dcb7c3327a2203c60511ab233a58d93f542db2 WHIRLPOOL 8c6d2191b5ef2a115ad658eebd5f07cb9f596df1d769d0d3ea67056861c0b2887115ab10d12286f84f13bdddd2b42949837a9f5d9843452c19a3dd887e1457c4
diff --git a/dev-python/dugong/dugong-3.7.1.ebuild b/dev-python/dugong/dugong-3.7.1.ebuild
new file mode 100644
index 000000000000..d5bddcb825e4
--- /dev/null
+++ b/dev-python/dugong/dugong-3.7.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for communicating with HTTP 1.1 servers"
+HOMEPAGE="https://bitbucket.org/nikratio/python-dugong/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dugong/dugong-3.7.ebuild b/dev-python/dugong/dugong-3.7.ebuild
new file mode 100644
index 000000000000..326f69c1fc63
--- /dev/null
+++ b/dev-python/dugong/dugong-3.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for communicating with HTTP 1.1 servers"
+HOMEPAGE="https://bitbucket.org/nikratio/python-dugong/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test-html-escape.patch
+)
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dugong/files/dugong-3.7-test-html-escape.patch b/dev-python/dugong/files/dugong-3.7-test-html-escape.patch
new file mode 100644
index 000000000000..ba2ee587d0c9
--- /dev/null
+++ b/dev-python/dugong/files/dugong-3.7-test-html-escape.patch
@@ -0,0 +1,46 @@
+# HG changeset patch
+# User Zac Medico <zmedico@gentoo.org>
+# Date 1494468556 25200
+# Branch test-quote-html
+# Node ID b8a28438442ec12cd4067fd3240d9afc8e6998da
+# Parent  a986296769f3fc4daa0f29fe28b857f43d05634d
+Use html.escape for python3.6 compat
+
+https://bitbucket.org/nikratio/python-dugong/pull-requests/3
+
+diff --git a/test/test_dugong.py b/test/test_dugong.py
+--- a/test/test_dugong.py
++++ b/test/test_dugong.py
+@@ -24,7 +24,7 @@
+ from dugong import (HTTPConnection, BodyFollowing, CaseInsensitiveDict, _join,
+                     ConnectionClosed)
+ import dugong
+-from http.server import BaseHTTPRequestHandler, _quote_html
++from http.server import BaseHTTPRequestHandler
+ from io import TextIOWrapper
+ from base64 import b64encode
+ import http.client
+@@ -34,6 +34,7 @@
+ import ssl
+ import re
+ import os
++import html
+ import hashlib
+ import threading
+ import socketserver
+@@ -1163,9 +1164,12 @@
+             message = shortmsg
+         explain = longmsg
+         self.log_error("code %d, message %s", code, message)
+-        # using _quote_html to prevent Cross Site Scripting attacks (see bug #1100201)
+-        content = (self.error_message_format % {'code': code, 'message': _quote_html(message),
+-                                               'explain': explain}).encode('utf-8', 'replace')
++        # HTML encode to prevent Cross Site Scripting attacks (see bug #1100201)
++        content = (self.error_message_format % {
++            'code': code,
++            'message': html.escape(message, quote=False),
++            'explain': explain
++        }).encode('utf-8', 'replace')
+         self.send_response(code, message)
+         self.send_header("Content-Type", self.error_content_type)
+         self.send_header("Content-Length", str(len(content)))
diff --git a/dev-python/dugong/metadata.xml b/dev-python/dugong/metadata.xml
new file mode 100644
index 000000000000..2ae422c40102
--- /dev/null
+++ b/dev-python/dugong/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">dugong</remote-id>
+    <remote-id type="bitbucket">nikratio/python-dugong</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
new file mode 100644
index 000000000000..e05e1a8b3343
--- /dev/null
+++ b/dev-python/dulwich/Manifest
@@ -0,0 +1,10 @@
+AUX dulwich-0.18.3-skip-failing-test.patch 695 SHA256 0c22a6b14ae58031a6454fb41e5966c238ef109cedacfd535fc796109c85280d SHA512 765c9942b0d46d9da5a78a972e4277bf55febcb9ab3991cc1c9561f84ce0c22bd37a5ccca75cc804db51436676393e5e6528e83ef4d599ba9859cc1e4efd98f4 WHIRLPOOL 022c20f5b10edf34bf9706e6e6e1e1824cdfcd0c1c477a64f95881f1154070652ff7a11961dc244e751d861b24af91ea476d846946c69c3794dd51a7674bee20
+DIST dulwich-0.17.3.tar.gz 311704 SHA256 0c3eccac93823e172b05d57aaeab3d6f03c6c0f1867613606d1909a3ab4100ca SHA512 1cc7950d53b8d8bb98f9206e1ced74857f756d4355813ddb2463cef855419ac57ae411e422e500b736c3e577f71da70d675d1f172140d4cc0645d3d5ab9e6e32 WHIRLPOOL c094224fd8c8f135114a7a91f4bbf509f7c28c24d3cdf8e6af25f8ccbbab6fb1bbe39fae1594429844746f6e006f4a63b9536fa84ecd3d617c6c6f5a2a2d5fe2
+DIST dulwich-0.18.3.tar.gz 328891 SHA256 d34c2628f89a5ac632fa462b2edd5afcfbf512793cfa14452d4c52f786962a8a SHA512 c89ae096407b59b37c2c36e7a429f2162950a0ee93f0ac619ea74c7ce48231ad9af097203dc8d9e2cd59bf1962f9c13325de61e9988c402fd3e212aacd910898 WHIRLPOOL 6d7aa5dd97fbc61d4248dc44626375ff465b132ae7c4ef8b60a473f138e53beb909e23e7a2fa2307a8bf44a8df52ff87f8958a41830ba16783918494d1668e01
+DIST dulwich-0.9.9.tar.gz 270127 SHA256 084e762c8d4d0c0002823249db57b8e735c99c409dacc2849565dd3c0c288496 SHA512 5039e8e80c51b8ee0df2ba0805fa63d9b476a05c86b6bd9eaf9348ac03a83f0f1208e259ae6bcf40fb2c94ffb57c9b45bff852e367b8bee95c10e672d3dc19d5 WHIRLPOOL 2a79d25f1233d9a6a242d064af179486810555eb3c9803c336ae152095318a32eb8588779cb07f84b073a05bf7f083ba3b3d4c8d2b4f8929b2aa3d01c29a0a01
+EBUILD dulwich-0.17.3.ebuild 1092 SHA256 e9b94ee590481f98b70098de750ea8a0836a1c7fa01b461722f474c30ce74ddd SHA512 939f40f9ad38434cc478523124f95d962bcaee47d61d96b29e061dd21322e5c153cbe5113b2edf7d5246f6b4304b1525972e4dd540ad08dac05f7fc2cdce019e WHIRLPOOL e4558d89d2e7168946fa03825556fa2d4e98342a05f422d79ffb05a6f2b5691cd9435927f173d8d2a41fbe59e70c577943bc8612fce8df6a1f461f3d5536c7e9
+EBUILD dulwich-0.18.3.ebuild 1317 SHA256 79ed3c2a37021a04101c82144cfeb6758eb5464435755d5e5f51e0e7e173025a SHA512 d950082e949531b0b147583c21ed64a830cf3af169aabf124e95e14ba79df263f654c84cb1f2baea2b0737e34efc71146169d52e6c79dfbd3bf845bed1623d11 WHIRLPOOL 3f390b430dbc5b94a4c7ddf325b51f12cf5cbafab7ba9309bc594bbdcf5ac6d822d2169ec8f7541936d7d8dead7573ca924d353b40a18bf400de45fbeb19ba63
+EBUILD dulwich-0.9.9.ebuild 1152 SHA256 3c18382d162513aa30640c0f1f99493e36fb7e5cc2297c4b934efceee867919b SHA512 d89285b81edf0d4203d021d436e6cf6b663609d358defa237f385cd5fca794a1a796ed377306725841af63050e143b04e06f47f175c4faf1de5b1659d89e1ab7 WHIRLPOOL 880822cc63b82297285b110a897bac9d662b13db8ee57e820419dc6225b98f430c3b3257fbc2ec961c2f4aa09ebffb8d769ead7643784c7ddfde410998872307
+MISC ChangeLog 5566 SHA256 456fe5a3fe54213a797a8719b7bd05269e501dae63561ffc72d8dfdf59a59e52 SHA512 211a71ba199cfbf8747c91115e3238f0d8fe68d9b771aa021918d1a84681e7d0b069fbf010451690fb98f3e295eac8deb4ba515586d143a39a16e18d80e88186 WHIRLPOOL ec2aa403a347a077e8df0c6c9906174871f15895f21388d853801a3083ed81bcee2c182c873d7742ad23b4db30d07a85c109ffda4f2a832133882f72e35bb60f
+MISC ChangeLog-2015 11626 SHA256 8a382497fec7ddea5941387fdd95109637f5907f6bac863f71d1491cc0522704 SHA512 ce06bf2988c44d4792625fdc8005e8ddd965cb24ddc8675ea16cc508879e3ab509d097376bce072480aa615ae1828c0171ea3b6d56f3f904bda16a328615e4df WHIRLPOOL ac50f0042c1d1e69009548ce47309daddf6ffe35243d1f2a409ed94d689a35e80fccd1529af1a93b039553c741dbcd4a21865a82d07d0c6d5b803c366425d9a2
+MISC metadata.xml 555 SHA256 b06e339e494957dad20ecd074e962e13d549cf2aa143b2b7a625a602a4cae2e0 SHA512 1f48222049a8ada15172ca0868c6b3f2eda4f465409cd1058ab6b9e498a521ac52d14f1bc2f2265c588f0afb9d874f4a45e6effef40e022f9bf8f6c7e4e38353 WHIRLPOOL 3ec89f1f7eb465e8a53d09b7e53e7037fb2f542ae805fb99bf0be77aaab819d623fbc36b1acc87f45215463b547585978c60e1b50c8091163441b37f91cf25b4
diff --git a/dev-python/dulwich/dulwich-0.17.3.ebuild b/dev-python/dulwich/dulwich-0.17.3.ebuild
new file mode 100644
index 000000000000..1df644930671
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.17.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
+HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.python.org/pypi/dulwich"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/geventhttpclient[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/python-fastimport[${PYTHON_USEDEP}]
+	)"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	emake check
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dulwich/dulwich-0.18.3.ebuild b/dev-python/dulwich/dulwich-0.18.3.ebuild
new file mode 100644
index 000000000000..2ebf7ec54dfa
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.18.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
+HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.python.org/pypi/dulwich"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/geventhttpclient[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/python-fastimport[${PYTHON_USEDEP}]
+	)"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+# One test sometimes fails
+# https://github.com/jelmer/dulwich/issues/541
+PATCHES=( "${FILESDIR}/${P}-skip-failing-test.patch" )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	emake check
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	if use examples; then
+		insinto "/usr/share/doc/${PF}"
+		docompress -x "/usr/share/doc/${PF}/examples"
+		doins -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dulwich/dulwich-0.9.9.ebuild b/dev-python/dulwich/dulwich-0.9.9.ebuild
new file mode 100644
index 000000000000..6aa147ef4093
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.9.9.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
+HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.python.org/pypi/dulwich"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/gevent[$(python_gen_usedep python2_7)] )"
+RDEPEND=""
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# https://github.com/jelmer/dulwich/issues/196
+	if [[ "${EPYTHON}" == pypy ]]; then
+		"${PYTHON}" -m unittest dulwich.tests.test_suite || die "Tests failed under pypy"
+	else
+		emake check
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dulwich/files/dulwich-0.18.3-skip-failing-test.patch b/dev-python/dulwich/files/dulwich-0.18.3-skip-failing-test.patch
new file mode 100644
index 000000000000..210908591dc2
--- /dev/null
+++ b/dev-python/dulwich/files/dulwich-0.18.3-skip-failing-test.patch
@@ -0,0 +1,20 @@
+diff --git a/dulwich/tests/test_porcelain.py b/dulwich/tests/test_porcelain.py
+index aa8587f..d1ffb9c 100644
+--- a/dulwich/tests/test_porcelain.py
++++ b/dulwich/tests/test_porcelain.py
+@@ -41,6 +41,7 @@ from dulwich.objects import (
+     )
+ from dulwich.repo import Repo
+ from dulwich.tests import (
++    SkipTest,
+     TestCase,
+     )
+ from dulwich.tests.utils import (
+@@ -634,6 +635,7 @@ class ResetTests(PorcelainTestCase):
+ class PushTests(PorcelainTestCase):
+
+     def test_simple(self):
++        raise SkipTest("broken")
+         """
+         Basic test of porcelain push where self.repo is the remote.  First
+         clone the remote, commit a file to the clone, then push the changes
diff --git a/dev-python/dulwich/metadata.xml b/dev-python/dulwich/metadata.xml
new file mode 100644
index 000000000000..989b825f1436
--- /dev/null
+++ b/dev-python/dulwich/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grobian@gentoo.org</email>
+    <name>Fabian Groffen</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">dulwich</remote-id>
+    <remote-id type="github">jelmer/dulwich</remote-id>
+    <bugs-to>https://github.com/jelmer/dulwich/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/dynd-python/Manifest b/dev-python/dynd-python/Manifest
new file mode 100644
index 000000000000..8ccb5838088d
--- /dev/null
+++ b/dev-python/dynd-python/Manifest
@@ -0,0 +1,10 @@
+AUX dynd-python-0.6.2-out-of-git-versioning.patch 613 SHA256 2d9441e2733d9cfe8fbadd4528f43baf5d31cd5ad215a82001815fb0e170460b SHA512 c9ec0b2bf7cdbc559dfca38b540d09360523c8162a9267cc9cb1effdb5c3ea02fd4d5252c1ac6190e0984a1d458bc40c60fa7ea92a9ae234b05f500767a2ae72 WHIRLPOOL 264c37c42a347c39c148630549662f100ab88e87f6e3d314abeff7a629565466281b182bb365a4994e613f2e3740b99c7ddaff33a2b64499c5cda5c1f5f2157a
+DIST dynd-python-0.6.5.tar.gz 231313 SHA256 63552c19d7da7a6dd417d75de45af61aa70f336e09d48fea0f5f9f571b41785d SHA512 46af19bc26c8f410ac26d4e756a726a56f2d852bfa21dca03c4c47210ed9074a7e017bdd2ecb1de3d00af37815b4a20885cd7945af4c8536941e9106bcf49f12 WHIRLPOOL 7a8941b0b678f4cf83eea7906ef060afa60a3d3168ca1a375ba8349b26cdba2437624150b8494d8f26bbb80f4cf4a8ca30685fb38aa9088b62e7df927dcdc8e0
+DIST dynd-python-0.6.6.tar.gz 233618 SHA256 cfd71413832c8c44f8357268ffce99f013184c339bfda5a9186610e57f32644d SHA512 c6be9acf0a4dd2446d613cc0c251b56fcd529fac733ecd63d0450806d7f4af2191ef4e861d015177140ca997464b591562a9f478ea83638516fab8552ee88c06 WHIRLPOOL b60e3d774fab77df19788b6eb8f812a19126a109ca7158de7eed2ffbacb3da7866935c39da985323dba3e79817225732d4ebd27d584913709ab527dbf05781ad
+DIST dynd-python-0.7.2.tar.gz 184981 SHA256 b86f9e25d0fc9dd9ed89181cbfc0085c767fb3170e0d708767986d00063e96f3 SHA512 e51df7b368b1f6869338cb12a2f093064b1e7531ef674a83dbc7b9cc1dc6143cbe12cb37273bcc01e7b1066eda541b3b15473bc01e88fd9a8d1b594f6f37eaba WHIRLPOOL 11591748f2da74bc0ba803b58f5557f647ce52d890e5621b9fc834ed27a41cf71038690656948a4f4cf9791023887ba4efee25acdd3286db8424094f02acddb4
+EBUILD dynd-python-0.6.5.ebuild 1829 SHA256 8901192ea74269ab7e82b7fbf4c5e1a366b7bf82a3547018b1cd1cd033b8e6e3 SHA512 5ddab3e99206cb62e7eb18cbfdfe86f18439e8010764e3cb99c92ae555bab8b6c5cab6c3d366c978562b634d12ca58f69f611c24666827f6b176668b595d98a8 WHIRLPOOL 21a438c797ab44b60b6b9da1643ea7b1dca5427944bcb3e8819bf0f932471ab0499b1dae9807193a548da6de29312280defb026a1abc922cdc8ed4b64ed2deb6
+EBUILD dynd-python-0.6.6.ebuild 1839 SHA256 a64d8d263afd7e7f75d3fbd1e32d3dcabb132aa3eefa1c611026f76df2b83745 SHA512 115c339635361b0377f7e70670d534d37ec0451ae0285b25767367a12b2674199759f133f1c2241f6f80db175528c32fe99c72d3ef1d6f65d4fe17df110528e2 WHIRLPOOL 906806cbd6e607c794dcc11d0e473ad47192c5ee4d032e54c306d3e04cf88c164a9aae84148decbd65a294e1ea7e52f91ee0f7cf752c0d3c6e4f43950f363001
+EBUILD dynd-python-0.7.2-r1.ebuild 1543 SHA256 4b3243e2db8ee65e966598606e2a640ec45620ac6734d66b301d4aa1a7270f24 SHA512 86ed7448a9e1e56d5e1c9e6c9c0a1eaefd42cbe0fcb8690293335cbb5dc9ac43901c62e320eb20bacc360d4d59970feffb1b846cc6996cc79b1ab0b9b5354ed6 WHIRLPOOL 5f35bd3118476f7670dbf95fb3681baf9cc56ff621f3e9b0741897174c45eaccce37556ec9b29d6b1cfa71ecad7ab465b7072fc94a738ec1852ded03e15342f3
+MISC ChangeLog 3125 SHA256 f979ed27908de1c3675628beb50b72f80ac6dfb7f917e1b3006ee44deb774240 SHA512 72fa3928a02661a6491a2cff2fc281b615c864472c2310d68e83ab1098aaf7918e82e49f2e644cf04f402e9473fafcdf8bde4abe3b28c504856b6e07f1f8284b WHIRLPOOL 92bb6504473767145f868bba3477ed5d2d60d7cfb18ed8998702da65813b69a1761edd679800d13116c0a2f7c1e58e009e2208351f671a95a11b0555716d6420
+MISC ChangeLog-2015 1511 SHA256 5e352f810d60bb2a524e0a9fd62390b26f1c21a4d4c95018ff1ba8411a19258d SHA512 b6b5863f6b4115cbeabf954976c4504e637ff0ac4f541b339c93488e63235b8947e08f208518fdd5e49ba43081ce76a1218f3e9e7efd484fd0090d703d66394d WHIRLPOOL 65f23412e735ac6ad95133196e49356fc047bef033b0c46f9004d1cc1909876f9ec34a372cdace2829c131d2806a1921dd0ce100030f0a0f5f7917b998175dde
+MISC metadata.xml 529 SHA256 cc9419f7cc306457883f5815b0621e1117ec8d969ec01492fa902d4b9931bd96 SHA512 8500904a91a51d552ef6f0fe17486b8d935bc4f50860120376ed40a31c002bda8ca66b5c3c8b8c244dccf659cbf8574f1e031e62a0a0b870af133062055a25b9 WHIRLPOOL e16956d94607d9caa3849b25ddc3128446fa0ec46e32c09c39daba506908687d2f61eb9bd730e2006730e3cf111094bf0c8b2d4c36a8bf543fdd926de25c9343
diff --git a/dev-python/dynd-python/dynd-python-0.6.5.ebuild b/dev-python/dynd-python/dynd-python-0.6.5.ebuild
new file mode 100644
index 000000000000..05a89c06c00d
--- /dev/null
+++ b/dev-python/dynd-python/dynd-python-0.6.5.ebuild
@@ -0,0 +1,74 @@
+# 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} )
+
+inherit cmake-utils python-r1
+
+# change each release, to avoid git in tree dependency
+DYND_GIT_SHA1=e5578b6b862c025dd757f77aaae69be48cde5613
+
+DESCRIPTION="Python exposure of multidimensionnal array library libdynd"
+HOMEPAGE="https://github.com/ContinuumIO/dynd-python"
+SRC_URI="https://github.com/ContinuumIO/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	~dev-libs/libdynd-${PV}
+	>=dev-python/numpy-1.5[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/cython-0.19[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.6.2-out-of-git-versioning.patch )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# each relase comes with a different set...
+	# remove forced strong flags
+	sed -i \
+		-e "s|@DYND_GIT_SHA1@|${DYND_GIT_SHA1}|" \
+		-e "s|@DYND_VERSION@|${PV}|" \
+		-e 's|-g -fomit-frame-pointer||' \
+		-e 's|-Werror||g' \
+		CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_SEPARATE_LIBDYND=ON
+		-DDYND_INSTALL_LIB=ON
+		$(cmake-utils_use test DYND_BUILD_TESTS)
+	)
+	python_foreach_impl cmake-utils_src_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake-utils_src_make
+	use doc && emake -C doc html
+}
+
+src_test() {
+	testing() {
+		cmake-utils_src_make DESTDIR="${WORKDIR}-test-${EPYTHON}" install
+		cd "${WORKDIR}-test-${EPYTHON}"/$(python_get_sitedir) || die
+		${PYTHON} -c 'import dynd; dynd.test()' || die
+	}
+	python_foreach_impl testing
+}
+
+src_install() {
+	python_foreach_impl cmake-utils_src_install
+	dodoc README.md
+	use doc && dohtml -r doc/build/html/*
+}
diff --git a/dev-python/dynd-python/dynd-python-0.6.6.ebuild b/dev-python/dynd-python/dynd-python-0.6.6.ebuild
new file mode 100644
index 000000000000..2c4ec25d899f
--- /dev/null
+++ b/dev-python/dynd-python/dynd-python-0.6.6.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit cmake-utils python-r1
+
+# change each release, to avoid git in tree dependency
+DYND_GIT_SHA1=d7ec36c6f1beb0621d6037ab0953db7e4c1b9150
+
+DESCRIPTION="Python exposure of multidimensionnal array library libdynd"
+HOMEPAGE="https://github.com/ContinuumIO/dynd-python"
+SRC_URI="https://github.com/ContinuumIO/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	~dev-libs/libdynd-${PV}
+	>=dev-python/numpy-1.5[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/cython-0.19[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.6.2-out-of-git-versioning.patch )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# each relase comes with a different set...
+	# remove forced strong flags
+	sed -i \
+		-e "s|@DYND_GIT_SHA1@|${DYND_GIT_SHA1}|" \
+		-e "s|@DYND_VERSION@|${PV}|" \
+		-e 's|-g -fomit-frame-pointer||' \
+		-e 's|-Werror||g' \
+		CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_SEPARATE_LIBDYND=ON
+		-DDYND_INSTALL_LIB=ON
+		$(cmake-utils_use test DYND_BUILD_TESTS)
+	)
+	python_foreach_impl cmake-utils_src_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake-utils_src_make
+	use doc && emake -C doc html
+}
+
+src_test() {
+	testing() {
+		cmake-utils_src_make DESTDIR="${WORKDIR}-test-${EPYTHON}" install
+		cd "${WORKDIR}-test-${EPYTHON}"/$(python_get_sitedir) || die
+		${PYTHON} -c 'import dynd; dynd.test()' || die
+	}
+	python_foreach_impl testing
+}
+
+src_install() {
+	python_foreach_impl cmake-utils_src_install
+	dodoc README.md
+	use doc && dohtml -r doc/build/html/*
+}
diff --git a/dev-python/dynd-python/dynd-python-0.7.2-r1.ebuild b/dev-python/dynd-python/dynd-python-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..458dea2c37c7
--- /dev/null
+++ b/dev-python/dynd-python/dynd-python-0.7.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+# change each new dynd version, to avoid git in tree dependency
+DYND_PYTHON_GIT_SHA1=8cdef57e71c784d7fe1f3f97a2ce2ce5727a89f1
+
+DESCRIPTION="Python exposure of multidimensionnal array library libdynd"
+HOMEPAGE="http://libdynd.org/"
+SRC_URI="https://github.com/libdynd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	~dev-libs/libdynd-${PV}
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	# remove the version mangling from git stuff it requires a git clone
+	# rather force set it a configure time
+	sed -e "/--dirty/s/ver =.*/ver = 'v${PV}'/" \
+		-e '/--always/d' \
+		-i setup.py || die
+	sed -e "s/get_git.*/set(DYND_PYTHON_GIT_SHA1 ${DYND_PYTHON_GIT_SHA1})/" \
+		-e "s/git_describe.*/set(DYND_PYTHON_VERSION_STRING v${PV})/" \
+		-e 's|-g -fomit-frame-pointer||' \
+		-e 's|-Werror||g' \
+		-i CMakeLists.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	cd "${BUILD_DIR}/lib" || die
+	PYTHONPATH=${BUILD_DIR}/lib nosetests -v || die
+}
diff --git a/dev-python/dynd-python/files/dynd-python-0.6.2-out-of-git-versioning.patch b/dev-python/dynd-python/files/dynd-python-0.6.2-out-of-git-versioning.patch
new file mode 100644
index 000000000000..29c3541b3274
--- /dev/null
+++ b/dev-python/dynd-python/files/dynd-python-0.6.2-out-of-git-versioning.patch
@@ -0,0 +1,14 @@
+--- CMakeLists.txt.orig	2014-05-12 14:00:52.000000000 +0400
++++ CMakeLists.txt	2014-05-12 14:03:39.000000000 +0400
+@@ -86,8 +86,9 @@
+ endif()
+ 
+ # Get the git revision
+-get_git_head_revision("${CMAKE_CURRENT_SOURCE_DIR}" GIT_REFSPEC DYND_PYTHON_GIT_SHA1)
+-git_describe("${CMAKE_CURRENT_SOURCE_DIR}" DYND_PYTHON_VERSION_STRING --dirty --always --match "v*")
++SET(DYND_PYTHON_GIT_SHA1 "@DYND_PYTHON_GIT_SHA1@")
++SET(DYND_PYTHON_VERSION_STRING "@DYND_PYTHON_VERSION@")
++
+ message(STATUS "DyND-Python version: ${DYND_PYTHON_VERSION_STRING}")
+ configure_file(
+     "${CMAKE_CURRENT_SOURCE_DIR}/src/git_version.cpp.in"
diff --git a/dev-python/dynd-python/metadata.xml b/dev-python/dynd-python/metadata.xml
new file mode 100644
index 000000000000..67e99838f6fd
--- /dev/null
+++ b/dev-python/dynd-python/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    DyND-Python, a component of the Blaze project, is the Python
+    exposure of the DyND dynamic multi-dimensional array library.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">libdynd/dynd-python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/easy-thumbnails/Manifest b/dev-python/easy-thumbnails/Manifest
new file mode 100644
index 000000000000..3a0a0b0bcc16
--- /dev/null
+++ b/dev-python/easy-thumbnails/Manifest
@@ -0,0 +1,8 @@
+DIST easy-thumbnails-2.2.tar.gz 71833 SHA256 515b846abd51aa6d309eaf0faf2aa4f3906cb1593881df0ef6ea815eeb3c4c7a SHA512 d76f695f8f5159e8bedf5b30433834db6679e93c95448a6cca0670739284c5edca0b55f6fae6cfe687be4bb6018ce262992ee1d3099d6bb48df37ff9f1aa22e3 WHIRLPOOL 3d1f5b4cc68c6651dee62b12d3b2781c041ea5b2877a936bb6f504d1c357fc921bc8c5ed4dc75ad41ea60ffbb582984eec63791d4ab13dd7e6d84fbba373a92f
+DIST easy-thumbnails-2.3.tar.gz 76840 SHA256 5ae57f086026dbfe4aa59e9bc80bcae1ae6daca63dec02a2d510c3ab098f0de2 SHA512 0e469ea907eb0b626660f2087a81055c651a9cb59b6511fcfa54dac014c4a8701c63f408f4b5e1a03552a048e194e9660f8b3a7cea24f6824fda42137cce8a70 WHIRLPOOL 98d066fa4c29e0ced1918a3a91f6deb2bc42d52e8d9d84080ed61fece445bb792af9fbf9d5fe7e5a6b65223f361a417b221646aca7a4e893009c67e55a858e06
+DIST easy-thumbnails-2.4.1.tar.gz 74236 SHA256 5cc51c6ec7de110355d0f8cd56c9ede6e2949e87c2fcb34bc864a20ecd424270 SHA512 455dc483fd590a35aa931513f2e07c059a1f33147db641adf120cab9fe56a5c251beede4ebcfe2d2dcff095a06a5552eb06c6b4a371bbac922b0006f62c2e9d8 WHIRLPOOL fe3fe286f7a4dcc33393d83c88c1986902c7a0bd704cdd35287d6272827a8ed87e2fc6e9b6ff512e5ecea19240e4bed0766eb033538704fa49653ab401a4b7e2
+EBUILD easy-thumbnails-2.2.ebuild 464 SHA256 01fd9256a01db3af48a6bc1d165be58c14b267c4c90c68935f5c5d94f00d893c SHA512 5421c02336b29aedad851d3ab6f430589ff56be5b98729d4929bfddcbd42bf2b56798e00fdc17640096f647fd6495eccbf2cdcbd2da5b2674981e498230cba09 WHIRLPOOL 12e590f7cb9583a3b864948733d71dec5bf07fce00b52a84cc94a215b4e422bd27505c6233e04e4f2e19ba0855da7ce2114aa164bcfe0f6bc2f738805816f15c
+EBUILD easy-thumbnails-2.3.ebuild 508 SHA256 a50518e4ba9259861d000a3851eb3805123d51ca487cc5c44e448a37e31042e0 SHA512 c970fc2c44d3184e69c698c76988a0e6a40908ee6fee314f399ac6117d3ba47baa8120a8f1b8338022fdb76e9e028bc23a387cbfcb606c8b1c3ee4eb402ac0d0 WHIRLPOOL 76b6b40b1ef74977b827106e73d957184d56b40ec5b6bf9379db435e3a5cfe6ba03f2c2aad622ebefc784acc090a492de385cbab4421fc3f8e441bbfe44200c1
+EBUILD easy-thumbnails-2.4.1.ebuild 514 SHA256 902fb3a0ed412fd0fe40650f4602e4209cb87d6ac8f86ae69ac568cb9843ec19 SHA512 60b883fdc9d46293864d401a250c10e01ab7409691a3c027bbf0c538ea55eeb7ab1d40db9f42343d906219dce0f6b71a3c361a24d172098671521bebda491877 WHIRLPOOL d94cb8f9a58b8ee33cbbae87b35733d286d0e14120dc6168e1a770b8be57266efaa90f4e9bb08109553361a6442115e87201a084b9791a8e56a918207015783a
+MISC ChangeLog 1479 SHA256 039d903ef77fb5e9211b807f74059d9adf8bbf33dc81016a26168db1a94f5c7f SHA512 52b878ad8d2a2bd9391fcfd0e655fe186772d4957f46ab4d7cd2c1933a5415992d0cfc107eab4dc40df4731aa5a2fc97064913149f4ea2643062c6077d7c075b WHIRLPOOL 9d198990319a2b1c123456b16421de57577325293ab4a1b348211b9b00227f1c81b35add1adf4905eb4dfbb5b6c6734b79f0a0e089acd65e44d09a5d38171fdd
+MISC metadata.xml 301 SHA256 9b9b92d3cbac8bb006ec87f0cf0ba0373ee4caf370e8fd0339ca2f1d80d86773 SHA512 cece6f84ee8415bd2ba4f85de8b08f892c76351f3f8c89afb92263201d76d88ea4856ccf2316fc2c480765b027d1fe09783f3413892e8c9e53362af2fc724e7e WHIRLPOOL 2bf91735618f5a1500bb5d5e931277ed3e3d6226420b561373d84be9384174054dea3a4e8426d1e60dba62a9a290cf9dda302e5d8c74a1183648da73bf48e4ab
diff --git a/dev-python/easy-thumbnails/easy-thumbnails-2.2.ebuild b/dev-python/easy-thumbnails/easy-thumbnails-2.2.ebuild
new file mode 100644
index 000000000000..cf81fd69ce10
--- /dev/null
+++ b/dev-python/easy-thumbnails/easy-thumbnails-2.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy thumbnails for Django"
+HOMEPAGE="https://pypi.python.org/pypi/easy-thumbnails"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.4
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools
+"
diff --git a/dev-python/easy-thumbnails/easy-thumbnails-2.3.ebuild b/dev-python/easy-thumbnails/easy-thumbnails-2.3.ebuild
new file mode 100644
index 000000000000..6c10e91af042
--- /dev/null
+++ b/dev-python/easy-thumbnails/easy-thumbnails-2.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy thumbnails for Django"
+HOMEPAGE="https://pypi.python.org/pypi/easy-thumbnails"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.4[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/easy-thumbnails/easy-thumbnails-2.4.1.ebuild b/dev-python/easy-thumbnails/easy-thumbnails-2.4.1.ebuild
new file mode 100644
index 000000000000..998ed9699032
--- /dev/null
+++ b/dev-python/easy-thumbnails/easy-thumbnails-2.4.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy thumbnails for Django"
+HOMEPAGE="https://pypi.python.org/pypi/easy-thumbnails"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.4.2[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/easy-thumbnails/metadata.xml b/dev-python/easy-thumbnails/metadata.xml
new file mode 100644
index 000000000000..b6052948d2af
--- /dev/null
+++ b/dev-python/easy-thumbnails/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">easy-thumbnails</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
new file mode 100644
index 000000000000..e52b43f5bbdb
--- /dev/null
+++ b/dev-python/ecdsa/Manifest
@@ -0,0 +1,5 @@
+DIST ecdsa-0.13.tar.gz 55579 SHA256 64cf1ee26d1cde3c73c6d7d107f835fed7c6a2904aef9eac223d57ad800c43fa SHA512 f21d4d196404455135a1a2255c889ffa26160ea1e9b9d16c914ea82614831816acb6d27c86aac68cdaafa8b1d5fefe065b5f49ce45acaae4a035cd7f08a97594 WHIRLPOOL fb1d368a5198fd1780c2dfdf8bbee8679fd91d1182037e7dfc755e979d4b31c03b97f374186059e3baf47417a78a33aef043f7826a2738619c17f59857d0da43
+EBUILD ecdsa-0.13.ebuild 620 SHA256 bc2af5a97fbaece88f3aefbb1a247d9e72476af4c24ab2c53e69597623404bb5 SHA512 10a1076717a4f3c8e8b2432c77679d468efcb6b78d77bccba296daa414967c9ec742a90ab3ea1d8215d9984b564df3e41103f36d1a056d3d033a5cdf10f8455f WHIRLPOOL 8bfa2b90890c3147576a7601f81b79866db08fef69ee66a4e1dc3ffea87e9bde2ea7a9e8027f1a384a48beae2f0758272d01d58205a52cedd56690f5b0ff8084
+MISC ChangeLog 3451 SHA256 c2b6cefa157eb530f9f073068ef8e459838ba8d4e85e8655c0ff837a1cc7188a SHA512 d9107743d94e64d1cde5d61b13b16c7261370218b2a2b6bcc51558abf654a35842d6b54483e00ccd92481499b3f618e40850319f2cfc71005a772542ce1de289 WHIRLPOOL f44432a28a6b6e775f645b2e802240e3638bd269f16bb08201d311544d5aa3cd51f9f8e78a28ae61cb452a7ad766f7111314bd8c6552e275e96fd0f1548c8cf7
+MISC ChangeLog-2015 5291 SHA256 0b0a82cd92183930538827c0e4267e03afe586401b4d451382c1d6d0822bcd21 SHA512 4f91e016978379e988ecf9a55bfd09530a061753bca114e682c7f9900000406db55058dd4770a53af39fdcb389df8c4dd1e49f9a5539f32c5016ea5849bcea82 WHIRLPOOL 293fd82de632598a4e48ee4a06892f28358a95291e1a92b7953b115c8bc7d7088182cad8fd7de037b572e81d9d985adeca420559c1da663c0e36c33c4d4d1aa5
+MISC metadata.xml 756 SHA256 376aa93ad9e54bea2bfdfa060f1c17f209f37cd0415efc64735c7aaf82fca89d SHA512 fac76cde9ed5b729b2e04ec63635f27c590f65995e92b0ccb60dbb24cc2f7e213d583c8d74bf049ba48cd8a67d5f5ba63aae5700fa108cfcd10491743c37755c WHIRLPOOL 906dd88f6da8abfd2bb15a523403849eefb075e60b857c12e477480be7cb64168ecb34bed2dc5163492bc32ace12ebe080fda729627d4b4654a4e41b8695ac97
diff --git a/dev-python/ecdsa/ecdsa-0.13.ebuild b/dev-python/ecdsa/ecdsa-0.13.ebuild
new file mode 100644
index 000000000000..231b94165cd8
--- /dev/null
+++ b/dev-python/ecdsa/ecdsa-0.13.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ECDSA cryptographic signature library in pure Python"
+HOMEPAGE="https://github.com/warner/python-ecdsa"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/ecdsa/metadata.xml b/dev-python/ecdsa/metadata.xml
new file mode 100644
index 000000000000..605a432ed881
--- /dev/null
+++ b/dev-python/ecdsa/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>luke-jr+gentoobugs@utopios.org</email>
+    <name>Luke Dashjr</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>maksverver@geocities.com</email>
+    <name>Maks Verver</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">ecdsa</remote-id>
+    <remote-id type="github">warner/python-ecdsa</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ed25519ll/Manifest b/dev-python/ed25519ll/Manifest
new file mode 100644
index 000000000000..1b852ba136a3
--- /dev/null
+++ b/dev-python/ed25519ll/Manifest
@@ -0,0 +1,4 @@
+DIST ed25519ll-0.6.tar.gz 74782 SHA256 7b75b7e6f4c7e7c172229aa78b13436ca9834ef5893598b49c7163d7ba55adf9 SHA512 03d6e1985371698d2fee9627fa24cd724ae2ce8399f55ef9c88df7166ddf88c4b56abbbf7971eb2c8591a6d703b92fcd52f743ecb5752841849eea23eba0978d WHIRLPOOL 71c914795a7b4fbd047471bc1efdafa6a033bc8c7aa3a4f315bdec5772c0a58574b5bfe94082e7f7173ff053f5438f40276358e2644974144266973487252668
+EBUILD ed25519ll-0.6.ebuild 761 SHA256 a81a8f471227db99fbc32f0096178569b1f44bfc07dedd111facc64465389c45 SHA512 74f951119c0a74496d4b05d9c3045db2dac65c4888db72697d2500bfd093e7dc66c20cffbabafeef8b79c835ff325f93e88dd64d5590cd3c28d41eda0eb4190c WHIRLPOOL 3d40d3793e090880e16583ee8cf4453e977a525c16654885d9fda7408cbf0c55dd9a2b71631d9d2b005c505186e98ff49743910a19e766b020579b13424755ae
+MISC ChangeLog 672 SHA256 c5d492fbc9488a437d0d9569166a3d47ba0ccda9a8908ca4d03e5126e3f7abe5 SHA512 688515e09126f0cdc2f90921cf1bd9da653d08ef2f3f08b19986f4304b709cd8287b51dfc726cad1c24ccdf9d86b4809aa33a4bb9c9a9aefa35134a41abb81ad WHIRLPOOL 44464cae93428388ba4fad9fff4e2711c16fc08a15d696d31ed4f1f7a9d631e5ca6660d0dc746baf5c49c17b348c79d785213b18888ec356a676856babac88ec
+MISC metadata.xml 507 SHA256 101de0be247f69cfbf635d0601dd7136e02e35c5a0227fedb5693ac635c1ca9d SHA512 a058610dfb8512ddb145083644fcaa685dc69fd9b1263bebbe8aeea0f7be9a683607cc5fd84a7c730b173989c745af928a13ca0b96913486c1fbc474ba32b37d WHIRLPOOL 88aa506d33993aaf4905495db72b43adfca618cf4b509a334bc6965a623d513609cdc3ffe03f28584cc1bc7cf0f10a2d5d90d2f68de13a6c3547ee5164d3d600
diff --git a/dev-python/ed25519ll/ed25519ll-0.6.ebuild b/dev-python/ed25519ll/ed25519ll-0.6.ebuild
new file mode 100644
index 000000000000..62a6fb63c32a
--- /dev/null
+++ b/dev-python/ed25519ll/ed25519ll-0.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A low-level ctypes wrapper for Ed25519 digital signatures."
+HOMEPAGE="http://bitbucket.org/dholth/ed25519ll/ http://pypi.python.org/pypi/ed25519ll"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+# https://bitbucket.org/dholth/ed25519ll/issues/1/testfailures-with-python-3
+RESTRICT=test
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/ed25519ll/metadata.xml b/dev-python/ed25519ll/metadata.xml
new file mode 100644
index 000000000000..786080e13beb
--- /dev/null
+++ b/dev-python/ed25519ll/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">ed25519ll</remote-id>
+    <maintainer status="unknown">
+      <email>dholth@fastmail.fm</email>
+      <name>Daniel Holth</name>
+    </maintainer>
+    <remote-id type="bitbucket">dholth/ed25519ll</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/editobj/Manifest b/dev-python/editobj/Manifest
new file mode 100644
index 000000000000..8a796dd8bd3c
--- /dev/null
+++ b/dev-python/editobj/Manifest
@@ -0,0 +1,5 @@
+DIST EditObj-0.5.7.tar.gz 39802 SHA256 9c72f7d9a9e31e9d7500b29583909246f5d3d7baf4b190f6be1dea4eb1da18ff SHA512 0b7603b00a09942d1ebd2b50203b698598b54a2334d5b69b638d5f4b0ff7273afeab5f4e0dbccc3eecc3349fc08dead1a6e056b858f419faecc7837a5af2df03 WHIRLPOOL 1af08ec076b693201919c5c17c1750bf0dc234a4b41c8c732535d2060c39ab99dc50c53fc80004d755cfbb9fa3ebb49822e38c0b60ec92b28b89b13263f88627
+EBUILD editobj-0.5.7-r2.ebuild 630 SHA256 e7a5106aa9e82b1253eaa5db931878152f56f0eb040fdf4db6d0b0fe498f2179 SHA512 f7872a0db311904ad6e1b4f12c5a89a33b6de5077ab3af0ba2b82064cb6b8cd03cc2c900a594dcf78c7f7fc783da69e5e28239bf4767cbd61894ddabdf625bd2 WHIRLPOOL b416403e2fb28205d3e751348d8efd9225b46f692a05f1b8994ae6b9f2ab97b8f63aaa4c251e5648516b89f866c3e6e4a20f803a0b66b73d871adc3e460795ce
+MISC ChangeLog 2493 SHA256 09d342c7c5232254232c37ae92b4522a4221e0f92f574713ce5f127cc6587b58 SHA512 25ebec8c51cc6d5d3f066fd2fd04bada2c69f63687be9f163d571e5d7e4dd5f9361895d9de96d44cfc94f3eb2acd57d60b4facdd888e742a1c355f7452f2f12c WHIRLPOOL c04cf0bfdd9994cfdc9c11ba9ef9adc722487efc5c0f7a759144a3bdd85efd69e39be8991c1120b36032a5c417f699b21778cac0f342df8c7765afa8ef469a8d
+MISC ChangeLog-2015 3571 SHA256 bacb9538423678bf86064203f3dd471f149d97c174dbcb9152a9a5658c5f5391 SHA512 d8b4869c3e3dac524e8a9dac380f65e46b8e9710eff9d81a564193f357ec5abaf10ad1267a745a8b3027cab0dba202d67284a5af53217412dd6fc7efc0f5c6f3 WHIRLPOOL fe48fc2077b2ce32dbcebe9b7b50a3d52129c2a942ce6af83adfc24e76f82fef4aa76bb70a1ee19392f9f609609e7c9b50c409e181f847f8200d0ed96156cc2e
+MISC metadata.xml 413 SHA256 ae8b4c473a2e7f3ca957d807d5c0f5ebfc381d60259dbf69291638f6d9becde7 SHA512 f8ddd93355d727bad3f2ff6df36b25fc72aff8214ebefbb3d718ceeed1842e5af47706409b5cf803290a4d6523c24ff4c831321af7062b48b8a05fab6728b5ee WHIRLPOOL f8d35759ea31f3f8d887662d6ceabc70ce9eabb23a0a558463bb2364f32438f611254761fffc5160cc3f732ae69b8bfa1b3ea5a4f86123b4de731a87adda4cf3
diff --git a/dev-python/editobj/editobj-0.5.7-r2.ebuild b/dev-python/editobj/editobj-0.5.7-r2.ebuild
new file mode 100644
index 000000000000..631be827e83b
--- /dev/null
+++ b/dev-python/editobj/editobj-0.5.7-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk"
+
+inherit distutils-r1
+
+MY_P="${P/editobj/EditObj}"
+
+DESCRIPTION="EditObj can create a dialog box to edit ANY Python object"
+SRC_URI="http://download.gna.org/songwrite/${MY_P}.tar.gz"
+HOMEPAGE="http://home.gna.org/oomadness/en/editobj/index.html"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ia64 ppc x86"
+SLOT="0"
+IUSE="+examples"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	use examples && local EXAMPLES=( demo/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/editobj/metadata.xml b/dev-python/editobj/metadata.xml
new file mode 100644
index 000000000000..0b1b7bdd558b
--- /dev/null
+++ b/dev-python/editobj/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<longdescription>
+EditObj can create a dialog box to edit ANY Python object. It also
+includes a Tk tree widget, an event and a multiple undo-redo
+frameworks.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-python/editorconfig-core-py/Manifest b/dev-python/editorconfig-core-py/Manifest
new file mode 100644
index 000000000000..2ca376e1b48a
--- /dev/null
+++ b/dev-python/editorconfig-core-py/Manifest
@@ -0,0 +1,6 @@
+AUX editorconfig-core-py-0.12.0-no-cli.patch 503 SHA256 8ddfea580c2620d30a4d2f48fe3a41bf751b6742f1667ad2dcee24d51dd17dd5 SHA512 3c8802b4df1799c5456e30cf2f62d8c7d5b939a935bd511e2b1dc4ee681131ea7da114038e67efc1938b2c4c110c11dd4cbee0b77024d311e9b50585c364b591 WHIRLPOOL c60e90e56776153ea37db9199fa4c67bc21376b9ef3a1e570d39ad890c571efa5134ea453ebf87a3d989c762472b0de805c4105caf681dee276be539e0555768
+DIST editorconfig-core-py-0.12.0.tar.gz 24801 SHA256 0b8e2468305b5795c2f887f936ffc461143567792eed5c81985cbc35b13a7bc0 SHA512 29c5f58bd7293052e4b1fbfbadcf4a148eb939558494d599bafd46151a4fb5af9cd07dcef477db9a709a0ea63dec0dd7e9d4071779f8ca6e3bd137268cc22f72 WHIRLPOOL 40927f76b3395725ef82a60dcf7045948bc41c3bb6c9e671852e3351633675d24cb3becb0e3176e49d8e385d129780210a7b440f5f75012cef9d531f039006e6
+DIST editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.tar.gz 7900 SHA256 0c091f6e707f42ddf1069997179da7f46b940b9a17e70ee236208a04783fad88 SHA512 ae5424b4926d6cb127cb3da473400ced4f7ccf224f7baa8bc5bde0317cc045bb7b99738a56efe5fd0e5a0fbe39b997b9fb1739d24713e7f83b58e987c5e56a32 WHIRLPOOL 31e29d29ed6e4abf493ef2eed960250baebf1c7400830e924e12c1a90559b6ab8717ce40a6d07064e1a619bdac9544863fca16506d228e7ac7735ea3ba4e7966
+EBUILD editorconfig-core-py-0.12.0.ebuild 1368 SHA256 55f643f1858bb5c75594f2408068537edddf024afc345283aad4d365c6772985 SHA512 ad1194435c8de92b1bc3ca5eb3a8aebef9935bb080edc6026975b19f9bac2e778a0d497ba620994ffab9bd411a426299bda7a261146840314aeb2156acfebee5 WHIRLPOOL fad710c51f797bcef5ea5533a40ffc351e10c1f1efc7b2521a544614f294e796c3d334ef6defefbab9f549d85e2177267789fedb54ff79e7c8052ef355a1d4bd
+MISC ChangeLog 440 SHA256 5ef07f148b8752ef9b3158148ada7e7b07d1e4cf59525363927ebe3742eef63a SHA512 b631e3e5dd221e4966adbe765b2f4d2a18c41623b7b089409596fbac822ddcf734d7a77c665998397f213ecd82d631d154631165670f00802fbd1991817f4414 WHIRLPOOL 73106e46ab7acf842f434aa07908db1bb97625927ea77d730625dbc787054f27a13d1d0f20ffcdb74fafcc39ba36e987588cd3543e3c5c5be4a6b01f147289ce
+MISC metadata.xml 679 SHA256 994f035d63aa31c6efa15072cffd4e21d7ce78cc4083d29c09000d36887ebb22 SHA512 ebac6fb7f09e22832a5436aba0b445775800d377a794c0a5b32302f2d3baf0c6c09d70685bcd12f21e084b290915a43d729cd94b8e92246259446aa17548710b WHIRLPOOL 79402fd93f69d8ed13dd7a83140f500602e8ea3f60999189bac9f478fc58631aaa8b4b62809d348a7228c43354b1a6ade24faddf1c7758a713db9960321cb43c
diff --git a/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.0.ebuild b/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.0.ebuild
new file mode 100644
index 000000000000..2099e048d670
--- /dev/null
+++ b/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+TESTVER="abb579e00f2deeede91cb485e53512efab9c6474"
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="Clone of EditorConfig core written in Python"
+HOMEPAGE="http://editorconfig.org/"
+SRC_URI="https://github.com/${PN%-core-py}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		https://github.com/${PN%-core-py}/${PN%-core-py}-core-test/archive/${TESTVER}.tar.gz -> ${PN%-core-py}-core-test-${TESTVER}.tar.gz
+	)"
+
+LICENSE="PYTHON BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test cli"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		>dev-util/cmake-3.0
+	)
+	!<app-vim/editorconfig-vim-0.3.3-r1"
+
+src_prepare() {
+	if use test; then
+		mv "${WORKDIR}"/${PN%-core-py}-core-test-${TESTVER}/* "${S}"/tests || die
+	fi
+
+	use cli || eapply "${FILESDIR}"/${PN}-0.12.0-no-cli.patch
+
+	default
+	distutils-r1_src_prepare
+}
+
+python_install() {
+	distutils-r1_python_install
+	#use cli || rm -f "${D}/${EPREFIX}"/usr/bin
+}
+
+src_test() {
+	__src_test_run_python_impl() {
+		cmake -DPYTHON_EXECUTABLE="${PYTHON}" . || die "tests failed to build with ${EPYTHON}"
+		ctest . || die "tests failed with ${EPYTHON}"
+	}
+	python_foreach_impl __src_test_run_python_impl
+	unset __src_test_run_python_impl
+}
diff --git a/dev-python/editorconfig-core-py/files/editorconfig-core-py-0.12.0-no-cli.patch b/dev-python/editorconfig-core-py/files/editorconfig-core-py-0.12.0-no-cli.patch
new file mode 100644
index 000000000000..7d6fd31c3cc8
--- /dev/null
+++ b/dev-python/editorconfig-core-py/files/editorconfig-core-py-0.12.0-no-cli.patch
@@ -0,0 +1,16 @@
+diff --git a/setup.py b/setup.py
+index 297e9cf..9702911 100644
+--- a/setup.py
++++ b/setup.py
+@@ -10,11 +10,6 @@ setup(
+     license='LICENSE.txt',
+     description='EditorConfig File Locator and Interpreter for Python',
+     long_description=open('README.rst').read(),
+-    entry_points = {
+-        'console_scripts': [
+-            'editorconfig = editorconfig.main:main',
+-        ]
+-    },
+     classifiers=[
+         'Operating System :: OS Independent',
+         'Programming Language :: Python',
diff --git a/dev-python/editorconfig-core-py/metadata.xml b/dev-python/editorconfig-core-py/metadata.xml
new file mode 100644
index 000000000000..53919fa69295
--- /dev/null
+++ b/dev-python/editorconfig-core-py/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<use>
+		<flag name="cli">Install command line interface as well as python library</flag>
+	</use>
+	<longdescription lang="en">
+		EditorConfig Python Core provides the same functionality as the
+		EditorConfig C Core. EditorConfig Python core can be used as a
+		command line program or as an importable library.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">editorconfig/editorconfig-core-test</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/egenix-mx-base/Manifest b/dev-python/egenix-mx-base/Manifest
new file mode 100644
index 000000000000..c716c0f61b22
--- /dev/null
+++ b/dev-python/egenix-mx-base/Manifest
@@ -0,0 +1,10 @@
+AUX egenix-mx-base-3.2.6-tests.patch 1024 SHA256 56d5d280a2423b768ed64838436dfa4a5fb138224649196db6c8530616ce771d SHA512 d1bac82e2d19731e57a16597d1d832ab6e9f988c2243681d012f750eb72bf9d9fd86117a599faa6ccf1ea853694f9a8d94f490161146cea080e542bc14b75a46 WHIRLPOOL f9c8bf364e669266ccf347b32aa82540354267f3d1e8c61b7061ade3eb6daaeccc8b9097b693416d9f4f32e2e12efe6eaf301fe10747ad2eb2614940d3ab908f
+DIST egenix-mx-base-3.2.5.tar.gz 4575752 SHA256 bfd0d2aeef73532697c857db26ea11a3574280b1d439d42501c36b4c1d989dce SHA512 707d4cb96de04f967c1a37d156f41d9570b580088132f96533b7b4319c1fc0492a29b01ce1dba9527d7fc7cada99da8767a55c0994c285af81af82fd0f370a42 WHIRLPOOL 6f1a190c3d3dad516b58005815fb283c74cba6a3bb87a9f4dfe1f1bb18789ef8731af8e151e1e855feb0338734ea6232c984d259836607bafa3ddbeb0956887f
+DIST egenix-mx-base-3.2.8.tar.gz 4597088 SHA256 0da55233e45bc3f88870e62e60a79c2c86bad4098b8128343fd7be877f44a3c0 SHA512 26a8d53c2a8ccfe088ac201d0b50d9becc402220746dae2f4fe67b55a1c0cff29b6b7f635f689752c4d444bb05b5edc30972354301830ae24e13b845596dcff9 WHIRLPOOL caba8296c996dc847b0039d5b088f3ddf8e2fae36af1bdb563ca705bf39d6d00aed490c785e303bce9cb79c425f2ca32a244e6f8cfdfdf529548fe2ddd1e3d39
+DIST egenix-mx-base-3.2.9.tar.gz 4611603 SHA256 1c6b67688e7a231c6c1da09b7a6a2210745c3f2507bdda70e2639faedbf68977 SHA512 ff3b6ba90e9729004e7b18511a69529698b7d6089f08b686a0930d8f065323933e9fb97f2ed7a5b24c4bca0ddad1983773144b5dd9ee401859a2ffbfcfc79025 WHIRLPOOL 920b309345662eca1d898facd0d44a38bfcce989450449699b5b5c9d9fdbd5b09eaead8f522b982c0883f77c1cbd049d249c5f2676e28446bf5f6716301c1be8
+EBUILD egenix-mx-base-3.2.5.ebuild 1511 SHA256 b1f84d25b41c466bca962ed5104c49941061460b07ddefa3d93feddc80b96a3a SHA512 76e8306ca68d0970b69fa326c6ac24b953ebe3229b8af07623d373f2f097ca43392e78d67d56956391674a4a51afb49d6e5853d903facf577beb2b13a2283756 WHIRLPOOL 2246173177a5cd4506ef9e57fb960cfe2994aab10ba1d4f27d696ec38c288b4d41cd2c3fadc406067c13df3048ce820b115a5812b862eba11aa652cef3038687
+EBUILD egenix-mx-base-3.2.8.ebuild 1615 SHA256 4cc11f35cce003f34938459ad1190ea72c74071705bf5feeb8d8985955f630c0 SHA512 2315ae69d136c70f6198c9130a69ac240cd0f49fd4efe4e3d6e0bb2b05df77aae5fa34b7d36526a1842cd7e8278f1cfc9e15282d25913d5c354acc595019390e WHIRLPOOL cec7af3b98585550ffaf142fb8732baba4c8bc8482b91dff15dc42c944832fd42bb35a737a186e585fae47123025679c56391e892bbdee58ad082c1fb133907b
+EBUILD egenix-mx-base-3.2.9.ebuild 1617 SHA256 5075fa8b584876557451bd109a378859645a17f993f8857eff59a1a5d34784a6 SHA512 505f59c196bc9cd593cf92184f8f5957f0132c77d486fd8dc6dfde966e1c6778d6d5658a9e98f0da139efb826d16b3236c06754a2538e49e14361e5da9af17f2 WHIRLPOOL 44d146dab67b4d3aed26cc1c1e0077b610b13b95dc708f7a370c43a4478142329d84f804bc61a776f2ee83d98615b22deb7f164316572c80f943545aeac51ab3
+MISC ChangeLog 3152 SHA256 3f37ece20f93029b91a868f7506610e5cb3bcc691b41e6bf62dd7ce95fc88b00 SHA512 2969b34184e7c7cbf098dadabb349ae6f5168431b573bd5150c56dacc45b1f3c58b0933ab2a5cc76a80e5dffc93aa261ec5a5fa2fb1df8ef826eba69e0da6f0f WHIRLPOOL faa4a23645ec1dae9d44661e00b4630c6af20adfe72869715d84b0ff96546b1508eb21535aa3cbb02f1fd1e69af0ceff66b3a0d93233a19bcc52916ff2a29b5e
+MISC ChangeLog-2015 13122 SHA256 81f313590bdd3d8eae2bcc677a33f246b396dc7feb1cd7764b889e587649c162 SHA512 43599e319b20b85f54a317b535d4af1e7eff185d44c6efa9443cb69df28fdd541e09999c5b17aa9fd485a83e18fe5efac7ecff1827cb4934ae2ceb46197a8142 WHIRLPOOL fca66c291f7a2fa9676e24d872f3e9b5197f026badb49e009db78424fb07660d3da4dbd774fe1a52adee90feaaea5b770be467fd54f0c1c197c24716e8f1ff50
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
new file mode 100644
index 000000000000..b985a149ba12
--- /dev/null
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="eGenix utils for Python"
+HOMEPAGE="http://www.egenix.com/products/python/mxBase https://pypi.python.org/pypi/egenix-mx-base"
+SRC_URI="http://downloads.egenix.com/python/${P}.tar.gz"
+
+LICENSE="eGenixPublic-1.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+# distutils.command.config writes to CWD, bug #450516
+# mxSetup.py is broken with --build-lib
+#DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Don't install documentation in site-packages directories.
+	sed -e "/\.pdf/d" -i egenix_mx_base.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local t
+
+	while IFS= read -r -d '' t
+	do
+		"${PYTHON}" "${t}" || die "${t} failed with ${EPYTHON}"
+	done < <(find -name test.py -print0)
+}
+
+python_install() {
+	local f dest=${D}$(python_get_includedir)/mx
+
+	distutils-r1_python_install \
+		build --build-platlib "${BUILD_DIR}"/lib
+
+	mkdir -p "${dest}" || die
+	while IFS= read -r -d '' f
+	do
+		mv -f "${f}" "${dest}" || die
+	done < <(find "${D}$(python_get_sitedir)/mx" -type f -name "*.h" -print0)
+}
+
+python_install_all() {
+	local f
+
+	distutils-r1_python_install_all
+
+	dohtml -a html -r mx
+	while IFS= read -r -d '' f
+	do
+		dodoc "${f}"
+	done < <(find -name '*.pdf' -print0)
+}
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild
new file mode 100644
index 000000000000..cc4b4460693e
--- /dev/null
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="eGenix utils for Python"
+HOMEPAGE="http://www.egenix.com/products/python/mxBase https://pypi.python.org/pypi/egenix-mx-base"
+SRC_URI="http://downloads.egenix.com/python/${P}.tar.gz"
+
+LICENSE="eGenixPublic-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+# Correct broken tests
+PATCHES=( "${FILESDIR}"/${PN}-3.2.6-tests.patch )
+
+python_prepare_all() {
+	# Don't install documentation in site-packages directories.
+	sed -e "/\.pdf/d" -i egenix_mx_base.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local t
+
+	while IFS= read -r -d '' t
+	do
+		"${PYTHON}" "${t}" || die "${t} failed with ${EPYTHON}"
+	done < <(find -name test.py -print0)
+}
+
+python_install() {
+	local f dest=${D}$(python_get_includedir)/mx
+
+	distutils-r1_python_install \
+		build --build-platlib "${BUILD_DIR}"/lib
+
+	mkdir -p "${dest}" || die
+	while IFS= read -r -d '' f
+	do
+		mv -f "${f}" "${dest}" || die
+	done < <(find "${D}$(python_get_sitedir)/mx" -type f -name "*.h" -print0)
+}
+
+python_install_all() {
+	local f
+
+	distutils-r1_python_install_all
+
+	dohtml -a html -r mx
+	while IFS= read -r -d '' f
+	do
+		dodoc "${f}"
+	done < <(find -name '*.pdf' -print0)
+}
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild
new file mode 100644
index 000000000000..c0345c5a668c
--- /dev/null
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="eGenix utils for Python"
+HOMEPAGE="http://www.egenix.com/products/python/mxBase https://pypi.python.org/pypi/egenix-mx-base"
+SRC_URI="http://downloads.egenix.com/python/${P}.tar.gz"
+
+LICENSE="eGenixPublic-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+# Correct broken tests
+PATCHES=( "${FILESDIR}"/${PN}-3.2.6-tests.patch )
+
+python_prepare_all() {
+	# Don't install documentation in site-packages directories.
+	sed -e "/\.pdf/d" -i egenix_mx_base.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local t
+
+	while IFS= read -r -d '' t
+	do
+		"${PYTHON}" "${t}" || die "${t} failed with ${EPYTHON}"
+	done < <(find -name test.py -print0)
+}
+
+python_install() {
+	local f dest=${D}$(python_get_includedir)/mx
+
+	distutils-r1_python_install \
+		build --build-platlib "${BUILD_DIR}"/lib
+
+	mkdir -p "${dest}" || die
+	while IFS= read -r -d '' f
+	do
+		mv -f "${f}" "${dest}" || die
+	done < <(find "${D}$(python_get_sitedir)/mx" -type f -name "*.h" -print0)
+}
+
+python_install_all() {
+	local f
+
+	distutils-r1_python_install_all
+
+	dohtml -a html -r mx
+	while IFS= read -r -d '' f
+	do
+		dodoc "${f}"
+	done < <(find -name '*.pdf' -print0)
+}
diff --git a/dev-python/egenix-mx-base/files/egenix-mx-base-3.2.6-tests.patch b/dev-python/egenix-mx-base/files/egenix-mx-base-3.2.6-tests.patch
new file mode 100644
index 000000000000..25a95b3b19fd
--- /dev/null
+++ b/dev-python/egenix-mx-base/files/egenix-mx-base-3.2.6-tests.patch
@@ -0,0 +1,34 @@
+reverse or annul them. Either or
+diff -ur egenix-mx-base-3.2.6.orig/mx/DateTime/mxDateTime/testslotops.py egenix-mx-base-3.2.6/mx/DateTime/mxDateTime/testslotops.py
+--- mx/DateTime/mxDateTime/testslotops.py	2011-07-26 17:12:50.000000000 +0800
++++ mx/DateTime/mxDateTime/testslotops.py	2014-03-28 20:18:05.841240713 +0800
+@@ -54,10 +54,10 @@
+     # DateTime op DateTimeDelta
+     assert t1 != td1
+     assert t2 != td1
+-    assert t1 < td1
+-    assert t2 < td1
+-    assert not (t1 > td1)
+-    assert not (t2 > td1)
++    assert t1 > td1
++    assert t2 > td1
++    assert not (t1 < td1)
++    assert not (t2 < td1)
+ 
+     # DateTime op floats
+     assert t1 == t1_ticks
+@@ -259,10 +259,10 @@
+     # DateTimeDelta op DateTime
+     assert td1 != t1
+     assert td2 != t1
+-    assert td1 > t1
+-    assert td2 > t1
+-    assert not (td1 < t1)
+-    assert not (td2 < t1)
++#    assert td1 > t1
++#    assert td2 > t1
++#    assert not (td1 < t1)
++#    assert not (td2 < t1)
+ 
+     # DateTimeDelta op floats
+     assert td1 == td1_seconds
diff --git a/dev-python/egenix-mx-base/metadata.xml b/dev-python/egenix-mx-base/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/egenix-mx-base/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/egg-python/Manifest b/dev-python/egg-python/Manifest
new file mode 100644
index 000000000000..36b4b5ba7b23
--- /dev/null
+++ b/dev-python/egg-python/Manifest
@@ -0,0 +1,6 @@
+AUX egg-python-2.25.3-python-libs.patch 2243 SHA256 649b7bdede190923a504b3a598ac9e2003872da8857a152305048a628795c187 SHA512 f9ddacdcffaaf6933e3ab28f843892a4754677a29987d512ebc3810245fb793f8a242b479e47fd63dc7756c817a510e04cda2548aa6bb4d88ce4649c2b1759ed WHIRLPOOL 015c9bb798dadbc0d64143a151bd2a3d1d978a77348e07473f675ccef6b0e5b722eaf81462e48b06c45176d51b698b28834cb2ef4afc9fb2b00e7a8ba5f98b75
+DIST gnome-python-extras-2.25.3.tar.bz2 370489 SHA256 ca346264e00e193f0866cabd8801d3b7ce70dae7b8b296e41e5b3a45c9b0275c SHA512 6994b8b5d6ccc009edc7ddfad373b9164d8162f1007972652f6086dca30cac6941ab68ef467d15c972ab05c4ae0e19ec72edc2643636d22a01a3f5a719251467 WHIRLPOOL b0adfcef8bbb978d063a932393e17de9c8c519194f40085ecd03824ec4fb4421c84e0a4853a5a2d9fc40c94d8c0c261828447ac5fd69cff4ece39c52fc833590
+EBUILD egg-python-2.25.3-r1.ebuild 1024 SHA256 75f2f74865c16a1101009044588b505ec4544961a94a0ae8a14ac43912860cf5 SHA512 a06a9d650726f8786d863f18c0616357179127b8ec47fbf50feac3ce5f313fc12f191b9a8fa4989e0b8185d55129ac5ce81f216c22ad09021d19e0415245cb3f WHIRLPOOL 5ae9358f0b4af837980f30762dee3635637c11eb36206e0b3f512bf96becb5e158b40243d1d2550b40ece51b3e8180f195829162ef62f6c0256021e8decaea2b
+MISC ChangeLog 2492 SHA256 be372d96f00c3ba5162f0ab5d0faaa6c59e30e9bc052f0ad75fbbbffef4f17fd SHA512 879b8ee01420e535212326cf52f71e354f76d3b7517e2dd48462f89e00b40cb5d4c1843af4365e9b328f70935ef34e66ef691475d25fcf21572381bfbba6c293 WHIRLPOOL c9c0a3135f15f82f84e1a8a8bfa5f2ab849ca9df10b4caf42e4a7814adefe87664de80844b322736870d17baf34687eea84ae5d9d6e08c2e9cbdd2cb63fed984
+MISC ChangeLog-2015 4385 SHA256 88ae52e7d3d460ced3132e774085c6ceaf1add38fae5a0c875a974bcfd4127a7 SHA512 b6ced55522becb22fffa8a03216f209fc3d53a66312c1186546d0995f60a592939c6e7311fed8a78509f362003ec62d1fa70df9cb77f29f113626032ccf4c2e3 WHIRLPOOL b2bb51225462eae3a7bec3eaca7a882fee04dab674b2c6dc0eee6b487ad34553d8816ba371b9ff4bff96faa15cfd991126de644b00ae6ff55c0439e5c6f8f284
+MISC metadata.xml 364 SHA256 55f3931f6a7f09c0869b6801233ecaf5fd1c3a4ec5b8bae4efe327dc16afcaee SHA512 6047332255074115daadcfdfe865fc811c09463a5f4e9f85ae36c52f705b413ac51d4281c18d09652115551603f8c5b1e28bb41cb8db3174d6cb4d9a0c368adf WHIRLPOOL ed86b0c0b3edf6acb04ad24c08b95173a6b24a9366259d6d8d15b5fb9dbd916628ffdab0a34a182f47b98fbf1082aeab65971c7628a8420f822dc487bd62179f
diff --git a/dev-python/egg-python/egg-python-2.25.3-r1.ebuild b/dev-python/egg-python/egg-python-2.25.3-r1.ebuild
new file mode 100644
index 000000000000..03a9cdf3f499
--- /dev/null
+++ b/dev-python/egg-python/egg-python-2.25.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# We don't support the egg.recent bindings that are also provided - they are
+# deprecated, have deps we don't really want and there are no users in-tree.
+GNOME_ORG_MODULE="gnome-python-extras"
+G_PY_BINDINGS="eggtray"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome-python-common-r1
+
+DESCRIPTION="EggTrayIcon bindings for Python"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="examples"
+
+RDEPEND=">=dev-python/libbonobo-python-2.22.1[${PYTHON_USEDEP}]
+	>=dev-python/libgnome-python-2.22.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	gnome-base/gnome-common"
+# eautoreconf needs gnome-base/gnome-common
+
+EXAMPLES=( examples/egg/trayicon.py )
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-python-libs.patch" #344231
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+	eautoreconf
+	gnome-python-common-r1_src_prepare
+}
diff --git a/dev-python/egg-python/files/egg-python-2.25.3-python-libs.patch b/dev-python/egg-python/files/egg-python-2.25.3-python-libs.patch
new file mode 100644
index 000000000000..ab691272cbb6
--- /dev/null
+++ b/dev-python/egg-python/files/egg-python-2.25.3-python-libs.patch
@@ -0,0 +1,59 @@
+From 7824fd5291f570de3c2c64185035d1a6a0a3445a Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 13 Aug 2012 04:42:47 -0400
+Subject: [PATCH] Replace horrible slow python libs search
+
+---
+ acinclude.m4 |   36 ++----------------------------------
+ 1 files changed, 2 insertions(+), 34 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 8694a65..f5373eb 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -59,40 +59,8 @@ $1],dnl
+ [AC_MSG_RESULT(not found)
+ $2])
+ CPPFLAGS="$save_CPPFLAGS"
+-
+-	# This bit is copied from Planner. murrayc.
+-	# Check for Python library path
+-        AC_MSG_CHECKING([for Python library path])
+-
+-	# Win32 has libpython25.a instead of libpython2.5.a, so we look
+-	# for both. TODO: Only look for libpython25.a on Windows, and for
+-	# libpython2.5.a on unix.
+-	WIN32_PYTHON_VERSION=`echo $PYTHON_VERSION | sed "s,\.,,"`
+-
+-        python_path=`dirname $PYTHON | sed "s,/bin.*$,,"`
+-        for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
+-		if test -e "$i"; then
+-	                python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
+-        	        if test -n "$python_path" ; then
+-				python_lib="python$PYTHON_VERSION"
+-                	        break
+-	                fi
+-
+-			# Additionally test WIN32_PYTHON_VERSION
+-	                python_path=`find $i -type f -name libpython$WIN32_PYTHON_VERSION.* -print | sed "1q"`
+-        	        if test -n "$python_path" ; then
+-				python_lib="python$WIN32_PYTHON_VERSION"
+-                	        break
+-	                fi
+-		fi
+-        done
+-
+-        python_path=`echo $python_path | sed "s,/libpython.*$,,"`
+-        AC_MSG_RESULT([$python_path])
+-        if test -z "$python_path" ; then
+-                AC_MSG_ERROR([cannot find Python library path])
+-        fi
+-        AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -l$python_lib"])
++PYTHON_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; print('-L%s -lpython${PYTHON_VERSION}' % distutils.sysconfig.get_config_var('LIBDIR'))"`
++AC_SUBST([PYTHON_LDFLAGS],["$PYTHON_LDFLAGS"])
+ ])
+ 
+ dnl
+-- 
+1.7.8.6
+
diff --git a/dev-python/egg-python/metadata.xml b/dev-python/egg-python/metadata.xml
new file mode 100644
index 000000000000..431bd550cb73
--- /dev/null
+++ b/dev-python/egg-python/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="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+<maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
new file mode 100644
index 000000000000..838654bfaacc
--- /dev/null
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -0,0 +1,12 @@
+DIST elasticsearch-5.1.2.tar.gz 33299777 SHA256 74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42 SHA512 1867626e8a87f11ed109e1325fd1d16c9e0af06ebe6a30c78ea679ab533ab377f5da8ea55af6871be33af226f02187a2aadd77e5e23c097dd24055be21e9d691 WHIRLPOOL 2e9df71c915343e2cc8ad82c59b877f41f5e093cbeba21f471c32cb51a195eccc6223bc48da48bb4af2e6bea9f2539f2e93b866963148f4ca2940ba4466e614e
+DIST elasticsearch-5.5.1.tar.gz 33476827 SHA256 e0924ae2af5f4435cef009ad3a567169e9653263e7a3b8693dba932698ea7e34 SHA512 9bedd48396cdd6c39c107a7951eba8446b8574493bd44c17a79ba3443670a48b72c053006821cf69dc17bf49ff1c05904db14a07d8a6403b2d2061fc605937bd WHIRLPOOL 770b2eab9d67212fde7bafb5eaa885c13195f3ecb41897c261bac405987397e299d064badda454d12901ed86a8f9a4e87ab0242ccf5f6971005397ad9061f8c6
+DIST elasticsearch-5.5.2.tar.gz 33485703 SHA256 0870e2c0c72e6eda976effa07aa1cdd06a9500302320b5c22ed292ce21665bf1 SHA512 62048f15b43e38a61e3a19a1599c25cd0d9009cc1172db5b450b04dec349ecd313b1f20e3d1c7ed1c101ae3e6f6c6d2cdf004a9713ad803576277f93e3adbdb9 WHIRLPOOL 3a71cef2858b76b11e1693907e745912a83f23e26c35a3456c6324fc19c317c53d4404e20134b034e41e162c1ea8d58c38bbd4afe0394d886ab32f6b698172ec
+DIST elasticsearch-curator-4.2.6.tar.gz 228342 SHA256 bebc7f6b53a4147e92004dd63d2349bb18170feed12b9219206d0d074b0643ae SHA512 e42d9f3c6122ba9cfc0bc90323f12d7ebf09902d04138472999b63fc59742f2f461b889dd98fca98f321d4975a3c05bc2aae5d211a774abd49b628ea318f5f64 WHIRLPOOL 63eed5c64f3a08f44d6feb8eb56b7698e8081a948b67daae91bb692d69e3ed1166c2fb867cb61f3f114eed74d05251b3aae68a8c475bf75ce318d53435e27b7e
+DIST elasticsearch-curator-5.1.2.tar.gz 290616 SHA256 e2f4f6db735223b8bf2bf84924b6edb23d1c3b9a6ebd3ad3bebfcc23f38e0434 SHA512 4ac0ae789fe662d352c3d228acc6aaf78873bb02b7108f985fd0a048d0b90cb2b30572eaa5f984025ab0d4209eda9d6fe6ac66cd8cc856f0707e3f12bb2e574d WHIRLPOOL 143f7b8704d73db92524e25a51074dc96385089aac0c88d197b12668afe10eaf7d686a2d03a1c81dc988a158e6d9e9b9e419b50450d474ec75ef90cc56d502b7
+DIST elasticsearch-curator-5.2.0.tar.gz 301134 SHA256 e79e0804b6629fa4669570052379e98d5e10c07879c132e1636f26d6e038c159 SHA512 5aba1c3fb1c76f2389902024190ba23567107e3655987014c9250ae46a9199daaad18cd6e9f2595458bf4abb6ac3d4d76c241907d1c0009eb2a15ef638e99d23 WHIRLPOOL 20ccff30bff5f52d05d5804a660dad35a2908479789bfe1d08052428c7c1352c30cbd11623d603ded8fd37b162252bfc24030731443ae7e120f5de7de88faace
+EBUILD elasticsearch-curator-4.2.6.ebuild 3333 SHA256 674a9cac7acf44b0d5197da32b433ab1709c13f8f37d1c62613868aa48e9ed6f SHA512 e2fae6174588e141c8538c8faa74989fb36fbaf98f656194d514e970265c664b7bcbc1e8ca3fc4fe5397afacc2c46713c63a84e0b424f3b330613787d3803022 WHIRLPOOL dcd998067add00ce57a637d563c5c79d42c1e15f5d644091ebd635aea817181b7288b199a00597d6c4f99c26519bbd2fdbb81769940f2e56bef6276abedccf6a
+EBUILD elasticsearch-curator-5.1.2.ebuild 3230 SHA256 225df48110e538c0dc0f53b8d3a7142ab659e324c5217cff44f4dc404564425b SHA512 ea5e1f9b9a9cd8fff2565eddc7b51fa5c2c1ca531fcf3979efb5221f4e07099bbe64c7fe885cd0b16dd0b7adbdb61a32f61b820241795f9c2d87056dc6fcf57d WHIRLPOOL def00b96eb39d966c053eeef41c838680fae939a032f7db98043bc49541a0a37f7da237ca306a1f461bd6ec21be93cf6b16d03090f017ae2a72bde7f56c71336
+EBUILD elasticsearch-curator-5.2.0.ebuild 3239 SHA256 d24d2f83720cdcb458a1fec7117b35e5a4caaac5a6adb9bea6a142b640185e96 SHA512 bf9f8495476708bc2a52eb26d81e2c453931bfe796d8f3bf3d71b34e196a95c2fc4a0d2871e8a18323151f51fe3f535c22c1d206f5a1ae12287c914ceac701c9 WHIRLPOOL f1278611e5431a143fc240cc33887ecf5f8eb923aa20acdbfea17d77f98e35438c520851a9b14c799b1a9b110fce16f3c26a4df420fc9091a8fb8ac9555e1d52
+MISC ChangeLog 7404 SHA256 784e287cdb399e760c0a989b0bd71f6388f8eba046d318a31637c7112d48c570 SHA512 9cc466c383c51c0ab85aa32d0fa443cf0149eaba3ac29e4b7757c9a8b2f4ebb6eb5d05cb785ec5e76c8fe7d0c1c3082bf3f30d39ba36e4d9e5ec7a5ca1c3819b WHIRLPOOL c595d57ecbac5eb1c167e77aaca8eeafa2071833c44da1c7b10431ab02a0ea717fb8c478669e402db47f1dcaadf5e4c50a285e9cac665a77952682d5dbccdb10
+MISC ChangeLog-2015 911 SHA256 6f2af6e82f6f117247a783b711378598aa316f1bc5733d83248949a96f197d1d SHA512 bc50115d94906909c1325122edcf10ac3a4844676958522286fe7f80e230ef83bc5f349877c3fc2b5a55c6f24043b1a92b6b753c35a7b6aa0de8919993186576 WHIRLPOOL ad452ba3670c5fdcd739b0afdd2411c2303c42940649e047af4cb28cad95be6c9d50bf4e03fb05fdafda8cafb0b944a3fb81494a5dbcc05ff4fd1e889de46d5c
+MISC metadata.xml 469 SHA256 ba02bfcc11d9e765164b3e47f308401fc23226ac7095f4adf0f6144b132c0e23 SHA512 38e98a77a6da51e077ac9a0dc77059276c58f56f8e26ca45a26df3ec16641dcb46ca9bccf85fd0dc9a358de1ac1424bfffd4cfc3d8213272ec6193663c89860e WHIRLPOOL 571df8e48c1eff216c0b5809e1a107f34feaef499b492526a8699079d789bad1b94d99da752580b3d1d2eefb2307e24dce48ba83c8b2721d48bf547cf940c9f6
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-4.2.6.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-4.2.6.ebuild
new file mode 100644
index 000000000000..dd682d809f00
--- /dev/null
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-4.2.6.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+MY_PN="curator"
+ES_VERSION="5.1.2"
+
+inherit distutils-r1
+
+DESCRIPTION="Tending time-series indices in Elasticsearch"
+HOMEPAGE="https://github.com/elasticsearch/curator"
+SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/elasticsearch-py-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/elasticsearch-py-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/click-6.0[${PYTHON_USEDEP}]
+	>=dev-python/certifi-2017.1.23[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.8.3[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		virtual/jre:1.8
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25123"
+	ES_INSTANCE="gentoo-es-curator-test"
+	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
+		"${ES}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${ES}/bin/elasticsearch" -d -p "${PID}" -Edefault.path.repo=/ || die
+
+	local i
+	local es_started=0
+	for i in {1..15}; do
+		grep -q "started" "${ES_LOG}" 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test || die
+
+	pkill -F ${PID}
+}
+
+python_prepare_all() {
+	# avoid downloading from net
+	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+
+	# remove test TestCLIFixFor687 as it is only to be run on older versions
+	# and the call to curator.get_version(global_client) sometimes
+	# fails with Connection refused
+	sed -e '122,205d' -i test/integration/test_delete_indices.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	cd docs || die
+	emake man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	ewarn ""
+	ewarn "For Python 3 support information please read: http://click.pocoo.org/3/python3/"
+	ewarn ""
+	ewarn "Example usage on Python 3:"
+	ewarn "export LC_ALL=en_US.UTF-8"
+	ewarn "export LANG=en_US.UTF-8"
+	ewarn "curator ..."
+}
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.1.2.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.1.2.ebuild
new file mode 100644
index 000000000000..89d83513f515
--- /dev/null
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.1.2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+MY_PN="curator"
+ES_VERSION="5.5.1"
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
+# running tests in non-chroot environments:
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
+
+inherit distutils-r1
+
+DESCRIPTION="Tending time-series indices in Elasticsearch"
+HOMEPAGE="https://github.com/elasticsearch/curator"
+SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/elasticsearch-py-5.4.0[${PYTHON_USEDEP}]
+	<dev-python/elasticsearch-py-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/click-6.7[${PYTHON_USEDEP}]
+	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		virtual/jre:1.8
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25123"
+	ES_INSTANCE="gentoo-es-curator-test"
+	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
+		"${ES}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${ES}/bin/elasticsearch" -d -p "${PID}" -Epath.repo=/ || die
+
+	local i
+	local es_started=0
+	for i in {1..20}; do
+		grep -q "started" "${ES_LOG}" 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test || die
+
+	pkill -F ${PID}
+}
+
+python_prepare_all() {
+	# avoid downloading from net
+	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	cd docs || die
+	emake man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	ewarn ""
+	ewarn "For Python 3 support information please read: http://click.pocoo.org/3/python3/"
+	ewarn ""
+	ewarn "Example usage on Python 3:"
+	ewarn "export LC_ALL=en_US.UTF-8"
+	ewarn "export LANG=en_US.UTF-8"
+	ewarn "curator ..."
+}
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.2.0.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.2.0.ebuild
new file mode 100644
index 000000000000..1da556996784
--- /dev/null
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.2.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+MY_PN="curator"
+ES_VERSION="5.5.2"
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
+# running tests in non-chroot environments:
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
+
+inherit distutils-r1
+
+DESCRIPTION="Tending time-series indices in Elasticsearch"
+HOMEPAGE="https://github.com/elasticsearch/curator"
+SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/elasticsearch-py-5.4.0[${PYTHON_USEDEP}]
+	<dev-python/elasticsearch-py-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/click-6.7[${PYTHON_USEDEP}]
+	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		virtual/jre:1.8
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25123"
+	ES_INSTANCE="gentoo-es-curator-test"
+	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
+		"${ES}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${ES}/bin/elasticsearch" -d -p "${PID}" -Epath.repo=/ || die
+
+	local i
+	local es_started=0
+	for i in {1..20}; do
+		grep -q "started" "${ES_LOG}" 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test || die
+
+	pkill -F ${PID}
+}
+
+python_prepare_all() {
+	# avoid downloading from net
+	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	cd docs || die
+	emake -j1 man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	ewarn ""
+	ewarn "For Python 3 support information please read: http://click.pocoo.org/latest/python3/"
+	ewarn ""
+	ewarn "Example usage on Python 3:"
+	ewarn "export LC_ALL=en_US.UTF-8"
+	ewarn "export LANG=en_US.UTF-8"
+	ewarn "curator ..."
+}
diff --git a/dev-python/elasticsearch-curator/metadata.xml b/dev-python/elasticsearch-curator/metadata.xml
new file mode 100644
index 000000000000..942da1fb5135
--- /dev/null
+++ b/dev-python/elasticsearch-curator/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hydrapolic@gmail.com</email>
+    <name>Tomáš Mózes</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">elasticsearch/curator</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
new file mode 100644
index 000000000000..11739a790204
--- /dev/null
+++ b/dev-python/elasticsearch-py/Manifest
@@ -0,0 +1,23 @@
+DIST elasticsearch-2.2.1.tar.gz 29424648 SHA256 7d43d18a8ee8d715d827ed26b4ff3d939628f5a5b654c6e8de9d99bf3a9b2e03 SHA512 9254175afff5c002625465fb5f398e4e53d121925a656af13e65d90eb3b3ef7507ef094cf44002f104a84e5147a8677a05f4071248140d6b48179b9057867cb5 WHIRLPOOL a470a663b8ec1b8cb7a8daf6bfc02ed7d5d0f23caab063ac2e6c7456bda449bad3e81237699fa434f077d4f86ee09dac7d007b554acc6428f2b436cf8448b210
+DIST elasticsearch-2.4.4.tar.gz 27343272 SHA256 981092e6ca65ba5560b8b97a74e5ed0eb2236e9128efdb85bb652cec340158e2 SHA512 899a4d2fc64548bcd488ece223f5f189dfb191eceb36390c4b9d8d0d90ef9d2cb67ada475223b9b2e0bd0fb521a4ab978bc7f60781195927e36d027925338c14 WHIRLPOOL 1a90bb8c923a9eab6cc4390b3daaa44cd85d5c1a3a1a5ef7d274050eb25b061a11a91b0f57ebe9f3cb27aafee3267af8f63ca87837f79d622ff362fbc5b6ae1a
+DIST elasticsearch-5.1.1.tar.gz 33291322 SHA256 cd45bafb1f74a7df9bad12c77b7bf3080069266bcbe0b256b0959ef2536e31e8 SHA512 2b5faf97c5ff41a9f12e21749d60f3632b39987d4886713ee9646110acdd17323d263168980d7dd4035732556b604acd68dc37ae7b805d84493075776b9d7bcd WHIRLPOOL ebb46d4a5643f09c0c903055c407a54d46264347924ca37cc73adfee3dd8a9bf2157b1be92b9b1d85636ea92b2d1f89d558c5413c804412996ea9bce42f1c3c6
+DIST elasticsearch-5.1.2.tar.gz 33299777 SHA256 74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42 SHA512 1867626e8a87f11ed109e1325fd1d16c9e0af06ebe6a30c78ea679ab533ab377f5da8ea55af6871be33af226f02187a2aadd77e5e23c097dd24055be21e9d691 WHIRLPOOL 2e9df71c915343e2cc8ad82c59b877f41f5e093cbeba21f471c32cb51a195eccc6223bc48da48bb4af2e6bea9f2539f2e93b866963148f4ca2940ba4466e614e
+DIST elasticsearch-5.2.1.tar.gz 33516684 SHA256 f28bfecbb8896bbcf8c6063a474a2ddee29a262c216f56ff6d524fc898094475 SHA512 aa8734c1e1111987d45e8dd64b5f8a0473955c48e09e6f1875e877090c21070fc18768b413e7b0c20652cec9ebd9bb6836a2c014cf8159b041f0d22b28ad5a08 WHIRLPOOL 3cf8672facaf03149c4c6119d869d12c2f96fa3c4ce413bfd9b0c940cd90a54c1d87ca915cdb5d9bc9a86135d6efe7891fe6932538020488ef6b3bbc3fd37115
+DIST elasticsearch-5.3.2.tar.gz 33704368 SHA256 a94fe46bc90eb271a0d448d20e49cb02526ac032281c683c79a219240280a1e8 SHA512 430021202fd747ea376e36e9035f05eaa27f06c25f2f8616e218a248f0aeaaffd8577d689c790b618e3fdbcbae23b7bd664d4380d0e323483f6e158675a4bc00 WHIRLPOOL 0fee048029880dabe901c0f9842ac331ef78204a70d0c71993cddbb8e76b7614af0e4b8e8181b36b9039b64093c9fd0720f5c8a2e7c515fc6634ac465c5f283a
+DIST elasticsearch-py-2.3.0.tar.gz 74954 SHA256 3610d3a2d2f4eb1906794276ac6fca1ad801067e0f36d71a8a11c2c9112ed120 SHA512 53ffc265dc2c42ef983bf12a6d6bfcb96a378da97c58b52ff872968e50f01936815f2d28d667d44a647174d90b55fbe6855ebeac6f86248adb4db4ba951facb1 WHIRLPOOL 836ea86fe64851eb1c8891f70ee8502bb2ff76c919536a3f57f06880dfed96626a658f3a722622ac49deb6d55ca9235755b56c771ed55d298b993c009c283b48
+DIST elasticsearch-py-2.4.1.tar.gz 77420 SHA256 673cdc861d2fd0cd9d1de5be80239dab01340b19e549ff2cbd65058bdcd86d54 SHA512 39eceffee56a4b7ed242c8edfc9634f31041d630e9621b8418a298ea3b32c3dd50a19fda0901e03823ed8dc1dc2c528d9526329ade7755cbed4b1510cc3a50db WHIRLPOOL e6771c722d6670d51fc01c5687ebce6e0b036ddb3aaee2b64238d8ed1ea64a7cf58fb0685af715ba91bb9bc4256dbced7952b016ceb95bef09d2f4be3fa97f4a
+DIST elasticsearch-py-5.0.1.tar.gz 79648 SHA256 b4e17253b950f550c8fb53a68f431abc0a67131154aecd3a1dff19e955c3345c SHA512 a10483c853b3b1b6a9a250ceb51738b5351764cde18140b0b754f6563aa5ed8d3095063e85524968adc0faeb846acebedeeab7a29533e3025db698db228823d9 WHIRLPOOL 109890c3c6a408a700e9d03265308b3d33910a8883e2ec48657c0b2f0c0bb48349067ad19877d76f27945b5712e373db669bda7f74128e077198853f18397a5f
+DIST elasticsearch-py-5.1.0.tar.gz 79933 SHA256 6d2c06607dd1c27842e25552878c2d45a345dc27946e8819588bcacedbe3c5f8 SHA512 a8b34c767247c906e7b602161adb94614b17f293e350908b375ae9c1a4f835914b3f4081cab20f958976c8b355189f1b4d3afa88dc66277773cf944fa7bbaccb WHIRLPOOL 9c1b8635220f24e4954d3464facff32a8d71e8aaef05062a8bc9e9eca369b179a9b50309558f1a199abb97bbadfe80e5344038015a54477664a9c8ea1e5ca500
+DIST elasticsearch-py-5.2.0.tar.gz 80317 SHA256 47725bfb394d40198ef8cdf254f2ded87970c87282e1b09510de0406ebbf5476 SHA512 df03879c981361b55f0c12ad7bbc9a123b49d9a6b351aa18840858f4ac43b9ef11d8a9a8b3200e295e461438254bf95c4f233a50752f917aa31392be5cd3b7fc WHIRLPOOL 7ed9f9af2d4c4cc4011454f3e9bfa8121e375d017d2a23ef3420cb3b02c054a9976438eaa4cdd3cdeda39602d14941376ec2da65b839858229cfd9274893f6d8
+DIST elasticsearch-py-5.3.0.tar.gz 80767 SHA256 f0b8a33a81b12a5a1b2bb603093a63a39e9e1ca116e56f85d18c02c2e93d6173 SHA512 2479b5be237f4ba4ca87997fafa92041fba1fe49658117515d70ae5d551e4da11d4556b3ed23f7b7c8907606b6b1f76b024a0293fd58072cf9bf650a902e5f06 WHIRLPOOL 4b17838d11d33edb389fc864f7aba0e07f4c766bc5197d19e029c05a304b2e9ac1b42d76ce4948b51e093bfbd90b1d8366725d48f6546b783b32afed65afeb64
+DIST elasticsearch-py-5.4.0.tar.gz 81286 SHA256 a574eea0032b73765efc6072f7e2b87a6a64cda08c23559ad46b7f3046d5a217 SHA512 9d30ffa810f495662769e6d2f2627f9ef6aa3849bc2eecd09df28c05a036b8fb15ae465914c38eeb3d854683bc150a3c56425388312bcd112bd5cc7b33ad41ae WHIRLPOOL 83e1076ace42ab73d6ca6502b7c0608b226649c82523b7779cbf76da90027cd36f9dde9ad022dba96f3c429b94e489ae0194d92549450838d21d8040985563b3
+EBUILD elasticsearch-py-2.3.0.ebuild 2445 SHA256 0eda8e8ad7fc6d4a8a88c9d30f33d861526de2fc60fabb21237711dba4adfff1 SHA512 0c530d4a11ced51f0f5539dc5267306acd84c8451ccbabc30d6e41722b855b99006c16ee96c295af3b27f940fd9fa393c04eca3aaef7e8ae64776553d931248e WHIRLPOOL fe795a1ead02ee094ade969716a77170af3e7b6802e3a7f783b37d64dc31b4ea73cac5cbc4a5abf3c7c5cc04ec8a540381b4a820e98d4c3693a5551a5c78b7a8
+EBUILD elasticsearch-py-2.4.1.ebuild 2521 SHA256 b153e9c797ee4c74215528ae8a48a298364dae0feb7cc08892d260b90ac7b41a SHA512 43b58f4ddfd9739e61f8c27841b8264bb60639f0db7b6680a5b54a4492da36fa4a715a9315ca0bea2340e59910d8f8ede7cd91dc4786f4edd31d31011fbbcec6 WHIRLPOOL ccf13d51069dd7ab6e7661a6f2dcdcbfbc7de0b6c9619cc6024f18fe55c8a2c91ac64983b99063a496f8bf519b216cf10b2956543de04f1db170c8812b489d5f
+EBUILD elasticsearch-py-5.0.1.ebuild 2449 SHA256 6c912a46c37ad636b478b65c6f1a94b7d695e0d9bece43b05f57d99795e81b66 SHA512 ae90b001085f5cd2e1c4f13ceb9ef3a9a00965341a4fcba2bd1794f2cc58675028b15b6045fe905491b4b0d44bb9544df5e9f9259cb630f0047ce3162e8a0765 WHIRLPOOL f74a444412832dcd319489fd528cd0226a8d926ed8dd86124347b4446e013fef067c8d430510faecb239d68f133fe0a5351282849455299172c6050a363edf40
+EBUILD elasticsearch-py-5.1.0.ebuild 2479 SHA256 0869cdb7ada38443aaeaeb0b8c2c438bb7cda6f7b316130fcb9b5a464f7b204e SHA512 1c20029ec3e00ee3cf88bfefb5e2c89ce1120e44582248a37abac1880412ace851b7798c800c8560387423ec1454e06f8c75d3f8b70415e83e432a4d928fdabd WHIRLPOOL 12562ebf7206d6611e0a8aadbbbf22f2aa136cd7f943ee9625390b440da64779e55477ba10bc2136aba199ad03ee5d0c830f242dc7b1458717094d794c375505
+EBUILD elasticsearch-py-5.2.0.ebuild 2647 SHA256 6abe303159ef0f4dc5e21c3ad0965cf4d536b45d8963566e6c6fd1e7c28a3dd9 SHA512 23a7b210f8931c84b781f3aae9f5dc362735d094a67417877a89d40d96b8d1da310ec1bc0c4d3d86f2d055a3891a9bfe2be0056081712850d7f3af34700f3a1f WHIRLPOOL 41d12a6aaf2a9509241c14cbf588bd517926525cce67ac197475ab310d76fed0d2999d46712833f2dd972976d0ce222c17ea90e5db2da32c61c1a5c9476a2786
+EBUILD elasticsearch-py-5.3.0.ebuild 2648 SHA256 64a6738b69aed853763c58234761852add4a734f3e01fd976440c7036bf51d35 SHA512 866f43398350a4943d8be34f1f731d168aebd21658d69b0c47c0f9ddad840f0dd8ca94d51259c94dbafdf021ff2fda8c5b204a4dfaa21d0bc7bbf4c7ef8bb34f WHIRLPOOL d53887f81562dc82b7851aa387f1c80df0a63a3e0e431d9083a74655f5a1879180ce30ac6c2d7e80f618aa74513a4a4c618a7976c16c7ff97af1ef19b84f605a
+EBUILD elasticsearch-py-5.4.0.ebuild 2648 SHA256 64a6738b69aed853763c58234761852add4a734f3e01fd976440c7036bf51d35 SHA512 866f43398350a4943d8be34f1f731d168aebd21658d69b0c47c0f9ddad840f0dd8ca94d51259c94dbafdf021ff2fda8c5b204a4dfaa21d0bc7bbf4c7ef8bb34f WHIRLPOOL d53887f81562dc82b7851aa387f1c80df0a63a3e0e431d9083a74655f5a1879180ce30ac6c2d7e80f618aa74513a4a4c618a7976c16c7ff97af1ef19b84f605a
+MISC ChangeLog 8192 SHA256 fc93966f91813cccaa40c65a6a256be7c81d637c78964d7b1828e17bbe9b96c7 SHA512 8e87101afeb610339f1176125f239fa0a0909d404371c559e3dbabb38097e5b1ba867ccf2e9ae2b2e10ad85ba9a9c878852984f8f083a63b5bad240bb19096bc WHIRLPOOL 877d346ff67b54e5a20c17dd237518d2530af34d0b14d0f1f9232254a940a5be8b01672d9e51e6ca57ad3c901825c2b8a0a4d3dcc0d52341f6e3f2a2a8bc3a14
+MISC ChangeLog-2015 1593 SHA256 0924eded2c64c97712c377b21b1d6999f9bf643b4eae250024a5fde81da2c76d SHA512 b68692be8d5681896cfff01a25ed6a9da49a105f93f612ed0e837ecf399288d1d678bd88141706872e1196b03801c4ee16a02b667ab8c4729892ae1eb4fbc940 WHIRLPOOL 43325bee35de57306f1215724c38cdc6c6c1cbcc81c6d36c437e325255ef2cad1e25d1738fa5abd7dcb3682ea19a4af58830ab5ef465e198ce293172c8e2e295
+MISC metadata.xml 592 SHA256 6d0efc689dd219716d43b2af82e47edc018d27761db793a1f55db81ca3e2303f SHA512 752265ff356d02b2825ac2ef5e5177649cdcdd31b5a3738e3638af89a7bfef8b16fef8332e67c3ac03285318b22e455795c75d408a1abfc99068a1d4015eade0 WHIRLPOOL c01227aee8ff53b986654cda00807ef8b4658ca21d5cab8aad1b11e9400dea722244c8cca3434692529eadc963d4203eeebf07417da2060cc07152d8f16fbb76
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-2.3.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-2.3.0.ebuild
new file mode 100644
index 000000000000..0bee6f546f28
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-2.3.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+ES_VERSION="2.2.1"
+
+inherit distutils-r1
+
+RESTRICT="test" # fails to start in chroot envs, unreliable
+
+MY_PN=${PN/-py/}
+
+DESCRIPTION="official Python low-level client for Elasticsearch"
+HOMEPAGE="http://elasticsearch-py.rtfd.org/"
+SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		test? ( https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${ES_VERSION}/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples doc test"
+
+RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
+		<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretty-yaml[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		|| ( virtual/jre:1.8 virtual/jre:1.7 ) )"
+
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25124"
+	ES_LOG="${ES}/logs/elasticsearch.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/# http.port: 9200/http.port: ${ES_PORT}/g; \
+	s/# cluster.name: my-application/cluster.name: gentoo-es-py-test/g" \
+	${ES}/config/elasticsearch.yml
+
+	# start local instance of elasticsearch
+	${ES}/bin/elasticsearch -d -p ${PID}
+
+	for i in `seq 10`; do
+		grep -q "started" ${ES_LOG} 2> /dev/null
+		if [ $? -eq 0 ]; then
+			einfo "Elasticsearch started"
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test
+
+	pkill -F ${PID}
+}
+
+python_compile_all() {
+	cd docs || die
+	emake man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r example
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-2.4.1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-2.4.1.ebuild
new file mode 100644
index 000000000000..f5ddcabcdb2b
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-2.4.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+ES_VERSION="2.4.4"
+
+inherit distutils-r1
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
+MY_PN=${PN/-py/}
+
+DESCRIPTION="official Python low-level client for Elasticsearch"
+HOMEPAGE="http://elasticsearch-py.rtfd.org/"
+SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${ES_VERSION}/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples doc test"
+
+RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
+	<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretty-yaml[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		virtual/jre:1.8 )"
+
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25124"
+	ES_INSTANCE="gentoo-es-py-test"
+	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/# http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/# cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
+		"${ES}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${ES}/bin/elasticsearch" -d -p "${PID}" || die
+
+	local i
+	for i in {1..15}; do
+		grep -q "started" "${ES_LOG}" 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test || die
+
+	pkill -F ${PID}
+}
+
+python_compile_all() {
+	cd docs || die
+	emake man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r example
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.0.1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.0.1.ebuild
new file mode 100644
index 000000000000..53a18e947df9
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-5.0.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+ES_VERSION="5.1.1"
+
+inherit distutils-r1
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
+MY_PN=${PN/-py/}
+
+DESCRIPTION="official Python low-level client for Elasticsearch"
+HOMEPAGE="http://elasticsearch-py.rtfd.org/"
+SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc test"
+
+RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
+	<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretty-yaml[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		|| ( virtual/jre:1.8 virtual/jre:1.7 ) )"
+
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25124"
+	ES_LOG="${ES}/logs/elasticsearch.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/#cluster.name: my-application/cluster.name: gentoo-es-py-test/g" \
+		"${ES}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${ES}"/bin/elasticsearch -d -p "${PID}" || die
+
+	local i
+	for i in {1..10}; do
+		grep -q "started" ${ES_LOG} 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test || die
+
+	pkill -F ${PID}
+}
+
+python_compile_all() {
+	cd docs || die
+	emake man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r example
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.1.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.1.0.ebuild
new file mode 100644
index 000000000000..afdb6da6dce7
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-5.1.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+ES_VERSION="5.1.2"
+
+inherit distutils-r1
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
+MY_PN=${PN/-py/}
+
+DESCRIPTION="official Python low-level client for Elasticsearch"
+HOMEPAGE="http://elasticsearch-py.rtfd.org/"
+SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc test"
+
+RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
+	<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretty-yaml[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		virtual/jre:1.8 )"
+
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25124"
+	ES_INSTANCE="gentoo-es-py-test"
+	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
+		"${ES}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${ES}"/bin/elasticsearch -d -p "${PID}" -Edefault.path.repo=/ || die
+
+	local i
+	for i in {1..15}; do
+		grep -q "started" ${ES_LOG} 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test || die
+
+	pkill -F ${PID}
+}
+
+python_compile_all() {
+	cd docs || die
+	emake man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r example
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.2.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.2.0.ebuild
new file mode 100644
index 000000000000..3d0a9b8b6551
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-5.2.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+ES_VERSION="5.2.1"
+
+inherit distutils-r1
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
+MY_PN=${PN/-py/}
+
+DESCRIPTION="official Python low-level client for Elasticsearch"
+HOMEPAGE="http://elasticsearch-py.rtfd.org/"
+SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE="examples doc test"
+
+RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
+	<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretty-yaml[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		virtual/jre:1.8 )"
+
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25124"
+	ES_INSTANCE="gentoo-es-py-test"
+	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
+		"${ES}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${ES}"/bin/elasticsearch -d -p "${PID}" -Edefault.path.repo=/ || die
+
+	local i
+	local es_started=0
+	for i in {1..15}; do
+		grep -q "started" ${ES_LOG} 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test || die
+
+	pkill -F ${PID}
+}
+
+python_compile_all() {
+	cd docs || die
+	emake man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r example
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.3.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.3.0.ebuild
new file mode 100644
index 000000000000..a25ac2a625df
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-5.3.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+ES_VERSION="5.3.2"
+
+inherit distutils-r1
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
+MY_PN=${PN/-py/}
+
+DESCRIPTION="official Python low-level client for Elasticsearch"
+HOMEPAGE="http://elasticsearch-py.rtfd.org/"
+SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc test"
+
+RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
+	<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretty-yaml[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		virtual/jre:1.8 )"
+
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25124"
+	ES_INSTANCE="gentoo-es-py-test"
+	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
+		"${ES}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${ES}"/bin/elasticsearch -d -p "${PID}" -Edefault.path.repo=/ || die
+
+	local i
+	local es_started=0
+	for i in {1..15}; do
+		grep -q "started" ${ES_LOG} 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test || die
+
+	pkill -F ${PID}
+}
+
+python_compile_all() {
+	cd docs || die
+	emake man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r example
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.4.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.4.0.ebuild
new file mode 100644
index 000000000000..a25ac2a625df
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-5.4.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+ES_VERSION="5.3.2"
+
+inherit distutils-r1
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
+MY_PN=${PN/-py/}
+
+DESCRIPTION="official Python low-level client for Elasticsearch"
+HOMEPAGE="http://elasticsearch-py.rtfd.org/"
+SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc test"
+
+RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
+	<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretty-yaml[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		virtual/jre:1.8 )"
+
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25124"
+	ES_INSTANCE="gentoo-es-py-test"
+	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
+		"${ES}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${ES}"/bin/elasticsearch -d -p "${PID}" -Edefault.path.repo=/ || die
+
+	local i
+	local es_started=0
+	for i in {1..15}; do
+		grep -q "started" ${ES_LOG} 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test || die
+
+	pkill -F ${PID}
+}
+
+python_compile_all() {
+	cd docs || die
+	emake man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r example
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/elasticsearch-py/metadata.xml b/dev-python/elasticsearch-py/metadata.xml
new file mode 100644
index 000000000000..e75480b915d9
--- /dev/null
+++ b/dev-python/elasticsearch-py/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hydrapolic@gmail.com</email>
+    <name>Tomáš Mózes</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>erkiferenc@gmail.com</email>
+    <name>Ferenc Erki</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">elasticsearch/elasticsearch-py</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/elementtree/Manifest b/dev-python/elementtree/Manifest
new file mode 100644
index 000000000000..ae1ff1ef2327
--- /dev/null
+++ b/dev-python/elementtree/Manifest
@@ -0,0 +1,5 @@
+DIST elementtree-1.2.6-20050316.tar.gz 41752 SHA256 b29d5f2417cb331562c8c5f8ebef2a895ba540261c4245f526143c6a31bccb04 SHA512 f213cf5bd9a79b59a2033c652d9d53087fd07dd3550db1771b8ba97168c3a5722d31ac5ff8699830df0f14a1d9f0caf8d237e8c6153568e16347d8b212771baf WHIRLPOOL d68e7e2cf02753c0d982406c4df01272c2fd1ec784bfb097d09a363fe36b4a73b7b8b9af07b0069b409e810ed5075e10419cc0ce86a21e5065621a7a12acb5d4
+EBUILD elementtree-1.2.6-r3.ebuild 979 SHA256 e8166d73bd49254c0d29bbb36867142b5a6574d21e517beb11607d604335c0d9 SHA512 3668c2cc7fe3b08cd64f34325a5b2e30ca3b543a4df70f0e596c985489f42634a3742586c858bc9b850e09cdfde3acaf44dbdcfa07276c391ae736b103be5543 WHIRLPOOL ba8741ac2bf3a0aaa46af767e4b70fe275ca2b629b10e1f4fecd58031a37ce4f08185b51d4c4d5cc3360158576fdc8dcfdff42220b73089d0ec807220b834c31
+MISC ChangeLog 2597 SHA256 aa5b66a74d04164a5882a3a9758735202a4b3e169d9ffdad8e5cb13b95197a50 SHA512 5457a473eff67aaf89a1b013d517ae10652be081f46e7aeed729adb56243d51325c4d3894ce887a4de9c43c3fd88959c5d05604cedc1219af8d0bd13d9d8228c WHIRLPOOL 45c5b7705a0c2e1258dd3a1ef74b510c06a999e080fd01a1f30a3b333d5dc369192c5fe7a2be9182168038731867f2f4f8128199564e8bb9c09ae51841eaf827
+MISC ChangeLog-2015 6920 SHA256 352d84e0379c681abd8b087379d82fc4becfe471774862bab7faa9b772ef16e2 SHA512 b7f81f30282d0eb8daf442a73499b7fd212d88520a8ae6740094a4f92709c820ad69696567d61eb59f64283b1049b089f1a9a0260edc8632da065e35ec8a3fad WHIRLPOOL 0f0820300bb90d6dcc3c2c0386f36071d5689626984d713c554cc28a66837cc669c519c234bb074bdb8ac36c292c358170535a60b1f600aea8b05f2eabb4c200
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/elementtree/elementtree-1.2.6-r3.ebuild b/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
new file mode 100644
index 000000000000..3b36ea347bf0
--- /dev/null
+++ b/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_P="${P}-20050316"
+
+DESCRIPTION="A light-weight XML object model for Python"
+HOMEPAGE="http://effbot.org/zone/element-index.htm https://pypi.python.org/pypi/elementtree"
+SRC_URI="http://effbot.org/downloads/${MY_P}.tar.gz"
+
+LICENSE="ElementTree"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed -e "s/distutils.core/setuptools/" -i setup.py || die "sed failed"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" selftest.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/elementtree/metadata.xml b/dev-python/elementtree/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/elementtree/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/elib-intl/Manifest b/dev-python/elib-intl/Manifest
new file mode 100644
index 000000000000..d42a5dbedc01
--- /dev/null
+++ b/dev-python/elib-intl/Manifest
@@ -0,0 +1,5 @@
+DIST elib-intl-0_pre20110711.tar.gz 29362 SHA256 55daacfd3fee466fb354ddbd6f92c61364841c3d6e6bf4d80247c7757e20c5f7 SHA512 f44388761bc1c371c0cba5ec8b3513b073eba1d620e1ebd696008999d748f8c2473d5100d625036436157c92283b29d700ad6672d7909ca284703e3146d02abf WHIRLPOOL 99b95e57c617f727fb1f02842f209d8684cd55aeb3d51c72c41ea88ce59ca756350ddce8c8906b71c57fbd65844924d9d4bb22fff1199b7c17047c1789f30e0a
+EBUILD elib-intl-0_pre20110711.ebuild 471 SHA256 89337cb7e6ce5dbb88485370538b55a9dc4a23cf938af33e02ba2a4ef2abc022 SHA512 06608a405d2dea03ae0e2db9aedf7ca7a1f2a367ee0edea150a0e588c22c1254044d5909a4f00b4275ec347f8dac10c1b00bd9d32918b9618b83070f668997ce WHIRLPOOL 87385235c7efa530ad73d5ca1b880079a5905f468089f80980ad1a26f64443414f33eb6c73fab6fb36d86b491cbfc909884887c8fdcb433fcf05b5e6326aeaeb
+MISC ChangeLog 2451 SHA256 ae5dbae48ede05a44994098b7492f734ebceee41bff2761097c99ba08f79c45c SHA512 e2c7987a63a59f95e8b1d0c6b14253364c7b6cd8caa8f841ef1f722542b38cba79899e6ce897651e3d0555b43af1892f8c2e7ed542fec52e19267a7336692f6b WHIRLPOOL 1898786b34a051d87e0beed84d914903dfd9609d5895317d940ca119df753ffe3e006e01f5c4609f4744f224060d6d39e8113d81d9ba12e2553e30965b54958a
+MISC ChangeLog-2015 851 SHA256 bbfc98baa9ad1d3e0dc4868124cad9c23864b2c98f8ab72f573cb7bfd9588f76 SHA512 9c932342cf5fab7b00676e39626bf6bd4d0e5ce99b02b394a311b34f7338884fad14ef5855cd660bd43dc3f7719f9619b26fe74f5aab9b80dc475e9ba5394a63 WHIRLPOOL cb8444481809642070200a81eda2cc24218510ab3f1d9830e9349e103b4aaf562b19fd73760db48d017b73796166c3cc565ed334c31aabdb6bf7fed698ce9707
+MISC metadata.xml 762 SHA256 6161b73fbc9b18b8923c16e64c0ce41bdc39c661af81d71708ddb45aed628c9e SHA512 54fafa517717e672887181e50e0a6cc4e75d38f3624dde4be29df0d4269e9a46e5ea1348a9fe8b39baa01453195d0e3334b047ec2da8473cad72bc782696b14d WHIRLPOOL b024ef5073844238943f5759d5bd5b8880a5a3cd3cac9185e2661db2d5022926cdcac8b049c1f20e850320efea9ab819e1ce41e48f2b9972045b83c601a8af4f
diff --git a/dev-python/elib-intl/elib-intl-0_pre20110711.ebuild b/dev-python/elib-intl/elib-intl-0_pre20110711.ebuild
new file mode 100644
index 000000000000..b8c44da5b451
--- /dev/null
+++ b/dev-python/elib-intl/elib-intl-0_pre20110711.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Enhanced internationalization (I18N) services for your Python modules and applications"
+HOMEPAGE="https://github.com/dieterv/elib.intl/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools
+	${RDEPEND}"
diff --git a/dev-python/elib-intl/metadata.xml b/dev-python/elib-intl/metadata.xml
new file mode 100644
index 000000000000..b0cdfd619792
--- /dev/null
+++ b/dev-python/elib-intl/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nixphoeni@gentoo.org</email>
+		<name>Joe Sapp</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+		The elib.intl module provides enhanced internationalization
+		(I18N) services for your Python modules and applications.
+	</longdescription>
+	<upstream>
+		<maintainer>
+			<email>dieterv@optionexplicit.be</email>
+			<name>Dieter Verfaillie</name>
+		</maintainer>
+		<bugs-to>https://github.com/dieterv/elib.intl/issues</bugs-to>
+		<remote-id type="github">dieterv/elib.intl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/eliot/Manifest b/dev-python/eliot/Manifest
new file mode 100644
index 000000000000..bc0416053ef1
--- /dev/null
+++ b/dev-python/eliot/Manifest
@@ -0,0 +1,5 @@
+DIST eliot-0.4.0.tar.gz 67581 SHA256 adc2d43434a3059dfef21841a30df7bce5f223b4486ce8c1f04ce9d5e0e027bd SHA512 f63b487905996bf06c2efccc66c5b9214e13d672f9c3ddcfa5f2a65dc909953b489111469251501efa2e46b3911b213ffe404c6fddfea92646e086e439fb6503 WHIRLPOOL 9c72e8826cccb78a1e81968ac46bf8ca3a273b44551326051b54c9f5ecb6e6f78683b2a09741573188def2be82d1f0b03576627e0d653d229519ccd6504c4f99
+EBUILD eliot-0.4.0.ebuild 865 SHA256 50df30da127912a388e68ce35648a171c75bf76caf1c1ec3048704b195c61882 SHA512 383174751cc43772768757f65852f60805e2bdd075c4dc1d851b9661d8f2d9c1f4377218a00f2b272871ce0f46424efb558044d07f7ec98e72e05f7012136ff7 WHIRLPOOL 4f0f38a0c52555f9f00c1a5a7735148b6025f466c8325d2e4204025e9f23b0afa82d6a2724f5fdcb5538c4915ef1397f0aa20478d971efbf7adac56405583df6
+MISC ChangeLog 2298 SHA256 dd7a37c12b68a16d3915826fa1dcc96b8f54c365643d6a12b040fa281620bae3 SHA512 02d639211f4b91a7e6841a985440c239fd232b01331d8576293699e6af4fe1570f38bb0f6ffc0ba770acaa02edf773bef2ac7f4a021ec66d3cee5f82e1861d38 WHIRLPOOL 8884a94473229d8022eb93991deed41bb3884b78401c14dc4271a4480fba6854308b5df4095a91465aac65d78f5cb9a54add72443f8f3451f563a22a7203660c
+MISC ChangeLog-2015 683 SHA256 7606ab0e34047c782d231f6c47f4c91ebb61a3c8e146e9f8a74a5685ae71e6dd SHA512 3b07ff28b8a9688daddca904ba20a2d878a830da9b0e99d8673c2d9636989f2291d0f09a589ba0baf781120498631aa70b49dd54260d1ac9450b180d85dd2d39 WHIRLPOOL c244f9d5602a1363929806861c8442488c96e874988bfe45f21efef7c976e95d2d1b949184e34653db9a6a02c673c1ead07f5f46a6e6b9a61b1770eaaee114c8
+MISC metadata.xml 381 SHA256 69bac181944dbc8c609c122d28f1a990c98b088f3856867ddb27cc7a30c17a5d SHA512 f877c87fcda543cd9bf7b94cfd2975a43035c5ab41688863fdc3f74108d10d14c544854a7680a4c959220bac24cdc7e835f47debece1922b49dfa1b8aed01f2f WHIRLPOOL 08eae56267f438184df7e63b73ebb1de69e2b1c7ff7eccc24189f2894d865774829f16991298655d0d2a9b6fd87f75ca09dd6cf830217e28a02459dfb06ae550
diff --git a/dev-python/eliot/eliot-0.4.0.ebuild b/dev-python/eliot/eliot-0.4.0.ebuild
new file mode 100644
index 000000000000..7055927e56d7
--- /dev/null
+++ b/dev-python/eliot/eliot-0.4.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+inherit distutils-r1
+
+DESCRIPTION="Logging as Storytelling"
+HOMEPAGE="https://github.com/hybridcluster/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	"
+
+python_compile_all() {
+	emake -C "${S}/docs" man
+	use doc && emake -C "${S}/docs" html
+}
+
+python_install_all() {
+	doman "${S}/docs/build/man/"*
+	use doc && dohtml -r "${S}/docs/build/html/"*
+}
+
+python_test() {
+	py.test || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/eliot/metadata.xml b/dev-python/eliot/metadata.xml
new file mode 100644
index 000000000000..2c82dcdba3e0
--- /dev/null
+++ b/dev-python/eliot/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>ryao@gentoo.org</email>
+    <name>Richard Yao</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">eliot</remote-id>
+    <remote-id type="github">hybridcluster/eliot</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/embedly/Manifest b/dev-python/embedly/Manifest
new file mode 100644
index 000000000000..ca407d16a8bb
--- /dev/null
+++ b/dev-python/embedly/Manifest
@@ -0,0 +1,5 @@
+DIST Embedly-0.5.0.tar.gz 7812 SHA256 e10bca4b5e25e8f30e93eb459921f787b08efc4004b6370a68f4c8984f6f16e1 SHA512 c85abacaa33b7897ccda79dc3746497f4eefe54bac3eef0aaa7c9120fec14ff6b7652a342303bea0667f60c2e31cb1591a22cddeff6827c87c6e2b1cc3274469 WHIRLPOOL b9a53ec896a4656404878473df9794163b4c792313636e077b90c991df18245dac32ebc109c08eb770c18ca3b9d0529bd03785ec7c6f12b70355e7f483cd8539
+EBUILD embedly-0.5.0-r1.ebuild 777 SHA256 52c56469b5c621859d0733e36d46a068930374fd30e7c2c366c5a34d31a56b82 SHA512 323e908ff0355159a6f7a4de4f69697f662e5e4262713019d2ba74fd3dc74b95ffe5f30a3461660fe10acea1d2b32441f8eb31ec3cf6d04f82fce7b20be60ace WHIRLPOOL 3af4f0bd159f7c3637381f570fe2d5dfd83e2b41f081dcf94786d8e4fe7cc1c6e2f56ab2e3cec18de1c8f6410eff9cd956c6ba1e868b7e73f3df27746d238a1b
+MISC ChangeLog 3053 SHA256 b4bbf33a8e2175218247e7da3132995e57a3dd5c713596783a84bcd5b17d709f SHA512 3f446335e73c54d6e580eea3cabed39baf10521f145e356f74ed7a381144fb83a5628bec5747775cd01da0ef5e5b1ab6950bac4294b86302918a4f38cd085241 WHIRLPOOL af3f2357ef80d8ee3fbf623795f8a207badd164f3dc5fe021767a8114bd438a266f4b8046cdd26d93221dfdb11e363f1f89f16736da79cdca6604c8852c1e306
+MISC ChangeLog-2015 1065 SHA256 b86beee29b12618d43f4dc9b5f327ff6e168dd4bb3b33da28d370280c2248750 SHA512 9ce75db1c558820bf1b6f9813b40e61cedb2c25a0af7880e689bd0cfe0547ec2b313598d3a0f2435779e15abeed7a6fe58d044cf0b9506c53d43e1d7bfdba1c7 WHIRLPOOL 1c9d1b2662bd63239a4bc26341c2234f75a0f6369018fded3faf6b0b3f47c51265bb277ad8e63251fbf1853224ca373c57075128215507c13ebce3d23b2ce8d6
+MISC metadata.xml 384 SHA256 0b590e54126e1bd3ef97a2d7abf43c0958469a2cf3eee289ccbbe25ba136b4bf SHA512 a66f322747866c5740c53a0920008f2d8beade0c84d8ea3b5b247130b20edf0a74c3f154ee195bb76b3c7a9962761c2abe9ce57733b0590597434db3e4845baf WHIRLPOOL 9bf287950cb9ab272e314cedd0da2f3ab9fa6a5af874d265bfe199c953c008d25e8b2a39da48d616a84260a91a0d9a2a3543959c75a4228a886239b0e3c841bc
diff --git a/dev-python/embedly/embedly-0.5.0-r1.ebuild b/dev-python/embedly/embedly-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..f9d2fa8b3364
--- /dev/null
+++ b/dev-python/embedly/embedly-0.5.0-r1.ebuild
@@ -0,0 +1,32 @@
+# 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,5,6}} )
+
+inherit distutils-r1
+
+MY_PN="Embedly"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python Library for Embedly"
+HOMEPAGE="https://github.com/embedly/embedly-python/ https://pypi.python.org/pypi/Embedly"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/httplib2[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2) )"
+
+S="${WORKDIR}/${MY_P}"
+
+# Testsuite relies upon connection to various sites on the net
+RESTRICT="test"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/embedly/metadata.xml b/dev-python/embedly/metadata.xml
new file mode 100644
index 000000000000..b7b9868d6fb1
--- /dev/null
+++ b/dev-python/embedly/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Embedly</remote-id>
+    <remote-id type="github">embedly/embedly-python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/emcee/Manifest b/dev-python/emcee/Manifest
new file mode 100644
index 000000000000..8fec60bf98ee
--- /dev/null
+++ b/dev-python/emcee/Manifest
@@ -0,0 +1,6 @@
+DIST emcee-2.1.0.tar.gz 23094 SHA256 5ce1039a3d78fb9e7d53fcd768517585c5998193743bfcfaac407927d375ca63 SHA512 dff055dddec630e922565c38fd65d41cbfb974f6efd301d7779a3cc7de8372d7ca64ced91d01757b5b37c7a00eecdbbda74c1cd3a899ae8999959cfdc2e7fe05 WHIRLPOOL e01e5cfb8ace4b89a1b1c7e52951cb256a9d46c6a5faa0fe1dc27d0118b8dca819761670d3d08f9ac3fdb79f3f64b75f241795cfb70da391fa080b1df1bc22c4
+DIST emcee-2.2.1.tar.gz 24277 SHA256 b83551e342b37311897906b3b8acf32979f4c5542e0a25786ada862d26241172 SHA512 8f612a135fe5fc2bc75c2bc231d9210d4a70a91f5d7b94ac2161618c082d18aa1b896604b7ece166b86d93a93902e89ee9961da2a3e65307880c0dbc63bea267 WHIRLPOOL b5c30216f2665b003f11d86934d1465daac05688ea99e59990c53a70ff2bfd15a9b5391d4ca349fda7615fe387c7d9c69877393d256ea29db8443fe6aef98534
+EBUILD emcee-2.1.0.ebuild 646 SHA256 a48f4f5d5dfe80c588829815bcce94618762beedae26dd06ccd981d57b0f816a SHA512 b788959c151fcba6896ecfdf21cd9eeaa993d9652dd06fcdc5cfacd48e7428be08eca188ff924c145332d9cf631fc60d76bd46b24d125282d78c883638f9674b WHIRLPOOL 426198fc89da21a862f2c862c24c366148f8352b089a96ee7cdccfef4bb0e0a1a0377c5ad61840bd1159685932dddf12e97ad97711390aff0386668f19e6bb6d
+EBUILD emcee-2.2.1.ebuild 650 SHA256 c5706f33e75ad63a92ce279e8f5ebd453b1ef4804cbdc04a96e361b7af309b8f SHA512 ecd6293fb1bbc3b1ed03a7ae7270ee37bcba8b47a80f385c260b692ad48eb4e484af591924499e95dbda8ef1dd73c4d5ae5270b7fc58d4b17e1be45460aca59b WHIRLPOOL 25f285749dfb98a462f805b5e84610a45dae20af6ce206b55130803691f10e4461914143b75404c59b022cf187ee3e413ebea6ff0e78e1d405b2252208ce072f
+MISC ChangeLog 310 SHA256 e4b28eee7e8041bb5395e129e0c352dfe2cae57d3110a6133b805cd09260d99e SHA512 19397c772ca08d38a1d26382ed91ebe3613a6e39d1d816ab533f375ad68e0f6a23eedf84b4ff037d9a7df33455af632e2bd862e595e063683871aa207a93ce1b WHIRLPOOL 37c995623a77d23b19e1fd64518a9cdbf9093be8d212f6cf9aa07be9addf315ae4d41f60bb467a367fe5d29f38756fa6772e3fe3bccc5280d7e6d41a65063a68
+MISC metadata.xml 865 SHA256 2aa298041a382cc24447b51a8230bbff1f85d002314eaf9cbaa34c8249c74246 SHA512 e3a8df62f73e85de2462f6f631706f2940cf7903017065e9b1c1e639e409bc7e99d2213ccbeba7da20f8ef15dd04ccb17be6664d2dd10b285f53b204f97e2102 WHIRLPOOL f6ffa1b479f4abc2895f4ab2f893c36450dddbe0497832d829fced66bb475abb0eb7edc415ed793efffe8c20698d240a8850b01451ba438313b0d5b20d7d4d89
diff --git a/dev-python/emcee/emcee-2.1.0.ebuild b/dev-python/emcee/emcee-2.1.0.ebuild
new file mode 100644
index 000000000000..72dd619d631b
--- /dev/null
+++ b/dev-python/emcee/emcee-2.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python ensemble sampling toolkit for affine-invariant MCMC"
+HOMEPAGE="http://danfm.ca/emcee/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+DOCS=( AUTHORS.rst README.rst )
+
+python_test() {
+	nosetests -v || die
+}
diff --git a/dev-python/emcee/emcee-2.2.1.ebuild b/dev-python/emcee/emcee-2.2.1.ebuild
new file mode 100644
index 000000000000..7c6cce8b9fd5
--- /dev/null
+++ b/dev-python/emcee/emcee-2.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python ensemble sampling toolkit for affine-invariant MCMC"
+HOMEPAGE="http://danfm.ca/emcee/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+DOCS=( AUTHORS.rst README.rst )
+
+python_test() {
+	nosetests -v || die
+}
diff --git a/dev-python/emcee/metadata.xml b/dev-python/emcee/metadata.xml
new file mode 100644
index 000000000000..04a193100616
--- /dev/null
+++ b/dev-python/emcee/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  This provides a set of sparse matrix types for Python, with modules
+  which implement:
+  - Iterative methods for solving linear systems of equations
+  - A set of standard preconditioners
+  - An interface to a direct solver for sparse linear systems of equations
+  - The JDSYM eigensolver.
+  All of these modules are implemented as C extension modules based on
+  standard sparse and dense matrix libraries (UMFPACK/AMD, SuperLU,
+  BLAS/LAPACK) for maximum performance and robustness.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">emcee</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/empy/Manifest b/dev-python/empy/Manifest
new file mode 100644
index 000000000000..4052396c74d3
--- /dev/null
+++ b/dev-python/empy/Manifest
@@ -0,0 +1,7 @@
+DIST empy-3.3.2.tar.gz 138168 SHA256 99f016af2770c48ab57a65df7aae251360dc69a1514c15851458a71d4ddfea9c SHA512 d9098823bbb26e4447aae9042e389e000f893615117512f9b786eedbc6875dee6b7f6be50021f68a4bd6e200b364852206b36bff5c48ae1754c8f0d49682d5f2 WHIRLPOOL 575c5f3db72e404ffc3f5ff74a6bab5636bcd33b54c09c15d2d5a8e8f9bef769356ec05da13d5bd23a1c64053c5978e5138f4266d7b4cedd977b56c109912944
+DIST empy-3.3.tar.gz 137144 SHA256 c625436d03cff8adbbade639d14a2df9bc4c4de99ec3a821ad4d6eeb66ade805 SHA512 36304577839f5e6b2fb9bb2c2d72880e1f16886b2afadbcb38fd31a85620bb0369e837b8a1d74eab09a074bfe1f7be199b38842673106e0d26f1d9abc53987a7 WHIRLPOOL 404db523f8ed8eaed297ab70b483eed8058c978ce025a35ceab70fa503fc1eefae15c8da9924cba6331a0f57a4c19f8c33cf93277614ae328ed8ad280fe62192
+EBUILD empy-3.3-r1.ebuild 1136 SHA256 09747012a21ce992899c9ea96c9a578cfb65c0fbb8b408d3d0f0d5513496132d SHA512 99a0cc0f4d40355769b00bb34af5f69e8c6eecc8dc653d55bd90202cf646c62e03c4e4207357f114b0d586ce9e27ac817c2fd5345687f14581c0e8b0bb882b84 WHIRLPOOL bd0dfef03b90ad3951b235cce68694a083ca6005f2f05ad1bac628e030ed5889a4651688950150ab4fc1ee615fa81101aaec716c7d754631bda042ef4ebdc608
+EBUILD empy-3.3.2.ebuild 1018 SHA256 765fe74117d21cbb255a03c0e8e84723132ecffa65d5a35db30108382d2d392c SHA512 773e801af6526febccd4432dae5a819ece6064decf7370281ee4f7716569822ff9475c750d370c6cc2e6d59120386536c7b52c773e58e2ddca42a05ea7cad991 WHIRLPOOL 418d62dacc4b8ab3e03b4eda762a07a5c500bcf2324a55f425d96218d38c29a73e96a9b9d30c9d43e70344519c13034ec415cc4317f76f28d2087d704450cf85
+MISC ChangeLog 2779 SHA256 79871a029e99c2bfc4086b4d0c93efd58216d8d0d38b5dad7be84ec40f2d78bb SHA512 2e15beecb0bc04dc122f0101548394a22048bc105bdf043e3b455e29ca497e4f0a5f1bc60268cb5e6d1c10a9a84aebe541eaa55b81ed135fefefba36dd672af6 WHIRLPOOL af0acf7b29e202cef11daf53cf793e25d440e2206701af2f3bfd0c91d0ade7a21a442846b5ed3b854063524cb91ac4fffd4ebcce8f958a77789e74629740027a
+MISC ChangeLog-2015 3265 SHA256 b1164540e6c4ca366d8a903e8add2baba7fa99bbd9877d52a130e3a037b82151 SHA512 e62117b0c241b8541065ecd956ea99f2895ba67eef23f7ca28bcf34e1f7a3ed643106298f4daeb9666b9ad11347e2e1cf25ff3528fce5226a81ca21a559019b6 WHIRLPOOL d7fb69fca681e244f8c540771496d41cc134d8bc3108eeb3d3362c0e0fe25af35173d7e7b5115a9defee6e32bf5e70fe83ee711abce848a52ad2dd392536a5aa
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/empy/empy-3.3-r1.ebuild b/dev-python/empy/empy-3.3-r1.ebuild
new file mode 100644
index 000000000000..9cab539714f7
--- /dev/null
+++ b/dev-python/empy/empy-3.3-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A powerful and robust templating system for Python"
+HOMEPAGE="http://www.alcyone.com/software/empy/"
+SRC_URI="http://www.alcyone.com/software/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ia64 ppc x86"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND=""
+
+python_prepare_all() {
+	sed -e "s:/usr/local/bin/python:/usr/bin/python:g" -i em.py || die "sed failed"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" em.py sample.em | diff sample.bench -
+	if [[ ${PIPESTATUS[0]} -ne 0 || ${PIPESTATUS[1]} -ne 0 ]]; then
+		die "Testing failed with ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dodir /usr/share/doc/"${PF}"/examples
+		insinto /usr/share/doc/"${PF}"/examples
+		doins sample.em sample.bench
+		#3.3 has the html in this funny place. Fix in later version:
+		dohtml doc/home/max/projects/empy/doc/em/*
+		dohtml doc/home/max/projects/empy/doc/em.html
+		dohtml doc/index.html
+	fi
+}
diff --git a/dev-python/empy/empy-3.3.2.ebuild b/dev-python/empy/empy-3.3.2.ebuild
new file mode 100644
index 000000000000..5627436175d2
--- /dev/null
+++ b/dev-python/empy/empy-3.3.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A powerful and robust templating system for Python"
+HOMEPAGE="http://www.alcyone.com/software/empy/"
+SRC_URI="http://www.alcyone.com/software/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND=""
+
+python_test() {
+	"${PYTHON}" em.py sample.em | diff sample.bench -
+	if [[ ${PIPESTATUS[0]} -ne 0 || ${PIPESTATUS[1]} -ne 0 ]]; then
+		die "Testing failed with ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dodir /usr/share/doc/"${PF}"/examples
+		insinto /usr/share/doc/"${PF}"/examples
+		doins sample.em sample.bench
+		#3.3 has the html in this funny place. Fix in later version:
+		dohtml doc/home/max/projects/empy/doc/em/*
+		dohtml doc/home/max/projects/empy/doc/em.html
+		dohtml doc/index.html
+	fi
+}
diff --git a/dev-python/empy/metadata.xml b/dev-python/empy/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/empy/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/enable/Manifest b/dev-python/enable/Manifest
new file mode 100644
index 000000000000..a1311fe3fd0b
--- /dev/null
+++ b/dev-python/enable/Manifest
@@ -0,0 +1,11 @@
+AUX enable-4.4.1-swig.patch 2367 SHA256 e93bf98c6f8ad32aaf49f7db37112d2a2f5a1f4f96f0ef714b6a1d556f741c24 SHA512 a53e89d392346a6d3c1ea0fea102c37101fcc3cba2cbe25221202caed9b770caab84e91096a40c08ce5888fd927299e903eec403e2b60ea6df7887aad5569582 WHIRLPOOL 4ff75db98040dc7aa355b29a64c08d5dbe2cd7ce6c648d5d7a2d46055444598ce2203be55bb0bafee4dda9ff68617439f59638cb375435b4f917a3033d651b6c
+AUX enable-4.5.1-doc.patch 917 SHA256 ac72f01d992803815bd8e44ade7744508b0dd92eea389f86ffee737646184809 SHA512 6025233ce500d324d75a23535ceb0dac50b7d5955fc76803c156d3813a157fe8ec4d855913a6aed9c966d594fed4c7c36d6af6a175155ee2190f9c56f7d3b177 WHIRLPOOL 4285181d58fa64f1c86c8f47eb58454cd84ae7225ebd9303fa47823209210ffd0451f415fd636249937d73dcd4d43b0d40d63373d18c476be4441e27e9a70950
+AUX enable-4.5.1-gcc-5.patch 741 SHA256 e99d0dbfdf3f2bccda46db1a40b8dcb6ba1aedebe879d1cbd6bc69522d03cc85 SHA512 697201de95e2202d20cce40ddef063e91f64c1e10fb88c8b65db61ab18f8ee5a7c6c680684ea1c15b39c9ed67fc527ae833eab3ad21c34105704ae5377746bd6 WHIRLPOOL 0d95828029aba1d8ec8bafbf5586e95aab33c6bada048a9c9c55eddb90b938861c0b9481a754fa887d3d8d2dbd7a2348ddb14d9f6c4d9589c0c7941d19c85e90
+AUX enable-4.5.1-version.patch 1297 SHA256 2499ffd86438b2be5fa1f2f09e3fae2a345d1a4a9821dc16045459987767c35b SHA512 b198640bc503ace1aed8ae8c67dc500647d2679e3e516ae62cd1800b8aade433e776db2be5d519b1ea8e0ed2f47e3285102e5a6e1ef89bdc46cf753bbd214150 WHIRLPOOL 82a1f0bb19a4387ce2684189a82b4f2d8b2b15e9e88fbc119e4253bf4db22acb4033dac4d87bd7cbbae9e716f57596583eb67a424423e44a4a94367a60dd705e
+DIST enable-4.4.1.tar.gz 2507048 SHA256 6bdba2754410b89d6c0531482a20b930c2a3965d843f374eda7e1e1902a03bdb SHA512 72c879f19e26a4311b900cb4665969b9f806ce47b23c214a25e3ec308cc5300b6d71084a793215b05302fbeba09e13a4561e661c3bddb700d529bd31cfeb4dff WHIRLPOOL be172d97a979270b3a355436a323f72e00eb1fe1544cfd73091f6d56eded44b463198c48bbb8dbabc06e9a417cf24fdd898eecae316376cd1b9845cd4af03d02
+DIST enable-4.5.1.tar.gz 2571975 SHA256 9a7e7c82872969bf11eed5347c735ba7703b6af01274ad4bd3a7c8d89b0da164 SHA512 1095a4490f4918756dd33864aaba2636c294c3b177d3f500d98a355ec86ef86ab211d33cdec95c2d37e7e1df41622acf2c8ecf524a1d93cc39797804c49e6971 WHIRLPOOL 3bda72d5228adb106ec654aacdb34c91285afa40ff676c520119415a6517c1c2b595cbdea6122f70e07365fca18d4bfcd0696cc4dbf1c815165a41418d1b9d71
+EBUILD enable-4.4.1.ebuild 1676 SHA256 0cc09a10646cceffec9538764b412aface00484fa3df30d4fde8da6e0f3ed139 SHA512 7a7d927748de3fc99909524322934958d385f2c692ebe96a57884dedb04d0b59e367e1c4c5518098c2aaadaaa8b120ef28b970a25b5d255ed414fdd564658690 WHIRLPOOL 007336a7493472144522e78a77fda35b2cf220fcdde4547f29ec86529494c75ea08fa0f6c840678bde835d25b44d594a0afea47fc34a59e46822ae3f56226a16
+EBUILD enable-4.5.1.ebuild 1956 SHA256 add38617d7c2062dc17a60ba51c0aa505139be94cd61e2c6548c376ece56bb33 SHA512 75faa7fd99ffd3ee7ede05a444ea1d59ac54d2f35295a62ba307ec61036c80e8c5fa0cebf36af37840a19be03acd2421bd895205750266dcf346262571e0d9fc WHIRLPOOL d8919a07851ee8fdbdf3033861c0c1ed33bb0db3588275ef5f567258a62e0124a729c99ce435460228fb9fd5a262b0ffbf8f850aacee4cb6eedf782e5d718302
+MISC ChangeLog 4014 SHA256 3a77640d277216d84923f6e32abb8f3d71a285cd65770baf0fcf372d4ffa1329 SHA512 3ceda621f788e6ef73e354174e11dd38c3ce4609a401786ab303c8b1fce0f20daca348310c0b51f4bfd4ff959cb5aaf09027098086a09998e82096383e63bacc WHIRLPOOL 21f65d296e0d58c42ded3b762aca26dee5b44a32765625b4ca407573af06dbce08afc391c0cdab259b686abb7b31bce449e7e3797d513d638d4955324f1673d3
+MISC ChangeLog-2015 4595 SHA256 32f5cc3a0441a27b744810045d4930df720796332e35baf8fe4bb593ad28d52e SHA512 4f3555bbf9999494d877abb339d7c28fc967bc24ba98efbaafcd2685dfcd338e24ddce9203ef485cd96085ab7d3a4db674e900a941014654194b6a53c5f39b6c WHIRLPOOL a82840eba0e70cb21afef6cd492acea940c0ff5abd3b6c1f2089fdb47a551a76ab852822c4fcc4a092e536b3317ca6fcabfde21ba0562c774ae4229da777d579
+MISC metadata.xml 714 SHA256 58f13825f45ae9c17d3e8ab13187796a776e04454c2d5e0c37baec342919fc15 SHA512 24af77a3c81ffb8d105fc73f48fd6a3d5729601d8c24bae4c952265af928b7ea89f1d0c069f058439e10fc3694ae75b0e83121f1de7266d3b57b94af67cb0dc3 WHIRLPOOL cc8ef043c528173285ec472ec8bc5f8549b3e8684cf712d7b538792c1850e192f282945de2146ad6daf9611c97a043bc6819b6d8b888bf5223cb4b6bbeed456e
diff --git a/dev-python/enable/enable-4.4.1.ebuild b/dev-python/enable/enable-4.4.1.ebuild
new file mode 100644
index 000000000000..68fe4fd77629
--- /dev/null
+++ b/dev-python/enable/enable-4.4.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 virtualx flag-o-matic
+
+DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
+HOMEPAGE="http://code.enthought.com/projects/enable/ https://pypi.python.org/pypi/enable https://github.com/enthought/enable"
+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"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/reportlab[${PYTHON_USEDEP}]
+	>=dev-python/traitsui-4[${PYTHON_USEDEP}]
+	>=media-libs/freetype-2
+	virtual/opengl
+	virtual/glu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-lang/swig:0
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=( "${FILESDIR}"/${P}-swig.patch )
+
+python_prepare_all() {
+	append-cflags -fno-strict-aliasing
+
+	sed -e 's:html_favicon = "et.ico":html_favicon = "_static/et.ico":' \
+		-i docs/source/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib > /dev/null
+	# https://github.com/enthought/enable/issues/158
+	PYTHONPATH=.:kiva \
+		VIRTUALX_COMMAND="nosetests" virtualmake
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/enable/enable-4.5.1.ebuild b/dev-python/enable/enable-4.5.1.ebuild
new file mode 100644
index 000000000000..ffa29e06d113
--- /dev/null
+++ b/dev-python/enable/enable-4.5.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 virtualx flag-o-matic
+
+DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
+HOMEPAGE="http://code.enthought.com/projects/enable/ https://pypi.python.org/pypi/enable https://github.com/enthought/enable"
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/enthought/enable/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="
+	dev-python/apptools[${PYTHON_USEDEP}]
+	dev-python/kiwisolver[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/reportlab[${PYTHON_USEDEP}]
+	>=dev-python/traitsui-4[${PYTHON_USEDEP}]
+	>=media-libs/freetype-2
+	virtual/opengl
+	virtual/glu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-lang/swig:0
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.4.1-swig.patch
+	"${FILESDIR}"/${P}-gcc-5.patch
+	"${FILESDIR}"/${P}-doc.patch
+	"${FILESDIR}"/${P}-version.patch
+	)
+
+python_prepare_all() {
+	append-cflags -fno-strict-aliasing
+
+	sed -e 's:html_favicon = "et.ico":html_favicon = "_static/et.ico":' \
+		-i docs/source/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib > /dev/null
+	# https://github.com/enthought/enable/issues/158
+	PYTHONPATH=.:kiva \
+		VIRTUALX_COMMAND="nosetests" virtualmake --verbose
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/enable/files/enable-4.4.1-swig.patch b/dev-python/enable/files/enable-4.4.1-swig.patch
new file mode 100644
index 000000000000..a82f3af1c7e2
--- /dev/null
+++ b/dev-python/enable/files/enable-4.4.1-swig.patch
@@ -0,0 +1,93 @@
+From f0e399174c5f55eb3a72860c620fdd5193ad57da Mon Sep 17 00:00:00 2001
+From: Jonathan Stickel <jjstickel@gmail.com>
+Date: Wed, 25 Mar 2015 14:05:01 -0600
+Subject: [PATCH] fixes for recent swig
+
+---
+ kiva/agg/src/affine_matrix.i | 4 ++--
+ kiva/agg/src/constants.i     | 4 ++--
+ kiva/agg/src/hit_test.i      | 4 ++--
+ kiva/agg/src/rgba.i          | 4 ++--
+ 4 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/kiva/agg/src/affine_matrix.i b/kiva/agg/src/affine_matrix.i
+index 2f30e51..7c05a6a 100644
+--- a/kiva/agg/src/affine_matrix.i
++++ b/kiva/agg/src/affine_matrix.i
+@@ -157,7 +157,7 @@ namespace agg24
+     };
+ };
+ 
+-%pythoncode {
++%pythoncode %{
+ def is_sequence(arg):
+     try:
+         len(arg)
+@@ -184,7 +184,7 @@ class AffineMatrix(_AffineMatrix):
+         """
+         self.multiply(other)
+         return self
+-}
++%}
+ 
+ %extend agg24::trans_affine
+ {
+diff --git a/kiva/agg/src/constants.i b/kiva/agg/src/constants.i
+index b680cae..78f9d0c 100644
+--- a/kiva/agg/src/constants.i
++++ b/kiva/agg/src/constants.i
+@@ -44,7 +44,7 @@
+ unsigned path_cmd(unsigned c);
+ unsigned path_flags(unsigned c);
+ 
+-%pythoncode {
++%pythoncode %{
+ 
+ #----------------------------------------------------------------------------
+ #
+@@ -141,4 +141,4 @@ interp_enum_map = {}
+ for key,value in interp_string_map.items():
+     interp_enum_map[value] = key
+ 
+-}
++%}
+diff --git a/kiva/agg/src/hit_test.i b/kiva/agg/src/hit_test.i
+index 76de0c9..2cfb1cf 100644
+--- a/kiva/agg/src/hit_test.i
++++ b/kiva/agg/src/hit_test.i
+@@ -22,7 +22,7 @@ namespace kiva
+ }
+ 
+ %pythoncode
+-{
++%{
+ from numpy import shape, transpose, zeros, rank, reshape, int32
+ 
+ def points_in_polygon(pts, poly_pts, use_winding=False):
+@@ -92,4 +92,4 @@ def points_in_polygon(pts, poly_pts, use_winding=False):
+     else:
+         _agg.points_in_polygon(pts, poly_pts, results)
+     return results    
+-}
++%}
+diff --git a/kiva/agg/src/rgba.i b/kiva/agg/src/rgba.i
+index f7624b8..183014f 100644
+--- a/kiva/agg/src/rgba.i
++++ b/kiva/agg/src/rgba.i
+@@ -74,7 +74,7 @@ namespace agg24
+ }
+ 
+ 
+-%pythoncode {
++%pythoncode %{
+ def is_sequence(arg):
+     try:
+         len(arg)
+@@ -90,6 +90,6 @@ class Rgba(_Rgba):
+             if len(args) not in [3,4]:
+                 raise ValueError, "array argument must be 1x3 or 1x4"
+         _Rgba.__init__(self,*args)
+-}
++%}
+ 
+ %clear double r, double g, double b, double a;
diff --git a/dev-python/enable/files/enable-4.5.1-doc.patch b/dev-python/enable/files/enable-4.5.1-doc.patch
new file mode 100644
index 000000000000..c9cc1ff2e3cc
--- /dev/null
+++ b/dev-python/enable/files/enable-4.5.1-doc.patch
@@ -0,0 +1,24 @@
+From 41134b03b96b741d95554846841c189313052265 Mon Sep 17 00:00:00 2001
+From: John Wiggins <jwiggins@enthought.com>
+Date: Thu, 1 Oct 2015 20:40:07 +0200
+Subject: [PATCH] Read the docs version directly from enable._version
+
+---
+ docs/source/conf.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/source/conf.py b/docs/source/conf.py
+index 10b7552..995e315 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -41,8 +41,8 @@
+ # The default replacements for |version| and |release|, also used in various
+ # other places throughout the built documents.
+ d = {}
+-execfile(os.path.join('..', '..', 'enable', '__init__.py'), d)
+-version = release = d['__version__']
++execfile(os.path.join('..', '..', 'enable', '_version.py'), d)
++version = release = d['full_version']
+ 
+ # There are two options for replacing |today|: either, you set today to some
+ # non-false value, then it is used:
diff --git a/dev-python/enable/files/enable-4.5.1-gcc-5.patch b/dev-python/enable/files/enable-4.5.1-gcc-5.patch
new file mode 100644
index 000000000000..b18b8eae7bb7
--- /dev/null
+++ b/dev-python/enable/files/enable-4.5.1-gcc-5.patch
@@ -0,0 +1,22 @@
+From 55a74ccfc33764499497022dd3649be4bb1091ed Mon Sep 17 00:00:00 2001
+From: Nathan Ringo <tikiking1@users.noreply.github.com>
+Date: Wed, 10 Jun 2015 22:06:57 -0500
+Subject: [PATCH] Fixes #200
+
+---
+ kiva/agg/setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kiva/agg/setup.py b/kiva/agg/setup.py
+index 5b4d458..c6e290a 100644
+--- a/kiva/agg/setup.py
++++ b/kiva/agg/setup.py
+@@ -170,7 +170,7 @@ def get_ft2_sources((lib_name, build_info), build_dir):
+         f = os.popen("g++ --version")
+         line0 = f.readline()
+         f.close()
+-        m = re.match(r'.+?\s(3|4)\.\d+', line0)
++        m = re.match(r'.+?\s([3-5])\.\d+', line0)
+         if int(m.group(1)) < 4:
+             use_32bit_workaround = True
+ 
diff --git a/dev-python/enable/files/enable-4.5.1-version.patch b/dev-python/enable/files/enable-4.5.1-version.patch
new file mode 100644
index 000000000000..1dd3fe42775e
--- /dev/null
+++ b/dev-python/enable/files/enable-4.5.1-version.patch
@@ -0,0 +1,31 @@
+From f91c824ebad74e8c23e62fe3390842c5fe322aee Mon Sep 17 00:00:00 2001
+From: itziakos <ioannist@enthought.com>
+Date: Wed, 20 May 2015 22:52:42 +0100
+Subject: [PATCH] check the enable._version.py when installing from source
+
+---
+ setup.py | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index f765f51..3328b93 100644
+--- a/setup.py
++++ b/setup.py
+@@ -92,13 +92,14 @@ def write_version_py(filename):
+     fullversion = VERSION
+     if os.path.exists('.git'):
+         git_revision, dev_num = git_version()
+-    elif os.path.exists('kiva/_version.py'):
++    # All packages are synced with the enable version
++    elif os.path.exists('enable/_version.py'):
+         # must be a source distribution, use existing version file
+         try:
+-            from kiva._version import git_revision, full_version
++            from enable._version import git_revision, full_version
+         except ImportError:
+             raise ImportError("Unable to import git_revision. Try removing "
+-                              "kiva/_version.py and the build directory "
++                              "enable/_version.py and the build directory "
+                               "before building.")
+ 
+         match = re.match(r'.*?\.dev(?P<dev_num>\d+)', full_version)
diff --git a/dev-python/enable/metadata.xml b/dev-python/enable/metadata.xml
new file mode 100644
index 000000000000..63ecca60e3b3
--- /dev/null
+++ b/dev-python/enable/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    The Enable project from the Enthought Tool Suite provides two
+    related multi-platform packages for drawing GUI objects:
+    * Enable: An object drawing library that supports containment and
+      event notification.
+    * Kiva: A multi-platform DisplayPDF vector drawing engine.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">enthought/enable</remote-id>
+    <remote-id type="pypi">enable</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/enaml/Manifest b/dev-python/enaml/Manifest
new file mode 100644
index 000000000000..75264614a8c3
--- /dev/null
+++ b/dev-python/enaml/Manifest
@@ -0,0 +1,5 @@
+DIST enaml-0.9.8.tar.gz 1455642 SHA256 c646f12dc7928555f2f24a10706c0d668b11a5e63e4b878dcb267247bf22a1d5 SHA512 e9b88d1fbb9e82564d3a865f74685b1b1f8b8918e29dd4d7ce7d6b4b2e6d386c6388e99f9bf0adb02fb9277a57519f8502a33bd6e0548fd1a4d52d0a4b33cf02 WHIRLPOOL f9c6874f7fec569acdbf74c5cdd24c6189506980ca65028c3ea53ed076338a5edea6b19d018d19b8662385b058d9c96c7e36239a1f86d8c1cdcada559f49bfd8
+EBUILD enaml-0.9.8.ebuild 1671 SHA256 a453bf277d7fd4d2b3212da443bc1125bb33574599bb62e1ba5ac2c1c8a8aa68 SHA512 bab220c729adb94b406d6626653f06daec88e7938b2470b2942d09c53e322029713e190553afea5faa26c2bef1c667fbcb9db3ded0ca2dc126a1adbadf5b3279 WHIRLPOOL c5731df721bf2017600be92affbc30b66224c05cbb5a8bc12e2f1b08edde4b320da0606a7bbc94f52ffe028031abcebe0d1b215f3ab50e39ff64260fff1049fe
+MISC ChangeLog 2643 SHA256 0381a605cf493dde99a82de49600aed669a69a6326503ceec1f93786f0f65fd6 SHA512 5813514be58709f0ac8c10cefaa68d997097d3d27f2b5743bd99878d9a29939455e0b01d8082b4be40f9a0137d001f6258a5bd0c2386909bc93cf805e8540c5c WHIRLPOOL 8510f2ea9d21cac07282337e5674fe694c7f721c5ff1bc1d239a5ea5f568996bb77d1f0d1b73e3dbc56f2dec2a490164d93107161daa6856e296d51316af0ea5
+MISC ChangeLog-2015 1764 SHA256 c91b77d1efd17cf7315e233274f0670f5c658eebf28f82318d3b60cedbbb9567 SHA512 31f1db335139e758c4e4e12189a0689a25084ba02fb51b7dd2798532e6248f93b65c19d9f8117c975a7b94a8fc3156d9486dad955ab5ed65bcdf895aa0ad316e WHIRLPOOL d0215bf2edb9541bc6f8962381e076f65d2c6e77608e313c7d72c1b029308c8b701b5db070a038fb40e010701440509e8d9c514cd9eeb122528eba87312f0304
+MISC metadata.xml 631 SHA256 a02f73a3bb3193a145a9f1a93f53bacd80647dff4a0bf1b0231320d97bb4d7a5 SHA512 2c642e89488173558b55516bfc7830c8e324f79508b133a4b238b85588f58417a8ed2edcea4dee94dea734e4e9d6adef873bffc12d53e4c6655a59bc7309b3b4 WHIRLPOOL 21cf9c1b2ae2e20db7cc5a4c2822787e15f1ffa996cdf1c2349dfdef662eaaef36a3e0d160d198f3ac533e75f77f94dcdaa9c555c8945601e8da423e3fe0cbf7
diff --git a/dev-python/enaml/enaml-0.9.8.ebuild b/dev-python/enaml/enaml-0.9.8.ebuild
new file mode 100644
index 000000000000..141a0e63b409
--- /dev/null
+++ b/dev-python/enaml/enaml-0.9.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 virtualx flag-o-matic
+
+DESCRIPTION="Enthought Tool Suite: framework for writing declarative interfaces"
+HOMEPAGE="https://github.com/nucleic/enaml https://pypi.python.org/pypi/enaml"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/atom-0.3.8[${PYTHON_USEDEP}]
+	>=dev-python/kiwisolver-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
+	|| (
+		dev-python/wxpython:*[${PYTHON_USEDEP}] \
+		dev-python/PyQt4[${PYTHON_USEDEP}] \
+		dev-python/pyside[${PYTHON_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	test? ( dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/wxpython[${PYTHON_USEDEP}]
+		dev-python/pyside[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+# The testsuite antagonises gentoo conventions far beyond what can currently be dealt with
+# It also passes all once run
+RESTRICT="test"
+
+# Doc build now fails, missing required folder, use doc removed for now
+# https://github.com/nucleic/enaml/issues/170
+#python_compile_all() {
+#	use doc && emake -C docs html
+#}
+
+python_prepare_all() {
+	append-flags -fno-strict-aliasing
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	export ETS_TOOLKIT=qt4
+	export QT_API=pyside
+	VIRTUALX_COMMAND="nosetests -v" virtualmake
+}
+
+python_install_all() {
+#	use doc && local HTML_DOCS=( docs/build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/enaml/metadata.xml b/dev-python/enaml/metadata.xml
new file mode 100644
index 000000000000..15d1b80895d1
--- /dev/null
+++ b/dev-python/enaml/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  Enaml is a framework for writing declarative user interfaces in
+  Python. It provides a Yaml-ish/Pythonic syntax language for
+  declaring a ui that binds and reacts to changes in the user's
+  models. Code can freely call back and forth between Python and Enaml.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">enaml</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/encore/Manifest b/dev-python/encore/Manifest
new file mode 100644
index 000000000000..0aaf4f53cbcd
--- /dev/null
+++ b/dev-python/encore/Manifest
@@ -0,0 +1,6 @@
+AUX encore-0.5.1-pypy-tests.patch 1521 SHA256 32341df740ee17f2e301cf2f516b7e4f0db1930df5d810311ac99fcbd2e93359 SHA512 a12237e32a973d120e59521cbba2be02574e4ed9f07e2be8be9687039c7af7aa8d96cab0f28e2524cf52dd40975f4e04688cf61c5260e74cb4853b876c8e3c3a WHIRLPOOL 4ba5ddd3a820092c7ba06cceb8a8d04f499c1f30692b44997cac3eadbeea322f3c0f8a9dab0e834bb76878d9deb1173c2d890b3c54f4e46527cb6054bf6a27c7
+DIST encore-0.5.1.tar.gz 71248 SHA256 0e90fd798e3b274b7f41e2989f27a22b41ec331976753a804f27f5781012c3b2 SHA512 410d37bd326ac5b8433dd5896c3e167387e83380cc55efa7405b4c3f918108cee60e6d3c78c3ff41aa2b1f46939cb3c4e2e495b9f77a9c2483a77e1973bd2d17 WHIRLPOOL 3ed37349e3ad5db6979472b2808a11b7f43cc7e1074265dfb2ed2480b2890dca64af86e66bad9578184915f4e24577ab1715defeaba8e6610e33292fdab6fd16
+EBUILD encore-0.5.1.ebuild 1053 SHA256 56dfe524f720cd17ddb527456496b234d4060f4f9a1cc98a25748c03ed8c4fd0 SHA512 c94902aa8c0b5b70bfbd6f6b6e9089d5e6e0a0af0e01a8fd3c5089c9d2bfc7437c348364bc7d423f6bca8bce85ef8f0088fa4bf590349cf96068fa4bc5fcb4f8 WHIRLPOOL 6ae696911d8a82c1f44e5baba958f3ac8a10381b8cdfeb0b4882df018608d66db9e09fa7ff3dad9ba410deddce61a07247e1073eca784f9ce57b1f6aa69fc048
+MISC ChangeLog 2562 SHA256 bba3517bd2256d98a6f38d503d0651c991458cbbb5d871d12e4eea583183aa47 SHA512 cf6f7a701b382e6035d93d889268e9ce2ef203d9a140267b900bd206419f48c5e973ec2661134bf809d596007984711c421f0326c0b0b474b95cfe540bd98556 WHIRLPOOL 7a06e84be64d418af0d75fdc7f3757d0aed5b3a7d5e7045ddbd166d5e40a67329d7dce6c688f3eae244a1ac1d9b174761f55e8a55e3f2cb0cf1cf5e8eddde45f
+MISC ChangeLog-2015 1830 SHA256 401b20b987afaa15f0d61723aea6ee128c864359c96755d4838d3c682820ab33 SHA512 449860b22e50687f88b6b85bfdf044e6a56e382ce7e1016a2c3cf6b10c648f1da51fc094371320bb05189ca15f2dde321f1dcbf4c4ce6f06e0456ef7d8fcdb54 WHIRLPOOL 40012809423b127eb87be7168bb929caa483e79c47fd9221f5dc513cbe9b4cc93e28de31edc459cd70df1276ddc87e1dcd514120484d8670a7d56c6203783e7a
+MISC metadata.xml 690 SHA256 e23514922d8dec654386b66e570ca285e516b701cf40fe143991aff1e379cb13 SHA512 f1f802d95ab3c1d74c8632a86117fdb0eecf9acb46b1d50a3a10bbeb17a001144ab3bbbc3b600bea98c78baf0c2b2a437a3bda04e069c0f6f1389465bf88258c WHIRLPOOL a78d82431eaca68c277e20b96aa98018ffca410355093eab1150817dcf256ea210201b3b202e504c2efd419d8f07146e8b4f1d4fa5b49af92c90fd6ccdf1d87a
diff --git a/dev-python/encore/encore-0.5.1.ebuild b/dev-python/encore/encore-0.5.1.ebuild
new file mode 100644
index 000000000000..756162a5ade8
--- /dev/null
+++ b/dev-python/encore/encore-0.5.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Enthought Tool Suite: collection of core-level utility modules"
+HOMEPAGE="https://github.com/enthought/encore"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="virtual/python-futures[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${P}-pypy-tests.patch )
+
+python_test() {
+	"${PYTHON}" -m unittest discover ./${PN}/events || die
+	# PYTHONPATH goes astray & '-m unittest discover' loses its way. nose works
+	# https://github.com/enthought/encore/issues/84
+	# tests for storage simply aren't written to cater to pypy
+	if [[ "${EPYTHON}" == python2.7 ]]; then
+		nosetests ./${PN}/storage || die
+	fi
+}
diff --git a/dev-python/encore/files/encore-0.5.1-pypy-tests.patch b/dev-python/encore/files/encore-0.5.1-pypy-tests.patch
new file mode 100644
index 000000000000..c7673efa7c4c
--- /dev/null
+++ b/dev-python/encore/files/encore-0.5.1-pypy-tests.patch
@@ -0,0 +1,36 @@
+diff -ur encore-0.5.1.orig/encore/events/tests/test_event_manager.py encore-0.5.1/encore/events/tests/test_event_manager.py
+--- encore/events/tests/test_event_manager.py	2014-01-06 22:40:24.000000000 +0800
++++ encore/events/tests/test_event_manager.py	2014-05-05 17:56:16.606026933 +0800
+@@ -10,7 +10,7 @@
+ import mock
+ import weakref
+ import threading
+-
++import sys
+ # Local imports.
+ from encore.events.event_manager import EventManager, BaseEvent
+ from encore.events.api import (get_event_manager, set_event_manager,
+@@ -429,6 +429,7 @@
+         self.evt_mgr.emit(BaseEvent())
+         self.assertEqual(data, [1])
+ 
++    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "test written for py2 garbage collection methods")
+     def test_method_weakref(self):
+         """ Test if methods do not prevent garbage collection of objects.
+         """
+@@ -464,6 +465,7 @@
+         self.evt_mgr.emit(obj)
+         self.assertEqual(data, [1, 2])
+ 
++    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "test written for py2 garbage collection methods")
+     def test_method_collect(self):
+         """ Test if object garbage collection disconnects listener method.
+         """
+@@ -481,6 +483,7 @@
+         self.assertEqual(data, [])
+         self.assertEqual(len(list(self.evt_mgr.get_listeners(BaseEvent))), 0)
+ 
++    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "test written for py2 garbage collection methods")
+     def test_method_disconnect(self):
+         """ Test if method disconnect works.
+         """
diff --git a/dev-python/encore/metadata.xml b/dev-python/encore/metadata.xml
new file mode 100644
index 000000000000..3b6cf870a96f
--- /dev/null
+++ b/dev-python/encore/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  This package consists of a collection of core utility packages
+  useful for building Python applications. This package is intended to
+  be at the bottom of the software stack and have zero required
+  external dependencies aside from the Python Standard Library.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">encore</remote-id>
+    <remote-id type="github">enthought/encore</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/entrypoints/Manifest b/dev-python/entrypoints/Manifest
new file mode 100644
index 000000000000..2b254dd72ec3
--- /dev/null
+++ b/dev-python/entrypoints/Manifest
@@ -0,0 +1,12 @@
+AUX entrypoints-0.2.1-init.py.patch 243 SHA256 c531fbe3fbc8f938f49a37f376c9b81aab434ce85652f056e6743c5375df5205 SHA512 f25cb047aa8743dd9145c8e5913c53b5faa6a2b0ed3a50a957d69739bef43b3a6612ec38754bb088c2f9a8e116df61e00962fd1a78c45e5c107cbdd40a9569d0 WHIRLPOOL 4796b7c2cf87b8018e1e02e7ac040098ef594bfd59a60d8c65c09a6e19931aff2097324d0f3a67bd8ffe942ee78e834afe841ab85b4c3cd17d9ce2450184846b
+AUX entrypoints-0.2.1-setup.py.patch 614 SHA256 17cc4cee0f01c6af05a6dd51c38dd29a454e3a02a8ecdf4287ef4d1600df7332 SHA512 03fa78528f98d82823083c3ab9e134726ccb221b6d4bc47f1013ffd84d019e1e84a084f3f8f064b5344bc40b897bbf3c52ef1d61c1a089a86bcacb35f3b42e88 WHIRLPOOL 8b2608bedeb4d00fec7deed201915ed08ac0069234bd2c8786471f83d267ce8512b4083af32de1c6f831182bf80e4c45cebf37fa94e8f44d2a7cd3c8eff2a8a1
+AUX entrypoints-0.2.2-setup.py.patch 614 SHA256 907a33da9940958035bd0efc9d8349d5e84f21fad84ea80feaa2d0712cedc938 SHA512 6acb4821f8a356203d0e915dd0d2dc8952350d17bd364ca2a2194ad9901cca826ee8d882abb349f36ae1e3a10caf7c651d5c9e7e4f6b9498c2d4674b37b71499 WHIRLPOOL 85e155f5b8ddffbcf4ba532ddb99b766eeeb85a62b8ade82bb9be616b1f1b9cfe23b03b3174de6a9fe2ee5a07b9b32278a342b374cc3915abdedb1c5e49f5ef1
+AUX entrypoints-0.2.3-setup.py.patch 614 SHA256 cdfa094c050575119a14a0566bd769b40bb8380ef88e62f9d3f4a2d450dac3b7 SHA512 eff2b655b0b0efe32fba265ee7816e6618062a665f86371104862cbc2e1ef79bd6ded749084ef18c09c6a5a43f572daff4c3377b6fa39b6b46d926de5bfeb42a WHIRLPOOL 5ca76dce590f9790b1c6283840845a903741977895f18e7aa016c25f9074917d9e65c9ff079d2b924f5f2373344606358b59f8a1724423d1750fb8b95c014b91
+DIST entrypoints-0.2.1.tar.gz 11126 SHA256 0d6b6798446c2e5e5dd6691e79356c29e82234bdb67995233f57413a11f2ded4 SHA512 67a24fc53ae8bdac6bda163d2c8057b158979d55ccdbcdb8709966573bf0a999728e04eb92a05fbc2c0d532593de0ec6518bcfed1d5bcf875b00bbd5c48494c7 WHIRLPOOL f673fb42bad930bb1907692013df469d64b9afb77c3e0acca250fb0b14fe17ec3962cb60de2f0760ede40c8f039690851424b816e047669916ff1d73389daaf7
+DIST entrypoints-0.2.2.tar.gz 11162 SHA256 e54b5df8bb971507278c65df96e6486cf4aea0cdac384d0102ea0339e0a4f82b SHA512 c987807924f92fd6bc0aab1cccaa4b204587d4f34932c353033ed062fff5adf69bfdc8767f095dda15fff9b57e2be2d205bfa44abc5ad7f7820114e0355a6e99 WHIRLPOOL 9d884c8977f8ea49f23f3c8a6b8ac3d48de6e6ff1133f53afe7072e180fd714019c9076b553deae5595d2383a02728412a8536ea26f4a1a56a8d552806054da9
+DIST entrypoints-0.2.3.tar.gz 11219 SHA256 a628825648fade6fba8dd94cc26e38340ed840fca3e9d5b7b3dbf755b27bbbdd SHA512 dbf8085652e50cbdbe137ae655ef765cff58bdaa6beefebf1383dcd96dfcbf9c92580c09e9a58de7893aebdd7b2a701ef8d13a56ef0fa9a3d9ef7a5bd1d9b11b WHIRLPOOL e7915ed78eb77923dfbce5ad8d71e869169ecc9117c2c98fafafb370957874bfb63d39064b41dc17af2d2d51ab426a6865ee65fe04a96a211bc96f6a0979769f
+EBUILD entrypoints-0.2.1.ebuild 1323 SHA256 03812c36fec9c7b595357c0381ac93d58ec345ce7a2a432b0f5298eb39340ce1 SHA512 4b2a53bc66f99ac312b3d087f533f0262561f8e0453101e8f45561629539f9dc835057226a4ca0c980228351bd062bb90a4a5347a633ed1a4fe870950ca574e2 WHIRLPOOL faf12a87d5833950cea493469da4ea6c003f207b261163bc7233d0fce8a79cc48386e3e997759115f652bbe161104230bbcf655b70b865a7fe6aa03079cb3b39
+EBUILD entrypoints-0.2.2.ebuild 1289 SHA256 7333844714f7bdd820196a2d8b6380166211df8e5cd968cf6744b98d457b02c9 SHA512 435d3e7b0ad552aabfd9b1842e95e49610233c5075d08da176377107001ef510da438681ca077817c7e9a2d99a7ad14e47c179ef8da90ad07845574dd0120ea2 WHIRLPOOL 033a4a55825ca1172770e926099fedafe9982437a2d1b90da8c5a53009314efd085f04cbc5803aa1ef1f3128537b93bf4309502d6bc1c529d6d4a6d386f619bc
+EBUILD entrypoints-0.2.3.ebuild 1289 SHA256 7333844714f7bdd820196a2d8b6380166211df8e5cd968cf6744b98d457b02c9 SHA512 435d3e7b0ad552aabfd9b1842e95e49610233c5075d08da176377107001ef510da438681ca077817c7e9a2d99a7ad14e47c179ef8da90ad07845574dd0120ea2 WHIRLPOOL 033a4a55825ca1172770e926099fedafe9982437a2d1b90da8c5a53009314efd085f04cbc5803aa1ef1f3128537b93bf4309502d6bc1c529d6d4a6d386f619bc
+MISC ChangeLog 433 SHA256 a98eaf9b50fe18947004d13051f9b7f2224d84c5894250fbfe6259d3984d4b35 SHA512 e3dd5b39059b3d153bd87b1930b9c7b82872d510b2c246b4f168ea9042f08286faae558f4fc6b697a4f8a53b65c1b368a1b6afec545afc4bf98ac33777e5d81c WHIRLPOOL b76c7fefda1a6e654f4a893cdf3a7022140b386423fce4793351a916b58c0212bbd156dd55c9bbe759e3407a5d72163c1a708bdd243c1312c179eeeea9ca24d2
+MISC metadata.xml 742 SHA256 e4f549e56b7b0d743ff06ce592b0f14d6a7d74cf5fc4b0090e4de2e0ec0d8643 SHA512 0588e7b73f038771ca8f1a6aa637f1d2a67ee1ea8bb35b73fcad109deaea11d7e57b61314a088c82d923de66e9fd8fc8ff5927dfc835ee587c819367f1f4d68d WHIRLPOOL 43273d7aefc37b101216e9a375795cc73f6ca21eb0b86aeb6688758f57ac44509b95ee6b1c55a9c29e867af45efdb22d91ce04fda8ae8dd274dc09ff54cfffb8
diff --git a/dev-python/entrypoints/entrypoints-0.2.1.ebuild b/dev-python/entrypoints/entrypoints-0.2.1.ebuild
new file mode 100644
index 000000000000..854450116632
--- /dev/null
+++ b/dev-python/entrypoints/entrypoints-0.2.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Discover and load entry points from installed packages"
+HOMEPAGE="https://github.com/takluyver/entrypoints"
+SRC_URI="https://github.com//takluyver/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7)
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/python-pathlib[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-setup.py.patch
+	"${FILESDIR}/${P}"-init.py.patch
+)
+
+python_prepare_all() {
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+
+	mv "${WORKDIR}/${P}"/entrypoints.py "${WORKDIR}/${P}/${PN}/" || die
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+	}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	cp -r "${S}"/tests "${TEST_DIR}"/lib/ || die
+	py.test || die
+}
diff --git a/dev-python/entrypoints/entrypoints-0.2.2.ebuild b/dev-python/entrypoints/entrypoints-0.2.2.ebuild
new file mode 100644
index 000000000000..2f1065d5e644
--- /dev/null
+++ b/dev-python/entrypoints/entrypoints-0.2.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Discover and load entry points from installed packages"
+HOMEPAGE="https://github.com/takluyver/entrypoints"
+SRC_URI="https://github.com//takluyver/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	$(python_gen_cond_dep '>=dev-python/configparser-3.5.0[${PYTHON_USEDEP}]' 'python2*')
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/python-pathlib[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-setup.py.patch
+	"${FILESDIR}/${PN}"-0.2.1-init.py.patch
+)
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+
+	mv "${WORKDIR}/${P}"/entrypoints.py "${WORKDIR}/${P}/${PN}/" || die
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C doc html
+		HTML_DOCS=( doc/_build/html/. )
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	cp -r "${S}"/tests "${TEST_DIR}"/lib/ || die
+	py.test || die
+}
diff --git a/dev-python/entrypoints/entrypoints-0.2.3.ebuild b/dev-python/entrypoints/entrypoints-0.2.3.ebuild
new file mode 100644
index 000000000000..2f1065d5e644
--- /dev/null
+++ b/dev-python/entrypoints/entrypoints-0.2.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Discover and load entry points from installed packages"
+HOMEPAGE="https://github.com/takluyver/entrypoints"
+SRC_URI="https://github.com//takluyver/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	$(python_gen_cond_dep '>=dev-python/configparser-3.5.0[${PYTHON_USEDEP}]' 'python2*')
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/python-pathlib[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-setup.py.patch
+	"${FILESDIR}/${PN}"-0.2.1-init.py.patch
+)
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+
+	mv "${WORKDIR}/${P}"/entrypoints.py "${WORKDIR}/${P}/${PN}/" || die
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C doc html
+		HTML_DOCS=( doc/_build/html/. )
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	cp -r "${S}"/tests "${TEST_DIR}"/lib/ || die
+	py.test || die
+}
diff --git a/dev-python/entrypoints/files/entrypoints-0.2.1-init.py.patch b/dev-python/entrypoints/files/entrypoints-0.2.1-init.py.patch
new file mode 100644
index 000000000000..40d5d82730d3
--- /dev/null
+++ b/dev-python/entrypoints/files/entrypoints-0.2.1-init.py.patch
@@ -0,0 +1,8 @@
+__init__.py for entrypoints by Marius Brehler <marbre@linux.sungazer.de>.
+
+Patch by Marius Brehler <marbrbre@linux.sungazer.de>.
+--- /dev/null
++++ b/entrypoints/__init__.py
+@@ -0,0 +1 @@
++from .entrypoints import *
+\ No newline at end of file
diff --git a/dev-python/entrypoints/files/entrypoints-0.2.1-setup.py.patch b/dev-python/entrypoints/files/entrypoints-0.2.1-setup.py.patch
new file mode 100644
index 000000000000..98786854773c
--- /dev/null
+++ b/dev-python/entrypoints/files/entrypoints-0.2.1-setup.py.patch
@@ -0,0 +1,20 @@
+setup.py for entrypoints by Marius Brehler <marbre@linux.sungazer.de>.
+
+Patch by Marius Brehler <marbrbre@linux.sungazer.de>.
+--- /dev/null
++++ b/setup.py
+@@ -0,0 +1,13 @@
++from distutils.core import setup
++
++setup(name='entrypoints',
++      version='0.2.1',
++      description='Discover and load entry points from installed packages.',
++      author='Thomas Kluyver',
++      author_email='thomas@kluyver.me.uk',
++      url='https://github.com/takluyver/entrypoints',
++      packages=['entrypoints'],
++      classifiers=[
++          'License :: OSI Approved :: MIT License'
++      ]
++)
+\ No newline at end of file
diff --git a/dev-python/entrypoints/files/entrypoints-0.2.2-setup.py.patch b/dev-python/entrypoints/files/entrypoints-0.2.2-setup.py.patch
new file mode 100644
index 000000000000..bb82eee6951f
--- /dev/null
+++ b/dev-python/entrypoints/files/entrypoints-0.2.2-setup.py.patch
@@ -0,0 +1,20 @@
+setup.py for entrypoints by Marius Brehler <marbre@linux.sungazer.de>.
+
+Patch by Marius Brehler <marbrbre@linux.sungazer.de>.
+--- /dev/null
++++ b/setup.py
+@@ -0,0 +1,13 @@
++from distutils.core import setup
++
++setup(name='entrypoints',
++      version='0.2.2',
++      description='Discover and load entry points from installed packages.',
++      author='Thomas Kluyver',
++      author_email='thomas@kluyver.me.uk',
++      url='https://github.com/takluyver/entrypoints',
++      packages=['entrypoints'],
++      classifiers=[
++          'License :: OSI Approved :: MIT License'
++      ]
++)
+\ No newline at end of file
diff --git a/dev-python/entrypoints/files/entrypoints-0.2.3-setup.py.patch b/dev-python/entrypoints/files/entrypoints-0.2.3-setup.py.patch
new file mode 100644
index 000000000000..7ed226b489da
--- /dev/null
+++ b/dev-python/entrypoints/files/entrypoints-0.2.3-setup.py.patch
@@ -0,0 +1,20 @@
+setup.py for entrypoints by Marius Brehler <marbre@linux.sungazer.de>.
+
+Patch by Marius Brehler <marbrbre@linux.sungazer.de>.
+--- /dev/null
++++ b/setup.py
+@@ -0,0 +1,13 @@
++from distutils.core import setup
++
++setup(name='entrypoints',
++      version='0.2.3',
++      description='Discover and load entry points from installed packages.',
++      author='Thomas Kluyver',
++      author_email='thomas@kluyver.me.uk',
++      url='https://github.com/takluyver/entrypoints',
++      packages=['entrypoints'],
++      classifiers=[
++          'License :: OSI Approved :: MIT License'
++      ]
++)
+\ No newline at end of file
diff --git a/dev-python/entrypoints/metadata.xml b/dev-python/entrypoints/metadata.xml
new file mode 100644
index 000000000000..acbfe4f76fbe
--- /dev/null
+++ b/dev-python/entrypoints/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>marbre@linux.sungazer.de</email>
+  <name>Marius Brehler</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    Entry points are a way for Python packages to advertise objects with
+    some common interface. The most common examples are console_scripts
+    entry points, which define shell commands by identifying a Python
+    function to run.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">takluyver/testpath</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/enum34/Manifest b/dev-python/enum34/Manifest
new file mode 100644
index 000000000000..1c8f0f0a3a79
--- /dev/null
+++ b/dev-python/enum34/Manifest
@@ -0,0 +1,5 @@
+DIST enum34-1.1.6.tar.gz 40048 SHA256 8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1 SHA512 51652525adc37bd1af1d81933f965dba9c508838d9f759c80ca1392991515a29c2c0263264a4e175b37a6ba11dca68c354774e448b19ef1bdba96be5474d93ec WHIRLPOOL 856c6f81f33eb8f13b65e4124f1eaba79ed6b1ee69caf4200398b335a21019b2a54443bce87dd570db0282d2e17a1366010ac274795ce4cf78608271d934626d
+EBUILD enum34-1.1.6.ebuild 742 SHA256 16c53804db1ad53a1198e2ec01b8bdcebbed66ca1760414c385db30f0f4d2c4a SHA512 d89e1b6f75572f1a3a6397dcd01d5adf65c5cf9a9d385413ebbca4ed46f190ba65e82dcfc2be101105e0bcd538448fb33523d0949cc7c2f0b48027568e6c98f5 WHIRLPOOL 8c5deadd1eb889f8031ff863f37fe03f5f3da73183420a35e38f50ce9936664ac02611e199fad2c7902a1e3ea93d1d1453b0ce40991706fcc33348868e632b9d
+MISC ChangeLog 4274 SHA256 26335621cbbf9f8f52abf65a07ae1c72ce3869dd19afbd819bbfe211e505c9a2 SHA512 463152461cbf3aa571744648cbe7705e09ffc026665798beb6d738936cc5ea44c9508572ffe6779bcf22f23fb891f269d7c19be1b12937133c2489543c09a508 WHIRLPOOL 120d624bc6838efe256ec5f97bb7790d0d9a5dac5ea427980eec571d240057fb9d63b93e030adc816618e0ef4bf7e30cd40175f553abf16627343815d86c311b
+MISC ChangeLog-2015 2726 SHA256 07a00a02ef2dcd1d4b2bda65b5302f44f3c022faf6030b0c4c4b9d312a26a667 SHA512 804539a2749ce6c4a850f1a9920ffbd42ce9c1634eeb50c35e0f462605797c30d39d4d70df004144963874d09ec1483bcf31787645e9f625bd578541ae071d80 WHIRLPOOL 39819c7d1c003c3944bd2b6493339d17ed9e17dd6385777e308318d8b89ae71f7a01f2da629f5d3fd4d2c848b142b3774d93c48b53dc4fe29d76c50eceb64ae2
+MISC metadata.xml 432 SHA256 9bf7b08d0f54aaa591f9bba69525ab8487587bcf2d04421e0d2ebee3f0da5f53 SHA512 8c05be54dc369433faa69fba6fecb610e74d9f71d6f3feb53bcb2c7882a8e5cd64d90456a20cdfc73c87555acb62c77307ccef393b84dd6e979c83bc3cc3d640 WHIRLPOOL e82f8ac64ad69ce4f97b3d7b7cabb9727c2255a4d59700af714ecb1d05e2e97871a69b08c1c81a6be9f189280ac931619bc9ac4b3b0b49cdda65306cd3f2b13f
diff --git a/dev-python/enum34/enum34-1.1.6.ebuild b/dev-python/enum34/enum34-1.1.6.ebuild
new file mode 100644
index 000000000000..0223ef3faf92
--- /dev/null
+++ b/dev-python/enum34/enum34-1.1.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 3.4 Enum backported"
+HOMEPAGE="https://pypi.python.org/pypi/enum34"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" enum/test.py || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local DOCS=( enum/doc/. enum/README )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/enum34/metadata.xml b/dev-python/enum34/metadata.xml
new file mode 100644
index 000000000000..be52cebea38f
--- /dev/null
+++ b/dev-python/enum34/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>alunduil@gentoo.org</email>
+    <name>Alex Brandt</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">enum34</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/envisage/Manifest b/dev-python/envisage/Manifest
new file mode 100644
index 000000000000..815cf76f7818
--- /dev/null
+++ b/dev-python/envisage/Manifest
@@ -0,0 +1,5 @@
+DIST envisage-4.4.0.tar.gz 192529 SHA256 ce9274a1afef8e4b660344eda2b32c4aa23fa35aa61dadc33d5a85eb284270f6 SHA512 7cc8fa82ea9bfd53f1a6cc90551d97972dd4b7abe9476515ea617ab6a32d7f2f65b2815ed934633f96b0f1445b763b9350e5d0e37ed99768c9a2ca32e588f91f WHIRLPOOL a108b28877821fe7acc0841726f7357c75eeb6b2734fcec12fd7c700b5fff41b9c0bb84b47be95f0776529fb70b58481b6a2b1ec1ad70763799e58ac152286db
+EBUILD envisage-4.4.0.ebuild 838 SHA256 0fd48b4742db48f7f394da01428c2f6a6d42818ee483a2974bc99514cd28f811 SHA512 c8dd6f96e44adc7ec40cc3107903c5b8c32ef8ed50d186229213028f983590556604bff3d02b6fa0c848c7b11e237ee5d333a436549ce7f3e7261a4e8580f454 WHIRLPOOL fdc4cbf0742765881c83b7b02ff54b5048a67e4bf6c9b5562981ab7a5d60cad2a976029c0e402018247f3b5115f9e5521006edc9199546089c6fa5f847d8d573
+MISC ChangeLog 2598 SHA256 20efcfa35f817a4034ae3eb5eac880db2fa674371aa4be1f7a254fc49e3ea830 SHA512 4e56a346332635bcdfed081850e013259a5ddd9f855625985e73d407f29fed20349312e56c10efe5e6eba2e8531eac65358c2087d0fb00991dbbe507b5d31393 WHIRLPOOL 0221a6aec9c49c307736e1a47214a6b7b2fd031270df3a7b67c755205c3f52bfa4b367e21c735411055758c61a489cbb0c086b6779a32890b13ede37953657d4
+MISC ChangeLog-2015 1927 SHA256 55c3c9918063d23c7795d889f10981238468501c63030286169e4ae8228158ae SHA512 90b036dbec57287bbd826574341afaa53374e474e23fd856fe2df3866839e168289af238b49e6986b374f3ec29581fa781fd969c67173034ccb957b46b8e7a61 WHIRLPOOL 00b49ea4e2da2fcad44a76b204d591f4e0b8e24469634fbb1a752ee378478e0eb95c6ad8eb8070183bc68bc6a57e590214e1b961b715bd804107a000649ffcc3
+MISC metadata.xml 866 SHA256 242fc0aa8d486514cd7c6068ccc81ef119f4f94e148b1c42394864742f0b8e5b SHA512 3e728258e339af459a3f5a95181646cac565e5c47f81983fc2abb5e82264a0e2e523814564eeb148b7ee6103d8e3ee4a96bfa3406b61c0fea089dbc4cd14a397 WHIRLPOOL eb7964c038d36aba5940d8096f088eacc52d4fc95fcac731ee98e1d14106d41a53e6da8cf3bb199b6df48666b4c1f7d6daf9cc8ee2affe65f02ce20ee5de2a5f
diff --git a/dev-python/envisage/envisage-4.4.0.ebuild b/dev-python/envisage/envisage-4.4.0.ebuild
new file mode 100644
index 000000000000..fa1070b7e6bf
--- /dev/null
+++ b/dev-python/envisage/envisage-4.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# py2.6 fails testsuite horribly
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Enthought Tool Suite: Extensible application framework"
+HOMEPAGE="http://code.enthought.com/projects/envisage"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=">=dev-python/traits-4[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/traits-4[${PYTHON_USEDEP}]
+		dev-python/apptools[${PYTHON_USEDEP}]
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)"
+
+# tests are buggy version after version
+RESTRICT=test
+
+python_test() {
+	VIRTUALX_COMMAND="nosetests" virtualmake
+}
diff --git a/dev-python/envisage/metadata.xml b/dev-python/envisage/metadata.xml
new file mode 100644
index 000000000000..bd359300b96d
--- /dev/null
+++ b/dev-python/envisage/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="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+</maintainer>
+<longdescription lang="en">
+  Envisage is a Python-based framework for building extensible
+  applications, that is, applications whose functionality can be
+  extended by adding "plug-ins". Envisage provides a standard
+  mechanism for features to be added to an application, whether by the
+  original developer or by someone else. In fact, when you build an
+  application using Envisage, the entire application consists
+  primarily of plug-ins. In this respect, it is similar to the Eclipse
+  and Netbeans frameworks for Java applications. 
+</longdescription>
+<upstream>
+  <remote-id type="pypi">envisage</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/envoy/Manifest b/dev-python/envoy/Manifest
new file mode 100644
index 000000000000..36f489b38394
--- /dev/null
+++ b/dev-python/envoy/Manifest
@@ -0,0 +1,6 @@
+DIST envoy-0.0.3.tar.gz 4190 SHA256 22b02009cfda2cf2cdb94a75a15ac3fd910aea8685c53e8e03715c7e9d8e8bde SHA512 3af97b95d61f12ef0d8dc71234023a69123667ef26feec9342bda4c3307629728be589be3ac7d118f6cf17aeb6b5ee91c23f37f84c411f117f5e76a5b024a967 WHIRLPOOL fca1eb6de99d90c8c94598bf5524f8ff5e41ab96f5b351e8bcd20cfc729fc8a4f360d744d25f5af4d80dd6b5ad3624a5fb041041268c4ebcf7d5154ccf62db56
+EBUILD envoy-0.0.3-r1.ebuild 646 SHA256 5db7db79f3e17bdb2ec8a2e54a853e55ace8bb02848a157cc9a03aed29f56671 SHA512 0ef8253bd4238f9f4c64079c854397d9073f71f16b59a432997fdfa738e24a76c67b954415faea7848d31435593da22ca6eda07a3aaf7aa8933765e1bfac9f03 WHIRLPOOL 04cdeb6fe0715c9067dd55f125a977090c7b1201b17643fd61b0aa2707ef57812ae1a6bd604007497133006f2a3b99784966e0076723966857da0f9a5cc1aee2
+EBUILD envoy-0.0.3.ebuild 662 SHA256 075e524caaa8ad3d77a1c5f6a4b9806f85533e9ea1a84507f46f95195e8a1e40 SHA512 0941766e748bd588d6a39243b286899c5d30d090c9a147c15383fc6c783b08a5027700df7d5afdbf54c8e5ac0f517e0442a9b21886f4822a1cbf9f6b20c91507 WHIRLPOOL da115e40b6e45c15e830f5c98499e668dbd1517ebdbb640ca1f838914f95248c30e2214ea427a2be2d09eb574a8794769f8ddf185d8773e602ead25fb98ed4d7
+MISC ChangeLog 2712 SHA256 5eabdd7e47332e0f1ccf341ef016f03b3eab5d9a77549b978b2f8807a695dd1f SHA512 2b824bfe4ffbd82e560cd228fcdac2cccbe65958f25696da0dd96b8440be57c05fa8f8cb053a52c3fdbd5a303720c250941606dc9cd7c0ff9a745aa26cea9f4c WHIRLPOOL 91d7af7187307f471cf1035b03a0ba326263d02957f9323c3538d9bb47060014992186c9f8a868ac63f1b116b4bceec8259fcae21497d5bf45074cbe8b70dd92
+MISC ChangeLog-2015 1391 SHA256 f337d8f14b33264dbacba43029d7091c8854aad1652760feab0c85569b35558c SHA512 5ee530419639ab7ed31c9b1421b7f1aa71511c4e98a74fdfb36e15f72926deede35a986134b8188552948aa929cc91902cda8f124c9c43eee0136631267c3433 WHIRLPOOL 95f47c11bb7111a795e0b16521dc00c8cce8e2f32d56b20094a122b072fa89a8f1ef377034a3b30155a0956e158740d8b832ef3173e68654441853e73b04631b
+MISC metadata.xml 378 SHA256 ec1f065c7919e0a7e0972565374123b37cb81640a754fd263fa939b6f71fcb94 SHA512 f3c1a3d7c4766c7789e851fa17aa58ca1dcd986a0dcc9cc9f52e3c23e0cbadd2ceb15ea4b6b0adff9b2d71a096e129b4e5441a8171a932e0f10cd3690b8effd5 WHIRLPOOL dc1c4db4ee3fce4cd037841caabd809ea9ce6ed640f402902fa6df4ec1291e7447cb37c834649f4e9308e7de9f0bcd142ff3077402b390fd4bb6963d9b47cb82
diff --git a/dev-python/envoy/envoy-0.0.3-r1.ebuild b/dev-python/envoy/envoy-0.0.3-r1.ebuild
new file mode 100644
index 000000000000..5a7c6b0ccf71
--- /dev/null
+++ b/dev-python/envoy/envoy-0.0.3-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple API for running external processes"
+HOMEPAGE="https://github.com/kennethreitz/envoy https://pypi.python.org/pypi/envoy"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RESTRICT="test"
+
+python_test() {
+	# These unit tests fail, see the following issue:
+	# https://github.com/kennethreitz/envoy/issues/58
+	"${PYTHON}" test_envoy.py || die
+}
diff --git a/dev-python/envoy/envoy-0.0.3.ebuild b/dev-python/envoy/envoy-0.0.3.ebuild
new file mode 100644
index 000000000000..c37fa098c957
--- /dev/null
+++ b/dev-python/envoy/envoy-0.0.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple API for running external processes"
+HOMEPAGE="https://github.com/kennethreitz/envoy https://pypi.python.org/pypi/envoy"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+RESTRICT="test"
+
+python_test() {
+	# These unit tests fail, see the following issue:
+	# https://github.com/kennethreitz/envoy/issues/58
+	"${PYTHON}" test_envoy.py || die
+}
diff --git a/dev-python/envoy/metadata.xml b/dev-python/envoy/metadata.xml
new file mode 100644
index 000000000000..dc9a9937971d
--- /dev/null
+++ b/dev-python/envoy/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">envoy</remote-id>
+    <remote-id type="github">kennethreitz/envoy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/enzyme/Manifest b/dev-python/enzyme/Manifest
new file mode 100644
index 000000000000..07ea9de61ccc
--- /dev/null
+++ b/dev-python/enzyme/Manifest
@@ -0,0 +1,7 @@
+DIST enzyme-0.4.1.tar.gz 47953 SHA256 f2167fa97c24d1103a94d4bf4eb20f00ca76c38a37499821049253b2059c62bb SHA512 62a85c076a7eb320249a507dcc9dd26572e3a9b9643e0a960ed114a80c75213e6e5028a726fbcdd0c2c46c53af980a69828a54a66af9a17af3210273376395b3 WHIRLPOOL 5055306ce3747b1aa2f6a9bf5ac85c705426e1eaa1e946780f626cbda2cf26d508baf9f6781faeb62d09266df00e6b2c7942493d9139e82eda502cc175cb711c
+DIST matroska_test_w1_1.zip 184550509 SHA256 d86f96e165e695e6cf5324ebca184f2df723872f02965b565820d265b53004eb SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f WHIRLPOOL 3d0a16871fc7df0a3ef3f34f7c496eff188400a9796a2ad66667112ef0de7deecf025196898bd24ea395f8c44e75156a8b8c09d40a92e98d833d995473eefa9e
+EBUILD enzyme-0.4.1-r2.ebuild 988 SHA256 42aeca327a4aadc9e6296ca09ff40bc60b22101ff38448c42a91a882a539c5df SHA512 85ad8c419566af85ae21c2ba14044e633c57f2b8f06e282c2aceb8b5c84a2777ee385b29388fe58ab800a0b59311f3617bb307a719fad970387f6d61e8b548ac WHIRLPOOL a1c91be545313e02c4c13cc81c1e61f7b7ad0ab642af378ae875b022e3376f6ff13a0757b713419b82ca38ddd356745e0045b6814b9367a2bd295d5f50a6b7a9
+EBUILD enzyme-9999.ebuild 1049 SHA256 f7d53c0af17073f25a40fc08b5dbc994ad2fef166ac5b92784d89b4a18539ddb SHA512 ad866aeacecc41678755d28e14088952110abcf76be11b88e3287ac55b04954b4dcac4d7c793ab4859a4389c0568205726230d57755ff0accb8b5544ea164480 WHIRLPOOL 900d8d7e7876ee69adce3273e152e0285beb5ce0e3e4ec268b0282fb01f52fab223433bfb28a613ac449ba1f2f3b8ce6ffa3c250a9fa5b0a874655b7e4197787
+MISC ChangeLog 5092 SHA256 fc9f34787820bb871d723d0e75c9b80e61103262e530efbf24885df4dc9084ee SHA512 1f835776b0eaa34c15881f1a3082cf9a03b10346ea72dd934586727ebc6fdcc916395ecd41df197c5005e749552932e81030298249c6a7c4bd5761f3820b7556 WHIRLPOOL 5e07d8e8e5352e55b1ef7021143935896983c3a297f74b9744a5d89569698ca7dd5d82fc1cd9af622250cf3039278199046f37942c971dc25e288ea45533d826
+MISC ChangeLog-2015 1352 SHA256 07787c4432b3b7ba9c8c11a8976c66f4701c9e38e436278f3cefcbe5388360a3 SHA512 a800843e4339442b67ad99b3cfcc9b7faf524fe8f764bc30ed612e9706a94f0967bd5082fa22e0897344262eac7649331a71affaf726354bbbf297344899053e WHIRLPOOL aaa348695759aa00253021605604a815976892fb64ea36f4712af0623cd185e09250abf621fbcabfe2b3ea226734998eab4add353fe1844d29f43fc10bd7e19b
+MISC metadata.xml 541 SHA256 bb45c267442ec47969dccd3a3e4fe5ce305d8dbebcbca5192177a8641ed98ae3 SHA512 0797f0d2d0b20c8a14d165efa4ea4b564ea4c714dd4d799c8b3837807a9b8b8a34b41991e52e95a63a44a7c9bcb56df008b1ca3b36fa35f8ef46b1b133368782 WHIRLPOOL b517cc62fe6086c79e89d9e28956c6fa60d317882a6750037bd82f841659117f1b8a6f9313471f8203c0142edef2c09367a5b5d4f63c21aa778a12830e4f6edc
diff --git a/dev-python/enzyme/enzyme-0.4.1-r2.ebuild b/dev-python/enzyme/enzyme-0.4.1-r2.ebuild
new file mode 100644
index 000000000000..23e0d26b393e
--- /dev/null
+++ b/dev-python/enzyme/enzyme-0.4.1-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE='xml(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="Python video metadata parser"
+HOMEPAGE="https://github.com/Diaoul/enzyme https://pypi.python.org/pypi/enzyme"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		app-arch/unzip
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	if use test; then
+		mkdir enzyme/tests/test_{mkv,parsers} || die
+		ln -s "${WORKDIR}"/test*.mkv enzyme/tests/test_mkv/ || die
+		ln -s "${WORKDIR}"/test*.mkv enzyme/tests/test_parsers/ || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/enzyme/enzyme-9999.ebuild b/dev-python/enzyme/enzyme-9999.ebuild
new file mode 100644
index 000000000000..c9d243a749c9
--- /dev/null
+++ b/dev-python/enzyme/enzyme-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE='xml(+)'
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Python video metadata parser"
+HOMEPAGE="https://github.com/Diaoul/enzyme https://pypi.python.org/pypi/enzyme"
+EGIT_REPO_URI="https://github.com/Diaoul/${PN}.git"
+SRC_URI="test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		app-arch/unzip
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+src_unpack() {
+	default_src_unpack
+	git-r3_src_unpack
+}
+
+python_prepare_all() {
+	if use test; then
+		mkdir enzyme/tests/test_{mkv,parsers} || die
+		ln -s "${WORKDIR}"/test*.mkv enzyme/tests/test_mkv/ || die
+		ln -s "${WORKDIR}"/test*.mkv enzyme/tests/test_parsers/ || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/enzyme/metadata.xml b/dev-python/enzyme/metadata.xml
new file mode 100644
index 000000000000..36f8646de595
--- /dev/null
+++ b/dev-python/enzyme/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>itumaykin+gentoo@gmail.com</email>
+		<name>Coacher</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Diaoul/enzyme</remote-id>
+		<remote-id type="pypi">enzyme</remote-id>
+		<remote-id type="sourceforge">matroska</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/epsilon/Manifest b/dev-python/epsilon/Manifest
new file mode 100644
index 000000000000..05bd4f062ff6
--- /dev/null
+++ b/dev-python/epsilon/Manifest
@@ -0,0 +1,8 @@
+AUX epsilon_plugincache_portagesandbox.patch 537 SHA256 4a09ec36e84b6dbc9b0ad62db969722e72d3b1b28e5713389aba5bd77af286a6 SHA512 44aa8441d22951e573ddb6771f452c400bd971ae8cd17994959717c6d543d519bc9f2e0721e38815210048f553ca60fcc09260cd1fac1a4fc78c51055c7a6acc WHIRLPOOL a8a4df9f8ce3d89d341d0e1730512aefd0704e4782849fbf6503264d96673ba7b6d29771ae2b4170ce67112d47103a1765a38b625bbfeb1a337b9aab13953dee
+DIST Epsilon-0.7.0.tar.gz 81218 SHA256 81419d50b17a20efd75440d43e4b07fe3c2a5e6d619f39318dab9031a0680032 SHA512 d1927ca431df3233a94296ca9e1f5dd70d6d61091d23f77df2222c6472d9a5f7b55c5c8dd2a75d0fead41af862c9e3a6a0ea9a31e21447459d5182f0d677d9b2 WHIRLPOOL 8cbab28e5e05b44b521c5f66494de1e2f4bee7713487cfb9d87bfcc108dc05b6534919934fd53cb1b0dc7aee633187351973b78cfdabf0584d6b294104a05a57
+DIST Epsilon-0.7.1.tar.gz 96820 SHA256 419ab2de80e6b201455775a939c158259af90695e59474a4a7bb3cd522a7193b SHA512 ecf34a402208e514c430b4b3785df9b29f3708026ceba1301a2db8760b55111f59e7c40f868f4b642e4c7dd6c78735edbc32b2ef96ec3582e90aa2d978f06842 WHIRLPOOL 69de1d74457ce6f376537c1a8ba3adbf8cae7b2e7325d8a61ba1a1a83e1b2cc88794b5016fa37b1808e32ff61834cb215b30146d93a0e6416623afd6a4609c08
+EBUILD epsilon-0.7.0.ebuild 1710 SHA256 701a2854d4f17066f250f4ca74430edd262d4beabb7a0f68ccc857569390adc0 SHA512 0d0d540dd896717b4bb28ccb74121be60a20bbf64920cc4e7f5b367f044844e8d00272856c5737ad47029aa8a55c99ed41223acfd37b7141d36329cfd70f8b6c WHIRLPOOL fd94cfdf6af6513d42c52fcaf89a7567e16371ca829374e3080a15214d514438b729e3bac7c02f34126552540362079ab46729e83c3f745870d7b0b693414646
+EBUILD epsilon-0.7.1.ebuild 1756 SHA256 4ff6b9879be21a420642195b1d163af8dde02f5c8c688142b41038d3fac379bd SHA512 ac00e17ce63f18f70f7b127263630e9dfbf19f5c1c8ea8b2e474174d5f7d0c13a23b956d79d72f6468df39a0fd465dcbbe7e5e55bf25fc6f0a0ac5283efdc3b8 WHIRLPOOL cfc88b8abffb9dd3710df019b619782660ef7f58cba6b84d502634a14531e98bcefc7119075d7f63213b542a782d40ebca44e6e481cab54d1113c5b2a19bad8f
+MISC ChangeLog 3135 SHA256 0c5d582017a320d585920ca513c54abe0505d4b5388928dbe3e83cb9be5542c8 SHA512 fe9b7aa84578c8d8f29a14c4f9decea720659f98b77504849d2e43f1cc40c7f92f41a24c8885ff60584cc863fe89840a5853b26f09cd1c5aa02a990df27dcbfa WHIRLPOOL f36d804b0df78f16984275ff89ee0e660096e8feb107f1e8012b38dc265041e80048032095f65a9f916c45929c2ac11b56ff9e35ace3589726a1b22cf113c248
+MISC ChangeLog-2015 5462 SHA256 a729901e9825758e4390d34e3d4d0aced126193999c1ebc480f5e3e2d4a18290 SHA512 7ac3765ce9c91e42b9de68fe1dee4eaf14983304e79441bae37e31033d9869a7dac3a0d7fbda5ae69b189a79ea41a417eecf55c622edeec3a97682cf4625901b WHIRLPOOL 387f824e24616f579efbed57ac2a0cb28c2a46d60e8993330032781d6afa78fcdc0bf3d22fb844a1017830989204e6d7d7c812dbaa4e27e135896a1b356623bb
+MISC metadata.xml 652 SHA256 35eb8d599e013d51d12d196bcc19311daa3987bd51e2d82dc503f6d31cbc8174 SHA512 aad17bdfe9501dda95cf69d3b8069ec9dfe624a07c5f0ce4160cca62928217a16140a7188d87ffe46f0626624e25ae764db892170fad6f9f0bafff7dbb413d30 WHIRLPOOL b164417d71a2b5b640dafeb1fce3603c2b2ebc76c058cf3a7aa2a71d27df540b9443e7ad8e2f3afbe9baad3f926f1f7e48ea55d506b69301f42d9141f9a3afe9
diff --git a/dev-python/epsilon/epsilon-0.7.0.ebuild b/dev-python/epsilon/epsilon-0.7.0.ebuild
new file mode 100644
index 000000000000..0d7e44bcf2e9
--- /dev/null
+++ b/dev-python/epsilon/epsilon-0.7.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1 eutils
+
+DESCRIPTION="Epsilon is a Python utilities package, most famous for its Time class"
+HOMEPAGE="https://github.com/twisted/epsilon https://pypi.python.org/pypi/Epsilon"
+SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
+
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/twisted-core-13.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/nose[${PYTHON_USEDEP}] )
+		${DEPEND}"
+
+PATCHES=( "${FILESDIR}/epsilon_plugincache_portagesandbox.patch" )
+
+# epsilon doesn't install any plugins, so override the default
+TWISTED_PLUGINS=()
+
+python_prepare_all() {
+	# Rename to avoid file-collisions
+	mv bin/benchmark bin/epsilon-benchmark
+	sed -i \
+		-e "s#bin/benchmark#bin/epsilon-benchmark#" \
+		setup.py || die "sed failed"
+
+	#These test are removed upstream
+	rm -f epsilon/test/test_sslverify.py epsilon/sslverify.py || die
+	#See bug 357157 comment 5 for Ian Delaney's explanation of this fix
+	sed -e 's:month) 2004 9:month) 2004 14:' \
+		-i epsilon/test/test_extime.py || die
+	# Release tests need DivmodCombinator.
+	rm -f epsilon/test/test_release.py* epsilon/release.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	dodoc NAME.txt NEWS.txt
+
+	distutils-r1_python_install_all
+}
+
+#Lets run some tests, having prepped them
+python_test() {
+	# No testrunner seems stipulated within the source; pytest and nosetests both work
+	nosetests ${PN}/test || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/epsilon/epsilon-0.7.1.ebuild b/dev-python/epsilon/epsilon-0.7.1.ebuild
new file mode 100644
index 000000000000..f52a5827fc01
--- /dev/null
+++ b/dev-python/epsilon/epsilon-0.7.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Epsilon is a Python utilities package, most famous for its Time class"
+HOMEPAGE="https://github.com/twisted/epsilon https://pypi.python.org/pypi/Epsilon"
+SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	|| (
+		dev-python/twisted[${PYTHON_USEDEP}]
+		>=dev-python/twisted-core-13.2.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	${DEPEND}"
+
+PATCHES=( "${FILESDIR}/epsilon_plugincache_portagesandbox.patch" )
+
+# epsilon doesn't install any plugins, so override the default
+TWISTED_PLUGINS=()
+
+python_prepare_all() {
+	# Rename to avoid file-collisions
+	mv bin/benchmark bin/epsilon-benchmark
+	sed -i \
+		-e "s#bin/benchmark#bin/epsilon-benchmark#" \
+		setup.py || die "sed failed"
+
+	#These test are removed upstream
+	rm -f epsilon/test/test_sslverify.py epsilon/sslverify.py || die
+	#See bug 357157 comment 5 for Ian Delaney's explanation of this fix
+	sed -e 's:month) 2004 9:month) 2004 14:' \
+		-i epsilon/test/test_extime.py || die
+	# Release tests need DivmodCombinator.
+	rm -f epsilon/test/test_release.py* epsilon/release.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	dodoc NAME.txt NEWS.txt
+
+	distutils-r1_python_install_all
+}
+
+#Lets run some tests, having prepped them
+python_test() {
+	# No testrunner seems stipulated within the source; pytest and nosetests both work
+	nosetests ${PN}/test || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/epsilon/files/epsilon_plugincache_portagesandbox.patch b/dev-python/epsilon/files/epsilon_plugincache_portagesandbox.patch
new file mode 100644
index 000000000000..06bd55732011
--- /dev/null
+++ b/dev-python/epsilon/files/epsilon_plugincache_portagesandbox.patch
@@ -0,0 +1,12 @@
+--- epsilon/setuphelper.py.orig	2009-02-11 08:15:39.000000000 +0100
++++ epsilon/setuphelper.py	2009-02-11 08:18:56.000000000 +0100
+@@ -21,6 +21,9 @@
+ def _regeneratePluginCache(pluginPackages):
+     print 'Regenerating cache with path: ',
+     pprint.pprint(sys.path)
++    if os.getenv("PORTAGE_PLUGINCACHE_NOOP") != None:
++        print 'Not regenerating plugin cache for portage sandbox usage.'
++        return
+     from twisted import plugin
+     for pluginModule in pluginModules([
+         p + ".plugins" for p in pluginPackages]):
diff --git a/dev-python/epsilon/metadata.xml b/dev-python/epsilon/metadata.xml
new file mode 100644
index 000000000000..223df38b1fda
--- /dev/null
+++ b/dev-python/epsilon/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">A small utility package that depends on tools too recent for Twisted
+		(like datetime in python2.4) but performs generic enough functions
+		that it can be used in projects that don't want to share Divmod's
+		other projects' large footprint.</longdescription>
+	<upstream>
+		<remote-id type="pypi">Epsilon</remote-id>
+		<remote-id type="github">twisted/epsilon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/epydoc/Manifest b/dev-python/epydoc/Manifest
new file mode 100644
index 000000000000..689a6101fdea
--- /dev/null
+++ b/dev-python/epydoc/Manifest
@@ -0,0 +1,7 @@
+AUX epydoc-docutils-0.6.patch 1190 SHA256 43c9cdc3dbdbd66045d949c6c872f7836d54b0b8262d3dd5ef6f82917ad3d03d SHA512 d1366440fb3942d307508e2a629453dee1ba53dc01dccb6a424bc5486a34dd714cc5d502262ee4fa9d8191faabae61176592a950d0d7cfc0d037ca0fbd5abfac WHIRLPOOL 77bf80de95f364021a2a6cc28ee7c794e3edd900c2d18928cad21116b0c4e83558d442bf47dec40432993002031416f5196e12405a662921c14c982a24e18602
+AUX epydoc-python-2.6.patch 2425 SHA256 c1e3ef61ba2ba70918c9f535c4c515eaba353e79c9cbe2f3071734434c045751 SHA512 b1dbc9053125c770acb75a236a32475e98be41d77dc9c1816cc194297cbbb6334e3e4cdfb1b50e37ec37a18285be6675be50f8a029ffac96705c776c0768d173 WHIRLPOOL 6d903eb3e43ba456f4f598d4a62ab39292aec77d645d4f57910da0802c1fc4a1e7e802760b01ba3a2a16518a3437db8379402b9a1c4056750f3d12456a48504f
+DIST epydoc-3.0.1.tar.gz 1785792 SHA256 d4e5c8d90937d01b05170f592c1fa9b29e9ed0498dfe7f0eb2a3af61725b6ad1 SHA512 5c4011f0018ab956c0e1fe5fe0c1608fa2416439a60b5836a9d2d95e359428086ba403bcb5ed53e64d9d4979441ca6d537d9e5b8d6224d2202e7df3332d9ea83 WHIRLPOOL d72247342d02a71765410c8da5cfa31a17049fcb916400ec202bff81fec2246cbd93d145ba3a7f333de25de6b72a34097080d9419272656a8ec4a72eea2291cd
+EBUILD epydoc-3.0.1-r2.ebuild 1141 SHA256 a6565337d565bed9e39e10825d123fe2f43648cc7b5a77dd13b7aadf5a33420b SHA512 2c679dd207b5670e0703d2c517bb89b32ac027e6530349dba6e0e66d81e49504fa0503d5dbbb679066ec06c80d965107a26b99f68a0bfc3e787fe7960e8d0e47 WHIRLPOOL 7c8bd337efd74e9e0c6171445210503909884eb20bd05ace92fce030e96f6d008e6ad77dfdeb53cc5ecd45a069695fd22b71bb2c72d0b2d636ba20d8cdfa6596
+MISC ChangeLog 2970 SHA256 ac7688c1e5f3cf9917bc88c802ac9d0513dd4a990950818f78917d86271a180b SHA512 cbb9a06f116e88009917ddc877325836c101f05e7ecfb3d7d06054322c3deae7be2266693d54b75baedd5ed149cb0db726e9b5c398e9c6eb322d40fb47f57c7e WHIRLPOOL 5ca8cc7247945b7f1ff9e13532c54a569bbe53b6dcbc8bf4283499c53b00ad80c20266c4b46a7691968f27e66c54eca3066c6ff6f72e64dcb3792d11a0b00a2f
+MISC ChangeLog-2015 9181 SHA256 e57d174c9d1e140aa112848f44e8f18eb42757a0626cc12b30db88ab5c515362 SHA512 0bc3d7505644ecb33f580bcd4df66731310c0d20da7115f185356b7dc019cd7a78239b2b581adf1858db8c0221da0ad8737e194d063e6085a2136cb146b23b14 WHIRLPOOL 55ece1aa52f7357a43cface6038a68481361058d326eddcaaaa9baf6f388b173aaf88e481f784fc43550e19a895e24a743b5e6c10caed48c8555765dd7eb19a5
+MISC metadata.xml 1222 SHA256 65c73ed7ecd6f0e6ae570e09cb84aeffcb1467db2b59f237ec95b75bc61b1a9c SHA512 188705eb8a77c10334e981c7343d64f662fe941990248054c9d91537b391e12f0ac40c1d2a00121e391e33df0965dc3e0bde42c559f0ea25ab1288fc5265a748 WHIRLPOOL 28e5a005724705fa0095cbb98666a9294f58bf5af3aab436ff5d42234909cda766724a617858fd72083d15bb30afe6cefb46efc2c4e529b06cc2aab6f454c3e3
diff --git a/dev-python/epydoc/epydoc-3.0.1-r2.ebuild b/dev-python/epydoc/epydoc-3.0.1-r2.ebuild
new file mode 100644
index 000000000000..63cd3bcba64a
--- /dev/null
+++ b/dev-python/epydoc/epydoc-3.0.1-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='tk?'
+
+inherit distutils-r1
+
+DESCRIPTION="Tool for generating API documentation for Python modules from docstrings"
+HOMEPAGE="http://epydoc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc latex tk"
+
+DEPEND=""
+RDEPEND="dev-python/docutils[${PYTHON_USEDEP}]
+	latex? ( virtual/latex-base
+			 dev-texlive/texlive-latexextra
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-docutils-0.6.patch
+	"${FILESDIR}"/${PN}-python-2.6.patch
+)
+
+python_install() {
+	distutils-r1_python_install
+
+	use tk || rm "${D}$(python_get_sitedir)"/epydoc/gui.py*
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+
+	doman man/epydoc.1
+	if use tk; then
+		doman man/epydocgui.1
+	else
+		rm -f "${ED}"usr/bin/epydocgui*
+	fi
+}
diff --git a/dev-python/epydoc/files/epydoc-docutils-0.6.patch b/dev-python/epydoc/files/epydoc-docutils-0.6.patch
new file mode 100644
index 000000000000..efb6baa121b7
--- /dev/null
+++ b/dev-python/epydoc/files/epydoc-docutils-0.6.patch
@@ -0,0 +1,27 @@
+Make epydoc work with docutils-0.6.
+
+Patch created by Engelbert Gruber (grubert) and adjusted by Martin von Gagern.
+
+References:
+https://sourceforge.net/tracker/?func=detail&aid=2895197&group_id=32455&atid=405618
+http://thread.gmane.org/gmane.text.docutils.devel/4888/focus=4924
+http://bugs.gentoo.org/287546
+
+Index: epydoc-3.0.1/epydoc/markup/restructuredtext.py
+===================================================================
+--- epydoc-3.0.1.orig/epydoc/markup/restructuredtext.py
++++ epydoc-3.0.1/epydoc/markup/restructuredtext.py
+@@ -304,10 +304,11 @@ class _SummaryExtractor(NodeVisitor):
+         # Extract the first sentence.
+         for child in node:
+             if isinstance(child, docutils.nodes.Text):
+-                m = self._SUMMARY_RE.match(child.data)
++                data = child.astext()
++                m = self._SUMMARY_RE.match(data)
+                 if m:
+                     summary_pieces.append(docutils.nodes.Text(m.group(1)))
+-                    other = child.data[m.end():]
++                    other = data[m.end():]
+                     if other and not other.isspace():
+                         self.other_docs = True
+                     break
diff --git a/dev-python/epydoc/files/epydoc-python-2.6.patch b/dev-python/epydoc/files/epydoc-python-2.6.patch
new file mode 100644
index 000000000000..84bb22d879c5
--- /dev/null
+++ b/dev-python/epydoc/files/epydoc-python-2.6.patch
@@ -0,0 +1,60 @@
+diff -Nur epydoc-3.0.1/epydoc/docparser.py epydoc-3.0.1/epydoc/docparser.py
+--- epydoc-3.0.1/epydoc/docparser.py
++++ epydoc-3.0.1/epydoc/docparser.py
+@@ -72,6 +72,26 @@
+ from epydoc.compat import *
+ 
+ ######################################################################
++## Tokenizer change in 2.6
++######################################################################
++
++def comment_includes_nl():
++    """ Determine whether comments are parsed as one or two tokens... """
++    readline = iter(u'\n#\n\n'.splitlines(True)).next
++    tokens = [
++        token.tok_name[tup[0]] for tup in tokenize.generate_tokens(readline)
++    ]
++    if tokens == ['NL', 'COMMENT', 'NL', 'ENDMARKER']:
++        return True
++    elif tokens == ['NL', 'COMMENT', 'NL', 'NL', 'ENDMARKER']:
++        return False
++    raise AssertionError(
++        "Tokenizer returns unexexpected tokens: %r" % tokens
++    )
++
++comment_includes_nl = comment_includes_nl()
++
++######################################################################
+ ## Doc Parser
+ ######################################################################
+ 
+@@ -520,6 +540,10 @@
+     # inside that block, not outside it.
+     start_group = None
+ 
++    # If the comment tokens do not include the NL, every comment token
++    # sets this to True in order to swallow the next NL token unprocessed.
++    comment_nl_waiting = False
++
+     # Check if the source file declares an encoding.
+     encoding = get_module_encoding(module_doc.filename)
+ 
+@@ -570,7 +594,9 @@
+         # then discard them: blank lines are not allowed between a
+         # comment block and the thing it describes.
+         elif toktype == tokenize.NL:
+-            if comments and not line_toks:
++            if comment_nl_waiting:
++                comment_nl_waiting = False
++            elif comments and not line_toks:
+                 log.warning('Ignoring docstring comment block followed by '
+                             'a blank line in %r on line %r' %
+                             (module_doc.filename, srow-1))
+@@ -578,6 +604,7 @@
+                 
+         # Comment token: add to comments if appropriate.
+         elif toktype == tokenize.COMMENT:
++            comment_nl_waiting = not comment_includes_nl
+             if toktext.startswith(COMMENT_DOCSTRING_MARKER):
+                 comment_line = toktext[len(COMMENT_DOCSTRING_MARKER):].rstrip()
+                 if comment_line.startswith(" "):
diff --git a/dev-python/epydoc/metadata.xml b/dev-python/epydoc/metadata.xml
new file mode 100644
index 000000000000..b409ee311894
--- /dev/null
+++ b/dev-python/epydoc/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+  Epydoc is a python documentation system without output similar to javadoc. 
+  Epydoc uses python doc-strings, importing modules, and introsepction in 
+  order to do its thing -- if your modules are not safe to import, you 
+  should look for another tool. Documentation mark-up is done with restructed
+  text (reST).
+  </longdescription>
+	<longdescription lang="ja">
+  Epydoc��Javadoc�似�出力を�る以外�Python言語����
+  ドキュメンテーションシステム��。Epydoc�doc-stringsを使��
+  モジュールをイン�ート���れら�自己分���も�を使���。
+  -- も�����指定��モジュール�イン�ート�る��安
+  全��������ら�他�ツールを使�����。ドキュメンテーション
+  �書���構造的文章(reST)��。
+  </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">epydoc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/errorhandler/Manifest b/dev-python/errorhandler/Manifest
new file mode 100644
index 000000000000..9f182d7f5205
--- /dev/null
+++ b/dev-python/errorhandler/Manifest
@@ -0,0 +1,7 @@
+AUX docs.patch 358 SHA256 d368ecf94e5da9520700c98c4f8711384f98d8e5cea34d2643e4e83eaa1dd20b SHA512 fad104f167d633644ec8f21d8888e8bfe5ab7eaa8c82b30ae2d209d64746ac4912ece042ea942bc7578c51423d1472820a58eafedfd34b644899362b94d84469 WHIRLPOOL 45da624ac9d10655712abad9abee0c9eaabc2c450e1e377d6a7c9fbc6b63bbab09395db6177f772293832569a27e2d7c922e939bd99384f3ab161587866074f9
+AUX errorhandler-1.1.1-test.patch 386 SHA256 0f329ac201d3ddf363eb60f388b5c076db5d252dec29fc24b5b3a406385a5eb2 SHA512 c6ce048411e70f8f2cb5bdbba5ee2799b09dc036f5620f03b87c0185bd12759cce03d7dc9379602546693daa05d3fb9b15c4aed8e18c265bee73272bb4a16f52 WHIRLPOOL d64038b3f82b5da88bcef0a9ce48ee4919d8a1542e36c1ae611cc8f76346c1572b08806f643acb0c00d757aad07ead41080c7b5c013c6f984f59a407375b4360
+DIST errorhandler-1.1.1.tar.gz 8321 SHA256 2baa97a8a256fe72960d196bbdee4404162186f539c4d73b3f1c072db18463e9 SHA512 a2f875537103086be956becfdac25a43a646a89b404b6a7a2a243c6d2ddbc29d55948b781529d0a0fa82b163187747f3396b62ed0be98d39834de038cc4a1fd2 WHIRLPOOL dd296200b2a451ae36225122d69e215e463a777ca162ed4b98067e146080e5fa91fd4ee8a219fc0999a05461aa69c712866e57c3b31c9a19366d82ea8efdad8a
+EBUILD errorhandler-1.1.1-r2.ebuild 1132 SHA256 1df65b30665fea60855bf5903dec3684d85edb6469b9efcce3e96207a99d3851 SHA512 52cab64df927286f703522c751fda86fb151d349448088116c6ab80558262df7ff584c87dc2208d1ffb7418477f500db436f035632d15303b65e0ac6fc04b692 WHIRLPOOL e9925047bf98dcbb8298175f7b87cc9f4f3fb90b2648410e0070dde059fe64d49eae9107f8aa8ff40bcc64911229f686b5cd764dd9d1e37a59aa1c18b381e185
+MISC ChangeLog 2784 SHA256 f95eea514e1e46984b90c38d872572c2da07ecacbfd6b49f7422e8ea47ec5199 SHA512 d6ca4190057cecab44c3feb613eb0c3f5969ba0068da5a139008c7ace9114cab2de8a55f8a01a88a0e8fb68e1b20bcb7d1b1c472c2a538e59fd9f7426b308079 WHIRLPOOL c756107e4e21db17189d3c16757f1757f0838068959dda115a0b5b0b7ea081b0b384a592c1071a8152256f96437ce89404cc4736340b8395a3f905e51eceb0fc
+MISC ChangeLog-2015 1596 SHA256 589874b5fd24cbd19795e2af16c83e804159637504c389837efc512605ea3c51 SHA512 38b82634f4745906b045fbd7608301d0ff9779c4ba0c3deabbfcf42769bae1d654727db2c97a3eaf7d1ee1073a1205c0e652da6b497fe70882496d3c35c2d1e0 WHIRLPOOL 990327b3201495dac57cae0db8dbc7762453569f96a4a6c6a4ba992cad776b7267fa363136021d746c8071dec209f1e50c599e0b0c5ad33e9e54458c91eecbc5
+MISC metadata.xml 325 SHA256 c7fa89b25ea58448a3b81cd2740c3f9c0c2b551069d74998822d65e395d5c89e SHA512 d7a0591bd66d48cab6821c9ac4131839a8b60f026ffbb677263f1af1a0f6f9b9dea2cfe3be003c40e2da7f16914ff2078ed591de0c6833406595010ed88479ff WHIRLPOOL b25008e39d0a2781a8bab9242284cdd4db4da6c55c9274bb3dc7a5eace7ee2275617416bd9c10bb57715af9e532277d0645818d46c98420f2f4a095cee3e8c22
diff --git a/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild b/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..3fe7defcd780
--- /dev/null
+++ b/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Logging framework handler that tracks when messages above a certain level have been logged"
+HOMEPAGE="https://pypi.python.org/pypi/errorhandler"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="
+	dev-python/pkginfo[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test.patch
+	"${FILESDIR}"/docs.patch
+)
+
+python_prepare_all() {
+	sed -e 's:../bin/sphinx-build:/usr/bin/sphinx-build:' -i docs/Makefile || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" -c "import errorhandler.tests as et, unittest; \
+		unittest.TextTestRunner().run(et.test_suite())" \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/errorhandler/files/docs.patch b/dev-python/errorhandler/files/docs.patch
new file mode 100644
index 000000000000..10c704d6fec3
--- /dev/null
+++ b/dev-python/errorhandler/files/docs.patch
@@ -0,0 +1,12 @@
+diff -ur errorhandler-1.1.1.orig/docs/conf.py errorhandler-1.1.1/docs/conf.py
+--- docs/conf.py	2009-11-07 20:08:10.000000000 +0800
++++ docs/conf.py	2013-06-07 14:05:17.321475285 +0800
+@@ -8,8 +8,6 @@
+     'sphinx.ext.intersphinx'
+     ]
+ 
+-intersphinx_mapping = {'http://docs.python.org/dev': None}
+-
+ # General
+ source_suffix = '.txt'
+ master_doc = 'index'
diff --git a/dev-python/errorhandler/files/errorhandler-1.1.1-test.patch b/dev-python/errorhandler/files/errorhandler-1.1.1-test.patch
new file mode 100644
index 000000000000..126b508b9923
--- /dev/null
+++ b/dev-python/errorhandler/files/errorhandler-1.1.1-test.patch
@@ -0,0 +1,9 @@
+diff -ur errorhandler-1.1.1.orig/errorhandler/tests.py errorhandler-1.1.1/errorhandler/tests.py
+--- errorhandler/tests.py	2010-03-01 16:41:46.000000000 +0800
++++ errorhandler/tests.py	2012-04-26 02:28:11.991954681 +0800
+@@ -134,3 +134,5 @@
+                      tearDown=tearDown,
+                      optionflags=options),
+         ))
++if __name__ == "__main__":
++    unittest.main()
diff --git a/dev-python/errorhandler/metadata.xml b/dev-python/errorhandler/metadata.xml
new file mode 100644
index 000000000000..2fd7162096d2
--- /dev/null
+++ b/dev-python/errorhandler/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">errorhandler</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/et_xmlfile/Manifest b/dev-python/et_xmlfile/Manifest
new file mode 100644
index 000000000000..513bfb2e469a
--- /dev/null
+++ b/dev-python/et_xmlfile/Manifest
@@ -0,0 +1,4 @@
+DIST et_xmlfile-1.0.1.tar.gz 8427 SHA256 614d9722d572f6246302c4491846d2c393c199cfa4edc9af593437691683335b SHA512 551fd87efd961b9c3202154dea9468aa97814ab8f6e5efc00962a651b17400866f2ad4fc85484a04c183c85a06375fd1c576c425e2e01bee4395ccfb680ce39b WHIRLPOOL 717822dc554150f8231e86df81eba8683d5d46dd477a464fe4555f9f83fe0d29f404a4ed9d7c1f179ae2b0c80a24ee1b0e82fd9199b564baa9a2c03b90bfb07d
+EBUILD et_xmlfile-1.0.1.ebuild 680 SHA256 c1202f1caa378fe20695bb6b4437dfcba22d5aa4113d8efe7a961737f994ed41 SHA512 41cb73b3262528218a67e3c980ff42e8ac07016edf3e361d5ab98f7a0b11fc460910c0203b00a49b429bdd95bf70c83aec90ba04b7c2c17546e428d9d410e760 WHIRLPOOL 94923fbfa1bea8ec8dad37aa3d71fe0a6385d8bbae5b61327deec4a0e9b50e2fa0778eac5cf784f2336701de787729092939e6c33f510dd627660ecf20cf96cf
+MISC ChangeLog 2309 SHA256 894ac5170fd6f30fe3da28b1c7455b691a029a1246c3f5be4e5285da3fd741af SHA512 2511d8631bd281f03161ddf327ecdaa4b79aae7d69d4ba6e58d85d94a966bc7015671e099f3d8e791840dfbcb5a43a6bb590bb2334ab32cd4caa01447163908d WHIRLPOOL 9fa1a8af85cc98b77eb583cffce0057ab8eba86225eecdaf60863b4620503db4db93db7c9a3ddca29c4158b0440bc429a5b33a9553b678cf201199b66ca3c0ef
+MISC metadata.xml 387 SHA256 d829d4d36ef92535037a58e6610eccadbeb6bf0e09b68715b36aa0fb65b6a681 SHA512 777c9ddb70e315fa3d5a943a4037b2876361f9ae53db8d86fd84453d2ad21f10882e79b3f9148263bc2288e77382a04614a006797a35f8da810104063826d244 WHIRLPOOL 3a870a7a0b62b7c1da9f610508ced50f1dfca687f48952519a45bf6d09d966f310f9859d5afd6cb7da5fe5b473d7eee67b56ea41fbb007e7e44ef213493a610c
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
new file mode 100644
index 000000000000..b2589278828f
--- /dev/null
+++ b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of lxml.xmlfile for the standard library"
+HOMEPAGE="https://pypi.python.org/pypi/et_xmlfile https://bitbucket.org/openpyxl/et_xmlfile"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	py.test -vv || die
+}
diff --git a/dev-python/et_xmlfile/metadata.xml b/dev-python/et_xmlfile/metadata.xml
new file mode 100644
index 000000000000..cf7f0f75e00f
--- /dev/null
+++ b/dev-python/et_xmlfile/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="bitbucket">openpyxl/et_xmlfile</remote-id>
+    <remote-id type="pypi">et_xmlfile</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ets/Manifest b/dev-python/ets/Manifest
new file mode 100644
index 000000000000..3ef1a63babc4
--- /dev/null
+++ b/dev-python/ets/Manifest
@@ -0,0 +1,5 @@
+DIST ets-4.4.1.tar.gz 5074 SHA256 af3614663dda07a03380960d30f36752f07e4c00debfd991cfe11b4726fd2c85 SHA512 50e8b0a4777e2ba433366ea6a34ef7c31ed9f41b2d662360839aa2ebaf40b0a9c613b3c472518be0931c5f523a7b383a382e9bd401e7b713f29337d4fd3a2c35 WHIRLPOOL 6ff5a49976767c068f65a04d9b7953d21e7eb58fbb0959b67f2237d839ed3bbaed729f1cb741d07262297d4b1d8e1be01b9fcd89daaea3c9e5b835863c848c8d
+EBUILD ets-4.4.1-r1.ebuild 1271 SHA256 6e9b4d429f15e585afb373322b65356d81e9559d2f88bb848a5211141a7935a1 SHA512 81ff362c4c1a835a49769f72c2a9b916fc56cc5e2595937dcfd67de44db7cbca6592ef64a8d40c4ca341b9acf4a6c8e4812e99af973580d3b6bde4f8e6d9a732 WHIRLPOOL e4b7c8d708d4d7b4eca83b8676ed4c0b6ebd49278c676091630ec2d68d9a509bc2613593faa51178be473a501a9750e2de1455fa23b6bf0dc94410e699420a6a
+MISC ChangeLog 2417 SHA256 01ec7c4f5e7321528f6d298e0afca688c3e1a36ed647a5182fca6ea43cc3eba4 SHA512 c19ad0fb2f80f1759d52486924ec2b27cd5bf5bb1f2a9310c8918ea461d9fa3ff83801294599523c9a3b21f7267565f733ed0fd5e80a2e76a43eb2712a2c80e1 WHIRLPOOL 80ccdea1c5bf1381709f86191a76cd1aa33f8410dba82a8b1e13d3c553a9e508e6283b630282aa79f5c5625bbc465e47105e79ac5d94268e13371a090a697fdb
+MISC ChangeLog-2015 3301 SHA256 090fcd5d77aea4a06bb195ea1e71691134d62a2e546b4f91f7c6340800cf5e5a SHA512 6bda8e1ddf50eac761fb8a1ceefe947217dd27942c4caaa6635cc8cad12ef4f77342a10e9e214d912a0fd0acad1a9a22eafdfa4adea3be21dbe609b9d3e342ec WHIRLPOOL 381de6f157594e169fb207f397fd91c14b35aa2763c9325713a105706d591edec6e99d82f1fd1f085663b98649f343f3fbc6432fb1dd5762da523fc728f387e2
+MISC metadata.xml 839 SHA256 aa7e31cba2e0a5caf733de4a34d2f4ddb1fdf0b89c9ada03c5059904134922f1 SHA512 50c9f1d94f26ecdf4bc01fc9edb11c2e83b5b63db1a8b50e1974651837245918249c1ab069d34ad0e16f19508415831491e2ef584fac5f7dd369d2b5481ab2bf WHIRLPOOL b1ebdc1aea245df42c0f7d60ab9cd42b5528275f14575576d49393fb73f00e5ed66e2770e374620b80eb1baa9b7c965401f2dcdb065c34fec8c5107bb8b7d018
diff --git a/dev-python/ets/ets-4.4.1-r1.ebuild b/dev-python/ets/ets-4.4.1-r1.ebuild
new file mode 100644
index 000000000000..edf2d340c781
--- /dev/null
+++ b/dev-python/ets/ets-4.4.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Meta package for the Enthought Tool Suite"
+HOMEPAGE="http://code.enthought.com/projects/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+# see the setup_data.py file for version numbers
+RDEPEND="
+	>=dev-python/apptools-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/blockcanvas-4.0.3[${PYTHON_USEDEP}]
+	>=dev-python/casuarius-1.1[${PYTHON_USEDEP}]
+	>=dev-python/chaco-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/codetools-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/enable-4.3.0[${PYTHON_USEDEP}]
+	>=dev-python/enaml-0.6.8[${PYTHON_USEDEP}]
+	>=dev-python/encore-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/envisage-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/etsdevtools-4.0.2[${PYTHON_USEDEP}]
+	>=dev-python/etsproxy-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/graphcanvas-4.0.2[${PYTHON_USEDEP}]
+	>=sci-visualization/mayavi-4.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyface-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/scimath-4.1.2[${PYTHON_USEDEP}]
+	>=dev-python/traits-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/traitsui-4.4.0[${PYTHON_USEDEP}]"
+
+DEPEND=""
diff --git a/dev-python/ets/metadata.xml b/dev-python/ets/metadata.xml
new file mode 100644
index 000000000000..ba888efe1412
--- /dev/null
+++ b/dev-python/ets/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+</maintainer>
+<longdescription lang="en">
+  The Enthought Tool Suite (ETS) is a collection of Python components
+  developed by Enthought and its partners to construct custom scientific
+  applications. It includes a wide variety of components including:
+    * An extensible application framework
+    * Application building blocks
+    * 2-D and 3-D graphics libraries
+    * Scientific and math libraries
+    * Developer tools
+  This metapackage contains the dependencies for installing all of the
+  components comprised by the suite.
+</longdescription>
+<upstream>
+  <remote-id type="pypi">ets</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/etsdevtools/Manifest b/dev-python/etsdevtools/Manifest
new file mode 100644
index 000000000000..e4fee1e530c5
--- /dev/null
+++ b/dev-python/etsdevtools/Manifest
@@ -0,0 +1,5 @@
+DIST etsdevtools-4.0.2.tar.gz 4222266 SHA256 6b0e8906deab4cbb449e2be559526f0a958c062678b70b04a6978a7c00fb6310 SHA512 41e88997d74397f8780c47c87080629661790aefaabeb9463503f7a7331aefbb7ba42a9754382f43adf6143c28db999af70b287a221b8cdbd44b2b7443b2b23d WHIRLPOOL 9dedd133088d6b40d1f923c984371aecc2fc0ebd4a930bec5f4948e3e5c304b2a41b6e6c2749a49dc77b24f74872aa93311321a8c4daa83da2f0098848ab7662
+EBUILD etsdevtools-4.0.2-r1.ebuild 1136 SHA256 430adc73c4b195857d91d03704687971ec2e337773d792f1ed27023ad630f873 SHA512 3fe95ebec78351f0e8980b52e96e6f7579f24500806c8beb943e52d8338670159b305a86740528d0880d466eaa24399a0406ac8a944783cda34b5f8b8e161256 WHIRLPOOL 3f71d8b29101dcd986c3fd9ed1a992435361bc94373c10a474d82f1f7368eae8313e46a93b8edf33a06401ddcf7b291c90ea229cc5c1acfcd68d8368eb42181b
+MISC ChangeLog 2769 SHA256 f166ae69f4ce5710029fb55d5bba05098717fbe6459a9838ae3fc4dd83239305 SHA512 b488d3cfc104e469b913c059d1d654807d6f7c900d2a9abfa22c1e4c376b2a9340f7d1b7d6a03498f18684ae3324718a2569d9932529c64bd0895fa3c7070036 WHIRLPOOL 41b1667e520c27ec017f3ce72eac5710638ec809dbfa269437b2c20dbf10fc87dffca6171984652cdd16ed4547a01df5de6aa157c22a4d3194f194c22de8378d
+MISC ChangeLog-2015 3925 SHA256 9bb8175d505fadf683f7199cd58c7cc2006427d36440eefdcb34463dc9f714e0 SHA512 44d33c0b12d3c1d7b7570dadfb0622007c93377efc96428b4cbf8141ec479db0b20c89d718f44d997ad1c1d663e94d8be822728c005ef7929b56cde4c2c7dae0 WHIRLPOOL 6671d0872390601b722de9222a8f3ab9e003379ac9dfe268bfb0aea31fd51dac1548fc212c42f6f1efa366f619a43a820f114f5467b186e2297ad0be2e609b54
+MISC metadata.xml 1714 SHA256 cbc984105d606e980073283f4660b598dad61e4c1377eeee5c114c784dede6cc SHA512 e51be7af099abfdcdff6cf10c05ee2054622058094c8548d49fb82a887821e4adc80b6f1836a780af6c5363da270ea6332842881056a39c2c01d402056ecf1d0 WHIRLPOOL f2e0d41f32ad1452d896b8b770ca7b85161e4bf9fe67cef9c3936f1c76c8dabbf80d0f3042fddf23c43367864de8f2e9ade13411f6e79a35a2952428acd94538
diff --git a/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild b/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild
new file mode 100644
index 000000000000..b342be12e09d
--- /dev/null
+++ b/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Enthought Tool Suite: Tools to support Python development"
+HOMEPAGE="http://code.enthought.com/projects/dev_tools.php https://pypi.python.org/pypi/etsdevtools"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/traits[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		>=dev-python/traitsui-4[${PYTHON_USEDEP}]
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		x11-apps/xhost
+	)"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	VIRTUALX_COMMAND="nosetests -v" virtualmake
+}
+
+python_install_all() {
+	find -name "*LICENSE*.txt" -delete
+	use doc && dohtml -r docs/build/html/*
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/etsdevtools/metadata.xml b/dev-python/etsdevtools/metadata.xml
new file mode 100644
index 000000000000..c950c177b248
--- /dev/null
+++ b/dev-python/etsdevtools/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    The ETSDevTools project from the Enthought Tool Suite includes a
+    set of packages that can be used during the development of a
+    software project, for understanding, debugging, testing, and
+    inspecting code: 
+    * Enthought Developer Tool Suite (enthought.developer): A
+      collection of utilities, designed to ease the development and
+      debugging of Traits-based programs. They can be used as plug-ins
+      to your Envisage application while you are developing it, and then
+      removed when you are ready to release it.
+    * Endo: A Traits-aware tool for processing API documentation of
+      Python code. It extracts not only docstrings, but also plain
+      comments that immediately precede variable assignments (both
+      module-scope variables and class attributes).
+    * enthought.guitest: A collection of utilities for unit testing
+      user interfaces (translation of the Perl X11::GUITest and
+      Win32::GuiTest modules).
+    * enthought.testing: Scripts related to running unit tests, based
+      on testoob, and also allowing running test suites in separate
+      processes and aggregating the results.
+    * enthought.debug: A collection of debugging tools, not to be
+      included in production code. NOTE: These tools are functional, but
+      are not being developed or supported. They have been mainly
+      superceded by the tools in the Enthought Developer Tool Suite.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-python/etsproxy/Manifest b/dev-python/etsproxy/Manifest
new file mode 100644
index 000000000000..464d28f0247a
--- /dev/null
+++ b/dev-python/etsproxy/Manifest
@@ -0,0 +1,5 @@
+DIST etsproxy-0.1.2.tar.gz 119646 SHA256 be852bc033396a89ea8d567174d07009f6e25e74ccb8d096a365475a37e93eae SHA512 f97a55127f6c1200a5a0bf581f24fc2718b8619c9cd137158c9c28511f2ad9c7a0a03998931bab25c193ed540d96d2325f390052591c8239ea7ea06cf5fd98ae WHIRLPOOL 08256398503fa674221087faefd882f7ed27d8e93eea48773c802106fe979034d6dae90660db8b689a44afa2359fe420ff2b851afd54e69c2a694ee9b80a6881
+EBUILD etsproxy-0.1.2-r1.ebuild 979 SHA256 babf57ac9bc1129f1e16f5cdded8c5cb31eab85afbee66ace3ccd00bac2ee53d SHA512 064481b682b8cf3288735fe4261a4a8e975fba065792230ea64ba65ea964802fd39aeaa17cdd2906633ab1ebbd3cab7e142c0e7acb34ec5dfefe605c8e6b3df4 WHIRLPOOL 6ffa8e94ccdce620db9b6ee174968457f7808f569d28086e23c7d460edb242485c114542bbb7696215df9995a10f49ab68ea3806e5a78aeaa1dc6fc9755deda8
+MISC ChangeLog 2585 SHA256 0dd41a48b8ab57e15ad15dd2c31db84ec3e2e40036926bcd630fe1250755e73f SHA512 187f3f8ad7d882d9fd099c266c3950f87457bd048afe8d009414bb60b3b07270515944865f7e309e5bb6e598b92ff3184d570527a11f9864686b5b1b64fe88e5 WHIRLPOOL d4763732ee51f9041b040d0a6e6a732f0f018f5f5da91a293ba010ded0e9090a150c72bb9619657c4ab6996aa09221e40df6114c64a5fc17dd8db57fc26616d7
+MISC ChangeLog-2015 1773 SHA256 0e2e367bde6c2076e4c5b0047674fcd2f0c69d6600fbcc274de32d9c255a9c64 SHA512 8ffd8aad6c757dd9ab9fa642346b4c3951318bf06ced6821218a718400f2b044feda51640e4eb7dcd1c137c2094e4f7c798464c14daddc677720238a6e654bc8 WHIRLPOOL f0a06e73494d9a69214752faf37fbac83a52cdcafc2b97f5a7795f8b954f6d999073a10490123df872325f7854194d6388c9cb9320ec96107df42463ac9696a2
+MISC metadata.xml 526 SHA256 dc9dc3d4917d7eaf3c16beee27d1a2acd104f80f54f6c5a5f78331c90847b0f4 SHA512 5d39134fccea3b821c0c32b89d5a93564760ba36887732ed39765646f939e20c414367fec2241bc0778ce3f3cc0028364824cce38abff219b6c166ab4f2b592b WHIRLPOOL c8b69ad47037f810b1f4a8210658e806a911eb694084d2c124226c2980dd397d70cfdc1985ab2ab13e039aaf3635c76e7949e259096cdd3a92c030cfe71b047e
diff --git a/dev-python/etsproxy/etsproxy-0.1.2-r1.ebuild b/dev-python/etsproxy/etsproxy-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..19b2cdf745c6
--- /dev/null
+++ b/dev-python/etsproxy/etsproxy-0.1.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Enthought Tool Suite: Proxy modules for backwards compatibility"
+HOMEPAGE="https://pypi.python.org/pypi/etsproxy"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="!<dev-python/apptools-4
+	!<dev-python/blockcanvas-4
+	!<dev-python/chaco-4
+	!<dev-python/codetools-4
+	!<dev-python/enable-4
+	!<dev-python/enthoughtbase-4
+	!<dev-python/envisagecore-4
+	!<dev-python/envisageplugins-4
+	!<dev-python/etsdevtools-4
+	!<dev-python/etsprojecttools-4
+	!<dev-python/graphcanvas-4
+	!<sci-visualization/mayavi-4
+	!<dev-python/scimath-4
+	!<dev-python/traits-4
+	!<dev-python/traitsbackendwx-4
+	!<dev-python/traitsbackendqt-4
+	!<dev-python/traitsgui-4"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/etsproxy/metadata.xml b/dev-python/etsproxy/metadata.xml
new file mode 100644
index 000000000000..47541ebdaab9
--- /dev/null
+++ b/dev-python/etsproxy/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<longdescription lang="en">
+  This is the ETS proxy package, it contains the proxy modules for all
+  ETS projects which map the old enthought namespace imports to the
+  namespace-refactored ETS packages. It should be only needed to
+  switch from ETS-3 to ETS-4 packages.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-python/eunuchs/Manifest b/dev-python/eunuchs/Manifest
new file mode 100644
index 000000000000..aa3bc01cbec4
--- /dev/null
+++ b/dev-python/eunuchs/Manifest
@@ -0,0 +1,6 @@
+AUX eunuchs-20050320.1-python-2.5.patch 262 SHA256 85fdab2e42a9b3b827c31f724ec2273b3c5f71aea48174e5d18d30eb88bb4e64 SHA512 43d026c6a00d8ff660b07ee8bd4e7cb635cc5778d6c87054f90ba95e48c61abac874756fba111caa399da9d812ff1784b822a6214b10c94559674c2917df8ff2 WHIRLPOOL 6265b172a13293763eda66ad876b3731afdeeb558408a383a38a209b33f68cf0891b185c7c29623028a4fd3550abdfad7912df9e522d2f5c638cf9275f15b804
+DIST eunuchs_20050320.1.tar.gz 8448 SHA256 2ca782d49b4065b37226f2a3f839e73d5d4c78d661ec9d2cf6219887135f9408 SHA512 b3272de7ac2a41c2c632aa17424dcc74ef3b6d536be5684bd54e4f22ce2d7c6546ac7b1b7cef2611f00b467780b11a30eca9c8804c0f8839a13adff6894ce88d WHIRLPOOL 7b39613719bbb0c228a7702fdfe56a96d8e90057dabb9c4a1abe56f8c590524275dc321d92f10eb78990480b12f87115d2f93c016b35c4320ea4bed2727321da
+EBUILD eunuchs-20050320.1-r1.ebuild 643 SHA256 af07fd3864d17ec9358117505f2e1b28a66071ef68156fc272c49236da5a6486 SHA512 ce9568f69fd9fd8644c9a2dd6e31d6e589f50ad5407b23d6114b820da3d76c3e056187f8dfe34d7c4efa342806b3a1b697c5f9a932e08a2011f2ac7abd2dac82 WHIRLPOOL 78d13a1d6bd9fc678f05bc91b25494dbf6288332937e242579684f232487cee8080ebb3d9321db37aaf08864f9e0120f9d0efdf4b4295561050a6bd093cce4f3
+MISC ChangeLog 2642 SHA256 2ad8a75273a9de2bbc5bfab7048a720f630f679731d11e96e695f6ee584d667e SHA512 4b4baa04ade83ff4d218f3da066f31ff75c00c850273cc0b2962982167600c580e108ac22c242dc1cbd3632af7b2e33418f1d4b0692999e52927de8f25527d9f WHIRLPOOL f77e87966a60e3067c9a477c566f8b0cdab5586ee2669c49dbe715f0eb1d8820f371154a2dd1fe3fd9fc45f2d2a2040753384fa0e364e87544cdc056265bc281
+MISC ChangeLog-2015 2198 SHA256 b4e93fcce9f02c808810f7df6d98d372043fe7d3471172a1e8de48b3c4a40f0a SHA512 8d8103024902416d4de4f689f821e68a47fde208ecffc28d6342a9f611d0d39af88d8ce8f6d6fbbfdd912d4ae86bce0ba2c74d326f55749c8486429f73066e35 WHIRLPOOL 84c0158a9f72c244cb3ac0da231260bfbf91ae8d7246886b6df2486835687cfbf1c014fc2a99d833d606b40c7e7382325fceee2b199a1d3c015a8a2816c74b2c
+MISC metadata.xml 658 SHA256 6d42a9fbe7014f5d9ce764d936c761036b880aa33ed6e1fa172296d1f6d898d8 SHA512 92618daf26770efe92b1809e150401c0e5d8e987bcb1d1b497f7a9e1eddc39ee08ef0c393d17009c76dd4460ec778f50c6f540bbd89ad681c34d59423f8120c4 WHIRLPOOL 54932bb958e6ede88a57e9da9860e4f451c1a5d413a0fa846441ef0ddbeb0f5fbab9e81e635686edc2212d5ce53e3ead1bcf30c0a619cbd7ee8403dfe4b439ee
diff --git a/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild b/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
new file mode 100644
index 000000000000..a599913c9135
--- /dev/null
+++ b/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Missing manly parts of UNIX API for Python"
+HOMEPAGE="http://www.inoi.fi/open/trac/eunuchs https://pypi.python.org/pypi/python-eunuchs"
+SRC_URI="mirror://debian/pool/main/e/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ia64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}/${P}-python-2.5.patch" )
+DOCS=( examples/ )
+
+python_test() {
+	${PYTHON} examples/test-socketpair.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/eunuchs/files/eunuchs-20050320.1-python-2.5.patch b/dev-python/eunuchs/files/eunuchs-20050320.1-python-2.5.patch
new file mode 100644
index 000000000000..dfad7a8dce79
--- /dev/null
+++ b/dev-python/eunuchs/files/eunuchs-20050320.1-python-2.5.patch
@@ -0,0 +1,11 @@
+--- lib/eunuchs/sendmsg.c
++++ lib/eunuchs/sendmsg.c
+@@ -101,7 +101,7 @@
+ 	real_controllen += CMSG_SPACE(sizeof *info);
+       } else {
+ 	char *data;
+-	int len;
++	Py_ssize_t len;
+ 
+ 	if (PyString_AsStringAndSize(rest, &data, &len))
+ 	  return NULL; // TODO leaks
diff --git a/dev-python/eunuchs/metadata.xml b/dev-python/eunuchs/metadata.xml
new file mode 100644
index 000000000000..6f09877002a5
--- /dev/null
+++ b/dev-python/eunuchs/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Eunuchs is a library of Python extensions that complement the
+		standard libraries in parts where full support for the UNIX API (or
+		the Linux API) is missing.
+
+		Most of the functions wrapped by Eunuchs are low-level, dirty, but
+		absolutely necessary functions for real systems programming. The aim
+		is to have the functions added to mainstream Python libraries.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
new file mode 100644
index 000000000000..11f136ffc62e
--- /dev/null
+++ b/dev-python/eventlet/Manifest
@@ -0,0 +1,11 @@
+DIST eventlet-0.18.4.tar.gz 288920 SHA256 74ef11d67ee5e85e009b0fced733c907620bca1ab8e6b0489d9f247405ab2685 SHA512 3098f2e8649b1e10157b9474571b372176b05263a7d5e7bb915b0464551d70505bbdf77dc072f64c1c05b3011406ae4814ea1b6f746cea766bb58827b1515fcc WHIRLPOOL 818fea5dec6532312068b9853a501d38bf4e69cca4e6e7ad6f6cbede9f9fe63237e3889ddb8b74d3d0e080b826d24532ed488687b60fc160a7e65d129ce2497f
+DIST eventlet-0.20.0.tar.gz 466828 SHA256 2e17cda85f2003796f13de0e6c59a5253c0afd1f45dfc97bb9b6bfb8962f7895 SHA512 4be70ba8cc3ac76d424aad66cd214e97249a42785319b992d048a77cd26f53a428f7959596d07da9a88c92ee103d73d4990733fc00bca57cc8fd242041365348 WHIRLPOOL 35b84c2ea667982561b9a791f9f8429f0902c3e99b0ad99b98aaa17bc145b534554fb2b005cfdcce3fb8762fc4a8e247eb109d442ba25750d39705fdc17b73d5
+DIST eventlet-0.20.1.tar.gz 469509 SHA256 3ad581b8645a54acf436e62a4d8cbf229a1ec7bfa3287c160f0258826b297838 SHA512 875c1ca82822a486bf28866c7d1f34df2419e7d33450a21740434d2e7f15c37a1090436cb7fe1feaeb5c810d39e4b238206c502323317897c8a42e844cbe7734 WHIRLPOOL 729505cd16fdecdc323f2bb12f4b03a9f9dc63267db4a1f005ba266a8bd8f37707969a80e23ecd18b2cc6e247e71bff0c31d7a5096576c57e6c3c32dc050cf73
+DIST eventlet-0.21.0.tar.gz 484191 SHA256 08faffab88c1b08bd53ea28bf084a572c89f7e7648bd9d71e6116ac17a51a15d SHA512 4ee682ca8faf870ff6f1d72e93527028f73ae13d7f755eceafb23f3cde48e52b83ff04b645b7e90299997713de93c52f244db8b81d6abc7788a56ea38c7b0f47 WHIRLPOOL 7dd13fe69aa5690001900ac34382cee8c2b0c112fa556a4b552543806d6e88992ef1a5dd6fb7307fa63bcf25e311727b6c979a6acb0e009fc488edd64e4d5e87
+EBUILD eventlet-0.18.4.ebuild 2040 SHA256 a760ba0e2cfd487bfaaa0a780bf5d26a540a95dc6b7ef792c3b6a1e79fa09581 SHA512 cf2cb7035c0cd19839d3a754adeeaf49b09f79ef063cc97df902cccf926c546011543cfce7fcde6e7e1a0a10935aa85e9add6576baac9d6ceb5a244ed5dc079a WHIRLPOOL c3bba53664bc2d16a4142ad95cc295e859d175e31d55d0d9f9dde31981e9f03a7fe79ad4fc154a49f6679f7292dd5024a954a027110fc8c6532ddd031deb98cf
+EBUILD eventlet-0.20.0-r1.ebuild 2144 SHA256 ddcd8ae703b83dacd2a294ce1971dd9312931079ba2d52b87e1e145e59739c30 SHA512 696ecc53399848101a48319830045daffa86d8a7adfb5ab1f6d10d353d87f702bf4671bf0e579af722748ada68d0be2b0d7c7c2e282c5192ae6810b6c3f68e31 WHIRLPOOL b363608cba13b8b14f8cc7ee3f76ffa918ba233ace3290d08ec5ec27cb20857e67ed58ece20ddbccdda3d0f2ad446b53c582436eb42686747d6ec5c65a21572e
+EBUILD eventlet-0.20.1-r1.ebuild 2160 SHA256 c1cc0ead37033a425c3a88d1a0549a1e32ba9170a6987e0b51a04f1cb3296c4d SHA512 de3ea57285a9ddb5374cff54fb9c6f0c82bb47fe7280d7d63d24181212997d46391f0b49ef9e18fc7a33493509678571eac989d1067760c52f1c8c1bcad2ca88 WHIRLPOOL a321046d6febbf6d383f184d88f5cf129774834f29ab0de219633296cc4223a11c373f97e3b64e901933f645076d830d4330b757e403290d956fab23447663b9
+EBUILD eventlet-0.21.0-r1.ebuild 2162 SHA256 67aebf17b43022526736ac3af3fcdeee5fa32fbb3af3a6f301a527c8412d4d34 SHA512 c297755f8541b1eca3937c8688013de5328319426ba732916a3ee1532579800e0d74735532f3788bc1ea6e66d9dcfec6a8663898e1e93fb35cdcbed37f547d99 WHIRLPOOL db264bbdd6258b82c55ddfe097f2c2804d0838e5f586ed8f0322134425fdd2ec5ba4fa3d135f1bdcc8d8ac5aeb25e528bc6fd41c59c8359a2ee353702b898b2d
+MISC ChangeLog 4712 SHA256 99ac79f74a2065a2630aa0d02a9665e61223b3c79fea55bd5c3a4d4d73fcf2a0 SHA512 6d557a32e79b51494ded197a8138def994fed468e446008ebae5d3cdbe04688487f938b67455315eabd7a284efa5f0142fcc8131b2f85bdea285059680385ada WHIRLPOOL b4799d7c7e5ccd82fe62f819350ee921aad7f8e8379f46edd27acdafec12a7f3724a3bbab675910dc95350d24f64551c725701f49483dfd3d4111e982b21d3c5
+MISC ChangeLog-2015 2887 SHA256 1c705b5b7b44891cc239d7a50b992ea449de67bb778bff9d4b65ecdf514f0c51 SHA512 71a2a6a1c7d0f1873cb6a8ec36f4d83613ee398acc97791e9fe33137302e4f8ef4e15647d3155aa9b15157fc96821962e8730eee66a4e310f96d913516b7d68c WHIRLPOOL c23e04fa9980dd8085cc97f4a60b88242eba41144b7d9ca514ac180738b9f5308faf502904b2cfdea52bcaa88e515447da5de37b974e5a03e285ccbf1e1297cd
+MISC metadata.xml 380 SHA256 78f6be83993801f376748e135657eac13b680d21fdd56f04d099fa2bb17b9a19 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa WHIRLPOOL 45bfcf31c22a47927dd15f6c564613a7aa2be416ed1793030707feeb0ab5c0ef1e3314e46d1d100f400d262a23a36c5a16298f2df2157ef91705aa6df1d110d4
diff --git a/dev-python/eventlet/eventlet-0.18.4.ebuild b/dev-python/eventlet/eventlet-0.18.4.ebuild
new file mode 100644
index 000000000000..4b00621ad223
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.18.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Highly concurrent networking library"
+HOMEPAGE="https://pypi.python.org/pypi/eventlet https://github.com/eventlet/eventlet/"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/greenlet-0.3[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7 )
+	test? ( ${RDEPEND}
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
+	fi
+
+	if use test; then
+#		sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die
+#		sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die
+#		sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die
+		sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die
+	fi
+
+	# Prevent file collisions from teestsuite
+	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# https://github.com/eventlet/eventlet/issues/152
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# Several errors 1 failure
+	# https://github.com/eventlet/eventlet/issues/151
+	nosetests tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/eventlet/eventlet-0.20.0-r1.ebuild b/dev-python/eventlet/eventlet-0.20.0-r1.ebuild
new file mode 100644
index 000000000000..b0366da9f319
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.20.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Highly concurrent networking library"
+HOMEPAGE="https://pypi.python.org/pypi/eventlet https://github.com/eventlet/eventlet/"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="virtual/python-enum34
+	>=dev-python/greenlet-0.3[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7 )
+	test? ( ${RDEPEND}
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# provided by virtual/python-enum34
+	sed -i '/enum-compat/d' setup.py || die
+
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
+	fi
+
+	if use test; then
+#		sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die
+#		sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die
+#		sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die
+		sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die
+	fi
+
+	# Prevent file collisions from teestsuite
+	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# https://github.com/eventlet/eventlet/issues/152
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# Several errors 1 failure
+	# https://github.com/eventlet/eventlet/issues/151
+	nosetests tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/eventlet/eventlet-0.20.1-r1.ebuild b/dev-python/eventlet/eventlet-0.20.1-r1.ebuild
new file mode 100644
index 000000000000..b218597e0479
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.20.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Highly concurrent networking library"
+HOMEPAGE="https://pypi.python.org/pypi/eventlet https://github.com/eventlet/eventlet/"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/greenlet-0.3[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7 )
+	test? ( ${RDEPEND}
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# provided by virtual/python-enum34
+	sed -i '/enum-compat/d' setup.py || die
+
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
+	fi
+
+	if use test; then
+#		sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die
+#		sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die
+#		sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die
+		sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die
+	fi
+
+	# Prevent file collisions from teestsuite
+	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# https://github.com/eventlet/eventlet/issues/152
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# Several errors 1 failure
+	# https://github.com/eventlet/eventlet/issues/151
+	nosetests tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/eventlet/eventlet-0.21.0-r1.ebuild b/dev-python/eventlet/eventlet-0.21.0-r1.ebuild
new file mode 100644
index 000000000000..a0881d9eaa47
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.21.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Highly concurrent networking library"
+HOMEPAGE="https://pypi.python.org/pypi/eventlet https://github.com/eventlet/eventlet/"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/greenlet-0.3[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7 )
+	test? ( ${RDEPEND}
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# provided by virtual/python-enum34
+	sed -i '/enum-compat/d' setup.py || die
+
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
+	fi
+
+	if use test; then
+#		sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die
+#		sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die
+#		sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die
+		sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die
+	fi
+
+	# Prevent file collisions from teestsuite
+	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# https://github.com/eventlet/eventlet/issues/152
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# Several errors 1 failure
+	# https://github.com/eventlet/eventlet/issues/151
+	nosetests tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/eventlet/metadata.xml b/dev-python/eventlet/metadata.xml
new file mode 100644
index 000000000000..6cec5e8a7b6c
--- /dev/null
+++ b/dev-python/eventlet/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">eventlet</remote-id>
+    <remote-id type="github">eventlet/eventlet</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
new file mode 100644
index 000000000000..697147a56a66
--- /dev/null
+++ b/dev-python/execnet/Manifest
@@ -0,0 +1,5 @@
+DIST execnet-1.4.1.tar.gz 171041 SHA256 f66dd4a7519725a1b7e14ad9ae7d3df8e09b2da88062386e08e941cafc0ef3e6 SHA512 e8c0c32e873f8585ff4d4da3b9cbd40046479370f5653f67a98c9029d4535a619731d1b825332fe4af4dc5ebc9ab11ee879ef45df07f08943b1e1685f2255790 WHIRLPOOL 487c31617b78e4eeed9dc75ae8f01ade33aad35f7547677ec007b688071dd56e69c4f4b92cf9355dee7cea97bf6eac09f508099f104cf52d6c9fe3860e4fd3c9
+EBUILD execnet-1.4.1.ebuild 1267 SHA256 b7a57b057a44edf1c17b15107f3583f570bedd8c9bd80c3dad0ef0cfc1c52624 SHA512 f2319195883a57fe2d69328ac5258345c2234c3b5974cb269f9aa320953a97b17e60777a2e1a12de41363f9b353e059083188525faa3d0a7514cbd84dbbcb3de WHIRLPOOL 3ad3c00674b60118244f972989608ecd2dd490cac35880c70e5517b3edd2e65c2c8d3f38a1336dea30f3255bda1c24121938711104a36467dff36a25c2a80222
+MISC ChangeLog 3673 SHA256 d763bec6268da229319e3f0e51c213901d7fef248586214076d5a20580d88e89 SHA512 c7af23a568a3740602c3968c3fb67cca0a1ebe87727f0294a19ee8ebcc16cce36ca0ab37662ce1b7364fee3da8f376a365714c3961d5f319da6d05b95f1cc13f WHIRLPOOL de08c6d220e92b2d0f0c9bde47f87f972d2d051d7e3205660040b340ae0625a178903615b8d33e51c5338671fd3b90ea1b37fc405deede1c5b06bf46f77b5e49
+MISC ChangeLog-2015 3979 SHA256 ab583d6fbd59ee50fde491589b5e6a7c2c4bb62ff4479fbbc4fc9d71ebf2fb4d SHA512 84b40ef3c6a615dc001340a98a51e97ecebe94f0b3fdf6f89389115b3c3a2767b5f2f6991e4921685ab92e979572254e55ec93effc5a2d6d4de8a921873aaff4 WHIRLPOOL a9d65042dd8a1c54f764929cda16c738735c5069df42b3f5e13754d897a3e5e6e76dc0e005603579971cb6b626439a8f4a1e0e203f840ff203b9bcdfd42c0148
+MISC metadata.xml 537 SHA256 0ce0032e5a4c681acdcda81864bcaa1975957fc566819ea813696fceb93a675e SHA512 a5a760db3d0753d69c0bec281ac5b6d7920c2a94b01413fa5ec63541ca09b4e7cdd9a63ad7ae417e8a886c2ddedc505f5784fe928e2c673158a38afc2cd0e1b2 WHIRLPOOL 900cbe090e1023213267c394ff1a5c5d89539b62265af762802cecebb3437a7ace9199865f429159bc3050f3232371b1cc131f9fa9f7789eca81c0804431946b
diff --git a/dev-python/execnet/execnet-1.4.1.ebuild b/dev-python/execnet/execnet-1.4.1.ebuild
new file mode 100644
index 000000000000..fcc4e14e1cf0
--- /dev/null
+++ b/dev-python/execnet/execnet-1.4.1.ebuild
@@ -0,0 +1,51 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Rapid multi-Python deployment"
+HOMEPAGE="http://codespeak.net/execnet/ https://pypi.python.org/pypi/execnet/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (	dev-python/pytest[${PYTHON_USEDEP}]	)"
+
+#PATCHES=( "${FILESDIR}"/1.2.0-tests.patch )
+RESTRICT="test"
+
+python_prepare_all() {
+	# Remove doctest that access an i'net site
+	rm doc/example/test_info.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# https://bitbucket.org/hpk42/execnet/issue/10
+	unset PYTHONDONTWRITEBYTECODE
+	py.test testing || die "Tests fail with ${EPYTHON}"
+
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/execnet/metadata.xml b/dev-python/execnet/metadata.xml
new file mode 100644
index 000000000000..ab39f126c6cb
--- /dev/null
+++ b/dev-python/execnet/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grozin@gentoo.org</email>
+		<name>Andrey Grozin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>Interact with Python interpreters
+	  across version, platform and network barriers.</longdescription>
+	<upstream>
+		<remote-id type="pypi">execnet</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/expects/Manifest b/dev-python/expects/Manifest
new file mode 100644
index 000000000000..6ca540febe47
--- /dev/null
+++ b/dev-python/expects/Manifest
@@ -0,0 +1,7 @@
+DIST expects-0.4.2.tar.gz 23813 SHA256 b1e0b27141f784fe81a143153f23d3c8220fe8ec1003eb580b3eeb38eb778007 SHA512 6701a1a3099073c70d8f729b7ca72e4b9b3eb6d6f9e7d6d2d654a3b684c5ab101c343b4c3556f45d763ab1479dbc3eb3db209c4d9f5d2254cc4111e74a4a3c1a WHIRLPOOL 44ef85ca96225c22f91468e8b8b6368a26138f0fb9ee22dc89c282fb91adf4425d177ba62891239515affc639053165c6080f972c9435619c50a47fd81a27894
+DIST expects-0.8.0.tar.gz 27801 SHA256 37538d7b0fa9c0d53e37d07b0e8c07d89754d3deec1f0f8ed1be27f4f10363dd SHA512 c2379bb6b3b6181a0365a84b0602f2552de40760b7cbadd775705bacfe113ffbe55bcde818c5766f7079867ae38c8c02e318f3c9ffdccdddb58e6cf0559f1e25 WHIRLPOOL 825cebbfc05a287d213b3f12d4c783c5d7c23d3e93ec53570751d6786a1b891cd94b4c79db0a71bab21d7574652871f6955cf07c35f797497a16f735dd770451
+EBUILD expects-0.4.2.ebuild 919 SHA256 70415d5197f0568293270818429fd0ac97641a100d05a204c4bf2282bc807f89 SHA512 debfd7498db299261d28163ecc1d87adaea48a9c895ed15d697af9e3efb53d5c230f1308320523a683ff549eb60e3606d1e199d8e75cc822d9ff8a5658b5d889 WHIRLPOOL 665cc193322e920621afa2729ce953a0724042ae5868b2dbfaa62768448d164ffd11258ca733fd5d3030b8385785030607b0a9c0a9ec491a7cb30758a24f6e16
+EBUILD expects-0.8.0.ebuild 819 SHA256 793b68ed3dbb5c2bcb8127f2c30b4007a3eacbbe2c4325b063ae84be035f0d5b SHA512 9a1ca0d4a39ee3e5107caefbe2a2a8cad6d5c3684ba66870c2f08464a9eb2798bad688730476c487276814b85f51153e79ed59b0f0c3fe5dca27b62fbf1aea9a WHIRLPOOL 2cc1530f8405a8ecaee13229c9d83364fea1c57830692ff45f42297f1c03e19e0a41bea4f7654693c8d871c72610e94e52942d2151865d796a0c08ce96a2e09c
+MISC ChangeLog 5048 SHA256 d7fe8998073a05cc8200070479bc3a25187d05ac70c48c218db5a5beeed3593e SHA512 7f29a94a81446460734f329685a0d95f86ef2f1ef3dce630735f3bfc65a5d3b14ea10cf470b06dd2bb0392b7ef74188b452dced10d1fb11ee561fd71044773c9 WHIRLPOOL ef9e0045a0cbb8ea25c582cc94d0575a26120113d36e3bdf5e331e05d8ad051ac4d062f76e96e295bec22f6c3bcee61645decac8d59dd01c1dc2009b7564c255
+MISC ChangeLog-2015 2121 SHA256 e4a80396b2fa646cb66012e7af518a8b170d1a3bcc11c59a8827088525cc60ff SHA512 faea37aed815535c6f2179aaef1832fae0ebce794f985d03459d7b9a0290bad1a28c7d0f09446ffe8ac496b6b49be0bed7223665fcc0dfe52179b4910ca9b291 WHIRLPOOL e3b463e327740057b300d875d66e1b9f2ed594fdcc83c72313f324e257fbce8bd1c776f4fbb3d6c38fc22ee6e9ddd9133a429cb17d883304d6b6c1d817ba31b9
+MISC metadata.xml 381 SHA256 82c43587bb57bd899d026e4ae882091b633caa768a8a25f8d3dd42f8b11d1a75 SHA512 b6271b3ab1ae1be7bfcfee188d54dc5e991eb709e7d5449ecad8ccfb3118dd46ba5dc349c15ccbe50e472d9835b00654db2d1c65ef127718bf5d77c5fa33a389 WHIRLPOOL 2e1e6bf72c680532aeeac5d9c32a2d7046cf74afacbb6f1011714941edb4f101a0947afb0c527ca6b1dca41f1fb207708e51d93b72e9cc7b6bdccdcb588671fe
diff --git a/dev-python/expects/expects-0.4.2.ebuild b/dev-python/expects/expects-0.4.2.ebuild
new file mode 100644
index 000000000000..684b630d7a6d
--- /dev/null
+++ b/dev-python/expects/expects-0.4.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Expressive and extensible TDD/BDD assertion library for Python"
+HOMEPAGE="https://github.com/jaimegildesagredo/expects"
+SRC_URI="https://github.com/jaimegildesagredo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		>=dev-python/mamba-0.8.2[${PYTHON_USEDEP}]
+		<dev-python/mamba-0.9[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND=""
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	mamba || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/expects/expects-0.8.0.ebuild b/dev-python/expects/expects-0.8.0.ebuild
new file mode 100644
index 000000000000..2c8fcdf98246
--- /dev/null
+++ b/dev-python/expects/expects-0.8.0.ebuild
@@ -0,0 +1,37 @@
+# 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
+
+DESCRIPTION="Expressive and extensible TDD/BDD assertion library for Python"
+HOMEPAGE="https://github.com/jaimegildesagredo/expects"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/mamba[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	mamba || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/expects/metadata.xml b/dev-python/expects/metadata.xml
new file mode 100644
index 000000000000..57f7c5efe5f7
--- /dev/null
+++ b/dev-python/expects/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">expects</remote-id>
+		<remote-id type="github">jaimegildesagredo/expects</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/extras/Manifest b/dev-python/extras/Manifest
new file mode 100644
index 000000000000..17c3494e203d
--- /dev/null
+++ b/dev-python/extras/Manifest
@@ -0,0 +1,7 @@
+DIST extras-0.0.3.tar.gz 6231 SHA256 7a60d84cb661b477c41a5ea35e931ae93860af8cd259ecc0a38a32ef1ae9ffc0 SHA512 7b08d094717a27fbb522d49c0c538e98baccef6540216479d176b55b94f3f0b97c4b70ed48f3802a1bf08a58fe9a319a113d4ca04d9dadcb85e3a99bf7490a3c WHIRLPOOL a80db53c4b536d1a98c03237cc56607ca477619d1789a4a4c4795c843212eb1bdc64f0fe2a0ae1d4a4bab351ec68e07acb9ae494e537630ba841826116121d2c
+DIST extras-1.0.0.tar.gz 6759 SHA256 132e36de10b9c91d5d4cc620160a476e0468a88f16c9431817a6729611a81b4e SHA512 510c796628f28db90bb96c7c9ba5fc9b2b950d2968e219efe67f3899bbe7ef68fe5de1494f8fd640f13a1ccd329e7dac9cd38aa965ab1e07c4cd287c04da50fb WHIRLPOOL e6b09b2be7225022587d26b5749e4b26282188c177c228e595843bf70c4eaa282698d9cea85afd23beef25ad97ee64dec0275957928be910e49c13e5e395f69d
+EBUILD extras-0.0.3.ebuild 739 SHA256 b365ef5fa4f34082e9aa65289ffdcaeec785f6c923341584c273d53d1120a08c SHA512 925d191e7e457d4f797b8d378613630780b59abb2e81d90750298c8295a81f3b0c2c968a501ef83976bd43138be07dcd4a69e53f288a73f11f60b2dc76c82077 WHIRLPOOL 8a71b60c0c34040654d7afb8c0da8f56f9480a8356a8721726d11e1c0a6b0d3296a97e0b8c28e52d93fc32fd82e0f302068469ec320914828dfbb1a96f53751a
+EBUILD extras-1.0.0.ebuild 763 SHA256 eb6c00c40b0e707847e3c720fe817cb3dcb4d78cff2fb22599899ec5d0a78538 SHA512 c55b5a9025fe33cec81ffe9d658f93153619a67760195ef054ee7f10caa598f4637a6ed1151446a1d2b92ff835f8c9a42447e552d43c11fc5b435836a3d2783c WHIRLPOOL 1e157443b8334546010c9bd3d488529dd3179829ace844bd83c3260ea79ad551a97dda1bcc53ab5c9cbd7d2b202010a81ee415d20fc1e677792b2e30a00a3b15
+MISC ChangeLog 3739 SHA256 0ecb8e0bdfb609311c75028e081ec136778b3f3a39a2da1e1e786270bfd31c95 SHA512 861b2551333dc0eaaf4bfa8860fa1ccf099f0d5afd9635b371e9851eab7bee63f8da68129ba90755f00e6e87363d8b7cf141abe901d70fc3109e8c68a6712e39 WHIRLPOOL d61431263fe5beac863893174c141ab614c303973b9a41a2ec1b168f4f53df37f54ccaa29005068826feddf897bd41ef20225e9d6a57e2422c9598faefd976f2
+MISC ChangeLog-2015 3296 SHA256 f003f71c128cc1aef6a5c2e77d122228cc1c04b29ea7659d3599286fb4279784 SHA512 f7160768d26c4f7741750ec458834f123b95afcf707e6347d56f33fd401578fa69ebb2509a7487023838015184b5cea3ac136aeaf58250e84da6ecec12a5df1f WHIRLPOOL 7c7f31e744812232175f56357911b0064db25f8d026ca8d48073e9a6d4d03bc38d99205836d84ced7ee6d7bfc05ac9fc1dc6f9ab3e55b78fe7d220b824520750
+MISC metadata.xml 381 SHA256 52bb787ffd25fe8f4197cbc63a2d6b28c1f40dedeec3ffe875c2bd64f58db135 SHA512 bd91400e2886a9f79e973f16fa5a84c6b3d38a3fab45db89bdc5f930e7bd8adff02fddbb9f8fcc72199dad32881a355b046c5cdc2c16e679a46c1bc9e08c3e02 WHIRLPOOL 484ad817fae0f3bfa4dde39ffdb09cfaaeef101dadc0415fcd9841c173f72532e7c58621ce7034fe3fb35af3ca72b986636f18b19340d3fdb0b93439528ee132
diff --git a/dev-python/extras/extras-0.0.3.ebuild b/dev-python/extras/extras-0.0.3.ebuild
new file mode 100644
index 000000000000..9ed1426ad291
--- /dev/null
+++ b/dev-python/extras/extras-0.0.3.ebuild
@@ -0,0 +1,26 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Useful extra bits for Python that should be in the standard library"
+HOMEPAGE="https://github.com/testing-cabal/extras/ https://pypi.python.org/pypi/extras/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/testtools[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+python_test() {
+	"${PYTHON}" ${PN}/tests/test_extras.py || die
+}
diff --git a/dev-python/extras/extras-1.0.0.ebuild b/dev-python/extras/extras-1.0.0.ebuild
new file mode 100644
index 000000000000..b620d21e8a29
--- /dev/null
+++ b/dev-python/extras/extras-1.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Useful extra bits for Python that should be in the standard library"
+HOMEPAGE="https://github.com/testing-cabal/extras/ https://pypi.python.org/pypi/extras/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/testtools[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+python_test() {
+	"${PYTHON}" ${PN}/tests/test_extras.py || die
+}
diff --git a/dev-python/extras/metadata.xml b/dev-python/extras/metadata.xml
new file mode 100644
index 000000000000..b55cf3ae5a8a
--- /dev/null
+++ b/dev-python/extras/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">extras</remote-id>
+    <remote-id type="github">testing-cabal/extras</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/extremes/Manifest b/dev-python/extremes/Manifest
new file mode 100644
index 000000000000..6aad5737133a
--- /dev/null
+++ b/dev-python/extremes/Manifest
@@ -0,0 +1,5 @@
+DIST extremes-1.1.1.zip 10360 SHA256 e92564d2535929a18c51b75c8904e13ab5e78a6d75fee8c70d04e09812fc8545 SHA512 a0b951306e9d5ef84c6498268a3476e7ed889f0be950a529774e2d8c4f155d4c10cbacd20864ed37aea5512ba65a267e414eb2b4f7cc6d67b21a020d82da8ec2 WHIRLPOOL 67a3a7aa5b4f32497f262097d34ac750f34a89471290f7eb7b9a3a3491f36bc08e6db0341f852ca3f575767dc21a9b8d4f97a9f0d7ce68559eb2cb6564d51a55
+EBUILD extremes-1.1.1.ebuild 670 SHA256 e521602d9997fde07746643efe3338586ac3b35e5af4eba30ffaa4bbb8324b1b SHA512 38caab57513512b8bb05a56d2840948253cd1e3f4f50e69d674fbc83a5d1a3ba50fc720c48bc8d397c4fdf71cc7b0766bd91d6f2375cf4fb5a9d94f82824b3a5 WHIRLPOOL 081e79098d40117779ed5f8ee3ab21e3cd106e08bcadc9820903a64dde17a6d3595064a1ecf2d634c5d8b3b478b655725212f0d77ef5180c65f4f8c8c00d9d81
+MISC ChangeLog 2576 SHA256 8e17bb998649294b28b6acb5039b478fad26d5cb321781ccc55e40c708ded2b5 SHA512 770112a87b1bdb716e2731c21b8f8ee9d47a07ded4a631af8819c3a3aa5fc0b8bc7c582e69712fd87276ee7712fe2fcdab8afa8c3a9424edcf1e1680b4e111fa WHIRLPOOL 4cf7e209a23fbd9cf17f20ea825d7e178933dd03a6e27333629d7303c8a8dcc965c5303421f8243c7fdf5709ce89bdd8f03abd855bed03f228b660f03fdd5bc4
+MISC ChangeLog-2015 1026 SHA256 328e5ed371adbf701d37ddcee866dc928677ea9f77267f4fb19387994c869d3b SHA512 cce3ee166eeaaa8b79000a39a191dee58aee192399210cb668ec3c59ccf9b9f33ad9f629461a1ff90a15f0934be9babda5d0b840db0e70a0bb40bb6bd0445a68 WHIRLPOOL 84753b193a8dc9f8dc0e76937dc3e5fdcfbbb24a4dff09e020627d67b31dd37ac5efe40a0b05ba4da7ad9d0036b49cbc386b6a1b45b0d87af49678132f7c28d3
+MISC metadata.xml 321 SHA256 5b3ff29a754bd48093a22f61f222e8dfacf4a769031c66504201ddfcf3d2a2c5 SHA512 b24c67841c1fcb26d1e5d13d113dc9d862a86c99603f4544fb486885b9637e5bca3dd945e82cbb35a00f327ceea5f91039b306b53c37e1dacec435d4cd510364 WHIRLPOOL 67dfdf664e9fd31ebb42431604bdf88a996bd8dda5c5fbdd56d3cda6e5b2d78620f1f1a725b0a31c5359e0157be493dfdbea471e7f0988b21ad88c81b48076a0
diff --git a/dev-python/extremes/extremes-1.1.1.ebuild b/dev-python/extremes/extremes-1.1.1.ebuild
new file mode 100644
index 000000000000..f2be72d7bfcc
--- /dev/null
+++ b/dev-python/extremes/extremes-1.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_PN="Extremes"
+DESCRIPTION="Production-quality 'Min' and 'Max' objects"
+HOMEPAGE="https://pypi.python.org/pypi/Extremes"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+LICENSE="ZPL"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+python_test() {
+	"${PYTHON}" peak/util/extremes.py && einfo "Tests passed under ${EPYTHON}" \
+		|| die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/extremes/metadata.xml b/dev-python/extremes/metadata.xml
new file mode 100644
index 000000000000..4a6ed43e944a
--- /dev/null
+++ b/dev-python/extremes/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Extremes</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
new file mode 100644
index 000000000000..ef99c1dbadbb
--- /dev/null
+++ b/dev-python/eyeD3/Manifest
@@ -0,0 +1,5 @@
+DIST eyeD3-0.7.5.tgz 221685 SHA256 6a60f6dff7c8b74fee11eb378447b3bbbd2433ca5f7a00846840b0b2ddec9222 SHA512 9f57e05e4db78618e73ec15ca6ac7b983e13c24ae926bfb9194ee4fc1d735f80308dfc5bdac6016f5491bdb06d46b645d7ac54247d581467a8a22129fae85ba5 WHIRLPOOL 08c8e3771d263548e8f3213653f6846ee0d55ebd56816cddf03d80dd6d6b7d7906ef85045d13f599137e74ce0d59a76a4862a2ff5ae5d3e1637df7794a6cccbf
+EBUILD eyeD3-0.7.5.ebuild 989 SHA256 8d8bdca2abe2a0ab832d999a3128de13879cbd77bb2795757c4d199775dd422d SHA512 4ee3e662e9b48f7e3720e8955bedd48a5c3df1949e13ade12bfe4cf02e354e222a86c8632ed2ff345d95087b1e93128a25b73b1638b7d262b963be9ce79562cd WHIRLPOOL a05852aa2a8e8f1c269d3724a9310bcb28b3d084af1f99a703f4ae1b2c9a6c90a39b1427ef6bdfb5af0e1a07e86d067d679a60d247bf10fa97e81f5c8f47dae2
+MISC ChangeLog 2423 SHA256 04ba3d4bb8e2a73b1147d67695a19f2c822fd59c8da1e21dc3f2dff0cee29f6a SHA512 38a8fe4334affd99a0c1fa9fbfbb0e636ebdb4ffb9eb1c3d7c36a52061a8a7cbd108edd007231d2e63f6f83899471ce62afdc9ae58a6ce1744f4088df947a60a WHIRLPOOL 699a48fe8b6094c58c1d42a49b9debee9afc79c4d8289aced4d0ed86079f1e89e64d0230cb490f104edfb1457290899a8364b6b4314c12650bbdae8ff5f38366
+MISC ChangeLog-2015 11521 SHA256 6fa92d8f505f87a4ca77cd2c4dbbc35d1541e58a39669e39faf133e007dda9a5 SHA512 1e7e05131926f0658eb9d93551382256263a2085f428c139a59a3004f76948f82760124b0933859648695a6fa31d80972701652a6104351b85ee6d7b3097365b WHIRLPOOL 6a1d46bbc11818983922d2a825e91516edaa34f4d734ce2bc35456ce50f3ba7401e46ebf214a9af5d97c076b3dde4c94fcb516b71e65af5bc033191de48e8ebd
+MISC metadata.xml 353 SHA256 bc8c169ee6d20b278e4fa97db9855aba0706b54053977d69e9dd925b0bbba6b6 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1 WHIRLPOOL 03d7dba44d17d9499312e3a29c1a0cea78c9b5276f788784d77e47d52b5caff6ac11acf985dc6d3f57fd13095bc7dcafec7e7503494c62ccea08d060ecebede6
diff --git a/dev-python/eyeD3/eyeD3-0.7.5.ebuild b/dev-python/eyeD3/eyeD3-0.7.5.ebuild
new file mode 100644
index 000000000000..b31a2f2a1902
--- /dev/null
+++ b/dev-python/eyeD3/eyeD3-0.7.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# still appears ill prepared for python3; see bugs 501338, 501340
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for manipulating ID3 (v1 + v2) tags in Python"
+HOMEPAGE="http://eyed3.nicfit.net/"
+SRC_URI="http://eyed3.nicfit.net/releases/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0.7"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/paver[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# prevent the build system from installing unwrapped bash script
+	# and prevent it from pulling optional python-magic
+	sed -i -e '/scripts/d' \
+		-e '/install_requires/d' pavement.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	sed -e "s:python:${EPYTHON}:" bin/eyeD3 > "${TMPDIR}"/eyeD3 || die
+	python_doexe "${TMPDIR}"/eyeD3
+}
diff --git a/dev-python/eyeD3/metadata.xml b/dev-python/eyeD3/metadata.xml
new file mode 100644
index 000000000000..d0913ee5d1cb
--- /dev/null
+++ b/dev-python/eyeD3/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="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/fabric/Manifest b/dev-python/fabric/Manifest
new file mode 100644
index 000000000000..091fc2a9af54
--- /dev/null
+++ b/dev-python/fabric/Manifest
@@ -0,0 +1,8 @@
+DIST Fabric-1.10.0.tar.gz 208969 SHA256 edb2702b4655600f0a49a97e654c79f5b21490ce30f77d1313dd851f0b60335a SHA512 991341dfb3f71e938c2a2e30f5bc158be84cb1600ab64c4f7c5c49decd0a38bc57615f9e07edfbed70d9ca796592d7c1a4f7f3e25a40c4d31049015df928b2e3 WHIRLPOOL c07ba33bd6e7832fd5527ec14e206d74a6a2b983dbb49a43d972f31e15e22f9642df4809adff72f43f92fca5c1d758a4ac540ed87e22f46adc25094b2aa4ccb3
+DIST Fabric-1.12.0.tar.gz 232840 SHA256 fafa17d69a15fd6ae5f82d28acbf90e1bf15e3d7438fbf0e8691868164c0e9dc SHA512 cc07e811873c296c7e33ddadb00af3b4cbd1a87b2617b82505758e6b646e20e55edafe76cd969f3b2a7931a2deb4daefe8e44a7d6fe6ec67e5d9923d6c64e95e WHIRLPOOL 454cf9b2f7eb2c74ca2e6eed349600d37d4306c49da098e46442001e2f720f2df46f4c2eed973916ece7cbffe1c54100dd3571a8696463e10aa3b0ddde0455e2
+DIST fabric-1.12.0-completion.bash 4266 SHA256 9346541b636f001d4efe1ee0bf0a7a083e85789c88ebd54910004b39ee3f68fa SHA512 2303e3b6a71ac8f6a61ce3bd464f3c950db8374b61a6375ccc6fbb2dc815a4a44509a034788862bd361ace7c0f401533cd5cee0fb6fca8d9ff7e0ffd143706a3 WHIRLPOOL 616cefd147905347c38ac7ea91ec465be12435ffe48c487083c9d0f1767bb12e5f82423c132b7cc82a89575869729ac1e530d82cf1831c97f0586be5262d8cab
+EBUILD fabric-1.10.0-r1.ebuild 1735 SHA256 8306fd6b00e22f6602d6cf25a5b817759477da0b06f8806ec06bbdb085b307d5 SHA512 233ff8cbf47fa8933707d5f9738b195aeef0bea3d16a8419c1c5a2f67e0ee6d029c5bfa71aeff7b5cc1c1aaad2839b415e9a7d77b798bf235781bcf8c9ae9092 WHIRLPOOL 316d340c8684a6ca8de9bc7bea974724d92f35a270a3a6440ed7f59c21dd61cbd08f608660854d3aae240e007847befc88f5b0f5df110eee6942ff1af1937481
+EBUILD fabric-1.12.0.ebuild 2124 SHA256 8362ed935268a74c1e2cee9519fb93c0aa25ac08d44e82bf06c55762ebfb344f SHA512 5434ec174f4bce65b6bc1fdc24004454ad7c3a54049ec0126761211e42c96878f027e6604ca9f7578cae1d3582335194240dc34ed0ba23aae3c7e2c6aef3ffde WHIRLPOOL ee0a757c4560329bd6d94b7db975c882194076bd32dc2352c7af42ccc1dbb856716256c6fd2ac13c586a6bbd5e1f333f29392396b286207e26311699f4f1b043
+MISC ChangeLog 3927 SHA256 c5ddd7505154ea80b6c1d0b2c5608d3d1ee8713b4e41884aa83782cf8b9cec19 SHA512 f1ac97c9fe44eda1e0ceb4de41e179c921146a4fe3b50a5806592be8d39aa341f11483a33376647b48107ea1be628e6d0e15d982e7786061ace9332f3f0e4b5a WHIRLPOOL 6c54f2cc0826deda85d3890954640b19ef5cbea5a5b8b99caf86e7c37730b8ed6d2b6e5506e3d78dc35bacba1405197381bee78602091862f3f5222ddcc92b9d
+MISC ChangeLog-2015 8942 SHA256 a594917a8152d500cf5087976c3c00421c760dcdfa5a1f473393a20406d63e17 SHA512 f832546fadd4a535740dcc6387b9a0e897cd1021415af8de2432fc29be82701d25350a07ba0d5edbd39fb1284a4e5a379520b95c27b1c6bae7f47ab0066e6bb4 WHIRLPOOL 643f5315fa34ca80e19a631bfd4057a4434dcfa25decfe2a770a4645235b13c15aecba2ae64cc9f7d0bf2e161e7ba60405c17ced443a8f36b2c38a4933a180c0
+MISC metadata.xml 309 SHA256 5255f8fc6c04937a200f9d3c2318e99f68b74b4bd4e61d2cd55d05586d5f096b SHA512 ca05cacf9ab4eb5814b4d311902e34ba0e788c811b59c9a687b0d320b254036a688cccc45265384523b2fc460383336d334acc860b72f78d3ec9736361bf6b24 WHIRLPOOL 796c675b4f796955e6cddb40d0440c11a00994bcd93f8a94d26b3636545ba4f7effbe0a8c5d6304b4130445dabec63b710817f5f4a60a70fb4bbd7c0ee8db90d
diff --git a/dev-python/fabric/fabric-1.10.0-r1.ebuild b/dev-python/fabric/fabric-1.10.0-r1.ebuild
new file mode 100644
index 000000000000..f855e6e81561
--- /dev/null
+++ b/dev-python/fabric/fabric-1.10.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Fabric"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A simple pythonic tool for remote execution and deployment"
+HOMEPAGE="http://fabfile.org https://pypi.python.org/pypi/Fabric"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/paramiko-1.10[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7
+		dev-python/alabaster[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		<dev-python/fudge-1.0[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Re-set intersphinx_mapping for doc build
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed  -e "s|'http://docs.python.org/2.6', None|'${PYTHON_DOC}', '${PYTHON_DOC_INVENTORY}'|" \
+			-e "s|    'www'|    #'www'|" \
+			-i sites/docs/conf.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html -c sites/docs/ sites/docs/ sites/docs/html || die
+	fi
+}
+
+python_test() {
+	nosetests tests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( sites/docs/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/fabric/fabric-1.12.0.ebuild b/dev-python/fabric/fabric-1.12.0.ebuild
new file mode 100644
index 000000000000..36ca64ccbfef
--- /dev/null
+++ b/dev-python/fabric/fabric-1.12.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 distutils-r1
+
+MY_PN="Fabric"
+MY_P="${MY_PN}-${PV}"
+
+COMP_HASH="83d303e9fb352deaf4885b6db0781b3d9115e9c6"
+
+DESCRIPTION="A simple pythonic tool for remote execution and deployment"
+HOMEPAGE="http://fabfile.org https://pypi.python.org/pypi/Fabric"
+SRC_URI="
+	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+	https://raw.githubusercontent.com/kbakulin/fabric-completion/${COMP_HASH}/fabric-completion.bash -> ${P}-completion.bash"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/paramiko-1.10[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7
+		dev-python/alabaster[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		<dev-python/fudge-1.0[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Re-set intersphinx_mapping for doc build
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed \
+			-e "s|'http://docs.python.org/2.6', None|'${PYTHON_DOC}', '${PYTHON_DOC_INVENTORY}'|" \
+			-e "s|    'www'|    #'www'|" \
+			-i sites/docs/conf.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html -c sites/docs/ sites/docs/ sites/docs/html || die
+	fi
+}
+
+python_test() {
+	# 1 failure, reported https://github.com/fabric/fabric/issues/1360
+	sed \
+		-e 's:test_abort_message_only_printed_once:_&:g' \
+		-i tests/test_utils.py || die
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( sites/docs/html/. )
+	distutils-r1_python_install_all
+	newbashcomp "${DISTDIR}"/${P}-completion.bash  ${PN}
+}
diff --git a/dev-python/fabric/metadata.xml b/dev-python/fabric/metadata.xml
new file mode 100644
index 000000000000..0ed9470ac422
--- /dev/null
+++ b/dev-python/fabric/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Fabric</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/falcon/Manifest b/dev-python/falcon/Manifest
new file mode 100644
index 000000000000..dfb30c52ab82
--- /dev/null
+++ b/dev-python/falcon/Manifest
@@ -0,0 +1,11 @@
+DIST falcon-0.1.6.tar.gz 186870 SHA256 325503ae704420b91ffcb4c188d5ab15ae467b6168d7ccfacf905db1667022e3 SHA512 033b06d643dc910d62830d42a559a1fa1933b93c8f93b136c0ba89429cf3eadd912b5512f2add2ae904c3ff192046718a8d40a53d3a05506dfc2722cf5437668 WHIRLPOOL 1d93d1ffae86a167ab278fff3d6d653ea6b4df41723ea21f5149fa7316145ca9d8d6b8cde7ec1d018699cdbd86ebec87f682fd7a0f887f9e3f2926b18b6282ab
+DIST falcon-0.1.7.tar.gz 193151 SHA256 15c22f481b6152cb625d44ee852ec02cf775cb49f1fc9fa71cbc8d4fcccfbe7c SHA512 665a0bdd02c8e9a0806c863164fde33a6a10a1ac8c2ec9c3194da0ca41e411c19ec5b2a84cce521abb510588c23b4bb5fab25af58d5c17fbbf8e7c3304839b9a WHIRLPOOL 598f43cc59fd0d160e8a0fdb50385306c88a6becb5982110b4d9bd981e61768f1d33b46a51e44dfd0ec93114d156a56c9046e62daa044077246befa90009563d
+DIST falcon-0.1.8.tar.gz 202170 SHA256 e16c0e3062c4d6977e3ce892807d7e822c622f2743d9d97bd8be9babee29b63b SHA512 e0ec028c1d1dc3fba722bd91f9bb315523367313bef40238579a96ca49de37f4c63e53746bf6ab40add053320925378860e3571e32401151c00d4afcbad9b7ca WHIRLPOOL 1fa22d3167a12f992c5974864020ddcc89d6c9001d324e972b3e9fd8040ab8577cf955488c869fde662e0dfa98ed8c24e26f36b9b81ac9c282838aea6684e809
+DIST falcon-0.1.9.tar.gz 202209 SHA256 c8190ddf37dd8cf90f325a27185916e336e229292595f892043f55a502c04f94 SHA512 442a04c925f4af69bb0f1906c4123e68ef423e4040fbde82cecc200a44410665c0f97ad28e7f59e4139aae1209ba1df1dd445c5a44e6b975bed9416a97e681e8 WHIRLPOOL de1ff7b57a553efe9647b19c844107dc2a18dae0366c866ddf6d6035e40c1c532ad1bb81d03bc48af506996b4978c76392c98b4de5e8ba374dc3e6b4f334a27c
+EBUILD falcon-0.1.6.ebuild 1153 SHA256 db874c2b915ad45132d4a4866ecce046ba403f822d40777199499182d2482053 SHA512 6249ca64562e0ad210bc2ff0df65ad60d2ed0dcdec7c7c0ade688166d2aef5d05fa6cddf784de0890b12bf3b3ccc83a42c7e60010bc4e8421fcd57ef94a71d97 WHIRLPOOL e202cc0ef7477bc3c4d5cd0cc1494b60a544a5fec41104f7456b919617397f6f3060de9773b8a3b89374821a539d3dc5272b02ddab07bb6dca3c2d83adff9b49
+EBUILD falcon-0.1.7.ebuild 1193 SHA256 a3ee8d824404960ec54650401f16f7d19e255b9f7fdec5d059ebd452ffea2564 SHA512 7de089879fa647df628d95482c48eb3d14e32273b4533e6f40e6d148c662ab8813aa3b4d41c06b8b07c9549618b4475064fd7b09728e6b0f960a4842c34a8d55 WHIRLPOOL 4bc5734a4f125cd8c341656067c3fafe187ecc71b4e917bdc7a62d11fc130f7eba68e5a18dafce7fc4ed9910011026fb0e2af354b2dcfa43597b651152ad0927
+EBUILD falcon-0.1.8.ebuild 1341 SHA256 f2e26588a9f874f5ef6c396690e557b20b7a92d8b473c952bec16a1964effa23 SHA512 d1b2763bde210ccc84b81febc5f998033ca06aa263cecfc241a1bdcdbc6669e0bc6305b8e487251008edaa3ff307d0883f8b523cfa791e629dafe6dac7ac7f35 WHIRLPOOL 6e1338913251ccbd0141710b4bb665417c419ef38804dba4600a1f85f945a8dbb4f8283897603bf49a11a01509ba1884ab070a253030253b76bd23cc63457e0e
+EBUILD falcon-0.1.9.ebuild 1345 SHA256 08d72566f0a708e21ffe4ddb8c6bb66d0ec1d2b0e1d20a23642800cd9d9ce68c SHA512 abde203d262a811e476cc88faac204b279c27445d1cb4071daba8a7c6fed7cb63037be72788dbde6d627a5f0856f99c5caa1b22ab04554093b07a2c1813ebec4 WHIRLPOOL 10a8650d12aa90086dad8f580e085fa4990992f2e5345806629d2a45e57a7f4af18399027ea5697a238cd55bd01599a3541915c83e62eefd2003eaa4c97255f0
+MISC ChangeLog 2519 SHA256 92281a6d639d099081628db7e01dd5685c8cc80485e2a729295f25a0cfa0ddf4 SHA512 dd3e08ec16105191064fa59a7ed1ac1372de7c1035d0ac90800ed617bec2d379b1af9a3a57b93fa66c564cf649b6dc9419573aa3e727f5da4df35329d5636270 WHIRLPOOL 33534ebea124d6b887bdf00887c879d86aedb77abc590e3e0c62e32e5d064d189ccfb327fde5f1cee7b3e2523749dfe07b6c72510a89139098a18671ab99609d
+MISC ChangeLog-2015 1712 SHA256 3d1501b6bbec3e86dd307fa79c79d1f9ed068cf7379d93bc9fd6370f837652d9 SHA512 b959e30818384ed392742da08df884d3c4fbd12eedad917efbcf0742b1940674c6f7d1eee5b6fbfd38da40a5a69a36a8f937684c745a256d04d5b63e601c51c7 WHIRLPOOL 63fddb15787d2b61ba739418bad76351b76f263631934ab1707149c8506bf6dc0fd81df7afd0d6e64af9fc08aacaa4bf0c6ea9b28f6aff4a76313decf71e3538
+MISC metadata.xml 427 SHA256 c686d3019f1fe986c507ce3256eff0bc6ff2e53eddfb6e5dd17f20d17658ff30 SHA512 7221c24f2bfa8068d4f5516e094af7dfc01786c63ae8d3f040b8d1da0ec4a83a6c507332e524fbd78e0644c978c11c89bec8c9771e0247ef48de1f50c50d8fbe WHIRLPOOL 74487efbd849cfa7e7921836f3b2d33553287b59a138b27aae7980aaa786975b310fa7ed702e759079fd6b75813293242e5050d72539e0902325c50a890c2281
diff --git a/dev-python/falcon/falcon-0.1.6.ebuild b/dev-python/falcon/falcon-0.1.6.ebuild
new file mode 100644
index 000000000000..68269102da33
--- /dev/null
+++ b/dev-python/falcon/falcon-0.1.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# Python 2.6 is supported, but depends on ordereddict, which has been in
+# improvise for months and is a minimal package. If needed
+# please let me know. PyPy also works
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A supersonic micro-framework for building cloud APIs"
+HOMEPAGE="http://falconframework.org/ https://pypi.python.org/pypi/falcon"
+SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cython test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	cython? (
+		dev-python/cython[$(python_gen_usedep python{2_7,3_3})] )"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/cython[$(python_gen_usedep python{2_7,3_3})]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
+
+src_prepare() {
+	if ! use cython; then
+		sed -i -e 's/if with_cython:/if False:/' setup.py \
+			|| die 'sed failed.'
+	fi
+}
diff --git a/dev-python/falcon/falcon-0.1.7.ebuild b/dev-python/falcon/falcon-0.1.7.ebuild
new file mode 100644
index 000000000000..0e647c824812
--- /dev/null
+++ b/dev-python/falcon/falcon-0.1.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# Python 2.6 is supported, but depends on ordereddict, which has been in
+# improvise for months and is a minimal package. If needed
+# please let me know. PyPy also works
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A supersonic micro-framework for building cloud APIs"
+HOMEPAGE="http://falconframework.org/ https://pypi.python.org/pypi/falcon"
+SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cython test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/mimeparse[${PYTHON_USEDEP}]
+	cython? (
+		dev-python/cython[$(python_gen_usedep python{2_7,3_3})] )"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/cython[$(python_gen_usedep python{2_7,3_3})]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
+
+src_prepare() {
+	if ! use cython; then
+		sed -i -e 's/if with_cython:/if False:/' setup.py \
+			|| die 'sed failed.'
+	fi
+}
diff --git a/dev-python/falcon/falcon-0.1.8.ebuild b/dev-python/falcon/falcon-0.1.8.ebuild
new file mode 100644
index 000000000000..0eb150dc701c
--- /dev/null
+++ b/dev-python/falcon/falcon-0.1.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# Python 2.6 is supported, but depends on ordereddict, which has been in
+# improvise for months and is a minimal package. If needed
+# please let me know. PyPy also works
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A supersonic micro-framework for building cloud APIs"
+HOMEPAGE="http://falconframework.org/ https://pypi.python.org/pypi/falcon"
+SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cython test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/mimeparse[${PYTHON_USEDEP}]
+	cython? (
+		dev-python/cython[$(python_gen_usedep python{2_7,3_3})] )"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/cython[$(python_gen_usedep python{2_7,3_3})]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
+
+src_prepare() {
+	if ! use cython; then
+		sed -i -e 's/if with_cython:/if False:/' setup.py \
+			|| die 'sed failed.'
+	fi
+
+	# fix tests installation : potential file collision
+	sed -e 's@^where = tests@where = falcon/tests@g' -i setup.cfg || die
+	mv tests falcon/
+}
diff --git a/dev-python/falcon/falcon-0.1.9.ebuild b/dev-python/falcon/falcon-0.1.9.ebuild
new file mode 100644
index 000000000000..33a843d2c517
--- /dev/null
+++ b/dev-python/falcon/falcon-0.1.9.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# Python 2.6 is supported, but depends on ordereddict, which has been in
+# improvise for months and is a minimal package. If needed
+# please let me know. PyPy also works
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A supersonic micro-framework for building cloud APIs"
+HOMEPAGE="http://falconframework.org/ https://pypi.python.org/pypi/falcon"
+SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cython test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/mimeparse[${PYTHON_USEDEP}]
+	cython? (
+		dev-python/cython[$(python_gen_usedep python{2_7,3_3})] )"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/cython[$(python_gen_usedep python{2_7,3_3})]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
+
+src_prepare() {
+	if ! use cython; then
+		sed -i -e 's/if with_cython:/if False:/' setup.py \
+			|| die 'sed failed.'
+	fi
+
+	# fix tests installation : potential file collision
+	sed -e 's@^where = tests@where = falcon/tests@g' -i setup.cfg || die
+	mv tests falcon/
+}
diff --git a/dev-python/falcon/metadata.xml b/dev-python/falcon/metadata.xml
new file mode 100644
index 000000000000..690e2fa0f23b
--- /dev/null
+++ b/dev-python/falcon/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>rafaelmartins@gentoo.org</email>
+    <name>Rafael G. Martins</name>
+  </maintainer>
+  <use>
+    <flag name="cython">Build cython-based python modules</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">racker/falcon</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
new file mode 100644
index 000000000000..6ffcc1155cfe
--- /dev/null
+++ b/dev-python/fasteners/Manifest
@@ -0,0 +1,6 @@
+DIST fasteners-0.13.0.tar.gz 17510 SHA256 76a804e7d5793ea5239aee7ccface4a51262fdd1d49cdb407838c2f8076ef059 SHA512 921affd29452548e97e0dbb2dc70d7f0df9c181b6f17da734dceef37f42f0873d4316da50905b56d9dae20801001d1fdde94569f6bb41f60fc211ef5bc7f161d WHIRLPOOL 3b94d7700a7e600328a42ddac0b3e2306a79dd2bd4fb1b3e540d0d635da3a81e75339abdf612833fbaf717e36430539dbf2a1b73390b0f8e57b665ac1e65f866
+DIST fasteners-0.14.1.tar.gz 17749 SHA256 427c76773fe036ddfa41e57d89086ea03111bbac57c55fc55f3006d027107e18 SHA512 a58c5f1658b1bc664c825f2237fa91b72b9f31590e7eb79c7ae7a86c507ebe84574ac7d8e837a7bec11ad32f04204ef6f5906219b00a6adb0732daee1eb6faa1 WHIRLPOOL 21c27f5c23e6c472210dae6b7aad8265c6cb952f63b0200a8489bb8462589d1b14a50d084453ec5487e39a857e8008ebad342c719a80affb3605255e7a43d406
+EBUILD fasteners-0.13.0.ebuild 513 SHA256 7145a0017044503f753d864236c1b27b459d4320b5846d1bc7a5dbc4506c322f SHA512 25e62ef05dcc5d2146018c7cd504f8168c490c1949ddf3d4f7fedb9c0ff6fb46e8f3124c4e241025ba2bdfdbf9231fe8260a59063cb432b55fd2d5cca6ef0937 WHIRLPOOL 99cd9a4fbd26ce2fcee7e42a090f94fc01a9ab4e1f7b3661ff1eb4e571059ac6bb382bc7d3bcfaacf8a3cc932148777bba9d1344077210c05a5542285e43b4ff
+EBUILD fasteners-0.14.1.ebuild 766 SHA256 b340503db983402cfd7d3faac5bf4c7cb6552ed8042b1ef067b4b2e1c70bf2c9 SHA512 0f9bfbbe905cfb28c556d16c803bcaad22b61b4b1b2393697ed29e69645be10b20192c40cb2eedbe9875b44ca6f17a290ef7c74abed8cfe8cea63fb2dc42068b WHIRLPOOL ac782da5c24dc064b354522162dcdad7e945798165edb840e31a7b3325470fcc2454c807150f9b46a639ec3d654ff374745c7804c8b7ad683d4f6a50df86ff08
+MISC ChangeLog 1809 SHA256 048c911fba167e649ae6a519624c4b695184112a53313112f98ec6d5a4fc1b1b SHA512 864e019e512ca15f6246fb1e9cb33fdbd0885d46f66ec1cb9684f4a25227aacd81383b651b908c64b7f33d38900e9e83ba9f5ebbe04b9661b4b09d7676b4efbe WHIRLPOOL 51217c19885da76a36c314dd82e2cf624624fb6ed9c7ca936b863a16438c13a16a33fc2fae144a210afd130205fccd80c108afc44f4248ae5a2ab7c3ba09f83b
+MISC metadata.xml 384 SHA256 295dac24ef3723594ae6eb65652c7cec766f4b6db16b3a1cb05ed31e84874960 SHA512 ee6f6af5c106f8afb401defc7f8ad7f8801b8a84dcb3f3ce76520b46774ce363277f0383523f71ccb4b0d00ea4f358deb42fba64853498037375ce15b137a491 WHIRLPOOL f2ac7fec527e8967ea3854609ef801b29c57dc0a0d0d056ab4edc86df53b036f8c549008c404cf28989a0195739e618f59ef8e2f58f281b4b1eb4c2bc94f7620
diff --git a/dev-python/fasteners/fasteners-0.13.0.ebuild b/dev-python/fasteners/fasteners-0.13.0.ebuild
new file mode 100644
index 000000000000..82143bd166d9
--- /dev/null
+++ b/dev-python/fasteners/fasteners-0.13.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A python package that provides useful locks"
+HOMEPAGE="https://github.com/harlowja/fasteners"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/fasteners/fasteners-0.14.1.ebuild b/dev-python/fasteners/fasteners-0.14.1.ebuild
new file mode 100644
index 000000000000..17729660d897
--- /dev/null
+++ b/dev-python/fasteners/fasteners-0.14.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package that provides useful locks"
+HOMEPAGE="https://github.com/harlowja/fasteners"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/monotonic-0.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		virtual/python-futures[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests -v || die
+}
diff --git a/dev-python/fasteners/metadata.xml b/dev-python/fasteners/metadata.xml
new file mode 100644
index 000000000000..cce46e1fdb23
--- /dev/null
+++ b/dev-python/fasteners/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>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">fasteners</remote-id>
+		<remote-id type="github">harlowja/fasteners</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/fastparquet/Manifest b/dev-python/fastparquet/Manifest
new file mode 100644
index 000000000000..5ed53f3904e5
--- /dev/null
+++ b/dev-python/fastparquet/Manifest
@@ -0,0 +1,5 @@
+DIST fastparquet-0.1.0.tar.gz 118108 SHA256 dad60f61596b0118b50c727d8abd10115ec5e172ca5cb14211a3d6dfe1075c6b SHA512 9aa61f998cd95e4242635ef729c29fa5c66834bdd501fe7d104317a767c5eebc6a1d1aecbd669a39c855f5f2d1650af153b77f12c0120e6e5d13cb8f78e4cba0 WHIRLPOOL c4bc25df8ca0964f6df19840fd7f8c6aab4a6beb2ef8a3d714291121e73a15d3e005cf4534832782eba64a30ba29c63b92d6862a06c7e1db50910d695bbe8a0d
+DIST fastparquet-0.1.1.tar.gz 119573 SHA256 189105b53f56b5ed4d9077a0b22de0055b79917ae9a083dfb7abe9453d754d28 SHA512 f8f052202ca095596870e6a10e2ab05e3c55289cd0ef3dab0502dff26052c9970f65f6b826d4d073c6c221827f6b18ddc83c47c04e84e08491f5237358f5860a WHIRLPOOL 4c9d7b7523da38f2b8230cbddfe70a6ffec69653858dae1ede5776fa033775420dd9afb31876d2c50df595f43f05f7c8a1698507bb9aaff6e3d3e1b23f83cc12
+EBUILD fastparquet-0.1.0.ebuild 765 SHA256 3ff957371af293acb022b6b05901d6535ed6fb23f68e6631ac7abb0a5cfa31b8 SHA512 aa69b6e9aafd5512d399e7840e2258aefaabddf84cebd5dc7c79db340fb27d956feaec7f3447d13ce70ac9e07d051c5c5eeea1b32a5f0ed488f94ffba5c24c49 WHIRLPOOL 753bb26a3a139918edc0162197443c777b90e5b5df6dedf59ff296c5f23b51304ca9a0731df3705ec6a15c29e9f8fe678120ef7bb14b1362aca598ba52e474a0
+EBUILD fastparquet-0.1.1.ebuild 899 SHA256 53424349119698877b5292e7f948fca8db6fca5d306d82951498cc6237f6b806 SHA512 dc977589378234cf19897bb18483eb4676df014e9dc3c4dda1bf70d7998771f3b5da33c25559cec6eb14f1e3f9b587bf9a0c8fee5ab1509cbfbf5c0265c19b6b WHIRLPOOL 9623333a5d6302e1133299e665eb379b2bc4cbbb28ff18b3401cc47f7fbf2e954647060b12184e305dd01435190df31f7d6e99738a6058f2e813b5a3854b14c9
+MISC metadata.xml 961 SHA256 c738d31ceab32e9f34d642458cf59a8a1b76ccfc3c7b1e8cce8acd9e324937a7 SHA512 2634acb33c585b036fd09df504e7d2d885b287e1b30585233fa7f2d3f7dd7e8206e20adf7061623fb2e8ecb45e714290966c8ed4a27baac56c7909b116eb49be WHIRLPOOL 0d638ce923bd7607f4d01eb932cabe6ff5f0017bc4a6585f5ebd76a576f1eead6ab307fbbe5055284ae40b075fca78df6dbc99f1cdcf9507f403bec493efec23
diff --git a/dev-python/fastparquet/fastparquet-0.1.0.ebuild b/dev-python/fastparquet/fastparquet-0.1.0.ebuild
new file mode 100644
index 000000000000..0f06496d4b59
--- /dev/null
+++ b/dev-python/fastparquet/fastparquet-0.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the parquet columnar file format"
+HOMEPAGE="https://github.com/dask/fastparquet"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/numba[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/snappy[${PYTHON_USEDEP}]
+	dev-python/thriftpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/fastparquet/fastparquet-0.1.1.ebuild b/dev-python/fastparquet/fastparquet-0.1.1.ebuild
new file mode 100644
index 000000000000..01c8d3c54fbb
--- /dev/null
+++ b/dev-python/fastparquet/fastparquet-0.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the parquet columnar file format"
+HOMEPAGE="https://github.com/dask/fastparquet"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="brotli lzo +snappy"
+
+RDEPEND="
+	dev-python/numba[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/thriftpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	brotli? ( app-arch/brotli[python,${PYTHON_USEDEP}] )
+	lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] )
+	snappy? ( dev-python/snappy[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/fastparquet/metadata.xml b/dev-python/fastparquet/metadata.xml
new file mode 100644
index 000000000000..0866e1d45e83
--- /dev/null
+++ b/dev-python/fastparquet/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    fastparquet is a python implementation of the parquet format,
+    aiming integrate into python-based big data work-flows. Not all
+    parts of the parquet-format have been implemented yet or tested
+    e.g. see the Todos linked below. With that said, fastparquet is
+    capable of reading all the data files from the
+    parquet-compatability project.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">fastparquet</remote-id>
+    <remote-id type="github">dask/fastparquet</remote-id>
+  </upstream>
+  <use>
+    <flag name="brotli">Enable support for brotli compression</flag>    
+    <flag name="snappy">Enable support for snappy compression</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-python/faulthandler/Manifest b/dev-python/faulthandler/Manifest
new file mode 100644
index 000000000000..246516df434d
--- /dev/null
+++ b/dev-python/faulthandler/Manifest
@@ -0,0 +1,3 @@
+DIST faulthandler-2.6.tar.gz 54219 SHA256 59487773e0189d6236ec694af53ac1fe564ec4a6d9593818deadd9afe4c0dc7f SHA512 884996a78b595c1c03c12d88687f5ee5051fabe162092a7b0c15a5ce51da33e64041bc1f2d4505bd5ae0d35a8e8d0e50dd08f603e58bdec5229f888ac46ce029 WHIRLPOOL ae8f0cf6107544e12836bc5fa50ea3ab65f07a99c4cc0fec105b5152882af24dfe8e3b746ddeb915f928d472f6f3ebd16589f5daca9dfd787cf00b23d259144b
+EBUILD faulthandler-2.6.ebuild 534 SHA256 0f058bc81dff831c83e116dc3b27be4c60040014c2eacc2e06d352ce6bded7ed SHA512 603a88086a8955f9314c84cfb9fd176f3b13b277d22f32e5001158c49160d63fcf72ea5cb01bda590bf1b5cfd59196a193e70a0941cabfac2da38db73b7eed7e WHIRLPOOL f8c8eda6f758740644ae79a6bf2b737290fea3c2e43ff5326c100f474ce3849a3db2f68df52d09e7a8111a23c5c73cb28eb4b9e87137baf9afb982bd3bef2a1c
+MISC metadata.xml 392 SHA256 4c5b1993a687e71a7e9f73de9315e6057013c9c60670e63c9fe75fe5da1c469f SHA512 1354c7b6391bfda781ad27395fdf230d81abb277452b7731caf870f356d1dc45a277130c9fa5bb61414f6160dd187622a261cf99be3bb53e5fb28b8cec4371dd WHIRLPOOL 1dcf190b5cd5d1bf4d06393fae7301b3dd09d8b3c22a84550909bf7ac0b52052e7df86e84936f0985c73779405656b94a51e416dcb641891d10d7768ed16c9c5
diff --git a/dev-python/faulthandler/faulthandler-2.6.ebuild b/dev-python/faulthandler/faulthandler-2.6.ebuild
new file mode 100644
index 000000000000..e2c97d0e41ca
--- /dev/null
+++ b/dev-python/faulthandler/faulthandler-2.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="functions to dump Python tracebacks explicitly (on fault, user signal, timeout)"
+HOMEPAGE="https://github.com/haypo/faulthandler https://pypi.python.org/pypi/faulthandler"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/faulthandler/metadata.xml b/dev-python/faulthandler/metadata.xml
new file mode 100644
index 000000000000..8583f2ad1028
--- /dev/null
+++ b/dev-python/faulthandler/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>tamiko@gentoo.org</email>
+    <name>Matthias Maier</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">haypo/faulthandler</remote-id>
+    <remote-id type="pypi">faulthandler</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/fdsend/Manifest b/dev-python/fdsend/Manifest
new file mode 100644
index 000000000000..9b8cabb825e2
--- /dev/null
+++ b/dev-python/fdsend/Manifest
@@ -0,0 +1,4 @@
+DIST fdsend-0.1.tar.gz 11394 SHA256 a610ff5cf34c6ac8a0dbc4d5556fb69915c9894b6e60b693fd00deaeaca6e21a SHA512 29193dabd2084d4c4f2468c27e0501bce69c340d0a5a30bbaf377120f36092c08190c53d0f85321a8615c9cae9aa5c91a1a261b438a83df93145883ece29bf4e WHIRLPOOL ee9b69fbde285b6e466623c54833b32b9445a206b7d0d256a62c89310ee1c24b34e4f9b34a92c4bd9ff9f3f11baf399ab644978fcd802abf10f5014c8271ac39
+EBUILD fdsend-0.1.ebuild 375 SHA256 035eb49292cfb9ac2972c9d7f0dba1995c74c7ecde16fbce932be6b796ee597a SHA512 0c43c5fa3f2740ac480b12f776f0aa41e51300051affa53b9050f5775f740275f205aeda6e48bb4dcc11bad1e474f9767f84db2e09b0e361f7f670978ea69c63 WHIRLPOOL a55e73dbec5c7b4bb9479e7384c4c81b0b90c45ea02af51708af19622f2e00b06bbcc55fce727bf388a3593fc93c2e1eb95442c9ea49874f6efbb5134fb1c1c8
+MISC ChangeLog 784 SHA256 66fe5b6d3d1dfe5993d990314e94495efd3699e8d84588b9f9205c44584fff10 SHA512 e48c942005f63e960f10fc31bacfb27acdc4743093fe80d1d5c48c81dd2935d5d1ee8e20479851092d28492b1a9fdedc33e8a31c4a0492081ceff9475f5886f9 WHIRLPOOL eeb5c892dd2c4204beb96cf8559f56e0103dde4883cce183d103ae44e90b26819432b2ad0a35ee763f7165361a24213796fa7ca97835868cb0f5bfdd1f950c1c
+MISC metadata.xml 250 SHA256 bcd9559baadae8534ff9477c11ff5ea7a59d3ccdf2bca3f9b9e9707afb50661f SHA512 c599b09b9aaf744dfe13d0707adde7d3dfd1a8a411e937fcba25e65c6045792cdcf6ceb9004e3dd38b014c486c9f1334bfc898419f59806ec6abebfc71bca382 WHIRLPOOL 0ef6ee8ef06c304dac6bfc2458c14c637a44a12cb7864968039b2c294f7febdd40ab082542280b5cb920f5fa8cbea5f6a5133a4fbf525bb44b53c79a8f7c0e78
diff --git a/dev-python/fdsend/fdsend-0.1.ebuild b/dev-python/fdsend/fdsend-0.1.ebuild
new file mode 100644
index 000000000000..c1200a06dc0d
--- /dev/null
+++ b/dev-python/fdsend/fdsend-0.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="flexible file descriptor passing"
+HOMEPAGE="https://pypi.python.org/pypi/fdsend/"
+SRC_URI="http://pilcrow.madison.wi.us/sw/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE=""
diff --git a/dev-python/fdsend/metadata.xml b/dev-python/fdsend/metadata.xml
new file mode 100644
index 000000000000..4073267daf2a
--- /dev/null
+++ b/dev-python/fdsend/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>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/fedmsg/Manifest b/dev-python/fedmsg/Manifest
new file mode 100644
index 000000000000..65e6579c666a
--- /dev/null
+++ b/dev-python/fedmsg/Manifest
@@ -0,0 +1,6 @@
+AUX 0.18.0-endpoints.patch 1251 SHA256 f5c203b25669f4b24604bc34a462e527889618e3d70d0079fcfa9279be272291 SHA512 43a3850690980556e7a5ca8ae83359c7f9ef40d6556b590715ae40b5f1dd64c57ae4eef4898c935a556dd4230c53c75c246294ad30daa5a9c505c7ed3b1e39b6 WHIRLPOOL ae3b03e4ea001e6fc7cdb297b17dde03b6b6d9969b34ffcdc2ac2594af9e586600c3c920cc63da676d564d74d0ec8b260ca88f2bad44f95b24f014017a0a0329
+AUX 0.18.0-no_signatures.patch 820 SHA256 cc44833c81cc023498630807916af003bd157a510d66dd9594b055ce6ff73206 SHA512 d4869a6140b9594a6079257c55c86934f67c3eb69230881014501aac4c500efca2d20f1a2d3a69dc122444f63d14a42c87ba7eb3fd9468c8568d592378c6791b WHIRLPOOL 2852f81be49b859db64a29b5ee6bc628fde62f6392efd61b8b341f911f9cff415609485e6615fc85613175b349a6a83776b5b07f7f27c2147679bcc3d653a46d
+DIST fedmsg-0.18.3.tar.gz 540686 SHA256 1e870af77d9d27c83542849d24be3ee9807b1a36499e4471004e0473851ca0ac SHA512 59418b4da151c71962bf7d4d5c5005716c41578673b4786b0a6de3928b24e3de2976878fd66580f02848d453df4588d26d484d5eaf594ba7f49b1ba3a1cb2b00 WHIRLPOOL 8781fd2ed6db5a4308954d8ef063faa7a3545963cfffea62a1ec6e3237ae0a361944764c4f6a585a5e61699b70017a5d459a6d18d68b8b62e638b53d3a558762
+EBUILD fedmsg-0.18.3.ebuild 1042 SHA256 ba1eda7d86b9267d3be8250ecdc701f31ec2882aedf0a5865b2b0ece7ec05aa7 SHA512 e0d44c8d9f9b75ab01764c9b0ed78e3388926a1ccdb150beb4a5c1aa4f7c70377f10f4a4cf392b276f2da40d6e921e5fa40f6b41395b4b28ce0d8d628f0067f9 WHIRLPOOL 426eb04990fed70259fbd1845179100d519a24b8e53b5121c27cbf7a1edb24189ac66e7e4b21877718a9397af4570a902ebf7036356e1f9dc251d0882894211a
+MISC ChangeLog 1205 SHA256 bc53c812432cef4a8d4c47c3411d42d5c2df13ef777d1506b4cd942b3336915c SHA512 d82a6a8b48fc8dc0040c6a6a6934ef28be6857ab5e7503b8c8631703ffb612b2ec274b32e3cd7c914114e70ac01e224ddc7884acf45ef96963575ad7caf5a8b1 WHIRLPOOL 7a78a82d746094249a2374dfac50bec177bdd5a081e3316c9ee2a714bc50779b8af932cb2bf1904cf88a7c2b9a5e40962593ad0a3884df2bddb8f84c22cbe2ba
+MISC metadata.xml 393 SHA256 995f7f6416e6d3b24bf3271caae5e41e07b547d96a40820ea495f24db6dc6df6 SHA512 a26cb34971bbe8e273f3214ba98dee260a6175943d1c1cd2715b0ea7dfc9db1b18a615fa62617532ca0f6b2722992b6cb320b97339941a027bb58e2b6a458233 WHIRLPOOL 710b51e10affe41c638fb031fa9b0e963584478732ca2823d603ff563b8a42ee5cdabba6470f72226d8fa3bdedaf4f2969a61f25a007456699b8991cbdec71c2
diff --git a/dev-python/fedmsg/fedmsg-0.18.3.ebuild b/dev-python/fedmsg/fedmsg-0.18.3.ebuild
new file mode 100644
index 000000000000..f59cd04664d7
--- /dev/null
+++ b/dev-python/fedmsg/fedmsg-0.18.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+inherit distutils-r1
+
+DESCRIPTION="Fedora Messaging Client API"
+HOMEPAGE="http://www.fedmsg.com/ https://pypi.python.org/pypi/fedmsg"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/0.18.0-endpoints.patch"
+		  "${FILESDIR}/0.18.0-no_signatures.patch" )
+RDEPEND="
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/kitchen[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/arrow[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/m2crypto[${PYTHON_USEDEP}]' 'python2*')
+"
+DEPEND="${RDEPEND}"
+DOCS=(
+	"README.rst" "CHANGELOG.rst"
+	#TODO: doc/ dir full of rst files
+)
+
+python_install_all() {
+	distutils-r1_python_install_all
+	insinto /etc/
+	doins -r "${S}/fedmsg.d"
+}
diff --git a/dev-python/fedmsg/files/0.18.0-endpoints.patch b/dev-python/fedmsg/files/0.18.0-endpoints.patch
new file mode 100644
index 000000000000..857f6839b5e3
--- /dev/null
+++ b/dev-python/fedmsg/files/0.18.0-endpoints.patch
@@ -0,0 +1,39 @@
+From 8bc5cbaa977b8de962f68ef84f6c8fadcb369c85 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentfredric@gmail.com>
+Date: Sun, 13 Nov 2016 09:12:20 +1300
+Subject: [PATCH 1/2] Adjust endpoints to be more suited to gentoo users
+
+---
+ fedmsg.d/endpoints.py | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/fedmsg.d/endpoints.py b/fedmsg.d/endpoints.py
+index 72c182a..c4eab16 100644
+--- a/fedmsg.d/endpoints.py
++++ b/fedmsg.d/endpoints.py
+@@ -24,15 +24,15 @@ config = dict(
+     endpoints={
+         # These are here so your local box can listen to the upstream
+         # infrastructure's bus.  Cool, right?  :)
+-        "fedora-infrastructure": [
+-            "tcp://hub.fedoraproject.org:9940",
+-            #"tcp://stg.fedoraproject.org:9940",
+-        ],
++        #"fedora-infrastructure": [
++        #    "tcp://hub.fedoraproject.org:9940",
++        #    #"tcp://stg.fedoraproject.org:9940",
++        #],
+         #"debian-infrastructure": [
+         #    "tcp://fedmsg.olasd.eu:9940",
+         #],
+-        #"anitya-public-relay": [
+-        #    "tcp://release-monitoring.org:9940",
+-        #],
++        "anitya-public-relay": [
++            "tcp://release-monitoring.org:9940",
++        ],
+     },
+ )
+-- 
+2.10.2
+
diff --git a/dev-python/fedmsg/files/0.18.0-no_signatures.patch b/dev-python/fedmsg/files/0.18.0-no_signatures.patch
new file mode 100644
index 000000000000..8be69ad5ba81
--- /dev/null
+++ b/dev-python/fedmsg/files/0.18.0-no_signatures.patch
@@ -0,0 +1,29 @@
+From 8f61441ba94f7f0bd2b2a1c900e20db038b7085f Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentfredric@gmail.com>
+Date: Sun, 13 Nov 2016 09:23:58 +1300
+Subject: [PATCH 2/2] Disable signature validation
+
+Signature validation currently requires M2Crypto and M2Ext,
+which are *only* available on Python2
+
+Python3 Implementations of Signature Validation appear currently broken
+---
+ fedmsg.d/ssl.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fedmsg.d/ssl.py b/fedmsg.d/ssl.py
+index c148667..f635ffb 100644
+--- a/fedmsg.d/ssl.py
++++ b/fedmsg.d/ssl.py
+@@ -25,7 +25,7 @@ here = os.getcwd()
+ 
+ config = dict(
+     sign_messages=False,
+-    validate_signatures=True,
++    validate_signatures=False,
+ 
+     # Use these implementations to sign and validate messages
+     crypto_backend='x509',
+-- 
+2.10.2
+
diff --git a/dev-python/fedmsg/metadata.xml b/dev-python/fedmsg/metadata.xml
new file mode 100644
index 000000000000..5bc322e3720d
--- /dev/null
+++ b/dev-python/fedmsg/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>kentnl@gentoo.org</email>
+		<name>Kent Fredric</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">fedmsg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/feedgenerator/Manifest b/dev-python/feedgenerator/Manifest
new file mode 100644
index 000000000000..3c50fff858e9
--- /dev/null
+++ b/dev-python/feedgenerator/Manifest
@@ -0,0 +1,5 @@
+DIST feedgenerator-1.9.tar.gz 4136224 SHA256 5ae05daa9cfa47fa406ee4744d0b7fa1c8a05a7a47ee0ad328ddf55327cfb106 SHA512 77f4df51c6bdf261f0d1665206ab048a21f8660cf8f2c7abf3d71e17c63284240d0eaa690dd6d53b0b7d8ce9c9e0349094d5270c75c2a069608b7717538d7fa1 WHIRLPOOL f5f0dbfde157ecba644eeaaf7ca7b2c03b576d5df51f6ef98308cc071051f621dcd2080a1d17579abbf9dde513fb28f47a8a487eda80154605eb2d90c91de302
+EBUILD feedgenerator-1.9.ebuild 712 SHA256 409eee119647b66fd222a247a116049f05bea93b1c0a2749024ccf8c0c8914e5 SHA512 339bfb399c419b9b11015abcb89189d3bce2b4082fe466754f9202bc0ec3fde1481ec40cdee284a1dfb1b92dc9e9a36ca0f4854f1591747cd7f5646c6fe49fe2 WHIRLPOOL 522fa9863f4ff5a0f62762e607b226ba65243c34939a7ba6d32cb890bcb252e656080b33525d268a7f9769522e60a50f36298f5ca02cd063233f2accae4a3067
+MISC ChangeLog 3162 SHA256 da9955ed4f85954da4c2852436270bb1290f59b0cfa8397b046211c46e5add60 SHA512 a59195a6bb1001ff4b085ec63507705720756c9a9ee660af04f52099dab1601dcddfd6a8f9715cfef8c126dd5799de0984244b76e13e0e6d842003dd76ed10f4 WHIRLPOOL 5ce53efb99ded19e289e1143ed9d48bffd9f5a65dff2d5da8d1af4a01e355a5f1d780e00bb342504abdb7cba89f60ddd0b1106a3d4d92c81f67b87b1384f1084
+MISC ChangeLog-2015 1743 SHA256 fb9c5040936720594b7911010d37d612e2c460b8e17d1fee8ee2a38d771ba8ec SHA512 57ffdd0e276969e8ff09d4047c250b5802f4d872bfdfc24b9bda1f24fa510620c6e0e642d28a5e7dbc5bd55d74d4b9fc797b6d3e0b37b0049e6c6b1fcb64ef9c WHIRLPOOL 760c11d4b5504c6aa5cb0b35cb9969fca0666cb955264a46df1d856cc738c11c7649b4a7160033095de708ec7b191260f95b54f62fa5a983ac661858455eac72
+MISC metadata.xml 452 SHA256 1e00413faf6b7e1e9f36bbd6cbeb97eaca040724175951e8d616e06ca1390204 SHA512 d37223c168450987a8f3d09a34636cbf08b6e95622ba23aad3a0d240ce179fde3f20d0645631cea16b147215b91c8132940d6376cbd3e6a435dd4ee00524b585 WHIRLPOOL 14e533cea3bfbacf5e08a2f316c025d36a80153e368a32b743618952f43d78dd8db01584cc19674e65edd30606353bbc350ed05b62beb99f1912dfe60e5e2aa6
diff --git a/dev-python/feedgenerator/feedgenerator-1.9.ebuild b/dev-python/feedgenerator/feedgenerator-1.9.ebuild
new file mode 100644
index 000000000000..a74143a3add0
--- /dev/null
+++ b/dev-python/feedgenerator/feedgenerator-1.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+inherit distutils-r1
+
+DESCRIPTION="Standalone version of django.utils.feedgenerator"
+HOMEPAGE="https://pypi.python.org/pypi/feedgenerator"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# Allow pypy to read MANIFEST.in
+	ln -s tests_feedgenerator tests || die
+}
+
+python_test() {
+	"${PYTHON}" setup.py test
+}
diff --git a/dev-python/feedgenerator/metadata.xml b/dev-python/feedgenerator/metadata.xml
new file mode 100644
index 000000000000..c010579f7748
--- /dev/null
+++ b/dev-python/feedgenerator/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">feedgenerator</remote-id>
+		<remote-id type="github">getpelican/feedgenerator</remote-id>
+		<bugs-to>https://github.com/getpelican/feedgenerator/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
new file mode 100644
index 000000000000..c2d7fb08e3c7
--- /dev/null
+++ b/dev-python/feedparser/Manifest
@@ -0,0 +1,6 @@
+AUX feedparser-5.2.1-sgmllib.patch 2748 SHA256 b9317aa240e254ae38001c04ac6c0994b6f5691ee38f5d9ad3785643ede38cef SHA512 3ef63206b043179f5a09cf1f3d5256aed1ae0c559b99fc0ec4c1de756dd678af8a7672673f864f72c8162705056fb0011ff19b39debfcbd0faf402804869f681 WHIRLPOOL cf00bd92e642a8cbe1fd81f7169156725feb1949f62648ffb89ac35f294fb86cf00803830fa16699f31e3d852091d19665311175f0f567bd53b14121a7b802cd
+DIST feedparser-5.2.1.tar.gz 252956 SHA256 bd030652c2d08532c034c27fcd7c85868e7fa3cb2b17f230a44a6bbc92519bf9 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81 WHIRLPOOL 7214fbafa15351d9d759b6d281e5edd4cf38f6285e0a2d788933c1336ab0e66c2587ea341773ed956d7a006e9b09f2f769876690eec9374c9f96b464f2c71ba3
+EBUILD feedparser-5.2.1.ebuild 1209 SHA256 3b8821277795d5422e1f0b47c3b79db3054a3cd4e277df8f15888dfe41f4e2a7 SHA512 7a7b2b310ec08041366ac953706c322fef047955a0e68a5b0aa1be66ebcbba8d68b1e7ac6dd70008ed56c0ab05423181ec5c2723f0294296f1418b8cdcb3dfc3 WHIRLPOOL 199a40c52ed482272bbfcc50f670441fd98432f842c550bf34ffe42bdb2fdec83e67aa4ab5cdc0be5b97b7f62e8a61a7fd35ed1e51dc664105938a5ad0b860d2
+MISC ChangeLog 4229 SHA256 ff273ca99d07ea29967dae7d414857844dd1127054d2554c2ff22dc0ff5fabae SHA512 216458756e1befec938e4563a0a9ed99cc745836298b903975a031a07d68b96b40dc6c9d2c30f288c0605209aa8e31eb370910cdb266396e633b4dd6edf0c7e0 WHIRLPOOL 889d8d17076f28d3697e5bf2678b24e99a31b192efedca6a4684dd2d9d8e2ca3f9695c94b745cdf389bddfa9e2bf8eb9051b6508d786fe444b9e2c641f88de17
+MISC ChangeLog-2015 8316 SHA256 06866662463314c475884dd8b90f8cc415f98bfa58551f65b1a95c0ffa41fe86 SHA512 cfdb57af60ee008a27874bdfa99d10f41889629a32bb49d384e57240ac7c780707cef2ce27d3ecaf2014b721be02e2fc209f81974335df127a9096250e186070 WHIRLPOOL a80451615cec876b1f4bc81640dc344911ff53f37822c81ef5d86ceb1ed82b024c69745367908c6ed621dd72df9fe1bf714462475ae16a703b2c26bdfb6dc53d
+MISC metadata.xml 545 SHA256 e3e9ff90e29ef8d291b9a14d1a1695c20b5ff381d1a0531e3e659fbddcb6cd65 SHA512 529faf4a7612e461dbae6746acf9e886a0ea497b11996e0c5f89de5fece30b544226fdf02a4e19915d132e40b0abcc5b180cce36b5a9f172cd6364ebe3d3f46d WHIRLPOOL 4b389c1312d6e2df2ad7da8520e597d9558bc51d72087dc046fa569fa9603dfed7f02e11f835273a44330e22c937533dea175f40763f63bf004f9a05a6d387f4
diff --git a/dev-python/feedparser/feedparser-5.2.1.ebuild b/dev-python/feedparser/feedparser-5.2.1.ebuild
new file mode 100644
index 000000000000..d137f86feb0f
--- /dev/null
+++ b/dev-python/feedparser/feedparser-5.2.1.ebuild
@@ -0,0 +1,43 @@
+# 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="Parse RSS and Atom feeds in Python"
+HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.python.org/pypi/feedparser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+# sgmllib is licensed under PSF-2.
+LICENSE="BSD-2 PSF-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+# Tests have issues with chardet installed, and are just kind of buggy.
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-sgmllib.patch"
+)
+
+python_prepare_all() {
+	mv feedparser/sgmllib3.py feedparser/_feedparser_sgmllib.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cp feedparser/feedparsertest.py "${BUILD_DIR}" || die
+	ln -s "${S}/feedparser/tests" "${BUILD_DIR}/tests" || die
+	cd "${BUILD_DIR}" || die
+	if [[ ${EPYTHON} == python3* ]]; then
+		2to3 --no-diffs -w -n feedparsertest.py || die
+	fi
+	"${PYTHON}" feedparsertest.py || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/feedparser/files/feedparser-5.2.1-sgmllib.patch b/dev-python/feedparser/files/feedparser-5.2.1-sgmllib.patch
new file mode 100644
index 000000000000..714480560e52
--- /dev/null
+++ b/dev-python/feedparser/files/feedparser-5.2.1-sgmllib.patch
@@ -0,0 +1,78 @@
+From 812793c07d3202d3f5bc39091aec2e7071d000c8 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 1 Jan 2012 19:30:57 +0100
+Subject: [PATCH] Use shipped sgmllib for Python 3.x
+
+---
+ feedparser/feedparser.py |   19 +++----------------
+ setup.py                 |    2 +-
+ 2 files changed, 4 insertions(+), 17 deletions(-)
+
+diff --git a/feedparser/feedparser.py b/feedparser/feedparser.py
+index 8275c29..9a8a053 100644
+--- a/feedparser/feedparser.py
++++ b/feedparser/feedparser.py
+@@ -204,17 +204,9 @@ else:
+ try:
+     import sgmllib
+ except ImportError:
+-    # This is probably Python 3, which doesn't include sgmllib anymore
+-    _SGML_AVAILABLE = 0
++    import _feedparser_sgmllib as sgmllib
+ 
+-    # Mock sgmllib enough to allow subclassing later on
+-    class sgmllib(object):
+-        class SGMLParser(object):
+-            def goahead(self, i):
+-                pass
+-            def parse_starttag(self, i):
+-                pass
+-else:
++if True:
+     _SGML_AVAILABLE = 1
+ 
+     # sgmllib defines a number of module-level regular expressions that are
+@@ -2520,9 +2512,6 @@ class _RelativeURIResolver(_BaseHTMLProcessor):
+         _BaseHTMLProcessor.unknown_starttag(self, tag, attrs)
+ 
+ def _resolveRelativeURIs(htmlSource, baseURI, encoding, _type):
+-    if not _SGML_AVAILABLE:
+-        return htmlSource
+-
+     p = _RelativeURIResolver(baseURI, encoding, _type)
+     p.feed(htmlSource)
+     return p.output()
+@@ -2803,8 +2792,6 @@ class _HTMLSanitizer(_BaseHTMLProcessor):
+ 
+ 
+ def _sanitizeHTML(htmlSource, encoding, _type):
+-    if not _SGML_AVAILABLE:
+-        return htmlSource
+     p = _HTMLSanitizer(encoding, _type)
+     htmlSource = htmlSource.replace('<![CDATA[', '&lt;![CDATA[')
+     p.feed(htmlSource)
+@@ -3890,7 +3877,7 @@ def parse(url_file_stream_or_string, etag=None, modified=None, agent=None, refer
+             result['bozo'] = 1
+             result['bozo_exception'] = feedparser.exc or e
+             use_strict_parser = 0
+-    if not use_strict_parser and _SGML_AVAILABLE:
++    if not use_strict_parser:
+         feedparser = _LooseFeedParser(baseuri, baselang, 'utf-8', entities)
+         feedparser.feed(data.decode('utf-8', 'replace'))
+     result['feed'] = feedparser.feeddata
+diff --git a/setup.py b/setup.py
+index a4a60fe..8c15451 100644
+--- a/setup.py
++++ b/setup.py
+@@ -16,7 +16,7 @@ setup(
+     download_url = 'https://pypi.python.org/pypi/feedparser',
+     platforms = ['POSIX', 'Windows'],
+     package_dir = {'': 'feedparser'},
+-    py_modules = ['feedparser'],
++    py_modules = ['feedparser', '_feedparser_sgmllib'],
+     keywords = ['atom', 'cdf', 'feed', 'parser', 'rdf', 'rss'],
+     classifiers = [
+         'Development Status :: 5 - Production/Stable',
+-- 
+1.7.8.1
+
diff --git a/dev-python/feedparser/metadata.xml b/dev-python/feedparser/metadata.xml
new file mode 100644
index 000000000000..3404a9d0ca67
--- /dev/null
+++ b/dev-python/feedparser/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>Parse RSS and Atom feeds in Python. 2000 unit tests. Open source.</longdescription>
+  <upstream>
+    <remote-id type="google-code">feedparser</remote-id>
+    <remote-id type="github">kurtmckee/feedparser</remote-id>
+    <remote-id type="pypi">feedparser</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/fexpect/Manifest b/dev-python/fexpect/Manifest
new file mode 100644
index 000000000000..e27e838dd0ad
--- /dev/null
+++ b/dev-python/fexpect/Manifest
@@ -0,0 +1,5 @@
+DIST fexpect-0.2.tar.gz 6260 SHA256 d037d1282a43ed38b3edc6b33dabaa543b8b274e92753cbb565d21aa10f52a0c SHA512 45b14bfc50f5e2a5dca45594b024a213c270196a89b1ee51c6a8107d6f8b46ab1ca1362331372492307a2e42adef60be444465d33248788ae2ba2728e42cf580 WHIRLPOOL 2dfd4092ab30870c36ad2dedcaaeff65e58bd1530f3a71831c2ad41d4f4dbdb484c8f79a6baffc585dc48e855ddd9e8c08a3f1c8993628c689907dc3c79bf174
+EBUILD fexpect-0.2.ebuild 663 SHA256 bfe6912ee0904e982b9e6fd1ae0481c502037e626764c3c1e7f1394048ecf0c0 SHA512 da95e15a38474a3dfd9423d99b8fa6182782ef040334f0bac78ddf035658454b65cc24fcfdd216070200bae72444e2be8b1ea62fec37c33c091d4089081c88bd WHIRLPOOL 6cd6c16cc12df272689ccb3228cc01ca04b3fb77c36478f40e895604b5e015c4dee244f6dfca1c3f147f975fdfb5cf90df556073991200435f7f70199891e32a
+MISC ChangeLog 2565 SHA256 97c7d2005c8b7196efef0b5c269d8b309d8eb517b621a1365449655780b412db SHA512 c31f11c0b77b3af92dcd24743c39522f549c332abd833ab63de398efa0d696c419a0448c8efff975328fc9b58f0b7daa064ffb67835e213979935f1845efee9e WHIRLPOOL 43d7bb47b79ac2ab27cd335ac0bbd30fc399d53e53e83af70e4538ef37ea7ed582c167f3f69890ef3995ee017e515dfe2f07c68f28a26aad11f07d38a9ae590a
+MISC ChangeLog-2015 639 SHA256 cded77f38ab17a37b3078cfc6f81b747d018878bd12e178b1472b194461e4ceb SHA512 dd6ca80d2846c6d46b070f6c8343d0f2889699d6265270681b63a7497d86871b29c20ca8c9c243e8118d3d7e5f69d69fb7f8d9b65b7992d7293fa14d47f90946 WHIRLPOOL d04412e31d2efc111140470580f52ed7894297e0b31dbee2f9a7b67f4b68155034b13e84ad2d11ef2e728cf3a081e98e84da8535db93df4fd9608790b3efe9a9
+MISC metadata.xml 329 SHA256 a182a8068ab7f2d917d7f7a763c36bb58c5d837fc3b42c681047401e3cd13c5f SHA512 237bae522b25ae3af8dc8b0220aa52c09b69434e08d2399c4aa800bdf68c49bb9137fa164900c8227dfcfa7d37c6ea7cfb88c519d4c1db7ffdbf73c5cad4a2ef WHIRLPOOL 24b7cee460f5a910dae04511e719c4f00f0c6086f00fbb3e7b1f7ea07efc44b2dbb5acf43ff319cb57650a5bf39692f8f3c55c241d5f6bb7e95c88cf170ee572
diff --git a/dev-python/fexpect/fexpect-0.2.ebuild b/dev-python/fexpect/fexpect-0.2.ebuild
new file mode 100644
index 000000000000..5743bb97265f
--- /dev/null
+++ b/dev-python/fexpect/fexpect-0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Extension for fabric to handle prompts through pexpect"
+HOMEPAGE="https://github.com/ilogue/fexpect"
+SRC_URI="https://github.com/ilogue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/fabric[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/shortuuid[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/fexpect/metadata.xml b/dev-python/fexpect/metadata.xml
new file mode 100644
index 000000000000..8fe841db5de8
--- /dev/null
+++ b/dev-python/fexpect/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ilogue/fexpect</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/fields/Manifest b/dev-python/fields/Manifest
new file mode 100644
index 000000000000..9760d83c2174
--- /dev/null
+++ b/dev-python/fields/Manifest
@@ -0,0 +1,3 @@
+DIST fields-5.0.0.tar.gz 36232 SHA256 31d4aa03d8d44e35df13c431de35136997f047a924a597d84f7bc209e1be5727 SHA512 3d80b9c6a1d0a43568045fc25422b0db783c84e2e3f2be8b1d41b0150f48fef58736d863d06b4562b29190cd6dc2616829faab8e901b7268ac2e9e63e996180e WHIRLPOOL b6e48218dc5060d565516afc247167ea627ae248eef9622d27ea2100de2fd6055ab719f0d1d2e05c769e45dabf4c2e0e5638e35af77c77179e3564b765b7cbbf
+EBUILD fields-5.0.0.ebuild 722 SHA256 cfc45820c203d3b3eba3f117595bea821432856cffd67f31153f6248f8ea450d SHA512 7a5e90796b6053bd9c896a020fab7a403e16caef53178514d03091d37adff472eb70eab3a388dd73ba9441a7188284ea6b4326861ada789ebd43f255c857f5e4 WHIRLPOOL 892d9ce27f7044307f54abcaa1a8c5815289d17f08348effceddec68800317342d88c1e7e39c77ebef77b0146a639e41a4249b18225f3c494ece69c471cc5a8a
+MISC metadata.xml 336 SHA256 f7a3ada3c7cd2acbedbdd2979e2c59a2b7d15f4fcb75cd79d1665ea08349155b SHA512 3c055d4cf5070c7535ac37c335f224c0cafbeb68a7bf7677acd06a786b4aff93b5ddeeed3e2514cb999407c21303adf2945561688d5e20148d7e712000f62d0d WHIRLPOOL 6332cc872c372a344adb9c3a43b8705193546fe925cca4538391ebdf751eb653a32512a8ef58203a688b5184c8387eccf3f23f0692746522e4cf20998d3a4b60
diff --git a/dev-python/fields/fields-5.0.0.ebuild b/dev-python/fields/fields-5.0.0.ebuild
new file mode 100644
index 000000000000..f9032a554d89
--- /dev/null
+++ b/dev-python/fields/fields-5.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 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 distutils-r1
+
+DESCRIPTION="Container class boilerplate killer"
+HOMEPAGE="https://github.com/ionelmc/python-fields"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/characteristic[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -i -e "/--benchmark-disable/d" setup.cfg || die
+	rm -rf tests/test_perf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -vv || die
+}
diff --git a/dev-python/fields/metadata.xml b/dev-python/fields/metadata.xml
new file mode 100644
index 000000000000..8e8da838d640
--- /dev/null
+++ b/dev-python/fields/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ionelmc/python-fields</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/figleaf/Manifest b/dev-python/figleaf/Manifest
new file mode 100644
index 000000000000..501be181d1f3
--- /dev/null
+++ b/dev-python/figleaf/Manifest
@@ -0,0 +1,5 @@
+DIST figleaf-0.6.1.tar.gz 59051 SHA256 04d22485db08f9f60c7de92407753423fa0f574c00211e409e8b0f9482f2f062 SHA512 c759ff9c0946e05a913f85c628acfa1a5636fa422ca93aa10ed8999baafebef395dabf69cc0b6d740bfa11608dc6f2ad6e8001ca314f476d2f582f5d217b8937 WHIRLPOOL 79ed1b9ea789b7317592a73b1dcf258e1ee5b3e11bdf711786010818c24b4517a2268372491f906b884988adfe6ea98328bd0df7519867ed5823d90311f262c0
+EBUILD figleaf-0.6.1-r1.ebuild 568 SHA256 35a8d4e37b73893efbf2f75886f550550f0becf68b6684c7e0542fbe0b3e0e55 SHA512 d6185957b88cbf8674b41ba0be6da27540e40980bb5ae2a694abeff3f836f9a45e401169577983abce058b7277d15947b87682a912974755e174672105288c58 WHIRLPOOL e8e1a25a53db96a5f26dc0989a9275f49134ced3bb365f826c2e00fb14b05491c4825ce9d7abcee6171506c40e024566f2583536aa6aeeb6a597960c44d2e118
+MISC ChangeLog 2581 SHA256 06f964f65bf926fa37b32d5ac15db268aff1658f1f8478f1073a97b4df70eee0 SHA512 e3e28fffe738441966661f899b0d84843c424bd132feed856bff17a31a3fae9fe137e67663b344ba83de210da38d163a8fd4564ed78410e9ba7ba1c37d43f460 WHIRLPOOL f7d36543e24c2749274f843ffd76d0d0296ee9407e61d757c5f8e382b07f118abf5ad6720f5b91814d4a80b17eb7a8ca45ab4b7d4d99172dab6a863161dfd37f
+MISC ChangeLog-2015 890 SHA256 8d503281e22390ac5c2a34692ec5d0ae7a60361c87aeeb83a1b9e5a68ea9d5c0 SHA512 c1fbea8a51a7679765bcb8afe0ed07efaeb3ff941ef20eeafcc376f69516c093615bc2bb6073d487cf6335c40fda05795496cad34eda484cd4b8edc2ea5cfe67 WHIRLPOOL c9cc3a44288686b31fe23f9cedb2793197750ca2a8e927b02b83f87b644fdb4fce312654ff92453b8c8ec96d2beec403fad6044ebc9b48b0bd021505273034e2
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/figleaf/figleaf-0.6.1-r1.ebuild b/dev-python/figleaf/figleaf-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..0a9ad08bbc6d
--- /dev/null
+++ b/dev-python/figleaf/figleaf-0.6.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Code coverage tool"
+HOMEPAGE="http://darcs.idyll.org/~t/projects/figleaf/doc/ https://pypi.python.org/pypi/figleaf"
+SRC_URI="http://darcs.idyll.org/~t/projects/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+DOCS="doc/*.txt doc/ChangeLog"
+
+python_test() {
+	nosetests || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/figleaf/metadata.xml b/dev-python/figleaf/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/figleaf/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/filemagic/Manifest b/dev-python/filemagic/Manifest
new file mode 100644
index 000000000000..1002f753427a
--- /dev/null
+++ b/dev-python/filemagic/Manifest
@@ -0,0 +1,4 @@
+DIST filemagic-1.6.tar.gz 16754 SHA256 e684359ef40820fe406f0ebc5bf8a78f89717bdb7fed688af68082d991d6dbf3 SHA512 2b33b55467d14697ddcee2b1cb69eb41dd51474d2d8d095873f6f6609d77efa295a91bc9b976c9af22983a7cc801e1ea1e55163c18c5b6a41c4e1ff9cf73bb47 WHIRLPOOL 3bc18e084f17d3c74f3ebf5cef4cb884d80bf3fa994358fa5bbb9bf716353fa1cad18a6856f14ce7bad57a07f7180aa4aed47058d557eb445e4a0dc194637032
+EBUILD filemagic-1.6.ebuild 681 SHA256 05503ce385e1681a805e565f3f593b5ce2a45212618eb310768ed91951a1842d SHA512 2f9cae4818d565be8977b2ba6b6fcf571678974b1fc0c09bb3b9a6add393f66680624da3286161bbc232df8332ab0a698620d8cb7cf309e6170e68f4e97b43de WHIRLPOOL 5feb7f7ca7b10cbeab0eb9cadbd73c4884d4dbe4d39409fbc0abfd87c3e58b8d4f4c7ce8d9026ab0f4e096dca6e055fe336f358fea03c3d9c9c3375f8b505831
+MISC ChangeLog 455 SHA256 a8a6fd2baf13f2cc5a5a3022887d83817f43504a0596af46fc847731629b3199 SHA512 56c9d8d285e789100818b9264fed52ac43d1dbc4d9f6427d572cb32c1dbc3596c0e62c5428ef35e0e98f8b4853007676ddfbf68a43e215726b98b75b21ef8b94 WHIRLPOOL a778a4ace3688d46ef9770e69f708fda397b2fc5d8937a5b524d1d8626a1aeed2b73a1cdc1473325fea22b76448a00cb3fdecb08a9e85c03389228251c773c40
+MISC metadata.xml 509 SHA256 d36b416cdaa168de204e1a8c8955a7fb5f75bdb2c68d17f9d18afb636e220efa SHA512 81ad038afa3c0a35a403289cc0866bbc0f80369b435909471300fea4cb8d8f4a860dc18bc600b8d70b111a1be32278622c9640342ba8d152cb4bfb7b8584c27e WHIRLPOOL 138f1283e03c3f8ec66fc70ab94488dca65aae93e6461810d6f61bebeae0a3e2b229007c1f50b6fbd67ce79d9744a318ad7a2a1fe77e13b7e39e8d8e4a7f370e
diff --git a/dev-python/filemagic/filemagic-1.6.ebuild b/dev-python/filemagic/filemagic-1.6.ebuild
new file mode 100644
index 000000000000..0398d416e177
--- /dev/null
+++ b/dev-python/filemagic/filemagic-1.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+inherit distutils-r1
+
+DESCRIPTION="A Python API for libmagic, the library behind the Unix file command"
+HOMEPAGE="https://pypi.python.org/pypi/filemagic https://github.com/aliles/filemagic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		sys-apps/file"
+RDEPEND=""
diff --git a/dev-python/filemagic/metadata.xml b/dev-python/filemagic/metadata.xml
new file mode 100644
index 000000000000..4263866fda92
--- /dev/null
+++ b/dev-python/filemagic/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>wizardedit@gentoo.org</email>
+    <name>Austin English</name>
+  </maintainer>
+  <longdescription>
+      A Python API for libmagic, the library behind the Unix file command
+  </longdescription>
+  <upstream>
+    <remote-id type="github">aliles/filemagic</remote-id>
+    <remote-id type="pypi">kafka-python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/fitsio/Manifest b/dev-python/fitsio/Manifest
new file mode 100644
index 000000000000..c102a86bf646
--- /dev/null
+++ b/dev-python/fitsio/Manifest
@@ -0,0 +1,4 @@
+AUX fitsio-0.9.11-test-failures.patch 1560 SHA256 f16f2d480acd63bd2dfc27df3d95c5e6720d66c31e4198063993cfa9c6179d8a SHA512 224ae91e65d4b5f24cd64f3ab389940bfa58801822ad090966c4c570d5c9fb568588b3efa1dab73c2ebbbd0b5f802c2364fda31097811da78c09903814613c6b WHIRLPOOL 4e7537ab5f0203f5b47347b5732ccd13aa738c0927c6e99651d75ca8ace0ea4e38c1679c97dea4856124ba7fcd8bdc25b8397a15d884d17da7f863106efc2354
+DIST fitsio-0.9.11.tar.gz 6020222 SHA256 a1196385ca7c42c93d9e53002d5ba574a8db452c3b53ef1189e2c150177d4266 SHA512 751b9612fe051f128d8f5dea61e2d119409293051a130ee3e18836181637e8c8daea757a715012fd024678d00e234e8b6c0cc0c9229c2bd9a406db312e4607d7 WHIRLPOOL b1baeef81675b089fc176d2c83766fc535e0fe5f1841b8ecf3b37ce8a336f05c9d61791fa5d7d010a115f300560ffe499eed291c12c3ed2633a2651de79f26e9
+EBUILD fitsio-0.9.11.ebuild 944 SHA256 3c0ffc7b287f3c0e6f0501eec7cc32bbf0940740dcf1c5555387b941dd1ba09b SHA512 bb5e7bc6d307595cd5ee9258bea43cec4213917d5efcd2e65096da7dc04fd95674a6fefed304e865e06436c2512c9ee2cd8c912228ae8718582a75a3f0c286ab WHIRLPOOL 264678c1195996196bf100bc9870ae2eceaf92a3b5b62f3d916f0481ca9a1069a34d2f5e70dccbbd278042cccf3239a6cbddb05fa244e9f7d40e41a855f11cad
+MISC metadata.xml 930 SHA256 6eefa6476052f6920a6a7935c8899edb2ad111fc6790115b375a0a9896348284 SHA512 ef4d3c9838e4e151b16febdacb9fb3b3538763dfb0c08b43ad73a9d9ecbdb275d91152b64b400aec8e3d337f08f3aa46cc166251e34142a68514135d6ae314d4 WHIRLPOOL 3b7499d28fa8237420e3f63bff0542440d9ed011d41e50d79970303f81d90f1d206f67e1e117327eda77bdee2742147a3e931a7d4dc7a76dcb5e46510108bcf4
diff --git a/dev-python/fitsio/files/fitsio-0.9.11-test-failures.patch b/dev-python/fitsio/files/fitsio-0.9.11-test-failures.patch
new file mode 100644
index 000000000000..243913dc659e
--- /dev/null
+++ b/dev-python/fitsio/files/fitsio-0.9.11-test-failures.patch
@@ -0,0 +1,38 @@
+From: Ole Streicher <olebole@debian.org>
+Date: Fri, 15 Jul 2016 08:46:15 +0200
+Subject: Mark failures that are known to fail with the original cfitsio
+
+---
+ fitsio/test.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/fitsio/test.py b/fitsio/test.py
+index bafde15..49a4b3b 100644
+--- a/fitsio/test.py
++++ b/fitsio/test.py
+@@ -545,7 +545,7 @@ class TestReadWrite(unittest.TestCase):
+         try:
+             with fitsio.FITS(fname,'rw',clobber=True) as fits:
+                 # note i8 not supported for compressed!
+-                dtypes = ['u1','i1','u2','i2','u4','i4','f4','f8']
++                dtypes = ['u1','i1',     'i2','u4','i4','f4','f8']
+ 
+                 for dtype in dtypes:
+                     data = numpy.arange(5*20,dtype=dtype).reshape(5,20)
+@@ -569,7 +569,7 @@ class TestReadWrite(unittest.TestCase):
+         try:
+             with fitsio.FITS(fname,'rw',clobber=True) as fits:
+                 # note i8 not supported for compressed!
+-                dtypes = ['u1','i1','u2','i2','u4','i4','f4','f8']
++                dtypes = ['u1','i1',     'i2','u4','i4','f4','f8']
+ 
+                 for dtype in dtypes:
+                     data = numpy.arange(5*20,dtype=dtype).reshape(5,20)
+@@ -1365,6 +1365,7 @@ class TestReadWrite(unittest.TestCase):
+             if os.path.exists(fname):
+                 os.remove(fname)
+ 
++    @unittest.skip("bzip2 is not supported with debian cfitsio package")
+     def testBz2Read(self):
+         '''
+         Write a normal .fits file, run bzip2 on it, then read the bz2
diff --git a/dev-python/fitsio/fitsio-0.9.11.ebuild b/dev-python/fitsio/fitsio-0.9.11.ebuild
new file mode 100644
index 000000000000..cf3d78bf88dd
--- /dev/null
+++ b/dev-python/fitsio/fitsio-0.9.11.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 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="Python library to read from and write to FITS files"
+HOMEPAGE="https://github.com/esheldon/fitsio"
+SRC_URI="https://github.com/esheldon/fitsio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/numpy-1.11[${PYTHON_USEDEP}]
+	sci-libs/cfitsio:0=
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}"/${P}-test-failures.patch )
+
+python_prepare_all() {
+	sed -e '/self.use_system_fitsio/s/False/True/' \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	pushd "${TEST_DIR}"/ || die
+	${PYTHON} -c "import fitsio; exit(fitsio.test.test())" || die
+	popd > /dev/null || die
+}
diff --git a/dev-python/fitsio/metadata.xml b/dev-python/fitsio/metadata.xml
new file mode 100644
index 000000000000..b7f5bc4ce9ac
--- /dev/null
+++ b/dev-python/fitsio/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="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Fitsio provides an easy to use object-oriented API including
+    providing a Numpy interface to FITS files read from CFITSIO. It
+    allows direct access to the columns of a FITS binary table which can
+    be useful for reading large fits files. Compared to astropy.io.fits,
+    this package is closer to the underlying cfitsio library.
+    Fitsio also exposes a microlanguage (implemented in CFITSIO) for
+    making efficient SQL-like queries of tables (single tables only
+    though–no joins or anything like that).
+  </longdescription>
+  <upstream>
+    <remote-id type="github">esheldon/fitsio</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/fixtures/Manifest b/dev-python/fixtures/Manifest
new file mode 100644
index 000000000000..d3e83bb6215a
--- /dev/null
+++ b/dev-python/fixtures/Manifest
@@ -0,0 +1,7 @@
+DIST fixtures-1.4.0.tar.gz 50411 SHA256 3e1c61753d0fafc1429591d33ad6b828a0673a200eae63dd6ac0685479db5d36 SHA512 62e314821ea507ab5c1465fb626c29c91430b36ae4670fd05a3aa7180452989c393d35ab623da3646b25cf671a84861ab68d9529d04ae759c0d38efca7c7d8cf WHIRLPOOL ad2b0ebf50a01aad4ec6924511eb3d174ebf4ac11306ed2873896380456a20e3fc5b7d84791035cffdc77561664f09f04935ef73246554110df756d8213d469a
+DIST fixtures-3.0.0.tar.gz 56629 SHA256 fcf0d60234f1544da717a9738325812de1f42c2fa085e2d9252d8fff5712b2ef SHA512 e52ba864c42d15a8baa60583761006b2dd78e3cd5f3f043f5702346aef428b933d62e8fa5889b7cb4196e4072acc5df3b7ffa39702a1b782887bdc109299b695 WHIRLPOOL 93f92dc2da126cfd175ec44a783d94b57d0ecfb168887d5117fc723129ecf6dca04ce3aa7186ff9f1c6053b3b7615b1cd961c9d365fca44557fe43f29e87b19e
+EBUILD fixtures-1.4.0.ebuild 949 SHA256 3378a95e6f06dc67d43b03b29b78551d5be4efb091716f0e7ce8b9b86a4325ff SHA512 481967dfa1f4b684f207c6d6d7297cf0bc41c7fad304841e3bb469c75dc68e02f2ffd90f4a439e1050adb8a41b3330358539262026a177d7e380a765d4fbc954 WHIRLPOOL 1cfcf9fee5284d4d42d99c0c0346ed760305363ca8b5a1559e2fe82411cef6f48634c0d2f783045acb659195a2de04f120640400a98b5f0d5a01f64ff13fc19d
+EBUILD fixtures-3.0.0.ebuild 952 SHA256 c5318e32f40aeb95a64d0bd693821688f84ceced205ef2f42c2beae09739c285 SHA512 28ea049e38ec7d76f41f31671676891c6c60394994579730cd0a96ed353ee78e93232a5a5ffd3b4f430f923bebedd97e43850d2c1ae59146215a31c84767c248 WHIRLPOOL b4d9d2cc2442b8eb2b77abd527718fba59a8f5be9291763cd7480c2ad683f7476ec536a35df45d711fe553f97cc089b539df53d13f147aeadea4e084b658a4ec
+MISC ChangeLog 6713 SHA256 f10c3c22909bcfae66660cd127a45c86d9f8f28086052fa8273c6a4246146a0a SHA512 2246a36dbe4dc7767dece14b4dc0dcafdb0af94a4adcff9915cec99b6fbc96925376bbbe9c297bf64c6c90b44dd36a6ef30201245b8adb72c9d1f72ecf0132cf WHIRLPOOL f68af54d10877e31f7a943c978de1e2495769d862c69630016e78f44b870536021f28eceddb4dc93d2554de6322d5076cdd9055e753244146b9daf82ea90bc0f
+MISC ChangeLog-2015 4784 SHA256 a92afb0c4e4eee8e93317d6c7114995740b721fd48aa02444e0becc306325a44 SHA512 8d061fbff8a35dac357c35c8a67d599f6052ca881545f10e86caab7482813036273d43de7e55401bbf61dd0504b8efffea01d1ba1e16340dd5c7f5d0ff393dba WHIRLPOOL c76493c176d268727e327cdfa7cabdbd0d191ce19c911288f506b60990af7d56f17f00d11ed8e32856baad0ad3945dd93780b29712ab1b5c41b65ab8e50c95a7
+MISC metadata.xml 889 SHA256 93a9481a0675ead8a9564e44e7cea128050e8c430b86d4563065028680f7960a SHA512 8887064dea4084b58983b19ff033b543fddaab24ee29e6b52dc4cde0941eac612fd5c7054bda842d69b900555e308f0b9bea388ee2af3ffb3eb04cf8f76a4232 WHIRLPOOL 24b1135ca652177da2323f57895955929341cda3aa38965613582af47668c4f968cc7b191f3b9d99f7d836ffbef8d71da9adab47631434e0004cea6d77930146
diff --git a/dev-python/fixtures/fixtures-1.4.0.ebuild b/dev-python/fixtures/fixtures-1.4.0.ebuild
new file mode 100644
index 000000000000..7fa418f9b964
--- /dev/null
+++ b/dev-python/fixtures/fixtures-1.4.0.ebuild
@@ -0,0 +1,31 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fixtures, reusable state for writing clean tests and more"
+HOMEPAGE="https://launchpad.net/python-fixtures https://pypi.python.org/pypi/fixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# nose not listed but provides coverage output of tests
+# run of test files by python lacks any output except on fail
+RDEPEND="
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/testtools-0.9.22[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+#DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	emake check
+}
diff --git a/dev-python/fixtures/fixtures-3.0.0.ebuild b/dev-python/fixtures/fixtures-3.0.0.ebuild
new file mode 100644
index 000000000000..2a20a161e889
--- /dev/null
+++ b/dev-python/fixtures/fixtures-3.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fixtures, reusable state for writing clean tests and more"
+HOMEPAGE="https://launchpad.net/python-fixtures https://pypi.python.org/pypi/fixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# nose not listed but provides coverage output of tests
+# run of test files by python lacks any output except on fail
+RDEPEND="
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/testtools-0.9.22[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+#DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	emake check
+}
diff --git a/dev-python/fixtures/metadata.xml b/dev-python/fixtures/metadata.xml
new file mode 100644
index 000000000000..b92d628502f3
--- /dev/null
+++ b/dev-python/fixtures/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Fixtures defines a Python contract for reusable state / support logic,
+	primarily for unit testing. Helper and adaption logic is included to make
+	it easy to write your own fixtures using the fixtures contract. Glue code
+	is provided that makes using fixtures that meet the Fixtures contract in
+	unittest compatible test cases easy and straight forward.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">fixtures</remote-id>
+		<remote-id type="launchpad">python-fixtures</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flake8-polyfill/Manifest b/dev-python/flake8-polyfill/Manifest
new file mode 100644
index 000000000000..8936b376aad0
--- /dev/null
+++ b/dev-python/flake8-polyfill/Manifest
@@ -0,0 +1,4 @@
+DIST flake8-polyfill-1.0.1.tar.gz 8094 SHA256 c77056b1e2cfce7b39d7634370062baf02438962a7d176ea717627b83b17f609 SHA512 cdb1530c004015fc44007eb4efb5a84b2ff6f22bf75b3a33ada0c0e80eca5e137a2504baea11ae186018ff7617c8935bc14c36703c17c533a27abc81f9856883 WHIRLPOOL f9e3b2938d4683cccf13885a40348c7d5e8dbcb3e5808edbebc8538b28b573e399009f12317c926adccdbb2ab78fc7adc07ea495935b03f0454a33974a5cc97b
+EBUILD flake8-polyfill-1.0.1.ebuild 721 SHA256 8361cd10e0293152c983e1d4484e51277f402575c2c147b9fcb79c9dd091bfcb SHA512 fa7242a9da9c47a6288fc2342d9850dffda0c45c8748c59f46d08988b21a1082c180c4f82799410d11e0853fd7a1d0fa2238a4c3e6e2a5861d2d4f393bdb90dc WHIRLPOOL a543aa2fb8932c68eab1fbaf1750b19a1671d466710d2805df2c21223d9552f9ff69f8b6d99845322993c3a5b85b4c89ad99f71a9fdb4ccb6722742035afa3d0
+MISC ChangeLog 336 SHA256 435dd50e313d14b068ebf726db120af50b901f69c7401ae2024735430ecb1c10 SHA512 3f837dc88bbc625f9eeaf834988464fc793dfc0e5a0ea5b9957c07e6842d41c34245068629a77eafe5593b9aa8bc9f07493c98eb6e46d1092201b2b4f0165092 WHIRLPOOL 4f168d7add4faac6f47855d623a7f1a44fdf609e98b8bd3731b19cccda4cf90de615f3a914d1da7a4318aa77dccc6a0a1dc5852a6c451a9aa4465ec38d677955
+MISC metadata.xml 403 SHA256 dfc632480f9a5cffbb892d74beaa178fde3632cfcf165269ba7b1a328d483c11 SHA512 c75c5e09521f7f8c98806f04832d838e8cafeead79aef8c0aafbecd6da9dfb37f654cc759c25afe874f72deb9e96597574a02a3c8518f20ed98bd9c4ad36fcdf WHIRLPOOL 138790976a51469450174ddc79dcbabc82b154fd1db687d5b957ebc73ca4879f120eb42f6cc681d376def18dce155f94b6134c1e8a54bb10aebf97d067a4327a
diff --git a/dev-python/flake8-polyfill/flake8-polyfill-1.0.1.ebuild b/dev-python/flake8-polyfill/flake8-polyfill-1.0.1.ebuild
new file mode 100644
index 000000000000..ce45dac7f78a
--- /dev/null
+++ b/dev-python/flake8-polyfill/flake8-polyfill-1.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="Polyfill package for Flake8 plugins"
+HOMEPAGE="https://gitlab.com/pycqa/flake8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+EGIT_REPO_URI="https://gitlab.com/pycqa/flake8-polyfill.git"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/flake8-polyfill/metadata.xml b/dev-python/flake8-polyfill/metadata.xml
new file mode 100644
index 000000000000..8f3fcce9a54b
--- /dev/null
+++ b/dev-python/flake8-polyfill/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">flake8-polyfill</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
new file mode 100644
index 000000000000..a81ec68cfb7b
--- /dev/null
+++ b/dev-python/flake8/Manifest
@@ -0,0 +1,15 @@
+DIST flake8-2.0.tar.gz 10511 SHA256 8dce4f7e64cc202cc6da93eab84b2ce660110ff684b6738bba64a0a431b3bc69 SHA512 6e3d8030562c4489dce8d4b17464ea8c0239b7c28fcefb7c67bff645e18628bc3074ff0ff197ab54228544d0ff85c2ff9509502c8f98371d8dc5df6f1e3ec047 WHIRLPOOL 46dabf0120b97cf20b58d76745dd0c23aec69f4eeb25b8605944c7ca4f8a05580c6c9df3ce7ec4e507f2402ddb53da2a6730cf6b246eec8472562ec33fcbb9e2
+DIST flake8-2.1.0.tar.gz 25010 SHA256 098ab7991067c08cfaa4716de20066d90f66dbc71502114ea8cad9a9fd5c9512 SHA512 bf961d76ed08dafe7c2a9b767594577a57a2276166e515f1d84654223aa50879c5ee1e20919b3a4c7576c7d549037c8cfe67c11ab1f6648a0205200f5060950b WHIRLPOOL 48982d33cd32f557796ef103da441f46d3a6ddbf1d1cace66f3ceac8b31bf78389c72df4a717881fe3735f6301b8ce0831908d32010f94ce72fc5414404261d4
+DIST flake8-2.2.5.tar.gz 28333 SHA256 285e8bd730c0b6fdfbe23c32d2936bffba401f23cab132e8722c68be80d6f182 SHA512 fe5e06d3a7699e3f348181108f1ab3ee9eb1f2b0422de582a172d3a4aed42a5cf839ef8a5b5b113da1e0c3c2b53ed7b43af1ca24314ea842d0d3d3735eba1dee WHIRLPOOL 6c1e737a760876d410fd116bf2b8104f932b6751b5970096ddadcead5937fba21772fb28c1addf8026eda5ec573eb07cd920e46fb711d79f46de559d229c8705
+DIST flake8-2.5.4.tar.gz 81663 SHA256 cc1e58179f6cf10524c7bfdd378f5536d0a61497688517791639a5ecc867492f SHA512 31cbec556fc41361ac464d2547275e319ab663c907a4a8644113a2288a9f349bcfbec85197b6dfa13a7db9e82419f01e0f2abc84a347e133c144ea137e0daa28 WHIRLPOOL 2547b78092b1a85edd2a0d03d9e0bc31e7d3b7cb3958cf5dea9947377851a69d5c37f64c0d65a5d7e88ab9573597729adbe07ae758b0510e455b26bf62292f47
+DIST flake8-3.3.0.tar.gz 134345 SHA256 b907a26dcf5580753d8f80f1be0ec1d5c45b719f7bac441120793d1a70b03f12 SHA512 53b3116765f9031c96a0442954f324fe3edaf63aff21f7cf340e47e724250928d6d9786473d2680b695969ef979a8bb6d4d2b39f1598b075dcace1b221a4c099 WHIRLPOOL 1a0f7e228cbfdde18957c43377fd5c07a280628ca75138e76ec295e5567c153e454543e534496ec9217e7ca0389208ae143c3396ca3798b65b0f2ce1d72bd68b
+DIST flake8-3.4.1.tar.gz 137066 SHA256 c20044779ff848f67f89c56a0e4624c04298cd476e25253ac0c36f910a1a11d8 SHA512 42df8fa0cf6f4bb4f3e52143028dee14d51a645aef19a0bab05000fef577e5bea3cc29f961acb0c98d92b76e635fdd2f0d689e23663a6c14d435d0410be94c87 WHIRLPOOL 95be7a58b817d4a7b112104b6f561d3fd30837be6430582856aca6c56d3aff247ec2ae3f3dfc05e29c4ae5b4f0ef0a24a778b30e7813b90234c37c6956970a05
+EBUILD flake8-2.0-r1.ebuild 711 SHA256 1a772d529b67099c41711788860a3aa2f126b746f3fd599fef5ef8beae6da92e SHA512 61c3050c3dae972cef22d5fd5a5350614eda2316c8b4fd6ddcc2f6f869430decd9dd938aa63067934bc07d21275a0e3d83e91a77e476f66d7ace8b66539d8b41 WHIRLPOOL c3f15f876384d9f20c1ebec51ac0689e4bf5450be8b289596260e8a3c047258ccec57351a201d99f87def6093b5ca90098beb5ac73cb2c7d6e4d11104a456fb3
+EBUILD flake8-2.1.0.ebuild 1073 SHA256 215ddb4fae266bd401e395a18f0885d5968c3e61ead91f0ca3dfee60361382f7 SHA512 0f7cd9b30bf9b095506af3796ce2927d2b14572a9f42e34021a205c090388ef08a6ce091aaabd19441b32e18c0d43c94cc1fd274f80e104c465d1bde88b46f1a WHIRLPOOL 280a9b18a7a6899979fc0128a70d16d7ec11fdb9053e6fe5cd74ea2e74d50e725b077609fa651c5030ade0e887291d891ae4209a56469177eeb229dc0500d816
+EBUILD flake8-2.2.5.ebuild 1102 SHA256 48038fc8a22b7f81f7059c3e5f811083c7a09d791e8ac9f267f96a20cde59f80 SHA512 0cae93c37085868960eeca63c005c2c8d0d191e3deef5e223f130c2f9ed6712002815fb4da27b239f47f41fed37d82f4172e4b31842b75aa7f00666e5176c415 WHIRLPOOL 15baac98c35ab6afbf9a15e83beb706c23b0e87a52361df8120e412fb46c989f54003747e8903f6dda75d59273af69f86e84095ae5d5ee6e0cc1706c6880e599
+EBUILD flake8-2.5.4.ebuild 1608 SHA256 29b532b1ec872a8d7d97df3b4cdb5cf30ab283082e5d7def269afc273f058297 SHA512 55f6fd53f6d4525af92cdd5bde0f6baa634f4c607583e2c9b89074964ff31a71923502d0e661c6b280d34708e1fcd2edf2474edfe894211507fe54dbb1e526d6 WHIRLPOOL 2e96562f2aaf637227c349e7ffc9ee5279cd76384100eeb6cfef416ae230718d9cf3967d0fd700f877e22b8436d70b02df181921bac8f002f7023d4b3117e1b8
+EBUILD flake8-3.3.0.ebuild 1947 SHA256 1332fcb9d66b33bca4b9869dcd6fb6d7d9c3fc296009032e142b60159b6e8008 SHA512 a3d3062f8f17a71731f5447e9cfc449e9bca98748c3e9ffa5465a5258d9dd50942484210517370ad491a9a06f8e18578d393e48487de30eb91ea262ddc95fe96 WHIRLPOOL 0c188d207ad6db2f698da24c621221b6d5b790bc6f8c4875e741afc7a38ffac53079ccf9bdbbc1aad146061aa27a2c99560fb194da9c73b804ee24dd76e3b4cb
+EBUILD flake8-3.4.1.ebuild 1625 SHA256 fbe06de5be1cddcfa480644259639febeeb8f66f0074bec5f1d49a3edb4c8ee5 SHA512 8be0c1209cc063f5350e193940e52fd0aaf10d02e505fbca281d9b333e0cace571ab3a72a6ceedf449dfbc7742ce960c52ac94b706def15a13b874322c81386b WHIRLPOOL 61e1b087bc0376c88e9c6d3944fc6bab5113422b39f879bc32bd0ad48ee11c4185d6883c83fc25a73832108217a7cc1b7e2a7cc5ca0114ea95c331a938bfbe43
+MISC ChangeLog 7292 SHA256 19412e55ac37afaec863a073d332b4b84d59ccf1c35ba3198db9e4f722c2d519 SHA512 a16d2bfea0f6249d73097daa72fd9d1c56b11f52643c1aee9cdc27b376c01e14b55171673914b4ce17129f72cb5abfc78627ab72ed03e7b1e5abe8e28f1234a8 WHIRLPOOL 37b3786fbbc6536c345c75e62114449ae8dbe1f0d6c4c95a1ce1bb57c66c047818ca383fee41d68cddf4d4f07032c6e65c4e1895580e834649d3984e08067afe
+MISC ChangeLog-2015 5001 SHA256 f5ab1ff406184950cc3b39b983e11aeaf9f29c1c4b6b6cee6e80c718c5a0faef SHA512 fbb10ed85bec45fb629e0a9039e5dd24cfaadd5f65eacc4760572e9c2f07933807024b41f78e2773aa3b8f6351924a3d64e3c5170a31aec3ffdaadcfea981b90 WHIRLPOOL 394ad6662ee92de0c4f4a4f8dc6fd2309fb1efd7818e06094acd31a54ee4b0410f5c62be0b7eb8657cbd98fdb8992141c5fcab08877a0ce6d39abc850760aed7
+MISC metadata.xml 373 SHA256 c1ed6f124fb019319d592ff2518e3d745e7809d49174a83f4a0a482409ea3cb3 SHA512 449aa40152590e7103a4bf10006a33e6a0d5010a7846b0c5fbee8a78d99a3539995eccf441845c205bf48fc1e9b35cd7b1d6af0d98b469bdd06989baf8b88646 WHIRLPOOL b17df39fbe00cbabfaf6a9dfbb1ae4084a64ec8c930a7d1983be1f4a075baf7b66b9137a4187def5d1a052d05c161844daaa7a2876d1dba8ee41779b643e86f5
diff --git a/dev-python/flake8/flake8-2.0-r1.ebuild b/dev-python/flake8/flake8-2.0-r1.ebuild
new file mode 100644
index 000000000000..c3a7edb13019
--- /dev/null
+++ b/dev-python/flake8/flake8-2.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="the modular source code checker: pep8, pyflakes and co"
+HOMEPAGE="https://bitbucket.org/tarek/flake8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	>=dev-python/pyflakes-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pep8-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.2[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/flake8/flake8-2.1.0.ebuild b/dev-python/flake8/flake8-2.1.0.ebuild
new file mode 100644
index 000000000000..f526a8773e6d
--- /dev/null
+++ b/dev-python/flake8/flake8-2.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="https://bitbucket.org/tarek/flake8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+LICENSE="MIT"
+SLOT="0"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND=">=dev-python/pyflakes-0.7.3[${PYTHON_USEDEP}]
+	>=dev-python/pep8-1.4.6[${PYTHON_USEDEP}]"
+PDEPEND=">=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${PDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# This tests requires / assumes this version is already installed.
+	sed -e 's:test_register_extensions:_&:' -i flake8/tests/test_engine.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/flake8/flake8-2.2.5.ebuild b/dev-python/flake8/flake8-2.2.5.ebuild
new file mode 100644
index 000000000000..813b9c427bb6
--- /dev/null
+++ b/dev-python/flake8/flake8-2.2.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+LICENSE="MIT"
+SLOT="0"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND=">=dev-python/pyflakes-0.7.3[${PYTHON_USEDEP}]
+	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]"
+PDEPEND=">=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${PDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# This tests requires / assumes this version is already installed.
+	sed -e 's:test_register_extensions:_&:' -i flake8/tests/test_engine.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/flake8/flake8-2.5.4.ebuild b/dev-python/flake8/flake8-2.5.4.ebuild
new file mode 100644
index 000000000000..e1546bdff4c6
--- /dev/null
+++ b/dev-python/flake8/flake8-2.5.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+LICENSE="MIT"
+SLOT="0"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND="
+	>=dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-1.1[${PYTHON_USEDEP}]
+	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
+	!=dev-python/pep8-1.6.1[${PYTHON_USEDEP}]
+	!=dev-python/pep8-1.6.2[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${PDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
+	        <dev-python/mccabe-0.5[${PYTHON_USEDEP}]
+	)"
+PDEPEND="
+	>=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.5[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# This tests requires / assumes this version is already installed.
+	sed -e 's:test_register_extensions:_&:' -i flake8/tests/test_engine.py || die
+
+	# Gentoo has flake8 support restored in >=pep8-1.6.2-r1.
+	sed -e 's:, != 1.6.2::' -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/flake8/flake8-3.3.0.ebuild b/dev-python/flake8/flake8-3.3.0.ebuild
new file mode 100644
index 000000000000..85c2214274f8
--- /dev/null
+++ b/dev-python/flake8/flake8-3.3.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.python.org/pypi/flake8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+IUSE="test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+LICENSE="MIT"
+SLOT="0"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' 'pypy*' )
+	>=dev-python/pyflakes-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/pyflakes-1.2.0
+	!~dev-python/pyflakes-1.2.1
+	!~dev-python/pyflakes-1.2.2
+	>=dev-python/pycodestyle-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 'python2*' pypy )
+	"
+PDEPEND="
+	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${PDEPEND}
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		|| (
+			>dev-python/pytest-3.0.5[${PYTHON_USEDEP}]
+			<dev-python/pytest-3.0.5[${PYTHON_USEDEP}]
+		)
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Gentoo has flake8 support restored in >=pep8-1.6.2-r1.
+	sed -i -e 's:, != 1.6.2::' setup.py || die
+	# Flake8 falsely assumes it needs pytest-runner unconditionally and will
+	# try to install it, causing sandbox violations.
+	sed -i -e "/setup_requires=\['pytest-runner'\],/d" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pytest || die "tests failed"
+}
diff --git a/dev-python/flake8/flake8-3.4.1.ebuild b/dev-python/flake8/flake8-3.4.1.ebuild
new file mode 100644
index 000000000000..f3111cc499fd
--- /dev/null
+++ b/dev-python/flake8/flake8-3.4.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.python.org/pypi/flake8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND="
+	>=dev-python/pyflakes-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' 'pypy*' )
+	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 'python2*' pypy )
+"
+PDEPEND="
+	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${PDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Flake8 falsely assumes it needs pytest-runner unconditionally and will
+	# try to install it, causing sandbox violations.
+	sed -i -e "/setup_requires=\['pytest-runner'\],/d" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/flake8/metadata.xml b/dev-python/flake8/metadata.xml
new file mode 100644
index 000000000000..ef6942e1e79d
--- /dev/null
+++ b/dev-python/flake8/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">flake8</remote-id>
+    <remote-id type="gitlab">pycqa/flake8</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/flaky/Manifest b/dev-python/flaky/Manifest
new file mode 100644
index 000000000000..7f057e1e59f0
--- /dev/null
+++ b/dev-python/flaky/Manifest
@@ -0,0 +1,6 @@
+DIST flaky-3.1.1.tar.gz 29136 SHA256 d50eb4034d5fc1bbe043f2c9a364024f436ebdcadc03e89f091a332407b7cf7e SHA512 039ad115a52b8b3a31bba045874e1860f1e04ea9cf878316226fb22af3c715b3893570c2f7380cf8467107f1a83a4ff69d0e9135daeb2dbea4b8f873a192815c WHIRLPOOL 6fb841fe6aaf575a776ac1ebba262e1272fa194c517cdc1e8db125bdc339d67e23dbd7f8f3f3469741e50863bf564c93eb921e4e621e8f54ec815cdde9148712
+DIST flaky-3.4.0.tar.gz 29197 SHA256 4ad7880aef8c35a34ddb394d4fa33047765bca1e3d67d182bf6eba9c8eabf3a2 SHA512 14fda6312e4eb8260a8190204622a7dd274d0c946dda07ec8aa65e8c341f7f4a701c704c807f50eacf77589231b37c3bb06eec18d60a718f24e9b0182f7e8cb5 WHIRLPOOL b7e5501301bfa47398ab134625d482d3f3f0e38401df932fc234181204f7144fe34d0ef580a94ff6387e44dcef9d43cc82fc3887b059cd8f08fdc5523207b7e3
+EBUILD flaky-3.1.1.ebuild 1392 SHA256 3698ca10de1af11a5ba116325a02dd70c5238e251982d87d59d40333284a0085 SHA512 1ab7b7ea367bfe7ed15698cbe97ceb18c15b88fdcb097e28c3bcd770ec8b57564f36ab29e10eecf253983d532fffa06147edd52e438920fd09399a3516f83cac WHIRLPOOL d43a6ad93fabc15d887e6b09a8dc7593e7fea5f3c2258f3c19d2ab2bba2242fd968aa54a967cb8d5d18a3f33a62a84e8b1cf87af3d6a3aa6b39585c4898c3d58
+EBUILD flaky-3.4.0.ebuild 1401 SHA256 2f12102f3f0a66bcfd0d021695330e91969341ce7d000e350e6667b96144ac8a SHA512 4f973efe6f73fe8f19f857419fedc2bd5fe5d39ac8b62f52cea0dcfaff9cfdad861c2aaa6dda31f3b699df1572d3a611082d0e8603c8ec52729f9d863098005f WHIRLPOOL 8d0ef7cf8968b3a70c758648a55a96a786618a9435246955310405688a3c6d5dfa806cbc046e448b370366a653d8b870eeebc28d3fea3af5aa309cfa565b2e2e
+MISC ChangeLog 3280 SHA256 d4c6bfc1fb9ae5954daa25539745650f55f262880b1ce3968ffd1ee5514884bd SHA512 082a89da50b0263ecf784bea816849380f5be8e2b601164e9b5cd4795fb333c6eb863bc9c0dda4b107b338590ad9f3326bf74e01ae05a13d344649fb1b63acf6 WHIRLPOOL 669c67f250533df7ace43a2014e105065b0d7a2acd5a84ed5502e720293c2aebf2624f8664b46668890a9a30162e60cf8160b22cdbef8dd7bb8d90a248b657f4
+MISC metadata.xml 369 SHA256 0cacaa478bb88bcc9fcc72fffa77813fef4e26f213fd8926a48fe0df45f65518 SHA512 da1597d14b2e3f9bc56e48064718a2a52bc1615d982d679d8c971f1fb1b9c25169d5412f99542f808fa42f958e1bb589e7615a13077a7d1b0574acbec1d4b1dd WHIRLPOOL d1e423e0c187c075d5cb71f38cb1e82af590f1284bc0e840de238352fb74363a4edd71efdc7e287ba13d1d5917af279fc82b8a6809163497ae6a2d1d749c2929
diff --git a/dev-python/flaky/flaky-3.1.1.ebuild b/dev-python/flaky/flaky-3.1.1.ebuild
new file mode 100644
index 000000000000..28da53e5255d
--- /dev/null
+++ b/dev-python/flaky/flaky-3.1.1.ebuild
@@ -0,0 +1,45 @@
+# 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="Plugin for nose or py.test that automatically reruns flaky tests"
+HOMEPAGE="https://pypi.python.org/pypi/flaky https://github.com/box/flaky"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/genty[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+python_prepare_all() {
+	cat >> test/__init__.py <<- EOF
+	# coding: utf-8
+
+	from __future__ import unicode_literals
+	EOF
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --with-flaky --exclude="test_nose_options_example" test/test_nose/ || die
+	py.test -k 'example and not options' --doctest-modules test/test_pytest/ || die
+	py.test -p no:flaky test/test_pytest/test_flaky_pytest_plugin.py || die
+	nosetests --with-flaky --force-flaky --max-runs 2 test/test_nose/test_nose_options_example.py || die
+	py.test --force-flaky --max-runs 2  test/test_pytest/test_pytest_options_example.py || die
+}
diff --git a/dev-python/flaky/flaky-3.4.0.ebuild b/dev-python/flaky/flaky-3.4.0.ebuild
new file mode 100644
index 000000000000..9f67738122dc
--- /dev/null
+++ b/dev-python/flaky/flaky-3.4.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Plugin for nose or py.test that automatically reruns flaky tests"
+HOMEPAGE="https://pypi.python.org/pypi/flaky https://github.com/box/flaky"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/genty[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+python_prepare_all() {
+	cat >> test/__init__.py <<- EOF
+	# coding: utf-8
+
+	from __future__ import unicode_literals
+	EOF
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --with-flaky --exclude="test_nose_options_example" test/test_nose/ || die
+	py.test -k 'example and not options' --doctest-modules test/test_pytest/ || die
+	py.test -p no:flaky test/test_pytest/test_flaky_pytest_plugin.py || die
+	nosetests --with-flaky --force-flaky --max-runs 2 test/test_nose/test_nose_options_example.py || die
+	py.test --force-flaky --max-runs 2  test/test_pytest/test_pytest_options_example.py || die
+}
diff --git a/dev-python/flaky/metadata.xml b/dev-python/flaky/metadata.xml
new file mode 100644
index 000000000000..8487b6711c9e
--- /dev/null
+++ b/dev-python/flaky/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">box/flaky</remote-id>
+    <remote-id type="pypi">flaky</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-admin/Manifest b/dev-python/flask-admin/Manifest
new file mode 100644
index 000000000000..4a6f7a1d53a0
--- /dev/null
+++ b/dev-python/flask-admin/Manifest
@@ -0,0 +1,9 @@
+DIST Flask-Admin-1.0.6.tar.gz 235842 SHA256 c16d1bb1b6c2b6ac8db8486b9a5e1919d1a073252e3fb0c0c226406470113a54 SHA512 a30e2678a063d45d55ccf41cfec07fd16973cc8c770b1e7f16d11b9aba693049b1d9d4cff81d8ae8f2548d019f977f0906728e98d23d229d76bf135a079abc8f WHIRLPOOL 9851b8f7e59c5b7bf99e2e58a0ad72076578f12564146a282b9e3e0e79bd31bec7a1fd394dc807b8152165fce617c6a7b025cfaa987680a649412a3d1c3f8e8c
+DIST Flask-Admin-1.4.2.tar.gz 922579 SHA256 7d1cfdcb29a7135d4275dc22628c0f068cccfdb84dadad885bde685d0511597c SHA512 e736d5f6d05c886ac8bd96b7524d6bc7af956fd9d2f183d1c0872ea346301d67c5b634589b94b1de3be9fd5f1595ad95505b68d80adc613520259380bb9b0be5 WHIRLPOOL 25b20415ebb3286f59f496d4d443d560e2036b1f9521de9143e97821db5929d3b17be1bcd8cd878cc12e4c232781df4a57540e19655ea1567a6adb4bb8cad812
+DIST Flask-Admin-1.5.0.tar.gz 1598074 SHA256 fe3a96d99f22e293cd7e83d364de6cffd36573ef25db93d6e32102527a624bc5 SHA512 dbf5b97f27228eb000fd1298f4da8d4824196856e4ba9e2d8cbae6e562794ec2d1a998b382efaa84ec4fd7a74ae589a739c52e117efebfb171f19bc16e7350e7 WHIRLPOOL 875c1db6527ecb3e1526a72594c017cb999d3cce9a0737d7947726b01511d5ba790e21183aab16d54977f741dd1b51338d2daa393026d2ec3bf37336861f7d7a
+EBUILD flask-admin-1.0.6.ebuild 1187 SHA256 eefa4c54dabf1451d78ff03bd712018fdbc854d797cd0a73b378ede59b7a1b8e SHA512 ca3866cdd8fd63b475ad4a3f0c8d7ddf93c68d085b1904ba4dac74fa55686d4aec3b08ed8bb990e73dcfafb9562d76113e08d41c4e1b60560a4292311fd81aa4 WHIRLPOOL 2678f13573efc93742ffe7e6e2e4b80ceb3ab431b29935f29f909a6459fa3e8c705c9d1c1aeefd972afa91f8cbaf5d0947ab92410c55cdecd724a6e2729c9dd2
+EBUILD flask-admin-1.4.2-r1.ebuild 1558 SHA256 578ea41d46f2717d2a3ab0b3d26c998464760f586302283f6f0a47ad78a34a1c SHA512 645a3b3ef6fa977551d7773a485d68ab3fd759a1e18140086bf716f94f4d9e2497e624589555c031702e50732d43b2c77af3b1156f0b0c7ef0309868c89b2934 WHIRLPOOL be96bbb9b6abe71b0bcd2a8f138b8141c8e144e32edffa424070538040874a70255fea1491694dec7ddbf788fa0541c57810e656725dd46b20a8f183f8c6df2a
+EBUILD flask-admin-1.5.0.ebuild 1558 SHA256 8eb171cafeff62079b24646cdb45f8d3b11e644c9e989e3ee7aff81d3312bcd3 SHA512 14dc8424ec849007b2adca10d31faf35b013aeff6876ec35b2bcdc2e72429cbf4092b54764e67bbfe7f251579c2c2f1074341e671e767434942914bf976e7abe WHIRLPOOL 5757fb9be279a083a882e0f58888b1aa79addc9e9572e8e5330786147980334c96f8b6bd47871f48aa0c9ac86f7c5f621f7039dd162f2050ddc21c4f8324202d
+MISC ChangeLog 3259 SHA256 6579aaa1cee4aec7952349ffcf292739295840fb404b21c07544641eab52bec4 SHA512 6c67d900ac784c936e92ec0f6c04b6f9b5e3ce3c807f041533c7f7be7fa970bb040a43ebcdd852e49ca6347286521c19edb6f527739b52633540a86509ab0979 WHIRLPOOL 2ebf96d18761536c7cf5ea22e44a06904ab49925d60f72eef4d9ee94878eb4a6183b0f0d1411cb115a8b74d269dcaf79bffc8daf719a4ed6099c2ae4637911d7
+MISC ChangeLog-2015 1258 SHA256 8c4ed82aa60fb011fd2d64bea1364b5b82c49bd6789b22dd4930470e9acc36f3 SHA512 ae1a44ea1bdc17c3eb9902f349eb98504131b444d91f80eb7d343db52a09f3a6188e074d12551463e205e9d281daa9138d941e677a3bd7da542a15ed6453fc44 WHIRLPOOL fd711730600b5e637153f709127f75fc8a9da7760438c40cf9a8ec44b48e560548ca77f585ded4b70b3c3e4ff1459044d4cbefddf10f2e440fc7bbf3f640ccdc
+MISC metadata.xml 324 SHA256 b1a7662375ce6c78e5b74214ca99d19ded75810fc44ab0e6865d650a57b23149 SHA512 02944086c5f7fbcc10241e5596db8caef60c142ddfcc28627c9e7bbe9b472663fc6be2f6234d0205233c7ab5e51b9a4a1c4f7f08256daf1314ae3f0274469ff8 WHIRLPOOL 6e48bafcaffa4b9c4bb716b6c054374f4380b37fadb0c32e5f7550b241d100b32fac7a939f192174b93d5b46a07fb492e9d1e30c226007146350eb4844bc358b
diff --git a/dev-python/flask-admin/flask-admin-1.0.6.ebuild b/dev-python/flask-admin/flask-admin-1.0.6.ebuild
new file mode 100644
index 000000000000..04b1b866af98
--- /dev/null
+++ b/dev-python/flask-admin/flask-admin-1.0.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+#RESTRICT="test" # we're still missing some of the dependencies
+
+MY_PN="Flask-Admin"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple and extensible admin interface framework for Flask"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-Admin"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/flask-wtf[${PYTHON_USEDEP}]
+		dev-python/flask-pymongo[${PYTHON_USEDEP}]
+		dev-python/flask-peewee[${PYTHON_USEDEP}]
+		dev-python/flask-mongoengine[${PYTHON_USEDEP}]
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed \
+		-e 's:find_packages():find_packages(exclude=["*.examples", "*.examples.*", "examples.*", "examples"]):g' \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-admin/flask-admin-1.4.2-r1.ebuild b/dev-python/flask-admin/flask-admin-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..4448c1c4616d
--- /dev/null
+++ b/dev-python/flask-admin/flask-admin-1.4.2-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+#RESTRICT="test" # we're still missing some of the dependencies
+
+MY_PN="Flask-Admin"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple and extensible admin interface framework for Flask"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-Admin"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND="
+	>=dev-python/flask-0.7[${PYTHON_USEDEP}]
+	dev-python/wtforms[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/flask-wtf[${PYTHON_USEDEP}]
+		dev-python/peewee[${PYTHON_USEDEP}]
+		dev-python/wtf-peewee[${PYTHON_USEDEP}]
+		dev-python/flask-pymongo[${PYTHON_USEDEP}]
+		dev-python/flask-mongoengine[${PYTHON_USEDEP}]
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/flask-babelex[${PYTHON_USEDEP}]
+		sci-libs/Shapely[${PYTHON_USEDEP}]
+		dev-python/geoalchemy2[${PYTHON_USEDEP}]
+		>=dev-python/pillow-2.9[${PYTHON_USEDEP},jpeg]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed \
+		-e 's:find_packages():find_packages(exclude=["*.examples", "*.examples.*", "examples.*", "examples"]):g' \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-admin/flask-admin-1.5.0.ebuild b/dev-python/flask-admin/flask-admin-1.5.0.ebuild
new file mode 100644
index 000000000000..7cbd867bf944
--- /dev/null
+++ b/dev-python/flask-admin/flask-admin-1.5.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+#RESTRICT="test" # we're still missing some of the dependencies
+
+MY_PN="Flask-Admin"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple and extensible admin interface framework for Flask"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-Admin"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND="
+	>=dev-python/flask-0.7[${PYTHON_USEDEP}]
+	dev-python/wtforms[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/flask-wtf[${PYTHON_USEDEP}]
+		dev-python/peewee[${PYTHON_USEDEP}]
+		dev-python/wtf-peewee[${PYTHON_USEDEP}]
+		dev-python/flask-pymongo[${PYTHON_USEDEP}]
+		dev-python/flask-mongoengine[${PYTHON_USEDEP}]
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/flask-babelex[${PYTHON_USEDEP}]
+		sci-libs/Shapely[${PYTHON_USEDEP}]
+		dev-python/geoalchemy2[${PYTHON_USEDEP}]
+		>=dev-python/pillow-2.9[${PYTHON_USEDEP},jpeg]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed \
+		-e 's:find_packages():find_packages(exclude=["*.examples", "*.examples.*", "examples.*", "examples"]):g' \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-admin/metadata.xml b/dev-python/flask-admin/metadata.xml
new file mode 100644
index 000000000000..282f7b064249
--- /dev/null
+++ b/dev-python/flask-admin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Flask-Admin</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-appconfig/Manifest b/dev-python/flask-appconfig/Manifest
new file mode 100644
index 000000000000..5f7bd8ceca50
--- /dev/null
+++ b/dev-python/flask-appconfig/Manifest
@@ -0,0 +1,5 @@
+DIST flask-appconfig-0.11.1.tar.gz 14545 SHA256 9869a752692e56f35ed3b017ea0e5b1d4b918a23bac8bc98a9e41ab54f5a9902 SHA512 9ebc42be5ef247b1f14b85f7b65600a1595ecdc70e792c0cd495347254b07675a3b7a306df8d2f2663626ceafa4ce7700f6f26cd0f1bcd974ba6bbab293847ee WHIRLPOOL f59662f9e7ace02e1e8dfc1a0a99b40c0cc5a353782d925d71e528fecc73ffbcea2891f99c3a1d20900f5b4f4064be9981f04ec20519aa74e2f872e8167b7da3
+EBUILD flask-appconfig-0.11.1-r1.ebuild 1293 SHA256 76402d5c8f3c584042b1b78b93d690ad85906b2e5698548415cf9e846dae50df SHA512 834c004413be8a0a5148aaf7b4d31a46ec1dbe77d828127bb57243301c735fb4699571cbfeb222770abf970f124bb2fbf7c60d973c989131bfe4f1238bdb9571 WHIRLPOOL 7502d22bc3be4682b4fbf6673b15f24682bb959826becce708b2346fafcb87dd06ab2b613c1ff9facbd4f51b473a511e3b54024132aa79aae30cc888d22299b0
+EBUILD flask-appconfig-0.11.1.ebuild 1189 SHA256 6b62ef5de9bda54c9aa600d837b016c2f37b814485604dde0a597d885b7c9ad0 SHA512 aa7836360cbb4de89fed9ffabe2313b4ab2f582e072cfee815304eca0fd2dd1e320674ae029572554cf46bb11c72aa6437f9a7de46d9e09d246b293ab2e8069d WHIRLPOOL 7d473a07c8f8b8770c044fee92fb380dd1178e3ebb33a8d8fbe0cbfbf4b61a948a03276d6ae2692a70f52e10e7f4c6d4956f3a951208b7cd48f66cb29ccf5bd5
+MISC ChangeLog 1087 SHA256 1f15b4ef11cf5b55e884295d0338efc277fabe00953d54072c950100457062b7 SHA512 3c571cc521bc551a2faf2a3c67dd6d4b994fa0c69fff06c0d4ffc85866f3fa3c297aaf3498ed43a26865586b955d14297036a018d284a1309d499cd0ece1891c WHIRLPOOL 7fd18ecbb786c1a7e8ea15ffbe9fa422a4254882770d8c33763df18c5ae71f35ff1ef45e28af1df595e6ffe081be344ac6f76b15169534c8b872b4a7a114bf11
+MISC metadata.xml 573 SHA256 e8689590d0c8a60aba9adc8c06b658886486404f3c549236e29d34c88e714aaf SHA512 77d7130b75896a8a317f3ee741e0bd1c9b0c0d3acecc183985bb8330a7b6010174eff3631c98b706b28af17790926bdba275a6e9a05b5b799eec7b04e4e8e6d9 WHIRLPOOL e6b113d626a9505b15b9e2be89287e4bd71b367450b9fc618f7e7f4798d13a65920a792e2849f026744ca109a862f6a64d5134b435a5a548e2106c80e98513cc
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
new file mode 100644
index 000000000000..66d2f6d35180
--- /dev/null
+++ b/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Configures Flask applications in a canonical way"
+HOMEPAGE="https://github.com/mbr/flask-appconfig"
+# PyPI tarballs don't include tests
+# https://github.com/mbr/flask-appconfig/pull/4
+SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -i "s/, 'sphinx.ext.intersphinx'//" docs/conf.py || die
+	# These conflict with recent flask versions, #589548
+	sed -i '/entry_points={/,/},$/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-appconfig/flask-appconfig-0.11.1.ebuild b/dev-python/flask-appconfig/flask-appconfig-0.11.1.ebuild
new file mode 100644
index 000000000000..c543bd77e196
--- /dev/null
+++ b/dev-python/flask-appconfig/flask-appconfig-0.11.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Configures Flask applications in a canonical way"
+HOMEPAGE="https://github.com/mbr/flask-appconfig"
+# PyPI tarballs don't include tests
+# https://github.com/mbr/flask-appconfig/pull/4
+SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -i "s/, 'sphinx.ext.intersphinx'//" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-appconfig/metadata.xml b/dev-python/flask-appconfig/metadata.xml
new file mode 100644
index 000000000000..8639b4a6ed3a
--- /dev/null
+++ b/dev-python/flask-appconfig/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">flask-appconfig</remote-id>
+		<remote-id type="github">mbr/flask-appconfig</remote-id>
+		<bugs-to>https://github.com/mbr/flask-appconfig/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-babel/Manifest b/dev-python/flask-babel/Manifest
new file mode 100644
index 000000000000..cf1669e0003d
--- /dev/null
+++ b/dev-python/flask-babel/Manifest
@@ -0,0 +1,9 @@
+DIST Flask-Babel-0.11.1.tar.gz 40494 SHA256 d29b36c399e42e98bc9401c8c1c159f2befcb8c12a2a2a87ec49ad7623036899 SHA512 a70ab4c10d2e495121f8e050e2d6ed136a85b1030c90e540a7746c6e759a63f12940fe44b4551f221445839e972e298053e7778d3fcf1e4ecb7cd9a79699b19a WHIRLPOOL 57ac267da8fb9a0e4034f54b26a73d7b241a0c25705ee3f958b9f8784e5e39e8826279401e0a9423fdd0b02021eb921cdb0241237660a2c51255d122c2a5b9b0
+DIST Flask-Babel-0.11.2.tar.gz 41105 SHA256 c0d75710bd4b0fe866f9f2347de6e19208712f9cec006436b4c1c15d4cb0c939 SHA512 d95947983ff5bc33a28384f000512e85ed64c16555aa03e110a32b7c0c9e91eebc02259bfc69a0dbc84adb6ecf8155cffaecde5726658d64d36435060de3f22b WHIRLPOOL 4e1180bcb63712f90581f59c308920e136f17ee5b6d5aa82ed65ce961b98ea42983061ba6633f22fade7fe27a1e0903459c5dd14ed66739d6a4644103622429e
+DIST Flask-Babel-0.9.tar.gz 38881 SHA256 4afd150f360434b00684ba7848358f7961072fd0658a6e81aaa578522699fb4c SHA512 c667c8a532332bb3dd0d694932d17f7f9b2b51f68151767624116853b2e71f2a6b4c47164d17a6f368b67a5cabce97495b18147655fb36aee5034c058d3b9a89 WHIRLPOOL 28309a4a27bfd0fbe30be52613ee9eef5110e3cc38e863c6de200cced579476870e01b92edaeb08fd29e0deabcaa13d14742d188960742d61cf8ba5384476cd1
+EBUILD flask-babel-0.11.1.ebuild 872 SHA256 30e705d9559955d2996fe452a16ca5a23b1944f911fb4636a643389d03961c59 SHA512 c665ee80d5a23e1135ff3098634f41df90745216703d489466ef51369a4f7536e845204f5c2ec384b79a8f09e227e6f95e3163d60f643194bbea05d678c6b104 WHIRLPOOL fdbbccbfead40f22564bff413cfbd6238ebfe7653a0971dff513471e5ea2eaa192723520c1db924c23d268f6abfdaa2e97d6224d0b172c7416338c273de59b3f
+EBUILD flask-babel-0.11.2.ebuild 872 SHA256 3ee2c1730a340bc3559ca64d584ca29c7ae2b57ad12faa2c2083d2dfefd09edb SHA512 e62bd517832cde0c6cd33e429ba4d6653a839cbb6080c7ce78f505c6014f4a42bdebdc996ae762886f0604e2ad811187d0dc1cafa257d04969984514a6391016 WHIRLPOOL 78528ab3d48c7ecb3caf877e01b33615f35b2558bc397b5d29176d4c83b815ab985e2dea82b10285e1d07d7cbdef0b07d320da9de4a5e9d9fffb42b81c4c5a45
+EBUILD flask-babel-0.9.ebuild 942 SHA256 6632ffe76c6c27ced9d6167cd863627dde3703b10cc178beaf14d754c6279d71 SHA512 cd9fe9f7552d06e228567a2757dd257ae6e98275d4674df48d02fab8e8dbe82659731b4d57742ebc58356d21c0e08f013030ed15bfe0d61c35f21a55e120a422 WHIRLPOOL 9f425d820cff9256e3cbc83498e4a9b6ca5059f21c3d4f4c95df01381246330cfc033cbf7ffe5f9afea73cf813e9770232a8dec6b323f16a3c1955f56a468b48
+MISC ChangeLog 3276 SHA256 ceaf5916a584bc596eb3996dbf014b04f0e47d37092f4399bf23da2209c0443b SHA512 0b61b82e358e5780f0f30ee1eaef15feb5363bd4f9e7b2fd7778c2bc3ede170f855a8a82abda59836d3912c69c24e993610045a299cb5bcdf155cd595177d538 WHIRLPOOL 5a192342222aba2a5e0531e47ee2d13bc269d9423f3fcb3006563c5fe779abfdda197f5f54932f383a84087c075c325a0f9e6b4c8685ee8971d1ae31a4b9ceb9
+MISC ChangeLog-2015 1700 SHA256 9b79b4d85ba0e9c85a2619ee940bff96b30037153f03cff63231e4e74bbc9c95 SHA512 d3e2e0ebfb3dbbaad4e4d8a4ec058bceb259d6cdcf518f3db888df604c679045a0525484610d8eda08716144534bfba84851e706511a9754353af6afadc1ed0f WHIRLPOOL 810f7fdce9b6074943aa4de3f7307523023f6204c76c52cf85a5bb2305f132432ec388f75ebc7d159eac9fdff573e4a3cee771c2d55e6bd3e7e5a85b0584fbe6
+MISC metadata.xml 450 SHA256 ca1118b209a0303c7de172f9099971dfc332bc787c9ed7fddae051252a5804f5 SHA512 d6fb2f7cdf0a8d4b54dce372bbb3d9728a5ebb0e6d714da9c58e5215d6711e3f4211e2a6ef5390cdfa663d375d7e2942a210bfa2822489dd04a911d9e9c24985 WHIRLPOOL ffc86a9ef2589398fba3055db840235d93ab13955f168bd2bc8b90e6064530a1783903a6d456c653086f43e48dea125114dbe9fee32128a179ba9866ad7eb8f3
diff --git a/dev-python/flask-babel/flask-babel-0.11.1.ebuild b/dev-python/flask-babel/flask-babel-0.11.1.ebuild
new file mode 100644
index 000000000000..27ed48926f31
--- /dev/null
+++ b/dev-python/flask-babel/flask-babel-0.11.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-Babel"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="i18n and l10n support for Flask based on Babel and pytz"
+HOMEPAGE="https://pythonhosted.org/Flask-Babel/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/speaklater-1.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/flask-babel/flask-babel-0.11.2.ebuild b/dev-python/flask-babel/flask-babel-0.11.2.ebuild
new file mode 100644
index 000000000000..39d1c874859f
--- /dev/null
+++ b/dev-python/flask-babel/flask-babel-0.11.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-Babel"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="i18n and l10n support for Flask based on Babel and pytz"
+HOMEPAGE="https://pythonhosted.org/Flask-Babel/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/speaklater-1.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/flask-babel/flask-babel-0.9.ebuild b/dev-python/flask-babel/flask-babel-0.9.ebuild
new file mode 100644
index 000000000000..183d66a21e27
--- /dev/null
+++ b/dev-python/flask-babel/flask-babel-0.9.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-Babel"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="i18n and l10n support for Flask based on Babel and pytz"
+HOMEPAGE="https://pythonhosted.org/Flask-Babel/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+# https://github.com/python-babel/flask-babel/issues/87
+RESTRICT="test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/speaklater-1.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/flask-babel/metadata.xml b/dev-python/flask-babel/metadata.xml
new file mode 100644
index 000000000000..ee71c5b56de2
--- /dev/null
+++ b/dev-python/flask-babel/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Flask-Babel</remote-id>
+		<remote-id type="github">python-babel/flask-babel</remote-id>
+		<bugs-to>https://github.com/python-babel/flask-babel/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-babelex/Manifest b/dev-python/flask-babelex/Manifest
new file mode 100644
index 000000000000..6bf4f1a42719
--- /dev/null
+++ b/dev-python/flask-babelex/Manifest
@@ -0,0 +1,5 @@
+AUX flask-babelex-0.9.3-tests-fix.patch 1508 SHA256 1f62293fc591031077007c5cf5d7301061c5ab41b12e78e5327003b30d6196d5 SHA512 60761e4117919619562701c24ea2e7f7f55554da251b8144526063cdde35413ced741bcfb35c8666104b7f0850e665450a27e8f134d768b0c5d49d1ee6775ace WHIRLPOOL d52d2ef6080a2ff92a38961921c954c4f366ee43dc1cdecb8064c412349e4d64e91e774fbc7edb05fc1f463d2f71a13ba7bd2d72f7e13400d7f1cc6eea99ef7e
+DIST Flask-BabelEx-0.9.3.tar.gz 41040 SHA256 cf79cdedb5ce860166120136b0e059e9d97b8df07a3bc2411f6243de04b754b4 SHA512 c759f990c4c96dab7cf2fbe83c1ac6dde4606adfd2f5d03ed293578bec621170be319b71fc3e38c1910d2edaba3e4394f32ede3754940e315abd917beaf3982c WHIRLPOOL 73566e75f7fa178598752a4778824b641d12c89de1f044141566cff1f92326ae1d1bfebad8b69c75507e11a622127d24e645122a09cea9856614456be72ac045
+EBUILD flask-babelex-0.9.3.ebuild 1169 SHA256 238afa5fe6a2f308c1deacf5ec5dc42dffcea76b67100ca9dc01ecfac98205d4 SHA512 67120b66c0f01be232868916ecee3b0c2dfaf33bafd5c5a9633dd217658109a09998df03c3999af6428008f22309dce3770dc37c9a06b91030352ed5344bfc1d WHIRLPOOL df686f53c350841f40a897fdda22d6698f2fbca5a72d204a8bc62b67580acab084b76ab5a71b62e5ac9b2b7982b54a552b93c722c829d18738547372bae7c1a9
+MISC ChangeLog 413 SHA256 20c3e3797a99296987d150da51eae33302b90585def36454ac0bd1e9fa4ad8e5 SHA512 ff0a2ad318227ae720d2c82c9bb596d137284f38d432d22696ffbc89871240e5fb4596528e41051e2932265a249ba987ddddad3971764a553e8c3de5d4d58477 WHIRLPOOL c9c2a0bc8eea97e58fc2d992940a2208a4a46cc89ba73f9e96a7a573cf860e0c36320394dc3f9e6992334a2d05b7a3b1cab50bea5f425f5925dcb34dd595a242
+MISC metadata.xml 388 SHA256 c5905d0c88871da8ca95324d3d5b17b8f4c29506e47ac041630e23b5c07ff6a5 SHA512 844d8f6784fdeb00484620a822f16256cbb7f07b9c0da936a3cc1b158219839612439e8158b30c4b4c713a88b70edf64068e1091ed102f7b5ecac17b1ef53ed0 WHIRLPOOL 1f383deac3cd52cfe75c9cc2178989f44bd8d1462255211d630634ac476c987573efb982308e47af73be49753b286e30db82e6335241ff6207bd853df6d522bf
diff --git a/dev-python/flask-babelex/files/flask-babelex-0.9.3-tests-fix.patch b/dev-python/flask-babelex/files/flask-babelex-0.9.3-tests-fix.patch
new file mode 100644
index 000000000000..5b11f1ae6e46
--- /dev/null
+++ b/dev-python/flask-babelex/files/flask-babelex-0.9.3-tests-fix.patch
@@ -0,0 +1,41 @@
+From d56d2c9a42c291a3592f3d7977b4dcca9ac755b3 Mon Sep 17 00:00:00 2001
+From: Jeffrey Kyllo <jkyllo@echospiral.com>
+Date: Mon, 25 Jan 2016 14:00:04 +0000
+Subject: [PATCH] Updated DateFormattingTestCase with new datetime formats from
+ babel.
+
+---
+ tests/tests.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/tests.py b/tests/tests.py
+index 63c2ecf..2df68ee 100644
+--- a/tests/tests.py
++++ b/tests/tests.py
+@@ -35,7 +35,7 @@ def test_basics(self):
+         with app.test_request_context():
+             app.config['BABEL_DEFAULT_LOCALE'] = 'de_DE'
+             assert babel.format_datetime(d, 'long') == \
+-                '12. April 2010 15:46:00 MESZ'
++                '12. April 2010 um 15:46:00 MESZ'
+ 
+     def test_init_app(self):
+         b = babel.Babel()
+@@ -57,7 +57,7 @@ def test_init_app(self):
+         with app.test_request_context():
+             app.config['BABEL_DEFAULT_LOCALE'] = 'de_DE'
+             assert babel.format_datetime(d, 'long') == \
+-                '12. April 2010 15:46:00 MESZ'
++                '12. April 2010 um 15:46:00 MESZ'
+ 
+     def test_custom_formats(self):
+         app = flask.Flask(__name__)
+@@ -95,7 +95,7 @@ def select_timezone():
+         the_timezone = 'Europe/Vienna'
+ 
+         with app.test_request_context():
+-            assert babel.format_datetime(d) == '12.04.2010 15:46:00'
++            assert babel.format_datetime(d) == '12.04.2010, 15:46:00'
+ 
+     def test_refreshing(self):
+         app = flask.Flask(__name__)
diff --git a/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild b/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild
new file mode 100644
index 000000000000..e1a7a94a45a8
--- /dev/null
+++ b/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+MY_PN="Flask-BabelEx"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Adds i18n/l10n support to Flask applications"
+HOMEPAGE="https://github.com/mrjoes/flask-babelex https://pypi.python.org/pypi/Flask-BabelEx"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1[${PYTHON_USEDEP}]
+	>=dev-python/speaklater-1.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/flask-sphinx-themes[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}/${P}-tests-fix.patch" )
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cd tests || die
+	"${PYTHON}" tests.py || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-babelex/metadata.xml b/dev-python/flask-babelex/metadata.xml
new file mode 100644
index 000000000000..ad8b7279ec7a
--- /dev/null
+++ b/dev-python/flask-babelex/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Flask-BabelEx</remote-id>
+    <remote-id type="github">mrjoes/flask-babelex</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-bootstrap/Manifest b/dev-python/flask-bootstrap/Manifest
new file mode 100644
index 000000000000..f2260c976484
--- /dev/null
+++ b/dev-python/flask-bootstrap/Manifest
@@ -0,0 +1,8 @@
+DIST flask-bootstrap-3.3.6.0.tar.gz 489779 SHA256 b7e215fbd570940a5a29fa08d41ee5958b616947f39f93cbd9d0ae3e5ed6d56a SHA512 4cf08a6fd75185fdf5c89783cf8610d74835bf9dc07bd83b36819147bd40cf0e10d20f563a5fc5b8e799e2b87f1e80ad896c76930ca1bc72f74a94818ac708c8 WHIRLPOOL 2963b38b7f076e5289e75ff439eb9facf3b025a548b907cd4a8166c833f164aa6b631a4ffbcad95b0d90c384bb0ccb95523f7c244334232a6d8ce6f43fb94266
+DIST flask-bootstrap-3.3.7.0.tar.gz 490438 SHA256 c526afd60c8d56391d2a728706470aa5f789ea6bc739c01613973652b1932f78 SHA512 0c7950d633d88f2e71eab444760229efde324b5169bc774215db4a5cd816d4b8eee8b5d55a68921330b2018d4ae57aafefa6e66cefa0ee822260103cf42143e6 WHIRLPOOL 698d5aee5c188349d6f00a0a9acc1fc8bb62b0ef707e4de46d6be1c788d1a578f64319f1936d47d9e2f69825a70ba15743cede32aa08ac8dda37d44ecdbb21e6
+DIST flask-bootstrap-3.3.7.1.tar.gz 490821 SHA256 b5c188cebd80eabe94f3ea2189429a9070cdbf102d2ae31aa007883d86d25f16 SHA512 010c71f69a95cb51afb449d1b43cb345ad23815ea89b368281f721a2af13cf2c143d67b586114898450d8e7fec413f45ff042cfca3dc1183cb0f50566e39fdc3 WHIRLPOOL a5c2991d391252909027cc67cafd0b4ddc98247c3762969ca7da5de6530911c07bbed73ee6dd836f70632acf5d2b211df0e76b4ed7fb7b759878bb2b663faf5c
+EBUILD flask-bootstrap-3.3.6.0.ebuild 1517 SHA256 8534a11694d467c266526f72077b361eb33763e24b02bdcf85e34f5841f10075 SHA512 aec7901141da7394f73ae79ea92a42fd3af6789f469ae197901c5d311e78e0eeab1230e6863f0614975759749310ddec8e0e78bc0fa67fbe30c2b4f791d8146a WHIRLPOOL 1b6a52040aac42420d520cda5bb0be951c85e4cb2f0dff1c1a7519d4a267e7e3cdb6fa7c401b622ed2869ea39161a79e0cb01879b156b9f156c9063093ca93ff
+EBUILD flask-bootstrap-3.3.7.0.ebuild 1517 SHA256 8534a11694d467c266526f72077b361eb33763e24b02bdcf85e34f5841f10075 SHA512 aec7901141da7394f73ae79ea92a42fd3af6789f469ae197901c5d311e78e0eeab1230e6863f0614975759749310ddec8e0e78bc0fa67fbe30c2b4f791d8146a WHIRLPOOL 1b6a52040aac42420d520cda5bb0be951c85e4cb2f0dff1c1a7519d4a267e7e3cdb6fa7c401b622ed2869ea39161a79e0cb01879b156b9f156c9063093ca93ff
+EBUILD flask-bootstrap-3.3.7.1.ebuild 1517 SHA256 e38dd5364f138d087b36d925d335c2dee975d32dc6fbaedee923a79a369ea048 SHA512 975a44cdf013cdc9d220ea0d04cc08996065cecee3095f75c2fdcc2992f76dfa69900f0b089928edc9e13a53375f0a7bb12e57a97a0f0abc07d6e35c90b7cf5a WHIRLPOOL 2e0b086aa145c4d7ffd1b18605dc0c40be5ad4364b0045c0721ae6830dedf541d28bc9cf8a423aea8ae43ff364bc0a7c6eb03fc21e645b266e3e4219dbd69b75
+MISC ChangeLog 1250 SHA256 479cdd57717443b078cde286f404a09ad4d243dfc458af8bb22736b910083bdf SHA512 9ec7ee3374d0068fb4788e9b8c16fa307f2ff7615b2c54027bf1e74cfbe028ef6cb0dc79b4e4edb21841bee33f2ffcc09d566a5a32dbe8f603af44fd0fd50806 WHIRLPOOL 2dedfaddc8024b2ff867a88a9756b39c15c8b03ed3b6062ed8a0e9cdf4a87378e086d5a45a889a9e70008249565fcdbadd5df96ef230fe8e6fee429e2262c67c
+MISC metadata.xml 573 SHA256 54b86118fc1662241cc963cd502e18900e109b92a05b0d0924ee04be8edf35ec SHA512 e8bd20bdb92ba23034ff7757bbdd8a59d0614c12ff2ad9fd78bda026a77562ae5e14d60033a5989d7117811195a9567c13fad4b30f28296d71462e06f3c54347 WHIRLPOOL b36be207f52a5ae756e3fb2149979ac6a76ee5b2da5be8e7dd1879935b194a75793deb8d2156cfa058d4635eafcb2afe146cc75853af51f2cfd23664d036730b
diff --git a/dev-python/flask-bootstrap/flask-bootstrap-3.3.6.0.ebuild b/dev-python/flask-bootstrap/flask-bootstrap-3.3.6.0.ebuild
new file mode 100644
index 000000000000..23574c4628d7
--- /dev/null
+++ b/dev-python/flask-bootstrap/flask-bootstrap-3.3.6.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="An extension that includes Bootstrap in your project, without boilerplate code"
+HOMEPAGE="https://pythonhosted.org/Flask-Bootstrap/"
+# PyPI tarballs don't include tests
+# https://github.com/mbr/flask-bootstrap/pull/134
+SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/dominate[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/visitor[${PYTHON_USEDEP}]
+	dev-python/wtforms[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flask-appconfig[${PYTHON_USEDEP}]
+		dev-python/flask-debug[${PYTHON_USEDEP}]
+		dev-python/flask-nav[${PYTHON_USEDEP}]
+		dev-python/flask-wtf[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -i "s/, 'sphinx.ext.intersphinx'//" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Skip one test which requires network access
+	py.test -k "not test_versions_match" || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.0.ebuild b/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.0.ebuild
new file mode 100644
index 000000000000..23574c4628d7
--- /dev/null
+++ b/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="An extension that includes Bootstrap in your project, without boilerplate code"
+HOMEPAGE="https://pythonhosted.org/Flask-Bootstrap/"
+# PyPI tarballs don't include tests
+# https://github.com/mbr/flask-bootstrap/pull/134
+SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/dominate[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/visitor[${PYTHON_USEDEP}]
+	dev-python/wtforms[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flask-appconfig[${PYTHON_USEDEP}]
+		dev-python/flask-debug[${PYTHON_USEDEP}]
+		dev-python/flask-nav[${PYTHON_USEDEP}]
+		dev-python/flask-wtf[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -i "s/, 'sphinx.ext.intersphinx'//" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Skip one test which requires network access
+	py.test -k "not test_versions_match" || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.1.ebuild b/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.1.ebuild
new file mode 100644
index 000000000000..33d02be24a68
--- /dev/null
+++ b/dev-python/flask-bootstrap/flask-bootstrap-3.3.7.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="An extension that includes Bootstrap in your project, without boilerplate code"
+HOMEPAGE="https://pythonhosted.org/Flask-Bootstrap/"
+# PyPI tarballs don't include tests
+# https://github.com/mbr/flask-bootstrap/pull/134
+SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/dominate[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/visitor[${PYTHON_USEDEP}]
+	dev-python/wtforms[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flask-appconfig[${PYTHON_USEDEP}]
+		dev-python/flask-debug[${PYTHON_USEDEP}]
+		dev-python/flask-nav[${PYTHON_USEDEP}]
+		dev-python/flask-wtf[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -i "s/, 'sphinx.ext.intersphinx'//" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Skip one test which requires network access
+	py.test -k "not test_versions_match" || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-bootstrap/metadata.xml b/dev-python/flask-bootstrap/metadata.xml
new file mode 100644
index 000000000000..0811c94c8fdd
--- /dev/null
+++ b/dev-python/flask-bootstrap/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">flask-bootstrap</remote-id>
+		<remote-id type="github">mbr/flask-bootstrap</remote-id>
+		<bugs-to>https://github.com/mbr/flask-bootstrap/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-cors/Manifest b/dev-python/flask-cors/Manifest
new file mode 100644
index 000000000000..9dca5acecef1
--- /dev/null
+++ b/dev-python/flask-cors/Manifest
@@ -0,0 +1,9 @@
+DIST flask-cors-1.8.0.tar.gz 17368 SHA256 da01f3ecf6d3d5c9c45ccdd95e6f93bc04a31f403ff5e4ad2e6c0fca99eb2cf1 SHA512 185a4e5785223d547373ff40d18dee2112a8da2dec2ecb39cb7b7c394e9220551e46302590870393c35902dd12e58d3d7cd4fb8fa052828b21d4107457a080fa WHIRLPOOL 1631d5c8e4521a31adcf061a6fbb21b9019835d3718ff02d16d2fe48af57d23d6cef01d740887d6b592ee420ba0c74ccb27a3a402547257823bc7a894793373a
+DIST flask-cors-1.9.0.tar.gz 22846 SHA256 d1237b21c3f98ea8bed387efdf1db1d1078df9c480f8fe06db21ff130420200b SHA512 0ed2d4fdd80b43bbbcab4257c3917ea12b39a9da89989e3cad5575d1ebca1523f9cefaca6c36b4dae81629f65936b2cdf3af04c789b28cc03d5660062c2a0e56 WHIRLPOOL 8356937c86d67da4084405d2a1565165da07a467f979c324d72dc4630f3abb7b1f2f906d700592a730a94a19fa12346014788863fa2f7041b5a015300349e16d
+DIST flask-cors-2.1.0.tar.gz 28038 SHA256 749fc78f18f677317cb44d8ee3fdd3a5914ec1c5f5340d10e2ac020d405c7ed1 SHA512 235162749485588e9112a52a833a43e68ad1737997628dc51cc30358d01837f427ba33872ecb1fff8e821b84c3de0a15a1c89c57f2407ef0cacafae9ca354640 WHIRLPOOL d71d1ea44954a6a691b1442a176d58413c4b99674e0e055af991b370fd39c0f5cb9ddffec7add635db8fcdbc93b6b0b7395e861b487863f458c7741d52215d0f
+EBUILD flask-cors-1.8.0.ebuild 894 SHA256 b82a9e90758634122bbb95a68f67f0cb765e30bf84bd460ceb9dcf3ee3ecb9be SHA512 399b0efafb53cf293317b12f1d768c574c3d41804f902141779686077e594435cbf4d58336c83e28c69dd9984c9d63503d38fd4017dbbdd549f7ac5210b28f0c WHIRLPOOL d48823162a0c3ca620035e25f40bd2cdf1f3c52a5e8b8505992f89307019f93a4728925428a3c33997411dc50b9ec641f23a08e2d28bcdfe64f6de006a110415
+EBUILD flask-cors-1.9.0.ebuild 1689 SHA256 87f00ebb9de40e8c584efa6fd80e9968dfa2a4e188fa8feb97273f34f39abe06 SHA512 a40978ba69486b819f10abc4ae7e708955011652f8653ba8d2e883e28786ed46e9e137644874de8dddd9cb479796871ba829b53d9e80bdcc94ca588fb44fe54e WHIRLPOOL 01d5358555253b50d59068c5a5e8ffa2f9e44fb04896c4205ea8e37a4be9734eb05b7b31b6939a1fbaf06af353b580724ee2423a8c8d10cc82d93055564b708b
+EBUILD flask-cors-2.1.0.ebuild 1695 SHA256 30981649cbf54e4ba6e1a941372be93d85b54c9e6ef7acd8095a03ee4c2f262c SHA512 5f2143e7401afa6d90b5ae834800ca271316acf6bef255d7fba4d3dd63d96617fbe78dc98e2d8fc6f7dc6f773151622e4ac12d8a089347cb0e6d45b46f5f25dd WHIRLPOOL 4c5c8187ecd41757832dd97afcb8e184160f7a96d02b195a951c04db4f1fadb99f76ed85fc38544340457402d411bea7b99d7ba95d08e72f85108178096f9ffb
+MISC ChangeLog 3255 SHA256 4d7e405907c3d240fbce9cea2cb0da0e9beecad42e7d6af2b005ce656816a344 SHA512 43f62d4cb41003d3a3ddb1c14502208cedbd0ad5cfdf525408120a628f4b72e6c9d361a111348add2ce69b8b7c367d61ab29bc1803d35e849487b1b8eafe310c WHIRLPOOL 67b0c80dd5ca96714ad08d03d3825a56fdb1f74445f4dc0181c0759634510d784ca3a56871f7f901149ab83824347822de2d700a4cbc9967898d74a8e3904f62
+MISC ChangeLog-2015 1108 SHA256 cae467685e1a61d13c83c3ae06db2366e1b75c61c2cfcf6a6f6605fd12c36895 SHA512 261ab3b1563362a69f737e27d4e891a27d1548b98041180e38a233e2b90a54b2ea09421e9b35209d63faf72aa0240b32c0135db9586b848a0f84d3de92302b71 WHIRLPOOL cf668d7a9d26647c0badda443b2882245ea191497821cc36e3d708e9201c89d2d10fb50aa495f0d78d8ebef4ea0b14024eb1f68a2ce16fa1f49c22ba3460feb3
+MISC metadata.xml 562 SHA256 d27591a719383c9b44e5f72d8617abaf07ebb1d80d7db5923291e5c791732d0c SHA512 0f7aeff494625337815930c46d69e05f5a34c880761c1de16bb8006477aab1208c2991b9388b31fc4ef42fb3adc9921494e92aae832ab774999953700940204d WHIRLPOOL d004abdf0ae98a0e7342b2e45b9483880bb97945b30d273f605b5c5c7bd65461693151f6d1a5c221856ecc36671d833e2224ac3d7737014a362634254e16d210
diff --git a/dev-python/flask-cors/flask-cors-1.8.0.ebuild b/dev-python/flask-cors/flask-cors-1.8.0.ebuild
new file mode 100644
index 000000000000..c9c3573f15da
--- /dev/null
+++ b/dev-python/flask-cors/flask-cors-1.8.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-Cors"
+MY_P="${MY_PN}-${PV}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/wcdolphin/${PN}.git"
+	SRC_URI=""
+else
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
+HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.python.org/pypi/Flask-Cors"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/flask-cors/flask-cors-1.9.0.ebuild b/dev-python/flask-cors/flask-cors-1.9.0.ebuild
new file mode 100644
index 000000000000..43b7653ba36b
--- /dev/null
+++ b/dev-python/flask-cors/flask-cors-1.9.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-Cors"
+MY_P="${MY_PN}-${PV}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/wcdolphin/${PN}.git"
+	SRC_URI=""
+else
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
+HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.python.org/pypi/Flask-Cors"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		${RDEPEND}
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" docs/conf.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-cors/flask-cors-2.1.0.ebuild b/dev-python/flask-cors/flask-cors-2.1.0.ebuild
new file mode 100644
index 000000000000..8be49aee9b31
--- /dev/null
+++ b/dev-python/flask-cors/flask-cors-2.1.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-Cors"
+MY_P="${MY_PN}-${PV}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/wcdolphin/${PN}.git"
+	SRC_URI=""
+else
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
+HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.python.org/pypi/Flask-Cors"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		${RDEPEND}
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" docs/conf.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-cors/metadata.xml b/dev-python/flask-cors/metadata.xml
new file mode 100644
index 000000000000..d5adccbf3059
--- /dev/null
+++ b/dev-python/flask-cors/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>wking@tremily.us</email>
+    <name>W. Trevor King</name>
+    <description>proxy maintainer</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Flask-Cors</remote-id>
+    <remote-id type="github">wcdolphin/flask-cors</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-dashed/Manifest b/dev-python/flask-dashed/Manifest
new file mode 100644
index 000000000000..d69f2c3ead5d
--- /dev/null
+++ b/dev-python/flask-dashed/Manifest
@@ -0,0 +1,5 @@
+DIST Flask-Dashed-0.1b2.tar.gz 325834 SHA256 fe49940e39a9eaeafa9d26eb81db0fee1eba54d87ef3a5d7489072cd221c28b0 SHA512 daccb1e4ac83a598c25c7ef202f50f08c19473aa27d8c936a9918b3e45bc9da06de7499a3976e6fff001fd81cec787093594a13c814bf26e2315793a0c8efded WHIRLPOOL e6e520ae230028bf23c1950faf075ccc36cb5bd6b4dfa47f04f39e863943bd75963d51c5f5864dbd50b73bb76505126ff2820a1349beb5af63ff0893e8f0e0bd
+EBUILD flask-dashed-0.1b_p2.ebuild 703 SHA256 8d4cf0984a37cbf55b161b12ac69277d0ca6b20985198a4c89c26ddbb8998387 SHA512 64704c74a09282a1652a570c320d82d85b7b79b7752eb9afac6bcb5b0e0fb88833288db935a613243e14839d2047ec690946ab6016d51b446b896ba2a894d8f9 WHIRLPOOL 493578b7ebc526801c420bdf276bd82b1776fef7b108beacbe18c0356b0aa3d32e2b6eb5f265c73d8b9bf294f5a5edcb2b77e9cb5e53be9da0eb23f5b05e8243
+MISC ChangeLog 2448 SHA256 73cbbd67d23075f7d3c577d88adf4ce5225ef76ca450392c25c68fd455e2da85 SHA512 af97de800996b8e33d7b11c6957c747e3e32f7f787048a0a978cb8e400d445b3360d220ca9954a79020c796112b74a37062e4de9564ade3e69e51801c1c7ab83 WHIRLPOOL c49c85af674ce980207783676e1480df9075d1e92a8bb4163994ad196dc3a371557af805c5156080d7f6cf86c934554e2397593d16722862b38d787a36022d23
+MISC ChangeLog-2015 688 SHA256 cd9d995bf03ee8331f9daf2889db635dac418407889e5cc0b12a26999644fe06 SHA512 0fdd4ad888dd0ed7c2c80f59f5f7d36f78bdd79f4e539721eace16b2008f2c6d7d699dcb7344c8ba06d511270696cb02f86ee31d2fb1b355af96b55ff3cf90f8 WHIRLPOOL 5f9c4113cf6d58e3ffbc1f87867c794674093388b8499cdaa87b8ce218c3133b1415f5509176a890b5775e1716a89023f8d597eeea740cc728ae08cb80e0f428
+MISC metadata.xml 325 SHA256 ad59c39ca940bb7f53542017f58588cdefea015a76a416a1ce9b80a3b3155bba SHA512 0b51bdfd9a4571b913c3107050aeab288dab2c2483ce1b608780d400229327fdbbb3c7d8e836f0e36a0617f6814b7c243978c7afb4454a00383d125b617dab9b WHIRLPOOL 5ad411a76d15369a3a390537672e96f4a5e9917cad5c9e596d847187c4e0bdcbf089db492d95d78242d9839d0748736c838b93a6a1d5ed53c64dfdd197855e02
diff --git a/dev-python/flask-dashed/flask-dashed-0.1b_p2.ebuild b/dev-python/flask-dashed/flask-dashed-0.1b_p2.ebuild
new file mode 100644
index 000000000000..491007a05794
--- /dev/null
+++ b/dev-python/flask-dashed/flask-dashed-0.1b_p2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Flask-Dashed"
+MY_PV="${PV/_p/}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Admin app framework for flask"
+HOMEPAGE="http://jeanphix.me/${MY_PN}/ https://pypi.python.org/pypi/${MY_PN}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-wtf[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	distutils-r1_src_prepare
+	rm -rf "${S}/tests"
+}
diff --git a/dev-python/flask-dashed/metadata.xml b/dev-python/flask-dashed/metadata.xml
new file mode 100644
index 000000000000..970bb09cd936
--- /dev/null
+++ b/dev-python/flask-dashed/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Flask-Dashed</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-debug/Manifest b/dev-python/flask-debug/Manifest
new file mode 100644
index 000000000000..0c412688b5a1
--- /dev/null
+++ b/dev-python/flask-debug/Manifest
@@ -0,0 +1,4 @@
+DIST flask-debug-0.4.3.tar.gz 9148 SHA256 059f230304805820955894eb1b3d336067eb3cb7a283cd9b7b3744305d65b827 SHA512 7bc1cf9f88f28e2ca5a24c1454dcdb4e2a450eff3c00329f299c3840032e0803079f565652974f4c3a0e5aac443365ce47a3d2c2fee8e21e2e0c7150367e8816 WHIRLPOOL 1080f045e58865f4dea39696b1acdee8a5a2eb5f5903e49cea5aad919f7c654ba3f78822723aedbec174b8bf952dcf14adcc669956e2e194a2e371d4adab4550
+EBUILD flask-debug-0.4.3.ebuild 1206 SHA256 61cd91879bed0d6e2c2664d540ae86e10027297f4dfe039b0025a92dbc64d859 SHA512 6f13e6c8f148a05341883bc7ff91e8667e0c099aa4c53c2b9363410dfa6096e5971b3b0e08ed8fdf51f3ae36f30c5d663d3b70c58a4b02d999857877ce2c7eba WHIRLPOOL 73bf4a525bf6f7a1c038b90bb13b2bdc23d0aaf32062cc1a68e98bb30c8a8138f8bae6849be1f236425442fee9968b70044a434f1f88ea463b58aad2bc6607ca
+MISC ChangeLog 464 SHA256 5d4e3a94d962a11371fbb8733721b00efcb3e5f46da0fb0a9bf2c692923b3aba SHA512 93dd6591e3b91102b01f4f74e3cda54fdd223f24e9688b25dddf311ef27787fd93eaa184d09fa0a8fa5e30712613fb9fb298ed5fd004fb577d3dd7f996176c58 WHIRLPOOL 5422ebc860b4dcb656cde2a7fc9d85907df4104685189508a5e43f682826df1e42417e4834063a982325038c33faaad27e95a6ac3c22f5d5a514215eb4ef0095
+MISC metadata.xml 561 SHA256 ef0a736094eba5fc46f889020897b2c9324c2c91872b02587d92233fad582168 SHA512 f35b563a78757a00cf59b714b073e689367c4f9f29cfa2ad7c3613decd6e2badc521a61263882dda3e0bcc3c9cd16be3066cbc9a37b27f2982233f6d03ae700d WHIRLPOOL 7737aee8d1f8bda072ea2c75b6cb2beb73087bfc1f6c90a4bacfaacc10c7f7d0ae2845d4bfd7460f23d8e8669b6896d5fa1f8bbe4eb5022e1f668fb9a738f1a7
diff --git a/dev-python/flask-debug/flask-debug-0.4.3.ebuild b/dev-python/flask-debug/flask-debug-0.4.3.ebuild
new file mode 100644
index 000000000000..d5e0d4fcc1e2
--- /dev/null
+++ b/dev-python/flask-debug/flask-debug-0.4.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="Flask-Debug"
+DESCRIPTION="Configures Flask applications in a canonical way"
+HOMEPAGE="https://github.com/mbr/Flask-Debug"
+# PyPI tarballs don't include tests
+# https://github.com/mbr/Flask-Debug/pull/2
+SRC_URI="https://github.com/mbr/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/inflection[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	sed -i "s/, 'sphinx.ext.intersphinx'//" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-debug/metadata.xml b/dev-python/flask-debug/metadata.xml
new file mode 100644
index 000000000000..5838f9e89967
--- /dev/null
+++ b/dev-python/flask-debug/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Flask-Debug</remote-id>
+		<remote-id type="github">mbr/Flask-Debug</remote-id>
+		<bugs-to>https://github.com/mbr/Flask-Debug/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-evolution/Manifest b/dev-python/flask-evolution/Manifest
new file mode 100644
index 000000000000..6ac808268c16
--- /dev/null
+++ b/dev-python/flask-evolution/Manifest
@@ -0,0 +1,7 @@
+DIST Flask-Evolution-0.5.tar.gz 3582 SHA256 f1a177eebd7908bc2390956754cf9b7c6d29f915d760db867d4b094843020dbb SHA512 94c7861a218563e6e72b831728bd199d2eb4850a14fab5e144cde9d44fe2545ea739019250073a27bed588b2bbfc88da7067ce3495dab355398bc0aba5a5960d WHIRLPOOL b7874931624b0a88954bb8bcd980b614cd672a52d88c6870f254268f79a1a071279d8a7262f79d79bf3f60ca87d85cd34e468856e3a86b6262e389230429079c
+DIST Flask-Evolution-0.6.tar.gz 3480 SHA256 54be57ccc4cac5a5fe54fa4635e792e69bd1959a6d60318fe8c0a414f3963591 SHA512 04fd348b7ed0dc93d864bf012dd9708a8c4c0fac81cd31ddffe91159a7631f42095bb9d6bcacc08cc5498d836e3497b4ea9896f1df039a12eb78d5e2c236c7ba WHIRLPOOL 4a17cc623bc68caa3c50368bcddfc556722047110fcd435fdd62af9769e81717192943863bd0c34d76f4b1c41c270571983e0cfbf5c5b6215738e290a2f2b6de
+EBUILD flask-evolution-0.5-r1.ebuild 665 SHA256 72ab6beea5f442e9a5d7066f21725c8116fbc3050edc2f724bedd4fb6cbf7790 SHA512 aed08a0fdbc34a0884064f728af6ae828fd584eb5d4fe019eb5f613df688ca2b312e0808127c83059b85473dc5fecf507f10bad2d4419824c8c260e93d03b5e6 WHIRLPOOL e91a0f62e96bace3696c2a334c06c822a6061069d2cd9701b27f6305161b7836ed8f89e6aa212fb26096771a32dcfea47246857fb4cc32a4204fd71816270fa9
+EBUILD flask-evolution-0.6.ebuild 667 SHA256 1580231cfa093052f7b071c0b25c76b2c2608f34b6a52d8d9bdc1c2dbc1b8ccb SHA512 b4c08fae7b064ad5cc1687b24966d7e910a49b78593c287d4ceb06afac3ba275aed439c3ef7bec2ffabcfbf0f827f54297e201e7c52f0ac949d27380164a1a86 WHIRLPOOL 8210b2b13ed47d77d4b8d294a884957c7339976309aaf56a5d115161cccc7438d7c3327dbfb3d5173991308f26704f75a01441c29962332156671289cf009aed
+MISC ChangeLog 2701 SHA256 46aba7395b4bf64cc0450cf52e11d2fb52403beca40fc53fa1c063f70e69078a SHA512 f62a967a9ffd2eef4e57864290035647775e5d58ef1841c686b0b53128c9134664b9b0d0abe5f7890243cfeb5a17b0190026278a56d7981ddd86095e89f9eeab WHIRLPOOL 04eace193402fad1f43596d3c9215e5d6ec6858376f44ae99248926463f32caf453bd9b8f343324ff9713e30e42352d6123d3115facf76f19b1b0e51f41ad8c1
+MISC ChangeLog-2015 1261 SHA256 4a3c0b245bf6165914a4a6866213b9ca0c39a778b2ae75e971e5289bbe852e0d SHA512 6847241f1284c97d2a009e9d84e00eeedf4eb635ee0998dd2331562bbd55458dbe4a43f3722c2f74bab3b8fa9c593edf7129366f4ad0d04af6a7674dd200d4d7 WHIRLPOOL 4b6afc2d2a9e4905ce5eb4b96f84417b8736840eddfd3ac840025a9b627f36ef5cedf129e789fdf8e86e1fe3ff4589db42c212c1a7fa8f274c91bdb2d6389f6f
+MISC metadata.xml 328 SHA256 7e35705d37c67f4f1f6e734191f526c441bd8392051135bafb4ebc60bf6b4d1f SHA512 741ee52e1130543a13ba76ecbc075ebb4be4818d99741240d99c7804140fe6ce9f8fc404c14fffa62bb44bfde69444eccb0e90d4d81d7e0e6ed61a21f81f3922 WHIRLPOOL 4120704c740a2e065d76b6b6c2ce8b074079a465f66b01e85c10992159311b8f30f924f37fc09d4423a7bf0cb59feeb4667d52b4253f007f1b050ee7d8d5b8d7
diff --git a/dev-python/flask-evolution/flask-evolution-0.5-r1.ebuild b/dev-python/flask-evolution/flask-evolution-0.5-r1.ebuild
new file mode 100644
index 000000000000..10c90958bb7c
--- /dev/null
+++ b/dev-python/flask-evolution/flask-evolution-0.5-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Flask-Evolution"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple migrations for Flask/SQLAlchemy projects"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-Evolution"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/flask-script[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/flask-evolution/flask-evolution-0.6.ebuild b/dev-python/flask-evolution/flask-evolution-0.6.ebuild
new file mode 100644
index 000000000000..138f0fe1adaa
--- /dev/null
+++ b/dev-python/flask-evolution/flask-evolution-0.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Flask-Evolution"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple migrations for Flask/SQLAlchemy projects"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-Evolution"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/flask-script[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/flask-evolution/metadata.xml b/dev-python/flask-evolution/metadata.xml
new file mode 100644
index 000000000000..18f05ea414d6
--- /dev/null
+++ b/dev-python/flask-evolution/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Flask-Evolution</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-gravatar/Manifest b/dev-python/flask-gravatar/Manifest
new file mode 100644
index 000000000000..895a6aee3287
--- /dev/null
+++ b/dev-python/flask-gravatar/Manifest
@@ -0,0 +1,3 @@
+DIST Flask-Gravatar-0.4.2.tar.gz 14216 SHA256 318dd427a21245ace37027246193daad3492e08fcf9999d2fe9addae4c8aacd3 SHA512 9f18faff3dc0b3a5fae4abd538b690c8000fe17e3ed0a9417d6b28e5a40f34143530916bc35c1bb302ed8a72e15bb8e0f98116e5bf7270f9671f8cbbf7671ba1 WHIRLPOOL 4533ecd59b537a00a756fac41c400d634374fb39a97a8427c2de326e19b71f84720454ca4da6d94b8cbcc8f6d21de9168ddeb8e8ff2a616cc7177569c10ee729
+EBUILD flask-gravatar-0.4.2.ebuild 535 SHA256 e4c3a0e228626c50ccc6c97a26bdc4bd6ca491e9d8f6b6ccd4301c89fd57c0e3 SHA512 55425a1debe5d467495a513b85903757c1b788edd02543c313736b448c79285619567b65a8da24b0d12b351534fd806eaee1bcea9cabd9bcb0a6c7a5ffd21c6c WHIRLPOOL 8a8ab43693203f5d923c518bc186d804ef11e02607cb479054036af5ef0228bdb5f2f896e7e795d913b0388eb0c00c3d85ef7bba93bd725b7276f39ef9b7b131
+MISC metadata.xml 431 SHA256 b653c9b437f6ad0ad0db77186ce2b8040a0e4bb5de488881c6494878b3cc7d50 SHA512 d6cc23df1b882978c77421c21b2a00ea7bdc6781ebd283b00cefdff1efd79e6822025e63f2fc64d2268237f114a6e0f6b451487060d66bfa30295312518f6bbb WHIRLPOOL 66b35f195e7471373f044a6b04941bda374937581f9cb22ce55e3bb7c5ce860652f8db2541eef8bb8a823a72fd422790217a93a137804757a5acabab524b7a26
diff --git a/dev-python/flask-gravatar/flask-gravatar-0.4.2.ebuild b/dev-python/flask-gravatar/flask-gravatar-0.4.2.ebuild
new file mode 100644
index 000000000000..024deb17e202
--- /dev/null
+++ b/dev-python/flask-gravatar/flask-gravatar-0.4.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="Flask-Gravatar"
+MY_P=${MY_PN}-${PV}
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Small extension for Flask to make usage of Gravatar service easy"
+HOMEPAGE="https://github.com/zzzsochi/Flask-Gravatar/"
+SRC_URI="mirror://pypi/F/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/flask-gravatar/metadata.xml b/dev-python/flask-gravatar/metadata.xml
new file mode 100644
index 000000000000..09014f03117e
--- /dev/null
+++ b/dev-python/flask-gravatar/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Flask-Gravatar</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
new file mode 100644
index 000000000000..04bb2c21a333
--- /dev/null
+++ b/dev-python/flask-htmlmin/Manifest
@@ -0,0 +1,3 @@
+DIST Flask-HTMLmin-1.2.1.tar.gz 2921 SHA256 06b43b7b88c363c2d497554eb86e36fa6c2db8424331549dec758afd41033b9b SHA512 255dac2da4db1cdacb3cccf8dcd06507c249d97c6e92e7c413d3598fbfa247f657c294eb5f1ff1f50ed73ed656ca2a1015ab712f4ea880a209f13c1d8950d83e WHIRLPOOL cf6e5a2c525b5d1ac93129dcdf3a90f69b632e1620842bc1791b5ffe4c0959b50deb04f2f1997ba5723e28b984c7e1921c8b2b29d1d80ccf8c21c65994f9c95c
+EBUILD flask-htmlmin-1.2.1.ebuild 517 SHA256 fc502eb0a37bda9d7ced4472240700eef96d21392ea9af7bc022c218e048388b SHA512 1cb3630830408717d10278fb4d20419d06278c5ddda76b8b781c9adf7261af25a9dc059f31c30c9312f33d6fcb442c82c21efa4a409af03459df622320ff88a6 WHIRLPOOL fcda858ab08505c532f8e493b23a633975a7bdfeaabdae9f218249e08251a6a71f5ebe333871432beb8ca3786c2620ec14a1483ad503bd4da7b306f964c4c946
+MISC metadata.xml 430 SHA256 a5b4370d56d61322506c66c0fcac072d8a3d24bf0d75f0eedf2184afa9aa3be0 SHA512 78c978ecd3f4ef205b0ddef1cec9e60b95988ce92bafefb5134e8a1f1f8fec8ef47f50af05ce3f71047b7f72ecae76a9f4d83add103ebedbc374fc4e49a24180 WHIRLPOOL f45b39312830fd1022b8162895c0c6096e00349ff8a7b4108bf36b02aab63f798f0e02eb288e5e3df6697826f2bc7b2c4c63adbba901b03eedd74582f465d988
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild
new file mode 100644
index 000000000000..2f049edcc881
--- /dev/null
+++ b/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+MY_PN="Flask-HTMLmin"
+MY_P=${MY_PN}-${PV}
+
+inherit distutils-r1
+
+DESCRIPTION="Minimize your flask rendered html"
+HOMEPAGE="https://github.com/hamidfzm/Flask-HTMLmin"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-text/htmlmin
+	dev-python/flask
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/flask-htmlmin/metadata.xml b/dev-python/flask-htmlmin/metadata.xml
new file mode 100644
index 000000000000..d80478200fa2
--- /dev/null
+++ b/dev-python/flask-htmlmin/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Flask-HTMLmin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
new file mode 100644
index 000000000000..de9187a9e79b
--- /dev/null
+++ b/dev-python/flask-login/Manifest
@@ -0,0 +1,6 @@
+AUX flask-login-0.3.2-fix-tests-python2.patch 1115 SHA256 97632887638155950ce8e9808104b60b3c71c36cd4b797603d2b6fef7c739822 SHA512 2796244a27b504feba773d29cf394ed04b8d7812d8989aca9a5dcd58207c3b192545531c23883f9d6828320adfb09f31388e92af72da5d5a2d2e6df05b89282c WHIRLPOOL 601e6dd1e465c921efd41307b9863a50f9dc4e4a7a057a86c14113b67ae3ab4d0f86e9a75d7d2e06a0dc9c22528cf8ec219507dc4afda7346412da8bac2fe0aa
+DIST flask-login-0.3.2.tar.gz 38626 SHA256 e7c021eba4f9fb9805e08403a6ee36ce5c7e747e799cc56212bf6c14fce72911 SHA512 c42af6ed7902145cc4778815f247ed88de6df7c929abe0a1f22aca0515495a54d298b2af2b74ba7d5e0ce9b453eee4c4ce03802a3e9ab531137e117e9dcdfc1b WHIRLPOOL 60dacd8c4bec1f96dd934109ecf6517350d5722e2ad1e98524f83d3ac15db4d4329eb05e91f5d78c6664fd54fce8288f70e1157cb53d770816142f7278788675
+EBUILD flask-login-0.3.2-r1.ebuild 901 SHA256 ef43d54a070cf246558dfdad0a1d9403a4fae39f2f85d63ea3e3fdea08c637cd SHA512 f4d365babddfa125a1025cf483bacd034e5d19cc5148d3cfcb6b75d8d50ee93820fee6d5615da046b4847605959fc155ba53ec850e2d7b3da9c4f4b41e666885 WHIRLPOOL ded0c4140dee7e1b8d1fe2073159d7b109290863529d959d8ab8e3e6b74d196c9333b2c387d9b5b4e51a41ee4228d341a09894efe22e46765349467e51578f9a
+MISC ChangeLog 3244 SHA256 8938ed94eb02197c63cfaf938b59d61e00691f24fe7ba91b5e7bbc89d39bbb92 SHA512 b8ff4c5cd4622e38b6b4adcf7f965abff51e867cdb7d0c1f547c41009e9cd0374f7ffa77aff24201eb8e0a893f6a09236759ba774d66daad30583d63fb96f21a WHIRLPOOL 9ce89ee175ecb92026dce88371553fd1cd1bc456bef7345acca9089d3d5a156b1c80566a5b03fa90bce2cbd6ff295354467428c990f1bfb10d9ca628356d2273
+MISC ChangeLog-2015 2296 SHA256 ab6020a9c3f49fa96ed67240b6c4ea2f773fac803dfe66329a52d67a24de2155 SHA512 c8d40db9af11c1bd251a871d6495239bb22b0f9edff0f6a8aafc04448566359e79b46a1f33be412ec2c4ba07c6bfd28d39d7219f0d6388e11dfb61510a754c30 WHIRLPOOL 765bb598dfc76e046a8a5de284eb26f1fc596012a07c5b06eccde4291b948435518a92b11d5d6b92fc227a9c46dbac7a560a35b6b2a1737fc3b51f378040bdd0
+MISC metadata.xml 379 SHA256 ae3426afba88aaa903ad7bbbb76c1601c751248b32fed5b1ba1735cdd76b3838 SHA512 fdce43f3694a2e027fd12ca87bd0c964e243dac37a2d31a93c034cf7881097985402f9dc6ac45f02a157914705ddeb77965486506e94f67e0f868cb77a81f6fe WHIRLPOOL aeb4b7ef07c179c728df9452d5a9648b0bb8aafa175615d3d994c849edc008b4568c463c2c7e3e7b1561527b3b95ca15f00b8d93eea29519aa647cb751aa475a
diff --git a/dev-python/flask-login/files/flask-login-0.3.2-fix-tests-python2.patch b/dev-python/flask-login/files/flask-login-0.3.2-fix-tests-python2.patch
new file mode 100644
index 000000000000..33811abdc7ac
--- /dev/null
+++ b/dev-python/flask-login/files/flask-login-0.3.2-fix-tests-python2.patch
@@ -0,0 +1,29 @@
+diff --git a/test_login.py b/test_login.py
+index 3f110e0..0c060f5 100644
+--- a/test_login.py
++++ b/test_login.py
+@@ -39,6 +39,7 @@ from flask.ext.login import (LoginManager, UserMixin, AnonymousUserMixin,
+ if str is not bytes:
+     unicode = str
+ 
++werkzeug_version = tuple(int(i) for i in werkzeug_version.split('.'))
+ 
+ @contextmanager
+ def listen_to(signal):
+@@ -1073,14 +1074,14 @@ class LoginTestCase(unittest.TestCase):
+     #
+     # Misc
+     #
+-    @unittest.skipIf(werkzeug_version.startswith("0.9"),
++    @unittest.skipIf(werkzeug_version >= (0, 9),
+                      "wait for upstream implementing RFC 5987")
+     def test_chinese_user_agent(self):
+         with self.app.test_client() as c:
+             result = c.get('/', headers=[('User-Agent', u'中文')])
+             self.assertEqual(u'Welcome!', result.data.decode('utf-8'))
+ 
+-    @unittest.skipIf(werkzeug_version.startswith("0.9"),
++    @unittest.skipIf(werkzeug_version >= (0, 9),
+                      "wait for upstream implementing RFC 5987")
+     def test_russian_cp1251_user_agent(self):
+         with self.app.test_client() as c:
diff --git a/dev-python/flask-login/flask-login-0.3.2-r1.ebuild b/dev-python/flask-login/flask-login-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..32b9e6928c51
--- /dev/null
+++ b/dev-python/flask-login/flask-login-0.3.2-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Login session support for Flask"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-Login"
+SRC_URI="https://github.com/maxcountryman/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+# pypi tarball is missing tests
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/flask-0.10[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/blinker[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' 'python2*' pypy)
+	)"
+
+PATCHES=( "${FILESDIR}/${P}-fix-tests-python2.patch" )
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/flask-login/metadata.xml b/dev-python/flask-login/metadata.xml
new file mode 100644
index 000000000000..4f9b3ffa2782
--- /dev/null
+++ b/dev-python/flask-login/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Flask-Login</remote-id>
+		<remote-id type="github">maxcountryman/flask-login</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-mail/Manifest b/dev-python/flask-mail/Manifest
new file mode 100644
index 000000000000..8c0ed07754b0
--- /dev/null
+++ b/dev-python/flask-mail/Manifest
@@ -0,0 +1,5 @@
+DIST Flask-Mail-0.9.1.tar.gz 45654 SHA256 22e5eb9a940bf407bcf30410ecc3708f3c56cc44b29c34e1726fe85006935f41 SHA512 1d19f0bade77c66e73624d8af0919165f8b6f208a00c1e4025049b50ad56912557b8446cb80f8567adf697e92b126954a5f130bd9fa7a2345d4e98e35b29ac47 WHIRLPOOL ecaecab331b47b8901448c50e0dc480a657df773f8c851f85cb4cb6814b820e9fdf0d23b7c51c74e69ad7be1e4e9da32304e23795c28502cf5bb9bd1ee57bfda
+EBUILD flask-mail-0.9.1-r1.ebuild 1050 SHA256 4969e01b03a8571c85cf72f3277d55841cc24441beabafe01e7cb14869122e65 SHA512 8ae6cbbc64484e3dc7acb8472da871913cfd94e3d0fc1f22480f7da720f3325fe63b36779c15104ff4f68df5064bee086ca0ca301a71e935770fa39f6240778b WHIRLPOOL 043e9376559e77b9c78752e6f526a13ca616c745d29bd4ad31c235ce20ffd24006dc584a699304a4f30b65910cfacbc1f31b04b7375a4c1074dd37933c39e3c4
+MISC ChangeLog 2855 SHA256 30981652f05b2407f295e9036407e82962fb873c0a68d1bc6a09fc6416bc57e5 SHA512 0db557f18811c866c2bd36243ed673f1d6eccfad1680048b1e6d50bf645d4e87e8c9ccaf25c244423e6e9ebe9f4669737795c99f321f0b63fc40270171dfa6ed WHIRLPOOL 0aa3004f7a31885a456594a9d1545bf8ceed6d2e70336397784a87263c0ced7a1e0fc010d59553934d86e88878c5f4b24ad3e98bc66a974edbc391dc6848f071
+MISC ChangeLog-2015 738 SHA256 c945926adcfc0cf12b204fc89110b53ddd7ac6dd85154dd440d5f0db9bb77167 SHA512 985b8e333587d5600ea41a7b47bddf3042903325da16ed2bf03e348ebe7ae0aec96be54cad7ada2031410ed7c5342942be3ed983bc416445d37cf1943805d7de WHIRLPOOL 65a04061f1de3a462cc3909e9fcba756a0b03e20e007026ddcac7fdbbe1b24a8c304a8ef2179fe4192f18a096ca84e664e4cb83c4cee35cda339cbe7204163bf
+MISC metadata.xml 313 SHA256 0962f001a1aa8d3c08223f13e29d437a8c6b3e396cb2e8582dbfdd8cba95b70e SHA512 b898617b8854d5d1abe05a263ff182c9734539aca8a7ed6721db1de0a9c76c5c90aca7867fc5a213b0e938d2b610ca48a79c3b71b01ff5291aadf6f46de93532 WHIRLPOOL a2a7eadf27c61b568974632adfcc962e383e4678f8595aebfea14c77066898f355d4099fbe57a4c2fd38220454baaa4c57b3c67eb964f4ee961acf609398b7cd
diff --git a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..3dd893b3ec99
--- /dev/null
+++ b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-Mail"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Flask extension for sending email"
+HOMEPAGE="http://pythonhosted.org/Flask-Mail/ https://pypi.python.org/pypi/Flask-Mail"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/speaklater[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy) )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-mail/metadata.xml b/dev-python/flask-mail/metadata.xml
new file mode 100644
index 000000000000..04fe6148b772
--- /dev/null
+++ b/dev-python/flask-mail/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Flask-Mail</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-migrate/Manifest b/dev-python/flask-migrate/Manifest
new file mode 100644
index 000000000000..9b1a91d77f48
--- /dev/null
+++ b/dev-python/flask-migrate/Manifest
@@ -0,0 +1,9 @@
+DIST Flask-Migrate-1.3.0.tar.gz 8400 SHA256 8d142bcae64d45eda6efab821283841380749653e49030aea59f0059071d134a SHA512 dbec7fee9027f9446c57a3d24b171a59dcde1e7023e20efc7eb578f41b7c5228a6704edf2cf7afec5e2fc5f8c37a76abeae5a1b9cf0d95c132e7e834f31f7b14 WHIRLPOOL f8c43f3427cbd6cc72e39cfb4f4329f9e826b2b71ca3310d6831121c5a6c9f7915d3a5308f885cb27ad2d3d77197d411bda026d9636c25bbc122069c41a011f6
+DIST Flask-Migrate-2.0.0.tar.gz 10774 SHA256 c621f5ea230bdef22bed47f4905bd8979446e1c7f9d61ec1668b2c49549787d7 SHA512 7a4118ba5089bb9f7660ec64407793c5bf9436ac21dc5d8f406294b08bade175f385e2e5eab35f33480df730aee6b580cd181f2a970b2cd7c9072dec4e7bb55e WHIRLPOOL 9df589dc9266148833e1bf15b533678b722e0d62fb9cd53cb4681d79585979854e39324a960357a9732c74d05a5f2998d833bfb32ef4cd16dfae80c0555faf6c
+DIST Flask-Migrate-2.1.1.tar.gz 15034 SHA256 b709ca8642559c3c5a81a33ab10839fa052177accd5ba821047a99db635255ed SHA512 b5bf6b1b15dfa969e645640d14077fd4755f0db9279a75045fbc3ac685ff32ec19b3207b3d937e341e3546ba5c5c34e509c3964cc63d0e864f200c706b73d851 WHIRLPOOL 905fe61a851070945e5377e37e101faf44df192edc1f82955c4a33a2c990ce250c0fedfab424e1267b5077af41416211f928e44c6ed843ab15433b54bab08216
+EBUILD flask-migrate-1.3.0.ebuild 795 SHA256 48766a8a90c487e31a3d579ad75a96cda59d4e0ffb278f39926338799ed2b76d SHA512 1767654dc6778d342d16cfea2ad2c419f7f8cf9ceed7eadba52bab3528477e1306c878d899721d72dd4a2127c57e6b68d6eca2ebccc5c8bcce43d5443d654b55 WHIRLPOOL e15f513427d3d7ff78f939848fd48344258490ced9a9145cf298e23c4226bf5ffa4a8441a64e928debfb37a0212b4a465ed17f7a063e19d84703d395f7e33f1d
+EBUILD flask-migrate-2.0.0.ebuild 881 SHA256 600ca540cfb626136fc394584b7c2ef141ef63c5f42f1dd2b10fd408a00325be SHA512 8acac801c2b3e0610ceabb754eded8cbc287b948ceabd31c3c2f669b411386f89b76ef83a221433d143e04907f1ffad1d9f8e57f002d72bf63321cf8f793d5b4 WHIRLPOOL f334ab4f1374fbd6c250925732e0159bc71b4df04b7080251fcbaf84f8ca488041f87e9437398bc7cd8b6088f4dc0701e681477da109c177bb41666bdba50855
+EBUILD flask-migrate-2.1.1.ebuild 881 SHA256 19762d63fcbfdbbbcdb8c6d4bd76d22db98102fe86217f2e8f6019dda7676735 SHA512 d2ecaf16a739a9fb1305e473dd0ff008c36d6db4b01cef9e392da8ab728500690ccd5ee2d015e91f2f107b90da57f143ea73fff121803c99fdc06208595950ff WHIRLPOOL 7ed8381683777be77cb48d3800b85c288029534545f43fd5a92c986eac68ca8a83b5884dfbe76a76e7881fa46d45c034b82405f019409d70204b0052d59369e1
+MISC ChangeLog 3765 SHA256 e8c5eef656a097e93c3d9328443b1a6288763df357717de68cd846c540bf4f23 SHA512 4d0b27d0339a376854851c2d410ce60fbd6079ff4b68b3589de0dd8d31f5942b81fc60359156303609900d4ae40c57251a7841e0f7764e4e5787da32a5349e6d WHIRLPOOL ac9436b77026fd225827230c0ac6d0a60a79d6edc78afbcbec034727a6bdab8e30bf5166745023779e98ab8d551a4cf39278fdfa05d5c25a3e22ce2b44aa901a
+MISC ChangeLog-2015 956 SHA256 f513ced908206fb23fc9bd388985bcdd51a324bb9ba4b86c8baa4a27457404f9 SHA512 bb791e3a0a0322e357627740dd3b1e9883b5b3121dd519c30677f170a8865103309f4ccedb1d67909f7f0e82cdde7fcbedc5d0655cc4a8085470e34f2b9ac8bb WHIRLPOOL d026d1129009e110fe34e81c82b4599f6adbe7dd84bcb3f39018ee0ec5bd7bb5428033b8999e50e3d3c7a373e87bf640ad1ae9fe5c291d4867e34977ded41d2d
+MISC metadata.xml 316 SHA256 e5066c1501cbcc0e8d4dd2e8bf70e29dbf8ad49e6e2e1871f0e1d0b1ba49f00d SHA512 1dfa03b638a9c39be69148ea8aabb4554326dc65bc3a004a2eb93b05fe4be8d667efc7470ea35a138bbe1bae17511a42d530448a98da5c5eaa3eb1c2d3126ede WHIRLPOOL 026df2629dd151ee5cea24c0dd50406d2a649a7e72a0328ca85e6943f8d6dd6ac43d867b2718079ca11f391c3862e905c6f2333193b5f147a12608fbe9b2e2bd
diff --git a/dev-python/flask-migrate/flask-migrate-1.3.0.ebuild b/dev-python/flask-migrate/flask-migrate-1.3.0.ebuild
new file mode 100644
index 000000000000..6987c1f86b5a
--- /dev/null
+++ b/dev-python/flask-migrate/flask-migrate-1.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Flask-Migrate"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-Migrate"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/alembic[${PYTHON_USEDEP}]
+	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/flask-script[${PYTHON_USEDEP}]
+	"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-migrate/flask-migrate-2.0.0.ebuild b/dev-python/flask-migrate/flask-migrate-2.0.0.ebuild
new file mode 100644
index 000000000000..a97b5fcfafe3
--- /dev/null
+++ b/dev-python/flask-migrate/flask-migrate-2.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+MY_PN="Flask-Migrate"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-Migrate"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/flask-0.9[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-script-0.6[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests -v || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-migrate/flask-migrate-2.1.1.ebuild b/dev-python/flask-migrate/flask-migrate-2.1.1.ebuild
new file mode 100644
index 000000000000..485d8d40c8c6
--- /dev/null
+++ b/dev-python/flask-migrate/flask-migrate-2.1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+MY_PN="Flask-Migrate"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-Migrate"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/flask-0.9[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-script-0.6[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests -v || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-migrate/metadata.xml b/dev-python/flask-migrate/metadata.xml
new file mode 100644
index 000000000000..6cac4f70a433
--- /dev/null
+++ b/dev-python/flask-migrate/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Flask-Migrate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-mongoengine/Manifest b/dev-python/flask-mongoengine/Manifest
new file mode 100644
index 000000000000..5811af9563e1
--- /dev/null
+++ b/dev-python/flask-mongoengine/Manifest
@@ -0,0 +1,9 @@
+DIST flask-mongoengine-0.7.0.tar.gz 103676 SHA256 e5031d1f812181699b10fec76d7c9c6633f19f8b686dcee48371e9216884f2b4 SHA512 3a9ce923b5d391e4fbdacc87d32e6cd8e0ada592c9fce585cf6dc38b8c116966cd70c83c2f2b77f580348722351c129ef38d7788f9ae2bd27d043de0d5487493 WHIRLPOOL 20583285ec18871b750c045a1dc911d6c836b152a27816b81805f12808dd68450236139245fd6ea07c9239544a7a62dafd358feaf13304910b6c6301f5f32567
+DIST flask-mongoengine-0.8.tar.gz 115524 SHA256 24b30f3cfce95a53f0ad7ce14aa5eb24db7a6db756e1549056fb2b4b397b045e SHA512 fe64765f5ce5e9d9b6919b29bae5ed0faff98e42f2ae99283c8492e5c82def0ec90afabade92dd8ee7805ca65dd6f529b266c8518a95328422f57d5ab18283e3 WHIRLPOOL c38f5c00de4f8bbebe045a1b7d4ef7f9460209c4f2eac17e0a00dc7b86f1550a5e6f3a601ee00f9f107d05345e07b195ece63198bd31ecaad72dacd4e38acb88
+DIST flask-mongoengine-0.9.3.tar.gz 111690 SHA256 01b66bd9bfdef9cc9e7e7102e1f86e772e6777c36d8577b3ef5c94ba3216bde8 SHA512 15b8031e4f8a9275fa6a602aed8466533fc9e6eb408d8f3316fc8814cc785feeee59dae25f40c1c30371e7e33bcc8727bb866bd99dbee0dc75cf15049576fb3d WHIRLPOOL 5b8de916e67f7fca9dffc053ca9e18e390fcfa2afa576d57760770b5e15051ec9accc256f5c6ecc5fab4949d0e27142b2cccc0ec72c8415b13cc4a49b29d01cb
+EBUILD flask-mongoengine-0.7.0.ebuild 693 SHA256 38b5744a842abb225841004930b73e5e098a57ed0794cf621d0dbcbd4e061d08 SHA512 60e69a8e740970112e633c34ca288996ea480709efaef8a0c1babee254960bf0214052c75e1297d1b4750803f9100bb9f0d80f1a992c75716f4fe4599f27bca6 WHIRLPOOL 76cf5c2fa6aee70cd8b4098e573c614d09d6d834d0c0071d3fb7061cd9ece30bb74855a9e4bb5dacb98ef5cc5f1eb2fc16e60ae5e0e0153577c6668c884831a3
+EBUILD flask-mongoengine-0.8.ebuild 1171 SHA256 bd980f3befc52ac60d9b4a3e4c96b29b9e8e7c17ca88901cd0afb590c1ed25df SHA512 e2dffd474105ae8d2f64bee69b712b07ca0408b5454017d541cc11a5075ea800d38b375d3df856a1ef3d2700d7f711b2685bfd8ec8d46aed53503c4e709bf24d WHIRLPOOL fe90de2c710405abb6af44c99770b4798392d26cbba5f30d9a03c203588ff9ff3ce47a32429dbac6c147496839b3d7355f2c9e75ebbcbfa5febcf9e40821c9f7
+EBUILD flask-mongoengine-0.9.3.ebuild 1171 SHA256 2365b9e0ee1c700b468fdf517068188767fc79413e17291b5a137d1659e1f275 SHA512 42a1c13a90b334a39e2007b85b066e23e71733f28f4d70996b7658ca874ec104b6611a40960d0449257610622c37a352b16d095fad52ddbcf280ea74de733384 WHIRLPOOL 55f0b09bf9123b56677df4bbf4bc92624700c1a32a0ccd183f4acf50ca6b427540b074094b2aca2b843e71778d141412cdb2ffee3c7b5a8980e5dbd5238a9b79
+MISC ChangeLog 2707 SHA256 5d462ffece1c5ca4fc6c93c68a9ae610d912ab26e35eadb58e56ec7bc3d1104b SHA512 2045b065baab7aa84da87ea1d494ee7bb19b130797d3c561530498e941f12c977e3e84c9dc20d9ccdb1c2a871bc73ab20fe3fca88e1aee162fc6f34575f7c004 WHIRLPOOL 8d7a80c2c10a4f0d2a2fefdb2a8a84b303e291f3e3c73bb67132d61154a70f9a0569f71f665ced6a44e515ce5ec5f9e0380718f42417b5ea76259d892243309b
+MISC ChangeLog-2015 909 SHA256 5fb95ad620862e76348a617dc339826853b36ea37e11a0d85ace8b80c9f0ab96 SHA512 7348f461312c791b58bb2466f7fde15e338d2a35ffb4d6d78a593bfc7762d495c699f7cfb9b8cbed6391842f2c5d0a05cc05c522ebe6125827460cdc6a46b775 WHIRLPOOL 661f70e61b563db1e56f6d2107d122dfa2fd77bf1980deb7ca1db8e8991feea38fe6fd7a569f1e2bef1fa5b782dceb82c7576827aa0677be5e3d85ce5b73591c
+MISC metadata.xml 330 SHA256 82edcaaaf1a145dc4c56abb7c0ce59b5d3c6df93420ed1a0692e94d87f64298b SHA512 02da72329c4df28bb5298edb25f2a79117214feda68a264f7885406e8b8a5287ebad89c31f110ef2a409e1d3ecca525155ff2b6a7b2d2ed798342f02224b8b66 WHIRLPOOL b520d1a9f6cbb417004083572f96ea47c7a1a0f2e26ca6febb22bb8da0300334a42939600fa6e655f6f70039ffd4cc0f3ba9d8eb09726667a3b89aff6b82b9bd
diff --git a/dev-python/flask-mongoengine/flask-mongoengine-0.7.0.ebuild b/dev-python/flask-mongoengine/flask-mongoengine-0.7.0.ebuild
new file mode 100644
index 000000000000..61eef2c8ef20
--- /dev/null
+++ b/dev-python/flask-mongoengine/flask-mongoengine-0.7.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+RESTRICT="test" # broken
+
+DESCRIPTION="Flask support for MongoDB and with WTF model forms"
+HOMEPAGE="https://pypi.python.org/pypi/flask-mongoengine/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/mongoengine[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+	"
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-mongoengine/flask-mongoengine-0.8.ebuild b/dev-python/flask-mongoengine/flask-mongoengine-0.8.ebuild
new file mode 100644
index 000000000000..ffd9e8b8476b
--- /dev/null
+++ b/dev-python/flask-mongoengine/flask-mongoengine-0.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+RESTRICT="test" # requires running MongoDB server
+
+DESCRIPTION="Flask support for MongoDB and with WTF model forms"
+HOMEPAGE="https://pypi.python.org/pypi/flask-mongoengine/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/mongoengine-0.7.10[${PYTHON_USEDEP}]
+	dev-python/flask-wtf[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# fix distutils sandbox violation due to missing test-deps in normal build
+	sed -i '/test_requirements/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-mongoengine/flask-mongoengine-0.9.3.ebuild b/dev-python/flask-mongoengine/flask-mongoengine-0.9.3.ebuild
new file mode 100644
index 000000000000..04d379eae398
--- /dev/null
+++ b/dev-python/flask-mongoengine/flask-mongoengine-0.9.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+RESTRICT="test" # requires running MongoDB server
+
+DESCRIPTION="Flask support for MongoDB and with WTF model forms"
+HOMEPAGE="https://pypi.python.org/pypi/flask-mongoengine/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/mongoengine-0.7.10[${PYTHON_USEDEP}]
+	dev-python/flask-wtf[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# fix distutils sandbox violation due to missing test-deps in normal build
+	sed -i '/test_requirements/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-mongoengine/metadata.xml b/dev-python/flask-mongoengine/metadata.xml
new file mode 100644
index 000000000000..2ef0c031b99c
--- /dev/null
+++ b/dev-python/flask-mongoengine/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">flask-mongoengine</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-nav/Manifest b/dev-python/flask-nav/Manifest
new file mode 100644
index 000000000000..b177427600ea
--- /dev/null
+++ b/dev-python/flask-nav/Manifest
@@ -0,0 +1,6 @@
+DIST flask-nav-0.5.tar.gz 11579 SHA256 68a608aae8c6c21453247cc288595c9d52a6b5f3bc31d9a9ee3fd7a1f9c28c47 SHA512 94ebd858754c0ac936b43762cf427c381faa40de86e73b487d6b415d099696e6216b96ad9fefa62516cefd8e51e7ef282e01e1a492783ab696a9fd3602de7e78 WHIRLPOOL f47f6773fd31e4a959437159c5de88f6463ad890e36387cf205ffd42d4de41f375f8264f568bd192ad4f8235cf6e5a6651c2ca3b5dbf14a785f749ab8510a098
+DIST flask-nav-0.6.tar.gz 12270 SHA256 53c7c97cbc75ab904389331a7c8870314c040a668914c3554aa77dcd36609f86 SHA512 a7930687425a53fac9ad9a7cb65c2e2a759a0c9660189965bf37ea6e9925dd869074d37a283801631b3e6c3391f9f4167e0a36294104f72970e876b5a7a0930c WHIRLPOOL e29e32bc4c49049bc0660df9e0ba6737ee48f1841b34314b937b5b41b443d4fb0fccc3e9c5502f68a0486b8eb2218a6a9539b22892af4d65e47019669d46864a
+EBUILD flask-nav-0.5.ebuild 1008 SHA256 fd068771dec1e185c41b9fa5dc3abba2552a32efc5d68063de5be6a804dd7fb2 SHA512 8afbc43d220ee67d07f66bb0e1ae316c80a8d6136a1fb2215609c3e59162964f014b2425c8571a3b2e3b49dd66626f1b1d5e6ba2b6337ba87a8eb3c067ad0956 WHIRLPOOL 9b647c69bae6091fe3651eba07344ed7f34e13daba45ff080986c99406e76a1491dd3f70c4fc4bc1e7f58c161556e5d1cb45c95407add88e57060f96fc8bc470
+EBUILD flask-nav-0.6.ebuild 1187 SHA256 6f25269d3c25e40dc429dccea55a4ed3b8f75b05d8fdef5fe9a18fec1dc54020 SHA512 7c0516b778bf68790cf744992e59a9a167dd806b0fa64390cf3825bdf3edd5d5e9540c7516d362eb9cb99ffd674253db2f8bd8db7bbf393f1fd5eb3de3e4b4c1 WHIRLPOOL d757d09203d82c34b0634436ec11e0811a0b0ee7875e0c19112eeda00a99f1ce83f29dde0f67547fcb98c32c06dcd40601806d59c781123ed96d8ae5c9339e41
+MISC ChangeLog 654 SHA256 4d94ed4168167b6a7efa0a93bb31d95c98443796802ecfab32f1ccaf6dc51fd0 SHA512 9ce0c82bb536cca98d60b22eb07e3907c38e3ccac558c43ba75260b5dc458d05e9683bce94c5db5aadd8465f19c5fb063d6a2f156a786150ce9d632c182066ab WHIRLPOOL 630b99e4cc5721881b66a7c0a4c5345b3aaa76e8352464d9c78bfd2baaf4a43ac194b924c730fd750fbb76695ad33e53a184476c9ed8bcc8647ce3ddc20cb912
+MISC metadata.xml 555 SHA256 30e30d3ca620ff2aa08182f4340e7e540e0dee4d523d8da8b3dfd671435b7c8c SHA512 7e49b189e66f0faed8349f3f0f3d3262c49e45224f3167aad49ab71f09d42843830261d04cfb4a6779959789307828fa8c4e2f8263b4e5ee6bf5784df4c1d86c WHIRLPOOL 5f6de023fea591c41d66bd2eccf8b0c135220f9ee8bf0f6628c068ac57e62f8e080f21193bcacac2f726d45fdc03d4e5e87eadd8f1e686f6a5652110d53e59ea
diff --git a/dev-python/flask-nav/flask-nav-0.5.ebuild b/dev-python/flask-nav/flask-nav-0.5.ebuild
new file mode 100644
index 000000000000..fd208ca6de37
--- /dev/null
+++ b/dev-python/flask-nav/flask-nav-0.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easily create navigation for Flask applications."
+HOMEPAGE="https://pythonhosted.org/flask-nav/"
+# docs are missing from PyPI tarballs
+# https://github.com/mbr/flask-nav/pull/12
+SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/dominate[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/visitor[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-nav/flask-nav-0.6.ebuild b/dev-python/flask-nav/flask-nav-0.6.ebuild
new file mode 100644
index 000000000000..2c76b7a87243
--- /dev/null
+++ b/dev-python/flask-nav/flask-nav-0.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easily create navigation for Flask applications."
+HOMEPAGE="https://pythonhosted.org/flask-nav/"
+# docs are missing from PyPI tarballs
+# https://github.com/mbr/flask-nav/pull/12
+SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/dominate[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/visitor[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-nav/metadata.xml b/dev-python/flask-nav/metadata.xml
new file mode 100644
index 000000000000..af1c6276a546
--- /dev/null
+++ b/dev-python/flask-nav/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">flask-nav</remote-id>
+		<remote-id type="github">mbr/flask-nav</remote-id>
+		<bugs-to>https://github.com/mbr/flask-nav/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-openid/Manifest b/dev-python/flask-openid/Manifest
new file mode 100644
index 000000000000..fdae0722d81d
--- /dev/null
+++ b/dev-python/flask-openid/Manifest
@@ -0,0 +1,7 @@
+DIST Flask-OpenID-1.2.4.tar.gz 42570 SHA256 7ac41a5816e32a69333f6798046b7bf73d8d9a6c0051ff8c687c336fe1fefcb2 SHA512 3a9cf29c425747fd2f00b0200c99eece4c66b29e3ef56c78c945f9da1029fceb59053798a26209289625c2e2a2e9118531ac2fced82758c76bc8002ec1d58ae7 WHIRLPOOL b072e34245f3e2d504b424769dcbe29c975fbb4133031bf8e4881592ceec99f9ac897b562b37c9cf33a9ef25074513a1d4db2c8b52950147d3e9d6e10c761dae
+DIST Flask-OpenID-1.2.5.tar.gz 43369 SHA256 5a8ffe1c8c0ad1cc1f5030e1223ea27f8861ee0215a2a58a528cc61379e5ccab SHA512 20486b3dc8364842f36bfeb2b8501c75a36ec7a16ecb43e826d67ecb2c91846be4e29f1f0bf616a85c5a264446ddcb7dfa52019c9809e8f6be77822e9f69b003 WHIRLPOOL 652c77bc53dd4199d6119928161a5e645c0c4dedcb2c633b829b5acead4734518ebc0a5f97301300681f3051cd59a0ca608b39d83a633c83dd92ce2b54cf81f6
+EBUILD flask-openid-1.2.4.ebuild 1035 SHA256 41ae4c3995db9e52c810549970d7dfe10221374c641dcc783bf4be8f29254ac2 SHA512 4c3adfb7b1c9a39b374a702331e64d011f0a398fc869590ea88fe18fb425ff10c9a9eba32b50489fc0adad2a6893814a0c3ff66b65b1fdb568baa107686650f3 WHIRLPOOL c56591231a43b23acc5d21d8d45aac9de7fca13c7e936cd72a41b1467be4c687f0972552b1f10743cef7740ad615eabbcfeb19a488f04e87a62bf5d4f2fdf8c6
+EBUILD flask-openid-1.2.5.ebuild 1037 SHA256 48e285a4a50c2cd1758946ee7c6a75064670d5d11013c24ecf21c55445cec490 SHA512 62f89ad1cbfa49a490715d349ad366eafc8a5e512b81355ff5d2544a468aa067b8f3a9a209f797c87d7900d51d1cd7964497268d74289abcd2ca903b406d58ca WHIRLPOOL 7dbd1d6eee72efbdc3dcaa69ab330b7faa244795a98f5400c30af8bc3788be2f9ea70542068eaaab7c181f46bc8ff581dce08114d6e406c8aba534ebae549af3
+MISC ChangeLog 2839 SHA256 5315989d439e923e89389b37e872f5b54d26dea3157da02eda88c6f2c05d8d8d SHA512 e2c488b733fcf01039b461b76896b6b3daa1df8903d25773315109be62de130df54242905edbd33aebe93e9eb110f8d2b5e0549f90be91a6d761204e78b6c67e WHIRLPOOL 25d64acd95c1b930cf496f663ac25406ff5f438c3841198ab36d1955b2f8d1923509e72258754566661ebf9419a6fc81c41b74a61da35156324849b4afc95973
+MISC ChangeLog-2015 2029 SHA256 22e638873c0fbc616ff9cf03eefc813cf65c8b8804c8f9702799da9e7e0c9f6a SHA512 935c6e7518c0ca0070b1cb9900a8da50c08b4b247e5cd6d2352a001465eface7133af10198bb035d2eafbfb729ccd87d98873d139f376d0558eb98b09205bfeb WHIRLPOOL f5e9abc009cd6789879d78e9a4cf1a84ae33e894afae2e6687539029cc34883e4784d31a51bb2f7dcec9903fdc0b731b97302e58af125e2be29020fb8b57f56d
+MISC metadata.xml 315 SHA256 e6a7fedd0e4116b8fc8805eb237f9efe76f229c7b516fd701788ac1bb20c1dd3 SHA512 5263ba5dd535395613b174284d4eee15958167c326346152a62da40181b81e98dc6b2df22c6dc1d009f91d6a29ac375c68cbd46ad87ed744d8ea93af52444d12 WHIRLPOOL fd8066c98145fcb254378154b9643b2d680ff02475c0e0d961d003fa2a24d03bdc72f9fd7f08262d920337f499a0514a1b60f371b5491ec936c9d40d09c332a4
diff --git a/dev-python/flask-openid/flask-openid-1.2.4.ebuild b/dev-python/flask-openid/flask-openid-1.2.4.ebuild
new file mode 100644
index 000000000000..cae113a90ca1
--- /dev/null
+++ b/dev-python/flask-openid/flask-openid-1.2.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Flask-OpenID"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="OpenID support for Flask"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-OpenID"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/flask-0.3[${PYTHON_USEDEP}]
+	>=dev-python/python-openid-2.0[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( example/. )
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-openid/flask-openid-1.2.5.ebuild b/dev-python/flask-openid/flask-openid-1.2.5.ebuild
new file mode 100644
index 000000000000..ae474adbe382
--- /dev/null
+++ b/dev-python/flask-openid/flask-openid-1.2.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Flask-OpenID"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="OpenID support for Flask"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-OpenID"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/flask-0.3[${PYTHON_USEDEP}]
+	>=dev-python/python-openid-2.0[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( example/. )
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-openid/metadata.xml b/dev-python/flask-openid/metadata.xml
new file mode 100644
index 000000000000..84d84ad328c2
--- /dev/null
+++ b/dev-python/flask-openid/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Flask-OpenID</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-peewee/Manifest b/dev-python/flask-peewee/Manifest
new file mode 100644
index 000000000000..ee51938894b0
--- /dev/null
+++ b/dev-python/flask-peewee/Manifest
@@ -0,0 +1,7 @@
+DIST flask-peewee-0.6.5.tar.gz 702466 SHA256 7b39fac44b86e057a44fc059193e444cefbf3aa7807ba3022fa090ac50ce89c2 SHA512 4e1f01d78d1c778cd95a784920d8cfbddc712b8224d93cd0dfe566ee007b781dc4b353bb27c4240475234660363b2b77093d504bf5ef90f358e116f8373020d5 WHIRLPOOL 14e89a5cdf83dbebe377eead7fefcbc56463c889f753fb56198808f0c739c67a68e39c8ff3ad0a304d0843f99147a9771bf0769a731ad28e2d07d28ae084824f
+DIST flask-peewee-0.6.7.tar.gz 701725 SHA256 06da4feeda28dcd8a800c37da7363bfab0e86fda548dbb789e4b85ef3dca3dc8 SHA512 77c4a9b295f829c11285c2596f83bd08f5a9f63e5e9ae193b1625bd25d426434aa24dfd59d35ef0bf6a1521bbb4f554c414455b7f10ba9d25ec5bf228a8a8c5d WHIRLPOOL 0056c132f03fca8743189c52f725e731477c5189b9b2612bf0fd570966b5b6c6914357d4ab0a25fd73e8cbddf5d46a1c850df3c7946f3eff5166d4e408f193c6
+EBUILD flask-peewee-0.6.5.ebuild 673 SHA256 7fbaf2de2a0cac542edd32941f07d67b2a436e42b571dca111e53cd61ecaa963 SHA512 538da434b23e72bf90015452a3dc62b180f960913cfe84e3b8435b5c100d0a41a1ba52e4ffff7a6761de79ec1d7a2d6083e5af3ab707d17d9c89c612de91bbeb WHIRLPOOL 5bbaaecf7bc431e0b95a3034b2187bb99bfd4774c6e00a186fa27038406351ac00b563b03639e4aea4afb42af5340abf85f888996b52ded40112e6d495014088
+EBUILD flask-peewee-0.6.7.ebuild 1092 SHA256 953a77246b1d62fbb63c13e4a038a3a234cf7242fa3fc6c7787ef69a8eb89809 SHA512 8fff466a02c01f54943b07e3d167bf4af3a01ded4d8082cdc31f2973a2232f1214321d8098c3ed2c29557ebb5e1e88580d8c4e1180382b61dda5db35d793a232 WHIRLPOOL 55763607faf803fb87b0633070e6aeffd010a8225711a396ba2e5546b3a468ccb18169de5f9e4113dd972217a24641ff11b83b5a5a8be39ffe6c6610a8296ff5
+MISC ChangeLog 2662 SHA256 bb8f2af37a257fc7167f9095c27acb518efdcdbf86f6202fb5f2ae5ce71f067f SHA512 e0699d99d2f1149d713866fb7eebbd2f503aa4f9616aae7dcf6482ed1ab3f60f5e1f0a0962efbb115dd52906bdb260dd5ccfc708b7e716a14378a5f93380564a WHIRLPOOL 07360ded90d75f3f65ec3df306df091b04d5a5b91b18dee0f5fcaf33d3bfe3534cae0e5f93adbaa9b60ff9abf442b1321b8b67b5725ea16c66d38b35510002ac
+MISC ChangeLog-2015 869 SHA256 ff70c4156bb6869c6e16ca350c432415a28c0248e7450aba800ae781270f8dd5 SHA512 e846708eb69f3c193d56f9dc938dc78ab18b4495ad0db0474e1e65b9a5162b424abba0463c937dee24dcb364058713ae696fc33ddebe5e85fae69719cdcfb3b8 WHIRLPOOL 5d94ec1ff27d4a5e90b40af71bb5a3ec8d4499728d1f6626b88921b035475a32706fdf615ecc65a13dc160d4b2aa6e2e04cc1fd806abea401c3f984c52df0dd8
+MISC metadata.xml 325 SHA256 e24ed7a749abb9f3eeaa07f1d27d9d22a050ed6a96477ead9b6a280376ec103a SHA512 97a4ef0f5aba0c0632da8be3db3c2d204ecd9e8537131bcfa4e91c489695cb9b0278ad6a199e9c447ffee01190f5a96e4cacfc279cd68d23bcb1e910c1e72c97 WHIRLPOOL 2a19c2f7847e79c5e69568dd5d9b5ee9c7d0cf034a5ff8ff335191b4c575b81e613518fc296e09d08cb566ba43c00e3f149d99eac717bf18d158d5a5dde8e82c
diff --git a/dev-python/flask-peewee/flask-peewee-0.6.5.ebuild b/dev-python/flask-peewee/flask-peewee-0.6.5.ebuild
new file mode 100644
index 000000000000..08f05b45ad78
--- /dev/null
+++ b/dev-python/flask-peewee/flask-peewee-0.6.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+RESTRICT="test" # broken
+
+DESCRIPTION="Flask integration layer for the Peewee ORM"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-Admin"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/peewee[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+	"
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-peewee/flask-peewee-0.6.7.ebuild b/dev-python/flask-peewee/flask-peewee-0.6.7.ebuild
new file mode 100644
index 000000000000..0eb43f0f4aad
--- /dev/null
+++ b/dev-python/flask-peewee/flask-peewee-0.6.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+RESTRICT="test" # broken
+
+DESCRIPTION="Flask integration layer for the Peewee ORM"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-Admin"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/peewee[${PYTHON_USEDEP}]
+	dev-python/wtforms[${PYTHON_USEDEP}]
+	dev-python/wtf-peewee[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+	)"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( example/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-peewee/metadata.xml b/dev-python/flask-peewee/metadata.xml
new file mode 100644
index 000000000000..77151382fbb1
--- /dev/null
+++ b/dev-python/flask-peewee/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">flask-peewee</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-principal/Manifest b/dev-python/flask-principal/Manifest
new file mode 100644
index 000000000000..eb574af2084b
--- /dev/null
+++ b/dev-python/flask-principal/Manifest
@@ -0,0 +1,5 @@
+DIST flask-principal-0.4.0.tar.gz 17287 SHA256 ed8c58943460d7d54c29463e2fe98ae4969d3818c0f59b36e9b2649128db96c9 SHA512 ed8cb28c4e8d936de96db0bf9f7cb45b253dc204c4b8f8dd8022ef1552592ff6324b4a33d3ee862794a6e20eb8c32a0365e7b9397d427da5022c5ded3dfa308a WHIRLPOOL 66fd5fd659c4984b604d60bdd4b7733644d1997fad761b62cee68196f84d4c5ceab81ea54728678ec4f94ada4f6e1d500ca9ede14c94d90e6e56e070389da735
+EBUILD flask-principal-0.4.0-r1.ebuild 761 SHA256 bbe94cc77cd4c18b6f40641f75434658a8ade37dbe264b9d1f911a796e984035 SHA512 bd4d370e48ad8762505d55c90339defb10340cd5322c633b3fe468f08a6fe9f08f8e76c0ef45414a007dba6acce3736e920a1cb6dc77ce58c840db5d2d7e41e8 WHIRLPOOL 2b6feb71996156a80b78bea13ad0698bc29e4c5df29d2fe42cc7832f310e0e172bc29358b80b8347ab7e6c3905932695fd6c0d6c869431ee375dca32773f10a7
+MISC ChangeLog 2815 SHA256 3970abc1c9a5a8b5da1c62957c0e945724620132edc1697a5709d25dfa3d567f SHA512 a7cdf464cb1db8c76ad6a87962651466b8c71c46ce3dd473300aa8b8e26b1d7194bcfc58b257aeb3c9a81f0bb73bb92a3aff2d909aada3214bfa0f1bef694901 WHIRLPOOL ce2fd6d6ad92e5df061b271f91fe1f20ded8dc65110aa90ab43beb3723bcd5d19145707d6193bf11a46aaaf3afba64f8e4a013c9fd82b6f10a298892ea721214
+MISC ChangeLog-2015 819 SHA256 f156ec997a383dcfe22cb1bf1623942d4a4d67c7d9d5ee7d9cb04be1f8ce9e3b SHA512 368d68a2d672a399392942cd759dcc60b180c187aec12ffc35f7f0b87c5cb599ebf890b62510ddef3cead404fc91a373c2fdc48dd43e601eafd8a5f10b83fed7 WHIRLPOOL 8e78ac9f35c22d829e403bf52df463a3687967cd3a6088f8b920a3b973ba7bb3c703326ed553994fbf5c2227ba35206c3ba4f01930e1922073508e0ca823d30b
+MISC metadata.xml 385 SHA256 c8ea5f3baba654d8331861c5a87fa59212aca342741c7a3266eb910f243d198b SHA512 453ca2da57ca6cca5d2b4d55f048827f0a62e5d629af12120a314117a2b11fa405402580ba5da933bd5eccb924816dd6471a64cbe409d13c22f3a923ba815f0b WHIRLPOOL 1046bcc6aa8c092384a1829e81b3843325148328f844a042c472cec4c799d95fc933138d2825b1be5a9d0a3a3a6e079b28c11ba324668baaef3a7d63de9b4ec7
diff --git a/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild b/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..0532d9f272e9
--- /dev/null
+++ b/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Identity management for flask"
+HOMEPAGE="http://pythonhosted.org/Flask-Principal/ https://pypi.python.org/pypi/Flask-Principal"
+SRC_URI="https://github.com/mattupstate/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+# pypi tarball is missing tests
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests -v || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-principal/metadata.xml b/dev-python/flask-principal/metadata.xml
new file mode 100644
index 000000000000..b3f5173ce7bc
--- /dev/null
+++ b/dev-python/flask-principal/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Flask-Principal</remote-id>
+		<remote-id type="github">mattupstate/flask-principal</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-pymongo/Manifest b/dev-python/flask-pymongo/Manifest
new file mode 100644
index 000000000000..4af91d19febf
--- /dev/null
+++ b/dev-python/flask-pymongo/Manifest
@@ -0,0 +1,8 @@
+AUX docbuild.patch 618 SHA256 c0ab38f946bb8465c7e028a695adf1648bacb4d2f55b32f13637f769aa6fc923 SHA512 20ae49b16c4070e9d988e27a3eb7ecc35106782150bb24b95ef1656707d4ba4311a04aa86c3bdf1ef5886fef3ca41fef0ed8ec99260a44e742dcc00d3c63c1b8 WHIRLPOOL db7a307408984f236417e46ea3cdb1ecb9d464c77d08369063ce5e6d6b06762987d3bce16f6732896ba075aa97b8209c036088bacef8e4b282b4a35a124f0f42
+DIST flask-pymongo-0.3.0.tar.gz 21019 SHA256 b1ab5c38f43a8f7ae3e981fb8e0a5d58fb47b066ba0c1b647738e68690f62473 SHA512 669e2c2df4c3378aec0a9f401120ceee2bfb0452a093beca6e7adaffd764bfe0a90a5e5b82d0945933693c3c179f3a0bf56cd4a2e03ab0522065eb650550ff44 WHIRLPOOL 4563628d4d77dbcc9253520636875774655865ba9510b955afe5509da3e9e872b97355649b61ad59e4693c018216f82b7757129d32c112cb95212bfa0c703c23
+DIST flask-pymongo-0.4.1.tar.gz 22323 SHA256 0187dcbdf6a724556b3a88cc58b7c425449b0524568288894ac1c18f3762a73e SHA512 2d64ae430ee9592204462b5b81b4fe2d0f5fa8e17e03e1b139acf28b11330d7ef990108f1d49e3b968618acaa2ffdd4e26901b1e03b85f8f25ef05d59f5d6d83 WHIRLPOOL efc38195a1ea321ab5392b8b0c13c0327fcba4ebb163d87ea01245f60c59b8f2473b9c7bd349e47c9535d5089ac9934ca0b2135b54b2a7045cc5770eda2eadf9
+EBUILD flask-pymongo-0.3.0.ebuild 1080 SHA256 3bcd32d116724b69168d00395c2a10ea559843708ff9168f1b1df709f91b0f24 SHA512 ba4f857ad3c15f4a20c5d90458b60b02dfd704708a939e8347e2be396b3a2be0c04a01c00baa95997bffe8890fd865e091539ec1a33ae3871003ea6e53fb80b1 WHIRLPOOL 992e8c8f22836f1cea56534e525ad683842de43e679e16363be3b9a756d02785bb9cd52f37bdb185d2cc93ce255b6bb932987ae874811cd6c967c37a8ad4ebf9
+EBUILD flask-pymongo-0.4.1.ebuild 1135 SHA256 8f76f477e4aeff7fe3501639808d4369b32519b98a8196f181ad61f6e03d2e7c SHA512 8f4c004163d4db9cbb42daa868fbb23bbeeb777d8f9a9d00c92160c54d30a57b48cf07f700894cda781928a095e5ba28441135ef5bc91fca1b9a6ddabe6e3620 WHIRLPOOL 974042b8a09b8ca4f31da19bb839bfe928569de2a44a12d2c8e07e3ce6b3dc26f61991f7cdb425f74740666a9d8e071890389e80f32952f3fc0829dd4907984f
+MISC ChangeLog 3235 SHA256 a677d1e37527a5078be54cbfcd956bda55cfcfb1c85b776443130bd68bf2caa9 SHA512 55c663f2de3429e19ff4d063a331efa7737854ec6134b3e25224771395326cb2c984cd79533450a972c200f513824f43b6ca3e020707e1886bed7ee629e50be6 WHIRLPOOL 8f1e813e9a159deefb7469f47615e2ccb668815682d86d47182973bc93e7508db9e2401879af45a0622e2f328ecf253b71e16ebbaf814895c1bdaf8bbaa04cfb
+MISC ChangeLog-2015 2157 SHA256 4db941e8a0b38f208f629140ef47ae1b2ad5051273b02379311e627c5e7b17ea SHA512 3379fffc38f63adcbdd592fcc6bb0b507f4e5a37704eb9b2200a2c6c2fc2abaeaa650ba6e18d7165525d9f80c04ff025d56bf1029703df66472ea15c5c64c023 WHIRLPOOL 86bd6a6f8c34bc0d4550aca60890a612abf1fff9dd6c8a67e3fcd972db3a781805563efd7c90a60026a3f823c9ae01d8b9b3855cd48785dc95d53477e43e21ec
+MISC metadata.xml 503 SHA256 badaf7eba977df6c39644dd858a789f8c44c13e5a4add80ef1036b4ad12580c8 SHA512 9cf902fcc48e65e0676376dcc1d7a943e5df0852c905b98cb312305e8b3d61bde14e85239e4976d0bc27f7205ac1c9dc84114177217397bf7ccb755744a36cf8 WHIRLPOOL 26397baeaae775b335cbc6327c06ac42b0d5f61cd42d936fde6621c0dbf4f42061dc76680b4a03b270626524f3f1ff85e785ed844618375c6529b32562b63d8a
diff --git a/dev-python/flask-pymongo/files/docbuild.patch b/dev-python/flask-pymongo/files/docbuild.patch
new file mode 100644
index 000000000000..6ecdeb8cc56b
--- /dev/null
+++ b/dev-python/flask-pymongo/files/docbuild.patch
@@ -0,0 +1,16 @@
+Avoid un-needed d'loading
+diff -ur Flask-PyMongo-0.2.1.orig/docs/conf.py Flask-PyMongo-0.2.1/docs/conf.py
+--- a/docs/conf.py	2012-12-23 00:52:16.000000000 +0800
++++ b/docs/conf.py	2013-06-10 01:26:28.430485499 +0800
+@@ -247,11 +247,3 @@
+ 
+ # How to display URL addresses: 'footnote', 'no', or 'inline'.
+ #texinfo_show_urls = 'footnote'
+-
+-
+-# Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {
+-    'python': ('http://docs.python.org/', None),
+-    'flask': ('http://flask.pocoo.org/docs/', None),
+-    'pymongo': ('http://api.mongodb.org/python/current/', None),
+-}
diff --git a/dev-python/flask-pymongo/flask-pymongo-0.3.0.ebuild b/dev-python/flask-pymongo/flask-pymongo-0.3.0.ebuild
new file mode 100644
index 000000000000..9cd0a4282138
--- /dev/null
+++ b/dev-python/flask-pymongo/flask-pymongo-0.3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Flask-PyMongo"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PyMongo support for Flask"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-PyMongo"
+SRC_URI="https://github.com/dcrosta/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+#SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+RESTRICT="test"
+
+RDEPEND=">=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pymongo-2.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/docbuild.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# fix me
+	nosetests tests/{test_url_converter.py,test_wrappers.py} || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild b/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild
new file mode 100644
index 000000000000..08df937c350b
--- /dev/null
+++ b/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="PyMongo support for Flask"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-PyMongo"
+SRC_URI="https://github.com/dcrosta/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RESTRICT="test"
+# Testsuite appears to require a running local instance of a pymongo server
+
+RDEPEND=">=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pymongo-2.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/docbuild.patch )
+
+python_prepare_all() {
+	# Req'd to avoid file collisions
+	sed -e s":find_packages():find_packages(exclude=['tests']):" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-pymongo/metadata.xml b/dev-python/flask-pymongo/metadata.xml
new file mode 100644
index 000000000000..3ff5bc660e12
--- /dev/null
+++ b/dev-python/flask-pymongo/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ultrabug@gentoo.org</email>
+    <name>Alexys Jacob</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Flask-PyMongo</remote-id>
+    <remote-id type="github">dcrosta/flask-pymongo</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-restful/Manifest b/dev-python/flask-restful/Manifest
new file mode 100644
index 000000000000..7d748d40d002
--- /dev/null
+++ b/dev-python/flask-restful/Manifest
@@ -0,0 +1,7 @@
+DIST flask-restful-0.3.5.tar.gz 113214 SHA256 30f3433c32d3251b83779034513994df93635db81bf5cd5122a4e0415dd3f5c1 SHA512 a541e6739644b4db6ae97cf529bfc43f3136c97fc19a8538277d1f9be033b7c6dc3e39e1c4b2f313e099efbe750dbdc85c67b527224df557567ecac668e5969a WHIRLPOOL d8d0673380263c25e84ed3e86a83b04bae88761c8f3456dcab7d6d58b9884b1b984c28c861bc091c9693b080c15f2f47f99ff6a3003a7f89dd50df851a7d3af5
+DIST flask-restful-0.3.6.tar.gz 114512 SHA256 1b04bf8246fffc92a33a402213cea5a50b4c586d8a515f53ccc94612df32c365 SHA512 c5136302111e6c8953e038d31b42b029744111bb916dea7ec8bd5fac2de5e17a86d30a7d04a7335cdc5da25ee13f35ad9a6d284166e11cca0c6fec96d23fd977 WHIRLPOOL 1e581d19c833d7b27ed8a1d1e4a73cd478f04900f2d4135217c60061189d8c336fc3c548cc4e89579eb063f2e444347bad98d755fb3895c522c01b50880c74f4
+EBUILD flask-restful-0.3.5-r1.ebuild 1276 SHA256 e89e2f32cfc3abecaf60a605ae77a72c37dc799f37d4f4ad09f4476584178fae SHA512 04521a45045cad73ac9c833ee53e38a01d2b642a9877a350be3e503dc06e3671013e5b4fbc50b3eca57c181e89ac327350645a8778a55d984a0f1bfbd722fbf1 WHIRLPOOL 92c3a9eb0095daa0545cccb3f91acf496d46d4b861c7803cae224e96ebf8c969677f7c8c6fe611d0342b92cae53d51d980ddf8dd3431f11c31be8eb969422b2e
+EBUILD flask-restful-0.3.6.ebuild 1278 SHA256 56bda2cda27d24f65f878385476e6b1d29a1af13bbcba5ebe619c40764b672a8 SHA512 92b23a79a4458c292e3fefa3ac0459ced1e07a55d5b30d58d09842d2dd14f29c5a73abcada5ddfe5901f6b0e359eb69d929fd93dd2c58c7d299ef9bcadad54df WHIRLPOOL 20348acc66b02e6cec8abdee430c2d2e6c7cf7cfca92dba279acce1bc70aec4b29b80b7389a0d46b19afec268d646b643fecb4606a195a99cbd71d9682d6e908
+MISC ChangeLog 3519 SHA256 5c8f6e4c7369abb306f86440185edf36c9e86c3b24adef5a5c60c7a2582d0e0e SHA512 9ba3a3d646a55b849a062cf2d7fc24b9c0799dfc2e549ea6dfaa3b042d2a0ab76a84cba2fdd2eb5c2e3f2c3a2374f443b56a1957c36e7e2ddd434e57963c82a5 WHIRLPOOL 5ad7d1fc413e32e45522d97f6b18b74a8178c1f4897145fc13d69eda674181dbde7268b51687149857e37669d30f380706c2d20310182a8235ff65498b7af40f
+MISC ChangeLog-2015 1330 SHA256 ea09072313f9d7ad1dc0cc8ef67086f3572cd35596876dbdc2db0a7659cbe445 SHA512 cbc2ea6df3ce464d12e8dec61367ee4f874913d2833f42ba8052e0354df4b01cce8b23aaea45dba752434cbd3577bd03f2bb7984232679df841a5b044d65075c WHIRLPOOL 2566f375f25351a55522e9163265fae371398d629af3d1106f9dbed20f35d0f21d4d7bb51fe03216a15d1e3ba3a1a4398de203745529f5034bb907631679efd7
+MISC metadata.xml 400 SHA256 a64469879efad14ae53e8468c15df5717d4542bbbb4805909225bb39461fe3e1 SHA512 be62c37c4d0fd8a051cc14fb2a9dec6885a1e83420bbe95282a0fdc7803d700372b345d83c3d648037c45080246d71b91086b3e4841d9e41fb3003d7c114e0c0 WHIRLPOOL 9055d73392db53098798e48562f1b605c4a7f80ea6883275ed0ede2c11281194354670acbc36912992e09ff828ed36fd6d8b24a2e7ce4db268309a7dfb55b562
diff --git a/dev-python/flask-restful/flask-restful-0.3.5-r1.ebuild b/dev-python/flask-restful/flask-restful-0.3.5-r1.ebuild
new file mode 100644
index 000000000000..b9209fd71cca
--- /dev/null
+++ b/dev-python/flask-restful/flask-restful-0.3.5-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple framework for creating REST APIs"
+HOMEPAGE="http://flask-restful.readthedocs.org/ https://github.com/twilio/flask-restful/"
+SRC_URI="https://github.com/twilio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples paging test"
+
+RDEPEND="
+	>=dev-python/aniso8601-0.82[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	paging? ( >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_compile_all() {
+	cd docs || die
+	emake man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r examples
+	local DOCS=( AUTHORS.md CHANGES.md CONTRIBUTING.md README.md )
+
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-restful/flask-restful-0.3.6.ebuild b/dev-python/flask-restful/flask-restful-0.3.6.ebuild
new file mode 100644
index 000000000000..a55d4e3709b3
--- /dev/null
+++ b/dev-python/flask-restful/flask-restful-0.3.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple framework for creating REST APIs"
+HOMEPAGE="http://flask-restful.readthedocs.org/ https://github.com/twilio/flask-restful/"
+SRC_URI="https://github.com/twilio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples paging test"
+
+RDEPEND="
+	>=dev-python/aniso8601-0.82[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	paging? ( >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_compile_all() {
+	cd docs || die
+	emake man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r examples
+	local DOCS=( AUTHORS.md CHANGES.md CONTRIBUTING.md README.md )
+
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-restful/metadata.xml b/dev-python/flask-restful/metadata.xml
new file mode 100644
index 000000000000..7e42a30ff5f6
--- /dev/null
+++ b/dev-python/flask-restful/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">twilio/flask-restful</remote-id>
+	</upstream>
+	<use>
+		<flag name="paging">Enable resource paging support</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-python/flask-restless/Manifest b/dev-python/flask-restless/Manifest
new file mode 100644
index 000000000000..573bcc935846
--- /dev/null
+++ b/dev-python/flask-restless/Manifest
@@ -0,0 +1,8 @@
+AUX mapping.patch 609 SHA256 f317d3636efd20e94fe3bbb3e785323c137f93f28345d1d42580ed344c78ec55 SHA512 eea22ff633fc5cdfc0349c27876dc8eee11a0be5d76a2fc423010ab2622b219745a1bf89f4fb4dcb9199d8bd98f3bc7ea3b12b2603458c4c640b3643a47134bd WHIRLPOOL bd9106f0463cdf87e594ee915954e1d2f7483a7c795763eecc3b1ba45b678982b37dab81d7bb2401ff3bbaf75f2b9b8729ac0366444cd3f04b3a0816274a1a65
+DIST flask-restless-0.15.0.tar.gz 515022 SHA256 78c07508018f6c417c3f383553d249ae08acf66864b786c1cbb5464cda2b5502 SHA512 156223295a2b1fcb270ed132a9023caa77632559155342381277f427fa069457977f8122bb21425281f1039aaef48c411a5f2677be403a0965abad4af199d775 WHIRLPOOL baaba2a60c424eb75faca35a0840d15b5215489c8ae6c39e513183253d66657f03e6e9544ff57edb0e1b7591f436bb46d7909a8f53179ad866c0fb63daa73111
+DIST flask-restless-0.17.0.tar.gz 527502 SHA256 8c82c4c5c7977b88fd2fc8e6586252afb64b4f802ef4197dfe5630b3fc9a69eb SHA512 96183a8bb285a916e6ad680089c70b4c00fcc72ea26a6862537314f6b588b597ff78f2f1c3de0ae24f7dfc7af53a3412c8179801afa9eaeaeb3505695d44076e WHIRLPOOL 21eec21cd4afb51860ce253b1745cf7b9ee63337e3a4f3fb0b2309f76fc4446189c59741f786575ba7f5d993eee8f7839a0baa35ad191abc2551fc7b5403544e
+EBUILD flask-restless-0.15.0.ebuild 1856 SHA256 f04db9711d1785dc4170e9a3574678835cdb8d86d87cb5a8fd537814de402bac SHA512 fc80475bd36327030867913a8ae79fe7bf45d73efbea57e78ada576e48f12a2011602535cffbf95996d73cd9d2c191b98cb3f3718c3edce6e60f3aebdec57b53 WHIRLPOOL 69ee9a83eb61b8f67706ca50ddd09326030dcf08a0ebb0dceadea3da14dbc005b14e7a3efb070cc67cff9e653d5025d697a9186f000c3ebaab213b8e98cd4238
+EBUILD flask-restless-0.17.0.ebuild 1864 SHA256 352a20ce46cb81912ec8b0da0d66f4b88beeceff56d9d707ae8de991210f1edb SHA512 e9ed6424e3ffc7dec185e8b25ab8eda056605738e6ea02dfa615b20eecf0a3b59fc86b39df5556b0933c139ad875df00f4c2c9423533a4dd5990ad62b563d28f WHIRLPOOL 1cc529f046f023efaa3e40921fdbc57a4ce944931873d0a3b3c6eb9d5daf53c234e0d471dc486e5b98aab47fb8aab5d84b235cfb059a747ca54061eb4b72bb8c
+MISC ChangeLog 3190 SHA256 59eaecbe5788d22efdfaa10bf6b986e773e2f48584ec608e05db038308ca6a7f SHA512 61420a6ffaa2143a3e60f43d6803a5ced0e8d868f6d661fbe305afff5c07e49f0417dc409720cddafc5695a3075fd5e8c7e8a01d356673315538ca7ded976cd2 WHIRLPOOL dad742893962e8d65ea6fc5d414304b59ee985fbd08e7519751ff65e78b3de5a5b05cdd6bd9cdb9c0ad8ebea3c39b4c006702a29ae9b823e7e67830d06e267d9
+MISC ChangeLog-2015 4080 SHA256 91ca9deecea997ceab7c3edb01a7140c2c9629156acd6bcc7dd5c6896512b899 SHA512 07b41976061ef69504c5315d5726f98aee08d584fa8362b8654ea6572a3efff6c62e042e9123528fc998330a3bfb579b04707a6f5b014b014a93a681e3e71e5a WHIRLPOOL 4a7cadabbe6ec336b11928422c67833f260576f57678913f0d1b6a4a16fc523e212714d2570046e502fb43dd116cc054dc46e7b6bbdc297cc4e61f78b87691d4
+MISC metadata.xml 338 SHA256 ca033c1b62bf5de0890f3b3091caad3dbdd92b9e84977f64f7d7c5edaea72cf1 SHA512 cc6bd6a5626d3c650d3937ed2c0a6bc04fe62929d8177b75684eae56e36a63ae89d4e26d37f27d2db40b0673be7c674b92427f25c308f5b866d6eeea80921964 WHIRLPOOL 815cd4510c84be27b08eb5a7dea513692cbac646a2dcb5b96da82806170e38715386001dd586493a3812c8d6e4fdfe4eea278b1cd71683fc1babc98bdf209a85
diff --git a/dev-python/flask-restless/files/mapping.patch b/dev-python/flask-restless/files/mapping.patch
new file mode 100644
index 000000000000..725a20d828f6
--- /dev/null
+++ b/dev-python/flask-restless/files/mapping.patch
@@ -0,0 +1,13 @@
+A number of these settings are simply unworkable in gentoo
+diff -ur flask-restless-0.11.0.orig/docs/conf.py flask-restless-0.11.0/docs/conf.py
+--- docs/conf.py	2013-05-19 01:50:21.000000000 +0800
++++ docs/conf.py	2013-06-10 23:39:05.741199580 +0800
+@@ -26,7 +26,7 @@
+ 
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
++extensions = ['sphinx.ext.autodoc']
+ extensions += ['sphinxcontrib.httpdomain']
+ extensions += ['sphinxcontrib.issuetracker']
+ 
diff --git a/dev-python/flask-restless/flask-restless-0.15.0.ebuild b/dev-python/flask-restless/flask-restless-0.15.0.ebuild
new file mode 100644
index 000000000000..d1ed87369743
--- /dev/null
+++ b/dev-python/flask-restless/flask-restless-0.15.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+PYTHON_REQ_USE="sqlite"
+inherit distutils-r1
+
+DESCRIPTION="Flask extension for easy ReSTful API generation"
+HOMEPAGE="https://flask-restless.readthedocs.io/ https://github.com/jfinkels/flask-restless"
+SRC_URI="https://github.com/jfinkels/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( AGPL-3 BSD )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/flask-0.7[${PYTHON_USEDEP}]
+	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	dev-python/mimerender[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-httpdomain-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-issuetracker-0.11[${PYTHON_USEDEP}]
+		dev-python/flask-themes[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/mapping.patch )
+
+python_compile_all() {
+	if use doc; then
+		if ! "${PYTHON}" -c "import flask_restless"; then
+			eerror "flask-restless is not installed. Building of the docs"
+			eerror "requires flask-restless to be installed."
+			eerror "emerge with USE=-doc followed bu USE=doc"
+			die
+		fi
+		# Changes connect to read issues @ github
+		rm -f docs/changelog.rst
+		einfo "Generating html docs for ${PN}"
+		PYTHONPATH=${PYTHONPATH}"${S}"/docs emake -C docs html \
+			|| die "Generating html docs for ${PN} failed"
+	fi
+}
+
+python_test() {
+	nosetests -w tests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-restless/flask-restless-0.17.0.ebuild b/dev-python/flask-restless/flask-restless-0.17.0.ebuild
new file mode 100644
index 000000000000..b80b28d63d96
--- /dev/null
+++ b/dev-python/flask-restless/flask-restless-0.17.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+PYTHON_REQ_USE="sqlite"
+inherit distutils-r1
+
+DESCRIPTION="Flask extension for easy ReSTful API generation"
+HOMEPAGE="https://flask-restless.readthedocs.io/ https://github.com/jfinkels/flask-restless"
+SRC_URI="https://github.com/jfinkels/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( AGPL-3 BSD )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/flask-0.7[${PYTHON_USEDEP}]
+	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	dev-python/mimerender[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-httpdomain-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-issuetracker-0.11[${PYTHON_USEDEP}]
+		dev-python/flask-themes[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/mapping.patch )
+
+python_compile_all() {
+	if use doc; then
+		if ! "${PYTHON}" -c "import flask_restless"; then
+			eerror "flask-restless is not installed. Building of the docs"
+			eerror "requires flask-restless to be installed."
+			eerror "emerge with USE=-doc followed bu USE=doc"
+			die
+		fi
+		# Changes connect to read issues @ github
+		rm -f docs/changelog.rst
+		einfo "Generating html docs for ${PN}"
+		PYTHONPATH=${PYTHONPATH}"${S}"/docs emake -C docs html \
+			|| die "Generating html docs for ${PN} failed"
+	fi
+}
+
+python_test() {
+	nosetests -w tests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-restless/metadata.xml b/dev-python/flask-restless/metadata.xml
new file mode 100644
index 000000000000..3cc6a720c0ba
--- /dev/null
+++ b/dev-python/flask-restless/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jfinkels/flask-restless</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-script/Manifest b/dev-python/flask-script/Manifest
new file mode 100644
index 000000000000..c158f9eb58ac
--- /dev/null
+++ b/dev-python/flask-script/Manifest
@@ -0,0 +1,7 @@
+DIST Flask-Script-2.0.5.tar.gz 42580 SHA256 cef76eac751396355429a14c38967bb14d4973c53e07dec94af5cc8fb017107f SHA512 257b724c05dde79c99b028c7fa1980b700f273010de82fa9f1bb090b23519297d8bad87e436fa88a63feabfcd8908041d4a5ad9a673e08f4ed15e97310f16fbb WHIRLPOOL 2f05e8524a6f0ff0beca342f77f9c4b4f7f73cca65b2aa1fc21b4184ccc3a2e253f3d07a88c07c56c9ed1e5f3f9e12c4b6999bfdc85a35569def4107d0fbfb8e
+DIST Flask-Script-2.0.6.tar.gz 43146 SHA256 6425963d91054cfcc185807141c7314a9c5ad46325911bd24dcb489bd0161c65 SHA512 03c51213be8e2b86f1f4450565cf4d7e3d9d7257ac017bd53830be57620d581f43bcfe959ef7b621af722c688c56495229aad3dd9654c8a8a5905db0105275fc WHIRLPOOL 3e55418c8fa8023b7ce8ba084ad951a75eea848b7db7c7788592806321021b0bb71b61da613193faf084be003b8abe28c3fe347b5ee5a903f01c2135e73d55ee
+EBUILD flask-script-2.0.5-r1.ebuild 981 SHA256 5a49c90eb1dee9e6386cfbb5870f0dea6ac3bf744a1f039d7235377951ffdccf SHA512 002b6c3f4c58fa23add5e2ac354a4207f8c4d5d670a47903e183dee4e9c7d8a3d31337d40576baa8af73951af40ae06d06aae4f01d4da193beaaaf50b4a712f7 WHIRLPOOL 43f1440cb6d822ff8fc9648898463d6d1f6d6a115ea808e83505fd8906e8bb127415898e0c02a8e9b751b29cb2f04863b1a706531a4cd731409f18812fbe563d
+EBUILD flask-script-2.0.6.ebuild 983 SHA256 0de16a51a71a031198143573df5b3e21585403b4a6834da643d314850ec9dcd7 SHA512 0202966cbfffc1f11e64ccdd4faab1f7374943df22a16f04de57e8c49dd6f2a09708d1d3479dc1ee5cc65f2269eada5bfbc6e383efe4f384c1c693819dbe3699 WHIRLPOOL bfeb9c6a4148bb3a4bf802f0e0cb636a90b3b8058ac5c6141c57c6530724db0af179eae0ab88bb3c12ae06f395541eca2e439adb8d8a7507ba2b7580d7c19a77
+MISC ChangeLog 2958 SHA256 95f6b0c47dcf7f83e936a2eea22b30a6049ddcec314ef3760f440fec0a5fde6a SHA512 739c282638c7f679ca3975df400372dc7ded1e57f772c1f042a6c7273a4896ce393782719d095ab0c293444817f5b2cd94758f5d3be49a239ef9cb07ffa16adb WHIRLPOOL 69db5e9ef4c8482e69a5418ba3c74fbca5c4ca7c634421f6cf6ea9f47615431334f1b4988c659892e850c4b2f4bb879c6c8d760a89958c54f7205b92f51308f0
+MISC ChangeLog-2015 3539 SHA256 a7c68b6b8e5c09d9dad71b31e23f1347456d1f9ee1e7bac7bbf558cf5ae6fa88 SHA512 08b386361e8d1e403cfd5a7fa75234dadf24aab59fb35ebef6a8115010ae5e42fb8b43e305a771f45f6a3c5f27a53d836886e702e6aa20fc3fc92e32de91db04 WHIRLPOOL a15af763f653000cd14239fcbbb909feafc1a3d9c7a9b67c8a0c480dcc5261fe36b00a2f01ccb63cb7ae023c90444261bf93dbc46686e0496a59f8f6a0263ddb
+MISC metadata.xml 315 SHA256 8980507bd1359d5939c97d779bbd20e3a288a4428ec9416fe71c0cac44095f26 SHA512 95cc9ed58105d822599495d5a093550da1665276efdf4e13a885d730265d229fa01d72322a33598363a87bec9cb1e112b9bae7b7874d1f03c6465089779483f7 WHIRLPOOL 5f448f2ffa3fffbcbcfddf64139d3a89d60a364e925246573fdb3e4e91589329826649be093921f48f19ee617107da23660c601ba20bcf6929f4df48a1a154bd
diff --git a/dev-python/flask-script/flask-script-2.0.5-r1.ebuild b/dev-python/flask-script/flask-script-2.0.5-r1.ebuild
new file mode 100644
index 000000000000..57021e7b3e08
--- /dev/null
+++ b/dev-python/flask-script/flask-script-2.0.5-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-Script"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Flask support for writing external scripts"
+HOMEPAGE="http://packages.python.org/Flask-Script/ https://pypi.python.org/pypi/Flask-Script"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/flask-0.10.1-r1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test tests.py || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-script/flask-script-2.0.6.ebuild b/dev-python/flask-script/flask-script-2.0.6.ebuild
new file mode 100644
index 000000000000..58fd2a945765
--- /dev/null
+++ b/dev-python/flask-script/flask-script-2.0.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-Script"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Flask support for writing external scripts"
+HOMEPAGE="http://packages.python.org/Flask-Script/ https://pypi.python.org/pypi/Flask-Script"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/flask-0.10.1-r1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test tests.py || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-script/metadata.xml b/dev-python/flask-script/metadata.xml
new file mode 100644
index 000000000000..8c3b802d07da
--- /dev/null
+++ b/dev-python/flask-script/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Flask-Script</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
new file mode 100644
index 000000000000..af6feeb9b2d5
--- /dev/null
+++ b/dev-python/flask-security/Manifest
@@ -0,0 +1,7 @@
+DIST Flask-Security-1.7.4.tar.gz 41467 SHA256 f0b8ee98ab983d96b808c97d4bc0d6ede9fd7adf88f436dde7f38fb66aa1e2ed SHA512 9d0f7db3250f6cab5af4e60cdffd2fffe28ef2dc30e38a479eb91f04c559308b5c530784fc4d9bbf410fd3f6060830f150b8cdb56a3a2d650c4873a14e09b622 WHIRLPOOL b747c9e9e73eb82c4c4ebd6d61289e09e383f5055ec2dcee12af74117119431ef341f01917ab108e19fa02b7e84a10fd03c33c8407c00f1668b86ef3236267c2
+DIST Flask-Security-1.7.5.tar.gz 42261 SHA256 988952dba451896fd7e9dbf838d0e843844f1cbd27a8e15594a9e1d9432f435f SHA512 41fd806d35746bdc212aa4ab01af678d39765a6d4df42cd19c87b8a2060374112d3e8a5f2fc243e88906505d6a942b9a824cf19a29b2c0eebacde9299534ffc9 WHIRLPOOL 1f106bf2339bd3d5b84bf9071c5c67564bbc2d7433f5271bb39dff663011019c3e04073fd4887eebfb95dfcb43e8f99fa8ba17158b6366fa54dd9d42cdb6975c
+EBUILD flask-security-1.7.4.ebuild 1356 SHA256 ee7da94dc0ceb05e7ed10b049b1bbf783194112eefd631050c4fee70e8b801e6 SHA512 dce6e1a47bf90261958e5fc1eb241cee8bf1e266ec2c7d200aecf06bbccd2af6d8e2e563a8fe35c27e931ffe1cc504ae309c1c7f3898b6960eeac9569818a01f WHIRLPOOL 5289df960937de69f4c005c214cae5a712f4d8603ad3e368487f80035fa5149600c1590411748976a0c20069062be5aed31abefaae98f6ea7974afcfab204955
+EBUILD flask-security-1.7.5-r1.ebuild 1330 SHA256 410d9d5f81789820339be4814d6a3a73ce06f65a96f4d1e157a8aee5f0036f35 SHA512 2b00b0bc1c2de2ad1f556780bb15e290188cfebbec5be4ccbb580898b52e8fe5544f93e0eebb1714c467573edca789bdf37ce87da7b9b45cd304b8759f758f1e WHIRLPOOL 9491c8daec44a7a66bb665c5549d4b50ea3db5e154678600a713edd43f4ada6f753230b3adefb6964a47d603adba5daf4e5afcfcf0f233d33d039734f7d03003
+MISC ChangeLog 2821 SHA256 ccf16798ed7ad30dab72aaa5a4a0e03038e04bcf7d66678a2797c9ce97177b4c SHA512 b833744d9b63bd4c4100c6af13f17917852462ffa5c860b40638cadd42c12221bc2d339bd97fed888702ec7a292129a041648f89c8738f6eb6b824662abe18f5 WHIRLPOOL a04656b043b0af0f6c3012892b2b70e5f955cc5d6fd19a9514ec1ac5f0b57f8a4a0074bd1bbbbc798eb6c917d0e59766f75f91750b439b5bf20ad11d26bc4e9c
+MISC ChangeLog-2015 1352 SHA256 ef0635413f2b2531424c2f4b38baaa8898c30836c4c5911a2e18037d0d7c674c SHA512 a76e675c4b9b5981379e7282cbd4f78c74ed71253e32fbe801e30d6a04663fb04c10ea2c809f5ca6840560baa95489a952397aa8b4eaa2975cc98679037fef30 WHIRLPOOL dd750497a78d6e55c44745273e89dbb24b4e5c26ec800d406837eb8a37f81e83c5021ac4044c97320c790db8b31e188523e1186b7e17cc0a2c9d6c8ef40913d5
+MISC metadata.xml 317 SHA256 53fc2a54d2b6ec3c3c85aae3d67e339f6a91815baf16212125d384118bd72964 SHA512 4e5d572e3b4c865bd75763af3bf90a1aeae9a74865ed3da3aa8d00956158cf842a7fb8f2ec837bd53fda5e2a3266777c41bc109d64f31fe75a5d219f1dba1ed2 WHIRLPOOL 02d8d31aa6e77503ed888c5821c0de369224893da5cb30ad85d169b7af217b23f9012375577a89f1b3110ef42e44c4558c151727c81733804984ed37958b5ff3
diff --git a/dev-python/flask-security/flask-security-1.7.4.ebuild b/dev-python/flask-security/flask-security-1.7.4.ebuild
new file mode 100644
index 000000000000..bdf86b22f3ec
--- /dev/null
+++ b/dev-python/flask-security/flask-security-1.7.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Flask-Security"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple security for Flask apps"
+HOMEPAGE="http://pythonhosted.org/${MY_PN}/ https://pypi.python.org/pypi/${MY_PN}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+# packages of this type require local running  instances of databases
+# which then require connect to localhost
+RESTRICT="test"
+
+RDEPEND=">=dev-python/flask-0.9[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-0.17[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-login-0.1.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-mail-0.7.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-wtf-0.8[${PYTHON_USEDEP}]
+	>=dev-python/flask-principal-0.3.3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/flask-mongoengine[${PYTHON_USEDEP}]
+		dev-python/flask-peewee[${PYTHON_USEDEP}]
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-security/flask-security-1.7.5-r1.ebuild b/dev-python/flask-security/flask-security-1.7.5-r1.ebuild
new file mode 100644
index 000000000000..fc8f8773761c
--- /dev/null
+++ b/dev-python/flask-security/flask-security-1.7.5-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+MY_PN="Flask-Security"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple security for Flask apps"
+HOMEPAGE="http://pythonhosted.org/Flask-Security/ https://pypi.python.org/pypi/Flask-Security"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+# tests are foobar
+RESTRICT="test"
+
+RDEPEND=">=dev-python/flask-0.9[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-0.17[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-login-0.1.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-mail-0.7.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-wtf-0.8[${PYTHON_USEDEP}]
+	>=dev-python/flask-principal-0.3.3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/flask-mongoengine[${PYTHON_USEDEP}]
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/flask-peewee[${PYTHON_USEDEP}]' 'python2*')
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests -v || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-security/metadata.xml b/dev-python/flask-security/metadata.xml
new file mode 100644
index 000000000000..2ac97148200c
--- /dev/null
+++ b/dev-python/flask-security/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Flask-Security</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-socketio/Manifest b/dev-python/flask-socketio/Manifest
new file mode 100644
index 000000000000..6fc9b65dc90b
--- /dev/null
+++ b/dev-python/flask-socketio/Manifest
@@ -0,0 +1,7 @@
+DIST flask-socketio-2.8.6.tar.gz 13530 SHA256 a7054b23629a2426ca9d6c3ba74134a5c9a8bc96e81facb69ae29b21ee381e53 SHA512 04e8029e83a1ddae184feb32a1d1a97dffaf3ab2d52d62c1fc5676182ff5fa1de28e7c08ac3d84f0d056919289b8087a25477c9f75c97961eeeed224dcb3752b WHIRLPOOL 1eb1feb57e6e47450977ddf0f634d76bdb40d058ff7863a4f3d20b9fb910d583599c526a93836c7042c6c0580db62149b20977b7a87a324b68e0da5f8a2e4623
+DIST flask-socketio-2.9.2.tar.gz 14361 SHA256 0fb686f9d85f4f34dc6609f62fa96fe15176a6ea7e6179149d319fabc54c543b SHA512 6fc499a32f37752e6d6d62fc52787cca795f3d113315402bab8063f7b7041785a7c90aff1bd393ef12ba84f2547607920b5f3146271dc536847c07ef0ffb0617 WHIRLPOOL 64087a9b52536227d498924f7e21429619deaad505fc25ba9fce26aa7fdf85ee13cf5ce3a1b52f36fd579541abea84ba31c9de2d373a71c797e19b02ce26cce6
+EBUILD flask-socketio-2.8.6.ebuild 926 SHA256 3be6a9600b6d99ffa93067b3ab9312a4e9e28f8f18903fac3d24b0c128718d1b SHA512 1fc7e46195de6c22f74033ff22c23b90e6ebcfb37bbab9a088cf182bb4f2588228a959c8abfcfd8d2275208911a993a3d14087dc1e6920d77bbc0c547a2716e1 WHIRLPOOL 1194df0537149e259a222fd7dd7f1118fa2a109983153c8c478c3083079160dbdf7996e06233f94447f3f2569fe6a0587fa355d21d1a3e3722cdfc617b7374b1
+EBUILD flask-socketio-2.9.2.ebuild 926 SHA256 3be6a9600b6d99ffa93067b3ab9312a4e9e28f8f18903fac3d24b0c128718d1b SHA512 1fc7e46195de6c22f74033ff22c23b90e6ebcfb37bbab9a088cf182bb4f2588228a959c8abfcfd8d2275208911a993a3d14087dc1e6920d77bbc0c547a2716e1 WHIRLPOOL 1194df0537149e259a222fd7dd7f1118fa2a109983153c8c478c3083079160dbdf7996e06233f94447f3f2569fe6a0587fa355d21d1a3e3722cdfc617b7374b1
+MISC ChangeLog 3746 SHA256 ad422b678942eee5e89aee39c6fc4e8df9e4cfe474f2b6074d0304fa8cc04e45 SHA512 0d7eb39eb36a78543041dbe5b7d9e71c995210689d640bd7f6d6f9de7fae46d7ac44cca82f6c755bf7125d3fcb205f7f95b351110f0c0a42e64aee9194df88fd WHIRLPOOL 52b265284836b6d48839827f252e2cb8731125b6c19dc8f77c662b1b49fa8466ba6a91edb54fe591505559aecf56478fbdd8095b4179959ee7959bfc150f9bba
+MISC ChangeLog-2015 469 SHA256 8f27fa4839574fb3cc79410950201904579d169941fa2b35263deb61afc9d4e4 SHA512 daa261762502eaac6a8c194028569a94b76492a7197e276e17af5a9fa17fac679a9fdc6aae16e2596c7a3252a47fbd65f53dfdbc969d802c81b6a7e5404cab31 WHIRLPOOL d09c0a96a54126ad5f16717a48a8fb7ac2fa6eed505b4246f589a5a38224f5ba919f76d10e953dda81ad5bcc72ee7aa3458b939c4ab8c7f2535e8aa9b4d520a8
+MISC metadata.xml 464 SHA256 8ac300d9c23bc9712e3a60d4050ff29499249e7343c8d40207531ea44b436a93 SHA512 3ca7417e14ca354f6bb0ed18dcfe733704b47df3e2a958c7d2bf16b3cda2197fdbfbdaf6652ebacd04c4dd60f9cb00d455dbbb3bc01108f75047f9ae832f38cf WHIRLPOOL a53fb8212588655ea8418a6e60fdd536dad40936d4e5fd33d8d0afae25f7a59b350b3346556ad3ce59ca81089f908f7e8b56aa50f544dac8f2bc9a403f656052
diff --git a/dev-python/flask-socketio/flask-socketio-2.8.6.ebuild b/dev-python/flask-socketio/flask-socketio-2.8.6.ebuild
new file mode 100644
index 000000000000..60880a0c55de
--- /dev/null
+++ b/dev-python/flask-socketio/flask-socketio-2.8.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Flask-SocketIO"
+DESCRIPTION="Socket.IO integration for Flask applications."
+HOMEPAGE="https://flask-socketio.readthedocs.org/ https://github.com/miguelgrinberg/${MY_PN}/ https://pypi.python.org/pypi/${MY_PN}"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/flask-0.9[${PYTHON_USEDEP}]
+	>=dev-python/python-socketio-1.5.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/coverage[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# pypi tarball does not contain tests
+RESTRICT="test"
+
+python_test() {
+	PYTHONPATH="${PWD}" python ./test_socketio.py || die
+}
diff --git a/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild b/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild
new file mode 100644
index 000000000000..60880a0c55de
--- /dev/null
+++ b/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Flask-SocketIO"
+DESCRIPTION="Socket.IO integration for Flask applications."
+HOMEPAGE="https://flask-socketio.readthedocs.org/ https://github.com/miguelgrinberg/${MY_PN}/ https://pypi.python.org/pypi/${MY_PN}"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/flask-0.9[${PYTHON_USEDEP}]
+	>=dev-python/python-socketio-1.5.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/coverage[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# pypi tarball does not contain tests
+RESTRICT="test"
+
+python_test() {
+	PYTHONPATH="${PWD}" python ./test_socketio.py || die
+}
diff --git a/dev-python/flask-socketio/metadata.xml b/dev-python/flask-socketio/metadata.xml
new file mode 100644
index 000000000000..ceb30f6531fe
--- /dev/null
+++ b/dev-python/flask-socketio/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">Flask-SocketIO</remote-id>
+		<remote-id type="github">miguelgrinberg/Flask-SocketIO</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/flask-sphinx-themes/Manifest b/dev-python/flask-sphinx-themes/Manifest
new file mode 100644
index 000000000000..6b39a90184a0
--- /dev/null
+++ b/dev-python/flask-sphinx-themes/Manifest
@@ -0,0 +1,5 @@
+AUX flask-sphinx-themes-1.0.1-python2-encoding-kw.patch 256 SHA256 d73cdad3d78bdabad50e11b3d9b59d57dc8a1ed11af046c1efc1a94aa522cb06 SHA512 c0d0421de3492f7cdf7c29790e7df4476095dcb7d3f310997eea74b3c2370d8e3ebb27e661024326e587a15d9f888096695624809f592e69b4e026695bef89e4 WHIRLPOOL 04a1bdcf69cfac14a92efc5cbb689a551639d146bf791546a55b4e2353bb7088866f94879fe2854e89b3f0d18399baf60cd4aa86ba2cde5c65460d12a400c34e
+DIST Flask-Sphinx-Themes-1.0.1.tar.gz 8150 SHA256 a83eebca95fc5b8adbae4e65926961912edd52a1b6a422c0301a750d1ae31747 SHA512 65ab8dcc75697fc61e6f6f78ec497ece99eba19c48e778f79e3883079cd0d5e42a2e0f1cf3d656dedf92423d1758caf6fd2279907dd87b50f3a79700f66c5e65 WHIRLPOOL 8d918d348c72e5ce4c47c50a0652299624a71cae7d1f7a3740360101269c04c5757682f7237b21b2be04260f606b1157f8f96d55b364f4c617e2c05a3da24226
+EBUILD flask-sphinx-themes-1.0.1.ebuild 718 SHA256 2a17711bd281a8d72737de417493c231966468106d6ba6028ffa5cce1e80002e SHA512 aa6a44b359f06b7ebe13c2e9362835333745722f636b21c449900abe4819d864fc775ec4a4afbb1a8cfd8952001976bf465ea00922568d358ba7eab48214495c WHIRLPOOL daa7bf97f72c27d52f8a2cfdf19dc420b089b865f30b179f0b4a3780d3fabf872544fa8cf01932633e8107b2b9049f05228caf528e7405c843fa727b31645b7c
+MISC ChangeLog 439 SHA256 21f21039469762779d8487df84642ceef4841fc9f8020193c7887ec1c04497e3 SHA512 a87fc1e69713e51d597f2571bd8c60dad5651de742f8f0ccdbe2e7068a18d7419c9d40dbcbff0393742c4337e1d5d5158e98a2c7164410bb7b8a95e306f2a7fd WHIRLPOOL 008e4b087112bbfad456ff793b561b83ca0ba021d06eafee0017ccc906e32148cf402d420d3571ae8fd30f258dd6fde5001826ceb7d32a0ee30ea795a8e2bbce
+MISC metadata.xml 401 SHA256 9fc2238bb8ead32bc1bd15f20f840cf8e2ab746727d6412cdba4abf128e8e5af SHA512 0e955337b9b299ad56b385c1773eee4f1d3c6b191a31d9e23053034489571d7c0da6dab3cfc4a40cf458743155661356d22c2524097f88ff46dfb52dc824abe0 WHIRLPOOL 7db94d20f901a2c36e6a5c06fba8c68e7849006709e1f3e5037aad88241f8da4fee95e1cbf2076aae738e117e203203fa341496f7d40da0b2a797226344fe2ff
diff --git a/dev-python/flask-sphinx-themes/files/flask-sphinx-themes-1.0.1-python2-encoding-kw.patch b/dev-python/flask-sphinx-themes/files/flask-sphinx-themes-1.0.1-python2-encoding-kw.patch
new file mode 100644
index 000000000000..5f4f5d4d3bbf
--- /dev/null
+++ b/dev-python/flask-sphinx-themes/files/flask-sphinx-themes-1.0.1-python2-encoding-kw.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.py b/setup.py
+index d14f27b..40bffcc 100755
+--- a/setup.py
++++ b/setup.py
+@@ -1,6 +1,7 @@
+ #!/usr/bin/env python
+ import os
+ import re
++from io import open  # for python 2 compat (missing 'encoding' kw)
+ 
+ from setuptools import setup
+ 
diff --git a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.1.ebuild b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.1.ebuild
new file mode 100644
index 000000000000..ab2570d7efc0
--- /dev/null
+++ b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="Flask-Sphinx-Themes"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sphinx Themes for Flask related projects and Flask itself"
+HOMEPAGE="https://github.com/pallets/flask-sphinx-themes https://pypi.python.org/pypi/Flask-Sphinx-Themes"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${P}-python2-encoding-kw.patch" )
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/flask-sphinx-themes/metadata.xml b/dev-python/flask-sphinx-themes/metadata.xml
new file mode 100644
index 000000000000..e6c5f932fd7a
--- /dev/null
+++ b/dev-python/flask-sphinx-themes/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Flask-Sphinx-Themes</remote-id>
+    <remote-id type="github">pallets/flask-sphinx-themes</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-sqlalchemy/Manifest b/dev-python/flask-sqlalchemy/Manifest
new file mode 100644
index 000000000000..bb00b40c2939
--- /dev/null
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -0,0 +1,6 @@
+AUX mapping.patch 756 SHA256 fe5908656a404f5e9632e58c8df469a95a56696dfa3d974a2e30b61176344abe SHA512 050dd1e5378f0ad361c3524563693e9501c1826dc8f5359c4138ceae74e1ed9ddac88398dc744f400b8e941e018c9afdd5cab9a59df80f95389df1ff1c091b2e WHIRLPOOL f44adc5086530a9eac3f5f65a45dc25c1681c2808db029e60dbb3b7ebc2f10ae4ffa51762b912a0c507532d724b8874dd2be2450326681affbd4668ecc5d7e27
+DIST Flask-SQLAlchemy-2.1.tar.gz 95967 SHA256 c5244de44cc85d2267115624d83faef3f9e8f088756788694f305a5d5ad137c5 SHA512 023f3dd011a57768e921928dd3df791a54c64bb8a0cc1bb545dbb8e16dda263b730da74a0d400e5a057819830dd4cd014a642098a081c956a7ea8a2d37ec112a WHIRLPOOL 8acda8985dadde8f14157e9462c3d34220e0bed8b571797aa11f3f415dfee287bfb412142a94dfe725c1d6aab17e241bead90cd1b5128d29ee9905422e58b769
+EBUILD flask-sqlalchemy-2.1.ebuild 1055 SHA256 6bace93e83cd619a52d98cf38a32d8e94bb9cad32a126b038720538a56fca904 SHA512 3e63ee5b4423b7903ab0a853f9fc7b6b8e1ef33249a0093827602148e1efafb03eeb11f69a625214c37719bfe0786b697427e1cfacd916bcfbaa9e1bc4420246 WHIRLPOOL ffe86a0abd411c5653053a8914efb449ae9f329e8aa8b8863194177a9429e736b44aa8414f2b63bac4e5285427eeccd76e740ecb7dc34415b6a2e13be62aeb00
+MISC ChangeLog 3824 SHA256 7a1b009fa50263f8399ad5bd2a20289bceee1724343d3c59213510f467b45b76 SHA512 a58658aaed95e2375b9428202065fde764c8e1370404691981cb60c84e7a2c4ffb93140ab8c4cfe78fcf9b6d5e1c271974200ce973f09187bf64a66b8cbd96a6 WHIRLPOOL 320232cc7c89fcc7be18f364f2f56795890c56b9d121ec101e7c1f55a70b66d3c634ee48c0f9515590dbe58c740b530974a2a154fb76a929747b2f793ab5cf6c
+MISC ChangeLog-2015 3093 SHA256 36332f7851493fbad7aa58b04a918212217eaa255788881630d7c06d330b6b66 SHA512 c7ef8ae8d3352581a72494072ed673e13e174228a90e1d7a7da9452f2a0548e6d327aba3dcd027cb0d94ba0496bae192fde4ec2ef959799e8e15bf9f2421c0c4 WHIRLPOOL fcff9f25aa0d5ac89d4b13493ad7e710439de610f0cc2337372c38f911682165779f2b75fad2536c13e17e42f625347bdc09503f83aeb2c6b58d8734634c6825
+MISC metadata.xml 699 SHA256 47a542e864af3ee48ba42a08cc45c12bd8dc7012a9e4aa8599d274dd395d9105 SHA512 7d116340ea46dcc4c739c63071923e235b31d3eac197d36f6d347fb500092cdb9bdf3365b9dcc5f80eaffeb2cc7fe6391fd31c1a48d009cff1645d7aa1684542 WHIRLPOOL 4ff2dc24077025d2fd327ff652fc4e134abcab6d3ad8c67fbc25687cc6402b7834e37eb1ed8edb6bf24b01a362b126985be97622d3fc7008f975310770caa4aa
diff --git a/dev-python/flask-sqlalchemy/files/mapping.patch b/dev-python/flask-sqlalchemy/files/mapping.patch
new file mode 100644
index 000000000000..af6572489a4f
--- /dev/null
+++ b/dev-python/flask-sqlalchemy/files/mapping.patch
@@ -0,0 +1,16 @@
+diff -ur Flask-SQLAlchemy-1.0.orig/docs/conf.py Flask-SQLAlchemy-1.0/docs/conf.py
+--- a/docs/conf.py	2013-01-27 08:57:36.000000000 +0800
++++ b/docs/conf.py	2014-04-03 18:08:34.772268079 +0800
+@@ -224,9 +224,9 @@
+ 
+ 
+ # Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {'http://docs.python.org/': None,
+-                       'http://flask.pocoo.org/docs/': None,
+-                       'http://www.sqlalchemy.org/docs/': None}
++#intersphinx_mapping = {'http://docs.python.org/': None,
++#                       'http://flask.pocoo.org/docs/': None,
++#                       'http://www.sqlalchemy.org/docs/': None}
+ pygments_style = 'flask_theme_support.FlaskyStyle'
+ 
+ # fall back if theme is not there
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild
new file mode 100644
index 000000000000..689d398f548a
--- /dev/null
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-SQLAlchemy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SQLAlchemy support for Flask applications"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Patch out un-needed d'loading of obj.inv files in doc build
+PATCHES=( "${FILESDIR}"/mapping.patch )
+
+# Req'd for tests in py3
+DISTUTILS_IN_SOURCE_BUILD=1
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-sqlalchemy/metadata.xml b/dev-python/flask-sqlalchemy/metadata.xml
new file mode 100644
index 000000000000..53187fdda862
--- /dev/null
+++ b/dev-python/flask-sqlalchemy/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Flask-SQLAlchemy</remote-id>
+		<remote-id type="github">mitsuhiko/flask-sqlalchemy</remote-id>
+		<bugs-to>https://github.com/mitsuhiko/flask-sqlalchemy/issues</bugs-to>
+	</upstream>
+	<longdescription lang="en">
+		Flask-SQLAlchemy is a Flask microframework extension which adds
+		support for the SQLAlchemy SQL toolkit/ORM.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/flask-testing/Manifest b/dev-python/flask-testing/Manifest
new file mode 100644
index 000000000000..75c0949a26c9
--- /dev/null
+++ b/dev-python/flask-testing/Manifest
@@ -0,0 +1,10 @@
+AUX 0.4.2-test-fix.patch 652 SHA256 eee3b5cc4a27cbe5bd1a76c7dc49654faefb7f265025ba46271756a7dd07b939 SHA512 f6ae344e20cc707f4894fb5005f3aee4f903ddf9df604e8178b8b25ac6fada35d8d1150815ee573a84219349ded6762a92ba174b38a2e6479b4bc97a44299a19 WHIRLPOOL ebd44d789714198b5cbbdd6751abacecf0b8b5973029b4a3701db873fea4c972692c2d5b1021ad5d26ca224026858823b371954a9a37668aa0c3d5947420a96e
+DIST Flask-Testing-0.4.2.tar.gz 40994 SHA256 921c7c653e0d511ed87fbf70d984e27afea8dfa7e10b358689863d7a63e05321 SHA512 57f1a58f352637b6c1d4dc5aa8b3cac215eae334f355d40b6c777f9c5a769c745ce11f2a98818669ec2c29fc170fd86fe4670bb66bd4e4607174b21c5c2067e3 WHIRLPOOL a1fc0723660c25cb18ea5eb4c283c79eb379f2d8cee1bf8fda6ed8b10391cdf0080fa3e2e1ce6cdc50845548a5d9be3f4b20ef267c1350a14049adfbdcfa8e20
+DIST Flask-Testing-0.6.1.tar.gz 42541 SHA256 abf539332c013aee5301cbb720d2c6a78bb69fe9bcf854697b6f62f1e7f175b2 SHA512 f7a0a89885693f568e8e03a9ae689add3b9577517faa6b842bb6b990a2be447ecb9ccf693dd5279ca98dfcc8b18e2041fccf0cf36c28cea5fdc0dbdc9b64f065 WHIRLPOOL 456c7c834f3ed9806fd830f64873f43ac6707cdc195ac2e4c7ae9083987b967a8e2bc0250df1a5247f5512483b39272bf3a3bc53642180990b6269a619eb8b12
+DIST Flask-Testing-0.6.2.tar.gz 129078 SHA256 f25effd266fce9b16482f4ce3423d5a7d25534aab77bc83caace5d9637bf0df0 SHA512 1ce6a32f2c4e2d6d39c0bd2f01b8d20e2ee8faa5cb31d308bbcda2159f8307cc42f445e328a3752c3c3c66f4fffef75b400c70954b1aeb1aabab8a54c565b5ce WHIRLPOOL 3cdba18893defeac5728fdb6fed82555769cd93809fef873083876dceb75474133b2a58d3e8d0226b9ffaa13b939c9820a3b64a78768e8278e28ed9d940cf25d
+EBUILD flask-testing-0.4.2.ebuild 822 SHA256 0172c74f4cc0ef0a0559c54c328138c2fa0d90792f91bbfbadb30618a88695fe SHA512 3793afbd901b822d32ada763ecae3946f356824c4ff3472403e134fc370c69079689f456bf8c8d34edb2bf0a74888c720ae8123a64e3fd2403e0163687bbf536 WHIRLPOOL da3c4ecc2c26eb324bcfb8bb960685d975f62a1fd1e30f96123973ebe7b23733391dc42b766a448624d7c63e17513182b383a6c87d4e5d4af5fff0841b35d468
+EBUILD flask-testing-0.6.1.ebuild 1047 SHA256 e5e38f9c306ce2cdee974f3d9b98b9f25a629258b4f10118b2c497a4e75e6f24 SHA512 1e3c5d104a2254fb3f0bad15a70b2a69045403b7dc98f92593d85bda7eda154cbb242c42d1029c79390dcb7c711439e78d22ae9b2d5f7af7bb356dff6f592c71 WHIRLPOOL 3fb56062ca96ac2526951754f7bfa6e85cf397271c7b98866e1ac6a77cc767fc5b13f845974dfd3ef66cf143cf4c3affcfba4bd0bf7c7f0522c23c01fb83f033
+EBUILD flask-testing-0.6.2.ebuild 1047 SHA256 b5954dbdb69a01cbbb663522bd1010050213419dbcdd1225dc677a2f466fb9b3 SHA512 824b391798ce454d64e1ac737055d04444c21c282b6d11cfe162fe7c5c37f232d25ec8926fa16f415037aa46b1500d19a2498075aab428d354fd14e920a03eb0 WHIRLPOOL 5723199b046eb42a06eb8cb32fa95f63a0ba711b0d670dcdee0eac8275b19bf772a2ddebc9a4c73c3069889fecbac9dfa63cde74ecf9948ccc05c797acc3e1bd
+MISC ChangeLog 3217 SHA256 681c6ab89f94ce90e0d5bd76347da34ba289a4c80cdbf82f6db66d571fbf2f2d SHA512 fdb9f2ff8f1530ea654366292407963af2f6be68363a01f73313e33436307dd777c3e6f0e527a2b673b2170f119decbf818dc48535bd68b1798dd68340d9e03f WHIRLPOOL 4071c8c812504abf15ee09c5dea49686b4462c1159d6e1f61908cdb42c1f5e800fc0144e9e353ba3c6dd8a9af07f3fb8a132e39a9c447ff3d15c894360115167
+MISC ChangeLog-2015 1495 SHA256 a13dd2ad07473f46e4e45ec39fc79ca1f68313ecebb0e0d142c09f1115859ea8 SHA512 d8458d024b31cdb5e28dbcafa1d4a7d534877d35d8765abdddb990ed84af91050868d0edc2fb174fa117c180497dccb93a395327465c572fb4ac4a6e7d61d34c WHIRLPOOL 42ca6ecd951f45d2833bf8171a37731575cfda5fbded58c122dd845050b50620b2117303aceb62c91ee9b6cbded5ee1f8570efc5836e0fbe8a97cc5c7b4c6a18
+MISC metadata.xml 442 SHA256 157b429de4fcf14980441a396164049d7d43d984ef27d561f83df82024108657 SHA512 158bf4f1f2b1eae39a24a460f7d3343c2a8c044a125bb7052075ba6cf1a27310de9a20f647decccd5923c31f415dd957e99ab4c0f88a274d26ef7e07991d0ecc WHIRLPOOL 092b997e2a48801dbea03fbdf600597bf7793d1b3eef174743aadd993684f71ce4c01ccfb32e0af3e2060c7c61c1a07f02fb2e4082d8f62caa11589934ea773f
diff --git a/dev-python/flask-testing/files/0.4.2-test-fix.patch b/dev-python/flask-testing/files/0.4.2-test-fix.patch
new file mode 100644
index 000000000000..a0933e475afc
--- /dev/null
+++ b/dev-python/flask-testing/files/0.4.2-test-fix.patch
@@ -0,0 +1,17 @@
+https://github.com/jarus/flask-testing/commit/c969b41b31f60a5a8bacd44b3eb63d1642f2d8bf
+diff --git a/flask_testing/utils.py b/flask_testing/utils.py
+index add12ef..9b479df 100644
+--- a/flask_testing/utils.py
++++ b/flask_testing/utils.py
+@@ -143,8 +143,8 @@ def _post_teardown(self):
+ 
+         if _is_signals:
+             template_rendered.disconnect(self._add_template)
+-        if hasattr(self, '_true_render'):
+-            templating._render = self._true_render
++        if hasattr(self, '_original_template_render'):
++            templating._render = self._original_template_render
+ 
+         if self.run_gc_after_test:
+             gc.collect()
+
diff --git a/dev-python/flask-testing/flask-testing-0.4.2.ebuild b/dev-python/flask-testing/flask-testing-0.4.2.ebuild
new file mode 100644
index 000000000000..0e13068c0c20
--- /dev/null
+++ b/dev-python/flask-testing/flask-testing-0.4.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-Testing"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Unit testing for Flask"
+HOMEPAGE="http://pythonhosted.org/Flask-Testing/ https://pypi.python.org/pypi/Flask-Testing/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/twill[${PYTHON_USEDEP}]' python2_7)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/blinker[${PYTHON_USEDEP}]
+	)"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PV}-test-fix.patch )
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/flask-testing/flask-testing-0.6.1.ebuild b/dev-python/flask-testing/flask-testing-0.6.1.ebuild
new file mode 100644
index 000000000000..ef29e92c1d8a
--- /dev/null
+++ b/dev-python/flask-testing/flask-testing-0.6.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-Testing"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Unit testing for Flask"
+HOMEPAGE="http://pythonhosted.org/Flask-Testing/ https://pypi.python.org/pypi/Flask-Testing/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/twill[${PYTHON_USEDEP}]' 'python2*')"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/blinker[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	local exclude
+	if $(python_is_python3); then
+		# Twill is not available on python-3
+		exclude="-e twill"
+	fi
+	# test phase appears to run only py2.7 but if it passes for py2.7 is passes for pypy
+	nosetests ${exclude} || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-testing/flask-testing-0.6.2.ebuild b/dev-python/flask-testing/flask-testing-0.6.2.ebuild
new file mode 100644
index 000000000000..29041a15206a
--- /dev/null
+++ b/dev-python/flask-testing/flask-testing-0.6.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-Testing"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Unit testing for Flask"
+HOMEPAGE="http://pythonhosted.org/Flask-Testing/ https://pypi.python.org/pypi/Flask-Testing/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/twill[${PYTHON_USEDEP}]' 'python2*')"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/blinker[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	local exclude
+	if $(python_is_python3); then
+		# Twill is not available on python-3
+		exclude="-e twill"
+	fi
+	# test phase appears to run only py2.7 but if it passes for py2.7 is passes for pypy
+	nosetests ${exclude} || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-testing/metadata.xml b/dev-python/flask-testing/metadata.xml
new file mode 100644
index 000000000000..186145be8e10
--- /dev/null
+++ b/dev-python/flask-testing/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Flask-Testing</remote-id>
+		<remote-id type="github">jarus/flask-testing</remote-id>
+		<bugs-to>https://github.com/jarus/flask-testing/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-themes/Manifest b/dev-python/flask-themes/Manifest
new file mode 100644
index 000000000000..bb7db3a42067
--- /dev/null
+++ b/dev-python/flask-themes/Manifest
@@ -0,0 +1,6 @@
+AUX fixtests.patch 1036 SHA256 b63d6a26e0374403bd3014c82ba6a31bc0b178ee56f3199d9b6a2b6cff221bbd SHA512 a3ca31a2bde1539b0ae2a552952f8ef82f7979446eaf7874029d65362bb30151a396becef07f97c12bd5d3264696ee66f2213cd7b3a305bc7ff6faa628320575 WHIRLPOOL 97f47ac8a812a0ae3d07a9b100c2c9cd1af5ed183e535fe2448468cff83523a678cba657fe6b1a2417457f37b470954dd8d007a8cd7f5a809245619a02d38a45
+DIST Flask-Themes-0.1.3.tar.gz 9723 SHA256 0586fdd29a4ccfaa37effc92652a3fe50c6a37d929493d5ab7b4b747be08d9fc SHA512 baf609b8b08446dda5b5d6d39bc0a2e7406f9270d70924c795243384be8967c82f82adcebe5e060352a0c33b763d600eeb5600d3116c10bdbbb3ceddfadf764a WHIRLPOOL 7c77e4ce39d3c9e1ac9f4fb5d3fe9b3bea71a71a2619e11a0bcbd413bd9215606f1beb76ca27dcbebd2dfefcfe835c84eb2a0bfc337a17ee9aa021edad75aeab
+EBUILD flask-themes-0.1.3-r1.ebuild 909 SHA256 d0624f717e32f335cf73cdf6e303e4aba9f955629c2685b014a1fd02e7db27da SHA512 82c5c355d1ab2af8c6007c2c83133fcbe78a64ada1b0038e8fbdbcf7cb22968777e10369a8449e3f267b75d846181db96307e9a7dafd14b8fa4a8b87f767f6f1 WHIRLPOOL f1d787279fa9ed41ad22c7d3f3736f0daddafa1411cb2cea38650858a05134e4b95aad2b67fa12782c775a676a32a9b8db4e138e5fc334a71098c03a2e34627c
+MISC ChangeLog 2760 SHA256 6dadf370555203bc09d0641e65bb42893a6f69913cc1ae3eac28ef4fa35fa382 SHA512 5eba43ce604169d2ba0e3d6315f7ee6a03be511d83136b812ebb31f358550eaef7748de969e6a3303b101c2c693c19c56c85e69c8d1a4898e6aca2b3899e8463 WHIRLPOOL fe58756ff95f55a98a165183eaa0239655b7b09639f04e554cdfd0df157e05cf914f37d081b11df939542e16a60187829a2f1239ac4bf1ee40f963fb9dd17a48
+MISC ChangeLog-2015 1663 SHA256 2bffbf57b3850c50ded693abe6dfd49262f93d4dea81052707850b4a5c5850c6 SHA512 f06f81296b390afddcb9771eae8552f8ecd936e00c5101b764a6999e689c214fc4d03800593d2068c1c9bc35650322bd8a3327e300962d4a02662b101e426baf WHIRLPOOL e8d343c91be0913ab9499650fc47cab881d8b4237dcb5e81fd1fd1d8ece45290eb42a34d68d1ed8af1e85f025fc1af1a53ce18151344296c0537494d6667ff4c
+MISC metadata.xml 315 SHA256 5ac5979e1025700f10787bc245468fec74ed70c3e443e569ed1f5ce94339e7b4 SHA512 87b5e27ef6869c29956604c891a2f8fa0a945817de4642aae7bd735c798cd08c3f1d26196b03ae7db52a83060af468df311e51d95a9a460b2882b4604e05fcd1 WHIRLPOOL 3b2f2f7139e9ffd8dd3d4ac2ddf0a8f344b143172468705ac9d3d0c52e996899bc7fca56bc59be8edfc3b6f794056dea2da9b29334f6e622356abc404c7dc98d
diff --git a/dev-python/flask-themes/files/fixtests.patch b/dev-python/flask-themes/files/fixtests.patch
new file mode 100644
index 000000000000..014508e4ddd2
--- /dev/null
+++ b/dev-python/flask-themes/files/fixtests.patch
@@ -0,0 +1,23 @@
+diff -ur Flask-Themes-0.1.3.orig/tests/test-themes.py Flask-Themes-0.1.3/tests/test-themes.py
+--- tests/test-themes.py	2011-07-14 06:36:33.000000000 +0800
++++ tests/test-themes.py	2013-06-10 18:20:25.901480529 +0800
+@@ -129,8 +129,8 @@
+         
+         with app.test_request_context('/'):
+             assert template_exists('hello.html')
+-            assert template_exists('_themes/cool/hello.html')
+-            assert not template_exists('_themes/plain/hello.html')
++            assert template_exists('cool/hello.html')
++            assert not template_exists('themes/plain/hello.html')
+     
+     def test_loader(self):
+         app = Flask(__name__)
+@@ -140,7 +140,7 @@
+         with app.test_request_context('/'):
+             if USING_BLUEPRINTS:
+                 src = themes_blueprint.jinja_loader.get_source(
+-                    app.jinja_env, '_themes/cool/hello.html'
++                    app.jinja_env, 'cool/hello.html'
+                 )
+             else:
+                 src = themes_mod.jinja_loader.get_source(
diff --git a/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild b/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..c1d538f3f5ac
--- /dev/null
+++ b/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-Themes"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Infrastructure for theming support in Flask applications"
+HOMEPAGE="http://packages.python.org/Flask-Themes/ https://pypi.python.org/pypi/Flask-Themes"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-python/flask-0.6[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/fixtests.patch )
+
+python_test() {
+	# suite fails miserably under py3. Cannot even find upstream repo to file. pypi.org does NOT help
+	if ! python_is_python3; then
+		PYTHONPATH=.:tests nosetests || die "Tests failed under ${EPYTHON}"
+	fi
+}
diff --git a/dev-python/flask-themes/metadata.xml b/dev-python/flask-themes/metadata.xml
new file mode 100644
index 000000000000..646bcdf7ccef
--- /dev/null
+++ b/dev-python/flask-themes/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Flask-Themes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-uploads/Manifest b/dev-python/flask-uploads/Manifest
new file mode 100644
index 000000000000..1d98c3d326fc
--- /dev/null
+++ b/dev-python/flask-uploads/Manifest
@@ -0,0 +1,8 @@
+AUX flask-uploads-0.2.0-remove-deprecated-module.patch 737 SHA256 58aad6203c8dbbf2750adad749ea80abfd81bf4d9882cdc36f89fbcda9738332 SHA512 d382208366de79e2cad19e26799120282b85a684ace4ac2d23e7a45661e1434805e4302e6c1dcf9bfaa0d4cbf9be8302804cf80f643d98122a5241722bb4f746 WHIRLPOOL 1714ce580b9b1d73163f8a3e47a2fd3431818f443d8548966e88adf3aca677458f8a71547972361284a7c86c8da546c82c15fd5ae367c269e18aab9eae583941
+DIST Flask-Uploads-0.1.3.tar.gz 9312 SHA256 2ed695257bb9e3ab93aacf88022f78e1167c748ba8ec19c180ede4af36a4d4de SHA512 eb52c8b22ecc909a37149a9b6df91f47bff0f48ef768325a6e8cc1031b1c1977894a1aaaf70726484316de1782daa26ea96d24114d10490b0d271b2a87efd8ae WHIRLPOOL 9a240e9b797d535622cbb7fbc324a7763ec53e3a9a3d0267176fbc202013c4bb2a3671515320f3157b6086de8b8cd653154080bffa69fe082710109be6789c6c
+DIST flask-uploads-0.2.0.tar.gz 23304 SHA256 6d7898213b33f60db88c9d62f0a521cde2692d8ba3f085929fdc2db1ca15d826 SHA512 ad80448b111019a5e731529267a790d1dd95a356671780efc20f1dc830044e539ab348404b706baf3666c7407518ed04cd2871d811f72b6145261dcc307ffacc WHIRLPOOL 65cba4a20227d6373209a0511b862af1cf6e281912473392428bc3ecde755ad12deee628d52bd2f5742b4d210f07054e7729a9a227e44fe0c9721022004080ef
+EBUILD flask-uploads-0.1.3.ebuild 742 SHA256 1010d96bad453ac4f51ca98253d9462fe39800a1682af13c75e30070c517cd91 SHA512 ab88963a2d7a08fdb31e6f089a05404de6161f42c31f88727d94647920798c831aea416bea3a4f4fb2eddb812bbd4b9edafbec2433d99e9735849c16fc183176 WHIRLPOOL 737d9075b2ec77715a6c13293a922faa973fe368b3ea280cd02d29a32dbb69ec27f1d5e789e8d637fdb857a66b5daee04478fef33a8825368db72f492b938278
+EBUILD flask-uploads-0.2.0-r1.ebuild 849 SHA256 85ca6c36511f123e3723e8165719659d60f95257a9a8f538ff55d65876ac8c44 SHA512 3af12a4ba8363fbc0e0722d91cb36e8e06f2200cfe704116a3e4b51a838f91198cd2519b6430959a228652a6d77369933e593fece21b78e2dc2dd38a83619f55 WHIRLPOOL 86e5f94ab70a8b50e9c825d95e14281c394653f43d512e658f17a549641668d8bf8708576f98fcd0b5289854ff3976ef144a7cbd9bda88149b41e0bdc841499f
+MISC ChangeLog 3176 SHA256 a3dc202ced20d08178a31e57e64a9f9d75e1b92e43d01efd214a50e41ce96ce7 SHA512 3ce7a0c0c0bb9a0ece4765b4c660ef9cc4da7f56dea7608a4980edcdf398e676d90c7b6ef46f14b54d3bdfb8d0e66a3a9c6aaa5438c2b5c6e6d9c72c3b72addb WHIRLPOOL e9b9fca7a6062cb5bb0cd7e6aed2bc57e1ecc382b77b9c25ca38a21683ec22a0a486d0e699dd37577bd86646c282b6085b01e3aa131a4a0863ab0c3e08e48de3
+MISC ChangeLog-2015 713 SHA256 7be678632e46453b5d84352c38cfac0be92de24b9557807ade8ca86ea0bcd407 SHA512 3d46be585de0573ff038451d8ac303858c3120e8d81e67fd7c3f2ce0399eea098eb3f680dd82f2a55237e41145e9aee65b8920eb2d378da814bfdcb7cf02c5c9 WHIRLPOOL bf3f2d0b46435c564e80a7e86d7038cee1095947959b75757e8fd770d31738b9e5514d386789e35489fd5865897fab21ddf9f073aaa0b4e6f3c530da99b07611
+MISC metadata.xml 458 SHA256 e62c2d73b67ae03a10038e35c62dae457a9bfa575d0c6329639a197606b87343 SHA512 731c3d6009d98a61dd00f29f563b5651ddae42e35a9b86da0653fc38ad416369304dc6dbdeb2e36fb2f6f3273032aa7f97d5a816a7b4d5ed5a7d642158ac859a WHIRLPOOL 3f2f4b2ca1f7e1461bb51cff38d5dea32836b106a5145295f70893502e11ede3df697940a09a97c889a6fbc522ee07bfcf33b3deec3658526cdd1d1dbd61e947
diff --git a/dev-python/flask-uploads/files/flask-uploads-0.2.0-remove-deprecated-module.patch b/dev-python/flask-uploads/files/flask-uploads-0.2.0-remove-deprecated-module.patch
new file mode 100644
index 000000000000..ea3fa46ff30e
--- /dev/null
+++ b/dev-python/flask-uploads/files/flask-uploads-0.2.0-remove-deprecated-module.patch
@@ -0,0 +1,23 @@
+From 0a4d2a9724ad7ac4e332f0016bd2027a5a8ad33e Mon Sep 17 00:00:00 2001
+From: Wojciech Kryscinski <wojciech.kryscinski@fornax.co>
+Date: Mon, 6 Jun 2016 12:17:05 +0000
+Subject: [PATCH] Removed Module from imports. It was deprecated and removed
+ from flask
+
+---
+ flask_uploads.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/flask_uploads.py b/flask_uploads.py
+index ebbc395..a10b72c 100644
+--- a/flask_uploads.py
++++ b/flask_uploads.py
+@@ -21,7 +21,7 @@
+ import os.path
+ import posixpath
+ 
+-from flask import current_app, Module, send_from_directory, abort, url_for
++from flask import current_app, send_from_directory, abort, url_for
+ from itertools import chain
+ from werkzeug import secure_filename, FileStorage
+ 
diff --git a/dev-python/flask-uploads/flask-uploads-0.1.3.ebuild b/dev-python/flask-uploads/flask-uploads-0.1.3.ebuild
new file mode 100644
index 000000000000..d9551f6fcf92
--- /dev/null
+++ b/dev-python/flask-uploads/flask-uploads-0.1.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Flexible and efficient upload handling for Flask"
+HOMEPAGE="http://pythonhosted.org/Flask-Testing/
+	https://pypi.python.org/pypi/Flask-Testing/"
+MY_PN="Flask-Uploads"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/flask-0.5[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-uploads/flask-uploads-0.2.0-r1.ebuild b/dev-python/flask-uploads/flask-uploads-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..fed446ac5fe1
--- /dev/null
+++ b/dev-python/flask-uploads/flask-uploads-0.2.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Flexible and efficient upload handling for Flask"
+HOMEPAGE="http://pythonhosted.org/Flask-Testing/
+	https://pypi.python.org/pypi/Flask-Testing/"
+SRC_URI="https://github.com/maxcountryman/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+# use the GitHub tarball since the pypi-tarball does not contain the tests
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/flask-0.5[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/${P}-remove-deprecated-module.patch" )
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-uploads/metadata.xml b/dev-python/flask-uploads/metadata.xml
new file mode 100644
index 000000000000..065aa013af5f
--- /dev/null
+++ b/dev-python/flask-uploads/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Flask-Uploads</remote-id>
+		<remote-id type="github">maxcountryman/flask-uploads</remote-id>
+		<bugs-to>https://github.com/maxcountryman/flask-uploads/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-whooshalchemy/Manifest b/dev-python/flask-whooshalchemy/Manifest
new file mode 100644
index 000000000000..121c5ca3f2fd
--- /dev/null
+++ b/dev-python/flask-whooshalchemy/Manifest
@@ -0,0 +1,7 @@
+DIST Flask-WhooshAlchemy-0.56.tar.gz 8528 SHA256 8320ba75040bd37c2810d5ab9a4bd9f3ccadebbef93c805fe0578403f8785baa SHA512 acf7607ad909382bbf3016467cd8e402c98b4618a5822ba6097671becba43f1cac48f6415ce967c4f85c71b71fdafd30c36e5b65e9fc99500c0aad83ea1c650c WHIRLPOOL c08ae0add692379cb1571ff957b4b45447d350c770ad64dde3a5592cbf1b704ee1466f740bc8d6b82750a962695424588717af197e0859a96a28669a935b5e40
+DIST Flask-WhooshAlchemy-0.8.tar.gz 8916 SHA256 45bd638d2ded106d955b9924f27f7ee41c48fbdd5a1fd6b2a892180354006d10 SHA512 c8eff47cedd955d8ad758c8441c3f4e715eed77fbe2749d0830130f6c63547ba7d7fbcade635da0be5f03967c1be01ab7a62939a6d2eba28f9a58b1ab83469a6 WHIRLPOOL 909363e7d7de96a8206dcffba838c5d1fa8b3c55d498c5b018f31f5b67f086d6c8106c123e878fbb02dfd4a97880b09002cc1f4465cfea7b8f847201b0d11f8f
+EBUILD flask-whooshalchemy-0.5.6.ebuild 959 SHA256 3ffc5a40945b47a5c4458da92488899efa9222233fb4010d1a707ccdf9fb41b4 SHA512 135878d2a82e30d0488442bcb2a214f9c31ab8638f48ba7d23d9baebb7ddbfe6a52447fe0f7adb64f2d325180e344f430e18b8f0ce228da08508a1a02bf19137 WHIRLPOOL 7fc2562ac1f1e5b743749a2f478efc1acd87d44e55a9f96d93a372a5f237ab5584ac6c993f1c8b892e5330553546cac49cd860e078e7c0ca612da33658754588
+EBUILD flask-whooshalchemy-0.8.ebuild 1262 SHA256 17e147b622b5928b7467a6dcc3e48733d7ff1915955b54d96a7b0a238ae165e4 SHA512 742c7afe16384c8eaf933302a1b11899dbfb01b39e28572d735eb72d7125984b69e81a5bfe51b2b251629b344b62efb6cfb4372b2c6b83f79e3ad2c6559df509 WHIRLPOOL 73f9460b7aed6261d91cc57264a121da196c8b15a67291329057a1e722f666a69bf2c41d182816b6b47123cc46b91760cb7f1423a904d7461b533d46399eedbc
+MISC ChangeLog 2682 SHA256 a955e5e0fb64fcdf7c83945f2f909f5079240e657af5b2ca074d482c9cf1330e SHA512 fbae57abc1d0ecb6619de08feb01e6dfb529076faf6ff1003b51985bac9c30c66bb4fa82bb47c09f9d9c441f32f7aa145518e5739b8c91d402772b7c2354f272 WHIRLPOOL c4b7b207af8809e5ffb563d2f699e116e2978d64e028248a40db936e7532dc557e177e66cb764647f3561f5ec5e177c5c9e13918137b34c9dd5dac2ffd1fbfee
+MISC ChangeLog-2015 877 SHA256 86878a5036225489cb9f1f8aaa438ca91850288deff70c4619816816a10fb4d4 SHA512 b30dbac605468a8fd75525d41384c92ce529bb519632cf935c24a6b1be906c08d3f89955cf71694dc14988b148c1939b6f19f3c79584b1b1cc6d04b0309ce435 WHIRLPOOL 016673277723204e0fd954a7f40fb274f78e9d9d778d684c8fff46b299dc7bde68ae27752b8d79f4448b842ac5dcdf14c90f0e0951170c1e198d0cd9d3609ab7
+MISC metadata.xml 404 SHA256 4deeb48d39fb190a29ddfaa4ea51fd76b81020bf4ca447ae3b4237dad9adfd1f SHA512 1368bfa588bc2e34a3faf163d89c7c24f53cd0e65e8e6edf03f167f2faed222764ad22b3e43dd9bbe6f6c1f333c68a8e65002514f9d2411e838b66bbe4c972dc WHIRLPOOL 6e2af86b48b7c15d34a53520d4f47ddc3facfc9c21ff806b96dfcc50886cac60e47f0ad451594474421ff40ed4b30f7997768a61011a1efe273635c71df41c55
diff --git a/dev-python/flask-whooshalchemy/flask-whooshalchemy-0.5.6.ebuild b/dev-python/flask-whooshalchemy/flask-whooshalchemy-0.5.6.ebuild
new file mode 100644
index 000000000000..1976762e785d
--- /dev/null
+++ b/dev-python/flask-whooshalchemy/flask-whooshalchemy-0.5.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+RESTRICT="test"		# appears pretty borken
+
+inherit distutils-r1 versionator
+
+MY_PN="Flask-WhooshAlchemy"
+MY_P="${MY_PN}-$(replace_version_separator 2 '')"
+
+DESCRIPTION="Whoosh extension to Flask/SQLAlchemy"
+HOMEPAGE="https://github.com/gyllstromk/Flask-WhooshAlchemy https://pypi.python.org/pypi/${MY_PN}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/whoosh[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+#	test? (
+#		dev-python/flask-testing[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-whooshalchemy/flask-whooshalchemy-0.8.ebuild b/dev-python/flask-whooshalchemy/flask-whooshalchemy-0.8.ebuild
new file mode 100644
index 000000000000..7e2a6d7f8ac7
--- /dev/null
+++ b/dev-python/flask-whooshalchemy/flask-whooshalchemy-0.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-WhooshAlchemy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Whoosh extension to Flask/SQLAlchemy"
+HOMEPAGE="https://github.com/gyllstromk/Flask-WhooshAlchemy https://pypi.python.org/pypi/Flask-WhooshAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+# TODO: figure out how to make it happy about the newer whoosh
+# (i.e. if it's broken test or broken package)
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	=dev-python/whoosh-2.6.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flask-testing[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# unbind dependencies from specific versions
+	sed -i -e 's/==.*$//' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# esetup.py test -- test module decl is broken
+	"${PYTHON}" test/test_all.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/flask-whooshalchemy/metadata.xml b/dev-python/flask-whooshalchemy/metadata.xml
new file mode 100644
index 000000000000..a36129d8ca17
--- /dev/null
+++ b/dev-python/flask-whooshalchemy/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Flask-WhooshAlchemy</remote-id>
+    <remote-id type="github">gyllstromk/Flask-WhooshAlchemy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-wtf/Manifest b/dev-python/flask-wtf/Manifest
new file mode 100644
index 000000000000..5cf9cf6f0f24
--- /dev/null
+++ b/dev-python/flask-wtf/Manifest
@@ -0,0 +1,9 @@
+DIST Flask-WTF-0.10.3.tar.gz 247240 SHA256 40da66462df074c2a0fd209e6047972bc226125f6c484c8e367ea10e71ddd718 SHA512 c8cbc817afca7efbc2c0302c4fa3625874159c10e4664b502693acfa3ffcca34aee0a6f17528b45340f1e7f103f87ac72178f2ca4d589307bde12fe47ac5cf50 WHIRLPOOL 08b1b66813a558918ed3e9da8ae2d0db9947f11bf6fccb2ec6f8de1e359422d4431754e982a81a959129230aa39c70470bbad944451238f6c1136976286f303b
+DIST Flask-WTF-0.13.1.tar.gz 253341 SHA256 20a5d72271677722ba6834e9e3327af777e0f6a758a3010c892c362107398512 SHA512 ea85898688c16ee0b5dc54055ac0f19564c83b60a433c8fb4dfa27651f9f16b62e6c30ede0f8246a18c19c7b36dd17272210fd1a38f463efe71e12c058bd0f27 WHIRLPOOL 834e86bd54c83fa4e225929b4cf984c197cabffdbdcb440d738cfb338e7dd10521bbceb0516e37fe5049e15898ce84327d453138b1a59962863ce9a9a8d61158
+DIST Flask-WTF-0.14.2.tar.gz 254903 SHA256 5d14d55cfd35f613d99ee7cba0fc3fbbe63ba02f544d349158c14ca15561cc36 SHA512 9d4b4b24eb24827aeb524699e6720eab384c42901a102daddd9fdc6b8dbc8eebec8c9d31a1e9052c9af4d61bd08eef8ef9dc4cdc8d9b950ff5bdd0201db1dfde WHIRLPOOL 1863485f4b69f02c8f23c7a0e046816ed596eed55489ff21e9e85f4c3bd3044e87ce9efc60e2fb21bc8b1d30da9b36ae38ec6667c481e0f1015dc79b556669e8
+EBUILD flask-wtf-0.10.3.ebuild 1364 SHA256 3ac4d13fcdd6009c207b680dbd72cdc2956d15b08c18d7aede9d1d9e00d6b448 SHA512 e7b6f1ac066060fb8aaa0272c0e051e2fa64063b6837841982b8e3f6fc39bc9591d5518aaa951a79fc2ccfa3ed643c203406056fd96892e2e89a623cef51e747 WHIRLPOOL b8d1fff84fb6341bd2e9a132fb3839ba6460f768cab975b9059def8319def84e1acbe3c4f42be1d5c1a002c4c8e2a6775591913a0e6fa69c640815bb96b920a6
+EBUILD flask-wtf-0.13.1.ebuild 1379 SHA256 6efac7dcfa8d873bd9e44b45ad37261dab94be08230f10464ccf32d4ee0eaa5b SHA512 05c95069d570fd78353f5840ef25d3e8c226088072f8925543ed9306744e67d0712aaa0d9f5f1cec85077332de811f3ca2d116ca070275d6d1934000954a278c WHIRLPOOL 418fb293d1b0844a281b826a44d09a5140120cf16cbbc385990ad11772e8edacb3d58b42d190eef97e39f9fc7f9424c76092ec26cf4b49da544f20ba8f88dd0a
+EBUILD flask-wtf-0.14.2.ebuild 1379 SHA256 9c43a6ad9d1e48a014a7ccc773d063691631128b3767c6df674e5528e355f384 SHA512 03a0179bd2af73ae38405a0f01b12e011221f027b8de367bfa1cc33bdfc261fc48fcd224dae4d8fa6d71c3f70bd18e5cdee2120ed47b0dc1d0ccebe87d9ae564 WHIRLPOOL dfe8b886aad98f1d36a7feba3410d9c3a597cb10ddfa5ac376c4b6d741c96db0b58ec8897b1768845aa92041026af52f5affd4d245b18bb7bc8be50965da7371
+MISC ChangeLog 3035 SHA256 2426211e6aba0d11a340fcf579f1da656a078163445ea2583853c228a21472b3 SHA512 97d94eac08817c7a0125a5646ccef1b5caaa2f3033569e16116495bbe901ddb285501797b6fb9363bcd91a92eb74aeb6bd5d2840241f674ae9c4469fd23d17ea WHIRLPOOL 4f81267e41929f19e6f95bf6575ad58a63b978b6ab5defc97cce8901f91fefc9e1aa1666733c0a88d3cf59ce78266cc1d8019c30fd197119c8cb2c6f0725e2dd
+MISC ChangeLog-2015 2841 SHA256 075ca530eea03bf17e83d27fa9edf5be43b7f871bc46ad71ba0d63fd058aaaf2 SHA512 fedee357b4be2c7267e3e7dbebe4e320c10ad167382ae581cf1541d5c4f8029feeed658fe4ddfa7ce96bec0a886440746ccb3749c7e41808b08c8050c355a8b0 WHIRLPOOL 16fbbbfa070db9139ac384cf773df094477a9685f44dc0ad9e7f4a7f666a55f22a7cd1cc12c6a036bad2e84b40922dd3def40a14d1fbbefb060b9874afdc3231
+MISC metadata.xml 628 SHA256 005c39fa87200ed5dd1a8b5c9f23b2ea86c7234b3232c89592c9178ca626a465 SHA512 cc8c127cf6483396ba9a849683ecbc34527a9d51c8464b8ba523f015244a5a4efe1052691150f8888e4577dee538a1280afab28901be367f8856405bf380aea7 WHIRLPOOL 025929803330db9f0156cb9740c4caa2b238a53f8430f9db01f0a995d38ece184f91206183a7c289d51693cf8324a14eb6520dc76914397dc92e49cecb6c8887
diff --git a/dev-python/flask-wtf/flask-wtf-0.10.3.ebuild b/dev-python/flask-wtf/flask-wtf-0.10.3.ebuild
new file mode 100644
index 000000000000..0012300ab428
--- /dev/null
+++ b/dev-python/flask-wtf/flask-wtf-0.10.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+# silly captcha test trying to access things over the network
+RESTRICT="test"
+
+inherit distutils-r1
+
+MY_PN="Flask-WTF"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple integration of Flask and WTForms, including CSRF, file upload and Recaptcha integration"
+HOMEPAGE="http://pythonhosted.org/Flask-WTF/ https://pypi.python.org/pypi/Flask-WTF"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	>=dev-python/wtforms-1.0.5[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/flask-testing[${PYTHON_USEDEP}]
+		dev-python/flask-uploads[${PYTHON_USEDEP}]
+		dev-python/speaklater[${PYTHON_USEDEP}]
+		dev-python/flask-babel[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/werkzeug[${PYTHON_USEDEP}]' python2_7 )
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-wtf/flask-wtf-0.13.1.ebuild b/dev-python/flask-wtf/flask-wtf-0.13.1.ebuild
new file mode 100644
index 000000000000..2b954d8da5c4
--- /dev/null
+++ b/dev-python/flask-wtf/flask-wtf-0.13.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-WTF"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple integration of Flask and WTForms"
+HOMEPAGE="http://pythonhosted.org/Flask-WTF/ https://pypi.python.org/pypi/Flask-WTF"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	>=dev-python/wtforms-1.0.5[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/flask-testing[${PYTHON_USEDEP}]
+		dev-python/flask-uploads[${PYTHON_USEDEP}]
+		dev-python/speaklater[${PYTHON_USEDEP}]
+		dev-python/flask-babel[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/werkzeug[${PYTHON_USEDEP}]' python2_7 )
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# tries to access things over the network
+	rm tests/test_recaptcha.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-wtf/flask-wtf-0.14.2.ebuild b/dev-python/flask-wtf/flask-wtf-0.14.2.ebuild
new file mode 100644
index 000000000000..37fef397990e
--- /dev/null
+++ b/dev-python/flask-wtf/flask-wtf-0.14.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-WTF"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple integration of Flask and WTForms"
+HOMEPAGE="http://pythonhosted.org/Flask-WTF/ https://pypi.python.org/pypi/Flask-WTF"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	>=dev-python/wtforms-1.0.5[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/flask-testing[${PYTHON_USEDEP}]
+		dev-python/flask-uploads[${PYTHON_USEDEP}]
+		dev-python/speaklater[${PYTHON_USEDEP}]
+		dev-python/flask-babel[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/werkzeug[${PYTHON_USEDEP}]' python2_7 )
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# tries to access things over the network
+	rm tests/test_recaptcha.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-wtf/metadata.xml b/dev-python/flask-wtf/metadata.xml
new file mode 100644
index 000000000000..39cf0b536952
--- /dev/null
+++ b/dev-python/flask-wtf/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="project">
+        <email>python@gentoo.org</email>
+        <name>Python</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="pypi">Flask-WTF</remote-id>
+        <remote-id type="github">lepture/flask-wtf</remote-id>
+        <bugs-to>https://github.com/lepture/flask-wtf</bugs-to>
+    </upstream>
+    <longdescription lang="en">
+        Simple integration of Flask and WTForms, including CSRF, file upload and Recaptcha integration.
+    </longdescription>
+</pkgmetadata>
diff --git a/dev-python/flask-xml-rpc/Manifest b/dev-python/flask-xml-rpc/Manifest
new file mode 100644
index 000000000000..55e7bd844c57
--- /dev/null
+++ b/dev-python/flask-xml-rpc/Manifest
@@ -0,0 +1,5 @@
+DIST Flask-XML-RPC-0.1.2.tar.gz 5756 SHA256 4adc7482240a916e8c2205cba38b4bd6e648692d189419686a3116768fa48ab7 SHA512 0e083b70576b0d09a316f8be9a779eeb24723caede172fe51168b2b125553b7916e65012813976d46b03787d1f5c24ad6524267d432a246aaf8b222023481e85 WHIRLPOOL e50373eb0cdc7453d94204fc2f3d6c6eba03233e0c313138cd62d1a6c312463aa6f170228ca7f00697bcb1df0e50e4dd7fc2b1d03c2a227c49687d247e14b71a
+EBUILD flask-xml-rpc-0.1.2-r1.ebuild 642 SHA256 fbc9c08f382df79d746143cec2134527e24d0251ba1fd7a40131875faf590d14 SHA512 cad51b3a97b5da14d1eb9466c333bf32a44e50f19fa2b7e2763f2b0ca9e0806e53db975b73a7a25030caf6438f497fcd9f1615f7aa316978f70084a3a49be1b9 WHIRLPOOL 87d0197946d578a2a6d491be52ea2bfc6b23ace9f04a1c0ca5e39e53e15568208ed1767e76030541ec54756b8da757f6ed45a1b9442c55ad71bd9119efd3546d
+MISC ChangeLog 2605 SHA256 f509990f1e72c11605610003ca9d024831c3e0e4d762e024a29c0c059afd7734 SHA512 e2d5f27fd6345ef2e0c3a7e615474cbc24fed530e3fc56c22879402351b2df4632b16bb2ddcb68344656322f8faea51faf3479e998949c039cbb065588c4d250 WHIRLPOOL bbe0e873aaaef9c9e2aa66cdc551df4beb7eda74932a2be79f651031c92688fefa2a45390e8db66ce8dc3275d4e91908b7e49cab9d7bdda1171509eeebdaa4cc
+MISC ChangeLog-2015 1268 SHA256 dea805251d03ac2d876e13b5de14f4103a23c64bb9e8239426f4365de1eca6cb SHA512 9ae1a1ef3c9305a83a1b4f9661a042a89d7402a700ea77ed2a81eb185382448c44cce84ba6ed1668191f0d5262b457d74a55ca9aca4757f56435c9c3da35284d WHIRLPOOL 0b1215ff8a5bd7b91062d0a95aa28f18b4e188413a66a93587863ef1766ccc48fd3ca78451758f41198f8b157d56afd34f2257086d6f0d47c061d70a56c0f864
+MISC metadata.xml 316 SHA256 0401480ff5e113f397d318748f99f2b814acbde49b6da167426b6245f373670f SHA512 3c4cc08e88993f3a36c3df4bd8c1ae2d9cdc5e75fb27c34960ab749a1ecc1eb67e22dec85cbd3225f0401080104bc0a503df1b68db66de29e4d8e16af0f19718 WHIRLPOOL 62164cdc841cf4f119ef4b4badd42766d009d4c52757578a009c3ef03c44b07dc7b1c522cd0847bf32428d30c5623ef6fc98637f6b881007a98bda2428212cd6
diff --git a/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild b/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..490fd4648cfb
--- /dev/null
+++ b/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Flask-XML-RPC"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="XML-RPC support for Flask applications"
+HOMEPAGE="http://packages.python.org/Flask-XML-RPC/ https://pypi.python.org/pypi/Flask-XML-RPC"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/flask-xml-rpc/metadata.xml b/dev-python/flask-xml-rpc/metadata.xml
new file mode 100644
index 000000000000..1db4779c1a77
--- /dev/null
+++ b/dev-python/flask-xml-rpc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Flask-XML-RPC</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
new file mode 100644
index 000000000000..b2899cc0b492
--- /dev/null
+++ b/dev-python/flask/Manifest
@@ -0,0 +1,15 @@
+AUX flask-0.10.1-is_package.patch 655 SHA256 cd564c6aa58798e61a0759645ebd6ffbbdb1f694d8749d5ecb49d85b2cb30314 SHA512 d68d5db64f629f106151bfe8b4ddbc837a38f54e4a55897e64abccd48f533ffdad0395428e2e5f39f9f733ca20b08170de21f5250e522a78ea95631410915d50 WHIRLPOOL 4355b5ec26b24dbbee2a01659a8ec053a17442087fde41fd59bb8cd1fad780e554985f3428d6d21dc2f5b5bc89777f2224e8e6d80eec44df62cae5bd3e168a20
+AUX flask-0.10.1-sort_json.patch 1563 SHA256 50449f406b0164a5f2d1934e0f7f24aa48967fc434d93b3953bd4699bb32941c SHA512 d03d38d6a8cb96ee56c6f678955fea60df151a712d0bc42eb98464817bf436e6846b445677d8a961e13f2c6f6774c44a3c4fd16a1656107212852632f0bc708b WHIRLPOOL 2f66700910a5abeddc4bc8d8b9a3887a6ac6f829d38ae918bc38d713229d3589f81ddc814a311499148e096d3ff22bdecc26069f89be291539d56ae5cb79f9c8
+AUX flask-0.10.1-test_appcontext.patch 550 SHA256 866872ac74d58dc024dfbffbb6d16cddb18a09f1db69d6700d2b6ab26e4d7e27 SHA512 5510d536ee432429ba2f0da8248653192e9e5ed9ad107b05dd3cc640d63039327f1f495148da5b7de403cd124d04760fb94d185b6b774ce39a8ebb171bca4d61 WHIRLPOOL c9af7a75be4e6dc3b62b55248443686a2918826755be73ed9a11db7856254e163a6deacb00fa11dba4dc58398685a2ec11750a7dc1b78c2cbc6f85d18349354c
+DIST Flask-0.10.1.tar.gz 544247 SHA256 4c83829ff83d408b5e1d4995472265411d2c414112298f2eb4b359d9e4563373 SHA512 0008d62d03a46b071c7d0510513d011a9bfd2b77df7f677371a446ca9805d16b1ee5e17dd8dd7cde6443a629370234e44735e20381de20a7da385969797f053f WHIRLPOOL f30a306ed00fe6d4c8e47b781c556c576b99b3545f833ae06f6b778d91c3127dc0adcc34d48221a0f1db1bb1633f2329d6085b7a4550afc672530525fdff474f
+DIST Flask-0.12.1.tar.gz 548511 SHA256 9dce4b6bfbb5b062181d3f7da8f727ff70c1156cbb4024351eafd426deb5fb88 SHA512 23a376ed452bbf874eeeff959924bf8aee51fc9196af71092a7a457742a635fb3adaa958e61625522e93a14092e3bb88a22a74ef419513ca1ae93a1d08723ac5 WHIRLPOOL 29e1c55d094673cb1150780cac5deb1c2964a71e7030b4b4d32dd633fd7631d48687171cf1e745302e0c4dd40d4807a2467ca8c9c4fc9ada4e5d22a35cf3875d
+DIST Flask-0.12.2.tar.gz 548510 SHA256 49f44461237b69ecd901cc7ce66feea0319b9158743dd27a2899962ab214dac1 SHA512 c00bb807e8fbc943e23a3721acf5b04320e7a58d658bca46bdf83a345b4c4d5729accae338505e134f01bc908adec9555fd94e8c87ef6f0367e6037215c06319 WHIRLPOOL 6a1c9c12804bc0a4052ba16aff00cc05dba243787a7a58ebf094760ff7e121cfd302eac85f900d9b5c49876a6761dbd6c0c17e8e21bb6c3a5a23d49b67575cc3
+DIST Flask-0.12.tar.gz 531923 SHA256 93e803cdbe326a61ebd5c5d353959397c85f829bec610d59cb635c9f97d7ca8b SHA512 b8e9e005a850fcba413ad151998768ea0facb68f05855a1934cc6e4de1438cb59a4dd1bc74d2b04d52b3e837afa0a7785e98ae6c5af363a894c2be64773113f0 WHIRLPOOL df0df8db12b18b50d9ddf43ae925717bf4a67179af1d387020e73d4fb5f0c04c6cc1d6c83504d8dc5cbcb4dc11dcb0b63724499bd3c5b820feb181418d965138
+EBUILD flask-0.10.1-r1.ebuild 1149 SHA256 982b942cf78e2ec0060e46f14a4b13a9e9d8c7825e235821058bc8738185f225 SHA512 4811cfa34a2cc28a3640fecc370b744f12f39befea9c057cf505e8423bab74707f1aaee267f8fbfd76fbdc0c5da3493d04080f9be401c553cd93620e9fd78d62 WHIRLPOOL 3c51bf1e29aebbb2ee51fc83e79afedd985af7141abb89a5dcc9a0094b20bf7944e4c2a332d9f2547219d960bfb416f8c02deae42d71563aa6f0b2653c5d16ca
+EBUILD flask-0.12.1.ebuild 1723 SHA256 3d21032e1635f47bd433233684c9aa2c6e8d30b4cb3377c63a01ecf28909a7c6 SHA512 a972af92082b1e268d2ed0e4ded97027e5b969c18ece9a6be639e33a30a1988dfbff6e2311a78ccc69dc1711bede33245f0a003d71659c9376058b6184a3baed WHIRLPOOL 642123a1d8e1cb28accf20d42236086c296647aed4d226b6f84c07af2d7391eb8288a1a14dff1a441fed521bbc7d45493a05153d9d8eb0803004d36686a5659d
+EBUILD flask-0.12.2.ebuild 1730 SHA256 c6c521cdcb397726e09640a61207e520715cb1b869f8847711a0cff7c59d61c8 SHA512 a744a27e43ba92b11a994ee25e9f4d081064e8f548129b81da5b769f83c1cd9a02cdc74c3c03a7605722c10a0aca5e785f99b4c5aa83aa2d0f1d52db67715178 WHIRLPOOL 0eeaeef734b30037f3aed1241787e1e222a73f692b43cc08631eabc732d9182261bacdbaaab68d59e094caa9b4a32073a8a41c9a555c8edae3f1d8a5cd72e952
+EBUILD flask-0.12.ebuild 1441 SHA256 10cc1d0f12f955f2006fb8ebd3979fd4606f379dde73461e75f257522013c077 SHA512 c81594248e5ad39bf26c7a1ea4ffb8c0316f96c789f7b22c3544a6e506df128532cdf256e1ad9378c2ddfb061d4bb88d5428c4d99f290ea14611f96e50f73aa4 WHIRLPOOL 0b5839e4b071ae3280633d988c0f801820eff299d0a0fd1bfecc722ca3d30b428a29ce521a187d436d175a15a6cf68970f56579f9d660016949f9b4945375302
+EBUILD flask-9999.ebuild 1082 SHA256 2ac2309f26333c7bfda64f5669769fe922fa535ec60b2a4555a95328b2483368 SHA512 eeeac5935ff26e80c2ebc12ebc5a7e3bc5a46516a0fb63bae222e4be91f7858a48c4c5444180c1142ff82452a7eea972c860fe49fcb6da1ed433d2a2ced1c3b3 WHIRLPOOL 3a8c7602de3f1ab0be928578d74c0df918c3b036477ea6d3028cea0227b6187aa57544d3cc8b72c00ef65c049b955107c86eb8edd1e8fb06495c22ee07c45d04
+MISC ChangeLog 4034 SHA256 c227cb9f563938a8c37758dea86d9f912cdaa7b7a075f4c03de7b52e607395fe SHA512 a4173a2e68f4c51b67d72653f520cb3007346af41c8e1c182d2ff0b65b0be46884f3dde10c29c66e249d403bd8438d3cd467ae75428c97a2283d92bbbc54658f WHIRLPOOL 9d8eaf216cb8d3d773f85005a0a5b87f48365d40e12fba29303ef18f2dc3272fee18ec9ef967d20698cb2c87e195c26555fb39b5fc5c79df5a00c529eecf2221
+MISC ChangeLog-2015 5610 SHA256 83fa7a0722e9585f39448a2eb4ffac7e49e4db12f8a82af4140c15c38c781d84 SHA512 4eb71e7171f26cdb1906149ded4acc45a3dfecbb52127e6c66452e286d000d39f03c19401ef756ca9f6b9d5a9f702fc510ddf1a142a6a7fb061bcbfedfeee1b8 WHIRLPOOL 89bdd2077fb6acdbe55d0727225bd66505e2400682ce8ed64e1ff903712a9c731296cadbf89e94c727ac118dfd28e7bb5fa6baf914da36f3cde7b0df9b2bc5be
+MISC metadata.xml 363 SHA256 8da9e9b392ea7622393b929fe21f4f468aa1711ca7f503b79b421cd21856a554 SHA512 33989d02b79b82d3256dbbf7402d79580d529e728222d74dbb80f740dfc1f8f1357f03ab5da857ff1821f2bb90f7b7eeae71d89e237516da62656d3d124ef4d6 WHIRLPOOL 93a6905c11beeee5a5ecaf05032bbc3e984287279fafd918d4eb28584d98818f8c1252fdd74e66b8d743ba814251d849263c2648e813d575519311eca269b94e
diff --git a/dev-python/flask/files/flask-0.10.1-is_package.patch b/dev-python/flask/files/flask-0.10.1-is_package.patch
new file mode 100644
index 000000000000..611d931d502f
--- /dev/null
+++ b/dev-python/flask/files/flask-0.10.1-is_package.patch
@@ -0,0 +1,13 @@
+https://github.com/mitsuhiko/flask/issues/487
+diff -ur Flask-0.10.1.orig/flask/helpers.py Flask-0.10.1/flask/helpers.py
+--- flask/helpers.py	2013-06-14 06:35:43.000000000 +0800
++++ flask/helpers.py	2013-08-16 16:18:36.194006290 +0800
+@@ -679,7 +679,7 @@
+             filename = sys.modules[import_name].__file__
+         package_path = os.path.abspath(os.path.dirname(filename))
+         # package_path ends with __init__.py for a package
+-        if loader.is_package(root_mod_name):
++        if package_path.endswith('__init__.py'):
+             package_path = os.path.dirname(package_path)
+ 
+     site_parent, site_folder = os.path.split(package_path)
diff --git a/dev-python/flask/files/flask-0.10.1-sort_json.patch b/dev-python/flask/files/flask-0.10.1-sort_json.patch
new file mode 100644
index 000000000000..e78cd0dee825
--- /dev/null
+++ b/dev-python/flask/files/flask-0.10.1-sort_json.patch
@@ -0,0 +1,54 @@
+https://github.com/mitsuhiko/flask/commit/a2bc61b5ab19e899735f8945f68123b4cea570d5
+diff --git a/flask/testsuite/helpers.py b/flask/testsuite/helpers.py
+index 636f67f..7de70c0 100644
+--- a/flask/testsuite/helpers.py
++++ b/flask/testsuite/helpers.py
+@@ -173,7 +173,33 @@ def index():
+         c = app.test_client()
+         rv = c.get('/')
+         lines = [x.strip() for x in rv.data.strip().decode('utf-8').splitlines()]
+-        self.assert_equal(lines, [
++        sorted_by_str = [
++            '{',
++            '"values": {',
++            '"0": "foo",',
++            '"1": "foo",',
++            '"10": "foo",',
++            '"11": "foo",',
++            '"12": "foo",',
++            '"13": "foo",',
++            '"14": "foo",',
++            '"15": "foo",',
++            '"16": "foo",',
++            '"17": "foo",',
++            '"18": "foo",',
++            '"19": "foo",',
++            '"2": "foo",',
++            '"3": "foo",',
++            '"4": "foo",',
++            '"5": "foo",',
++            '"6": "foo",',
++            '"7": "foo",',
++            '"8": "foo",',
++            '"9": "foo"',
++            '}',
++            '}'
++        ]
++        sorted_by_int = [
+             '{',
+             '"values": {',
+             '"0": "foo",',
+@@ -198,8 +224,12 @@ def index():
+             '"19": "foo"',
+             '}',
+             '}'
+-        ])
++        ]
+ 
++        try:
++            self.assert_equal(lines, sorted_by_int)
++        except AssertionError:
++            self.assert_equal(lines, sorted_by_str)
+ 
+ class SendfileTestCase(FlaskTestCase):
+
diff --git a/dev-python/flask/files/flask-0.10.1-test_appcontext.patch b/dev-python/flask/files/flask-0.10.1-test_appcontext.patch
new file mode 100644
index 000000000000..11dee7a9f6bf
--- /dev/null
+++ b/dev-python/flask/files/flask-0.10.1-test_appcontext.patch
@@ -0,0 +1,14 @@
+https://github.com/mitsuhiko/flask/commit/f88cc2d2f9d14d97e33ddd2bbaa4b1885db06e1c.
+diff --git a/flask/testsuite/signals.py b/flask/testsuite/signals.py
+index e061932..45ca45d 100644
+--- a/flask/testsuite/signals.py
++++ b/flask/testsuite/signals.py
+@@ -102,7 +102,7 @@ def test_appcontext_signals(self):
+         def record_push(sender, **kwargs):
+             recorded.append('push')
+         def record_pop(sender, **kwargs):
+-            recorded.append('push')
++            recorded.append('pop')
+ 
+         @app.route('/')
+         def index():
diff --git a/dev-python/flask/flask-0.10.1-r1.ebuild b/dev-python/flask/flask-0.10.1-r1.ebuild
new file mode 100644
index 000000000000..931a2015563a
--- /dev/null
+++ b/dev-python/flask/flask-0.10.1-r1.ebuild
@@ -0,0 +1,42 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/mitsuhiko/flask/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-0.21[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.4[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+# Usual; test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${P}-is_package.patch
+		"${FILESDIR}"/${P}-sort_json.patch
+		"${FILESDIR}"/${P}-test_appcontext.patch )
+
+python_test() {
+	"${PYTHON}" run-tests.py || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/flask-0.12.1.ebuild b/dev-python/flask/flask-0.12.1.ebuild
new file mode 100644
index 000000000000..851f950e42f4
--- /dev/null
+++ b/dev-python/flask/flask-0.12.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/pallets/flask/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/blinker-1[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.7[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.4[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-0.21[${PYTHON_USEDEP}]
+	>=dev-python/click-2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die
+	# DeprecationWarning: Flags not at the start of the expression
+	sed -e "s/r'\(.*\)\((?.*)\)'/r'\2\1'/" -i tests/test_basic.py || die
+	# issubclass(ModuleNotFoundError, ImportError)
+	sed -e 's/\(excinfo.type\) is \(ImportError\)/issubclass(\1, \2)/' \
+		-i tests/test_ext.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \
+		py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/flask-0.12.2.ebuild b/dev-python/flask/flask-0.12.2.ebuild
new file mode 100644
index 000000000000..30a177c03834
--- /dev/null
+++ b/dev-python/flask/flask-0.12.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/pallets/flask/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/blinker-1[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.7[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.4[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-0.21[${PYTHON_USEDEP}]
+	>=dev-python/click-2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die
+	# DeprecationWarning: Flags not at the start of the expression
+	sed -e "s/r'\(.*\)\((?.*)\)'/r'\2\1'/" -i tests/test_basic.py || die
+	# issubclass(ModuleNotFoundError, ImportError)
+	sed -e 's/\(excinfo.type\) is \(ImportError\)/issubclass(\1, \2)/' \
+		-i tests/test_ext.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \
+		py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/flask-0.12.ebuild b/dev-python/flask/flask-0.12.ebuild
new file mode 100644
index 000000000000..74cc21a5a81e
--- /dev/null
+++ b/dev-python/flask/flask-0.12.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/pallets/flask/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/blinker-1[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.7[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.4[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-0.21[${PYTHON_USEDEP}]
+	>=dev-python/click-2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \
+		py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild
new file mode 100644
index 000000000000..6a024894089c
--- /dev/null
+++ b/dev-python/flask/flask-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 git-2
+
+EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://pypi.python.org/pypi/Flask"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="examples test"
+
+RDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-0.21[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.4[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+#if LIVE
+SRC_URI=
+KEYWORDS=
+#endif
+
+python_test() {
+	py.test tests || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/metadata.xml b/dev-python/flask/metadata.xml
new file mode 100644
index 000000000000..0d860934115e
--- /dev/null
+++ b/dev-python/flask/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Flask</remote-id>
+		<remote-id type="github">mitsuhiko/flask</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flexx/Manifest b/dev-python/flexx/Manifest
new file mode 100644
index 000000000000..df189bcbadab
--- /dev/null
+++ b/dev-python/flexx/Manifest
@@ -0,0 +1,6 @@
+DIST flexx-0.3.1.zip 418280 SHA256 aa8aefca3aec283cf555a2b59aa619fdd1b595b62a881cee35e3f36794185f04 SHA512 3d98daa18e0f307ed24386fc59a59a4df1727cdc7483cb1fa7bc6c5b2eb8cba36fbc100a98d8549ac890ef8ba86b9acef77d34e26c99994b918f5344354b0bfd WHIRLPOOL c74eb8e22975c16296ade19f46364c086bcdbfd83dd5a2592033fb6ba53164dab17814a952f34db93b8170f01def4c46423f8e8bbfb6c75c620334535113f9b2
+DIST flexx-0.4.1.tar.gz 287596 SHA256 d6395dd37ed01387673813a1465a1bd9e2170eb80fda92298fb13d40f40a76f5 SHA512 af9d84876d2c6b5f8b9fe7967dc282e4043456606c1574c10cfcd15a3f3d0d3f8f889a41ff254655eed06200b5d9c10fa27249343ee689ff62346031a4ed607b WHIRLPOOL c01381814f2f4e0842fb276f8614897084f7c9d5557c612b361f1ee73c41ca3bf95c83247dd3808b0536d736a6a8d477ad6d98afa3026564c84d0a8770e37cc4
+EBUILD flexx-0.3.1.ebuild 554 SHA256 9e4456b2d41d6d988fc87bce30e63bf56507dd13498a24b667322000377a47d8 SHA512 8a6cd9ed7c5412493f54b8a50eb39579b7e592f705e5a74df6d29b62bf7f2f2d923807a92a19d3138b8e55021a9bd53415ab842eba72ca4ef05207cfd3433d47 WHIRLPOOL e250f9ba496da5398cc7b2019fed3afcf07ad6f1796aaee9c17138b2bca856ede427fcb6fc62b146a4d73d1affb3208b58745fe972830f69be4789b49f663055
+EBUILD flexx-0.4.1.ebuild 584 SHA256 76b79b59aab36886e1d000077e56555780e0fc746d1b4963457a0f9855c649c0 SHA512 fa60d734d6b5c8f0a5d8d3b8da2767ddc7a045ab4f95d7871dffaf50c987f02cb17c4e28bb9022e47adce120cce3aae0f3e1fa1411c77617bbdf74f5daab23c3 WHIRLPOOL 5c05e1637e8228aa4b1adf7870234f848fe765ec905007c1f9dfaa56b2ac12a52762c13c75d246463ab0746337dcb93bbae4c3632f579389e9777c05352d4eb5
+MISC ChangeLog 2270 SHA256 9efbe9e3917138f9a172a63cef68a8736fa3ba7d1d59013cc85363aedcb49d18 SHA512 70cea034e2e8016006333a58411b38efbe67494650cf412de836909137c6693cb55aa874085095f75b4413f84c0cc61d7fbdda4b54590d311773544c06ffd644 WHIRLPOOL 9d2c443521c6ab6f2d776310a28c8590143e730c308c3ad82609d5b8f8599353bef1438321d0e75436b18a48b76097166dee4ddc49a52eb719d232f0d48241b2
+MISC metadata.xml 509 SHA256 372f177fa7997d3c7a8ad6f5d2ec1da9f3bb6479cc2442b402cbfc0110065ec5 SHA512 5e15dab8c10def713dacd1e6883502c075aff68e72b839d89273d28b3edc7ad03cc82152e1f4fddbd416b08fb0efdda3df26832c99bab7cddf700caba0258492 WHIRLPOOL 1b146c9f97d0be971acb0992c4a72f1faa4ceb2048efb3455f4a1ba6572ffe35480142526db042fe9259c1f4008cfc195208b5d59e36e074a7fa41222fdb71f2
diff --git a/dev-python/flexx/flexx-0.3.1.ebuild b/dev-python/flexx/flexx-0.3.1.ebuild
new file mode 100644
index 000000000000..7f83b67265ab
--- /dev/null
+++ b/dev-python/flexx/flexx-0.3.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure Python toolkit for creating GUI's using web technology"
+HOMEPAGE="
+	http://flexx.readthedocs.org
+	https://github.com/zoofio/flexx
+	http://pypi.python.org/pypi/flexx"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/flexx/flexx-0.4.1.ebuild b/dev-python/flexx/flexx-0.4.1.ebuild
new file mode 100644
index 000000000000..45ae7cc1bf7c
--- /dev/null
+++ b/dev-python/flexx/flexx-0.4.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure Python toolkit for creating GUI's using web technology"
+HOMEPAGE="http://flexx.readthedocs.org"
+SRC_URI="https://github.com/zoofIO//${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+#IUSE="doc test" broken tests
+IUSE=""
+RDEPEND="www-servers/tornado[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/flexx/metadata.xml b/dev-python/flexx/metadata.xml
new file mode 100644
index 000000000000..a79517c51568
--- /dev/null
+++ b/dev-python/flexx/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">flexx</remote-id>
+    <remote-id type="github">zoofIO/flexx</remote-id>    
+    <maintainer status="unknown">
+      <email>almar.klein@gmail.com</email>
+      <name>Flexx contributors</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/flipflop/Manifest b/dev-python/flipflop/Manifest
new file mode 100644
index 000000000000..76b943c784b5
--- /dev/null
+++ b/dev-python/flipflop/Manifest
@@ -0,0 +1,4 @@
+DIST flipflop-1.0.tar.gz 9991 SHA256 32a23ed7bdb53bab03271c4c92abceae1ee3a337dd7fd5a18334fd64930ebcfd SHA512 cff8e6e0ecfbf633aacbfe7612837cc85d5208b1dadc4b30a20cc4934549365a066df9ed66bab4e760b7fe73d7ce796de6a53fc01cec742d81fceb17e2529267 WHIRLPOOL d1de0967f0b86530cfb601db40d9578e087212c1d5496c647224d925079dfdc943851ae4be6e4633b94679f0911c75886e5706268d9a6f5aae1841b995ac05b2
+EBUILD flipflop-1.0.ebuild 354 SHA256 d3368cd172b8ae85e50060391227811d10dca2a398d4c03f70d0a39dd9a80ce7 SHA512 718b1a24eac4c913a41a39896976982527c27fd0cb1ba9333e85072a9e06818423961fd3d8f2dd301739efeb75fa6b20ba11a602e72332dfa1b39b76bf23dbec WHIRLPOOL 9ce778d9686ced4baf0cc196300a63878919051dc834d4d1422075b4a430fd82a1805f108a640ecdd4057630e0a9ffef52710ff7f1ac7b761be537ac07601d73
+MISC ChangeLog 308 SHA256 e92ef596a994dafc8d89d08cd8c83a150b73c70ef738e7a6e64a3f3c59c97315 SHA512 5a2d11385892798657eba827fb83dcd37206834070d6435b274efad56d1a6d2ef8645aeb5c67b0128f62672797023de5a0cbb2741e27f38d2873b485d6dc2b15 WHIRLPOOL d454a97f825faf544789f566c65293e51c69b81dc196c36fec52abd5bb9756684297ef4a40ef8669e699618051a93f355fab2b4aae84ff06a4dd1a2ec28224a0
+MISC metadata.xml 343 SHA256 5b0cfb4382240708a4511b53c228f1e06dbe7c5e06bb616737b6792cb3dfeb40 SHA512 6dfff49a804afe29069cfe7d93b61a823ff29d7b09f4055188bc6306131a794b9add9801a942cd0ef88e2360a966689b41930615dd4f53bcf5405115beca9ffc WHIRLPOOL 1daefcce34d2ac1e36ceae7ab1059a11c6ee7acbad7c9e27344cf6472d9d61697f27f3ca2585823bab68f78dc0e0368f1532bd714eaff1553eebe013b0aa3acb
diff --git a/dev-python/flipflop/flipflop-1.0.ebuild b/dev-python/flipflop/flipflop-1.0.ebuild
new file mode 100644
index 000000000000..10b19c9b7a79
--- /dev/null
+++ b/dev-python/flipflop/flipflop-1.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=(python3_{4,5})
+
+inherit distutils-r1
+
+DESCRIPTION="A FastCGI/WSGI gateway"
+HOMEPAGE="https://github.com/Kozea/flipflop"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
diff --git a/dev-python/flipflop/metadata.xml b/dev-python/flipflop/metadata.xml
new file mode 100644
index 000000000000..cfbf11057bad
--- /dev/null
+++ b/dev-python/flipflop/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Kozea/flipflop</remote-id>
+		<remote-id type="pypi">flipflop</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flower/Manifest b/dev-python/flower/Manifest
new file mode 100644
index 000000000000..678d627f3d8d
--- /dev/null
+++ b/dev-python/flower/Manifest
@@ -0,0 +1,9 @@
+AUX config.py 2666 SHA256 443c979e86e2931b5f34c7ab9223431e0e5f26cd9b8e259e47230a2d4a23dcd9 SHA512 6f67ebdd7bc5bef3ec9cd384b1b9c8a5edccc03d20fe0bd147ce25d4ca5100ee8cd0734609f4a7bb302f6cbc3bafd92dd7058c6bdae746f483d8c7b1d7c2c7ac WHIRLPOOL fb8bf0a36bce60aa7af17a6be288aaf49e54be7367c726434dc13fe3e39560ca942e54704df45c88f03fe7edca4bac60d697e6ffe5b656494e5c85b2b4eefea8
+AUX flower.confd 77 SHA256 b2acbed5049285171b4383f129db9462e0fdaf07b74cfeacb933fa4701fd534f SHA512 291df73d16622fbff51c805a1c967d98c461dcfe54324b8f271e812e6afd3f4d3d855ce2acfb3228b096ec0afaa16ebf5e75500e5b84c4bc0d9da31c3230bbc7 WHIRLPOOL 261034fcec47aa1ed7df23ff750c07f2d0a5c20ae1644004f4e2d5179d8060506e730a87c1fd9f671d14ea0957a512b206a905aa73a8971e62fb782da531be13
+AUX flower.initd 508 SHA256 d2790cc16c3c044f34e1b855cecd87b129e60d7212d53ab81171053c089baeea SHA512 66d066b2df7f8c6c42d410e8f0c6c1bac6340db994122040c796a0e9ff5440fc155f138a158b1477b6f50c2a627a7a18eeaf9b01d80e05d5273be3358047a960 WHIRLPOOL 21da00989c6ff14a692f20e7faeb71fec79d1fdc268984a0f456b9ade8f91812fbf4b2300c03eb0d3ebe555ddeffc05cf305366ed9e75be493057ef0107a42ec
+AUX flower.logrotated 85 SHA256 59f9f63401d599a643052b499b9da8e69854dbdfd7fc01447c7ba62974a25e74 SHA512 ff230e516d0aeffe9bb7d43bd847abdf1d3bf0f0fe0a6aec087fa7f08e2157e7f15994997ba76fc57a03dc34a0271cb9051bba938138ad95fde46c9774f05ffd WHIRLPOOL c078dfecfb74a203057cf70bf3124a1495868981d3ef25d91948640c929cfedcc0626ac2637b5bc014642d4652e2a6268eb03e423710908218ac04c5edcd8feb
+AUX flower.service 331 SHA256 5ee7d9b99efbe5ab4890904c644c2ab858bfbf21828740a9ef23e548e657502b SHA512 894d9e3cf4c87ba731ce8089efdce7e5d6f536425ce368825f750fe5367707a12b3b99221b7d9f3ebebf6881fa7bfbca6e13654ae878b046bfa94376c00039c7 WHIRLPOOL ee878c78c9f8f19435aa22c309255a9f7941b6dde59a355aac2806d53c6a03b0a88571641da6803f3cc64ed57675eaa72ac46d47984682ee6782f99f9a4a5c63
+DIST flower-0.9.1.tar.gz 3880608 SHA256 bdd926b731e8024779a5373fa33bff4a30e2a2ae6cf3a591beb83fbde3dc352f SHA512 519d92209dbdb7956fde30c604956d1cbbc8ec7180ff160ea088847b5b63310cd42dc949d02eef1197588b0353470a0f3ac96b44b2e3ebb093a254d8f94fb407 WHIRLPOOL 3595137d6f83e2ace3d93281daa19bf3b46432f30467489ec46bef4ff437bbbd3975230c31d4bd3134fb54616ee0a6eea1136d23c088f3543a45da1f6a495db3
+EBUILD flower-0.9.1-r1.ebuild 1428 SHA256 26a2a2a49a42fef2bcd695156867c7a211bc1b83aeab219aa68b515d3ada229b SHA512 cd2c71c8d9267ec245ef0d2edd9a1e163b63e32b839dc9d7bfb62105e55d317f5068960772176b9293496ba843ed1c8b544403bca119bb382627ac1e226e0e9b WHIRLPOOL d9112fa18b88f1d6f67a67ddc881a2e98bd32a65b420d1c52879cf04dde71128b5319e4d6ac70360d8d12b3b3eabc65fef67c7298c22543d0a91e60733987458
+MISC ChangeLog 1182 SHA256 35a5a7d8bbce1742fcb87568f430b527d62deb0252542fb96dbe47c530b2b010 SHA512 9a760e52677d1667bf6e4bf7ab093a7b62efa965e13898c46d880217f96ee2ae1f963f3d6060e3c39e13aa067ae7a5f4b143b8699dd1642e3532eb8216a2c95f WHIRLPOOL 5b20599e3c84241ce7e12e16a2039dd9a72d7ecf9a25450f9bc6acac3bb5fe403682d8cf012b83955113abdd21ccf1f160d745b20786a4bea77d23680eacd853
+MISC metadata.xml 348 SHA256 6f4c261cd54cee66c13999a0dc7cbee96e752f7fe7a9fc3b750f288e59d2b092 SHA512 3ebe07dea33229439c0e810bebe106316ec29481faf9c39ca3449228979d160d42a81161ed59b7109bf0731664d122b68b3ab5a6ea39aaeb35fe9feadf304a4e WHIRLPOOL dfbbce8feeb6c8b9c946b0574472bd57b8d6a1c54aa2ec938e955768b9bab1d0f633c0e61cdb572cc41c7abe5a21b4d96ebd56f0525a9f1d6733b02ad17554c9
diff --git a/dev-python/flower/files/config.py b/dev-python/flower/files/config.py
new file mode 100644
index 000000000000..da101ab785b5
--- /dev/null
+++ b/dev-python/flower/files/config.py
@@ -0,0 +1,115 @@
+# Configuration file for the Celery Flower service. Standard Celery
+# configuration settings can be overridden in the configuration file. See the
+# Celery Configuration documentation for a complete listing of all available
+# settings, and their default values.
+
+
+# URL for the broker used by Celery.
+# BROKER_URL = 'amqp://guest:guest@localhost:5672//'
+
+
+# Run the HTTP service on the given address.
+#
+# addess = localhost
+
+
+# Run the HTTP server on the given port.
+#
+# port = 5555
+
+
+# Enables Google OpenID authentication. `auth` is a regexp of emails to grant
+# access. For more info see google-openid.
+#
+# auth = None
+
+
+# Refresh dashboards automatically.
+#
+# auto_refresh = True
+
+
+# Enables HTTP Basic authentication. `basic_auth` is a comma separated list of
+# `username:password`. If configured, any client trying to access this Flower
+# instance will be prompted to provide the credentials specified in this
+# argument.
+#
+# basic_auth = None
+
+
+# Flower can use the RabbitMQ Management Plugin to get info about queues.
+# `broker_api` is a URL of a RabbitMQ HTTP API including user credentials.
+#
+# broker_api = http://username:password@rabbitmq-server-name:15672/api
+
+
+# A path to ca_certs file. The ca_certs file contains a set of concatenated
+# "certification authority" certificates, which are used to validate
+# certificates passed from the other end of the connection.
+#
+# ca_certs = None
+
+
+# A path to an x509 certificate file.
+#
+# certfile = None
+
+
+# A path to the private key for `certfile`.
+#
+# keyfile = None
+
+
+# Enable debug mode.
+#
+# debug = False
+
+
+# Periodically enable Celery events by using `enable_events` command
+#
+# enable_events = True
+
+
+# Modifies the default task formatting. `format_task` should be a function
+# that accepts a task object and returns a modified version. This is useful
+# when filtering out sensitive information.
+#
+# format_task = None
+
+
+# Sets worker inspect timeout in milliseconds.
+#
+# inspect_timeout = 10000
+
+
+# Maximum number of tasks to keep in memory.
+#
+# max_tasks = 10000
+
+
+# Show time relative to the refresh time.
+#
+# natural_time = True
+
+
+# Enable persistent mode. If the persistent mode is enabled, Flower saves the
+# current state and reloads on restart.
+#
+# persistent = False
+
+
+# A path to a database file to use if persistent mode is enabled.
+#
+# db = flower
+
+
+# Enable support of `X-Real-Ip` and `X-Scheme` headers
+#
+# xheaders = False
+
+
+# Specifies list of comma-delimited columns on the /tasks/ page. Order of slugs
+# in the option is unrelated to order of columns on the page. Available slugs
+# include: name, uuid, state, args, kwargs, result, received, started, runtime.
+#
+# tasks_columns = None
diff --git a/dev-python/flower/files/flower.confd b/dev-python/flower/files/flower.confd
new file mode 100644
index 000000000000..a74ca17f3d2b
--- /dev/null
+++ b/dev-python/flower/files/flower.confd
@@ -0,0 +1,2 @@
+# extra arguments for the flower
+command_args="--conf=/etc/flower/config.py"
diff --git a/dev-python/flower/files/flower.initd b/dev-python/flower/files/flower.initd
new file mode 100644
index 000000000000..1f950c6d2103
--- /dev/null
+++ b/dev-python/flower/files/flower.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 2015-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Real-time monitor and web admin for Celery distributed task queue"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+command="/usr/libexec/${RC_SVCNAME}/${RC_SVCNAME}"
+command_user="${RC_SVCNAME}"
+command_background="true"
+start_stop_daemon_args="--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
+	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+
+depend() {
+	need net
+}
diff --git a/dev-python/flower/files/flower.logrotated b/dev-python/flower/files/flower.logrotated
new file mode 100644
index 000000000000..5c7f0287690e
--- /dev/null
+++ b/dev-python/flower/files/flower.logrotated
@@ -0,0 +1,7 @@
+/var/log/flower/flower.log {
+	missingok
+	size 5M
+	rotate 3
+	compress
+	copytruncate
+}
diff --git a/dev-python/flower/files/flower.service b/dev-python/flower/files/flower.service
new file mode 100644
index 000000000000..dd2f1d9da105
--- /dev/null
+++ b/dev-python/flower/files/flower.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Real-time monitor and web admin for Celery distributed task queue
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+User=flower
+PrivateDevices=Yes
+Environment=_FLOWER_OPTS="--conf=/etc/flower/config.py"
+ExecStart=/usr/libexec/flower/flower $_FLOWER_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dev-python/flower/flower-0.9.1-r1.ebuild b/dev-python/flower/flower-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..c5b5750941fd
--- /dev/null
+++ b/dev-python/flower/flower-0.9.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 systemd user
+
+DESCRIPTION="Real-time monitor and web admin for Celery distributed task queue"
+HOMEPAGE="https://${PN}.readthedocs.org/ https://github.com/mher/${PN}/ https://pypi.python.org/pypi/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+
+RDEPEND=">=dev-python/celery-3.1.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2015.7[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.2.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+src_prepare() {
+	eapply_user
+	sed -e 's:tornado==4.2.0:tornado>=4.2.0:' \
+		-i requirements/default.txt || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	insinto /etc/flower
+	doins "${FILESDIR}/config.py"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+}
+
+python_install() {
+	distutils-r1_python_install --install-scripts "${EPREFIX}/usr/libexec/flower"
+}
+
+python_test() {
+	esetup.py test || die
+}
diff --git a/dev-python/flower/metadata.xml b/dev-python/flower/metadata.xml
new file mode 100644
index 000000000000..119189addfa1
--- /dev/null
+++ b/dev-python/flower/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">mher/flower</remote-id>
+    <remote-id type="pypi">flower</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/flup/Manifest b/dev-python/flup/Manifest
new file mode 100644
index 000000000000..089532e3e6e2
--- /dev/null
+++ b/dev-python/flup/Manifest
@@ -0,0 +1,5 @@
+DIST flup-1.0.2.tar.gz 49051 SHA256 4bad317a5fc1ce3d4fe5e9b6d846ec38a8023e16876785d4f88102f2c8097dd9 SHA512 65c610f9ddc3df6ed6deb6753b2b15ce4f4579efd9dfd25166d3b6803e5d7058fee6617388c9c67c39f7db54da5c918181dcbddfbb7be4a78cf8b65501af4c4a WHIRLPOOL 03c60b9f51699f2b3171e35a1e4fef3fbd47ef07c7150f61cd5bbd2ae1b9094580745b0bcf951aa79d1ea1157ef7c76945470177aba9f2f93733508fc306e8db
+EBUILD flup-1.0.2-r1.ebuild 536 SHA256 e40616fbc63b4201f2b8e27dd853c87e6de78453cd6ec7764bc1293eae567379 SHA512 049afbae275ccbed3684bcf9ff67f06e643377ac9224741907796753c4460f21f1fcf91fc94ab6ac03170acca67f84ad917f1efffb7cca6f6fdb55b901642f37 WHIRLPOOL ed95bbbd9fcc421506bf03d41d01de428079630de85eff6e34c23683676a81760704b15067cedbc3d7f219c285bc08b58113349102429a5ab520818e7cbf851e
+MISC ChangeLog 2426 SHA256 99778a0e025d4d39bae776a507e479c82abb692870c69a83040a1d0b989e035e SHA512 56d4b4be61fcf6e7f9652ff0e5683576424d27fbf4425f4d5fb587aebbabb7f08a1153d53e9fbac09e2c364cfce517557e5b28ffa1fbe5423ee356174513894f WHIRLPOOL c3774839586970d6c40999621abbc0ca7eb8270d2e81f8b671eb1858c63426bebb2410d3e1901a7421a69e4b3a7b26841505f7d4add7011e8caed013cde78d61
+MISC ChangeLog-2015 2899 SHA256 813a5fe5177d7da459f21bd38cb220e9e5d4c3f16e94e778d7d4219f35b2eb20 SHA512 14cb0e0c02358a6802de3862ab455e14febe8f6b853fefccaf18855bd61e31583568bdacf587286882b9e4dd64260d6c74d7608a74d0e766a061b2fd007818bd WHIRLPOOL 33d06f481bb6627eb5d805bb60e422f46edc3d5f99c1c1a93eaa189ddb339dc008fd2fbde69e57b02ad05167fe86b6aeb98a8254a967a98dd69c7d691a2d7aa4
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/flup/flup-1.0.2-r1.ebuild b/dev-python/flup/flup-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..9c4519990786
--- /dev/null
+++ b/dev-python/flup/flup-1.0.2-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Random assortment of WSGI servers"
+HOMEPAGE="http://www.saddi.com/software/flup/"
+SRC_URI="http://www.saddi.com/software/${PN}/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/flup/metadata.xml b/dev-python/flup/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/flup/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
new file mode 100644
index 000000000000..d2a9bfbdb8f3
--- /dev/null
+++ b/dev-python/fonttools/Manifest
@@ -0,0 +1,9 @@
+DIST fonttools-3.0.tar.gz 298992 SHA256 3bc9141d608603faac3f800482feec78a550d0a94c29ff3850471dbe4ad9e941 SHA512 d0793d4c17e077e2cd308f37680d8b2ac34502542fda5a4a20e9567dff3667c8fc3f73aff8605e2e86d5486bf9a61f3f25f1f8d20d6de610477f7f8b0c7be40e WHIRLPOOL acaf145935e7f85529bdcd74edd366307482424ea68b55be96c6e51808d2364e0c6c2aba1cfef8d16b8e402a286add0785e7974998492178b3fd0ce2458207f8
+DIST fonttools-3.10.0.tar.gz 820057 SHA256 91fbab7277017587d9c6bfaf6770cbf1b38983d02308eb3f948b7915e43ef6bb SHA512 fe59f03d6d2bb1dbbe02da922c994911cbb12cea02dfae67651872fbda9b5b1c522bd6d69a4eb117854eceb79c92b385a28e2df5a4a7ceebce4467f9f193e68d WHIRLPOOL ac3acbf8346f3e60c7d96333315a4b4493cfb4ac687781c54f8a70ed5959f15ae1ef117eeed3c3009b2d03aea1fba4bfa66a2a09fba30128afbe6b01d73440b5
+DIST fonttools-3.15.1.tar.gz 888194 SHA256 72c0706fed42b5fbb0d02b2abed040763de7b5062681f81978ffe288fa81486e SHA512 a5d258c52d56a37f368cf405a0705744e5c0828954ea389359115c3cd0ccc856dd7d699182410a5173e9b9f60c38495abbe1fb01b8a9b6c9263ef7aa93f9ce4b WHIRLPOOL b7e32bce05ec6b7c4f258cbccfbb7cec1ea6e58c726bf5f2fe043bf46f563c6cc1618cf1fe067b58228547c552d107b82e8d3f4ff72c6042e7fb0870683ba465
+EBUILD fonttools-3.0.ebuild 715 SHA256 8063187c690b0d0a6675c6d75d42f9964c4ebb5728be9752c20e87e1a06733bc SHA512 5ff43c81e6109df1cab0d27c059c85e20e6fb268b4bad6168fcd88b7a2f317b3ffd3f20ee4634e43e0deadd2cbfdf24936c0099cf4114d8944ac846ca2604822 WHIRLPOOL 68175c4aa3bce2545c324d52a97c59fc1430a45af90ad73c02b58bde70253254b4ab1ef762b2dfcc2b4f56443db39938f6ee5f54df7f473c41cffd316daac0d8
+EBUILD fonttools-3.10.0.ebuild 684 SHA256 d79d0f1b1938ac557ce2fa894b74e5b6ad30e85cc027b9c60d870d4c69b210d3 SHA512 c8260cd0e0a4256e329d64c5da8e82965a6dbe9f1e671636c37c8b43df9f8b325c0fff8064499320789866fd2f840c074f91f2330efb48721f4bc80c7c65e2fd WHIRLPOOL 8ff7e13eb25d65634eac6e8d3669150b1fab479966abb623c65d62e4af35e792b68de7a90b95931c9f76c044cd33b8ccaa9720ed2fbe23d10f83e0d5ac73e80b
+EBUILD fonttools-3.15.1.ebuild 684 SHA256 d79d0f1b1938ac557ce2fa894b74e5b6ad30e85cc027b9c60d870d4c69b210d3 SHA512 c8260cd0e0a4256e329d64c5da8e82965a6dbe9f1e671636c37c8b43df9f8b325c0fff8064499320789866fd2f840c074f91f2330efb48721f4bc80c7c65e2fd WHIRLPOOL 8ff7e13eb25d65634eac6e8d3669150b1fab479966abb623c65d62e4af35e792b68de7a90b95931c9f76c044cd33b8ccaa9720ed2fbe23d10f83e0d5ac73e80b
+MISC ChangeLog 4002 SHA256 42b11bb0f5614967123acea7e923e200c9daa5eb5dca2b001ea09784857f2c9b SHA512 3353e6cbdb063c5a7d9c28d5075ece4e9f2ceeaec4b70244c366702ce6234bd31655a950ef784f539876a91dcce1844be4e1b783bf4207b700e0271e12149143 WHIRLPOOL be3503d0c399902be1096da262e4f8e3718939751ea20909d6ffe1c6b583eff1abd055ed56d9be7ee7ddc71607f17771c1364249466e8f8918ece2e754321f8f
+MISC ChangeLog-2015 5323 SHA256 c9e5e7d9ec87a9e9f64e6338e76a181f7da573f58b455616813cde0db280aebf SHA512 d154cbca050af6635b35785c8f5eb5cb4fcbbbc5166de5b19554157fae9c2f9f43bed7291bb5336974d6a22e3e31333c5c0f435a9f2c13bef04a26779b1943e1 WHIRLPOOL 8706cac483a90734992fe78941c5ea5ff8a339072f9ab454e9fa4432c175c50fba4bb204ab1d6e682ac0ce53cf5dc48fd0cad833f757d2f513de3972aa7c475e
+MISC metadata.xml 474 SHA256 a225fe4cedc13906fc4cd9b5553236e3e77472c83b7f49f296d80b67920a7d64 SHA512 f683da73b5db5e132fa4eacd6de94e50e434f12a88e14b1d97585492c4c4bbe3dda1791eb7855e6b4111ecd61601da4da22c6b77305d9affdd8f9e478c140ed4 WHIRLPOOL 411fdb291b0b113393bad9ca098308fac8887aff6f42c08d4c0c30619307bdf9e29ee9af1a314662733b71e753bded3659f5504b4ba9a1474276f11af8c5e0cb
diff --git a/dev-python/fonttools/fonttools-3.0.ebuild b/dev-python/fonttools/fonttools-3.0.ebuild
new file mode 100644
index 000000000000..453400fdf8d9
--- /dev/null
+++ b/dev-python/fonttools/fonttools-3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/behdad/fonttools/"
+SRC_URI="https://github.com/behdad/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND=">=dev-python/numpy-1.0.2[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	DOCS=( README.md Doc/{changes.txt,install.txt} )
+	HTML_DOCS=( Doc/documentation.html )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/fonttools/fonttools-3.10.0.ebuild b/dev-python/fonttools/fonttools-3.10.0.ebuild
new file mode 100644
index 000000000000..80c7274af69e
--- /dev/null
+++ b/dev-python/fonttools/fonttools-3.10.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/behdad/fonttools/"
+SRC_URI="https://github.com/behdad/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/fonttools/fonttools-3.15.1.ebuild b/dev-python/fonttools/fonttools-3.15.1.ebuild
new file mode 100644
index 000000000000..80c7274af69e
--- /dev/null
+++ b/dev-python/fonttools/fonttools-3.15.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/behdad/fonttools/"
+SRC_URI="https://github.com/behdad/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/fonttools/metadata.xml b/dev-python/fonttools/metadata.xml
new file mode 100644
index 000000000000..37f0a7eae125
--- /dev/null
+++ b/dev-python/fonttools/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">fonttools</remote-id>
+		<remote-id type="github">behdad/fonttools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/foolscap/Manifest b/dev-python/foolscap/Manifest
new file mode 100644
index 000000000000..80f254f2822d
--- /dev/null
+++ b/dev-python/foolscap/Manifest
@@ -0,0 +1,7 @@
+DIST foolscap-0.11.0.tar.gz 491916 SHA256 b6874de97eb08654362cce80317e68d203bcccf85e4eed613ef10a3cf4b1aa87 SHA512 577cd15e7f9207a9675999590cb1189edbdd77a2daee5cab80d66d40b1343bcb338a064eedf372ca7f8a102ed1cef0770923d6dea27dd6c3b37c0717cdc912e8 WHIRLPOOL 5ecc908bc46e1ab7ce8709351488111d187b71d85f6c59a5063eacb81b010e1925dd25f48341a775c6c1daa1a649613eb28822b588a8594187458ba76b2e1c6d
+DIST foolscap-0.7.0.tar.gz 478999 SHA256 fba0e016079442c9e69e2752727a1307f4110a1c62319a059650b2ab044b29d8 SHA512 b2eb5415376d4e8e4ee3fd9ecef80a02d195d6b44059e5292c2daa7dcfdea9deafd8678ff89391128244a8d41fb6a69a92f9e4f07cc599f7358783dc8cb70f15 WHIRLPOOL 58bc4b34d36e1edfa3bbcadb6a16704820af8b6448bf09d6d5e95c23edf60f41481d6792fcae808c0bd8bb3f71b18ed794c0be00e77cc67f160cb3b026567384
+EBUILD foolscap-0.11.0.ebuild 1271 SHA256 2d706696f78fefa799d95778643acfe8c2bffc300af68f32291cc027bcab7599 SHA512 4a1d9ebfce4c7679f1939c28742b95d6f63a0725abec04f3d2f9301f8aa9367b1cf8fa88eb8ddd6c6382d0a21c3fd39be4fa19b971c1afdf8bc5652e077817c2 WHIRLPOOL 138b65377230b53af506b6e259a0f7459d551a2e1d171bdf2e39ebacca42a0037c982cb3fb65c3e22adfd1c27acf57be866e980f1d27d5f86539c9e4821cd175
+EBUILD foolscap-0.7.0.ebuild 913 SHA256 9919c910a93952c9d75fd41b2fc7b5151761033b479cca0d293ecd31f8ce571d SHA512 6c5a16876e4225704c9a43a20c06fd925a203e09a4268c47b493337561623c6f0b976d6d3e4a12f9360ea7569ba0b20537f5062bc1942c66411801438e799d9d WHIRLPOOL 9e2a2f5f994e517dec5f64e4d64a541694ef8f50ab65e97958f208038bc8ab4d8546d832ca38f88cd4e3093218e6e56f59e008ee2aad0e9335c909b40f69f173
+MISC ChangeLog 3489 SHA256 04c737f16cbab97e95266879896e9d2474041db7a012341afe6aa7cb83cf1d4e SHA512 9083f5fc8bd50a7f05308c6dcf1bda780f7a281c5f060654ac2252a66be1babc77662e7f14c01d39dc26610bc63bd6d4b4ccad40c9f4b98976224285d45596a2 WHIRLPOOL 51f486bf01c58fa0a3092d07754af1581e2a13884ac16e7645b2bf0d1704cd19bcd703ae790e064f0198c4a82d8969c95a7c667b2f3e66137e135fa90ab808b2
+MISC ChangeLog-2015 7314 SHA256 fa7016b28f20a7679326654ae46fa2706fbd6b185eba412479941ad18a66f14e SHA512 16333c8a769fba99dcf5416d58f84381db293fd1f9804b32f9a7e75318a6b3ca47592aacba1ff79ff32deba43530bd9bc8ddbc87d981f1d24aecb3c8eaf0aff7 WHIRLPOOL a62803a8b44960860e1d318680e84236ef7f9a4045a36ce63bb54c18fcf92c77d9dfeb9effb41b6a62af43de6a767e064b74424800a0a3b5480bf71ffe5f8d64
+MISC metadata.xml 1272 SHA256 970d5a4dcf3b23607214a891220d28ffedbfb2bdf11e709759c58b1520f6e228 SHA512 5509a54a69ca4d5c6898cdf125fc62d974b494dcce9117e9c66fc2e4e17b7f0d07e423739c9ea8b81cd2b3f16012400df9f764a5e2a4ab939edb2f8a3428ced0 WHIRLPOOL d7cc69d7f773537e56dea398efb3dbecae2e2fde4a888a2492b510fe648fb9f254f2973aac2bb4c1ae93acfcdcb94f506f6110c0c7e5b4584364b7b2155c4a3c
diff --git a/dev-python/foolscap/foolscap-0.11.0.ebuild b/dev-python/foolscap/foolscap-0.11.0.ebuild
new file mode 100644
index 000000000000..5a4b05b9ddde
--- /dev/null
+++ b/dev-python/foolscap/foolscap-0.11.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="RPC protocol for Twisted"
+HOMEPAGE="http://foolscap.lothar.com/trac https://pypi.python.org/pypi/foolscap"
+SRC_URI="http://${PN}.lothar.com/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc +ssl test"
+
+# setup.py stipulates >=twisted-core-2.5.0 but failures occur in testsuite under -15.x
+RDEPEND="
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/twisted-web[${PYTHON_USEDEP}]
+	dev-python/service_identity[${PYTHON_USEDEP}]
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+	"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	trial ${PN} || die "Tests fail for ${EPYTHON}"
+}
+
+python_compile_all() {
+	local i;
+	if use doc; then
+		pushd doc > /dev/null
+		mkdir build || die
+		for i in ./*.rst
+		do
+			rst2html.py $i > ./build/${i/rst/html} || die
+		done
+		popd > /dev/null
+	fi
+}
+
+python_test() {
+	trial ${PN} || die "Tests fail for ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/foolscap/foolscap-0.7.0.ebuild b/dev-python/foolscap/foolscap-0.7.0.ebuild
new file mode 100644
index 000000000000..24f6c34c2be0
--- /dev/null
+++ b/dev-python/foolscap/foolscap-0.7.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="RPC protocol for Twisted"
+HOMEPAGE="http://foolscap.lothar.com/trac https://pypi.python.org/pypi/foolscap"
+SRC_URI="http://${PN}.lothar.com/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc +ssl test"
+
+RDEPEND=">=dev-python/twisted-core-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-web-2.5.0[${PYTHON_USEDEP}]
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	trial ${PN} || die "Tests fail for ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		dodoc doc/*.txt
+		dohtml -A py,tpl,xhtml -r doc/*
+	fi
+}
diff --git a/dev-python/foolscap/metadata.xml b/dev-python/foolscap/metadata.xml
new file mode 100644
index 000000000000..05b50f1ab47b
--- /dev/null
+++ b/dev-python/foolscap/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+This is a ground-up rewrite of Perspective Broker, which itself is Twisted's
+native RPC/RMI protocol (Remote Procedure Call / Remote Method Invocation).
+If you have control of both ends of the wire, and are thus not constrained to
+use some other protocol like HTTP/XMLRPC/CORBA/etc, you might consider using
+Foolscap.
+
+Fundamentally, Foolscap allows you to make a python object in one process
+available to code in other processes, which means you can invoke its methods
+remotely. This includes a data serialization layer to convey the object
+graphs for the arguments and the eventual response, and an object reference
+system to keep track of which objects you are connecting to. It uses a
+capability-based security model, such that once you create a non-public
+object, it is only accessible to clients to whom you've given the
+(unguessable) FURL. You can of course publish world-visible objects that
+have well-known FURLs.
+</longdescription>
+	<upstream>
+		<remote-id type="pypi">foolscap</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/formencode/Manifest b/dev-python/formencode/Manifest
new file mode 100644
index 000000000000..06a7aeb2a732
--- /dev/null
+++ b/dev-python/formencode/Manifest
@@ -0,0 +1,5 @@
+DIST FormEncode-1.3.0.zip 347674 SHA256 e6757280244a0d04e9cef51beeeafb4124087c27b7944c7d41341d0a30f7af78 SHA512 12c7c9fa36173c209682a6e1d68a074c64c9a5bd30e4f6b6b851b55d43c350ce1f79f666a9176add65f6bde554bc5deeb82ac965005f9457c4c2b0447af0cea9 WHIRLPOOL b2fa93f0f2eb2c417da43f22f41cb27edf18346560468927fc320aa93c1f6614ec7b76860427f843e3b50017a907c110a05269d281c76f99415b76480d395645
+EBUILD formencode-1.3.0-r2.ebuild 1294 SHA256 8231adcb983c7dbbb955430b4f10ccae6e48d027f434c5566cc6045cf94281b1 SHA512 eace0e33a9a3494955bb9d1124941d1fc759640c6bcc447f7b173b53c425f1c560bf5b67d4a128c61b666c037d367d82b084976be319e3d9103b008c2157b3f6 WHIRLPOOL 22d9c2d0811d22a3d7eeadd64f7931150a95c03d1f41ba5487e6364dc77b5f33bd9c920413e02aba5aebef9ed3862c2ce467f059643f7564edcdd25337faa2e7
+MISC ChangeLog 3625 SHA256 e4be0a512cd381b7e993f3b85b259e5522daaf96da9e2e2235a4195ede393097 SHA512 e66789490b15c42ba5909020f5babdf42539febf202f683eaed66b508f96aa13f1e881f9d3ccc1f42f7ce63630c04fde9186a9595661ac450994bf1bb9c6490b WHIRLPOOL 94e7f9341c5113ded0869a8df9345725db81f24f950f809fe0d790ea789097ce0c4903188b820e006e0dc16370ee8710432281684b3eb0462fe9367bbad72cc7
+MISC ChangeLog-2015 6119 SHA256 8ed58c1864c6bffe86206d90f993a6ee7a4e0b40b4f9ac3e35d8772f364d763d SHA512 ea04a313c5e61df3680103ef243e3c3e253927fd584380be2dfdb6dee9939655c6998e34a8e134e519bf7efb5d00cd2f86ad3c27cb6b862a7b05390c740b06cf WHIRLPOOL f6a0d5e4370eafc7ec5a0cab27b48645c5683e1f7e375c79bf8e79dffbee112f8960a81b451d97c32addb21089043db707a863d0f3a6f8bb1921abaae9c6a2f2
+MISC metadata.xml 313 SHA256 a1596abcc69c26d6dba5b2c2a51be33f41ee55757eb3a5ce1e934128f62447d7 SHA512 75c69f2f2ed7d4415bd057215675f4f4ed90b7c6ac1c402e61c6c2404600a5676298d3f0eeb58d287113ea34304e34ffe3731646d96264f776a37b0812d4db9b WHIRLPOOL 936e66937d86d33cff317703ca091be538632b661e4c0374e4776783539445a945caf04c4b1181190e5ed6d5b9d9cae2c992c0dae7ea0d53cd97c486beca1712
diff --git a/dev-python/formencode/formencode-1.3.0-r2.ebuild b/dev-python/formencode/formencode-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..b1ad55734adf
--- /dev/null
+++ b/dev-python/formencode/formencode-1.3.0-r2.ebuild
@@ -0,0 +1,45 @@
+# 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
+
+MY_PN="FormEncode"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="HTML form validation, generation, and conversion package"
+HOMEPAGE="http://formencode.org/ https://pypi.python.org/pypi/FormEncode"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pycountry[${PYTHON_USEDEP}]
+		virtual/python-dnspython[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+RESTRICT="test"
+DOCS=( docs/. )
+
+S="${WORKDIR}/${MY_P}"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed -e '/package_data.*..docs/d' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# https://github.com/formencode/formencode/issues/78
+	# 5 failures under py2.7. Although the package claims to cater to py3, the suite fails horribly
+	# Main problem is that it is written requiring to be system installed, then run.
+	# Suite found to pass on extended testing using tox.
+	nosetests || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/formencode/metadata.xml b/dev-python/formencode/metadata.xml
new file mode 100644
index 000000000000..3dc3b29a8a4f
--- /dev/null
+++ b/dev-python/formencode/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">FormEncode</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/fpconst/Manifest b/dev-python/fpconst/Manifest
new file mode 100644
index 000000000000..64a9e66dddc2
--- /dev/null
+++ b/dev-python/fpconst/Manifest
@@ -0,0 +1,5 @@
+DIST fpconst-0.7.3.tar.gz 9697 SHA256 1a5c2e4a1ecefd9981988cea15068699eccbc55e350af3471e782083d390c727 SHA512 c6394ca2bd5d431bd7902a35bb31b976d1ef7461b4b576c77859f4132288a288ccdcf38805cc9f49228a989b94d74846cae3e99b382a5546866f327b436c5cdf WHIRLPOOL f6bd4f327fa2045ec8d1dc31d20faad81600ec0d1d6b347142cb1ef3192d968fe10abfb24587fb1888113b0eb26509c7882e80c7b20892b2e9cfe5d610e54844
+EBUILD fpconst-0.7.3-r1.ebuild 794 SHA256 ac4ca7cc80915dd3669f854254ef07ffd7a0ade2ff1e49669688a32b6f9b39ab SHA512 55ef479c60c68fa56619b3d9691993e21242215c0942e1a1dc7680a27a38b3146030e591cdf92bdb34b86fdee22ec5ff687b9198e78cd50ce278d91db5fbbacd WHIRLPOOL 2edaf0a547339d7d32a777e8d25adffab710fdc94c183c23b9d868d46d960d754dfcdcbba67ca71a846cdd6954bd974af7579ab67e33ca86db04f9019163413d
+MISC ChangeLog 2696 SHA256 be616e09eec3f649066bca8fa02269974525500c4e04c8c62d5be633a2ff0610 SHA512 fed04a7065dfacb50cdd4fca4b411eeec562777bfd15e2600acc4b4112bdebcb6a64c439c5faecfcfce3d94124e03f78fd7faf9673ba2cfcb7805acdbd02d48a WHIRLPOOL 6d255c18e0c7e0e32c50c85da0f85f99c5763138402bdcdb75719f0e1400d58d6cd4aa5728f21e8ddc7b64b00523c43cf1eff417da21a28fab6f19d61558e965
+MISC ChangeLog-2015 5768 SHA256 1f80e57cd436f5717a0ca9b2e0c42a706f3b874d86cd883829ae3f8c5ca5354a SHA512 299267340bdf0930c8283597dc16fe06a741b06f2a55962e5ad2769fe48a1dcb50e87dc808a7901a2f893348b4c5b97061affe233e5abf2ff3b4f628c1b99d25 WHIRLPOOL 9c6006fb1730842e6d7ea595a483418ec1c157b06aac3eb88a6879ea385c5b592b0c80ee86968b3e6150b78391d14e5740f4c21315670507800167ac20a5fdbc
+MISC metadata.xml 315 SHA256 f765f0a1c2230cdbf272569dced9141191f08a65318a50b8abbb8089f9325051 SHA512 03c0ea04bc047530329ef73ae2c0d1c687bae54031e0ab4fc383b13d00f97bc144ae8ba8f66e97a0b8f9b2aa804c4b38bb09023b7e9fec6838ff867de0e119a6 WHIRLPOOL 9caf33adcb81375b401ce19f008c99bd98994a90b804d162155d09d38ab129909c96e778639288416ed6170fd9e82a2406102562a7dbe7a9f248ddfc28268d42
diff --git a/dev-python/fpconst/fpconst-0.7.3-r1.ebuild b/dev-python/fpconst/fpconst-0.7.3-r1.ebuild
new file mode 100644
index 000000000000..691afa20191e
--- /dev/null
+++ b/dev-python/fpconst/fpconst-0.7.3-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Module for handling IEEE 754 floating point special values"
+HOMEPAGE="http://chaco.bst.rochester.edu:8080/statcomp/projects/RStatServer/fpconst/ https://pypi.python.org/pypi/fpconst https://sourceforge.net/projects/rsoap/files/"
+SRC_URI="mirror://sourceforge/rsoap/${P}.tar.gz"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+DOCS=( CHANGELOG README pep-0754.txt )
+
+python_test() {
+	"${PYTHON}" -m fpconst || die "Self-tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/fpconst/metadata.xml b/dev-python/fpconst/metadata.xml
new file mode 100644
index 000000000000..d59f19460f55
--- /dev/null
+++ b/dev-python/fpconst/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">rsoap</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest
new file mode 100644
index 000000000000..30e5dce53c09
--- /dev/null
+++ b/dev-python/freezegun/Manifest
@@ -0,0 +1,7 @@
+DIST freezegun-0.3.8.tar.gz 17447 SHA256 a184d75f850e408e38daae15132a0c13fba8336ca78b92378432ec154743c3e9 SHA512 1c60e4e864bf61f4b93fa91cda2ce43726575be3da7ee37d8e504370240a0d50369e750b61fdcb6e088fd7d36857e8c566d33bb837e00291a2202dae177c03aa WHIRLPOOL 97be49b4b9cd8dcd3fbff3528f3fd6612e900df1c5dfe93987077826d4c4551426a62ea465e7d62c4bf81cbfad2df6e303896f5a2fbd77b926566c0aa2d7ccde
+DIST freezegun-0.3.9.tar.gz 18118 SHA256 783ccccd7f60968bfe49ad9e114c18ea2b63831faaaf61c1f1f71ddfde1c0eee SHA512 1aba8ffacc8b9ebdf810253181418bacb75c04222dc59a5e1e526a9f2d97573944926b1b9fcb6c6e6971a7958acaf9b7522c5582190ae6be448c043b6f908c17 WHIRLPOOL 4074f72b30aa68d649506f862fabb8d8137ac72ade7910111ab1aaa1a5e9103c3850f51b6e2474a4998e6afea967067518c1d1ef3fc99a75916fd69f6f3742ec
+EBUILD freezegun-0.3.8.ebuild 638 SHA256 8d266cd1eefae9be073f855107cf28001a7f6f12d48b79a1fe304a4b041c08c5 SHA512 ab4a3d6c90d14ea24ab5a380b4db029c536dcd6aa345a31406c1848b5bff2ef93b35de5e1f08675432f537f618daa8561bbd27f00f014658d0653e71950af2c9 WHIRLPOOL 508a0b25a86401a03f2c697b40c9bd3739d761e960168ea946bd258901a4bc54a54f90bb7b89490b4371880db3ed7753ac7c32e8e760867861e62a9fbafde518
+EBUILD freezegun-0.3.9.ebuild 655 SHA256 09f8841c693bc3345db911210fdab128b62ac49379db9e6b0977c66364c4edee SHA512 4f41246dbf768e9c8dfd8b3c79f4761e231f76d0c5af8c142cd9b2cc76bf23ff6ff9783d68a5cf8e66daf6c0738779871c37cb4e9edc0e6ce0028f102a8d4bd6 WHIRLPOOL 4141be64727560330b044d1b440697711b6bdf62b1e3074f71f61d06c3e0b8074d40162ffe3e0b4a3a1397f8bbd409ead4e5f1144d191a728c624548e1e88863
+MISC ChangeLog 3300 SHA256 ff2f941d3102e205ca050593d67c90cd44407515375d279e00bdd1502002d31a SHA512 30d25d91a4be37cb33adb0426eed795ae066bb98a8682561b80e66c36f6c5ffd0b2432f25e79451dac0552d18126c03628e47d3bcf5ecf7af74cebb1d2424faf WHIRLPOOL a42697b5f27c0537fb161973f29f9e2f25a6312b9bd7e325b7ab7b58e0ac05002c20d9ba6ae03b2aad7ad967aac685ba9240d4c16567a57e0b5d42b243ee9d72
+MISC ChangeLog-2015 606 SHA256 9aec6d8ba6b51a012ead1814a2374b02358cb4ceaf7b2de8b589ff723041f79d SHA512 81f07784785023ff0f52e50aece156ed1744dab91f72b586603b7d70463688c9f3d81e01fa27e09fa51741e5775f55421696ea114ad3701ef12680af528ecb98 WHIRLPOOL aea0814dfce8df284e5c110837ec6d949a944dd02b4334ad7ae90f79822a8421a255ee2d70b720b4f32e57bbe721e126554137a8b2529788321623b6627d3068
+MISC metadata.xml 368 SHA256 f2ecca288c7500c697329a8d2c2fef8c78b50071d3a4c2e6637d506f49b8b9ae SHA512 5d268015dd8be027059e5d405c47c0bf48ca8ead3103031e29748e63a9aa132321257b8f9963e557829a3602fe078933613e70b07b8291d32b7ce2da14b6bccd WHIRLPOOL 2b4135d6f7702d3c3f643db95814010edb512f339cdb33684f600eef5c3c2d741ebe4351c64fa060eeaa46609c6d351201c46cae05c74f78f24ab55e218f1d45
diff --git a/dev-python/freezegun/freezegun-0.3.8.ebuild b/dev-python/freezegun/freezegun-0.3.8.ebuild
new file mode 100644
index 000000000000..0209dcbf27f4
--- /dev/null
+++ b/dev-python/freezegun/freezegun-0.3.8.ebuild
@@ -0,0 +1,27 @@
+# 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
+
+DESCRIPTION="Let your Python tests travel through time"
+HOMEPAGE="https://github.com/spulec/freezegun"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/python-dateutil
+	dev-python/six"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/freezegun/freezegun-0.3.9.ebuild b/dev-python/freezegun/freezegun-0.3.9.ebuild
new file mode 100644
index 000000000000..a782d8873da1
--- /dev/null
+++ b/dev-python/freezegun/freezegun-0.3.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Let your Python tests travel through time"
+HOMEPAGE="https://github.com/spulec/freezegun"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND=">dev-python/python-dateutil-2.0
+	dev-python/six"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests -v || die
+}
diff --git a/dev-python/freezegun/metadata.xml b/dev-python/freezegun/metadata.xml
new file mode 100644
index 000000000000..4fe09364c008
--- /dev/null
+++ b/dev-python/freezegun/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">freezegun</remote-id>
+		<remote-id type="github">spulec/freezegun</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/frozen-flask/Manifest b/dev-python/frozen-flask/Manifest
new file mode 100644
index 000000000000..6b94acfa766f
--- /dev/null
+++ b/dev-python/frozen-flask/Manifest
@@ -0,0 +1,9 @@
+DIST Frozen-Flask-0.11.tar.gz 106927 SHA256 c348e0165b161efa44770157eba3e006cc6a1e9867bfd74670cbc56529cc5512 SHA512 a734c6e090f08b01756b677a577c013e0198272a9e469410be81e5214eceb34d98e163410e8e04850036c58c5e7c9e718145e69cd26dd9e30c821f6949aede76 WHIRLPOOL 60a54174665e96b4f3921b72bb1f5f313f53c983d84e3dc6fd917f7273ace98a364638d925776eb5cfa6b709d8ee7c935cd3b9bbbb8926550513e3a54e517d59
+DIST Frozen-Flask-0.13.tar.gz 174984 SHA256 ed5f92fd7581ea2b26381a08ed0001ca24986bc953bc29a01a7df1fd35782662 SHA512 2ffaa0b9f989058859f742699ce47865ab1dd7602d5e79db4ed6d9f8f79b39249deb48881377cb421c7583ffa77126b9a7d70770595895d91790dabbb23888e0 WHIRLPOOL 2b375e5dd51d3f27746b8dc329ef1bc70f18de228e01c95346c23c46c4e0c2295d68cfdc2d66b16a92e870c2be0957a765186ebe637247c258095ace5738ff42
+DIST Frozen-Flask-0.15.tar.gz 477516 SHA256 83858d6ed8b9d3fa7fc9523e415e65fb86b99352798d7695f63cffbd59a56269 SHA512 8cb80ccb5018abdaaf53a43c219504d57f2630af3d8d5c7bd6bee44c7cf483f50530bc00ff49fd674d54c0e1f6a5e0caa004bff04e95dec7f58a8bb443a36241 WHIRLPOOL 1fd9e6fc9ff2b9a97938c5554a2f1705ff334e34b446c53876513c483970bec2581d0f3defa73da18d1feaeeeba7454abd77a3d7d48e6ecb0126bfe4f56afa5a
+EBUILD frozen-flask-0.11-r1.ebuild 1056 SHA256 056accbf1c4c5513e58dcfb431bcad2f44d10e413912c14626f9608f190da931 SHA512 ce6014230eeaf93a3b60ceac26aa407543609ac9361f64ec8881df8345db1dd3f783e16c042c0f1cadd5c3ac071c59cbe37a5e1c4a2fb4f4e8ce4fcb4c6f5018 WHIRLPOOL 0646047965e7a2bb8134eaed2e8fc984966e922076427709ed36e51efa8b98e90891ddaf774840b7ce4c2e5182e931ea022ab47bc6bb4de082d76e9380db8b2f
+EBUILD frozen-flask-0.13.ebuild 1058 SHA256 a9b89dfa4e42b6c0397b5a3b2efdcd2b501a9851cc0d7663a3aedb18fa1b2dff SHA512 3163a36c9eab3680671fe4aeab26cc22f8eea9eaab9cd95621a3c7d77e5cfc68b040fdce67147700d8a377edf2d7d529f33303926955d2847c10f48166d84a6f WHIRLPOOL 8f7e07d02f53eb17ce80d70bdcafabf204162403da474125e489af295931abe26af8dc3b81e3301ee0dec72b6553b081e4d3fd96128ab2466debe37f3be4a771
+EBUILD frozen-flask-0.15.ebuild 1058 SHA256 97f684ea2ada32be85ef58ac64e3369e5ddac3ba3d5599621c55aaac6b8a439a SHA512 dc06a714628176624c1549346c810cfbbf490eabd1a1355518af7d706d02e6b0056acc6b7be1c937b18f7eefeab109a8b46e97a40465650698ba64ff11298f7c WHIRLPOOL c491950032cb0fea1e49fac98f3584fe2769a64f8876729f552bc49a61a16d41cc521fde3b5a23529e54c710b42bb5e6dadc38ec8bff5a9e347e3ea4c100cc1e
+MISC ChangeLog 2905 SHA256 379ec0a6ffb5e170778bacef0d4645d7b5cbdc31e0a29c308394e549b433fb50 SHA512 c19ee85e831d04d245ada55ab3f6f008cf522ca434e993cc6b087e7407e70dca4ca351f41bc5ce2824f702c32b141d6b475cc23db2bee62aacf559e2b4c157e9 WHIRLPOOL 2ad5ef162ad865c6cd974c78fa38c7d5cb8345660552ebfb7f845ebe4e4a856c9efef01a6426a73f60943a558300d8533c17c4bbf5f6a13be639a2e11e68b6ad
+MISC ChangeLog-2015 2404 SHA256 7688cb06643ee5c10da717bc145e53d822473beb52f74e9258cbadb13538fdc8 SHA512 107f1419aba166dd8181329c835c9044bd373ef25b1f2468defd890d36e7c76b735283751a1a72d5975b1361d5b09fa3a6f544535fc4d0353e2593fc7873d81a WHIRLPOOL 7bcac8ab58ce05aaa96f4d6f0c4cb24ef76b08491aa190b89b8fad6ebe50358be31043a68b0319b3d13381486e03e56b2a8b33bade76a1ba7a56458d49f3eb72
+MISC metadata.xml 390 SHA256 6714f0567de234a6f3234640692f985d21b9ccc548189fa68ea78d64d080f477 SHA512 d8c13cff6277121723990211a23849cedef64a6571ec745233d65ee8fd11f9e3499436a9ca7fd2f98ff47f65de0147a7df870ff23455fcdbc684ae7c6bda0857 WHIRLPOOL 7cbe0092ab2cec33e7093b1ba9fb7e6aaa3145f7fba9636ecd0b836e847b2518324301489f2f83884ff8f142ae16e1c95a11c7a440afa5dc5e2676374a41766b
diff --git a/dev-python/frozen-flask/frozen-flask-0.11-r1.ebuild b/dev-python/frozen-flask/frozen-flask-0.11-r1.ebuild
new file mode 100644
index 000000000000..3cf6179ffbec
--- /dev/null
+++ b/dev-python/frozen-flask/frozen-flask-0.11-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Frozen-Flask"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Freezes a Flask application into a set of static files"
+HOMEPAGE="https://github.com/SimonSapin/Frozen-Flask https://pypi.python.org/pypi/Frozen-Flask"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/flask-0.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	if use doc; then
+		sed -e 's:^intersphinx_mapping:#intersphinx_mapping:' -i docs/conf.py || die
+		mkdir docs/_build || die
+		sphinx-build -c docs docs docs/_build  || die
+	fi
+}
+
+python_test() {
+	nosetests || die Tests failed under $"{EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( "${S}"/docs/_build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/frozen-flask/frozen-flask-0.13.ebuild b/dev-python/frozen-flask/frozen-flask-0.13.ebuild
new file mode 100644
index 000000000000..613e2671924d
--- /dev/null
+++ b/dev-python/frozen-flask/frozen-flask-0.13.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Frozen-Flask"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Freezes a Flask application into a set of static files"
+HOMEPAGE="https://github.com/SimonSapin/Frozen-Flask https://pypi.python.org/pypi/Frozen-Flask"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/flask-0.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	if use doc; then
+		sed -e 's:^intersphinx_mapping:#intersphinx_mapping:' -i docs/conf.py || die
+		mkdir docs/_build || die
+		sphinx-build -c docs docs docs/_build  || die
+	fi
+}
+
+python_test() {
+	nosetests || die Tests failed under $"{EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( "${S}"/docs/_build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/frozen-flask/frozen-flask-0.15.ebuild b/dev-python/frozen-flask/frozen-flask-0.15.ebuild
new file mode 100644
index 000000000000..f8c26e719d97
--- /dev/null
+++ b/dev-python/frozen-flask/frozen-flask-0.15.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Frozen-Flask"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Freezes a Flask application into a set of static files"
+HOMEPAGE="https://github.com/SimonSapin/Frozen-Flask https://pypi.python.org/pypi/Frozen-Flask"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/flask-0.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	if use doc; then
+		sed -e 's:^intersphinx_mapping:#intersphinx_mapping:' -i docs/conf.py || die
+		mkdir docs/_build || die
+		sphinx-build -c docs docs docs/_build  || die
+	fi
+}
+
+python_test() {
+	nosetests || die Tests failed under $"{EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( "${S}"/docs/_build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/frozen-flask/metadata.xml b/dev-python/frozen-flask/metadata.xml
new file mode 100644
index 000000000000..d142ed38f2cd
--- /dev/null
+++ b/dev-python/frozen-flask/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Frozen-Flask</remote-id>
+    <remote-id type="github">SimonSapin/Frozen-Flask</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
new file mode 100644
index 000000000000..9ccd54857d1f
--- /dev/null
+++ b/dev-python/fs/Manifest
@@ -0,0 +1,4 @@
+DIST fs-0.5.4.tar.gz 231333 SHA256 ba2cca8773435a7c86059d57cb4b8ea30fda40f8610941f7822d1ce3ffd36197 SHA512 d67c85f2816cf1a84c25664a6cf71dac551c3eec4eb34154bc92d52eb0efa9739adca6d0ec86b9978ff6af408cfa17b913ee8fd4c143cd2adf862ca0a1dd4c5d WHIRLPOOL 13ca379c6b563ec29985ff6dafa68f601c43459e75d7de99afaac55c21c7c5c581784f3f8dcb2b14b97adf00034e4890a8674f8a5263718c11b4c39051b1b902
+EBUILD fs-0.5.4.ebuild 985 SHA256 ad9b3e28b4371628a2b9fafd9beef04881b666b4361b857ad04e9e7df1f892be SHA512 9f96edaa20cadc8f714be71aebd666c1eb14b99c3960a57e728bfb4dcc58ea988e91c5d681f4a90e4f0e64601e74ea6bdbbf3d5ed21bbbd863eb3823198bf6be WHIRLPOOL ff02f9cd376a39a74298e89caae376ec0d85edc3ae92fea9374e330a9a2f9becd811207b29704642c0bb7b4d316601380ca27ea62241dd652099b8e7595447f5
+MISC ChangeLog 647 SHA256 4ad1c42c4d24803106e1c4b2d689e893f6095aed19420632c533cd90b96ce61b SHA512 2a4745f9b629e85289bf6f3abb3e3b17ad09c9952a034e7f94c01d4f856f059c218ec51b9a59c3f48ac7d6415ef13447deb78beada452499bae11e767a93cceb WHIRLPOOL 6f79a4b8b30d395a596e216a2fddb5326ecf9528e7eb98d96c71e41957b0ddd5c98d578d3141dfef458724dca41927c5807387da333e63d9fd3cf933aceef8f1
+MISC metadata.xml 486 SHA256 774cb537ab8fb9d7645d97b45bd1a4799ff251522ba8cedf8a328bc824bd9410 SHA512 48e48fb5f3c868fb8e1b9dce7c483c13291659c99e0f19e096204451e1ada83fb0d2334d89a3beb45de11b7e710a3deb9e5777e5c8f905312efe899cbee02d07 WHIRLPOOL fe0aff3fa1df4064930629c81aea4ba7ae16f8a71cbd98fbc95702a9d391f7e8a1f32f4fb1f16180ec5a5364f17caf4509ee092712e1e0483affbb3af42981f5
diff --git a/dev-python/fs/fs-0.5.4.ebuild b/dev-python/fs/fs-0.5.4.ebuild
new file mode 100644
index 000000000000..cbc9f7b57b63
--- /dev/null
+++ b/dev-python/fs/fs-0.5.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Filesystem abstraction layer"
+HOMEPAGE="
+	http://pypi.python.org/pypi/fs
+	http://docs.pyfilesystem.org
+	http://www.willmcgugan.com/tag/fs/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/dexml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+# Tries to access FUSE
+RESTRICT=test
+
+python_test() {
+	nosetests --verbose || die
+}
+
+pkg_postinst() {
+	optfeature "S3 support" dev-python/boto
+	optfeature "SFTP support" dev-python/paramiko
+	optfeature "Browser support" dev-python/wxpython
+}
diff --git a/dev-python/fs/metadata.xml b/dev-python/fs/metadata.xml
new file mode 100644
index 000000000000..a3293478ffe7
--- /dev/null
+++ b/dev-python/fs/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">fs</remote-id>
+    <doc>http://docs.pyfilesystem.org/</doc>
+    <maintainer status="unknown">
+      <email>will@willmcgugan.com</email>
+      <name>Will McGugan</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/fudge/Manifest b/dev-python/fudge/Manifest
new file mode 100644
index 000000000000..92d43d87bde6
--- /dev/null
+++ b/dev-python/fudge/Manifest
@@ -0,0 +1,7 @@
+DIST fudge-0.9.6.tar.gz 81653 SHA256 34690c4692e8717f4d6a2ab7d841070c93c8d0ea0d2615b47064e291f750b1a0 SHA512 69b2fa5bdd678779c0a8d9863a67e1e6724828720d2764f9f8958bc3598dcf39b22f9827efccb03014961d27d6e214c2125f639bab200b63c824c2306e3bb617 WHIRLPOOL 176df990c9adebe2d4f969603e48b2f1a797cf9935de3daeab98c078314a3fd88a19affdff5b784db5d570a3264f8cc849305b2e4761a7128c2cca7eed79062f
+DIST fudge-1.1.0.tar.gz 86418 SHA256 eba59a926fa1df1ab6dddd69a7a8af21865b16cad800cb4d1af75070b0f52afb SHA512 061d9303d28509d4e22eb2036d041359f872be85911dd85bb16e4d13bfc1cf27637f8206f215f4a37d63108ab2500d2af3f6a1a3e206fe461ead9163e0519417 WHIRLPOOL 3425a95652a778b784af99aed54ab90caf3b94fa171c9991e35b5a561ce44e14c2d337c88a3bcd2ea52499dce7d642b70b0be27a45c13fb3d0025abfbbd6d8df
+EBUILD fudge-0.9.6-r1.ebuild 914 SHA256 788f57ac234804cc9ea47cc28fb937d096528797f8b51cb83f08b57a6273076d SHA512 4008ac1d3b1fb7e16da411b1306496cd9976fe6e9f35376c1b0d2954a0753f4740311a6718421ef63d14dd1dc8e50214898673e4559382c2192acfca4c862fb6 WHIRLPOOL 5c9bbfe52246bb82b2b20a38cf95bd675fcba7a0e9d1c9f6cbbdead44ddbf8630d59211d1fddf8a6caaf928560074de38f797ea27be5d47ee9b3123ad102dc1b
+EBUILD fudge-1.1.0.ebuild 870 SHA256 1b98f6d64430c0251db0128d47b23f3d225a2ccfd025f07d3ee0ee1471442a90 SHA512 2f52d79fe9ccc3d463a8a311307aba6f5167eb8b21598c47170b03c87ffa0c43fd0d7ad154479e719f7e15b0fd7ff58011f3c2dbe32532fda856507bb6854c7c WHIRLPOOL 959ba61de22f3e116e6f61abf5642f465d5067d785afd19c1905557d114de3bc78c88b01530f9d268b1266b848ee0a25400b183e7ebb432bb43907de74236daf
+MISC ChangeLog 3098 SHA256 baaef40f758cd182ed4d15223ba93f8897fbbedaca20063d6451fc2740e08898 SHA512 99ef62021e47bf39ff0d455d6b19f3be54fb4134466f0b185574058705f18bfce888f003912834da9c71058dd3f0cde0a527559db5c8e403080b6e2e6d5fcd20 WHIRLPOOL 81351c207e6d8c61dec3ccae1da2c5631cb431b4f1279a8702a5bcdf3e666a1a0b1f334807085d7d7616c39a0ad39baae4c97706797b295c63aa6fe950be51fd
+MISC ChangeLog-2015 2909 SHA256 9c3e186b1cd3d5b51f0032c2080cbe9b54f71ef2bd6a56adf37610ad41c90893 SHA512 8ec42afbbfd1e4d5baea165e95881c009757f30517832edf3c16a9efd286958cd314fe0c5796eccfbd440ee999064503ab8f81895cf90a1fbdd04412c448ae99 WHIRLPOOL 4fc8eac8dae906dfbcae3cfaf2bd88df144e00dc157d97664836a421ec44511c6cf2d202ff34a6982314d7bae41582920d0283e50ffbe1ec6d85254bd982238a
+MISC metadata.xml 308 SHA256 f9cc127d2d6d62ce14c1e9ae38545e272319ccd588a01fc183c0020a67785d55 SHA512 b453f365fc5bb8e91cf95982d92096d7f952f4d4cdef59ec1cc41e53a6e2e4861d815db845174952791a1ff67007c8c076151b2a12a1730d3ea03471cab02c56 WHIRLPOOL 1b189c044168c1beef5541b7593dafd03c7eccb257564feb33dbd4142455b0f7bb0749679d17100b00a2d2e7b96611c5cb1c43daf24c1aa55a9f21275a02fe73
diff --git a/dev-python/fudge/fudge-0.9.6-r1.ebuild b/dev-python/fudge/fudge-0.9.6-r1.ebuild
new file mode 100644
index 000000000000..efd57493fb5e
--- /dev/null
+++ b/dev-python/fudge/fudge-0.9.6-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Replace real objects with fakes (mocks, stubs, etc) while testing"
+HOMEPAGE="http://farmdev.com/projects/fudge/ https://pypi.python.org/pypi/fudge"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	find -name "._*" -delete || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -w "${BUILD_DIR}"/lib \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/fudge/fudge-1.1.0.ebuild b/dev-python/fudge/fudge-1.1.0.ebuild
new file mode 100644
index 000000000000..a6f52a9d6575
--- /dev/null
+++ b/dev-python/fudge/fudge-1.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Replace real objects with fakes (mocks, stubs, etc) while testing"
+HOMEPAGE="http://farmdev.com/projects/fudge/ https://pypi.python.org/pypi/fudge"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -w "${BUILD_DIR}"/lib \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/fudge/metadata.xml b/dev-python/fudge/metadata.xml
new file mode 100644
index 000000000000..f231f09e26e7
--- /dev/null
+++ b/dev-python/fudge/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">fudge</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
new file mode 100644
index 000000000000..d6eef494cc4d
--- /dev/null
+++ b/dev-python/funcparserlib/Manifest
@@ -0,0 +1,5 @@
+DIST funcparserlib-0.3.6.tar.gz 30401 SHA256 b7992eac1a3eb97b3d91faa342bfda0729e990bd8a43774c1592c091e563c91d SHA512 efa52f788aa902b099660cb8bc60a025085a8c383e52bd0824a0c3ae28a6c13804a0659de0c80b4dcd839ee70491805d4eecda6cea221e35c3750ec569098c24 WHIRLPOOL c4bbf1f332f7fd6319fae178e810ea3ef83e403ee9ee89cacf1ec652c36a9047b5ed8fd9a41350eeb826633ec9ac6564d81ce88021670a079f82f256949d25d8
+EBUILD funcparserlib-0.3.6.ebuild 748 SHA256 87e5778a6e3342858c4aea27fdb4944e33247218c2e6329014a41bf3fd8cfb96 SHA512 da0ae0dbbd56fd985ba8d7fae1918fff9a646d693b9626591dd83dc1548338083b92ae5df837d7f1cf8a64f42de7d58bf5c5220286534a95948329c8bd01a2d8 WHIRLPOOL 974b598899c2e2ec67c6810df3a2e0db8580b3750f5633b4b09ae8bd43590e012f7f81a655b5899ce8d9dd5bca1f883585af5fd617a9818a5c19e0d1c0eab2d4
+MISC ChangeLog 2581 SHA256 11e2240e41e1901b17e26811c2855f408f1f14d424d467f8f666f8bc2ab749d5 SHA512 425e8887711ccfc0d475cb5251c7028839a33aff4c115227832920fdb05cb5cd31c1e2151cf9426d218b1fe429cb1fbbb9c18492a82703f755f9334238080198 WHIRLPOOL 2ba9681d1c6e4b2564f500409a2e0a19f9cb385d2ff685a4179cc483adc2e76a7313b0768c9640e1c9f734c3f3a8e64fbdf9b621aabf56cce77157fb5564b5e9
+MISC ChangeLog-2015 1176 SHA256 0e8783dc401f6eaaff8a018d488758c5bd3ada52c8286eeaae239b19124eeb11 SHA512 375046f4e3738be1bcb41d87a0a6f549f1d0cfb0f364eaf3be7df7fa38aadcc2a5a447eab98fc25c9a7b11adf5e60d7835efec2971e95110f1e195683e38254d WHIRLPOOL bbd5035e0195128d18f780dad7bccd09ea7421fcff219b33d2710e49c7a36083261243bd2b30c1401dae476e308ca339f78ca1b0299861b0d82188399834a936
+MISC metadata.xml 316 SHA256 b6e9768e1dcff8d7561166a9ae6e3b244fcc67ac6ba98c1bd47805eb48c3e45b SHA512 9fe54328f405d097056ad5e3e0795ded4e3eacd72381dca3298a9af0e7c78f11eab97548b251c6bfaa9144dd0b00c00ac4292ad2ed5e84c31ab6c593a26b8caa WHIRLPOOL 0332377aedb9cc0c2098a7569f5a6c2736b5646d57f2005964ee959aff3628400ccecb2d87f44c2b2463514475018607713c6bcf6b46279f417c6066fbf8fc5a
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
new file mode 100644
index 000000000000..42b86b323040
--- /dev/null
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Recursive descent parsing library based on functional combinators"
+HOMEPAGE="https://code.google.com/p/funcparserlib/ https://pypi.python.org/pypi/funcparserlib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	local m=unittest
+	cd "${BUILD_DIR}"/lib || die
+	"${PYTHON}" -m ${m} discover || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( doc/*.md )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/funcparserlib/metadata.xml b/dev-python/funcparserlib/metadata.xml
new file mode 100644
index 000000000000..48fa62ab4ac6
--- /dev/null
+++ b/dev-python/funcparserlib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">funcparserlib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/funcsigs/Manifest b/dev-python/funcsigs/Manifest
new file mode 100644
index 000000000000..7d687d49a775
--- /dev/null
+++ b/dev-python/funcsigs/Manifest
@@ -0,0 +1,8 @@
+AUX funcsigs-1.0.2-fix-pypy3-tests.patch 3154 SHA256 86ea3f2cd723774f1ac920ac9c95443c7219e90f22af7a00deb3754cdf9bf812 SHA512 f4f93b2587fe2b0a41dda070d827f663785c367fcb3a181c0f461175ebeff47147907cc901954cb98cb7cce25754535663fbefe9227462fa2963d3ed572a852a WHIRLPOOL b64cd25663a49c409d819ed27e012e8b097de5cd0e42043800a14022f98de9be77a7a153922ae518836c23e2bac78e9c085603d9cba1572ef67f2841dbd635d8
+DIST funcsigs-0.4.tar.gz 25697 SHA256 d83ce6df0b0ea6618700fe1db353526391a8a3ada1b7aba52fed7a61da772033 SHA512 64d821e94049ae906b9e5c8a2590f80a7d1d819554258e20f4170207576e5c8f65d32759a3f65bcb05fe721fa502658ff5767cd435932ea926c792c62ebe96d5 WHIRLPOOL d34cbcc061a341155b24b67af89f3fe0d14b659965ef4c9c14748996d33f3fd31d41492f097166236ebea54ea3ddd0e147c52f21f1410b2141169668811b9f66
+DIST funcsigs-1.0.2.tar.gz 27947 SHA256 a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50 SHA512 4e583bb7081bb1d6c0fe5a6935ca03032d562b93ef5c11b51a72ce9e7ac12902451cc2233c7e6f70440629d88d8e6e9625965ee408100b80b0024f3a6204afda WHIRLPOOL af07f5828aa7d3b3f403041e2f041f47f73d38da676f2da4ca8b07674c075eafde8bd1917c643bcedf49416c715f30a3d2be17783c51ef1f478d73a13ee7bc55
+EBUILD funcsigs-0.4.ebuild 648 SHA256 3812212ef5409bf027437b9f25d64ae91fd6d7f32fc9b2307483516973d4d12d SHA512 153be4574e0d49ab639c6778049faf267ef0646910da3c2034a196896edcb67afc9d07142dae276db525c65b558dfd0a4ec49991f84bd6418fc3d5921553ac4e WHIRLPOOL 50862e57c397262a0a0da95af803f1a88908563f3003f85725822b35045a7f6f85defb96239c5743e541c7005f71efdc8772a7a9adfb510b3a64441854aea512
+EBUILD funcsigs-1.0.2-r1.ebuild 893 SHA256 04e68a6519b76f6c0c42025d1f033eafa2dc93e8ee38fcd01fc41dac8fe7c059 SHA512 1b3c0b0da48cb5b19613f282e6601b578d6621d240e9121c33046207ac6018ed7323a54196d8b37168309be9885a11f4f23413e427489a577c8a31c00aee24ef WHIRLPOOL 3253ca2af2b3a16139aa9e70bb1515ca7365ecb5b7bd84793589626cc917f3bfe5c55e86ad8627bb156828f96a0a9c62bf5321f9e77b2c06ebbca40e836ee201
+MISC ChangeLog 6405 SHA256 d71b4e1b52f4eb305455d6e1b68494cbbaf31c90695ce9c1d27b44149ef803b4 SHA512 2adefff1b9a180c060bfbd72221ed13608c4435790c6bdc79fc675dbcaa0960aba44aa4708118529a002c090b2183169d241a180743986f091f721f206fdd52b WHIRLPOOL 2146adebd2219a11e946798b673b9ac52d420d114d9f09f92c7dd919dbb425709e0458fcb5216b05f02389e763ec837f8aaf26e16abdee254b1ab7e7dd6e5369
+MISC ChangeLog-2015 988 SHA256 c922db721420e55c71b112a6a0ed14d114993e3e9ee6f25f001f95fe879fe79b SHA512 0f489f69e735a4d956ebd9fdd3bf9896abe52fd187c60d5eaf743356a392a01de86ceb0ac0d99c0b1d0d4b8b66a22780cae1e9a5c7669d71615b997ae0f4fcf2 WHIRLPOOL 50cc4378112a22bb858d7bcaed51815cadf8592974d5675ec7b3c35d4e041bcee69556e711c64b687f8be423f7323609905b9f9820eda845553c8a1475fc8055
+MISC metadata.xml 321 SHA256 6f84cbe2889f895e57d4b8400078540ffbb4848a5ba392e6112b9032c4ed79a0 SHA512 a3df23a85e33881f6ac0da0b0e33fd69de760c79e636574982606964134d303bfa219f429006a54ad71622c05c07b6eb233a1e8918f4703257b0e8c389acb6d8 WHIRLPOOL a9d776ea993a03140c3a75a86ffa8e9a98586b07b04c09f2f04ee6fb772ce86a2cb1f399a86669e14f489e311ff8ec4af17c679dc8c17382333e2b270579bf96
diff --git a/dev-python/funcsigs/files/funcsigs-1.0.2-fix-pypy3-tests.patch b/dev-python/funcsigs/files/funcsigs-1.0.2-fix-pypy3-tests.patch
new file mode 100644
index 000000000000..f4ecec3b6137
--- /dev/null
+++ b/dev-python/funcsigs/files/funcsigs-1.0.2-fix-pypy3-tests.patch
@@ -0,0 +1,94 @@
+diff --git a/tests/test_inspect.py b/tests/test_inspect.py
+index 98d6592..3a2a1f2 100644
+--- a/tests/test_inspect.py
++++ b/tests/test_inspect.py
+@@ -8,6 +8,7 @@ import unittest2 as unittest
+ 
+ import funcsigs as inspect
+ 
++import platform
+ 
+ class TestSignatureObject(unittest.TestCase):
+     @staticmethod
+@@ -409,7 +410,7 @@ def test_signature_on_decorated(self):
+                       Ellipsis))
+ """)
+ 
+-    if sys.version_info[0] > 2:
++    if sys.version_info[0] > 2 and platform.python_implementation() != "PyPy":
+         exec("""
+ def test_signature_on_class(self):
+     class C:
+@@ -493,41 +494,44 @@ def test_signature_on_class(self):
+                       Ellipsis))
+ """)
+ 
+-    def test_signature_on_callable_objects(self):
+-        class Foo(object):
+-            def __call__(self, a):
+-                pass
++    if platform.python_implementation() != "PyPy":
++        exec("""
++def test_signature_on_callable_objects(self):
++    class Foo(object):
++        def __call__(self, a):
++            pass
+ 
+-        self.assertEqual(self.signature(Foo()),
+-                         ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
+-                          Ellipsis))
++    self.assertEqual(self.signature(Foo()),
++                     ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
++                      Ellipsis))
+ 
+-        class Spam(object):
+-            pass
+-        with self.assertRaisesRegex(TypeError, "is not a callable object"):
+-            inspect.signature(Spam())
++    class Spam(object):
++        pass
++    with self.assertRaisesRegex(TypeError, "is not a callable object"):
++        inspect.signature(Spam())
+ 
+-        class Bar(Spam, Foo):
+-            pass
++    class Bar(Spam, Foo):
++        pass
+ 
+-        self.assertEqual(self.signature(Bar()),
+-                         ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
+-                          Ellipsis))
++    self.assertEqual(self.signature(Bar()),
++                     ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
++                      Ellipsis))
+ 
+-        class ToFail(object):
+-            __call__ = type
+-        with self.assertRaisesRegex(ValueError, "not supported by signature"):
+-            inspect.signature(ToFail())
++    class ToFail(object):
++        __call__ = type
++    with self.assertRaisesRegex(ValueError, "not supported by signature"):
++        inspect.signature(ToFail())
+ 
+-        if sys.version_info[0] < 3:
+-            return
++    if sys.version_info[0] < 3:
++        return
+ 
+-        class Wrapped(object):
+-            pass
+-        Wrapped.__wrapped__ = lambda a: None
+-        self.assertEqual(self.signature(Wrapped),
+-                         ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
+-                          Ellipsis))
++    class Wrapped(object):
++        pass
++    Wrapped.__wrapped__ = lambda a: None
++    self.assertEqual(self.signature(Wrapped),
++                     ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
++                      Ellipsis))
++""")
+ 
+     def test_signature_on_lambdas(self):
+         self.assertEqual(self.signature((lambda a=10: a)),
diff --git a/dev-python/funcsigs/funcsigs-0.4.ebuild b/dev-python/funcsigs/funcsigs-0.4.ebuild
new file mode 100644
index 000000000000..5116da873ead
--- /dev/null
+++ b/dev-python/funcsigs/funcsigs-0.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python function signatures from PEP362 for Python 2.7"
+HOMEPAGE="https://pypi.python.org/pypi/funcsigs"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..a6926ba1f685
--- /dev/null
+++ b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python function signatures backport from PEP362 for Python 2.7-3.5"
+HOMEPAGE="https://pypi.python.org/pypi/funcsigs"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+PATCHES=(
+	# This patch disables some tests for pypy as they do not work as expected.
+	# This has been reported upstream
+	# https://github.com/testing-cabal/funcsigs/issues/10
+	"${FILESDIR}/${P}-fix-pypy3-tests.patch"
+)
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/funcsigs/metadata.xml b/dev-python/funcsigs/metadata.xml
new file mode 100644
index 000000000000..bb74f00502a5
--- /dev/null
+++ b/dev-python/funcsigs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">funcsigs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/functest/Manifest b/dev-python/functest/Manifest
new file mode 100644
index 000000000000..f708eee8db20
--- /dev/null
+++ b/dev-python/functest/Manifest
@@ -0,0 +1,5 @@
+DIST functest-0.8.8.tar.gz 9972 SHA256 73e4a8a325e2f1e8028c25e2530ac86064434b4583ec87dc6780208ba80d6fdd SHA512 31b95b90222044d4f7605c652730ea463fbc22f0fc3369afd60a870cd12c5edf333de15490d324a7d68476a82bed87de0f6dd30fb710af2e5d4338d7acbfc27d WHIRLPOOL fbeb06f00e450f2f73e1397308e3859f3d05146e36ef616b02f7192c6ce51ae0d8a9f7bf1a5f2d84bac6ddc29f0e3c22d726c4cc64853cf0e768c952c6f73fcb
+EBUILD functest-0.8.8-r1.ebuild 779 SHA256 bd8d5db945e925b1dda486a9a59ed355ed19d5f7a86d5fbd6c91b3a80abb5a44 SHA512 d0c712ebb1236598373be5ff8823a3d55a16a6e09c62ddd58d014c5d857aaf793748520c4bf1263e507d132a1a462f2c52afe34d2448314337532edc406bbd03 WHIRLPOOL b3fdb9dc7b698a258b1ff7662bf169b1a4def5797a09f941decc135aa45a0e1849908799d29dc07053e0da49c1d652c0710f991b163358b1d2e114885bbe234a
+MISC ChangeLog 2744 SHA256 47d956f5bdb26730d36dd1d3ce82b6aaf29c529dab18494fa54fa5bbd96a1243 SHA512 3c60c1f0d2849711ccbac7eef238bfc62c0d5f353004c9e06596f22d5b0f38b999f8142a19a0466d2056ac5df6e1297b2010305ee0ca36a8dab633b9e28bcb10 WHIRLPOOL 307dd3f85bf96b4d77bdbc82e7e1d10dd11efb6965ce2740e48e569910a32994e044531f0af9efa595cf108d94019e62adcdeaef670227f41a0db103648184a9
+MISC ChangeLog-2015 1034 SHA256 8f4cd37d34192b76bb54d176aa69b08fe001931010c7a11d6d536fc1a79e080e SHA512 42705e2f1a841f8154685d9f49fd5a72ff179473163764e616e605bbc15223d8a6ad036e4f3e50b4982c8074cc3ab0b9aeb2f5dddeb34c67d5f0a038f531177c WHIRLPOOL 51f9a8ade77bba0793a1c340e539433d0412ec83855521884af2cd31dfb1fc5323a2ba0f13488a2fc80ce60e12645512537b4c7d2c5cf892037b81d1e923e906
+MISC metadata.xml 311 SHA256 801347bc050ebd9d83f780e6f1791e03cd974a3017206da99097a96e8e315b55 SHA512 54b2c606b837dcf3ff6281060f848b19a96df0214fcc676c57bb2dc098d3633421868395a15f2ed746723254b78e50347030b485b084f49651bb114fa3e61072 WHIRLPOOL 277b9e941bca5410197203cce6c997c1e6d321728dec30f80a82b10d7bd7730a2204151d096aafb0f898b102ecc30722dc2c7889822a252571f94233ad507649
diff --git a/dev-python/functest/functest-0.8.8-r1.ebuild b/dev-python/functest/functest-0.8.8-r1.ebuild
new file mode 100644
index 000000000000..2ff1be77f7d9
--- /dev/null
+++ b/dev-python/functest/functest-0.8.8-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Functest is a test tool/framework for testing in Python"
+HOMEPAGE="https://code.google.com/p/functest/ https://pypi.python.org/pypi/functest"
+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}]"
+RDEPEND=""
+
+python_prepare_all() {
+	# purge test folder to avoid file collisions
+	sed -e "s:find_packages():find_packages(exclude=['tests','tests.*']):" -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PATH="scripts:${PATH}" nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/functest/metadata.xml b/dev-python/functest/metadata.xml
new file mode 100644
index 000000000000..b743c9552700
--- /dev/null
+++ b/dev-python/functest/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">functest</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/functools32/Manifest b/dev-python/functools32/Manifest
new file mode 100644
index 000000000000..953ad55abadc
--- /dev/null
+++ b/dev-python/functools32/Manifest
@@ -0,0 +1,4 @@
+DIST functools32-3.2.3-2.tar.gz 31171 SHA256 f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d SHA512 ad944019f4aefde292b6872bfe06862d01920a2f44adf8740c36ed51d16d879be7638591aaddf9dac4ec83b6f05bbf81972d5f32854abedcce3dde080459f7f7 WHIRLPOOL b574508df6fcc1b1309cc5130c50e0d4611f59f434f5ecea27924085a9c12c70f8fb3819741c3db8f5244a8ee0ceb9085565b5603f3b888166ce66d1af943121
+EBUILD functools32-3.2.3.ebuild 612 SHA256 6611d641b54e5b973327e02ab93de6634d7d4ec2129e911ed37e614c983e3f8c SHA512 486cf17a9bdfbb0bc9c3990706ef63c590fbd760d2b395e8b09e36a1367ae35b3d87abaed4e261700b9110202c4623dcf5f0976da0fecf8b4eabdbc576fd8a69 WHIRLPOOL d60c7a5633443436bfc52f3fb99ae5ce32cff378311acbe4623cf297f352406a8b13785e387bae54132bb96cad801110eb507efd1d51fa3a697d8c4a19331c43
+MISC ChangeLog 2298 SHA256 a220da3ecdc16dd8034a534c33603f2416a9b786f7441ef0b83c31692fa20b43 SHA512 4ce2655b0730fa89f288858fef96cae53062cc121e606ce00b8ded8e3f1a1b6ada05249793ebbb1911504ac8ba2ad47754eab38460497141dd3d4e6660738632 WHIRLPOOL 442c73c81a830d763e7333e4a62bd9f2d79b04e5fc2e319ac44ece872df44777a9b81adf0da9eaeceaf754139f9e5d3a182ac602e6b1b1fca94cdf3b74b5f236
+MISC metadata.xml 380 SHA256 91098a21200f0acf39ba3e5d5fdad18a3cfb93dfa2671784ddfa107de527b308 SHA512 665568fc9ce82f570e4601ea9574856c6e1d3db18e79a04ea46888b61ddc6da5aa0f73950346a8940a32ccf1c832981e6ed18ad547fb2f37edbea9b123b0fcce WHIRLPOOL bb3f55cd7cfde2d31eb0c6b84885de7b0671e60abf6935fdd0ee68571a65e7714b94452e239810461afc3799b5d24c24d7fdd73b714614cc0a726a41dce5c3fe
diff --git a/dev-python/functools32/functools32-3.2.3.ebuild b/dev-python/functools32/functools32-3.2.3.ebuild
new file mode 100644
index 000000000000..10c0842c19df
--- /dev/null
+++ b/dev-python/functools32/functools32-3.2.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Backport of the functools module from Python 3"
+HOMEPAGE="https://pypi.python.org/pypi/functools32 https://github.com/MiCHiLU/python-functools32"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}-2.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2.4"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}"/${P}-2
+
+python_test(){
+	"${PYTHON}" test_functools32.py || die
+}
diff --git a/dev-python/functools32/metadata.xml b/dev-python/functools32/metadata.xml
new file mode 100644
index 000000000000..f8fc51c33338
--- /dev/null
+++ b/dev-python/functools32/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">functools32</remote-id>
+		<remote-id type="github">MiCHiLU/python-functools32</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/fuse-python/Manifest b/dev-python/fuse-python/Manifest
new file mode 100644
index 000000000000..f6f149cda0ad
--- /dev/null
+++ b/dev-python/fuse-python/Manifest
@@ -0,0 +1,5 @@
+DIST fuse-python-0.2.1.tar.gz 57833 SHA256 11ead462f8d0f8302ee07b33fe93dc42c653861a16c8802a31903a7355b8351b SHA512 f89c738352ca23e92b5c0222dde0a13bbee4d86432e9c339080203ed5bf4f885c42a0a3a252ed485f26b569d87e68dc0d78c55d8f7b2f3ce0cbac8afb251bdaa WHIRLPOOL ebd717570ceb539323af332e2e2057d549f6cf510b3558cd7cf1aa462645d283125d217498eaa97adff8a3c1c3af1da36235debf40ba97d886d63dcc8de54242
+EBUILD fuse-python-0.2.1-r1.ebuild 424 SHA256 cb2ae9310f066dcb955fbae67ee9a85a1ed0b8f7ade189de6a870aff2efb13b7 SHA512 ff9f02a55327537d0a99b7d874bc6a4118d7d66c9a9094a6b2b407f7a63ec8a2bbd37bae76e83a3e41d250692d6eb06ea6f9805b494a5a3e3957de5432901855 WHIRLPOOL 3614a5711cab328c718a31afad129c90868e83ee132e623a1d4828cc62c1dd051674145ee8f88d3f55695d852014432cfa17b295655afa0c3f6a30be994e9167
+MISC ChangeLog 2542 SHA256 1a614fe6b52014e0775baa9aeee83c09f4c2b41dd0a4e88b291519d3b9b52bad SHA512 955c563cde22b89d3181cfc1c2d9b62ae6be61b9bbed6d8bbe3a960a8c56b3b629f9ef17fd2697937c71c69a74dc02deb1470ed8f04e7c931b6115869982b78f WHIRLPOOL abdd7681a65e595c07c01102b82ee1f2f297f7ae4d2d921b717ee91eed9dfea5be505b78a5f03fa5b24d4932329111d596357f0d373049d2a1fc1cad0101893a
+MISC ChangeLog-2015 4124 SHA256 dfbd37422edb1f4d968660372157f1815ab8607e198eced5db9868165062746e SHA512 1ba55c6a69edace0043905c795dc0f345aa39d2b0c1041bd84288e3498b719dc1d51d32a199e26f9790aede2d8080c67d5e4f6361a64ddda06eb41b9975fe835 WHIRLPOOL 8bd7729df26921db57f745385c6775a9858f74d55b309482caee565ee79711fba6f846f2bf29fddda1ebbe8bb8953a5f6ecd98836296c0df7ed4e60eaa440e43
+MISC metadata.xml 241 SHA256 04b46e7636adfbe0e5bcd8a100cc00c0054b5547868a2125e072869a2926cf76 SHA512 fae6c0b9c2f7b479a2ae029b5e79207756486f5c59a9fc5a2094b239464270eb7a18928a34c11237811a3d1537cd35839778da6704ee6ea3fd806c76e3e6bb6a WHIRLPOOL 700c75c30296e58681282584a736d9f09c025c263b7b563b0eb35cf2eedf0e3e28b17d87614f0261c896ebeba9ec3c882deb95994588ca16a01cf133d404220c
diff --git a/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild b/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..627c96fe3666
--- /dev/null
+++ b/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+KEYWORDS="amd64 x86"
+DESCRIPTION="Python FUSE bindings"
+HOMEPAGE="http://fuse.sourceforge.net/wiki/index.php/FusePython"
+
+SRC_URI="mirror://sourceforge/fuse/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=sys-fs/fuse-2.0"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/fuse-python/metadata.xml b/dev-python/fuse-python/metadata.xml
new file mode 100644
index 000000000000..514528075df9
--- /dev/null
+++ b/dev-python/fuse-python/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-needed -->
+	<upstream>
+		<remote-id type="sourceforge">fuse</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/fusepy/Manifest b/dev-python/fusepy/Manifest
new file mode 100644
index 000000000000..407339afe743
--- /dev/null
+++ b/dev-python/fusepy/Manifest
@@ -0,0 +1,3 @@
+DIST fusepy-2.0.4.tar.gz 14113 SHA256 802610ab25ad04fc9ef34d024a0abe41cdcaff6a2cb8b2fb92cdda0057c09d1f SHA512 a76d6a795ea08bcfea30f783b06e263c0c31d603ade95f8ac40071fa844668c5f989111649908d26b4c2759feb48abedaf887c75f177c3639b1916b246e7d83c WHIRLPOOL 0f134aefa66d834810cb02fa527b53840ec1064ee8517934673bff26dfed8ab8d2be81f4248d7156896dbe26486e2c92611e0fb7d9b54fbe71e5770faf018399
+EBUILD fusepy-2.0.4-r1.ebuild 497 SHA256 3d4cf6f4cbe122f31b53f01160c69c7607841fdf1a08e935c385943ab50c497f SHA512 bf43fc1979e46236b6a7f34fd9ce1e08a0abaa5ac154cdd06306c4e5bd32147d873751c5a87223a928f537b2d7ae77ff6604a8279b1765af6d1f323ff14deb1e WHIRLPOOL 3eb07e7b9c35b7b2e74478da65739bf07fbbe66b03897859128151a205e8a88e8fb6506d13ca30e16266095d82af757fc5648734bc7ea3ea8a2a3c3bdd0e8ba1
+MISC metadata.xml 514 SHA256 bd06aefbf56151550f4c41dd6bedf18490eb7fe17758afc14e4598eeed76ef28 SHA512 7209b73d25dddbb47c2389316c29e7df578f2b4342dc68aaf3ef2d39945cc3bbe2e1aa03dd8df9a465aa7f713b9d3647f731aca086a3cb4d2e5eb9ae3cce6d0d WHIRLPOOL ff22654077d1b8b436e307089ad1c4deab35be85432e785275cc8abf5c99d6e9ec9fd8621159cb13ac4e3d22838d56d0bdebc4b47dc9515857409d9b88126747
diff --git a/dev-python/fusepy/fusepy-2.0.4-r1.ebuild b/dev-python/fusepy/fusepy-2.0.4-r1.ebuild
new file mode 100644
index 000000000000..4d274aed3c88
--- /dev/null
+++ b/dev-python/fusepy/fusepy-2.0.4-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python FUSE bindings using ctypes"
+HOMEPAGE="https://github.com/terencehonles/fusepy"
+SRC_URI="https://github.com/terencehonles/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=sys-fs/fuse-2.9.7"
+RDEPEND="
+	${DEPEND}
+	!dev-python/fuse-python"
diff --git a/dev-python/fusepy/metadata.xml b/dev-python/fusepy/metadata.xml
new file mode 100644
index 000000000000..d806a30c7d2c
--- /dev/null
+++ b/dev-python/fusepy/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+	  fusepy is a Python module that provides a simple interface to FUSE and
+	  MacFUSE. It's just one file and is implemented using ctypes.
+  </longdescription>
+  <upstream> 
+	  <remote-id type="github">terencehonles/fusepy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/fusil/Manifest b/dev-python/fusil/Manifest
new file mode 100644
index 000000000000..9c5be3bef5c6
--- /dev/null
+++ b/dev-python/fusil/Manifest
@@ -0,0 +1,5 @@
+DIST fusil-1.5.tar.gz 138910 SHA256 1b6e269f47636b5fd1ddd25940aa1beaae68c05c076b3ad6bcef72db5865729b SHA512 0d84bfd2d9b8e509989723de26b30c3ec2824612dbdcc097ff3e998fd4efa6b1293cb78743e098ad5012d4981b8e8036f3ad3f9c6acf2dc30e3ff1f707c7d1c0 WHIRLPOOL d0747c9f53af8ccaa9155fa05726928b0a52b5cef6fc76f7ab38b3219ca3d1c82c396737de3427fe3129d257f91853659ea7f2ab158c31a4349b53d906c5121d
+EBUILD fusil-1.5.ebuild 941 SHA256 e37ca523dc878120bc6ea6e732967e33a589597e3e0d99982da221bc7591a5f3 SHA512 f867526e9eebc3b30b3891c55b316cd7cd8665c887a6a4adbd07306cec7047a4016913763b4c2d7d7b57d911837a78f649eaab7195a53e1fd52fab971527fa9e WHIRLPOOL 389090f0880cc02654156aff581152edc7d1782797df919703534e05c097805f0dff1afd3c461a36e9db220e616d8f288dfe3aca7e958823c74143fcdc077ec2
+MISC ChangeLog 3049 SHA256 f60ef2fdb2040c5d10b978e495dd740e44b27e04e81cf808a9d39ad0486176af SHA512 a3af2c3e92d8f99bf717e2645ce739575940d9e653be3f5a789c190187289a58542825f77836c37995c9d442d4f59b58201e956a675280b0a43dc84833c9ecce WHIRLPOOL d6556334628149f84fb5dbd197d9caf779f32fce78fd356081ac00835ad7e5013da6a4389a8b1a9218d7d6d3f050b3f67090e3284997729c19024ccee4bc49dd
+MISC ChangeLog-2015 2338 SHA256 e230b45b115e8f85100cc789830aba52daa728de82caee3f50af758ca8818dec SHA512 5fa7999c2b0529749f53f6dab29e0ca54d028bae5bcd2957fb22743e03e669323e4d8432b2369e3a347748350e121b0449d62d28e88afd10504877b141eb8bff WHIRLPOOL c913eaed971169055be4e9eb998534d7fe16c1a087e46f495a920e8a3cfdf4bb8dee2537c636004e2cf7db78ca6defff5e545ecaeb3c79d16b067d48a2817d54
+MISC metadata.xml 374 SHA256 8e2ee6dedebc1404e04d2a08dfb3ba65e18f9d59ae2dc137655bdeaeba5aad26 SHA512 98947683cbc807385f692511afa4402ed11644fbece4ecad9888cb8beb90d4154f9ddad104210ab2e7fc0641cadb654a826786a57ffb6fbae158eb3aefe0bdba WHIRLPOOL 06b9b7ecfc2d3de5ff795cf30dcf0e70da5090bc161a378efe3eb5907efc918fcf02991b1091c0253d5fedf935e0eed1d8cea06e5f21822b4ba5ce3ac1dcd0ff
diff --git a/dev-python/fusil/fusil-1.5.ebuild b/dev-python/fusil/fusil-1.5.ebuild
new file mode 100644
index 000000000000..9a5f6f56b197
--- /dev/null
+++ b/dev-python/fusil/fusil-1.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Fusil the fuzzer is a Python library used to write fuzzing programs"
+HOMEPAGE="https://bitbucket.org/haypo/fusil/wiki/Home https://pypi.python.org/pypi/fusil"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+DEPEND="doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
+RDEPEND=">=dev-python/python-ptrace-0.7[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	if use doc; then
+		emake -C doc RST2HTML="rst2html.py" || die "Generation of documentation failed"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	enewgroup fusil
+	enewuser fusil -1 -1 -1 "fusil"
+}
diff --git a/dev-python/fusil/metadata.xml b/dev-python/fusil/metadata.xml
new file mode 100644
index 000000000000..030b6dace8fe
--- /dev/null
+++ b/dev-python/fusil/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">fusil</remote-id>
+    <remote-id type="bitbucket">haypo/fusil</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
new file mode 100644
index 000000000000..2c938e77d63e
--- /dev/null
+++ b/dev-python/future/Manifest
@@ -0,0 +1,7 @@
+AUX future-0.15.2-fix-py35-test-failures.patch 2339 SHA256 563628f399342a6f5035b105f0cc1d56f7817025ddb20d065447c563719fcc85 SHA512 816a3d30461f6e0eed0106bc46952e3f6d98323d03ff3f212332871b7eaf7d3b9817ee2043110bd004152c4239bfa427d9ed74f1dc7166d41534ba0fc76ad055 WHIRLPOOL 65cd5db9c57e00545632df729c8613a975a63ad787caeaaf222d8a7ba72a3dfe75b11efddaff3fddf246ff771bf9053e3e6b9000a971d4c3cf7ab904777b4bc6
+DIST future-0.15.2.tar.gz 1583441 SHA256 3d3b193f20ca62ba7d8782589922878820d0a023b885882deec830adbf639b97 SHA512 24a0eaf70795efe1644b098c5abbcb0103d9172a5243721f0d26b1cbd108872b6c0616180da8f5507855ddfc7b26bb10a606a64e59d307d39042b346700f77ee WHIRLPOOL 557b53495033d4586dc0f34837cc7f0cab12fb770abda56049fd90b5bac3e36db561e185d86e8a08b153869f0f692ccf0b305f5edc20871edde487faa1b1fc4f
+DIST future-0.16.0.tar.gz 824484 SHA256 e39ced1ab767b5936646cedba8bcce582398233d6a627067d4c6a454c90cfedb SHA512 41c795cd1746a76df84de2da9fbc611fc6164322c1c712ec9e8a8626c21c2717cb4899ec150d95c5e0c037270e6bb71e099edd169609369aae619daea9df2e5f WHIRLPOOL 744ab7e228c608f49308609e18778e198804a7b6fea3a6285efcce14a4ea8d114e146e94779e084ac91916fb7cc560be2178806378305b40568d6bb7ff448951
+EBUILD future-0.15.2.ebuild 490 SHA256 ed6145f6dfab57b955480719c27e24179994720c5f8a292c654df9c16f714405 SHA512 2830318a18c7948a413e83401e33a7dc911791ae672288160c49159a96918d9556d7077746efed3467fda487a61b07da0d34d8adbb6c38ea7618cd8b21d48ac2 WHIRLPOOL fa5cf6ed8ecef08e69549139c3e48a606f9f6a8d8368f5e0e295130fbd6afb3daf9dd22801f80c93f73941e55d275c3a07144f37dcb6fb8dc7c290af2312ec34
+EBUILD future-0.16.0.ebuild 555 SHA256 aa31b591d1ba357e87dc802d018085fc1b00afda2eff4835a79466fa5647628b SHA512 b68848c3df188420e8a3826ed06d4e85994278e9214ae03945b801a7eeb0df3cb440852dd4b42f54c451cc2a7c2efa27e9bdb8164309794ff502b375d1113207 WHIRLPOOL f86de97d310fb9ad158534fce6ded08ec3427c208e7afa36506ee50be50b95c28bac3e74bb270235c9dbc073558b5bd3929fb63455f81a1364f19ce90faeaeeb
+MISC ChangeLog 1394 SHA256 98c7b22ba268a5ab6ef159456f749e2fe89f22c18ef62da04f14f2d2dd65a007 SHA512 4a6dbf4a22ff0af654f1b367ae6534b92c0fc3f37407c8de7be5514fc5a9de6abcc8380edaf6fb408a740ba074c731bc98b021ffeccbd44c9b344512185668ff WHIRLPOOL d627df34b85c5e6bfa05c058a0ff0846f2bec52ef7938c38e360a4e3a4c03a8412d5fde79c19f3ca0f35370574b087f23238c4392d199a8226f33f639a5d8085
+MISC metadata.xml 309 SHA256 b34d01a25d528ef86a4bccb18881a1623e31aac8a8df38c36371fa6f51fbf3e3 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4 WHIRLPOOL 8f95c0410c7e60dec33b734054a4a7b57283b4e41794a7b24b006142457f97f4a5bf08ebf864e6433d5634a8e54a2f96183aea698cb5aea31be3d0ac3e01e924
diff --git a/dev-python/future/files/future-0.15.2-fix-py35-test-failures.patch b/dev-python/future/files/future-0.15.2-fix-py35-test-failures.patch
new file mode 100644
index 000000000000..8d8e5daccf10
--- /dev/null
+++ b/dev-python/future/files/future-0.15.2-fix-py35-test-failures.patch
@@ -0,0 +1,57 @@
+* Fix test failures on py3.5, backported from git, see also
+  https://github.com/PythonCharmers/python-future/issues/183
+* Fix unexpected test successes on py3.5, which are now correct
+
+--- a/tests/test_future/test_bytes.py
++++ b/tests/test_future/test_bytes.py
+@@ -10,6 +10,8 @@
+ from numbers import Integral
+ from future.tests.base import unittest, expectedFailurePY2
+ 
++import sys
++
+ 
+ TEST_UNICODE_STR = u'�εα∂@ßʟ℮ ☂ℯṧт υηḯ¢☺ḓ℮'
+ # Tk icon as a .gif:
+@@ -534,6 +536,8 @@
+         self.assertRaises(ValueError, bytes.maketrans, b'abc', b'xyzq')
+         self.assertRaises(TypeError, bytes.maketrans, 'abc', 'def')
+ 
++    @unittest.skipIf(sys.version_info[:2] == (3, 5),
++             'Only works in Py3.5+')
+     @unittest.expectedFailure
+     def test_mod(self):
+         """
+@@ -551,6 +555,8 @@
+         a = b % (b'seventy-nine', 79)
+         self.assertEqual(a, b'seventy-nine / 100 = 79%')
+ 
++    @unittest.skipIf(sys.version_info[:2] == (3, 5),
++             'Only works in Py3.5+')
+     @unittest.expectedFailure
+     def test_imod(self):
+         """
+--- a/tests/test_future/test_builtins.py
++++ b/tests/test_future/test_builtins.py
+@@ -525,11 +525,10 @@
+         self.assertRaises(ValueError, compile, 'print(42)\n', '<string>', 'badmode')
+         self.assertRaises(ValueError, compile, 'print(42)\n', '<string>', 'single', 0xff)
+         # Raises TypeError in Python < v3.5, ValueError in v3.5:
+-        # self.assertRaises(TypeError, compile, chr(0), 'f', 'exec')
++        self.assertRaises((TypeError, ValueError), compile, chr(0), 'f', 'exec')
+         self.assertRaises(TypeError, compile, 'pass', '?', 'exec',
+                           mode='eval', source='0', filename='tmp')
+         compile('print("\xe5")\n', '', 'exec')
+-        self.assertRaises(TypeError, compile, chr(0), 'f', 'exec')
+         self.assertRaises(ValueError, compile, str('a = 1'), 'f', 'bad')
+ 
+         # test the optimize argument
+@@ -1287,7 +1286,7 @@
+         self.assertAlmostEqual(pow(-1, 1/3), 0.5 + 0.8660254037844386j)
+ 
+         # Raises TypeError in Python < v3.5, ValueError in v3.5:
+-        # self.assertRaises(TypeError, pow, -1, -2, 3)
++        self.assertRaises((TypeError, ValueError), pow, -1, -2, 3)
+         self.assertRaises(ValueError, pow, 1, 2, 0)
+ 
+         self.assertRaises(TypeError, pow)
diff --git a/dev-python/future/future-0.15.2.ebuild b/dev-python/future/future-0.15.2.ebuild
new file mode 100644
index 000000000000..065b9adffcbb
--- /dev/null
+++ b/dev-python/future/future-0.15.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy, clean, reliable Python 2/3 compatibility"
+HOMEPAGE="http://python-future.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-fix-py35-test-failures.patch" )
+
+python_test() {
+	esetup.py test || die
+}
diff --git a/dev-python/future/future-0.16.0.ebuild b/dev-python/future/future-0.16.0.ebuild
new file mode 100644
index 000000000000..fb402928085e
--- /dev/null
+++ b/dev-python/future/future-0.16.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy, clean, reliable Python 2/3 compatibility"
+HOMEPAGE="http://python-future.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/future/metadata.xml b/dev-python/future/metadata.xml
new file mode 100644
index 000000000000..c7fc9479ce4a
--- /dev/null
+++ b/dev-python/future/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">future</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/futures/Manifest b/dev-python/futures/Manifest
new file mode 100644
index 000000000000..addb258de55f
--- /dev/null
+++ b/dev-python/futures/Manifest
@@ -0,0 +1,9 @@
+DIST futures-2.2.0.tar.gz 26786 SHA256 151c057173474a3a40f897165951c0e33ad04f37de65b6de547ddef107fd0ed3 SHA512 5f2a835b4b3f6bf1c4f086984a2e1d6ab30004b9af9298ef8afb23549014695ba26b43500dad3ee873e52aacd75911a42cd4ec9dfae6522cb99476a480dc83ee WHIRLPOOL 5c38f64759d0f2a15a536e8a5cb5c7473ce61d46242fc0c0bc737dfe91ce9b6573c1291a6f305953b96cd6298e1e41f7e27b45a2f0c2647315826ad9a1246ccd
+DIST futures-3.0.3.tar.gz 24959 SHA256 2fe2342bb4fe8b8e217f0d21b5921cbe5408bf966d9f92025e707e881b198bed SHA512 2fa14df90e583ca86c47441b170a93435eb82fd37bb2e15d98e79c32fbe40fc3f602d762805de05fa8007df4a3ce92840915be59481b94ab4863aae884da74bd WHIRLPOOL 661a1174815766717eb7b130929c7aeef08079228df8f092093ee6cf40f84041ae6729cc7c0f2b05080efd0d80c0f7885c3ae333f7e5f3d21ccf2cfc20cbaa44
+DIST futures-3.1.1.tar.gz 26471 SHA256 51ecb45f0add83c806c68e4b06106f90db260585b25ef2abfcda0bd95c0132fd SHA512 7ccb041271ed2688591942f46ab2d2c92d806efbd5209ff9aba77c6d5d3c1a1495fccbeb1718d914894b0b8d936438687e8f3cc22b7ab6625fb518321084ead3 WHIRLPOOL e0c71503261511713872344cd7e8c429ae62ac5fef934758fd1c7b60a7a697c824bbc78ca1aeb7a05b03c8b2a14ca63dfe3028e7c48e78670ecdbe9dd66d0051
+EBUILD futures-2.2.0.ebuild 1033 SHA256 4e27167c9c2e33b0ae631ab1b342d79a4a3f9ca56660fececae8f143e6484e91 SHA512 5bf24a597059f6195478944b836171132f9489b2fd880d84bbe1dd1bf80392dea2e6a3d26b551ade75eca507c1c8014fc7315e030a8131bfb9cda510f57f3bd3 WHIRLPOOL 2b3fb62c36187235dcd108454c12c91bab405049598f58676819f14bcfd6c9fddf923af69b2383914fded7c78d5d9219ecfb68674baf7b5947503255bc7e0703
+EBUILD futures-3.0.3.ebuild 1085 SHA256 1c1da03fe7369b9c43b6613fe5e56a1fdceb121a33e08740e61ae4f52e25d36b SHA512 616046f342a0ed20ee369c96741e1a6c223b2a302458764a19eae8cb632a990ec15916c2b93a681b5fa93e8bce420b8e785179ce627366a378c224dde3535962 WHIRLPOOL 4f5032d96d09503cced261d15da91b0d8efa5187ea8096668234cf91c5a5a08ce2b69b72db869c3eecbe93f90b1e6254acf7eb002c84f68e1526b3f663d1920a
+EBUILD futures-3.1.1.ebuild 871 SHA256 285d0f04a982a279b629999489a887f2179978ea50136d6f5fabb9ac86273aba SHA512 a1b9ba40a36312d8e5480e48f99b1b8939eb99ec80b44315ca153d1dd4faf41efb356dd4bbdba411747a2d88d34736f07730d69b723e1b1b6500eef95b74ee2e WHIRLPOOL 7237df320cbff2517a3417d5d04456c9b1f9abf454bc386f71af8fe1f8f04d047fd3a59719244fb00839a4df58cc0137435d6faec86efc050f273d9dc4686b88
+MISC ChangeLog 5863 SHA256 7a99fd9a7494a1ed68b4a314d6a446a382f233a40a30202ee33dce89f10079a4 SHA512 be5054a2be7d2e83e54e9e47f581efc4c4723c6d976cfc044d25125b51b42ef000c8ce1451c90f641b7a89f944890365436b01af2eaeb7910e021aaaa7843d9a WHIRLPOOL 8a0f755983a2ff30f025415c752be7e4c9bf4d4cefbec383d70e039828a1414b10440cb8a415ad6bbe74f1eb41025483bbcc52e72b8a3c0d7e90203efbabb06e
+MISC ChangeLog-2015 2528 SHA256 da01eaf6a1fddc32e34248deb91fedcf59f34419924151107936ef810535a646 SHA512 50450d9419492267a313ff8df10bd709d1b959fd60d914689a3de1e4db71fb197acb0be903ce67771a8000dfbdeddf10330f4ec60b4055111139eb0029bb1b6c WHIRLPOOL 94a942fbf61cb1ee6ad67aec32dbcf19d22ee491d27f5034ec0314056bd32fd349af81a5d70a50f388383abc492ad6e728d51cf7749b0558b375a57aaffd00ea
+MISC metadata.xml 310 SHA256 3156dce7e9e3a82ba0d74f0b723a68ce309fdb23a7d3505b034ee0bc6f7080f4 SHA512 a6efb8ac5fff2d6eab08681ade46c776ad393e65ac9c5fdbe53977ec7cc852e05b82d7466001caa91021eeda0e03ff6513322b90251b8d273b72d80ca30ef20f WHIRLPOOL bd72826cd5ab21e6a11337447d3848524df1a01f0a98c0cd6d416d47c107e2a7abddc34d16da23ca9b2b6c2d25c1b52e60fb4360a4004e964aef7e2dadd1f3f6
diff --git a/dev-python/futures/futures-2.2.0.ebuild b/dev-python/futures/futures-2.2.0.ebuild
new file mode 100644
index 000000000000..a32041e878e7
--- /dev/null
+++ b/dev-python/futures/futures-2.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+inherit distutils-r1
+
+DESCRIPTION="Backport of the concurrent.futures package from Python 3.2"
+HOMEPAGE="https://code.google.com/p/pythonfutures  https://pypi.python.org/pypi/futures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# tests that fail under pypy
+	# https://code.google.com/p/pythonfutures/issues/detail?id=27
+	if [[ "${EPYTHON}" == pypy ]]; then
+		sed -e 's:test_del_shutdown:_&:g' \
+			-e 's:test_repr:_&:' -i test_futures.py || die
+	fi
+	"${PYTHON}" test_futures.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES )
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/futures/futures-3.0.3.ebuild b/dev-python/futures/futures-3.0.3.ebuild
new file mode 100644
index 000000000000..1405b9a27043
--- /dev/null
+++ b/dev-python/futures/futures-3.0.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+inherit distutils-r1
+
+DESCRIPTION="Backport of the concurrent.futures package from Python 3.2"
+HOMEPAGE="https://code.google.com/p/pythonfutures  https://pypi.python.org/pypi/futures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# tests that fail under pypy
+	# https://code.google.com/p/pythonfutures/issues/detail?id=27
+	if [[ "${EPYTHON}" == pypy ]]; then
+		sed -e 's:test_del_shutdown:_&:g' \
+			-e 's:test_repr:_&:' -i test_futures.py || die
+	fi
+	"${PYTHON}" test_futures.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES )
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/futures/futures-3.1.1.ebuild b/dev-python/futures/futures-3.1.1.ebuild
new file mode 100644
index 000000000000..0b7ad52ac7a2
--- /dev/null
+++ b/dev-python/futures/futures-3.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Backport of the concurrent.futures package from Python 3.2"
+HOMEPAGE="https://code.google.com/p/pythonfutures  https://pypi.python.org/pypi/futures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
+IUSE="doc"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" test_futures.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES )
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/futures/metadata.xml b/dev-python/futures/metadata.xml
new file mode 100644
index 000000000000..7f7164692f0c
--- /dev/null
+++ b/dev-python/futures/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">futures</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/futurist/Manifest b/dev-python/futurist/Manifest
new file mode 100644
index 000000000000..7cdfaa5a8372
--- /dev/null
+++ b/dev-python/futurist/Manifest
@@ -0,0 +1,6 @@
+DIST futurist-0.13.0.tar.gz 30739 SHA256 2d51e23607f42bcd84fcf666b91d9a41c131943d85f7a252e599cdea6518ab1c SHA512 a193721ac4920577cf42a39868a76ab772154430ff59b7ca90584d63d65097e842057a0767d357ead9b057638fc8b736d4245cae9945dabac8782d5821e134b0 WHIRLPOOL bf5353773ca8482361567461e0aaee72c03b2535005533364da54b34a88fc19e7d260e0de8831b1f4c88ab2ffed70481a22892d186c5a0e5727fb4dc3649381a
+DIST futurist-1.3.0.tar.gz 40889 SHA256 1cd2cccdb1d09e6d8bb61568e933611d41da8bf72e8714cfd473f0728145efef SHA512 1510de6b52ac72500045e0daebd21184788b31123f0cd152fcca9021fcccf8638e808c0459a446f386ecd849dc2f563b7651145c6a5b56a6b36d630868729abe WHIRLPOOL eeb1ca603d38b110c99bc43b7a9bc833cabac9c71bb4fee1fe033dda883101d979258fab9f7b2d09572d29b226cf0c4c674da6023a7b42d86abc39c5325f539b
+EBUILD futurist-0.13.0.ebuild 755 SHA256 bdcbbe480ec2c1ee93235ce0514aed44d8b925d2c50f77e304227fe4c35f3404 SHA512 d72ee7ffd18aeb26e884fe07d42efd55f6447f36a83a906b61f14349c6e9c015767f7f29f6c94592ddb9718d5da8e2029087a12f2bcc08fe28a721d0eac60c60 WHIRLPOOL 76dbab33c5bfd5ba40ea4cbd52d735baf413b7967bbf7c9db531f94af0bcf6c895f5d491456f437e1e663d7da7b20e62eb3b154decd9e23d423fea5fc230a9ff
+EBUILD futurist-1.3.0.ebuild 911 SHA256 dc4492d566c49435a810a149e22e137c3b7a009ce23b1621ae4a4b03440ca599 SHA512 6595e2e5075f9581545316ca5a698664e5f0abd2ef6f0de9146bfb730bcbebf4a08ee2704266a332aba763c6c36da4ec563fbeefd72a94253d3ad8c1d83afb8f WHIRLPOOL b35e6a0c88b756d3b5d4b0d8ef8f628bc6a71a6ce1a5927a2d6c73da4536ec8752e63364325fba7f38984890b4ce16f3b3a40859df8f5f3140562dbfeab24d73
+MISC ChangeLog 2156 SHA256 ece761961d3ca42dadb5bb8804fe4260450292ad5d5190c524b6472e9bdd0a65 SHA512 8828f44773573e556cf707efb8d77c51274ff6be5229b87c55c5a82a7ecfe8c89dc3836517b401da0064771a307c900a95c6305ca79d95e005a85083bad7b72a WHIRLPOOL ae4215beb9d50d2dae310424eeaa24f94e2a082d5d59620c529374d1b6d992a98befaccf7bde01ed626cd43b4abe42331be09800286dafeca1a424596599e9ac
+MISC metadata.xml 325 SHA256 2172a62cb77e3b862d96c71896a094a4b89fd2c69b35ad52abac64f7045aece5 SHA512 4d4d42c2821349f1a2144c297cf80c572482eff31cd1fb4f43f43c503d1533a1ea53627528cfac417ab0d1c174f7924f951f823c9577ebea86ce7cdd88195bed WHIRLPOOL 7f482b44d112071394b796816146c20b22cc6e314dc5b672ea0fc0b6d03f5e0148c08ccf6bdb1e782d83cad986eba8a346e8f2b9b632e66ddfa0b0fdb58c86c2
diff --git a/dev-python/futurist/futurist-0.13.0.ebuild b/dev-python/futurist/futurist-0.13.0.ebuild
new file mode 100644
index 000000000000..3c94fc81a197
--- /dev/null
+++ b/dev-python/futurist/futurist-0.13.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Useful additions to futures, from the future"
+HOMEPAGE="https://pypi.python.org/pypi/futurist http://docs.openstack.org/developer/futurist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/contextlib2-0.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/futurist/futurist-1.3.0.ebuild b/dev-python/futurist/futurist-1.3.0.ebuild
new file mode 100644
index 000000000000..d226756aac6e
--- /dev/null
+++ b/dev-python/futurist/futurist-1.3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Useful additions to futures, from the future"
+HOMEPAGE="https://pypi.python.org/pypi/futurist http://docs.openstack.org/developer/futurist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/futurist-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/contextlib2-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/futurist/metadata.xml b/dev-python/futurist/metadata.xml
new file mode 100644
index 000000000000..c2513943d020
--- /dev/null
+++ b/dev-python/futurist/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">futurist</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/fuzzywuzzy/Manifest b/dev-python/fuzzywuzzy/Manifest
new file mode 100644
index 000000000000..6b9570d1f3d7
--- /dev/null
+++ b/dev-python/fuzzywuzzy/Manifest
@@ -0,0 +1,4 @@
+DIST fuzzywuzzy-0.12.0.tar.gz 25792 SHA256 0a39865799ada1d514c8ac612194a2d1c8a335f67c17078d5ab0bb9ec980ac33 SHA512 d4312342af9e3fc9383e1967e60b2856af73e8ad869f6b694d3f737d0280cd840dc42779b0407aefce2571d98c97ab780912943078c4d94dd77502c4e28bd2cc WHIRLPOOL 161c464690b9f2479f0eaa158619c764fa179371aa7bfe4757dd5e68ab84dc819e001da7a04f1be54815ad49de299cabc39c44fbf1bba7c5a2a29c50dd1975e1
+EBUILD fuzzywuzzy-0.12.0.ebuild 540 SHA256 a93b697ffcec5de5e5cf1323355c1121b3e4266dcc929436f883a765fd741f0d SHA512 478133b7a198ad67695d8f055455b446fc55195b0eac6393296ef76017069e3cc7a3c622c21b497d219dfec9f6d4e64ad2676115e405c703405a0715e9842971 WHIRLPOOL b85661b06074d714e13f5a6df6f035d8c08bbc0e518a1ccc8c40b69fbddf16814ef5455af8df4e845dc640ac8c0198ab7176d8dc9d6034295927c7d2f7616f20
+MISC ChangeLog 656 SHA256 a4cc747327b002b4993e8f3429d035ce976b71e503308a07e84f2757e91557ce SHA512 c13689e48980a543bf0f238bca981929fa3a022959fbb81010424392d8e268bf8248cbe61aaa6e5b43d5e37df0072d7a32cc42a4df690def5b7053608a0415a3 WHIRLPOOL 6c1362bae445d26589dfdb569041ffa07c7a4ad52749f33ac5ce73f4085e7b8b3409e26628bfb09395133b99aa69a3f0bea3ad4ef25856f0517f8854589ab505
+MISC metadata.xml 457 SHA256 b152820b27bbfa2c6795271d7cf78bbc8161ece9e84dd8cbaf68433d2bc440e1 SHA512 2b1c211df04f960796b486cba1cba9c723a6dae3092a89fd994b686be3d41fd78af968b49b44ca703645239ae92f09b3d5918044f65b095a6b2704a8f8584c84 WHIRLPOOL 7851d12f26a6f0e0d16880d4cfaded144581002fa81e1cb56c782b0aed8bfcf826d2d93aac7b6533baf7fe0322cc1a141143b6ed407887addd743feb129ec266
diff --git a/dev-python/fuzzywuzzy/fuzzywuzzy-0.12.0.ebuild b/dev-python/fuzzywuzzy/fuzzywuzzy-0.12.0.ebuild
new file mode 100644
index 000000000000..2dbe71fffcfe
--- /dev/null
+++ b/dev-python/fuzzywuzzy/fuzzywuzzy-0.12.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+inherit distutils-r1
+
+DESCRIPTION="Fuzzy string matching in python"
+HOMEPAGE="https://github.com/seatgeek/fuzzywuzzy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	"${PYTHON}" test_fuzzywuzzy.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/fuzzywuzzy/metadata.xml b/dev-python/fuzzywuzzy/metadata.xml
new file mode 100644
index 000000000000..63eadc1cbd10
--- /dev/null
+++ b/dev-python/fuzzywuzzy/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">seatgeek/fuzzywuzzy</remote-id>
+		<remote-id type="pypi">fuzzywuzzy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/gammapy/Manifest b/dev-python/gammapy/Manifest
new file mode 100644
index 000000000000..33c223015986
--- /dev/null
+++ b/dev-python/gammapy/Manifest
@@ -0,0 +1,4 @@
+DIST gammapy-0.6.tar.gz 950419 SHA256 50f816a1b13de0bd483b588fc5ca4799849cca65a74102f81b8d972d48903550 SHA512 37e660ab23614895eb033949d737b884968e1d15a21a146acab65250248585c9cfd100026d5ee7473b2db7b3b56777e1953fbe876fff1983cdd72d624fcb9bed WHIRLPOOL 4654d6df6dc4871d81997c837c0fe0f6bb7fc44e2706469bd49554d957362763d304ce1680899d0bb65b4986b197cf0a0fb2ea945f6a7051a235c0a0b7ab9093
+EBUILD gammapy-0.6.ebuild 1854 SHA256 d61015a8894d33a57173edc35d39ea9d371841a2d9699b56c7167c4dda7fbcc5 SHA512 5723264022c67d7b4933b3e722c17a0c9a6886032fe563ea34bb7ed0b2655660c1af202653453c3aac09ac0154e0caed230e368569be76675f227b647f27b276 WHIRLPOOL c3b23eca71cd02a250446b157456a92883db13b7edd4569e4c847f7c1fc6c6ea3b82e5b53584b3c599645a0407723689be86db0e2028ffd3802ec9734538fbb9
+MISC ChangeLog 1222 SHA256 ab9717d16cf70d61823fb64dbcc994fa2503009477e258936fcdbc8cfdb3f266 SHA512 d799304860d767c423713af39913b43e1eccff99c3e822f9ce7c7c3c9da8c6f1f9e9fe5b5d4dca1aa24f0ad72d3476fab1314aace387524e23564904d9dc2e81 WHIRLPOOL 76ffea98348c766e0a90fc9f8d5199bf7a60b92b7f93d4f885b4865cf7676174ed134a1c55c7bb690bb443e3b09daa82bd7eb2ac609377ee0991af138e598416
+MISC metadata.xml 667 SHA256 03320967448a2fd079e873cd423e96432ecef978a7bcb23dd25be44c67b88dc9 SHA512 858634d57feea0db252d21360a9ea790059455e803a83aabbf08437c2a8c668c0e49a1e28c29ae57b85865ce402b8888d2a8af94f97a07821f749cafa1a6da5c WHIRLPOOL 9dc699bfbdcb948f2cd39105dd73f19fe7d9073fe91b88a7d52a41dbe4cbc4d5969ce17d1695e7859662db76df6d7b57c4c27658be81eba201e6f5e63dc14197
diff --git a/dev-python/gammapy/gammapy-0.6.ebuild b/dev-python/gammapy/gammapy-0.6.ebuild
new file mode 100644
index 000000000000..aef18d0e936b
--- /dev/null
+++ b/dev-python/gammapy/gammapy-0.6.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1 eutils virtualx xdg-utils
+
+DESCRIPTION="Python package for gamma-ray astronomy"
+HOMEPAGE="https://gammapy.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+DOCS=( README.rst )
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/regions[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	xdg_environment_reset
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_sphinx --no-intersphinx
+	fi
+}
+
+python_test() {
+	virtx esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "${PN} full functionality" \
+			   dev-python/aplpy \
+			   dev-python/astroplan \
+			   dev-python/gwcs \
+			   dev-python/h5py \
+			   dev-python/iminuit \
+			   dev-python/matplotlib \
+			   dev-python/naima \
+			   dev-python/pandas \
+			   dev-python/photutils \
+			   dev-python/reproject \
+			   dev-python/uncertainties \
+			   dev-python/wcsaxes \
+			   sci-libs/scipy \
+			   sci-libs/scikits_image \
+			   sci-libs/scikits_learn \
+	# not yet in portage: sherpa
+}
diff --git a/dev-python/gammapy/metadata.xml b/dev-python/gammapy/metadata.xml
new file mode 100644
index 000000000000..a1fa597d52c6
--- /dev/null
+++ b/dev-python/gammapy/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Gammapy is a package for simulating and analysing gamma-ray sky data.
+    It is currently designed to support users of telescopes such as Fermi,
+    H.E.S.S, and CTA in primarily Galactic plane survey studies.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">gammapy</remote-id>
+    <remote-id type="github">gammapy/gammapy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/gconf-python/Manifest b/dev-python/gconf-python/Manifest
new file mode 100644
index 000000000000..d4c670158a4d
--- /dev/null
+++ b/dev-python/gconf-python/Manifest
@@ -0,0 +1,5 @@
+DIST gnome-python-2.28.1.tar.bz2 562220 SHA256 759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8 SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2 WHIRLPOOL cd4ea19fabd26c55866d8789628fdc3c834e73932381431216d65c5e9b42ad529e83f74d498951f07f060d3049f1739b6db99dbdbe34575eed469ceb23a51c5b
+EBUILD gconf-python-2.28.1-r1.ebuild 580 SHA256 90695adbe3f8d6ee005cc8ccb723fab476115b091fcdf479b8ab89a0354c20bf SHA512 aa386fab6692b168ca3b3d56a09a3cb03c71f0d2af33f561d08d888f72636daf00319b9f4ae636ccbef2fd2beb5596a046da6f0f4aa22fc504c4e39c0b1b9f7a WHIRLPOOL 21504cfcbfc49a01a89fd6cd340a5a36d25b38ad8a199a24da2bb5bd9ff22895dc80e3bbe0baba65bdd66b741934f6d8b2ee8b262a6617c0dbe90f0dff176a75
+MISC ChangeLog 2452 SHA256 b1ea1455ef1e9d80d5c39247fd5b9f5f77ab0558aa32994cec9f596ee4fdfc42 SHA512 12549fa1ab519aa4c860add5f1934a9e787871057e8fc5c12cdd8a3aab298f87cc865ce059e99f5657a795a2b474877a4b92f070da5b4eb423cdaec313fd341f WHIRLPOOL 52b12d3e2ca74d2bd0c38876fa5a88e407f781d12d8d4cf8ed27e24ad129b46996982ac87bd69a7aad34ca4f89be4978afdbb9643705ff5784f86860305faa24
+MISC ChangeLog-2015 6567 SHA256 4900fdd53709b0d018c91dd5ce534f799b2eb2e31fb3d2bc79cde168bef320ea SHA512 94e269f5e9ad1a5d59a0a31d1d466bb158ce568e5e967cbb3d370e400dc752cbd9ae234284a2be68588fb17281df90498ea50a17c5d44acaba22d1dc90459bbe WHIRLPOOL 583193dd284bf9a1cb0e9896ab9ef75351ace84c4b63801f1ec8154a2bab4cbfa026be01ce1af60a4a34a6faa951aec5690cf4bc7d3185bb6a3ca7191b998b87
+MISC metadata.xml 346 SHA256 e03340f54524c1be70afcd11b77ee1249143b59b69d9668673f9ed55d3002a9b SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77 WHIRLPOOL 97cde96f56111c4c355d88d8f353c1daea1012183c43b6c29ef6dd7f07bbf2b14a1477c5edaae58c73c604a05543e2a67e2ec51c439bf43e7a3ddcd577ee2606
diff --git a/dev-python/gconf-python/gconf-python-2.28.1-r1.ebuild b/dev-python/gconf-python/gconf-python-2.28.1-r1.ebuild
new file mode 100644
index 000000000000..62b32be651b8
--- /dev/null
+++ b/dev-python/gconf-python/gconf-python-2.28.1-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+GNOME_ORG_MODULE="gnome-python"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome-python-common-r1
+
+DESCRIPTION="Python bindings for the GConf library"
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="examples"
+
+RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
+	>=gnome-base/gconf-2.11.1
+	!<dev-python/gnome-python-2.22.1"
+DEPEND="${RDEPEND}"
+
+EXAMPLES=( examples/gconf/. )
diff --git a/dev-python/gconf-python/metadata.xml b/dev-python/gconf-python/metadata.xml
new file mode 100644
index 000000000000..e4e250dd8100
--- /dev/null
+++ b/dev-python/gconf-python/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/gcs-oauth2-boto-plugin/Manifest b/dev-python/gcs-oauth2-boto-plugin/Manifest
new file mode 100644
index 000000000000..a0087477a1b5
--- /dev/null
+++ b/dev-python/gcs-oauth2-boto-plugin/Manifest
@@ -0,0 +1,10 @@
+AUX gcs-oauth2-boto-plugin-1.13-py3.patch 2606 SHA256 0e77d01e6d4c8edf826d6f2979b6859210917ebeb004775ed61616448ec4c5bc SHA512 d215e1ef13a4f513f11dce6311352b808bb3f6b991a452fca1becef56b106529606a7a0ec065292e72fb47e6b04ed854293a43cb14ff74d50102d4b43225390a WHIRLPOOL 362b36758eb7694859dbac9de6db4d2c3ec59a015f545e5cf21d06ac57ebbefe77c7a318c4c8ef2d1bf0091796e44cac1c17b577f791a78fbb3568caa39816db
+AUX gcs-oauth2-boto-plugin-1.13-use-friendy-version-checks.patch 347 SHA256 7b08a65bb812dfb6a48fdc50c8f24b9be6fc609bef56df255fc4e60700ceea11 SHA512 b7354d7b195382213018ac4c6924a042da106affb2b9058f664ab5c57b521f0b7164a5249609ecaccfa343114fb8c47d687a861a17b31700c75ee7ca42432bfe WHIRLPOOL b34916e2bbeea71f445d5970c33e1ca71a8759af951aef0fb87f7adcd5ed276167f17a415dc6d705a5bb57f0243941050b8703f0771dfc2fb69eb3a157004bb7
+AUX gcs-oauth2-boto-plugin-1.8-use-friendy-version-checks.patch 345 SHA256 c27b2be5e28a1fa5eb77bf1279a49da673357d4112e7480a3ef80ba1cff02316 SHA512 cc1dc36815a4ffd42867d398f00a702c0677bcfe54ce772ea93a1e641fd9f2ea0f146b25947587c8d40f66a9b45ff1c4038002c518110bd78808565e120f6230 WHIRLPOOL 80c3bffd819efbf8ffb6d4a43a313d6e3500410a8df8f409031e4d87bab58431797ba7ccf546d8369b047566416769a3fc449cdfe4043d48be76db55f2374730
+DIST gcs-oauth2-boto-plugin-1.14.tar.gz 14980 SHA256 dd06a90ee502a4732729a5bf2d56745965b0b2ed68741c140ff09c208c837fbe SHA512 86804a599c969c63587387df21a2396a27509981cc13a3f92bc98a645757362e77c63b68956ebd2663a721bb51993c9e61679db85a67de48d017ddad7de044b7 WHIRLPOOL 35c2eb3c8072994036b525525f22bc23ca3fa2d7fe1688aa324e25daca99f5dbbe62c281bcfb9674b7b0e7f78a2658223715355df74562edf06156854b7638bf
+DIST gcs-oauth2-boto-plugin-1.8.tar.gz 13248 SHA256 cb4f3c608c953c9f6eecbad0dd33c6a2dba283cf1cd332ceaac1a9ba8a17c64b SHA512 5504fc38d58ee68a78ee2b8e6c3757045494d000748382bc26888a65085cec08d2d137c63cb51afd1cef72d31b3f0cac5d40014548cca47c5322a67a7f1ef204 WHIRLPOOL 238ee67cdad11162abe614fad7d6eb6175a27fc132c790e17f4380373b8c8d48906e5ac361c4d3c34fbac85e851bdf6426c3660434bf809d4abca87f6cb995a9
+EBUILD gcs-oauth2-boto-plugin-1.14.ebuild 1442 SHA256 8e087dc4f9dd63154ceaaf4c7b371e824e8c271b32e0fbaeae6370e959ce4e2d SHA512 9bef3d7c9cf276502c5cb940b749fbb22cd2f27eab4a14d208a420dab3d4e08b7deb537b3d16b534d62f2b1a7c30a39a1665b4cbf518d74782c496614a9b65c1 WHIRLPOOL 8ea1d30f8f38f138cb935cb6f6d5e6301b73c8565d1d10248af4b2da2f8a15d0eb7d3616d1c3a6d5739ced96f93f1dc306d524b3a6f698d0c446173f97f3c619
+EBUILD gcs-oauth2-boto-plugin-1.8-r1.ebuild 1042 SHA256 d881de53b304ab5fec131856d8ca8c98f04ee08656fd5ff4c352826436a50770 SHA512 fae2c7e75e0fc786ce8b69489189615bcfdc4c6b061a83ec1b67d31ef8dcff681e2e41be50deebea35c9561e25cbfcc152b5401dea32ce182eb3931183985b01 WHIRLPOOL 48720d95bebc2dfb526746172063031d202a6ce2d3290f49e92bd7745815f5d244a8bb9b3a846f16d4e828fe31c2af6e713698e013defb1f4be2719707f54eef
+MISC ChangeLog 4508 SHA256 23d521bfa7a91260f01594f25163d278d32259c76c73b4056d878a0d5ef0c76c SHA512 46f5d31808aec60b9cc5e09e51b321912db1e7d90f130ec24bd866b80ba19046d2dc8acf1e18e8e037213e881f504c37b4ca210fcd12a49175f9d57ece76a72f WHIRLPOOL 4be3a83054b33acdd6c1d130d45926e97af4ead02086e519a2cc4b4ba080dc001a9356b1f521672bffdc0095e23cf056713956a691f0f412f64e50da886a0829
+MISC ChangeLog-2015 1663 SHA256 3b7ca678516c11c5f971c86baceb96b65cefa779d00552946dd020a284ac6dc8 SHA512 94aceab6716fd697561a7b913c5cbd67ddaf5d306f893a817f41270cbabd0073fa8572ea4e499fdb686fa5e8ebb8f63fd5c92ff7497a9a8a5c7aad9feaa95b5b WHIRLPOOL b4f5b6e4dc8bf552a8529e6f0ef3b21a6883bd4afac5be7bbd5a28b87e705c0480a678d90f3592ccbc3d858812a75d96ceb4428ef0d1a1bb0b55d57ace370f37
+MISC metadata.xml 335 SHA256 1c05ccebe4ee11783aca56fa532b2241bea9d204b57276e2068e3a48c5f78642 SHA512 cb494f35eba6442585175997cb16c7d4f6eea841e56f2828386f0894e68a7d917c010264bea46d7b6ae1957633763c66a5b669606fd8b0fcba3b4555fa926807 WHIRLPOOL aa4b871a67355df816868d5ba9bc711266f550f7b40d9b5805ad87eddc4c464d230962d1112b619e920e2f9c267e61aeabdd7dc5346cc0f1aefceec3994e6777
diff --git a/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.13-py3.patch b/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.13-py3.patch
new file mode 100644
index 000000000000..15f6fc373779
--- /dev/null
+++ b/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.13-py3.patch
@@ -0,0 +1,60 @@
+https://github.com/GoogleCloudPlatform/gcs-oauth2-boto-plugin/pull/18
+
+--- a/gcs_oauth2_boto_plugin/oauth2_client.py
++++ b/gcs_oauth2_boto_plugin/oauth2_client.py
+@@ -122,7 +122,7 @@ except ImportError:
+           retval.token_expiry = datetime.datetime.strptime(
+               data['token_expiry'], EXPIRY_FORMAT)
+         return retval
+-      except KeyError, e:
++      except KeyError as e:
+         raise Exception('Your JSON credentials are invalid; '
+                         'missing required entry %s.' % e[0])
+   # pylint: enable=protected-access
+@@ -274,7 +274,7 @@ class FileSystemTokenCache(TokenCache):
+       flags |= os.O_BINARY
+ 
+     try:
+-      fd = os.open(cache_file, flags, 0600)
++      fd = os.open(cache_file, flags, 0o0600)
+     except (OSError, IOError) as e:
+       LOG.warning('FileSystemTokenCache.PutToken: '
+                   'Failed to create cache file %s: %s', cache_file, e)
+@@ -633,7 +633,7 @@ class OAuth2UserAccountClient(OAuth2Client):
+       return AccessToken(
+           credentials.access_token, credentials.token_expiry,
+           datetime_strategy=self.datetime_strategy)
+-    except AccessTokenRefreshError, e:
++    except AccessTokenRefreshError as e:
+       if 'Invalid response 403' in e.message:
+         # This is the most we can do at the moment to accurately detect rate
+         # limiting errors since they come back as 403s with no further
+@@ -669,7 +669,7 @@ class OAuth2GCEClient(OAuth2Client):
+       http = httplib2.Http()
+       response, content = http.request(META_TOKEN_URI, method='GET',
+                                        body=None, headers=META_HEADERS)
+-    except Exception, e:
++    except Exception as e:
+       raise GsAccessTokenRefreshError(e)
+ 
+     if response.status == 200:
+@@ -695,7 +695,7 @@ def _IsGCE():
+     # this approach, we'll avoid having to enumerate all possible non-transient
+     # socket errors.
+     return False
+-  except Exception, e:  # pylint: disable=broad-except
++  except Exception as e:  # pylint: disable=broad-except
+     LOG.warning("Failed to determine whether we're running on GCE, so we'll"
+                 "assume that we aren't: %s", e)
+     return False
+--- a/gcs_oauth2_boto_plugin/test_oauth2_client.py
++++ b/gcs_oauth2_boto_plugin/test_oauth2_client.py
+@@ -248,7 +248,7 @@ class FileSystemTokenCacheTest(unittest.TestCase):
+     # Assert that the cache file exists and has correct permissions.
+     if not IS_WINDOWS:
+       self.assertEquals(
+-          0600,
++          0o0600,
+           stat.S_IMODE(os.stat(self.cache.CacheFileName(self.key)).st_mode))
+ 
+   def testPutGet(self):
diff --git a/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.13-use-friendy-version-checks.patch b/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.13-use-friendy-version-checks.patch
new file mode 100644
index 000000000000..334ee5e90c96
--- /dev/null
+++ b/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.13-use-friendy-version-checks.patch
@@ -0,0 +1,13 @@
+--- a/setup.py
++++ b/setup.py
+@@ -36,9 +36,7 @@
+     'httplib2>=0.8',
+     'oauth2client>=1.5.2, !=2.0.*',
+     'pyOpenSSL>=0.13',
+-    # Not using 1.02 because of:
+-    #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
+-    'SocksiPy-branch==1.01',
++    'SocksiPy-branch>=1.01',
+     'retry_decorator>=1.0.0',
+     'six>=1.6.1'
+ ]
diff --git a/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.8-use-friendy-version-checks.patch b/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.8-use-friendy-version-checks.patch
new file mode 100644
index 000000000000..c89b7a69b461
--- /dev/null
+++ b/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.8-use-friendy-version-checks.patch
@@ -0,0 +1,13 @@
+--- a/setup.py
++++ b/setup.py
+@@ -36,9 +36,7 @@ requires = [
+     'httplib2>=0.8',
+     'google-api-python-client>=1.1',
+     'pyOpenSSL>=0.13',
+-    # Not using 1.02 because of:
+-    #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
+-    'SocksiPy-branch==1.01',
++    'SocksiPy-branch>=1.01',
+     'retry_decorator>=1.0.0',
+ ]
+ 
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.14.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.14.ebuild
new file mode 100644
index 000000000000..660f8c57b1eb
--- /dev/null
+++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.14.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
+HOMEPAGE="https://pypi.python.org/pypi/gcs-oauth2-boto-plugin"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+# The tests only work with py2 atm.
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.13-use-friendy-version-checks.patch"
+	"${FILESDIR}/${PN}-1.13-py3.patch"
+)
+
+# Keep versions in sync with setup.py.
+DEPEND="${PYTHON_DEPS}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
+	!=dev-python/oauth2client-2.0*
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -i \
+		-e '/SocksiPy-branch/d' \
+		setup.py || die
+	# Make sure the unittests aren't installed.
+	mv gcs_oauth2_boto_plugin/test_oauth2_client.py ./ || die
+}
+
+python_test() {
+	${EPYTHON} "${S}"/test_oauth2_client.py || die
+}
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild
new file mode 100644
index 000000000000..690677bd6003
--- /dev/null
+++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
+HOMEPAGE="https://pypi.python.org/pypi/gcs-oauth2-boto-plugin"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-use-friendy-version-checks.patch"
+)
+
+# Keep versions in sync with setup.py.
+DEPEND="${PYTHON_DEPS}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed \
+		-e '/SocksiPy-branch/d' \
+		-i setup.py || die
+}
diff --git a/dev-python/gcs-oauth2-boto-plugin/metadata.xml b/dev-python/gcs-oauth2-boto-plugin/metadata.xml
new file mode 100644
index 000000000000..fa87f777eb4f
--- /dev/null
+++ b/dev-python/gcs-oauth2-boto-plugin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">gcs-oauth2-boto-plugin</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/gdata/Manifest b/dev-python/gdata/Manifest
new file mode 100644
index 000000000000..ef5e5803a8dc
--- /dev/null
+++ b/dev-python/gdata/Manifest
@@ -0,0 +1,5 @@
+DIST gdata-2.0.18.tar.gz 2475552 SHA256 56e7d22de819c22b13ceb0fe1869729b4287f89ebbd4bb55380d7bcf61a1fdb6 SHA512 57d01a8e41fd7507621c10a4ea3e66223aa1d481365269daecdb5ef1bd725915448bcfa5aca9bef3a7fb4b735627d7916b7f971f1c05d7bf840069346e98ceef WHIRLPOOL a3ed7e084436ad858b35970ebc0b73216ca4f041448c1916c0e1ba28f9b6135c0aa80dfb3aa6a5cf31ba6ca0b999e3633e2d6801e5c2c495da0d40feac61afe6
+EBUILD gdata-2.0.18.ebuild 841 SHA256 f261c9a9064711a2eda6c14ab1514037e744f97b128d7f0ea39526ae4347a3be SHA512 9f935f662df3e8189d3323f320b5b201290c16dc27006369c1ae8e1041461375f87f9aae329a7e13f7c4da38950af3778842f8088b61d4d2b3565de1659a8e38 WHIRLPOOL bc464a76590d56ae464bb9f8d8dc0181eff456c83183cbf28a80d54e4055a7b182f380631f584c3fe506799b5bc2b04c7ea35bddab673f43cfca837445de2591
+MISC ChangeLog 3690 SHA256 4f3c8446c309bd35d97ec5156e865574ae17e247c1aff6ec7711437f5226b66b SHA512 d77293fe255f5e3a8467b9847e56e9d1191efc3d1e2f2d0581e3b919723a8e3f67740b86ead3d2b15ae124316a005799b2311d8df28607db5e2264ade68a1dfa WHIRLPOOL 42ad799d3c21a745e01ef10bccfba756a3118004c0c1105664ed678b9bd8fc5edff58200557639f89f3668b60a6c779ea5a7c6852e3a7a9cb867dfc873dfa768
+MISC ChangeLog-2015 13902 SHA256 6f0627ef442d4ffdf732bcccfca3c5085c7c564bea89c84e6e2d390ccd0a1208 SHA512 ac2a229b4c4d3c42d1261503778e50c788a79ea145d8cd3a46c9afba9adfa1871d697c2e97481988265caa7681aa2034b3481f8d8f3281d307d87ce8c45f4123 WHIRLPOOL 0a9e4ccb1189f49dba27f51ccb96b0c7ceece36b965238e2c4515a28ea8ae9fa5ce91ba33dc27aba3437bafa16f48c6c81986b611e89b3b6cb49b8c0ecc6b2ef
+MISC metadata.xml 374 SHA256 344538006fd55666e7d9a686558d1d74cbe84c14d03c560c3773c517206b4a05 SHA512 d4c66573bcdb0cf9b1f9c61539180de94c57853fbd6241c4049247ca745779284072b39087d90b79ed79f83504dc0551fbc0c62b9a52b5572ae1681af97c41dc WHIRLPOOL ccb68d29c4f550170de6da4f79199cf7660b10c14d7b259423928ab9b5a6cefc518111abe70fb60de78e2d3463ef5face355636c55451a1dc7b6e24d2f39199d
diff --git a/dev-python/gdata/gdata-2.0.18.ebuild b/dev-python/gdata/gdata-2.0.18.ebuild
new file mode 100644
index 000000000000..d29a26b0004e
--- /dev/null
+++ b/dev-python/gdata/gdata-2.0.18.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_REQ_USE="ssl(+),xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python client library for Google data APIs"
+HOMEPAGE="https://github.com/google/gdata-python-client https://pypi.python.org/pypi/gdata"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="examples"
+
+python_test() {
+	# run_service_tests.py requires interaction (and a valid Google account), so skip it.
+	"${PYTHON}" tests/run_data_tests.py -v || die "Test failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( samples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/gdata/metadata.xml b/dev-python/gdata/metadata.xml
new file mode 100644
index 000000000000..84c76180c346
--- /dev/null
+++ b/dev-python/gdata/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">google/gdata-python-client</remote-id>
+		<remote-id type="pypi">gdata</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/gdmodule/Manifest b/dev-python/gdmodule/Manifest
new file mode 100644
index 000000000000..836bd9e24b46
--- /dev/null
+++ b/dev-python/gdmodule/Manifest
@@ -0,0 +1,6 @@
+AUX gdmodule-0.56-fix-libs.patch 2629 SHA256 38221d3d1d1609eb696cbf59e8d1a8b9ea079607fed34eb1c5a5647e22a9c6ee SHA512 eb8993b77f5b893b568d87e572a19caf84ee11e4c0c76a13ef81e7185678bf007d7967e1d68ce56f869bc83cfe502b8f67ab0fee2f7f477e9aa2b4f0017e0a0a WHIRLPOOL ae1c5112cd4a549fc06f7b24f30236b51788ac7e7d10ae6e8eedaf22c04bf72cf45f80eb47c5e672f4257936972e902e659e8ea134f2c08f96c352ac59c92a51
+DIST gdmodule-0.56.tar.gz 48748 SHA256 a3a2fd6378e32f10a348c4db428a91e2c1adc28de6ec35c0619a52e379f4edec SHA512 9570a9c06a1c7d76af760fffe30cfde9a840620c608f0d55123898e030d6f3ab4c91fe75bf02b326f13f4a85ea5429c6a0ec0cd20fdc27fa83e656b81f7cce88 WHIRLPOOL e05702ca2fe129b9548f301a73b8a8b461f060dfef67e7b5135756ab70b6a996c55037c9ec60952a2577ed2468141af20ebe128f5312449b8e909092d6f8c5ad
+EBUILD gdmodule-0.56-r2.ebuild 1104 SHA256 71a4ee2b7aa0fff4e520ef4ddbc943fe493be875983d9a7b9ee16f85291a0028 SHA512 10248982c643358824fe477c38e48389ea84b562e42f8856c90d08c07ef669dc02bab0034f49f373b99632817395506abdf4401512bd3151a62e5ff23c720e8f WHIRLPOOL 8ccd28e1b051204128fbe8ebe7ed4849d7cc1f999118bca3f8142a722232ccc7f02a2a7c3095c41365dddf0ba33edcaa87b3882cca74d1258f999f258f36cc06
+MISC ChangeLog 2475 SHA256 a037c80462847b7b3e904842dbf52cd44ac648712ff8cad8f1d609154f1c865a SHA512 948d6bec6c774443b37cc8d7d51fa28c75b6c5896328979eec6ffdb44e2558af39053ae7b522c78ec2377f343936a70b175ffd6bbbe51d14a98c0ff094212d17 WHIRLPOOL 4f96045e4f8b92201ced763f7480609bd6273671e0fb780752a8539eb8902eb2e0379872d0dcb6e2cd0e3e6d43fbea2826967f56c3624774602db33b63602343
+MISC ChangeLog-2015 1882 SHA256 3d41c6c3ebb3e28d2536a0e4552d7fe3060c62bd28aed0a7d48fe066b17778de SHA512 abf1db04d63be1b11b3a24416159d17e2851db64d5c3a50af1efb6a317e18e4e541c71c26e2c32bbb0eee5f3636ac134b5f135d0b2bfe7d1ce52131fe68773db WHIRLPOOL 72a5b21191cd1e4b07f18719724d801fe386c069bede5c959570998c89ba8ac304537199446d06e3461c269002a41d26c3d0a83e8aa734ba8e7ac2514550da24
+MISC metadata.xml 450 SHA256 db31e8ffa0fa75acf543852a6fb13e8ebb573c43614964f3ea1a102821fd92ac SHA512 58ab6153c0955e9d9e37fe1b43c3b92cfd3133bdb9f0b52df7618d21fa14170cab255a06d88a110a0bfef09da6cf51c13bc8904d15d1585bd4cc1743b7846900 WHIRLPOOL dc46cbbd98ab1be2fb692e25fefba6ac8398b49cf5fa91b239d4c794a4d7f38117b6ec20d4e35d827c55a1c56a3520999a6ed47d2cc0f4eb906d8e48f736e2a9
diff --git a/dev-python/gdmodule/files/gdmodule-0.56-fix-libs.patch b/dev-python/gdmodule/files/gdmodule-0.56-fix-libs.patch
new file mode 100644
index 000000000000..bb46490986a9
--- /dev/null
+++ b/dev-python/gdmodule/files/gdmodule-0.56-fix-libs.patch
@@ -0,0 +1,116 @@
+--- Setup.py.orig	2005-03-11 04:29:59.000000000 +0000
++++ Setup.py	2010-12-06 07:15:26.332707178 +0000
+@@ -1,102 +1,11 @@
+ # Setup for gdmodule 0.50 and later
+ 
+ from distutils.core import setup, Extension
+-import os, glob, sys, string
+ 
+ # version of this gdmodule package
+ this_version = "0.56"
+ 
+-# directory existence tester
+-
+-def dirtest(lst):
+-    rlst = []
+-    for d in lst:
+-        try:
+-            if os.listdir(d):
+-                rlst.append(d)
+-        except:
+-            pass
+-    return rlst
+-
+-def filetest(path, names):
+-    rlst = []
+-    for d in path:
+-        for i in range(len(names)):
+-            found = glob.glob(os.path.join(d, "lib%s.*" % names[i]))
+-            if found:
+-                rlst.append(names[i])
+-                names[i] = None
+-        names = filter(None, names)
+-    return rlst
+-
+-def remove(itm, lst):
+-    r = range(len(lst))
+-    r.reverse()
+-    for i in r:
+-        if lst[i] == itm:
+-            del lst[i]
+-
+-# library_dirs option is rather non-portable, but since I am targetting
+-# Unixoid OS's I will just look for the usual suspects.
+-
+-libdirs = dirtest([
+-    "/usr/local/lib", "/sw/lib", "/usr/lib",
+-    "/usr/lib/X11", "/usr/X11R6/lib",
+-    "/opt/gnome/lib",
+-])
+-
+-# include_dirs are also non-portable; same trick here.
+-
+-incdirs = dirtest([
+-    "/usr/local/include", "/sw/include", "/usr/include",
+-    "/usr/include/X11", "/usr/X11R6/include",
+-    "/opt/gnome/include",
+-])
+-
+-# Try to identify our libraries
+-
+-want_libs = [
+-    "gd",
+-    "jpeg", "png", "gif", "z",
+-    "X11", "Xpm",
+-    "ttf", "freetype",
+-]
+-
+-libs = filetest(libdirs, want_libs)
+-
+-missing = []
+-
+-for l in want_libs:
+-    if l and l not in libs:
+-        missing.append(l)
+-
+-if missing:
+-    print "WARNING:  Missing", string.join(missing, ", "), "Libraries"
+-
+-# hand-clean the libs
+-
+-if "gd" not in libs:
+-    print "Can't find GD library."
+-    sys.exit(0)
+-
+-if "ttf" in libs and "freetype" in libs:
+-    remove("ttf", libs)
+-
+-if "Xpm" in libs and "X11" not in libs:
+-    remove("Xpm", libs)
+-
+-if "png" in libs and "z" not in libs:
+-    remove("png", libs)
+-
+-if "z" in libs and "png" not in libs:
+-    remove("png", libs)
+-
+-# build the macro list
+-
+-macros = []
+-
+-for l in libs:
+-    macros.append(( "HAVE_LIB%s" % l.upper(), None ))
++libs = [ "gd" ]
+ 
+ # OK, now do it!
+ 
+@@ -111,8 +20,7 @@
+     py_modules=["gd"],
+     ext_modules=[
+         Extension("_gd", ["_gdmodule.c"], 
+-            include_dirs=incdirs, library_dirs=libdirs,
+-            libraries=libs, define_macros=macros)],
++            libraries=libs)],
+ )
+ 
+ # end of file... I guess we're done.
diff --git a/dev-python/gdmodule/gdmodule-0.56-r2.ebuild b/dev-python/gdmodule/gdmodule-0.56-r2.ebuild
new file mode 100644
index 000000000000..0ca691c8e2af
--- /dev/null
+++ b/dev-python/gdmodule/gdmodule-0.56-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Python extensions for gd"
+HOMEPAGE="https://github.com/Solomoriah/gdmodule"
+SRC_URI="http://newcenturycomputers.net/projects/download.cgi/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x86-linux"
+IUSE="jpeg png truetype xpm"
+
+RDEPEND="
+	media-libs/gd[jpeg?,png?,truetype?,xpm?]
+	media-libs/giflib
+	jpeg? ( virtual/jpeg:0 )
+	png? ( media-libs/libpng:0 )
+	truetype? ( media-libs/freetype:2 )
+	xpm? ( x11-libs/libXpm )"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-libs.patch )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	mv Setup.py setup.py  || die
+
+	# append unconditionally because it is enabled id media-libs/gd by default
+	append-cppflags -DHAVE_LIBGIF
+
+	use jpeg && append-cppflags -DHAVE_LIBJPEG
+	use png && append-cppflags -DHAVE_LIBPNG
+	use truetype && append-cppflags -DHAVE_LIBFREETYPE
+	use xpm && append-cppflags -DHAVE_LIBXPM
+}
diff --git a/dev-python/gdmodule/metadata.xml b/dev-python/gdmodule/metadata.xml
new file mode 100644
index 000000000000..6304ac511407
--- /dev/null
+++ b/dev-python/gdmodule/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  This module is a python wrapper for the GD library.
+</longdescription>
+  <upstream>
+    <remote-id type="github">Solomoriah/gdmodule</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest
new file mode 100644
index 000000000000..90eec7cc04b0
--- /dev/null
+++ b/dev-python/genshi/Manifest
@@ -0,0 +1,10 @@
+AUX genshi-0.7-fix_tests_failure_with_python27.patch 1093 SHA256 850ae2eccc262e116dcf8990c63afd424b629a86f996e1a4832cad3278b68c66 SHA512 adf85e1c13c691b1dbbaeea4725a9b5a8ff8d7c6d485196e3537b6e3f6beca6eeb43a7fe452cdfc4612c8be39e9495606377f17854d0778eabd95db13d40d629 WHIRLPOOL fa13dea5d4fc8f4020a6f422fbdced52de80c8a9e924cfdfdf208e5e5fba2a936464dc70e9ac2739f83407f43de7989eb5fa8566dff18427eb2241d51b97e0ec
+AUX genshi-0.7-issue566.patch 2230 SHA256 f9de16d1004123b5b4cd32ab9ba0703cc2edd0b7eb1e182f80a8c5e486dfc90c SHA512 a1d9223326ef84566c2f5a4be82012295e1918eceb21fdfaa0f74f28bb21e95646a8188331abebb0e3b1b5cb12ba50d2917eba1d74ea6254581fe3acdddf1b80 WHIRLPOOL 2dfa93aaf001c278dc67838b9da590852c99398fa4d8e2dcb74d9e9a6e46b14ef5449836577f3a032ec1e59f1872467e9338dd84bb16121a806c85b5150c64e5
+AUX genshi-0.7-issue582.patch 12766 SHA256 c0dcb041b1b1552e0f9e704b6caabfe44c2edd6777ec91a20f540be5c2fc2d91 SHA512 100f2e76d4e9fdad8dbe9c1f70111be597dbdfd5d3efe9d6c4908fa789bc7300311346929106606185834870a8999abe2165ccac3efa94560543c7c5100f9d24 WHIRLPOOL 0251175e31454076be147eb482ae6e76beabeb652b4e1bfba4c9e29e5936356ceca7bcb8c125bb6f1bc4a5e3d1de57b0b96eab8c10623a53e20e683c61898f71
+AUX genshi-0.7-issue602.patch 4504 SHA256 64f756377ac63cbdfe2ad1bba0a382ad797eb2e86456f963596595e0a0adb5e0 SHA512 59a47ac114065aa398b4795880a02ee98d9605b1a52b53221c4c0efde28b43473d773b9f84ce7c1b954160b5103f53566d739fe39842e6dc6efb6edc61172999 WHIRLPOOL dd2bda14f2cef43d0b685457cee3955b5079ea11b49b0d8e08ae64529671ec097690204498fdb2dcc1d3cd79ee046da5d69fae0edf2081d939537d5e31777984
+DIST Genshi-0.7.tar.gz 491579 SHA256 1d154402e68bc444a55bcac101f96cb4e59373100cc7a2da07fbf3e5cc5d7352 SHA512 2d0042d4da4566725ddd80b73c5b7be09f479f5529e4aa69903edc2a98905ff6de42a0d5a6f02986d7962deb7740c4a3acf6955a8b77fdb42d3cf4ca037de6bf WHIRLPOOL 5e1a7af061d28a581c8a028ae7343a2b80697eb8bca01c8609345a3f2146db190a596d3488c0bde5aa132ac930d591ff1babd033ccb532c7cac7d2931751f906
+EBUILD genshi-0.7-r1.ebuild 1094 SHA256 3f60551035723ff764c6344d9c77940a557f2da5807ac930df5dd77a49764236 SHA512 84e682866124d2bd00e3213225fa27e88453e2c6a444723128b4492e730f2620d60f29c57a45eca32c30f4d06db9505a97d7807317b9a4668379221e20a18932 WHIRLPOOL 228c156813dad1aafe0acd3c9600f75af34b55124b5bd0798b8cfd3ba5efc291c588c4daec2342ff5f3237a5cc1e83569b767b61784c38f956b11730c852687e
+EBUILD genshi-0.7.ebuild 869 SHA256 7a7dc4c0f979b6ba929391a71ad690d2d0064466b0e161b2707937bacd784982 SHA512 e7959ee3a8927a7e7b3febf64ca78bf5dc95edadd13587b8c3b19150cd5c726cacff40cdef8cfd4cc9430a7883043b016567e958288253c3a4cb48ab1bbccadb WHIRLPOOL c50b688356dd6c63559a406570b4c47c2c507205d17fbd918cc827cd6b085a4b6030b9d5f758f2d334d1b48678653ebfda31d2936253899f621c5ff3ccaae211
+MISC ChangeLog 2933 SHA256 db3b5e40ec02badf8935bd7a8eda6114ecc5f62e1e7a5c0e78ee45cb02bf5137 SHA512 c0467603864fbbe63526bcbcb66a0ce08512355b85613e09792806463e49513e81fbfb0503aac2a0fd71a265e0fb55b2209a72ddb0021ee45a3fe68ebf02013e WHIRLPOOL 197b419af6af0b9d45ef973e86657a0b6930af09e5ca4b577e31526452a6b9bc859e4e87747e2dd67482d3a39d392d81700ecbf59c3c6738e4bfb1394bc6810f
+MISC ChangeLog-2015 5431 SHA256 1cfb0b19ecaf516389e0904269d402cdfd19a4aee50bafaf7d0810cae8709096 SHA512 fed1b805756f1c66a93e4ae7a164a9064203daf9da04b11609ce47e37627eafbfae1ec44d08507878549a24d23f4ed0c63f5bdb2f0f63385561b2075c0ae149f WHIRLPOOL 2b9e1c3f31d78dd18559c3a00bd5843414215b5579d36272fdd097484b838781bcd3c10bb5107128c87e0fa931b6f4c625096591a62195ceba87c2011e0d9d6f
+MISC metadata.xml 246 SHA256 634432e12556106844e569b7ff16962881c6e70887e6fc9650bdd82deb51a834 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc WHIRLPOOL 869ef1c8e23bdae0a11b44ccf38ddec23f0dc0ae2573bc83ccbe2d8a2c6bf5a3f9c3c52149aa2e3690dd66f7fc7ec498f2eb6b9d338440fb54c12d5ac0b9fb7a
diff --git a/dev-python/genshi/files/genshi-0.7-fix_tests_failure_with_python27.patch b/dev-python/genshi/files/genshi-0.7-fix_tests_failure_with_python27.patch
new file mode 100644
index 000000000000..4f3467d64815
--- /dev/null
+++ b/dev-python/genshi/files/genshi-0.7-fix_tests_failure_with_python27.patch
@@ -0,0 +1,25 @@
+From 7f3552a9373fadd2d37ff592769ba6c65755eea5 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 09:13:47 -0700
+Subject: Skip test which still fails in Python 2.7.6.
+
+Author: Barry Warsaw <barry@debian.org>, Arnaud Fontaine <arnau@debian.org>
+Bug: http://genshi.edgewall.org/ticket/500
+
+Patch-Name: fix_tests_failure_with_python27.patch
+---
+ genshi/filters/tests/test_html.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/genshi/filters/tests/test_html.py b/genshi/filters/tests/test_html.py
+index 0c6cfe1..a8cfa04 100644
+--- a/genshi/filters/tests/test_html.py
++++ b/genshi/filters/tests/test_html.py
+@@ -410,6 +410,7 @@ class HTMLSanitizerTestCase(unittest.TestCase):
+         html = HTML(u'&junk;')
+         self.assertEquals('&amp;junk;', (html | HTMLSanitizer()).render())
+ 
++    @unittest.skip('http://genshi.edgewall.org/ticket/500#comment:3')
+     def test_sanitize_remove_script_elem(self):
+         html = HTML(u'<script>alert("Foo")</script>')
+         self.assertEquals('', (html | HTMLSanitizer()).render())
diff --git a/dev-python/genshi/files/genshi-0.7-issue566.patch b/dev-python/genshi/files/genshi-0.7-issue566.patch
new file mode 100644
index 000000000000..70fc8ea85e64
--- /dev/null
+++ b/dev-python/genshi/files/genshi-0.7-issue566.patch
@@ -0,0 +1,57 @@
+From fafbc4296902b2259c23d2ce55996b0127726b4f Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 09:13:49 -0700
+Subject: Fix an IndexError preventing Genshi for uploading attachments in
+
+ Trac for users with non-English language settings.
+Origin: http://genshi.edgewall.org/changeset/1243?format=diff&new=1243
+Bug: http://genshi.edgewall.org/ticket/566
+
+Patch-Name: issue566.patch
+---
+ genshi/filters/i18n.py       |  8 +++++++-
+ genshi/filters/tests/i18n.py | 12 ++++++++++++
+ 2 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/genshi/filters/i18n.py b/genshi/filters/i18n.py
+index dfb52b8..8f2d25c 100644
+--- a/genshi/filters/i18n.py
++++ b/genshi/filters/i18n.py
+@@ -1048,7 +1048,13 @@ class MessageBuffer(object):
+ 
+         while parts:
+             order, string = parts.pop(0)
+-            events = self.events[order].pop(0)
++            events = self.events[order]
++            if events:
++                events = events.pop(0)
++            else:
++                # create a dummy empty text event so any remaining
++                # part of the translation can be processed.
++                events = [(TEXT, "", (None, -1, -1))]
+             parts_counter[order].pop()
+ 
+             for event in events:
+diff --git a/genshi/filters/tests/i18n.py b/genshi/filters/tests/i18n.py
+index 212d5f6..b36a30b 100644
+--- a/genshi/filters/tests/i18n.py
++++ b/genshi/filters/tests/i18n.py
+@@ -928,6 +928,18 @@ class MsgDirectiveTestCase(unittest.TestCase):
+           """</p></html>""",
+           tmpl.generate(first="FIRST", second="SECOND").render())
+ 
++    def test_translate_i18n_msg_ticket_404_regression(self):
++        tmpl = MarkupTemplate("""<html xmlns:py="http://genshi.edgewall.org/"
++            xmlns:i18n="http://genshi.edgewall.org/i18n">
++          <h1 i18n:msg="name">text <a>$name</a></h1>
++        </html>""")
++        gettext = lambda s: u'head [1:%(name)s] tail'
++        translator = Translator(gettext)
++        translator.setup(tmpl)
++        self.assertEqual("""<html>
++          <h1>head <a>NAME</a> tail</h1>
++        </html>""", tmpl.generate(name='NAME').render())
++
+ 
+ class ChooseDirectiveTestCase(unittest.TestCase):
+ 
diff --git a/dev-python/genshi/files/genshi-0.7-issue582.patch b/dev-python/genshi/files/genshi-0.7-issue582.patch
new file mode 100644
index 000000000000..fbcab626d6c4
--- /dev/null
+++ b/dev-python/genshi/files/genshi-0.7-issue582.patch
@@ -0,0 +1,364 @@
+From 554fa3428bea3039decfd9064b860c753b2637a1 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 09:13:48 -0700
+Subject: Make genshi 0.7 compatible with Python 3.4.
+
+Origin: http://genshi.edgewall.org/changeset/1252?format=diff&new=1252
+Bug: http://genshi.edgewall.org/ticket/582
+Forwarded: not-needed
+
+Patch-Name: issue582.patch
+---
+ doc/upgrade.txt                   |  8 ++---
+ genshi/compat.py                  | 10 +++++-
+ genshi/filters/tests/test_html.py | 14 ++++++---
+ genshi/template/astutil.py        | 66 ++++++++++++++++++++++++++++-----------
+ genshi/template/eval.py           | 37 +++++++++++++---------
+ genshi/template/tests/eval.py     | 23 ++++++++++++++
+ run_benchmarks.sh                 | 31 ++++++++++++++++++
+ setup.py                          |  6 +++-
+ 8 files changed, 151 insertions(+), 44 deletions(-)
+ create mode 100644 run_benchmarks.sh
+
+diff --git a/doc/upgrade.txt b/doc/upgrade.txt
+index b240eda..ad4c080 100644
+--- a/doc/upgrade.txt
++++ b/doc/upgrade.txt
+@@ -7,11 +7,11 @@ Upgrading Genshi
+    :depth: 2
+ .. sectnum::
+ 
+-------------------------------------------------------
+-Upgrading from Genshi 0.6.x to the development version
+-------------------------------------------------------
++-------------------------------------------
++Upgrading from Genshi 0.6.x to Genshi 0.7.x
++-------------------------------------------
+ 
+-The Genshi development version now supports both Python 2 and Python 3.
++Genshi 0.7.x now supports both Python 2 and Python 3.
+ 
+ The most noticable API change in the Genshi development version is that the
+ default encoding in numerous places is now None (i.e. unicode) instead
+diff --git a/genshi/compat.py b/genshi/compat.py
+index 9787325..6574e39 100644
+--- a/genshi/compat.py
++++ b/genshi/compat.py
+@@ -35,6 +35,15 @@ else:
+                 'Python 2 compatibility function. Not usable in Python 3.')
+ 
+ 
++# We need to test if an object is an instance of a string type in places
++
++if IS_PYTHON2:
++    def isstring(obj):
++        return isinstance(obj, basestring)
++else:
++    def isstring(obj):
++        return isinstance(obj, str)
++
+ # We need to differentiate between StringIO and BytesIO in places
+ 
+ if IS_PYTHON2:
+@@ -112,4 +121,3 @@ except NameError:
+             if not x:
+                 return False
+         return True
+-
+diff --git a/genshi/filters/tests/test_html.py b/genshi/filters/tests/test_html.py
+index a8cfa04..7120988 100644
+--- a/genshi/filters/tests/test_html.py
++++ b/genshi/filters/tests/test_html.py
+@@ -368,12 +368,16 @@ def StyleSanitizer():
+ 
+ class HTMLSanitizerTestCase(unittest.TestCase):
+ 
+-    def assert_parse_error_or_equal(self, expected, exploit):
++    def assert_parse_error_or_equal(self, expected, exploit,
++                                    allow_strip=False):
+         try:
+             html = HTML(exploit)
+         except ParseError:
+             return
+-        self.assertEquals(expected, (html | HTMLSanitizer()).render())
++        sanitized_html = (html | HTMLSanitizer()).render()
++        if not sanitized_html and allow_strip:
++            return
++        self.assertEquals(expected, sanitized_html)
+ 
+     def test_sanitize_unchanged(self):
+         html = HTML(u'<a href="#">fo<br />o</a>')
+@@ -417,10 +421,12 @@ class HTMLSanitizerTestCase(unittest.TestCase):
+         html = HTML(u'<SCRIPT SRC="http://example.com/"></SCRIPT>')
+         self.assertEquals('', (html | HTMLSanitizer()).render())
+         src = u'<SCR\0IPT>alert("foo")</SCR\0IPT>'
+-        self.assert_parse_error_or_equal('&lt;SCR\x00IPT&gt;alert("foo")', src)
++        self.assert_parse_error_or_equal('&lt;SCR\x00IPT&gt;alert("foo")', src,
++                                         allow_strip=True)
+         src = u'<SCRIPT&XYZ SRC="http://example.com/"></SCRIPT>'
+         self.assert_parse_error_or_equal('&lt;SCRIPT&amp;XYZ; '
+-                                         'SRC="http://example.com/"&gt;', src)
++                                         'SRC="http://example.com/"&gt;', src,
++                                         allow_strip=True)
+ 
+     def test_sanitize_remove_onclick_attr(self):
+         html = HTML(u'<div onclick=\'alert("foo")\' />')
+diff --git a/genshi/template/astutil.py b/genshi/template/astutil.py
+index b24f728..e561846 100644
+--- a/genshi/template/astutil.py
++++ b/genshi/template/astutil.py
+@@ -21,7 +21,7 @@ else:
+     def parse(source, mode):
+         return compile(source, '', mode, _ast.PyCF_ONLY_AST)
+ 
+-from genshi.compat import IS_PYTHON2
++from genshi.compat import IS_PYTHON2, isstring
+ 
+ __docformat__ = 'restructuredtext en'
+ 
+@@ -103,32 +103,48 @@ class ASTCodeGenerator(object):
+         self._new_line()
+         return self.visit(node.body)
+ 
++    # Python < 3.4
+     # arguments = (expr* args, identifier? vararg,
+     #              identifier? kwarg, expr* defaults)
++    #
++    # Python >= 3.4
++    # arguments = (arg* args, arg? vararg, arg* kwonlyargs, expr* kw_defaults,
++    #              arg? kwarg, expr* defaults)
+     def visit_arguments(self, node):
+-        first = True
+-        no_default_count = len(node.args) - len(node.defaults)
+-        for i, arg in enumerate(node.args):
+-            if not first:
+-                self._write(', ')
++        def write_possible_comma():
++            if _first[0]:
++                _first[0] = False
+             else:
+-                first = False
+-            self.visit(arg)
+-            if i >= no_default_count:
+-                self._write('=')
+-                self.visit(node.defaults[i - no_default_count])
+-        if getattr(node, 'vararg', None):
+-            if not first:
+                 self._write(', ')
++        _first = [True]
++
++        def write_args(args, defaults):
++            no_default_count = len(args) - len(defaults)
++            for i, arg in enumerate(args):
++                write_possible_comma()
++                self.visit(arg)
++                default_idx = i - no_default_count
++                if default_idx >= 0 and defaults[default_idx] is not None:
++                    self._write('=')
++                    self.visit(defaults[i - no_default_count])
++
++        write_args(node.args, node.defaults)
++        if getattr(node, 'vararg', None):
++            write_possible_comma()
++            self._write('*')
++            if isstring(node.vararg):
++                self._write(node.vararg)
+             else:
+-                first = False
+-            self._write('*' + node.vararg)
++                self.visit(node.vararg)
++        if getattr(node, 'kwonlyargs', None):
++            write_args(node.kwonlyargs, node.kw_defaults)
+         if getattr(node, 'kwarg', None):
+-            if not first:
+-                self._write(', ')
++            write_possible_comma()
++            self._write('**')
++            if isstring(node.kwarg):
++                self._write(node.kwarg)
+             else:
+-                first = False
+-            self._write('**' + node.kwarg)
++                self.visit(node.kwarg)
+ 
+     if not IS_PYTHON2:
+         # In Python 3 arguments get a special node
+@@ -732,6 +748,17 @@ class ASTCodeGenerator(object):
+     def visit_Name(self, node):
+         self._write(node.id)
+ 
++    # NameConstant(singleton value)
++    def visit_NameConstant(self, node):
++        if node.value is None:
++            self._write('None')
++        elif node.value is True:
++            self._write('True')
++        elif node.value is False:
++            self._write('False')
++        else:
++            raise Exception("Unknown NameConstant %r" % (node.value,))
++
+     # List(expr* elts, expr_context ctx)
+     def visit_List(self, node):
+         self._write('[')
+@@ -837,6 +864,7 @@ class ASTTransformer(object):
+     visit_Attribute = _clone
+     visit_Subscript = _clone
+     visit_Name = _clone
++    visit_NameConstant = _clone
+     visit_List = _clone
+     visit_Tuple = _clone
+ 
+diff --git a/genshi/template/eval.py b/genshi/template/eval.py
+index c00cfcb..81644a7 100644
+--- a/genshi/template/eval.py
++++ b/genshi/template/eval.py
+@@ -24,7 +24,8 @@ from genshi.template.astutil import ASTTransformer, ASTCodeGenerator, \
+ from genshi.template.base import TemplateRuntimeError
+ from genshi.util import flatten
+ 
+-from genshi.compat import get_code_params, build_code_chunk, IS_PYTHON2
++from genshi.compat import get_code_params, build_code_chunk, isstring, \
++                          IS_PYTHON2
+ 
+ __all__ = ['Code', 'Expression', 'Suite', 'LenientLookup', 'StrictLookup',
+            'Undefined', 'UndefinedError']
+@@ -495,28 +496,34 @@ class TemplateASTTransformer(ASTTransformer):
+     def __init__(self):
+         self.locals = [CONSTANTS]
+ 
++    def _process(self, names, node):
++        if not IS_PYTHON2 and isinstance(node, _ast.arg):
++            names.add(node.arg)
++        elif isstring(node):
++            names.add(node)
++        elif isinstance(node, _ast.Name):
++            names.add(node.id)
++        elif isinstance(node, _ast.alias):
++            names.add(node.asname or node.name)
++        elif isinstance(node, _ast.Tuple):
++            for elt in node.elts:
++                self._process(names, elt)
++
+     def _extract_names(self, node):
+         names = set()
+-        def _process(node):
+-            if not IS_PYTHON2 and isinstance(node, _ast.arg):
+-                names.add(node.arg)
+-            if isinstance(node, _ast.Name):
+-                names.add(node.id)
+-            elif isinstance(node, _ast.alias):
+-                names.add(node.asname or node.name)
+-            elif isinstance(node, _ast.Tuple):
+-                for elt in node.elts:
+-                    _process(elt)
+         if hasattr(node, 'args'):
+             for arg in node.args:
+-                _process(arg)
++                self._process(names, arg)
++            if hasattr(node, 'kwonlyargs'):
++                for arg in node.kwonlyargs:
++                    self._process(names, arg)
+             if hasattr(node, 'vararg'):
+-                names.add(node.vararg)
++                self._process(names, node.vararg)
+             if hasattr(node, 'kwarg'):
+-                names.add(node.kwarg)
++                self._process(names, node.kwarg)
+         elif hasattr(node, 'names'):
+             for elt in node.names:
+-                _process(elt)
++                self._process(names, elt)
+         return names
+ 
+     def visit_Str(self, node):
+diff --git a/genshi/template/tests/eval.py b/genshi/template/tests/eval.py
+index 7722571..c44a0e3 100644
+--- a/genshi/template/tests/eval.py
++++ b/genshi/template/tests/eval.py
+@@ -590,6 +590,29 @@ x = smash(foo='abc', bar='def')
+         suite.execute(data)
+         self.assertEqual(['bardef', 'fooabc'], sorted(data['x']))
+ 
++    if not IS_PYTHON2:
++        def test_def_kwonlyarg(self):
++            suite = Suite("""
++def kwonly(*args, k):
++    return k
++x = kwonly(k="foo")
++""")
++            data = {}
++            suite.execute(data)
++            self.assertEqual("foo", data['x'])
++
++        def test_def_kwonlyarg_with_default(self):
++            suite = Suite("""
++def kwonly(*args, k="bar"):
++    return k
++x = kwonly(k="foo")
++y = kwonly()
++""")
++            data = {}
++            suite.execute(data)
++            self.assertEqual("foo", data['x'])
++            self.assertEqual("bar", data['y'])
++
+     def test_def_nested(self):
+         suite = Suite("""
+ def doit():
+diff --git a/run_benchmarks.sh b/run_benchmarks.sh
+new file mode 100644
+index 0000000..0c64cc8
+--- /dev/null
++++ b/run_benchmarks.sh
+@@ -0,0 +1,31 @@
++#!/bin/sh
++#
++# 1. Run the tests with `tox` (this will set up all the tox envs).
++# 2. ./run_benchmarks.sh <env-name> | tee results-<env-name>.out
++
++NAME="$1"
++PYTHON="./.tox/$NAME/bin/python"
++BENCH_DIR="bench_build/$1"
++BENCH_BIN_DIR="$BENCH_DIR/bin"
++mkdir -p "bench_build"
++
++rm -rf "$BENCH_DIR"
++cp -R "examples/bench" "$BENCH_DIR"
++
++case "$NAME" in
++  py32|py33)
++    2to3 -w --no-diffs "$BENCH_DIR"
++    ;;
++esac
++
++echo "-- basic --"
++"$PYTHON" "$BENCH_DIR/basic.py" 
++echo
++
++echo "-- bigtable --"
++"$PYTHON" "$BENCH_DIR/bigtable.py"
++echo
++
++echo "-- xpath --"
++"$PYTHON" "$BENCH_DIR/xpath.py"
++echo
+diff --git a/setup.py b/setup.py
+index 294ba9b..45099b5 100755
+--- a/setup.py
++++ b/setup.py
+@@ -65,9 +65,13 @@ available.""")
+ 
+ 
+ if Feature:
++    # Optional C extension module for speeding up Genshi:
++    # Not activated by default on:
++    # - PyPy (where it harms performance)
++    # - CPython >= 3.3 (the new Unicode C API is not supported yet)
+     speedups = Feature(
+         "optional C speed-enhancements",
+-        standard = not is_pypy,
++        standard = not is_pypy and sys.version_info < (3, 3),
+         ext_modules = [
+             Extension('genshi._speedups', ['genshi/_speedups.c']),
+         ],
diff --git a/dev-python/genshi/files/genshi-0.7-issue602.patch b/dev-python/genshi/files/genshi-0.7-issue602.patch
new file mode 100644
index 000000000000..d7f0b77fa921
--- /dev/null
+++ b/dev-python/genshi/files/genshi-0.7-issue602.patch
@@ -0,0 +1,114 @@
+From 1acbd00b4961164edc8a185458ba4a433bedbceb Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 09:13:46 -0700
+Subject: Fix Python 3.5 compatibility issues.
+
+Origin: http://genshi.edgewall.org/attachment/ticket/602/t602.diff
+Bug: http://genshi.edgewall.org/ticket/602
+Forwarded: not-needed
+
+Patch-Name: issue602.patch
+---
+ genshi/filters/i18n.py        |  6 ++++--
+ genshi/template/astutil.py    | 14 +++++++++++---
+ genshi/template/directives.py | 20 ++++++++++++++------
+ genshi/template/eval.py       |  5 +++++
+ 4 files changed, 34 insertions(+), 11 deletions(-)
+
+diff --git a/genshi/filters/i18n.py b/genshi/filters/i18n.py
+index b724956..dfb52b8 100644
+--- a/genshi/filters/i18n.py
++++ b/genshi/filters/i18n.py
+@@ -1187,8 +1187,10 @@ def extract_from_code(code, gettext_functions):
+                 elif arg:
+                     strings.append(None)
+             [_add(arg) for arg in node.args]
+-            _add(node.starargs)
+-            _add(node.kwargs)
++            if hasattr(node, 'starargs'):
++                _add(node.starargs)
++            if hasattr(node, 'kwargs'):
++                _add(node.kwargs)
+             if len(strings) == 1:
+                 strings = strings[0]
+             else:
+diff --git a/genshi/template/astutil.py b/genshi/template/astutil.py
+index a4c21c8..b24f728 100644
+--- a/genshi/template/astutil.py
++++ b/genshi/template/astutil.py
+@@ -135,6 +135,10 @@ class ASTCodeGenerator(object):
+         def visit_arg(self, node):
+             self._write(node.arg)
+ 
++    def visit_Starred(self, node):
++        self._write('*')
++        self.visit(node.value)
++
+     # FunctionDef(identifier name, arguments args,
+     #                           stmt* body, expr* decorator_list)
+     def visit_FunctionDef(self, node):
+@@ -648,9 +652,13 @@ class ASTCodeGenerator(object):
+             if not first:
+                 self._write(', ')
+             first = False
+-            # keyword = (identifier arg, expr value)
+-            self._write(keyword.arg)
+-            self._write('=')
++            if not keyword.arg:
++                # Python 3.5+ star-star args
++                self._write('**')
++            else:
++                # keyword = (identifier arg, expr value)
++                self._write(keyword.arg)
++                self._write('=')
+             self.visit(keyword.value)
+         if getattr(node, 'starargs', None):
+             if not first:
+diff --git a/genshi/template/directives.py b/genshi/template/directives.py
+index 7301c2d..1f70ef6 100644
+--- a/genshi/template/directives.py
++++ b/genshi/template/directives.py
+@@ -266,13 +266,21 @@ class DefDirective(Directive):
+         if isinstance(ast, _ast.Call):
+             self.name = ast.func.id
+             for arg in ast.args:
+-                # only names
+-                self.args.append(arg.id)
++                if hasattr(_ast, 'Starred') and isinstance(arg, _ast.Starred):
++                    # Python 3.5+
++                    self.star_args = arg.value.id
++                else:
++                    # only names
++                    self.args.append(arg.id)
+             for kwd in ast.keywords:
+-                self.args.append(kwd.arg)
+-                exp = Expression(kwd.value, template.filepath,
+-                                 lineno, lookup=template.lookup)
+-                self.defaults[kwd.arg] = exp
++                if kwd.arg is None:
++                    # Python 3.5+
++                    self.dstar_args = kwd.value.id
++                else:
++                    self.args.append(kwd.arg)
++                    exp = Expression(kwd.value, template.filepath,
++                                     lineno, lookup=template.lookup)
++                    self.defaults[kwd.arg] = exp
+             if getattr(ast, 'starargs', None):
+                 self.star_args = ast.starargs.id
+             if getattr(ast, 'kwargs', None):
+diff --git a/genshi/template/eval.py b/genshi/template/eval.py
+index 89aec49..c00cfcb 100644
+--- a/genshi/template/eval.py
++++ b/genshi/template/eval.py
+@@ -593,6 +593,11 @@ class TemplateASTTransformer(ASTTransformer):
+         finally:
+             self.locals.pop()
+ 
++    # Only used in Python 3.5+
++    def visit_Starred(self, node):
++        node.value = self.visit(node.value)
++        return node
++
+     def visit_Name(self, node):
+         # If the name refers to a local inside a lambda, list comprehension, or
+         # generator expression, leave it alone
diff --git a/dev-python/genshi/genshi-0.7-r1.ebuild b/dev-python/genshi/genshi-0.7-r1.ebuild
new file mode 100644
index 000000000000..65360402e2c3
--- /dev/null
+++ b/dev-python/genshi/genshi-0.7-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+
+inherit distutils-r1
+
+MY_P="Genshi-${PV}"
+
+DESCRIPTION="Python toolkit for stream-based generation of output for the web"
+HOMEPAGE="http://genshi.edgewall.org/ https://pypi.python.org/pypi/Genshi"
+SRC_URI="http://ftp.edgewall.com/pub/genshi/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-issue566.patch"
+	epatch "${FILESDIR}/${P}-issue582.patch"
+	epatch "${FILESDIR}/${P}-fix_tests_failure_with_python27.patch"
+	epatch "${FILESDIR}/${P}-issue602.patch"
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc doc/*.txt
+		dohtml -r doc/*
+	fi
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/genshi/genshi-0.7.ebuild b/dev-python/genshi/genshi-0.7.ebuild
new file mode 100644
index 000000000000..e522c7f9b7cd
--- /dev/null
+++ b/dev-python/genshi/genshi-0.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_P="Genshi-${PV}"
+
+DESCRIPTION="Python toolkit for stream-based generation of output for the web"
+HOMEPAGE="http://genshi.edgewall.org/ https://pypi.python.org/pypi/Genshi"
+SRC_URI="http://ftp.edgewall.com/pub/genshi/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc doc/*.txt
+		dohtml -r doc/*
+	fi
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/genshi/metadata.xml b/dev-python/genshi/metadata.xml
new file mode 100644
index 000000000000..e24dd86faa2a
--- /dev/null
+++ b/dev-python/genshi/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/genty/Manifest b/dev-python/genty/Manifest
new file mode 100644
index 000000000000..7128c26cb419
--- /dev/null
+++ b/dev-python/genty/Manifest
@@ -0,0 +1,4 @@
+DIST genty-1.3.2.tar.gz 20818 SHA256 2e3f5bfe2d3a757c0e2a48ac4716bca42d3b76d9cfc3401ef606635049c35dab SHA512 cfe984dfe5af48ba9f4f959a1d0ab1d331d3c2fdb64c680572e5652b845e5c290097ec3ed2b4e472a563cd6ab79489124f6eb212902a05a2f1ce5ff254a82e13 WHIRLPOOL 0c8d5baa90f50ef3434a3daf827c71afb0532585ee2bfdf6261584818d300513ffb5f91a3114c5b521cc4bcfdc101df7ab37141fbb5420eb6c1895ad63d50449
+EBUILD genty-1.3.2.ebuild 741 SHA256 db69abb3b370f90672362c708d09738c58feb5678770c0fe1b4ff67d4c3ab595 SHA512 2a73496b922e59ce2cd3dcb02fd9046415fe410de88998ac0b612ab91a95119d7f693c5c6be6815f2db41d0121ce27ffebbf0a08c30fec83b59f70f922065ce1 WHIRLPOOL 1be1520a77838942775d661658d81b954eb1d843651a586e298c2abd2743cce3cf845c7c0da92a647bb51a493f69c9f37874c86c2158e78dc40b2d9018f24e61
+MISC ChangeLog 2501 SHA256 5b9032a2b89947db2e2f4ecdfbf7b04b1de9093b7612423282089bf2f051ab54 SHA512 299e47fa18079329c8a6c266f9a3479a4f88e13edc21325db8cee9e8496ebf17b82e4730c42bb75f089f6844aa5ebcf2722ed45b1b6e5cad674fc07cb3080fa3 WHIRLPOOL b3cb2fb6cb3549be82082111a08f921c42b5cabf7c8ef4395cc52e499a28d58c3bc57901fc029985d4dbaf234b53690ba39f4759022f664684784f38e210e8d1
+MISC metadata.xml 357 SHA256 a2ab8ef7c10c658c5c57bcd59836ade6243acd74344167152418d5440867e185 SHA512 ba3b3f11913ffc8848a7d2b1637b028812badef52306565f5d0462314d97ddb5795219cc6f674f3dfdc47c3d9b0bce602425b25df99c7227dcc166f1b1f536a0 WHIRLPOOL 14444240d6fa0063cf0c7c31be58cd932e088d2d3d2844a5ab70d8dec31010212d74a8a255cecc4fd2fe7b3ad66596c7ced52425056615221ade6c424a920d7e
diff --git a/dev-python/genty/genty-1.3.2.ebuild b/dev-python/genty/genty-1.3.2.ebuild
new file mode 100644
index 000000000000..f178f57fedd8
--- /dev/null
+++ b/dev-python/genty/genty-1.3.2.ebuild
@@ -0,0 +1,31 @@
+# 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="Allows you to run a test with multiple data sets"
+HOMEPAGE="https://pypi.python.org/pypi/genty https://github.com/box/genty"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# https://github.com/box/genty/issues/42
+RESTRICT=test
+
+python_test() {
+	esetup.py test --verbose
+}
diff --git a/dev-python/genty/metadata.xml b/dev-python/genty/metadata.xml
new file mode 100644
index 000000000000..975b996b7900
--- /dev/null
+++ b/dev-python/genty/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">box/genty</remote-id>
+		<remote-id type="pypi">genty</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/geoalchemy2/Manifest b/dev-python/geoalchemy2/Manifest
new file mode 100644
index 000000000000..4b23ba4c0ac6
--- /dev/null
+++ b/dev-python/geoalchemy2/Manifest
@@ -0,0 +1,4 @@
+DIST geoalchemy2-0.3.tar.gz 93256 SHA256 029550f36695b48452907c834cf23ef24390d81e1e59d19bc2ba2de89e9a4835 SHA512 5f94f6459eba1266c3b31b6d0b1f16478c1641a29b3dbe26cfdc3983d3aa5642b075871fb4722e6bccca7d1960ac1d87103351d846a061891f17d407df4867c8 WHIRLPOOL e99361c67b8cb1ad727d20e649e51f898ed6d426eae866464db7460d8ca36fa78fa5fb055d0e63474b38df42d4f7f2492fe162729b1beb5a1ce27ac1891d14d6
+EBUILD geoalchemy2-0.3.ebuild 808 SHA256 d43f09e7c7c2e0502566ae5308f7ec032e83a6a1270e3c51fa45a6542b89b342 SHA512 57ab430aebdd5a9d1176629c3a0794049da17317d33d7323f42733368199d86a2bd848e06ae430491715f46828a1546319a159110afaebc0f533c77fb80a2220 WHIRLPOOL 0412f2dc50a4ba2e7bc9ee45201a62d3f014b239d59c3f8544654393f5572b5d26bc77d996ad5c1a26f999c74f8ca6f38f563d727d80fd61efdc692d890c63be
+MISC ChangeLog 506 SHA256 1ccb64311cabf9e42cf1620c8fe4c24a0157164819099a1b017f9ae467047988 SHA512 268ffce7c21afc288a6ace1430ae8d4701a13930332425e4bdab4ab0f0f5419686fe66a746a733fc450aee4c18977b364c2ba5c1385bb5fccafd52f86bae422e WHIRLPOOL 33d195ae2d21443cb845b1f927ab31fe0894deb0f0f2fb67aa378a69b686812fab04869686759ac37ee5cc17bcc34c86f6caf16aa30426fd6c39d3e6436e10d7
+MISC metadata.xml 388 SHA256 5e267adeae8c75a2087486e9930aad0bf5b82684ccb452179bb15fd265cf9c5b SHA512 fe5d16f1006eea8b0eead7381650b7a06f547dde06224daede90460e2319b8c3f5eb527125f1004d56d866587003aafc35c0c17518699617798d5d05b3fbd254 WHIRLPOOL 0bec7fc798dad3a3882bff3b5cce79160acad674eaea1c07f64017ed0ad71eb6660132eae9bfedaed86eafe71b608b619261bfb6c833a8f3ff0f9e41308b50e0
diff --git a/dev-python/geoalchemy2/geoalchemy2-0.3.ebuild b/dev-python/geoalchemy2/geoalchemy2-0.3.ebuild
new file mode 100644
index 000000000000..5b71f1c7bfe3
--- /dev/null
+++ b/dev-python/geoalchemy2/geoalchemy2-0.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Geospatial extension to SQLAlchemy with PostGIS support"
+HOMEPAGE="http://geoalchemy.org/ http://geoalchemy-2.readthedocs.org"
+SRC_URI="https://github.com/geoalchemy/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+# ^^ tarball on pypi is missing tests
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		sci-libs/Shapely[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+RESTRICT="test"
+# tests require a running PostgreSQL database
+
+python_test() {
+	py.test tests || die
+}
diff --git a/dev-python/geoalchemy2/metadata.xml b/dev-python/geoalchemy2/metadata.xml
new file mode 100644
index 000000000000..9ef773e0fe0d
--- /dev/null
+++ b/dev-python/geoalchemy2/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">GeoAlchemy2</remote-id>
+    <remote-id type="github">geoalchemy/geoalchemy2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/geoip-python/Manifest b/dev-python/geoip-python/Manifest
new file mode 100644
index 000000000000..6f5d61f7c336
--- /dev/null
+++ b/dev-python/geoip-python/Manifest
@@ -0,0 +1,6 @@
+DIST geoip-api-python-1.3.2.tar.gz 35674 SHA256 95e966e9d62b73a7933434b61b0e09fdf25190047ea4d3b92922e03a7e83034d SHA512 284209a6894d55ef95844c5c4c7aafff99ebcb13996e5ff64a0c31b38677e13c11d51fd8b0250d0fa097f15805c27b572d5aa12c2b217a839afe3cdd0851c414 WHIRLPOOL bd123b2417b2d0aa0e9d91e3b24276b806e470ce7bcd90977676fb3a52af5c5096932c542100221e0aed4723f93e00b5949fa3bc7970ef6f312b4a5512f3dc7d
+EBUILD geoip-python-1.3.2-r1.ebuild 905 SHA256 8f3ce90ac8623bd0def68a0b97e1dea49137c8b4fd5439631109d908f864b617 SHA512 e71a1c2b572ad444c388997ae11c37c78661f4cc4a25eff1fdb5f33285c6e9823d82d435616e5bf60417a4df13b05df1be436eecca5b5bb89308fa04d165ab09 WHIRLPOOL cf5796c319b8750b88c5ebd8bd8ef1494da4138eb767fd285e8158e081f78323fad752d1a10ed3354bfbad2efda1a95b3ac5439179bedb7c432de7955d2267fa
+EBUILD geoip-python-1.3.2.ebuild 972 SHA256 76c25f8bbf8fb5093b3b0abf7aca7e6fd6dd01cac94765b43da53fcd2f28f28c SHA512 6a058db575e1370c2b2d261e83cc0632c86cb3df41324555699bfbc5824bcd61b72810a423f25e1b5c868bdf022ac8d0913973fee474eace182339247a717923 WHIRLPOOL 17285977c4dacdca03959f89ef31c2c8e8e214c0f70aaa59a20ff286c114400fbe376bd38581ea0956400fc82fd6aa1a2b1fc3c39172b1b02a3cef6e40864340
+MISC ChangeLog 2577 SHA256 48e55795cf9d251b36091fe3806013e93d63a68008dc9f18c0a55e737792179d SHA512 31d784225f8c09e5952854e128021f65698462fab835245f350921eb78eaea0b055b7ce373b0d8030ea0d66505c1ac0e784c5af48d11f9c810a3f37755519ea6 WHIRLPOOL 31ad50087cfb3a4f9c2ed90e75d4adced3be1c89e071358419b64fb6b0f33f4c99dbc2efbe7f329984fe14557ab4e85a486db19cd7bcd0703c48f2b6bed9ff21
+MISC ChangeLog-2015 5963 SHA256 ec68dcbfb3be5b1b53e569c647854ee493ba376944e6878c38259db15256bb3c SHA512 ec50da2eae484229eb2313584cc003533d1a890e00bcaad4eb317d1020d0e3fce6fd3e211e0b89d1570c8ef1801eacafabe1f047150aa7f1199363e04c321b5e WHIRLPOOL 64478b108a414850ba8e14ddbe3451623f800b44ae3355e8fa1e2daf183feb2f83c5e47ab99429c619b2d40628801a939635637e7de0cd202c967a8661e58fab
+MISC metadata.xml 372 SHA256 0f157bc3f1b14426d67ac960d032b169ea14a52b180693eeac28f69f07ca6a93 SHA512 dfcd2454bac4830995eda03b9fc585ea4f19f3e5fc90c00b57ee75d8d9596dc5dda9294f770481df7b9c6e27dea45f7fcf1f8d6094703121b0eab62f2fb055a0 WHIRLPOOL 344ba6342ec1d12f20d684aaf8b8217d1d0f3500ae248819df111cbcad2dfaae1b1e6e9930c398187e02acc31405c63e32018b9d176a3151facc39f029f19f8f
diff --git a/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild b/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..06fb375a9292
--- /dev/null
+++ b/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="geoip-api-python"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python bindings for GeoIP"
+HOMEPAGE="https://github.com/maxmind/geoip-api-python"
+SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86 ~x86-fbsd"
+IUSE="examples test"
+
+RDEPEND=">=dev-libs/geoip-1.4.8"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( README.rst ChangeLog.md )
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/geoip-python/geoip-python-1.3.2.ebuild b/dev-python/geoip-python/geoip-python-1.3.2.ebuild
new file mode 100644
index 000000000000..16ee2baa878a
--- /dev/null
+++ b/dev-python/geoip-python/geoip-python-1.3.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="geoip-api-python"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python bindings for GeoIP"
+HOMEPAGE="https://github.com/maxmind/geoip-api-python"
+SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc ~sparc x86 ~x86-fbsd"
+IUSE="examples test"
+
+RDEPEND=">=dev-libs/geoip-1.4.8"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( README.rst ChangeLog.md )
+
+python_compile() {
+	if [[ python_is_python3 || "$EPYTHON}" == 'pypy3' ]]; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/geoip-python/metadata.xml b/dev-python/geoip-python/metadata.xml
new file mode 100644
index 000000000000..362cd6be0d48
--- /dev/null
+++ b/dev-python/geoip-python/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">maxmind/geoip-api-python</remote-id>
+		<remote-id type="pypi">GeoIP</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/geopy/Manifest b/dev-python/geopy/Manifest
new file mode 100644
index 000000000000..0edf2c71a36c
--- /dev/null
+++ b/dev-python/geopy/Manifest
@@ -0,0 +1,7 @@
+DIST geopy-1.11.0.tar.gz 72035 SHA256 4602a662855656551dec7bf86868f1557cc3435b7ff6bbb607f26a86dee5b718 SHA512 b3abbf0ce4ca08eadc03a97876a662bbda1901660ea03329aace30bfb5f8af17c82653273e4d2eab9aca5e817f50768dd742b4865083709e10b8599331d5573b WHIRLPOOL 2016a26bffc07e8c1466331f017cbdf04299aab6bf81cb715538ac766bf2beeba97d2fac42856f44f9701040807727e09fa18fcdb757b5406c4e50a9e710347a
+DIST geopy-1.8.1.tar.gz 67542 SHA256 63b805535cbe178367ee8f5e0221fab9fa691eef5797decac1e0851d16173dcf SHA512 0df2e67ed35d5cc3f796e3188df3a37d8fa101a4b6feb6b760ea08087ba44c350765a8c1032012b5e762454fa15c520f97d59ff942f07047927ef4872232a57c WHIRLPOOL 44c3f68a26ba23ca3ffae52dba5dc575a1cf54a53ea1e39d9566d97c58bcdb26b98934befc7cf012adbd266cee8a10b72d6880d1765af7f23486292b249c91a2
+EBUILD geopy-1.11.0.ebuild 2291 SHA256 3a1c7f84e2c4f4aba233eb5c4ad6599dfa3420e4a417b333af05e82b809af105 SHA512 6e7dd83a59537d0665d3cb90483d3287d54753c9069a52ef2ddfdfbb437956d0538c5583aa496e756afac680a235761e8def6e31161a93378b8f27bf3b04c7c9 WHIRLPOOL 5dadb4f65737a6be1da41d0728d2bedb0fd37c466116cbf726071be706cec884a8fe8c53458ebfcfcc433428b1b8e323a3656994e919d5c20f53dab1793908f0
+EBUILD geopy-1.8.1.ebuild 2005 SHA256 f553bcfd37c46dcc9d63a22fba7fa9aa5d30abc89f9dd1c22a7e9febbc842451 SHA512 de16f758bac7b8bbc7e41393d9614c27c46e52af9d77a2ea4c3d9673b5024f91474a774d0d5d21740bc0f6561f429f4eb42763c2ec5e926c6bc21c6b2e5e9090 WHIRLPOOL fa2310a04b0521499a107c0445cfc2dbc38193c1402c337733817b9271e3db2efe457710a96d2551c4cc200f3cabd7c55a0fce0cbec282c4dc866e097847b254
+MISC ChangeLog 3237 SHA256 bed7cfcf0cf7e9c743e3532ba47c00f614112babe62c34786e3ee79d264183a5 SHA512 47d79ebb320f1ac1f30c1618c96f09c970e664884084dc131254de0af5dac7f3fb121832cf17f2b79a432ba5d413565257d18db9c3bbd420295f840651dab0da WHIRLPOOL 3f34c07447fa57f632002dfc9d959ca99e7fe9b948998e513e5706cf08c0e987620762b3611fb408c6731d30d8541ea730a024d38d7fe886e3f0a7b9128f7525
+MISC ChangeLog-2015 4042 SHA256 f94ad554be5d88780a7c8505db0f50f6c548c8b69483c2a72a7ba1856d0d7e37 SHA512 e1c6f5ec20539d92a981f184e7723588b9fcc253facb4d31c8d0b0e4f6af9e950cdcfad0f8f33bebc9d5d13257ceaa683dfe24453e278e7e21e498d7baf2330e WHIRLPOOL 4fb59da20879e2ecd94986e239826bf23ccc467b195a68da832f93c8a7c3c9e6704b670ef3c3ae410ae62a80b6b3fc6e5a905eeb8764b479d3f3aad8de57a3f5
+MISC metadata.xml 566 SHA256 f5d0f98af606dbab8f9ed635847cfa39b7cac5344465d25e81b1d3972a4859e0 SHA512 37c883926b9a90ea8357aa2c307bef10ce6f419acb6bae4f4bef43604e699476dc1d5a258a3279e3b029d16097168bda3beeec924111fbe185be82017dbb8843 WHIRLPOOL bc81856e49aaf8b6e225d1b926cadbf33dd72dede0bde3dc93f36f42d70d8c5d6406169d7eb46ac6a9ad018ed1ab4b08d4f9c3faa7065ac762dcbf63d3e95502
diff --git a/dev-python/geopy/geopy-1.11.0.ebuild b/dev-python/geopy/geopy-1.11.0.ebuild
new file mode 100644
index 000000000000..cac709dd0f81
--- /dev/null
+++ b/dev-python/geopy/geopy-1.11.0.ebuild
@@ -0,0 +1,66 @@
+# 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
+
+DESCRIPTION="A Geocoding Toolbox for Python"
+HOMEPAGE="http://www.geopy.org/ https://github.com/geopy/geopy"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="test doc timezone yahoo"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="yahoo? ( >=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]
+		dev-python/placefinder[${PYTHON_USEDEP}] )
+	timezone? ( dev-python/pytz[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}]
+		 dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		dev-python/pylint[${PYTHON_USEDEP}] )
+	doc? ( $(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/python-docs-2.7.6-r1:2.7 )"
+
+REQUIRED_USE="test? ( yahoo timezone )"
+
+python_prepare_all() {
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+
+	# prevent install of test folder to avoid file collisions
+	sed -e "s:find_packages():find_packages(exclude=['test','test.*']):" -i setup.py || die
+}
+
+python_test() {
+	# broken tests
+	rm test/geocoders/openmapquest.py
+	sed -i -e 's/from .openmapquest import OpenMapQuestTestCase//' test/geocoders/__init__.py
+	# Ignore rogue class IGNFranceTestCase demanding elements beyond a normal testsuite
+	# i.e. "You should provide an api key and a username with a password"
+	# Cannot decipher how to skip or exclude this "context=IGNFranceTestCase"
+	# It appears it MAY stem from nose rather than geopy's suite
+	nosetests --verbose || die "Tests failed under ${EPYTHON}"
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/geopy/geopy-1.8.1.ebuild b/dev-python/geopy/geopy-1.8.1.ebuild
new file mode 100644
index 000000000000..43bd2cdb513e
--- /dev/null
+++ b/dev-python/geopy/geopy-1.8.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Geocoding Toolbox for Python"
+HOMEPAGE="http://www.geopy.org/ https://github.com/geopy/geopy"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="test doc yahoo"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="yahoo? ( >=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]
+		dev-python/placefinder[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		dev-python/pylint[${PYTHON_USEDEP}] )
+	doc? ( $(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/python-docs-2.7.6-r1:2.7 )"
+
+python_prepare_all() {
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+
+	# prevent install of test folder to avoid file collisions
+	sed -e "s:find_packages():find_packages(exclude=['test','test.*']):" -i setup.py || die
+}
+
+python_test() {
+	# Ignore rogue class IGNFranceTestCase demanding elements beyond a normal testsuite
+	# i.e. "You should provide an api key and a username with a password"
+	# Cannot decipher how to skip or exclude this "context=IGNFranceTestCase"
+	# It appears it MAY stem from nose rather than geopy's suite
+	nosetests --verbose || die "Tests failed under ${EPYTHON}"
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/geopy/metadata.xml b/dev-python/geopy/metadata.xml
new file mode 100644
index 000000000000..8e4022f6fcb3
--- /dev/null
+++ b/dev-python/geopy/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">geopy</remote-id>
+    <remote-id type="pypi">geopy</remote-id>
+    <remote-id type="github">geopy/geopy</remote-id>
+  </upstream>
+  <use>
+    <flag name="yahoo">Enables use of YahooPlaceFinder</flag>
+    <flag name="timezone">Enables localized date support</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-python/gevent-socketio/Manifest b/dev-python/gevent-socketio/Manifest
new file mode 100644
index 000000000000..84d2c6489d24
--- /dev/null
+++ b/dev-python/gevent-socketio/Manifest
@@ -0,0 +1,7 @@
+DIST gevent-socketio-0.3.5-rc2.tar.gz 22210 SHA256 ab38b6b97b369626cfa87eb4d2e1cfddf67c45e138e9bc61321e30f32e85facd SHA512 22a7c4c03b527eecb929ea896d8fdcfd2b299a06707cd30772f6762ecfc45e35f0c39053a57fb1ae06748aa58f3c246a1b9c9c3d917851d63f1275a70a7c14b3 WHIRLPOOL f7c2ab35e5036adaeda141c9ec75eb5767db5711c4ba6af8ba1698fa81142c21435c5b694f25cf9af55ff822a7f1a3a9b630c39e659b7f06bd270747318bc778
+DIST gevent-socketio-0.3.6.tar.gz 264203 SHA256 53394ab93fbd84d9dbbb2bef85349f6a503bfc53d86a9be8653250f1a0412aff SHA512 e64ad7c42f9a80e031b443920d7d770bbc58fdbbd4787585dbab0e7d455819e5b09bddf9915867afede45e26deb4087173f6e730ebd0dccaf64ba0bd63b2fd98 WHIRLPOOL eecd771b561a2d89f186e61d8357a946e9c9412cff0d0fc6c36ec0f473bd2aab40efa2516e6b286c1e5986cbb32354b6ebea410ac594a0ae976d123bad2d1e81
+EBUILD gevent-socketio-0.3.5_rc2-r1.ebuild 674 SHA256 a50717d17060762f7dd99801d06991844a3edd70ddbc120c9d01f0fd6e75d591 SHA512 f62aa8247ed49f68cd3e9f949bbeb3c22dca97144645a7d0653e6f0ed3ff74ea2a21c5739ffda6e4826236151933bd3107b90b1a5fa2a59b1acc8631fdb4d15e WHIRLPOOL a0820eeda4f65c1a1f48eef0db64b8e2e6881b74c11fd81836feafb04e53eefc45673c8b69f5f9e2e9d7ec2bf2d55c08cae86242ce74c5edd245bb5d7219e15a
+EBUILD gevent-socketio-0.3.6.ebuild 717 SHA256 06c0c79d67080f0104e9e1a10fa60fd0aa3e1262fc6e7f484de39b259dd3d93d SHA512 72e0df11d2947fc371153168c9a8ebce7db1f474dbaab84fb31b15236338015bf9ba4b462fb6872f63766e56b7c1f0b8562d57251d2c36059cf27b4de4e699b3 WHIRLPOOL 5d3b2833f1fadb8fbf8759e33a1697773c5c4746093f352be96e686219a328a4dd0c9a079ad9bec5d365563d436072388aac9e8f608f7627c34364a279322930
+MISC ChangeLog 2727 SHA256 3d369460228ad6ed5eab230324c2a38af762bd834745907dc4094d082a745b8a SHA512 3445d4b32b598f2ea802f067ba57f4095d37724f265f239e20305039b9ac6f1f4877c4e11367eccb7844928a7ab452c491fd66bb2042b99dc26e1a42760e692f WHIRLPOOL 4d22b09a89727de9453ba2be60dd0848ae4f02cfc5ae17d79564f538be2d7f665d1780e0b4755f9c23bbc2cb85dbbe70cb5190ebdc1e1e1ee0ff58f30202a0f4
+MISC ChangeLog-2015 1357 SHA256 a34f53811a212e328e8e6b08531bda5e1287e4bce79fa15e68c3d6f4d74f7a90 SHA512 5be45cd51d11d66f0e0bdf04392d45501e45157f42671d7c0c69fb65f9e0b8f855308f78017d0a01b6ac5260e561d02f6903a3435d7a3bba658493a037358421 WHIRLPOOL 42e454a022d2c4f7af41c875efb43c5a8d0163cbdbc900d77d026070968a1184e088806e24ffeea7ef89222cc18e45d3956950ac6a5b036f2c5ca4ef84eeaf4e
+MISC metadata.xml 862 SHA256 6d6b14cf866bbda0e0ae0f4da4f88b17f1b5eb42c450136b03578d3f0c24a3f0 SHA512 a98c176c81d27f9f6cf34c8a1dbc6928ce34c3c3a4eeea48640bb974d53402182dd0a110f720dea294537e823a4b94fbf0b1cdf85faa6e26a7503a71859ecea2 WHIRLPOOL 05d2dd18d9e624aa576a79164fec4308b6c4635f466402b3752daa23049d54944607ea4ab75d7636b4ed63c97d4b95a15f031bc249490320fc82d1078e88a7a2
diff --git a/dev-python/gevent-socketio/gevent-socketio-0.3.5_rc2-r1.ebuild b/dev-python/gevent-socketio/gevent-socketio-0.3.5_rc2-r1.ebuild
new file mode 100644
index 000000000000..9705218f8f3d
--- /dev/null
+++ b/dev-python/gevent-socketio/gevent-socketio-0.3.5_rc2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="gevent-socketio"
+MY_P="${MY_PN}-${PV/_/-}"
+
+DESCRIPTION="SocketIO server based on the Gevent pywsgi server"
+HOMEPAGE="https://pypi.python.org/pypi/gevent-socketio/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-python/gevent-websocket[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/gevent[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/versiontools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/gevent-socketio/gevent-socketio-0.3.6.ebuild b/dev-python/gevent-socketio/gevent-socketio-0.3.6.ebuild
new file mode 100644
index 000000000000..8e64f10b8dd4
--- /dev/null
+++ b/dev-python/gevent-socketio/gevent-socketio-0.3.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="SocketIO server based on the Gevent pywsgi server"
+HOMEPAGE="https://pypi.python.org/pypi/gevent-socketio/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/gevent-websocket[${PYTHON_USEDEP}]
+	dev-python/gevent[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/versiontools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/gevent-socketio/metadata.xml b/dev-python/gevent-socketio/metadata.xml
new file mode 100644
index 000000000000..2b004dbf709f
--- /dev/null
+++ b/dev-python/gevent-socketio/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ultrabug@gentoo.org</email>
+    <name>Ultrabug</name>
+    <description>main maintainer</description>
+  </maintainer>
+  <maintainer type="person">
+    <email>julien@thebault.co</email>
+    <name>Lujeni</name>
+    <description>Proxy Maintainer. CC on bugs</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>SocketIO server based on the Gevent pywsgi server</longdescription>
+  <upstream>
+    <remote-id type="pypi">gevent-socketio</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/gevent-websocket/Manifest b/dev-python/gevent-websocket/Manifest
new file mode 100644
index 000000000000..62a784d16fc0
--- /dev/null
+++ b/dev-python/gevent-websocket/Manifest
@@ -0,0 +1,7 @@
+DIST gevent-websocket-0.9.3.tar.gz 16463 SHA256 6475220340f9f8895a0f51bd2b9df3511bc7765dc055f49e997584bdaee3381f SHA512 71d6a81f04bae36e7122890b37082df188c28f5901bffcd8c774b2bf1cbcc603ff7ff9f854ab17ef00564d36b19787e3a9267e6e299f9837c1d682e63acadb73 WHIRLPOOL 27f84f0452b5be4cc0da03fb5e38710ce7fa3be052c1e41c4b9bc87a7aef40a13c714c24444a681b755eaeaa91e614aff92cb95b49fb03e004f8d44751a5737c
+DIST gevent-websocket-0.9.5.tar.gz 16970 SHA256 0091d6e6aa7298510cadcccb8068e1097a50d4e19090d0c055a93068d4530056 SHA512 fdaa8c704e1d0869700cf67c3a1c04246bfd816f98beac9c755b723a2074aa26344991c924ebdd7de5661065cde48ad412685014c53fdb92df12401cad3c358c WHIRLPOOL f566ec09f2d7739b0f70600c684471b768756c4b94b0462979ba770c5a17bc984b47e2ceb7ca1c0cf2ad26fa9fd9284326294450f013cd43fa243e7140aa7285
+EBUILD gevent-websocket-0.9.3.ebuild 518 SHA256 9e9517a6c0cdc4932e0abe5689d092627dd535682fac1bb71ce286120f59aaa2 SHA512 4073362fa970ba73dedd7a2da8421f0a447dbf71a354bc2efcbcd24ea64ab8c561d5075fab1e0de09998e03b313d22b61abc8d771c5374837c30196ab4f836d3 WHIRLPOOL 42dc13f72b5e052ba09af782f409fe176d84c9d6942fd540abf0197a21edd0b4f039aa8e5f4832583de08ead7c77f6711a0a6ca89e83f2275ce585512aa9f5f3
+EBUILD gevent-websocket-0.9.5.ebuild 520 SHA256 1b2bd1b148e321fa9399e9e485a97d9cd1c80e24b874b88be868b460e606f744 SHA512 4038497a6dbfe23f401fe42ce025c5c4610cd68a0e4d474510a55e1279a5fa100e19db20da34f73d32e6e0eb127ea78a0633961da463616496855bc033a8ed7b WHIRLPOOL a4cea057e4449f69eed7f0051112c4cc0e9a0311d4dc08d1679fc4ff441ec271dd77cc40c8d486c18e297fb0d83f2d5d75329dd9b935079db18ad4dca8123c0d
+MISC ChangeLog 2713 SHA256 dd8cc81c61afd31acd9d9564497f065e856e24e54616fe31bbbaf96cce265ed7 SHA512 73953c0027995d0faf0fee4597bd975ddd9784394735d4712f1dd35b1fa08b504ea9aaefe75a77f41713ae756d4fd05c1611156ef89e6a141569847485269173 WHIRLPOOL 35de4937768efaaef8d7cce698188bca7f42940405606b67ca360f9b7ca194ba643fd3de01b0adb4784f61d93df6980b13ee57876994667412725851f6caef7c
+MISC ChangeLog-2015 1424 SHA256 9cb2e5224d23b2a0c7d4199e07dece4e8b14615c051b728dae529e3675af9f5d SHA512 66afa3aef95dc8593776bea644fb31ce70fa172851ac688e0ba171e1496cd1304d020a2c1654510f18b0a9b759c6651b0c4cea721984ef0bb9844d4188d42577 WHIRLPOOL b55a37d2e60f921d3fae203dcf85c466b99eb6fee3aed1edd4fedc9d73a7ca9530e9fd3653710c44abd7e4532e62120b60224548e0d09c8ca0badeed1ed5e8d8
+MISC metadata.xml 820 SHA256 7713d1ae11e5e9234e03c8a811467f54622273b4db800b901a86c47fa649ae69 SHA512 60a1d9bd86378314c37895e21d329a63b74d2f31dea971e9aa8ad320d7d8ccfc1d14a638b3881e1c942aac435d6601f89100526f2f25c44bd7717a8553f6bb5a WHIRLPOOL b969bbd0bc77fd049701f16a0232835e7d4ea6da31e9407365d830ca5c5d8182ce0dde2a431e31b9ace72da086601946044f95763522f67182d8a93902378586
diff --git a/dev-python/gevent-websocket/gevent-websocket-0.9.3.ebuild b/dev-python/gevent-websocket/gevent-websocket-0.9.3.ebuild
new file mode 100644
index 000000000000..f35bdec67865
--- /dev/null
+++ b/dev-python/gevent-websocket/gevent-websocket-0.9.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Websocket handler for the gevent pywsgi server"
+HOMEPAGE="https://pypi.python.org/pypi/gevent-websocket/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/gevent[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/gevent-websocket/gevent-websocket-0.9.5.ebuild b/dev-python/gevent-websocket/gevent-websocket-0.9.5.ebuild
new file mode 100644
index 000000000000..0733d0b100d8
--- /dev/null
+++ b/dev-python/gevent-websocket/gevent-websocket-0.9.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Websocket handler for the gevent pywsgi server"
+HOMEPAGE="https://pypi.python.org/pypi/gevent-websocket/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/gevent[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/gevent-websocket/metadata.xml b/dev-python/gevent-websocket/metadata.xml
new file mode 100644
index 000000000000..d9c65dc83c5d
--- /dev/null
+++ b/dev-python/gevent-websocket/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>ultrabug@gentoo.org</email>
+  <name>Ultrabug</name>
+  <description>main maintainer</description>
+</maintainer>
+<maintainer type="person">
+  <email>julien@thebault.co</email>
+  <name>Lujeni</name>
+  <description>Proxy Maintainer. CC on bugs</description>
+</maintainer>
+<maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+</maintainer>
+<maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
+<longdescription>
+  Websocket handler for the gevent pywsgi server
+</longdescription>
+<upstream>
+  <remote-id type="pypi">gevent-websocket</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
new file mode 100644
index 000000000000..5ec9110579f0
--- /dev/null
+++ b/dev-python/gevent/Manifest
@@ -0,0 +1,7 @@
+DIST gevent-1.0.1.tar.gz 1455636 SHA256 4627e215d058f71d95e6b26d9e7be4c263788a4756bd2858a93775f6c072df43 SHA512 4790e06b49536ad15856cf551c7ad4d717be2ceda8bc7d39fc35a0132d21f302e033f3294da426be4f6c0476554163776e5ffd82d89962503a720c453ff96461 WHIRLPOOL a1d552f89e9d3db1720fd0db1dbfb6ffc7ed4db87ee5816e5c44843f3c5bba9afbfc21ab2cfcf5bfc84ea70fea3caf6f8fbdbc2807c868b27105bce7e58d6290
+DIST gevent-1.2.1.tar.gz 2808619 SHA256 3de300d0e32c31311e426e4d5d73b36777ed99c2bac3f8fbad939eeb2c29fa7c SHA512 22740e8e114869c1f53bcfd6796226927a3a726d4fd49d104b947f0c97546c7490eabea98b4492db794e21d26d0aee85f1e40b01d386a47063b042a719e61726 WHIRLPOOL db0055610130df7d5c4e914364a2bacedb2f3567db0bff730ebdc285cdb45c5409da5bea665d6776c92299eaa0b189a8815b57eafd5ce44e853ccfa20824d7b0
+EBUILD gevent-1.0.1.ebuild 1458 SHA256 9f71f1f80a6ae4028d80effbc906c3224387b1ef5806f2e3e990edf6c26f95c4 SHA512 02942b4376c8ec3a387005a4c5b20cf3611b25710ffa3c74f8cb0e929a72da51bf5a721ab091cb2b4ad6370d4b2405ce0750905c8d325042e4111dbd18d4f0ea WHIRLPOOL f982dc3769487d68ad001149bf0f3318176376880508a263cd52c4fa9d6e379326cfd993bb21581627c874d5df7b3e168e557bda9d0cabd43acd8ebaadb8eae0
+EBUILD gevent-1.2.1.ebuild 1857 SHA256 55eb14e2d5e88a10a506e3c7844fc29fc5a717b274513b94c1f7892343c731bf SHA512 a62a64dc4ffae21c853f90660d854cb013363a656c4e6b9348e7a45ef38481e2e30b3fd38fef74990f377c3411b51f2a7f90fcf902da220cf46e06e9c1c5afa6 WHIRLPOOL 38dcf22015549d3998a6585b5549a0e6aa3307bf01fec0069c3b2e4b1e1454b7481e2122e62a511b398cf02d7a616f7d4809f3ea32a634a6c58eb7cef1f05a5e
+MISC ChangeLog 4893 SHA256 d86a05c310fbd61df452b3fbaa5cd6a632a7f9d0c8168dc80897736119b68c7f SHA512 e4c76ca7d8b28b71d25529b0ca0df7be947700839f71a3e88be365d8bd147fa334ada0e188f8f9886526164f0e9cba1fe907aa057865e0e847f25d3987d09a5e WHIRLPOOL 2e349ec80a0ba150dc64af91625c934647a05614c76f1e600aecc0a47a45f624315cd85d1bf91573c574b64791d326688a5b1d20760ca8067e91abe8f780fdf2
+MISC ChangeLog-2015 4157 SHA256 50fa0c3ba77ea3bb4b511d7ca039a23dfe73a728a8bd4d5849e8e5cdb2d1733e SHA512 32469e0ce7d6d183dd9862eaa89aad109d9e64e5ba46042d758020b7d91c806aa4cccefcc1e60b4b5030e72d07c0491a3bbce141dfbfc64f174c22a09cdb269a WHIRLPOOL 1086b4859a88056d8548a7fb1ff158e4d8e303bcd411e9d4b626589b2220cbaac8fb361fd9815dbac20bb768e250c4f32d610ff4a0f45e91c3df0d3984a42136
+MISC metadata.xml 374 SHA256 c672648793ab05ee22aa134d2da3e74c7937a9ead321dd854f09ba877302870b SHA512 443f847333d35cd55f9c33624664569ecc8c2d0b7c74a358a716e0e133072edb0f29abfc36d6fb446db6890ae1319ad9d719a6e65e2bb35f9c9e9259379241fc WHIRLPOOL b5854e50ce75d59af88f8fee22b775dfc2a31225dd837c43b6667309ee1f79ef6a484edd848883dd507b7c475f2bdd9abb80533aecff2603c56a0ad4679d370d
diff --git a/dev-python/gevent/gevent-1.0.1.ebuild b/dev-python/gevent/gevent-1.0.1.ebuild
new file mode 100644
index 000000000000..6bda4c53e109
--- /dev/null
+++ b/dev-python/gevent/gevent-1.0.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl,threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV=${PV/_/}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Python networking library that uses greenlet to provide synchronous API"
+HOMEPAGE="http://gevent.org/ https://pypi.python.org/pypi/gevent/"
+SRC_URI="https://github.com/surfly/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="dev-libs/libev
+	net-dns/c-ares
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	rm -r {libev,c-ares} || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	cd greentest || die
+	"${PYTHON}" testrunner.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+
+	dodoc changelog.rst
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/gevent/gevent-1.2.1.ebuild b/dev-python/gevent/gevent-1.2.1.ebuild
new file mode 100644
index 000000000000..8d9af07ca111
--- /dev/null
+++ b/dev-python/gevent/gevent-1.2.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# http://www.gevent.org/whatsnew_1_1.html#broader-platform-support
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Coroutine-based network library"
+HOMEPAGE="http://gevent.org/ https://pypi.python.org/pypi/gevent/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-libs/libev-4.23
+	>=net-dns/c-ares-1.12
+	>=dev-python/greenlet-0.4.10
+	virtual/python-greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	export LIBEV_EMBED="false"
+	export CARES_EMBED="false"
+	export EMBED="false"
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	cd greentest || die
+
+	GEVENT_RESOLVER=thread \
+		"${PYTHON}" testrunner.py --config ../known_failures.py || die
+	GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 \
+		"${PYTHON}" testrunner.py --config ../known_failures.py \
+		--ignore tests_that_dont_use_resolver.txt || die
+	GEVENT_FILE=thread \
+		"${PYTHON}" testrunner.py --config ../known_failures.py $(grep -l subprocess test_*.py) || die
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/gevent/metadata.xml b/dev-python/gevent/metadata.xml
new file mode 100644
index 000000000000..d0c159e3da9c
--- /dev/null
+++ b/dev-python/gevent/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">surfly/gevent</remote-id>
+    <remote-id type="pypi">gevent</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
new file mode 100644
index 000000000000..fadbbf2421b1
--- /dev/null
+++ b/dev-python/geventhttpclient/Manifest
@@ -0,0 +1,4 @@
+DIST geventhttpclient-1.3.1.tar.gz 82598 SHA256 bd87af8854f5fb05738916c8973671f7035568aec69b7c842887d6faf9c0a01d SHA512 a50486e1485c449a821176f0aa139cb05a3c7675fb045086e086cc7bb71d6e1d75191fae6972b381e7e69dba89d23c387464503845badd29fa361e03aa866079 WHIRLPOOL 960241f8758e35314caa293b512d15b50b8fcad451ca86f26abdf59a51284d57558aa42679ffff497eccc683fe140b43bbbbc3c808fca98a882e3ae517aa744e
+EBUILD geventhttpclient-1.3.1.ebuild 1201 SHA256 667f561c204f6d036f4c1cf206af861a6103a3da410083b4aec38f42b9d6d241 SHA512 243523dc12bf2d75adef903e4c7822a0667229e7620131ca237eff92c6123cd9fbe621812346a624955efd9e918414bc01f05d85f007a737a6c336318d4b0d84 WHIRLPOOL 899fa9bc7d33e4a3b45a4c3ec2fc408b0a8326b49ff39ebb3846e730a19a1e5da873cb48be45208711ade391e3e057d1645e90884f7f5ddc1465d3c9c429d288
+MISC ChangeLog 774 SHA256 4e0524a7fb26ba1cfc08081aa5111a4656b2d80b341221aaa53659ba2d5036ca SHA512 f1c220a854b52e2d504814b88ba944fe05ce64c37022febd966c373ecfaa8f602d3900876fb423f46a784f30c1a65663e34957dd3a1c8e008aea7b7de5ca2745 WHIRLPOOL 455a63b914b0c12a9b10b7ba9831956834f753833244c1b07ff7f15657f454a8cc594fe3861b5ba4d4c7aa20d427c86c134c6ffe7f14dc9e1f8707183e777ec4
+MISC metadata.xml 578 SHA256 f3d9efc472c54a59ae2312210e44f2dbbb3d5523546806b2dfa404a86f25b8ed SHA512 8d9a834f198c8b8428a68e2493d2e54d56c2e2995018e57ea5e67bd8f56c0c9cb312a8b39ae14a4ea1ea3187f8406bbc67a756e091b65909a3c29879a2ac5a9a WHIRLPOOL 5406d0861fc11a145b3617ecb0275f8f4e413b9a1560373ad2b2ce8b38e3487a2f3ca37923a7db48815262c56917303879119ef4b742ae30587e668c2cf6f9b1
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.3.1.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.3.1.ebuild
new file mode 100644
index 000000000000..2761e853dd4b
--- /dev/null
+++ b/dev-python/geventhttpclient/geventhttpclient-1.3.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A high performance, concurrent HTTP client library for Python using gevent"
+HOMEPAGE="https://github.com/gwik/geventhttpclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/gevent[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# https://github.com/gwik/geventhttpclient/pull/82
+	rm -rf src/geventhttpclient/tests/__pycache__ || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Ignore tests which require network access
+	py.test src/geventhttpclient/tests --ignore \
+		src/geventhttpclient/tests/test_client.py || \
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/geventhttpclient/metadata.xml b/dev-python/geventhttpclient/metadata.xml
new file mode 100644
index 000000000000..fac88891eb87
--- /dev/null
+++ b/dev-python/geventhttpclient/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">geventhttpclient</remote-id>
+		<remote-id type="github">gwik/geventhttpclient</remote-id>
+		<bugs-to>https://github.com/gwik/geventhttpclient/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ghp-import/Manifest b/dev-python/ghp-import/Manifest
new file mode 100644
index 000000000000..bb2f357e0bf3
--- /dev/null
+++ b/dev-python/ghp-import/Manifest
@@ -0,0 +1,6 @@
+DIST ghp-import-0.4.1.tar.gz 5002 SHA256 6058810e1c46dd3b5b1eee87e203bdfbd566e10cfc77566edda7aa4dbf6a3053 SHA512 8b0e6578f05dc74449082a840ccd609a43fba3ca1c4dffacaddc4b27d2e9e3eac565a5c9672734e6ec5f2e8872b13ae0bb8a5d6bae4ee6c4cf41ef7d2c0b2eda WHIRLPOOL 15008edc2539affef67267859ce3a4019e1d3621e8e0a2cb3b74de53af2fb5433f77a74b1742552ccc223fdc9cc30db135a0b9f0cd796ce2df38bfc83c7aa24d
+EBUILD ghp-import-0.4.1-r1.ebuild 712 SHA256 7727b6fcbe3e4220231d7e38be72403f19743b87119c7f8e1ef9e9eba1ea4a75 SHA512 a3bda407d8af4181740fef1268232b4044c6d29565126bdc77505a6294faff5ba8f1e3d545f379d731e421b3aa3cf0d0ccce2df8f148007fbc7ea3b9dbbcc769 WHIRLPOOL 32fd92a8c2c9a7e7490edcee197c9227bede719f5b02a0617cdfafb26d2a93c232c9fe24ad92630f2052b2e9afba610baa02652be31f3fa02cd5040eaeca711d
+EBUILD ghp-import-0.4.1.ebuild 453 SHA256 6b40e38b96069b36959c7cdccd4d8476012df6ba4b353dceab3452bdaabc788f SHA512 266789411d2b3ce4f97dddc1623fcbf5d2b42e8003450340aa2a2bac0bffe3ce70cf103d6288245e0e0eda403be971b98b0c53c0aab96778fa90bf7fbf4bb255 WHIRLPOOL abaa98386fa55b7c538a4a4e31e6b02bb38f0fc677e77c1d40458befdf9d8d0441ccf77dc1c6adead190d87594d083cb9ed07942c2a62944492884e56aa4b970
+MISC ChangeLog 2588 SHA256 fa045e962bce1b3169a12f1ab18ff080c7d7437a23f79f9396a8d76a5a93af00 SHA512 579201c3bbb71f8d0e8e5feca5c64e358d3d7e504f65dbe53c96fb101cfc1748fd39c2b3f216e1a18c538b801a8d804963b33d01ce70989bd0ec16b4d3d1ea6b WHIRLPOOL 50c0ad5a4d5bb9596645dedda9e3feb71768f74300c397e2f59b6646a6e21f95d5618d33cfcf365b736212ac1d646e520b32020ccd4087e837c93e46e423833e
+MISC ChangeLog-2015 1006 SHA256 0a0c74680779793f58653107bdf39023e6acbc1c17322cc0394bbdaa78342ba4 SHA512 dce0f946899f51e696a6e6899c33e0dba4a307dbc8c26694544ed8577a294e8b106b504cfb9f72877bb69e1a6c343d4694cd92c749bb587f19ef82f3252b21e0 WHIRLPOOL 732782ce0ec2f96649f71e2485865439afbda8dc39819ec0494953d94ceb1a7b0d85a5fac46de86997e2ee8185a98515a516ce92e7c43936e35e932a7cbd3523
+MISC metadata.xml 376 SHA256 cb978b8efeae652ef40ebfe94bc87a0ada51191ff931df170b8dd058e239096e SHA512 de63be720729201062c30e12422e2d242f213ed52e1ef8c03c1102aecb8c18bdf2ef550aca02c0cedde8e5994f04665aadf6754b5aed9ae6083883bb3fb47eeb WHIRLPOOL db39f0385fee4225c16028cddf32f2e5c168b933d8e30d18061607fdae02a610e2571a07c209130f7efc56d5d5f7bc512e99eb1a516847af5d4563058fb8eade
diff --git a/dev-python/ghp-import/ghp-import-0.4.1-r1.ebuild b/dev-python/ghp-import/ghp-import-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..7bad1544380d
--- /dev/null
+++ b/dev-python/ghp-import/ghp-import-0.4.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Copy your docs directly to the gh-pages branch"
+HOMEPAGE="https://github.com/davisp/ghp-import"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="tumbolia"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_prepare_all() {
+	ebegin 'patching setup.py'
+	sed \
+		-e '4ifrom codecs import open\n' \
+		-e '/LONG_DESC/s/))/), encoding = "utf-8")/' \
+		-i setup.py
+	STATUS=${?}
+	eend ${STATUS}
+	[[ ${STATUS} -gt 0 ]] && die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/ghp-import/ghp-import-0.4.1.ebuild b/dev-python/ghp-import/ghp-import-0.4.1.ebuild
new file mode 100644
index 000000000000..e7994f4bca49
--- /dev/null
+++ b/dev-python/ghp-import/ghp-import-0.4.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Copy your docs directly to the gh-pages branch"
+HOMEPAGE="https://github.com/davisp/ghp-import"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="tumbolia"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/ghp-import/metadata.xml b/dev-python/ghp-import/metadata.xml
new file mode 100644
index 000000000000..5f753dbf65f9
--- /dev/null
+++ b/dev-python/ghp-import/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ghp-import</remote-id>
+		<remote-id type="github">davisp/ghp-import</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ginga/Manifest b/dev-python/ginga/Manifest
new file mode 100644
index 000000000000..2e16b6cb9673
--- /dev/null
+++ b/dev-python/ginga/Manifest
@@ -0,0 +1,7 @@
+AUX ginga-no-roboto.patch 597 SHA256 18eedf21f0d5bc05ecbf24f08b8dc5ec54c91596dacf497aa151e26eeae7c497 SHA512 e4e03b31ef61b3c71f5a049d23e721634d5c54646abf35d13df05423f2f215ff50aa7c867077bdb0216e2e8482e5a2bd75d24c505fcb09cb4ce96ac21d327c0d WHIRLPOOL fa1a8021df7685cd275d8226b8f20a402e7dcc785fdf453ceba72b952e90340fbb423e4824a91fec80e6a9bbe2b5225345b594c299a2c3fb73280e37b658cb6e
+DIST ginga-2.6.4.tar.gz 19971195 SHA256 25d3435af454135c3539108ab41d4a55169e939739e0a947f12643dce16aa16e SHA512 79c471ee3fefb6dc03c90538147b8fa8606b37b7747712f9a69163870e6ae460d259f0ea08388a07163ea8b588676d0208fcdd51577d04cfc334aacbd0c01599 WHIRLPOOL 7ab2c47015446aae322f5a167a4054f40e601f2d0ace9b164a87bf4cf1f084765d7cc05592a69847010fee20b780e47a4532defcd5acfbdf6ba74568dd6dbc52
+DIST ginga-2.6.5.tar.gz 19969984 SHA256 0a8000a2e872d10fd05368cf3fa9d48d67c9191877998d764cd681f3f88b0e25 SHA512 66c55662a8ce1fe683cdf6a83511f39146fadf10d1fedabd6d6c5c46662a3abd2496bd1f0200612a84bdad246f960990e242bccee7a8a13e3aaf88a4884ceb80 WHIRLPOOL 76284b1ada78ff60bfb7e350f71ed1d6e81f73704757574864a64fb437d80fd1ab011fa50daadd231dae75dc3d22efb76d48f14678538e7949a7f56a6f44412e
+EBUILD ginga-2.6.4.ebuild 2374 SHA256 c0bcf6701c6fdce01f53f9822d8b112293651632995fbe690a4b68f74edf8eaf SHA512 aa59af7de073aff58f64322fe267aef777cb57eb90f9cdc703b09641a493c16332dca948eb56735de899c64963d9268f1740fbefc69e297fc8737593605f3ee6 WHIRLPOOL aec5b88bea3367c7d2bb98faecf6144a289d54a472135297de9f08bf36a8b719ff9d35ce2d5f74be0be70e9b0776d7bf8a182fe49183d9a7b5e640a934217a35
+EBUILD ginga-2.6.5.ebuild 2156 SHA256 cfc78b6af0594a394b3d35a586a73dd00d27a38d2eab792fb055fc03850ea734 SHA512 07b85cab2aead0c4d34130977cd741dadcdd9e137c7503fcf3d7643c93e9b16bb5462fab272fb1b58bf3da2dd3444389ab5a1e4414262568d614686898833890 WHIRLPOOL 7246772591f3333cb200356e1378f9d162944c88e413f259f31cd28158fe9ff056e259e826842c476620f07d1084ba5e1ff5c413bdb38427dad97f364f8d24d2
+MISC ChangeLog 339 SHA256 0bce9ce422de804941a3b3fa0aecf951b3897ce857fec4f9b7117847c7c6f817 SHA512 6aea6b1b0232b5e7bf104aaa199fa421af8ca8716bd744d4dd125dd6adc2bf1e10d25ea0eb5d1872161609765d99e8a6b6370e2cc35dbaa9d9e999ff6d35b5ba WHIRLPOOL 5cf900e086e8502f1db9103e26d04391c401f0ea6fd746c66cc1747cd80af36912e5e70ffbc1079608cc060e37bae908358c4589b02ac890f492ca7f8e9fad27
+MISC metadata.xml 849 SHA256 016f245aa1b3ca3e29e0ff55a25e6608984b5b02150a2b766fb020704b103d56 SHA512 50343b22bb87eb298d17182553ddbbec417198e65f6c86177760e3fdc1c117f2e40dce6b539831d6dc85f820efa13b0b4e739dc40222c7ad2f318c81b78a2d33 WHIRLPOOL 6728adce7673409f114ccd6aedba88ef82ee6a7cea7b08b2435029af40acebaf69cc434dbd98b0a1012949584c6e592bd12ae307028d964338d7333677ea2cb2
diff --git a/dev-python/ginga/files/ginga-no-roboto.patch b/dev-python/ginga/files/ginga-no-roboto.patch
new file mode 100644
index 000000000000..36b222fea5e2
--- /dev/null
+++ b/dev-python/ginga/files/ginga-no-roboto.patch
@@ -0,0 +1,19 @@
+From: Ole Streicher <olebole@debian.org>
+Date: Tue, 2 Aug 2016 09:06:36 +0200
+Subject: Don't install the fonts included in the package.
+
+Use the package roboto-fonts-unhinted instead.
+---
+ ginga/fonts/setup_package.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ginga/fonts/setup_package.py b/ginga/fonts/setup_package.py
+index 9dd1e93..fe0ed0a 100644
+--- a/ginga/fonts/setup_package.py
++++ b/ginga/fonts/setup_package.py
+@@ -3,4 +3,4 @@ from __future__ import absolute_import
+ 
+ 
+ def get_package_data():
+-    return {'ginga.fonts': ['*/*.ttf', '*/*.txt']}
++    return {}
diff --git a/dev-python/ginga/ginga-2.6.4.ebuild b/dev-python/ginga/ginga-2.6.4.ebuild
new file mode 100644
index 000000000000..69fd1a42bc64
--- /dev/null
+++ b/dev-python/ginga/ginga-2.6.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_REQ_USE='tk?'
+
+inherit distutils-r1 eutils fdo-mime virtualx
+
+DESCRIPTION="Astronomical image toolkit for Python"
+HOMEPAGE="https://ejeschke.github.io/ginga"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc examples gtk qt4 qt5 test tk"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	media-fonts/roboto
+	gtk? (  dev-python/pygobject[${PYTHON_USEDEP},cairo] )
+	qt4? ( || (
+		   dev-python/pyside[${PYTHON_USEDEP},help,X]
+		   dev-python/PyQt4[${PYTHON_USEDEP},help,X]
+		  )
+		  dev-python/QtPy[${PYTHON_USEDEP},gui]
+	   )
+	qt5? (
+		 dev-python/PyQt5[${PYTHON_USEDEP},help,gui,widgets]
+		 dev-python/QtPy[${PYTHON_USEDEP},gui]
+	)
+"
+
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+	  dev-python/sphinx[${PYTHON_USEDEP}]
+	  dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+	   dev-python/QtPy[${PYTHON_USEDEP},gui]
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-no-roboto.patch )
+
+python_prepare_all() {
+	# use system astropy-helpers instead of bundled one
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		PYTHONPATH="${BUILD_DIR}"/lib esetup.py build_sphinx --no-intersphinx
+	fi
+}
+
+python_test() {
+	virtx esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+	rm -r "${ED%/}"/usr/lib*/*/*/ginga/examples || die
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r ginga/examples
+	fi
+	domenu ginga.desktop
+}
+
+pkg_postinst() {
+	optfeature "Pick, Cuts, Histogram, LineProfile" \
+			   dev-python/matplotlib sci-libs/scipy
+	optfeature "Online help browser" dev-qt/qtwebkit
+	optfeature "To save a movie" media-video/mplayer
+	optfeature "Speeds up rotation and some transformations" \
+			   dev-python/numexpr dev-python/opencv dev-python/pyopencl
+	optfeature "Aids in identifying files when opening them" \
+			   dev-python/filemagic
+	optfeature "Useful for various RGB file manipulations" dev-python/pillow
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+}
diff --git a/dev-python/ginga/ginga-2.6.5.ebuild b/dev-python/ginga/ginga-2.6.5.ebuild
new file mode 100644
index 000000000000..e08f9fa4c1f2
--- /dev/null
+++ b/dev-python/ginga/ginga-2.6.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_REQ_USE='tk?'
+
+inherit distutils-r1 eutils xdg-utils virtualx
+
+DESCRIPTION="Astronomical image toolkit for Python"
+HOMEPAGE="https://ejeschke.github.io/ginga"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples gtk qt4 qt5 test tk"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	media-fonts/roboto
+	gtk? (  dev-python/pygobject[${PYTHON_USEDEP},cairo] )
+	qt4? ( || (
+		   dev-python/pyside[${PYTHON_USEDEP},help,X]
+		   dev-python/PyQt4[${PYTHON_USEDEP},help,X]
+		  )
+		  dev-python/QtPy[${PYTHON_USEDEP},gui]
+	   )
+	qt5? (
+		 dev-python/PyQt5[${PYTHON_USEDEP},help,gui,widgets]
+		 dev-python/QtPy[${PYTHON_USEDEP},gui]
+	)
+"
+
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/QtPy[${PYTHON_USEDEP},gui] )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-no-roboto.patch )
+
+python_prepare_all() {
+	# use system astropy-helpers instead of bundled one
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	virtx esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	rm -r "${ED%/}"/usr/lib*/*/*/ginga/examples || die
+	if use examples; then
+		dodoc -r ginga/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	domenu ginga.desktop
+}
+
+pkg_postinst() {
+	optfeature "Pick, Cuts, Histogram, LineProfile" \
+			   dev-python/matplotlib sci-libs/scipy
+	optfeature "Online help browser" dev-qt/qtwebkit
+	optfeature "To save a movie" media-video/mplayer
+	optfeature "Speeds up rotation and some transformations" \
+			   dev-python/numexpr dev-python/opencv dev-python/pyopencl
+	optfeature "Aids in identifying files when opening them" \
+			   dev-python/filemagic
+	optfeature "Useful for various RGB file manipulations" dev-python/pillow
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-python/ginga/metadata.xml b/dev-python/ginga/metadata.xml
new file mode 100644
index 000000000000..9b4ee82bcef3
--- /dev/null
+++ b/dev-python/ginga/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Ginga is a toolkit designed for building viewers for scientific image
+    data in Python, visualizing 2D pixel data in numpy arrays.
+    It can view astronomical data such as contained in files based on the
+    FITS (Flexible Image Transport System) file format.  It is written and
+    is maintained by software engineers at the Subaru Telescope, National
+    Astronomical Observatory of Japan.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">ginga</remote-id>
+    <remote-id type="github">ejeschke/ginga</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/girder-client/Manifest b/dev-python/girder-client/Manifest
new file mode 100644
index 000000000000..cfea5d2f01e2
--- /dev/null
+++ b/dev-python/girder-client/Manifest
@@ -0,0 +1,3 @@
+DIST girder-client-2.3.0.tar.gz 19976 SHA256 8c336ccfa6f837d3967756444d59a049668d3ca0c5730d1bf82f9b39f2225cb2 SHA512 68bbb9aa328b9021b8d3604269df75f67c63631aebdad3b2268e8b170cc65ede911dc57abf049c091f033d85f7026c0869c68ceaed4ebf830f3f1d34d7e59fbb WHIRLPOOL a3b5ab088fa617fc77857e5669f4ba59dd7ac946b2fefae3551211ea2b0ca9c33989a0ef6a581c3bef5a836c4ab362f1ec6e5bf986107fad895a425b9f55673e
+EBUILD girder-client-2.3.0.ebuild 837 SHA256 d90eb5148f9e7630c87d78cd3b3288db60c86b9c457ad7230b5eb1c8c247fbb6 SHA512 c46a71456e0c9571e185109311ac44f643b103fb1242d9acd4e60d9e036f6e1ba23c069a070753125d4f450ac1712a7b0eb34257005be348608efebd640f44ca WHIRLPOOL 0fbe92c3f74c6b0b2d74424b6f175840be5edf81e92b6184257bfcbff87c4a3d9166e4ac9f4f4073d901e32b8704741981bc77f156a94578e033c574f180d3c1
+MISC metadata.xml 515 SHA256 4e4d1f0ae944b3a6265c233462eb812b14beb1f53785acf9c4820a59383d6f08 SHA512 908a914fefa0d9d1cbb822dae3bb5e0f6385c85f15d59504cb40fdde47625513fc6603fa865d522dce9936d4e0a23523cc6a510cb7f87601aa42bb7acfce5e62 WHIRLPOOL 93358be4d4d9e4935f411ac5d2f57eb4e3b8f7941e87f42a126cd03fbb724cf06c4f96f1ec0857bed3017715384ad417fe83520d0c674e8a48dc76de9580d1d6
diff --git a/dev-python/girder-client/girder-client-2.3.0.ebuild b/dev-python/girder-client/girder-client-2.3.0.ebuild
new file mode 100644
index 000000000000..069b6e055e9c
--- /dev/null
+++ b/dev-python/girder-client/girder-client-2.3.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python libraries and CLI to interact with the REST API of a Girder server"
+HOMEPAGE="http://girder.readthedocs.org/en/latest/python-client.html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+# see https://github.com/girder/girder/tree/master/clients/python
+RDEPEND="
+	>=dev-python/click-6.7[${PYTHON_USEDEP}]
+	>=dev-python/diskcache-1.6.7[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/girder-client/metadata.xml b/dev-python/girder-client/metadata.xml
new file mode 100644
index 000000000000..eedb195e5a4d
--- /dev/null
+++ b/dev-python/girder-client/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Gentoo Python Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Set of python libraries and a command-line tool that can
+    be used to interact with the REST API of a Girder server.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">girder-client</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/git-python/Manifest b/dev-python/git-python/Manifest
new file mode 100644
index 000000000000..b54dc8da9c86
--- /dev/null
+++ b/dev-python/git-python/Manifest
@@ -0,0 +1,9 @@
+DIST GitPython-1.0.2.tar.gz 387615 SHA256 85de72556781480a38897a77de5b458ae3838b0fd589593679a1b5f34d181d84 SHA512 faff50d5272158f1d05d932e7827c05272f9a28772aabbcabd631b735bb4d8306d2861d13c327d02a4c554bd9a9902c473fb282318036405497dd8bf0fcc51a8 WHIRLPOOL c12e850114d101faa673d4d87e6885b1d7cd55544d335e08d4579c160e4d8ef488dd09359cfbd9a39e11f4555b8cb3cd2bfec214c95883b5a83565ad1e28b403
+DIST GitPython-2.0.6.tar.gz 406234 SHA256 282268c4eab0d53a44fe40af038625be307560370c38d2882f3b6763642785db SHA512 97a64e715b2d78d58542de5adcf679aa73a64bae49b6c76c2ac56a8ffaa0f712f80b239a39408d79395bf4c3a6e5ca7c5ee21a166a8b4da597c898f92a5a123d WHIRLPOOL c0a540f2b84059a038127182d515ce8c91b93fde4328ed32c7f57d847c2f7bc62dfd0275ead5c23498f4e8ba756d9c2067b2d608167031b352416b197117ed44
+DIST GitPython-2.1.5.tar.gz 420147 SHA256 5c00cbd256e2b1d039381d4f7d71fcb7ee5cc196ca10c101ff7191bd82ab5d9c SHA512 40350434edb12d3335ea6a9f0176df4eff0564c8c8388f6a9769d2ab9e46c708625849a079eaf4e1c5aa9eaf10d91f439097277d67e3c6b5e9659a88bfcdd4e2 WHIRLPOOL 62df18eca5400b96bb99939256f3e601a48241ad79b360eb3ff570c1faf48d48e449d319b5860859ac0f974a21038f9b572418f5a14000c22f2f63f9d631ea28
+EBUILD git-python-1.0.2.ebuild 1076 SHA256 96c89dfdeacc20a4b5010cd24a9a42493f6079b677d33d8d487a5233945cfde9 SHA512 bb2712caa805494c2fb755c651abc50ad4063055bbd46347a7330980473f322ea1eebcd4327c3f07240bdbef9dcb8493ba7e173c7c93dcf0bc86f0220525d2c9 WHIRLPOOL 0ffd3067245e2d3b607fc8c3ee249f4f6ea25bd2a6ee01fd1feb67a52a167cf138388b0d9fef1d3d0250939218e8e21d2c761a9d2d78314b10d3dcb12c84a913
+EBUILD git-python-2.0.6.ebuild 1085 SHA256 cb9cedb3ba6111c4812c9fdc41517fd194b5ea52bdf85d41d0d5562b5a754cd0 SHA512 ebe6b3e8e3e3f6175256ec6bc026be934382e28afe52ef1953016260b232b9aafd34fe28381961dff4532106a035bd9b6f9fedb6368bcca97221005289d58732 WHIRLPOOL f69e23b25b5b7074d4566b2aa293cc4c0956a025f60c6f60beecb74aac06f2ae46449ef38444cd4209785f8618093eb4033ecc6585a6679dd863ccaeddf1c858
+EBUILD git-python-2.1.5.ebuild 878 SHA256 016726bf399879579a726437c52dbbbe6054e8827c6612c6481d96bc59a331b6 SHA512 5947ccc99d977ffc585b7175f9d3d8d7c6b787aa64dd7c2e0690b86aced3a2e7f361fe622f23a04f010c4f049a4db7bb3725e64cf671de1b60d865faec3b24d0 WHIRLPOOL 1d9905cf2d3a693f8cac8d626e6cb9e87c6c661f12a38c0b5c329c6cf23e659925d42b7f31dec0232770b74624ee1d5a54c7fbe077902781990b955dd688635f
+MISC ChangeLog 4374 SHA256 531eb461281511ad83c85d2c36ded046dc634c7b622013b7d8faf563683c3698 SHA512 504e4147d756858f7bde5b76e150bd0ba9c6b6443382f99d84ad12abd327d6477122d9f94e71ff08858b29ea39242e465b30fe11ab16b9e5134c0bc69541a62c WHIRLPOOL c75813495729a379e577f9bdc6269ac8a26b8cc9ef7aac1a59c5db62bc07320a19fab4a580367387655f918cdbc74f3c8c92d64003a2140190dc9e3548f13be5
+MISC ChangeLog-2015 3298 SHA256 d574103b2bf27aa26f58d8af7a5cb6ff6efb652f2273be20ef633b8f3ff0421e SHA512 ebf3c6a02d3a0d6a18b2a3f6de4c52a928513b5018fdc88990b3a1abc34ca5366d97e8642e6cea0d35074181e2a778848b37e219dc38e0de229df9322ce57dcc WHIRLPOOL 27aaf8433241532caa5b75ab6541b4d2ea3c1b82e2519b4f5a55a7214156c279cfcf6520d5293bddf592f8324519e3de40dd1d731e4047b1a0229a252c15d0d6
+MISC metadata.xml 382 SHA256 fcf56c8c8119575b1d9995f69265e2d5f2d4ea0c33b8dc55b5ed9ec9c0e1139e SHA512 3f31be6d8a7fc5622f56141778f1779ff092a7e50f6ee162edc7854eb84b896206382edacf678e3f53f513727ca67e3cce0b6b6f50be7cbc93533201533ebe85 WHIRLPOOL 3ede1cbc6bd71e7a853fcd5a2e0e7d494a86afa801b8c0bdfe60d64cd4518a956aa9099f25ce31f2317de8f2002d6b257b95d40dca9db56c2d58c9990a7a66ae
diff --git a/dev-python/git-python/git-python-1.0.2.ebuild b/dev-python/git-python/git-python-1.0.2.ebuild
new file mode 100644
index 000000000000..407a96443c98
--- /dev/null
+++ b/dev-python/git-python/git-python-1.0.2.ebuild
@@ -0,0 +1,39 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="GitPython"
+MY_PV="${PV/_rc/.RC}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Library used to interact with Git repositories"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.python.org/pypi/GitPython"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# Tests dont make sense without a git repo
+RESTRICT="test"
+
+RDEPEND="
+	dev-vcs/git
+	 >=dev-python/gitdb-0.6.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+# $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+# is the correct entry for mock, however while RESTRICT="test"
+# there is little point in setting it since it is inactive
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/git-python/git-python-2.0.6.ebuild b/dev-python/git-python/git-python-2.0.6.ebuild
new file mode 100644
index 000000000000..3d1c453295f3
--- /dev/null
+++ b/dev-python/git-python/git-python-2.0.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="GitPython"
+MY_PV="${PV/_rc/.RC}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Library used to interact with Git repositories"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.python.org/pypi/GitPython"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# Tests dont make sense without a git repo
+RESTRICT="test"
+
+RDEPEND="
+	dev-vcs/git
+	 >=dev-python/gitdb-0.6.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+# $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+# is the correct entry for mock, however while RESTRICT="test"
+# there is little point in setting it since it is inactive
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/git-python/git-python-2.1.5.ebuild b/dev-python/git-python/git-python-2.1.5.ebuild
new file mode 100644
index 000000000000..88367417a705
--- /dev/null
+++ b/dev-python/git-python/git-python-2.1.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="GitPython"
+MY_PV="${PV/_rc/.RC}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Library used to interact with Git repositories"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.python.org/pypi/GitPython"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# Tests only work with the GitPython repo
+RESTRICT="test"
+
+RDEPEND="
+	dev-vcs/git
+	 >=dev-python/gitdb2-2.0.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/ddt-1.1.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/git-python/metadata.xml b/dev-python/git-python/metadata.xml
new file mode 100644
index 000000000000..7e626312fece
--- /dev/null
+++ b/dev-python/git-python/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">GitPython</remote-id>
+		<remote-id type="github">gitpython-developers/GitPython</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/git-review/Manifest b/dev-python/git-review/Manifest
new file mode 100644
index 000000000000..439468aa6891
--- /dev/null
+++ b/dev-python/git-review/Manifest
@@ -0,0 +1,7 @@
+DIST git-review-1.24.tar.gz 39106 SHA256 20fa8be4b86430b41153c270f770dd270bde06ff70c60c411aa9adc9db2f512a SHA512 7729358c8a99078d1e66d4682b9d886ab97fc82793838f14f7a30572e561a8e1b4c5ae11f7b347180ab34488af309dce7ee804d4a7c7873fa40b182ab6ee1ac5 WHIRLPOOL 07e33a18c42ea5689a4189134a44a3b5a9f95bea4a69f07a6a225a7577f2ccb829b15f41da901cc3e7ea0cd98c3b764bb2056456697bec0db619878b0976c0b3
+DIST git-review-1.25.0.tar.gz 51903 SHA256 087e0a7dc2415796a9f21c484a6f652c5410e6ba4562c36291c5399f9395a11d SHA512 4e3e23f9c016b6919377fbc44e426eba4db7dc2558dc64100fc51f5dde7c38387c092c26700bc4bb57661373e391c743098e4ffc845375b5d64de32891a81e67 WHIRLPOOL f6134568ab69e6b220d1eba74184593fb596ebbe35c570c4b89bed7919dd6bf1d6e79570b9831bd84195de6f8131c90c77d8f1bdb5a20ee0ceb445ddc22efe3e
+EBUILD git-review-1.24.ebuild 553 SHA256 ea4f98a0fb45351720cb0696a723a33aa7d36f0ea195e849ef52d65fca2de50a SHA512 172c7814a0d04dbd64754cf910398e4a0f644c2b51bb7abd750dcb7fac87fbcf0fd407552e2cf1b657d524f3ed35a1179f4ed3661c5a59b51382131134bc9ce8 WHIRLPOOL 74338f81423ba6ddd18b2f15d4b21fc3e89f1d85423b248072276792ad2a7aaa5336910e65272c7b74383fd5aa7a197ac6d39726d2f731f220ecbe889847340e
+EBUILD git-review-1.25.0.ebuild 665 SHA256 43f437a776222853b204028ba895c85ba3361b2efaeb84bb07e33a6de569f5d1 SHA512 c1c14c39c1e0ff27b95604eb3ce401f92a056568d552d4d8e9a6ab5ef261ced6bce7d576f553600aa942664702d1606f9092f21926b750808587d4b575cdc5e1 WHIRLPOOL 0b0800869628a2df31cb01ed8ecfd88141318b4c5e31408f77396fcbd36495eba8101f356b229461da3b15d1cebb98b04b49bec46f413b4c7940a62c4b397ec0
+MISC ChangeLog 3247 SHA256 1093f67bf4517ca9752945fe034f40d7dd2f51fb99d619d5b0f4e7010730afa3 SHA512 e5fe39a440618e2965e2feffc7d599df8f93af34c3b14f490cbdc3be76fa7ccca035fe22c65031ebefc9932066e9ed9dc42eb96b3d849eefbd520e86f1cec6ea WHIRLPOOL 12fb86e688b9088db1ce7952a620496ad9425d5ec7a603edb145779256647fa17b57c2f45737a17709e97dd4439ab73aaad2b422afcf406316aed255bb5e0e6d
+MISC ChangeLog-2015 489 SHA256 b3dac97eb20652acb8ea9684649a8fdd4469f1a1c6c56d812b056fa172885e9e SHA512 d55731588ab43c1051f408cd6f918f8379e5479a4fae47c937642f51cdb4306cf93e2dc9f95c3ab1cac9183376d7ef0ea9ae9444cce95748c502f6db870892a4 WHIRLPOOL 7ecba5cfc1952f2a8058df4b256592deb73eb87c2b91bee2df3a105748825465370c3136de825235b34dfb7d51c7a565400f4103560027f8d6917f6ee361594b
+MISC metadata.xml 337 SHA256 2f3da1a25035e317e34755e607a0d6e6e9c7a7647cb12d389f48d46b700fb1a7 SHA512 5bb1243f031097419ceadb6935e12567d359790e5fe63c19687f1cfe4a64f5dfa23b5704232d5777c6dddc1908b0856a780129dc08b787d786d2b867dc40ff46 WHIRLPOOL 7195835044fe74942c118bf40142d5300ab2b7a8422648aa496c7093670769dc2f73d19160a0010fad046b6613c2924d509b7cd7f6fc2fb05f27fe176db28db7
diff --git a/dev-python/git-review/git-review-1.24.ebuild b/dev-python/git-review/git-review-1.24.ebuild
new file mode 100644
index 000000000000..c6f21ff1a656
--- /dev/null
+++ b/dev-python/git-review/git-review-1.24.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="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}]
+"
diff --git a/dev-python/git-review/git-review-1.25.0.ebuild b/dev-python/git-review/git-review-1.25.0.ebuild
new file mode 100644
index 000000000000..eaefa3706be5
--- /dev/null
+++ b/dev-python/git-review/git-review-1.25.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="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/git-review/metadata.xml b/dev-python/git-review/metadata.xml
new file mode 100644
index 000000000000..ca090fae8914
--- /dev/null
+++ b/dev-python/git-review/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">git-review</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
new file mode 100644
index 000000000000..34cc444d640e
--- /dev/null
+++ b/dev-python/gitdb/Manifest
@@ -0,0 +1,5 @@
+DIST gitdb-0.6.4.tar.gz 400506 SHA256 a3ebbc27be035a2e874ed904df516e35f4a29a778a764385de09de9e0f139658 SHA512 2314ae70ec26c46c559cc69a1300ead8cd65a0a22425a3bb36b04edb73bd5e2628cbdcd8e515830c74b21af2badea662c915a727d9a46ed2f92f169eb71bdf62 WHIRLPOOL df7425efd5f2c6a704b3545723ce8e27fdca09c435f52685dd4dcca7eb3eb3da8d89fbe88e2d9dfee7984b029b9ea741b32a6afcdbccb5bcbd7b04ce59f6d552
+EBUILD gitdb-0.6.4.ebuild 710 SHA256 d00e65471954d41cdc9749c6d8a657cfbe865afb8e5a99359394df574d6d251c SHA512 5a8791dd83f2a11d14a177df2b3fb96c1dd442c647adecd729667f1d76057afbc463c2a69f174967e42e3fcc71e61953de6aee372d204e1c6ab7fbe562563fee WHIRLPOOL 0a91ea2bcdea77e41916815b4403b380bd56fcb66342e56b6aa93b3498a0218c0d8394c64c7c6a2f77fdb99953792cd43101e7be0fc167042547121425a872e6
+MISC ChangeLog 2958 SHA256 f2df13c9d8b5cdfeeea266d87d334838d2bb4bc7a605e1e3484eeea88981c86c SHA512 83f9e9c969b16ab6bddd01854f4a718d40c8c7632fad29ba4c94e4788f5cae00894c7a3fe0a319f2e0731448e747e8c690d9aa53f2f0b7bdd0c8eef7dcd17465 WHIRLPOOL a5f4f84ead040efb5294eb3869118484105eab56127b1e8cf0fb28a015f2c1b778ab91167eb80310d54bd90ef21fffc01ea644b8aa5f756fabbea005e1502da0
+MISC ChangeLog-2015 1551 SHA256 969a14ce204f74d8bd8ba21d0706494fe0fcd0bafa917cebf2aee281ab7ef47c SHA512 7f4ad5ac3ad12a5418c43567678b2006bdd437e131ef0a6cf2f48fc728c29365f9a519be2531c389a63f90a5153447fc7f4bbe2520fcc36a2ecfa3a5a4e5d6fc WHIRLPOOL 593a06f552ab2b5365e8753b7512dd0828b9a3e2af1327e885911358a2aa7391e33880774d8342c0bc2a9a6f5355e33fdaeae0ae894f089124353833908f55cf
+MISC metadata.xml 386 SHA256 46146d4739167d0190b55c584c8b8197c684c97e27681509abba78b92b51fddf SHA512 b9c7e7c5575d60c1f6f50f5577ca4bb9ba64285555890400edf4a7118d9a7546d71eaffdb9cc222e464b9397496ad832595e8d4f864228421a764b9ae3c3ad87 WHIRLPOOL 0a7f5ff0225cf0c3fbba1fbce7de3f25e0789a5b0c7ad390b402c3960152a65bcbd1234d8a2fc86b7fe188a19a745511b075dc7b522cbfbabbe924c8dee88e17
diff --git a/dev-python/gitdb/gitdb-0.6.4.ebuild b/dev-python/gitdb/gitdb-0.6.4.ebuild
new file mode 100644
index 000000000000..e3c073b7f0e1
--- /dev/null
+++ b/dev-python/gitdb/gitdb-0.6.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="GitDB is a pure-Python git object database"
+HOMEPAGE="
+	https://github.com/gitpython-developers/gitdb
+	https://pypi.python.org/pypi/gitdb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+RDEPEND="dev-vcs/git
+		>=dev-python/smmap-0.8.5[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+# Testsuite appears to require files from a git repo
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
diff --git a/dev-python/gitdb/metadata.xml b/dev-python/gitdb/metadata.xml
new file mode 100644
index 000000000000..95de8c8c4ea2
--- /dev/null
+++ b/dev-python/gitdb/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">gitdb</remote-id>
+    <remote-id type="github">gitpython-developers/gitdb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/gitdb2/Manifest b/dev-python/gitdb2/Manifest
new file mode 100644
index 000000000000..7e844c20e29c
--- /dev/null
+++ b/dev-python/gitdb2/Manifest
@@ -0,0 +1,3 @@
+DIST gitdb2-2.0.2.tar.gz 393188 SHA256 f2e36d7561e91f30a6a44858756dc020d8f1e81ca6e4185979d5c6c24c648070 SHA512 685af97dcb1f352255024b8a382255dacea00aa6312f71d2a16eab00d0204ebf6d46c90d804a4778ea0ef35eae7e5a2f5ae71c16851206fdaf27be8af59499d9 WHIRLPOOL d79705c7bca170f98f47ec7b437af6b9d2b0d1c5fffa57b863ade7a3d4b8e950860f9b1a08aceb5a8c5a2135266a671b7a35bd56f39777a40e8b1afaaadcfdc8
+EBUILD gitdb2-2.0.2.ebuild 1232 SHA256 efc076bca5afa3b0eddc081f1b350ab908c15310002cb0f08b31a632a2f8a008 SHA512 a175742c8e932e8303a1e7410a9d73f616b243b12b8c360a14ec58235faec98cd3b6cac66a5a5415e91babf10251245895045ff9aa6784f2f20f1fac3c4e105e WHIRLPOOL a0642c03b0e400b1be5aeed8bcaf9143f7bd7d55f919126bc276dbb36e92e1d63840f84587c2f7f01f401b15d1253d70482541a56ad1b955b4531b3d4bde9d48
+MISC metadata.xml 387 SHA256 a1bb06b927c5604c6c96d2a37b6a1ed4f86c1d40c5d174a9c67feafbe6a6705a SHA512 09f4154dd271adbf328fcc0ef35267b1c3648c919f6c5d3de480a815f5d5b49b4c4f6661f9f1839bede87834c01c2b27145c6295b8f99804aa45df3eba669eeb WHIRLPOOL 05c9f4e356cf0dd98ae6199f9e2be37b9fa1467f938c19513292e22d120104a9cb13008f1d8d39affc7a08eee898f67b7d20006b98efe1c8b33390a2a77ad44d
diff --git a/dev-python/gitdb2/gitdb2-2.0.2.ebuild b/dev-python/gitdb2/gitdb2-2.0.2.ebuild
new file mode 100644
index 000000000000..4aa4893fc037
--- /dev/null
+++ b/dev-python/gitdb2/gitdb2-2.0.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="GitDB is a pure-Python git object database"
+HOMEPAGE="
+	https://github.com/gitpython-developers/gitdb
+	https://pypi.python.org/pypi/gitdb2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	!dev-python/gitdb[${PYTHON_USEDEP}]
+	>=dev-python/smmap2-2.0.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+src_test() {
+	local i
+
+	mkdir "${T}"/repo || die
+	cd "${T}"/repo || die
+
+	for (( i = 0; i < 2500; ++i )); do
+		echo "${i}" > file"${i}" || die
+	done
+
+	git init || die
+	git config user.email "you@example.com" || die
+	git config user.name "Your Name" || die
+	git add -A || die
+	git commit -q -m ".." || die
+	git clone --bare "${T}"/repo "${T}"/repo.git || die
+	cd "${S}" || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	#TRAVIS=1 disables performance tests which rely on the gitdb repo
+	local -x TRAVIS=1
+	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/gitdb2/metadata.xml b/dev-python/gitdb2/metadata.xml
new file mode 100644
index 000000000000..005b63ca8056
--- /dev/null
+++ b/dev-python/gitdb2/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">gitdb2</remote-id>
+    <remote-id type="github">gitpython-developers/gitdb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/github3/Manifest b/dev-python/github3/Manifest
new file mode 100644
index 000000000000..b7591bc1e071
--- /dev/null
+++ b/dev-python/github3/Manifest
@@ -0,0 +1,3 @@
+DIST github3-0.9.3.tar.gz 783446 SHA256 5836eb9f7cd1099ad4c2804fde55ddc068add23008d001f37afb266dd014292b SHA512 23d7ca5d9e5c4efd37541ec0be56bcc50c36d141999196ea2f0c17068ef1235e758d48c3e4fe9c8e204bac98931995913a4c3af227cfdbb7382bec8ac91b3c19 WHIRLPOOL 4b82d89536ee51f2c99de4cb7057fcc5c0a84133d73f13eb2e592874a49c85ef3a25d991b5e1bda39c0b23b294b409b2227de3aa96e32928a3cc9913b690f98e
+EBUILD github3-0.9.3.ebuild 660 SHA256 9c4128e68d86d8227c24aad554794135669b2c365dc22d0f71467ea3b358ab35 SHA512 0a2726ce2d0513b1e1a8e4a8a8750d1891086292c8defc2a4ffcd5e1aa2e6ff370eda3fba286e17ab79d241f3356d85c10bd41a9f42256934e5eb6a8b5c27ee1 WHIRLPOOL 3a4dfb35366f24f09f1734784a39020d2d9235895bc758576430fc935bb68e027bda95f02948d67106bcedac0e23c0d6d01c349b9770f2b6f2832a0bc11e0e02
+MISC metadata.xml 626 SHA256 8cda110f426d46d081006b2ba3c9bb4c8fd7a9cb8565d4d8103abfbf5802bf05 SHA512 e7d2ee56150217ba65f153d875c0771fc99efdcf5a29682369e1b22d121fe55d77c38f45586f6b6e3723f9356e9004e4d3676ee09c21bda4ce5101b8ac551690 WHIRLPOOL 314aa303fba1fa1185124b3bbdf5596ecc03570b7e6990f2b07a98909485f7c074bb092aaae78ff43b0efdf24991d3dc4bb28b977558ad0c65cac13873243dd1
diff --git a/dev-python/github3/github3-0.9.3.ebuild b/dev-python/github3/github3-0.9.3.ebuild
new file mode 100644
index 000000000000..ec394a6f4df3
--- /dev/null
+++ b/dev-python/github3/github3-0.9.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper for the GitHub API written in python"
+HOMEPAGE="https://github3py.readthedocs.io/en/master/"
+SRC_URI="https://github.com/sigmavirus24/${PN}.py/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-vcs/git
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${PN}.py-${PV}"
diff --git a/dev-python/github3/metadata.xml b/dev-python/github3/metadata.xml
new file mode 100644
index 000000000000..556e313bfbe8
--- /dev/null
+++ b/dev-python/github3/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>nicolasbock@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		github3.py is wrapper for the GitHub API written in python. The design
+		of github3.py is centered around having a logical organization of the
+		methods needed to interact with the API.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">sigmavirus24/github3.py</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/glance_store/Manifest b/dev-python/glance_store/Manifest
new file mode 100644
index 000000000000..734466fffce2
--- /dev/null
+++ b/dev-python/glance_store/Manifest
@@ -0,0 +1,11 @@
+DIST glance_store-0.13.1.tar.gz 127250 SHA256 e2f2051ff22abaa462fdb7fe8741312de8543bba7f6f65165b9c52343ccd35fc SHA512 1625849ed35d8fec6d730790485451fd740240a6fd076ad084cd0444b5b8bfadeab82164854a9bee194f6f3cabff7c30815d5fdcd800a7d982ed8c3224e6aaec WHIRLPOOL e16ad3aef7ca1ef15ead956fa7e459a4f6259b3c7ffb0086b11aa5fe2c4034011d306df09255cf6b94bf9474861546e483147c3823d804b661244455e463a217
+DIST glance_store-0.18.0.tar.gz 126949 SHA256 56b8b33f5deb74c652bd82d781aa82459e14152a5ee5c74726f0f1545c2355a7 SHA512 f23505b0081d0bb9948a4a2550868ea9864c00604358264c826551caccb4e35cbdcfcaa1e0ed3d470fbe72250196e246b596cbb57db0e99cc49fba3e0c609e01 WHIRLPOOL a1f26bc06a19a6deb14b910813829a07726ec9408b71e4fbb854ea3a2815f872cd27dfd82ae4f84e1bf49fdf5b89ef079c8f17f24a883bbf5a2cacc218f0ce8f
+DIST glance_store-0.20.0.tar.gz 129769 SHA256 9109738038f22fc229eb83698251c7d3086cf227922e7e3625d8d204986d818c SHA512 456a316763b2364747d24472aa42cf7602d3432043a52164a141ea0827afd2c92e6770a4c04ca7bb3c96cb9103080801cb1095a1869e5851c0ee83c4e7aea018 WHIRLPOOL 47f2f968d228038c69d6510a9845e6789369283c29c25b9f0babae9d50090034f40665f89421cb94f378b7ad147d03ed5516a84b29645ccca18d4c4a994017f5
+DIST glance_store-0.22.0.tar.gz 130377 SHA256 a3e073beefabc79a78a6798b818b00cf19a2552f6294f22fc55ce0a88eed1b1f SHA512 3de073fd4926513674b87afb15a2d4485c4a98f76c7d36cd0957a9cd848399bfb1fc6b3b40550522b712e9bbddf8efec5c3fc629a944fe447543d35eb7184168 WHIRLPOOL f79346df5787dbce546ff22ade3d23c59e5b4b68ea83970f8a6442c98227af29b87aea3336928e5115702a1fdbd5cc1277dc06beff33a1a54da677dae27f2501
+EBUILD glance_store-0.13.1.ebuild 1620 SHA256 e416c41a1fc9377f7e2118238511238e1d050af7dd9ae1af4916f6d0cff689cd SHA512 67b81b9f84c47f9ec95cb457e049aa386b798b67af37fb0b7fb7747c7a423c010d11393f8911cbfe782c1cb28a20dfbc2ce35c5d9a19601232ed4ea884b902ac WHIRLPOOL 2586a35a41c38b4c40114770613a443502299657b15792bf1bc6728dc83533ac68ea73f685a5cc76b0ff8f8968b013a07dee6c68673392161d642b69fbfdeba4
+EBUILD glance_store-0.18.0.ebuild 1517 SHA256 7242f79250e677e327fa8893a86a0c8edd1f0a7372a754a8e81246655215c28f SHA512 8f25f3a53f6315c9fa53994531b7635659f3cbfbb11b0cffbf370baab4ded52ce2512988e41d7f9a66df2d6aa20d75214b90230befa9be288b269b90bb685030 WHIRLPOOL 52bdecf07d59a920dde250d2ecc65e2fb2e0edeafa4204960f032d733b9d22749113d598afae7889c6d60ed5aa141549b656845724d29a5c9cb895f4ef183f34
+EBUILD glance_store-0.20.0.ebuild 1455 SHA256 e5ca8f633c127f6187891239a0e52ff28a4ba60a91cc1fd3709d3d8936d320ca SHA512 388e50051c7402a682d46f56b39e9952c2a0b85acb7ed4cb8e174c07b3cec57666fe2577e14e21a5899d7560be88863cb3087b8883871581aa59cf8904bbb919 WHIRLPOOL 4e61a0ea33c9dc6b32ac2561a437877813774f55426315eb88dee637be1c2d85e68f61ac3e12e77b0f2fc8c0165b64b2fe2705b986874cf59480276382f37fcf
+EBUILD glance_store-0.22.0.ebuild 1631 SHA256 8b2708c671d89c08f6106c93a6947f74faf7565a9b32e0d2e1818532f67e301d SHA512 09fdad30dd0da08e1e685bf85a3dd6f5c95379d36743d6bc30cf67bdd8ee82e42a7ebf00bbcaf791942fb2a7376279c9c0a2713395e744f650d5a601fa1f0ed3 WHIRLPOOL 17bfd066304a77af614ab54578d4b430dbcad17960e40f0a5aa2ab729125c9379d5ed8aaee1fd85ed015e978ef9cf0ee07ec457a6dbb1a6f66a01ee35864ff41
+MISC ChangeLog 5682 SHA256 c1506d2f104347a8654c43b088f26b650316cf6a0085c4396a74da627919e942 SHA512 503b3f6fbfb3edb1e54bb222950923715a5935487ced12d11bee347a2a5a2bc60f17f0e0bca6bab102b48f2681ec80fe28105e4b62fe9e50a92f23fc3a5ef40d WHIRLPOOL cd3ce37d529d9cdd9a426992387854a6715c3f8aed3a5203f117579f58fca33d31363246d8894934db12d0d03f75a7dbe78b48ce2e57a1929a03153c6bcbb31e
+MISC ChangeLog-2015 1196 SHA256 7dca74d315c517cbc8b85213ed24ba374a489c428c2138d0db95e080c3714165 SHA512 92305fc4638a6104f157baad6ab5eefff6af9197d502a9b586e65794fd5a434701732f3a0f48601b255aacde6127be8e166aa0163d99777c2c5d9bff3cd6f4df WHIRLPOOL 54ec45b443db67f1d9a1641b8b377817d2f34c770b2248cf4f8f6ba78cc1468bc719e5180d1648f2e18e75ef783f3692243bf6101d390ca2a923bc4c9ecbbaa2
+MISC metadata.xml 692 SHA256 9c02c41ba2e52a1a84409585f2eafb7661d683117af4bd297577140da16205d0 SHA512 97172f66abbafd05483b8b7d51ae5a1384c5beed369eba1fe8828b83186b06c90f88f5ebe0c9bb69164f76a3214bb7af67e95b9b16fe774fdfa60948891f13ac WHIRLPOOL dfca157d00ec57acb292c5e6a0717e3dafac6179ec381b2402d0e614d46305d12eec461b6ce0bc8b330d30906e73d9341b14d3bbceab6a3ee32c1dd3361f2d50
diff --git a/dev-python/glance_store/glance_store-0.13.1.ebuild b/dev-python/glance_store/glance_store-0.13.1.ebuild
new file mode 100644
index 000000000000..8f8478e527c8
--- /dev/null
+++ b/dev-python/glance_store/glance_store-0.13.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for glance"
+HOMEPAGE="https://github.com/openstack/glance_store"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="+cinder"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.9.1[${PYTHON_USEDEP}]
+	cinder? ( >=dev-python/python-cinderclient-1.2.1[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -i '/ordereddict/d' requirements.txt
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/glance_store/glance_store-0.18.0.ebuild b/dev-python/glance_store/glance_store-0.18.0.ebuild
new file mode 100644
index 000000000000..201407baf74b
--- /dev/null
+++ b/dev-python/glance_store/glance_store-0.18.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for glance"
+HOMEPAGE="https://github.com/openstack/glance_store"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="+cinder"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	cinder? ( >=dev-python/python-cinderclient-1.2.1[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -i '/ordereddict/d' requirements.txt
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/glance_store/glance_store-0.20.0.ebuild b/dev-python/glance_store/glance_store-0.20.0.ebuild
new file mode 100644
index 000000000000..e0841900f036
--- /dev/null
+++ b/dev-python/glance_store/glance_store-0.20.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for glance"
+HOMEPAGE="https://github.com/openstack/glance_store"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="+cinder"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.0[${PYTHON_USEDEP}]
+	cinder? ( >=dev-python/python-cinderclient-1.2.1[${PYTHON_USEDEP}] )
+"
diff --git a/dev-python/glance_store/glance_store-0.22.0.ebuild b/dev-python/glance_store/glance_store-0.22.0.ebuild
new file mode 100644
index 000000000000..f39ec966e1f5
--- /dev/null
+++ b/dev-python/glance_store/glance_store-0.22.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for glance"
+HOMEPAGE="https://github.com/openstack/glance_store"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/glance_store/metadata.xml b/dev-python/glance_store/metadata.xml
new file mode 100644
index 000000000000..c097a6135423
--- /dev/null
+++ b/dev-python/glance_store/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+		Glance's stores library
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">glance_store</remote-id>
+		<remote-id type="launchpad">oslo</remote-id>
+		<remote-id type="github">openstack/glance_store</remote-id>
+	</upstream>
+	<use>
+		<flag name="cinder">adds cinder backend support</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-python/globre/Manifest b/dev-python/globre/Manifest
new file mode 100644
index 000000000000..5adaffa4d732
--- /dev/null
+++ b/dev-python/globre/Manifest
@@ -0,0 +1,5 @@
+DIST globre-0.1.4.tar.gz 19274 SHA256 eab210811e7dbdf8ef698cc6b8d9e4b218cfe16e8286520cea78a509de4fbd91 SHA512 288b2a6e9e1b7e646f7b06db73b255f9710007c0305466a8d4e26245ab73efb14e5b543291937edb3f0d1dd9205391a08a073d106f4ed687e2a21d181a83840b WHIRLPOOL 67ecc9a99f82dbb7e0c0b85530b0b8d6e151360de518ca2fc93bc554daf5d8d5578631a3cb89b87509c3a9a56b69da57097a2149f884b7d604a5d135ce02de13
+EBUILD globre-0.1.4.ebuild 685 SHA256 f8b9970af85fe5fd72309203c0c6871ba80991141775e474b8070cdefe65b25d SHA512 b0f48e45595631e3175375145bef0c57ddea901ae7103bdac6db186b4c732b24989f4cf62adf603e0090b04652a66af21d8e44d90ba52ce0ef31b608ce67f65b WHIRLPOOL 6df6f5b91df2df49e91aaff0ffed618ca544c06902bd79594759b2a948c934c0a654ef4ae9eee4f6b4f61e8c7d5506c565d45e926fb1e67bbf625beeeec85b2a
+MISC ChangeLog 3417 SHA256 00417259503ad283ce28765ad5cfc3d328091859be921c78292140354a7842d0 SHA512 08a1162dc5de6ef7846cd31699eeb16af41f57890837360b7cd1707aa0b740304e956ee7650a249b07b5209915c79ef34f1beffcc046c6aca52eb36f6e044415 WHIRLPOOL 9c7614e0bfe75bc0e508a5d7c233d3b92ae183c0c7cfa40b3d81d3fdc5e312cab198df798d2189049b0b90c1094177cf39618d74f4a2de1cc76cf13af6401f52
+MISC ChangeLog-2015 522 SHA256 d54f7f6f6f438a0263de43df86c407ba2fa228a7ab658b5a1b52497aab3ebd96 SHA512 dd8fec5dc716d0b94f3cd991af128a078599762844132b55cf5887e5d70463805c119545d92c78380a974812e13727e86b792a656c64f5ea0358cb3f723d6ac1 WHIRLPOOL 490ee6b8a96893e9c22f7095968cef334a1e07362d9ac7a91e1d8057cfae55e34e15cc1c47baa4cf1e7fd3c26d7ec1199fa6e294701375869618cf3bb7a4a1a0
+MISC metadata.xml 367 SHA256 7a3e2b36d8c471c37b2c25d941a2fb1b6c23538da2f4e757b64ccb7cdb662f43 SHA512 d6d5ed219d18649e5c54e8a8b7aec3119f1af0dbaeab04953e88ee825aba9ec309374ea32249f8f3e36bf80b6fcd91a345f9562ec757efcd691ba8dc5a684257 WHIRLPOOL b6d203111ad15a7c3cb97def177c05610f3c0a99c63c4691a8cdbeefe26da2ec01702699ed417c38d44b1b81d9285c5352426472c3dd9c449b8b36a4725d859d
diff --git a/dev-python/globre/globre-0.1.4.ebuild b/dev-python/globre/globre-0.1.4.ebuild
new file mode 100644
index 000000000000..e5f0dd76320c
--- /dev/null
+++ b/dev-python/globre/globre-0.1.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="A glob matching library, providing an interface similar to the 're' module"
+HOMEPAGE="https://pypi.python.org/pypi/globre https://github.com/metagriffin/globre"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/globre/metadata.xml b/dev-python/globre/metadata.xml
new file mode 100644
index 000000000000..61600bda6526
--- /dev/null
+++ b/dev-python/globre/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">globre</remote-id>
+		<remote-id type="github">metagriffin/globre</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/glue-vispy-viewers/Manifest b/dev-python/glue-vispy-viewers/Manifest
new file mode 100644
index 000000000000..995b5570956c
--- /dev/null
+++ b/dev-python/glue-vispy-viewers/Manifest
@@ -0,0 +1,5 @@
+DIST glue-vispy-viewers-0.7.1.tar.gz 682074 SHA256 ad42bb4726a3f80dc2096de0bfa0c3f4f322fd52a359601bfe9b9fab3e3e041d SHA512 7d32abd75049a0f8d95ae99baf8590f1748f0232ed134c10f6625edfd31009642f836c4232e2c727a193d9cd2a085c1af4d0a4602ca326cee4b3dac3bd1390f3 WHIRLPOOL 442c102412bcf04baa48b2f947261fc6a9aae27edd6b0b32a607dd435fc525934209236b8cca6b4875dd4335212a0d41265faefca20b7452f12a278bb7214a99
+DIST glue-vispy-viewers-0.7.2.tar.gz 682795 SHA256 2daed5f7c5cc01feda1f0d19ec94feca37192ac97be669b276c649f2f6fd1e72 SHA512 687bb732a55d18c50aa16aec0b7c1b56712e84556f60c6ea8600f0c2c5cce9404c54f4d7a6b9d193f94202b16e9902045c3e8c3fc0f0347c3a30ff7b21177c27 WHIRLPOOL a15a52c205c44f276441de3d86534bb165c8167bfd78de59070a19bf3900e8079834562b203f1d6aee55182df6bcf61138a636a291fe05b60bc3b499de320c71
+EBUILD glue-vispy-viewers-0.7.1.ebuild 1007 SHA256 499263dd3a917202d326bbe0f61c86e9481bedc4299f020bce4a02003f221e9a SHA512 213435cb87f249d4ba90883ab8930063784dcb16f5fb674fb7a6eac6b7bec355145b869694958f50d4a778b2814062a9dc07d5b3485f2362e97f4f67662f0241 WHIRLPOOL 661c937281cff75b54252538b1e3dcf3874e3d2b4493711ac35d48964c3690a976a6dd39fd6e09250792b2b1b46a904bcf16af43ef8b6e86d0698ac88edbeb33
+EBUILD glue-vispy-viewers-0.7.2.ebuild 1011 SHA256 940f0b602cdf75d72c19ae77b3df4816651daa529080ce31f3c3022376c9c805 SHA512 b80dc72bc51c400ab59e987d2c2917c4f49d84a1c4bdeb090442cc2ff2a3fbae2aad95a1100e194178ce80e524a70410de67b6e1c86df420908900b8c1f61c9d WHIRLPOOL 90b598721f8b56e2927c5c57555964e99c42b3525d2e83cc46d44e45165f307052105fc4be7df3faa9670ab1134cb334ae21f8ab851c33ea75df6f9c8864c994
+MISC metadata.xml 529 SHA256 9a9fca2c3fba010e3c3ba8ce9f0fd1c9504eef95771fc7f28db52381aff988c4 SHA512 4682153ce74e9d7276224de2f44d8e6a091d43d9705229e538350b3f968151c497f310ac2f1a24a3b980db9d4ccdb45af7ace313e739e665bf456d4af45657e5 WHIRLPOOL 23e8d8dbd402b9e78b7cb5b8dfa38f701ccc0670375b344efa15e586e90c6f2811abf71f87e28279cad4a9f5c5a5abc11c1a8baee60a00a8d78634e0fbf54084
diff --git a/dev-python/glue-vispy-viewers/glue-vispy-viewers-0.7.1.ebuild b/dev-python/glue-vispy-viewers/glue-vispy-viewers-0.7.1.ebuild
new file mode 100644
index 000000000000..63e8e293e66e
--- /dev/null
+++ b/dev-python/glue-vispy-viewers/glue-vispy-viewers-0.7.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Vispy-based viewers for Glue"
+HOMEPAGE="https://github.com/glue-viz/glue-3d-viewer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+DOCS=( README.rst CHANGES.md )
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/glueviz[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	dev-python/QtPy[${PYTHON_USEDEP},designer,gui]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		  ${RDEPEND}
+		  dev-python/mock[${PYTHON_USEDEP}]
+		  dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	echo "backend: Agg" > matplotlibrc
+	virtx py.test || die
+}
diff --git a/dev-python/glue-vispy-viewers/glue-vispy-viewers-0.7.2.ebuild b/dev-python/glue-vispy-viewers/glue-vispy-viewers-0.7.2.ebuild
new file mode 100644
index 000000000000..16235c1bad69
--- /dev/null
+++ b/dev-python/glue-vispy-viewers/glue-vispy-viewers-0.7.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Vispy-based viewers for Glue"
+HOMEPAGE="https://github.com/glue-viz/glue-3d-viewer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+DOCS=( README.rst CHANGES.md )
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/glueviz[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	dev-python/QtPy[${PYTHON_USEDEP},designer,gui]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		  ${RDEPEND}
+		  dev-python/mock[${PYTHON_USEDEP}]
+		  dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	echo "backend: Agg" > matplotlibrc
+	virtx py.test || die
+}
diff --git a/dev-python/glue-vispy-viewers/metadata.xml b/dev-python/glue-vispy-viewers/metadata.xml
new file mode 100644
index 000000000000..5b0df1b06b07
--- /dev/null
+++ b/dev-python/glue-vispy-viewers/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Plugin to view 3D in Glue visualization toolkit.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">glue-vispy-viewers</remote-id>
+    <remote-id type="github">glue-viz/glue-vispy-viewers</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/glueviz/Manifest b/dev-python/glueviz/Manifest
new file mode 100644
index 000000000000..91d7d7cb4f56
--- /dev/null
+++ b/dev-python/glueviz/Manifest
@@ -0,0 +1,8 @@
+DIST glueviz-0.10.0.tar.gz 12645658 SHA256 1c3dfbe721a3566f968b388f9806d0e91238ebb9eeefcd3f7eb9abf7b33b8930 SHA512 1b42e600a7aa01320512c38aa40388a39fe93f2efe0bfd668492de13559d6fa2106cabcd755b35346c4dd80099db94cfec5e791a5f53a4258bccd61d1e836ea3 WHIRLPOOL f9c3bc4a1089b3e44ff54f373ecf5ac018b3394f2ca43e810a815f83cff200d4458b860816ef2d2d7fd69b3ec345df4d93ca435d5d3ddb02ae1f6907037a4495
+DIST glueviz-0.10.4.tar.gz 2395 SHA256 8dbe3cca9f2d4a4b8d67da74001d90c43b4a636bd80ceb6e74908e1b7d484481 SHA512 c372e04a52a1e4609a8545f3330d539f0afbbe30b09d4f3c0be28895bab82ab1825cb907297562adaefa11c0c94b25c74ccffc31b5a272eb45724efe6180e8f6 WHIRLPOOL 5956d629f9ebca15ec25379bf9cb0fd7bf49ad074b87122179008bf173871798a15c6cb4292d97caef22dab907b53066572b90f9e611b660d487eddee7150052
+DIST glueviz-0.9.1.tar.gz 12229471 SHA256 b0cd6de792ca5812bae7a033b96acafcf9fa7ab49919c2dc876b8cea877c4fce SHA512 d4b8e476c3ec37a873084cbe1e0c3019aa7bfe7d5d03af4cc1d6d14474200060d0a8a608e90024ab0aaf10d71f85a2c82ae1371e2a5d14f7c91ca5d979c25d30 WHIRLPOOL 220127d131692bceb899a65ca4f3b13720b8eb835c66b6d3b09ee3ff1f70f65cb1c18ba64ba2dfdb791d4d6e83a332d3ba405f7871b3c7f812cb7e0363d7da43
+EBUILD glueviz-0.10.0.ebuild 2012 SHA256 80b6de93dfb858d21338b194ebd3600ccb5a3a10ce2328b8321a863a466df24b SHA512 1ecdbc2715fd0bee9f1fcbebc1e13b3f97344fcfa1b6abe46c170de83e4b84b76d0a91affdec433f22d21ed6fa164939e03a38cf6896b02b722e3ea1b741cc16 WHIRLPOOL 853424296ba92820782fe19ec4608f674ad796164c05ff00c3f69bf2006513e84c5886bf7f637bed0732c7911df18d62acfaaf4eb6a1136dba20e67e94f1b09b
+EBUILD glueviz-0.10.4.ebuild 2058 SHA256 f0b8e077eab886239427a85c0960b5f1eb434064f6c49c96b804ea153c9ab44b SHA512 03d0f8effbd778c6f686e644d4a5e99b7cf85cf577a5fe2e0d1e17e5ffdcc5ffb630444a137f4f7e7f1ab801f45125f4e7a48c7bbb3ea99f4841bb6ddfeafd25 WHIRLPOOL 9da42733b2c8760a2b69078b3f823816d117edc27a968ee10a07d94f89a617170b23bfc5046c2abf6087070fae565d330e05834c09fe6161ea674e6f144eace9
+EBUILD glueviz-0.9.1.ebuild 1865 SHA256 54fa94889d52ac9094b6b741e06d07e04a90671adc0848ba7e04e68cda794d7d SHA512 d1e31ab02149e15b1aeecd9eb48e5feda97416a72f6a78f4caf639914b8229f75926842a88b57a0ffc8ada19bd3b64aca51c67b1a4ad80b38372538dc058dc20 WHIRLPOOL 6d6ba5670075a368d638a353a12e515a5cd813147a9c88142a3da2bd55615354030516e5bdf9ad298e28f9bbe0de6ef60fb494187ddc3c33161f6706379b092a
+MISC ChangeLog 1501 SHA256 f5fbe16981fd6a0b7d57bb46aeb2ceebc750b712b1d11e16503b601ae4ce8ed3 SHA512 5cfc993b1cf27ea557513d110e6a75e08e42c14d1c0e2771ee4e2266a7cace718092e8aad55374fd54ca4d95f1da20ee2d4e72ca7b0ef62c131b43d8097cf259 WHIRLPOOL 611ca28c1aa932e204ac373f3fc952bd9150b218173516d8ee482ff9957d0f7bf140b088156f386600b49be79f6fdbb72b3a22c0943f2c863f99deaae9aba3a7
+MISC metadata.xml 590 SHA256 aeb48c86b0e27a98ead5f7e7cf1601826099228ec7b9c9d26b8d3bc53685d506 SHA512 c7e9cf9b5889352b5f56bd3945a46ca22ba51c4f15dca335beedbf83eb34f16da61a5f8d7ea7bfd75a1f8168683088411315b28e2d9005f2771067624e52a0c9 WHIRLPOOL 0d989e5494eb34050310bc945fb4ea7c464ccd3112a4d5a3872356744ee023f4dde4c84525d7f440dd2d9521ffe7cb1a4c1d36411c672221b097be86be246d74
diff --git a/dev-python/glueviz/glueviz-0.10.0.ebuild b/dev-python/glueviz/glueviz-0.10.0.ebuild
new file mode 100644
index 000000000000..22c72e5d74b3
--- /dev/null
+++ b/dev-python/glueviz/glueviz-0.10.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 eutils virtualx fdo-mime
+
+DESCRIPTION="Python library to explore relationships within and among related datasets"
+HOMEPAGE="http://www.glueviz.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="test"
+
+# as of 0.10.0; broken
+RESTRICT="test"
+
+DOCS=( README.rst CHANGES.md )
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/QtPy[${PYTHON_USEDEP},designer,gui]
+"
+
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		  dev-python/ipython[${PYTHON_USEDEP}]
+		  dev-python/mock[${PYTHON_USEDEP}]
+		  dev-python/pytest[${PYTHON_USEDEP}]
+		  dev-python/qtconsole[${PYTHON_USEDEP}]
+		  dev-python/QtPy[${PYTHON_USEDEP},designer,gui,testlib]
+	)
+"
+
+python_test() {
+	virtx esetup.py test
+}
+
+pkg_postinst() {
+	optfeature "Interactive Ipython terminal" \
+			   dev-python/ipython \
+			   dev-python/ipykernel \
+			   dev-python/qtconsole \
+			   dev-python/traitlets \
+			   dev-python/pygments \
+			   dev-python/zmq
+	optfeature "Parse AVM metadata" dev-python/pyavm
+	optfeature "Save ${PN} sessions" dev-python/dill
+	optfeature "Support HDF5 files" dev-python/h5py
+	optfeature "Image processing calculations" sci-libs/scipy
+	optfeature "Read popular image formats" sci-libs/scikits_image
+	optfeature "Interact with Ginga viewer" dev-python/ginga
+	optfeature "Export plots to plot.ly" dev-python/plotly
+	optfeature "Support Excel reading" dev-python/xlrd
+	optfeature "Used to read in spectral cubes" dev-python/spectral-cube
+	optfeature "Support astronomy dendograms" dev-python/astrodendro
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+}
diff --git a/dev-python/glueviz/glueviz-0.10.4.ebuild b/dev-python/glueviz/glueviz-0.10.4.ebuild
new file mode 100644
index 000000000000..2757d82c20fb
--- /dev/null
+++ b/dev-python/glueviz/glueviz-0.10.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 eutils virtualx fdo-mime
+
+DESCRIPTION="Python library to explore relationships within and among related datasets"
+HOMEPAGE="http://www.glueviz.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="test"
+
+# as of 0.10.0; broken
+#RESTRICT="test"
+
+DOCS=( README.rst )
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/QtPy[${PYTHON_USEDEP},designer,gui]
+"
+
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		  dev-python/glue-vispy-viewers[${PYTHON_USEDEP}]
+		  dev-python/ipython[${PYTHON_USEDEP}]
+		  dev-python/mock[${PYTHON_USEDEP}]
+		  dev-python/pytest[${PYTHON_USEDEP}]
+		  dev-python/qtconsole[${PYTHON_USEDEP}]
+		  dev-python/QtPy[${PYTHON_USEDEP},designer,gui,testlib]
+	)
+"
+
+python_test() {
+	virtx esetup.py test
+}
+
+pkg_postinst() {
+	optfeature "Interactive Ipython terminal" \
+			   dev-python/ipython \
+			   dev-python/ipykernel \
+			   dev-python/qtconsole \
+			   dev-python/traitlets \
+			   dev-python/pygments \
+			   dev-python/zmq
+	optfeature "Parse AVM metadata" dev-python/pyavm
+	optfeature "Save ${PN} sessions" dev-python/dill
+	optfeature "Support HDF5 files" dev-python/h5py
+	optfeature "Image processing calculations" sci-libs/scipy
+	optfeature "Read popular image formats" sci-libs/scikits_image
+	optfeature "Interact with Ginga viewer" dev-python/ginga
+	optfeature "Export plots to plot.ly" dev-python/plotly
+	optfeature "Support Excel reading" dev-python/xlrd
+	optfeature "Used to read in spectral cubes" dev-python/spectral-cube
+	optfeature "Support astronomy dendograms" dev-python/astrodendro
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+}
diff --git a/dev-python/glueviz/glueviz-0.9.1.ebuild b/dev-python/glueviz/glueviz-0.9.1.ebuild
new file mode 100644
index 000000000000..b4e4186d4325
--- /dev/null
+++ b/dev-python/glueviz/glueviz-0.9.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 eutils virtualx fdo-mime
+
+DESCRIPTION="Python library to explore relationships within and among related datasets"
+HOMEPAGE="http://www.glueviz.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="test"
+
+# as of 0.9.1; broken
+RESTRICT="test"
+
+DOCS=( README.md CHANGES.md )
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/QtPy[${PYTHON_USEDEP},designer,gui]"
+
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		  dev-python/mock[${PYTHON_USEDEP}]
+		  dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	virtx esetup.py test
+}
+
+pkg_postinst() {
+	optfeature "Interactive Ipython terminal" \
+			   dev-python/ipython \
+			   dev-python/ipykernel \
+			   dev-python/qtconsole \
+			   dev-python/traitlets \
+			   dev-python/pygments \
+			   dev-python/zmq
+	optfeature "Parse AVM metadata" dev-python/pyavm
+	optfeature "Save ${PN} sessions" dev-python/dill
+	optfeature "Support HDF5 files" dev-python/h5py
+	optfeature "Image processing calculations" sci-libs/scipy
+	optfeature "Read popular image formats" sci-libs/scikits_image
+	optfeature "Interact with Ginga viewer" dev-python/ginga
+	optfeature "Export plots to plot.ly" dev-python/plotly
+	optfeature "Support Excel reading" dev-python/xlrd
+	optfeature "Used to read in spectral cubes" dev-python/spectral-cube
+	#optfeature "Support astronomy dendograms" dev-python/astrodendro
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+}
diff --git a/dev-python/glueviz/metadata.xml b/dev-python/glueviz/metadata.xml
new file mode 100644
index 000000000000..6138cdefa33d
--- /dev/null
+++ b/dev-python/glueviz/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    python-glue is a Python library for data interaction, it blurs the boundary
+    between GUI-centric and code-centric data exploration.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">glueviz</remote-id>
+    <remote-id type="github">glue-viz/glue</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/glymur/Manifest b/dev-python/glymur/Manifest
new file mode 100644
index 000000000000..8c908f193c8c
--- /dev/null
+++ b/dev-python/glymur/Manifest
@@ -0,0 +1,3 @@
+DIST Glymur-0.8.10.tar.gz 3410241 SHA256 97d07136588f6431bffd4150327b87c1cd8489045b9cf2a2cce22fd7df804122 SHA512 8912e22d76b9de4a0bf8ec098ce1acc9bb0fa70b3b42ddb9fc1de5fc01653478d813429a00ef7502934af34eb78423881a31282e550e4f49c2c9f7d7c08b0016 WHIRLPOOL 1dad6329ed0d98a637c1087e8d833a7b2b19af8fdce70e7f1fce886165118c23bd92ffa6f38f70a8e63b1e542a53f619117d1f4c021ca40acd254b351514811c
+EBUILD glymur-0.8.10.ebuild 1030 SHA256 1928779bdba2c5aed1b5a6bdfe79401ddd33cb96324e81faf3f8733790b32b23 SHA512 b8ef5a5af85299108c61da1761045e1a7f6d1189c8219cd32b01035ce0c9590c1af9919f58949e9a6e375d6799c94ea50abc3d0d82b95e9f504fc5b9715f6ba6 WHIRLPOOL 653eedd84735d9679a53779c2d65201388d0b7b2b46038fe2e846baa01a24f6a5b775720488508c5d03c44cd680a82f3ec3a455f2ab2f708ac91018731326a8a
+MISC metadata.xml 381 SHA256 6ba5f0d44ac12a29e9c9b4c903cb39e1bac41cde23e2186406a1462a2f084452 SHA512 944aedc2a2b05937971ebb61246c3c74dd89dd97bc133386af6a1eae8f6c1c034f49beb31f6531b5192ada3ddc1999963a6b36066e877ffe8fe2584267014edb WHIRLPOOL 33c79459a3ddb0b6a13504740a70a67b6e8314fcd8404abd11d5411f68960712dbd1cc9b153443791511562975d1ee3cc16850ddb1aa680c4b76d7f8d824c10b
diff --git a/dev-python/glymur/glymur-0.8.10.ebuild b/dev-python/glymur/glymur-0.8.10.ebuild
new file mode 100644
index 000000000000..0a19aa6c6587
--- /dev/null
+++ b/dev-python/glymur/glymur-0.8.10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+MYPN=Glymur
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="Python tools for accessing JPEG2000 files"
+HOMEPAGE="https://github.com/quintusdias/glymur"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/contextlib2[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/openjpeg:2=
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MYP}"
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover || die
+}
diff --git a/dev-python/glymur/metadata.xml b/dev-python/glymur/metadata.xml
new file mode 100644
index 000000000000..65f5c6d0e930
--- /dev/null
+++ b/dev-python/glymur/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>  
+  <upstream>
+    <remote-id type="pypi">glymur</remote-id>
+    <remote-id type="github">quintusdias/glymur</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
new file mode 100644
index 000000000000..41469732f975
--- /dev/null
+++ b/dev-python/gmpy/Manifest
@@ -0,0 +1,5 @@
+DIST gmpy2-2.0.8.zip 280551 SHA256 dd233e3288b90f21b0bb384bcc7a7e73557bb112ccf0032ad52aa614eb373d3f SHA512 090f449641f378c73eb166831b1d956c6cee3da83e42fde8741f18aa0fa687e37927fc3b045d4b35e3a3b75570e6b1074150d8bc29d16119ab5c717bcfcf9fb4 WHIRLPOOL e78b7fda27a3df8f72750b7ae6a6ff734013a68e8a39b52a3e0cc64076084ae8c5e7024684714a9a83fe22a28d7a1be4bfff7b289bfd4b797900e20790c279b0
+EBUILD gmpy-2.0.8.ebuild 1471 SHA256 6e0cfc5378d843b8d06325259a8fab587617b5756e2a936dfeeb60b90c360654 SHA512 f274878f9571140a52378ed66459fdae60dfb42dbef07c24fc4bb4553e24616b64a9dce531d736989eed1b9d763b4127b44d28c68ade8581062c96a347ec7afd WHIRLPOOL cfb0c2dfb43602e2d20b61db5dc9ef31d62220620dc6bd137df66d1011a83cb909fd28d2b2eb782e35cd6b6feebc37c6de1a51ad4f1d6c0d11ae2d1c3693d2e9
+MISC ChangeLog 3512 SHA256 b81631b6b822074cc1f2425d10d11e073326965296ca8455881f0089b3e2a8ca SHA512 77a87c38254e811350274416cfee7d30105fadee5a98a3c4518de44cefa5797f76867df9d0d720b05c56e377830b9673b1587902d587b30535810e7b050b25f7 WHIRLPOOL 68fca7f720b9623463e2bf53136f8da3a71e7b348244bc0bc15c049caf7a35b527a42b1b4df818efcaab87ade7ff148234d7028728353716fe869a1e0412732c
+MISC ChangeLog-2015 7675 SHA256 8ec199278fb170ce5b920816271232bbc4149994d7d19b039cf6cc13d819a58b SHA512 fba48077405e9582dbaed7964dc36cef65bfb052201277a5499c04b6fcf1ddf88cc50c493086f1156c5adcb20afa2b2fccb9ee127f8a547792bba528d4d27857 WHIRLPOOL d68a4be5904f30260b889b438da1f0ebb54d04bd83e1c6693a480ceca470e8a871dffbde203bdf9091d939f4058372d6185eb725ded6abd21fb1dbde68b85765
+MISC metadata.xml 795 SHA256 90f63c5cb25229d1f1df8b078efc887da0d211ba17fda4e348cfaefbb4547cf6 SHA512 e7f8324cdacceed22f28e27a224668f59955fb5a639d26376da037b0d21437ef57708c7c325e00c771df9e11050be8dc423a3d4b631599da2cc1ef3f97cf3795 WHIRLPOOL 314b5979bdf98423b2f0fdac1e0f19ee34114d6d2629609e62549798288b2c3f86f68e233c4899ad5a3010ad00e559ec4a2f5ca328dcfdfa9c316b71a4115043
diff --git a/dev-python/gmpy/gmpy-2.0.8.ebuild b/dev-python/gmpy/gmpy-2.0.8.ebuild
new file mode 100644
index 000000000000..0aa9fd3a119b
--- /dev/null
+++ b/dev-python/gmpy/gmpy-2.0.8.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python bindings for GMP, MPC, MPFR and MPIR libraries"
+HOMEPAGE="https://github.com/aleaxit/gmpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc mpir"
+
+RDEPEND="
+	>=dev-libs/mpc-1.0.2
+	>=dev-libs/mpfr-3.1.2
+	!mpir? ( dev-libs/gmp:0= )
+	mpir? ( sci-libs/mpir )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	# rm non std test file
+	rm test*/gmpy_test_thr.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=(
+		$(usex mpir --mpir --gmp)
+		)
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cd test || die
+	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
+	if python_is_python3; then
+		cd ../test3 || die
+	else
+		cd ../test2 || die
+	fi
+	"${PYTHON}" gmpy_test.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/gmpy/metadata.xml b/dev-python/gmpy/metadata.xml
new file mode 100644
index 000000000000..1c3638694bff
--- /dev/null
+++ b/dev-python/gmpy/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  gmpy2 is a C-coded Python extension module that supports
+  multiple-precision arithmetic. gmpy2 supports the GMP multi-precision
+  library, the MPFR (correctly rounded real floating-point arithmetic) and MPC
+  (correctly rounded complex floating-point arithmetic) libraries.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">gmpy2</remote-id>
+    <remote-id type="github">aleaxit/gmpy</remote-id>
+  </upstream>
+  <use>
+    <flag name="mpir">Use <pkg>sci-libs/mpir</pkg> as gmp implementation</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-python/gnome-keyring-python/Manifest b/dev-python/gnome-keyring-python/Manifest
new file mode 100644
index 000000000000..6f18c85f5f57
--- /dev/null
+++ b/dev-python/gnome-keyring-python/Manifest
@@ -0,0 +1,5 @@
+DIST gnome-python-desktop-2.32.0.tar.bz2 621277 SHA256 09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18 WHIRLPOOL 5713353291a34e0a03152ad76c46391e3ab246efc17b63193fc0b26b02176eb78ce134c8d0cabcb3480bd2dbb3446b7b6b301cffbfac3ce915e21a974947e37e
+EBUILD gnome-keyring-python-2.32.0-r1.ebuild 601 SHA256 1f0db869b9503732c90de00b75e5c8bbddff29784d981ade641c03506586f864 SHA512 03dcf5dda639267a3e627e6045958c7eaa6c4a54ece9869f7f638afcb1808ea2e72ff26fcc195b90ebd93e41b0c5579594e16355d0f5aa6c8c5ef67767148cf2 WHIRLPOOL 0a27d23eb90aea99771c6f3649abf144c38d7b0d309e1a8006b291868f655f1ee24b6126a59a8fb96a0fb864e814d059cc746246d37e0ed897c8135b553d5d6c
+MISC ChangeLog 2476 SHA256 0b83586a0b278768698fc7ab34ec23f0c0eeeaa01fda81f66cb2c6e09f26c2a6 SHA512 711c075ee90c7119ad270fbe7e198bfd0758a9f65891ae4dc8cccae326ca04c50ff63e359cb3b9005e669318be946ca89838054868171994e8836c4eae4cf862 WHIRLPOOL 102cb59d9f1f94eee4eb5331b57a69cc879a5d10cee98caff07728fa0a899342b431cdc3a4ff92f7494571e59360cae9c9e9f237ed053d916e8189aa3465881d
+MISC ChangeLog-2015 8251 SHA256 497f2695c92d76337242a8b19d066d62020b64cb53796e599b61662174a0f871 SHA512 9da94598383a363a258d6366df250a2fdc219160f7ffb389edfc8a7d891b81c8528f7b445fab19cd59dbe477fcc14e0b29b3b22bdb4a5a50de77631ae4798ae3 WHIRLPOOL 59df80370e413684870ecf2321b35aabc143675ed7a36da9081bb14b6974df8811a3f9e2d2d08c35806faabf9843d0260c77ac827f2d0ce3f18d54f0948b6459
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/dev-python/gnome-keyring-python/gnome-keyring-python-2.32.0-r1.ebuild b/dev-python/gnome-keyring-python/gnome-keyring-python-2.32.0-r1.ebuild
new file mode 100644
index 000000000000..b70e20817e04
--- /dev/null
+++ b/dev-python/gnome-keyring-python/gnome-keyring-python-2.32.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+GNOME_ORG_MODULE="gnome-python-desktop"
+G_PY_BINDINGS="gnomekeyring"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome-python-common-r1
+
+DESCRIPTION="Python bindings for the interfacing with the GNOME keyring"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+IUSE="examples"
+
+RDEPEND=">=gnome-base/gnome-keyring-0.5.0
+	!<dev-python/gnome-python-desktop-2.22.0-r10"
+DEPEND="${RDEPEND}"
+
+EXAMPLES=( examples/keyring.py examples/keyring-async.py )
diff --git a/dev-python/gnome-keyring-python/metadata.xml b/dev-python/gnome-keyring-python/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/dev-python/gnome-keyring-python/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="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/gnome-python-base/Manifest b/dev-python/gnome-python-base/Manifest
new file mode 100644
index 000000000000..4e37f211bb19
--- /dev/null
+++ b/dev-python/gnome-python-base/Manifest
@@ -0,0 +1,5 @@
+DIST gnome-python-2.28.1.tar.bz2 562220 SHA256 759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8 SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2 WHIRLPOOL cd4ea19fabd26c55866d8789628fdc3c834e73932381431216d65c5e9b42ad529e83f74d498951f07f060d3049f1739b6db99dbdbe34575eed469ceb23a51c5b
+EBUILD gnome-python-base-2.28.1-r1.ebuild 1084 SHA256 6a86a724a59bc187e79601ab9b48bd31fea85140b0be71ac30845510ebcbc0e8 SHA512 1d97e3195c01aaffbd3c94b3f01a189d809f80208ddc232f0fc4c0a4ad6cdabe611af40dde0c81c851cf0edb2bf49e66dbc6165d36538bee4d4fd82dffcde9c4 WHIRLPOOL 4fa3cbba2c9454af2993df091503c6c9754bf22a163c78b64d323acac34bfadeabc10f3e06845c314faf5fceaadbfafc3acd57c062ef414a1c7dda8d292fe789
+MISC ChangeLog 2467 SHA256 28fdbbe7c60702cd6300e5544902218725629354754f5e02b03baca82cdad4ed SHA512 3d850a3275ac4526d36e885bd02bc1296c5a63f9ca7695ee71f57c4acdacb26dea3dcc22614c437db33293c12f2dcea4c0584d5c76c8423017538b0bb6fec8ee WHIRLPOOL 91fb291b411ba2d05131d9e8b380128b2222d5c3e3467f227fad1a742043b92cd43daa4e4ff9bf80d24300fca662aeb3f0d626a94322e1c9df4b84f3489f084c
+MISC ChangeLog-2015 7169 SHA256 080fc8776d546bc2cc15a962bf1e2cc9cc4668cb80098b7ac23d101efb85d6ad SHA512 c77a41bafb49489415ac9fc07808b1a5e144b692a3638f3405e70cb7897aa4b77da8ba1b9c14b4297edd884dc4adda5643c49500c109791af92cf770005b3fd4 WHIRLPOOL 366c29d4f4cc0719c7ec79766690177cc04c9f546af809c3df59502b1fb1458b943331650e1760da80ee45ac257435ebca220a29724f0c8d68f35c692dba6042
+MISC metadata.xml 346 SHA256 e03340f54524c1be70afcd11b77ee1249143b59b69d9668673f9ed55d3002a9b SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77 WHIRLPOOL 97cde96f56111c4c355d88d8f353c1daea1012183c43b6c29ef6dd7f07bbf2b14a1477c5edaae58c73c604a05543e2a67e2ec51c439bf43e7a3ddcd577ee2606
diff --git a/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild b/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild
new file mode 100644
index 000000000000..540f323b3815
--- /dev/null
+++ b/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit versionator eutils gnome2 python-any-r1
+
+# This ebuild does nothing -- we just want to get the pkgconfig file installed
+
+MY_PN="gnome-python"
+DESCRIPTION="Provides the base files for the gnome-python bindings"
+HOMEPAGE="http://pygtk.org/"
+PVP="$(get_version_component_range 1-2)"
+SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP}/${MY_PN}-${PV}.tar.bz2"
+
+IUSE=""
+LICENSE="LGPL-2.1"
+SLOT="2"
+RESTRICT="${RESTRICT} test"
+
+# From the gnome-python eclass
+RDEPEND=">=x11-libs/gtk+-2.6:2
+	>=dev-libs/glib-2.6:2
+	$(python_gen_any_dep '
+		>=dev-python/pygtk-2.14.0:2[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-2.17:2[${PYTHON_USEDEP}]
+	')
+	!<dev-python/gnome-python-2.22.1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-allbindings
+}
diff --git a/dev-python/gnome-python-base/metadata.xml b/dev-python/gnome-python-base/metadata.xml
new file mode 100644
index 000000000000..e4e250dd8100
--- /dev/null
+++ b/dev-python/gnome-python-base/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/gnome-python-desktop-base/Manifest b/dev-python/gnome-python-desktop-base/Manifest
new file mode 100644
index 000000000000..0d2c768bf264
--- /dev/null
+++ b/dev-python/gnome-python-desktop-base/Manifest
@@ -0,0 +1,5 @@
+DIST gnome-python-desktop-2.32.0.tar.bz2 621277 SHA256 09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18 WHIRLPOOL 5713353291a34e0a03152ad76c46391e3ab246efc17b63193fc0b26b02176eb78ce134c8d0cabcb3480bd2dbb3446b7b6b301cffbfac3ce915e21a974947e37e
+EBUILD gnome-python-desktop-base-2.32.0-r1.ebuild 1077 SHA256 d47a0e3b3b5c021af0beef308789c9c2fd79b9b327197e01788caa62059ff3a2 SHA512 3de5611926b91175e217c7e65f976f6445007726b1afb212f1b29ccb4f4c07f99f2d71af7354639e395c541f704ab0681ec62544811163a60546a3fcd8b5d4d7 WHIRLPOOL 7af7e77b250ec9121039f3b59c5cfd6762dc4f2c7b2aa612412cafbec33d1c020b3faa376799d862d7443ef92a7a86ae41cd62a733ea9d33e7b915695b55c5f6
+MISC ChangeLog 2491 SHA256 f4cb3e4e3e663c7b41653d9bebeed93a83eb4e658397bb940d7fb6ecc36227a4 SHA512 0202ea89c9f9293a3553bce938d926244ddd8fa0e137ee6c32b56efb02da139aa3215dfccbc3158d2ea50dae333e1d487bddc2d6fe9e4dcc3c4a320bf1df7688 WHIRLPOOL 11c8cd933251676fa91ca205d1c3c3c6633b377a2ceab263da09bea004bc22c8ffd3a1ba99f8cfb5a761f1ad56e40612d697d00a20dbca4d106343060cc5c9c4
+MISC ChangeLog-2015 8915 SHA256 be6892f75e02452b579b21f14e4f877cfc1405ee54fadc60500fdf28b2d241ec SHA512 27d284fc05800f8c5567f667c0d687ce467a8479d69a1c5458dd8c5b70bff2cfdc250ba85c716bfbf98554fd6791e07b6cee53e67e79010dd3e7a57e8706c343 WHIRLPOOL bfaaafe76dfcf75f21ab07e1b3363d3118ee7d754ca07bc2a7ba993c3741d516d6343fc9d966dc34f291d11aaa8abcfca057c648a68a377ca3ab89b27643a11e
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/dev-python/gnome-python-desktop-base/gnome-python-desktop-base-2.32.0-r1.ebuild b/dev-python/gnome-python-desktop-base/gnome-python-desktop-base-2.32.0-r1.ebuild
new file mode 100644
index 000000000000..18367683dba2
--- /dev/null
+++ b/dev-python/gnome-python-desktop-base/gnome-python-desktop-base-2.32.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+GNOME_ORG_MODULE="gnome-python-desktop"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit gnome2 python-any-r1
+
+# This ebuild does nothing -- we just want to get the pkgconfig file installed
+
+DESCRIPTION="Provides python the base files for the Gnome Python Desktop bindings"
+HOMEPAGE="http://pygtk.org/"
+
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+IUSE=""
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+# From the gnome-python-desktop eclass
+RDEPEND="$(python_gen_any_dep '>=dev-python/pygtk-2.10.3:2[${PYTHON_USEDEP}]')
+	>=dev-libs/glib-2.6.0:2
+	>=x11-libs/gtk+-2.4.0:2
+	!<dev-python/gnome-python-extras-2.13
+	!<dev-python/gnome-python-desktop-2.22.0-r10"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+RESTRICT="test"
+
+src_prepare() {
+	gnome2_src_prepare
+	python_fix_shebang .
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+	gnome2_src_configure \
+		--disable-allbindings
+}
diff --git a/dev-python/gnome-python-desktop-base/metadata.xml b/dev-python/gnome-python-desktop-base/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/dev-python/gnome-python-desktop-base/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="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/gnome-python-extras-base/Manifest b/dev-python/gnome-python-extras-base/Manifest
new file mode 100644
index 000000000000..d50af44586de
--- /dev/null
+++ b/dev-python/gnome-python-extras-base/Manifest
@@ -0,0 +1,6 @@
+AUX gnome-python-extras-base-2.25.3-python-libs.patch 2243 SHA256 649b7bdede190923a504b3a598ac9e2003872da8857a152305048a628795c187 SHA512 f9ddacdcffaaf6933e3ab28f843892a4754677a29987d512ebc3810245fb793f8a242b479e47fd63dc7756c817a510e04cda2548aa6bb4d88ce4649c2b1759ed WHIRLPOOL 015c9bb798dadbc0d64143a151bd2a3d1d978a77348e07473f675ccef6b0e5b722eaf81462e48b06c45176d51b698b28834cb2ef4afc9fb2b00e7a8ba5f98b75
+DIST gnome-python-extras-2.25.3.tar.bz2 370489 SHA256 ca346264e00e193f0866cabd8801d3b7ce70dae7b8b296e41e5b3a45c9b0275c SHA512 6994b8b5d6ccc009edc7ddfad373b9164d8162f1007972652f6086dca30cac6941ab68ef467d15c972ab05c4ae0e19ec72edc2643636d22a01a3f5a719251467 WHIRLPOOL b0adfcef8bbb978d063a932393e17de9c8c519194f40085ecd03824ec4fb4421c84e0a4853a5a2d9fc40c94d8c0c261828447ac5fd69cff4ece39c52fc833590
+EBUILD gnome-python-extras-base-2.25.3-r1.ebuild 1307 SHA256 06c0f29ea31c390c8f72a71e840e208e8fae920c4a592403eb57e098ce121235 SHA512 a82a22c5edb1049e12d5c4bbd137f7e560293bcb9d5813ecea0754c9a95c02c405599d13363afddbffd3919cfe202cc5ec30a22063203d1e401fbeb4e59e2410 WHIRLPOOL 48e9b4254f15c312af17d8192bc2f9a19a96d21890c3d155a0af11ebfd170b06945b281a37658a4404659b4ad0d49649dab68635234b51837c6b19dea1f1a558
+MISC ChangeLog 2548 SHA256 cf8b82a098e3adfe367b00f30f4d0534d2b2167df71eb551e2d3882dfba5339c SHA512 13e5b1267cfac2c9804526e67cac85dde98dc664c87831ecaca34c41214e23d9a096226c97539ad6057a2e1333b849c9e502aff0ce9456c6a10cbc0feef600e7 WHIRLPOOL bcba13278d4d00bc93c7b0eead76f43f5e03181ffb7756f1089387132525691efc99b16d8029c7356bc190fa462a3ba7ba842f6cad93c7366c8eccd3df83d031
+MISC ChangeLog-2015 5330 SHA256 541a76f860bcc6369ea7132a9c699f02c079345d51c691afaa293898dca42adf SHA512 482985fe03f8039cf5be65a7dd690bae8f73f67c49d25ed7c5afbb35fd23e8b8fdcdad12c183a54f90511d2cdfab5f2c9e519969ce94f7c8c5b7481ad817fb7a WHIRLPOOL 5fa7a5f018d7446ceee3aafd1ea10347e835895804de14d3d63f7ef25762908798441e7e1ea79614c4bbb598b7c8666b83bada4f73157b3b6de9a377500c7363
+MISC metadata.xml 346 SHA256 4b87f1154df42a81076572760417393762ac1c76a6c1cec8d16c31049097d48b SHA512 e7e631f5ebe3a81d0431366152d6f7a2d21958a031746d6b2fd6ac9ef3f145d78fb30d1014b0912e9d720b3be7c6d2fdc544bb840a9f12fddf37ffdcf65933bd WHIRLPOOL 1d51841db0de7eaec1b024566af146da5323306447445f18c771cb90030c664ce376db8a3bb59d39f125e9abd9dc367fad98a8abfb2acc7bbfe4855b7695cced
diff --git a/dev-python/gnome-python-extras-base/files/gnome-python-extras-base-2.25.3-python-libs.patch b/dev-python/gnome-python-extras-base/files/gnome-python-extras-base-2.25.3-python-libs.patch
new file mode 100644
index 000000000000..ab691272cbb6
--- /dev/null
+++ b/dev-python/gnome-python-extras-base/files/gnome-python-extras-base-2.25.3-python-libs.patch
@@ -0,0 +1,59 @@
+From 7824fd5291f570de3c2c64185035d1a6a0a3445a Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 13 Aug 2012 04:42:47 -0400
+Subject: [PATCH] Replace horrible slow python libs search
+
+---
+ acinclude.m4 |   36 ++----------------------------------
+ 1 files changed, 2 insertions(+), 34 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 8694a65..f5373eb 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -59,40 +59,8 @@ $1],dnl
+ [AC_MSG_RESULT(not found)
+ $2])
+ CPPFLAGS="$save_CPPFLAGS"
+-
+-	# This bit is copied from Planner. murrayc.
+-	# Check for Python library path
+-        AC_MSG_CHECKING([for Python library path])
+-
+-	# Win32 has libpython25.a instead of libpython2.5.a, so we look
+-	# for both. TODO: Only look for libpython25.a on Windows, and for
+-	# libpython2.5.a on unix.
+-	WIN32_PYTHON_VERSION=`echo $PYTHON_VERSION | sed "s,\.,,"`
+-
+-        python_path=`dirname $PYTHON | sed "s,/bin.*$,,"`
+-        for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
+-		if test -e "$i"; then
+-	                python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
+-        	        if test -n "$python_path" ; then
+-				python_lib="python$PYTHON_VERSION"
+-                	        break
+-	                fi
+-
+-			# Additionally test WIN32_PYTHON_VERSION
+-	                python_path=`find $i -type f -name libpython$WIN32_PYTHON_VERSION.* -print | sed "1q"`
+-        	        if test -n "$python_path" ; then
+-				python_lib="python$WIN32_PYTHON_VERSION"
+-                	        break
+-	                fi
+-		fi
+-        done
+-
+-        python_path=`echo $python_path | sed "s,/libpython.*$,,"`
+-        AC_MSG_RESULT([$python_path])
+-        if test -z "$python_path" ; then
+-                AC_MSG_ERROR([cannot find Python library path])
+-        fi
+-        AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -l$python_lib"])
++PYTHON_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; print('-L%s -lpython${PYTHON_VERSION}' % distutils.sysconfig.get_config_var('LIBDIR'))"`
++AC_SUBST([PYTHON_LDFLAGS],["$PYTHON_LDFLAGS"])
+ ])
+ 
+ dnl
+-- 
+1.7.8.6
+
diff --git a/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild b/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild
new file mode 100644
index 000000000000..cfcd4a3af74e
--- /dev/null
+++ b/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit versionator autotools eutils gnome2 python-any-r1
+
+# This ebuild does nothing -- we just want to get the pkgconfig file installed
+MY_PN="gnome-python-extras"
+DESCRIPTION="Provides python the base files for the Gnome Python Desktop bindings"
+HOMEPAGE="http://pygtk.org/"
+PVP="$(get_version_component_range 1-2)"
+SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP}/${MY_PN}-${PV}.tar.bz2"
+
+IUSE=""
+LICENSE="LGPL-2.1"
+SLOT="0"
+RESTRICT="test"
+
+# From the gnome-python-extras eclass
+RDEPEND=">=x11-libs/gtk+-2.4:2
+	>=dev-libs/glib-2.6:2
+	$(python_gen_any_dep '>=dev-python/pygtk-2.10.3:2[${PYTHON_USEDEP}]')
+	!<=dev-python/gnome-python-extras-2.19.1-r2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	gnome-base/gnome-common"
+# eautoreconf needs gnome-base/gnome-common
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-python-libs.patch" #344231
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-allbindings
+}
diff --git a/dev-python/gnome-python-extras-base/metadata.xml b/dev-python/gnome-python-extras-base/metadata.xml
new file mode 100644
index 000000000000..6cd5da0617a4
--- /dev/null
+++ b/dev-python/gnome-python-extras-base/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="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer type="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/gnome-vfs-python/Manifest b/dev-python/gnome-vfs-python/Manifest
new file mode 100644
index 000000000000..323faaa31775
--- /dev/null
+++ b/dev-python/gnome-vfs-python/Manifest
@@ -0,0 +1,5 @@
+DIST gnome-python-2.28.1.tar.bz2 562220 SHA256 759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8 SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2 WHIRLPOOL cd4ea19fabd26c55866d8789628fdc3c834e73932381431216d65c5e9b42ad529e83f74d498951f07f060d3049f1739b6db99dbdbe34575eed469ceb23a51c5b
+EBUILD gnome-vfs-python-2.28.1-r1.ebuild 665 SHA256 2fdb80aa50380979861e558eaa049828577e2b14192328f5e4c044eae69b7c70 SHA512 2b255a5b933f6c092798b29dac21f90f6a3fecb4dd4936ba3b43413af72d6b826844bef4d5aa0e4e0d99c20ce31ff60327665a5a6c0f7f279b183e291425972d WHIRLPOOL 42904b013225d577cd90fd300399e8cb911f27e420c5412280fef3ad676d427438bcaf49e81fc6f6f0d65d60177ffb12a98981352d4139a0936f7e34f87076f7
+MISC ChangeLog 2464 SHA256 96989c1696ac6d7609f3b1024a72d5ff8b21a4ae1b4b732e94f68e13780dbb93 SHA512 8be31c04a2c8bbcbfef51f3972327a56a641693b3c6853d69ee5cc90e5172d172973c87f89e39e104b84f40fed70be001c675478a53d7c19a3da1fdf52a96b48 WHIRLPOOL f09d08946202dae08c3aa7de846067efebaa2481ee3a4dff43aab2a7cef6cc64ca4b4a4b25afbbbc797a3c7b7c85ec4ddca3130c529fa0d50b52d007f7aa9999
+MISC ChangeLog-2015 6463 SHA256 5abe222d65edbe5d5a84bb8f44ce8fdaa2969144895cc5caa274e5a8f067a424 SHA512 1fe66192c812c5a96da20ae199dc0a2b8c2f512c29b5ef48dc0cc9aea8a1381455c28097fca88b6ea80a19f50d8e5e123a8affc9b166248c6ba92ba6edd48e24 WHIRLPOOL 2c71d46bd6a470654f46d03c33a40e00497dc513bc75346c8a03e3436a7590b7a171a460a59818bee69670a0c9d29db170bde21ae0d33657f942eaa262f3a758
+MISC metadata.xml 346 SHA256 e03340f54524c1be70afcd11b77ee1249143b59b69d9668673f9ed55d3002a9b SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77 WHIRLPOOL 97cde96f56111c4c355d88d8f353c1daea1012183c43b6c29ef6dd7f07bbf2b14a1477c5edaae58c73c604a05543e2a67e2ec51c439bf43e7a3ddcd577ee2606
diff --git a/dev-python/gnome-vfs-python/gnome-vfs-python-2.28.1-r1.ebuild b/dev-python/gnome-vfs-python/gnome-vfs-python-2.28.1-r1.ebuild
new file mode 100644
index 000000000000..d35bb6759094
--- /dev/null
+++ b/dev-python/gnome-vfs-python/gnome-vfs-python-2.28.1-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+GNOME_ORG_MODULE="gnome-python"
+G_PY_BINDINGS=( gnomevfs gnomevfsbonobo pyvfsmodule )
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome-python-common-r1
+
+DESCRIPTION="Python bindings for the GnomeVFS library"
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc examples"
+
+RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
+	>=gnome-base/gnome-vfs-2.24.0
+	>=gnome-base/libbonobo-2.8
+	!<dev-python/gnome-python-2.22.1"
+DEPEND="${RDEPEND}"
+
+EXAMPLES=( examples/vfs/. )
diff --git a/dev-python/gnome-vfs-python/metadata.xml b/dev-python/gnome-vfs-python/metadata.xml
new file mode 100644
index 000000000000..e4e250dd8100
--- /dev/null
+++ b/dev-python/gnome-vfs-python/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/gntp/Manifest b/dev-python/gntp/Manifest
new file mode 100644
index 000000000000..de358bb79900
--- /dev/null
+++ b/dev-python/gntp/Manifest
@@ -0,0 +1,5 @@
+DIST gntp-1.0.1.tar.gz 10889 SHA256 bad7a9a3d877e46dc13ad60cacca0442901ed9ebd96708cebe9b8f280652e382 SHA512 6e44cbafcaa5b60b39d3bb60a67786300acae5e3aa6fbab1d5cbdcb4a24fffba62f878d801683d724321d5c0e3a3b780da9c99d3faf8a578f956603e1daa49cd WHIRLPOOL d908eca646801672e70bf69ea55a96ef42d75ce2b18ccaa2d96117452411cd07cfb2934a0716dab71e2aa4edf70df91a200b1d7289d0b0ecab39fefb39417e11
+EBUILD gntp-1.0.1.ebuild 467 SHA256 d91a7e1ad89e0211386825920ebe0e097e1de1f6458c7ec685cbae849fb51f11 SHA512 a8a6875ea5390b3e5033dee39a3528d73c912457edfab5a411f56b8aabe7c85ee0edc72fc6cbb6822543daa774b3e2c79d352e5b5b76df1d511402b5c9dab987 WHIRLPOOL 2e948db0db3f5058a5c39f15ce231f84b60d408696363a5212b7b00181d810be94aa3fdf80fa6ed469659a0636659932cd6a4350293ffaace04978af38480338
+MISC ChangeLog 2434 SHA256 87d9125df7099141f269b8474482df4dca3b0f87ab3078d3ab23ab9d12bf03a7 SHA512 ec0136c749d6d22d3776c3f0a407a9758dcea06a610d861e67d6dd4289806354982da5557bb12fcf9fa328780e15eabf22a847553cfe4f828751d0df06f253b7 WHIRLPOOL e9e88536715dde1d3e61e2f5a33ae5133721c8f15c641321640f89c3491e6d0622a4491e3ae802076d2196dd5e184c87f718d0a9cd7e67af3d1e899695b6ec5e
+MISC ChangeLog-2015 1316 SHA256 a0378c324a4469cf0bb1ec96188cedde5dac953535bdf9cfe8e370b32940674f SHA512 e16c24bb8c20338d72a51c040edb749cbec7b77560555bf4192a252f019c868ce32daa4c68b02874d05ca9965c5fad8ccc0afa0724f47fc6afa701094bf30445 WHIRLPOOL ed7f5816a50b96cdfeaeb1356d57220b3ae29e43abe546f690ceca23129f3f684f038129e69a89d2ab725cf154cadfb57f03ae13a34214301931e5a2ba61a692
+MISC metadata.xml 372 SHA256 1912e85b2d1ff80171daacdecb052c073fbbafe7d2fd3ad4cc3760e32740970e SHA512 c247337a79257cb729b1439a90f977f650169abe6d685edd8f74bf2841f3274579df2b2a3c32ff4a8c2c9771220e6f115295671407829ce145daecf652f43621 WHIRLPOOL fa27814ff9a1fb1b167f2e77abed217583582c00e8f84f29304b2739edf39bbd359ce99f6457320a46433580a1f90557cfc28c06cfc7c4df2b65822633c729b3
diff --git a/dev-python/gntp/gntp-1.0.1.ebuild b/dev-python/gntp/gntp-1.0.1.ebuild
new file mode 100644
index 000000000000..b7983a23981d
--- /dev/null
+++ b/dev-python/gntp/gntp-1.0.1.ebuild
@@ -0,0 +1,19 @@
+# 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
+
+DESCRIPTION="Python library for working with the Growl Notification Transport Protocol"
+HOMEPAGE="https://github.com/kfdm/gntp https://pypi.python.org/pypi/gntp"
+SRC_URI="mirror://pypi/g/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/gntp/metadata.xml b/dev-python/gntp/metadata.xml
new file mode 100644
index 000000000000..ec14835c24ee
--- /dev/null
+++ b/dev-python/gntp/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>naota@gentoo.org</email>
+    <name>Naohiro Aota</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">gntp</remote-id>
+    <remote-id type="github">kfdm/gntp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/gnuplot-py/Manifest b/dev-python/gnuplot-py/Manifest
new file mode 100644
index 000000000000..3f6db7ed9da9
--- /dev/null
+++ b/dev-python/gnuplot-py/Manifest
@@ -0,0 +1,6 @@
+AUX gnuplot-py-1.7-mousesupport.patch 2596 SHA256 5e0f161cc3fb1b5e3251a79e203ff1ec190452f3fd8bed2b753f1ec948229cef SHA512 5dee0dcb4b24aef830a9c65678dcb4ca1a831a7dff04723e2248219883e578cdc136b668f05ab95d13c7bbd7da47b20012e0b3d1149342bb64336325c2f1dbbd WHIRLPOOL 6f3254d39c9196ca7488ef3785783b3129de11865e7e8388a90e4f4bf9f6879c26ee2fcba30071b3b3031a95ae4fa4c4dd586256636ea95dc20ecae2407b4454
+DIST gnuplot-py-1.8.tar.gz 118828 SHA256 ab339be7847d30a8acfd616f27b5021bfde0999b7bf2d68400fbe62c53106e21 SHA512 748dc95ea53acd362f67c821a3cc7cf23b6329c2dd13c130c91e1c9f89afe1ffd84619ed321923c65455adf86ee58976dd6dd187881ee3ede5e0f5f551fb027d WHIRLPOOL b13436a3de17db7c871f7179291e0b9669dc7b3b6de9b4e0463e9989c1c0105c2495145ffd12e163cbbc75ff863ce657dbd64aca305c5a42c529e0f2411e7060
+EBUILD gnuplot-py-1.8-r1.ebuild 854 SHA256 7b640b29fa33ccb084feda5b89901f66f8510a40d0cc89da52fe5b524cae6495 SHA512 d840d450515ec30fc55ea0d1921e25f6b829f88d191222fceae25c736458ba10a5e59b3ad78e8b50000876af49312297e2f02e07f43455086578b1be12ff74de WHIRLPOOL 3d4d80af376f8b5da95513e5e31d04976051f608b2036934b5c8286f7f67cfdce4bdaf5d761eda5d84b7d83262e6c677d5e810ef826da404f597fdaeb6aa7816
+MISC ChangeLog 2484 SHA256 e313d58574787a7557c917155c6f6e384b8e9417734b48e50903fea06afe3e12 SHA512 3e65c10605331868d58c3ee822b37272c098958eff7e306c494c4f96903edcab4b9f4bb6238e30acfc5c9f455f7c87311fe4c3ac2d306d8a8cc53717cf3ed042 WHIRLPOOL 63d2cf8102a39382dc0b859fa48ce30ca5a4041a574055b3b7db9031bc572e77d5777b7784c2ff0a5974744eaa7ffde4802353e5fd6000ce3182f37d69ee8465
+MISC ChangeLog-2015 6615 SHA256 2e814fa8c24bc877bdd823e2cc872759fca82cdf7734e914c6a2a0f2386c0341 SHA512 f962eac46abe278c840a3a6fddb4a90dca8235e81c18f42275803fe46be05069a9cf29f7e443017cf99f21017a12740a42111e261f48db5bdf72d4b248908241 WHIRLPOOL 617fa8db2a9b086cc4826f6196efb08546e9b07b20c86045afb30b482e0206ea704c1968ef77a550c7cfdf641692b5c74781c27748773863e4afd57550c3b8b0
+MISC metadata.xml 902 SHA256 e76f0c4e846d28afcc67b091d4915ad1d91479b9e8b67a97301ba06c9aebb5a6 SHA512 1bff541b1e9ed569db2c6ac78eca5842c4a6e456d9a3e72649d4a8f2584f039adf33db7cbf6d9224ec00b69f7ebdf7e72b8bbc13f44fbb5565586bbb7cfcf9e8 WHIRLPOOL 2356fee56f4ec3752cb4711ef014d689fca9eae3e85331ea555415458fc9b3b9117e9cdd12daeeafc81216f8fe5992f3885e3413b78bb10b6547930d62134f11
diff --git a/dev-python/gnuplot-py/files/gnuplot-py-1.7-mousesupport.patch b/dev-python/gnuplot-py/files/gnuplot-py-1.7-mousesupport.patch
new file mode 100644
index 000000000000..2eaf6ae379ed
--- /dev/null
+++ b/dev-python/gnuplot-py/files/gnuplot-py-1.7-mousesupport.patch
@@ -0,0 +1,75 @@
+--- _Gnuplot.py.orig	2003-10-17 16:28:10.000000000 +0200
++++ _Gnuplot.py	2004-10-28 14:39:20.000000000 +0200
+@@ -18,6 +18,27 @@
+ 
+ import gp, PlotItems, termdefs
+ 
++def test_mouse():
++    """Return whether mouse support is present or not.
++
++    The detection is done by calling gnuplot with a file containing only the
++    "set mouse" command.  If gnuplot does have mouse support, it should simply
++    execute the file silently, producing no output."""
++
++    import os,tempfile,commands
++    
++    tmpname = tempfile.mktemp()
++    tfile = open(tmpname,"w")
++    tfile.write("set mouse")
++    tfile.close()
++    msg = commands.getoutput(gp.GnuplotOpts.gnuplot_command + " " +
++                             tmpname)
++    os.unlink(tmpname)
++    if msg:  # Gnuplot won"t print anything if it has mouse support
++        has_mouse = 0
++    else:
++        has_mouse = 1
++    return has_mouse
+ 
+ class _GnuplotFile:
+     """A file to which gnuplot commands can be written.
+@@ -152,7 +173,7 @@
+         'output' : 'string',
+         }
+ 
+-    def __init__(self, filename=None, persist=None, debug=0):
++    def __init__(self, filename=None, persist=None, debug=0, mouse=None):
+         """Create a Gnuplot object.
+ 
+         Create a 'Gnuplot' object.  By default, this starts a gnuplot
+@@ -172,8 +193,19 @@
+           'debug=1' -- echo the gnuplot commands to stderr as well as
+               sending them to gnuplot.
+ 
++          "mouse=1" -- activate mouse support (officially available as of
++          gnuplot 4.0 under certain platforms).
++
+         """
+ 
++        # The mouse check must be done first, so we can decide whether to use
++        # inline data and fifos or not (they break mouse support)
++        if mouse is None:
++            mouse = test_mouse()
++        if mouse:
++            gp.GnuplotOpts.prefer_inline_data = 0
++            gp.GnuplotOpts.prefer_fifo_data = 0
++            
+         if filename is None:
+             self.gnuplot = gp.GnuplotProcess(persist=persist)
+         else:
+@@ -182,10 +214,14 @@
+                     'Gnuplot with output to file does not allow '
+                     'persist option.')
+             self.gnuplot = _GnuplotFile(filename)
++	    
+         self._clear_queue()
+         self.debug = debug
+         self.plotcmd = 'plot'
+-        self('set terminal %s' % (gp.GnuplotOpts.default_term,))
++	# The "set mouse" command MUST be the VERY FIRST command passed to gnuplot
++	if mouse:
++            self("set mouse")
++	self("set terminal %s" % gp.GnuplotOpts.default_term)
+ 
+     def __call__(self, s):
+         """Send a command string to gnuplot.
diff --git a/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild b/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild
new file mode 100644
index 000000000000..dd6977fde737
--- /dev/null
+++ b/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_SINGLE_IMPL=true
+
+inherit distutils-r1
+
+DESCRIPTION="A python wrapper for Gnuplot"
+HOMEPAGE="http://gnuplot-py.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc"
+
+DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	sci-visualization/gnuplot"
+
+DOCS=( ANNOUNCE.txt CREDITS.txt FAQ.txt NEWS.txt TODO.txt )
+
+PATCHES=( "${FILESDIR}"/${PN}-1.7-mousesupport.patch )
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/Gnuplot/. )
+	distutils-r1_python_install_all
+}
+# testsuite does NOT run unattended, so left out here
diff --git a/dev-python/gnuplot-py/metadata.xml b/dev-python/gnuplot-py/metadata.xml
new file mode 100644
index 000000000000..b7268ab2fa8a
--- /dev/null
+++ b/dev-python/gnuplot-py/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+  Gnuplot.py is a Python module that interfaces to gnuplot, the popular
+  plotting program. It allows you to use gnuplot from within Python to
+  plot arrays of data from memory, data files, or mathematical
+  functions. If you use Python to perform computations or as `glue' for
+  numerical programs, you can use this module to plot data on the fly as
+  they are computed. And the combination with Python makes it is easy to
+  automate things, including to create crude `animations' by plotting
+  different datasets one after another.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">gnuplot-py</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
new file mode 100644
index 000000000000..c0887aad5f6b
--- /dev/null
+++ b/dev-python/google-api-python-client/Manifest
@@ -0,0 +1,13 @@
+DIST google-api-python-client-1.3.1.tar.gz 1480269 SHA256 5137c4d6e853cda1a2e32b7f1b1ce28b66f5d62e464d91386be22492c276b1f8 SHA512 385377bd99f006154f90bed2b6f55cb25786032d28ac7f15b9859882670cc8bf94acbfbd8485c4cf89abd665908f1a7f46f74e84f05faba992a62fe4b9fd5bd1 WHIRLPOOL cda6825e502738f6d3035e524494aadc159ac8d41ae12d3f682236f8c344dc41e2ecf03aee6b247233c5b9aa8c756ac8d598c98c95333dc8a8929901c3a82327
+DIST google-api-python-client-1.4.2.tar.gz 2289731 SHA256 dfb7feab9733ae99952545927b5d87dda24cea308b2040fba2c505e7f0c57696 SHA512 ab5ce56142d96ed9b38d00294133e188dfeaf70aac78054f093f03fce7c4aee5b7b99f18ee27190aaef14b7fbe2bc8d0a4e2526ff6f166e41eb0b4b050e7c6b5 WHIRLPOOL 006e24d1a4e5d2bfabcbf2503fa163d6b0a3a28a839396014bf0a91a463454f02140f38dd179a141010a03e268711c2d22c9aa3158b594e5b465d9032997e7b9
+DIST google-api-python-client-1.5.0.tar.gz 2683924 SHA256 1558d6a6bca8c4ea775be46c6a81364739dc35b7ad2afc660c3a3102a43165bb SHA512 082a89e2e52dff449b6c4b6800503e337c5f2aa7ea2ca45a8373743a312d18d24ad87a486aed77b2e26075ba897f36e1129852dc30a139750e75cce5a1c25aa4 WHIRLPOOL f306a91fda8f241774a0b121dd8741ed5342aafb920b1bb59ca46a296ac7eaee4072839480abcd592a52d92e01811b9032545f93e8528211edf51d0cbe07644b
+DIST google-api-python-client-1.5.3.tar.gz 3622355 SHA256 1a89429cb591112463fe6fb7fcc23c9475e52bcaa337a3d9bb375891fbfe7525 SHA512 3f58af0d1f165fa7e045d08a0bfc282855b40dbea16d310bbc4cbce76f631b6303738a396048efc8ea114fdff1164d1ad303148999d0ab0ba0d2cc91df9408b3 WHIRLPOOL f878baac9a29065ce8cab67b41716697cc7f34205384e41b8849ef38271d75442c7d44922e56489cba7dc4871c216f37050e61ecc6d0302056adea72a57f9387
+DIST google-api-python-client-1.6.2.tar.gz 4262337 SHA256 1b2c0429fe7e85d243c60ed8ae11d3652664cd0066b118ade04405d598092850 SHA512 ee906c2efb47469dc18dcfcb1edfad4346f61e88c1e7f73b60924b393c704e7033a5ff4f9a1965d0c29aa3a6bf25b60888e1d39366cbc1372861b49e79c9e886 WHIRLPOOL 025404e922a15f4986fcbaacddd6fb7570b47679689058b1663611731ba74a2cca2a2ac993737558868c575950db04216d860a68c512fbd8c77e98d3871e6474
+EBUILD google-api-python-client-1.3.1.ebuild 887 SHA256 da7f330969f34e6d3e7e790802ad60cc160aadcacf8b287c788384b963ab3032 SHA512 6f9d1dc267248ae28914596e8270f0b6f97139f7fd118200e0534af51676765238be6bd55fd76935f9e128eb8709b2a26bef2d312368b645b2b93d3953c7b6a5 WHIRLPOOL 69909b9b8d956c20705012693c9e4ef5c3ae9458cdc109f80f38257249138e1b252a350b47f3f1d88606c91def017f4523fea99f3b7a10b593112c871c88ecdb
+EBUILD google-api-python-client-1.4.2.ebuild 864 SHA256 5cc755a4362510a3781aaf9b61bbb9eaf2b223963492ce5adf6282342c99c330 SHA512 9da0718c882fefa266f3114df01cef0fa53bb7e5927152eafd52d54395f4641fc484c909274273f1b1dd3d6a0feb44bb630ca875ea73fff5f82935a9490da234 WHIRLPOOL 7de90e3220044c2a1b219766aeb6b1e3dd5fb910d5f8ddfc58a078c96fc33efd768f467fe80437e7d3d15b1beb329aaeec26929a4708a124b095a63d56ec3637
+EBUILD google-api-python-client-1.5.0.ebuild 1082 SHA256 2ebff5c8434e233c28d151e0f060fbeb32360b88126416b04d7ab2a48954c0e9 SHA512 d5ddee43e96b7e65da2568879268cf2960b83182d7a95a84c187642b9a447b633a3ed43a7585ba6f92bc7ab22915955ae9fd08b9c625eb1780f81d3bab09ce0e WHIRLPOOL e35caebf65b4505daa73d052308a379308eb24494b05589cebef186f20e5d622a877f5d42b6e2affaa4b32c992020266516a39da36a01bafe8286eb3bee81785
+EBUILD google-api-python-client-1.5.3.ebuild 1132 SHA256 49027b17efd5d3e948667ba3fb1fec7f59931148226617b6cf24bcae2fc88067 SHA512 3a4fb461c807189da1d26e3388fff90ece1a30ca9b8bfeb51841d7f68a36c7e8494ec7589d0760ac15e6744a5e5d4ddd691875ad5aeeedb9cdf54d37d2f29ee2 WHIRLPOOL 501b366ff481ed4be86d0783d521c049131a8359f64fedd63c2e337622eb26bc1357a2bfd0c7dbcd23630f7c5d6ff734ba8650d91a8d57bd89386c9ce46b8674
+EBUILD google-api-python-client-1.6.2.ebuild 1194 SHA256 15479a071cbe5d025c2391309d4c6f62e2238e81c8a2c608c5513e6ef0871158 SHA512 41384e153fb18d48229bb57b7413267342e8ea8cdd5a560fb6fbef8aefb540dec712b410edb4b02b718d022b3349c87028d0d452d7b18b718d0590c7dd829665 WHIRLPOOL e8ffd0600d13bfe9197956d4cc42224b1a00b255deee303975c9fded19d651f7a6e99534e3558040bd0ee49e0a9d606bd912c962239068cc20a64c3edffde907
+MISC ChangeLog 3761 SHA256 08f4f56a8205cb15501c7a9856c5c7f74898be76c5aebf4c552396b6d72c78cf SHA512 4674a2ca7d3b7facb4a26d0b0dd3e435dc8d57df99e00c2d08a5898b006fe828ca951feaf67f6aee10d466e1b0bc054bf3dbe3ea90d9dd35798f955efa44b5da WHIRLPOOL 83f40ad293afae63667426a17374bfa3ab9906ea2adf4df936258c7a17512c387edd1aacb61bf27500711d6e2530393f022d046df19b92d9d9aee68bd8482cc3
+MISC ChangeLog-2015 1968 SHA256 5f9e89e42172bcc7783882049777f212fc413efd1163ead76600f5a292d66649 SHA512 1e7c08e75b8d453ae8e338d15e1554c2fb33bf9135104d97c9f1c0c0a3dc24f8431de9003a898e14da40ea9f4c28f08b005c6616017d4b43042b69291b419167 WHIRLPOOL fb264d90d4724a3074b3641f3ac96adb8e8c640d690bd64d8def101df994fc087134688865d79c16cfc31d063e2314276d3a68cdcfa96e903a224bafcd024a97
+MISC metadata.xml 356 SHA256 ee96057089fa4d1bc62cf4bf3cd873a53ea40d23d826456ccaea01790400e9d1 SHA512 e45fdf92fc9a3fcf08b74e9ac07326cced2cd7971b16a6cc4f96203199aafb9d72d36a29e3a924a43ce8dc4f3709add9c8bfcc8413bef028408cfb899eec9338 WHIRLPOOL 9cb0263ab8e2b6377b7ddabd21fa505e7798ad81a09db752ec65b912e98e428be827601bdc9763fe6d54701c329057f3dfe780fa2485029ce97b0e30827fd2d0
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild
new file mode 100644
index 000000000000..b15e985f62a3
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/google/google-api-python-client"
+SRC_URI="https://github.com/google/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+DEPEND="
+	dev-python/python-gflags[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	<dev-python/oauth2client-2[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/uritemplate[${PYTHON_USEDEP}]
+	"
+RDEPEND="${DEPEND}"
+
+python_prepare_all(){
+	export SKIP_GOOGLEAPICLIENT_COMPAT_CHECK=true
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.4.2.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.4.2.ebuild
new file mode 100644
index 000000000000..b864d672f77f
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-1.4.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/google/google-api-python-client"
+SRC_URI="https://github.com/google/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	<dev-python/oauth2client-2[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/uritemplate[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all(){
+	export SKIP_GOOGLEAPICLIENT_COMPAT_CHECK=true
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.5.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.5.0.ebuild
new file mode 100644
index 000000000000..ee02f6711c1c
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-1.5.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/google/google-api-python-client"
+SRC_URI="https://github.com/google/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-2[${PYTHON_USEDEP}]
+	<dev-python/oauth2client-3[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-0.6[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	export SKIP_GOOGLEAPICLIENT_COMPAT_CHECK=true
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.5.3.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.5.3.ebuild
new file mode 100644
index 000000000000..09dbe3dda09a
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-1.5.3.ebuild
@@ -0,0 +1,43 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/google/google-api-python-client"
+SRC_URI="https://github.com/google/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-2[${PYTHON_USEDEP}]
+	<dev-python/oauth2client-3[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-0.6[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	export SKIP_GOOGLEAPICLIENT_COMPAT_CHECK=true
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.6.2.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.6.2.ebuild
new file mode 100644
index 000000000000..d8e51fd1931d
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-1.6.2.ebuild
@@ -0,0 +1,44 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/google/google-api-python-client"
+SRC_URI="https://github.com/google/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.2[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-2[${PYTHON_USEDEP}]
+	<dev-python/oauth2client-5[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/google-auth-httplib2[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	export SKIP_GOOGLEAPICLIENT_COMPAT_CHECK=true
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
diff --git a/dev-python/google-api-python-client/metadata.xml b/dev-python/google-api-python-client/metadata.xml
new file mode 100644
index 000000000000..8d8cdc3a5875
--- /dev/null
+++ b/dev-python/google-api-python-client/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+    <name>Robin H. Johnson</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">google/google-api-python-client</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
new file mode 100644
index 000000000000..a12265f1f59a
--- /dev/null
+++ b/dev-python/google-apitools/Manifest
@@ -0,0 +1,5 @@
+DIST google-apitools-0.5.4.tar.gz 255413 SHA256 003363aba9ce4d9a89a23761449074596f7f75303c3c30f726525e2077edfb77 SHA512 63953a3ce4e7485344f54434ae4e6de75e4ca1ca380858143735b02560a5ac808d5f2ffed346b09402c156632a34ea1ded27d152538a98ec40981230f7d38764 WHIRLPOOL c6c6f373e1c70c8c28e0f97075f8df8e35ca54cb69ef4785ef46d616430ff7832a2de8ec23982395c279646ac72402643a29ebe0227e3d1677b5a0f0cdae1fd0
+EBUILD google-apitools-0.5.4.ebuild 770 SHA256 27ea1989d5dcf97633e7fcd3f1019c3c23fe6b99204e0d02903e5b64e2156fc9 SHA512 5b441733cc1930ecc8cb571b87f78b13b848700fe299e64b0b4fa6ae10b7b4d74490aad4687bf306aec8212468654fd9fed0be66a64f90fb13ce4318fa9feb2f WHIRLPOOL 39fbf844450e638375b2ce4c335eebac62ba75060b0e8e5a819b2e33729761f949d6dbfc34e534e6a26b771dcf06dff5215686d61fc273b9aea5eef52dbfa19d
+MISC ChangeLog 3638 SHA256 1196251976d0028d6c922b6800dad4e8718af380987c4ce0b01338ee86664191 SHA512 c12e92472a08a0cfb8ecbd9ce042ad03130de27b0a10ba7db47b1045fbf1f05c5d50b507dd1251a259ac0204df2c1f63f561916514e3712bed8953cdf9d3700d WHIRLPOOL 127584992e2d7cb6ec068ad7734b3ab1b47b4b50f622b2ad10f77fddb0122ccdc1a5c7410f6410e6d094fbbd0924d5af0948665151391f9557ab74ef8058dbb5
+MISC ChangeLog-2015 648 SHA256 17a5c6cb34230db092782d31c10c9f38aa945a7baac20ce6cbf36fc8d4f46012 SHA512 131a46678a16be35ba5f7b7ef8995e1d5a8bb18cac787ea7dcea114b16e41d32edbf78837fc952db07935fe433dd7b0df4b2d60a3a444f09d6271b29cab0b608 WHIRLPOOL 2341f9ba6ad4f2d94c62ee48a8c4558f217a3ab3d5ad7a93ef48a767e05d9a1d6b45dadce30472910765acf789f4a7f15c0c7390cbb3edc0c1f64e1a4bc1a32f
+MISC metadata.xml 330 SHA256 916f8e575e6f74ea2c11b2beb98305d6501316fbca7c1bbca11fb1aa0e717da2 SHA512 a4b6c01f3d8c411c5e96b911585770af30c8a1f262e92bf01748447111798a8e6ede7aa5979f16c3cf7068b3f158842023546e234049e2345f1a2f2891e51296 WHIRLPOOL a261e9a1e1fcd81b4743527c0593a43a5fe9a9da17001a90fba09c0e8ef603178423c92b9704c592bf17a4fccba75222e241f81b16ae68a57a37727eb50dc732
diff --git a/dev-python/google-apitools/google-apitools-0.5.4.ebuild b/dev-python/google-apitools/google-apitools-0.5.4.ebuild
new file mode 100644
index 000000000000..7815253a3ade
--- /dev/null
+++ b/dev-python/google-apitools/google-apitools-0.5.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to manipulate Google APIs"
+HOMEPAGE="https://github.com/google/apitools"
+SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/google-apputils-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/apitools-${PV}"
diff --git a/dev-python/google-apitools/metadata.xml b/dev-python/google-apitools/metadata.xml
new file mode 100644
index 000000000000..8caccea78d85
--- /dev/null
+++ b/dev-python/google-apitools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">google/apitools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/google-apputils/Manifest b/dev-python/google-apputils/Manifest
new file mode 100644
index 000000000000..ed1601bd4464
--- /dev/null
+++ b/dev-python/google-apputils/Manifest
@@ -0,0 +1,9 @@
+AUX 0.4.2-sh_test-env.patch 754 SHA256 57da614c193e3500c52a1d07dcf69c4a6a44e1097988eaa9e1a5c9717ff2ab21 SHA512 a8a84c65d08c7574f4e33c6e6c0b75d1153e192e86ec37c0e74754cc84f45b081b523ee2f1919f57580ba5bf6d849922dfaf62bafa00ef098cb1a835a929331c WHIRLPOOL 5dcfa105e8ff3a9bbe4b1d4c27cfa38e36cc35b7d7b78ae533c0cc7f2fe0f35c9e14bc57f5d1a33e9541b30815f26efb587b0de95b52b8be646a8978927b73dc
+DIST google-apputils-0.4.0.tar.gz 80014 SHA256 b260eb39f2723b71329ad016773033b95a31e89d8c9e13b8e6a1ef8eed8e94a3 SHA512 5dbbf50e9551b33d882557ef9385c64691dcff6d6c219c9ff6aea2dc73c8af6d03392b3088fe1fb4000979e227830a0e437dc347520488627657085c8ea23f5e WHIRLPOOL c52d3fb5a4b0a81f212f53e4e1c92efee1275415fdb6ac337bce18494cee5a9c319c07634f890187e3e9f6b7d9222da048dc484d18fde6727db569d7c579d27f
+DIST google-apputils-0.4.2.tar.gz 81095 SHA256 47959d0651c32102c10ad919b8a0ffe0ae85f44b8457ddcf2bdc0358fb03dc29 SHA512 d7579ec461292bb01ad5b8e1b09e161c66af0e85361f43f6065b837c90bddb9711a2d56db2b73d780dc25945375d4dad2f646507512b9acfeefd517613feacd4 WHIRLPOOL d5db6aeebb18b9b3a01dbb338095a3b3b90fc90c9cb2250f141e07426119dada1deb301f4d9c3580448709d329de86f7086e13a6ab479ab1e8da154d53f921bc
+EBUILD google-apputils-0.4.0-r1.ebuild 1419 SHA256 1fc85c17626972603e4b000ac5ef13a5f95961d04afe6b58ffffcb14ebb93136 SHA512 3d7618b86dd42de706c747840f206fff16e7048cd88a565b50076016115f3d8c30094e339247294f36e2f880b55dd2d97f600349e11201d9f903cbfb17d105ac WHIRLPOOL 535091a3621a11a1381c2e36166ae75b633e4a45cae730a96009e665dd5db6ce11e97f9457e49c4a5fd9d942ae4b7d3e44d69a34531437f16773cb3179422335
+EBUILD google-apputils-0.4.2-r1.ebuild 911 SHA256 bb00b581d534714bd268cacd960ca21ded98b8ce068138eebcab2870f84830f1 SHA512 002ac6d13ff7fb217d0bac24524cd5280ffc7717181a847a486e2f6e5f18aaddb663297e9260d0d5574016ae7476e716877b07478e389dc86f457db3415c4e72 WHIRLPOOL f63c7a0a7aef16a0aef4b023adf085f89d17025200d1bec03914ebc45b90f6292ff81d360131af0fbc004a4678b01184a9d5edb88553bb5e13247f6bb43851cd
+EBUILD google-apputils-0.4.2-r2.ebuild 1110 SHA256 5913a036541be39608bc478cba58c7e0833c628f08837723e66d5c1156ea2b02 SHA512 6321eeb225b0fc048c149e198cd8d6fa651bd590a3a6058d104c14236610126e0cbc18adcfd518932ba92695eee49f677a54708318f89c9e1dfb155c32be1538 WHIRLPOOL 82b7be29f47c6ccdee1907c4a375471e5d941673787e2c46b41f14e7cfa0ca7e6ecef3443c5dbdc85cbb21dee808881ca46cfda07d1c592290e7842128adf050
+MISC ChangeLog 3971 SHA256 8f3f927b3ac1fbbedfe9cba44021bda3153b87a77509c42a065c63322b249c11 SHA512 2c3aea68658d9a08ca8ee81179db499d17751dffb9f8e9dd4e68b712dc27cdda097717175c91080b2923b48ee763de13460abfa78943b2d2fab9f3b83e75fbd1 WHIRLPOOL 1d59984c17eeb56293ea8dfdcdc7cd933d925dcee8dc84bae2927294875c780b169f28f0c15ded8f6878d4b8763083803dedfc0aa097353c86ac3520497f9a03
+MISC ChangeLog-2015 2320 SHA256 34a856334284b144930aab26bedfe13a0410aa39b926f16a974d09ed8555e733 SHA512 9aeffa9fbf3c85f1645599827ca0861c1a648eeb90b4defeb69340b68a89f8b7dd3d446440e4c1d55c183bd7f3a8ef723010c8beb7439595ef28895f81e9dcfe WHIRLPOOL b84fee97ec98ba2cd50a77762999b666aad19f9e0e8cb7d70db829ce4901982020e8abd6a3fd0cc9b7749efc81e8c5d210ec897e41b4eb4984939037c2669f79
+MISC metadata.xml 392 SHA256 6ef498e89491a6162640a77548c2c3e7eae852d40ca3b50436ce55cbfa970d1d SHA512 7ccba7bf0fcdb9da27053154056eb947ad07ce01db7ecc41f5a7e58bf75d15e71ce08ff420ee70b8169e5ea44d48d04d529acad65c8280785e0bd21a21bbcb9a WHIRLPOOL f8be2c4496dec9be22b60a5b143748d6751ea74ff8dbe7088cc9ddd3fc14095654a035aca7c04474708d260f409f5dc7384ce40aa2d5773efe686a1d7e4ff6b7
diff --git a/dev-python/google-apputils/files/0.4.2-sh_test-env.patch b/dev-python/google-apputils/files/0.4.2-sh_test-env.patch
new file mode 100644
index 000000000000..69ebe6278f9d
--- /dev/null
+++ b/dev-python/google-apputils/files/0.4.2-sh_test-env.patch
@@ -0,0 +1,21 @@
+Prevent the environment from being clobbered during sh_test
+
+diff --git a/tests/sh_test.py b/tests/sh_test.py
+index ab41055..d1b08c6 100644
+--- a/tests/sh_test.py
++++ b/tests/sh_test.py
+@@ -29,12 +29,8 @@ class ShellScriptTests(basetest.TestCase):
+     path_with_python = ':'.join((
+         os.path.dirname(sys.executable), os.environ.get('PATH')))
+ 
+-    env = {
+-        'PATH': path_with_python,
+-        # Setuptools puts dependency eggs in our path, so propagate that.
+-        'PYTHONPATH': os.pathsep.join(sys.path),
+-        'TEST_TMPDIR': FLAGS.test_tmpdir,
+-        }
++    env = os.environ.copy()
++    env['TEST_TMPDIR'] = FLAGS.test_tmpdir
+     p = subprocess.Popen(sh_test_path, cwd=tests_path, env=env)
+     self.assertEqual(0, p.wait())
+ 
diff --git a/dev-python/google-apputils/google-apputils-0.4.0-r1.ebuild b/dev-python/google-apputils/google-apputils-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..c669a1979113
--- /dev/null
+++ b/dev-python/google-apputils/google-apputils-0.4.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )	# Doesn't yet support py3
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of utilities for building Python applications"
+HOMEPAGE="https://github.com/google/google-apputils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh x86"
+IUSE="test"
+
+RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/python-gflags[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/mox[${PYTHON_USEDEP}] )"
+# version borders needed are already confluent with versions in the tree
+
+src_unpack() {
+	default
+	chmod -R a+rX,u+w,g-w,o-w ${P} || die
+}
+
+python_prepare_all() {
+	# https://code.google.com/p/google-apputils-python/source/detail?r=12
+	# This version bordering is long out of date and wrong since end of March 2012!
+	sed -e 's:>=1.4,<2:>=1.4:' -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# These yield 2 fails which are in fact expected errors run from a shell script!
+	# They seemingly have no immediate mechanism to exit 0 in an expected fail style.
+	for test in tests/{app_test*.py,[b-s]*.py}
+	do
+		"${PYTHON}" $test || die "test failure under ${EPYTHON}"
+	done
+}
diff --git a/dev-python/google-apputils/google-apputils-0.4.2-r1.ebuild b/dev-python/google-apputils/google-apputils-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..4c34e95c5e8d
--- /dev/null
+++ b/dev-python/google-apputils/google-apputils-0.4.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# Python 3: https://github.com/google/google-apputils/issues/9
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of utilities for building Python applications"
+HOMEPAGE="https://github.com/google/google-apputils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/python-dateutil-1.4[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-1.4[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2010[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} dev-python/mox[${PYTHON_USEDEP}] )"
+
+src_unpack() {
+	default
+	chmod -R a+rX,u+w,g-w,o-w ${P} || die
+}
+
+python_test() {
+	esetup.py google_test
+}
diff --git a/dev-python/google-apputils/google-apputils-0.4.2-r2.ebuild b/dev-python/google-apputils/google-apputils-0.4.2-r2.ebuild
new file mode 100644
index 000000000000..0f2dca125c4e
--- /dev/null
+++ b/dev-python/google-apputils/google-apputils-0.4.2-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# Python 3: https://github.com/google/google-apputils/issues/9
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of utilities for building Python applications"
+HOMEPAGE="https://github.com/google/google-apputils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.4[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-1.4[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2010[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} dev-python/mox[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/0.4.2-sh_test-env.patch"
+)
+
+src_unpack() {
+	default
+	chmod -R a+rX,u+w,g-w,o-w ${P} || die
+}
+
+python_test() {
+	esetup.py google_test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/google-apputils/metadata.xml b/dev-python/google-apputils/metadata.xml
new file mode 100644
index 000000000000..12da0e45b5e2
--- /dev/null
+++ b/dev-python/google-apputils/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">google/google-apputils</remote-id>
+    <remote-id type="pypi">google-apputils</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/google-auth-httplib2/Manifest b/dev-python/google-auth-httplib2/Manifest
new file mode 100644
index 000000000000..2e464d22b82c
--- /dev/null
+++ b/dev-python/google-auth-httplib2/Manifest
@@ -0,0 +1,3 @@
+DIST google-auth-httplib2-0.0.2.tar.gz 10830 SHA256 56ad472d166aeddab10fbf6b6a39848c959379e12b9cbcb5ccf2530eda61b4de SHA512 ec111fdad930bfe3f8f97df70a8bef955920ab2cb0c383d7888ff444f19e5c176dd5aabe10f9a870c86035791a2b27e3e8e1276360626ff5e430db823da5efb0 WHIRLPOOL 8bf72785a168905a6d1a5d6f2ec093d54e93799f09c0e0f5e53bb0de96c200a8638ac68bc393cd0b4dce4cca4b6299a202086d943dec917ee8733aa792869a99
+EBUILD google-auth-httplib2-0.0.2.ebuild 1162 SHA256 62f29f26d4ac38446314d4858e64085559c3fa6507074a42f1b304dc9e5b8903 SHA512 0fcf7e99c549215ca65264ba2b9936a8af0149e2bcfc3b075e64860bfc3da982a6dc94d89eca5a7c6321751ff1b06b6bd4fb296b38d79df5df9a60bf1e4af8b4 WHIRLPOOL 0ccdc35a5fad325edff4d7d9b1c90d89d1d7bd9c702fc962150fcee8c9b3b1ce3a5816e103e7d033315a6eb9e3706e18f5e37628aeaf5ae50f777ca7a2d201a3
+MISC metadata.xml 422 SHA256 322f7d321267935e9f3336798db8ee0cd8c720d8c4a9765a59e02866cbe86adb SHA512 bba9deccadfaf0b663a2f6239633f20ee02838d98cfa25e4d8c399e5635c4cd0b811dbf821f18edf98b328a56a37146bc316aceed6b5b057ef5fd2cd151bbaa2 WHIRLPOOL 13e3b6810f849ff0c1d49b00b41f20a125f11d11c342539b1c25d9aa05c7f2dab9cd070d5bdb4ed3575e2ba2e6d148cb14c120b762e994000b3707b7d71ad4e7
diff --git a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
new file mode 100644
index 000000000000..ca26a78531f7
--- /dev/null
+++ b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+EGIT_COMMIT="607e86011141e8885b1f52826d57c8b5ff588ffc"
+MY_PN=google-auth-library-python-httplib2
+DESCRIPTION="httplib2 Transport for Google Auth"
+HOMEPAGE="https://pypi.python.org/pypi/google-auth-httplib2 https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"
+# PyPi tarball is missing unit tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/google-auth[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)"
+
+S=${WORKDIR}/${MY_PN}-${EGIT_COMMIT}
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/google-auth-httplib2/metadata.xml b/dev-python/google-auth-httplib2/metadata.xml
new file mode 100644
index 000000000000..aaafa4650042
--- /dev/null
+++ b/dev-python/google-auth-httplib2/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">google-auth-httplib2</remote-id>
+		<remote-id type="github">GoogleCloudPlatform/google-auth-library-python-httplib2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
new file mode 100644
index 000000000000..cfa985c8f25e
--- /dev/null
+++ b/dev-python/google-auth/Manifest
@@ -0,0 +1,3 @@
+DIST google-auth-1.0.1.tar.gz 133903 SHA256 dd7b6e5f3bd15c0f7cfee63a266acea40c779da0a924b475bc1812e6e10687e1 SHA512 c10822c6b75700503a06a4b3a43a123d57605a043eb494bcb0232cc3941fc039d0803ed75be26d0da72fd4df613135c290fb3fdf82b0fa47d4fe0729462d80f4 WHIRLPOOL 04560bf31278988be1c98c0d781b84cfbc48b3c1e00e772ca83d17cbf05d2db055e6a8bf732605d39cdc02a0068d898b3c5765019e2550cdc980f2da50cd222e
+EBUILD google-auth-1.0.1.ebuild 1356 SHA256 7bbf0cd4b4a7176e9fa0c7e16cc180d14a37439247f581e02d6d997cbfa58ca4 SHA512 74bf3433020cff18b04b19b1c754626c78159b8cdd7414001844f5111042ea59a8ce96193f774e57b8af653e8fa9a0dcd09612dade2061a4a086ce48e74987fc WHIRLPOOL 57a6026ece97f8efe9b24e64d74614d901ea25942e046479763087b3bf4925e4e1bf2ef9e2dcc67f2bc245b4e147783f0695a57b35e7fef755305fb2ea84da40
+MISC metadata.xml 404 SHA256 482a57654056a5e35d3fd9ebfc826653a33a074b246f6914ccf3a4fbd1d71c50 SHA512 ba3c9a09c5bc382da4c8594011872eca305111afa671adffbd3d4c04f8d772cc37d43d83385183f38311e9549c12ccff14f44f85352c49f778766134075ff32b WHIRLPOOL 4c7a8533ba6a05153c5d0f335b7aca4c95e31cf21eabc10ae2febc602972cbe32c581d535586ea1e8849334f9c0e386760f946319464e25803f8657d1804bba9
diff --git a/dev-python/google-auth/google-auth-1.0.1.ebuild b/dev-python/google-auth/google-auth-1.0.1.ebuild
new file mode 100644
index 000000000000..6a57524baac7
--- /dev/null
+++ b/dev-python/google-auth/google-auth-1.0.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="https://pypi.python.org/pypi/google-auth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# urllib3-1.16 raised MaxRetryError, not TransportError
+	sed -e 's:test_connection_error:_\0:' -i tests/transport/compliance.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# delete stray files included in the tarball
+	find "${S}"/tests -name '*.pyc' -delete || die
+	py.test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/google-auth/metadata.xml b/dev-python/google-auth/metadata.xml
new file mode 100644
index 000000000000..9ee4c6540b0e
--- /dev/null
+++ b/dev-python/google-auth/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">google-auth</remote-id>
+		<remote-id type="github">GoogleCloudPlatform/google-auth-library-python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest
new file mode 100644
index 000000000000..95a379c8ba29
--- /dev/null
+++ b/dev-python/graph-tool/Manifest
@@ -0,0 +1,10 @@
+DIST graph-tool-2.19.tar.bz2 15147961 SHA256 eba1090f94b0434890beedaf0c100dd0fc77e41ebfe29b4725d76cadb82099af SHA512 dc0bd93ccf21bb6616035dbfe33b0d9406eb894791e615795d486dc8f9d9991a6b93cf835cf4e59197005c14faedf105f3384cccd42db544104840cf857b2a84 WHIRLPOOL 3a398c98487a1e29952fea4c3ff8671e5aaf3d4f9e8df26aae9f6a856e61c290954f4c662e48ae424cbe0b916833a8f3bc7a6eefe6c6c3a08540de58ed6b9de0
+DIST graph-tool-2.22.tar.bz2 15100673 SHA256 57121b562763c79c138b3a385b8cddb59e7dec375c61e00ca7e9e96fd1a5e080 SHA512 e5ffb6913ba76c1b3dea597950b8d50edd55cb997bf8b02c105ffab314b4978ac861db0c57507e51598f731b6b8fa9f1251e21d5feb9eb89158bc4c1921dc51f WHIRLPOOL d4f2cf19ef885ad22837ba693e65ebe5f2fc379bcafe2d23eb42327d1aad49fb2a73b4b0eb24eb4cde3d6a77b9b6dc2c05dfd01aec83d53d5c3ebbdf1be82aae
+DIST graph-tool-2.23.tar.bz2 14998733 SHA256 5278f7d7504c7d4de2b259a079f37c894d4ee11daa53ba6f5d646a13e4a4da34 SHA512 bd7e493806152d004ed8fcd5cd93f8a27200b0acacde07026ad6f83e8b9a0cdbdedfee79f5ff4c41de179ea3293a1d100571501e8791dad2ff608ecb424a9e36 WHIRLPOOL 0a623944245f190d9b535c0d514ba0023c006c91bb2affbf4038d23ffdf852cf5ba954a8b3ff5743cb97842f78007ae78063f95babe12814126dbfcffc24c846
+EBUILD graph-tool-2.19.ebuild 1848 SHA256 8652b07fbdce184b34a250812d1165e8dd9f9cd2780bfd923e89b5329110bfcf SHA512 344223b9db341f944a0ece4c94b9fec1dba2bfa0e61389fa991401eb1132db418f1547dd89904a8de9cf9cbfeaa050b8e9c1c15ed4f0455a2d440b19389a282b WHIRLPOOL 8c1de777016bfd52d75c8b957ae6def567d760852fa665243347063c2011dabd0cfdd67a55639fd44c31ebd5fde1cccc9d9c6fb37cfc936439d1c2bdeb01ceab
+EBUILD graph-tool-2.22.ebuild 1832 SHA256 3bf7ffe1c2adc7f0cb63e822a0985b098492adbd53abdda64e3aade10bcf3cbc SHA512 5e8dc4c1031047eaaeba8453b9cefe8b30dd28251fcb0074b05a084ac99be994bf66aff9abefafa0c9ac8243897760cedda81e3f7efe56539575740bea6e9127 WHIRLPOOL 26437b696e1bcea10a8953c7dd351c961954abcbb821eb3e7189f79d604b06b2a6b2380201687aa2022091aac408b3efcc0907e61f5d85a7a74c16d18053ba91
+EBUILD graph-tool-2.23.ebuild 1832 SHA256 3bf7ffe1c2adc7f0cb63e822a0985b098492adbd53abdda64e3aade10bcf3cbc SHA512 5e8dc4c1031047eaaeba8453b9cefe8b30dd28251fcb0074b05a084ac99be994bf66aff9abefafa0c9ac8243897760cedda81e3f7efe56539575740bea6e9127 WHIRLPOOL 26437b696e1bcea10a8953c7dd351c961954abcbb821eb3e7189f79d604b06b2a6b2380201687aa2022091aac408b3efcc0907e61f5d85a7a74c16d18053ba91
+EBUILD graph-tool-9999.ebuild 1832 SHA256 3bf7ffe1c2adc7f0cb63e822a0985b098492adbd53abdda64e3aade10bcf3cbc SHA512 5e8dc4c1031047eaaeba8453b9cefe8b30dd28251fcb0074b05a084ac99be994bf66aff9abefafa0c9ac8243897760cedda81e3f7efe56539575740bea6e9127 WHIRLPOOL 26437b696e1bcea10a8953c7dd351c961954abcbb821eb3e7189f79d604b06b2a6b2380201687aa2022091aac408b3efcc0907e61f5d85a7a74c16d18053ba91
+MISC ChangeLog 3975 SHA256 327bfa789bb47d323d3066a85c5f2f6ca8bdc8a14dd71497a33943f617edb1cb SHA512 aad9ffa79e91d78ee038138a29ec9533359617c756abb168c0af4dcbb01089e9f538d443aea6871597facafd9cb88629f4575c2740e54793bf98a82c3d1c7ef4 WHIRLPOOL 4379ae88bc31ddff7d94dfb40b363c6597959652bbc620a984bd58822edd0a0424ce7f3c8437d4de3d96de93957884f6046f4c7b065ac0cf34fd2fd08b1cb16b
+MISC ChangeLog-2015 4586 SHA256 7e6dacce9f4a2d9f1435fd7fd7f41b10b1a2fd3592043f2eca821cbd11cbc4ec SHA512 85a26e77ac86957d46bf278e6cd5df4447acaa9209f7d88764ca6df3be2d8ade72229e858e137f6faf0909abf33ce99d6f9a70e616db2598d450838545f1da31 WHIRLPOOL 1db0af21c8376a0911147960da469a803b8b08cf62c3b349697b1328a099cfd6653216b3c562ba6e445886bc686bcb1ad027a7052cb7985baeab72a9ddbdbfe6
+MISC metadata.xml 354 SHA256 1e65cefb46e61518bce761a8b0c392a943bf569e1ffba5a8dd008e2d22c11fc4 SHA512 4f8b73df8933d138d1d86ef9436bca38dc449b035701b51ea1d3ab666f3348a21fd3ab09817358d8e6e15a9189a7e61edc3d9af42755e4de472f1acc59852f51 WHIRLPOOL 2735c6b6c9bb8e8649c5bc658709d9cdd007545fee1b2b101fcdba440680aa5546041dc4d7f84c3dc5d624610f208e73835fb4e7b1fb102d79822d8195e39cd7
diff --git a/dev-python/graph-tool/graph-tool-2.19.ebuild b/dev-python/graph-tool/graph-tool-2.19.ebuild
new file mode 100644
index 000000000000..6e8852b6b20d
--- /dev/null
+++ b/dev-python/graph-tool/graph-tool-2.19.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit check-reqs python-r1 toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/count0/graph-tool.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2"
+	KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
+HOMEPAGE="https://graph-tool.skewed.de/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+cairo openmp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	dev-libs/expat
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	>=sci-mathematics/cgal-4.9
+	cairo? (
+		dev-cpp/cairomm
+		dev-python/pycairo[${PYTHON_USEDEP}]
+	)
+	dev-python/matplotlib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-cpp/sparsehash
+	virtual/pkgconfig"
+
+# bug 453544
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+	python_copy_sources
+}
+
+src_configure() {
+	local threads
+	has_version 'dev-libs/boost[threads]' && threads="-mt"
+
+	configure() {
+		econf \
+			--disable-static \
+			--disable-optimization \
+			$(use_enable openmp) \
+			$(use_enable cairo) \
+			--with-boost-python="${EPYTHON: -3}${threads}"
+	}
+	python_foreach_impl run_in_build_dir configure
+}
+
+src_compile() {
+	# most machines don't have enough ram for parallel builds
+	python_foreach_impl run_in_build_dir emake -j1
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-python/graph-tool/graph-tool-2.22.ebuild b/dev-python/graph-tool/graph-tool-2.22.ebuild
new file mode 100644
index 000000000000..cf9f4302985a
--- /dev/null
+++ b/dev-python/graph-tool/graph-tool-2.22.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit check-reqs python-r1 toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/count0/graph-tool.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
+HOMEPAGE="https://graph-tool.skewed.de/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+cairo openmp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/boost:=[context,python,${PYTHON_USEDEP}]
+	dev-libs/expat
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	>=sci-mathematics/cgal-4.9
+	cairo? (
+		dev-cpp/cairomm
+		dev-python/pycairo[${PYTHON_USEDEP}]
+	)
+	dev-python/matplotlib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-cpp/sparsehash
+	virtual/pkgconfig"
+
+# bug 453544
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+	python_copy_sources
+}
+
+src_configure() {
+	local threads
+	has_version 'dev-libs/boost[threads]' && threads="-mt"
+
+	configure() {
+		econf \
+			--disable-static \
+			$(use_enable openmp) \
+			$(use_enable cairo) \
+			--with-boost-python="${EPYTHON: -3}${threads}"
+	}
+	python_foreach_impl run_in_build_dir configure
+}
+
+src_compile() {
+	# most machines don't have enough ram for parallel builds
+	python_foreach_impl run_in_build_dir emake -j1
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-python/graph-tool/graph-tool-2.23.ebuild b/dev-python/graph-tool/graph-tool-2.23.ebuild
new file mode 100644
index 000000000000..cf9f4302985a
--- /dev/null
+++ b/dev-python/graph-tool/graph-tool-2.23.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit check-reqs python-r1 toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/count0/graph-tool.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
+HOMEPAGE="https://graph-tool.skewed.de/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+cairo openmp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/boost:=[context,python,${PYTHON_USEDEP}]
+	dev-libs/expat
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	>=sci-mathematics/cgal-4.9
+	cairo? (
+		dev-cpp/cairomm
+		dev-python/pycairo[${PYTHON_USEDEP}]
+	)
+	dev-python/matplotlib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-cpp/sparsehash
+	virtual/pkgconfig"
+
+# bug 453544
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+	python_copy_sources
+}
+
+src_configure() {
+	local threads
+	has_version 'dev-libs/boost[threads]' && threads="-mt"
+
+	configure() {
+		econf \
+			--disable-static \
+			$(use_enable openmp) \
+			$(use_enable cairo) \
+			--with-boost-python="${EPYTHON: -3}${threads}"
+	}
+	python_foreach_impl run_in_build_dir configure
+}
+
+src_compile() {
+	# most machines don't have enough ram for parallel builds
+	python_foreach_impl run_in_build_dir emake -j1
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
new file mode 100644
index 000000000000..cf9f4302985a
--- /dev/null
+++ b/dev-python/graph-tool/graph-tool-9999.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit check-reqs python-r1 toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/count0/graph-tool.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
+HOMEPAGE="https://graph-tool.skewed.de/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+cairo openmp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/boost:=[context,python,${PYTHON_USEDEP}]
+	dev-libs/expat
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	>=sci-mathematics/cgal-4.9
+	cairo? (
+		dev-cpp/cairomm
+		dev-python/pycairo[${PYTHON_USEDEP}]
+	)
+	dev-python/matplotlib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-cpp/sparsehash
+	virtual/pkgconfig"
+
+# bug 453544
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+	python_copy_sources
+}
+
+src_configure() {
+	local threads
+	has_version 'dev-libs/boost[threads]' && threads="-mt"
+
+	configure() {
+		econf \
+			--disable-static \
+			$(use_enable openmp) \
+			$(use_enable cairo) \
+			--with-boost-python="${EPYTHON: -3}${threads}"
+	}
+	python_foreach_impl run_in_build_dir configure
+}
+
+src_compile() {
+	# most machines don't have enough ram for parallel builds
+	python_foreach_impl run_in_build_dir emake -j1
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-python/graph-tool/metadata.xml b/dev-python/graph-tool/metadata.xml
new file mode 100644
index 000000000000..3d9b58965b28
--- /dev/null
+++ b/dev-python/graph-tool/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>horea.christ@gmail.com</email>
+		<name>Horea Christian</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/graphcanvas/Manifest b/dev-python/graphcanvas/Manifest
new file mode 100644
index 000000000000..028bca7421d0
--- /dev/null
+++ b/dev-python/graphcanvas/Manifest
@@ -0,0 +1,5 @@
+DIST graphcanvas-4.0.2.tar.gz 6998 SHA256 f0721ae540d6f725e9f74df8b074e772e53b970f86bdb897504c9bd57d634e13 SHA512 090e493627d3f5639a73a005f75da6357745ae3af6351f15cd8b82a6a742835932599b9c2e955de20dcb94333eb5263b25e553e3a522ae9292cf677ca805246d WHIRLPOOL ae7a529a97c9c26ad940766a60a8dc8e456698cf2626740e270df1f66bce3bc91f5aa516a5cd0bc38f54b078c2f940988da3da46c06f8c5654c5b6d0ff4cbe17
+EBUILD graphcanvas-4.0.2-r1.ebuild 760 SHA256 96fee022e0a5ccdc675f6dec7bfd12d689e7e51d517d7b07ca0bb5cb013cfcf6 SHA512 313b1fa30e0b96deca79621dd2b35167dc6d119ccf23c6b8a807a10797d29d6f77e9b161495d32ffcaef9bbb5bd8039175fd26e515afb6269734ecc7c1b76af6 WHIRLPOOL f9c3377863463df795540715b190ae284553d322239176fa65b0749b4f0fd87811dacc59b462d8a4e2aac16acfc84d45f2e7bd67b259f8b82970e569836d2080
+MISC ChangeLog 2597 SHA256 d672f93d41ca5ad6d647c45cde263e74f17597435ac109625bbb9536e54cee07 SHA512 a63c44715a7b3ce7638d10eec41c9e547e967d4e100323a0d2841a6536b5019a213599ea0b55f49518e6ce8400d4ac4c58da1646ccbf9003638943cf49595f87 WHIRLPOOL f7763d69f833420aabada261ebf280dfed388ea0b8eea0d49a916527fa342fa9ec035e1a20d494461e9f5d061a6b760bacfdf2c1c94713df683fe34d83c06fa2
+MISC ChangeLog-2015 1568 SHA256 3b36fc3cbd3eadbf8d61213f27b3d1cdd4ac73e4615cf64d936bb3dc8c476d36 SHA512 1552ac5a296380f8f5340715717a31c2e3c29c1cb08fc1c509ca341cfa4f779f1f07074bf2ad44c6bad29cd31a2f6ce3ea4968e3468fc5906f21f13ffdf87fce WHIRLPOOL aaf135e1b5afba94df09e947a7d75d5fd7a50ae3663d6b2389c609d8c325c82f58a58c190112cf6af1b22ab881365b72320b158f132bda6527a6763c051bea7f
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/graphcanvas/graphcanvas-4.0.2-r1.ebuild b/dev-python/graphcanvas/graphcanvas-4.0.2-r1.ebuild
new file mode 100644
index 000000000000..5311b72bbcba
--- /dev/null
+++ b/dev-python/graphcanvas/graphcanvas-4.0.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Enthought Tool Suite: Interactive Graph (network) Visualization"
+HOMEPAGE="https://pypi.python.org/pypi/graphcanvas"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="dev-python/networkx[${PYTHON_USEDEP}]
+	>=dev-python/enable-4[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		docompress -x usr/share/doc/${PF}/examples/
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/graphcanvas/metadata.xml b/dev-python/graphcanvas/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/graphcanvas/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest
new file mode 100644
index 000000000000..307a1d38995e
--- /dev/null
+++ b/dev-python/graphviz/Manifest
@@ -0,0 +1,3 @@
+DIST graphviz-0.7.1.zip 100779 SHA256 c7744df945fa90791ad9b4183a6a7dc8220d63a7b8a5f8f93ba62086f1e69e83 SHA512 e8ba326060ff3039f74902c01cf3d96c9965ce2259d0d5a9594e399added05c7e25b0f6c4b0be9ab21c1d37bbfb69e9c4856a7bb457b545185d48838d34cac70 WHIRLPOOL 9d81bfc82d7329e6db586f0ca3c4997446491dc1f413115ec7b4cd28cb31f5827206c3f57bad1b84d6b494d01bf751b516d6be75c4566abb639144fa9e623d54
+EBUILD graphviz-0.7.1.ebuild 660 SHA256 29971b3b60d83a3d8e6c9607e1d1cf0930d5b72e12eb0c663a5a76d779c5704b SHA512 0b974d48ff314fbcaccf54d1de13fafb6a21cd74d354c05af03f4da9484678f6a5b2bcc647f43c59f5be72c18953c3b1502e42377945db22b3f7f079385e0b8d WHIRLPOOL 0d62c7831bf7c1762cf401f86423a1970cd86c5aa4594a615e407d2932345aa4ddbf797314a664f7777e60d0937515dbb7f533528df0ec20211db957667541f3
+MISC metadata.xml 527 SHA256 d8b3d684a3bff008047b74606a7fa635b9f9b196ce6f331404149bcaa7e59c1b SHA512 ee156200f5de25536c3de4de57d0cdc0e01fcbf5b3ef8cd0baf15f7aeea29ce178e393c2ff3f409a93ad3dacd099664b9e72c43c259231b59668f08504c21c82 WHIRLPOOL 31d92d6e49cf877ce96e4a8f1c20546f7beb489bcd6be9728a21b04c8190cfac33ba1e854c1a0c449dd1bdf57edcacc88d62ecd8d6726d52299888cc26219435
diff --git a/dev-python/graphviz/graphviz-0.7.1.ebuild b/dev-python/graphviz/graphviz-0.7.1.ebuild
new file mode 100644
index 000000000000..a2327f77b8aa
--- /dev/null
+++ b/dev-python/graphviz/graphviz-0.7.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple Python interface for Graphviz"
+HOMEPAGE="https://graphviz.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="media-gfx/graphviz"
+DEPEND="
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/pytest-3.1[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/graphviz/metadata.xml b/dev-python/graphviz/metadata.xml
new file mode 100644
index 000000000000..f36ba828ecec
--- /dev/null
+++ b/dev-python/graphviz/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+    This package facilitates the creation and rendering of graph
+    descriptions in the DOT language of the Graphviz graph drawing
+    software (repo) from Python.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">graphviz</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/graphy/Manifest b/dev-python/graphy/Manifest
new file mode 100644
index 000000000000..ed7b98b4a237
--- /dev/null
+++ b/dev-python/graphy/Manifest
@@ -0,0 +1,5 @@
+DIST graphy_1.0.tar.bz2 69099 SHA256 d51c726c7deb028304fe4745afebd5e4fcd012ef2ee214d971f902f5d321492b SHA512 39b85b21dd0e984a3b7895a090d6676d2fc12e629bcb5f2e486ad02b6cacdd57ab150c1aa4364cae571cd8e6fbca20b5744c079be532b6f4ea2668899c9932e3 WHIRLPOOL 1898814373bfcaf9f3e0ad2cd7441a2c23d1f279d573a4db389af8ca1b5154cc5dca40930362161d7f36b51292c53877a1d015550954c3956883ebea6548565c
+EBUILD graphy-1.0-r1.ebuild 908 SHA256 11f58c1f247be3fb2156027c65394a077b6c21f642cf34a413265e7c576fb552 SHA512 b7cc5f5760b92c42e331ae0bae4e48c1877ace84f8c4be083fe152c881780858a1f4b77b82887b538c1e3551fa7e55816479357f6caacda5360b1940a883bb36 WHIRLPOOL 277372309daa245c88a7d0e0dbb5798ca323560d0bbd898dae94380810a3311cc5d37aa544a9d142637cf9e7c8d117475b4f1a57fb1379b64fccf4922f83014f
+MISC ChangeLog 2746 SHA256 e971f5fd6ed5db8db9e2b70667577fa031d6c604546489351bb143de400f337b SHA512 13e5b329484677c1bd47452bc7bbda6a3f2f96d22d1502e7d758958fcc3ad9b7db4c63613e2c3797b3a00c1a51ce0fd34f8c1496bd429c59590b5d1a08183680 WHIRLPOOL 8ec02489aa8a18c7114c766dff9f75486cc68119e3bc5fd157aea14e85b1c2ffc7a081a6fe0bf8509bc565bc23a8f74078fddd4670f0a7f75d9266fa17f92d93
+MISC ChangeLog-2015 1536 SHA256 e7e64a232cae49b4f1bd4dbe13d7f9bf1ec923c4c44a2921d5338244a48709f8 SHA512 4821880cd0cad8908d280244aeddbd642f76b8eee928eda8e4218356e4892116a362d32ff44ff283c056e97d8781c5b5ce3f14f35744d8c4639d7ce5dbeba742 WHIRLPOOL b65e450c42e251ec4780f858142319cac0a3567d1a900e0ab1a3aac1e03ad987185e0caa3c5147a2a6c41db8b46c4c5e3e8a678112b861333f66233b737a6f6e
+MISC metadata.xml 326 SHA256 4b51483980f9d43d6789b417702067ddea2a99cc60c11f9b10ca81619a74a0b5 SHA512 013f991fae51821c931d805c76bc412a131abb57390dbe03f47f6ed3cb32ff3b7608b6878bdca8f8d675fe09c6c5ecc694c476adddecef3411177e87393a526f WHIRLPOOL 555bd72748202972031b6b831d502a0c5bacc139972165297a86263b1b4ffdb8a1007392a842072c47cec74ddb3ff33ada6bf4645d887b174488a6d910c944f6
diff --git a/dev-python/graphy/graphy-1.0-r1.ebuild b/dev-python/graphy/graphy-1.0-r1.ebuild
new file mode 100644
index 000000000000..5c8b9ed95518
--- /dev/null
+++ b/dev-python/graphy/graphy-1.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="Simple Chart Library for Python"
+HOMEPAGE="https://code.google.com/p/graphy/"
+SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="examples"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	esvn_clean
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	:
+}
+
+python_test() {
+	local PYTHONPATH
+	mkdir -p "${BUILD_DIR}"/lib || die
+	cp -r graphy "${BUILD_DIR}"/lib/ || die
+	"${PYTHON}" "${BUILD_DIR}"/lib/graphy/all_tests.py \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	python_domodule graphy
+	python_optimize
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/graphy/metadata.xml b/dev-python/graphy/metadata.xml
new file mode 100644
index 000000000000..e81f2f46b144
--- /dev/null
+++ b/dev-python/graphy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">graphy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
new file mode 100644
index 000000000000..e4301f7f5c44
--- /dev/null
+++ b/dev-python/greenlet/Manifest
@@ -0,0 +1,7 @@
+DIST greenlet-0.4.10.zip 82616 SHA256 9a98d49f63259b16d3627976b69dd856888a376c498b091c8e9ead56d5098ca8 SHA512 7fc78b14dca079f838647fd99878850cf9e83af781c985362146a11f71c5a700fbac8148273cd1c0ec4ac6ead4cf5bd389e001b8fc1225e87e9b51919d7ecc6c WHIRLPOOL 19490879ceb1ca3407cd84beea6a9dc741ac5d2783df3a867f69e249d16cd5b0ec9fafb5b27a22c71e1984dea85fcdeacd915a5a3fd3759e3c873fb02c515127
+DIST greenlet-0.4.12.tar.gz 57319 SHA256 e4c99c6010a5d153d481fdaf63b8a0782825c0721506d880403a3b9b82ae347e SHA512 f3bf0f82b6e3bc687fc9b89469339cfb05e64518d1e49bc96066e8d47b8559f1c1aa53692cd25d839437a2f1b81df6fd9a4509a1b4063ec4ce1d97b73842e9f6 WHIRLPOOL bd6eeca3614487c864c1bd3adadcef714c6fb6358e64bd4e9c3c41d2104a3e1d9f31ace7fcbc13a5cb5f482313baf2085385454e9e65129c9c88359798afecbe
+EBUILD greenlet-0.4.10.ebuild 1088 SHA256 731ecbbafd734ee0c2e8728fc8bfbd5bf2104be86d291608839bb7aeba69f087 SHA512 faa86a437f85ec7571ad6cbd0f9c73eb762d978361e05351ba6b858a346feba213e2f95a0a7236f0c6a293ab7fee5e40e71b93a7b7428228f79024f1a8c723f3 WHIRLPOOL 360740bf88941083fbc4a523f5366afe1fb5674f3244465688b81777dce9a39849ac67db93f8e2e69b29074922c13347ec1bfb1fdcc61939453997f36b452091
+EBUILD greenlet-0.4.12.ebuild 1076 SHA256 19876f23559ab0245f74974822430adb7459d1a7a65f99f94137110a1132a246 SHA512 12bd4435b40405ec368da8edbb5f16e17fb106c37417673ff210eba982c25952049ebf7e8d4fc52a40a02260f04ae4801bda15d49df7d991b105eb1ff404d235 WHIRLPOOL 8d0509c71cd97463a2ab3af1cc84ae1a189720866bdd88c8266cb6ab2af6ddd506d46e7bb682bf9a80ae9f21d2bccc3487b24b7932dfc2600cdc3851e2173934
+MISC ChangeLog 4848 SHA256 fb1565db67c6a74306e611f681c044c92438b0f156a0571085253ec1e8e6f613 SHA512 2b5c2b96d1327bf90202c5756224ebd616e5ea7cd708f595e97ee090605ca4f2062efbddf7f18a0cd78eced0f615305e3611ce25be22ef7266dc1a467d4562a3 WHIRLPOOL 03b3037d0ec49f7f5aebaf98cb510fed7cef0db986a4e66291872631ec277b1f2dfdf2814c74e64fc6111182ae50273b8dc4b137b1289219b2668d75ab1e105d
+MISC ChangeLog-2015 5616 SHA256 3cf2c2e7623c7cd5b7ac20d5b112bbd726b00ea5418769bfcdcb14590db917d7 SHA512 c37a7baa6fb686066263578d55fea9e8bb2a26c2960a381a2a8fef965f5a7998662108b1ba915668826000bc9f2c0e0d71b2ffe8fd228b083b9f4d11e605e65c WHIRLPOOL dfffaff18a1d5178e49a0117684d1ad68e41591df5771ad5e42d44080920f8184f89b81bcc9190559c197bef9414e3a01864f8328befe2da945bb7b4d5c46c69
+MISC metadata.xml 321 SHA256 34b426273d9d802099d4353f79eb83a9c8d52635ac94a3f1fcf280b7d0b6727f SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548 WHIRLPOOL badb0f08e8f4ce66d31740f8c139d25afe90c41c3ec04abdb184a0b9bb7bec1eef29b4dbe50cc2bd6642751b96bf8a98f5908f9672b036f421f06b32b8ceefee
diff --git a/dev-python/greenlet/greenlet-0.4.10.ebuild b/dev-python/greenlet/greenlet-0.4.10.ebuild
new file mode 100644
index 000000000000..d066407ec748
--- /dev/null
+++ b/dev-python/greenlet/greenlet-0.4.10.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# Note: greenlet is built-in in pypy
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Lightweight in-process concurrent programming"
+HOMEPAGE="https://pypi.python.org/pypi/greenlet/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-alpha amd64 arm ~arm64 -hppa -ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND="
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile() {
+	if [[ ${EPYTHON} == python2.7 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	"${PYTHON}" run-tests.py -n || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/greenlet/greenlet-0.4.12.ebuild b/dev-python/greenlet/greenlet-0.4.12.ebuild
new file mode 100644
index 000000000000..032d251bdd68
--- /dev/null
+++ b/dev-python/greenlet/greenlet-0.4.12.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Note: greenlet is built-in in pypy
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Lightweight in-process concurrent programming"
+HOMEPAGE="https://pypi.python.org/pypi/greenlet/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-alpha amd64 arm ~arm64 -hppa -ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile() {
+	if [[ ${EPYTHON} == python2.7 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	"${PYTHON}" run-tests.py -n || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/greenlet/metadata.xml b/dev-python/greenlet/metadata.xml
new file mode 100644
index 000000000000..81610f8da9ea
--- /dev/null
+++ b/dev-python/greenlet/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">greenlet</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
new file mode 100644
index 000000000000..852760d75cf7
--- /dev/null
+++ b/dev-python/gst-python/Manifest
@@ -0,0 +1,12 @@
+AUX gst-python-0.10.9-lazy.patch 534 SHA256 5a973c247741dcf2418c3f15427e9408295606ff3b2bf559ae7d82e060b18fee SHA512 b00cb635ae44f4dc42f0d72f5fb49e6540eee6c8b989715df4554dc09e9980ce0d5c91ea7ebd853d552061d1aad1a28b645c831198b9799587debce654f508c1 WHIRLPOOL 309008562b2870a8b2519f484100750027519e6ddc31c7462c0fc4420fdc5950be0943f74c1e623d17c080271bf58564a49f286330eaf9c0b41582640edada9a
+DIST gst-python-0.10.22.tar.bz2 632651 SHA256 8f26f519a5bccd770864317e098e5e307fc5ad1201eb96329634b6508b253178 SHA512 bbbd6b661778cca990da0e216294d86da31a6e472049905989a3311459dd1227bf8f2ae3699a3cdbb66a16288569764352f1e1b93e696d3db4b0728bc38e5b12 WHIRLPOOL c6902554bc8f390b5d295d05598ee60fd6b2637d290125d83a48fc40bbd4e6e261a711430259831c96a30fee4c5ec5c89aea444424b117fb5d62c946b0263454
+DIST gst-python-1.10.3.tar.xz 389748 SHA256 bdfa2d06dfe0ce68f638b04fed6890db506416c1dcf1279e83458269d719a4e8 SHA512 346fae905f5d0d3e6295c4752351e629871e9373f2bf7e1acff0778f0935f81dd6043ae0d9ae774919a19ad8bd19bd9ea3456a3a1a381c9e63e5ad2ee5bf1530 WHIRLPOOL 4540cc8bda15dd4a4b07bf67d440c42c41b4165b92e417abcfc3f84495c7ca712621976dd3db9ce7589ef6fa691afefbefbfe407ef765e888a06dc0a6733d842
+DIST gst-python-1.10.5.tar.xz 390188 SHA256 ccc7b63413c29196401488ca2af599ef8bc9791ee3512c7483c9f87294b3a77e SHA512 93120156b5af8914b9190ba0f9996f2bce860889dbd92c0a7b41213af36efd880e0f94f295df07c27d83b5a79a1874dacb035943d3f51a93cfa484d38bd6fd4d WHIRLPOOL 662a46e9c2d9329527d5aecbf3a73564caee515279e4da84195769abdc8fe775ee96e5baeb856dd86394b1d035ee354ca310f9950c8ffe41e8f85e8bbf0165bf
+DIST gst-python-1.12.3.tar.xz 388220 SHA256 c3f529dec1294633132690806703b80bad5752eff482eaf81f209c2aba012ba7 SHA512 f4d0d09a5b068e79496aa5e0d73f09af2d1e929cf6f80874dba8396950952b795a30f5a33c18b42a650f173c80ce342f959d497aa0d9d281bbe36507a71d1b4a WHIRLPOOL 2903fe2391173c731ec91a3c750c99651dece4ee6789059d6235b4e1e748b81e65a50e6bb77835e5d5a60ad315c3225998da3b44b3141fc729448c36b1ff949a
+EBUILD gst-python-0.10.22-r1.ebuild 2148 SHA256 ad01d5164839df14bc10de659b53c6d78d4fe00f31f4b9533141207b8a9b2183 SHA512 ebc646247140167dff59b882007d1919cfcc03cbc872d2d0db1dba3887287b3f9110a523df844da4b59ac70f764a8cb1f9de570ac660458a29d0802b7791639f WHIRLPOOL a95ae5bff61a4db977c442527d75076b8f30fd0460f6789db43d83f1261a1ca96e90ba5572f38f581dafdb463b056d9f5aa11e796034831fd0f1c9dd13a9c1bb
+EBUILD gst-python-1.10.3.ebuild 1121 SHA256 7f451ae76de262b1383f95ec700be01a3c5e8b48bfa283cd424525167bba9322 SHA512 82a9e5b7ad9811d59cfebe0772b4003822bd179bad5d00ccbcdb4c9cb1e03ba57b9c116f0827c635ee3005c0bf4326f4d57ac51c77b7d941058a2e524ede4545 WHIRLPOOL 8a92d7d87beab2e4e3977455b21b73635885661c2e4f5ece4e9cbc674648be16e4087491c7f9844b7c712d98cafd35b361f100f7bc72a6134e71dc3ccf827525
+EBUILD gst-python-1.10.5.ebuild 1129 SHA256 2ee3f62435f5d46e3c93ba8faa7e3e55a93ace5841111999f6d8f5a9d1333248 SHA512 848e939d3e9dfe925eff842bb3aa13d35a27dee56e0fb90bffd46768424efddb0c1181c9257ea9e521be79597874bcf72beee2be1dc352e7d952a1ff42aec008 WHIRLPOOL 2baca0d54b1ab701193faa4e1dbfc7b94da3eeeefd4a9b5119e916e3a8c20f43f2350d193c8427566e826b9b4ff9cb3f4980cead05a31dbf7b4df09754bdeb5b
+EBUILD gst-python-1.12.3.ebuild 1133 SHA256 6b0d0fde717dc0db1340d75d37d95ded7ee6b58692b072d72f12c91b462c5ab2 SHA512 f81a6bc528ebe479583e922524db39f13ec2c3dd8baf7858d99ca5743e298a488c0e3e221341880811dad6fe6736a7102a094ea1571f65baf2f822ec8b654a94 WHIRLPOOL 1779c5134cd547503c7be651d16319c2891d3536ef75605021581359e313345d85b4aa28c97363a0df17295ec153270e0cb61a71425be289bc032442b0d16142
+MISC ChangeLog 8901 SHA256 5b4d606ecd7d165a41fc1fd440ecf2a4f80f098db793db1d717b8a6b805be372 SHA512 8a818af9dcdcbc2daa50ad8abda2beabed387aa301e7acd8adda9119157f82ef1754eeb7ce923fbf6c9ae0399a6114946b60938282462f28e6e8ac11f99af22d WHIRLPOOL 3c3cb3912b79fe75e2aa41b4ea6fd1bd32a991826fb5e1481ded90eac868b314e3d04973417db3030027e006dc7b4c1a6d60a4f4d1b8a5f096a64828614354ff
+MISC ChangeLog-2015 19499 SHA256 faa35ccc2dcdeaf3f92a918338451aa330a6e7e959268cbf03d8a83f11a0de77 SHA512 93fbf1c4c68e5b7212ad6d310a8ed1d13710d4f2e8b7e92715d7303b6b7bf71362b0813962268e4b7abb21c9ef8f5789e0ad5fd129e96cfc2199d52de2d271c0 WHIRLPOOL e1cba65dd70b859bd351bd0634201adfbf91d00db882d03bc7439bc964d0ce17b66f6ad3b8433dbb483ca1c0e49bc3a1209fbbb2a5a410e51d9b35e28c6b1b00
+MISC metadata.xml 272 SHA256 c359e335e2d2a52e9d3462702b8e24475e6f1e6e62673d13cc64e4b49a97a059 SHA512 7dffa3bd729f24f9081f6b1c3db474cb26c54e95752a37140c5a9836299f26b3d0aa73e7c448e6b773478cb0112eaaf70f783d2b2f3d2868b1a2def8e6a9b8ea WHIRLPOOL 10927e64702cd2ed921e795e80c874379a66141393d5bcb46a86da71b47bbf9a04ecc0ff0dbd01d1d5634ae00b2f6af5c5ee17de8073a84e47b0daedde9bf618
diff --git a/dev-python/gst-python/files/gst-python-0.10.9-lazy.patch b/dev-python/gst-python/files/gst-python-0.10.9-lazy.patch
new file mode 100644
index 000000000000..880d5508b2ee
--- /dev/null
+++ b/dev-python/gst-python/files/gst-python-0.10.9-lazy.patch
@@ -0,0 +1,21 @@
+diff -ur gst-python-0.10.9.orig/configure.ac gst-python-0.10.9/configure.ac
+--- gst-python-0.10.9.orig/configure.ac	2007-11-28 11:33:05.000000000 +0200
++++ gst-python-0.10.9/configure.ac	2007-11-28 18:09:48.000000000 +0200
+@@ -363,6 +363,17 @@
+ 
+ AG_GST_VALGRIND_CHECK
+ 
++AC_MSG_CHECKING([whether $LD accepts -z,lazy])
++case `$LD -z,lazy -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++  LDFLAGS="$LDFLAGS -Wl,-z,lazy"
++  AC_MSG_RESULT([yes])
++  ;;
++*)
++  AC_MSG_RESULT([no])
++  ;;
++esac
++
+ AC_OUTPUT([
+   Makefile
+   codegen/Makefile
diff --git a/dev-python/gst-python/gst-python-0.10.22-r1.ebuild b/dev-python/gst-python/gst-python-0.10.22-r1.ebuild
new file mode 100644
index 000000000000..5ac4ba415bd9
--- /dev/null
+++ b/dev-python/gst-python/gst-python-0.10.22-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils python-r1 virtualx
+
+DESCRIPTION="A Python Interface to GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0.10"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="examples test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/libxml2
+	>=dev-python/pygobject-2.28:2[${PYTHON_USEDEP}]
+	>=media-libs/gstreamer-0.10.32:0.10
+	>=media-libs/gst-plugins-base-0.10.32:0.10
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? (
+		media-plugins/gst-plugins-ogg:0.10
+		!!media-plugins/gst-plugins-ivorbis:0.10
+		media-plugins/gst-plugins-vorbis:0.10
+	)" # tests a "audiotestsrc ! vorbisenc ! oggmux ! fakesink" pipeline
+# XXX: it looks like tests cannot be bothered with two vorbisdec implementations
+
+src_prepare() {
+	# FIXME: this comments out the only failing test, report to upstream
+	sed -e '171,176 s/^\(.*\)$/#\1/' \
+		-i testsuite/test_bin.py || die
+
+	# Leave examples alone
+	sed -e 's/\(SUBDIRS = .*\)examples/\1/' \
+		-i Makefile.am Makefile.in || die
+
+	sed \
+		-e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \
+		-i configure.ac || die
+
+	epatch "${FILESDIR}"/${PN}-0.10.9-lazy.patch
+	AT_M4DIR="common/m4" eautoreconf
+
+	prepare_gst() {
+		mkdir -p "${BUILD_DIR}" || die
+	}
+	python_foreach_impl prepare_gst
+}
+
+src_configure() {
+	configure_gst() {
+		ECONF_SOURCE="${S}" econf
+	}
+	python_foreach_impl run_in_build_dir configure_gst
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_test() {
+	LC_ALL="C" GST_REGISTRY="${T}/registry.cache.xml" python_foreach_impl run_in_build_dir Xemake check
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+	prune_libtool_files --modules
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*
+	fi
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null
+}
diff --git a/dev-python/gst-python/gst-python-1.10.3.ebuild b/dev-python/gst-python/gst-python-1.10.3.ebuild
new file mode 100644
index 000000000000..613391bf35fb
--- /dev/null
+++ b/dev-python/gst-python/gst-python-1.10.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python{3_4,3_5} )
+
+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/gst-python/gst-python-1.10.5.ebuild b/dev-python/gst-python/gst-python-1.10.5.ebuild
new file mode 100644
index 000000000000..6a2f88ae8a3c
--- /dev/null
+++ b/dev-python/gst-python/gst-python-1.10.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 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/gst-python/gst-python-1.12.3.ebuild b/dev-python/gst-python/gst-python-1.12.3.ebuild
new file mode 100644
index 000000000000..b022282bed4c
--- /dev/null
+++ b/dev-python/gst-python/gst-python-1.12.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 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/gst-python/metadata.xml b/dev-python/gst-python/metadata.xml
new file mode 100644
index 000000000000..af143d8096cb
--- /dev/null
+++ b/dev-python/gst-python/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="project">
+    <email>gstreamer@gentoo.org</email>
+    <name>GStreamer package maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/gtkspell-python/Manifest b/dev-python/gtkspell-python/Manifest
new file mode 100644
index 000000000000..4131cd7faaba
--- /dev/null
+++ b/dev-python/gtkspell-python/Manifest
@@ -0,0 +1,6 @@
+AUX gtkspell-python-2.25.3-python-libs.patch 2243 SHA256 649b7bdede190923a504b3a598ac9e2003872da8857a152305048a628795c187 SHA512 f9ddacdcffaaf6933e3ab28f843892a4754677a29987d512ebc3810245fb793f8a242b479e47fd63dc7756c817a510e04cda2548aa6bb4d88ce4649c2b1759ed WHIRLPOOL 015c9bb798dadbc0d64143a151bd2a3d1d978a77348e07473f675ccef6b0e5b722eaf81462e48b06c45176d51b698b28834cb2ef4afc9fb2b00e7a8ba5f98b75
+DIST gnome-python-extras-2.25.3.tar.bz2 370489 SHA256 ca346264e00e193f0866cabd8801d3b7ce70dae7b8b296e41e5b3a45c9b0275c SHA512 6994b8b5d6ccc009edc7ddfad373b9164d8162f1007972652f6086dca30cac6941ab68ef467d15c972ab05c4ae0e19ec72edc2643636d22a01a3f5a719251467 WHIRLPOOL b0adfcef8bbb978d063a932393e17de9c8c519194f40085ecd03824ec4fb4421c84e0a4853a5a2d9fc40c94d8c0c261828447ac5fd69cff4ece39c52fc833590
+EBUILD gtkspell-python-2.25.3-r1.ebuild 898 SHA256 7516a712f0ba14925b9a6d2f4c433be7f49f660e0c9ab93fcf270f8de1b37fb6 SHA512 75b411bf4fc5722c600f1f0a5520ddb20a39b7f5bff9c9d8b3bf4a53dd079653fbcec4a87bec2a5cc35eee978a7fdea612a09edc888de469cdc7691064dcbf5c WHIRLPOOL dc5420cc8c2ace58c1c839facf8e347c012e12680ed701c6faf52a48006b5fbf17661c4058eb24953420e391a80d045833a44f8159ba2e42e661e6d879fa7b11
+MISC ChangeLog 2512 SHA256 6347b79e956f6ec8b60e2225b04e20ce4d5fc1037fa35d0b8ee102e4402009e2 SHA512 e4a0bf6ce7e9a85f279c86408976e4608dd84efaf07e9c15cbbed1da1455c86f18e51613a867d000d0ecc771a6a2d68de5ff194f6a3837a26f12fca73a75db22 WHIRLPOOL 368c6da1614234e5c3d23541b18c07789534a79b0e2a1f821f67b9e0892702c263eab45192c01aeacff256d261dc3b27fd35946cea5cd6ab94276818f47c9a5a
+MISC ChangeLog-2015 4436 SHA256 72698d97f475f96462c46c54ae38a510c62c039c17a67195fe9128d2df3b1bbb SHA512 7676aa93dfde071836c809a65da01991bae2383670e11f5492048ac47e2ed1036441d09009be49a401ed7a431f55c14131f426e323d0b8a127905862fbed53a5 WHIRLPOOL 9186f15d43c6141fb406c44ae9ff7d8f3eeac4683eaf7c8e5ac7a89ad84dc593c22c9c8f26300a7a39f261e8bea98ca1176b147c1843b5d4d886032fc5fc3a5f
+MISC metadata.xml 346 SHA256 4b87f1154df42a81076572760417393762ac1c76a6c1cec8d16c31049097d48b SHA512 e7e631f5ebe3a81d0431366152d6f7a2d21958a031746d6b2fd6ac9ef3f145d78fb30d1014b0912e9d720b3be7c6d2fdc544bb840a9f12fddf37ffdcf65933bd WHIRLPOOL 1d51841db0de7eaec1b024566af146da5323306447445f18c771cb90030c664ce376db8a3bb59d39f125e9abd9dc367fad98a8abfb2acc7bbfe4855b7695cced
diff --git a/dev-python/gtkspell-python/files/gtkspell-python-2.25.3-python-libs.patch b/dev-python/gtkspell-python/files/gtkspell-python-2.25.3-python-libs.patch
new file mode 100644
index 000000000000..ab691272cbb6
--- /dev/null
+++ b/dev-python/gtkspell-python/files/gtkspell-python-2.25.3-python-libs.patch
@@ -0,0 +1,59 @@
+From 7824fd5291f570de3c2c64185035d1a6a0a3445a Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 13 Aug 2012 04:42:47 -0400
+Subject: [PATCH] Replace horrible slow python libs search
+
+---
+ acinclude.m4 |   36 ++----------------------------------
+ 1 files changed, 2 insertions(+), 34 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 8694a65..f5373eb 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -59,40 +59,8 @@ $1],dnl
+ [AC_MSG_RESULT(not found)
+ $2])
+ CPPFLAGS="$save_CPPFLAGS"
+-
+-	# This bit is copied from Planner. murrayc.
+-	# Check for Python library path
+-        AC_MSG_CHECKING([for Python library path])
+-
+-	# Win32 has libpython25.a instead of libpython2.5.a, so we look
+-	# for both. TODO: Only look for libpython25.a on Windows, and for
+-	# libpython2.5.a on unix.
+-	WIN32_PYTHON_VERSION=`echo $PYTHON_VERSION | sed "s,\.,,"`
+-
+-        python_path=`dirname $PYTHON | sed "s,/bin.*$,,"`
+-        for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
+-		if test -e "$i"; then
+-	                python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
+-        	        if test -n "$python_path" ; then
+-				python_lib="python$PYTHON_VERSION"
+-                	        break
+-	                fi
+-
+-			# Additionally test WIN32_PYTHON_VERSION
+-	                python_path=`find $i -type f -name libpython$WIN32_PYTHON_VERSION.* -print | sed "1q"`
+-        	        if test -n "$python_path" ; then
+-				python_lib="python$WIN32_PYTHON_VERSION"
+-                	        break
+-	                fi
+-		fi
+-        done
+-
+-        python_path=`echo $python_path | sed "s,/libpython.*$,,"`
+-        AC_MSG_RESULT([$python_path])
+-        if test -z "$python_path" ; then
+-                AC_MSG_ERROR([cannot find Python library path])
+-        fi
+-        AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -l$python_lib"])
++PYTHON_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; print('-L%s -lpython${PYTHON_VERSION}' % distutils.sysconfig.get_config_var('LIBDIR'))"`
++AC_SUBST([PYTHON_LDFLAGS],["$PYTHON_LDFLAGS"])
+ ])
+ 
+ dnl
+-- 
+1.7.8.6
+
diff --git a/dev-python/gtkspell-python/gtkspell-python-2.25.3-r1.ebuild b/dev-python/gtkspell-python/gtkspell-python-2.25.3-r1.ebuild
new file mode 100644
index 000000000000..7e38b416a754
--- /dev/null
+++ b/dev-python/gtkspell-python/gtkspell-python-2.25.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+GNOME_ORG_MODULE="gnome-python-extras"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome-python-common-r1
+
+DESCRIPTION="GtkSpell bindings for Python"
+# The LICENSE with gtkspell-3 is LGPL and there is no way to express this in
+# an ebuild, currently. Punt till we actually have to face the issue.
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="doc examples"
+
+RDEPEND="app-text/gtkspell:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	gnome-base/gnome-common"
+# eautoreconf needs gnome-base/gnome-common
+
+EXAMPLES=( examples/gtkspell/. )
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-python-libs.patch" #344231
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	eautoreconf
+	gnome-python-common-r1_src_prepare
+}
diff --git a/dev-python/gtkspell-python/metadata.xml b/dev-python/gtkspell-python/metadata.xml
new file mode 100644
index 000000000000..6cd5da0617a4
--- /dev/null
+++ b/dev-python/gtkspell-python/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="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer type="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
new file mode 100644
index 000000000000..284c33d0534c
--- /dev/null
+++ b/dev-python/guessit/Manifest
@@ -0,0 +1,10 @@
+DIST guessit-2.1.2.tar.gz 100478 SHA256 9f7e12b7f2215548284631a20aae6fc009c8af2bb8cc5d5e5e339cb15361dd95 SHA512 394098cb61cdd1d140e47a969dd86422d6856d2cda42dc7072ab9e482a0001d62f6ffe91d74a7bad04f274197e36e731ce203fe92930558969a94889d47c8e14 WHIRLPOOL dd26470424be58231a5787da45ca9122596800fbb968366699bc799cc29d65562cded7d40f8c6abbb6e48466300521d07560c92f44868b8a4229a68b5795468f
+DIST guessit-2.1.3.tar.gz 102452 SHA256 b2eebbb61e4d2b3764ce4462e0b27da0dccbb25b78e13493a2f913a402e1d0fb SHA512 e10d784709b0f66e344988021274077ae7e849c75b35701ded414f80de00d5314a149a99679b4e41e52c1bc91f6b8f481e82418126be0fba43541a05ecdfe95c WHIRLPOOL 573c1efef786758555e602b1cb17891570c53d491f170371037630ba5251954f2903c273d2d508f146a3e6c526320456bcafc86393f91ed15e095e01360dc82c
+DIST guessit-2.1.4.tar.gz 102907 SHA256 90e6f9fb49246ad27f34f8b9984357e22562ccc3059241cbc08b4fac1d401c56 SHA512 c6465c32a68d40698b75addb343d765e47b867dd7f9b8c912f70532a9e9ca54d0e40f70a393880347eea64535a65df5f79d83ea99dc996cd126ba91ca130a879 WHIRLPOOL 5266dc2367f6642494dc4d9530cf3d210576e0a94940db68f46cc058ec257bdb2be81ea5287fc376d2935c80053474bcb5d0e0727431f3565009e54caada1a7d
+EBUILD guessit-2.1.2-r1.ebuild 1261 SHA256 244750284bb7d50850f88537be76ad2e8fb3eab87c98d9a56f9c49c5d68c8824 SHA512 eee95aa7586fceaf340485b570aea6a93a7ca8334756da94c3a6ed69d274e3cccf9dc7601b012d316a2fd2fa925e85a0b183514d42db9556818b1301e3385f2c WHIRLPOOL 1b47c19372e9ed528041d3987e4d311ae814f7e9eb47b1976d184da2789c8d3d7c989678f1910e35b43c55cca5a1024b6855a2712f56d63b96652be6225db95c
+EBUILD guessit-2.1.3-r1.ebuild 1261 SHA256 244750284bb7d50850f88537be76ad2e8fb3eab87c98d9a56f9c49c5d68c8824 SHA512 eee95aa7586fceaf340485b570aea6a93a7ca8334756da94c3a6ed69d274e3cccf9dc7601b012d316a2fd2fa925e85a0b183514d42db9556818b1301e3385f2c WHIRLPOOL 1b47c19372e9ed528041d3987e4d311ae814f7e9eb47b1976d184da2789c8d3d7c989678f1910e35b43c55cca5a1024b6855a2712f56d63b96652be6225db95c
+EBUILD guessit-2.1.4.ebuild 1262 SHA256 5906e1905d1345398bdff74a5379b7b2db2b0b7508e6048a44f40cef684c1842 SHA512 20f07f80db8c96352db4ec5124ea73598152bc8ca1cdc852a49ca30cc531a3fc8920bf666d4bae4a61ffba8f7d115fddd70b579b6fa70403f97e1b2c41b9a70f WHIRLPOOL ad347109edce0c126413a0a8207b231e9e5cde49169e2b69e3ecd0d1508c94e6c9cde106dc026c229379f6a84cd778bba35a7333e87ec8211e0eb267adbad411
+EBUILD guessit-9999.ebuild 1284 SHA256 28fa063c4011ed4f63159848c83240a755cf67ba5f7a42beaef410717596fb13 SHA512 3e0caedfbce4eb60c2eadec02e2f48e9a1901f82833fb2ce165414c7497f5609d0856ea2b4e10251c6d6f7d0903bcde60bc8142adce721af780fffe71b8dc64f WHIRLPOOL c376764db6deb9f71d59480a1ccec4045d50e59bffa435ec5b010602b471afc37e680f7461f5931039a19cbe447589d72793012b8e378b704a01d0acf129cacd
+MISC ChangeLog 8428 SHA256 f6578dbb21f0b2808d9f8f3c0baa4552b96802aaef96b5a5e079a1c21501fd0d SHA512 c89ab9c29daf4c55ae4ecd47b4fe3e588eae6d442f55256d00961d80bf1cc5f70f446dee954eb0b938e8ffc63287d18c789c401fad85864dd7097e77f9809cff WHIRLPOOL 7921d3c352d00674e6c93dca7c1f3e26846ce2bd3a46546db3e769548551b45cf445a348f4cd286d4979776a94b23db7aa2064a8a0150484c0f77965f87a368a
+MISC ChangeLog-2015 1913 SHA256 e273a560c467b6d2c919e048f85709889055642b090f3bc1bdcaedbb641d83fa SHA512 8abce08e34a1abeae708548aef357007d2b17dd64e5cb1efa0707a577e7e06c2cc0803a4b0b50f63523784d4906d52a8e4fcf56a976b5632952d4a10bbb1d81f WHIRLPOOL 6834f2eb8d8e95a6b52dce434980583ae6b653d52b879b3335583b96b7a0b4fb261cbbe068381aa13f6441a13472e3b9014dd840639ef8403f555dccdebc57a2
+MISC metadata.xml 494 SHA256 a4b99dd6eb9954f8676ab24c92b1ceb4cd61e7c8ce207d3e6ec17b9d03d47653 SHA512 7a9448f171bf023c39ca5bdeb3f3c079ad64ecfb07a15d8d3708e00365ed9cb9dd547e404197fca308fab1e52f8c7f3669bb952b370c8ca707ff24d6067a1c32 WHIRLPOOL 4153cc3020a8164f6850959e3ff48ea41d95e54def1368069c0109c1418cb693d6fc6469bd5c05500b061d8e8125e1598d0abfd90f4c7a2620f619d8365c4d5c
diff --git a/dev-python/guessit/guessit-2.1.2-r1.ebuild b/dev-python/guessit/guessit-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..298b5a6ff0e3
--- /dev/null
+++ b/dev-python/guessit/guessit-2.1.2-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for guessing information from video filenames"
+HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.python.org/pypi/guessit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
+	=dev-python/rebulk-0.8.2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
+		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Disable benchmarks as they require unavailable pytest-benchmark.
+	rm guessit/test/test_benchmark.py || die
+	sed -i -e "s|'pytest-benchmark',||g" setup.py || die
+
+	# Disable unconditional dependency on dev-python/pytest-runner.
+	sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/guessit/guessit-2.1.3-r1.ebuild b/dev-python/guessit/guessit-2.1.3-r1.ebuild
new file mode 100644
index 000000000000..298b5a6ff0e3
--- /dev/null
+++ b/dev-python/guessit/guessit-2.1.3-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for guessing information from video filenames"
+HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.python.org/pypi/guessit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
+	=dev-python/rebulk-0.8.2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
+		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Disable benchmarks as they require unavailable pytest-benchmark.
+	rm guessit/test/test_benchmark.py || die
+	sed -i -e "s|'pytest-benchmark',||g" setup.py || die
+
+	# Disable unconditional dependency on dev-python/pytest-runner.
+	sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/guessit/guessit-2.1.4.ebuild b/dev-python/guessit/guessit-2.1.4.ebuild
new file mode 100644
index 000000000000..98774b237126
--- /dev/null
+++ b/dev-python/guessit/guessit-2.1.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for guessing information from video filenames"
+HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.python.org/pypi/guessit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
+	>=dev-python/rebulk-0.9.0[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
+		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Disable benchmarks as they require unavailable pytest-benchmark.
+	rm guessit/test/test_benchmark.py || die
+	sed -i -e "s|'pytest-benchmark',||g" setup.py || die
+
+	# Disable unconditional dependency on dev-python/pytest-runner.
+	sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/guessit/guessit-9999.ebuild b/dev-python/guessit/guessit-9999.ebuild
new file mode 100644
index 000000000000..8c6ead3c27e3
--- /dev/null
+++ b/dev-python/guessit/guessit-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Python library for guessing information from video filenames"
+HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.python.org/pypi/guessit"
+EGIT_REPO_URI="https://github.com/${PN}-io/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
+	>=dev-python/rebulk-0.9.0[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
+		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Disable benchmarks as they require unavailable pytest-benchmark.
+	rm guessit/test/test_benchmark.py || die
+	sed -i -e "s|'pytest-benchmark',||g" setup.py || die
+
+	# Disable unconditional dependency on dev-python/pytest-runner.
+	sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/guessit/metadata.xml b/dev-python/guessit/metadata.xml
new file mode 100644
index 000000000000..8b04885dcd0c
--- /dev/null
+++ b/dev-python/guessit/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>itumaykin+gentoo@gmail.com</email>
+		<name>Coacher</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">guessit-io/guessit</remote-id>
+		<remote-id type="pypi">guessit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/guppy/Manifest b/dev-python/guppy/Manifest
new file mode 100644
index 000000000000..ae805d7cf9f1
--- /dev/null
+++ b/dev-python/guppy/Manifest
@@ -0,0 +1,6 @@
+AUX guppy-0.1.9-rm_BrokenTests.patch 1643 SHA256 b03693bbb82906290213374f6dc89d40018cbac042b042ebb4f2ce71e12e177a SHA512 ad6f5b126c84062a5d29a45f23fdf5d91c63a305bb26d7ef1ac1e5034505c79498c7da393b17a04118762261c0cd74f4360e18b49cf292805896dd1f9294097d WHIRLPOOL aa6b3359beb2d8648c8b95f1f30d18f1a3e1a2dba766ba2ef02c4669e3979164008bb467e20e845ccb465b4947e8f7496967636eb791f8a78ad5b4ed41cb3cd9
+DIST guppy-0.1.10.tar.gz 484906 SHA256 00118c000e451063ea16bb6a3b52632d10960c44c0014553c287dce5c03813df SHA512 ea48fd19d7fe9a24832364599b8843304e95ccd1ccf3a9a475456ba25af2a4be94991dcb61deb854b740c2358d280579e756177236b3c73cb0de100bdf0286ce WHIRLPOOL 81b23d17f66d012865627d3f44edd89e63897d0a5e00b7e98d76d5abed3e4c296a1ab00b7dba32f02f0df7fb460c39c0672d6bc157cd74c478b39a87fb4d199c
+EBUILD guppy-0.1.10-r1.ebuild 1279 SHA256 947327c1d1141ac34cd517acb1b493af897c0b65ffaa058697c9d732f6be4e6d SHA512 f1f5e4e7bbc317dfbd4e81966bfccd4001fe9f47125c09f1de7a6815f3afc8f1d5a36d5afbb74f41d938936ae0e2176103b315394bd3450de2b433d7e5902037 WHIRLPOOL e0c1560283e00d8c6665d81ff77e5108a1fd426fed3f07d57f3fb339f3e114ac52add15664ee1e3603d5dc99d322cc5f5f7cfb8435c339b686e418267089ccb6
+MISC ChangeLog 3165 SHA256 e5245952418d517a31c23f9af180393a17d66d9f4bb1bc1df124521479e0bcaf SHA512 0b2a93a2cd1cc006f7bd63a2a8425e5d8a50d7be5bb46f2068dcae6ce7bcb53a1736b52f415a040c715825d708dfed5811a4a9177dd187b0dbc7bbddcea42cbf WHIRLPOOL 70291269fa8f530143cec2262175ee4265cd9dc2049952d9af631081fc3c617f65de90d8f12a2ad30aedf46783bc45f59605d5c66f6309f42e20cc5aa337e5c9
+MISC ChangeLog-2015 3202 SHA256 5c74d6344950b563176c7bacb2503a3799f3e6d87ac83ada1dba8e12b658bd39 SHA512 07e7d9643231184596a49a81063693687a7046f748725270f4e564323bf74872462870a58a4582d80da7fe70eabebd937ca80d297c0fef2357cc5ebce8e35191 WHIRLPOOL a00f11eae0f6d9e30b5974b5f3c3cc688b0b11e3d478bb515e635c76b80cc8a8987c8f072a3a633206f74685ea5d7d2a72ac4c0243374d837d0cf20dff1111d5
+MISC metadata.xml 691 SHA256 bab3b542be4deb3c898b461aa557ab45b2f0b343dee2cc7e244b30a23877dc9c SHA512 df184d2e1d689a4017ce29f754d7cf85ebf3adc05e7b441790c1e7dfefcd42ddf247bb754298e2302bb6d34dedbb53bafb0d7542d600a4377d71870a0d002ab0 WHIRLPOOL 2081356f5c6546cf956ba3917f492b8168054fd5ff34fd83ca01476b7fb46111b4907b26eda6d391fa10a524a34fc15c3ab9078ad52104daf6098d1f5e60a90e
diff --git a/dev-python/guppy/files/guppy-0.1.9-rm_BrokenTests.patch b/dev-python/guppy/files/guppy-0.1.9-rm_BrokenTests.patch
new file mode 100644
index 000000000000..fabbe4cda512
--- /dev/null
+++ b/dev-python/guppy/files/guppy-0.1.9-rm_BrokenTests.patch
@@ -0,0 +1,57 @@
+diff -ur guppy-0.1.9.orig/guppy/sets/test.py guppy-0.1.9/guppy/sets/test.py
+--- guppy/sets/test.py	2009-06-23 21:48:32.000000000 +0800
++++ guppy/sets/test.py	2012-11-07 16:59:38.383392670 +0800
+@@ -4,6 +4,11 @@
+ # so wouldn't check so much with python -O.
+
+ import gc, random, sys
++if sys.version_info[:2] == (2, 7):
++    import unittest
++else:
++    import unittest2 as unittest
++
+ try:
+     import numpy.random
+ except ImportError:
+@@ -211,6 +211,7 @@
+ 
+ '.nython off'
+ 
++@unittest.skip("Class broken")
+ class Test:
+     faster = 1	# Set to 1 if test should be faster (less exhaustive) than normally
+ 
+diff -ur guppy-0.1.9.orig/guppy/heapy/test/test_View.py guppy-0.1.9/guppy/heapy/test/test_View.py
+--- guppy/heapy/test/test_View.py	2009-06-12 18:20:53.000000000 +0800
++++ guppy/heapy/test/test_View.py	2012-11-07 17:23:52.289280501 +0800
+@@ -1,4 +1,11 @@
+ from guppy.heapy.test import support
++import sys
++
++if sys.version_info[:2] == (2, 7):
++    import unittest
++else:
++    import unittest2 as unittest
++
+ class TestCase(support.TestCase):
+     def setUp(self):
+        support.TestCase.setUp(self)
+@@ -55,6 +55,7 @@
+ 	p = iso(z).referents.indisize
+ 	self.aseq(p, iso(y).indisize)
+ 
++    @unittest.skip("broken test")
+     def test_horizon(self):
+ 	iso = self.iso
+ 	h = self.View.horizon()
+diff -ur guppy-0.1.9.orig/guppy/heapy/test/test_all.py guppy-0.1.9/guppy/heapy/test/test_all.py
+--- guppy/heapy/test/test_all.py	2009-06-18 21:44:11.000000000 +0800
++++ guppy/heapy/test/test_all.py	2012-11-07 17:34:04.036233306 +0800
+@@ -1,7 +1,6 @@
+ import sys
+ 
+ autotests = (
+-        'dependencies',
+         'Classifiers',
+ 	'heapyc',
+ 	'ER',
diff --git a/dev-python/guppy/guppy-0.1.10-r1.ebuild b/dev-python/guppy/guppy-0.1.10-r1.ebuild
new file mode 100644
index 000000000000..03fffb34e63e
--- /dev/null
+++ b/dev-python/guppy/guppy-0.1.10-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Guppy-PE -- A Python Programming Environment"
+HOMEPAGE="http://guppy-pe.sourceforge.net/ https://pypi.python.org/pypi/guppy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${PN}-0.1.9-rm_BrokenTests.patch )
+
+python_prepare_all() {
+	sed -e 's:_PyLong_AsScaledDouble:_PyLong_Frexp:' -i src/sets/bitset.c || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	"${PYTHON}" setup.py build install --home="${T}/test-${EPYTHON}" \
+		|| die "Installation of tests failed"
+	pushd "${T}/test-${EPYTHON}/lib/python" > /dev/null
+	"${PYTHON}" guppy/heapy/test/test_all.py || die "tests failed"
+	popd > /dev/null
+}
+
+python_install_all() {
+	# leave the html docs for install as the setup.py dictates but rm if set by IUSE doc
+	if use doc; then
+		local HTML_DOCS=( guppy/doc/. )
+		find "${D}$(python_get_sitedir)" -name doc | xargs rm -rf
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/guppy/metadata.xml b/dev-python/guppy/metadata.xml
new file mode 100644
index 000000000000..041d6c710310
--- /dev/null
+++ b/dev-python/guppy/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">Guppy-PE is a programming environment providing object and heap memory
+		sizing, profiling and analysis. It includes a prototypical
+		specification language that can be used to formally specify aspects of
+		Python programs and generate tests and documentation from a common
+		source.</longdescription>
+	<upstream>
+		<remote-id type="pypi">guppy</remote-id>
+		<remote-id type="sourceforge">guppy-pe</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/guzzle_sphinx_theme/Manifest b/dev-python/guzzle_sphinx_theme/Manifest
new file mode 100644
index 000000000000..60a6f9c0884c
--- /dev/null
+++ b/dev-python/guzzle_sphinx_theme/Manifest
@@ -0,0 +1,7 @@
+DIST guzzle_sphinx_theme-0.7.10.tar.gz 225764 SHA256 d0ddb986fbb70c00d84c628ff520ed3d64bdb0e876487e896dae1ece048a8e08 SHA512 a21867e93ffc80e91b85a0fc33cedb21ba9e1d2912b6d5d6226e5ec93550564a1a9321eae09aaaddb61f36ce051017c33b750c52d609cd604a5cc4bf8ce5248f WHIRLPOOL 99b96d26f744fa3a8e7a7b480d617ec9bb47ca3b3330d5a4b3439ad7cae3b846b29e031dc9f7640066fd1c7542a03f044029e1c5cf0cd88341988218b561fc42
+DIST guzzle_sphinx_theme-0.7.11.tar.gz 2548612 SHA256 9b8c1639c343c02c3f3db7df660ddf6f533b5454ee92a5f7b02edaa573fed3e6 SHA512 9aecdd4cf8ae286c9dd59a453790d957e96a57a9c9acd3aa38ff8fe64969cde4619c4154cd7304dd1c5bd0ea58fe71f556701b7a9b12f58fe3f5c1bdd2681da5 WHIRLPOOL bcedb9a2f5f574100be78a002dd973dae8d78244f422d7328e7fc405a65442ba6f50ae360c2fd6d6034bfdca882f3623861cdfe0b43086a8cb091f9693384bfb
+EBUILD guzzle_sphinx_theme-0.7.10.ebuild 483 SHA256 6f5988a63344377ebb45df6748fe8127da3390df2aac2eb238a7567a060b5d38 SHA512 41c475243e28745a8f750e9dd1d0137e67a5ce4ca3e0d47058834aafeafabd84103c9ba5775b194f1cac586a696ab283cf8106ea9f7d2d7e137c2b5703ea2e6e WHIRLPOOL 69217f3fec0acc712ce2d649cdeb14c07e02ce5b2162164f030034b7ce62b1cc1944ceef957b68fdacea3ec4d0709f333a43834b59631466b471b5d9acadc8d1
+EBUILD guzzle_sphinx_theme-0.7.11.ebuild 510 SHA256 ed83e9bd12f9f68f066b78cd88c515fd23b4b79c88ede4093da27637e7ae44a1 SHA512 0e02fd3cbbad0ef1afc8161bfc8da627eb6e8103477971804966f10e5ec8b4fdff7b8425bcd70015c5b32342e67966c7c620ae0ebddccd4e721a9fed98ec9688 WHIRLPOOL 72a1313706738ff27c6790e399e145f8377c13c3eba9347cb82f9ccdb1b5b8e6d1cd2ef7c2405dce46e972a8af00c39f656b58967ffa3033bcd11604e8fe5b1b
+MISC ChangeLog 2501 SHA256 e66cc2235aeca23991925ab72bc89bd9024c76eb5b2b97ec26446b20d9836c5d SHA512 0a4ead1a2ed6757948ab92344b3a9a3a63fe408c6a251d0b5d4fd295470321c9bcdac666679b22f9874525a9233b09c86105fa64152019a5134796d3e96fe9ed WHIRLPOOL 74a76719b03445bbbcbadc62f7de10ca727d4f3efcc165aea3e51dda405a50d22ed7d9683cbe2804833d56310d2637ce1b2b1d4929b3ca5692e71ff3be2a45b7
+MISC ChangeLog-2015 401 SHA256 88e166dee4b18d7d9e83473ea86baccad2856da169828d39e21a17155abce0de SHA512 f1c8d0bc72119c06b585e5c08d5b6e3903a5f164e95cdf2dd74d3c7c20b52868a1f53587357b959294ba900a4424e63b4ab321e0454cd0fe64a1221941bd5f20 WHIRLPOOL 3af86c9190fddc3da0a68c0dc3b96c2ce0808a9c11a89901c7cd5785bc3830a51fa4d8543142246fd89f2bf414b7e54c1ef371ea1f52adca7007922df0405ce9
+MISC metadata.xml 394 SHA256 8a8abdddcc9bf76851331117f518ca8efab6401157e76c57fbbc21dddf0dddc2 SHA512 59a0a481a2e4fcb97968ca496460775270c5e7c60729b65fbacc443bac2bb31185f4ee6913009d5749a8f2e25526c78fbbc2aad6a57e823054970f9a04c4476a WHIRLPOOL 4967e4e7a97032bd82672d6e6ed977333f035d0637aa4c9e1f98204f9d9a5cac515c69cf5141b895db5f569fe846daf1fe4c78a30e160522b21078092cbed483
diff --git a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.10.ebuild b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.10.ebuild
new file mode 100644
index 000000000000..b7e9895fb6bf
--- /dev/null
+++ b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.10.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx theme used by Guzzle"
+HOMEPAGE="https://github.com/guzzle/guzzle_sphinx_theme"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/sphinx-1.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11.ebuild b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11.ebuild
new file mode 100644
index 000000000000..5722b5e28f58
--- /dev/null
+++ b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx theme used by Guzzle"
+HOMEPAGE="https://github.com/guzzle/guzzle_sphinx_theme"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/sphinx-1.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/guzzle_sphinx_theme/metadata.xml b/dev-python/guzzle_sphinx_theme/metadata.xml
new file mode 100644
index 000000000000..911ea664afba
--- /dev/null
+++ b/dev-python/guzzle_sphinx_theme/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">guzzle_sphinx_theme</remote-id>
+		<remote-id type="github">guzzle/guzzle_sphinx_theme</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/gwcs/Manifest b/dev-python/gwcs/Manifest
new file mode 100644
index 000000000000..fea9516eb064
--- /dev/null
+++ b/dev-python/gwcs/Manifest
@@ -0,0 +1,4 @@
+DIST gwcs-0.7.tar.gz 276681 SHA256 ad1cb88de858a4174d97c50a045cc7a4317c615a95c70ff5243a55431b0278cb SHA512 fe7b11c748f76175ea7a3d0a584ac61d783ef06db849c7dc77f220e40e8e9f44a5090f3f2de50a51d0df66e04f7aec32aac14fd406d4d41d32d70c53f04a9961 WHIRLPOOL 93265da283643487e189c573e6b052c08638b1a34c2e096151d507b26bb269259cade121896bdfcb2723fa923845079c02f277c08d1501d9eb72393720426b7d
+EBUILD gwcs-0.7.ebuild 1311 SHA256 e94167681f2b910c6b5dad9a5c45122d128ce0054af342ecc22aa2ffa9d554cf SHA512 79bab4cc5eefd42523fac6a041ce7ab2f70208e4ec836cf632099ac189d7348c7041967ac54c2ff195b286be0c0e0f5f62c44aede4a4006d71bedec48f90bf69 WHIRLPOOL 8fa01edf5a27d84d77ff3921d46d6c5bdc4a27a485b2c262ce39716b84c425a75f35b72404a4b9d906f9b6f1c3d1d52ee252c3321011901ec1916b4436c5531f
+MISC ChangeLog 310 SHA256 aa0417e4d7aa899200b162f576d28369653658f25a455ce9df3bafcab98ee8b3 SHA512 ec079c4c82cfd9866c46c603c48565b5983775cac4dcd92c1d6bc1ef3a001e1d46148cd017e2d4ae53d178276d390dba0f04d86959759c82388b95be0ce44693 WHIRLPOOL b0b95028acab0a0f96b71641d600fbbc691cbe91964869ffebc476bbe40fd549ceff52509d1896c6d0d922da8ce92b131899dd82617fac2a3843f1e9262c996d
+MISC metadata.xml 801 SHA256 530a852bd3ad7e06a9ff60f65e9fa451da4d8b90be524a01e35917e56dcbd952 SHA512 9a20c6faf196c7076f94c28ff3dbb1c63ba144b799b6d4c35051afb39d3cf90247bfe38fcb5ec4a53f210d629f5d86c38282eeac3cb24913d1cab0fa58e2c273 WHIRLPOOL 345bd9c244a411979974291c801c5146e6fe52c0ada64f8443833bf036112fe0c89b1e52c6539c0e086d096f1fa818eef615aa55dc190888e6651d96e8f5107c
diff --git a/dev-python/gwcs/gwcs-0.7.ebuild b/dev-python/gwcs/gwcs-0.7.ebuild
new file mode 100644
index 000000000000..f778cbb6d015
--- /dev/null
+++ b/dev-python/gwcs/gwcs-0.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python  for managing the World Coordinate System"
+HOMEPAGE="http://gwcs.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/asdf[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7 )"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${PN}-${PV/_}"
+python_prepare_all() {
+	# use system astropy-helpers instead of bundled one
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		PYTHONPATH="${BUILD_DIR}"/lib \
+				  esetup.py build_sphinx --no-intersphinx
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/gwcs/metadata.xml b/dev-python/gwcs/metadata.xml
new file mode 100644
index 000000000000..033a8d077fdc
--- /dev/null
+++ b/dev-python/gwcs/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    GWCS takes a general approach to the astronomy World Coodinate
+    System. It supports a data model which includes the entire
+    transformation pipeline from input coordinates (detector by
+    default) to world coordinates. The goal is to provide a flexible
+    toolkit which is easily extendible by adding new transforms and
+    frames.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">gwcs</remote-id>
+    <remote-id type="github">spacetelescope/gwcs</remote-id>    
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
new file mode 100644
index 000000000000..125508925143
--- /dev/null
+++ b/dev-python/h5py/Manifest
@@ -0,0 +1,7 @@
+DIST h5py-2.3.1.tar.gz 1072766 SHA256 447e55d5893ca285d1185a938548a12f3f7d4af441f1a7740ac28bc3aecf85c1 SHA512 f0da1d2ac855c02fb828444d719a1b23a580adb049335f3e732ace67558a125ac8cd3b3a68ac6bf9d10aa3ab19e4672b814eb28cc8c66910750c62efb655d744 WHIRLPOOL cdd2be028d450d1566776b056550af001dd382082cce5cac9fdb8968071b9f3e9855e2c30bf12bbb800c1313343980f74c2ad3d853318585bdc6134c8af5b35c
+DIST h5py-2.7.0.tar.gz 256471 SHA256 79254312df2e6154c4928f5e3b22f7a2847b6e5ffb05ddc33e37b16e76d36310 SHA512 7c1e5d8b47c176521f5f62cfc4f782c09a0e003c5cbc07a673ccc3dfbe97df930b33801ef7311360892e3fad1d7d72561a8578aed9cb630d44e1a73543bb5da4 WHIRLPOOL fa38ff5d6c2a97d9eacedb0c8ccbf791ee2edb4ff652bd39a1ab102be5ec849cd45a74dd294f42fd8b2f1d943bbe1b0653afc57f6a44aed0cfc3e0b37cdc589d
+EBUILD h5py-2.3.1.ebuild 1125 SHA256 1cc0a89dd17803b32ed40e839c659dd0047abaf82eeb37329ce18759f3e22d7c SHA512 324df192b0734bebddca783c9fcf469a1a09803dc104235a2f2987ff1d11994f770ef482f47cf055ca5aec725f5924cb1195bf563dc8c22ceb119ae779c1412d WHIRLPOOL f20894ee64d83f3fd596861ebf3b33fac36545ebf2398c0d81eb33e9416361bbcc9c8974d7c417f56ceda7e8a5273e0dd3cf160d3940be6a5075c201acff8a38
+EBUILD h5py-2.7.0.ebuild 1383 SHA256 f7cb6b3852f8e176d35549d3fd003fe9ef61c030824dfaca6c68de8c2c9d63b3 SHA512 f7687d5f281f9892660784a1f47192212cba546ee85cf1499c2a6d75efdcb9622d71884422f03395830746026630ce5bdec74c32a1e806c05d42c88ae6fcff7b WHIRLPOOL 43f3c5dfa2f466d566e4d4144e5da85d5bfc08b98d99bce8e5291104b3f85bdc3e7ab2f092a5eb8aad26c3ee814d54021823ccf18ff7802961650b0fb12b59ce
+MISC ChangeLog 3716 SHA256 5ddf47ea19c4c882b0b784308ceb6f9c819d52f209e83862f5bcc62a8bd39349 SHA512 9cfb744d9284434917040f134952a3b8aa953f455011caacc9e029ae05318f9087a1a21e341807c26eb3d34ee9fff71df50b1720481d6bc3194783e04b29e739 WHIRLPOOL b075967ccc3ba0dc18ae5d969ce77ca1da09d37925e2fc4584577d6d1ae2f565ba4d356a87c92be29a004429cacf1ac9470890231b7f1479517c7ead91d301c0
+MISC ChangeLog-2015 6744 SHA256 4748dd52135158fa44c356515f3133ed6ff3f4b2832892fd8114a64f03b82cf1 SHA512 56331f00f8e02297148bdcf454d5b83a51e639de3d550f09bfe0530d0beda2710a83c8c97cc7c34fddb8a90b3c53f24c62c85dc75e9ac2929a30959b80478346 WHIRLPOOL 13c04979b3c6f8efe4997028448a8ef1bf237ad686ea5fc7e909877b3c66267d66d8012a065fbaf97f49f79c1cb26ccf04d28037c69a38dca240b5849b573c6d
+MISC metadata.xml 1015 SHA256 55ca2ad18cedd4bd7ee368ed7198da478bb315e87385c748b4e7e0da0f8d11d9 SHA512 1880b779b8917357e6301273a304314e73686cea70325c2ee17c1bd901190bf0b07575584275039d199df6b190df9be3ab6617ee9f2babb0b609c408cba5af52 WHIRLPOOL bee1487893f83cdf49282f94f0117f800e528a104faf34d52330d2cd61cd8294ddffb723777c0b2776760de67ebd3c0b0cab8e3bd801664823bc0dfb85dc4ae2
diff --git a/dev-python/h5py/h5py-2.3.1.ebuild b/dev-python/h5py/h5py-2.3.1.ebuild
new file mode 100644
index 000000000000..29efd5b8b5e9
--- /dev/null
+++ b/dev-python/h5py/h5py-2.3.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Simple Python interface to HDF5 files"
+HOMEPAGE="http://www.h5py.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test examples mpi"
+
+RDEPEND="
+	sci-libs/hdf5:=[mpi=,hl(+)]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )"
+
+pkg_setup() {
+	use mpi && export CC=mpicc
+}
+
+python_prepare_all() {
+	append-cflags -fno-strict-aliasing
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile --mpi=$(usex mpi yes no)
+}
+
+python_test() {
+	esetup.py test --mpi=$(usex mpi yes no)
+}
+
+python_install() {
+	distutils-r1_python_install --mpi=$(usex mpi yes no)
+}
+
+python_install_all() {
+	DOCS=( README.rst ANN.rst )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/h5py/h5py-2.7.0.ebuild b/dev-python/h5py/h5py-2.7.0.ebuild
new file mode 100644
index 000000000000..4e74bc6c5354
--- /dev/null
+++ b/dev-python/h5py/h5py-2.7.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Simple Python interface to HDF5 files"
+HOMEPAGE="http://www.h5py.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test examples mpi"
+
+RDEPEND="
+	sci-libs/hdf5:=[mpi=,hl(+)]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/alabaster[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+		)
+	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )"
+
+pkg_setup() {
+	use mpi && export CC=mpicc
+}
+
+python_prepare_all() {
+	append-cflags -fno-strict-aliasing
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	esetup.py configure $(usex mpi --mpi '')
+}
+
+python_compile_all() {
+	if use doc; then
+		cd "${S}"/docs || die
+		sed '/html_theme/s:default:alabaster:g' -i conf.py || die
+		emake html
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	DOCS=( README.rst ANN.rst )
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	use examples && DOCS+=( examples )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/h5py/metadata.xml b/dev-python/h5py/metadata.xml
new file mode 100644
index 000000000000..9ca11da4f83c
--- /dev/null
+++ b/dev-python/h5py/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  HDF5 for Python (h5py) is a general-purpose simple Python interface to the
+  Hierarchical Data Format library, version 5. Existing Python and
+  Numpy concepts are used for the interface. Almost all HDF5 features
+  are available from Python, including things like compound datatypes
+  (as used with Numpy recarray types), HDF5 attributes, hyperslab and
+  point-based I/O, and more recent features in HDF 1.8 like resizable
+  datasets and recursive iteration over entire files.
+</longdescription>
+  <upstream>
+    <remote-id type="google-code">h5py</remote-id>
+    <remote-id type="pypi">h5py</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/hachoir-core/Manifest b/dev-python/hachoir-core/Manifest
new file mode 100644
index 000000000000..45315b16e13a
--- /dev/null
+++ b/dev-python/hachoir-core/Manifest
@@ -0,0 +1,5 @@
+DIST hachoir-core-1.3.3.tar.gz 91504 SHA256 ecf5d16eccc76b22071d6062e54edb67595f70d827644d3a6dff04289b4058df SHA512 71c24c4c4612ab544663ddde4aa07bb7514fcb3b86596ad67d6b48e0d8590b1a9d8c88ed4007c2341cb195ef825e06634bce14c62cc2c5200b6d745d341cac51 WHIRLPOOL 1b6ab4088cc5a8270cd590d00fafb0c68571248a5f15703d5e644613cc338c6d594df87b82e2bc39f420333ca34bf37f45e003aedf43e1d085958a9294a716c7
+EBUILD hachoir-core-1.3.3-r1.ebuild 662 SHA256 66f815a40c1998538b0c7c35649350949a2cf1f43d2b8c3e7abe9578dfa1b111 SHA512 a4c3bde97763536557ff789e6202537af92b4d8ea130b8d90f0e8e6ecb8b8aa217c4dc0bb5e22ecf55262ef407e3d2a9377ab3f1eef617d07406124f39abf68d WHIRLPOOL 5e98071dc842df7c65e8ae475e25a12b780f870d84dc12e86e19ddaf2a6b76f68c5bf0b1ff78d214ed99288afaf5f6eb9ae39653d3834bef733ee66a9e765918
+MISC ChangeLog 2752 SHA256 7d1da397ff4892d2f341f9803c4b9935338da947cb2b3ec2cc2a4d154dbf2365 SHA512 ae4260c5a1d66c93d8450c27cd7afd3e60323e821c1e2758fe05c8521d5c22366f5d2407e01894546f428516b12141bce243dfbf99f0b437f26b1b39abbe8fc8 WHIRLPOOL 792017d696ff165129688ba797f33398a359468a16e0849e03cf904b59e1f0fad9bd600d4422745223f0e076186368a89e1842d26f911b5ae4088ebc8b84c72c
+MISC ChangeLog-2015 2284 SHA256 aa066fcd984ab53b949c8f4602617bb10c9905ffb2d712538f1b26a653c4fe5c SHA512 a4140fb33d21d8c9b263317d5e3d04eb04412d38479536977776daed24123d50311d490de67715c69aca074fc8d88f1daf803b6876e4b72e2a7ec23293cacdbb WHIRLPOOL 1f6a28d0642c606f41eb5eb64d4797acd4030d0962451d27da737e3a5e17765c70dbce9df55ecbc9924798a61045ec659d1481fe60313c4239c6d157cd51ce3d
+MISC metadata.xml 645 SHA256 fa00b3b90c101e2b7553379c0e72c742c15243ea5970f6349fd830decd39bc86 SHA512 dbcf61a4c938389b5384d946390e2a16b17bcf45561c824a7fcce1bfa5d9ecb0b43975a0b08cab29bc04c140cefecc8cce6d13e1a6dfc8dba58be2c2e7deafa2 WHIRLPOOL 095823fdc93b6927ebe19111a5f695ecc7f9790b14c548d92c222d2da7ab2f515667bd39e6d6fb8a2ff37cdc59149d7ec42d792aa18a3fe4caf644c9341a9869
diff --git a/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild b/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..75901c4929b3
--- /dev/null
+++ b/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Core of Hachoir framework: parse and edit binary files"
+HOMEPAGE="https://bitbucket.org/haypo/hachoir/wiki/hachoir-core https://pypi.python.org/pypi/hachoir-core"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_configure_all() {
+	mydistutilsargs=( --setuptools )
+}
+
+python_test() {
+	"${PYTHON}" test_doc.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/hachoir-core/metadata.xml b/dev-python/hachoir-core/metadata.xml
new file mode 100644
index 000000000000..d2ad52173a81
--- /dev/null
+++ b/dev-python/hachoir-core/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">A tool written for hackers to cut file or any binary stream. A file is
+		splitted in a tree of fields where the smallest field can be just a bit.
+		There are various field types: integer, string, bits, padding, sub file,
+		etc.</longdescription>
+	<upstream>
+		<remote-id type="pypi">hachoir-core</remote-id>
+		<remote-id type="bitbucket">haypo/hachoir</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/hachoir-parser/Manifest b/dev-python/hachoir-parser/Manifest
new file mode 100644
index 000000000000..ca2cff466e0d
--- /dev/null
+++ b/dev-python/hachoir-parser/Manifest
@@ -0,0 +1,5 @@
+DIST hachoir-parser-1.3.4.tar.gz 359230 SHA256 775be5e10d72c6122b1ba3202dfce153c09ebcb60080d8edbd51aa89aa4e6b3f SHA512 d1c01af0fc7dc59fc4fed57401cbbb3ba498d1a6de78322f47ff139ac10f1ad1d5713011c04fde610267b40188c84ff79397f9c8d309c1ab5cc3384c03577948 WHIRLPOOL 84ded718259a823f9a0458a846b4d330cb087bec8b8559e8dc2c1175e8b4f82ec17e728a38e7d881087ff371f24f7cfcd8dd30d3454b714366e3129de418a9a7
+EBUILD hachoir-parser-1.3.4-r1.ebuild 643 SHA256 6f8e989b3adcda82277453740cd2f30b3b7afd284a0e942a38879d35405c7bac SHA512 99d43355a80e7419938d8aa1b472ac1c8e90524b5c934ab83f06c004a0c45c43f52bed6cb4dc471e5bf116daeb117fbc6ecceee816ed7551bcc2e168fd7df02f WHIRLPOOL ac9b7d5dba8220afd88fb14e934c35f786e1a1818fa1c32b140476c9f4b3b3e8cd8cc0bb30cbc6af8d17f598c650d31890d71c2e697948373b59b66d86ed18f6
+MISC ChangeLog 2762 SHA256 88c10b370271c3865609c60eb8c93303f038d42141e9607f3c421555b8b421b3 SHA512 5c1c31a697cd6469286c49e3f5ce807036e6d239482a1395249eb8966d08f9b1bc6208f90754ee6bbdd1af490f31022ee14ac90c9d7c236badda7bb00a07cb00 WHIRLPOOL 13eb7a67ba8fbac7555202e07ff5e0dea4560765f7a81001295311892e6d0b3dc09ea2183889de3907e999b07540a802a236d1a7d5834d3c53f0658beae1d564
+MISC ChangeLog-2015 2423 SHA256 52aeca9655522a9b0a6728eb6d03a14f3e6d253bfe22fa423041884d782f78f9 SHA512 7791db98abb7079148e3d49dc1ee476c2818318de3da857c75b83e6a0ba8c47b192223b3a8f142d87ae99114f5080f6d78591940240593d2410b48fbf0448d68 WHIRLPOOL 0d2fffcde89cd1ed109251e8fcd9d4bc23314d849073457ce71f055b6b181260adcc16614ec56130a5d82744135ffaee4a337435f53cf57c7ed3684f3dcb38aa
+MISC metadata.xml 623 SHA256 7c0f65daa0c9a1a27e9a8956cb7a99cb2ec711c5fe45504786150bdef64b3832 SHA512 3edf47f4e311280a87c43944f80ac9fb99318be777b29efb0d2f8b510b65da4d73de0f0c04412530732c8688dcb9ce9e412c518fe72620fd85427638ce93dd65 WHIRLPOOL 31380451251ce46c9dd461c834c18494a59b388b74ac8be577738bdb1feeb7cda99f7407235b5b904b998d4408b64ca1b0c677a681f32967fe54375daac47576
diff --git a/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild b/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild
new file mode 100644
index 000000000000..1ecec245b392
--- /dev/null
+++ b/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Package of Hachoir parsers used to open binary files"
+HOMEPAGE="https://bitbucket.org/haypo/hachoir/wiki/hachoir-parser https://pypi.python.org/pypi/hachoir-parser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND=">=dev-python/hachoir-core-1.3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_configure_all() {
+	mydistutilsargs=( --setuptools )
+}
diff --git a/dev-python/hachoir-parser/metadata.xml b/dev-python/hachoir-parser/metadata.xml
new file mode 100644
index 000000000000..2db8eeb8dece
--- /dev/null
+++ b/dev-python/hachoir-parser/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">a package of most common file format parsers written using hachoir-core.
+		Not all parsers are complete, some are very good and other are poor
+		(they only parse the first level of the tree for example).</longdescription>
+	<upstream>
+		<remote-id type="pypi">hachoir-parser</remote-id>
+		<remote-id type="bitbucket">haypo/hachoir</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/hachoir-regex/Manifest b/dev-python/hachoir-regex/Manifest
new file mode 100644
index 000000000000..b267034ba399
--- /dev/null
+++ b/dev-python/hachoir-regex/Manifest
@@ -0,0 +1,5 @@
+DIST hachoir-regex-1.0.5.tar.gz 22156 SHA256 a35b2bb0ff11418230fffbb97605adba012bf65d2aba3e5e7d8295774d5ba986 SHA512 eee781ea9665c41e8a2d02116aa0af0d734e6e1ecdb06aaaa69fe9a54abd3ef16590281570ec0f87a54903c9849c12387626c9fc78f3523eaf13a5a77cae1610 WHIRLPOOL bd11417c1ef933be5706c1539284910fff343831d96239a979a855c651bd8a033ce2ea1b8d4d54b4dea88423ca87faa0a6aa0a0c57ac83d58f73fded87691097
+EBUILD hachoir-regex-1.0.5-r1.ebuild 651 SHA256 f36e5eda699a5fea737f74dd29bc5e702874ceb53518905df64c44f398924bed SHA512 df58107213d4611981b3720fb3ee914ce6257d24c30345a0884302dc82156e4674c10432afd0acb9fbbec14b4aa3d8b77c573bca0219b0308e81de8494905189 WHIRLPOOL 742e95006747ca818e9f6051aeeb7f37abd2adbea82dde46e5a7857b5a334ae4e3b7f6cff8fe90a0082085c1ef1ee585e8a896967c8daf32dbe242f9b27d8371
+MISC ChangeLog 2757 SHA256 1f1058707051fe686358885fc0fcf78e68bd63f9450b673c5db38dd81cba21e3 SHA512 568c643478308a53afc354b9ae9e96b300997c637b10847755fab2359326551fc15e7e37292aad7a7371b822639f5e18d25202c0f5f4c2e5299cb27a784a2e99 WHIRLPOOL 79052daa757e75f1dab2f357d434338af12f1d82f4acb6da228f9e0c598514ed0f326fc0241637a056de65be5b2809a5ce07e0f30f0047c4fb8a654f734cb1ca
+MISC ChangeLog-2015 2074 SHA256 e00991aaf6e598717072c16cdf5b68b30e2632c37e095a6971910dc0b9f8e164 SHA512 785d7ea0ef8510548197bc16b2942e08e6fa4b71a045a817bf87a6579cbcfd3a6802d8f63c70701bc5210fc0e5a01ba0186e4c189e0f42a29321f5d48fd95764 WHIRLPOOL 057159db313c29246b5ef8207522bbeebc7ae0c964c6b028136a84f8d0034ef5cd90b865fe0b81b848a4e44899f76184b41d4217b23b9f4f250306bdfe7d7229
+MISC metadata.xml 530 SHA256 49a85a9cec354eaab9c867d3f04c35283c4e958d192a66052035a93ee23a1774 SHA512 fb0c48fbfe674d66937f07c03c365386d60dbc26f9a68869e99be67e39a9e6c0a19667455d5a7d9a9e3615073209a5a459bdb62c1f8f5455118c223606d1c88c WHIRLPOOL c2c968eca40b6ac3f29db0ac6b75b95f39a5a8c4f7c0f2a1ec32ab5e9351e56a2e9a22b1f5a569400d45df85a8e8848e8081f30e4b9292b9d57a54efed49c957
diff --git a/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild b/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..994d5ca78c35
--- /dev/null
+++ b/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manipulation of regular expressions (regex)"
+HOMEPAGE="https://bitbucket.org/haypo/hachoir/wiki/hachoir-regex https://pypi.python.org/pypi/hachoir-regex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_configure_all() {
+	mydistutilsargs=(
+		--setuptools
+	)
+}
+
+python_test() {
+	"${PYTHON}" test_doc.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/hachoir-regex/metadata.xml b/dev-python/hachoir-regex/metadata.xml
new file mode 100644
index 000000000000..d81a69990448
--- /dev/null
+++ b/dev-python/hachoir-regex/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">regex manipulation Python library. It's used by hachoir-subfile for fast
+		pattern matching (find file header).</longdescription>
+	<upstream>
+		<remote-id type="pypi">hachoir-regex</remote-id>
+		<remote-id type="bitbucket">haypo/hachoir</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/hacking/Manifest b/dev-python/hacking/Manifest
new file mode 100644
index 000000000000..53d23dc7f918
--- /dev/null
+++ b/dev-python/hacking/Manifest
@@ -0,0 +1,13 @@
+DIST hacking-0.10.3.tar.gz 41119 SHA256 6368126562604370c6781710030ee3880ba365530304c8b6eb301f9714f9522a SHA512 020f58220d6c3d09dcc1b0ab886796087c9fe4e9eccae1e331f6f2056b5b106ffa4ba2545af086cf4ee53e21bcc124fef203c7bac36456ac86f09b4c6ff07417 WHIRLPOOL 4ec7d4eb74d3db356476d3b5940dec0b09e52ce7edffdb41e9dcaf1ebc2c455bf945c57847d3b45c30827900eb036b7a3593b49c2dd8c406d6971d520ced58d3
+DIST hacking-0.13.0.tar.gz 49171 SHA256 0402905b392c428d62bee2095fa6b789ca39c69d3b8ccf33bad219ddb4c03ce8 SHA512 ca3fe0bef1c6348ee9497c136d002b04c9f67a766192d88456b749ff860528a887636b1f3db23fec336749dbf3e5bb413a1effd2261e42929d5826e54336e314 WHIRLPOOL df61e75cce0b28b25f26e78e3e7d8d896635ed389b0fd003ae86fc95ab527738a410db7e08b374b09bd7c8a3b7d7485b7ec3cf17503d058d0a4173f32b05b7f7
+DIST hacking-0.8.1.tar.gz 51800 SHA256 65390ea60215e4222d9ddbc1241a0f3e05644e4f55b305e69755ed8eab3decb5 SHA512 9055d57dd39bc1653cd7c8773ea4ca7f9b206e8495c137570c3456dab45373b51d6f25dcd4413b5f78b7c4740f5c89d21534ee982dee542c7674bd825c96b91a WHIRLPOOL d35e577c0790fe989a2141264afe67b4d1478bf2f08edcbea62515764e10938f364f5d57b3d8d66dba2125246c9eb1afc2a9b67ad4d91bb6d1346eb382a420ac
+DIST hacking-0.9.2.tar.gz 43956 SHA256 2a584e5bf185ee19517d4e72a852b729578aab3822ae345534e1f35338582ba4 SHA512 76aa59b4cdfb8036d6471e35cba43d502de3a72edc3883a05822063cbb92eaa072cef3144d21ee82ac763c3385c65bc9dec4b66fda5a5a2090191ba5b6388d41 WHIRLPOOL 718d790fdc0a405166f3ff194bcfa4d68cb311557eb092630716a14018aca7ac94e43f3305fd66195dbd15c35322c8a9bf25e9dd08ac5ff1964800c140ddf17f
+DIST hacking-0.9.6.tar.gz 43287 SHA256 aba204f93beb3aa60732bfe910116c9fa9756efd58f00aea66ee856e07199f50 SHA512 e4225754a85ff474b724130a0c3d6a6b9c480a953ea35a18833378cf2a5df4687819f510b50a95f42890cc69836033a8af933bc0a5a4e330ae94532bcee189b4 WHIRLPOOL fdb3de41229e8cc6f4ec5b5b3fe59546bc6e8f49de349241545f134ba10095fd7f7d6ef418f5193654618f28db092159246f9a37db2b3c0a443618882557df2b
+EBUILD hacking-0.10.3.ebuild 2114 SHA256 cca39a124600acd81fb7e7786df7122746d008a4dfbe62f7b70d2a433ffabf47 SHA512 c465af100e5ce74604e78c98150c845395e9ea53a5247ef523376b52be0f60d8a18335ef1d4ed043b9665335d9737266e09fedfa9bee21f0a0791bac89c2fdef WHIRLPOOL e58612907f54638abedfdb05abcc806933d87f8ca4a5cf486d1adefd38bde1b4d51f38fd2f680cdac547ff971290a3732e7d598ee5e4d365d414b31e6e9a952f
+EBUILD hacking-0.13.0.ebuild 2165 SHA256 3145f2f63b22c046ac0a23018e3ad2f6782676704c880576a2d3f7b52ecddb9d SHA512 628e3fcec874ee75c034a620c1e3b880ae0d6941fcd9e28bef1f7e1b8866e2207a8a4ebf7be2bf9c2d363925b8e5b4b90c82830bba0d91133186a75a5b5eef72 WHIRLPOOL f2a97b5c3c04689dcf2bc9d83583d0cb36463472b9b66b7907b509e55bf86a808b5a5426fb038d4b8d0f4043a00da643215506ac8acac1c1bf1bbe38a50a5a12
+EBUILD hacking-0.8.1.ebuild 1959 SHA256 8a89fe8c85077033d976da4556c37e3c0d5b82e8b85178931e0ef7da159f77bb SHA512 b59562045fc300c8d0e9300eb2958387be63eb9adf0e70bccf4f2e8596b63d223adde26873d9efbf3599f04123c2dca0d31ae02e2894ce7a0457b6afde4e996f WHIRLPOOL b8647c889102317efa0230de15ce9befb0084b77d61f6d6b5bed263a2e7ed2c8e3f12f2239381bfc400540bc61315fdc15c3da7c9abab63b9d49d32a65f49d6c
+EBUILD hacking-0.9.2.ebuild 1942 SHA256 9a19b8ced93a67de2ec6a2af77782dc72d350f96730cadb21b6f2301b5d6e74f SHA512 f9d49566d6b2ac6489b9d0e163960733222e929feaa12d6701c54cac354299214deb979db2a6c1b466cc0df3d6146bbacc4b4a2534e24648c9162ff59834a49a WHIRLPOOL 04e0430b0343230d2e05d7dd9256822bade216bfa1316b97a742dd87a94b238b71bf1c77d5dfaceec7c87a47ceedc2d82c258e29c7425510ed12d65579568ebd
+EBUILD hacking-0.9.6.ebuild 1927 SHA256 f773fc43629a72513e6569b4c3adc9ece3a02d92dd0a8ca2385a3202302a1069 SHA512 05e14f7072171567a0bc9cfdf430846b34404bcd1e5dd3d8ae0070203fe4b29d88b9360dd59222162bdb4411651d210bb443c0f386433284bec1b31cea918513 WHIRLPOOL 3e42b53081e53dbb27d11647cd3756b9ea0def104349b6d8da55bc08281ce998696841009a0670e48937b0b3f668dc32b5abb31bcae101f23ddd87619bd27b24
+MISC ChangeLog 3729 SHA256 aeaea1d11740397b3a1ad8374c10a03b1f9fabdcee530c0107ed03eff3f986ce SHA512 d61c810d9b6740e53220a35fba44544d420815eeea3b73b7974e0789136a07503ed7f576cbff5b5ff55eb176673c4138c6169195155e188f71a0820d3f4ddd9b WHIRLPOOL 544ba11fd5ae25074c5be9b2ce74788d2562086e4139d4ce5b13c01ea35a822fbb24d463bde03d6f0c4bf9d31c3df358b9c7e1ec4e02d5059768b91914f62dbf
+MISC ChangeLog-2015 4031 SHA256 06ca44591cda5f3361956c72c358b88883871dbbaa2435c18700c84153dfa8d4 SHA512 1d9e98c95781f3e2485dcbfee8831314626bac15dad3be4b37a58acfe45723daff7c7d46534ba9b87f4fe2466891500a18f73310bb88cf73aabf690f90e127a9 WHIRLPOOL 74cfa740f53ccc4ebeb75e3e4e99ded18a0b6caf4fba1481001c76b44b73b828fcbbf3e650646e60bb40547c6a5eab111a12779876ac8a7c5baa7f0ef94797fb
+MISC metadata.xml 751 SHA256 6123816b9e748a140e998d9e71a47c788f513fb471e861719f09944bc5b24c73 SHA512 e165f608f39a605ef7e80fdfab9e1335b82e75d3093226537a1b5a0372fd5f10de242616e1bfeb08268b3b1e598d27e4c5e062f3e96bfe7b01c5cac5f87e4d14 WHIRLPOOL 2645e2425541d71ccdbd9b473103c29088195d1718d17ba08e2191d590d93b40e30a7e97b79d6b8aa97aa54bbaea8fe6eb4a9f944183ead6fbab8b2c4abb850d
diff --git a/dev-python/hacking/hacking-0.10.3.ebuild b/dev-python/hacking/hacking-0.10.3.ebuild
new file mode 100644
index 000000000000..9b3d093c88c6
--- /dev/null
+++ b/dev-python/hacking/hacking-0.10.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack-dev/hacking"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.11.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		<dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+	doc? (
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/oslo-sphinx[${PYTHON_USEDEP}]' python2_7 )
+	)"
+RDEPEND="
+	~dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
+	~dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
+	~dev-python/flake8-2.2.5[${PYTHON_USEDEP}]
+	~dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Prevent d'loading and correct ?typo to oslosphinx in conf.py
+	sed -e 's:intersphinx_mapping:#&:' \
+		-e 's:oslosphinx:oslo.sphinx:' \
+		-i doc/source/conf.py || die
+	# relax deps
+	rm *requirements.txt hacking.egg-info/requires.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
+}
+
+python_test() {
+	testr init || die "testr init died"
+	testr run || die "testsuite failed under ${EPYTHON}"
+	flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/source/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/hacking/hacking-0.13.0.ebuild b/dev-python/hacking/hacking-0.13.0.ebuild
new file mode 100644
index 000000000000..a53ebcb6bb1c
--- /dev/null
+++ b/dev-python/hacking/hacking-0.13.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack-dev/hacking"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		<dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+	doc? (
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/oslo-sphinx[${PYTHON_USEDEP}]' python2_7 )
+	)"
+RDEPEND="
+	~dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
+	~dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
+	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
+	~dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Prevent d'loading and correct ?typo to oslosphinx in conf.py
+	sed -e 's:intersphinx_mapping:#&:' \
+		-e 's:oslosphinx:oslo.sphinx:' \
+		-i doc/source/conf.py || die
+	# relax deps
+	rm *requirements.txt hacking.egg-info/requires.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
+}
+
+python_test() {
+	testr init || die "testr init died"
+	testr run || die "testsuite failed under ${EPYTHON}"
+	flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/source/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/hacking/hacking-0.8.1.ebuild b/dev-python/hacking/hacking-0.8.1.ebuild
new file mode 100644
index 000000000000..9a6e1c4b54cd
--- /dev/null
+++ b/dev-python/hacking/hacking-0.8.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack-dev/hacking"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+			dev-python/subunit[${PYTHON_USEDEP}]
+			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.17-r2[${PYTHON_USEDEP}]
+			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
+			${RDEPEND} )"
+RDEPEND="~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-0.7.4[${PYTHON_USEDEP}]
+		~dev-python/flake8-2.0[${PYTHON_USEDEP}]
+		>=dev-python/six-1.4.1[${PYTHON_USEDEP}]"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:#&:' -i doc/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
+}
+
+python_test() {
+	# https://bugs.launchpad.net/hacking/+bug/1265520
+	# Although fixed in trunk, the fix is a version change in pep8
+	# which cannot be simply dropped in here.
+	if python_is_python3; then
+		sed -e 's:test_pep8:_&:' -i hacking/tests/test_doctest.py || die
+	fi
+	testr init || die "testr init died"
+	testr run || die "testsuite failed under ${EPYTHON}"
+	flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/source/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/hacking/hacking-0.9.2.ebuild b/dev-python/hacking/hacking-0.9.2.ebuild
new file mode 100644
index 000000000000..da0c91bd8502
--- /dev/null
+++ b/dev-python/hacking/hacking-0.9.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack-dev/hacking"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="~dev-python/pep8-1.5.6[${PYTHON_USEDEP}]
+		~dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
+		~dev-python/flake8-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/six-1.6.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
+		!=dev-python/pbr-0.7[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+		${RDEPEND} )
+	doc? ( >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/oslo-sphinx[${PYTHON_USEDEP}]' python2_7 ) )"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Prevent d'loading and correct ?typo to oslosphinx in conf.py
+	sed -e 's:intersphinx_mapping:#&:' \
+		-e 's:oslosphinx:oslo.sphinx:' \
+		-i doc/source/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
+}
+
+python_test() {
+	testr init || die "testr init died"
+	testr run || die "testsuite failed under ${EPYTHON}"
+	flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/source/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/hacking/hacking-0.9.6.ebuild b/dev-python/hacking/hacking-0.9.6.ebuild
new file mode 100644
index 000000000000..305cf9d9ca20
--- /dev/null
+++ b/dev-python/hacking/hacking-0.9.6.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack-dev/hacking"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="~dev-python/pep8-1.5.6[${PYTHON_USEDEP}]
+		~dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
+		~dev-python/flake8-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/six-1.6.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.11.0[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+		${RDEPEND} )
+	doc? ( >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/oslo-sphinx[${PYTHON_USEDEP}]' python2_7 ) )"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Prevent d'loading and correct ?typo to oslosphinx in conf.py
+	sed -e 's:intersphinx_mapping:#&:' \
+		-e 's:oslosphinx:oslo.sphinx:' \
+		-i doc/source/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
+}
+
+python_test() {
+	testr init || die "testr init died"
+	testr run || die "testsuite failed under ${EPYTHON}"
+	flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/source/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/hacking/metadata.xml b/dev-python/hacking/metadata.xml
new file mode 100644
index 000000000000..4abe1468eb67
--- /dev/null
+++ b/dev-python/hacking/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+    hacking is a set of flake8 plugins that test and enforce
+	the OpenStack Style Commandments, HACKING.rst
+  </longdescription>
+	<upstream>
+		<remote-id type="pypi">hacking</remote-id>
+		<remote-id type="github">openstack-dev/hacking</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/happydoc/Manifest b/dev-python/happydoc/Manifest
new file mode 100644
index 000000000000..dceb9986714c
--- /dev/null
+++ b/dev-python/happydoc/Manifest
@@ -0,0 +1,7 @@
+AUX happydoc-3.1-python-2.6.patch 726 SHA256 eef6859695f365507470fcbdfc68dbdbe236ffbe79abbc263c5424cb2a001de6 SHA512 b47a45271cdf0e26167562302d82eac8198b3dcb74cbb6315ba24b0ac3eb66a5a78bff3259b926528cde8d78d42480b1ff1930e7d27fdd1a67f9824beccef8b1 WHIRLPOOL 3d1ad327413eae047519f987936ef55e06ff6c44ace68d9657260e23f423ba7725bf01527204da50a23db5a15cb8c1a40f4b373dfc2e79c12585d0d34535f750
+AUX happydoc-3.1-setup.py 4899 SHA256 15c6302c1e1f416e6c8b543a46a18a45d0a56e5343f6c0d95ed10122a8d9e550 SHA512 536f165b37a6508e1d364184474e69ed410c56bd7936bbbf041d1541af41414b156b5f079c39917b12fb82f377ae52dcf50c7a3d260e911a6d0bb38950d39469 WHIRLPOOL 394659a15cc3eee1af802b9e249cc744dc2404174808a7479cb32d2d345d408f4aba6c8834c23351ee50ba33f90f2b15533bdcad0f7855758bed9c5dc2b178ec
+DIST HappyDoc_r3_1.tar.gz 732849 SHA256 ef5f8dee5782a1ebe750aa51b855ce84097f5bb60488826ea5da900098c5aaec SHA512 5f526f90225f189f59fdca24b3db1cd73c7346b859cc3b8a00ddaf248c2e0901ad048c1a83ec1b9ee3f950f1260427b0fd1d6f4b1e6c4b772615f6ca799f86ff WHIRLPOOL 63ec714e882b6f067002a46e07a38ec83649e61bbc2a5dfaf83ab0e13d05e289e8e7b7d25434daa126bbb2bec2298b0c15b3120be00c5b831a763fb7379aba87
+EBUILD happydoc-3.1-r2.ebuild 1031 SHA256 8bcc2a5d901060cff25ae11fa69e373fbf6afca1a558fd2240ca6087735ea9bd SHA512 31a40af952be0b89883aa8838e4f02cd150021cc27f0c6fed51c893f6f127e86d99a618ef3a28dafb26762f24f7358a4ce936996c13a6e9e823b258d1a728272 WHIRLPOOL 2622fe404c50e66d706edd9024ca55d976bf040a7b27d23bf4626527cf15c595f0a8c0df6411cfc58ce5d4c0b177c1dc3b9dd1d92b678897ad8fcf6b1de39cc9
+MISC ChangeLog 2504 SHA256 d158c251da89c73ab38cfd94c6f1b2635fb44fa69bd7a60d8749bd3271a37a6c SHA512 90344b44af22e2ad64f3d54014381c2293bfbaacb9c0744f7ef9db7eac516143ba5c96fa7375f345ce26cd1d2c03608c30976ff6efff368b4ac8495fae29d2fb WHIRLPOOL e44c3f28776a689e8c898d9fca65e499884948cf6a4fcb2571846ee91de00a185f0b1c6c6d85c52d3609cbecc6fa27ffad31ab997f050a1bb781757784de5293
+MISC ChangeLog-2015 4433 SHA256 7df1d756dbc41b7fa0136a8ec37c09e06c4e3641f2ff1e81769231400c9f4b00 SHA512 fafe6a6f6911cd86064e69121e72a5807674f8fa7eecc974e23c1a3588b1237123efcf9a898e16f91ac48f4991f11d77d042be1a41fdf119b1b8446560db15f0 WHIRLPOOL afed8574e4af733cbe7fb4d76b28ebb2e17bf8cd42c314d723d232aaa66396839256040e90e726114b249b52e17b4944f3a2764b0a3622d4c79773ea463d2629
+MISC metadata.xml 318 SHA256 6daecff4982481c2573341fdc658be4c126b274a133fb10332e4cacf31f3c6a0 SHA512 9b9ddb517c3bcdd431de07987594db7d7ca25f5cce3550f35c9731dbd72ef5301330c97138dee8bdf369c55b219bb4da71048419c5cfc2f15f7ba1e174b3eb43 WHIRLPOOL a358494185cd79ab601b3fb8de9743db1ac3ff5c65ab8a962e579cbdfaf56a20581f6908a5d9f401f62e5e8d1942480b8d59c7ca856af6f97126a2638d19314e
diff --git a/dev-python/happydoc/files/happydoc-3.1-python-2.6.patch b/dev-python/happydoc/files/happydoc-3.1-python-2.6.patch
new file mode 100644
index 000000000000..4cced8e25833
--- /dev/null
+++ b/dev-python/happydoc/files/happydoc-3.1-python-2.6.patch
@@ -0,0 +1,28 @@
+--- happydoclib/CommandLineApp.py
++++ happydoclib/CommandLineApp.py
+@@ -102,10 +102,21 @@
+     #
+     # Exception names
+     #
+-    ReservedOptionName = 'Reserved option name'
+-    HelpRequested='Help requested'
+-    InvalidOptionValue='Invalid value for option'
+-    InvalidArgument='Invalid argument to program'
++    class ReservedOptionName(ValueError):
++        'Reserved option name'
++        pass
++
++    class HelpRequested(ValueError):
++        'Help requested'
++        pass
++
++    class InvalidOptionValue(ValueError):
++        'Invalid value for option'
++        pass
++
++    class InvalidArgument(ValueError):
++        'Invalid argument to program'
++        pass
+ 
+     #
+     # Globally useful configuration stuff.
diff --git a/dev-python/happydoc/files/happydoc-3.1-setup.py b/dev-python/happydoc/files/happydoc-3.1-setup.py
new file mode 100644
index 000000000000..40ea5d6cd25f
--- /dev/null
+++ b/dev-python/happydoc/files/happydoc-3.1-setup.py
@@ -0,0 +1,158 @@
+#!/usr/bin/env python
+#
+# $Id: setup.py,v 1.11 2002/02/05 19:59:36 doughellmann Exp $
+#
+# Time-stamp: <02/02/05 10:00:12 dhellmann>
+#
+# Copyright 2001 Doug Hellmann.
+#
+#
+#                         All Rights Reserved
+#
+# Permission to use, copy, modify, and distribute this software and
+# its documentation for any purpose and without fee is hereby
+# granted, provided that the above copyright notice appear in all
+# copies and that both that copyright notice and this permission
+# notice appear in supporting documentation, and that the name of Doug
+# Hellmann not be used in advertising or publicity pertaining to
+# distribution of the software without specific, written prior
+# permission.
+#
+# DOUG HELLMANN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+# NO EVENT SHALL DOUG HELLMANN BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+# OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+"""Distutils setup file for HappyDoc
+
+"""
+
+__rcs_info__ = {
+    #
+    #  Creation Information
+    #
+    'module_name'  : '$RCSfile: happydoc-3.1-setup.py,v $',
+    'rcs_id'       : '$Id$',
+    'creator'      : 'Doug Hellmann <doug@hellfly.net>',
+    'project'      : 'HappyDoc',
+    'created'      : 'Sat, 03-Feb-2001 12:51:26 EST',
+
+    #
+    #  Current Information
+    #
+    'author'       : '$Author: neurogeek $',
+    'version'      : '$Revision: 1.1 $',
+    'date'         : '$Date: 2009/02/25 20:59:36 $',
+}
+try:
+    __version__ = __rcs_info__['version'].split(' ')[1]
+except:
+    __version__ = '0.0'
+
+#
+# Import system modules
+#
+from distutils.core import setup
+import string
+import sys
+
+#
+# Import Local modules
+#
+
+#
+# Module
+#
+
+BSD_LICENSE="""
+
+                    Copyright 2001, 2002 Doug Hellmann.
+
+                         All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and
+its documentation for any purpose and without fee is hereby
+granted, provided that the above copyright notice appear in all
+copies and that both that copyright notice and this permission
+notice appear in supporting documentation, and that the name of Doug
+Hellmann not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
+
+DOUG HELLMANN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+NO EVENT SHALL DOUG HELLMANN BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+"""
+
+LONG_DESCRIPTION = """
+  HappyDoc is a tool for extracting documentation from Python source
+  code.  It differs from other such applications by the fact that it
+  uses the parse tree for a module to derive the information used in
+  its output, rather that importing the module directly.  This allows
+  the user to generate documentation for modules which need special
+  context to be imported.
+"""
+
+
+def cvsProductVersion(cvsVersionString='$Name:  $'):
+    """Function to return the version number of the program.
+
+    The value is taken from the CVS tag, assuming the tag has the form:
+
+        rX_Y_Z
+
+    Where X is the major version number, Y is the minor version
+    number, and Z is the optional sub-minor version number.
+    """
+    cvs_version_parts=string.split(cvsVersionString)
+    if len(cvs_version_parts) >= 3:
+        app_version = string.strip(cvs_version_parts[1]).replace('_', '.')
+        if app_version and app_version[0] == 'r':
+            app_version = app_version[1:]
+    else:
+        app_version = 'WORKING'
+    return app_version
+
+
+
+if sys.platform == 'win32':
+    platform_specific_scripts = ['happydocwin.py']
+else:
+    platform_specific_scripts = ['happydoc']
+
+setup (
+    name = 'HappyDoc',
+    version = cvsProductVersion(),
+
+    description = 'HappyDoc Automatic Documentation System',
+    long_description = LONG_DESCRIPTION,
+
+    author = 'Doug Hellmann',
+    author_email = 'doug@hellfly.net',
+
+    url = 'http://happydoc.sourceforge.net',
+    licence = BSD_LICENSE,
+
+    platforms = ('Any',),
+    keywords = ('documentation', 'extraction', 'source', 'docstring', '__doc__'),
+
+    packages = [ 'happydoclib',
+                 'happydoclib.docset',
+                 'happydoclib.docstring',
+                 'happydoclib.docstring.StructuredText',
+                 'happydoclib.parseinfo',
+                 'happydoclib.parsers',
+                 ],
+    
+    package_dir = { '': '.' },
+    
+    scripts = platform_specific_scripts,
+    )
+
diff --git a/dev-python/happydoc/happydoc-3.1-r2.ebuild b/dev-python/happydoc/happydoc-3.1-r2.ebuild
new file mode 100644
index 000000000000..1b3cfd122e31
--- /dev/null
+++ b/dev-python/happydoc/happydoc-3.1-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1 versionator
+
+MY_PN="HappyDoc"
+MY_PV=$(replace_all_version_separators "_" ${PV})
+MY_V=$(get_major_version ${PV})
+
+DESCRIPTION="Tool for extracting documentation from Python source code"
+HOMEPAGE="http://happydoc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}_r${MY_PV}.tar.gz"
+
+LICENSE="HPND ZPL"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+# Tests need extra data not present in the release tarball.
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_PN}${MY_V}-r${MY_PV}"
+
+python_prepare_all() {
+	cp "${FILESDIR}/${P}-setup.py" setup.py || die "Copying of setup.py failed"
+	epatch "${FILESDIR}/${P}-python-2.6.patch"
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( srcdocs/${MY_PN}${MY_V}-r${MY_PV}/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/happydoc/metadata.xml b/dev-python/happydoc/metadata.xml
new file mode 100644
index 000000000000..2d122c86dfd5
--- /dev/null
+++ b/dev-python/happydoc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">happydoc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/hcluster/Manifest b/dev-python/hcluster/Manifest
new file mode 100644
index 000000000000..3ebd071af3a1
--- /dev/null
+++ b/dev-python/hcluster/Manifest
@@ -0,0 +1,5 @@
+DIST hcluster-0.2.0.tar.gz 453082 SHA256 ce1ff67271cc1be36522ec1b144722c62ab74e48b9051a47b0f439b1eb372652 SHA512 b7794e7032099d7f2f9acd5339f7ab70bfbd69035d9c1fae0166c2c03f8420ae25f8111f5db4c6eded9f8c32991154a20c6fdcc82104116710b52176e3c2033b WHIRLPOOL 9f6aae12eb704c5fe2b9d880effcc6ddb6a054c6928e4df426069531466c7652d684ce914fc9b8048e8cc70620b2e0296209dd09513c235701c45b969b18b7a0
+EBUILD hcluster-0.2.0-r1.ebuild 548 SHA256 c7a6e5e13c38e2b3224decb288d4390bee1a1cb0aefae2576b62c199c647ce5b SHA512 dcca49eeb6dc445d092b357aebf59dcf11c990506bcbe6fe87517ad512b2ae3c1a850d55246a0ba62a57d8afb91e9b42fc65202ee772878389741658f9d825be WHIRLPOOL 218194e18297697dc0d4c5f1845ba36631a28d02de99104e79554af8c90a9f26f38167a1bfa463fe756a5c508211f27ed97ef07d8f0fd26fbfd97e79ce3c5f26
+MISC ChangeLog 2911 SHA256 451d45b2c393fa6512c3fe8a5160431fa34cb0b02a428fad3ea413910c8e6de0 SHA512 3045ca5e4465be28264a52a5286683185b72dee5943caec8d97499c9df909a8a8dd2dffacbeddbd0043220a1e808466c2d1014f3c565f752eb08f16528b2c3dd WHIRLPOOL 8ae8979e4ca3a6294ec8023117875b52b99db07a4490016db671807ef5e18251d6e96562b156d5d15e92174273912244ac42157c105c8b00a9e7388eb26c2d5d
+MISC ChangeLog-2015 1012 SHA256 9bcf112650e859db84b1f19a83b53e7a08fe7dfa290d3869ebfadc5f0bcff7a8 SHA512 345bcaf976c1693ca7362d157c784e72c8e9fe0e48e817883d30227f74931e8db62ba768c444d4478e45e82b0fbb24830711d3110122b29eb595ad5e30536ae0 WHIRLPOOL 4f0d0ff434587068b961546eb26d965466f8f5215886879f11a3d30615b262b3bd4ef7e4cbab8108b92297de6bdb10acad1a36f4ee3857b97ba9896ae634732f
+MISC metadata.xml 961 SHA256 8a628d9fbbb006428304ffae931ecbcc166935dfa94594ef8e2d35ba0bf6e2db SHA512 d6319935dab4fbcf76e6babe17f50384f66df6feadbfd62a719146609833ea681e33ee938b46480c670fd6965cda530eb32e656094703041a3a802711d8e7e8f WHIRLPOOL 5a4838486d8dbf3b29593b3692b29df22a9c5b149c9aebfce592b432f311e018804d1fcd5beb5dbfc74f1a6c609a2034df4375babd5b0aef2a59eb925c7fe8ae
diff --git a/dev-python/hcluster/hcluster-0.2.0-r1.ebuild b/dev-python/hcluster/hcluster-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..aee97299e523
--- /dev/null
+++ b/dev-python/hcluster/hcluster-0.2.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python hierarchical clustering package for Scipy"
+HOMEPAGE="https://pypi.python.org/pypi/hcluster"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/matplotlib[${PYTHON_USEDEP}]"
+
+# Tests need X display with matplotlib.
+RESTRICT="test"
diff --git a/dev-python/hcluster/metadata.xml b/dev-python/hcluster/metadata.xml
new file mode 100644
index 000000000000..3de3c222d3bb
--- /dev/null
+++ b/dev-python/hcluster/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">This library provides Python functions for agglomerative
+  clustering. Its features include
+  * generating hierarchical clusters from distance matrices
+  * computing distance matrices from observation vectors
+  * computing statistics on clusters
+  * cutting linkages to generate flat clusters
+  * and visualizing clusters with dendrograms. 
+  The interface is very similar to MATLAB's Statistics Toolbox API to
+  make code easier to port from MATLAB to Python/Numpy. The core
+  implementation of this library is in C for efficiency.</longdescription>
+	<upstream>
+		<remote-id type="google-code">scipy-cluster</remote-id>
+		<remote-id type="pypi">hcluster</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/hcs-utils/Manifest b/dev-python/hcs-utils/Manifest
new file mode 100644
index 000000000000..59bb7594cff7
--- /dev/null
+++ b/dev-python/hcs-utils/Manifest
@@ -0,0 +1,7 @@
+DIST hcs_utils-1.5.tar.gz 23316 SHA256 745614347855f8edc7fb1659032166f0a2285cfc8383607aa3f1bf9959525fb4 SHA512 9a8fdddc47e5b4f89d52b59af66594e9b9a3adcf9d0ca5894111a0d359e8c18930e2d38027acfacadbdbf874a281d0f2ce88b310dacbab1f2a39c03bb2fe6fbf WHIRLPOOL 1ee476f1112557b8808d6cb5163b419d3b86db8b64d49bc9bf34f878eb0ba0e14ff278dad599b2a7c51d015fb98bc92be0d0a361a372b668c18c9d23dfa09959
+DIST hcs_utils-2.0.tar.gz 38187 SHA256 e2c29c4a0498cfe6c560a74e11087752c2ab08036a5f74677214699f6132b813 SHA512 63b2ab16c8e517563dbcac4b85e781da5bd40fe20b5c41c449a20c07da5539ac37b622d7bf4d421f3721ed13bf4227aa9ebd5607280147f3723c31ce965d23f2 WHIRLPOOL 23b12eb73c3f75a238ef15fc02407a046e51ab1851dc1d9d76bf13916462729ff9d7f2c17ad32aaede436447ba8374290b5cd5b5f1050636cfc86d5a8f63664f
+EBUILD hcs-utils-1.5.ebuild 692 SHA256 4f8576089d66df12fae55ad0a12347c50aff768b991b463fc92632587783aecb SHA512 f2e2d300085ca93f7c6922154a073cf722da34b620754193b66e2ee834f36068fac3b8511c64fa46f8ba68272c02be6833cd0f4de9fd84e4102faa5873cdb45d WHIRLPOOL 91c1728b0bcf07554a341bc175e4444eed02f51de8242a6dd80c838f7591ebed8d6cc815d444ad1fbb3c91d9352850a256949fa5e6620a3f56dee5368426fe02
+EBUILD hcs-utils-2.0.ebuild 690 SHA256 380e7ea77b983458c42197512d2d71d2d3c50b3a0d467377b41c6ad5154b89aa SHA512 e5bd5e46cea8b920ceef6e35531056e3d14d657c338477fffafdfd42c9b944c0565f05feb0c1f67bc2f8cedf3642cfa90e7c14af85fcb43f4278909df6f5948f WHIRLPOOL e11d7faf6d3a9174d6e888f8e89229567b374c60dfea517a0a079c1d7c131982457f4d1b1901cc4fcae5c661fa61ed99a3784ea23036edf94975c603dc3cdcb3
+MISC ChangeLog 2650 SHA256 1115e3852edfff30ae57e01ba72420fa771fae7498abcdcd0453be11e7c58ff0 SHA512 31897daeec0a3284f8a4794e5e56d89dec9f246f753c3520b31b1cf067cc43cd96de45e9a77abb343b46097ac7dc89d5fb8e49e9cbdcda5f1510851ee6e5af8f WHIRLPOOL 34c2a70430aad1cce76f2cec5c12efeeaf5e1a72afbb2ab40996e20fb7373c0fc4fce673163b11c1cad6e694406505f9b5e9aded8df22390ca136b73f72dd96d
+MISC ChangeLog-2015 1888 SHA256 582d3c0f21780a911c8e9e4c899547f859a7ac311dad71063cf00b5e7ff46eea SHA512 5107ff1ba395aca69fd27416737888d3e95751b53bd202448b69180e4ef7d07db9e223614a36c9bc5f0f7a08211cb179612b19fb911f420c7f582e9208903676 WHIRLPOOL 28e082dedd4383179326a198964d0548d30cc6f233202a1728f76911ad4656f47fe0a5ad6bd1125af3d3eda78ec54f98e5f1e7fc65fe8e01e00cf7fda778c833
+MISC metadata.xml 614 SHA256 4098444be094c5caa4ee1d72c127f3e512eaee75dd72e501eb4d69b08f1c39c1 SHA512 7d90ad7d9e58097c3100f898d2afcf3d6e76f0b3e6f3a36b7b98df3009edf24b7abb4b7d97453490a2f48e006903c7f99db7b1b4a38a4f1653bab95769a55070 WHIRLPOOL c7b88c8923fe28f7a5b397465cc71dfae13ea7e353ec9c7127ea7c9e088cbd9ce04df5983f7f6fbe89100d28a4add254d211777a0244ae9b1fdc07b3353af21e
diff --git a/dev-python/hcs-utils/hcs-utils-1.5.ebuild b/dev-python/hcs-utils/hcs-utils-1.5.ebuild
new file mode 100644
index 000000000000..98685b1f7b47
--- /dev/null
+++ b/dev-python/hcs-utils/hcs-utils-1.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P=${P/_rc/rc}
+DESCRIPTION="A library containing some useful snippets"
+HOMEPAGE="https://pypi.python.org/pypi/hcs_utils"
+SRC_URI="mirror://pypi/h/${PN/-/_}/${MY_P/-/_}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P/-/_}"
+
+python_test() {
+	pushd  "${BUILD_DIR}/lib" > /dev/null
+	py.test --doctest-modules hcs_utils || die "Tests failed"
+}
diff --git a/dev-python/hcs-utils/hcs-utils-2.0.ebuild b/dev-python/hcs-utils/hcs-utils-2.0.ebuild
new file mode 100644
index 000000000000..5d17911fb1d5
--- /dev/null
+++ b/dev-python/hcs-utils/hcs-utils-2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P=${P/_rc/rc}
+DESCRIPTION="A library containing some useful snippets"
+HOMEPAGE="https://pypi.python.org/pypi/hcs_utils"
+SRC_URI="mirror://pypi/h/${PN/-/_}/${MY_P/-/_}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P/-/_}"
+
+python_test() {
+	pushd  "${BUILD_DIR}/lib" > /dev/null || die
+	py.test --doctest-modules hcs_utils || die "Tests failed"
+}
diff --git a/dev-python/hcs-utils/metadata.xml b/dev-python/hcs-utils/metadata.xml
new file mode 100644
index 000000000000..f2f4912e4cf5
--- /dev/null
+++ b/dev-python/hcs-utils/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>fabiano.francesconi@gmail.com</email>
+		<name>Fabiano Francesconi</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">hcs_utils</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/healpy/Manifest b/dev-python/healpy/Manifest
new file mode 100644
index 000000000000..f82972e17791
--- /dev/null
+++ b/dev-python/healpy/Manifest
@@ -0,0 +1,6 @@
+DIST healpy-1.10.3.tar.gz 4018897 SHA256 43bdccb0081b3b5a72a9c1f523c367bc2cba91f989a60047d8043685a3beb81b SHA512 c5862fceb597ffbc5c53204479fa9dba19287e3c08744e25edef3eaecfa726e61e8558d50d73e2bf4d19b7d0adc0ac928a38c4808fc92fe855f5eae101e18baa WHIRLPOOL f3d883f8de8c35573d865ab444818b5b3e3cbeac4176961cd8db39931a09b0d52a7f2fe7c6f3862823d32cd2ec2a569a17f6dc9e1da8510f35940f9ddbb7b66a
+DIST healpy-1.11.0.tar.gz 4033412 SHA256 8c3c7982ae188549315a11f4d1aa6528cd1ccf078017ca20120ff2cf1b47babe SHA512 35926c769f2fd4ebc3cd61357d742e9e1747325187e465bd3be62b4281506bd02cf3d8b982583819219e994dfa3936d6bc61914218325bb6b4ddfcffc50c802f WHIRLPOOL 59cb954d30b6df3db07ae4aa94e576c94f19eaf8e99e7416bf162c362089490999b6e85a62f94c09d62d37292b82d2bfaf7e89de1b93882e0b35cd6ab8887a59
+EBUILD healpy-1.10.3.ebuild 953 SHA256 5ac31854dbf4f28ab6b907eacd656ed02d5dd5867526e2d1b048864ed9f6e517 SHA512 3bfa350217f621fd59ed84a95cde8f6dc452304228459f53d201fb2b75db2f78912d622ebe8e8376220e8f09a323c9500405165ccf485a9df46716b36606fe13 WHIRLPOOL c433ddd699e5e307b60c3a5c34386a592b6e915ecbbb6fd6cd0dbc3968660d1ad3cff0bc0bbfe181bc38d4ad3d5615e3c42399cca4a483fa53fc205036ebdccb
+EBUILD healpy-1.11.0.ebuild 1048 SHA256 2511ce5d456ad267ec6f0ed9b2d59761632af50377b0d2cbe52b86cfba2cce66 SHA512 92ab0e948a8717f4e6be8f1164c46a974707a5e19311908f3519336adf37e8006f23d210479554ee4002f6762dc202f2cb52ca8367aadd620e001d30226a0616 WHIRLPOOL 62ce1e94f9531c2c14bbba52ce2a7a330600b2971208f8702643288790d69f2a06ec58a36b1289bbccbba79de38286771f7f2aaf1cd03b996fc81b56825dc269
+MISC ChangeLog 471 SHA256 edccd66667eccd41ab6a161f101719b69db7df548c2d87d1851aa8c9d3547520 SHA512 f938d33c53011414e3defa75144916eb5cbec1bd15313e20256895d680209b141b8bb82bc87f1018583931f1aa02c4bd2e4ee8d5097cea991b127accba5a4b2a WHIRLPOOL 7dd745d0f75c4cb14596e140426a01fdfcd2966a4fabd002ab238b3c8279dccbed3eae6fde28a754f882c5c3ec26ce7dcb925b99d49cb7ef561ddf70bd4fff1b
+MISC metadata.xml 609 SHA256 c705ce298601801e95338a2a24cf56cdf3a9a6435961d3e3fc7893ea245d68ad SHA512 e8d86f81b4a62f3f15bb2210cfbc9eb51568525349c34e10bc32de76654f18c7937ee1c5390915c8a225be35baefb8b45d8cb982a41e314da77b91c30ae8749f WHIRLPOOL f4d99bcab4e795a035511e4c2d5408111f3b94a2dda09225e7cfc46a514a4ede2f2ccef085b3b580af9c688a24591b39a6bebf9ab3f4f5fc3c6526e862d332b8
diff --git a/dev-python/healpy/healpy-1.10.3.ebuild b/dev-python/healpy/healpy-1.10.3.ebuild
new file mode 100644
index 000000000000..f84e392eec9a
--- /dev/null
+++ b/dev-python/healpy/healpy-1.10.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for healpix"
+HOMEPAGE="https://github.com/healpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-astronomy/healpix:=[cxx]
+	sci-libs/cfitsio:="
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
+
+DOCS=( README.rst CHANGELOG.rst CITATION )
+
+python_test() {
+	echo "backend: Agg" > matplotlibrc || die
+	MPLCONFIGDIR=. esetup.py test || die
+	rm matplotlibrc || die
+}
diff --git a/dev-python/healpy/healpy-1.11.0.ebuild b/dev-python/healpy/healpy-1.11.0.ebuild
new file mode 100644
index 000000000000..c517d95ea5cf
--- /dev/null
+++ b/dev-python/healpy/healpy-1.11.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for healpix"
+HOMEPAGE="https://github.com/healpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-astronomy/healpix:=[cxx]
+	sci-libs/cfitsio:="
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/pytest-runner[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	test? (
+	  dev-python/pytest[${PYTHON_USEDEP}]
+	  dev-python/pytest-cython[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( README.rst CHANGELOG.rst CITATION )
+
+python_test() {
+	echo "backend: Agg" > matplotlibrc || die
+	MPLCONFIGDIR=. esetup.py test || die
+	rm matplotlibrc || die
+}
diff --git a/dev-python/healpy/metadata.xml b/dev-python/healpy/metadata.xml
new file mode 100644
index 000000000000..39b8f2351616
--- /dev/null
+++ b/dev-python/healpy/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  Healpy provides a python package to manipulate healpix maps. It is
+  based on the standard numeric and visualisation tools for Python,
+  Numpy and matplotlib.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">healpy</remote-id>
+    <remote-id type="github">healpy/healpy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/hgdistver/Manifest b/dev-python/hgdistver/Manifest
new file mode 100644
index 000000000000..a81f4c35d100
--- /dev/null
+++ b/dev-python/hgdistver/Manifest
@@ -0,0 +1,5 @@
+DIST hgdistver-0.25.tar.gz 9879 SHA256 603bed5bcd892252b4501375fbca4a24de7937418e0a6ef299e3902c5a198d8d SHA512 3fef872af3c8fffb3ba612d2505260468b510c17219257640a4bcf3dc6568fdf59eb3cc544ef41b7eab32ee6cedcd81bfffce753c98bbc7d1e538fe4937d039c WHIRLPOOL 3afad9490e51b67bb90671377083eb0e853f242f088f83f4574d3ff19506cafed04c4c089f54e603ede5f3a5d6e1b9eafd0db00095d2f1c0b9ff0451efdb407e
+EBUILD hgdistver-0.25.ebuild 810 SHA256 f8fded23793ad5f37d0e344eb5c01e013f4f182f8db4611c167a47e5c7ae4e19 SHA512 cd34a5b79b5c30cf2626e893f100c24ccef8fb0e3990f951e3495154b1f217b233f8d022be995af780231880f64b2463e45fa95433a792156b5a89a953abb868 WHIRLPOOL 82e6296c4de0041525eb5c88e3422780451094cd9b0744fd6f7591d8e9178be7a5fd5ff0d0d269463c7b36963d336e77fc6023379b584f4a56a126c4c67b2423
+MISC ChangeLog 3215 SHA256 4ee33eef7d87527ccd7d49dc4348f24fcb6a2339feaf061ada8fb8f8ea1e33ab SHA512 4a4662801d03c2074b65c6793dfdc2d832bc6533e0a34f0177c367d5250ebd6b35f1f06d0f7af348f5bf23cab3f823019ecc6dec3244e829124ab1c92c7f1b16 WHIRLPOOL 76cf87d86015e1f4629b3f33d6ce9792bae6c669055cbd9fa4df25679afd18b6ccd60e3eccd790385177902e296173e1c2211380f3794c11b7ce1c6058858bea
+MISC ChangeLog-2015 2895 SHA256 ef73edebd938a37e631a03a3106db774e3ebb10ddfa15c7f28fc7f3207d4f56f SHA512 b839305065a261aec1915507275a5f4453c76c617304483c4ec2f128f70c057859581459193464570fb3702af46d3eb9dc70dd50606ea476deaf9c80aa0136cc WHIRLPOOL 5dfb106c5c5df8a3dcea54b36e6b02ef76972d5100fe5a08e8472becfde911182cc2fb20af43a6c9e4d64684c9799941133065eab2e969fad87923203f1b9bc2
+MISC metadata.xml 394 SHA256 d973e90dda429aa283b9c15ff408ed81c03c9dc9cb9015ec69cd74874bfb6445 SHA512 01c27a5f8d42a579acc1d21bd2f4b7a569183652c9637403b3efe7dfa515b9c86cee97f505ed909f0f34443cf2912cd1ae6b568a11954b6cf756815a5db82cc7 WHIRLPOOL 19820c701dab42023f3c53c2ba944ced7b664caf5225e44ca15e2185805717ec3489c6d5285520115c168f94bca4566a1cb516ab663b5fb68cbbb90e1b22dfd5
diff --git a/dev-python/hgdistver/hgdistver-0.25.ebuild b/dev-python/hgdistver/hgdistver-0.25.ebuild
new file mode 100644
index 000000000000..12f161ed5070
--- /dev/null
+++ b/dev-python/hgdistver/hgdistver-0.25.ebuild
@@ -0,0 +1,28 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="utility lib to generate python package version infos from mercurial tags"
+HOMEPAGE="https://pypi.python.org/pypi/hgdistver"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-vcs/git
+		dev-vcs/mercurial
+	)"
+RDEPEND=""
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/hgdistver/metadata.xml b/dev-python/hgdistver/metadata.xml
new file mode 100644
index 000000000000..35d22485a9b7
--- /dev/null
+++ b/dev-python/hgdistver/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">hgdistver</remote-id>
+    <remote-id type="bitbucket">RonnyPfannschmidt/hgdistver</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/hglib/Manifest b/dev-python/hglib/Manifest
new file mode 100644
index 000000000000..f5c67f088026
--- /dev/null
+++ b/dev-python/hglib/Manifest
@@ -0,0 +1,7 @@
+DIST python-hglib-1.5.tar.gz 27812 SHA256 601c04d8daa806768e3075786ffe9b93ad3574ad2b300107dd615dbe7846a367 SHA512 2506e2ac95488830b90f5f099d231e45833a8f19ce14fc2f3391ae1bf48ca72187b6b57afb633ecbe6cd2c6f3d3f482d75e03ea36406b3a07085ed1b4ef9c6b5 WHIRLPOOL 84e0cdc82344cbe3872f70d9d95ec41da4bb99e3fcece0759dea58d727ca9d650449cba1ef9ca214b954942c801363b7e8fc2fbb1abf6e6a0eb7b8133855c7c1
+DIST python-hglib-2.1.tar.gz 29030 SHA256 aef394edeeea89803f9764a441423da3efffefaae9cf0eca6ee38cdb4ac00d73 SHA512 82cd00e4184a8a002ea0bcc2dec4de06a705f5f6cecd1ddbddef08ead2817f673590884aee5187fbc3496ced3f27ca8c8d78e0436fb97205ef654cd28d912e68 WHIRLPOOL 248b37b1ef0ff8a0d5f3ecaa9defd2e72f2cd661922847eef4f9501e6a313af9cdc6a6bac774d2aed1b79ad7ab9bb04cd639431376b3502ad75b97ad26a6d6e7
+EBUILD hglib-1.5.ebuild 829 SHA256 e98d8055199808817636c565abefa541d93d64316c40226ae8e84344eb173ed9 SHA512 360909ae97f2a2044844975d4e16eb33dd67aa34cb92a0d47f795d791917f9406c884ee9da89160dc6fd833b42b1410a5a300e740501699a07c06920937f8e5b WHIRLPOOL b14c9a48b1c71438da212c8248f9d1dd8a0dbee23f61627a17d0fcf95ce3863c27445a1d13e6fad7c8dda4e1910de127d63eb10a633ddf125c096ca89e3645fd
+EBUILD hglib-2.1.ebuild 835 SHA256 9ef5439e83635ffb81941ce7792bf9649b45dc1c8603bd910485af9d22c491c4 SHA512 9ee61147a350ef73c47d9fe78c271206a82c5237a411be69691d42af962be313c453d39c7e461bbd7384559ee541a37d32812f813fcb3706fc6e703e4bdda767 WHIRLPOOL 3dfd8538f040a58328f1148a63ead8dc0717782b0a9d383f2fd470ee75a9937871b48a9d45260617eec18f0882aa6473b4d6918701703ddcfdfdd4acdc298340
+MISC ChangeLog 2857 SHA256 30b2b010dca10d7b75d89a7c7c44722aaebed95024b6cbb462debe7509e411be SHA512 a02aa298a6640c5c5b68c73dca54554292b158bde4e565443892ac94ec326c2e4f4abb02fa094af51803c8254d585fa616e96dcbf2625faabde1c38ace57efb7 WHIRLPOOL b26fe557cfb2a2c31e5eb7d256218dcce7df7700c6695ff15524b0b4fb79f80df6757b78cad9c6f6aa5a8e13bc184f593e66592abd65e54df47a75fa0b3c7dcb
+MISC ChangeLog-2015 1992 SHA256 9f1bf29ec716109c71b587f72bf8b0b8179008596d2bc74b9f3e07f4520bc71d SHA512 45139704f3815e339758fa3e0b350d9f37767d40157ae617cc8ea1e5429c0253574bc77b44c05b940959cc08c6e41ab8d41286116692fcb3950ce7344eecb828 WHIRLPOOL 5dd473d7a4842b97c608ba4f5f54a0385e638c97464655b6bb67950e794c232c0f7c0bcabb3eb1f92ee416de12e09465aeb50f8e7b0984d63be38441237cc033
+MISC metadata.xml 554 SHA256 c3362cca5ee77b92c987bc5840806130108830abdd9ebb1016fd336f58fb5838 SHA512 421fa6d625b36970114ae407051d4363367d6a6a2e53cbd87a5a996ef23fdfaeb489342fc8af6e64aa074640b088097ea54397ff09351a6902fc502c5d1146bc WHIRLPOOL 5512ab813d28dbdc474ff0bb87aea7d1a06f8ae4e8e25c6ece4c7b568806fba20a7ec2b1623482c5f622ddb0328e0c30e398ddce181e1440e5841c999b87111f
diff --git a/dev-python/hglib/hglib-1.5.ebuild b/dev-python/hglib/hglib-1.5.ebuild
new file mode 100644
index 000000000000..8e38d45dd8cd
--- /dev/null
+++ b/dev-python/hglib/hglib-1.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_REQ_USE="threads(+)"
+
+MY_P="python-${P}"
+MY_PN="python-${PN}"
+
+inherit distutils-r1
+
+DESCRIPTION="Library for using the Mercurial Command Server from Python"
+HOMEPAGE="http://mercurial.selenic.com/"
+SRC_URI="mirror://pypi/p/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND=">=dev-vcs/mercurial-2.4.2"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	if ! ${PYTHON} test.py; then
+		die "Tests failed under ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/stats.py )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/hglib/hglib-2.1.ebuild b/dev-python/hglib/hglib-2.1.ebuild
new file mode 100644
index 000000000000..ebe995c339f8
--- /dev/null
+++ b/dev-python/hglib/hglib-2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+MY_P=python-${P}
+MY_PN=python-${PN}
+
+inherit distutils-r1
+
+DESCRIPTION="Library for using the Mercurial Command Server from Python"
+HOMEPAGE="http://mercurial.selenic.com/"
+SRC_URI="mirror://pypi/p/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND=">=dev-vcs/mercurial-2.4.2"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	if ! ${PYTHON} test.py; then
+		die "Tests failed under ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/stats.py )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/hglib/metadata.xml b/dev-python/hglib/metadata.xml
new file mode 100644
index 000000000000..5d827767bef9
--- /dev/null
+++ b/dev-python/hglib/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arne_bab@web.de</email>
+		<name>Arne Babenhauserheide</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-hglib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/hgtools/Manifest b/dev-python/hgtools/Manifest
new file mode 100644
index 000000000000..4d40edb6988c
--- /dev/null
+++ b/dev-python/hgtools/Manifest
@@ -0,0 +1,5 @@
+DIST hgtools-6.5.1.tar.gz 22389 SHA256 638a29345707569944459b063763a00c2a3651bc489b1e0dfe0d1d6f3c3c518f SHA512 7a9cd405f4e3f49c57b89e85bca1dff6bfcce91c86a1f006f4223c23a82b13b57468c583815719b9c7e6189070381cf9345c3b7b06d9ed83cf1ed6994293c130 WHIRLPOOL 53f56ab71dca4ed824f84670b9f93e68b827453bb99075f4e2af684ef121fe27d011409819b604d233ea6660f4194c6807d2133f7f819da6d74a732952d322f4
+EBUILD hgtools-6.5.1.ebuild 735 SHA256 764030f8fbdefa6817eb672dadd105009f4b98bb14543f19f35a175859015e24 SHA512 34f8de66c125c0fd73b055401332d2fabde46be8085014e7c501ab1927778fe9279f43c8bd47bc05347be70173025f803c91f985c4d0dd86a594079365de7f58 WHIRLPOOL a477c53ed20538922118656fb6d6547b2b4bdd349d88e0c5b908ccc3fbdec365c89743c50747b9c0e85f1066f351b27985e9dfb9dbe5499098d5a5c05838a7ac
+MISC ChangeLog 3134 SHA256 9db2100fbd56f9ef7436728c7cefd7ede24d7c968f640a425bb27f212b563df8 SHA512 36cdf1026a0ee393e6e3eec285fd26585b4bb664b9cd6826bf835e34efe3d8523ebe3e1f39d5ef6f23c321e2128f86e2c5d9f5a05fde04d032ebf73ef1889d5a WHIRLPOOL ab3b2f17e97c70d3a60bcd902544194d4259ea717738a89dbdc7a9b970e4785a42b89475635a2052971ee09e8a8d2f6f50b254ff9134c639024b00a2768a0d3b
+MISC ChangeLog-2015 2830 SHA256 c2a47d7d2f9d1b4ecdf402ba2d316e71768ecdb83c0545041caacc21af1f9a3d SHA512 39b6b3165983a28903885b3bb90d72116b5ad965d80a5080d598f38cedf3c9679f7017d1882d03aab8abff7a7489eb6734182381e1b424af99d84a3426f54297 WHIRLPOOL 3308417ddab5c63c2596e05fcd575673d9288cee963f53eee2ef03d0b900d9c1ef55123a0ec478f32764f00aee322246bd4cf5fbd43041ccc8c0d7aa412536f5
+MISC metadata.xml 590 SHA256 ae3352f8837bb60c706756a24a596c4b56c757f163e5613b0a3c883d4deb8064 SHA512 16dbbcb08ea7371510d7d2594f7df1df01de8df54a45c12c4ea87330d3bb773edb10db5a08aa48333f383a6a627d9c86c017e3cb357df063874899e62ac55ad1 WHIRLPOOL bd35186340cb3f6dec9e63b9cc44b3959d7a7f6d1a909538656f267a41fe5e240097ba2ae41f4b14dc564e0e2ba1e00e273d8b61e80ba1a23e5a93f86bc8fc13
diff --git a/dev-python/hgtools/hgtools-6.5.1.ebuild b/dev-python/hgtools/hgtools-6.5.1.ebuild
new file mode 100644
index 000000000000..ed2c0a896a6b
--- /dev/null
+++ b/dev-python/hgtools/hgtools-6.5.1.ebuild
@@ -0,0 +1,31 @@
+# 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} )
+
+RESTRICT="test"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Classes and setuptools plugin for Mercurial repositories"
+HOMEPAGE="https://pypi.python.org/pypi/hgtools https://github.com/jaraco/hgtools"
+SRC_URI="mirror://pypi/h/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE="test"
+
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="dev-vcs/mercurial"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	pushd "${BUILD_DIR}"/../ > /dev/null
+	py.test "${PN}"/tests || die
+	popd > /dev/null
+}
diff --git a/dev-python/hgtools/metadata.xml b/dev-python/hgtools/metadata.xml
new file mode 100644
index 000000000000..9a44103124e5
--- /dev/null
+++ b/dev-python/hgtools/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Classes and setuptools plugin for Mercurial repositories
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">hgtools</remote-id>
+		<remote-id type="bitbucket">jaraco/hgtools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
new file mode 100644
index 000000000000..57d4982d6ff3
--- /dev/null
+++ b/dev-python/hiredis/Manifest
@@ -0,0 +1,6 @@
+AUX hiredis-0.2.0-system-libs.patch 899 SHA256 14f5772c0d0301ef1a88014759aabe4cee7c0f084f63c6a34d927a3ea91e5758 SHA512 fcfd8b3bdc4e987bc82d461babec71b7f35c50aa9a9032784821dc782cb45ae714c2f199806f84449aa5e8b9a5d4480b0ca76ec1b4f1cfbb869a5ada7486951b WHIRLPOOL 5c9b50f0ee27bca2bfba349f10de286caecfbbe9232d5b67fba8b010a6dd5a679a8f5e4be09cf255d2271f4a8020e2d1788ee20788fbc1a5edcb92829d820240
+DIST hiredis-0.2.0.tar.gz 46113 SHA256 ca958e13128e49674aa4a96f02746f5de5973f39b57297b84d59fd44d314d5b5 SHA512 9eb18ec089517340043d14938a213b139dc948dc9cf2f9c65e632bb4694ac22543b87a5875c1cea083e2bc8e303103c749047889cdb3e9d5680b586d34330c86 WHIRLPOOL 5c2252d82814b8365a29160c41133571083954c317f9c36f534e3f0aa98bc97621f144479b715da0d5c77a0a00a7a5e0b69fb63c2559a4ebf124d88be93d477d
+EBUILD hiredis-0.2.0.ebuild 614 SHA256 d8a01279902c0c0aae696a6c599239923fb5603b25affde231346e04017eb146 SHA512 6a43463bd9401b5f93204796c795dcf7ce4165e57984294f1e3e50d710f3780c571a1d1175ee60b82abbad35e702bc8c12c6ce450c6751d1f4198e802e268275 WHIRLPOOL 6a43fd8e1063a90d1bbce4fe15cec92e9f535c1f551d6b222f2f1fa8cc3590cd2c22fa00bdbd99bbeb65dd688bd84e5ba913286ebcdff4376cd4cd6a96a068e3
+MISC ChangeLog 2874 SHA256 9b30be7e02c51e92bb0309d51f2c170e1cc924276345f5f3a46c634d8c92dc44 SHA512 044cda4d1de817f45ac83af8f016c5c09855dd31570b691302b0281406900c51a94105e80ae2c2aba3344dbad37ee7f100a0bdbc5fddd28531cb2017fd2a62be WHIRLPOOL 4bba236e6676e381bbe38dbddb289c4cb27bba5d99fb2a50903f0350bb2d888ae6b8fe1816be7d7c99cc60fa841bb591aa5d419bf1f64553607f971dbde610c3
+MISC ChangeLog-2015 2118 SHA256 329c2d5abe2461355e74c9eb42b59ba95688ab99104c418e10a7443f52195f6f SHA512 67195d3093b62c43e54813c74adf822a49d9cbf89648085cb2cc89929efa1c8405028cbfe9accb9d7b4086b161e139a73517b717e6b1f28e7867225cbb07210c WHIRLPOOL bd6e47b68d018cdeca4b2060daf5ad1ba5a2f6c9b9401f20b2abab8cf1c69ced643012cbd35cd1745cfe42f18a502f76f854d9b28d9f7d2ad35174a1b0603882
+MISC metadata.xml 494 SHA256 3e824fa6185ea4daed8c30ad2baebe6e72084838d376e73b4da53d9a995c61bf SHA512 f378121293d91d941dcede71f7e7a1a3e6fe906aa5963bd2388f8538d4e696d0bdb16c4f44126105b43ec81b1ee9e36e9549e7557d76c6a032c1cae3a4103265 WHIRLPOOL 243acba1097675b2ec2c309f530616fdbd38bccf4f2588ed637450c86b90b4a864c03a9eb1334901db4022e3ce6f2efe7333c4dffd1f6c0f99c00dcf155b9c1c
diff --git a/dev-python/hiredis/files/hiredis-0.2.0-system-libs.patch b/dev-python/hiredis/files/hiredis-0.2.0-system-libs.patch
new file mode 100644
index 000000000000..6cd22292deb9
--- /dev/null
+++ b/dev-python/hiredis/files/hiredis-0.2.0-system-libs.patch
@@ -0,0 +1,28 @@
+Remove vendor and var 'lib' from setup.py
+diff -u hiredis-0.2.0.orig/setup.py hiredis-0.2.0/setup.py
+--- setup.py	2015-06-21 11:47:28.796472027 +0800
++++ setup.py	2015-06-21 11:49:53.047949803 +0800
+@@ -40,12 +40,9 @@
+ # supported Python versions is worse...
+ #
+ # Also see: https://github.com/pietern/hiredis-py/issues/15
+-lib = ("hiredis_for_hiredis_py", {
+-  "sources": ["vendor/hiredis/%s.c" % src for src in ("read", "sds")]})
+ 
+ ext = Extension("hiredis.hiredis",
+-  sources=glob.glob("src/*.c"),
+-  include_dirs=["vendor"])
++  sources=glob.glob("src/*.c"))
+ 
+ setup(
+   name="hiredis",
+@@ -57,7 +54,6 @@
+   keywords=["Redis"],
+   license="BSD",
+   packages=["hiredis"],
+-  libraries=[lib],
+   ext_modules=[ext],
+ 
+   # Override "install_lib" command
+Common subdirectories: hiredis-0.2.0.orig/src and hiredis-0.2.0/src
+Common subdirectories: hiredis-0.2.0.orig/vendor and hiredis-0.2.0/vendor
diff --git a/dev-python/hiredis/hiredis-0.2.0.ebuild b/dev-python/hiredis/hiredis-0.2.0.ebuild
new file mode 100644
index 000000000000..f95394376f38
--- /dev/null
+++ b/dev-python/hiredis/hiredis-0.2.0.ebuild
@@ -0,0 +1,28 @@
+# 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
+
+DESCRIPTION="Python extension that wraps hiredis"
+HOMEPAGE="https://github.com/pietern/hiredis-py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+DEPEND=">=dev-libs/hiredis-0.13.1"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-system-libs.patch )
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+
+	distutils-r1_python_compile
+}
diff --git a/dev-python/hiredis/metadata.xml b/dev-python/hiredis/metadata.xml
new file mode 100644
index 000000000000..d5da8f0733c4
--- /dev/null
+++ b/dev-python/hiredis/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>swegener@gentoo.org</email>
+    <name>Sven Wegener</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">hiredis</remote-id>
+    <remote-id type="github">pietern/hiredis-py</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/hiro/Manifest b/dev-python/hiro/Manifest
new file mode 100644
index 000000000000..6fc0cfce0ee9
--- /dev/null
+++ b/dev-python/hiro/Manifest
@@ -0,0 +1,6 @@
+DIST hiro-0.2.tar.gz 9384 SHA256 5b71a8d446c4c4efbebab4e06c9973a173c425e0eda218a86fa47244b61a9187 SHA512 69a66223e678c87363ac4beab8a58bec7976b93fe1b354ac1030842e31463adda84f444732ac48868f6b4f11f4a132a1142889466474bff2a77964449c710b65 WHIRLPOOL 7bccec85bf160ead6d9dafa9a0ee6f2f390fdd2d60d2454762dd3521d3eaae7af94f503f169ae8c926ab0dae15c79fa080bf68f453eb4de11b849fbd5a620ed4
+DIST hiro-0.3.tar.gz 9355 SHA256 33c0a32d709fc980d54b096f1b1055a18e8dffb8e307f8ac7543fae10ededbfd SHA512 c5ace67410ac0e946aa7f93b61448760ab9bba5610621a585f17d1ad99444161a2495a73e20b67d50f1b8b0a4c1b54a9f25732319431905891b7c5fc58c6000d WHIRLPOOL 6d9b68ea51dedc60cd9a5cbbc7f9e0ef8995b23e134e993bb86b373f29673ebfa164615a0b2990c73cdb4fd5633e70df92c276646a4db2ac12b7f624a24efbbd
+EBUILD hiro-0.2.ebuild 528 SHA256 600460d84a7d953b9e5b4af0a07420cb169862b70a385bf698779389077c7451 SHA512 a664b3c4b7575c25a665288836a013fa757d516679ec947bf9879393471653f0794ddcba07ac80f13aa7d452bdbffab2b93e2850916c98e8ff19d8dc12f65014 WHIRLPOOL a63d674059e75ff8ad105f95d24a9b108ba3a97891f6ee4bfad0559c47abec7877a6047b7e60cbd666ac78bbaf06d193d995417e620c2992550b3e0084fe1e80
+EBUILD hiro-0.3.ebuild 530 SHA256 b19925d540f3e0cd61ae5a1ce25b14e3042dc0448282aba80ea07e9d370afd19 SHA512 28c3af48fc074438b7193cc42fafe0bfe040a4d2191eaa0668041a82de4b5642506cc288d7959b54c487a8bd497ab2be35146f65d89e3ff89ca972a95c7a730f WHIRLPOOL a6d922daf20e5f8cb795e865dca0172b3e0ca739cbdff1561b02b0c6240ea1446e53f4eb0709ca896b94202121ba6f291ce63ce6da32964be8f761dfe35f2555
+MISC ChangeLog 296 SHA256 aaa66ec843ce2896b10382ea9b5736e76e26cac6bca9e7cf1bf7491fc03f3db9 SHA512 03b50efb3f8a8e225846bc6a889e7d7e64bd2a2a8640745fadba760fc1782cfda8f38f3512ed33325b2687c8774c8db1f3523a2efd192ece6c29fb681bda63ac WHIRLPOOL ea16d39f71bcb27d0da23acc8c0cae0d7b43c6e81268640342deb29aff7c8b66cbd200e7a46d5fd99ceaac0e587f67d53c42d12070fe799aeaa1e61bbe4c2bfe
+MISC metadata.xml 361 SHA256 ef8f631179bf6196b6fd8a10098bc66a50b1339084af2a9ed7330e9c10241c75 SHA512 dd0603e5ffcb021686962cba814ad6631e0affa111ff455c1465d0c245c14e3a8d92947257ee90e5737b58f0c8d452ab6e48e5fcd0bbad9e62ea170207e70f45 WHIRLPOOL e8e9d14b56e5501712af7caad3b6d83b2a62d2e8a84ea44076a197483b9ef5b4e5febf87a67b64d8f158751c776fec3012ae95d95f08dabf9f3f849157c203cc
diff --git a/dev-python/hiro/hiro-0.2.ebuild b/dev-python/hiro/hiro-0.2.ebuild
new file mode 100644
index 000000000000..ec92685fd8a1
--- /dev/null
+++ b/dev-python/hiro/hiro-0.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Time manipulation utilities for python"
+HOMEPAGE="https://github.com/alisaifee/hiro"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/hiro/hiro-0.3.ebuild b/dev-python/hiro/hiro-0.3.ebuild
new file mode 100644
index 000000000000..17cde81a8dd8
--- /dev/null
+++ b/dev-python/hiro/hiro-0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Time manipulation utilities for python"
+HOMEPAGE="https://github.com/alisaifee/hiro"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/hiro/metadata.xml b/dev-python/hiro/metadata.xml
new file mode 100644
index 000000000000..eca22bdc769c
--- /dev/null
+++ b/dev-python/hiro/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">alisaifee/hiro</remote-id>
+		<remote-id type="pypi">hiro</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/hp3parclient/Manifest b/dev-python/hp3parclient/Manifest
new file mode 100644
index 000000000000..18dd83a3481f
--- /dev/null
+++ b/dev-python/hp3parclient/Manifest
@@ -0,0 +1,7 @@
+DIST hp3parclient-2.0.0.tar.gz 42167 SHA256 bab78a3fa14236d7884af52271fd91d08d51ec99b7e2d6c6fb477bfdfb9ef259 SHA512 8bc4903e31f3f8a73c7656c1c6d722dd5baff05d7fcab1b22505843f0464e207194a333ba86bf487ac44219a9f792d8384cd0a3aefba292013c66f2d798d9552 WHIRLPOOL b48305e8b7f29d4adaa9ad8d3e83422a1d4a74d59ae0191f00bb947761d5077bfc7f9f70f504f17f23248b8e3c0275f47461eacb38bcd92f66053f06556b6607
+DIST hp3parclient-3.0.0.tar.gz 40895 SHA256 1a3acbe86acf8f698dbda83ced88872fe118eab3a91ae22d6c0cb70d109b9cc5 SHA512 976f28b96ea18ef7995b327403f9ccc2d3322296d4d4ae8c66018b7810adb86f582aec8aed59ddafaa0f8a5cc73b1ef40cf916ad3210a74ce8dae3b1f7f7adff WHIRLPOOL 3a3f34338b64837faf9dc060bed2a5a0154841bedeb0d3770dc91b5f7a89613780f9603ca6f015b0dd7b30bf7f51fc8625fe129bf27a222005f41ef305c9c586
+EBUILD hp3parclient-2.0.0.ebuild 958 SHA256 5c86a716615e86ed923f8f9fa4e93fa29a1846efcf1d9ebdde0f23c929a9b2b3 SHA512 92f66defa23272ad579618f33db96441192ccad07f66f4ef6a93d240dd5bc4b2dbc69a87765cdb5d46eec20077f2643ec5d4b39ae253d421c629f37001f48dca WHIRLPOOL 1e0a2255caff213b2019e60c294356ff6fe2616d4e80b0a56e2f6721b5314f5df5ae09b218c30ae902791e0574137fb5e472dd09b94842a027acc813ba5f0735
+EBUILD hp3parclient-3.0.0.ebuild 1044 SHA256 3cfc309a2882caf46c1853c2f3b4fb8cfafa27b36b0d9b7e296a34c4c4ad20bc SHA512 ff649ef53653e7d9fcc7688809d6a338461c9f7b904046c6eef9135cd7eed2dee075d70124d03631653fc6639651673bbb343d5fd27c8389f59df2ab2c778f5c WHIRLPOOL 05151c5c9862cfd720b3de0398b107de48fd82d8c4db2526b12f4eb058f5a68a3d0f85e11cfcec2491d1fd2070049c422d2d0903b1ffc5447d1f46b58a4e9459
+MISC ChangeLog 2506 SHA256 6b5c9a6d942b314a3519bfe91e546cafc4c2289556d68e7b9b7624421382e706 SHA512 7ce4da5562bd97d320ea583d0fc79424856cad964a729e5fee34377e806082ef20b683a27071b1b0ad645ef692d9d56df16f9c3d201eb70e9e17874648c1adce WHIRLPOOL 981c27fb38b4486de883adedcbc7450df341ba10c09e89e99b99d769f6354bcb0e20203d0fcded5d4fdc91285d386ef8a1953544897d9710489dda7a199a3003
+MISC ChangeLog-2015 863 SHA256 85ab76f7328d4f9e0d867d472db672468b98465ace9e48aaf75af778dfa44b9a SHA512 6f865945df8b1c0158f01f2571998bcf74e5808f10eca31267d12814a170204fbbb7cf7529d18759d804c37459fb3da06c62179a0262f9cce5000ff8d1ed5ef3 WHIRLPOOL 6bbc6d37f155cf70d06e0151ca3ade5b463946da39e42851adabfef61916e78f55eda86a9847e1aed05820f75ff3fcacc76c5e488ae437e82def2ce825d06f6e
+MISC metadata.xml 331 SHA256 4dbed543fe0abc97d3df2dd4dff39649acd3cee7d29e72e10e61dc825c02235c SHA512 7871745a798e87553a4f378e5c689df0e8e33108138731c39fdc76bb7951f15f29848a4539de3276702d6b5a6254ec974673b2bbd9219dc12ff6736b6928830b WHIRLPOOL 3945e22ccb3be324cffc8e595b0c8ab1086bea8c82f4d6f40a9d5e9f5b6b10b90da07c5c4bea55522adb57e8c5ff8994bb71a1d12b0ffd9b5c67166f2fc516a5
diff --git a/dev-python/hp3parclient/hp3parclient-2.0.0.ebuild b/dev-python/hp3parclient/hp3parclient-2.0.0.ebuild
new file mode 100644
index 000000000000..feebb28d1af2
--- /dev/null
+++ b/dev-python/hp3parclient/hp3parclient-2.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A python interface to sendfile(2) system call"
+HOMEPAGE="http://packages.python.org/hp3parclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND=">=dev-python/httplib2-0.6.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/nose-testconfig[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Instructions on running tests are utter nonsense.  Tried and gave up
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( samples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/hp3parclient/hp3parclient-3.0.0.ebuild b/dev-python/hp3parclient/hp3parclient-3.0.0.ebuild
new file mode 100644
index 000000000000..26f2dff89169
--- /dev/null
+++ b/dev-python/hp3parclient/hp3parclient-3.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A python interface to sendfile(2) system call"
+HOMEPAGE="http://packages.python.org/hp3parclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND=">=dev-python/httplib2-0.6.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		test? ( dev-python/werkzeug[${PYTHON_USEDEP}]
+				dev-python/nose-testconfig[${PYTHON_USEDEP}]
+				dev-python/nose[${PYTHON_USEDEP}] )
+		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Instructions on running tests are utter nonsense.  Tried and gave up
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( samples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/hp3parclient/metadata.xml b/dev-python/hp3parclient/metadata.xml
new file mode 100644
index 000000000000..1cded487a3ee
--- /dev/null
+++ b/dev-python/hp3parclient/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">hp3parclient</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
new file mode 100644
index 000000000000..b1c61f19aa7c
--- /dev/null
+++ b/dev-python/hpack/Manifest
@@ -0,0 +1,6 @@
+DIST hpack-2.3.0.tar.gz 41610 SHA256 51bd9aa8151efd190d70fe87991b1e3b79be0f93f0e34088fba2a8d34877a0a9 SHA512 a3d13da105482bb258ee3a2314b2629215028777f84127f71359f08819c96af088a3952bb0a74435472035d10ee6e3943cdad689a28f04cbc12cddcc4af9a8a7 WHIRLPOOL 8f47b6c2a78f915b009c35ecefa517486c27eb45f0b99834718152e14f9e934c23d52981c87b0c39af28fb9cb58d94e5eda07db2e999c37900b76b7aefd64b08
+DIST hpack-3.0.0.tar.gz 5305971 SHA256 0f8f5f92cfa59f91804eabb237d4b18895f3e200e282c41cedf6cd11a4416daa SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6 WHIRLPOOL 3252253a9f489d5bf4bc8ef243f576c99f5fa9a49d2767ca1e7f59ba15da1e00de3b083e6e64f69bb8c3c32bf27b177aaaad94b3cf1aba1c726d473d7b062403
+EBUILD hpack-2.3.0-r1.ebuild 1037 SHA256 54895f4391112a042e43e26d91f1d55d4194014d76132ceafda288b7a33e696d SHA512 f44d46b46f3cb4ef53e416b3d141fc3db00b304d5b79867848db10e8b0389f1a53b44464b782d360a7294c6d307cc9701e2c7799d16ad800c5e201a2909abe35 WHIRLPOOL 59e3ba9f8df693859fec946451069f1d0b710c92208e99b87255b26d69a4b37b293bdcc0c4016c8c98c0445c82a4744fa92889e0204e119b6320fc2287b3b7ea
+EBUILD hpack-3.0.0.ebuild 1077 SHA256 f9f6031f81ee5cb4636ca25e78dfc24f2eae5061a655be20bf89014eb33ad69c SHA512 2ce9835a2aa1f3eabf15f320ca34164f4007a3ba92ae7e316131bb5ef850f7d8814c3dd257466e32416a235fe9c8f65fd074241c8142954817f262b6bb30aa4e WHIRLPOOL 07ec571e523b8451c822d2822ed8438c1fd59f99bc5c4c26f4b04360e330638cbb3180978baacbf4a6277872b7d47b19730a474ed95d813e995621db959c86d5
+MISC ChangeLog 523 SHA256 f001fd94530baa2f45994b34c7612a68954b1a95826d1dba5629c2abf8f7a9d3 SHA512 cd250280a0008dbbe71f978165c7bce670c71e69177876fb64e87267726760dba4ef42debb3acfc51921d116d37462eb417f2455758158cc448bfeb110d5e5ea WHIRLPOOL 9714e0c8ffe42e81e7dd2c8131034963c143dbef8a4b739fa223d2ac58a6258c254d7881d4e885c0d76f937ee70108037b0a10c39d9858bd0314e0d651c496d3
+MISC metadata.xml 803 SHA256 1c1a3736c451f7ebceedc758010cd28721c9bfd0334f461da7c2026b0005eaf3 SHA512 b8ac20ddf96244080d349be25143b5fda799e158b16363aa23bc8b628e241fe7c8a32f8f281c91f56c80a7a91130640d922112f565c7dba470062ce97db528ee WHIRLPOOL 81c63dcf91a8f38a14015f5dcd5ca83997655ddfa73c831e27af1d0e0d8a63b7d76266c1c32546ddb4652bfdb1a1978f0ccc7914cb2b9eaf6d40971b4e873ed6
diff --git a/dev-python/hpack/hpack-2.3.0-r1.ebuild b/dev-python/hpack/hpack-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..cb4eb89e1531
--- /dev/null
+++ b/dev-python/hpack/hpack-2.3.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python HPACK header compression"
+HOMEPAGE="https://python-hyper.org/hpack/en/latest/ https://pypi.python.org/pypi/hpack"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-2.9.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.14.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Remove a test that is not part of the mainstream tests
+	# Also, it's data directory is not included in the release
+	rm test/test_hpack_integration.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \
+		py.test -v hpack test/|| die
+	cd test
+}
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
new file mode 100644
index 000000000000..f4c42fd21be9
--- /dev/null
+++ b/dev-python/hpack/hpack-3.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python HPACK header compression"
+HOMEPAGE="https://python-hyper.org/hpack/en/latest/ https://pypi.python.org/pypi/hpack"
+SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-2.9.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.14.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Remove a test that is not part of the mainstream tests
+	# Also, it's data directory is not included in the release
+	rm test/test_hpack_integration.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \
+		py.test -v hpack test/|| die
+	cd test
+}
diff --git a/dev-python/hpack/metadata.xml b/dev-python/hpack/metadata.xml
new file mode 100644
index 000000000000..69a604fdc475
--- /dev/null
+++ b/dev-python/hpack/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>cory@lukasa.co.uk</email>
+			<name>Cory Benfield</name>
+		</maintainer>
+		<remote-id type="pypi">hpack</remote-id>
+	</upstream>
+	<longdescription>This module contains a pure-Python HTTP/2 header encoding
+		(HPACK) logic for use in Python programs that implement HTTP/2. It
+		also contains a compatibility layer that automatically enables the use
+		of nghttp2 if it’s available.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/html2text/Manifest b/dev-python/html2text/Manifest
new file mode 100644
index 000000000000..13170fa656d1
--- /dev/null
+++ b/dev-python/html2text/Manifest
@@ -0,0 +1,9 @@
+DIST html2text-2016.5.29.tar.gz 46879 SHA256 7f59fb29083a7819063b227c24a8dd5e25aeef74b68bf2318a68cc1e3e653add SHA512 58b71fda6ea6fd1a71dec757c91cf342265a2c89ff5c45e752436068419fb6c1faa1ca0d5a6baafaaa60186a85aefdd840989177ce30e55bcda1c6209fc375be WHIRLPOOL 23f8625952dbd3543687976fa2595a0859d18376e716e83848aec29f7f704e40c71142c3d01bdcbdc8f8542b1e03a5ee695da40d4b6b9d436108a10b1ad57456
+DIST html2text-2016.9.19.tar.gz 48003 SHA256 21c0237fae4f640eef53343a2965f44bfd907f0e1b956cd1171fb3884541767a SHA512 bfa7d051e49bea592413bc6e335aad34f6b10d3e718170e709dd9d4bb55cc26b7da4c3f64f512022efe41df80a1157b542ab2ca897612b702f9285cef3b44f40 WHIRLPOOL 7b39ab2351d057aa82b63cef0bcce71bb8d2ac053a940b01e9dcfb6ff4909d5cfb79ee52ebd6cd6f2998785808e9a925107c1f9cc7b3d4a2ea5aacd180af2f8c
+DIST html2text-2017.10.4.tar.gz 50527 SHA256 e32553658cfe504db084a98ccc11758727107acc4c12c5fe464f6a8cdccc938f SHA512 c7f9b765572b5eac72837aa757f0be07df0270b49f9b3a3ec8c3c65ff929505166b0510c106116ffdca484b56120b6c162f86b600d88a5a35e86d06cd6b6fa19 WHIRLPOOL d31adbec5475afb3955173d4ea90a877d21e79611c60fd6609015291e999165e78ea3191c222ea4ce4df2d0a959e85aa6ed05b2e86b8cbf945889fc71eb2064c
+EBUILD html2text-2016.5.29.ebuild 959 SHA256 070740ce5fb6b373ae47db7e6d21ceade9de63cbb39aa1b12c7d179519cda3a0 SHA512 758d2bfc792069c5ee9ed436f81861e9173e39865e0ab3c8ffe74d78a4c7cac983772177ae6e11103e073dfd86389a34243e97bf8310694a592b1cb32bb1dae5 WHIRLPOOL 32039d23226bf7b0145f078d8bbc5eb837fef145a961e14138b32b18e3fcf2829f5e8fc7e264ce48895405af9ef83963429b3b7fe1fb72e71e35a17d1cb0d00e
+EBUILD html2text-2016.9.19.ebuild 968 SHA256 40f2dc77db569166742dd53b94622c43f8be2e0c700643f2b5125e1cc99ab28d SHA512 ea760f8673819ca00a85e7283b71e4acc43b3024f6b4a87b8f8640ebc44fd210a5dfbf838aaea1892abba40d830c52199d92b91e6207da90fb23885a5d9defd2 WHIRLPOOL 5667439be91362cb6b1e37aec0e48382c42d96f51476f31a8d08c96ae8d70f9adcec9d3f53d4982489498751ac3c4bf744db07eb74dd6d8650428ace16f7f69d
+EBUILD html2text-2017.10.4.ebuild 932 SHA256 f4012ef02054e6f96cd13c2018a3350137ff19f505e9522d13e625d8e4fe2329 SHA512 3e4e0ded8806868b1af581dcf21d5eb74427b774a729cc39b955307ac59d6b8c107d63a429df6ded169c89e21a53f173ecc2f800a9c2544992c2a2e1ac297168 WHIRLPOOL 1b254713b00d72ea24da66c83f3ad56ca017252d310232e2866da1162f7429ba83da2cdf4d9560511895debb26aa1d0c58f10b6856c8303e121591012bdc9816
+MISC ChangeLog 2979 SHA256 4cbdd6878688bd3ceff8ba069435cb5c0e432ff497cae16ee98625423dff4e8f SHA512 945e781a7f6dd8028b13c57dc6d041d9d30c25a0b814ca9eb71bf8eeff8199bee716cbd7f40d77a966a82d6337d860c680872b68f28a60252e30500f04a63088 WHIRLPOOL d42569ee583d258ace02640ccd28cab3ff48d7d254236b46a466ee0b92e4ee897cee3f0ff95c3ec02f329a3a9fcc9e1656a0a097118019ee9cd060d99b96062c
+MISC ChangeLog-2015 3729 SHA256 1fe64b99dd209868dbd842ccc566d612f266ccdc4fe4d97958e97b97bde74ce1 SHA512 665d86372f26ea40f2f036b604f4ba9acbf5b9c65ac5c33286e291ba43c956b83a49c22292133ba7bbe1831cd80c2a2163c9ce7e47ad2562b88c3a2622fdc9b5 WHIRLPOOL 334fe612ac061e444d020b86d3202841a04fd027d1ccaaab2a2e371c58c4aefa3f12464b231c620ee57a9ebd51979dea9e35e578ecb8ac7e8d30d3eb635e9f42
+MISC metadata.xml 332 SHA256 36f8b7955f70a6065e3675055f4d9a49af4a00d097faf76e565c47e4e07f31d9 SHA512 2fea207556f26e64296d5804463e561410aff69312cf947dfb2eceee8c664980d86cbdb6b062a0457953e16018cb0304771311a3313056efe0183a85c8b2d5fc WHIRLPOOL e1761d62536baba601e7b6cb0cd76a51d40952dabb7dee90b79111fdd6c00ff08cd5efd760615725c1a42960056bc7c8597694809af0ae0eca1ac64b2fe3211b
diff --git a/dev-python/html2text/html2text-2016.5.29.ebuild b/dev-python/html2text/html2text-2016.5.29.ebuild
new file mode 100644
index 000000000000..46ddcd0140a1
--- /dev/null
+++ b/dev-python/html2text/html2text-2016.5.29.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
+HOMEPAGE="https://github.com/html2text/html2text
+	https://github.com/Alir3z4/html2text https://pypi.python.org/pypi/html2text"
+SRC_URI="https://github.com/Alir3z4/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+
+DOCS=( AUTHORS.rst ChangeLog.rst README.md )
+
+src_prepare() {
+	default
+
+	# naming conflict with app-text/html2text, bug 421647
+	sed -i 's/html2text=html2text.cli:main/py\0/' setup.py || die
+}
+
+python_test() {
+	"${PYTHON}" test/test_html2text.py -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/html2text/html2text-2016.9.19.ebuild b/dev-python/html2text/html2text-2016.9.19.ebuild
new file mode 100644
index 000000000000..6e7cf55e98d4
--- /dev/null
+++ b/dev-python/html2text/html2text-2016.9.19.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
+HOMEPAGE="https://github.com/html2text/html2text
+	https://github.com/Alir3z4/html2text https://pypi.python.org/pypi/html2text"
+SRC_URI="https://github.com/Alir3z4/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+
+DOCS=( AUTHORS.rst ChangeLog.rst README.md )
+
+src_prepare() {
+	default
+
+	# naming conflict with app-text/html2text, bug 421647
+	sed -i 's/html2text=html2text.cli:main/py\0/' setup.py || die
+}
+
+python_test() {
+	"${PYTHON}" test/test_html2text.py -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/html2text/html2text-2017.10.4.ebuild b/dev-python/html2text/html2text-2017.10.4.ebuild
new file mode 100644
index 000000000000..9eee8c70ea91
--- /dev/null
+++ b/dev-python/html2text/html2text-2017.10.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
+HOMEPAGE="https://github.com/Alir3z4/html2text https://pypi.python.org/pypi/html2text"
+SRC_URI="https://github.com/Alir3z4/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+
+DOCS=( AUTHORS.rst ChangeLog.rst README.md )
+
+src_prepare() {
+	default
+
+	# naming conflict with app-text/html2text, bug 421647
+	sed -i 's/html2text=html2text.cli:main/py\0/' setup.py || die
+}
+
+python_test() {
+	"${PYTHON}" test/test_html2text.py -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/html2text/metadata.xml b/dev-python/html2text/metadata.xml
new file mode 100644
index 000000000000..3f2858f880fc
--- /dev/null
+++ b/dev-python/html2text/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">Alir3z4/html2text</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/html5-parser/Manifest b/dev-python/html5-parser/Manifest
new file mode 100644
index 000000000000..9f0ede7f5a5d
--- /dev/null
+++ b/dev-python/html5-parser/Manifest
@@ -0,0 +1,3 @@
+DIST html5-parser-0.4.4.tar.gz 267787 SHA256 b9f3a1d4cdb8742e8e4ecafab04bff541bde4ff09af233293ed0b94028ec1ab5 SHA512 3aaeb32f360d2c131ecbe11fa1dcd3dfcd62c9ca046fce7dd4ff8127d0e62216f666e83bb20c7809c6adc591e1fb2798e382e78a1cf6129b1f0a09a71377f8d4 WHIRLPOOL 924f71b373075fe9e103b961efbeb00347b007cbaf8aa6a3a03a2af22a6cdecdb2e2d6cb67aa8a75e02b660f93f5f84a7b56bb7f8bb30af7846faa80c9ae566e
+EBUILD html5-parser-0.4.4.ebuild 632 SHA256 d30437a706372c627d11f5ebf47ba57afbf1114327158c83d20913e8657ca597 SHA512 eeb52856f162e237ddf4a6c117188ac471f8abc3774b77fe589809e988fdeaa391c598fbe381cf7ef27b545c0b91db8bac42eacffc9fc613f0f93885a81ffcb3 WHIRLPOOL 809773ec4c238247feca08b99bf988eebdcdc9ef8c3aff6b9b80a035547d32cb27b96ee7ea970f3dabae88519bb4c21cc39002f99a5fe55ff88fee1cafc6755b
+MISC metadata.xml 356 SHA256 737c67ee6a44b79afc6e7c18921572a80d623313a57732d3bc8fc6f3533bfd71 SHA512 3452ea432c8187cf09b7ce3b70df1c951ae243c153300093583efc337d9f6c42c41082b34ff6a81c19337ef508c90cff4308d0da63a44f4976d11ff57779baca WHIRLPOOL ea63b7a89ae055b2dd032d8b843f477dfb107a0467968b5666129e9cb6153d6ead74e5d2b9f9cb3b34179a508f49aa41cdde29e71ef43c4d3a57a62f4cd44ccd
diff --git a/dev-python/html5-parser/html5-parser-0.4.4.ebuild b/dev-python/html5-parser/html5-parser-0.4.4.ebuild
new file mode 100644
index 000000000000..638a6fe3e5b1
--- /dev/null
+++ b/dev-python/html5-parser/html5-parser-0.4.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast C based HTML 5 parsing for python"
+HOMEPAGE="https://github.com/kovidgoyal/html5-parser/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libxml2:=
+	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/html5-parser/metadata.xml b/dev-python/html5-parser/metadata.xml
new file mode 100644
index 000000000000..ab943e8204c5
--- /dev/null
+++ b/dev-python/html5-parser/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">html5-parser</remote-id>
+		<remote-id type="github">kovidgoyal/html5-parser</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest
new file mode 100644
index 000000000000..e67e71e14472
--- /dev/null
+++ b/dev-python/html5lib/Manifest
@@ -0,0 +1,10 @@
+AUX html5lib-0.9999999-lxml-3.5.0-backport.patch 4654 SHA256 c93abd685ee6454100482b1f0a095b05581c5e86f0542aa3bef1d55ed789e3c4 SHA512 bcaddd8dfd71c943b472028b7c21cf913d58e6093d5f15fc280597d3d01e8a7d96a27f976e5b94b6289d0ea6ed4756abaf1bc382a4c48b95c65aedd2992aed05 WHIRLPOOL 2be2e23b075ede2239aa772142af97f85959838c3a75e8aabf391e50624b506ef4ef72076ec9582287b49130feef3e06767ec2542d6f8cccecef61dacc9c5288
+AUX html5lib-0.9999999-python3.6-sanitizer-re.patch 2591 SHA256 3dad183ba2e5501b0910e0132bf32f1bc047e7c3ad809c6cd9645fa7e60bb464 SHA512 c95e2a4a4f1fd1e376a6af7710c6ed94747e54de8d1f1c6233f56405405011c2f9fcebb93e5dfd19589148387a62abe856e7d55b0d0014ca931b337e825c35ce WHIRLPOOL 339422a77c001775fe9c2ce0964104b81d36fe0f6a5e80109f2f0d7ee7bb038002347ac88a2600d8b98cc2e27e3f6b6342bf6d4288a43a8b41812070147b4ffe
+DIST html5lib-0.9999999.tar.gz 889312 SHA256 2612a191a8d5842bfa057e41ba50bbb9dcb722419d2408c78cff4758d0754868 SHA512 1748a1921f4bc93b7f208d89701eeabfe507e40515dd2e88ece239ba7c1704c8ae9dc4eea310164c7b207225dce910f78a8b34f826f4f87a2992365c07089c28 WHIRLPOOL 48dbd278e247e98e2765e7da1ce99474fba241b0a6b70e441899271b0cffffca33720646a35ae724713be5ce5a15617d611ebd76c192755e72485d09d446f5ac
+DIST html5lib-0.999999999.tar.gz 245488 SHA256 ee747c0ffd3028d2722061936b5c65ee4fe13c8e4613519b4447123fc4546298 SHA512 b30d9ea74d0ad03e07ebee0d33caefeed717e6084f2ef44559ebf73948563ffd60e40c774e23c8964a32b0f265d1d1f0b98759861acaa208f28e5ab2813c3ca0 WHIRLPOOL 369e81d83d03636b34901277f53e80373f54ecc15ae948d4a4f04554cd78815b6574759835d76e3105028803e6797a92144a1346e7c826a72269239dc5d105ee
+EBUILD html5lib-0.9999999-r2.ebuild 927 SHA256 ebd6a38a450ac0c223ad02ebd63eb0c8d872bca9ef1b6d4dcead0b186cc320b3 SHA512 adb8a68a96e5d785dfb9490209f0c54e549a322eabc62f8887021754dee30de5df6bcfbb060220d6cf483ac9ad2a1fc9c77db4beaf794f1c1404d0d039e1c716 WHIRLPOOL d8aa600eed1780523774dc3c7b8479b98600efde953908a4a50bc257fe600c37c1fb7ffc0af3c4c584c745c0a97c63670967c466457a686db5d0d858d7ad6ad8
+EBUILD html5lib-0.9999999.ebuild 1095 SHA256 5881d605639d95cac57786ee63cebb1b93f21410317092db39f924286d080dc2 SHA512 a556b56261fda05dce6005e0e8fc9fb58fcc3de79ceef34db2ef4209ca1b8294b7dd4aeb8dc055831de9635e452467d0ed27ebccdfc938f83835d4230ef5e0f0 WHIRLPOOL 650c8ac17e8c3125707936205d5e16caf82047919cb20eb3e9d0b38e31fa3d21728f19f7077856bb51b19edb4f8cdec8003e7857e8f14944a2f46fd0e2303805
+EBUILD html5lib-0.999999999.ebuild 865 SHA256 c8bb362ba1f5220b9fbc3352eed06d88a0ae98ab3992ff5c6872dc2ff93e86f5 SHA512 2b096eb600834fdd5a301548e2e86a8fba9ce993d86b6a9d241d6b48ba6c98ae3b73483705bfff8e17be614b569ab35990c7c89d1ed517f81e3951c7c775f6b6 WHIRLPOOL 9bc5c36dbac107538b0a355dddba6fe588620e0a9e04f32da2629c4ee9850170b44db8590d212563927b17e71ff319ba37c02ef33e5e64b46e1e9a37f09b1011
+MISC ChangeLog 6481 SHA256 83ff0832d1526d6ff37cacf96cab2582fdb8586cd2f9b85c0c60c0e853d009b9 SHA512 1129ccbae3e81a94a1c18e0fa04d8428be1558e12d800587973c337665bf07d63eecbfb11c88db33615884f9486523716947e30d6d05d3b0359f8125792bb72d WHIRLPOOL 311815008f7961868e187fa2596734957238b32b800880c76eb08c0ec36097ebbc01a0ddb1d4f33de49008a79ceb3e69543b81bceab3e4b280890cad1da9d43f
+MISC ChangeLog-2015 6235 SHA256 63019b29710baea895a82cc7ca2c5d5a645b897d9c373db0e2d55ad8b5bbc92c SHA512 adc85d838edfe98374118868d31c405b36a2b3ab76ff07b4afb078ff952498e37140c2848bae72dee1b0ae6069c22c0c94a3da3429178b50788f0833959edcae WHIRLPOOL cacc2d9e9bde8ab8b4da407aa9b4b48b309fce8aa336277b3e94357c55be8f602b15b5aebb97af471880d401ad11390c19911b61d02cf17476a30cb4f760eedb
+MISC metadata.xml 589 SHA256 78e9ccc2c370cbac692bbf3f71fb54029f84fe6c81539fc896f480e6bad36053 SHA512 b619c0adb0c781b00e656b1027465ec19d1ab7d0792475f197ab4164cb8a1c26563dcf48d147e346637789c8ec1603afaea428357c1022c42e22b85967e1694a WHIRLPOOL b3f5cbf79934926f7b8d0ee89480ba963f91a11bcc550c9be9547099f42588a188a8760073abf6916c54bc68df6147fed2d72af758a1d91e48a54cd996ab0e19
diff --git a/dev-python/html5lib/files/html5lib-0.9999999-lxml-3.5.0-backport.patch b/dev-python/html5lib/files/html5lib-0.9999999-lxml-3.5.0-backport.patch
new file mode 100644
index 000000000000..fecfab9a4fb4
--- /dev/null
+++ b/dev-python/html5lib/files/html5lib-0.9999999-lxml-3.5.0-backport.patch
@@ -0,0 +1,117 @@
+From 46046c0f7125911ff8205f09a7574573bb953105 Mon Sep 17 00:00:00 2001
+From: Geoffrey Sneddon <geoffers@gmail.com>
+Date: Mon, 23 Nov 2015 15:17:07 +0000
+Subject: [PATCH 1/3] Make lxml tree-builder coerce comments to work with lxml
+ 3.5.
+
+---
+ html5lib/ihatexml.py                | 2 ++
+ html5lib/treebuilders/etree_lxml.py | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/html5lib/ihatexml.py b/html5lib/ihatexml.py
+index 0fc7930..b5b2e98 100644
+--- a/html5lib/ihatexml.py
++++ b/html5lib/ihatexml.py
+@@ -225,6 +225,8 @@ def coerceComment(self, data):
+             while "--" in data:
+                 warnings.warn("Comments cannot contain adjacent dashes", DataLossWarning)
+                 data = data.replace("--", "- -")
++            if data.endswith("-"):
++                data += " "
+         return data
+ 
+     def coerceCharacters(self, data):
+diff --git a/html5lib/treebuilders/etree_lxml.py b/html5lib/treebuilders/etree_lxml.py
+index 35d08ef..17007e3 100644
+--- a/html5lib/treebuilders/etree_lxml.py
++++ b/html5lib/treebuilders/etree_lxml.py
+@@ -189,7 +189,7 @@ class TreeBuilder(_base.TreeBuilder):
+ 
+     def __init__(self, namespaceHTMLElements, fullTree=False):
+         builder = etree_builders.getETreeModule(etree, fullTree=fullTree)
+-        infosetFilter = self.infosetFilter = ihatexml.InfosetFilter()
++        infosetFilter = self.infosetFilter = ihatexml.InfosetFilter(preventDoubleDashComments=True)
+         self.namespaceHTMLElements = namespaceHTMLElements
+ 
+         class Attributes(dict):
+
+From 1c22e1ce93dd4acc81a66cfa03cf9720fbd741c7 Mon Sep 17 00:00:00 2001
+From: Geoffrey Sneddon <geoffers@gmail.com>
+Date: Mon, 23 Nov 2015 15:35:21 +0000
+Subject: [PATCH 2/3] fixup! Make lxml tree-builder coerce comments to work
+ with lxml 3.5.
+
+---
+ html5lib/ihatexml.py                | 1 +
+ html5lib/treebuilders/etree_lxml.py | 7 ++++---
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/html5lib/ihatexml.py b/html5lib/ihatexml.py
+index b5b2e98..5a81a12 100644
+--- a/html5lib/ihatexml.py
++++ b/html5lib/ihatexml.py
+@@ -226,6 +226,7 @@ def coerceComment(self, data):
+                 warnings.warn("Comments cannot contain adjacent dashes", DataLossWarning)
+                 data = data.replace("--", "- -")
+             if data.endswith("-"):
++                warnings.warn("Comments cannot contain end in a dash", DataLossWarning)
+                 data += " "
+         return data
+ 
+diff --git a/html5lib/treebuilders/etree_lxml.py b/html5lib/treebuilders/etree_lxml.py
+index 17007e3..c6c981f 100644
+--- a/html5lib/treebuilders/etree_lxml.py
++++ b/html5lib/treebuilders/etree_lxml.py
+@@ -54,7 +54,7 @@ def _getChildNodes(self):
+ def testSerializer(element):
+     rv = []
+     finalText = None
+-    infosetFilter = ihatexml.InfosetFilter()
++    infosetFilter = ihatexml.InfosetFilter(preventDoubleDashComments=True)
+ 
+     def serializeElement(element, indent=0):
+         if not hasattr(element, "tag"):
+@@ -257,7 +257,7 @@ def _getData(self):
+             data = property(_getData, _setData)
+ 
+         self.elementClass = Element
+-        self.commentClass = builder.Comment
++        self.commentClass = Comment
+         # self.fragmentClass = builder.DocumentFragment
+         _base.TreeBuilder.__init__(self, namespaceHTMLElements)
+ 
+@@ -344,7 +344,8 @@ def insertRoot(self, token):
+ 
+         # Append the initial comments:
+         for comment_token in self.initial_comments:
+-            root.addprevious(etree.Comment(comment_token["data"]))
++            comment = self.commentClass(comment_token["data"])
++            root.addprevious(comment._element)
+ 
+         # Create the root document and add the ElementTree to it
+         self.document = self.documentClass()
+
+From 235a6d7ac7e0a3e2b431766e051094c2d3110ba3 Mon Sep 17 00:00:00 2001
+From: Geoffrey Sneddon <geoffers@gmail.com>
+Date: Mon, 23 Nov 2015 15:42:12 +0000
+Subject: [PATCH 3/3] fixup! Make lxml tree-builder coerce comments to work
+ with lxml 3.5.
+
+---
+ html5lib/ihatexml.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/html5lib/ihatexml.py b/html5lib/ihatexml.py
+index 5a81a12..5da5d93 100644
+--- a/html5lib/ihatexml.py
++++ b/html5lib/ihatexml.py
+@@ -226,7 +226,7 @@ def coerceComment(self, data):
+                 warnings.warn("Comments cannot contain adjacent dashes", DataLossWarning)
+                 data = data.replace("--", "- -")
+             if data.endswith("-"):
+-                warnings.warn("Comments cannot contain end in a dash", DataLossWarning)
++                warnings.warn("Comments cannot end in a dash", DataLossWarning)
+                 data += " "
+         return data
+ 
diff --git a/dev-python/html5lib/files/html5lib-0.9999999-python3.6-sanitizer-re.patch b/dev-python/html5lib/files/html5lib-0.9999999-python3.6-sanitizer-re.patch
new file mode 100644
index 000000000000..2fbef2ad0b9e
--- /dev/null
+++ b/dev-python/html5lib/files/html5lib-0.9999999-python3.6-sanitizer-re.patch
@@ -0,0 +1,50 @@
+--- a/html5lib/sanitizer.py
++++ b/html5lib/sanitizer.py
+@@ -203,7 +203,7 @@
+             for attr in self.attr_val_is_uri:
+                 if attr not in attrs:
+                     continue
+-                val_unescaped = re.sub("[`\000-\040\177-\240\s]+", '',
++                val_unescaped = re.sub("[`\x00-\x20\x7f-\xa0\\s]+", '',
+                                        unescape(attrs[attr])).lower()
+                 # remove replacement characters from unescaped characters
+                 val_unescaped = val_unescaped.replace("\ufffd", "")
+@@ -228,7 +228,7 @@
+                                          ' ',
+                                          unescape(attrs[attr]))
+             if (token["name"] in self.svg_allow_local_href and
+-                'xlink:href' in attrs and re.search('^\s*[^#\s].*',
++                'xlink:href' in attrs and re.search(r'^\s*[^#\s].*',
+                                                     attrs['xlink:href'])):
+                 del attrs['xlink:href']
+             if 'style' in attrs:
+@@ -257,16 +257,16 @@
+ 
+     def sanitize_css(self, style):
+         # disallow urls
+-        style = re.compile('url\s*\(\s*[^\s)]+?\s*\)\s*').sub(' ', style)
++        style = re.compile(r'url\s*\(\s*[^\s)]+?\s*\)\s*').sub(' ', style)
+ 
+         # gauntlet
+-        if not re.match("""^([:,;#%.\sa-zA-Z0-9!]|\w-\w|'[\s\w]+'|"[\s\w]+"|\([\d,\s]+\))*$""", style):
++        if not re.match(r"""^([:,;#%.\sa-zA-Z0-9!]|\w-\w|'[\s\w]+'|"[\s\w]+"|\([\d,\s]+\))*$""", style):
+             return ''
+-        if not re.match("^\s*([-\w]+\s*:[^:;]*(;\s*|$))*$", style):
++        if not re.match(r"^\s*([-\w]+\s*:[^:;]*(;\s*|$))*$", style):
+             return ''
+ 
+         clean = []
+-        for prop, value in re.findall("([-\w]+)\s*:\s*([^:;]*)", style):
++        for prop, value in re.findall(r"([-\w]+)\s*:\s*([^:;]*)", style):
+             if not value:
+                 continue
+             if prop.lower() in self.allowed_css_properties:
+@@ -275,7 +275,7 @@
+                                                 'padding']:
+                 for keyword in value.split():
+                     if keyword not in self.acceptable_css_keywords and \
+-                            not re.match("^(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$", keyword):
++                            not re.match(r"^(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$", keyword):
+                         break
+                 else:
+                     clean.append(prop + ': ' + value + ';')
diff --git a/dev-python/html5lib/html5lib-0.9999999-r2.ebuild b/dev-python/html5lib/html5lib-0.9999999-r2.ebuild
new file mode 100644
index 000000000000..5b23d984fc3e
--- /dev/null
+++ b/dev-python/html5lib/html5lib-0.9999999-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTML parser based on the HTML5 specification"
+HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-lxml-3.5.0-backport.patch
+	"${FILESDIR}"/${P}-python3.6-sanitizer-re.patch
+)
+
+python_test() {
+	nosetests --verbosity=3 || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/html5lib/html5lib-0.9999999.ebuild b/dev-python/html5lib/html5lib-0.9999999.ebuild
new file mode 100644
index 000000000000..75af49a9d1ce
--- /dev/null
+++ b/dev-python/html5lib/html5lib-0.9999999.ebuild
@@ -0,0 +1,33 @@
+# 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 pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTML parser based on the HTML5 specification"
+HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	# https://github.com/html5lib/html5lib-python/issues/224
+	# https://bugs.gentoo.org/show_bug.cgi?id=571644
+	has_version =dev-python/lxml-3.5.0 && \
+		einfo "test are broken with dev-python/lxml-3.5.0" && \
+		einfo "https://github.com/html5lib/html5lib-python/issues/224" && \
+		return
+	nosetests --verbosity=3 || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/html5lib/html5lib-0.999999999.ebuild b/dev-python/html5lib/html5lib-0.999999999.ebuild
new file mode 100644
index 000000000000..7e238cc4804a
--- /dev/null
+++ b/dev-python/html5lib/html5lib-0.999999999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTML parser based on the HTML5 specification"
+HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/webencodings[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-expect[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/html5lib/metadata.xml b/dev-python/html5lib/metadata.xml
new file mode 100644
index 000000000000..a9695174a877
--- /dev/null
+++ b/dev-python/html5lib/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+  html5lib is a pure-python library for parsing HTML. It is designed
+  to conform to the WHATWG HTML specification, as is implemented by
+  all major web browsers.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">html5lib</remote-id>
+    <remote-id type="github">html5lib/html5lib-python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/htmlgen/Manifest b/dev-python/htmlgen/Manifest
new file mode 100644
index 000000000000..0ffc37ef37ee
--- /dev/null
+++ b/dev-python/htmlgen/Manifest
@@ -0,0 +1,7 @@
+AUX htmlgen-2.2.2-python-2.5.patch 5226 SHA256 68e4ab27bcdee920df71143b6897635b9619100b2fca4c3eff59ae159f84eea6 SHA512 340cc8603aa112b82a366b820691a49be62713d5d3611944d842b5170b7a267259dc8af75fedf30cbb8af9c514cc8f102caeca9e106a7afa8f154f0601b9d947 WHIRLPOOL b178aef91565bb9361a7ea3927ea00adf4b0bd72dd7bafd4049eb443c95527035e7702ac40b728713cdecba3e6e24f64505d2358c0428221c15f0355e6e17772
+AUX htmlgen-pillow.patch 1621 SHA256 fb4af0a73f648326f315d07250525716b940971058782a51e6810269fc872318 SHA512 160896ecbac5135730ba06765d108e223f56b7fdc38595ff3a575639a7562e2259afad37ff3ada3633437ac01596501c044fc1a0438cd5a24a66ada98f41926f WHIRLPOOL dee3273d902947a5651f5008cd08546f608f36f891571ccae010ab33894fe0cb301247f311b9485ce3f60d921eb9ac158ecaae54e96d23ba0abb18e75c3c4336
+DIST HTMLgen.tgz 316415 SHA256 f3b39b4b07b5dd318780ad0e9b8b3c524a54138537697dd7966223f314d2177d SHA512 8301d4a28c29f477f07eedee2bffd6d07e345f08c056402098fa966f0e61895ed4dea60b653793b30d8457a7d692e3af772514d86ae440950fd52719bbadf942 WHIRLPOOL c3cef973b39a893026050a969cf1d433a18916a0340667436ce53b7dfc19d643809e48feaa3985faf6dc392f3c84c53c04f98b9e8a0c2773c4bb6c8f0131dd72
+EBUILD htmlgen-2.2.2-r1.ebuild 1510 SHA256 cb433c9efac065153cec8a9c62e253f35ccfa8b9073ce0e0e965655815cca725 SHA512 e869760d9711a89805fc7b763b348b8fdd4b253ec74935832c459e8321012404714173dc2f735af3c1f9dbc406de4ca46faa1cb3d5c249a2b7c654cc095db872 WHIRLPOOL 6e453411fc109340ffbbba66596ed72d56083b80b819fc71da80095c515852235660753edb995edf04e5f64084d56422e3f0ff0054806fe30b95020522d5a9b6
+MISC ChangeLog 3039 SHA256 2f9eb8c0ab3bf4db1345eaeb5d6f831c3e4e30603e7a5fb54c984880d615c771 SHA512 264a1b046ccffb115aa29a091c14c9ceb996da8f62853dd1a164b1a16c497f362f4cde688d3ef4730e164186767458d091a63c1570ecbddd9d1fd014f01914e9 WHIRLPOOL 1f16b97778bf68f75ad732a343bd5219e3efd424bf96624c851e6c3845dc14f70d8d686b88fe55e8466a6f25340d7f6d4cff2d7f8087ab1588706f1005a1ac1e
+MISC ChangeLog-2015 2683 SHA256 6aee3a8dcaea77a45948cc5c6199be309de45889f98c6cccc03faed1384960e7 SHA512 bfc41a896d96300c61b2f22e085f5c541b6c46cf173970aaa71a161f72076d66125f7f69ed54230e2f3c1852a13f5c16e14ea7e69623c66fb5372894d12f4d2e WHIRLPOOL e57767a081f22d51562d84e7b68bf768a064f295f2243e93f438c78cffe55f90edeb6ae1f20f3d18401b92403f63572bae5199718af8b47e7dfb18b571cfc004
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/htmlgen/files/htmlgen-2.2.2-python-2.5.patch b/dev-python/htmlgen/files/htmlgen-2.2.2-python-2.5.patch
new file mode 100644
index 000000000000..7bdff6815011
--- /dev/null
+++ b/dev-python/htmlgen/files/htmlgen-2.2.2-python-2.5.patch
@@ -0,0 +1,145 @@
+--- HTMLcalendar.py
++++ HTMLcalendar.py
+@@ -212,12 +212,12 @@
+             return value
+         else:
+             raise TypeError, ('cannot convert to int', value)
+-import regex
+-datepat = regex.compile('^ *\([0-9*][0-9]?\)[/-]' #first 2 char date field
++import re
++datepat = re.compile('^ *\([0-9*][0-9]?\)[/-]' #first 2 char date field
+                         '\([0-9][0-9]?\)[/-]?'    #second 2 char date field
+                         '\([12][0-9][0-9][0-9]\)?[ \t]*:') #optional year field
+-daypat  = regex.compile('^ *\('+string.join(day_name,'\|')+'\)')
+-timepat = regex.compile('\([0-9][0-9]?\):\([0-9][0-9]\)')
++daypat  = re.compile('^ *\('+string.join(day_name,'\|')+'\)')
++timepat = re.compile('\([0-9][0-9]?\):\([0-9][0-9]\)')
+ 
+ def read_appt_file(filename):
+     """Parsing function.
+--- HTMLgen.py
++++ HTMLgen.py
+@@ -924,7 +924,7 @@
+     def antispam(self, address):
+         """Process a string with HTML encodings to defeat address spiders.
+         """
+-        from whrandom import choice
++        from random import choice
+         buffer = map(None, address)
+         for i in range(0, len(address), choice((2,3,4))):
+             buffer[i] = '&#%d;' % ord(buffer[i])
+--- HTMLtest.py
++++ HTMLtest.py
+@@ -2,7 +2,7 @@
+ 
+ """Test script which generates the online documentation for HTMLgen.
+ """
+-import string, regex, regsub, os, time, glob
++import string, re, re, os, time, glob
+ from HTMLcolors import *
+ from HTMLgen import *
+ import HTMLgen  #only so I can pick off the __version__
+@@ -232,11 +232,11 @@
+     doc.email = 'jefferson@montecello.virginia.gov'
+     doc.logo = ('../image/eagle21.gif', 64, 54)
+     # parse Declaration of Independence
+-    re_hline = regex.compile('^--+$')
+-    re_title = regex.compile('^Title:\(.*$\)')
++    re_hline = re.compile('^--+$')
++    re_title = re.compile('^Title:\(.*$\)')
+     font2 = Font(size='+2')
+     s = open(os.path.join(datadir, 'DoI.txt')).read()
+-    paragraphs = regsub.split(s, '\n\([\t ]*\n\)+')
++    paragraphs = re.split(s, '\n\([\t ]*\n\)+')
+     for para in paragraphs:
+         if not para: continue
+         if re_title.search(para) > -1:
+@@ -263,7 +263,7 @@
+     #Ok parse that file
+     f = open(mpath(os.path.join(datadir, 'parrot.txt')))
+     line = f.readline()
+-    re_dialog = regex.compile('\(^[OC].*:\)\(.*\)')
++    re_dialog = re.compile('\(^[OC].*:\)\(.*\)')
+     while line:
+         if re_dialog.search(line) > -1:
+             role, prose = re_dialog.group(1,2)
+--- HTMLutil.py
++++ HTMLutil.py
+@@ -19,7 +19,7 @@
+ # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ # PERFORMANCE OF THIS SOFTWARE.
+ __version__ = '$Id: HTMLutil.py,v 1.3 1998/05/28 20:14:52 friedric Exp $'
+-import string, regex, os
++import string, re, os
+ import HTMLgen, HTMLcolors
+ from types import *
+ 
+@@ -79,7 +79,7 @@
+     """Determine if the text have been marked by a previous gsub.
+     (ugly hack but it works)
+     """
+-    if regex.search('\(</?FONT\)\|\(</?STRONG\)', text) > -1:
++    if re.search('\(</?FONT\)\|\(</?STRONG\)', text) > -1:
+         return 1
+     else: 
+         return 0
+@@ -125,13 +125,13 @@
+ not_backslash = "[^\\\\]"
+ triple_single = "'''"
+ triple_double = '"""'
+-_doc_start_re = regex.compile(
++_doc_start_re = re.compile(
+     "\(^\|" + not_backslash + "\)" # bol or not backslash
+     + "\(" + triple_single + "\|" + triple_double + "\)" )
+ single_re = not_backslash + triple_single
+ double_re = not_backslash + triple_double
+-_triple_re = { triple_single : regex.compile(single_re),
+-               triple_double : regex.compile(double_re) }
++_triple_re = { triple_single : re.compile(single_re),
++               triple_double : re.compile(double_re) }
+ 
+ del not_backslash, triple_single, triple_double, \
+     single_re, double_re
+@@ -150,13 +150,13 @@
+         return (None, None)
+     return startquote, quotefinder.regs[0][1]
+ 
+-string_re = regex.compile('\(\(\'[^\'\n]*\'\)\|\("[^"\n]"\)\)')
++string_re = re.compile('\(\(\'[^\'\n]*\'\)\|\("[^"\n]"\)\)')
+ def find_string_literal( s, begin=0 ):
+     if string_re.search(s, begin) > -1:
+         return string_re.regs[1]
+     return (None, None)
+ 
+-comment_re = regex.compile('#.*$')
++comment_re = re.compile('#.*$')
+ def find_comment( s, begin=0 ):
+     while comment_re.search(s, begin) > -1:
+         if been_marked(comment_re.group(0)):
+@@ -166,13 +166,13 @@
+     return (None, None)
+ 
+ Name = '[a-zA-Z_][a-zA-Z0-9_]*'
+-func_re = regex.compile('\(^[ \t]*def[ \t]+' +Name+ '\)[ \t]*(') 
++func_re = re.compile('\(^[ \t]*def[ \t]+' +Name+ '\)[ \t]*(') 
+ def find_function( s, begin=0 ):
+     if func_re.search(s, begin) > -1:
+         return func_re.regs[1]
+     return (None, None)
+ 
+-class_re = regex.compile('\(^[ \t]*class[ \t]+' +Name+ '\)[ \t]*[(:]')
++class_re = re.compile('\(^[ \t]*class[ \t]+' +Name+ '\)[ \t]*[(:]')
+ def find_class( s, begin=0 ):
+     if class_re.search(s, begin) > -1:
+         return class_re.regs[1]
+--- ImagePaletteH.py
++++ ImagePaletteH.py
+@@ -70,7 +70,7 @@
+     return ImagePalette(mode, palette * len(mode))
+ 
+ def random(mode = "RGB"):
+-    from whrandom import randint
++    from random import randint
+     palette = map(lambda a: randint(0, 255), [0]*256*len(mode))
+     return ImagePalette(mode, palette)
+ 
diff --git a/dev-python/htmlgen/files/htmlgen-pillow.patch b/dev-python/htmlgen/files/htmlgen-pillow.patch
new file mode 100644
index 000000000000..0c4f3daa27f4
--- /dev/null
+++ b/dev-python/htmlgen/files/htmlgen-pillow.patch
@@ -0,0 +1,53 @@
+Fix PIL imports for Pillow compat
+https://bugs.gentoo.org/show_bug.cgi?id=471506
+--- HTMLgen/ImageH.py	1999-04-20 22:40:28.000000000 -0400
++++ HTMLgen/ImageH.py	2013-06-08 14:00:49.261734532 -0400
+@@ -576,7 +576,7 @@
+         "Display image (for debug purposes only)"
+ 
+ 	try:
+-	    import ImageTk
++	    from PIL import ImageTk
+ 	    ImageTk._show(self, title)
+ 	    # note: caller must enter mainloop
+ 	except:
+--- HTMLgen/ImagePaletteH.py	2013-06-08 13:56:03.476318926 -0400
++++ HTMLgen/ImagePaletteH.py	2013-06-08 14:01:26.564871622 -0400
+@@ -87,7 +87,7 @@
+ 
+     if not lut:
+         try:
+-            import GimpPaletteFile
++            from PIL import GimpPaletteFile
+             fp.seek(0)
+             p = GimpPaletteFile.GimpPaletteFile(fp)
+             lut = p.getpalette()
+@@ -96,7 +96,7 @@
+ 
+     if not lut:
+         try:
+-            import GimpGradientFile
++            from PIL import GimpGradientFile
+             fp.seek(0)
+             p = GimpGradientFile.GimpGradientFile(fp)
+             lut = p.getpalette()
+@@ -105,7 +105,7 @@
+ 
+     if not lut:
+         try:
+-            import PaletteFile
++            from PIL import PaletteFile
+             fp.seek(0)
+             p = PaletteFile.PaletteFile(fp)
+             lut = p.getpalette()
+--- HTMLgen/imgsize.py	1998-05-25 13:56:37.000000000 -0400
++++ HTMLgen/imgsize.py	2013-06-08 14:01:48.731358969 -0400
+@@ -15,7 +15,7 @@
+ 
+ try: #Following switcheroo ensures that if PIL is installed it's used instead
+     # of the HTMLgen-bundled copies.
+-    import Image
++    from PIL import Image
+ except ImportError:
+     import ImageH
+     Image = ImageH
diff --git a/dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild b/dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..528d9be0955b
--- /dev/null
+++ b/dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-r1
+
+MY_P="HTMLgen"
+DESCRIPTION="HTMLgen - Python modules for the generation of HTML documents"
+HOMEPAGE="http://soc.if.usp.br/manual/python-htmlgen/html/main.html"
+SRC_URI="http://starship.python.net/crew/friedrich/${MY_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ia64 ppc x86"
+IUSE="doc"
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-python-2.5.patch"
+	epatch "${FILESDIR}/${PN}-pillow.patch"
+}
+
+src_compile() {
+	return 0
+}
+
+src_install() {
+	# doing this manually because their build scripts suck
+	local files="HTMLgen.py HTMLcolors.py HTMLutil.py HTMLcalendar.py
+	barchart.py colorcube.py imgsize.py NavLinks.py Formtools.py
+	ImageH.py ImageFileH.py ImagePaletteH.py GifImagePluginH.py
+	JpegImagePluginH.py PngImagePluginH.py"
+
+	mkdir htmlgen || die
+	touch htmlgen/__init__.py || die
+	ln ${files} htmlgen/ || die
+	python_foreach_impl python_domodule htmlgen
+
+	if use doc; then
+		# fix the image locations in the docs
+		sed -i -e "s;../image/;image/;g" html/* || die "sed failed"
+		dohtml html/*
+		dohtml -r image
+	fi
+	dodoc README
+}
+
+pkg_postinst() {
+	ewarn "htmlgen now resides in its own subdirectory"
+	ewarn "so you need to do \"from htmlgen import HTMLgen\" instead of \"import HTMLgen\""
+}
diff --git a/dev-python/htmlgen/metadata.xml b/dev-python/htmlgen/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/htmlgen/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/httmock/Manifest b/dev-python/httmock/Manifest
new file mode 100644
index 000000000000..d195b22869b4
--- /dev/null
+++ b/dev-python/httmock/Manifest
@@ -0,0 +1,11 @@
+DIST httmock-1.2.2.tar.gz 4975 SHA256 4dd4eddd8dba38c2b279c6fc7487fb92e91b1ae5d945a496bf059ea2b2aaf06c SHA512 0be8ae754bd3ae34166b0b001a44e664b07488ba6d44ed3dc518b310b82418dc5ab2f15ef13cb20909109f19c22a6e13dfdfdfa37f26f3c0688b19f2321be767 WHIRLPOOL 7d1315845e7a72975d5e0f8ae483f17b5e033a230cf020c770e804091c7a0ef5e94c4649720db3f3f5c68d2a19d7a45ab5d696118719967913e4c1ee01f9234c
+DIST httmock-1.2.3.tar.gz 5203 SHA256 030cca3f3210b902aaa28524183dc061a2ef9afd3da6a9b40ce0c09d28d50d4d SHA512 23b7295f2685639eba44714b3dadbd6eca20b7f50e636d6490d5c3f581429d84e1f4b1e15f4ba31a7ccee1596768003e68a7f1591b75aeb3d5811b279b3f1bb1 WHIRLPOOL 4eea5a2637e88309a19a05ba5788f8d53a062f0e54458d9ace1e3262affc4104c7953ebceaef52c5fdabcc5b30a520557e75ca5aaa0473159a286d3340200221
+DIST httmock-1.2.4.tar.gz 5412 SHA256 d43f56f0777f0fe8155879c8ede214c55fec56e1c948033ab507915f8d3af761 SHA512 868c38e84665d7eaeae2610d79f21d991f1ddebe72bd9d396a906f59595695199ff2c11c80318e6c246425b9acdb7a1c8b36d570ac0af04d04f4eaa4d965e01b WHIRLPOOL 1f7039840d401cc17303123ca77cc446deb7c811d9e0b861292e2bc0b810c2632efa77e4afa488f7052b553c5d620c2d99191ef48edb33e3e7d3a8fdf2d88515
+DIST httmock-1.2.5.tar.gz 5409 SHA256 d48ca51e10d1f9e273df8d13759064f7d2f0627b960897e9a67dcf5f464e8ba5 SHA512 1dc3bd506f76f2e57db5268201faeb7038b9a62873f0113590023c7b889903428fc3c796db4accf74f53cae60a258160c3698dd9cef71024183f0c6f05040b80 WHIRLPOOL d176636d763977e4059174792c9e14a2622dc6cddbf5586e72a00ecfe2dfc372d3781cec336ac22b4b3f83e6cf2e247ea9c035ee9ffba28c7036d370299144e9
+EBUILD httmock-1.2.2.ebuild 541 SHA256 7b0459939843a93023e473b10a81109b368396dca156de2246212eaae5130e52 SHA512 39368f0c06f16655c5d48c55679240a3a23da72c422c318c2c703ea739335f81fba887d0116c98c04af9be31ab4199ce7a7fb85b62368125550d59d39f7b640c WHIRLPOOL 7f3cd076f47849161f2a1565d03553f1cf489408fa0b3c45647577fa9c17abe040fc65b3158b76c034f17c3c188dfd15dc1183c64bde8351f9e951795ec72af9
+EBUILD httmock-1.2.3.ebuild 553 SHA256 56d2e0bd7cde2f4532c2451c2901a52a0d151d850b49dda4c7b90b86bcfef28e SHA512 b7b91018246ddb4718b414fdc0ef08a150d3fdea8fb2059c13815f4b37dd4c23fd7427a12994a13b868259e8ba7f3a6b7600b6b0ffc1de15fb7b20df2037f813 WHIRLPOOL 83022331c525062db0d840fe5f46906f9de2b2ef7ee3695ccd96f63b0419cc26f46e25a3ed79681558b6d536c7bf1512f125ddda5472142270ea791965f6b0cc
+EBUILD httmock-1.2.4.ebuild 545 SHA256 6f6f6f97c9186d2e282250fa5b85ba6d480849a038769d50225afda0c9f1f6e0 SHA512 059502cf827d28fb7748d884c553370341256cd0e42a5cbd0be03343fa70f728c7a34dd50f9a6b699db921460e48c88e10b82c7b74396690c691a0bf18fb2b06 WHIRLPOOL a1912541154881c84d512a62eefd8b43c0ab538a4910a586d1f77ac04710e95020cb815432704eb2e6b4b6cddbbaac75c8661e7fbd02ccfa36be89f5f8909fe8
+EBUILD httmock-1.2.5.ebuild 549 SHA256 ea42cfb38bbf92051fbd61dabd61a0e5acd733d5fde65d9ba4ca5bdee1760033 SHA512 8ecef2290ea7ed9fb96af6fd586edeaa8732d173048a75ec79785ec1c8c6e665bfc44b59b5b870552b4495395c72e714010e17701a7c8e1fdc33c9aa8969b9d9 WHIRLPOOL c08fc5deecf046da6c6263bf7f4a0dc1ddba62ad9f38003909de9c735972431c427c5f02d706de2757b0f19bbe4de9223bbc572d3d9fce3968bf5092ad86462d
+MISC ChangeLog 3277 SHA256 a51499a6e61153fe6ea44782194df8766203bd2292de185801d1212360851791 SHA512 7041025b1dd6bb381d13d7bd0529203189c9ad00c89eca9c62e7518ba0e92ee4cb9a72d76f52704f872921ce454478b6aa690a77728fc30ecd28bc703c3cb6a8 WHIRLPOOL 90818f2514cc84f38054a485688274bdf06e6bab1f777dd90636160be5ad9a6febcc26d8a30e8ba49fc5fd9a9f723966bcb5a8377fcd4db3b7ab900555b068d3
+MISC ChangeLog-2015 573 SHA256 15866c8ab22e413a2343826009898b8bb156a0dcfc239c6edd4981825585690e SHA512 2e01e487ef9f524f795197f918bd35ead8a292d08b6c165abcf0269bc0c64f69190ddd19a5ae9c0050e06a44e882266545b9cd521fa2a54b5867500cb2310352 WHIRLPOOL d13e6b29ea21e47dacb4c993558e71ea255259e21f5c10fd7c12a1e08738670b5e52302ffecbc9b8b46ef29338e0d964f2160ca45d3c6ed58742824d33d38d5b
+MISC metadata.xml 246 SHA256 3d5821c19eb4811bd90967e8e6a58994afdf24c06e32d146fffbbf8362fbad24 SHA512 8e33ef8d63dacd3d70b04a4b0f2e206148f09bb605a51e1d51d069351b498238bfd205574f45a0cd606422364e093023b8dc40bbfa3ab0afe26ba8e052df4f74 WHIRLPOOL e407d586f71972766349b3f5061294f804c54c71b545f44c0c0aeb4e761bab99188e1f0efd99c01ebfc4f6431e41ab8d1c766a603c7fff188f21b183bba04922
diff --git a/dev-python/httmock/httmock-1.2.2.ebuild b/dev-python/httmock/httmock-1.2.2.ebuild
new file mode 100644
index 000000000000..1878d487dd3b
--- /dev/null
+++ b/dev-python/httmock/httmock-1.2.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A mocking library for requests"
+HOMEPAGE="https://github.com/patrys/httmock"
+SRC_URI="https://github.com/patrys/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/httmock/httmock-1.2.3.ebuild b/dev-python/httmock/httmock-1.2.3.ebuild
new file mode 100644
index 000000000000..57a4bbeba389
--- /dev/null
+++ b/dev-python/httmock/httmock-1.2.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A mocking library for requests"
+HOMEPAGE="https://github.com/patrys/httmock"
+SRC_URI="https://github.com/patrys/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/requests-1.0.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/httmock/httmock-1.2.4.ebuild b/dev-python/httmock/httmock-1.2.4.ebuild
new file mode 100644
index 000000000000..4e2a45ca7f94
--- /dev/null
+++ b/dev-python/httmock/httmock-1.2.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A mocking library for requests"
+HOMEPAGE="https://github.com/patrys/httmock"
+SRC_URI="https://github.com/patrys/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/requests-1.0.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/httmock/httmock-1.2.5.ebuild b/dev-python/httmock/httmock-1.2.5.ebuild
new file mode 100644
index 000000000000..484df4bdec2b
--- /dev/null
+++ b/dev-python/httmock/httmock-1.2.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A mocking library for requests"
+HOMEPAGE="https://github.com/patrys/httmock"
+SRC_URI="https://github.com/patrys/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/requests-1.0.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/httmock/metadata.xml b/dev-python/httmock/metadata.xml
new file mode 100644
index 000000000000..459fa77374fb
--- /dev/null
+++ b/dev-python/httmock/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-needed -->
+	<upstream>
+		<remote-id type="github">patrys/httmock</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/http-parser/Manifest b/dev-python/http-parser/Manifest
new file mode 100644
index 000000000000..a172eeeb4025
--- /dev/null
+++ b/dev-python/http-parser/Manifest
@@ -0,0 +1,5 @@
+DIST http-parser-0.8.3.tar.gz 83040 SHA256 e2aff90a60def3e476bd71694d8757c0f95ebf2fedf0a8ae34ee306e0b20db83 SHA512 aca583d976dcf172244179cc4199336f296dbb2e2838dded23e64d55f23298fe600f9c24ba6cb6d1d5faad3022710154949fd39adecaef763f7589a58d03fbd1 WHIRLPOOL 9de8476e9fa878b5542806efb8fe1729ac6fcb04b7dcc9d084dfd9e4280fe3bee185d2fb8ae43b2d3a46eb3a1a67047a40e423d054ecb542f66bd15b35fae427
+EBUILD http-parser-0.8.3.ebuild 913 SHA256 7e1aba98443902c3c7150d497fc091bec7c72c2ab7e2481c46d841baf8a5dc7b SHA512 d032b1e2d32fd074600230a4f5ec99729feaf204923bdb66e5fc227088a25aeb7a8f972884767e0c14bb324aa5bc897a8f7be52dcf47d675b963344241bfcf4a WHIRLPOOL 07aa82dd31bd56fa41ae8b1c89682640d8786dbe2db7f7c80db28d065397443cca42618aa0ee0573cb8e5100722bac35bf4d415104852d24324ae18670a9bdf4
+MISC ChangeLog 3357 SHA256 6dab1742f5b4fbd944124cb8713c1b24a8f256c39b465af0840f80703566ed41 SHA512 18543806a4fb2abb4579653ce5c758a32c29392b707afb17eff86514a2a898742eb93777e5018d24255626bc00aa76e5b259f4c1122dce9670d8bdf549927e39 WHIRLPOOL 99b04ffb7dd4fb41d6cbe96becb203949bd739e8ef71570706b999702592ecac318fb0355fc71a74941e043015d3a5278ac7d7e34d1dea5a2120727a0df9e4e9
+MISC ChangeLog-2015 4270 SHA256 4afe378dec98fe411993e2d53f7513ade936839aa27d5dd3c9c0584e83bd091f SHA512 4686554b58d17c9b5eb74a10846e1179358aad5506298c9b7fd5b696057339d59caaebb8f37580ab001d6bc3138212646f6e52dcebdbe72207954160c90e1543 WHIRLPOOL 72479534ce8f116959bc66872c46dd22ee82f80eae2d503516e8a7bd09ea90534d090a759577bedf8da21f226dfa85fd5156450750723217d120f60d1010fab5
+MISC metadata.xml 385 SHA256 fe663d14ed077a087f8097519006a3de175b98f3eda3021cfd47eb0d4648aa28 SHA512 5b4b7b992bf4036ee076a2714bd0b91540b071fac6194ade8327e71062d7dfc5597f68934c275d72756c5ebb25e334059df4112946a1a84ab20ca0710ee16760 WHIRLPOOL ca594c7e8bb7ff966934d1831672bba1e3511e14ae5911dff9410e30f6e4c12e6f9ee936f3ff5163a34afe559c1a0148f857a6549fca5ad0a1be7fab33eb8676
diff --git a/dev-python/http-parser/http-parser-0.8.3.ebuild b/dev-python/http-parser/http-parser-0.8.3.ebuild
new file mode 100644
index 000000000000..11ee13c191f8
--- /dev/null
+++ b/dev-python/http-parser/http-parser-0.8.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="HTTP request/response parser for python in C"
+HOMEPAGE="https://github.com/benoitc/http-parser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd"
+IUSE="examples"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' 'python*')"
+
+python_compile() {
+	if [[ ${EPYTHON} != python3* ]]; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_install_all() {
+	local DOCS=( README.rst )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/http-parser/metadata.xml b/dev-python/http-parser/metadata.xml
new file mode 100644
index 000000000000..ec7464a19b16
--- /dev/null
+++ b/dev-python/http-parser/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">http-parser</remote-id>
+    <remote-id type="github">benoitc/http-parser</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/httpauth/Manifest b/dev-python/httpauth/Manifest
new file mode 100644
index 000000000000..03a20ac829dd
--- /dev/null
+++ b/dev-python/httpauth/Manifest
@@ -0,0 +1,4 @@
+DIST httpauth-0.3.tar.gz 4440 SHA256 74645a5c3cf7d094fb3b6803b789453ade634f2eb7d177d149dfbf680e3a5a61 SHA512 aa35148322a1c5ffc22a132d3062d300118aa23181a0008018d0aacfd473758d86d50ff1236d88126858a53e2f45aeea938988b2d1a8f62f80a97d8c2cc69822 WHIRLPOOL 861600fd9912468d187bd982ffb2968756d5281be55e249fd0f175ecaf0d095965a24bbd3435f127fa629d609bfa1d999df772ae8d204199f0c478c3ff278b84
+EBUILD httpauth-0.3.ebuild 609 SHA256 1c50705585e18bd2f421b6befd2a607dbb9a6db75265f69dbb2dcc97e4103a6a SHA512 1fe43a4db2054a5bb944ed57259f3e0804ab2df091d08432fe7485c8e5c5a2a95b06f99e9b1ffa4413a16d1856ee154955d27d69b376db0f8ab5e5c4d56531c0 WHIRLPOOL 566c86d800992f62b0dd6988cc408c42337c31a4056a2b12569062963fb65cddc573442eea05c66203ac0d0dd39fa1dbf049d6b71020b319872e35cfeab2d344
+MISC ChangeLog 448 SHA256 ba96a98d54cfb9dd36f3068d8f5dba8780fc4d4ae26293d300994aa9de1b6ccf SHA512 f2dae240ee7f3091a1f983dd2e573a0d868280dc792b4fa53742a0550cbdb2b030523b261ba8d6d623f5e299ce56a685fff762bc03305fb9d07eae4603e9ad48 WHIRLPOOL 5a69878fb2df5049b5f1a3404d8b29c79f5140f73c2ae45138456aed1054b38a9ec837678a498206ae53b4e5e16c07088f651da3226573f1eadcf8cc6843b7e3
+MISC metadata.xml 564 SHA256 b4f7fbcfc3a2bc0192e7d1175d8736e7507fd5947b826118a02b251be106216c SHA512 0fc6fc882f8ef29b16e73e7e0e4559e2f30e2ac153370405c438e8f2e7267bfff7cb4a34e49e58ff0dce849596a4ca6a5dff2d5cbedf6508df2525504ecfab66 WHIRLPOOL 5c02b4188fa1443e5dbef05bc6298c7adf38e834bd563d0e1f8c8cb8d1e58c7798fc80bbc3feca78c2c606b75763c307add7f04c647ea087203b700bda4a1e41
diff --git a/dev-python/httpauth/httpauth-0.3.ebuild b/dev-python/httpauth/httpauth-0.3.ebuild
new file mode 100644
index 000000000000..49c87f86fbe0
--- /dev/null
+++ b/dev-python/httpauth/httpauth-0.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A WSGI middleware that secures routes using HTTP Digest Authentication"
+HOMEPAGE="https://github.com/jonashaag/httpauth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	nosetests tests.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/httpauth/metadata.xml b/dev-python/httpauth/metadata.xml
new file mode 100644
index 000000000000..ce8b8302b0df
--- /dev/null
+++ b/dev-python/httpauth/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">httpauth</remote-id>
+		<remote-id type="github">jonashaag/httpauth</remote-id>
+		<bugs-to>https://github.com/jonashaag/httpauth/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest
new file mode 100644
index 000000000000..b8fa6c6b3fbe
--- /dev/null
+++ b/dev-python/httpbin/Manifest
@@ -0,0 +1,4 @@
+DIST httpbin-0.4.1.tar.gz 88101 SHA256 3362ae9dec439912e32287e19c673a090658a4e1891f44985c1694cf81d05258 SHA512 feb519ee909c5115971f4bfd488ec0f9e987cd473464721f4e343e09b9d8fc592cf48b50ff3a2960bb67310521d865091cd766ed351ebfaa2dc8193115e9f052 WHIRLPOOL f68c97593228d354bad1acf9ee8abd88c94c9371579144ef978595891374dded4a52749f5cc936386424dea430e0112d31f1c6ebd89e2d053c471c57e292e86f
+EBUILD httpbin-0.4.1.ebuild 895 SHA256 de3ea6a479bf1d2e3337e0a8834d51dfec8573312e7251f7c35f868a7c569d19 SHA512 c4a0c07ff31963f9946b00018852ce1cd501dbda116af5882bdb40a4cbe102ab41e12b44e9efd62f0be6783e543ccfb3b45c36210e5dc9b12da1f4f34be8d0bf WHIRLPOOL 3fa4bc5c6ec4551e3cff47dd4b56eddd772f810e16e13783913a7ddd22936188e3a6cb4d0537882ce49d6d15abcd4d375732454f7aa0e54eef140acfbbf436c6
+MISC ChangeLog 1733 SHA256 3fce17eb3f60ecc7440cf8a4d969ab36276d6a631a33c0dc06df24486e083620 SHA512 9dfeb5bca5602c765cabd44a191fdb228029cdacaacbbe098e0334a34e5d95343b60a1d88686e93cb353382d2c1739992209a3aab23290ce83d7cd004be17c64 WHIRLPOOL d5e5e89f18b8e3624ee2a7cd93fcc6e07b91567e1657ac944afa9f3aff306b72f7350c024531194b3bb89ebb02a1297e52928c0f8decdf92448466ec2df8949b
+MISC metadata.xml 500 SHA256 1231fc9e991aa63457f6ca3d3dddd499b56f6f5d8cb0fb0a16ed4aac846f70b3 SHA512 014a5e115d2cd225618e78ddf226dfe4f8772815efc3e9ecf49883701127335d9cba5e216daaba3f15de2944074c0041e5fd6eaf26772f0892da891570f841e1 WHIRLPOOL 8e88892d9aff9513b500eef91b3d829728dfe500491410529796d941d742d9055b72bbb952bb448830c473ea3c2ceb6a1fa595dd9b0125124beb189fd03dc6a1
diff --git a/dev-python/httpbin/httpbin-0.4.1.ebuild b/dev-python/httpbin/httpbin-0.4.1.ebuild
new file mode 100644
index 000000000000..a2632b2ab643
--- /dev/null
+++ b/dev-python/httpbin/httpbin-0.4.1.ebuild
@@ -0,0 +1,35 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP Request and Response Service"
+HOMEPAGE="https://github.com/Runscope/httpbin http://pypi.python.org/pypi/httpbin"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/werkzeug[${PYTHON_USEDEP}] )"
+
+# Not included
+# Someone needs to file a bug upstream
+RESTRICT=test
+
+python_test() {
+	${PYTHON} test_httpbin.py || die
+}
diff --git a/dev-python/httpbin/metadata.xml b/dev-python/httpbin/metadata.xml
new file mode 100644
index 000000000000..abe8d7d98c04
--- /dev/null
+++ b/dev-python/httpbin/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">httpbin</remote-id>
+    <maintainer status="unknown">
+      <email>httpbin@runscope.com</email>
+      <name>Runscope</name>
+    </maintainer>
+    <remote-id type="github">Runscope/httpbin</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
new file mode 100644
index 000000000000..592223429e86
--- /dev/null
+++ b/dev-python/httplib2/Manifest
@@ -0,0 +1,10 @@
+AUX httplib2-use-system-cacerts.patch 2357 SHA256 e903d680c389b6a588b2ee890e2bef7bfb31c91b9d16f4a020a08c3c6235bc9a SHA512 08022280948e530890664f8af9fa5d3776b14526bbe2c55151b3631473b100b96c3c353ffd8df5a4d03d553ce24f962dec53307f7e23c257404920247940ff8f WHIRLPOOL f980cfc828c2375c8844a4dce70fc96c61ffe7d871febd14e5172b7f6b149c0f40b96073a58c325c404943cf2eee4902735be9fa847d31174dd477a74e56e345
+AUX python-httplib2-0.9-cve-2013-2037.patch 1166 SHA256 25676fcd307ba6bd81afba1037a97f6326b8bb538c34c53c2e31ae08bf64bd2e SHA512 10a3ac8ae9be7796c3f933694081c36c7412016fabd80e366703ed4622cad47463a523e8b7c30548112f885243887eb6d389218ddfaad99de8181ea5ffa9b5b3 WHIRLPOOL 679ed573e7a9b78f855afcbd689c75790164213040728997644f8c05012905b08cadc6842aa36b6beea616fdf9b53cb6fe01896e0f04e31f6b243e3929e1a73f
+DIST httplib2-0.10.3.tar.gz 204500 SHA256 e404d3b7bd86c1bc931906098e7c1305d6a3a6dcef141b8bb1059903abb3ceeb SHA512 d024986ffd577858017d7a8cfcae98a6cd04b8c89634ea302df4c1443eb2381cecca6ffbb631c9d4260335a3462df6d5604ec485aa591a05cb0231a3f6745aaa WHIRLPOOL da205bc1bb5ed6d253c857381300eb0eefe9e409abf87799f5706809eb2d06ac76322f03cf6480f1105c5d0c5820c8842268c0bd2af3496828c201c6d01a4689
+DIST httplib2-0.9.2.tar.gz 205165 SHA256 c3aba1c9539711551f4d83e857b316b5134a1c4ddce98a875b7027be7dd6d988 SHA512 cf1684f2d072588bc676c02491667480bdd2be0b3494703129d9cfa339d1233e14c0b4895b174d4c2ec5e2f5ae265d165b4e001b180f39f81db2178f91a032f8 WHIRLPOOL d795a016202821870e890531011e7c1c51dbc52f78f79ccf078e85fb3c1155dcf996b2e629b450ba79e34ccdda41e3df3d80293e102c39a76a57d174e51a884e
+EBUILD httplib2-0.10.3-r1.ebuild 946 SHA256 587f136625e4b892e86bbf187274e311e4f64d8afd224f23589734b77f1579c8 SHA512 08725c9058a1bdd64874fea180ce98bdbe3676421d1a180c66b88dcd66f41ae923da3ffef917496c9d9934437a698bd2b7cdcdee136f1493cfb84920fede7e2a WHIRLPOOL f0a1ad7bb424cb36aa36a201ab676c78d4edbd12d48ce00f086d7cbcec29b972e077f262434bb7565dc5994dc55a3617f9142009fdf98627a46f432914d1276a
+EBUILD httplib2-0.10.3.ebuild 858 SHA256 90e88a8011f26c2d2c5ee0f1c10c8305c109f975cdbfa7eb926cfafc6d7211f5 SHA512 fdd5cba5008f9141881d5607f25787b73bebcfb1d0166018dd064addd636524f637d8d60a58970c10fdf8cc43281c10f3f8a9e3aa2d8f1d83d24f9c1adde941b WHIRLPOOL ac29cafcef363c5494615e5999425b358c72e40d30dcf5171b0549fa1baa38c2d48e36074bb690f82bd5e2cbd94f0cd535b2890c83c06f18fa6b1df13493913a
+EBUILD httplib2-0.9.2-r2.ebuild 918 SHA256 83a1846fef462e25a90160cf17cb5929521ecb8d2c2314dba574f61500c02c0d SHA512 8d225e3737f880defc870b78ce0cdf116dcab5880622bb5794af03b4f1a4006b0d768edde84304595c4f2af5aadde9f91043040c5d4dd248482f87402e14d7da WHIRLPOOL 810160739c4e37ba1a6d0f5a2b4be473b12fb29b20e5cc7fc91dd8a41ad4f6425f1f13448b3b055394edc5f8ece31ec3e06eaf8c98501874430a15ecf4196db8
+MISC ChangeLog 5663 SHA256 d3b1d7d55fd36051e43e7b66500343cdb2e9f49464d9748d8da03b7817ee3d3c SHA512 7558febb614bf93e3e599736dbea21820198153b4522f61599d27a71b2b8e15ecff1540b2ce0982095b2805f3fe72634e3f44e66e0641c2e11ca8752c7707333 WHIRLPOOL 00804ad2fbdf5b03cf22aa3e21e2a66f2779595ba80fcafde1e33d49c249d7191519c9f913186f7feb891d56e08b6b71c005cd4d2dd0d81fed5bb3925025430d
+MISC ChangeLog-2015 7127 SHA256 0f2cdbbcb3cd26ade636b72757ccf852ae8577785c0491c93e706e82847ea31f SHA512 b17b347b03ee36d3eda828782b5a95fa0db7e33c277dc19873954c655d1d2ba3ed0ff773a3c80813e0fb87bbde96e06259eca39cd29235b51dd9ed9e876979a0 WHIRLPOOL 94b148b20f77703e41ac252c6f15bca9b68c1b26a8293321683dabfeb7f71d4965c85349dc1c2c9fff077388966df6bdb1e3555be3cc81703d184dc4ae864cfd
+MISC metadata.xml 437 SHA256 efd660831d7d58767d07210a2195e9e21f95f53ecebf3fa1fbb15a07f7bf5ea5 SHA512 fae017eb657512165f1d931910349a683417f98de8d70248d6b898a1e038212b9c2b1baebeae818126badbb57efb3b3ba1d647b25b759376ba5c3a719ed900a9 WHIRLPOOL 22935c38c8113969c1b99f542758052d470c2522092035d2830b2f5a8a4041bb7d83e4b59b2e15e7431b8daa1fb158feb8948249d94374a2b60cb110cf2877c9
diff --git a/dev-python/httplib2/files/httplib2-use-system-cacerts.patch b/dev-python/httplib2/files/httplib2-use-system-cacerts.patch
new file mode 100644
index 000000000000..cff65bb75ea5
--- /dev/null
+++ b/dev-python/httplib2/files/httplib2-use-system-cacerts.patch
@@ -0,0 +1,59 @@
+From 437b5bba5dac2e43815a900dbc6ee093c675bb4c Mon Sep 17 00:00:00 2001
+From: Marc Deslauriers <marc.deslauriers@canonical.com>
+Date: Thu, 8 Oct 2015 12:15:44 -0700
+Subject: Use system ca certificates, not the bundled ones
+
+Forwarded: not-needed
+Bug-Ubuntu: https://launchpad.net/bugs/882027
+
+Patch-Name: use_system_cacerts.patch
+---
+ python2/httplib2/__init__.py | 5 ++---
+ python3/httplib2/__init__.py | 5 ++---
+ setup.py                     | 1 -
+ 3 files changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py
+index 6fa3cc6..e996d01 100644
+--- a/python2/httplib2/__init__.py
++++ b/python2/httplib2/__init__.py
+@@ -190,9 +190,8 @@ try:
+     import ca_certs_locater
+     CA_CERTS = ca_certs_locater.get()
+ except ImportError:
+-    # Default CA certificates file bundled with httplib2.
+-    CA_CERTS = os.path.join(
+-        os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
++    # Use system CA certificates
++    CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
+ 
+ # Which headers are hop-by-hop headers by default
+ HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
+diff --git a/python3/httplib2/__init__.py b/python3/httplib2/__init__.py
+index 3ce019e..8383cc4 100644
+--- a/python3/httplib2/__init__.py
++++ b/python3/httplib2/__init__.py
+@@ -123,9 +123,8 @@ DEFAULT_MAX_REDIRECTS = 5
+ # Which headers are hop-by-hop headers by default
+ HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
+ 
+-# Default CA certificates file bundled with httplib2.
+-CA_CERTS = os.path.join(
+-        os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
++# Use system CA certificates
++CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
+ 
+ def _get_end2end_headers(response):
+     hopbyhop = list(HOP_BY_HOP)
+diff --git a/setup.py b/setup.py
+index fb00ed2..2c31f44 100755
+--- a/setup.py
++++ b/setup.py
+@@ -61,7 +61,6 @@ A comprehensive HTTP client library, ``httplib2`` supports many features left ou
+         """,
+         package_dir=pkgdir,
+         packages=['httplib2'],
+-        package_data={'httplib2': ['*.txt']},
+         classifiers=[
+         'Development Status :: 4 - Beta',
+         'Environment :: Web Environment',
diff --git a/dev-python/httplib2/files/python-httplib2-0.9-cve-2013-2037.patch b/dev-python/httplib2/files/python-httplib2-0.9-cve-2013-2037.patch
new file mode 100644
index 000000000000..6a09337b1993
--- /dev/null
+++ b/dev-python/httplib2/files/python-httplib2-0.9-cve-2013-2037.patch
@@ -0,0 +1,21 @@
+diff -Nur httplib2-0.9.orig/python2/httplib2/__init__.py httplib2-0.9/python2/httplib2/__init__.py
+--- httplib2-0.9.orig/python2/httplib2/__init__.py	2015-04-03 13:10:43.401035131 -0600
++++ httplib2-0.9/python2/httplib2/__init__.py	2015-04-03 13:10:08.470685647 -0600
+@@ -1042,7 +1042,7 @@
+                         raise CertificateHostnameMismatch(
+                             'Server presented certificate that does not match '
+                             'host %s: %s' % (hostname, cert), hostname, cert)
+-            except ssl_SSLError, e:
++            except (ssl_SSLError, CertificateHostnameMismatch), e:
+                 if sock:
+                     sock.close()
+                 if self.sock:
+@@ -1052,7 +1052,7 @@
+                 # to get at more detailed error information, in particular
+                 # whether the error is due to certificate validation or
+                 # something else (such as SSL protocol mismatch).
+-                if e.errno == ssl.SSL_ERROR_SSL:
++                if hasattr(e, 'errno') and e.errno == ssl.SSL_ERROR_SSL:
+                     raise SSLHandshakeError(e)
+                 else:
+                     raise
diff --git a/dev-python/httplib2/httplib2-0.10.3-r1.ebuild b/dev-python/httplib2/httplib2-0.10.3-r1.ebuild
new file mode 100644
index 000000000000..58351dcaf406
--- /dev/null
+++ b/dev-python/httplib2/httplib2-0.10.3-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A comprehensive HTTP client library"
+HOMEPAGE="https://pypi.python.org/pypi/httplib2 https://github.com/jcgregorio/httplib2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="app-misc/ca-certificates"
+
+# tests connect to random remote sites
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-use-system-cacerts.patch )
+
+python_prepare_all() {
+	chmod o+r */*egg*/* || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	if [[ ${EPYTHON} == python2.7 ]] ; then
+		cd python2 || die
+	else
+		cd python3 || die
+	fi
+
+	"${PYTHON}" httplib2test.py || die
+}
diff --git a/dev-python/httplib2/httplib2-0.10.3.ebuild b/dev-python/httplib2/httplib2-0.10.3.ebuild
new file mode 100644
index 000000000000..a12c08521b0b
--- /dev/null
+++ b/dev-python/httplib2/httplib2-0.10.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A comprehensive HTTP client library"
+HOMEPAGE="https://pypi.python.org/pypi/httplib2 https://github.com/jcgregorio/httplib2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# tests connect to random remote sites
+RESTRICT="test"
+
+python_prepare_all() {
+	chmod o+r */*egg*/* || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	if [[ ${EPYTHON} == python2.7 ]] ; then
+		cd python2 || die
+	else
+		cd python3 || die
+	fi
+
+	"${PYTHON}" httplib2test.py || die
+}
diff --git a/dev-python/httplib2/httplib2-0.9.2-r2.ebuild b/dev-python/httplib2/httplib2-0.9.2-r2.ebuild
new file mode 100644
index 000000000000..063a7624efe8
--- /dev/null
+++ b/dev-python/httplib2/httplib2-0.9.2-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A comprehensive HTTP client library"
+HOMEPAGE="https://pypi.python.org/pypi/httplib2 https://github.com/jcgregorio/httplib2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# tests connect to random remote sites
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/python-httplib2-0.9-cve-2013-2037.patch"
+)
+
+python_prepare_all() {
+	chmod o+r */*egg*/* || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	if [[ ${EPYTHON} == python2.7 ]] ; then
+		cd python2 || die
+	else
+		cd python3 || die
+	fi
+
+	"${PYTHON}" httplib2test.py || die
+}
diff --git a/dev-python/httplib2/metadata.xml b/dev-python/httplib2/metadata.xml
new file mode 100644
index 000000000000..a3e1442dc0b5
--- /dev/null
+++ b/dev-python/httplib2/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">httplib2</remote-id>
+    <remote-id type="pypi">httplib2</remote-id>
+    <remote-id type="github">jcgregorio/httplib2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
new file mode 100644
index 000000000000..f42148a61850
--- /dev/null
+++ b/dev-python/httpretty/Manifest
@@ -0,0 +1,19 @@
+AUX httpretty-0.7.0-deps.patch 2344 SHA256 f221f105ef6da02527a246c898083d7e52edbeaf5004165aec68937558d60b45 SHA512 d8c06d426966673d178969c8d0edb79e903ba89831a9942ba6788006d62e52a0302f306c40e1d171e39aaef03e75b73606b5a936babe50940b04025e7c46229c WHIRLPOOL 6c4f6782a676a6a6aeb090fefb277a56f7a1d19e636d99eb04f630d28d5c6fb4eca5a07a4699fc3b8b0de0961b74674cbe50fcde68d26202d3de84672eaf72f5
+DIST httpretty-0.7.0.tar.gz 28066 SHA256 a422a74fe0f35fbb644c9a3a0a4ccb7a7469a8f5bae2d7c807d35a7d149d3fa6 SHA512 9adfd906336aa0ac2c21be8b789eb2e57994f4aac719958fc657291d922fe28b1fcc60d9b39e0e616b6d8565adaecb8228df3a9d1428cc189372b1cc700f664e WHIRLPOOL 8aaa28f26d038ba198b19a31a7f9490e2c3882a9eaacd6b5ccee34cd5f03f745e0facd96853da1be00c7ae949f18cfd4e8f3f696b51f26ffd9b2c6063502976a
+DIST httpretty-0.7.1.tar.gz 28394 SHA256 a0f61cd3fbdffd28a556f8fd5eff703ad3c5c76cf0c39ab8bc136f38d0a71857 SHA512 53b6f063e0e7863fa77aad1eebb0ad3078528bc97d26df80a3c6491c42b9a9008080da35bbb1e9372674c996f25e5109c84b48a2a6d9f0de5b7c53331bdad857 WHIRLPOOL 2112692eeaa034f6afa3b7ef76aa557f3211b0f9db9178369446148b7c1d8eb6292f51a47c767d168222a7d40ed66bfefd1557bbb1c9ee3c5394e1c524861e4b
+DIST httpretty-0.8.0.tar.gz 34291 SHA256 e5512b38ad3bfb9f7d275c957b4a7eddc69e4b3a749e3b62a984c86fb6ab329b SHA512 0c6193c488a27345b3d98cc6a62e8933b67828b7335700367b28cf328ef86ff2342056bada84ca631d6acc5650b7b456e80d85d8099e873f07cd41140c481650 WHIRLPOOL f828e84fddc6e4ab9671a9cd33da6b0f2b4053fc3368e3119ed5d7410cde125486aaae8bcf1cf4eab3a641af48dda7c6531c231f0d59c36d65f1c3d173e8969f
+DIST httpretty-0.8.10.tar.gz 41741 SHA256 474a72722d66841f0e59cee285d837e1c6263be5be7bf2f8e824fc849a99adda SHA512 5bc734a89c45daa746551ef7d150c02bf6d9cddf1bc5426a8800d2241bb5bf8a834d2736fd9a4846ce150747d9c2064686a3ed63e97e5f131778d834956a9107 WHIRLPOOL 33fc4c025176c9d3493f8efe67f24db90d2c799536a949d490be4d9c11918190846d2612c6b09e6e000430a70f0e54b9bac87261cae62e5ba8ef558251f2bc3b
+DIST httpretty-0.8.12.tar.gz 43396 SHA256 0fb1c892c6161110c90b93096fe38ce1445ab484b6796f366e7af2cc7d37a9c1 SHA512 1d1cbc2fd56c4aa8c2ba1e5bdb6d56db57a74f73028ebeab141f93d55eaac4a46a19c66148435e45c91d21a561ecaa6100cbe1ac0dbb65b2bdf2c8551b99a523 WHIRLPOOL de6c283eca878b6b8f6d35317c36c3f798f24259d911f241f99c33ebf8d83cfd38ba47099324029905d2e7531c827b4b44fa2704a43d5802ee76dc1992ed82dc
+DIST httpretty-0.8.14.tar.gz 43574 SHA256 83c176bbac9d68a45a5cca54f2d5be7e6b16a063adf6f334e7fd0eee272e976e SHA512 5adab6450e8360cc21bab4136f64cd11757b9f292c7e27980fe2561f3e705baf4f0211b9e6ff4ec9ba96a788a6c5b5b1d26657972b67423c9c25491927b0884b WHIRLPOOL 356e8e4ffe5ce3ec65d424826588838cf30496af752c9cfb2a08cd950228a6623afb95b98c7daa600f6c95525875d130b6ce6ddacaa50aff8a98c03ef177aaff
+DIST httpretty-0.8.6.tar.gz 40815 SHA256 36bd574d289ee5ad781e28abb1f9cb6af696c27f13200769caf48a23e42f4938 SHA512 bd5d0b1a33b52ae3d0e09673429e771ce582795bf58d38b34d4df39f74b377ec199d720fa061a84b64175b6ba67a91bdb35c242b4fd754627d2744cb8b33b313 WHIRLPOOL 0803c822bfff000c7bc5630f29ca08232e50a1a8786122179471c84d5630281e8e2a746f820b027f6357eee77b8ece46275cb1b1cf25d957a5e785c6c9220d5b
+EBUILD httpretty-0.7.0.ebuild 1397 SHA256 803331ddcbcad927a2b4bfcffa04d220dcd14d30a0d0132fa8ed421630cbadcc SHA512 a99cbc6ed739e133a6d812f267c0aca45c3298ce0aa0a1682cb30d35bd6f3ba83fd49f56b2f4ded0db0ddde56f2b46723647e08fe444098c3affca8f6a3ffbcc WHIRLPOOL a45c9d391b198d488547d78342afe6d960c97adb3562fc0df6795f54ef23924859dbb05f328f6eb3b189df88e8d58f182b846f025c911f7c73e5bf5c87c7629d
+EBUILD httpretty-0.7.1.ebuild 1268 SHA256 a897a9d66bfdecbb0d72762ed529bea5ba7a2313a09c1886b60f6806146db55b SHA512 f5ee3a5cbedd31ada8785bb9cf8763c29537b543819b0f77c99fd324fd0e952a832151b7edf0b53f05da03f736655b8aeff0cfb41e3eca1c9cf46d83e5c72430 WHIRLPOOL a87d3207cf359fd26ff1cdd06e7a7e8e4406634b407a50fb4c6deed37d77ce9479718ed36ee26ce6cc4b828ff8c9d52c48b953f9cb18d83e47ffba5f701bb0d6
+EBUILD httpretty-0.8.0-r1.ebuild 2309 SHA256 1351133673a195d41b2d173bc0777cf18d4d9f20e67e548b9290fd17838e01a2 SHA512 d36021d2470c4410802341ea39c48ef0c3a75a5d998e597c48374dc992bac07839ce17fd80fdd125a5250f90179928c1595257b2fbf270afca134654ce043311 WHIRLPOOL 812a580be0753923de13cb1e8b1644b83d400b96992073314c6077e853e7d073adeec82e7dd989fd98936a1ff989cd47a100e6b4c65b300bb9f4e4635119464c
+EBUILD httpretty-0.8.0.ebuild 1223 SHA256 d50d0f25cb6135a86ada747cd814997b2b8140fe7b9df3763ab230ecb07cfe38 SHA512 8f3eef3205c7ed4d1165d6c0e389a4c9aad75260330f26828cdb69de83ac4f9db0441a70801b32064c63678ebc1f20aff9863e3714c161a2e7ff5f943d605e91 WHIRLPOOL 85c083a03f9e98ce1c3896a11b810670b3a75dc272399e34cc3f610e9303637c48527de516e9ff449c7829290959aff346270fb9be2e8da9221b193f046fe186
+EBUILD httpretty-0.8.10.ebuild 2307 SHA256 6c52e194c07eebb72c3a2124663451ba78d5b6f7defc90de644c62c80ac5638a SHA512 ba89125cdbd1c277ae523e6052b9cf4e94cc8c879e755c5d01e30cf074cbe612626b74f07dab7814b0f6bd0f92b625a32526b28e23ecccc05805d3ad1fe94092 WHIRLPOOL 4f5a7e14bedab395e8663f08ced8d25b36b76f46941976878b70f8eba9d8a5694b728dd173f8e03848627bf5264d166fb9877d444369f86b73cce511ae30556d
+EBUILD httpretty-0.8.12.ebuild 2321 SHA256 6b0002d1eaf0d2c84230356a6fe41aed2b50dc803f85d4c363e83e242636d4ae SHA512 b283fcb17cfc8468035ab28acb5b6cb117634ea14f8557c06f3a0cc6485f87b89f17ca0bae3db6eb019a82583299f2d5c0a65b67e26b9b44964671e25ca36bfe WHIRLPOOL 763fa66dff92501ac376652c85ad23ace1b9546cdca187e6b5fc210293e1771eeca40324b7f3340b16c30453ae0cbf71c8e15bcf4eb868b6d2216c0ab264412b
+EBUILD httpretty-0.8.14.ebuild 2313 SHA256 58f1e78995de70c15fd1bb5b45b0f794e5a075c78a6795ceace2175c4b45d097 SHA512 28c889079832baac7452bb4e85f86a87f812a0c5b822c32aa882c792210a4cda06a0361113b7a37113bebdb02f79cd5f5df5d8619f500b1dd8fb2181ba6ca70d WHIRLPOOL 62d09b87cc5b0a22b622610a995cda4fec8afc84b992651fe5d3c97916989ef9dea9bb7dd913c8e35ab244ff8668fb5e24665f7671c72db3741971b8c905296d
+EBUILD httpretty-0.8.6.ebuild 2330 SHA256 a262be65b0fe1b566cb1cd508a5b8858441cb850f47889155ef8e0f267770ddf SHA512 fb4ea0ef4bddd1fbafde0126f91c8efc4024c267a633f0f378143e93ec3b054f93f65ec689713674351b35b43fd3b26e570d3196023c57a5a142100eed258293 WHIRLPOOL 1af0395398bb560a0a6ac2906d099002591551e1294c46589737afd040bc83b920ba252384b161b7bc9f7eda592fa06cc03a8aa82bc8c9edbc19239b3bbe775a
+MISC ChangeLog 4529 SHA256 8594c6f9e163e93d5a624d71f56e26070bf1ee25e99ae20bb5eb9c2a6961f149 SHA512 fe9ce30ee403dcc91a3be64fcc64fa09bd99cb85244764ee1097f39977f78172315d4a6d51be6ff834d65a50451033e7f0825f5c6695be535ba22347469d3d7a WHIRLPOOL 1028193c5cb4db91b107508342d174f1dd47dcb453196c4d0d8691d1677724d5369d7829672372491ec28037ffdc49e08eac295625210190b34db664a7bbd550
+MISC ChangeLog-2015 2102 SHA256 51012848347c5a436f6591f7f49eec09cd8611efc7cc6c28580116090921c972 SHA512 715e01f784891211364feb1df744346b1c7da48befc9291b5e11f02cd593be7497ab906042d80bb10e9e986ffbc8314ed0310fd9cac46958542ac7551bbc9673 WHIRLPOOL b400d22d749685dab9a00334975e201f8a0c4eb6a82c379080b8774670d0acd9ed1d799d026b483a9257c675c0d46533c0eca4cdc2cc680f1f17e2b702bca668
+MISC metadata.xml 393 SHA256 582b1c983af0b7976d2a6440b1d6a9379a5b77d703a363ab122803e76a1455bb SHA512 79c7b3c101043ed36490f7b543f191d79e8fc3b2d9830ea44999e7e8018e6d1fcbe73915fb2f1adff9e6110404467bb98786aa6091fdf751021a995f0ef6f483 WHIRLPOOL f493fa94cf09353ffbd970fdbc193c24e2231203015da559c60d283aa1ff2b3da1396b0c588263886c56a8d1043187e418ce55c1464fa6bcfe241796ebee43af
diff --git a/dev-python/httpretty/files/httpretty-0.7.0-deps.patch b/dev-python/httpretty/files/httpretty-0.7.0-deps.patch
new file mode 100644
index 000000000000..26c6ebec4e5e
--- /dev/null
+++ b/dev-python/httpretty/files/httpretty-0.7.0-deps.patch
@@ -0,0 +1,68 @@
+rebased from https://github.com/jamielennox/HTTPretty/commit/3a7d5a04b2ed5cebc8e1fc14f706f5da7fc5162f
+diff -ur httpretty-0.7.0.orig/requirements.pip httpretty-0.7.0/requirements.pip
+--- requirements.pip	2013-10-02 12:44:47.000000000 +0800
++++ requirements.pip	2013-12-02 15:37:00.611977792 +0800
+@@ -1,12 +1,9 @@
+-argparse==1.2.1
+-coverage==3.5.3
+-httplib2==0.7.6
+-misaka==1.0.2
+-mock==1.0.1
+-nose==1.2.1
+-requests==1.1.0
+-steadymark==0.4.5
++coverage>=3.5
++httplib2
++mock>=1.0
++nose>=1.2
++requests>=1.1
+ sure>=1.2.1
+-tornado==2.4
+-tox==1.4.2
+-urllib3
+\ No newline at end of file
++tornado>=2.2
++tox>=1.4.2
++urllib3
+diff -ur httpretty-0.7.0.orig/setup.cfg httpretty-0.7.0/setup.cfg
+--- setup.cfg	2013-10-08 05:42:31.000000000 +0800
++++ setup.cfg	2013-12-02 15:40:34.331985437 +0800
+@@ -2,4 +2,9 @@
+ tag_build = 
+ tag_date = 0
+ tag_svn_revision = 0
+-
++[nosetests]
++verbosity=2
++with-coverage=1
++cover-erase=1
++cover-package=httpretty
++cover-inclusive=1
+diff -ur httpretty-0.7.0.orig/setup.py httpretty-0.7.0/setup.py
+--- setup.py	2013-10-08 05:42:31.000000000 +0800
++++ setup.py	2013-12-02 15:42:26.467989448 +0800
+@@ -50,10 +50,11 @@
+     author_email='gabriel@nacaolivre.org',
+     url='http://github.com/gabrielfalcao/httpretty',
+     zip_safe=False,
+-    packages=find_packages(HTTPRETTY_PATH, ('tests')),
++    packages=find_packages(),
+     tests_require=test_packages(),
+     install_requires=['urllib3'],
+     license='MIT',
++    test_suite='nose.collector',
+     classifiers=["Intended Audience :: Developers",
+                  "License :: OSI Approved :: MIT License",
+                  "Topic :: Software Development :: Testing"],
+diff -ur httpretty-0.7.0.orig/tests/functional/test_requests.py httpretty-0.7.0/tests/functional/test_requests.py
+--- tests/functional/test_requests.py	2013-10-08 05:42:31.000000000 +0800
++++ tests/functional/test_requests.py	2013-12-02 15:43:48.763992391 +0800
+@@ -698,7 +698,7 @@
+     response['response'].should.have.key("status").being.equal(200)
+     response['response'].should.have.key("body").being.an(unicode)
+     response['response'].should.have.key("headers").being.a(dict)
+-    response['response']["headers"].should.have.key("server").being.equal("TornadoServer/2.4")
++    response['response']["headers"].should.have.key("server").being.equal("TornadoServer")
+ 
+ 
+ def test_playing_calls():
diff --git a/dev-python/httpretty/httpretty-0.7.0.ebuild b/dev-python/httpretty/httpretty-0.7.0.ebuild
new file mode 100644
index 000000000000..eec8bd8fc2d1
--- /dev/null
+++ b/dev-python/httpretty/httpretty-0.7.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP client mock for Python"
+HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.5[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		>=dev-python/steadymark-0.4.5[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.2.1[${PYTHON_USEDEP}]
+		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+		"
+# I believe we don't need unpackaged package markment
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+PATCHES=( "${FILESDIR}"/${P}-deps.patch )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	if ! use test; then
+		rm -rf tests/
+	fi
+}
+
+python_test() {
+	# https://github.com/gabrielfalcao/HTTPretty/issues/125
+	nosetests tests/unit \
+		-e test_recording_calls \
+		-e test_playing_calls \
+		-e test_callback_setting_headers_and_status_response \
+		-e test_streaming_responses \
+		tests/functional || die "Tests failed under ${EPYTHON}"
+	rm -rf tests/ "${BUILD_DIR}"/lib/tests/ || die
+}
diff --git a/dev-python/httpretty/httpretty-0.7.1.ebuild b/dev-python/httpretty/httpretty-0.7.1.ebuild
new file mode 100644
index 000000000000..9913d5128b50
--- /dev/null
+++ b/dev-python/httpretty/httpretty-0.7.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP client mock for Python"
+HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.5[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		>=dev-python/steadymark-0.4.5[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.2.1[${PYTHON_USEDEP}]
+		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+		"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	if ! use test; then
+		rm -rf tests/
+	fi
+}
+
+python_test() {
+	# https://github.com/gabrielfalcao/HTTPretty/issues/125
+	nosetests tests/unit \
+		-e test_recording_calls \
+		-e test_playing_calls \
+		-e test_callback_setting_headers_and_status_response \
+		tests/functional || die "Tests failed under ${EPYTHON}"
+	rm -rf tests/ "${BUILD_DIR}"/lib/tests/ || die
+}
diff --git a/dev-python/httpretty/httpretty-0.8.0-r1.ebuild b/dev-python/httpretty/httpretty-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..e74338ab415c
--- /dev/null
+++ b/dev-python/httpretty/httpretty-0.8.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP client mock for Python"
+HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
+	"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/coverage-3.5[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+		dev-python/ipdb[${PYTHON_USEDEP}] )"
+
+#Required for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	# https://github.com/gabrielfalcao/HTTPretty/issues/125, still occur
+	# py3.4 hangs on many tests and is deemed underdone
+	# Upstream does not make it clear whether py3.4 is sctually tested and supported.
+	# python2.7 has substantial failure in tests/functional/test_requests.py and is removed.
+	# Some tests excluded attempt connection to the network
+	# On testing in the state below, py2.7 still has a tally of FAILED (failures=5)
+	# that occur within the folder tests/unit which upstream should address.
+	# https://github.com/gabrielfalcao/HTTPretty/issues/236 Bug #532106
+
+	if [[ "${EPYTHON}" == python3.4 ]]; then
+		einfo "python3.4 not adequately supported in testsuite"
+	elif [[ "${EPYTHON}" == python2.7 ]]; then
+	rm -f tests/functional/test_requests.py || die
+		nosetests -e test_recording_calls \
+			-e test_playing_calls \
+			-e test_callback_setting_headers_and_status_response \
+			-e test_httpretty_bypasses_when_disabled \
+			-e test_using_httpretty_with_other_tcp_protocols \
+			tests/unit \
+			tests/functional || die "Tests failed under python2.7"
+	else
+		nosetests -e test_recording_calls \
+			-e test_playing_calls \
+			-e test_callback_setting_headers_and_status_response \
+			-e test_httpretty_bypasses_when_disabled \
+			-e test_using_httpretty_with_other_tcp_protocols \
+			tests/unit \
+			tests/functional || die "Tests failed under python3.3"
+	fi
+
+	rm -rf "${BUILD_DIR}"/../tests/ || die
+}
diff --git a/dev-python/httpretty/httpretty-0.8.0.ebuild b/dev-python/httpretty/httpretty-0.8.0.ebuild
new file mode 100644
index 000000000000..5ed9516eff5b
--- /dev/null
+++ b/dev-python/httpretty/httpretty-0.8.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP client mock for Python"
+HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+IUSE="test"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
+		"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/coverage-3.5[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+		dev-python/ipdb )"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	if ! use test; then
+		rm -rf tests/
+	fi
+}
+
+python_test() {
+	# https://github.com/gabrielfalcao/HTTPretty/issues/125
+	nosetests tests/unit \
+		-e test_recording_calls \
+		-e test_playing_calls \
+		-e test_callback_setting_headers_and_status_response \
+		tests/functional || die "Tests failed under ${EPYTHON}"
+	rm -rf tests/ "${BUILD_DIR}"/lib/tests/ || die
+}
diff --git a/dev-python/httpretty/httpretty-0.8.10.ebuild b/dev-python/httpretty/httpretty-0.8.10.ebuild
new file mode 100644
index 000000000000..d8f9443c6f99
--- /dev/null
+++ b/dev-python/httpretty/httpretty-0.8.10.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP client mock for Python"
+HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+IUSE="test"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
+	"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/coverage-3.5[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+		dev-python/ipdb[${PYTHON_USEDEP}] )"
+
+#Required for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	# https://github.com/gabrielfalcao/HTTPretty/issues/125, still occur
+	# py3.4 hangs on many tests and is deemed underdone
+	# Upstream does not make it clear whether py3.4 is sctually tested and supported.
+	# python2.7 has substantial failure in tests/functional/test_requests.py and is removed.
+	# Some tests excluded attempt connection to the network
+	# On testing in the state below, py2.7 still has a tally of FAILED (failures=5)
+	# that occur within the folder tests/unit which upstream should address.
+	# https://github.com/gabrielfalcao/HTTPretty/issues/236 Bug #532106
+
+	if [[ "${EPYTHON}" == python3.4 ]]; then
+		einfo "python3.4 not adequately supported in testsuite"
+	elif [[ "${EPYTHON}" == python2.7 ]]; then
+	rm -f tests/functional/test_requests.py || die
+		nosetests -e test_recording_calls \
+			-e test_playing_calls \
+			-e test_callback_setting_headers_and_status_response \
+			-e test_httpretty_bypasses_when_disabled \
+			-e test_using_httpretty_with_other_tcp_protocols \
+			tests/unit \
+			tests/functional || die "Tests failed under python2.7"
+	else
+		nosetests -e test_recording_calls \
+			-e test_playing_calls \
+			-e test_callback_setting_headers_and_status_response \
+			-e test_httpretty_bypasses_when_disabled \
+			-e test_using_httpretty_with_other_tcp_protocols \
+			tests/unit \
+			tests/functional || die "Tests failed under python3.3"
+	fi
+
+	rm -rf "${BUILD_DIR}"/../tests/ || die
+}
diff --git a/dev-python/httpretty/httpretty-0.8.12.ebuild b/dev-python/httpretty/httpretty-0.8.12.ebuild
new file mode 100644
index 000000000000..f0dcd0326bbe
--- /dev/null
+++ b/dev-python/httpretty/httpretty-0.8.12.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP client mock for Python"
+HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-3.5[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+		dev-python/ipdb[${PYTHON_USEDEP}]
+)"
+
+#Required for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	# https://github.com/gabrielfalcao/HTTPretty/issues/125, still occur
+	# py3.4 hangs on many tests and is deemed underdone
+	# Upstream does not make it clear whether py3.4 is sctually tested and supported.
+	# python2.7 has substantial failure in tests/functional/test_requests.py and is removed.
+	# Some tests excluded attempt connection to the network
+	# On testing in the state below, py2.7 still has a tally of FAILED (failures=5)
+	# that occur within the folder tests/unit which upstream should address.
+	# https://github.com/gabrielfalcao/HTTPretty/issues/236 Bug #532106
+
+	if [[ "${EPYTHON}" == python3.4 ]]; then
+		einfo "python3.4 not adequately supported in testsuite"
+	elif [[ "${EPYTHON}" == python2.7 ]]; then
+		rm -f tests/functional/test_requests.py || die
+		nosetests -e test_recording_calls \
+			-e test_playing_calls \
+			-e test_callback_setting_headers_and_status_response \
+			-e test_httpretty_bypasses_when_disabled \
+			-e test_using_httpretty_with_other_tcp_protocols \
+			tests/unit \
+			tests/functional || die "Tests failed under python2.7"
+	else
+		nosetests -e test_recording_calls \
+			-e test_playing_calls \
+			-e test_callback_setting_headers_and_status_response \
+			-e test_httpretty_bypasses_when_disabled \
+			-e test_using_httpretty_with_other_tcp_protocols \
+			tests/unit \
+			tests/functional || die "Tests failed under python3.3"
+	fi
+
+	rm -rf "${BUILD_DIR}"/../tests/ || die
+}
diff --git a/dev-python/httpretty/httpretty-0.8.14.ebuild b/dev-python/httpretty/httpretty-0.8.14.ebuild
new file mode 100644
index 000000000000..9c545c3eee1c
--- /dev/null
+++ b/dev-python/httpretty/httpretty-0.8.14.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP client mock for Python"
+HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-3.5[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+		dev-python/ipdb[${PYTHON_USEDEP}]
+)"
+
+#Required for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	# https://github.com/gabrielfalcao/HTTPretty/issues/125, still occur
+	# py3.4 hangs on many tests and is deemed underdone
+	# Upstream does not make it clear whether py3.4 is sctually tested and supported.
+	# python2.7 has substantial failure in tests/functional/test_requests.py and is removed.
+	# Some tests excluded attempt connection to the network
+	# On testing in the state below, py2.7 still has a tally of FAILED (failures=5)
+	# that occur within the folder tests/unit which upstream should address.
+	# https://github.com/gabrielfalcao/HTTPretty/issues/236 Bug #532106
+
+	if python_is_python3; then
+		einfo "python3* not adequately supported by th package"
+	elif [[ "${EPYTHON}" == python2.7 ]]; then
+		rm -f tests/functional/test_requests.py || die
+		nosetests -e test_recording_calls \
+			-e test_playing_calls \
+			-e test_callback_setting_headers_and_status_response \
+			-e test_httpretty_bypasses_when_disabled \
+			-e test_using_httpretty_with_other_tcp_protocols \
+			tests/unit \
+			tests/functional || die "Tests failed under python2.7"
+	else
+		nosetests -e test_recording_calls \
+			-e test_playing_calls \
+			-e test_callback_setting_headers_and_status_response \
+			-e test_httpretty_bypasses_when_disabled \
+			-e test_using_httpretty_with_other_tcp_protocols \
+			tests/unit \
+			tests/functional || die "Tests failed under python3.3"
+	fi
+
+	rm -rf "${BUILD_DIR}"/../tests/ || die
+}
diff --git a/dev-python/httpretty/httpretty-0.8.6.ebuild b/dev-python/httpretty/httpretty-0.8.6.ebuild
new file mode 100644
index 000000000000..f49200316958
--- /dev/null
+++ b/dev-python/httpretty/httpretty-0.8.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP client mock for Python"
+HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
+	"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/coverage-3.5[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+		dev-python/ipdb[${PYTHON_USEDEP}] )"
+
+#Required for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	# https://github.com/gabrielfalcao/HTTPretty/issues/125, still occur
+	# py3.4 hangs on many tests and is deemed underdone
+	# Upstream does not make it clear whether py3.4 is sctually tested and supported.
+	# python2.7 has substantial failure in tests/functional/test_requests.py and is removed.
+	# Some tests excluded attempt connection to the network
+	# On testing in the state below, py2.7 still has a tally of FAILED (failures=5)
+	# that occur within the folder tests/unit which upstream should address.
+	# https://github.com/gabrielfalcao/HTTPretty/issues/236 Bug #532106
+
+	if [[ "${EPYTHON}" == python3.4 ]]; then
+		einfo "python3.4 not adequately supported in testsuite"
+	elif [[ "${EPYTHON}" == python2.7 ]]; then
+	rm -f tests/functional/test_requests.py || die
+		nosetests -e test_recording_calls \
+			-e test_playing_calls \
+			-e test_callback_setting_headers_and_status_response \
+			-e test_httpretty_bypasses_when_disabled \
+			-e test_using_httpretty_with_other_tcp_protocols \
+			tests/unit \
+			tests/functional || die "Tests failed under python2.7"
+	else
+		nosetests -e test_recording_calls \
+			-e test_playing_calls \
+			-e test_callback_setting_headers_and_status_response \
+			-e test_httpretty_bypasses_when_disabled \
+			-e test_using_httpretty_with_other_tcp_protocols \
+			tests/unit \
+			tests/functional || die "Tests failed under python3.3"
+	fi
+
+	rm -rf "${BUILD_DIR}"/../tests/ || die
+}
diff --git a/dev-python/httpretty/metadata.xml b/dev-python/httpretty/metadata.xml
new file mode 100644
index 000000000000..87a60423fd7d
--- /dev/null
+++ b/dev-python/httpretty/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="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">httpretty</remote-id>
+    <remote-id type="github">gabrielfalcao/httpretty</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/httreplay/Manifest b/dev-python/httreplay/Manifest
new file mode 100644
index 000000000000..3d6b69acfd0b
--- /dev/null
+++ b/dev-python/httreplay/Manifest
@@ -0,0 +1,4 @@
+DIST httreplay-0.2.0.tar.gz 8493 SHA256 dce205393b19f9a6e052ec84104bdbe4f10b70f7db7a40b09a2b3c904760b90c SHA512 0a035425241d34aeaed2ec219e7fdb7894ba09b711ccd60ca909f4f56467505bc39a8e77999a9196280883ff818165f9e4fb581e93df5d85a1dd30a0f243ea6b WHIRLPOOL 2a5260f679cbc502d07f64355e1315d39aee4ce9f6d0bd48f209cdd88942f7ba63d7b876a925e50341725e1743816e51a20c52974757b5d590e191556cb96eb5
+EBUILD httreplay-0.2.0.ebuild 458 SHA256 dc13139af7f19a781f9bd4f5a5add77275023921dddc7a5fb4bab83c753f63de SHA512 e555e1eabfc6da94b613030a906945da454ae322b70cf09957cbe6b030450cbfec3e367612137b6b7cec37e06589d8ac322b98d66a32b4cb80ac6b541f1489ab WHIRLPOOL 612ec6e4d851452ef2efd18af589c52647f413c406baa0698774ad4ad048f945b555fef06b70807561c31fa75ea8a94f1eaedf83a552321d01882e511c997606
+MISC ChangeLog 1693 SHA256 7e6890d7301bd79d1f6c6e43bc74fc64c8a05dc7e76ddb37d44ba310b249af09 SHA512 08417ae98a1d856612a31147ca6f2780ea35db0962a24f6a32691a5ea430775df962874e58d9bfb2205b372583c3a35554e8ffe193f907511087400358f365e3 WHIRLPOOL 91eeff19e798e945bfaa6dbfd73f14ec3ff6aab9e501ada962558735c7732d5c1aa952a5326defc016ba27ff97468c58e135a5084b0f8d25a30b5c36dce7bb94
+MISC metadata.xml 527 SHA256 5c568061a71b0c9789bf8322d309e6440e38b1fa4b81ee7c67148f9ff0f490f1 SHA512 89795450ad897b311a286f6936928935fd19e62e4c55604bce548409154340afa6b5813b62045d6687339acb6f373b6b289d4addf11bcd0faef8c193c20fc3fd WHIRLPOOL cde74c794bdb054ec0b384c63530d496b18fb4ac028207d2534db5cbf720f68c1029621654034a740e621e5c54f40299a3bb54ebb3d77213136fc1c6b9528e9a
diff --git a/dev-python/httreplay/httreplay-0.2.0.ebuild b/dev-python/httreplay/httreplay-0.2.0.ebuild
new file mode 100644
index 000000000000..222cac6a20dd
--- /dev/null
+++ b/dev-python/httreplay/httreplay-0.2.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A HTTP replay library for testing."
+HOMEPAGE="https://github.com/agriffis/httreplay http://pypi.python.org/pypi/httreplay"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/httreplay/metadata.xml b/dev-python/httreplay/metadata.xml
new file mode 100644
index 000000000000..eb32fb2b4542
--- /dev/null
+++ b/dev-python/httreplay/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">httreplay</remote-id>
+    <maintainer status="unknown">
+      <email>davepeck+httreplay@gmail.com</email>
+      <name>Aron Griffis, Dave Peck</name>
+    </maintainer>
+    <remote-id type="github">agriffis/httreplay</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
new file mode 100644
index 000000000000..b83163c00508
--- /dev/null
+++ b/dev-python/humanfriendly/Manifest
@@ -0,0 +1,5 @@
+DIST humanfriendly-2.4.tar.gz 51037 SHA256 bccba2151adfe4b058667cc995c780e21b36502af24ef4037fc37609f2ed6c2d SHA512 e35017c6be9d80ac5e3465836aae4f5b1ea4358224e250c7c1b7e3a93c2764832382e0ec24ea54e1d656fd8874c12b23ffc535440870b55a532800c5953cc676 WHIRLPOOL cf6678904edb6344f249ac8e8c5c3cef5fda72f7903d6a50cc4c17dc766060784591e6bc350451a5b46045414997ed44fac9627887bec14c4cf9de414191f658
+EBUILD humanfriendly-2.4.ebuild 802 SHA256 17d12cae7e5c7fc3c86d6f819048ecc8a4a292762e1c2d5eed1573eb4b482bab SHA512 4125ae529ab5aeb9a9d77e15b63fc7a7cbb0a80ffb2583cb121e260e1cbf94679b93a2a2992fd80b06dfc56f3bdafd842ddeb0646e7ae4554a9bcc631c2b4a19 WHIRLPOOL b9bf221096104df553d4abbf8efa8137d9243b7399a01b4f0347605b94b9f6bb66fab1660d833f57fbab3a78c31a1022bdd2729565d3dca9160113b54b268480
+MISC ChangeLog 5603 SHA256 addeb30bd287b033ee170bad413fe2bcf584fe2b68894a474a0f5ddb7d4335aa SHA512 281a91fe90c84c5857c0c49944720e77199c0fbc6aa914d67545dead623d1931046ca613a16ab3d40eb7bfed47823d7a0f377b5b02d21b0841af1835625fffa4 WHIRLPOOL 3cb238d8574d932e87af7ae90739c6bb5262d1133030339603174df0a5fe8e604e79166140e2ce41252cfbcfee3f8d4f1abd00da98e52847127a25452ac2a031
+MISC ChangeLog-2015 1023 SHA256 e761315a2061f574c2da7de0117c5a3f39f3ef600fca8b4b80cb787b426034e0 SHA512 5e444751314300b924c3c163daf7ae2d33f6addd98efb9659e778ffbed4899e48ebbddac76f4fda1458b399c9b587589a54bbc123e70b356de8c507336f8fc7f WHIRLPOOL a847ff00b18993d9c84a17f53f9d470240750c730ba1faf833c042bdf258522aad5acea7b16ecb191c561423e7c7b838786f0c789c51a533c123e790f4541daa
+MISC metadata.xml 326 SHA256 5727901ecbe169fb874bf37db89310cb0902c0b24f65cd01cb48bd33e0a1d0b2 SHA512 1338df242248b37b4d016d8f9a31ffa004eed60a9122ed9ec8f94103271b3136b698a613c0f7c91411f43d96b136777e0ffe808c250f9ece3d29922312457f47 WHIRLPOOL ff1ce2af96ed52bdf51fdc3b2760423d4171049328099a388a186428193c52c150df7d81f1b97d3ddf6f98b1e132de2c7a72a97c027d1aee4a12565620a8a94e
diff --git a/dev-python/humanfriendly/humanfriendly-2.4.ebuild b/dev-python/humanfriendly/humanfriendly-2.4.ebuild
new file mode 100644
index 000000000000..c4b229c3b9d6
--- /dev/null
+++ b/dev-python/humanfriendly/humanfriendly-2.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Human friendly output for text interfaces using Python"
+HOMEPAGE="https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/monotonic[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/capturer-2.1[${PYTHON_USEDEP}]
+		>=dev-python/coloredlogs-2.0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+	"
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/humanfriendly/metadata.xml b/dev-python/humanfriendly/metadata.xml
new file mode 100644
index 000000000000..10691287e903
--- /dev/null
+++ b/dev-python/humanfriendly/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">humanfriendly</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
new file mode 100644
index 000000000000..701c8b19d186
--- /dev/null
+++ b/dev-python/humanize/Manifest
@@ -0,0 +1,4 @@
+DIST humanize-0.5.1.tar.gz 20507 SHA256 e3f3ac75e647f75eec48c3950385ab7585c1c1cde2a6c1479c1f58e055a3e868 SHA512 dd7ad7f3c564cc6abcb6b128e50dbea7f19f7f418bfd936aae2472961c53ec71202133c5c2b5b930ef41ef807b51d6ba1210565627ed32c0b41acc0abd32a2d5 WHIRLPOOL 37a43b9dc5e7d4b2054453f45d663af630b598f017e18b937aaa7265ca97e75dd8219eaab276710d3f906ffb0330b69eb9642046f17d7f5a321c3e214fb65617
+EBUILD humanize-0.5.1.ebuild 867 SHA256 3626f3570a24e6438aa0f1ceedbb8a4498d2e853a40d78537607c2da062900d2 SHA512 a57f2e4ab378f9de3a60e0b89b8c73a98188082f06077c583c862e441a41b83a0d092ce33afd3ea6c0838d54203f0c855f6f6e4cf166ab7a978368654c964768 WHIRLPOOL d12245c848ac7e57933cc5fc1f0217a66bb8893c0b9e7d51ad9a54d063e737ed139c4f48aeb19113e61192b55c9cc8b90454dbda3b9febc73a354e20a1a47432
+MISC ChangeLog 452 SHA256 b5a35f96de7031d8373c0cfff376c9f899f1e2d411d7a7ff5edfca60e9842c63 SHA512 4b1e9ba9dd709d01027ce6cbebf1721fb5d1ba0a7219c37151d2ea9229b980ce82a75ffe699fb88edd6c3a3d7c0696893f06fb54693765601c2bdefb8c93d9a9 WHIRLPOOL 7c368ebe3f1e95340de852007a613f0940820f13e4a3cb5a8366b05b49fb11a5349bd068823082fcce00e234ddab38cd93fc91ccd788278c69f19589bb5fd494
+MISC metadata.xml 560 SHA256 26c01f3b4ff01d74c48189ec3e345a68456f03f5175affc3ea0f83d82c851a44 SHA512 671661f3da4180319c2ce22e8bf9d49173fca8ea51136ab97af91b4a3667a2c241df610c61e5ccd4304511abf4dd47f3e878bbdb463e7ba2316dfb0df09e36be WHIRLPOOL fcc80156a90dfad4e7aa5cdde9b946ebf5aa1b2e7fd11bfd0c1ab818dc55feecc876419f7bd3dcd588639087baa01ef32d0cc6bafbe839a0f87ba5c8f3e61571
diff --git a/dev-python/humanize/humanize-0.5.1.ebuild b/dev-python/humanize/humanize-0.5.1.ebuild
new file mode 100644
index 000000000000..cddd0815cf3a
--- /dev/null
+++ b/dev-python/humanize/humanize-0.5.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="https://github.com/jmoiron/humanize/"
+# Tests are not included in PyPI tarballs
+# https://github.com/jmoiron/humanize/issues/33
+SRC_URI="https://github.com/jmoiron/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build . _build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	esetup.py test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/humanize/metadata.xml b/dev-python/humanize/metadata.xml
new file mode 100644
index 000000000000..1957b0b12307
--- /dev/null
+++ b/dev-python/humanize/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">humanize</remote-id>
+		<remote-id type="github">jmoiron/humanize</remote-id>
+		<bugs-to>https://github.com/jmoiron/humanize/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/husl/Manifest b/dev-python/husl/Manifest
new file mode 100644
index 000000000000..59d87992d747
--- /dev/null
+++ b/dev-python/husl/Manifest
@@ -0,0 +1,4 @@
+DIST husl-4.0.3.tar.gz 3880 SHA256 8a1d622565a01ca553a87f52de97244f33d04c20d9e4d0dac76ddfeccb6850b9 SHA512 1df5e08b24c3b815e4bf643d8bfc911aeeff25328565123122efb2a7042aea1e6e7709ed9d2c6a42390a0cece98863813a83952964c7df1dfcdc566671858034 WHIRLPOOL a745b12d2cac76ecdcaa7a726d2332046871dcaff9091db11d29455230350b33fd7ed07c25209341dc287b87315db9722e0fe72710b6201dc5994a70ae99501f
+EBUILD husl-4.0.3.ebuild 425 SHA256 8e93bc3220e534eefb56634ca6b466f13442791f5e95064022a971b6161ba20a SHA512 a32637920ecb75eb89668116f9ebd27550c36f426d5bbc7d4a33955af71c43599b7e08eef5a73f1c27bb160d0c042366fc8d0289b6c2bed1c3fa43d5af9a8ada WHIRLPOOL 37906bf3489053a50cfdf396f203673b11c0c304f5ffbe1958afab12d7fb06eb1df3c711dd5dd0165d4a51a97c90a630d5c4e2ae7dc8bda865dd96c4c0e2ac69
+MISC ChangeLog 642 SHA256 d010609877469cf963cba4c2e25d7186517d35a8505fc168cde23102efa6cd92 SHA512 3440af4dbb97a55bb5f36c2169d9bf0668f95a1bb757176ff1a4fe1c6e407cdd9ecdcab4c1b24917f0b96b1d265fd61649dd11be3e120a7f77c05c1f7e64b4eb WHIRLPOOL a93872910df8f4f0351a0297794fdfcd49171580afcfea8c2834d52891986a78aaa1a98c28eb4ed24a27396c8e2f8af9dd72e460448c1b3a27f3fa80f7370c42
+MISC metadata.xml 485 SHA256 eef42b4e88dae620b1cccbd86ce14e012d80e18ef58c7c08270d66725deaab74 SHA512 71a3691718f4f980d590facfd9ee7a158b97abec76c8094957584c0c48128b9ae4fc5440a13b6e60fb2cd160e1080ec79974aa366493b2aeadfa970e2a799d89 WHIRLPOOL 2c933d2bb73be44388c119f5e480daafa6d3e6935a6ee02b440dc03d5ec94ddcd0bf745641cd0bf87e885d16cb9372403d8cd929af8248ae152c4e0b71c9870d
diff --git a/dev-python/husl/husl-4.0.3.ebuild b/dev-python/husl/husl-4.0.3.ebuild
new file mode 100644
index 000000000000..0a13677dc6e2
--- /dev/null
+++ b/dev-python/husl/husl-4.0.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Human-friendly HSL"
+HOMEPAGE="http://www.husl-colors.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/husl/metadata.xml b/dev-python/husl/metadata.xml
new file mode 100644
index 000000000000..38858514d7fd
--- /dev/null
+++ b/dev-python/husl/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aidecoe@gentoo.org</email>
+		<name>Amadeusz Żołnowski</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">husl</remote-id>
+		<remote-id type="github">husl-colors/husl-python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/hvac/Manifest b/dev-python/hvac/Manifest
new file mode 100644
index 000000000000..3c64418d64a8
--- /dev/null
+++ b/dev-python/hvac/Manifest
@@ -0,0 +1,3 @@
+DIST hvac-0.2.17.tar.gz 9884 SHA256 2a4f7ea68d55caa90eae6d417765efb7fa31337e095cd69bcf7af0b3f7620270 SHA512 5c35cf3cc2e1e08a9ffa0f485da89725b84753822165a2d5ba0de2db616281beb12acff85d4b091234f2127df43d409001716eb95c9277503c45771d1d2be412 WHIRLPOOL a198c1f224f6cd0fef45e2bca1cc82003cc648f5d3f59f5749454fbf2db70a26f45cd5c9623171e5d1577a81482b3633af24520836c852bb278e3c8b91521a61
+EBUILD hvac-0.2.17.ebuild 683 SHA256 19a1aedcfc0d87d63c3a4602b8ab8c486fa1167bba05e46c04064cc7946cd2b2 SHA512 78a4496f4a9d5cc22282e4df2d154fc147b57bd256ae413ed6e1dd5daf1160be29226d316c9f41a40213dded2f690bcd076c67c9e9565daf67a07bd89d090628 WHIRLPOOL dee4b0e5a9ee1b5b5cc43346f48dcfaa84dff36cc3c3815ab3bdfeda4884c50cad28803b9488e9030204c1e80fec37d14444ee388853b9a5a4506e43c1b9b8af
+MISC metadata.xml 318 SHA256 4d4f21d293d8281464b944e77410ab2d9185f8bd6e3afc3378c9e88e8c5202b3 SHA512 b39506ba5cb096645fb3dff6b16f333216464806289dd293191405bf8e6008e91d89bcfe0aaadab46db10bc6257b08f9070555ed520a5144f2defd586061fc34 WHIRLPOOL 56549ed0d491f6e62152e49c7342657c155773d4f5a87746200424f65aac7e507d0bf381481514c11bd4e2b51cc5d1a672f1a819e8034fe2d822fa269054d4b5
diff --git a/dev-python/hvac/hvac-0.2.17.ebuild b/dev-python/hvac/hvac-0.2.17.ebuild
new file mode 100644
index 000000000000..b156b861035c
--- /dev/null
+++ b/dev-python/hvac/hvac-0.2.17.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 2/3 client for HashiCorp Vault"
+HOMEPAGE="https://github.com/ianunruh/hvac"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="<dev-python/pyhcl-0.3[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+	app-admin/vault
+	dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/semantic_version[${PYTHON_USEDEP}] )"
+
+RESTRICT="test" # need running vault
+
+python_test() {
+	nosetests -v || die
+}
diff --git a/dev-python/hvac/metadata.xml b/dev-python/hvac/metadata.xml
new file mode 100644
index 000000000000..29195172efab
--- /dev/null
+++ b/dev-python/hvac/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ianunruh/hvac</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
new file mode 100644
index 000000000000..9b7dafc7d125
--- /dev/null
+++ b/dev-python/hyper-h2/Manifest
@@ -0,0 +1,8 @@
+DIST hyper-h2-2.5.1.tar.gz 92713 SHA256 673937480f97ad5a1fc8d78ff937352083c82525905b0f631db841c776a91f76 SHA512 e82a7e6b592b43d74defbd4c729ad287ed019881f6ddf0d2dff9d3eb4fdba29cab8d988848ec64b693da77df5cbcacb06eecf1ecd77843c66c9eea8808fc949c WHIRLPOOL cc1d761bc636fcdb1d760c04676c50427d6a0940bf739244e738506982116338e108a4d2d2dc016127894d1dea842709a2f667239cdd9320e4f1fcc73e7c86bb
+DIST hyper-h2-2.6.2.tar.gz 169942 SHA256 af35878673c83a44afbc12b13ac91a489da2819b5dc1e11768f3c2406f740fe9 SHA512 4bbdb26fabe2ee72e1b22e91dcc2a727d4b5c4e2cc465aaf45a15d004062740db87ef5f35f369fd423cdd6fdb61475f0dc423cbe7cec1bc52ddbe8a7488acf1d WHIRLPOOL c9bf4ca23dea8d6223c1d560cd9a95432c782da75c12f9fb9c269245bfe5aa5322f956c587adf00e7a6b8946a8df6c3e26389bf6f679789a1567c5920bfaa5a0
+DIST hyper-h2-3.0.1.tar.gz 2198911 SHA256 fb77d22e844ea4a81ac9305249f4fcf73d06bf7162687980d9a9d20a63133e6e SHA512 5d98b4fb654c20f6b9e6918bb71b88a42a3027bae795f31c32c2b5cc4428774457c44a194f9c819f99b9cfd01753a6e6d8edb6c162020ff463602452d8e9057c WHIRLPOOL ed387ca70f29ee507f46712991def5b7db87ff0b79199848b72ef153d60de74c22db046e926f6dd4af3e955af68455324707f54874014b7c17e91b153e48ef02
+EBUILD hyper-h2-2.5.1.ebuild 910 SHA256 3499c037bb5f0647e65eb098f6cbbeb4208ac8b37008e5e416ecf31fb0780e22 SHA512 d2047fec6abaf6913c38203098a807b6ab7fd08fc8cbed6d4fa55aa00b19a28c2098764bd3a91c2d3479ad6862d61e6133e6a5cec10fd4a634a500d7d6c2a7e0 WHIRLPOOL a922439f389786445741a1f8369a711efb5de17cb64debbb8be81164e34d52aa134b3af446b8725ebed23a8f17b2f9b8b4f4c0f6d6565170bad9d5e1b7961ce6
+EBUILD hyper-h2-2.6.2.ebuild 910 SHA256 476056b9f935f24e426f3115552d73996520b2cd43c5b0b475b0d87534efa866 SHA512 97999129a918910602e18c8ca3cf975766ae0a6d08f0530f357fe94389a46b1cdd4a0fa066d801b84a70fb0ef165250e66d11aeae61b844a8e5e2a81329922b6 WHIRLPOOL 370df267bd73fb2b4f0539054f4878bfb0cb75f7b3dcdb1094f958ea393048450513f714600cade18a712c3add14062522872bed05b101c7ed52134b96572017
+EBUILD hyper-h2-3.0.1.ebuild 893 SHA256 58c45f18d73ffc6b38abf0d0c0fbb7697e42debed448c9b605f9fe969e298352 SHA512 3941a41b1dbea09770d5f3acf285387832965a876f6201fdc3f4793d50cdbb3f7f7e836724522b91edf6f70b5d9cd41410d9c750a1d8ce910ea59a03d73ed300 WHIRLPOOL f879ac2556042f75673b120ed414b68a6b5bfdf0468ea87ae57e25067d5ebdefe9632690ff526dc807c1c46c6ead7cdb51989513e5aa47f7533dd5ddc2e6d717
+MISC ChangeLog 976 SHA256 2ac8927205957778855017e8211a1754fa112dbfd2a3d59b0c66efbaf37f00d8 SHA512 cdbf599e9e4be8f32093b4326e0ca4330ac1df84290164d71997cf3b85b434703a4b729e077cf66079905091ab493e400a4daacfaa3616b5b004c534ee2189b1 WHIRLPOOL 2e7703ceefe0c4879f199df76a709e8f1c99b508d06c5da45db507470643c27232f6354133185fc0db7e47ba8a6313f85b1cec2868c6876207921cf9aecd79ad
+MISC metadata.xml 795 SHA256 3de49311519322aabc4135064fb4c6e528ad7105a0f9915f8ed99e48d17a4b59 SHA512 93236434859273e9d28452c192776e52b22897c7d737807dee35b2d9375e1c45ac42e260b5ab84e8967f4f06dea117d4a82a6476ee2e580f656a0afc9a7f5f31 WHIRLPOOL 84393fb9a3a65adc6fa8fad58aca5b27bfc7acaf31b76a81f0b84298a961ff553274ad1bbb573d07fed35ab5e994a202e146b69811a5f5cfbbd139665a17083f
diff --git a/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild b/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
new file mode 100644
index 000000000000..153285fdd586
--- /dev/null
+++ b/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+MY_PN="h2"
+
+DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
+HOMEPAGE="http://python-hyper.org/h2 https://pypi.python.org/pypi/h2"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/hyperframe-4.0.1[${PYTHON_USEDEP}]
+	<dev-python/hyperframe-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/hpack-2.2.0[${PYTHON_USEDEP}]
+	<dev-python/hpack-3.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep '<dev-python/enum34-2.0.0[${PYTHON_USEDEP}]' python2_7)
+"
+DEPEND="${RDEPEND}
+"
+
+S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/dev-python/hyper-h2/hyper-h2-2.6.2.ebuild b/dev-python/hyper-h2/hyper-h2-2.6.2.ebuild
new file mode 100644
index 000000000000..f8e40011f0ab
--- /dev/null
+++ b/dev-python/hyper-h2/hyper-h2-2.6.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+MY_PN="h2"
+
+DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
+HOMEPAGE="http://python-hyper.org/h2 https://pypi.python.org/pypi/h2"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/hyperframe-4.0.1[${PYTHON_USEDEP}]
+	<dev-python/hyperframe-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/hpack-2.2.0[${PYTHON_USEDEP}]
+	<dev-python/hpack-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep '<dev-python/enum34-2.0.0[${PYTHON_USEDEP}]' python2_7)
+"
+DEPEND="${RDEPEND}
+"
+
+S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild b/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
new file mode 100644
index 000000000000..3b69548f5eab
--- /dev/null
+++ b/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
+HOMEPAGE="https://python-hyper.org/h2/en/stable/ https://pypi.python.org/pypi/h2"
+SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/hyperframe-5.0.0[${PYTHON_USEDEP}]
+	<dev-python/hyperframe-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/hpack-2.3.0[${PYTHON_USEDEP}]
+	<dev-python/hpack-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep '<dev-python/enum34-2.0.0[${PYTHON_USEDEP}]' python2_7)
+"
+DEPEND="${RDEPEND}
+"
diff --git a/dev-python/hyper-h2/metadata.xml b/dev-python/hyper-h2/metadata.xml
new file mode 100644
index 000000000000..65c4be5e6c0b
--- /dev/null
+++ b/dev-python/hyper-h2/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>cory@lukasa.co.uk</email>
+			<name>Cory Benfield</name>
+		</maintainer>
+		<remote-id type="pypi">h2</remote-id>
+	</upstream>
+	<longdescription>A pure-Python implementation of a HTTP/2 protocol stack.
+		It’s written from the ground up to be embeddable in whatever program
+		you choose to use, ensuring that you can speak HTTP/2 regardless of
+		your programming paradigm.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
new file mode 100644
index 000000000000..d3a566be9179
--- /dev/null
+++ b/dev-python/hyperframe/Manifest
@@ -0,0 +1,8 @@
+DIST hyperframe-4.0.1.tar.gz 16110 SHA256 8a57365b9c5046819fb7bb9c47eb4b44fd4385b976edf3518940f11725c04e43 SHA512 0970faf8711b12b4be2cb4a41b4be6d067eea57c40ee063e2ea0c15b148f1eed0214b29c9e8a4341ed453edd8679b55f290c3818157d66f247dc4ab8e3d369b9 WHIRLPOOL ad7283e6f70dabaf932ba77600ededeca357b6fb97ea3e32e2a9d687474bea15618dfc69b3ce8b4864563d05813472e0ddb6000c59f890b3c2fff4b2d8a4a500
+DIST hyperframe-5.0.0.tar.gz 17691 SHA256 b886c7f25dab2e39a95cc01741c56755d11092abbcf33a6e60c465206f6ae7ec SHA512 cb971bfc35938c3b76410432a7b3a677e25e44372fe3005351191e4bbb0fd11564f0e60765d22a96b565e7cc2ac80ea65447673bff2bee36e502bcca89a76491 WHIRLPOOL 251523fd243cf45d0a1d89977b80b632c64d7568686c6591c93180644650a04d047ad925447abc11cd7f0802ccd8fd26c9d829f39dda9a86cb02302c248f59b4
+DIST hyperframe-5.1.0.tar.gz 17851 SHA256 a25944539db36d6a2e47689e7915dcee562b3f8d10c6cdfa0d53c91ed692fb04 SHA512 5326f1b3362086a905e9c9ec63767707547428311b3ccee28d4bbf2ce729869bdc6d30a21617984ec3ac7ebef5919708fc1f2edc08d22b99a7820789408e281b WHIRLPOOL 96ebdd29cc201cbdaa4604c327f4bf992324458436269ce5ef4f3832cf3abaff1b58e378c81ab3a4160017edba4951a37699c88b78632edb8339c2defed96e07
+EBUILD hyperframe-4.0.1.ebuild 493 SHA256 dbf933f2fe30371131cb31dfc09ccf09c9a8a8d1f5329e73dd3f286c71d48170 SHA512 8f5528b92c143bd4d928f44026d9f4462f87514c6a9ad0e799a8a3912b91c56994b2a198f5a8e1ff262756a3d59ca7583363df47628fa2ded9ebc59bef13fb18 WHIRLPOOL e450ce498fa7ae0a02adde7631125199854a66f1f50e366229bb932c0039b34d5feb8b9a573fcc88e48537102e72d57734330f3efa08a0f937d807d39e612e60
+EBUILD hyperframe-5.0.0.ebuild 493 SHA256 a3ed2a373238089ca78df908a5505317310e0f4b81639e539637c62ff821b063 SHA512 82942760c801e98f7ed92998383348da49809008889a0fc2ab7afeab6acb3dd5586a4878e5401f6f7ac633edf899c330f403572e8f8592d8901cb441d6586e03 WHIRLPOOL 0390dcdea0898f18a35599088b7542159d6f0832104e77250bf0214c02f6865d291062204ea96683e6980b2e21ccfc1e1eeb38b5e8e0fae0083a238089a12f62
+EBUILD hyperframe-5.1.0.ebuild 499 SHA256 fe342ad896151262e660ffa10fce785f488178ebab9c3d90a7bc8c801bc30b66 SHA512 e345a457827f6cbdf3cfc1a9bcf38ea482711ce63fbaf205d9c61f30cec14dde9a1b8e4c00a5400d9c9c0f82321b29a15d39fa42a603461f027ef3926e14c5f4 WHIRLPOOL 5092abd39a94113dd2c90f6c6cdbec51fc917deee7da0229cbdedb558fe658d28ebf50c02c8027efa12de12e2ad4243608d48f011432554cc94e97b52944857d
+MISC ChangeLog 537 SHA256 565c6e55f1efc1cd5c70407f29942ac9c9fe20d4ce70e0dadf2b8e8a17a25cb2 SHA512 9b48f9c7dcd56f2e20c12d90b8d74e6d70628fa3ae6ae0a5a1fade35057aff671236028fff097c05d097533a265e7e8efb33570b6cfc5a7a67bc11d26357b3aa WHIRLPOOL 886597fa0b57eb1d5a9d4fc55384ac9b9fb5ec04d32959b912043a198c5e4b6d34682844992a5beefeee07ca2c4cf93cd5dd9f116b7ba490676f033e9038cb19
+MISC metadata.xml 750 SHA256 bcefeb84e00c95719fb8fbdc424a2fff10b9a4229015c24301c4be2d7947b295 SHA512 cc327a1e5cc34d38519d01deb7bcef7fbdb96f24bb426781979423020afc761857223336ed3d76eabf96ddfd26b0a212a9e0b7222e832d781db4f580b99cbedb WHIRLPOOL 5b7bd1b4f0bd0f41b82d33db7c9f91072556ce1e52ed44991d186132bbc496967ba9a07da7bd5bd21a0fb3d707d8e5e1539bb8fc2bd4cdb82eebecbd72ffe915
diff --git a/dev-python/hyperframe/hyperframe-4.0.1.ebuild b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
new file mode 100644
index 000000000000..0aa32143a45b
--- /dev/null
+++ b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP/2 framing layer for Python"
+HOMEPAGE="https://python-hyper.org/en/latest/ https://pypi.python.org/pypi/hyperframe"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/hyperframe/hyperframe-5.0.0.ebuild b/dev-python/hyperframe/hyperframe-5.0.0.ebuild
new file mode 100644
index 000000000000..f53f008741b5
--- /dev/null
+++ b/dev-python/hyperframe/hyperframe-5.0.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP/2 framing layer for Python"
+HOMEPAGE="https://python-hyper.org/en/latest/ https://pypi.python.org/pypi/hyperframe"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/hyperframe/hyperframe-5.1.0.ebuild b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
new file mode 100644
index 000000000000..e6da76854e9c
--- /dev/null
+++ b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP/2 framing layer for Python"
+HOMEPAGE="https://python-hyper.org/en/latest/ https://pypi.python.org/pypi/hyperframe"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/hyperframe/metadata.xml b/dev-python/hyperframe/metadata.xml
new file mode 100644
index 000000000000..2efd7a0723d2
--- /dev/null
+++ b/dev-python/hyperframe/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>cory@lukasa.co.uk</email>
+			<name>Cory Benfield</name>
+		</maintainer>
+		<remote-id type="pypi">hyperframe</remote-id>
+	</upstream>
+	<longdescription>This library contains the HTTP/2 framing code used in the
+		hyper project. It provides a pure-Python codebase that is capable of
+		decoding a binary stream into HTTP/2 frames.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
new file mode 100644
index 000000000000..5509a2f6a80e
--- /dev/null
+++ b/dev-python/hyperlink/Manifest
@@ -0,0 +1,3 @@
+DIST hyperlink-17.1.1.tar.gz 23067 SHA256 a7462dee03672b8f853c26e1ab9e3b1fd4c90a6efde64ab44a851c2472445018 SHA512 13b20fd54c6bb5d7de3c9a04133fdd848413d1308d9944a2288c76d5f8b9bb0c54401ca5ed53460112209806407497526f2e68a92d119656eb58a9a618e9b708 WHIRLPOOL 86f3dab9cd32805ce974d55920ab3a4cad032da740ce3e4fb103b20ee59a501400e302aa6c90f7d905bb49b78a460a4187a21fe34dc3a155b9234f6e48ea11f1
+EBUILD hyperlink-17.1.1.ebuild 746 SHA256 f831d9c269d4b5f1a8abccb6511f102edf6238238d63182386cfcf4b1494ad04 SHA512 d683637d349fe8455d7125d9681d2d37cdf8e199090cff6df6ddd90b8924000dfc528eab404843993ad42a0ffa083e562b24a9239da974f2af1795e48cdf8f9f WHIRLPOOL 765f689e079e84a1dbc496395c7c9749415fb7cac0aeb465369eb86bef82e760f608832b62d41bfb1bbcb109957045e919b512148e860ad8ef17655448a339ab
+MISC metadata.xml 799 SHA256 c71176540b5977a518a64d2d02d796d3af881f1526e128214fa8c71bbf5d9aee SHA512 be631c718eadd3957f4152a6f630f67b0b308067b1bcdf4a9c6618edddfbd6eba61f6e8ff11fe45ed90cd77fefbf360a9f30baa01e5ff1cf703fd3dc59feb734 WHIRLPOOL 7fba5f4310378a6a7aae961abcfd21a540bdd63f062ac1b2d1662491597bb4a13383d6f9655ef71114df3098ac79fd94a8f4c870f348e6b505ed40802edfe0d5
diff --git a/dev-python/hyperlink/hyperlink-17.1.1.ebuild b/dev-python/hyperlink/hyperlink-17.1.1.ebuild
new file mode 100644
index 000000000000..9e2620d13d17
--- /dev/null
+++ b/dev-python/hyperlink/hyperlink-17.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="A featureful, correct URL for Python"
+HOMEPAGE="https://github.com/python-hyper/hyperlink https://pypi.python.org/pypi/hyperlink"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-2.9.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-2.3.0[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \
+		py.test -v || die
+	cd test
+}
diff --git a/dev-python/hyperlink/metadata.xml b/dev-python/hyperlink/metadata.xml
new file mode 100644
index 000000000000..ddf1f449113f
--- /dev/null
+++ b/dev-python/hyperlink/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>mahmoud@hatnote.com</email>
+			<name>Mahmoud Hashemi</name>
+		</maintainer>
+		<remote-id type="pypi">hyperframe</remote-id>
+	</upstream>
+	<longdescription>
+		The humble, but powerful, URL runs everything around us.
+		Chances are you've used several just to read this text.
+		Hyperlink is a featureful, pure-Python implementation of the URL, with
+		an emphasis on correctness.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
new file mode 100644
index 000000000000..8a4a1f3dad95
--- /dev/null
+++ b/dev-python/hypothesis/Manifest
@@ -0,0 +1,7 @@
+DIST hypothesis-3.31.1.tar.gz 464365 SHA256 b2e5413e5424b433f013f4c7c5308130a55fa7dde346ffad2e0868139d442e57 SHA512 2bb0bcf1030374a17d0002901a9ffeb2bd522917428989206a3398e13dc0523703b9b39331cc503ee4d815ad48dca4826cc49379434767803373aa7b81a2625d WHIRLPOOL a46599f7e1a5c93e2de4dff00f3b40f75972cdbbab3ee943e1683774cb9dbbb5e7c6cfdbd700e08c72c772b13b21789ee39d6ee954ce47f77ee79a477ae5e5f2
+DIST hypothesis-3.6.0.tar.gz 73586 SHA256 ecb0e711ab83032c54605d88fda1e07ca5c6025bdb5e91deab96eca29491f678 SHA512 cb885628e5c38ab9312cfb177ebc3c014617d21031737f5fba343ba485c1b8ff82b1302e7bc1d3e79192bfd8324fd0501498c968f3ac8343829f8965f6354389 WHIRLPOOL 189c788fdd0a326879a468061c271b14056da5f7dc1d5975e8f360cd5a91957eb8f79c26a045fbe49d7b11f7cc09024d3d09a353321b1dda1d4d96b452fd9e7b
+EBUILD hypothesis-3.31.1.ebuild 1100 SHA256 fda1923e9047ae3efb96595e3c8ae3305e2e9b17d207022640360d1c26cdac0b SHA512 695fb455580fc5d752e8b8d2be0f9110fa4074c027f660de11cdccb2877d112c2d853ed0f3e2ce982abc59916f4e25869c1f217051e4a07a1dec39e920d23b3c WHIRLPOOL 230386cb9b6ce4ca94a88a5bd3f0066117da91da0bafcb43ece9df1fbfdc214f318ad49f3e1184f4c01604dbddcbf90aa6c331efa41f2d9d688e9581b5dbce6d
+EBUILD hypothesis-3.6.0-r1.ebuild 915 SHA256 fe23c94089626188676ac9fd4874aea2b85a13034602f30f4e846a5ea0140fef SHA512 83ab953c3eca8c1e3672eec5d4acec86566cd2eb6151f7304ad57f8dd9ff485e40322ef4dc30b9b7444799bd919be9b3b5d8165c663a0f4e10d0e69e90eab6ba WHIRLPOOL 446636ef0dc735872fa2bed6a8d8a97ae7ac737ec04091020be3e576531b1cd863e328bf60de19e7d8166ee7ab21beb8d43da4d2bbc4a44e63e01cb557b7c870
+MISC ChangeLog 10982 SHA256 16d4bd011e6f9233e9a02424c453a1fba9c516f65a692d81536359a53af2407c SHA512 c393ae1550bc62ff5562fd28c91ed27b79455f199d77c6b1f61d7b554fb5f8f73f66b9b494536d119787c4764d24d3d3bd99eeea78ce9f25af1f223582170375 WHIRLPOOL bed69f6e30e34dec48e08e15e78921632389b7e8185d8db7f55a8c78b5956e6c0a1a661351f4f731681406588d1627aef3a44f98bc1e6fb711d4d9476310330f
+MISC ChangeLog-2015 643 SHA256 8bd7afabf7b29c9cef84286964de6f612b036e52c56234c7daf0ef38463425bd SHA512 6d0960bab281c57ff2ed827062421fd636f8dfe1b388530fe02858883158d2a47cb95521736d23799f8928e2d7a8c108894dd05b8725531da9156df850bac405 WHIRLPOOL 40eb3e014b2dac792d9668b27c1281f7044878bb26224141a030a92f265d3e83a651c3faeb4c92e3655502f1205f53e9bc7fd7afc8059fb178fc808670a00cca
+MISC metadata.xml 386 SHA256 b408eaef54c087510bce48e2455ad5d710ac25d75fdad53b8b3c0e6200c3a2e2 SHA512 e0ad6c17078a2a06250d83b93484b2b449fb6924a7f083121f7368e7032ea970489067f8231b5d27edd9875434c32dc02801d01d4ebd8bfba33b3761429e5975 WHIRLPOOL 911346939091bdb9b89a90ed98d09a09dbe610803d9e4250c1afc9f8811bf13464c3c5af6e4ecc6e12ead2661b41a4bf2bc2329d88993fa25499d3caec3dea45
diff --git a/dev-python/hypothesis/hypothesis-3.31.1.ebuild b/dev-python/hypothesis/hypothesis-3.31.1.ebuild
new file mode 100644
index 000000000000..4869c0b7b9eb
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-3.31.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.python.org/pypi/hypothesis"
+SRC_URI="https://github.com/HypothesisWorks/hypothesis-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/coverage[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${PN}-python-${PV}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild b/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild
new file mode 100644
index 000000000000..cfd208934d87
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/DRMacIver/hypothesis https://pypi.python.org/pypi/hypothesis"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*')"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/metadata.xml b/dev-python/hypothesis/metadata.xml
new file mode 100644
index 000000000000..0eb6c1c42697
--- /dev/null
+++ b/dev-python/hypothesis/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">hypothesis</remote-id>
+		<remote-id type="github">HypothesisWorks/hypothesis-python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
new file mode 100644
index 000000000000..65cff2e4faa0
--- /dev/null
+++ b/dev-python/icalendar/Manifest
@@ -0,0 +1,5 @@
+DIST icalendar-3.9.2.tar.gz 66283 SHA256 0b2d2610e039404e22a0a72fe5a59614374e7bd15ed824ead6ef6f8d36b41e2f SHA512 da50bba72f7a114263672ebd45cfcca5f7c2eca48538901f595b26ef18bb21a6290da4392c62cc27d1202083fcab7f5bfe6c9a463df38087de0ef764999f7eb1 WHIRLPOOL e5162b46f97a3b86e4e2eb75f2fdba2a3418f3b8e32a239f16f607811fbadd376619e9805336eb272f41aca2c0e6f9d724d92d4740c7910536ad64ef673de7fa
+EBUILD icalendar-3.9.2.ebuild 1301 SHA256 c7871bd67492ce28f742d4ab2b44b679c14ccbb6317f08218db7055d55635efb SHA512 b7cb075497bf8282e3b2332a701805b4be1f3881f9ad248f49750606abf04d9167b0326308898ec7332530ede1ab28e463b8bafd444bf68f14fd597af3261219 WHIRLPOOL 47d205fc08182cf5609522e6a5ec1304d9c8d5e6deb035b92dc7aa205f74331b5d2420dda2f1aeb76f56d2fe3604fbdb0b302bc47d309f98bb0a0fac77e1d93e
+MISC ChangeLog 3545 SHA256 72a8769d54fc11a22d50339e96e3207d80dab78561ffffccb9bea498d5ee5479 SHA512 d481476a82aee110c368d9fde43c33f9e6ac53459fc3b2f501d5fdf61d2ed919fade995f1fb40034346f6f5cdeca2aa9bc380802894e29e6d34f0dce0e7c7c92 WHIRLPOOL 0e8590d6603b8f51b0a2b811192cf0aaf4481dbeba54095ae557dd61958945bf6da8ae6dc0662aa1b56228dfdb691b02c2eed702345f893cc07dc08d0f7732b9
+MISC ChangeLog-2015 7846 SHA256 74784b74d4f203697668cf8d38fb3f4c99e81a7d0f70f7b3812689d7b2253e7e SHA512 30b4d0e98096d7e799eea92892da833a50f40f57d9b6a882822abe02690c9e89c514309b454e6cb1a184d08fd190f174b4872d5b0a8f10a9722feaf986d8a158 WHIRLPOOL ff2ab8c62f9a4be6138dd1fc42b4562657529c767e5de75ebb9bdbf1dbb9e574b30d9b7ba34f4d16ac61da3713235352aef8719b956ed43c00eebc2e5d5d0dfb
+MISC metadata.xml 477 SHA256 cdf3f826f494d203034d113f4fa0924a16dfaf04542a22b07e7bebc709d7f552 SHA512 468420550f8bdacfb0425ea8df443f1e25552f3e2c132869dd12a1cd74cee4b8174c2dfff2023a80d17f570e8c6d0b0163968f603086d8ea30f61a50e174ad22 WHIRLPOOL 8dbd6a8a03ba3806acc653bc2f3a402bbf885c6dc3107070b4fde26f1deee8de1a1d35346a18052322a3f7eca7485413b0a7a98b62c972d33954541423fece01
diff --git a/dev-python/icalendar/icalendar-3.9.2.ebuild b/dev-python/icalendar/icalendar-3.9.2.ebuild
new file mode 100644
index 000000000000..447c91f3472c
--- /dev/null
+++ b/dev-python/icalendar/icalendar-3.9.2.ebuild
@@ -0,0 +1,50 @@
+# 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 )
+
+inherit distutils-r1
+
+MY_PN="collective-${PN}"
+
+DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
+HOMEPAGE="https://github.com/collective/icalendar"
+SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE="doc test"
+DOCS="README.rst"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# reset conf.py to not read version from an installed instance
+	sed -e "s:pkg_resources.get_distribution('icalendar').version:'3.9.0':" \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		pushd docs > /dev/null
+		emake text
+		popd > /dev/null
+		DOCS=( ${DOCS} docs/_build/text/*.txt )
+	fi
+}
+
+python_test() {
+	# From tox.ini
+	coverage run --source=src/icalendar --omit=*/tests/* --module \
+		pytest src/icalendar || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/icalendar/metadata.xml b/dev-python/icalendar/metadata.xml
new file mode 100644
index 000000000000..43e4acf159a3
--- /dev/null
+++ b/dev-python/icalendar/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <use>
+    <flag name="doc">Generate examples and other extra documentation</flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">icalendar</remote-id>
+    <remote-id type="github">collective/icalendar</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/iconvcodec/Manifest b/dev-python/iconvcodec/Manifest
new file mode 100644
index 000000000000..e8458c2bd242
--- /dev/null
+++ b/dev-python/iconvcodec/Manifest
@@ -0,0 +1,5 @@
+DIST iconvcodec-1.1.2.tar.gz 17643 SHA256 89960c9192f1398fbe62e8b10e1b46e92638324522081d8aff7540e201968cb3 SHA512 e63af4166cc8199dab888d9bf59d666546bceb1f71d2ce8423c4d3c9b374e870e8a526ffe1254cded346f9bc7a0f23d23e6e9120224d45fa4755468dd0a995e5 WHIRLPOOL 643df353020aad226343105001952080408eb3e2ead1cd7de5c19565981e87fdf40f772eae1450bcf122fbad5623269538eb63b7397d345c657a16dc1a6f3a9d
+EBUILD iconvcodec-1.1.2-r1.ebuild 482 SHA256 118bf29cb09f9c7feeaccc70d64f635a3868c7c3570f0e70b3367128ff47255c SHA512 62ccc8c282b1160e91dbcf072aa4d3928713fb6f3d92ff8724097487dbd4bef4b2c3ea4290adbf42d8355bceaceff5530371de17d8711489d2dc601564ffb60f WHIRLPOOL b625849aa60ff61c32a8cad8f3ae636b4aa6c74b5ed53692a0c6cf8b9b094b9507af50bce0323aae22ff8fcb41ddf5bd9e4b153c8985d998c3f4489ecd38ddaf
+MISC ChangeLog 2792 SHA256 7b49806b1c36c7830c7e3d33da87e9dcc9d58d6cc53c0d5d029cad2b856a7d5a SHA512 40e4c05190f45e7776f5a3872289795d1fe57da4d8982302006df3e71bb4f9233129105feb0f2d5d0a7f0b953f95eae3ba632161b2eae275d5474e81abb05e4b WHIRLPOOL 5e0be2fc09dc70f2ae69fb51824b7d3c1f31a7d40cb82563bd41c263c4b41d34e5ba929de0f55f368ccc8a9fc095a203ff1a6ecc0afa51f947412e5c2020714d
+MISC ChangeLog-2015 2148 SHA256 c5d9527a582223c15f7987d0d727d51e467d7c696f8d88176df19121dc086358 SHA512 43fa4a4e9b613f66b4dd0c33915687caccc975d415d3fe3701d683ee2e0417effaed86c0d876a54f7172f3f088ad161457b32648a68c2f9f80d8abb43704b64b WHIRLPOOL 2a6bcb87440b6daf3ab22098221d1394d9bcae6b7d3a0ac6dfc57ef16bfe764250b22440449cf3495120f64f796b921eb6fbcd17dac327b0afdc73ca454e0969
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/iconvcodec/iconvcodec-1.1.2-r1.ebuild b/dev-python/iconvcodec/iconvcodec-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..8907f1235ade
--- /dev/null
+++ b/dev-python/iconvcodec/iconvcodec-1.1.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Codecs for Iconv Encodings"
+HOMEPAGE="http://cjkpython.i18n.org/"
+#SRC_URI="mirror://berlios/cjkpython/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ia64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_compile() {
+	distutils-r1_src_compile --with-libc
+}
diff --git a/dev-python/iconvcodec/metadata.xml b/dev-python/iconvcodec/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/iconvcodec/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/id3-py/Manifest b/dev-python/id3-py/Manifest
new file mode 100644
index 000000000000..d232579c4714
--- /dev/null
+++ b/dev-python/id3-py/Manifest
@@ -0,0 +1,5 @@
+DIST id3-py_1.2.tar.gz 16650 SHA256 ba612342b59a49cbf9a7eb23a646667757ffda96dc23b67245fc6cd8d90c2022 SHA512 d629a964e9008be1645815d659b45b2c1cbecc4cb5c51624adb733e0a847198848afb3959f2342df9077ce01ee1f546997639c56bfc357fa9ceec7d01da8d4fd WHIRLPOOL bbc4503ecaace0d087f3f747288b8f4ea4896889fb38695b53f1813f5b3ac258045831d522ae7b4da1d8d632a1c1dd78d01d23770a0128151f0acf96cc0a9bae
+EBUILD id3-py-1.2-r1.ebuild 411 SHA256 722826ed6906a152571d05a930b9f00029e44c2fe52e55027a0c34fb8c2a8dcd SHA512 a884b9e87c637453478d4cf124877c1a977f71e40439af52c03b3e699dae58f70527a05f3c2460207d137b5b64728e6fef7840d560f3d8d5d1be465f17dcfc9a WHIRLPOOL 7eee6cab18cd963793d0b07d98fb3b43152d32d2c51ec36c4c298c57ae6b6fab3f5ac57816341fde5e54cd06bbf1127ccae93ccdec7fd11f82f26f3e19f1a91c
+MISC ChangeLog 2941 SHA256 93b2b3aafd164f6f6db02b834216a436bdeaf636f91b25dc5921a2f14694e594 SHA512 998a48d3afc7c4d5f3f83fb5a3d4b8db8ea08dd9b8eaef3f42035cb7afc88bcda2cd3ad472ed100ecd80ae85cf4a6d65f1958c701b06cb4e75ba9888cc9619c5 WHIRLPOOL 44d2a9cbca12eeb0297695cc259cd4199cd4cda2861360c4332ab089ec90bac1a4ca5afb9e5be5db397fb4f54d9fefb46be7daf5bfa95fa711ca446fd9d6c4ef
+MISC ChangeLog-2015 1787 SHA256 4d75e393d691a240b7e2f9c886a334e9d989d8f66a7c1a4c5f32398c7c73a545 SHA512 5346548271142e9131d643c90cebadffb794ebadd86ec962aa04d14de6aa0b20bffe0cef6925c9639939060941ac19356fa66ffa8044e8329aaad4c4611dda6b WHIRLPOOL 49c930e0b804049a58169a278828c1070af12544fa15ffe6a8ee39f39f18e69a02825f954c9c9e5a4752c5a9dba0825221f03667aa66226b6e7f8138d854d705
+MISC metadata.xml 316 SHA256 78b07c433bf7d62c2f1f590c5f6d93a36c98be3f56c872e835c3574a1685c1fd SHA512 a256e8051e33604b9080c37ffad530095c8b13bd403168614c8a41255e939adb4d5a5b8e1c5e1dcf0f2b828d536a6e4fac863c8d7fe681552989160b6d962d44 WHIRLPOOL 8b6cd4d332508aba922db87a19d1f93dbdb7eda840670d7e73a6a5ec1c212e0dd9afabb8f2f1dcd7b6a0ee88c83e2ec1af9d1b61885e8c4721ae24926535d64e
diff --git a/dev-python/id3-py/id3-py-1.2-r1.ebuild b/dev-python/id3-py/id3-py-1.2-r1.ebuild
new file mode 100644
index 000000000000..b6ba3171d395
--- /dev/null
+++ b/dev-python/id3-py/id3-py-1.2-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for manipulating ID3 tags in Python"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
+HOMEPAGE="http://id3-py.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
+IUSE=""
diff --git a/dev-python/id3-py/metadata.xml b/dev-python/id3-py/metadata.xml
new file mode 100644
index 000000000000..490a10aeb337
--- /dev/null
+++ b/dev-python/id3-py/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">id3-py</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
new file mode 100644
index 000000000000..96e5c373add2
--- /dev/null
+++ b/dev-python/idna/Manifest
@@ -0,0 +1,9 @@
+DIST idna-2.0.tar.gz 135150 SHA256 16199aad938b290f5be1057c0e1efc6546229391c23cea61ca940c115f7d3d3b SHA512 005f88e954f13ace584ced510752da58d1cb16ebfbeee10aeef5bec57b3c61a3a5d7ce0bb50deba6dc90b412607727bf94a95a785e91d6528cd8633961c142dc WHIRLPOOL d865420f1c5f648d12480af93a52e0b2d463064c34c57ce56022f6965c2e4f6a49244e7798b9fcc18a7c6517b98e88bf84dc52e0050abe2ce504365b5579d2b6
+DIST idna-2.5.tar.gz 130211 SHA256 3cb5ce08046c4e3a560fc02f138d0ac63e00f8ce5901a56b32ec8b7994082aab SHA512 29a69ede25a8855135c763da5d20ff81832c710038a38521c127d5b7b24b355c6cfa5e9f9a2a4ef1fa4437537d1d9e4b448357e07b4b5e3724d98fee0a3b7835 WHIRLPOOL 8b54100310e57a35eacbdabd14f3e612b5ecbc87335e174ae84aeec4e52d29f4ddd570c5958228b3b7b4bc706cecd16f05862b6669aa9ca5698fe7e7d4eab469
+DIST idna-2.6.tar.gz 135992 SHA256 2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f SHA512 cb5dbfab44c4d11521c67f9d29391f184d1267a3da6dc89f4ed12c60a7a909d5c7474c3ea2bddd0af7063f4f620e87a8dd586bb07e8b961b30b1dd7c969704c2 WHIRLPOOL 8758527e6c57a7f7a669b82609d00646311ce0617d35e9cf7d3f4ee635955b0c844d906f0ff3aec42f59528ae1554df60bf1272c0734fe28e79503e86619fe4e
+EBUILD idna-2.0.ebuild 579 SHA256 0e71f604b1092774284d9300dea6b93f663cdd41d5c8d7a7146bb7607e9e3464 SHA512 7f624723a6912c61091a9f61ca7315785828617f45951dd151e9c50d780d57671473e86c19325ce793c892ef4b00faa5c7958565ac1813a62c5c1dcd000bba43 WHIRLPOOL 5cf880b975a44ce219fa5b98763f4d1875ff012b6c197bc86c561b8c9b03e87ed8cb6cb78b530a4ab4ad80719d86889274df3eae8ecba12668ed221334834ec7
+EBUILD idna-2.5.ebuild 604 SHA256 4b27199ae1ed941f78d8b91a9e3a425da6c9410df3172d92f498d82aeb2a8543 SHA512 d2722bbe1c458e10655a70079ded3d67a2b7b7d18f131e507dab42933abfaeb4c8579a8641971109a1b4bdd2220f5edea5cffa01b545fde68dc61968523fe9c9 WHIRLPOOL ddcb7f59933b540be1db2235c2fd5ef4d92776ae1b3d881336e7b80fc7b69fbed0c0f26fdd2eeae829147766c46ffb3ad391f8bb08a3711cb13d634077093bf3
+EBUILD idna-2.6.ebuild 648 SHA256 279c679f7d6f3306fbb352b2d28f7203351e5b15c40471e3396222a8c3287ec0 SHA512 2527b7031bab2025258e1204007e4239785a2ab57a6c4db153f9b6ea7c3605d40b1447776fa57e218b2cdaf19ac58936d236dee43f84e417ce6cad1c6b2f88e0 WHIRLPOOL 86cbd127ccfe779a1ae87043c63cd81ec5e010ee7be736050ece752e6a11998cc0b2452713f3fedb03646c511d5cf47ed7192ff5ce29b1849d5faad4d81f5440
+MISC ChangeLog 5231 SHA256 79c04a9f929590ef24255c3cae61179f32b301b0292b37ae7a8898740d295f89 SHA512 9ba4cf5b635c67763629f442d70300b35398c86d4ff50ba0c4c9e6d2c3707a1e76c9813e72c9c8fe73584e7ae1511775fc6efe737bc8153ec8941012273e73cb WHIRLPOOL 7238399fb61af7e7a776766b92b7c08ec20684e4e2b1832cea4ff5d691cbe87ce784c6dd48b3ae36b0816c9cd7cc9cf58ed11c57618448d85f78a58ffeca08b0
+MISC ChangeLog-2015 1075 SHA256 95dc2b47514f3c2c4e1b1945000c2b75e0d994639668b0594cfb3b2cfd465608 SHA512 c1f43adebb25bce3ecce106e952e76f1d21502f66fe299dd5290c876777f104787484027f810794617c7d1175f77612427129aae2d946c790a13f01c8a27fa79 WHIRLPOOL ba6dda9a045a3473364bd108c2493a8a6a7dcb980e757265f82cb1adbf2e42b48c949b8364308023b12e552c8de1cbf471c3f702f04263a9489e3a19f18c6589
+MISC metadata.xml 367 SHA256 6eea5f18c0ae0d7467b5548ce1daa6520ccdc30159722bb7faf8f14bc5b0b1bb SHA512 50f13044fec18651463e6199826a39c7f28c783e7da389017e2dc2fd6f17b6c93e4e437a1019e0e31605a06a428c31a2fbc12744daa957cefbba2d76b511331e WHIRLPOOL 6a1830597687bc55602f0717067798f754a2001529619e6a084e30ddec7efdb38eb6ffc8e0158508d215abdfc1b65a4371abc0247989957946ac35b0d1c3fee3
diff --git a/dev-python/idna/idna-2.0.ebuild b/dev-python/idna/idna-2.0.ebuild
new file mode 100644
index 000000000000..0237b10e618b
--- /dev/null
+++ b/dev-python/idna/idna-2.0.ebuild
@@ -0,0 +1,23 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
+HOMEPAGE="https://github.com/kjd/idna"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/idna/idna-2.5.ebuild b/dev-python/idna/idna-2.5.ebuild
new file mode 100644
index 000000000000..62c331816862
--- /dev/null
+++ b/dev-python/idna/idna-2.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
+HOMEPAGE="https://github.com/kjd/idna"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/idna/idna-2.6.ebuild b/dev-python/idna/idna-2.6.ebuild
new file mode 100644
index 000000000000..3fb7b28edfa0
--- /dev/null
+++ b/dev-python/idna/idna-2.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
+HOMEPAGE="https://github.com/kjd/idna https://pypi.python.org/pypi/idna"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/idna/metadata.xml b/dev-python/idna/metadata.xml
new file mode 100644
index 000000000000..6ce490eacf0b
--- /dev/null
+++ b/dev-python/idna/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">idna</remote-id>
+    <remote-id type="github">kjd/idna</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ijson/Manifest b/dev-python/ijson/Manifest
new file mode 100644
index 000000000000..afb6dfacad65
--- /dev/null
+++ b/dev-python/ijson/Manifest
@@ -0,0 +1,5 @@
+DIST ijson-2.3.tar.gz 11800 SHA256 5db72cc5ebad786ee2cf85ae277ae068c14f965e0747fd8b65bf4d8d9c4c8395 SHA512 4d6647cb72661b26a3b36addeabec79fbc047a6c3b86aa419c178dfb8ef09bcdefdf37ed729f26b4b6b176cec06230ef3dab53bdff4c4b401bbc835eb486d038 WHIRLPOOL 0f1bef3e7f3237d259839253cd0c433bdeafdef4314cc2f50d1965abb835179a4781c39f11a8fd4cdfdec1688c53f26bec7d051a94b40fa808ef71a7df6be5f9
+EBUILD ijson-2.3.ebuild 579 SHA256 689d0fc9e272ca317d3cd4e6699d5503a9d0045e572ddfce9ac151174a9f7129 SHA512 9952594f801e6e969566a46dcad5f4e6d224c2f34dfc89b92ed79438c8a16c32aa76d98f2d2d758797869de900cb3a89dec5c46b2f3a33d1038143151f397b81 WHIRLPOOL fb49d1c34badb215a01de234555fd5e3f192c21209ffe6b2723f583e17e2c474d43fd13c8e3e896e14f2d0446bba9e3c8ba7516c737a7ea59af8780a4569e1d8
+MISC ChangeLog 3320 SHA256 6bf3947b2be8f080d25f06827a190f8f30fdf7a97036f5550f2f9b8d1ae546b7 SHA512 2d8d38354744237afe7619e0296b4ba6cdbe5deb706c1c93ac501894e9b0d6d5446db9a4f2671ed6694ca14dc32e917fbee14cc230cde6d144f3d1522bedb31f WHIRLPOOL 79b3e308543a8f378dc28202cc733ed61d909a363122bf441dfe210c8c16ffeba1320528b308f414b1e91a0ed0c422c0d1a56d133241faed4d06e3825062ee84
+MISC ChangeLog-2015 1728 SHA256 37a65a1090661952ec7dcd1c193933f903a81cc7941f019f84f6db52eb51c392 SHA512 956c43bde823c6cf05f96cc58d396ecc5bc2c0a3ba33eef41194446ed2714539e22426479e98211307ee69185300d9a010596a1fdb76273e2e029ce399ed83d9 WHIRLPOOL 26d11bb4b37048a9752ffa5c564d0bb5e81167ab614d120b244e74db4c812ef847e84202ecbb1f45cf06ab6dd422b9e78a47479889518472275f4221ff9f3cac
+MISC metadata.xml 375 SHA256 c39a8f282757afd212f91269c64fabee8de47aee64fa7feede6f8f4ffa5d642c SHA512 99d84d8cbffb0864a3473385642d96238a3ec4679b13d60361ce147536e58780978ac5ca947533fd25d97f05ec9b011ce3a831c05b90a24281b828b03fb80919 WHIRLPOOL 8cd0c43927beed7c02896268171e71659b6943d148f2c0ee6d32ec45625ae7e62d18790e01166384fb2daf8dff17f6409eb694f7871df0a8ec6c13e5160acf85
diff --git a/dev-python/ijson/ijson-2.3.ebuild b/dev-python/ijson/ijson-2.3.ebuild
new file mode 100644
index 000000000000..cb1eddd040e0
--- /dev/null
+++ b/dev-python/ijson/ijson-2.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Iterative JSON parser with a Pythonic interface"
+HOMEPAGE="https://github.com/isagalaev/ijson https://pypi.python.org/pypi/ijson/"
+SRC_URI="https://github.com/isagalaev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="dev-libs/yajl"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	${EPYTHON} tests.py || die
+}
diff --git a/dev-python/ijson/metadata.xml b/dev-python/ijson/metadata.xml
new file mode 100644
index 000000000000..dfdc2dc6c0eb
--- /dev/null
+++ b/dev-python/ijson/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">ijson</remote-id>
+    <remote-id type="github">isagalaev/ijson</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
new file mode 100644
index 000000000000..882c1a35ced8
--- /dev/null
+++ b/dev-python/imageio/Manifest
@@ -0,0 +1,10 @@
+DIST imageio-1.5.tar.gz 187004 SHA256 6240f5e8391b34bdeacf23bdb8f70c7b578dc11dec1644a6ba81b4153ad512f4 SHA512 2913353c02a26236f254c6cefce72cb8179cedeac4e1ebae435218dddfc35cbec9e806eefe99e174ca9c572c09725a697e1165f6be0bbdc657a9fcf2312c7460 WHIRLPOOL 0960f559cd47dcb0eeca2133a8118004b7fed7250da0c9a776d6745558345a59682f103bf2159e71c6f6571bed90a3879fb95d10c2af69ef83d80afe6b6c3a61
+DIST imageio-1.6.tar.gz 201043 SHA256 7b6519c358b87b026f5253c4d55e21b8e84f556adab1f04ac3726937e6b4baa4 SHA512 bbb22a8c48f54e5bec8475eea041ce361b259cd8113463fb85e6c02b9c5a9805e675eaf2c693a26d51d1609071ce92d54fe76ed5563ad48f562b465ab586bb43 WHIRLPOOL 1d429c1eff65e5df30d665f3819267271c5d351f448021848310f74c814306991b8b794a0279a5ece6257fc98738083c7f40f35b73072efa1e504164f674ce58
+DIST imageio-2.0.1.tar.gz 224487 SHA256 cd0d32f7621b02faa0b5a8533e58579f011b75e2f6f8547f1c55a8c2d464664b SHA512 8adfcdb897d898806ef4a3227730a45a663eb485e126db62d8c5f79063aa8aa2b83f4a9c27d4ae47b4ca8e2ed82125d04642952c62fb29dd1fe8dfa11430bb58 WHIRLPOOL 949e83d466dca03e22e73de761c343a90fd73295e23fcf00b923d88f5ab294d46784f725bc369422a458bce6072639a89856233ed2592e72c150759ed31ea01e
+DIST imageio-2.1.1.tar.gz 227148 SHA256 7aa56f4ddfb7b1e6bf99d752eeee93a07d2fe2bfb299fe7f2735c0690533028d SHA512 a01ebf8fe9cc3761b0779107bcd610ecf4c9a5e6e789bdc15983e2f4ff65d03351266431391519cd637a98f48a1a9f91a2123191d0aed5790bc731b007a85d29 WHIRLPOOL a2cf5042a9d88190205608e3b4da33d6905964d97ad2ebf6796d5d5545b735b4e8acff0fb35b807cc35cdd5c04c7cc4e0abc3b8f932fa5ab7397e68aaa1fbfe4
+EBUILD imageio-1.5.ebuild 553 SHA256 a66934b3485e6acc111c619ff84a59bd6944472c0829216ce05bfb93e19a7066 SHA512 f8200765530b794114a9ed4320999f4de997edf789577f07e93dc3cf3049caece4137e49b60cb3774466b291b50feda0ae4db727c503c8649e9c31910c2af6b2 WHIRLPOOL 65c5fb8a8907209ba4beb3c985dfa8d9a88ae66bdfb9bb8c550e18352bb7df534e58cad23346b2cb9e11ff31710db7bdbe19a8faf8b10f1231452d97ec37277b
+EBUILD imageio-1.6.ebuild 553 SHA256 a66934b3485e6acc111c619ff84a59bd6944472c0829216ce05bfb93e19a7066 SHA512 f8200765530b794114a9ed4320999f4de997edf789577f07e93dc3cf3049caece4137e49b60cb3774466b291b50feda0ae4db727c503c8649e9c31910c2af6b2 WHIRLPOOL 65c5fb8a8907209ba4beb3c985dfa8d9a88ae66bdfb9bb8c550e18352bb7df534e58cad23346b2cb9e11ff31710db7bdbe19a8faf8b10f1231452d97ec37277b
+EBUILD imageio-2.0.1.ebuild 553 SHA256 a66934b3485e6acc111c619ff84a59bd6944472c0829216ce05bfb93e19a7066 SHA512 f8200765530b794114a9ed4320999f4de997edf789577f07e93dc3cf3049caece4137e49b60cb3774466b291b50feda0ae4db727c503c8649e9c31910c2af6b2 WHIRLPOOL 65c5fb8a8907209ba4beb3c985dfa8d9a88ae66bdfb9bb8c550e18352bb7df534e58cad23346b2cb9e11ff31710db7bdbe19a8faf8b10f1231452d97ec37277b
+EBUILD imageio-2.1.1.ebuild 553 SHA256 a66934b3485e6acc111c619ff84a59bd6944472c0829216ce05bfb93e19a7066 SHA512 f8200765530b794114a9ed4320999f4de997edf789577f07e93dc3cf3049caece4137e49b60cb3774466b291b50feda0ae4db727c503c8649e9c31910c2af6b2 WHIRLPOOL 65c5fb8a8907209ba4beb3c985dfa8d9a88ae66bdfb9bb8c550e18352bb7df534e58cad23346b2cb9e11ff31710db7bdbe19a8faf8b10f1231452d97ec37277b
+MISC ChangeLog 822 SHA256 14a7e63f023b15775756b02b1754c44802ce894a90e7a2fa803360198e80063c SHA512 2d95a03505f29954a2eb1ae600a71c033f1bc046273636c0731ff35b219101bcb3977253ef191edbaadb0e61ccc712d42d4fe0fee2b9b214e64527453c84ee96 WHIRLPOOL f18ba10ac51c58898c14a39e8a9808af0b298b80d348399565539d61788c63e155881257a5a724fa5762bfa2ed4fdbfd36f80065184e9f8e2cb19d49a2e04e60
+MISC metadata.xml 763 SHA256 935206aeb1c1f3b66c2bf365f4c871d08ead6f1ec5d1d4d5f9ec7139f043b7b6 SHA512 b6729dbd110c5d7c977618ba6fdc7585609e4bc69f93d904a8796781273b38c9dd0e9a29e782f47e36d49dc72032d6967803f88e418a6a1ea8715c719342136e WHIRLPOOL f333c47e137fed66aa364af1a9e1ec1358fd953cbb41491c78667b290036158ae16797d132b3a8954cc5e3d216fce96f9e0d1a79e63c702945c83f7713ee53e2
diff --git a/dev-python/imageio/imageio-1.5.ebuild b/dev-python/imageio/imageio-1.5.ebuild
new file mode 100644
index 000000000000..faecf0cafe9a
--- /dev/null
+++ b/dev-python/imageio/imageio-1.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="https://imageio.github.io/"
+SRC_URI="https://github.com/imageio/imageio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/freeimage
+	"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/imageio/imageio-1.6.ebuild b/dev-python/imageio/imageio-1.6.ebuild
new file mode 100644
index 000000000000..faecf0cafe9a
--- /dev/null
+++ b/dev-python/imageio/imageio-1.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="https://imageio.github.io/"
+SRC_URI="https://github.com/imageio/imageio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/freeimage
+	"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/imageio/imageio-2.0.1.ebuild b/dev-python/imageio/imageio-2.0.1.ebuild
new file mode 100644
index 000000000000..faecf0cafe9a
--- /dev/null
+++ b/dev-python/imageio/imageio-2.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="https://imageio.github.io/"
+SRC_URI="https://github.com/imageio/imageio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/freeimage
+	"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/imageio/imageio-2.1.1.ebuild b/dev-python/imageio/imageio-2.1.1.ebuild
new file mode 100644
index 000000000000..faecf0cafe9a
--- /dev/null
+++ b/dev-python/imageio/imageio-2.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="https://imageio.github.io/"
+SRC_URI="https://github.com/imageio/imageio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/freeimage
+	"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/imageio/metadata.xml b/dev-python/imageio/metadata.xml
new file mode 100644
index 000000000000..a9976317cc48
--- /dev/null
+++ b/dev-python/imageio/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">
+		Imageio is a Python library that provides an easy interface to read
+		and write a wide range of image data, including animated images, 
+		video, volumetric data, and scientific formats. It is cross-platform,
+		runs on Python 2.x and 3.x, and is easy to install.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">imageio/imageio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/imagesize/Manifest b/dev-python/imagesize/Manifest
new file mode 100644
index 000000000000..ec80a22779ee
--- /dev/null
+++ b/dev-python/imagesize/Manifest
@@ -0,0 +1,4 @@
+DIST imagesize-0.7.1.tar.gz 2871 SHA256 0ab2c62b87987e3252f89d30b7cedbec12a01af9274af9ffa48108f2c13c6062 SHA512 61ff92167cc90bb1dcc78bb358419a526f09dc567709548bbe399694aa15dab63744f56c67bf33a940f5f443fd3a5ddc08ef9e17799b6fede1b11c0ad6a17f75 WHIRLPOOL 9bf14680e5e1ad2f4d1a6c6c0e1d6cba973bdd4f5b1bb97b09a8b8e4d25faed268439da908e710f656071c17285a4fbd97d2e8c13b2d77565b8a76ac65f32e25
+EBUILD imagesize-0.7.1.ebuild 584 SHA256 8b94fcd87d21dd00be32a56b72970e298da2b80727c2bb0ad752a26d06f0b210 SHA512 e4e571fe27f0636b080e31c84206b42e030b7c2d5909a58186befacd159e4aff43ff9f27123d3939c6e1a92a7dd1ff65061d359fd4759ad66f8363c7ea70d599 WHIRLPOOL 7dd3e446191ed68382cdf16a846c85cc6d06f86bb9909f0dae823d134c2e048ab4310ecc6ffb429e4535023cc2fe84b3c1922c9430a80dcfc3a3fb34e3584893
+MISC ChangeLog 470 SHA256 4349f207a11468febaff238232db0d06c7c0881cee03f25c51e0f6eb708e67ae SHA512 e7fcdc54ea3727bac97a42f2938cad371b4d3fa493176c60663469bbabb7e7bd9ecf1e01b1ff88f1e9172ea44806b2761a78141eeb5fa8f854251938967b6ad9 WHIRLPOOL e892c1b5f6887a0b854b1ae900b506572f9695b2515084e11c9e0217d77ee2748846a1376e61b53e5945533cf5fc592cb5ea1e96d8390662d53293c85ca02d2d
+MISC metadata.xml 313 SHA256 35f457426183bbfa4b40a6979cab5ab7b6ddf85636d274dd5b93b01ce2166802 SHA512 2d42588c1fced4bb920c8bcf5ac2f090c3ea55873f448a216bd4dc85882a861652f6fe8f8d230789f99e2e33efa854860b2b2e7cdf210dad3e1d60c3c46d7750 WHIRLPOOL c86cd8acee243fb0bfd8f843bd8f02c3e3ba57fd6009d52b7a7bc9de312c865a524d8a97dd864fc6a6e17e5352ac8da0a1df672d5dd3d8ff3f287016d5ce3e86
diff --git a/dev-python/imagesize/imagesize-0.7.1.ebuild b/dev-python/imagesize/imagesize-0.7.1.ebuild
new file mode 100644
index 000000000000..432fbac1a74f
--- /dev/null
+++ b/dev-python/imagesize/imagesize-0.7.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Getting image size from png/jpeg/jpeg2000/gif file"
+HOMEPAGE="https://github.com/shibukawa/imagesize_py"
+SRC_URI="https://pypi.python.org/packages/53/72/6c6f1e787d9cab2cc733cf042f125abec07209a58308831c9f292504e826/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~ppc ~ppc64 x86 ~x64-solaris"
+IUSE="test"
+
+DEPEND="dev-python/setuptools"
+RDEPEND=""
diff --git a/dev-python/imagesize/metadata.xml b/dev-python/imagesize/metadata.xml
new file mode 100644
index 000000000000..1d45d9286d9f
--- /dev/null
+++ b/dev-python/imagesize/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">shibukawa/imagesize_py</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/imapclient/Manifest b/dev-python/imapclient/Manifest
new file mode 100644
index 000000000000..b23709b5500e
--- /dev/null
+++ b/dev-python/imapclient/Manifest
@@ -0,0 +1,8 @@
+AUX 0.12-tests.patch 1596 SHA256 91c2baa7ea8dbf9e3557080c2cc288a8594b0a704e4586dfe219ca98542b7e47 SHA512 87cd44146f273bf4d77df34eeb4f921eaaa36bfed951769b7c7b8b729b21ca078f8e7a907d98529f917c88754c48b5cc08acb53ac7786dd6b205b567a50d2c0d WHIRLPOOL 5e6bff85ff08ee76a843034221dcda8668a655be7b6ce88ae87ed8fab82bad46f5f153339fd0faca423bad3e364069d1b0ab983792e6d91b35a76a0855fab53c
+DIST IMAPClient-0.12.tar.gz 100698 SHA256 037ff008f1454287c1ed8684e1cf40b2ced382a875c5157dce380562f3566e15 SHA512 bd7d3e3911ff5ef1cc4a66f20e261955851562e76228f941d35f16a4680678be6a3741d520cc3133925a2dba9e8b6b5b988d7a740ff8abb63c14db1cf962acda WHIRLPOOL 134bf4db98806dbaf98bd780b92b8be2a2dbbcfec1ae83320f52a83bf0952f139bebd99d686d212830d25c08886217062577576a76205af54085628b03d7dbeb
+DIST IMAPClient-0.13.tar.gz 102427 SHA256 3a0e9a3c790722aa4882982090e68546c7f9352eb535026b06cead965968f36c SHA512 daebaf7f4180b6c9c6f4a486b313abfdd06f3ed8ece18a19bf46a50e56c2094e85de8a8e4efb8850566378eba016c10816611d03852caf637ee1d43f3c8a418f WHIRLPOOL b29ae9ea83ea4e736202af263215132028da47dfb4e9ee220b37e35eb2649cb85cc46bdabf6b06c5edb5f5173b8b942cb73293c0ae22c5efb1397c7bb65cfde9
+EBUILD imapclient-0.12.ebuild 1706 SHA256 17226d43cbe54777e3adc40287c509e3afab2bfbfc361b2b1929305cb2c7fb80 SHA512 bb77119146d5f36a744dd1c79ac3864f208e03876d8fdf6eb5a100c9f661316b39a378cac220c2249b4f55569679b1fe4ef024b0b04b16bf47bf9cd86154bc90 WHIRLPOOL 50e2e781f77b2d691db807c1f9661abb38eef0f16817432aaa75fff30ba9e462d0fb13776a95a63014d978a39ccb4d8d597668c781e0c569b19db5d5a0bbccdd
+EBUILD imapclient-0.13.ebuild 1714 SHA256 1112fc0b7c9fd508150af401f8f1dc417b4566ca6c4d0b7e67c3915f53193838 SHA512 3bfdc98ee2e723cafb291a2e3a2994f12f55cacf5c0b804c3b7633980fea0656c3cc79e29fc81734707e9a1f901b85c48b4a557f5c549407df94199de9bdb1cf WHIRLPOOL 0a0ed8bafc54fcbab8af1893852594dc4c97f1f8f64da1b76dddbe8af883233f423d80eb5d4f246f1824a444c73f9daedc27d8b351e9232d7badc2ac45146a29
+MISC ChangeLog 2673 SHA256 10e147a6bd67d051a019b6159e1e1397ccc16a9e03c9c4fad3f7a68a89ef7278 SHA512 6d84e3a92536d67801a6ad62df5cad23fb95194d191567c089fd654224ceb21941aeb132a7d4347f179070bfffcd0ca21191d3b16a362ba8bdd7330bf0e73934 WHIRLPOOL 451a93cb5f18c5738a318e4ce263464ecd2c051a33e78b0fac7ae7d3e14b40cbc6c39b3219627a9efa75a81dbd0abc3982434c8428246d8a40aafd57fb9b84e5
+MISC ChangeLog-2015 1541 SHA256 b3a21cabb9bb0e573667d0802aa7cedf53c7f5cf2481f14c6c46c82aaa545541 SHA512 5d7262239a762328bb470b7453f27bc47fb8e8f6a8c00f05927d2c5ca0bb00c069ab1ea9c0a1fd22efc3cc81bde673eeede5b54da8f12bf7a4313acd4569b0cb WHIRLPOOL 8b22545905d54c77d6cbc5ae4edb2223e6ee5dd6480fe40490f05d39c3af4ad266f822f367769d39d6e5bd53c25a5c8a7f504d760c6b2becb8bedd53934198b2
+MISC metadata.xml 313 SHA256 7682db8fe00091e9d289663af9313183c04845b6df0dee69d5abc3434cd147fe SHA512 b8b32e8bfcf59a3f7134ca2f562365c02e590a2d6e8e5eae9c6d3dbe2d4918b973b614aa38650cc67a5c34167b6293f4dede92e53f635f079a050bb26289d48b WHIRLPOOL b52e85fe2041dc781484a73bbf8feba37a9d3ebd4ceac6cddfdcea353b86a400e878560236eac92baf222b49d7320d1790c64834f8b5e54ae6361cac55342fb8
diff --git a/dev-python/imapclient/files/0.12-tests.patch b/dev-python/imapclient/files/0.12-tests.patch
new file mode 100644
index 000000000000..0bd0d001e6e1
--- /dev/null
+++ b/dev-python/imapclient/files/0.12-tests.patch
@@ -0,0 +1,36 @@
+diff -ur IMAPClient-0.12.orig/imapclient/test/test_imapclient.py IMAPClient-0.12/imapclient/test/test_imapclient.py
+--- imapclient/test/test_imapclient.py	2015-01-12 19:36:18.000000000 +0800
++++ imapclient/test/test_imapclient.py	2015-01-17 08:42:46.669121934 +0800
+@@ -10,7 +10,7 @@
+ from datetime import datetime
+ from mock import patch, sentinel, Mock
+ 
+-from imapclient import six
++import six
+ from imapclient.fixed_offset import FixedOffset
+ from .testable_imapclient import TestableIMAPClient as IMAPClient
+ from .imapclient_test import IMAPClientTest
+diff -ur IMAPClient-0.12.orig/imapclient/test/test_imap_utf7.py IMAPClient-0.12/imapclient/test/test_imap_utf7.py
+--- imapclient/test/test_imap_utf7.py	2015-01-12 19:36:18.000000000 +0800
++++ imapclient/test/test_imap_utf7.py	2015-01-17 08:43:23.893392410 +0800
+@@ -4,7 +4,7 @@
+ 
+ from __future__ import unicode_literals
+ 
+-from imapclient.six import text_type, binary_type, int2byte, unichr
++from six import text_type, binary_type, int2byte, unichr
+ from imapclient.imap_utf7 import decode, encode
+ from imapclient.test.util import unittest
+ 
+diff -ur IMAPClient-0.12.orig/imapclient/test/test_response_lexer.py IMAPClient-0.12/imapclient/test/test_response_lexer.py
+--- imapclient/test/test_response_lexer.py	2015-01-12 19:36:18.000000000 +0800
++++ imapclient/test/test_response_lexer.py	2015-01-17 08:42:14.749747748 +0800
+@@ -5,7 +5,7 @@
+ from __future__ import unicode_literals
+ 
+ from imapclient.response_lexer import TokenSource
+-from imapclient.six import next
++from six import next
+ from imapclient.test.util import unittest
+ 
+ 
diff --git a/dev-python/imapclient/imapclient-0.12.ebuild b/dev-python/imapclient/imapclient-0.12.ebuild
new file mode 100644
index 000000000000..8c024c439d83
--- /dev/null
+++ b/dev-python/imapclient/imapclient-0.12.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+MY_PN="IMAPClient"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="easy-to-use, pythonic, and complete IMAP client library"
+HOMEPAGE="http://imapclient.freshfoo.com/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy) )"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	# use system setuptools
+	sed -i '/use_setuptools/d' setup.py || die
+
+	# drop explicit mock version test dep
+	sed -i "/tests_require/s:'mock==.\+':'mock':" setup.py || die
+
+	# use system six library. patch proven less preferable to use of sed (< maintenance)
+	# but a copy of the working hunks from prior version works fine for now.
+	rm imapclient/six.py || die
+	epatch "${FILESDIR}"/0.12-tests.patch
+	sed -e 's:from .six:from six:g' \
+		-e 's:from . import six:import six:g' \
+		-i ${PN}/*.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" -m unittest discover || die "tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+	# don't install examples and tests in module dir
+	rm -r "${D}"$(python_get_sitedir)/imapclient/{examples,test} || die
+}
+
+python_install_all() {
+#	local DOCS=( AUTHORS HACKING.rst NEWS.rst README.rst THANKS )
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+	use examples && dodoc -r ${PN}/examples
+}
diff --git a/dev-python/imapclient/imapclient-0.13.ebuild b/dev-python/imapclient/imapclient-0.13.ebuild
new file mode 100644
index 000000000000..1bb557f59606
--- /dev/null
+++ b/dev-python/imapclient/imapclient-0.13.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+MY_PN="IMAPClient"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="easy-to-use, pythonic, and complete IMAP client library"
+HOMEPAGE="http://imapclient.freshfoo.com/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy) )"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	# use system setuptools
+	sed -i '/use_setuptools/d' setup.py || die
+
+	# drop explicit mock version test dep
+	sed -i "/tests_require/s:'mock==.\+':'mock':" setup.py || die
+
+	# use system six library. patch proven less preferable to use of sed (< maintenance)
+	# but a copy of the working hunks from prior version works fine for now.
+	rm imapclient/six.py || die
+	epatch "${FILESDIR}"/0.12-tests.patch
+	sed -e 's:from .six:from six:g' \
+		-e 's:from . import six:import six:g' \
+		-i ${PN}/*.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" -m unittest discover || die "tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+	# don't install examples and tests in module dir
+	rm -r "${D}"$(python_get_sitedir)/imapclient/{examples,test} || die
+}
+
+python_install_all() {
+#	local DOCS=( AUTHORS HACKING.rst NEWS.rst README.rst THANKS )
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+	use examples && dodoc -r ${PN}/examples
+}
diff --git a/dev-python/imapclient/metadata.xml b/dev-python/imapclient/metadata.xml
new file mode 100644
index 000000000000..918bf0e26c80
--- /dev/null
+++ b/dev-python/imapclient/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">IMAPClient</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/imdbpy/Manifest b/dev-python/imdbpy/Manifest
new file mode 100644
index 000000000000..85301a97ee3e
--- /dev/null
+++ b/dev-python/imdbpy/Manifest
@@ -0,0 +1,6 @@
+AUX imdbpy-4.6-data_location.patch 386 SHA256 22c59416cc2481aab25ab924b6ad2467ec9556a3206c0dce6d2af2899acedb56 SHA512 b6846126cf3eab62f454b1d8073d068a356ee792895939c9a4ee67eacd46616d0173bc85e52f6930f3ee8d96b95913afcc07b5b384a205559bce105e37038567 WHIRLPOOL 06fdd41f098ba290df40860f65582e5c4f59de724951bf634d5d4cb8fc9dfff4b90dbbc68c886bafcc82b4c08de0c22d2b55df66c3778c2fc517d86b61ce42bf
+DIST IMDbPY-5.0.tar.gz 367238 SHA256 3224a8896847cddb8d049a587852c66f0f33f36c89311ae9a89ff87ed51fc243 SHA512 924b9c9b7055c75abb1c48867ba9ccef3c5259c748a6f21e8344616da9ea58d5ae58a2f12a78dc61fea7c008956994687fdcf7ecd59f5f4e82daea62890086d4 WHIRLPOOL 5cae4a26734c10c3c21bc2f1be4fa5efca8e82a2cf78249c359f7e3c8bb8e12f1fefc535796f98d5b23b6c3174e11ac40f8e56749c93c859c7f63e052af6402f
+EBUILD imdbpy-5.0.ebuild 894 SHA256 fad5edf081cfafc41bf18a7f38cfe9ba4331b098ac73700df6b2c1311efb5d8f SHA512 c1fa3ff89047dda065ffb771924282e266e586f2ffa65b783d8931116d0356e036f6284a29e2b0d23b78a2e0e6532fa8260835df5da5520b1d330cedee9fb361 WHIRLPOOL 6ca4bdaba7985a31ef119b97a2b3049bdbe85e3eeba78fec6c6178421b3a281b9314e83657c957059f8448085c9d7e324bf23039650b0ac852f8a537a49ee521
+MISC ChangeLog 3225 SHA256 1226368f26928f4872cab46a9e2bd3b7181b8b80a06626e716129b80fca3e92d SHA512 36126debbc52e91f704beb5870b7567251e27886d592b50c2c01cb4c5a45b14ba582975d33af52980d98477551ee27b05cf4a4506824e323f0a97999e5204405 WHIRLPOOL 52b23decd4c3993d95603b1ebe9a956affa2906e7aaca27157afd84f6a08cc8bc80b409ab64dec13a97a726b1acaea9d630b604b40ccff6f76f925edcd41bacb
+MISC ChangeLog-2015 3653 SHA256 f57b36bd6f0ba1097d4873cd84febff3c8f7670fd46a80c3fec37d288c37012d SHA512 f0e53a6062a6ddaec2cded42afd4e7bffcd214c67eea9610e56b2b20bb740d5bab9149230837a1690c76598c1c7e9dae5d0051f0ac73745fdf4702cd859d100a WHIRLPOOL 99002cd43762af42d5a51932b09c688b66326c72bdc1e228166b6f5d10456c6663a08f35c3c699552aeaeead3f1e3984f190a75d6b4f38d0a73e151e374c0f01
+MISC metadata.xml 287 SHA256 d0e51c37511b11b7257ac73d3410f6abdd910228f4f79db14d77e03cdd68767c SHA512 73efa1a442676f1fea6bfa663d9615e9e55d2520d8a30749ceea26fbadf3df55358320ddb5ced57841b5d4eec5dc6948b3c85d2537d8fbed3cc1d4392f970767 WHIRLPOOL 3ef3e35ba26ced552102ff613fe4be620d74ef1bd06833a7692f2fb20ea00306c951262f161fe2ba2250d602c1c300c8b1a7c06a65757a2310a27861149659a6
diff --git a/dev-python/imdbpy/files/imdbpy-4.6-data_location.patch b/dev-python/imdbpy/files/imdbpy-4.6-data_location.patch
new file mode 100644
index 000000000000..90dc467170eb
--- /dev/null
+++ b/dev-python/imdbpy/files/imdbpy-4.6-data_location.patch
@@ -0,0 +1,11 @@
+--- setup.py
++++ setup.py
+@@ -70,7 +70,7 @@
+ 
+ # XXX: I'm not sure that 'etc' is a good idea.  Making it an absolute
+ #      path seems a recipe for a disaster (with bdist_egg, at least).
+-data_files = [('doc', setuptools.findall('docs')), ('etc', ['docs/imdbpy.cfg'])]
++data_files = [('/etc', ['docs/imdbpy.cfg'])]
+ 
+ 
+ # Defining these 'features', it's possible to run commands like:
diff --git a/dev-python/imdbpy/imdbpy-5.0.ebuild b/dev-python/imdbpy/imdbpy-5.0.ebuild
new file mode 100644
index 000000000000..1c075afaf2d0
--- /dev/null
+++ b/dev-python/imdbpy/imdbpy-5.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_PN="IMDbPY"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python package to access the IMDb movie database"
+HOMEPAGE="http://imdbpy.sourceforge.net/ https://pypi.python.org/pypi/IMDbPY"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DOCS=( docs/FAQS.txt docs/imdbpy48.dtd docs/imdbpy.cfg )
+
+PATCHES=( "${FILESDIR}/${PN}-4.6-data_location.patch" )
+
+src_configure() {
+	distutils-r1_src_configure --without-cutils
+}
+
+python_install_all() {
+	local doc
+	for doc in docs/README*
+	do
+		DOCS=( "${DOCS[@]}" $doc )
+	done
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/imdbpy/metadata.xml b/dev-python/imdbpy/metadata.xml
new file mode 100644
index 000000000000..9a2bea3d2d20
--- /dev/null
+++ b/dev-python/imdbpy/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="pypi">IMDbPY</remote-id>
+		<remote-id type="sourceforge">imdbpy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/imexam/Manifest b/dev-python/imexam/Manifest
new file mode 100644
index 000000000000..d14664eb673c
--- /dev/null
+++ b/dev-python/imexam/Manifest
@@ -0,0 +1,4 @@
+AUX imexam-0.7.1-system-xpa.patch 1902 SHA256 fd647e5e391e74ce22c50bb5a8954ebec10fff6e9fca4d829bc586f0dd0577af SHA512 c0f337fcae6db9eaac30e54f57efdc53a162be1500aa67bb7adde152af6a53560cb1449c95e1029c16584acbdbf6e5b7b55e6a720cb9a8e4a8255beee6d6a992 WHIRLPOOL 829d572e06e1f9b086a6e52ffeb4bba2b1814953aa0da761cd6f2f3008b3540452b4db9543529313eade6c5e3e00eeeecd0dc80d4c97882603487d58e9e0e364
+DIST imexam-0.7.1.tar.gz 20264259 SHA256 99579305e71f22fd06e4ed95e0d38edd0474832e9b87ef3f6abcd243ed8ad46f SHA512 cb09d1764de19333fa6be1bbb9e6efd3d59943fdef4ccac4e8429e436dd615fa5be3a06c9473cc2c3ff1de1a8987d02ef24765de5b36131c31451b013be8d776 WHIRLPOOL 6c45aa0006d1217df6fd7fc4c2b0fa01a6cf4efcb26bd8adf16832823b229407ed20394202b3298f9e5433e3330cbd33469eaf215af863523011d6286afff89b
+EBUILD imexam-0.7.1.ebuild 1443 SHA256 542fde18ec12859fdc2aaf7417ab1e7a7021134527bd7ef7a88412dbd9c112c8 SHA512 149115215293ad5b44ba77a6eb2506e12c36ff5666230457699a8cbd64f06f232451d39bf75ddfec627137f223eada11bba8d8436cd99a1b2ae0be1e4a7b1f93 WHIRLPOOL 7396a10816645208226b1a85d13356e3cfe82818bffeab438bb5334fac91252bb55aac44adbae2a5740df5d6b73c9766351e263c371378c5511a6a6b85d8d066
+MISC metadata.xml 903 SHA256 899173490ccfe7b2042b962bdbfb2c941396175686a50a06774a23099a2c0468 SHA512 40598f07aa51ad664d0368303e30ccda539db5ad0293e6349fc02b0555a6562c6b58ddda8fea6c31d80c96dffdf7262a68a516fac1b2eee9d0e0d3f4daee7417 WHIRLPOOL 57ea9ddf038e2212316890ded6c19bf0de4ad61a9bc2b8cc3518a61fa4425cc37113eb62160f7e27af90234c7d2d4c96356b2246d31fb3582266ceb806e83105
diff --git a/dev-python/imexam/files/imexam-0.7.1-system-xpa.patch b/dev-python/imexam/files/imexam-0.7.1-system-xpa.patch
new file mode 100644
index 000000000000..fc90ffef7f34
--- /dev/null
+++ b/dev-python/imexam/files/imexam-0.7.1-system-xpa.patch
@@ -0,0 +1,52 @@
+From: Ole Streicher <ole@aip.de>
+Date: Fri, 21 Apr 2017 13:40:06 +0200
+Subject: Use external xpa
+
+---
+ setup.py | 15 +++------------
+ 1 file changed, 3 insertions(+), 12 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index f0dd5d5..f291201 100644
+--- a/setup.py
++++ b/setup.py
+@@ -121,24 +121,20 @@ if not sys.platform.startswith('win'):
+                    xpaio.c
+                    """.split()
+ 
+-    XPA_SOURCES = [os.path.join(XPALIB_DIR, c) for c in XPA_FILES]
+-    XPALIB_DEFINES = [("HAVE_CONFIG_H", "1")]
++    XPA_SOURCES = []
++    XPALIB_DEFINES = []
+     XPA_SOURCES.append(CYTHON_SOURCE)
+ 
+     xpa_module = Extension("xpa",
+                            sources=XPA_SOURCES,
+-                           include_dirs=[XPALIB_DIR],
+                            define_macros=XPALIB_DEFINES,
+-                           depends=[CONF_H_NAME],
++                           libraries = ['xpa'],
+                            )
+     if use_cython:
+         ext = cythonize(xpa_module)
+ 
+         class my_clean(clean):
+             def run(self):
+-                import subprocess
+-                subprocess.call(["make", "clean"],
+-                                cwd=XPALIB_DIR)
+                 if os.access(CONF_H_NAME, os.F_OK):
+                     os.remove(CONF_H_NAME)
+                 os.remove("wrappers/xpa.c")
+@@ -147,11 +143,6 @@ if not sys.platform.startswith('win'):
+ 
+         class build_ext_with_configure(build_ext):
+             def build_extensions(self):
+-                import subprocess
+-                subprocess.call(["make", "-f", "Makefile", "clean"],
+-                                cwd=XPALIB_DIR)
+-                subprocess.call(["sh", "./configure"], cwd=XPALIB_DIR)
+-                subprocess.call(["make", "-f", "Makefile"], cwd=XPALIB_DIR)
+                 build_ext.build_extensions(self)
+ 
+         cmdclass.update({'build_ext': build_ext_with_configure,
diff --git a/dev-python/imexam/imexam-0.7.1.ebuild b/dev-python/imexam/imexam-0.7.1.ebuild
new file mode 100644
index 000000000000..65296b55c7c1
--- /dev/null
+++ b/dev-python/imexam/imexam-0.7.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Simple interactive astronomical image examination and plotting"
+HOMEPAGE="https://imexam.readthedocs.io"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/ginga[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${P}-system-xpa.patch )
+
+python_prepare_all() {
+	# use system astropy-helpers instead of bundled one
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	echo "backend: Agg" > "${T}"/matplotlibrc || die
+	xdg_environment_reset
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${T}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_docs --no-intersphinx
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	esetup.py test -v
+}
diff --git a/dev-python/imexam/metadata.xml b/dev-python/imexam/metadata.xml
new file mode 100644
index 000000000000..6a478af7b2bf
--- /dev/null
+++ b/dev-python/imexam/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="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+ Imexam is an affiliated package of AstroPy. It was designed to be a
+ lightweight library which enables users to explore data using common
+ methods which are consistent across viewers. It can be used from a
+ command line interface, through a Jupyter notebook or through a
+ Jupyter console. It can be used with multiple viewers, such as DS9 or
+ Ginga, or without a viewer as a simple library to make plots and grab
+ quick photometry information.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">imexam</remote-id>
+    <remote-id type="github">spacetelescope/imexam</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
new file mode 100644
index 000000000000..c5aa9d1bcd49
--- /dev/null
+++ b/dev-python/iminuit/Manifest
@@ -0,0 +1,4 @@
+DIST iminuit-1.2.tar.gz 931630 SHA256 7651105fc3f186cfb5742f075ffebcc5088bf7797d8ed124c00977eebe0d1c64 SHA512 b9836abf57a3c33bfdf044655e3b8f465cf5252a10a50c17a70f382b8283754095f083e523060fd6d33c7e4c345b8c9923255408120e8bcfcedf1eee8de2dbca WHIRLPOOL 98966c69bf356c3239b0228846361aa037143c7563b192abaaec153b19051f14aea4b5a0151c7f91ba2816edce6a284aaa5287f100e57e24576a57767a0e4632
+EBUILD iminuit-1.2.ebuild 725 SHA256 5ca746a13edf894751c4cc07f7313b2792e3da309ef64759560dcf22dac39afb SHA512 33793c7d62c7fe55f31852cbd776c6009a6bb2ac43e42ed6e9dee86196e254b7da754a35794beb5827eccf5135ff0180cd7d9e75cbe268edc7ca7c64821c919c WHIRLPOOL 2694a1f8a414d129eca62c882106660982c150f6160b4f317f32631ead518ded03eb5a6d9ad358268be4167b04e9d676ac2a1ee2a780d667e07ab6b6f24f08c5
+MISC ChangeLog 1251 SHA256 b81b988faecb5722eac410eebef5547c761f6c93d3d1934f024595fcf369c64e SHA512 9ec8dc4c847b5c9443e937a4b46ab6f434f3c3ccf8772f39ec4fc4b72a08ea08140ef2345a0fa0abbdc56e3ed22a4ece99d8b161efc4a365246e8ac4a2332b47 WHIRLPOOL 53cd9ab3a1385972764e7b1a6c0bebf5e2c1c8ec01b28b8d2bb3946cdc77010afb29e632e1283a91a3f5bb6331ff15fb95a2fb49d0369a8ca21b736b618ac5d6
+MISC metadata.xml 383 SHA256 fdfb40a18a04cd06050aa091f0ce9678f93d2a8233f581d2d24730e45b31db29 SHA512 8a2f70c08231e482c3121380f52f405d5606aff28379d7b306a95b1cf6c092594e1713554409245e870352911e610de977288c58570c57a8d1546653fd7deb62 WHIRLPOOL 21af98d1a91e7d99d40b0d51c841a7407428bf890a8d78a2d3525b238c924d594fbecfddbe51288060c6a45683fd8fa18e7beeb4fc73c844cf5cf512ff64e246
diff --git a/dev-python/iminuit/iminuit-1.2.ebuild b/dev-python/iminuit/iminuit-1.2.ebuild
new file mode 100644
index 000000000000..6c2aa22961a2
--- /dev/null
+++ b/dev-python/iminuit/iminuit-1.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Minuit numerical function minimization in Python"
+HOMEPAGE="https://github.com/iminuit/iminuit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SLOT="0"
+LICENSE="MIT LGPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+	  dev-python/ipython[${PYTHON_USEDEP}]
+	  dev-python/matplotlib[${PYTHON_USEDEP}]
+	  dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	virtx esetup.py test
+}
diff --git a/dev-python/iminuit/metadata.xml b/dev-python/iminuit/metadata.xml
new file mode 100644
index 000000000000..77d8f100497b
--- /dev/null
+++ b/dev-python/iminuit/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>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">iminuit</remote-id>
+    <remote-id type="github">iminuit/iminuit</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/importing/Manifest b/dev-python/importing/Manifest
new file mode 100644
index 000000000000..655543fec1d4
--- /dev/null
+++ b/dev-python/importing/Manifest
@@ -0,0 +1,5 @@
+DIST importing-1.10.zip 17138 SHA256 e61348d8d37b20b69c887ded5378ca99f2588e177133a06607130e6a5515062f SHA512 628f4c119c8d0cf558580887fe30683223dcc439ca7ad5f7fa442d87452f3aa7b2f8ad200634c70a969dfdef7ef5938fd51fd36044d311296a8df73b5f2851cc WHIRLPOOL afcd84da66bc9292c8b8657dc72ba2693928b515607ea1ec3843c9411aaed3c7f50ad484f532ceff64eca38136d71b28b04ab991df63277f4e9edbd12bfc9156
+EBUILD importing-1.10.ebuild 559 SHA256 e0bd7a440ba9d2b1deeec76df67b76842ae651f973d4acfb517648bf8d991d51 SHA512 975b16fcc379c71bc1e7ddf116cfb25f681d22c4e686ffd48fb5c307eda08752268ebc63903cfe4ed56cd36a10728651c8653a5c9c96a39604a8078e94dcabd2 WHIRLPOOL e179d838dad1f4c243b8a5bf1d13f499bba586c93c7c46bc16c618f890c9942db09be010db18ad15adf8f0d419a2276e5c6c0e00e276de4ff5efe2f3fa029bd3
+MISC ChangeLog 2433 SHA256 5f84203ea8f30cf5eb3ce9b172e3f4e9ed7bb1e3c87d1a91fbb1f3ec9f70f052 SHA512 99bbc8e3781e731428b9fd2dccfa1bfcf64860e25eb75c92c54e520f3b010a4aa3a402e40cd7fb6b74e8647f7e3a47ac4efe74f8ad10b1aa41ae03beae274837 WHIRLPOOL 0a48fa0b4e4056242e2598b87c8552a07f04d13c0d7b322b52441f524c685a3f89aa0ccdee899f6fb3e386314636859b33f9f42f923d798a9ba51a8ea6cb171a
+MISC ChangeLog-2015 1028 SHA256 16c5f11c92814b981e5dd3c20557e1a4ac07759dd17e0a838f150a97bb0eb471 SHA512 05b4b424c7082f73fca260395bd6fd4c47d1e53d2fa8a3754c0ae21bd1a0a4642d46ab30d782808b951701c0fdb223c86f974449c0ca80309a5b69256b539e80 WHIRLPOOL b93dabd6e5415918cc04cd1f70a7df5651be8ddfa0480f0d2508e8847a2b19ed55a61d854524862381ef0141662ab3a6d5549c22154600d23c0d0fc3591a4aff
+MISC metadata.xml 322 SHA256 0cb3458bb5df578e4a18cf2c69d24f5376e35fe3d280d65f705455778ac5f4b2 SHA512 d5d569d1e9f867a47f2f22ab678ce9013b576a3ee8ad7b12fd43b1d5842a38e00824bb9b84af37e34eda21a86ea67ce4cbc06dfb6487f78d68fa080ff78bb2eb WHIRLPOOL 30dcdbb92935438b7358ae816f3b14c0cbe8cb75874dfcdbc1dc882a6226e7ce466aa6b5c1fa0eeda69a643d755424b9f15794c3528378a9390faa40f647e03a
diff --git a/dev-python/importing/importing-1.10.ebuild b/dev-python/importing/importing-1.10.ebuild
new file mode 100644
index 000000000000..fad2593f6827
--- /dev/null
+++ b/dev-python/importing/importing-1.10.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_PN="Importing"
+
+DESCRIPTION="Import objects dynamically, lazily, "weakly", and more"
+HOMEPAGE=" http://peak.telecommunity.com/DevCenter/Importing"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+LICENSE="ZPL"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${MY_PN}-${PV}
diff --git a/dev-python/importing/metadata.xml b/dev-python/importing/metadata.xml
new file mode 100644
index 000000000000..4ebe2a7762aa
--- /dev/null
+++ b/dev-python/importing/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Importing</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
new file mode 100644
index 000000000000..2a750c3bfd13
--- /dev/null
+++ b/dev-python/incremental/Manifest
@@ -0,0 +1,5 @@
+DIST incremental-16.10.1.tar.gz 16066 SHA256 14ad6b720ec47aad6c9caa83e47db1843e2b9b98742da5dda08e16a99f400342 SHA512 b60ebc41c32f27da5a489ebd76c7fa1707a5a38c32097bfab20f355a86b490ce21acc7be157d0309a30c63b85d79f72f850587d1449110bd1a8075ca3586db5e WHIRLPOOL cfc84b426e3cdcfb915b247a928b7e614a415dc7679836c966c8cb7b863477923839fa021f30d0351365939948ce2a8c62be86dce29200a0ac3c76e7b1dc1c6b
+DIST incremental-17.5.0.tar.gz 15527 SHA256 7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3 SHA512 91443205f7c92ec8f6502f38379c5ac2fe441435ff9490af01e5420d6bb05bb1c666dd612fc45204199a34afd533fd3de1390ca482bb554dfec7d3a22958a4bc WHIRLPOOL 7546143aa9bf3f9fecd50dc293e7ad2d5fa5b5efcf8307186e33fbf0e82cb973e14436d7b10243e20b7808e7dce0757ff60720d31d49b7653c4657dfd62ba405
+EBUILD incremental-16.10.1.ebuild 601 SHA256 aa6ca9aa3b6dd6f14a380f12c4ecfddfa969f8426be814de987ccf6a6ba19af6 SHA512 a3dd394a01f7aa84c4b683159777fc301a7a9e0704c7db6154f722b9d43e826c2b63bdf6ebafb7b927951dc50298525cfbc3f959348d0f93c4cbc99dc6e482ea WHIRLPOOL 0cefcb0c028049635c7430b8f81ce0a436c21127d46f201c1a6a7132344650379556fd661a70e1deb836f2f6e00a7004790c3d633c386690a736faf936e94924
+EBUILD incremental-17.5.0.ebuild 606 SHA256 aaf4e552d10b71d80f11bd76f5814775e7e7d549d51a528da585f2b766d0ec96 SHA512 f4d7de4a137b56141e4289471a70fa18ebfda37908df793ece43b6043a043c527262654014deeb0e5e1c947d7c2f379ec6e9e0b5936f159965143b1241b14a40 WHIRLPOOL 65fd1ee7889201e6f22a63a012c792fc410ee9f5ee6b5d9a141ce7623bbf1ee9afbabfa4e28c7078b8e3711ecb822fc4e0cf837285658ec09b5f4f32ceb01525
+MISC metadata.xml 602 SHA256 1825e4934d025949daffa69b0bd73cd6a86eacca5a2ee30c1023456a097ccb3a SHA512 0a5dec49f829c3fcb16aeaefe77a4d70ca33f934c9924eaccd47541b2a2817a7327209656e32013c60d3e58a530c439529dc69ccacb653490da9adaacb0c1c2c WHIRLPOOL 0cefea8f03eb8ed8be26462d3dc3a9eb9365a866caabd8d281e2250d90d1b67e30e9bc8d9360d974f8bf9e84f904f5ac4840231a550bf0a9da39c1cb07b0c2a0
diff --git a/dev-python/incremental/incremental-16.10.1.ebuild b/dev-python/incremental/incremental-16.10.1.ebuild
new file mode 100644
index 000000000000..04aa5a6ecc1f
--- /dev/null
+++ b/dev-python/incremental/incremental-16.10.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Incremental is a small library that versions your Python projects"
+HOMEPAGE="https://github.com/hawkowl/incremental https://pypi.python.org/pypi/incremental"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+#S=${WORKDIR}/${P}
diff --git a/dev-python/incremental/incremental-17.5.0.ebuild b/dev-python/incremental/incremental-17.5.0.ebuild
new file mode 100644
index 000000000000..3cd50a50b55a
--- /dev/null
+++ b/dev-python/incremental/incremental-17.5.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Incremental is a small library that versions your Python projects"
+HOMEPAGE="https://github.com/hawkowl/incremental https://pypi.python.org/pypi/incremental"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+#S=${WORKDIR}/${P}
diff --git a/dev-python/incremental/metadata.xml b/dev-python/incremental/metadata.xml
new file mode 100644
index 000000000000..5c541d1fb5b0
--- /dev/null
+++ b/dev-python/incremental/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>hawkowl@twistedmatrix.com</email>
+			<name>Amber Brown</name>
+		</maintainer>
+		<remote-id type="pypi">incremental</remote-id>
+		<remote-id type="github">hawkowl/incremental</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
new file mode 100644
index 000000000000..0d839d1b19da
--- /dev/null
+++ b/dev-python/inflect/Manifest
@@ -0,0 +1,4 @@
+DIST inflect-0.2.5.tar.gz 109756 SHA256 2014c8dcb2114ebae2941ba3f0fbd98a02c846792a7b72f2da31eb9aa431a818 SHA512 68371158ac90d9662c19657cbf697f44ee9ceac090286d53e29ee04252efbb7d0bfbd99ae6847e6eec1991ef4ef670eff60693d1f0a301885bab2a09c7ce4616 WHIRLPOOL 4c6a88a43fd126ebebcace4a0fce3453253db1495f4c5fe26ea60c5f8237c484383e766d64e4d51957b15bbdcdf686951fd733827cfee3c111af71646718b546
+EBUILD inflect-0.2.5.ebuild 561 SHA256 1ed4cb13e24534a36da74ba0476205ab59344cde72acb922c27b64c1586cf6ba SHA512 11a39bc8f7a6e60bff5747616e2437d57a5a3d62793d0cd46bf95565eee667944dbdaaf5d8fcd2b1d9840faea290fe84a84be201d347d92bf6e5a55d284dbeaa WHIRLPOOL abeb5c031ae38789ce3640904ad7145ed150f5331256fea6f3681cb7c90cf9e23b4daf16a8037bafa1c4f8e4610733cd65652ab283bbb7f57525790d67b63e1d
+MISC ChangeLog 716 SHA256 9ad3f8c3f2a2a367270b17ddc4a638cf7d6476324799788493753dba08ea52f2 SHA512 6ae37f77b7f4ab2fccc04475a91672976e57a7999ef809bbbaae58791f1f34cbd9e721a6b55525cc24599cca0823dd23f778ac72fc5bc1b44e2e6f5169d94edf WHIRLPOOL b2432a8b6c22672154c291c47a253b5a868897c1bba14c4cff6415701c54a5e93d505b10d6d864cb4804dff576ae7a19182f9bf63dbf42830b44ed8ea9fa9a3f
+MISC metadata.xml 574 SHA256 251f5d2e3b4a2558d057012af1154a6e05113feb98627ba1145da58598aa9e75 SHA512 a9cba8ba987d332b9a1241acdb87abdb2ad3beebd853e84dc883af81db5f3ba4d0c926944ef5e9b1cefb474e3e60e80e8fed97aeb9d621f6cc4a013cef059c2a WHIRLPOOL edaf7c25fad3153c793c8bc451a7fd8e8829740fe04d4771f033b96cd3fae5283cd63152064216a759d1d50ed67e31572e13e85ed8c07829bf63c71e0c56db00
diff --git a/dev-python/inflect/inflect-0.2.5.ebuild b/dev-python/inflect/inflect-0.2.5.ebuild
new file mode 100644
index 000000000000..bffa40f5d2a8
--- /dev/null
+++ b/dev-python/inflect/inflect-0.2.5.ebuild
@@ -0,0 +1,24 @@
+# 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
+
+DESCRIPTION="Correctly inflect words and numbers"
+HOMEPAGE="https://github.com/pwdyson/inflect.py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests tests || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/inflect/metadata.xml b/dev-python/inflect/metadata.xml
new file mode 100644
index 000000000000..5ab73fe7d724
--- /dev/null
+++ b/dev-python/inflect/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">inflect</remote-id>
+		<remote-id type="github">pwdyson/inflect.py</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/inflection/Manifest b/dev-python/inflection/Manifest
new file mode 100644
index 000000000000..c316237c1b50
--- /dev/null
+++ b/dev-python/inflection/Manifest
@@ -0,0 +1,4 @@
+DIST inflection-0.3.1.tar.gz 12943 SHA256 97e5fd494e5c2a541b2c86f8866e342c894c4eef28a19c1907db02024777495a SHA512 2a69a6228f2d44a5afecbd3ef51a51b4d5f63f69ddc844f4abfd6f326cb25c518403e8c5b9f98589885777d41d8fea31bacab3a5a3ab80db411960238d2f49ad WHIRLPOOL 10cfde356372e2f8d41b58122f239c80d7d38dd62f40f62af2cb6e10b687b524989baaa5dfdfbdf8aad5432bc9ffb91aa15121054c754ec90778e7148d138ea0
+EBUILD inflection-0.3.1.ebuild 952 SHA256 94afa7c63bda08064165f832b208a082fa7dbc6a25b32f645b9bd053ad2b2b7f SHA512 1b1cf480a09f3ca33cef74e16c07d0911eca0d997671110a1e65fd491522813593d2c345fe4915ac1123a04a0d7110021f4cc51d74f53dd0059035930ce64658 WHIRLPOOL 6694221c2a2b24ae169910576371051e296aade62f3eb40154a14d6a5a817d52728fd9d6b3c92baf6257d4d8079920eddf8f5695e641ee1c583defd5f0fb69d7
+MISC ChangeLog 461 SHA256 6440e419a760ff82e66115b74b12d38f0629b02ac6c22e85ddde52c9b4c2b8fd SHA512 6f9c8dde7ede406895581299f4e56b3642a01b79837d587126fa1702470b42a2a292d6eb85e40396f3dcb800615408e0365629e316969f274aa2ce3597d0f9a9 WHIRLPOOL 762a29b5a43d68a2fb1fc11b1f02cd8cb5f34b8d94ed34364c47601ee5ad2f5a4ef9123959083edb6f89f535ea604dcff813efbee709ddee1348ca95b2b53555
+MISC metadata.xml 568 SHA256 d903c308c6a50c4c07ef8509e2bd00942eb465e48058fa85521986419262fc78 SHA512 d6f1a24e986672bc56e5cfe7a99e336b148e7976540b2ae46e36a51a115d6f4d23df0abfa322e17342a2abf09d9ce536d0eed6f585b0a2fd37df5737a19a2a18 WHIRLPOOL 841f936cf1730b0aeea00696a7c0adc9a50db16be2ce7573d38c0d0da7391766df24ce3c68cd8de55ada8ae0fe7b0078a2799f2df77d439a1d76f48633f1bcf0
diff --git a/dev-python/inflection/inflection-0.3.1.ebuild b/dev-python/inflection/inflection-0.3.1.ebuild
new file mode 100644
index 000000000000..864ac21bea52
--- /dev/null
+++ b/dev-python/inflection/inflection-0.3.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A port of Ruby on Rails inflector to Python"
+HOMEPAGE="https://github.com/jpvanhal/inflection"
+# PyPI tarballs don't include doc
+# https://github.com/jpvanhal/inflection/pull/12
+SRC_URI="https://github.com/jpvanhal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/inflection/metadata.xml b/dev-python/inflection/metadata.xml
new file mode 100644
index 000000000000..5fc3f78f866b
--- /dev/null
+++ b/dev-python/inflection/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">inflection</remote-id>
+		<remote-id type="github">jpvanhal/inflection</remote-id>
+		<bugs-to>https://github.com/jpvanhal/inflection/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/influxdb/Manifest b/dev-python/influxdb/Manifest
new file mode 100644
index 000000000000..d4210000e644
--- /dev/null
+++ b/dev-python/influxdb/Manifest
@@ -0,0 +1,4 @@
+DIST influxdb-2.12.0.tar.gz 48091 SHA256 b57f31205b4ef14aeca62dc9968c4a262ee5c29b44bff0d7fa6956d7bd4fbcf9 SHA512 2975cbf606833f56c30572cfb377f3a9b69b0e8c228419d5d1d93196ee55ee38e1455838b47c0834f7f1021da72ec721aa73d02934718848271a2287ccb281c6 WHIRLPOOL 6c6483eb759858d7139d08c59f4f9c9c8d4a0d59146825701169a355554175620070413ec5bfe0a90a48c746290fac592b43151f1fb4db003869faad258d74d8
+EBUILD influxdb-2.12.0.ebuild 853 SHA256 51f49d0b62df54ce92628dfe345bed5bd023b11dafeb3ab961b540025f7611fe SHA512 dc259e8da8a188657a3e2ba7b834bd44823749e11eb9e5bc0f41f5e994f2c424c88b0591e23bd8e730df19a1bff95ceae452cbf34a57a38eb5b27284226470c8 WHIRLPOOL 774cfb2e1a8f230e705e80be40b5041440aee14e53920df244319cf6e4acdb7a44e5b3d30a6646f2d8016743e5a63b5b54f64c88f8db22b039c76b9bfc79b8c1
+MISC ChangeLog 511 SHA256 d0f803ddee630466a37af6c2b33dfcbb76f8c6167737dd8d45dbf25355086b89 SHA512 a7b62aeb450712a17b7d0bfb3ca95eb54f59d1b9e7b6feb2f32b11e539e9acbc1a997617222b68752d668d86e3deffc962f9bcbb7f2a75cd53670dc36caa6e00 WHIRLPOOL 343aee973515d5ecb6671a6757e24c98e529ce6a64897a3c0661ed4da11c4463a95719891d38ea6d6affcd187b4d2f46fdfac99a8e4baae979d321feb9febff5
+MISC metadata.xml 387 SHA256 978ae2ed73fbda50bd56a6b6a87e2b47359e27efe1e9628b7360c23a538abb88 SHA512 0aceab42b46030b04172d2158cf57ab28e53091ca57a6c4a989b65594abda52c2d924670b37775e6bec5cf77841aae575c73bd2f66ce3329ffb3216bc093939c WHIRLPOOL cf9c1f839e6a5881ccb65b848a92ab0946d5228665cfcefe77b7f717b56381add2ad089753ff73268f77950442c60ec07d6932fd7ef59f42480d6d30452122e4
diff --git a/dev-python/influxdb/influxdb-2.12.0.ebuild b/dev-python/influxdb/influxdb-2.12.0.ebuild
new file mode 100644
index 000000000000..c85a1907f5e9
--- /dev/null
+++ b/dev-python/influxdb/influxdb-2.12.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="InfluxDB client"
+HOMEPAGE="https://github.com/influxdb/influxdb-python http://pypi.python.org/pypi/influxdb"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.3[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/influxdb/metadata.xml b/dev-python/influxdb/metadata.xml
new file mode 100644
index 000000000000..0aedf664258e
--- /dev/null
+++ b/dev-python/influxdb/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">influxdb</remote-id>
+    <remote-id type="github">influxdb/influxdb-python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/iniparse/Manifest b/dev-python/iniparse/Manifest
new file mode 100644
index 000000000000..af220c9d569e
--- /dev/null
+++ b/dev-python/iniparse/Manifest
@@ -0,0 +1,7 @@
+AUX iniparse-0.4-python3.patch 16919 SHA256 bcc0da57d579dd03a44f99ca70686324251c14adb1a1a94632acd321f23c7581 SHA512 ed292dca5b124da5de1617cb2ad4f743b836607226805e488572b37cb08e9a71595ef2e008a26f99f8dd0acaa1308a77cdf58b48cde231524d034138df26ef7e WHIRLPOOL 431363554915af72f484649947a3c53bf314111dc1b3531b56661eb02140b9178eba7b266321f8fa5aa634656efd7a24ae941bf3e95114557cb15ea91f11b047
+AUX iniparse-0.4-tests.patch 779 SHA256 8710a9aa2abcf5e4014bc86c7f810a31c39271d475097e2a9f06a45b64753bb0 SHA512 543770491ca075463e4947d7adff0c846e31e03ba7b263c37d9728b93486ff751d8066cb5cdec3a244c30e00f6f1edbd39ec6ea1188340d0a3edf460af147ee3 WHIRLPOOL 57178426bb91d831d5bdc6e68ffba424abf9eb205f4dd444ff0a2fcbdd44b70fe751672ecbb82ee6d8975f824fc631fa5b624ab7eb9f999f9498d0160c703851
+DIST iniparse-0.4.tar.gz 31278 SHA256 abc1ee12d2cfb2506109072d6c21e40b6c75a3fe90a9c924327d80bc0d99c054 SHA512 d59eae7c1ce474c89eddb0b0cbff5973444571728aa0c6ce5b3632984353415f7eec4de63cf007c276df0d1bb914b2ea5dd0acc00f3a261285c8e2e9883fbe9a WHIRLPOOL 08c81ccaeb18e84f479c1ec851218b3d9466807126ca91d06a906fc36ab13e675939b41f78404200114de14e11ebae402caf7994138090ea247102b2ce6953c5
+EBUILD iniparse-0.4-r2.ebuild 588 SHA256 5a538a966cb2f85c61327d3e0fa01ad74e3907f36e50933f34518fedda4184a4 SHA512 f2e005c759d45723a843694c0c49fe00bd9f4e01f1292acfd13202be3b5e26da27a300b855696d66c385c4b218f7d4183371474e209f31248d20784b38f5515c WHIRLPOOL 6fb9dac25024936f3a9af17c30b5294319025836b0a49db044c387246e08ed478026c7fcdff54c802dc2b0067d417561b329d39140ff1671413761d14ff889ca
+MISC ChangeLog 3981 SHA256 9557e951ce1b4d1615eb745a286bae093184256d2a3e7c014efc5430b7f668c6 SHA512 dedfe2bd4e21ff10ee1c55237b56a0b5d3643470869c9f0fe2a83989842c78106305b1a969317beeba689692cb177aa34f41098cc3f68566610acec9d5d6ed96 WHIRLPOOL dc1b4facf1c84f805a78457f5530f7270401ceab3cfe254f878d0eff94d82edaee3eeb8a7ddd334d48e01aadd46b9011f73c3e3f7f7de68af0a66f4b9907137c
+MISC ChangeLog-2015 1533 SHA256 21378d14cf3dce616898510d96c890a2b711d8f971e1130cd0a028d71a6fc19e SHA512 ef091f82dd3f7d11b4f751aae79ca5cb6d43b0e3f97b7e2886e4f7d2b68f4e5d71659a8c838faa7028eb5be70f830813627e3f6218e38ea140fa16cf59057e7a WHIRLPOOL f9879ec75021ef4e34f3aa801394a30030cf14f1c4cead3ed7ca99896d5de98fcfbbe2b733106a07223166d0de60a1a77c442d39b747f833fe92f9d35212ff38
+MISC metadata.xml 311 SHA256 00f3ccc6d908852b939f3651f4b495184c23c3daae2ba28f5dbdce6339101c82 SHA512 f29afa7ed4888925433a7af5746a6d707c51856a95bf08c6f3b705e721091f84e18b1654d5e0cfb2e00d50d8eff2fa169d94a3642c5903e8cc503ff2a833ce72 WHIRLPOOL b04411eca92e4d200ebe8d3e1dcd633774e4bccb561f928114f5303979295d7bc2ea2f145424fc33d64d2996bb34f2427f5b80726b5f2bbb6c1c8c5ea449eb7f
diff --git a/dev-python/iniparse/files/iniparse-0.4-python3.patch b/dev-python/iniparse/files/iniparse-0.4-python3.patch
new file mode 100644
index 000000000000..a5ebb73e711c
--- /dev/null
+++ b/dev-python/iniparse/files/iniparse-0.4-python3.patch
@@ -0,0 +1,523 @@
+Index: iniparse/__init__.py
+===================================================================
+--- a/iniparse/__init__.py	(revision 146)
++++ b/iniparse/__init__.py	(working copy)
+@@ -3,17 +3,17 @@
+ # Copyright (c) 2007 Tim Lauridsen <tla@rasmil.dk>
+ # All Rights Reserved.  See LICENSE-PSF & LICENSE for details.
+ 
+-from ini import INIConfig, change_comment_syntax
+-from config import BasicConfig, ConfigNamespace
+-from compat import RawConfigParser, ConfigParser, SafeConfigParser
+-from utils import tidy
++from .ini import INIConfig, change_comment_syntax
++from .config import BasicConfig, ConfigNamespace
++from .compat import RawConfigParser, ConfigParser, SafeConfigParser
++from .utils import tidy
+ 
+-from ConfigParser import DuplicateSectionError,    \
+-                  NoSectionError, NoOptionError,   \
+-                  InterpolationMissingOptionError, \
+-                  InterpolationDepthError,         \
+-                  InterpolationSyntaxError,        \
+-                  DEFAULTSECT, MAX_INTERPOLATION_DEPTH
++from .configparser import DuplicateSectionError,    \
++                   NoSectionError, NoOptionError,   \
++                   InterpolationMissingOptionError, \
++                   InterpolationDepthError,         \
++                   InterpolationSyntaxError,        \
++                   DEFAULTSECT, MAX_INTERPOLATION_DEPTH
+ 
+ __all__ = [
+     'BasicConfig', 'ConfigNamespace',
+Index: iniparse/compat.py
+===================================================================
+--- a/iniparse/compat.py	(revision 146)
++++ b/iniparse/compat.py	(working copy)
+@@ -12,20 +12,22 @@
+ """
+ 
+ import re
+-from ConfigParser import DuplicateSectionError,    \
+-                  NoSectionError, NoOptionError,   \
+-                  InterpolationMissingOptionError, \
+-                  InterpolationDepthError,         \
+-                  InterpolationSyntaxError,        \
+-                  DEFAULTSECT, MAX_INTERPOLATION_DEPTH
++from .configparser import DuplicateSectionError,    \
++                   NoSectionError, NoOptionError,   \
++                   InterpolationMissingOptionError, \
++                   InterpolationDepthError,         \
++                   InterpolationSyntaxError,        \
++                   DEFAULTSECT, MAX_INTERPOLATION_DEPTH
+ 
+ # These are imported only for compatiability.
+ # The code below does not reference them directly.
+-from ConfigParser import Error, InterpolationError, \
+-                  MissingSectionHeaderError, ParsingError
++from .configparser import Error, InterpolationError, \
++                   MissingSectionHeaderError, ParsingError
+ 
+-import ini
++import six
+ 
++from . import ini
++
+ class RawConfigParser(object):
+     def __init__(self, defaults=None, dict_type=dict):
+         if dict_type != dict:
+@@ -56,7 +58,7 @@
+         # The default section is the only one that gets the case-insensitive
+         # treatment - so it is special-cased here.
+         if section.lower() == "default":
+-            raise ValueError, 'Invalid section name: %s' % section
++            raise ValueError('Invalid section name: %s' % section)
+ 
+         if self.has_section(section):
+             raise DuplicateSectionError(section)
+@@ -88,7 +90,7 @@
+         filename may also be given.
+         """
+         files_read = []
+-        if isinstance(filenames, basestring):
++        if isinstance(filenames, six.string_types):
+             filenames = [filenames]
+         for filename in filenames:
+             try:
+@@ -143,7 +145,7 @@
+     def getboolean(self, section, option):
+         v = self.get(section, option)
+         if v.lower() not in self._boolean_states:
+-            raise ValueError, 'Not a boolean: %s' % v
++            raise ValueError('Not a boolean: %s' % v)
+         return self._boolean_states[v.lower()]
+ 
+     def has_option(self, section, option):
+@@ -234,7 +236,7 @@
+             if "%(" in value:
+                 try:
+                     value = value % vars
+-                except KeyError, e:
++                except KeyError as e:
+                     raise InterpolationMissingOptionError(
+                         option, section, rawval, e.args[0])
+             else:
+@@ -283,7 +285,7 @@
+     _badpercent_re = re.compile(r"%[^%]|%$")
+ 
+     def set(self, section, option, value):
+-        if not isinstance(value, basestring):
++        if not isinstance(value, six.string_types):
+             raise TypeError("option values must be strings")
+         # check for bad percent signs:
+         # first, replace all "good" interpolations
+Index: iniparse/config.py
+===================================================================
+--- a/iniparse/config.py	(revision 146)
++++ b/iniparse/config.py	(working copy)
+@@ -143,7 +143,7 @@
+ 
+     >>> n.aaa = 42
+     >>> del n.x
+-    >>> print n
++    >>> print(n)
+     aaa = 42
+     name.first = paramjit
+     name.last = oberoi
+@@ -152,7 +152,7 @@
+ 
+     >>> isinstance(n.name, ConfigNamespace)
+     True
+-    >>> print n.name
++    >>> print(n.name)
+     first = paramjit
+     last = oberoi
+     >>> sorted(list(n.name))
+@@ -160,7 +160,7 @@
+ 
+     Finally, values can be read from a file as follows:
+ 
+-    >>> from StringIO import StringIO
++    >>> from six import StringIO
+     >>> sio = StringIO('''
+     ... # comment
+     ... ui.height = 100
+@@ -171,7 +171,7 @@
+     ... ''')
+     >>> n = BasicConfig()
+     >>> n._readfp(sio)
+-    >>> print n
++    >>> print(n)
+     complexity = medium
+     data.secret.password = goodness=gracious me
+     have_python
+@@ -199,7 +199,7 @@
+ 
+     def __str__(self, prefix=''):
+         lines = []
+-        keys = self._data.keys()
++        keys = list(self._data.keys())
+         keys.sort()
+         for name in keys:
+             value = self._data[name]
+@@ -258,7 +258,7 @@
+     >>> n.ui.display_clock = True
+     >>> n.ui.display_qlength = True
+     >>> n.ui.width = 150
+-    >>> print n
++    >>> print(n)
+     playlist.expand_playlist = True
+     ui.display_clock = True
+     ui.display_qlength = True
+@@ -267,7 +267,7 @@
+     >>> from iniparse import ini
+     >>> i = ini.INIConfig()
+     >>> update_config(i, n)
+-    >>> print i
++    >>> print(i)
+     [playlist]
+     expand_playlist = True
+     <BLANKLINE>
+@@ -277,7 +277,7 @@
+     width = 150
+ 
+     """
+-    for name in source:
++    for name in sorted(source):
+         value = source[name]
+         if isinstance(value, ConfigNamespace):
+             if name in target:
+Index: iniparse/configparser.py
+===================================================================
+--- a/iniparse/configparser.py	(revision 0)
++++ b/iniparse/configparser.py	(working copy)
+@@ -0,0 +1,7 @@
++try:
++    from ConfigParser import *
++    # not all objects get imported with __all__
++    from ConfigParser import Error, InterpolationMissingOptionError
++except ImportError:
++    from configparser import *
++    from configparser import Error, InterpolationMissingOptionError
+Index: iniparse/ini.py
+===================================================================
+--- a/iniparse/ini.py	(revision 146)
++++ b/iniparse/ini.py	(working copy)
+@@ -7,7 +7,7 @@
+ 
+ Example:
+ 
+-    >>> from StringIO import StringIO
++    >>> from six import StringIO
+     >>> sio = StringIO('''# configure foo-application
+     ... [foo]
+     ... bar1 = qualia
+@@ -16,14 +16,14 @@
+     ... special = 1''')
+ 
+     >>> cfg = INIConfig(sio)
+-    >>> print cfg.foo.bar1
++    >>> print(cfg.foo.bar1)
+     qualia
+-    >>> print cfg['foo-ext'].special
++    >>> print(cfg['foo-ext'].special)
+     1
+     >>> cfg.foo.newopt = 'hi!'
+     >>> cfg.baz.enabled = 0
+ 
+-    >>> print cfg
++    >>> print(cfg)
+     # configure foo-application
+     [foo]
+     bar1 = qualia
+@@ -42,10 +42,12 @@
+ # Backward-compatiable with ConfigParser
+ 
+ import re
+-from ConfigParser import DEFAULTSECT, ParsingError, MissingSectionHeaderError
++from .configparser import DEFAULTSECT, ParsingError, MissingSectionHeaderError
+ 
+-import config
++import six
+ 
++from . import config
++
+ class LineType(object):
+     line = None
+ 
+@@ -278,6 +280,8 @@
+     value = property(get_value, set_value)
+ 
+     def __str__(self):
++        for c in self.contents:
++            pass#print(c.__str__())
+         s = [x.__str__() for x in self.contents]
+         return '\n'.join(s)
+ 
+@@ -465,7 +469,7 @@
+         self._sections = {}
+         if defaults is None: defaults = {}
+         self._defaults = INISection(LineContainer(), optionxformsource=self)
+-        for name, value in defaults.iteritems():
++        for name, value in defaults.items():
+             self._defaults[name] = value
+         if fp is not None:
+             self._readfp(fp)
+@@ -551,7 +555,7 @@
+ 
+         for line in readline_iterator(fp):
+             # Check for BOM on first line
+-            if linecount == 0 and isinstance(line, unicode):
++            if linecount == 0 and isinstance(line, six.text_type):
+                 if line[0] == u'\ufeff':
+                     line = line[1:]
+                     self._bom = True
+Index: iniparse/utils.py
+===================================================================
+--- a/iniparse/utils.py	(revision 146)
++++ b/iniparse/utils.py	(working copy)
+@@ -1,5 +1,5 @@
+-import compat
+-from ini import LineContainer, EmptyLine
++from . import compat
++from .ini import LineContainer, EmptyLine
+ 
+ def tidy(cfg):
+     """Clean up blank lines.
+Index: tests/__init__.py
+===================================================================
+--- a/tests/__init__.py	(revision 146)
++++ b/tests/__init__.py	(working copy)
+@@ -1,12 +1,12 @@
+ import unittest, doctest
+ 
+-import test_ini
+-import test_misc
+-import test_fuzz
+-import test_compat
+-import test_unicode
+-import test_tidy
+-import test_multiprocessing
++from . import test_ini
++from . import test_misc
++from . import test_fuzz
++from . import test_compat
++from . import test_unicode
++from . import test_tidy
++from . import test_multiprocessing
+ from iniparse import config
+ from iniparse import ini
+ 
+Index: tests/test_compat.py
+===================================================================
+--- a/tests/test_compat.py	(revision 146)
++++ b/tests/test_compat.py	(working copy)
+@@ -1,9 +1,16 @@
+ from iniparse import compat as ConfigParser
+-import StringIO
++from six import StringIO
++try:
++    import UserDict
++except ImportError:
++    import collections as UserDict
+ import unittest
+-import UserDict
+ 
+-from test import test_support
++import sys
++if sys.version_info[0] < 3:
++    from test import test_support
++else:
++    from test import support as test_support
+ 
+ class SortedDict(UserDict.UserDict):
+     def items(self):
+@@ -35,7 +42,7 @@
+ 
+     def fromstring(self, string, defaults=None):
+         cf = self.newconfig(defaults)
+-        sio = StringIO.StringIO(string)
++        sio = StringIO(string)
+         cf.readfp(sio)
+         return cf
+ 
+@@ -161,7 +168,7 @@
+                          "No Section!\n")
+ 
+     def parse_error(self, exc, src):
+-        sio = StringIO.StringIO(src)
++        sio = StringIO(src)
+         self.assertRaises(exc, self.cf.readfp, sio)
+ 
+     def test_query_errors(self):
+@@ -181,7 +188,7 @@
+     def get_error(self, exc, section, option):
+         try:
+             self.cf.get(section, option)
+-        except exc, e:
++        except exc as e:
+             return e
+         else:
+             self.fail("expected exception type %s.%s"
+@@ -227,7 +234,7 @@
+             "foo: another very\n"
+             " long line"
+             )
+-        output = StringIO.StringIO()
++        output = StringIO()
+         cf.write(output)
+         self.assertEqual(
+             output.getvalue(),
+@@ -465,7 +472,7 @@
+                         "o1=4\n"
+                         "[a]\n"
+                         "k=v\n")
+-        output = StringIO.StringIO()
++        output = StringIO()
+         self.cf.write(output)
+         self.assertEquals(output.getvalue(),
+                           "[a]\n"
+Index: tests/test_fuzz.py
+===================================================================
+--- a/tests/test_fuzz.py	(revision 146)
++++ b/tests/test_fuzz.py	(working copy)
+@@ -1,9 +1,10 @@
+ import re
+ import os
+ import random
++import sys
+ import unittest
+-import ConfigParser
+-from StringIO import StringIO
++from six import StringIO
++from six.moves import configparser
+ from iniparse import compat, ini, tidy
+ 
+ # TODO:
+@@ -96,24 +97,25 @@
+                 s = '\n'.join(good_lines)
+                 cc = compat.RawConfigParser()
+                 cc.readfp(StringIO(s))
+-                cc_py = ConfigParser.RawConfigParser()
++                cc_py = configparser.RawConfigParser()
+                 cc_py.readfp(StringIO(s))
+                 # compare the two configparsers
+                 self.assertEqualConfig(cc_py, cc)
+                 # check that tidy does not change semantics
+                 tidy(cc)
+-                cc_tidy = ConfigParser.RawConfigParser()
++                cc_tidy = configparser.RawConfigParser()
+                 cc_tidy.readfp(StringIO(str(cc.data)))
+                 self.assertEqualConfig(cc_py, cc_tidy)
+             except AssertionError:
+                 fname = 'fuzz-test-iter-%d.ini' % fuzz_iter
+-                print 'Fuzz test failed at iteration', fuzz_iter
+-                print 'Writing out failing INI file as', fname
++                print('Fuzz test failed at iteration', fuzz_iter)
++                print('Writing out failing INI file as', fname)
+                 f = open(fname, 'w')
+                 f.write(s)
+                 f.close()
+                 raise
+ 
++    @unittest.skipIf(sys.version_info[0] > 2, 'http://code.google.com/p/iniparse/issues/detail?id=22#c9')
+     def assertEqualConfig(self, c1, c2):
+         self.assertEqualSorted(c1.sections(), c2.sections())
+         self.assertEqualSorted(c1.defaults().items(), c2.defaults().items())
+@@ -123,9 +125,7 @@
+                 self.assertEqual(c1.get(sec, opt), c2.get(sec, opt))
+ 
+     def assertEqualSorted(self, l1, l2):
+-        l1.sort()
+-        l2.sort()
+-        self.assertEqual(l1, l2)
++        self.assertEqual(sorted(l1), sorted(l2))
+ 
+ class suite(unittest.TestSuite):
+     def __init__(self):
+Index: tests/test_ini.py
+===================================================================
+--- a/tests/test_ini.py	(revision 146)
++++ b/tests/test_ini.py	(working copy)
+@@ -1,5 +1,5 @@
+ import unittest
+-from StringIO import StringIO
++from six import StringIO
+ 
+ from iniparse import ini
+ from iniparse import compat
+@@ -196,13 +196,13 @@
+         self.assertEqual(p._data.find('section2').find('just').value, 'kidding')
+ 
+         itr = p._data.finditer('section1')
+-        v = itr.next()
++        v = next(itr)
+         self.assertEqual(v.find('help').value, 'yourself')
+         self.assertEqual(v.find('but').value, 'also me')
+-        v = itr.next()
++        v = next(itr)
+         self.assertEqual(v.find('help').value, 'me')
+         self.assertEqual(v.find('I\'m').value, 'desperate')
+-        self.assertRaises(StopIteration, itr.next)
++        self.assertRaises(StopIteration, next, itr)
+ 
+         self.assertRaises(KeyError, p._data.find, 'section')
+         self.assertRaises(KeyError, p._data.find('section2').find, 'ahem')
+Index: tests/test_misc.py
+===================================================================
+--- a/tests/test_misc.py	(revision 146)
++++ b/tests/test_misc.py	(working copy)
+@@ -1,9 +1,9 @@
+ import re
+ import unittest
+ import pickle
+-import ConfigParser
++from six.moves import configparser
++from six import StringIO
+ from textwrap import dedent
+-from StringIO import StringIO
+ from iniparse import compat, ini
+ 
+ class CaseSensitiveConfigParser(compat.ConfigParser):
+Index: tests/test_tidy.py
+===================================================================
+--- a/tests/test_tidy.py	(revision 146)
++++ b/tests/test_tidy.py	(working copy)
+@@ -1,6 +1,6 @@
+ import unittest
+ from textwrap import dedent
+-from StringIO import StringIO
++from six import StringIO
+ 
+ from iniparse import tidy,INIConfig
+ from iniparse.ini import  EmptyLine
+Index: tests/test_unicode.py
+===================================================================
+--- a/tests/test_unicode.py	(revision 146)
++++ b/tests/test_unicode.py	(working copy)
+@@ -1,5 +1,5 @@
+ import unittest
+-from StringIO import StringIO
++import six
+ from iniparse import compat, ini
+ 
+ class test_unicode(unittest.TestCase):
+@@ -17,14 +17,14 @@
+     """
+ 
+     def basic_tests(self, s, strable):
+-        f = StringIO(s)
++        f = six.StringIO(s)
+         i = ini.INIConfig(f)
+-        self.assertEqual(unicode(i), s)
+-        self.assertEqual(type(i.foo.bar), unicode)
++        self.assertEqual(six.text_type(i), s)
++        self.assertEqual(type(i.foo.bar), six.text_type)
+         if strable:
+             self.assertEqual(str(i), str(s))
+         else:
+-            self.assertRaises(UnicodeEncodeError, lambda: str(i))
++            self.assertRaises(UnicodeEncodeError, lambda: six.text_type(i).encode('ascii'))
+         return i
+ 
+     def test_ascii(self):
diff --git a/dev-python/iniparse/files/iniparse-0.4-tests.patch b/dev-python/iniparse/files/iniparse-0.4-tests.patch
new file mode 100644
index 000000000000..ca6900ad2ea5
--- /dev/null
+++ b/dev-python/iniparse/files/iniparse-0.4-tests.patch
@@ -0,0 +1,27 @@
+From b3d6ea5ed88b0e6cf9fdb411a14e725665ded92e Mon Sep 17 00:00:00 2001
+From: Tim Lauridsen <timlau@fedoraproject.org>
+Date: Fri, 7 Mar 2014 19:06:40 +0100
+Subject: [PATCH] Fix handling of REM xxxxxxxx as a comment, but REMXXXX is not
+ (upstream issue #28)
+
+---
+ tests/test_ini.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/tests/test_ini.py b/tests/test_ini.py
+index 07d4f4e..6d974f0 100644
+--- a/tests/test_ini.py
++++ b/tests/test_ini.py
+@@ -144,8 +144,7 @@ class test_comment_line(unittest.TestCase):
+         '#this is a comment',
+         ';; this is also a comment',
+         '; so is this   ',
+-        'Rem and this',
+-        'remthis too!'
++        'Rem and this'
+     ]
+     def test_parsing(self):
+         for l in self.lines:
+-- 
+1.8.5.3
+
diff --git a/dev-python/iniparse/iniparse-0.4-r2.ebuild b/dev-python/iniparse/iniparse-0.4-r2.ebuild
new file mode 100644
index 000000000000..4c4d1a47417f
--- /dev/null
+++ b/dev-python/iniparse/iniparse-0.4-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Better INI parser for Python"
+HOMEPAGE="https://pypi.python.org/pypi/iniparse"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT PSF-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-python3.patch"
+	"${FILESDIR}/${P}-tests.patch"
+)
+
+python_test() {
+	"${EPYTHON}" runtests.py || die
+}
diff --git a/dev-python/iniparse/metadata.xml b/dev-python/iniparse/metadata.xml
new file mode 100644
index 000000000000..6d4c229f7a73
--- /dev/null
+++ b/dev-python/iniparse/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">iniparse</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/inotifyx/Manifest b/dev-python/inotifyx/Manifest
new file mode 100644
index 000000000000..5e28d15e7045
--- /dev/null
+++ b/dev-python/inotifyx/Manifest
@@ -0,0 +1,5 @@
+DIST inotifyx-0.2.2.tar.gz 11831 SHA256 bad6a84df2a110f282d398dff112b1d3c838a6d50907305121a9af590d185fab SHA512 a00a947da2bd31d9b867f21666aceed48b0bf9be6b1b3643676450ed68bd71400601e57e004bcd45e93274cabf933694887797f3a4e334ce6924236763112c56 WHIRLPOOL 806c83a69141d901f3df443739bc3a5dfc6d5f66dc45fc4c8c6780e1267aa709f0c3bbdb775caa332bdcd954b262523fcd3b8bf2867e408382175f806925dfeb
+EBUILD inotifyx-0.2.2.ebuild 484 SHA256 4cae8348a944b5af34450d2de8dbeb65e6cfbfe58b8cca19db8d9eefefe38cdd SHA512 1e578d8e65506f87eb0a4d129cb4dfb26503830e1ac398ae75e0685976cbca64ce2770d1fc49ef03264cf07f2e735c02322b4ebee8ac068b1338f1114efd9d0c WHIRLPOOL 97dcf8a482cf6352194e7c79fe221dffe7a1307a4a67e426877ca8b39461808997a8f22d41d37b83b1ca6cf4d4074827cbb34c482986769204b2c3fe767690bc
+MISC ChangeLog 2791 SHA256 772036167eb7c829fcb074519c4c53ff4d3c06ccc9f544fe2f1a6ffdf988cbdc SHA512 7b20455ab81acfd8698deb2b1dcb7055f02095e578fedcc7bac4a201add605eb7a0e5d095dc274dabd5d9972567883b9d2e94d8e240f43844ae48a6a4e78f56b WHIRLPOOL 5014edee7f46da574b00ff927e40ac6bf46fa91fcc560c050b1b78e8a2ecac146c7cf805d55fd1b84178c5ab9583be62087c643947ca1f29352551af8706c215
+MISC ChangeLog-2015 1685 SHA256 e1603c950f573c2b88d81a15922edfcb0a590d5fa7923ace4d8ad6db2516d365 SHA512 506c923b31c8d1ef9b0dd20cf6d9f69e7e005a448a6c3216729a8529e1255d078eb9d851f84d3a126a5f0189d7909ba4f2614d6b7ef5ab31263cc9503c67871e WHIRLPOOL 262f6224d184c28a350b50f2d715518c93976ffa2aafb2fbaa9169fafd3d9d5ae726fe48058dde3145b8b40b37a513daf8d0d72fdf26107378b809388490ab23
+MISC metadata.xml 325 SHA256 01ac380c6a5bf522cf8211554d2a636e38e1cb0f7c3b608e5731c87e517f8777 SHA512 60447839a97f75c1649cdf8ef33333a70fafce89882c97ee3222996834246ce2bb92605c2b47fb1ae57507b8dd4192aaaf90c7d2bafbfd1fad4103a07c7b6a7d WHIRLPOOL 25e8bd608ec6e58035bc3b2ad4422814c77dfec31418fbfa454719cea5f7f16444bcc0142dc7bcf5b09ca191a7363ef90a57e280b29d230c52235185e14900bb
diff --git a/dev-python/inotifyx/inotifyx-0.2.2.ebuild b/dev-python/inotifyx/inotifyx-0.2.2.ebuild
new file mode 100644
index 000000000000..ebaafa18716c
--- /dev/null
+++ b/dev-python/inotifyx/inotifyx-0.2.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings to the Linux inotify file system event monitoring API"
+HOMEPAGE="http://www.alittletooquiet.net/software/inotifyx/"
+SRC_URI="https://launchpad.net/inotifyx/dev/v${PV}/+download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/inotifyx/metadata.xml b/dev-python/inotifyx/metadata.xml
new file mode 100644
index 000000000000..c670c9a3466f
--- /dev/null
+++ b/dev-python/inotifyx/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">inotifyx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/intelhex/Manifest b/dev-python/intelhex/Manifest
new file mode 100644
index 000000000000..aa65699138c0
--- /dev/null
+++ b/dev-python/intelhex/Manifest
@@ -0,0 +1,4 @@
+DIST intelhex-2.0.tar.gz 69410 SHA256 11eeb14534a84218b59094c2b76fbde448cac08613be0925efbcf1432ea0bbec SHA512 3b3d70bd758e5780922277a8f153467568d7d7d2517528848c7f6d8c137ef5e75612f0b0653f89b277c68e421785611cdddd9a0c924061780279f1fec2319c86 WHIRLPOOL 7d190b22767d907f233f5aaf297bbbed0498651813c5b962b7a0c500ac4ab8c297344c166b6806110970ce8e0b46b34a74cc82f0ebb6609c725ed5075027840e
+EBUILD intelhex-2.0.ebuild 439 SHA256 0ca4fa7bad04afce326068dd0ab3a4b773a37a7c11821e5757a7bda4a130368a SHA512 416e3c156a83940688808fecab5b2b65bc54f08fa224c92f7c996407c192ef35e5440ed3d54353399a57f93039f435fb1d51d8f6c16aae82876b7d4b7d05fa2d WHIRLPOOL 069385d17e3d6c1dd0ee5867fae35f7917bc055597bec80881e3ad35c44d4f5e92f12889416fdaf37eb88217464c48dfe12943f5f25a109c2f3c7366c9624940
+MISC ChangeLog 1285 SHA256 0337436b00327f751bd37f61e84685b1ff4c86dd905b652de532840545cede3b SHA512 9db6de8391709c0ba1ca2494a41ed283dbaef40d9fd4907e8b6b0e70f21bd21873ad852f1c45080f5ad1c6dc98ae002884fafc39a67e3ff6c4566e2181e07df9 WHIRLPOOL 218b3e2554bc7ad280463372a7ec93ff5dd03ffd414c1e231f7e06f6ddd6d0d6909c5c7a740057c7da66364aebe5bed30c935f876737bb224cba7a5550c8614b
+MISC metadata.xml 358 SHA256 8ed5ff2011508abf5327bae8c4ed25d5413eeca4366b8aaf7c6bc505c7431c7b SHA512 1861f321df055b65260a63d65807468a38823cae9c51fb159c836333c2db3715bd75e1570b896cd0e15130811aec691a326702540055ed7dfdef5bec260fe96c WHIRLPOOL 273a7ea70538f96450df7bb2dcc4fe341720213e72508f55d9f911a084e015e0e066d06c2afec93b1193c7b8bfe9bc887710d83e6015621f4d6898991ce280d3
diff --git a/dev-python/intelhex/intelhex-2.0.ebuild b/dev-python/intelhex/intelhex-2.0.ebuild
new file mode 100644
index 000000000000..bbc4705890bb
--- /dev/null
+++ b/dev-python/intelhex/intelhex-2.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for Intel HEX files manipulations"
+HOMEPAGE="http://pypi.python.org/pypi/IntelHex/ https://github.com/bialix/intelhex"
+SRC_URI="mirror://pypi/I/IntelHex/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+IUSE=""
diff --git a/dev-python/intelhex/metadata.xml b/dev-python/intelhex/metadata.xml
new file mode 100644
index 000000000000..90caf113b01a
--- /dev/null
+++ b/dev-python/intelhex/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<upstream>
+	<remote-id type="pypi">IntelHex</remote-id>
+	<remote-id type="github">bialix/intelhex</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/intervaltree/Manifest b/dev-python/intervaltree/Manifest
new file mode 100644
index 000000000000..3ade65f66e1e
--- /dev/null
+++ b/dev-python/intervaltree/Manifest
@@ -0,0 +1,3 @@
+DIST intervaltree-2.1.0.tar.gz 38404 SHA256 aca5804b88f70cb49050c37b6de59090570f77a75aec1932966cf69f6a48810b SHA512 983318e23c681ae53371125700bf6f2494467f719e5ffce661564e117d2a7c711da17e74a5793ce2688d8389b3373f17fbb384ac0b37d2be10d6c0a6ec5ecd29 WHIRLPOOL 8b10be2b5517d14873014f7b60bfe24c8024a5d5a499ba75ef39d6955259d1e9f25eb98735a6edf293cc527d6b80a654d0cd3591fd8717b28f3bcb8703b4fd97
+EBUILD intervaltree-2.1.0.ebuild 631 SHA256 cfe4216dd66636354d00b833d2b08a2520eaef350a42ca8da4f7492901bf71b2 SHA512 527b964520bfc7f4293d28d0f96ac85b452f8572cd91d7535be8357844dfbd0114b99ba360b32066b82a64d513376f6a5c123c27edf5cf5897e658df5728e349 WHIRLPOOL adcfeb3f220349aee4c3ed5b512367ff09d51e13c7c7e3df3b0881c51eed25310917e4785d1ffe38ee6f276cddd4099c43edc96231cbbedd0787e6bc9642813b
+MISC metadata.xml 336 SHA256 2bffe785f4d531313abc8cf3e607af8d6d42dfe96c20afa23c71b9705fb93196 SHA512 4149796fdf18a600f444b1716e32116eedcb71a535e206e3e1233b91071967fb8419b5b15710710508f25fef609a8cb2a68baafd4a91d72e962acaf42a8feb2b WHIRLPOOL d42b6997eeff12ae6f7c065023512e0afd760753f69edaa23c8ae42e64f42b6f7e4d1006ea4bd8b3790ea93e55fc6e9c557dd75954817574aefcfa0753b445c9
diff --git a/dev-python/intervaltree/intervaltree-2.1.0.ebuild b/dev-python/intervaltree/intervaltree-2.1.0.ebuild
new file mode 100644
index 000000000000..8e32eb654019
--- /dev/null
+++ b/dev-python/intervaltree/intervaltree-2.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Editable interval tree data structure for Python 2 and 3"
+HOMEPAGE="https://pypi.python.org/pypi/intervaltree"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/intervaltree/metadata.xml b/dev-python/intervaltree/metadata.xml
new file mode 100644
index 000000000000..16eae33e858a
--- /dev/null
+++ b/dev-python/intervaltree/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">intervaltree</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/into/Manifest b/dev-python/into/Manifest
new file mode 100644
index 000000000000..766f4a258176
--- /dev/null
+++ b/dev-python/into/Manifest
@@ -0,0 +1,5 @@
+DIST into-0.2.2.tar.gz 85008 SHA256 8a6d5595625a1c2de0732ba4448c554b707a8259b477c9b0b7bb94a1f1ca887b SHA512 0dc43e55dcbb6264c226c1b4d893b07fee9e90304e293953b26764d90ba211ed65eddad68c7fe4f2eebe7b57595bbd12131665394ce4f339da0cf77337ed16e2 WHIRLPOOL 49da50cc994788037ac4edd5f5c44802a2263f30184bfe4d64810395efa97283e1741ef879e9b883a0b02ed2732eb280448d339f55cafa501706fd8b2f2afdfa
+EBUILD into-0.2.2.ebuild 701 SHA256 8daa6dbaf5d3f023a7ab3f4bb036dd8def7b38b81f27dd33ebb9f2b998b28a11 SHA512 5bbd71d2f9a288245cc9af83805dc37cf47509f29cdfdfad08afb2dfc2f44d3a129a7426a5e865483ce0e767a2b484e59cf736db5786c4311f6c994347a754b7 WHIRLPOOL c76c9af773ce15887f6e91f79a4869afb92d423503da252ab8bcf0ef0f255f370c2445afd58063a96e70a31ea372538f0691ca281fe83c64683c6da97595b6e9
+MISC ChangeLog 2792 SHA256 863ec60d52bb6122dfe4a6671f76dcf810c7da11387ffd42ed216f7372aeb165 SHA512 2484749777b24be09ae578326d6603243a23e5e2a85c64ede205350cdbf74cceebc5262095dbd4bfbbd03ae5fed1f92ad4e5242cf7289fa7f36a9163236bfcb5 WHIRLPOOL e0ed2b8bdcf73d11f89f805e2d2ba5688cf04e717d626b23493f8d655e72382c3792e8825e6f0ab9d32613622353ee7a7e7702d8fd6322bd928c1b5999aca790
+MISC ChangeLog-2015 1060 SHA256 b14d71b68d2b3975c4c7bd4ceefcea9c291f8b498a6f5473318e8fb0b4ad3800 SHA512 6dc378cd9f257451f4d11a4e724e25157218a9268ad1c4cde0ac0e7d1affc09269da77b157956d454f4f69d11837f319d7e5e1f3d6d9fc96a80dd1ceb5f19b5b WHIRLPOOL c8f538520044430d5ff777c14cb789a510cd1391caba286ecfd63632cda981fafcf0c5198e5e59abc51d38ce218fd40c06b5a343c555dab827cef2a0800eab89
+MISC metadata.xml 317 SHA256 b34f2e593531e26f166350c7cd1edc6d750031b727bbf4c9587e7fccbed0e061 SHA512 41ace180fc3b6550d60bf8969358c4220acd21c688decf0d47d437dfa2423e7cf5a015bd163108c7e5ef028fba1ae0383754f772d9de954e35f840d09c97ff03 WHIRLPOOL 059080891b5bb4dc8c1d0c5a3079a7225448b87428ea20d1a9fe3642c25463b3dab2fe02decd450f83fef8ed5545b54acc2af520b8fe4e4e45cb48ee920ce813
diff --git a/dev-python/into/into-0.2.2.ebuild b/dev-python/into/into-0.2.2.ebuild
new file mode 100644
index 000000000000..ae24d10cdba9
--- /dev/null
+++ b/dev-python/into/into-0.2.2.ebuild
@@ -0,0 +1,25 @@
+# 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
+
+DESCRIPTION="Data migration utilities"
+HOMEPAGE="https://pypi.python.org/pypi/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="dev-python/datashape[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-python/pandas-0.15[${PYTHON_USEDEP}]
+		dev-python/toolz[${PYTHON_USEDEP}]
+		dev-python/multipledispatch[${PYTHON_USEDEP}]
+		dev-python/networkx[${PYTHON_USEDEP}]
+		!media-libs/urt" # Bug #552448
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/into/metadata.xml b/dev-python/into/metadata.xml
new file mode 100644
index 000000000000..d392ddfdc2bc
--- /dev/null
+++ b/dev-python/into/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">into</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/iocapture/Manifest b/dev-python/iocapture/Manifest
new file mode 100644
index 000000000000..c40d577b3cf0
--- /dev/null
+++ b/dev-python/iocapture/Manifest
@@ -0,0 +1,5 @@
+DIST iocapture-0.1.2.tar.gz 13114 SHA256 57056d1a99a9c584ae2bb23a1aa855292fd2bcc01a8a6ad5467d7ca2e739d31b SHA512 1205d13b107d83dcb45d5546038d8b0b5417a20a51149c405123111488c351ff81a447f10653cd3dd9ecc236e01a0fcceb6647091e38ff2fa34c69e0baff1567 WHIRLPOOL 808ca4412f7c024e1c272777fb1bb86c00d976c28bf0bd4966769b60c1153178f5cabdf61d4f1028b994249c2a84ba70c83ced838199aa13fc12019f6a58c86b
+EBUILD iocapture-0.1.2-r1.ebuild 695 SHA256 e0af147e277aa258ce95bc076a6faac62e7c8d687e3784438348fdd230244c96 SHA512 1ec63835220083849d3dd6494d25972080f9ed7028474548f5cb89ba4b88fa66a28c7025690f283262abb6266c0f7cd9c38be1b920eed6e71e22328baafdb5fb WHIRLPOOL 37adc482ba4ff1ef2900b4062d4f91829ed450e401da1d37b6baaf1cf46dd85e0324050a73e8370f3304c1909d20917da1bcc20055df54400ffbac0daf0637dd
+EBUILD iocapture-0.1.2.ebuild 689 SHA256 0dbd911d985f700245ec1b25cda565d862b1f5d4d29b02762d61bf3cab23459a SHA512 c892f52bd40e64cb165244d5790777ee3203bab92fd0beffde127b445d3b6cfcbe2ac350bd646f01264af41d9ee073ce00c37afa2d9eba8b43ccc45c8c5deed0 WHIRLPOOL e9252680ede91ef07eb3f49bf3f66de6ec0c59b110712491ace6ead1249177ca0f06f44490bb5da8b9722f5b8486ff38804d83dc51fdb1d195664181ece6d405
+MISC ChangeLog 469 SHA256 62eb192f1fee43f9edfc695168ac862b79a31361f9eab22b5eb65dae1199ef66 SHA512 33f966b322c01e980495ff64f70c042d957aa628bda94fb898b478447635629f964285d9c610ab81a75fc493e23fae71519e9b3d5499ff261d5ca14fde3b5fc4 WHIRLPOOL aad9ba6518524ed558d5092989190945924c31308705ef68597b2f0fc038984600fb2edc6e440a5c120cd18a74f12676769ab0b13d1ba6f0e2c8b164bbe61d20
+MISC metadata.xml 368 SHA256 a73419a8dc33f4177f91aab02c0ab9fbe5596d5b97ebb16eae8a93cf3ea39106 SHA512 463826d4afeb4be68800318809427cb4762f9fb7e14f6f4ed2fe84a7765dfb5acaf9d5fe2f1e339e06a092d8a4dec5d21b3a9f15fc10c9112b69e85f4903b932 WHIRLPOOL 66f533bf1507108c7c0dfb79e7f5b36ce5a9d47e07e713523e2b4020f16a1bc613857468c44f15ce1fab61c04d5e693a69bbcc656de19eafb40b5518d2be5421
diff --git a/dev-python/iocapture/iocapture-0.1.2-r1.ebuild b/dev-python/iocapture/iocapture-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..20efb540ea09
--- /dev/null
+++ b/dev-python/iocapture/iocapture-0.1.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Capture stdout,stderr easily"
+HOMEPAGE="https://pypi.python.org/pypi/iocapture/"
+SRC_URI="https://github.com/oinume/iocapture/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+LICENSE="MIT"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+		${RDEPEND}
+	)"
+
+python_test() {
+	py.test || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/iocapture/iocapture-0.1.2.ebuild b/dev-python/iocapture/iocapture-0.1.2.ebuild
new file mode 100644
index 000000000000..c1efb80fdfbc
--- /dev/null
+++ b/dev-python/iocapture/iocapture-0.1.2.ebuild
@@ -0,0 +1,29 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Capture stdout,stderr easily"
+HOMEPAGE="https://pypi.python.org/pypi/iocapture/"
+SRC_URI="https://github.com/oinume/iocapture/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+LICENSE="MIT"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+		${RDEPEND}
+	)"
+
+python_test() {
+	py.test || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/iocapture/metadata.xml b/dev-python/iocapture/metadata.xml
new file mode 100644
index 000000000000..eedcfcf90ce0
--- /dev/null
+++ b/dev-python/iocapture/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">iocapture</remote-id>
+		<remote-id type="github">oinume/iocapture</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ioflo/Manifest b/dev-python/ioflo/Manifest
new file mode 100644
index 000000000000..b34f6cb2e33d
--- /dev/null
+++ b/dev-python/ioflo/Manifest
@@ -0,0 +1,11 @@
+DIST ioflo-1.5.0.tar.gz 765559 SHA256 28f878e6f435453b31f4595ffcf021078aa773c426b2dd21e1f53d467789080b SHA512 114dd5ab3ab5bbe66be7e639c2018256ff1c8ab18ba73931733dbe23c8f65631fd630f278b0a186303e288a6f49cd6df224dda462973cc258b3d07114e70c991 WHIRLPOOL f90b472d4a360a97cd2b74fb9fabd3fe4896961d924d1ec87d9fa45165f9473c875ae97bf26df92f9e2e073f8227435df1d4b6d054e3fbdcb2bd9e95c45c02fd
+DIST ioflo-1.6.7.tar.gz 823994 SHA256 e3f500064972d43cf45327af6140950c55020ea3b15cccaad1450a6915660c09 SHA512 256ded683e65896160546145ac9993f3221170584a70ef21fab3230b7d2300d9562a1bc7d1f8911e5e930340b119fa88cc5d2f9717899bde0ee69501a3ba6a57 WHIRLPOOL 672482df434951d5f8c6a68aac3a728eccc47f1c175fa2648a0edfe45e33523b291d0fc24c2db34fc2c1a1ff610c02c8758f7c4cfada5bf1100140b622f28151
+DIST ioflo-1.7.0.tar.gz 827128 SHA256 5bde25cff49397d48d0280ac03cb583b04524a8cee70e1dd34d99341f2a97dbc SHA512 b7f3ba0511ed5f2cf8031aa11a660ccee8eef0674c8df17ec09ff32268b5c9d34dd2d79956ddf24ab2fcbf4fe8fc7bb5e521f9636f013b7ed6365960b4cabe48 WHIRLPOOL 53743f6d689252c02fd4025334add34bb2e02ac015dc3d17403cc1b2445d930c92d3846b3d9d068e484d330b7b8a4d73ba112e2a989bb9a677b9183e26a7827b
+DIST ioflo-1.7.4.tar.gz 834916 SHA256 dc9f95a5fc701dd6efddc2ddd08141491b4f8720e1dc03ac565c28006c6d886a SHA512 415b43b66c1be479e8ba4fc993f180418f95f1ae0d16ff8c496476da7a04f6caa0f918a064c60034cd926f4f49c1112946b911b57339a76ee5b0d2564ade224f WHIRLPOOL 30bf7f38b1c04c920935f603f6fa77062ee67c93dbe8932c0251297811dab5c356c9326eb3fdacdde0210400809fc88bcbf52b47165813db1323ecc5d7d33da8
+EBUILD ioflo-1.5.0.ebuild 487 SHA256 342f7c235b50050bbd73788aadd8bffa475a8bca7d9a220515b99d224556ab46 SHA512 44c4dd772945ac479e121b205989b988fd81ba2d3548636770e47a17a279490b042112c9790cdc7820a1b96ea95e695d1bd114e7451b6b0966bff2bb1889146d WHIRLPOOL bc34383140e6153e6da83bb65571471037b38f368b225b2cdd9f0a7b8c55d7ca421a259faab7cf18554f2fa9def2b6b6882141448877e4c14902658ff5c6254c
+EBUILD ioflo-1.6.7.ebuild 540 SHA256 fcfbe8d3d2a0336ac29f070754793ad1b61d79debed43aa210ec7285df5db025 SHA512 d7dbbe21d04f590dbbd2a4428fbc432e78c3ae4c7af1d94101ba10179d275e91784cd79364afd2a3550e60244b3cc560a9a73c4a9baaa441ea8f9f3efb71796d WHIRLPOOL 1a8b1ef50063a3cb9daf25323d5f0079957eb9e3448c3e5255ce8260d18363a6f48c6816b48f2922069e724b8c25fd6508276e3919529eb818f2e8031c700d91
+EBUILD ioflo-1.7.0.ebuild 540 SHA256 fcfbe8d3d2a0336ac29f070754793ad1b61d79debed43aa210ec7285df5db025 SHA512 d7dbbe21d04f590dbbd2a4428fbc432e78c3ae4c7af1d94101ba10179d275e91784cd79364afd2a3550e60244b3cc560a9a73c4a9baaa441ea8f9f3efb71796d WHIRLPOOL 1a8b1ef50063a3cb9daf25323d5f0079957eb9e3448c3e5255ce8260d18363a6f48c6816b48f2922069e724b8c25fd6508276e3919529eb818f2e8031c700d91
+EBUILD ioflo-1.7.4.ebuild 540 SHA256 fcfbe8d3d2a0336ac29f070754793ad1b61d79debed43aa210ec7285df5db025 SHA512 d7dbbe21d04f590dbbd2a4428fbc432e78c3ae4c7af1d94101ba10179d275e91784cd79364afd2a3550e60244b3cc560a9a73c4a9baaa441ea8f9f3efb71796d WHIRLPOOL 1a8b1ef50063a3cb9daf25323d5f0079957eb9e3448c3e5255ce8260d18363a6f48c6816b48f2922069e724b8c25fd6508276e3919529eb818f2e8031c700d91
+MISC ChangeLog 2613 SHA256 3140103edf136d3e29cfed83450e31270a7395e0b42fdef663ee8e28870e3023 SHA512 0def4d410f053f904b90d676e962e58ddec134e438de60dbc3e09ead96eb51d31c87b234885dcf459d72e82841a974b6a5c54323bd0f2e3f75ac5d2344043c97 WHIRLPOOL 519cb1e9ea8d657ebe8acced7600c49f7b1532ec4bd761a0b1e5176df714804febea898f70b42d1e98c55738a2d444939bf06c9f914a3e06bc4d2d47526bd5a7
+MISC ChangeLog-2015 808 SHA256 5b3892ff3879595fe5737e476209f13442f5c575b88f3bf3d31668622f2c4358 SHA512 bd9651c3865b376b304d5b485dbe0f05fff309f354e867145fa2c3eeb69e1dc266c5edc953cf35dcdc84c1f70c0a8bb01634cb2ee73af90d67f00e35d2c9ed07 WHIRLPOOL 555da837a84fff18b02730129391650a241bf7dd1f8b3c2a259c2a03bf1d4a5405f0e13e4237f63ddc6dabe31a8f4987fd72976273313a1c525eb362df636033
+MISC metadata.xml 442 SHA256 f259d85ab1a6fa71a147387368403968b1f8c696b1ccc8ee9c63ba4dd165f537 SHA512 8d6a727c351749f21566b4085b2355611b40e7a962e99d1a0e52d19d96f3d64db66c17ef01d08b82b4031bcdc637ae0a074423fd1eb92323334d6ee36d004742 WHIRLPOOL 4d243d45d3ee4e4ca24cf8dfa55c8af6a3b2e8e46a440f031f605e9ca18770ca016d5e5a5dcfb27c447f6684f50e1d5f2ba764938aeb72bf3125f04f1429749c
diff --git a/dev-python/ioflo/ioflo-1.5.0.ebuild b/dev-python/ioflo/ioflo-1.5.0.ebuild
new file mode 100644
index 000000000000..0c230f0e0c51
--- /dev/null
+++ b/dev-python/ioflo/ioflo-1.5.0.ebuild
@@ -0,0 +1,18 @@
+# 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
+
+DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
+HOMEPAGE="https://github.com/ioflo/ioflo/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ioflo/ioflo-1.6.7.ebuild b/dev-python/ioflo/ioflo-1.6.7.ebuild
new file mode 100644
index 000000000000..6bc509dcef22
--- /dev/null
+++ b/dev-python/ioflo/ioflo-1.6.7.ebuild
@@ -0,0 +1,19 @@
+# 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
+
+DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
+HOMEPAGE="https://github.com/ioflo/ioflo/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-git-1.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/ioflo/ioflo-1.7.0.ebuild b/dev-python/ioflo/ioflo-1.7.0.ebuild
new file mode 100644
index 000000000000..6bc509dcef22
--- /dev/null
+++ b/dev-python/ioflo/ioflo-1.7.0.ebuild
@@ -0,0 +1,19 @@
+# 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
+
+DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
+HOMEPAGE="https://github.com/ioflo/ioflo/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-git-1.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/ioflo/ioflo-1.7.4.ebuild b/dev-python/ioflo/ioflo-1.7.4.ebuild
new file mode 100644
index 000000000000..6bc509dcef22
--- /dev/null
+++ b/dev-python/ioflo/ioflo-1.7.4.ebuild
@@ -0,0 +1,19 @@
+# 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
+
+DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
+HOMEPAGE="https://github.com/ioflo/ioflo/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-git-1.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/ioflo/metadata.xml b/dev-python/ioflo/metadata.xml
new file mode 100644
index 000000000000..3273120e4e7c
--- /dev/null
+++ b/dev-python/ioflo/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ioflo/ioflo</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ip-associations-python-novaclient-ext/Manifest b/dev-python/ip-associations-python-novaclient-ext/Manifest
new file mode 100644
index 000000000000..6d2cfe846d05
--- /dev/null
+++ b/dev-python/ip-associations-python-novaclient-ext/Manifest
@@ -0,0 +1,4 @@
+DIST ip_associations_python_novaclient_ext-0.2.tar.gz 2362 SHA256 e4576c3ee149bcca7e034507ad9c698cb07dd9fa10f90056756aea0fa59bae37 SHA512 533910e50508f45dab14c4000c26b9f66311a14554df0358c3fee5bb8e22296dabfe10afd56f2d79ea6015122c4172829a2a38ae4656924563e064f180d7056a WHIRLPOOL 3df55740b535aafe23702615550a3d63f87148d7d2f2216fda727578deef4f4dbb8850975013a86608b307dffb18522876f1aa2855ca114586aa31f4ad575024
+EBUILD ip-associations-python-novaclient-ext-0.2.ebuild 675 SHA256 7e8a01e1e2291ce5120b68e0ca164cf18bbd9680d5f6987685163f9d76885d5a SHA512 c0f87e3f8413f2405cafb2291eb4de366b16e57a77008a51facac5c78814449a789fa40e73a18f2cd53774f7dfd23f591d94629fb914516235cb852ac7ffbb84 WHIRLPOOL 8bc9e29640e499da9f75cfd66400827c5e47865e553ab1f1584b5c69ba473c7222b7b8374671ad4c6d9453ac118a9760c1243f7ae4c08b296ba2f650a1c82fb2
+MISC ChangeLog 384 SHA256 7a8dcfbfa14795ae0984b24f51f86e61c6382c2e3244be0fb06e93377e1978ed SHA512 a96679317a2ed91180bdec7a8242cc2081e21fdeda1a3f2554f138771107123587ad9f7c1e3cc9bfc18afe159c82c96dedf3405367925425fc1de1d3d9c2bd91 WHIRLPOOL ff1b4e63ce3994bd463372d7919aeabd9b2f8f430a59cbf2d9fbc2d7f08f151ca83d2d007164990beefff609588370e67330f9bad62b53230b55c8ff10aec795
+MISC metadata.xml 567 SHA256 f5684ec54a7bb05da2d21d497070c1cd2270bab649e21ad123a942fb4cbeff22 SHA512 8061c87d531af77b266e34c6fc66f7ed3a5c569da23ce681398f0610eab645d69e13bfe629e5a4c3cdf89c37a63c2dc1e404e3c199e60d39bbcdb69d4ba33dbc WHIRLPOOL 5474d65fde83bb84e1a28e927a77ab4a394201862289fce42f2dc1c2018894850b4cadbe4b552fab13d0056e0b8f29619b3ff4b2f7cc4f54c508fe1da3690a14
diff --git a/dev-python/ip-associations-python-novaclient-ext/ip-associations-python-novaclient-ext-0.2.ebuild b/dev-python/ip-associations-python-novaclient-ext/ip-associations-python-novaclient-ext-0.2.ebuild
new file mode 100644
index 000000000000..4979dc8acaa0
--- /dev/null
+++ b/dev-python/ip-associations-python-novaclient-ext/ip-associations-python-novaclient-ext-0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Disk Config extension for python-novaclient"
+HOMEPAGE="https://github.com/rackspace/ip_associations_python_novaclient_ext"
+SRC_URI="mirror://pypi/${PN:0:1}/ip_associations_python_novaclient_ext/ip_associations_python_novaclient_ext-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/ip_associations_python_novaclient_ext-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/python-novaclient-2.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/ip-associations-python-novaclient-ext/metadata.xml b/dev-python/ip-associations-python-novaclient-ext/metadata.xml
new file mode 100644
index 000000000000..10c4c8adf3b0
--- /dev/null
+++ b/dev-python/ip-associations-python-novaclient-ext/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+    Adds IP association extension support to python-novaclient
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">ip_associations_python_novaclient_ext</remote-id>
+    <remote-id type="github">rackspace/ip_associations_python_novaclient_ext</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ipaddr/Manifest b/dev-python/ipaddr/Manifest
new file mode 100644
index 000000000000..747b15f80a7e
--- /dev/null
+++ b/dev-python/ipaddr/Manifest
@@ -0,0 +1,5 @@
+DIST ipaddr-2.1.11.tar.gz 29046 SHA256 1b555b8a8800134fdafe32b7d0cb52f5bdbfdd093707c3dd484c5ea59f1d98b7 SHA512 a97b0f760f0d7fac549e5edf17b644c966a8858c145b8f9472ddc8bf4805c9d537f6f8755e3716d78b729b87e84149f8b73c7f98c0deee4fbf266ccb7a206bc6 WHIRLPOOL ba34b892828098e00c78df4ecfb8b79b58a6884ca5592336a96c17bbb351f65baa9c0287acc65ed166c60ce5c9317322964dd27bfe6de33a54c3bb3b08b638cb
+EBUILD ipaddr-2.1.11-r1.ebuild 722 SHA256 8327e9c571e4a0c7ab925765559d5ade2eccc4dcfd90ffc77c3053356be73358 SHA512 7ca1ff371f7a545775b4d14c8b1c9394fb8efd55e56694514d80ed7ad8a06d18a19caaa0d3312488ac28f5cccc1ae41ffe9e52200805d613f5e4b3d371307faa WHIRLPOOL 3a76821f0fef57839245be47a0094e51e7274a09018d675ed619988dfb900a749e4d6573f4f116bc1ecf4f14d5262aa4a23f5b8ead94e219cc65ce23b9d2151f
+MISC ChangeLog 3442 SHA256 148c5bac327c73f7db271dbd89a5ad8e870e2ecb3e68319fa6388c95354ba6fc SHA512 eab70fc3c36c38251c76ffea13cf4adfc0df0db7fbf578bc79b65920c57270337020acacf4efcdacd2f97e463acae697b059771daf0bcda7ebff78933d93372c WHIRLPOOL 8b181cbb4f3dc1c4a0f0a5a15a11d262c058b5fb447f322e6822660a3e92976f867309b51a5caabce3a82611e04b4aaf31d7fec64889de73a1651c557b58376b
+MISC ChangeLog-2015 2488 SHA256 24c6c25b15032d330c15720d8046bb7a6980995558a18c7de6e326761236e8e3 SHA512 46752e7d6e63383153591482b06ce27af26edb84c40de6617c3e600a8695bec700a767b36ef6be615306449a7f74a34f30f13ba1ba8c858692f6eb7818ff77a1 WHIRLPOOL d87e2150920b24ab484a02b3f3c03a2428cf3d980070f7b3511e58f16e8033c12b70027b5e8386d8ca9a53176febf88adfd6203c74627f7ff1ac93eba17530fe
+MISC metadata.xml 490 SHA256 45e3d6354ccc7d0262c9f44bdba6d78907d67abe1d8a70651f09998313394ae2 SHA512 e1b60dcbd70386a4adc9d65c4e530c38c4477611739baa8c82812ef77373319016d1d41bfe564745b535de6ee5d2ca7665825a455a72ef4403edcb17b26447fe WHIRLPOOL c29df114a85ab2d178602a50e83a1b33d5450a3853eee20a93221bb226e6fe6ab766a012048328952beb32a733d1b24cb7863fd2b172887841dd3b754dfd67e8
diff --git a/dev-python/ipaddr/ipaddr-2.1.11-r1.ebuild b/dev-python/ipaddr/ipaddr-2.1.11-r1.ebuild
new file mode 100644
index 000000000000..8f9fd9de9788
--- /dev/null
+++ b/dev-python/ipaddr/ipaddr-2.1.11-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python IP address manipulation library"
+HOMEPAGE="https://github.com/google/ipaddr-py https://pypi.python.org/pypi/ipaddr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 x86"
+
+DOCS=( README RELEASENOTES )
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare() {
+	if python_is_python3; then
+		2to3 -n -w --no-diffs *.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	"${EPYTHON}" ipaddr_test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/ipaddr/metadata.xml b/dev-python/ipaddr/metadata.xml
new file mode 100644
index 000000000000..765b19ae0d3c
--- /dev/null
+++ b/dev-python/ipaddr/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>maksbotan@gentoo.org</email>
+    <name>Maxim Koltsov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">google/ipaddr</remote-id>
+    <remote-id type="pypi">ipaddr</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ipaddress/Manifest b/dev-python/ipaddress/Manifest
new file mode 100644
index 000000000000..981577845774
--- /dev/null
+++ b/dev-python/ipaddress/Manifest
@@ -0,0 +1,7 @@
+DIST ipaddress-1.0.14.tar.gz 30429 SHA256 226f4be44c6cb64055e23060848266f51f329813baae28b53dc50e93488b3b3e SHA512 fb33b484ca435f4e8817c735a1084f2fa749abca4643a10be644003fdb73cc9205fc28f484ef96d2db90e8b27d8a238d1d7cf20140f7942e39be12c7524e8d6f WHIRLPOOL 30e21d5b7568125575fecd0f8cac4172713c029faa81f88cd2a6111b47da1fb3bea9305a9311ce1a7b2795e9d54b58f2cbef1e5b66f355b8c91633ead0836d04
+DIST ipaddress-1.0.18.tar.gz 32475 SHA256 5d8534c8e185f2d8a1fda1ef73f2c8f4b23264e8e30063feeb9511d492a413e1 SHA512 7d1c8cf67db5b55a872783390ca214bb39e243d313311674afe10008e86638838bef5f9e6d703803bdcfde6d27520b1fc19d0adb19d482e27a327fb735aa0312 WHIRLPOOL 0cbe1230da55740e8486590a27f491c79b5c005e75c9b70b990168b600981f87e6167859ac2a4a00f21885ae6ffd86bd06a9aa8a445a7d595c2818dee8d239cc
+EBUILD ipaddress-1.0.14.ebuild 617 SHA256 9eb5bdf3dfc256a644b2f3718fae39f69fc1678c1d992a642998d549528f018d SHA512 7b21d5cd33817248dcf66651222695cd198009682bda5ed82c0013593557fa85daf7677218c58c1a635e035f4adec9ee093dfc719389f7aa6d0517156b06f08e WHIRLPOOL 4f86cefff170466e90acb80dfd74319678f722aaf612aac8396448943db2da611d16738500cbf06d9299b12caabdcad364d33c366ce13d2c8f5c1a5658340789
+EBUILD ipaddress-1.0.18.ebuild 644 SHA256 99b24009ee838d70b356357836440e2df35ab21a4e5188dad8a3c6fff36fc20b SHA512 a5dc9e635ca2cfc9a860460297fd1fa6b8761143825512fddb219fb0f349a21cf2cf3c46133a89340e0226bf0e3da0dd3191b06602dd3822a706dd701364acdd WHIRLPOOL 86a4927050a9c28291a0c44e73727c036329aef521ad72c07484e156ae3de9159a0400532b53f4816b433da6585e84b635b1b3d7e9cf3e9276dc6613730a4679
+MISC ChangeLog 6339 SHA256 67fde03b9a5a5d80a12fbca08e906073eb1624c0dcc432c28e8b99b907613775 SHA512 919239099c730696c1e714256b41a83486acc8cd5e036f8949aecb08518beec20390f9bf734d8f5d4e3ae7515f42d12dcbcc3d56cc751b54006cfe1271148984 WHIRLPOOL d67286edab31a83782d6617f8d72c96769ec5f63efbcae63162be586729dc3c7009b8f709d01524106b84985299706bd0048cf316a22200d863c9e88fee49700
+MISC ChangeLog-2015 1279 SHA256 f7b05a20439a05bcf3b654f419f36159146b0b35da6b41982b026ca1eebedb1e SHA512 060cf0c5eed68069f12fb9b8bca5f224e9f618b1ed7b585612a7a67e2b60240d4379da53fd7419b12e0c472e5a3b84ae1e509c8ac548d12507adea607790b924 WHIRLPOOL c2733d1995ca39b4857408f3bc901109eac0a5e378732bbe946a4b997ef8ccffd9303ded64e71ac879d9c4d1c183cbf54c962744f0b2dbd7b461846af5c55c7f
+MISC metadata.xml 501 SHA256 bb7de6c9eadff65252991c59a6c2792e861223ac19edce22a8d78a331ea29055 SHA512 e3b1bcf46848fc0b6faf58d4b9df44df0d0dfb6649a6c7f3806d1ca148528ddccefb4323ebdb046ff4469c07f081a0ff0ef32d767b37d6539b77c356371ffd12 WHIRLPOOL 83dbc9a137264413473c403ab4d626a709899ac4224c9c5d29345af6d992b561bd229fa2e388b41349a3a8078ac547089dd2f47cf1c1f0fa993a8f76452b6a86
diff --git a/dev-python/ipaddress/ipaddress-1.0.14.ebuild b/dev-python/ipaddress/ipaddress-1.0.14.ebuild
new file mode 100644
index 000000000000..60fcc9bea0e2
--- /dev/null
+++ b/dev-python/ipaddress/ipaddress-1.0.14.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="IPv4/IPv6 manipulation library, backport of the ipaddress module"
+HOMEPAGE="https://github.com/phihag/ipaddress"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" test_ipaddress.py || die
+}
diff --git a/dev-python/ipaddress/ipaddress-1.0.18.ebuild b/dev-python/ipaddress/ipaddress-1.0.18.ebuild
new file mode 100644
index 000000000000..e6fae2e318bb
--- /dev/null
+++ b/dev-python/ipaddress/ipaddress-1.0.18.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="IPv4/IPv6 manipulation library, backport of the ipaddress module"
+HOMEPAGE="https://github.com/phihag/ipaddress"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" test_ipaddress.py || die
+}
diff --git a/dev-python/ipaddress/metadata.xml b/dev-python/ipaddress/metadata.xml
new file mode 100644
index 000000000000..d0feb299d87f
--- /dev/null
+++ b/dev-python/ipaddress/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">ipaddress</remote-id>
+    <remote-id type="github">phihag/ipaddress</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ipcalc/Manifest b/dev-python/ipcalc/Manifest
new file mode 100644
index 000000000000..40dac012c9ec
--- /dev/null
+++ b/dev-python/ipcalc/Manifest
@@ -0,0 +1,5 @@
+DIST ipcalc-1.1.3.tar.gz 8099 SHA256 3bfc52cafaa39e9c4e8478a38b21b2d62b2145d3d21a1722f1340e897656ac34 SHA512 f852e93bfa4994e424a8aafc74a1e8ec9488d4c60085fbc53e0587abcf8fbfdc7a35d7a20e67cd4dbe0d8484c0e7bfb11b5fe3d6934f322dd818273e3d64c2c6 WHIRLPOOL 9c4dfd021346059baac0e4bedaaf74d49a0e11d390ad5bb46d1f293e7d98923dec567a94d74a505f501d16d1db3369296c8992b57b8019cf5ea1bde8cd16abe2
+EBUILD ipcalc-1.1.3.ebuild 351 SHA256 584fe107ede7de302dde969c5adabb9769c8298107955f3f2f80cdf7923a8ed6 SHA512 f7140fc7ff0c95834e2c5182e64bc206e63c1cfcd87a45bc39ef88afa54f82117b25bd3fc6571b1400672b79afdecf8ec196f7206a23e58e005fc721d3c58f5e WHIRLPOOL 9f65cc83f1352baf2be65c4b9501b32d2cac02ea622613c9040a87b8321ce7c4481466a5d1c037be1980bd9b387a1d988729c9c45f19744475d337d28167a0bb
+MISC ChangeLog 2958 SHA256 ad0f784daf30bcc9a10ccc366f73b03d519480b9b18410089bcfda6befc51d8c SHA512 3c58da97d117e128d756e349f16d1e4dafe362f75a936c3554d7a60581489fcd084aa59e6cdb9ef40d1cd3383faccc1f8416c693b8798ac605ee7ff6bfba964e WHIRLPOOL b39e0e1a938cc0648e2cfb78264710fbcc767c1a54acdc8f7bd0aa0bd03d385fbca1d8889d83b817b549152614b471720f03a9a1cd08fc235b1f9c34657af104
+MISC ChangeLog-2015 1065 SHA256 bccf41c5b0e6b07a26a158ebc8fb1f952962fa7b35eaa496b706534e2db7bc75 SHA512 9d4dc9489ce1fec0225296c4bcdd347e2aa5ae53434184dc46bcb845ec4fb3e134e9c335647a7fb884d480e0ff90efcf46db75259994229da6ee167bf003b7c4 WHIRLPOOL 9dd00a58105d52cc5fb299430b308b2675057098ec28f120c193ae5c07b006999ad721acfa8e32221ae6fe910075ab57da2b65480639c4062ba4bd6440a9f444
+MISC metadata.xml 416 SHA256 47a3818b311f411577cf518c04a10194ecb3307989bbb2520b269eed82dee3f5 SHA512 49a0dad8d0375cb9bd239b0c6939e78b452b3be2b5d51550c3d217b21366f65baa4f6a3842914293076744bc276f0fd2708c5fec3040186089c912fdfd9393b4 WHIRLPOOL 28c67e6c53a919369d0b382a6fec799e497d001fcd4af617821d4fff3b9235616c3e4431489209565ae254f67b2ba3e8c9b29dc7f5e688f55b3e65a3f43ccf5f
diff --git a/dev-python/ipcalc/ipcalc-1.1.3.ebuild b/dev-python/ipcalc/ipcalc-1.1.3.ebuild
new file mode 100644
index 000000000000..f89b7750f41f
--- /dev/null
+++ b/dev-python/ipcalc/ipcalc-1.1.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="IP subnet calculator"
+HOMEPAGE="https://pypi.python.org/pypi/ipcalc/"
+SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+IUSE=""
diff --git a/dev-python/ipcalc/metadata.xml b/dev-python/ipcalc/metadata.xml
new file mode 100644
index 000000000000..fe44936ddc63
--- /dev/null
+++ b/dev-python/ipcalc/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ercpe@gentoo.org</email>
+		<name>Johann Schmitz</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ipcalc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ipdb/Manifest b/dev-python/ipdb/Manifest
new file mode 100644
index 000000000000..2d9125aef14c
--- /dev/null
+++ b/dev-python/ipdb/Manifest
@@ -0,0 +1,9 @@
+DIST ipdb-0.10.1.tar.gz 8595 SHA256 bb2948e726dbfb2687f4a582088b3f170b2556ba8e54ae1231c783c97e99ec87 SHA512 81dcc80651f7aab54287c2b6b7a4d7af1afa6962382dbf0dfa4d436fa0002522bb3c87c82133fd2d9cbb83a4e471b611afb6f7e7c6bd6db8b0685d94d651bce2 WHIRLPOOL 3c11655ad445c0c4f985b110ecbcfe75cda84ceb2fb3aa7a4133467bae7171181a451a45c24f061f89bd41340618a4bef41e583a98160503228cd877dba760b8
+DIST ipdb-0.10.2.tar.gz 8827 SHA256 fffc45b615e46eb75becbd88a30c69c75e7164ecd0122f2c78579b4dfa41b8c9 SHA512 5bae921cf7eb8beefd26a0b3ed0969b3435d86bbff7289dd874d0a011c63c36c50683a2a15191c3d6f5ddc1d41d4ae812bbdd831c972cfbbc54258085765acbd WHIRLPOOL a0a19a56afcbe12c0910dd0b58e234b757717848b5b1f9bb6368c2620aa5e03833530959701816924fb86f90b64f6da1162c5d964f838f5b87255158ef5506a8
+DIST ipdb-0.10.3.tar.gz 9356 SHA256 9ea256b4280fbe12840fb9dfc3ce498c6c6de03352eca293e4400b0dfbed2b28 SHA512 5f704222ea4d6877bbf6a83cb528e0e975ceebd7ee0838cd7a01f167381b80c48d3c8fc06d13a718a08ec619bfe984fd258e86ce93dba571ebdec2539db543f3 WHIRLPOOL d627ca29f75a2779ff1923e88dd8b558948781e6df52b727df085fc2c6868ef481a2f77afc5d464c12339d464c79249ba806a17337ede214f9a4df3344ed41e6
+EBUILD ipdb-0.10.1.ebuild 651 SHA256 6ed3a36af4c605f356e3f357d9e6f96f2c722eb88221bb11e06556459d42042d SHA512 a32c3f0f1f5c332da3526f28c6a09798d30b04628ec937e914a48a5d695212c9d9a77d185db4dde7d3247af7ffe1029264f819e07774e3773f7543c04ba77bb4 WHIRLPOOL 9cf32df2f700c4615e3aebd1343cc6077fbf1bcc8c6b326f605f6b64fe01555928fd9d9d081919bf2a7162df38181f97dc48c90b1b92b6b97d350086df4725a9
+EBUILD ipdb-0.10.2.ebuild 673 SHA256 a093565589e9283a9c1194fa5473e7bdadde24ea7c8dff7eab41582ca79d3ea2 SHA512 b75d622cb243649d7657aa0beb918e73045d5f223b744c2faa79f37706db67b62e4822257efaf6181f57e41ff09a8657382d09c2c70fe9b7a31734ee9539de90 WHIRLPOOL f97f2e335bed2beedcadcfcb6bfc6c2376aa10539aa6d41a66450fe816b7b934ea781125cff261e2578df76dcedc9498c669c8b1b8cdff3856f6e40de49dd831
+EBUILD ipdb-0.10.3.ebuild 674 SHA256 57afdd11fa8c0b9cb72edeb2f11ec1d663605cc278b517237f1035bea248e211 SHA512 84ce629266f18cf3ce56098dac7f86ffff6d5732769d58d8346dfee3df5073371cea889978dea6c7a8040d477ed12a7e530001543140ed4d9042a92c9ae0d7b7 WHIRLPOOL 221f152556b105e0e908aa981ca3ef98b35b6e34f2b2ee27de8cb85d96aab27c7df7005f65013ac812cd6893f71729dfe31e40c55b1efc79128a1938488e1838
+MISC ChangeLog 3548 SHA256 4304de7e9252593b4bd71673909bafd77477666ecd8c8518e82307d02b3e32e6 SHA512 849f2bfed0f5f30ab6eb913df25845419182741b6647148c248e204c30f333583451d337b47fc502345b3f758602cfb54666e596b27c7180db189e67fe816034 WHIRLPOOL 6f5a7c7a1ecdde535ff0209a7159a3ae93a6147a9f8dd1fc95d301a9577a5707a03e2c754fcaa0a4d9156f0b021901630db55fcc815609929eb07b0965bc353a
+MISC ChangeLog-2015 2223 SHA256 17bed9d1f69aff52845a00336b5848ed9ee72cbd040c49215637d83cce32a1b2 SHA512 e1768b1fae0d854192fcc08b65d3bd218d6c8c339740091c6f5b8f900938afd21c9e3ccf66b14a48b2ca2e45f12bc7f1fa071a44c8efb97c152cb3aa17ca835b WHIRLPOOL fc3ca0a51ffc482a198adba8b394ed11dc11753bacd3e132fc3ef8ead85e87a08caa6e5b8bd20eee44814d7e6325806ec8b8530132f23486f9320456a2fbc33a
+MISC metadata.xml 307 SHA256 2ac7f841a64d98ddfd614c3f8565e0b385df43ef76e45615277ec2b59c66e228 SHA512 debb6af292a4b01925b248df604776ec21fafc3d3dca20373399a1481061392aa8e5313b07b586af6a9c2f429474d2b07fc1115e9c337c19fe0c38c489e774c9 WHIRLPOOL 2fe2ea88fb37b65fc745df23cfd64116440a5192a24d02e8b6916acb021aa9253b8cbb59d5cc54f4f89e1ec89fefc5b21cca6643e00c489e1a98f0cb4add573e
diff --git a/dev-python/ipdb/ipdb-0.10.1.ebuild b/dev-python/ipdb/ipdb-0.10.1.ebuild
new file mode 100644
index 000000000000..be794f5033ce
--- /dev/null
+++ b/dev-python/ipdb/ipdb-0.10.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="IPython-enabled pdb"
+HOMEPAGE="https://pypi.python.org/pypi/ipdb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' python2_7)
+	"
+
+DOCS=( HISTORY.txt )
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/ipdb/ipdb-0.10.2.ebuild b/dev-python/ipdb/ipdb-0.10.2.ebuild
new file mode 100644
index 000000000000..dfa3021163fc
--- /dev/null
+++ b/dev-python/ipdb/ipdb-0.10.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="IPython-enabled pdb"
+HOMEPAGE="https://pypi.python.org/pypi/ipdb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' python2_7)
+	"
+
+DOCS=( HISTORY.txt )
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/ipdb/ipdb-0.10.3.ebuild b/dev-python/ipdb/ipdb-0.10.3.ebuild
new file mode 100644
index 000000000000..c71a75ece88d
--- /dev/null
+++ b/dev-python/ipdb/ipdb-0.10.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="IPython-enabled pdb"
+HOMEPAGE="https://pypi.python.org/pypi/ipdb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' python2_7)
+	"
+
+DOCS=( HISTORY.txt )
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/ipdb/metadata.xml b/dev-python/ipdb/metadata.xml
new file mode 100644
index 000000000000..bb5e395b913d
--- /dev/null
+++ b/dev-python/ipdb/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ipdb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ipdbplugin/Manifest b/dev-python/ipdbplugin/Manifest
new file mode 100644
index 000000000000..2015fd4d84f3
--- /dev/null
+++ b/dev-python/ipdbplugin/Manifest
@@ -0,0 +1,6 @@
+DIST ipdbplugin-1.4.tar.gz 2473 SHA256 4778d78b5d0af1a2a6d341aed9e72eb73b1df6b179e145b4845d3a209137029c SHA512 5831d1e9aceb2fe4db272975d4d792622822049813ba76bdc0ee48dee001339084efddf534882775922ec178c1bcd52954bc2df1ce42181cbfdd1c3c4b944365 WHIRLPOOL ebf61a52db5be766a8407a85d8af04667a0818b5e084f762759cc535df8611ff363017961278a8da1bbeaafdb1b5630bbff1ba83475b89cf7f1add683748a79d
+EBUILD ipdbplugin-1.4.ebuild 690 SHA256 baa93f492554342f7317c504500f57886a70e419553619359035aa33dfb26cf7 SHA512 e86522e67bb79235fc8f284c1d67d4667ae277bc8e81a98b3b9a8e238e9df755b76b2a9c0ff62079a11c4d05fae2f2d77aec65e84454f86fcec4494fdc302fa0 WHIRLPOOL ce383480624a1d7ffd8cc90abdd2d3b072f90e085bfb7bcb59a5aee7fb371af27323acad5e035c02b5ff4c61e6688d1ae41ba5704604661322b9c614d36ee802
+EBUILD ipdbplugin-9999.ebuild 690 SHA256 baa93f492554342f7317c504500f57886a70e419553619359035aa33dfb26cf7 SHA512 e86522e67bb79235fc8f284c1d67d4667ae277bc8e81a98b3b9a8e238e9df755b76b2a9c0ff62079a11c4d05fae2f2d77aec65e84454f86fcec4494fdc302fa0 WHIRLPOOL ce383480624a1d7ffd8cc90abdd2d3b072f90e085bfb7bcb59a5aee7fb371af27323acad5e035c02b5ff4c61e6688d1ae41ba5704604661322b9c614d36ee802
+MISC ChangeLog 2394 SHA256 0ee265cf196c20ad5315a83f66708c1e388e26af94434c2ff55ea437a3499d87 SHA512 842daf83b555a55c620dea95da3f7f43f595f54e0e4a45e5c96852f06fb9cb9049e8904f423a09354f800fb3aceb6a15085dc24356bd560d410e4c4e48b8d206 WHIRLPOOL 603ffc3ccd05fd39ecb311f52177f4d6b32119e9a29be642ff18bd536616ba6099a1142e12892b1585d894b57a54fa358e3c30ad1c169b10e934f7e73854c8ed
+MISC ChangeLog-2015 766 SHA256 29d49b7986daa2c67bc254cf07f6501f52928bce70e3a7a748079559e862b43f SHA512 45d843157ed097d9e53f193a7f788b096e4999abcec350e648c09bc71b663d48ab6f1f0fb1bd2c4dd7045b531b697206162fb2fd37bdfde7059deaef2ee7e551 WHIRLPOOL 55e608e535b41b6ae239fdea973b77cd6a95349bbfb4c335ed1d79e154f90a825fac07d8168bdd8a60a9ce2501f280e3e9d109ecc24a70312166938e0aedd360
+MISC metadata.xml 296 SHA256 382ebd4e36d7474dc339c2a71b5949f6e9388b58233bb89a44984f7c81c09a18 SHA512 c64bf334a8ee1242a8f26e916d2d1458b57aabe24890c1e79e2b7fef812a2a2f2ece2ec3d5795ce3838b9a0f27c16a2fa01aa36b12e7c8e69dc1ba2d9e409929 WHIRLPOOL e37dfeaeb6d6be776bfdf5e1f242d5814d3ad29b7b7f38efb5b07500c9a9a840bd63256f4dca0999eaf3152d63f0069c721317647f001da2105912c9c0c50aec
diff --git a/dev-python/ipdbplugin/ipdbplugin-1.4.ebuild b/dev-python/ipdbplugin/ipdbplugin-1.4.ebuild
new file mode 100644
index 000000000000..ecddbd26416e
--- /dev/null
+++ b/dev-python/ipdbplugin/ipdbplugin-1.4.ebuild
@@ -0,0 +1,29 @@
+# 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
+
+DESCRIPTION="Nose plugin to use iPdb instead of Pdb when tests fail"
+HOMEPAGE="https://pypi.python.org/pypi/ipdbplugin"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/flavioamieiro/nose-ipdb.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/ipdb
+	dev-python/nose"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ipdbplugin/ipdbplugin-9999.ebuild b/dev-python/ipdbplugin/ipdbplugin-9999.ebuild
new file mode 100644
index 000000000000..ecddbd26416e
--- /dev/null
+++ b/dev-python/ipdbplugin/ipdbplugin-9999.ebuild
@@ -0,0 +1,29 @@
+# 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
+
+DESCRIPTION="Nose plugin to use iPdb instead of Pdb when tests fail"
+HOMEPAGE="https://pypi.python.org/pypi/ipdbplugin"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/flavioamieiro/nose-ipdb.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/ipdb
+	dev-python/nose"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ipdbplugin/metadata.xml b/dev-python/ipdbplugin/metadata.xml
new file mode 100644
index 000000000000..50b1d3e8f984
--- /dev/null
+++ b/dev-python/ipdbplugin/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">ipdbplugin</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ipy/Manifest b/dev-python/ipy/Manifest
new file mode 100644
index 000000000000..7e13fc941962
--- /dev/null
+++ b/dev-python/ipy/Manifest
@@ -0,0 +1,5 @@
+DIST IPy-0.83.tar.gz 31816 SHA256 61da5a532b159b387176f6eabf11946e7458b6df8fb8b91ff1d345ca7a6edab8 SHA512 6bd69d96fa77dc4ceaf119b81c19a524b871badb37665a763a055e1c8b2ce3433c6e9534f03aa64d02e559dca2fac2c4e1d09b7fd78ed79c0fded88f803ad2de WHIRLPOOL 0f58ea88a437293ca2d89aa41c76db49cdfee4b52fe6fbae1e8dce297b59bf1309d79612283ac7691b17ddf1c7596b19a3b39c6ce157946ea8274166e1da9d9b
+EBUILD ipy-0.83.ebuild 1083 SHA256 722f8fed380176955a2aff1282f289de9776945bb57eaadb4db9f3451f5ea762 SHA512 56440ffa6b998fa9f082431f40fe9974f71728b7a11528cb50d6a5929c3c810d5b5af6755c9ee92684bbf02934f7d4dfd6c27835f346d689782baaefc9407ade WHIRLPOOL 9a8d783593dd8f8c61603dfd819cbdca41191af115d9e469affd0874dc0acb08c2c5d023334de2d5e995a456bda78fcc8bcfeeb2b5f14aaeccfa0411672dbb2c
+MISC ChangeLog 2987 SHA256 a380a444deca5d9fb514789cfc11f0df2e2c80c0de34cacff5d7c86d58b16e3c SHA512 aeaa68ec712aa5972ebdf8a7632892fe357583bd528fdf9f67ae640e21bfcc5f09cf676eed6bcb02ad485a07bbe5498db5968026ff63bde56bff363182cf780d WHIRLPOOL 8f96da1b128be303f2e0862c8bd94b5eef9397e577e5a707bf198fb7513f0f3c7f1c25937393c34245548f04d49efc4830c4237ecf259cb4ebbdf158b5d65c68
+MISC ChangeLog-2015 6380 SHA256 c2def855c3a5eab4d3ab938c63e5638d9e73f487f65b98f233f27f4c0a1d1891 SHA512 6839bad30a54a25f968f41da931796c1949dede4348ae38c5a3139af7e6fa2c717c09bad33a8110a4f5ac41e4ecdd51623be16c02140d37188a6ed71c2c0cd33 WHIRLPOOL 7aa72b99592ffae8db212208c23e8344ce6eb7e7732cf89626bc005a162073d0d080dd0adfa24ddffc521752aa7156c6defd606bd077a30981a60b7a810d1e03
+MISC metadata.xml 374 SHA256 1d2014e5db478b61f1d39065f34995b2afffcd666411c4155a7e93df9d01dc4f SHA512 8c12c38a49ffef811e6107d003f44cd8174bc95fc71dcc3296511e3356a0203cf12479a36c7d649f1933c6a90820c3212de25166b61eac8de06728cb8cb25566 WHIRLPOOL 0fab009b4aa7b3bc59ad25a4b1805d60db5206977f51f68847ce57c422647f42fecb9778f28c7818edc1f62d674c0fbc50954a64fc29e3cf2bbcfe6b733d19c9
diff --git a/dev-python/ipy/ipy-0.83.ebuild b/dev-python/ipy/ipy-0.83.ebuild
new file mode 100644
index 000000000000..300b8df59cb9
--- /dev/null
+++ b/dev-python/ipy/ipy-0.83.ebuild
@@ -0,0 +1,39 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+MY_PN="IPy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Class and tools for handling of IPv4 and IPv6 addresses and networks"
+HOMEPAGE="https://github.com/haypo/python-ipy/wiki https://pypi.python.org/pypi/IPy"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	# 1 test fail under pypy, persistent from 0.82a, not a regression.
+	cp -r test_doc.py README test "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"${PYTHON}" test/test_IPy.py || die "Tests fail with ${EPYTHON}"
+	"${PYTHON}" test_doc.py || die "Doctests fail with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( example/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ipy/metadata.xml b/dev-python/ipy/metadata.xml
new file mode 100644
index 000000000000..13405b9629d2
--- /dev/null
+++ b/dev-python/ipy/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">IPy</remote-id>
+    <remote-id type="github">haypo/python-ipy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
new file mode 100644
index 000000000000..a2bcc2b20727
--- /dev/null
+++ b/dev-python/ipykernel/Manifest
@@ -0,0 +1,12 @@
+DIST ipykernel-4.2.2.tar.gz 80780 SHA256 a876da43e01acec2c305abdd8e6aa55f052bab1196171ccf1cb9a6aa230298b0 SHA512 8b7853b5f2602377d696f2c82cc5b2dd4cf2c0b1fb907b3a76aaad034d3f97ace374db86e30b33c83ccaad5ea9ae42229349610789f844ca5b67d9b806df9b4c WHIRLPOOL c15a46abb3adbd9b2fd855de3d060151d7392a06a43aff301c4f854a9daeb0463526f57883f37c02f1efbe4812ff9baca1fccc713ad19e7bd086739f4377dda8
+DIST ipykernel-4.3.1.tar.gz 83268 SHA256 8219d3eaa3e4d4efc5f349114e41a40f0986c91a960846bb81d5da817fb7cc3f SHA512 0dfa24e75a0cc901b9d522cef60d658c4ac77be3d9372a71c7b3ef7869579fee1201bfb688f90e6a50f04e0ea84f7406c4b1d114311660107ec612ad16a4057b WHIRLPOOL bcf39e21d1de208ef2ef38c22edbcac16c152984bb4e94c878003eb45002166b2b7051f81f616b15a9cded4434c76119b12d1b80a65359f2224368452d494db9
+DIST ipykernel-4.4.1.tar.gz 87373 SHA256 6d48398b3112efb733b254edede4b7f3262c28bd19f665b64ef1acf6ec5cd74f SHA512 739eb21deadf678bb4826832905039c353714e7ef5dfdffeca6f43873b4834662741a4a9a8500f5fb83fbd0a580ec0b7a2ebe4519a3d36b521f11a7b5d1e61d6 WHIRLPOOL bed33142e5282b95dcad355ab580bfecf26889f70f0a4ffca0d69cd6779a32e6fd25bb0c8aa3562a415ebddc50af2c0a9d54f6e5403976f142459a865302b25b
+DIST ipykernel-4.5.2.tar.gz 88282 SHA256 5a54f25f0e6c8ee74c362c23f9a95e10e74c6b7f5ef42059c861ff6f26d89462 SHA512 98552dec167b43eff3f57c3ce77d2a3f9ec0993a4df4d70f363a3c8bce0355d79c847aa9974e87926709018f616bd9f044f646b96822843abce6dbe0e48f69c0 WHIRLPOOL c410eb132c4c2cd68df271d7cdcd2b8f6355cac4eef0719549c0ca49f1bea82e0adb36b05a04c904cd6339914c2356dd0c9f90fd70fc35fe31fc2e775d57dcd6
+DIST ipykernel-4.6.1.tar.gz 90591 SHA256 2e1825aca4e2585b5adb7953ea16e53f53a62159ed49952a564b1e23507205db SHA512 3124534a8a059056211ac573784c491ba18d6e936292523382a9604af10bc2c911b14f49f7625242e29189b46c673da25244f3c9dfa3148d460ba4e466eef001 WHIRLPOOL b1ea3e7cc42a41ce4c6b3a69e2e1bd7c1ad0fe63efdcffc817d8a72ce746cbe5281ec7a8e915673bb7c8e6f1bee639e4e12e73336bc236d7d6f96cf8b97b3162
+EBUILD ipykernel-4.2.2.ebuild 713 SHA256 895b05d780c035d2768270ce53097d41482b49c3a3b8c689c486abec489fdb6c SHA512 dc917e5b872999e3707b1880411b7eec2b9dba4cecf053b61e8085739952b10cb560be2d82edc8f9728ed6fdfa3d0364fffabb3aa3226459e58c8910e85866de WHIRLPOOL a9ea919455d2a28d36fa36d10a848d801071d1d506bbfb806e9c8a55aa3d5b24e789234708ad1122c8ac40f96d4b5cccd67a4632b05244a88ca79b4171e652d6
+EBUILD ipykernel-4.3.1.ebuild 810 SHA256 c04c3bfb7ac0f9fa752f75ce799f382f911244f33817827cf0eeef91fda3b86b SHA512 c7a0dda9e93bd50980d7a0a5d3e89d42992888cebf58473d857623c839519e56427e5cafcc9e66a033dedf0b6f05a5bd5ebdbe959b2167d4ec7491930e5f4573 WHIRLPOOL b661dbe2dd29ba0751a7d985f5a5719b4da0d6993502af7091af4035decd8625dcaf8636d4c4f4b7ee840352d1e37b59dd1bad254578a1503a63bd8dbcd67be1
+EBUILD ipykernel-4.4.1.ebuild 884 SHA256 e2920b0c24f1b2be24ec7c7bd602317edc354572fd78e012fbde96be26a30e90 SHA512 049875f47bcc47f11a33cc00d63626abdbc45bb6da1681e775d6c396ecd9fd9176ebedc59c3fdb8b3daa7e8673711f25a2b503ad92f96d626a864bcc9d6a686b WHIRLPOOL 6f4570aec2dc2c1ece9cafd04b2b4ecfaea9eed87673684aa615ff317fc3229b23b8c1fc9453134a088fc8994068e1a239251fec2a1d029aa30c21abda83e110
+EBUILD ipykernel-4.5.2.ebuild 873 SHA256 be4d0f0792dae63b651fc4f97c05c94510d22a04a44eaef8f431f0f6d23cab9d SHA512 be53ac9c1b101e3cdea75b41bf2301599adcbfa4973383c6cbc182a24ae2db8e75ea55a15c3b6b926cc340b3c14e70113940d8749f4c0a7cdff299e9b9ec76cf WHIRLPOOL 33acd4c079c870b5190436cdca9cdbce42e9ae1d96b029d28d2ada651052b8adb147538ddf9d5d06d6362a0c31f6cb61d0f90690c0159837549df19893bd1b47
+EBUILD ipykernel-4.6.1-r2.ebuild 1130 SHA256 b18ffd591464660a3d0accece15f172d82e1e5676449bacc19ad845f1a520b2b SHA512 1b301061e36f5d07dc7f11ac74a6f02f9c46deb9af1a86aa91e4191ce01a2adda460c8bb1eaf22cd48798d356bd7bba0336359fa7aa75cb53668ee28b02a0908 WHIRLPOOL b63ace97220fa5c110437d01f9717f697e04694daddd14147862f9f0b1aa1130f251e29c9f8ffa313ea364b189cf6cca997e4aff7a43ff6aaef2cdcc7f94804a
+MISC ChangeLog 2829 SHA256 a3dbe9abc1c2ee1d44b4035c01128956ea3c5ddddc19acd62a6eb5e5e6bc31c2 SHA512 63252aa0f89de232ab5cd59dcaa6a73468803157d1e75cf677c6cd809982133e453cd8abd3ade7bc3146bea42f91b5ba982adafd10ed9297719a42cf73cbf434 WHIRLPOOL 10a6d35ec5d51e63638f0824d74f78a3370e54c57f81040fa5dc727ca9cd8d539e523f28e5455df1a7726688eaca14fff003afbcb16dda5684fcc4a46d335c7e
+MISC metadata.xml 493 SHA256 93ddad2ef7dc9e78cd0d26749610605ac613fd779986dedbe8bf69a1506f6bf2 SHA512 f4176cf4bf94b2a2859ed74298ad8d1b7beb310d9a00f499c32528beb46014aebe7705d47f01bfcc6273729271360a404aa7cd03e046918418d80b8b6bb4f269 WHIRLPOOL e69bca0c6d03fca830e16ee07e8afa0c6dd7c95b9457ce97527cbd4203abc7417ca15fb55363cd8320c2bdac015ef29ea6f1f9023ccf0d74c5bb9ddbdccce512
diff --git a/dev-python/ipykernel/ipykernel-4.2.2.ebuild b/dev-python/ipykernel/ipykernel-4.2.2.ebuild
new file mode 100644
index 000000000000..f92f84765ba6
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-4.2.2.ebuild
@@ -0,0 +1,32 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/traitlets[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+	"
+
+python_test() {
+	nosetests --verbose ipykernel || die
+}
diff --git a/dev-python/ipykernel/ipykernel-4.3.1.ebuild b/dev-python/ipykernel/ipykernel-4.3.1.ebuild
new file mode 100644
index 000000000000..608aee74cc65
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-4.3.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+	"
+
+python_test() {
+	nosetests --verbose ipykernel || die
+}
diff --git a/dev-python/ipykernel/ipykernel-4.4.1.ebuild b/dev-python/ipykernel/ipykernel-4.4.1.ebuild
new file mode 100644
index 000000000000..1e126fb6cc6c
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-4.4.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+	"
+
+# nose_warnings_filters not available in portage
+RESTRICT="test"
+
+python_test() {
+	nosetests --verbose ipykernel || die
+}
diff --git a/dev-python/ipykernel/ipykernel-4.5.2.ebuild b/dev-python/ipykernel/ipykernel-4.5.2.ebuild
new file mode 100644
index 000000000000..83d385129770
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-4.5.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+	)
+	"
+
+python_test() {
+	nosetests --verbose ipykernel || die
+}
diff --git a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
new file mode 100644
index 000000000000..01461f099319
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+	)
+"
+
+python_install() {
+	distutils-r1_python_install
+
+	# bug 628222, specify python 2 or 3.
+	sed -e "s:python:${EPYTHON}:" \
+		-i "${ED}"usr/share/jupyter/kernels/${EPYTHON%.*}/kernel.json || die
+}
+
+python_test() {
+	nosetests --verbose ipykernel || die
+}
diff --git a/dev-python/ipykernel/metadata.xml b/dev-python/ipykernel/metadata.xml
new file mode 100644
index 000000000000..973783bf3b19
--- /dev/null
+++ b/dev-python/ipykernel/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    This package provides the IPython kernel for Jupyter.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">ipykernel</remote-id>
+    <remote-id type="github">ipython/ipykernel</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ipynb/Manifest b/dev-python/ipynb/Manifest
new file mode 100644
index 000000000000..cdf68472d2ba
--- /dev/null
+++ b/dev-python/ipynb/Manifest
@@ -0,0 +1,3 @@
+DIST ipynb-0.5.tar.gz 50633 SHA256 b7d5d462c1c1738befbc471f5032d2f8e2991adeb81df2f4def27c00dbff2fe5 SHA512 6723551aedf8cbcf65c72629c39858c358aee634c38ce7fac9ffec79db2e80a1775b60a5234dbcfaa0202e7b2ea633ba6cdd5d823f6460e736bc58b8616ae54c WHIRLPOOL b836dc128e2a2a6822b6d22667ef822896a74f17f5006183fff16705d2db82a2fd78362ed6886529c2ca9a3fe10d5773894483415f95158eeba454396dad87a3
+EBUILD ipynb-0.5.ebuild 421 SHA256 a9aefe1d5b644160acf861204d7ccd39b5c965091a36e62812b2e89624ef1ac3 SHA512 7c987909fac51ce8e2a13bea04615a6fe70984aec19ae3f12b8e06ff3ff1b85715e94ecf82deac09dce2dae892e73cb34a6ee57f506d57bc393c8b3bd2bb32b4 WHIRLPOOL c1e2efd40d6818199fa053942a9147dcb5d1ceda3eeebc7149ebf9515aa8ad5f43c81929f09dfac560278d67fe1cf7ccd0c51dfe1f6691fb99cf77374ac87368
+MISC metadata.xml 667 SHA256 2f1a48d5b6c283d7d6c3ff73a9f33539114d7caf7e3690633e32ac41387ea849 SHA512 d248835afd2ab8ae67ef01fbf340ad06739c962efe9efa2a64565d7e189422d8b435514ceadd848ed4d70cc086b14f4b7ec0ea5c0e5cd0da306fca7e924bcf12 WHIRLPOOL 7c7344fe38a0f7119427a2092db08cdebf171fe447097ce0baa654ec791d30dedddaddca1266c981cf335094bc85632a234d2788f9e3ec5c038f67d869836a66
diff --git a/dev-python/ipynb/ipynb-0.5.ebuild b/dev-python/ipynb/ipynb-0.5.ebuild
new file mode 100644
index 000000000000..e995d8d88f5c
--- /dev/null
+++ b/dev-python/ipynb/ipynb-0.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Package/Module importer for importing code from Jupyter Notebook files"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="https://github.com/ipython/ipynb/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/ipynb/metadata.xml b/dev-python/ipynb/metadata.xml
new file mode 100644
index 000000000000..580977109cb1
--- /dev/null
+++ b/dev-python/ipynb/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marbre@linux.sungazer.de</email>
+		<name>Marius Brehler</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription>A python package providing an easy way to explicitly import Jupyter Notebooks files (.ipynb) the same way you would import regular .py files.</longdescription>
+	<upstream>
+		<remote-id type="pypi">ipynb</remote-id>
+		<remote-id type="github">ipython/ipynb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
new file mode 100644
index 000000000000..c366b2604768
--- /dev/null
+++ b/dev-python/ipyparallel/Manifest
@@ -0,0 +1,13 @@
+DIST ipyparallel-4.1.0.tar.gz 2271608 SHA256 c943f6b3bbabb9332336d15474969e2a7a73d5b583f9786f7b357c75e4b1709a SHA512 19fff1ea57d9fcaec6525ce6e0c72ab63ab1245e32e485174a0691d2b48d8d2512af4055b77df82c7b30a8c071e1b6c5900d37e992f82f1597492e220e83d36f WHIRLPOOL ead35bc2166af0b221e730550689b09b7bf04148abcd754039f1c511acaa182ba50b593372f3e8bc627ae40a6117f9209cac476c1905bdc780f53de10666ffe1
+DIST ipyparallel-5.0.1.tar.gz 2350472 SHA256 48e319c16995a697c82e72dc4e5cb977be45cb0f0cdcfc482d5e8019ea6afeb2 SHA512 b7fa4f2ec5375398a533c92f07e2ab09180e537366c36ff5a7f3245d63072006ebcffc19dda28d08d5cc2e8a9044bf9101c7eeccf2857ed4a78ddd859ce23a2c WHIRLPOOL 350f67f7f341fe83bd21fb5f84714c43a426fa0d2234a532e781d0b0e9a977e2ee455184da995f5a3fbbf8e260d776dd9ac2607ac86041b5abecf41aeb9a8a9b
+DIST ipyparallel-5.1.1.tar.gz 2360986 SHA256 c46cd3bad50bbe12106257241d671ce6edb3faca2ced54ed001b8f1d579720f0 SHA512 66edfafeb6ca99b04ad08a61bbe7cbcfd9ba2689d16d19c476685d73f44ec40a4f2cde75e8394dbdc3b9e4da333afdfff8960bc9f37503aa4b28af90c63878db WHIRLPOOL eebf9c71b67c9ce129e125ca3ed7fb81f38ffb604805b861cc3239e113da52c1fb939fbf400d6c0cc7cfa29330ed60730a36447f7e74c45d788b33e6f1ac60ed
+DIST ipyparallel-5.2.0.tar.gz 2362590 SHA256 d99e760f1a136b1c402755a4ab51a8d7cb87c892cccadf641948a5e886c8a455 SHA512 1a3a4be28847ad11d43d96192ded62506380374b96a14cc9a6d6e945ac9592da7543fb5f9626a112068e548ed27f3291894a3cef544c65476c22b397458f60f3 WHIRLPOOL 29a77df915dfb487adabfb89ea96ee66253c14c7968699826f5be01073b43c753a2985bd940e09a708c92b4e9945b16d855b65a568523b1a75688a4aca022bca
+DIST ipyparallel-6.0.2.tar.gz 2366627 SHA256 7eea4780266252fcc987b220a302d589fbb4d6b0569bd131115a20b31891103d SHA512 2dab781eac81bb3c2d4eedff9689448ed8d4317b47a1e8110a0b16147f986428f6fefe13acd12ee8604ec7775aee46a5f62c7d6a676bda7f8d3d39d95d90f28d WHIRLPOOL e6f5047fbf153b587cb7b27924485648b6423f91ebee1541d961b8f1fd8179a18c08986652ff7f55a66168b276b1e7266c787b35bea950d50c8c761512fba867
+EBUILD ipyparallel-4.1.0.ebuild 1424 SHA256 f6b1b9674f7b896194cda011f1be50644d04af65988d2899e5ce6244e8bd669a SHA512 4c34c9ba59c3e29b2c3fb5b3626205499db9c5316c374cd6118b46b30250be66755c90444f2eadccd7b9cfbbd40ead19633004388db98dd91300ab9c6fbe15b6 WHIRLPOOL f8b23e625d61eb2ef691622e698a6d4761eb43a29a7b6b1c3f12693d2400799c855ae92421155891e0cfe4d7073d518c4eab0b44dbf146c45c6169fef2a7d3e2
+EBUILD ipyparallel-5.0.1.ebuild 1384 SHA256 768eee4c66a283d7f9cc012c4a2e87881c54767f4163e8928d0b8ab00b1689e5 SHA512 25d5d51ce06c0cca3047ce64db330120d561abd272d39f2ba2ef107430c3e7133e401e3aee6235354f54327b1141def10ceb5fb289fb08143ccce3e193b03c20 WHIRLPOOL c016a0e3d5c273989455644ece930bac2368a440f7f497a90aaa99011e6b8ec84babad18ab42b003bb5e9bac1d04788b5091533a1b8ad1e524c885525340ff72
+EBUILD ipyparallel-5.1.1.ebuild 1498 SHA256 bcd5ae70a5a9e482c170fda938504f4635e3be1b8c2930683be466ae5afed74f SHA512 6d242b1f2f8bba94409410bf09e8e6ee3dc9e0755a19638fcfeca16112f4a04f0bf2424744acb0cb43c3b9ad387ef829bf9a604617f766baea4fa49d397a2a75 WHIRLPOOL cd669058298dc60c2de541cd4567bfd44534bfa61c9d95de849d7e870e3f258d3bbc68cc96e117c6457f38f686ce9f3fff4f4e4f279e1e8a679ff2fc2c86fde1
+EBUILD ipyparallel-5.2.0.ebuild 1634 SHA256 25a79402f763265ee713098f242fc0cdb45449ae3e06a35edf5aebabcf037a72 SHA512 0aab07f95db9d12a716a2c97b7ba68e3356bc7115d43c35d5d8a63fe812b00221521ffedb5d144ae2d31043fb6bb96b4a8441fb72fe16ea17607f4acc037e9e5 WHIRLPOOL 701c2fe44d8b1319b6ba8164c4e4abe55790ee3b4d3215f59fbd27dddb570e3e3c244b16a6914f40fa815b5fbfd372937fdafbdfe87648942b95f1992d63e274
+EBUILD ipyparallel-6.0.2-r1.ebuild 1695 SHA256 e5d1a15b94bfccb3d5229a61e2171c047212d237ee6fc7a6d3f0114ef52a632d SHA512 b9cab720ca0a6ee327dde220fc3d203bbf3c65865de77d825e5fd8c98fa28a7475277f0c19ce6473f446cc01d8ed8f68fd903c1240f1944c06a57132cbe8970b WHIRLPOOL 9aefbaf7698b1a84f649cb71a8b9fa4ed8dde83a663600bedbc6338712a0a94dbcc435782e559a00ae559c37213899ff8c03b7aaf9182e394342a196c79e6b3c
+EBUILD ipyparallel-6.0.2.ebuild 1626 SHA256 16aad1421a0d89510fd31119e9cb62d864c54d4cdd55a438ef9e58dd0cc894f2 SHA512 2e7c0d3e102f4a5abd989f93a3e617f90a356ec2912b60042ff041f3b48a8030545140fb04d5ebcfc9d2fabf028a8784ff4d5f04cfc0ab6754b8654a273b6c24 WHIRLPOOL 756219a3aa043ec6a1aa210b4bc09c3ef42b5da0b901c0e38a4793b5601f3d77331ef847b206f77e367ebcf7fa57fc2395cf04309252203c8624878f45bdb086
+MISC ChangeLog 2342 SHA256 68350f4fe91a21d66e6b5c5ab891775a756e6a68ada467bff4eb7387d67b2afd SHA512 fdd9e61ff7b58938d1479d48443ef710abf1489edcce1365ac2239925e21868cfe623edf79b831f0a79e43288a407018e2843ce031dfb8b5cbb683839bae2d98 WHIRLPOOL 5970b4dfa8f75fcac188790c008c5851e0425d0f5800f4e4b390d3e7839e5e410d9e516750f3a9d66de4d8b3c817124c4c78bcd5fda8189b6b0bbb61709e673c
+MISC metadata.xml 541 SHA256 53c0c756c23166e1a397f85f9c70e9907c7afe85addea938251c8b363dac50a3 SHA512 47be22e2e5c3d43e92a6e9fcdcfe936ac7690499b850920196fca218b326f708d2350ec23f3084b58d0c9630f8dba06b90414a2e325811467034ef9f35a07a9a WHIRLPOOL 905d8d4761e5c14c370228260f9a564504c26544c8ae97b2b214515caa67e9a415eff44b72aaafcd9f0f930fc05f25f37de6e0e9643174cc3786d222ef3d99f4
diff --git a/dev-python/ipyparallel/ipyparallel-4.1.0.ebuild b/dev-python/ipyparallel/ipyparallel-4.1.0.ebuild
new file mode 100644
index 000000000000..62d09048ca07
--- /dev/null
+++ b/dev-python/ipyparallel/ipyparallel-4.1.0.ebuild
@@ -0,0 +1,59 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Interactive Parallel Computing with IPython"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	!<dev-python/ipython-4.0.0[smp]
+	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2_7')
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	iptest --coverage xml ipyparallel.tests || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild b/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild
new file mode 100644
index 000000000000..d7477fdddfac
--- /dev/null
+++ b/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Interactive Parallel Computing with IPython"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	!<dev-python/ipython-4.0.0[smp]
+	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2_7')
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	iptest ipyparallel.tests -- -vsx || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ipyparallel/ipyparallel-5.1.1.ebuild b/dev-python/ipyparallel/ipyparallel-5.1.1.ebuild
new file mode 100644
index 000000000000..459d8e5dc1b1
--- /dev/null
+++ b/dev-python/ipyparallel/ipyparallel-5.1.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Interactive Parallel Computing with IPython"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	!<dev-python/ipython-4.0.0[smp]
+	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2_7')
+	dev-python/notebook[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	iptest ipyparallel.tests -- -vsx || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ipyparallel/ipyparallel-5.2.0.ebuild b/dev-python/ipyparallel/ipyparallel-5.2.0.ebuild
new file mode 100644
index 000000000000..41ea11d938aa
--- /dev/null
+++ b/dev-python/ipyparallel/ipyparallel-5.2.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Interactive Parallel Computing with IPython"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	!<dev-python/ipython-4.0.0[smp]
+	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2_7')
+	dev-python/notebook[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' python2_7)
+	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	iptest --coverage xml ipyparallel.tests -- -vsx || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ipyparallel/ipyparallel-6.0.2-r1.ebuild b/dev-python/ipyparallel/ipyparallel-6.0.2-r1.ebuild
new file mode 100644
index 000000000000..5b18b53468df
--- /dev/null
+++ b/dev-python/ipyparallel/ipyparallel-6.0.2-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Interactive Parallel Computing with IPython"
+HOMEPAGE="https://ipyparallel.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	!<dev-python/ipython-4.0.0[smp,${PYTHON_USEDEP}]
+	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2_7')
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/notebook[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	iptest --coverage xml ipyparallel.tests -- -vsx || die
+}
diff --git a/dev-python/ipyparallel/ipyparallel-6.0.2.ebuild b/dev-python/ipyparallel/ipyparallel-6.0.2.ebuild
new file mode 100644
index 000000000000..646d41f54228
--- /dev/null
+++ b/dev-python/ipyparallel/ipyparallel-6.0.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Interactive Parallel Computing with IPython"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	!<dev-python/ipython-4.0.0[smp]
+	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2_7')
+	dev-python/notebook[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2*')
+	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	iptest --coverage xml ipyparallel.tests -- -vsx || die
+}
diff --git a/dev-python/ipyparallel/metadata.xml b/dev-python/ipyparallel/metadata.xml
new file mode 100644
index 000000000000..742b296901f6
--- /dev/null
+++ b/dev-python/ipyparallel/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    Interactive Parallel Computing with IPython.
+    ipyparallel is the new home of IPython.parallel.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">ipyparallel</remote-id>
+    <remote-id type="github">ipython/ipyparallel</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
new file mode 100644
index 000000000000..654119b8a6da
--- /dev/null
+++ b/dev-python/ipython/Manifest
@@ -0,0 +1,16 @@
+AUX 2.1.0-substitute-files.patch 1017 SHA256 5547660171b6a92145aed499bc0ccfafd079a1f86db86eac05baf60b39f6a15e SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542 WHIRLPOOL 581a456407b325d554689c9ad99ce6ee969468a41351e80f81b846267a97dca6cdf1052ab87088b42cd7d8445d73c17d5a99093f385e5e5e3640b5a10547ffe9
+AUX ipython-3.2.1-Don-t-redirect-from-edit-to-files.patch 2004 SHA256 776b54af81f6323ce19e83ef8faac148ebf616b6589aa093cc151387fcf42111 SHA512 8d519f154ff60038348896814cd2464a52f31e172d7660acc4f9b818ad1415717ad48df7197c6509416c7dd7a86fda3420188c05aae3db6947a4add1d07390fe WHIRLPOOL 6212ec73cf9ce11d964dc76463cdb4f856c51f35635cb7ce36be768c30058c841b8c28fc7320c2b1e757825e99d30ddc31b04c7335d4b12b35edcb162093ee37
+AUX ipython-3.2.1-only-redirect-to-editor-for-text-documents.patch 1311 SHA256 2d6724c52b3c0537af7afca2bf2d07037c9e8cd9a8dbcf5779e85f183b4fefbb SHA512 ff6f5ba68baa455565aabd6de403bb1d8d52183bacf068fdffd3e7e2b1dcd37267915316eae11f781f6107703c2bcdda7007c0a0b06e9888f7a69ae752994ee1 WHIRLPOOL 0e29ba597ad0320569a29290041a20357b4d930d1c893c18f4f1da944cc488f93161135b3a0d865cc488190087df60547a34b1b5401826a6f1aea91c057c3102
+AUX ipython-3.2.1-set-mime-type-on-files.patch 1175 SHA256 95b700a914c0490787f876bff4efc59de6e5e583bc700354f50a8b3c2cba3828 SHA512 d4791082b2b784bfe4998ad135ccfe0aa7e39f66e26125b75b15ab0b2474ba079c718e913853c709b2cb4e1def620d185918a063f3afc21dca474497f5982b4d WHIRLPOOL b9c18a38f21906bc97908f934d71e8e990bdc36cfc8171371a96b210a4f9e66c18a797fb5548bb1238ab5e422bc7272827eedeef9f9812b03438c10508a035d3
+AUX ipython-3.2.1-set-model-mimetype-even-when-content-False.patch 2329 SHA256 20c2fce0d118fc5c88088009960bda114ded6c0ec44544fd511f96722f443112 SHA512 6b6efe04677cbf09fd9b42e2bc981779371a5cbec2ddaeee911b5246756300b75b54f540f246c98c84868c5abae4ca2d60787a168d2bd95dc2db35e16d5d98f4 WHIRLPOOL 8adb5098acab56d87f94eafb94d9437d510e6a58efdda58a822c98f6cd08749287ad7f798b7f7299635a609bdbf1871f2b71bf23946504591f246d19deed59a3
+DIST ipython-3.2.1.tar.gz 10884249 SHA256 c913adee7ae5b338055274c51a7d2b3cea468b5b316046fa520cd8a434b09177 SHA512 de7723e3b859d21a58a24456c76c8d8ec98c019f290f61269f46270e7647d2b49a98671138fecd75cb6f46384fde7e09618eb5c85c175e0e442c7fae7328d8fe WHIRLPOOL 9f020c167559259931dcb177d0c3a5211939632e5775c2627795ba390cf57bd62c378c15b7ee9b9ed2079180f8df8e062eb9673ed9cfc025a56f1da82c9428d1
+DIST ipython-5.3.0.tar.gz 4967956 SHA256 bf5e615e7d96dac5a61fbf98d9e2926d98aa55582681bea7e9382992a3f43c1d SHA512 41706d7521cc84f36f5580dc44cd91832a60aa8a7a946d15a9ec9563649b9ae97931b9f135f1fdbaecbcb0b9b925d467edfd6eec7f8c82309872047be77b598d WHIRLPOOL 96478b15fd4928d11da35dbbaba6492ff12cf739c06b6f9cf8fdd827060baf5c07d093c3e340792b62102f85ada0b6ea29adc742b784ad21e5292cde09a6fa25
+DIST ipython-5.4.1.tar.gz 4973571 SHA256 afaa92343c20cf4296728161521d84f606d8817f963beaf7198e63dfede897fb SHA512 b37dae27a558585ec4f42fa22e86380ac81990207ec680fc7b0e6f97ac81c99d915cfe77488bc0b91a61c34e0c00b323df08aa06b142ce0fc88ce30203102907 WHIRLPOOL e91e719a681c29e8ecd3e08ade470adcefb957ffddfa601f89306c19b6f6e80fa793a603948fb9fd697884474f2559ece30456be27d9034448cb618217a8cfa1
+DIST ipython-6.1.0.tar.gz 5066094 SHA256 5c53e8ee4d4bec27879982b9f3b4aa2d6e3cfd7b26782d250fa117f85bb29814 SHA512 6b1d9713b5e8c3870ac8cd8bea9d3a6f0c0302e3983017516128ede9f0baba21372890873df29fbba3f9d2f47ba16bfadb1c611f9de23b71595c0ab8f917695b WHIRLPOOL 9b579922060a1d37487bb294314fae4ac19c8d98509c856c117c17f6eb8d617cd29b7d7fa5e44bb2b1004a70f893b0e83571f69149729b6f6ebcbaa162f257fa
+EBUILD ipython-3.2.1-r1.ebuild 5044 SHA256 7898fc3eda7730ca788b241cd34b4b4318828c0e9e5c7bb360b055115faf59bb SHA512 2d786c8dcc972b6231884a0a874e371642bc8c01ee588988d26989b251277b344b1373525ce6be713931c69c56ec83bd70e5aa29379113e593cb75eae470f69c WHIRLPOOL dda5302c02a1fc45da05b8fca0ce849b8e07c7f9ba107b01c3dcb6b1b3da1d0514e0f3edb137c1e4c59ec3f4d5eb087f8bd1d63c8cd993a5d8343bf04e534234
+EBUILD ipython-5.3.0.ebuild 4324 SHA256 ede259fcb1065f074ad5f1262f5511d86cd222a4405d969bf5c57fbd412b8623 SHA512 cd06a1a43545b8ded7dbdfae4be0c66291718337d7e83047988c5aeba313bda2a983f4b5714e685bfba1f0908b2e0d375b91aafc7d677562fb92715a89510fa8 WHIRLPOOL 738042cb9b82045379bde8c7fcba41d0e214f3dfd0fd903958756fcdc1da31fcec4de29cfec7fc777409d3e811b84c80abed7bacdbdd2eda2f0aae39128add3b
+EBUILD ipython-5.4.1.ebuild 3698 SHA256 235fd89996d9f3ccd303d458c9950f8fe5fc91d98a41684a0dbf4b35401d036f SHA512 8f27826f9ac163b1fe48e37caa8c904ae4320ba6adeb186f0f970fa163d078097ee486468aa280b0440cca4bfe7e24929f8866a4dc48a4e07e411ca072569ba2 WHIRLPOOL c312de3bf14a6533c673b9ac2b5aa7d2f4fb2fb3a0a1bbe0d62521bf0df03e7b33db5a2e339268f63fcb121abb3e9afe167386c5385b1ded5759952ebb6761d2
+EBUILD ipython-6.1.0.ebuild 3440 SHA256 ab042cac1af84d9839a07ee35631ed69ff64440b97e9b8ebd74fcf99209a600d SHA512 1251ed84c81edc211cf8d389bfa79e4b3df30c6fa2cf4446b6b04b4d36119d112ed9a677ea4b43cb21743f102ff6c11626ebc2530762250f7486adcd33b62292 WHIRLPOOL 626f276aa95ee6867bccbb6dec4afb671241b2c16dcaa5c72d61222631a188874737635db08b9363e2d13817253b7101fe0822c8bb7a22ce4af35d6b1939214c
+MISC ChangeLog 10996 SHA256 1d0f52575701c78ed1d41c4f2acd87058a6ce424ee43a7905580d2738bdfd956 SHA512 f28dbf25970065284e0ed2b726d2b35f6484f68c98f7c62b7aa4d607e9421c140ea2d9cdd83a25cdfe92a88b5f25ca5e0f290e571def0b5627738ae0a3a1617a WHIRLPOOL bacb3e444412adb8153ae63b599b331432346dff17011641721b02f5d498f37661810779394459b62c1de85a3f8f9378c59f4207ce6311354560ec84cdec5af9
+MISC ChangeLog-2015 28077 SHA256 09abe93b0e7fe824a90d0b25f87ad1c30afceb2d37c5cc869ea134ca917d926a SHA512 1478e71c72ff28766debc68e6037e9cb2c8f402e7fe95150ae8790c0bf087d48f624e652197bbd4706f8732a02328924aea26efff2be0babe20cda5b236ab380 WHIRLPOOL 985235b1a87e05eba5d9638f94da47a09623c3e4dca5fa7fe9c60c2b2dc4f9be04228a40dd81b4d0e851062309725b7902cfcb002f3070e27722d1a4b4303d82
+MISC metadata.xml 3035 SHA256 3a29f5250cd022aa4037445be5873713e9f5019d3adfa9c06fcbc845fc085000 SHA512 a841d52fc997a447ec98335dad7cbb2971a0498754eb86942d6a9aa9f14cdb3b8687f78e882adc8b84c1967a16f75239e8fda6bfedc58622b052bdadda719dcb WHIRLPOOL d172ada3d31cefd932ebb263a99bf458577f244092f7b68f10550097900d03182c75c543ded54318390bead56d81ec33fdf0007a4e8e446efa51783752571cb5
diff --git a/dev-python/ipython/files/2.1.0-substitute-files.patch b/dev-python/ipython/files/2.1.0-substitute-files.patch
new file mode 100644
index 000000000000..659df39226ac
--- /dev/null
+++ b/dev-python/ipython/files/2.1.0-substitute-files.patch
@@ -0,0 +1,27 @@
+substitute the insource files with these messages
+diff --git a/IPython/extensions/octavemagic.py b/IPython/extensions/octavemagic.py
+new file mode 100644
+index 0000000..dc93fe4
+--- /dev/null
++++ b/IPython/extensions/octavemagic.py
+@@ -0,0 +1,7 @@
++import warnings
++
++def load_ipython_extension(ip):
++    msg = ("The octavemagic extension has been moved to oct2py. "
++           "After installing oct2py, you can load octavemagic with the "
++           "following command: '%load_ext oct2py.ipython'.")
++    warnings.warn(msg, Warning, stacklevel=2)
+diff --git a/IPython/extensions/rmagic.py b/IPython/extensions/rmagic.py
+new file mode 100644
+index 0000000..739e491
+--- /dev/null
++++ b/IPython/extensions/rmagic.py
+@@ -0,0 +1,7 @@
++import warnings
++
++def load_ipython_extension(ip):
++    msg = ("The rmagic extension has been moved to rpy2. "
++           "After installing rpy2, you can load rmagic with the "
++           "following command: '%load_ext rpy2.ipython'.")
++    warnings.warn(msg, Warning, stacklevel=2)
diff --git a/dev-python/ipython/files/ipython-3.2.1-Don-t-redirect-from-edit-to-files.patch b/dev-python/ipython/files/ipython-3.2.1-Don-t-redirect-from-edit-to-files.patch
new file mode 100644
index 000000000000..5ec742c34cf8
--- /dev/null
+++ b/dev-python/ipython/files/ipython-3.2.1-Don-t-redirect-from-edit-to-files.patch
@@ -0,0 +1,55 @@
+Upstream patch to fix
+"Maliciously crafted text files in IPython/Jupyter editor".
+
+http://seclists.org/oss-sec/2015/q3/558
+https://bugs.gentoo.org/show_bug.cgi?id=560708
+
+
+From 2b835ca6daec2592d9127dc85bf2cdcfb718edf2 Mon Sep 17 00:00:00 2001
+From: Min RK <benjaminrk@gmail.com>
+Date: Mon, 20 Jul 2015 12:11:23 -0700
+Subject: [PATCH 4/4] Don't redirect from /edit/ to /files/
+
+show failure to decode, instead
+---
+ IPython/html/static/edit/js/editor.js | 15 +++------------
+ 1 file changed, 3 insertions(+), 12 deletions(-)
+
+diff --git a/IPython/html/static/edit/js/editor.js b/IPython/html/static/edit/js/editor.js
+index dd12ea4..75d65e0 100644
+--- a/IPython/html/static/edit/js/editor.js
++++ b/IPython/html/static/edit/js/editor.js
+@@ -90,19 +90,10 @@ function($,
+             }).catch(
+             function(error) {
+                 that.events.trigger("file_load_failed.Editor", error);
+-                if (((error.xhr||{}).responseJSON||{}).reason === 'bad format') {
+-                    window.location = utils.url_path_join(
+-                        that.base_url,
+-                        'files',
+-                        that.file_path
+-                    );
+-                } else {
+-                    console.warn('Error while loading: the error was:')
+-                    console.warn(error)
+-                }
++                console.warn('Error loading: ', error);
+                 cm.setValue("Error! " + error.message +
+                                 "\nSaving disabled.\nSee Console for more details.");
+-                cm.setOption('readOnly','nocursor')
++                cm.setOption('readOnly','nocursor');
+                 that.save_enabled = false;
+             }
+         );
+@@ -186,7 +177,7 @@ function($,
+     Editor.prototype._clean_state = function(){
+         var clean = this.codemirror.isClean(this.generation);
+         if (clean === this.clean){
+-            return
++            return;
+         } else {
+             this.clean = clean;
+         }
+-- 
+2.4.6
+
diff --git a/dev-python/ipython/files/ipython-3.2.1-only-redirect-to-editor-for-text-documents.patch b/dev-python/ipython/files/ipython-3.2.1-only-redirect-to-editor-for-text-documents.patch
new file mode 100644
index 000000000000..4b1f7d3686c0
--- /dev/null
+++ b/dev-python/ipython/files/ipython-3.2.1-only-redirect-to-editor-for-text-documents.patch
@@ -0,0 +1,38 @@
+Upstream patch to fix
+"Maliciously crafted text files in IPython/Jupyter editor".
+
+http://seclists.org/oss-sec/2015/q3/558
+https://bugs.gentoo.org/show_bug.cgi?id=560708
+
+
+From df24d9153b86863ccfa98bf509704d9304143ce1 Mon Sep 17 00:00:00 2001
+From: Min RK <benjaminrk@gmail.com>
+Date: Mon, 20 Jul 2015 12:11:04 -0700
+Subject: [PATCH 3/4] only redirect to editor for text documents
+
+treat unidentified mime-types as text
+---
+ IPython/html/static/tree/js/notebooklist.js | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/IPython/html/static/tree/js/notebooklist.js b/IPython/html/static/tree/js/notebooklist.js
+index 0065143..d8c7b2a 100644
+--- a/IPython/html/static/tree/js/notebooklist.js
++++ b/IPython/html/static/tree/js/notebooklist.js
+@@ -532,6 +532,13 @@ define([
+             icon = 'running_' + icon;
+         }
+         var uri_prefix = NotebookList.uri_prefixes[model.type];
++        if (model.type === 'file' &&
++            model.mimetype && model.mimetype.substr(0,5) !== 'text/'
++        ) {
++            // send text/unidentified files to editor, others go to raw viewer
++            uri_prefix = 'files';
++        }
++        
+         item.find(".item_icon").addClass(icon).addClass('icon-fixed-width');
+         var link = item.find("a.item_link")
+             .attr('href',
+-- 
+2.4.6
+
diff --git a/dev-python/ipython/files/ipython-3.2.1-set-mime-type-on-files.patch b/dev-python/ipython/files/ipython-3.2.1-set-mime-type-on-files.patch
new file mode 100644
index 000000000000..b5d4b5fbd668
--- /dev/null
+++ b/dev-python/ipython/files/ipython-3.2.1-set-mime-type-on-files.patch
@@ -0,0 +1,35 @@
+Upstream patch to fix
+"Maliciously crafted text files in IPython/Jupyter editor".
+
+http://seclists.org/oss-sec/2015/q3/558
+https://bugs.gentoo.org/show_bug.cgi?id=560708
+
+
+From d729ce7c2063c0de746a7c2ea39697040d0af5bf Mon Sep 17 00:00:00 2001
+From: Min RK <benjaminrk@gmail.com>
+Date: Mon, 20 Jul 2015 12:10:10 -0700
+Subject: [PATCH 1/4] set mime-type on /files/
+
+---
+ IPython/html/files/handlers.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/IPython/html/files/handlers.py b/IPython/html/files/handlers.py
+index 7727d08..b358d94 100644
+--- a/IPython/html/files/handlers.py
++++ b/IPython/html/files/handlers.py
+@@ -40,6 +40,11 @@ def get(self, path):
+             cur_mime = mimetypes.guess_type(name)[0]
+             if cur_mime is not None:
+                 self.set_header('Content-Type', cur_mime)
++            else:
++                if model['format'] == 'base64':
++                    self.set_header('Content-Type', 'application/octet-stream')
++                else:
++                    self.set_header('Content-Type', 'text/plain')
+         
+         if model['format'] == 'base64':
+             b64_bytes = model['content'].encode('ascii')
+-- 
+2.4.6
+
diff --git a/dev-python/ipython/files/ipython-3.2.1-set-model-mimetype-even-when-content-False.patch b/dev-python/ipython/files/ipython-3.2.1-set-model-mimetype-even-when-content-False.patch
new file mode 100644
index 000000000000..a69f746f64c0
--- /dev/null
+++ b/dev-python/ipython/files/ipython-3.2.1-set-model-mimetype-even-when-content-False.patch
@@ -0,0 +1,64 @@
+Upstream patch to fix
+"Maliciously crafted text files in IPython/Jupyter editor".
+
+http://seclists.org/oss-sec/2015/q3/558
+https://bugs.gentoo.org/show_bug.cgi?id=560708
+
+
+From 50a1366a8fcfb94671c87199515ebc922882f447 Mon Sep 17 00:00:00 2001
+From: Min RK <benjaminrk@gmail.com>
+Date: Mon, 20 Jul 2015 12:10:25 -0700
+Subject: [PATCH 2/4] set model mimetype, even when content=False
+
+---
+ IPython/html/services/contents/filemanager.py | 12 +++++++-----
+ IPython/html/services/contents/handlers.py    |  3 ---
+ 2 files changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/IPython/html/services/contents/filemanager.py b/IPython/html/services/contents/filemanager.py
+index 01ce07b..c869c75 100644
+--- a/IPython/html/services/contents/filemanager.py
++++ b/IPython/html/services/contents/filemanager.py
+@@ -277,18 +277,20 @@ def _file_model(self, path, content=True, format=None):
+         model['type'] = 'file'
+ 
+         os_path = self._get_os_path(path)
++        model['mimetype'] = mimetypes.guess_type(os_path)[0]
+ 
+         if content:
+             content, format = self._read_file(os_path, format)
+-            default_mime = {
+-                'text': 'text/plain',
+-                'base64': 'application/octet-stream'
+-            }[format]
++            if model['mimetype'] is None:
++                default_mime = {
++                    'text': 'text/plain',
++                    'base64': 'application/octet-stream'
++                }[format]
++                model['mimetype'] = default_mime
+ 
+             model.update(
+                 content=content,
+                 format=format,
+-                mimetype=mimetypes.guess_type(os_path)[0] or default_mime,
+             )
+ 
+         return model
+diff --git a/IPython/html/services/contents/handlers.py b/IPython/html/services/contents/handlers.py
+index 5cd849e..d77e70e 100644
+--- a/IPython/html/services/contents/handlers.py
++++ b/IPython/html/services/contents/handlers.py
+@@ -52,9 +52,6 @@ def validate_model(model, expect_content):
+         )
+ 
+     maybe_none_keys = ['content', 'format']
+-    if model['type'] == 'file':
+-        # mimetype should be populated only for file models
+-        maybe_none_keys.append('mimetype')
+     if expect_content:
+         errors = [key for key in maybe_none_keys if model[key] is None]
+         if errors:
+-- 
+2.4.6
+
diff --git a/dev-python/ipython/ipython-3.2.1-r1.ebuild b/dev-python/ipython/ipython-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..af473413e2cf
--- /dev/null
+++ b/dev-python/ipython/ipython-3.2.1-r1.ebuild
@@ -0,0 +1,156 @@
+# 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} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 eutils virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets"
+
+REQUIRED_USE="
+	test? ( doc matplotlib mongodb notebook nbconvert octave qt4 wxwidgets )
+	doc? ( mongodb )"
+
+CDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/simplegeneric[${PYTHON_USEDEP}]
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	mongodb? ( <dev-python/pymongo-3[${PYTHON_USEDEP}] )
+	octave? ( dev-python/oct2py[${PYTHON_USEDEP}] )
+	smp? ( >=dev-python/pyzmq-13[${PYTHON_USEDEP}] )
+	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )"
+RDEPEND="${CDEPEND}
+	notebook? (
+		dev-libs/mathjax
+		dev-python/jinja[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
+		>=dev-python/mistune-0.5[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		>=dev-python/pyzmq-13[${PYTHON_USEDEP}]
+		>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
+		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+	)
+	nbconvert? (
+		|| ( >=net-libs/nodejs-0.9.12 >=app-text/pandoc-1.12.1 )
+		dev-python/jinja[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
+		>=dev-python/mistune-0.5[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	qt4? (
+		|| (
+			dev-python/PyQt4[${PYTHON_USEDEP},svg]
+			dev-python/PyQt5[${PYTHON_USEDEP},svg]
+			dev-python/pyside[${PYTHON_USEDEP},svg]
+		)
+		dev-python/pygments[${PYTHON_USEDEP}]
+		>=dev-python/pyzmq-13[${PYTHON_USEDEP}] )"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		app-text/dvipng
+		dev-python/jinja[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
+		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/2.1.0-substitute-files.patch
+	"${FILESDIR}/${P}"-set-mime-type-on-files.patch
+	"${FILESDIR}/${P}"-set-model-mimetype-even-when-content-False.patch
+	"${FILESDIR}/${P}"-only-redirect-to-editor-for-text-documents.patch
+	"${FILESDIR}/${P}"-Don-t-redirect-from-edit-to-files.patch
+	)
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html_noapi
+}
+
+python_test() {
+	distutils_install_for_testing
+	# https://github.com/ipython/ipython/issues/8639
+	# Failure of some modules only in python3.4
+	local fail
+	run_tests() {
+		pushd ${TEST_DIR} > /dev/null || die
+		"${PYTHON}" -m IPython.testing.iptestcontroller --all || fail=1
+		popd > /dev/null || die
+	}
+	VIRTUALX_COMMAND=run_tests virtualmake
+	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+	use notebook && \
+		ln -sf "${EPREFIX}/usr/share/mathjax" "${D}$(python_get_sitedir)/IPython/html/static/mathjax"
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/ipython/ipython-5.3.0.ebuild b/dev-python/ipython/ipython-5.3.0.ebuild
new file mode 100644
index 000000000000..6da17185aa7d
--- /dev/null
+++ b/dev-python/ipython/ipython-5.3.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets"
+
+REQUIRED_USE="
+	test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets )
+	doc? ( mongodb )"
+
+CDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/simplegeneric[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-1.0.3[${PYTHON_USEDEP}]
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	mongodb? ( <dev-python/pymongo-3[${PYTHON_USEDEP}] )
+	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' 'python2*') )"
+
+RDEPEND="${CDEPEND}
+	virtual/python-pathlib[${PYTHON_USEDEP}]
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
+DEPEND="${CDEPEND}
+	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep \
+		'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep \
+		'dev-python/typing[${PYTHON_USEDEP}]' 'python2*')
+	test? (
+		app-text/dvipng
+		dev-python/jinja[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' 'python3*')
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+		x11-base/xorg-server[xvfb]
+	)
+	doc? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' 'python2*')
+		>=dev-python/jsonschema-2.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+	)"
+
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+	)
+	qt4? ( dev-python/qtconsole )
+	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/cythonmagic.py || die
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	pushd "${TEST_DIR}" >/dev/null || die
+	"${EPYTHON}" -m IPython.testing.iptestcontroller --all || die
+	popd >/dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/ipython/ipython-5.4.1.ebuild b/dev-python/ipython/ipython-5.4.1.ebuild
new file mode 100644
index 000000000000..0abf3b2a028e
--- /dev/null
+++ b/dev-python/ipython/ipython-5.4.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples matplotlib notebook nbconvert qt4 qt5 +smp test wxwidgets"
+
+CDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.10.0[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-1.0.4[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/simplegeneric[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' 'python2*') )
+"
+
+RDEPEND="${CDEPEND}
+	virtual/python-pathlib[${PYTHON_USEDEP}]
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep \
+		'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2*')
+	dev-python/typing[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+	)"
+
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+	)
+	qt4? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/cythonmagic.py || die
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	pushd "${TEST_DIR}" >/dev/null || die
+	"${TEST_DIR}"/scripts/iptest || die
+	popd >/dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/ipython/ipython-6.1.0.ebuild b/dev-python/ipython/ipython-6.1.0.ebuild
new file mode 100644
index 000000000000..492ab29a655d
--- /dev/null
+++ b/dev-python/ipython/ipython-6.1.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples matplotlib notebook nbconvert qt4 qt5 smp test"
+
+CDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.10.0[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-1.0.4[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/simplegeneric[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${CDEPEND}
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )
+"
+
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/typing[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+	)
+"
+
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+	)
+	qt4? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )
+"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+#DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/cythonmagic.py || die
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	pushd "${TEST_DIR}" >/dev/null || die
+	"${TEST_DIR}"/scripts/iptest || die
+	popd >/dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/ipython/metadata.xml b/dev-python/ipython/metadata.xml
new file mode 100644
index 000000000000..f9fc713b4c4d
--- /dev/null
+++ b/dev-python/ipython/metadata.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  IPython provides a replacement for the interactive Python interpreter with
+  extra functionality. Main features:
+  * Comprehensive object introspection.
+  * Input history, persistent across sessions.
+  * Caching of output results during a session with automatically generated
+    references.
+  * Readline based name completion.
+  * Extensible system of 'magic' commands for controlling the environment and
+    performing many tasks related either to IPython or the operating system.
+  * Configuration system with easy switching between different setups (simpler
+    than changing $PYTHONSTARTUP environment variables every time).
+  * Session logging and reloading.
+  * Extensible syntax processing for special purpose situations.
+  * Access to the system shell with user-extensible alias system.
+  * Easily embeddable in other Python programs.
+  * Integrated access to the pdb debugger and the Python profiler.
+</longdescription>
+  <longdescription lang="ja">
+対話的�利用�る場��Pythonインタープリタ�ら�より機能�豊富�IPython�置���る事�����。
+
+主機能：
+* 内包的オブジェクト�分�。
+* 入力ヒストリー�セッションを越��記憶�続���。
+* 出力�自動作��れるリファレンス�セッション間�キャッシュ���。
+* Readlineを利用����補完。
+* 環境管��IPython���OS���ら��関係�るタスク実行����magic
+  コマンドを拡張�能�システム。
+* 異�るセットアップを簡��交���るコンフィグレーション・システム。
+  (毎回起動時��$PYTHONSTARTUP環境変数を指定�るよりも簡���。)
+* セッション・ロギング�セッション・リローディング。
+* 特別�状�時����拡張�能�構文解�。
+* ユーザー定義��るエイリアス・システム�システム・シェル�アクセス。
+* 他�Python言語プログラムを組�込む��簡�。
+* pdbデ�ッガ�profiler��統�アクセス。
+</longdescription>
+  <use>
+    <flag name="matplotlib">Add support for <pkg>dev-python/matplotlib</pkg></flag>
+    <flag name="mongodb">Enable support for MongoDB via <pkg>dev-python/pymongo</pkg></flag>
+    <flag name="notebook">Install requirements for the web notebook based on <pkg>www-servers/tornado</pkg></flag>
+    <flag name="nbconvert">Enable support for converting notebooks to various formats using <pkg>app-text/pandoc</pkg></flag>
+    <flag name="octave">Enable octave bridge via <pkg>dev-python/oct2py</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">ipython</remote-id>
+    <remote-id type="github">ipython/ipython</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ipython_genutils/Manifest b/dev-python/ipython_genutils/Manifest
new file mode 100644
index 000000000000..0c800bbc0450
--- /dev/null
+++ b/dev-python/ipython_genutils/Manifest
@@ -0,0 +1,6 @@
+DIST ipython_genutils-0.1.0.tar.gz 22255 SHA256 3a0624a251a26463c9dfa0ffa635ec51c4265380980d9a50d65611c3c2bd82a6 SHA512 714f850783d5e3c042da409217c0e213cbce249a42fd689c3559745861a991fecb5dbf98a012a4186053d9bb7ca4d52dad742b676eeb5163bc4dfbf256181081 WHIRLPOOL 2696d088cd1f1a8faeb8fa847da8b41205b7823eae02813f2fa8769c392918b0d990007f451bb77704d732b7e700ef02b39144dc0a42db14c6399c076e5db91c
+DIST ipython_genutils-0.2.0.tar.gz 22208 SHA256 eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8 SHA512 0e5a9f8be17d98dfb74ec77d1360ee79276a13fe1914e6d31e8740f06375ed1671c49356a77f118495f50823b8384c1e2c5b6fae73965e3d4249c831b9a2b095 WHIRLPOOL a1527ffb4bcdbb9eeb92d7c6e07d3ddf34744f48d2715a5148c9f6855eb33cdb3491b5706b222372008c04d86ea22c4163752d10b3a4fefda6b568d68e5477d3
+EBUILD ipython_genutils-0.1.0.ebuild 606 SHA256 3355698d6d3a1df325def32b481af427df672b5572f916c22e3a4183b12d7efd SHA512 1a303a98bfe7f8d0eb2c83e9da1d7f507ce697d31e7da2066f302f74f5982ebb756c3279e8ba6a02e2ff5e7778654d9ee780029082309162936c32903bdb5cc9 WHIRLPOOL be4620800116a816e6b7050f0cfa86f0c789e13114fb1614bcce5709f4a5a2260bbfd8615b00ddf748308eb60672b6548ef84881bb6ba6874b7c593c5b851baf
+EBUILD ipython_genutils-0.2.0.ebuild 607 SHA256 1a11af23147e5b42e5e791146297589cadb7a167b436a6a068750f96949c822c SHA512 6788f720f49ca991b2374e34e32abf69cab9cede676b0c285d77a1543f7df96ca2bf6a7d3c1ee5514d9915c83f47db283339cebbe9bed452e61264c8d8f9fe14 WHIRLPOOL 9d2c4ec44057c892de8e42dd165eaf3919cfe282a7861bec7a38578c60df645efd202ac6430d21a2394b696ec6549bfc54e6f48ca3c46d0fdf382205c211abbe
+MISC ChangeLog 1037 SHA256 9270bb3b0fd377605e1fe8241a9cd83853d4c633eb2d3f8ba7de3a3e70c11f6d SHA512 481eeb73c19d69fa4987d128f4221e0dc258938d3c2aafc2429c6b483c8b85fc11af2d64214d9d77ea8f171762324eb379192c27cd4d3d12783ca102999512bc WHIRLPOOL 4dee0ac09ed33d1a4d3ff325865b3550314c14ab302917782f88507993d551b50fa251c248afbe4fa08ae6b4bd9a161328c72b5a466a5fcd75338b12974fc561
+MISC metadata.xml 729 SHA256 11e279bf64f133edb27f89d8968ba7245f47b963b965de3acfc6add265f1758b SHA512 13724fe12d5a5053947c38bec58984747985fee21954ff33072c954bf6e9bb53c4b9d23dad194c4cc6b1151ae83d1f8f53c9f91368a370aa51f84c7ced0178fe WHIRLPOOL f9963cc50fb1c082f9352cc504b5f7e797666a450735d3eda39e5654a1a99304f526f54c8c847aadbb02b2ec844b15110397cfb3fdbcd561ba6cf282a2af3875
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.1.0.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.1.0.ebuild
new file mode 100644
index 000000000000..438b767b115a
--- /dev/null
+++ b/dev-python/ipython_genutils/ipython_genutils-0.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Vestigial utilities from IPython"
+HOMEPAGE="https://github.com/ipython/ipython_genutils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~x86"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	"
+
+python_test() {
+	nosetests --with-coverage --cover-package=ipython_genutils ipython_genutils || die
+}
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
new file mode 100644
index 000000000000..b8767f4bff24
--- /dev/null
+++ b/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Vestigial utilities from IPython"
+HOMEPAGE="https://github.com/ipython/ipython_genutils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	"
+
+python_test() {
+	nosetests --with-coverage --cover-package=ipython_genutils ipython_genutils || die
+}
diff --git a/dev-python/ipython_genutils/metadata.xml b/dev-python/ipython_genutils/metadata.xml
new file mode 100644
index 000000000000..c9deb0b0985a
--- /dev/null
+++ b/dev-python/ipython_genutils/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    This package contains some common utilities shared by Jupyter and
+    IPython projects during The Big Split. As soon as possible, those
+    packages will remove their dependency on this, and this repo will
+    go away. No packages outside IPython/Jupyter should depend on it.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">ipython_genutils</remote-id>
+    <remote-id type="github">ipython/ipython_genutils</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
new file mode 100644
index 000000000000..2cabbbaf4cff
--- /dev/null
+++ b/dev-python/ipywidgets/Manifest
@@ -0,0 +1,12 @@
+DIST ipywidgets-4.1.1.tar.gz 321646 SHA256 ceeb325e45ade9537c2d115fed9d522e5c6e90bb161592e2f0807375dc661028 SHA512 53b18ae432f72d3305333e92f488f62bb36f83d37fab59e4d103fb77a7ee266d03b96e6de4ffcc2a0f67d6fd892ed1d984c0b188d6cbd527ff3e950e885a5fe4 WHIRLPOOL e1ccb54416bd48fa451cd84f818595dcbe907a3bda79935d884b6f1f226167559cc24f1390d35f8b9a1e3a9af07da5c755c05e93729e27573d030d7ba2def3c3
+DIST ipywidgets-5.1.5.tar.gz 2467289 SHA256 9590407ed96c3ac4fe22b4d18eb59854de83d1f6a007522b8d63373ed06e1eaf SHA512 245f6fb1ece32cea809813d4c49dd1dbce46fdcf3ccf2b76aad44243243ed33b6d7286524637d4475f7245a84797159d03a181a35ce925d95d3e2317d1d98df1 WHIRLPOOL 501591ab630cb143a8313ae7f102e7c0acf9c5b01e35daa219c999b88be533684334d2a74a48b589f9e5c30ddca34264dcaca36d0456ce44358fb5879634bb68
+DIST ipywidgets-5.2.2.tar.gz 2420984 SHA256 baf6098f054dd5eacc2934b8ea3bef908b81ca8660d839f1f940255a72c660d2 SHA512 2648640b08b734384e99f4a7aaf0eecafb90adea971ebd772e4c7d43a6a18006e250e6d5f1124c0f4c49d75f0b8b30bf4b3640ef3599bdf2491d517fd8bbc58b WHIRLPOOL 29b67381dbcd1e6d2c0a146ace5f6dd42a4e3dc0d5dd4c8df88cdfa1189ba636bf1051e1e15b6dfab8b15c5ae5123c2bbfb1ca83cc5c7c6e49c4a41468894a25
+DIST ipywidgets-6.0.0.tar.gz 836173 SHA256 afa6248850cff14ef86117db87aeab0b12237e4eaf740e73716460ed593a43a7 SHA512 91544cb2ee60a21776332cf39a95f1e5bb86d0ffd33c9230430e780caea6a569dea2f48604bafe1d0b2e1d6828410010e5d0b096bd95f5b9cb470ef3857d7e23 WHIRLPOOL 5b5e9a21739bf944fd8f1f6848fa5bd45a54ed723a7cc6764321806903aa8ab2fb02980be9ae4ee16fe65ed91d2f07214a07c4095c2dd56b939f42b3fb6e7dd0
+DIST ipywidgets-7.0.0.tar.gz 1006851 SHA256 63e454202f72796044e99846881c33767c47fa050735dc1f927657b9cd2b7fcd SHA512 39219478c12f26a2bab0e975b6fb53a7f9ee92b10fa05bd885b21c7c981a4402ad65f497223a4a2c30a7d6d18bb56bec715a20659926075f2e3730e72022ade6 WHIRLPOOL 5160e2cb712318b736b44e6df38603be0a3e1424a5abf3efbea93b266300f5dbaa869cad6ec737030611453d8a9c3fcd75a179e1c9762620187e4d0eb9a99cab
+EBUILD ipywidgets-4.1.1.ebuild 764 SHA256 dc7971bf1c7234e4b6486154af67daad155cafd4d6e0e7f617eb4c6a01d5191f SHA512 e03eef73caef4db4cc69efa9df2668e8f6da55c868f2705a5fa3b83f8603c75adb42faf5da2e78a18b5a80399e299ddcf5d19a904006a3144c62302294c7cf2e WHIRLPOOL 555dd16acaed033f7f6f821f7dc07608aaf4203e8ede6fb3c6c0b8d25642b4b855efd12bb6eef6c6124099d1f24135683fa7f08d250c8a97f7a43bafc19d8582
+EBUILD ipywidgets-5.1.5.ebuild 837 SHA256 6ddebd5bfbc6079ed86f4cf6c9b56d8272dde4c00ae77dfb0ef6f3826ff2bbac SHA512 a4d2efd70c2f2aef3958b320cc6fb916a3da431449a95868aa84f6e98b361babe92e8c9a35f642e337fde5af66e66ee61489682c22ae9ba5f6d20a0cf84d492e WHIRLPOOL ce3077db90dc6d49fdce5359225a5362b5af6613183c4a5898d847210f79efdfb78bfea6216adf7264885a82b40c0bbbec239522ffc886793f7d161f9a687355
+EBUILD ipywidgets-5.2.2.ebuild 837 SHA256 6ddebd5bfbc6079ed86f4cf6c9b56d8272dde4c00ae77dfb0ef6f3826ff2bbac SHA512 a4d2efd70c2f2aef3958b320cc6fb916a3da431449a95868aa84f6e98b361babe92e8c9a35f642e337fde5af66e66ee61489682c22ae9ba5f6d20a0cf84d492e WHIRLPOOL ce3077db90dc6d49fdce5359225a5362b5af6613183c4a5898d847210f79efdfb78bfea6216adf7264885a82b40c0bbbec239522ffc886793f7d161f9a687355
+EBUILD ipywidgets-6.0.0.ebuild 840 SHA256 bc7af5e8389f8133b9a6dfbdb58b4574d69187502714e07909edb7a11527d9b3 SHA512 58e584c08d51b1a339915c1c36d7db590e233aad5891426d7fe4b3f2ec838cc95d4649c7844d70ad8d61eb50e60532a8516321ea9166739a7a5031d56a7b4fec WHIRLPOOL a069dd61b7fb6e7ea7a1dfeb6a5177941a42fb583d6854a179f12bdd040719fc67b3dffabad6e1680ff9045e1e2d9ca61254b50f70c9e751fde9654b6caebede
+EBUILD ipywidgets-7.0.0.ebuild 924 SHA256 d356bd77ca606fa7686a7efb8438c9818e8329e4ffcf5ce5cbca2f4d759ac107 SHA512 fc48a4dfeaa6855050e8efd0c9a2f94980157bd656919da55f957928df27eeae7d48593feed1af49135277d3fad772eb3f36c38a6ed1619804eb513d993dcd44 WHIRLPOOL 831eb9bfb1bcba27f457b3419468f28f8fa94f86553fd395b4c877ac8b1489702ccaa5c173116d449a776d6d617118f4e308ba46c54abd66bb0f606d15825ed4
+MISC ChangeLog 1790 SHA256 e993acf58edae9ea32ac7a365dbce8ff3b6a511b1196070df329de568fdbed5c SHA512 8cf6f0bedcddadf4cd08ea3a7674004a10f2f197f02e15305f7b2d46e2d5a417541d78bc655d2735bcbf678b54fa8d4b2e5e624aed7543893e1ad7cebd520b2e WHIRLPOOL 9845b16fbe482287c18ae637e61d33614432575732e6c9a44ac6eabd759c78e7a7fe5c432f895fe7d96cdd5b8b35bdacbdabd828fa39663d869b9ca18d2f9391
+MISC metadata.xml 520 SHA256 d2ca506aa05bd7168c995b211e3bda5b1d45e8aaa6f9918d10da8719bdc71581 SHA512 2072af0fb3f92af2e73edc7d2e69b9773325ce5c1bb8046496fbeb4908789ad2896126c78c5bbccc475e57cd78385ea15c03e4c4318325912cb23babff45b10c WHIRLPOOL 176b8bf6229880597ee51d1bbfbb1b8fa26f405f48089091021e8ebcf918452ae0f38036a95073e118b6fa7bc41a68a3b8bcfb3383ea22127c5cb776791a73c7
diff --git a/dev-python/ipywidgets/ipywidgets-4.1.1.ebuild b/dev-python/ipywidgets/ipywidgets-4.1.1.ebuild
new file mode 100644
index 000000000000..76aa4535a9be
--- /dev/null
+++ b/dev-python/ipywidgets/ipywidgets-4.1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	"
+
+python_test() {
+	nosetests --with-coverage --cover-package=ipywidgets ipywidgets || die
+}
diff --git a/dev-python/ipywidgets/ipywidgets-5.1.5.ebuild b/dev-python/ipywidgets/ipywidgets-5.1.5.ebuild
new file mode 100644
index 000000000000..18eeb648a67a
--- /dev/null
+++ b/dev-python/ipywidgets/ipywidgets-5.1.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/traitlets-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-4.2.2[${PYTHON_USEDEP}]
+	>=dev-python/widgetsnbextension-1.2.3[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	"
+
+python_test() {
+	nosetests --with-coverage --cover-package=ipywidgets ipywidgets || die
+}
diff --git a/dev-python/ipywidgets/ipywidgets-5.2.2.ebuild b/dev-python/ipywidgets/ipywidgets-5.2.2.ebuild
new file mode 100644
index 000000000000..18eeb648a67a
--- /dev/null
+++ b/dev-python/ipywidgets/ipywidgets-5.2.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/traitlets-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-4.2.2[${PYTHON_USEDEP}]
+	>=dev-python/widgetsnbextension-1.2.3[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	"
+
+python_test() {
+	nosetests --with-coverage --cover-package=ipywidgets ipywidgets || die
+}
diff --git a/dev-python/ipywidgets/ipywidgets-6.0.0.ebuild b/dev-python/ipywidgets/ipywidgets-6.0.0.ebuild
new file mode 100644
index 000000000000..628a80be05ea
--- /dev/null
+++ b/dev-python/ipywidgets/ipywidgets-6.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/widgetsnbextension-2.0.0[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	"
+
+python_test() {
+	nosetests --with-coverage --cover-package=ipywidgets ipywidgets || die
+}
diff --git a/dev-python/ipywidgets/ipywidgets-7.0.0.ebuild b/dev-python/ipywidgets/ipywidgets-7.0.0.ebuild
new file mode 100644
index 000000000000..fa7ecc286f34
--- /dev/null
+++ b/dev-python/ipywidgets/ipywidgets-7.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="https://ipywidgets.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/widgetsnbextension-3.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --with-coverage --cover-package=ipywidgets ipywidgets || die
+}
diff --git a/dev-python/ipywidgets/metadata.xml b/dev-python/ipywidgets/metadata.xml
new file mode 100644
index 000000000000..26b1e54ce025
--- /dev/null
+++ b/dev-python/ipywidgets/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    Interactive HTML widgets for Jupyter notebooks and the IPython kernel.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">ipywidgets</remote-id>
+    <remote-id type="github">jupyter-widgets/ipywidgets</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
new file mode 100644
index 000000000000..f854a4884a31
--- /dev/null
+++ b/dev-python/irc/Manifest
@@ -0,0 +1,9 @@
+DIST irc-11.0.1.zip 120409 SHA256 25d818003780fd6d62e93d3ff32580e74c0e527c6290ae14b47af50b58339233 SHA512 fca2fe653d921c9ec65dfb2b072c16658d88d4a22ae91568b1eaf722a90179920808db157f587afe6de0055af3a04a528eb9022122e539150e5635f05b58f466 WHIRLPOOL dd9b9e8624e6bd86d27fead1f3006a2b80832d236ad21f50c147c07a27b2cc4933d68efd951dece44398dbc0299b73ba7a98e4eff2061d0e3a8a01833518113b
+DIST irc-15.0.2.tar.gz 81790 SHA256 23893c1fb21826fd9b3edf6ef49b0e1080c846761900ab06b4f1980f5cb8e2e3 SHA512 5f6daa539a9ae665b0153d97ab11f246040963d9109d84efde0a92cbe200c2a6e8126120eee11b4bc92d65d415946627116b62cde07bebeb68a7105af40f98ab WHIRLPOOL 1f28b3e343328a2c78af406944fcfac4be25a61834e1807d7a1636834a2ea9fa9775856380e8ea75df7917913756a4b971e76ab47a06e0379304dfd2e5d81e61
+DIST irc-15.0.6.tar.gz 81996 SHA256 986706eb76da86f14ebd69f7955a2ae132fe45dde60e67ddd9c6c50b7dc914ee SHA512 48240eb496a3c88310f02cf092b8e19e4aa8d8dc165a9a8a39c313490a69ecc29ac67db297436df5e86e7253e2481bd19bc0429ea9cc359089a5cd6179125c0f WHIRLPOOL 33dbe34c49027d3dad6d1b3b322713185ebabb1607dde8a4f53ab9f48294dd5d592cffb98e66572d33e0e68a5a394eab2c2d3a5021af2ffa7b761792774bab5f
+EBUILD irc-11.0.1.ebuild 1058 SHA256 57e6f7719d5a3ca29847510ccda943df51c1802a62abbeaaea665f9e3b312ff9 SHA512 3fecbcd9053445d79aa566748ae22bd83583e3d58cd2ef45ededa958dbdfa4033ef2ca8296e206400702f8737ec58862360e12276566c36a6a312d2f1a53f01c WHIRLPOOL ab9f597e412dac442e16b87125b5bb1194f05af989549b121a448b1e8ec6b543f44d04650061d33678667ce3514158ad60bb43d49f842ebeae876a2fb0aa7993
+EBUILD irc-15.0.2.ebuild 1585 SHA256 8b10925f59ea14c98633c8f4b3db67e3489d797bb13594118a3329b195b773ca SHA512 010c5830c9717f23088867e090647295f73cdcbb01642d67ca936cc08595a53bb155e44b1f120821010dc4422f8ada908e2a7f66e3f4853604a8640758015443 WHIRLPOOL 4a7a39cafdbb6443d078ad9e40acb3bf7d86eeafeb468bfe73647a25ad5ca7db9b8454c3e29981bdeaab7ebe35be917e6f678a957233841085507dfd219bbffb
+EBUILD irc-15.0.6.ebuild 1597 SHA256 655958533c07c373692e31e8c5f5e8b266975a78fbd16942e16d251fb890a50b SHA512 df65de77ef9fdb42bfd560212e5c9e86fb1d6febb58e4691a1a8ac3392b424709e81614b22c301f775b40e7682cb938012f4d98298ffad6e1dd62c1600af9ecb WHIRLPOOL bb4bd874b63fa5d6f3c747f615edb15d08c0e66b5fcc0b34c757a96164d31608805412daf7d140ad2368a44291b7cd08c3f22de4bbe5c2f5047ee328c297c17e
+MISC ChangeLog 5958 SHA256 34214b36da2ad6979b1602c5393e7ea5489980bb6770745998b513b62f1e607d SHA512 b5a6479f697328f18596936163d370bd686f8b2020b3085a3d2076b0175481eaec48ed71cce0c54b2f3f03814dd1691b7ba9dfa388b129b52cb506e573665fe6 WHIRLPOOL 5fba93dc262fe2020afca56aac6dd7f83495d8eb6daa6305444eb8ce73c72e2d50e791e3963ffe2679000aa6260a32129b6615932f7707cfdacaba4c8108cdb9
+MISC ChangeLog-2015 4853 SHA256 e0a6e9e62d7cbcb58c82332e7a1784f79a8225674273fd8f522269e387a005a7 SHA512 f1f1c7bbb13686353cb8361caff6419a22b3b97482b6607f8063b33376a58333fdb8e1c15b271189719e6c1f063eb7076a445881e2d4b852249a70803dc72461 WHIRLPOOL 837f08859e2c680c39eed1142b24dd4f4e308b70e804b9bc2c36c340f45c1487ec5f035aebaa9a00feb1bd8c15255b6f20cbf3085d5835be6b9bc4c7336eb7cc
+MISC metadata.xml 814 SHA256 66667bb653290fcb226a7311d2324c8b1cf9c26dae3a25d13dd6c5cb7f9ba187 SHA512 97c3129365cbe22cf31f5ea6147163b21da942f65838330d608ddbc41a516f2600e0bc00e7fef18ee53f7a51cc1682650684283a8abf45a4ae28972939783e05 WHIRLPOOL 303211aa59397bede6787aa1d4f693b61fbefc52334f811a47406cb8a67bc03368c0fb8269b7246cc14509db8a75cea5a45ea5ce98d3665a2f500267104debfd
diff --git a/dev-python/irc/irc-11.0.1.ebuild b/dev-python/irc/irc-11.0.1.ebuild
new file mode 100644
index 000000000000..29fbdd70e186
--- /dev/null
+++ b/dev-python/irc/irc-11.0.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="IRC client framework written in Python"
+HOMEPAGE="https://github.com/jaraco/irc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples test"
+
+RDEPEND="
+	!>=dev-python/python-irclib-3.2.2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jaraco-utils[${PYTHON_USEDEP}]"
+
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/hgtools-5[${PYTHON_USEDEP}]
+	dev-python/pytest-runner[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
+
+# A doc folder is present however it appears to be used for doctests
+
+python_test() {
+	py.test irc/tests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( scripts/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/irc/irc-15.0.2.ebuild b/dev-python/irc/irc-15.0.2.ebuild
new file mode 100644
index 000000000000..c58d4a5e56c9
--- /dev/null
+++ b/dev-python/irc/irc-15.0.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="IRC client framework written in Python"
+HOMEPAGE="https://github.com/jaraco/irc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	dev-python/jaraco-stream[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-itertools-1.8[${PYTHON_USEDEP}]
+	dev-python/jaraco-logging[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-functools-1.5[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/tempora-1.6[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	py.test || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		insinto "/usr/share/doc/${PF}"
+		docompress -x "/usr/share/doc/${PF}/scripts"
+		doins -r scripts
+	fi
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/irc/irc-15.0.6.ebuild b/dev-python/irc/irc-15.0.6.ebuild
new file mode 100644
index 000000000000..b84a0821d677
--- /dev/null
+++ b/dev-python/irc/irc-15.0.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="IRC client framework written in Python"
+HOMEPAGE="https://github.com/jaraco/irc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-functools-1.5[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-itertools-1.8[${PYTHON_USEDEP}]
+	dev-python/jaraco-logging[${PYTHON_USEDEP}]
+	dev-python/jaraco-stream[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/tempora-1.6[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build . _build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	py.test || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		insinto "/usr/share/doc/${PF}"
+		docompress -x "/usr/share/doc/${PF}/scripts"
+		doins -r scripts
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/irc/metadata.xml b/dev-python/irc/metadata.xml
new file mode 100644
index 000000000000..f4d5c71852d1
--- /dev/null
+++ b/dev-python/irc/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		This project includes an event-driven IRC client framework written in Python,
+		as well as an object-oriented wrapper class and some example programs.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">irc</remote-id>
+		<remote-id type="github">jaraco/irc</remote-id>
+		<bugs-to>https://github.com/jaraco/irc/issues</bugs-to>
+		<changelog>https://github.com/jaraco/irc/blob/master/CHANGES.rst</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/irman-python/Manifest b/dev-python/irman-python/Manifest
new file mode 100644
index 000000000000..5dcfcc806532
--- /dev/null
+++ b/dev-python/irman-python/Manifest
@@ -0,0 +1,5 @@
+DIST irman-python-0.1.tar.gz 16390 SHA256 404d9fb4934957c3052b28b0bbe3b8f2f5c38134e71eeeb7ffa9867c0b4cb6bb SHA512 7e0c80252c471419400ca80215c64f84ee89559496f5d118f860ffe9eb7078c029d8c5b5f75b55ccb6d21917bc91314d6e8ef3523d260172c22dc0beb13c794c WHIRLPOOL 1884119fcd8d6b4f3b8f725346bebbeb3cacc6f7ee0a48540f833de3a12de782f81ea5f4d41cf441f3507ef5811c35b23d30b565d16447dd77ee5ab2af9332b3
+EBUILD irman-python-0.1-r1.ebuild 475 SHA256 117cbd48e3145c831551a30a14a98b64cae4d3153ba40d4734d7255da716ff75 SHA512 4da9c32c5a87b6a7842106466448d61320101d648cc4aff2664516bdc60615097f55f120584891c8071f1b19e7247aefa97ed097d0b063b785dce8b9359f9312 WHIRLPOOL fe2b174022e43bf82fcfaef51894d7dc471d4e14475a6d2d8afe4d97516f4b691640e5a8d4c1a253f5d7b9f4408b53f7bea127a7d209ac2c4b5eae907f45bd01
+MISC ChangeLog 2446 SHA256 30b0f92e91a7b7ef6eebed6cd70d82713115f854de1098e3a4ba003bb52c5679 SHA512 fc4322b06fb59147e628f5ce493e8a5d6bdb2ea2ddd3330b86fe0f952e44b607e5a9f5ae0d8642f7f5c4237da73d43e24a215c590d0402dd2dc9f718cdbfd478 WHIRLPOOL 998f80c28abb514748d38929fe311a44003c13d797c15b04f7ec277acef13deb8463da4620229f6bbbdbbe9d8959091252cbd656aad3bd41a6587de48ab7a095
+MISC ChangeLog-2015 2153 SHA256 189ff86d07767ce8ca781f7f05684cd17d5c1bfde9eaf46453c29585898af930 SHA512 ef63852695ff474d1a64f3a7f14b3c35f6b42ff3333347b54c134da58bd1e1b7faaa08843cf15071c7ce96b62f96274dd95b66476821be323e95e3e247128153 WHIRLPOOL d519b2aa4a7a185ae6b1aea72b6a9c46315f592b6f3f5271698f1aa1cbaa0605a6d844216f704e9e4b194328a7f635d0f2c1d9295c02761c95d817d04c053f7a
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/irman-python/irman-python-0.1-r1.ebuild b/dev-python/irman-python/irman-python-0.1-r1.ebuild
new file mode 100644
index 000000000000..e14874be68d2
--- /dev/null
+++ b/dev-python/irman-python/irman-python-0.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A minimal set of Python bindings for libirman"
+HOMEPAGE="http://bluweb.com/chouser/proj/irman-python/"
+SRC_URI="http://bluweb.com/chouser/proj/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="media-libs/libirman"
+RDEPEND="${DEPEND}"
+DOCS=( README test_name.py )
diff --git a/dev-python/irman-python/metadata.xml b/dev-python/irman-python/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/irman-python/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/iso3166/Manifest b/dev-python/iso3166/Manifest
new file mode 100644
index 000000000000..cdc2a9fbd689
--- /dev/null
+++ b/dev-python/iso3166/Manifest
@@ -0,0 +1,3 @@
+DIST iso3166-0.8.tar.gz 8930 SHA256 fbeb17bed90d15b1f6d6794aa2ea458e5e273a1d29b6f4939423c97640e14933 SHA512 ccb49bbdb1a2751816b095141d4bf566761df4d3857923d3444d5e12b915c4d92e5aefba16c4680a4876862efdfb6c928b50f5ca675342d5952c1b446012a101 WHIRLPOOL fc9c3a2aff93f818f2a4ff55d426dc30bb9c0ff12c3a0c42241b54ea88aca8ab50f378b217b90bcc3335f56161b1b8d5d34089ff6aae9100f1074a171e122bc4
+EBUILD iso3166-0.8.ebuild 510 SHA256 cfed3972c134f152d47d6b1898c9d9bacd969fd242252b1a99f6c18a4ad91a09 SHA512 216965027922f480eb7d6ea684e747e73b558f6ea3b51a1b3b1f74e628105c97029d18d875b2c19fb52e83953b84604d32b185d65934eec90bd4dd5c66aa5a60 WHIRLPOOL 0c4444e918e019326fbc10bfa52ae94787186d86bad9dde55ed53d8db14f5acd076adfb36a66fb17c7c0ea87636cc665be029222e290a5e6bbfb8f47eed72774
+MISC metadata.xml 376 SHA256 be9edf1f3db9c9160182c4221f0b9f41fe8d1dd071d13c662d5e5614af76922b SHA512 2c490fa431919280ca2c84b5ec638fd49657c9ff8f79ef131df0c5d04e65b60a8adff3692723850b7a048b6cb2398a5c87c06048c69919d2bcac43ba7af407db WHIRLPOOL 869e4f3de43f165f261d2a130b4e92e9c916a19c958abd31158e621203e87929679adf6bb23104bea2b27008fe076b79eb39e6604459eb8ced8f89ba0446ca79
diff --git a/dev-python/iso3166/iso3166-0.8.ebuild b/dev-python/iso3166/iso3166-0.8.ebuild
new file mode 100644
index 000000000000..59573ef2f09a
--- /dev/null
+++ b/dev-python/iso3166/iso3166-0.8.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Self-contained ISO 3166-1 country definitions."
+HOMEPAGE="https://pypi.python.org/pypi/iso3166 https://github.com/deactivated/python-iso3166"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/iso3166/metadata.xml b/dev-python/iso3166/metadata.xml
new file mode 100644
index 000000000000..3db062ead97c
--- /dev/null
+++ b/dev-python/iso3166/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">iso3166</remote-id>
+		<remote-id type="github">deactivated/python-iso3166</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/iso8601/Manifest b/dev-python/iso8601/Manifest
new file mode 100644
index 000000000000..9d2a2accfb56
--- /dev/null
+++ b/dev-python/iso8601/Manifest
@@ -0,0 +1,9 @@
+DIST iso8601-0.1.10.tar.gz 8405 SHA256 e712ff3a18604833f5073e836aad795b21170b19bbef70947c441ed89d0ac0e1 SHA512 5a3635b3daf6c5ccfd0dfdf47bcd60a0841c06137b3ee334ec024909fa24c8fe4a1da1fa253e0a5dfaca173d4b10dfd994b83a031b2a0385406ca92987098168 WHIRLPOOL dc491a7b1b22e9cdf6b49b92c9378273d887a9a7760a501abb08931ffec0e07368ce378a69a2e91b95bb068b56a6d4f60e77e57079111694e05bc080eddb6a1f
+DIST iso8601-0.1.11.tar.gz 8725 SHA256 e8fb52f78880ae063336c94eb5b87b181e6a0cc33a6c008511bac9a6e980ef30 SHA512 19f5443aae4e3f93b0521a7215318c2833bcca5740ea05f9a6d5771bff2aaeb5626ba26e5ba64efae135bf9420a1810854969dad845aaf67089d5e6898a254a0 WHIRLPOOL 99f80758f28b80d45ff27c31d431546262a011473c714248562259811de143133a1eee34fb835993d612af1419960b3692c9f3cb9824a0c9c440d1e9a54bc9de
+DIST iso8601-0.1.12.tar.gz 8868 SHA256 49c4b20e1f38aa5cf109ddcd39647ac419f928512c869dc01d5c7098eddede82 SHA512 d64f3a83fd3a678446e17fb35265c0487491a53a2ec306fe2332c59e9e471bfe8580b3280da7ae13664f07f7f29edb0347196351ab698849ccaefb52d6ce6613 WHIRLPOOL 1ca565ff9cf71aee523d0a7d85ac122c8a3fc3ababb8f20067cb49b31aa60670ab5b976dfbca81c47040663636256d270e054b89709e1457ef6c566d4b32775c
+EBUILD iso8601-0.1.10.ebuild 795 SHA256 80499285826c1965b61c9734132942b807a93714e036fafc312c51325a51009c SHA512 f0d12d943d0dcca4149d05de8f13aff67858d0feeea5afaf96717a76f79e70aeb53cea2f28dfc3b97af5277b356ba971c81bd19c2dce793c3323abdc7423d62b WHIRLPOOL 25d98089114d01875d3caa7bf24ec0af832bd201e292ae48103117e2adf15c6e4a7c0896fb4418b3022fd99d4c630438f1bc6a950278ac0ebdb926937ccd8046
+EBUILD iso8601-0.1.11.ebuild 806 SHA256 f88c83a0b34610781319b1e121b0c0a053a858ec6c9bc9f666bbf5d925bcb3b8 SHA512 e01922149d924eab38cb13430cc65b1e4811aac0fe7f156bf95f04ee9d320dbdd556ff57020f0383593c631391b3aa9f206041b0f63fa1fbdc1374742ced5280 WHIRLPOOL 2e22d40a1999517fdcd838e770a48c56a6d17d2d2645c78bf7107a261f428878092cc40efe878336806c1616bd108267f91e8f537ac108a8dbd43018fe445843
+EBUILD iso8601-0.1.12.ebuild 808 SHA256 5681bf713e54bb4dca3eed4e16e8f1c0846f5af0fcd21cf6e0c0d2a11187a49f SHA512 a2a24a000fb114e3591b395e56ccc974d4503f701d274a4e301d134070c83f5c246fd080f817849ccf7628010fcc921aca802474ab51bcb04782eb9f5fee43f3 WHIRLPOOL 18b5fdc378f59872b54b5f2113c4beba1e48326173d6943cfb6f181c357b4f36d00f8d0a367ecc6db4b8aeb252891e654d891497359c15ce233353f4e64d1a16
+MISC ChangeLog 3689 SHA256 09281cf7629bb6724055efa08cbfe278a1e6bcf056d659c5bdba2e122b258450 SHA512 26603ae4706b67165f3b3c40a8203dec1f2ea8c50f49578e787e47510f39ee487b5cdb860b9082ebf60d2399a486805ff44782d4aab1c458fa5c7967547754a7 WHIRLPOOL e93b01f2915dd4f25017d840f2fde9c2b66da792ca47bd9b7056dbfb1fd46d2ecbbf28515b4d5a25c0445dfbf0486da14aa195de802513736b93c2b894b04513
+MISC ChangeLog-2015 4131 SHA256 b400421815ce3d0c10bb519b8eead8b69884628c56fc28da6d734d79f52b0231 SHA512 4066ca666d09b9323fc240c32d9f82f92db85bdd32c9eaa9efbb4e143890629d54250d324e2ad4ef0681400c8097d5309793d76856fc702ea84b0e1d61092590 WHIRLPOOL 6b4f36d078b8a49a34a19974277673cff65c270c4a71f80b643eace5527f306eb29e5e56314eb06271599bf2dd91c25329a110bf23d94818b20f9ad6fc6a5b63
+MISC metadata.xml 310 SHA256 35218fb76d7c7a6240581fdba68bf7c27d55907fa1a81ae0aa76b90ef8660065 SHA512 1676ac1d5e3486d07200637f9160cc54f6ea25174a12d53dab6300a366d71a918baa9c464e6e00a1f68d2408b1ebc179436a5aef0ba022a9fd03f4f5f073870e WHIRLPOOL 7b8a0306a12eeca76c7a4b0cec79a46fea26b73caf7d4b85472938016d6bc5568a2e09e971f1b2b8a098bdaaa8faa5941f9be95686f0ccc54a628bf43f30bf80
diff --git a/dev-python/iso8601/iso8601-0.1.10.ebuild b/dev-python/iso8601/iso8601-0.1.10.ebuild
new file mode 100644
index 000000000000..734d93ba8da5
--- /dev/null
+++ b/dev-python/iso8601/iso8601-0.1.10.ebuild
@@ -0,0 +1,24 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple module to parse ISO 8601 dates"
+HOMEPAGE="https://code.google.com/p/pyiso8601/ https://pypi.python.org/pypi/iso8601"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )"
+
+python_test() {
+	"${PYTHON}" -m pytest --verbose ${PN} || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/iso8601/iso8601-0.1.11.ebuild b/dev-python/iso8601/iso8601-0.1.11.ebuild
new file mode 100644
index 000000000000..aec1dd38db8e
--- /dev/null
+++ b/dev-python/iso8601/iso8601-0.1.11.ebuild
@@ -0,0 +1,24 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple module to parse ISO 8601 dates"
+HOMEPAGE="https://code.google.com/p/pyiso8601/ https://pypi.python.org/pypi/iso8601"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )"
+
+python_test() {
+	"${PYTHON}" -m pytest --verbose ${PN} || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/iso8601/iso8601-0.1.12.ebuild b/dev-python/iso8601/iso8601-0.1.12.ebuild
new file mode 100644
index 000000000000..b5793936c2f0
--- /dev/null
+++ b/dev-python/iso8601/iso8601-0.1.12.ebuild
@@ -0,0 +1,24 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple module to parse ISO 8601 dates"
+HOMEPAGE="https://code.google.com/p/pyiso8601/ https://pypi.python.org/pypi/iso8601"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )"
+
+python_test() {
+	"${PYTHON}" -m pytest --verbose ${PN} || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/iso8601/metadata.xml b/dev-python/iso8601/metadata.xml
new file mode 100644
index 000000000000..95d315c9a408
--- /dev/null
+++ b/dev-python/iso8601/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">iso8601</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/iso_639/Manifest b/dev-python/iso_639/Manifest
new file mode 100644
index 000000000000..24839cf00967
--- /dev/null
+++ b/dev-python/iso_639/Manifest
@@ -0,0 +1,3 @@
+DIST iso-639-0.4.5.tar.gz 167421 SHA256 dc9cd4b880b898d774c47fe9775167404af8a85dd889d58f9008035109acce49 SHA512 5b27cbcd39173f03d6d54e1ecddf879b630e985c549d6084dab29134d30bcd0052f902a2c8ca5a0db891c197deb1a00f1acda880cf728e7589f0471c42982f73 WHIRLPOOL da3aed44560571ca7cba10f1c2a25df32dc681da4d60cf3ec7716b1018d00937e3369ba6c69692cd082b3f0bbd03dc3feab0f3a47fa3f046504fcbfeb8d2d7c3
+EBUILD iso_639-0.4.5.ebuild 558 SHA256 180cc48980aa9b4c69646c617360dc70c6745f64fa8594fb34af99b520dd3113 SHA512 f1ec53ce5f8fdd0b79fc88e439f5a80ada7ed70feb4b9e8d3a2edeaf7fa0f1b55d4fe4e303f66948e07ce5bfc4cac8b6b452b09068907dbdae67167286836f99 WHIRLPOOL b24c34f84b2955587c6eaff7ce7c588a7cb044307560ee3934daeda63bc76dc027dd0e481461816abec8c5d84fb5ef99fb318f3b4d688546c2c4de6d39113b09
+MISC metadata.xml 363 SHA256 362556b567ea236a9ab42729d4ff454ad1edfa7a7acfaa3c5afde17e9bb1bb37 SHA512 a01ca49ce0b5ca24d9edc382cb561b32b4e8ed3114e21700c477a3ac3fece85345244e7781bd11fa74fd3be2f7efe65126a1792b55c946035d9888ebd0bdf23c WHIRLPOOL c29cebadef43dbc98aedb1aebd091c3a00700a91c85cf9912feb5b1c207e951380a072123a46e24870132fcac802ba118c47dde2fe6c9ef24b23b9a00871a52e
diff --git a/dev-python/iso_639/iso_639-0.4.5.ebuild b/dev-python/iso_639/iso_639-0.4.5.ebuild
new file mode 100644
index 000000000000..4205e19323fd
--- /dev/null
+++ b/dev-python/iso_639/iso_639-0.4.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+MY_PN="iso-639"
+MY_P="${MY_PN}-${PV}"
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for ISO 639 standard"
+HOMEPAGE="https://pypi.python.org/pypi/iso-639 https://github.com/noumar/iso639"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/iso_639/metadata.xml b/dev-python/iso_639/metadata.xml
new file mode 100644
index 000000000000..3db7f9b3042f
--- /dev/null
+++ b/dev-python/iso_639/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">iso-639</remote-id>
+		<remote-id type="github">noumar/iso639</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/isodate/Manifest b/dev-python/isodate/Manifest
new file mode 100644
index 000000000000..b89034d51a30
--- /dev/null
+++ b/dev-python/isodate/Manifest
@@ -0,0 +1,5 @@
+DIST isodate-0.5.4.tar.gz 27691 SHA256 42105c41d037246dc1987e36d96f3752ffd5c0c24834dd12e4fdbe1e79544e31 SHA512 ef5fd27ffa61ad10abf499723c452fd8fd6c2f08a0d5aca6ead88857e5d159f50a3d01769b9fe0aed59a57b0f89a70b359135b0d7c5e6a75d023daa824e5d80a WHIRLPOOL 3f26621513740bb6c4bd42a97d6cb56d631ce8f48f056d679edc1e1c0b57b1349a69aecd79704efe2d7f9195d54ec704e1f96b3da90dea52704999893fe2e3d3
+EBUILD isodate-0.5.4.ebuild 633 SHA256 b53d1df1c109a7187b4c727399e61a40b52398e857ac07e00c2e0fc22611bfff SHA512 314d9415b495594e6070ce9622b814f53daff4a726ad5d98c2ebfdf09610dc22e96b362f252889ebf4d4defcb55993d7d38b3667ffe36fc6d33282eb6288d7c3 WHIRLPOOL 59858fd98951c66703177176ab7942387878e84b409adb0494eaedf2d7b93e707790a2eaab216367ae8966a6467d56e879ad54540640fa008f2dee2b79f91c71
+MISC ChangeLog 3143 SHA256 466fbae75723d72508fad881535759788cc973c6c86741c73d7f517ff55e2aa6 SHA512 ddd1c32eedc490f22a29b24f0c4984ffb38c70417ff5b4d5132651560f9c2109fee1d4fb826ed945df309d1551a4affd5e2492b330518bfe738f38a9869ecab5 WHIRLPOOL 4fd4071c1fefcd967b18daff5c3301bb0cc9e750b8156a77aafe12282b85b61cd0689ea0b735dcf3ee63921d162b7705bf5e32408ec8a4f9dc73784b37829077
+MISC ChangeLog-2015 4703 SHA256 d9ae3ec92f64891194f0618835b00ebe0bc49c00de6171eeef5ee9c6a32a90dc SHA512 6e6a872028a6d94a0f6a68e99e2949c64f8d7c4d1299f45cd96ad6de4f48789731d8f29b1c127f589fbb3663aa44de87b50f1086e0b280446c7549ca9602068d WHIRLPOOL a3a2f475e65a8eb08d89d45c2cf4bc17355da0cc77519918f4710c5e653c1d96b6d78dbaa077e78b6eab7bc6ceab42c7478e5708a9fb7e3ab2274cdf45d6bfbb
+MISC metadata.xml 1120 SHA256 3faf13ce75c2382a10896e3059db6ba0d31ec867cd71c06ed889e93fa5db9b9f SHA512 c9213c9a90a27f29d51584edc4537055a82962f9153cbd68fcf8868409be2af625f754c1b8c9e1f5d00ddf6696809a118fa33a742f5e241ba6a4141937f60dce WHIRLPOOL fc633d1e0f7046485fb619a54377dc77e90225d9380fc4abc32f8a5bf1901acaa511d392cd57a2d9bd2bef2792c31ce8c506d8e11e7c51ebceca772e7e6d6c61
diff --git a/dev-python/isodate/isodate-0.5.4.ebuild b/dev-python/isodate/isodate-0.5.4.ebuild
new file mode 100644
index 000000000000..333e8597362a
--- /dev/null
+++ b/dev-python/isodate/isodate-0.5.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="ISO 8601 date/time/duration parser and formatter"
+HOMEPAGE="https://pypi.python.org/pypi/isodate"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	${EPYTHON} -m unittest discover -v -s "${BUILD_DIR}/lib" || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/isodate/metadata.xml b/dev-python/isodate/metadata.xml
new file mode 100644
index 000000000000..40a9ac204fa7
--- /dev/null
+++ b/dev-python/isodate/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+    This module implements ISO 8601 date, time and duration
+    parsing. The implementation follows ISO8601:2004 standard, and
+    implements only date/time representations mentioned in the standard. If
+    something is not mentioned there, then it is treated as non existent,
+    and not as an allowed option.
+    As this module maps ISO 8601 dates/times to standard Python data types,
+    like date, time, datetime and timedelta, it is not possible to convert
+    all possible ISO 8601 dates/times. For instance, dates before 0001-01-01
+    are not allowed by the Python date and datetime classes. Additionally
+    fractional seconds are limited to microseconds. That means if the parser
+    finds for instance nanoseconds it will round it to microseconds.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">isodate</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
new file mode 100644
index 000000000000..a5884f0066e1
--- /dev/null
+++ b/dev-python/isort/Manifest
@@ -0,0 +1,3 @@
+DIST isort-4.2.5.tar.gz 36361 SHA256 56b20044f43cf6e6783fe95d054e754acca52dd43fbe9277c1bdff835537ea5c SHA512 ddc8e859bb421e4179315d74896958c8279394d42a75494db5dc22c58422994aa249b63c03645626a021ccf9142941bde51ad400256ab1c6be29da8110375f40 WHIRLPOOL fb94f6a82329a5d7715762590995e3ffe1f7b9fd31f81ff898c87a65c47d6371b96a29a57f6a42ecc05b1795ca59239eacd0f273e3e5ade85d621160bcffdcdd
+EBUILD isort-4.2.5.ebuild 478 SHA256 41a05f226abd3189b9ef344998b4d6af02dc20209b8e7b6533cb078a13698080 SHA512 76a938b88677f4819c11c98860223d5b9684f0d553be95b8d5ead73537dc09189ee979bc3f83f09b81373ea60542365252fd7159b7f32ee46516933c0f4126a4 WHIRLPOOL 2eb4d637e303cd565daec6866c1f65d89078950daf9b36cea20cfb5f8fa050190d027842b1acb80437af7ce04ca7f1687cb29bd950c9fa7adffdf2439a938165
+MISC metadata.xml 395 SHA256 2f0adf35775e6d846b5e130aa371494daa7067ca46edc947b9dc35f6b3032ce1 SHA512 27076ca449e7effce88a4295218f20fcf89ba36ca0df51951f50d25b4f8b76945282136b6e972c0220567df3249c2c1fe2e956acfd36a5cf249401c88c721d4a WHIRLPOOL 022f838d5534321abe625dd15838b787bdf6bec1c21e3c8b83c43f18319e81a51daaff10c50b682e66615342a15c86bf77a37d98d8ecc17865dc77a7b4906313
diff --git a/dev-python/isort/isort-4.2.5.ebuild b/dev-python/isort/isort-4.2.5.ebuild
new file mode 100644
index 000000000000..42781932f934
--- /dev/null
+++ b/dev-python/isort/isort-4.2.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+inherit distutils-r1
+
+DESCRIPTION="A python utility/library to sort imports"
+HOMEPAGE="https://pypi.python.org/pypi/isort"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
diff --git a/dev-python/isort/metadata.xml b/dev-python/isort/metadata.xml
new file mode 100644
index 000000000000..27370316e81d
--- /dev/null
+++ b/dev-python/isort/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">isort</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/itsdangerous/Manifest b/dev-python/itsdangerous/Manifest
new file mode 100644
index 000000000000..24882293b39f
--- /dev/null
+++ b/dev-python/itsdangerous/Manifest
@@ -0,0 +1,5 @@
+DIST itsdangerous-0.24.tar.gz 46541 SHA256 cbb3fcf8d3e33df861709ecaf89d9e6629cff0a217bc2848f1b41cd30d360519 SHA512 2863b6e5fda178db59bd214c6d24d04422c1021bb41bf11598aba1cbc43053aff3bb1e0539940b5769de04b68c03e8bd01d728dcbfc4bd0ba05867688574a297 WHIRLPOOL 44338b9c489506b972c33bafa1437042c17f452e65095d3b7dc85bf1cbfa26fcc45b097a7e899ae5ccfa4e3727e9c0ea285e254f6318c74a61217da910a63a83
+EBUILD itsdangerous-0.24.ebuild 835 SHA256 b0f67e155aa7fc95143d8b3c4a7bfd4a1a1857acad60dfdbac5f090335f30d76 SHA512 9de4e630f1687bf6634402b104acced31953c4d65c764828dff096b5a320e4658890ff18f7dbb3bb7511c171638669fa34f66beb8e775d1e374257d124e0fa3f WHIRLPOOL 26ec7a3dc1fae45341fe34575783e6c5bd486bc91b4575c4ac61af60c0e5e0d8c56c210f32775efda7c19283c90d8c444861de11448b14d1eb3c3be4a0ea2abf
+MISC ChangeLog 3867 SHA256 866048812fdc20220cd973d4a37003c860fd3ea30fac48d4e2a8c008c933158f SHA512 f61da6fa8c4b6ba7b8b771d98429028094fd81d9eaf131fd31e8c0493eea466c86a8f2ce134edfdc0af91e4ecc30be202309d0adc3b949b6ced8c13808a29194 WHIRLPOOL 4011d93fd3eca49114d6e5b3967fe12ed38ba597d671a3cba78b4e25e4af500e12319ba43150ce1b18cc783867d7fa6a264010f63bc9bce89c3198d54ec14483
+MISC ChangeLog-2015 2744 SHA256 a02418921f94c09a3f17d098a64c482f0d697d73147c96d6ce5701d0442bef6a SHA512 0336d813761df20545236cb23c8a0d1e1c46934fb6878d102c31dd8deef31917dd785442d28958f07357ab96eaa337aa1964259ab9b7c137738a320e847be6b2 WHIRLPOOL 7d586eec93f46cfd2e9cf3c58e0b6253a876542015091093874e358ac8a2e448c618a4e12a8c8da883c89033c6f7ee553224ce9f152aec8927cb78e6102e45f4
+MISC metadata.xml 325 SHA256 f644ddd76b5f2fd74af27070d2c20be6414d6772a606a610e9a0a6dbdbc41f85 SHA512 ea6c9ac90af243fc0367615835740108e37ddb9547dd9f288572af097c978e11c3fb2a17398950fbf842e6d1a4fb0410a74e769ad7b0c103b2d9301497578e22 WHIRLPOOL e8c61a9be45893e00d39821970bb11c1ecfda2a2a087c67d7994da343d23417a6ce2cc965ef5a4f0008b82a814601d6929e36dbf6218acc105f9f7b421ffe4e3
diff --git a/dev-python/itsdangerous/itsdangerous-0.24.ebuild b/dev-python/itsdangerous/itsdangerous-0.24.ebuild
new file mode 100644
index 000000000000..16db17e95c4f
--- /dev/null
+++ b/dev-python/itsdangerous/itsdangerous-0.24.ebuild
@@ -0,0 +1,28 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Various helpers to pass trusted data to untrusted environments and back"
+HOMEPAGE="http://pythonhosted.org/itsdangerous/ https://pypi.python.org/pypi/itsdangerous"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+# Required for running tests.py
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	if python_is_python3; then
+		2to3 -f unicode -nw --no-diffs tests.py
+	fi
+	"${PYTHON}" tests.py || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/itsdangerous/metadata.xml b/dev-python/itsdangerous/metadata.xml
new file mode 100644
index 000000000000..60d737336602
--- /dev/null
+++ b/dev-python/itsdangerous/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">itsdangerous</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
new file mode 100644
index 000000000000..30a6750dccf8
--- /dev/null
+++ b/dev-python/jaraco-classes/Manifest
@@ -0,0 +1,6 @@
+DIST jaraco.classes-1.3.tar.gz 4095 SHA256 8d7333a8930efd10a934d5a1b5984f81f0c08e483c5d39a604660c9715c64522 SHA512 abd60444066b39894f21032004010eea9b3b56718eaadffa1c66fc7d66d281d34d0ae76445dc6174e0a07e0d4dfca97e181048a4eea47ee20dae1d902265c32a WHIRLPOOL 8992eedc077f7d03480c00384ef994770584cb9b3266f4f19f68e5f109fe14c8c70bd416a9a094bb42b0d97d4fd7c0b450636bc90c7a4e6b46d9653959ca84f3
+DIST jaraco.classes-1.4.tar.gz 5171 SHA256 5004f3ea7b3897971821090ed41da7edff5be2e8ccdb9a1f99b0e5528de2c1fa SHA512 d434b470424c104f91e9a4a5e3a1f2109b919a35edf45540ad1ef8600f0b10864f32aefb411d747e13b5d99ba06601ea7abe5032e24e5dc6b25254b4e68f8a89 WHIRLPOOL bdeea9f5a47f951868c24c830eb6833bbcc10fb4aac97887fa71cf636bcac440bca2be2df1d1cf4673f9f71eddc440fc1e7060a3379a4c9ad50c07cd0b3be732
+EBUILD jaraco-classes-1.3.ebuild 975 SHA256 2ee77b420342df11bdf20f0e554d599fe4e3dade76e8208b748e55dcbb2aff41 SHA512 8ddcc1ec468b05ebfafbe9dd604e7a7e9f49faa79885062b40fabaa0e0b07718b1f63e57da32945418e0c475090beead76fe86801d5b898632155ab044ced44d WHIRLPOOL 60b7cdb31aae7a5e0afbffcb4f3cedff08336ec981b8e4889f165367d83d43bd0adacb90bfdddbec3bc41552cdd035ddb6fad0bf1e486822cb7462eb00209acd
+EBUILD jaraco-classes-1.4.ebuild 1073 SHA256 30b2bac927126d7e865f7751330b5449aa8fcf48e0ddeb131ce2812caec06f23 SHA512 382382cc08370724725ad39d54919b58e53e52b1f4ae191fe90bf07a3a77c9755dd20c4e63f6d453a979251279d124bc67c882dc9e58c2383ab1d84c35be0524 WHIRLPOOL fc96d14f9dc0d6ceb0cd2cf7ce81d6e7ecb676e938d411c7a5cff6f87c9fc4ff7e98329dc8d95a8b2c18188470d73b0e71d152ab83efe569f8e24de325d05c10
+MISC ChangeLog 1216 SHA256 9c5ebadb73cfdde6c7fe865b97688403e8ac999291838418a40ca8df4c482f67 SHA512 cd7629e174ba9be66594229c20ba41d32add7e436d1ce81c1fa944093b505b7cf75006fb8fed42858b93998dfd09350f534b53c2c3b08cf882140c8bbef72c3a WHIRLPOOL 27080751bb9c7995628493dbe746d56ffd8553ecda459862294352490c9e0d1e85d8ac5a11e53a96d1f4d5d6fe4a1e670198b53bfdf87e3c7d1759efe99a6012
+MISC metadata.xml 576 SHA256 bc98e344ed319fbb95c68f882dc81f25f038507871acdf050580d56888ffec38 SHA512 15421c155e166e85d127519a5b34c0dc5ec3b7709aeb55f7f10189d40e58669afb9e7d2f414cd9547b7f02c2e5daf9136eceff105b7cd01716ed7ef5d9398e3b WHIRLPOOL 75697e8a6356835dadf01d913cd6b5d74aae74c4983cdd3297e31ad0193f566b82bc6c6b603a614407d63d8e5e8825d417aaf87ae350c5b2e78ad2f72ae01053
diff --git a/dev-python/jaraco-classes/jaraco-classes-1.3.ebuild b/dev-python/jaraco-classes/jaraco-classes-1.3.ebuild
new file mode 100644
index 000000000000..e7c012b3473f
--- /dev/null
+++ b/dev-python/jaraco-classes/jaraco-classes-1.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Classes used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.classes"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/hgtools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	if use test && has_version "${CATEGORY}/${PN}"; then
+		die "Ensure $PN is not already installed or the test suite will fail"
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/jaraco-classes/jaraco-classes-1.4.ebuild b/dev-python/jaraco-classes/jaraco-classes-1.4.ebuild
new file mode 100644
index 000000000000..290cde611ef3
--- /dev/null
+++ b/dev-python/jaraco-classes/jaraco-classes-1.4.ebuild
@@ -0,0 +1,47 @@
+# 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
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Classes used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.classes"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jaraco-classes/metadata.xml b/dev-python/jaraco-classes/metadata.xml
new file mode 100644
index 000000000000..62bc57c67712
--- /dev/null
+++ b/dev-python/jaraco-classes/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">jaraco.classes</remote-id>
+		<remote-id type="github">jaraco/jaraco.classes</remote-id>
+		<bugs-to>https://github.com/jaraco/jaraco.classes/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
new file mode 100644
index 000000000000..c1855dfaf914
--- /dev/null
+++ b/dev-python/jaraco-collections/Manifest
@@ -0,0 +1,6 @@
+DIST jaraco.collections-1.4.1.tar.gz 10456 SHA256 43d0221be38fa0d8da339a149829800c8c3f843f379c09f3f8f1d99125110936 SHA512 1f9eca787efb427a73b5f03e144a2a95e5740580e21e9857a376d76dd35f39066c3a06056eaf78f72de2f97e4fc70805467fcc516f989ba4785e3f3d9354a538 WHIRLPOOL c37a851f1ab041554c1d9a54565e5671350bc750d31d1569a4415c5c215557739145b3a4992546d715a013695ef86cb788c47b4eb72940a29fdc17a9300399bb
+DIST jaraco.collections-1.5.tar.gz 10615 SHA256 7af6aedcf1601eca23d4411727caa201c0fdb80d2ec40f63d5f0942529f971d6 SHA512 7e2d3849d26422d687cfeb560f8096fb099a9c7b99b3061a06f9ad7037c3805b577754f62e5d5ead3f6f89bcd7dbf574df2844aa3c28928941ea2c99d50fc161 WHIRLPOOL 91a5c6c09d8b46231a409abea40e43a80a165a17e4f23be05d5341446630cf31d94880f37bbba0cd8c9cc1cb27fc6b698cd18d07e9342f1cec0fc2453ad88378
+EBUILD jaraco-collections-1.4.1.ebuild 1404 SHA256 bf0d82902c890bb0ca2313dee866fec7353ca81a6cf9eeb3b2c924bbc4c2502c SHA512 898ee4f6f72bbc91a723ddd3176a56b33b50f951d46eeb4cba8a82d750a5c647463ed95708266ebf02c29194fdb89c2b702ea2fcfa427d50952c96ccc1274669 WHIRLPOOL b23a420e0ae90299db341b1e37e7b51131d3093fa7d3a469f363b190a347c2148614ba902e4053d692183db808a410c8c631746ca76cf3332a204cd496041b4b
+EBUILD jaraco-collections-1.5.ebuild 1402 SHA256 8fc677e127b4dde79b77399c9b03811a6fb6b28c3c29f58a5b26c15fb47d5852 SHA512 a48e9c9a8918ce2734bf0d2ad37e9ef85353bb502a057e3f3ce63d97ef0e9871fd086c36219452788c9bbcb29e4e0c90aa4094c4cca11360bc645e81c7c30fdd WHIRLPOOL 7674b00caa927dd1e24b364f4da12d2842c052ed19aef8502e8856c5d89cce947a1adc640b829dad55785cfc7012915f4442ed0bca221dee5b963b3a121beed4
+MISC ChangeLog 2284 SHA256 67b5f76444b374fb0c0f70ad11bd6537a90b1910fd37d576dd290f2f3af3fa0a SHA512 371acdfba2c806cc58c76fcd356b5d7d37bf4e64963f5a09a1d05942bcb778a68a188e2b522c501b2c8c2dc835647b0173174d53ebd803e94131a4e2d54d5f90 WHIRLPOOL 0474be4670e6f4c87329294b78b208b34f307b4821e805eb3b4ca402264d12e02b09c804d72b0015a9c03a21df04f17d9e3e0fe234a250595ef6a93777cbea67
+MISC metadata.xml 682 SHA256 265fd252d28faba25541fafecfb6226027798ef8a80a9d7c3f3a976db5f3c0f7 SHA512 3b642f903fdc07a9ddba157b15b9cbcb3141f7a7b5bd74101b360a9052ca213a765c48266acbe296e8119900d311aaa4dd8d54f7b6f5e05ea2041145ce455c30 WHIRLPOOL 313316f15c376e8b789dc2295abaf7a02d8aafca770c14c5b68b08b4b8ce9869408cfe33f3cc1ab3a52329e8c9482ae1d9ef21bf91510b2ecab03834b77635cf
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.4.1.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.4.1.ebuild
new file mode 100644
index 000000000000..d4d9d45a02f9
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-1.4.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Models and classes to supplement the stdlib collections module"
+HOMEPAGE="https://github.com/jaraco/jaraco.collections"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+PDEPEND="dev-python/jaraco-text[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	if use test && ! has_version "dev-python/jaraco-text"; then
+		die "Ensure dev-python/jaraco-text is installed or the" \
+			"test suite will fail"
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.5.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.5.ebuild
new file mode 100644
index 000000000000..708280d2b630
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-1.5.ebuild
@@ -0,0 +1,58 @@
+# 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
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Models and classes to supplement the stdlib collections module"
+HOMEPAGE="https://github.com/jaraco/jaraco.collections"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+PDEPEND="dev-python/jaraco-text[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	if use test && ! has_version "dev-python/jaraco-text"; then
+		die "Ensure dev-python/jaraco-text is installed or the" \
+			"test suite will fail"
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jaraco-collections/metadata.xml b/dev-python/jaraco-collections/metadata.xml
new file mode 100644
index 000000000000..349dba02c653
--- /dev/null
+++ b/dev-python/jaraco-collections/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">jaraco.collections</remote-id>
+		<remote-id type="github">jaraco/jaraco.collections</remote-id>
+		<bugs-to>https://github.com/jaraco/jaraco.collections/issues</bugs-to>
+		<changelog>https://github.com/jaraco/jaraco.collections/blob/master/CHANGES.rst</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
new file mode 100644
index 000000000000..f6b92258b452
--- /dev/null
+++ b/dev-python/jaraco-functools/Manifest
@@ -0,0 +1,6 @@
+DIST jaraco.functools-1.13.tar.gz 9026 SHA256 af9033b6aa974cfc70e4abec2be71f2434453b80db1b6f031d2ab26ee5b0eef9 SHA512 fb73a69811026562e1f8195960956a90757700ce13dbc00feb0ef97cf5f3c35f0334bcd7d5529ddab7c7524899bbcc6e264266a4cfe23056b50cd7a3cd9e896b WHIRLPOOL 14a59d390ff8e940d276181559d96fae4e2d5be8a1247b7cb892b452498953c3ed7881fa42dba5bd56dfd95093e8b3db3d3fc819253973828ff812e820acd8f1
+DIST jaraco.functools-1.15.1.tar.gz 8744 SHA256 ca8b594d38c64884f54d6ea36b859227686a54c03cbda6a0fd9da9c3e40514da SHA512 0b65bc36a2338775d4879dd7502b50b930a12458512061ceba65ada86df2658f4fcce4a4e523580239b302a34a8bf90adcfdeaf8f0b2169d704a3a74457424bb WHIRLPOOL 81f91008dfe76fa91b4e54791a895678cd1dc13050339d00bdec90e39abb2ae7492c8f6c61b63c9e104e18ce1e56ae66ada9d9d3d28df07e48e6d66fea20a389
+EBUILD jaraco-functools-1.13.ebuild 1294 SHA256 a48336b1bea009147ab3cd88a92036253a7b079986e1826b0122620576e17cc1 SHA512 d3cc8243569ab8b5448bdbe0efa71a4ff12d319e84a12afbf4222abb92d33dfa11e2bab65823ab625c2b12973c11d35edd439be9e7f58072d0fb1785667caf1f WHIRLPOOL f1a1e99d4fc669afe80667b6c53ab6e114508f89a06cf8d18ab1c797f9e3fb083589172bfcee2fbb7111c9deed27b1ce67ba35077d9217ca9f702743325a1047
+EBUILD jaraco-functools-1.15.1.ebuild 1292 SHA256 865884fe520a3dc471ef936735dba1279b9f6f2f0f283e1758e1491d9437a916 SHA512 07e63f108881f4ab7cbaf7be577bc8a10aa27af3abccf6ed878a2a3ef4822f226771b470660ae58ff24934ae9424e387b86e10257255cd2a1a218c7e06e99c82 WHIRLPOOL dff75fa2b1c766e304404bc6a2824e0bb8703d08f16f813c1e2f35ca64abf2baf023a0ef6f6074137a2d06c171427fd4b25406f7ca17d6e1358a50e083e69c73
+MISC ChangeLog 3040 SHA256 bf87d3686ee99f7f08e8ad41598efed9e030d0161be203ec58ab736243a69f05 SHA512 0efe4858fa73bf3131e19e57fa675cc6ab8b69847f44db7131ea77531ce9683361ee5d9df61bdf292b38ca12f4d08b333aaef9b599375188d6315a7171b2f2d6 WHIRLPOOL a1e8d6cd7695b998bbf656a32ee4e85d3b20596341ab43015fe853d2e70d910c6fd071de37374fc7e8c1e192da99370305ef0a375e7578de5c371c632df1ce57
+MISC metadata.xml 751 SHA256 5a2bafb4464adc3664eeaa4ec9cae76dbe5f263c43416ef3fb7297037ac69b19 SHA512 07a1f8da707627951f272353e006ce92d9918e06b92309db099cb9bcdb53be40b1e9ad100f43c05eb1b78bd44f25028d782eedcb3c2cff1daf15e1926cfc2452 WHIRLPOOL d8d472c4f26617540e35c33938bdf4d4c26635f98f85a0184ea45c01fe2061884e0d369cf279b6429230e86f0258ad38838e2fc998d9fec575188a190b62d113
diff --git a/dev-python/jaraco-functools/jaraco-functools-1.13.ebuild b/dev-python/jaraco-functools/jaraco-functools-1.13.ebuild
new file mode 100644
index 000000000000..352cdfac6fdf
--- /dev/null
+++ b/dev-python/jaraco-functools/jaraco-functools-1.13.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional functions used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.functools"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jaraco-functools/jaraco-functools-1.15.1.ebuild b/dev-python/jaraco-functools/jaraco-functools-1.15.1.ebuild
new file mode 100644
index 000000000000..2309da0ce0a7
--- /dev/null
+++ b/dev-python/jaraco-functools/jaraco-functools-1.15.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional functions used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.functools"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jaraco-functools/metadata.xml b/dev-python/jaraco-functools/metadata.xml
new file mode 100644
index 000000000000..18f1768bcad1
--- /dev/null
+++ b/dev-python/jaraco-functools/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">jaraco.functools</remote-id>
+		<remote-id type="github">jaraco/jaraco.functools</remote-id>
+		<bugs-to>https://github.com/jaraco/jaraco.functools/issues</bugs-to>
+		<changelog>https://github.com/jaraco/jaraco.functools/blob/master/CHANGES.rst</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
new file mode 100644
index 000000000000..4e257c2c1979
--- /dev/null
+++ b/dev-python/jaraco-itertools/Manifest
@@ -0,0 +1,6 @@
+DIST jaraco.itertools-1.7.1.tar.gz 10224 SHA256 bf5c7bf22c930a0c5942e0850166b10c77bbb6286117ac2c619c78c86db97d7b SHA512 e149de3368137db4379d02858be0cbb3b6dc1e81cc06eb0f53064a55c8e25fb09b2b4387035dda29928bdf54e22d28c9d9744dfbd82a6cf4e4c90b5d42b31dfb WHIRLPOOL 7377baca4411fe8acaccf4cca763d5c47aebd62acb51e4380e0565c4b72785d439e8cee51887aa4ccde9fd0bf90ab4d824cb6878b4b7436552d120d8f5e5ea50
+DIST jaraco.itertools-2.0.tar.gz 11158 SHA256 18ecf2d93145496051c358fa114b588a69eb8a97910a6908240df4cd11df5be4 SHA512 56877e141da1c79499dee2e3cfd15a81f07d6cf6fa1ee88f4ae387423d91106f41c1787fecc194755fddc521d6284763cba93083904e67d548c053d1584a4438 WHIRLPOOL eb9804945045ea2e68128f524e3d4ebccd6648a9027f890ac957ef5e45951320e4f883a7f81b0fc1fccd37253ef5afc22efb9a91b08ef75c172c5bbb7c0a90d3
+EBUILD jaraco-itertools-1.7.1.ebuild 1090 SHA256 81b87c9541f13da1c5a7e3c2d1f9f071def1dd27f0390d5485c386370d714138 SHA512 91fb4ccb095c07117d75693cfaab37bd92fc8dcd371233b9eea4635800b18027d41277c19dd4eaf3ad5d48452d4ed138d6e37c2a01822c46ff1e6de5c1388ef7 WHIRLPOOL ef7a64f08014ffc2a503ebe6c7517547245c56d90aae18b467db394f907914650948ff4779aa734f13151cdfc8d8209afe5834395569a27ad4fc41b9fdb1ea83
+EBUILD jaraco-itertools-2.0.ebuild 1182 SHA256 af71a5f1c7d28b183cc0699b04c9c1781eb374e61e5de603801df5b6acda3de9 SHA512 768bb6ab73af637d0afc0ad8fd4c9b335060193980d0b1abac9989328ab1630e48c1b2d1d31a323cff474174097ec9e0fbb9be893c31cca00e26b8c806122674 WHIRLPOOL 4f11dcd00dafeb95fa2b8928b168fa3aeacf618e0611988dbac528ad8cac185c422fc37c20b38a7d963fdf3678937e102474414958be9d3e8c293cce37604538
+MISC ChangeLog 1342 SHA256 a816a279b9d58d6f70596b6bf52d2f523a73d40d5cc2c437bba0ad4c29894ba2 SHA512 ec61b422de5d9dabc488a10ad7decb508df24f250af41407754d6ab230a8a0dc0a548cc50de5b664e21709db403af7dfb76818046a6f2b30131c616f78abbe02 WHIRLPOOL 4287b5e7f4510c9a94cdc49f05ebdece0e1c8ccc731b892c14d280c939a9b5ef83088b367567b3cac535737472453a416df7666006da5cc82cd5653ac6e5efe3
+MISC metadata.xml 751 SHA256 39ada35f7ec304f9738aedad51b9f834a14126467c98d4eddb50b9079a2f24e6 SHA512 09bd9d3f74e2ad249463b9b35d9e0359d2d94e49d778b0350abf32970cd782a8e70192454f5aaecc218f842bdc1d2760daeedd004a3602f95ed1b490bbafbdd6 WHIRLPOOL e5116935ecdd6ad2bdaea03fd42e3ad184b1384dab1596b729f2a6b02b0e84eb9624ea0a089794cdd9810aefb7a9dd509eec9fc528462f24bc9ef6777b3bcd4b
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-1.7.1.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-1.7.1.ebuild
new file mode 100644
index 000000000000..885d69ea24af
--- /dev/null
+++ b/dev-python/jaraco-itertools/jaraco-itertools-1.7.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional functions used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.itertools"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+dev-python/inflect[${PYTHON_USEDEP}]
+dev-python/more-itertools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	if use test && has_version "${CATEGORY}/${PN}"; then
+		die "Ensure $PN is not already installed or the test suite will fail"
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-2.0.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-2.0.ebuild
new file mode 100644
index 000000000000..7c1d7c48359e
--- /dev/null
+++ b/dev-python/jaraco-itertools/jaraco-itertools-2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional functions used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.itertools"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/inflect[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jaraco-itertools/metadata.xml b/dev-python/jaraco-itertools/metadata.xml
new file mode 100644
index 000000000000..f99ac8068f24
--- /dev/null
+++ b/dev-python/jaraco-itertools/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">jaraco.itertools</remote-id>
+		<remote-id type="github">jaraco/jaraco.itertools</remote-id>
+		<bugs-to>https://github.com/jaraco/jaraco.itertools/issues</bugs-to>
+		<changelog>https://github.com/jaraco/jaraco.itertools/blob/master/CHANGES.rst</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
new file mode 100644
index 000000000000..7e197f3f0266
--- /dev/null
+++ b/dev-python/jaraco-logging/Manifest
@@ -0,0 +1,6 @@
+DIST jaraco.logging-1.3.1.tar.gz 4589 SHA256 e80e43a7b0d94bda2faacc1b996d5cc8bc6dcf20205048d18f4889f35e956580 SHA512 aaa2b29551a13358887e0747acb47ca2a6611ce1bfb08259bc70c7908929c4d2c45eefd7738e808b7b2404d723425efd69f9cb9601e0fb0c08f611bcf744ceae WHIRLPOOL 150101a7fa0b50a0130802638bd73124543c1836c27a96deb21be4eb6966028d58e4cabc6513a7149d08273a728ac1e46a27f78b6a139e304b16f14d2227abf3
+DIST jaraco.logging-1.5.tar.gz 5707 SHA256 05c8922640cd22e7c6cb71068ef494a227b61ae8a0cd43b28ab1fa08ef4f7cd3 SHA512 18f267bd0c764f38ff5223d4fd6e08d7d9fa568691db285155d7b955c71439474fd84edd61b20d57f6eac77394d4b3ddf9b35d8e6ba08a2db5dd4b2ada6e0d68 WHIRLPOOL 03e32aaf52030c8635f59627a91330de004fb564b0d330e11122ebe7bb05e467c66f83f248424b1308ab7aecfcef428b90c05cab896fff10c3e7e83087031096
+EBUILD jaraco-logging-1.3.1.ebuild 1049 SHA256 72a8b5e9e27b02fc0788dd9d12f3bb785b448d7853a100d5c6e4a9ff58034cc9 SHA512 d6594e11324ddca1a0815e011b3f28fe5e4121eeac88b104ff3835d832434d4a072e6a8fa09c18e49dfa1218d3cc152a53a660b97676942c4042dc5ae28c4291 WHIRLPOOL a3009ea8bc58280d5c93a9117b31bd346194e613f21716e9df8e17e54ef9b1979fddb21979cc41509b2b090281380400479fd0feff293dc227694ed995183d58
+EBUILD jaraco-logging-1.5.ebuild 858 SHA256 95c600a318e7ef38dfe1cf22a35717ba2fa60553eef64ae95d457adc0345b0c9 SHA512 72c358214ae4e6938551a57b808ca2b9c4f7f5c2cb184a53715882b80b5d6721765ea5ad7d0962076e0aeb66f082f61a26498f882f00de5740f21abc97663464 WHIRLPOOL 357149c9c31edb4e43d0af35ae07eaaa859b9b32d041535541482dc2e46d2871d8696e476b269be7fcfa3f289ff524261729e0c5de78af8c820eda959a81efe0
+MISC ChangeLog 946 SHA256 11174bc50d6ad0d3c769ee789a2063a9a55a3988855e25744c048a9615aeaf44 SHA512 5ef5e06eedd3a7fb9868948d4f33ca5e1296835eea3d01f67554e59e7fe3077bb77daf53de0f11907c8d5916d7179ce59a5baf3762173901b5b32f9333fb2411 WHIRLPOOL ee8884e85675166504bef078ac1686fed64e8772b1573bc8ffdaf372bc6f6cf8abbd38a6d1c1496d6fa213a4ab55b33da312560fc9bfd6fb77dacfcfc7832106
+MISC metadata.xml 653 SHA256 51695d82468fa057d1b7c1544160947dcaa779e55bf51e026487789176e93b20 SHA512 0b1186c769705f4f5d7ae8efe471f5e85d790ca13a276e6e4968b330f8c4872d01f5ea529909b7c4af2dabee7cd7ca1067552b5d649dff7505b338c24a3d480d WHIRLPOOL a539321a2d92dcef6b360230b93bd594e7a0e45055d3104ab2abd3d4710d6b0c3b68ea46aeb07b03ee5e18d11fc51d79dd2638698b23893c87d284becb3e8047
diff --git a/dev-python/jaraco-logging/jaraco-logging-1.3.1.ebuild b/dev-python/jaraco-logging/jaraco-logging-1.3.1.ebuild
new file mode 100644
index 000000000000..818e606076d6
--- /dev/null
+++ b/dev-python/jaraco-logging/jaraco-logging-1.3.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
+HOMEPAGE="https://github.com/jaraco/jaraco.logging"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tempora[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	if use test && has_version "${CATEGORY}/${PN}"; then
+		die "Ensure $PN is not already installed or the test suite will fail"
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/jaraco-logging/jaraco-logging-1.5.ebuild b/dev-python/jaraco-logging/jaraco-logging-1.5.ebuild
new file mode 100644
index 000000000000..77544c7b4847
--- /dev/null
+++ b/dev-python/jaraco-logging/jaraco-logging-1.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
+HOMEPAGE="https://github.com/jaraco/jaraco.logging"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tempora[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/jaraco-logging/metadata.xml b/dev-python/jaraco-logging/metadata.xml
new file mode 100644
index 000000000000..06a11fe2096c
--- /dev/null
+++ b/dev-python/jaraco-logging/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">jaraco.logging</remote-id>
+		<remote-id type="github">jaraco/jaraco.logging</remote-id>
+		<bugs-to>https://github.com/jaraco/jaraco.logging/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
new file mode 100644
index 000000000000..5bb6a600e32c
--- /dev/null
+++ b/dev-python/jaraco-packaging/Manifest
@@ -0,0 +1,3 @@
+DIST jaraco.packaging-4.1.tar.gz 8820 SHA256 9980b0fb6a0d2ee754d5979c9e5e02f31853da8e9046dc99f5abfcb7ace9e189 SHA512 381ac1ba3a8eeea1235e719d98b61e38399d3fea1310732b0e2f921a3d46544efbb12c23c03bfa3ecfa07697458cb8930ca5156df7b411509c7b1da0b673d7cd WHIRLPOOL 887d743fef6d1e5b8aa97b1ae0d83500f2c68f61520978557a0a53ec7d58b6f42740e3669340e7101cf1c3afd9638da4bf27e6ab5402229b614a27267d62df9b
+EBUILD jaraco-packaging-4.1.ebuild 1157 SHA256 5e800e615b5087fe80badcb71446a8f550a64938bd14b9a44a26515b8d66379a SHA512 93a0d86b1e8076fa96a78352a26142bcdb89af6c09f5481289de744c55b1cf5ae98f30f7fc5cf0636948710ecf0c322475f681f3527b48cb41960905cf406397 WHIRLPOOL 72d9b79ae6176e52938918c393b69146e13d39b06d7004b2938f55c15e95d7a33fbe8bef0feb5fe065b2ab3d6a3d4878dc4614a897a3d32df463b4e8ab1fdb92
+MISC metadata.xml 683 SHA256 a74958f7cc90ee6751c4f2ca154197b289ab054204b3935eafdab3335b2e5fde SHA512 b6f9d4889c3591dd7e70a4945408a75ccb7eda388599cf9fbf0020ca15152ce4b585b61f8f669980b01386fd277dbe3f8f97e633a148f60726b5260d216f3071 WHIRLPOOL 8b96550a2de07d5522706085a31e2d613c622c025c34f77e107841eab207fce97cd868278e3520a10b7fa22707ea256e4fc1b15ba04d26782c7a445f4285e64a
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild
new file mode 100644
index 000000000000..cdebb345a179
--- /dev/null
+++ b/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Tools to supplement packaging Python releases"
+HOMEPAGE="https://github.com/jaraco/jaraco.packaging"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die "docs failed to build"
+		HTML_DOCS=( html/. )
+	fi
+}
+
+python_test() {
+	# Skip one test which requires network access
+	PYTHONPATH=. py.test -v -k "not test_revived_distribution" \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/jaraco-packaging/metadata.xml b/dev-python/jaraco-packaging/metadata.xml
new file mode 100644
index 000000000000..7f4f59851b20
--- /dev/null
+++ b/dev-python/jaraco-packaging/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>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">jaraco.packaging</remote-id>
+		<remote-id type="github">jaraco/jaraco.packaging</remote-id>
+		<bugs-to>https://github.com/jaraco/jaraco.packaging/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jaraco-stream/Manifest b/dev-python/jaraco-stream/Manifest
new file mode 100644
index 000000000000..b8f06672f6d8
--- /dev/null
+++ b/dev-python/jaraco-stream/Manifest
@@ -0,0 +1,6 @@
+DIST jaraco.stream-1.1.1.tar.gz 6115 SHA256 f111cbb2a04063bcb1675a31a633c1a0f1b879a3f46c2ea8e71c7dc1242d8f47 SHA512 65c8d1652a0d63506cc3cadee590664e6a99e2f770d26f0cea1dce07c54ffe308e1df8619bc728ea81c5ac43c9c6731fe9f71e5d38d2674c4e0d63d635bb5112 WHIRLPOOL 808c4c854eea1f06bd8b06cdf31497876ccfeb939beb1c785408d83255774fd304d355e97ea7c4ff6794d7609a945f903926ab3d8bd55fe70c8651093578a62c
+DIST jaraco.stream-1.1.tar.gz 4887 SHA256 8f1e4aaea35728da594d1430772b85be098a919bf316be721045beb4377526a9 SHA512 5af385084623fbdfe86e9fb620f49b097dee164638bc99622ba557a26cda591e856f1fc4134bc7b73b8f7b61afaf2607686fe20c59c582324a65c22f39d74a13 WHIRLPOOL 5c91d24f8007041cbe76c4ab371776bc1058c714e991eb346ac0c846eda7ead0a532028ed5bc51f8618ee2b7061b5ee6a2e70915c292e4441eb5b5324cfb967f
+EBUILD jaraco-stream-1.1.1.ebuild 1199 SHA256 cdb37083a7b868d6003a60ebd4f226d07203dfb7e50fbb189178cd1950943f28 SHA512 3cc3a43091ee01b0ed72f510378f7de528f3ad3a4a44a8b90ad8d4cef87c8e954e2c3a7338fa132b52c5e3ca196b11c8853a9a63cc849aac3ccd0649816110d7 WHIRLPOOL ddcd4424d574696289605288649922186adf48e596bef9178b4bb2bf0cd19df67ae808d504cfb595ed02b8dea0fa4e75f23302d53b649a04baf50b7d184329ce
+EBUILD jaraco-stream-1.1.ebuild 1140 SHA256 fa228f988a94896fd9f2622a7dec5c22050a5f37be1ec41d2e799c09cf129def SHA512 9d67cc8e9ec8fa2b39a421f8a87ae5b0a7561d7555b00531ad6ac1fab470d9190bd104b5bac066aad8b5e1db0db53f7da13086986c5f34b83436547a522df599 WHIRLPOOL 7ebd20fda0d73b5a483b0ba4fde5d3f2ac3f150d67b3a75c28535408c9316eb390a34c8945b5c0b8492a527e013efa29a53a2770922473e0070a820022bd4c0c
+MISC ChangeLog 645 SHA256 e85a316e0d3f56101ffd7d68df6a968f6cfda4f426c1d92883b76c0f6ffdfd5d SHA512 44dedee178049d02d8f27281095082c394e835cc47b856de9289ffbf11853e0702ebafdc346e96529ebda48f3415513b235d4b48afc363439772c7ca64699906 WHIRLPOOL b4b9d0f574beb1d00ae9f46a0ee8b296f3649de8b62e31a183954a8b913eba47f08416b7995f2ad25054d87ccb66a3654fae9e0529e337653dab9ac2dac0cdbe
+MISC metadata.xml 726 SHA256 54b64b1c70ec94ff4a9fa9fa874cc92c7a2ed18f04d6d0ea6011699a830503aa SHA512 70852c5c0af30b62e142d05e75f241deff9ec67e47bf27d5a9fda28e88df3baefdf2d76bab43629b83237330668772f7c5cbb7242b0d168a8429659c4d3920da WHIRLPOOL de300d0d62885e006733cbd5f01bdc489550522c7e0ba60c1cc718b4f55ad98c715eead2d765a9fcdd1c600396ca10dcde287df34969c3aae0dd9f53eff06912
diff --git a/dev-python/jaraco-stream/jaraco-stream-1.1.1.ebuild b/dev-python/jaraco-stream/jaraco-stream-1.1.1.ebuild
new file mode 100644
index 000000000000..628b500250d4
--- /dev/null
+++ b/dev-python/jaraco-stream/jaraco-stream-1.1.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Routines for handling streaming data"
+HOMEPAGE="https://github.com/jaraco/jaraco.stream"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	# Skip one test which requires network access
+	PYTHONPATH=. py.test --ignore=jaraco/stream/test_gzip.py \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jaraco-stream/jaraco-stream-1.1.ebuild b/dev-python/jaraco-stream/jaraco-stream-1.1.ebuild
new file mode 100644
index 000000000000..d9f68a120781
--- /dev/null
+++ b/dev-python/jaraco-stream/jaraco-stream-1.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Routines for handling streaming data"
+HOMEPAGE="https://github.com/jaraco/jaraco.stream"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	# Skip one test which requires network access
+	py.test --ignore=jaraco/stream/test_gzip.py \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jaraco-stream/metadata.xml b/dev-python/jaraco-stream/metadata.xml
new file mode 100644
index 000000000000..778d6071842a
--- /dev/null
+++ b/dev-python/jaraco-stream/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">jaraco.stream</remote-id>
+		<remote-id type="github">jaraco/jaraco.stream</remote-id>
+		<bugs-to>https://github.com/jaraco/jaraco.stream/issues</bugs-to>
+	</upstream>
+	<longdescription lang="en">
+		Routines for handling streaming data, including a set of generators for loading gzip data on the fly.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
new file mode 100644
index 000000000000..14493dbc5590
--- /dev/null
+++ b/dev-python/jaraco-text/Manifest
@@ -0,0 +1,6 @@
+DIST jaraco.text-1.7.tar.gz 7020 SHA256 10ae286a70f391ab7b787863a8b3f538a0e2901d3c6eeffc0c4b23c13e608c1d SHA512 b1418dc19b52e353da3b2a332ffbc9a4201c6696ecc962722e25fd6549c8748a9dbea2cf76f658111aa4e3fd411ee999b526fa4d8148259866dbe95ebc4cfa95 WHIRLPOOL 5f08fd96576dbda3aaca3aca047bafe72939f66f61882a513cbe7dec07c3a8a187aa7eae9f5aedfe9ee9f4d497aae3dd0c62039f3ae7321687b11ed34f975e43
+DIST jaraco.text-1.8.tar.gz 7364 SHA256 297f7e7ba5b450c58db95d56a31b6429cb3ee4724f379d13f738e0128974348c SHA512 7f13eee9553d7531bf2f51af1b1c7fbb9d778cf082e6eb49948fc0943b7eb5a0268ec51b363ae9e96df854e0af5e38fbc4a679c746160e422759c044d4a33654 WHIRLPOOL 3abfa1d9322084bd5810f696c37f108952ed690b3a486a40668bceea229985b266499ee0ea1c1a5d4b6ef165a742acc2aa5540f0ae445d5bdbcf0aaba69db948
+EBUILD jaraco-text-1.7.ebuild 1156 SHA256 b43f36d109501ee23d6125ea1c6629ef32b22b3456e1a8b98628e93cc06943b2 SHA512 3222d565c1422777e386475e7ad9a5d38c667f65cfbe40692d584e49acc90332465c7f3649a26180124030c1d814ed1816438a7a138c1e803ac8c2fd6e8106ce WHIRLPOOL bac6f596033d7e96cbfb74111036f3389b6def91b108d5a234a79d78152e2f7dff6275d609b4e090ef66b2e2671fca872fce0996249bddcc5b3e447a1eb8d2a8
+EBUILD jaraco-text-1.8.ebuild 1154 SHA256 a48cb6d27a3e525febc6ac4cf7a9a31f6f62ef57553d1bdf5be5c5d43b4bd3f4 SHA512 401b49fd1c77829f2a8f6e3173912948b6e44a3e7f4544bb6ade500d6c7b0ccef23b350a4161069c994313804777210053240b898e907d944d34c6aa750c6498 WHIRLPOOL babfce067e5cb8e56b5305e62c0f3c96ccf3d4383a2fea2e40a6d7b8ac697c99ad65fae5374fc6c97289e0d1239d1e772377b0719d24b081b8148cf819c22d43
+MISC ChangeLog 1526 SHA256 f2f0add266d673ae1d2bab07e55f098089026c919384006805be1d153cc17f53 SHA512 8d2aa887f700267774b1312e99c3f9813acb49fa2ae81fc9bc73337f224b6538e4f7033a66361b07280b0196731e129d67d11d7c6414e8b787093e3c55217851 WHIRLPOOL d6c2ac47b7caab528d44aa65695620012abee34f32e36304824c8337b39da54976388007148c5b52ddd3696df884c7035c4e0bffab043efc096a1b2ef5ec4f3e
+MISC metadata.xml 567 SHA256 26e435d6746d8d20a8c228a8522080856c265cec5d014c3f739098bfef45abff SHA512 ab64cbfb8436cd234c42b65339dc95c510b9c3d484e9ffbb111e037f6b3ba9437d90809b5f7a0d8d8fdc3e1ea57cc1d4fc803879155f0b9ec55967b765dbe3fc WHIRLPOOL 8f3f7d5829bb1d2836d24c4fcab8f75a8dc27c9e07a43feef02ee7e4ad023ddb4518d7a7f487d66fd4d8cca6dd1325bab1d7683d2b9d3eec5ec7fa8350266126
diff --git a/dev-python/jaraco-text/jaraco-text-1.7.ebuild b/dev-python/jaraco-text/jaraco-text-1.7.ebuild
new file mode 100644
index 000000000000..2c1db8dfdd7e
--- /dev/null
+++ b/dev-python/jaraco-text/jaraco-text-1.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Text utilities used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.text"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+PDEPEND="dev-python/jaraco-collections[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/jaraco-functools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jaraco-text/jaraco-text-1.8.ebuild b/dev-python/jaraco-text/jaraco-text-1.8.ebuild
new file mode 100644
index 000000000000..d011804da5bb
--- /dev/null
+++ b/dev-python/jaraco-text/jaraco-text-1.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Text utilities used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.text"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+PDEPEND="dev-python/jaraco-collections[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/jaraco-functools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jaraco-text/metadata.xml b/dev-python/jaraco-text/metadata.xml
new file mode 100644
index 000000000000..67d1fd8c3133
--- /dev/null
+++ b/dev-python/jaraco-text/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">jaraco.text</remote-id>
+		<remote-id type="github">jaraco/jaraco.text</remote-id>
+		<bugs-to>https://github.com/jaraco/jaraco.text/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jaraco-utils/Manifest b/dev-python/jaraco-utils/Manifest
new file mode 100644
index 000000000000..454833c4c2cd
--- /dev/null
+++ b/dev-python/jaraco-utils/Manifest
@@ -0,0 +1,5 @@
+DIST jaraco.util-10.0.2.zip 83375 SHA256 da136010c98f1ceaaa02ab1a201da45d3b2d59348fac8e3c7b1ddb61825ca872 SHA512 9522d0923db0637b605a11014104fbf6d86fc014fa1d065610df0cf8fe18dc5f962c8f4e4a3822c9223b434fbd252a99ac1949e52f7c9774642244f7a25e12e1 WHIRLPOOL 5dc4bdcf744e0fda210a3f1b5de6f5c8ff73c179586873b28cab309f320c662591442c63ae3cbdd2b3187ab56bb9d541839e40525baf1b15d79719015ebf20bc
+EBUILD jaraco-utils-10.0.2.ebuild 864 SHA256 975606d0e5e85fc5e2c6ba154ec5e7ff7c042ba766febbb6ab3d8ba27d9660bd SHA512 bd1fdcad43b19b6ce7020b9df45cd6c15727c61e79c0adf4ec60debddcc95ec38c60080b66ab6258be55718d0c4c18126bb9201eccbe732f96487d701a41820f WHIRLPOOL 1835d187872c2e34ac6e7a7ffed6781eeab7550c5f61ab481333f887fe82d7247a63327a40df20663952e5ca507c86606ea1287419dc52a7b4fe08329f3b6b3a
+MISC ChangeLog 2882 SHA256 b84d0dd8587976d6b91d9655f787a35e4053099cadd68a9d42ef68633a9ed371 SHA512 b81ef08670c053bef84f4aa8b523dd7c892fbba88dc18a0d36282f63a691390c9e1dcc7176fb8a78da6b31f24627e72854da0cc2c9b958ba6d42c9c43d212c07 WHIRLPOOL 45fb1a741ecf0d19ba1518cf85e82864d8dc0b85434c52afda6bcb0c9479f5100ab0ec4906a293eec14fff09ae450ec2d31e092fbfd2f80e3cefb85e981c1263
+MISC ChangeLog-2015 915 SHA256 84aeb19fd528f9ba9c13fe4781cb8601776ec0cea4e54ca866bdc9b5e856fb0d SHA512 32d61ebae142f356652004a0cd64f06c071df4552a117ce9369a3832b03d9bfd293479b413a809a23a2318ff435fc80b94028f07e0c69bde4ecc70d2b59d0ab8 WHIRLPOOL c778e583ef3ff3d85b04cfc28389dc986768a00f8e3b8bee46ff72069960045f1fb45f2fefce19fd862f827cf7548cdbd5923c83e3a4229c7dbf764e456f2b71
+MISC metadata.xml 315 SHA256 1c59769efe91aa56268186ac3ba21fc826c3fcd3ef80c2d4d889b4ed3a9eec9b SHA512 ba7b5a27b035c27c8a788a8ef6e01431d6cf8517b7e3d3fd57a1b2a93434c40b7518f74b797e651d4f81933b5ec63304fe80d6350797e35f78caa88fc1d5741e WHIRLPOOL 097f692da66d2d338bbf81340b005ed0202fbf804075b8ce565beda5167aeae03be166bce102e69035649b1bc25bf81917bcc80cd22f644f0c2906d8ff4d1f11
diff --git a/dev-python/jaraco-utils/jaraco-utils-10.0.2.ebuild b/dev-python/jaraco-utils/jaraco-utils-10.0.2.ebuild
new file mode 100644
index 000000000000..9e37b474110b
--- /dev/null
+++ b/dev-python/jaraco-utils/jaraco-utils-10.0.2.ebuild
@@ -0,0 +1,33 @@
+# 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
+
+MY_PN="jaraco.util"
+DESCRIPTION="General utility modules that supply commonly-used functionality"
+HOMEPAGE="https://pypi.python.org/pypi/jaraco.util"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+# The binary calc-prorate is now part of tempora
+DEPEND="!!dev-python/tempora[${PYTHON_USEDEP}]
+	dev-python/hgtools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}] )
+	"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	py.test tests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/jaraco-utils/metadata.xml b/dev-python/jaraco-utils/metadata.xml
new file mode 100644
index 000000000000..996855360b40
--- /dev/null
+++ b/dev-python/jaraco-utils/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">jaraco.utils</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jaxml/Manifest b/dev-python/jaxml/Manifest
new file mode 100644
index 000000000000..ac02e6c7f0ee
--- /dev/null
+++ b/dev-python/jaxml/Manifest
@@ -0,0 +1,5 @@
+DIST jaxml-3.02.tar.gz 27718 SHA256 7c6693cf2a200dcc81939e648f7d8ec59ac0b9106e6134aba4e7bbc8e3f3e019 SHA512 e23b4026dfb7b7d08cfa7ebdda11b66ad7dfd5a158495d90d73988e9b9d5ccb898cc7df112a78c6f3724dd04a0fdef24129e3c115b230e56b184acd28f844597 WHIRLPOOL a1d28cb4f49100a2eb2b3a34719936c99f749baab2bc443de08924d3eb6eddcdd594de17b6b619c774aa0c9acc743a2af5783030f02a749bd4b815df5d9bf93d
+EBUILD jaxml-3.02-r1.ebuild 535 SHA256 03ed140b0469d40c30d0f6cb429ae54c6d9fe2f44d08f49e591009b18bc81f05 SHA512 06c1d6d074f066c31723f6b9bbde3f21c854cd904ce440b1513248d1fbe60ad7edae9794fa690f87e296ab17b32bbf809867a26fb84adb1c806fbe7e911866f3 WHIRLPOOL d47b23c5ee4d3182fdff6421ea3ea6470719395425c92370a9f35d0074edf30e2a24179ce04b79ac6b233ea6db47055a0eaf252e042c6c4496dd8190a4654f52
+MISC ChangeLog 2570 SHA256 ca5166f77510cfb7a75aae2ae84f2c2cbe41e9c0ce6504908f85fbe6bdf59c2a SHA512 67ffd81b8be555d7642e9d4947f5748b05d3a5604212140089e253b5e169ea65388c270b25cea0c1584bde1f594d312b8390afdf2d064e9fb8bd63eb1bf97427 WHIRLPOOL 087b23c30c9fd9d4de86e22c5311882c7ffe87295c28503f7e98de8d67c3357754bd1c793f29665994baa7527de55950032d3b117005cc04a83f992987feb5b7
+MISC ChangeLog-2015 2905 SHA256 80e991f4beea0d9121e83a3a5dfd0208437470f15376c0c497d9ae4a83bc121e SHA512 d2a9e25d9437a02a4b392ad453c35b24ca72141cba67343401c65fbf0aca4a2305ab5709efaa62e61f7cdc3647ce628a4c0f502115adc2c240ba99faa98f590f WHIRLPOOL 43d6068f8e7067137fedbfb1c690947d32d84781cbe24e5802668ee1668a9a7be2cf73689cbf87dfbc8bbed830e125ab6b90edb368e4517cac82086979e654b9
+MISC metadata.xml 308 SHA256 0066f66a2eef51f36a8e3ce17b2ca03532bb67bc2365245d7b48935424cec1ae SHA512 9ad2ffee9add34959b829a18859f17d43b4ad4c09914eb8bf6ede1d38e383c279f8482be74415dcebdbf1f1e444b1a5a4aa5e7734bfc066d061612502a8a775b WHIRLPOOL f03c36ec13e603c2ef89ce089585f69012f101f1815b3fc2e55c9c3eb5c3b046a8fac3f8ea15f328c7b7aa9a78e3aea8835eedf5b902d39b4ac9f054d018b61f
diff --git a/dev-python/jaxml/jaxml-3.02-r1.ebuild b/dev-python/jaxml/jaxml-3.02-r1.ebuild
new file mode 100644
index 000000000000..dfaa543dc92b
--- /dev/null
+++ b/dev-python/jaxml/jaxml-3.02-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="XML generator written in Python"
+HOMEPAGE="http://www.librelogiciel.com/software/jaxml/action_Presentation https://pypi.python.org/pypi/jaxml"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ia64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/jaxml/metadata.xml b/dev-python/jaxml/metadata.xml
new file mode 100644
index 000000000000..3a3a70253635
--- /dev/null
+++ b/dev-python/jaxml/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">jaxml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jdcal/Manifest b/dev-python/jdcal/Manifest
new file mode 100644
index 000000000000..d18481104a98
--- /dev/null
+++ b/dev-python/jdcal/Manifest
@@ -0,0 +1,7 @@
+DIST jdcal-1.0.tar.gz 5677 SHA256 133220a36c533bae02355aca7f507de7b33e57e9467d33cea7d5673ba354a3e6 SHA512 5e9f865a3c9a123a56d084c9ddd325cfe6c246e1a9162bb8f000abaf7cdf376b1e38f7c2a97f14a13d2f4b3f3de4e7e3773a903f905685ce76f541b50134a408 WHIRLPOOL d09da7dbcaea2ae10fd992b20ce5c7203cd020443ed685e5dba6183cd1296e824ba66fb06e317f1598302cb17fe5cf914ff0e7e31dd626029ed6e8c292717c9b
+DIST jdcal-1.2.tar.gz 7059 SHA256 5ebedb58b95ebabd30f56abef65139c6f69ec1687cf1d2f3a7c503f9a2cdfa4d SHA512 cb7805229968cb9f5822e97c255b3666e50ac424725ece20ec3b980b87b84334bc13f2e772a4be2a0341b31f569edc11779796a41ae22d85cf822f9aa0a471af WHIRLPOOL 772909d027f27dc4ea2a00806f62e421ad0a0c29bb048a1d0677b8dfeffcbdf86617698cc8a8bb1e342d2b3f8ac7b310294e140d7f86b157c4c02519d3cc8dfe
+EBUILD jdcal-1.0.ebuild 433 SHA256 eb062aadc38bdab173bea9a275ea1c55a4612bb42bff21dc21bdd887546416d8 SHA512 cd2a1bbc9455f6c4ffb2f544539022c9127c3edf8dc27a5f806437ba4d31f9af72ca1a1ae32cb02f3df8ebe2b1f591164eccfbba93ddd5c8dcc39f4dd9c44e21 WHIRLPOOL e7868160bfd009e343a65394dd9a94beeb10f0b9407d5e89ff68670437fdc6d9079681f385b01524c3d42c456047478bf08d6e4c50cfc74a8076509716194a6d
+EBUILD jdcal-1.2.ebuild 435 SHA256 9b1150776c8fa8dbf519caf56d43823fefeeaa063a3f65355c5b5e84e570e55e SHA512 71a34b4c910a8a38f10808ab4167882498dfae48ba5cf078c24efc2e65bcce26e8edb5c7cec00af421f1b42c71155059a6ded626b5c7e5b5aff550cba9eed765 WHIRLPOOL b2dddf89c523034d09b6e2c6b56dec5128d88a46ea00012abbd092f3c6aefda854b58d90165272d6bffaa0bf5b64c427b3ed4db1aa0ba89ac887f8ab32169a13
+MISC ChangeLog 3014 SHA256 a4e1db0f05cb7dbf5274354ece78f171f540f7681e75aa6fabe93efb30f62676 SHA512 e5b670ab87028081de9b1ebd84ecb7156ea9ee86ca9ab744816829100f747986464980f4ca5020e729aec08cf198b46bd5305615fd76576642ffaba91b7d0768 WHIRLPOOL 81e69cbdbcffba64bb56548251708813063b6d9393a67d9269450b5a3a5234c5a18acafd2d0f496ca61adf43de724c3801de765af6a732d27cce6dbad05603e7
+MISC ChangeLog-2015 948 SHA256 ef8b83af61312e1b0e9be8ce59a483a86dffbee34d451bccb3c9c171ebc43c61 SHA512 79828dc7a3d660811e00182c891f81571172e5638b14415a5f7d067c316a3f5622f69bfb325c2b9bc850d2254437bd2a7e8103b6bd0087eddb59b8fca17a3953 WHIRLPOOL d20bbf5eb164a866924699d419c26172c5802a123e754b67e1379822e56f10206ed4bbedf846e4b99d10a679cdf29ed9fc358c41af74e51fdeb4508a042f3a38
+MISC metadata.xml 369 SHA256 e39d6b47b4b0e5dbc8ab1872ed088ed02c96354a4c6b446f72e7cd1f8e90fe51 SHA512 dd32db88be812a5a89482abf0c22de65201ebc26b6caea99ef3cccbb170273da086b9b6380a7e8894574c96b03844a76256498941d9821cedf817126d6594a8f WHIRLPOOL 25525027f21d7028f3049bccdbf3272aa9f115b2f99f28104726c01728745a60fcd05e21938347d0d4e8635ce4d187b79917d4222fd8d6bc53b70cf1a5bacba4
diff --git a/dev-python/jdcal/jdcal-1.0.ebuild b/dev-python/jdcal/jdcal-1.0.ebuild
new file mode 100644
index 000000000000..8492435ea527
--- /dev/null
+++ b/dev-python/jdcal/jdcal-1.0.ebuild
@@ -0,0 +1,16 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Julian dates from proleptic Gregorian and Julian calendars"
+HOMEPAGE="https://github.com/phn/jdcal"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+SLOT="0"
diff --git a/dev-python/jdcal/jdcal-1.2.ebuild b/dev-python/jdcal/jdcal-1.2.ebuild
new file mode 100644
index 000000000000..561f8b8f2c4d
--- /dev/null
+++ b/dev-python/jdcal/jdcal-1.2.ebuild
@@ -0,0 +1,16 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Julian dates from proleptic Gregorian and Julian calendars"
+HOMEPAGE="https://github.com/phn/jdcal"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
diff --git a/dev-python/jdcal/metadata.xml b/dev-python/jdcal/metadata.xml
new file mode 100644
index 000000000000..520a5de8ab37
--- /dev/null
+++ b/dev-python/jdcal/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">jdcal</remote-id>
+    <remote-id type="github">phn/jdcal</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
new file mode 100644
index 000000000000..3e3062a001ae
--- /dev/null
+++ b/dev-python/jedi/Manifest
@@ -0,0 +1,5 @@
+DIST jedi-0.10.2.tar.gz 373879 SHA256 570aced88bc9ac34d8fa91d3db6de834f45c8adaac3f7fc1a1e9e08e19491acb SHA512 847b000894b5e17cf5582c88245989ce1f0e17b595c79a2cdf4cc7a805fe7360ea08f28ac31473408be795c9ea210c85541cffa5fc7e7119da8c0228eb509351 WHIRLPOOL 3e3792994d3f6a358f9109ddb288427733268a3b08040975af256ddda802e75f8bf3b924490e996798bddcff70c041a52017b209d796b031bc0437e0c2b3939a
+EBUILD jedi-0.10.2.ebuild 988 SHA256 90443b40178a51d86324f1d10a3ce857027a1256824f5d788af809add9567a4f SHA512 e354c07d1f2378b94675b59476a9bab9ef7db19eff2be6fa5f86fb931fadf6c2de55f9df43203481957a42f622d75b0867389523e3d3dd7e2267c1d02797d611 WHIRLPOOL 00d72afd5026b4ce3ff9e8c87870e7a31ad3a09bfdc8d810aff3e636b22d038ee8fca12e49d945b42e96d2be952034902d9e5b74bce1dda7e98b6806530dd523
+MISC ChangeLog 3328 SHA256 0cd206f65f61b25b62363d2db054233b46de58b654e8726e1cb16cf5ac3c0f6f SHA512 69688070a8ef7bf9db918a9108e676c8831a6573ccbc8cc39572ec57a2c117946155cd1b0654d73d6b25ab02bc1cd09dc74c6314bc4c0d2a484aeb93e80d993c WHIRLPOOL 99b2f1d2831065d1990d9e0f0fced5afa0cd4f0661be384ea6003e7431681575561062d7d62b2c05c312a82e9a6180410691e75217ea99188b6882081ca2f30f
+MISC ChangeLog-2015 3524 SHA256 7115554fbebeb95634e89f17f1017c0e7807c8241f0cbe1ab78a35886441671a SHA512 6a918ec33845ff01d821778639a8abe245f30789344dfdc73041fc5f4c32d56f9716e3f3586c0f2a824b514030f500df2fe2605d75f10449d49f7fb95f2b1138 WHIRLPOOL 974e916ac997fd77065f642b505da1b470bdddb4920ce2adcaedf23eaae72349ba2b93f68aa876cffbca2d1eebe2ce808341c8d290e1f9c8189bfbcd15fc2b1c
+MISC metadata.xml 375 SHA256 78c1c92499f5e4d593def340149f9ccf769afc79a2c1500b8cdab5267e2739de SHA512 16271d48499888ad36f71d79301ddc361831a7263f3d0ad19d12c29b51c52c24806a7a366c6e263b4b6d43e28856cd336b0bd728fa00a5fe5111b505fdc50977 WHIRLPOOL fb54a95ff23c5145576d872c3abf69cbfff463581cbda5f2e7624e88e77c8edefd0cf71a05742db0b5ca333b6e974bbc0cf1fa5c08d065665fe163f02df17dca
diff --git a/dev-python/jedi/jedi-0.10.2.ebuild b/dev-python/jedi/jedi-0.10.2.ebuild
new file mode 100644
index 000000000000..9850629b4f5c
--- /dev/null
+++ b/dev-python/jedi/jedi-0.10.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Autocompletion library for Python"
+HOMEPAGE="https://github.com/davidhalter/jedi"
+SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	# skip integration and speed tests
+	rm test/test_{integration,speed}* || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH="${PYTHONPATH%:}${PYTHONPATH+:}${S}/test" py.test -v test \
+		|| die "Tests failed under ${EPYTHON}"
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( "${S}"/docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jedi/metadata.xml b/dev-python/jedi/metadata.xml
new file mode 100644
index 000000000000..25c892708c62
--- /dev/null
+++ b/dev-python/jedi/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">jedi</remote-id>
+    <remote-id type="github">davidhalter/jedi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
new file mode 100644
index 000000000000..96ad3113fc23
--- /dev/null
+++ b/dev-python/jellyfish/Manifest
@@ -0,0 +1,5 @@
+DIST jellyfish-0.5.6.tar.gz 132177 SHA256 887a9a49d0caee913a883c3e7eb185f6260ebe2137562365be422d1316bd39c9 SHA512 12f09e877dd2a9386adc336a56c8ea6566179e5ba333045ad70604c17c288fa61fad2aa9735c76c58d69dfba95f99876e608e2d05995085f970834132fb8504f WHIRLPOOL c5db2e15d44b5ca891a733165dbd68c49becbe3a66294a457483a7012fa27f70fb0941e80ada02bc2f94f6619717981b0ca3f7d3234dd6b8554148bffc396954
+EBUILD jellyfish-0.5.6.ebuild 992 SHA256 9357e472a7d849842b79c205d597fe5d250558569ededc26526a8468f55506d0 SHA512 9c43ad3d59ec5f3c362d5565a90e10db6fb9227f0d4af072e1b1bde4377910f09ab9ef7182518b12987bb9575707c3417a484f5bc6f228b0bc0e319b85bcc014 WHIRLPOOL 1a6341caec5fe96437fdc9311289a0c750edce1ff1761cebbcf01f51c1e99be4e79b86c5dcc9a7b43aeb4491dc0be2be01981d8849f7ac34652d3cc3c79fb3bb
+MISC ChangeLog 3059 SHA256 0e508ad10469b50d15d0a9188a5267fca9289f30404252720a2b4d174e1e4918 SHA512 c4e7ee6e7693b3dcd41df867b741b796ee5876c51a78a38b2e43c477c0d5ddead5b57456b26c58c88f45d0c7f192bf8e74d410b24ef52ff14ef1200a6f41d294 WHIRLPOOL 2830fd140ac8411896865c3259d4267d0abb4c55a528cf62fed41980035515b76106f203d548d5bf7cca8ba93e4917c5acdf1fb93d5daa9ee42f717bc5658b4b
+MISC ChangeLog-2015 426 SHA256 4eb90dc0d393479aae5fbc2fe7e27614b50c34f841e244b61a3324aac9b2d2ae SHA512 ae266aeda87cfeedcbba09c38eb8c3066874a47c188f7ea74a33e68fb8a16786390d969f17ae56b7a5dc58750921da21c0ddf3aec1ca845aacdbfed05832b335 WHIRLPOOL f5e5610ef51e2efaf51b2b6e51725c581ac815b326e96f5ed7bbbbfcf0c25cf33063613e556bb3e362a516218a9b95c90942172b26e6bd365b2f107ec35d9471
+MISC metadata.xml 503 SHA256 cc1b17d3da51b7045384d6d5b8ca12e10fa06031f5dad006a831f4d17f85113a SHA512 47e552f516be95767e3dfe9b5b43ea36b02369cc426cebc25d66ed6c3e449c1041d6c79351669d80ac13d19a45f699a719a80130073d02d14459c4630c87736a WHIRLPOOL 2a47a06a13bd02eebb16a89908525a4f8849a787be8dd6e40e6c2ba105f48223c2ac19756fc7a6eff806cfe0543a35e9517d94c4b28e2434ac998e18391843ad
diff --git a/dev-python/jellyfish/jellyfish-0.5.6.ebuild b/dev-python/jellyfish/jellyfish-0.5.6.ebuild
new file mode 100644
index 000000000000..b73a765398e5
--- /dev/null
+++ b/dev-python/jellyfish/jellyfish-0.5.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
+HOMEPAGE="https://github.com/jamesturk/jellyfish https://pypi.python.org/pypi/jellyfish"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/unicodecsv[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile() {
+	esetup.py build_ext --inplace
+	esetup.py build
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( build/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	py.test jellyfish/test.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/jellyfish/metadata.xml b/dev-python/jellyfish/metadata.xml
new file mode 100644
index 000000000000..a46869b41f3f
--- /dev/null
+++ b/dev-python/jellyfish/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">jellyfish</remote-id>
+    <remote-id type="github">jamesturk/jellyfish</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jenkins-autojobs/Manifest b/dev-python/jenkins-autojobs/Manifest
new file mode 100644
index 000000000000..301bfcb44570
--- /dev/null
+++ b/dev-python/jenkins-autojobs/Manifest
@@ -0,0 +1,8 @@
+AUX local_jenkins.patch 791 SHA256 cd83de0640a987b8c5a4f06583ac5a1c09bf6a3a32abb288844637953bf9a0c2 SHA512 1e6e555d4402732cdcd26bc4fa6260815de6e14a6abb75b0ac7bf4a80fe52c9c02af016125cd34eead163d57aa45ceeb704d3fbcf1f3c37970509530143a2cc2 WHIRLPOOL 4bda71f9c7abebbdadecc28c9f6d92f61c9c7e62f76445556af1720a5f443a09c902ea7e946e3a6f653adb3e20f67033c99f1e2a10073c7927532448f59d5983
+DIST jenkins-autojobs-0.14.3.tar.gz 151992 SHA256 ceb7fab28421c34b01015116cc64428ed3bf672381de759ae3d029500fe1b161 SHA512 1db2d02bf6f1c2d52d0197ffc21e80e5ccd48f6e2020bbe4618ab06792ea3988a42089c1fe1e6d277e30ea6ecf58078d8138da0c463862a063583c119e67e805 WHIRLPOOL 465057f18207fbb1d4d5fe48b06151dca2cc683ae4ba72c92ebc3a4e8548aa4018605189f4f1c353d048230c5a70eaf2bde41648cd0a84e1213f834db59d7f68
+DIST jenkins-autojobs-0.14.3_git_1.1.21.hpi 2108607 SHA256 bed6ad5ee68ab126139dc0a889d04d31541bbeb0063e05734d34a3586fe98124 SHA512 6fa6386f0292cfc61f44dca11860146b7c35df46adefdfec547789b75145fbff61e620195e5f756ae8902211117b4cd2cd7d616dfe51204e563ad38154a67d88 WHIRLPOOL af70f74034cbd6205f4a3518ae1273500b8f526378a02963437f4e92c6594faea8b59a5d1ff0035e9fa90bad328074f5eeb37c815997a25291105b599641478a
+DIST jenkins-autojobs-0.14.3_mercurial_1.41.hpi 107202 SHA256 944a83d115171affdbd4d7e227cb234d01aaecbff90b49bd54800c93b820eff6 SHA512 76d24c9964d7d4590f128bf1577f54a0a4b799d275a0e7874aee95aa20c3ed0313b96bb6fb4e7f9603a4433db68e4d0caeb4ca22394cdc24a436fcc3b32b8d67 WHIRLPOOL 2b32cf6aa2bc23f62e1ec173ad8a16debf7c313902ab8eaf5f41ecae870e0c81fa095756d6c78af9b0106a2042f3f5a5fa9d5b9743c53d09d586d28c4bc9925f
+EBUILD jenkins-autojobs-0.14.3.ebuild 1913 SHA256 cc018ecbf608b90a5679c73c5ff1707e407b66d403178dbd2ad6ca435d617066 SHA512 b427ac22d0e640646a583f5ce9ed550368f215b10383e18ea86a1c6eedc7f925abd3654fb88483ca92b620c876a71aa6d24ef07b4ff52c8b7a3aa7211e1d5a18 WHIRLPOOL 9861ce43bb59ae8779418bc170cfc881ce455cb7b1c7629ba543d76fdb2cc609b5fea66d3ae98343d751e75ef947ff45fdaa6986853ea28e35ca6ba958c3d0b9
+MISC ChangeLog 2750 SHA256 8535adbb8eb3087e28dd5746b749b43890b436c8b3bfe0d468969a62b94ea57e SHA512 6a4072c0ffc77280733495766ac8a866dd55a4097c4537b90fcbf3b33613b3a52ff2046b8c822632c0ee19b90b4f631b440a7b3d59567a111e0ed42d8984046c WHIRLPOOL 18fa294f5f1d057f7affc4b486eae213b96fc277f7c50fe6dd7a59d4c2432ddb2335a9ab91dc604abc2ba885463678a8bc98b32bd7065971e30d0fe25f695629
+MISC ChangeLog-2015 671 SHA256 b582dd19cfd2a9d5b41d993cb5d6942d36dd39c9847be938e2eb4efed0f86a08 SHA512 d516730a4eac3d9b64ca81a59e636b05bc14220dcf74d3b23d12d9cd99ead02548549a54ac6310f969a485cb97ad15e844a60e06abc44d54baa38a54efa83c83 WHIRLPOOL cb0f5569162b74658e5c7094ed51592b9807722545f9271982993128989947629ab24504a809538cefdf6be3a84d7b47c3c90cbc3d1f4c8271d256bdd6c9f268
+MISC metadata.xml 261 SHA256 efc823676acb890d75d806e045afa3ab0fb5f1f5e4004e73bd95d059775f298d SHA512 37e30a12d6a78ffcaca06791def124d675df7c6252b1a1cf4716ceb2b66ea078dc65ec97a97eb946961ff8f4c8f6205dc7739504e5e911e33033c156be310397 WHIRLPOOL 92a84313c6deed9e303a12894d0dc7570fe5bac920c00e59fee729f9a4ad461ffa26123db7c5c3ed6725f2936fa556a3eeac520edb6ed60d2ef4230c5ed315f1
diff --git a/dev-python/jenkins-autojobs/files/local_jenkins.patch b/dev-python/jenkins-autojobs/files/local_jenkins.patch
new file mode 100644
index 000000000000..96bab635ffe8
--- /dev/null
+++ b/dev-python/jenkins-autojobs/files/local_jenkins.patch
@@ -0,0 +1,26 @@
+--- tests/bin/start-jenkins.sh.orig	2015-01-02 23:10:17.000000000 +0100
++++ tests/bin/start-jenkins.sh	2015-01-30 16:35:27.058035074 +0100
+@@ -19,6 +19,8 @@
+     echo 0 | nc $jenkins_addr $jenkins_cport
+ }
+ 
++cp -v /opt/jenkins/jenkins.war $jenkins_war 
++
+ if [[ ! -e $jenkins_war ]]; then
+     echo "Downloading jenkins.war ..."
+     curl -L $jenkins_war_url > $jenkins_war
+@@ -31,7 +33,6 @@
+ 
+ if [[ $(unzip -l $jenkins_war | egrep "plugins/(mercurial)|(git).hpi" | wc -l) -ne 2 ]]; then
+     echo "Adding git and hg plugins to jenkins.war ..."
+-    wget -c $hg_hpi_url $git_hpi_url -P "${here}/../tmp/WEB-INF/plugins"
+     (cd ${here}/../tmp && zip jenkins.war ./WEB-INF/plugins/*.hpi)
+ fi
+ 
+@@ -57,4 +58,4 @@
+ 
+ [[ $jenkins_running -ne 0 ]] && exit 1
+ 
+-wait $java_pid
++#wait $java_pid
+
diff --git a/dev-python/jenkins-autojobs/jenkins-autojobs-0.14.3.ebuild b/dev-python/jenkins-autojobs/jenkins-autojobs-0.14.3.ebuild
new file mode 100644
index 000000000000..ff00a92b13ae
--- /dev/null
+++ b/dev-python/jenkins-autojobs/jenkins-autojobs-0.14.3.ebuild
@@ -0,0 +1,67 @@
+# 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
+
+MERCURIAL_PV="1.41"
+GIT_PV="1.1.21"
+
+DESCRIPTION="Scripts for automatically creating Jenkins jobs from scm branches"
+HOMEPAGE="https://github.com/gvalkov/jenkins-autojobs"
+SRC_URI="https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		http://updates.jenkins-ci.org/download/plugins/mercurial/${MERCURIAL_PV}/mercurial.hpi -> ${P}_mercurial_${MERCURIAL_PV}.hpi
+		http://updates.jenkins-ci.org/download/plugins/git/${GIT_PV}/git.hpi -> ${P}_git_${GIT_PV}.hpi"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+RDEPEND=">dev-python/jenkins-webapi-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.2.3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+			dev-util/jenkins-bin
+			net-analyzer/netcat
+			dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? ( 	>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
+			>=dev-python/alabaster-0.6.1[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/local_jenkins.patch" )
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	if use test; then
+	  mkdir -p ${P}/tests/tmp/WEB-INF/plugins/
+
+	  cp -v "${DISTDIR}"/${P}_mercurial_${MERCURIAL_PV}.hpi ${P}/tests/tmp/WEB-INF/plugins/mercurial.hpi
+	  cp -v "${DISTDIR}"/${P}_git_${GIT_PV}.hpi ${P}/tests/tmp/WEB-INF/plugins/git.hpi
+	fi
+}
+
+python_test() {
+	# Test phase works with the limitation that it need be run as root in portage
+	# starts jenkins
+	./tests/bin/start-jenkins.sh
+
+	py.test || die "Failed with ${EPYTHON}"
+
+	# kills jenkins
+	echo 0 | nc 127.0.0.1 60887
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jenkins-autojobs/metadata.xml b/dev-python/jenkins-autojobs/metadata.xml
new file mode 100644
index 000000000000..69a9c16c4b6b
--- /dev/null
+++ b/dev-python/jenkins-autojobs/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-needed -->
+  <upstream>
+    <remote-id type="github">gvalkov/jenkins-autojobs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jenkins-webapi/Manifest b/dev-python/jenkins-webapi/Manifest
new file mode 100644
index 000000000000..f91e8338945f
--- /dev/null
+++ b/dev-python/jenkins-webapi/Manifest
@@ -0,0 +1,12 @@
+AUX local_jenkins_war.patch 507 SHA256 67280cec608df88bd84c3bce86fc53c33dec3525d86df08411e475146321e84b SHA512 8283091c6b491ff6207a678ccbb6a219691788c92a9aaabef1c0f60961acd0661ba2e8ab7c827d09f2b9eb3c61890cb017d3c36a6215ff6376875956867af0a6 WHIRLPOOL 6ca56fa00f4fb1c7f8d80209b67949c26f2cc3e7b0c03a2f91c5b0322228ff893cacadf45b950f13661728cac80d549bc6185eca9267d40e7b63390e74a52dd5
+AUX tests_py27.patch 201 SHA256 e4ece30897bb72567e4eba12b2b5b0566f05dec60aefd0c8750149c82388a892 SHA512 364d3dbaacc3573d6cff0a5b42553860276bbef20b77b09ebedb5bec2e5a644cdd0b186595ba104f1764decdeb7272d4584ebf83b2012bbec3595eb59d68b81f WHIRLPOOL aef08ff5be531bd16eb02f3fbb5c5f73527c5401e482104a25987fa43e1677b6c19c51b27b1c33fd6f0f22d5d0c81900b5b19387ecdf8e6783112618e832a7e0
+DIST jenkins-1.596.3.war 68396864 SHA256 85409f83b81ba90094ecc9e3ea6df0920ecfb3064b731a6a5c9b397eda18b47f SHA512 8652d4d18e3258208fe190c4a6aa5586faa66f690d7d7f7369c5490a587e3ec5e074dc22f2c8caedf5e5335f5b8f511717b2d6eb667a61e9948a703bf80310fe WHIRLPOOL ac6401ebe42a42495dc148d71a61daf49905292e6cbcbb5d8e41f520a01c8f1f783fd75baf908a3e99fbd9f25483366a3a5a005fa04b5843550c8e211f4d8e2d
+DIST jenkins-webapi-0.3.2.tar.gz 14831 SHA256 8f67d86c1f95edb79928af9b3b7c60ef9a63bfbfd19b6fe0a892ef4039f25500 SHA512 2ac59c90bba48406cc9fe5595505d5836eab1147869fbc8c06577767891d37904bffa5516316af0cb25f7f9193ae5277c0219ecc9daf5e0efa093fd449d1f4f0 WHIRLPOOL e4562a1857d7c526aec8c5ecc35f6a0644c48bf69fad4bdfef20f0708fdc0dfb5595c428acdc03e1df02c3d21669d47c89e0f3a99c1ee09a9741f9e21ab83b48
+DIST jenkins-webapi-0.4.0.tar.gz 16149 SHA256 7515b1e0503e07d50088e32205873146eda3b1132d8a6508e28f4e935c41e8b2 SHA512 ae40366e6fb6414391287ffa42ec92fba1971f070ac718d521c5b10f6e47d14ceea15a8c71f559380356530fdb2f826e08a6c611813b407dad73dab39fcddfeb WHIRLPOOL 30abf44c7d1ec6884baa3481c9d2f234f46f812d5ee6a8d9e49de8bc367ffef9c58f7653dcd30c24a308372cb8f6211e51f40e441e17f9ef15abd222de5d775b
+DIST jenkins-webapi-0.5.0.tar.gz 78813 SHA256 d3a730761bd5164683e1bfff53332b0bf056393e0660769ba8e09df6d555304d SHA512 dde91231e6fe6713eb5953efa038d44a820b51968c2b0591e5dd064c7a35c7dab4d1780370dc97a0a671b3d3cb7d8a48e571c7c0af4f0d5f8a65430c8c074eb3 WHIRLPOOL 2110593ae171efd30f4f0fd407d8bc526e85ce53a3670b5f4c09c73aa8a880cdcc314091104e1684485899a65227a2da18fba7c358a7d11a80f0de5ac99a26c7
+EBUILD jenkins-webapi-0.3.2.ebuild 1170 SHA256 ab83dc6cc7b5cffd43841151bea8168ff4b0918d799614a27263598943b0ad33 SHA512 e566ef0870cccf094f27a099fdca3875d6545e0659cc4263ea493945ce69724089143ec25d656fe5f02c0795398319c34e01bb5a4ce61ecc2ea4093994384fd7 WHIRLPOOL 4f5fe803af5c6aa733dca89332504c1c65513c5494a4728c6b55d5d8520564ed1721f92e64f7263fe7a11f459a2df338cd5e6e3555ea600c72a96e9a81602b73
+EBUILD jenkins-webapi-0.4.0-r1.ebuild 1136 SHA256 c5c748e3dd0ec85dd6be58da4fa91c1e26e90d2eafeafc353a3e7d049fabc842 SHA512 e5275533ed8f09399c6159338e19e7461212f0df25e69cd4739534a4065d5fb91f05eb085f0aaf3c09b1d4e8cc0266eceb60a788ffe387a188a5363f63279578 WHIRLPOOL 1fcc6439f124affa8bc25be7af1e8a9caa00091098536970b70b250aa6d75b8e57010e8f5d23a375cbe0479ac6c192f0479631bf170300b5b06c13328af31d85
+EBUILD jenkins-webapi-0.5.0.ebuild 1561 SHA256 e80283637c9c3ce0dd27f43c5d56b2542fe052cb545dc707e83b48b0b813a327 SHA512 0f161b5bee11e27c546248db1ac75ad4d0abf687e6446764a65b049179c90d71c74e2a2f4b6098eee8749ee78f87a29cb6edc10ea929fd5f215ada77f120bc6f WHIRLPOOL cd1ac04b9aada3caa771aa0a9831c51f642088469f9b28b6444a87cf584ee4182e99d6c599d3f6494d55ee65d21bfb72e42742a3e4554027cd878c4e04890d27
+MISC ChangeLog 3083 SHA256 5421c75abe4fefb4fb0b809f29929b6fd6f505c5260318992f86ce613cb61474 SHA512 5818bb8215448021688a54c13e08af691a3cf74b381df02573263f0e4c0dec950da02129d348a886b934292b925f3e4149c43f803f4cbe483f611bf12e850a54 WHIRLPOOL 1eb754fc2a34121160dd7338e0e2313942849e7effefc78c12ed0e44c47f7dadaf842e1296a6af7084bacd26f58e1ad7c7ce5c954bc5c54c6c2140c9e5db3e20
+MISC ChangeLog-2015 1159 SHA256 020bd62d652ec6aec530d51854b8b3e2460a29ff0fa555c210118d37f81b6cc5 SHA512 72fb40bdc99da6d2ffce83863da366d0fccc5e732e9bcea150939688a22b78254de41200e9ab7e00894f3a25670c4901e597d2786e325c2c39c669ddf6e637d1 WHIRLPOOL a1a546956a6fcad72ced8f8e4d674184512106b22473c01318a11fc4d57a50bb3669ad87f7f92fb9a59ab43c86958d8d6b557acbc67c7326852c09df96bb7a1a
+MISC metadata.xml 254 SHA256 810a5e11377d8eaa51460be453e5ffa9d2c36d588fa93b5ad1d652c77b5f5123 SHA512 2e112d5670c712a9738320e0505f1758f82d57ddcb2bc71e3ad22ee08ef52538f150c316571e59cc3a86f3647cf3ebefe715762c79048e9a2ea56e1a6245ee77 WHIRLPOOL 86185a8bc67d176cbcbe5dfe4bcbb3e233de59dedb65e62bd1a042fb4e59f9653dc20d873b325b1e3ee1663f19d4bf8c2deaa44eb307cf5823add809b864f125
diff --git a/dev-python/jenkins-webapi/files/local_jenkins_war.patch b/dev-python/jenkins-webapi/files/local_jenkins_war.patch
new file mode 100644
index 000000000000..c41f5bb51ce3
--- /dev/null
+++ b/dev-python/jenkins-webapi/files/local_jenkins_war.patch
@@ -0,0 +1,12 @@
+--- tests/install.py.orig	2014-11-23 21:21:29.000000000 +0100
++++ tests/install.py	2015-01-28 18:29:42.750933314 +0100
+@@ -23,7 +23,7 @@
+         self.destdir = destdir
+ 
+         self.logfile    = logfile if logfile else pjoin(self.destdir, 'jenkins.log')
+-        self.jenkinswar = pjoin(self.destdir, 'jenkins.war')
++        self.jenkinswar = pjoin('/opt/jenkins', 'jenkins.war')
+         self.jenkinscli = pjoin(self.destdir, 'jenkins-cli.jar')
+         self.homedir    = pjoin(self.destdir, 'home')
+ 
+
diff --git a/dev-python/jenkins-webapi/files/tests_py27.patch b/dev-python/jenkins-webapi/files/tests_py27.patch
new file mode 100644
index 000000000000..5a6e8c9ddf69
--- /dev/null
+++ b/dev-python/jenkins-webapi/files/tests_py27.patch
@@ -0,0 +1,7 @@
+--- tests/conftest.py.orig	2014-11-23 21:21:29.000000000 +0100
++++ tests/conftest.py	2015-01-28 18:37:25.388067816 +0100
+@@ -1,3 +1,4 @@
++# -*- coding: utf-8 -*-
+ import re
+ import time
+ import pytest
diff --git a/dev-python/jenkins-webapi/jenkins-webapi-0.3.2.ebuild b/dev-python/jenkins-webapi/jenkins-webapi-0.3.2.ebuild
new file mode 100644
index 000000000000..032cd14fbfd2
--- /dev/null
+++ b/dev-python/jenkins-webapi/jenkins-webapi-0.3.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for interacting with the Jenkins CI server"
+HOMEPAGE="https://github.com/gvalkov/jenkins-webapi"
+SRC_URI="https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/requests-2.4.3[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-util/jenkins-bin
+		>=dev-python/pytest-2.6.3[${PYTHON_USEDEP}]
+		>=dev-python/termcolor-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/httmock-1.2.2[${PYTHON_USEDEP}] )
+	doc? (
+		>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
+		>=dev-python/alabaster-0.6.1[${PYTHON_USEDEP}] )
+	"
+
+PATCHES=(
+	"${FILESDIR}"/local_jenkins_war.patch
+	"${FILESDIR}"/tests_py27.patch
+	)
+
+python_test() {
+	emake test
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jenkins-webapi/jenkins-webapi-0.4.0-r1.ebuild b/dev-python/jenkins-webapi/jenkins-webapi-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..36338e08f585
--- /dev/null
+++ b/dev-python/jenkins-webapi/jenkins-webapi-0.4.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for interacting with the Jenkins CI server"
+HOMEPAGE="https://github.com/gvalkov/jenkins-webapi"
+SRC_URI="https://dev.gentoo.org/~idella4/tarballs/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="mirror"
+
+RDEPEND=">=dev-python/requests-2.4.3[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-util/jenkins-bin
+		>=dev-python/pytest-2.6.3[${PYTHON_USEDEP}]
+		>=dev-python/termcolor-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/httmock-1.2.2[${PYTHON_USEDEP}] )
+	doc? (
+		>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
+		>=dev-python/alabaster-0.6.1[${PYTHON_USEDEP}] )
+	"
+PATCHES=( "${FILESDIR}"/local_jenkins_war.patch )
+
+python_test() {
+	emake test
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jenkins-webapi/jenkins-webapi-0.5.0.ebuild b/dev-python/jenkins-webapi/jenkins-webapi-0.5.0.ebuild
new file mode 100644
index 000000000000..b918a072d7ea
--- /dev/null
+++ b/dev-python/jenkins-webapi/jenkins-webapi-0.5.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+JENKINS_VERSION="1.596.3"
+
+DESCRIPTION="Module for interacting with the Jenkins CI server"
+HOMEPAGE="https://github.com/gvalkov/jenkins-webapi"
+SRC_URI="https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( http://mirrors.jenkins-ci.org/war-stable/${JENKINS_VERSION}/jenkins.war -> jenkins-${JENKINS_VERSION}.war )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/requests-2.7.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		net-analyzer/netcat
+		net-misc/curl
+		app-arch/unzip
+		>=virtual/jre-1.7.0
+		>=dev-python/pytest-2.6.3[${PYTHON_USEDEP}]
+		>=dev-python/termcolor-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/httmock-1.2.2[${PYTHON_USEDEP}] )
+	doc? (
+		>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
+		>=dev-python/alabaster-0.6.1[${PYTHON_USEDEP}] )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	if use test; then
+		# tests fail with jenkins 1.6x
+		# https://github.com/gvalkov/jenkins-webapi/issues/14
+		mkdir -p "${P}/tests/tmp/latest"
+		cp "${DISTDIR}/jenkins-${JENKINS_VERSION}.war" "${P}/tests/tmp/latest/jenkins.war"
+	fi
+}
+
+python_test() {
+	emake test
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jenkins-webapi/metadata.xml b/dev-python/jenkins-webapi/metadata.xml
new file mode 100644
index 000000000000..773d698964bf
--- /dev/null
+++ b/dev-python/jenkins-webapi/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-needed -->
+	<upstream>
+		<remote-id type="github">gvalkov/jenkins-webapi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jenkinsapi/Manifest b/dev-python/jenkinsapi/Manifest
new file mode 100644
index 000000000000..90b78d36053f
--- /dev/null
+++ b/dev-python/jenkinsapi/Manifest
@@ -0,0 +1,9 @@
+AUX local_jenkins_war.patch 565 SHA256 cdfa4f1ba3c1581a994a359692f6f4453606a7688395d76cb6adbc019686aadd SHA512 80a191e858d4ba63fa11421ddbb87d8979630e894e4c162e986f82d59faf09b9b8e305d7fbf51299f93b3c69b7be39dabb7bca6eb2af3278ec9d4cbf08dee2a9 WHIRLPOOL 4ee8c8d09129f06f66adb0a6d1518c9a4333e59a0971301c3af716cd3f31af74ce9646210d3a62174c21a9818b9ff22a3b86e63f486c53b7e75c427d4bb68c28
+DIST jenkins-1.596.3.war 68396864 SHA256 85409f83b81ba90094ecc9e3ea6df0920ecfb3064b731a6a5c9b397eda18b47f SHA512 8652d4d18e3258208fe190c4a6aa5586faa66f690d7d7f7369c5490a587e3ec5e074dc22f2c8caedf5e5335f5b8f511717b2d6eb667a61e9948a703bf80310fe WHIRLPOOL ac6401ebe42a42495dc148d71a61daf49905292e6cbcbb5d8e41f520a01c8f1f783fd75baf908a3e99fbd9f25483366a3a5a005fa04b5843550c8e211f4d8e2d
+DIST jenkinsapi-0.2.26.tar.gz 76598 SHA256 68118e5abad7e5cd4191e1b20b08a950e5e563e816e3ba25e2f4ed994ba945f2 SHA512 5c04450bd285e2f576bcdd933ec8bd9df840f3fdcae9999305f96ea3f2e85bced4dfc5f961c763cd9137c2bfc2c9b79e032dc451978b6fc04a2fe8cb6e98d030 WHIRLPOOL 025d6c8cee081068d77350b7ffd6e03441dc2758be6b761d6ef6f00007c99ac41032ce3e1be3cf01496f6e59913e8b2f7a22ab9d66d5a8aeeca5c24922d4175b
+DIST jenkinsapi-0.2.29.tar.gz 87447 SHA256 e1ceabe0217a422e4bc1ab9aa43e976ca3307c8b4b3f03b70371a93ad090dad0 SHA512 9f80f3a9afe210aba7b67247775249e11c53bdbb3a6cc62e009fe7c6dea1bbc0c95cf4eb20b44a68e3a9978478bb3f8459b6404eeca64587139d68a9ad458802 WHIRLPOOL 71e7175b925027f747f5ac750b115dfa7714aef1052ea9260e0645b40e1b69af4170dd6c9082ac93a93a358ef0c98a9fd5d2b81a83f2709bd84b090a847ab888
+EBUILD jenkinsapi-0.2.26.ebuild 991 SHA256 4d98a79dd591e2900f144e341850f91e7744156fd0bd559e0f95f3cf54569e0f SHA512 32f4d94a2f8b32bf8fefd95f1d042afa9c6b9edbb3a54c86a2259012a2cd193e0a8ab481b2f2460df348524b55e80e6babaf9b11827b0b3ef8a6ef626787620e WHIRLPOOL 74794e9bc62818a38e95f2437d923ba73806af504dffabe330d22f1144dbd8c362b7141b3073a529f3be12014f61816283e25320294ba97b3b6a276e37329c32
+EBUILD jenkinsapi-0.2.29.ebuild 1251 SHA256 99607fe42a8703924681bcfb5ac53817758e64d047adc0ed59b57a9c157c277f SHA512 78a0e3f731d50cbc0609605ec96a1ebdf93693974cf3bc6776e2b3f6069cb1740ddbe9b71d283fb48dbb4505819f37bf854b7e0ed1221275b9527c76285c2644 WHIRLPOOL 159b081b6e7553ae8b50e11aef2bca267d842034cdfb16d1e8c220cd96543722334c604781a3d07802627646eb6fe6ba79b54d3067edacdc52e02cb221b1714a
+MISC ChangeLog 2894 SHA256 2ed440cc2d957e369420edae07b4bc065f6c498b2d8e6b84a1b068f46a6b1aca SHA512 8883889defe1d62f6be99de0d04a80a1295d812a59ba5b316e3a23ef57f9f2293b0547c1305607e2ba8cebf28b7a236634e9f89201f20d18a994453cb3841a5f WHIRLPOOL 0f435fe0d67de7ddae3771f8921b28f2cc9f7d3d10059cde15c2c41241c322a2da2703a58b5714971e5accdf0584751ca9eadffe954842d3a04937b2a1cb073f
+MISC ChangeLog-2015 631 SHA256 1dbe114567fb15e19e495ccb1096d0cdf32f84bc9b04f26001f28360aca5f758 SHA512 5c922beddc746708b85ffe4391de3d4a891bfec4904086162d51f8f9602f812bf7c0ef75f8e09a93dfbba55dfa660a2441c8955298ebe1779ec2593d51780159 WHIRLPOOL da8ef8f42203e3c42b35319d2f8663be7c5eadb737e063b020393d5fcaa6a587df28a4ea04d1aa61efff38f4c5e3afa04b37c89372f0f05c332a94f851f26bb0
+MISC metadata.xml 255 SHA256 b71260e50312eceed06a35ad9b0a09d2fa7f58e4f76123aa8edb63cd4c1d2d5f SHA512 789af9afddc908080b99f6354943ca03aeec052a129a19ad22584ae1604ea9d39aff748e4f23e70ca898c8aa5d2645ec6d1f4c0f5447697052797533abda6144 WHIRLPOOL 2e1b72cc9b1ac756467a2be89a8c8806cd6481bb2f6ccb4183c2df31f073f503d17aabf93c9b2b42c21b92f508e9319c3cc49d1a1305501e83c672f5db7d4092
diff --git a/dev-python/jenkinsapi/files/local_jenkins_war.patch b/dev-python/jenkinsapi/files/local_jenkins_war.patch
new file mode 100644
index 000000000000..811ca4cb9c22
--- /dev/null
+++ b/dev-python/jenkinsapi/files/local_jenkins_war.patch
@@ -0,0 +1,12 @@
+--- a/jenkinsapi_tests/systests/__init__.py        2015-01-27 14:14:43.632779039 +0100
++++ b/jenkinsapi_tests/systests/__init__.py      2015-01-27 15:08:52.521438293 +0100
+@@ -11,7 +11,7 @@
+ 
+ def setUpPackage():
+     systests_dir, _ = os.path.split(__file__)
+-    war_path = os.path.join(systests_dir, 'jenkins.war')
++    war_path = os.path.join('/opt/jenkins', 'jenkins.war')
+     state['launcher'] = JenkinsLancher(war_path, PLUGIN_DEPENDENCIES,
+                                        jenkins_url=os.getenv('JENKINS_URL', None))
+     state['launcher'].start()
+
diff --git a/dev-python/jenkinsapi/jenkinsapi-0.2.26.ebuild b/dev-python/jenkinsapi/jenkinsapi-0.2.26.ebuild
new file mode 100644
index 000000000000..f01b0f9cf5de
--- /dev/null
+++ b/dev-python/jenkinsapi/jenkinsapi-0.2.26.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="API to access resources on a Jenkins continuous-integration server"
+HOMEPAGE="https://github.com/salimfadhley/jenkinsapi"
+SRC_URI="https://github.com/salimfadhley/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/pytz-2014.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.3.0[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-util/jenkins-bin
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+# use jenkins.war from jenkins-bin instead of downloading
+PATCHES=( "${FILESDIR}"/local_jenkins_war.patch )
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/jenkinsapi/jenkinsapi-0.2.29.ebuild b/dev-python/jenkinsapi/jenkinsapi-0.2.29.ebuild
new file mode 100644
index 000000000000..473a79f5ff13
--- /dev/null
+++ b/dev-python/jenkinsapi/jenkinsapi-0.2.29.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+JENKINS_VERSION="1.596.3"
+
+DESCRIPTION="API to access resources on a Jenkins continuous-integration server"
+HOMEPAGE="https://github.com/salimfadhley/jenkinsapi"
+SRC_URI="https://github.com/salimfadhley/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( http://mirrors.jenkins-ci.org/war-stable/${JENKINS_VERSION}/jenkins.war -> jenkins-${JENKINS_VERSION}.war )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/pytz-2014.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.3.0[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}] )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	if use test; then
+		cp "${DISTDIR}/jenkins-${JENKINS_VERSION}.war" "${P}/jenkinsapi_tests/systests/jenkins.war"
+	fi
+}
+
+python_test() {
+	# tests fail with jenkins 1.6x
+	# https://github.com/salimfadhley/jenkinsapi/issues/406
+	esetup.py test
+}
diff --git a/dev-python/jenkinsapi/metadata.xml b/dev-python/jenkinsapi/metadata.xml
new file mode 100644
index 000000000000..eb4470a6275a
--- /dev/null
+++ b/dev-python/jenkinsapi/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-needed -->
+	<upstream>
+		<remote-id type="github">salimfadhley/jenkinsapi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jingo/Manifest b/dev-python/jingo/Manifest
new file mode 100644
index 000000000000..a57fdbe4730d
--- /dev/null
+++ b/dev-python/jingo/Manifest
@@ -0,0 +1,7 @@
+DIST jingo-0.7.tar.gz 9365 SHA256 a3bd5051dd17e9d50e8a9f2d362508e82d7063010fdc06d5e07ce3608e780fe6 SHA512 7358c20371d761ad147aaa2991056d1789d6a80d645741d816c38369abc469911ca6a1ab4324e7b1243832605fd80cdb3df89610106d2a850f634f1595da254d WHIRLPOOL 5c3c17a287a2cb1469d187387064b8c55accbd240105aa3f09f9fb671512dfb394b3be2529d227181c302070c83c73c1c0556a9885f8cf32ba4dbe31039cfb4d
+DIST jingo-0.9.0.tar.gz 10536 SHA256 37de5435622d05763bc55d1a3d0a7edcf998ece9e6048bb470db431d1aa83c3a SHA512 ec064df61639a96dcd0f0b8383d93a650928035e8744f600bd55e42e2ca4b2436db9cff3d75780d2803e9a326fa17308c424c693e14553c9b9a3b45e4132989a WHIRLPOOL 1b60e6fa983011e49818be161d3ac7df966b2a2057215db84c771ff89b32c78cdf8891daed660f3739e58973710f556f335682a574d3a05b2f41b8e2b8c79348
+EBUILD jingo-0.7.ebuild 486 SHA256 955e1ec5a9358e9241ba711e04437bccf95dae059af40d105ba91ab6a91ab731 SHA512 4bd35905302c8df60a1250c71e9d486de6bf2bc3a769fdfd50de709bd485549622f821a882248fdf0fd4d1316fe58cad5225185f1470f2b4dd491bfc59be0809 WHIRLPOOL f877eb2e1820a53e5d0c251a874d5f8b73163643fa08dbb9be8f5df72a0d3db11c22baf2148032f722815ea068805cc44d7cb8f33b017443499dc0490d292908
+EBUILD jingo-0.9.0.ebuild 494 SHA256 eeebec9d4e7e830c71923c3f48c0c53955553601fc3c5c61ede4735d23262966 SHA512 7c9e70ab9c83ac5d14658e2380e337f8c6341a5fd25e9406cb3bbb90bd46b557f7e5ed820087e91d559c603d1edf8474d6d22cc1ac2d62c2982de9ec048afdf7 WHIRLPOOL 5b4dceaf55225daf0d43010417606c056e25e3ba4f3073ac77e7d8bdf2375fb145e2a8d3fb0bd3ce7110218fcca309b2dc919a58abea2a82f20e57f519da600e
+MISC ChangeLog 3097 SHA256 a770e25ec1db6e206f1913f972af0386299e05fe2b4ee0ad8db6d0cea4e7e208 SHA512 dabc674329133b38db82d7dc9b639faa0f31cacc2d63388b6242805e46943b962bbb4c2838621f723c391a718e0ffd9fb6f1821504daf059306a5d6c2a119342 WHIRLPOOL f16cbfaffe9b89aef9a9fc6a5aa8c38ce05f41c86cd9733af772cb2deacbe390e2d6ea2073cd06db81a316468f3bdccec0d0e742e5dd99c2d6ff52afb75743a8
+MISC ChangeLog-2015 860 SHA256 2dcb2792af7bb0055740c735083fa774a6387b0dd10729f5a00b69beabb8ac50 SHA512 2f8774bff14d25d2cf4b6ea560a071e274394c9b1c47f824e443263bdb21d2a70e7a6f68e2547296a492ab61f471c4c20bfd0ae442c3de0a26a4b9f0c675b123 WHIRLPOOL fac5b17ff69615a8c2ffd2f7419abf1a5a20e08e585cf0b2c7a915eea7b61578a8562b0e535ae545901f2b28a924f3c94579751ad0f51777cfee8596a5b82873
+MISC metadata.xml 373 SHA256 004fa1810c0d541cdf2e9bc87354ea2f4627052bc108b24c68bb8e33e2838639 SHA512 a04d5e28ad423aa29d52e8bf57b5116523c596acc6fa1f7cbea6929736d4e969ed859b87e742e1a9ce3f2c37f15802680be129aa37595d43918a4edb3351e9c0 WHIRLPOOL 43e0f95fd328d7439c490cb914bf7e7d423b01c24491fc4ec514e841d1ae3d6ed35f11e5e0c659e7cbab2288a8f23551da13ee0b739533a33d64d182a3a272e7
diff --git a/dev-python/jingo/jingo-0.7.ebuild b/dev-python/jingo/jingo-0.7.ebuild
new file mode 100644
index 000000000000..52c0324c275a
--- /dev/null
+++ b/dev-python/jingo/jingo-0.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="An adapter for using Jinja2 templates with Django"
+HOMEPAGE="https://github.com/jbalogh/jingo/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]"
diff --git a/dev-python/jingo/jingo-0.9.0.ebuild b/dev-python/jingo/jingo-0.9.0.ebuild
new file mode 100644
index 000000000000..77618d3706d4
--- /dev/null
+++ b/dev-python/jingo/jingo-0.9.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="An adapter for using Jinja2 templates with Django"
+HOMEPAGE="https://github.com/jbalogh/jingo/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]"
diff --git a/dev-python/jingo/metadata.xml b/dev-python/jingo/metadata.xml
new file mode 100644
index 000000000000..8743f7df7de6
--- /dev/null
+++ b/dev-python/jingo/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">jingo</remote-id>
+    <remote-id type="github">jbalogh/jingo</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
new file mode 100644
index 000000000000..9542144ae8a2
--- /dev/null
+++ b/dev-python/jinja/Manifest
@@ -0,0 +1,9 @@
+DIST Jinja2-2.8.tar.gz 357055 SHA256 bc1ff2ff88dbfacefde4ddde471d1417d3b304e8df103a7a9437d47269201bf4 SHA512 2e80d6d9ad10dafcce1e6dd24493f5dffc43a17f71a30a650415638e12d3a3891738ebacc569701129214026d062d91a2b10e4f7a2c7b85d801dde26ded1bebb WHIRLPOOL 31adc38738848aa224cceb0d0afb2b85eb080d166ed84f145eb0576eeedfb91cf8d99d7c98b6a6cc6ab4fedf33fdbe3171c80fd559df48036a7441232702e749
+DIST jinja-2.9.5.tar.gz 486763 SHA256 86baad86b1210856d784ddf0d243b8fa043f65b1e3cbc07e4fb24cd5b9725d89 SHA512 15c1b79981c4d6fcbb7fa947fe0fd7e43973433c03d6549a84deec8ad70881f7fd0d3a35160bf6371361994f838da7eb478c577de2612e004679ae51bd97b121 WHIRLPOOL 8ef540e81c40b72dbf652b73a63577e052813bc3d263340f55181c9a2320fa8e3f65c37ccaa6f4840d79b63c1c47f12070ae76d61be6fe0a93104e3916a7ff36
+DIST jinja-2.9.6.tar.gz 487185 SHA256 fa4b0ac374a3502d4523673cfdff7a1f6cbd533a13c8050bef6dcd9168142638 SHA512 934e253d9d621fd6d19302ea5e73b571a806c0e31e10ac29b54700ad6649fabf321b00cdc513bb3fb551ee28e83de7f163ce9ef88d232a6c178f4ee5dc2e69b5 WHIRLPOOL f1f576ff18237ef1dddd76c806d4e9256734aeb289aa146c237803e8fc63984dd41e88e8cdb7f45ff9810d9f20c781f040cc04b2cdd02eacb2c35749e5e257ab
+EBUILD jinja-2.8.ebuild 1689 SHA256 108e047b6a2d4e65626453d3e34d5ee737348bf94cbca02b0de2e4b988dba451 SHA512 59bc262e5d2f3880f914753d583b90a39f512f25426f0d5a7de7400f0aa196c7dd087de0e17b7ea44f1a89ab95b549cb1479a56516412bee8b6418facacabff5 WHIRLPOOL e0b371d48022833e6c6d8d609cab0b98dbc78fe04f8bcdcbe68acc98dc1010528bd334c156bc5a749660b294ff04901bdfc0381cf3677809250efe007dd8d3a0
+EBUILD jinja-2.9.5.ebuild 1744 SHA256 33c5909e1ed79862dbc1a07e0788cfadfbba9d0823084fb6bbc90f931582ef33 SHA512 81c239488b75f715c995d319299d9d36b84cf2158fdc4fb281a7c6cfcf5ffc452ab16d3da842b2d4aad6860dc78daf803dabf9cafde96603eee0463bc12e04dd WHIRLPOOL 18709a75dd3474ce40a0cd080ee6ddce94db20829f5d931f1ab17e1eaacb3884a141c3533f55deb3ff4288971962e0d62ded0f576c0d9ffdd34cd43c471bc8c0
+EBUILD jinja-2.9.6.ebuild 1661 SHA256 45a22aeea4b973fde9a18ffdc7600918e7205a5c58906cc7489657410eb54c6c SHA512 7c102db950d863abd1cd63ac166338dd72dc043cceb8ea02b5a96ddfdbd8ec63d6f0f3ea68f8e7937790a4389518c72db9f84706aa7e1895438ae7e51eaa2859 WHIRLPOOL c1645c59a07f509899faea969fbb5e21eee1af6f903e12e2205ec0a112c69abdf3f3498b9eeda3027a0ad82e3f2ea555162f1edb2015afafbceb0f40500910b8
+MISC ChangeLog 4624 SHA256 fe6e6a4f339d4ad838ffb2820378082020777f4ec8d7ccb3fadc28856dd07174 SHA512 8f9007f1aacdfbe6f6094f89a94edb3ea0a20a91883ed67163be1a7e947ec485cf041dae6d9a2a8ed971b64d59bfef8cf80724f81ceb4afc56280bb0d7d8d921 WHIRLPOOL 2abfbc525d632cd1e6a6f3f854286f3600768798bb3bad1563993ccb6881a9ba4a5895053febefcfbe8c56b4653e42ecfeff11196f5ff2e60df07b03ac8071f5
+MISC ChangeLog-2015 20286 SHA256 2f733feee2fcf3e44bbd85ca91531f8a48ff372d38525a09fc69e36290422f68 SHA512 e6e1fcedf704d4b9057f49d766110cfd1365fa5c4ef7d2ae35ba10283a6bd9098a716df13a09f025f4e1b175ccb19505f068855df4147d50c3cfaf54b5036902 WHIRLPOOL 80098837c0aeb2bf8fc832253c0a9a085d366f6a72e08833bbd4ba2c7c48d2c5ff232cdf08ec7bffb94f129f694f896cae8a3a86a7e72dfcb9bacada6b812047
+MISC metadata.xml 374 SHA256 c369d0ad514d0f875d312dad4156e392f98003d2749c89dbc08bec647df18cff SHA512 5c3b1f608d45786b27c3bf31f04816f6a85e2cfaa44eec5a9aa21029a2e8ab26264e87f9a6faa4c44a44d718aa8186110fb4d0878655dd76d880a7173b6e5d59 WHIRLPOOL d060cd1cea8fa34ec7f7e319d0b850a899dd7c77c26a695870d2f27d4eaadc5c1f32de7cdefc20de75eba8a653cca578b6c57ccfb6ccc3432fc044ab70ca2184
diff --git a/dev-python/jinja/jinja-2.8.ebuild b/dev-python/jinja/jinja-2.8.ebuild
new file mode 100644
index 000000000000..2c30af4afbf0
--- /dev/null
+++ b/dev-python/jinja/jinja-2.8.ebuild
@@ -0,0 +1,73 @@
+# 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 pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit eutils distutils-r1
+
+MY_PN=Jinja2
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A small but fast and easy to use stand-alone template engine written in pure Python"
+HOMEPAGE="http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="doc examples"
+
+RDEPEND="
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	!dev-python/jinja:compat"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# XXX: handle Babel better?
+
+S=${WORKDIR}/${MY_P}
+
+wrap_opts() {
+	local mydistutilsargs=()
+
+	if [[ ${EPYTHON} == python* ]]; then
+		mydistutilargs+=( --with-debugsupport )
+	fi
+
+	"${@}"
+}
+
+python_compile() {
+	wrap_opts distutils-r1_python_compile
+	if [[ ${EPYTHON} == python3.2 ]]; then
+		2to3 --no-diffs -n -w -f unicode "${BUILD_DIR}/lib" || die
+	fi
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins ext/Vim/*
+}
+
+pkg_postinst() {
+	if ! has_version dev-python/Babel; then
+		elog "For i18n support, please emerge dev-python/Babel."
+	fi
+}
diff --git a/dev-python/jinja/jinja-2.9.5.ebuild b/dev-python/jinja/jinja-2.9.5.ebuild
new file mode 100644
index 000000000000..fcb6cf8582bc
--- /dev/null
+++ b/dev-python/jinja/jinja-2.9.5.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit eutils distutils-r1
+
+DESCRIPTION="A full-featured template engine for Python"
+HOMEPAGE="http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2"
+
+# pypi tarball is missing tests
+SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	!dev-python/jinja:compat"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# XXX: handle Babel better?
+
+wrap_opts() {
+	local mydistutilsargs=()
+
+	if [[ ${EPYTHON} == python* ]]; then
+		mydistutilargs+=( --with-debugsupport )
+	fi
+
+	"${@}"
+}
+
+python_compile() {
+	wrap_opts distutils-r1_python_compile
+	if [[ ${EPYTHON} == python3.2 ]]; then
+		2to3 --no-diffs -n -w -f unicode "${BUILD_DIR}/lib" || die
+	fi
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins ext/Vim/*
+}
+
+pkg_postinst() {
+	if ! has_version dev-python/Babel; then
+		elog "For i18n support, please emerge dev-python/Babel."
+	fi
+}
diff --git a/dev-python/jinja/jinja-2.9.6.ebuild b/dev-python/jinja/jinja-2.9.6.ebuild
new file mode 100644
index 000000000000..35747dfc21a7
--- /dev/null
+++ b/dev-python/jinja/jinja-2.9.6.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit eutils distutils-r1
+
+DESCRIPTION="A full-featured template engine for Python"
+HOMEPAGE="http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2"
+
+# pypi tarball is missing tests
+SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	!dev-python/jinja:compat"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# XXX: handle Babel better?
+
+wrap_opts() {
+	local mydistutilsargs=()
+
+	if [[ ${EPYTHON} == python* ]]; then
+		mydistutilargs+=( --with-debugsupport )
+	fi
+
+	"${@}"
+}
+
+python_compile() {
+	wrap_opts distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins ext/Vim/*
+}
+
+pkg_postinst() {
+	if ! has_version dev-python/Babel; then
+		elog "For i18n support, please emerge dev-python/Babel."
+	fi
+}
diff --git a/dev-python/jinja/metadata.xml b/dev-python/jinja/metadata.xml
new file mode 100644
index 000000000000..03be6412af96
--- /dev/null
+++ b/dev-python/jinja/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Jinja2</remote-id>
+    <remote-id type="github">pallets/jinja</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jinja2-time/Manifest b/dev-python/jinja2-time/Manifest
new file mode 100644
index 000000000000..a42836494317
--- /dev/null
+++ b/dev-python/jinja2-time/Manifest
@@ -0,0 +1,4 @@
+DIST jinja2-time-0.2.0.tar.gz 5701 SHA256 d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40 SHA512 8ac4686312cde689f7a431001833d5d477030c4f5e9470d949bd07a40fcb9521f6ddcde37a72468093121ff9451e352a0bb43d20a796d7a204cf94e8a7545f2c WHIRLPOOL c92da86a03bbbe44f2a0b98bd4895c18c99e2a05c91d129b4cb2e9810a79827a8cbd1bca656277dbd5c07597ebcba44746f541a327b408e8d348635ded63e3e2
+EBUILD jinja2-time-0.2.0.ebuild 624 SHA256 5fbbf3d2acd4f48ff64e7ec56ec840edebd6444c33299d31d5fe8787d3725cab SHA512 a7f73b5792fd976f43394bd1d6c16f9c18ad309389336daeca7d67ca356b863256d6772ddfcb04b9a62d4f64cd369b991511e4e75a6ea2c345afc1865e53f318 WHIRLPOOL 98f9668814cce7b980abeef018e6022f5714da2a202bbd54d83acfac905568155581930e471b7de44a80a4523f5e7e29e7b5727c262c5756ac789b13aec737b0
+MISC ChangeLog 321 SHA256 07efaabf3d965f82fcb4e8a194123a9bc86afdf2283f8a9f3ea8970b8e574e68 SHA512 2d8a0a8237f0a68f690b9c83bcad6cb46c409d1d4c70c85bc5818308933d35eb440a203d0983762106bbf828bdaef488dce8a47bae4ad0e18782967162cad6b6 WHIRLPOOL 101c219c1ec73a51da80f07fa6422883785534d9c03e9d0606c8a1ca87e4cb7b9e3c95542d9e7c259dcd223717d346e27530b80b962262a01a2e877ac1976a45
+MISC metadata.xml 375 SHA256 0cae2d438d5cfb87bc10583111c35cd6e9f818d0ad4ade03d067e05205c91f24 SHA512 23697fa9d297ce1deaed947d2f5c98cfd85d9f10e4f703259db15d6deeacbed1ac4f297eed4b58d07b23c798ad738680c945395dc68f15cb0d083f7acb6d99ce WHIRLPOOL b3217e0e8ddfa783383f881c7c49a116ba0990194e98036e709a47e91d935db1aba3ef029ea5b6d59c09e7df903599c60f6bdee7e13a9085dd1dda57749ebec7
diff --git a/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild b/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
new file mode 100644
index 000000000000..bfbd62db1e43
--- /dev/null
+++ b/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python{3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Jinja2 Extension for Dates and Times"
+HOMEPAGE="https://github.com/hackebrot/jinja2-time"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/arrow[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]"
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/freezegun[${PYTHON_USEDEP}]
+	${RDEPEND} )"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/jinja2-time/metadata.xml b/dev-python/jinja2-time/metadata.xml
new file mode 100644
index 000000000000..07e8079b8492
--- /dev/null
+++ b/dev-python/jinja2-time/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hackebrot/jinja2-time</remote-id>
+		<remote-id type="pypi">jinja2-time</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jira/Manifest b/dev-python/jira/Manifest
new file mode 100644
index 000000000000..693b1dee130a
--- /dev/null
+++ b/dev-python/jira/Manifest
@@ -0,0 +1,6 @@
+DIST jira-1.0.10.tar.gz 98406 SHA256 409a0a94800f05a1e8e078540eb5610e243586bd5ee9bc8cae8899cbbd061898 SHA512 5b6bf3ae04d50a2a1f45cbd57f4bc3aabb3d9524b582d55c5a5b39ac9128de15c78e463234dce13cb60d18d8ee36a5844ecc1681978276c8f0fd66ae16ca4195 WHIRLPOOL be8f1806eca3b27c8ddc95d46873ba245267326dcfd7f3b5d895048e5b214c92cb6863cd282d2020cf18f1bf22ed25a0e7bae21ff26d00a677d864a840e67895
+DIST jira-1.0.5.tar.gz 113738 SHA256 4085f72397ffc898019f7eea2c51a099e0a5de6ba2b1f9541db940ebda890240 SHA512 e84e96813b672f57f85613da5a0e9e960e191cf8037146b6f80229563a544839ab3b650894064d29ed22db1bd022ef401e693e3b20aaf8c58cb525b2614edab6 WHIRLPOOL 016b8d859f8a331a1e06c1f765a1898262e7ab80a7324e1a7f0ae95f1b64891ae52ea4151d0ca5c487056ed85135cf89b00d1bdeb22c788f7fa4cb72941a39cd
+EBUILD jira-1.0.10.ebuild 900 SHA256 e8ead607a7eebba7048c7ad3e0b5c1a515131545ea6f2d4cd1f17eff5ef18fb3 SHA512 f937ef410a77915323b39a41876424bd0515f3a3609a854817c41ed006868294a1ad2d9b4e347bf537a69fd2ef04283d104286e252151f18a218a0d76fbcd94e WHIRLPOOL 6bd2c90b8a9f6c1b35591152d08b5a6c640b51385f0643adf5937c6dd028ca3edf2d644e42b1609f3b7350f6f77d7153ae0aa9f50835e0ed918ba72fd2d0be79
+EBUILD jira-1.0.5.ebuild 849 SHA256 8608ab2093c3f1cc87b7c3691080d2ff5ec2fe501b0fc4111fa72f9878669924 SHA512 c18a5df3ecd116bc218ad94a9fd313e479d42a508f63315fd0ea9103ca27703d25d2b8a8663977af607459fd3d8e8e0f91a32fbb157df8c4f1b6ba833d6fe516 WHIRLPOOL 4dea625e99e57382843450da28d5ebeb6b468aa039166c04e483fa3b6953d2ba974e48241ba7e7b3a81e2265d9fa86a15a61eb3f7a3d44cb601a93d9682d7910
+MISC ChangeLog 442 SHA256 1a5c0b7014f1f65edaa8945ae6b49ef5e6f698de5433a8cbfd1b51f8dcc83f65 SHA512 7a5d1e5e5533ec8ce8461b7bd7a59ab5821a7a997751c6a41aaff9beef6e9c763c5df0be8b9f4426fa8918fd777196a4b273ccf69e6c881d04283146e074481c WHIRLPOOL 3cc2f102cddab1ee5ec0dbf5e547a895ff2def188324931467a03e0061aff79ad37c615e92f68f9658850e1f521ea35806f2f3fbcfc9a218ccd057a1da62f4e8
+MISC metadata.xml 853 SHA256 7603510f2a91248dc6cc18056a881f9de4ecaf6017a10a043e0e73a5c9cbcb27 SHA512 045e8044287207947473ad63d67915fba81614380538770fee27c74bfb262c8aedfc5d46629d35c927aa1dd890f3594b34df3ce126cf6682c44c4e3da81369e1 WHIRLPOOL 61d95be9d3a6a6d52d8ae297aa011b9ae56b921655c2996ade8bb17ed2e6a68827b51570240c803506ffd1af546afd16df7f65503a622de01d4994767a412eb8
diff --git a/dev-python/jira/jira-1.0.10.ebuild b/dev-python/jira/jira-1.0.10.ebuild
new file mode 100644
index 000000000000..68545d1ee3cd
--- /dev/null
+++ b/dev-python/jira/jira-1.0.10.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Python library for interacting with the JIRA REST API"
+HOMEPAGE="https://jira.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="filemagic ipython oauth"
+
+DEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/pytest-runner[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	filemagic? ( dev-python/filemagic[${PYTHON_USEDEP}] )
+	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
+	oauth? (
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+	)
+	"
diff --git a/dev-python/jira/jira-1.0.5.ebuild b/dev-python/jira/jira-1.0.5.ebuild
new file mode 100644
index 000000000000..bae39a9f3044
--- /dev/null
+++ b/dev-python/jira/jira-1.0.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+inherit distutils-r1
+
+DESCRIPTION="Python library for interacting with the JIRA REST API"
+HOMEPAGE="http://jira-python.readthedocs.org/en/latest/"
+SRC_URI="https://github.com/pycontribs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="filemagic ipython oauth"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	filemagic? ( dev-python/filemagic[${PYTHON_USEDEP}] )
+	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
+	oauth? (
+		dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+		dev-python/tlslite[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/jira/metadata.xml b/dev-python/jira/metadata.xml
new file mode 100644
index 000000000000..59bf90305a69
--- /dev/null
+++ b/dev-python/jira/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>wizardedit@gentoo.org</email>
+    <name>Austin English</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>calchan@gentoo.org</email>
+    <name>Denis Dupeyron</name>
+  </maintainer>
+  <longdescription lang="en">
+    Python library for interacting with JIRA via REST APIs.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">jira</remote-id>
+    <remote-id type="github">pycontribs/jira</remote-id>
+  </upstream>
+  <use>
+    <flag name="filemagic">Include filemagic support (for identifying uploaded filetypes)</flag>
+    <flag name="ipython">Include Interactive Python (IPython)</flag>
+    <flag name="oauth">Support OAuth authentication</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-python/jmespath/Manifest b/dev-python/jmespath/Manifest
new file mode 100644
index 000000000000..0bbf86d4f9cd
--- /dev/null
+++ b/dev-python/jmespath/Manifest
@@ -0,0 +1,9 @@
+DIST jmespath-0.9.0.tar.gz 20855 SHA256 08dfaa06d4397f283a01e57089f3360e3b52b5b9da91a70e1fd91e9f0cdd3d3d SHA512 c3a707bde5e529554638255a6a6dcf49591ec7573e28d84d34b3c1b8f84d13289ab054818f88b72ac8aee0f1af6ae830cb661f027e90efe9fb9edb4dcf5128c9 WHIRLPOOL f2b8e5d65068add24d3e3d7a272fbc67f439baadd0863ca90ce21db9f62913de9d64df43763c2cdb3549aeedc56bf7aac4cfd40756bdf013a8184d5c3d72b8ac
+DIST jmespath-0.9.2.tar.gz 22773 SHA256 54c441e2e08b23f12d7fa7d8e6761768c47c969e6aed10eead57505ba760aee9 SHA512 8363c234955d35d292ef27630a98d13c68e9f22d19892c44c68796eaa9c12d0a11921cfdbf9b517b2956b82943ae0b9dafc9a4b756bf0f15c4c6b1e3fe4efe1f WHIRLPOOL 64b9e1c8045b0e42f7cfa1c818f0733a283661f2f8910b1d05f4ef7395c892638f48b6114e989954ee8ab432aa1e2bdccef35c00a54ac9ecdc776be2a1f6832b
+DIST jmespath-0.9.3.tar.gz 22967 SHA256 6a81d4c9aa62caf061cb517b4d9ad1dd300374cd4706997aff9cd6aedd61fc64 SHA512 eeab444df7a29c0bc64bd8064c942a5b02772d39d6d262dbef1d43ebaf7e4eb97c34fb1df3a47c6da011a632ec5f9b1ffe62ac51929e8d412368b907ebbb85a7 WHIRLPOOL fdfdc74048a2f233f5f40dc8646ca5c0051bab588f20d89efba05c04483197783495738bc3f7b6125fdfa3d28f49179c027e2d9ad8cc13e0fbbb64ba1911212a
+EBUILD jmespath-0.9.0.ebuild 556 SHA256 87931e1f8bfc1287678ba66c80e339574ef2a7acf65a6b7dcffbc166b31ea992 SHA512 fa3369652afafdea2501450b4032ac95f38ab2e4d56359f0904de4df33b5a97985927f60326ebf6cd6f69e966315640adc40197447c7341f7193697680e9f82b WHIRLPOOL 296f49a1c1334033a7af3a752beb398e0361312b3daf4006a03ebdbbc5dc3dc10166439b6f7bc6c5ef78d9ac55ed9f7401c4dcedfd011a61060c269e8701b500
+EBUILD jmespath-0.9.2.ebuild 570 SHA256 4256e6aeb9b48abd7b58ccdf761a968365b4adfcfc0385444dd00a90d999d205 SHA512 f457cf10472a893eef317db97debe84c5ae1f398546145cf596fb230da44cdbf90141ee85f70951b0b69ee2528222fdfa69da2122a2df98b4ae5f6b683e6b1f3 WHIRLPOOL f181a6a49cb40ac09c42051a304771fac805b7d6f814492c1e5c590bdf1e5df343717964f212d661ec027fa4d8cb73f6381cb352f9e86585e1b9f80ce2df28fa
+EBUILD jmespath-0.9.3.ebuild 599 SHA256 4084611c1f7ed3bdd49293ca303b05ba6728cbd6c2126762e1daea79300f30ae SHA512 009d2e62d4523d0789c2412493b427307838cd6be31c8978a7f02522d68831330df8e2ede9a9ba710ea9890ad34f69288a5683648bef26c5f1d74b9f1ced434d WHIRLPOOL b0ad8d6848af48b14a2f19597ebf03b37fb4b017ae0416a7cfffbbab4fbb2a306012fe60d788eba503e24d7400556c75f2b173f357f48e6cbcea154768024c69
+MISC ChangeLog 3151 SHA256 c09584d752af20e654cd740dcc12bfec9d0bfda48c4d0d9abee1120160bdfeb3 SHA512 077afdcb8c7db4f489294800df9f31a0e890298bca9346c3450803a0c9d5553175ad9812c5ef75a68a9ca8fccfbd911a8e46dbf2fe5bdff4910c65ecc08288be WHIRLPOOL 6732139c8252ce29f412ef1db1f66f94a359f6d9a9723b5d1aeedbd58dceb73db7a7b128d0b14ec2059a69492ae768cebbe106968f0db77445136de1ab4d60af
+MISC ChangeLog-2015 909 SHA256 701091ca06a9c9056bc8fdc152d28ad76e1e121dffd543e376b8f544fdf26137 SHA512 a157f8a735ec0218be4ddd6d4a1acbb1fb054f0be65bf96d05ff2810fa0cdb99527977553ac30df10fab3e4f12ad26581de2feaa6958d7a4b33ef1e15a21aac2 WHIRLPOOL 5324d322c7f9a0a1f0e79174004515a933655e4d91ec0f960f07b50fa748ce3b2a104943093e897bd237580a7f20c00d9740da3c47b05f2d33b21f1ff5b78bf9
+MISC metadata.xml 570 SHA256 ce0a75b4d512939442fec418ecbad3255d76285fafcd268dad46f210ef751da8 SHA512 dc7e96be59813dd79d3492c619d3080c0858711b948843a12a2b9043b853b99885b780b130425ed0f437d2f51139e0024c3f37623cc7c4794e86568995bea36b WHIRLPOOL 9e5d1618212146773c8ff562cf23325277796c9214a2cf618cecf4dd55e7b2505c9021bca39f7e5256cddac669b886aadfb696a48db6d46c1d58ca1d14d087ff
diff --git a/dev-python/jmespath/jmespath-0.9.0.ebuild b/dev-python/jmespath/jmespath-0.9.0.ebuild
new file mode 100644
index 000000000000..574ec8202263
--- /dev/null
+++ b/dev-python/jmespath/jmespath-0.9.0.ebuild
@@ -0,0 +1,26 @@
+# 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
+
+DESCRIPTION="JSON Matching Expressions"
+HOMEPAGE="https://github.com/boto/jmespath https://pypi.python.org/pypi/jmespath"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/jmespath/jmespath-0.9.2.ebuild b/dev-python/jmespath/jmespath-0.9.2.ebuild
new file mode 100644
index 000000000000..2280da921034
--- /dev/null
+++ b/dev-python/jmespath/jmespath-0.9.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="JSON Matching Expressions"
+HOMEPAGE="https://github.com/boto/jmespath https://pypi.python.org/pypi/jmespath"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/jmespath/jmespath-0.9.3.ebuild b/dev-python/jmespath/jmespath-0.9.3.ebuild
new file mode 100644
index 000000000000..f24fbe278a09
--- /dev/null
+++ b/dev-python/jmespath/jmespath-0.9.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="JSON Matching Expressions"
+HOMEPAGE="https://github.com/boto/jmespath https://pypi.python.org/pypi/jmespath"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/jmespath/metadata.xml b/dev-python/jmespath/metadata.xml
new file mode 100644
index 000000000000..1f180a1cf789
--- /dev/null
+++ b/dev-python/jmespath/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+    <description>Python team can take the package if they wish.</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">jmespath</remote-id>
+    <remote-id type="github">boto/jmespath</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
new file mode 100644
index 000000000000..a5bbbb74181c
--- /dev/null
+++ b/dev-python/joblib/Manifest
@@ -0,0 +1,7 @@
+DIST joblib-0.10.0.tar.gz 480797 SHA256 49b3a0ba956eaa2f077e1ebd230b3c8d7b98afc67520207ada20a4d8b8efd071 SHA512 a1f06c531973cb6f8af2c3fa62eaa18204a16ddc56b05de38cf84f7882f4820d30306f4aba52241f57f43c46c2b2bdd6c66459cf6bfa9c893b5750ac059c41a9 WHIRLPOOL c58c03329a0f41e3b93afe02104debd430bd8d21c4a3a197bbf2eaa0a9edf63b2952f3e8ef028a9619c921e62ddf58bfd1a507c6cda592a68e951ec6edcfcdbd
+DIST joblib-0.11.tar.gz 213136 SHA256 7b8fd56df36d9731a83729395ccb85a3b401f62a96255deb1a77220c00ed4085 SHA512 8374a1e2445b9734a5af1d9f17fda057722f4e9e257819084aa7028866a8780f358fcbab131b13c2af315bbd953f8474e4ea698efdeda2be8699c3c471d9465a WHIRLPOOL 234f6b55f0e563e5afaeb16f7d0c8d8eed2057f4da356986bb224215814487cdaecdd64a1312d93e2e4c913b709a2ee80105c338df2ecaee903df54f3518d2fe
+EBUILD joblib-0.10.0.ebuild 1201 SHA256 12422b225607cdccf5d55137dee682f1d7cf33e65c3886b383643cd0f22aeefb SHA512 d0f12505a47bce0eb2d6f036edc29c6be7fc52193e997a3311829b75b0925a9b0735c6bbbb4f4c0aaec86df7b71ccb0a594c93fa58b26edaa10c408e0b6169f6 WHIRLPOOL 959450a511d4f7e7ddcf2ac683560871a450a7dc0d7c3bbe61f076d9ab314490bcca0e8b394f0b4e1ba86d8999c5f9bd13f8b47852973401e918131220616a98
+EBUILD joblib-0.11.ebuild 1100 SHA256 728e73598f17ae107453ef5551e23dfb70e5a9ad23daa689428a606587a6e9cb SHA512 5cb42317f541325bf59997f1eed85b464ed662cab9ef82d2cfdfc3809039ddf14361b5b739b6672f0c633685d3d76dc1c5a3af01ef61356e5ea7d40a1949c92c WHIRLPOOL 0e1b01c633c62dfac603b82edd56bbebcd095ed6feac194ce55708f8d01fd34bac5c07577a303a7778b30320b2d226b7115cfbcf903585eea098395960cd3fba
+MISC ChangeLog 4038 SHA256 622725501e8d418647c24767be290913931fb303ec3915dd253b48b05614f97d SHA512 346f85553343e7e26fbba37fc03703ff17690114ac813c143cccde904739e548b22c0cb6c266360810175be79eecf166161e09ba8113bb355e416ac45cdba9b3 WHIRLPOOL a509aaa3b0f86d25c6f5af7a85b7d971fa9284b82fc58aafb430cf3528931235fd50f52b6a8432403271aba8018188cfa8289d363c05d705707cd7a6a1a4040f
+MISC ChangeLog-2015 2403 SHA256 6b1d73132e7d1307051cb0c189c0b254ef2e80d250b45d554d251464665147a9 SHA512 df116493f7ff8bc49b1b34137682decb4f9314fd453072538f96ef17fc81cf7db164b85c6746a14e9e04fa41f9801059584d73fcfbcfaaad880bce41e2956705 WHIRLPOOL b9ebdcfca02ff7c86b3c40a69a30a6c8377e20020c7b06aea2ffb779ba46798a3d03140150d159de6f236afa3a4479367f133ef802a0512b32640af5aa79f873
+MISC metadata.xml 832 SHA256 bad2be506555504519b4f04feb32f505057ee1cfee731680d079429373315bdb SHA512 af7c23a51fa4ad666546900aca84ebd07412ab36f305ce4650df5cecdfcda3c24ff7d56322495c191a83fa99d00d968fc19284053f77620885f03bf4555f2353 WHIRLPOOL 0e1959373491aa5d4fe59d8f894886b8e2fca0fa7c58674bb8a7cebbbe9100589d2a20b6c00c6c7dcd96d0fdcc43ec00c1b843ea2c4f10a205dd30583904f364
diff --git a/dev-python/joblib/joblib-0.10.0.ebuild b/dev-python/joblib/joblib-0.10.0.ebuild
new file mode 100644
index 000000000000..004409f6b836
--- /dev/null
+++ b/dev-python/joblib/joblib-0.10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools to provide lightweight pipelining in Python"
+HOMEPAGE="http://pythonhosted.org/joblib/ https://github.com/joblib/joblib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+# Usual; req'd for testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html -c doc/ doc/ doc/html || die "docs failed installation"
+	fi
+}
+
+python_test() {
+	# https://github.com/joblib/joblib/issues/143
+	if [[ "${EPYTHON}" == pypy ]]; then
+		sed -e 's:test_func_inspect_errors:_&:' -i ${PN}/test/test_func_inspect.py || die
+		sed -e 's:test_parallel_pickling:_&:' -i ${PN}/test/test_parallel.py || die
+	fi
+
+	nosetests -w ${PN}/test || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/joblib/joblib-0.11.ebuild b/dev-python/joblib/joblib-0.11.ebuild
new file mode 100644
index 000000000000..9c796668123f
--- /dev/null
+++ b/dev-python/joblib/joblib-0.11.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools to provide lightweight pipelining in Python"
+HOMEPAGE="http://packages.python.org/joblib/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html -c doc/ doc/ doc/html || die "docs failed installation"
+	fi
+}
+
+python_test() {
+	# https://github.com/joblib/joblib/issues/143
+	if [[ "${EPYTHON}" == pypy ]]; then
+		sed -e 's:test_func_inspect_errors:_&:' -i ${PN}/test/test_func_inspect.py || die
+		sed -e 's:test_parallel_pickling:_&:' -i ${PN}/test/test_parallel.py || die
+	fi
+
+	py.test -v
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/joblib/metadata.xml b/dev-python/joblib/metadata.xml
new file mode 100644
index 000000000000..3875b1287e55
--- /dev/null
+++ b/dev-python/joblib/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+  Joblib is a set of tools to provide lightweight pipelining in
+  Python. In particular, joblib offers:
+  * transparent disk-caching of the output values and lazy
+    re-evaluation (memoize pattern)
+  * easy simple parallel computing
+  * logging and tracing of the execution
+  Joblib is optimized to be fast and robust in particular on large,
+  long-running functions and has specific optimizations for numpy arrays.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">joblib</remote-id>
+    <remote-id type="github">joblib/joblib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jonpy/Manifest b/dev-python/jonpy/Manifest
new file mode 100644
index 000000000000..ae4831d98aeb
--- /dev/null
+++ b/dev-python/jonpy/Manifest
@@ -0,0 +1,7 @@
+DIST jonpy-0.11.tar.gz 51496 SHA256 983f0af78c6a4cdf843da8449a297681be358476764a06ccdd0cb838a6979a7c SHA512 9fa925259a5d56347b71845fc0ed00f16f4b411b350a08f0779f8f867fc34d0c6164cb0dc107410b6b88d1565fc504cabd102a0c7fcbb86e7163319a235d89ee WHIRLPOOL f3166d7cf06c64cde822baee35c15449eedf31b342a5eea5786eb5ee83645fcc6a93537ec0654e5d851ab9ab5880a17039eaa367708ee13df0d36208bc0cba86
+DIST jonpy-0.13.tar.gz 22107 SHA256 906ded54f6ed77f3ccf0ea37f2f4b57a31889dc2e6931f050e80d46bf8f2b693 SHA512 b46942ce186c325feb2483425a9163f2e871eec3b6cac79ed20e6cab15e22c8fcb4a9e7829ba4dddbe5ee3bd5c2e38c12ae0115ed2456dc3957a4e5a4564dfbb WHIRLPOOL c166b090729e239d1be1d334f048b952b904dcacbd26b6e5de545aa8eafc88880ecd4c2bd1cacb90a9573370c45e023d7d20d7f00c19a4f131bbc3c4d62d2b01
+EBUILD jonpy-0.11.ebuild 611 SHA256 e0c773040dc8da22baf2cac90f46284f7a72dbcdd6f0a35f1e6863c2e13ce6f7 SHA512 7b1ee30b998138baad79ba9f0d04ac93894d5beeb28da8175e6faa61a6c886e81b07adcf2468f7302019e96afea571186818d54fb48abca7cad59157115a2dc5 WHIRLPOOL f71b77af1393d983490d37609097387957c4f271adff90fe8451510f62f3af0dafb4f709c5a074426b404c9ed56ebda76ca0c0ca23147fad0ec736efd37e33e2
+EBUILD jonpy-0.13.ebuild 613 SHA256 9403948e9daec95a9b5412a846e75ba1afa8b032227b46582955e7b3902b41fe SHA512 f516613d43d7bf4c2e49deabae3d8a1896a778353c6289828f0b9db48c6e9750a8385ab9ef20e373053a3538899b9ed83181e86c9ebeddbd82e93097d42ccb13 WHIRLPOOL a06574dce6ff32a6cc76658f323e4702fff04e7c7c0c7e9dbc1436fc38c897dcd1273f249e29bc8cf724b05b1294e0b824cf2c5b327ca9495a8d6efcb0b9a4e7
+MISC ChangeLog 3462 SHA256 038a3c5859e0aca335d979a220ec033b61245b933d65ddfcecc725a9796ce32e SHA512 12b4026a55cadb1115f67c755db61fb9dfd204d6867fde4007d66e4f32bf3ddcb436f01e8973258a7b04bce5ca9ef2550a174155b0f9720f6499b80dcda5b078 WHIRLPOOL c2cebe98d102beb5ba87c09967acfc3cc1483e64249dec56959f4f1a1e08ca8b188b60e42f31dc8e850d2686beea85c1049f2e559156e2c1d2f150df4d15bde1
+MISC ChangeLog-2015 3229 SHA256 1718ca00f395ef3b65554113b3783d09656a81f935ee281ef35d06f5cb9aeac2 SHA512 ad2d401b68d9a566706a4eaa44f566b4ea3fc0f738bcf556efac90f2a580afd3935d01e80f492cac678d64c6fb37500474d0b376cacad78971614f87b0d4a5f0 WHIRLPOOL 68831569bb3ec45a91d68bfcfcc03c1054163181cecae846bebda83afa9dc271ac76307c49ed95ec489d3786ff2734b104e94346d7530fe98a3992b179046c5b
+MISC metadata.xml 370 SHA256 e45f7fdbd8aa8b1d952f4dff0a5461c5448c69f0d925960ee855e4af27a502d3 SHA512 31957f1fb378433322e8e4a83fb89e9d97a0be9b9f38ef823662ded6f320ebe45ce83263af09b7d8f00326dbec33c5aafd9cca645b687a144f162fee3f3bdf4e WHIRLPOOL 1834ccce895fa9334f89dfe82dff8cbe68f815cb171a8668319f8da1c30af7527213bdeb073c11b2fb47af20fe962758b534cc0cefc6e265f7124f1f0ac5291d
diff --git a/dev-python/jonpy/jonpy-0.11.ebuild b/dev-python/jonpy/jonpy-0.11.ebuild
new file mode 100644
index 000000000000..e2e2b63695ac
--- /dev/null
+++ b/dev-python/jonpy/jonpy-0.11.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Powerful multi-threaded object-oriented CGI/FastCGI/mod_python/html-templating facilities"
+HOMEPAGE="http://jonpy.sourceforge.net/ https://pypi.python.org/pypi/jonpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+	use examples && local EXAMPLES=( example/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jonpy/jonpy-0.13.ebuild b/dev-python/jonpy/jonpy-0.13.ebuild
new file mode 100644
index 000000000000..c261966757bd
--- /dev/null
+++ b/dev-python/jonpy/jonpy-0.13.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Powerful multi-threaded object-oriented CGI/FastCGI/mod_python/html-templating facilities"
+HOMEPAGE="http://jonpy.sourceforge.net/ https://pypi.python.org/pypi/jonpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+	use examples && local EXAMPLES=( example/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jonpy/metadata.xml b/dev-python/jonpy/metadata.xml
new file mode 100644
index 000000000000..78935d8ce56b
--- /dev/null
+++ b/dev-python/jonpy/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">jonpy</remote-id>
+    <remote-id type="sourceforge">jonpy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jplephem/Manifest b/dev-python/jplephem/Manifest
new file mode 100644
index 000000000000..28c1c1ec21dd
--- /dev/null
+++ b/dev-python/jplephem/Manifest
@@ -0,0 +1,3 @@
+DIST jplephem-2.6.tar.gz 27587 SHA256 b1be79d85d7a2fa06a122c979ab0d30d7a0c295e8c197b05c85d16a5484b2143 SHA512 037b3b6571936f1a6bc07b156bb8a0c9fb0a51cc8c74e7a2d35f0ac28138223d5479c6fb964f017ca88ff56c7fb757e932d2a922d126d5dd410dc122d0458d7c WHIRLPOOL 54b94516e995a964973f4aef9fd51db98beac721dc196a71bc2ba0b3b3a39964edf66c56b0cfaeceae84866377bc6d877b7c20171197dd175494594559c37795
+EBUILD jplephem-2.6.ebuild 512 SHA256 10aa58a8e6efefae0d8738d282a73a2d392e8682d3e9e468d956b1d8714fe5a2 SHA512 5cc6378a21f8511b771123d083c5e598539e85ce1caebc5b425c83e4617e33f6d87c72619f7e0e846b22356559acc9c4724c6c399328896f0bc21f4c75b61b9f WHIRLPOOL dbb909b8e1309ee40f68605dcaa43ed24a3fb5394e5bd5d7b93a3c5acf086522cd81303da843de5d14c541a0b8c9ebc99f9f6e7a0397b878f8464bc66276b593
+MISC metadata.xml 636 SHA256 ac21364ec8265b07cbc9e686d968528c96db3308a69a7b4abd57e1db19929325 SHA512 2c406f9486ab5c05c126f371546e4dda63f277bf2e32346b3889b8ffdcce14339ad51740687302a2c41a4c11c700200ca4afc6a0474a329701f28036d5aa5e6c WHIRLPOOL 4b7321578176e60beed3bcda8d57b5ea53c66777c57020ce00736b236c8cae41a1dedb19dbaf2e81e2a32b313363aa6e261297c396b1cb3c3ead6c91e0f9fe0f
diff --git a/dev-python/jplephem/jplephem-2.6.ebuild b/dev-python/jplephem/jplephem-2.6.ebuild
new file mode 100644
index 000000000000..5d51f85f53a6
--- /dev/null
+++ b/dev-python/jplephem/jplephem-2.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python version of NASA DE4xx ephemerides for Astronomical Alamanac"
+HOMEPAGE="https://pypi.python.org/pypi/jplephem"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/jplephem/metadata.xml b/dev-python/jplephem/metadata.xml
new file mode 100644
index 000000000000..530af437ee2b
--- /dev/null
+++ b/dev-python/jplephem/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    This package can load and use a Jet Propulsion Laboratory (JPL)
+    ephemeris for predicting the position and velocity of a planet or
+    other Solar System body.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">jplephem</remote-id>
+    <remote-id type="github">brandon-rhodes/python-jplephem</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jpype/Manifest b/dev-python/jpype/Manifest
new file mode 100644
index 000000000000..d41d6cb7393d
--- /dev/null
+++ b/dev-python/jpype/Manifest
@@ -0,0 +1,7 @@
+AUX jpype-gcc6-noexcept.patch 1792 SHA256 660d21fefa01f5e66f8fa1d9e1646fa56988ca4216d1c19fc74bdd57c0502bb9 SHA512 cab22d5247a30cce362fc7ad705aa8595a79636715f64e78c274061b9cf6a2ba679bbfd4c0ff20e195a59ed2c6a33170fe69021ab9675890ac75296b24280e03 WHIRLPOOL 7831d8c19081cb0e5c8fdd6fceb2ef29e39bf191d10c5c977f6be9003bc57c04f5cb4b79a1bedb9572a370847b8fb70f877114435135b0791bf57b30479c3176
+DIST jpype-0.6.1.zip 251407 SHA256 63ad841bae8d4a75e657f867122ef569ef6e9545d6880d30da63930bc74816e5 SHA512 e3cdae95a394f5b57049f444e4da442a75938279f77d74304ac6a45bf00eb4110d3a63b5580e30d82777764f195f848639f6b4e973e48510d0f5cd60c475ce2f WHIRLPOOL 5ae85f6a1e52f8fc26242f8772f467df06bca15447db9ac3881e1688bb86966aa3eeb542ad228779b286be3b7ece46cba13b15835bb6914eb2861122f614429f
+DIST jpype-0.6.2.zip 260812 SHA256 f1138b3836a1e236b2d9d18e223c5ee9bcc0fd3c9ecd482b6f02104db69bc40d SHA512 f4ce5fe6e0f920f6c17bc8815c09fb54909f105fb4cf022856482680f24305a002ce00354cf44c730b34220d12f1d926971b246d0a938bb411401b0656486091 WHIRLPOOL 26e3686beb9cd62e9e7bd5d53b7b960e571767690e8c26b4022efece2f3de4f9a0349e561ee46267db542404077b7d2d985b226fc27c56864858cb7cbd8d36d8
+EBUILD jpype-0.6.1.ebuild 912 SHA256 addcaf0132d2f36d4cdc43fd86013f2e2832ab42fc99b71062480d14a7baa281 SHA512 5e42a3fd00a3d0ec95ae9ad08c03f475335ae2e6c553e40e6db0aa26e97c3f2bbc025bab4f1849d2573adabb68f59ddfed02dca74c1119c910b92c0a84b69883 WHIRLPOOL 93acdbe0133a876982ce7237126e0dcbaeecd5fc858b66eaba830ed2cb44dd7940b31a2285ea99d4f668db18f233515ffa64df9ea57540c805b9d18c8a50617a
+EBUILD jpype-0.6.2.ebuild 914 SHA256 f214735b8727a5d7abe33b1ee4ec35919bf029e121677b13e6fe410c0ee61710 SHA512 ae57797f9aa411ed0c07f0902ea25953a2d31b8bf06b2ba1822d236700a0d5ba86c89e253afaba9388276f2dd266561d47478db05d94b42c362e6253459f5a97 WHIRLPOOL d22ceb2c891da1fd92dc2f675f8ff12501423b9cb814f88f7b77e99fa5ced6c2c9ee20b110b0db7f478a0e75fd3b74a7ebbe027998c0cf19645b939f7f9e1182
+MISC ChangeLog 1214 SHA256 cd480f47ceeef4279a152840323e67d458c06d7ad2a36322a251af29d51f2126 SHA512 54f0938be6a5948bff5561a9804ff6686b814603ea7ac528fee8a63e608a3c0d0b4d2101f710a8406c10e3c95a90c1b46af95cf43283af6c05c0db0b05f161f9 WHIRLPOOL 595c9bb89ba3a36bcd4687226b7ea2efa01baa6f76e4d15cb04944a15aba111cf5608c8034f4a84003391007087d69481fa7198a2b86a9861c1b42fdb9463bd0
+MISC metadata.xml 529 SHA256 ada3d722093acd0de89d36d14d91026ab175a39cf2a4ce6195d23cdb0e4a3c68 SHA512 20e1dbd02171941eb65d78af65539692ab39c21e7d800a730f96c4186ef3e9cb01d499b6a938c04fd1da424fa253b12799b0209523054db4837ddaec3aab4b23 WHIRLPOOL b601f4afb4fe80790de7081b69fcb2d72952f7026f35232ff7648314791273537ec8f288c3bb7306f707fda77bb8f03e478e3cab316f193413a48b81180ff96f
diff --git a/dev-python/jpype/files/jpype-gcc6-noexcept.patch b/dev-python/jpype/files/jpype-gcc6-noexcept.patch
new file mode 100644
index 000000000000..710844d35608
--- /dev/null
+++ b/dev-python/jpype/files/jpype-gcc6-noexcept.patch
@@ -0,0 +1,57 @@
+Bug: https://bugs.gentoo.org/show_bug.cgi?id=608920

+Upstream commit: https://github.com/originell/jpype/commit/3a4fb98938afd9c03070086d1b8fda8841410fa3

+

+From c3578c3488de35236f73b6eb27428b1f1526c45b Mon Sep 17 00:00:00 2001
+From: Peter-Levine <plevine457@gmail.com>
+Date: Sat, 11 Feb 2017 23:31:27 -0500
+Subject: [PATCH] Mark destructor that throws as noexcept(false) for >=C++11
+
+---
+ native/common/include/jp_field.h | 2 +-
+ native/common/include/jpype.h    | 6 ++++++
+ native/common/jp_field.cpp       | 2 +-
+ 3 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/native/common/include/jp_field.h b/native/common/include/jp_field.h
+index d28b795..f93752c 100644
+--- a/native/common/include/jp_field.h
++++ b/native/common/include/jp_field.h
+@@ -38,7 +38,7 @@ public :
+ 	/**

+ 	 * destructor

+ 	 */

+-	virtual ~JPField();

++	virtual ~JPField() NO_EXCEPT_FALSE;

+ 	

+ public :

+ 	bool isStatic() const;

+diff --git a/native/common/include/jpype.h b/native/common/include/jpype.h
+index 7db5832..a492d06 100644
+--- a/native/common/include/jpype.h
++++ b/native/common/include/jpype.h
+@@ -64,6 +64,12 @@
+     #define PyUnicode_FromFormat PyString_FromFormat

+ #endif

+ 

++// Define this and use to allow destructors to throw in C++11 or later

++#if __cplusplus >= 201103L

++#define NO_EXCEPT_FALSE noexcept(false)

++#else

++#define NO_EXCEPT_FALSE

++#endif

+ 

+ #include <map>

+ #include <string>

+diff --git a/native/common/jp_field.cpp b/native/common/jp_field.cpp
+index 8c75e58..5ef9d8c 100644
+--- a/native/common/jp_field.cpp
++++ b/native/common/jp_field.cpp
+@@ -63,7 +63,7 @@ JPField::JPField(const JPField& fld)
+ 	TRACE_OUT;

+ }

+ 

+-JPField::~JPField()

++JPField::~JPField() NO_EXCEPT_FALSE

+ {

+ 	TRACE_IN("JPField::~JPField");

+ 	JPEnv::getJava()->DeleteGlobalRef(m_Field);

diff --git a/dev-python/jpype/jpype-0.6.1.ebuild b/dev-python/jpype/jpype-0.6.1.ebuild
new file mode 100644
index 000000000000..090ec143ecb2
--- /dev/null
+++ b/dev-python/jpype/jpype-0.6.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit java-pkg-2 distutils-r1
+
+DESCRIPTION="JPype is an effort to allow Python programs full access to Java class librairies"
+HOMEPAGE="https://github.com/originell/jpype"
+SRC_URI="https://github.com/originell/${PN}/archive/v${PV}.zip -> ${P}.zip"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+S="${WORKDIR}/${P}"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=virtual/jdk-1.6"
+
+PATCHES=( "${FILESDIR}"/${PN}-gcc6-noexcept.patch )
+
+python_compile() {
+	if ! python_is_python3; then
+		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+		export CXXFLAGS
+	fi
+	distutils-r1_python_compile
+}
+
+python_install() {
+	use doc && local DOCS=( doc/* )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install
+}
diff --git a/dev-python/jpype/jpype-0.6.2.ebuild b/dev-python/jpype/jpype-0.6.2.ebuild
new file mode 100644
index 000000000000..f8dfefc0dd22
--- /dev/null
+++ b/dev-python/jpype/jpype-0.6.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit java-pkg-2 distutils-r1
+
+DESCRIPTION="JPype is an effort to allow Python programs full access to Java class librairies"
+HOMEPAGE="https://github.com/originell/jpype"
+SRC_URI="https://github.com/originell/${PN}/archive/v${PV}.zip -> ${P}.zip"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+S="${WORKDIR}/${P}"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=virtual/jdk-1.6"
+
+PATCHES=( "${FILESDIR}"/${PN}-gcc6-noexcept.patch )
+
+python_compile() {
+	if ! python_is_python3; then
+		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+		export CXXFLAGS
+	fi
+	distutils-r1_python_compile
+}
+
+python_install() {
+	use doc && local DOCS=( doc/* )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install
+}
diff --git a/dev-python/jpype/metadata.xml b/dev-python/jpype/metadata.xml
new file mode 100644
index 000000000000..c8bb1538ea87
--- /dev/null
+++ b/dev-python/jpype/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">originell/jpype</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/jsmin/Manifest b/dev-python/jsmin/Manifest
new file mode 100644
index 000000000000..125037a64bde
--- /dev/null
+++ b/dev-python/jsmin/Manifest
@@ -0,0 +1,5 @@
+DIST jsmin-2.2.1.tar.gz 12542 SHA256 df7fe41d6de1df42cb5dcfdefe1d7285b584ec6f2a714f6c05f6e6dbacff7f71 SHA512 b70a72d5dbe37b34cac186967b151a79573bc060a1b814645b6d58499ec0e087f7a5941b00755258cb05e8a092f05b614de1253038140e773102f5312fa6a3c7 WHIRLPOOL 05bf48bc4fc5aa56118a11a30043f29578e399eae77039c9953fbdfd7fa5dc81c8322b56c5f374cd809ab99cea18439f4d399c37de6abe2ebe8bc698e57528ea
+EBUILD jsmin-2.2.1.ebuild 509 SHA256 62f79eacfc9f14d28139bf031625a75d28f0d91f490da23f435eadadf0fadfd8 SHA512 57d84c9205626fa43e20c2ad9be03f16d824e53a87b9e9ed48578dac35ec3663224f2800712968d38281f47257da33f2281990e12bc9dbe3a4606ca173eca9ba WHIRLPOOL 1fffa25ba4bfd52d938c0eecde6f09395c2e7ca3dd9f4a53124834b7f290995d87b81f21c6567375e87b2224988065bf85346495df2bf75989a4b8826bacc57f
+MISC ChangeLog 3554 SHA256 384aeed2eae87cb12697d6636cebdab09a8a2df363616ae2c6166ac42bbac40d SHA512 1a00ae1e64fee74a21e04d04a0b6f6b04a8ea68bebfedbd08931996d372ca6e8d88ee8f9f7c52d781dbc499e40bbe15573cf1d92577bdd61e6641eaa34c8a7f5 WHIRLPOOL 18074c3f87390a5ff28582495a9568cd2f4a353616ddd83b03f7e110cc11cb6d48f96c044fa2b61514fd40039361727037d08ac592c632c85254c860d266edf0
+MISC ChangeLog-2015 1652 SHA256 3fb3f1214ae02d6d24a623ab972035e2a9b882f696dccd2cd02ddf52419e2d8e SHA512 011d4f78327ee073add5c442dca3eb828594b89f3b0a556e57a9ba43ba23588fa5d540c2ea6636b2418a96bd4f41653ac768e1721909bad05424237eecbb157b WHIRLPOOL bacaeb4fdbb6249b7a6ea06fd263b1778cdc18a99102ebd603cdee7021204131c3f9e5461f0fa2d03b359bc4b4a402376f659e6d116f83dcb4dfbc3369bc7009
+MISC metadata.xml 372 SHA256 b7a5eb8bb058521d86ef1652573a9550ab1b54186ca6079f48ece0b65f30aa99 SHA512 3719ee9f00f088f6c8e0086fda757322717e177b4534877667e4f2606de6f97add603be1958c0d33a9189157184668296ced776f63fa5257bbaef5c3b0edfa31 WHIRLPOOL 9f2142d5ef5555e8a90598fbcc28913176bb3b8904eff7b17a2d4f9766d7e1400f5b4f153076d1af582c73f624d00ef2043d4b9bfd41b8444976327a2b2fb75b
diff --git a/dev-python/jsmin/jsmin-2.2.1.ebuild b/dev-python/jsmin/jsmin-2.2.1.ebuild
new file mode 100644
index 000000000000..a660652b3227
--- /dev/null
+++ b/dev-python/jsmin/jsmin-2.2.1.ebuild
@@ -0,0 +1,23 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="JavaScript minifier"
+HOMEPAGE="https://pypi.python.org/pypi/jsmin https://github.com/tikitu/jsmin/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" -m ${PN}.test || die
+}
diff --git a/dev-python/jsmin/metadata.xml b/dev-python/jsmin/metadata.xml
new file mode 100644
index 000000000000..2560a207eda1
--- /dev/null
+++ b/dev-python/jsmin/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">jsmin</remote-id>
+    <remote-id type="bitbucket">dcs/jsmin</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/json-rpc/Manifest b/dev-python/json-rpc/Manifest
new file mode 100644
index 000000000000..aaa4469f4642
--- /dev/null
+++ b/dev-python/json-rpc/Manifest
@@ -0,0 +1,5 @@
+DIST json-rpc-1.10.1.tar.gz 25410 SHA256 3edffc0905a08090edb4036f8767a08826ec618f9f02717251fd2eb3e1c6983b SHA512 bb69cbb12c0a64286fb1e98db21ca75cb19daf20c6d6f5721f82891a17e44d2cda172e73bd389a02077d094b8f6deb0959952b0498b0c1b4a0acfaa5e3ba3922 WHIRLPOOL c08c465be4951055a12979de5bca056cf56e35c874f491ba4891125e9fbfcc985f85d120c2a5fcb1d8b8264487af90efb34e0316981ccf546190421df5fdc885
+EBUILD json-rpc-1.10.1.ebuild 809 SHA256 76728c7461f02b12b2dc6684d473ed6a4daca71c7386239cefeb358c4f8584bd SHA512 9ce22bc24d9211288274e21aea3a987b333215cf25db80626e77a626fa86a8fac06a76857edfcd8e060df306702c7ccce4af3b7402ca384163ee21adbf8e92d7 WHIRLPOOL 1b452e76fc93b326c0e25b7fe947fb34239fae13d0ce821302dd1a522144a50381d3be157d35ba6d30fbaba5d8b025850031a45296edd538d64100995743e3cf
+MISC ChangeLog 3653 SHA256 1fb8757e287a973f39ad207c984c8382d5051b5a19e1a915400bf15bb0efe5b5 SHA512 0547733cb176221e0153656b7b8ee743611f9cd601ee239370f8cefe827e2da3ab8e2b2c8082e1087c353fa46b2090ef084310f14ecfaa07c3dfae159cee8b0a WHIRLPOOL da6cf15f9e2c600eb44ff6ce843ff7a62bd058b0523d235b66bd7863b8e62bc3eaa627a34b91e44ea0423d8ca275fc90bb8f05e2b22eea962c681f0a97be449a
+MISC ChangeLog-2015 1210 SHA256 e4d79517b2402cbfea67dd34402e383819d0dfce60e9d7b215e7e89526f957ec SHA512 70059d47c0f31160d10718650b9b01b7b25c8ce6b638799f0685f316738dff11bc9b2255843c483d1c377afdcc16edd35de1de55f170065ac697bf4a604e819b WHIRLPOOL e356ad710bbb9ee8b626cc474e39ce53a7e72e5d8a0dd0549fc263726e23fa1f9959d7f141db83cdf57da4131971c35e3dd22095f75e7f100cef87780f1dfbf9
+MISC metadata.xml 794 SHA256 b5e857cefff4992d5c565b86ef17c0b59123ea4a8eaf311da39f933b6d152af2 SHA512 68c309e9fcd29a2182d6eba1e9e758971edc2293cd3c044852de9c938ae0bdbe6ea8805b32e76656d809d6ab3d636a274cd2e65dfd21ce3f026bde5e9ae02266 WHIRLPOOL 8a8c43576c7e3685eb867e62e17926fec9649af8f37eb20b600b9cc4de154f576e19b6d474c833e24d861de0474fa245319a4a924946037d1fbd14bf9570eeb4
diff --git a/dev-python/json-rpc/json-rpc-1.10.1.ebuild b/dev-python/json-rpc/json-rpc-1.10.1.ebuild
new file mode 100644
index 000000000000..857752944190
--- /dev/null
+++ b/dev-python/json-rpc/json-rpc-1.10.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="JSON-RPC transport implementation for python"
+HOMEPAGE="https://github.com/pavlov99/json-rpc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	cat > jsonrpc/six.py <<- EOF
+	from __future__ import absolute_import
+	from six import *
+	EOF
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/json-rpc/metadata.xml b/dev-python/json-rpc/metadata.xml
new file mode 100644
index 000000000000..300f5e2ad4bd
--- /dev/null
+++ b/dev-python/json-rpc/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+	JSON-RPC is a stateless, light-weight remote procedure call (RPC) protocol.
+	Primarily this specification defines several data structures and the rules
+	around their processing. It is transport agnostic in that the concepts can
+	be used within the same process, over sockets, over http, or in many various
+	message passing environments. It uses JSON (RFC 4627) as data format.
+</longdescription>
+	<upstream>
+		<remote-id type="pypi">json-rpc</remote-id>
+		<remote-id type="github">pavlov99/json-rpc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/json-tools/Manifest b/dev-python/json-tools/Manifest
new file mode 100644
index 000000000000..5a06a9faeaab
--- /dev/null
+++ b/dev-python/json-tools/Manifest
@@ -0,0 +1,7 @@
+DIST json_tools-0.3.3.tar.gz 8093 SHA256 d651d10326447b7a039305661b0fa6c44bb54ca2313494e20dda1e4c8c63b7d6 SHA512 34bb34d52f7f230a13071a9a5c3de79f2c76de6b4a8ce60d0acb4447f68893faeb79ee9a98133ba72f1c1acebd9e8beb34dba0953242aee97799e8b97fcf6537 WHIRLPOOL 203666696b13d95b4c918c604c8b968ac1b64603f3559fec4251c2d80792c1d0674fd7a7a086e4536110f241c93fe28457921023183daa3697bf7deee352a11f
+DIST json_tools-0.4.0.tar.gz 7277 SHA256 ec704468805d898da89c5c88157e8aa6559df0cfdcf29ed60a1076a45f79d19a SHA512 b3f86493d17f97eeaecec6572adfc6e16c113c1755f49655863e84f17467c9dae9a57911d66639eb6e6d8548a99887adc827ff28bd26b6180e523b145bba2d5b WHIRLPOOL aaac4a58404a77043cd977c198b5ffe71ec9be9fe0a7fb727bd2efb94802861b961355ce52c0b515456c404a3c855d5a38d4c15a9d9e03cdd9fb4d8bb4989cc5
+EBUILD json-tools-0.3.3.ebuild 745 SHA256 0fa7fdc9865b03358e1763919dea8d318e8de0830e6aa930dab98cab1a0ae1dd SHA512 7e47696a580e52c4836784e305f13713d395180fe569642469ca1afe5d3bf0462584ff1b58b4e4a1e2da2d8db068e897418f09a934081d6717c70265e577b5db WHIRLPOOL e23c86f5932d7d26ea144fd9043e4b7b08d057882459b49c021867515ced63bc28b4e21500510f3cef34989329b605cd97ace4861ace11517c083aa30fcaf0ab
+EBUILD json-tools-0.4.0.ebuild 825 SHA256 2661e070b8d7e83a8e059ade2a19a512e67ec51a15261a279e7ab2d0e6dd4447 SHA512 c41593fcd1bc16bb6a9d0819c12e599cca34a0bc7ca006144ef2a75918ac1be8e8379f94dfb3e60af797c38b1d869acd0faad8678005a6ed2d5442ff4561f19e WHIRLPOOL b5b5768dc396b9c5ab7c506e6b40f39275027fdc04326ac56d9b9cc90987481811b29ecefd1772b297d7c1646ce7ed00071f0a42d90bad607e8ea6b4e50ace92
+MISC ChangeLog 2627 SHA256 55468b5e7a56f716f2830956b652bd23c7ccd2b3b9bbcfdfa73c5c187dd8035c SHA512 c3ece4b0e9145e6edf38916bc5a5e68acfc063a938b9fb9472878c4172aef33e1bf56d4192edbb9304f2758b1c983b3e3301825f1b57a6d0d00322496ce82942 WHIRLPOOL 1632196fa5285c3d5e99f528920d161bc1b65ec1af2198293d2c6a5261c309af0bbf71f714f255ac29a80e431c7db4d45c5bd1e0c9546c7aa59d2f174ba4025b
+MISC ChangeLog-2015 1129 SHA256 a2b59f6a7065a477485a4d60dc66d7c69f0f9f9f6a64b43c099338689e13e52d SHA512 f1f284840a84b421f6bc52f5dfc6320aadaf4b24ad2a66af5317c9b66b2cdfe72eca72e91efed9b55bce452ca937298eb16ff99cb2cd0b30fb7b6cb2fd30d272 WHIRLPOOL 014e9451cb2fa40dacfdde8f9f484906342b114aa031e4b65ed17449aae3f024a34293ce484a4e08baf41707ade5a93b321b365e7aa02a3ec671e3aa6687fd57
+MISC metadata.xml 392 SHA256 993925a627f7a5e8e52630975d18032b0358d08b0e9b902b2fd9073dc8a767cc SHA512 66769c970cb91b5eeba9870de3774f0f3f1e7fb9ee95e01af16293293874441c00efa233fffa9c9fd84c5e1e40518d88beb04f0f9d220b7f453c2bacb3272d4d WHIRLPOOL 1a49f4668af420901db5185eafe5e68e9f22b1b3b4fb489b623e0ea049b8a25155930b33115b4561d3c5f9478da115eac7dc2803b942c04b9129b34a13f49367
diff --git a/dev-python/json-tools/json-tools-0.3.3.ebuild b/dev-python/json-tools/json-tools-0.3.3.ebuild
new file mode 100644
index 000000000000..62f4ecec755e
--- /dev/null
+++ b/dev-python/json-tools/json-tools-0.3.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+MY_PN="json_tools"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A set of tools to manipulate JSON: diff, patch, and pretty-printing"
+HOMEPAGE="https://pypi.python.org/pypi/json_tools https://bitbucket.org/vadim_semenov/json_tools"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/json-tools/json-tools-0.4.0.ebuild b/dev-python/json-tools/json-tools-0.4.0.ebuild
new file mode 100644
index 000000000000..252ce00be9ad
--- /dev/null
+++ b/dev-python/json-tools/json-tools-0.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# 'Programming Language :: ...  in setup.py requires updating"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+MY_PN="json_tools"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A set of tools to manipulate JSON: diff, patch, and pretty-printing"
+HOMEPAGE="https://pypi.python.org/pypi/json_tools https://bitbucket.org/vadim_semenov/json_tools"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/json-tools/metadata.xml b/dev-python/json-tools/metadata.xml
new file mode 100644
index 000000000000..84b69a921467
--- /dev/null
+++ b/dev-python/json-tools/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">json_tools</remote-id>
+    <remote-id type="bitbucket">vadim_semenov/json_tools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jsonfield/Manifest b/dev-python/jsonfield/Manifest
new file mode 100644
index 000000000000..4855ab30077f
--- /dev/null
+++ b/dev-python/jsonfield/Manifest
@@ -0,0 +1,5 @@
+DIST jsonfield-1.0.3.tar.gz 7950 SHA256 7e7f73a675c518712badd783279e26d164140f3fc2ed7a32102c3d08a6a2a4a7 SHA512 b69b783266f593d40b588f8deb42828b36fe31f62aba0a80286a24fd788bbea543c74b0566a70fb336fb80105f488a16932bab417a01d3730fa89201f542deb0 WHIRLPOOL 456205636a57171ab952172233204e249b786138d2afc2be60e603399d6802122d19acdcad3fa2cb5df981368144b610668b12e14f9e51fff0994ce8e7e2c661
+EBUILD jsonfield-1.0.3.ebuild 607 SHA256 eab3bcde3ba4689281934ccfea9811b9e8e5e5d7fac058e164234ab3a881cc48 SHA512 c453a6d903e13cf325f016952de0895c36dc764708bb2eac9602c162707d23829a37266c907c7f4c3ce877693b7b508f78777fc3f522ab22473f6d328ea3f64a WHIRLPOOL b7d845deacd4bb4837ff32bb4349a2e4aad225a46c3233d92351cb715b3a2b63515a4a82599f975aac84743ac89de83591934d0d7fa587d2e09eb6078decbe43
+MISC ChangeLog 2705 SHA256 9b06005abe1f10d4190cf573f50ff0c989dbbf7dbee59144805efb766350a571 SHA512 01d50eb8ce2f34bce69d0cefe962225d57263b1d1a3e3b742c734eb2b8c57a11095cc3bb02537494de1910e1e8208ab805fffa06cfc74b1a3845ea8a644210ea WHIRLPOOL 15fa5be94899f694a173af55f9e1f057f09b487c7cbb0cb42f14b9bd87b842bf70269398df72d061c499114437412cdccd904be8e32eb0a8da5a0d40435ab3ad
+MISC ChangeLog-2015 567 SHA256 da6d34db3daabdd4be24c37972f6e114a9763689eec932ae9569d1f2823cb3d3 SHA512 7d1794c6d0c689eca18d12beb72375b0f7bce19fb46e94377b5c6dd09a3057607ce864a52063fe323ac6179ed625496c231059a11a5a61d05657ca8c5bfca981 WHIRLPOOL 814064ddb37e3affb52f88029d1fb9ce58f0bc108ad9d2052882724c173106c5c29980ae62f91a66f2dd648ed4f9716eac5643442017070d98530c31c4eeefcf
+MISC metadata.xml 391 SHA256 e7f426f9febef25163df920aa81106f25ec6090358816d51b4e1b10af4972657 SHA512 405fa8acbb46234295ff3a93441b99ce699bd61789fef4730b9ff0b170b18d76b93e1eedb36fd6c9fdde2bb08e826d013e319d6748f91d058b25b13ab197fe28 WHIRLPOOL f0c6a6fb1195869b2fd6448c8734b210d22cadbfe002ce7b5a6129b80336e26ff761a2589a50e36c5da325979f66fdaa1508504b8344c4bb0a9000859ed5905a
diff --git a/dev-python/jsonfield/jsonfield-1.0.3.ebuild b/dev-python/jsonfield/jsonfield-1.0.3.ebuild
new file mode 100644
index 000000000000..8922af1fcacb
--- /dev/null
+++ b/dev-python/jsonfield/jsonfield-1.0.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Reusable Django field that allows you to store validated JSON in your model"
+HOMEPAGE="https://pypi.python.org/pypi/jsonfield https://github.com/bradjasper/django-jsonfield"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="test? ( dev-python/django[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/jsonfield/metadata.xml b/dev-python/jsonfield/metadata.xml
new file mode 100644
index 000000000000..71182d9ff271
--- /dev/null
+++ b/dev-python/jsonfield/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">jsonfield</remote-id>
+    <remote-id type="github">bradjasper/django-jsonfield</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
new file mode 100644
index 000000000000..6c7b94846183
--- /dev/null
+++ b/dev-python/jsonmerge/Manifest
@@ -0,0 +1,9 @@
+DIST jsonmerge-1.1.0.tar.gz 12556 SHA256 2ae73a058474e75f27d4ac2595d9da28084ae42be506f04d077ccea3a853b921 SHA512 52ca9d17098533ada09365caddaaa92b0e0ac696c99b92db6aabc8942183a6d9e06ebf002213d8cebbd25d4905a6a7bfa17ad9d296c838b0019b9f30e403ce94 WHIRLPOOL 610597ffb82cc1cf92d40e2c54fe4877c6e38431611855328a6dba5246f2e12420cf7994e00b296a7880588cc4976df62e359e78b6402ec74275d4f343d8618a
+DIST jsonmerge-1.3.0.tar.gz 16569 SHA256 422d3373905270d4ad53530e1bc184c8b8ab1934853b9108b14ec71c69c2e484 SHA512 2d44b52441651c090b7439880a1fcda7acbf958fa60bf64b91297b0267500a992e80b3fc51f45c7c97d94af327b02984b110a0e157e62b33f39e1c83a3fdcc32 WHIRLPOOL 7eca6661c1a142dc8483ebdf2247f64851d517c51d6fa3c0ade9463f2e354d35fe6f594ecddfebdbc98934128379c386ca67bc22b7a6ed712d8cb4873d01556d
+DIST jsonmerge-1.4.0.tar.gz 17953 SHA256 b4513d8361496508fa642feb8097a60e9fd692a0c10c7370fea592c1f64fe4f3 SHA512 ad28e01692189863f38f363d22b6bb3cef0b0074e5f6092eabf7c58fb242085fa2ac26506e5d816daebd85049cf6fdbb62f9885d66e545c49e2ffeaf589cf122 WHIRLPOOL 642677fd37fd7c2769a9b5a630d0cab70ca5bd36c41ebc31e39452b8c0696806b3b0806f09a8b22a36db11218ec6c6cefb1548c22739f5a2687fd5c8834cfab6
+EBUILD jsonmerge-1.1.0.ebuild 689 SHA256 697317ef252e08b222b09505d2c1470d152b5623ccc688859b134578cf75b953 SHA512 565ec9a41ec0bfc266fb83bdda520759323a1979acb9c860c843515df9f79705458f32c4b3c630ec3651c25f38dc77af2e48a9cd944ee9f84b3d02e753b47736 WHIRLPOOL 0749b5ff5d207abfb982b56da3655dc6dec8f70cc1662dfb138422f0432a35dd67e77c6bb32f0a7e96380d9bf8b8b59d835c62fb80bd8ef19dc95a2bc766cb97
+EBUILD jsonmerge-1.3.0.ebuild 744 SHA256 20ee99b480b8432d22937e70c1c0d391b8025ebcb2a75fe5ad31524d9c3c24e8 SHA512 d86201a9ab77e3fde5e7d86e1fd70109a0bbae84be13cdab478e9555c8fef235a7d1d959f33eebad68e9a73645abfb53287205e7bdcaf1bb945f9afed1d6994e WHIRLPOOL 8589937bc0620c6c6371245d4fcc4cd74b3a03e4c6b44da042dc21458a9fe21803943850e3c25d73d765d88a68017550af60cc593b0e0d9bbe53c03e609a7675
+EBUILD jsonmerge-1.4.0.ebuild 684 SHA256 a05ddab7d3b175ff62f5073af7170dd328ffa39c2a967e012d2db651a3810f8d SHA512 03192a8c6875f8e2a9dbb5ae0f020add48ae0b3486cc86c5dcbae948db42c1aca9d6078ae9cafba0a0e7b733a6589fd9585f1396ed579a2245fc28c720280e35 WHIRLPOOL 97081a70b5b25628161e82f088ccabf8d91b0970e0ba4db024af4652a5bc04e1c6f42976b4d468e8839d2af06296cedcb4d4daa488a2df00c09799f8d482ed42
+MISC ChangeLog 2451 SHA256 6a5a4e7852dd935961b0326c6ec8494c22a65e91a8b108ff86d0951d6ddba8ad SHA512 15b858bd30aa7a32be56fc132bc69a358dd012fe303bdae7644c33439b3c530b4fef22a7d6d2823cd33950e714d9cc0263eea43ec6657f9f9837d776b6e8a685 WHIRLPOOL 6b1e68bcd1fc22fdf5ccd005edafad710cd8fa4f58f1a9c0e20e61e296d40eb79c0f62d8bcc29ac0103df7085ce5d0d34919c3245cf038bbbbb46d6d8962135f
+MISC ChangeLog-2015 352 SHA256 bc638c69c502d2f315b64093618afc073ae8e0e1df322761f415a0c9c1a7be02 SHA512 c87b21eb4fc69689f638655a01cf16e82e18c73d75e48748af0cd22c29c4770217ff0a9c714934638be5b31af8e534a884d05f0650e3e7f6ad18074f8953893a WHIRLPOOL 0ed98f87aae3ea0e79415714ebd3e78241c8b51cf5c2ad926f0ab37010ec54490043bccb3f66e70ccd13369a164630a1d6c25278f18e3b8ec7fdefba407ea1fd
+MISC metadata.xml 372 SHA256 b077fea3e87babd4b7ae6cbd6da379ff2a4af81363813363f59ca9e3ee05a5fa SHA512 ecf2f464f37f4f00ccad0d697216fdb669ab31f26a571023597f8d7bffe2e9101bc618c437ce381879c64701f13d3b81c03dba57bf1a67df5b13c81a137865ea WHIRLPOOL fcf8efbace42be28ffc6d84ec62ac90bd45bfe50303c60b9eae878dce423dd7d3df64ee7852043a18e3bc76cb70e35bde8a931aec9702f05864e064e8efbc484
diff --git a/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild
new file mode 100644
index 000000000000..15ccdb315da0
--- /dev/null
+++ b/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Merge a series of JSON documents."
+HOMEPAGE="https://github.com/omergertel/jsonmerge/ https://pypi.python.org/pypi/jsonmerge/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
+DEPEND="${REPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	PYTHONPATH="${PWD}" python -m unittest \
+		$(find tests -name 'test_*.py' | LC_ALL=C sort | sed -e 's:/:.:' -e 's:.py$::') || die
+}
diff --git a/dev-python/jsonmerge/jsonmerge-1.3.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.3.0.ebuild
new file mode 100644
index 000000000000..22627bb346c7
--- /dev/null
+++ b/dev-python/jsonmerge/jsonmerge-1.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Merge a series of JSON documents"
+HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.python.org/pypi/jsonmerge/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# See https://github.com/avian2/jsonmerge/issues/20
+REPEND="<=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]"
+DEPEND="${REPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	PYTHONPATH="${PWD}" python -m unittest \
+		$(find tests -name 'test_*.py' | LC_ALL=C sort | sed -e 's:/:.:' -e 's:.py$::') || die
+}
diff --git a/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild
new file mode 100644
index 000000000000..e6ef174e7342
--- /dev/null
+++ b/dev-python/jsonmerge/jsonmerge-1.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Merge a series of JSON documents"
+HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.python.org/pypi/jsonmerge/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
+DEPEND="${REPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	PYTHONPATH="${PWD}" python -m unittest \
+		$(find tests -name 'test_*.py' | LC_ALL=C sort | sed -e 's:/:.:' -e 's:.py$::') || die
+}
diff --git a/dev-python/jsonmerge/metadata.xml b/dev-python/jsonmerge/metadata.xml
new file mode 100644
index 000000000000..d4bd319f27b3
--- /dev/null
+++ b/dev-python/jsonmerge/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">jsonmerge</remote-id>
+		<remote-id type="github">avian2/jsonmerge</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
new file mode 100644
index 000000000000..1a6a79eea578
--- /dev/null
+++ b/dev-python/jsonpatch/Manifest
@@ -0,0 +1,7 @@
+DIST jsonpatch-1.13.tar.gz 15119 SHA256 9470656a08002e309632b59772b206ce0564c9a77b44c25f05f49dd2cad248d5 SHA512 23f0c92c2c8834d5e3129e9ba78ece7da2646dd60d5b0522b0f09d83e20057ef7517042e5ee8547804185d3ce23cff394c8fe78df93fad7999fae12cc5467a45 WHIRLPOOL 39a08103e5476a2ddb8fb120b61d6e99d80ff1bfe0a1b2949515d830299e99f5a41ca15b7e507b4700ca948687082ff1edce3c13ce5a161bb08fe6f57bffecbb
+DIST jsonpatch-1.15.tar.gz 15544 SHA256 ae23cd08b2f7246f8f2475363501e740c4ef93f08f2a3b7b9bcfac0cc37fceb1 SHA512 c5df880764b14a2fb60bb46e319bf006644ce1472d0413cf08ad151cf386e5be9fec197fd9efe0bfc3aa22dadf4078344c11211c1e8a3d5cc3ddcb998795dc91 WHIRLPOOL cacc064387db34183d7790bf1379daab37f104c6247888f4cee3108c43ef4a45cb589216df23b536f9c9e38ff94b52b4ca89b7f53bd37280f4d5b605f307ffa1
+EBUILD jsonpatch-1.13.ebuild 801 SHA256 39092f0726d1c3ac8f72cd7213059a1a2165751e9749d27ab7511dd59b09de84 SHA512 06bec10c49dc7a3b09f3ffa8aea48c67d75feb63384a1a0714f334dcfbb0615504b27fc2526ff8cc65edb7462be8a5856d139693db688d6b610f2af1896225d9 WHIRLPOOL 5c182c8e5d46f2d2782b8175e6db3a66c975c7e8039b036359e26c4c35563edef95749930502ee144c90da142b7ba389ae29e9f61b0b14776988fc33e32e6d4a
+EBUILD jsonpatch-1.15.ebuild 809 SHA256 04a0ce906863d210f93971e370a7af0a4d12a7b930992d2bcd8c869083b44ed1 SHA512 288a6d1297c6d286b15b152796701cc71d9bdb9e9bf518ba50a169e31b4e56dbb67dfba2d8bb212582188b3d64a60b2fef312a66c94af626857febd821ae45a7 WHIRLPOOL d2f2fa0689304d4d6f66bf82f1f5803295fa6c82f078cb4e6a231e38800771900aca11a30e8a293cb5a85bfe5735068dfb197c822247c03f0f0b33771a09ebf4
+MISC ChangeLog 3162 SHA256 78d4f73e6e347bf60ef3fc6f73352fff25b774f4bd8fdf29cf0c318e61fafa0a SHA512 f735140b43e1d870eaab04a2067bca58ce34e76f7f250d6d1494944a9ca32217e9777a84b1da3be392a51a40d04652e99a11fbe20970de64712e12d0481cc7f9 WHIRLPOOL 28ba9703d595702836496500111f3af06e91101c6721eb29e7cf6f4f87c43acb7729aa90ac5570ea8d52311aaaa76abee166dc2f7510928f62a33016e97ff7d1
+MISC ChangeLog-2015 1870 SHA256 386934a47a056fdc796767b1ca5691b5f5fc84498def0c8e75581ccb58fd2004 SHA512 db85a6bd39da849b23f1cee4326d4e23bd686d2039fb3c6dff6ccaaee2c4f1f5b31ad12c7ea6b98a2e425ccca2d6373844c0486a30c4564c9b941891be64d976 WHIRLPOOL 21bae6cadaf1da6760c33f4f3092fa04f4300083f09b88b039134ceb2fee73aca5ef059c5a447ab5ffccece97fe1e464caba9a9803b8587b39e104b21f4ef1af
+MISC metadata.xml 679 SHA256 455283535f1c6ecee1e90535a715a49c0b2d65923bcb30765fafb7815f9b26b1 SHA512 37946af836c2d8b521618688ffee4b33c1864751081c1f1cd86442e6eb6cf822cfd9dbc228f834fbd31ca63b1dd24927cdb680076e2bd7ead941558ac1d2e436 WHIRLPOOL 69c20b12ea5b35cb4c86f56ca7adb7fc91d2b27a03fb2a84ee7927a57f0e9ef75647f72cc6b10802143b6cbb498ea5ae777933888ed73f2524988066b8530247
diff --git a/dev-python/jsonpatch/jsonpatch-1.13.ebuild b/dev-python/jsonpatch/jsonpatch-1.13.ebuild
new file mode 100644
index 000000000000..115f4a0ed516
--- /dev/null
+++ b/dev-python/jsonpatch/jsonpatch-1.13.ebuild
@@ -0,0 +1,28 @@
+# 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 )
+
+RESTRICT="test"
+
+inherit distutils-r1
+
+DESCRIPTION="Apply JSON-Patches according to
+	http://tools.ietf.org/html/draft-pbryan-json-patch-04"
+HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	"${PYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
+	"${PYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
+}
diff --git a/dev-python/jsonpatch/jsonpatch-1.15.ebuild b/dev-python/jsonpatch/jsonpatch-1.15.ebuild
new file mode 100644
index 000000000000..06dcd9751bba
--- /dev/null
+++ b/dev-python/jsonpatch/jsonpatch-1.15.ebuild
@@ -0,0 +1,28 @@
+# 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 )
+
+RESTRICT="test"
+
+inherit distutils-r1
+
+DESCRIPTION="Apply JSON-Patches according to
+	http://tools.ietf.org/html/draft-pbryan-json-patch-04"
+HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	"${PYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
+	"${PYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
+}
diff --git a/dev-python/jsonpatch/metadata.xml b/dev-python/jsonpatch/metadata.xml
new file mode 100644
index 000000000000..90675b487db0
--- /dev/null
+++ b/dev-python/jsonpatch/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  Python library to apply JSON Patches according to
+  http://tools.ietf.org/html/draft-ietf-appsawg-json-patch-08
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">jsonpatch</remote-id>
+    <remote-id type="github">stefankoegl/python-json-patch</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
new file mode 100644
index 000000000000..5e1220d29645
--- /dev/null
+++ b/dev-python/jsonpickle/Manifest
@@ -0,0 +1,5 @@
+DIST jsonpickle-0.9.3.tar.gz 60489 SHA256 54569ebd2aa042529966d45d46be9eac6dd9852150dcee01bb61499d884f23fa SHA512 38de2ab2c15e0e28323a8cc83b0c0b0631f2f678f620e8738fee19c71492f011aa7eec428b859574a0066b9e24a08bde911a283736757964035befe3042f2e06 WHIRLPOOL 3a30037709d93c03930b686f1ba63f17059b1e162564b14ec302a2d87796faf45ea36b8b9acf03538f577e12a8dbabb4e8ca9064a3b9018f18f7edbfbc29e849
+EBUILD jsonpickle-0.9.3.ebuild 1546 SHA256 c7c2a1b9d45b6c35e1a6e02766dd4430466b654bade067e2086d20bd9ad0fcb9 SHA512 6d881de6f98d84e965d267b5cab19e1bb5bb31f0005efe7c798fb99ff916f336942d564c4553977926a0130f91a0e16249904d44f99ba01db46704a14b435d27 WHIRLPOOL 752c2e047c98b8ae06e1bf221f8028e51bfc7189670466a8e6ae0a9d3b64b580761ac9a195bdbf0b021b61ef41db7284bc7d7a46ef0a5c12043e5ac562790779
+MISC ChangeLog 3440 SHA256 c986cb01f2e84cae46c238c9767e48e1b467f44f79515ec2d15500fe22e72f32 SHA512 2fa776d35dca336c7ef3a08ad5edb395a26e4f8084541a09be69d94ab158a608c95f7f5f49b0b0d0a028bbfb14c624bbc2f6faefaeba7c252fd45274e6b7cffe WHIRLPOOL 99c03f5649a3035656648bc4b06a58b8c7fa04bf661b6ac2041d933b5b0208a1b808631db6e41a895008b1c01fc25df47a9573810338b6e22e7e32fd64246db6
+MISC ChangeLog-2015 4852 SHA256 901f4dc3c46db890d0618574c62fa47cc799da0bff2e5012e1ea4f36789b4c76 SHA512 e9c86a7353d6991e8ab49a373e6cec4cc04b142d8a9cf6fecdcf2dbc8b75612e16c338cd7ae76b1c1539224d5ebf9435e1f041b8246b0209709a4cb786845cf9 WHIRLPOOL 4ccc9996e6f8e1c2b5c25f13bf777e4148b604b96a612c5ff41d5d7e2926fe939374e0ee3110b697b813e01537ec8638e798a7665b6b893f5b57b3c853a2aa14
+MISC metadata.xml 386 SHA256 783b69bf72bf59908b06da5255db4626ef1376fbcfe39cbd0da49ed67feb78ba SHA512 12590542127c674ae6c8123b20ce5c7ed6815f9129eefb95ef3a8c064fdc25477765d397cb7d7e62772475306c0ac7389a7155655576845b936866470302b759 WHIRLPOOL b8651b9a69d139008ad1b2e776f1694ec27942603085ce028fbaab5aade0eff2763b4cc7faca0d111380572651f1ba2fc6049dec9a9d0d72311073f0d8c8d5cf
diff --git a/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild b/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild
new file mode 100644
index 000000000000..c08f5614e2d2
--- /dev/null
+++ b/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild
@@ -0,0 +1,50 @@
+# 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
+
+DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
+HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.python.org/pypi/jsonpickle"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+# There are optional json backends serializer/deserializers in addition to those selected here
+# jsonlib, yajl.  demjson added
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]
+		dev-python/feedparser[${PYTHON_USEDEP}]
+		dev-python/ujson[${PYTHON_USEDEP}]
+		dev-python/demjson[${PYTHON_USEDEP}]
+		"
+DEPEND="test? ( ${RDEPEND} )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/sphinxtogithub[${PYTHON_USEDEP}]' python2_7) )"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading during doc build
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && sphinx-build -b html -c docs/source/ docs/source/ docs/source/html
+}
+
+python_test() {
+	# An apparent regression in tests
+	# https://github.com/jsonpickle/jsonpickle/issues/124
+	einfo "testsuite has optional tests for package demjson"
+	${PYTHON} tests/runtests.py || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/source/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jsonpickle/metadata.xml b/dev-python/jsonpickle/metadata.xml
new file mode 100644
index 000000000000..6ee6ba05b2b7
--- /dev/null
+++ b/dev-python/jsonpickle/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">jsonpickle</remote-id>
+    <remote-id type="github">jsonpickle/jsonpickle</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
new file mode 100644
index 000000000000..b5d36ca9dcaf
--- /dev/null
+++ b/dev-python/jsonpointer/Manifest
@@ -0,0 +1,5 @@
+DIST jsonpointer-1.10.tar.gz 7577 SHA256 9fa5dcac35eefd53e25d6cd4c310d963c9f0b897641772cd6e5e7b89df7ee0b1 SHA512 b2df5f19b14b670825b18f7da4ca50b089beb2ccbb1c69acfc904eed82b5315ad19940b4aaa8f8504c2fc7d477778d65e31f492dd30ee8b5ba95ccfd0eaeb9b1 WHIRLPOOL d333093fd6fd6f3d565200d11e5d727dfb3ac11eb8f029731915fbe47cb9c5ac915df94b77db30deac080047f5e9e7012f1ae023378e91fdacc2d41f12c9b5f2
+EBUILD jsonpointer-1.10.ebuild 647 SHA256 3f36eb84451669d304e81f2f41016a26f555201a72229de8b53ddeb47c4f0edb SHA512 ad336b00ab0290f45d7a0dddb425c87bc86199892b9739970bcb2beaf11a32551f806fe2a56fc93e191716e981bb25da3c7bcae36cb588cf7f642d7b91ba90df WHIRLPOOL 7b2067c46d1635f89da1000db64ea09164e6abbf50f114505887957fdc1c3cecf5b109ae9b7434fef91c880dc7e5f5d574b8baf82101e77410d28175169f008c
+MISC ChangeLog 3183 SHA256 41826e4847b659e5df09ec2067c6b54ce49b71f2efb93454db45a6c778efc01e SHA512 e929de083d71c4a66d90566f7b37c58c7ac358b114a5cfb2ca21b0b5f45948021b12f993ad96cb18c0f48abc4a1d4d7a41522defff37ddb5057867bb5a5935d8 WHIRLPOOL 969cac1249488c93ffe1c7573f2e8a47deda3d46e1af8bf402bd0dbe23990e544a164c7b2912233930693418887b5200074f9fc24280f723138af73e3ccbdbe6
+MISC ChangeLog-2015 1916 SHA256 ec7eaee8b0ce37cde7094221920199c0bff7fa27394fcdccce0369e6f741c8c0 SHA512 a54a55c8c7b51664411750739caeabfeb9de96d41215cf9dd9fdcf3f77c4d270efd2dab76eb3af365f798dc2fb424851440a526455500cf020fb3a6888d465bc WHIRLPOOL 7dc22fcdd9f9f4778a727cf245f43d110cd93ddd1eeedb16f53d561aa4c54395f2e824bf0ced445209d60a2f9fd70551798ebd3c456bda45f28a398d5b0f71d1
+MISC metadata.xml 702 SHA256 028ec84d6662c5f8ca2e8b6420d6a2f93132b8b0802ef6e6e601494e96ed2efc SHA512 0f25c1d5667c07fc6382d958c6f150412de3208a9f21218bcff55c32354e86e17338d3b2480dbb8c7633f1b0d95211c9510aa4cbc9e5392490b6c3904babb9f8 WHIRLPOOL f817fa19851ebe70b91fc4fca1e5b810dc5318adf0ead04a04ac4cc8e7dac9bf5477f66b548eb7cb535d8e288e1c1175d5447f372fe73b998a9fc13fa127c29b
diff --git a/dev-python/jsonpointer/jsonpointer-1.10.ebuild b/dev-python/jsonpointer/jsonpointer-1.10.ebuild
new file mode 100644
index 000000000000..41e1a097a83a
--- /dev/null
+++ b/dev-python/jsonpointer/jsonpointer-1.10.ebuild
@@ -0,0 +1,22 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Identify specific nodes in a JSON document (according to draft 08)"
+HOMEPAGE="https://github.com/stefankoegl/python-json-pointer https://pypi.python.org/pypi/jsonpointer/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/jsonpointer/metadata.xml b/dev-python/jsonpointer/metadata.xml
new file mode 100644
index 000000000000..0340733bd893
--- /dev/null
+++ b/dev-python/jsonpointer/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  Identify specific nodes in a JSON document (according to draft 08)
+  http://tools.ietf.org/html/draft-ietf-appsawg-json-pointer-08
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">jsonpointer</remote-id>
+    <remote-id type="github">stefankoegl/python-json-pointer</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jsonref/Manifest b/dev-python/jsonref/Manifest
new file mode 100644
index 000000000000..984920339985
--- /dev/null
+++ b/dev-python/jsonref/Manifest
@@ -0,0 +1,4 @@
+DIST jsonref-0.1.tar.gz 12296 SHA256 56e0ce228798bdecadff865c142741b1ffdd57a5e9c40c40ec2b641d7c430ad3 SHA512 9900601feab0c20c902a6d5575fd411898af126a650d0c9ff955f50f5bd1f5da8e5a071ca86cac31ce3c5fb35a516f849cbb70098cac2cfdc910ba33a1f7411b WHIRLPOOL f1249188c03e90fb03a090dd4b2faec272aa9b9edcadceee32403ecf79a8a62029af9380cab8273094fa6cb04d086bf5e529febc9606e68f00016686817e2a05
+EBUILD jsonref-0.1.ebuild 547 SHA256 99bd650c1c38039edb9c40a273e97b75082c39dfedf434a6ab74f778e1c71e43 SHA512 83eadc1a110016257bc43817a3fc783addbd1df79600b3e014d7024737976a656d08f498bdd58daf9f3f9239f99d78365e52a20b989fc77713e3752e688ccb1e WHIRLPOOL 2ead7b4bbadcb2f85f0344d0cfb98688cbb9516616c03ce31e19e18c7d139ee25876deb9379b5a8b4d52ecac43c1d81ade3b2ea2b383c55e8c401e7232a0aeea
+MISC ChangeLog 485 SHA256 133b3bad63267ed930b74e6f998934355c135a6eba895a15b32a3e08ea940ffa SHA512 b2acf529102f7a911bf248d08b4ef69ad7f7034660cd9c802736941b29ba32259668ed53272a1d584e09e61fc2d92d193c266a30d97125acf15ca87b372f54a7 WHIRLPOOL d5097bf86b27aa1035d9d6483475b5762b672a232d098a8f3d4ef1aad6a2e54cc5d3f4c88c5cd3968557331751d37541fcf1b100a8a5e683c22c1d45a3368e6f
+MISC metadata.xml 926 SHA256 018386021e8a305248bdb470fceec2885720191f4fdc47caed0bf8ad681e79df SHA512 69ca42b5722e562f75f40c3f4cab8362d9f7610c9b8a0ce72d3707bc3a942035efdb281cc933189779274117fb310395fede353a570d76e0188a8e7e6cd6eb01 WHIRLPOOL af45dec9819a9c44e7ba8649f94f4b5e01ba0ce5b2c16f2400378f80d7b29460e58c47c1991fd24be1db45172f90dcdca79c6e69c501c44ec1af2044f78bef34
diff --git a/dev-python/jsonref/jsonref-0.1.ebuild b/dev-python/jsonref/jsonref-0.1.ebuild
new file mode 100644
index 000000000000..b065699eaea7
--- /dev/null
+++ b/dev-python/jsonref/jsonref-0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit eutils distutils-r1
+
+DESCRIPTION="An implementation of JSON Reference for Python"
+HOMEPAGE="https://github.com/gazpachoking/jsonref https://pypi.python.org/pypi/jsonref"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test tests.py || die
+}
diff --git a/dev-python/jsonref/metadata.xml b/dev-python/jsonref/metadata.xml
new file mode 100644
index 000000000000..f8b232a25049
--- /dev/null
+++ b/dev-python/jsonref/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<name>Chase Sterling</name>
+			<email>chase.sterling@gmail.com</email>
+		</maintainer>
+		<remote-id type="pypi">jsonref</remote-id>
+		<remote-id type="github">gazpachoking/jsonref</remote-id>
+	</upstream>
+	<longdescription>jsonref is a library for automatic dereferencing of JSON Reference
+objects for Python (supporting 2.6+ including Python 3).
+This library lets you use a data structure with JSON reference objects, as if the
+references had been replaced with the referent data.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/jsonrpclib/Manifest b/dev-python/jsonrpclib/Manifest
new file mode 100644
index 000000000000..e499f7d51702
--- /dev/null
+++ b/dev-python/jsonrpclib/Manifest
@@ -0,0 +1,8 @@
+DIST jsonrpclib-0.1.7.tar.gz 16980 SHA256 28355fb625fba393c458a532baa21e6ec063b394a27e5c0abdbc73e6c7e07488 SHA512 caa315879faac986c14a15cd87591ea2823405f2ea0731962c37147378f77bcfd260c6e7900bc128392332b27e2c0ae23cab9cb6150adb39924f9a369405b2ec WHIRLPOOL d195af83596ec7c9b75770621929846a25c82e2d8df97db665495bee6f5c961046af65cf1371663fd432c0e65669d42adda423d067edbb027937c4a59ec895bf
+DIST jsonrpclib-0_pre20110820.tar.bz2 14608 SHA256 a31ce391e8f430f2434c538dedb012e879296628a7b2968f1aa41cb36207369d SHA512 80864890982c4a11996cd9fae21029cdf40b089eb6c2d265c645f52fe0a6e858b3405c5d899d2a5908527da04263d93064f365c5308adda1791105bf32329b71 WHIRLPOOL d7ad4277ea5bcb3451728a36f42a76e965256ac6239269e12125c1a19f9dbbeb9dfe69b58738b42e7823a687ad195f8a782aa2e0fe4797a59743b5230f598365
+EBUILD jsonrpclib-0.1.7.ebuild 632 SHA256 25e8e3900fd9d784043a079f260bd6c2ec96a9a263de5bad9134dc1466fa5e71 SHA512 cbb6e50dc1b65eca17ca5a6f185a3f1de40655437653c9c81e0955299710f68a36dcccab43fdf664071330fdb5b1279619828e4b4ecd33d59812ee0285f23399 WHIRLPOOL 738e926f97caa42e8a4025e0b078442710098b7bc4f265c1dc037256dbc2c008253256bd0eec31f1ffdc4ed03f78243ea7e388dfcce8df7029624d317c1194bc
+EBUILD jsonrpclib-0_pre20110820-r1.ebuild 572 SHA256 e4c3622ff5fae34db13c33b1a9b3f7ba6d1dcc8ba8a2f92992757a32d954a8a4 SHA512 1dc679926e2ce8564cbd23b5b7b32b1eff533137da5bc3ff8f7c834e07f0171a2d2344f5b1708a54a00be12aafa809a26cd55365a858b64e591668e1dfdb2045 WHIRLPOOL d928eaae6d6158cf9722365eac3ac1110cf7b3e3bd24b61d2e20c66e8c140d8cbbc9e94dbd634c6fd0644339387eba50b9ce96d124a41e517ca831faf18ddc3f
+EBUILD jsonrpclib-9999.ebuild 632 SHA256 25e8e3900fd9d784043a079f260bd6c2ec96a9a263de5bad9134dc1466fa5e71 SHA512 cbb6e50dc1b65eca17ca5a6f185a3f1de40655437653c9c81e0955299710f68a36dcccab43fdf664071330fdb5b1279619828e4b4ecd33d59812ee0285f23399 WHIRLPOOL 738e926f97caa42e8a4025e0b078442710098b7bc4f265c1dc037256dbc2c008253256bd0eec31f1ffdc4ed03f78243ea7e388dfcce8df7029624d317c1194bc
+MISC ChangeLog 3026 SHA256 c278eb14b069e80f808157999366e3c14c294061f2f3bc42f5117039cdfc0e22 SHA512 9c10ae5741daa5b073d97a37421dcdff3953758433209bacca9f10915e537f473287499f78d117bcfd8ae242ea22bbf8fbfce9fcce1595f85f0bda335727daa9 WHIRLPOOL 6e66b20cc36184aca7224853b630ae239a64bee181df7b80d8a0d34a2e1417160e054bacf5f5fdbb4b5e90afb1b1172805b27710c07600813e7ad02057620c5d
+MISC ChangeLog-2015 1795 SHA256 04bae772f39652e890bd8966bffadd51146357c316e9c3ab5f090aec7911804f SHA512 b434c559024c4fbbb86415924559d520db1abff3196bc71274096df08e4d54548a0c78c5f8019c3a5aada4a567e6726e0c257873eee9dd2f31b15d03daf900e4 WHIRLPOOL 7ed74acbfe0fb47edbebeb224ff298ae0a8875543698c1b53ac19202499110089ac7e33634ba8aaf14750c8f6d76560f9762dcb4438e28704712765c8ee7232c
+MISC metadata.xml 482 SHA256 a977fddd404ae92f941de93ff240a29e2d8716c8301931fce1fa59e98d835c34 SHA512 1162c5120b3cafeacd75f9223fb082d72dbc1da75814eec82aa12931dd3fed358b272796de22b8d8cde3e0e7c468b8293817def2585b11e68ec1b1ff608de49f WHIRLPOOL f67f542e28746d07faeaa5b7194690114b79ab5b9f8a7f25ae726ee15f2cfd2a6ea6e096cf612e860c14d847c8f8e79d3ec0abc4cc740e3bbfeceabce5a4f241
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.1.7.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.1.7.ebuild
new file mode 100644
index 000000000000..d423c16be33e
--- /dev/null
+++ b/dev-python/jsonrpclib/jsonrpclib-0.1.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/joshmarshall/jsonrpclib.git"
+	inherit git-2
+else
+	SRC_URI="https://github.com/joshmarshall/jsonrpclib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~mips ~x86"
+fi
+
+DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
+HOMEPAGE="https://github.com/joshmarshall/jsonrpclib"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/simplejson"
diff --git a/dev-python/jsonrpclib/jsonrpclib-0_pre20110820-r1.ebuild b/dev-python/jsonrpclib/jsonrpclib-0_pre20110820-r1.ebuild
new file mode 100644
index 000000000000..dfd50a3a36e4
--- /dev/null
+++ b/dev-python/jsonrpclib/jsonrpclib-0_pre20110820-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/joshmarshall/jsonrpclib.git"
+	inherit git-2
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="amd64 arm x86"
+fi
+
+DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
+HOMEPAGE="https://github.com/joshmarshall/jsonrpclib"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/simplejson"
diff --git a/dev-python/jsonrpclib/jsonrpclib-9999.ebuild b/dev-python/jsonrpclib/jsonrpclib-9999.ebuild
new file mode 100644
index 000000000000..d423c16be33e
--- /dev/null
+++ b/dev-python/jsonrpclib/jsonrpclib-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/joshmarshall/jsonrpclib.git"
+	inherit git-2
+else
+	SRC_URI="https://github.com/joshmarshall/jsonrpclib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~mips ~x86"
+fi
+
+DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
+HOMEPAGE="https://github.com/joshmarshall/jsonrpclib"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/simplejson"
diff --git a/dev-python/jsonrpclib/metadata.xml b/dev-python/jsonrpclib/metadata.xml
new file mode 100644
index 000000000000..d757ee7410dd
--- /dev/null
+++ b/dev-python/jsonrpclib/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>vapier@gentoo.org</email>
+    <description>make whatever changes you want</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">joshmarshall/jsonrpclib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
new file mode 100644
index 000000000000..c479fbf6536e
--- /dev/null
+++ b/dev-python/jsonschema/Manifest
@@ -0,0 +1,11 @@
+DIST jsonschema-2.3.0.tar.gz 43115 SHA256 a79dcee3769d7cf749836da840966a83cd2e33e361264e77b74df9490ffe5c89 SHA512 8c39c47c236904d3deb3893d43fd1a9332896e8a1883901ef6040607575250b0d661b010d94be6b0d52515b42e2c7924c93d352ca9b209cec54514e856d95c75 WHIRLPOOL 7f61838ac7173ac2d0dde16f83a864b8dcd82905d139c4de8d7b698ce022f1a63003ff45be53cf134a30747533cb034d2d5d944559a1b6990a37d8073b38d0ea
+DIST jsonschema-2.4.0.tar.gz 48293 SHA256 1298a2f1b2f4c4a7b921cccd159e4e42f6d7b0fb75c86c0cdecfc71f061833fa SHA512 111d60f6b490c016a69bed6b0b22cc6395c949d4510fdcb530757d6e61720cd2e1e3346293a5dd1b6501b262b36510ec08ab4ed76dc7484065e692e041232a93 WHIRLPOOL 1bcec6c3e09f72ad314db49e73d92f854e5f69c490e9ad46b4d0e31564392fb27bf387eec6d376237735396a7da989dcd601e33e2a43e35ed2559fc83b7ebf63
+DIST jsonschema-2.5.1.tar.gz 50855 SHA256 36673ac378feed3daa5956276a829699056523d7961027911f064b52255ead41 SHA512 9e8f6ce16504b7ae7ef1ceb44ecb07eab85923e40967bd8e502b9fa779e772b547db90f56ca951d06591b951e7240db1071e909ac75543d42f6f2495f6de3298 WHIRLPOOL 24da2ad53ecfe9b46d6b9f469719899ddfe54d425aa10e7e83d715e88ee09ba6e80501f1a33dec153af5436fc62abc29ac3ac8af3de6d748e1c007bb771ba642
+DIST jsonschema-2.6.0.tar.gz 53252 SHA256 6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02 SHA512 03f916abd023b32fbe60f91718d6f2f94d8834bd1bd8ec85ab02f591a145161275c2cde25b037c4d2e94703b870159feb776d3556f011e4c394d2e20ab897b0b WHIRLPOOL 21f52b990c2047ce14889032ea574e8cae46046fabeaf1ce4041e24c6d8eafb93a7832e5bd7a15babff3e18e87a77539e9a7bac0c8f63c907c28d58383cb1ba2
+EBUILD jsonschema-2.3.0.ebuild 677 SHA256 83cfa7ddd6b0b25055847f0dce3cf39381677ffaf786f427355dc80d88b20843 SHA512 16689092635d248556edaab9483ffb9234993fb70768927e8c3e2200f120420eec50f2fa7d61656146ba94d7f028e2189788babf3de3e1b15e07af373d143c49 WHIRLPOOL b520f9990e30c3bbce5e03a75acb28112567479723448fc925f05560a0a52a92ebb10b216e0827ca0de401faddd50371e8c026bf96a5bfb3ed0ac0fcc8707dd2
+EBUILD jsonschema-2.4.0.ebuild 551 SHA256 b5dcb102e099980a946c867d85d6ba9a35c6c215e9d013b66b48024fa959608a SHA512 b505d52a2ccc0035bcdb50546ebad7713ae15f839de3088b12119bf6af253338a2ae9cecabb57a9f56fcde689319af44e852dccae2b1323527543ee4d8e3cbb4 WHIRLPOOL 2b07348ba07af7588e5787644b3bcc6be5ad648a245d6b13d88267e11e58ce8ecdc34a291cc3fa56705779251c2b511d002422108d3e64ab4bba702571947c1b
+EBUILD jsonschema-2.5.1-r2.ebuild 1014 SHA256 205986dcbd3a9844eaea61a6e7391cc9fc4d8540938b16e64cd633124639ef88 SHA512 2e6512dd799ee8461a82d6a376a7df78219feaed1c765e5639b39f87a6e005c3eaa28f216fd005a88afd18cd9c3805d76d954f73da38b8044ddb67f671da76e8 WHIRLPOOL 29e8fd366624a651f110cfe67c7dcc9daaa15907bbd951ca5f78aa5ef3c6e7fe028c37128e8f19a55fe8fb12a1bd3acbfd1d811a8574c0724723ca9ae140b2ec
+EBUILD jsonschema-2.6.0.ebuild 1028 SHA256 d3df979983139f8be30a3967619043d7bf4ec6679eda895773316cb25e6c8866 SHA512 ab8ab207d6e62e44786415473b8b3223e0469fc4c64d41ba8c599a2c6d432ca8b6b853c198c5bbb9d834680dc795897d1bd4b4c6db3206c35a2e9371d3e6d333 WHIRLPOOL 2e873c15996f0945a6d301888ff5fa737897918366b4d3819e0e8649be053fd26dd57af21522f410c318ef90bb5ee9bcab29d5905b7e0808f8d6bf432b7bde0e
+MISC ChangeLog 6572 SHA256 7273a1c968fdb5cbf2cc3a54ed382f1d0c1f8b996c7a84ce8b1c2071b3d95e38 SHA512 ef9331f7467805f8d2af9c630dddd741838efdca72dab3f5f5440d9c43d9b7db8fab8566cd565d66dc20fc2c4a87de82d3e4eda5a40344751f87562d48f1f6b9 WHIRLPOOL 7d0ae6a71a72ab2e1f36f17823cfe22b3cc03ffa474afb41a594e95fe4b5ee691d1d2a5b8a6610df884f2d0b6625ca63bb920e6b7568ec22d7d9c677c09bdc18
+MISC ChangeLog-2015 3062 SHA256 26ed3af0c9f05087fb91450faae6d93246cc2ebe6aa97f878e5e07cb645b4f20 SHA512 405fe090f85427fe473ced38984834856fbbda8f2ebfdfdbf4a1d849e1facec5455705f715e6e4eb68de0f5bdfe8536b233ce34db05dd0fa84cc372a3ef65277 WHIRLPOOL 194f7ca70b476dfa3201d448b76ebc9bdb921f2e37f6dffa996083fa283b93fd2b0186e6ffb7e9c363458ce5c98184994fa1d01f0817e97010b7a7558e32e4f4
+MISC metadata.xml 559 SHA256 0e33e1152ab780a0dd0729ca52d95e9610ed663192052d546a00e347ca3c5d95 SHA512 6824c104780402599891db143c021ecb833d2bca3dee97a6d12cc51f23856f6e9dcadd2a438ca8ad13a6e292048cb5bdbdf024665b06da547fff1c7b9f5090cc WHIRLPOOL 6c6dcf0c8517d827033a6b883f623f67a0ef50f05ee2cec39d967fda3c8841fbbda06a234c83106aadd62ba2d7fe181ee16eded2e4187487619ce5d4bc8645da
diff --git a/dev-python/jsonschema/jsonschema-2.3.0.ebuild b/dev-python/jsonschema/jsonschema-2.3.0.ebuild
new file mode 100644
index 000000000000..93e3df5bb9cc
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-2.3.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=(python{2_7,3_4} pypy)
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="https://pypi.python.org/pypi/jsonschema"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+python_test() {
+	local runner=( "${PYTHON}" -m unittest )
+	if [[ ${EPYTHON} == python2.6 || ${EPYTHON} == python3.1 ]]; then
+		unset PYTHONPATH
+		runner=( unit2.py )
+	fi
+	"${runner[@]}" discover || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/jsonschema/jsonschema-2.4.0.ebuild b/dev-python/jsonschema/jsonschema-2.4.0.ebuild
new file mode 100644
index 000000000000..2a22eda88298
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-2.4.0.ebuild
@@ -0,0 +1,21 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="https://pypi.python.org/pypi/jsonschema"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+python_test() {
+	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild b/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
new file mode 100644
index 000000000000..878115565f4d
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
@@ -0,0 +1,33 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="https://pypi.python.org/pypi/jsonschema https://github.com/Julian/jsonschema"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/rfc3986[${PYTHON_USEDEP}]
+	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+	dev-python/webcolors[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep \
+		'dev-python/functools32[${PYTHON_USEDEP}]' 'python2*' pypy)
+	"
+DEPEND="${RDEPEND}
+	dev-python/vcversioner[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+python_test() {
+	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/jsonschema/jsonschema-2.6.0.ebuild b/dev-python/jsonschema/jsonschema-2.6.0.ebuild
new file mode 100644
index 000000000000..5154857aa768
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-2.6.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="https://pypi.python.org/pypi/jsonschema https://github.com/Julian/jsonschema"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/rfc3987[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+	dev-python/webcolors[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep \
+		'dev-python/functools32[${PYTHON_USEDEP}]' 'python2*' pypy)
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/vcversioner-2.16.0.0[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+python_test() {
+	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/jsonschema/metadata.xml b/dev-python/jsonschema/metadata.xml
new file mode 100644
index 000000000000..0ba78538e44e
--- /dev/null
+++ b/dev-python/jsonschema/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <longdescription lang="en">
+jsonschema is an implementation of JSON Schema (currently in Draft 3) for
+Python (supporting 2.6+ including Python 3).
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">jsonschema</remote-id>
+    <remote-id type="github">Julian/jsonschema</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jupyter/Manifest b/dev-python/jupyter/Manifest
new file mode 100644
index 000000000000..0f152d0d06db
--- /dev/null
+++ b/dev-python/jupyter/Manifest
@@ -0,0 +1,6 @@
+DIST jupyter-1.0.0-file-colision.patch 1727 SHA256 a88e50d5aba792e87566c74991023017e04324f728f628b3e45b8ba05feb9140 SHA512 a6b4cc6b91bb9941f029963cc3e3b7f415192f64788a34dde7828d450497987f92c25655c5ca183a7408fb1fb439917ba0f0a1ef1db3fe3bec1fc46d9ad2cf4d WHIRLPOOL 3690b872d910ed8e4615780e868c566f1f36c84fa11c33b25f2b9380a7f201a5c99aae9e29a0e6fb068494ff32babb257f20f773c7af901f25226ac1fd40767d
+DIST jupyter-1.0.0.tar.gz 12916 SHA256 d9dc4b3318f310e34c82951ea5d6683f67bed7def4b259fafbfe4f1beb1d8e5f SHA512 1f0bc83f7a127c98ccf4b3868814116aa272ea5d0baac52d7a022305af7e2da28ca2b90fa3554ff085d8df3eb6d8b8cde80bf02b8e66064c59900b926d73c520 WHIRLPOOL c648e494556f6d5d3a42594bb4c2fd5701b2f993cf467d6011f67141de2e80d6cccf1adfcfcda6445d8325604e67d6af4465b6e2d79443de67512a2a29360855
+EBUILD jupyter-1.0.0-r1.ebuild 1300 SHA256 dbabe4812cd58329f1bb1d7bab08c0f58890d5fa2fb1fc51fa0aad7d61b2d51c SHA512 24571554e886d5589fd845a7ee576515ebbe9d3f73e6afcb4ea6020fc6da3df5ef37083c7d4e9a6959a346513cac085545ee9006e784c4456222a011754b0715 WHIRLPOOL 6b15133dcc810e305233f55bec33fd44164f76c9c8e9d6b37cd5151fac5b28cf0196846def93d0b5f9fb0911a31260d8bb739ffbe94b697945d22d7a7d0641ff
+EBUILD jupyter-1.0.0.ebuild 1075 SHA256 d306591d0c978b1e1d65ea6ec10e7346b8ba0259ffaac19b1eb625b00361d824 SHA512 34ff80f3d9f05e1798c83b17e756682ed8142ca0180fba8401fddbb7d0ed3c1b57c92addaf35f81e41623fd0df3621168ab9acadf5dfce3ee7e544b9547f9797 WHIRLPOOL 6834eedeac41bf94765dfa0c2936cc69613293816a057b9f6a9e29acf1362854ddd530e7de94b39873c88aa45bd926f916b53879a5a01e5f25ad5a901ce7bde1
+MISC ChangeLog 1139 SHA256 b25ea3bc9f82f81a7833a60e9eb9f2faf37e8766f01abb66ec0f958a9842147e SHA512 a83bf5d781d4745130272b7e2376aa9ed3c95c75511f01f2a046fbbb487eff9075b853c43142d80043447efdbc4c082f3fe843a44f63ea62a6d752ac2a9694bb WHIRLPOOL 7f3c5cedfdb2b4b5c48041f37ac49aca88be21223734f401f7d816221b71955657dfea32e5e68e5954c7eabcf5e76057cc517553546617da2ddbc61ed7d0bc40
+MISC metadata.xml 518 SHA256 3cf6ab74353954a82db3ca65ed8f9deb66f4b34beadc0ba1ad0224f17d978f3d SHA512 3838bb1bd86e45821a6793faa2afcffa0a887876e35fd36a2b21e6e6312256f94ab79026232197752c922ad51208dbc04a30c43e0bd0ab8d7945ee4fe2947999 WHIRLPOOL c8a082d4bd9c87022b0f7b5a3b59294c1d6b6d448d2057c378d61ca13289380af7b94233fc96933c2cf3c983190bf0ef88bd0c50bbd9e0ea145466b0221d8d25
diff --git a/dev-python/jupyter/jupyter-1.0.0-r1.ebuild b/dev-python/jupyter/jupyter-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..d08d186cc3f0
--- /dev/null
+++ b/dev-python/jupyter/jupyter-1.0.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter metapackage. Install all the Jupyter components in one go"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://patch-diff.githubusercontent.com/raw/jupyter/jupyter/pull/198.patch -> ${P}-file-colision.patch
+	"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/notebook[${PYTHON_USEDEP}]
+	dev-python/qtconsole[${PYTHON_USEDEP}]
+	dev-python/jupyter_console[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipywidgets[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+PDEPEND=">=dev-python/jupyter_core-4.2.0[${PYTHON_USEDEP}]"
+
+PATCHES=( "${DISTDIR}"/${P}-file-colision.patch )
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( "${S}"/docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jupyter/jupyter-1.0.0.ebuild b/dev-python/jupyter/jupyter-1.0.0.ebuild
new file mode 100644
index 000000000000..2d9cc0f1408f
--- /dev/null
+++ b/dev-python/jupyter/jupyter-1.0.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter metapackage. Install all the Jupyter components in one go"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/notebook[${PYTHON_USEDEP}]
+	dev-python/qtconsole[${PYTHON_USEDEP}]
+	dev-python/jupyter_console[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipywidgets[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( "${S}"/docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jupyter/metadata.xml b/dev-python/jupyter/metadata.xml
new file mode 100644
index 000000000000..07ac384073dd
--- /dev/null
+++ b/dev-python/jupyter/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+Install the Jupyter system, including the notebook, qtconsole, and the IPython kernel.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">jupyter</remote-id>
+    <remote-id type="github">jupyter/jupyter</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
new file mode 100644
index 000000000000..fca4886c0f03
--- /dev/null
+++ b/dev-python/jupyter_client/Manifest
@@ -0,0 +1,7 @@
+AUX jupyter_client-5.1.0-setuptools.patch 1062 SHA256 eeb2870c19cf0bd29f1b1ba74ff54fc8096bb34429c917404fae8b3ad910fe47 SHA512 b373c4bd3278484252430bf463d873249895aa6e5b041274352866d73de9fe3196dd64a73385aed8878b44a33e742e64623427d6a2d68706fcbdd70d4a539109 WHIRLPOOL 82fae12597d63016cfc972ca5ea08e5d674e7c059b4614241ae808727d1db80808b022d3d1b73c23d565f79f04a0e99b53ec0b45a1e9c0175eb3dd5805db4504
+DIST jupyter_client-4.4.0.tar.gz 256379 SHA256 c99a52fac2e5b7a3b714e9252ebf72cbf97536d556ae2b5082baccc3e5cd52ee SHA512 a5b35812e5a5f2435888c07fcdeb4dc3fb8abfd13143579cb519cf349da12e7e94ed53d7655bf5a51191f9cfc8175ecac606ace23b90a5dc91b72878b0e87e80 WHIRLPOOL ca2ffc030ee9ba89ce7c97feea775a70d936e5e89d9f0930b098f249f3e2501dcc92ae9455241f0285fba9c344b3dbcbaf30715f2428a0081f478a2c58712678
+DIST jupyter_client-5.1.0.tar.gz 265233 SHA256 08756b021765c97bc5665390700a4255c2df31666ead8bff116b368d09912aba SHA512 eca7adab1f8aae05743c341a257d4ca4338b0838cc3441939dda48229cdfa13b267bdc338b951bc4e6e139d03d26b40a1294140218f84ab800d211f7e0d8bfc7 WHIRLPOOL 7b121394caea86739eac46a709fd725f6a000404c4006543fab543cd7e09faeff088a7a72444dce8aa02d75743d9270e9c68179644070625a86d20d87af3a3b2
+EBUILD jupyter_client-4.4.0.ebuild 889 SHA256 c1916ff9ed3fc90b5dabbdb89e8ac8d0fbf577f558a2b938c2447b380aa4fc8f SHA512 442851e421b6b6e5c09161ce84d3ebc2585a6612360a99043d2926059e7e6d2994464d8e28bb7325ebd05278f0d0a3b18b2952b06985c511130de0e7d8ee761d WHIRLPOOL aeb076a0886caed7b20bae7028ce94299db3c0befbd8213603ce873ae5efad516f0ce10037a422ba587e9fa412e8d418a36a2089ff727be42ee36214026cb84b
+EBUILD jupyter_client-5.1.0-r1.ebuild 1008 SHA256 c68a5afcfcc903c62dde7a115d5c89188efa46982c3256e3adbae0562a0602f8 SHA512 eec8c1b968f674e872734ec5ff531385cf0a6377cc8d3b561a3815d5885c39f6f33dcdb03e8b571ee3d058ea2511535b94006b5ef6139317da9e9cf536c08694 WHIRLPOOL d808f774d5f4273893063c3b7b627ae792d4cfb33aed413b59dec3deeb2aba995f357114b81ef6b87ab25edb3cd0a50af9738097e8c6d3af5f6fcdb85aa2dfee
+MISC ChangeLog 2011 SHA256 9a8315aa8b584c69569f37ac85027521b1f5eeb29f95ac0b8ad3ee1dc75414c8 SHA512 56a153a02a558ff0f6a3b41dcfb4fc3cfa01731a4a01eefd26ff4a2ce717d3563493a81fcfc8c769204dc0380878b5eb25e7668c94ecb1dcd7668428e1f74c6a WHIRLPOOL b2841996918958dde0884565256099913c5380e7437b9e42f94d786a6049f9c39db3e7f910d93609e6d1cfa7649a5c426700c631fdfdb40c0ee168537520d6f6
+MISC metadata.xml 647 SHA256 e5c4cb2a0b96f5abd4519558b3234fb8063cd921b270faf93394efc9e8c133ea SHA512 ffa9ecee1da3f5856daefeedbee972936ede17b2a828acd2ae1f80a82badc834afa2cdfef6f4a2dd70d29babdead8de8f5f60b888f0ff5e72b6b3993142177c5 WHIRLPOOL fad9799ae41a585c7df3d9793186a55e7feff2b5b76bb51ebcf9e271bbd4fbe92b84b26768deb846b9bea4aebb59c31804e12c232bb934fa7e64c8c92c789c4c
diff --git a/dev-python/jupyter_client/files/jupyter_client-5.1.0-setuptools.patch b/dev-python/jupyter_client/files/jupyter_client-5.1.0-setuptools.patch
new file mode 100644
index 000000000000..ff7dcb0f3d4c
--- /dev/null
+++ b/dev-python/jupyter_client/files/jupyter_client-5.1.0-setuptools.patch
@@ -0,0 +1,39 @@
+From f9bd2643d42b3354b27e64368d8c15cad18101d2 Mon Sep 17 00:00:00 2001
+From: Philipp A <flying-sheep@web.de>
+Date: Tue, 8 Aug 2017 17:38:52 +0200
+Subject: [PATCH] Always use setuptools if availabe
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When running `python* setup.py install`, the `jupyter-run` script doesn’t get installed without this.
+---
+ setup.py | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 60fa17c..0831f7a 100644
+--- a/setup.py
++++ b/setup.py
+@@ -70,6 +70,7 @@
+     ],
+ )
+ 
++# require setuptools for these cases
+ if 'develop' in sys.argv or any(a.startswith('bdist') for a in sys.argv):
+     import setuptools
+ 
+@@ -85,7 +86,12 @@
+     'test': ['ipykernel', 'ipython', 'mock', 'pytest'],
+ }
+ 
+-if 'setuptools' in sys.modules:
++# always try to use setuptools if available
++try:
++    import setuptools
++except ImportError:
++    pass
++else:
+     setup_args.update(setuptools_args)
+     setup_args['entry_points'] = {
+         'console_scripts': [
diff --git a/dev-python/jupyter_client/jupyter_client-4.4.0.ebuild b/dev-python/jupyter_client/jupyter_client-4.4.0.ebuild
new file mode 100644
index 000000000000..306a0f15db25
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-4.4.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+	)
+	"
+
+python_test() {
+	nosetests --with-coverage --cover-package jupyter_client jupyter_client || die
+}
diff --git a/dev-python/jupyter_client/jupyter_client-5.1.0-r1.ebuild b/dev-python/jupyter_client/jupyter_client-5.1.0-r1.ebuild
new file mode 100644
index 000000000000..f58b4e92548e
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-5.1.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+	)
+	"
+
+python_test() {
+	pytest --cov jupyter_client jupyter_client || die
+}
+
+PATCHES=( "${FILESDIR}"/${PN}-5.1.0-setuptools.patch )
diff --git a/dev-python/jupyter_client/metadata.xml b/dev-python/jupyter_client/metadata.xml
new file mode 100644
index 000000000000..53a086c17f50
--- /dev/null
+++ b/dev-python/jupyter_client/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    Contains the reference implementation of the Jupyter protocol. It
+    also provides client and kernel management APIs for working with
+    kernels. It also provides the jupyter kernelspec entrypoint for
+    installing kernelspecs for use with Jupyter frontends.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">jupyter_client</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
new file mode 100644
index 000000000000..a874c1b3c888
--- /dev/null
+++ b/dev-python/jupyter_console/Manifest
@@ -0,0 +1,10 @@
+DIST jupyter_console-4.0.3.tar.gz 22090 SHA256 555be6963a8f6431fbe1d424c7ffefee90824758058e4c9a2ab3aa045948eb85 SHA512 da9c311d881bbf61fbcea3c79e4dbdbe00f0f713772d0da4d30e0dec36ff5a6c5cbff3b996770f532c1e9c61ade1b1bf7a6f1ed28188ffd6900f6cc2ce7c0665 WHIRLPOOL 37139a87b182b9100284766ffb6e0b4c4e44b9bc2261a2d466920b0a23cf62d55f6a68cfb77da67a2eb3c316582fa7afaddcce69074b7597122e1c858c9a6c26
+DIST jupyter_console-4.1.1.tar.gz 23391 SHA256 d754cfd18d258fa9e7dde39a36e589c4a7241075b5d0f420691fa3d50e4c4ae3 SHA512 40894f41b85c1b823c3d75f33427728717b75e800a08c8a6b17b1c6ca7a6543b2aadc72d7ff131a7633252ac01bb0b0142025d7a53c3f3b7f8d189e6ff14216e WHIRLPOOL 724a06b5f0bba3a3bdd14d319df09ecf0b2ce3c4b167fce20cc498737e1bbb27082911dd8c5b4027bd56e13eff523b18abb112e308d7ce8e59d098b3d9257d80
+DIST jupyter_console-5.0.0.tar.gz 26119 SHA256 7ddfc8cc49921b0ed852500928922e637f9188358c94b5c76339a5a8f9ac4c11 SHA512 e31afa5960200feea125b939124b108a0b9dcc914fe2e21b86cd1dc409789cb25a72918a7eb5fcc7bd35c26bfabb71b6426a2cb7b45a8cab58f1d8e4b9bc89de WHIRLPOOL 9b5fff77febfc54c376f38700cd110a8cfd5e990c20827e4a985322a3a94b4ed961294606a9e0e1ed624c5883410a3d33fcc0bb98fb5c72b7b6851d2f177b878
+DIST jupyter_console-5.1.0.tar.gz 26661 SHA256 d0b4ae4dfe070be1e9d5690fa819328acffb5f37a8ef3baa1c7e3b77b443cfd7 SHA512 208a31886eb58c64541048e1f7ed75fccc888d34177f86dfaf10fb7dcd603130a8b3ecbe23cf4d80a75287b847128425f853715c494d2a7e4b4eed8a31058b5c WHIRLPOOL d41ffe6ba592ea5952a0094f7396f12c60f4348fa71eed705a1d445b446b2261094a8cd34bf3c0996bc1db6d7792275ee3eb1c43444649f33318a56f4a0b0b22
+EBUILD jupyter_console-4.0.3.ebuild 1261 SHA256 1231da5e16e612e1c3d69d05de2ad936ddc5e28fc93068ee0b9ead1389dad376 SHA512 e2502da12e494a94a8ef4c1b05682a9893915115bf8bb2f4eebbe5baff357b3c8f73170a3e2aed6079b1544c67c168f03a6c06dd85b1ac3f4058daf4925989c0 WHIRLPOOL fcf09153212bb71752aa00f1b7c47aec6cce37eb5083295d3e4989729927814293fa90efeed26dd4a6447799310e3efcebcf3ee1b3b02599139656b729873404
+EBUILD jupyter_console-4.1.1.ebuild 1187 SHA256 c7772a52226a9ea7960dc92446e50470afab688162dd0122bc7d6ea4f0285e21 SHA512 4e1efbca95dab43a888b043e34895ea5ec17d68279c775fb00db20458fb26e4317fef67a11f4ce6ff416c2e3d6eb3084590c19b0c4267a432a189327e025ba33 WHIRLPOOL bc10ce570e9a19ee44a519ac7e23724a9e9fa9d10917baf6276e00ac06daa61c557d5cd341e8afcb035d49b92b9b8f1d0af62fd204e044d0b5a37a8c04fcd0bb
+EBUILD jupyter_console-5.0.0.ebuild 1313 SHA256 be0218f9f04080f80d2446cd7f778f4d0db485fd5cb00af9e6f7d911b4336cf1 SHA512 7cdb1158f412ce0db69e22994d2702020ba0193476d0d12d14f1350187bf0a8f42169f4a7bd1b1b2e936a6e3df1ae1e5fe1213c7c40e14ddfc4cecd7615e2c5f WHIRLPOOL 5750a1f1c7e6686d1a1d80da632966c36180e998026671726690b0f6ebd630c64b661bfc097484150dd842527d7f62961de8be7621f6ccfa3d2adde98aa56c18
+EBUILD jupyter_console-5.1.0.ebuild 1257 SHA256 609b4af6cc8d58c4bec4875b16a9997554cc09558e2a9a821b8489bafa37d19f SHA512 ba435a1691e0e03348f38767da8b1b6c8fe471fe2020707d5da79cdf3c569ca9cefe3bfe503da60702895e96653b4b71edaf8ee62bf96ad971ee5414f6bed3ae WHIRLPOOL 086f964352a46c4459aee59a9a2a3410a2a4b43578f092eb45e6dbb4674e45c1c1bb310ecbd18b2371c6496c2d8618bf6a6ba5a22c92324f36037c34e1fa00b9
+MISC ChangeLog 2068 SHA256 8e797cb62c051c16bd776d5f6a43fe16090cb87d2b51072f08c51042f2555574 SHA512 4eaecd67c784a32732277cab0cfbcd162906d0005ba0cc1ca8f647634cfc8f6e31b641409a9966dd0b02d338c2499b7ce2505f14de36a535ee093a54f03e5c51 WHIRLPOOL e21ab6544041ad8b35b45ba0cafa14f177bd49a06d344ec3c5506a665c6da2472a5c7563c40de19c21e71a85de1e3c4bc1f9393597a2510372a580c4a13293de
+MISC metadata.xml 569 SHA256 473e5f596a4c34b2d69ee89b08e86b82f4045c0386f930a2055c3e8c6a61590f SHA512 dd29f7ff9dcca2afaa4caf814f4792391560a33b485d9a6de539a36c75df7b63e59d3eabf7bcb020b48ad30a7de0ac28137f54d96023fbc435e3a6378cc79b10 WHIRLPOOL 92c826d7a7ad6f221d952d9505440d938fa523ebbed8094835e773fc9d6da7e2282dbe27b0c0c7135c9bac1e0fa4d7b624a08085ae0c837a29e96fe29dbbc719
diff --git a/dev-python/jupyter_console/jupyter_console-4.0.3.ebuild b/dev-python/jupyter_console/jupyter_console-4.0.3.ebuild
new file mode 100644
index 000000000000..590cd9b43950
--- /dev/null
+++ b/dev-python/jupyter_console/jupyter_console-4.0.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests --with-coverage --cover-package=jupyter_console jupyter_console || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jupyter_console/jupyter_console-4.1.1.ebuild b/dev-python/jupyter_console/jupyter_console-4.1.1.ebuild
new file mode 100644
index 000000000000..e442872c62d5
--- /dev/null
+++ b/dev-python/jupyter_console/jupyter_console-4.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests --verbosity=3 jupyter_console || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jupyter_console/jupyter_console-5.0.0.ebuild b/dev-python/jupyter_console/jupyter_console-5.0.0.ebuild
new file mode 100644
index 000000000000..321559e078bc
--- /dev/null
+++ b/dev-python/jupyter_console/jupyter_console-5.0.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-1.0.0[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests --with-coverage --cover-package=jupyter_console jupyter_console || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild b/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild
new file mode 100644
index 000000000000..941b2efd7cba
--- /dev/null
+++ b/dev-python/jupyter_console/jupyter_console-5.1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-1.0.0[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	nosetests --with-coverage --cover-package=jupyter_console jupyter_console || die
+}
diff --git a/dev-python/jupyter_console/metadata.xml b/dev-python/jupyter_console/metadata.xml
new file mode 100644
index 000000000000..5f427be5461c
--- /dev/null
+++ b/dev-python/jupyter_console/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    A terminal-based console frontend for Jupyter kernels.
+    This code is based on the single-process IPython terminal.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">jupyter_console</remote-id>
+    <remote-id type="github">jupyter/jupyter_console</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
new file mode 100644
index 000000000000..71e5248458de
--- /dev/null
+++ b/dev-python/jupyter_core/Manifest
@@ -0,0 +1,10 @@
+DIST jupyter_core-4.0.6.tar.gz 55060 SHA256 96a68a3b1d018ff7776270b26b7cb0cfd7a18a53ef2061421daff435707d198c SHA512 e6d7a0293ce6cdd3202b354aae62900683eb0474590980bf3d9c6f89b4b16182e7caee0e42c3feb3de5851535a01394b20725d9428eb105dbc2c34d90e0d398b WHIRLPOOL c1370d386c63665db1a47f1df0e3942c713b4f9e71ad5a2bd8c83bcf1b5dfe937fdadcd606335a989514499b9e6446d92a0bb250b9e972181b12d0d9423ee80a
+DIST jupyter_core-4.1.0.tar.gz 56500 SHA256 146af0679c33c56db4b85b785f3dacd933ffaca97e7d2d56ff577a5485c2bd13 SHA512 863c4611093e914d92ac268d26e546842132d398d30f78c8440830a426da2923912b7da484ca3282a3f737300af316a305b8417cd1c35acd4a0ff93de1309d39 WHIRLPOOL 80427965a8394f1e86e0fc9a456eb3396cf37ed6e3c4362acb5998121d7b02c3242c3405871a2c25b71394716af039211a994fdbac5e833cc55c7beeb6e29d4e
+DIST jupyter_core-4.2.1.tar.gz 61794 SHA256 89c55399c8437f777197c2c82c1ff5639c7f71d4eb2f172a81afa120b68dc7b3 SHA512 775a1ddbf6f6cbd44bf924017832c4fa394c453c778639d4d58ca9a11d79574c5203858bd05683210c887ba469baae1290d1885a59833b129064a9c59345ad19 WHIRLPOOL b1797cd8884bf56f7c6d85123251572d18ee0a46bc5b3c8b6bbb97bcfa82b9f70b8b74aaba837293a11c714a5c0ecf99f0740c0d0e3d2250d4cd019533c21f00
+DIST jupyter_core-4.3.0.tar.gz 57998 SHA256 a96b129e1641425bf057c3d46f4f44adce747a7d60107e8ad771045c36514d40 SHA512 8e84cae53e035e3a3d29fe3b64246ce75bed291165db4ae7fcad472e1f1523d740ac168cb97330844548f3df3d7d82cd833886c1b755761b93e01153500961b1 WHIRLPOOL 6a1237ad91a06d6a5ff8b50258344983d6933cf7b798345471b350ee3a6c87deecca2411d0a009e4d48795b9ba307cc78908d4248439a6ef6f37a07a54b923c3
+EBUILD jupyter_core-4.0.6.ebuild 1145 SHA256 56a7ac9ae08a4a0de58e8036520bc8a80fcfc9d0b362a632c3470a23ec26b482 SHA512 7a37085e333e3efde2e1f06083b348b51e571e0bf48c47a3bd40c25a830ed7695203724b26a14c3e4b147fc31f4a43246e5aeab438ac3b1156b5824066436431 WHIRLPOOL 93d7f122b7f910556a6d59d2795e3b4e6e3e6b38b8b5ccee5b941a406f105e5eab0a2bb28f175a3485e30442b784337c068178791703cc1c9a7f6b41528ece20
+EBUILD jupyter_core-4.1.0.ebuild 1145 SHA256 74ec4ab56081dc51ad5c611c352d828712a3c11dcc966024aaa22deb0e7cd083 SHA512 5f5127ca454f3c60a9ce41751491031335f933fc6c965e1e525854c7870f3d4afbb079e7bf97dd9821fba28af4c64f830e643d655c40c24639b6d747dcb36224 WHIRLPOOL 97666670162dddcc4deb5a006354597b0d9d16dfdf587be1433fc8c6edf68f7f7386276b7ed2ccdf0ade0fe959d07e285982a6468d731e24efce378c04134918
+EBUILD jupyter_core-4.2.1.ebuild 1177 SHA256 0311805967567252f7cf632f6e69a9b8240cbf1e5e2b14316dd67ec3aee85df2 SHA512 5364e8ee4d268f0afe1f55ec54e064f64081e2644d4a9f61ea1fbecd99206a18ff0b4fd017e7552a1304352ad0187b5e9462227e7c21f102d3342fc5cd2bcfdd WHIRLPOOL 2ee5f1cd7bf7f2da7fde05c5941e43f23edbae10435e6311b6fe164fa5c18511ac950aab1bdac03e36f90ea432ace279c546f741075168283dbf0c0da2702cd3
+EBUILD jupyter_core-4.3.0.ebuild 1123 SHA256 e226bed2e4e5eb6665b22985a4deee949293aa1f38d60a1b2d9c670956e975f0 SHA512 73b3a1bcb6c69e820a31917672c88ab6a7aa2cac4dd24c60e69e889c9eb40270afeabe99d85b30cdc90c1391814e66fa81b55917e26f85030358622dbd6eb061 WHIRLPOOL 94d7f55154ef7ece90aa4349656c05709736a02c071d4aac3d9386f53b2aa6e65e160cf41667811824be4ed5ed43bd49db1a0bb62198f507099080664ea87d11
+MISC ChangeLog 2326 SHA256 4fe2da0cdf96211e17cbe948ed801fbf606a16931bef37da63255e702e1aadd4 SHA512 60f273e89e99457ff0d07f4ddfeef8bdc697a8a4dc8418f0e214e9d13ef449ab618f00d8200b0f629d3c9267fcb196ebf3e520026e110be0d1ec65e1418732b5 WHIRLPOOL 646797bf75a4b0ea8a7ceb14c217c86ef0eb483d948e7f06708e8d5ecc06150d90a41f4bd4e5fc6b42cf1803a6859a6bedb57f8b1310c1e5dd1396b1e47b03e7
+MISC metadata.xml 626 SHA256 ea685c7facff503b156ddc5704102828f11d6943c97831d9ff3cd9c9a4a096ff SHA512 bdac450a0bc297c925ea6431253eede78d61623feb30e1901f51a9e31722642741d5bc009162e09eb5b0fd9ca094e2eff54846b2612e99116239d764abb05533 WHIRLPOOL 38e0b8477682e31af913c75bcd2803b6d6da7fe911cfb8f426cf68af4dfac6e2d2f45950750a817cfbd7a1fe73ce738ffa82f3a49f328aa753c52beca61ef5a6
diff --git a/dev-python/jupyter_core/jupyter_core-4.0.6.ebuild b/dev-python/jupyter_core/jupyter_core-4.0.6.ebuild
new file mode 100644
index 000000000000..47ce9f7f531a
--- /dev/null
+++ b/dev-python/jupyter_core/jupyter_core-4.0.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core common functionality of Jupyter projects"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	py.test jupyter_core || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jupyter_core/jupyter_core-4.1.0.ebuild b/dev-python/jupyter_core/jupyter_core-4.1.0.ebuild
new file mode 100644
index 000000000000..c46b91a23259
--- /dev/null
+++ b/dev-python/jupyter_core/jupyter_core-4.1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core common functionality of Jupyter projects"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	py.test jupyter_core || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jupyter_core/jupyter_core-4.2.1.ebuild b/dev-python/jupyter_core/jupyter_core-4.2.1.ebuild
new file mode 100644
index 000000000000..c7cb549f26d3
--- /dev/null
+++ b/dev-python/jupyter_core/jupyter_core-4.2.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core common functionality of Jupyter projects"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	!!<dev-python/jupyter-1.0.0-r1
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	py.test jupyter_core || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jupyter_core/jupyter_core-4.3.0.ebuild b/dev-python/jupyter_core/jupyter_core-4.3.0.ebuild
new file mode 100644
index 000000000000..a64ed0b484f5
--- /dev/null
+++ b/dev-python/jupyter_core/jupyter_core-4.3.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core common functionality of Jupyter projects"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	!!<dev-python/jupyter-1.0.0-r1
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
+		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	py.test jupyter_core || die
+}
diff --git a/dev-python/jupyter_core/metadata.xml b/dev-python/jupyter_core/metadata.xml
new file mode 100644
index 000000000000..dd311505a57e
--- /dev/null
+++ b/dev-python/jupyter_core/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    Core common functionality of Jupyter projects.
+    This package contains base application classes and configuration
+    inhertited by other projects. It doesn't do much on its own.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">jupyter_core</remote-id>
+    <remote-id type="github">jupyter/jupyter_core</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/kaa-base/Manifest b/dev-python/kaa-base/Manifest
new file mode 100644
index 000000000000..a12cf640c27d
--- /dev/null
+++ b/dev-python/kaa-base/Manifest
@@ -0,0 +1,5 @@
+DIST kaa-base-0.6.0.tar.gz 346849 SHA256 04fb0f610ec19a1aad1698d20829fb8caa34a97fe9cd4d9acf9f4f9f918d79b0 SHA512 685bfbab9ccdfed529ce17185f50700f8b090c0ca2f5f8e937609c9f03efd19536cc8c2ae8218415eea3ccd89269c92aa4d9bfe88ca3e951d7546ea4ce91cd6f WHIRLPOOL 4887fd6af4cfbf16701a604aacf4f78aedeb96db50c6955a7fbb15d45fd5824288b76f5aa372358fd7c0983b7ca0ea55390334a301c55bcd0e219d777ebf546e
+EBUILD kaa-base-0.6.0-r1.ebuild 1048 SHA256 fec3df1ebb22cfaa4a094a5c4af00d52ae818227ba8276b2f38ae5fafae6ac4d SHA512 5da7c7c0f1e5610ffb3bc7353215701773035b7c9d850403b8647b25df3bd530f7761d02309f847f9c6bf5339e3dd553c32c8c51553b55e94b0f953ace6719d8 WHIRLPOOL 4b043e75b865992a2121f380c43ba326aaa32acd45a1d5eb8d5de15d9a1bb3779ca76fd205d22cb92e72b0924b07ebc05454f3cc95bf9230acb457d7e0e4b889
+MISC ChangeLog 2596 SHA256 0b37657daee9f623043f5ca2ce37eaf5f442edd5826b800bc26a1cf4257629c5 SHA512 6b01ab47fad4bf8baa84e7aa9685eb82a613787c17451240eba6bf5da07ac4350d9bd0712521ba85af83dc035fac783e729057219dd03e70e9596507a44f3473 WHIRLPOOL a47bcbbec8aa48184d14bb05d21572fd91947fc8ef7c49ce6e4a0595442327f3b2424aaa19928077a52738c57f052670e61b22af5319b837b2e63df2082b4a13
+MISC ChangeLog-2015 4718 SHA256 32100c59391a9c9c8641570435973f9e4938b60ca75f5f03c181f3291cc8d77a SHA512 5850ac2e6683cb868988ac43c18b0d86ff2b90112bcf23ea3fc94d7d4d526e9ac45b0f825d03ebcc22b04f04df1b9240c485c842dac55331556db39764f5d452 WHIRLPOOL 2fb7e7a9e80dfc726dc8f7d0690c417cca90ce731d5dc2b79dd82170b65b5c599562617e86813cc2505fbe5366541ec9b5c7b113c116063d0c165886f75abb10
+MISC metadata.xml 828 SHA256 768eca9c7769dcf0c719fc06a5860c8b4a469d287a7c354b04012b01f029b256 SHA512 d4b57b7f916b6ea47c371ec1198b1bf03ffc63c8d3b205013ba9fdcf7106ec71b71b1727e2a0e08d7aab9b1ef9d06b645ff53f7a8c73c60fbc7d397331746b4e WHIRLPOOL 1610363821e8ac1aa7a2ca145728068434ea873cbdd6645fcf512486973145a4344ec7196caf1aea1bedb4856f6ee4e9e0e2d2b02bf88b5aa04277c191f31926
diff --git a/dev-python/kaa-base/kaa-base-0.6.0-r1.ebuild b/dev-python/kaa-base/kaa-base-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..02a7ed1b8652
--- /dev/null
+++ b/dev-python/kaa-base/kaa-base-0.6.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite?,threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Basic Framework for all Kaa Python Modules"
+HOMEPAGE="http://www.freevo.org/ http://api.freevo.org/kaa-base/"
+SRC_URI="mirror://sourceforge/freevo/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="lirc sqlite tls zeroconf"
+
+DEPEND=">=dev-libs/glib-2.4.0:2
+	sqlite? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	zeroconf? ( net-dns/avahi[python] )
+"
+RDEPEND="${DEPEND}
+	dev-python/pynotifier[${PYTHON_USEDEP}]
+	lirc? ( dev-python/pylirc[${PYTHON_USEDEP}] )
+	tls? ( dev-python/tlslite[${PYTHON_USEDEP}] )"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed -i -e 's:from pysqlite2 import dbapi2:import sqlite3:' \
+		src/db.py || die
+
+	rm -fr src/pynotifier
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	export CFLAGS
+	distutils-r1_python_compile
+}
diff --git a/dev-python/kaa-base/metadata.xml b/dev-python/kaa-base/metadata.xml
new file mode 100644
index 000000000000..aa7526149e67
--- /dev/null
+++ b/dev-python/kaa-base/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+		Kaa-base provides the base Kaa framework and is an implicit
+		dependency for all kaa modules. The kaa framework includes a
+		mainloop facility with an API for signals and callbacks, timers,
+		process and thread management, file descriptor monitoring (with
+		INotify support), inter-process communication, as well as a
+		rich, practically magical API for asynchronous programming.
+	</longdescription>
+	<use>
+		<flag name="tls">SSL/TLS support via <pkg>dev-python/tlslite</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">freevo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/kaa-display/Manifest b/dev-python/kaa-display/Manifest
new file mode 100644
index 000000000000..3b0ddc527f6f
--- /dev/null
+++ b/dev-python/kaa-display/Manifest
@@ -0,0 +1,5 @@
+DIST kaa-display-0.1.0.tar.gz 40263 SHA256 72cfe231feae7b860b9e00fb2d83e1cb54f0d38719267a4701818c4c8aa6e922 SHA512 dec20eb8830567b07248fd4733d7576c9dfbe4f8577d4326e82baf434034e2b6105d3a6cf561f074fcf29b328d2daf6faf6a18dc467b030a3814d953b44a0b1b WHIRLPOOL 6da8fb77f155c8814e1af60364a89955330dd78238748aded1b0e64e503e38994f597462f0b3eeddfd7654f049fb8a7d03853e7174d11217916ea4074760ec1c
+EBUILD kaa-display-0.1.0-r1.ebuild 699 SHA256 18a02269938e5719663cdda3cabd8cfa28973454f1910b607f4ac3f4757fa43e SHA512 1e31803f7302b587c8d089158cde317fe79c6941027e21a85f7c80114f3f0c69d8c43e31a5e7df07c93083044e596b0dea7d24534af322ebefe7ce4d73f36b87 WHIRLPOOL 3ab5e817cd1ac957c7fcdad230e51132933348cc0c37086fa8d43b61521c658dd15df10b2cc73a60ad5f813497661daaf0c57d787a388748ae420f2bf2299729
+MISC ChangeLog 2866 SHA256 e3a4a5ee9efce5c19d060bda11adc41b7b72b8a1fd27a4a7e7d40e0d5f314d0e SHA512 91be2783eaab751fdb3d056cf4ab13a39b03e1857bb7dc1ea571d758da42a1c08a2c36b682c7b8250683f8ddf5b98be152003319e71b1d48bf9a18ff4593e9c3 WHIRLPOOL 7fb3e6d79ed636856206dc67d2e4d8c66d294edea4f90b043470ed8fdef6e100392aa246b27e18b45efb834c124a64b9398fea1a02055460b8613f93b2809eb9
+MISC ChangeLog-2015 1941 SHA256 081a5f1b6c4976c0953ea210a57321a547af5e3ea325f6148ce549e1f6282b18 SHA512 388143a2e45d22af76799f7c6ce088d6c6251c877c4066fea07c0ecb49b46871b3fd062b2a5e5a2365b42f36e1dc3441cc6fc4575bde8d6c52dc4417321153a4 WHIRLPOOL a63ef5be18d3a295147193affabbb1071f4bae3fa6fec3130024509526ae98a80214e52dd01eed768d27de6573e8c7f83c12e65dd5c497f73062bae220101343
+MISC metadata.xml 316 SHA256 850fdf41d182b1c050d4787657382f8c2144989cafd538e244d083b75ef5703e SHA512 41d3e8e45db975400ba89fb8fa4d2159d1d77a2200d116f9e071a1b498f81ec05d74ab0c5c36ba5859a87d1b66cdf337e05e45a85044ecccceece3a93cb79385 WHIRLPOOL 365979f5a820844d03ae15190646fc201784eadaf554feb8c10bfa108ecf2f5981ab0ae95aec136582d7984e26e57783ec55c8a2e1307bdd9771117a7c86f7d7
diff --git a/dev-python/kaa-display/kaa-display-0.1.0-r1.ebuild b/dev-python/kaa-display/kaa-display-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..d4484e45f550
--- /dev/null
+++ b/dev-python/kaa-display/kaa-display-0.1.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python API providing Low level support for various displays, such as X11 or framebuffer"
+HOMEPAGE="http://www.freevo.org/ https://github.com/freevo/kaa-display"
+SRC_URI="mirror://sourceforge/freevo/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-python/kaa-base-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/kaa-imlib2-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pygame-1.6.0[${PYTHON_USEDEP}]
+	media-libs/imlib2[X]
+	>=x11-libs/libX11-1.0.0"
+RDEPEND="${DEPEND}"
+DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/kaa-display/metadata.xml b/dev-python/kaa-display/metadata.xml
new file mode 100644
index 000000000000..4d1758b85b4d
--- /dev/null
+++ b/dev-python/kaa-display/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">freevo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/kaa-imlib2/Manifest b/dev-python/kaa-imlib2/Manifest
new file mode 100644
index 000000000000..e00805248fc2
--- /dev/null
+++ b/dev-python/kaa-imlib2/Manifest
@@ -0,0 +1,6 @@
+AUX kaa-imlib2-remove-png-dep.patch 387 SHA256 8f1c578f5b1ff70dba7e6e8a8ca40e89dc6e25d25fb6b0e47b7efbc212765054 SHA512 70434172fcdfa29889a8fd53ff504a6aa33e2f630ae76020894f776c81f8dd1923b0aa9d9460ee41ea1b973650835a735efee82cd27c83cff7b4f5d27e074c5c WHIRLPOOL 00ade8c9cca291cfa47a888bbe4683de716afb94265621145809f94b14ab5e7e7b1d1640ecd89ecc1984c7b1aaa256854539bc777848ce1b6a4d1ad7097007a3
+DIST kaa-imlib2-0.2.3.tar.gz 30671 SHA256 44eec202450edadfdac91a44be191b7fbba6225e90a6595443c422d1928f39c6 SHA512 417e473befba7360160db8296fb20de9689f6620bf0940b35e68b4abf00ec49ffadf95f62b7c6baaf1465b6c69c2d14b149d9ff3a4a8450e5966cf53f160a5a0 WHIRLPOOL 480d3e0b51cb93c4c53c6734844e6fddbfba3ed81e0d4b40493e254c39375276e3d52c108cef488f8551d58e73a196d8bb3a3e73a48e9fcf98d1158106c10e9d
+EBUILD kaa-imlib2-0.2.3-r2.ebuild 596 SHA256 a2bdade04addba33da74f09f0ce57add94f9a85f1bf906f0299c5a5ea7eac7ac SHA512 dc07bd47eea64d6582035c0daaef1792cd13c5613b769ff0b21076bae5e75f210ec8d4351a3ed22388efb8cac91d61cd48f740e59670e688c801eca5f40796e8 WHIRLPOOL 784dd91a66a9c42146ee8a6eb8d4f33cd64b16abbc7738cd20340473a6048043d5f93239d930b5971d78d9f143c33dfaa3f27b9b3f7dddb8ab588b5a0b5f5de6
+MISC ChangeLog 2910 SHA256 835df03644a6e28bc473b2b0197705d8ee281ad1c2ab7f80f64a27b8d4f2fa73 SHA512 f160f64bb10bfac88dd943cab720d08b96f37b28a05094fe8ff6d2b7a138f63f82fc2abf8635595f29cf95308aacaa957992f9a1ee256897857256b9e03634f4 WHIRLPOOL c5cd5e22065582f4526baedc9cee167b5114bfeffdd5027469e01556666eb0131f62ad2070b3164bead0f344a1a78f87985a83d70b5929e3a703d97ba74fbec9
+MISC ChangeLog-2015 2889 SHA256 d881754714aa917d771446898f31dd704e9d6c59e183988f69d6253697910705 SHA512 d27972b5759178ee8a50b616270993fc36cf9a0b6aa09130d3daff6ffa666955aef7857b555f15b358dd76539d9fd15ddbfb68cd7052c510c7dd406570d2da9a WHIRLPOOL 643dbdcc9be043e2e96acbc6c226c8a3217111d88a119224acac92bb9a5868a43331d947b3ac724c8d6ae71a2784f0d6b7de512ea744582275c937bc3e1bb5b1
+MISC metadata.xml 399 SHA256 3863e7c2e450bd96c1811aac885d87fd691be38535308e776ea2d009f83b861b SHA512 536fc2cfcc90a1990fedbf8a706bae5aaa6c5c6a16e9734fb471923ac68a298857b6f4b2bc17b6d4241ff3ee9b7d5dfc031d4bbb178f4140616ac5ecfc868f85 WHIRLPOOL 1629a81d176da2c2511f928aafb312276f03390d0c7fe48998c8d1fe0b2ba436ab5d2ab5403dfa7107083da5efb01cc64a75555bda1776c8aba4faf1f32dd485
diff --git a/dev-python/kaa-imlib2/files/kaa-imlib2-remove-png-dep.patch b/dev-python/kaa-imlib2/files/kaa-imlib2-remove-png-dep.patch
new file mode 100644
index 000000000000..0db6fefa9ca8
--- /dev/null
+++ b/dev-python/kaa-imlib2/files/kaa-imlib2-remove-png-dep.patch
@@ -0,0 +1,11 @@
+--- setup.py.old	2008-07-12 01:43:30.700296071 +0200
++++ setup.py	2008-07-12 01:43:57.441547566 +0200
+@@ -39,7 +39,7 @@
+     sys.exit(1)
+ 
+ files = [ 'src/imlib2.c', 'src/image.c', 'src/font.c', 'src/rawformats.c' ]
+-libraries = [ 'png']
++libraries = []
+ if not os.uname()[0] in ('FreeBSD', 'Darwin'):
+     libraries.append('rt')
+ imlib2so = Extension('kaa.imlib2._Imlib2module', files,
diff --git a/dev-python/kaa-imlib2/kaa-imlib2-0.2.3-r2.ebuild b/dev-python/kaa-imlib2/kaa-imlib2-0.2.3-r2.ebuild
new file mode 100644
index 000000000000..01b4d056decf
--- /dev/null
+++ b/dev-python/kaa-imlib2/kaa-imlib2-0.2.3-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Imlib2 wrapper for Python"
+HOMEPAGE="http://www.freevo.org/ http://api.freevo.org/kaa-imlib2/"
+SRC_URI="mirror://sourceforge/freevo/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-python/kaa-base-0.3.0[${PYTHON_USEDEP}]
+	dev-libs/libxml2[python]
+	media-libs/imlib2"
+RDEPEND="${DEPEND}"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=( "${FILESDIR}/kaa-imlib2-remove-png-dep.patch" )
diff --git a/dev-python/kaa-imlib2/metadata.xml b/dev-python/kaa-imlib2/metadata.xml
new file mode 100644
index 000000000000..a6cf9f4c0035
--- /dev/null
+++ b/dev-python/kaa-imlib2/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+		Kaa-Imlib2 is a python module for Imlib2.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">freevo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/kaa-metadata/Manifest b/dev-python/kaa-metadata/Manifest
new file mode 100644
index 000000000000..e3ce0f2fa6a6
--- /dev/null
+++ b/dev-python/kaa-metadata/Manifest
@@ -0,0 +1,5 @@
+DIST kaa-metadata-0.7.7.tar.gz 257513 SHA256 7466058f1f69e40a9e26c8e6219c13c3a4f1b5228effc88035d9f4fe287cf450 SHA512 a6ac02e4887cc0489903cf57f55666b30e1351a958572117a867285f34639bcd7302450177f0471cc4bf0ad02d8a42d1f015cd237948610357bdc2e2fb9cc131 WHIRLPOOL 2116f304b826e906ce150ee4b321085b1f2d10ed5c929d8a333c9a5b0d63304e56a3cf91212ab100d78f0a7eda0991ba3824c687f1ddebaa9b8f76626c73088c
+EBUILD kaa-metadata-0.7.7-r1.ebuild 807 SHA256 46a056d47d88d1cdba8a57bfa4ac8219d3fec4ef22799aeeaa95569445bcb3b3 SHA512 9fc188772a0074f45a25413dd6441cabed9386dbef944a8d277071429a2f48b1a03a5a93b38d4bbdd3f2eb6368d1a1b154ad4393974000d8763b88091637b708 WHIRLPOOL 6b00c667bf413c2b865cb2d726cc19444a8727e96fc5a205a69cbab4f42f0e82332a780ab6e3e0dee31b3f6cbb612038bec370474da0afae95bd6abd8fdd113c
+MISC ChangeLog 2450 SHA256 34fb40654dbd89d7a40079953150cf085d24457a2c935c7f660d855d868e4600 SHA512 2f87874d2edb9d1dabcc46b840106d1f08b5394445817b3c1c1c1c152e09b915d8a00d1136a0daafd5a2d3d8c35f783ffb577a7b65590e5766a35b0094406007 WHIRLPOOL eea95b8e50311094f1010553d3ba6dc9d02a4b57dd32056154b799f81f2359994beee2a3eb9d0f3975940822a971556bcfcd9b755561b7359d402bf848786b28
+MISC ChangeLog-2015 3867 SHA256 4d38dab283ee118e434f9d028fe14812216a120b5ca7258c706f82f11209c231 SHA512 9847a48808856f997a466b8e3ba7cc88367b374f07fa6b64b0ac369f7f386027ddaaedfc97341e5582ffb5a8d78c7d59328a774a8a373e01b7313bf0bd733b9a WHIRLPOOL aba450329c09d7cd2d28a6bba39e620cfd7bcf6070bf5b00caaee1de76fe8a94e7ff23d16f916dcb225aeef49a7277564b331c56445b59dc9740885916c6a100
+MISC metadata.xml 601 SHA256 eca2f8fe4c8ac36d6d7d3d11d636acbb26cb746569c101221b28767182762aec SHA512 0664a2829b06c44684c95d2026d55618bea39179ee184eb922c6e58bd7c81d87d0326998330000126cb885ac9cdb241e20279508762d71a99ddd4e351199f421 WHIRLPOOL f4b18c6d6e008ec75961facfc40dc92c2998e379b92440b3704314d0d0e1b41d647756f3f820d026763a75e404841b09fc5a3727e45bd7bff999434b34cc9c76
diff --git a/dev-python/kaa-metadata/kaa-metadata-0.7.7-r1.ebuild b/dev-python/kaa-metadata/kaa-metadata-0.7.7-r1.ebuild
new file mode 100644
index 000000000000..c928e9c8f9b9
--- /dev/null
+++ b/dev-python/kaa-metadata/kaa-metadata-0.7.7-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit distutils-r1
+
+DESCRIPTION="Powerful media metadata parser for media files in Python, successor of MMPython"
+HOMEPAGE="http://www.freevo.org/ https://github.com/freevo/kaa-metadata"
+SRC_URI="mirror://sourceforge/freevo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="css dvd"
+
+DEPEND=">=dev-python/kaa-base-0.3.0[${PYTHON_USEDEP}]
+	css? ( media-libs/libdvdcss )
+	dvd? ( media-libs/libdvdread )"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	# Disable experimental exiv2 parser which fails to build.
+	sed -e "s/-lexiv2/&_nonexistent/" -i setup.py || die "sed setup.py failed"
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/kaa-metadata/metadata.xml b/dev-python/kaa-metadata/metadata.xml
new file mode 100644
index 000000000000..3331a4dc8021
--- /dev/null
+++ b/dev-python/kaa-metadata/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+		A powerful media metadata parser in Python. It can extract
+		metadata (such as id3 tags, for example) from a wide range of
+		media files. Attributes like codec, length, resolution,
+		audio/video/subtitle tracks, and chapters are also returned.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">freevo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/kafka-python/Manifest b/dev-python/kafka-python/Manifest
new file mode 100644
index 000000000000..898b1121a03f
--- /dev/null
+++ b/dev-python/kafka-python/Manifest
@@ -0,0 +1,10 @@
+DIST kafka-python-1.1.1.tar.gz 213892 SHA256 1da61987111d23918aaebc81e1a5cfc8c72193a5df3caf4ce8826cf08bef89ec SHA512 aa95c5e5ae7790b898cfa40e763eb9c64f17c74ce1322b9a31edfd61fe693ff7cf7048d3f90cac5911c7c4dc8aa7c34ec9d33224bdad5ae5e9591e7fbcc01967 WHIRLPOOL 7706058a061c08bdd383de36dadb4035fb2c4606b0a0440062e0b92ea3965cbd1dbdb88ffc6784096e62d088a733fce66617aef63463485c5a1cfe416a007743
+DIST kafka-python-1.2.0.tar.gz 219060 SHA256 d5b503dbd2a0f3a6224b32998a02793fe3ac39bf45721bd9d4c65d841ba9a6ad SHA512 71141cf71a8da3124f03870b6de0787a1d20451d280b2077b694c87c46a0f78d4f6c2dfd4984859e3b4a54d6ec151ad1f5626fde1af135a5bb711a39f48a855f WHIRLPOOL bb156a89ae50cc040d98f1c50715ed8db61504a54fa8dcd460543686d81c03bb5efbcd972df459a4545bc88157d1381721d4e8c47301a26be5eeed15a9cf61df
+DIST kafka-python-1.2.1.tar.gz 219842 SHA256 ade1f5c016f030eae5bff6eb34052ee9d1dc8d0623cb5c61d23b43abf679393e SHA512 29989a137a05b7d8eccf05ddbb7f9d281b678f1d128e2b9383ccc0b7decfe931b09baaa8e9c2a45403601143f78cb0e3f89cec0c6151ab8e7bf38b732b984b9b WHIRLPOOL 3c6d60f8c1e2d1eff8fa9d46e625fed7f47089db35f8637a998ef5d671f4b070cdd6add39d22671ee2e76a72c7ce51860db1cdf492cd0e30e65c1fba0e72d0a5
+DIST kafka-python-1.3.3.tar.gz 255686 SHA256 a4910d705c3800a40c31c33c264532a09364f24051697e59279c4ee06527ca29 SHA512 19b43ddc7a1ad3fcf58c55198de60c4434bfa3747d5bbc40f1acf0aa28225eae87effbae69087919b111cb739010bd4087e2497fdc78987f4cdaf33e81e516b3 WHIRLPOOL 79855df0dbc711d20175623cde9dddb170de9b41a138ee94ea44cd3a179d0602ca40485ac17e0e8485c3d9ecbfc32d65aa827e9652809d3c38a32d51e0c026d0
+EBUILD kafka-python-1.1.1.ebuild 762 SHA256 657d1bd60d0ce237deb21364eb20d0a9530e40fc7e39b6a19fab9c7189efd6dd SHA512 3a5cb78ce0056782a4194f0d58f96d5d6b10044431f3f591be128f6a3808bad42333f844339590d7fc7aea7c69ce6dc08b576c023e2bb2a352a99a1cda069041 WHIRLPOOL 6973f99e0ab45aa58497b98462164d7dbb624c8771093b61575e933633c09a2cb69f843a942a2a49354e1900bd52b684879250712f12d20c62d6c27886872815
+EBUILD kafka-python-1.2.0.ebuild 762 SHA256 657d1bd60d0ce237deb21364eb20d0a9530e40fc7e39b6a19fab9c7189efd6dd SHA512 3a5cb78ce0056782a4194f0d58f96d5d6b10044431f3f591be128f6a3808bad42333f844339590d7fc7aea7c69ce6dc08b576c023e2bb2a352a99a1cda069041 WHIRLPOOL 6973f99e0ab45aa58497b98462164d7dbb624c8771093b61575e933633c09a2cb69f843a942a2a49354e1900bd52b684879250712f12d20c62d6c27886872815
+EBUILD kafka-python-1.2.1.ebuild 762 SHA256 657d1bd60d0ce237deb21364eb20d0a9530e40fc7e39b6a19fab9c7189efd6dd SHA512 3a5cb78ce0056782a4194f0d58f96d5d6b10044431f3f591be128f6a3808bad42333f844339590d7fc7aea7c69ce6dc08b576c023e2bb2a352a99a1cda069041 WHIRLPOOL 6973f99e0ab45aa58497b98462164d7dbb624c8771093b61575e933633c09a2cb69f843a942a2a49354e1900bd52b684879250712f12d20c62d6c27886872815
+EBUILD kafka-python-1.3.3.ebuild 753 SHA256 439dc36cde2f85c214dd91286fe5be4ef812639148f79690020790f30273f1a0 SHA512 fb368c0d9ec0fdf196840e8d3cdf0c5d7dce22b4bc55eda50395584bbf4693d98532414659383e1d935da67c0031f8f2a73a461ba686b7a3b0473846f1431469 WHIRLPOOL f09a91bc88121f4a7c66f26aacf12dedd52b06df6e9a7612d59193e389f350a7126809595e77fe29b34515644959a057395bdfdf96d47ef85cca939d89961cab
+MISC ChangeLog 562 SHA256 aa5dd4febb69861fdc5388892c033cab0f491208175c9fc7207b54d02e7be6f7 SHA512 d321953b9353ae80f4fcae2ceb0dadc54d26ac266113b660d9bb6bae338a112102ccf7193d79a1bb81d8c4efd9a2f736a6a84c72bfd8d68fc3c5576876d94675 WHIRLPOOL 99fa879cefeed776753364da30a9cbbf649f042e5ac510c84a8a21a8fe33ad232fc91bb2203d22df37a1f0e554f92d53ace92d21254c6bdc0ad7ca9b70412f2f
+MISC metadata.xml 584 SHA256 02b553d9283b0e68f349b5430c69ac91f6bf61bedf12ea53f5d93f7a0d97c8d6 SHA512 e9fc0f1e65caa37159e31c2044d483b98601a912646d7fa4e3c31d59b631fc01cbaa667490d9924d936632f629d54742e4a7b2046f50a7186c36c794deeb2737 WHIRLPOOL 43efc84c46bd7f9669c9c929f165f9cbf24dac63cd6908ad576894a6c6897d1ceb53e28af8fb23a4359b2f93c8089274beb353b0e4c6932d005ba3e92b68be48
diff --git a/dev-python/kafka-python/kafka-python-1.1.1.ebuild b/dev-python/kafka-python/kafka-python-1.1.1.ebuild
new file mode 100644
index 000000000000..04cec8c5c343
--- /dev/null
+++ b/dev-python/kafka-python/kafka-python-1.1.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Kafka protocol support in Python"
+HOMEPAGE="https://github.com/dpkp/kafka-python/ https://pypi.python.org/pypi/kafka-python/"
+SRC_URI="https://github.com/dpkp/kafka-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="snappy test"
+
+RDEPEND="snappy? ( dev-python/snappy[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test || die "tests failed"
+}
diff --git a/dev-python/kafka-python/kafka-python-1.2.0.ebuild b/dev-python/kafka-python/kafka-python-1.2.0.ebuild
new file mode 100644
index 000000000000..04cec8c5c343
--- /dev/null
+++ b/dev-python/kafka-python/kafka-python-1.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Kafka protocol support in Python"
+HOMEPAGE="https://github.com/dpkp/kafka-python/ https://pypi.python.org/pypi/kafka-python/"
+SRC_URI="https://github.com/dpkp/kafka-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="snappy test"
+
+RDEPEND="snappy? ( dev-python/snappy[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test || die "tests failed"
+}
diff --git a/dev-python/kafka-python/kafka-python-1.2.1.ebuild b/dev-python/kafka-python/kafka-python-1.2.1.ebuild
new file mode 100644
index 000000000000..04cec8c5c343
--- /dev/null
+++ b/dev-python/kafka-python/kafka-python-1.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Kafka protocol support in Python"
+HOMEPAGE="https://github.com/dpkp/kafka-python/ https://pypi.python.org/pypi/kafka-python/"
+SRC_URI="https://github.com/dpkp/kafka-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="snappy test"
+
+RDEPEND="snappy? ( dev-python/snappy[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test || die "tests failed"
+}
diff --git a/dev-python/kafka-python/kafka-python-1.3.3.ebuild b/dev-python/kafka-python/kafka-python-1.3.3.ebuild
new file mode 100644
index 000000000000..2a07e8db3922
--- /dev/null
+++ b/dev-python/kafka-python/kafka-python-1.3.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kafka protocol support in Python"
+HOMEPAGE="https://github.com/dpkp/kafka-python/ https://pypi.python.org/pypi/kafka-python/"
+SRC_URI="https://github.com/dpkp/kafka-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="snappy test"
+
+RDEPEND="snappy? ( dev-python/snappy[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	unit2 -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/kafka-python/metadata.xml b/dev-python/kafka-python/metadata.xml
new file mode 100644
index 000000000000..e2edf6176a94
--- /dev/null
+++ b/dev-python/kafka-python/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>wizardedit@gentoo.org</email>
+    <name>Austin English</name>
+  </maintainer>
+  <longdescription>
+      Python client for Apache Kafka
+  </longdescription>
+  <use>
+    <flag name="snappy">
+        Install snappy compression/decompression support
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">dpkp/kafka-python</remote-id>
+    <remote-id type="pypi">kafka-python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/kazoo/Manifest b/dev-python/kazoo/Manifest
new file mode 100644
index 000000000000..fc47057fd130
--- /dev/null
+++ b/dev-python/kazoo/Manifest
@@ -0,0 +1,5 @@
+DIST kazoo-2.2.1.tar.gz 108037 SHA256 525a9959b98a1203530bee01446b365a9f7f1caa69399af0151127178941eb82 SHA512 a2590441a9e3bfb3d14913051453e195d275b82bd6a4ce5e32d0a7bbc09b00e475ffac68fd06cb065aa439ea580b61bbeaa3ccfefa413723e46f4b1d3ce05707 WHIRLPOOL 6e43b27683382f4fb4054b85017e94e4fddd2d1416eea1566b87fc4cbc3edce37093e8c001211d324162d35f4c0f0da3632de1cf543eef2b171971a0f05b7357
+EBUILD kazoo-2.2.1.ebuild 1122 SHA256 a8eb026157dde9fe0ad86d84696319129c3b274017fe1e779ab2ae1f5e95c2b1 SHA512 96521ff62d6dcfea9b143ce292a133a49d407da32029eaf6ac152cbb9c6a7a6b90f61d61340296b204ed1e032ae61e2b5ff148fa50c29d2682fa63c0ca60e282 WHIRLPOOL 20fe33d4983dee79293df43af04db2dcfaa0de44ee82af578e28d1f2349ad35fd3c2368f3ce4f777a05838a2ed2657741dd97646ec917bd0d02e06c2c83d4d55
+MISC ChangeLog 3466 SHA256 c84533d6d80b525719bfea1a1506ffdd22df486e50e00ae2856b95c41843973e SHA512 38d679beff76e969a69893acc628fdbefcfa103a88f84ac98e90e47d6780de0f9d3f6bc9f658a4c4e081936ed11139634e42897acca54962b6e1f3ad11c1037a WHIRLPOOL 9acce96497d9074e27579d302a2cf84d867fb6b242fb5b5c378c8df261c5121553dbad4db4041f28451edcf7e5a8ee188ee466ebd53db0cbcd211b53f1a6a216
+MISC ChangeLog-2015 1275 SHA256 0286650dac18e17c191eb2542057c0a3891f1120ed64670fce0dbef2254286fc SHA512 01dfea962050793cc6fe12dc54661aeb962675e0b5bf74242909d5c25344c985f80841ea654881bb1670a627d6b010ab3374d7a3f110c10bc607da2e6a128698 WHIRLPOOL 6268d7f9ceea66d78585ba57423cbdda1a3601781285f060203bef2643a558ea059b89a00dfb97b6e6899d0aa1224b5262d37560186b8fe263fa2532b2f52285
+MISC metadata.xml 467 SHA256 944c378def6995b6223d1e16eabed35f2d3973d79f28b519409cb89c03dacedf SHA512 3028edb8107a980e1573f283e9f47a408b9c4ef9bea0ee452f25d908665220ea6cd43b70e2d85d339d553e60426f9d45a093eece38cd0a67f2f416db7580a6d6 WHIRLPOOL a211825e2990ba53b9dc009e0fa30d19e1d5cda5ef9449c038e91caf7213df989870bf8e936b0c84d561f4176f6743e05d373d1805b840b9a1e7b4b26bd6ce36
diff --git a/dev-python/kazoo/kazoo-2.2.1.ebuild b/dev-python/kazoo/kazoo-2.2.1.ebuild
new file mode 100644
index 000000000000..178fd95b55f0
--- /dev/null
+++ b/dev-python/kazoo/kazoo-2.2.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="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.python.org/pypi/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}.rst )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/kazoo/metadata.xml b/dev-python/kazoo/metadata.xml
new file mode 100644
index 000000000000..a186ebb8fe6e
--- /dev/null
+++ b/dev-python/kazoo/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <use>
+    <flag name="gevent">Enable support for the gevent based handler</flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">kazoo</remote-id>
+    <remote-id type="github">python-zk/kazoo</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/keepassx/Manifest b/dev-python/keepassx/Manifest
new file mode 100644
index 000000000000..9b3badf2851e
--- /dev/null
+++ b/dev-python/keepassx/Manifest
@@ -0,0 +1,5 @@
+DIST keepassx-0.1.0.tar.gz 37022 SHA256 deba28c48e2400860095447143f4db840e312b3fd8961043023b7303edf91e9f SHA512 635f98d2a95a1e5cc4a5c08f8d261cdf5be9e5656df28c070250aed2dbc058c85b9d7ad81e69de1d9b095b0aac5e3c6bf3a6a54b0b4de9b5664348ca42bdc755 WHIRLPOOL 0be496ef696fc198755ec6c0e3f76743896ba44e72c443bd04eff25efdca481590ec51acbb655d7897b6d581f7cb344c00922c1530d73d81387fc2bb0d34f9e8
+EBUILD keepassx-0.1.0-r1.ebuild 923 SHA256 a115b9445c2a2c5c042c4feb7af3a057875cdd6572f19c255b225828e53def76 SHA512 44db62d5426212a60185d5110656483547e56f208385277692e7f7da0cd5b091c9e0d8015dca3c0ddece8ec592306fcd6e5b84a34416089cdde69e312aeb0379 WHIRLPOOL e38cd47368c3612f8e93cbb9661baecf4cf2a64fc32511a3c226ebd137ebadeb3a1fdce129e2eb356843ac979df619bcdcc32bc28e493766173992856ff8a32b
+MISC ChangeLog 2755 SHA256 d724f656f99ead4be3c5b7c170f3d5c34ab3a94d2450e2132cf1d5c9f75c6e88 SHA512 24638e133862d503f70e2a428500dd4b72aa52b7dd04e135c60b36c00d151dde101cf3826b723c1acfe6419444e7e06f30574f4246b03912b017c0cd1319780e WHIRLPOOL e237ae64b28aaaa218469bff4758e1f2a21381a11bb5296a1e33d5f10d0c111cc481a9a0ab1b9b64bbe66121462880e087d24f3c6d4aad4456be1ad8ec4b5249
+MISC ChangeLog-2015 916 SHA256 9e3e87d7ffe8e34216d5b1558c3e17e4a62bc91c6b1dbba5166ee00b78ae79ea SHA512 9b90053ea56d99945ee94b5ec66dc907384cec87a00a63fefe58345496293bae64cf16893198de1eb47056adca5f428f660f7eeb991208afaff7c416ba3c876d WHIRLPOOL 10a8e23165092f23551f82203d8249c55a430e7f3b3167f0c4224acbc02fce6cd05f59b3ec96141cdc1b0d9bb6884bd3123279d0af2cc4fa64007b501a7f07bd
+MISC metadata.xml 386 SHA256 958bc6f85ed90ed2e9f0f2f1e5c8a985498b11fb805366fe21bf8d1ab0d5e7f0 SHA512 c9112d8355995023881edd537c958839c09e5079128350df3e3ea0d9a0bc7b856af9c89f6343f998e6d3905196ac1fc456b941168999d7608523c79785929cc3 WHIRLPOOL eba0539017f292db2f87a4c6c8e7a17881644724e65684ec520565fd76a2f442031c114aef864b646ba645a71613542388079fbfda53a53e83e7d39433541d96
diff --git a/dev-python/keepassx/keepassx-0.1.0-r1.ebuild b/dev-python/keepassx/keepassx-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..21e951ccb28e
--- /dev/null
+++ b/dev-python/keepassx/keepassx-0.1.0-r1.ebuild
@@ -0,0 +1,37 @@
+# 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
+
+DESCRIPTION="Python API and CLI for KeePassX"
+HOMEPAGE="https://github.com/jamesls/python-keepassx https://pypi.python.org/pypi/keepassx"
+SRC_URI="https://github.com/jamesls/python-keepassx/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+S=${WORKDIR}/python-${P}
+
+RDEPEND="
+	|| (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}] )
+"
+python_test() {
+	py.test tests || die
+}
diff --git a/dev-python/keepassx/metadata.xml b/dev-python/keepassx/metadata.xml
new file mode 100644
index 000000000000..e6603a475abd
--- /dev/null
+++ b/dev-python/keepassx/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">keepassx</remote-id>
+    <remote-id type="github">jamesls/python-keepassx</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/keyczar/Manifest b/dev-python/keyczar/Manifest
new file mode 100644
index 000000000000..6869e9d660ee
--- /dev/null
+++ b/dev-python/keyczar/Manifest
@@ -0,0 +1,5 @@
+DIST python-keyczar-0.715.tar.gz 242151 SHA256 f43f9f15b0b719de94cab2754dcf78ef63b40ee2a12cea296e7af788b28501bb SHA512 e0733ad488db2a2803227db6f140c5f316425782a780070e6fd4227d3b88d523e2c41743cd3a6e14e535c7dbdf7b50b428d15d26ca5cfb35e2841a5f71b709f3 WHIRLPOOL b93ec173970f4857e1991e0fe08e3e0ac9c8243dad2f5d63b362711f100da2861c878ea0b5ee44aae54594404d9e77d4d8420c9b54004d3019d6b00995535354
+EBUILD keyczar-0.715.ebuild 894 SHA256 3e7f04754a72e196b2d914ee05d6e7d053ebc557d5f60b59a1d527e16eebbf79 SHA512 d4a1068bf7c1ab17b83584e9f5e3a73768bcfa123b50f5905016b830ba6c926c0f1147949369915d8825764dbacf169192b3e4a7ba9e27ab1d7db40b4dd002f7 WHIRLPOOL a0c5f15cc1a2164f79f20af5bf1cfa9efeffe508ca7c611603673878a30594a700d435b3a53df0fb91cc973ac4d99ba9f81210c35114643ffd22b8fbf987d393
+MISC ChangeLog 2649 SHA256 147c650e205fb64fb7f2adabe8fd468fea9c26d8dcbea292af344c0b8978e150 SHA512 755ae243478ea1df128aba932e56b1a09b3c14493e2dcbfb939610d8f35aa6582ecb57dbc757a2ba0a7f400bd5047187a241516789e6de63075498d88bec34fb WHIRLPOOL aa29e6e4098008cbfbf062a6fcd731673a8f32b5be2829ac429a336500166375a041fa695c4a941723e7f9ad30cf5b9a5305718affb9c7daa87af7cb0061d370
+MISC ChangeLog-2015 766 SHA256 d4c494463f0d891541cf4804fa3ddaee2a20dd201f44e632b6ab4ec200f817f1 SHA512 6d4f13a007865269416c3074abf5bac77279693874dedec8ad4689fad6d35210dc54639f5a62990621d5701f7b994b407c7e44f772362685515c0be2fb796ceb WHIRLPOOL 4ff4089b9fe1d4165e1425d30a608f898c79561a39800b3ec743185b219cd9ab4f77ef62e3d6e2e8591cd24f26476d82dea3236540aaa13153f7c65e479f2351
+MISC metadata.xml 317 SHA256 8e67e868ff3cee24200d5c8d1fd5ac6ea6da0e14af664a70c2b54769d5770b4e SHA512 30948aa22ead2cc18fcfcfcb94027e183839d0e668d4df9636e5c0f7332417a61a968ab158bc7a9ca27e90518055651e6b14b2234374159a3c32888badf138c2 WHIRLPOOL a425ee7aed0420366cef9e19a6feee8de4d47745de32d1e6a4f8e5925979864db01955efc22c80df3fac879d4a7041c37414c2de4be80cefe40b4be2aab69e9f
diff --git a/dev-python/keyczar/keyczar-0.715.ebuild b/dev-python/keyczar/keyczar-0.715.ebuild
new file mode 100644
index 000000000000..b0646330be91
--- /dev/null
+++ b/dev-python/keyczar/keyczar-0.715.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )	#appears py2 friendly only
+
+inherit distutils-r1
+
+MY_PN=python-${PN}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Toolkit for safe and simple cryptography"
+HOMEPAGE="http://www.keyczar.org https://pypi.python.org/pypi/python-keyczar/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	>=dev-python/pycrypto-2.0[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	cd tests/keyczar_tests
+	${PYTHON} alltests.py || die "tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && dodoc doc/pycrypt*
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/keyczar/metadata.xml b/dev-python/keyczar/metadata.xml
new file mode 100644
index 000000000000..832d760fb83a
--- /dev/null
+++ b/dev-python/keyczar/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-keyczar</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
new file mode 100644
index 000000000000..4da4e84fafab
--- /dev/null
+++ b/dev-python/keyring/Manifest
@@ -0,0 +1,7 @@
+DIST keyring-10.3.3.tar.gz 39531 SHA256 86a7db0ed1026853d1235f4901efbcaafdba52357f2a0b0347ec1adbdc9b9026 SHA512 6087b9553d3a8df4abbcc0bacc18d769fda04c092781bd79817ceb5984a2548b5c3a4a2bda15a95040b9db59750a91d8eebbc2420d5f9dbd2fa3d6f10884e26a WHIRLPOOL ca25219e54280a75c08147baec88e795d23bca18f9ddc8b5e562dcd70635c61d4cab7e354eb04417cef6b2c9dfbd1c29ab3f5c4e53d4a0fb859e67415272ecfe
+DIST keyring-10.4.0.tar.gz 39632 SHA256 901a3f4ed0dfba473060281b58fd3b649ce70f59cb34a9cf6cb5551218283b26 SHA512 34b1503588fedd480b2031d5557349bc6cd70108e68205a38338e091d2865df512f9a9aa3525fb11fbbb9bc06b2cfa759685495ca94b4044ec034070aa3dc0bb WHIRLPOOL 87dda84b89dd6823b161898be8656cc0bd6ab2a549238193f24fcd27fd4b7fae73e77005fdb56b259c2eec3fb0b8f38e856b749ca313cf1b465cebb7804b6721
+EBUILD keyring-10.3.3.ebuild 761 SHA256 ddb60f53201f607df0926d50dbfb8a6e051720dff88c45e348409e1c47e914f0 SHA512 09240d0c2463587ec9656e61e2db74d7efcd2c79fa8bc9428e191e0220cc4edde49092fef638ec74abdf924daeb6c5420b8e28d15e4e34972f7feecc19c3fe9a WHIRLPOOL 2404c64ab1dcd5d55295bdaaa7d59ce267ac6fe39b4cb1195379f7ff604b57005e9db3b857dcc0b1882cc156c126e4ded1e00e5966d67314a7480e6bd70972d1
+EBUILD keyring-10.4.0.ebuild 880 SHA256 d64ebfe1b0be22dd2f65b8b348ca921f49605c1f3ac7714a9e52f2a59a5e4a17 SHA512 a6d152bc4446e1a4d37e152c2bb1011ce7225c2fd3609533b73abf33bed6f18a5a0f38dbecf765e91f40cdf47fe126e34bf6c4730b926cc3c3bc21978847a802 WHIRLPOOL 706e276f8e9acf2dde39337fafab2fc7b71123fbf68b733a1d735011b7769ec99daa1189927c2aa36294f810546a0311c4fef7c68e286b8feba99a297f84a54c
+MISC ChangeLog 6541 SHA256 2164587edfc3bd92ef721d5a4b2010d432f2f8e311f9224f5d9f365343bce0b4 SHA512 03107c0af2cf5ae7e82b1300e9618f49053dd1fd83bf6f487af26ebe170b081a991669e731a071eb9e9d2b89722f36233987d3866e912ee3882de6efe1e25c49 WHIRLPOOL 2d90400d7c74506d0463e7b33b09574a79984b98949b3281711ee8b2d9ceba96cedae4119433b79a4632da0e3843d5fac15c61a8dc57d07c8a5b5b1e39e3a40a
+MISC ChangeLog-2015 3476 SHA256 9e3e504467d5b4b3d18bb5cc12358b59087f7484d612d56ed0d82c069c58ebf8 SHA512 81e4fbb0ef294c4b9a4a812ef92f85fc7a7557219dabe2cc60bb025c54eb8a6c7cc3b4b0e68592590064a6282965180c2bdd45f98832e606bfc908bd95e610a7 WHIRLPOOL 63f15f3b64efc5facb2c7e27d2c0e270ba15ee67a14722758961624e0505616f873d4bb5e367b461861d4a7a34c841a90265c33fc09b86e995230a79c9832c4c
+MISC metadata.xml 672 SHA256 41442668784a3b88b529375ee741626a20f694a7b3cbb8072f2d08a0c793cde8 SHA512 19e907e069f6e6092791babdd8b914791d1c52c32187747edc127ce4c80ecad2da1edcdf6e6387c15f9c2b041767b9072668197087afc3644b7713837d5f2ac9 WHIRLPOOL 0a8f161f3c7afd8a6990a44deb9767a41f96df4a0bf70d237d36b330d5190480ba7927148e8bbd0c66144a82b84c703cea6578d2b313640ce6af0e15cfca243a
diff --git a/dev-python/keyring/keyring-10.3.3.ebuild b/dev-python/keyring/keyring-10.3.3.ebuild
new file mode 100644
index 000000000000..2ed6a9125603
--- /dev/null
+++ b/dev-python/keyring/keyring-10.3.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="https://github.com/jaraco/keyring"
+SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)"
+RDEPEND=""
+
+python_test() {
+	py.test -v -v || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/keyring/keyring-10.4.0.ebuild b/dev-python/keyring/keyring-10.4.0.ebuild
new file mode 100644
index 000000000000..50461563b99e
--- /dev/null
+++ b/dev-python/keyring/keyring-10.4.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="https://github.com/jaraco/keyring"
+SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~arm amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)"
+RDEPEND=""
+
+src_unpack() {
+	unpack $A
+	# This is an interactive test.
+	rm -f "${S}"/keyring/tests/backends/test_kwallet.py
+}
+
+python_test() {
+	py.test -v -v || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/keyring/metadata.xml b/dev-python/keyring/metadata.xml
new file mode 100644
index 000000000000..29d3c3220b71
--- /dev/null
+++ b/dev-python/keyring/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+		Provides a easy way to access the system keyring service from python.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">keyring</remote-id>
+		<remote-id type="bitbucket">kang/python-keyring-lib</remote-id>
+		<remote-id type="github">jaraco/keyring</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/keyrings_alt/Manifest b/dev-python/keyrings_alt/Manifest
new file mode 100644
index 000000000000..4c0a2a25172b
--- /dev/null
+++ b/dev-python/keyrings_alt/Manifest
@@ -0,0 +1,6 @@
+DIST keyrings.alt-2.2.tar.gz 26121 SHA256 f438bd6e9f1b413b8926b0568fc8aaf2f773fa5b75fed4fb49091c5b32ad85a6 SHA512 28d29c1f3f0a9612baa61d4506f0ac0782105a0c04ca2d9be63bd3106c82c2478487a42f2d5396d2f5e5d7205ae4f2d43221dba6ce6587e6e807d597984c833b WHIRLPOOL 0b21017adda12d7f5390b4be8e58936890fe44825b82c31e709e0926739d847e2160c1389b47632dfd48df2c501f7c219463372cc5b78875281f50c7d442a18d
+DIST keyrings.alt-2.3.tar.gz 26170 SHA256 5cb9b6cdb5ce5e8216533e342d3e1b418ddd210466834061966d7dc1a4736f2d SHA512 593194f0b3e64ebab9950b1ee674e43afecf6410110e7c683cdccaa121eaaff864ef07763363c0b0ac25b94e913d6ba2e1bb1ebb428ba14e81e3c29335b81807 WHIRLPOOL 1d9dad28ed5aaa5e71647a578f75659146397a8fb97840d1307976f6a585b414402b0f98dac8a9d6e5d969eedc6ea752cee75192a8ed670300245c2feb0cc939
+EBUILD keyrings_alt-2.2.ebuild 1239 SHA256 c5cafcd051f7ae43e3a0f0fc813a9f291adf0f0e4fb4c8c082ba4fb619d0a13c SHA512 c5a6a052fdf81e92cc2921184a7eec7e5f92f62fa08b4dfe2e41bb2360ed6c566e694b4941bd2f3069783d9b73a24a94a92db4e5c90232a224d7843974773ce0 WHIRLPOOL 5e24172e8c1440cc6405fd6c10d9cb76f518a017ad01b5fb56c9c6ffd9b171389370698d18a507402d2a2a4893979ce49fb6ccd2a7c0167f9dc59226f53969c5
+EBUILD keyrings_alt-2.3.ebuild 1240 SHA256 0dd53231718d4833dc9529260e0d1978e60660d25790a51915b1e04247242a0d SHA512 e1be55dc138605f1c6ce927f41830d2f42e6d397daeea9cf9d834b2b2808bc4a7ae6908f4d47ec2442ab4deb575453bfa85d237a8c90d130ec40085014136ace WHIRLPOOL 2dc153c5999e3a251c0813d50c80187ab89d25e3f5b4ea6e04c779180cb0ab465d4d1f958d00e486303592bdee93221c8e8d5ccfa6e45585830f4ba4d6c25f03
+MISC ChangeLog 1068 SHA256 c43bcfd4a1bcd1d88e199a9888b83de1b094734974d241ca75856425b254d0b7 SHA512 6134611fdaa2e033b357c719c0391fcb73f0819780a38c9397275e45e3aadcfb048737c2a31e2a6123e7745cb161333a8a3e3db5a37bfed8c8fbc91164b48d39 WHIRLPOOL ecd466561e025df530435702ce7b78395e3a5649267667f23b657f79c51313b7bcd8ea9c260e7416f963e11ed23a4a39b5cdc3f68f5c94b5abc21785e33500d3
+MISC metadata.xml 565 SHA256 40783b64d6a2f2fabf0001878f2aceec8d75e353aa17fcaeeb2bf76bcfcf6711 SHA512 e1513ec8f623dcdeb869e49e3bb1325bf8192075a0478d89101f9430645537768fc25d2adf579783b03f8c7848a4a7a67dd4bf006f662f31b92c934b24cfb531 WHIRLPOOL 2c714958f6a7190c746f5f728bc2db1f5096dfd3af8ab165526eb90d013c0e70c902bb2ccf6e3a218bc5d2fa9032d42446293382a406488e97f9505670ed5dde
diff --git a/dev-python/keyrings_alt/keyrings_alt-2.2.ebuild b/dev-python/keyrings_alt/keyrings_alt-2.2.ebuild
new file mode 100644
index 000000000000..d7f475cf58a7
--- /dev/null
+++ b/dev-python/keyrings_alt/keyrings_alt-2.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+
+inherit distutils-r1
+
+MY_PN="${PN/_/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Alternate keyring implementations"
+HOMEPAGE="https://github.com/jaraco/keyrings.alt http://pypi.python.org/pypi/keyrings.alt"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fs-0.5[${PYTHON_USEDEP}]
+		<dev-python/fs-2[${PYTHON_USEDEP}]
+		dev-python/gdata[$(python_gen_usedep 'python2*')]
+		dev-python/keyczar[$(python_gen_usedep 'python2*')]
+		dev-python/pycrypto[$(python_gen_usedep 'python*')]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+# Multiple failures
+RESTRICT=test
+
+python_prepare_all() {
+	sed \
+		-e "s:find_packages():find_packages(exclude=['tests']):g" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v -v || die
+}
diff --git a/dev-python/keyrings_alt/keyrings_alt-2.3.ebuild b/dev-python/keyrings_alt/keyrings_alt-2.3.ebuild
new file mode 100644
index 000000000000..e36f3a6ce535
--- /dev/null
+++ b/dev-python/keyrings_alt/keyrings_alt-2.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+
+inherit distutils-r1
+
+MY_PN="${PN/_/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Alternate keyring implementations"
+HOMEPAGE="https://github.com/jaraco/keyrings.alt https://pypi.python.org/pypi/keyrings.alt"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fs-0.5[${PYTHON_USEDEP}]
+		<dev-python/fs-2[${PYTHON_USEDEP}]
+		dev-python/gdata[$(python_gen_usedep 'python2*')]
+		dev-python/keyczar[$(python_gen_usedep 'python2*')]
+		dev-python/pycrypto[$(python_gen_usedep 'python*')]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+# Multiple failures
+RESTRICT=test
+
+python_prepare_all() {
+	sed \
+		-e "s:find_packages():find_packages(exclude=['tests']):g" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v -v || die
+}
diff --git a/dev-python/keyrings_alt/metadata.xml b/dev-python/keyrings_alt/metadata.xml
new file mode 100644
index 000000000000..26ffbe2b93a2
--- /dev/null
+++ b/dev-python/keyrings_alt/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">keyrings.alt</remote-id>
+    <doc>http://pythonhosted.org/keyrings.alt/</doc>
+    <maintainer status="unknown">
+      <email>jaraco@jaraco.com</email>
+      <name>Jason R. Coombs</name>
+    </maintainer>
+    <remote-id type="github">jaraco/keyrings.alt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
new file mode 100644
index 000000000000..0ae3a236574c
--- /dev/null
+++ b/dev-python/keystoneauth/Manifest
@@ -0,0 +1,14 @@
+DIST keystoneauth1-2.12.3.tar.gz 176768 SHA256 921e31ebe93e97f771a228296a40559ed1ab96797f589af0e9ac1189ee21364b SHA512 85c35f6c39135176a5a0393fe56d006f5929fbec6a08f8ba03ea39ce458a8d9dde6ffdbce724bcbedfb72e7a895c9ad003d46b23884692eefa773ca9a085446a WHIRLPOOL 7ff4b2f2aef099d0d0e3720e2553b5fc91dff6a80f3335583a07afcf7708dcdae0a7386ffd782932a04b739697677b6aced5b5cadf2f2ebc141c5dc0db0240d4
+DIST keystoneauth1-2.18.0.tar.gz 184966 SHA256 075a9ca7a8877c5885fa2487699015e45260c4e6be119683effe0ad2ab1255d2 SHA512 71c584de03f89c7e469368221847a8d32cc0ceed5afbc4eafcf886ccbbbad225587e073a7d7f36c8f3768f391e7a3b9d54454f587018b8dbf385dc676a5fee6b WHIRLPOOL 4c1ba1f93d50a55ee547621416a424c68cff1d537f4b133fb2bc4673267c2e5b1b2c242ee90746774fce41d3a1cb3b8630ea4c4a4d62e21dd76ae15b84c4a617
+DIST keystoneauth1-2.20.0.tar.gz 187746 SHA256 6bb45250f2e716302f9572f3f5440baf4b7339a93e0ea33c38ac501294da9b2e SHA512 43d949e46f743905e6987df9f923f222bf4b5622fd395c66da4dbed626d3ba80787a9e77340caf53018c7e277366851ffbfac0812c0f75f6c9c4755eebd852fb WHIRLPOOL a7c2f38a99e69d5885f8420f1a0c06249630487f9c833015366bc90ce6c372a0aac2c2bb8104610fa0a5e9fd21d4a60ecb1fd5851c77d1787845d2a7780680ea
+DIST keystoneauth1-2.4.1.tar.gz 150586 SHA256 61a2f4cf374b55f10a0d8250a532ccb93dff2ea81994ced15b2a34af055d4e78 SHA512 f9e8fcea7b23001b907d643d5bf67fc4779c8729cca213b3240ef988eda9de1212b15c2031f6fd8b431aafac85e773346eda71e0b414fe967728611b6817fb05 WHIRLPOOL 42644ede5c0db10ffe77ef106d78764dcb49d455dbc09e3660160b9d7a9eb3453118f6777469f9779e2fca34eb9e09cf3ef759f2f27cc38b8dca8520b9febd43
+DIST keystoneauth1-2.4.2.tar.gz 151213 SHA256 c8be35bdf5c773c385a0b9b773ec55c44c9c3ea7587179d15b2d4352ae2cbe57 SHA512 dd3b0907c554606489081b970ad248efe52aa6593cb8584ac1d4e3b05075b6a60b8c5f159c00f5668eb0938dbed655e7135ac9b7d3d6017f2f280f69b9080122 WHIRLPOOL b0b79a431b90aa78852a2a76c5f3a72081975c8f5b7e2174ded010c560f3ec205ae702722cd32cea33876f478009400e626b8a7ef750bdb15b9b7a93d7b71189
+DIST keystoneauth1-3.1.0.tar.gz 217744 SHA256 e5abfa8bbe866d52ca56afbe528d15214a60033cc1dc9804478cae7424f0f8fb SHA512 3214e08cf449a0eff35eff0400542cbb9e46051095d7955593fec89c4ba31062677f434c70c40037db213fa0e0db15c66d1058e0eca35b1d214967f7fa3fcf14 WHIRLPOOL ab7888dfb85ac6b5e2e0acf35943cad714caae156d19619588ef2fe9532d03c354ba0bd6cd9753654f394f268990eea1915847b1ab6b5a9b4aa9c930bc280e65
+EBUILD keystoneauth-2.12.3.ebuild 848 SHA256 72acfb08aedbafc2c85488bf9ce3ff750d0878d12fa1561e92eaddbe0c9fcf76 SHA512 99c8d8a2b72a0aaca243845cbf66662ba31c428160b2ce427262f0b1ddf6614f5ae54c53cf40b9a3b5e13bd8eee7deed53ac121bbc98fc437f6360ff4d650a98 WHIRLPOOL 196cd216ed33ef04a254c5a6c091dd5a7807a108e42027be926afba130c3c82dc5c3058f8858c56f5830149e23d09449253eea20674a8015045b3f9b8d135813
+EBUILD keystoneauth-2.18.0.ebuild 896 SHA256 0e92a113b252381c6c328dddf40c5f7ccac43b499a971e76ef0b414bb334538f SHA512 021403bec263dcb0bee342db779fe6130b7a06b8b54e068dd0fea474f52af6cbf149b531e9f7071a42231829ac1c25eb357555d04e72c0124a511ad49ce94640 WHIRLPOOL 15438f99a03dd9320173adb30cce81204bc344d620a8f9aa905903536a16faa10ab7f7038fb54d45c12d3a802828bb510f3c3f3251350a180d78fa5d5f805406
+EBUILD keystoneauth-2.20.0.ebuild 916 SHA256 c241efe1ffd167fd18e5f7fb92cbfeba08987eab574b794f69d50dd6f7eca67a SHA512 23f901af40eebf9d0278581a0a53922b5228de94ec41e15e22dfb2cd73456799f7f0a34dda8a58f15847be033dcbc4c51dcbad0d34240fc484903c11b8415e7c WHIRLPOOL 1e442ae58ac6076c75ca6cf87eb43ee436f3fd961be13467561b0cc12e1ce49689c319c2fdb03ec0818345423c608bb10cbad36185e70e1dc3098a7d170bf443
+EBUILD keystoneauth-2.4.1.ebuild 896 SHA256 39455e96a7fcf108ac4b4ca4a6bc0f148d856bc0541a25f73cc9f801d370283d SHA512 bca2f973d67e58f558e8e8f338e001e735f58fdb0bb88ae3d0e9d93fbbd25a3f59a38704b17224a4102939ab3f463443159089299fe3cac87ccc4fb694f72025 WHIRLPOOL 88bed2e1746bcb240438360e9654dd21e51374bc46a56067ada831c9444537ff763cc379a6d7480c7f050343012c4c3ecc5474624647b6159012b19943add059
+EBUILD keystoneauth-2.4.2.ebuild 896 SHA256 39455e96a7fcf108ac4b4ca4a6bc0f148d856bc0541a25f73cc9f801d370283d SHA512 bca2f973d67e58f558e8e8f338e001e735f58fdb0bb88ae3d0e9d93fbbd25a3f59a38704b17224a4102939ab3f463443159089299fe3cac87ccc4fb694f72025 WHIRLPOOL 88bed2e1746bcb240438360e9654dd21e51374bc46a56067ada831c9444537ff763cc379a6d7480c7f050343012c4c3ecc5474624647b6159012b19943add059
+EBUILD keystoneauth-3.1.0.ebuild 888 SHA256 46fe64dfa3b05d2ab4c172e9a0c502efe4ee859fc665aae3642b6f7cd0f2147f SHA512 dadadd0754f365119b68199e92e6d7d63a2ab169f69d49c237321e8d2503df4359f46cd1d11f734a187b3142729de49c857458ab0d439a9a967306057f6e23a4 WHIRLPOOL 93d9c7d167b5df3bd46c7ceffbdcdb34b9a5f94b53162c265f7328c46162489263617b03da269105aed9ed90e4de39521413fcfe4faf4e73ccf3a1ebcf533851
+MISC ChangeLog 2245 SHA256 5fbba7abdbad1aae00debf61a73ec62fbd5348d5fed7ecca649165db5f30c9b2 SHA512 4527fad75423ba416454bee741b772ce12bd633ae0a757359b7c3aa8240f557d98e2407add2eea5e05ad0f019af284527f1ecca2f126acb917c6b7a4ed0e9845 WHIRLPOOL 4e64183e6c6182cf48c5d739b69fbd29d46f87a197b7021c11bc236c1cade5b8f92217461263b43fd141935f55b71c704c65c6352743c5574336823259a01cb6
+MISC metadata.xml 519 SHA256 2e0e2db13579d81797089f78d24da5f7b93e36685edd570e8711e79d2228d390 SHA512 8a00d549ee4cf755cb819cab370b9e66cea6d3396d7c15c3b644731991ad292b0a2c862b2be42e045584e1a429ff5b8950bfe55d58a904cbefaeda8d117ac117 WHIRLPOOL e22462d98e34aa55c80308e2c5f041189c2a12c0009bb33530ccc92ef41c47069e44d4d2e3277c8c4053748b08595d78d9e46c0a0bf6fd3849a3aab4c0a99ff2
diff --git a/dev-python/keystoneauth/keystoneauth-2.12.3.ebuild b/dev-python/keystoneauth/keystoneauth-2.12.3.ebuild
new file mode 100644
index 000000000000..1a36a64ad01e
--- /dev/null
+++ b/dev-python/keystoneauth/keystoneauth-2.12.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
+HOMEPAGE="https://github.com/openstack/keystoneauth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
+S="${WORKDIR}/${PN}1-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/positional-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystoneauth/keystoneauth-2.18.0.ebuild b/dev-python/keystoneauth/keystoneauth-2.18.0.ebuild
new file mode 100644
index 000000000000..261777960416
--- /dev/null
+++ b/dev-python/keystoneauth/keystoneauth-2.18.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
+HOMEPAGE="https://github.com/openstack/keystoneauth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
+S="${WORKDIR}/${PN}1-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/positional-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystoneauth/keystoneauth-2.20.0.ebuild b/dev-python/keystoneauth/keystoneauth-2.20.0.ebuild
new file mode 100644
index 000000000000..472260f11c93
--- /dev/null
+++ b/dev-python/keystoneauth/keystoneauth-2.20.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Authenticating to an OpenStack-based cloud"
+HOMEPAGE="https://github.com/openstack/keystoneauth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="${CDEPEND}
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/positional-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.13.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${PN}1-${PV}"
diff --git a/dev-python/keystoneauth/keystoneauth-2.4.1.ebuild b/dev-python/keystoneauth/keystoneauth-2.4.1.ebuild
new file mode 100644
index 000000000000..2bdf823431d9
--- /dev/null
+++ b/dev-python/keystoneauth/keystoneauth-2.4.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
+HOMEPAGE="https://github.com/openstack/keystoneauth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
+S="${WORKDIR}/${PN}1-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/positional-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystoneauth/keystoneauth-2.4.2.ebuild b/dev-python/keystoneauth/keystoneauth-2.4.2.ebuild
new file mode 100644
index 000000000000..2bdf823431d9
--- /dev/null
+++ b/dev-python/keystoneauth/keystoneauth-2.4.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
+HOMEPAGE="https://github.com/openstack/keystoneauth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
+S="${WORKDIR}/${PN}1-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/positional-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystoneauth/keystoneauth-3.1.0.ebuild b/dev-python/keystoneauth/keystoneauth-3.1.0.ebuild
new file mode 100644
index 000000000000..17af2b3e67bf
--- /dev/null
+++ b/dev-python/keystoneauth/keystoneauth-3.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
+HOMEPAGE="https://github.com/openstack/keystoneauth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
+S="${WORKDIR}/${PN}1-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/positional-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystoneauth/metadata.xml b/dev-python/keystoneauth/metadata.xml
new file mode 100644
index 000000000000..89e7da464756
--- /dev/null
+++ b/dev-python/keystoneauth/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		This package contains tools for authenticating to an OpenStack-based cloud.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">openstack/keystoneauth</remote-id>
+		<remote-id type="pypi">keystoneauth1</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/keystonemiddleware/Manifest b/dev-python/keystonemiddleware/Manifest
new file mode 100644
index 000000000000..3a188019ef7b
--- /dev/null
+++ b/dev-python/keystonemiddleware/Manifest
@@ -0,0 +1,11 @@
+DIST keystonemiddleware-4.14.0.tar.gz 203369 SHA256 83bc4ec27983a496e3aad73440759aee47b258cc2a365cdd9c11082b7c1b3cfc SHA512 c221c59a865fb8d958ddf2f6b112465f6a66d499f7598becf7bf1dde6ad00675dc118ee353502452c640cfb5fa8d1029125ea912f69c1da3bc6f894387fed8af WHIRLPOOL 4397e940550155ce1a92c44e9bd6ee0bd0741323e02f746845c12cb5653d19c727c03058455a495c672fdff65244f7f7fbba0ff5771a44223a2c138b81e69134
+DIST keystonemiddleware-4.17.0.tar.gz 204603 SHA256 410efad8b5d639ff5ba08c32164116be1797d4caddafd49a9ec4adbf164971e8 SHA512 ead2eb829a2189efddb6cf0052d86d32eaca0ae7474cf0444640c0c976df66bc1cf61971891639b798ffb6745fb510fe6499e42e94cc60f2c2084ad7f06c7ab7 WHIRLPOOL 3425507e50176bb9fec62b12a744a4b4f9834d1bc5848c3bb7d65070c6023f406d6521ded2a2b4e35034d9acdf72f5ad6de9cedf96bd270e31d92d3359de990a
+DIST keystonemiddleware-4.4.1.tar.gz 194711 SHA256 dff35f0e4acb77f34c9c880bd4f456bbe26a1c4701815d82e8c27ff74a5dfb52 SHA512 c04383836740222d49324cb5f25f8b156424abaa74ac9482a2deb2e1d54cc6d990a864451a075bc12c3d7d38da7235f236e8a8cfb4c3748953c14a4505eeb99f WHIRLPOOL 76a96e6140752cd8eb1d060591c5dec1181abf873c82595be89d9597e3c3e5d3344739fab6b8d0058ae2ab47863e5169d4bbcb4a83f46a24dea042c0ccfac8d0
+DIST keystonemiddleware-4.9.1.tar.gz 196430 SHA256 93fa012c70b2ac5773ecf7185ef94a224ca70a32728ad7d07cf12540f507043b SHA512 baff23d86e8157a465646a23fba873739fe019319873d7385ba5ef843c4546d14919913648075122e56a3805f03b91b2a1b03c3206bcbd05a3540a58925a1d01 WHIRLPOOL 6103d6621bce0020672ef7a04d5191be9eb876ae0fc279e83402655136f8e132fa4aaaffcab06f789dbd73a3f9246ef567d6c5dc77b7c3b14e6760a3cf857f2f
+EBUILD keystonemiddleware-4.14.0.ebuild 2720 SHA256 0667ab30600c1c7260957808479d79c255df4ba45955cd9df22188f4bcb3bbb0 SHA512 970a1d4b94fbac85a5b62074849f2e85591ca8c82613bce9cf21144fde09bc4649e42879e48c20ac255dd99ab7327cdda155a6f3c1b1e2b252a52527f01ead5a WHIRLPOOL 52bfcfad748ad598d68720a1f894b0a1076c203fde13f0be8795f877e633902ce04b249fdcd2e42d9a2ab63f988fc8694fd5fcebc1fa31e88263b433a8990562
+EBUILD keystonemiddleware-4.17.0.ebuild 2863 SHA256 23f28db4bd21224e673c3ecc95edc0422e80129fbbab0cddc1dcba85d31544d5 SHA512 d0188b3155628486cf3d1dffd34f5a767e678b63ba4b936c3c5dc538b48ecdfef124c1529c1ef453139bd4c1a157510e427d1df23a90e15468006faa9fd52001 WHIRLPOOL 8466358664ae087f756f117af0bfe192a91f140ef63b177546ae712d5f09a8a841c0cc5a5bd113f1ecb8f707b7e3f8d8976233b5ce10d2b3e12e591118bb2d0c
+EBUILD keystonemiddleware-4.4.1.ebuild 2947 SHA256 1a1099abaefe45b33049e98f771fd157c20b36d8bd40687113aac92c08c1cc50 SHA512 7db72db355dfac4af795b2b71924a6bd8a282ff3e24636177f49c2db3569b958600507083265783515d4ab42afe4f22dfd8bd2416b52c14fbfafdc1b1bc6da95 WHIRLPOOL f8cd6a72e4b5cd94307ed9ad92592b6ca3a08d91c47cb212b45604b0b7c6b7b077ed94d14b945213a4c1a25c9a89d285681b132a798b660192d45a0d4135b5eb
+EBUILD keystonemiddleware-4.9.1.ebuild 2633 SHA256 3615bc7cf3f906baaf5c5778253011807a57959a20daa437a0a8d06cc560f6de SHA512 4e581d44f4d162ad8a56063a7f00506a321ea2d4f2a5e4c9e19e90129e6fc8dc72ecad1bd26d8b4d4c48bbb96ffcb79549634552caa4d7168a6d82c4f0650eec WHIRLPOOL 99f8fd727b37dd4a05ea6650af88bb1f70f179ab6c0c46f57b005a04dcf2b99843fb6f78d951092ed5577240a389d4b258e6dc7eee20cee18a9ae2582af0cd5d
+MISC ChangeLog 8726 SHA256 0bf83132d04ef173604f7fe8bb27d0031a4593253d6ef8368ffd22da6922eb28 SHA512 f0c158907015ebf7ef2401bdd8715d4202dc58456b45f5e762307fa46dfab1965d4edb1ae48c3bb0352375c2aea01cc1902b1974b48fb3d8f7317e5cd853e42d WHIRLPOOL 63193b8697a71d944411d1c2b9563771f4e0abc16bea0ab109ea197d8fe7081a7cb8fc3f9e890ecac8500d8b729ecb31e4f0da14a8414f1745cade5a4b1625ff
+MISC ChangeLog-2015 1361 SHA256 44a6b6328925989e37f72899a6d1c92979456403664f1d35108e75011d781c2f SHA512 83c7e134af7bfe198fb53f98949fe444cb0d29faa88d629638cd05d949c0d9aa45b8f7201de9a29219c5ea6a57d9d8f22ffa72c743f3eb7e9b4db070eff63c41 WHIRLPOOL 629f47fe230bc404cfa45c8572a2d0a733c5c9a8e06d6a30a8906c4d46e576f68450b7c41fe73bbd98e4b60e82b8433da80e3c3253b1da09f87ae2f95d81ed20
+MISC metadata.xml 624 SHA256 1d36d099f58705016533a2ff9d6be89d760ddf3f755ab24500c3aa1c92068b3c SHA512 5ca1f6ea10053be2f9f74c797cd1143f6b3ab267d0decb66f3609973c20637b55769bcb305ab70693d99d3ab09da6aa6ac7d2acc66431a4a52f6dc9aef79aa6c WHIRLPOOL 7013809f104a82c79edb97a115d86b8b07ec876196b733115081f388930355f32459f30af894ab46396a2f30e272e345ab6a38ee1b89bd2b0c31ea4a4aa6bb36
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-4.14.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.14.0.ebuild
new file mode 100644
index 000000000000..8d99ab92d5af
--- /dev/null
+++ b/dev-python/keystonemiddleware/keystonemiddleware-4.14.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A middleware for the OpenStack Keystone API"
+HOMEPAGE="https://github.com/openstack/keystonemiddleware"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/keystoneauth-2.17.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/positional-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
+	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-4.17.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.17.0.ebuild
new file mode 100644
index 000000000000..8937d82214f4
--- /dev/null
+++ b/dev-python/keystonemiddleware/keystonemiddleware-4.17.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A middleware for the OpenStack Keystone API"
+HOMEPAGE="https://github.com/openstack/keystonemiddleware"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
+		>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/keystoneauth-2.21.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/positional-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
+	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-4.4.1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.4.1.ebuild
new file mode 100644
index 000000000000..3fe65cc40548
--- /dev/null
+++ b/dev-python/keystonemiddleware/keystonemiddleware-4.4.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A middleware for the OpenStack Keystone API"
+HOMEPAGE="https://github.com/openstack/keystonemiddleware"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		<dev-python/fixtures-2.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-messaging-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
+		>=dev-python/bandit-0.17.3[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/keystoneauth-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/positional-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
+	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	<dev-python/python-keystoneclient-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	use examples && local EXAMPLES=( examples/.)
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-4.9.1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.9.1.ebuild
new file mode 100644
index 000000000000..c83c413ca605
--- /dev/null
+++ b/dev-python/keystonemiddleware/keystonemiddleware-4.9.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A middleware for the OpenStack Keystone API"
+HOMEPAGE="https://github.com/openstack/keystonemiddleware"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/positional-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
+	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/keystonemiddleware/metadata.xml b/dev-python/keystonemiddleware/metadata.xml
new file mode 100644
index 000000000000..baeeac9fc4ba
--- /dev/null
+++ b/dev-python/keystonemiddleware/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+    OpenStack Identity (Keystone) Middleware
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">keystonemiddleware</remote-id>
+    <remote-id type="github">openstack/keystonemiddleware</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/kid/Manifest b/dev-python/kid/Manifest
new file mode 100644
index 000000000000..dbbd1fe9a408
--- /dev/null
+++ b/dev-python/kid/Manifest
@@ -0,0 +1,5 @@
+DIST kid-0.9.6.tar.gz 268602 SHA256 d4c84b3de0a0584b33db489e5dde82f9c2c8832f40dad0413bce309e16813ab9 SHA512 56f87f5fdb9d692ced4b19c13705ee872058279084f49efd2e2515c28240e36833c7dfbecf084f504d6fef45f2cc60185decf0c9f18517d255ba469486aa3ae8 WHIRLPOOL 3dd2203c0b9c1e9a065729a2d8fe73cb5525ec99fcae73f3541cba7c1182355241057d9996eaab4b2d3fa91566c644db7a43cba61b3ed1c9ce15acf5ca97b4a5
+EBUILD kid-0.9.6-r1.ebuild 900 SHA256 be6e4550d313eeb45bd057512f4f7f183e6c2c7d4840afad61123e9c28bb0bb6 SHA512 cbba56589194fa4a92f2d580e5dc13fe2860e55f1fba96efb0d3ee4da492078e0046daec267436c6af2ec0b4c76461416244b7a125b7bb0fc6d588bb2436b2e2 WHIRLPOOL d726cb5d1eb08a46372bcde0dfbdaf188f85a3b8ea1834b3e6f6c5ef8f0303a33a8e73e2cebb16a14f7ec7ae2fa6bfff3c70ae8f9fccea278933ad876981c3c5
+MISC ChangeLog 2565 SHA256 ab73857441b9634dc50d9bb39a3040e071b9ea5995e2fa3e99a9512d8b6479f2 SHA512 ad70bb347319f06bf980828cc21554568cabd5919d81ccd1eff76853969a54b48ee5baaf844d60c913b6f6f41162e06c0a6e39e81aba740a0a870a8fe621bc7c WHIRLPOOL e7cdd37d96a21558db99c64f7cdaa339f8ef207de146f534a1707bf55600b6a6b199df8f2df87c9dbd9ec7d73729a4a9e807ea67a11e089a51ffddbeddc32695
+MISC ChangeLog-2015 3426 SHA256 222e4afc1a8172d0aa8b7e5859087ffd002856ae4d9d53289f34c5fa5433f65a SHA512 132aed9cc1974a3389a9766a297467846ef0c163c5393625f2cd9465949581eb53a4e344eb50c29f05279a342d81ef3ee4fa4dc2f4e1846588d820974a65b7d6 WHIRLPOOL 4afac1563367fddd65cb6c060d153c3abfb85f161924673f16bdf8b6d5aa0e70c48a04eb4f79542cb1d9808a13628b8932e807883703fe9effa2357f8845eb8a
+MISC metadata.xml 448 SHA256 75a6f0d2dd213caa44241326c3861299627f03c816dcaef5386017370f17b018 SHA512 910e2d680b8507c745125ee1127a0632bc570b9055b074d7e96665faec48f66a9f82769e7ff9dcf62f092aeb843a3f3700d8a36413f2de4419dd92538d0aaaf2 WHIRLPOOL 5157d6161549743e3a77ad8d9001eff7781bd555a9d23874358af0ab8c58de460083303ac271e690c8e2a2804030b7ab1085914f9c511c533ed3850b0cba843f
diff --git a/dev-python/kid/kid-0.9.6-r1.ebuild b/dev-python/kid/kid-0.9.6-r1.ebuild
new file mode 100644
index 000000000000..444e86b9ea4d
--- /dev/null
+++ b/dev-python/kid/kid-0.9.6-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple and Pythonic XML template language"
+HOMEPAGE="http://www.kid-templating.org/ https://pypi.python.org/pypi/kid"
+SRC_URI="http://www.kid-templating.org/dist/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ia64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
+
+DOCS=( README doc/{guide.txt,index.txt,notes.txt} )
+
+python_compile_all() {
+	use doc && emake -C doc
+}
+
+python_test() {
+	py.test -xl || die
+}
+
+python_install_all() {
+#	dobin bin/*
+
+	use doc && local HTML_DOCS=( doc/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/kid/metadata.xml b/dev-python/kid/metadata.xml
new file mode 100644
index 000000000000..ab97a505e009
--- /dev/null
+++ b/dev-python/kid/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<longdescription>
+Kid is a simple template language for XML based vocabularies written
+in Python. The syntax was inspired by a number of existing template
+languages, namely XSLT, TAL, and PHP.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-python/kitchen/Manifest b/dev-python/kitchen/Manifest
new file mode 100644
index 000000000000..1beea72fbcea
--- /dev/null
+++ b/dev-python/kitchen/Manifest
@@ -0,0 +1,4 @@
+DIST kitchen-1.2.4.tar.gz 187149 SHA256 38f73d844532dba7b8cce170e6eb032fc07d0d04a07670e1af754bd4c91dfb3d SHA512 790f7eaa16820d3b12f740d2ac7c9d849d40eea91527b7fc011270bd46af5038e987cc1b170c75c2175dc627f99a52bde52b9f276db8dac5d9d7df59ef9a505d WHIRLPOOL d9864ac07bb391df82049ffcd98f82a2013f6f28056ab19a7d17c59c8c345b64a0090eeac197313930391547f12412a68d1c794690798b4c434a840c5fb685a0
+EBUILD kitchen-1.2.4.ebuild 415 SHA256 fbaa902a7c9873d96ede42208e140012aabb5dc7376a08f5f8f09c03019a32e2 SHA512 dc425a044c4097312a3988f39b0822aabae8ea0bbd65fb28414838617aacdc281853e9de1896be96134accff8b8d0a3140b4419991a550d552884961cf287953 WHIRLPOOL fd51e3090f6113b614b6c7ab8d1fc2dd50bdbac09b7c5877425eca3e65eb08c41be6bedb1e520b907efb3b8b4adf0557d674789569207b12be97bd6839d73ad7
+MISC ChangeLog 342 SHA256 4e597341696a25774d92d39aa330569fc7079b06a0a55e00b974c69dd90de49a SHA512 250e67a61e153485fbedfba3ddabcec8bd149e92cfae0116e87f1447a1ec218295b22d8224aa695caa901302d90e1ecca1c980f619f3175f1f07b13b8b977d3b WHIRLPOOL 5f2d2ba2bb14853dea23d1058c5b0237fa895c24534996b3e75694534f7737c0c396a655320529eaabdcfbba93a6a133a997f6e0b691883d34ec7ee2feb45d26
+MISC metadata.xml 394 SHA256 76266ec80cafff0da549e2ebd9e819937624369ce5797af11d9354a7ee204e7f SHA512 3ed7d0541ef7bfe4a14a04c54ce9ccabc08d47c29e2cf821848f53e3d3efefdb577e8dca99e6fd063d222864312bc8f1cae627037ad6abefd5c195276872429e WHIRLPOOL cba59fb5382e9ee6adf978a8814666238731e8c72fcb240e9bb1bc93cae6db9dbf7ac112648b785d1fa7f7ef779b79da47073e274c3e85658a3d168e33e41f4b
diff --git a/dev-python/kitchen/kitchen-1.2.4.ebuild b/dev-python/kitchen/kitchen-1.2.4.ebuild
new file mode 100644
index 000000000000..6d8e86f8775f
--- /dev/null
+++ b/dev-python/kitchen/kitchen-1.2.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+inherit distutils-r1
+
+DESCRIPTION="A cornucopia of useful code"
+HOMEPAGE="https://fedorahosted.org/kitchen/ https://pypi.python.org/pypi/kitchen"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/kitchen/metadata.xml b/dev-python/kitchen/metadata.xml
new file mode 100644
index 000000000000..5eb9f5c3f7f3
--- /dev/null
+++ b/dev-python/kitchen/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>kentnl@gentoo.org</email>
+		<name>Kent Fredric</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">kitchen</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/kivy-garden/Manifest b/dev-python/kivy-garden/Manifest
new file mode 100644
index 000000000000..5f163906e8c3
--- /dev/null
+++ b/dev-python/kivy-garden/Manifest
@@ -0,0 +1,9 @@
+AUX remove_bat-0.1.4.patch 343 SHA256 0d7f3d668adccb596b91933b1825d857abb2c3bb2dc2d416061f2e70595597c1 SHA512 25d921c2790742537f64404c35c24cc8bcc0ceb0183907b165976ebfa45636f21b3d137e18c6b211d653c6fb7be395d681d0d1d5ac70c0e09f7276b47e36e328 WHIRLPOOL fc08ce2f109efb2da2d0295adcf6daa5622d22f9af8cab4a673381bbf0bf0b34d1e9fd4dfa9555ef382c7df46841abada58a96f3472db5c394c689b30a60497f
+AUX remove_bat.patch 338 SHA256 07794cd1310012fb3a976fa2d4f66952cb7c13e849e02ced4372114f9cc6e194 SHA512 53cc44b84467a74323b5bf2bd7f6e7f3e08dc0f6eaa3bfba740ced968e66e40ff422ad6ff3fc40f1a09564eb244486b3b960f8a1e8dba7aeed1122bbd05bee47 WHIRLPOOL 6d101fd9f42c5819374f3e244e49c5d6ed2415dd95f95b418da5421efd2ba0db956bc196c59e992d6b9166492e38be75f57a99326268cea5a718b8c4d26ede34
+DIST kivy-garden-0.1.1.tar.gz 5789 SHA256 bea618e978f962bc0a2bfc3890fafe6c1bc2fa7aaf8a1cd3c8c70a682f33d79f SHA512 d551e8fdb08c7c1810972df04b024fb59554a94b9d6dc98a1438620541c13152e8c7de4cc603efed4df00e3d681d8545939ab417266459e26e116ff6660d8013 WHIRLPOOL 79a5db5b0e854ae2d2cf4bbb2c9d4733bf1a4c772a38e7c4e65cfc050bfb4494712b04095e89e026bd282851f562c4df6f5c1ec25e6a5b5e30f53f5a1c503fcc
+DIST kivy-garden-0.1.4.tar.gz 6849 SHA256 c256f42788421273a08fbb0a228f0fb0e80dd86b629fb8c0920507f645be6c72 SHA512 69b8fa2e2e80cc215eaad0eca78e1e207726ef2f611ba328863191580c19e77de970347b206c82927d92fbc821811956f8c45ac3613dafb2db706a491c50585f WHIRLPOOL eca92d06ac0f482d70f8abe9452e28f1b84648d9911a8241047711cb6389a91da55fc9fda805ebad7318a009bb674106f92097813aae5742617d34ec810bc334
+EBUILD kivy-garden-0.1.1.ebuild 557 SHA256 e360eb66d8aa2fd5908c603e6495d78514b689cef88d0a0d1b4d76fd671263ac SHA512 57d560587bb1e33df1813e2d4f2f69d4452d3bee7416aecc870ae4809119e49d6212dc1733b3383e8147fd1af230f6bb4187ec9ddee445a4499f85638528fbea WHIRLPOOL 7a2794c34341da99957ead5a952b58e7920d95756632bcececfac93be4a7a48e276897a4c809d503954876fa4bf6e4576889b9ad8e0ab1d00192839922cb1c06
+EBUILD kivy-garden-0.1.4.ebuild 760 SHA256 56a2740ff57d1092784de8c0a7b751bcd2ab64dd3e70f46a41970bce21006210 SHA512 3cb4f6f7a81ea60abbe4246ff875d8ef38b7d70be35677b9042e71a1ca9027b35e6d359d50e230c4a96a19073ff150163d65c073e12743d01d0324ba7dc48a91 WHIRLPOOL a0d43f136dd526848633d0ded07008a4dc8278cbbc093b7f1efe76ddaec0aa767234cb7cbe6551fdcd468ec449ea003b65021778a092f357e1a6478e0e140155
+MISC ChangeLog 2976 SHA256 672fb0bdb40b088945a3e30277b6d94604afda2fd81b3dd789134f0415e810d6 SHA512 866c1509aec68110324e7894fece4d52cca6e621941b34c58760735820469645a657793fc8d10afd42f96c28a7ff424ef2536b5ac60e1a43fad66daf674be9c3 WHIRLPOOL d573f132726bc0e7b907922afdf4e77b24528656a494738f9b28574e83da381f73a2d1f7b59e1959891dd703d57fc85404364ec1adb5f6451c4425000e91b367
+MISC ChangeLog-2015 697 SHA256 c06bfb18e5ea60ebab263cece19a2338c0d369eecd8d0ff268b026e657529c6d SHA512 f05a31b1cb739f414e4116a93c04ddc4805fac270baaff08e55d23f02c8b78274013c405f3ec0efead92796e12af13b3c32fd7584c7bdc24a0f4b075ba515de8 WHIRLPOOL 7ca219181ed48721d62d3f034f9ad1c693862b921f1ad8abfcb6f796ba1c9185ddca266d00ad30e2419975b4ba141eddb748c50f71f9eb5181010c50dc965ec8
+MISC metadata.xml 532 SHA256 6d13db04c32033777681e3e08aa6a73f30b5f878f2506362c422ae67cf41f179 SHA512 91e074fe17ff264c7d74694902dbc6711373d275ffa90d7d470faa145699224a4d1d4444bce5aac423f7401c05aa27c51fc3ebf95966401a8c0c852c439ecc1b WHIRLPOOL 4c547414d46e14e2645fba6b15ba2197ecc060dc1739d1d0bf60e9d69e1c7c96fd53d503dd6603c4257123412fd833a4d82a46663c32a82f7609f0163fc7eae6
diff --git a/dev-python/kivy-garden/files/remove_bat-0.1.4.patch b/dev-python/kivy-garden/files/remove_bat-0.1.4.patch
new file mode 100644
index 000000000000..5c116608aa79
--- /dev/null
+++ b/dev-python/kivy-garden/files/remove_bat-0.1.4.patch
@@ -0,0 +1,10 @@
+--- a/setup.py.orig	2014-04-02 08:48:05.906881843 +0200
++++ b/setup.py	2014-04-02 08:48:16.650214908 +0200
+@@ -8,6 +8,6 @@
+         version='0.1.1',
+         license='MIT',
+         packages=['garden'],
+-        scripts=['bin/garden', 'bin/garden.bat'],
++        scripts=['bin/kivy-garden'],
+         install_requires=['requests'],
+         )
diff --git a/dev-python/kivy-garden/files/remove_bat.patch b/dev-python/kivy-garden/files/remove_bat.patch
new file mode 100644
index 000000000000..f178f2b1314f
--- /dev/null
+++ b/dev-python/kivy-garden/files/remove_bat.patch
@@ -0,0 +1,10 @@
+--- a/setup.py.orig	2014-04-02 08:48:05.906881843 +0200
++++ b/setup.py	2014-04-02 08:48:16.650214908 +0200
+@@ -8,6 +8,6 @@
+         version='0.1.1',
+         license='MIT',
+         packages=['garden'],
+-        scripts=['bin/garden', 'bin/garden.bat'],
++        scripts=['bin/garden'],
+         install_requires=['requests'],
+         )
diff --git a/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild b/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild
new file mode 100644
index 000000000000..9c17ebfdd6d1
--- /dev/null
+++ b/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kivys Garden tool to manage flowers"
+HOMEPAGE="http://kivy-garden.github.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/garden-${PV}"
+
+PATCHES=( "${FILESDIR}/remove_bat.patch" )
diff --git a/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild b/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild
new file mode 100644
index 000000000000..ac977907183c
--- /dev/null
+++ b/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kivys Garden tool to manage flowers"
+HOMEPAGE="http://kivy-garden.github.io/"
+SRC_URI="https://pypi.io/packages/source/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/garden-${PV}"
+
+PATCHES=( "${FILESDIR}/remove_bat-${PV}.patch" )
+
+src_prepare() {
+	distutils-r1_src_prepare
+	mv "${S}/bin/garden" "${S}/bin/kivy-garden" || die
+}
+
+pkg_postinst() {
+	einfo "Kivy's garden tool is installed as kivy-garden"
+}
diff --git a/dev-python/kivy-garden/metadata.xml b/dev-python/kivy-garden/metadata.xml
new file mode 100644
index 000000000000..2fc98962afb1
--- /dev/null
+++ b/dev-python/kivy-garden/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <longdescription>
+    Tool to manage the installation, removal of flowers at https://github.com/kivy-garden/ 
+    They are a set of user maintained widgets, extensions, tools for kivy(http://kivy.org) framework.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">kivy-garden</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/kiwi/Manifest b/dev-python/kiwi/Manifest
new file mode 100644
index 000000000000..c1ee58fdd729
--- /dev/null
+++ b/dev-python/kiwi/Manifest
@@ -0,0 +1,7 @@
+DIST kiwi-gtk-1.9.39.2.tar.gz 678242 SHA256 6992d278883ca4ca7bdf3e908e8f091c8fe9b61fdbdd0f0a33c4ba015dbf8458 SHA512 fa54623bb95a7ebe03e87c10d3bb271bd98fa4f40f7244f399cf2f86bf9b2e257666fc58caa4cc83d91a3c7fcf06817886ef5cab1baff58c8cbfdf6cfd12a554 WHIRLPOOL 907c50d89b8a534ba6712137f00214426e937f74d8ba6b49a247113ec7a9a60534a1cfa26d8337e382190bb3901d17d3d555333a7ed1b36cb167194167697e7d
+DIST kiwi-gtk-1.9.40.tar.gz 675794 SHA256 368e65e915f1ea8f69a174b13a116dee95318ca23a4c631f7f0879b4584748e1 SHA512 1fa210bcf00eeb8513f1b3fde968a212ac79c286a50a09427b0e3dffc5e78d739e70101ba4a0086d2002ac6907bc40b0103604f486b72e1bec36c9912ae6f2b6 WHIRLPOOL f7ce0189760c6ed3387ae2f0e1a4df82ffd7a692718d3ddf092ec616cf2403c7aa5781b1c6b26908d44ac13f230fc874da685bebfceb026a6a291022c1420b29
+EBUILD kiwi-1.9.39.2.ebuild 1157 SHA256 66dc138aba0deae8fcf7f95aad7c86d36033af15373ece4dc4b4ae01c97fda00 SHA512 bb6e57bf2977ea3e06712bcbe55c3ecf3527b898d35c49bf4e80e4b5a6fda76fe1807837badccfa5ebf69f4b1b61151770be3d41098426f5a56e6efb3e1794c8 WHIRLPOOL d47a10430ff85dbd9171d9d7d8ea7f815b65882dcf54f89b450326dfa10b3d7cc6ab1aa29e48ad0c8235da66e082dbf217c71a023b9fe4913eeb6e163011326c
+EBUILD kiwi-1.9.40.ebuild 1332 SHA256 1661e084db72f8263676175b42e65e6a229b318c686f812bb1f824487735e108 SHA512 7059ff522871c1056d408955589c69e65aac7cf5595f849e3d4fc8fc0519a977831a330ec91cf32b0923930227ec5a356a985256ae8b81a9b6bf4cb31a723dd0 WHIRLPOOL f5938ee10151ce5e087019a5a08cebefc6132c560c404d8bdefd1ffbb64e3d5722e09e8c524b9cb9db257ad938bd9b204547369aa91ca8f04b508854eec25d54
+MISC ChangeLog 2639 SHA256 3df68bba76def6c6b504a1137282cfb12e08beb5249635b08538599dd4d4e20f SHA512 46b88c856b693f0a40648752de3588fbce4def6c08cb2cc610e7ab09d662b424f5ad5f6a24ea557e487e8426a4346f971763b22fcfdd4b878612e6dc1adc2595 WHIRLPOOL 9024ecf4b35125120072e4e3336e77ae979032e12ba503dcd38d89a2d4b9b07ad4d3b68bee20f0cada9c61a12f699b8523b856cecbcc2a5a2b839ff3c1c463c4
+MISC ChangeLog-2015 4734 SHA256 70a297cd50300ad17d3ab2ee052247ab0c025a9a7265860f18b06c845e572aed SHA512 492361b24802f00ea3e2a0546f4f7d73f1b515a1a9d8198b2ce5cd7004d43363ddfe4673c9c45dcb712a671ffec1a5f972774df3fcc827ff294551fe027122ff WHIRLPOOL 53d4995471524145059ec1d647c765f44e5bc4d0b56d935053bc1e1914514fc84df4009e8b0585df7281d35b8b699dde342a1e9b8be9210cdc12293b65a05c1b
+MISC metadata.xml 358 SHA256 e9d990729c56e625cf439210b92dd4c383f0e0746ffb965dab7c41632021cf8a SHA512 26cf10d26661eba23c7b1b7e48aa5498a1534ebc67e00de3a8fd49ece5ca4a14db84a6b9bd9797957aefb21724a053bbcdccfd814684603145078beeee2e137a WHIRLPOOL 3fb03964c8057eef0467a7e119822bf0d55c645321050a568fc30f6f8c461d459c195c54ae75c93f89702d5af5d43d25119617fb6d7636b72e8a82c80afe8dec
diff --git a/dev-python/kiwi/kiwi-1.9.39.2.ebuild b/dev-python/kiwi/kiwi-1.9.39.2.ebuild
new file mode 100644
index 000000000000..e12ec8eb629e
--- /dev/null
+++ b/dev-python/kiwi/kiwi-1.9.39.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator virtualx
+
+DESCRIPTION="Kiwi is a pure Python framework and set of enhanced PyGTK widgets"
+HOMEPAGE="https://launchpad.net/kiwi
+	https://pypi.python.org/pypi/kiwi-gtk"
+MY_PN="${PN}-gtk"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND=">=dev-python/setuptools-0.8[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.24[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed -e "s:share/doc/kiwi:share/doc/${PF}:g" -i setup.py || die "sed failed"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testing() {
+		"${PYTHON}" -m unittest discover || die "tests failed"
+	}
+	VIRTUALX_COMMAND=virtualmake testing
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+	rmdir "${D}"usr/share/doc/${PF}/{api,howto} || die
+}
diff --git a/dev-python/kiwi/kiwi-1.9.40.ebuild b/dev-python/kiwi/kiwi-1.9.40.ebuild
new file mode 100644
index 000000000000..c033f8e0c080
--- /dev/null
+++ b/dev-python/kiwi/kiwi-1.9.40.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator virtualx
+
+DESCRIPTION="Kiwi is a pure Python framework and set of enhanced PyGTK widgets"
+HOMEPAGE="https://launchpad.net/kiwi
+	https://pypi.python.org/pypi/kiwi-gtk"
+MY_PN="${PN}-gtk"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND=">=dev-python/setuptools-0.8[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.24[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed -e "s:share/doc/kiwi:share/doc/${PF}:g" -i setup.py || die "sed failed"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# There is one fail of a test repeated 3 times in tests/test_ui.py however
+	# they are shy with their bug tracker. The fail is not a failing of the package's core modules
+	testing() {
+		"${PYTHON}" -m unittest discover || die "tests failed"
+	}
+	VIRTUALX_COMMAND=virtualmake testing
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+	rmdir "${D}"usr/share/doc/${PF}/{api,howto} || die
+}
diff --git a/dev-python/kiwi/metadata.xml b/dev-python/kiwi/metadata.xml
new file mode 100644
index 000000000000..c05c28dbfd5b
--- /dev/null
+++ b/dev-python/kiwi/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">kiwi-gtk</remote-id>
+		<remote-id type="launchpad">kiwi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
new file mode 100644
index 000000000000..63b10a4a2649
--- /dev/null
+++ b/dev-python/kiwisolver/Manifest
@@ -0,0 +1,5 @@
+DIST kiwisolver-0.1.3.zip 48696 SHA256 bbcd6470dd8518ec8d2d0daec96551291e2e17f0e910ec2502a2ecc1c7c98b44 SHA512 ce5ccf03da88743f091aba7e01ec3d7f4d7a83cb1d2e33b52a4a825bc4b9919329e73bb85a05effc83f6cc449082c5534a036a8d639937229fc7bedcc90d5089 WHIRLPOOL 355e8347010cd7cbb018f22e91fc9117cbd71a9cb68fd0c8c2b7f4f2fd146ce6453c5be7d0948b07b13e4b0750e13c8a78643ac2b9c268229f98701dee618838
+EBUILD kiwisolver-0.1.3.ebuild 557 SHA256 6a6ebb6154b30612a5ece6e89f218ceda8a80ec8b7de48a519d40144beb5b312 SHA512 80b46de3ebf259e3ffd7fb3fef5d873fd39e8733b8745d909858b9f5168982879d39007bc9b9d2699879281a1986e35bb4a5f52d1b60df420e03bbc787686c19 WHIRLPOOL 9109a828a56872a3f068d1edff46108b1bff3097911db7720a9e33e1f7403818223156ec1085e695e2b9087b575325126c4b606c5483242c0bb82c8112f7e0a6
+MISC ChangeLog 2523 SHA256 06ad85e66507f7cb2adfcaf143fbb71ab6a262abcd8e47d7955a3c38cf73ea98 SHA512 59c866e0e754ab4a8ead963dd8858b8eca9bae1dcfe0be90274923414aac5b28fd2b76715377ff13002c91c9390f3ec7d08b90287d42fa3252f77de74f38dbd2 WHIRLPOOL 7ed416898d97788d91c7892291ad2a9a51ca33eb5ca2962b12383cbea1dc829049273e5d6ca2eb426c8cd7fbf56ebcadfad50b5f3f192771ae8e33f62e359808
+MISC ChangeLog-2015 740 SHA256 d4059bad55f262d87534709e418271ae26dd48bd2b7de4ceb6942ec06f4c6ef7 SHA512 d7ff8512a59820a5aa1a98adc27b089278ba0af3d01a5ad9d8145b6c50f48a971f9fd1fa95595b2e096140e7ce4370918f19604600ec08a4a4d700eaa6475fef WHIRLPOOL 084ece5603f0bc7a8703d505dfb97c4521d6a16153cc526c9b842be36d5395212b35e889a4ce27b4d282e5cb89be50c7763f951a84e54a9712d98066f6e8595c
+MISC metadata.xml 297 SHA256 9296636828f354123801d0ac8fd26607337f43775875f0e411db30f7ea0da8ec SHA512 8e2af9d77af6a660d6624bb67076747b79884797a2a1cfd32df0301e7aff0d2d4f8dfe48acb8f3a2de5d3b4c51ed647cb2a373d04e5a5d1e3abc763b270197af WHIRLPOOL 0a2768fa492495e85992f769cbcfb0801e3f1652c5eff98ee9a6b38202d2c6fea1e3ae3e74caad974c6247fdb24b29ea84aecd7bddb2ad4991be10c08497255e
diff --git a/dev-python/kiwisolver/kiwisolver-0.1.3.ebuild b/dev-python/kiwisolver/kiwisolver-0.1.3.ebuild
new file mode 100644
index 000000000000..b7356a2414ee
--- /dev/null
+++ b/dev-python/kiwisolver/kiwisolver-0.1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
+HOMEPAGE="https://github.com/nucleic/kiwi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="Clear-BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	chmod o-w *egg*/* || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/kiwisolver/metadata.xml b/dev-python/kiwisolver/metadata.xml
new file mode 100644
index 000000000000..6ee72f235302
--- /dev/null
+++ b/dev-python/kiwisolver/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="pypi">kiwisolver</remote-id>
+    <remote-id type="github">nucleic/kiwi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
new file mode 100644
index 000000000000..eda6a4677a8c
--- /dev/null
+++ b/dev-python/kombu/Manifest
@@ -0,0 +1,11 @@
+AUX kombu-4.0.2-dict-iter.patch 1022 SHA256 c0d5232c6399f47075797e016708605a09711858c8d79d19f77ab244a2a81414 SHA512 fbb52e5fa20b4d295cd7414ef1e8b49fee6cd31e465b4059f01ccd65d96c966af0e62388fa2f486a152fe7174deb75a889c86a7cb1eb4c02a886e2c57fe0bb27 WHIRLPOOL d14ff55251b6392ee52645b2ea617a0e4c465274d8472a0ab0fce66cba1d99d4847dccc18bfa1c2a7c4b0ebc8d1e6a60294507a43652063a57506d76c9ed1387
+AUX kombu-NA-tests-fix.patch 495 SHA256 e83b9ca823d1a972a203fc02cce2cf1ab740e65957e89be50fc4343def926ac4 SHA512 0399ddcd6992182577a09e5892b042ab2c232a6f86fda46a8ac4b6254ad73fd2fc342b863d59154371a266dd0927ae72c299c4ad16bc1c8cad557d26865ff264 WHIRLPOOL 55ba444b7607fa169cf53463965520c82bdf74ce2781a127c844d496a4f9c208ff366c24a3832839ddea14bff3ee3b545d8ed960cde524688cc916ca114282e9
+DIST kombu-3.0.37.tar.gz 411790 SHA256 e064a00c66b4d1058cd2b0523fb8d98c82c18450244177b6c0f7913016642650 SHA512 ba9bb00e23ce2d3da87eb07aacff8d63ef9879e6ca9f3fe82653cc2ee91610199fe8fc778d7c2e00df05b46130ecda0bdeceda48192b8af1fb0eca41fbb44712 WHIRLPOOL 1e3344eb25024e94d341a3928bd04a9fd13bb41fefd7254e5f2dd70a8b235ae48b93d9b003b21d9ccde4ebdb8d1f349d9af6d54b51c74d6c6b1ee7913ee06919
+DIST kombu-4.0.2.tar.gz 418051 SHA256 d0fc6f2a36610a308f838db4b832dad79a681b516ac1d1a1f9d42edb58cc11a2 SHA512 99be6aa833eedc02897da90ebbd838bf0ac2a21db91350e235fae99ce31607cbc749f73f99d24f76acfc68b81d6263688d35b72ed62bb21d024a3ab385fa666e WHIRLPOOL e140f700c2e00ab892b54664d61c56343fb4d51f65fc0c42e2b4e0b0f75836889f5746061db1f31d3ba5f5981946d47d29ba64b8e6f0561fec054b77167d090e
+DIST kombu-4.1.0.tar.gz 421875 SHA256 4249d9dd9dbf1fcec471d1c2def20653c9310dd1a217272d77e4844f9d5273cb SHA512 fc104a3f974fabf090cc257b1a7623af6048f4630c6c2a9bb693fe69d77b6cdab36135a290a41056c1f854f61cce8fc2aa6b7880e9273581bfdfa162b5724861 WHIRLPOOL 88b59ce41218e7a585b6d9b8240130d7a88c19df85f8cd74acb0263252dd16d4d631f8af546b45555e8aeec4f048a808d55e1e3fb8e9895d0e46cf0cd20a5d68
+EBUILD kombu-3.0.37.ebuild 3727 SHA256 95926f13216948e1b97cb1db93091e4d93981c8aa05dd58be3f95e3e018e8446 SHA512 4d82688457a71ad8606b499a21a662495b049cba0561ca4647f730d67fe9c57e768350af90f9dd5d3e395d17d0ba52c9396c7f8f1053e3cbce17a8eb1231420a WHIRLPOOL 39128a84b54637ad837d7af3d1f638893475baa13d31ca1b8ee2673afc3f8581e76a746631c92ae4a818998eb6ba9087d1b4e3dad1c0a9e2faea41fc69da723d
+EBUILD kombu-4.0.2.ebuild 2141 SHA256 f93841d5361289ce8fb055eaf09fdced4769f1437d3bf0a40e3c842ed6f822f0 SHA512 816f2b3f8e1381c482c6945612ad8f41d92fa3b85dd0cf45461a7494833a603cdbf0f99cdacae65fbc61e7ea03133a5546358b34db7f10de93aff68a2af17d78 WHIRLPOOL c16a515d958f87999bbaa1c787e9097d5b0beb9cee7d0a873cdf87087f411687a8ce5435457eb1b6f1dddc61c03534c0e2e16f9783d8031026c781ac954cd2b1
+EBUILD kombu-4.1.0.ebuild 2148 SHA256 228db6f494848590e2eea9d5a17032c01aa163b04c1e24525ca465033d6a1aab SHA512 d1ae7cc79599172007b374d324476cb52bca0e143808c637020d8f9eec1cb6d86c9ce77ed555fd499e44d010a9ead284fd100bb5112e07fb1a9bf50ce193ecb3 WHIRLPOOL bcb10c12b24bc354fd4d5f7eaaf4156b79bf55374ac28392b3e8b9d6d89fe6ae50b4c717ee718c908cdb77c248462c78636c9675dc1b99c6e59fcde83e4d8470
+MISC ChangeLog 5918 SHA256 a40005f1ecd918db749fc513ffa5b06924ad153dc0cea9343fae0cbb240bdfbf SHA512 01fdcdb43245b848cd11496db9fd633e770f226c09bc967413686671e80981e0015d3ad26a04d79574a257d6c950096d3e87494233a8d4719baaefef9c53f7b1 WHIRLPOOL 31d498ad1a477cfe347f730125e9d71c0fa6469e44330f73bc16e52fce55e9bdecdbb9ceb851a9fe8ef2bcd4bde7fb3fb2aee55e515cdcbb2a732dff9c081b1f
+MISC ChangeLog-2015 7197 SHA256 7391125e7caf0a3da3ee1df44f913d0e01f6a42fb480e4dd02b91e54dd94aef3 SHA512 bc9033f772daffa0017cf4c7606a520e7ecb8fdaa4e5baafc9a5ddaf1b8860ac18c12598d49ad29a96dd71525d3484c16f85da13f029b96e025b9ef941fd86e0 WHIRLPOOL a85a4996943ae223b5151dba92ee3a87c73538caefb27b1e50c563a470e5eb95cb87b8fe4cbdcc511a2e695ed59c8b89517227da6ea2fdbb15d50e6696b34f99
+MISC metadata.xml 576 SHA256 ebe56d377d4dbaef969068352f3594b153870ce22c3a93606f56f44caa5c7226 SHA512 9d5fccd7c511196d4c98b80dd668e4f683d52335d3eee7fa372558091d131f1305aedd4bbcaaa895fe25679bb8912a4452f3f69fbd37ea45a5780c621cc1ae9b WHIRLPOOL 3b2ce876af34015bace1956bb03e9f14be1fd3352dcdfa26cbabf104c774db490a1661c1d8a90fccc8b7883e2bd024c6d22482a637a8d6eb06f919708dc14b3e
diff --git a/dev-python/kombu/files/kombu-4.0.2-dict-iter.patch b/dev-python/kombu/files/kombu-4.0.2-dict-iter.patch
new file mode 100644
index 000000000000..fa3e545c6273
--- /dev/null
+++ b/dev-python/kombu/files/kombu-4.0.2-dict-iter.patch
@@ -0,0 +1,24 @@
+From 2940a4b1830bc2fc6d3f65de4feeec6ea5a49fe5 Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars@archlinux.org>
+Date: Tue, 21 Feb 2017 11:52:18 -0600
+Subject: [PATCH] Don't modify dict size while iterating over it (#676)
+
+This fixes https://github.com/celery/kombu/issues/675.
+---
+ kombu/messaging.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/kombu/messaging.py b/kombu/messaging.py
+index 03e7e15..e1800b5 100644
+--- a/kombu/messaging.py
++++ b/kombu/messaging.py
+@@ -397,7 +397,8 @@ def revive(self, channel):
+         """Revive consumer after connection loss."""
+         self._active_tags.clear()
+         channel = self.channel = maybe_channel(channel)
+-        for qname, queue in items(self._queues):
++        # modify dict size while iterating over it is not allowed
++        for qname, queue in list(items(self._queues)):
+             # name may have changed after declare
+             self._queues.pop(qname, None)
+             queue = self._queues[queue.name] = queue(self.channel)
diff --git a/dev-python/kombu/files/kombu-NA-tests-fix.patch b/dev-python/kombu/files/kombu-NA-tests-fix.patch
new file mode 100644
index 000000000000..a4bcda6e292d
--- /dev/null
+++ b/dev-python/kombu/files/kombu-NA-tests-fix.patch
@@ -0,0 +1,16 @@
+https://github.com/celery/kombu/commit/828ba134105eeb4c6df52cb4441cf90c297b77e3
+Fixes NA bug with amqplib.
+diff --git a/kombu/transport/amqplib.py b/kombu/transport/amqplib.py
+index feedee7..f57e28c 100644
+--- a/kombu/transport/amqplib.py
++++ b/kombu/transport/amqplib.py
+@@ -17,6 +17,9 @@ class SSLError(Exception):  # noqa
+         pass
+ from struct import unpack
+ 
++class NA(object):
++    pass
++
+ try:
+     from amqplib import client_0_8 as amqp
+     from amqplib.client_0_8 import transport
diff --git a/dev-python/kombu/kombu-3.0.37.ebuild b/dev-python/kombu/kombu-3.0.37.ebuild
new file mode 100644
index 000000000000..5f608fd2bb8f
--- /dev/null
+++ b/dev-python/kombu/kombu-3.0.37.ebuild
@@ -0,0 +1,110 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="AMQP Messaging Framework for Python"
+HOMEPAGE="https://pypi.python.org/pypi/kombu https://github.com/celery/kombu"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="amqplib doc examples msgpack sqs test"
+
+# couchdb backend support possible via dev-python/couchdb-python
+# ditto dev-python/kazoo(>=1.3.1) and dev-python/beanstalkc
+PY27_GEN_USEDEP=$(python_gen_usedep python2_7)
+PYPY_GEN_USEDEP=$(python_gen_usedep python2_7 pypy)
+RDEPEND="
+	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/py-amqp-1.4.9[${PYTHON_USEDEP}]
+	<dev-python/py-amqp-2.0[${PYTHON_USEDEP}]
+	dev-python/pyro:4[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]' 'python*')
+	amqplib? ( >=dev-python/amqplib-1.0.2[${PYTHON_USEDEP}] )
+	sqs? ( >=dev-python/boto-2.13.3[${PY27_GEN_USEDEP}] )
+	msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )"
+# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-0.7[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/unittest2-0.5.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-0.7.0[${PYPY_GEN_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		>=dev-python/redis-py-2.10.3[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/beanstalkc[${PY27_GEN_USEDEP}]
+		dev-python/couchdb-python[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-issuetracker-0.9[${PYTHON_USEDEP}] )"
+
+# kazoo and sqlalchemy are optional packages for tests.
+# Refrain for now, no established demand for it from users
+
+# Req'd for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PY27_REQUSE="$(python_gen_useflags 'python2*')"
+REQUIRED_USE="
+	sqs? ( ${PY27_REQUSE} )
+	doc? ( ${PY27_REQUSE} amqplib sqs )"	# 2 deps in doc build are py2 capable only
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-NA-tests-fix.patch
+	)
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+	# https://github.com/celery/kombu/issues/246
+	sed -e 's:kombu.transports:kombu.transport:' -i funtests/tests/test_django.py
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# Doc build must be done by py2.7
+	# Doc build misses and skips only content re librabbitmq which is not in portage
+	if use doc; then
+		emake -C docs html || die "kombu docs failed installation"
+	fi
+}
+
+python_test() {
+	export DJANGO_SETTINGS_MODULE="django.conf"
+	# https://github.com/celery/kombu/issues/474
+	# tests need </pymongo-3.0; known to cause some breakage
+	if python_is_python3; then
+		2to3 --no-diffs -w build/lib/kombu/transport/
+		nosetests --py3where=build/lib kombu/tests || die "Tests failed under ${EPYTHON}"
+	else
+		nosetests "${S}"/kombu/tests || die "Tests failed under ${EPYTHON}"
+		# funtests appears to be coded only for py2, a kind of 2nd tier. pypy fails 6.
+		# https://github.com/celery/kombu/issues/411
+		# Fix to https://github.com/celery/kombu/issues/474 breaks the
+		# funtests under >=dev-python/pymongo-3.0.2
+#		if [[ "${EPYTHON}" == python2.7 ]]; then
+#			pushd funtests > /dev/null
+#			esetup.py test
+#			popd > /dev/null
+#		fi
+	fi
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/kombu/kombu-4.0.2.ebuild b/dev-python/kombu/kombu-4.0.2.ebuild
new file mode 100644
index 000000000000..b5d030da5273
--- /dev/null
+++ b/dev-python/kombu/kombu-4.0.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="AMQP Messaging Framework for Python"
+HOMEPAGE="https://pypi.python.org/pypi/kombu https://github.com/celery/kombu"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc examples msgpack sqs test"
+
+# couchdb backend support possible via dev-python/couchdb-python
+# ditto dev-python/kazoo(>=1.3.1)
+RDEPEND="
+	>=dev-python/py-amqp-2.1.4[${PYTHON_USEDEP}]
+	dev-python/pyro:4[${PYTHON_USEDEP}]
+	sqs? ( >=dev-python/boto-2.13.3[${PYTHON_USEDEP}] )
+	msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )"
+# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-0.7[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		>=dev-python/redis-py-2.10.3[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/couchdb-python[${PYTHON_USEDEP}]
+		>=dev-python/sphinx_celery-1.1[${PYTHON_USEDEP}] )"
+
+# kazoo is optional for tests.
+# Refrain for now, no established demand for it from users
+
+# Req'd for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${P}-dict-iter.patch
+	)
+
+python_prepare_all() {
+	# AttributeError: test_Etcd instance has no attribute 'patch'
+	rm t/unit/transport/test_etcd.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# Doc build misses and skips only content re librabbitmq which is not in portage
+	if use doc; then
+		emake -C docs html || die "kombu docs failed installation"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/kombu/kombu-4.1.0.ebuild b/dev-python/kombu/kombu-4.1.0.ebuild
new file mode 100644
index 000000000000..fe5302327bf7
--- /dev/null
+++ b/dev-python/kombu/kombu-4.1.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="AMQP Messaging Framework for Python"
+HOMEPAGE="https://pypi.python.org/pypi/kombu https://github.com/celery/kombu"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc examples msgpack sqs test"
+
+# couchdb backend support possible via dev-python/couchdb-python
+# ditto dev-python/kazoo(>=1.3.1)
+RDEPEND="
+	>=dev-python/py-amqp-2.1.4[${PYTHON_USEDEP}]
+	<dev-python/py-amqp-3.0[${PYTHON_USEDEP}]
+	dev-python/pyro:4[${PYTHON_USEDEP}]
+	sqs? ( >=dev-python/boto3-1.4.4[${PYTHON_USEDEP}] )
+	msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )"
+# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-20.6.7[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		>=dev-python/redis-py-2.10.3[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/couchdb-python[${PYTHON_USEDEP}]
+		>=dev-python/sphinx_celery-1.1[${PYTHON_USEDEP}] )"
+
+# kazoo is optional for tests.
+# Refrain for now, no established demand for it from users
+
+# Req'd for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+)
+
+python_prepare_all() {
+	# AttributeError: test_Etcd instance has no attribute 'patch'
+	rm t/unit/transport/test_etcd.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# Doc build misses and skips only content re librabbitmq which is not in portage
+	if use doc; then
+		emake -C docs html || die "kombu docs failed installation"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/kombu/metadata.xml b/dev-python/kombu/metadata.xml
new file mode 100644
index 000000000000..7c51adae3ca3
--- /dev/null
+++ b/dev-python/kombu/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">kombu</remote-id>
+		<remote-id type="github">celery/kombu</remote-id>
+	</upstream>
+	<use>
+		<flag name="amqplib">Enable amqplib support</flag>
+		<flag name="sqs">Enables Amazon SQS transport module for Kombu</flag>
+		<flag name="msgpack">Enables MessagePack (de)serializer for Python</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-python/larch/Manifest b/dev-python/larch/Manifest
new file mode 100644
index 000000000000..4ff1756baf4c
--- /dev/null
+++ b/dev-python/larch/Manifest
@@ -0,0 +1,7 @@
+DIST python-larch_1.20130808.orig.tar.gz 88271 SHA256 f64599ebd5247bc79ed69cdc853ae08cc3d0d8648fa7737ad2854854cc843045 SHA512 84bab884e3ff8e27cc43e2520eb10fb7a38d99eddb06b9163e174329d69552e678ef81d606fa041f894794f0ba3bdf59ace3081f71596869e1167a0e23d56c85 WHIRLPOOL ff86df6db0d0dac024ba086e2264028abd74b45f73cae773c5c8a7b91ad9df54ab8f092fa85b277f27f7d17b50391037059624c533e04ef97108751d7c2f3013
+DIST python-larch_1.20131130.orig.tar.gz 86509 SHA256 2717e851bde45b66e8b2d44181861f24135d185abab8111119857943d3b5cac1 SHA512 e661fa29043a5254eb3615f0eb54f6afbaf59020607bb72f621083e9f6acfbe92b1c978ce2be73336d8984a4a64ce6d0153556f0af0ca63ad53aff40f785d052 WHIRLPOOL ca777fd5a23270918dc83e92e321413f8bdfee58228ce1224deddbd0d6ae854d1b28b945282fd290053f3cb3b240e6e795eb28c8d687726f2c18f5fda5b716c1
+EBUILD larch-1.20130808.ebuild 670 SHA256 9fe4d83b64633c1e77c7eae5b748a9c6a93f67fb19fa1321475b4d8f03a85755 SHA512 3fe27d8f94fe95e777a10ef2ff23b58865b5ce367b471b7a26b586af605a853120c81c2a368abe8ae5c9c226923d90ddde204d55d780123f2bb67b9e10f8bd40 WHIRLPOOL a8b218518503ce938c93937f920bdb8d6395c0d1a4129bb1d20dd600c2c9a04121a3fdc0c432e0e64d78d86c0a22c5db33f0a24acc007429a71e05bd64ea2066
+EBUILD larch-1.20131130.ebuild 670 SHA256 9fe4d83b64633c1e77c7eae5b748a9c6a93f67fb19fa1321475b4d8f03a85755 SHA512 3fe27d8f94fe95e777a10ef2ff23b58865b5ce367b471b7a26b586af605a853120c81c2a368abe8ae5c9c226923d90ddde204d55d780123f2bb67b9e10f8bd40 WHIRLPOOL a8b218518503ce938c93937f920bdb8d6395c0d1a4129bb1d20dd600c2c9a04121a3fdc0c432e0e64d78d86c0a22c5db33f0a24acc007429a71e05bd64ea2066
+MISC ChangeLog 2479 SHA256 4bc8e1289fd006425524a4c6dfd2ee3b14a7bd7f30d78b70ffa697f375e0d59b SHA512 25adebe8894816d9546335c8b69e0992579fd748bf535c0ae1a099774084e79f6546d438d1e580cbb193670d648d5afe17139aa5ebe61f177ea5642a74256564 WHIRLPOOL 6d766ddd8909656620197b12c1374f5237c0e89137a37b3cf3aa465ba5ecfb17bb484c355cc817ed5c3d14d5c6345ded23e4a6f6b789d831b4cc44a10fbd45aa
+MISC ChangeLog-2015 1522 SHA256 6e07009fdf8728e3bd6185f1a3d4148bb86dba9504dde2be80c57a767b97eec7 SHA512 be4ce3ac3b844dba0948526826a115d6040b13b0fc317800e979118d7f8c83c036259a9b636dae7373e38eedb804060d8be6613a127bd7326b87391d2697b0c0 WHIRLPOOL f5681f423ed604f6109695e2d5234f116f1e5d550072f412d1bf37fc85387bcd25e9b2e98c9beeebf47bb21b78e7c64a08bf394db929ff504b27027eaa43be04
+MISC metadata.xml 250 SHA256 dc7996b965794cc38ecefc226a6b05400ff49c69553249c3d0ac69fd277b7906 SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de WHIRLPOOL e00ced8aee67f075273a4c498a4c69671eef224f7b41ef8c194ae72404c242bb93bf31a48fcf94065ab6fe8afbfb667238deba4ea4eb9bec406ace4bfcdcdc8c
diff --git a/dev-python/larch/larch-1.20130808.ebuild b/dev-python/larch/larch-1.20130808.ebuild
new file mode 100644
index 000000000000..7154cb4765f6
--- /dev/null
+++ b/dev-python/larch/larch-1.20130808.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Copy-on-write B-tree data structure"
+HOMEPAGE="http://liw.fi/larch/"
+SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.orig.tar.gz"
+#RESTRICT="test"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/CoverageTestRunner dev-util/cmdtest )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/cliapp
+	dev-python/tracing
+	dev-python/ttystatus"
+
+src_test() {
+	addwrite /proc/self/comm
+	distutils-r1_src_test
+}
+
+python_test() {
+	emake check
+}
diff --git a/dev-python/larch/larch-1.20131130.ebuild b/dev-python/larch/larch-1.20131130.ebuild
new file mode 100644
index 000000000000..7154cb4765f6
--- /dev/null
+++ b/dev-python/larch/larch-1.20131130.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Copy-on-write B-tree data structure"
+HOMEPAGE="http://liw.fi/larch/"
+SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.orig.tar.gz"
+#RESTRICT="test"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/CoverageTestRunner dev-util/cmdtest )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/cliapp
+	dev-python/tracing
+	dev-python/ttystatus"
+
+src_test() {
+	addwrite /proc/self/comm
+	distutils-r1_src_test
+}
+
+python_test() {
+	emake check
+}
diff --git a/dev-python/larch/metadata.xml b/dev-python/larch/metadata.xml
new file mode 100644
index 000000000000..ea6b59e79026
--- /dev/null
+++ b/dev-python/larch/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>mschiff@gentoo.org</email>
+		<name>Marc Schiffbauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
new file mode 100644
index 000000000000..c59361ef3e13
--- /dev/null
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -0,0 +1,4 @@
+DIST lazy-object-proxy-1.2.1.tar.gz 28860 SHA256 22ed751a2c63c6cf718674fd7461b1dfc45215bab4751ca32b6c9b8cb2734cb3 SHA512 60813fea51e14ccfa22974c547c7179593da25e4ba65380c39493d2b91558bfcdffa298fe0a043170414d897bd72fd22f0bc3bc3fbdc8202873fab6c2a8e45a8 WHIRLPOOL 3e6bad5e09407d2ff750ce2d1078aa65156d61224c8f04b90a535235cc4c12d2683844dc43eef1a18805b395eb8d47508cb11dfde4f9cec08907657cf73613c1
+EBUILD lazy-object-proxy-1.2.1.ebuild 974 SHA256 14d39e3e298c8f9da0f8f5aeba5ffcd2689df44b888823d51ca159934d6c789d SHA512 b45dda99003d2da063dc617dd9ece75a56e7dc4bf7e0be30bb71c3026ae777835387a3d427802dff5f9227814336974217a2200208f8f0ed8c34c5538baabeab WHIRLPOOL ef483ec69546ce06c2fa4adb90cf1123a64bb0cf734bd54583adfa2d54330c96608bf5e66555514624f712133a7b16f0144e067622a8630b6f04aa730e81a04a
+MISC ChangeLog 1812 SHA256 a26df6d0999af29810272190cdc680f8dd26bcff397c360dc1268fb3b9e6b975 SHA512 97a6fa00cb18d14738e44495c59797942d7712a492ce63975acd345df50ab4e1a903f3d7ec3d460729978cdccec1ee4875896c6176c72c2c4858398a28cc3c48 WHIRLPOOL a8faf2abc695f71e7471ad66afd52ef66aa67d94b7ab356fbf968946ece2b01260b80e474feba97b031dac0c07d0f54a407a91bbdc9b9705f3a3e7e275e84a4a
+MISC metadata.xml 539 SHA256 f6e08bffa1429652c15ed155f686fb75477608a9e5e2ad83fa1f5d2e3d4608d8 SHA512 7e5fa1513ed6a00183c3722f53b25062e35a3128dce6fd4e0d40fc10dcce8157eb902654b2f7606184378f81972f9bafc6e1ba578581ecf6d8e1b3ec09e1f473 WHIRLPOOL 8c3115e17fe666cb12c18a4eb500e2960b6adb81cc6539aeee3f01f0392d0154f7dc4dd009390f729e07dd1444d83a5c8bc3671a8645f2aa85a1930f6b4468de
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild
new file mode 100644
index 000000000000..3b78058b30c5
--- /dev/null
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild
@@ -0,0 +1,40 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="A fast and thorough lazy object proxy"
+HOMEPAGE="
+	https://github.com/ionelmc/python-lazy-object-proxy
+	http://pypi.python.org/pypi/lazy-object-proxy
+	https://python-lazy-object-proxy.readthedocs.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# No need to benchmark
+	sed \
+		-e '/benchmark/s:test_:_&:g' \
+		-e '/pytest.mark.benchmark/d' \
+		-i tests/test_lazy_object_proxy.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v -v --ignore=src || die "Fails for ${EPYTHON}"
+}
diff --git a/dev-python/lazy-object-proxy/metadata.xml b/dev-python/lazy-object-proxy/metadata.xml
new file mode 100644
index 000000000000..90b19b814175
--- /dev/null
+++ b/dev-python/lazy-object-proxy/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">lazy-object-proxy</remote-id>
+    <maintainer status="unknown">
+      <email>contact@ionelmc.ro</email>
+      <name>Ionel Cristian Mărieș</name>
+    </maintainer>
+    <remote-id type="github">ionelmc/python-lazy-object-proxy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ldap3/Manifest b/dev-python/ldap3/Manifest
new file mode 100644
index 000000000000..248bdce8ce47
--- /dev/null
+++ b/dev-python/ldap3/Manifest
@@ -0,0 +1,7 @@
+DIST ldap3-1.4.0.tar.gz 300079 SHA256 f69cb30894423b31b44206fa0548f2bf38cb5afc527f6c1a6e90f6c9327ef901 SHA512 0aaa05355dd065f66a6fb24ce298f8b632f013ffa47e805b0a1674ba96e89554106a437d8a6fceece36ccb84484e447595f459697baba9a432c458c9969f0da6 WHIRLPOOL 1d5fb8d91411f5ad90fcf8e70093c3da9533902212051df648facc776a81fd8a31ceffc2d5714e25cca62696bb5d82667bff98c843aa308ef549ce45a9b51133
+DIST ldap3-2.2.3.tar.gz 331483 SHA256 28ec651fbe5822cbd4161a96ccaad5b1b5c4adba186addc1232d94f2e6b03c23 SHA512 a954f6c582e88addf0bd6dc6fb24108d76d134b80c14a3dca0f9f667dbbfee484cb7b0444822f7e82a41af7dacf61ba111b6dcbf215b7f6df26a3784cfd2fc83 WHIRLPOOL e38f149d3218a61c1de4b8b0f25eeffcb936900f8a189b37dcc77131db854dd36d5b97213f0d36e22f8017ff9e14c975240e6d064b544780bd4f3c994a99970a
+EBUILD ldap3-1.4.0.ebuild 690 SHA256 16fce2033bdebd6cc797f517adf67d3e70cccac3296a054b0b818f74d01bdc07 SHA512 87dc87d78f4c94a555d1327e2b29c1a5e0f6148762b7d50950daf50d037e04b7b033f207008e2dddfc448b51e3c907cc7c474f42ffaf757fa9a88bb98e6a337c WHIRLPOOL 15521edf8b4316d4d68502e00b0db5f0c90425077059bc46f80d4072723b6a4710b81bdcbdf84682fe6ba7666acfdb076d88f7720fbd3b2c4a4d531855949129
+EBUILD ldap3-2.2.3.ebuild 875 SHA256 457f0c75c42564b1799c8c0cb8c801e5755837d693eb7ae7e6e0699a878e376a SHA512 a8bb1875b9590816a38a5ee933b8b2be7467b0811d3b15968bb4a1139cd541faf86cfdc80f61fdcc4dc0e2408ff46722dc0a8679221ada0144217562a11947bc WHIRLPOOL 1b21bbf2829c17cf1b9a0765b006b5bee352b8058aa680fe9fe7b3f29bcfca3b41214ac989f75b5c8266e962c8c3e3117dac486448bc665a178d95fc190330a7
+MISC ChangeLog 4495 SHA256 0c033d519db303cee43cc75ff69de135f803b9b5202d176598bf3195910d598a SHA512 5754e38552b31727012df477f8cb0508174234196b5b18f5c9e9710782aa5ca67a2de354892e9f8e21ed5488249692d8c15b5071d13e3817ce73208ccaf336de WHIRLPOOL de92f4e1fa715bc109366ab837ea93a81cdcb0dc00dc861945bac3ca956060d8208299dc4001e80e180b0ae2f0cd7f2e3beecbe3a2a1a976d1774629a6fe8a2d
+MISC ChangeLog-2015 904 SHA256 6d1b68bcdf42a67cb033270d823997f4f8228d4a31c8f0218c338e94a2ac5290 SHA512 39e3b4f4d5df749c28081f4a0e2846cf064328e1623ad865213a405cd7fd79b89eac4f4366242454b5d157ea7c8eb5688abcb81fdfcdd6a4d6f40e0874e78d84 WHIRLPOOL e83f6241d0cc2752b2cff7f1038cfda42832508dd5a6092aaf8609930947db0de9eef9dced6bb8d8061bc3ccd5b30de8b8f8423109dcd4725a8fa4c26a2d768a
+MISC metadata.xml 667 SHA256 d2c9e83b14e65dc1431d3b01be494a017480c4aad01fa29b1ad4081366bbb428 SHA512 f92f6b96a6d9c32f959d278edd654495b0e8350ade72dde717b285667c0a6a9f472ca164b8c5f7e96b6f4aab1f48368a4a5836f75ff5e55941f8953b6b02e747 WHIRLPOOL fca0873d287bb08a9016246c08e0a1a103ca7817935e736b556251ae369235fc36b834d39048346324d14aff8c1b6d172ff5dd2f8f0662d03931d33e646786a4
diff --git a/dev-python/ldap3/ldap3-1.4.0.ebuild b/dev-python/ldap3/ldap3-1.4.0.ebuild
new file mode 100644
index 000000000000..8601757c6141
--- /dev/null
+++ b/dev-python/ldap3/ldap3-1.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A strictly RFC 4511 conforming LDAP V3 pure Python client"
+HOMEPAGE="https://github.com/cannatag/ldap3 https://pypi.python.org/pypi/ldap3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	"
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	nosetests -v -s test || die
+}
diff --git a/dev-python/ldap3/ldap3-2.2.3.ebuild b/dev-python/ldap3/ldap3-2.2.3.ebuild
new file mode 100644
index 000000000000..35f3ea68309b
--- /dev/null
+++ b/dev-python/ldap3/ldap3-2.2.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A strictly RFC 4511 conforming LDAP V3 pure Python client"
+HOMEPAGE="https://github.com/cannatag/ldap3 https://pypi.python.org/pypi/ldap3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+# The tests are a mess, and the test config is not included in the
+# PyPi tarball (see https://travis-ci.org/cannatag/ldap3 and
+# https://github.com/cannatag/ldap3/blob/master/test/config.py).
+RESTRICT="test"
+
+RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	"
+
+python_test() {
+	nosetests -v -s test || die
+}
diff --git a/dev-python/ldap3/metadata.xml b/dev-python/ldap3/metadata.xml
new file mode 100644
index 000000000000..3e6256f8c0b6
--- /dev/null
+++ b/dev-python/ldap3/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		ldap3 is a strictly RFC 4511 conforming LDAP V3 pure Python client. The same codebase works with Python, Python 3, PyPy and PyPy3.
+		This project was formerly named python3-ldap. The name has been changed to avoid confusion with the python-ldap library.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">ldap3</remote-id>
+		<remote-id type="github">cannatag/ldap3</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ldappool/Manifest b/dev-python/ldappool/Manifest
new file mode 100644
index 000000000000..88337213c612
--- /dev/null
+++ b/dev-python/ldappool/Manifest
@@ -0,0 +1,9 @@
+DIST ldappool-1.0.tar.gz 6795 SHA256 1fc36c617ffa6195a738ca99ae7f2178271ebe30a5ee6d41abdb49168afb75aa SHA512 081dc08833d95bb0d3ce396cbbe697252e2b483cc3703e87f00f8af0513f9fdca4ff9c97295fb439ff1fcd404027d5922c2a6337665cfad526be3c6b83acfa53 WHIRLPOOL e5cb9b61848cb3fa7314eeeb25fd9bed89ec7e4dca50eb501f80f952ca3aab78017962c85359efbe6d741ec9b38450d78a06a287aee8e7e935db391c3856a68a
+DIST ldappool-2.0.0.tar.gz 15089 SHA256 2850274c16b3108fae9f0ce2bc327e7712f78578677c08336225b75edeb1c5f1 SHA512 824243cca712d6aef8929c74cb15f0cefbc8795cdb599d3b0cc48e8eee4a58d3db94a6642379f87ba011784c289f936a62f2aed637bb005985bbee2118d3b6ea WHIRLPOOL 9a54e41a9ff5c5236b9fcf16f61d11bd121c49f9122866c00fc82fc2e6fa2c72d4c45386f613b14ea2d20c58bd40750a90ad3c5384c8d8df6d665c7b7ccb07e0
+DIST ldappool-2.1.0.tar.gz 16395 SHA256 f3e04e7ffd257f19c2b71b625817dcedc76356f30abc65748060baaeb5a1a5cf SHA512 a261a4a68e159a54eae51dc19ed543398a1be61d305ba3958d4dab9ed2de9787203a418e5d754cf12c503e5a4c2e8d180d609968e6407201548d4c4886526c0c WHIRLPOOL a2ca320e12503f0412295256a21acbdfcb2da4e1031aba5cf0914a2a48f9a1f641c29aca772660dc5f929dc64981470c23954cfeacb4bb9c60fdb350f9c67385
+EBUILD ldappool-1.0.ebuild 471 SHA256 db0778d8636f1b8d72bd2b2e8f4930d309fa3bc56d4ad8f5779926735849f5e4 SHA512 710a13787440aa22507537cfaa02d6ceace6590a4e9a8fab0fbea9f3f47d1e6bbff3f4fb0d2ee9ff470121923051c44b90260a759dc57e81797b83d9fd24ec93 WHIRLPOOL e6142a7630ad30f727b236f3561025b5557437b56477f6da0a0c7a72fb8dcb7596bb52a8842383ffd0f37d606945b27f7ebf1729261dff850f0b2aa28aa5a345
+EBUILD ldappool-2.0.0.ebuild 539 SHA256 71ee9301fa200f9c64d40387a391e49ea4ee35c34b20eedbf29a34465bc55089 SHA512 47517b04ae8bd0969a668910d0f9c6b198ec2ec4e7c19bc3ab561056d813362ef96aa7627aa1eddfc3942ca03d388f14c6bce92a7ae1ad78e3c4b6970c0cae4d WHIRLPOOL d0c1de41911122673cc6bed8791ab43d72cf451c0728a22a9130fc1f382f195c22c257b9adee6b4f239e5089a519eeb4ea2304059cf431ef7105fb806df0eb01
+EBUILD ldappool-2.1.0.ebuild 586 SHA256 0a66319732ff2e15e7a850a506879bbf00cb125c2ab3e043f684ac4ed8d29677 SHA512 8f5e4ce9054c4b63b771ec4e1e71c45d5ecc6078a3e89ff39266201fae7e2327a1f06af76693939fc112d7203ea9163eb8e4f111efc3a4556dea17e09da7b87d WHIRLPOOL 26884b9d488674303a4dd0a2965e64d506ee80ae5bf0b7988ccc0d89063c079c59973803244b396e48f1781f703468ba0723bd9810b3256e1fa9bb63598bb821
+MISC ChangeLog 2963 SHA256 83c2ffc94a7d03612f35750792f582a5d6f46e0dad18737d813c9e7e5f0b0a3c SHA512 a7a9a4d74ee58ee163de083f5332761629c27f1c0e471f26f0b0f9a73e3a85773c314ab4735b2ea1ad02b5264c2767db660557c4f58c206a0e946251d9fb5159 WHIRLPOOL cf2af75675e8e5a451e8043c8d670a7ff5ee4d84e23f31930edce8f30c14db8d082e24eb042a6a195e9b073acef207b497b08b7541997c321839ef48bb2e9cb3
+MISC ChangeLog-2015 768 SHA256 53d9e27357bace37c38e9d2cd075b57a0e7720dc39d952cc53d91fce02568797 SHA512 79e6ed39fb1f19f14f605730b67ba3734b79aa371f9f07b522e37a1d6e7063c175a9f8bfada3bcae57e3f05676d274de69baea1d129c66344c8f683f64674ab0 WHIRLPOOL 602d4588ef121f120ccbb1ac2103d96e693a699d1861ef4f62ffa8140d111a19307dac8ba062cef6fb044e71c79454a05ede8bf19287dfdda824896bdc42b360
+MISC metadata.xml 570 SHA256 a184d634feca3562dadfbc00562031a43795473a47edf144548bbb6d83bafb96 SHA512 c8ca27a9ee07cc0af330a7c6fc0906346c8de23644a5df9b6846cd6246370c9ac05a6c49eb748cd4c4f21698a317beb19184f1753325592408c2f4b6b73d8f59 WHIRLPOOL 8ebc7661172d6009e8f121ebce6a2376002d8d7ec1c1f74b1bcf823659bb2953c417f43e0adac487b846234ee0f1ce9a4b0cc7db3ab19d8c687470223defb816
diff --git a/dev-python/ldappool/ldappool-1.0.ebuild b/dev-python/ldappool/ldappool-1.0.ebuild
new file mode 100644
index 000000000000..92bcc53a435f
--- /dev/null
+++ b/dev-python/ldappool/ldappool-1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A connection pool for python-ldap"
+HOMEPAGE="https://launchpad.net/oslo"
+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}]
+"
+RDEPEND="
+	dev-python/python-ldap[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/ldappool/ldappool-2.0.0.ebuild b/dev-python/ldappool/ldappool-2.0.0.ebuild
new file mode 100644
index 000000000000..a89eef334720
--- /dev/null
+++ b/dev-python/ldappool/ldappool-2.0.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A connection pool for python-ldap"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/pyldap-2.4[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/ldappool/ldappool-2.1.0.ebuild b/dev-python/ldappool/ldappool-2.1.0.ebuild
new file mode 100644
index 000000000000..a16508b2e5e1
--- /dev/null
+++ b/dev-python/ldappool/ldappool-2.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A connection pool for python-ldap"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/pyldap-2.4.20[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/ldappool/metadata.xml b/dev-python/ldappool/metadata.xml
new file mode 100644
index 000000000000..3ae98cda1a8c
--- /dev/null
+++ b/dev-python/ldappool/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+	A simple connector pool for python-ldap.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">ldappool</remote-id>
+		<remote-id type="launchpad">oslo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/lesscpy/Manifest b/dev-python/lesscpy/Manifest
new file mode 100644
index 000000000000..d07578280313
--- /dev/null
+++ b/dev-python/lesscpy/Manifest
@@ -0,0 +1,7 @@
+DIST lesscpy-0.11.1.tar.gz 159706 SHA256 640357af8599aec24462013c66043fa499de84c94c468b2b464e440a3ecf9b30 SHA512 2cf4e8c3a46cf5e9a7f1dd80f613550fa0e857a8acf9d33d9da2f7a90e1b264bbc18a427668f152ff136b438b19866f016dec91794c721b98ec2f2456dc504e3 WHIRLPOOL 827285d7f87724802ca9ebdf26c8fde3c4c528777acda444453f6ce31848681f9cbe967e9a76edb3cd91a70fc71f1e70b68cba0eb3411ee64d3a0ce50d3b0823
+DIST lesscpy-0.9j.tar.gz 32061 SHA256 fa01d435a1ab3abafba683519bdc7aca5e19399e96225e1a8bc1d660b566364d SHA512 9063b89a1ca8dc8424b3b1989bdf7c31de74e26ab8ab5ede1664f53d1ff1946308d9add65236cd5fabc58efcaf1cb5789fa73f0775a83cb70ea9a73d25207a73 WHIRLPOOL 3e885dc03138a2b693c94af775e4386bc8c2bcecb8b6202a5f80ec5b8435798cb0d06934d7e9eb39e0a54c9861c009a673d6ee7990050f1164e239157047140a
+EBUILD lesscpy-0.11.1.ebuild 744 SHA256 ce6f6fc004ad2d232c1630309901d1d34debd2477f2e5ffbad7d388c2ad6656a SHA512 77df44dee39184eb670b5f531e43092c3ade4218961c63a2de34656cc9dbd9dd1690a07876128cde8e21c19b54a0304ffd00704707ebce5d79b8eb125ba7e020 WHIRLPOOL c2b4ce983aa36448d9c78965e0944d435ad93dc624ab428c79fdc8cb3f2c9364f8077622f48ab62bd3799746373fab0691ee96208e6a3a00f30b45d506e93731
+EBUILD lesscpy-0.9j.ebuild 581 SHA256 47404855861ebafda8f3433df6d38f736f9017dbfe6c74bbe700b53d2a90b596 SHA512 e6d5028096d61afafe29c1af057ae81b61bda2e17948dfe3156c5a7bac6b38bb39c26ea97d409473b068302e7d890313bdf733a84e471cf6891b3f1d6410f98b WHIRLPOOL fdb6d67e2b352cc9bb7a3ee31fb3a7d85f91d7db5af52c31765f5aeaa7fd828fe36daae3f6d51fed25daae6c0ea0202ce960925f4115e3509a3631a20c6aa681
+MISC ChangeLog 2862 SHA256 1b4d0ec0fc178ac473d8b39c751f2fba9c8b05557b53398600f59086bf14313b SHA512 035cf05d24b432b06d59e389a2280140bdf6613ae4fe27712a93c3f1ea99ec554ac117f8324dc2cab44836e8e5387571617b62890e2a361f923e4979084428e0 WHIRLPOOL bba353c4793004a9b5377ff0edaf2d893ff52798e8d3e82e98352d1e82353c1c21945c26d177d0f5b0d6fd6ba54ca9469fab16301e3ac91de8fc79103619e769
+MISC ChangeLog-2015 962 SHA256 152e2263c7842b7f4f43b731b99b704b7a88094da3a7073bcd3fa2473548fc04 SHA512 8351a1055afa4fc8f82082148091953b7642ffe12b40257f0c551cde1b96ce837eb88a2d1e840b5e6408c22c079011eda19eae26235f93e5a4f593d02d9cac1f WHIRLPOOL 66f91b5f998968521fda0cb3843e44c6b3b643855454677351bd4d5d50acff0db18a005732e8e942c863e2363655fd2ae0d65a748ad70c4f243ab9b6c474df85
+MISC metadata.xml 548 SHA256 c4fd5ab679c9eb64cad7ecd1eb84ce6976f320308f5e2ce508cd5d870618612d SHA512 cd7c549b5130cdc08e12cccb5a0d68b5f19f2fddc97bce839c4dba5300608fe871663154ef0348623c52295e79d6efd6fd42580713a877430e82aa964b1361e7 WHIRLPOOL 589aad3517c4501aec1631b9425f45a5a130f590deab000eda9903429317cb095aa15ac5a78ff9cd3c6455bcc8d192bcf38a35b3708851d1f26cb55c173289c7
diff --git a/dev-python/lesscpy/lesscpy-0.11.1.ebuild b/dev-python/lesscpy/lesscpy-0.11.1.ebuild
new file mode 100644
index 000000000000..64bd846ea7aa
--- /dev/null
+++ b/dev-python/lesscpy/lesscpy-0.11.1.ebuild
@@ -0,0 +1,30 @@
+# 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
+
+# incomplete tarball
+RESTRICT="test"
+
+DESCRIPTION="A compiler written in Python for the LESS language"
+HOMEPAGE="https://pypi.python.org/pypi/lesscpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/ply[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]"
+
+python_test() {
+	# https://github.com/lesscpy/lesscpy/issues/74
+	esetup.py test
+	# This is equally effective
+	# nosetests -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/lesscpy/lesscpy-0.9j.ebuild b/dev-python/lesscpy/lesscpy-0.9j.ebuild
new file mode 100644
index 000000000000..73b241fcd605
--- /dev/null
+++ b/dev-python/lesscpy/lesscpy-0.9j.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A compiler written in Python for the LESS language"
+HOMEPAGE="https://pypi.python.org/pypi/lesscpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
+
+python_test() {
+	${PYTHON} lesscpy/test/__main__.py || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/lesscpy/metadata.xml b/dev-python/lesscpy/metadata.xml
new file mode 100644
index 000000000000..492fea94b855
--- /dev/null
+++ b/dev-python/lesscpy/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    A compiler written in Python for the LESS language.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">lesscpy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
new file mode 100644
index 000000000000..f04a12771587
--- /dev/null
+++ b/dev-python/libarchive-c/Manifest
@@ -0,0 +1,3 @@
+DIST libarchive-c-2.7.tar.gz 42299 SHA256 56eadbc383c27ec9cf6aad3ead72265e70f80fa474b20944328db38bab762b04 SHA512 809319cffc250130c1414885d4e2de399a8ba92f6025848f1423bde79eadc6f686f934f4b17fc0a90ea84379b94c5c38d4849b2b28e2e03f8d16548152dbc856 WHIRLPOOL d6de46b5df8a6997fe4e701345ec29ba47ac93970a9b7277a393e0a18470b6cc27dc90abb8b025351fa6b4568a613aa895e17d2578bc74e2da9df2f193d599fa
+EBUILD libarchive-c-2.7.ebuild 440 SHA256 3125d2d98494c40bf2de3a4e32684599bb9dc67200e71e9c78358ab7f9c8ddcb SHA512 a36ac3adecd9b288cc73768ccdac8f9ddc8e7f36b549f8f1d19002b709a24ebc2238c030d5a5a8f963fdc64ba55114be97064a6fd5eed409f3aaf95cd916a612 WHIRLPOOL 26327ac3df6cd04c9314dcd9c2e846cde73a2c9ef06072e8a4889d3031166b57282f8f0b15404ff8d452980a7c892537da3773185f86b5cac2be44b8f25ad20f
+MISC metadata.xml 561 SHA256 112bb6438d4855d0346638aae66615f8dc36d7729d34ed4801a9ddc7f7de2e85 SHA512 3aa3b727b62b12512e5b342cdfbebd89aef9c605204ac1869592d48a98b4384f1772234e1a4ca8ee5bb04b254e34e2f68962cc1154e4f7e4207fa3f2a49b5551 WHIRLPOOL ef618a2deb92c56fb8486c6adb7982ac14758aa37edd10807bcb2a711beecd0ba9c06dc008e22488d7b7e93c6faa14c47b2f5edf7a42941334e6855fe3257349
diff --git a/dev-python/libarchive-c/libarchive-c-2.7.ebuild b/dev-python/libarchive-c/libarchive-c-2.7.ebuild
new file mode 100644
index 000000000000..a4db4ef059b3
--- /dev/null
+++ b/dev-python/libarchive-c/libarchive-c-2.7.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+DESCRIPTION="A Python interface to libarchive"
+HOMEPAGE="https://github.com/Changaco/python-libarchive-c/ https://pypi.python.org/pypi/libarchive-c/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/libarchive-c/metadata.xml b/dev-python/libarchive-c/metadata.xml
new file mode 100644
index 000000000000..a5c0bafa9bee
--- /dev/null
+++ b/dev-python/libarchive-c/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <longdescription>
+  A Python interface to libarchive.
+  It uses the standard ctypes module to dynamically load and access the C library.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">libarchive-c</remote-id>
+    <remote-id type="github">Changaco/python-libarchive-c</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/libasyncns-python/Manifest b/dev-python/libasyncns-python/Manifest
new file mode 100644
index 000000000000..c17e03b92962
--- /dev/null
+++ b/dev-python/libasyncns-python/Manifest
@@ -0,0 +1,6 @@
+AUX libasyncns-python-0.7.1-glibc-2.25.patch 509 SHA256 d97ddcc4ffe5e383bc48369ec7bd7f846c4355ade9c382650f80ee89e134f17b SHA512 56270790454eddffc0a546a557f0360d637ce441e194b94d2a2af917ac42f25e9a7f376c739dfb93bdea1dfba5e6eb7a00a26507bf5c5814a77aa068a71b7521 WHIRLPOOL a64a7aaa1eff74a8b69e5797a69e7e1fbbd61df5098ff5f503fa4fb0b50ca876989eb468506a028c7e37ed699a7468a4216b94af66f63f8dd3b235aa4495a681
+DIST libasyncns-python-0.7.1.tar.bz2 20276 SHA256 0ff757f8d9bf1f07054ab7ad2d03434de4cfa6b9d6cb4bba29072728563894e0 SHA512 ac8bd46cb842e40bc0f3720a789fe17a6488d80bf68f5f60b3093708d9e5f91d8b0082255a77d37c1814232d46a4c44c58abe971ddbe54f881d8e6a78937f489 WHIRLPOOL 6b8cf9db88512fb273514617975ec18f639ff9f1443f7cfab267f34381d0ca9405842688fcd2f40d272f398c0970358c8852df21de8f9d24a9d3900d53ef4bc9
+EBUILD libasyncns-python-0.7.1-r1.ebuild 705 SHA256 5f723c0faa8c2115a82b6a6c79c491f6fd5668a05e70824a9206c46d8048ca18 SHA512 774aa92a83a7afd7e0b19ef47da45d34298975d502d1437e1840704446a3aec0229350f82fcfc5faa726f50c6510b1b6f5d42633f3fdedeb04c38abec942c99b WHIRLPOOL 0586da5650a90fbd0a148cd700dcd3984eb36e10fe1c4d4154f488b95902e4a1ac7fcf134c10e85d4465b0f5693c25d70cd550bb54329c24a7c8ded4a7888b49
+MISC ChangeLog 2717 SHA256 ae104847fe159cfd42ec5877b13fe89a67341ff06c767649f9680b8735dd33f9 SHA512 75aa8640ed1140dce192508dcec759c7ab437422d0d789e66d6f5bb6959350b70a5ec6982fcb8590250f1f34c6346e15bdfd063149df6e285bab8fda6980eb1e WHIRLPOOL 7a3ce5ca635831693d2bde176ab72227f616b2eab484ede97e653eb398f24b7c80e33f7695551433e2b26b7f23f120c02646c112350c029ee1d59368a23060fc
+MISC ChangeLog-2015 1543 SHA256 f95d749a946ad217364c373d6a7904e6323bd226bbbd59ef946f02261f56d639 SHA512 55200f1aa5142f141fe1c74b63b723951c8bb7dcb50ad57c07f64999931365587b302c7fc9cc2595a33866282d5524ad198904e0bb48c29f41b19b012573070b WHIRLPOOL bd036baa4bf20ee0ff30653bf00339165283e2abe0cbfb0b01b77d0b5c39514c6401c6f8d37a107338e9af3350240516d10da9ae3ed5c5b34c760f86cba537ac
+MISC metadata.xml 252 SHA256 f87312922eeb5360856a5384f61f2df1d7a84b9fbf9acac1c3c43a100a709160 SHA512 ea1f58fbe07f5912fc69ec2182812dde68f0b5d38a03daeed9d22e0bbf4fdd6fdebad11674a0b51ed7d5b85abdacc64afebb8883dded1cbd0e9b767ebc9f283c WHIRLPOOL 6a54d3f0363bf0ff064bdbf0eb61348d448f4c75df7f1408e23a5b8b77cce8c4678f60411e813a7d307bb0159ac003056e5d7317f7de54043773b6da7d625819
diff --git a/dev-python/libasyncns-python/files/libasyncns-python-0.7.1-glibc-2.25.patch b/dev-python/libasyncns-python/files/libasyncns-python-0.7.1-glibc-2.25.patch
new file mode 100644
index 000000000000..6ec84aa732b9
--- /dev/null
+++ b/dev-python/libasyncns-python/files/libasyncns-python-0.7.1-glibc-2.25.patch
@@ -0,0 +1,14 @@
+https://sourceware.org/git/?p=glibc.git;a=patch;h=4f157746e0c713965d9143b52fef606312087c48
+
+diff --git a/libasyncns-python-0.7.1/libasyncns.c b/libasyncns-python-0.7.1/libasyncns.c
+index 99a73de..5e3da0b 100644
+--- a/libasyncns-python-0.7.1/libasyncns.c
++++ b/libasyncns-python-0.7.1/libasyncns.c
+@@ -134,7 +134,6 @@ PyMODINIT_FUNC initlibasyncns(void)
+ 	ADDNSCONST(ns_t_mailb);
+ 	ADDNSCONST(ns_t_maila);
+ 	ADDNSCONST(ns_t_any);
+-	ADDNSCONST(ns_t_zxfr);
+ 	ADDNSCONST(ns_t_max);
+ 	
+ 	ADDNSCONST(ns_c_invalid);
diff --git a/dev-python/libasyncns-python/libasyncns-python-0.7.1-r1.ebuild b/dev-python/libasyncns-python/libasyncns-python-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..2c5ab37721e6
--- /dev/null
+++ b/dev-python/libasyncns-python/libasyncns-python-0.7.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for libasyncns"
+HOMEPAGE="https://launchpad.net/libasyncns-python/"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=net-libs/libasyncns-0.4"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.7.1-glibc-2.25.patch" )
+
+python_compile() {
+	if [[ ${EPYTHON} != python3* ]]; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	distutils-r1_python_compile
+}
+
+# Tests are network-dependent
diff --git a/dev-python/libasyncns-python/metadata.xml b/dev-python/libasyncns-python/metadata.xml
new file mode 100644
index 000000000000..da06078f5866
--- /dev/null
+++ b/dev-python/libasyncns-python/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-needed -->
+	<upstream>
+		<remote-id type="launchpad">libasyncns-python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/libbonobo-python/Manifest b/dev-python/libbonobo-python/Manifest
new file mode 100644
index 000000000000..9e7c0498a494
--- /dev/null
+++ b/dev-python/libbonobo-python/Manifest
@@ -0,0 +1,5 @@
+DIST gnome-python-2.28.1.tar.bz2 562220 SHA256 759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8 SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2 WHIRLPOOL cd4ea19fabd26c55866d8789628fdc3c834e73932381431216d65c5e9b42ad529e83f74d498951f07f060d3049f1739b6db99dbdbe34575eed469ceb23a51c5b
+EBUILD libbonobo-python-2.28.1-r1.ebuild 774 SHA256 d15ba7082f0bc1d362daa826b007c3d51791596e29d23d82a0e3acd9e89ae5bd SHA512 a9300936abf32d375549fbb2a228d04d8ceba9b1f729023b7ddc7140d6c0264f95599f4d843c30f060868a4c3501acfb8eb81005953e223ed8779521b60359a8 WHIRLPOOL 52251d98f1098bb07d8d15351c711f690a63b2513c4eb0ec75f73157eadd040db3bb47e3ab1963ec3cb30578869c07a9834553259afd66a874c4abdfb0db3824
+MISC ChangeLog 2464 SHA256 281f1be3a3f5c5a192987046ccb04c746100b5629bb2127d63b3d9f06d27f20c SHA512 4217cde6ed1fa677742b2716726d210633ecf378a110af6d531b050fde9c81fa7aa10c2b6c3c8638e44ff852ee02ec8259e2a1aaac2f0a6d575759ad65c09345 WHIRLPOOL 38aaea8c71c3c0991dc031a6cdefbac4d7cae2f988af5147fe783045995308555cce463f8999f341c50f1e39af8b0286d2c3799134d489dfaf4e61b23b6c61db
+MISC ChangeLog-2015 6370 SHA256 3a5cfaab46553ed4690105d721b7030b0e2ecf6e72f7317e17ac438e26d4bab2 SHA512 caa0a15628f3b8731b480181db008571f2465abd1109e111ce1b4994ab8b12c4885eea6d6027422078b750b9208751b54d31637434fe0036c1f34fdeeef46424 WHIRLPOOL 82f72d43ac78d4f0c8782779cda356c065f2974df2a9a67c584d03328ca2bc2ab62b0dc2d11261d25111fb5f0b8cdcf40f1764a47d62ac28bd9ca3ac1d70be26
+MISC metadata.xml 346 SHA256 e03340f54524c1be70afcd11b77ee1249143b59b69d9668673f9ed55d3002a9b SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77 WHIRLPOOL 97cde96f56111c4c355d88d8f353c1daea1012183c43b6c29ef6dd7f07bbf2b14a1477c5edaae58c73c604a05543e2a67e2ec51c439bf43e7a3ddcd577ee2606
diff --git a/dev-python/libbonobo-python/libbonobo-python-2.28.1-r1.ebuild b/dev-python/libbonobo-python/libbonobo-python-2.28.1-r1.ebuild
new file mode 100644
index 000000000000..d9bddee22707
--- /dev/null
+++ b/dev-python/libbonobo-python/libbonobo-python-2.28.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+GNOME_ORG_MODULE="gnome-python"
+G_PY_BINDINGS=( bonobo bonoboui bonobo_activation )
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome-python-common-r1
+
+DESCRIPTION="Python bindings for the Bonobo framework"
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="examples"
+
+RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
+	>=dev-python/pyorbit-2.24.0[${PYTHON_USEDEP}]
+	>=gnome-base/libbonobo-2.24.0
+	>=gnome-base/libbonoboui-2.24.0
+	>=dev-python/libgnomecanvas-python-${PV}[${PYTHON_USEDEP}]
+	!<dev-python/gnome-python-2.22.1"
+DEPEND="${RDEPEND}"
+
+EXAMPLES=( examples/bonobo/. )
diff --git a/dev-python/libbonobo-python/metadata.xml b/dev-python/libbonobo-python/metadata.xml
new file mode 100644
index 000000000000..e4e250dd8100
--- /dev/null
+++ b/dev-python/libbonobo-python/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
new file mode 100644
index 000000000000..03ba739f8bd7
--- /dev/null
+++ b/dev-python/libcloud/Manifest
@@ -0,0 +1,7 @@
+DIST apache-libcloud-0.15.1.tar.bz2 570953 SHA256 557e3f29e0ab1f19a31e858a8e802c822cb7f07df5edce029a1c67d2b0f30d15 SHA512 0cbc02c955cb91e135d73a5198ad216d0f91fa942b88dd1ffc1c46a487190f45500f003d2825cdb4f6c96c4ca7e5cf2681709769b0c2d8801b08e5a41b3d69b0 WHIRLPOOL 0143a7d2c337603f769bb2d3fd4fb98df18c82dfaa09c12fe481f18eb300c65d9efd4e18756d0c75a691b6d755fff0f62d41ccda3c9006955870fb8631d8366d
+DIST apache-libcloud-1.2.1.tar.bz2 992983 SHA256 1f4f607855c1ff5d88dc709849e746a2213d99c6dfc7054244af8be1caf79062 SHA512 12e239f286d8eb523597488998582be02d6e8cd4e21a8fa7c639c829ba622833e4292ac4cd7cbc8b94670e19ec1711cb0032bc72433f421bf2ba2b8c70dcd954 WHIRLPOOL fb9574bfa81e08d34cbce6b96988425cf9b0aa44202397bf345383eee95e564de1427581cc3cb0095ea37912b64a40c65e1ca55383bac9a27ddce4ef63f4adbd
+EBUILD libcloud-0.15.1.ebuild 1062 SHA256 af94edd09255884fb7b5ae24c16376497d2962d8dfa7cf53f29584512ab9ce96 SHA512 443b4f6d3f66169d0b54963dd7b804f9918bd5ac8c3e61d2e53efb9f015e41ea70ab3cae6012406b0eac4c61efe382c506727c1af2006eb6430b6294dd96cfc7 WHIRLPOOL 75408720caef25f1420baa814c8ac4fa8bef36d7a192f40cf9d65714b70f2ea8e525bbf1c74eed9d7e377414c330154bd93eb036f53630d5d78da5dc562c3816
+EBUILD libcloud-1.2.1.ebuild 1173 SHA256 f915f2a42b4d8c5200297555ff9c1bcb9ed74501ad903949e1fe26797d8fa03e SHA512 46a0171b1a4c021025d17120f0b99cfc4728b3329206b24c51efe5266bb7e2c8be77512f86ab116bbcff6f61755dd1259c6996025b9df1af81e27f5fa1574cf4 WHIRLPOOL 2f966e8c0d54bd23e08ccfcd7e8586833085e0d6cad8840d936be2f885c2ecdb487ae7023e7284707791dc972f9bff0f2109ca4fa73d80818f69c3482fe3d67d
+MISC ChangeLog 3283 SHA256 0bd397acf6b1a13c2145dc129f08456189ed9e533f52c4be2ddd44ae201e2c72 SHA512 84267f934cbc8b24db3c79763c83368ef167c0298f9d358a8586526bb408af216952976c3324b490dda5ae3c446d1cb58578502718890ec2418e7ec1469331af WHIRLPOOL a8e505ad82a8073342caae444b0c62b971de375f719a14861ddb087c1910d9aa6508c4d3c649a5f736a5f61d8fdbb9112b80998d675f1da9324750bd9a95441d
+MISC ChangeLog-2015 3296 SHA256 e997d4fe07d8a51bb3caf7ceb94160d9f3e563ecc95a8e33b62dc6a2bf349079 SHA512 4ea2fd458e4ca22efe545d8829b9cdfa624de21066e360422ba4059d472df1b7e54c26b34f5bbddb0580394c1d0ab7e36182e72867174f9f0c3974a087067fe2 WHIRLPOOL 92491e1b35684895e4d154dd6db3e7aa20515f6ba736190927cc4eed0fd371a75823164c943389241e37b3b89ae20f2672a97f395ddea6bdd125cbfa559342d7
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/libcloud/libcloud-0.15.1.ebuild b/dev-python/libcloud/libcloud-0.15.1.ebuild
new file mode 100644
index 000000000000..604905a8f5b6
--- /dev/null
+++ b/dev-python/libcloud/libcloud-0.15.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# py3 dropped due to failing tests once lockfile installed
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Unified Interface to the Cloud - python support libs"
+HOMEPAGE="http://libcloud.apache.org/index.html"
+SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/lockfile[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/apache-${P}"
+
+python_prepare_all() {
+	if use examples; then
+		mkdir examples
+		mv example_*.py examples || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/libcloud/libcloud-1.2.1.ebuild b/dev-python/libcloud/libcloud-1.2.1.ebuild
new file mode 100644
index 000000000000..0d4c1eb35030
--- /dev/null
+++ b/dev-python/libcloud/libcloud-1.2.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# py3 dropped due to failing tests once lockfile installed
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Unified Interface to the Cloud - python support libs"
+HOMEPAGE="http://libcloud.apache.org/index.html"
+SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/lockfile[${PYTHON_USEDEP}]
+		 $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python{2_7,3_4} pypy)
+	)"
+
+S="${WORKDIR}/apache-${P}"
+
+python_prepare_all() {
+	if use examples; then
+		mkdir examples
+		mv example_*.py examples || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/libcloud/metadata.xml b/dev-python/libcloud/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/libcloud/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/libextractor-python/Manifest b/dev-python/libextractor-python/Manifest
new file mode 100644
index 000000000000..7029fb3fa741
--- /dev/null
+++ b/dev-python/libextractor-python/Manifest
@@ -0,0 +1,5 @@
+DIST libextractor-python-0.6.tar.gz 4086 SHA256 9a4f9a7049765bbc253be324cab2f774848e1bbb5542868f3b3686934139d9e9 SHA512 38300177fc55183fb70068d9af69f0530b8729ca92056ebd77f06d11e855e983aaf9fe28c0f9a77ffe2d6375ae769dafba847d959809fd43892f518c4ecf2d18 WHIRLPOOL 2383be0860a2977f307f37206390a51db2bea2fd63013dbc3f0dd12eb0bb6ddd26de51c038d9cb73e6fa4aabe1b7c695c5ce00299fe69fcb830f8e7bcef198cb
+EBUILD libextractor-python-0.6-r1.ebuild 551 SHA256 26798232bf3bc201ab1b51119b6fa8c2fdf6008e3158770927ad7acb7fee310b SHA512 92dde8c89e0e7890b02859fc05dbe28fdd0888fd15fe1c2ceb09da2ed67f9ab3fffdb1f8ade1f24eec274ca1dfbcd71364a8c1e386c553b9fcb8de577ff07c0b WHIRLPOOL d6e152ee0678ba7ee45d1fd5083a940871b0b8259a0d363a30ed0e8c5ab831d8f2d451ce14c96e6e4fd17837c2b6f9a56991bfd1de9d0a54490f1a538d0db520
+MISC ChangeLog 2757 SHA256 56b79fd7d7f3fe7b356d4c216c13d7bd8828f22067da006d5cfaf5b0146f8fc5 SHA512 15d9e736ba8d3ad93959a92f6ab3adda29cc9cc9ff3370d5b11da8dd01dd98cd7dd1664e49e68c80d97c29bf21ede65b097d6cba4710f0587b20cdc534297421 WHIRLPOOL d3a583c78b4d35084d8a5b49dea83f296bd48462da137d3d1b09c6c6e40e7f3754ab8951d03a3fd9abc993cfd9b8d00682a92cae0115c7090906472d35e27022
+MISC ChangeLog-2015 1273 SHA256 ad6725401b540792a7eb384f8e9853ea1fc3f48ec577ce56406d1127f9316fb3 SHA512 f202cd795738615beccd564838a9151812bd66470abc3f6b0c657639c4d0b643c188cb3b0761866545f9dfb68aa03b7f3fd79e2ec5843fdbc14e790983d315cc WHIRLPOOL 8397f1ec421cf1e4b65c66663fbf9aad22f954c6dcf66bce89fbb7b5b539519df0831f83d3d7119bc0735b387d44b96284de968d06a61a63679e5b7a90efbe77
+MISC metadata.xml 244 SHA256 3d44e2f8a9488e7d4de4a5c1dfaadda66e2ce4eede21e598cedbd2458f85e607 SHA512 a136c69dc1c7476ecf5837cf1556617148c5160b0f4f0f796451b8dcae337b67725c6d53ab38f1fa81d46519f30163b3899827449696df61ed1ccb3025773d72 WHIRLPOOL 4205ea1d3f1ab1bb3f4aa0f643e497294011fe4c6e6ca28dcf4042a81b8ffb73be0f90b89ca4342990796b3dadcd789a6b5bc15f74bbf4d7dafd0da4a3ce6db0
diff --git a/dev-python/libextractor-python/libextractor-python-0.6-r1.ebuild b/dev-python/libextractor-python/libextractor-python-0.6-r1.ebuild
new file mode 100644
index 000000000000..d510df6937f5
--- /dev/null
+++ b/dev-python/libextractor-python/libextractor-python-0.6-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A library used to extract metadata from files of arbitrary type"
+HOMEPAGE="https://www.gnu.org/software/libextractor/"
+SRC_URI="mirror://gnu/libextractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libextractor-0.6.3"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/Extractor-${PV}
diff --git a/dev-python/libextractor-python/metadata.xml b/dev-python/libextractor-python/metadata.xml
new file mode 100644
index 000000000000..de8326e467c2
--- /dev/null
+++ b/dev-python/libextractor-python/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/libgnome-python/Manifest b/dev-python/libgnome-python/Manifest
new file mode 100644
index 000000000000..8659622e7b40
--- /dev/null
+++ b/dev-python/libgnome-python/Manifest
@@ -0,0 +1,5 @@
+DIST gnome-python-2.28.1.tar.bz2 562220 SHA256 759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8 SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2 WHIRLPOOL cd4ea19fabd26c55866d8789628fdc3c834e73932381431216d65c5e9b42ad529e83f74d498951f07f060d3049f1739b6db99dbdbe34575eed469ceb23a51c5b
+EBUILD libgnome-python-2.28.1-r1.ebuild 860 SHA256 afebdbed36ffd3fa7fd34f88ad906911d1adaa7eaa96877e4b208329e8b1be67 SHA512 29d21d13d571407ecc76bc44cef6f13a723bb89e955c553fd41188c227ac99372c6ef2e79359d2665dc56ef8d0586697056c45f90c0b42a974fe695e6f93a0f4 WHIRLPOOL d41cdcef9267b8348909eb990b8bdd13280ce3448f80c29f52168f502111db327d5a8678b7252cb4dac36cabff1cebde9843f25ce707406995b951d9b98eb579
+MISC ChangeLog 2461 SHA256 ad5025c35a767e593615599684174f62c9f023f1b15b792992d95e65bdff3fd6 SHA512 e8ffa73452eceafa5eea929b136f00ac271a785ded3412977cfe76478a2740b83b8d4ab3b8478cf90a1aa26daf3a0104785b973d79ccaf9951fabf7356f6e0e0 WHIRLPOOL cb92a8685d867d00b4a2d94fb9f3fd031dccfe64014e6bf014e5e85a4f89cd5435d13d50535c96dd2b082442ede301b014fa31a8c08eeca785476b3cd43fbddf
+MISC ChangeLog-2015 6304 SHA256 7588861f0604121ec2221769084d4e1fa31064fdfeee685bbd2c6bd8d4791bd2 SHA512 07bfb8defd80e6ace3b948801dcbece607c23281cf210798bc8e5fdb543375449816620bc5095ad565d4dda161b5c78094a53bdba9dccd2940a5ab23a58a5bc1 WHIRLPOOL 46f1afe2b1e8c70b1add6a45166db574e5164bd797b1d649ab9db633522b86e0753e93def72351e63abb70a8b6b7fc13c73531e3b8056ffb3d00319a3bc2a1ae
+MISC metadata.xml 346 SHA256 e03340f54524c1be70afcd11b77ee1249143b59b69d9668673f9ed55d3002a9b SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77 WHIRLPOOL 97cde96f56111c4c355d88d8f353c1daea1012183c43b6c29ef6dd7f07bbf2b14a1477c5edaae58c73c604a05543e2a67e2ec51c439bf43e7a3ddcd577ee2606
diff --git a/dev-python/libgnome-python/libgnome-python-2.28.1-r1.ebuild b/dev-python/libgnome-python/libgnome-python-2.28.1-r1.ebuild
new file mode 100644
index 000000000000..0f3c3d1edc5d
--- /dev/null
+++ b/dev-python/libgnome-python/libgnome-python-2.28.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+GNOME_ORG_MODULE="gnome-python"
+G_PY_BINDINGS=( gnome gnomeui )
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome-python-common-r1
+
+DESCRIPTION="Python bindings for essential GNOME libraries"
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="examples"
+
+RDEPEND=">=gnome-base/libgnome-2.24.1
+	>=gnome-base/libgnomeui-2.24.0
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	>=dev-python/pyorbit-2.24.0[${PYTHON_USEDEP}]
+	>=dev-python/libbonobo-python-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/gnome-vfs-python-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/libgnomecanvas-python-${PV}[${PYTHON_USEDEP}]
+	!<dev-python/gnome-python-2.22.1"
+DEPEND="${RDEPEND}"
+
+EXAMPLES=( examples/. )
diff --git a/dev-python/libgnome-python/metadata.xml b/dev-python/libgnome-python/metadata.xml
new file mode 100644
index 000000000000..e4e250dd8100
--- /dev/null
+++ b/dev-python/libgnome-python/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/libgnomecanvas-python/Manifest b/dev-python/libgnomecanvas-python/Manifest
new file mode 100644
index 000000000000..ead2d3fc094a
--- /dev/null
+++ b/dev-python/libgnomecanvas-python/Manifest
@@ -0,0 +1,5 @@
+DIST gnome-python-2.28.1.tar.bz2 562220 SHA256 759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8 SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2 WHIRLPOOL cd4ea19fabd26c55866d8789628fdc3c834e73932381431216d65c5e9b42ad529e83f74d498951f07f060d3049f1739b6db99dbdbe34575eed469ceb23a51c5b
+EBUILD libgnomecanvas-python-2.28.1-r1.ebuild 618 SHA256 0a954fbbe67c1a8730344fc0370738fe726db0a0cbd783be7d1c498a8ed68a13 SHA512 90346ddc6909ffe4d9090f25ec955b4172cdb8a0224e85c225743018e8bc5caa207bdd76dad4555ef832228f18e6c909d43b3ca010f2aada4a05d6b6a3827dde WHIRLPOOL 8479bc1dfaf05dee2657244b0d387b929cb28d41269c9c1bd07a4a9ff3dc92b3f041440bdf1612bcfca469f3a8531d787327a6baeaf0d4152867eb81e6ee6e47
+MISC ChangeLog 2479 SHA256 460892ebfa4de9ac5b148f574e4a275a42cb85c52f580cead2b328b3f069c492 SHA512 e7dadc285aaa03627d5eb37450e24aacb7ab839b78f681d79b962dd32cca4a7fee0faf19a0f4b4f2163d771020dabfe25b7313cab6923a9a2f084cb999bb7818 WHIRLPOOL bbe9f3251c905b6f98b9e15cddb47deeaaca8f601764d71fec7a1b406d198c83d48b785c9405816dd2b7f41f01bc17fb671f075ef3df768b64e587e728b7a181
+MISC ChangeLog-2015 7179 SHA256 20d23fbc6f63b8bc6a9a564e4ac6aa4537e4d0a73b28eea4876ada4b827ff59e SHA512 8cc967e040a2275877c07413d0b89665b484f2b947bd8b148276b8906cfa3f4a3d4b7d9aabb1d404e0d3cb0d052a2c6360829a9cd11270defcc22f1a8c2b7800 WHIRLPOOL 4ca12a61c1bc3a784b511caf7139e8f26695f87636dab2fbb15872edf6d2c0d120cd588f2095ff62127775392e042b4e5496c6bafac1a69d2c54378a76f4998d
+MISC metadata.xml 346 SHA256 e03340f54524c1be70afcd11b77ee1249143b59b69d9668673f9ed55d3002a9b SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77 WHIRLPOOL 97cde96f56111c4c355d88d8f353c1daea1012183c43b6c29ef6dd7f07bbf2b14a1477c5edaae58c73c604a05543e2a67e2ec51c439bf43e7a3ddcd577ee2606
diff --git a/dev-python/libgnomecanvas-python/libgnomecanvas-python-2.28.1-r1.ebuild b/dev-python/libgnomecanvas-python/libgnomecanvas-python-2.28.1-r1.ebuild
new file mode 100644
index 000000000000..ad3f33373827
--- /dev/null
+++ b/dev-python/libgnomecanvas-python/libgnomecanvas-python-2.28.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+GNOME_ORG_MODULE="gnome-python"
+G_PY_BINDINGS="gnomecanvas"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome-python-common-r1
+
+DESCRIPTION="Python bindings for the Gnome Canvas library"
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="examples"
+
+RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
+	>=gnome-base/libgnomecanvas-2.8.0
+	!<dev-python/gnome-python-2.22.1"
+DEPEND="${RDEPEND}"
+
+EXAMPLES=( examples/canvas/. )
diff --git a/dev-python/libgnomecanvas-python/metadata.xml b/dev-python/libgnomecanvas-python/metadata.xml
new file mode 100644
index 000000000000..e4e250dd8100
--- /dev/null
+++ b/dev-python/libgnomecanvas-python/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/libiscsi-python/Manifest b/dev-python/libiscsi-python/Manifest
new file mode 100644
index 000000000000..92509f4c88c1
--- /dev/null
+++ b/dev-python/libiscsi-python/Manifest
@@ -0,0 +1,5 @@
+DIST libiscsi-python-0_pre160211.zip 110062 SHA256 5165edc59a696b200c5572a21a4fcf258d7cde32983ad56e0b92e2ca71ec4e37 SHA512 c3f3742d2471f038c93ccd61e3eccf0431242988bc1237e3a0047518fb1eef71c5092735bc323452fae2219ee5a89de1fe098cd1170174934b547b44319d465c WHIRLPOOL ea4034821f6540516132df8e005b4910281091b4b8b5d2d5bf7e4044b5437f74c9e137e530b0982f0803e81a6185a6a03120ba2b3cd7f266607f493a3fe106b8
+EBUILD libiscsi-python-0_pre160211.ebuild 604 SHA256 892511ef56093ebbb0bcea0476d787dafd9ef202bf496bf0d813fbf76f0ef8ca SHA512 bddcf23ac76f82f72892a038881faf2ae9cfc74b32e412fc6778d0de7d482ffbaa2dcdff67962f1d3ae843655db0c387e3d323277844d316a2ec30f8c7e2f6a6 WHIRLPOOL 824cf1892b8cf56710fa9725ca7c635d7d59f8afad631dc043257ad4d5e914eb150fbae8cd0f6034ffc7331217863d783a6d4fe0cb998ade95d25e84ab5301b3
+EBUILD libiscsi-python-9999.ebuild 486 SHA256 82d1765e0500b663f69eb1f5e95e3cfe9e054d38994691c981e6185e2ea02219 SHA512 5efcbd0c9968f40b0eaa584e9254f060ef2bf4207205f97e1224e830d4a56944156bffbfe21e692723ccd6754c0791f8fd2727a08ccfa4caecd252c4da2505ca WHIRLPOOL 8ec9fe86cbb3f1fce035396701b76e146b05daccf0fe7eacf1edd07eaf685fb07ec3db63e99d62051905c36e47f6f7272244d688ae1b06878ee42e7cbc33234d
+MISC ChangeLog 838 SHA256 911470c12a7caa5bfe416fe398a6db3b3d571308eba3bc064705dbf44a361fc6 SHA512 69b0b847f728067c84885d9d1ad0f97b962fe7c17868cbe163ba8b5678c83ec7ceda9d0ac516f83e26cf1bcf40aac31411a434523b8ef624fca0fc0b9dbe5061 WHIRLPOOL 8a797c7485c449c0456ecdcb0880d6a9edf189f25705224b0109a82c442d553fd60475bc8b150ba38459895c83f18f39fe9fedd296a9385c4e7adcb60ec4b2ce
+MISC metadata.xml 339 SHA256 f2ef11227d53fd44b0399295e9f18a690b4705e9e38766b230d8dff9ad007204 SHA512 6773ced8ea8929c32ef44908b453b227d9abcdf3c0b051d37234885c05bec7d18a1ad68efc3f413e0678b60a819ceba10f84b0819c6a5a80716358caa5000258 WHIRLPOOL 696afc6317f16c56c5380e7cade2d5540798e39e7e1a993b0e85924e29b53587922bbac98190020122afd87082cc894c0e0ba28a7a3ad5373c3446cef90c668d
diff --git a/dev-python/libiscsi-python/libiscsi-python-0_pre160211.ebuild b/dev-python/libiscsi-python/libiscsi-python-0_pre160211.ebuild
new file mode 100644
index 000000000000..34501cb59704
--- /dev/null
+++ b/dev-python/libiscsi-python/libiscsi-python-0_pre160211.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+HASH="a8f548c2700dbe3dadfe048fa2491c7b77cf7846"
+
+DESCRIPTION="Python bindings for libiscsi"
+HOMEPAGE="https://github.com/sahlberg/libiscsi-python"
+SRC_URI="https://github.com/sahlberg/libiscsi-python/archive/${HASH}.zip -> ${P}.zip"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="net-libs/libiscsi"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${PN}-${HASH}
diff --git a/dev-python/libiscsi-python/libiscsi-python-9999.ebuild b/dev-python/libiscsi-python/libiscsi-python-9999.ebuild
new file mode 100644
index 000000000000..df01ba0b65fc
--- /dev/null
+++ b/dev-python/libiscsi-python/libiscsi-python-9999.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Python bindings for libiscsi"
+HOMEPAGE="https://github.com/sahlberg/libiscsi-python"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/sahlberg/libiscsi-python.git"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="net-libs/libiscsi"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/libiscsi-python/metadata.xml b/dev-python/libiscsi-python/metadata.xml
new file mode 100644
index 000000000000..910f4e214bc2
--- /dev/null
+++ b/dev-python/libiscsi-python/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sahlberg/libiscsi-python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/liblarch/Manifest b/dev-python/liblarch/Manifest
new file mode 100644
index 000000000000..bbe4e7faa904
--- /dev/null
+++ b/dev-python/liblarch/Manifest
@@ -0,0 +1,5 @@
+DIST liblarch-2.1.0.tar.gz 26829 SHA256 f55b8ce2c6350b614f46acf826c323b03bd64890288dd25b31cda3ccdb59d49b SHA512 fd6a6c48142e434f49fb49d9dee874b88f013775c280dd2dc929ed5fff4df7bd3743bf915b09dac4329f894cac24e466d78366a072136de389725bc5ed985ec1 WHIRLPOOL b2e34e15d5dd523597cc369fbfec6c02a8785b34c6fec1035a0995714aecde2c4dfe92ead1b1b60cfed81a725f85af7e604eda25fa46028ab36d0b8e73bd8485
+EBUILD liblarch-2.1.0.ebuild 626 SHA256 7ec5b2842c3f66204402b8ba030e3462d7bbbb54428c8837f008800236e74fbc SHA512 e137786e5f705db99a1de668ccb2bb99c215d3a348bd61e3d38597837a5642f57e44214016751da48fd88eae7bd863b2e8d4c9e52a4429b20b2f51ccdeb2d4cc WHIRLPOOL 433897d18e86befbcbab14e165ae8ca9091f0b356384e87f222e64686ac89bad7739f43c495bf5e5e4871717a65a1cf9debd5ee51cb847d02890f0dcf247acc5
+MISC ChangeLog 2352 SHA256 0108be4357696cfa75451b33f39df4e3d885f7942fcd7cb010dc1441cd1e2ae1 SHA512 b0dc1dbe5d204a87a05bfb6cd3d07510bed29a86b3efd9c0dac413727c46a14408709d91dfffb69c2689271bbe9a0115df94be1233ac94326ee24229805dd09b WHIRLPOOL 51890ce00367dba0276f0a4b294a60974be87349a127fb94d75ebc4452d1f143dac22815ebe00540ed305a3920d30cf6bd3372d6b4e857e511d8927d9396969d
+MISC ChangeLog-2015 494 SHA256 30767d9ec2bfced5d4f17ec800ec34205804002606cbcf13c7d20b1b5b7b17f0 SHA512 15d7fa7b9df3a6917b4796efa97a9672dd32e1749c00c1746b93f49214c4397e1fcadb0dc7b0a99e993cb93651f2aaccd1334646e286023245a47225e8625e96 WHIRLPOOL 6493eb200ca757a538e7cff41f23664e2f2de8253de9c510f10a14048ac3d299135e6913e6d688c3fd5ec6b5fd243b4b3d6ac6c749038db3e03edbc2f0f6f48b
+MISC metadata.xml 956 SHA256 fd7a48d17caaa9dc3a249fc27e866467d361ab8aea3f1f8a606b887a401008c8 SHA512 889cb88e102b063e3629e031f7c6d39b1a883cae96bdcd2f9bf97fb45cff9fe86df13f22c706cc79d172f47ce6ada406f133bc278471b5e987e3fed98e67a695 WHIRLPOOL bb5226c0d16f9f1a334a5ee766f6a3d3ce0aeb5c9810a157e8097165cdc9fe1e89f107bba631cfd1895077e117954f22d003a9d1c034874042c6efc461e4fefe
diff --git a/dev-python/liblarch/liblarch-2.1.0.ebuild b/dev-python/liblarch/liblarch-2.1.0.ebuild
new file mode 100644
index 000000000000..2bba1e2d90f7
--- /dev/null
+++ b/dev-python/liblarch/liblarch-2.1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to handle directed acyclic graphs"
+HOMEPAGE="https://live.gnome.org/liblarch"
+SRC_URI="http://gtg.fritalk.com/publique/gtg.fritalk.com/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+# This is what should be run if tarball included testsuite
+#python_test() {
+#	${PYTHON} "${S}"/run-tests
+#}
diff --git a/dev-python/liblarch/metadata.xml b/dev-python/liblarch/metadata.xml
new file mode 100644
index 000000000000..c2ca3019dd88
--- /dev/null
+++ b/dev-python/liblarch/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>eva@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>leio@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>steev@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		Liblarch is a python library built to easily handle data structure such are lists, trees and directed acyclic graphs (tree where nodes can have multiple parents). There's also a liblarch-gtk binding that will allow you to use your data structure in a Gtk.Treeview.
+
+		Liblarch supports multiple views of one data structure and complex filtering. That way, you have a clear separation between your data themselves (Model) and how they are displayed (View).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">liblarch/liblarch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/libnacl/Manifest b/dev-python/libnacl/Manifest
new file mode 100644
index 000000000000..5733742c896d
--- /dev/null
+++ b/dev-python/libnacl/Manifest
@@ -0,0 +1,11 @@
+DIST libnacl-1.4.4.tar.gz 30965 SHA256 f2ee401a78dc693fcbc2051befcee2f76bb13ce75a933420646abfa47a39a6db SHA512 dbcf16b308bad85195a96d538a116a915876a049efcd2e4a333d16a57cc59dc28fe85b2cc2c6ab036360bfd0b93ce4d1a1c0323046281dc35d290e9f12253470 WHIRLPOOL 02468a4dda407df3fd958c4dd9fc8f288a990899d6571a7b7454eb44da55e74ffd058f443dbf4764de42da87020759245b15acf4a3d7fc345508a64f7447a8f6
+DIST libnacl-1.5.0.tar.gz 47386 SHA256 1af2bc9fab80bd264ed224d9c4cacb0514db2f202eca5a4d90da3b06ba2000de SHA512 72c6041e14bf705d6d3b0fd0b77b1b1c7f4a86653113f56fed6b4e20369ff8b79ee1ea23179661299c51f13602dbc3f33e98bab0f6b8080d40ad75253137391f WHIRLPOOL 97795c28cd6437736e94a2e9faaac79a71c21e6b19ec5d652a2fb0616177f25ceab57bc8cdb4bdf7a0a20588f8dbe4d7f6808be4f905628ed1bf39e47ffa7855
+DIST libnacl-1.5.1.tar.gz 49383 SHA256 e44e9436e7245b0d8b7322bef67750cb7757834d7ccdb7eb7b723b4813df84fb SHA512 8bc5e0e15b35814249b69b6c1270fdf2c45af808c3315a6499b25a4861f0b21fe1840630a08cf808c8dc840f417736dee9d020d21d5d1d697b8644bc2645b12e WHIRLPOOL 0b4ec73546e3976a9fbca79db6e5bcbea5f90de202e3f83041c7b271f9f95d23980fe8020eb3505e8339c3b03d1dbc4f11b649f9b61979d5e86a9fdb4dbc6d46
+DIST libnacl-1.5.2.tar.gz 49573 SHA256 c58390b0d191db948fc9ab681f07fdfce2a573cd012356bada47d56795d00ee2 SHA512 f5d0827b621c0ddcb61041c3bb665d2c70f5fa400691128134d519fe454439648e7b2e36ab73b0cc827032461ad611e0834655c2f75e3cb3b53063c33aba8c1d WHIRLPOOL 926b6ced7bff0411ae3a4d060459f255fcc4af0eaa3fb41fc9cf60c7b93a0b8fb8128715ec2eb7160904e9e32267bcb3bd57ad91791229da8d906e0c07a6c92a
+EBUILD libnacl-1.4.4.ebuild 514 SHA256 5014e1f8afefc4923967992f5dcdb2a2797b92a6beff41847dcd9edc45a2d5b0 SHA512 2d1cde34848085f3388246464ef19deb02a92e2de16413fb539e086a6c61f28b553f3b1ccfb1410455618151f48c69bb5062e5adc5ff76efcf39eeb55fbdc318 WHIRLPOOL 9f265f5d41ddc8e58e0515565bacd51f08cdad37427f7a2ee31b971aa7278d5cf134743bd557ac7c648e063dc61e60d71cf91292eb7fc4e8cd21bc5974e69084
+EBUILD libnacl-1.5.0.ebuild 520 SHA256 733aa1dcd118b1eaad3618dc6b1ae964279282b244ce8f28bb322f4e6c1867f4 SHA512 ac3d78c6d234b56213fe46025d56fdac38b4ba2e8cde29dd4e085795c090d70f00409d7444dae13c75116e230269cecd8d3d29e524f70c2d6c129c840c9542bf WHIRLPOOL 668fba0c4a543f6278ffe4b3d4aa2d62d4ee0448fee72c4f4c5edb80b12bc292d06deaa51426953086daeeb90ada34f6fed5dbda9083ee248e8bb94dfeece4ff
+EBUILD libnacl-1.5.1.ebuild 520 SHA256 733aa1dcd118b1eaad3618dc6b1ae964279282b244ce8f28bb322f4e6c1867f4 SHA512 ac3d78c6d234b56213fe46025d56fdac38b4ba2e8cde29dd4e085795c090d70f00409d7444dae13c75116e230269cecd8d3d29e524f70c2d6c129c840c9542bf WHIRLPOOL 668fba0c4a543f6278ffe4b3d4aa2d62d4ee0448fee72c4f4c5edb80b12bc292d06deaa51426953086daeeb90ada34f6fed5dbda9083ee248e8bb94dfeece4ff
+EBUILD libnacl-1.5.2.ebuild 520 SHA256 733aa1dcd118b1eaad3618dc6b1ae964279282b244ce8f28bb322f4e6c1867f4 SHA512 ac3d78c6d234b56213fe46025d56fdac38b4ba2e8cde29dd4e085795c090d70f00409d7444dae13c75116e230269cecd8d3d29e524f70c2d6c129c840c9542bf WHIRLPOOL 668fba0c4a543f6278ffe4b3d4aa2d62d4ee0448fee72c4f4c5edb80b12bc292d06deaa51426953086daeeb90ada34f6fed5dbda9083ee248e8bb94dfeece4ff
+MISC ChangeLog 2917 SHA256 c469c55aa1de9d7839b81986966e75270ed63a2f76a49fa0a405f480d8dd63be SHA512 fb55c0243e457d543bd133e8aa2b267c2cc9db72c00663389a52f567efc085a80e9e2af67804850a61fc442942cac4778cecd1d59d118ed930449fbeb7cef42b WHIRLPOOL 047b92442839784f45935736ddacdb21747d6456106fe52e3c7a0371f8193cb7a797e6877e0ed4df751b00f98d8bd0dda757e0806b5ba243a7b87d70bc8b8325
+MISC ChangeLog-2015 901 SHA256 cd39a114539571cde9c295ac0775d6f820eeb22995cb824a96d4b66640c8c437 SHA512 24afdc8b8e1b440f648dcf87f464b42ddb4afd4110b710dadf7a01b35254619ea4b74071a0b13ac7e38095b4b757f7dbfc670190b53d59c340cf579c855a1d4d WHIRLPOOL 42956de2340506b52d5e33de409b45c9e7fa7d08cc46a364f66d23c360059e0c814f616e22a22885757ed859659972b8301b6efb817156cd9b05a0de2f65bebc
+MISC metadata.xml 436 SHA256 c988eeecd5cc7f58c8c77f16c39a5d0cdccb9e6aa00f67561aba3e6077115a74 SHA512 f8a241e4d71d6d6c682f019d086e4effa58608430a5df8c2f70c29cde07124fec2c37b8c63411b19e50baf2b5486a88ec696e4499e47e64936212f6dce938a2c WHIRLPOOL ce8cfb495e00f54a1b6f9c64fc22029d63c0ddd44e2961bc5629439b0089e9f022a6eed25670cb7f9a2303eebe9c581e63bedea48541c91fcc5adbce30121925
diff --git a/dev-python/libnacl/libnacl-1.4.4.ebuild b/dev-python/libnacl/libnacl-1.4.4.ebuild
new file mode 100644
index 000000000000..d957c6dc5e04
--- /dev/null
+++ b/dev-python/libnacl/libnacl-1.4.4.ebuild
@@ -0,0 +1,22 @@
+# 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
+
+DESCRIPTION="Python ctypes wrapper for libsodium"
+HOMEPAGE="https://libnacl.readthedocs.org/"
+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}]"
+RDEPEND="dev-libs/libsodium"
+
+python_test() {
+	${EPYTHON} tests/runtests.py || die
+}
diff --git a/dev-python/libnacl/libnacl-1.5.0.ebuild b/dev-python/libnacl/libnacl-1.5.0.ebuild
new file mode 100644
index 000000000000..1b4f8c2b8d03
--- /dev/null
+++ b/dev-python/libnacl/libnacl-1.5.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+inherit distutils-r1
+
+DESCRIPTION="Python ctypes wrapper for libsodium"
+HOMEPAGE="https://libnacl.readthedocs.org/"
+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}]"
+RDEPEND="dev-libs/libsodium"
+
+python_test() {
+	${EPYTHON} tests/runtests.py || die
+}
diff --git a/dev-python/libnacl/libnacl-1.5.1.ebuild b/dev-python/libnacl/libnacl-1.5.1.ebuild
new file mode 100644
index 000000000000..1b4f8c2b8d03
--- /dev/null
+++ b/dev-python/libnacl/libnacl-1.5.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+inherit distutils-r1
+
+DESCRIPTION="Python ctypes wrapper for libsodium"
+HOMEPAGE="https://libnacl.readthedocs.org/"
+SRC_URI="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}]"
+RDEPEND="dev-libs/libsodium"
+
+python_test() {
+	${EPYTHON} tests/runtests.py || die
+}
diff --git a/dev-python/libnacl/libnacl-1.5.2.ebuild b/dev-python/libnacl/libnacl-1.5.2.ebuild
new file mode 100644
index 000000000000..1b4f8c2b8d03
--- /dev/null
+++ b/dev-python/libnacl/libnacl-1.5.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+inherit distutils-r1
+
+DESCRIPTION="Python ctypes wrapper for libsodium"
+HOMEPAGE="https://libnacl.readthedocs.org/"
+SRC_URI="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}]"
+RDEPEND="dev-libs/libsodium"
+
+python_test() {
+	${EPYTHON} tests/runtests.py || die
+}
diff --git a/dev-python/libnacl/metadata.xml b/dev-python/libnacl/metadata.xml
new file mode 100644
index 000000000000..cb03e9f45458
--- /dev/null
+++ b/dev-python/libnacl/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">libnacl</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/libnatpmp/Manifest b/dev-python/libnatpmp/Manifest
new file mode 100644
index 000000000000..9ae307605b6f
--- /dev/null
+++ b/dev-python/libnatpmp/Manifest
@@ -0,0 +1,10 @@
+AUX link-against-system-lib.patch 536 SHA256 47809598d8d7c3b407785de3a27b99d4a3463be52706da7df55ce51a980b9658 SHA512 587abd1777fe87f42b90d789e3546707ef45ed4e8e5f228fc103f1e91ee5fbe3b5324afd3b70074dd845f8d555bc63263956c8077c7160d15088dbca36a3aa81 WHIRLPOOL 2666f8b8b9e271cd2e1c6b83c360fb492a9f8c9cdf83d45524a4953b2b0a17cf537d2b17d9da27006de851ad53f6549e21d8096bb7c3b27c18b019b0cec928e0
+DIST libnatpmp-20130911.tar.gz 18744 SHA256 a30d83b9175585cc0f5bff753ce7eb5d83aaecb6222ccac670ed759fea595d7d SHA512 e7dfb3955ccc2c30e7c74c1085bc71bd9318f6171b84fbad2d8ae8bd5a227f7ceed3f60ecb49bd10e6fb838d8be3325bbf467467bf0d04e46883e3a19fa14a2d WHIRLPOOL fafb32c930e21afd8c3e10528638be4b31d03a2bcfdc481b4f2ea682ae4b7fd0cf943f32b8a395f03ceeecf42a41370fcd49a6026bc3cd449b6e4fba39cf191f
+DIST libnatpmp-20140401.tar.gz 23302 SHA256 b2ce5e626a21c795cba2d118f26e54aaa89de29d4611c440fafc49a2a5bedabb SHA512 12616f07b0a096046a35079954b8a34d474e672d7836ddac9da993a47178902aa2d781786ac76c55c5f16cfdf6a7e7258f92fec3850714ad9cd50208d854c4c2 WHIRLPOOL c12bfbc83d1f30f20162c3fddd5452f53d6ef556452845c6303420718a92568c8e8174939a3ef2702045d7c2061f5aff57bfe81c3516452d84172ef6ecf08849
+DIST libnatpmp-20150609.tar.gz 24392 SHA256 e1aa9c4c4219bc06943d6b2130f664daee213fb262fcb94dd355815b8f4536b0 SHA512 e50b1f68ce9254bb2f068ddc37417a3c417b80f7b3fb3d84e3e9af4a144d89e204ab993b54c01657335e855d0124a8fcbbf96ce78db7b9ae0b03b6eb79de2e09 WHIRLPOOL 27243e13e445a8bbe592257e1029264c3535ef1c71ccaf476708e91c8ead39b778a2d07e6bc42500444b910a005d5be092c5a453df225a556975e97f4184b7c7
+EBUILD libnatpmp-20130911.ebuild 678 SHA256 9a24ec604d5c85cfac07148602c534b820874508775a3b93ec29c3a45d375490 SHA512 dbc6ddc32e6c347e356e9895839ce32b2c0acad9376866412936052b4c7154b593bbd288d9af82e451a2ee38815ca4f43a178d767065da0eaabd5afa55e41246 WHIRLPOOL 784959c2e29b3579f1ec39f436a450f56ac5f988c463a41cfc978d693c61511046ceaee9ac878b63e0207599d959c2cce3e690f4d8746f93527779aaf9d88ead
+EBUILD libnatpmp-20140401-r1.ebuild 678 SHA256 aba7c7ecc19452221f372c73c71bad480650d3dd7613f290e7d2e45740be7b61 SHA512 1eed86e389eb7700365b2f8119966d53a68b01128a5b9942c3bde55df878faffa5ea8637343c431959504c39be49061b6bd99781236d2407ec533b32f975ceba WHIRLPOOL d8bb5b283007e690067489212983cfccd28f61be54069a99a9bf60fc420b0439b82f9d4ad2ae9a294a0d0785a0e55f4ede1a656e9b86ea4e8208a138fea93503
+EBUILD libnatpmp-20150609.ebuild 678 SHA256 aba7c7ecc19452221f372c73c71bad480650d3dd7613f290e7d2e45740be7b61 SHA512 1eed86e389eb7700365b2f8119966d53a68b01128a5b9942c3bde55df878faffa5ea8637343c431959504c39be49061b6bd99781236d2407ec533b32f975ceba WHIRLPOOL d8bb5b283007e690067489212983cfccd28f61be54069a99a9bf60fc420b0439b82f9d4ad2ae9a294a0d0785a0e55f4ede1a656e9b86ea4e8208a138fea93503
+MISC ChangeLog 2360 SHA256 f40393a0e42b7bbeaf491a1e7a756171bfa1176789c9fa6d2c43b3ee01488307 SHA512 acef68704abe48015bde9bdbd74ad03fbbdc7c0e2bbb360d27d3cf4e5c7d6b5cc84c78a0ec7c75c174134c188a2a11e9074e1b686dd6562be9432368c99e656d WHIRLPOOL 1731ff88961c7fa0a999567b588ff8f8ecca81b068cd2c79f114593eba22637d6bd48d66c2b9d3437d1cfb18ae49c3e939eeeb46009b1255ae9744a83d54c710
+MISC ChangeLog-2015 2655 SHA256 5d124d20380942f2f16cb81e96a1b93fa3836c0e09166691bc8a8cf11ce57b1e SHA512 f4e98b9029f4eb469cf38cf40a8b08da622d7ace875d0fd8e5dd074e058c32955e00f57d87ebee280f23a735fdffb058486a7cb8af1954d352876e352d7380e0 WHIRLPOOL 8d91bac7a9e7ef9a6a9d0526fe425c0658bb6a46796a1a5856911109c93c91d33b81354cb0d4dfd52aa38e380b27dbd96f7f0e3359035eef3d96c5c253a5618c
+MISC metadata.xml 252 SHA256 a590e5133cd97a615db4f977b0e28e5c60c56cac76eb3d339109cdf379003b60 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65 WHIRLPOOL b209a730a169969b9e3c4d4612368bc5b30bfa5fae275d98d83ba96fd0ad01d308a8fed4f7d67a7c9fa417c624dfeb23ce89ab58923a8a0b5b1bd68ee73f288c
diff --git a/dev-python/libnatpmp/files/link-against-system-lib.patch b/dev-python/libnatpmp/files/link-against-system-lib.patch
new file mode 100644
index 000000000000..cdb64a9ce12b
--- /dev/null
+++ b/dev-python/libnatpmp/files/link-against-system-lib.patch
@@ -0,0 +1,12 @@
+diff -Naur libnatpmp-20110715.orig//setup.py libnatpmp-20110715/setup.py
+--- libnatpmp-20110715.orig//setup.py	2009-06-04 17:37:06.000000000 -0400
++++ libnatpmp-20110715/setup.py	2011-08-03 06:55:11.000000000 -0400
+@@ -8,7 +8,7 @@
+ setup(name="libnatpmp", version="1.0",
+       ext_modules=[
+         Extension(name="libnatpmp", sources=["libnatpmpmodule.c"],
+-                  extra_objects=["libnatpmp.a"],
++                  libraries=["natpmp"],
+                   define_macros=[('ENABLE_STRNATPMPERR', None)]
+         )]
+      )
diff --git a/dev-python/libnatpmp/libnatpmp-20130911.ebuild b/dev-python/libnatpmp/libnatpmp-20130911.ebuild
new file mode 100644
index 000000000000..53cc321d66e6
--- /dev/null
+++ b/dev-python/libnatpmp/libnatpmp-20130911.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for libnatpmp, an alternative protocol to UPnP IGD"
+HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
+SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="=net-libs/${P}"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	epatch "${FILESDIR}"/link-against-system-lib.patch
+
+	#These are installed by net-libs/libnatpmp
+	rm -f Changelog.txt README || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/libnatpmp/libnatpmp-20140401-r1.ebuild b/dev-python/libnatpmp/libnatpmp-20140401-r1.ebuild
new file mode 100644
index 000000000000..d870176a2408
--- /dev/null
+++ b/dev-python/libnatpmp/libnatpmp-20140401-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for libnatpmp, an alternative protocol to UPnP IGD"
+HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
+SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="~net-libs/${P}"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	epatch "${FILESDIR}"/link-against-system-lib.patch
+
+	#These are installed by net-libs/libnatpmp
+	rm -f Changelog.txt README || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/libnatpmp/libnatpmp-20150609.ebuild b/dev-python/libnatpmp/libnatpmp-20150609.ebuild
new file mode 100644
index 000000000000..d870176a2408
--- /dev/null
+++ b/dev-python/libnatpmp/libnatpmp-20150609.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for libnatpmp, an alternative protocol to UPnP IGD"
+HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
+SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="~net-libs/${P}"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	epatch "${FILESDIR}"/link-against-system-lib.patch
+
+	#These are installed by net-libs/libnatpmp
+	rm -f Changelog.txt README || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/libnatpmp/metadata.xml b/dev-python/libnatpmp/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/dev-python/libnatpmp/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>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/libpillowfight/Manifest b/dev-python/libpillowfight/Manifest
new file mode 100644
index 000000000000..c5edbdda5d30
--- /dev/null
+++ b/dev-python/libpillowfight/Manifest
@@ -0,0 +1,6 @@
+DIST libpillowfight-0.2.1.tar.gz 23125246 SHA256 9a00e3636c8ebb00c40c6b0e6f4e6eb5a7ea7618704fdee18e145687f08de13c SHA512 352f23daa2cce39395604f3c545773fec26b336ae17cea9148b8d6b7f61f0fcd314ab08e4fde8dff85531ecfa07fbee0fda90e3258c04c39cad397a775318d95 WHIRLPOOL cdde4f9a4de9ff80557f21229549fe10192d2819f2a737973619c3b17cc83fab0faf084aa4c291e5dba8ae5094317664533f236b9ac38fed657bf7efa38298c1
+DIST libpillowfight-0.2.2.tar.gz 23125494 SHA256 de49337c1975e548bcc557121e4e9a417cfbd4dacee79f3d9aa4e402de041c75 SHA512 76dcaf9105b4dbbe427851d794e92ba023453e2d750ecdd4e3feb864534f9d99adb562b719b7c9af299ae16c0778b510ab96b4997cf9bcc6ea4c6f8f7471ae8a WHIRLPOOL 8bd6c72dbcb73ff33e2f4d8f61ef8b78d5d9dad9aec3972f9c1eb00ce14ed7f98278b7f9de3c3a95f11c8ac0f24313c0d8d5675df66e24fb6ecfdf8a962758a4
+EBUILD libpillowfight-0.2.1.ebuild 668 SHA256 d943f7b2a2a6be45b31f94f4065c75b1711f46d12e2ef9f54ca81f726668906b SHA512 6127bba47f4091ee83466c925278ef8f65613f1a3c6de66a2ef45ab7992cb4781a69715dfc6a49b79c411f7e0bd11e7f6df6367a847850bfaef58be7cc8e3224 WHIRLPOOL 737bed003be842422ccc529d9cb2989ee151136fd03dadb59faf1d50cff8b28ac14aed6688ab52309626ba52390da3816b7d6c153e91baafdf8abd67af54ab66
+EBUILD libpillowfight-0.2.2.ebuild 676 SHA256 e54d278550582014fda9f5a35ca6f9def3641782a940ce7696239be1e0c6daa8 SHA512 8919455d801ce8da7f49b41728d3dd41362b3669e3a23a57b3381e6a97011f3e5ddd045b3c5b59bc7fa08b1f02634076c8c288ce9d2455874cd1b672079fb46b WHIRLPOOL 3c04aa6e7794d5306ed18ce60f7e4fa29ae9e4dc62cd29101ea37fa05a5e339b118250081156a496ab39c10074049a07bf9938ab206b0c999182f088bfd217d8
+MISC ChangeLog 370 SHA256 2a5b24f8f7e8506c135ac6fc0f9542bfc150e786bea5dd6db75872a8ada73e2f SHA512 d6f822ce03bff152c26a1e4aed28a6a86a1bfa6cc72774fce0282446a437b5afb03c435960162f48a5026925cfa748d1eceff27c97738211a26951b109cabf27 WHIRLPOOL c9de3ca4019115d22c08d0c08a2dbc44a85dcc24114d6cd64a6691cad0cbe3f6ee889cef551045ba447c7e5fb7a42dfa1f8dbdf944046eff3e9b9e46865c8199
+MISC metadata.xml 349 SHA256 b3ac4d534adbb733e06bf1fbee49b397b41aac0e373d4eaf267bbeecf2a4d475 SHA512 5934060618b194c844776072f78ac15400fbee4629595a8c3ed60acf30b4ffd9cfed4dfcd9b263101842be197a1491daeb3e929bdd924839c17819b185ae7578 WHIRLPOOL 267c3eb49896ed21ff23c53501c3d08c65dbe245fd93bfae7244e03de57c584f27766d58b026d51d945d4e7ff4a61ec3e4a31010020c7437d5c85423058e25c9
diff --git a/dev-python/libpillowfight/libpillowfight-0.2.1.ebuild b/dev-python/libpillowfight/libpillowfight-0.2.1.ebuild
new file mode 100644
index 000000000000..1401864b5c3a
--- /dev/null
+++ b/dev-python/libpillowfight/libpillowfight-0.2.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Small library containing various image processing algorithms"
+HOMEPAGE="https://github.com/jflesch/libpillowfight"
+SRC_URI="https://github.com/jflesch/libpillowfight/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -e "/'nose>=1.0'/d" -i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/libpillowfight/libpillowfight-0.2.2.ebuild b/dev-python/libpillowfight/libpillowfight-0.2.2.ebuild
new file mode 100644
index 000000000000..ccb2ccc8455d
--- /dev/null
+++ b/dev-python/libpillowfight/libpillowfight-0.2.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Small library containing various image processing algorithms"
+HOMEPAGE="https://github.com/openpaperwork/libpillowfight"
+SRC_URI="https://github.com/openpaperwork/libpillowfight/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -e "/'nose>=1.0'/d" -i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/libpillowfight/metadata.xml b/dev-python/libpillowfight/metadata.xml
new file mode 100644
index 000000000000..ce9bac02678d
--- /dev/null
+++ b/dev-python/libpillowfight/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jflesch/libpillowfight</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/librharris/Manifest b/dev-python/librharris/Manifest
new file mode 100644
index 000000000000..b617eb48eca5
--- /dev/null
+++ b/dev-python/librharris/Manifest
@@ -0,0 +1,5 @@
+DIST lib_rharris-0.1.14.tar.gz 12895 SHA256 4127cf6bb45aa4bfba9f3b96c551f1e7779711e76e5577b651832d166365b551 SHA512 24e8be3a0508bcac30261a0c05652ca452c09b0ce23e3a8341d702a6e3516284d65f21b5b8bca3e6bd5db39de90fc697f11943ce86cce2e849a4d9c44eb2bc85 WHIRLPOOL 896f6567f5cd218d0d627ea8bc9f5fca2814296c08bafc6da78bcd494e398f67c1d4d337b09879962b391253810b5b88a1bbb016371cb1858296bf4c593cb546
+EBUILD librharris-0.1.14-r1.ebuild 473 SHA256 92e4e719e70554cac821b7b85c976d737aa5b27b68a3a65d3426d993aabe7788 SHA512 615e4e4d46efa4160bfb3482b5c9c7a1e71fbac1451f11096895662bc956b5570ff5b6dbce62a52e4490bbbe976655959d08afb8883d1a3bd41707396ad5f30c WHIRLPOOL c2599ccc3b7125e7105e4fd33682fcccbea843969338e392d06ee0dd90c5e985ebd5818227c2c59688bfb5136f69a388ed179fbe585327c3c3ae3b8eddaf3013
+MISC ChangeLog 2596 SHA256 02a40226ca6adf46a5990754415755d2758182691c37d7ab3c39603d2b8bdbe9 SHA512 0920b02004d93d0e399eb8541ec95abffba2d909db01faaca13b719cd8b95f4f208e63ee278fa6777f0779dbee9bf91427db03b17ad09703eb3b90862e703f5a WHIRLPOOL 1730938976d486a591db7136f4b256f43a072d88531a72dbe51e26088c3fd9faf1271defa1289ab3151f960c337199113c18dae293f4298236585914caf50ffd
+MISC ChangeLog-2015 1025 SHA256 a2d9dcc84f30c18594c25f556d839766429a6cab12a58f3e05fa51b37aa68c7e SHA512 6867458b8a55293c019431360aec41bd1cbd96a5bc284453025de2cf15732d74d92e3ce302fc3d8b5e59586839000440c21d18b793943e19c39bc3b3e14b7a33 WHIRLPOOL 6bda22733448c8c2d8d41617d5a46b0f41285b05d6b7887f04c35da5a9d8144a2b4152695024556e7713aa5db62d0997e0477011c6d9c8c6df507be794c132d7
+MISC metadata.xml 314 SHA256 0fb1556bc32d58dbc60f86113734c1c6e306d8b003c60de54dd5fec397512bc1 SHA512 173c3c07b9742e039202a6a2bcaa1ca6a9f1cefac49f40a3461dfa405b874f12705d818cffec3293d22b969715575ad3167ddac7f88192722e14e12bbe78445d WHIRLPOOL 22b414ac61398d895b48ee2e62fe0ce8ef5087699b0dd92920964ad8af304135ab00abf971db241f6fe595e61bf1d0a2888ae4e4972b1cff447db2073e8fac2e
diff --git a/dev-python/librharris/librharris-0.1.14-r1.ebuild b/dev-python/librharris/librharris-0.1.14-r1.ebuild
new file mode 100644
index 000000000000..5543f6e9d662
--- /dev/null
+++ b/dev-python/librharris/librharris-0.1.14-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="lib_rharris"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python Internet Programming Library"
+HOMEPAGE="https://pypi.python.org/pypi/lib_rharris"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/librharris/metadata.xml b/dev-python/librharris/metadata.xml
new file mode 100644
index 000000000000..1e6c9b2420ab
--- /dev/null
+++ b/dev-python/librharris/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">lib_rharris</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/librsvg-python/Manifest b/dev-python/librsvg-python/Manifest
new file mode 100644
index 000000000000..f351a424d8d5
--- /dev/null
+++ b/dev-python/librsvg-python/Manifest
@@ -0,0 +1,5 @@
+DIST gnome-python-desktop-2.32.0.tar.bz2 621277 SHA256 09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18 WHIRLPOOL 5713353291a34e0a03152ad76c46391e3ab246efc17b63193fc0b26b02176eb78ce134c8d0cabcb3480bd2dbb3446b7b6b301cffbfac3ce915e21a974947e37e
+EBUILD librsvg-python-2.32.0-r1.ebuild 586 SHA256 d7f25dd2e12e7c8ddb5788d10ce98bb27e66dea79a556d71b4a95ac4a3dacd3f SHA512 7259f39eab6bcb014ee71c4de998ec496f1d0a8bb6d7055d672bd1619f7451baaeb7188e5df6dfb458fbccfe5b81f46725cef48374c1e74b7538504dde91c023 WHIRLPOOL 79bc1690c0d2565dad154e11de053a1fffacc9535e025d645194d792c674f992cd14ccc5e131a8525bbb3895314d89a80a994178019dbbe583ace8e981aa4bb2
+MISC ChangeLog 2458 SHA256 38a75d8aa7c8ed24128df0bd3618980bbc62fb5adb467d015fce7d8a5de91b42 SHA512 ed6281f1cc15bc62159adbccb7c98f1a93050d452192ec786e74d282933e7c7896008deb297f05b8b0d989fb4743bca7f415bf1fcdfa929861463a37e1d90ef8 WHIRLPOOL 062ffb486bc9da853447d6829e719b28e2036a8ab4ddece0db026ebcc17ef869c68215a52043b68059d3ce6ab2ab4ac7c774d7dac17c30507cab1bf095a40c6f
+MISC ChangeLog-2015 7555 SHA256 f971339c03f9854d6074b8a050577a00300692fec162565931db6c9038d8887d SHA512 207b1be77fa39053896912de69133521757a239fddb5ab8b1bd11cac7748129bfcaa8f13fade649f8c5cfdc3ae37ac2968c4788dcbd867a44f4cb16d2b1942b3 WHIRLPOOL c9f1b49e1d734f2e6226129da8cb476c452ed06318ebc292f7cec0c14889e9ea62e62b596b91b63102ee6981a7084d155bb08e36113b0295e2534fa03b4a7496
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/dev-python/librsvg-python/librsvg-python-2.32.0-r1.ebuild b/dev-python/librsvg-python/librsvg-python-2.32.0-r1.ebuild
new file mode 100644
index 000000000000..37fbb9380a4d
--- /dev/null
+++ b/dev-python/librsvg-python/librsvg-python-2.32.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+GNOME_ORG_MODULE="gnome-python-desktop"
+G_PY_BINDINGS="rsvg"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome-python-common-r1
+
+DESCRIPTION="Python bindings for the librsvg library"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+IUSE="examples"
+
+RDEPEND=">=gnome-base/librsvg-2.13.93:2
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	!<dev-python/gnome-python-desktop-2.22.0-r10"
+DEPEND="${RDEPEND}"
+
+EXAMPLES=( examples/rsvg/. )
diff --git a/dev-python/librsvg-python/metadata.xml b/dev-python/librsvg-python/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/dev-python/librsvg-python/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="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
new file mode 100644
index 000000000000..ebff2e95a1f7
--- /dev/null
+++ b/dev-python/libvirt-python/Manifest
@@ -0,0 +1,8 @@
+DIST libvirt-python-3.6.0.tar.gz 181778 SHA256 ecb9cbc8b1f33b245b04e3a937d8483584ab7a18258b217be96661343a4b1ad0 SHA512 333f991fc69b509b2eda67ee70dea39cc9d1ff36b1abb6a881296313ffebfb5ed41de8443534f19b27a70271548214fa94a12e7f59dc217492edf0bb5555ede9 WHIRLPOOL 6f13ee521713c3540e649c9c9edf6fc0427e0c4563305a42366796352fc99867bc79dd5ce61db0d7b79dc02957f8854c5664f5b5952a402c614e19264167546b
+DIST libvirt-python-3.7.0.tar.gz 182372 SHA256 1e4a8a8b08ef8f2502088f26ce3aced415d55ef808d8301dfed023f45154c06f SHA512 2f37d860d9ee203af3765a1b8d7f8981a8e51b5e6c78170d4bd80d0b23b9f5997725d81ff8c4ed4e5bb218346913321a3b4b8e2d337fd3cb8eeb95ac78256413 WHIRLPOOL b35f8aa071beb14ebf4be233bac190c6022d7ad56788f28bf3c8d265faa8fc514e0604beea9ccd8b703079fbec65de5c5b20ec6b8d00693cf6a6c7b9afc8bd75
+EBUILD libvirt-python-3.6.0.ebuild 967 SHA256 ed96a152932adcdd77b623742dd386bb4c02e60bb6e1e177add0b12cc8c7798a SHA512 342912f6f1aa4a8f2c7f7b5df2413490d9d5e9b19b959a1b339d5b6e617ebfb76aa91a6bdd363bf4d9b842e2113bfa7ae5d235d8da4787ef3f07959cc0334e8e WHIRLPOOL 973315859bd2aaac52fb24bc5af7cdfd6f388488a01e6e1fa860a2df2875184df4b78f73c9cdce38219b995e0d9162dff0e5fa0eacc70f6f86cbb9172a9076a8
+EBUILD libvirt-python-3.7.0.ebuild 964 SHA256 92bf9bd371325bd9cba38a138cfc10544bd566f7e69e58918b3f142b326c7a9f SHA512 5067c0583c8f3042ed13b6afb53d9aacca76305650223d318b5d82013b22bf0320069ac26efee4713376d01a75b9e2b797588d2bb5696b3815a74218c651072b WHIRLPOOL 6cf9c76a3dd05b31aa6b46c5e3ecfa89fb3b9ad39927917f379b6a4af5746d941c63c0b98e7d92252f4166eab136d77298d5ae0c327d30d4f3cdb6588bfda52b
+EBUILD libvirt-python-9999.ebuild 965 SHA256 07d0fd1b274ae7c25e9401ea7b6d1215874c903197890b336b7ea18bd5ac47da SHA512 031a6875c7685b942cc444faa1a175cf44ac2700de9611920eeef03ba771c87be449b4dbdb71fbad7348cf69ba3c475516d41bed874b7f672b14b7c7d56a0156 WHIRLPOOL 219d268e84d8eec062cae56e7c67e812422dacd0350e68322b31a6db6cf55d1a54c393c777b728e37acb2bd1f3390e9f3735559f03d123bdc9a50b543fac3366
+MISC ChangeLog 10187 SHA256 4c9e3a534260ccab329ff53474e2106cc71eaa205c7114f8fbd25650f2b32fec SHA512 0a2c23768c88fc676d6acd30edf8851daccd7892611ca3713500a2c8996af454a577b23788588ddffb2c9a8d260c474acdd63645cbb2d49110b28baf070a8aab WHIRLPOOL e91ce13a2048f101f238ab8523afbb6493c62ebf6fa8730c1c1d96640aa1b50eb292cb214bd72158b2c993c6ff52906056d39953e24c4a6d1a7f7faad43e418a
+MISC ChangeLog-2015 6687 SHA256 8fa4074b08dac5640b998739c571b9580a1b5e658ae416a53bf8188eb57dc6cd SHA512 f8d3531e978480c684badb7e914a4b2bf3039c3030bc610cec26ff83ae60b64e42a68fcfcf3182d0f175dd8e1de71c27915cfcd9da42d1b41a8af2b10feb10c6 WHIRLPOOL 1a6eb42d21b6758105aa72c56bcdb1c268be5bea67e1a66ebea21354fc60637719a1adb8a33cc163d57502217122da1ddbe48056b305d5d73ecece4bff2aec00
+MISC metadata.xml 518 SHA256 4aa8453fa5b3cc1630dab48bf399f3184b1a3d3ae258ab1d8690bcc44d4a41bd SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083 WHIRLPOOL 2c376efaebc0f74c414eded66fe3475adcb27516277c2aef5a94c0fc9635e9c4b5c7e891580d17a907040e3afdc2a43e3fe4c8a9981e4b9071481515c3c9ea3e
diff --git a/dev-python/libvirt-python/libvirt-python-3.6.0.ebuild b/dev-python/libvirt-python/libvirt-python-3.6.0.ebuild
new file mode 100644
index 000000000000..4262eae37256
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-3.6.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+MY_P="${P/_rc/-rc}"
+
+inherit distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
+	SRC_URI=""
+	KEYWORDS="amd64"
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
+	KEYWORDS="amd64 ~arm64 x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/libvirt-python/libvirt-python-3.7.0.ebuild b/dev-python/libvirt-python/libvirt-python-3.7.0.ebuild
new file mode 100644
index 000000000000..c16440985c37
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-3.7.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+MY_P="${P/_rc/-rc}"
+
+inherit distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
+	SRC_URI=""
+	KEYWORDS=""
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/libvirt-python/libvirt-python-9999.ebuild b/dev-python/libvirt-python/libvirt-python-9999.ebuild
new file mode 100644
index 000000000000..34efdc0f4c12
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+MY_P="${P/_rc/-rc}"
+
+inherit distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
+	SRC_URI=""
+	KEYWORDS=""
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/libvirt-python/metadata.xml b/dev-python/libvirt-python/metadata.xml
new file mode 100644
index 000000000000..1c1b2935845d
--- /dev/null
+++ b/dev-python/libvirt-python/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tamiko@gentoo.org</email>
+		<name>Matthias Maier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">libvirt/libvirt-python</remote-id>
+		<remote-id type="pypi">libvirt-python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/libwnck-python/Manifest b/dev-python/libwnck-python/Manifest
new file mode 100644
index 000000000000..ce21a4558f37
--- /dev/null
+++ b/dev-python/libwnck-python/Manifest
@@ -0,0 +1,6 @@
+AUX libwnck-python-2.30.2-flagsfix.patch 847 SHA256 d3d7b5aec7a459466766a91bc3e9e6b99cce4ea5d194e4ec1b461e9e946c9c13 SHA512 ff30e03ee241ab6d26fafc4ab52f6b1c241b37b476fabeb72e9fb4536ad20604dffac6af42bb0c3170cc062ac90bee2f8c501fc0cb8478bb2adca3d07882c3ee WHIRLPOOL 86313aecebcf57df173b9fc555c226522f9f0abaff278726aab3c44bb779277c0f89003a2130acd8135cbf3a1525a6b5eb5b4b6f701eb774669dc848c21ec058
+DIST gnome-python-desktop-2.32.0.tar.bz2 621277 SHA256 09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18 WHIRLPOOL 5713353291a34e0a03152ad76c46391e3ab246efc17b63193fc0b26b02176eb78ce134c8d0cabcb3480bd2dbb3446b7b6b301cffbfac3ce915e21a974947e37e
+EBUILD libwnck-python-2.32.0-r1.ebuild 727 SHA256 286a6ac84c4b2210bd4a8696cb123f71c761e068854ce442dbb5eaa4abb04fdc SHA512 b5335585b2d4bcd532ddf04c340c96904a99c8fcad98f824aee11cd1a33e7682c0e9870af931941a1b9d0fa39729902365b46274eee1f1b684dcfecb3dae6bfb WHIRLPOOL 971719c1cf85825f122901b841767022fcb7e9ffe6b5b8aea92ab39e7e605f36061291d17c0433066375ae7da4ef02f6b34c0d868292cdb4ab473b0887993b89
+MISC ChangeLog 2505 SHA256 8c02ebd87ed787eee5b242da7953abbf2bdcc87ffe24a29815a3177e8c70f1a6 SHA512 444f1bddb0392733e450235f004d561f5c5670c5b07547fff01f0148661d13f20ff0ec5cf5fd5bced2162cd73c998a8351c342787444447040ee67fffe341fb1 WHIRLPOOL 8e35dd5124a7cbb3c417133faf57632deaad50aeab3ae67f13104f848d1620cc386d55bbbf002af88bf610fa36cff9e3833ffc062470043b18cafcf63256f846
+MISC ChangeLog-2015 8186 SHA256 3a0b110eab60b7676ded404fe93b44a3e61b02ba6ae7081ac852a4534e95435a SHA512 57e7f29aa3315c6dff02d279689ca4988b63994615de8e2ba85a93930e1c6b5d8b63990d862f4988c959ddfa1d8e84f7860b28cc9e9c27e390ccb14f45d80174 WHIRLPOOL 32fe386f2b9ef5fd536a55ddf8e75319575cb16c6f9c1612e2757be66634a60d4e6f71b41c255507abbfb09c9e04cab4accc1a18a0533df83d4431a2f02f6c0f
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/dev-python/libwnck-python/files/libwnck-python-2.30.2-flagsfix.patch b/dev-python/libwnck-python/files/libwnck-python-2.30.2-flagsfix.patch
new file mode 100644
index 000000000000..0be84c96b533
--- /dev/null
+++ b/dev-python/libwnck-python/files/libwnck-python-2.30.2-flagsfix.patch
@@ -0,0 +1,30 @@
+diff -up gnome-python-desktop-2.30.0/wnck/wnck.defs.flagsfix gnome-python-desktop-2.30.0/wnck/wnck.defs
+--- gnome-python-desktop-2.30.0/wnck/wnck.defs.flagsfix	2010-04-20 11:27:20.119491538 -0400
++++ gnome-python-desktop-2.30.0/wnck/wnck.defs	2010-04-20 11:28:34.715491536 -0400
+@@ -100,7 +100,7 @@
+   )
+ )
+ 
+-(define-enum WindowState
++(define-flags WindowState
+   (in-module "Wnck")
+   (c-name "WnckWindowState")
+   (gtype-id "WNCK_TYPE_WINDOW_STATE")
+@@ -121,7 +121,7 @@
+   )
+ )
+ 
+-(define-enum WindowActions
++(define-flags WindowActions
+   (in-module "Wnck")
+   (c-name "WnckWindowActions")
+   (gtype-id "WNCK_TYPE_WINDOW_ACTIONS")
+@@ -184,7 +184,7 @@
+   )
+ )
+ 
+-(define-enum WindowMoveResizeMask
++(define-flags WindowMoveResizeMask
+   (in-module "Wnck")
+   (c-name "WnckWindowMoveResizeMask")
+   (gtype-id "WNCK_TYPE_WINDOW_MOVE_RESIZE_MASK")
diff --git a/dev-python/libwnck-python/libwnck-python-2.32.0-r1.ebuild b/dev-python/libwnck-python/libwnck-python-2.32.0-r1.ebuild
new file mode 100644
index 000000000000..36371a2ded20
--- /dev/null
+++ b/dev-python/libwnck-python/libwnck-python-2.32.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+GNOME_ORG_MODULE="gnome-python-desktop"
+G_PY_BINDINGS="wnck"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome-python-common-r1 eutils
+
+DESCRIPTION="Python bindings for the libwnck library"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+IUSE="examples"
+
+RDEPEND=">=x11-libs/libwnck-2.19.3:1
+	!<dev-python/gnome-python-desktop-2.22.0-r10"
+DEPEND="${RDEPEND}"
+
+EXAMPLES=( examples/wnck_example.py )
+
+src_prepare() {
+	# Fix three enum items that should be flags, upstream bug #616306
+	epatch "${FILESDIR}/${PN}-2.30.2-flagsfix.patch"
+	gnome-python-common-r1_src_prepare
+}
diff --git a/dev-python/libwnck-python/metadata.xml b/dev-python/libwnck-python/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/dev-python/libwnck-python/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="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/libzilla/Manifest b/dev-python/libzilla/Manifest
new file mode 100644
index 000000000000..f02bc32797f1
--- /dev/null
+++ b/dev-python/libzilla/Manifest
@@ -0,0 +1,4 @@
+DIST libzilla-1.3.zip 17384 SHA256 0b365586ff5249389357ca37f8d346801cf3b61c5cab9a4aa0fc4ee7e13e4035 SHA512 cb38edbf71642b3358417247a62208bf865a6ea62f94eb5c3f4ee46b33ed90c53c8c3483ea3eea031e301d693d77ed65a221e7bd13a4c2dc4e436f8c2d92b66b WHIRLPOOL 0a6fc193f8c843abb87980625be2edf3df382b4fa957bdfc36ce025258537de3dd5d228551bd3a389478658d1170c42571e82598ee4846df87b4250039eaf18d
+EBUILD libzilla-1.3.ebuild 572 SHA256 1c74f0d1cba0f617f496d810d0cc51b469e97ddb30714d33d0e9c54a7351f05c SHA512 9a20f69144024f0c98feed616b558a0a934f672843fe20d81ffca3bc3a75831931fa453e4b1c61c40141033f37dded3eae6d19362d0d5ceb9d29422fc1130a97 WHIRLPOOL 89fa609f2e87a4b4d6d57afee1265f6ba5ae2e0c2338a8cae8dd89c31ea91ebe0d6b8a11e1fb7891693540b4e814e683f7fb6351573a46145c58b12a770c973c
+MISC ChangeLog 1526 SHA256 4e4b7fe07453a7840cd08e7931ecd28fc56e3799aec12dcd2725245a687ff38e SHA512 14dc6ee72601b3cf6631c65776baab01ebc467e3e3eaa2b02ce123b402e585557e02238fb5c1a2082906bc1944472a93e65cadf007226c2ed6d6766bd23dd496 WHIRLPOOL e27457aa2500bd05aace5ff9d5683854a2aa652093a752f86186be3565e3a43ddb8404d3cf3521ba99d6b51f6f26a08c93d169abfe96e828d6ab9e78f8c4c6c8
+MISC metadata.xml 418 SHA256 76b476ba384e2cb1c7b760d573b32ea98cb91be0faa63403ebe1af82a481ff9a SHA512 e382a0185c2c4f2968395ef7aff65364c0523f529b6003ab135285cffd13f80c718953090d6c845b31aefcdd4c8c38ebaadbb9a4fd44cb557586185e4a7f023e WHIRLPOOL faa43c75cec1e46a09cc070ac4d8a1d99cffb21cf00030ff95d8029915f152136f0ab8fb1d366579a1b324464a8636d9ecc886e79a42d145020382e2612c4570
diff --git a/dev-python/libzilla/libzilla-1.3.ebuild b/dev-python/libzilla/libzilla-1.3.ebuild
new file mode 100644
index 000000000000..e1ce63c71c89
--- /dev/null
+++ b/dev-python/libzilla/libzilla-1.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for managing Bugzilla bug reports from the CLI"
+HOMEPAGE="https://github.com/monsieurp/libzilla"
+SRC_URI="https://github.com/monsieurp/libzilla/archive/v${PV}.zip -> ${P}.zip"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-python/libzilla/metadata.xml b/dev-python/libzilla/metadata.xml
new file mode 100644
index 000000000000..5e1aebe4f3bf
--- /dev/null
+++ b/dev-python/libzilla/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">monsieurp/libzilla</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
new file mode 100644
index 000000000000..3a4ba4df717f
--- /dev/null
+++ b/dev-python/line_profiler/Manifest
@@ -0,0 +1,10 @@
+AUX line_profiler-1.0-fix-name-from-copypasta.patch 862 SHA256 58cfec02b45453c23de77a33b0639c3cdf732e01b5c8737db0bb40144789690e SHA512 6c36b574d6c031fe9c8d6dd7c59a033c5ec3dca25d675c52cea4d990e6044b5a413a347e2bd220f7912ce06e066c36839cec70af36e5153aad6c086a1d30eae6 WHIRLPOOL fe6d950dc8548f1c3c1e602f80825b02699b7eddc1525271008c582ef6876fed86317876a6c458a8bda0df7a29306fb721d1a28b8870692496c141df8f0af65a
+AUX line_profiler-1.0-ipython-5.0-compatibility.patch 11633 SHA256 6c9b22ae9af0f21892086dc74ef3f0601b9a5b61e54c5683b4d4be6add5eb56c SHA512 23019c545e348bc794dbb3c251e2f53c245723814c8439e5f00356494c9260a51fbe41efeebb97448bc206b1e1b0e6d8748318c261a5a6ffaee427fbce22bd8f WHIRLPOOL a44cb49041e475b97abca7131050bc052f60e822cd95ca155f015e76d2fb1eaf0e8fc9a6d185760c4f5d3e04339806485ecf9d8c98af695f0c2d4058e2a50375
+DIST line_profiler-1.0.tar.gz 65862 SHA256 a9e0c9ffa814f1215107c86c890afa8e63bec5a37d951f6f9d3668c1df2b1900 SHA512 15dd7ee10951287a5030eaff28e729e82094ec41d8e8dec803d5e44c6b9036ecbf1198365ef43c1fdd28451dec260c6491d118f1762d99fe037bb85eb7908dda WHIRLPOOL 1fd56ea4777a3c569807a124c708018fc77e68521d1f1ecdb13c343ddad3fcd881353cd71a0af36d06a12f1dd17be0f2731040fca5e827a4936298057dabf917
+DIST line_profiler-2.0.tar.gz 68478 SHA256 739f8ad0e4bcd0cb82e99afc09e00a0351234f6b3f0b1f7f0090a8a2fbbf8381 SHA512 c0335fc69fb47c150fa5555af4f7fdf4b172ca12ee6512e04ba854c4a81f3e6ee5594e484d11c8ea7e9e8048e3f3b8661db52332d4ac645195a0e050acea4ecb WHIRLPOOL 6f4a3816fb22c86fe1c691a3e949be41da7680055db5c0909dbfb9af4052cfa50640eca43e0e918e903c23c9e6b8858ebff76e4fa21d8648084ade74f45a2915
+EBUILD line_profiler-1.0-r1.ebuild 683 SHA256 d946ffc6009bc501cf5f9245f56cbddfcd0573af277d96b7586d9158174ae17a SHA512 48263a069ecb191cec782f78ab1056094ee79fd951fc4a3a1cad7355f6595f39bf2f89189f953c7855a8d510be0a9c6aad41c1132e646973d643506df7a20f40 WHIRLPOOL 07f27561c3ffdfe7c6e311995b9d2f206efa1ae696aebd4b6e8b6716901edd8d4398879db77a41292914fe2ecd73a0bb319ee1930caba2b5153ee08b5a085934
+EBUILD line_profiler-1.0.ebuild 568 SHA256 4096df35bd4ec1ac6b1f1ead62c01264cebe218091497856e8b652b6fc07b3aa SHA512 226f5ffc8cd8e12208d3e909504bb9cce15e9f809aaa927cefb7e16bb7ecb63d3c6318cf2ac342b1b84c6a1b5d90e842dbcc39a7acc6a02c5ea5f723ecbe8ebf WHIRLPOOL 446a0ff23a85984474d60b3ff2e86e768eecae0ffa1e194321432bb88e589496a41b9070b4700b5a9c1055d6d305481244a03e3cd80c1e1414d707f7f7060b22
+EBUILD line_profiler-2.0.ebuild 626 SHA256 c14ab4da54d358cbeeadaaf4271abd4ed5fae15a525fd068df25c2e9195f06a5 SHA512 8e93760d55b381eec44ed1f9a2f48850380fc5ca7553def3daca7df9b61d30bde61ce77e64f26029cb42b09ef4ec9e3795b7bd7a3d59682b0bd48f6336561426 WHIRLPOOL 1bc67c108c65795830fa8491f98e12412c81e539d14309e81904d698388f60b94e1aac58045d3f18237a43bf819f872fdcc569b3930720570c43c02b2804ad2a
+EBUILD line_profiler-9999.ebuild 582 SHA256 c1f28470633190bc2aab13cfe097d0d15459a03b6e6f64678712795829bd498f SHA512 4f50a2bf39ceb6d132c74705358d396ed5ff341fd8cda88f29c8cd5427a32e65c37c5c358ea620c3ca8fa85fa52c974bfd711df465c51f1bb778a196ae923662 WHIRLPOOL 148da9efa7b410635ee38d72852c57d111354b064360cb0bbf7c10f9455270c59ca27409f2c2b4b1fc68b9b4534ad5d9fb13c5d2872b58ca0d57390a04e192ac
+MISC ChangeLog 1573 SHA256 530818cc50f32d6f94fcc223bdd927bee164f44fa58b1702b485d9da021b7e65 SHA512 b4b9c6677275f933ecaf800384f4023c68533f986de2fa3d3bbff735cae8c5dc5411d6de4345d3a2d9475b77a86e228163b830341b400ca00b98c88ee5be81ab WHIRLPOOL fcb8ae0e9c058734d356d7434aff8c2e7a4d3993bb9c19dd8e4271e5b056ad1d95b1edac1539b979685d62c5adb07c7870361372874fe134dcce2e08496698e2
+MISC metadata.xml 810 SHA256 05dc5917ee16d3643827b02064945a1d877d9fcbd02710d4e5e0fab32482ee7c SHA512 6369d88b7412ba45e4d38bce909c198dc35db0e163e751f35b17b38739283fbb5b6d7da23e5cf147c4fcc08ebde39c394a8cef1e32d02de273fed1ad55552cea WHIRLPOOL 9005c81388b4d43352b1adf9fa5a94f96e13296db7250a3157bf3213a7d2c830e2224ffceae7bf0ad25b077a89cf5e36eeec7598bac78424808b5c11a9ec4465
diff --git a/dev-python/line_profiler/files/line_profiler-1.0-fix-name-from-copypasta.patch b/dev-python/line_profiler/files/line_profiler-1.0-fix-name-from-copypasta.patch
new file mode 100644
index 000000000000..e51a24f86171
--- /dev/null
+++ b/dev-python/line_profiler/files/line_profiler-1.0-fix-name-from-copypasta.patch
@@ -0,0 +1,25 @@
+From 717df8c2088087ea4bce870400a2c99b36b0e53d Mon Sep 17 00:00:00 2001
+From: Robert Kern <rkern@enthought.com>
+Date: Mon, 21 Dec 2015 19:25:51 +0000
+Subject: [PATCH] BUG: fix name from copypasta.
+
+Fixes #43
+
+Thanks, @anntzer!
+---
+ line_profiler.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/line_profiler.py b/line_profiler.py
+index 4480c7b..aac01c8 100755
+--- a/line_profiler.py
++++ b/line_profiler.py
+@@ -303,7 +303,7 @@ def magic_lprun(self, parameter_s=''):
+             mod = __import__(modname, fromlist=[''])
+             profile.add_module(mod)
+         except Exception as e:
+-            raise UsageError('Could not find module %r.\n%s: %s' % (name,
++            raise UsageError('Could not find module %r.\n%s: %s' % (modname,
+                 e.__class__.__name__, e))
+ 
+     # Add the profiler to the builtins for @profile.
diff --git a/dev-python/line_profiler/files/line_profiler-1.0-ipython-5.0-compatibility.patch b/dev-python/line_profiler/files/line_profiler-1.0-ipython-5.0-compatibility.patch
new file mode 100644
index 000000000000..04caa8c6987c
--- /dev/null
+++ b/dev-python/line_profiler/files/line_profiler-1.0-ipython-5.0-compatibility.patch
@@ -0,0 +1,299 @@
+https://github.com/rkern/line_profiler/pull/65
+
+From 677a43104dd537b515c06eaeffa77f8dcfa5a76e Mon Sep 17 00:00:00 2001
+From: Brett Olsen <brett.olsen@invitae.com>
+Date: Tue, 12 Jul 2016 10:18:28 -0700
+Subject: [PATCH 1] Update for compatibility with IPython 5.0
+
+Also tested with IPython 4.1.1.  Replaces the depreciated ip.define_magic() method with ip.register_magics() and some modifications to handle the different API required.
+---
+ line_profiler.py | 245 ++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 125 insertions(+), 120 deletions(-)
+
+diff --git a/line_profiler.py b/line_profiler.py
+index aac01c8..7645997 100755
+--- a/line_profiler.py
++++ b/line_profiler.py
+@@ -17,6 +17,8 @@
+ import os
+ import sys
+ 
++from IPython.core.magic import (Magics, magics_class, line_magic)
++
+ from _line_profiler import LineProfiler as CLineProfiler
+ 
+ # Python 2/3 compatibility utils
+@@ -226,150 +228,153 @@ def show_text(stats, unit, stream=None, stripzeros=False):
+     for (fn, lineno, name), timings in sorted(stats.items()):
+         show_func(fn, lineno, name, stats[fn, lineno, name], unit, stream=stream, stripzeros=stripzeros)
+ 
+-# A %lprun magic for IPython.
+-def magic_lprun(self, parameter_s=''):
+-    """ Execute a statement under the line-by-line profiler from the
+-    line_profiler module.
++@magics_class
++class LineProfilerMagics(Magics):
+ 
+-    Usage:
+-      %lprun -f func1 -f func2 <statement>
++    @line_magic
++    def lprun(self, parameter_s=''):
++        """ Execute a statement under the line-by-line profiler from the
++        line_profiler module.
+ 
+-    The given statement (which doesn't require quote marks) is run via the
+-    LineProfiler. Profiling is enabled for the functions specified by the -f
+-    options. The statistics will be shown side-by-side with the code through the
+-    pager once the statement has completed.
++        Usage:
++          %lprun -f func1 -f func2 <statement>
+ 
+-    Options:
++        The given statement (which doesn't require quote marks) is run via the
++        LineProfiler. Profiling is enabled for the functions specified by the -f
++        options. The statistics will be shown side-by-side with the code through the
++        pager once the statement has completed.
+ 
+-    -f <function>: LineProfiler only profiles functions and methods it is told
+-    to profile.  This option tells the profiler about these functions. Multiple
+-    -f options may be used. The argument may be any expression that gives
+-    a Python function or method object. However, one must be careful to avoid
+-    spaces that may confuse the option parser. Additionally, functions defined
+-    in the interpreter at the In[] prompt or via %run currently cannot be
+-    displayed.  Write these functions out to a separate file and import them.
++        Options:
+ 
+-    -m <module>: Get all the functions/methods in a module
++        -f <function>: LineProfiler only profiles functions and methods it is told
++        to profile.  This option tells the profiler about these functions. Multiple
++        -f options may be used. The argument may be any expression that gives
++        a Python function or method object. However, one must be careful to avoid
++        spaces that may confuse the option parser. Additionally, functions defined
++        in the interpreter at the In[] prompt or via %run currently cannot be
++        displayed.  Write these functions out to a separate file and import them.
+ 
+-    One or more -f or -m options are required to get any useful results.
++        -m <module>: Get all the functions/methods in a module
+ 
+-    -D <filename>: dump the raw statistics out to a pickle file on disk. The
+-    usual extension for this is ".lprof". These statistics may be viewed later
+-    by running line_profiler.py as a script.
++        One or more -f or -m options are required to get any useful results.
+ 
+-    -T <filename>: dump the text-formatted statistics with the code side-by-side
+-    out to a text file.
++        -D <filename>: dump the raw statistics out to a pickle file on disk. The
++        usual extension for this is ".lprof". These statistics may be viewed later
++        by running line_profiler.py as a script.
+ 
+-    -r: return the LineProfiler object after it has completed profiling.
++        -T <filename>: dump the text-formatted statistics with the code side-by-side
++        out to a text file.
+ 
+-    -s: strip out all entries from the print-out that have zeros.
+-    """
+-    # Local imports to avoid hard dependency.
+-    from distutils.version import LooseVersion
+-    import IPython
+-    ipython_version = LooseVersion(IPython.__version__)
+-    if ipython_version < '0.11':
+-        from IPython.genutils import page
+-        from IPython.ipstruct import Struct
+-        from IPython.ipapi import UsageError
+-    else:
+-        from IPython.core.page import page
+-        from IPython.utils.ipstruct import Struct
+-        from IPython.core.error import UsageError
+-
+-    # Escape quote markers.
+-    opts_def = Struct(D=[''], T=[''], f=[], m=[])
+-    parameter_s = parameter_s.replace('"', r'\"').replace("'", r"\'")
+-    opts, arg_str = self.parse_options(parameter_s, 'rsf:m:D:T:', list_all=True)
+-    opts.merge(opts_def)
+-
+-    global_ns = self.shell.user_global_ns
+-    local_ns = self.shell.user_ns
+-
+-    # Get the requested functions.
+-    funcs = []
+-    for name in opts.f:
+-        try:
+-            funcs.append(eval(name, global_ns, local_ns))
+-        except Exception as e:
+-            raise UsageError('Could not find function %r.\n%s: %s' % (name,
+-                e.__class__.__name__, e))
++        -r: return the LineProfiler object after it has completed profiling.
+ 
+-    profile = LineProfiler(*funcs)
++        -s: strip out all entries from the print-out that have zeros.
++        """
++        # Local imports to avoid hard dependency.
++        from distutils.version import LooseVersion
++        import IPython
++        ipython_version = LooseVersion(IPython.__version__)
++        if ipython_version < '0.11':
++            from IPython.genutils import page
++            from IPython.ipstruct import Struct
++            from IPython.ipapi import UsageError
++        else:
++            from IPython.core.page import page
++            from IPython.utils.ipstruct import Struct
++            from IPython.core.error import UsageError
++
++        # Escape quote markers.
++        opts_def = Struct(D=[''], T=[''], f=[], m=[])
++        parameter_s = parameter_s.replace('"', r'\"').replace("'", r"\'")
++        opts, arg_str = self.parse_options(parameter_s, 'rsf:m:D:T:', list_all=True)
++        opts.merge(opts_def)
++
++        global_ns = self.shell.user_global_ns
++        local_ns = self.shell.user_ns
++
++        # Get the requested functions.
++        funcs = []
++        for name in opts.f:
++            try:
++                funcs.append(eval(name, global_ns, local_ns))
++            except Exception as e:
++                raise UsageError('Could not find function %r.\n%s: %s' % (name,
++                    e.__class__.__name__, e))
+ 
+-    # Get the modules, too
+-    for modname in opts.m:
+-        try:
+-            mod = __import__(modname, fromlist=[''])
+-            profile.add_module(mod)
+-        except Exception as e:
+-            raise UsageError('Could not find module %r.\n%s: %s' % (modname,
+-                e.__class__.__name__, e))
+-
+-    # Add the profiler to the builtins for @profile.
+-    if PY3:
+-        import builtins
+-    else:
+-        import __builtin__ as builtins
++        profile = LineProfiler(*funcs)
+ 
+-    if 'profile' in builtins.__dict__:
+-        had_profile = True
+-        old_profile = builtins.__dict__['profile']
+-    else:
+-        had_profile = False
+-        old_profile = None
+-    builtins.__dict__['profile'] = profile
++        # Get the modules, too
++        for modname in opts.m:
++            try:
++                mod = __import__(modname, fromlist=[''])
++                profile.add_module(mod)
++            except Exception as e:
++                raise UsageError('Could not find module %r.\n%s: %s' % (modname,
++                    e.__class__.__name__, e))
++
++        # Add the profiler to the builtins for @profile.
++        if PY3:
++            import builtins
++        else:
++            import __builtin__ as builtins
++
++        if 'profile' in builtins.__dict__:
++            had_profile = True
++            old_profile = builtins.__dict__['profile']
++        else:
++            had_profile = False
++            old_profile = None
++        builtins.__dict__['profile'] = profile
+ 
+-    try:
+         try:
+-            profile.runctx(arg_str, global_ns, local_ns)
+-            message = ''
+-        except SystemExit:
+-            message = """*** SystemExit exception caught in code being profiled."""
+-        except KeyboardInterrupt:
+-            message = ("*** KeyboardInterrupt exception caught in code being "
+-                "profiled.")
+-    finally:
+-        if had_profile:
+-            builtins.__dict__['profile'] = old_profile
+-
+-    # Trap text output.
+-    stdout_trap = StringIO()
+-    profile.print_stats(stdout_trap, stripzeros='s' in opts)
+-    output = stdout_trap.getvalue()
+-    output = output.rstrip()
+-
+-    if ipython_version < '0.11':
+-        page(output, screen_lines=self.shell.rc.screen_length)
+-    else:
+-        page(output)
+-    print(message, end="")
++            try:
++                profile.runctx(arg_str, global_ns, local_ns)
++                message = ''
++            except SystemExit:
++                message = """*** SystemExit exception caught in code being profiled."""
++            except KeyboardInterrupt:
++                message = ("*** KeyboardInterrupt exception caught in code being "
++                    "profiled.")
++        finally:
++            if had_profile:
++                builtins.__dict__['profile'] = old_profile
++
++        # Trap text output.
++        stdout_trap = StringIO()
++        profile.print_stats(stdout_trap, stripzeros='s' in opts)
++        output = stdout_trap.getvalue()
++        output = output.rstrip()
++
++        if ipython_version < '0.11':
++            page(output, screen_lines=self.shell.rc.screen_length)
++        else:
++            page(output)
++        print(message, end="")
+ 
+-    dump_file = opts.D[0]
+-    if dump_file:
+-        profile.dump_stats(dump_file)
+-        print('\n*** Profile stats pickled to file %r. %s' % (
+-            dump_file, message))
++        dump_file = opts.D[0]
++        if dump_file:
++            profile.dump_stats(dump_file)
++            print('\n*** Profile stats pickled to file %r. %s' % (
++                dump_file, message))
+ 
+-    text_file = opts.T[0]
+-    if text_file:
+-        pfile = open(text_file, 'w')
+-        pfile.write(output)
+-        pfile.close()
+-        print('\n*** Profile printout saved to text file %r. %s' % (
+-            text_file, message))
++        text_file = opts.T[0]
++        if text_file:
++            pfile = open(text_file, 'w')
++            pfile.write(output)
++            pfile.close()
++            print('\n*** Profile printout saved to text file %r. %s' % (
++                text_file, message))
+ 
+-    return_value = None
+-    if 'r' in opts:
+-        return_value = profile
++        return_value = None
++        if 'r' in opts:
++            return_value = profile
+ 
+-    return return_value
++        return return_value
+ 
+ 
+ def load_ipython_extension(ip):
+     """ API for IPython to recognize this module as an IPython extension.
+     """
+-    ip.define_magic('lprun', magic_lprun)
++    ip.register_magics(LineProfilerMagics)
+ 
+ 
+ def load_stats(filename):
diff --git a/dev-python/line_profiler/line_profiler-1.0-r1.ebuild b/dev-python/line_profiler/line_profiler-1.0-r1.ebuild
new file mode 100644
index 000000000000..6dbe4b315ca2
--- /dev/null
+++ b/dev-python/line_profiler/line_profiler-1.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Line-by-line profiler"
+HOMEPAGE="https://github.com/rkern/line_profiler"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-name-from-copypasta.patch"
+	"${FILESDIR}/${P}-ipython-5.0-compatibility.patch"
+)
+
+python_test() {
+	"${PYTHON}" -m unittest discover -v "${S}"/tests/ \
+		|| die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/line_profiler/line_profiler-1.0.ebuild b/dev-python/line_profiler/line_profiler-1.0.ebuild
new file mode 100644
index 000000000000..802d85e74204
--- /dev/null
+++ b/dev-python/line_profiler/line_profiler-1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Line-by-line profiler"
+HOMEPAGE="https://github.com/rkern/line_profiler"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	"
+
+python_test() {
+	"${PYTHON}" -m unittest discover -v "${S}"/tests/ \
+		|| die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/line_profiler/line_profiler-2.0.ebuild b/dev-python/line_profiler/line_profiler-2.0.ebuild
new file mode 100644
index 000000000000..81d586184a05
--- /dev/null
+++ b/dev-python/line_profiler/line_profiler-2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Line-by-line profiler"
+HOMEPAGE="https://github.com/rkern/line_profiler"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v "${S}"/tests/ \
+		|| die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/line_profiler/line_profiler-9999.ebuild b/dev-python/line_profiler/line_profiler-9999.ebuild
new file mode 100644
index 000000000000..cbcda89a1905
--- /dev/null
+++ b/dev-python/line_profiler/line_profiler-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Line-by-line profiler"
+HOMEPAGE="https://github.com/rkern/line_profiler"
+EGIT_REPO_URI="https://github.com/rkern/${PN}.git"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS=""
+IUSE="test"
+
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	"
+
+python_test() {
+	"${PYTHON}" -m unittest discover -v "${S}"/tests/ \
+		|| die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/line_profiler/metadata.xml b/dev-python/line_profiler/metadata.xml
new file mode 100644
index 000000000000..a5ab15f42671
--- /dev/null
+++ b/dev-python/line_profiler/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>marbre@linux.sungazer.de</email>
+    <name>Marius Brehler</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    line_profiler is a module for doing line-by-line profiling of
+    functions. kernprof is a convenient script for running either
+    line_profiler or the Python standard library's cProfile or profile
+    modules, depending on what is available.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">line_profiler</remote-id>
+    <remote-id type="github">rkern/line_profiler</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/linecache2/Manifest b/dev-python/linecache2/Manifest
new file mode 100644
index 000000000000..3fac4d4ad211
--- /dev/null
+++ b/dev-python/linecache2/Manifest
@@ -0,0 +1,5 @@
+DIST linecache2-1.0.0.tar.gz 11013 SHA256 4b26ff4e7110db76eeb6f5a7b64a82623839d595c2038eeda662f2a2db78e97c SHA512 e585a6e4c054c1965bc4241a1e36b57cb04f32b2d778df0ae4381975700497975251f509354d3622e36c82973c726a207b815f8b12060d9d583b6669a9eb279e WHIRLPOOL 2968c4d82a8655bd91d487c814eef00f0edfdbb2c41642fcce78826efb467554f06e9951ce6bf6a9b2ed92ce4cf3edbaa77fe3b51c557aae561c486a62dabbb0
+EBUILD linecache2-1.0.0.ebuild 756 SHA256 fc17edb8aa68f02929ddf415354bea0dc2287bc6c8db732dd30461cf85930193 SHA512 94ecd6483467c8dbf587035e20cfdd43e74f95080ce80062d7d399c9213a8af3f31fd26811fe0ada4847825408b691fc8f10086912b072e2b2a0b8fc05b61b2d WHIRLPOOL b73f9f49f941c81b4546ad6563cedb1a336fc315af0ca8ecf9a70df534f78200ce6a5b3dc05bf7581b226ff6dabce6b62f5a5407633b29ddb9cbf4a4dad71a36
+MISC ChangeLog 5141 SHA256 54c6daf6983005199bd82c64b3d362663056275018fe485016f216b6ad93a195 SHA512 6f1313f42d76f88e521ed6263739b0e5dd998364b7deecffe9026eae09b2c16769479d48448b653d7b1b839f3a3beb444235fbc13707fc857fb7421564bd018e WHIRLPOOL b192982a9a88e3d2fb63d90d94c6f2a97bdea07a088ed2b23a7f2cc710a304899ff9866059aa0d4e77de2a6bb4d71bc9ae45126d5d0b745a2367bc594a81284d
+MISC ChangeLog-2015 1104 SHA256 a088c3225e9cc697175bebf51c91fdc375f6c5006a50a300b416f7fa1178c132 SHA512 ffd4fe3b90b0244e13dd67ed89783b138448b38fa3ab2c35d77e926aa1b9512bc2381aef8138ba4ffe62204adab411a1ca25cc9899ec1c4696c48fa09c09ff0d WHIRLPOOL 4950a68e352070f4de5a7cd8eca898301b4a910a8e0b05a0c2ffbf5e0eb720b71c1e9cea3132c3220e815e6c42c2212ffed7daa80596969586b7556644af28d0
+MISC metadata.xml 383 SHA256 a43c4b8344e57a337cce4a00ea6c1c890aa89d6d40b97b6f6a38943180a1853a SHA512 07f4ff74dbdcfab1287a21982ce8a349b75a7ca246c4a75e3fd46db60a6d333af9140adc731ac56874e38aafa635182e5148dff46e355eacd99666dae0340762 WHIRLPOOL 4aa77cd247d5c4160ccd12cc4a93316f48c32d307cceb0e3655962ca4130b2397292fee56168e1e8d49f43b2374d2d7386775e4c4a79ad00de9ab849e3cbd3b2
diff --git a/dev-python/linecache2/linecache2-1.0.0.ebuild b/dev-python/linecache2/linecache2-1.0.0.ebuild
new file mode 100644
index 000000000000..81e3384415e8
--- /dev/null
+++ b/dev-python/linecache2/linecache2-1.0.0.ebuild
@@ -0,0 +1,31 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Backports of the linecache module"
+HOMEPAGE="https://github.com/testing-cabal/linecache2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND=""
+
+python_test() {
+	"${PYTHON}" -m unittest2 discover || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/linecache2/metadata.xml b/dev-python/linecache2/metadata.xml
new file mode 100644
index 000000000000..42b1b3e69e3e
--- /dev/null
+++ b/dev-python/linecache2/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">linecache2</remote-id>
+		<remote-id type="github">testing-cabal/linecache2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
new file mode 100644
index 000000000000..765c68749d38
--- /dev/null
+++ b/dev-python/lit/Manifest
@@ -0,0 +1,10 @@
+DIST llvm-3.9.0.src.tar.xz 18235716 SHA256 66c73179da42cee1386371641241f79ded250e117a79f571bbd69e56daa48948 SHA512 f18ae32531218ab156c3e56c11826be0fd05f0799c82eaf2e6a043b38e1277560b4d921987513b88b11d97ea2619feaf277eec72181dd2ae4f4108c2836bf7b2 WHIRLPOOL a36c1bcee6e7995067a9a7a51e3fdb0f10d51d0239250eefab92ed2e46b024a203fa10a17a25a5aca69046bcb413628e288427f1a6690d0862e07cd95694c8a8
+DIST llvm-4.0.1.src.tar.xz 21065652 SHA256 da783db1f82d516791179fe103c71706046561f7972b18f0049242dee6712b51 SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d WHIRLPOOL 1626ff270f7ce4801d02a0797b227fda9314ff5c0c01d653111599e9a4d2854c4d9edc3c698a7abee8d79d6bce8b18dc619fbced3c07ca610d44a248d65830cc
+DIST llvm-5.0.0.src.tar.xz 23411980 SHA256 e35dcbae6084adcf4abb32514127c5eabd7d63b733852ccdb31e06f1373136da SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a WHIRLPOOL 6a99edbdc3e6726dc8ff9126b110fd7560faac46601407722e6dd80b5d894ff242521dc8fda7f4d879de83dac51c65645a37224f7e8def0d8d2f1e564b0531bb
+EBUILD lit-3.9.0.ebuild 778 SHA256 d0350f0c473c5dbc586a547de40e6844abc0bb1e04ac7d90f4fb35d525c6eeeb SHA512 016f2dd37dc1d09e7ab480a9e6c0373a3c76266c5d68ccb9f98f249f82ba1b3d3f9a86359f9bcb41e9dc71f3ba82a4b81b9103d33bb07b16acb825ad71d3a3c6 WHIRLPOOL 00f5c2edf5e98f3043bcb4f476ed9085753155cecf6b5957099ea992ea0c6c7d2d2d44a57a51901f95cddb9431b203b345d4dfb6107cd679c7f6964454a50270
+EBUILD lit-4.0.1.ebuild 746 SHA256 465dd81a9c08c27df9eeecbb60b9230cd7e17b2f18adbdf5c98852d77b708d02 SHA512 806d2a845240d2544c5550a9cf2f67846961b9cf70cd4e780ca4281ae88e000769e5b74e8cc40754ffe2615cc916fa9e1c4f254268e0a027876c8ddc96c4de76 WHIRLPOOL 370e50ff8976dc4d676a261cece8d56ee41072712419881e0d89d17a2b63efaa67622d56507f71ebcad9486a4d20b6b47e5c79a1c7b52cc90128036532d6c0f9
+EBUILD lit-5.0.0.ebuild 762 SHA256 fe797ddc5c2eb90c351f087a3f74678ad4bb7bf374b59d387250e47edaa62f45 SHA512 47e1442c6ec4005737145556d900fe0bb4e763c1042cc3014c7374b6dc9fd88b5ffacb50211f0a833de5b0dd7d2b869cb293d8da72405a4f827dfe59663c1fec WHIRLPOOL 2d071210031fbe086c031f8385242834ba68c6e2532c0f6358269265355f5970aa503133dbb5c9795617e9fb3ed6b2ce882924c9f0a3c705606de006f4f805bc
+EBUILD lit-5.0.9999.ebuild 782 SHA256 b9099610c0b9d57e497489bd91654ed44e86378595f2e2a1ad3b6a2e28886927 SHA512 e9657bdfc870359ff803e6dbd4670cadbd5f5bc474941b598aef3c96183a02da7d02a69afb46c2763674bc5193ebadfc4d5c3a8c026adec48fc4aecf0a0e079d WHIRLPOOL 509acd253b366646193bb7f8406ac009fb4a1253ca7d0fd6d3e2843a6dc5907c161b193ced31f23f61f976ee122a26d79b2407c44a8c030255baa06aeadf7815
+EBUILD lit-9999.ebuild 757 SHA256 92267bfb77662b054ce90d845348d49ddcad5706602a0d3043e5a6b70fc488e0 SHA512 3a4bdf72b99ec4de11874d8757ed75d3dfc0072dbcb441aff1f27c0c663a24e6e7063e0ed3a77a372ba177d3e7a0cccbc388361e8c46b52c66e08e8fca338460 WHIRLPOOL c9d48d9e499a16a21f38a18f59e0929e9629f5c499801772a6217055be4e18b46c6fdee8b0d68fd5bdc35b86e8f4bac6e419c2a8571e35ad7276daf202722cf8
+MISC ChangeLog 510 SHA256 e7c9cd6bc5b3a0aeac1970cbf158561915b48111102ac29e6d196bbe2d345b12 SHA512 868b7233b44e2b16b0b89d12ffdfe0961310af63c590433c1f763f5b8500c0a8c893c6d52b06ae9e63a7a11ead2db169906f6b035b55b713b37044dfcd3c8c76 WHIRLPOOL bfed991a7f04d70e20aac101573b890f5a3da80f2c54a7a8679ac9882c7b6f27ce188f0d1d72755f12fe76c919fb88f91f80843e59e319257af52ee4c358041e
+MISC metadata.xml 216 SHA256 e94ba81dd2791908508a3993afdebf723cc617314c53c273b9bcca15a9c48327 SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5 WHIRLPOOL 29145f5721e079e0548c5ef22424c65e6a5b2bfc4428918e923fcfdfc37e9b8749fb63e3c2eb5773c17fab276f7513dd66e326b906f1848911dceba7ae4b419a
diff --git a/dev-python/lit/lit-3.9.0.ebuild b/dev-python/lit/lit-3.9.0.ebuild
new file mode 100644
index 000000000000..4a0384b88247
--- /dev/null
+++ b/dev-python/lit/lit-3.9.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+MY_P=llvm-${PV}
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://llvm.org/releases/${PV}/${MY_P}.src.tar.xz"
+EGIT_REPO_URI="https://llvm.org/git/llvm.git
+	https://github.com/llvm-mirror/llvm.git"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+S=${WORKDIR}/${MY_P}.src/utils/lit
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+DEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+python_test() {
+	./lit.py -sv tests || die
+}
diff --git a/dev-python/lit/lit-4.0.1.ebuild b/dev-python/lit/lit-4.0.1.ebuild
new file mode 100644
index 000000000000..0531b4bca56c
--- /dev/null
+++ b/dev-python/lit/lit-4.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+MY_P=llvm-${PV/_/}
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.src.tar.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+S=${WORKDIR}/${MY_P}.src/utils/lit
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+python_test() {
+	./lit.py -sv tests || die
+}
diff --git a/dev-python/lit/lit-5.0.0.ebuild b/dev-python/lit/lit-5.0.0.ebuild
new file mode 100644
index 000000000000..37bfadb1be7e
--- /dev/null
+++ b/dev-python/lit/lit-5.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+MY_P=llvm-${PV/_/}
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.src.tar.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+S=${WORKDIR}/${MY_P}.src/utils/lit
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+python_test() {
+	./lit.py -sv tests || die
+}
diff --git a/dev-python/lit/lit-5.0.9999.ebuild b/dev-python/lit/lit-5.0.9999.ebuild
new file mode 100644
index 000000000000..61b9ce3ec021
--- /dev/null
+++ b/dev-python/lit/lit-5.0.9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1 git-r3
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
+	https://github.com/llvm-mirror/llvm.git"
+EGIT_BRANCH="release_50"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+S=${WORKDIR}/${P}/utils/lit
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+python_test() {
+	./lit.py -sv tests || die
+}
diff --git a/dev-python/lit/lit-9999.ebuild b/dev-python/lit/lit-9999.ebuild
new file mode 100644
index 000000000000..063e1421607b
--- /dev/null
+++ b/dev-python/lit/lit-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1 git-r3
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
+	https://github.com/llvm-mirror/llvm.git"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+S=${WORKDIR}/${P}/utils/lit
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+python_test() {
+	./lit.py -vv tests || die
+}
diff --git a/dev-python/lit/metadata.xml b/dev-python/lit/metadata.xml
new file mode 100644
index 000000000000..89c4bdb96049
--- /dev/null
+++ b/dev-python/lit/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>llvm@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/livereload/Manifest b/dev-python/livereload/Manifest
new file mode 100644
index 000000000000..920261c849b3
--- /dev/null
+++ b/dev-python/livereload/Manifest
@@ -0,0 +1,10 @@
+AUX fix-tests.patch 2230 SHA256 8786c0e0ed3a3f08a9e6745a9196ac32e6a384cf5786244091ae3531e64c6a05 SHA512 ca99482a11acd94428ff441bab2b85bfea3c49c2bde74a99f754324f4e7e8d966f2d3fef5cc367e69003979a8cc26b505a975e7a1e7ddaa5b3ca357d6b806301 WHIRLPOOL 51c07ba64726ed9697a88b92588b62fa6172c39d994c70029bbe3b90f9ef7b7486df047e96e8658e6483100c3855cc458dcd4b0fe5692ec4276d62676452c93f
+DIST livereload-2.3.2.tar.gz 24119 SHA256 fa2959005a134d767409c129cbf94528a0eb5022c915da9c685e14f1adb81b63 SHA512 59dc5be184d80a8b3aa6f98a6bc12f98f2efe00a0497deadfe5275222be2e0865e182cf0d83fc7a6e5f7297a7bf26a30c3ad9af5eeb2517af8b7ab3946e4bb1d WHIRLPOOL acf0c4ffa017a65d67423bb28b36cfd4e8acec59c47cc845f98669a3368920fa1e4e33b4c86e00082aeb416225066091305adcf1e8919071825a192ab5127180
+DIST livereload-2.4.0.tar.gz 25258 SHA256 a3f162357d886710a317f6f8c0595ac1db176bd9db171f0ca751c4954c29b5e2 SHA512 9b961ed41224359e986873973840fae43387af1b773328ab1262d095879aeff98090d736d696abdfcd9b2f1c127a061a29d044df7cfa15ba218b0162576093a3 WHIRLPOOL 268d274d57b1e7f7587fd690dac2bae7051dde2d1b110a8953a84eea6e08017488d4ee0e59fbc1bb0a9468d7925913ca8cb28a74c13c291fd7e004a5322160cf
+DIST livereload-2.4.1.tar.gz 25593 SHA256 8a29fe9c869181f8e1617c2e32d6a3bf896d7da20267dc682150e7c98d230b55 SHA512 9106fe1894092ab336270f539be41d4db2d277560a41898e45014e34783ab0b601c993a5a5831c951d313db98ea835aecc8eb31468ba186e243a28df75bfe9bb WHIRLPOOL 70142a5bc1c6c7c4d2af20840eff93a19db7842dfa8b1d3ffd79904c924e9f6e9f93fd6c3dac976d22ace3cdbb833eb57f2ccb26b6abf0e03d67a57d97d845fd
+EBUILD livereload-2.3.2.ebuild 898 SHA256 90914895804bf65fa39dd09f4294ed25c42afec2371e529e8b008858d60fd4c7 SHA512 3378e093a9fa7bfbb1c1983a2bc20d5ac815573cc7d4121c9a6994d2d2bff97a3566d2df200d278a19e7ffc0c8a958d80bb3271c6a4f670723ef171750c9405d WHIRLPOOL 13c1164ab4a043d164c4173a7f4dc4c51e96252cb513ed0765e58f7a21214667e20fdb5cfb3ab902640d37b9f8aaf4995ac5a59e38fe64016ab8a15010e9ab7f
+EBUILD livereload-2.4.0.ebuild 857 SHA256 746bf966e00d9767f343aa6419461e05b917145a7a31201a6bac2e1ddeaa0923 SHA512 d934f170ef4ab92b2f26064ccc42a5b5145d8f3a00d189467a94c37cfd576ee93820b89b69a313f691d6684625f8ad36fea51dbb6d34beb1b134494c2dee3fdb WHIRLPOOL f14228bec197ecae3c73ae862a520513bd75eafe42d1a7f35add35538b8583fa62b7259fd16bc2bf5de7afbf0652983760bea44ef67cf2ea3f07395a49ea1211
+EBUILD livereload-2.4.1.ebuild 862 SHA256 33975d333c2bcb8e165611af45e2c88e2400d5be279ed3169c88939da494024d SHA512 fa6ecc738ba79b41bab45743bcffe42653c614f5c2bf681940141aebeca1cce1390ebcaf438bd5ee0cebc89d8096f3c0679ee4ec0631237bd9208515c8ff295b WHIRLPOOL 728bfc17820ed514ab6410650bf0aa21feba4914c3eb7945788200dc426f5bc3f06c3ae496003fe2e2b94c6d9ebdf84f94519bad087d21f142aa1bbcffd19ad9
+MISC ChangeLog 2616 SHA256 0f6bd2b14d73a716ba0ae305cd3142ae45ba3ea05f3eeca6dc5b3abf26d26782 SHA512 286e1f0514083aff31e6b27604cfa6c154f6fe3aa0618259a6fd2ebcdc4b2bd6229e85c7d7d3205114ff838591fd29b6a81028720a24058d3b25e156a14305bb WHIRLPOOL e536f7753219d5671804cf1ac5d2873fa5b331db8b42cd4349b5d70fdde769609f8e118dcbe1d2a989b54dde8e042af9fa022671d37a8b504f86dc0155be5ce5
+MISC ChangeLog-2015 739 SHA256 6c1e20530d6793e339189dd564722ebdc195ac9fedc7724f918f3b5d5c670738 SHA512 1256f489a9375431c71b72b1f13c432253f17fef806053efdddaeb20234ecaee4a8b4f55f10457943295948c4d2703b1c8813044aa4b177bf732943d66e21d51 WHIRLPOOL dcdd5d2acce30d47650e2f56bbdbc409c9743f6cdadcd499488df2a1aa1e5284c94809cef431496fc5f811b8836681431dbbbce3cbdd1ff88f2e7b7432ec2192
+MISC metadata.xml 336 SHA256 3df91ead96483a8e20f944c7b0ed22199d5908f0bc0c32a95e107624a4f853e8 SHA512 941dfac2634cb5bfe9250bdb75c192e0994b978251de8627232534448e28c5bbcefd0b0f7ae36c6cce3a746058a2c623af39b2f890bd366b1f8b20cb98e3dfd3 WHIRLPOOL a9b69469d50910babccd3e7b09b3dec5c70473755a0505142e976f66af509c860a200015f34b80818b2af57d5174a0623712bbececc272442e7d2efbb940c606
diff --git a/dev-python/livereload/files/fix-tests.patch b/dev-python/livereload/files/fix-tests.patch
new file mode 100644
index 000000000000..2c9208ad17aa
--- /dev/null
+++ b/dev-python/livereload/files/fix-tests.patch
@@ -0,0 +1,77 @@
+diff --git a/tests/test_watcher.py b/tests/test_watcher.py
+index fa0ae41..5310bdc 100644
+--- a/tests/test_watcher.py
++++ b/tests/test_watcher.py
+@@ -3,18 +3,22 @@
+ import os
+ import time
+ import shutil
++import unittest
+ from livereload.watcher import Watcher
+ 
+ tmpdir = os.path.join(os.path.dirname(__file__), 'tmp')
+ 
+ 
+-class TestWatcher(object):
++class TestWatcher(unittest.TestCase):
+ 
+     def setUp(self):
+         if os.path.isdir(tmpdir):
+             shutil.rmtree(tmpdir)
+         os.mkdir(tmpdir)
+ 
++    def tearDown(self):
++        shutil.rmtree(tmpdir)
++
+     def test_watch_dir(self):
+         os.mkdir(os.path.join(tmpdir, '.git'))
+         os.mkdir(os.path.join(tmpdir, '.hg'))
+@@ -25,6 +29,9 @@ class TestWatcher(object):
+         watcher.watch(tmpdir)
+         assert watcher.is_changed(tmpdir) is False
+ 
++        # sleep 1 second so that mtime will be different
++        time.sleep(1)
++
+         with open(os.path.join(tmpdir, 'foo'), 'w') as f:
+             f.write('')
+ 
+@@ -35,6 +42,9 @@ class TestWatcher(object):
+         watcher = Watcher()
+         watcher.count = 0
+ 
++        # sleep 1 second so that mtime will be different
++        time.sleep(1)
++
+         filepath = os.path.join(tmpdir, 'foo')
+         with open(filepath, 'w') as f:
+             f.write('')
+@@ -51,22 +61,24 @@ class TestWatcher(object):
+         with open(filepath, 'w') as f:
+             f.write('')
+ 
+-        assert watcher.examine() == os.path.abspath(filepath)
++        rv = watcher.examine()
++        assert rv[0] == os.path.abspath(filepath)
+         assert watcher.count == 1
+ 
+     def test_watch_glob(self):
+         watcher = Watcher()
+         watcher.watch(tmpdir + '/*')
+-        assert watcher.examine() is None
++        assert watcher.examine() == (None, None)
+ 
+         with open(os.path.join(tmpdir, 'foo.pyc'), 'w') as f:
+             f.write('')
+ 
+-        assert watcher.examine() is None
++        assert watcher.examine() == (None, None)
+ 
+         filepath = os.path.join(tmpdir, 'foo')
+ 
+         with open(filepath, 'w') as f:
+             f.write('')
+ 
+-        assert watcher.examine() == os.path.abspath(filepath)
++        rv = watcher.examine()
++        assert rv[0] == os.path.abspath(filepath)
diff --git a/dev-python/livereload/livereload-2.3.2.ebuild b/dev-python/livereload/livereload-2.3.2.ebuild
new file mode 100644
index 000000000000..53379d37ad1d
--- /dev/null
+++ b/dev-python/livereload/livereload-2.3.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python LiveReload is an awesome tool for web developers"
+HOMEPAGE="https://github.com/lepture/python-livereload"
+SRC_URI="https://github.com/lepture/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="examples test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="www-servers/tornado[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/fix-tests.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( example/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/livereload/livereload-2.4.0.ebuild b/dev-python/livereload/livereload-2.4.0.ebuild
new file mode 100644
index 000000000000..f6eee14f1ff5
--- /dev/null
+++ b/dev-python/livereload/livereload-2.4.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python LiveReload is an awesome tool for web developers"
+HOMEPAGE="https://github.com/lepture/python-livereload"
+SRC_URI="https://github.com/lepture/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="
+	${CDEPEND}
+	dev-python/six[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	nosetests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( example/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/livereload/livereload-2.4.1.ebuild b/dev-python/livereload/livereload-2.4.1.ebuild
new file mode 100644
index 000000000000..e3b937af1d0a
--- /dev/null
+++ b/dev-python/livereload/livereload-2.4.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python LiveReload is an awesome tool for web developers"
+HOMEPAGE="https://github.com/lepture/python-livereload"
+SRC_URI="https://github.com/lepture/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="examples test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="
+	${CDEPEND}
+	dev-python/six[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	nosetests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( example/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/livereload/metadata.xml b/dev-python/livereload/metadata.xml
new file mode 100644
index 000000000000..fcbde6cbf668
--- /dev/null
+++ b/dev-python/livereload/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lepture/python-livereload</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/llfuse/Manifest b/dev-python/llfuse/Manifest
new file mode 100644
index 000000000000..e7584dbf4ef3
--- /dev/null
+++ b/dev-python/llfuse/Manifest
@@ -0,0 +1,8 @@
+AUX llfuse-1.3-cflags.patch 752 SHA256 7de4f9ca778a01e020542e5b36b9b0485782e2d02ce1ef300d8a80701f4da840 SHA512 e0751e90fa89fe7fff6844b5be3cd8b55cbe4c62fb3341643a9049ff54c2e8bccc439ce444822b9d0858c83a3cd12dbede5253f9a9e6544ef26747a19f8f233a WHIRLPOOL 66fe412be5235a06687a5785749a3a41ecf9ad2bac1ff51781f6c944e6e8a01f0c841c89c926b58d009565f3d323c81f742c29ac34c8f31e2d7ff343853f0c1f
+DIST llfuse-1.2.tar.bz2 327967 SHA256 24d3ff1dd793db0c03cbbfb298df94a369ecdce5831f8f175ec12d647ad01586 SHA512 0c31ac385a98211f8696857654ea187c5f18b655b65199696923bcc66d079a5e2a6f7260ac4f6da17b25ed57c9cb1314ce62fabb3b538a87e4286bbd0763390b WHIRLPOOL c3c2d2cc022f6aeafc3b167e6ce4c0e8e3a2c6b302e1f9fd0bdbcfd48bf92415b41d333cb4d02f186fee2308fec9a9fa633608353190bedb39321636cd5b9c5a
+DIST llfuse-1.3.tar.bz2 335418 SHA256 d1ab2c7cdaeed1c4c99882f2ad44df3906db263b832d76de18291e484c685bd2 SHA512 10d6c6dba20031106334559bd84d9477db70cf5e940f5e379716af1140bacaa4defe533cca51ac718e4d37b44414e34c7dcf48274c6fdd8ecc422f2f438552ee WHIRLPOOL ff0ab29ed312e788365da421b9f40b56edfad9cd6df5024351b29f46d41ab57844e98a9b7a4dc5e4bd157b50cc1ba8dfa7933d55f617ace3ee6ee19aa61232e0
+EBUILD llfuse-1.2.ebuild 952 SHA256 8dd603d3a92ea6baa8070f9bbdb7397f092e8f0e11c27ba733772d038427d6f6 SHA512 cfc1dbb3edd2e3f3830055172fcc912e90fa7732e0ed7009cecec3dd9996ce917e39f623bc10a40bb04aaf1f82cbeb63e597604e404b8ba5a54d309cc5e6c29d WHIRLPOOL fe11b01780a33406dd76049b37e6a26c72bb04a17783dea3e98dd53491a67222d540e85c34b35ca34612b717a438f2ef253b1a4712c83fc7fa0c11aae470afe2
+EBUILD llfuse-1.3.ebuild 1016 SHA256 7a710a921d7bb5c624bfb91918127343e59f93be3ea8942ba71f4ddb138dc872 SHA512 2e80d8167d2ce5d27f55653956b65e6c6d0fa3edf96f26a292577212f1db962f0820c1c9ccce5e3e66a75d85e1775da16f418b969638247c02e808b5bfce3293 WHIRLPOOL adbca2bc606164b09c9634273dbc3492ca969080d9df593e4a6c856c8f25fc5e1cf46dfc7e7e5fd91973b520eecda77e414949bcdf3bf988033b24323cda3ff2
+MISC ChangeLog 4368 SHA256 00f6dee6d5d3db17098449cfd76b52cf5a196d17c82387eeb18dacee5c79f678 SHA512 cc42f2604890e32e874a7438964e881aaf2a6bb57a79b450a5fe9ddd0c3bc30d80a9f0213a309afda5a7806174559780e2921b074c94c7cb071d255eb57d5ea8 WHIRLPOOL f7b785ccf34f2083c3b495305266a3b83dbb64ef31d76707f3eefd7e2bfc3468f562f9f6b42f3166a6ba5bb47a3db8e102aaa00686abc01ded9d34bce09cb078
+MISC ChangeLog-2015 2508 SHA256 ab6470a9048e43233da7409a241c236941866b116357085ba5f013e99aae42a8 SHA512 ed101b1542214dfd8fc89171448c8c5033914d35112cfa965acbeb199fc08118896f5d36e952948b151ab37cb7979a83d7f6b563002309d66f8316d977c284f5 WHIRLPOOL b4d0d32e6199630fb76ac5dcdc00ed6a564d36c7168a4dde747a20bbb5539d3409f132cc6e3c353145a667d421eceef17a30e4a4e2ddd9af6fc8ffb01142b874
+MISC metadata.xml 309 SHA256 c0629eea6bed3c14bcfc118078e8a83bd9a8daaf6d9906d14d2ee5587e6146f6 SHA512 31061d2419abdc0ded07625ee0a21bc77162b15db90e2559ab9ce71e8a3aed1c866de5aebd8b1b24f566b79a85a45bec4c941542d268daf9df65bdb711d59342 WHIRLPOOL 1da1583094b8afeeb41766a58f1344154f92f1502171310bb27f39a8b4178a5a6ae93f17acf226d3a8d708a667dce3c5990e35c5d0cdd01664ca1960c27dbd78
diff --git a/dev-python/llfuse/files/llfuse-1.3-cflags.patch b/dev-python/llfuse/files/llfuse-1.3-cflags.patch
new file mode 100644
index 000000000000..42e4eef82a02
--- /dev/null
+++ b/dev-python/llfuse/files/llfuse-1.3-cflags.patch
@@ -0,0 +1,19 @@
+Build fails under pypy(3) when enabling these flags.
+
+--- llfuse-1.3/setup.py
++++ llfuse-1.3/setup.py
+@@ -84,12 +84,12 @@
+     compile_args.append('-Wno-unused-parameter')
+ 
+     # Value-changing conversions should always be explicit.
+-    compile_args.append('-Werror=conversion')
++    # compile_args.append('-Werror=conversion')
+ 
+     # Note that (i > -1) is false if i is unsigned (-1 will be converted to
+     # a large positive value). We certainly don't want to do this by
+     # accident.
+-    compile_args.append('-Werror=sign-compare')
++    # compile_args.append('-Werror=sign-compare')
+ 
+     # Enable all fatal warnings only when compiling from Mercurial tip.
+     # (otherwise we break forward compatibility because compilation with newer
diff --git a/dev-python/llfuse/llfuse-1.2.ebuild b/dev-python/llfuse/llfuse-1.2.ebuild
new file mode 100644
index 000000000000..97dda6a7932e
--- /dev/null
+++ b/dev-python/llfuse/llfuse-1.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the low-level FUSE API"
+HOMEPAGE="https://bitbucket.org/nikratio/python-llfuse/ https://pypi.python.org/pypi/llfuse"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples test"
+
+RDEPEND=">=sys-fs/fuse-2.8.0
+	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' python2_7)
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/llfuse/llfuse-1.3.ebuild b/dev-python/llfuse/llfuse-1.3.ebuild
new file mode 100644
index 000000000000..761de45bf852
--- /dev/null
+++ b/dev-python/llfuse/llfuse-1.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the low-level FUSE API"
+HOMEPAGE="https://bitbucket.org/nikratio/python-llfuse/ https://pypi.python.org/pypi/llfuse"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND=">=sys-fs/fuse-2.8.0:0
+	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' python2_7 pypy)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/llfuse/metadata.xml b/dev-python/llfuse/metadata.xml
new file mode 100644
index 000000000000..9460e17f2acd
--- /dev/null
+++ b/dev-python/llfuse/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">llfuse</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
new file mode 100644
index 000000000000..80c4d23645ff
--- /dev/null
+++ b/dev-python/llvmlite/Manifest
@@ -0,0 +1,14 @@
+AUX llvmlite-0.15.0-use-system-six.patch 1274 SHA256 b05dd74c09c3fa05fa82b35feb9e63c2919cf54b1492265c12b401f6e875f979 SHA512 5db6b819e0a9e0d6b7963272ef7fd9c9fee778cb4c2d577325de6602e7a283a98752e870b83df4978d063c84b73045e2f65bc9aeb482dd487255efe24792db69 WHIRLPOOL c62bb164cef6ff3b652ca2ea4bed7946d8fe704bf012bb037ae86d0052c1dae95c4debaf5520b92592bfae9abbdc1fa8596657c92022cb33ed1076a4e812c27d
+DIST llvmlite-0.12.1.tar.gz 88271 SHA256 3ce71beebd4cbc7a49abe4eadfc99725477fd43caeb7405650ebb746c7a1d0df SHA512 f5b448f0ae3d84a0d3438dd7bb4c7f87055e551191c4fefb6282539029d25e8c5e1cca9dec5b90c0d99ec0a720719133b2ccf8b9551aa818c3b4626cc522d8d9 WHIRLPOOL 82b3e60520eda83d0e4082d75ca377bd34c9baf7c67688814e6dd3a7ae687b1eacf7ddd9758254e0c61f39ea5af77c847a15f1f8071cf030d9dd07bb2b1020a5
+DIST llvmlite-0.15.0.tar.gz 95009 SHA256 c855835537eda61f3a0d19aedc44f006d5084a2d322aee8ffa87aa06bb800dc4 SHA512 db49ed82eae989e7e7abbd72f1c1da5129887f7fce447c684085f98ae2aaf47d24e73b79c5916802edbb8dc55dda92efeac833cb903300560b1aa89f2aeb5dca WHIRLPOOL 66336fa610ae2706c9281f5e7febc8e76e0cacf8cbc151952f6978adb104bcc6b98ac65d9661c7289f258e1e63a1e6e4a139f93efc45cdfd2a26f50c35bc03fb
+DIST llvmlite-0.16.0.tar.gz 95284 SHA256 ef3bae32482f91742d91571b5225a6943804291eb9405b98090a7b50942ec5e9 SHA512 97a251ef9d840fc5a25bd673c644207750f2e653ccad5850dec0a7f1bc77170c6ce85d5cd663ab5c109cb1b51ced9545493d35ef81dfe04a3696b5a0c37fa768 WHIRLPOOL ab629a507c2cc27756109162469a0eed8f4dbb059b7c3957df65e059c6e613581fed6380b58686812ed5378a9d2ebe5f754e6de1a5132c89a323b221da203e91
+DIST llvmlite-0.19.0.tar.gz 97109 SHA256 fbaeb3d584e0f6bac82a33776e9b5f0b5b4a3415a03edeff5d66f6176f0edbe2 SHA512 93551bbab519021abdc66ca099b9090b3af54b048adbce8d16f3700c066bbc4f5c24e5234a8a1ac4bfcdf8bf74d0ac52bb7023251ac948af6ef99fbd5a5324c8 WHIRLPOOL ee6170c09ac897862fee4705b8131f6dfb97a980c8aec73a9316f7d0d57dfeb4a0e3bd629f536cfeb51df682b4838b1c4e267ff3ebaf54f2f5db7193062014f5
+DIST llvmlite-0.20.0.tar.gz 96753 SHA256 b2f174848df16bb9195a07fec102110a06d018da736bd9b3570a54d44c797c29 SHA512 c2e0918e7acfba68922f60889180ec660da13ea199c9e8dfb3ac075c295baeb8c90784a6acc3c463cdd696f8f61c42226548d38db5bd8c4397a23cfa7c7ff764 WHIRLPOOL 8eae219cce74a106ddf48b771b210589775a4fea37f8267ed7e496b078d92503fe955edc371326cf3261d9707461f996585209cd30183cc81f5b6f204b1aa293
+EBUILD llvmlite-0.12.1.ebuild 1083 SHA256 39ac0812575ebe7b5982bb09ccfdabb67a199d590440d809b992427b94342c91 SHA512 304d08d1a6842102692a288fc0cdb47a88f94ef07a05e1903d6acc07950eb2a936a206355c244bd9628c564a9da6bb8d42f2fefe9472782cae9022a08f37a660 WHIRLPOOL 67b18d4cee415fd6b7a9090366fd1ac8fbcb2e17dbadec401f74fe69ce8c3639c61aed78bd5dca961376737df3c94b6151c3e6538f17bc9e5c400e868ccfd104
+EBUILD llvmlite-0.15.0.ebuild 972 SHA256 fbbc62a674b8a8195c5fa779ecac4894f97afe192591a7f171bf5a21482a812f SHA512 3d44e8322b75d9005413c580075b05e26c9bdaadd3b36fc31da80d3cd9db6091905bae3cf1215cb63c0017d66ae02775391c873129a223acef6c5013de804137 WHIRLPOOL 35ba0fb8f956e9a405816e5c580f9cac2b4425ae40c22d5201ec1438e872e23c086f6887167618326c36489386cd0c0b9de4cf89308f4524d1b0661b57361c32
+EBUILD llvmlite-0.16.0.ebuild 1198 SHA256 8ca92924a3329997a792c0461d8fa1b218e2d0340e8d1d59e4be835385b2d568 SHA512 79b761d1c155eaa10b123575908b66d78797e7265c78a8bfdd81963fc53396f6e47ffdb39d57f64b781ab2d6e55a3fd628093bc68827ea2845a107f9262ef40d WHIRLPOOL ef0dfa9b77f99b9d2f5ed2daa6fe7e5f3be55d22aeae8d22e6964a2ad02cf0471896ca50d659066b4291e184a4ea7734fddbde10b0129d2baf66a9eb729da0f4
+EBUILD llvmlite-0.19.0.ebuild 1288 SHA256 b2b39bcf270ca32b60657ce67bab39149c0d794969e7c4b8ba055ef3d055df02 SHA512 81f241338e6d2e249b8ee7a9b9dbc184f47ed6c461259437f664400f49b2ebcd45c5434dffbd8781f0f6b34e93a8ceaf1394353df5ccb67a19158c72ff5d0db4 WHIRLPOOL a66d0054a971135320b512f2e7a59445d36bf9d5a54ead9398c96c69517c7679dbcf8ca5e2398a073882f439799df5f324eef2cf0366643c767e298b4895985e
+EBUILD llvmlite-0.20.0.ebuild 1288 SHA256 b2b39bcf270ca32b60657ce67bab39149c0d794969e7c4b8ba055ef3d055df02 SHA512 81f241338e6d2e249b8ee7a9b9dbc184f47ed6c461259437f664400f49b2ebcd45c5434dffbd8781f0f6b34e93a8ceaf1394353df5ccb67a19158c72ff5d0db4 WHIRLPOOL a66d0054a971135320b512f2e7a59445d36bf9d5a54ead9398c96c69517c7679dbcf8ca5e2398a073882f439799df5f324eef2cf0366643c767e298b4895985e
+MISC ChangeLog 4292 SHA256 c4e0b1bd3172db58479173e6fb626184125b92b64c3cfe01fa608fc5c8e10d55 SHA512 40c271840595f5a6758cfc4773eba185ade60d708e71a93095eda51cc00bc402bc9fa1d24b6124875a17b27d288b16bf858da3ccc67cbd772419ee8b3e7af95c WHIRLPOOL 865ef80c6f0b921bf36e9c513e9a536a028cb0ca2e32f53c77a18560982b7f3668f8b61bb25e295fc41366e481352246cd86a0e2df67c91ada4871838d7b6e83
+MISC ChangeLog-2015 1246 SHA256 2553bf87a635b787f38e4f9bd8a9aeddf1f25b13765eb2dee53ea0c39d2f3de4 SHA512 9d9beda83216e2d06d377249c2a97c591e393930da2891dcb6260ecbdccc390d47461e67c919d74a9fffa9be0c2f45804013582aa8abd901a84ea95d6c0d093f WHIRLPOOL a24eb7e0ef4438ab06473e63ac46f59465208b5a2117c155a24f8f8fb2fcccc0ef09134250a00a6ab3d675212ef1fec9e8abaa0d48fc39da00468937edc20200
+MISC metadata.xml 792 SHA256 5516cba431a5716f0a44f2af171e87bab77084987c051f239ea9b2b241f7e90c SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a WHIRLPOOL 51402fc235b08509617f606cc96ec5a000041de31966b54edbb4742d1a9b85bf82ac190c074d41243f82c25873953e3deeaf96ebc7ef1c92df0304e54d713f77
diff --git a/dev-python/llvmlite/files/llvmlite-0.15.0-use-system-six.patch b/dev-python/llvmlite/files/llvmlite-0.15.0-use-system-six.patch
new file mode 100644
index 000000000000..f7cfeae404ad
--- /dev/null
+++ b/dev-python/llvmlite/files/llvmlite-0.15.0-use-system-six.patch
@@ -0,0 +1,50 @@
+Description: use packaged six instead of stripped module
+Author: Daniel Stender <debian@danielstender.com>
+Forwarded: not-needed
+Last-Update: 2016-21-06
+
+--- a/llvmlite/binding/ffi.py
++++ b/llvmlite/binding/ffi.py
+@@ -3,7 +3,7 @@ import os
+ 
+ from .common import _decode_string, _is_shutting_down
+ from ..utils import get_library_name
+-from ..six import PY2
++from six import PY2
+ 
+ 
+ def _make_opaque_ref(name):
+--- a/llvmlite/ir/values.py
++++ b/llvmlite/ir/values.py
+@@ -7,7 +7,7 @@ from __future__ import print_function, absolute_import
+ 
+ import string
+ 
+-from .. import six
++import six
+ from . import types, _utils
+ from ._utils import _StrCaching, _StringReferenceCaching, _HasMetadata
+ 
+--- a/llvmlite/tests/customize.py
++++ b/llvmlite/tests/customize.py
+@@ -12,7 +12,7 @@ import unittest
+ import warnings
+ from unittest import result, runner, signals
+ 
+-from ..six import StringIO
++from six import StringIO
+ 
+ 
+ # "unittest.main" is really the TestProgram class!
+--- a/llvmlite/tests/test_binding.py
++++ b/llvmlite/tests/test_binding.py
+@@ -12,7 +12,8 @@ import subprocess
+ import sys
+ import unittest
+ 
+-from llvmlite import six, ir
++from llvmlite import ir
++import six
+ from llvmlite import binding as llvm
+ from llvmlite.binding import ffi
+ from . import TestCase
diff --git a/dev-python/llvmlite/llvmlite-0.12.1.ebuild b/dev-python/llvmlite/llvmlite-0.12.1.ebuild
new file mode 100644
index 000000000000..52f240ea76f0
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.12.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DISTUTILS_IN_SOURCE_BUILD="1"
+RESTRICT="test"
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="https://pypi.python.org/pypi/llvmlite"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+RDEPEND="
+	=sys-devel/llvm-3.7*
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3)
+	"
+DEPEND="${RDEPEND}
+	dev-util/cmake"
+
+python_prepare_all() {
+	sed -i -e 's/-flto$/-flto -fPIC/' \
+		-e 's/-static-libstdc++ //' ffi/Makefile.linux || die
+
+	# disable test using installed instance to read version info
+	sed -e 's:test_version:_&:' -i llvmlite/tests/test_binding.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" -m "llvmlite.tests" || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/llvmlite/llvmlite-0.15.0.ebuild b/dev-python/llvmlite/llvmlite-0.15.0.ebuild
new file mode 100644
index 000000000000..9649c7db2954
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.15.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="http://llvmlite.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	=sys-devel/llvm-3.8*
+	sys-libs/zlib:0=
+	virtual/python-enum34[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-use-system-six.patch
+)
+
+python_prepare_all() {
+	sed -e 's/-flto$/-flto -fPIC/' \
+		-i ffi/Makefile.linux || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/llvmlite/llvmlite-0.16.0.ebuild b/dev-python/llvmlite/llvmlite-0.16.0.ebuild
new file mode 100644
index 000000000000..47ce82f48703
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.16.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="http://llvmlite.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	=sys-devel/llvm-3.9*
+	sys-libs/zlib:0=
+	virtual/python-enum34[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+PATCHES=(
+	"${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
+)
+
+python_prepare_all() {
+	# remove -static-libstdc++, it makes no sense with shared LLVM
+	# add -fPIC, needed to link against shared libraries
+	# disable -flto, we do not force it against user's wishes
+	sed -e 's/-static-libstdc++/-fPIC/' \
+		-e '/^(CXX|LD)_FLTO_FLAGS/d' \
+		-i ffi/Makefile.linux || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/llvmlite/llvmlite-0.19.0.ebuild b/dev-python/llvmlite/llvmlite-0.19.0.ebuild
new file mode 100644
index 000000000000..1f4d10f64b16
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.19.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 llvm
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="http://llvmlite.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+LLVM_MAX_SLOT=4
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-libs/zlib:0=
+	virtual/python-enum34[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+PATCHES=(
+	"${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
+)
+
+python_prepare_all() {
+	# disable -flto, we do not force it against user's wishes
+	# add -fPIC, needed to link against shared libraries
+	# plus use those vars to force our CXXFLAGS/LDFLAGS in...
+	export CXX_FLTO_FLAGS="${CXXFLAGS} -fPIC"
+	export LD_FLTO_FLAGS="${LDFLAGS} -fPIC"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/llvmlite/llvmlite-0.20.0.ebuild b/dev-python/llvmlite/llvmlite-0.20.0.ebuild
new file mode 100644
index 000000000000..1f4d10f64b16
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.20.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 llvm
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="http://llvmlite.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+LLVM_MAX_SLOT=4
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-libs/zlib:0=
+	virtual/python-enum34[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+PATCHES=(
+	"${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
+)
+
+python_prepare_all() {
+	# disable -flto, we do not force it against user's wishes
+	# add -fPIC, needed to link against shared libraries
+	# plus use those vars to force our CXXFLAGS/LDFLAGS in...
+	export CXX_FLTO_FLAGS="${CXXFLAGS} -fPIC"
+	export LD_FLTO_FLAGS="${LDFLAGS} -fPIC"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/llvmlite/metadata.xml b/dev-python/llvmlite/metadata.xml
new file mode 100644
index 000000000000..3f12f0b34215
--- /dev/null
+++ b/dev-python/llvmlite/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="project">
+    <email>llvm@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+    llvmlite uses the LLVM library for JIT (just-in-time) compilation of
+    Python code into native machine instructions during runtime. Instead
+    of exposing large parts of the LLVM C++ API for direct calls into the
+    LLVM library, llvmlite follows a lightweight multi-layered approach.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">llvmlite</remote-id>
+    <remote-id type="github">numba/llvmlite</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/lmdb/Manifest b/dev-python/lmdb/Manifest
new file mode 100644
index 000000000000..f1554c1d2a2c
--- /dev/null
+++ b/dev-python/lmdb/Manifest
@@ -0,0 +1,3 @@
+DIST lmdb-0.92.tar.gz 155720 SHA256 3d73238ab0e1f9d8b8ea4916b66f9e91574ec64f844f91b6e9374e894036dc06 SHA512 5177abe0c441fb9067ad84de0cafda960113042404507eaf36194efe614fbc9fda37668b9d8a07d4a7f674b0c1a267194ddfb241834a3b1db0d8026f53841cf2 WHIRLPOOL eeddff397808f18e76dd68a45f68b946d11233ccfbf0318587e5c5b9f109f96d3821b584f55715fc9be380cfc33288088f65453fbdab17cc20852a81ebfbe576
+EBUILD lmdb-0.92.ebuild 575 SHA256 f88c45d9586e02fb56a7e8686af6c710c891978657c7d24790328bd1c95ddb29 SHA512 104ed200189ae4d5d32e4f77b3dfd6b646008189761cdd4dfa25bdbf86f148b2b47d7d7a973e0f6f150250b5032f9c9c8663d8d1e4053de58b370ef39f599c56 WHIRLPOOL 1c8e6912d100a9b391cab2b480ab1b04eddc27b8768cb1c0cf6ce264edb56dfe35f452ee04292722814ad0ea058cec18a0f8c584b9289ab710ab1ab8dfed15e8
+MISC metadata.xml 369 SHA256 28a5bf49e38927cf7789e969fe2402bdb342cc083ef901e4721f6395f4c80253 SHA512 4b2ad4e50acca757e8a1ff4e659ae99c8c42788ba6cc1e1d503cb371cb897443e6fbe3b7c2f7f8ca0b6409da9e7a7961a644aaf615d306da8172687caddff3bd WHIRLPOOL 42c057cb5374e811dd362c2423e80dc015867b8bd1e7358d69fef0ad5d73d8534c6485c84b4bfc79f5ec995bfb330fdd21521a59e7af1873c32e0240a216e1bb
diff --git a/dev-python/lmdb/lmdb-0.92.ebuild b/dev-python/lmdb/lmdb-0.92.ebuild
new file mode 100644
index 000000000000..3e152d59d2f9
--- /dev/null
+++ b/dev-python/lmdb/lmdb-0.92.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the Lightning Database"
+HOMEPAGE="https://github.com/dw/py-lmdb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="OPENLDAP"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-db/lmdb:="
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_compile() {
+	LMDB_FORCE_SYSTEM=1 distutils-r1_python_compile
+}
diff --git a/dev-python/lmdb/metadata.xml b/dev-python/lmdb/metadata.xml
new file mode 100644
index 000000000000..06b93698919c
--- /dev/null
+++ b/dev-python/lmdb/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">lmdb</remote-id>
+    <remote-id type="github">dw/py-lmdb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/locket/Manifest b/dev-python/locket/Manifest
new file mode 100644
index 000000000000..e280b822d4e3
--- /dev/null
+++ b/dev-python/locket/Manifest
@@ -0,0 +1,4 @@
+DIST locket-0.2.0.tar.gz 3506 SHA256 1fee63c1153db602b50154684f5725564e63a0f6d09366a1cb13dffcec179fb4 SHA512 ed9bb25f3fcaa70386217716db5612bf31a923c669cbdb8e871de6df4c0c42bf3309604a1aac804c0f334aed8c88b0ba113d8d265054c0e87793c7b53f729ff9 WHIRLPOOL 549d6dc28db38fb23e4b5761ca8120caac82d435cf96f39f294ac38e011e4c1f8b6af91c526cbfb12d4fb353b6ec1da5e8814f1d66744398bf3aea7f3a4f39ba
+EBUILD locket-0.2.0.ebuild 456 SHA256 271e093e82ba497bb404690178ba1c002b308336f69a0b8251aea8ea9cab1031 SHA512 78b5f19af0d017a8302d424a529bb21af9aaa3c41b96d61a2c5a738e04d9e97f2985d1efbf263c466356137f63c3d08a759c315bef993f1f4229a6fc465d2a8a WHIRLPOOL d7b1cf62d7a08767144fe32f61a1760866b8fbc6306598979a514418aecad994ca199afde03d382b47f25039a575b4ece7fc9cb8c05b4e9423bfeb029c5ff8c1
+MISC ChangeLog 1114 SHA256 b2d6c9d3e18d337d776e553db11be8447598bab15e53f07bfaa054f8306cb9dc SHA512 1601e0e0dc9b9bae76eda0032118f3f590531658468993ae14e8af4d162dc5472194a71706af3f45217edfa303180169daeb89f471e5d93f9792b738b84278ae WHIRLPOOL 00dfb02436251620fc46c20ce5ba086e0d52a09089d3a804d54b164f8c288ba46e34282afb8583e9a28a103559a748056c0ba930b79452832db750b8b9e05f0b
+MISC metadata.xml 534 SHA256 88b1ce131c1ec610f044a56b02fb077b34abf0e9fb52ae4e41690200b25ea74e SHA512 9e37c3571558f195d20d84d2785dd3866c8c035c21d6b62b5c25ea0f4f57ad8fad6e08b0071bc08c21b39d92188c31aeab930a678f0e7d014a7acba8b25d082d WHIRLPOOL 6ef3114590cc58d737b33e6a87be0d5699c19214d83ba406195c508bb64a3e309cb7f7025e3a002de6a4840d11287e20fb7c02163fede9a8f282671e1ef39c2d
diff --git a/dev-python/locket/locket-0.2.0.ebuild b/dev-python/locket/locket-0.2.0.ebuild
new file mode 100644
index 000000000000..1b7a1b9907b4
--- /dev/null
+++ b/dev-python/locket/locket-0.2.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="File-based locks for Python"
+HOMEPAGE="https://github.com/mwilliamson/locket.py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/locket/metadata.xml b/dev-python/locket/metadata.xml
new file mode 100644
index 000000000000..9aea7a2046ad
--- /dev/null
+++ b/dev-python/locket/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Locket implements a lock that can be used by multiple processes provided they use the same path.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">locket</remote-id>
+    <remote-id type="github">mwilliamson/locket.py</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/lockfile/Manifest b/dev-python/lockfile/Manifest
new file mode 100644
index 000000000000..75f9ebda89b5
--- /dev/null
+++ b/dev-python/lockfile/Manifest
@@ -0,0 +1,7 @@
+DIST lockfile-0.11.0.tar.gz 20909 SHA256 eed7e0c829135aaaf2a9df83652bc6e2cc50175d933741c25aac0394674e7fd3 SHA512 6c4c69e1434194076a99f8134a2558c791675d420a17687dfd5b38c1303564392ecc388ec285d55a20027bcbcbc1b3475a489b70390796c46346b89d4b18ad89 WHIRLPOOL 3fe41cec5f22109ce17e249a02469201e74cc6facd18bbcd5d6b75984f1f72e66d36eab68772d9bc6aa0c1ef6597f3bdf8f8757d9f867323d152cca8a47a445f
+DIST lockfile-0.12.2.tar.gz 20874 SHA256 6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799 SHA512 67b7d651d7e963a497c2604912c61eed90181cdd09c744a0ceaa26e6bbe09d1a871ce48be3949b7da7ea6b366b15492c8c8de589edeca2641ca5e6cb3804df07 WHIRLPOOL a8aeb69cfeb0c190885fce7198ebfdb898b361806816a3b902e8764ad909cec8497dc5f09004bec2c0bbc6a88c057a4104e9a40e93fd25bb32437f4b63de491a
+EBUILD lockfile-0.11.0-r1.ebuild 1259 SHA256 dd1d1a44808618e80634fbb9019222e8fb409382e090d48b56f80f4cc74be5fb SHA512 883c9eb0e3ef7792ba65fbb1e622c9a63ae635dad5e2d23900670978faa61593999a18ab8432411e5edf43149e77b735cd7bb316b61b24082415969065d68445 WHIRLPOOL c2d04b8cd54a09281c27854e668a6b1109fb66d17d7d483742479452ac83c0ffd75af38bcfaf3cf215a0538c7cb360b8082c12dd6008bf0ebcd061380829faec
+EBUILD lockfile-0.12.2.ebuild 1191 SHA256 c3a1b5468dc104e5b10e74a4530a7d9cfc5b1311dcf19197b2cf34f88c19d4ba SHA512 2a95be5b416c4abbf1d477eccb6e3f9c88e4bbf28f28ce6f897220c4a628e5fc6fb11921cd893b78830fdbe80cbf8a138159d51f433afe61c9eeb21584f806ab WHIRLPOOL d4457abaee998c9925d570823e36484bf8f1ee793fda06a491c60e9ee584815d5f09b0ce2c33234104d7eb929950c52ac2aa4a0582e3389e46d3a320521ea7b4
+MISC ChangeLog 8861 SHA256 0dac2b0e47356ff2512a35f0ff94c208fc993bea30d9aba618aaadb6ce15a9d5 SHA512 385fca122071298baa1e478a518e0bc6148d78d2f4ed885a2fa25e149ced8c63fd3f57c039df4be405bb4be7487686ea2bb4086360a3770c2a7b3bb1fafd50a9 WHIRLPOOL eb1a786e155527fbe4df8a59cda0d9a9fd6a8460b804cf3a6d8438ba7204db0cfadfb52444e2e6e2d2ba535cf5c2e404bd7e88714aeda90e08e1dedc394a7c39
+MISC ChangeLog-2015 3916 SHA256 b7cb172a9a6f2b2ab50a136e77bf301e56ff42e9ab1b177dcdfef412bab5bae2 SHA512 d3e8144da3e7d27e533d44db9a4646d76a7a704c1a08dbf5796e6acf49ed78d638f600afc4a78a24f8219a94fb9b7144dec7d7056bf00cfe758d77289bf43b0b WHIRLPOOL f9866d12d44f9c84fac7891f1f7d4f54ea088772cf2ac3ccdd6786b5ef50c5d5272fdcf91ddf7aef73dd6a7307733bc00ab62ce46c67ce2c63799e7ecafb6207
+MISC metadata.xml 364 SHA256 3b1572a1632c29112798c0cc38efcb2128d222f316bc77ca2bb65c78f6db0448 SHA512 b736cd5f710ac2c628d8379aa69fbf3cf5015a1edd80405ee695d56d0a0f86bc40c8ecbe70083338e6b7fdd115d11318358f5fd04b2397e0ab5ab7b315bfad5b WHIRLPOOL f194d07ce60638fce09ebecfc9b54b67b4f31470da29d0251ba0dbc0191fb8d9b7ab171220ec743830f3682943bed012757e70ded353b51badca8123696e52cb
diff --git a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
new file mode 100644
index 000000000000..f468b85dff61
--- /dev/null
+++ b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
@@ -0,0 +1,48 @@
+# 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 pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Platform-independent file locking module"
+HOMEPAGE="https://launchpad.net/pylockfile https://pypi.python.org/pypi/lockfile"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="doc test"
+
+DEPEND="
+	>dev-python/pbr-0.7[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+DOCS=( ACKS AUTHORS ChangeLog README.rst RELEASE-NOTES )
+
+python_prepare_all() {
+	rm requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		einfo "Generation of documentation"
+		emake -C doc/source html || die "Generation of documentation failed"
+	fi
+}
+
+python_test() {
+	# "${PYTHON}" test/test_lockfile.py yeilds no informative coverage output
+	nosetests || die "test_lockfile failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/source/.build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/lockfile/lockfile-0.12.2.ebuild b/dev-python/lockfile/lockfile-0.12.2.ebuild
new file mode 100644
index 000000000000..d772d7000ea4
--- /dev/null
+++ b/dev-python/lockfile/lockfile-0.12.2.ebuild
@@ -0,0 +1,43 @@
+# 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 pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Platform-independent file locking module"
+HOMEPAGE="https://launchpad.net/pylockfile https://pypi.python.org/pypi/lockfile"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc test"
+
+DEPEND="
+	>dev-python/pbr-1.8[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+DOCS=( ACKS AUTHORS ChangeLog README.rst RELEASE-NOTES )
+
+python_compile_all() {
+	if use doc; then
+		einfo "Generation of documentation"
+		emake -C doc/source html || die "Generation of documentation failed"
+	fi
+}
+
+python_test() {
+	# "${PYTHON}" test/test_lockfile.py yeilds no informative coverage output
+	nosetests --verbose || die "test_lockfile failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/source/.build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/lockfile/metadata.xml b/dev-python/lockfile/metadata.xml
new file mode 100644
index 000000000000..385ef5e60b67
--- /dev/null
+++ b/dev-python/lockfile/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">lockfile</remote-id>
+		<remote-id type="launchpad">pylockfile</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/locustio/Manifest b/dev-python/locustio/Manifest
new file mode 100644
index 000000000000..203e8127bfc5
--- /dev/null
+++ b/dev-python/locustio/Manifest
@@ -0,0 +1,5 @@
+DIST locustio-0.7.3.tar.gz 89300 SHA256 220e1f97ece2def3454aeecc5070419518e4e16c5aa39d21eb509a38f47847ec SHA512 fe2434691218be0749c0bf7c2c26b6b3172b7dd69898667441aa98a67ac5e5fbb513aebd27bd54c10f423da452f734c2d6ab7a52f4641755439cd3b81a82eee4 WHIRLPOOL f7e485f9bbfbf30dbe9d55c7642dbb10df3616d5f7c11612218adea4113b519a4a0b084f35f32de73181150edddc6e5d7f698eb453462987c727c1d5dc9b0661
+EBUILD locustio-0.7.3.ebuild 747 SHA256 7ace91be4b82d5dae7b2896a76a880ac91cc9e556fb701432c6ef559283fbf96 SHA512 45c7c5ec6e1c2590ac02e93ddf0c217d4c3a82ff4f960294437a25e2546ad1a2b815394f059fb2168b6af074ed8ae9d1a125dca93f7d4a6c51ed21577e965d64 WHIRLPOOL a04b4b5ae2d3dbffd2726f343385ed7623b34dcec96f4a88a5b17ea48801490d14e5fb06f98d57042b5bee3bbd544ea358c36305b2ea0696bd4b9e1ff5150dd1
+MISC ChangeLog 2432 SHA256 45ce2c805985b332dbc06748d50dc6d8dc2dd7881fb1d316b3f77a0a3568a941 SHA512 d8526ecd2dd3dd72286c4744806e830a0976aa6bfe4734637989cee1bba77d0278291ba53bdf7ca695a5125d1b3d49773a7f0b36dfdee4764c554e506e0b6502 WHIRLPOOL 9d94233ef86c35ebee2783ad83ac762d071f0339a6b2f2ac382edea667a9d3a9691681bae7ea5e6e5b4eafb6cfd8def00de7baff3d38f0c63711450f8e8b9f28
+MISC ChangeLog-2015 426 SHA256 d878de2899c3dd39c2570649225e7c27b4e236a73cadb4139a76ed48380b0cdd SHA512 326df274c04e48aea82aac4bf1c5ad70573e4950b9be04134a94dd4548b1a29ee59c039e311c7c88f79e73069145a8fd8fa35e854280a8f4132e7fc61255cdce WHIRLPOOL b992a2ab6b6c7b4b19ef7220c1b3f4e6423c71416640eca3946947cce56d03145796187ee1ac22c62ab31a488ab49edd35031f6fda7ba52a4685cea7e79aeabd
+MISC metadata.xml 375 SHA256 238f978194c0a437774061d20281d1f05b610a5795fa4559005822487cf42920 SHA512 6bd93bd6d77b281cf7ffcc4cfdfceae7247a4461bc619cf5b935841e3befe385cd1c26b5da8bf20e0e551cfed0c73278e82cda16736cc2fae6b5cd69fa0cf805 WHIRLPOOL 60167197269890fa216243c5048b0eba4a3dedf9e16afe9f5b9e7f938848f3ba48d8d90f852bb3ec43f2327403ef4258879224469a178d1ff5a7ff16cc54e301
diff --git a/dev-python/locustio/locustio-0.7.3.ebuild b/dev-python/locustio/locustio-0.7.3.ebuild
new file mode 100644
index 000000000000..7892ab1e586c
--- /dev/null
+++ b/dev-python/locustio/locustio-0.7.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(python2_7)
+inherit distutils-r1
+
+DESCRIPTION="A python utility for doing easy, distributed load testing of a web site"
+HOMEPAGE="http://locust.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pyzmq[${PYTHON_USEDEP}]
+	)"
+RDEPEND=">=dev-python/gevent-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.2[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/locustio/metadata.xml b/dev-python/locustio/metadata.xml
new file mode 100644
index 000000000000..42b654393052
--- /dev/null
+++ b/dev-python/locustio/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">locustio</remote-id>
+	<remote-id type="github">locustio/locust</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/log4py/Manifest b/dev-python/log4py/Manifest
new file mode 100644
index 000000000000..7e0c0e4f3342
--- /dev/null
+++ b/dev-python/log4py/Manifest
@@ -0,0 +1,5 @@
+DIST log4py-1.3.tar.gz 14926 SHA256 dc80ab6048b0f727c96b7fd9f0d279543e6f716fb08c32cdeaf96ac91675290b SHA512 683352f00c2cbb3afdd938d7b30a524f543db6b336c69a6a10acecdab08febba384fcc7a55b0d55a56c389dfd6b74c5e6f26345680fc7b4e29adcbe66f45e9ad WHIRLPOOL 2d709bb7a7f31368f5a8fc0509234451fc24ded075582675013975628aea3b1cdb6c4cb8e78077537683b82875c57b3af582a7652a5c80adfaeadb0d45d8cc9d
+EBUILD log4py-1.3-r1.ebuild 673 SHA256 2353ce5c6c761e6b5842010a9a15354d7f0099f0a2a05556c6f1819bd8b3a018 SHA512 6f70b4178f67c213a39333af178f45b76d43a106d4abb547161bef7ac2506d3d6286e07f158d57399aed4002a3b21a92b2a30e0b67bcc90bd715bcc447e904e0 WHIRLPOOL 92e9997dced857569801c74999265d41ea1cc0dbc43a1c622fc6e8fe3d7ef6dbcf764727e1b63d8e00caf378328e8d8972087903cef0d739dedc476ec1abded7
+MISC ChangeLog 2428 SHA256 714d2de128e790f0f9393b6d4b3434f40c4120d46f4d7ceb705d57782927bfc4 SHA512 0997c9837bd99ae2922a0ed7177378ca72034035a915ef755f3f35b6dc9c4131b7f645a3f7094c12de26376187af49abf99bff2cabffda5cdd07e81d291d9068 WHIRLPOOL 19c433e0860a109f3376b0972446b836d6bc70e923c2b32d77a992275f6046f60fec68cbe98b1c9297427fc693c85d2b8936f8ff820acedaafb900cd6d4c3326
+MISC ChangeLog-2015 2644 SHA256 ce6349ee36ee8a864d18d8640685fa51baa20fef3b76118590884b2db3d9b796 SHA512 5cf16401f252d7ca8bb174e656357c7922a3b3e8f06c09797451e2ad2a97efe96030f2e5d92d50f4945a21478742174def19dd95e95b8dc65641b73ee62aa1cb WHIRLPOOL 687babec7c2e1ebb9f3827f21078a6b94c11fb1499dbe1437c0ea5d284e0b0f343f5af2cc433adb8b8e7b64f35b6f08e70ba8d83fd5f29751b20bd67c0af0c68
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/log4py/log4py-1.3-r1.ebuild b/dev-python/log4py/log4py-1.3-r1.ebuild
new file mode 100644
index 000000000000..40621831e88f
--- /dev/null
+++ b/dev-python/log4py/log4py-1.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A python logging module similar to log4j"
+HOMEPAGE="http://www.its4you.at/english/log4py.html"
+SRC_URI="http://www.its4you.at/downloads/files/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ia64 ppc sparc x86"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND=""
+
+DOCS="doc/AUTHORS doc/ChangeLog database/* log4py-test.py"
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	distutils-r1_python_install
+	insinto /etc
+	doins log4py.conf
+}
diff --git a/dev-python/log4py/metadata.xml b/dev-python/log4py/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/log4py/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/logbook/Manifest b/dev-python/logbook/Manifest
new file mode 100644
index 000000000000..3e5f2fb4b668
--- /dev/null
+++ b/dev-python/logbook/Manifest
@@ -0,0 +1,10 @@
+AUX logbook-0.4.2-objectsinv.patch 365 SHA256 7666c9ef04d3d4d6d81b7b78193e7a42d744419868d4c4fe2a9726fdd018e0d5 SHA512 a66b80355dd76fb965f2f2206b29c327328ddac406db681898ccf56605a3004f7bf84c7b5623fd9ed953b170a87589c47ad1e164c24be8f9d4fd664f482a8633 WHIRLPOOL b953e7c28200f3d186f8d12aee61b781e5970be054ae2c9543c7f4d4efaf5d817b3215048d4ea3c6bd930e434cb9bf2dde3d9a54f35ad250b969c74d45dee2c7
+DIST logbook-0.9.1.tar.gz 106615 SHA256 e2f49e922c7836a58418b1cb2680e71492f45150cb968afced9f6a98222e3524 SHA512 d136dd5a7219a23a50db857919d794e7b721cc629443ac2bf92374aef68889d8a7146886fc4484c6d0dea56ec5c1c1ccca3f0b20310c2e12dba9d40dcac9c188 WHIRLPOOL adfb8bd28565ec97904c63631c55ee17613fdf2259d039baa0351df870bfa1658ebc52c8dbf69c8b94b0230577f287b215324d95b186cf38cc4d68bb1040d502
+DIST logbook-1.0.0.tar.gz 365307 SHA256 b09d45ae8aa2baf450347fd42dd74942b7fd726af7a336fbc089bb72e4fc0e71 SHA512 0ff2348cc04155d13e911bb7f080d2621e2c46e827c1823e6a4f977d39569271001f64c84ca24fcaf269209c15b88fd50c28c2fcf87312761dcf16ab414abc1d WHIRLPOOL 9d76d229462907218d3b922a02739db58e422be909d56c67a171f4d78458380417f3c7f21d05426c4864753cbf2fb96aab77812dec96f4114035e607445a4898
+DIST logbook-1.1.0.tar.gz 367541 SHA256 9b0998a1c1d7d33d6d23d9c66cbdf2bf0ec274d528daae015ab3dad33770e35f SHA512 55ec7a026a08baed405e29d7cdcc9d3cc423c9faf13788c2447ac7ccff688de9bd9e332ad78077b1eef8bc8ad9aea572f9c124888f46ecabc2abf22d8ac9086b WHIRLPOOL aa27ce1a9f07f309d3bfcfab73525ebe52ad75aab9fa2ef1fecf310ece10fc62084e2713a1637981d3c195271449ad0734d84f1603f8a2864640d3a22506ee33
+EBUILD logbook-0.9.1.ebuild 1131 SHA256 d2c27edfb8ef40d3097ecf123ae7080f2bb52ba235f60be9ed2c3b17c81a4106 SHA512 506bc5ca373aea27fba53b404db372d06ec37d2c77dfed730a690147211b335f6618aa86ce6bd321fc7bdb2486dac81def56eab8b1eed7bde4edf00e30a2ba44 WHIRLPOOL 017f3cc65f77da5983a9005563f0f027ae69116a675b897ed4493af2d2effd8fcf6d01634a99f4e6cb1801483ccec4ef621c264143f50bb2526abcef2ba758c0
+EBUILD logbook-1.0.0.ebuild 1135 SHA256 5f60af4cf79d7592325e6dba9f9b17618f05eb7db5af119aacb3f5135cbe69c6 SHA512 6ed95cabf1c76ccd997a16a554adc219902cc8379bb2b27cce0c55a02181cf421332e915b2ab3bc703da183b61ea94bf9bb72312fb3ee0afb4e68597d0409375 WHIRLPOOL 8d5176cf39f862191d25332ad70d39a51c9e8fc1b48f1c5eccf755b107a5b1bedfb1a6cf81402281e7a5d3e7764906c73fb20fa79cd3ceeed70b0ee8c293e19b
+EBUILD logbook-1.1.0.ebuild 1135 SHA256 5f60af4cf79d7592325e6dba9f9b17618f05eb7db5af119aacb3f5135cbe69c6 SHA512 6ed95cabf1c76ccd997a16a554adc219902cc8379bb2b27cce0c55a02181cf421332e915b2ab3bc703da183b61ea94bf9bb72312fb3ee0afb4e68597d0409375 WHIRLPOOL 8d5176cf39f862191d25332ad70d39a51c9e8fc1b48f1c5eccf755b107a5b1bedfb1a6cf81402281e7a5d3e7764906c73fb20fa79cd3ceeed70b0ee8c293e19b
+MISC ChangeLog 3792 SHA256 45a0f6cf497d6abf5cf8ff090e9fc6a4306643e2f906d4236d7e0e67443152a7 SHA512 32f19397bf1bff72afb02d6f3718156266e858d3c0bead94e96ed4f59bffe00e7d745af796093e4fc9ff66d900dc1919bfd594466d6ebc9d2c76bdca99a43ef8 WHIRLPOOL 872ce4402c817e9e16b532079d5a78136b283e17715871630c475e7bb29b06d98fc21ded7e80cf350eae5c2aa367d981cb6372f05f5e921a83bfd98fce9abe7c
+MISC ChangeLog-2015 4328 SHA256 7dd8c2615e20190ace9d5048e100d2dba454c45e49347c98d783c97cfba1a4f8 SHA512 42f71d7ff92e334f06d130aa90010fcebea7e64e2da2d6082b195f47752597fb7a164abbae58e2bceb34b691807aef66a10d4716c2d898852be7d31ce9457f5a WHIRLPOOL 186638df4effff3415ecec1b4a8b720b82808413be8f7ecf7da74c7900dde93f4c9e540439cb6cedba029bc860d4a5d863fa42bafdea1f1466faecf4714d9469
+MISC metadata.xml 379 SHA256 300f3573dd67d6425c21aff9589df1d00e5d1b2a65edc7c276ff27aed04f4110 SHA512 fcb989995cc9403469ef44339c37b3a849a485b9741b1910e3dbad66d6aeb5a815a25ef9c403c020d75e608f91d78d436dff8a098efe5a508ae73b3dffe01a82 WHIRLPOOL 4ca35a3bd84b53022ce47826735d545d58f4df712524cc9bf78c438425ba7df12f6f4b71d376dba3fe853dc81217703f85f6a09a24c0fb479b3a913f06f29cfa
diff --git a/dev-python/logbook/files/logbook-0.4.2-objectsinv.patch b/dev-python/logbook/files/logbook-0.4.2-objectsinv.patch
new file mode 100644
index 000000000000..28b26f0bc9a3
--- /dev/null
+++ b/dev-python/logbook/files/logbook-0.4.2-objectsinv.patch
@@ -0,0 +1,11 @@
+Prevent unwanted d'loading of un-needed objects.inv files
+diff -ur logbook-0.4.2.orig/docs/conf.py logbook-0.4.2/docs/conf.py
+--- docs/conf.py	2013-06-02 19:31:32.000000000 +0800
++++ docs/conf.py	2013-06-30 10:50:38.604402792 +0800
+@@ -219,6 +219,3 @@
+      [u'Armin Ronacher, Georg Brandl'], 1)
+ ]
+ 
+-intersphinx_mapping = {
+-    'http://docs.python.org': None
+-}
diff --git a/dev-python/logbook/logbook-0.9.1.ebuild b/dev-python/logbook/logbook-0.9.1.ebuild
new file mode 100644
index 000000000000..9f642e1023cc
--- /dev/null
+++ b/dev-python/logbook/logbook-0.9.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A logging replacement for Python"
+HOMEPAGE="http://packages.python.org/Logbook/ https://pypi.python.org/pypi/Logbook"
+SRC_URI="https://github.com/mitsuhiko/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? ( >=dev-python/sphinx-1.1.3-r3[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/redis-py[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.4.2-objectsinv.patch )
+
+python_prepare_all() {
+	# Delete test file requiring local connection to redis server
+	rm tests/test_queues.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test tests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/logbook/logbook-1.0.0.ebuild b/dev-python/logbook/logbook-1.0.0.ebuild
new file mode 100644
index 000000000000..119a2db91392
--- /dev/null
+++ b/dev-python/logbook/logbook-1.0.0.ebuild
@@ -0,0 +1,45 @@
+# 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,5,6}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A logging replacement for Python"
+HOMEPAGE="http://packages.python.org/Logbook/ https://pypi.python.org/pypi/Logbook"
+SRC_URI="https://github.com/mitsuhiko/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? ( >=dev-python/sphinx-1.1.3-r3[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/redis-py[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.4.2-objectsinv.patch )
+
+python_prepare_all() {
+	# Delete test file requiring local connection to redis server
+	rm tests/test_queues.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test tests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/logbook/logbook-1.1.0.ebuild b/dev-python/logbook/logbook-1.1.0.ebuild
new file mode 100644
index 000000000000..119a2db91392
--- /dev/null
+++ b/dev-python/logbook/logbook-1.1.0.ebuild
@@ -0,0 +1,45 @@
+# 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,5,6}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A logging replacement for Python"
+HOMEPAGE="http://packages.python.org/Logbook/ https://pypi.python.org/pypi/Logbook"
+SRC_URI="https://github.com/mitsuhiko/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? ( >=dev-python/sphinx-1.1.3-r3[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/redis-py[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.4.2-objectsinv.patch )
+
+python_prepare_all() {
+	# Delete test file requiring local connection to redis server
+	rm tests/test_queues.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test tests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/logbook/metadata.xml b/dev-python/logbook/metadata.xml
new file mode 100644
index 000000000000..e8dd3bfbdbbc
--- /dev/null
+++ b/dev-python/logbook/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Logbook</remote-id>
+    <remote-id type="github">mitsuhiko/logbook</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/logilab-common/Manifest b/dev-python/logilab-common/Manifest
new file mode 100644
index 000000000000..af9b80f2717d
--- /dev/null
+++ b/dev-python/logilab-common/Manifest
@@ -0,0 +1,7 @@
+AUX logilab-common-1.2.2-test-namespace-fix.patch 502 SHA256 abbf9dbf7c2d47a777b7c89100aa7b7b8752d11a09fb50be36a03d9d33de95ad SHA512 c8a9898a6fa497c21edebe4b6890a87215622dfd1c4ccdd7b23ca7669131200cf82ae82bd17c7226ac79ff3fb4ae964b1bf1470eb79c5aec0018850eacd2760f WHIRLPOOL 71acb32d38736be6a1a12496e8dd7805d8f2f4d1e34ccfb70e0b4c175ffef0b811ee780866b6f171324a11cfc1585f1c723201ed8907e079aa48681abb7523dc
+DIST logilab-common-1.2.2.tar.gz 184817 SHA256 62b0d88d9276e86b48c7188cea8d91d8ff1744d046ea6323d40359aa53aef708 SHA512 9c2161e8644e50cb3d4418430ca95363363e532b286d39cbdb73a51274bee02e5e8d0632b7564049243f497df96102c90ab0aeff9c91e91f7275407a6cfc56e2 WHIRLPOOL d683d92c472640c7167b3ec3c6c4d80eca91f0d3b649223d172999a1c6dd7c004fd52dd016f9682405aa8ca2204273e21b9c486fa0e97f04228e270193b108e5
+EBUILD logilab-common-1.2.2-r1.ebuild 1467 SHA256 da02ade29b9d96128f66575e343954e69ffce9de5d24a3fab8b8c67ebdb43f0c SHA512 eecd67f05f356c81f8df430efca8a4cda2b38e1da3113e2e8ec40631a3e034cef7684f2077777300ccda380874ad58f43289a908dd067265631cb0a2f4a3839c WHIRLPOOL 4ddb490146eb585b769472eaede3c94834386e74ba7c6cd86db71b71a729e22b0bbdd3a1e6962ab3aa579c6bcfebe955418dfb13ae6e7e16b805ccc52f191f11
+EBUILD logilab-common-1.2.2.ebuild 1197 SHA256 0c72096f02dadd105e7bcc9e983a7ab9a4c24f17e275afe1b6e839b63d7b954c SHA512 ea66e669f10d8ee096d5552cb7088b2aff93c7dc5ce14d552f7445308259479025b3b4ef31773744826789ab927d70c37a59014ceb6c076bb8c616a99c573084 WHIRLPOOL b029edadf7f4acf6988d5b03a311d22532cbb960e9ff285e92a6ff431a5c3a480812fdd2a4700675c6283e972e672aec9ec8b53f508fe517cfd738749dc21237
+MISC ChangeLog 4500 SHA256 5f8649f01f7516dba90da4e42d413eb6ea7fac1b5f5e7342d9ccd76630c8eb08 SHA512 2b04904413b7e0319fef85d6c713c285f7b8be148dd3a7f4bd1c8254ee503eee13873cdd6cc7391b513d729db76ab1f1b8293379c60823b7a8bf058a35261fe1 WHIRLPOOL 6dda1dcbc80c8ad83df77b421145e5bb5aaf80f5c2de1672655e68ee88e71c21723f7e87246b6690f85102c544226e7ef5016fb2d0d4a08affb625b6d27d402e
+MISC ChangeLog-2015 25806 SHA256 c603016b004ca30958ad7c18c0dc02251ad466be7282bff5fd9c6a236f6322d5 SHA512 a236b80b2697a5c0b556e916f8cfd3b95bb88c6b0f42b63a97c59d836555db0241fcd7974fb31fa7d2b8789b1eafd62ca6cf8395c708139d82e582533cd12e6b WHIRLPOOL 767d6b9fb354ae8e70de6077fcebf24e567e448117b73536c54097c8b6ebf2c6f2e5d05dd0ed4d24a9ca21b273986b7b429bbbd4837450a754a2e8d8488a58b4
+MISC metadata.xml 317 SHA256 d35e532899af68853173b66679df599015c23cc1b8dd0a351eea5321d938c8bf SHA512 4e3f634378fd3dcd721af5e038a2331fab376c3625cb8b9dce6a87921886602ff75d308fc9d7f887a65cda607e9e635fb59e86b1da0c7c11a75860229f90c3c9 WHIRLPOOL 87ee6bea80c4d50cfb0ba4a7ba15c64ab80179fe4c99d2bf114c8ae4e16e1da7a7db7f9699a03d50bfb97e7c9cba96e10a8a422a8fae1efe26c4be6d1690a6a5
diff --git a/dev-python/logilab-common/files/logilab-common-1.2.2-test-namespace-fix.patch b/dev-python/logilab-common/files/logilab-common-1.2.2-test-namespace-fix.patch
new file mode 100644
index 000000000000..044fc67f0d3f
--- /dev/null
+++ b/dev-python/logilab-common/files/logilab-common-1.2.2-test-namespace-fix.patch
@@ -0,0 +1,21 @@
+diff --git a/bin/pytest-local b/bin/pytest-local
+new file mode 100755
+index 0000000..a2b771b
+--- /dev/null
++++ b/bin/pytest-local
+@@ -0,0 +1,15 @@
++#!/usr/bin/env python
++
++import sys
++try:
++    # remove an already installed logilab-common module from
++    # the list of namespaces to force the local module to be tested
++    del sys.modules['logilab']
++except KeyError:
++    pass
++
++import warnings
++warnings.simplefilter('default', DeprecationWarning)
++
++from logilab.common.pytest import run
++run()
diff --git a/dev-python/logilab-common/logilab-common-1.2.2-r1.ebuild b/dev-python/logilab-common/logilab-common-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..e31fdcd05d44
--- /dev/null
+++ b/dev-python/logilab-common/logilab-common-1.2.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Useful miscellaneous modules used by Logilab projects"
+HOMEPAGE="http://www.logilab.org/project/logilab-common https://pypi.python.org/pypi/logilab-common"
+SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND=">=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7)
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-test-namespace-fix.patch" )
+
+python_install() {
+	distutils-r1_python_install
+
+	# this package is commonly used by all logilab.* in ::gentoo,
+	# so let's just keep the namespace here
+	python_moduleinto logilab
+	python_domodule logilab/__init__.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman doc/pytest.1
+	find "${D}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	# https://www.logilab.org/ticket/149345
+	# Prevent timezone related failure.
+	export TZ=UTC
+
+	"${PYTHON}" bin/pytest-local || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/logilab-common/logilab-common-1.2.2.ebuild b/dev-python/logilab-common/logilab-common-1.2.2.ebuild
new file mode 100644
index 000000000000..f01e88a34a5a
--- /dev/null
+++ b/dev-python/logilab-common/logilab-common-1.2.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Useful miscellaneous modules used by Logilab projects"
+HOMEPAGE="http://www.logilab.org/project/logilab-common https://pypi.python.org/pypi/logilab-common"
+SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND=">=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7)
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-test-namespace-fix.patch" )
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman doc/pytest.1
+}
+
+python_test() {
+	# https://www.logilab.org/ticket/149345
+	# Prevent timezone related failure.
+	export TZ=UTC
+
+	"${PYTHON}" bin/pytest-local || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/logilab-common/metadata.xml b/dev-python/logilab-common/metadata.xml
new file mode 100644
index 000000000000..6d7823824e72
--- /dev/null
+++ b/dev-python/logilab-common/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">logilab-common</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/logilab-constraint/Manifest b/dev-python/logilab-constraint/Manifest
new file mode 100644
index 000000000000..9148015449d3
--- /dev/null
+++ b/dev-python/logilab-constraint/Manifest
@@ -0,0 +1,6 @@
+DIST logilab-constraint-0.5.0.tar.gz 48395 SHA256 ba291c988dcc5d4457cd3414994bddfe1f19b7e20b735e179ba0095294d8f511 SHA512 b1ccc6e7400eacb7c446c1904f5e2b0129104482e312929292c6ca7c9c18bf4e1fa0d0e78fce61527a97e00d85c4e2a5c1bb8cce7c18792cd5d2a295449e435c WHIRLPOOL b529175f81d846714bf6f9a810bfc6aeb5c11be344ca79e21d3b510663aefedf9a00489d964d71ad3ecd87e40c1698d0a270a2aea3de17799bf8138c68152c40
+EBUILD logilab-constraint-0.5.0-r1.ebuild 884 SHA256 0e5f3cd9f151e5900776ff515b26c91d10ca232b5cc9fc2d96895a8660ca7f01 SHA512 99dc6b8f3c6895e9713a5d1b65352d3d5b906582f5655c4ca302de02d8077ec294f46034470525aaa81c524d6b3298e5f9a3c0d0360f71cc19f174224c69eb3e WHIRLPOOL f2a0e071d66b4c6353d67428872b7140326d335440185db2a5b81ce1e4278575820fa3e51f7f04c7a089dd6fd4b5f2a65e2093eb31a5ce8ceeaab5561ec61246
+EBUILD logilab-constraint-0.5.0-r2.ebuild 941 SHA256 f1d670a4d195a7d8bfdf5c08e326c04f39bfacd074b9fa47a9b05e1fbd09784a SHA512 45abc48b60a9f1d92ac73068ccadb0597c89968df20432e15c849c630736ebd1795643c3239380c748ba1f8a8ebf747a06a025767a15d6984583e5ac3c74ba0b WHIRLPOOL 28204e46c343935c21966e5f41d1594b59e44cbefe6304bc96f0c7df5ecd7bda70e3750ce9e65fa8287c96a0bdcf789be476cc4a35d16249ca359a11954ba6e5
+MISC ChangeLog 2468 SHA256 ab51dfa23c609d6076054100e073e65d631083800aa96f1a9d00e87de41e30cd SHA512 94b0f694dd87e9529a76cdea108cbc942455c0c726437683958bf6757cf35462335ada1167d07abbf16dcf286fe4c1d0ea3e57a9aad0d7e03d0d797d8cc6b259 WHIRLPOOL 5ad18757e66bdb8577701eb35d8b0302f54b4bf18b7f83f95a3bbe3f26657f61de9aa7e7266b7ffcf301c5056b86cf62189fae52e97a66bc90ac6ec088fef08a
+MISC ChangeLog-2015 2830 SHA256 da7d82897d33e00757b6f3ff652c4a5e917817ee408ae5fbb53c93ca1b13eca7 SHA512 e299f70b2c3140aba172f611447ec9e3b1c7f81a8dceea73f4b3cdbfd5828f5a8203e0084b5e8c4471d912a3cfa41e78ddb0b762b471450e11f9990a52c1f99d WHIRLPOOL 61d40fb53fe3395c4838cce7c27e0b2996ffface3a5faedea9345181c73fd02859af48505d8f457e068bf117d2be74e860aef06121de0bc131a2176cae74050c
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild b/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..8a333582daa5
--- /dev/null
+++ b/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A finite domain constraints solver written in 100% pure Python"
+HOMEPAGE="http://www.logilab.org/project/logilab-constraint"
+SRC_URI="ftp://ftp.logilab.org/pub/constraint/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 sparc x86"
+IUSE="doc examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/logilab-common[${PYTHON_USEDEP}]"
+
+DOCS=( doc/CONTRIBUTORS )
+
+python_install() {
+	# Avoid collisions with dev-python/logilab-common.
+	distutils-r1_python_install
+	rm -f "${D}$(python_get_sitedir)/logilab/__init__.py" || die
+}
+
+python_install_all() {
+	use doc && dohtml doc/documentation.html
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/logilab-constraint/logilab-constraint-0.5.0-r2.ebuild b/dev-python/logilab-constraint/logilab-constraint-0.5.0-r2.ebuild
new file mode 100644
index 000000000000..4ce61777e8a1
--- /dev/null
+++ b/dev-python/logilab-constraint/logilab-constraint-0.5.0-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A finite domain constraints solver written in 100% pure Python"
+HOMEPAGE="http://www.logilab.org/project/logilab-constraint"
+SRC_URI="ftp://ftp.logilab.org/pub/constraint/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="doc examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/logilab-common-1.2.2-r1[${PYTHON_USEDEP}]"
+
+DOCS=( doc/CONTRIBUTORS )
+
+python_install() {
+	# Avoid collisions with dev-python/logilab-common.
+	distutils-r1_python_install
+	rm -f "${D}$(python_get_sitedir)/logilab/__init__.py" || die
+}
+
+python_install_all() {
+	use doc && dohtml doc/documentation.html
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/logilab-constraint/metadata.xml b/dev-python/logilab-constraint/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/logilab-constraint/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/logutils/Manifest b/dev-python/logutils/Manifest
new file mode 100644
index 000000000000..a3cfe66d788f
--- /dev/null
+++ b/dev-python/logutils/Manifest
@@ -0,0 +1,4 @@
+DIST logutils-0.3.3.tar.gz 27106 SHA256 4042b8e57cbe3b01552b3c84191595ae6c36f1ab5aef7e3a6ce5c2f15c297c9c SHA512 d341567180e96cf09155af7af96becb773b81e1c25946c5f08fce56b85018f236eb23b0d76b2b938900128b763a65327d64f0abaec0ccb0f6365d4d8fa3dc369 WHIRLPOOL 59141a65d3da231fb240f030a10679a668f5087d8ec47cdf2be16d5140c0d7e108511021632718af93743ac9d7b36b8ee0e881d2898719d13c1e0b53ea976a8f
+EBUILD logutils-0.3.3.ebuild 493 SHA256 2f0954f156fb5e9b3df30ff21615ccc6cebeeefc0afef332e442b0db69e61aad SHA512 aca70166dbc23fb2053dd8641434d2553ee827b87d5c2f46de1d60f701742573923333f6a8bb65a60f90d2fd4ed6be8d4b6f0c16c1e163c79ea8a496c129c518 WHIRLPOOL 7b26bbde3551d0ae5d2699d958c0dfceca71305b92ceee358536c7607104061d513b4a7d7d83d933323cc7aa26816bf55f1f1b8bf7b5c879851137f3815d33d8
+MISC ChangeLog 1920 SHA256 9a762e5395f29093c317139ce492b98f266f07542b6ad3812b1ca5270192dd75 SHA512 f383847816998be298efb4369b647ac47d0f7f51ddc4a92cddc27402ba427e1d51ff45ae9eece9308f0e4a5c05199f40f74b1c21cd75aaa475d02dd540fd2879 WHIRLPOOL 3db0f52f86877a364a5114766e36a7d3f609074b192fa8ea47839af56a7d1f6e8ce96cc34ef35d28a033899f8d365e5a63d9bdcdd685a0fdd873cf6935bf8432
+MISC metadata.xml 388 SHA256 7c845b7127755ec8c1f94d5fe5d6edc3efe6316c25d0340c64422ae534c9975c SHA512 19aab936b18ec786b830772716ee0d0c0e2d81e2cfabbccc20d0c0baa0dda993423c9de608780f2b969a2cc53f5e03a1378486246c86c656143fe6a0626a61de WHIRLPOOL a9403e3af96b476b19e1cfab7d4da159621f98e0948a8dba0876ed8c7fc72ad2724368a5dd63ee4ba02f32c0312374f213196ce4f20d625e29750643c2ebd541
diff --git a/dev-python/logutils/logutils-0.3.3.ebuild b/dev-python/logutils/logutils-0.3.3.ebuild
new file mode 100644
index 000000000000..2b53abda1250
--- /dev/null
+++ b/dev-python/logutils/logutils-0.3.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="The logutils package provides a set of handlers for the Python standard"
+HOMEPAGE="https://bitbucket.org/vinay.sajip/logutils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/logutils/metadata.xml b/dev-python/logutils/metadata.xml
new file mode 100644
index 000000000000..b8dbe2ec06b1
--- /dev/null
+++ b/dev-python/logutils/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>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">vinay.sajip/logutils</remote-id>
+		<remote-id type="pypi">logutils</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/louie/Manifest b/dev-python/louie/Manifest
new file mode 100644
index 000000000000..1b3a704200ca
--- /dev/null
+++ b/dev-python/louie/Manifest
@@ -0,0 +1,5 @@
+DIST Louie-1.1.tar.gz 22306 SHA256 75f33f2978e9a7ba1f541c594d8e93d0c4a965a706db688fd11a77f4049e5a5b SHA512 4f5426da4bfbf7a5928007a82e155414e7db9d466397eb9cba6a5fcfddccf4bd162071e5d551fb6ffd41f0b780097a89eea6c268e2d4fb32264683f796d85ec0 WHIRLPOOL e3b6ac3769ec7097914e4b73b9064fa2be6d4be358a661087c0d002a472e36435e0ec1665958e56857f581ce8b88f0827c84d68c966d18184d403109bc6e2746
+EBUILD louie-1.1-r1.ebuild 700 SHA256 a570417ba8f0eb98fde209686c171f153ec81ceb4a46ae51f5cdfdd7ebfcae7f SHA512 8ec58601eb193c31432ebbc97ecc07d6d6b39e7964088399b67d1065d5759c721031178b865a249230fb1d295904feea8eac87092c363cf6d3fcbe5bdede7504 WHIRLPOOL 72e401c159d646e8ca4a16b508ccd1813dec2ed032c3421a5a8d4fac16590f16ad311aa79c84fa8a2f1ff2434fb9d0d3e79e5d3e8651f7cbfc575053dbf11a11
+MISC ChangeLog 2927 SHA256 c2c0a4791eefdddac646a6797f731f747d772de800be432757a317ad89518b6b SHA512 58ac508ae14da927ea3a7ff6ad059c6a67a1044970b62b01176b07084eeef48182df9408e4ef94834e9a67550c914a55450f6ebd9f99a18430c13efaa5e3a904 WHIRLPOOL 0b7f6b774827f6c1aad033fd4cd8be1711875b503bca7b6d703d62985cec42f857c4dd8d836a0e08f8fa566bb0edef10fe36102a0d1d1fd28934de18a34e2d7b
+MISC ChangeLog-2015 1715 SHA256 ff2d2cf26410f37a9d7fe2f16136399dde7c89ba7a590cfdf16b2b0c9878e8c8 SHA512 41b0c830ac851269d81fc3b75de49d7b7a77a0be4f393250876760161b05123564e209b4cdb32254d39f7d22dbf1460c49d564af9617ddf17bebdc20392074bd WHIRLPOOL a36770f6f0dfe674056e1c570e6e60ca54328db7582534da5e1dcd8ccc16c3411eaa26e32f21879ec4e7e2d7e23059245080b735bd8696c276c8c7be473f0580
+MISC metadata.xml 308 SHA256 41b870f5e0589949ec9e7dafec87f5a779af744cab2506b7de09e0873fb4082f SHA512 6559bcc872bf9bfdb5fb0bb7b3f8b61dc0bbba13fe726aa00bd316dcae42c13d2eeb887cd77168810ca6333e442a9deb82cc9de3fd7f2bd66bfea662287e63ed WHIRLPOOL a9d4a159ab83addfaaa3c7c58d4e741f484c5c620f9c380d3397c72e23597169fd5087cb1557a66f29e6df2b7e77eb3136ded53eb6fede231373624ae87dc3da
diff --git a/dev-python/louie/louie-1.1-r1.ebuild b/dev-python/louie/louie-1.1-r1.ebuild
new file mode 100644
index 000000000000..298e6a90a071
--- /dev/null
+++ b/dev-python/louie/louie-1.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Signal dispatching mechanism for Python"
+HOMEPAGE="https://pypi.python.org/pypi/Louie"
+SRC_URI="mirror://pypi/L/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+S="${WORKDIR}/${P^}"
+
+python_prepare_all() {
+	sed -e "/'nose >= 0.8.3'/d" -i setup.py || die "sed failed"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/louie/metadata.xml b/dev-python/louie/metadata.xml
new file mode 100644
index 000000000000..9ca525a62916
--- /dev/null
+++ b/dev-python/louie/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Louie</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/lp_solve/Manifest b/dev-python/lp_solve/Manifest
new file mode 100644
index 000000000000..9cb9b4dfb6ad
--- /dev/null
+++ b/dev-python/lp_solve/Manifest
@@ -0,0 +1,6 @@
+AUX lp_solve-5.5.2.0-setup.patch 1637 SHA256 d2e0e070a2e0adc2703870f677c9177a6db8f7c3d749e43d47526377480b9a44 SHA512 d9060808f86f67205acc3d0ce9b0aef750e9ea5d77f363c225bc11330e603646b0ef7a5b1f86f00c61324e92d8237ef99126f6b439ddb04c0c28fb6f484ef295 WHIRLPOOL 4700bfb286971ea7629c2fdaa05dd8ad6df4d0202ceda2cee75715aca6191c1f2532fd1ac0c2d25e272d5cbe3f8d16da0498f2e23f2984c595d849f97205a0df
+DIST lp_solve_5.5.2.0_Python_source.tar.gz 58017 SHA256 79683bc262e9da5b2fa7338ba190a9cd10559b9f2dbcb8f3bf07e2a81083ac51 SHA512 eaf732a1f3497c27e40a037be21b2e1552c3aec6cc7801c47d68a439be556ac45c2f1bb90e403d1a4b8bd42b0be0b323b8c3364363e6d51ecb0ad0934902444c WHIRLPOOL c40af8a5abacc98981a723d3d988e8921c35f988261d6a55da3f635aa920150b96186e35de4dcc3fe452b920041a161a24e40f5b5ec59db5a1ccb303967ccd7b
+EBUILD lp_solve-5.5.2.0-r1.ebuild 1024 SHA256 424f6143c2f38b92ee35b830eaf0fa9539530f778018c405d467adaca4930211 SHA512 c2a049f639ed3eab974a43359cab1ff77d2b56de1695161759d3ba988976247fc6328c604e534fc5fc265c6e7fd99aa87dd9feb47532c188cd67a561de309e7a WHIRLPOOL ddfd6c64aa281c526a92ebb68b32afbcffaacfd363b17765681f7eaade666242132c32fddc29502952fde6c9f1f5fbe21c06e90a68c3a168674b525dcd5c2ed1
+MISC ChangeLog 2481 SHA256 2a238646d51d4d94a143ff1246c44146f26fe224b6a1e47b85ab57187d7ee094 SHA512 d53276ca4f79308469183dc4fbbb8f2148b6d8206bd4885c54b20923a273adc62b1d9766540f39dfda9b655fe4ce4c27f416c912ad6c91db4a589a9d52c6f49d WHIRLPOOL 57361872af55a041ff5d950923241a494f7c2765f2193b15cbc8c64e0748528ec41abf4aa10583a0a898d41b66cbe2ed4e01a33cf236fd57c75b055a00fced8d
+MISC ChangeLog-2015 1400 SHA256 b94d640b95883aba228e2cf7593f3bc6befc5dfda1e35329cded6cdb7cab1d08 SHA512 4ac057dec426292f93890ded7fb1af09c509d8640cb147ac9f449f1d662db044547d986d83ee4b28650a5d6f1f274ee1432feef8c63fe7606192534d357945f5 WHIRLPOOL 156f2133566d2d1567263274c1a01e68d00c2b308c66fd757b4375c7f0e9b70b29d66864341c490216b62b15c2303c77c4de7d4fe314676e26442bee1c23ca04
+MISC metadata.xml 463 SHA256 8ec3b8b4569d9e164ffb006023cc714bf45c8741b985804b290ed193755ef25b SHA512 6e10a62621ddcde04a0fbbecacd05aee86371bf02d483a445008eef99e744639b0bf3bc2b5434bf67bf571332e9fee58d782cb8470900833319cfc687d9ca183 WHIRLPOOL 5e7f68be70892e197b04a0c8c3e430972c6c5ad6ec7bda2c83dbc50668ba0964b96e48fc2fa08f8b47fb7235af81fa222e667d4246170ce956c00a3b07dc019f
diff --git a/dev-python/lp_solve/files/lp_solve-5.5.2.0-setup.patch b/dev-python/lp_solve/files/lp_solve-5.5.2.0-setup.patch
new file mode 100644
index 000000000000..a28b8179d261
--- /dev/null
+++ b/dev-python/lp_solve/files/lp_solve-5.5.2.0-setup.patch
@@ -0,0 +1,50 @@
+--- setup.py.orig	2012-01-07 20:27:45.072840503 +0000
++++ setup.py	2012-01-07 20:24:22.127570128 +0000
+@@ -1,26 +1,25 @@
+ from distutils.core import setup, Extension
+ from os import getenv
+ import sys
+-import os
+-p = sys.prefix
+-NUMPYPATH = '.'
+-if os.path.isdir(p + '/include/numpy'):
+-  NUMPY = 'NUMPY'
+-elif os.path.isdir(p + '/Lib/site-packages/numpy/core/include/numpy'):
+-  NUMPY = 'NUMPY'
+-  NUMPYPATH = p + '/Lib/site-packages/numpy/core/include'
+-else:
++import os, os.path
++
++try:
++    import numpy
++    NUMPY = 'NUMPY'
++    NUMPYPATH = numpy.get_include()
++except:
+   NUMPY = 'NONUMPY'
+-print 'numpy: ' + NUMPY
++  NUMPYPATH = '.'
++
+ windir = getenv('windir')
+ if windir == None:
+   WIN32 = 'NOWIN32'
+-  LPSOLVE55 = '../../lpsolve55/bin/ux32'
++  LPSOLVEINC = os.path.join(sys.prefix,'include','lpsolve')
+ else:
+   WIN32 = 'WIN32'
+   LPSOLVE55 = '../../lpsolve55/bin/win32'
+ setup (name = "lpsolve55",
+-       version = "5.5.0.9",
++       version = "5.5.2.0",
+        description = "Linear Program Solver, Interface to lpsolve",
+        author = "Peter Notebaert",
+        author_email = "lpsolve@peno.be",
+@@ -29,8 +28,7 @@
+        ext_modules = [Extension("lpsolve55",
+ 				["lpsolve.c", "hash.c", "pythonmod.c"],
+                                 define_macros=[('PYTHON', '1'), (WIN32, '1'), ('NODEBUG', '1'), ('DINLINE', 'static'), (NUMPY, '1'), ('_CRT_SECURE_NO_WARNINGS', '1')],
+-                                include_dirs=['../..', NUMPYPATH],
+-                                library_dirs=[LPSOLVE55],
++                                include_dirs=[LPSOLVEINC, NUMPYPATH],
+ 				libraries = ["lpsolve55"])
+ 		      ]
+ )
diff --git a/dev-python/lp_solve/lp_solve-5.5.2.0-r1.ebuild b/dev-python/lp_solve/lp_solve-5.5.2.0-r1.ebuild
new file mode 100644
index 000000000000..9e8b2328c501
--- /dev/null
+++ b/dev-python/lp_solve/lp_solve-5.5.2.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python wrappers for lpsolve linear programming library"
+HOMEPAGE="http://lpsolve.sourceforge.net/5.5/Python.htm"
+SRC_URI="mirror://sourceforge/lpsolve/${PN}_${PV}_Python_source.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-mathematics/lpsolve"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${PN}_5.5/extra/Python/"
+
+PATCHES=( "${FILESDIR}"/${P}-setup.patch )
+
+python_prepare_all() {
+	if use examples; then
+		mkdir examples || die
+		mv ex*py examples || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" lpdemo.py || die
+}
+
+python_install_all() {
+	dodoc changes
+	use doc && dohtml Python.htm
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/lp_solve/metadata.xml b/dev-python/lp_solve/metadata.xml
new file mode 100644
index 000000000000..3af678d960c8
--- /dev/null
+++ b/dev-python/lp_solve/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
+	<longdescription lang="en">
+  Python wrapper modules for the linear programming library lpsolve.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">lpsolve</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/lupy/Manifest b/dev-python/lupy/Manifest
new file mode 100644
index 000000000000..d5340fa3ccfd
--- /dev/null
+++ b/dev-python/lupy/Manifest
@@ -0,0 +1,5 @@
+DIST Lupy-0.2.1.tar.gz 52269 SHA256 f0ced0b331c99b59d82b8ebc2fb23445e31dc3df339489b4b9811d9d25d42ba3 SHA512 3ecfaced8ea8005e2fdb57f87546e9128eaf2174d27109b3e3ffbd32cf4f2dd23d2568eac7ff4b3f93a05f4efc19a6eb7f89811f1d6d1441e66f6f955184ff64 WHIRLPOOL 980a8a3f38b44d95f6f712327b44dfe16c04fedb88518e99432f299e79d446a45e07e4d4eb4e7a0d6ff3f490c285b813443c96cd79775359306c0d5cab85fa1a
+EBUILD lupy-0.2.1-r2.ebuild 653 SHA256 43eecd147d31bee5c467f4f1590e56371acc0186c3d27c36d6da718d6039afa4 SHA512 9afd39c77f2c18679ad4929a815505cb4f7bbadb5319ac56cc5215a09e60d60b779bbd24c435fc1f8d8dd00448c1ca210caa07aa48b54d08f6beb85fa136e612 WHIRLPOOL 27adf0b6ca0f089bf0e17610cc43ae0c4f4a8a13438a51a6653791abcd0db8040f84a1bc8a87af8826bc835d9edfc1bf0ddc52fb0bb686d2c610db221cea9225
+MISC ChangeLog 2569 SHA256 e9316bdc1bf0e60185dd7f4a51c3458287e447467bf9cbd5e2fffd59aa41342c SHA512 0853edc0764d0eee7c72106c9c753020e02a3f5e1cd78bea521959d830793e638fca85bde6a8370ec15c8c76a1d28b4c57eb0f44dbebc6488238c29afd905e58 WHIRLPOOL 6238271c01961825e2acced694579b339d219be75c9996b5bad89790913a2934fb6822ce6f8c6bcd1cdedc6ae7d4b7e2be74cd3c16b8ea613b0cc401b03e3ddc
+MISC ChangeLog-2015 2523 SHA256 794d1be71278efcd90b997c70ace5c48a685868f3ca34be5346d8dfd49933e84 SHA512 7aa52b6f212cc37131092a98914bf85c831b0dc56f224ea7961731928ce383a7130cebe1b23ec2cd67fd0372a97588ff778bdd5bc7c4541b03e59d80ced2018d WHIRLPOOL e2954b37b55c7e005325849c00e57fcc6e2290296285e318fcb7cda122a4b8bc4fd88bb9eea6e6530f4ca7fd34e90f485b3a3c674e859e1d3baa5d68e509e02e
+MISC metadata.xml 393 SHA256 1846b8c657c21e496b44497480a0e70339a665b97f621cb40ef5c416406c0d95 SHA512 23dc92c93c8270163b3bed19107e4f2fa30d96c5da86353c865dbca4fbccdf2a88969d1a498385774bd9efa96136137026da5e56931896fc10146c7bca9de751 WHIRLPOOL c2be2e1265c7636cfe29c71a72af5b044f5ff676a9cb8d1672a93b4c00a0eb21c53a2b2f89ff5cf1e7db1007eae17069d74770f225f4ab5c75634a0800ad7b29
diff --git a/dev-python/lupy/lupy-0.2.1-r2.ebuild b/dev-python/lupy/lupy-0.2.1-r2.ebuild
new file mode 100644
index 000000000000..6385bf816a0d
--- /dev/null
+++ b/dev-python/lupy/lupy-0.2.1-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Lupy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Lupy is a is a full-text indexer and search engine written in Python"
+HOMEPAGE="https://pypi.python.org/pypi/Lupy"
+SRC_URI="mirror://sourceforge/lupy/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ia64 ppc ~s390 x86"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="changelog.txt releasenotes.txt"
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/lupy/metadata.xml b/dev-python/lupy/metadata.xml
new file mode 100644
index 000000000000..d4dce3c126cb
--- /dev/null
+++ b/dev-python/lupy/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lordvan@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">lupy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
new file mode 100644
index 000000000000..0551480014e6
--- /dev/null
+++ b/dev-python/lxml/Manifest
@@ -0,0 +1,11 @@
+AUX lxml-3.5.0-cross-compile.patch 1518 SHA256 4d16cb9d2951fac9ec467d5fa9fd5d7c0565fd746eb8200924a75474def4c3bd SHA512 b53925979e554552e72e58e06df579d2eb0190cadc304d13766852eaaeec78641deb1ef10700a0b52aebbdc998979830413a76a56cf221bce2e9a24926e1680b WHIRLPOOL 67b446ef6f66d5fca0fe4261d47508a2fa3e850cc03f7329b01fbe27476e844faacd6e310d8973654477361ea5ed7060d7c6b5290f521c3b6a6b02e2ee83eebd
+AUX lxml-3.6.4-fix-test_xmlschema.patch 1483 SHA256 6f44d53b78ac07cdd87cd3653d236a62ca60d83b6dba1fef65aa4d9858d7ed71 SHA512 5ea10849df7966b8e1c55a699c1489f72714449de3564ee13b5d9410877db3691e82c1d37cb6ea60c30c2deac33bb839583f0bb81a3551baac39bf14ca066229 WHIRLPOOL 15589a917a2b8eff7989205c60368be8a462c2937db085c7bc8662a119382defda88d0e9129222711c857f417f81530194a7ca3a34d7c76a438ac3f5554935fd
+DIST lxml-3.7.3.tar.gz 3797713 SHA256 aa502d78a51ee7d127b4824ff96500f0181d3c7826e6ee7b800d068be79361c7 SHA512 9bf1142e81b6e1c8a47e296774d7e448d9ed47de3672f7442cc33274b07252baa47a9346efa9d2fda7b7bb66beb95bbc81f0ae16c9f808ff568f330991dd6d13 WHIRLPOOL d3881f308622ed8beb03a59bbf8256a55b92f5cf41c2c9a0c65c1e53acceea33ab93f420151330b09e8dbde3f717d5c095aa0275406355ec4a17105de46b6bae
+DIST lxml-3.8.0.tar.gz 3795205 SHA256 736f72be15caad8116891eb6aa4a078b590d231fdc63818c40c21624ac71db96 SHA512 08f6f352e22ed2bc199a5f34a1c6b5f7b41ec282dc0026c9f16a06466c27e39e8eb18608ba4493636170eeac4b0194f7050445e1cc9bd0a4628573c404593088 WHIRLPOOL b09d7509ca55df74c5ced03ca91b72e0f373df6cb22331a452a35cfe3aa305bb9417280ae0b4835cd4abd29f7df465468799fa25c1b8d732152222c74fee51e1
+DIST lxml-4.0.0.tar.gz 4217301 SHA256 f7bc9f702500e205b1560d620f14015fec76dcd6f9e889a946a2ddcc3c344fd0 SHA512 8aa85ab6a99097ae2eaa0087b3a663aae8ac81a0a4d685bf857571c811c8ccd6410afc414f14c68702a53e90265726af085d0609ec7f0d3cc96e3702772627e8 WHIRLPOOL 24ad26d075ecf8f7062a6aa695557628664ce9d23cee7f66218bc373c90feec07bdf8a7f6e4501b996bd4bb208ca173faac1609262c08c6313f5a2d155eed220
+EBUILD lxml-3.7.3.ebuild 2225 SHA256 31a982ad59109791756145d68de4f9bf57eb7108af300d50d2b8b37494999bfa SHA512 c50654ba48c2437f5fa8f27a04d58ec827dea8c11fc1d36a3112f56cf872da4bea02f664a74cdff7899e9dbd13722896e1cf6dfad8d9485313a1342017972d94 WHIRLPOOL 289b35a0ba855a747573a2761becf22360f4fb344223207bc217a058fc998071b6e519ff00af7baa76d5e66cf5b0252bf251b2c6fb19a97c0b298d148cccc2a5
+EBUILD lxml-3.8.0.ebuild 2254 SHA256 c2f8ec55283ff70da5ceef74fa9900736d4badef700dc3d47414161a62fcd26a SHA512 bd042b2a97d121436bc890f017b908510e4c199a37524c0497c0adb0d81071c3061f67b0f9fc1435def6d47cd9a4970e9f7f94aba9a629b8964d351a7d58b75b WHIRLPOOL 7095b783b48e379e2de8ae2cd5897e519b93ddec199978b74c425bfef7c8e07b9ed6c69ea1f3953fd12e57048d6d95fec5a094855a4146597382629c0dafe2f1
+EBUILD lxml-4.0.0.ebuild 2264 SHA256 06ca03fe985b78c67c8da68fb9f8a0ac321b08d880e96d3f3ce3a0af1ab9ea2e SHA512 0d03174c227a945680fcaa13ba8ba1f28981b52a8f45693564b258b5f8966217eda13dc4e72307394ae4de0696e34f977b62bfba01d547d893bd9d1dd6a08cf6 WHIRLPOOL 958a8e6d94728bdd46ea1dda4d6e37b6cb169db602a586cabca303f41b0f34c3989c2b1e949df133892014b47b5c4e646a59a0621dade74b4eda9d51febf26f5
+MISC ChangeLog 11862 SHA256 6fd242f3eee218860f8744e0c5656c51599e9a80cbc75e12c954a543a03ead94 SHA512 220b3df834fd4e8d85cfc46bec8a414042c06d4cd05efa887f619e855b452c7e69c7713d70478cdea9264a83f5012b5f0d0604c7511e07f495d8a0d02ae0a721 WHIRLPOOL 9771d6651fa6a474fd3e234504e419b18f9d1e266253bef4b6500e33b3d3c477aca2d2d45d6b72b9fbd144f6e9875700df0cf84e96c45482ad228e3eb89da280
+MISC ChangeLog-2015 27655 SHA256 585c3b7babb59fabf24b0bbd3abfa0abbe5f35c92faaccb0df995c61b5878b24 SHA512 0a05a247257042ba708d9914e6757aa60ece30eb67d1892b164f49d2d2825d467b4fe60396bbbadb692fc0a6f11e28efc8b6cce6176966a9e4f4669b1fff651a WHIRLPOOL d031211ffd5cc010d16cc3d872a6ed17d348103302f65e7ecb9af1082659f85e6b65babf36ec347ae1c03cf8822d71bc679eb6738bbcb892d8dbeeb322c34082
+MISC metadata.xml 317 SHA256 cd18e04d042e1f29961f6fd28916572028bba9f9fc0dfe26da78c3347b4d49e9 SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae WHIRLPOOL 093286f5009a9dff327e1f6931f18e9081a7972a86ed88d1f04f612d68e9dbb94bc5847c8430554ffb29a51cc0b233de03d82f8d4d086a116a124826faeabcd7
diff --git a/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch b/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch
new file mode 100644
index 000000000000..82a371c72978
--- /dev/null
+++ b/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch
@@ -0,0 +1,39 @@
+ setupinfo.py | 18 +++---------------
+ 1 file changed, 3 insertions(+), 15 deletions(-)
+
+diff --git a/setupinfo.py b/setupinfo.py
+index e04c38f..0549eaa 100644
+--- a/setupinfo.py
++++ b/setupinfo.py
+@@ -93,19 +93,6 @@ def ext_modules(static_include_dirs, static_library_dirs,
+         source_extension = ".c"
+         print("Building without Cython.")
+ 
+-    lib_versions = get_library_versions()
+-    versions_ok = True
+-    if lib_versions[0]:
+-        print("Using build configuration of libxml2 %s and libxslt %s" %
+-              lib_versions)
+-        versions_ok = check_min_version(lib_versions[0], (2, 7, 0), 'libxml2')
+-    else:
+-        print("Using build configuration of libxslt %s" %
+-              lib_versions[1])
+-    versions_ok |= check_min_version(lib_versions[1], (1, 1, 23), 'libxslt')
+-    if not versions_ok:
+-        raise RuntimeError("Dependency missing")
+-
+     base_dir = get_base_dir()
+     _include_dirs = _prefer_reldirs(
+         base_dir, include_dirs(static_include_dirs) + [INCLUDE_PACKAGE_PATH])
+@@ -358,8 +345,9 @@ def get_library_versions():
+ 
+ 
+ def flags(option):
+-    xml2_flags = run_command(find_xml2_config(), "--%s" % option)
+-    xslt_flags = run_command(find_xslt_config(), "--%s" % option)
++    pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
++    xml2_flags = run_command(pkg_config, 'libxml-2.0', '--%s' % option)
++    xslt_flags = run_command(pkg_config, 'libxslt', '--%s' % option)
+ 
+     flag_list = xml2_flags.split()
+     for flag in xslt_flags.split():
diff --git a/dev-python/lxml/files/lxml-3.6.4-fix-test_xmlschema.patch b/dev-python/lxml/files/lxml-3.6.4-fix-test_xmlschema.patch
new file mode 100644
index 000000000000..13f963ab2e2f
--- /dev/null
+++ b/dev-python/lxml/files/lxml-3.6.4-fix-test_xmlschema.patch
@@ -0,0 +1,36 @@
+diff --git a/src/lxml/tests/test_xmlschema.py b/src/lxml/tests/test_xmlschema.py
+index 26d8432..b41c097 100644
+--- a/src/lxml/tests/test_xmlschema.py
++++ b/src/lxml/tests/test_xmlschema.py
+@@ -168,31 +168,6 @@ class ETreeXMLSchemaTestCase(HelperTestCase):
+         self.assertEqual('ho', root[2].get('hardy'))
+         self.assertEqual('hey', root[3].get('hardy'))
+ 
+-    def test_xmlschema_parse_fixed_attributes(self):
+-        # does not work as of libxml2 2.7.3
+-        schema = self.parse('''
+-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+-  <xsd:element name="a" type="AType"/>
+-  <xsd:complexType name="AType">
+-    <xsd:sequence minOccurs="3" maxOccurs="3">
+-      <xsd:element name="b" type="BType" />
+-    </xsd:sequence>
+-  </xsd:complexType>
+-  <xsd:complexType name="BType">
+-    <xsd:attribute name="hardy" type="xsd:string" fixed="hey" />
+-  </xsd:complexType>
+-</xsd:schema>
+-''')
+-        schema = etree.XMLSchema(schema)
+-        parser = etree.XMLParser(schema=schema, attribute_defaults=True)
+-
+-        tree_valid = self.parse('<a><b/><b hardy="hey"/><b/></a>',
+-                                parser=parser)
+-        root = tree_valid.getroot()
+-        self.assertEqual('hey', root[0].get('hardy'))
+-        self.assertEqual('hey', root[1].get('hardy'))
+-        self.assertEqual('hey', root[2].get('hardy'))
+-
+     def test_xmlschema_stringio(self):
+         schema_file = BytesIO('''
+ <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
diff --git a/dev-python/lxml/lxml-3.7.3.ebuild b/dev-python/lxml/lxml-3.7.3.ebuild
new file mode 100644
index 000000000000..f2a0ffd01303
--- /dev/null
+++ b/dev-python/lxml/lxml-3.7.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="http://lxml.de/ https://pypi.python.org/pypi/lxml/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +threads test"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+RDEPEND="
+	>=dev-libs/libxml2-2.9.2
+	>=dev-libs/libxslt-1.1.28"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+	"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5.0-cross-compile.patch
+
+	# This patch removes a testcase that fails because of issues
+	# in libxml2.
+	#
+	# Upstream bug: https://bugs.launchpad.net/lxml/+bug/1608479
+	"${FILESDIR}"/${PN}-3.6.4-fix-test_xmlschema.patch
+)
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i '/sys\.path/d' test.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if [[ ${EPYTHON} != python3* ]]; then
+		local -x CFLAGS="${CFLAGS}"
+		append-cflags -fno-strict-aliasing
+	fi
+	tc-export PKG_CONFIG
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+	if use examples; then
+		docinto examples
+		dodoc -r samples/.
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
+	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}
diff --git a/dev-python/lxml/lxml-3.8.0.ebuild b/dev-python/lxml/lxml-3.8.0.ebuild
new file mode 100644
index 000000000000..224c7a410152
--- /dev/null
+++ b/dev-python/lxml/lxml-3.8.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="http://lxml.de/ https://pypi.python.org/pypi/lxml/ https://github.com/lxml/lxml"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +threads test"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+RDEPEND="
+	>=dev-libs/libxml2-2.9.2
+	>=dev-libs/libxslt-1.1.28"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+	"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5.0-cross-compile.patch
+
+	# This patch removes a testcase that fails because of issues
+	# in libxml2.
+	#
+	# Upstream bug: https://bugs.launchpad.net/lxml/+bug/1608479
+	"${FILESDIR}"/${PN}-3.6.4-fix-test_xmlschema.patch
+)
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i '/sys\.path/d' test.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if [[ ${EPYTHON} != python3* ]]; then
+		local -x CFLAGS="${CFLAGS}"
+		append-cflags -fno-strict-aliasing
+	fi
+	tc-export PKG_CONFIG
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+	if use examples; then
+		docinto examples
+		dodoc -r samples/.
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
+	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}
diff --git a/dev-python/lxml/lxml-4.0.0.ebuild b/dev-python/lxml/lxml-4.0.0.ebuild
new file mode 100644
index 000000000000..2ab0055cd819
--- /dev/null
+++ b/dev-python/lxml/lxml-4.0.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="http://lxml.de/ https://pypi.python.org/pypi/lxml/ https://github.com/lxml/lxml"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +threads test"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+RDEPEND="
+	>=dev-libs/libxml2-2.9.2
+	>=dev-libs/libxslt-1.1.28"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+	"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5.0-cross-compile.patch
+
+	# This patch removes a testcase that fails because of issues
+	# in libxml2.
+	#
+	# Upstream bug: https://bugs.launchpad.net/lxml/+bug/1608479
+	"${FILESDIR}"/${PN}-3.6.4-fix-test_xmlschema.patch
+)
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i '/sys\.path/d' test.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if [[ ${EPYTHON} != python3* ]]; then
+		local -x CFLAGS="${CFLAGS}"
+		append-cflags -fno-strict-aliasing
+	fi
+	tc-export PKG_CONFIG
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+	if use examples; then
+		docinto examples
+		dodoc -r samples/.
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
+	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}
diff --git a/dev-python/lxml/metadata.xml b/dev-python/lxml/metadata.xml
new file mode 100644
index 000000000000..ed72c69d7530
--- /dev/null
+++ b/dev-python/lxml/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">lxml</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/lz4/Manifest b/dev-python/lz4/Manifest
new file mode 100644
index 000000000000..7cc4ecaec607
--- /dev/null
+++ b/dev-python/lz4/Manifest
@@ -0,0 +1,12 @@
+AUX test.py 269 SHA256 15fcd6e63ca0a28d14af8062a44f851405f477758de71afe44fb9070b754baac SHA512 7968adb54b414a8dc1ba9b3b8ba4f11695564239786cd37474122ce83f8976920206fec2b846eefcacdd307da6c9f6ac73ead87c78dfefab746540021f44964c WHIRLPOOL 219cfb0a1bde5e142bd5cb5fd7c09050a5467db85a51c78038d3ce39b33c99d79aec0d102531fbf563585a272ed6a0eb05f26529b7e3a7eaab256ba27ad2023d
+DIST lz4-0.10.0.tar.gz 91852 SHA256 c3daab3974893b4a8641793af441cf30e9950fe048476d8649cac49cab4e2837 SHA512 5a998eb2a541e7a6b8ff7a2d8c1fc0e6d30cddb35ec2b400f60726a6c9d996e2488c738dd841c16069a13d3eaadad3479ca173cd8c863c7e73cd5a26d77ef658 WHIRLPOOL 753581edf1da6db609bd879a0a34d931f07a32b8c7c8272345673246a0a1567bf2ed46918d1e37cecc24aa0c177e306a3c5c64d9987ca060495975e945c9ae05
+DIST lz4-0.10.1.tar.gz 92068 SHA256 a0423290a6e89c1789525a7e9d344d877c7a97102cf5c0f99b2319ac560f1b3e SHA512 538880742257e08b027c45c33aa29e12d7303826f63817d1f6d316ea9b69dfb20710a4f573499ce141cffd12fbac701305405521cb815e2329333934e7e1f2c9 WHIRLPOOL 5164d887cc0b974b80660f0db2e79951cd129622d228912ab43609df318e1517e1da6b69ebabb64c21bd77634e552ff7ef4c28c4c383f8f1d180796c59c6ce58
+DIST lz4-0.8.2.tar.gz 30818 SHA256 6bf49061d73d69c453e892ace4586b99ccffc7de558f921d18b9418235692ac7 SHA512 e516d5c3309f214fa422b040a0aacdda079395624dd4f5548ed7af637b1594012aac75b309cef260b41c10a623410f815fc089b54ca5d80955d5f2ead12841b1 WHIRLPOOL 0a91c5befd9e8d1593ffdf6e102ec4dfa0ac921530e5c570748fdd1be4e0d1a4367792d9226b92215eae764da4107f4370fbf35c5e3b0793d96afc07f330434b
+DIST lz4-0.9.0.tar.gz 86939 SHA256 93c2b83aa9c74c024062823f96515488c510fa5a4b3826579d0916049d28c205 SHA512 744d1759e3aecdd75c1045594f05ca8d7b849c737315d5115d7e84e6a8fbe8463bde301466686245662d71f916aed691a6628b8cf5af9c1c1ad2a0352e11947d WHIRLPOOL 5a9e6809e7ff270225dc789e0c56e70513220873154683d6ff81c9ad9220e64b28d8d5f4ddfab6fb167300d011a4d9bbef21ddd3cb5f779b7b3ccc12958de945
+EBUILD lz4-0.10.0.ebuild 585 SHA256 623d4904697c9c355f81dffa709abe4e5e1402981fd837848349168a39830145 SHA512 daa139cfe385381f7160a7009d019920411eca47c8ceb1c938b8a4e901f0e49bf8fd5879ceafc5baa317db746d94993f1267c2f375c38f5567d8e6ccdce8f545 WHIRLPOOL 440a8e94d809c368028c5036597b42480bfc2e6b3e36201e213c08b4428119ee886ead579ab3033198fac9e8d63dc1ba03dcaab2b8bb95d613bee2aa21660792
+EBUILD lz4-0.10.1.ebuild 585 SHA256 623d4904697c9c355f81dffa709abe4e5e1402981fd837848349168a39830145 SHA512 daa139cfe385381f7160a7009d019920411eca47c8ceb1c938b8a4e901f0e49bf8fd5879ceafc5baa317db746d94993f1267c2f375c38f5567d8e6ccdce8f545 WHIRLPOOL 440a8e94d809c368028c5036597b42480bfc2e6b3e36201e213c08b4428119ee886ead579ab3033198fac9e8d63dc1ba03dcaab2b8bb95d613bee2aa21660792
+EBUILD lz4-0.8.2.ebuild 817 SHA256 aed393538c1bde577a291640a51d38cf3a381d53637c2fcf63e0426526826eae SHA512 c9cfce89de216f4ccee6224645f16102b1b782bdc3869270b7b793010453ec676c672e32503e2ea53e41b4cbf9235ee54ae5844e51b2452fc0c61fe364b0d0f4 WHIRLPOOL ec81d90bf054accbb817b2449204723f15c9756d95a1cdd49795a95ab2762d6fc61fbaf19344264b87c17e5ca9579ba5620820dd6dfe045fb5668218e5f3c6db
+EBUILD lz4-0.9.0.ebuild 585 SHA256 623d4904697c9c355f81dffa709abe4e5e1402981fd837848349168a39830145 SHA512 daa139cfe385381f7160a7009d019920411eca47c8ceb1c938b8a4e901f0e49bf8fd5879ceafc5baa317db746d94993f1267c2f375c38f5567d8e6ccdce8f545 WHIRLPOOL 440a8e94d809c368028c5036597b42480bfc2e6b3e36201e213c08b4428119ee886ead579ab3033198fac9e8d63dc1ba03dcaab2b8bb95d613bee2aa21660792
+MISC ChangeLog 3449 SHA256 84e2b0082e4140385f9ae6d3caadb6c612e8c043af8624cc2f9e51e758d9ef5f SHA512 5fde2c8805b0460de3933ef43811eeac43ff4918a5f0511ec429c9c1df74ffb8dd8b2a824dcbe5e888801186a6f039a359b719063c61e683fb16a5146584656e WHIRLPOOL 09a43ef0c4ef65d261d4cbd51f9b711887047b3ed8d21398a06fa7ac2efbcfb9dfc6911178d91cac4449701d225d12fb556ab77955edae638317b06968fb8578
+MISC ChangeLog-2015 1779 SHA256 3dc58c70722d4625d7d1fbe437f174bf40c813f7c92182a90ef100e0990014e8 SHA512 fd1f3e86ae82ae0a4e9717744d1cfb09b04724993c4ae91db8ba223e9e6700533df10e2526649bc059ce78b7e0849e80ec06f95eda3ace1f090281246a91466a WHIRLPOOL 22de20835ec909ef65326049a16a6b39f6e68ea1a99223e421231a4bd58c6f3aae28c9fcffd33862a8295f4efef30c06c728a01d4a817b4b9940393a4fb13b87
+MISC metadata.xml 465 SHA256 4326f7fcdfaeb7b8f10f38457fbfb7de2214bd0f2d7d202d0d8f2c137d3976eb SHA512 e5f75916075710426f9a7b875aaeb1239b948f11ac97a8d8bc45032d99985d6659916cd3c126bd37fb0fa53c97cca5b4eeeb4228180633809edc01af3b89ad91 WHIRLPOOL 72eb9a8c5f1230fd25d0b963432aa3da2b28fa477978dcdf0e7275110e8d3e3541b971d8f784e0992c2f24ebc3069010e1037557048f52cb24ba0eacdb79234e
diff --git a/dev-python/lz4/files/test.py b/dev-python/lz4/files/test.py
new file mode 100644
index 000000000000..9469a03da328
--- /dev/null
+++ b/dev-python/lz4/files/test.py
@@ -0,0 +1,16 @@
+import lz4
+import sys
+
+
+import unittest
+import os
+
+class TestLZ4(unittest.TestCase):
+
+    def test_random(self):
+      DATA = os.urandom(128 * 1024)  # Read 128kb
+      self.assertEqual(DATA, lz4.loads(lz4.dumps(DATA)))
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/dev-python/lz4/lz4-0.10.0.ebuild b/dev-python/lz4/lz4-0.10.0.ebuild
new file mode 100644
index 000000000000..3e2cd6e23b11
--- /dev/null
+++ b/dev-python/lz4/lz4-0.10.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="LZ4 Bindings for Python"
+HOMEPAGE="https://pypi.python.org/pypi/lz4 https://github.com/python-lz4/python-lz4"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/lz4/lz4-0.10.1.ebuild b/dev-python/lz4/lz4-0.10.1.ebuild
new file mode 100644
index 000000000000..3e2cd6e23b11
--- /dev/null
+++ b/dev-python/lz4/lz4-0.10.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="LZ4 Bindings for Python"
+HOMEPAGE="https://pypi.python.org/pypi/lz4 https://github.com/python-lz4/python-lz4"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/lz4/lz4-0.8.2.ebuild b/dev-python/lz4/lz4-0.8.2.ebuild
new file mode 100644
index 000000000000..b75564adfb8e
--- /dev/null
+++ b/dev-python/lz4/lz4-0.8.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="LZ4 Bindings for Python"
+HOMEPAGE="https://pypi.python.org/pypi/lz4 https://github.com/steeve/python-lz4"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed \
+		-e '/nose/s:setup_requires:test_requires:g' \
+		-i setup.py || die
+	mkdir "${S}"/tests
+	cp "${FILESDIR}"/test.py "${S}"/tests
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test || dies "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/lz4/lz4-0.9.0.ebuild b/dev-python/lz4/lz4-0.9.0.ebuild
new file mode 100644
index 000000000000..3e2cd6e23b11
--- /dev/null
+++ b/dev-python/lz4/lz4-0.9.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="LZ4 Bindings for Python"
+HOMEPAGE="https://pypi.python.org/pypi/lz4 https://github.com/python-lz4/python-lz4"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/lz4/metadata.xml b/dev-python/lz4/metadata.xml
new file mode 100644
index 000000000000..503d76895130
--- /dev/null
+++ b/dev-python/lz4/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">lz4</remote-id>
+    <remote-id type="github">steeve/python-lz4</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
new file mode 100644
index 000000000000..1e210c00e7cd
--- /dev/null
+++ b/dev-python/m2crypto/Manifest
@@ -0,0 +1,11 @@
+DIST M2Crypto-0.24.0.tar.gz 184457 SHA256 80a56441a1d2c0cf27e725be7554c92598b938fc8767ee2c71fdbc2fdc055ee8 SHA512 c23ae0f8ac790d4ef108a217a44e994341f6bbe4e12a7fef2518d8def82331246a145e19a2504b82b790a3ad4b467d2facc8a73bb7f1190b56441d8482c66aca WHIRLPOOL 47a437ee1207b4cca8d67aa4bdec95b9194030e3fc7146ace8d071caa9be829f3e9516ff9399e695615acdf930a90040deb0f1175d81994465ed0853688e3b37
+DIST M2Crypto-0.25.1.tar.gz 300904 SHA256 ac303a1881307a51c85ee8b1d87844d9866ee823b4fdbc52f7e79187c2d9acef SHA512 096d414efd5558f9ca4cebf46a297fa39f799e35c4325e031ee816689345e041370f2129650a10db66ebfcfe64309a7c7b49082306567baaf003b88ed9d60bda WHIRLPOOL c634685f8e096c41fc6caf9b364c5393b8f62fb585cd63f7599bb9cc10f910eb25cf48772616773ad9708d1f0fc25f139ee897d925d18432a03e18db552bfe7b
+DIST M2Crypto-0.26.0.tar.gz 305914 SHA256 05d94fd9b2dae2fb8e072819a795f0e05d3611b09ea185f68e1630530ec09ae8 SHA512 f6ba0173833d1b9a318402a3445fbb522f1848c7406face0cc08d384de6b6944395737f5871353ca1488c6655be7ffb0ad7b40b5e98d5954858da4540590d242 WHIRLPOOL 9984e4367ecca0e0fe2ca94db69db817660c9b045bdd45e117ffe23fb8ea5e522c342e08738328ed2769ee85d215e22d42e33ada806bf9de6555e28d4d31cc7c
+DIST M2Crypto-0.26.4.tar.gz 1116587 SHA256 5cae7acc0b34821f8c0ddf6665e482893fe1f198ad6379e61ffa9d8e65f5c199 SHA512 632b71850edd4f4e32d6d3aa83cb0e8068654c087498c88265f999180e0c58917aa6d29c5d1033f597397da98c3dc9acb9d21feddbb2f3da25a368f6a0af60f9 WHIRLPOOL 9388b016cf47f849379ef47a1819a9ee4fd647f8491a61e7381107032ba0e57f28bf6ebca868cf8cc6e4d6fb9341c77a01bc620b5133ea6e689aab72349a07d0
+EBUILD m2crypto-0.24.0.ebuild 939 SHA256 bfa6031ec861a3e04bcd464b379d90a803958ba2e4034dd85721c5b7f734490a SHA512 b5f7ae379e997a56934130c4b14b9357773904e19ec5357b93de6ab144ec7faeabfb19def44e5c8460d56fbc3b59287121f75b008f83b83e71aaf41e5d26823a WHIRLPOOL f60473c26e42124d24747d86535cea9e77e34dc975d46b53e47ae0d59a37cfffdb827eaeb2539528b0250fae5d03da4ddf34cd31496d0ef77f1558e420f48be4
+EBUILD m2crypto-0.25.1-r2.ebuild 872 SHA256 144e7206804b5044ad294ae816448f3e60b9ca8d1263aaa2482e316794face3b SHA512 73f1f2d87a9bddce1d2ab241801f78f9891b3be29dbc90803c4571fb5852d8179b8e945b7682e2ff69224dfe16ef9e2e4d046c5f604cfc18aa3f0a37d4fcbb26 WHIRLPOOL fa6e055d35d48e6e5fe6d07dfcdffa4ad12fc4922b57894b365b0bd1fa5f3b1c781b64653f31d24404023fa8797d3b50ee9f54f6874a6908a40ba56752fcfd61
+EBUILD m2crypto-0.26.0.ebuild 997 SHA256 3b2c1c5998f7916f1c65b60fb6d59b1083076956b823f18ab2ec883c3855b8d8 SHA512 a7569727bb1b958ab175d88f919119fc03e48c09931d83390b35d23dcb6e8ee4492df06ea6192315ccb86d8235f0597657c56c9ee1823ff4688719398d2eae7a WHIRLPOOL 463fed62e2fd8e3776d2b917313f30bfdff835f01dee1aa6ea64c8ab8cea9ce6535e7eefdf9d98d5b732e459cf3397d1c2294b2c57f1365ebcff83563e8d8a3e
+EBUILD m2crypto-0.26.4.ebuild 997 SHA256 3b2c1c5998f7916f1c65b60fb6d59b1083076956b823f18ab2ec883c3855b8d8 SHA512 a7569727bb1b958ab175d88f919119fc03e48c09931d83390b35d23dcb6e8ee4492df06ea6192315ccb86d8235f0597657c56c9ee1823ff4688719398d2eae7a WHIRLPOOL 463fed62e2fd8e3776d2b917313f30bfdff835f01dee1aa6ea64c8ab8cea9ce6535e7eefdf9d98d5b732e459cf3397d1c2294b2c57f1365ebcff83563e8d8a3e
+MISC ChangeLog 4266 SHA256 cb2c5c4b7e3f369ff5771668f735d21ccb7220e0d4f0087823cbf857571e7694 SHA512 ddd1c2a62e02a76067b9dd7c78f6c0db466938118f89ac3e0fe80dcbb1836157fdf845b3a71c14730d18d696555ebb9ccaf724be9c7935dd549f43d30e2f9c8f WHIRLPOOL 176157383668d784462e09697ecbf240110622b7f63eb423ab85c684beb3452e3cb177814c6925864607901377bef1fc48d32931254cfe36d9d58c6842f4d1d6
+MISC ChangeLog-2015 14785 SHA256 bc1f5e8965bd259e09aca3df7f1f04e5730b88839a8624159adfd0098202b627 SHA512 fc570db891f03ca71c118ce6662fcad9a219d15d2dde18b3d914aeecd1108783abf2f4659e96e3f5e8aa6cb4bf476bd7f98f1975fd395411e5725118013f82b9 WHIRLPOOL f6a6a35ab0566f54b3d49bf5714c8173a0ab9a91114a25ff508507469c6d538869231119b338e9bb9ad7baae81e62aedec3978e5292b8e4089c849d6e0e973fa
+MISC metadata.xml 380 SHA256 5ab7583a3fb8617ce68eb175d57b6a1ba951baca62d0179d80f63aca9eba3635 SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6 WHIRLPOOL f7bbc7ad82ae17374b32f1606bbf8960c799800debf709111abffb1df8da39d4492038dbeb3e3eb135f81f43038615d6d0fc0810151a58d5c27a3936237df9da
diff --git a/dev-python/m2crypto/m2crypto-0.24.0.ebuild b/dev-python/m2crypto/m2crypto-0.24.0.ebuild
new file mode 100644
index 000000000000..4ddfa7e334e1
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.24.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="M2Crypto"
+
+DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.python.org/pypi/M2Crypto"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-0.9.8:0= )
+	libressl? ( dev-libs/libressl:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.28:0
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Tests access network, and fail randomly. Bug #431458.
+RESTRICT=test
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/m2crypto/m2crypto-0.25.1-r2.ebuild b/dev-python/m2crypto/m2crypto-0.25.1-r2.ebuild
new file mode 100644
index 000000000000..5f6e4c00b3e8
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.25.1-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="M2Crypto"
+
+DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.python.org/pypi/M2Crypto"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64"
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-0.9.8:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-python/typing[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.28:0
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Tests access network, and fail randomly. Bug #431458.
+RESTRICT=test
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/m2crypto/m2crypto-0.26.0.ebuild b/dev-python/m2crypto/m2crypto-0.26.0.ebuild
new file mode 100644
index 000000000000..bd08f83725fe
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.26.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="M2Crypto"
+
+DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.python.org/pypi/M2Crypto"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-0.9.8:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-python/typing[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.28:0
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Tests access network, and fail randomly. Bug #431458.
+RESTRICT=test
+
+python_compile() {
+	distutils-r1_python_compile --openssl="${EPREFIX}"/usr
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/m2crypto/m2crypto-0.26.4.ebuild b/dev-python/m2crypto/m2crypto-0.26.4.ebuild
new file mode 100644
index 000000000000..bd08f83725fe
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.26.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="M2Crypto"
+
+DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.python.org/pypi/M2Crypto"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-0.9.8:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-python/typing[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.28:0
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Tests access network, and fail randomly. Bug #431458.
+RESTRICT=test
+
+python_compile() {
+	distutils-r1_python_compile --openssl="${EPREFIX}"/usr
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/m2crypto/metadata.xml b/dev-python/m2crypto/metadata.xml
new file mode 100644
index 000000000000..ed108183e47d
--- /dev/null
+++ b/dev-python/m2crypto/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">M2Crypto</remote-id>
+    <remote-id type="gitlab">m2crypto/m2crypto</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
new file mode 100644
index 000000000000..fee3d5591841
--- /dev/null
+++ b/dev-python/m2r/Manifest
@@ -0,0 +1,10 @@
+AUX m2r.1 9244 SHA256 514e684cf89b345f1db6cfcc6d62e4b1cbf1bea9534be1bab29a061cb4eaccfe SHA512 bb085477c363a0384a5aea0f5cac3e64ece957048f5a610b3063a5d96a31e8b78167dd847bd42d0f267b506595b55cffdf7647a5c819c9755b054e34d2ee3a99 WHIRLPOOL 54a87c5fd246a488f69d771fdb90a9b9537e6ea3ed01c17cc9912a467528b625e2eef38cb170069cb3f8e9f6baf202f46d7f2b3a40e6bc0ed89ae21d061d2763
+AUX test.md 34 SHA256 4de52ecd38fcfb8eb76e4aa773ef53daf8f42d06e3307a0a35380698bc9a9845 SHA512 c4b98b3256e14d46187d4c5cf5d3b26e4e4e0b1c6f2f61618987c234f49ea5a9bf31a94b9d2c4907bbd0685fb30138a5916b5dd3c8f92cd80bf0c7c2e657ae26 WHIRLPOOL fb01c2430fe9c210561ec4d0a55ffd1a157cd051b754ef9e093d5f48e5f8b69c62d52bcc33162173ce46a42423e515eea14252765a0e3781688eacd06a2b3dc1
+AUX test.rst 45 SHA256 4b2c59ad09b719e6a1d7d10d0692b2adcdea7f8fbae226a10ca49213cd0218a1 SHA512 a2d44de89e17b5a023928fa695c8dd61163a2b59968a514b9a976f92923881ce53625930f0e05f7f257250e46f25747928f71e8f25fcb9c05445b221688077d7 WHIRLPOOL e802dd8282e4bf7038629d9ebb7282d9daf47b4bb23c95f14388b8607e687ed98287b6e28e501168504a03f9d5380a19e994356b1d4ff57b3057ff721bfbefd0
+DIST m2r-0.1.12.tar.gz 15358 SHA256 adfb86ebb7ff3fcd3ebb27ce8cd6f795c409a13f0c03363e265f17419ce5b9ab SHA512 5579f993c9a8aa72195e97ba6ea2a317f97587f2f8fdab6d7cc16ced6ccc169960a99c712b9ab1251cd021b03f1c5566139bfe6c314bdad43b9bf138a921f0f1 WHIRLPOOL fa78d5ad192bf4e29740cdb6964647a47cf8e3b9b087a07ecb33d23cebd4a05fb8ade0fd4fcdd74bce6540a91b02903f27d224bbff4d8df6ac30636d84593546
+DIST m2r-0.1.5.tar.gz 13202 SHA256 3448f770aed05ca10390d0917cd51836cbf82a2f095bc91507e6291cfab03223 SHA512 78e9e8daa293b2466c95f0adad937fa0bbefaf0dd9663695bb916be13182633e0d462afa5331a595db424420485ef54bbfd4e0625962026fab4ce0c63104bc84 WHIRLPOOL c701aa0a735eda9b7eaab7ff6f384bad7535337f6a7adcfce2d729f33b01aed9213d04fcfe1dc3521b2df0687f2b849a3eb5df628a87ea3ea2697ae389ad8438
+DIST m2r-0.1.6.tar.gz 13615 SHA256 a26bc2e25e0ad3f8650385aea25cf734ac4fcd30e54faec92fd39675da75e527 SHA512 3641cf4013f71fbd43d6cdad530cfd3e909c93709edfbd79d6a51e7121de68e279d3ec4eb7eed391a35902ffa467310bd6b020139b2024c3e80fa44e5f6cc4a7 WHIRLPOOL 4bc6ed787069483f4f4c5bcbb4c9cc448dd2d2edc0a7845e2ca74189a0a8b25040c1fed293e4c4aebf6ea1640f69cb777c4621db79a6008b887b8199247712a9
+EBUILD m2r-0.1.12.ebuild 1195 SHA256 5cdb6442f68c0d8995e209ac65d8e1b18daae9107fac68c9ea731bda193fe021 SHA512 fd0521031bbf700f364ee5aef0c8dfaedaf1659adc415933f8d439d91f0f3d84b5e09eda5ed9e23cc5689624d9edf7e8ee038b503a6fed264461d72aa132e600 WHIRLPOOL eeb5c0c3ac1bfaaa65b84b072056d813706f6da25b6b6e5365a5624beb907932a259cef6ea41c55035a3d447439bef10844106b6f4e754c6b33c3e4dc6f0a66f
+EBUILD m2r-0.1.5.ebuild 1266 SHA256 2c1ba30993dba67f983468f9707e321923a48a205d045cad582da46fba4e60fd SHA512 8bf1727b92b641a3367fa261c6a7ecfedcfbdee62cedcd4a241eb130a72523556f5da86ddb8623822e20a50fb0c721291f3c75b077013951b0bcfc51e0a1357d WHIRLPOOL 66cc798e86d8c89f16c99f79ffb3e2a8511322f1aad67000cbd443cc805314e0b2e426d7bbac73e6cdadfa0b17890915a8288fb39febb4da9cb9177d08a26c71
+EBUILD m2r-0.1.6.ebuild 1266 SHA256 2c1ba30993dba67f983468f9707e321923a48a205d045cad582da46fba4e60fd SHA512 8bf1727b92b641a3367fa261c6a7ecfedcfbdee62cedcd4a241eb130a72523556f5da86ddb8623822e20a50fb0c721291f3c75b077013951b0bcfc51e0a1357d WHIRLPOOL 66cc798e86d8c89f16c99f79ffb3e2a8511322f1aad67000cbd443cc805314e0b2e426d7bbac73e6cdadfa0b17890915a8288fb39febb4da9cb9177d08a26c71
+MISC metadata.xml 602 SHA256 93d5c02e43c22ef342cfdd698b03a2f334b96df777b29ba081cb93b64a235e9f SHA512 82a101c9a126a8e8d7b1ebf0786370856fc16aa7cf0941f13b6ce8fcb994beaa189163a17e0c7d9eb1d0cb4c1bbb01bb15d02a310cf563e71b05a8e7bef75c15 WHIRLPOOL 73401efa086a08b67eeeb875b500ce825e5d17d1419e3af7c5a0c56164397657756a41980c3c9f9a7127d078fc400cdae2ae9ef69f0877b75b0308321597a063
diff --git a/dev-python/m2r/files/m2r.1 b/dev-python/m2r/files/m2r.1
new file mode 100644
index 000000000000..1a6c10b48a90
--- /dev/null
+++ b/dev-python/m2r/files/m2r.1
@@ -0,0 +1,515 @@
+.\" Man page generated from reStructuredText.
+.
+.TH "M2R" "1" "Mar 30, 2017" "0.1.5" "M2R"
+.SH NAME
+m2r \- M2R Documentation
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+\fI\%PyPI\fP\fI\%PyPI version\fP\fI\%Build Status\fP\fI\%codecov\fP
+.sp
+.ce
+----
+
+.ce 0
+.sp
+.sp
+M2R converts a markdown file including reST markups to a valid reST format.
+.SH WHY ANOTHER CONVERTER?
+.sp
+I wanted to write sphinx document in markdown, since it\(aqs widely used now and
+easy to write code blocks and lists. However, converters using pandoc or
+recommonmark do not support many reST markups and sphinx extensions. For
+example, reST\(aqs reference link like \fBsee \(garef\(ga_\fP (this is very convenient in
+long document in which same link appears multiple times) will be converted to
+a code block in HTML like \fBsee <code>ref</code>_\fP, which is not expected.
+.SH FEATURES
+.INDENT 0.0
+.IP \(bu 2
+Basic markdown and some extensions (see below)
+.INDENT 2.0
+.IP \(bu 2
+inline/block\-level raw html
+.IP \(bu 2
+fenced\-code block
+.IP \(bu 2
+tables
+.IP \(bu 2
+footnotes (\fB[^1]\fP)
+.UNINDENT
+.IP \(bu 2
+Inline\- and Block\-level reST markups
+.INDENT 2.0
+.IP \(bu 2
+single\- and multi\-line directives (\fB\&.. directive::\fP)
+.IP \(bu 2
+inline\-roles (\fB:code:\(gaprint(1)\(ga ...\fP)
+.IP \(bu 2
+ref\-link (\fBsee \(garef\(ga_\fP)
+.IP \(bu 2
+footnotes (\fB[#fn]_\fP)
+.IP \(bu 2
+math extension inspired by \fI\%recommonmark\fP
+.UNINDENT
+.IP \(bu 2
+Sphinx extension
+.INDENT 2.0
+.IP \(bu 2
+add markdown support for sphinx
+.IP \(bu 2
+\fBmdinclude\fP directive to include markdown from md or reST files
+.UNINDENT
+.UNINDENT
+.SH INSTALLATION
+.sp
+Python 2.7 or Python 3.3+ is required.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+pip install m2r
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.SH USAGE
+.SS Command Line
+.sp
+\fBm2r\fP command converts markdown file to reST format.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+m2r your_document.md [your_document2.md ...]
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+Then you will find \fByour_document.rst\fP in the same directory.
+.SS Programmatic Use
+.sp
+Instantiate \fBM2R\fP class and call with markdown text. Then it will return converted text.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+from m2r import M2R
+m2r = M2R()
+rest = m2r(\(aq# Title\en\enSentence.\(aq)
+print(rest)
+# Title
+# =====
+#
+# Sentence.
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+Or, use \fBparse_from_file\fP function to load markdown file and obtain converted text.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+from m2r import parse_from_file
+output = parse_from_file(\(aqmarkdown_file.md\(aq)
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+This is an example of setup.py to write README in markdown, and publish it to PyPI as reST format.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+readme_file = os.path.join(os.path.dirname(os.path.abspath(__file__)), \(aqREADME.md\(aq)
+try:
+    from m2r import parse_from_file
+    readme = parse_from_file(readme_file)
+except ImportError:
+    # m2r may not be installed in user environment
+    with open(readme_file) as f:
+        readme = f.read()
+setup(
+    ...,
+    long_description=readme,
+    ...,
+)
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.SS Sphinx Integration
+.sp
+In your conf.py, add the following lines.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+extensions = [
+    ...,
+    \(aqm2r\(aq,
+]
+
+# source_suffix = \(aq.rst\(aq
+source_suffix = [\(aq.rst\(aq, \(aq.md\(aq]
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+Write index.md and run \fBmake html\fP\&.
+.sp
+When \fBm2r\fP extension is enabled on sphinx and \fB\&.md\fP file is loaded, m2r
+converts to reST and pass to sphinx, not making new \fB\&.rst\fP file.
+.SS mdinclude directive
+.sp
+Like \fB\&.. include:: file\fP directive, \fB\&.. mdinclude:: file\fP directive inserts
+markdown file at the line.
+.sp
+Note: do not use \fB\&.. include:: file\fP directive to include markdown file even if
+in the markdown file, please use \fB\&.. mdinclude:: file\fP instead.
+.SH RESTRICTIONS
+.INDENT 0.0
+.IP \(bu 2
+In the reST\(aqs directives, markdown is not available. Please write in reST.
+.IP \(bu 2
+Column alignment of tables is not supported. (reST does not support this feature)
+.IP \(bu 2
+Heading with overline\-and\-underline is not supported.
+.INDENT 2.0
+.IP \(bu 2
+Heading with underline is OK
+.UNINDENT
+.UNINDENT
+.sp
+If you find any bug or unexpected behaviour, please report it to
+\fI\%Issues\fP\&.
+.SH EXAMPLE
+.sp
+See \fI\%example document\fP and \fI\%its
+source code\fP\&.
+.sp
+I\(aqm using m2r for writing user guide of \fI\%WDOM\fP\&.
+So you can see it as another example. Its \fI\%HTML is
+here\fP, and \fI\%its
+source code is here\fP\&.
+.SH ACKNOWLEDGEMENT
+.sp
+m2r is written as an extension of
+\fI\%mistune\fP, which is highly extensible
+pure\-python markdown parser.
+Without the mistune, I couldn\(aqt write this. Thank you!
+.SH LICENCE
+.sp
+\fI\%MIT\fP
+.SH CONTENTS
+.SS Example
+.sp
+This page is written in mixed markdown and reST.
+Source code is \fI\%here\fP\&.
+.SS Basic Markups (inline)
+.sp
+A \fBstrong\fP, \fIemphasis\fP, , \fBcode with single\-backtick\fP,
+\fBcode with two\-backticks\fP, ,
+\fBreST\(aqs code role\fP, and delete.
+.SS Link
+.sp
+Auto link to \fI\%http://example.com/\fP\&.
+.sp
+Link to \fI\%example.com\fP in markdown.
+.sp
+Link to \fI\%example.com\fP in reST.
+.sp
+Link to \fI\%example\fP in reST_ref.
+.SS Basic Markups (block)
+.sp
+This is a simple sentence.
+.nf
+sentence with
+newlines
+(reST)
+.fi
+.sp
+.sp
+Sentence with
+hard\-wrap (markdown, trailing two spaces)
+.INDENT 0.0
+.INDENT 3.5
+block quote
+second line
+.INDENT 0.0
+.INDENT 3.5
+nested quote
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.UNINDENT
+
+.sp
+.ce
+----
+
+.ce 0
+.sp
+.INDENT 0.0
+.INDENT 3.5
+Block quote after raw\-html directive
+.UNINDENT
+.UNINDENT
+.SS List
+.SS Unordered list
+.INDENT 0.0
+.IP \(bu 2
+unordered list
+new line
+.IP \(bu 2
+next item
+.INDENT 2.0
+.IP \(bu 2
+nested list
+with new line
+.IP \(bu 2
+nested list item 2
+.UNINDENT
+.IP \(bu 2
+original depth
+.INDENT 2.0
+.IP 1. 3
+ordered list item
+.IP 2. 3
+second
+with new line
+.UNINDENT
+.IP \(bu 2
+original depth again
+.UNINDENT
+.SS Ordered list
+.INDENT 0.0
+.IP 1. 3
+ordered list
+in new line
+.IP 2. 3
+second item
+.INDENT 3.0
+.IP \(bu 2
+nested unordered list
+.IP \(bu 2
+second item
+with new line
+.UNINDENT
+.IP 3. 3
+original depth
+.INDENT 3.0
+.IP 1. 3
+nested ordered list
+with new line
+.IP 2. 3
+again
+.UNINDENT
+.IP 4. 3
+original depth again
+.UNINDENT
+.SS Code Block
+.sp
+Simple, indented code block
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+pip install sphinx
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+Code block with triple backticks and language.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+def a(n: int) \-> None:
+    for i in range(n):
+        print(i)
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+Triple\-tildes (\fB~~~\fP) are also available.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+def a(n: int) \-> None:
+    for i in range(n):
+        print(i)
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+Here is reST style code block.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+if True:
+    print(\(aq\en\(aq)
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.SS Extensions
+.SS Table (Markdown\-Style)
+.sp
+(cell\-alignment is not supported currently)
+.TS
+center;
+|l|l|l|.
+_
+T{
+Table Header 1
+T}	T{
+Table Header 2
+T}	T{
+Table Header 3
+T}
+_
+T{
+normal
+T}	T{
+\fIitalic\fP
+T}	T{
+\fBbold\fP
+T}
+_
+T{
+\fBcode\fP
+T}	T{
+T}	T{
+T}
+_
+.TE
+.SS Math
+.sp
+This is E = mc^2 inline math.
+.sp
+The below is math\-block (markdown\-style).
+.sp
+.ce
+
+.ce 0
+.sp
+The below is reST\-style math\-block.
+.sp
+.ce
+
+.ce 0
+.SS Footnote
+.sp
+Footnote[2] and footnote[3] with markdown.
+.sp
+Footnote with reST[1]\&.
+.sp
+
+.IP [1] 5
+reST footnote
+.IP [2] 5
+footnote 1
+.IP [3] 5
+footnote key
+.SS Change Log
+.SS Version 0.2
+.sp
+(next version)
+.SS Version 0.1.5 (2016\-06\-21)
+.INDENT 0.0
+.IP \(bu 2
+Support multiple backticks in inline code, like: 
+.UNINDENT
+.SS Version 0.1.4 (2016\-06\-08)
+.INDENT 0.0
+.IP \(bu 2
+Support indented directives/reST\-comments
+.IP \(bu 2
+Support role\-name after backticks (\fB\(gatext\(ga:role: style\fP)
+.UNINDENT
+.SS Version 0.1.3 (2016\-06\-02)
+.INDENT 0.0
+.IP \(bu 2
+Remove extra escaped\-spaces (\(aq\(aq)
+.INDENT 2.0
+.IP \(bu 2
+before and after normal spaces
+.IP \(bu 2
+at the beginning of lines
+.IP \(bu 2
+before dots
+.UNINDENT
+.UNINDENT
+.SS Version 0.1.2 (2016\-06\-01)
+.INDENT 0.0
+.IP \(bu 2
+Add reST\(aqs \fB::\fP marker support
+.IP \(bu 2
+Add options to disable emphasis by underscore (\fB_\fP or \fB__\fP)
+.UNINDENT
+.SS Version 0.1.1 (2016\-05\-30)
+.INDENT 0.0
+.IP \(bu 2
+Fix Bug: when code or link is placed at the end of line, spaces to the next word is disappeared
+.UNINDENT
+.SS Version 0.1 (2016\-05\-30)
+.sp
+First public release.
+.INDENT 0.0
+.IP \(bu 2
+genindex
+.IP \(bu 2
+modindex
+.IP \(bu 2
+search
+.UNINDENT
+.SH AUTHOR
+Hiroyuki Takagi
+.SH COPYRIGHT
+2016, Hiroyuki Takagi
+.\" Generated by docutils manpage writer.
+.
diff --git a/dev-python/m2r/files/test.md b/dev-python/m2r/files/test.md
new file mode 100644
index 000000000000..e54ac950e527
--- /dev/null
+++ b/dev-python/m2r/files/test.md
@@ -0,0 +1,5 @@
+# Title
+
+## SubTitle
+
+__content__
diff --git a/dev-python/m2r/files/test.rst b/dev-python/m2r/files/test.rst
new file mode 100644
index 000000000000..f45558879567
--- /dev/null
+++ b/dev-python/m2r/files/test.rst
@@ -0,0 +1,8 @@
+
+Title
+=====
+
+SubTitle
+--------
+
+**content**
diff --git a/dev-python/m2r/m2r-0.1.12.ebuild b/dev-python/m2r/m2r-0.1.12.ebuild
new file mode 100644
index 000000000000..b5cb99779fb4
--- /dev/null
+++ b/dev-python/m2r/m2r-0.1.12.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Markdown to reStructuredText converter"
+HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.python.org/pypi/m2r"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/mistune[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )
+	${RDEPEND}
+"
+
+#S=${WORKDIR}/${P}
+
+python_prepare_all() {
+	# fix a Q/A violation, trying to install the tests as an independant package
+	sed -e "s/packages=\['tests'\],/packages=[],/" -i setup.py
+	# add missing test files
+	cp "${FILESDIR}/"test.md tests/ || die
+	cp "${FILESDIR}/"test.rst tests/ || die
+	cp "${FILESDIR}/"m2r.1 ./ || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman m2r.1
+}
diff --git a/dev-python/m2r/m2r-0.1.5.ebuild b/dev-python/m2r/m2r-0.1.5.ebuild
new file mode 100644
index 000000000000..d6d2a181ec75
--- /dev/null
+++ b/dev-python/m2r/m2r-0.1.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Markdown to reStructuredText converter"
+HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.python.org/pypi/m2r"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/mistune[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )
+	${RDEPEND}
+"
+
+#S=${WORKDIR}/${P}
+
+python_prepare_all() {
+	# fix a Q/A violation, trying to install the tests as an independant package
+	sed -e "s/packages=\['tests'\],/packages=[],/" -i setup.py
+	# remove duped old file in the tarball
+	rm "tests/test_r s.py" || die
+	# add missing test files
+	cp "${FILESDIR}/"test.md tests/ || die
+	cp "${FILESDIR}/"test.rst tests/ || die
+	cp "${FILESDIR}/"m2r.1 ./ || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman m2r.1
+}
diff --git a/dev-python/m2r/m2r-0.1.6.ebuild b/dev-python/m2r/m2r-0.1.6.ebuild
new file mode 100644
index 000000000000..d6d2a181ec75
--- /dev/null
+++ b/dev-python/m2r/m2r-0.1.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Markdown to reStructuredText converter"
+HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.python.org/pypi/m2r"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/mistune[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )
+	${RDEPEND}
+"
+
+#S=${WORKDIR}/${P}
+
+python_prepare_all() {
+	# fix a Q/A violation, trying to install the tests as an independant package
+	sed -e "s/packages=\['tests'\],/packages=[],/" -i setup.py
+	# remove duped old file in the tarball
+	rm "tests/test_r s.py" || die
+	# add missing test files
+	cp "${FILESDIR}/"test.md tests/ || die
+	cp "${FILESDIR}/"test.rst tests/ || die
+	cp "${FILESDIR}/"m2r.1 ./ || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman m2r.1
+}
diff --git a/dev-python/m2r/metadata.xml b/dev-python/m2r/metadata.xml
new file mode 100644
index 000000000000..c560383e607f
--- /dev/null
+++ b/dev-python/m2r/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>miyako.dev@gmail.com</email>
+			<name>Hiroyuki Takagi</name>
+		</maintainer>
+		<remote-id type="pypi">m2r</remote-id>
+		<remote-id type="github">miyakogi/m2r</remote-id>
+	</upstream>
+	<longdescription>
+		M2R converts a markdown file including reST markups to a valid reST format.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/m2secret/Manifest b/dev-python/m2secret/Manifest
new file mode 100644
index 000000000000..329b371c97df
--- /dev/null
+++ b/dev-python/m2secret/Manifest
@@ -0,0 +1,5 @@
+DIST m2secret-0.1.1.tar.gz 5032 SHA256 4174f4967b378d751e758894d6c394db506c4f8753d1db66494320c31667d8a0 SHA512 8fd66fdf9f255eedaeaeb514dc3af812358cdac2744cccfe65bfd0d85258c2b3ec851fd1972d1cd5604becfb8e54cd2b933bd9c0fb53e7317b03d7f09a8f16b7 WHIRLPOOL df3c4469a6c6c504d07fa1017c3277c4f3b36a810d4f014a1771cbfedc5fb9ae2b18579bc2175b48a22262f9cb3b73710fceb52d63e3d9a255794178ed766997
+EBUILD m2secret-0.1.1-r1.ebuild 545 SHA256 847e064fc291d0779100efd133453fceb3939619fa45a8aaf0e342e44ae8be4d SHA512 e960a3f9730e02ae522742da81981b7c31613dd3170ef9a418e404d628b815a9e560c1d85250bbf589a3c85d62c503938dabb5fd6583ab9eed6c9c4d4961760b WHIRLPOOL 327c8e292134d6b4c8033cc78de8b7a63bce079d7aaac80f1aae24d147abcaf6a71187c931742c22ac0e3cfa1d3e07323af342ac41b85c875a0d2e9deaaf0a54
+MISC ChangeLog 2585 SHA256 adbe4c89eb7e272870dde8e7b094de49607d5efc66606734c2cddbb9be602f20 SHA512 5c721629cf07d5b2a554c028b43a9f3a1a44f092e3b3872b5bfaba38a7ad494adc7cd5055eb9630a3aa40ee9e960f99136d5fbdc5764c6f023251e9bda05f767 WHIRLPOOL a6f1b135c452abb7e8a9d26ca024092dcd764964f7a43d3824dc3d639a5a5cfb1a7def19c46a93804c0f10889bc7b69db7e24a8dff817aa6c61070fb874dcce2
+MISC ChangeLog-2015 1194 SHA256 9783e10374a8e58f2ba8eaa39e2e8c3e90cc946446c47ebe71de7e82602be9fa SHA512 352f0e63b76eff7add63a573991caaca7116ac85f43b12b1f72f7b2b06d5af72e1343da25c5c9f25e04c2e011b4db4083bdddb1d286561f8555ade8a3015d4cd WHIRLPOOL 72f3e9bda69a94bd4c8542da6e5b33b7a83bd5f53e1ea85fcb5b44e6cfd5714069efa4b0005677c38e91a981569039cbb4999be92f372dc1a0edb122fee7147c
+MISC metadata.xml 311 SHA256 bc6ab98ec148a1cdd15db9b90d4e5b948c7be6f2322c83090acdd0ec1cd3bc34 SHA512 dc650b5a070aed296017ee094c3af8bfde5ad8c8afeb907292f12427ac3ab9229e0fe77875fc8390d89c8ab849ded17b3b8fa4e21bf1249e9af7a0a8fc9ac250 WHIRLPOOL 92828fab332c567aaf5d809219148571d5fd2f5f249168e1a0ffcf523df7bb3b62d81d3b855d7111c2693d526f6019ac026684b5a0c0a9c425fbc37f1c884331
diff --git a/dev-python/m2secret/m2secret-0.1.1-r1.ebuild b/dev-python/m2secret/m2secret-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..97a7dd4371d0
--- /dev/null
+++ b/dev-python/m2secret/m2secret-0.1.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Encryption and decryption module and CLI utility"
+HOMEPAGE="http://www.heikkitoivonen.net/m2secret https://pypi.python.org/pypi/m2secret"
+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}]"
+RDEPEND="${DEPEND}
+	>=dev-python/m2crypto-0.18[${PYTHON_USEDEP}]"
diff --git a/dev-python/m2secret/metadata.xml b/dev-python/m2secret/metadata.xml
new file mode 100644
index 000000000000..e5ab6e8d316c
--- /dev/null
+++ b/dev-python/m2secret/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">m2secret</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/maintboot/Manifest b/dev-python/maintboot/Manifest
new file mode 100644
index 000000000000..37958f3a34ff
--- /dev/null
+++ b/dev-python/maintboot/Manifest
@@ -0,0 +1,5 @@
+DIST maintboot-0.1.0.tar.gz 2090 SHA256 4a1f09ab8e6e7222eebd9ade69a32e4d76d3099a36fcdbc3fc0dcbc29e1c2d51 SHA512 dc63c59718a3c66a2128f36ad495c42d94bba08d6b16c40f470b0a0cc00388b5ec5977326ac258c858113e4d6c3f1ff246c5a1dfbd3d417aea181d381d7ae28f WHIRLPOOL d78786a8b1b0538764dfa2e9b1eac0ee3482be3a04d1a6705a26e465268b61cc8f5f6e4cf1d82ee3680ba26c9135197b63340afb9fee633dcdfbc82991670771
+EBUILD maintboot-0.1.0.ebuild 415 SHA256 2898d3301c70ffbe6c3dd350d1174ff5712fcf45934352f0041cc0166cb6be4d SHA512 f6a2bcdbb435d15da2e09dd619cc5d309a82dc5720b579bd4818e919ff14470cd038e749358e8e954a57ba21f4a1c3d9b31845adfc80684c9481765e67765253 WHIRLPOOL 3d031f56de1251456966da4cb07b7c2d87bdd0f6ca7bdb365e7422f31f99c2b1d749857d70b8c79eb7c5a1d2cf6b320b8491d81820c57202ff49cb932cf4a900
+MISC ChangeLog 2705 SHA256 937a8fd65cf5e558c794e9223cd6b418244554cfd506208d8cc016c17389f5e4 SHA512 fb0bcba3ee3147875d9fe75ac7b13899524aa3bc4bc75c93dd661f56329c36bbfbd5f476056e9a499238ceef67a032eca52057da892501dcdaf59cd2622e812f WHIRLPOOL 61285b690b4aec42ade6b6c54a1f74f9214c8b1eee502ae81acf0bd4338c90e6a9704bceb4f7a66ebdbf509379c19f0e8310f4afd3f49cc2855aa2f9d966eecc
+MISC ChangeLog-2015 462 SHA256 88e0f84a66de8685b3b64c9008ad092b270367d2eda01dc0cc2799e82f8f4558 SHA512 3e55a1344a3436c0bb0eb32ee827ad6219564b883a5981b1542cb9c3749883139fed0ae328df70033c944b7c55ecf78443a4805d37d8a3d4863f9f33857f94a1 WHIRLPOOL 8994d56c54abcb02839b6a15029b945e6245c769c54ea56ec05cafbdf2fa2d304a1fbdae53d873329eb8a0273c16cf1cab5a1accad8c91d8cc89993476518aa3
+MISC metadata.xml 244 SHA256 9f8cf048fab4add09a99490adf0d65c644804b21da623a05e2536fa9db9c8f02 SHA512 b0e08647af630e02531f47cabd502af365aa5f33e4152ca0944b73e8f627d2d473fd3ee8b0670d792854f4ee9feccb884d7dd9d33b921f881d5754f4e606d14a WHIRLPOOL 7e674a019fb234a54e334da99f5c0d0bbebc06879b65ec9314b1c84d500daffe639e5efbd3efd5f627b30480f0dc1d6d082149265b5852659e66f54974d7ca2e
diff --git a/dev-python/maintboot/maintboot-0.1.0.ebuild b/dev-python/maintboot/maintboot-0.1.0.ebuild
new file mode 100644
index 000000000000..35faf8b4ac93
--- /dev/null
+++ b/dev-python/maintboot/maintboot-0.1.0.ebuild
@@ -0,0 +1,17 @@
+# 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
+
+DESCRIPTION="Run maintenance tasks outside the OS"
+HOMEPAGE="https://pypi.python.org/pypi/maintboot"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/maintboot/metadata.xml b/dev-python/maintboot/metadata.xml
new file mode 100644
index 000000000000..238ea5642ad3
--- /dev/null
+++ b/dev-python/maintboot/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-needed -->
+  <upstream>
+    <remote-id type="pypi">maintboot</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
new file mode 100644
index 000000000000..1b34497c1175
--- /dev/null
+++ b/dev-python/mako/Manifest
@@ -0,0 +1,10 @@
+AUX pygments-exception.patch 1456 SHA256 32cf51ea6ef94763201b4ca47c2582aa5def13e2b0d9f566d0fff509fa842795 SHA512 c43f620fe52e1a69e52a14a4ef3a390ff38d6507a53a70b2da0625b3be1941a0f6b2cb23d2ee60a391e78d8062ba2a9c76d8c5ab0556e01c256867dede44ef61 WHIRLPOOL 6977370b49611bd1f85cfc611d532838ed2d960004bcee3481c2903be9ec51d1577e36787de3c3c60ce78899edfee2d1a7ec53ccd1b5b68403bf26962e635450
+DIST Mako-1.0.0.tar.gz 470006 SHA256 a3cd72cfef507204b50f74ffcbfcfde7e856437891d3f6cfe780866986d006fe SHA512 81a6b7637e26d561350a591e3490e7140db218ae7f6b43fec8fca5b767fc6e57d0e8cc901d28fecb9863b2170c824a35c578a94579f991359fa0873f62ec578a WHIRLPOOL aa27b63e3832f03120312fbfec939b05606081e67a5cb4c9a056c27259631c2e159cf7506292d44e2c17c5950d7e4255d19f4beba78502bdbb52fbf11e1a872c
+DIST Mako-1.0.3.tar.gz 565224 SHA256 7644bc0ee35965d2e146dde31827b8982ed70a58281085fac42869a09764d38c SHA512 1652cb3f7ea6484975c16f914ce9c070e503ff532564f76a048dd316e5eb12ff2b2445f272be55147d4d62b45906d5e14b3799c9136622ed0867a00875a0e52d WHIRLPOOL 4ac07778b58d8b4c95853a07dcb8755e560cb7225f68b606582ef9883fe632caead44d4a56ae1662b42f0ecdee2117942b3c500385558aa8f9763a3ce755b583
+DIST Mako-1.0.6.tar.gz 575112 SHA256 48559ebd872a8e77f92005884b3d88ffae552812cdf17db6768e5c3be5ebbe0d SHA512 15608f2487783ea3a48faf743ee1b8e811adc34281c613e56f1a4548f3c614d1d5dbc943911943a7f8f6d34a962a27387d8fc17862038c1abee2e6c3328a79cf WHIRLPOOL dd0c12f2b8fe6f65907df662de73117eb11afee015f3acd2c70c8522456a7c52761a1bfe8247ce9e88a4ca704008a120be95893f3c3b1b0e410c1a244af011ba
+EBUILD mako-1.0.0.ebuild 1466 SHA256 eeab16be7f3414888905092da5085a51fd297babbf9332d21d102e87d5a26c16 SHA512 4efcb883a90a92fc82ee4cbbc7a976d76732b869fc669c3b978e34c6e1a98afafea58b16d1a2c553728dd9f2d360313c9fd35d5554a97b2a53d6e7be74a40b70 WHIRLPOOL f9515e4dfb78526300e4bbb3ff2762cb8dea8743087598c0bfc313d9b8dce2ad4d2d1ef837e7df26376222946272bd794cc0369f5919fe7ea59b092bf588b059
+EBUILD mako-1.0.3.ebuild 1415 SHA256 43d929f0e6473a9829d506a08e42ff1ca3e527d0d1ea42690edb12ed377ceb2c SHA512 659bbf5a8f48dd5bc8f8a2e5ab2dd3a0c770566c8087304a9b721f8a44aa40f207b1faf6570dd690c936e498619840f8faee9f48437a64c91e23f29e6bf9c125 WHIRLPOOL 320296dd4aee1c193bf7975771a228e95237582f246da809773126c69ffb9d25be7d40e7ca9b0afa27368b01958f50a99543a62d856caca31978503cfd87e50e
+EBUILD mako-1.0.6.ebuild 1475 SHA256 815debb86981266af8880d48e7ec2797bf11e7f8e78132322fb4c1317fe4d3e5 SHA512 87c0cf382124cc4df200dc1693241e45fe2c6ef6af1e61d63b07984207c19ab0015783c853a6eb96e23a5e621b1e880e857b08a77e34f1b663f366852fe57013 WHIRLPOOL 5e05496f8beb253eb4835b1a9968005214d90168c3a02687618f8eba80fd51d04ea4084d212f1fe8788b10d441e73fe75e6d08a6c2f11d46e73823a2fa3bb46c
+MISC ChangeLog 4435 SHA256 0f17740adf4b369e34fec603a55ba27302f884eec9ae432a00f6f70a0402fcca SHA512 ed0667aab0a1fce67a1f4b19f7d5c7382c8a9db63119a4df2860567e66dc5ae78e30612857297d86de000bf5ec8a8d301584893f2d6d34f836f3fe24c74a7c50 WHIRLPOOL 25b811e20daa232a9ce476491b36b0813bc5481d2032dd14e896ba654b1aec54404e826a9c78fbf6dc6a5dca054ca941142bf095cd3b34131ac366dc30b52856
+MISC ChangeLog-2015 11613 SHA256 71f22807a50d90b0a352f1779d569c759a6ca4aade7720ebd1a5a99e15955eb0 SHA512 2e7105a71366a86cacaf1db1f0e22e11d0aaaaadcb48b4cc37bc7d1892094e04e27006e907478e2e05ca7ed7c018f9694c889cbb6115fc9885360706aef6b6ed WHIRLPOOL 2e46cdf29763d008446b21c45efc0b154286bf9fc656ceec065a2e9fa7b366edda47e66205de56e1ee75a6205be92660150128dc0751e290508943ae23d6d50c
+MISC metadata.xml 317 SHA256 345f956b756f726f59c602606ce0b294cd7db6cc97dd03b6b15b56ec64b6c557 SHA512 5df2d87e902b439727d8be3861e626ff798a546f09dbfdd19ee7384dc1ca0474d1b3ff2f638d262217f0105fc2536a3ac2440cc5b1161cb510976bd2ca6d1da8 WHIRLPOOL 823719ce6b94cd109f4714a1198d5810698f720ca9f8214dc0f1dcfd1df0a184bec4fc8e79fe89bd18b5b6ab5c921d481fe57491c27c13793284b495e720dd9d
diff --git a/dev-python/mako/files/pygments-exception.patch b/dev-python/mako/files/pygments-exception.patch
new file mode 100644
index 000000000000..0d2faca4f688
--- /dev/null
+++ b/dev-python/mako/files/pygments-exception.patch
@@ -0,0 +1,32 @@
+From 8eaf6b7ea92018202a886e1d919e2c6b0d307c99 Mon Sep 17 00:00:00 2001
+From: Mike Bayer <mike_mp@zzzcomputing.com>
+Date: Mon, 22 May 2017 22:30:54 -0400
+Subject: [PATCH] - exception test fixes for more recent pygments
+
+Change-Id: Ibdfe5b2f2f3d1426921bcadf6740ae065ed0833b
+---
+ test/test_exceptions.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/test_exceptions.py b/test/test_exceptions.py
+index 8321b25..bcaae3b 100644
+--- a/test/test_exceptions.py
++++ b/test/test_exceptions.py
+@@ -91,7 +91,7 @@ def test_utf8_html_error_template_pygments(self):
+                 assert "".encode(sys.getdefaultencoding(),
+                                         'htmlentityreplace') in html_error
+             else:
+-                assert 'u&#39;'\
++                assert '&#39;'\
+                         '&#x43F;&#x440;&#x438;&#x432;&#x435;&#x442;'\
+                         '&#39;</span><span class="cp">}</span>'.encode(
+                                 sys.getdefaultencoding(),
+@@ -220,7 +220,7 @@ def test_utf8_format_exceptions_pygments(self):
+             assert '&#39;привет&#39;</span>' in \
+                 l.get_template("foo.html").render().decode('utf-8')
+         else:
+-            assert 'u&#39;&#x43F;&#x440;&#x438;&#x432;'\
++            assert '&#39;&#x43F;&#x440;&#x438;&#x432;'\
+                     '&#x435;&#x442;&#39;</span>' in \
+                 l.get_template("foo.html").render().decode('utf-8')
+ 
diff --git a/dev-python/mako/mako-1.0.0.ebuild b/dev-python/mako/mako-1.0.0.ebuild
new file mode 100644
index 000000000000..6b8880fc9434
--- /dev/null
+++ b/dev-python/mako/mako-1.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit readme.gentoo versionator distutils-r1
+
+MY_PN="Mako"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A Python templating language"
+HOMEPAGE="http://www.makotemplates.org/ https://pypi.python.org/pypi/Mako"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOC_CONTENTS="
+${PN} can be enhanced with caching by dev-python/beaker"
+
+python_test() {
+	nosetests "${S}"/test || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	rm -rf doc/build
+
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 0.7.3-r2 $v; then
+			ewarn "dev-python/beaker is no longer hard dependency of ${P}"
+			ewarn "If you rely on it, you should add beaker to your world"
+			ewarn "file:"
+			ewarn "# emerge --noreplace beaker"
+			break
+		fi
+	done
+}
diff --git a/dev-python/mako/mako-1.0.3.ebuild b/dev-python/mako/mako-1.0.3.ebuild
new file mode 100644
index 000000000000..79caccad1dcf
--- /dev/null
+++ b/dev-python/mako/mako-1.0.3.ebuild
@@ -0,0 +1,55 @@
+# 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 )
+
+inherit distutils-r1 eutils versionator
+
+MY_PN="Mako"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A Python templating language"
+HOMEPAGE="http://www.makotemplates.org/ https://pypi.python.org/pypi/Mako"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests "${S}"/test || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	rm -rf doc/build || die
+
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Caching support" dev-python/beaker
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 0.7.3-r2 $v; then
+			ewarn "dev-python/beaker is no longer hard dependency of ${P}"
+			ewarn "If you rely on it, you should add beaker to your world"
+			ewarn "file:"
+			ewarn "# emerge --noreplace beaker"
+			break
+		fi
+	done
+}
diff --git a/dev-python/mako/mako-1.0.6.ebuild b/dev-python/mako/mako-1.0.6.ebuild
new file mode 100644
index 000000000000..2cc45b623373
--- /dev/null
+++ b/dev-python/mako/mako-1.0.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1 eutils versionator
+
+MY_PN="Mako"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A Python templating language"
+HOMEPAGE="http://www.makotemplates.org/ https://pypi.python.org/pypi/Mako"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+	)"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}/pygments-exception.patch" )
+
+python_test() {
+	nosetests "${S}"/test || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	rm -rf doc/build || die
+
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Caching support" dev-python/beaker
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 0.7.3-r2 $v; then
+			ewarn "dev-python/beaker is no longer hard dependency of ${P}"
+			ewarn "If you rely on it, you should add beaker to your world"
+			ewarn "file:"
+			ewarn "# emerge --noreplace beaker"
+			break
+		fi
+	done
+}
diff --git a/dev-python/mako/metadata.xml b/dev-python/mako/metadata.xml
new file mode 100644
index 000000000000..edcc780c70de
--- /dev/null
+++ b/dev-python/mako/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">mako</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mamba/Manifest b/dev-python/mamba/Manifest
new file mode 100644
index 000000000000..c6003871d677
--- /dev/null
+++ b/dev-python/mamba/Manifest
@@ -0,0 +1,5 @@
+DIST mamba-0.8.6.tar.gz 10430 SHA256 8770551c694f8be14c71710b2201d8a64fc630295f77eefce6f23050e0cd644b SHA512 f35396bcb607c2eb10caa99f4c82924b0c75c2eeddb3d18ed5db3d5e38dca41917c23f1fcd7003b596576436cea6a02f40c352e6a11f63e472144e0ae0575198 WHIRLPOOL cd542f776d4e3056476caeccbc3a11c62c8df18468f88b6ba22791ff54e4ff79618237a7ccae08dcac652e711e6bbcc450f53c1bde55625e9bf4962a6dc4c5e4
+EBUILD mamba-0.8.6.ebuild 908 SHA256 a9e87e612ae682bf8308265d94e182493acfded831276550085c666fc7a3b785 SHA512 da75fe2bcff3cc1ad8bcc09c57e62d97efd1be473df6289e378c9991348a169543be54931751b5aaf3458d9d336d2b2d232ef715f18f3ca3377ab7eb0ba37316 WHIRLPOOL f0c82df577710b5924e681e7024655e40765dc4b75ea1eba99eab1b44d266ecbd5f1e8e7346bf84bea8c7678c21f8e99437671919bf1ee1071254cdfdc88bba8
+MISC ChangeLog 3956 SHA256 2dde6f0eaee6ef32c973c9a1d944ade4355e2c5180d97d2936d14cffad694a07 SHA512 06086aed263f5d595338e6b9a547cace77d8c5943e4befff476c320e852a4eadbcfc5a026364c43570cddcea775689d61816d0ec92684074dcb72b62702e9e8c WHIRLPOOL 4c0a0e4990c8464b555b006c78ed4f5a2ed7caa151fe4736adcb0122a9a716c4b4a48a5297e54e7779d41a091b9795bad1306fff06e71e9ea2cdd784eb02f1f4
+MISC ChangeLog-2015 882 SHA256 ba24d63709fc0a0fc2311177856d6992ed19bea927f5385ca2cbba11ae4bc7f8 SHA512 f28f48946cd0d1af10815f6bb13023f9ba034b1bb8c98f9b8eccb2a0f98fdfc79bf70886fdc8db7f3ff3ba6ba2e3bd66b87c58f132a6bf5aa20f548941ce0f4e WHIRLPOOL 5a74aecd826444167e2829281ff352d38337e2e563b2c224c787b2ff3808390a16ece8539d046a0d3c9d39259557695ff528a632974ac3f908e851e99c91bb72
+MISC metadata.xml 385 SHA256 30def18b18007f4a93723bfb6203b72f6cf81929625bba2dbb5d5229d30aeeba SHA512 81f9ec8328999978c336315f06686431cd3ee99de88dacce03d1883b2aa1dec5dd226282e79260cf077d955fdeb4380d6c9466cfd8c89e38b13c1a9c8525af29 WHIRLPOOL a040eb6ea48c5fe11a852736dcb0438758377a2e81e9b7294ef0ea55b60e51a130f0a5786d4a116aa75039a8d1b779af779668a560bfb03a145dac5dd5a30837
diff --git a/dev-python/mamba/mamba-0.8.6.ebuild b/dev-python/mamba/mamba-0.8.6.ebuild
new file mode 100644
index 000000000000..7ddb9d87c8a8
--- /dev/null
+++ b/dev-python/mamba/mamba-0.8.6.ebuild
@@ -0,0 +1,36 @@
+# 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
+
+DESCRIPTION="... testing tool ... Born under the banner of Behavior Driven Development"
+HOMEPAGE="http://nestorsalceda.github.io/mamba"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? (
+		>=dev-python/doublex-expects-0.7.0_rc1[${PYTHON_USEDEP}]
+		>=dev-python/expects-0.8.0_rc2[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/clint-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-0.8.1[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	"${PYTHON}" -m mamba.cli || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/mamba/metadata.xml b/dev-python/mamba/metadata.xml
new file mode 100644
index 000000000000..db4fd1aacc28
--- /dev/null
+++ b/dev-python/mamba/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>alunduil@gentoo.org</email>
+    <name>Alex Brandt</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">mamba</remote-id>
+    <remote-id type="github">nestorsalceda/mamba</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mando/Manifest b/dev-python/mando/Manifest
new file mode 100644
index 000000000000..d70d93a07b4a
--- /dev/null
+++ b/dev-python/mando/Manifest
@@ -0,0 +1,5 @@
+DIST mando-0.3.2.tar.gz 22393 SHA256 9aeb48af6165370bbbfd5b0b32fedb772531d7a1db35b73ab955107a2f5e2af8 SHA512 57f5041ad175c4eca4c158d9d917dcb1f9c25978c60aa0e76322d0395b0edbc3fb7b062da7b9af871a97bbd46cfe7f81e634287f813baf15ef134be53150bd11 WHIRLPOOL 7c5ef43092ed81e427df5109b0c6706070a57eb1ea99608b19738b5ab20f685b09812e90babb97bc3b8cab6571e573d4a5374f931bc90e8ebb8c15753f603ff0
+EBUILD mando-0.3.2.ebuild 926 SHA256 eeede878b0eb4f89ed4917be956d262b165b9017bb8ffaba684ac39f0cef2e5c SHA512 f541b765c473f06bdd73b3fe5d6d5e0faa88efdc96dc838642b857c32eb2f8e0bf21e2a0159c8b15f1c1d7381296ca864c402b070cdd8afc42256d76a0da1d46 WHIRLPOOL 3542aa44e7c36aab6d2ac4697a9480e3c0b7f7f9e6eaae380d15acca45b468539ff6692f540783238726800be0361cee5063e28b53dc9fe38cb36aa861ded8fa
+MISC ChangeLog 2298 SHA256 eeb60d81206baf94768b99388258b5650be28556db6c0b7683afb10a9776f1b9 SHA512 02893ae287d0a12c13e39b6fb564b9e1b292e9d8259832d4ef6fee5fdd33248926196f1051c9bc29ea307e5db7650980e3f6652da7b38002b4a464167cdd7578 WHIRLPOOL 450836d82963e504add6858ceee2c44eeda39d06e5a04c2150ad5b2a5150d41165765d4c7d1606f541a81350a6d14a8eec625f6de2364950dc5cc63d492a27f8
+MISC ChangeLog-2015 455 SHA256 b2a17c803433e6c49fa41293cc12736f99b08e7366420291eef1453bdb5a6037 SHA512 5ba9d1ecc247354f7d3bd9611d3a1e1ca3a88827ec715bd91da39ef3c52a0903eec30571014d6f046c512fbce29aa132de5d941ca3c1a4ffd26aa7fa5759692d WHIRLPOOL 741205d500542efe7ae359261de54fac41f577632b81bdee24c0fa0ea90716648099dc7b4481c14b6628818a854275bbaeb777dc9d961c356224f6339fbdbef1
+MISC metadata.xml 322 SHA256 26ba89149b2e86fbc9fd39c131344af901c82710945b1223448305bc30102df4 SHA512 bc9560803775874f6c7e82093f266103f305f326468529d99e35eddc5c4e639e2e89d838b28ddbd018f40d6b3abd049bb49b133b3f453e1703a278c8434fecda WHIRLPOOL 5abf0e94d60daf8b5405cc658186bc911fd672e5bf191a1dfd994a74768b4dc821b0e524bb02afd9b0b63795751d9f76769d6b6ad6406c7d198c74816bce2da1
diff --git a/dev-python/mando/mando-0.3.2.ebuild b/dev-python/mando/mando-0.3.2.ebuild
new file mode 100644
index 000000000000..3b4303bcc81b
--- /dev/null
+++ b/dev-python/mando/mando-0.3.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Create Python CLI apps with little to no effort at all!"
+HOMEPAGE="https://mando.readthedocs.org/"
+SRC_URI="https://github.com/rubik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/paramunittest[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" mando/tests/run.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mando/metadata.xml b/dev-python/mando/metadata.xml
new file mode 100644
index 000000000000..39a0eb394fa2
--- /dev/null
+++ b/dev-python/mando/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rubik/mando</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/mantissa/Manifest b/dev-python/mantissa/Manifest
new file mode 100644
index 000000000000..377365611a59
--- /dev/null
+++ b/dev-python/mantissa/Manifest
@@ -0,0 +1,7 @@
+DIST Mantissa-0.7.0.tar.gz 827087 SHA256 30bc3bb452810561e81e84bb73be00287d32c17fcdf4f0da837a63cbba7e7fa7 SHA512 a0ef58902d0d752f2643f0c9639d9338a0441651cc0a2c3b45493a79b81757c4b642a7adcc940e0228033280927b7dad460a345fac62da1dcb9d73babd981d8c WHIRLPOOL 283b02ebea0c7a0d6dd6a7345b473a9f9d0ab3f955c5424ed6090cf50d63f3df2a68b6ab07efe459828a75dc841e5e540a66313e9428bb8e88fb3a96762b6576
+DIST mantissa-0.8.4.tar.gz 832649 SHA256 f150858eefb75f64259a772a6b0697864bd9df7780aa42df02ae107fb8273887 SHA512 448f26cb540e7d19ede1b39c1b0157ccdd04baeac6cb8eb918fec2eb2bd395e12b0a659633ffb4c260a84c87025b81b41a8e168e7d1f1a0235bfe25f492c2c32 WHIRLPOOL f41f7330f9bb1830fa2929d65f85afcc570a5e8369585392b613c066c56b45aca3c69c7a2999b3ac5f144fc76734f4c93e8a0675f2b037877bd82ee5efcd6a95
+EBUILD mantissa-0.7.0-r1.ebuild 1321 SHA256 247dfc8f5d45df40cc63d65a4bd1bc29b2e9e3dc961f81a5ed4a30a8e3215419 SHA512 85bbd5e0d8b64023210cc2009ae8cfc1721a4c13a358c519a06f5350e83d241a82a655fa914e3bea6304ad5913472d780f26f6f00a373bc052de1385330e7d37 WHIRLPOOL d738c8bbe3856956e5688828142a6d665edf72859c7fe27f1c61c03bf9e0b164d549bb836f071137fda2f794bd864a792b499e134256b466c8d1a9302cf101c6
+EBUILD mantissa-0.8.4.ebuild 1512 SHA256 aa7b30ea3818add9916fa54097bd0f3d0bd4cc31101912d8a58f8ec40c2cb22d SHA512 802e844e40487ea8e8a351103a4d63f734ae7f022511d499d88e2be29ba0a558bd7854e7ce4fcdb1ed6885f00cc510806eb41f4d808de48ce14400f8d4e42e33 WHIRLPOOL 4952457c3db7fe3b1bbdfb41900a09f6e60e637487990675e8b9922127ec81be852ab20706efaa47366d772de7d9ff51540c4d37fe894cea204d9dcb5d44b3ce
+MISC ChangeLog 3228 SHA256 b636544b85a19a59121a67ce0c25afd550825f09932a08f42730fd425ff8302a SHA512 f709234d49f1ce4dd492b0b1ece4e768563c8836cc8f760209fc75a983e78d0c42ecdb9d962305378a9fdbc02b60771e6f6b2bdb9f8cc1ddca3ee93372a25e49 WHIRLPOOL ca75175ae08c55d38581f7d7a420c435fba6cfa4156bda480fb558d55165351912fbcacb058d601a80bb4e79412ddc76bd50674768475e415f90157c69f55ef8
+MISC ChangeLog-2015 4173 SHA256 dde337a9ef3f9eca7d74211d8d7e0025a2c6a57fab6ecb02e7ca365d758b9902 SHA512 4bba9698a33eb8ea2da8400988c3859bb9b8a140ec8c044d9cebf713c7da36ce374ca611ab85477bdc6f71dde2f5142c80489d7f590779e83cc1dcaaca5d813b WHIRLPOOL b8d5de2558bb1b6cf3602dbaef1161c57c067a98a61b35950a03d7a4beab02dc34c449c4a557ab5b4f3324405fc5db987493bcd175a113926783bbce0bae1164
+MISC metadata.xml 585 SHA256 edd4849916c10b271df8d4b4fe952c8478985bfbf5043a54ff24a7621a0a27fd SHA512 5126e2561efaf55f617c60991b2870cb51ad784f8185bd18650a605139103cdd1b1011e2f4cf8c2ab2b4806b65aee9402ec575f93deedf671e126d9bf2b05ee5 WHIRLPOOL e3a5e0812935215db0a87cefccab10952eb01627b9dc384b6c61baee327bca31b80119af4b06ae77f680cc54c90cadf05892341f53d3e1245f88911514a10742
diff --git a/dev-python/mantissa/mantissa-0.7.0-r1.ebuild b/dev-python/mantissa/mantissa-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..540ee1e0510d
--- /dev/null
+++ b/dev-python/mantissa/mantissa-0.7.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="An extensible, multi-protocol, multi-user, interactive application server"
+HOMEPAGE="https://github.com/twisted/mantissa https://pypi.python.org/pypi/Mantissa"
+SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=dev-python/axiom-0.6.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/cssutils-0.9.10-r1[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	>=dev-python/nevow-0.10.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2012j[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/twisted-mail[${PYTHON_USEDEP}]
+	>=dev-python/vertex-0.3.0-r1[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+TWISTED_PLUGINS=( axiom.plugins nevow.plugins xmantissa.plugins )
+
+python_install() {
+	distutils-r1_python_install
+
+	# remove foreign caches we don't want to own
+	find "${D}$(python_get_sitedir)" -name 'dropin.cache' -delete || die
+	# then our own one
+	touch "${D}$(python_get_sitedir)"/xmantissa/plugins/dropin.cache || die
+}
+
+python_install_all() {
+	dodoc NAME.txt NEWS.txt
+
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	trial xmantissa || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/mantissa/mantissa-0.8.4.ebuild b/dev-python/mantissa/mantissa-0.8.4.ebuild
new file mode 100644
index 000000000000..cde1fc09dc08
--- /dev/null
+++ b/dev-python/mantissa/mantissa-0.8.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+MY_PN="${PN/m/M}"
+DESCRIPTION="An extensible, multi-protocol, multi-user, interactive application server"
+HOMEPAGE="https://github.com/twisted/mantissa https://pypi.python.org/pypi/Mantissa"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/axiom-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/cssutils-0.9.5[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	>=dev-python/nevow-0.9.5[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2012j[${PYTHON_USEDEP}]
+	>=dev-python/twisted-core-14.0.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-mail-14.0.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-conch-14.0.0[${PYTHON_USEDEP}]
+	>=dev-python/vertex-0.2[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+TWISTED_PLUGINS=( axiom.plugins nevow.plugins xmantissa.plugins )
+
+python_test() {
+	# https://github.com/twisted/mantissa/issues/27
+
+	trial xmantissa || die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# remove foreign caches we don't want to own
+	find "${D}$(python_get_sitedir)" -name 'dropin.cache' -delete || die
+	# then our own one
+	touch "${D}$(python_get_sitedir)"/xmantissa/plugins/dropin.cache || die
+}
diff --git a/dev-python/mantissa/metadata.xml b/dev-python/mantissa/metadata.xml
new file mode 100644
index 000000000000..be380a8e5f32
--- /dev/null
+++ b/dev-python/mantissa/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">Mantissa is an application server. It provides integration between
+		the AxiomProject object database, and the TwistedFramework, as well
+		as web user-interface utilities.</longdescription>
+	<upstream>
+		<remote-id type="pypi">Mantissa</remote-id>
+		<remote-id type="github">twisted/mantissa</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/manuel/Manifest b/dev-python/manuel/Manifest
new file mode 100644
index 000000000000..ad60c71edabe
--- /dev/null
+++ b/dev-python/manuel/Manifest
@@ -0,0 +1,6 @@
+AUX manuel-1.8.0-rm_zope_test.patch 3693 SHA256 6548868021688ac9eab455cd328d853711076f836ea6a7264925365da758d6f5 SHA512 47dbc28c5d66895c764997de7a5c04aefd92de6aac6094f8184de849f906e5a1650e2c483868bf5ce77e7d81893f51410a19d7d38f732b4e0a1e54bb728836e9 WHIRLPOOL dfd4ef2d8bb0bb63d17ed55a225e35287f25bb28283330f587a3d6c028966cddc6e19e936910e81a78cc4bafcc5f600095174275f34e86deeee17db895d46595
+DIST manuel-1.8.0.tar.gz 207600 SHA256 a974d7e83652b26be30f6f513fac95d28b9ffa5ae2819a5c63e2ef8594913eb6 SHA512 8099df44cfd28c8ac6256f346bf8cd36091893a38d3c297099866b1a5db97286b9c9e69f3f12054d7eee9ae3985ca0a003d7b2cc082d28d59850bbcad6b57c57 WHIRLPOOL 7870484499d8c18916bf8349ed1a8a9be84eb074440b8c875f3a0468137edf45425a51545da3517a6c81a862708114eea2fa8561eaa219ccb1ff958d8fcb2afe
+EBUILD manuel-1.8.0.ebuild 733 SHA256 c708e286ec67e3982e2d6a8f9618bab8e35eb8d3193eeebc6b40b5f95df6d38a SHA512 b3f38c970e1e12ff71b36d199845040b1cd609321adb68b1481c5e118d09a2dabf5aab51a36e265c0f4b9319c4fbf112df0f9a7840034cb6aa0dffbe872c0085 WHIRLPOOL 141c7fe0c08076b87ee8d54f070d0a2630feb52440947966e7df6ec100e50a8f16f57fd1d745d211d7f38b02c81339b34158570a3a5d5b55e18dae461f1f7c15
+MISC ChangeLog 3737 SHA256 6103e5c45e34a4f42cd44dcea57ef03a9d7bce9888092ebdb078279792937a99 SHA512 931f287c4ac902e16e00771dc0dd0994499ab59513f6110b1a48d93a896bafd87dd91717db273e44f49b8a06f970900e1cd0ae9d6324f2c5caf402e3f6580828 WHIRLPOOL 56c2c971d73930f93c7d6296115e9dc83f1752864f3405e33a4a2096d44c41e050fddf208998c3aa7b904b26f25713c028934f195b8d0f6189aba763777321ec
+MISC ChangeLog-2015 1494 SHA256 e2fed7c3334f6655538dfc33dc3c1e1da5a2e96293b0720a88f2ec093a2287af SHA512 720bc7f3c3a16f231754ba910435d5c884491c23ec05421e8d64e56bf1944649b72be21941ea8324a27280d32f22ee2a83fd255128a06a9bb08c6cee78bfe0d7 WHIRLPOOL de4c91bd08c4b3f63b6417add954cfd292e97657bda5f084340ec42433ceef0a007b4c7413708edabaff42ad6c715ef9fefc8292aa71bc1b9d1b5d6da58ccc17
+MISC metadata.xml 378 SHA256 d417342e118cefcb1b2c1abd93b0b474dd786e9c755f9faf9623d8964f15ba02 SHA512 a90d635b0d109936cb39e2b016464e6c6220ff02b6d6f640d30045782ffb85bccc9e408119897947b11d8fa234451820bef9bd1f49264dc72c7b0ebe36f1edac WHIRLPOOL dee193402b169240db3cdb4ce4a027ecd209f486b14fec086550289859d72fd3a1f6794e0f9565983cb930faf14b03770cb868c3ee0838e6e8e56e8000111e56
diff --git a/dev-python/manuel/files/manuel-1.8.0-rm_zope_test.patch b/dev-python/manuel/files/manuel-1.8.0-rm_zope_test.patch
new file mode 100644
index 000000000000..d1b61cc678ab
--- /dev/null
+++ b/dev-python/manuel/files/manuel-1.8.0-rm_zope_test.patch
@@ -0,0 +1,120 @@
+ setup.py             |  6 ------
+ src/manuel/index.txt | 26 ++++++++------------------
+ src/manuel/tests.py  | 13 +++++++++----
+ 3 files changed, 17 insertions(+), 28 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 4561779..b6730c8 100644
+--- a/setup.py
++++ b/setup.py
+@@ -20,8 +20,6 @@ with open('README.rst') as readme:
+     with open('CHANGES.rst') as changes:
+         long_description = readme.read() + '\n\n' + changes.read()
+ 
+-tests_require = ['zope.testing']
+-
+ setup(
+     name='manuel',
+     version='1.8.0',
+@@ -44,10 +42,6 @@ setup(
+         'License :: OSI Approved :: Apache Software License',
+         ],
+     license='Apache Software License, Version 2.0',
+-    extras_require={
+-        'tests': tests_require,
+-        },
+-    tests_require=tests_require,
+     test_suite='manuel.tests.test_suite',
+     install_requires=[
+         'setuptools',
+diff --git a/src/manuel/index.txt b/src/manuel/index.txt
+index c1d85f3..a315317 100644
+--- a/src/manuel/index.txt
++++ b/src/manuel/index.txt
+@@ -166,16 +166,16 @@ can pass in your own class to `TestSuite`.
+ 
+ .. code-block:: python
+ 
+-     import os.path
+-     import manuel.testing
++    import os.path
++    import manuel.testing
+ 
+-     class StripDirsTestCase(manuel.testing.TestCase):
+-         def shortDescription(self):
+-             return os.path.basename(str(self))
+-     suite = manuel.testing.TestSuite(
+-         m, path_to_test, TestCase=StripDirsTestCase)
++    class StripDirsTestCase(manuel.testing.TestCase):
++        def shortDescription(self):
++            return os.path.basename(str(self))
++    suite = manuel.testing.TestSuite(
++        m, path_to_test, TestCase=StripDirsTestCase)
+ 
+-    >>> list(suite)[0].shortDescription()
++    list(suite)[0].shortDescription()
+     'bugs.txt'
+ 
+ 
+@@ -236,16 +236,6 @@ checkers <http://docs.python.org/library/doctest.html#outputchecker-objects>`_
+    smoothes over the differences between CPython's and PyPy's NameError
+    messages:
+ 
+-.. code-block:: python
+-
+-    import re
+-    import zope.testing.renormalizing
+-    checker = zope.testing.renormalizing.RENormalizing([
+-        (re.compile(r"NameError: global name '([a-zA-Z0-9_]+)' is not defined"),
+-         r"NameError: name '\1' is not defined"),
+-    ])
+-
+-
+ .. reset-globs
+ .. _capture:
+ 
+diff --git a/src/manuel/tests.py b/src/manuel/tests.py
+index 07723a6..b1a3a76 100644
+--- a/src/manuel/tests.py
++++ b/src/manuel/tests.py
+@@ -11,11 +11,12 @@ import manuel.testing
+ import os.path
+ import re
+ import unittest
+-import zope.testing.renormalizing
+ 
+ here = os.path.dirname(os.path.abspath(__file__))
+ 
+-checker = zope.testing.renormalizing.RENormalizing([
++try:
++	import zope.testing.renormalizing
++	checker = zope.testing.renormalizing.RENormalizing([
+     (re.compile(r"<unittest\.result\.TestResult"), '<unittest.TestResult'),
+     # PyPy spells some error messages differently
+     (re.compile(r"NameError: global name '([a-zA-Z0-9_]+)' is not defined"),
+@@ -25,7 +26,9 @@ checker = zope.testing.renormalizing.RENormalizing([
+      r"<\1 object"),
+     (re.compile(r"<SRE_Match object"),
+      r"<_sre.SRE_Match object"),
+-])
++	])
++except ImportError:
++	pass
+ 
+ 
+ def turtle_on_the_bottom_test():
+@@ -59,7 +62,6 @@ def test_suite():
+     optionflags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
+ 
+     m = manuel.ignore.Manuel()
+-    m += manuel.doctest.Manuel(optionflags=optionflags, checker=checker)
+     m += manuel.codeblock.Manuel()
+     m += manuel.capture.Manuel()
+     m += manuel.testcase.SectionManuel()
+@@ -73,3 +75,6 @@ def test_suite():
+         suite,
+         doctest.DocTestSuite(),
+         ))
++
++if __name__ == '__main__':
++    unittest.TextTestRunner().run(test_suite())
diff --git a/dev-python/manuel/manuel-1.8.0.ebuild b/dev-python/manuel/manuel-1.8.0.ebuild
new file mode 100644
index 000000000000..965da71f9d49
--- /dev/null
+++ b/dev-python/manuel/manuel-1.8.0.ebuild
@@ -0,0 +1,31 @@
+# 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,5,6}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Manuel lets you build tested documentation"
+HOMEPAGE="https://github.com/benji-york/manuel/ https://pypi.python.org/pypi/manuel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+# Required to run tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( CHANGES.rst )
+
+PATCHES=( "${FILESDIR}"/${P}-rm_zope_test.patch )
+
+python_test() {
+	PYTHONPATH=src/:${PYTHONPATH} esetup.py test
+}
diff --git a/dev-python/manuel/metadata.xml b/dev-python/manuel/metadata.xml
new file mode 100644
index 000000000000..cfc835588bcb
--- /dev/null
+++ b/dev-python/manuel/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">benji-york/manuel</remote-id>
+    <remote-id type="pypi">manuel</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
new file mode 100644
index 000000000000..813f3ae8088b
--- /dev/null
+++ b/dev-python/markdown/Manifest
@@ -0,0 +1,10 @@
+AUX markdown-2.6.8-dont-build-docs-default.patch 387 SHA256 23b0d1f617d3946de51d19357ff971e52bab523701e868216dd3472e2affa442 SHA512 71f7534ce557e061c4f09b9a78aa05fd1e3f16f44c55d5597fa4901c0349f7ec7d0093eab655950812e2cab6d607377d2a15a6583009cb90ae32659c6949cfff WHIRLPOOL 07bf93a6f1b2e6d2d983e52309eb76a3a724f6fa58c4157d10d421697bbf841ed234cc3c6667cc6a975fd4181afd53195c286e008c5b8c5ca9ae7703ff05f578
+DIST Markdown-2.6.1.tar.gz 298074 SHA256 b5879b87e8e5c125c92ab8c8f3babce78ad4e840446eed73c5b6e2984648d2b1 SHA512 53e11c5d4feacdb8210427da65b6b09453e8c904e86b42095a80132a4b67e926ba974458769e5227bfeaddd3bba5f6bd7ca7e3385951982ec982f63989119d78 WHIRLPOOL 58b6d87354ee19aac7ad1567e10f2cdc99c1aa980d3bee2fee81a5ccb5e70f43d13750dfaf1df9a42c00f3d35664731b52bfa1246271907f5a3422281ede1cc6
+DIST Markdown-2.6.5.tar.gz 301781 SHA256 8d94cf6273606f76753fcb1324623792b3738c7612c2b180c85cc5e88642e560 SHA512 d966136a7184ada4eec70af661aba441694a8c4f59e57d59a28dfbc1649ca1e90cc1e4a29b354b3caf35362e1e0c96eeb3f46c68f82d7a898b76c08866d459d3 WHIRLPOOL 752414989f7b3ba04f4f4d8b9f855c9d64f816c61b4d6333e1b3c15b2aadf6579f1b1f0a686ca3eccfc3fcdaac8007c6655a0f331d795a8a0b07ef83dda2465c
+DIST Markdown-2.6.8.tar.gz 307330 SHA256 0ac8a81e658167da95d063a9279c9c1b2699f37c7c4153256a458b3a43860e33 SHA512 85c1a16ebb50af79f378eb2fa936342df6174a4f597a74fee6d0495ef2bc4c7c8337463799e427cb6788b3429e400309958b5c4784f536593047ab2e47ac7c23 WHIRLPOOL a7472b1feb23db0b6fbf8826979d1f82ad6e84dd6d33b66e4bfba9c2914ff10ec278d444aa8ab740d1d290cb1bd6682cb4f6e9cedf66c5cae8d0a5f96cfd4804
+EBUILD markdown-2.6.1.ebuild 1262 SHA256 662529f8a8a4ae92291a59fdeeffc131f6b8f7ba41c82efb6b2476513d11d274 SHA512 ddaac99dd6fc3f2dcf1f2cfd14d8401058fe729fea31bc82f949cfe168fca6d093634b98eef3868f80bdb7a5386e2b6b1e87eccab17f969c60dcf365398ac41a WHIRLPOOL 4bca917bfb1d25594f293ceb05bd24acd50925fcef8f26a54f8150e7c1b89b1224f117fb549e4a01f41987b3dc84443830a3b09a016b4c6b69a7fcb9ad3ea165
+EBUILD markdown-2.6.5.ebuild 1413 SHA256 24ef210fb86509ae9cc26ed9b4f2bcccfc48d58a1c51d7d434dc681cbe22bffb SHA512 0447c35221a7aaa7ea6a2d9f82a6114811f6c468bd6d6d09e3faf788b696c69ae39253e1293b2a1b44d6a72a53b2e203d8280780706b37258980094c0570d3ca WHIRLPOOL b1025a8ba1070682a8791051d1a748a4b2ce0bf9aef7b4b4d11cc4a7ddec44f106263aec4bc281c523a33810687c3d76e1684d2e2f799fd610ac039d28b292ee
+EBUILD markdown-2.6.8.ebuild 1457 SHA256 9ff55ac5ad53d9571a711245a6115e1e073e4e18fdb3046d36d57cb2647a2137 SHA512 740194f42bd3ea464ec647b747c652a6449bb4b551dfea577e6767b49c9cf43cd45b8958394cd598f284c459f30be4b7f0c1550790ec5cd9bb62f691df9d95d0 WHIRLPOOL 96d0c63f103832d1646179910bc87fcbeb9490a0d38e34dfde4444592850caff03c4360ff3b4b364a94841a8c0f497b04690f4bff1d8c2cc03e09fcce380982c
+MISC ChangeLog 4529 SHA256 7812da61bc6216f03b9e34a8806649797c128eee9229c52f58b241e9f781c5e1 SHA512 23637415bfe62a4a9a604bc34bde66be55247234bc5fb76c1c1ffc50bb15e76a20062e19216b1f4d8b6e45f45bfbe5ccdf68b4346cf3522c332d7251e44135e9 WHIRLPOOL cb4c396220814fb2938de3b9f47246ba08bd8fd490c501345b0a2fe07085464f3448ad561646a0310ba1d9300c48cc62bb513994bb672f57f37fbfd78574085a
+MISC ChangeLog-2015 10110 SHA256 0e41baa82e3cb11ae76f0163bd724b96150c77d18b5c56ce5d851cdc5d7b43a1 SHA512 91145c9f3c46c07c153946f2845eab23a35789dd2ef25c178f50966b764abd74c2dde79dfa4ed971a2782ac35e055ce3baffc148899903458bab6374051ab033 WHIRLPOOL ccc1629eb976416acc5148dfa09bd8fc9161082282a37c879828d8219dfe4eb8bac1d74eeae226634601a17e5863dac1af35d9114e69bb23916393ce1a471327
+MISC metadata.xml 465 SHA256 84dcfd8ce02886121b44a2c3c0129fc274c623fa4dd540c104aec20037c8ccf6 SHA512 4c9a52b62e49040fde94cc2d3d9edf88c42d085639d893fb81d119b8c216100f912e2725a1bbb31b1136b505ef8102f560989289da5aadc6c8f433f0186da44c WHIRLPOOL e863a31fc72ed8f30d783db6fdcace5784366c1da954f53650e2d363cc31c61c2f6e448d95a349b450ddcbb606d57597ad0c7e4a975784732db21937edde94a1
diff --git a/dev-python/markdown/files/markdown-2.6.8-dont-build-docs-default.patch b/dev-python/markdown/files/markdown-2.6.8-dont-build-docs-default.patch
new file mode 100644
index 000000000000..65b7d21c5597
--- /dev/null
+++ b/dev-python/markdown/files/markdown-2.6.8-dont-build-docs-default.patch
@@ -0,0 +1,14 @@
+Don't build docs by default, which causes issues when trying
+to remove .txt files, as they will be readded on installing.
+
+--- a/setup.py
++++ b/setup.py
+@@ -204,7 +204,7 @@
+ 
+     def initialize_options(self):
+         build.initialize_options(self)
+-        self.no_build_docs = False
++        self.no_build_docs = True
+ 
+     def has_docs(self):
+         return not self.no_build_docs
diff --git a/dev-python/markdown/markdown-2.6.1.ebuild b/dev-python/markdown/markdown-2.6.1.ebuild
new file mode 100644
index 000000000000..f1817a405d00
--- /dev/null
+++ b/dev-python/markdown/markdown-2.6.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Markdown"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python implementation of the markdown markup language"
+HOMEPAGE="http://www.freewisdom.org/projects/python-markdown https://pypi.python.org/pypi/Markdown"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test pygments"
+
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}] )"
+# source cites pytidylib however from testruns it appears optional
+RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && esetup.py build_docs
+}
+
+python_test() {
+	cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
+	pushd "${BUILD_DIR}" > /dev/null
+	"${PYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
+	popd > /dev/null
+}
+
+python_install_all() {
+	# make use doc do a doc build
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/markdown/markdown-2.6.5.ebuild b/dev-python/markdown/markdown-2.6.5.ebuild
new file mode 100644
index 000000000000..737eaccafeb0
--- /dev/null
+++ b/dev-python/markdown/markdown-2.6.5.ebuild
@@ -0,0 +1,53 @@
+# 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} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Markdown"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python implementation of the markdown markup language"
+HOMEPAGE="
+	http://www.freewisdom.org/projects/python-markdown
+	https://pypi.python.org/pypi/Markdown
+	https://pythonhosted.org/Markdown/
+	https://github.com/waylan/Python-Markdown"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test pygments"
+
+DEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pytidylib[${PYTHON_USEDEP}]
+	)"
+# source cites pytidylib however from testruns it appears optional
+RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && esetup.py build_docs
+}
+
+python_test() {
+	cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
+	cd "${BUILD_DIR}" || die
+	"${PYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	# make use doc do a doc build
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/markdown/markdown-2.6.8.ebuild b/dev-python/markdown/markdown-2.6.8.ebuild
new file mode 100644
index 000000000000..79a73dee4fdf
--- /dev/null
+++ b/dev-python/markdown/markdown-2.6.8.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the markdown markup language"
+HOMEPAGE="
+	http://www.freewisdom.org/projects/python-markdown
+	https://pypi.python.org/pypi/Markdown
+	https://pythonhosted.org/Markdown/
+	https://github.com/waylan/Python-Markdown"
+SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test pygments"
+
+DEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pytidylib[${PYTHON_USEDEP}]
+	)"
+# source cites pytidylib however from testruns it appears optional
+RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${P^}"
+PATCHES=(
+	# build system always builds docs
+	"${FILESDIR}"/${PN}-2.6.8-dont-build-docs-default.patch
+)
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_docs
+		HTML_DOCS=( "${BUILD_DIR}"/docs/. )
+
+		# remove .txt files
+		find "${BUILD_DIR}"/docs -name '*.txt' -delete || die
+	fi
+}
+
+python_test() {
+	cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
+	cd "${BUILD_DIR}" || die
+	"${EPYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/markdown/metadata.xml b/dev-python/markdown/metadata.xml
new file mode 100644
index 000000000000..132dd61343bf
--- /dev/null
+++ b/dev-python/markdown/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <use>
+    <flag name="pygments">Enable fancy pygments support</flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">Markdown</remote-id>
+    <remote-id type="github">waylan/Python-Markdown</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/markdown2/Manifest b/dev-python/markdown2/Manifest
new file mode 100644
index 000000000000..667b72e47bc5
--- /dev/null
+++ b/dev-python/markdown2/Manifest
@@ -0,0 +1,5 @@
+DIST markdown2-2.3.0.zip 145194 SHA256 c8e29ba47a0e408bb92df75d5c6361c84268c54c5320d53ffd4961c546f77f1c SHA512 48bf8e26b34c48c0c12fc0f110b09d3232ea3394db3325d50639adf5cefb603344ee97b116e09b574f7c7414ab4a8293ddc37ca6706e41baaa14e399fa467d5f WHIRLPOOL 1ca759c7f08437d98304849de2259576fbb813845dee5282a54e0a8940b2b76ba9dd31912894ac63f336f1aecaa00a566c39d87ddcc48d11daee3f981fd933a0
+EBUILD markdown2-2.3.0.ebuild 702 SHA256 211fd13f99d1781536fd1865f92e71da1c7863278012c35fb6ffcbc8b5788678 SHA512 3e106556a5942e84e0e80e87e01376c9da00e09c547c0a92cab328919bb50b22473f75630803012f678d983290d0e93cb50a583b061b7e9a73f0415bab71a49f WHIRLPOOL 8245c537e98c38ba20268ea14f9f1545f3868bb10a50a31f5cff640e99a432996119119261ea7e25e8b1afaeb7b4e909c1b51e07771954ad3114e9019760536e
+MISC ChangeLog 3195 SHA256 a99678415bdd840ef7fbe2d56d48768ffccf5371e6f3208b7c9179f8c548903b SHA512 1e97ebca2b4df8d0296d8761be34cd035a6ef33a20bb155fa088bf16eff98ccdb206dd94e17f639d80d1e4124bf5ac20368d099b75ea78924298293cdf54d35b WHIRLPOOL f13bcbe20e1633a2f68f8fccbed9e9b37370b4b1270de59e854e27617f6c0bfebd53defb4ae085a635ac383e441469990dc58db3f2d78ccf943b9193cc20b43d
+MISC ChangeLog-2015 2631 SHA256 dfdbaefa7a7e5e4346325cfb9212b9082918e7f3640742f95c1cc2abc8817d31 SHA512 aebda967f62726d94b53fe08a8f2e3a6a2f2a32bf5e0a883c889ef1e18ad67ec6e078b0db30f9bf6b13d7fa883817bcbaa02593e510533d78e5a76d862b906b6 WHIRLPOOL 17f35f0bc8cfacd1931e2056d6e76bf55642fb550f0703305471b7f92dd5f5bff9987fc2870a86bde31fbfb16aaede6550e824130af6f7221ba9c92c2ec25d68
+MISC metadata.xml 641 SHA256 f41e19c7467693fb8278a242aa15f69b72726162ab297d039d730de0c9f7cb1e SHA512 ece3faf6646450ac53797ac77c91f7e7a9953dcc419f98738cb8529722d04fa00a9a0e9fbe0958c2119b6e0909fe1ca6eee50749a133e2aec8b2d242071348f7 WHIRLPOOL a5e3b727755454b0692abe05efe50b6d98f50f79cd6c821158514ccbf3cd1abe1d2fd3e13eb99576fb73a364065a324fd1b1c1551182804a2ef736deb19a9edb
diff --git a/dev-python/markdown2/markdown2-2.3.0.ebuild b/dev-python/markdown2/markdown2-2.3.0.ebuild
new file mode 100644
index 000000000000..66c5fd0c7f50
--- /dev/null
+++ b/dev-python/markdown2/markdown2-2.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Markdown language reimplementation"
+SRC_URI="mirror://pypi/m/markdown2/${P}.zip"
+HOMEPAGE="https://github.com/trentm/python-markdown2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	# [issue52, knownfailure]
+	rm -f test/tm-cases/issue52* || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cd test || die
+	"${PYTHON}" test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/markdown2/metadata.xml b/dev-python/markdown2/metadata.xml
new file mode 100644
index 000000000000..671860593b2e
--- /dev/null
+++ b/dev-python/markdown2/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>maksbotan@gentoo.org</email>
+    <name>Maxim Koltsov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <maintainer>
+      <name>Trent Mick</name>
+    </maintainer>
+    <bugs-to>https://github.com/trentm/python-markdown2/issues</bugs-to>
+    <remote-id type="pypi">markdown2</remote-id>
+    <remote-id type="github">trentm/python-markdown2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/markups/Manifest b/dev-python/markups/Manifest
new file mode 100644
index 000000000000..3101048e053a
--- /dev/null
+++ b/dev-python/markups/Manifest
@@ -0,0 +1,9 @@
+DIST Markups-0.2.4.tar.gz 8827 SHA256 0aab138698035e699fad1c88bebb3fa5e90a1876bc7d8fefb3491513fe13f16b SHA512 369eda02474f723d694bc0518324afde9f5baef02719448abb420a77d58cf1543939e6d38aa1db531d4214dc4cd4c47b29d79fa7a23b33b4ae74b45ad2ec52c7 WHIRLPOOL 1118723f5b9725b68d052e2496ccee414782bd6cceaedc49f9c2918c4055145fb95d49cf962c46eb669ab7a3a8659b86ed54fa5b99f6ac91266cebc4ecf01b10
+DIST Markups-1.0.1.tar.gz 14894 SHA256 74464b7532aa355f6ed2767fd5cfb5eb5b484dd773b33bae4016a7fa9354b4ee SHA512 f57f712f84413ed35f53643533d392e2164de02742e170f85fc4556094041ffa16ed1ff6d902bcafe996d22a4410e4c2794e4c96246fc06afbf878d6be85cf31 WHIRLPOOL f5bf7700b76dcad18aba9ec5503ba9516e8e7f8a34577b55b423531c9f88ee547690a90e8043997651fe36516c9990a6de103f8268c4fcf768f4605d8982829f
+DIST Markups-2.0.0.tar.gz 16772 SHA256 5639ddd76d74e0a5335e5b66ff2f1b3f9a9f0ab6eeff76a1003f59ed0ec2b721 SHA512 8ccd348efea68678bfb7f47bd13da2729f95a5b5a8d44f11239dbb86b8224867cb1197e46d875ab9a0ba914be004bdc9aa6848b1e6549dc53b12e06040faaaae WHIRLPOOL 0f47974c498e3088e6af022eeff9478f6602df0cc509c3f04935005fc61e6abd431bdb581f4442f7b06cd86366a96590d04c75642698bc6abbc86679b97768c3
+EBUILD markups-0.2.4-r1.ebuild 811 SHA256 c7fb6fc74872190988204e7288fbc02e70153acdd22101ab68b38a5fb0701712 SHA512 f14db2c6e7adf268b46646c05c89211d74bd865cc15f705e300dbccc6e7289946f953fb94f158bf5e96af7aea5eb14f287a3b06642c70e22c9ea02c5338343aa WHIRLPOOL d9c348e2c6b9313e06ecd44390be4e9433d57c3730d37689457fa75c8aa26329cb82fbaf393d8ed071ec2a7f5a6fed1acf5d8742168c2b89eda7ca00214c3a49
+EBUILD markups-1.0.1.ebuild 662 SHA256 c70de2e38206a78a8d5ebdc0d36f7cbf538eeea8b5d1c4db921094cc9db28e3f SHA512 4b810b5998505ab8403c851ececcac3e1a13426d896033f20a9e3247e7036110fa1f7d834ab2f6a7d519f18d441be42185da7237cc0d034931020d64b1b9dbd0 WHIRLPOOL ee81e0ada5f905b9cb84a7a6eaad10d7fd653a8a5e6f1989a24d5bbeceefa5153afb5f235a0de951ae71901ac98070072f98074ca9a05e5439aca3097adf4285
+EBUILD markups-2.0.0.ebuild 664 SHA256 c6429c42a3e6c7e1ee7eecccbd3381e7a7347dad046ee315becfb1532b9e0151 SHA512 736edb5418e55ac3d9a48a657b51d48c5a066992167e86456b827cd4c53aff17ae1604bc80ffcd34a2c6b35b925c530554930eb52fb4f73c703d93250223f01a WHIRLPOOL 42038425cc1ea97e9a97a03ee1d303476c2c33eceaab81c9115050742af99ab2bd1e25072f9a09d6a170bf110690b3fad19c2a73d6d82aa79a21f755659e2a24
+MISC ChangeLog 4307 SHA256 b73a4af6b306fc7354c26791d1f51f8386cfeb79ee84c5b3302c67f986ebeb1d SHA512 c682e3d67d2da04447ba78d7e00f08255728f7a2dcee4c0a4b1abb9eba1c8b7fcd70e4a8be69a5825d684104f32471980abbfe4c21e4f570623c27974c303dde WHIRLPOOL aed8da02fd7a6835ba6859b2e0ce8d3485dde947c91419099a83508ea8194b7bbb51ecb57bc7ea0497e1174ea0e52e071f228dfcad9670d3b40c3e345cf9dee2
+MISC ChangeLog-2015 2289 SHA256 930933588a1039845e382892a2aed0fdf0ae4bd71e8bc2d558a31c71c7fcb6a9 SHA512 9673dd92e5b3c1644719ff83fe0fe0637c1ad069a482f0bbf91c51972650fb5769e5054383390bafc9f6a75da8e38f3be9d4e9dbcb364b190111116c2b421e46 WHIRLPOOL 95083621f96aef1a0e1ce156c95e047653f6ff7447bdebed263be3fba62f283563dd5201837afe07254465b9ab3999aef7a4b28a4d1858c8b4724cd6e3c58562
+MISC metadata.xml 386 SHA256 d58e4046c0ff8da4bd4685edae3aa2c27495063f427ac09d0b0704e059fe9d19 SHA512 3b8b537f5f944976cb1190822427b4c82af3fae92ad3b6a3505a2327a4da78c5eb0133adf6a0e4470ee27affb6787d1aa3a4443f7eec79a5e16a3684d01a6c3a WHIRLPOOL 2a15b1b400738b2cdb2e9a83c521dc5c8e4028a27ff5023aee2241e25accf1ca13f6abe93b00b46bcb251dda0cefacaca1de109b517c2368b64d5ed47347b459
diff --git a/dev-python/markups/markups-0.2.4-r1.ebuild b/dev-python/markups/markups-0.2.4-r1.ebuild
new file mode 100644
index 000000000000..7c40377906c1
--- /dev/null
+++ b/dev-python/markups/markups-0.2.4-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_4 pypy )
+
+inherit distutils-r1
+
+MY_PN="Markups"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A wrapper around various text markups"
+HOMEPAGE="https://pypi.python.org/pypi/Markups"
+SRC_URI="mirror://pypi/M/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+S="${WORKDIR}"/${MY_P}
+
+DEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	pushd tests > /dev/null
+		for test in test_*.py ; do
+			local testName="$(echo ${test} | sed 's/test_\(.*\).py/\1/g')"
+			einfo "Running test '${testName}' with '${EPYTHON}'."
+			${EPYTHON} ${test} || die "Test '${testName}' with '${EPYTHON}' failed."
+		done
+	popd tests > /dev/null
+}
diff --git a/dev-python/markups/markups-1.0.1.ebuild b/dev-python/markups/markups-1.0.1.ebuild
new file mode 100644
index 000000000000..745a9abcb2c7
--- /dev/null
+++ b/dev-python/markups/markups-1.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_4 pypy )
+
+inherit distutils-r1
+
+MY_PN="Markups"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A wrapper around various text markups"
+HOMEPAGE="
+	http://pythonhosted.org/Markups/
+	https://github.com/retext-project/pymarkups
+	https://pypi.python.org/pypi/Markups"
+SRC_URI="mirror://pypi/M/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}"/${MY_P}
+
+DEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	${EPYTHON} -m unittest discover -s tests -v || die
+}
diff --git a/dev-python/markups/markups-2.0.0.ebuild b/dev-python/markups/markups-2.0.0.ebuild
new file mode 100644
index 000000000000..fc0fe30f1e8c
--- /dev/null
+++ b/dev-python/markups/markups-2.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+MY_PN="Markups"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A wrapper around various text markups"
+HOMEPAGE="
+	http://pythonhosted.org/Markups/
+	https://github.com/retext-project/pymarkups
+	https://pypi.python.org/pypi/Markups"
+SRC_URI="mirror://pypi/M/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+S="${WORKDIR}"/${MY_P}
+
+DEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	${EPYTHON} -m unittest discover -s tests -v || die
+}
diff --git a/dev-python/markups/metadata.xml b/dev-python/markups/metadata.xml
new file mode 100644
index 000000000000..f3a0a5c01d35
--- /dev/null
+++ b/dev-python/markups/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Markups</remote-id>
+    <remote-id type="github">retext-project/pymarkups</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/markupsafe/Manifest b/dev-python/markupsafe/Manifest
new file mode 100644
index 000000000000..a01f94e247f7
--- /dev/null
+++ b/dev-python/markupsafe/Manifest
@@ -0,0 +1,5 @@
+DIST MarkupSafe-0.23.tar.gz 13416 SHA256 a4ec1aff59b95a14b45eb2e23761a0179e98319da5a7eb76b56ea8cdc7b871c3 SHA512 4f1fd91ced5e7119584b56cf7b69cfe6fdd9613bd77412368a38e9ef5d1011ba5c76d1d3a0da3d60f9f474627e6c8c8b613a80a668b32d212f09072f8b1f5b28 WHIRLPOOL 8104a8a795ed2e6b63a126fcbe2c8361ba21f9fee10e00f2b80aeafc55ea52daaf03b849d0ddbcbe5c244dbfef744c6e30f0c4681bc9108e2791afd438fba8d1
+EBUILD markupsafe-0.23.ebuild 931 SHA256 34a12e2b35d4855d742041a47077247e264c2beb693c70f6d130d045a25c0460 SHA512 aa6485296bfc8d43460d49c6b0347748b1232d3aa6a683a380a2a5fc0680b6b77d2774a8f2344cdb55fa02f50b9ada1bc68769f5a5fb5a852d25cb5588bbc7f0 WHIRLPOOL b179cc386f8bc1292dffed1ba5a8dd9c4b26c06dce6c869d8c3743f10ba5e8ba24b5a12e50556443ec252abcb9872ada0ec71298adb67b9ca912017d9e2c654c
+MISC ChangeLog 3332 SHA256 b4a5c1d3f2324b7003a05fbb888b9c9d07a817d891870542bd057929207442b5 SHA512 ceb17a7594c5c97bd80ab06a71e4749f67dd2a87cdf2de2b2aa69a6a8a68fd1c858109db848736400afff112408b8d13bb98000f4bd57f05851d16bb4448b425 WHIRLPOOL 32d27cf046e56e9538ff470b3635f51827602af9aef8ec98529fa180d54402dce0d5bce2a854763bb5ab5c0b22bca62d33f92aa3a743d017a9c5c2a49b773e29
+MISC ChangeLog-2015 9391 SHA256 5486ff04c2225cc24d554670e28a034cb263e05e058def4f1d4f23f22a69c423 SHA512 2e1e20f6b8e3bd33771d6ac12d33629366be7bc639893ee1a3ee838bb22d54b368490a27c965109eea11c2827dfcb0f1c0c7e0214446f497973335f437eca6a2 WHIRLPOOL 3bed3f23c4f21264811115290a63e73270f124d70369b5a6c55e2531c04c85095571b431c49fd03a87fac0711cb2ca7e8944570599b711398b78f9a228c2a337
+MISC metadata.xml 313 SHA256 bd7bca239f283de142b125702c16b54fb92f8ca0b20300073be68d2dabe01655 SHA512 91b859646ec529ca9b646ac0a6526554de887d6aca353069dd00a6b01dcd2b5765a7b1a1e02c8b52bd50ea67f1476cc2dce086651ee46f7c575c56d1ab7f4c8d WHIRLPOOL 74bf4b60018d6fc2dad0ecddfca7938769032ed0052e233cf4e9a5a18afbe7be4b295ad054eeb4e0db812a43e26906a881df63824ade1a0c9efb8bfa67b34c52
diff --git a/dev-python/markupsafe/markupsafe-0.23.ebuild b/dev-python/markupsafe/markupsafe-0.23.ebuild
new file mode 100644
index 000000000000..f9f0a98c2345
--- /dev/null
+++ b/dev-python/markupsafe/markupsafe-0.23.ebuild
@@ -0,0 +1,37 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+MY_PN="MarkupSafe"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
+HOMEPAGE="https://pypi.python.org/pypi/MarkupSafe"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile() {
+	distutils-r1_python_compile
+	if [[ ${EPYTHON} == python3.2 ]]; then
+		2to3 --no-diffs -n -w -f unicode ${PN} || die
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/markupsafe/metadata.xml b/dev-python/markupsafe/metadata.xml
new file mode 100644
index 000000000000..e96f1e27ba70
--- /dev/null
+++ b/dev-python/markupsafe/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">MarkupSafe</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
new file mode 100644
index 000000000000..7556ba0c4c3b
--- /dev/null
+++ b/dev-python/matplotlib/Manifest
@@ -0,0 +1,18 @@
+AUX matplotlib-1.4.3-backport-GH5291-2462.patch 4810 SHA256 6ba9d2c886524fd892b87c0e5b74c41f4d16fde0a40f4c70b195194febdafeef SHA512 06fb07f42d5a0e8c54e7f259bc0b8787a8caf25fa52c1d5a37a660c6e6df0fe6d93dc91367699d40d19b523c903c4be6a284403dc3eb93a4e68acc2e80329120 WHIRLPOOL 8a28cb05eb3848c38829c7a0c4c020d1c94f2f7d8059be02d341f2c0a3f568e6600e16eb9b1de3d9ea98a24c45469f708642679ddee9569535479afa7d06e388
+AUX matplotlib-1.4.3-cross-compile-1.patch 1779 SHA256 1910a0e3a5dca036e4c30d5bccbba7e0722fc02d1d867a32699fff4f8db248fb SHA512 6d2b57ae37df42b1d6c87501037f0dfe1ebf40dad9ea2bb35ff4b58cc1a3e580ad12add99c779966e764244d0bacf6ad922848bca568fc3329ead07c0b57826d WHIRLPOOL 57fa9a889bd4adff780b6bbd478cfa94f6fdb231004f2b05f6288ffb243ed2b8a9e497b85a11a5a34170d0560895c1d56a1d679949ce29dc6aa403e672d44574
+AUX matplotlib-1.4.3-cross-compile-2.patch 2066 SHA256 88513fb38363ae65aa56991de81e4e1f1b51e2465ebfe0dd41f0dfb1ba16dc9b SHA512 d547b79d2a6f2dcca5105093faf9bc15208b1d28737d17a65d4ad716d74029d1a575d0c83b684e139d203f7b58a34a161a8e3968bfe1515f47c754b29117a824 WHIRLPOOL 0cb8e3e4dd08f0aed733297641e8e4b16b361107d545921008116f1618a427ed486a91d930420f44ac9a50facca3d70cb565c76d2ea0cb3537e5270fd3e6c0b2
+AUX matplotlib-1.4.3-cross-compile-3.patch 2202 SHA256 2285ba7aefb3b06eb5cb16651d3870944d5a3c0ed7b39046a8b05dd0c14ae44e SHA512 5c1a7579a2cd4e97f56485e0300d9dcc7c8871e99bd93e03113e68b95996960ece039a41203775afc2c627f0a2483f038e0e693c73efdacfbb85d47ae855b7b1 WHIRLPOOL f27e6495720ed9db16f61a3aa9fca275aa3bd3ebb867c2c79e381a053a8412bf7a17422b6675d9fd75af5dfefbe58418ec8ffe5e8e096be655a10943829709ee
+AUX matplotlib-1.5.3-freetype-spurious-failure.patch 1061 SHA256 fef22d55869d8a9cea9f49a6d57feb955929df2e58c9cb746947927dd2224e26 SHA512 3cae61f9f6fcad1f2c8f47d7489a4ab54406118deaa8993b2a82c65bac8d21dc733f8c46b7f59d4a1961c643035b0b95d0c906f9388865e5036b12ff5abbbc32 WHIRLPOOL 6f4c892264716888828acefc712a3d8f3fe1efad4aa2071c56a8a6b1c2ffaef430d0d76f70e15b4c74ab3c4b69a76f0642b1c455c05b91e8b42b4046c7ba6913
+AUX matplotlib-2.0.2-freetype-spurious-failure.patch 1318 SHA256 0c5fc2d0fe9fa974680531ecb0ea9bbdbc67e153e8ac06b170f77f4841261aee SHA512 2c9de58cf652bb8eb95099410ecc7ea0229e06edefed5159470addfb6c76435ce1e5b682d5b6335fdcc4d522c6b8da1bac3c79046db984a20de8f58736796fba WHIRLPOOL 2b62405f92d73622ff4dca2566b7f18387dc9314f4dcbde53735965c19369cf62f891d8b2990ffbf0994a52a897c300c972b7fef010fa097460f1c13d2c6846f
+AUX matplotlib-2.0.2-nose-fixes.patch 586 SHA256 744722572f56fd020a54ba4eaff2a590d8ed06b45b04f34f87e091f488cc561d SHA512 85056ca6bfc91317d44c157838e21902085efcbde688ac977b634916525f1787b7f370b2e19e957589d3872dc05987c13cd6b9b4aee0dbc5aa661a0bbd2990fd WHIRLPOOL cd37f031241231a6374bcc662c41e30119b071ecd3730210c9b5f69b8e7c3f590cf93cebcfea2af1bbfdc583538a89742cc3c584c195fbcba5a7868d5415383d
+DIST matplotlib-1.4.3.tar.gz 49933525 SHA256 5b9544472d9d6ab3d47423bdb5a0e64fdf913e505c1c083f25283dd0362bc0b6 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5 WHIRLPOOL 160ca48ecb44db58f1c56bd6e89592c5d1badd8e434fc25d32aa6d4d7a346ae7c7444d1c8e0c2ca2bf5c3246fd56cd93856ec7b1e3e51f5e471b9b55a0f2c1ad
+DIST matplotlib-1.5.3.tar.gz 51606089 SHA256 a0a5dc39f785014f2088fed2c6d2d129f0444f71afbb9c44f7bdf1b14d86ebbc SHA512 553be9f661a1923d8ec7504a11dd3317e5ffb429c19339c58047715f4c28358d6d2ac38d46bd27ecd1dcf7159f157aab80d90713fbc4071e2e395bbf11ee6385 WHIRLPOOL 7e2b0472bb7d913e78260da95c93c3243562e76352790318286e5d194f88ac05a9f51fa029a7b0ad17bbbbd0dc9658769fe6301b544ec03f1ab5c205835ea894
+DIST matplotlib-2.0.2.tar.gz 53879938 SHA256 0ffbc44faa34a8b1704bc108c451ecf87988f900ef7ce757b8e2e84383121ff1 SHA512 39d68aee87fac2c246cdee7941ffaae1b8d586fa75c351bc94f963def66df32c3aba13fa0be94e1f8d21f06e068565b1a79c6d4f65589d8dd23cd48b32ab474f WHIRLPOOL 5ab8f9edb4591205d61bd47c5125520c0d24b8ce44e0041b99a5a0c692ffd3ff581cd6e092d18a64ddf6fb4f43ace6ee8c2bce19f5acd01d022d8a46e472b2df
+EBUILD matplotlib-1.4.3.ebuild 6150 SHA256 a9aac5050e5e2b85e2dabc87ff854b1a6a1f2f93ba752497357aa9323c40d34d SHA512 9e6e415962ad4e3699bde4b2e9701ca9141a72bb7d1c9097e3bda541c2d618524eee7a64ddc22a13f2d228c2e32296a4d88592ffb6ecdb366c590f70e01a2b46 WHIRLPOOL aee3d4046f0554a4f6f45359826961bac81d95f1533c40dedf5232f27e4e3b751fddb54285c20b69ee40c5abd79cb5dbe7a833e88775b339cc98296468c7e2b7
+EBUILD matplotlib-1.5.3-r1.ebuild 6411 SHA256 1e382cc3c6ef71005b07259d2c06d64be30b21228dda6ee4ede4dba09d0c0d58 SHA512 2b82734df065dd850ab99e4a19ed8001c45f9f9a472c54b29930f2b2447b77a2b5b2538c75d8c940d1fc5ffa774ddcb85b065bca923e9a46c4feacab0c3764af WHIRLPOOL d0964372a2796304505e7d8761f4b0d401513569f50386c9b50a3550e0a1080ffa75aed9aec897a2ae7d56216c6e7a08983acc70c51ea4b49464999da2dff121
+EBUILD matplotlib-1.5.3-r2.ebuild 6559 SHA256 6b5eee62e57b305290e0e1e64a3ed37242f3236d2cbcfdf6705e26695d95a89d SHA512 00b3fc17023fa04a4e7dc35e3c5752f0e4b16ca1edd21138448ea9e44d843762b7111a018b002fea762b6c6914f1171d72054da52427572c25d87f1c2157c537 WHIRLPOOL 6639184ce4dcfa65aa3647af85582105428e1c3fbb381873af738e5eea56c53619dc88bd3e5ca2a6b8032679ce0f54ea365144a5dbac3e4bb45ef8e9bf774ead
+EBUILD matplotlib-2.0.2.ebuild 6182 SHA256 bb37b2e70a7157fc15da9afb9fb2598e35ccd9ff13cc07388c58dec3abad56e7 SHA512 ab6b634f44041f3dc17615acece6bd8066842c42203a28bad2dca4923ac3ea969eb57354f59aac417f575aaee2c6d2f77ec0384dab08ee6776106d7971078f66 WHIRLPOOL 80314ec11af2a9f06eea0e35c47c9244e6d7dbda46bb16fa859b384fa61ec105de317a1f5cb37a9a8e4f13f723ca63e08dc4509540e52a044727050f8f89c089
+EBUILD matplotlib-9999.ebuild 6396 SHA256 85daf537315da546a0b98cc4a4da704047d8499b17a9358f4ad732a58434b2f9 SHA512 1a6406602fabea4b12911a89d34e69fed7b418c3127dac5679ebfe706e144aa62c93f3aa19ca832d75fdff0b4f2c5e5029a92ed3e1a8fa6bd61973cedf5504cc WHIRLPOOL daf26233c729a7e37d8aa6e3ac33301635215d78adc475eb2397b253868cbfd556a9d6c421980abd6ba3d217b7c4490ee1441f852f5925f2b2e89ece721faa76
+MISC ChangeLog 9810 SHA256 587f82b153d9c79045205c763ff839c4c4efafc28c9ce8c1f55181284b5ca10a SHA512 0d520483f15b6775938e767a926902f828d2626b80028a34f92ee19bb9b1c9d034e6bfa92b89b1d6ba190d2bd34f4d00db7d83571af00d3d799d2204471b42d3 WHIRLPOOL 274049289255cf08568a5eb30d1e21e3d59a6abc974b47afb0ed5c615a4fec52858cf0522174b723889e09b017b464df1266fe7a6e34709d20014923262d717c
+MISC ChangeLog-2015 33930 SHA256 1b276064ae4242da1737e4b42495a7b1de60d177e0d8fcc109708ecc3e6da847 SHA512 f9d4ceb0794bb4477e373f1b4edec0f7490ffe34a8ec536eb269991c98478f9b43fdf0d942da8c8b5c081cbd2bc839ff7ee681d52f0cfad072d117e507a5f66c WHIRLPOOL 3c23403904f9a52119a3f3c2212059b685fb0475f6c42c04148f53e717a9eb5f9ed070f41c5eae6b4026a28e26f541b24191a30c057d35b055237dbf5f1a2bc0
+MISC metadata.xml 1063 SHA256 0eeb70d161d755d7f6f2309395ca68510a08163b126e89d5cf6ff44b83c48d22 SHA512 25344a9f8d7ae73f1ec9f493cef17925c94fc4cd44486a9928debbd18ba53010455393e3e97fc70e67a9afae9d6c15b12688af16e5e9f7e090748481969eac4d WHIRLPOOL e16d9df78af232320c2397428deac9400b38f26bc9abedc27dedd29078fe16426f80c6b9b23a12d47310fdd5d19c7eb5ff8b7ee71ef90f7ac61a1492a1c1f0a6
diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-backport-GH5291-2462.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-backport-GH5291-2462.patch
new file mode 100644
index 000000000000..d6b2ae860038
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-1.4.3-backport-GH5291-2462.patch
@@ -0,0 +1,126 @@
+commit f98c4846dc3c15b3d24aafb973764cb9b860d935
+Author: Thomas A Caswell <tcaswell@gmail.com>
+Date:   Sat Jan 10 16:10:29 2015 -0500
+
+    MNT : removed deprecated method/kwargs from patheffects
+    
+    Deprecated in #2462 / 84e0063bd37c629f129d36c548e8ce3a30692cae
+    
+    attn @pelson had to known-fail a test which was using the
+    proxy renderer to verify that PathEffectRender was working
+    correctly.
+
+diff --git a/lib/matplotlib/patheffects.py b/lib/matplotlib/patheffects.py
+index 13f8ce0..19e1c4a 100644
+--- a/lib/matplotlib/patheffects.py
++++ b/lib/matplotlib/patheffects.py
+@@ -10,9 +10,7 @@ from __future__ import (absolute_import, division, print_function,
+ import six
+ 
+ from matplotlib.backend_bases import RendererBase
+-from matplotlib.backends.backend_mixed import MixedModeRenderer
+ import matplotlib.transforms as mtransforms
+-import matplotlib.cbook as cbook
+ from matplotlib.colors import colorConverter
+ import matplotlib.patches as mpatches
+ 
+@@ -42,12 +40,6 @@ class AbstractPathEffect(object):
+         return transform + self._offset_trans.clear().translate(offset_x,
+                                                                 offset_y)
+ 
+-    def get_proxy_renderer(self, renderer):
+-        """Return a PathEffectRenderer instance for this PathEffect."""
+-        cbook.deprecated('v1.4', name='get_proxy_renderer',
+-                         alternative='PathEffectRenderer')
+-        return PathEffectRenderer([self], renderer)
+-
+     def _update_gc(self, gc, new_gc_dict):
+         """
+         Update the given GraphicsCollection with the given
+@@ -219,9 +211,9 @@ class withStroke(Stroke):
+ 
+ class SimplePatchShadow(AbstractPathEffect):
+     """A simple shadow via a filled patch."""
+-    def __init__(self, offset=(2,-2),
+-                 shadow_rgbFace=None, alpha=None, patch_alpha=None,
+-                 rho=0.3, offset_xy=None, **kwargs):
++    def __init__(self, offset=(2, -2),
++                 shadow_rgbFace=None, alpha=None,
++                 rho=0.3, **kwargs):
+         """
+         Parameters
+         ----------
+@@ -241,24 +233,12 @@ class SimplePatchShadow(AbstractPathEffect):
+             :meth:`AbstractPathEffect._update_gc`.
+ 
+         """
+-        if offset_xy is not None:
+-            cbook.deprecated('v1.4', 'The offset_xy keyword is deprecated. '
+-                             'Use the offset keyword instead.')
+-            offset = offset_xy
+         super(SimplePatchShadow, self).__init__(offset)
+ 
+         if shadow_rgbFace is None:
+             self._shadow_rgbFace = shadow_rgbFace
+         else:
+             self._shadow_rgbFace = colorConverter.to_rgba(shadow_rgbFace)
+-        if patch_alpha is not None:
+-            cbook.deprecated('v1.4', 'The patch_alpha keyword is deprecated. '
+-                             'Use the alpha keyword instead. Transform your '
+-                             'patch_alpha by alpha = 1 - patch_alpha')
+-            if alpha is not None:
+-                raise ValueError("Both alpha and patch_alpha were set. "
+-                                 "Just use alpha.")
+-            alpha = 1 - patch_alpha
+ 
+         if alpha is None:
+             alpha = 0.3
+diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py
+index 8298ceb..5af71e5 100644
+--- a/lib/matplotlib/tests/test_patheffects.py
++++ b/lib/matplotlib/tests/test_patheffects.py
+@@ -5,7 +5,8 @@ import six
+ 
+ import numpy as np
+ 
+-from matplotlib.testing.decorators import image_comparison, cleanup
++from matplotlib.testing.decorators import (image_comparison, cleanup,
++                                           knownfailureif)
+ import matplotlib.pyplot as plt
+ import matplotlib.patheffects as path_effects
+ 
+@@ -84,19 +85,7 @@ def test_patheffect3():
+ 
+ 
+ @cleanup
+-def test_PathEffect_get_proxy():
+-    pe = path_effects.AbstractPathEffect()
+-    fig = plt.gcf()
+-    renderer = fig.canvas.get_renderer()
+-
+-    with mock.patch('matplotlib.cbook.deprecated') as dep:
+-        proxy_renderer = pe.get_proxy_renderer(renderer)
+-    assert_equal(proxy_renderer._renderer, renderer)
+-    assert_equal(proxy_renderer._path_effects, [pe])
+-    dep.assert_called()
+-
+-
+-@cleanup
++@knownfailureif(True)
+ def test_PathEffect_points_to_pixels():
+     fig = plt.figure(dpi=150)
+     p1, = plt.plot(range(10))
+@@ -116,11 +105,9 @@ def test_PathEffect_points_to_pixels():
+                  pe_renderer.points_to_pixels(15))
+ 
+ 
+-def test_SimplePatchShadow_offset_xy():
+-    with mock.patch('matplotlib.cbook.deprecated') as dep:
+-        pe = path_effects.SimplePatchShadow(offset_xy=(4, 5))
++def test_SimplePatchShadow_offset():
++    pe = path_effects.SimplePatchShadow(offset=(4, 5))
+     assert_equal(pe._offset, (4, 5))
+-    dep.assert_called()
+ 
+ 
+ @image_comparison(baseline_images=['collection'])
diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-1.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-1.patch
new file mode 100644
index 000000000000..065731441311
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-1.patch
@@ -0,0 +1,50 @@
+https://github.com/matplotlib/matplotlib/pull/4430
+
+From 08d26a80859023963bc2ffb41a0b6aed942685a9 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Fri, 15 May 2015 03:36:45 -0400
+Subject: [PATCH 1/3] setupext: respect $PKG_CONFIG
+
+When cross-compiling, it is common to set the PKG_CONFIG env var to a
+custom pkg-config that knows about the target.  Make sure we respect
+that just like the standard pkg-config tools suggest (pkg.m4).  If it
+isn't set, we use the same default as today -- "pkg-config".
+---
+ setupext.py | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/setupext.py b/setupext.py
+index 80b2a6c..29cddf9 100755
+--- a/setupext.py
++++ b/setupext.py
+@@ -253,7 +253,8 @@ class PkgConfig(object):
+             self.has_pkgconfig = False
+         else:
+             self.set_pkgconfig_path()
+-            status, output = getstatusoutput("pkg-config --help")
++            self.pkgconfig = os.environ.get('PKG_CONFIG', 'pkg-config')
++            status, output = getstatusoutput("%s --help" % self.pkgconfig)
+             self.has_pkgconfig = (status == 0)
+             if not self.has_pkgconfig:
+                 print("IMPORTANT WARNING:")
+@@ -286,7 +287,7 @@ class PkgConfig(object):
+ 
+         executable = alt_exec
+         if self.has_pkgconfig:
+-            executable = 'pkg-config {0}'.format(package)
++            executable = '%s %s' % (self.pkgconfig, package)
+ 
+         use_defaults = True
+ 
+@@ -330,7 +331,7 @@ class PkgConfig(object):
+             return None
+ 
+         status, output = getstatusoutput(
+-            "pkg-config %s --modversion" % (package))
++            '%s %s --modversion' % (self.pkgconfig, package))
+         if status == 0:
+             return output
+         return None
+-- 
+2.4.0
+
diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-2.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-2.patch
new file mode 100644
index 000000000000..9580c70b2ae9
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-2.patch
@@ -0,0 +1,54 @@
+https://github.com/matplotlib/matplotlib/pull/4430
+
+From 3761303016cab0542891374032eca87e74d585bf Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Fri, 15 May 2015 03:43:17 -0400
+Subject: [PATCH 2/3] setupext: do not mess with PKG_CONFIG_PATH
+
+The current code always sets PKG_CONFIG_PATH to build paths in / which
+breaks cross-compiling -- things like /usr/lib are for the build system
+(e.g. x86) and not for the target (e.g. arm).  Since we're adding paths
+that are already the default for pkg-config, there's no point in trying
+to be smart here.  Just punt the code.
+
+This basically reverts commit 101beb975d3a1218350f02bf68dc2a43ac8ff148.
+---
+ setupext.py | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/setupext.py b/setupext.py
+index 29cddf9..57d80e7 100755
+--- a/setupext.py
++++ b/setupext.py
+@@ -252,7 +252,6 @@ class PkgConfig(object):
+         if sys.platform == 'win32':
+             self.has_pkgconfig = False
+         else:
+-            self.set_pkgconfig_path()
+             self.pkgconfig = os.environ.get('PKG_CONFIG', 'pkg-config')
+             status, output = getstatusoutput("%s --help" % self.pkgconfig)
+             self.has_pkgconfig = (status == 0)
+@@ -262,20 +261,6 @@ class PkgConfig(object):
+                     "    pkg-config is not installed.\n"
+                     "    matplotlib may not be able to find some of its dependencies")
+ 
+-    def set_pkgconfig_path(self):
+-        pkgconfig_path = sysconfig.get_config_var('LIBDIR')
+-        if pkgconfig_path is None:
+-            return
+-
+-        pkgconfig_path = os.path.join(pkgconfig_path, 'pkgconfig')
+-        if not os.path.isdir(pkgconfig_path):
+-            return
+-
+-        try:
+-            os.environ['PKG_CONFIG_PATH'] += ':' + pkgconfig_path
+-        except KeyError:
+-            os.environ['PKG_CONFIG_PATH'] = pkgconfig_path
+-
+     def setup_extension(self, ext, package, default_include_dirs=[],
+                         default_library_dirs=[], default_libraries=[],
+                         alt_exec=None):
+-- 
+2.4.0
+
diff --git a/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-3.patch b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-3.patch
new file mode 100644
index 000000000000..21fdf128863c
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-1.4.3-cross-compile-3.patch
@@ -0,0 +1,58 @@
+https://github.com/matplotlib/matplotlib/pull/4430
+
+From d077e49be318c851f6bbd64708efeed78a3ece3f Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Fri, 15 May 2015 03:49:02 -0400
+Subject: [PATCH 3/3] setupext: do not hardcode system -I/-L paths
+
+The native compiler should already know the right paths to look for
+includes and libraries.  Hardcoding a specific list of those paths
+breaks both cross-compiling and multilib.  In the former, paths like
+/usr/include and /usr/lib are for x86 but when you want to build for
+arm, mixing them leads to bad failures.  In the latter, paths like
+/usr/lib typically hold 32it libraries, but when you're building for
+64bit, you want the libs from /usr/lib64.  This goes even further as
+there are other mixed ABIs like /usr/libx32 and /usr/lib32, neither
+of which are handled here.
+
+Instead, delete the code entirely and rely on the compiler being
+properly configured.  If you want to use a misconfigured compiler,
+you can always set CFLAGS/CPPFLAGS/LDFLAGS to include the -I/-L
+that your system needs.
+---
+ setupext.py | 12 +-----------
+ 1 file changed, 1 insertion(+), 11 deletions(-)
+
+diff --git a/setupext.py b/setupext.py
+index 57d80e7..7473e3a 100755
+--- a/setupext.py
++++ b/setupext.py
+@@ -216,9 +216,7 @@ sysconfig.customize_compiler = my_customize_compiler
+ 
+ def make_extension(name, files, *args, **kwargs):
+     """
+-    Make a new extension.  Automatically sets include_dirs and
+-    library_dirs to the base directories appropriate for this
+-    platform.
++    Make a new extension.
+ 
+     `name` is the name of the extension.
+ 
+@@ -228,14 +226,6 @@ def make_extension(name, files, *args, **kwargs):
+     `distutils.core.Extension` constructor.
+     """
+     ext = DelayedExtension(name, files, *args, **kwargs)
+-    for dir in get_base_dirs():
+-        include_dir = os.path.join(dir, 'include')
+-        if os.path.exists(include_dir):
+-            ext.include_dirs.append(include_dir)
+-        for lib in ('lib', 'lib64'):
+-            lib_dir = os.path.join(dir, lib)
+-            if os.path.exists(lib_dir):
+-                ext.library_dirs.append(lib_dir)
+     ext.include_dirs.append('.')
+ 
+     return ext
+-- 
+2.4.0
+
diff --git a/dev-python/matplotlib/files/matplotlib-1.5.3-freetype-spurious-failure.patch b/dev-python/matplotlib/files/matplotlib-1.5.3-freetype-spurious-failure.patch
new file mode 100644
index 000000000000..bc6891a5f252
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-1.5.3-freetype-spurious-failure.patch
@@ -0,0 +1,26 @@
+Increase the tolerance margin in order to pass tests caused by
+freetype producing unreproducible images across different versions.
+See also: https://github.com/matplotlib/matplotlib/issues/2667
+
+--- a/lib/matplotlib/tests/test_mathtext.py
++++ b/lib/matplotlib/tests/test_mathtext.py
+@@ -158,7 +158,7 @@
+ def make_set(basename, fontset, tests, extensions=None):
+     def make_test(filename, test):
+         @image_comparison(baseline_images=[filename], extensions=extensions,
+-                          tol=32)
++                          tol=40)
+         def single_test():
+             matplotlib.rcParams['mathtext.fontset'] = fontset
+             fig = plt.figure(figsize=(5.25, 0.75))
+--- a/lib/matplotlib/tests/test_text.py
++++ b/lib/matplotlib/tests/test_text.py
+@@ -18,7 +18,7 @@
+ from matplotlib.backends.backend_agg import RendererAgg
+ 
+ 
+-@image_comparison(baseline_images=['font_styles'])
++@image_comparison(baseline_images=['font_styles'], tol=20)
+ def test_font_styles():
+     from matplotlib import _get_data_path
+     data_path = _get_data_path()
diff --git a/dev-python/matplotlib/files/matplotlib-2.0.2-freetype-spurious-failure.patch b/dev-python/matplotlib/files/matplotlib-2.0.2-freetype-spurious-failure.patch
new file mode 100644
index 000000000000..b6450a83fed0
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-2.0.2-freetype-spurious-failure.patch
@@ -0,0 +1,27 @@
+diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
+index 5e738ad9b..78b3f8169 100644
+--- a/lib/matplotlib/testing/decorators.py
++++ b/lib/matplotlib/testing/decorators.py
+@@ -266,7 +266,7 @@ class ImageComparisonTest(CleanupTest):
+ 
+                 yield do_test, fignum, actual_fname, expected_fname
+ 
+-def image_comparison(baseline_images=None, extensions=None, tol=0,
++def image_comparison(baseline_images=None, extensions=None, tol=20,
+                      freetype_version=None, remove_text=False,
+                      savefig_kwarg=None, style='_classic_test'):
+     """
+diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
+index 39f5d7ef1..7681e5cb9 100644
+--- a/lib/matplotlib/tests/test_mathtext.py
++++ b/lib/matplotlib/tests/test_mathtext.py
+@@ -159,7 +159,8 @@ for fonts, chars in font_test_specs:
+ 
+ def make_set(basename, fontset, tests, extensions=None):
+     def make_test(filename, test):
+-        @image_comparison(baseline_images=[filename], extensions=extensions)
++        @image_comparison(baseline_images=[filename], extensions=extensions,
++                          tol=40)
+         def single_test():
+             matplotlib.rcParams['mathtext.fontset'] = fontset
+             fig = plt.figure(figsize=(5.25, 0.75))
diff --git a/dev-python/matplotlib/files/matplotlib-2.0.2-nose-fixes.patch b/dev-python/matplotlib/files/matplotlib-2.0.2-nose-fixes.patch
new file mode 100644
index 000000000000..ab1181bd0176
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-2.0.2-nose-fixes.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
+index 530c889a9..8231c2bb8 100644
+--- a/lib/matplotlib/__init__.py
++++ b/lib/matplotlib/__init__.py
+@@ -1609,7 +1609,7 @@ def test(verbosity=1):
+ 
+         # store the old values before overriding
+         plugins = _get_extra_test_plugins()
+-        plugins.extend([plugin() for plugin in nose.plugins.builtin.plugins])
++        plugins.extend(nose.plugins.builtin.plugins)
+ 
+         manager = PluginManager(plugins=[x() for x in plugins])
+         config = nose.config.Config(verbosity=verbosity, plugins=manager)
diff --git a/dev-python/matplotlib/matplotlib-1.4.3.ebuild b/dev-python/matplotlib/matplotlib-1.4.3.ebuild
new file mode 100644
index 000000000000..4c7f57ce2f47
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-1.4.3.ebuild
@@ -0,0 +1,261 @@
+# 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} )
+
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 eutils flag-o-matic virtualx toolchain-funcs
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+KEYWORDS="amd64 arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="cairo doc excel examples fltk gtk gtk3 latex pyside qt4 qt5 test tk wxwidgets"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+	doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	fltk? ( ${PY2_FLAGS} )
+	gtk? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo fltk latex pyside qt5 qt4 tk wxwidgets
+		|| ( gtk gtk3 )
+		)"
+
+# #456704 -- a lot of py2-only deps
+PY2_USEDEP=$(python_gen_usedep python2_7)
+COMMON_DEPEND="
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	media-libs/qhull
+	gtk? (
+		dev-libs/glib:2=
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		dev-python/pygtk[${PY2_USEDEP}] )
+	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.3.4
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		media-gfx/graphviz[cairo]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	cairo? (
+		|| (
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			dev-python/cairocffi[${PYTHON_USEDEP}]
+			)
+		)
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	fltk? ( dev-python/pyfltk[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection] )
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
+	qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+	"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-backport-GH5291-2462.patch
+)
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+	epatch "${FILESDIR}"/${PN}-1.4.3-cross-compile-{1,2,3}.patch
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	# suggested by upstream
+	sed \
+		-e '/tol/s:32:35:g' \
+		-i lib/matplotlib/tests/test_mathtext.py || die
+
+	sed \
+		-e "s:/usr/:${EPREFIX}/usr/:g" \
+		-i setupext.py || die
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF
+		[directories]
+		basedirlist = "${EPREFIX}/usr"
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[gui_support]
+		agg = True
+		$(use_setup cairo)
+		$(use_setup pyside)
+		$(use_setup qt4)
+		$(use_setup qt5)
+		$(use_setup tk)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+
+	if $(python_is_python3); then
+		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF
+			six = True
+			fltk = False
+			fltkagg = False
+			gtk = False
+			gtkagg = False
+			wx = False
+			wxagg = False
+		EOF
+	else
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF
+			six = False
+			$(use_setup fltk)
+			$(use_setup gtk)
+			$(use_setup gtk3)
+			$(use_setup wxwidgets wx)
+		EOF
+	fi
+}
+
+wrap_setup() {
+	local MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	export MPLSETUPCFG
+	unset DISPLAY
+
+	# Note: remove build... if switching to out-of-source build
+	"${@}" build --build-lib="${BUILD_DIR}"/build/lib
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		"${PYTHON}" ./make.py --small html || die
+	fi
+}
+
+python_test() {
+	wrap_setup distutils_install_for_testing
+
+	cd "${TMPDIR}" || die
+	VIRTUALX_COMMAND="${PYTHON}"
+	virtualmake -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)" || \
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/matplotlib/matplotlib-1.5.3-r1.ebuild b/dev-python/matplotlib/matplotlib-1.5.3-r1.ebuild
new file mode 100644
index 000000000000..11acf166d286
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-1.5.3-r1.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 eutils flag-o-matic multiprocessing virtualx toolchain-funcs
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+	doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	fltk? ( ${PY2_FLAGS} )
+	gtk2? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo fltk latex pyside qt5 qt4 tk wxwidgets
+		|| ( gtk2 gtk3 )
+		)"
+
+# #456704 -- a lot of py2-only deps
+PY2_USEDEP=$(python_gen_usedep python2_7)
+COMMON_DEPEND="
+	dev-python/cycler[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	media-libs/qhull
+	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
+	gtk2? (
+		dev-libs/glib:2=
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		dev-python/pygtk[${PY2_USEDEP}] )
+	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PY2_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		media-gfx/graphviz[cairo]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	fltk? ( dev-python/pyfltk[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection] )
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
+	qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+	"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=( "${FILESDIR}/${PN}-1.5.3-freetype-spurious-failure.patch" )
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	# suggested by upstream
+#	sed \
+#		-e '/tol/s:32:35:g' \
+#		-i lib/matplotlib/tests/test_mathtext.py || die
+
+	sed \
+		-e "s:/usr/:${EPREFIX}/usr/:g" \
+		-i setupext.py || die
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = "${EPREFIX}/usr"
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[gui_support]
+		agg = True
+		$(use_setup cairo)
+		$(use_setup pyside)
+		$(use_setup qt4)
+		$(use_setup qt5)
+		$(use_setup tk)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+
+	if $(python_is_python3); then
+		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
+			six = True
+			fltk = False
+			fltkagg = False
+			gtk = False
+			gtkagg = False
+			wx = False
+			wxagg = False
+		EOF
+	else
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+			six = False
+			$(use_setup fltk)
+			$(use_setup gtk2 gtk)
+			$(use_setup gtk3)
+			$(use_setup wxwidgets wx)
+		EOF
+	fi
+}
+
+wrap_setup() {
+	local MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	export MPLSETUPCFG
+	unset DISPLAY
+
+	# Note: remove build... if switching to out-of-source build
+	"${@}" build --build-lib="${BUILD_DIR}"/build/lib
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		"${EPYTHON}" ./make.py --small html || die
+	fi
+}
+
+python_test() {
+	wrap_setup distutils_install_for_testing
+
+#	virtx ${EPYTHON} tests.py \
+#		--no-pep8 \
+#		--no-network \
+#		--verbose \
+#		--processes=$(makeopts_jobs)
+
+	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/matplotlib/matplotlib-1.5.3-r2.ebuild b/dev-python/matplotlib/matplotlib-1.5.3-r2.ebuild
new file mode 100644
index 000000000000..9b22ea3ab8c3
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-1.5.3-r2.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 eutils flag-o-matic multiprocessing virtualx toolchain-funcs
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+	doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	fltk? ( ${PY2_FLAGS} )
+	gtk2? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo fltk latex pyside qt5 qt4 tk wxwidgets
+		|| ( gtk2 gtk3 )
+		)"
+
+# #456704 -- a lot of py2-only deps
+PY2_USEDEP=$(python_gen_usedep python2_7)
+COMMON_DEPEND="
+	dev-python/cycler[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	media-libs/qhull
+	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
+	gtk2? (
+		dev-libs/glib:2=
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		dev-python/pygtk[${PY2_USEDEP}] )
+	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PY2_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		media-gfx/graphviz[cairo]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	fltk? ( dev-python/pyfltk[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection] )
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
+	qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+	"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=( "${FILESDIR}/${PN}-1.5.3-freetype-spurious-failure.patch" )
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	# suggested by upstream
+#	sed \
+#		-e '/tol/s:32:35:g' \
+#		-i lib/matplotlib/tests/test_mathtext.py || die
+
+	sed \
+		-e "s:/usr/:${EPREFIX}/usr/:g" \
+		-i setupext.py || die
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = "${EPREFIX}/usr"
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[gui_support]
+		agg = True
+		$(use_setup cairo)
+		$(use_setup pyside)
+		$(use_setup qt4)
+		$(use_setup qt5)
+		$(use_setup tk)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+
+	if $(python_is_python3); then
+		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
+			six = True
+			fltk = False
+			fltkagg = False
+			gtk = False
+			gtkagg = False
+			wx = False
+			wxagg = False
+		EOF
+	else
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+			six = False
+			$(use_setup fltk)
+			$(use_setup gtk2 gtk)
+			$(use_setup gtk3)
+			$(use_setup wxwidgets wx)
+		EOF
+	fi
+}
+
+wrap_setup() {
+	local MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	export MPLSETUPCFG
+	unset DISPLAY
+
+	# Note: remove build... if switching to out-of-source build
+	"${@}" build --build-lib="${BUILD_DIR}"/build/lib
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		"${EPYTHON}" ./make.py --small html || die
+	fi
+}
+
+python_test() {
+	wrap_setup distutils_install_for_testing
+
+#	virtx ${EPYTHON} tests.py \
+#		--no-pep8 \
+#		--no-network \
+#		--verbose \
+#		--processes=$(makeopts_jobs)
+
+	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/matplotlib/matplotlib-2.0.2.ebuild b/dev-python/matplotlib/matplotlib-2.0.2.ebuild
new file mode 100644
index 000000000000..e8214110ebfe
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-2.0.2.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+	doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	gtk2? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo latex qt5 tk wxwidgets
+		|| ( gtk2 gtk3 )
+		)"
+
+# #456704 -- a lot of py2-only deps
+PY2_USEDEP=$(python_gen_usedep python2_7)
+COMMON_DEPEND="
+	dev-python/cycler[${PYTHON_USEDEP}]
+	dev-python/functools32[${PY2_USEDEP}]
+	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+	dev-python/subprocess32[${PY2_USEDEP}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013
+	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
+	gtk2? (
+		dev-libs/glib:2=
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		dev-python/pygtk[${PY2_USEDEP}] )
+	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/colorspacious[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PY2_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		media-gfx/graphviz[cairo]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection] )
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
+	qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+	"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${P}-nose-fixes.patch
+	"${FILESDIR}"/${P}-freetype-spurious-failure.patch
+)
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	hprefixify setupext.py
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	rm -r extern/qhull || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup pyside)
+		$(use_setup qt4)
+		$(use_setup qt5)
+		$(use_setup tk)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+
+	if python_is_python3; then
+		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
+			gtk = False
+			gtkagg = False
+			wx = False
+			wxagg = False
+		EOF
+	else
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+			$(use_setup gtk2 gtk)
+			$(use_setup wxwidgets wx)
+		EOF
+	fi
+}
+
+wrap_setup() {
+	local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	unset DISPLAY
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		"${EPYTHON}" ./make.py --small html || die
+	fi
+}
+
+python_test() {
+	wrap_setup distutils_install_for_testing
+
+	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/matplotlib/matplotlib-9999.ebuild b/dev-python/matplotlib/matplotlib-9999.ebuild
new file mode 100644
index 000000000000..0591f9c414de
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-9999.ebuild
@@ -0,0 +1,273 @@
+# 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} )
+
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 eutils flag-o-matic git-r3 multiprocessing virtualx toolchain-funcs
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/matplotlib/matplotlib.git"
+
+SLOT="0"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+KEYWORDS=""
+IUSE="cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+	doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	fltk? ( ${PY2_FLAGS} )
+	gtk2? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo fltk latex pyside qt5 qt4 tk wxwidgets
+		|| ( gtk2 gtk3 )
+		)"
+
+# #456704 -- a lot of py2-only deps
+PY2_USEDEP=$(python_gen_usedep python2_7)
+COMMON_DEPEND="
+	dev-python/cycler[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	media-libs/qhull
+	cairo? (
+		|| (
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			dev-python/cairocffi[${PYTHON_USEDEP}]
+			)
+		)
+	gtk2? (
+		dev-libs/glib:2=
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		dev-python/pygtk[${PY2_USEDEP}] )
+	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PY2_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.3.4
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		media-gfx/graphviz[cairo]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	fltk? ( dev-python/pyfltk[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection] )
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
+	qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+	"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	# suggested by upstream
+#	sed \
+#		-e '/tol/s:32:35:g' \
+#		-i lib/matplotlib/tests/test_mathtext.py || die
+
+	sed \
+		-e "s:/usr/:${EPREFIX}/usr/:g" \
+		-i setupext.py || die
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF
+		[directories]
+		basedirlist = "${EPREFIX}/usr"
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[gui_support]
+		agg = True
+		$(use_setup cairo)
+		$(use_setup pyside)
+		$(use_setup qt4)
+		$(use_setup qt5)
+		$(use_setup tk)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+
+	if $(python_is_python3); then
+		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF
+			six = True
+			fltk = False
+			fltkagg = False
+			gtk = False
+			gtkagg = False
+			wx = False
+			wxagg = False
+		EOF
+	else
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF
+			six = False
+			$(use_setup fltk)
+			$(use_setup gtk2 gtk)
+			$(use_setup gtk3)
+			$(use_setup wxwidgets wx)
+		EOF
+	fi
+}
+
+wrap_setup() {
+	local MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	export MPLSETUPCFG
+	unset DISPLAY
+
+	# Note: remove build... if switching to out-of-source build
+	"${@}" build --build-lib="${BUILD_DIR}"/build/lib
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		"${PYTHON}" ./make.py --small html || die
+	fi
+}
+
+python_test() {
+	wrap_setup distutils_install_for_testing
+
+	virtx ${PYTHON} tests.py \
+		--no-pep8 \
+		--no-network \
+		--verbose \
+		--processes=$(makeopts_jobs)
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/matplotlib/metadata.xml b/dev-python/matplotlib/metadata.xml
new file mode 100644
index 000000000000..5dd5a6634838
--- /dev/null
+++ b/dev-python/matplotlib/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+	matplotlib is an interactive library for plotting and doing basic
+	data analysis in python with a syntax similar to matlab. It provides a
+	variety of backends and hard copy formats for almost ready
+	publication plots.
+	</longdescription>
+	<use>
+		<flag name="excel">Pull <pkg>dev-python/xlwt</pkg> for the exceltools toolkit</flag>
+		<flag name="gtk2">Enable <pkg>x11-libs/gtk+</pkg>:2 support</flag>
+		<flag name="gtk3">Enable <pkg>x11-libs/gtk+</pkg>:3 support</flag>
+		<flag name="pyside">Qt support via <pkg>dev-python/pyside</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">matplotlib</remote-id>
+		<remote-id type="sourceforge">matplotlib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/matplotlib2tikz/Manifest b/dev-python/matplotlib2tikz/Manifest
new file mode 100644
index 000000000000..82cf3bb09171
--- /dev/null
+++ b/dev-python/matplotlib2tikz/Manifest
@@ -0,0 +1,4 @@
+AUX matplotlib2tikz-0.6.11-pipdated.patch 639 SHA256 f98244a71104b31d2b03b960f616e4c8079530d526d8fab55faaeb90137ed646 SHA512 f2c8f4e8af2a5deedb1cb1f38f51c7b5cc70aea54a76647664c68531b98b80058622fd948adf56eaf3815df9c27075694ff96d8ddbb60edb4bf67d62f579500e WHIRLPOOL 8e5fa04554671b96f61e6c5670436a00ba9e206103380d585ff97babe5d917e9e080eea89404ff3de2f24823b905087a2f2a6d23c59a01892b283eb04986278b
+DIST matplotlib2tikz-0.6.11.tar.gz 524298 SHA256 79c9f141fd802fe5863d2eaff6c67476d02ca474433e65990c935241a2591994 SHA512 eda5042f1db35436ca56256cb858fa11b48d497f621183475d69381b0b10ac67f9447522e1b78c1a331337e34eb159b5ffeef9655a8c0dc4ccab22b7afcb5e96 WHIRLPOOL b09025b9444e0a0ec122fbb7d6d90e32e043c3a86e8b7454ac3fdc0ba03374f5648491a4564bae7ef622a536f4ec92e762a68816d64621da6df44fea2c404c8c
+EBUILD matplotlib2tikz-0.6.11.ebuild 966 SHA256 0a45b2fb418fb8bd5df6bb5a6177fd1b4edfa487cf89182e9993bee6773bd91b SHA512 a614afe5abf1e043d6f61c033a77b03a0cf4108c0499903fd1aad99e5fef518c7025402822a2c7c412db02ad84e7c5922a3e16a35fed542747b3558fcbea28ab WHIRLPOOL 90158cc980e2e597af7d5566d5dd898a40021dfde385a01f8f1de9d2d238c09b0c067b96a181bde6dc833515d37315c428cd6c074b899a41c12f0c6e26eaab1c
+MISC metadata.xml 976 SHA256 bbd0ee639b2f20cf03f6f450fa9e7486cb1bf286b4b58e2f555a489345de6872 SHA512 5ce41d4236c17a50a9a9949974c8c9fbaa5ca0c46cd628b34a8266227982b780c5fa5f2fe5667d51961f64c19c73d377363558f28756d2bbb8a88f1c4ced19b1 WHIRLPOOL 3e3e5a5edb35e07284a4d9447829e66e54b98bf612af5ebd1164044583ef52a5cb08653772e3122825fc73bff166b5103c2345fb664a6da9bfc86d32c38718df
diff --git a/dev-python/matplotlib2tikz/files/matplotlib2tikz-0.6.11-pipdated.patch b/dev-python/matplotlib2tikz/files/matplotlib2tikz-0.6.11-pipdated.patch
new file mode 100644
index 000000000000..3b7cf2ffbe51
--- /dev/null
+++ b/dev-python/matplotlib2tikz/files/matplotlib2tikz-0.6.11-pipdated.patch
@@ -0,0 +1,24 @@
+Remove version checks using pipdated.
+
+Patch by Marius Brehler <marbre@linux.sungazer.de>
+--- a/matplotlib2tikz/__init__.py
++++ b/matplotlib2tikz/__init__.py
+@@ -16,7 +16,3 @@ from matplotlib2tikz.__about__ import (
+         )
+ 
+ from matplotlib2tikz.save import get_tikz_code, save
+-
+-import pipdated
+-if pipdated.needs_checking(__name__):
+-    print(pipdated.check(__name__, __version__))
+
+--- a/setup.py
++++ b/setup.py
+@@ -34,7 +34,6 @@ setup(
+         'matplotlib >=1.4.0',
+         'numpy',
+         'Pillow >= 3.0.0',
+-        'pipdated',
+         'six',
+         ],
+     description='convert matplotlib figures into TikZ/PGFPlots',
diff --git a/dev-python/matplotlib2tikz/matplotlib2tikz-0.6.11.ebuild b/dev-python/matplotlib2tikz/matplotlib2tikz-0.6.11.ebuild
new file mode 100644
index 000000000000..437c6ed6f555
--- /dev/null
+++ b/dev-python/matplotlib2tikz/matplotlib2tikz-0.6.11.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
+HOMEPAGE="https://github.com/nschloe/matplotlib2tikz"
+SRC_URI="https://github.com/nschloe/matplotlib2tikz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+PATCHES=( "${FILESDIR}/${P}-pipdated.patch" )
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/ImageHash[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-tex/pgf
+	)"
+
+# we have not succeeded in getting the tests to work yet ;-)
+RESTRICT="test"
+
+python_test() {
+	local -x MPLBACKEND=Agg
+	virtx py.test -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/matplotlib2tikz/metadata.xml b/dev-python/matplotlib2tikz/metadata.xml
new file mode 100644
index 000000000000..9c08eac0171c
--- /dev/null
+++ b/dev-python/matplotlib2tikz/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marbre@linux.sungazer.de</email>
+		<name>Marius Brehler</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription>matplotlib2tikz is a Python tool for converting matplotlib figures into PGFPlots (TikZ) figures like for native inclusion into LaTeX documents. The output of matplotlib2tikz is in PGFPlots, a LaTeX library that sits on top of TikZ and describes graphs in terms of axes, data etc. Consequently, the output of matplotlib2tikz retains more information, can be more easily understood, and is more easily editable than raw TikZ output.</longdescription>
+	<upstream>
+		<remote-id type="github">nschloe/matplotlib2tikz</remote-id>
+		<remote-id type="pypi">matplotlib2tikz</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/maybe/Manifest b/dev-python/maybe/Manifest
new file mode 100644
index 000000000000..5ffd494475d1
--- /dev/null
+++ b/dev-python/maybe/Manifest
@@ -0,0 +1,6 @@
+DIST maybe-0.3.0.tar.gz 5738 SHA256 214dc0bbf35e1174103711f068840b998f6f4fcd93d65957b9087906308fb45b SHA512 512b7b5251c27a64891bd105599b5625331cb21d40dbf7d1b88b56375a5ead484f02f87da6410c01682c180218cae7b0df7a9f92ad7a69a862b333ee36265152 WHIRLPOOL 4d6fdbc58b95a9e8ef9dd27404b17d70e84d38ee0e5f905de2dcee2cc33cfcedddca97fef2109141a42111688c0ff5a5ce407d81057b7d7d9c53fd83237a23df
+DIST maybe-0.4.0.tar.gz 6105 SHA256 581ad535104e8af27f56d1eecf92525c44d0440f228351fe195f56c0d45852b9 SHA512 39882c69375b408e809e899b997675c9395ddf50b8625fd04a0d78cbd041f6138e491b76578c8b530ba122b921c694bc27d256eab7485ea4638330f6e0411129 WHIRLPOOL 68d4ef05356c164ae5a764e3d922565e3a750c8a300b12ab3b87c18bc7636f08764a49a286fd315b3cffcf3cbe5dc6fd7c25c43e4ee8d68ad16d747f98ed6224
+EBUILD maybe-0.3.0.ebuild 611 SHA256 15808e9281fc6ed63c432e56135d394bf14065e93176ff052cd842eb79b39c9b SHA512 c8179014e364ff88565e6abe0c12c6b671f17a073fabc4ae01266a4676379ce39ebb46254212adc742c3ba6ba89973bbbf1ef7ca4c3f16c63f2c9392751b74eb WHIRLPOOL 96d0dd8ff7d59549e7849cf76007455e40f99c8eb9ab385805695567f4c65c9ab42f685bf7ea4a25c467a8db21264950914fa56fc75328ec62a5b3c17645ddd9
+EBUILD maybe-0.4.0.ebuild 706 SHA256 3b2f724d3069aea138394369b1b63f13eea5568970951107b169970a1473894b SHA512 6eef9c736cdc3fa8cc2ac8505d93473515406d9ea1ec075eb1c44795a1e03d8db35e0492a92500bcebbc1a14b89a4cdca6003502719239cb0af2ab459cffca34 WHIRLPOOL 8c398e004795fcfc74f79d5e94473cbee003321fbbbaaafec2dff169a20a8a64d697776dee11e385c70d8c874227c6fc2eca559e26940d35c62123698f14fb87
+MISC ChangeLog 870 SHA256 98b839ca4013ba5a022c911a7a0762baf1cb995538d239e5826e43ac3a072dbf SHA512 587ab74c690d9712120932a350d1a6b7f6cfa043e4aeedaa86a4d6d969b61799b7804e663557bf552110c0538687833f7d91fe9935bff20ce878cf598bed0346 WHIRLPOOL 7dcbca34264bf98eafbc88eb6db81b2156e1db411461df200c0c3c19526bf7b27830ccb49533afd1765b5d03a32ec5d7656cba611514eb28893edc55dab3273e
+MISC metadata.xml 432 SHA256 f148a72802e0813940eaf6ccf6eecc67dd07dea133482c8435d9d39c69561144 SHA512 1c30bebf7c6b34ba11e4f8bef92f9a2b4238eee49c19078d817063ad35c45008e8c53bd9f534677325005ab29c847c9fda9a2cd07c722e3250b00a8d07d41b95 WHIRLPOOL 5cb4a1e42a40020287f3d0d306849075a46c0f5c6b786722e486802f4e10616e5947914b6ac20d3ca3e93534de52a1bba7ac22a0a3257fbc4834fff1a73ce9ca
diff --git a/dev-python/maybe/maybe-0.3.0.ebuild b/dev-python/maybe/maybe-0.3.0.ebuild
new file mode 100644
index 000000000000..e43b5cb24744
--- /dev/null
+++ b/dev-python/maybe/maybe-0.3.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="See what a program does before deciding whether you really want it to happen"
+HOMEPAGE="https://github.com/p-e-w/maybe http://pypi.python.org/pypi/maybe"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/blessings[${PYTHON_USEDEP}]
+	dev-python/python-ptrace[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/maybe/maybe-0.4.0.ebuild b/dev-python/maybe/maybe-0.4.0.ebuild
new file mode 100644
index 000000000000..bdc5651f4a04
--- /dev/null
+++ b/dev-python/maybe/maybe-0.4.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="See what a program does before deciding whether you really want it to happen"
+HOMEPAGE="https://github.com/p-e-w/maybe http://pypi.python.org/pypi/maybe"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/blessings[${PYTHON_USEDEP}]
+	dev-python/python-ptrace[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	>=dev-python/pytest-runner-2.7[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/maybe/metadata.xml b/dev-python/maybe/metadata.xml
new file mode 100644
index 000000000000..18d4caa64bbb
--- /dev/null
+++ b/dev-python/maybe/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="pypi">maybe</remote-id>
+    <maintainer status="unknown">
+      <email>pew@worldwidemann.com</email>
+      <name>Philipp Emanuel Weidmann</name>
+    </maintainer>
+    <remote-id type="github">p-e-w/maybe</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
new file mode 100644
index 000000000000..c3ae7074efc9
--- /dev/null
+++ b/dev-python/mccabe/Manifest
@@ -0,0 +1,7 @@
+DIST mccabe-0.2.1.tar.gz 5031 SHA256 5a2a170e47de5593a6abfae1e9542bd2c3924ac62bbe4e6ed96c953c0352243a SHA512 7155e52063e786c140c541f1410d0c319387b4b5f24ec3c60ba3d5a963a92d0ee545254559941ac0dbe961f46750c0e61271fbe82653c6b1465c0a13b31ec325 WHIRLPOOL 1db80033f91a24029e6757847d11528cb01c2aff2a2b40c947f969191f767fe6b93fd9adfb685eee8bcb03ba9719f852d8a5db7e1b27395acb93d973f35d09d8
+DIST mccabe-0.6.1.tar.gz 8612 SHA256 dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8 WHIRLPOOL fb57eebe4b20af1dbd81f0e62d00ea64b3e998f1549de3f06ed65d3c244f671d0668fc630c3105639fd351534f8dffe3c093d7e32a3f17400f210b1f286f38bd
+EBUILD mccabe-0.2.1.ebuild 553 SHA256 fd52a53724080393e8b9b035db45b55e4b83647933900e6db3e6938aa4eb650e SHA512 5ac2247052ee959a29a582884d4d8d10df032925ed6eeaf0c950081dbf05e091975952fb2394e6abb7e0f5f3ed93b4201bc90029e8c84aa34165bda8bfeefda5 WHIRLPOOL c87241d4f146dbe8494646df1e85e21ff5745c7de8a69a2f63686e690b7bb26283b69ff4f72b249f00e6dc06a7d24309c058b84cc72b7424aef4ddeb0cd86d05
+EBUILD mccabe-0.6.1.ebuild 873 SHA256 80acc3340cbdbe128559798dd276a84eb4bb7029388dad1b0edf28fa5b41c7c1 SHA512 66b6e6fd2274967f468f8f1352e10e25c2f5ed39388d25990d421f5832035546946f53f54e6c7dc8777fb0539edb97668ebad1c7a53e9b16762d71a3b5b7838c WHIRLPOOL 615137477fe94ece5e0b250cd40720043eecc216ca52db43df7178af0ac6ebec4da4b15ea503a2e4623db831788b8e9cdfc0af802dc2cd8d1e77b9e02686d983
+MISC ChangeLog 5326 SHA256 da0302c36de232263f4df3926a59c9a333221872701aa68e6dd51db68708e911 SHA512 6ae42559bfa0a25f9ad480aa86d9f7b2557fc9588d6f1e4302bd221196e83212c5548d046d0e0aef3673eea6ce8ae09984b7a8ee7364aa0326fb423f4c7a5f6f WHIRLPOOL e216053bd6bd616c5422cbd454d55801bf9a6642b9a1347661da892cd374058ace55a130eccf12576c3cda9d2a30b77729c9a3b390122f11b28ca0d660e93409
+MISC ChangeLog-2015 2635 SHA256 a7564701320834f2d40712d217a850d3a1191f9f3d2e1ce2583099d056ee41bd SHA512 c3f477111f68a99d86bdc497df25c56ad9b7f9013b78a976229b9a4ead982a9bb18279435c8f2cf94fd79b4e72ef8aaeb1b6ae82a41bc6e561c62246bdd6de32 WHIRLPOOL d756c83ddf1b53bf7593f1f56155462a62a2228dfad9fe21655f12daab6e09b7ed0e0e1eb2e2360e9b36d44762d71e178d2bfd9c1ef8701ef444e030e3e63043
+MISC metadata.xml 373 SHA256 69afc3321198c6b7781eb225e356124b73a62600c685f940a0d4f1a59b009a15 SHA512 9672aa38d9c5e31835bd0b7b1d3463f2e625ff71b4ee79d39b939cbae4df67241ba64f17cfa928aeb6fbcd0bc787c076dc078b56c92bcc1a46ea26f873472fc1 WHIRLPOOL 5b0e2890ca15e8d14eed0e6c5eed63b7bbf5b7b4ab05de5d326b911fccd45f065affc025969e36f2c1da241d51c7e159ded75c724bec3e45f51daff2a4587ceb
diff --git a/dev-python/mccabe/mccabe-0.2.1.ebuild b/dev-python/mccabe/mccabe-0.2.1.ebuild
new file mode 100644
index 000000000000..113112563276
--- /dev/null
+++ b/dev-python/mccabe/mccabe-0.2.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A plugin for flake8"
+HOMEPAGE="https://github.com/flintwork/mccabe"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/pep8-1.4.3[${PYTHON_USEDEP}]
+	dev-python/flake8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mccabe/mccabe-0.6.1.ebuild b/dev-python/mccabe/mccabe-0.6.1.ebuild
new file mode 100644
index 000000000000..0830488a6c01
--- /dev/null
+++ b/dev-python/mccabe/mccabe-0.6.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="flake8 plugin: McCabe complexity checker"
+HOMEPAGE="https://github.com/PyCQA/mccabe"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/mccabe/metadata.xml b/dev-python/mccabe/metadata.xml
new file mode 100644
index 000000000000..4e8535188806
--- /dev/null
+++ b/dev-python/mccabe/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">mccabe</remote-id>
+    <remote-id type="github">PyCQA/mccabe</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mecab-python/Manifest b/dev-python/mecab-python/Manifest
new file mode 100644
index 000000000000..ca10b253d1cc
--- /dev/null
+++ b/dev-python/mecab-python/Manifest
@@ -0,0 +1,6 @@
+AUX mecab-python-py3.diff 253 SHA256 0b2c7dc2f680283ed63e5170b8b65789f0453786dc9b4ec1c10cd2b837c8a72f SHA512 7937766e44c014149c64a3ad4226110f83868df330e5c0b22b65ce4624d3e6b710db972e18d446e535a76e0b0c763b2245d50280567e1ceebed15bd20c351695 WHIRLPOOL 4e6b46e9a1abe8a7cce162941586041d1ce2eef25823cd154d63d82e27e92b0b49a3288a935aca02fe33ae9db4e5a335573f3c9ad10227cdf7a029bfbef557f3
+DIST mecab-python-0.996.tar.gz 62338 SHA256 d305c30af9e781e70f7619a0b444ac1101f2faaf3922415a0d6c49da85a63511 SHA512 08954ed801419fd7f65d055244227364bc37b063f8d21babb6ceeb02ca40e0146fa4401d1426255f3656ac1a5e51439bde981414613153dca5972f624289447e WHIRLPOOL bae9a50996fa46bc0cf70b0d76c1d0377b84165a07d3ebeaa4a4731c6eafe8f3a952942c85e38bf6db0f1d56abfc6f85664e1cad5f5259dd2083ce28e08d8ca9
+EBUILD mecab-python-0.996.ebuild 545 SHA256 a62c903e6dd31655687a2e7d958fcfeb392423d7a8da4b42e74f24b7f0e64f19 SHA512 58c52b80c70c647e9a0c4063e2310c7131f6fe976939a96bece742e3d32d49ed652c9989b3c7a2d0817b23298d0faa70b893072f8ca858486956175b5813be0c WHIRLPOOL 36f557617d918c69a6846e4b0e981db05f8cd8df64d3fd4f983db252cf52762e6d17d11e7c8122e5e663b841d63a9d893c167bfb4e4f568db122a83d7fc0ebf3
+MISC ChangeLog 3321 SHA256 7ed56641221dd97524d6e1a545457d1957617c5b58b79c55f043afce486846ee SHA512 ca8e538109a5dd6185087946c1166f4fd519c421c3be68c3df9006d5ed1ed2631b7048ed1333c82542d289119cbc5a55e2491c6c3ecdd7b29d31d1100ecfd194 WHIRLPOOL 988b7d7baef013c3f23e6bf5acee79effdb3a9d737ed2bbe67b5ba32d330af57e3bed7234062e48b62efec388bb4818d3746a7a92294db522a0ec5ddd075e183
+MISC ChangeLog-2015 3812 SHA256 980f8a160d6df1f899ba0fda8ffe01a67e617691538e9f431bb921506f4e0c23 SHA512 308410ccf288e4c8ef75e8428baeec40c76587ee728517810e8af169a97945f7045afa93dbeb0e3c7afb1cc87d047c949394d60df0742dfb23c3c13deee1d4b5 WHIRLPOOL 8d57579a030cd2f6aca4e26b2efe1c540157d3acfcf6104ebd288aa4447c914c92753c99e33430db5da6033eb314aeed379fa2c7fe412689a9803a15ba68fb08
+MISC metadata.xml 359 SHA256 4d36587acbe08a40e836a607cae5579c49e166c1c4d043751f246aaad95a7b86 SHA512 26564a01d9ab28904670979d1961ab53dff53842e73ddb00f7d28f40c63ee0550daa6d48e44ea7e8a9ba04fe6852f61fae99612f111c0aef96d7422b21818c87 WHIRLPOOL ea914aa9d5286f4eeb42a9ab1af6aecfd2bba30ed74f497dd7ca5c3dc13852767044f1d04fece04ad3767a2e3625fbf20f886f08be1adc88dcf7ae23ec208ac7
diff --git a/dev-python/mecab-python/files/mecab-python-py3.diff b/dev-python/mecab-python/files/mecab-python-py3.diff
new file mode 100644
index 000000000000..33c8d97ebb2b
--- /dev/null
+++ b/dev-python/mecab-python/files/mecab-python-py3.diff
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -7,7 +7,7 @@
+     return os.popen(str).readlines()[0][:-1]
+ 
+ def cmd2(str):
+-    return string.split (cmd1(str))
++    return cmd1(str).split()
+ 
+ setup(name = "mecab-python",
+ 	version = cmd1("mecab-config --version"),
diff --git a/dev-python/mecab-python/mecab-python-0.996.ebuild b/dev-python/mecab-python/mecab-python-0.996.ebuild
new file mode 100644
index 000000000000..6e9a28c9f18a
--- /dev/null
+++ b/dev-python/mecab-python/mecab-python-0.996.ebuild
@@ -0,0 +1,23 @@
+# 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
+
+DESCRIPTION="Python binding for MeCab"
+HOMEPAGE="http://mecab.sourceforge.net/"
+SRC_URI="https://mecab.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc64 x86"
+IUSE=""
+
+DEPEND="~app-text/mecab-${PV}"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-py3.diff" )
+DOCS=( test.py )
+HTML_DOCS=( bindings.html )
diff --git a/dev-python/mecab-python/metadata.xml b/dev-python/mecab-python/metadata.xml
new file mode 100644
index 000000000000..367494a8fef2
--- /dev/null
+++ b/dev-python/mecab-python/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="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">mecab</remote-id>
+		<remote-id type="sourceforge">mecab</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/mechanize/Manifest b/dev-python/mechanize/Manifest
new file mode 100644
index 000000000000..bcd1c706195c
--- /dev/null
+++ b/dev-python/mechanize/Manifest
@@ -0,0 +1,5 @@
+DIST mechanize-0.2.5.tar.gz 383918 SHA256 2e67b20d107b30c00ad814891a095048c35d9d8cb9541801cebe85684cc84766 SHA512 23de1d9a5fba63d76fd577889594dacf5412fb2fccb58908a10ab350a81dd16a7a31019d0b4a59a5ed4115320c7e3585c77eef88dcd80a88a9c3c2da3c28fa68 WHIRLPOOL 14f8b9756adc3df8a3781b7b51568f36fc4cd0f35db62f537e2d1d1a0b8ea6dba08c7f2a1f0aad3fc089c3b973e4e62e5bbaaa91fe42f1017c883ff5b29ad0f0
+EBUILD mechanize-0.2.5-r1.ebuild 974 SHA256 356483d98d7b4950ba3fe1f6db5ee2e44c907b30db67de3f0f79fb0e18b3a3be SHA512 2f6484c9d3eb6c73ee201f0680c8af8d02bb7f60a90de6c4797efaabc941db8cb70c67397ca5d8754f300fab987fbed79545b47215515ba432ce29950802d91c WHIRLPOOL 972f6de836f32c1dbd2373522729040168abe37e29dd9dbb735eb41be096dffba471c333c8f7484b43f4c01db33871dd536ded792c1d7537f82aaff052d85964
+MISC ChangeLog 3972 SHA256 d7f7f28640797fc8c33be786d4c5d27b54881a3b7265a9a0b8e79e22b356cfa3 SHA512 b72a5dfea6cd57d9e9c2b83888f26fbba6df3e20e8c2a283c87e83c6c7ace8a978758575537c9ae1c59c89ac116da593928d322f947f3584d491cfa948fbfabc WHIRLPOOL 7a5be15011ece6a814ebc9c1a072f3956dc9a2c09526443ec33ad66a717b4ca46ce68fdfa2834b32fc1baeedff7d08fb5f12fd90a7e8d5560d5be12ebddd1ad1
+MISC ChangeLog-2015 6208 SHA256 4c359867a2e8e72fdd135a03153174a046389a6fdbcc020efb59359e3c9a377c SHA512 2523df749c4e4bd49f03412b6b3b2ce05f039f15a2889729d6bbd3cb0c6a8cdb5c918b87ce8dc920fe60e1b933a689d625a3c341323601075028f3fdb993f44e WHIRLPOOL c1a2f921aecc7483aa4f8b8b904d5bf1a32d736dafa587edcf7cb8475200884c338c245f4b76cc966de24ff7e27490c217b648ee88482f39086a0591cb4df59b
+MISC metadata.xml 959 SHA256 453a04cd6e91d22aa3b56517f78e24f5d4e0092b91bf1aefe46dbd7d44fd4b4c SHA512 37015b73d1166a75a206306eea97957f23cee6f558bafe54b18c99b7b70b966569a87e9d70466ed50393c1968aa1f7dd884cdf98bd401f274d1e6510d927afa8 WHIRLPOOL 0d0231fb86b0419fb11e66df9370cf325ebf6d49f626dd63ee9eb2a5debd458af89f38fdcaa9f578922ae67d75b924b20462e9e39d47cbdcfe7adf0880024179
diff --git a/dev-python/mechanize/mechanize-0.2.5-r1.ebuild b/dev-python/mechanize/mechanize-0.2.5-r1.ebuild
new file mode 100644
index 000000000000..4f730a62ff22
--- /dev/null
+++ b/dev-python/mechanize/mechanize-0.2.5-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Stateful programmatic web browsing in Python"
+HOMEPAGE="http://wwwsearch.sourceforge.net/mechanize/ https://pypi.python.org/pypi/mechanize"
+SRC_URI="http://wwwsearch.sourceforge.net/${PN}/src/${P}.tar.gz"
+
+LICENSE="|| ( BSD ZPL )"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	# Ignore warnings (https://github.com/jjlee/mechanize/issues/issue/13).
+	# https://github.com/jjlee/mechanize/issues/66
+	"${PYTHON}" -W ignore test.py
+}
+
+python_install_all() {
+	# Fix some paths.
+	sed -e "s:../styles/:styles/:g" -i docs/html/* || die "sed failed"
+	if use doc; then
+		dohtml -r docs/html/ docs/styles
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mechanize/metadata.xml b/dev-python/mechanize/metadata.xml
new file mode 100644
index 000000000000..cc33db8a685e
--- /dev/null
+++ b/dev-python/mechanize/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    mechanize is a Python module for static programmatic web browsing in
+    Python, after Andy Lester's Perl module WWW::Mechanize. With the Browser
+    subclass any url can be opened - not just http - and UserAgentBase
+    offers easy dynamic configuration of user-agent features like protocol,
+    cookie, redirection and robots.txt handling. Other functionalities
+    include easy HTML form filling using ClientForm interface, convenient
+    link parsing and following, browser history with .back() and .reload()
+    methods and automatic handling of HTTP-Equiv and Refresh.
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">wwwsearch</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/medusa/Manifest b/dev-python/medusa/Manifest
new file mode 100644
index 000000000000..09c2b26cd86c
--- /dev/null
+++ b/dev-python/medusa/Manifest
@@ -0,0 +1,5 @@
+DIST medusa-0.5.4.tar.gz 107744 SHA256 ab7fc4c9afd28b3aaf575aca5bb07005d228a0cad5b1787a521ffca63cfe4317 SHA512 9b28c13f633c87586b88388719afdc6c8f32cb0e25583e8c03f5bb0a0ef7c75a4fbad23f5b296bf84c8fa50d7d811fa62305f3fbe64d3764aa5d28228a31a43f WHIRLPOOL 84212d6cb2a9597e4c04634a45c4fafedf58ad81807337f4f34a2ae9c46e120b4437b56aa0baa62b0692de61b4319c5b8ae55d5e7cfb5ff0041fa9037f9c61e1
+EBUILD medusa-0.5.4-r1.ebuild 796 SHA256 94ea0a4afeac0fdb0b8d709a19ca107382c20f9ee701846974452a0ab2b9f7ab SHA512 2b245ed27da122c702d1738a173dfec4c61c86a51ec618ffa9554fbbe2f28731bd75e6cb9f4a148dee642e20c9e36a7b34c69a47ec810fc5786f9c86db9ae2a4 WHIRLPOOL 44fd9d0f12b74eaf546d1aae21da7a6b6bf821eb103f563d75359ad013364acb96ffd37bc50e35a942948b890ba6cd6883117af62a5329fed316168538a16624
+MISC ChangeLog 2577 SHA256 9ee31aac7cfa61aeca196f08d35b52033cc212a64a0f5730621183c1f413d397 SHA512 78b338185525da96f8d688d53ac982a5b8c6ad22edd269014654e78510e5328b4dcbab1401856af9d779e772159b4affff13bbb6a54edd36b16186c6e6ca31e2 WHIRLPOOL dfc311a482468b6d74f14db2e2f13d6fa7a6bffded3298eadb67e97fb67a36df51ae713287212706596c8fbd6d8053b0649aba9991b4ee27e3fb326c2e05bf59
+MISC ChangeLog-2015 5358 SHA256 4778bc2563bc52cb442aecf2ac6440baa9efe4ab6e3c90542d8e42d64ac4166b SHA512 0e0a324e8a7b2fe1a38c7ee6a16f04a5c056ed6dae02d737a15820084b010e705517e60dcfb5d5d65cc008194b283bd12321fa55c9f9d754bbeb4c85ea432aa7 WHIRLPOOL d73525e0fdd14245cd75441ad607b008b48ba8a883bd1fd4c083ed5732dd31ee82632af4023d7c4cc470dc12e080948b15a729f8b7d3067df8979fea4d91e2fc
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/medusa/medusa-0.5.4-r1.ebuild b/dev-python/medusa/medusa-0.5.4-r1.ebuild
new file mode 100644
index 000000000000..9c4e3064c721
--- /dev/null
+++ b/dev-python/medusa/medusa-0.5.4-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A framework for writing asynchronous long-running, high-performance network servers in Python"
+HOMEPAGE="http://www.amk.ca/python/code/medusa.html https://pypi.python.org/pypi/medusa"
+SRC_URI="http://www.amk.ca/files/python/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc CHANGES.txt docs/*.txt
+	dodir /usr/share/doc/${PF}/example
+	cp -r demo/* "${ED}usr/share/doc/${PF}/example"
+	dohtml docs/*.html docs/*.gif
+}
diff --git a/dev-python/medusa/metadata.xml b/dev-python/medusa/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/medusa/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/meld3/Manifest b/dev-python/meld3/Manifest
new file mode 100644
index 000000000000..0598c21b278a
--- /dev/null
+++ b/dev-python/meld3/Manifest
@@ -0,0 +1,5 @@
+DIST meld3-1.0.2.tar.gz 36478 SHA256 f7b754a0fde7a4429b2ebe49409db240b5699385a572501bb0d5627d299f9558 SHA512 54fe6def7169fb4e3469cad8be58e56984026f27b3b8b2bfd6d53e2296e0c2a5bfb3e67d032ef75edd93306f4115a091930a7aae3573acecd3fed4acd6eeb544 WHIRLPOOL b4191073e3419dc845ec0f618553c1d7871ad67ec9b49578b5c37bc6d3fe28513375c19509f75be16698cedbc224ecbb9516f10a68da43fad2f82741a67b55fd
+EBUILD meld3-1.0.2-r1.ebuild 501 SHA256 f057d5135ee2a63f36269b83e164fd7e01eb9b77208097afef79aa2aaa938390 SHA512 1ef3a4537fa96285e89771553a46191154cddea508e55539af6beec7ae680f1e2ac0261110a0f86d82ad2cbd4183a5eac3c7622a4c7a3a2202b89924deac77ed WHIRLPOOL 420008877201ab954760cebc8bebc284874e75850fc5a713ba507a2129a9811313a015fe717ba96c7965a80ec08237c98c10a421000f6e3640069755b3c41280
+MISC ChangeLog 3061 SHA256 a188e67cc26bb987fc052fd3502b547ccd2b2096ac15da63c1351cdbcd88173f SHA512 42e2441f9d5f4c2e46f8abf24121d6f3c0dd51e1d36b88c9ecc40faafc973e34671b7aba63e6983545e0c341dbd05d96b6b74c4cf6f9b16d96843c57ac2d7551 WHIRLPOOL b0d470ed708206dcd712ff169cb356002432c696a389d653d0bbd1a3536baf088f1e03ff4276d77d13b84594d9f1e1c5ba25fbe684dbf92d2afa3aee580a163d
+MISC ChangeLog-2015 3191 SHA256 a2f2e2f98fed70ab0c4f7b49b18bc0ca974319e4d53a3db167a3e7df120651ca SHA512 41d97f65b4d8a565305652e9156bdf7fd5c41a19e8b6bd8b9165ba485644aa542a68582078ceacb284fee35b7c9d5a36e59c9546f234df9c1fa64cfd3d007092 WHIRLPOOL 080aa12a7176840bd8ef2147ff5fba6cf28670a4780246cc4ef79f1612a9f2f2e26fb78dc40042c209b6c672ed879948aca12413f9ecb694ed59ba98803316df
+MISC metadata.xml 442 SHA256 9af2690d204dac300e117efcfe3ff0dfefab05d3a1980a76bc6f7d045efa6882 SHA512 9bef65de31cec735e1bb463f4ed8de286563cb428cbfb277fb34d99241558892d91b719d7719117b1bf882cd83044bf5a6ed234dda10bca43e0549fc14841dba WHIRLPOOL 2275f89adb10d79f78a673439b4339019a95fe09cf9b9153cc189e91395284748780772684590bb345d60d898de6c0d0ee1ca57cf2054dc7bda8c336c147bd31
diff --git a/dev-python/meld3/meld3-1.0.2-r1.ebuild b/dev-python/meld3/meld3-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..52b56384968f
--- /dev/null
+++ b/dev-python/meld3/meld3-1.0.2-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="meld3 is an HTML/XML templating engine"
+HOMEPAGE="https://github.com/supervisor/meld3 https://pypi.python.org/pypi/meld3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/meld3/metadata.xml b/dev-python/meld3/metadata.xml
new file mode 100644
index 000000000000..0fa59babf6c5
--- /dev/null
+++ b/dev-python/meld3/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">meld3</remote-id>
+    <remote-id type="github">Supervisor/meld3</remote-id>
+    <bugs-to>https://github.com/Supervisor/meld3/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mem_top/Manifest b/dev-python/mem_top/Manifest
new file mode 100644
index 000000000000..1b4a051ab0b7
--- /dev/null
+++ b/dev-python/mem_top/Manifest
@@ -0,0 +1,3 @@
+DIST mem_top-0.1.6.tar.gz 2520 SHA256 ba1b9013e2f3cbb06825db1aa6a8e29a14513fad8aade6bc813232bf78996b2c SHA512 0feb736c154fbe5e1b81bf12ca183b1dedf4ad5037388bfde5b32d2c077724af98b81e6c069075c606eda7121ed20e8b71c4c6039e0c558698db58e2d0a7a1c6 WHIRLPOOL d904bea931453dad56e7f939cc7164cac58e7806cd210939653f29c2fce5a0f0af7b6d1c67bc8c9e265d49022f1d46479497c3456ff476bffbc0ff4ea266491e
+EBUILD mem_top-0.1.6.ebuild 438 SHA256 3df735c5b84d5aab8da87d265e3de38b785e42a8ef07229c1aa797c92fc53fe7 SHA512 21db6c5910a027ddd85e60296e8b5709bfadc28fee3e8a86f25dc239ef490f24fe6804d50f67a844c7c3caf0e93816e787cbe73fa0b600b9bc54eeea498006ce WHIRLPOOL 24f6e52594249c78024ae734c8e674933cc173a9fbb18c8355025854c8da8d50d4957dddc848c34dfba54570da792c650fc3397c4956108fb1df849e307f9236
+MISC metadata.xml 349 SHA256 1632b5baaaf11f4cc45570992bd6b944a8edb2248123d7d12c770b04c136df6e SHA512 7695d89a8e220255089ca202257775d148d2293cf29d37045c0647536e38bd427253852c62ce8c6f5eedc9a007b0e60e78e7c309f0851593490dfbf825f0c0ef WHIRLPOOL e7b996e843fb5f7c1d647b028779d1cfc181e920034891fddbc99f27623fba0f2a312df55042922a6cf1997d963a94ee8a09d6a86c6a26c9f5df55bf26c2ad55
diff --git a/dev-python/mem_top/mem_top-0.1.6.ebuild b/dev-python/mem_top/mem_top-0.1.6.ebuild
new file mode 100644
index 000000000000..7ac0be346456
--- /dev/null
+++ b/dev-python/mem_top/mem_top-0.1.6.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Shows top suspects for memory leaks in your Python program"
+HOMEPAGE="https://github.com/denis-ryzhkov/${PN} https://pypi.python.org/pypi/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/mem_top/metadata.xml b/dev-python/mem_top/metadata.xml
new file mode 100644
index 000000000000..fd48f0ec3cd0
--- /dev/null
+++ b/dev-python/mem_top/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">mem_top</remote-id>
+		<remote-id type="github">denis-ryzhkov/mem_top</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/memory_profiler/Manifest b/dev-python/memory_profiler/Manifest
new file mode 100644
index 000000000000..bc53aefa475a
--- /dev/null
+++ b/dev-python/memory_profiler/Manifest
@@ -0,0 +1,4 @@
+DIST memory_profiler-0.43.tar.gz 31496 SHA256 ee2d4fb8f95b90d6faa511e46f4d117d4f17f7c62bb081f7266e9c98c23aeba4 SHA512 6c0bbece0b2a7da5504e878db3777ae86009ed3730a00527af457e4c216e7f5423feee79216bf28496374a2a597fd0cc2b267a312587ed01ac42f6ec3351eca6 WHIRLPOOL e0ac0eb1a99463fe295277768c4c97f23e7bd70f34e9d8a32b115247baa4c51b3c639e86ae24e77602aa97a648d026b36afd1c35dfda63bd7e7759bf5aeddcea
+EBUILD memory_profiler-0.43.ebuild 1237 SHA256 37210e6956eafdc5569a31c7e9cc5d29196fdf6e118df2d4d485dd6d757d1da7 SHA512 491670ae51e9516440f1acc559dc3b9ceb1af97607af09c0dae57a3954c766a5f94b88c0724f6c3ab0412c3f289ce1ee2be7688b33e5adb9ebf8dcf0a17c0d5b WHIRLPOOL c6c62c537503b3601df386f4545ee046ddaa3d4f4d141291194d8f8667036eea1c478cfd5894273fea65607db82bac7d04e101cbff47479e8a580e45e532945c
+MISC ChangeLog 2147 SHA256 4046ccc95cc3a76a996b16bfab1ebfd8c0d941ae5a45bc707f908656ce3ad6c6 SHA512 db95d57e338664d7049e3f80b000af72624c6539898291ad0dad38522734d07d75bc2bc2807c111255b9edb7d3af1f4a631ce4e825c855791327017443c5aa6b WHIRLPOOL ace7f3816f1a2236d80592cfe993a21ad58a68772ff00debc56e851da7ff0197b30ce8408f17f1d8c645ce013bed50cc4581efefa3a8ea3945ec2f5d8b9c705b
+MISC metadata.xml 514 SHA256 4c47574a29b9890d139a148204df5ff72096441c205af77d5a5f96df68f71883 SHA512 cedc4d8914ad8cf10c8981935089220967957ff50eecfd867376974055d4922df91357a2f2135ce3cf5f56a27c5111005ae53429e685f0ee080e031bb2a3e943 WHIRLPOOL 0acfb21589da8b120fdb8ece38bc070dfa10fa22dafea840b772745e334d15e3258ba5f50ca0e5b60958d0da708b973cc37f12fec194cf6dfbf32895c513eac0
diff --git a/dev-python/memory_profiler/memory_profiler-0.43.ebuild b/dev-python/memory_profiler/memory_profiler-0.43.ebuild
new file mode 100644
index 000000000000..3c9eee9a0e51
--- /dev/null
+++ b/dev-python/memory_profiler/memory_profiler-0.43.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A module for monitoring memory usage of a python program"
+HOMEPAGE="http://pypi.python.org/pypi/memory_profiler https://github.com/fabianp/memory_profiler"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	${EPYTHON} -m memory_profiler test/test_func.py || die
+	${EPYTHON} -m memory_profiler test/test_loop.py || die
+	${EPYTHON} -m memory_profiler test/test_as.py || die
+	${EPYTHON} -m memory_profiler test/test_global.py || die
+	${EPYTHON} -m memory_profiler test/test_precision_command_line.py || die
+	${EPYTHON} -m memory_profiler test/test_gen.py || die
+	if python_is_python3; then
+		${EPYTHON} -m memory_profiler test/test_unicode.py || die
+	fi
+	${PYTHON} test/test_tracemalloc.py || die
+	${EPYTHON} test/test_import.py || die
+	${EPYTHON} test/test_memory_usage.py || die
+	${EPYTHON} test/test_precision_import.py || die
+}
diff --git a/dev-python/memory_profiler/metadata.xml b/dev-python/memory_profiler/metadata.xml
new file mode 100644
index 000000000000..73a90c01eacf
--- /dev/null
+++ b/dev-python/memory_profiler/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">memory_profiler</remote-id>
+    <maintainer status="unknown">
+      <email>f@bianp.net</email>
+      <name>Fabian Pedregosa</name>
+    </maintainer>
+    <remote-id type="github">fabianp/memory_profiler</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mergedict/Manifest b/dev-python/mergedict/Manifest
new file mode 100644
index 000000000000..1cf257a390b7
--- /dev/null
+++ b/dev-python/mergedict/Manifest
@@ -0,0 +1,5 @@
+DIST mergedict-0.2.0.tar.gz 3554 SHA256 67c972c30087072f02cbf5052ee6e6cd87eba26c193bc698b71b58b32b141369 SHA512 5d867944865881731a854526ad17c178be44854e040ba47ccf493ba1e8bd627346da07fd55c066a5497d806c5537c8627c8e903883e35ac86a05661fd3248f3a WHIRLPOOL 4d033795a504406fc0bd3f33c3353898bee46a44cba1d1b1cd2e3485fdcb69e5904f4dc43e1d3520c3ef85954863bf1325d09e031c2716802e3b00ac74b1680d
+EBUILD mergedict-0.2.0.ebuild 505 SHA256 26f65cfc652a6ad27838df685f4917e38d53c4eec96a5ac03bbc306d7a74369c SHA512 08c59cabcf744a42c64d8a8af0c7745574885261254e2edd82924dae8e79f92ba7e49c3ec926baf83e21beca4d5630921c44f00a5deacddf105d0e99fef9b166 WHIRLPOOL f39b696ffb34766009be5488391366d839011ff16475fd2da951844eb6f684965a989b20608358db69c6cfea9ef01f6160b7f5c8d7a9529e30a91089991083d7
+MISC ChangeLog 2765 SHA256 ffe55809f647bbfd0dc2904852009d2e0c55c351cc17da524ada4e2b88e8d20f SHA512 225cfe60290694509242994a1d14908eede3f708be72acca7505a93e8afda7721d39e820ab358a8ae74cdfbb03bb91abe2eee00a18a0337932241ef89743da30 WHIRLPOOL ebd632f5474659a4f32294006c7c9888647939dc20700d702e1ddf3407cf50932b571c729c78d155fa34a1d9eb110584ea018d85cdf31ba850ca2a9b97aef999
+MISC ChangeLog-2015 394 SHA256 ad3aadfcf9280c484a5590fffa3d17347091575c82e5d19088a75ae86605f5f8 SHA512 48bc4e39d4c722b66167fb557ff0bd72c9c0024fc04e75630f0ddf0f59dbf5bc4fcc4bbe42a664c9a0c6810dab891da29fca11ea988e4b4104ec9cb28605c181 WHIRLPOOL 3169751c81f7e422820b1b8cf333ac643c69da0282641dc3fb2b7487f5f3a374eb17d7e78a117b7da390c08b74c2deaa63bb0e7bcb1adc93ac46eb5cef3290e0
+MISC metadata.xml 375 SHA256 a5aa7921c7c4361bcb7c0d163f94e32d7a34e93f3119582e36f2f48d7cefc35a SHA512 544ef98dfb5099a4cb1eb42b0be0692a02d7e965b4f1ded19fb87acd1b9f1dcbfe605c1a73710dd3daa2a53949d58a7e3b5dd45e7e5a6eace0349446220a8b9e WHIRLPOOL b3949d949d86714d25a1464f88c4f221d80e27ed651dec8ce92b03e78425e41accd6aeebb7513207f0200d6222a56b49cfd2165ba658d9b76db4188b3145f8b9
diff --git a/dev-python/mergedict/mergedict-0.2.0.ebuild b/dev-python/mergedict/mergedict-0.2.0.ebuild
new file mode 100644
index 000000000000..11087194f18c
--- /dev/null
+++ b/dev-python/mergedict/mergedict-0.2.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python 'dict' with a merge() method"
+HOMEPAGE="https://github.com/schettino72/mergedict/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="virtual/python-singledispatch[${PYTHON_USEDEP}]"
diff --git a/dev-python/mergedict/metadata.xml b/dev-python/mergedict/metadata.xml
new file mode 100644
index 000000000000..2d670bdf583d
--- /dev/null
+++ b/dev-python/mergedict/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">configclass</remote-id>
+		<remote-id type="github">schettino72/mergedict</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/metadata.xml b/dev-python/metadata.xml
new file mode 100644
index 000000000000..ed6a813dd009
--- /dev/null
+++ b/dev-python/metadata.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The dev-python category contains libraries, utilities or
+		bindings written in or for the Python programming language. 
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie dev-python enthält Bibliotheken und Werkzeuge für die
+		Programmiersprache Python.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría dev-python contiene librerias y utilidades referentes al
+		lenguaje de programación Python.
+	</longdescription>
+	<longdescription lang="ja">
+		dev-pythonカテゴリー��Pythonプログラミング言語�記述�れ�/����
+		記述�れ�ライブラリー�>ユーティリティ��インディング���れ��。
+	</longdescription>
+	<longdescription lang="nl">
+		De dev-python categorie bevat bibliotheken en hulpmiddelen voor het 
+		gebruik	van de programmeertaal Python.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm dev-python chứa các thư viện và tiện ích liên quan
+		đến ngôn ngữ lập trình Python.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria dev-python contiene librerie ed utilità per il linguaggio
+		di programmazione Python.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria dev-python contém bibliotecas, utilitários e
+		bindings escritos em ou para a linguagem de programação Python.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria dev-python zawiera biblioteki, narzędzia i powiązania
+		(bindings) napisane w lub stworzone do pisania w języku programowania
+		Python.
+	</longdescription>
+</catmetadata>
+
diff --git a/dev-python/metakernel/Manifest b/dev-python/metakernel/Manifest
new file mode 100644
index 000000000000..5645d0b02d5f
--- /dev/null
+++ b/dev-python/metakernel/Manifest
@@ -0,0 +1,3 @@
+DIST metakernel-0.20.4.tar.gz 67895 SHA256 ec437d01f76dd0d6eb6cf887590726e364a3a1811c018d1793102bb384275300 SHA512 8ab2943a93e61bfca276607adac5e619c407a2356656424d261eb520002bf582469f71329a3b2b2fcc290b21a4dffd724f5b73697c6853b5cb74eec07e26ede3 WHIRLPOOL bbcca2583be251fb695d4e0f4f8b7e741e5ec52c28c4726efa784ac6f4fa862332d698a03a9b168492ef9fe0cb98b45d240a8763c888ddfcafd2057cda9d8ab8
+EBUILD metakernel-0.20.4.ebuild 639 SHA256 c8b81cb3b796b3c706d61e6521070ddb99dd641ba7b349e1125da0061fe3dd41 SHA512 c95bab20ed42f8763880db8226d2c98264a63c67d46c877d4a95cdc11c4c5d79ad88ab5d1bbcc0c4f2b6b70498e956592508252707dde92069b59d583d218df0 WHIRLPOOL 7cde90875df3e8e4eef67cec94e60ec2859e15ce7ca0ebdc86dc7aabe41bc7330a6e8df5ea606a03e9d2eb8ecc3ae085c2ee6f8841c8bb0281af9dfa62ef7db3
+MISC metadata.xml 634 SHA256 24e6b1dd8adb17b49a3987d7773a8a775ac93cc8bcbcd0393e05bfe357aa8921 SHA512 b4a566da04b0f87e979b4556d3fbe76d3716ef96b6b9e5222fb942b0d622d9acb98274b935cb2fdbbf01baa111df351e2dc3988ce494c1bb4b17a18f2115c7ad WHIRLPOOL a88103f4b95b36f20a1a17767325c99ecfdb34c12eb2d7f46efc324cd22d1ac099a77d5bf103e47f0128f56dcfd903dfeef6c9e350877d46a14354265219d36b
diff --git a/dev-python/metakernel/metadata.xml b/dev-python/metakernel/metadata.xml
new file mode 100644
index 000000000000..e0c68c929e2b
--- /dev/null
+++ b/dev-python/metakernel/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    A Jupyter/IPython kernel template which includes core magic
+    functions (including help, command and file path completion,
+    parallel and distributed processing, downloads, and much more).
+  </longdescription>
+  <upstream>
+    <remote-id type="github">Calysto/metakernel</remote-id>
+    <remote-id type="pypi">metakernel</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/metakernel/metakernel-0.20.4.ebuild b/dev-python/metakernel/metakernel-0.20.4.ebuild
new file mode 100644
index 000000000000..b5db58babd4c
--- /dev/null
+++ b/dev-python/metakernel/metakernel-0.20.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Metakernel for Jupyter"
+HOMEPAGE="https://github.com/Calysto/metakernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (	dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	nosetests -v || die
+}
diff --git a/dev-python/meteor-ejson/Manifest b/dev-python/meteor-ejson/Manifest
new file mode 100644
index 000000000000..c678fad20b55
--- /dev/null
+++ b/dev-python/meteor-ejson/Manifest
@@ -0,0 +1,4 @@
+DIST meteor-ejson-1.1.0.tar.gz 2292 SHA256 17c10d00ae4ed4ab8daf3b1e18f1bbe46803058cb6ff81d9d5a73ae6b565224a SHA512 eb211d262f0006f3229296b71320f68b59d8a7e618e65baa8e613f874a0e6ac9cfe45e30fc73ba57c42129204c5f27a32c4b8b579527fcefd601fa1dc2844da3 WHIRLPOOL 7338c6587ed7f43383fb53ee0d63020a545138e51fd47b4eaaa44ac4ceb771628cad0480060a1cee4833e06814a0e2acefd88bf5fe28f288d7ab32eca5ea2017
+EBUILD meteor-ejson-1.1.0.ebuild 619 SHA256 c4464c4341b8ee5e2248b39d5660518e148a2dabb565c686ea66dac88ffc7e87 SHA512 b96298191946c0e0166e65dd0550dc9231e9682abe1e80326dbbc15504bae0938fba4ee484571d103d5c9e6da20d35e8c8763023e9c760b8b9d88efe9052c2c8 WHIRLPOOL f23c14bed8231bba14d5c98b79f59ef1c815e96e0af7529ebfd994bca3328377372ed163bd3defb15e2bdbd4c28c82955db51fcb5ee7bee8c7636929359d8370
+MISC ChangeLog 1166 SHA256 bd5aa3b3de7259243af4b29e07c78f58c3638a485dd983231db9b55360f3fba6 SHA512 2e41d47f8d93623d24b78c1138d19f2304bd82932f9a03ebaad30e1699cdb142ae9e7dfa392338b622ee9c14ad5f8f68ef72d855aed160592e9e06d646c5e7b8 WHIRLPOOL 9d02558fa5fc19510260f740a76380db5ffb26c61655ea23deaa2d90f7453310af03722bd4994b770b40b01f8bfb72aac2c136ab7e31145001d47574109dd184
+MISC metadata.xml 592 SHA256 708c12226e18169312fe5ced62c108d6b6d8f0d3deda55b07055b7bd64d50c6e SHA512 9244b588bb294281d3542c6b868359369ee2ea1aabaa1765c2b768b8add49213bd705075082168ebec080619ca481650f7546fe6e1c9ffa68f08e2aef66cc936 WHIRLPOOL c80727eb0b1fc009f15e7014035378e072446c0435d09edb51ed08b36a11333a6716593ce5fea5d500a0cca3475a4144bb220db8b4fb71d80efce8ceb96e0fe8
diff --git a/dev-python/meteor-ejson/metadata.xml b/dev-python/meteor-ejson/metadata.xml
new file mode 100644
index 000000000000..6ded22bf29f4
--- /dev/null
+++ b/dev-python/meteor-ejson/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+    <description>Python team can take the package if they wish.</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">meteor-ejson</remote-id>
+    <remote-id type="github">lyschoening/meteor-ejson-python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild b/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild
new file mode 100644
index 000000000000..ee378091c7e4
--- /dev/null
+++ b/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Encoder and Decoder for Extended JSON (EJSON) as used in Meteor and DDP"
+HOMEPAGE="https://pypi.python.org/pypi/meteor-ejson https://github.com/lyschoening/meteor-ejson-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/micawber/Manifest b/dev-python/micawber/Manifest
new file mode 100644
index 000000000000..5092d0255af3
--- /dev/null
+++ b/dev-python/micawber/Manifest
@@ -0,0 +1,6 @@
+AUX micawber-0.3.2-remove-examples-from-setup.py.patch 652 SHA256 7b44192bd58214ff56187a0baa1770ce5d210e5989cec4fd56d00a4c805fe73d SHA512 225bfd7c7306170c7c6d0b564c84092b015ac078ac597764c0029613209851e157ae5bfa2e910a5368f540e68c5a01aa44df78511dba753c6d875b8eb144cda5 WHIRLPOOL c5cfb46f6dd370e552beb6660e09f92ccf48eb6d6f67fc95076639f17567fdeaa565cabae95179572b591f5581d56d053e9bf9099400f381121fcd55762b98ee
+DIST micawber-0.3.3.tar.gz 32200 SHA256 361be2c2cfbfeadad31354e512abf211128156ddcb3bae76672794964d6a6fb7 SHA512 15f5e3f85e6d3bf44e6a4a3ae975872acb2e9093e15b56a5a3b24573332c811955c84f0ee69d327334b22fa61b29a51ce14657fc7bf2f486268145965c159bc0 WHIRLPOOL c50feda990c17211f7abb65f8e66af35b44d51b13793710c9adde015e463dfa567f21835efa02f2b0a80669dedcc81fba0a70624591fd16309d6c5050a77b28b
+EBUILD micawber-0.3.3.ebuild 663 SHA256 67675576c718887db17b7aa1686a43d6d25934b39f569af01846de6522beba9a SHA512 6e3ff5f4e96cbed9dd2bf6eb923cf56767a38e0338174ef2dda7dfcfd303418e14ffd2dded2271215e73c6daf575f1afcc25a65210cec662054ce8e1ed629e2a WHIRLPOOL 210370a5c685fce6269d28d0096abfcc12566f3f9bce3ab5948a374990dcd725316c95779e36c050d6c70f9aeb4bfae6a62c0338dce6c31a95a232db8d409c7c
+MISC ChangeLog 2701 SHA256 891a14a934b97ccfe3eb141297cce3204043c6bfdd757f63d652ef7c6cf63f2c SHA512 54328204512ad4edba6e4e9dc744da9d95e7ba420c71fc0b976d3f91bbca901c2192a3443b7b986500dcbd4dd3785bd1591dde3c961da514fbd8d65ce9aea031 WHIRLPOOL bc129da5150f7882839bae689ea9216a41814b184d731cb65a2f51e1c8ae2751e07ce9856cede4e939036a99092294ac81c72444e217afb206376a95a7f98d58
+MISC ChangeLog-2015 755 SHA256 15eab8c8c3b0c224722b48bc8d58641939f4c5fa4e6d1070ddcc560b2e1298c8 SHA512 336ae007e41ad78d288607261af087433281e1622e750be965ef0289a95a9df35109fe862d62760e4cf76101787ef25fb875454c431ecf52da149f9e8e71f543 WHIRLPOOL c9e4cb9618398f31be7c2359eb67609049fc0e4c5e157b2c8812cfd15cb4c894c0225dee8df67f6c8a6dcef279840a9db91ba05d367c873f600296fd0fa3e770
+MISC metadata.xml 332 SHA256 4de25fd9a888305324495fdacf6835fdfb87e38b2528117aafd9d1e9a2dc9426 SHA512 9815d1b8eec3bf22a430737bc5a7dfc9e576f0f5ca79ca318a419dd911af378f94b63a6d457cba32bbf4e4939cea3690bad4e6be918ed79324f06f7eef42aaa0 WHIRLPOOL a160cfbf69c8de31c8c45d4bbe66f784ef98e916999c5964cdd9a1a85aaa8c43fac1a03b86f790e96aa657b00470c68a14a626a3500ea1c7733c029d8f64b4a0
diff --git a/dev-python/micawber/files/micawber-0.3.2-remove-examples-from-setup.py.patch b/dev-python/micawber/files/micawber-0.3.2-remove-examples-from-setup.py.patch
new file mode 100644
index 000000000000..3d031e8a91cd
--- /dev/null
+++ b/dev-python/micawber/files/micawber-0.3.2-remove-examples-from-setup.py.patch
@@ -0,0 +1,20 @@
+--- micawber-0.3.2.orig/setup.py	2015-03-30 02:08:40.000000000 +0800
++++ micawber-0.3.2/setup.py	2015-07-20 14:53:42.776972042 +0800
+@@ -13,16 +13,11 @@
+     author='Charles Leifer',
+     author_email='coleifer@gmail.com',
+     url='http://github.com/coleifer/micawber/',
+-    packages=find_packages(),
++    packages=['micawber'],
+     package_data = {
+         'micawber': [
+             'contrib/mcdjango/templates/micawber/*.html',
+         ],
+-        'examples': [
+-            #'requirements.txt',
+-            '*/static/*.css',
+-            '*/templates/*.html',
+-        ],
+     },
+     classifiers=[
+         'Development Status :: 4 - Beta',
diff --git a/dev-python/micawber/metadata.xml b/dev-python/micawber/metadata.xml
new file mode 100644
index 000000000000..740d13d52312
--- /dev/null
+++ b/dev-python/micawber/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">coleifer/micawber</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/micawber/micawber-0.3.3.ebuild b/dev-python/micawber/micawber-0.3.3.ebuild
new file mode 100644
index 000000000000..2b0beae68490
--- /dev/null
+++ b/dev-python/micawber/micawber-0.3.3.ebuild
@@ -0,0 +1,25 @@
+# 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
+
+DESCRIPTION="A small library for extracting rich content from urls"
+HOMEPAGE="https://github.com/coleifer/micawber/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+EXAMPLES=( examples/ )
+PATCHES=( "${FILESDIR}"/${PN}-0.3.2-remove-examples-from-setup.py.patch ) #555250
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc -r docs
+}
diff --git a/dev-python/microversion-parse/Manifest b/dev-python/microversion-parse/Manifest
new file mode 100644
index 000000000000..1b8fe03db6e9
--- /dev/null
+++ b/dev-python/microversion-parse/Manifest
@@ -0,0 +1,4 @@
+DIST microversion_parse-0.1.4.tar.gz 12795 SHA256 040558958b5a9db618b55c326c5cb15a59e21ae7a2754c7017ffc85015b2db7c SHA512 06d7063370cc55b6c41f2d9cae33caf5cce501694d4271d0ae586cb5a468cc2e6361f93906f18405a0f99a59f442cda1b56bd565069d6dbf2bbc409942ea189f WHIRLPOOL 22d6b34f674d7b04e20571607ecda50913b50c77b42d2216e790cde6c45d3edd33dfaccd8e535dc45d44baf51d3f1fdd7d89835629ffcbb820b860bbd1b81f47
+EBUILD microversion-parse-0.1.4.ebuild 663 SHA256 cbb979c9c1048adf245900d91fc7b91f46ba0808b2d2a9c5eb3d5b40d08dd953 SHA512 8d8de8637751f1b2823467c7b7e45572064ba592a3e432c151eefdecd656192551192863e4800335772d90373e2c978e864a02ddc7f2ca26e48b236849ad5cca WHIRLPOOL 680864bd45c913c7b498b4ecef9fa63bca7b9b29a32b6af337b2559f6868ba3a4c90ff5faf42ceb57a82fd6bf1f4b0d3f1c8f46e3bf7964f810ce9d80aef949b
+MISC ChangeLog 507 SHA256 68715c8082cc1530389af5a57ffd9b02b590b29ee14907607a9a24933edc6bd2 SHA512 6f35b7ff99cd2a0d784f809ad9a611afaa0398b364f6b9060256a33ec0cfd50909a6c4cb685c82ebe6d43edd2ceb4d5c5f3e93f188f0da93f6882fe7b585846d WHIRLPOOL 66ff6f62d86555100023134ea3a57cc32cc3064fe237a8b6d4f9ff03013add927684812fcfbff7dc5ef57a2d44e661e2c90455e9d4d9f6f76b978292ad4e7cc0
+MISC metadata.xml 633 SHA256 2214ab4fa8358baf9b771413cdf506a968e2c44c30c994e907fb3b0e3e8f3556 SHA512 aa6528e994ea07a8dc434b5cbc07f84e046e19f97107b964d8ea9fe4413be08beb801bee29db3b5fab382b3b934fb0723dee0301ffa31f61b93123c2830f4886 WHIRLPOOL 76c2fc889309d92d4707c1836cf579047ea8f1363f7b769cd7b0b35e3e8cb288f7b3569b781b3de02f9f5518869c7c254ecefac213c0a7fa72449d5ce90d4b62
diff --git a/dev-python/microversion-parse/metadata.xml b/dev-python/microversion-parse/metadata.xml
new file mode 100644
index 000000000000..5ee8fe90cbf5
--- /dev/null
+++ b/dev-python/microversion-parse/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+		A simple parser for OpenStack microversion headers.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">microversion_parse</remote-id>
+    <remote-id type="github">openstack/microversion-parse</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/microversion-parse/microversion-parse-0.1.4.ebuild b/dev-python/microversion-parse/microversion-parse-0.1.4.ebuild
new file mode 100644
index 000000000000..7061a4fcb9ed
--- /dev/null
+++ b/dev-python/microversion-parse/microversion-parse-0.1.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple parser for OpenStack microversion headers"
+HOMEPAGE="https://github.com/openstack/microversion-parse"
+SRC_URI="mirror://pypi/${PN:0:1}/microversion_parse/microversion_parse-${PV}.tar.gz"
+S="${WORKDIR}/microversion_parse-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+"
diff --git a/dev-python/milk/Manifest b/dev-python/milk/Manifest
new file mode 100644
index 000000000000..42c65f257bb8
--- /dev/null
+++ b/dev-python/milk/Manifest
@@ -0,0 +1,9 @@
+DIST milk-0.5.1.tar.gz 623685 SHA256 f7fedd0f50967130bc0ddd6c1ce99a644305855d1d2d3c5d6d36b103bb749d37 SHA512 3ac6811f4c15b65de87cae0089ce3fd8372d4b349ea9b7e49db581dcd29e27baf6e33ddca9c6d96e832ebe499e9032de253da532d3241fbbaa4ac124d97a8386 WHIRLPOOL 096fee2ab0f5676c1bec9b3876f43a1d12eab215c5931bb2306d77d466924b7f0d3ac3fb026265cbed0123dec2f6eb15f917be060e7ddd5bc677a2c93a7da0da
+DIST milk-0.5.3.tar.gz 620091 SHA256 d98e0c142ab27fe96eb44bd3aefe774984530de82595ac996a61834e05111de9 SHA512 4b685f682229194d03fc9e6031d5e40890aac793ae87bf7c010f866c032ec53205c281ead7db654f1e4bef30a4e68ef325b560b78fe1b0db00344392d60ef4e4 WHIRLPOOL 82260fcd72ea081d30317b0fc066c4fe38f9c3dea253aff4691ada2281fde28f54b020b217174ad1bfc65472b7bd387f2ba382220f019ef339c30ed6ba854867
+DIST milk-0.6.1.tar.gz 628357 SHA256 47041ab5d1795907c092b4802e8b5a20620f32690d7b2f50d8c7817c38e3d304 SHA512 54a94bc1bf760320b53b2f65396e117bdccd0d4d5e6bdb4684b68d96f3cb3beaf3cc9b285d3ba91b1f97ba335750591c1fb2d2115468ec617dbd1cc65fed9f8f WHIRLPOOL 835a01c0685124099786bab06b6444c4e0c038a55669590f4272d10c0c46b98c4122d6677ec29edebf91c4af77eef36abd5f08dba12034aed9ac1c3a648dfa50
+EBUILD milk-0.5.1.ebuild 537 SHA256 537c676d421d607dcc40c8bdd20f92b9e4916f5a5aa651d1ed2884cea3f9f50d SHA512 96e27b740b2804ead27641a82c80156b23cda409376ab637b5bd4c280a2459eb4bba8629bc9c685e59b2f3c9a9844b4139c96bb7856cf88c092564ed1e1f7a36 WHIRLPOOL d264e94a8f9d61f8937116a56c0f2943f795e2d12960eaf837538a0fdc384d09d14078f8af1d5a3628ee0c44bbc6ee13dfd2be76c949b9c5f3e9eac23052ca2d
+EBUILD milk-0.5.3.ebuild 573 SHA256 23dfeae972a07068973610e30d5a693c7b843747cf569436d227607cf06313e9 SHA512 acfdba9177cf09fdb1d29ab6c9b4c41b8913e5e0e1aee6eb2731fdc3cbaa0754ee3181d1817a9c5fa58db95038e6a7a3f422643297bcd417e55b0601a9928d15 WHIRLPOOL 48d79c50b7a3c1333655e607855943a24d2b6276930124f63f4455926723c7be9a080a1f639348d9a417ec8c864854f35b6c92808f004dc8f86557e9a786d973
+EBUILD milk-0.6.1.ebuild 573 SHA256 23dfeae972a07068973610e30d5a693c7b843747cf569436d227607cf06313e9 SHA512 acfdba9177cf09fdb1d29ab6c9b4c41b8913e5e0e1aee6eb2731fdc3cbaa0754ee3181d1817a9c5fa58db95038e6a7a3f422643297bcd417e55b0601a9928d15 WHIRLPOOL 48d79c50b7a3c1333655e607855943a24d2b6276930124f63f4455926723c7be9a080a1f639348d9a417ec8c864854f35b6c92808f004dc8f86557e9a786d973
+MISC ChangeLog 2512 SHA256 9231a3b319ba4b4095e7580d8817a704092751bb15f6b496e01aa59a4801dc99 SHA512 708c24aebe9c8f5e18684ae59661c29a900242385b7ad21b89409bc5aff5188b82b392c29298c58f60bf405b2a4d04c4458b4602a930ea1524efb216edb1fe30 WHIRLPOOL cc32370d50541816e3e825b85383c4a685e2e9d74d690afa342c3f03e702742e02b815813a6b3e060f102c65eab5eb2b03f199dbb4e84c9026813b8a7be325f9
+MISC ChangeLog-2015 1901 SHA256 59b2b89c285591d35967cff66ec1d94376d2a8d19c51d2b355c57d9ca559d0e5 SHA512 91a96bdc6f1bdf176cffa7ed48014c2c1f972a3342ef1f6f28d13a85d4dd31d37826b23f01f2e8bb83c888edac928e9726428fd17160a06747471d8ff5762e60 WHIRLPOOL 91ea361b100cc73917df17cc597d927029f6fc25e3b300d71cb26f3dafaa5e258fc86c10abe02cced4245cae2a168c7b4a5e10da9fea117f0b6f8a6ddf1e56f6
+MISC metadata.xml 1152 SHA256 1583ed00b960b5e44ae9d5493b15fb078906341718315ff792ba84e739d5bd23 SHA512 c4d9d5d7774abd15d165107798995a5fe4de13ba96342fbc1c8987876df7133846ca94383942812945e6bea62c9bf8f34073bf264842e58a3e70d181273c640f WHIRLPOOL f8a3bdd0e67a2b7cdc47e10926b6cd35724d1b4864244723e632dfc894bd0efd259a6e5da18f7ce034f4ca2ce663ffc9ff5df970dbddb8b5b075ec140032148a
diff --git a/dev-python/milk/metadata.xml b/dev-python/milk/metadata.xml
new file mode 100644
index 000000000000..320bb4cda904
--- /dev/null
+++ b/dev-python/milk/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
+<longdescription lang="en">
+  Milk is a machine learning toolkit in Python.
+  Its focus is on supervised classification with several classifiers
+  available: SVMs (based on libsvm), k-NN, random forests, decision
+  trees. It also performs feature selection. These classifiers can be
+  combined in many ways to form different classification systems.
+  For unsupervised learning, milk supports k-means clustering and
+  affinity propagation.
+  Milk is flexible about its inputs. It optimised for numpy arrays, but
+  can often handle anything (for example, for SVMs, you can use any
+  dataype and any kernel and it does the right thing).  
+  There is a strong emphasis on speed and low memory usage. Therefore,
+  most of the performance sensitive code is in C++. This is behind
+  Python-based interfaces for convenience.
+</longdescription>
+<upstream>
+  <remote-id type="pypi">milk</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/milk/milk-0.5.1.ebuild b/dev-python/milk/milk-0.5.1.ebuild
new file mode 100644
index 000000000000..9ad5774bc8f9
--- /dev/null
+++ b/dev-python/milk/milk-0.5.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Machine learning toolkit in Python"
+HOMEPAGE="http://luispedro.org/software/milk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/numpy"
+DEPEND="dev-python/setuptools
+	dev-cpp/eigen:3
+	test? ( dev-python/milksets sci-libs/scipy[${PYTHON_USEDEP}] )"
diff --git a/dev-python/milk/milk-0.5.3.ebuild b/dev-python/milk/milk-0.5.3.ebuild
new file mode 100644
index 000000000000..3a6fd0fc243d
--- /dev/null
+++ b/dev-python/milk/milk-0.5.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Machine learning toolkit in Python"
+HOMEPAGE="http://luispedro.org/software/milk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-cpp/eigen:3
+	test? ( dev-python/milksets sci-libs/scipy[${PYTHON_USEDEP}] )"
diff --git a/dev-python/milk/milk-0.6.1.ebuild b/dev-python/milk/milk-0.6.1.ebuild
new file mode 100644
index 000000000000..3a6fd0fc243d
--- /dev/null
+++ b/dev-python/milk/milk-0.6.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Machine learning toolkit in Python"
+HOMEPAGE="http://luispedro.org/software/milk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-cpp/eigen:3
+	test? ( dev-python/milksets sci-libs/scipy[${PYTHON_USEDEP}] )"
diff --git a/dev-python/milksets/Manifest b/dev-python/milksets/Manifest
new file mode 100644
index 000000000000..b1c947b31990
--- /dev/null
+++ b/dev-python/milksets/Manifest
@@ -0,0 +1,5 @@
+DIST milksets-0.1.3.tar.gz 10438190 SHA256 90fa729a6993ba856e3fe3d02e2a0b08172a91599f122bf17e1b2d48d99ef7b5 SHA512 45ea6b14dc5e15c8797a42483fdbf3f5b8794f68a378b070f39e3117ff98fad810bb9b200f569061f8e65337380d908e32284c8563e74939b5b2cc202f2103d8 WHIRLPOOL 35dd68e09b1c1624f976345a1acf4c39ff28e14a342dec9cb7d64ab275fc3978079ee6200cd3f26bd0aa9d1f7a6dd04b7ebcc01809a385d3ac80ea0eb2ebe78d
+EBUILD milksets-0.1.3-r1.ebuild 474 SHA256 1c34f023f8a4cd076c45e8e257a541b3c08e2efb754fe8795822c9d655bfb10e SHA512 8aa952c9a777dabec056b4a94a7e24aca51be0b175f79eb18f07dc9e98dfc2d2933af93550200c9cc8979ad0430c30dcfae0d3b804ac4487aa184929332981bc WHIRLPOOL 87c25942b52cf98c11efee3d19060b253edb625c6017431342dceb93b2dcba812db74b9ae47cbfae556f1f4a402ae37bfec044291dd1e4f5591293a3d5508c25
+MISC ChangeLog 2438 SHA256 cab6a19e1f49b2d4e353d7a34ffec0b443a18b887571fc0265bd3f1b400f5e68 SHA512 e98c62d3975754832a18a73feccc97b2763f85717e4d5ce7b4f9028771947d70ea3fc2bae4b389be2fb4fab1442775685cdba91adb15bed63499a0475d0cf7ee WHIRLPOOL 8bb7b12f525c4238380968cb52cf82f5fd96ac73a831daaed06af9ae33c346a95aceba8114773673d3093bf491760a2f369dba27f918cb66b56d76bc6b98e6f0
+MISC ChangeLog-2015 1111 SHA256 370fbfdd2567d8ca5304f95ff3614ff341353a8bce11272d6e8799dc16427b14 SHA512 1d3daadeabf231cdca2da4f40d423cbc64ab42579736cb605a49ed41f6d05b808864a1f1555fe7d98f54ff0115adce4a535bbd3e4b1cc68d8b29d18e5753f238 WHIRLPOOL 8a5c1b56828045a9693a7db9c52f6ade1325bdfe6128f3b201e5a66653e353578e838bd58c6719dfc228ab63ad598a6e54c2d0b726bb75c96a5119f58233f29a
+MISC metadata.xml 503 SHA256 8912acb8584525b5f14d7d4a8a85fc939aecc7d4043f803f5dae2cec9b85fab5 SHA512 6140c969d0db68c2d14eb8a351c5b8668ccbbe1a2d5ad6f54d102e5025c24644589ef599fa5800eeb23f52c39447fe451f5b195d43da1618c9e94ba8655f94b6 WHIRLPOOL 7770bff1140cf92898a4ceedcd3a4be6a9894ea44d60c3001964f6fc115e5912a171729705f6acbd578d15ed4c15ccf91b47c35394b455866ddaa2a4ed6ca625
diff --git a/dev-python/milksets/metadata.xml b/dev-python/milksets/metadata.xml
new file mode 100644
index 000000000000..55ba88d2e3c5
--- /dev/null
+++ b/dev-python/milksets/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  This packages contains some U.C.I. datasets in a common Pythonic
+  interface, which makes them easy to use with milk.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">milksets</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/milksets/milksets-0.1.3-r1.ebuild b/dev-python/milksets/milksets-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..b6344d68e3a9
--- /dev/null
+++ b/dev-python/milksets/milksets-0.1.3-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Datasets in a common Pythonic interface to use with milk"
+HOMEPAGE="http://luispedro.org/software/milksets"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mimeparse/Manifest b/dev-python/mimeparse/Manifest
new file mode 100644
index 000000000000..60b6d760f5d2
--- /dev/null
+++ b/dev-python/mimeparse/Manifest
@@ -0,0 +1,7 @@
+DIST python-mimeparse-0.1.4.tar.gz 5228 SHA256 3c69a21e37e77f754e6fc09ebda70acd92c90d8a58f29a41cc0248351378ddc3 SHA512 c8eeb298773a0eb36512b1d9a46dfc85423c0dab10b85ed94284bf1bf8dba8c34aeccefd8b6a187434789d5a160ab5d4af81659dd1808ea02078cc2b168e10b3 WHIRLPOOL f83328743b16ae46263e05055d6400617b7858e11837ce892919e26a36348650122b78ee366125a1793b20fa71c641b3606bf834d2936f98dab65b89b740385b
+DIST python-mimeparse-1.6.0.tar.gz 6541 SHA256 76e4b03d700a641fd7761d3cd4fdbbdcd787eade1ebfac43f877016328334f78 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e WHIRLPOOL 76fae536b6c27f5a13eaca1ce26fde1e2e3c66573ef7a011ce0920f1a169559adc5fb2391e6649ec5ea9319e2c124b5f506139310f9a84851704e3818293d358
+EBUILD mimeparse-0.1.4-r1.ebuild 1158 SHA256 f27dd6006bb959c38da19dd2c6526e34a0313b8dfa4afb9258430df14c8b3ef8 SHA512 77250c17a627c22853db5d2caa05dae861ade7d7fb0859997035e1163730523799d6cb0d2facbd6932390be40fbf38dbda61df086e7cc5519b733982147560e2 WHIRLPOOL 70911bd3adbb1fe93ea20daa8e270118cf7126b065c5477a48aa8de2323503e46b02790322d321fe23d1671c61f65318231ebf50a0f22752cee8ed9ce893d530
+EBUILD mimeparse-1.6.0.ebuild 1202 SHA256 d045c916183bac54fbf698c15e735271c2f28246cfd2e7d2ced2d407c0e51165 SHA512 4fd2f78401d3816e2b190850f794bf84fa720fc8907d724ed2d4e205a71a8a614f5f3c10e43ed5e2a6aac012701ac66fd5ddda5f8190f93a6e6efae9c4d60035 WHIRLPOOL e854106414c4ee810aac10193fc03e77cf837e88008f3ab139adbc659fdebe989a8ed9844a7496b6b0d7e97873c54c6f174e7b748eb70281b4ceecfaa2e69b05
+MISC ChangeLog 6678 SHA256 88b097d7ed2089456c87273d94dad2abfb7a0c393bf4df900a7ba2ad5f0f5c03 SHA512 bcffbcf173d1d6fa1fe0e91a7d26f3a95580f22a12e8480bd875819240a0ea42ecefd2523945703feb6a3b9cf879c674e1220af5a820838e5fe1adcdc8f84576 WHIRLPOOL 0643773dbfb74c879afe02c93c78f8c91e0c59219453a5e59ecfe7cf26d499c2706b7b30c08d7c854375822c521f1b8de7a060f7719c3e761ea76c393bac7555
+MISC ChangeLog-2015 5073 SHA256 fed2ea2c1248467c24d96be65a0b64b0ac59985971c778427db82f007ea41a65 SHA512 8e2669894e69ca8e566253ef5c073022632d399e80788af376cc37f8bc9dd2210b2fa597e0f9c0b3f18b9e4569d6444779a4ce396d532c3199719b91df0e85d5 WHIRLPOOL 2e60973bb194e00a40cdbc71b8229f1a80257130dc11f7588aa1285dfed21ba4b610d6c0f860b4fd9af7afadcf8ebd3d14e0a6934527e7ea1396deb85db77b8c
+MISC metadata.xml 394 SHA256 53861ac21f09988ae5fabbf43c30f116a1b059a71f390841cac643f655d115e7 SHA512 900355ef3cc835ae4e0766614eaabcbe701570fc54e1b00cfb55eeeafb0b65df35e24ab272eef54bbaa7aa0540cf89931a9bf58f5b515fdd6c88d303fec4518f WHIRLPOOL 3d21a3041bfa4f3a8244cb1d80bd2db44c6efaaad1d2994820fff9beb46cafcf5d2f4bc53330986d1d263011bfed276e3c5facb672817feab381aecde901aa3e
diff --git a/dev-python/mimeparse/metadata.xml b/dev-python/mimeparse/metadata.xml
new file mode 100644
index 000000000000..e9e258b9c887
--- /dev/null
+++ b/dev-python/mimeparse/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">python-mimeparse</remote-id>
+    <remote-id type="github">dbtsai/python-mimeparse</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild b/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
new file mode 100644
index 000000000000..542f7ab01eb3
--- /dev/null
+++ b/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
@@ -0,0 +1,44 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Basic functions for handling mime-types in python"
+HOMEPAGE="
+	https://code.google.com/p/mimeparse
+	https://github.com/dbtsai/python-mimeparse"
+MY_PN="python-${PN}"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	"${PYTHON}" mimeparse_test.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	if [[ ${EPYTHON} == pypy ]]; then
+		local pyver=2.7
+	elif [[ ${EPYTHON} == pypy3 ]]; then
+		local pyver=3.2
+	else
+		local pyver=${EPYTHON#python}
+	fi
+	python_export PYTHON_SITEDIR
+
+	# Previous versions were just called 'mimeparse'
+	cp "${D%/}${PYTHON_SITEDIR}/python_mimeparse-${PV}-py${pyver}.egg-info" \
+		"${D%/}${PYTHON_SITEDIR}/mimeparse-${PV}-py${pyver}.egg-info" || die
+}
diff --git a/dev-python/mimeparse/mimeparse-1.6.0.ebuild b/dev-python/mimeparse/mimeparse-1.6.0.ebuild
new file mode 100644
index 000000000000..559dfa3db277
--- /dev/null
+++ b/dev-python/mimeparse/mimeparse-1.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="python-${PN}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Basic functions for handling mime-types in python"
+HOMEPAGE="
+	https://code.google.com/p/mimeparse
+	https://github.com/dbtsai/python-mimeparse"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${EPYTHON}" mimeparse_test.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	local pyver=$("${EPYTHON}" -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_version())")
+	python_export PYTHON_SITEDIR
+
+	# Previous versions were just called 'mimeparse'
+	ln -sf python_mimeparse-${PV}-py${pyver}.egg-info \
+		"${D%/}${PYTHON_SITEDIR}/mimeparse-${PV}-py${pyver}.egg-info" || die "Could not create mimeparse link"
+}
diff --git a/dev-python/mimerender/Manifest b/dev-python/mimerender/Manifest
new file mode 100644
index 000000000000..c7b28daf12c9
--- /dev/null
+++ b/dev-python/mimerender/Manifest
@@ -0,0 +1,7 @@
+DIST mimerender-0.5.5.tar.gz 6420 SHA256 387dcf22cfcbad8c72f2b0def6659c9fc720234a1a74ad485618b24e6779bc28 SHA512 35f52ad6c46ec7e37c44be67e52140f19a3def526546a7a370c0b19d4a43e01e213fdb4673c17449de0951066ae208a1f3f70577713242b078eb7080f62f4b24 WHIRLPOOL c6fddcf923d978bfdab88adc0949a695b2b3eb6475e427aa7b72a0563e485ad8f8f3d7d842b7a6b4584f68bae004e2d9c192490fe86208ba2668ce2ddfe68f65
+DIST mimerender-0.6.0.tar.gz 5310 SHA256 e7f1377efee18c3f562cee54907a3329223c824332889fb74b745ddfd0a9b1c6 SHA512 0b0f452404d09860cf42b8afef96ac87d4e5b222834b2309a9aa8d4855822b988cc8daaa2a0553332786755a26ff8e65c8cd6fbd4ff390f8534f925524b4222f WHIRLPOOL 612da7ad5cc3312bb4dc4a86ae93519052bb21ccb6e14b05efa3615f96718f85c896d3a4e3fff302affb80171698441a26af316abbc2ad78bbbd9b28143edd60
+EBUILD mimerender-0.5.5.ebuild 546 SHA256 fd237c905bc95bd08c6262df3cd6b8fe5e9499f8bef108ad18d9ab8ab97c301b SHA512 cd8d5aa5f7d046adca65869af970ec2eb39806cb88bb751bdbe6fe58a482121fe05cb3c0057d9fdd0f642df73d69edd3302d3ab3e4cbb0ee76ec1fb4f7366638 WHIRLPOOL 8ca3711ee7035e2b69590d84939eb3e6164dd088a796f924c29e9c3b691c170da2acabb34541e1f71d75c707b873442cfd27d1593a997aedbeb3d3d9fbe32d4b
+EBUILD mimerender-0.6.0.ebuild 554 SHA256 fcf2a631652ae84867aa6044711feae9fe6e5161401fcc0874a0641cade0ff5f SHA512 d5cde68c87d1a774b238b1b89dfa6ba1143100d926749a9cec0c79b1791aff9f94ced8fd6c8d43aa80861c23d56c0c41082a991f602413996de74b170f3225d1 WHIRLPOOL 82f71c73726413a7358305c12cea9c331168234b2a383d6c46a39a82b132b2900c48fae5c014e00e1c7d7c13ff0013b2708992b445c034da88ee3ca527c46c03
+MISC ChangeLog 3004 SHA256 0b523e584d3600589f6ce4cb6eebf9f40abf1effb20302c2bd05edeff9138424 SHA512 d5385b1eca77e18ad72bf93bb545ee9c3446596564bba99c46291d7881cc7f89fa857cbf8b0d1150d14dbeb1282a33791d5f15c0c1ede1f319bb117d598738a8 WHIRLPOOL 8b9704b84fbb600d4758c683825d19a4cef6783ee32df55f21674b7718dce1a7d49a4e7b3f01f08a1b43d2d4f2e852a970607ee5e2ac87d663201c2329b03d67
+MISC ChangeLog-2015 893 SHA256 4c3c555ebd450e02c250efb6e2728a7dd79d08d9813b6609ed33c3039f2c20be SHA512 dc836dc32f9e54b567d1e18ce6917f437d6c409cac803a012e4f7606dc4a4378e1ae15a4f3f1f92ef64302aeb825e1ea133e5d8c3ab238828e57aa2462a97686 WHIRLPOOL 814074021a19a170901a5561527e22f695b984342b99440fab0b0818ee71f383ed7874dfe3484b462ee76aa82848bb796813c8b4d807b375dad9470a9fc2c0b2
+MISC metadata.xml 313 SHA256 efb93dd545ea2548c06e67641cc36419c607428b56e06c31b8afc92b95943ff1 SHA512 69420483f170abf2482ef947c26bbe7dacda158cc222464d35d18b702694b73b6205fc4d66150265962e28ba1965f7c555ea033778fb04eff73a58ef804e157d WHIRLPOOL 51c94ef554d63d0a0767e8f7a71ecfd90824fa2645c6827a7311e4d3f93e9e468af2edb5cb06245aff86c65f843c1fbe3b6a21a45ef4ace86d0597c5dd13e9e3
diff --git a/dev-python/mimerender/metadata.xml b/dev-python/mimerender/metadata.xml
new file mode 100644
index 000000000000..14833db55be2
--- /dev/null
+++ b/dev-python/mimerender/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">mimerender</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/mimerender/mimerender-0.5.5.ebuild b/dev-python/mimerender/mimerender-0.5.5.ebuild
new file mode 100644
index 000000000000..c48543330399
--- /dev/null
+++ b/dev-python/mimerender/mimerender-0.5.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="RESTful HTTP Content Negotiation for Flask, Bottle, web.py and webapp2"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="https://pypi.python.org/pypi/mimerender"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/mimeparse[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mimerender/mimerender-0.6.0.ebuild b/dev-python/mimerender/mimerender-0.6.0.ebuild
new file mode 100644
index 000000000000..b8beb41045d6
--- /dev/null
+++ b/dev-python/mimerender/mimerender-0.6.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="RESTful HTTP Content Negotiation for Flask, Bottle, web.py and webapp2"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="https://pypi.python.org/pypi/mimerender"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/mimeparse[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/minidb/Manifest b/dev-python/minidb/Manifest
new file mode 100644
index 000000000000..b0e03d9a5e8f
--- /dev/null
+++ b/dev-python/minidb/Manifest
@@ -0,0 +1,6 @@
+DIST minidb-2.0.1.tar.gz 13848 SHA256 be894fc4e68e3ce9b84b3992f12fbbea5051d3c2a11019b1da463099f24725f5 SHA512 98be264ba669ef08f180c469ca8375540436244228ee4e0c4e4b0511425b909eb4c64dc812a27d0b490af5972e0897538f905590b7d2dd19f6fdd160280a6b4b WHIRLPOOL a209d44f26add8ebae0ad142c94fdfcd4698b80d4f7e491ad16d36a4704f8fa9f3e8649aead9b268cb80055c6ae9f4691e6428979e048907a79caef8165fb864
+DIST minidb-2.0.2.tar.gz 13928 SHA256 43d59231556e9ed43d88c8c1ffcca30886b4db6436625599eeeb22bb9f74ab2b SHA512 92879d6df61b0f9f72f9fe8f1cf38d559477983c6bba8c88ed02289570daff02f6f8d7010c0a95ffce049ab67be69323c47caefdfe3a8b008038377235ed9a5f WHIRLPOOL 3ec87fc16ca02c817c70917a8bb0b3da5f12aeaf0b54827551b27a1549ad8daad635d88a81a14730c9deea50ca582f201cbef83ca929a14d91b1b722d5865a58
+EBUILD minidb-2.0.1-r1.ebuild 563 SHA256 90b3845f0eb556608a2115c1da3339e7405e51864869a968599672616e7be4b4 SHA512 571131713ccadc1210ac7a23e6df6432577293d106a2691a25174002f0b3dffd2a885d0d16940532567ac365cab11498ec4df9970e5b28d662a800e9e6fabea5 WHIRLPOOL 0f3f410b7864d99026675b2d41b15305ac82091a22dcf5f7a7d5fcf91600550d6e6325adc2f882541258299a3b5cfa8f5a34e7e05ff8a2f863f7c27ffbf2dfae
+EBUILD minidb-2.0.2.ebuild 565 SHA256 bec306b24f6f2f266021055e40d9608d9112bdd3d76c3a61a457e9ab20401ebe SHA512 8e9b1f4de61525d9bedc3d8892c5dd63f41396954a2ce677e3adb0327716c1ca89a350f5498f8354afc7bdd56f1897ee3d58cb58f27db0dfa8afaf3e78ca1056 WHIRLPOOL 4f3d5b0809746e968597a08d42c6ef824f0cc89bf42b38480186e28b0861722840b960b729c06992502673c6c56a3df011f547ba09e873ffdefcb3119d71c1ed
+MISC ChangeLog 1595 SHA256 5d7964035a125a015e72348c9c1f8028302dbc4076118d2447021f23b86be677 SHA512 445e0ded1a95d0bde79b5df5f7dd617d9172ee48ef4339915b99503a522cbd46ea8c16a788fe409c7c48bce01a85bd47fccb5ab3f4c48de8cc3415674aa111d9 WHIRLPOOL 22ba0d110408ced91b7e83020636f07e3600d7e95a487c60f85d09852577eab79594d804d1a2b94819f4bc5499035ad1d6aeeb64ef3221f48b99ad6f5cd26d3d
+MISC metadata.xml 546 SHA256 985140cf13e56e81384aa1ba6d7b7b0c924f18d7b4789d60b2af7c31822e4742 SHA512 bec28f95ea114f7a12d5eed9531c57cfaaaa3c75b4de6037873ba6c1b6f7c19fb0126b4f1cb9fb986bcba72569e0b7114f62e1159a0c9d61aa420b730a79e1ca WHIRLPOOL dbee1bff70d994c1de6cf7c170bc1ae4af4f037b7f4d60d9b35d9bbb84d50a8f72054ef8cd5f517f04c5b73900ca58cd96816337edbfab5978534b2691870ce3
diff --git a/dev-python/minidb/metadata.xml b/dev-python/minidb/metadata.xml
new file mode 100644
index 000000000000..0d15c314bd98
--- /dev/null
+++ b/dev-python/minidb/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">minidb</remote-id>
+		<remote-id type="github">thp/minidb</remote-id>
+		<bugs-to>https://github.com/thp/minidb/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/minidb/minidb-2.0.1-r1.ebuild b/dev-python/minidb/minidb-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..33437a219865
--- /dev/null
+++ b/dev-python/minidb/minidb-2.0.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Simple SQLite-based object store"
+HOMEPAGE="https://thp.io/2010/minidb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	nosetests test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/minidb/minidb-2.0.2.ebuild b/dev-python/minidb/minidb-2.0.2.ebuild
new file mode 100644
index 000000000000..c99962ef184c
--- /dev/null
+++ b/dev-python/minidb/minidb-2.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Simple SQLite-based object store"
+HOMEPAGE="https://thp.io/2010/minidb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	nosetests test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/minimock/Manifest b/dev-python/minimock/Manifest
new file mode 100644
index 000000000000..10883a06edd4
--- /dev/null
+++ b/dev-python/minimock/Manifest
@@ -0,0 +1,5 @@
+DIST MiniMock-1.2.8.tar.gz 13217 SHA256 5fdfdfeadf0fc781d0592a1b90d2fcc11581f682ff7cba6201cfdb15c3ea5a4c SHA512 91133251a6e6b1acc11e6ac4f24404807134f8a7fca49d5f7365d7fdfc6bdd1527e7382da8d866669408b1ad30331a176026dd31bcb0c3b7367b7f778fc61ca7 WHIRLPOOL 768a73dc82499615ee0d0ce9dd7a3e67253c27908778b0fcd0bf07d562254f48ba95128ced78b7599ccf77cf19bec1c1b85d21a60d251f302825516800bda69e
+EBUILD minimock-1.2.8-r1.ebuild 836 SHA256 7be828e87d5a45d7feb54d66521bd1a55808fb4795b002e1e33faca538e3452d SHA512 34db96ec600f439ddfc41ff272997a3268b3b5d7d54b267160665ef9c5e6c3ade6464d6dda2148b15aacb8dae6fbf7f0e17d126470acba4544a844c354d95ab2 WHIRLPOOL da0048e59afc13af3e6728c7cb0346f48a941704a770d351e9808bc5e175bcc455457cfef50d15bd9c0f2d02bc858fb3320ab06cc239bea97297973721d5553a
+MISC ChangeLog 2717 SHA256 b4543ec62dffa73ad22c88d77a685b44e82c1e4038c3117a14efad02b5262469 SHA512 3dcc4850aa8c83e8c7aa3ff6a05a5a5761ba72c85795eeda19e2a618b7f7ba620c96b0939ff76d88e7ec7648a99628c7bb2848297365da83aa3873bbb17ef39e WHIRLPOOL 286b2323d79227d82968a416162bed2614b84a065ed1163cfd46bb7d70cba3edb1a08083e7f5886ccaa352330026bf8f38922d26f695ebb2ac6abb92ebaaf5f3
+MISC ChangeLog-2015 3377 SHA256 74791e2ff3d8705ec317890e088ba3a9a598d537e6c84da5b8db6bd8b41d422c SHA512 efbedfb881beb0aca4e0ef1865a8993bc0e2a73bdd15a5c535380ecd4d0441025725b4db3b53427339c90ec9c4274b18032f4d01380b0e5c6bcd682fc8735e12 WHIRLPOOL 27e1c5832fa3e8ae9ff749827a741ded5508732a0cc4b395e843f4e3273213f1f5685c461cec498afdde908dce29973daa647a745d220ca62d831720a278ee00
+MISC metadata.xml 311 SHA256 7ad89e7cc9756e1455ae7432feb3295853ccd5db23ecf8cd3c55c58d41a3410f SHA512 9df2bf6b3486803c9754bcb3b9142844ca050718f10c00bfcaf4538262cb95c3d7a5e3102ca2005ce407205f6beca7722aca82407e85cc289b35e33139ba6236 WHIRLPOOL c76fcf9f81f51d59206341ff6624dfed8a49574123db201d48a32d200afe1f9352cf6ea752ccc4e4a27c5a1c03ffec884c4d2e654ecddee409c0d63ac3626548
diff --git a/dev-python/minimock/metadata.xml b/dev-python/minimock/metadata.xml
new file mode 100644
index 000000000000..986d70145867
--- /dev/null
+++ b/dev-python/minimock/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">MiniMock</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/minimock/minimock-1.2.8-r1.ebuild b/dev-python/minimock/minimock-1.2.8-r1.ebuild
new file mode 100644
index 000000000000..e35d075291cf
--- /dev/null
+++ b/dev-python/minimock/minimock-1.2.8-r1.ebuild
@@ -0,0 +1,31 @@
+# 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,5,6}} )
+
+inherit distutils-r1
+
+MY_PN="MiniMock"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="The simplest possible mock library"
+HOMEPAGE="https://pypi.python.org/pypi/MiniMock"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm ppc x86"
+
+# future breaks minimock hard -- probably makes it think it's on python3...
+# https://github.com/lowks/minimock/issues/5
+RDEPEND="$(python_gen_cond_dep '!!dev-python/future[${PYTHON_USEDEP}]' -2)"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( docs/changelog.rst docs/index.rst )
+
+python_test() {
+	"${PYTHON}" -m doctest minimock.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
new file mode 100644
index 000000000000..fb2df4987b59
--- /dev/null
+++ b/dev-python/miniupnpc/Manifest
@@ -0,0 +1,13 @@
+AUX 0001-Link-Python-module-against-the-shared-library.patch 707 SHA256 16a223d7dd5cd3507e11782934699540c687c2bed28d582cab177ab3f9b49e98 SHA512 ac0dc69cafc857d2a5490f8d6b3f2db877c9b8e498c771b4afb1bcfa129279ffe61c5f28ba5af1cedba6d5bfbef5803ebfca7bfe2ed55c4aacaf693119f53d00 WHIRLPOOL 2bb2df815f80f1c077110adc44c4e450c89e7e2b4bf80a66526c146e536ba7744088707e7035fb68532bde571b439967e784d3c334057f936b35d5e6ad2415b3
+AUX miniupnpc-1.9.20150917-shared-lib.patch 723 SHA256 101388a2cd63c16e7bc39f2bc2547b12a1a92e05af995648c5cb383f92ae3b6c SHA512 2a74eb019b5da38468d917f62b86a95b636f1e7375285af17e12556dec04026209cf384aa154e31a23fd86a2888dc340dee8e4bd6184779101bf290d340186f1 WHIRLPOOL 9683a1705ebf50bcf83f464a8bc0c90fc628045e9a3f129fcd753bc6283828b328694f63ac27545859628ffa7fe0bf1d161cf0a44121a82688ef3c16c1ad59ce
+DIST miniupnpc-1.8.tar.gz 70624 SHA256 bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c SHA512 8eedac9ad473fc952ca8896fe534d6da6b1b234e8b6f35f721394d4c71aca84ed287ca6c4f0455b50d97a45e4cd34e27d99a6813386e0864781364aa607e13d4 WHIRLPOOL 5b76ccbb5ed7daa9bb0d481b424b7c31a5f6dc85c5c812ba10175a29aefc0d3924f3db2aa8c3529d1241be59d67d1d4c702d27aad2de8c8a07fecf3857d73169
+DIST miniupnpc-1.9.20151008.tar.gz 83538 SHA256 e444ac3b587ce82709c4d0cfca1fe71f44f9fc433e9f946b12b9e1bfe667a633 SHA512 b13e6044184f47d0f9e78c4c97d2887ab763121b2b21c86652bf3ea1b05335cfbcfd91eecb8d1dcfb5530f2528e6cf3e9c49c742d5e771dba68a774d2c2ad4ca WHIRLPOOL 839b531eb6cae7ada0bbaa0c4230a1f6889f6a288a114262bf6e27aa27638800636127fea3066427fb030e8f449794681d2bffeb8e2d30876d8ef9e4a3ade3cc
+DIST miniupnpc-2.0.20161216.tar.gz 85780 SHA256 01e14408d6fc628de9afabc4417b84adeaba4c0ec517e7b8e278cb2993dafd3e SHA512 ed1413fa6cd8eeb0d01e595e5470b255b1119a9bcf28da17765a4a3f0eb2b514409a9bfe9cd041274761b61441389c290754055ff07d599bb653a4efe47e920f WHIRLPOOL fde2dc16f5cfd6e7d066ec49646ac79b6d262988afe928d80aaf47f6b7f868a272ac46d3136c56ed8373e800d1538fe4dd6c34255080e2bd01cc0cb8b56e37fc
+DIST miniupnpc-2.0.20170509.tar.gz 86055 SHA256 d3c368627f5cdfb66d3ebd64ca39ba54d6ff14a61966dbecb8dd296b7039f16a SHA512 71ec052ef6c8ad0d529e467ddae6eae19a93b9816174eeac753aa90e036cc2f00cf7e8d1cdb188ef8280849a988fe2995e37b63f8e2a361e021c1d1b306bff6f WHIRLPOOL 86c1a7a1d8800dbc0d1eccad66a5cb61a59af38989ca79c3b8df926ed12d9c7760d0b5d0e59d5d3190b45c7801a76c3e209f156836277992131c587b97c1a48c
+EBUILD miniupnpc-1.8.ebuild 575 SHA256 d5d4edbf0bc67caf7b16801e6cc0a310f6da9fe52129b6160e5060062f022546 SHA512 5f7d32e2c60a0fd9b995d94dafb88eb7d99b2bb5077529a6a26dc156b750f0027bc40409847854559eb96fb422bace982258b0833a1008e79bc563a08b435c7c WHIRLPOOL 46021fe6ca9b95433d7f195176b750c40e33315570b6102bb5f9b4b4b32b919a1be6e380af9f54085c1f735bec890dbb6e479b3eb2cf2d80407737fe3fc2f41d
+EBUILD miniupnpc-1.9.20151008.ebuild 561 SHA256 1e6d7fec2489f4be49d94a6cbc83c07ad458f7dab2dec7c3e0a2388a20474645 SHA512 54cb341f5ef4217e3281f0f5aaafb096adc4e38a84e0fcae5b893d0701d2d70542d1bb9d9772f98f2cf6672e5c36ff90f069afcde6d63505d77b6c8e1f4aaa6b WHIRLPOOL d31e0a8c48f03c909830ac82d1bca2f18a5ece00ad3bdae6d4e9c0c6501220539071700e02afd64436c063555553c8f6f332941e5006507ae8c6492067a567b2
+EBUILD miniupnpc-2.0.20161216.ebuild 714 SHA256 8e930e6a2d1a5774328789cf50b75f9ffa86c6edf071910438933d6f49e57eed SHA512 22a6a47c6f235b8717e188a3051e67057b7d2d9caa3d711ed56800ee9b6cc98dac19f1722e03a163deeddaaab7494a74c0b81b8704fe200225535391653c3e53 WHIRLPOOL d5b62acda838b618a8d56f2e4e062d38c6293f3d82c2ff7c147031ad8bf1721978f4bbf7c287b69a60e48df9252337415c51f416075b52e021e4dc30bc580deb
+EBUILD miniupnpc-2.0.20170509.ebuild 714 SHA256 d57f906935dfedc8f318612e0d8a15a997a82c672aab21c4f15cc9ac4f3fdd0e SHA512 a145554f2dc93f098f6a4bf70f2505d8878de57ceb44fa74c894bbd1a6f7d27e57b2ed2f2e2d1144503444a1c25ef72a244139748db7dc5877888d785c1f330d WHIRLPOOL 3fa02d3e6d399b55c4f0e487336608c102a91e578f370ceda842a610a7b8379365c7970919bff0031e9ec4202e7451b7fe2b831154c29de38cc3b7829a877934
+MISC ChangeLog 2944 SHA256 1b6f4082c25955afbf1d52639544498eb5bb0a2ba28161fea94c2299418f7261 SHA512 773140e9ccb0b4cc7dc7c3b4a7386782e4ce430ecb078c70fb01013d5b2f4703bcc101e2ff8a6dbd5e27ba33eac3f16af5cab12dfab54551e1efc8f543043da1 WHIRLPOOL bbc14617332c605a14de04ff775bfa6f6a4760167ad7ea05c16e5378ab7b08c28cf75374a0cc7325bb47e96c505b060dba94c801b2deb61bc11d13a68c633d8e
+MISC ChangeLog-2015 2738 SHA256 49bbe8764172112a232edcc5af555fc8f642a191f1342c78d849eab4f6426cd9 SHA512 c6b64c9d83de74c8c17c1886dfd50e23fbd3a8a9ce06216fdedd4643d78cdc76e425d9a81c32c59ec64d275662d80724af812543f91afff913ed92f847e0029f WHIRLPOOL 3f2596450dfb0fd1728e3b679a4eafe5981bd397a897fd1a8317107a14cb828b14f9757dba30eb738a5d36e20c85918b89ab633b414f3f7c679baff4e72ac7d6
+MISC metadata.xml 243 SHA256 a90d5777b80d7ed5f0f322ff9cafae7a96dd513f4af28b60e36c060305157906 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28 WHIRLPOOL 10702c61e2ae8d5ddb862621065c0ed6b1d05b4a4ff0a30407d29edca19629cead238e10a9f1889f4c41f64d7ef88f0031f746a2e5d9502ca7b088c2039f5751
diff --git a/dev-python/miniupnpc/files/0001-Link-Python-module-against-the-shared-library.patch b/dev-python/miniupnpc/files/0001-Link-Python-module-against-the-shared-library.patch
new file mode 100644
index 000000000000..d9e6c4317ed3
--- /dev/null
+++ b/dev-python/miniupnpc/files/0001-Link-Python-module-against-the-shared-library.patch
@@ -0,0 +1,24 @@
+From 34da047ae5b945a43430f59efe0efefdd8f1ba55 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 3 Aug 2011 08:28:31 +0200
+Subject: [PATCH] Link Python module against the shared library.
+
+---
+ setup.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index ca31f96..f5aef19 100644
+--- a/setup.py
++++ b/setup.py
+@@ -10,6 +10,6 @@ from distutils.core import setup, Extension
+ setup(name="miniupnpc", version="1.5",
+       ext_modules=[
+ 	         Extension(name="miniupnpc", sources=["miniupnpcmodule.c"],
+-			           extra_objects=["libminiupnpc.a"])
++			           libraries=["miniupnpc"])
+ 			 ])
+ 
+-- 
+1.7.6
+
diff --git a/dev-python/miniupnpc/files/miniupnpc-1.9.20150917-shared-lib.patch b/dev-python/miniupnpc/files/miniupnpc-1.9.20150917-shared-lib.patch
new file mode 100644
index 000000000000..086c0926651b
--- /dev/null
+++ b/dev-python/miniupnpc/files/miniupnpc-1.9.20150917-shared-lib.patch
@@ -0,0 +1,24 @@
+From cd8787999bf4c4b89601f6338ce765ea6229232c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 1 Oct 2015 18:49:26 +0200
+Subject: [PATCH] Use shared library when linking Python extensions
+
+---
+ miniupnpc/setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/miniupnpc/setup.py b/miniupnpc/setup.py
+index 049f670..2533ed4 100644
+--- a/setup.py
++++ b/setup.py
+@@ -19,6 +19,6 @@ setup(name="miniupnpc",
+       description='miniUPnP client',
+       ext_modules=[
+          Extension(name="miniupnpc", sources=["miniupnpcmodule.c"],
+-                   extra_objects=["libminiupnpc.a"])
++                   libraries=["miniupnpc"])
+       ])
+ 
+-- 
+2.6.0
+
diff --git a/dev-python/miniupnpc/metadata.xml b/dev-python/miniupnpc/metadata.xml
new file mode 100644
index 000000000000..998965a402cd
--- /dev/null
+++ b/dev-python/miniupnpc/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>mgorny@gentoo.org</email>
+	<name>Michał Górny</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/miniupnpc/miniupnpc-1.8.ebuild b/dev-python/miniupnpc/miniupnpc-1.8.ebuild
new file mode 100644
index 000000000000..df6787d09fa1
--- /dev/null
+++ b/dev-python/miniupnpc/miniupnpc-1.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(python2_7 pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for UPnP client library"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=net-libs/miniupnpc-${PV}"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/0001-Link-Python-module-against-the-shared-library.patch
+)
+
+# DOCS are installed by net-libs/miniupnpc.
+DOCS=()
diff --git a/dev-python/miniupnpc/miniupnpc-1.9.20151008.ebuild b/dev-python/miniupnpc/miniupnpc-1.9.20151008.ebuild
new file mode 100644
index 000000000000..a35212d5abbe
--- /dev/null
+++ b/dev-python/miniupnpc/miniupnpc-1.9.20151008.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(python2_7 pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for UPnP client library"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=net-libs/miniupnpc-${PV}:0="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/miniupnpc-1.9.20150917-shared-lib.patch
+)
+
+# DOCS are installed by net-libs/miniupnpc.
+DOCS=()
diff --git a/dev-python/miniupnpc/miniupnpc-2.0.20161216.ebuild b/dev-python/miniupnpc/miniupnpc-2.0.20161216.ebuild
new file mode 100644
index 000000000000..e52f6d8e51d7
--- /dev/null
+++ b/dev-python/miniupnpc/miniupnpc-2.0.20161216.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for UPnP client library"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=net-libs/miniupnpc-${PV}:0="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/miniupnpc-1.9.20150917-shared-lib.patch
+)
+
+# DOCS are installed by net-libs/miniupnpc.
+DOCS=()
+
+# Example test command:
+# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
diff --git a/dev-python/miniupnpc/miniupnpc-2.0.20170509.ebuild b/dev-python/miniupnpc/miniupnpc-2.0.20170509.ebuild
new file mode 100644
index 000000000000..d1cda6440d24
--- /dev/null
+++ b/dev-python/miniupnpc/miniupnpc-2.0.20170509.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for UPnP client library"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=net-libs/miniupnpc-${PV}:0="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/miniupnpc-1.9.20150917-shared-lib.patch
+)
+
+# DOCS are installed by net-libs/miniupnpc.
+DOCS=()
+
+# Example test command:
+# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
diff --git a/dev-python/misaka/Manifest b/dev-python/misaka/Manifest
new file mode 100644
index 000000000000..37850383a0d6
--- /dev/null
+++ b/dev-python/misaka/Manifest
@@ -0,0 +1,5 @@
+DIST misaka-1.0.2.tar.gz 78702 SHA256 6197e4886ff0c2718df1b472e40b5fea45f447a7a5b0192a48123ee868973517 SHA512 ba3ef2e4c66e0e33e21bb554c3e317342929b3d9969aaba7e3dbd745430b3952b6bb7d3142a3049c4de3e3dede7cc68a9810cd43642e014949e4564fcb2cc74d WHIRLPOOL 8b36e931b50da2e55a3a21e9ef0955e677dc89db3de49c9b9fab776a94d607542320d067ced9d927a52b9f3b9d09f6d92ca4170738a8bdd4334629b68b262fc3
+EBUILD misaka-1.0.2.ebuild 516 SHA256 d465ac2f7cd302edb5f58af8c89ce26ba9eed534562fcaa8a2568807fafc3d6b SHA512 f93c06fd52d9c1ce7728f3dbe2d1a542686d4be7ba85d361507ab48e139b4a36b08f9f3235bf1e88fe7da46359d1e68c34951a330f53eb188939d6f53a84c825 WHIRLPOOL eb8c1a3c862b270f414d875d8e491e9247792e43a4913e18240c698b314dccc73dfa4fa69082b4a8294d3e9d7664ce9e83329d7cb2a858cf87109f2d8cf8b0c3
+MISC ChangeLog 2426 SHA256 9e572f8798b06e050dbb656e0cbb4b28e21a376c4f85a5207fc22b938c15a0bc SHA512 320c39996e48c488d9a7a433213f7e921c8719fb20874cc7ee87735e05efe3418f4e37a2e6a8a577f5f49594b500a38879c41bf1e62f96b8f24f38f47f97018c WHIRLPOOL 1e00440e7a1fd032c0c19076064182a263c219bb9ed628fa6b400a860fbb90b778c80d9aedc634c6090af92866db073b324d88d4e1dbfa726f95df42a029d77d
+MISC ChangeLog-2015 587 SHA256 8669be28c53fc3c02a968a3f9227d7e9e8214b326c6f8eeef8058f0ac931a6e9 SHA512 d90845fe620d8f4f0bd9d44e7b22600bf02d02ba7f527bc68e9b1e616f04cd809940a13eece5431f83e09ba59fe3860b57151807b128b1142f37b996ced7049f WHIRLPOOL 306997ee0853c61042c95b9fef419479157cccfbd66f516ac6f42fbc25374abfaedf9e738ddc39e95d0e081681920814f350d03e0b0ef8e5e67f93e4109265ad
+MISC metadata.xml 325 SHA256 7cf42c6051bee10ba143a000251c948236e9c7a72caaf7413128830b25a42e08 SHA512 bc9e07a67003034cee777f14118c2bf840d6481b61f84d811f42fd714cf9bc08675eaade34d2ac79c8efcb31e56e607156109a0b0984e23037f5744efd045a9a WHIRLPOOL 2b56e36e348844baccb732080ac87b2648ee0f0fe9c0d26b9ff44bfdde1735aa1c3700ab96f19657821d1b05a4107aceeee2143c834f1829a03ead5b11939b97
diff --git a/dev-python/misaka/metadata.xml b/dev-python/misaka/metadata.xml
new file mode 100644
index 000000000000..028f277d07aa
--- /dev/null
+++ b/dev-python/misaka/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">misaka</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/misaka/misaka-1.0.2.ebuild b/dev-python/misaka/misaka-1.0.2.ebuild
new file mode 100644
index 000000000000..d5020c59225c
--- /dev/null
+++ b/dev-python/misaka/misaka-1.0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="The Python binding for Sundown, a markdown parsing library"
+HOMEPAGE="http://misaka.61924.nl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/mistune/Manifest b/dev-python/mistune/Manifest
new file mode 100644
index 000000000000..79bda6ce9d18
--- /dev/null
+++ b/dev-python/mistune/Manifest
@@ -0,0 +1,7 @@
+DIST mistune-0.7.2.tar.gz 48887 SHA256 626f2516adcde4af608eaf83635ff20ff7e577c1898ad4d0f0fcd8c094399840 SHA512 9002bf83a368671389f05928f4f689064a1e415e54309259b6bbb7781b4bfddbbf834e2c63ed3271e1e6ec7b78c1665c7708177b9723433d1e2ad4b13ad903ca WHIRLPOOL 54d95b82bb061709a48bbd3e87a16e4cc03734f8adfc88e48b44da0070e16ec062ea4c219e258bd4abd2a4e7dd6aa144a4f73257c24ee28622eb36fcba89effe
+DIST mistune-0.7.4.tar.gz 49304 SHA256 8517af9f5cd1857bb83f9a23da75aa516d7538c32a2c5d5c56f3789a9e4cd22f SHA512 d300bec23f5482396c6f282ee3d773461c162791e4605ca40141eb9487c8b158ac7f47f6338f7c3bf27bc614292ecc61dfbf419d47eab817821f18cf80103802 WHIRLPOOL fbbb9bee4078aa25e2934fc0163306c24c7169e350e0816babad8a4dd7f305c8be8b4935a427f7266c05d640427a68eebe23e3c42cabd372252f0d8811a091e7
+EBUILD mistune-0.7.2.ebuild 709 SHA256 1433c7e355a8a2a937a4535f95260c46e53c1149465f97c1268ec3ff1eb144c4 SHA512 d664cab5e7081af273967c9053af586570be6beab5e9e281f815bc7a55d90f6053f049d5fbbca17da83afe72ae2feb328b303bbcae93e031e01630eb7b15cc38 WHIRLPOOL 3c13180187eab16f2f613c7835bf625cfaf433e93e14c0250ec658e3df8ed1202b668e6045c2f3e7ff3dfb5179758fb49b03a48e6591190cf08fc2f1eb8d3dcd
+EBUILD mistune-0.7.4.ebuild 712 SHA256 299090796c840dae71abab9a8b8058d1b54a384502389262c18a5313b4eb2951 SHA512 8c674303f5f5e9e137d77bc16da7c601130b77e1556c6a36449c1058f4f8ed44c1d2de6bd23ee27eba2f1e11bc3a483e15dbd228df7ca13f96c707680008b026 WHIRLPOOL 68d7de6eaf1259c6ccca823862b3d198b9ba200961335c4b4779eb61de808c8019a3ea6fcff526244d979a740d1699cb9c97cb3900075faebdaeec603fd66462
+MISC ChangeLog 4545 SHA256 2ac3e4330605380b1b04e816852c4206b5a94baa7f9ba7c2b0af5e4523f8f4cd SHA512 89bcda9c4d64b83637ce14acbeb01880c724ae330679fbdf9e8c61fa6d7e163df56b8e8e9a3300a7b37923ad8294fe86fadf1d32ece5424929864c4f06c82334 WHIRLPOOL 5f7eebbed64ebcb8320c981605781f8d472b3b0f51c64b069fa7a101b0d327a8202d579e59a0d5fdf5acea4c85ab5c9347196d8a6a312d7f04fde472fc631510
+MISC ChangeLog-2015 1589 SHA256 981da7f37fa0d8d92ee259d9f2495959f7c5f4bab8e0e1af4a9fc11dc5884b69 SHA512 b4f3eca5cac243c1c5d3beaeda83442c63172cbb93d4412a0a6d684c6c46864ffae8852e1520f355af01491865b5123369eb8c9c1529a9dc795aca91dbb983d7 WHIRLPOOL ea99884bd33d57581378d23258a040860c8c6bf737763b0b010831218be3a7e8fd518e1d33ee3aad3697f800d4641619a03b27cc3b43ceb915bce0bf6c051a7f
+MISC metadata.xml 377 SHA256 54baf5d6d1c198c95aba1ea974e0fc15a9bbf05e5ec896743852a9924a7b0058 SHA512 3630e9ba514f3f3b1ecf532ca928c3bc89c05ab50a9113ab4b1d609edf07a6421796774ee4a71cf17ea3c2939acea24e22a74f33b66fe630706dcd6482cf817e WHIRLPOOL c1ba7897bf39cf28dc4e28aaad8dbd64eeb036d415211a8063605d7d284d233c3b6ea501daa4a514ba9df9f881a7283363f93b21ff49bc7fc0d76468a9a82d45
diff --git a/dev-python/mistune/metadata.xml b/dev-python/mistune/metadata.xml
new file mode 100644
index 000000000000..f012a7616c68
--- /dev/null
+++ b/dev-python/mistune/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">mistune</remote-id>
+    <remote-id type="github">lepture/mistune</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mistune/mistune-0.7.2.ebuild b/dev-python/mistune/mistune-0.7.2.ebuild
new file mode 100644
index 000000000000..80ff16157091
--- /dev/null
+++ b/dev-python/mistune/mistune-0.7.2.ebuild
@@ -0,0 +1,28 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="The fastest markdown parser in pure Python"
+HOMEPAGE="https://pypi.python.org/pypi/mistune https://github.com/lepture/mistune"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/cython[$(python_gen_usedep 'python*')]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/mistune/mistune-0.7.4.ebuild b/dev-python/mistune/mistune-0.7.4.ebuild
new file mode 100644
index 000000000000..d6c91e615d37
--- /dev/null
+++ b/dev-python/mistune/mistune-0.7.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="The fastest markdown parser in pure Python"
+HOMEPAGE="https://pypi.python.org/pypi/mistune https://github.com/lepture/mistune"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/cython[$(python_gen_usedep 'python*')]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/mkdocs-bootstrap/Manifest b/dev-python/mkdocs-bootstrap/Manifest
new file mode 100644
index 000000000000..ed99d9665974
--- /dev/null
+++ b/dev-python/mkdocs-bootstrap/Manifest
@@ -0,0 +1,4 @@
+DIST mkdocs-bootstrap-0.1.1.tar.gz 363121 SHA256 15084a6be59393fe5ecb9f04d09e674337a69fbd1e6ec5d9328e606a6c6cab36 SHA512 edaf4178f2a5914bf6fb7daaf4dfeabe42eff6872e60ca78bf748b55bb2e487742ada279696ee6f8aad87106d38e7bcf0e24460b85d441b5f77e4f64a99a4b66 WHIRLPOOL 830da77e33bb5d29331724828e6356da5ce1a3f26b7a49d7a751114e6fe06038cca9a263d0f384849910987de2b6581a2a77c5f67fd10430570703eeb4dc9936
+EBUILD mkdocs-bootstrap-0.1.1.ebuild 418 SHA256 3c3e15368269db107c54dc82ce0237248f464471b05a0fd70059f7c9e72c4124 SHA512 07b3ae995690d1731477bad3543247f25757748b1a3490a9823fffea59a5430ed3227078441f90849bf02991d6923ec1033b52492533bb6101d88b7c91735bfb WHIRLPOOL bba53ef48c53999287035bd30380fd673b2cb2fa9abf3c022de68f33919690f500ca4eefa9024066d19f61ee361eb1b96342e0c6364b09039cd1adabc9e6f708
+MISC ChangeLog 653 SHA256 8215cedbe964775cd2eb61ca42528ef4dd423d270a8d6bcd4e943952c5423d66 SHA512 e0a9979bf5f81cf8543a275001c8174855d4a820bfe2a29441305fefebde8bfe18769706cfb2a8fac656c684addafad8ad9ec4519e1068e7429811c9dc9daab3 WHIRLPOOL 32ce8bfac2882fbde9b9dfc9722022a8d2aa39722bf9165a700fb8d943d0ea267b22d6463591ccd1fe0adfa8977bf7275b502cb37550f95bb74b3fb51b425e39
+MISC metadata.xml 325 SHA256 d217e61ecbb1ace42f7dd7a0f60eb235e68dd3517125b474bbb9af965b842e5e SHA512 0ce5098078a4cfda7f20db2926f5b9a9b519c9b8040fbd4f3394200e231124daf50900fc7f6a9903db51baaff1753ca981857911e47e1eac4c270ba5e72b2d69 WHIRLPOOL 75b94f8d2bd40bd64ee65b2a498f3a7ae4c5f24fe107c10c7fa26d27f3017b53b00017b5cfa00c91c0d3adfe42e3a14ba250a1f25e85ba74387216a81cd1d65f
diff --git a/dev-python/mkdocs-bootstrap/metadata.xml b/dev-python/mkdocs-bootstrap/metadata.xml
new file mode 100644
index 000000000000..b80903955800
--- /dev/null
+++ b/dev-python/mkdocs-bootstrap/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">mkdocs-bootstrap</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1.ebuild
new file mode 100644
index 000000000000..9b0896d2c933
--- /dev/null
+++ b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Bootstrap theme for MkDocs"
+HOMEPAGE="http://www.mkdocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/mkdocs-bootswatch/Manifest b/dev-python/mkdocs-bootswatch/Manifest
new file mode 100644
index 000000000000..2269d819d1ef
--- /dev/null
+++ b/dev-python/mkdocs-bootswatch/Manifest
@@ -0,0 +1,6 @@
+DIST mkdocs-bootswatch-0.1.0.tar.gz 4350835 SHA256 8123a872ceba41b63c06f6e7adf46d6d8e6ac74d4fc633df1bf01177b0a63e4e SHA512 1cd770674308fadfaf33a80d6c1e2c0f2c9b1386ce3eb84ccdace02f6a29a9d512b9538ebd1e8a77c2d8d802694fc873936681f531c125bd739eeb4d33ca0e5e WHIRLPOOL fb029d8538588733e60a85c1d14555b6938f706a2943492fbc6c4a02ebfd0ceaca90a92f0138286d0848974a866db080b3326812e2f6db3e21ac5a8d5335896f
+DIST mkdocs-bootswatch-0.4.0.tar.gz 4409488 SHA256 f8036ff93134ee3a45da255d75c12b4cd35e4c684c77bcee6b7779d45887d218 SHA512 46ab2f40fc5167dd96e7dd6d80b99696f371c46a1f0dca029dc444d352da71c0f05f765acd67a7a79a9e3f15140c0b0cec4e395fa247b4bc09f3b77d69b905ec WHIRLPOOL 48cdb12ed81e0cf319480ddc9e9e4652bf4466906ff435e2576f962f1f37caf52b899a1edf35ea05873b1548aa20a35943c57dc51968c8cffa0e0cc61a24d8b1
+EBUILD mkdocs-bootswatch-0.1.0.ebuild 415 SHA256 f6d281acb322e6a37cc3acf61646d54934757241d0b16d8ac0b5f19f86c35b4c SHA512 80812586fa6ef416ddc14a706728b57c90f851acc3c50e9a5c3e3d6299bd814fb6e23c76737294a0302ca2a7da31940883ef21bcc0d403deb49f4e53fa17696e WHIRLPOOL e911088a2d79bb24e610ac149086c10d141bae37131d85487672a10453e8c190feb5182191921922cb2ff8ba9cfea63f3350cec396c2285e2eb66497b060f3ca
+EBUILD mkdocs-bootswatch-0.4.0.ebuild 420 SHA256 2bfb97064e4f9f3885a07b98918eddf255e0479f04bbc14f9594c1902f096a22 SHA512 35f0f0b64b7b52a19e35bcc8f7315e59fbc4031e7fcc8758bc0d215d252167946e2453efd5274543e5b9231349d3c9ec0deed739c94399628c0bf895f92f3836 WHIRLPOOL 9997d703ff14fe67c59e73aaec8b92e1b44a48f13efd8318040d37e74f829a883fc2fc544c6d618571f7287c7639a55837560955c9305b028aa10e6632ae37dc
+MISC ChangeLog 871 SHA256 44ce7c5fc24e5f13b9220fe6ebe89d3e804b458f162fb4c317959692f4e01975 SHA512 4b3373ddfc53f6bce106bbbdcd908e14f9160e2189ee49d028466a4307fbef42a27a459c568f0f0a8a1211c78124699cd77aa52d2b8b5514d37abc370d475ff1 WHIRLPOOL bc38f1c63aff031f6a35c9f004ff3913701ea06f6b01c838a968768525f31eab24d49a05efcb21a0dd0f879f5aff98f22276c7503934536bc8d7ef6c292f0d58
+MISC metadata.xml 326 SHA256 fb4c6a376a4bb7564e63dcbc269609f9ac9a01f663013065dfe7a460c798a07e SHA512 0995ce3164b768d20960d5f4726083534af61fd423fc86ad58a9ea66d5ed5ff91046f5dee4e31c1e0ccafbaf1f8a9c789d976fe7d53d4dbfabc21230daebe24b WHIRLPOOL 50defaf5af657ff281267842c4256342f113278f8c933c31a79064c522a541c649f0d1df9c17865a6e2879a6444487d7aea7c05cccc169b772872c723f93ca87
diff --git a/dev-python/mkdocs-bootswatch/metadata.xml b/dev-python/mkdocs-bootswatch/metadata.xml
new file mode 100644
index 000000000000..c8905ba3d35d
--- /dev/null
+++ b/dev-python/mkdocs-bootswatch/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">mkdocs-bootswatch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.1.0.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.1.0.ebuild
new file mode 100644
index 000000000000..5a509cc34b7f
--- /dev/null
+++ b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Bootswatch themes for MkDocs"
+HOMEPAGE="http://www.mkdocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0.ebuild
new file mode 100644
index 000000000000..012e3922c692
--- /dev/null
+++ b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Bootswatch themes for MkDocs"
+HOMEPAGE="http://www.mkdocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
new file mode 100644
index 000000000000..4c906a80912d
--- /dev/null
+++ b/dev-python/mkdocs/Manifest
@@ -0,0 +1,11 @@
+AUX 0.12.2-skip-invalid-test.patch 485 SHA256 e852bdd7e688e750a382974c94f8e5d7a179954e684250217467972735eb018c SHA512 86974523c2011094f5ae5476e3d1882eb9fb4aba69991e616315a22ce6fad228b8129639de201d3048b6b8322cd06064ed498f20e9db1221b92bda004fe4348e WHIRLPOOL cbb83b6d1021c9d41c9c49a24b008a570aafafd9841d6af06421db37443151521a2e83aae8a7d9ce645ffe1d555950d00711115d756904145e5dcc226e5a3119
+AUX skip-invalid-test.patch 1078 SHA256 926330eeaf0a024bc1213601d3354ac25bdd5f21f8d0e0e5ea47937aa4d81967 SHA512 47ea0c80540a568c66b8b885fd797b3272bcc80e6fd42c5fc1563a58ed071ed357ef6207efe772a1279de7653f247c1f3a709c69c33cc85b63aa927e450c8727 WHIRLPOOL 99d14be53a0e19c7938260414cf37daee57fa1501cbadfa6348a48a0ea10a03517de7f870ca6f3b17c549ba75998970acd99f30903f9f552cbfe82784f741887
+DIST mkdocs-0.12.2.tar.gz 6042907 SHA256 3d96844b742c00e7466d63a713a3b6b01575aa71f6ae7214dd12797d48df38b8 SHA512 149d8e27df8474ade24e4cbff1b8eef1d7a7549997499c7df774afdb89bc9fe0d8de7d869d8b29aba883d1672032c76e8dbdb7e8982da6f94e2145d0b554e677 WHIRLPOOL c476ff900c94cf880c7f5c5f8edb615f11e4f169bae0b696a217de0c7384c7fb4818b5f9afdfb8a6f7c5c77877ada518f938a1b0b756703b5866f82b6a240262
+DIST mkdocs-0.14.0.tar.gz 6248506 SHA256 fd3e1623dcd7027dbac55f4d8c4f1c1b990e87588ee463999e717b5083556b73 SHA512 47c95f258362df8b124a9689a79a9927d26b1f7816b027fd14d193c79bb5340bdea8770c47566e00452edcdf801fe858569f4c76aa9d3f1799e6e7100bb916ff WHIRLPOOL be64596ebbd3c206ce805fa268719db49ff16272d63562c80664d9515f3a164304db80b680dcae7ff1a50a61cc42aa8a47c2df9ff6be270788eae36b5fb1e78d
+DIST mkdocs-0.15.3.tar.gz 1805972 SHA256 a5442ae24fd9e6f9daeefaf354c960e5dac27ff388f63e1bb324ed8a1b7edaa9 SHA512 e5b72eb56dcc2fe2be154155af15845a7d0fc06d6176f1c6b2bb54e8673d207146bdd92b37a709d72c1d59fcc76a793e6fed5d7fb6d9008f28d43baa17e446f8 WHIRLPOOL 35bf8e111ad66e22edb3ad2d9e9ec993da0d866621a2a97eff6779ac8c2f20a20a644ee49c7255bddde3e5db4321881c831bf7491d7313b70b4a3e3c483ade87
+EBUILD mkdocs-0.12.2.ebuild 1257 SHA256 bcd7c61240ec22144263ca5cfa9f8c701432f14a57cfc51a5a99c640223c76b5 SHA512 dbe02311fef0289bebfee87e31474a1b67ea761026bfe121bd8d96b3da7463c78c509f3308a0969f232a01ab8bc35e1fcf0412735c0c09b2f8517778bc59d190 WHIRLPOOL 813b9f22f2d497e578aac6e1a0ec989c70a99d5c79c0fd33355ff351dc76e86979d540a28b96d72145c16494e09307f9d08132684bbb31ae864e7e6fb254c182
+EBUILD mkdocs-0.14.0.ebuild 1107 SHA256 c352cb770ab68bbe17f040ce22ad23d32aa9889d1e7120a4fd509bb8b050d248 SHA512 766a9bd4f0f7497cbdf97abcbbc1f7a6ce4e5e05fcea8069d911a8e6792ada244156f883e6711e1899d0940bc8ee000cbd5d947c121d41523346e47a7a0076d9 WHIRLPOOL 80f02ba127dbb2c3b5c5a4e5b3f535079281c30ab3f49ea0b1ac10a93fe02f5e6f75b5cdd9bc0e53e73f19791a097da30420e2e4a0eb3782561be6135fea98cf
+EBUILD mkdocs-0.15.3.ebuild 1061 SHA256 a37f7ea40277ba316adaab70a65d3c7e4bbeb74c574e70e092c538b2cef2a693 SHA512 bc6b8d0ac0f6644e49659e3cc35c28a818b085e9ac60d812226f3b9b74c17f681b978e582a538d4d8a39bcdef94fed11d97542b0dccacd2a967263657dcd2093 WHIRLPOOL c7d50d8cba3f23700db27714f150ce719f4b9ff931067506ad0d5f7edbf2840ef809e31df6d8545da5774971829a5fca981348dbc70cf52c6ba2a7e6124cda8e
+MISC ChangeLog 2833 SHA256 0c71473970bd6970cf2ab1ec6b30934f96072dbfe6db7c0a78bad71c3825dd05 SHA512 9d4400d5bee1d08cf74e593d484c00c2023deae237a76ab8a15e2ef2c06947cab975bb7912137e8fa0b2967ce3758cabd410441d873eec9c9f16b1cc9b27c737 WHIRLPOOL 057a5cc9ab4ead27d3131e62d971e2ffee7ca5c608dea1f5c9d89cdb5e525ac9ad05b1e80c828cef6c0692e465d65ea540700518910d8f44a69e6e4af7fe8087
+MISC ChangeLog-2015 1194 SHA256 637f1e16de3b34c4a8c784c5666c9d55e5f49bd09d075ef6f25e83f8f926886a SHA512 41e07f49e883f4fd0319742ba0cdb8eedd4e85fc5a7cf8f34f3e1c570c29733c88e3bbf41783fda52129616722f84347c2b07a724be687f62795a450eefc0b0c WHIRLPOOL cb63d6a8b5c84abb12b3b39dea6d28482b703d86b0d05f4b7e3d703eafafdefd81bd91604a415a5c8b73ab2e3ecd9ce24eae1e9bcd835bb2f9218eefbd471524
+MISC metadata.xml 329 SHA256 a9745b4963f977ccb3801a4f5434eb7dc2bfb63ddfb8fa5efd3ae353e6fab1b9 SHA512 194126a085884dd5ceac7ac44f3e637549bdf66d1ad650cefa48169aa6d40b4741505ae51b4a8827c7d720c76ad5f8d33ace3e0d6be56123a181a3568b9c0f80 WHIRLPOOL dcc3a1e4290ef2cde5753a48c4a9f1d231d33a21534eda0b6c4ddb379a465bd8891dee805c7c3587c3ab264e9910d7536d4fd7ca1acf93ea89c35ee3bc85015f
diff --git a/dev-python/mkdocs/files/0.12.2-skip-invalid-test.patch b/dev-python/mkdocs/files/0.12.2-skip-invalid-test.patch
new file mode 100644
index 000000000000..cb8a23eb8131
--- /dev/null
+++ b/dev-python/mkdocs/files/0.12.2-skip-invalid-test.patch
@@ -0,0 +1,12 @@
+diff --git a/mkdocs/tests/config_tests.py b/mkdocs/tests/config_tests.py
+index 647c695..b26d59d 100644
+--- a/mkdocs/tests/config_tests.py
++++ b/mkdocs/tests/config_tests.py
+@@ -130,7 +130,6 @@ class ConfigTests(unittest.TestCase):
+             {'docs_dir': 'docs', 'site_dir': ''},
+             {'docs_dir': '', 'site_dir': 'site'},
+             {'docs_dir': '', 'site_dir': ''},
+-            {'docs_dir': j('..', 'mkdocs', 'docs'), 'site_dir': 'docs'},
+         )
+ 
+         conf = {
diff --git a/dev-python/mkdocs/files/skip-invalid-test.patch b/dev-python/mkdocs/files/skip-invalid-test.patch
new file mode 100644
index 000000000000..58bf9e4c01da
--- /dev/null
+++ b/dev-python/mkdocs/files/skip-invalid-test.patch
@@ -0,0 +1,24 @@
+diff --git a/mkdocs/tests/config/config_options_tests.py b/mkdocs/tests/config/config_options_tests.py
+index 1721bdd..4a41658 100644
+--- a/mkdocs/tests/config/config_options_tests.py
++++ b/mkdocs/tests/config/config_options_tests.py
+@@ -180,7 +180,6 @@ class SiteDirTest(unittest.TestCase):
+             {'docs_dir': '.', 'site_dir': '.'},
+             {'docs_dir': 'docs', 'site_dir': ''},
+             {'docs_dir': '', 'site_dir': ''},
+-            {'docs_dir': j('..', 'mkdocs', 'docs'), 'site_dir': 'docs'},
+         )
+ 
+         for test_config in test_configs:
+diff --git a/mkdocs/tests/config/config_tests.py b/mkdocs/tests/config/config_tests.py
+index fe32fd9..d5ce61e 100644
+--- a/mkdocs/tests/config/config_tests.py
++++ b/mkdocs/tests/config/config_tests.py
+@@ -181,7 +181,6 @@ class ConfigTests(unittest.TestCase):
+             {'docs_dir': '.', 'site_dir': '.'},
+             {'docs_dir': 'docs', 'site_dir': ''},
+             {'docs_dir': '', 'site_dir': ''},
+-            {'docs_dir': j('..', 'mkdocs', 'docs'), 'site_dir': 'docs'},
+         )
+ 
+         conf = {
diff --git a/dev-python/mkdocs/metadata.xml b/dev-python/mkdocs/metadata.xml
new file mode 100644
index 000000000000..ae05e47d193a
--- /dev/null
+++ b/dev-python/mkdocs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tomchristie/mkdocs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/mkdocs/mkdocs-0.12.2.ebuild b/dev-python/mkdocs/mkdocs-0.12.2.ebuild
new file mode 100644
index 000000000000..6dfd3f1c07c4
--- /dev/null
+++ b/dev-python/mkdocs/mkdocs-0.12.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Project documentation with Markdown."
+HOMEPAGE="http://www.mkdocs.org"
+SRC_URI="https://github.com/tomchristie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="doc test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7.1[${PYTHON_USEDEP}]
+	>=dev-python/livereload-2.3.2[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PV}"-skip-invalid-test.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		"${PYTHON}" -m mkdocs.main build || die "failed to build documentation"
+	fi
+}
+
+python_test() {
+	nosetests mkdocs/tests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( site/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mkdocs/mkdocs-0.14.0.ebuild b/dev-python/mkdocs/mkdocs-0.14.0.ebuild
new file mode 100644
index 000000000000..378dd2a258ae
--- /dev/null
+++ b/dev-python/mkdocs/mkdocs-0.14.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Project documentation with Markdown."
+HOMEPAGE="http://www.mkdocs.org"
+SRC_URI="https://github.com/tomchristie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/click-4.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7.1[${PYTHON_USEDEP}]
+	>=dev-python/livereload-2.3.2[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/skip-invalid-test.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests mkdocs/tests || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/mkdocs/mkdocs-0.15.3.ebuild b/dev-python/mkdocs/mkdocs-0.15.3.ebuild
new file mode 100644
index 000000000000..180cb047c7b3
--- /dev/null
+++ b/dev-python/mkdocs/mkdocs-0.15.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Project documentation with Markdown."
+HOMEPAGE="http://www.mkdocs.org"
+SRC_URI="https://github.com/tomchristie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/click-3.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7.1[${PYTHON_USEDEP}]
+	>=dev-python/livereload-2.3.2[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-bootstrap-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-bootswatch-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	nosetests mkdocs/tests || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/mkpythonproj/Manifest b/dev-python/mkpythonproj/Manifest
new file mode 100644
index 000000000000..a6fc16b8373b
--- /dev/null
+++ b/dev-python/mkpythonproj/Manifest
@@ -0,0 +1,5 @@
+DIST mkpythonproj-1.9.tar.gz 34828 SHA256 c89385ce08b46c81c4dbe1a9f77d2078a80ed49fc2fe11c81baf89f3ad68ead5 SHA512 6ace3a00657ca1e853b882e897ae727eede5f1f5d72f016b439be2d747ea7cf4954aed85032a50549c1a44f88fd98afd727476bef77797fa53c2234e1d22673b WHIRLPOOL 4e9564bc4beb1e23670a8e0d5d81c6f7069342ddc3fe403af906f8a516405886d287b9c550912f76f3d3f9e7d56efa1c131e801e8935a5edacd32d8aeea8b9c6
+EBUILD mkpythonproj-1.9.ebuild 602 SHA256 472216101e7901c1740a9a84e7b48a43456835ee85f5f86426f19bd4fb99f656 SHA512 3e7df54cb78128b2b8e41c3798e0eacac143a0f328b6131af240ac22243ea3b96dc90ba14266b7966c16b7001744966a56115bca8e259f0f1305c7db0932703c WHIRLPOOL 4e6476f9dd05c522e685ec2da5b1d25ae99064fdaabdf7cf055f2e6b735a3d91c222a6d6652018dfc8d939027eecedb7fc697dda0a88355f800e22e5d33b756f
+MISC ChangeLog 2561 SHA256 0f4477a1cea10ded7c148f21dd67086ea374e2eed02e8d52a2080de6e97f8e00 SHA512 365d777574f133b93e8a98c7627ed37fbda8d54cf7c82b67e64c89acdab8eca1870f621ba650ee8ada58c77df54203c78864b51f9c6c6aa60d91f18f6620b39b WHIRLPOOL bf0d869ace62a48361638ec4d9bc6cc4da3d96f8c845d2a6094ccb028265fb2804f9b72c1ef948de9d5b7f1063734640f89e98b20de95d31300958baf7ea479a
+MISC ChangeLog-2015 1228 SHA256 b263d671bba7673b213a1f33a7e87dd55423e29fe2e945d47346006ca393a969 SHA512 a2c0d3c2788733a1102784f87546aa0ef02b1b453bf74cb9e833b677907ae223de79fa9666d4a1dddb78e2bbfa3c715d08128cc03818bebcc7e7df00ca0c4cd0 WHIRLPOOL f438bbbd68371e66039685bb5e863e049fdcf56ce5d1a3409a6425cb568597f35f0833601e8c8a05599e754c802a50e2a84c46e57025a7adc902539bb24889ec
+MISC metadata.xml 239 SHA256 21821d28151e5b66338f24e3452d6d6ec7816bb0ca7649f4443a6a2ea7f03a05 SHA512 aaa56fc28c4600c5b0de6d837feece75d69a7ede375e5758766f46dc4fb44060f35e6d6eb343bba9e1698400139059e2118fa401969cdb66b80f422c95b59ca2 WHIRLPOOL 145d875140a6f718c895d3e9fdde5941361f34de2998786365d4fb5afc7c822d6ccd04b35475717fa0f42d09824b2cb004f6e47300415f7298c35d0e0ffbdfbc
diff --git a/dev-python/mkpythonproj/metadata.xml b/dev-python/mkpythonproj/metadata.xml
new file mode 100644
index 000000000000..47612bb6972d
--- /dev/null
+++ b/dev-python/mkpythonproj/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/mkpythonproj/mkpythonproj-1.9.ebuild b/dev-python/mkpythonproj/mkpythonproj-1.9.ebuild
new file mode 100644
index 000000000000..03b4b1424f99
--- /dev/null
+++ b/dev-python/mkpythonproj/mkpythonproj-1.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Creates the framework for a new Python project or script"
+HOMEPAGE="http://www.seanet.com/~hgg9140/comp/mkpythonproj/doc/index.html"
+SRC_URI="http://www.seanet.com/~hgg9140/comp/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mmh3/Manifest b/dev-python/mmh3/Manifest
new file mode 100644
index 000000000000..18238b0d34d8
--- /dev/null
+++ b/dev-python/mmh3/Manifest
@@ -0,0 +1,4 @@
+DIST mmh3-2.3.1.tar.gz 6122 SHA256 ecadc3557c093211a70b49814cf91d6833fff403edf2d8405645e227262de928 SHA512 9ffdf23f7fe33583713daf299fad64d4e3bc3ba433eec4e1d24a47daeffa39b13aedcedd3005f2d873a01dbc2d1b1ed931eed30d09e1887eaa0980586af37cc5 WHIRLPOOL 40784748aeb778efa1bcc2aa7f12f589112b843d6580bcf7b361f4a37a712179609196deb4593e7dcf2a7d1283c110445eadc58680aa7f8393daf31889809744
+EBUILD mmh3-2.3.1.ebuild 446 SHA256 a857fbda473d8963a840091d401195a9c49b0cce02d4a49c371539b832f3e654 SHA512 b51daee76084f4f1c2b971d5fb22969a6a807ebfeb897ad49cf36102b76b34dc0ef4311146964d4cf7f32bc0fd39d0bde53b7c4b0616d79cbf8ca2a03d4fae36 WHIRLPOOL 0009383ba8a7583ffc79b97fb33c39cc6e3a6319ab1c0c97703e1e50922ced43fce1dda2a7e5d317704ad40e5b78157883dac8ccc6c74fec9363ab5f19f30145
+MISC ChangeLog 316 SHA256 d9088c3f1eea9c173641d181d7b5992237f93cc38e74383b7993b8823468f652 SHA512 703da2fe9c7c66d56c06eabb478c74b28c256da5251a548927c9aa00226f56d1be6419b890ba207f8139c966bf4582d1081fe88c493b52c94410ed201696fbea WHIRLPOOL 1ab1da11079001b40eb78fc90593ba2de053c2c6e111dfb18fd52b6f7f19dde6c77f20cc5b74e921c57e3cae16c872d1bbdae9f0587fc477a64c1331ccbd66ea
+MISC metadata.xml 533 SHA256 830b64c2a7181888c02275af5a5dfedefa3fdbd4948c0944395719eed164449d SHA512 0ce139f6e24d78adcb11d7c1bb888daa94d382093a285ade74825abea3321a06dec759a9f8477f588c70e91e5276856a7ddebad3b8377fdd35ae7cc311e30292 WHIRLPOOL d6f63eaee199970a44baed98f5e808d5f76720f99423849e99992dff5d74557b26e3c7e92f7ba69bf8884f52f5e22f0e8d42b727bd40a5d4bdff081f1fa3f8d9
diff --git a/dev-python/mmh3/metadata.xml b/dev-python/mmh3/metadata.xml
new file mode 100644
index 000000000000..cb9929abb3d2
--- /dev/null
+++ b/dev-python/mmh3/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		Python wrapper for MurmurHash (MurmurHash3), a set of fast and
+		robust hash functions.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">mmh3</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/mmh3/mmh3-2.3.1.ebuild b/dev-python/mmh3/mmh3-2.3.1.ebuild
new file mode 100644
index 000000000000..c2c33078dcce
--- /dev/null
+++ b/dev-python/mmh3/mmh3-2.3.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+inherit distutils-r1
+
+DESCRIPTION="Python library for MurmurHash3, fast and robust hash functions."
+HOMEPAGE="https://pypi.python.org/pypi/mmh3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
new file mode 100644
index 000000000000..48c0e9635e3c
--- /dev/null
+++ b/dev-python/mock/Manifest
@@ -0,0 +1,10 @@
+AUX mock-1.0.1-fix-python3.4.patch 895 SHA256 1c751a699597801ac3f00e0fd629759d7f4acc598cad403a5d462e31524f4903 SHA512 86c08b8754a7ab7fe923c5d61d66f1196c603efea86a0e04df2fa8f53280522625e175bfd601de49c1f963c0948a2c6279154cd0e1fb5e7c2e5378ddfa512e97 WHIRLPOOL 7b5ab71ce0d45650a2f1b1f1b28e376bc069eb8f855e79d4416ebe8b7e1042bf173acd1f20c7c2b367acb88d0834215c5d53e5472fd4de5c003e08fc7f5ee0b1
+DIST mock-1.0.1.tar.gz 818644 SHA256 b839dd2d9c117c701430c149956918a423a9863b48b09c90e30a6013e7d2f44f SHA512 4f6f4ebc34843e16b15d866e415ad9992e79bd266a63a22fee31b773ba77615e3406bc8890ceed92c0ee296380d68c46299c4c4448a3526f9cb96b258d32cf58 WHIRLPOOL d5a83199a355d9dc8f327f287e6f6fb889f569eb6642c86390aead3f91505c5fb98512e15ed34cadb407dc0a56d541395132872f1a910d20d330d6d3190f164c
+DIST mock-1.3.0.tar.gz 70908 SHA256 1e247dbecc6ce057299eb7ee019ad68314bb93152e81d9a6110d35f4d5eca0f6 SHA512 10cbb78b89f2e82abfcadc035a526182f83b59df4775cd85acfdbeb4505791c63b7a3761e6126a08d9aedbd07ead8632ac2a728dc07a362f4aaeea694bdecaf9 WHIRLPOOL 783fa1a7dade482c318805cc34bc642e29403e2fd1e6010acf212283d20981216cc8ef85cfea3e72c9f521d2954cf8e895cbe7ee126cd84d780c8b80727421f2
+DIST mock-2.0.0.tar.gz 73684 SHA256 b158b6df76edd239b8208d481dc46b6afd45a846b7812ff0ce58971cf5bc8bba SHA512 a08007651b749d2843b94f5045d74c122958888290aea21930455538a854e6b04c07115e21d82edde996154bf597d7a8784a2f4213cbabc49a98dec22dd92238 WHIRLPOOL eb9a80028946f146f7951046940ccb5bddd2016c279e7cf936829b80fedc4dea6aa912a04d18cfab36b67fdccdb0bb6e71f495e309c1659637fed51c82fed3cc
+EBUILD mock-1.0.1-r2.ebuild 1123 SHA256 bbe3b6d289a921c8aec444d8f4e995e19569f6b0e4d49e28560b9201380f23d5 SHA512 dcd66fc36ed0ae5e45daab0f22062774ddc219feaa1fc2ae86be46fccca563abac4a1deaa1e9c8cc08665429d4f6d99db035d57fe68d47d7dddf3d2a3321b546 WHIRLPOOL 2d9382f4fa48562ccc9090129558df5d86152bb65552fc36801a86eb0677ffd8d670b49266676e377e9a3ef9d9a6c9681e679c4c53316beaf4440adc7e5b2352
+EBUILD mock-1.3.0-r2.ebuild 1073 SHA256 1f985baa287fed89164dd244c13232a2405ffedfbbce54ed80df6e914c25965a SHA512 601b41f1e291903f62a786900aef41e815396c21c2536ea1d9d0acfb27b305765bc3ee7ec2fa8270f14d6f70f76361cc007cd9cc926fc072b1cbcee145913e39 WHIRLPOOL c642e5450ecccafc2ffffd03ca2528ebc47d5bb085856603b7097bda2033f189578d9b49bbd4b6c3801105c680a1a139cadc7b3ee44ebdd21fa1e873f38a4aee
+EBUILD mock-2.0.0.ebuild 1084 SHA256 2faa24d395dbfe8ecef92dfa6b826ca7f31bfe9e533e07d016f49634cd4ce76f SHA512 45e9d2983daa5a90142c2cc1da13418f5c89285685eacac271fdb76f2eada9e0f6d6a9e8a1011b4939b9c6ec78a3a0242a05e9d35614b3cacb412e970747a04d WHIRLPOOL abb657b9a12dd883ba63667cc807ccfe087488e83fe72f091653c264df0663a6f646f3fbee347516438e9318d7206d2f7392ef5f8f801586016d48ede1e13683
+MISC ChangeLog 9139 SHA256 884f490f7add0325033de1eb34f2cece40d36819d1fd8e50d80f66ea2f76bfb6 SHA512 d2f999da351a21c127468dbe4a177fd1cc3ab977e5ada2e8505962eb58e37e66465f86af728be56e29699907cb41ffca5e27c4b8d7a9569cffb8284b299ae9d8 WHIRLPOOL d73ccfe6611b62b1417d13fea8fe6e23949709eb9b7dd61a03946c33a3a4535058644bc42f394f05e1b4c8d69db962740e1fcac2f515fce187a26c318b4e538c
+MISC ChangeLog-2015 11480 SHA256 5b8bbb68ce0512fc0374925e7ce774d47cb322c754f563b22d381b593b3df7bf SHA512 2e712ea2f21ea09cb282a55aee51c7352a216a6732ef9c8e9cd0a0b1a70d307cdb4d3a49f416d01280eeb1c7fd294795a8bc7b25c18933cb7df9582968dea619 WHIRLPOOL 8a6b079af71c6f05cc4a7c8a9ad3aed4b742d463dd0ab92ad01811eb969e26f75874235301543c3a120e58a2fcd0073161f1faa95be2de9b93c3c1089ba46766
+MISC metadata.xml 365 SHA256 82d0e71a904db861cd71393009a1cfde0924b60c3e0283a0a5bca68c71cee275 SHA512 89eda97d1f0ece91d573a9fc4fb5d357733b757b1214a56c7bb14a10f84e1c275d2cc49ed773597c4e320df03f751fb093fef7f3805deb450380df4dd83d875f WHIRLPOOL 7a086974296517fbacdbce679fd980595db2bc4317672d444aa2413dc04ab961d770fe0e0469839da49d45654d49624495808d54ce4b444e4913a0b50e035167
diff --git a/dev-python/mock/files/mock-1.0.1-fix-python3.4.patch b/dev-python/mock/files/mock-1.0.1-fix-python3.4.patch
new file mode 100644
index 000000000000..166ee2ac00d3
--- /dev/null
+++ b/dev-python/mock/files/mock-1.0.1-fix-python3.4.patch
@@ -0,0 +1,30 @@
+# Fix test errors with python 3.4 - thanks to Ubuntu developer Barry Warsaw.
+
+diff -r d356250e275d mock.py
+--- a/mock.py	Tue Apr 09 14:53:33 2013 +0100
++++ b/mock.py	Wed Feb 26 15:12:18 2014 -0500
+@@ -239,12 +239,21 @@
+     funcopy.__name__ = func.__name__
+     funcopy.__doc__ = func.__doc__
+     #funcopy.__dict__.update(func.__dict__)
+-    funcopy.__module__ = func.__module__
++    try:
++        funcopy.__module__ = func.__module__
++    except AttributeError:
++        pass
+     if not inPy3k:
+         funcopy.func_defaults = func.func_defaults
+         return
+-    funcopy.__defaults__ = func.__defaults__
+-    funcopy.__kwdefaults__ = func.__kwdefaults__
++    try:
++        funcopy.__defaults__ = func.__defaults__
++    except AttributeError:
++        pass
++    try:
++        funcopy.__kwdefaults__ = func.__kwdefaults__
++    except AttributeError:
++        pass
+ 
+ 
+ def _callable(obj):
diff --git a/dev-python/mock/metadata.xml b/dev-python/mock/metadata.xml
new file mode 100644
index 000000000000..ab357a34d6e4
--- /dev/null
+++ b/dev-python/mock/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">mock</remote-id>
+		<remote-id type="github">testing-cabal/mock</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/mock/mock-1.0.1-r2.ebuild b/dev-python/mock/mock-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..4b2f4513446a
--- /dev/null
+++ b/dev-python/mock/mock-1.0.1-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python Mocking and Patching Library for Testing"
+HOMEPAGE="http://www.voidspace.org.uk/python/mock/ https://pypi.python.org/pypi/mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc test"
+
+# dev-python/unittest2 is not required with Python >=3.2.
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-fix-python3.4.patch )
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( docs/*.txt )
+
+	distutils-r1_python_install_all
+
+	if use doc; then
+		dohtml -r html/ -x html/objects.inv -x html/output.txt -x html/_sources
+	fi
+}
diff --git a/dev-python/mock/mock-1.3.0-r2.ebuild b/dev-python/mock/mock-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..6604750c8115
--- /dev/null
+++ b/dev-python/mock/mock-1.3.0-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Rolling backport of unittest.mock for all Pythons"
+HOMEPAGE="https://github.com/testing-cabal/mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+DEPEND="
+	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
+	test? (
+		${CDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/unittest2-1.1.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.7[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	nosetests --verbose || die "tests fail under ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( docs/{conf.py,index.txt} AUTHORS ChangeLog NEWS README.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mock/mock-2.0.0.ebuild b/dev-python/mock/mock-2.0.0.ebuild
new file mode 100644
index 000000000000..9c5af1506b58
--- /dev/null
+++ b/dev-python/mock/mock-2.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Rolling backport of unittest.mock for all Pythons"
+HOMEPAGE="https://github.com/testing-cabal/mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
+	>=virtual/python-funcsigs-1[${PYTHON_USEDEP}]"
+DEPEND="
+	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
+	test? (
+		${CDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/unittest2-1.1.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	nosetests --verbose || die "tests fail under ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( docs/{conf.py,index.txt} AUTHORS ChangeLog NEWS README.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mocker/Manifest b/dev-python/mocker/Manifest
new file mode 100644
index 000000000000..47ddf3788a2e
--- /dev/null
+++ b/dev-python/mocker/Manifest
@@ -0,0 +1,6 @@
+AUX mocker-1.1.1-pypy_test.patch 1380 SHA256 432470af0be4b86cfb01b8baf96cc617fcc043950f45274b467a5df43771852d SHA512 cbbda1c8903658332f7a391c7be547d62d64c5b149c2d92434558415dafc0c68686d5210ba814ba5edb42987f04e51cb8e5ee10e3a31684560a0856f9aba81c0 WHIRLPOOL aaf9e74486a4dc6cf3cc63a6a7d7d226f794e67b0ab64ba8bc6ca8aa67a792dd8c9b42b1e10d17d670133b7af64ad6cbc83d727fe3b362bd4fa7855391a6a29e
+DIST mocker-1.1.1.tar.bz2 36357 SHA256 2009911707c74b28bdc9959b5224717e45fcb93475b4b7bb4efad3285fcf2919 SHA512 79fc08220b932f5e8ec4999a872fd522a71e2d193fb7842a60b164793863d97aefbd5b16469243c323b8ee151a33e1ea18703b7ceaa239c816bc09a3fb7f6825 WHIRLPOOL 29103b97a278575a424ff46f986459d93751a2865fb1eecfa37134053dfdd03e0998f280b44c43d9c9bd4044b7121b20c191e7dc1989790d774eda653f731619
+EBUILD mocker-1.1.1-r1.ebuild 669 SHA256 b26038b47c570023f006fad44b85e1dd830ac0f0cadc272d85dca3d67a236fd8 SHA512 d3811d6b6650deeea98f94499dfca47c6f8a8e6642a301851f7269c365e7b674a1dd93a706d781cfb46fa92bc289a6915305f430afc4c243e33d83a3a2ad672c WHIRLPOOL 4b9b8232fbe3126479a6704a59f34c2fac6b877ae51de2de71f09cca906060e4c92eba65a913cfce863b844b52fe8a806770bee3580726315ce74de4173c28d4
+MISC ChangeLog 2614 SHA256 4393200e76bda1cfdd820b5ca38b14a4d27f5f162330aa9794f97475a391c6c1 SHA512 771edd53e5dc7ce4fe01acf9fa4d012abb6da6ffa8709f34e9f2f9693fe83b84850367ee1480f9e5b1543b808d050829bbd20327e066fee28bb7ce9eae88c384 WHIRLPOOL e703048a1dd028bea81e42e15435fd6d6d16e567dafbd5f4b810f506d53b9e378ae7fd5b83ae3158bbe2ba6ce555eeb6ab2355bfafa3a7d3deca5ac3ed6d224a
+MISC ChangeLog-2015 2418 SHA256 4b859f6e6671bb566e173b7b89942f9c4d388f485751b4610615a10cb0e84c1b SHA512 1962f94a2b888f87b23d908112fcd8674794df5e780c73edda6a35388ec5b6374e59eeb91e17d70823c69647db473486e4f9d27148c1d23d6650e4f66607aea6 WHIRLPOOL 8f1b97efbbecc9593cf384ce7e57059b0a47fa7d29a0df6f12822a546ad5b8f6e116751270a54c03dbd84c631d6f5776e307f4c6fd087a93c832effeb1db2efa
+MISC metadata.xml 319 SHA256 b2f7bddd4be11a25163cd328219b3a107b025605b89571072496bcd2fc8b6576 SHA512 e5b4c5a742d74593e9bb504b3ec84dec33f96dfd414eecacfeb1b28542018b54979ec971259e8aeb193fb2a11acaac25d461684f75eb6832f4aba26739f1a8e9 WHIRLPOOL 411ff6e34a2b9cf801fba87ecb64a06c1b27468d563745aac1e2cd5d69c08a47338f6bba5a18fee0a880da6b6468b2849541c40beabf47c2a81c6d4809b2f8b4
diff --git a/dev-python/mocker/files/mocker-1.1.1-pypy_test.patch b/dev-python/mocker/files/mocker-1.1.1-pypy_test.patch
new file mode 100644
index 000000000000..b0036ad6dd11
--- /dev/null
+++ b/dev-python/mocker/files/mocker-1.1.1-pypy_test.patch
@@ -0,0 +1,29 @@
+Upstream maintainer assures us "The "assertRaises" line should be skipped IMO. The next call actually succeeds,
+but of course there is no point to test for unsupported functions."
+Re the 2nd patch;
+PyPy actually behaves as if __slots__ was added to the class
+see http://morepypy.blogspot.ch/2010/11/efficiently-implementing-python-objects.html
+diff -ur mocker-1.1.1.orig/test.py mocker-1.1.1/test.py
+--- test.py	2012-05-19 19:27:02.000000000 +0800
++++ test.py	2012-07-11 14:43:57.848953730 +0800
+@@ -3880,7 +3881,7 @@
+         from zlib import adler32
+         # If that fails, this test has to change because either adler32 has
+         # changed, or the implementation of getargspec has changed.
+-        self.assertRaises(TypeError, inspect.getargspec, adler32)
++       # self.assertRaises(TypeError, inspect.getargspec, adler32)
+         try:
+             task = SpecChecker(adler32)
+             task.run(self.path("asd"))
+@@ -4060,7 +4060,8 @@
+                 self.calendar = calendar
+         obj = C()
+         self.task.replay()
+-        self.assertEquals(type(obj.calendar), Mock)
+-        self.assertTrue(obj.calendar is self.mock)
++        if not hasattr(sys, 'pypy_version_info'):
++            self.assertEquals(type(obj.calendar), Mock)
++            self.assertTrue(obj.calendar is self.mock)
+ 
+     def test_install_on_submodule(self):
+        from os import path
diff --git a/dev-python/mocker/metadata.xml b/dev-python/mocker/metadata.xml
new file mode 100644
index 000000000000..b523b23fd348
--- /dev/null
+++ b/dev-python/mocker/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">mocker</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mocker/mocker-1.1.1-r1.ebuild b/dev-python/mocker/mocker-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..634d1f874b72
--- /dev/null
+++ b/dev-python/mocker/mocker-1.1.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Platform for Python test doubles: mocks, stubs, fakes, and dummies"
+HOMEPAGE="http://labix.org/mocker https://pypi.python.org/pypi/mocker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-pypy_test.patch )
+
+python_test() {
+	"${PYTHON}" test.py || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/mockldap/Manifest b/dev-python/mockldap/Manifest
new file mode 100644
index 000000000000..7b32c99bcf0e
--- /dev/null
+++ b/dev-python/mockldap/Manifest
@@ -0,0 +1,8 @@
+AUX mapping.patch 440 SHA256 88e2b5bee2c29f12aa8ebeb06073ac295d8d6fa609e8af35fad9a25c57b7662e SHA512 d69af2a319dc5f3511063b36b456a11c44b8d85d93b541cb223542b71eaef71fecd5405bdaa688d9516ca162060f64a4abe284841b7cbeaf69203f37ee5df120 WHIRLPOOL 4f9c4bcd9a8105951865e451288f92014c17c07eb3fe68d8868b75af243119e5a00aabaed7cd65ca7bb18c2f7308ad5ea5b939bd167515d19472a515835baf2b
+DIST mockldap-0.2.3.tar.gz 22369 SHA256 a37eb912cbc0cab5320cb848530c90729d87939ff9264dc38adba3bffc596e65 SHA512 3e17d9f3d6ae5a33014e2ccfe521170af1b136f38b68b216df721059941d958b87f03fb4ed5772282d319cfae9974cf1ae9e4e3bec629d161761e2018ed26788 WHIRLPOOL 2cf75ee5fabf4a350f82fc7b70b7c834e20f3bfddbc33741668c9d6765b57141dd18ae81b3fc2b15c9df20389374f3129e826e193723b220c51f2c721c48f7ba
+DIST mockldap-0.2.6.tar.gz 22892 SHA256 cbcf0480f3f55c427b1c3798f1509b367aa65bece244b87c2d6f7c3ec43f8c5a SHA512 7ff0219eb349bc9cffd0580eb80fc7428ea856824428c048ee7e133d4c6609edfb713a73d6a26e2293156482304bdd4fb8034f600631c8b1e290355a4e9e7f4c WHIRLPOOL 1a9b2a08173aecd23eb35b1a7c60d74a7c92e06d9efbe2a6b5883c88cf81b003e3efb95e20edf8425ccb3809d88a79cd0d0e62132a5ff79c3c08254fb19f6fe1
+EBUILD mockldap-0.2.3.ebuild 1047 SHA256 1f22452dfbb21ad8defface6bc8e8120640a57e21663a3d2f582e7fc9ad069af SHA512 2a87bdbf33c7ec59dd7272fa8171135ac29206d6cb556a72d964e2b240ad035ef8b61a75ceb3240a99fc0013cbc851633adb8028f5d8a7c55de069c9741293b6 WHIRLPOOL fcc375d1a329f634a1edd7da5c2092746cb59a8fdfbfc09f8922ac79f776cc036a326032135fd3c1d766f49062d2533bf8f4f0556a503b1e18601e068c1959ad
+EBUILD mockldap-0.2.6.ebuild 1172 SHA256 7cf69c4a818fdb5bf92e4d65ab7aa81fe2a35b6bd641b3a9dfe18f3e76abd0dd SHA512 37380ae387150b64936af31b134e4cc4e6cac04d34ec43b969d703c111976dc3513d7c3b21ac8274415c95d7d54b6d46c402e516703038190e31d74cd249a22a WHIRLPOOL 76564a2ed8541362d6e034246b84e9620b0350f47a490905e71621a46a6ee6467c237b5ccb374b800981996e1365cad1adfd23f4656fa43ea7460823a70fb8cc
+MISC ChangeLog 3319 SHA256 68b13b99709874e4dba118f1610349addd2f95a93749f1da0b6884f8ba800eac SHA512 461facb22cdaefeeea7924b61da00b21a20ac50676a912cd1750224d0ea9c5a06b33fe959b50b406d7b88c29836ab97c560a9918ead8b3b2d8a4ceca6227d00f WHIRLPOOL 767fd9f454a303bdb0b37af4ab7fd179620b16e444d990b643a5edbc54285509ffa0212a34046402ee8a7f1652a6a733badc8a5483a693aa9f4d81a386458ae1
+MISC ChangeLog-2015 2807 SHA256 b5615982b429790c9dc485a471e3f85ded3ff340776c8e1dac79700e7927657e SHA512 dd1bfbcb73db39f627a3b4835f7f8fa3fe862cd42b41309f395f324f5421d4133727043f206ccbfc1df86f23babf7439fb57e9e9840303d7c0b274ae6d776f98 WHIRLPOOL 6c6604d27d6f024387519ac2362d87690d9bb45738b03d6082a43f529e48cf896ff095fa72e38b0ba3c0f528eff382f5ee470679e85b3868cc8a68615741e934
+MISC metadata.xml 382 SHA256 85b5f50be060e7b5f985834834c71e2d8aa6160a26d22bbd057b818ab350e83f SHA512 2b137abc6da4c0782249954a50bdf8d6ba9dd0254e04afdc5e0d7f5406a0451c78c2ed8b8fbc0c2214eb04a3ad842b250dc1910327cdab58fa5aa43f0de296da WHIRLPOOL f0146972e9092711e125c97a22b9fc9fdc769bbf8a67c75582b8f961f675f5b7207facb28ebb97a89b86e002c5a24c5ada9112fe146714750563500ec6a2ff73
diff --git a/dev-python/mockldap/files/mapping.patch b/dev-python/mockldap/files/mapping.patch
new file mode 100644
index 000000000000..f3cdd862a9d6
--- /dev/null
+++ b/dev-python/mockldap/files/mapping.patch
@@ -0,0 +1,12 @@
+Disable un-needed d'loading during doc build
+diff -ur mockldap-0.1.7.orig/docs/source/conf.py mockldap-0.1.7/docs/source/conf.py
+--- docs/source/conf.py	2014-03-08 00:51:00.000000000 +0800
++++ docs/source/conf.py	2014-04-12 16:04:52.113446583 +0800
+@@ -28,7 +28,6 @@
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+ extensions = [
+     'sphinx.ext.autodoc',
+-    'sphinx.ext.intersphinx',
+     'sphinx.ext.viewcode',
+ ]
+ 
diff --git a/dev-python/mockldap/metadata.xml b/dev-python/mockldap/metadata.xml
new file mode 100644
index 000000000000..210ea1c3b2e4
--- /dev/null
+++ b/dev-python/mockldap/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">mockldap</remote-id>
+    <remote-id type="bitbucket">psagers/mockldap</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mockldap/mockldap-0.2.3.ebuild b/dev-python/mockldap/mockldap-0.2.3.ebuild
new file mode 100644
index 000000000000..757840f26170
--- /dev/null
+++ b/dev-python/mockldap/mockldap-0.2.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A simple mock implementation of python-ldap"
+HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.python.org/pypi/mockldap"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+RDEPEND="
+	~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/python-ldap[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Disable un-needed d'loading during doc build
+PATCHES=( "${FILESDIR}"/mapping.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "hashed password support" dev-python/passlib
+}
diff --git a/dev-python/mockldap/mockldap-0.2.6.ebuild b/dev-python/mockldap/mockldap-0.2.6.ebuild
new file mode 100644
index 000000000000..73665424de59
--- /dev/null
+++ b/dev-python/mockldap/mockldap-0.2.6.ebuild
@@ -0,0 +1,52 @@
+# 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 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A simple mock implementation of python-ldap"
+HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.python.org/pypi/mockldap"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pyldap[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Disable un-needed d'loading during doc build
+PATCHES=( "${FILESDIR}"/mapping.patch )
+
+python_prepare_all() {
+	sed \
+		-e "s:pyldap.*:pyldap',:g" \
+		-i setup.py
+		distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "hashed password support" dev-python/passlib
+}
diff --git a/dev-python/mockredispy/Manifest b/dev-python/mockredispy/Manifest
new file mode 100644
index 000000000000..5216a5fa68e5
--- /dev/null
+++ b/dev-python/mockredispy/Manifest
@@ -0,0 +1,4 @@
+DIST mockredispy-2.9.3.tar.gz 40462 SHA256 3bacb3f03f91d62b3b0214479716108211e164357dba32959abbfaf4a28e06f0 SHA512 cedb3641ee5dadc81d9bb39193157ea3cbb5d53f1d56758b47a6c96d2f0713c6831094e2a7b45aceef72c45e1d7705df9783037ce17ee1180bffd799a17ebce9 WHIRLPOOL 15d7116ba175aab5ef784a14f3480cf9bb8c0552d21e5d12d692079ece660b25d342166ae95557cc31bb5bf7bc010c86f5733ef1201aab30e26969078a002c5d
+EBUILD mockredispy-2.9.3.ebuild 724 SHA256 6485d4e0d6196d552e4012addbaa9ec2e13894918dd45501583a30a5d65ca080 SHA512 95020b10bd89c5eff8e25bc7b832f2c73d07c6a197f0d7201cc0e8f70f4639ce13437a56c19a138b16ac8cce582445ed7d5cd9e6289b439f00c37ccb19795c97 WHIRLPOOL a90b39941800689c78373a0e619b0607d3bfc99dc3372fd2c43a4f0b6e4c3c0ada47630eb0e1632c9337a045706ab68396aeeb88891bdb001126e1d0da83f679
+MISC ChangeLog 466 SHA256 a898e7a3bdf7d4e3d0092b4a9f896f3c38164ee4b1e364f16d843b233de8caa9 SHA512 0d470723dc2563b2bd143d64e127a045fda13500ae5bd28e300e0778e9647c53ec1a1ce6dd73a48e0e03f3930c3270966c6d27313462130153e10b40fbfdc45c WHIRLPOOL 60de3b73d20fc695dea8a418a513266116db5653e4c08c41b2ff40d7ba30b53ead53522384222ef9fe11014da5a0a0902b8026b11e8716df5ffce354858b8633
+MISC metadata.xml 388 SHA256 1f5a490c2b3c4db3c73088c76ea61ec5ef4dcf3613f1a929ccb0567ac0f22b1d SHA512 90aa0c41ba77628a91f0ca65d8e64202a228562e4d08c5e7816b3f1e176f21e0d301674bc113da06904da93b091dd636665aeaa8ccf5f9873f58990b089b1304 WHIRLPOOL 6f0fffc4e7dcfab3c34aabb782ece86bafc8b4cbfdd8f25a83d624e411dabfed0f6c5e63656670d7708d3f3e20cd887fab5ccad24e7932c5bcb7c33ae1a68e11
diff --git a/dev-python/mockredispy/metadata.xml b/dev-python/mockredispy/metadata.xml
new file mode 100644
index 000000000000..85333f5dc732
--- /dev/null
+++ b/dev-python/mockredispy/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>wizardedit@gentoo.org</email>
+    <name>Austin English</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">mockredispy</remote-id>
+    <remote-id type="pypi">mockredispy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mockredispy/mockredispy-2.9.3.ebuild b/dev-python/mockredispy/mockredispy-2.9.3.ebuild
new file mode 100644
index 000000000000..0c5ace6874f4
--- /dev/null
+++ b/dev-python/mockredispy/mockredispy-2.9.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Mock for redis-py"
+HOMEPAGE="https://github.com/locationlabs/mockredis"
+SRC_URI="https://github.com/locationlabs/${PN%py}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="test" # Fail on python 2.7: https://github.com/locationlabs/mockredis/issues/105
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/nose[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-2.9.0[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${PN%py}-${PV}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/mongoengine/Manifest b/dev-python/mongoengine/Manifest
new file mode 100644
index 000000000000..48abaa54aed3
--- /dev/null
+++ b/dev-python/mongoengine/Manifest
@@ -0,0 +1,7 @@
+DIST mongoengine-0.10.6.tar.gz 469469 SHA256 0fa34c2747c987eebe624a794d18ffefbed440e374e3d230b2baed7c98b9513d SHA512 a8d16739892c64ed408afab49c6d33a4b438af83e003844caa101cd51366038ba75121d12b4385a546cf4d946a506bc11f173355f6855e740cef9fddfd6437e7 WHIRLPOOL 58f511cfe80cae44c41fe1f451bd19edfc653e7c885547b16f1cd3436f62273c947c7ce893639d1fe3e1417bc6c4c97034bb84a85cf76886252b426b2e776bf4
+DIST mongoengine-0.8.3.tar.gz 219978 SHA256 e8e8acbffda03d70ab09615135b823b7707bd11a4e6c9327c2fd8cbed145c14a SHA512 b77c36ae008fb31f26a60135fbba3a9cf08375506a760daa3fe9e2558a6c67f4ea769eccf7c472c9ddef900fe50548aca00a81d0e666b007398b31cb4d32e368 WHIRLPOOL 241c0b51a2c9a130ed8416266baa1394d06def7c7b074cec7c6a35da6add251cd0aa05f0350bf9334ee9d3921e6a686c23dbdf5a3120a1459a4adfc134c244e1
+EBUILD mongoengine-0.10.6.ebuild 818 SHA256 7f428f982a1ca92de5f86d082b2416d0f4b4fa20d6fd04943b015308cddd9832 SHA512 c7e381c7961286477e49de4cc71e1e7ff98618e45d0134aeff7d5f5a6105c8407a6156b239afad625e14377c574f49196e7846872ee5e466bed9afe6ec535029 WHIRLPOOL 058270bdc75280f57e03a3384f019443815ffee34cb6806c46b349f8948f4b4a311729d8b6b6540e4e8915d29a8ee5edef368b9b30ffa2247811295108ad9dac
+EBUILD mongoengine-0.8.3.ebuild 776 SHA256 48e05e7f1b51ec5d2c4aa5cd40ebeca07eff190c057944584fc5f5f3b2461137 SHA512 e2326aee8f4b766a24168014326110152d24e073c988617e96dac7870426b79033c23c83ab500384c9fd5d778afc260e92a95ee3ec71cc28d97a9d9362355997 WHIRLPOOL 455d31dad4c01462165693c7b6390dbfa5105288ce7963c3c25d3ac84e9ab9f908c2b818abb8d57b2d503681b946c7f3016e90f3b22a9550bcc6d5b1efef7da2
+MISC ChangeLog 2768 SHA256 b997b9b6965bae65676b23e5485e85785aca77ec883bc948bda91c7a8c6af2e9 SHA512 3318617093c2c991b58d4ed38c5b23fc3c8d609f52e0a3b9b381027a6a2a5c351b07c3a504f2887a295b24e29570749953da072d0fd0b83011fa0fa08e2b6e3f WHIRLPOOL 1b6a9910f886168397b03b1c36d24718e7aadd186e265d9ef0bdf2ae8458be96d47ca78dabdf2da759d35a7871c329c40f3fd8daccafea3199be91902b69c26b
+MISC ChangeLog-2015 682 SHA256 26ba8b33d33874de96c0263fd59ce02dbb87ca927503be422b63b845b00fecd4 SHA512 fd884368bdef6f4b2fbbc05cba4e964a67c8d1d06919d771656bd63f526f1d1d76ce7421b76519db41fc2670cfa7f02548a922660ae5cdef9b8dfabad3f55024 WHIRLPOOL 4e754593b854eae31a7babb59ed6450e45df2f7a72cc410f68a1fd55fa9cc2ee6a96f5fa211f99f70871207348c3ea3752bd2516b82b96ff9087d88175f05255
+MISC metadata.xml 338 SHA256 ca7cb81d0d8ee8246a7811a3c48ec1d59b29fc84b9960aabd2b4b7d3fcd6a915 SHA512 b25628f5af0a4c32d9ec8d7bc4e39ccf6bf2c9d9bdaa60bec2a3da846a9a290944822a1d8233cda735a4cf3a801acbfa47826f6bb537ce5c7efedc669282e523 WHIRLPOOL 463a4b7cc2c5f134dc808e4c80c7561d3c5cbf7cb2c8620a9f18369ac3b6242aa71534863b09e6724e4466117b76c05a557b62664eb2bc8bfd49643c5ae220f4
diff --git a/dev-python/mongoengine/metadata.xml b/dev-python/mongoengine/metadata.xml
new file mode 100644
index 000000000000..f96ee66ae8b3
--- /dev/null
+++ b/dev-python/mongoengine/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">MongoEngine/mongoengine</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mongoengine/mongoengine-0.10.6.ebuild b/dev-python/mongoengine/mongoengine-0.10.6.ebuild
new file mode 100644
index 000000000000..f55967b86616
--- /dev/null
+++ b/dev-python/mongoengine/mongoengine-0.10.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+RESTRICT="test" # connects to local DB and other nonsense
+
+DESCRIPTION="A Python Object-Document-Mapper for working with MongoDB"
+HOMEPAGE="https://github.com/MongoEngine/mongoengine/"
+SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pymongo[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i -e 's/tests/tests*/g' setup.py || die "Failed to fix test removal thingy"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/mongoengine/mongoengine-0.8.3.ebuild b/dev-python/mongoengine/mongoengine-0.8.3.ebuild
new file mode 100644
index 000000000000..90c2e7758637
--- /dev/null
+++ b/dev-python/mongoengine/mongoengine-0.8.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+RESTRICT="test" # connects to local DB and other nonsense
+
+DESCRIPTION="A Python Object-Document-Mapper for working with MongoDB"
+HOMEPAGE="https://github.com/MongoEngine/mongoengine/"
+SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pymongo[${PYTHON_USEDEP}]
+	"
+
+src_prepare() {
+	sed -i -e 's/tests/tests*/g' setup.py || die "Failed to fix test removal thingy"
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/monotonic/Manifest b/dev-python/monotonic/Manifest
new file mode 100644
index 000000000000..416177bb2c1e
--- /dev/null
+++ b/dev-python/monotonic/Manifest
@@ -0,0 +1,17 @@
+DIST monotonic-0.3.tar.gz 6707 SHA256 2825ba5ded67b1a70d44529634d3f4ddfad67a5ed7fdcf026022a3ce175be07b SHA512 772154934ffdd1a12aacc331761ce219980caac1bce243fd0740320a25152cf800142c5787c9423270bf02d18e88973dcd981781e2279b28ce364063102f1099 WHIRLPOOL 83d34eac5ee577ba8c42c6276d1c3a46fc30a63919ffd6f86260c09aaf6720ab171db89dfdaa28fd6d42ebb309725ff2e4e0e6c8306c21f9f12dce3d71436e71
+DIST monotonic-0.4.tar.gz 6702 SHA256 852f656adbf623ee859def6ca2f5498f4cae3256f8320d5c50570ee8a0592ab6 SHA512 604f7d9f2b36e03413a0f9c341b45698440f3b004cd7120d3905e4712ac85daeadc0580ebd471ad9ad699aa2ec625908f13b604b10f656c803f6e885553d7e6c WHIRLPOOL f13cd567de00c24800da8b40ae1018f54b95e98c2ccda194ea2e8cf080c1ee47d0670db59ddaf72df373906d46107ec10a62581544076c7e70379119f3443dfd
+DIST monotonic-0.5.tar.gz 6493 SHA256 8c1f882aa66c41daffa701cbf7121d8d264d0cb7722bbb78a6eccd2d8b12c880 SHA512 55630c99559acb54d97cbaf033ed773e711059282538a16d9169d1efc08e5d5a77ec5a39c8402605b27865e963ab361d79ff2033ac58fb86272f279881ad7481 WHIRLPOOL fdc8896d25b604e0627e2533353b06abda8644b993c310346b530bcdab86038bee9d844f3d440c402488e06eb512cf0a2a53b6204bedff58f4b90d36fd13b828
+DIST monotonic-1.0.tar.gz 7082 SHA256 47d7d045b3f2a08bffe683d761ef7f9131a2598db1cec7532a06720656cf719d SHA512 af2127ba56f346f0ccba324d7398b2c69b8ca3357dbd647eff4ecd8b843c28db935a1e16bf468e0c5e66b54a3bc63ebd24d4a8ea544c45ac22c01eb034322cc8 WHIRLPOOL 1d875e7aade716d670fda4fae34012200a258c234916719d843dd1a94d7ae89523ca8972c439d6aa3d7dfea73803c9df7145123f3b4a511f40ba2a5be300c89f
+DIST monotonic-1.1.tar.gz 7139 SHA256 255c31929e1a01acac4ca709f95bd6d319d6112db3ba170d1fe945a6befe6942 SHA512 50a33ea7459c46e5a901912056976ed6ee8d006d71f96c8b13e462a40d90455aae3d5e50d96ff2ab426b94c4aefa1701b44ea04edd3823860f8adc4e99d2b71c WHIRLPOOL 4098870cc35097ba9f14c068b35d033991d62824b68dd8c62cccc8643a8c71517cf48e9a3c3659c3d2fd5039f993e14d193bf981e08b266caced89c1341ae917
+DIST monotonic-1.2.tar.gz 7173 SHA256 c0e1ceca563ca6bb30b0fb047ee1002503ae6ad3585fc9c6af37a8f77ec274ba SHA512 fe35cb2c23a9d8a6cac712fb0de2ec5bcff177f2f5af6e4d468090444f8c9a6adeca204071d9fc88bc4776e7b3fc30e15f00e77887925a7a39d9886dda412a82 WHIRLPOOL 41068f1f3ca6e02fc41c9379ad3443e477bda60736dd4eb45e91cabef4996df5c982a52f7a748d051b017383c9721d62785dfe6fa850fc4f6802891a2270f118
+DIST monotonic-1.3.tar.gz 7211 SHA256 2b469e2d7dd403f7f7f79227fe5ad551ee1e76f8bb300ae935209884b93c7c1b SHA512 870b9530235715eda099cc332c94935ebb80f52a30523dca90639b9f8b3391dd706a9a8f3aac402ebd8c008672e84cd09b5397e954160751e71940b3a9120bd9 WHIRLPOOL ee2e70d6b45bfbbccaa6eca1ca3ddb9a9828353fb26075047b1780eac8271049d474795fbb3c6e6ca1a8515a307255b20e7e1332075327153ee851affffda5d7
+EBUILD monotonic-0.3.ebuild 472 SHA256 03a7adbdd8f5a502d802ac8816a04cea80f86ef94723717e2d878eb25565bee3 SHA512 1c89f246f260203eb41d1e0243dc73abb5fedcd9c5620a4f56c85249488725e8ac5dfd5c9ea257cbf6122f6d9f9f3279158183db488f0a3d3ee168717c7e3b05 WHIRLPOOL 7b3679656787eec783fff11f68316604787b813413f6c6193c1ddaac0848e5cb808a22f0f8bd78551cb83f916018c22bfe5daf8491328647050fbd5b036d21a4
+EBUILD monotonic-0.4.ebuild 472 SHA256 03a7adbdd8f5a502d802ac8816a04cea80f86ef94723717e2d878eb25565bee3 SHA512 1c89f246f260203eb41d1e0243dc73abb5fedcd9c5620a4f56c85249488725e8ac5dfd5c9ea257cbf6122f6d9f9f3279158183db488f0a3d3ee168717c7e3b05 WHIRLPOOL 7b3679656787eec783fff11f68316604787b813413f6c6193c1ddaac0848e5cb808a22f0f8bd78551cb83f916018c22bfe5daf8491328647050fbd5b036d21a4
+EBUILD monotonic-0.5.ebuild 477 SHA256 9b3c2b1794825c23f8bd255ab8483dd20504afcd8d002d07e1079807d15d4a30 SHA512 16c72e903e35f82a9cac1076f241719d0d3f08d442af12f99a27840546e27bf5713a45ccc4de66be6c6cfd9b9ed742f19b5d706a02c706424821d212a41fa95d WHIRLPOOL 0887047407a15d8cb607276593dc127d846966ba7f7b7bd51d3119c7ecd5585eddb7b4d9418345ed21feaad8f2575e42b35a727896d73c9e28f7f9cc19ee4439
+EBUILD monotonic-1.0.ebuild 485 SHA256 9a3bb01e2513f2af879727fb56e8594f52d3c266f5975b0f7fec9b7dbadd79cc SHA512 e536452af47fbd12dfe47a5d8a637f031ca736e171f4b39d3f0f41a8b131f653e9174ddc1b3eb8f564861cf8df5d61d154b800f9d6277a4ca9741e6990f8daea WHIRLPOOL d4d69c82943d63b3555580aad33f43895d3746e635ce7c29450d27960d18d52bae7ebff4f26826057f2d1b818a607bd4ba1d0a1fed0898fbe3345d6523eabbd2
+EBUILD monotonic-1.1.ebuild 487 SHA256 e40998516b6579342ab73d188dc92f8af8bae2403bba1dcd444a043c285aab30 SHA512 39438513bf3a01ae9fa6f3a94e1dca27b65156f838e8a77bc8596b59bc3a9d96d803a6d63a60c70cb74838216cb494ab7a218f5f30a671663f742532c2ce5ca0 WHIRLPOOL e191b91e96a317be52316b0fa747e797295680c02923114933bc405413c73eab1f456d2496d794059c3a73123d6e5a9d3c7203e2d6fb2244c74ac544b93cba96
+EBUILD monotonic-1.2.ebuild 485 SHA256 9a3bb01e2513f2af879727fb56e8594f52d3c266f5975b0f7fec9b7dbadd79cc SHA512 e536452af47fbd12dfe47a5d8a637f031ca736e171f4b39d3f0f41a8b131f653e9174ddc1b3eb8f564861cf8df5d61d154b800f9d6277a4ca9741e6990f8daea WHIRLPOOL d4d69c82943d63b3555580aad33f43895d3746e635ce7c29450d27960d18d52bae7ebff4f26826057f2d1b818a607bd4ba1d0a1fed0898fbe3345d6523eabbd2
+EBUILD monotonic-1.3.ebuild 485 SHA256 9a3bb01e2513f2af879727fb56e8594f52d3c266f5975b0f7fec9b7dbadd79cc SHA512 e536452af47fbd12dfe47a5d8a637f031ca736e171f4b39d3f0f41a8b131f653e9174ddc1b3eb8f564861cf8df5d61d154b800f9d6277a4ca9741e6990f8daea WHIRLPOOL d4d69c82943d63b3555580aad33f43895d3746e635ce7c29450d27960d18d52bae7ebff4f26826057f2d1b818a607bd4ba1d0a1fed0898fbe3345d6523eabbd2
+MISC ChangeLog 4921 SHA256 d6d2b0ee7660df5cd91b44fd804f51c7bff5cd43c6ab5f17baa94eef8d2322dd SHA512 0f63ffa482fc59f5bf091c310a5d8704291d4c1e938ca0630a8ca83c0eebe2e624292e91ed4e7f1a579ebb9cd5f43336e6a8166652b855d9690cafabe3252c41 WHIRLPOOL 17c82790225d1fa47b5fcde51ef42090b427fbd101b7b43256d829bafc787e58320aa116c248ad134e5004eddcfa477f7eec867be1ed69cedf938cbe12cbc42b
+MISC ChangeLog-2015 586 SHA256 0f04d7442e80d3524aac99b1c6f7f324dffacc1005089a4956952009d245b4d4 SHA512 3b8462f65daef4afc90a86088f98d8f5c7ea09ed7cd288a143c6baf1c0643d9692c8dcbeabdb31b49052e782b30180263519c5db67088d462f234cf125a277cb WHIRLPOOL da23b8c11f68abbfecdbd2dbfbe7fbc79b13ca97ffb7353ab36e717ee22e16bb8b19b95a012b47cd6fc6282a443c3568d83b0ed21771927be84911fb811e0adf
+MISC metadata.xml 372 SHA256 c811889de97f48617ebe124ef3c4cd56b6167b618f3169289da6bc839cfc86b6 SHA512 32a26fff9f0d74fa026eed01cbf274198ce2da20ab63f57af7b9767910c6eab6c1a19022ee05e0499429d696576ddeffe2a891ebb867886d9690a51ac468feac WHIRLPOOL 9d11947857da83fbeace44ad794b73c1bcad7092ac78f7eb0a0d4ac90bf2134b1f89d25d1aca388455da9ac0312cdcc65b9d097094095a8ce63da619cee50bd1
diff --git a/dev-python/monotonic/metadata.xml b/dev-python/monotonic/metadata.xml
new file mode 100644
index 000000000000..4e03e26bbd50
--- /dev/null
+++ b/dev-python/monotonic/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">monotonic</remote-id>
+		<remote-id type="github">atdt/monotonic</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/monotonic/monotonic-0.3.ebuild b/dev-python/monotonic/monotonic-0.3.ebuild
new file mode 100644
index 000000000000..ef8cbbf66bd4
--- /dev/null
+++ b/dev-python/monotonic/monotonic-0.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of time.monotonic() for Python 2 & < 3.3"
+HOMEPAGE="https://github.com/atdt/monotonic"
+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}]"
+RDEPEND=""
diff --git a/dev-python/monotonic/monotonic-0.4.ebuild b/dev-python/monotonic/monotonic-0.4.ebuild
new file mode 100644
index 000000000000..ef8cbbf66bd4
--- /dev/null
+++ b/dev-python/monotonic/monotonic-0.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of time.monotonic() for Python 2 & < 3.3"
+HOMEPAGE="https://github.com/atdt/monotonic"
+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}]"
+RDEPEND=""
diff --git a/dev-python/monotonic/monotonic-0.5.ebuild b/dev-python/monotonic/monotonic-0.5.ebuild
new file mode 100644
index 000000000000..c47d4c844b5b
--- /dev/null
+++ b/dev-python/monotonic/monotonic-0.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of time.monotonic() for Python 2 & < 3.3"
+HOMEPAGE="https://github.com/atdt/monotonic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/monotonic/monotonic-1.0.ebuild b/dev-python/monotonic/monotonic-1.0.ebuild
new file mode 100644
index 000000000000..01ce8a6d0cc1
--- /dev/null
+++ b/dev-python/monotonic/monotonic-1.0.ebuild
@@ -0,0 +1,19 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of time.monotonic() for Python 2 & < 3.3"
+HOMEPAGE="https://github.com/atdt/monotonic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/monotonic/monotonic-1.1.ebuild b/dev-python/monotonic/monotonic-1.1.ebuild
new file mode 100644
index 000000000000..81be52da705e
--- /dev/null
+++ b/dev-python/monotonic/monotonic-1.1.ebuild
@@ -0,0 +1,19 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of time.monotonic() for Python 2 & < 3.3"
+HOMEPAGE="https://github.com/atdt/monotonic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/monotonic/monotonic-1.2.ebuild b/dev-python/monotonic/monotonic-1.2.ebuild
new file mode 100644
index 000000000000..01ce8a6d0cc1
--- /dev/null
+++ b/dev-python/monotonic/monotonic-1.2.ebuild
@@ -0,0 +1,19 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of time.monotonic() for Python 2 & < 3.3"
+HOMEPAGE="https://github.com/atdt/monotonic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/monotonic/monotonic-1.3.ebuild b/dev-python/monotonic/monotonic-1.3.ebuild
new file mode 100644
index 000000000000..01ce8a6d0cc1
--- /dev/null
+++ b/dev-python/monotonic/monotonic-1.3.ebuild
@@ -0,0 +1,19 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of time.monotonic() for Python 2 & < 3.3"
+HOMEPAGE="https://github.com/atdt/monotonic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/montage-wrapper/Manifest b/dev-python/montage-wrapper/Manifest
new file mode 100644
index 000000000000..7a4980f53747
--- /dev/null
+++ b/dev-python/montage-wrapper/Manifest
@@ -0,0 +1,9 @@
+AUX montage-wrapper-0.9.8-fix_tests.patch 2291 SHA256 f2e6bdf8db4fbd86ad8741669e025ecdcc62561664b93af2c33aad0205d53558 SHA512 1466905009a5dadd1f6cf95ab4b97384d2332cac850f61f8766dc7a9b07454fa1c3840e9b5720325db515e36ee8c321610a7ae1c5c24c0272f2f5fe25eafe226 WHIRLPOOL 5765a9209936bd55a15fe70573b68c439a1fbccf3a6f623e74b24fa4ba798790f2a4735af31c2198ae3bb68b740b5e0b0c48291901e0b3187bc39f27f2d36430
+AUX montage-wrapper-0.9.8-increase_rtol.patch 872 SHA256 045944645b1eb9e96e9770caee05a59944a5972156bcdcdbbb5cd5d6933a4913 SHA512 221f0549abef1a1a7a5d2a6edc47da96c54fecd0fe3d4a762153309523731194bb9254fa352ca88eaa13e0cabeae2913ca5313b2dc4feaba705a9af6df92ff12 WHIRLPOOL 8322d82484289408beaf1fe9f6460df51b1ce3bff55a6506d234373aa51b265c5c1c2c7e56bf94161ba1f27db676aef78e86a173e51f73d20cd4c9f1880bf775
+AUX montage-wrapper-0.9.8-use_configparser.patch 533 SHA256 2c12993a2f59dc9bfeb423a4cc2e1332c4251e6f049ec5b0435f4e2f0e4d16f5 SHA512 ed81511da9665429ffbcf2424db7aefa63f0f0a93932380c3685d90918b30a45970f658a8ef69d860c23f216da473884c816b56ffa49d763a620fabf2997c042 WHIRLPOOL aa3121835b13a1b9114f63e5d88255d6eeaaf7271ebeface7f1268d0f382eab1e341b5af2f114d40fe9f80949c0347ba377ea9144bbfd1879c361e9d083ad48b
+DIST montage-wrapper-0.9.8.tar.gz 208240 SHA256 8f7c468f602e3fa38907e481abaede08fbc4cd17faae0b82d86638c0418aa98e SHA512 a9aeb48f86d055448fdfed3a5c3762b554627db10f1374cbd3f7af6002721ae04e9f47828c2084147be40f79c1c4ce6e56568bf61a6cdd78a31ce91de6365ec1 WHIRLPOOL f224a4fe9dba626700e85a78b309f5db0bf1bac26d27457f6f3eb8a53ae58effbe70043c8c1f311029e36e36082540a9da634821df75366056e9ecb7dbc602f1
+DIST montage-wrapper-0.9.9.tar.gz 187490 SHA256 cdf7722297c95ef0c3065de96636d467cb9db4049298f4df10957d209e64a724 SHA512 a113a9f1ca03ca158ed6d8a4520c6710804a5ac10bae3dd0c0231390f771479c43f0cdd08e302c59ac1d608c4865d4b0d7a3a233ad068d40d3f1c0efbc343533 WHIRLPOOL 7c669455641c11963f0da97fa210efb41324dfba9ffa49f45e68b0ca96747472d1024b56e2a851043eb19362d5e4421e16e17b1cd1b1aabfb6f73d8ea1302ec7
+EBUILD montage-wrapper-0.9.8.ebuild 1146 SHA256 0b65422b7d343972ae2a73b70a6855195d894990f0857c6684e5ea8a76248fc4 SHA512 53bea7dd0c18f1cc88aaa90f8891de82717fa0f533ec2d2b5dbf612d750c2ec8c9972f36dda791fd74eddf197a4016827dffe89ace9cadb27cbb80daedc1421f WHIRLPOOL dafff3d468aa0702147c2a92e3a887558708062afc2b3648c7d85bcb208715b638a06838ada53782c78913c462538b8c42eb4edc9895322f7c988b73aa5b0a01
+EBUILD montage-wrapper-0.9.9.ebuild 989 SHA256 338c4cac8f34d18319140e2ec2dc9f66b51b3da51e6152b8afacb6e8fd88e0f6 SHA512 4c363a10eb6932ca947501e22132acfd9c92389acc69fdb1c1158c13711cc9c9b1946567428fd2f24ce6a2c3d1b85ee32f3b427f51dde55be6c388561f1166ff WHIRLPOOL 182c2fbd910c1b92e5cb38ddd838b89d10f88c37021cf2ea82f3f097392bcc91b9e87a0508a83b0a82ab39de2a2aa8a831b18a3e2c01cf2f885421e80a5e7be3
+MISC ChangeLog 498 SHA256 b94e7e8dd9b9bd4071fa79f7093f6c9b50bb83be284ecab9c2c2c3a1ceac1145 SHA512 14ed7e7222e1f95102ce48262ec470d6d57fcf0ac35f14c57dea163adc531ddbaca221ee095e2c3c3417daa88ee06ab78d90877b08fd0ccd6b3a60b96ef76daf WHIRLPOOL 9bcf4cccb5bb90cd7f8e7929c2189f21c89b1e61793ae9af9ade6eee8e8de55485d02fb53769745f1e538b6d3e34973dbd369965c41825324c55596a3de0fb4f
+MISC metadata.xml 640 SHA256 6c36256138a24f35e784d6c5a84c3f610a91c21eca27890a1df0f26accee2bd3 SHA512 ebc6b77919fd327e395610b3479a1bb84b2457cdd08ba850a0e9098b95284705fea84092eeb2322e51686dd8214cd281b681cbc8d28bc0d99068f73ca685cb83 WHIRLPOOL 2671fa929850062dc33194cc893dd0b027ab0661e024e5abf76a9ee23d0c413f5185ddf0f50846b8c996356b560413b5697e23cc463eb6f16390359115b65018
diff --git a/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-fix_tests.patch b/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-fix_tests.patch
new file mode 100644
index 000000000000..8d611b72f81a
--- /dev/null
+++ b/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-fix_tests.patch
@@ -0,0 +1,40 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Make sure that opened FITS files are closed after the test
+--- a/montage_wrapper/tests/test_wrappers.py
++++ b/montage_wrapper/tests/test_wrappers.py
+@@ -46,21 +46,21 @@
+ 
+     def test_mosaic(self):
+         mosaic(os.path.join(self.tmpdir, 'raw'),os.path.join(self.tmpdir, 'mosaic'), hdu=0)
+-        hdu = fits.open(os.path.join(self.tmpdir, 'mosaic', 'mosaic.fits'))[0]
+-        assert hdu.data.shape == (288, 282)
+-        valid = hdu.data[~np.isnan(hdu.data)]
+-        assert len(valid) == 65029
+-        assert_allclose(np.std(valid), 0.12658458001333581, 1e-5)
+-        assert_allclose(np.mean(valid), 0.4995945318627074, 1e-5)
+-        assert_allclose(np.median(valid), 0.5003376603126526, 1e-5)
++        with fits.open(os.path.join(self.tmpdir, 'mosaic', 'mosaic.fits')) as hdu:
++            assert hdu[0].data.shape == (288, 282)
++            valid = hdu[0].data[~np.isnan(hdu[0].data)]
++            assert len(valid) == 65029
++            assert_allclose(np.std(valid), 0.12658458001333581, 1e-5)
++            assert_allclose(np.mean(valid), 0.4995945318627074, 1e-5)
++            assert_allclose(np.median(valid), 0.5003376603126526, 1e-5)
+ 
+     @pytest.mark.xfail()  # results are not consistent on different machines
+     def test_mosaic_background_match(self):
+         mosaic(os.path.join(self.tmpdir, 'raw'),os.path.join(self.tmpdir, 'mosaic_bkgmatch'), background_match=True)
+-        hdu = fits.open(os.path.join(self.tmpdir, 'mosaic_bkgmatch', 'mosaic.fits'))[0]
+-        assert hdu.data.shape == (288, 282)
+-        valid = hdu.data[~np.isnan(hdu.data)]
+-        assert len(valid) == 65029
+-        assert_allclose(np.std(valid), 0.12661606622654725)
+-        assert_allclose(np.mean(valid), 0.4994805202294361)
+-        assert_allclose(np.median(valid), 0.5002447366714478)
++        with fits.open(os.path.join(self.tmpdir, 'mosaic_bkgmatch', 'mosaic.fits')) as hdu:
++            assert hdu[0].data.shape == (288, 282)
++            valid = hdu[0].data[~np.isnan(hdu[0].data)]
++            assert len(valid) == 65029
++            assert_allclose(np.std(valid), 0.12661606622654725)
++            assert_allclose(np.mean(valid), 0.4994805202294361)
++            assert_allclose(np.median(valid), 0.5002447366714478)
diff --git a/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-increase_rtol.patch b/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-increase_rtol.patch
new file mode 100644
index 000000000000..285b525a4df5
--- /dev/null
+++ b/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-increase_rtol.patch
@@ -0,0 +1,17 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Increase rtol of asserts to let the tests succeed with montage-4.0
+--- a/montage_wrapper/tests/test_wrappers.py
++++ b/montage_wrapper/tests/test_wrappers.py
+@@ -50,9 +50,9 @@
+         assert hdu.data.shape == (288, 282)
+         valid = hdu.data[~np.isnan(hdu.data)]
+         assert len(valid) == 65029
+-        assert_allclose(np.std(valid), 0.12658458001333581)
+-        assert_allclose(np.mean(valid), 0.4995945318627074)
+-        assert_allclose(np.median(valid), 0.5003376603126526)
++        assert_allclose(np.std(valid), 0.12658458001333581, 1e-5)
++        assert_allclose(np.mean(valid), 0.4995945318627074, 1e-5)
++        assert_allclose(np.median(valid), 0.5003376603126526, 1e-5)
+ 
+     @pytest.mark.xfail()  # results are not consistent on different machines
+     def test_mosaic_background_match(self):
diff --git a/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-use_configparser.patch b/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-use_configparser.patch
new file mode 100644
index 000000000000..082c3678e125
--- /dev/null
+++ b/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-use_configparser.patch
@@ -0,0 +1,18 @@
+Author: Vincent Prat <vinceprat@free.fr>
+Description: Use ConfigParser module instead of the one embedded in distutils.config
+--- a/setup.py
++++ b/setup.py
+@@ -21,8 +21,11 @@
+ from astropy_helpers.version_helpers import generate_version_py
+ 
+ # Get some values from the setup.cfg
+-from distutils import config
+-conf = config.ConfigParser()
++try:
++    from configparser import ConfigParser
++except:
++    from ConfigParser import ConfigParser
++conf = ConfigParser()
+ conf.read(['setup.cfg'])
+ metadata = dict(conf.items('metadata'))
+ 
diff --git a/dev-python/montage-wrapper/metadata.xml b/dev-python/montage-wrapper/metadata.xml
new file mode 100644
index 000000000000..aa3e481c13e8
--- /dev/null
+++ b/dev-python/montage-wrapper/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription>
+  This Astropy-affiliated package provides a python wrapper to the
+  Montage Astronomical Image Mosaic Engine, including both functions to
+  access individual Montage commands, and high-level functions to
+  facilitate mosaicking and re-projecting.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">montage-wrapper</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/montage-wrapper/montage-wrapper-0.9.8.ebuild b/dev-python/montage-wrapper/montage-wrapper-0.9.8.ebuild
new file mode 100644
index 000000000000..4dfca3796e6c
--- /dev/null
+++ b/dev-python/montage-wrapper/montage-wrapper-0.9.8.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for the Montage mosaicking toolkit"
+HOMEPAGE="http://www.astropy.org/montage-wrapper/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	sci-astronomy/montage"
+DEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( sci-astronomy/montage )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-increase_rtol.patch"
+	"${FILESDIR}/${P}-fix_tests.patch"
+	"${FILESDIR}/${P}-use_configparser.patch"
+)
+
+python_prepare_all() {
+	# use system astropy-helpers instead of bundled one
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && PYTHONPATH=".." emake -C docs html
+}
+
+python_test() {
+	${EPYTHON} setup.py test
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/montage-wrapper/montage-wrapper-0.9.9.ebuild b/dev-python/montage-wrapper/montage-wrapper-0.9.9.ebuild
new file mode 100644
index 000000000000..409d24f27653
--- /dev/null
+++ b/dev-python/montage-wrapper/montage-wrapper-0.9.9.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for the Montage mosaicking toolkit"
+HOMEPAGE="http://www.astropy.org/montage-wrapper/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	sci-astronomy/montage"
+DEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( sci-astronomy/montage )"
+
+python_prepare_all() {
+	# use system astropy-helpers instead of bundled one
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		PYTHONPATH=".." emake -C docs html
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	esetup.py test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/morbid/Manifest b/dev-python/morbid/Manifest
new file mode 100644
index 000000000000..782bf4b84d03
--- /dev/null
+++ b/dev-python/morbid/Manifest
@@ -0,0 +1,5 @@
+DIST morbid-0.8.7.3.tar.gz 15054 SHA256 71a9c88cee81dc473645e8568985dddd92437ca5e0bfc4558677573f8cad9fce SHA512 50a01e75ecf1691dcb6f4354647038627196eb4cd37d6e44812912bf0890870d307c8705f6894ecc389a86508d2dc81ed9195408b922c5ad140104a9b78c26dc WHIRLPOOL fa4ff28cdd13334a1f14ba2681a6d183f62b28f98bc52a792b2d5bf25c489780a04b65577d55dd089f1ceeb4ed246c362d242578fa82ca5bc64b3394bc543f17
+EBUILD morbid-0.8.7.3-r1.ebuild 633 SHA256 b6f3ca30dee79d03e3c7c8a060c3b34e8663eadbc6eb06ddb05adce59544ec63 SHA512 930850cb89301125b885a5b5475949cb57a5603e1da3f0f7a7e513dfce9ad488ece31514dc4baceabcdd89e5d24e5cd8e87126cb91f3058a8e0e8c4d3f70fbf1 WHIRLPOOL 7ce2ebd09ffaba5ffea5db840dc71e65b7c7ded7a6ba3b2857c970e80d7ec92bd298aa07b755b74e66dc86418a3f507cef18628b39495199ebaf958bca0b4514
+MISC ChangeLog 2917 SHA256 d6357c7a68771e51bb64032537b7093c949e2db895bb6b416114db9fd03771e1 SHA512 caf1f39aa69bfd50b5518fe7c3f132ef764693167670e77528b2eb101a624815f52402d05ccfbbc727b204a01105c9b2efccb40982458f34660ad695a5a3740e WHIRLPOOL e65c00b44f99cb49c3c12b0695b683f86d47423359e5370854dc667d782835d5e5c81e0b8abfa1d6c8347ef1ed21dd0e27c28a8faddacc76040fb0114487df24
+MISC ChangeLog-2015 1746 SHA256 af816d04c3dea1863e8fc2e9b91c568640c29001eddc72482312e57ee679db61 SHA512 faecdcb2b3ea849fe96aed39cbba01d611fb0efb5b7ce9d7e13bb722557872072186048940669b2df1f6da850fc50be79b056cd585f648781b7a92d4f2e8707b WHIRLPOOL 5ac463b4d584b7277bbc4d65a97637cba67162017027fdf4721440759b15de6dcabc0b3fc7009045fc301b456152fbf4aa97b94c28eea8d0e9866781ce7fd242
+MISC metadata.xml 309 SHA256 572c102dd3e92b73f5a07bf2286731213fc6b9f44e47c6df6b5c59a45588e509 SHA512 30fff36a70026750507a9682e3482061c6451e7035611941964bec90896402489e13c155acbcc9ca082bb3fb090fea0add83971234e2611c1eddc1e20350e20d WHIRLPOOL e947e863eb53722e81032fa35aaad7cd01ed137a9767d834d5480596e9cee8af2f9d9d09d7d308ba496d9bb5a88217a7a3dad1bed32424700c1d421e96fae1d5
diff --git a/dev-python/morbid/metadata.xml b/dev-python/morbid/metadata.xml
new file mode 100644
index 000000000000..cb0bbdd88866
--- /dev/null
+++ b/dev-python/morbid/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">morbid</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/morbid/morbid-0.8.7.3-r1.ebuild b/dev-python/morbid/morbid-0.8.7.3-r1.ebuild
new file mode 100644
index 000000000000..7a7b5e72ddfa
--- /dev/null
+++ b/dev-python/morbid/morbid-0.8.7.3-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Twisted-based publish/subscribe messaging server that uses the STOMP protocol"
+HOMEPAGE="https://pypi.python.org/pypi/morbid"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
+IUSE=""
+
+RDEPEND="dev-python/stomper[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/twisted-web[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
new file mode 100644
index 000000000000..e84a7a0f40f5
--- /dev/null
+++ b/dev-python/more-itertools/Manifest
@@ -0,0 +1,8 @@
+DIST more-itertools-2.2.tar.gz 19807 SHA256 93e62e05c7ad3da1a233def6731e8285156701e3419a5fe279017c429ec67ce0 SHA512 579a778b91607800c4000a30c7509e9fc44ad1d35598ab9041b547aca9d94b811d3fc0abf5c84413fb70be87eb20177685a8a30dc7146a005fa1eb82986294f8 WHIRLPOOL 75ad77394757b30709700957f20136029100eb0e6a42ca7a031a54f0bc71fc926eb552c1b29b0b92af175a618ae826c6380c2919ae3e74d60fa3423e352a9c37
+DIST more-itertools-3.0.0.tar.gz 37622 SHA256 8b791474073fbaef17fdcd148e33a62fa80ad6edd6eb3f61470e1ccdd30fa182 SHA512 575de991b6337e6416489d92b41201536397d84ff41030a2cf09ea57cc994e03dcb4dd19eda321243ceafd49c11271da43a4c4ed5a9261cf771f0b7f8e40345c WHIRLPOOL b420ef8fffa4751a811eedf456e83812016d16f3f30ca63073bfb3f602b5f8caadc8f556105b63abe057252952b938f6db1e6dbef89b008d61c4c45b8a063941
+EBUILD more-itertools-2.2-r1.ebuild 847 SHA256 4a7d2a31f27b41ef624beb37275f0311fc487c70746d55b1304783943a8394b0 SHA512 c67d4cbfc5ae1a47108ec059f1889bd051b9234b8403ab1a98ed61423e7e6312733fc3398c4039d75775295e682e8e212f887943395016ecfbfa9fd844a06845 WHIRLPOOL 671d29ed4f4f2aca8b5b426815d77cc33e920637736d04792d30a844a65af48ab44d45a991b8c6315e25acd40f9da58ade06667ee8f1dd96a9f06c9156b98135
+EBUILD more-itertools-2.2.ebuild 435 SHA256 abfec9fc6557a8d193635ac93c5544648b2a2fc7cfc235571f3f630fd9029cf2 SHA512 c7fd58b1a94f6fbe85f94ce955b07dae86f8310d22d9307728cb6cb7c812b821a57735e409722c4aab2c7cf79b16433691f08e3d86ec1353ada87c2cc3dc04ed WHIRLPOOL 9fd5c40b9165fbd4741e23c32ef6483f1b8ee4058ea1cec5a94ac330f2a397ba36eefd3d3cb86b44c42a67918921908cc4df9a270300c1a25d36d0f582f0d216
+EBUILD more-itertools-3.0.0.ebuild 929 SHA256 63f881c22e78167b07cf1b1f306aaeb2a5825782f9192f7b950a86cf8f9469d5 SHA512 a0e2d0a0af269e738b25afe7357fe8852350f5adb125bf3973dc34d3796dca9012858658244f332b1df9271524e0aee6f5f442104e08a4b3528795b246cd7c76 WHIRLPOOL e8667f5b39dce9432ed726f2c7d4c1afc2ccfcbbaf4ee5149db07b0781a68873a77e48e9568ff9771d02177fe2c2ca441a5d2eb4efc4b71ea87f2b936e650cc9
+MISC ChangeLog 3386 SHA256 b64a4b8f3b86780d91fba48a77b1f3e4f9181b99bca79d179300297521cccf74 SHA512 5514b6329f45a7a17423600317a736b6073f1229bce11c375e9a4782f15a55ad5623f57bdf30ff0311c9cad20b945aac4bd043bf8f567a6202c4557fdc1576ba WHIRLPOOL 62fd98f6dc843171c00a95dd7f99ce67f4a1987f84b6dac150b5fd1959797df6d4698c8aaea41d966dff379d11f7d21d001ff09b08d0212050559d69f0e8c900
+MISC ChangeLog-2015 832 SHA256 762eaec6d67027152536644b2c2d56b2cec03d0eee7393c6d75922c0629a3d30 SHA512 a92c59f3ed45119603817a2fdb21e7696ca81d7f6962701f17e47f718a4a987045df309c839546224e5ce09700c0bf1ad56fc97d5c30275340b6e6c1428396f4 WHIRLPOOL 87a0f272e03f036c6fb380d7b6cedd575242b04336492184232bc493c6840ba0f7d8c6a4294064fcc253dfce882a0574b06a932783e890cdecf1afb868a15ea4
+MISC metadata.xml 451 SHA256 52bd60900b7e3a43f4719dcdfdc5cbd97bde7139d398a1dfc7130637596d6fed SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf WHIRLPOOL d243c8b7a31e2453a26d95546c990ca8bce56a7fd80ebaa5f2d2277692db0c598deb23f1c83ebfd6fc70a9987b08649eea51438eff9bcab54323f24f4f4b1351
diff --git a/dev-python/more-itertools/metadata.xml b/dev-python/more-itertools/metadata.xml
new file mode 100644
index 000000000000..af8b864b2887
--- /dev/null
+++ b/dev-python/more-itertools/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">more-itertools</remote-id>
+		<remote-id type="github">erikrose/more-itertools</remote-id>
+		<bugs-to>https://github.com/erikrose/more-itertools/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/more-itertools/more-itertools-2.2-r1.ebuild b/dev-python/more-itertools/more-itertools-2.2-r1.ebuild
new file mode 100644
index 000000000000..6220729e1d71
--- /dev/null
+++ b/dev-python/more-itertools/more-itertools-2.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="More routines for operating on iterables, beyond itertools"
+HOMEPAGE="https://pypi.python.org/pypi/more-itertools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/nose[${PYTHON_USEDEP}] )
+		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -w "${BUILD_DIR}" more_itertools --with-doctest \
+		|| die "tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/more-itertools/more-itertools-2.2.ebuild b/dev-python/more-itertools/more-itertools-2.2.ebuild
new file mode 100644
index 000000000000..21b21ab2479c
--- /dev/null
+++ b/dev-python/more-itertools/more-itertools-2.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="More routines for operating on iterables, beyond itertools"
+HOMEPAGE="https://pypi.python.org/pypi/more-itertools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/more-itertools/more-itertools-3.0.0.ebuild b/dev-python/more-itertools/more-itertools-3.0.0.ebuild
new file mode 100644
index 000000000000..3c7a53ab430e
--- /dev/null
+++ b/dev-python/more-itertools/more-itertools-3.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="More routines for operating on iterables, beyond itertools"
+HOMEPAGE="https://pypi.python.org/pypi/more-itertools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -v -w "${BUILD_DIR}" more_itertools --with-doctest \
+		|| die "tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
new file mode 100644
index 000000000000..e718f5b7b167
--- /dev/null
+++ b/dev-python/moto/Manifest
@@ -0,0 +1,9 @@
+DIST moto-0.4.22.tar.gz 192878 SHA256 07c511f1ebcdf28a4022478bbca6c1e11585f41d0301e8d4525c353d0f7c1d59 SHA512 7a5f1f43dbf6202696705c52a35fde4e046febd403b1e1b0a7e98ae25e881c6a86c29d2f27841db5ce8fe34689cd00ff4d2d711cbfc8817723d2dfa675379f8c WHIRLPOOL 636aeab8991f0b6c5931c2085478bd1cc15df6d15ed04d33500e1848d1095d7e3734dc23b8fbe6aab2f067f8c63733feb96c7a06cc530d9dcdd3bbaaecd5bc9c
+DIST moto-0.4.30.tar.gz 614008 SHA256 8575b5d19fff0c6046692de6deb2a77968e34eea8a97d6c7e1b2be2148e4867e SHA512 ece27979911f46adbb0aec9aa3755b13c09ced00b24ea136ab9c8a8a992550e9c38dac15d8b0c71822953f070761083253ee5fb5cbe44a4b108d140ab4407699 WHIRLPOOL b277fa02ecf998f4d9120e182310cbced96cd7b79e6f92a8752872bec5bebbd0ebc2c2d759dfbb7d23cc99e9ea046376d0ad403a6c2c03dfda3a56702e44de2e
+DIST moto-1.0.1.tar.gz 731617 SHA256 1e856ff6c2ec03785b7ac758c2564b1644a5fe02ce00e5653b5a94e71af9532f SHA512 3171ea3e8f9d267960a7b82caf7e42b86fceba5a80e96d35b849e4e72b7fc6aed94090161219a520f9c1b4050f7de12e0f6c0d560ab1f90ca43fc0387b62d377 WHIRLPOOL 071968fe3bd8818d39a6ed1a18db85a0280edd74095c7cdb81029df1146235e4b197179d10dc08c58c04b78609bb108db39cdd14eb7734e10fe1ea867acd3fe0
+EBUILD moto-0.4.22-r1.ebuild 890 SHA256 ba37d089ad6fb221b41a74f3dcaf8b1c4427fe14c636c8c489c85544a8ac086b SHA512 9265c9f325bafa008a2cf07ef2d7ba5463d9365824804feb04bf1fbdcfffa7eb826295469b770158b23520cdc68072c53de427f11b9aa35a73a399700fe4229e WHIRLPOOL 8eb37a2f4ff37ec4a06d8ce0cfac0989cfdca4e176c71c30ebd54f591b71520ca70046ad3ca37f7c89350f87401845a774bbfefb0c65384242b32a91636042c3
+EBUILD moto-0.4.30.ebuild 864 SHA256 cada46d1d93ffd48d13649b6f086b53ddd8974d6a1dbca8cffe3e5e385a1b666 SHA512 f3b3caf523b23b97dfbbd546192342db6b2f802d1a263ecc0022144aa0182f13be7272c319c3894ddf770be926cc43f23cd525b00aa503fa1ec5c113fff6b1e8 WHIRLPOOL 907c041f5279d200ade1d5dcdb0d1c5d63c7a7d7b20d0899b7d77347975e16c5d4365d69eefa35bff574cf277c0b19322e272cffb3e846b0cac21edb0b94ecd7
+EBUILD moto-1.0.1-r1.ebuild 1291 SHA256 77b97343aa3417e25835e7b00798c610b2c7da487e1a268dede36eb90522c3ab SHA512 788e0d7f68107e8558d0222de4b3fd0ae523fc96ffff40b752c6dca4b13ecbff1bd0c18318eacfa2372a4d11aaad4d3bd5ec7f63041712d993434c91f8148e9f WHIRLPOOL f927cb7cccd4442006bb36d90d807d68be21de6ae9fff3c6d873cf6796fc488de74294fce9f041004cf21ba14d8e15c986fa252012db3624d182496d36acfe79
+MISC ChangeLog 3373 SHA256 ded17c0cb029955db9759036404d836acbd0511152dde9c6a9cf48c2b2124033 SHA512 629c5973369efce9ea09564a601a749e5abb1fce35645c6a190662990afce3596334024aa5fcebb0dcf90fabd6c7378280c2c77c05c57abcbbf1d519a9950c85 WHIRLPOOL 456a8a5af55023852044c53cbb310a31b70df425e0ceead95b2255b2f68dfca594e16ddcde588b24ca6ac9ed0e267fbbfc663a7b02610869384f45f701f0a0c4
+MISC ChangeLog-2015 787 SHA256 a7a5385245b86c27c29b073d57391c0b3f47cf053f39a3d336adbb6efee8084d SHA512 49c1a1c0f24b9fa7a27bc49b78a260c4722b93b81e4cde5db339db9ded46481ad20675116d2c995d08fe705e714f12851f5bd77a3f986e761e6011f17ec10334 WHIRLPOOL a538f2f079710c25674e5ba05cbcb7755cffda5929163d255cbbb71cdd57bb34fecc45010da21993962473b380f7e779d1e08f830dd7868e8d21a9c96785c330
+MISC metadata.xml 486 SHA256 b88dba4ebb82225bdd0cff8ecfc6c5b62fc4d5352b72cca33757dcfc96817e23 SHA512 9e69d49c588ebbeef151cee987986de7a942a3daa9bf4d4f442314d7e47bd1ad8650c6190c6313e6f4303c03038313b6562d5e0a32ec536227c04e7702ef316f WHIRLPOOL 97c9e99a76e9778bca86b2767a70ab8ab473c7362be39e0760371e7daa89ff0ffdf773fee8f4ea197c860964a35ad5c5a5ec4f701d184903e30ee975c78ef37f
diff --git a/dev-python/moto/metadata.xml b/dev-python/moto/metadata.xml
new file mode 100644
index 000000000000..b4fa92dbb737
--- /dev/null
+++ b/dev-python/moto/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">moto</remote-id>
+    <remote-id type="github">spulec/moto</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/moto/moto-0.4.22-r1.ebuild b/dev-python/moto/moto-0.4.22-r1.ebuild
new file mode 100644
index 000000000000..7f7c6c56b9f9
--- /dev/null
+++ b/dev-python/moto/moto-0.4.22-r1.ebuild
@@ -0,0 +1,32 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.20.0[${PYTHON_USEDEP}]
+	dev-python/dicttoxml[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	>=dev-python/httpretty-0.8.10[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -e "s/httpretty==0.8.10/httpretty>=0.8.10/" -i setup.py
+
+}
diff --git a/dev-python/moto/moto-0.4.30.ebuild b/dev-python/moto/moto-0.4.30.ebuild
new file mode 100644
index 000000000000..a5c700e06db9
--- /dev/null
+++ b/dev-python/moto/moto-0.4.30.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.36.0[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	>=dev-python/httpretty-0.8.10[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -e "s/httpretty==0.8.10/httpretty>=0.8.10/" -i setup.py
+
+}
diff --git a/dev-python/moto/moto-1.0.1-r1.ebuild b/dev-python/moto/moto-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..8f93f7b6fa3a
--- /dev/null
+++ b/dev-python/moto/moto-1.0.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="test"
+
+RDEPEND="
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/dicttoxml[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.36.0[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.2.1[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+			dev-python/freezegun[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+			dev-python/responses[${PYTHON_USEDEP}]
+			dev-python/sure[${PYTHON_USEDEP}]
+		  )
+"
+
+python_test() {
+	nosetests -v || die
+}
diff --git a/dev-python/moviepy/Manifest b/dev-python/moviepy/Manifest
new file mode 100644
index 000000000000..1d68d44272d6
--- /dev/null
+++ b/dev-python/moviepy/Manifest
@@ -0,0 +1,4 @@
+DIST moviepy-0.2.2.tar.gz 400489 SHA256 751e2165dc54ceb9bc91b6ad52d09d28c3c33723b4869c73c47435c4200a2247 SHA512 a4300b31552e8b4120448b8973ce812579b4f38be48fb46546f4a33e9c10903fb73a89c8075d161d441ecf084b3936ef7d6f0d1b637ad347d00db2c643f1cc43 WHIRLPOOL 73ad6b602d95a75cec765f15179121e79cf4fdd8e5eb5aaa79ebbbdfd5445325dd1f3005242348f063fae3c544d4f0a55bb009516fe30b22c62909d86a7665e3
+EBUILD moviepy-0.2.2.ebuild 901 SHA256 ba5b26388ff8d49fbab3edc55b4fff8c5a6c8d19092e234e63133c7f023cfcf4 SHA512 f095682bc5572848042f905038d659e3cab25c6eef6ed8bf2b9ae9a032a1b34485693d366d78a99c0ee7ba8fe8384f08f5d99c3b3dbdc1d30e15993b67c2a346 WHIRLPOOL 6fc1a0fb1ef2e7e84651cd5dd79b2ba622f6939f9b0404f6035a83a309a890cab0a45c4d4f50459ac46eda11b26796936d4db20417dae50586091bbd597c045e
+MISC ChangeLog 406 SHA256 22e06028185b861d87212913dd5eb38aac5a7a88933bc761163b7efcb85f0512 SHA512 1e541662286cf878c14880254077729f20a51b96a29249e51c2126e4e91180dfc6ed03095250ad49b4418c92f172e0a02b26695115d37abdd0f5410c44c5b70a WHIRLPOOL 49af47b21b415c285f6a1f63c24aa40e26dd35fe6464aeba48e1433122aa0937a541f3e5142dfd503ce37fa3c2510fd2945b101121ca04338fd9f2cdba69ec59
+MISC metadata.xml 732 SHA256 84aae20cc13b45cdd7ee28960f27392bc6bb97a2479396d432da00eb6f149cf1 SHA512 46bce08e60a3a53dcdd6a6fad0ba31c3d11b5c7a4995ac830a31a1e7f0d2ccf458d1c9d1e45ebf80365675cec5d313a6cc58c9b6ce7083daa14483f2832fa630 WHIRLPOOL 0ab3adf431f7bba8703e455be13debaff2ac252f7c13c802f83adeb00d261d7baaf88e4407ccac9c7ede0e70e1bac912097a09c5a1d60902fadb7f283ebcdb14
diff --git a/dev-python/moviepy/metadata.xml b/dev-python/moviepy/metadata.xml
new file mode 100644
index 000000000000..c59c71875d2f
--- /dev/null
+++ b/dev-python/moviepy/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">
+		MoviePy is a Python module for video editing: cuts, concatenations, 
+		title insertions, video compositing (a.k.a. non-linear editing), 
+		video processing, and creation of custom effects. See the gallery
+		for some examples of use.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">Zulko/moviepy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/moviepy/moviepy-0.2.2.ebuild b/dev-python/moviepy/moviepy-0.2.2.ebuild
new file mode 100644
index 000000000000..79c4f69c389b
--- /dev/null
+++ b/dev-python/moviepy/moviepy-0.2.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Video editing with Python"
+HOMEPAGE="http://zulko.github.io/moviepy/"
+SRC_URI="https://github.com/Zulko/moviepy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	"
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/imageio[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pygame[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	virtual/ffmpeg
+	"
+
+python_test() {
+	py.test --verbose || die
+}
diff --git a/dev-python/mox/Manifest b/dev-python/mox/Manifest
new file mode 100644
index 000000000000..b4f84119dc78
--- /dev/null
+++ b/dev-python/mox/Manifest
@@ -0,0 +1,5 @@
+DIST mox-0.5.3.tar.gz 31266 SHA256 4d18a4577d14da13d032be21cbdfceed302171c275b72adaa4c5997d589a5030 SHA512 122606264ea8bf83d38f8576c8208fd1bc17cd76009390f516ed4bdf705d49ccfbeed0fa3e9ac1940df3969e0254662c602c497d6c6833108dfcacc59f1c789e WHIRLPOOL 9c6a2c257250b0217752d728d47b97f8d60be4001e0f5d13e4584b1ae34d2582bb685dfa768246c6cfca838b7fb847bbc6aac3fa35d8c57be9874984eb63b16f
+EBUILD mox-0.5.3-r1.ebuild 528 SHA256 fe1ff7ddfb8e0c4c24ddeeacf57dfb16f3e0a8bd229ba4e1062f227f549100eb SHA512 891372c1456e4ea01ed1437ee869cac01f747f3a914bbd8ff0442b946367ef2567072164615cf6cb8ca2497f043d492be4b6a47264f06e62306ff2ec032b5039 WHIRLPOOL 418904c6589b79878c4f2decb71735c47cf06f0be2f6d6daaca3a2e34cf34df660c2128203a62ba67ccecfa5f1696f9cfad217aec76897c5cb328f8ab76b067f
+MISC ChangeLog 2758 SHA256 2b9db672ee9a16c99c658e445b6054b9cde0e290be6dda2999597944073c4052 SHA512 48d8ebe6007cb67f2bbb54edb1b20dc9794d2b5793027a6f594f4cf835e4846c980cc20247bc15345ef547cc3c1fc76d307b3b2a80aee5e10fe9409939d5fe1d WHIRLPOOL 52563abc1f9c196477f54dde7d2950bf05811846f28c53387672874f2322bdb5a0160f74c8d862a0c5507cd7fea9816cdc4096673095f69f5e9abd52a3fe50e3
+MISC ChangeLog-2015 2245 SHA256 f1c400fc469bc00c60329687df51ff4c05c80be258dbc903ceb0373b6b5e9bc1 SHA512 f4a1d7cba6adad8aae879894faf85326a446c921b077bcf953b99bc52ffc1e0bf2d36b5a28f6868faf85429c27b43091cdf0aa046b2fbbb4b6492b1e59e7541b WHIRLPOOL 65feca08905bd5cedd9e1745586247ccd93c77715c9fe223c154e1e58e071864ddfc41f7d09f7790bc94351972618a7ebd21605469d4ca81f8ecf00d400fc726
+MISC metadata.xml 368 SHA256 52ab8aba1dc4ff80bb11a32410c8209cf1770024db8e8fc8d304412d4f41dc28 SHA512 8a818882c4865dcffe190d21bd89abde52ffdec8bf1190653a011cab2c1e9182e4196d2dae54192fe8042573730cf878ee3e260308623bff6443143dee590f9a WHIRLPOOL 00b5c6a7b9680e15cd6fdd9a24932386460cba47e64bcd4d4462ea9b479ed34daabfdb601ecab6570dd21d7d45c9c09bdae219388b3defbae798fb9dae6dea67
diff --git a/dev-python/mox/metadata.xml b/dev-python/mox/metadata.xml
new file mode 100644
index 000000000000..5c3b83936ef0
--- /dev/null
+++ b/dev-python/mox/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">pymox</remote-id>
+    <remote-id type="pypi">mox</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mox/mox-0.5.3-r1.ebuild b/dev-python/mox/mox-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..fd0438fec063
--- /dev/null
+++ b/dev-python/mox/mox-0.5.3-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A mock object framework for Python, loosely based on EasyMock for Java"
+HOMEPAGE="https://code.google.com/p/pymox/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
+IUSE="test"
+
+python_test() {
+	${PYTHON} mox_test.py || die
+}
diff --git a/dev-python/mox3/Manifest b/dev-python/mox3/Manifest
new file mode 100644
index 000000000000..3e2620a2a623
--- /dev/null
+++ b/dev-python/mox3/Manifest
@@ -0,0 +1,11 @@
+AUX mox3-0.12.0-RegexTest-python3.6.patch 652 SHA256 84e84b250d0d4ae3fb7ec7da5d0c15d17f70ba5015ab4e9e5f6a6e0595a47f2e SHA512 bdb5b27c151a2b2fc0351575fb7f8413a7667b738624991255882c1908df3677f2d8bbc984f8c4179325450f0a5837a750adeef3afc1738090879b70a2b135b6 WHIRLPOOL 55a76980e55db213ebac22a35a3032418230d68ba3383385a032131164799dbb4f66bde322c1272a6b215cae4210bdce7d262e27ffedf60673127a3448e8acd5
+DIST mox3-0.10.0.tar.gz 42424 SHA256 cc0a2447b460c254a51dfd5b51e711647045c29c07ce711b2caf599d5ecba825 SHA512 1f56e17ae150339cb2f33dca065c246cf0ff2f633f182336a576e9ab0bd4512ec8f42a4cb128f38ede33fe7e796552768465cfc626abe4f734b7a06b4625710a WHIRLPOOL 22f25dad0a3bae3b3f0e434eb0b784288f896237471fb8d1a673bb0f41ee1eb968be10424fd2cbe71d2122052721651014c541a1e799804722337dac4595b848
+DIST mox3-0.12.0.tar.gz 42377 SHA256 52c5c1f35d460e4f70d60b20a4283c8cce6d83c03e7be47a478ba104304a9fdf SHA512 73e0215bf127589f791721a0cb9b8e3dcc379a23199339e370d641850a0a14c264eb9db94fbb37c99f9925ee3ebd302de14ec12fe1c8809dd3ca9c10cfd75468 WHIRLPOOL fdfdf53f14e5f9dbf89b8f93279ee14e7b946c1e1fd843efc6da655f86c64fd67844ea32b2170fe2a26eab66274423d334bba1aa55e8f1ea31a6877647d76b14
+DIST mox3-0.7.0.tar.gz 44073 SHA256 7cc2ffac72d55816bbf670b03cf636b4abdc089c3d8b31a6760b22fc1eeedde2 SHA512 ee4b87bad46fdb63e8988186846a1823fe9db512f1cd8cf37266db14413307824e45e38121bd16ca4c7f3753fbc051dfcd98dc5c9c9c933604b007ff1e7fea05 WHIRLPOOL 0c71c0ef8960ee535fa11a27855725601929ebd50ef56611c8aa8ac0bee500b63b3d63a60bb444511f2bc3b05bf65eb7d91821144d56da4e0da343ff3689d427
+EBUILD mox3-0.10.0.ebuild 2093 SHA256 351795b79d0776ba3be13b49c65b68513552e3bc1b1a3835b3827206608a87d0 SHA512 65dafacb31908c9e8291ebb5e3be9c8010894b882ca0f3ffec2db33da5635f3782894712ed491ef95e337411e7c6e52db4c374511e79d3d5c517daf3a77021a2 WHIRLPOOL 77bf5071054a4218227c93faa220cf649c06e7455d1b178ab232720d7f5353ba51a69237ceb480ed5375df600d080950a6c46807657a1d69e44b5c5282a3c122
+EBUILD mox3-0.12.0.ebuild 1464 SHA256 301eed3954a1c514b4484e30c4d62a36ac0a815636dbdcca16110632430864ea SHA512 07d475bbe8181819ab03d648930274ea47ef4213f41c11e08fa6958f29cd74c36e6582ce2fc21564082dae51112c48fea5add532cc5985f51d12350482148cdb WHIRLPOOL efc3423a362ea6d0e6610d8dcaa6364869be1d3d27e4298068e96bd4ac3101b1494e5c5a3fd8be1b65c87a8aca93af3908e14fd3d507c6c0e82c94e743629905
+EBUILD mox3-0.7.0-r1.ebuild 1754 SHA256 907a2c2b298383e80906d16ebf4d51e603547491dc7321820b34a5a82faf6f15 SHA512 a6db15807a493f3d2a9eb4b379c852249f8759ee510d70e0b5f4623f02d045dd5922b17f46cd46f17fb59291ad3cc837ac207186175653dcf9aa09e12586f3f6 WHIRLPOOL 45bcc6a9863eb2089fe57dbec400fb67f2ad7818429cc011cb81983bfc57c462a9856c97cb6c062334a8e2ab524e60f83bc973874a462a0c2fe8ea63e8e70c3f
+EBUILD mox3-0.7.0.ebuild 1539 SHA256 d6e74cb4728b94c8b26f213af477b67fcc41a361ab0e7404e1fd910a51208757 SHA512 a8d0dd9f0de113164aac4511e9bc1381ea250802398214d69f773e875c3d9cfc65c36a63ed0415e1989cf1b0925e70d563d9f4fefc164e5b0b74251cb47a0dbb WHIRLPOOL e16438578f6be24518e38c32630c9579c7939a13440a4c7b17bbc97bb96984e6afb9d07ba41470bc5df1c6a28e34218407751c092dfd762e9cf27af7bfbcd900
+MISC ChangeLog 4272 SHA256 39d29641087331dead27b50381e2a611de741cc4b0fa7f867afe97d17227400e SHA512 e574c21e0ab55d572bb74bf504216ff62736271f589cbd3eae35452d8285ce8da7a02c64ffa847b37e190570b336ec3ebb2bad2d65f50003576f5cfa8bda39a6 WHIRLPOOL 2cbfd6095a5533a05da00ab5ec37950f5e22d679e2b068ce66bedbb17ae57f254be1776ef97ba8ff6224dbbf6b5e74e9ed115e4d5193f6c1885f802d66718f3b
+MISC ChangeLog-2015 907 SHA256 86df0861775ab8f0af1c735dd88a29e167c65ab539f2dcb9d8e68a4d89fbfd7d SHA512 fa65831a4867d86f86d38b68843a53902f57b84f9a69a38aabf762632158bbf2f2fcd2db88947d9881eaea4d43ed519c466a54291d2bc3b9e88a81bca8fa0d0a WHIRLPOOL 13d37c6310b72a3a736d556509a8f8d8ea803aa255e6eb7762210fc4a75230c9d5a80eb8f0f82722a6a06ee18ec1e028fedadf92cc0ade57513cfd4580fbd998
+MISC metadata.xml 323 SHA256 51c6df1fef25a3b6dc63306318d5657c4b5671c66c380df79e7d17a977b63c9f SHA512 cb4be23a6eabcd2f0c9761234006bdba088200a94c23087fd3e09ac054c785bfcbe2c35ac060843cc0de2d4774298ac4c94ba8bd3e16eac9a8a4d08fa342e4f3 WHIRLPOOL 749764c1286635aaac4c24b0d1e64a6e98754cf369fca7ef7da347ee3c504eefca64e5874e781a2f735d6f454b614c461656c835ab20f1989d80aa20a4de63e1
diff --git a/dev-python/mox3/files/mox3-0.12.0-RegexTest-python3.6.patch b/dev-python/mox3/files/mox3-0.12.0-RegexTest-python3.6.patch
new file mode 100644
index 000000000000..8c118e6a9ca1
--- /dev/null
+++ b/dev-python/mox3/files/mox3-0.12.0-RegexTest-python3.6.patch
@@ -0,0 +1,18 @@
+From: Zac Medico <zmedico@gentoo.org>
+Subject: [PATCH] RegexTest: python3.6 compatibility
+
+https://bugs.launchpad.net/python-mox3/+bug/1665266
+
+--- mox3-0.12.0/mox3/tests/test_mox.py
++++ mox3-0.12.0/mox3/tests/test_mox.py
+@@ -316,8 +316,8 @@
+ 
+     def testReprWithFlags(self):
+         """repr should return the regular expression pattern and flags."""
+-        self.assertTrue(repr(mox.Regex(r"a\s+b", flags=4)) ==
+-                        "<regular expression 'a\s+b', flags=4>")
++        self.assertTrue(repr(mox.Regex(r"a\s+b", flags=8)) ==
++                        r"<regular expression 'a\s+b', flags=8>")
+ 
+ 
+ class IsTest(testtools.TestCase):
diff --git a/dev-python/mox3/metadata.xml b/dev-python/mox3/metadata.xml
new file mode 100644
index 000000000000..54da79d5a32d
--- /dev/null
+++ b/dev-python/mox3/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">mox3</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mox3/mox3-0.10.0.ebuild b/dev-python/mox3/mox3-0.10.0.ebuild
new file mode 100644
index 000000000000..0d53cedaed79
--- /dev/null
+++ b/dev-python/mox3/mox3-0.10.0.ebuild
@@ -0,0 +1,73 @@
+# 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} )
+DISTUTILS_IN_SOURCE_BUILD=TRUE
+
+inherit distutils-r1
+
+DESCRIPTION="Mock object framework for Python"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
+"
+CRDEPEND=">=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]"
+
+# NOTE dev-python/hacking isn't actually required for tests
+# >=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
+# <dev-python/hacking-0.7[${PYTHON_USEDEP}]
+
+# NOTE dev-python/pyflakes isn't actually required for tests
+# ~dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${CRDEPEND}
+		~dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
+		~dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
+		>=dev-python/flake8-2.2.4[${PYTHON_USEDEP}]
+		<=dev-python/flake8-2.4.1-r9999[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	${CRDEPEND}
+"
+
+python_test() {
+	# This single test fails on python3.4.
+	# I speculate this is due to the old style classes going away but have not
+	# verified this in any way.
+	if [[ "${EPYTHON}" = "python3.4" ]]; then
+		ebegin "patching mox3/tests/test_mox.py for ${EPYTHON}"
+		sed \
+			-e '/def testStubOutClass_OldStyle(self):/,/def/ d' \
+			-i mox3/tests/test_mox.py
+		STATUS=$?
+		eend $?
+		[[ ${STATUS} -gt 0 ]] && die
+	fi
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/mox3/mox3-0.12.0.ebuild b/dev-python/mox3/mox3-0.12.0.ebuild
new file mode 100644
index 000000000000..d34633d97b0f
--- /dev/null
+++ b/dev-python/mox3/mox3-0.12.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock object framework for Python"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+CRDEPEND=">=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${CRDEPEND}
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	${CRDEPEND}
+"
+
+PATCHES=( "${FILESDIR}"/${P}-RegexTest-python3.6.patch )
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mox3/mox3-0.7.0-r1.ebuild b/dev-python/mox3/mox3-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..76613c59e996
--- /dev/null
+++ b/dev-python/mox3/mox3-0.7.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock object framework for Python"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+"
+CRDEPEND=">=dev-python/fixtures-0.3.12[${PYTHON_USEDEP}]"
+
+# NOTE dev-python/hacking isn't actually required for tests
+# >=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
+# <dev-python/hacking-0.7[${PYTHON_USEDEP}]
+
+# NOTE dev-python/pyflakes isn't actually required for tests
+# ~dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${CRDEPEND}
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		~dev-python/flake8-2.0[${PYTHON_USEDEP}]
+		~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
+		dev-python/subunit[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	${CRDEPEND}
+"
+
+DISTUTILS_IN_SOURCE_BUILD=TRUE
+
+python_test() {
+	# This single test fails on python3.4.
+	# I speculate this is due to the old style classes going away but have not
+	# verified this in any way.
+	if [[ "${EPYTHON}" = "python3.4" ]]; then
+		ebegin "patching mox3/tests/test_mox.py for ${EPYTHON}"
+		sed \
+			-e '/def testStubOutClass_OldStyle(self):/,/def/ d' \
+			-i mox3/tests/test_mox.py
+		STATUS=$?
+		eend $?
+		[[ ${STATUS} -gt 0 ]] && die
+	fi
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/mox3/mox3-0.7.0.ebuild b/dev-python/mox3/mox3-0.7.0.ebuild
new file mode 100644
index 000000000000..518e6181a254
--- /dev/null
+++ b/dev-python/mox3/mox3-0.7.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+# py2.6 capable but unrequired
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+# Use at your own risk ;), or because an openstack package cited it as a req'd dep :)
+DESCRIPTION="The Mock object framework for Python"
+HOMEPAGE="https://code.google.com/p/pymox/wiki/MoxDocumentation http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+LICENSE="Apache-2.0"
+SLOT="0"
+# Required for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+# Though test-req's cites hacking>=0.5.6,<0.7, setting to hacking>=0.7.2-r1,<0.8
+# since it WORKS and supports py3.2. What more do you want
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
+		~dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
+		~dev-python/flake8-2.0[${PYTHON_USEDEP}]
+		>=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.9[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		dev-python/subunit[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
+	)"
+RDEPEND=">=dev-python/fixtures-0.3.12[${PYTHON_USEDEP}]"
+
+python_test() {
+	testr init || die
+	testr run || die "testsuite failed under ${EPYTHON}"
+	flake8 "${PN}"/tests || die "flake8 drew error on a run over folder ${PN}/tests"
+}
diff --git a/dev-python/mpi4py/Manifest b/dev-python/mpi4py/Manifest
new file mode 100644
index 000000000000..1d25df24230c
--- /dev/null
+++ b/dev-python/mpi4py/Manifest
@@ -0,0 +1,5 @@
+DIST mpi4py-2.0.0.tar.gz 1279957 SHA256 6543a05851a7aa1e6d165e673d422ba24e45c41e4221f0993fe1e5924a00cb81 SHA512 6459b482db782fea1a80499774ebfeb09c828b6c3f1805a0ca306f26f3ebcac52ad1c83bb97a98a01b518b6a6c887f6b99dbda9c37381a5ce05ddff0edb16d81 WHIRLPOOL 1b85699303a813cc35118464c80dffe798eb02dd3248c0b61937236f2f6cea533283a443f8a52298d888584e13e013601260b68552528d1b9b6f25bcccb990e7
+EBUILD mpi4py-2.0.0.ebuild 1122 SHA256 65240c57fc953692b797d4edd46689529e39b57e204cd50375502a3d0217fd1b SHA512 3ff46ee005e5f305189ae801d0a1d58336b0f1dcfe705a7abd3086d1a20d2a131486b7c50aa4b9923b312743e8355aaf5c19151a1fb7cdbbdc49b19cccad4e13 WHIRLPOOL 2f170cfce19573d664de5d37d76aae6d4e47d889a47a353d0ef35e62f7e0d9ed0f25ceb8cff6ab6486ad1f1ef6540e33098541e5cc3c4738d37dee39e07c58fa
+MISC ChangeLog 4255 SHA256 4caab3a55ade390ef0f7635b7ea0d95cd2fe0ae2e6a9e7a86facd69ff1b77b82 SHA512 13ab9049f2e201f38f4282ae66e7785e1ba5d1139a71ba1518467cabe1a58ec63a34c7b2cbb7f971b031e26b2282b02c5a8296d25e40ac89f631086c82cce61d WHIRLPOOL de2384bfd64d49df832dd5eaa7771001e22676709fca822201ec1a22cef3ae465a8ec28dc0e580104066e7f32e9196efacd3e642422819bc004e948bf6d61144
+MISC ChangeLog-2015 3033 SHA256 fc15ff4f377fa9a87b3d6a6c7c61ab88e26f54af4086f6ec7c609ef9a3515f23 SHA512 2b0ebdf12c7e0d50794165f6a064b754764a8ae91269ae54d48f03cc14c35e9e8a3b9490e364d82bdb2c3b01adbb555f339877fab8cf3e8dbce3a4e56f62ee51 WHIRLPOOL 38e886eee2bdc54ff6fe2f9bef024bcb811e512048e8d82c68f3a7a61bdd563a951033344fdb4f8f0dfb161b995b603efc703fa08fb25d696916ef1b2a011411
+MISC metadata.xml 1118 SHA256 1a3cb9fcf80e2ff5e7a60db58c87c3b0253683a678a44741ae515a1882880b4e SHA512 7afb6d05007036bf5562d6d262165d8c2576bb49a86f9230f939d6a2ef929affa8461fa6421ffd8d97203a4425b397a8dd8556190364f29622e53a67674978c7 WHIRLPOOL ad2dde2b7fcdda149ad23896fa32ec2f1c8878efcc9d58626ee45db324378dec9a7e0b3c4bf3132184a4f4fb4809f1d901d2bad39bbfd922bb6abc33cd8cf02d
diff --git a/dev-python/mpi4py/metadata.xml b/dev-python/mpi4py/metadata.xml
new file mode 100644
index 000000000000..a7842f1c7b32
--- /dev/null
+++ b/dev-python/mpi4py/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">MPI for Python (mpi4py) provides bindings of the Message Passing
+  Interface (MPI) standard for the Python programming language,
+  allowing any Python program to exploit multiple processors.
+  This package is constructed on top of the MPI-1/MPI-2 specification
+  and provides an object oriented interface which closely follows
+  MPI-2 C++ bindings. It supports point-to-point (sends, receives) and
+  collective (broadcasts, scatters, gathers) communications of any
+  picklable Python object as well as optimized communications of
+  Python object exposing the single-segment buffer interface (NumPy
+  arrays, builtin bytes/string/array objects).
+  </longdescription>
+  <upstream>
+    <remote-id type="google-code">mpi4py</remote-id>
+    <remote-id type="bitbucket">mpi4py</remote-id>
+    <remote-id type="pypi">mpi4py</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mpi4py/mpi4py-2.0.0.ebuild b/dev-python/mpi4py/mpi4py-2.0.0.ebuild
new file mode 100644
index 000000000000..f9ce3a4bae00
--- /dev/null
+++ b/dev-python/mpi4py/mpi4py-2.0.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Message Passing Interface for Python"
+HOMEPAGE="https://bitbucket.org/mpi4py/ https://pypi.python.org/pypi/mpi4py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="virtual/mpi"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+	virtual/mpi[romio] )"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# not needed on install
+	rm -vr docs/source || die
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	export FAKEROOTKEY=1
+	distutils-r1_src_compile
+}
+
+python_test() {
+	echo "Beginning test phase"
+	pushd "${BUILD_DIR}"/../ &> /dev/null || die
+	mpiexec -n 2 "${PYTHON}" ./test/runtests.py -v || die "Testsuite failed under ${EPYTHON}"
+	popd &> /dev/null || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	use examples && local DOCS=( demo )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest
new file mode 100644
index 000000000000..33b850ceb06e
--- /dev/null
+++ b/dev-python/mpmath/Manifest
@@ -0,0 +1,10 @@
+AUX mpmath-1.0.0.patch 422 SHA256 f5bff0707e7f38a2cb6e6b3a656e55dab9e6caeb471cffc19cc5ac56c11e42b8 SHA512 a5c7c8816d7e4ba2dc481480a887d94ca158fee804a01e86f91fcea037372217ed8b029f85f6a0c15558b44aaf56f6fadf36b4f7476713a04a66f18b6f1ab997 WHIRLPOOL 5fefe44e8e7524a3dc68585616663e7cbe68555ae59c30d6345f1369f1e3671f2bbbb9e0ec9f34173472b0077c8f94b8b145400dd115f5a31a7c614e20d42fba
+AUX mpmath.patch 434 SHA256 e15c6536596321479b5378d5919c9a310d1037c13de8c13c8f0421f95319dd19 SHA512 2ffc7ffa375f5c25d044974a8b1fac145a00d9b1f190d12e1ade6cadad44dae11098617de5ee0a523931f046b4cd0e785552a3de6f66f438052955b6987bda39 WHIRLPOOL ff01b799d5e7862dce8cdfa2536f56e9b683b877fc94f154df7e9f4045d53c7d6be4376502fcd18fb0a6da29136b74b8c89f28ff0515377ae7ef78fbe92c531c
+DIST mpmath-1.0.0.tar.gz 511349 SHA256 d32ba7afffbae688229a15f54fbc37c11f4989e4fac628c99b3c5b6889aee03d SHA512 b225f237008e1cfee52b2f0dca0dce1445b932b6eaef92879d7feca30d728e3f88810bfa80882ad8776ba846a636807e59bebe0b9f690cd878c089e9418bd8b7 WHIRLPOOL 5dc18ab6f81a529c06bcc968dd3e9da0a5123740b2a5b2829e98b303b5e3d8208956122a7fd7698ad275d4246aafcbd1756bc0922801d32a535b809cf749b3ac
+DIST mpmath-all-0.19.tar.gz 2123129 SHA256 21a824db176799f42843e4510da4bc6db36ef92b5a43fff70fad7e29bffb9c86 SHA512 5a6ed0b5fad84c1e8399467ea7a1295f9b77c8e673b821c11e3298e88df6c48d9967eed84e2979bf12868e2f9b42bffba01a0c1836a6d82ac42d5f423fed6580 WHIRLPOOL 360fedc4d6942a138b33c63867f8a5e4ce4c101a8f7221c61503933e75073807676cbb240c9bddea765159cb134efd608256c9b921b7d282763b57d2897eefdb
+EBUILD mpmath-0.19-r1.ebuild 1384 SHA256 4c683331e8d274524430634d3a2e1d4a56a08a60ccf1802dcb1bef4dcdf7694d SHA512 a250ca3659c948dd59a4f3151ee06fb5e0f4b9c9e51ef3edb757ab9f743d4f2ab28865531bc2db486333ddfda0fe0e69184c58af8a33bd8352327849ff0824ef WHIRLPOOL 8bdc6e0354ee41787545813ca1c8357dccf6c15a9ca5572a545b1cd666b613102e5b994b0fe9201ffb5f6a4485c2ce2455dda59394836f1e2068d5d4104100ec
+EBUILD mpmath-0.19-r2.ebuild 1390 SHA256 8d6f44ac1f5d32df0d7fa25db0bf9b5f5a9e9b115df125f9987f1f31c99a4ff7 SHA512 a4128b69fea1a8f4d936645fe9bee6d19e5c9077b088cd377c32c1541d140f1f2da42051fe194abaa914c2d1cf68cdb0e36df71ed09a0b56e6ad42f8ffc2c6a7 WHIRLPOOL 89cced15d59e6419539b137c7eefd3c4249a476e671b640f084c6399671e50d247241841a65ece44904e08b8da3aeeb8df872d069766d147991b1b80986a5529
+EBUILD mpmath-1.0.0.ebuild 951 SHA256 ad805be8bcd2460bdbf51d707410993d42d48290bf8959a0f79f36f408ca0efd SHA512 ccff02e86e1abd6e55cfe688a3dcf712686bda56497aef450be9e2e79532b5bfbedbf3c1ec19b7b0d6e27a32ed4eda0171a179e2e8e2b9d32271b85ff7b945e3 WHIRLPOOL 25eae442a9bbb85b330630f843345a59ee3e0b2da1847a8829b26edf92dbb61afe2db1ceb42a00db93bace4c216d76ff0bd7bea5ecf5f3b54e5771dbc71639fc
+MISC ChangeLog 2975 SHA256 db38c42d031c0744be675fe8177efd6750bf02ca595e1331f43fa6ba8b0e53a9 SHA512 f514c38a471973553ea60282b64f2527c25160fefb1e660d859436c1c31b64207d6ae457f084e03c5f1e1874bce1138c7fa13bb0aaa9399fbe152acf55008509 WHIRLPOOL 357db473750a1adbb0f1907531ecc239b0a0a559fd54e2c682c624a69590a8e9017543eacbf85ac59b78e644bd0a2def1b4f1ee4fd01af4f99d726f84516fb24
+MISC ChangeLog-2015 5482 SHA256 4ea9cbf6b2fc8431e7a3528002bd0ce9759eaab12eac783cdf4ccdf93c62a5a5 SHA512 ef1a0802edda88db61851154dc90ba8dd0811a42d20950a12f05535ece3582f6080f481bd5be6bc49987d309c09d75ebff328c167c7ecec80de1710833641b55 WHIRLPOOL 86ccb77718f8be7bdac6db1c9be8df46270da2728f86e263d31541b5b257fd0dd2d7a84ba9205b014b56fe0fb3f828c6cfa72bf68b33cc0b002bc9e83b239cc6
+MISC metadata.xml 650 SHA256 94048222427d74ac3b79e372118852ab6d742ee1238fc521605eba716e95bfee SHA512 0f999aeb354c73658f916cb8d3a80dcd216f50f77839c0c854e9235566cb197a7d047ad51045996fc0b9e1c47f55e934be9dd52597fee16fcce6360bfcbe8f08 WHIRLPOOL 2c9e65fdad987acf458b30823b6dfa5db2baeae4938d558e9138bfeb922e45048ce6573156f1d529ee3a62573bd9e216eb77ff511ac24a9030294a4f81a4aa71
diff --git a/dev-python/mpmath/files/mpmath-1.0.0.patch b/dev-python/mpmath/files/mpmath-1.0.0.patch
new file mode 100644
index 000000000000..3a88f38c9927
--- /dev/null
+++ b/dev-python/mpmath/files/mpmath-1.0.0.patch
@@ -0,0 +1,9 @@
+diff -r -U1 mpmath-1.0.0.orig/setup.py mpmath-1.0.0/setup.py
+--- mpmath-1.0.0.orig/setup.py	2017-09-27 21:42:12.000000000 +0700
++++ mpmath-1.0.0/setup.py	2017-10-02 20:36:02.919554100 +0700
+@@ -15,4 +15,3 @@
+                 'mpmath.functions',
+-                'mpmath.matrices',
+-                'mpmath.tests'],
++                'mpmath.matrices'],
+       classifiers=['Topic :: Scientific/Engineering :: Mathematics']
diff --git a/dev-python/mpmath/files/mpmath.patch b/dev-python/mpmath/files/mpmath.patch
new file mode 100644
index 000000000000..3040216e56cc
--- /dev/null
+++ b/dev-python/mpmath/files/mpmath.patch
@@ -0,0 +1,9 @@
+diff -r -U1 mpmath-all-0.17.orig/setup.py mpmath-all-0.17/setup.py
+--- mpmath-all-0.17.orig/setup.py	2011-02-02 03:17:50.000000000 +0600
++++ mpmath-all-0.17/setup.py	2011-02-13 01:18:00.000000000 +0600
+@@ -15,4 +15,3 @@
+                 'mpmath/functions',
+-                'mpmath/matrices',
+-                'mpmath/tests'],
++                'mpmath/matrices'],
+       classifiers=['Topic :: Scientific/Engineering :: Mathematics']
diff --git a/dev-python/mpmath/metadata.xml b/dev-python/mpmath/metadata.xml
new file mode 100644
index 000000000000..75c9c7ac5925
--- /dev/null
+++ b/dev-python/mpmath/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>grozin@gentoo.org</email>
+  <name>Andrey Grozin</name>
+</maintainer>
+<maintainer type="project">
+  <email>sci-mathematics@gentoo.org</email>
+  <name>Gentoo Mathematics Project</name>
+</maintainer>
+<longdescription lang="en">
+  A Python library for arbitrary-precision floating-point arithmetic
+</longdescription>
+<use>
+  <flag name="matplotlib">Add support for <pkg>dev-python/matplotlib</pkg></flag>
+</use>
+<upstream>
+  <remote-id type="pypi">mpmath</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/mpmath/mpmath-0.19-r1.ebuild b/dev-python/mpmath/mpmath-0.19-r1.ebuild
new file mode 100644
index 000000000000..85fc57bbf397
--- /dev/null
+++ b/dev-python/mpmath/mpmath-0.19-r1.ebuild
@@ -0,0 +1,62 @@
+# 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
new file mode 100644
index 000000000000..3bd7c37eb1c2
--- /dev/null
+++ b/dev-python/mpmath/mpmath-0.19-r2.ebuild
@@ -0,0 +1,62 @@
+# 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/mpmath/mpmath-1.0.0.ebuild b/dev-python/mpmath/mpmath-1.0.0.ebuild
new file mode 100644
index 000000000000..06c4d2848519
--- /dev/null
+++ b/dev-python/mpmath/mpmath-1.0.0.ebuild
@@ -0,0 +1,42 @@
+# 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
+
+DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
+HOMEPAGE="http://mpmath.org/"
+SRC_URI="http://mpmath.org/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+IUSE="gmp matplotlib test"
+
+RDEPEND="
+	gmp? ( dev-python/gmpy )
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${P}.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_test() {
+	py.test -v || die
+}
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
new file mode 100644
index 000000000000..c522deb752b7
--- /dev/null
+++ b/dev-python/msgpack/Manifest
@@ -0,0 +1,5 @@
+DIST msgpack-python-0.4.8.tar.gz 113641 SHA256 1a2b19df0f03519ec7f19f826afb935b202d8979b0856c6fb3dc28955799f886 SHA512 59e9c43be6b92e6d10f40999e0902c350137e67a83c43bb15b273eca856a6eb39f24b625b02b40188a9365ce3101f03bfa9aa3dfff56c5c3b551533942183481 WHIRLPOOL 461ef108839815a6919accc51be6bfa2a20790dcea3aebffcbb956bc6dc8ea5eac19efb9b36a15850d33693d160d7c67a2d5cc4cb4d6ed2312a731663c1103c6
+EBUILD msgpack-0.4.8.ebuild 771 SHA256 620a8d62c7848c6d2a3010059e54ac1f5cebfd90beaded5fe2a96487e834ac23 SHA512 9a70d29f0e89c8690371b917f9e4474c65e1cf5e0e58fb31bdecdf04f8bd155caf3452b8e3a7d9816123da75609102e89067d54921bcf32a55b6891d495ca690 WHIRLPOOL 0772bfcf3ee463b6284bd540b5aedcc07509aca0880a2285566b8b3d5b7f30e4f7937b310f9073f7f3a3c588c77b50897a4fbdd1e811083a651146dfe0890c07
+MISC ChangeLog 3349 SHA256 6a07842a79d912f0d8c72ae2f183a1cfc377a4eb55e155bfd51be72780d098a5 SHA512 b2c3fe2c6db22af0d03e4e99f6693381efaacdf758752629a814806d834b7241e8b2d2fe5edb6210eef33aa6b3de4a75fd22f7447492a174cf30bccdf09c93d8 WHIRLPOOL 8375dc5f4d3f0242c80edd0a0effff02a2c795f113d2ab1caba84396f59a36fe2aaef412217fccf9244ea94e8caa898495b1f6f88854ad3b026287a2a01f99c3
+MISC ChangeLog-2015 4495 SHA256 d0a22d64a25de185023eb112063b70e7401e26c071b3d85ac698b77971366fa5 SHA512 dafe141976d08135e52b93add3f60b5e37f6231ab956a5b1de644389232928cea1e43df7c951c570244282cc4a36c7e11291951a8d280d9b94fc11b616e2b645 WHIRLPOOL 1696ea47c338e34b8cb02b3b4600c0b6c3424277aa9db40faf870ddc4662c0b0dc715b40b3e2652d6361b0aa0f9fec8d7c1ae9ce98434f07109e7fd1f3c6081b
+MISC metadata.xml 391 SHA256 081c74a119323ad2e35e33a773babb1e69c6599e46446d60530cd70c35f7cd43 SHA512 3001105274f7bcc446a3ea5d0e278073a51b1c480a78127574dbdb427e656719673f7a9543c8bf9b3d8181e414612f3f186e7ab192fa0fa9333a988f17593f79 WHIRLPOOL 76e69c1093208ced968053909ab7aa07a6635095f5c7c3444939c4f25de24d8b9446d8be57f82d84e6eaf1ddd31a106f8f07a8a0b3a4b5153c4b1bd2204726d2
diff --git a/dev-python/msgpack/metadata.xml b/dev-python/msgpack/metadata.xml
new file mode 100644
index 000000000000..c0744d424d52
--- /dev/null
+++ b/dev-python/msgpack/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">msgpack-python</remote-id>
+    <remote-id type="github">msgpack/msgpack-python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/msgpack/msgpack-0.4.8.ebuild b/dev-python/msgpack/msgpack-0.4.8.ebuild
new file mode 100644
index 000000000000..b19f38fbe1d9
--- /dev/null
+++ b/dev-python/msgpack/msgpack-0.4.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+MY_PN="${PN}-python"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="MessagePack (de)serializer for Python"
+HOMEPAGE="http://msgpack.org https://github.com/msgpack/msgpack-python/ https://pypi.python.org/pypi/msgpack-python/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 ~ppc x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	py.test test || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
new file mode 100644
index 000000000000..22767e4f04d2
--- /dev/null
+++ b/dev-python/multidict/Manifest
@@ -0,0 +1,14 @@
+DIST multidict-1.3.0_alpha1.tar.gz 98403 SHA256 05d5e5e6572a250fa4084bb5b3408621ccae6ff5ad2eb3130ca789b181786e46 SHA512 71831a567e7098aaf3f1273335249dab12a96595dd233f88dae114c7dd26beca53c6f55f9a5b2ec4145d62acf84f1734778d0ccb1a54c380569030ae4a3d2957 WHIRLPOOL 5cc1b3344f4c57250afe91e6168400c44bf39aaea25778a00907d9585b835754ac9e8b12ba584cf39c28e93945196a0fdb2a5f425629c1d417221acad56538c0
+DIST multidict-2.0.1.tar.gz 27586 SHA256 465e0e62dcb68a1779b6428d8ff73134d84f986241b98e9ac0a6ff2b7f1370ef SHA512 2de3743256cdf3849f767613a510d707716b978c964626846fd082edb52d169a5fb47becf76dc287858f2d06c7f4bbf8aa0f662e41e8bc73becabfe0518f7836 WHIRLPOOL 513f0a2cdeef2742470c37a134a863ab8f2dce5753307f9e57cd8fa40b492cebdd3c4d54a38db37be2946d094fb14003cbe8dcbb02e08d2c8445ec7e83ec33bd
+DIST multidict-2.1.0.tar.gz 28131 SHA256 91c1b57f79a391cc8efaf6ada7b2a84c3954249ccf290c59d198a2df1ca4084e SHA512 124691f3654b202cc35c59bf4e1c38a9da7d89ca3fed71f800d15313fb4042b55c0df25c012be72b0cf64ca1b8cc00707f001d007df649840e0d7a76d171d385 WHIRLPOOL 6d8d00ca386d2a677fc8aada7c8342eac5163d3ad7ed62f0ace811048f18f72378cf9f874ec8f6ddaccf862735cb7c145cdab81c5b5141ae53354d42663f5931
+DIST multidict-2.1.2.tar.gz 28193 SHA256 f258814a672d093e062bb2fa3ebf007db3a542bc55785f25942b0728418feba7 SHA512 7debfe3c0abb3323a5ee82b7522ab86162b3d44333ea7dcb26c7c87d24fb4c4c062095db9603ac4a757d507971fff6252f4b3dd9d2183ea167caa5ae80ae3b33 WHIRLPOOL 6d1a9a66b753c05b430aabc21301576e2b19bde9713be8cb9b25781104c655effcf485cd64b472e82d4568cb06ce92ca3a158b22a547918ec2f44bd2d5068ff6
+DIST multidict-2.1.4.tar.gz 28395 SHA256 4116a99f024269210bc5629661e55f5f613e1b11016b3bbf4e0ba453b02a65c1 SHA512 1806f21a528f907ba16cada2eda05c7387d63bec45b7906a5a37eba834a87553c402766f4e50425a41414e93e2fc202d18ad9e6aaf02742fe06899e6a18109c8 WHIRLPOOL d889866bd3b82f7d4c4da963d6a74234f7e161a1d654b1fd5ed5a9ff0e35f1a3ac4d46f4a1ddd6a907abfbd1a29dcc630e0c4463b5252d30357b152d52d516d9
+DIST multidict-2.1.5.tar.gz 28497 SHA256 f3d8f71104d2084cbdb51158ac5eeb6aee0907618a59fe7cb97b2b139d58abb6 SHA512 927f2e0c175e52edbf3a5385957e5988a08061160488df70f7431520ef75439011986365dfebac80e8da6e1874232c532ea96c53081c65c74c04f0e307db6729 WHIRLPOOL 01d2d270571424b01877fee60e84f412f08cfb9371428d20731cc1a1af600fd7f9519d193a37d49bfdc4ecdf572a43ff97903b22d073df5269cf11f03ba91d45
+EBUILD multidict-1.3.0_alpha1.ebuild 869 SHA256 9ae316cc549e169f7ef5e174795aebd8df21ec7e6e3781f2166a313a7432ac71 SHA512 b558ad47531db3d3497adaba4f0fe7b620ef481cbaf44f94d17f23118fcd9a363945c7ea7b98340d9bef387e8720fc43697b34b2c140a13c6c0c806ed252d4d4 WHIRLPOOL 556a875022e853e95a5fa2f61c3f112a879170c45102c69e9c484db87ec2f9ba8882fc6037c127a771c42bb582f6db92c3ab380fe051df0a6e8286a447288ae0
+EBUILD multidict-2.0.1.ebuild 878 SHA256 70940af3aa043bd51c36da5d9215c84824042f24175253dbffa240ae440d6e1e SHA512 564b1022e58f1c404f53942fd2e11f0628849a4841670bf486bcbaabe36b07ca55182925c0958d9f889cc11743778b09995fe730b86d28b48564d4faad982672 WHIRLPOOL ec7c83fc73324d42eeb4c311be8ff92a09865f3fd042441583da204039f1edd38361622ac273b64250105a59301853b8eae1de73f7504c57b4b0132e8043c833
+EBUILD multidict-2.1.0.ebuild 878 SHA256 70940af3aa043bd51c36da5d9215c84824042f24175253dbffa240ae440d6e1e SHA512 564b1022e58f1c404f53942fd2e11f0628849a4841670bf486bcbaabe36b07ca55182925c0958d9f889cc11743778b09995fe730b86d28b48564d4faad982672 WHIRLPOOL ec7c83fc73324d42eeb4c311be8ff92a09865f3fd042441583da204039f1edd38361622ac273b64250105a59301853b8eae1de73f7504c57b4b0132e8043c833
+EBUILD multidict-2.1.2.ebuild 878 SHA256 70940af3aa043bd51c36da5d9215c84824042f24175253dbffa240ae440d6e1e SHA512 564b1022e58f1c404f53942fd2e11f0628849a4841670bf486bcbaabe36b07ca55182925c0958d9f889cc11743778b09995fe730b86d28b48564d4faad982672 WHIRLPOOL ec7c83fc73324d42eeb4c311be8ff92a09865f3fd042441583da204039f1edd38361622ac273b64250105a59301853b8eae1de73f7504c57b4b0132e8043c833
+EBUILD multidict-2.1.4.ebuild 874 SHA256 6e152e167b93ca02c5b7ba76a73b6d7597c96c168c02ad22f97b384afcf7d11d SHA512 b3a2970a265bf709e95a975ba31f7006ae1a1ce261b555495eb5770b81e76ce3af31fe4e0749d769ea70ec8c222ae6e21e30843a9feab9d82424371d33259cb5 WHIRLPOOL 910c017fb33cbd1155fb7d83fa64dc483f1564303b9a1e695d52c969c9d24cb1f75ee8f3e0471bf43e9446fea8266a4ee2da4199a2b044caa14d58696217740f
+EBUILD multidict-2.1.5.ebuild 1049 SHA256 c918352b24170d5ac7b75add2a596154971757305be383f9817d82165d9e2593 SHA512 e96c235ad7a272127d20107d5eff61cd840d35173c0b81d63202532f0e7a1e3d81b4dd880c0bbe744a2b4de3abbf8a2ea0bd15977489f3173fbc8a70f81e5a0c WHIRLPOOL cfa56e646c5b5ba6a7f101ef374da1bc09fd87a1cac3184003e8900efffb58d8b937003750ed77a2745f831df2b908653373623d6fc826c7bd6735f1a98a9ac3
+MISC ChangeLog 2503 SHA256 89e05281402991fd242ef1cc5e36f5c4418eebb319facefbf6c7dc068b091a83 SHA512 0c33729c79cf2a80aa2ec86912907c44b6fbbea704e552fef47af5e927faf968914c18bbb991bbefada856e72cb6f6a7c012b04892285ebca00b0ea7fefa36c3 WHIRLPOOL bd4b68b0b80910bc39060a757cd21a6f9e14e28c992e431c8aa1a62594357577e4d2626580a07c575f6a0d34eac6859501d5ced70e78ee564c0496852c54637a
+MISC metadata.xml 329 SHA256 e11ad5dd63503c827654c24462c1716628f3cdea4146dbf54615cffe3b70a45c SHA512 df7e3fd8d30523b4c4ff3d7eddf58f358a8950e371ed74146af2ae6301c069014e1e8f0e4eee1f01138eb15cd10304367dcf5f4acc3caa23437a9a47cc35778a WHIRLPOOL 504456ca9a5948c7fbe7d910e91b270673a6fc3e95eb1a6170b80ef20b0ecc08cf0db0c68a7bedd663facc3a9f1c69526e440091722e05b2581e653711603281
diff --git a/dev-python/multidict/metadata.xml b/dev-python/multidict/metadata.xml
new file mode 100644
index 000000000000..4d774fa2b6a4
--- /dev/null
+++ b/dev-python/multidict/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">aio-libs/multidict</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/multidict/multidict-1.3.0_alpha1.ebuild b/dev-python/multidict/multidict-1.3.0_alpha1.ebuild
new file mode 100644
index 000000000000..6d2f95f6c999
--- /dev/null
+++ b/dev-python/multidict/multidict-1.3.0_alpha1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PV="${PV//_alpha/a}"
+
+DESCRIPTION="multidict implementation"
+HOMEPAGE="https://github.com/aio-libs/multidict/"
+SRC_URI="https://github.com/aio-libs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" -m pytest tests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/multidict/multidict-2.0.1.ebuild b/dev-python/multidict/multidict-2.0.1.ebuild
new file mode 100644
index 000000000000..56b35f71095b
--- /dev/null
+++ b/dev-python/multidict/multidict-2.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="multidict implementation"
+HOMEPAGE="https://github.com/aio-libs/multidict/"
+SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" -m pytest tests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/multidict/multidict-2.1.0.ebuild b/dev-python/multidict/multidict-2.1.0.ebuild
new file mode 100644
index 000000000000..56b35f71095b
--- /dev/null
+++ b/dev-python/multidict/multidict-2.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="multidict implementation"
+HOMEPAGE="https://github.com/aio-libs/multidict/"
+SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" -m pytest tests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/multidict/multidict-2.1.2.ebuild b/dev-python/multidict/multidict-2.1.2.ebuild
new file mode 100644
index 000000000000..56b35f71095b
--- /dev/null
+++ b/dev-python/multidict/multidict-2.1.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="multidict implementation"
+HOMEPAGE="https://github.com/aio-libs/multidict/"
+SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" -m pytest tests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/multidict/multidict-2.1.4.ebuild b/dev-python/multidict/multidict-2.1.4.ebuild
new file mode 100644
index 000000000000..bc305063050b
--- /dev/null
+++ b/dev-python/multidict/multidict-2.1.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="multidict implementation"
+HOMEPAGE="https://github.com/aio-libs/multidict/"
+SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" -m pytest tests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/multidict/multidict-2.1.5.ebuild b/dev-python/multidict/multidict-2.1.5.ebuild
new file mode 100644
index 000000000000..ffd36de34e32
--- /dev/null
+++ b/dev-python/multidict/multidict-2.1.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="multidict implementation"
+HOMEPAGE="https://github.com/aio-libs/multidict/"
+SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Running tests from ${S} fails as follows:
+	#     ImportError: No module named 'multidict._multidict'
+	pushd "${BUILD_DIR}" >/dev/null || die
+	"${PYTHON}" -m pytest "${S}/tests" || die "tests failed under ${EPYTHON}"
+	popd >/dev/null || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/multipledispatch/Manifest b/dev-python/multipledispatch/Manifest
new file mode 100644
index 000000000000..fc8ad9946b65
--- /dev/null
+++ b/dev-python/multipledispatch/Manifest
@@ -0,0 +1,5 @@
+DIST multipledispatch-0.4.9.tar.gz 7541 SHA256 bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2 SHA512 b59f73f6d500c5cbb5e45eab9f6ecea45a211764cd8e7adbbf85c29510862bc5427f13dd652a18feaa9f930dfed51fee76411ee659ed8f961c0e5ba664878c1e WHIRLPOOL cdddaaf9b94806952c83a84abe596420d1c8065afb10da9b8d97acdd12b66a552de022d0f80081066e2c35f32aea3b1c7601dee09a5910c559188359bbdef502
+EBUILD multipledispatch-0.4.9.ebuild 523 SHA256 f2a513cfd4342a2617d211055c6387e026486f191b2d5845476c2ce65dd32ad7 SHA512 8642e17ecfcb2c93caaac2792c7f071ed26949e6bb82554da02a5b014dd8e826d0c144d4b6f5c54147d6a1e7be07b44deffe0ee7b47af2ccdc8107d1034ea2a4 WHIRLPOOL 88b0f46aed36f64df842926aa094e16b6d724a53a8a9d91c6ddc1621fc4789839e334e44b03214c8b0e5fe970eddc53df645e5ca123921942ee55add4f46d4eb
+MISC ChangeLog 3145 SHA256 e848535300220553b92e634603ba718011194e3ea8407586d7d92494a920590c SHA512 4cb3df19fc9c694050de8f3731c5ba4312a81c06589c323afdf47bf8ea618453456c11ba5f9c643e331487d45777e015a645c3ce3b575e3a03e7053cedfaf8d5 WHIRLPOOL bb00feb1b3e350bfaf776ed6a23125422d237996fcc9d8bd380bbddf820f24bda944e52a8b73bd3ef2cd15e7f258f0305f9c0892b09ae552dea0f6128bb9d384
+MISC ChangeLog-2015 1650 SHA256 8edc2e893f44ba03b29a5ef0e233f82cb004ace596e892e2afc4dfd0e610a5d8 SHA512 ff0d82dbabc29486025f7c9db516b45c0a8b8d2750d1e9ba3b3bcf37ba32c2744a30843e0e341b0ef29165fa87ab66b67eeb4802060f47e7454269f3f3f631e5 WHIRLPOOL 76d907fc2f0608be07c13cd267760a54b25fa6e794f734eb9f6448b14b7c619b0ecf8bcd3d71f2baba847449f74966a4c008af2e385f2151e86807633a86eb9d
+MISC metadata.xml 674 SHA256 6bd4cee4b4e0b22e53fbdfe7a8257a88a7c5977516494a671bdf869f09f6d50a SHA512 e67081034601d04f6218239e40ea4f7c9822496b3d2cfb581ae49d513445e5aca281293aacc79bacef49adb02235bc00c8598db88e7550e3f509a1f304976a39 WHIRLPOOL c9081b4b9bab864eb7ef96f659229ae666e7ade74f80c56cc52490bda348c5f4d486c0e05cc50177576700178a355c7cd14a677458026ca788405dc32098f40a
diff --git a/dev-python/multipledispatch/metadata.xml b/dev-python/multipledispatch/metadata.xml
new file mode 100644
index 000000000000..67abf67d3c53
--- /dev/null
+++ b/dev-python/multipledispatch/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+    A relatively sane approach to multiple dispatch in Python. This
+    implementation of multiple dispatch is efficient, mostly complete,
+    performs static analysis to avoid conflicts, and provides optional
+    namespace support.
+  </longdescription>    
+  <upstream>
+    <remote-id type="pypi">multipledispatch</remote-id>
+    <remote-id type="github">mrocklin/multipledispatch</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/multipledispatch/multipledispatch-0.4.9.ebuild b/dev-python/multipledispatch/multipledispatch-0.4.9.ebuild
new file mode 100644
index 000000000000..764104fb0243
--- /dev/null
+++ b/dev-python/multipledispatch/multipledispatch-0.4.9.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="RESTful HTTP Content Negotiation for Flask, Bottle, web.py and webapp2"
+HOMEPAGE="https://multiple-dispatch.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
new file mode 100644
index 000000000000..232871a56f0e
--- /dev/null
+++ b/dev-python/munch/Manifest
@@ -0,0 +1,3 @@
+DIST munch-2.1.1.tar.gz 6565 SHA256 648b650d1eb0173bd83c29f2eea2568b7591c1e05c87971387d170c71c6397e8 SHA512 5ffd78b1e062f71c73047a03949e6cddcd0eeae3a0ccccf36687140d12de9eb29161d2891a0fa2f1e70dfbc2b33c4ddab5d8a3611990718330c280ea769e85c0 WHIRLPOOL 8c5419758ed5e405fcf035fa32fb12be5291fac0658df4498fe6c570af5c4a099957c63f0d13320d213e8bd802738c000eb460f4b4c5349aee849c72b4e72613
+EBUILD munch-2.1.1.ebuild 486 SHA256 58f501f831cd26bc4e1e31bcb5919041a3aa7514e73e613ebd024126ee01ef75 SHA512 523651634c947b4aa0f08800bd9fd01607ce6d7db463ea7e61958e12b7b4b204165a58e6a2592e25cb0c584f59525fe1c8e810e12e2741f90b67114425db5984 WHIRLPOOL eaa6f2357419665f28a25e15289aed4c2d7d5765bd2f4af8c366703a86620fc48eb32b35b0b2aa5653424c48a17d76e257ef6e11c621662dff9935a4c59aae95
+MISC metadata.xml 348 SHA256 939f96491e100c3eb48f39c935407c150b82849e15ffe2c5e08a3622b726e683 SHA512 1787b144611cf1dd895b7a822ec2c5ef81e523f277c3394c4e23de466d11f1a4e22bbff019f92383de6b116ca911eff0293b4945c18d0287de07bf020303bf08 WHIRLPOOL 31cd73291e5088c4c3c6d2c300253cb9ae394ba7aa3fef2e57d3ae6a5a8fa1fb1d5829c93861441de4aa64a7791b0185632f0052eff2a9a3cab38b3d8ea29983
diff --git a/dev-python/munch/metadata.xml b/dev-python/munch/metadata.xml
new file mode 100644
index 000000000000..91b51b7d902b
--- /dev/null
+++ b/dev-python/munch/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">munch</remote-id>
+    <remote-id type="github">Infinidat/munch</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/munch/munch-2.1.1.ebuild b/dev-python/munch/munch-2.1.1.ebuild
new file mode 100644
index 000000000000..4da9536d5653
--- /dev/null
+++ b/dev-python/munch/munch-2.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_{5,6,7},3_{3,4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A dot-accessible dictionary (a la JavaScript objects)"
+HOMEPAGE="https://github.com/Infinidat/munch"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/munkres/Manifest b/dev-python/munkres/Manifest
new file mode 100644
index 000000000000..f804e2ffe1af
--- /dev/null
+++ b/dev-python/munkres/Manifest
@@ -0,0 +1,7 @@
+DIST munkres-1.0.5.4.tar.gz 43050 SHA256 105adad30659dbdf82815d3e12a74d4c01a3e0741d5ccbce194ee2ad4e5338d2 SHA512 a2b1577b75f3099cae57750543c985ab60097d5fa70481d3c6d8394dd55d0d8f99aacf5db625be7fa12772e976cf34d4b51c7841c3a24ee9df8214a68aa66aed WHIRLPOOL de64e126d37a0d267c0048ba368ab58f34aa9ae0d41cc3a97019370d3c12b231bee206c0c0f87d28f22e4b4ac1c29cd054350522372574437b6a09204d1a6561
+DIST munkres-1.0.8.tar.gz 9277 SHA256 185f1a9c4d2c31f2f19afa48bc2ec726c11e945eded4784d272da2fd49bf7a55 SHA512 e0afda8b91e51d177b9e2dc66ccacce849649d1a7d0e756884ac030acf4080076aa428182c5e9366613ee16db338ba7dcd3c38977de0888781b1885f08cb8236 WHIRLPOOL 15647beb863b6a2eb52ef594457564a524f8a6c4a4287f522679a3e1abc334279a9d3b47d0e7611ebb6c37c0549220c323bb6c4811f2097105f47d43a538653b
+EBUILD munkres-1.0.5.4-r2.ebuild 533 SHA256 5bb356ec050ea06a4916a7b991fd2586341582a7ab692f4948355c8d37e03653 SHA512 6374b721c0b84782b548aee6dfc83fef026f93566117caa3a65a5c8df4a2b2e88f630a30280673115192832df35069c34c100644de0246dcd5dfacb9d0d2462d WHIRLPOOL bd3fd92ae299866aa26b269d375b15493f2ca8453087a6d6793ff66a92a39003633d1bcffeb16d30c4eabea424e873e9bf09bf065e6367ed42ac7ceee58c6419
+EBUILD munkres-1.0.8.ebuild 464 SHA256 3b428f582ff5d3bc1be8ed5ac802357c87fd663b93ed3c2085d96bcc7a98a527 SHA512 a5434e257b8c4387b769e61c2db957fab56c27e869643e2a9b644434ff559eae3214fcea70528cc86aeb2cf70abd04feb3e8bd34b5b047bbc6cd1705ef477aee WHIRLPOOL 78696f9bf8a05da8a3a4987bc90e088fae0fbc219ae8b439a7f5155d6e841d1314a0131597a1d3d6268e4a30d6316943bfafd862aea864d46e85f9974e87bd4d
+MISC ChangeLog 2587 SHA256 ce9dc4d8e5d6aa745cfd34dad2a266b4989e46966e101d0e4e02819f80c2654e SHA512 cd773e9c0d6c2fc2bf2f57c6aa4bbc2d72c4dc4fdd7e8b75d739b010863957e7d83e05c4768fd469693742f01059167e4e19791987412bd37b586e576a172264 WHIRLPOOL aed58d357395dd9f0708e5b45bd35a0fd7725782b62060a6fff4c910400b15893a8ba2eb7b0c6bb1291cba11a89e8df778af579ad4004f40303433645a2e9225
+MISC ChangeLog-2015 1390 SHA256 118181aa6c28617eb1769b4b177abd6a1469ee7c13f7492565d2a4f4d9b01ebc SHA512 436f30a79d4907f201b9d1e0401aed70c19e445189644ccaa9aca69a63df71119aeea6f60830945cd92cc3fd30771552c9bd9c248b1d3d18223f0dc707f6bcb3 WHIRLPOOL 1e2969a6d3e5cc7884645fdce063393942dc9e456e8d32fd09f1defebe467144c7f3b443dc100e163a56d3e7cdf0f78cd09b9a1c96c232e883d76dbab0fb3c46
+MISC metadata.xml 687 SHA256 0a2219412c911d476fa412f0b075fd677a0304ad6438912c071c344718a38cd6 SHA512 70bd007a62b0b748c370d3fad141b50ba25868c293a8601d2e0fddbd286d7753f982e53fba40aa360f272d25ac48a5786ef337ee0388ea356c1aedb4dda592f3 WHIRLPOOL d9e040fba6fb5093c74f4dcc717cff688f8475bbdecd3779f0537ff3fdd5329b2f61c44792fb841ddd9ef3563eb306a8730c2e7aee130fe134334e13878eea5d
diff --git a/dev-python/munkres/metadata.xml b/dev-python/munkres/metadata.xml
new file mode 100644
index 000000000000..7c1499e711dd
--- /dev/null
+++ b/dev-python/munkres/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>joshua.downer@gmail.com</email>
+    <name>Joshua Downer</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription lang="en">The Munkres module provides an implementation of the Munkres algorithm (also called the Hungarian algorithm or the Kuhn-Munkres algorithm), useful for solving the Assignment Problem.
+	</longdescription>
+  <upstream>
+    <remote-id type="pypi">munkres</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/munkres/munkres-1.0.5.4-r2.ebuild b/dev-python/munkres/munkres-1.0.5.4-r2.ebuild
new file mode 100644
index 000000000000..6435ca693789
--- /dev/null
+++ b/dev-python/munkres/munkres-1.0.5.4-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Module implementing munkres algorithm for the Assignment Problem"
+HOMEPAGE="https://pypi.python.org/pypi/munkres/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test doc"
+
+python_test() {
+	"${PYTHON}" "${PN}.py" || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	use doc && dohtml -r html/
+}
diff --git a/dev-python/munkres/munkres-1.0.8.ebuild b/dev-python/munkres/munkres-1.0.8.ebuild
new file mode 100644
index 000000000000..7e17d8551f47
--- /dev/null
+++ b/dev-python/munkres/munkres-1.0.8.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Module implementing munkres algorithm for the Assignment Problem"
+HOMEPAGE="https://pypi.python.org/pypi/munkres/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+python_test() {
+	"${PYTHON}" ${PN}.py || die
+}
diff --git a/dev-python/mwlib-ext/Manifest b/dev-python/mwlib-ext/Manifest
new file mode 100644
index 000000000000..0c2bb5ac738a
--- /dev/null
+++ b/dev-python/mwlib-ext/Manifest
@@ -0,0 +1,6 @@
+AUX 0.13.2-unbundle-reportlab.patch 1211 SHA256 95fbf6ff64ef3210e7450a0725dcc11698e223d4bc12beab640b94c0484f8597 SHA512 9b722a08157d7e3545ce40c061ed84f1bda323bd65b2938062dc816d41b1005de851602249f787a5e6868674bf94ec37246572a7fe7476339fa5eae43e11dd72 WHIRLPOOL abbc2dae9ba6594b2dcf3745f47679631bb12509a741200d21b9a62ce95bd93bbde4986dd5f2f5adef2574ba4086925d9db8e9ee73307db77d6b117b4197af0a
+DIST mwlib.ext-0.13.2.zip 2111364 SHA256 9229193ee719568d482192d9d913b3c4bb96af7c589d6c31ed4a62caf5054278 SHA512 a7c6a53d92335d59f952c9fc549ef079afa92dbf8b3c97930463c817c867c27d6ea97b3a52aeadc12c6d107f149630799007409f1c1ca23186ba64a2e71ca6d8 WHIRLPOOL 600ada3cf17f8c8076d38262a2777acfe8c6add37f04360d64fb1869d9dfaa13c6dc176436e18208689a73386588aaf5004c7dc4baa36100776c4d58d3d74618
+EBUILD mwlib-ext-0.13.2.ebuild 674 SHA256 6bc585b235f3cbfd4514e76958fc7a01b989ca72d3efa5ac2fa5d00c6fd7efa4 SHA512 735807e3b838b6377c978437d57b5b5fef098ce9b903aa43bfca50435747c752920c7d173e445ba12c87f2b5da5f9bf9c2a96b76ecbe9ea81472f774f839aaf6 WHIRLPOOL b6b98bc41093d1d99082c7784e460fac4336ca1276df9a16fb8589f9ec886aa5ec642d1c6b047f35ba314cfd7902702690a8f5744f0e67acdb2b3ce32e27b880
+MISC ChangeLog 2761 SHA256 80e7036454a38a7101d5a681a37b15b2ff96ed30f04c498bd671c0fd800192cb SHA512 da12900d6ec28255bd90d65c178a15fbb37dde968be8a7c7bd80fe7c08d77604feeeb0c8ceccc3abcad796f4a8192c3c471dc9e732a72037f0674a7b6b676704 WHIRLPOOL deb0f25607049ed7a6013954086a77124243119ed0dceca3343ca6269343e879c97f684e8f29510d1c1fd5b5674c22318be92ce5aba896518887c1d120b80189
+MISC ChangeLog-2015 1582 SHA256 1bd8b485e6a3026cc1f551ba58d8df24bbb3da9c008809b13232d83dc34b75a2 SHA512 2d3ae95b7ebdd04f019dc9dce8c41d99afebfb4021971b36068097440df6365dd43d9e7147d7f187bf46bc0eb6f8fdee94b5802fb03dd44baba789b0165c66cf WHIRLPOOL befe73df088ee1a49a488551770618661ed927841650ae8acba45de75851a13e8c5e6515a9b83d108a4cf9c5b8205356a6d3d2ca95c18a72a01e97f1b69c0edb
+MISC metadata.xml 312 SHA256 2e9cd012605a2e9e5fea205ed9187b64e3c6ba80fa173c7e3da905227df8b6b3 SHA512 35e6f66eb933bb01e8475c55ff097ec406a08fd0358da5912fe702bebbbc46b04de23e7da88144ab699f91cb7796d7eb3fdb5e620dfb7f85b38caaf3c1c88a52 WHIRLPOOL 9c677c5126b6e3dfcb906e3a1151f6c16cb384d5d0caa16df8effbc5aa9f1785a44c59d9b1f1f9d4d0408274bbca48b4664b576de710efede10122b0995a57a6
diff --git a/dev-python/mwlib-ext/files/0.13.2-unbundle-reportlab.patch b/dev-python/mwlib-ext/files/0.13.2-unbundle-reportlab.patch
new file mode 100644
index 000000000000..12156a796a5a
--- /dev/null
+++ b/dev-python/mwlib-ext/files/0.13.2-unbundle-reportlab.patch
@@ -0,0 +1,35 @@
+diff -ur mwlib.ext-0.13.2.orig/setup.py mwlib.ext-0.13.2/setup.py
+--- setup.py	2013-07-02 09:53:32.000000000 +0800
++++ setup.py	2013-07-27 13:24:48.169128958 +0800
+@@ -1,30 +1,16 @@
+ #! /usr/bin/env python
+ 
+ from setuptools import setup, Extension, find_packages
+-from distutils import sysconfig
+-if sysconfig.get_config_var("LIBM") == "-lm":
+-    libraries = ["m"]
+-else:
+-    libraries = []
+-
+ install_requires = []
+ execfile('mwlib/_extversion.py')  # adds 'version' to local namespace
+ 
+-ext_modules = []
+-ext_modules.append(Extension("mwlib.ext._rl_accel",
+-                             ['upstream-src/src/rl_addons/rl_accel/_rl_accel.c'],
+-                             libraries=libraries))
+-
+-packages = ["mwlib.ext." + x for x in find_packages("upstream-src/src")] + find_packages(".")
++packages = find_packages(".")
+ 
+ setup(
+     name="mwlib.ext",
+     version=str(version),
+     install_requires=install_requires,
+     packages=packages,
+-    package_dir={"mwlib.ext.reportlab": "upstream-src/src/reportlab",
+-                 "mwlib.ext.rl_addons": "upstream-src/src/rl_addons"},
+-    ext_modules=ext_modules,
+     namespace_packages=['mwlib'],
+     include_package_data=True,
+     zip_safe=False,
diff --git a/dev-python/mwlib-ext/metadata.xml b/dev-python/mwlib-ext/metadata.xml
new file mode 100644
index 000000000000..f5604784d292
--- /dev/null
+++ b/dev-python/mwlib-ext/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">mwlib.ext</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/mwlib-ext/mwlib-ext-0.13.2.ebuild b/dev-python/mwlib-ext/mwlib-ext-0.13.2.ebuild
new file mode 100644
index 000000000000..6aa2127e6e65
--- /dev/null
+++ b/dev-python/mwlib-ext/mwlib-ext-0.13.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Extension module to mwlib to pull in reportlab"
+HOMEPAGE="http://code.pediapress.com/wiki/wiki https://pypi.python.org/pypi/mwlib.ext"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/reportlab-2.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PV}-unbundle-reportlab.patch" )
diff --git a/dev-python/myghty/Manifest b/dev-python/myghty/Manifest
new file mode 100644
index 000000000000..0bc621c7b34c
--- /dev/null
+++ b/dev-python/myghty/Manifest
@@ -0,0 +1,5 @@
+DIST Myghty-1.2.tar.gz 292439 SHA256 3de2d5bfd7ad8bd7cc33827b3b481fe8143dbe67eb0bcb53d38d46530a2fa7aa SHA512 a4534149241e794eb8a469b062d2696076cc5bc0fc07f3e093dc2ae0e489a9e79ce6d053f75ddc5b5ab64de9c0e4341d801e7e595dd5a0dcc24a3551fcef7098 WHIRLPOOL 9c7755fd0b892a9243a68961805dc05ade6a9b3569c12683719eeff400f85333272305b0848926ee989ac38cc5cd94dd7da879f0236ecc57bcbde23e795364bd
+EBUILD myghty-1.2-r1.ebuild 1016 SHA256 d1e297e2bd893bc9004e8e6bd13d5b5e544c7ce0c1ccc7e78a12cb54b3b5126b SHA512 6eecd01d2ab7448e3e540aff13d84457f1d29f85b58db528b1e3c02ef0813ea1a361b424882cf1fa09c79f7d50f55f67a3bde8833d825335a75754dec704ecf8 WHIRLPOOL c51399c73664a9ca466b3162e80c4feb9bd703822139bfb183de9a91ffc8b59b93cf52560287e0f83c726ba50deb414f098773897d1222cac84fc0b891d78de3
+MISC ChangeLog 2571 SHA256 3adb917378aff1abc67f528719b4d55f4d6b88f242202798fd9693c480ea1507 SHA512 ec34129fa65334b543a121fb8048bfdca846b4980121c6b84a5bea7a5b31f8c51541800660f1dc962b4fd5dd7244f2bd82868ce837c2319d5734090188afd705 WHIRLPOOL de2a42bca8bb825eec2eae529f851d56d14913e34c9056b32cd850ca4a6b0c21fef87ea42df603701b4c4da7f0463cf14967f1ad62bbc313a0aab534c34d4dd4
+MISC ChangeLog-2015 1310 SHA256 a1098a9ff80eb0d17263ea68ae80fc5345d90fd50748d3ade00b8306e8540427 SHA512 9161c14593156f7b30ec90ae92f414ef32e15f33cf39b79d41a3b73b281332ee06756426d5bebb443171e1c1367e36ed43e7f64b46595b8f8dceda0781a81076 WHIRLPOOL c9834ad79cb256d053481e752567e6e14d9e6a125ccf3d983f2ae25fb8add26faf01b28ce7e3cd8e1ac8ab097d9444f46b8ac4b0bee9043c4e88c2c663949cbd
+MISC metadata.xml 309 SHA256 9c0be2ec53c3623cf1f099f39893b02928bd7e2999a38fabfa8c0b5c8e297e67 SHA512 56372c565bd19b3c3d1aa685e74d20658afc18f6f60c08bfa95d808f340426c54bce08ef60755b5ae547356769e8915c2406561db42ea455a2da766a954bd80c WHIRLPOOL 34cf43215fb7599db969ee1c8381327d4da832055df1c0972d063d8acf0cfd006392f1246489894c38f0a45b223a4896c37223399878ef762f53b70ab271de6b
diff --git a/dev-python/myghty/metadata.xml b/dev-python/myghty/metadata.xml
new file mode 100644
index 000000000000..86506524630e
--- /dev/null
+++ b/dev-python/myghty/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Myghty</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/myghty/myghty-1.2-r1.ebuild b/dev-python/myghty/myghty-1.2-r1.ebuild
new file mode 100644
index 000000000000..1d633cf77677
--- /dev/null
+++ b/dev-python/myghty/myghty-1.2-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Myghty"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Template and view-controller framework derived from HTML::Mason"
+HOMEPAGE="http://www.myghty.org/ https://pypi.python.org/pypi/Myghty"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-python/routes-1.0[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	dev-python/pastedeploy[${PYTHON_USEDEP}]
+	dev-python/pastescript[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+		"${PYTHON}" genhtml.py || die
+	fi
+}
+
+python_test() {
+	"${PYTHON}" test/alltests.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		dohtml -r doc/html/.
+	fi
+}
diff --git a/dev-python/myghtyutils/Manifest b/dev-python/myghtyutils/Manifest
new file mode 100644
index 000000000000..685692d86fbf
--- /dev/null
+++ b/dev-python/myghtyutils/Manifest
@@ -0,0 +1,5 @@
+DIST MyghtyUtils-0.52.zip 31038 SHA256 2bbf206bd4c07b7d690b0397714fd893ab380f0ba5a82a897cda3647a3641cb5 SHA512 353174413c74ff440db299e0aa4c64cf01f67282f7290df8a9f7156c9efd6e502217ec8fa972ad91d37b0a137c5367378ece325f7f32c0f9fa83cdc0c15aeaf8 WHIRLPOOL bb86746cd6225754a6fb63ba08385f54f837ff723ddbf02b246d3b22af0cd66e667f990bb32db046ded27ee22270e09548c38e65fd4b698a29cd0f510836eb84
+EBUILD myghtyutils-0.52-r1.ebuild 605 SHA256 2151161cab075b1e8d14f6f131f52a5bbc83737b84b410c32bb35006c8b0c796 SHA512 06149dac004fd31daff98ea05c70d7e46a92d738d861dcf4a011c4414500c8284016949ebffa2f2cd81d874d36608db29e61d8c40281aeecc37507987011a652 WHIRLPOOL d788fd70a1694de452e04da92892c8e357892283d7d6b4a3100b4121f738b44f3f8b24da65414b02c782ac6e8f728a814f68e1140f463222babda5ab84e82993
+MISC ChangeLog 2594 SHA256 f754d28a7de2a3d759ca5df1fc8f594ef7f85334576661bf88c4ca29667940b0 SHA512 0dd2c82d4b69ffc5fdb07ccea10e9eb4710816456117fe250095d57498718372313935682bfc6c34bef0340fc137f44e8914ca27fb0981e66194853e6dbcf582 WHIRLPOOL fd0f20199385c3a8c460bcb1bcf0c8aa7a34f78512bfdb7a2cc155d716939aa64d55b684db48d69ade36f341962882a1f7d5d9232ad0bc860f45cebac60cc2dd
+MISC ChangeLog-2015 880 SHA256 15a62a3ca6bb54bf60b664a0eb92280c409ea5562db4b08f9661e9972cbb94e8 SHA512 65d659948c714e87ff4e17ff54ec1651b4254792111fc4c8c8f99565bd4b8177116a914899c0c485d268eddee7bf5135f817d17cf088e2638487e65f4edf6170 WHIRLPOOL bfe4802b8b5d7a1acfa3b975e6d011b9535004f8d67619d1f8bcb7e6bf8eae124a0f91c8d43c6234e9901e1075df15221d9411bc61694b0d8f003ef3bd3dae54
+MISC metadata.xml 314 SHA256 a3232dbcb2a9382e6a1a695b3e756424851a7fdfe8ece97eacc1ea3044a4ca46 SHA512 37dd8047d06d6b60fa54c2845eefd35109fd7c5a1923597db27a2623eb00b5adf2a52f7dae6ff3a751d1ee2f55c432234307f17c3abebb3e1135d68b02a1ffff WHIRLPOOL aa12f32c6d44750d4a094cf84a529dfe52b78653fd4239253d11e76b101536a0402ac13466f97402cd5c707749e4f561ab96190c9f912ea51e2afdf004a5bc3d
diff --git a/dev-python/myghtyutils/metadata.xml b/dev-python/myghtyutils/metadata.xml
new file mode 100644
index 000000000000..0aa6c8c5ce9a
--- /dev/null
+++ b/dev-python/myghtyutils/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">MyghtyUtils</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/myghtyutils/myghtyutils-0.52-r1.ebuild b/dev-python/myghtyutils/myghtyutils-0.52-r1.ebuild
new file mode 100644
index 000000000000..0157c0a8a8b7
--- /dev/null
+++ b/dev-python/myghtyutils/myghtyutils-0.52-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="MyghtyUtils"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Set of utility classes used by Myghty templating"
+HOMEPAGE="http://www.myghty.org https://pypi.python.org/pypi/MyghtyUtils"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/myghty[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/mygpoclient/Manifest b/dev-python/mygpoclient/Manifest
new file mode 100644
index 000000000000..674592de1e01
--- /dev/null
+++ b/dev-python/mygpoclient/Manifest
@@ -0,0 +1,6 @@
+AUX tests.patch 1727 SHA256 86f27b2954a77e23856df3a93298161b7bf97f0053bbcca0f128ef06b50c084f SHA512 dfd7f07575cf0816ac1072757e5ee64d696fda020ec7baaa492f97309a55f8c8758f87b1aa75752550beb2fc83a953b2937b746f8672ecd1370d283c20a4c21e WHIRLPOOL 6cfe92316f13853e0837d3e701970063f2f825dcf9049ba4725153fa095e78c024a486ae70eea6b32d2f54244d32a8c6f586fc7d8db3cf2990007d15998b6bbd
+DIST mygpoclient-1.7.tar.gz 35890 SHA256 6a0b7b1fe2b046875456e14eda3e42430e493bf2251a64481cf4fd1a1e21a80e SHA512 95e5920799300590830be6fba9d48fcd0398cab9eb07e34c9f07254f01f0fd483a3f117434a536c82fa8b1c846017919c9e3cbb7e848109912d9c38a347f896c WHIRLPOOL bb325dc6d824c7f8bc46d216011607314485f8065277e40b4521360b0fcf23b9c66804cf173a9f21d4000621df158c48c7f1f4f57f1fc175c70df1bff5338a25
+EBUILD mygpoclient-1.7-r1.ebuild 1024 SHA256 325e9241f6578f1a2ff4c36355905f5b638087aad566e4b9cd98c6feb8465dfb SHA512 180781662f7c97784af68959ed0de760080384a612e6af408d63060bd4cd00c8028f80488b609a0ec28842aa26a0f8ade8af95670b82308c851ac776224ab2cb WHIRLPOOL d47ee0164f01f52020a0490fe2b30b06b1742ecb7bce896cdbeeb6b7edf34b37700de216da131c5c3416eb29df75cc6820c59d0ceefe1585536fa4788e8330f1
+MISC ChangeLog 2463 SHA256 295bcef5821843745f12d9cef06eece062f426bc9638cec0c0965e2db37b0528 SHA512 c3ce41371bca68b86dcaeb0917c0c850dd0373eebb7f61e6f37962e84645d2f4b18852fea0c053716e5b7fa69b9558207a714a8feff7a78bf47f1a4e53a64069 WHIRLPOOL 0e740195e954d99f8297eb5224a0b638b9bbc5307fb2acf73b90809f2b295a6b5df8fa9e39c1b628564a151af2232a28103f1529080a007fb5dbb8bd79b8b8bf
+MISC ChangeLog-2015 1681 SHA256 f2e3e20fc958a2798981aa36e1ed22b1093d703878c843b8debd1765d2be4cb9 SHA512 e23580de5c867bc689527bbd2472221ab3d3d51b31d78b725dd023a6b9c6648123d9af3295631d784d50f2003a69905fac8b60ba8a43fc6a02f808b07c84bddc WHIRLPOOL 617d892ad381cb226324ea34b9bc79d2370ab5d9b706e442e301deff5c5e261c637f9621abc50548a92841107be4ce207368c500505bc67f9ade0b497078cb25
+MISC metadata.xml 346 SHA256 f377c92ba3a010b2b88778de08aaa34f6d51f25eab3def037c8310ca5267127c SHA512 83fb6ffd70d907e1fd4be3ba91e781cf9131a980338b2fe66874fecde7673bd40df0005b34f5f52c2a7ec88e4b3e92ef2417d293474c1b51ecd06ff4ee6edf2f WHIRLPOOL 3d2b3a86472f8974ecd8088dff4195f967b6b76af0c3759f33628a0fa3e9730024b47a39a28761c611526d18efc3dc7a15b7f96d1bf5dbbf0c7dbd719dea55fa
diff --git a/dev-python/mygpoclient/files/tests.patch b/dev-python/mygpoclient/files/tests.patch
new file mode 100644
index 000000000000..041cee501a00
--- /dev/null
+++ b/dev-python/mygpoclient/files/tests.patch
@@ -0,0 +1,34 @@
+diff -ur mygpoclient-1.7.orig/mygpoclient/locator_test.py mygpoclient-1.7/mygpoclient/locator_test.py
+--- mygpoclient-1.7.orig/mygpoclient/locator_test.py	2013-02-08 19:39:32.000000000 +0800
++++ mygpoclient-1.7/mygpoclient/locator_test.py	2013-03-09 23:33:37.137651841 +0800
+@@ -16,7 +16,7 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ from mygpoclient import locator
+-import unittest
++import unittest, sys
+ 
+ class Test_Exceptions(unittest.TestCase):
+     def setUp(self):
+@@ -54,18 +54,21 @@
+                 podcast='http://example.org/episodes.rss',
+                 device_id='gpodder')
+     
++    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")
+     def test_device_settings_uri_exception(self):
+         """Test if using no parameter for a device Setting raises a ValueError"""
+         self.assertRaises(ValueError,
+                           self.locator.settings_uri, type='device',
+                           scope_param1=None, scope_param2=None)
+         
++    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")    
+     def test_podcast_settings_uri_exception(self):
+         """Test if using no parameter for a podcast Setting raises a ValueError"""
+         self.assertRaises(ValueError,
+                           self.locator.settings_uri, type='podcast',
+                           scope_param1=None, scope_param2=None)
+         
++    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")    
+     def test_episode_settings_uri_exception(self):
+         """Test if only using one parameter for a episode Setting raises a ValueError"""
+         self.assertRaises(ValueError,
diff --git a/dev-python/mygpoclient/metadata.xml b/dev-python/mygpoclient/metadata.xml
new file mode 100644
index 000000000000..920281b72fbe
--- /dev/null
+++ b/dev-python/mygpoclient/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="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+<maintainer type="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild b/dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild
new file mode 100644
index 000000000000..46c40ed7c5cf
--- /dev/null
+++ b/dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A gpodder.net client library"
+HOMEPAGE="http://thp.io/2010/mygpoclient/"
+SRC_URI="http://thp.io/2010/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/simplejson"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/minimock
+	)"
+
+PATCHES=( "${FILESDIR}"/tests.patch )
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# Disable tests requring network connection.
+	rm -f mygpoclient/http_test.py
+}
+
+python_test() {
+	if [[ "${EPYTHON:0:4}" == "pypy" ]]; then
+		nosetests --cover-erase --with-coverage --cover-package=mygpoclient "${BUILD_DIR}"/lib/${PN}/
+	else
+		nosetests --cover-erase --with-coverage --with-doctest --cover-package=mygpoclient "${BUILD_DIR}"/lib/${PN}/
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+	rm -f $(find "${D}" -name "*_test.py")
+}
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
new file mode 100644
index 000000000000..7b6a2d328886
--- /dev/null
+++ b/dev-python/mypy/Manifest
@@ -0,0 +1,9 @@
+DIST mypy-0.4.3.tar.gz 714118 SHA256 d90aaf3e8c01ccdfdb5b74e9321a3f3a32dea964ce13472f406cec43c174229d SHA512 2185eccb6fa783168879acfc316da0c879fca0b04e6a21bbd47a456014281d634711d9f3e25fa3a64a0b7819b54f0bb87f8bede7452147fd3bab8bca4859f5f0 WHIRLPOOL 4b1db030e1c8aed69e763141a812626129451f04ec32ed4cd4bff15461d826b9479a85a92dcc846baa16dda3056840e6c7f798e9b27317d5158e4ccc769c34c9
+DIST mypy-0.4.4.tar.gz 757353 SHA256 665c9eecc1d43380534d2b88bfc6df2fc7c387f23772e5d82cb37ae96c580034 SHA512 7a5cb8dae4d28cb7803b56ce17e379dd5f1f953663af6a5c2510e3183028f06a8b3722b94843a782e01e4a65b3f5ae48ff002ad85bfb85cad05abb181fc60e47 WHIRLPOOL 71e0b90d521e09c8df21db3bd8a37d3f738ab91823a82481397f81a30cd0f04031a73b71acefefc77405570c8080bf7ccc19669db565313b676c2384018c0863
+DIST mypy-0.4.5.tar.gz 779940 SHA256 3217d0d0d1f43a102b43618cf73ac5640e0006c3403558da70206e9a642f61d8 SHA512 e0bd4cb1080f2a4c0f2c4f9ebbe22d05b8dabb374396e7d91c645724b5d67084fd005e181847fccc45c9c51f3280233185fa6bf08dc24c2d4f6e482197246fa7 WHIRLPOOL 9ee581530c59a07d0d06307708fc5970161e45111d838d77a5f511ba2d569601012a67ef5e7847c1baa1e79fbf78ce5e9a9f013f33d1b59937d2b3997d4d5594
+EBUILD mypy-0.4.3.ebuild 941 SHA256 bf7e8366d01f82e144d2bf348079909c94a8ed0843fb08840000f9ba133b6aa7 SHA512 db1db0065cf83201f578233d573c83104edcff1787a675d2aba7bbb5dd1c4bdea34297a444af47b27d22c76125d819389c8ee8359afc8029e76e569b29e7bb3e WHIRLPOOL 4eb4e153143f13f7590ae76e2007a7bf0cb04ce019b27545c2c4559de53689cd869c7dbc2199dd6c6c0f267ea7dcc426631389eeafa13b987658cb0eb4706f67
+EBUILD mypy-0.4.4.ebuild 941 SHA256 bf7e8366d01f82e144d2bf348079909c94a8ed0843fb08840000f9ba133b6aa7 SHA512 db1db0065cf83201f578233d573c83104edcff1787a675d2aba7bbb5dd1c4bdea34297a444af47b27d22c76125d819389c8ee8359afc8029e76e569b29e7bb3e WHIRLPOOL 4eb4e153143f13f7590ae76e2007a7bf0cb04ce019b27545c2c4559de53689cd869c7dbc2199dd6c6c0f267ea7dcc426631389eeafa13b987658cb0eb4706f67
+EBUILD mypy-0.4.5.ebuild 937 SHA256 7e741c0b25261a5adced887562bd0c8cadf4bb07cd74dbf7090bcf0b04f53165 SHA512 853cf2f741d4a25df8f7f9e06b5c84f323f45279ed80ecfd2059444af1d8a0a766406382493ac161beb21901e30d21cee51dc3cb796902237d71105f31487f8d WHIRLPOOL 569c257269da29f6a0d4b4c9a85ae2854b9b85f1d3ddf57f7594143191cfa2dcd76a169a58800d7a4559c89eff9d2d0968519526167825c671d07df5858faed8
+MISC ChangeLog 4289 SHA256 369eda934a7ec62b599a755a414586965715c1a70c29d60c5d92e1d34f43d242 SHA512 7622d08777acfcb82b84e21cd6c57208eebf48514233889629ba8c14e25a81957e13a3b3d25eda36f41a735846b90a9bb8e498bba412b778ffbe8301bfca249f WHIRLPOOL 373363db40b32e684999cc72fedcfba7188a5af631c67dfac15533c56a80b48128760219994bed5d2ad671b690b977ee2da86c17347deb54d3415165ac0d8cc1
+MISC ChangeLog-2015 614 SHA256 04ffb8aeefbfc4314611b1f4774e85c18e8ec285a9f5a1dae65be17f00ca3280 SHA512 866ce9c72aea6238d637a590d4cfe465e8e917a16e9f407f60ba4ea42bdbfc05189bd248c678e4362dbd4544916fcd59cca34e7ee45d208805c96210bbfad2da WHIRLPOOL d26334e9eaf03ee70e7895efc0811fc8e6dda934b319e40addf314f387de529076e1a938b9f50217d4a34c78b29e4c720bb09199413fb10e20423d08e51e4a6b
+MISC metadata.xml 322 SHA256 e4a9e287f7d0d530b02f8955f6ba37d20a8c25c68ba1900ec1e80b26f9b277bf SHA512 1c90e2464582d5b28664af1a084f0fa8e5083122530395a6454280526f696279f4a4b8112fd5b6c484ba306b1c9e72d956654772a8b593efbc60d2e087608100 WHIRLPOOL 64f1884d2bf9c89839b3001f605f5e8008559f18f88808d39f34d9c20f2ad1dc99ba849026099ffe4e4487eccd27fca53838f2db48c7a3d9153eaf8c4a0ca8d9
diff --git a/dev-python/mypy/metadata.xml b/dev-python/mypy/metadata.xml
new file mode 100644
index 000000000000..12cd662fd7d2
--- /dev/null
+++ b/dev-python/mypy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">JukkaL/mypy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/mypy/mypy-0.4.3.ebuild b/dev-python/mypy/mypy-0.4.3.ebuild
new file mode 100644
index 000000000000..c85d92ee6ea3
--- /dev/null
+++ b/dev-python/mypy/mypy-0.4.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+SRC_URI="https://github.com/JukkaL/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+	test? ( dev-python/flake8[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="$(python_gen_cond_dep '!dev-python/typing[${PYTHON_USEDEP}]' 'python3_3' 'python3_4')"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	local PYTHONPATH="$(pwd)"
+
+	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mypy/mypy-0.4.4.ebuild b/dev-python/mypy/mypy-0.4.4.ebuild
new file mode 100644
index 000000000000..c85d92ee6ea3
--- /dev/null
+++ b/dev-python/mypy/mypy-0.4.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+SRC_URI="https://github.com/JukkaL/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+	test? ( dev-python/flake8[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="$(python_gen_cond_dep '!dev-python/typing[${PYTHON_USEDEP}]' 'python3_3' 'python3_4')"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	local PYTHONPATH="$(pwd)"
+
+	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mypy/mypy-0.4.5.ebuild b/dev-python/mypy/mypy-0.4.5.ebuild
new file mode 100644
index 000000000000..d117678c0182
--- /dev/null
+++ b/dev-python/mypy/mypy-0.4.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+SRC_URI="https://github.com/JukkaL/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+	test? ( dev-python/flake8[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="$(python_gen_cond_dep '!dev-python/typing[${PYTHON_USEDEP}]' 'python3_3' 'python3_4')"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	local PYTHONPATH="$(pwd)"
+
+	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mysql-connector-python/Manifest b/dev-python/mysql-connector-python/Manifest
new file mode 100644
index 000000000000..ec8e18709486
--- /dev/null
+++ b/dev-python/mysql-connector-python/Manifest
@@ -0,0 +1,5 @@
+DIST mysql-connector-python-2.1.4.tar.gz 11766506 SHA256 f34f2ac9984c3b3065347506653b88cb2661b0a891871c80dc767c3a1352079b SHA512 1071c4b3d0e30dd90cb1ed7d6376a7dd688f16b285ab28c26eccd182a3b3c5bb3c36890aec38b037ccf70e2c2ae24a9013139c7ca71e69ae8e9e29f2c15204d9 WHIRLPOOL 0c461129dabc929400784204672fa39bf16e489a257bfd2c050b366f6ad2f7cd482d1410284ac844ce50c937eb7ec3012149ae1e2de8b25d1b289a37167edf9e
+EBUILD mysql-connector-python-2.1.4.ebuild 974 SHA256 1f1da65ea504151857c1d4aa8c1cf743565067b94ffd03589cf2cde7ac9167dd SHA512 7e4fe486d550b2e6f94e596784690f1e4ec6c3113a8e6ca967c593a64310dba67073e272e6b0efc8e232e382da16ef1c9bd04951af1bc141cb4ddcc6cce29235 WHIRLPOOL a088e9bb52a52d63a11f6a817b0591f3d3c06711da0f62548748f053f5942293fc7791cb09224320e66bb454214bd64b292d6b00b5d44621460a89a02bd5ca89
+MISC ChangeLog 3446 SHA256 be1583232a03251fe2a1476abfa651940e5dfab5f5018693542688dcfbbb7bb0 SHA512 db3b95a102551623db39048059a2246995b3fd3892595f67da38c252096e8a14732e060677fb56077d455dcfc132dafc265fffe471df82a5ff9f4500c6484e06 WHIRLPOOL ca76a24ed2558f7ec3266a60e9e925e975df37b107938cdea6d7090ad27e8abd399751b336fdbb46b157d2e85a29b059bdcb4e1e89ecb071259f758a031a7938
+MISC ChangeLog-2015 950 SHA256 93e671faf35a8f147e45c751d1a6ce87ec9bb7a89d77ac1898486b66635d4a10 SHA512 2b2f9cdd72779e67c9f6fa6e576c98470ca377d57edb2da0ab9c17a0bed8ed48321198c67fe34816d9a5ac1fe9ae4ea6fc5830c4ece7807674ac8f05e6038ac0 WHIRLPOOL ccefe4f7f0c72d92ab233bdd7fde6cb9c6d4a33a937ac03abdb9d2083dae7fd7fbecb29f67475b236491683e0e4cfd7194903548ae9cf31796ca5bb016e296fe
+MISC metadata.xml 336 SHA256 4aedabc1bb245b8a14e622c50d808f2dfde2f79be0e5d88a44b5dca4aca5a4cf SHA512 27da38ceaf7dc44250dcb4651e2d171f1ccf0d5a3a2c04845dc6369e1a264b71ea909f7d799d3eabbd989f4c9c37c201f511887956613bf7176697da63378838 WHIRLPOOL 7c706c1827cb895be58bb0e0eba81e588012e5ecd9023e6ecfa98c823d7d269bcccf7468736b7ba6014fa7ef8af156665bf6a81432e03fbc1af971cff7fcc6f4
diff --git a/dev-python/mysql-connector-python/metadata.xml b/dev-python/mysql-connector-python/metadata.xml
new file mode 100644
index 000000000000..5487ad62c5e1
--- /dev/null
+++ b/dev-python/mysql-connector-python/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="project">
+	<email>mysql-bugs@gentoo.org</email>
+	<name>MySQL</name>
+</maintainer>
+<maintainer type="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-2.1.4.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-2.1.4.ebuild
new file mode 100644
index 000000000000..06dbeacf045e
--- /dev/null
+++ b/dev-python/mysql-connector-python/mysql-connector-python-2.1.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit distutils-r1
+
+DESCRIPTION="Python client library for MariaDB/MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/python/"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-Python/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples test"
+
+# tests/mysqld.py does not like MariaDB version strings.
+# See the regex MySQLServerBase._get_version.
+DEPEND="test? ( dev-db/mysql[server(+)] )"
+
+# Tests currently fail.
+# mysql.connector.errors.DatabaseError: 1300 (HY000): Invalid utf8 character string: ''
+RESTRICT="test"
+
+DOCS=( README.txt CHANGES.txt docs/README_DOCS.txt )
+
+python_test() {
+	"${EPYTHON}" unittests.py --with-mysql="${EPREFIX}/usr" --unix-socket="${T}"
+}
+
+python_install_all(){
+	distutils-r1_python_install_all
+	if use examples ; then
+		dodoc -r examples
+	fi
+}
diff --git a/dev-python/mysql-python/Manifest b/dev-python/mysql-python/Manifest
new file mode 100644
index 000000000000..e3ee1a17a2fb
--- /dev/null
+++ b/dev-python/mysql-python/Manifest
@@ -0,0 +1,7 @@
+DIST MySQL-python-1.2.3.tar.gz 70305 SHA256 7de66fbbf923634e7c965aeaefa74642ba75ae20ee1cefcefc3009595b7a7e6e SHA512 8c1c88ccf833744ac1f78673cb306cafe7f9bfc85ab2ce6dee1024b86571c17f006e3ab8452dba3527976f39aca64757b2d961c30ef4ac61c9a27e60a5f1abf5 WHIRLPOOL 31e294d658d80b876e54d9825252b0fcffd369a8c80926c78b5830401125761ecfc2d0faa49669d8a404228fc6395ef2bcf7c614d47c13e6a2438e66af36dcd6
+DIST MySQL-python-1.2.5.zip 108935 SHA256 811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e140c74 SHA512 37521c6fd855c4cde495cc8ec085aca79c2d441a6e3710759385bf2e2c17f43d3311cf1166663892829d2e3999c419443c358c7031cdda225ac44611ced188d0 WHIRLPOOL 4dba5b960b6fda6e7096bbeeb38b35b6c645b2126dc82a3d24eb0f14feec7532a474bded66393ad7ee10ed4a6ed1e927fe994ddfaafda2534ba1e93bb1a7c0f6
+EBUILD mysql-python-1.2.3-r1.ebuild 850 SHA256 1a0dccf64bed4d2e843fdb4232e7a7f49ae9159fd0cc61585c9cd34880f74997 SHA512 af1efd20aff565becfbc0294f925e4aeefc32e479a5a908ad097e4caf9c4cc37eb50731dfee904d61588e66930ae59f90c037c921d993225ff1df887db56e9e6 WHIRLPOOL b632de631f164551ba4d3ced523d61ac618dd555878ef86b2f815072e2c1bc7ede9db0da20ba82c9075a55882e1f08a594b23adf28e73674fb8f4ed6807b3540
+EBUILD mysql-python-1.2.5-r1.ebuild 1127 SHA256 eae2f5f65cfdf112bd0d391fdc8684916f6c35d425a1edc4fe727d0a64cecd70 SHA512 f38b7981f44ce17ce9c4f7023f58f191730eb2037402f798bd4a90b462662d7dd1498f18836fe84dc338496d4a9a3c7ce30f6b035c19bde5b026dee42a21cda6 WHIRLPOOL 0627c5a812faed3c235a2ccd55684f78eb30dc718ec9f31b761d4ef068e2cd30acc47abd2e93880bdfdd27e326e83bb8bf708413e4b1fb5501533f0cd49e6d8a
+MISC ChangeLog 4260 SHA256 877f8431723b3690ef10a09965efa82e2da25c6200a4c353f79550059862a133 SHA512 a0b2d303345fcecd6ab00a9a8e52add56f52a67ee40ea35255b1f6e6b85ce3152170bfcad32c111f0c6fce47d615c28cdb33263770159b810c32d1ccda2a6f24 WHIRLPOOL 149f19a214a59aca03a88a8324c682b92678211bf6c6527a8ef3ad1487affce3645ac3ab4074609f684a2f903308f6750359fac74e55257b9d0d58c1a8fcea32
+MISC ChangeLog-2015 13695 SHA256 130b96a8387ec6905e162e2b7733f510dcd697742727cb1ae6ba11f4b2c894db SHA512 3f892bb585a3db2024cda36d7af2588f60178bf1a3e9ffa86c774a577fd84a455e4d5f2b0dc8412e6a39d19fe94d2cd4d6b4ff2541ab15f091cfeebe9b88d57a WHIRLPOOL 3f44d415337cc378bddd86a374cfd66b47ad7b566f42fb862f821436e85025d1459a3096caeb2cecea9bbf2a6c7a535f1d52e5dba3694e1fea0e2b867886ada3
+MISC metadata.xml 384 SHA256 7b8ced3c39018d9dbca04643b3632631f36c8c23981dff2abebb569a786457c0 SHA512 df7d59db502cd6ed66cd936708f82efc5e22633508ee367c331d1f66298f806eb3d9a17dc8919c450afe3bebe30fa38e356d3feea2e87c82eea03db54c6e7ee9 WHIRLPOOL d465a6e1ee8cd4ab152915314bb78ed534f6eb5c5a9141a8abcb27491887be6748c38084ed7997bafcff9c732fe897d45f738d6b0ea54ffbc4de7960e70b1334
diff --git a/dev-python/mysql-python/metadata.xml b/dev-python/mysql-python/metadata.xml
new file mode 100644
index 000000000000..3dd0d159f918
--- /dev/null
+++ b/dev-python/mysql-python/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">mysql-python</remote-id>
+    <remote-id type="sourceforge">mysql-python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild b/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..cf5c8f6465b0
--- /dev/null
+++ b/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+MY_P="MySQL-python-${PV}"
+
+DESCRIPTION="Python interface to MySQL"
+HOMEPAGE="https://sourceforge.net/projects/mysql-python/ https://pypi.python.org/pypi/MySQL-python"
+SRC_URI="mirror://sourceforge/mysql-python/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="virtual/mysql"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( HISTORY README doc/{FAQ,MySQLdb}.txt )
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
diff --git a/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild b/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..1abfb12732c6
--- /dev/null
+++ b/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="MySQL-python"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python interface to MySQL"
+HOMEPAGE="https://sourceforge.net/projects/mysql-python/ https://pypi.python.org/pypi/MySQL-python"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="virtual/mysql"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( HISTORY README.md doc/{FAQ,MySQLdb}.rst )
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_compile_all() {
+	use doc && sphinx-build -b html doc doc/_build/
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
new file mode 100644
index 000000000000..0d1d67c363e3
--- /dev/null
+++ b/dev-python/mysqlclient/Manifest
@@ -0,0 +1,7 @@
+DIST mysqlclient-1.3.10.tar.gz 82102 SHA256 452aaf9d2ba1a4fb85c134c88f9b1857852deed63b3b13255d7a65d2c1297262 SHA512 05924b363431e1208c39d4ee39199b06f29025e4fb2abdba5b85e2755d7a69ff921752754700ad34118ce6502ab654eb3e46192b5085f5fb5dca1ac46eaa412e WHIRLPOOL b7485881aee15fb0145a6431d0e9e59aebd49af07dfddada799b2217bfeddf1ff51ef60f3b62f09eabdedbe7265abce8e7bd9597d6ff5a7ac905fd4309b10f52
+DIST mysqlclient-1.3.12.tar.gz 89793 SHA256 2d9ec33de39f4d9c64ad7322ede0521d85829ce36a76f9dd3d6ab76a9c8648e5 SHA512 fa267ad14ee98cd994c0c80b8a84b592e71f80008348d67a9c970c84930504a02034e4cd2903f0acc7dce416c485d5629be6e6e9dc52de1774dec7345d5d64ee WHIRLPOOL 7b09477229686015dda9c254b31b4b3df46cb16b7d6b8da222e8ed6b3a75de871066bd5b9899884ca402fa410ba5f9648027b4e14bf0a43a77e3316467d63533
+EBUILD mysqlclient-1.3.10.ebuild 837 SHA256 e95e28331e6c1506eedef804897db3b71dfa2208b8082a35c2dc7701362b9390 SHA512 48c075666a945f077def5f5848a5c86be3fd4c701e1a99e9af2b968d87b606051bd5df78be8ae6d844f7d9ea0ac9ea968b40a7bf91d4feec8948edc181d38350 WHIRLPOOL 02a774003b7fb76678cd35d27ab1892a1065ea4f01a4384e5c008f2fa0abfe353189dd9a9757fd60b4a67346873249cf805428a7d9381946109f31d6f9a44e79
+EBUILD mysqlclient-1.3.12.ebuild 837 SHA256 e95e28331e6c1506eedef804897db3b71dfa2208b8082a35c2dc7701362b9390 SHA512 48c075666a945f077def5f5848a5c86be3fd4c701e1a99e9af2b968d87b606051bd5df78be8ae6d844f7d9ea0ac9ea968b40a7bf91d4feec8948edc181d38350 WHIRLPOOL 02a774003b7fb76678cd35d27ab1892a1065ea4f01a4384e5c008f2fa0abfe353189dd9a9757fd60b4a67346873249cf805428a7d9381946109f31d6f9a44e79
+MISC ChangeLog 3646 SHA256 b50c00f48a7e433062489cadacd3cf87f124ad566dac5d88a5f363e475f8b190 SHA512 4148ddc65be23ed4d3fddf8b823b8bc41b2ac5796ee30b54b3612850f0bc73e7e6ae11a1b8c6f3541a4081d2ef77749c0b4d3e36005cd6d7fb2008ccdf41455e WHIRLPOOL 6d263d1a3089a4f40614de770350b6015cf67254aa7e6a4f1c5700d963216d00c75e5673f82ff5adfa4c7de4be69dc2c2f58a99e404ca5cef02775b6028b1e61
+MISC ChangeLog-2015 574 SHA256 2fb743c2e4d70efd332d3f93211977953ce218d5010ed31276d17140a4e458ff SHA512 f98d542c781d822e8594966ecc74cb1065082b787ebf6356174a54b97dd1c34428d5373e7acd17cabae89245422dd7289c14a5511baa2e3ce6b95e6937ea1e4e WHIRLPOOL 92d78cc8d117e91582075182ab7b5b5268c0cab986afebcba5dd08adfab80302c0295e2fe28203bfe272f999460418e6a91bee0e6c272921c03240e02167b194
+MISC metadata.xml 513 SHA256 a0d07c7d3b6e4c408de87a6316ae153cc6ba574c459a9f1e6d9d5342c13338e8 SHA512 4a2756c3bde70c4fc73ba347e9648b356983662146cce5c1161f5d0c8333f795bc27d0aebe6019dcfe6402a51611dddfd87609c329a3c2fa6aa20808cee46b38 WHIRLPOOL 8f9d5a051ce3899903ff0713207cf01afe5ebf522fe694f32ac8f5d3de5e2cfadb8ab459d7a0984dd5220b65511bb1245713b28f1d9eb80b7ee8cee6b25d8a43
diff --git a/dev-python/mysqlclient/metadata.xml b/dev-python/mysqlclient/metadata.xml
new file mode 100644
index 000000000000..812567ab07a5
--- /dev/null
+++ b/dev-python/mysqlclient/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">mysqlclient</remote-id>
+    <remote-id type="github">PyMySQL/mysqlclient-python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/mysqlclient/mysqlclient-1.3.10.ebuild b/dev-python/mysqlclient/mysqlclient-1.3.10.ebuild
new file mode 100644
index 000000000000..5246b1ba5d40
--- /dev/null
+++ b/dev-python/mysqlclient/mysqlclient-1.3.10.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Fork of MySQL-python"
+HOMEPAGE="https://pypi.python.org/pypi/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	!dev-python/mysql-python
+	virtual/mysql"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+DOCS=( README.md doc/{FAQ,MySQLdb}.rst )
+
+python_compile_all() {
+	use doc && sphinx-build -b html doc doc/_build/
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mysqlclient/mysqlclient-1.3.12.ebuild b/dev-python/mysqlclient/mysqlclient-1.3.12.ebuild
new file mode 100644
index 000000000000..5246b1ba5d40
--- /dev/null
+++ b/dev-python/mysqlclient/mysqlclient-1.3.12.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Fork of MySQL-python"
+HOMEPAGE="https://pypi.python.org/pypi/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	!dev-python/mysql-python
+	virtual/mysql"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+DOCS=( README.md doc/{FAQ,MySQLdb}.rst )
+
+python_compile_all() {
+	use doc && sphinx-build -b html doc doc/_build/
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/nagiosplugin/Manifest b/dev-python/nagiosplugin/Manifest
new file mode 100644
index 000000000000..eb221c526697
--- /dev/null
+++ b/dev-python/nagiosplugin/Manifest
@@ -0,0 +1,6 @@
+DIST nagiosplugin-1.2.3.tar.gz 37570 SHA256 9a1729d6479b71b1c7184e88a6214b00133953921df1be2d14ccb35a94a3c8dd SHA512 3f3045db181acc144cb41871f2f67090a7b096d600c9cda7e4f9b86648d47319dca7c42b74670ba307c0bc60955eb33aefcde9c895e544bbb4c7ca1f80e8919d WHIRLPOOL 2482a04ba7280973e9c4f8faedc4c54ca193bd1ff3d37c608dc4018dc2e39dd719e43edac7393c9102436ff8f5dacbeaa3df32c9523924aa6474ca20cdc83445
+DIST nagiosplugin-1.2.4.tar.gz 38290 SHA256 6b020aca516f3643ad02378866d382f0296bf378fa3874d9b2e1d3cc6135f8bb SHA512 42c7823445c0dc1f5fedc6b8bed6c5be4e2b5e4c14cfa2cfbd158ae43485baa0fc74b80f9dcbb89bfdb27b984d72201c8a7c330c71d837c0f822603a5f8f7ae3 WHIRLPOOL 4f62e0f589cde46324b71060ba6e9aa37fcf08d9277fb26f03df3f5b6cfa6b181394cdde6f10dd5c5aa4fae3010c91e0895698724e7147ad30f07e342ef6987b
+EBUILD nagiosplugin-1.2.3.ebuild 666 SHA256 52d24e2e231aa9fcac9e53c5ca967ce01410062354950c4495db901d79c107b5 SHA512 18f550db8cd3427f0ffd5c5b005adba693bf4f0901a1cf5741b4d651e71e28d7db7839eb79b7df083ea72ee86da48f2cc9e9cf2ee94668182657de3b33ff9697 WHIRLPOOL 9590f2a80c0ee349260d8216470346ee7561a646f2c34bd7969860ef803df7cedb0fb87d5046599ff4574c41ce758532d9102e3110a4cfb99a694ff9f956d51b
+EBUILD nagiosplugin-1.2.4.ebuild 663 SHA256 e0bfb0103794bce572ee76be51f409e7a1b8309cb950c54b89650c5c03bb035d SHA512 fee9c13ec3d91b305cc745a53bd9c50c9e79ac02445b4881b4e107e54faa503d166a861b8f4a46ad168d78c857bfc4aa6665c17494ad1f589f4fc39c09b32c1d WHIRLPOOL 4c99ec9978de5849789248591589f974b9a234b0c692610bd8aa77354f33869890d07d509a8c4b7ab65ac89317f48315990bb7374f94fbeb0def112a0aee0ff0
+MISC ChangeLog 1716 SHA256 eae117f01215e49282bfad46cea435aa88ee13e6e2bbd51b839ed6b4bd11b503 SHA512 a6f443eb81ae69379e0bdc13f262638906b07f47816ac4a1e590b18a1ef0cbf5faf552682bd48a669bca12e129c0d1593f479dda70d0b8157a9ff57e08c57ba2 WHIRLPOOL 04f2cb98568a02aa1e8926f070ce3d354220a2e1027229ff57c8328fc6429868106493d324be6e162a2e063e6662cda1f78f0ff0cfc5041d51315d284c8b271b
+MISC metadata.xml 588 SHA256 0028ef87634355bcbb93f008916bddee2b9e25666a8cb0e2fba555197669fe91 SHA512 ccb799aadfbc04ee27d4fdf7f9208fc85ac9dd90d75a4eac293ef6c348afddc168f7788b390b481e71b5cce24fb14d8f9ccb2a5703466f612cdb2f9cf3cbacc0 WHIRLPOOL ec8e39789636819f27d3ba9e29a5ebc80b294a8af11275dfed3fbf8d1936bf9bbb8138f02ad8f7280546878353199c874c1c4a93545b56d3d71f97032c872a47
diff --git a/dev-python/nagiosplugin/metadata.xml b/dev-python/nagiosplugin/metadata.xml
new file mode 100644
index 000000000000..ccebbfed0c0e
--- /dev/null
+++ b/dev-python/nagiosplugin/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">nagiosplugin</remote-id>
+		<remote-id type="bitbucket">flyingcircus/nagiosplugin</remote-id>
+		<bugs-to>https://bitbucket.org/flyingcircus/nagiosplugin/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/nagiosplugin/nagiosplugin-1.2.3.ebuild b/dev-python/nagiosplugin/nagiosplugin-1.2.3.ebuild
new file mode 100644
index 000000000000..26aaa8152d01
--- /dev/null
+++ b/dev-python/nagiosplugin/nagiosplugin-1.2.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A class library for writing nagios-compatible plugins"
+HOMEPAGE="https://bitbucket.org/flyingcircus/nagiosplugin/ https://pypi.python.org/pypi/nagiosplugin/"
+if [[ ${PV} == "9999" ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/flyingcircus/nagiosplugin/"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="ZPL"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild b/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
new file mode 100644
index 000000000000..a6126533b514
--- /dev/null
+++ b/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A class library for writing nagios-compatible plugins"
+HOMEPAGE="https://bitbucket.org/flyingcircus/nagiosplugin/ https://pypi.python.org/pypi/nagiosplugin/"
+if [[ ${PV} == "9999" ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/flyingcircus/nagiosplugin/"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ZPL"
+SLOT="0"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/naima/Manifest b/dev-python/naima/Manifest
new file mode 100644
index 000000000000..5679d61f70d6
--- /dev/null
+++ b/dev-python/naima/Manifest
@@ -0,0 +1,4 @@
+DIST naima-0.8.tar.gz 5485631 SHA256 9e2e4e8b4d1a64a213fd52fb681440f7c7b23e994bbde76f3c5b8926b46160af SHA512 38ac487ffaf3169f6e351ac1abb22244a90a872661627bd784ff0b37068e6155cc504756440db55b481e249fa8df97530e6074ff382d98e8d142aa5fa607f99d WHIRLPOOL d03bc8f98fd456ef609f344d584cf0b86d98701089310bf7554665595beda523597f56d9212f853780b660570605ad97801c99a97c60a616163eb854fe25f991
+EBUILD naima-0.8-r1.ebuild 1500 SHA256 7e643a02f2d7fabfd2fa613eb3bab50849cf1bcf046f7d4216f0f5ca345506ac SHA512 2ef95f5484b8bf234fa1642cd3daeb7c7efbf63f0fc6a7ef33005b3e155117ec6e9e39846013d9b65b28c9f2e092f04b755c7809201e5a48d65d11cd9a45f641 WHIRLPOOL a3546047ffdca7bf26c83b992af8b5d0387cc5ed683e69d88e98ff94f6466d73a5285fee8ca038e9775fd3c06a581bb7faae28145b39b4732a20ebfa2594fba6
+MISC ChangeLog 801 SHA256 f7a4151cec57f913de0b46170422adb40e4e20587f10532209a05467108065d9 SHA512 42090af87fb251fac4e473976042c9c52dce13a29639f08919745ad983dc042b026ebb5d63e8fff63f14d192f5005a2c501fa172e1454695dbdebd825cab9d09 WHIRLPOOL 2d0773dd8fb326e8927d8a4fc185f4ec5b5a047911629438200713e657049d58cc90de1ad62f643aa8198712fcc2139773b435f30220b516eaecf54801907377
+MISC metadata.xml 746 SHA256 b27b8e3d9835351a2279ba286f3e9c9446d9eba933303de34c3008b04c2589f7 SHA512 c3ff9eef465f6bd6be732e9b7e6e154798a485395106b54daf8680d8b9368181d98ebaab6c7cc702e171f461e99d8c2b67e6271fe733f81509ff77f77bc5b39b WHIRLPOOL 5a2027e533fc0fc20dae57c18ce0712df9702d66c8d05577cf24b154e1625e4c18409f3819215d004f1bc80655040ca5d12ab772fc59bea94fe8f2d57ba0c780
diff --git a/dev-python/naima/metadata.xml b/dev-python/naima/metadata.xml
new file mode 100644
index 000000000000..a8f7917f0e16
--- /dev/null
+++ b/dev-python/naima/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    naima is a Python package for computation of non-thermal radiation
+    from relativistic particle populations. It includes tools to
+    perform MCMC fitting of radiative models to X-ray, GeV, and TeV
+    spectra using emcee, an affine-invariant ensemble sampler for
+    Markov Chain Monte Carlo.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">zblz/naima</remote-id>
+    <remote-id type="pypi">naima</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/naima/naima-0.8-r1.ebuild b/dev-python/naima/naima-0.8-r1.ebuild
new file mode 100644
index 000000000000..255a80556315
--- /dev/null
+++ b/dev-python/naima/naima-0.8-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 eutils xdg-utils
+
+DESCRIPTION="Python package for gamma-ray astronomy"
+HOMEPAGE="http://naima.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+DOCS=( README.rst )
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/corner[${PYTHON_USEDEP}]
+	dev-python/emcee[${PYTHON_USEDEP}]
+	dev-python/h5py[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
+
+DOCS=( README.rst CHANGES.rst )
+
+python_prepare_all() {
+	sed -e '/auto_use/s/True/False/' -i setup.cfg || die
+	xdg_environment_reset
+	# issues during install time (bug #604012)
+	addpredict /proc/mtrr
+	addpredict /sys/devices/system/cpu/
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_sphinx --no-intersphinx
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/namespace-google/Manifest b/dev-python/namespace-google/Manifest
new file mode 100644
index 000000000000..31e0bcfdc3e3
--- /dev/null
+++ b/dev-python/namespace-google/Manifest
@@ -0,0 +1,2 @@
+EBUILD namespace-google-1.ebuild 861 SHA256 2a5e7ece050ec65679e3fa72d81fa300936aa03aee10c0daa201587238ec2cb5 SHA512 fbd9bb3ea727ba9382c2161afcf57a8385ef0f9c3db391a69fbf364480b9526d8b95b963ce9a25519986032c939ba77492a8ee830936f71e5a9189c8c1ac1c30 WHIRLPOOL 538b4e236eb7f6b59a830a6383ad70fa1f3cdc25bd0192487517ba78cc03218a2758ff3581bf0f5ee2d7035b67c44c0e0187abae5c54cd7a5af279b9b890a592
+MISC metadata.xml 218 SHA256 ddc25240b08f34a11ec40b8f89b0465343135e80dd8762624858e383651e9363 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781 WHIRLPOOL e5a7ee851a7d7a5d30327c10ae6ea910afd395771a1ee35607ba1c183882c6c2257ff637cde344befa2388038b1546a7a9df0502939d26a58ebbb1e920c4ecdc
diff --git a/dev-python/namespace-google/metadata.xml b/dev-python/namespace-google/metadata.xml
new file mode 100644
index 000000000000..266e3f19ca59
--- /dev/null
+++ b/dev-python/namespace-google/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/namespace-google/namespace-google-1.ebuild b/dev-python/namespace-google/namespace-google-1.ebuild
new file mode 100644
index 000000000000..8672dd9e348e
--- /dev/null
+++ b/dev-python/namespace-google/namespace-google-1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+inherit python-r1
+
+DESCRIPTION="Namespace package declaration for google"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_unpack() {
+	mkdir -p "${S}"/google || die
+	cat > "${S}"/google/__init__.py <<-EOF || die
+		__import__('pkg_resources').declare_namespace(__name__)
+	EOF
+}
+
+src_install() {
+	python_foreach_impl python_domodule google
+}
diff --git a/dev-python/namespace-paste/Manifest b/dev-python/namespace-paste/Manifest
new file mode 100644
index 000000000000..b5178f061081
--- /dev/null
+++ b/dev-python/namespace-paste/Manifest
@@ -0,0 +1,2 @@
+EBUILD namespace-paste-1.ebuild 806 SHA256 604cedfdbf5bc642aa246f0a5f17c437e3b64520639c4814514da42e925617ef SHA512 a3e48f755ca7ea41d10533308c73a7db27026e24b52ed66dc3ce26afd118ee8e16e894e7be0b88ad4eb0305bf3ebd2a02596cf470fd0610c351010a18cb04e6c WHIRLPOOL 1b20ba7c7a954fd4d7ee8bd1f7b0b3c3ef880afbb931e38951c73626916a74fd665f05cd36c4aabb66c265623541013b56aa52057d1b8180427d5201d9b795dd
+MISC metadata.xml 218 SHA256 ddc25240b08f34a11ec40b8f89b0465343135e80dd8762624858e383651e9363 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781 WHIRLPOOL e5a7ee851a7d7a5d30327c10ae6ea910afd395771a1ee35607ba1c183882c6c2257ff637cde344befa2388038b1546a7a9df0502939d26a58ebbb1e920c4ecdc
diff --git a/dev-python/namespace-paste/metadata.xml b/dev-python/namespace-paste/metadata.xml
new file mode 100644
index 000000000000..266e3f19ca59
--- /dev/null
+++ b/dev-python/namespace-paste/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/namespace-paste/namespace-paste-1.ebuild b/dev-python/namespace-paste/namespace-paste-1.ebuild
new file mode 100644
index 000000000000..1c1cb2a9b69e
--- /dev/null
+++ b/dev-python/namespace-paste/namespace-paste-1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit python-r1
+
+DESCRIPTION="Namespace package declaration for paste"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_unpack() {
+	mkdir -p "${S}"/paste || die
+	cat > "${S}"/paste/__init__.py <<-EOF || die
+		__import__('pkg_resources').declare_namespace(__name__)
+	EOF
+}
+
+src_install() {
+	python_foreach_impl python_domodule paste
+}
diff --git a/dev-python/namespace-repoze/Manifest b/dev-python/namespace-repoze/Manifest
new file mode 100644
index 000000000000..048c51ddb114
--- /dev/null
+++ b/dev-python/namespace-repoze/Manifest
@@ -0,0 +1,2 @@
+EBUILD namespace-repoze-1.ebuild 744 SHA256 41cdb3fd0c39af4572f77a3cb666f348b47afc7fe72cef76afeaa9cd9316a1cf SHA512 db9458af27813d2b39e54bdaab19cd1eeb28ed328b6c11840918c44fb75e4a3079d42992ec1eda38d24704671b3dded81e73bc561bed5bd3f036ca2ef4fe8612 WHIRLPOOL 58e96cc8e9da89a6883c86279397221c78c0241a6d81d375e13a004d44e62acef17a0eed38d71d00bd8390276042ad72132f7b1b050e444a3c1bd31181af3fe9
+MISC metadata.xml 218 SHA256 ddc25240b08f34a11ec40b8f89b0465343135e80dd8762624858e383651e9363 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781 WHIRLPOOL e5a7ee851a7d7a5d30327c10ae6ea910afd395771a1ee35607ba1c183882c6c2257ff637cde344befa2388038b1546a7a9df0502939d26a58ebbb1e920c4ecdc
diff --git a/dev-python/namespace-repoze/metadata.xml b/dev-python/namespace-repoze/metadata.xml
new file mode 100644
index 000000000000..266e3f19ca59
--- /dev/null
+++ b/dev-python/namespace-repoze/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/namespace-repoze/namespace-repoze-1.ebuild b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
new file mode 100644
index 000000000000..92cb3300eda6
--- /dev/null
+++ b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( pypy python{2_7,3_{4,5,6}} )
+inherit python-r1
+
+DESCRIPTION="Namespace package declaration for repoze"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_unpack() {
+	mkdir -p "${S}"/repoze || die
+	cat > "${S}"/repoze/__init__.py <<-EOF || die
+		__import__('pkg_resources').declare_namespace(__name__)
+	EOF
+}
+
+src_install() {
+	python_foreach_impl python_domodule repoze
+}
diff --git a/dev-python/namespace-sphinxcontrib/Manifest b/dev-python/namespace-sphinxcontrib/Manifest
new file mode 100644
index 000000000000..17d6befd14c5
--- /dev/null
+++ b/dev-python/namespace-sphinxcontrib/Manifest
@@ -0,0 +1,2 @@
+EBUILD namespace-sphinxcontrib-1.0.ebuild 990 SHA256 35bc613cf664c829fdb98d57f374673ee281c3ff11a28bfc2435402cd1d84a77 SHA512 f05c8d7481153d2d2e111595fe063f944eab5679659264c483282a792d1ac4aea0db5ccb7f257d77afe85f23f0680c683ed31b8ff6b7392fda6df5291a11b37c WHIRLPOOL 39034ac5887acb97a16883ecf3f7ac5949b9cdd9266a6ddb498af51d5ed4ce35c530ad9b83e2d24b8a8ece89a8645a3133800a8283e4255a6d4207be3e18e040
+MISC metadata.xml 222 SHA256 901c44d7364b348d4046acc87d273475107344a4f228eb4762f6dcf86120b822 SHA512 b9b20f913c2b6bc8ec843d5d46a97ca2d847ccadd4dcadf7b68a60535e44b721541c72cc74b17c55fe21161a1dcfbc86a3d08e58659a8c431b574729fe87607d WHIRLPOOL d863cf585797b37f844ffed1e3b5e5d92e9db50bacfbadc70ac64ede8f780bcc3cf0dfe18aa25fb0b1fa45fb0a19869cd8a45b646cfcf69ccf509080c80e7752
diff --git a/dev-python/namespace-sphinxcontrib/metadata.xml b/dev-python/namespace-sphinxcontrib/metadata.xml
new file mode 100644
index 000000000000..3743220e59f3
--- /dev/null
+++ b/dev-python/namespace-sphinxcontrib/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
new file mode 100644
index 000000000000..1fa214f61b3f
--- /dev/null
+++ b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+inherit python-r1
+
+DESCRIPTION="Namespace package declaration for sphinxcontrib"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+MODNAME=${PN#namespace-}
+
+src_unpack() {
+	mkdir -p "${S}"/${MODNAME} || die
+	cat > "${S}"/${MODNAME}/__init__.py <<-EOF || die
+		__import__('pkg_resources').declare_namespace(__name__)
+	EOF
+}
+
+src_install() {
+	python_foreach_impl python_domodule ${MODNAME}
+}
diff --git a/dev-python/namespace-zope/Manifest b/dev-python/namespace-zope/Manifest
new file mode 100644
index 000000000000..5a06fea2185f
--- /dev/null
+++ b/dev-python/namespace-zope/Manifest
@@ -0,0 +1,2 @@
+EBUILD namespace-zope-1.ebuild 940 SHA256 9e179fcb28ffb4bbefb329a2c83e800fa28d7f2c1c56f52109e27397e11daeb7 SHA512 862c7d3290153cd1341d6797ab8b325a33c1b0cfcee691004eac371c54b18b9e7e97c1a3ad2f56c16628aea873f3f50a8fd0e164e56feff82efdfd99010f688e WHIRLPOOL 8cf72752c0ddb59a427200fa315c30436734abbb32e804a136931908a6cd8bf9a29ebab46778d34f6f3f4100bbfa18da8ca49eb7f8724a77fea456f2ab207985
+MISC metadata.xml 218 SHA256 ddc25240b08f34a11ec40b8f89b0465343135e80dd8762624858e383651e9363 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781 WHIRLPOOL e5a7ee851a7d7a5d30327c10ae6ea910afd395771a1ee35607ba1c183882c6c2257ff637cde344befa2388038b1546a7a9df0502939d26a58ebbb1e920c4ecdc
diff --git a/dev-python/namespace-zope/metadata.xml b/dev-python/namespace-zope/metadata.xml
new file mode 100644
index 000000000000..266e3f19ca59
--- /dev/null
+++ b/dev-python/namespace-zope/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/namespace-zope/namespace-zope-1.ebuild b/dev-python/namespace-zope/namespace-zope-1.ebuild
new file mode 100644
index 000000000000..268afd299faa
--- /dev/null
+++ b/dev-python/namespace-zope/namespace-zope-1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+inherit python-r1
+
+DESCRIPTION="Namespace package declaration for zope"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_unpack() {
+	mkdir -p "${S}"/zope || die
+	cat > "${S}"/zope/__init__.py <<-EOF || die
+		__import__('pkg_resources').declare_namespace(__name__)
+	EOF
+}
+
+src_install() {
+	python_foreach_impl python_domodule zope
+}
diff --git a/dev-python/natgrid/Manifest b/dev-python/natgrid/Manifest
new file mode 100644
index 000000000000..3a26c2d026fe
--- /dev/null
+++ b/dev-python/natgrid/Manifest
@@ -0,0 +1,5 @@
+DIST natgrid-0.2.1.tar.gz 35205 SHA256 99085f49540d030c8f7ed7e8af7170e1bbfa1961abf18f4546b0504ab5d2414c SHA512 489e8454f05ff994bad23d88bb423fd0bc17e838193865d3dbb6be0d01221203dcd1644c133827421ba4acf354295f07533ff838b138056064e1bee73d43c922 WHIRLPOOL 5262f5ca341ec265ca8e41aa4e7f10d5d581c7f55bed34f607effe7a8c44ddd5226c8ff0e81ed2c58fc1578405e8ef21c7a8828106ce40b3ed0b0b0bdec75aec
+EBUILD natgrid-0.2.1-r2.ebuild 813 SHA256 b5887689bfd0a2a23c29a37e53133c25298af63b9af7fc374f4006fd5f9191ed SHA512 78f7892cf967a0a74a9511782041925360ab3c4b089e3f48b1585d605f02f66ed93a8c431a9cfe58dba1fe2606196e57a64e5f54535ed017d245e61bc8ca7c19 WHIRLPOOL c4b62d9d316cab0cea0a5ee9df19b3ea5c2c13fc2bf12ee8f98daeaa901a0801a39963a31bd84746e91fe8a2894df6612cdf52d818eacce73ab2441de1bd362b
+MISC ChangeLog 2566 SHA256 ed29caa9e3b4eeea1bb631d2e3d7ca7c2485b73a061a59adc3952e44dcf9f918 SHA512 d265516adde16d52f5901e2762bb619dfdae527f3ea8ef8f5c1563f44163edd0fdef99e0ebb3947aed96c708f906470c684398f63fadceea21d1124dbeaaa503 WHIRLPOOL 219ee56a9eeb197078cb03f1469d899851ca59ed8cc1f3217a38a989b4f622003c39f8da766e7a4e605d897c28e4f1a322ae4f3779fb18859822ea174a68755d
+MISC ChangeLog-2015 2056 SHA256 20b874e16d5772e2b788c9a3b5cb6c5c0c333af8c7137f1cac95c63f2eb908f8 SHA512 aaa09e396b0cc236fac681c1f0d4df91fd36630f55193541901cbd2cb0b98ef6e825d722b225d3e6577f4a44108060cb0d1fb9f35cd3647a597b72fd115885e9 WHIRLPOOL 776431ee7d0cbfc6701458416e7d3b1a400d3d08cb2bb0fc66988a73e20336490b9c83709ae614a6d1fc7043e7538ec803fcc7dd444c27d1eab2c7a49f6288da
+MISC metadata.xml 614 SHA256 621fae97793b1381f9f8d5639d849ea354b46be6d5cf2945288708c57782e0f2 SHA512 570a3a261413f5a04a9226ba548f6a56ffa5331f50cb0383412fd311b6bb3d0bdfa565f37df92353e622ba92fef96b7d87b933700c9b52525373da7d8f509e25 WHIRLPOOL 2a06ee50a0469c0e13c717b9b5fc2f729b79f894fb3884b491c6d2816dfdd4ff516508aaa4d3eb8e4d8110c4732e1a78fe1be9a5e2b9142e8352d86b835ab499
diff --git a/dev-python/natgrid/metadata.xml b/dev-python/natgrid/metadata.xml
new file mode 100644
index 000000000000..41601dc19540
--- /dev/null
+++ b/dev-python/natgrid/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">
+  mpl_toolkits.natgrid is an python interface to natgrid C library for
+  gridding irregularly spaced data.
+  The original natgrid is a natural neighbor gridding package.
+  (See http://www.ncarg.ucar.edu//ngmath/natgrid/nnhome.html).
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">matplotlib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/natgrid/natgrid-0.2.1-r2.ebuild b/dev-python/natgrid/natgrid-0.2.1-r2.ebuild
new file mode 100644
index 000000000000..52464d9027dd
--- /dev/null
+++ b/dev-python/natgrid/natgrid-0.2.1-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Matplotlib toolkit for gridding irreguraly spaced data"
+HOMEPAGE="http://matplotlib.sourceforge.net/users/toolkits.html"
+SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=">=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	insinto /usr/share/doc/${PF}
+	doins test.py || die "doins failed"
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	distutils-r1_python_install
+	# Fix collision with dev-python/matplotlib.
+	rm "${D}$(python_get_sitedir)/mpl_toolkits/__init__.py" || die
+}
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
new file mode 100644
index 000000000000..e2188e167b9f
--- /dev/null
+++ b/dev-python/natsort/Manifest
@@ -0,0 +1,5 @@
+DIST natsort-4.0.4.tar.gz 63116 SHA256 c76ba3e85fba78f276ac06e4d47f2230d1070f9c19413b2a0bfe7de6af311839 SHA512 e1c00de6fec56aeda6dedb547edfb2f819d8c129feb938be9cee64cd106485d75b2af12316d73b6e79c90694b0d489ddbdc29635e3df9569466d062cabbed461 WHIRLPOOL b410156355c3b5c5e12a982f8703fbdc7fbe079a614edc7638354b238260e6a559adf8ebccab5b3b728410a2c21c8932cff851341f5274e7bdd12d3295d8c595
+EBUILD natsort-4.0.4.ebuild 774 SHA256 e3c4096b963f149f43e837d8200075d983afe08b92f148b33f527f3808f2c602 SHA512 e6d5957fbd21213e1b096a156ce41598303e0cfb5a8aaba4c6002502debc4b2e8862a789ae93f6af5d2214d50ec932f9d2bb949ba4f253ced2352e28860bf696 WHIRLPOOL c28fdfdc2a8e3a07f0b0745eb5b49200aa75a2bbf3a4b9fc7abaff253f05e43e603f7b1aa80e554628d54a0f7e2fe42ee18a1590e0a2ba244f2a5e454d8ef079
+MISC ChangeLog 3092 SHA256 0441acfa8e5b4471a20af57a8987f35ca698a53d018d7d5d8ec7a3890a962690 SHA512 fbf160bd34dbbcda7d822b1f039cfcb59524d240db32f013d3e9b34cdc0c3b25385dd77353ceab198afe697879a658ee1062f0300252332e0caf0c905bbd5090 WHIRLPOOL 60c046ed1a7d2046bda64c3a8298cd0fbdf31a466cc215235b652fd00765501cac80ca01982c4c483363ace8389fd5ad61696b42c0a3d2f77f5be2e9ec26f6c3
+MISC ChangeLog-2015 1664 SHA256 b92b0f9dd08fe295692825b150a896e906e88f2f6953271ece6c1bb2ba979f04 SHA512 c8ca08684926e94b3af09dd06dd68350f391b5a794dc9afdea66d977d3ad0cf9862e6f29fd45742650c5dcf365c0c7e421e197e58304cc20e0632c81993846d4 WHIRLPOOL 2158b3b002a65d073329c6a8c673f71ccb2a3b6f401c12d1704d04e5841c2e06f5d2e88f8604ff0ac8c2b21ed88c8e64959caa29426176e74e86a01a1ba1584d
+MISC metadata.xml 320 SHA256 ef942476c2d0bfbe5228ccc9de0c0949fdb8b695e9dc676858653c0f39b72962 SHA512 6ddb8e2538028ac71b41a224ca0c2f8a322aa12cf1eb779c422bdcb7796aa342394dc4f6ed46695deb46b5172cf156f81244935db0c4a5eb340537d7caab8916 WHIRLPOOL 6348ff775bc2d88194577beb8bcaeddfd25eb604ff35a7d13e46cb8ea3f60dd7305c312223264010d90bc6fec57a03beda7f5752c411ee36e8cbde1fb32071d5
diff --git a/dev-python/natsort/metadata.xml b/dev-python/natsort/metadata.xml
new file mode 100644
index 000000000000..9f76f3b0434f
--- /dev/null
+++ b/dev-python/natsort/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">natsort</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/natsort/natsort-4.0.4.ebuild b/dev-python/natsort/natsort-4.0.4.ebuild
new file mode 100644
index 000000000000..485781b48a50
--- /dev/null
+++ b/dev-python/natsort/natsort-4.0.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+RESTRICT="test"
+
+inherit distutils-r1
+
+DESCRIPTION="Natural sorting for Python"
+HOMEPAGE="https://pypi.python.org/pypi/natsort"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ia64 x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		virtual/python-pathlib[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/nautilus-python/Manifest b/dev-python/nautilus-python/Manifest
new file mode 100644
index 000000000000..e5f4f2cd74b1
--- /dev/null
+++ b/dev-python/nautilus-python/Manifest
@@ -0,0 +1,5 @@
+DIST nautilus-python-1.1.tar.xz 239392 SHA256 7825e08ada8e131f829d0e7d4144dcfac9fad7bfd7c0600bf3985349c20c496b SHA512 e721f46414a3efa4b5f5ec3f56cc00a308ec010a7a0612cef975d6f436494701f8bdbed39bdb5186c8013a582c7e63288a1c60adc4b8967c9ec69d6301a50fef WHIRLPOOL 280b6019a9850596b69777a758d89b06bfce5f30188feb274c8d5820ec6b9ecfcc8c0c402dbfee184378b2c02b6c29bc798ff061a139defd8cfae4e12b5d591d
+EBUILD nautilus-python-1.1-r2.ebuild 1249 SHA256 f5603caa1f088ba5761b5e230fca99d6999dce0c7ff52904fe561534144aa50c SHA512 af65749fb112c1c2c5c8d3a1a9317a14524a6159f56f8f55253597aa7ea56c2c9d48549f590e6d800e984ca592eb583ba4421eabfbcb086a355984e68c435d0a WHIRLPOOL a71a634ae96a0bd31ee4a43274ec1747fd2f7b3f857b974f9772ac4107f729b6d38ff385c26a67b0348d6ed4c02354dea10f030436a8afba49185f738784ebdd
+MISC ChangeLog 2996 SHA256 9101529f18e3e0da9017b0c146538b6f4f60383bed80589b4233b1c4e006bc3f SHA512 5efc3f153ab9dfad5eabfd5cafb5a25fa75939614d0597b798ceba61dec3959b91de15a053e6d44a86a1912c267ce1710b9eee3c4216503b54ea545090d633c4 WHIRLPOOL 52f5bd7a595c4b65729b7330c0b0151249ff1326a037576586c3b8ecdd8a58493fd838541131ea2ff16ec3ba1ec2e8a577fe30c6fb65b9690f85bfc914d24ebf
+MISC ChangeLog-2015 4733 SHA256 bad5752bd48c2ce49ab872c7737f8eadbb6a45edabfbeff2cebf0fce4eb2b2c4 SHA512 085a4d94ec0d20aeae3f1b592ea302d799221bad20a02b9713dd86ab2197182cc49994806b4f8859f814645cd5ddf7034dc9091b5df53a2de7a6e9b6df290087 WHIRLPOOL c556ffae71dc1a2e4842d8bce6c478b87173557b8036e2f113a5758d12a7b6d365b49b11fa86f0bdee6480ab7aee24f49f5269e35e9831be2b67ccb89c3a9cbe
+MISC metadata.xml 256 SHA256 09a8ad8d1626f1013c0de6f41fb61a1c72ea298e12eced6073f0fb879aa65dd2 SHA512 efe3e668ae6d6c6e11e5783c9133fbc6378a4cf21d502aaf7ada64dec0418f457480754a907ac037bb9f7acc008410c6c2f9db57322b9b44256aec74b14ef63c WHIRLPOOL ba23220780a07a4574eb7bbcb21413093b2ee3a1f6b9d8339eb55fb7c35597639311d6415847dc3de6fa9e063e1305ab48bc2eef0c0769c64ae9eefa9fc6825b
diff --git a/dev-python/nautilus-python/metadata.xml b/dev-python/nautilus-python/metadata.xml
new file mode 100644
index 000000000000..681f0dcf3b5d
--- /dev/null
+++ b/dev-python/nautilus-python/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>tetromino@gentoo.org</email>
+		<name>Alexandre Rostovtsev</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild b/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild
new file mode 100644
index 000000000000..fddd91c95507
--- /dev/null
+++ b/dev-python/nautilus-python/nautilus-python-1.1-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2 python-single-r1
+
+DESCRIPTION="Python bindings for the Nautilus file manager"
+HOMEPAGE="https://projects.gnome.org/nautilus-python/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 x86"
+IUSE="doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Depend on pygobject:3 for sanity, and because it's automagic
+RDEPEND="
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=gnome-base/nautilus-2.32[introspection]
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.9
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		dev-libs/libxslt
+		>=dev-util/gtk-doc-1.9 )
+"
+
+src_configure() {
+	# FIXME: package does not ship pre-built documentation
+	# and has broken logic for dealing with gtk-doc
+	gnome2_src_configure $(use_enable doc gtk-doc)
+}
+
+src_install() {
+	gnome2_src_install
+	# Directory for systemwide extensions
+	keepdir /usr/share/nautilus-python/extensions
+	# Doesn't get installed by "make install" for some reason
+	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/nbconvert/Manifest b/dev-python/nbconvert/Manifest
new file mode 100644
index 000000000000..c5bf02666534
--- /dev/null
+++ b/dev-python/nbconvert/Manifest
@@ -0,0 +1,11 @@
+AUX nbconvert-4.1.0-docs-Makefile.patch 667 SHA256 04cafae63fcce16e2fd9633dce2539c1d4585a3a1d24926e79003555d6e0a2c4 SHA512 22db6ba0f611c776710090e5abd66041a331a47c24170f711e19c658b43eb1030335f83b6bcc5cc71f38766cbbbc0347995992f7919ceabac69376929667d700 WHIRLPOOL 1eafb74aa324a1aa8a151df1b93936fb8e391980312cef4d8f0704270af3f4f8ffa63f2e8bbe0c2ada30787ed7ea227482e556db4a80e8d57364b15663634e42
+DIST nbconvert-4.1.0.tar.gz 263948 SHA256 e0296e45293dd127d028f678e3b6aba3f1db3283a134178bdb49eea402d4cf1c SHA512 9761cf8cdf206bd8f27c666d7b520cbd7d805353cf46b212b46ee6053b47ec6728a5926dfe59acef109c8770580c41d51aa5b943a27e72bccecc68a7d7b68bfb WHIRLPOOL 9cc27a45b00ee9914674cd14a279be1691eb8a8538803bdda127513f56dd0ce53b10745f305f8fb82abd2d19efe7c1b0284bf05f8088360d2def6c97db0c1c6e
+DIST nbconvert-4.2.0.tar.gz 428726 SHA256 55946d7522741294fcdd50799bd1777d16673ce721fecca0610cdb86749863c6 SHA512 441d32e5bd63cb7d0b9a70b814ec6ea647a04542601461cb8b008f4f9ab894f5729687093400703b222435100384378653fbbb38427431d9da62992ef778906a WHIRLPOOL 024ef6b9a70a9248431c71092de7ae993fad1144110669c0d538d13646cd991b5389f4550c269c55c541d96526541b884d5dec8632048a9365eb1986fe34d85a
+DIST nbconvert-4.3.0.tar.gz 377486 SHA256 d967ec588ffd1ad7336163f1ac8957a348b5c4bce4465632db4cf684ffe4b718 SHA512 ae5ca7c08dc052a20019309301d0d0d396498fc367614480c24192cc7fd059c31856d59594da7823463e14b769e4775d41c7942aa13d90ad7186aaa08ab4cdfc WHIRLPOOL dfffe8524f5724bd819cb6f24b0536831b08c08b45a3770e3fb5e884b8a3a854588bcba29a2eb1a4df91ffb93c8dd0db4227ded57510088e5722410d61e7f67d
+DIST nbconvert-5.2.1.tar.gz 510937 SHA256 9ed68ec7fe90a8672b43795b29ea91cc75ea355c83debc83ebd12171521ec274 SHA512 c71c95d6c7bda4b55afad792d108d48c27857e060531dc8ec262673971c258ff9480821bd78ee5cbdbb19f107d5f8d19a49eac88819f20a09b450c26681335fa WHIRLPOOL 5a580227885f18fe1caf63ad2d22fe42b6818a694a1c9212fe69f588952a9c5c6310b5ea099f3706e09b5dcbdb731b1541bd1cc6f0dce9941784dbe92cc37d1e
+EBUILD nbconvert-4.1.0.ebuild 1738 SHA256 4e798b4921baa108439272c3427763c61295b1e61e481f15b0921b766056cf2b SHA512 9d908374f0b40cf6c7faed026a14dd628e4548c0a61e50c488a6604831704a6b35655a03d801de07510522cb00d8a705a9c7a278b9a884c020a3e2a32bb439da WHIRLPOOL 3224ce98b1b7a6a6bf7514f284d0c2438d3f0817466fb29bccb84daabcf5e1c755ad1584d3b29cb4b6707caa31d842729ecf2866a96fc2080a130ad4b94bf041
+EBUILD nbconvert-4.2.0.ebuild 1812 SHA256 be27da09c4da890154690edf39a333ef15a572acad033501255172cbc2ab4de5 SHA512 b770bcf72c33f8997e39e114b025f8fb3c8fb3c6c17def4a728746b7c8b13fb0b646400e3291418171f2f95f0fdf369d99db191d5c34e5b1c5e992d0423013ea WHIRLPOOL 18b9a91f3159a2ec2d70656109bc4ff13e12d6fbb59fc72ffdd76ad7404319921d3e9feb20cc09e093a9f4d7bb4a68960bb0a2d88fbda7aef77182ac1fdbf13f
+EBUILD nbconvert-4.3.0.ebuild 1764 SHA256 0e3ec84d5b4a8687db09bcae8bfda289fb5677be14883dce9135bf39aefe521d SHA512 dd140f30b8e12e4905a4dbb59a01860301d0d0861d5944bb3d72547cc2284ad6a969695cdbc87d0ac3adb983dade48be46cbc5693c488d55ce24a0c0a5354308 WHIRLPOOL 5951a2b2bff182ceb2b2015b55ad966e4970d1620b27e6f0e160e41c00f1d1498419638c00a204dc64a009faa8b168fd9175982bdc30f06b4c867f3dc04e28cb
+EBUILD nbconvert-5.2.1.ebuild 2136 SHA256 8e5fa9f6031cd2f233a7b71311d033d54a2446b1cd30e6f1cdfdbc3acd050640 SHA512 cc8ffc47cb1496533dae185f986b3f3404955ff0d7238819d904bee601c4d6027bbdff506f5ee970ebe87735149f00ca8a209285b27c1500298f6ec0d5df9cd8 WHIRLPOOL f321bf30be5af920fcd414fe43f9851331b6c08289c2bff16511ef3fb48b31b3534f8792cbb1b71083a76eca8fadaf5d3a2ff5779b9d164e2cb903ace7364dd4
+MISC ChangeLog 1762 SHA256 adbd0c0ea93d1c7e9901ce3955d9ba9920acb13f290b57b7a55b49fa78b724db SHA512 dddb66bbf53a30ffe478e03c4360a848887522b5baeb19da6520696b18fac67850a605ea1e51c0ab9674a86f19a0305284a290ea9455e10c710ec9f97a92465e WHIRLPOOL 0512af338df801d43c8368baf6ac013d67fffb3fc6c18811b2dcb877ba5c65802f27b8b2d6e92a953e5691cddb0a554a035bf20bae51db32fcd34ebd7be9970a
+MISC metadata.xml 534 SHA256 5bc4e20b78ca6db6c6fe2e6f949c6a39de0bb8b9b1c95ed1249dcc05b014f6ba SHA512 8a00c8bf80e0e9477a531b70d9f2fbba1fc8c8bc09246a6a2263d94170d294e65e6a20f8ab84974e97b346c96b22e2ca648ef5021fc9316a023532ca34bd07d8 WHIRLPOOL 0feb98a7caca964ae0fee10da33cb06102685d9326537bcdea57177fea29085081be0a5911d57ef716cadbdee662ff2fafe479c12dead4494644b5dc58151099
diff --git a/dev-python/nbconvert/files/nbconvert-4.1.0-docs-Makefile.patch b/dev-python/nbconvert/files/nbconvert-4.1.0-docs-Makefile.patch
new file mode 100644
index 000000000000..130a4afc06cc
--- /dev/null
+++ b/dev-python/nbconvert/files/nbconvert-4.1.0-docs-Makefile.patch
@@ -0,0 +1,16 @@
+nbconvert is not yet installed at time of doc generation.
+
+Patch by Marius Brehler
+--- docs/Makefile
++++ docs/Makefile
+@@ -61,8 +61,8 @@ source/config_options.rst:
+ 	@echo "Created docs for config options"
+ 
+ ipynb2rst:
+-	jupyter nbconvert --to rst source/customizing.ipynb --FilesWriter.build_directory=source
+-	jupyter nbconvert --to rst source/nbconvert_library.ipynb --FilesWriter.build_directory=source
++	../scripts/jupyter-nbconvert --to rst source/customizing.ipynb --FilesWriter.build_directory=source
++	../scripts/jupyter-nbconvert --to rst source/nbconvert_library.ipynb --FilesWriter.build_directory=source
+ 	@echo "Converted notebooks to rst"
+ 
+ dirhtml:
diff --git a/dev-python/nbconvert/metadata.xml b/dev-python/nbconvert/metadata.xml
new file mode 100644
index 000000000000..71b87397b7e0
--- /dev/null
+++ b/dev-python/nbconvert/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    Jupyter NBConvert converts Jupyter notebooks to various other
+    formats via Jinja templates.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">nbconvert</remote-id>
+    <remote-id type="github">jupyter/nbconvert</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/nbconvert/nbconvert-4.1.0.ebuild b/dev-python/nbconvert/nbconvert-4.1.0.ebuild
new file mode 100644
index 000000000000..3d32feec95e2
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-4.1.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+MY_PN="nbconvert"
+
+DESCRIPTION="Converting Jupyter Notebooks"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-docs-Makefile.patch
+)
+
+RDEPEND="
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/mistune[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/jupyter_client[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		app-text/pandoc
+	)
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	nosetests --with-coverage --cover-package=nbconvert nbconvert || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if ! has_version app-text/pandoc ; then
+		einfo "Pandoc is required for converting to formats other than Python,"
+		einfo "HTML, and Markdown. If you need this functionality, install"
+		einfo "app-text/pandoc."
+	fi
+}
diff --git a/dev-python/nbconvert/nbconvert-4.2.0.ebuild b/dev-python/nbconvert/nbconvert-4.2.0.ebuild
new file mode 100644
index 000000000000..63fcc4d00117
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-4.2.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converting Jupyter Notebooks"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/mistune[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/jupyter_client[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
+		app-text/pandoc
+	)
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	py.test --cov nbconvert -v --pyargs nbconvert || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if ! has_version app-text/pandoc ; then
+		einfo "Pandoc is required for converting to formats other than Python,"
+		einfo "HTML, and Markdown. If you need this functionality, install"
+		einfo "app-text/pandoc."
+	fi
+}
diff --git a/dev-python/nbconvert/nbconvert-4.3.0.ebuild b/dev-python/nbconvert/nbconvert-4.3.0.ebuild
new file mode 100644
index 000000000000..15db15fac529
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-4.3.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converting Jupyter Notebooks"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/mistune[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/jupyter_client[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
+		app-text/pandoc
+	)
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	py.test --cov nbconvert -v --pyargs nbconvert || die
+}
+
+pkg_postinst() {
+	if ! has_version app-text/pandoc ; then
+		einfo "Pandoc is required for converting to formats other than Python,"
+		einfo "HTML, and Markdown. If you need this functionality, install"
+		einfo "app-text/pandoc."
+	fi
+}
diff --git a/dev-python/nbconvert/nbconvert-5.2.1.ebuild b/dev-python/nbconvert/nbconvert-5.2.1.ebuild
new file mode 100644
index 000000000000..8d94deb89a0f
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-5.2.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converting Jupyter Notebooks"
+HOMEPAGE="https://nbconvert.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/bleach[${PYTHON_USEDEP}]
+	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	dev-python/testpath[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		${RDEPEND}
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/jupyter_client[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
+	)
+"
+
+# still failing in many places
+RESTRICT=test
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	py.test --cov nbconvert -v --pyargs nbconvert || die
+}
+
+pkg_postinst() {
+	if ! has_version app-text/pandoc ; then
+		einfo "Pandoc is required for converting to formats other than Python,"
+		einfo "HTML, and Markdown. If you need this functionality, install"
+		einfo "app-text/pandoc."
+	fi
+}
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
new file mode 100644
index 000000000000..e1f8c492188b
--- /dev/null
+++ b/dev-python/nbdime/Manifest
@@ -0,0 +1,5 @@
+DIST nbdime-0.1.2.tar.gz 3864624 SHA256 4adb8ff052a7c778fb5f00872172a3790504de392eb7f23b6ae96b8a8165a695 SHA512 9f704645ef1e64b0da260841769068db6f6aba37f30b3c6506a1876af1276acb452ed78f66b9e6d7029f06ed9fabf01a1484b4b86055f27a451d623a7eda90cf WHIRLPOOL 570891b1f9067abe88009f7160f509f8cba6345742df3d0549a486b8669f84c097487d25855f76ddea3ee8d786131145467ea20bedf3d54bca30a137977b7978
+DIST nbdime-0.2.0.tar.gz 4139079 SHA256 0915df792ab82fe8c3d3c892123bae0d5fb0180bafa150e2fe4dd327ff7e3c82 SHA512 c156b706e1d6cc7885f987d746e91d7f0c2fa48885339fd79e778643382ab45e2e52565f45cc73b9a305c6f5177339e875f53ae46d73578443880a4c7522976d WHIRLPOOL 0a95351be0efe993ffee5f677b62488deade3895400350c04f4743eae4bbb4e113f6fc2295ef777ecabdc9c3e27023c1d6dec4b83dc48c119ca95ea2417f9319
+EBUILD nbdime-0.1.2.ebuild 1358 SHA256 8f05dc8bc947f0396cfcb1ccdff98ecb8183f0195249c323e3e9f5916d4091d5 SHA512 04b6221791545222a081baf8a6cbaf7b043b182f8a10a42994680526f2c7bc2574de781c506a663adc0a8e5d3fd85eb82d108021c3518fcfb52806e4208018ec WHIRLPOOL 11b4b59b42ca86597197ec1f25da5526b7042915b1a10f7583139d642676f67e46c0b1baf88a5b8f749eae68eca10b5e9e72bc272b47ee3e516a877172166a59
+EBUILD nbdime-0.2.0.ebuild 1606 SHA256 2e0aee165b22312a05c4a5b966644d03ac14e2c09e80a245550bf0286b07a9f7 SHA512 ab59172c5568411dd19dbc20021bef4b8ca3404e8093a9710953eec23afea8d67736e7b9f0721b38935e7b05652a6c76577764dd1e0d78a745144011d7d86915 WHIRLPOOL e2a73961aed762257a9ce159147f086c6d6b073dcaa83e53467fc8aaaa6d61f4c2fe0480cba3c31cc86f4e5063816c75a1f0d36e4de2b4abbd87f6797c395906
+MISC metadata.xml 722 SHA256 9f1cc2aa0341cc164e3732489e7dfcf33b5643ee81327b37a73ef90e852817db SHA512 0f319098fdae96681969217b5deedafca1908b8bf47e9603ca3ecef75c4461c61e64ce0fe20e7356713d2256de8267f4abf4162be8c0098930865f464914f59d WHIRLPOOL a8cae1d520a7f8eb6868350e95fc9814244f399fc7fb720118d479f91da4f42b75f3ce50a5d62841c418eadf4c27a2fa9c418e7f9fbdd105d991686070a0e6b0
diff --git a/dev-python/nbdime/metadata.xml b/dev-python/nbdime/metadata.xml
new file mode 100644
index 000000000000..b2a229dc3754
--- /dev/null
+++ b/dev-python/nbdime/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>marbre@linux.sungazer.de</email>
+    <name>Marius Brehler</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    nbdime provides tools for diffing and merging of Jupyter Notebooks.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">jupyter/nbdime</remote-id>
+    <remote-id type="pypi">nbdime</remote-id>
+  </upstream>
+  <use>
+    <flag name="webtools">
+      Install web-based diff and merge tools.
+    </flag>
+</use>
+</pkgmetadata>
diff --git a/dev-python/nbdime/nbdime-0.1.2.ebuild b/dev-python/nbdime/nbdime-0.1.2.ebuild
new file mode 100644
index 000000000000..f469ec14ebc7
--- /dev/null
+++ b/dev-python/nbdime/nbdime-0.1.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Diff and merge of Jupyter Notebooks"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test webtools"
+
+RDEPEND="
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	webtools? ( net-libs/nodejs[npm] )
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+	"
+# The package recommonmark is required to build the docs, not in portage yet.
+# Furthermore, backports.shutil_which is required for python2_7.
+
+python_configure_all() {
+	if ! use webtools; then
+		mydistutilsargs=( --skip-npm )
+	fi
+}
+
+python_test() {
+	# user.email and user.name are not configured in the sandbox.
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+
+	distutils_install_for_testing
+
+	py.test -l || die
+}
diff --git a/dev-python/nbdime/nbdime-0.2.0.ebuild b/dev-python/nbdime/nbdime-0.2.0.ebuild
new file mode 100644
index 000000000000..a5ed4d14c2a3
--- /dev/null
+++ b/dev-python/nbdime/nbdime-0.2.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Diff and merge of Jupyter Notebooks"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test webtools"
+
+RDEPEND="
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	webtools? ( net-libs/nodejs[npm] )
+	"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+	"
+# The package recommonmark is required to build the docs, not in portage yet.
+# Furthermore, backports.shutil_which is required for python2_7.
+
+python_configure_all() {
+	if ! use webtools; then
+		mydistutilsargs=( --skip-npm )
+	fi
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	# user.email and user.name are not configured in the sandbox.
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+
+	distutils_install_for_testing
+
+	py.test -l || die
+}
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
new file mode 100644
index 000000000000..7e8a5dea95ac
--- /dev/null
+++ b/dev-python/nbformat/Manifest
@@ -0,0 +1,10 @@
+DIST nbformat-4.0.1.tar.gz 105767 SHA256 5261c957589b9dfcd387c338d59375162ba9ca82c69e378961a1f4e641285db5 SHA512 f73e8cffc61825aa8b7b0ef3b842cba51baf2cdf0c5d0035e2e7cb51f71c6c819f09201367a3b342c2736492dee1e78c519961aaea8f2cc4b5e69a1545085d2a WHIRLPOOL 9b08003c456e00c529b7bf8e786d57a583e53e5a1e7e9eb4c3cc492c5b1d60e76579c9102e6c56749d546a9a124d475687d4ec1d71e0f3634698d5e30499db93
+DIST nbformat-4.1.0.tar.gz 108264 SHA256 dbf6c0ed0cb7c5a7184536368f1dd1ada2d48fd6f016e0f9e9b69236e28c0857 SHA512 606d8aa786fdbe8fe6d12d9a13886a49043b096a86ad180556f65f226d5031c98f6c80b4319de09292f2f17ed9e3a5038828c94a7306ed2abd78976e30fc08d4 WHIRLPOOL f01d3431fb007b12bbd892181781d87a700c01a28f1bf5308f4ae0f5c5dd63c768e926964848a3a21b6bd34e8d6d2b6c3d962b4dee1f034a387e45d2c3741a2e
+DIST nbformat-4.2.0.tar.gz 110309 SHA256 389a5b630a30539074f238a48fb9864592f63d611baccfa2ffaf14ffe239de06 SHA512 4b1b4ae59948306d750e0e44f5443980de64f7ae1e4afd57299114e952b9733268bd54900ea8598e4ba14754c622fb1fe7eb13a29716c91941d79ba75031f543 WHIRLPOOL 9e7ab6e385be29502cbe7a76aee57017e5956ee71d825902ffe25d6fb4b092eab17a649c04dbee953efdbc34c309dc79fe71d10fa96a7b888c3b46608765ed5b
+DIST nbformat-4.3.0.tar.gz 578765 SHA256 5febcce872672f1c97569e89323992bdcb8573fdad703f835e6521253191478b SHA512 f4727466b96bb1e1524e9c496898bf0e868fd85b65e325a9741f0debc4f9fd908652b0eb4d0d20ed68332d7770c21dcb41b63ec76dc6a7d1b3267f03a7f96757 WHIRLPOOL e6b55758042127ab40d14268d45b33d7d32b2fab42a1aeaef106e9f6aad144f4228221074fd6cfc287fea2274167534c970546afc1d8216bc90f51e29318dfc2
+EBUILD nbformat-4.0.1.ebuild 1305 SHA256 662eeecf4cba4830966887e175bcf1bc8a4fd10f030c9b415984e14bdc8610a9 SHA512 146ef2cd811348d64add1a03016bb0b0e231422444614f0fb9a95782a40ff4b49261a751b2323ba57600c24f5a62936386cb65dd34f5071d3ccc7ac918829242 WHIRLPOOL cf6da5c67b0a61f6dcdfc82e1249b61eba618923ff96ee4478ac1ca48836c535d745bad72128fa400ebc626a0b31fae3bbef96dcec0c12c6210f4092f057db8a
+EBUILD nbformat-4.1.0.ebuild 1338 SHA256 aee2388b7dfabbc5381a4dca3a32817eb0b5efad166a7b4b6f5c8b1f1d2ef5f4 SHA512 f6336307c86101edf4c4188e27692b32a4d14738dc3f331eeb2ba650d212ffb0a6984fc837b7fb27bb8a90d1e61adf3502a789e11d4380ea967238c0fd0b4cee WHIRLPOOL 0211d3a4382ea83248252e92ccf5cc411fb7b7d169a6c7535f5cf7310a55a26d33016e6e13939653697b9549fce94bf5c27d2c76a7bc01c991c2fe2374b6e873
+EBUILD nbformat-4.2.0.ebuild 1281 SHA256 a6d826e754af6773cea6f324a762b23d4b7b9f34ab325260226a702e1aacd49d SHA512 7b93004e57319f6d36ce94f3ff1307bbe84a3d784cfcc933cc137f28ec8e3c72e4b93b6085d98634a89e81690b3e32fb7630f941cd8f2b74ac95d50413fa61d6 WHIRLPOOL 1ec9a6a43b38dacb03d90069de07f2daac294a65c906acf83dbdf15edafd2eebaa85f7378d084942b20a05fad0f436fb7b74d91d17810ff1ca1e04d64e90f0f6
+EBUILD nbformat-4.3.0.ebuild 1290 SHA256 b4d4cd0502f51197af213fb3f3739dbd6bc4440d1a194e0e41ee0dfa83957b73 SHA512 3eefcc9d51b8d53b9792ca5f6a862844cee1f5096bc47568fcf6e6e88fa1d8e66935021034ecf994cdcd824d289d09e233775bf360d6b622c6277f3ff887acc1 WHIRLPOOL 5b6a1eca1acce54a888c2639a1f05c673e51cb7e09f0aaa810a88ab3d9bbbb64b6838d63be7578d27b1f0d6431ddc8298707399dbeed7d037c4844b13546e7fe
+MISC ChangeLog 1682 SHA256 5d6d384dd7ddd18460a1a64482a3070de260b88054a572ef731d06cafc645387 SHA512 f5ab00f6658c8e9efd3c55b215e1a1e7d3e3fde26cb20502b85f462a057e3316dc9b6febb453bfbcadf6f4ec024bb524aca03c8eae6370ea02e5a361093662ac WHIRLPOOL 2e2dda887dbe9bef74517822bb34a6d4b978b64b46a7ab1836e15aae96357fc593957f7fce34a99efd408efb7f29dc4a25894081013a8397dc5f806db37f59c6
+MISC metadata.xml 647 SHA256 57ac3ae327ac1f987e1e4bef8ca720dbef346bd758df3d43ce0246153ff3c552 SHA512 74b3a7a494e4ae1cd6407c031978a96d18de1e142570f5a42071df743bc55a8756271a3903f2bf22fe5997440339571c41a1210e7982bb1ad46468f84690a05f WHIRLPOOL 4e364d9cfbf276b29c6468c3c5a3a01527ca46a8a16cb09ce1f2e3302031552727ea60c6fba59b7a684f0c828096ab83293874ac6be4aa9ab79fe7fc63da2aa8
diff --git a/dev-python/nbformat/metadata.xml b/dev-python/nbformat/metadata.xml
new file mode 100644
index 000000000000..81964b34d3ad
--- /dev/null
+++ b/dev-python/nbformat/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    Jupyther nbformat contains the reference implementation of the
+    Jupyter Notebook format, and Python APIs for working with
+    notebooks. There is also a JSON schema for notebook format
+    versions &gt;= 3.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">nbformat</remote-id>
+    <remote-id type="github">jupyter/nbformat</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/nbformat/nbformat-4.0.1.ebuild b/dev-python/nbformat/nbformat-4.0.1.ebuild
new file mode 100644
index 000000000000..b70be1e2272c
--- /dev/null
+++ b/dev-python/nbformat/nbformat-4.0.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Reference implementation of the Jupyter Notebook format"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	nosetests --with-coverage --cover-package=nbformat nbformat || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/nbformat/nbformat-4.1.0.ebuild b/dev-python/nbformat/nbformat-4.1.0.ebuild
new file mode 100644
index 000000000000..3348bf949da1
--- /dev/null
+++ b/dev-python/nbformat/nbformat-4.1.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Reference implementation of the Jupyter Notebook format"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/testpath[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	py.test -v --cov nbformat nbformat || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/nbformat/nbformat-4.2.0.ebuild b/dev-python/nbformat/nbformat-4.2.0.ebuild
new file mode 100644
index 000000000000..1f93d46ff8ac
--- /dev/null
+++ b/dev-python/nbformat/nbformat-4.2.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Reference implementation of the Jupyter Notebook format"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/testpath[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	py.test -v --cov nbformat nbformat || die
+}
diff --git a/dev-python/nbformat/nbformat-4.3.0.ebuild b/dev-python/nbformat/nbformat-4.3.0.ebuild
new file mode 100644
index 000000000000..703139c395c9
--- /dev/null
+++ b/dev-python/nbformat/nbformat-4.3.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Reference implementation of the Jupyter Notebook format"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/testpath[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	py.test -v --cov nbformat nbformat || die
+}
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
new file mode 100644
index 000000000000..361478044b16
--- /dev/null
+++ b/dev-python/nbsphinx/Manifest
@@ -0,0 +1,8 @@
+DIST nbsphinx-0.2.13.tar.gz 96841 SHA256 20f4bca5f45ffe65fff4d616c2caf365375e8f8768a73d63905bd5d0664176bd SHA512 c6489ce696094efbb88e7d6689b8c67fa5fd0c71bfdb8c044f1eab0bf5f722668acd1e839488244578cb50def58c9ba6b88334c5d977cc07692b8747e6f502c5 WHIRLPOOL 65d71566013ba29ac9fa6c8a2863ff21b7a41e6c7bf591aca46e50b89aafbbedaf11468b9fd35236ff0d1f91e4819c1dbe321ca51daf5af2534716d5a195bc38
+DIST nbsphinx-0.2.14.tar.gz 98368 SHA256 d6a35b62be88eadaec8b9e5d61916012b9e26b16f4895ab0bbc5ee1e99fbbee0 SHA512 263aaf8b466d83215251f6115fa6210bca69537d041336ec23d9caaad06653fe848914c2e01981461fbabb8f5e4881ca11a4a01aaccb07909de6b79e695602d6 WHIRLPOOL a23bd92dcecd721db42a1eb22a4e18aee9fb519d6fe27d06e247fc8c5db9bb5bc10ebb2e045e29b1fc6c72ddf38c13432f2c148997b50b7f78c4ed9644d83f9e
+DIST nbsphinx-0.2.8.tar.gz 89524 SHA256 81d3905df0d8627f2e1762036fa761c3ed90ebd61c74ebce8ef07778800ec9a4 SHA512 fe73cdab2b6ac67aff48380137d07b8938bdc764a786c66ee4f0ff658aa3db207630a79900555c70b2232afcf3b5332c78495281518a97ca944550d13cb01b04 WHIRLPOOL e4fcf6e87ab37692ad310a3258ab13a8850ed7f3d1de78b9965552df28274736fc63b34724a1f7be3ecf5c6037c0bb06d8f55e2062ca1cc2f9661ce8e3b1c416
+EBUILD nbsphinx-0.2.13.ebuild 671 SHA256 ba97f529ce3950aa2d42a96bd815733c9a65b2dfca168fe47fd71a173987a6e8 SHA512 787d64ad488039ad3f5f50029a72001a3d8c7d46015e9c81607af25d526489750c5bad504388f153c544c781eac314a0203f1f18340df2a7cc2fb3eb1cac8728 WHIRLPOOL 4b63b0e542bbf27260bde7aeddd14de64369487cfdad9fc712ca89ffb3c7be6f6e1da5d78ee8808c48f99f8c1398b444b89c8191804967c55ac690bf5d42d9d6
+EBUILD nbsphinx-0.2.14.ebuild 664 SHA256 9c394dfd5ead8e3c1c367c78ddad42576c4c11641e8083a7058807e9bb18ddc5 SHA512 10bd5ab6db1854a34e7e19ddb5cf43ade1e661b4cd69478078a266b67d61c9a313ca9949df4ec1689d7eb7fe88d5300e58668d74c001dff025c497689d96c1a2 WHIRLPOOL ee1b4c41cade24769368a5281342ad838311dd11119f151d70d7ee5062ff941528b0125fb2d9b6ba0d590f9933861e9b2661c4a4820619fdedf20134262eeabf
+EBUILD nbsphinx-0.2.8.ebuild 616 SHA256 af6d21eb565895360b11935f2ebcae959e29fe881097e4dbdae37dfbd2d25c1f SHA512 34749f7264dc0c957cc1bbb8eb3a09705955cf7a7d5ade2e900406cf367e29eaeea6ce3e3f056f99a69c59ef6dfe31afd0f37c0db5d2984f08921a908ca00685 WHIRLPOOL 079638b63a4a2c60173436f083aa73ba8831f89cfe67dd0b10e3f161590ce0516092da67898c6fe0a858cdac0131eb959c02aba1ca5de16f2d94f5dbc6bc74b4
+MISC ChangeLog 611 SHA256 42a259199d03c3480ae28e1bf49b91fe900dffc4abdd3d1ada5201b62afb412e SHA512 8a6c6a7684b56312e601fa73b841708f64950bd628e10fbc018dc409f2e646cb19571755e991dc88997310397337c052e063ab4e402347bf2617f3e26212d3d2 WHIRLPOOL 2d63d49741c23d5dcb6dfc03cf4b68cddc980aad9c642656a060aa66c358dfc3edcc65dff87a817e2a151ecf1bd7d05bec963fb841e0467740172545453d61b7
+MISC metadata.xml 809 SHA256 fcb9d686c607c13b5d9e4624c58bdb0ebe6a49caa3b3920268bf85426ac7500f SHA512 03c63397c153886e8ab60767ae510a4d17350a5a2b18c05ddbcc453ef81581a029c3c63fd7c82b109dcbe9a142ec32af1650b240c72d8f95097be326c39a7080 WHIRLPOOL 93f52e03557f8cbaf9d4780a45e7fefc3152a8495a1ede3b4c13b0259d5f9fdea5de9439935db69ca23ca8bef191a9cbc3731a6e22f36bfa726d1deffd4d67b9
diff --git a/dev-python/nbsphinx/metadata.xml b/dev-python/nbsphinx/metadata.xml
new file mode 100644
index 000000000000..a586fea8a7a3
--- /dev/null
+++ b/dev-python/nbsphinx/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    nbsphinx is a Sphinx extension that provides a source parser for
+    *.ipynb files. Custom Sphinx directives are used to show Jupyter
+    Notebook code cells (and of course their results) in both HTML and
+    LaTeX output. Un-evaluated notebooks -- i.e. notebooks without
+    stored output cells -- will be automatically executed during the
+    Sphinx build process.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">nbsphinx</remote-id>
+    <remote-id type="github">spatialaudio/nbsphinx</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/nbsphinx/nbsphinx-0.2.13.ebuild b/dev-python/nbsphinx/nbsphinx-0.2.13.ebuild
new file mode 100644
index 000000000000..5c990dec35b0
--- /dev/null
+++ b/dev-python/nbsphinx/nbsphinx-0.2.13.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Notebook Tools for Sphinx"
+HOMEPAGE="https://github.com/spatialaudio/nbsphinx/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.2[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/nbsphinx/nbsphinx-0.2.14.ebuild b/dev-python/nbsphinx/nbsphinx-0.2.14.ebuild
new file mode 100644
index 000000000000..fae13d2e2b82
--- /dev/null
+++ b/dev-python/nbsphinx/nbsphinx-0.2.14.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Notebook Tools for Sphinx"
+HOMEPAGE="https://github.com/spatialaudio/nbsphinx/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.2[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/nbsphinx/nbsphinx-0.2.8.ebuild b/dev-python/nbsphinx/nbsphinx-0.2.8.ebuild
new file mode 100644
index 000000000000..cfe08807d5da
--- /dev/null
+++ b/dev-python/nbsphinx/nbsphinx-0.2.8.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Notebook Tools for Sphinx"
+HOMEPAGE="https://github.com/spatialaudio/nbsphinx/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/ndg-httpsclient/Manifest b/dev-python/ndg-httpsclient/Manifest
new file mode 100644
index 000000000000..6c9f851aec00
--- /dev/null
+++ b/dev-python/ndg-httpsclient/Manifest
@@ -0,0 +1,8 @@
+DIST ndg_httpsclient-0.4.0.tar.gz 24038 SHA256 e8c155fdebd9c4bcb0810b4ed01ae1987554b1ee034dd7532d7b8fdae38a6274 SHA512 3c0225a20c25cf0f12f03005bb79e738527c0488bb660c1eb3b55c505a0ef503002d37fcffb3d013e5f91101bdd03080a68d5805d6d29b682cc01bdc9f0e4a19 WHIRLPOOL 0c9c0a2cd2e5a0d2b742910129442285e4bdf1278c2590443fa00107066f5561af4249d4f1504720e8a48342ba1d0110fe8480e0adcd41ca999384bf3dc06853
+DIST ndg_httpsclient-0.4.2.tar.gz 25062 SHA256 580987ef194334c50389e0d7de885fccf15605c13c6eecaabd8d6c43768eb8ac SHA512 c7d6f442242ce01f69d2386b8ed41e4e5f72a2523ecbe38785c4333405f1b000e298133ccc4169d9685a3dcdcf0b20567c8e4b2dfd36f42721d36c73ee27d90a WHIRLPOOL 97cc65e017fb5b96d2d4d858c30151a3956ce6b713e4c38cf9bc62c57be164c30a87672e431a2aa70222fae6fdf54a3477498360bb700fc98bbc50ece43aab84
+EBUILD ndg-httpsclient-0.4.0.ebuild 823 SHA256 85700c1144f121d9fe1ab2115f2d1f62940675111e4c64c5634f8e6f3fbd43e5 SHA512 cbeea7a47e532cc6313b7e1f61de0decfba3d32eeb102445b17090b65b1d70532ec12217734fcc4d548025017f281eceaf8576f2e2dd29d694f7f17583ca1dcb WHIRLPOOL 4a35ec4f513c0eb6953c11f4d58675e840fc0e7d0c842b77769449b464da102c9103ab616b942d990019c7a8ec45b4769eb919c2acdffe0e8fb16d7d748f3cfd
+EBUILD ndg-httpsclient-0.4.2-r1.ebuild 1652 SHA256 6b6ecbe36deadc324060f5b4e376748ea050cb303c9e1949333a46be684f0ead SHA512 583d41b0868e6e25d0d7424ab6cfed2d6b6b51851d8a84e64c6871b0bbb33151aac83feedb6033cc78696c419cb516d6c4cb51040ec59ec6c045f39c3aec311e WHIRLPOOL 3d77a982de302b87e5b3ba0effbdca680c6eeef986c054ea13db5d0a039d80a182913c706289bb71ed177b2e0d82a4c7c56b50913ca6fcade0512bbc97920981
+EBUILD ndg-httpsclient-0.4.2.ebuild 848 SHA256 e2a0976b2f7560dadf396e5d67982264912f6af7d44375f407405b32e7f9dc0c SHA512 a1cdf1a1498007e50d40d17e2c2c6b4ba521250b89016c9dd6cf63fb1c76fe72480b952e228d8156a155f4dbef4ea7fa57c309f9404e9704980eb1b6cf08e993 WHIRLPOOL 4cf79def15bd5a891179efe839c20947fbc2204c5acc4aefaf21cff3002cb3b4e0b0883f5833d41204c8a11521dd5aaec94f5eab8f35b016d52969e2932db9c9
+MISC ChangeLog 6033 SHA256 a05893286648d0ea33b54157461f2453c2c966b76324c3285a1c0d2e445a0889 SHA512 9b09005a911c6ba366611960e8e3e51abd07e83410b07e07813dde1b748daf85c0e089aa875bbd437706bd8cb2c66018348b3a32ef9aee5b9da238c9ad911ec9 WHIRLPOOL 58bbe7d6a42c45292dd91c263b48f6b9a39b5dde86b55e8ff5e607b94304196a231f84150fe76dabec6cd39476a97eb072e1bc23431e709ceb9c36dfe7d0be16
+MISC ChangeLog-2015 2950 SHA256 255452dcd49627709fb368ca907879d2f9095f7bbddb9c47766886c432072274 SHA512 46670fbdcdc3101a2973d909407ba55155a0f3e46e1792be120757d030976f60013dbaf18da0c244e74fd9a51f9c41b7cf7d641a5d4a42c57353c300c82cc596 WHIRLPOOL 5b7b0eca220b5d1d4b4df4b4f02d0f9acf4c2aa95a4b94b5356ec1a74b16041d660836744049067f634a8a3aa56b8a5e9d369fc9bb2b2c70bfb5d0c43f586ed2
+MISC metadata.xml 393 SHA256 e3d2e9f5ac97a63f3edee91697f1dc6a98c36c8237d79958a9d88093e520024b SHA512 1092b2a6c3d9ed56cc6429ce9b1ffeb14f18934f2dc8dc9e34b28eb9a048304f31634fe2d7265a599afd338033605c831290b903e933e1a1634ed8fdbb1719ae WHIRLPOOL 5547a76e83811b2a1212cfe603bae7b7b26656360d340132d546e2eea0bcdd3f7a39253cca61f65eddb2b7b8d200892e80896177019886477838ea2edb8b3c1c
diff --git a/dev-python/ndg-httpsclient/metadata.xml b/dev-python/ndg-httpsclient/metadata.xml
new file mode 100644
index 000000000000..9946c2697cca
--- /dev/null
+++ b/dev-python/ndg-httpsclient/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">ndg-httpsclient</remote-id>
+    <remote-id type="github">cedadev/ndg_httpsclient</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
new file mode 100644
index 000000000000..64649d378fad
--- /dev/null
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
@@ -0,0 +1,27 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
+HOMEPAGE="
+	https://github.com/cedadev/ndg_httpsclient/
+	https://pypi.python.org/pypi/ndg-httpsclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${P/-/_}"
+
+# doc build by Makefile in folder documentation is broken
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..d4f272ba1c67
--- /dev/null
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
+HOMEPAGE="
+	https://github.com/cedadev/ndg_httpsclient/
+	https://pypi.python.org/pypi/ndg-httpsclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]"
+# we need to block the previous versions since incorrect namespace
+# install breaks tests
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		!!<dev-python/ndg-httpsclient-0.4.2-r1
+		dev-libs/openssl:0
+	)"
+
+S="${WORKDIR}/${P/-/_}"
+
+# doc build by Makefile in folder documentation is broken
+
+src_test() {
+	# we need to start a fake https server for tests to connect to
+	( cd ndg/httpsclient/test && sh ./scripts/openssl_https_server.sh ) &
+	local server_pid=${!}
+
+	distutils-r1_src_test
+
+	kill "${server_pid}"
+	wait
+}
+
+python_test() {
+	"${PYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# install the namespace (this is the only package in ::gentoo
+	# using it; we'll split it if we add more)
+	python_moduleinto ndg
+	python_domodule ndg/__init__.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2.ebuild
new file mode 100644
index 000000000000..63a3b925a3f9
--- /dev/null
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
+HOMEPAGE="
+	https://github.com/cedadev/ndg_httpsclient/
+	https://pypi.python.org/pypi/ndg-httpsclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${P/-/_}"
+
+# doc build by Makefile in folder documentation is broken
diff --git a/dev-python/neovim-python-client/Manifest b/dev-python/neovim-python-client/Manifest
new file mode 100644
index 000000000000..8497119cf25d
--- /dev/null
+++ b/dev-python/neovim-python-client/Manifest
@@ -0,0 +1,7 @@
+DIST neovim-python-client-0.1.13.tar.gz 41413 SHA256 b2f78226d0b3c57d1e53e26828f5fa5665c0655725fbadd43aea87f5ce93ef3b SHA512 ecef42601632551c98f8de019bfdf4dbff3ce1f0e1b6943b78a506b710e5810f6a7e611adc09435992b97288ff365a416870a74202a5c68236b5daeb51d15c8b WHIRLPOOL a7a2193d193797fd406f7a822528773f101c1e5c015c1d7208de042373b382fe09224afbf000158797bc5de96384625d8e1fcdfbc3e7101667ff55382c7a8cca
+DIST neovim-python-client-0.1.9.tar.gz 40599 SHA256 9e6250cad242fb79c07346cd292b055f4f334635a42bff3437131205bb09e0a8 SHA512 043429407d140b37004d5344f9244c8cb5a37e2b5d450454e6535bece7fb05f037e5eff2a63431fad55ab2470372c4a17e0a608a94af65a2f400f2158b736ce4 WHIRLPOOL eb8b54bdc2c5f455862026a39f76bb32f59b3225c17ff2abf2751670f22ed81b053417aef0e95d0fad6fd31df58867024967c44ba48b83b63c70e1c1977de23b
+EBUILD neovim-python-client-0.1.13.ebuild 826 SHA256 0397de358516b3fde42803b85e0cccc3aaf5785873eb3cf5570e23e50ba814f8 SHA512 2f26bd876a38955b833aca3875ce885755dc25b3a235aab9842a1dc300d6022886cba985362fcf5f0245d6124b34dadd5a1add3baaeaece335849df8e23fe3d5 WHIRLPOOL 8c8dcee8bfb5d21d5c04c89325f68eeab4353c8722cdf402edec26721e3628669aa0b393abd092314e87fd6fe5b4962813782d812f8100293e78802b06c7a340
+EBUILD neovim-python-client-0.1.9.ebuild 674 SHA256 c347406bef819c42ca92b7982433d759794bbddad0cf1b49ea123ce8281a3a2f SHA512 77c3f9e42e9f45ebdb3d9341e3305bd86366ccdd7451c416095920d973743e68b3d0ec8d5ea80c2553e2685ce4e622eca637f841373c47ccab5a74c8ad649b5e WHIRLPOOL 36b6c8aad1d44f615dee490cb53d2da29c6002d03b39117db77cdb0ad2aa792bf8603899c9922722cbb2a356a85f767c82f8c57a6c4cd19e3557deb9643fa036
+MISC ChangeLog 4769 SHA256 eaba486d5b4993665862a4dde446e8c3d3742a0fe43ffeb4b2cdc3fadfd6d01c SHA512 ca0fc3014f8f78c7ac422887e36afa5957271691d33686e2a7e057ca6502ed9c94cec6db60a6de0ab24dc30dc2761d7e151c88b7426a90838c988d23b0fb9480 WHIRLPOOL 71a9ed6c66c4a7e2aac29405e956ce44193d85657299e6e12bafcbbb0ec81bb5759ab2cd92c17332646109b5c6c7f30b2bd5a76e92b5368fae042bb1a44cd5e1
+MISC ChangeLog-2015 1514 SHA256 51b298d17ea2cc2a0d7fdb3c3cf08670f728d37ab91a738ea39603d7901096f8 SHA512 9eea4ce49b66f4190fbdaca530b70b323cec0d278eafcd45edc6a105a3fd722ec78df9c5ae08c61f87c1b4ac6fd632c5d9b602dd2527b881df2a4ce44a1d88c8 WHIRLPOOL 09263309821fecfa56da1f4ac3d1c88ec575e960ac385e3fda046619d4a17b9b96ac37644aa0e6f1a912990e3e8aceb38a0cf115d75fea5a73adf0b0b97ebc72
+MISC metadata.xml 451 SHA256 7b75fef42abf774a252770af767612315c01d2778d101cdca3e586a5f3fa326b SHA512 cf9f4169ee1ea2adc6f88b17461202cfe120c20a5367ccc0da4099b8792841d13057d8c133c85179b1c5b00ad4bc9954a0e9202b3810a6342f8e052ffa3dc2f1 WHIRLPOOL d443788edb525592705d5eb3446dd83014f248341a995361bc08ffcbb26648c71eb3af28359c617dcb90d52f5a77e63a066d5efde00a22364f2fb95db2185839
diff --git a/dev-python/neovim-python-client/metadata.xml b/dev-python/neovim-python-client/metadata.xml
new file mode 100644
index 000000000000..7e584044cde7
--- /dev/null
+++ b/dev-python/neovim-python-client/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">neovim/python-client</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
new file mode 100644
index 000000000000..72d1f13ef3f1
--- /dev/null
+++ b/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Neovim"
+HOMEPAGE="https://github.com/neovim/python-client"
+SRC_URI="https://github.com/neovim/python-client/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+COMMON_DEPEND="
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	>=app-editors/neovim-0.1.6
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/python-client-${PV}"
+
+python_test() {
+	nosetests -d -v || die
+}
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.1.9.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.1.9.ebuild
new file mode 100644
index 000000000000..5a383838e3fe
--- /dev/null
+++ b/dev-python/neovim-python-client/neovim-python-client-0.1.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit distutils-r1
+
+DESCRIPTION="Python client for Neovim"
+HOMEPAGE="https://github.com/neovim/python-client"
+SRC_URI="https://github.com/neovim/python-client/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3})
+"
+
+RDEPEND="
+	${DEPEND}
+	>=app-editors/neovim-0.1.3
+"
+
+S="${WORKDIR}/python-client-${PV}"
diff --git a/dev-python/netaddr/Manifest b/dev-python/netaddr/Manifest
new file mode 100644
index 000000000000..c62f71c3bd44
--- /dev/null
+++ b/dev-python/netaddr/Manifest
@@ -0,0 +1,17 @@
+DIST netaddr-0.7.12.tar.gz 1504096 SHA256 88bf0bff238df672b1a521cdc291db025f7462223b065405b62d58a22c0d0abe SHA512 d7783ecc697045d381d2d028d02c1773effd1331f15f2fb6423a06ed7915700e42862130d2ceb16c73ed0443a5055d101ce7ea3d10474f9af40cde83d2251e55 WHIRLPOOL 580aa6443fd384d8ed180e39b6c42e36d55cf2c644a470bd0aa657f6d1282d5082e718e9225ef2c5b352a48bb0599ee11642d7b72a5f50c7e621f8700f1da2bb
+DIST netaddr-0.7.13.tar.gz 1548094 SHA256 ca42c260b49e5fd74ba9104efa6a4fca6b55316ca42714d20d2b9b8e751e0412 SHA512 3bef68f9bf33d3c8946b2dd0a0ed1c182bf4e604501de1f62ec0e1a31c1c4a6806b78be847b49fa93ddbf50e2e58012f3ef68e7dad08297d7647d878ba17144c WHIRLPOOL a7a031607cdcaf0d0ed2eb7faa6c9db32f02663d48b827c5df558db88a0515a1778da67cdaa646bb55b424b86baeeb857d76d51d710b4555225d605eb802dca7
+DIST netaddr-0.7.14.tar.gz 1560641 SHA256 02abbb54c9edd6a3046385d2634f51c1dbddbbc9b5816599ecd052b1d9ff445f SHA512 8492932aa5218d84e211df9ac405b9f2eb2f66d9a0cfe7b427634461bd3c71a3c94662c8e13e0d484481cb621e60dfff22aa8065b00a03094543c33b50d3502f WHIRLPOOL 6198af280532f782a3a539749c41b44f139ea600edbfcd7aac66cd167546f27dee54afa63c9e48841180fdceb79bff086ab1fbe8b10c9b197e4c975754da0858
+DIST netaddr-0.7.15.tar.gz 1525041 SHA256 d5b5bb3f4e9a94f93d232bb876e567517d8fb59e5bebb5339483b44df5529d11 SHA512 b6279638598b756366fd236003dbd5315b4535d2d13153857d1a2b160d9521eb94e2a46e89eb317b72081ae6b0e8916da7932fa766541616e49b2a24b7494cf3 WHIRLPOOL b515b2fc7dc7970f9751ec28ca2a7b0937a7ad7a1f9a36b9e995dea430b004c2294263654d9c321fe29e7eff7af1e78281bf89432b408aa6324b0833b80e1847
+DIST netaddr-0.7.17.tar.gz 1714398 SHA256 386b161ba1efb7e9b7def525859633627ff2e8719bb444c4e78e10529fec4e50 SHA512 915109fee5025b37bbd10ba68b2c26d743e96f5579cffd5f3871ffb97e8a37b76e73ef903f0db1b4322c33768f17ba5555af66cb7e48dfac4f536c3cf0315db0 WHIRLPOOL a6c9889a12be25e7a22162564c895c89bd1039216bcc16323cfa1c20e99d7af464eb51d6a246315728a328aaadc8dca9fafd4ad4a31d1a8ba946aba0f506d4d1
+DIST netaddr-0.7.18.tar.gz 1715389 SHA256 a1f5c9fcf75ac2579b9995c843dade33009543c04f218ff7c007b3c81695bd19 SHA512 f2a05d177e8e45cc42c494340a4dc65afdbc75bce16acc7d2e9cda06f4c2404df086780d10c764b6845cef32cf18cf00069f8b11c2dd0cb7fbcdde7d75b81253 WHIRLPOOL 2e8b370ae79a70a84e309f2eeecf413a39aefb2bc52d5eb1952e8240d6bf9b356b417390e59e388c717b36f746088972288bd8d3fb641758985c214b4d76cba6
+DIST netaddr-0.7.19.tar.gz 1622835 SHA256 38aeec7cdd035081d3a4c306394b19d677623bf76fa0913f6695127c7753aefd SHA512 8440dee19d51828cd0dee403ec8c2fbc70e42d8c7c922d1a6a2a752100f9a313c521fa5e0789e024af0998f713599d50cf986e96867d3cc62a4143875e52d6bf WHIRLPOOL cbbd157cc7c2c81ce0f6b55c647cc7b533a07a2ae883864695a6e0bb7c25fa9fe3f4106824ca04729af5d1face19ff830f0bf8ff7dfd01e8b18634798ebd76ec
+EBUILD netaddr-0.7.12.ebuild 629 SHA256 1d259b70f467ca857541fdf42b55fc15c6c3d59b10c35374813ee00c3f4e5862 SHA512 9ccdd4ae182a82871c1f28975df867bb5979412725a6b797a71fffc5f19552c4050ffaac87bde0bf578511f22ff3f9148fdcd6c93e0a3f85ba1d67429d0fcb2a WHIRLPOOL b90cd56dca6d247ee1381557d7fc208085be381929baa050c116a5618669a63541cf0d91c3ef2de30fdc93e6f1437d7720957c5457c84d2996be2f6a2a46dc4d
+EBUILD netaddr-0.7.13.ebuild 636 SHA256 2dff7994313422fadae2fa09b030efebf34f6cfd4e7252b3fe6a88163397a8a7 SHA512 01e0fe9fd4b9b1d325f2d6634fcaf143e3031a30c9d6456da5b62b1614d7813f7011d0680d4f9af5977c4db471c6baa1ab117b0d562fe04fb663a4a1118f850b WHIRLPOOL 0a0bea2aead088979b21f2af3905b0373bf67a7425373e36aa9965b194b6797a6bfe75b436efa0bf69f3276d74ef30e3aa912234c423c58310c26518e762cadf
+EBUILD netaddr-0.7.14.ebuild 636 SHA256 2dff7994313422fadae2fa09b030efebf34f6cfd4e7252b3fe6a88163397a8a7 SHA512 01e0fe9fd4b9b1d325f2d6634fcaf143e3031a30c9d6456da5b62b1614d7813f7011d0680d4f9af5977c4db471c6baa1ab117b0d562fe04fb663a4a1118f850b WHIRLPOOL 0a0bea2aead088979b21f2af3905b0373bf67a7425373e36aa9965b194b6797a6bfe75b436efa0bf69f3276d74ef30e3aa912234c423c58310c26518e762cadf
+EBUILD netaddr-0.7.15.ebuild 751 SHA256 c282e143d93bf5847a4ad8508e5f34525f0694fb2f8f0645e33343b78fa63793 SHA512 e5795ae301aee06627013cb5f5691a987a1ad64f030639eadd096f1c69807ec60250a9d3870fddaf3f0a8b6554fdfe067c34e8dd4db97736c0994775f7eede4f WHIRLPOOL 3a01c868d26ac472fe61d99941e9dff1ba78be881730aada8c57b966ebdf46af1be5db13a67e6770eb61df931462dc46d8b8796d202c682fc1d464ef9b5c626e
+EBUILD netaddr-0.7.17.ebuild 677 SHA256 ee54874b38db29817b9d95ecb2d86ee9e87d411c740f13b5c09616e6acfaa387 SHA512 3f9c08a20ad81c63f8345a392091a5cb66069712db0f9d9c1d0b8613eec991ab63381838ea5931b03751188ac2261f8a8b25f03cb13499d65a89758799415a20 WHIRLPOOL 3fbf2cf1d90d3cdc82e25d7c93ad101449b0e288584abda535610ccab440c0b2df803fc188f2f312829d87ea1479e3cb6322900304a8d9af4416750f3652b0ce
+EBUILD netaddr-0.7.18.ebuild 693 SHA256 6c25e182025b577dbf53d626a586e26ae1007418538a2b297671fa590982dae0 SHA512 72103f5d29193fd347460306966615964387911ded934ea5336c78a14c96cd8ed891ba21f18fcca472e0be00d0a141a8ff95d13924fc6c7421910cfef18339f8 WHIRLPOOL 99df996e205caafff3bd9dbd69a14e868195f38957f63147d5202868c0491bc998799a2548348a339b528031f949d383104877796f7e25b2c596fc544f78d9a9
+EBUILD netaddr-0.7.19.ebuild 732 SHA256 936cd20e600883a78c3ce8c67b730236845821a95bd8acc7ccf1558c4ee41a05 SHA512 6fbc1cbf5e4fb735205b8c9f2747eb3e23b749567cfb9e1eaf53a03ea411b738f2f75a1877ee16c7a488449cd22263a856f7fc0087451b05b54e44af4d0ca1d7 WHIRLPOOL 28984961bc0579505c761949242ff8a81df0e050c002390c5f89b30ec877fbbc3dc491c410613c368a0a71a95383817ccd03c14f3b6493198962e8b546c63920
+MISC ChangeLog 4283 SHA256 8a8690b57df85fe18293cdfcfb5d56a002e3226e76fcf3c59a6bce3020985462 SHA512 c45c7a1bbdeba395a07b1be475dec492ee11757eac8724361c72a8284e6396e956ec283aa266b4c96a2add6bb786a498878beb33bcd9bbfb1602e32611c021f7 WHIRLPOOL 99e07faf174b21a007655b83492ad5d67c8aa09f8a05738cdf51c077a133710341907e27e41ceddd0596b48496112b9d8e50640830b4454ad5ebf9e2582f884e
+MISC ChangeLog-2015 4889 SHA256 9edc8241cd5bb9332c4d3ebc2481964c04b3153bebc7170b675e5bfc4ebe918f SHA512 681032bc7a810d1a30a3fb59a92ac5e4f7566e81747f88fa9a745b18cc33976f83587f1fd5fe147c9f2ab4fa3f99b8813572c2e7751536dcc26fa1028a55a713 WHIRLPOOL df11655146da5bbc71eaf0e92b9a4c914146d564054f249094c04b855e3c253a58350305cc5b1068a2311b88cb53839985c08375d04d9e72bea971ad86bc20d3
+MISC metadata.xml 486 SHA256 65d80713b73719f81b21ef335cd9a9a0875bc0e5af77b06c5c788330b51dbf41 SHA512 91e00ad588636fbfc6edc9212349e9c04227cd388cbffff622baf699741e5875019eb80a811f91c14a76f9c9106bd35a9a45ba9caedc4c145c04b9913afd1a99 WHIRLPOOL 2f1a56455a372bb76f6e24275bd69a47689dc1c5cc8fe8c4f72edcbbff9d4a5b39266173c20e73a2abf8902bbd0db1dffedf6f1b0a08f896391c79b627428d18
diff --git a/dev-python/netaddr/metadata.xml b/dev-python/netaddr/metadata.xml
new file mode 100644
index 000000000000..48f423e837e6
--- /dev/null
+++ b/dev-python/netaddr/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>maksbotan@gentoo.org</email>
+    <name>Maxim Koltsov</name>
+  </maintainer>
+  <use>
+    <flag name="cli">Enable netaddr shell with <pkg>dev-python/ipython</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">netaddr</remote-id>
+    <remote-id type="github">drkjam/netaddr</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/netaddr/netaddr-0.7.12.ebuild b/dev-python/netaddr/netaddr-0.7.12.ebuild
new file mode 100644
index 000000000000..ff7f10be8cbf
--- /dev/null
+++ b/dev-python/netaddr/netaddr-0.7.12.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Network address representation and manipulation library"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.python.org/pypi/netaddr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="cli"
+
+DEPEND=""
+RDEPEND="cli? ( >=dev-python/ipython-0.13.1-r1[${PYTHON_USEDEP}] )"
+
+python_test() {
+	"${PYTHON}" netaddr/tests/__init__.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/netaddr/netaddr-0.7.13.ebuild b/dev-python/netaddr/netaddr-0.7.13.ebuild
new file mode 100644
index 000000000000..743661b49cdc
--- /dev/null
+++ b/dev-python/netaddr/netaddr-0.7.13.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Network address representation and manipulation library"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.python.org/pypi/netaddr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cli"
+
+DEPEND=""
+RDEPEND="cli? ( >=dev-python/ipython-0.13.1-r1[${PYTHON_USEDEP}] )"
+
+python_test() {
+	"${PYTHON}" netaddr/tests/__init__.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/netaddr/netaddr-0.7.14.ebuild b/dev-python/netaddr/netaddr-0.7.14.ebuild
new file mode 100644
index 000000000000..743661b49cdc
--- /dev/null
+++ b/dev-python/netaddr/netaddr-0.7.14.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Network address representation and manipulation library"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.python.org/pypi/netaddr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cli"
+
+DEPEND=""
+RDEPEND="cli? ( >=dev-python/ipython-0.13.1-r1[${PYTHON_USEDEP}] )"
+
+python_test() {
+	"${PYTHON}" netaddr/tests/__init__.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/netaddr/netaddr-0.7.15.ebuild b/dev-python/netaddr/netaddr-0.7.15.ebuild
new file mode 100644
index 000000000000..41c876d8a2bd
--- /dev/null
+++ b/dev-python/netaddr/netaddr-0.7.15.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Network address representation and manipulation library"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.python.org/pypi/netaddr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cli test"
+
+RDEPEND="cli? ( >=dev-python/ipython-0.13.1-r1[${PYTHON_USEDEP}] )"
+DEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+# test subdir not included in the tarball
+# https://github.com/drkjam/netaddr/issues/102
+RESTRICT="test"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/netaddr/netaddr-0.7.17.ebuild b/dev-python/netaddr/netaddr-0.7.17.ebuild
new file mode 100644
index 000000000000..3ecb9948967f
--- /dev/null
+++ b/dev-python/netaddr/netaddr-0.7.17.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Network address representation and manipulation library"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.python.org/pypi/netaddr https://netaddr.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cli test"
+
+RDEPEND="cli? ( >=dev-python/ipython-0.13.1-r1[${PYTHON_USEDEP}] )"
+DEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/netaddr/netaddr-0.7.18.ebuild b/dev-python/netaddr/netaddr-0.7.18.ebuild
new file mode 100644
index 000000000000..26d065c0e62e
--- /dev/null
+++ b/dev-python/netaddr/netaddr-0.7.18.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Network address representation and manipulation library"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.python.org/pypi/netaddr https://netaddr.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="cli test"
+
+RDEPEND="cli? ( >=dev-python/ipython-0.13.1-r1[${PYTHON_USEDEP}] )"
+DEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/netaddr/netaddr-0.7.19.ebuild b/dev-python/netaddr/netaddr-0.7.19.ebuild
new file mode 100644
index 000000000000..ef37de34d901
--- /dev/null
+++ b/dev-python/netaddr/netaddr-0.7.19.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Network address representation and manipulation library"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.python.org/pypi/netaddr https://netaddr.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="cli test"
+
+RDEPEND="cli? ( >=dev-python/ipython-0.13.1-r1[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/netcdf4-python/Manifest b/dev-python/netcdf4-python/Manifest
new file mode 100644
index 000000000000..bfe181de35bd
--- /dev/null
+++ b/dev-python/netcdf4-python/Manifest
@@ -0,0 +1,5 @@
+DIST netCDF4-1.2.2.tar.gz 679107 SHA256 5e68d0a723ed327e53e90ac73d3dfa25e8da10db9ffba5f2aefd61356722ae9d SHA512 e09465d125077e71b8aad4332be844099c7fa29d0ea8f1dd0887f7a5e849ab778361026323466b1d4897bc3d8f8be1818cfa5f426773c765ee9c5f3728ff3da3 WHIRLPOOL 8fc551fbe6e1628304dd5067a22bbaffbb336c68f8315d5e929927f6ad52b0974b7a412d019b87a65e621e49d720ff1570514af66345e6c46c501ca9d862761e
+EBUILD netcdf4-python-1.2.2.ebuild 664 SHA256 238170e4155c092525e4dc44eba71a3ea52ad88adc61f112a0ceaa2506b7d87c SHA512 532164be91370b53c27336ebf1ddf8fcd14ba0b30a619b1472eaf5fec2a901128ac2851356ef5f7289b3baa19ec7ab7d4871a305e2c88ef65d8c7728cb451101 WHIRLPOOL 2dfc5adef69021a9d1524b2bb2f6c8c5f9ded3c8ce6988802d3a93f4e3d828fdcbf4f650c03dbdd6bd0ed475a080b70432f2479a58971e54b08d0a1aaf80b209
+MISC ChangeLog 3101 SHA256 d4f795f788381c271ef93f6715596f18199436ef565c9c56ec1f11eb518afbc2 SHA512 798179d9d485dd9481e9f0cdc8e45eae758844d8fa9e2b63d131aa5c4b611862bf02ab233797fbbd146b0897065590a34e4f6e8adee466730d4220af572d8e4c WHIRLPOOL f0a8978c2fcc7f847b099aeac0f814937b8a437aea9003258cac6867512ae999848a4f0de7e9c60e0ed372a67ca2abf49a17b3f97dfd75db591a279bdbe22936
+MISC ChangeLog-2015 1007 SHA256 dad37cdf281c66299ca12216ee42aeeb8d9d3fb459c880e53517a535dad305da SHA512 98ec7442b1ee59a67be754bafe2f70732ddf5dcd31527c31c2f52cb8f2ff3866d60d7046415924fb7ab0999011b802cde4f888749dd7a517a1cf627f64593751 WHIRLPOOL 43880abc2247b699b0719b2133195b142a4f6636b17ec002705b3ae4a1fe8730c5a6ac33ed725ca001a5472c47da73ad0eb69090b95d3c2e0e153dff2df01a02
+MISC metadata.xml 702 SHA256 e638c0d1c3bf1e0965a738e0b7d4900f416c491fc6ef842cda90a49d677e11af SHA512 ecb1a82976d540d6a8472901456bcc634077214703ca30e52cd9cf6fe47d7ac69abbf754dcaef977ece693e5c7d8f97dd250bbe1e1dccc4c03964eba576e29d5 WHIRLPOOL 8fbe5ac8c4f35157869d5a60b96bfad6f7d73e3a740cb87694b092dd636c0b0456ac22935e96eb2ee1188e29e74bc3e609df72eefcff8fe050474fbbc4fb4768
diff --git a/dev-python/netcdf4-python/metadata.xml b/dev-python/netcdf4-python/metadata.xml
new file mode 100644
index 000000000000..b230a3c11bf8
--- /dev/null
+++ b/dev-python/netcdf4-python/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    netcdf4-python is a Python interface to the netCDF C library.
+    netCDF version 4 can read and write files in both the new netCDF 4
+    and the old netCDF 3 format, and can create files that are readable
+    by HDF5 clients. The API modelled after Scientific.IO.NetCDF, and 
+    should be familiar to users of that module.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">netCDF4</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/netcdf4-python/netcdf4-python-1.2.2.ebuild b/dev-python/netcdf4-python/netcdf4-python-1.2.2.ebuild
new file mode 100644
index 000000000000..b952760211b5
--- /dev/null
+++ b/dev-python/netcdf4-python/netcdf4-python-1.2.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+MY_PN="netCDF4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python/numpy interface to the netCDF C library"
+HOMEPAGE="http://unidata.github.io/netcdf4-python"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/numpy
+	sci-libs/hdf5
+	sci-libs/netcdf:=[hdf,hdf5]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+python_test() {
+	cd test || die
+	${PYTHON} run_all.py || die
+}
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
new file mode 100644
index 000000000000..94daa39023ec
--- /dev/null
+++ b/dev-python/netifaces/Manifest
@@ -0,0 +1,10 @@
+AUX netifaces-0.10.4-remove-osx-fix.patch 353 SHA256 c048877682f93ef3302d381d70af0720efbe689c7b1b8ccdcaa6f76ddd3f7159 SHA512 0c47d026e1be42fdae860aade01762d0c7e27083fbe17dbed76526e72852f0444e56617431d081de9e4e86c7ce65293d83e704e56a3219face4d07106730255c WHIRLPOOL a9a047db83d959a2f3b0061dfd7d50b2df26c77b25f3a7dd261cd9f53f7f395e4ec545dc3c64b6a784182afc7befd3b61f4b41ed5344387ee89d26203d443fb7
+DIST netifaces-0.10.4.tar.gz 22969 SHA256 9656a169cb83da34d732b0eb72b39373d48774aee009a3d1272b7ea2ce109cde SHA512 1b9b92b69e01e4dd9f9304d3812d78d58ec195a657cb47b2e629ccb1311de4a8cd9716825d7b94d4791f7c479c289638780f6f9afa8a6465fb555130da622b24 WHIRLPOOL 44cb33b6ca0c6cda059bf7e88ca5b4904d1e2d5bb7201f23d8e5b9c3bd337acc99dc47dec76016b6ceee7c5d8d72af03af96afb709ff9368a8dfff8683d4b7e2
+DIST netifaces-0.10.5.tar.gz 24879 SHA256 59d8ad52dd3116fcb6635e175751b250dc783fb011adba539558bd764e5d628b SHA512 736bb985b444e78676dc10533a7597e750cadf41033196c4be49c4f33e91d46eba33a1f485e07e9f70aec2170c958564a6f54bbaa1ab193bfaca04b1fb07b3a1 WHIRLPOOL 7a0d63508dc2d2f80a4fbe4a92468696cb3335c9a47410a617de12f7c1f167a4bfc9d3a122dc666e5956b9b1422ed11f9e1839e929c85f0b0cc289eeccba4c35
+DIST netifaces-0.10.6.tar.gz 25166 SHA256 0c4da523f36d36f1ef92ee183f2512f3ceb9a9d2a45f7d19cda5a42c6689ebe0 SHA512 2c892062286007a8330c2cddc148ea21d1fd24aec32b5f25b8fe905933c651f8c532596f523f0bb7edb3a143e9a491ec49d60f75efad4407273ac2647b579b1e WHIRLPOOL 08447ff343e63417b34b2bf7a94e359865739484e46b3d02d0fc9f7d35b94d990fa5e7ee42a217b6856a2eb1adf13e82d8c0312ffbc06d47fa9d5bdea84fe244
+EBUILD netifaces-0.10.4.ebuild 633 SHA256 ad37451b50b01eb4530d68a5bfdad961682d263264532686e4756ed31a859971 SHA512 b4d95ae03e2f8f0bf377babff1789609ef99c5b8dbad5f92bbf8061f4557387deb98b2a3ad21b643df6632901b1ebeeb86eeee989d5009f651f3e5219bf34ed7 WHIRLPOOL c7a66c50b0cb9fcf3caa5400d641f9f66e045fee13feeab8513e9cb963104b8840e6be68f89084113be9a2c577d7a470f9c8683649ca86e65d9836afa27b968d
+EBUILD netifaces-0.10.5.ebuild 641 SHA256 c6f337799d16b31a94dd327dc574d7de78581cd1931f7270f816db9c3cd86b64 SHA512 de12e7992663862eb8d5289e2ecef270e12004bf5ef64f110c5852bee3b48a7dfb75a18e49ddd4d60ef90912fd5300ba695ee46e2be74040ae9a2d263af5679c WHIRLPOOL dbabe1b31c922592e3dda1c630eb079956e332d5efe22bd97ecd6db048386190ec52a247d7f4beb7b41360b15b294b2f44cef6870f640abfaeae4ab2c9ad4148
+EBUILD netifaces-0.10.6.ebuild 641 SHA256 b4b1f8851f9a4116b242a66a7389af065eed6c7948f6f9572ac34fbba1bc2489 SHA512 7d64b1307a613293a962a7438b456fbd3bbfd2fd4e338cc7e21ac220426c189bde64710b3fef7d8a8a8d08009a1e2ac169aef2792ddbdfe04bf2ce131af6d6a8 WHIRLPOOL 871dfeb12249dbf95900261511aae7137aed3a108787ff5bc611322cf0ed1651ee2fd87d9d4153de19087733cc832acfd6e2ca5da93ce8e0974f73d9aca5a3c1
+MISC ChangeLog 3553 SHA256 17f8b4829c0c2fec08ea6bae54f18d3918d4643fa7461d4f6ca9093a7a494ee6 SHA512 d878be843ca6112264d88782f47bbfdc85b2fdd2c4478611f5a1d172beb0800a16fb48f0e1f06ff8f99ffb99ed6b83f0d3e42028e371018be74a78c903df2629 WHIRLPOOL 008de2e61ae39d8c9dae160e8845bd36d88cccde30013f405431504ad5936f1c802f907dbb9081f1203f835c866d511bb4569a5c37f733e918f065dd29478b2b
+MISC ChangeLog-2015 3102 SHA256 ad72eda66d390d00498fe9c22c905cd8c9f4f4004b04ab3925672cf073a4eb72 SHA512 ba41aeb69b0bcde6ec6106701dd9f670468b661104359efa510674deeef9cdfd223ced31314d9cac282e796cf51cad51c0189bc9b2b0657e2bfabbe41af5cc91 WHIRLPOOL c39c30019431f9ad37a2aa0a2b1126452ca0af7c734d4c9e7709ba5e78a7f06248f20c81d45f1557d6c97ba449dac92dcec357c2bc87af83170783eec03349e2
+MISC metadata.xml 495 SHA256 3596207ba3007d3bbb89865275c839d75a3ebb41ea0c2166e820e9b6204ac812 SHA512 6a1388bdf9efd868c781dd76b855b14a88b010c4d2d95f98e2ea6d88aff34259f314e23a2130de4675e470d3b5bebf46e4f68bdc2152a8e62fa17e48cad95225 WHIRLPOOL 44a040a2ff17384f5ee8d55e3a6a7ce00caf5d7f3761efcb5da4e98242e47dbd26d440a80371a4fc30d85e83c4aa9915468d26f9537d0403669b77d09cd2cee4
diff --git a/dev-python/netifaces/files/netifaces-0.10.4-remove-osx-fix.patch b/dev-python/netifaces/files/netifaces-0.10.4-remove-osx-fix.patch
new file mode 100644
index 000000000000..7f87a02e365a
--- /dev/null
+++ b/dev-python/netifaces/files/netifaces-0.10.4-remove-osx-fix.patch
@@ -0,0 +1,15 @@
+--- netifaces-0.10.4/setup.py
++++ netifaces-0.10.4/setup.py
+@@ -18,12 +18,6 @@
+     
+ __version__ = "0.10.4"
+ 
+-# Disable hard links, otherwise building distributions fails on OS X
+-try:
+-    del os.link
+-except:
+-    pass
+-
+ # On Windows, we need ws2_32 and iphlpapi
+ if getattr(sys, 'getwindowsversion', None):
+     libraries = ['ws2_32', 'iphlpapi']
diff --git a/dev-python/netifaces/metadata.xml b/dev-python/netifaces/metadata.xml
new file mode 100644
index 000000000000..c535d0e3657c
--- /dev/null
+++ b/dev-python/netifaces/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xmw@gentoo.org</email>
+    <name>Michael Weber</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">netifaces</remote-id>
+    <remote-id type="bitbucket">al45tair/netifaces</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/netifaces/netifaces-0.10.4.ebuild b/dev-python/netifaces/netifaces-0.10.4.ebuild
new file mode 100644
index 000000000000..1a2e405d9cf0
--- /dev/null
+++ b/dev-python/netifaces/netifaces-0.10.4.ebuild
@@ -0,0 +1,25 @@
+# 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="Portable network interface information"
+HOMEPAGE="
+	https://pypi.python.org/pypi/netifaces/
+	http://alastairs-place.net/netifaces/
+	https://bitbucket.org/al45tair/netifaces"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-remove-osx-fix.patch )
diff --git a/dev-python/netifaces/netifaces-0.10.5.ebuild b/dev-python/netifaces/netifaces-0.10.5.ebuild
new file mode 100644
index 000000000000..dc74ba238899
--- /dev/null
+++ b/dev-python/netifaces/netifaces-0.10.5.ebuild
@@ -0,0 +1,25 @@
+# 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="Portable network interface information"
+HOMEPAGE="
+	https://pypi.python.org/pypi/netifaces/
+	http://alastairs-place.net/netifaces/
+	https://bitbucket.org/al45tair/netifaces"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch )
diff --git a/dev-python/netifaces/netifaces-0.10.6.ebuild b/dev-python/netifaces/netifaces-0.10.6.ebuild
new file mode 100644
index 000000000000..e9b0229c776b
--- /dev/null
+++ b/dev-python/netifaces/netifaces-0.10.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Portable network interface information"
+HOMEPAGE="
+	https://pypi.python.org/pypi/netifaces/
+	http://alastairs-place.net/netifaces/
+	https://bitbucket.org/al45tair/netifaces"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch )
diff --git a/dev-python/netlib/Manifest b/dev-python/netlib/Manifest
new file mode 100644
index 000000000000..f8e9c3d1d2cb
--- /dev/null
+++ b/dev-python/netlib/Manifest
@@ -0,0 +1,13 @@
+DIST netlib-0.10.1.tar.gz 299633 SHA256 ee22365f6aad99326fa83788e8f71ea940affea0df3142efde247c7d520fab7e SHA512 56df59b94b6dcd61809f7319dcfd6807294d0dd1011d64d6b26beb50e3217052a96b267f1facacf46cbd0379a29df7ad5f68ee025b64b7e8fbfd31a9b4d06469 WHIRLPOOL 7e2e48fb6204ae0efe1d0aa9698b7d50ab0802c06ef8478ddd80cf3f3268fdbf1f0de696d4e2110f15f0efd45cdb713c57c5b0fc24482f9d401da4955557a446
+DIST netlib-0.10.tar.gz 60256 SHA256 415e3db96f487177f372d47bc669dcc9068a435e49b8120ec8821026de36bd80 SHA512 e6897a1ba28942eb30f19b4876bf1fcc03a83ec619e162ee09d9c3ad3348cfaebf9b413fdc4c534c56342270c0c767f16b63b79efe51d6589e864e9b51742f4a WHIRLPOOL a6f3106870f30128c96d7f04ab8c5f0136c88217fe20c00f4a7791031ea6e176ef04785403324ac2ca63ce056957c3d53660bbb3cc143499b019ca7b33f3482c
+DIST netlib-0.11.1.tar.gz 43539 SHA256 5d752d93863cbccd8bb8d7990b62903e803490fa2de12c4fb79e028e20a7d309 SHA512 1682bd73d0ff592ad8ec4a79c1f4acd1267440ad0d120a5693f66fd94bfa10b40fdec69b4d43052952a3ecf64d27cb928fd3e5747f54acc419e50c3e1d3b4fbe WHIRLPOOL 8347395165b8d95f12ec81f9651e3dd9a9d71d2d039062fc9a2f6d2a81b0648a709424d83089203d98e3697b5cced511208a076ba524de1f04c6c0578fdce0a2
+DIST netlib-0.11.2.tar.gz 43569 SHA256 66dac408eccb528b284e6a6fa5bc52aa40d1c2a53d74179d3cb2253b3120851e SHA512 ef1b489c5affb4bd7d840af955c50fe6c180b179ebe0a4c67f8005a4e02f03e1ff0d47f3b40da9aae7fc7bc179f82203a4ab43798406a917ab1a1b29eebe5443 WHIRLPOOL a6961a57d6db07e36d2098ee56a303f2e8ebb742d7857f5ab02cd8950cdecd10cd7649a8ca88af5178d82fc8de903f166156306c7e4f3df47f58a1dbe25be457
+DIST netlib-0.12.0.tar.gz 53923 SHA256 2b53b9dd611a80ba65eb5eb11bb70dfec4912e5b38fa84e30756249241012480 SHA512 18a716e084eed577d7731a44cebbcfffcb58140ae808273d683df7f95818fdc990e817fe57ad43a5b439766e022c4b8398f85c3a694f29556856a658a86ac90d WHIRLPOOL 10b3cfa75528deedbb2df9ee6a3750dcf2c20d131974b3c91cd0bfa932d29a069238edbf4f3b93a8ec40b500183d6f86d6737bfb35942ffc0311e1ebc9868f26
+EBUILD netlib-0.10.1.ebuild 733 SHA256 f1063d7e34947a27223c308461cccf87b848a4dae5ad87b6f9cf5d7459d5be8a SHA512 683811b2c2f929f4739fa41aadb89fe3441eb441bf7b4a808b739c1bb0c3c7308ef39f8981f60a29612d066ec8f22fea8c2d820c3ced1660ca6345a388f428dd WHIRLPOOL 2badca66b0a0244eeeb0c7b1a1b788b17382e7b651dbe53c4306d0acd5af4d30bf1c6ee6d1b6254f4a89b801fc21a7e0a4009b2b4dcc538fe089a812bac01725
+EBUILD netlib-0.10.ebuild 733 SHA256 5e4e70ddedb5306ba755f37433be17f68377e42534b664393dee415c248be659 SHA512 df734a002a130d92024cfbc1ffdd9bed58bff2cba0f282eb182f2d9f76f1a28b53887aae649c063b60c7d5eed03d2e8645a486a5afbbba856fb92f0d72d78a2a WHIRLPOOL 3e373197af94f309b77216e0081e58eb685d46730a186d679c443596b3031039562037f9a26587ea322e394441fbb59ffea57c1ad3b763a82bc78c76123584b8
+EBUILD netlib-0.11.1.ebuild 780 SHA256 e4f4ced8f4eaa626c1296419c7e89a0dd33a1f930ec7804003ce2980900457ca SHA512 0bdee21357dbb0174eb567aa9b101db58804beaa3e19f323b8b61b1539e62ea7530f29a8b78f89e24d2f15aa2bd86c495045ad4ee9f05230ada76f58e75c1727 WHIRLPOOL 9c5eae6e77597a897fda3f1dd5abb82431bc8bd5007abb95e52f208c0e66c8eeba7692d9ec9a5e4716f00bc3e9953b35672e21859d4af1d0124b863326471ac8
+EBUILD netlib-0.11.2.ebuild 829 SHA256 9baccafa60b60b6a2aef2418d47a7c83854b6731b6806ff1c08483f59f4de5ad SHA512 26992ae5f984e5e7ae6e38c8703f7bdfd5c046e3ecb62161bfb73610f6d499987ae34e3c92fdf7699c902ccfffcecc9e9e764a54e652dcb8bc77e5ebe83f8285 WHIRLPOOL 854cf68d26db04f5f57349dc582cd25c59a112d2053248544181edc92007034a0add0b7ce6e693d01f72cebaab4e951eb07d47c8515edec0eaf062fe7a23cb13
+EBUILD netlib-0.12.0.ebuild 829 SHA256 9baccafa60b60b6a2aef2418d47a7c83854b6731b6806ff1c08483f59f4de5ad SHA512 26992ae5f984e5e7ae6e38c8703f7bdfd5c046e3ecb62161bfb73610f6d499987ae34e3c92fdf7699c902ccfffcecc9e9e764a54e652dcb8bc77e5ebe83f8285 WHIRLPOOL 854cf68d26db04f5f57349dc582cd25c59a112d2053248544181edc92007034a0add0b7ce6e693d01f72cebaab4e951eb07d47c8515edec0eaf062fe7a23cb13
+MISC ChangeLog 2383 SHA256 74abb1563cbbfcf88a0fdf5f82b95ac7dc19b1a6dcfeafd572014f2021734e2a SHA512 8296b35237f8697d73830103a37b336465eebd0c746c34a11ff9736c72ff760e8c51381b893cd6da089b09c0bed43fcfdb4948fd14a78301636d9b688e75e531 WHIRLPOOL a8cdb2e5cdd9bf99b94e3d6f4af976e0ddd648b63c357df2e23048570eba505ca28fec310a408fc4e20aa6efefa3448ab5cd5c2e54097b2b5662fb44dc766145
+MISC ChangeLog-2015 1783 SHA256 23a4e50a856a66e910bda538becac78f5127cdf0b391967f14d32060bf555809 SHA512 5b894b7eb521a478897d8b335b72d3fcc32acefa09e7af7072f7c0f32b12208399692127ad2c0ca1e2505a589c9a4993751cab0d54c419d5acfef5922ab395fd WHIRLPOOL def2274701ebb7cbc7ebc440d67f136a657b8c29bbce8215e518ade35b3f1a94d66e7365d4f99e99fab5ef07b3f1b46067b9121a42c5f3cc6029f1f4167c7ce6
+MISC metadata.xml 381 SHA256 416517c75d1cc1ab1ae5144616a52a6519df7391c3d1367a412875b4ffb770e5 SHA512 03ea4f721c07fcfcdccf5d4211cca285de9b724bcba8a499ba90dcf6b7815af93827934a12e7c1cc73433b381e5475aa443a19b8dab92c0f0d5fb007c50c1f1c WHIRLPOOL 74eef2fa84b7f3e41ddf8e275e5930789bed9387acee58079e828d9c49f444ed9e8b8db5affb36d79e80c9beabf274f19ad7447ebe42eff99ed44d3f92679562
diff --git a/dev-python/netlib/metadata.xml b/dev-python/netlib/metadata.xml
new file mode 100644
index 000000000000..0bfdb3b09754
--- /dev/null
+++ b/dev-python/netlib/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>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">netlib</remote-id>
+    <remote-id type="github">cortesi/netlib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/netlib/netlib-0.10.1.ebuild b/dev-python/netlib/netlib-0.10.1.ebuild
new file mode 100644
index 000000000000..9f5c850535a2
--- /dev/null
+++ b/dev-python/netlib/netlib-0.10.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of network utility classes used by pathod and mitmproxy"
+HOMEPAGE="https://github.com/cortesi/netlib/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">dev-python/pyasn1-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.12[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+		www-servers/pathod[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/netlib/netlib-0.10.ebuild b/dev-python/netlib/netlib-0.10.ebuild
new file mode 100644
index 000000000000..30d678a37f9f
--- /dev/null
+++ b/dev-python/netlib/netlib-0.10.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of network utility classes used by pathod and mitmproxy"
+HOMEPAGE="https://github.com/cortesi/netlib/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">dev-python/pyasn1-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.12[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+		www-servers/pathod[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/netlib/netlib-0.11.1.ebuild b/dev-python/netlib/netlib-0.11.1.ebuild
new file mode 100644
index 000000000000..aec31955ed61
--- /dev/null
+++ b/dev-python/netlib/netlib-0.11.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of network utility classes used by pathod and mitmproxy"
+HOMEPAGE="https://github.com/cortesi/netlib/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.6.2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+		www-servers/pathod[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/netlib/netlib-0.11.2.ebuild b/dev-python/netlib/netlib-0.11.2.ebuild
new file mode 100644
index 000000000000..0c08e722b36c
--- /dev/null
+++ b/dev-python/netlib/netlib-0.11.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+DESCRIPTION="Collection of network utility classes used by pathod and mitmproxy"
+HOMEPAGE="https://github.com/cortesi/netlib/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.6.2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+		=www-servers/pathod-$(get_version_component_range 1-2)*[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/netlib/netlib-0.12.0.ebuild b/dev-python/netlib/netlib-0.12.0.ebuild
new file mode 100644
index 000000000000..0c08e722b36c
--- /dev/null
+++ b/dev-python/netlib/netlib-0.12.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+DESCRIPTION="Collection of network utility classes used by pathod and mitmproxy"
+HOMEPAGE="https://github.com/cortesi/netlib/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.6.2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+		=www-servers/pathod-$(get_version_component_range 1-2)*[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/netmiko/Manifest b/dev-python/netmiko/Manifest
new file mode 100644
index 000000000000..4405a2fc40c2
--- /dev/null
+++ b/dev-python/netmiko/Manifest
@@ -0,0 +1,3 @@
+DIST netmiko-1.4.2.tar.gz 45217 SHA256 00486456951e23fdc240cdcf9525727ecf1d1dbd22ac1f5053e00dc687c16ed1 SHA512 57531f3004191aba0639394149ce60fa9ed1ce9c5ba401a0e901d5a28b404506bd08f2c30ea915c379cac75186ec4076dfca3940a1abe19d89aba58268de736a WHIRLPOOL 95adfc09c14b067974a062fe5a1f0445f31c148a45a6806cd6808b083f5b3e87242b12b95a7a3f446438e94f6330765741fa358db6a0acae9239416323101000
+EBUILD netmiko-1.4.2.ebuild 602 SHA256 3090756a8f7302ca748dc6c6ba08ae7b111926dcbceabc6445a85e088735e294 SHA512 9ee4675e02d66203a3ee6f0ddebe2a34e103bd94eba8ebe43602bc3a13615c0bd5bafabd002417cc2b8c32b935c7b1726c20368897f7118e7d5b90645726eb21 WHIRLPOOL 61c29c78bd73a23e7b8d70d9ae39733ea8092f33c3bee8d9cea44d602cef7fa05cd414c887fac5163291df3cb9c8703bc0b3f0da77a67404414a3b794d792296
+MISC metadata.xml 489 SHA256 40b1f8899edc032c5d699c1e7a86c1b6e924fd37c0b733898eb561aab73809a6 SHA512 f70e8c0dbd8a02116817fd74436c434b102a89b174865ec4a2bdeec240e428bc79526679c0205b01a165f5e63c4197e3c8875f1c1928292b16018b8e065e66cb WHIRLPOOL b12624d84b04e546f4bf32a56fbdf85198ed837a62ea49be6912335a02a60b0288875066910a7ffd7d4416fd9fd71d637b3c8e302143fb5a28c6102ce5e87f65
diff --git a/dev-python/netmiko/metadata.xml b/dev-python/netmiko/metadata.xml
new file mode 100644
index 000000000000..fd7d7423ac44
--- /dev/null
+++ b/dev-python/netmiko/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ktbyers/netmiko</remote-id>
+    <remote-id type="pypi">netmiko</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/netmiko/netmiko-1.4.2.ebuild b/dev-python/netmiko/netmiko-1.4.2.ebuild
new file mode 100644
index 000000000000..1e4ba2290de3
--- /dev/null
+++ b/dev-python/netmiko/netmiko-1.4.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2016-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Multi-vendor library to simplify Paramiko SSH connections to network devices"
+HOMEPAGE="https://github.com/ktbyers/netmiko"
+LICENSE="MIT"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/scp[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
new file mode 100644
index 000000000000..06c77307db16
--- /dev/null
+++ b/dev-python/networkx/Manifest
@@ -0,0 +1,8 @@
+AUX 1.11-sphinx-pngmath.patch 361 SHA256 ccc81baea36453386b1f1e2bec2635990f9240c6860756d2f9d8e09e2aa2fbee SHA512 2db58b8f6067ccbe66bcdb3f39a80d126bd549c6838a34907b01360b5441f8b122632f1863b51142cba8688f4705697b9cd15d8fb6534ded8a9613e374edea4e WHIRLPOOL 6d38056740c71a6b9b6d5043fb2ab08354b8f497170dcf6085cbf6336210b8ba9c37992fabd765aac70c1212f2264c705c012d78192c8e3c5fb29792dabdb45d
+DIST networkx-1.10.tar.gz 1189291 SHA256 ced4095ab83b7451cec1172183eff419ed32e21397ea4e1971d92a5808ed6fb8 SHA512 fc0a0b929991baef63c30382c2045d551b217140393a4264b18a5f1be198d325eee9f57e02dda38a7ad9f99771c5b78f82c673a88b04df122b9d91852db09efd WHIRLPOOL 8a9666142a1978e72b9eeb791de5c2033d0d29cd2db846f2583c41876d6a5c864c295316bb3d1c2858ccda0f4ca5081108ed9c07176eb8146c8c772fa77c8a60
+DIST networkx-1.11.tar.gz 1315737 SHA256 0d0e70e10dfb47601cbb3425a00e03e2a2e97477be6f80638fef91d54dd1e4b8 SHA512 622c93330bb5ba93a2be087f7f19963a1bb9a50dc72b6500ea8321c36aa9da19af379c5cd4bbee8bba3cb6e68a28f11ee24bbe333047f5c7d0ce0b755fd57253 WHIRLPOOL 64f68a750efef2f356525f4f2e1d8046327b223a4a55b3388fef1f7b68dac3796fbd05e7d997052ab644213ccea25a0584a2f4bbd660bc32b4c9aff9a92926c6
+EBUILD networkx-1.10-r1.ebuild 2031 SHA256 31fe8bcb2c84998263a39e5d50b535df871ea3d3332e3fd64cadd21fc4070cf0 SHA512 7322a968d07950d8455c3cae9d3011ef38e92c6aa280609aeaa4814679d297d5b8acbcb68b1d58b682fa1693bbccb49c4cfc68b2cb11cf2dd50383949f37738d WHIRLPOOL 259cf7f86918b8ddc015e85c225e62bfb338263927ccaae888cf5002113606c22e12f5be6a4fae3447d08e13be3737dde3df07f0134dbc412146b46ae0cb68f6
+EBUILD networkx-1.11.ebuild 1912 SHA256 71b09c9a7d355c99664a80bafebad81385cd3bb030779b42ba478f78d7bd6c67 SHA512 c88bdf91975f6e192eb557d1b492ba92f768e191aadfd36f1dda73ef5f420fbe9dfe91c07c0c187134a6019cfe364031670068aaac182de6f9b60e2245715a63 WHIRLPOOL ff4533d2c9e4536bcb35efdae67fff38a02c3ca52be7e8c17de446256c92be9811c29f60761573a3e0580bf41fefe1aae810b887f91768d45fe78f84c42d1ff1
+MISC ChangeLog 5088 SHA256 ef2f051279d7bbb0352ceafd2690a951e9bc88c6f9b28ba17ad92bafd46e04af SHA512 95e2853e65b585f27ef8f9178b0fdd5ed8c9dbc611fa8c1bccab3f6ba85cd99e69d90a5f1067d2bbda8ab64e9a1a056797871cfe7b1b85c595bbaa515cdda1ec WHIRLPOOL 804d2fa292450928292361ffe99c0989319c9eab1ec6f92cb7d603a4a9bf4e0b1ea569325ad6efbf38e9836f63a2dee29fdf8f582092e203983144d64315f252
+MISC ChangeLog-2015 5338 SHA256 b80e2ff466d14d85568688e20c3c193aeb6eabd448ea7592e7c6c9a959172dfd SHA512 16e779db4ce77776b23dbd552ed73dd7fb5f69f652a7566839a269809b28a09a4a1e0599815a5eea5378c024183a18f6ebb488728d476c1fe0f6a87593495a74 WHIRLPOOL bc3c341ecf0ced48ee2d98f594d824dcbd9c2d6eaf41c2261edb988356dfd4fc94fe8b6592c7807916bc9432b9261a12f31026f24b4f132351384e4dbd0153fc
+MISC metadata.xml 1062 SHA256 e48b0502e64da00662ed18bc7805bc54fdde0adb03260a129f22b817bda81358 SHA512 1db48def6b8009291d6d5235323b88f42b865e009a6cb8d9b09c6519f9a55ce71ee61904c95558ad719e35161daa15fc253f0fdad2942a6ba1ac44000ab80a30 WHIRLPOOL 9291fe668b660c6ce0eafa196c6f16a2cd8eb2ddb71112eac5d1631badfabc821cf17925a54af6effb96978c3ff0b6239f06418c398b2a7afd24c36d662b6cd9
diff --git a/dev-python/networkx/files/1.11-sphinx-pngmath.patch b/dev-python/networkx/files/1.11-sphinx-pngmath.patch
new file mode 100644
index 000000000000..d43e4275a40b
--- /dev/null
+++ b/dev-python/networkx/files/1.11-sphinx-pngmath.patch
@@ -0,0 +1,14 @@
+Drop pngmath extenstion from sphinx config
+
+Bug: https://bugs.gentoo.org/594626
+
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -74,7 +74,6 @@ def cd(newpath):
+     'sphinx.ext.intersphinx',
+     'sphinx.ext.mathjax',
+     'sphinx.ext.napoleon',
+-    'sphinx.ext.pngmath',
+     'sphinx.ext.todo',
+     'sphinx.ext.viewcode',
+     #'sphinxcontrib.bibtex',
diff --git a/dev-python/networkx/metadata.xml b/dev-python/networkx/metadata.xml
new file mode 100644
index 000000000000..10664d364e8f
--- /dev/null
+++ b/dev-python/networkx/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  NetworkX is a Python-based package for the creation, manipulation, and
+  study of the structure, dynamics, and functions of complex networks.
+  The structure of a graph or network is encoded in the edges (connections,
+  links, ties, arcs, bonds) between nodes (vertices, sites, actors). If
+  unqualified, by graph we mean a simple undirected graph, i.e. no
+  self-loops and no multiple edges are allowed. By a network we usually
+  mean a graph with weights (fields, properties) on nodes and/or edges.
+  The potential audience for NetworkX includes: mathematicians, physicists,
+  biologists, computer scientists, social scientists.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">networkx</remote-id>
+    <remote-id type="github">networkx/networkx</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/networkx/networkx-1.10-r1.ebuild b/dev-python/networkx/networkx-1.10-r1.ebuild
new file mode 100644
index 000000000000..4e2807d4e82f
--- /dev/null
+++ b/dev-python/networkx/networkx-1.10-r1.ebuild
@@ -0,0 +1,78 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="http://networkx.github.io/ https://github.com/networkx/networkx"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+COMMON_DEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7 python{3_3,3_4})
+	)
+	test? (
+		${COMMON_DEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pydot[${PYTHON_USEDEP}]' python2_7)
+	)"
+RDEPEND="
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	examples? (
+		${COMMON_DEPEND}
+		dev-python/pygraphviz[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_prepare_all() {
+	# Avoid d'loading of file objects.inv from 2 sites of python docs
+	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# https://github.com/networkx/networkx/issues/1263
+	if use doc; then
+		sed \
+			-e "s:^\t\./:\t${PYTHON} :g" \
+			-i doc/Makefile || die
+		emake -C doc html
+	fi
+}
+
+python_test() {
+	nosetests -vv || die
+}
+
+python_install_all() {
+	# Oh my.
+	rm -r "${ED}"usr/share/doc/${P} || die
+
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/networkx/networkx-1.11.ebuild b/dev-python/networkx/networkx-1.11.ebuild
new file mode 100644
index 000000000000..fa141b8ee7b3
--- /dev/null
+++ b/dev-python/networkx/networkx-1.11.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="http://networkx.github.io/ https://github.com/networkx/networkx"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags -2) ) )"
+
+COMMON_DEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7 python{3_3,3_4})
+	)
+	test? (
+		${COMMON_DEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pydot[${PYTHON_USEDEP}]' -2)
+	)"
+RDEPEND="
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	examples? (
+		${COMMON_DEPEND}
+		dev-python/pygraphviz[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/1.11-sphinx-pngmath.patch
+)
+
+python_prepare_all() {
+	# Avoid d'loading of file objects.inv from 2 sites of python docs
+	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup -2
+		emake -C doc html
+	fi
+}
+
+python_test() {
+	virtx nosetests -vv || die
+}
+
+python_install_all() {
+	# Oh my.
+	rm -r "${ED}"usr/share/doc/${P} || die
+
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/neutron-lib/Manifest b/dev-python/neutron-lib/Manifest
new file mode 100644
index 000000000000..627d82add528
--- /dev/null
+++ b/dev-python/neutron-lib/Manifest
@@ -0,0 +1,10 @@
+DIST neutron-lib-0.0.2.tar.gz 49102 SHA256 2040a08937bece401a49fb4a867ccf5a910a8267edc26947ab0c523b4903ce7d SHA512 efe524b18835ee351abc9514aa2026ed543857f523f0cb7ab47e509e2e53246aa093daa0b28cbfcede27487ba8eff3c054531bfab7d43af70354c4063f34ac92 WHIRLPOOL 159294e363e588b9d2c3204d8b92b5e5df9923d8a08b70d28d0a4cdd20f9b6bd6b01301f557e97a99fcad6aac5a2724768d0898d997750c1c015f85df02db708
+DIST neutron-lib-0.4.0.tar.gz 147871 SHA256 018550848e31e3eb20e5fb3d8173ae75cce46c6233fd020227fa9a49af593d6a SHA512 c76c17331d52dd3708be67da5b509b50580be5df7238162aa66a8b89a0ff36c08b03f2f2c1a66061f5a67dc010affa5d39616549d8ed3cc5e8df96292e6257d7 WHIRLPOOL 4949b04d3c60bb906b8912758f7229e22ae9595c3f4e335bb124687a255382452bc0e0e7bd6c7e68755a5a0b4e53498f858f4a3c86c0c1824bfebc6f77358c26
+DIST neutron-lib-1.1.0.tar.gz 207279 SHA256 41d27caacac6d4349fa6580d24841bd8dcd2bde28dcacb327e458c6cb3a8f487 SHA512 b6d3d42f98e9d4fb3777459a9d80cf08482a2283a071f97a23f152b794015a3826da1c353aed21335713cbe0b2c611a773b3080164cd224862778df150fca56f WHIRLPOOL 1537ae981b17ae73fbd7f1eb7f2e9245eb36c2b651d18bee46d1cd2df154ccb59b8728c7a9ef6162e976874b2801b171dd1064cb390b76727ab4db2d65da1ddf
+DIST neutron-lib-1.9.1.tar.gz 269151 SHA256 6dd955aea22e05892f54c10c1a8b1d8cd8b3041decbe12dacdd930db60a374fa SHA512 1bfe986a5174f19ebcea34220535b20b4afcebb8215d105b911badccf606f02dcda8def6f3abd49c44352f3fcc509da977646f65a371a4d94d448e7f9436302c WHIRLPOOL aa22b8504a0600f2de5b67f04f24d499d5fceb4a842a0a063180abd1dcaf2aab94f6af257a2430c4bbf4986e8aaed28ef1e8deac51218dede681fc093ad0b059
+EBUILD neutron-lib-0.0.2.ebuild 982 SHA256 1ae4dcf39c905c490f3eeda57f2138aa959b636e86a8f8bea4efd676676a1c84 SHA512 20351aae462354ffb9cd0d5460f073a7a3a5620c570d00cb929c36826a4de8f76ee47799be67feb1b4416d0fc3ae2769fc6f453c2783cf4348d9ce3f8bf61e94 WHIRLPOOL 1bff93ee0ff76a7a6e23ca97656ca6dd1883dbbdace90d0f86ae5b106549f235427bb50e7bb2e79835f3e524b187d621d8be37f91691a36d8ef397a8869cfc74
+EBUILD neutron-lib-0.4.0.ebuild 1084 SHA256 97ea6cd43e10958e01381e6fe9b033492a4028933f2917ac561f340bf03ada48 SHA512 59ce49dd7247730833ffab9de4e0c6828e98906a4d336c1d9bfea310defb73a5fc5067843a49f58524a32c8cb47129fbd329f24148dff695e559d1d3c19ff942 WHIRLPOOL fabe7fb01be5377584bc00ec237961fd7200a245a467eff9bb85ef843c01a422d3dc27b3d6f1fc80a21836d7b7149fa0f9107bffae5b5b4de51291dc26efd26e
+EBUILD neutron-lib-1.1.0.ebuild 1251 SHA256 246eac786dc76dec5b47f3f36b5879d41c03edaadfc860162cc9cda12b880991 SHA512 43e77f783d04979a77a85788e299c0aa81b837b1c98b796ba4f14447d09d48a88a325ce95988f8552f45cd7649dda38fa652aec3bd1c0288e10d52641c88f545 WHIRLPOOL b9c885803f62fd78d3c30b9c606493fdf7ac760da9cfc03f9e156724ef91907510105b5a0eabc4afadb19e32114ff664d94cb2942bc32f02e593a184304a7c7f
+EBUILD neutron-lib-1.9.1.ebuild 1626 SHA256 5ef35ddea009404323c7dca23244e0d0476195dfc5b5a86a37d907b02d130416 SHA512 5d5751023228bf5b9a6c3b291aa7a33c34e46e65aba15cb0c40580ddcdb8b7a4676f62ec881c8efb94c8a13661c635bee38e07aa591ef8fff20bfca057570c77 WHIRLPOOL b9c9d62a624b081b66663f5bdd61dbd32a3f325ebd5adc277f282013eea90a3fa507ce55c53fa831194b697e1cc09683e6329785df81ad74879e91557917c1e8
+MISC ChangeLog 938 SHA256 25430228ea349955b2e79ea46ebbde169cf9ed689c56370981c3c41a004324c2 SHA512 29be8de2887c46eb48fa93bb5b89c82de6974ea4c6db3ca8e0c50d1538c37ec607bb123934ca80cab69470fde3a6b29e32d7ea136a03ef6e5207f874e91de3d8 WHIRLPOOL 77dae403c2a3a53e918894737559587392cc930538e025fe84b8d678d040fcb4cfd9e6110b9ca0cc96f206d0c26b14e322e990c7bb56a2788cae67eabe50edbd
+MISC metadata.xml 478 SHA256 0965fad1838ff3845b27f5807883f5d00c5c6384376038f0a91319ec77987b3c SHA512 c642bad9f710c347629fca6952be3efe57e247dee81fac187d4a6458b4cb8280dc0d3d4a66e4d329bfd293b9e27edbb7a38247311fbb817088eeb70c441737bc WHIRLPOOL 0b1655ae658963991c2fc024b99ae115b0064410e915b4f6101246bb3af8b537250cb57622f1988131288cf367f6a9aaeec35bcfef827d591bb49b5d524dbb17
diff --git a/dev-python/neutron-lib/metadata.xml b/dev-python/neutron-lib/metadata.xml
new file mode 100644
index 000000000000..a3a413a2a5cf
--- /dev/null
+++ b/dev-python/neutron-lib/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		Neutron shared routines and utilities
+	</longdescription>
+	<upstream>
+		<remote-id type="github">openstack/neutron-lib</remote-id>
+		<remote-id type="pypi">neutron-lib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/neutron-lib/neutron-lib-0.0.2.ebuild b/dev-python/neutron-lib/neutron-lib-0.0.2.ebuild
new file mode 100644
index 000000000000..ccfd0584b857
--- /dev/null
+++ b/dev-python/neutron-lib/neutron-lib-0.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Neutron shared routines and utilities."
+HOMEPAGE="https://github.com/openstack/neutron-lib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/neutron-lib/neutron-lib-0.4.0.ebuild b/dev-python/neutron-lib/neutron-lib-0.4.0.ebuild
new file mode 100644
index 000000000000..a20824f1dadb
--- /dev/null
+++ b/dev-python/neutron-lib/neutron-lib-0.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Neutron shared routines and utilities."
+HOMEPAGE="https://github.com/openstack/neutron-lib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/neutron-lib/neutron-lib-1.1.0.ebuild b/dev-python/neutron-lib/neutron-lib-1.1.0.ebuild
new file mode 100644
index 000000000000..ea7c4e059c40
--- /dev/null
+++ b/dev-python/neutron-lib/neutron-lib-1.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Neutron shared routines and utilities."
+HOMEPAGE="https://github.com/openstack/neutron-lib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/neutron-lib/neutron-lib-1.9.1.ebuild b/dev-python/neutron-lib/neutron-lib-1.9.1.ebuild
new file mode 100644
index 000000000000..7cab9a2eaba5
--- /dev/null
+++ b/dev-python/neutron-lib/neutron-lib-1.9.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Neutron shared routines and utilities."
+HOMEPAGE="https://github.com/openstack/neutron-lib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+	!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+	!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+	!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+	!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/nevow/Manifest b/dev-python/nevow/Manifest
new file mode 100644
index 000000000000..782d42820081
--- /dev/null
+++ b/dev-python/nevow/Manifest
@@ -0,0 +1,9 @@
+DIST Nevow-0.11.1.tar.gz 563061 SHA256 89d7f6943cf81ccef8dde4016caa1cba977b9366e7aa0660b54239828b421efc SHA512 a7e52fbf6915498e77a41fb100d4c688fcd0567deb56ec946adf1b1712bcfbec7b7a55c551e414606218146772d5274973af7851a78878635e900a4df5193a53 WHIRLPOOL a82ca1334abf201ef9fcf22e579be778e819c488df8c9f774bef7f13041aa996f630408f4a8428e74b2e79df1904dbdf2f858fb79526a9417c1872da95a24963
+DIST Nevow-0.14.2.tar.gz 528266 SHA256 7ef8e6147a65a17ef85ef1c017b20126cfb58bdb2ddb730e73fb15a93d205073 SHA512 6b21e4471fbbe76bf2a64975ed2a04413d059d9a50ca89247d48db9436a9a5e747aa373921310f4a53120466d8033377f85cbea3af14a50b1297d85391d6474a WHIRLPOOL 702ada72de94ad17fa2e0a0251c05c83054e44c6696bfde70bdfa6128752bc605c4fcb342503ff384aab24017cca78363d6e5dca193d8ad80563cb66c44ec6e6
+DIST Nevow-0.14.3.tar.gz 548818 SHA256 ab565b9bccecbafa36446ea8765bec2be7ee7c66a9a8644b3851a13b64432d5e SHA512 5488be9c771dc9d9b348ee705f8cb1f47400b4789ea574f5ed68c54ecb33e6cc2928d45193137921727f560256e16716adff66ca5179d2a79eb395e0d61c2f05 WHIRLPOOL 749435b881dae54cad4dac0b49d82b1955b63efbaa87efc73448ac16a0106f719e39fc3172c03173e48fd51e6a45cbb94ebf46c3012efed65c74971e306d7f9d
+EBUILD nevow-0.11.1.ebuild 1020 SHA256 a1794c7849178c300bb090228c55f015795afd19c3a8b8c43b8c960f3efdcfdf SHA512 f075df2c1af254c7a02c694cd718024c12e59acbd050155ec01daf58bc85fdac14790958692af54c9455733cd3d753719da014c13079777d0d172233d0616f36 WHIRLPOOL 9e37895843f65c528b8a6c5b763b76e36231dd1d370d3dc0304b1368bd340e3cb6ea92f0ddb0b1bef0a211be048af9dd8cb16848d4b08ad977a585755d5fd291
+EBUILD nevow-0.14.2.ebuild 1265 SHA256 d7cea69211de32c3a6c2b5fff22acf07b4cbfd90817312db49a0e46d9c0a546b SHA512 457931f697e41171cd8a1ba7cddd6e9e53ee70bba0040d38e3ccf1c8f6bc5e99e96d1422575779637c6e5f655172ad4ff87d0a96660ea84dccd5de3e6fca2130 WHIRLPOOL 107acfbdf5f11ec0a0a73d866b6e67da7c5793cd69096373f55c539c12771454cdb6328a6c7a2a3e7ac9db5d8913a9759fb6fd2319c830d07b4b2a85b9b4b1a4
+EBUILD nevow-0.14.3.ebuild 1265 SHA256 d7cea69211de32c3a6c2b5fff22acf07b4cbfd90817312db49a0e46d9c0a546b SHA512 457931f697e41171cd8a1ba7cddd6e9e53ee70bba0040d38e3ccf1c8f6bc5e99e96d1422575779637c6e5f655172ad4ff87d0a96660ea84dccd5de3e6fca2130 WHIRLPOOL 107acfbdf5f11ec0a0a73d866b6e67da7c5793cd69096373f55c539c12771454cdb6328a6c7a2a3e7ac9db5d8913a9759fb6fd2319c830d07b4b2a85b9b4b1a4
+MISC ChangeLog 3084 SHA256 7db25920ccb42df59e221ca03a9fdab9c63c6f75924ea36948eda01b074d9384 SHA512 8ac21b4cc8f48aaa01815f5ed1dbf8311a0d2cfa95420abc7030a29408beddc50cfca3aa0241bf83a5b8628bddedaeaa96b5cd081dfeb2ac5050eb7579c1971c WHIRLPOOL f76c3ea9f59d48c20ead1f2306cc0baf8aa686861652740fda12817fdbc924cdb553043e93f1cb83396be145997c444b243edea63f77ce3f7291282b1ce0e95f
+MISC ChangeLog-2015 7930 SHA256 983f52922eec1f45e04de0b62c88061bec4c8f43e0cd53823b5a92d456dfa59d SHA512 f9d4ac93e03ce943a5cad37dcb1843318863963968e8ea7c728bfe67d5be29354664a2626c21beee73404e20d8fb1f705129965efb5b88e6d49026acdeb86253 WHIRLPOOL dca69e2a369ebd8b8f9764e0cadd004ab748dc2f75626c36d77520475d7e35ca755803ffe6bbf4bfffea22d24da9b26eec5f154594814e71ae3cd876a97a602b
+MISC metadata.xml 308 SHA256 f80010281598d5d9048b3aa568e7a9f9b144a47da9e8813e5601325b46d61b17 SHA512 f6315f9350d7d43c1c2df8665f38e6373a1b24ff9950001472333ed45aceb10fd7dcf376492643e6af0a995f561f3fa171341303a4935bd55d97ce2fd6db9229 WHIRLPOOL c63dcf089c3ae46483f7f5c21226be1c8c1af085ce626fcd8393a2c5b92ac1902ceca3a10f47d51bbf0501bd8732fd273a43f53c5adc1b0d7ba4a75749310f20
diff --git a/dev-python/nevow/metadata.xml b/dev-python/nevow/metadata.xml
new file mode 100644
index 000000000000..916525ee0a88
--- /dev/null
+++ b/dev-python/nevow/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Nevow</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/nevow/nevow-0.11.1.ebuild b/dev-python/nevow/nevow-0.11.1.ebuild
new file mode 100644
index 000000000000..6c8e6259e0e8
--- /dev/null
+++ b/dev-python/nevow/nevow-0.11.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="A web templating framework that provides LivePage, an automatic AJAX toolkit"
+HOMEPAGE="https://github.com/twisted/nevow https://pypi.python.org/pypi/Nevow"
+SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-linux"
+IUSE="doc"
+
+DEPEND="dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/twisted-web[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+TWISTED_PLUGINS=( nevow.plugins )
+
+python_test() {
+	trial formless nevow || die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	touch "${D}$(python_get_sitedir)"/nevow/plugins/dropin.cache || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# TODO: prevent installing it
+	rm -r "${D}"/usr/doc || die
+}
diff --git a/dev-python/nevow/nevow-0.14.2.ebuild b/dev-python/nevow/nevow-0.14.2.ebuild
new file mode 100644
index 000000000000..a2cf9c4418b1
--- /dev/null
+++ b/dev-python/nevow/nevow-0.14.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="A web templating framework that provides LivePage, an automatic AJAX toolkit"
+HOMEPAGE="https://github.com/twisted/nevow https://pypi.python.org/pypi/Nevow"
+SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	|| (
+		dev-python/twisted[${PYTHON_USEDEP}]
+		(
+			dev-python/twisted-core[${PYTHON_USEDEP}]
+			dev-python/twisted-web[${PYTHON_USEDEP}]
+		)
+	)
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+# JS tests require a JavaScript interpreter ('smjs' or 'js' in PATH)
+# and the subunit library
+DEPEND="${RDEPEND}
+	test? (
+		dev-lang/spidermonkey
+		dev-python/subunit[${PYTHON_USEDEP}]
+	)"
+
+TWISTED_PLUGINS=( nevow.plugins )
+
+python_test() {
+	trial formless nevow || die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	touch "${D}$(python_get_sitedir)"/nevow/plugins/dropin.cache || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# TODO: prevent installing it
+	rm -r "${D}"/usr/doc || die
+}
diff --git a/dev-python/nevow/nevow-0.14.3.ebuild b/dev-python/nevow/nevow-0.14.3.ebuild
new file mode 100644
index 000000000000..a2cf9c4418b1
--- /dev/null
+++ b/dev-python/nevow/nevow-0.14.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="A web templating framework that provides LivePage, an automatic AJAX toolkit"
+HOMEPAGE="https://github.com/twisted/nevow https://pypi.python.org/pypi/Nevow"
+SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	|| (
+		dev-python/twisted[${PYTHON_USEDEP}]
+		(
+			dev-python/twisted-core[${PYTHON_USEDEP}]
+			dev-python/twisted-web[${PYTHON_USEDEP}]
+		)
+	)
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+# JS tests require a JavaScript interpreter ('smjs' or 'js' in PATH)
+# and the subunit library
+DEPEND="${RDEPEND}
+	test? (
+		dev-lang/spidermonkey
+		dev-python/subunit[${PYTHON_USEDEP}]
+	)"
+
+TWISTED_PLUGINS=( nevow.plugins )
+
+python_test() {
+	trial formless nevow || die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	touch "${D}$(python_get_sitedir)"/nevow/plugins/dropin.cache || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# TODO: prevent installing it
+	rm -r "${D}"/usr/doc || die
+}
diff --git a/dev-python/newt_syrup/Manifest b/dev-python/newt_syrup/Manifest
new file mode 100644
index 000000000000..6aac3421b00f
--- /dev/null
+++ b/dev-python/newt_syrup/Manifest
@@ -0,0 +1,5 @@
+DIST newt_syrup-0.1.2.tar.gz 14283 SHA256 68de3c40c014721d23692a27b8e816d29d4bce6ee788a17a82df69afc76518e4 SHA512 8e9db226f2f31eea5656d5bea0acd287fefb4699816e8328471685952d6f323037665bf3908cabaff4e2d0359996989ce8e03ce8c8933c995f13c1a5f035ef0c WHIRLPOOL 3f129a3c68e5da3117b97f8a7e5509e031aaecab9754293c81d1975e2818974531a8010992e2fb968dc3871ac750427bd0f405f9ac84ce499c64d68e4c917836
+EBUILD newt_syrup-0.1.2-r1.ebuild 502 SHA256 06876e825504f891ca75f8dcbd9c69cfe0b45e89bc89b3057b6867e39a3487f9 SHA512 779e97837d725a095ec18d06b594f5cc9578be5603c8d78340dbe7869214313208dd0ca143a30cc685b4062306f71eae6a56d3250e97708aa821936054e87343 WHIRLPOOL c66dbd3b1accbbecef07217ec2d9124e902bd4c8f8e7077e27d36fbeb548be70373af4ea659afc09d051709196a2865f812f0b8c0320d5e5657ef8b8ea2dc7b6
+MISC ChangeLog 2444 SHA256 1918f7ccf518fb5146b1aaa2b45125ce43966dce33e3a42d4406e6b50b2d5e76 SHA512 e9d50ecfe0596310f097e326c5812dfb23a9ff077c397d54a5f8f0298af42a90c465c699f560dc017aa1c8c2fcd4787e341cc337f26331f64b5c5670f093767f WHIRLPOOL 89bde77cb2f88a5bc5a3ea53549020f66a01fc7312ec6803dc86225b462b691922edd1f0b4f45a18af67fbaf27d5b62eaff2bc291d649a080cea405abb3824f3
+MISC ChangeLog-2015 669 SHA256 ceb2e65a6d04fc46573f7f82d741af62afa3763d2d2ff3fb8cdb868a616efca4 SHA512 8180112bc8d6fb0a6d3827118fb32c93b384b839adab1f64c14d0c3d855cdabf5c5ce2b60facc3162e521e584bab46c10713ec6677aa4bb5744a8d30a1caddb6 WHIRLPOOL e90e236a6b6e7c6477031cd34e42dde233c60cb7d8ff2426d9120ac04cd3f83b37e1feba6985134e733a03b2c74c0c78a40604ad803048d9c587357943e8b034
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/newt_syrup/metadata.xml b/dev-python/newt_syrup/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/newt_syrup/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/newt_syrup/newt_syrup-0.1.2-r1.ebuild b/dev-python/newt_syrup/newt_syrup-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..ef7b1d14ec13
--- /dev/null
+++ b/dev-python/newt_syrup/newt_syrup-0.1.2-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python framework for creating text-based applications"
+HOMEPAGE="http://fedorahosted.org/newt-syrup/"
+SRC_URI="http://mcpierce.fedorapeople.org/rpms/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-libs/newt-0.52.11"
+
+DOCS="COLORS"
diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
new file mode 100644
index 000000000000..5974c27d7d84
--- /dev/null
+++ b/dev-python/nltk/Manifest
@@ -0,0 +1,11 @@
+DIST nltk-3.0.3.tar.gz 1011266 SHA256 28d6175984445b9cdcc719f36701f034320edbecb78b69a37d1edc876843ea93 SHA512 b058642670166bff538e2c1c417ffb2e57a217a9f3a056475ad47ffa222df7237bfb4ac00a58952dc6f79f12a32e3a40bf53a96262a4b3caced64c2c09abdfc3 WHIRLPOOL 4201a7d6219f437b8e8df2b7c88ae48578e69825c4fe067d777c92b24bd819172b6a831d2ed51de07a3b52bda20f5c559e2da0dcfde58cafca57c811bbb23cd2
+DIST nltk-3.2.2.tar.gz 1153499 SHA256 1b37db344770021c9be3d68f48d1667a8dae6eeff0e502b7bfb01638d288a88e SHA512 7a9aba4db26bc091bcba248156f74353a55cae0301ff3d675e55615967a0a1163d2d1db4e4bc51a953ced3c28d0b330a7949f4f9ec3621df300dcad23877a556 WHIRLPOOL c424e9290ffa6af3cbd4576caab28e44afa138001106243c3309e927e53f88bb642ea495be2623abb9635eeb1676dabf5588bcd090c5aff7395cc0763aa52fe7
+DIST nltk-3.2.3.tar.gz 1166282 SHA256 8734e180ba255562971aca8881f330201666e6ac63c8a1cd853e067eb827bcb1 SHA512 2e5c0899c29f61166b2e161e62e81fd35e045bda979fbfa662bf9ad1349be4aae6aabe4b9de34905e2abbc05b06a096480829fd66638efa35cd5c866f76c62e8 WHIRLPOOL 54791d2d19c973dc4024b701fbd6474013695765b4ffe81b92b9bc9865bbce91c56bd3c30b82cf7b45861cc6f828832796f4dd30363c97366470c485ca82c6d5
+DIST nltk-3.2.5.tar.gz 1188856 SHA256 2661f9971d983db314bbebd51ba770811a362c6597fd0f303bb1d3beadcb4834 SHA512 967b209ce3dde5296dafac16b91bff3894ff1a3f073c76974fd9193912597c82d2d1c50d4419052da77ab66f798f230f725b83f31368a95cacf94d46e45055de WHIRLPOOL 3b3d7d0e052342b377b9447c65e5ba5d15bfd122f78a9b487a474c3093d7a2901a6955da1e0598d56eb9b1a8367c3b894488df8e0f6eee8d268733a5e3fc9e46
+EBUILD nltk-3.0.3.ebuild 566 SHA256 cdcd72aba0b880d99ac06f70887a4e64e80e9d16e9e4a54a8b4bf8abb48f4c1f SHA512 4cd4525a2872a7007d7f2bae43937db84ac3b95dc323155f40b5babab2b1e1edce999fcdd8aa83f4a215eb552a5a492eb5a73103c2ebbb52ee1f16d556a4a12e WHIRLPOOL c88c7764f72ef3e7b83a1a842b768fb145c6fb4051d0963ba22d0e0207cc9beab446499665a1cc046d287af8c669ce18b79537b0b4315f58bca23e3ee02f1ce5
+EBUILD nltk-3.2.2.ebuild 546 SHA256 7001d24f5df8ae154f10f99119a6e88e7f35d62ba6cccb4bfe4c095a59523e91 SHA512 78fdbf8e7360cb3ab29f2cf20337fbc5c06c06b4b8ea538a57283f72c2229dd2014387662e30f5e3b32021da68de1f3b7363a2b2f3a4531864071a542314f433 WHIRLPOOL 9f18e56b4a79435a50a09fceb0f6b6608f50d6f26e309a0cd244bcb8883f58b59314abf1f27d31c03c928de0ef544d41d2e2f17eece385ed3b46d9b1cc2aa243
+EBUILD nltk-3.2.3.ebuild 828 SHA256 640375ef721f0e6b6f312aab0fda8dd76e61fb7ce6d16e16faf42c0720f24cdb SHA512 1f12ec98511728139858cb1c8a5519630ae85e070178cb756751a87711d0843ee91ce9551509a9812072b06125adc17a694fb8cf456f936d0173ff4e1ceeef8c WHIRLPOOL b24ef0119611499d32fbcb948c5cbbdff724a7796c652f234795809b11e52a025311ddf9f46bbc1862900fd5aaa08e50b3865213507c7259f4b1bd173a8a8d02
+EBUILD nltk-3.2.5.ebuild 830 SHA256 81fb9f31a9268e82ed5ad6a232aa25fe01a343b5aae12be9c005813289551f91 SHA512 c25333641e987f8df21265efc97f50d0d7c6abb350352be31fb72339994cb0d0e68040d1b6ba856f54dad2888b44a71a63956b0c89b2e475cc998f128611f55e WHIRLPOOL f1e8ec181dbdde9bda10f43011a9b0f4f5c2f4f88f50e57424128cce0516bec42fbd17c47091a0ff26c06708a452662a9cbc1a9d4dfde4a431f2eb8ccba2a6b0
+MISC ChangeLog 3411 SHA256 c4aaba5138839d7eb13e44094bdabf9d3adaa1a067dd984eb55c932ddd46251f SHA512 6936c69c1f3f296e7e0a10b3e56db3f848d116a1abd30700b012f70f3f05ee5f930688b8db7fb2441ffab2974bf37aede300074b947ab5589e18a35fc0e3e441 WHIRLPOOL 3938ce7ed559103033fc1bca27de25b40c83334be2868338e5c549a2730a4f143cb6151574e71c659e8a258fd49f04bb50b6449ce8a1a382be96609a74227c4c
+MISC ChangeLog-2015 3502 SHA256 53802c00664326c1ebf796ade835cd9a3e3d0caff570fad3367eba62fce9aa4a SHA512 eb8cda51c2978dce0bb1c6ff460f4c8a45c01ad5a2ad42094f5d60e5f53dcdd36167cf14f22c2e7d9c670c4d2b11e898966afc699783dc05e5a4de6ab646bdfa WHIRLPOOL ac59df8d3a4033c9fdda67d9f85078c401b9cc508539b23da27d60b8c3cdee64c7d1c63573a69302ac208f352ba2048a06747d38a623cedee93c4ba038ebfa57
+MISC metadata.xml 710 SHA256 87f8b39f7b3c521f7e8a315ebd312bad48908d0a1fda294feda3420e674b5637 SHA512 88962aa0835b0740f96350e417689bbefdef8657b73eb7282e6aaf58fb59229c7cabe39275c66de5cf16665ce0d0572eaac34b234838ad91f69300eb11b996e2 WHIRLPOOL f8e7253742cfe92f19368cb466a7c6db82353f8e5b59c4ffd393bb1dc0b21f801c3d0322569ae7f5b2d8492f87726e8c1dc9e86ac20da9efdcf892ae119afda8
diff --git a/dev-python/nltk/metadata.xml b/dev-python/nltk/metadata.xml
new file mode 100644
index 000000000000..2e15285d6835
--- /dev/null
+++ b/dev-python/nltk/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>clabbe.montjoie@gmail.com</email>
+    <name>LABBE Corentin (Montjoie)</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <use>
+    <flag name="numpy">Use numpy for the saved word tokenizer</flag>
+  </use>
+  <upstream>
+    <remote-id type="google-code">nltk</remote-id>
+    <remote-id type="pypi">nltk</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/nltk/nltk-3.0.3.ebuild b/dev-python/nltk/nltk-3.0.3.ebuild
new file mode 100644
index 000000000000..57605e0d4fd1
--- /dev/null
+++ b/dev-python/nltk/nltk-3.0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_REQ_USE="tk?,xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Natural Language Toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://nltk.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="numpy tk"
+
+RDEPEND="${RDEPEND}
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/nltk/nltk-3.2.2.ebuild b/dev-python/nltk/nltk-3.2.2.ebuild
new file mode 100644
index 000000000000..79fb3644aaee
--- /dev/null
+++ b/dev-python/nltk/nltk-3.2.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_REQ_USE="sqlite,tk?,xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Natural Language Toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://nltk.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="numpy tk"
+
+RDEPEND="numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/nltk/nltk-3.2.3.ebuild b/dev-python/nltk/nltk-3.2.3.ebuild
new file mode 100644
index 000000000000..7c9c2a8c4acc
--- /dev/null
+++ b/dev-python/nltk/nltk-3.2.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="sqlite,tk?,xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Natural Language Toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://nltk.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="numpy test tk"
+
+RDEPEND="numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+# currently requires linguistic data to be downloaded separately
+RESTRICT="test"
+
+python_test() {
+	nosetests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/nltk/nltk-3.2.5.ebuild b/dev-python/nltk/nltk-3.2.5.ebuild
new file mode 100644
index 000000000000..00df16dee538
--- /dev/null
+++ b/dev-python/nltk/nltk-3.2.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="sqlite,tk?,xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Natural Language Toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://nltk.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="numpy test tk"
+
+RDEPEND="numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+# currently requires linguistic data to be downloaded separately
+RESTRICT="test"
+
+python_test() {
+	nosetests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/nnpy/Manifest b/dev-python/nnpy/Manifest
new file mode 100644
index 000000000000..ae0c7a0ddeed
--- /dev/null
+++ b/dev-python/nnpy/Manifest
@@ -0,0 +1,9 @@
+AUX py3.patch 699 SHA256 83ec93205edcc4d3d099cc6e737e7499fb21b1b64a081254499f702b9f3ad760 SHA512 45072f0fdb3e95b4e7301ccaa9168dbfd11dd0dda651eb6f9dff0352010ec6619e9af3de38d03fe89c93c5794883c4f9d6dcf6bda3a21db64449f0d15b65c336 WHIRLPOOL 061cbe3de6d2335d49d787e5b857c7a4a067b7079d09c7e6275db803db805328de54748679245df52727fe55236144d38a4025d418dc44ad71e21e63fa584478
+DIST nnpy-1.2.tar.gz 3781 SHA256 0b3a894dd0be0f5b6f967e3cacf5ec3399e4fbc9ef83fdc3e7c6b17fa3284094 SHA512 ae88d52289c1b4e9853e81342aec94feee004f46e6b5801764ed1fc50f7e249cf45b8d24e85ae9f69003304052505cd9242f43ee33de42ab4f862b3f9cb20b3f WHIRLPOOL 09ab1e11bea3f163d78860ac69e604bb176f17e1e3049af139627e6baa4572bd9d40f38a29b0eb5a352e5279504652994003d84eb8f3a5c248f0fe96aad4c4ee
+DIST nnpy-1.3.tar.gz 4384 SHA256 50daf80693f355096a4926e8b5a8ec5f216a3ca28f0eb14ff819b218a3691f4e SHA512 66ec80169f4c107f2c9ea870153824a84f5bfdecbb0b40a455061a926b43ff61a723b4e62d9b0e9f5361cf6b486f706a5ff111681bbb4083180988337416e0f6 WHIRLPOOL 76ef6210c028cd83bb98fb89e452bec82a7b6cfb3a19bac37e8306a18b2e4d9f1a801624e3db31b525a831ad2ddee5d3dd87017eebeb20241e323037ab688e0d
+DIST nnpy-1.4.1.tar.gz 4826 SHA256 2b947d097b19e9d4182d77f542dccb93da543a325b2eb616cc9e0e90cfed50a9 SHA512 26e1393fdca77cc9385eff0622f9a5b4987eeca533c57478ba873a1ea96f312a2d535fd3eaa883c47746157a9d692b4b0f6c52d51ea5b4fea5fb885cfdadc2a2 WHIRLPOOL bb3082484ac0f2829ad39a0592c8944827bdb30cd097fc73e020570d770513d802608732e14ae47a565669060388e20d7684631d6d0da83da4dd48fba123f373
+EBUILD nnpy-1.2-r1.ebuild 549 SHA256 d036f9ad9f596d75d734226b6f4203895459d6ae7bf6c3238e7b74e9459a04f0 SHA512 aa7316585c21b300a3392297061e920a9e61194bc8e7537f9729845b08ed8a8614579621f635e57e8cc4c3ca825d68991534d26b9eb8d7c26b4665806f2ecc96 WHIRLPOOL 5ba3dc453c6d63a151285f0ce827b4cfe2598a12a4fdc2f960ce4617954a357903e0f79488e34977704ab7d9dfe19e1fe130452ba3d4252f840839c69bf52256
+EBUILD nnpy-1.3.ebuild 549 SHA256 d036f9ad9f596d75d734226b6f4203895459d6ae7bf6c3238e7b74e9459a04f0 SHA512 aa7316585c21b300a3392297061e920a9e61194bc8e7537f9729845b08ed8a8614579621f635e57e8cc4c3ca825d68991534d26b9eb8d7c26b4665806f2ecc96 WHIRLPOOL 5ba3dc453c6d63a151285f0ce827b4cfe2598a12a4fdc2f960ce4617954a357903e0f79488e34977704ab7d9dfe19e1fe130452ba3d4252f840839c69bf52256
+EBUILD nnpy-1.4.1.ebuild 628 SHA256 13bc48695852118734bd240f8ac849f1c6c467293bde227731fb21c892ade80f SHA512 b9cabcca60b2fb5ce3de656ba9788da050b00c747a41ff63d49355e982ff4b8e70478cbac45feff219e13d1c610a145d49d3c42812be02eb2df6f572c29266b9 WHIRLPOOL 517d15bbe053550bed09edbe34193fd1e5169b7ba346ee6b6553101e47288282475c4ba0626be7c44ca82da05b57c403ad7ae0bb7f2e85386cba3945a3d88a18
+MISC ChangeLog 1038 SHA256 727dd8cdc86c988dff6625c99c89252ce9b2aab2690ead206c5214713529b3e5 SHA512 2d2cea19d227dfa545a097354aff303b217d035c3c52b9e285c587cecd45bb9c9bf81fa6595146235d1da18ae74e38fde4567bbaefa33e9130871794e3ec8d0e WHIRLPOOL 694cc35840fe8d3d13738a6113e17b98d4eb1629429fa564afaf35617dfeb63ade6595bb2ec6086bb2bab7aae887a520833ecfc347af2d225a26e5714171b4ad
+MISC metadata.xml 432 SHA256 eaeb86fc0a67a188acf926c0f2ca8e4a2e1a404203e4161f4df1be8b831b2e0a SHA512 4831a2c1564e14be4136a2e6431a0bc5d8964fd644f13e63633090b8d962fca501bde23407cfb69672db93fcc27c14c19fbfb19fb9e2a5de8e460f014551070b WHIRLPOOL 7ac30ec227dd46532be633b8b6c001895475971157d73bc1133e30ac671d03664e0792e64ba8a2ed898bd125b609983f87271cc8444e940620937e42e146513b
diff --git a/dev-python/nnpy/files/py3.patch b/dev-python/nnpy/files/py3.patch
new file mode 100644
index 000000000000..8a39044bb7f1
--- /dev/null
+++ b/dev-python/nnpy/files/py3.patch
@@ -0,0 +1,19 @@
+commit 98ee46a4034ca94d6123b854e79f1dc3f35fff4a
+Author: Alexis Ballier <aballier@gentoo.org>
+Date:   Sat Jun 3 19:55:10 2017 +0200
+
+    Fix tests under python3.
+
+diff --git a/nnpy/tests.py b/nnpy/tests.py
+index ba2a3fe..7f9f6e0 100644
+--- a/nnpy/tests.py
++++ b/nnpy/tests.py
+@@ -17,7 +17,7 @@ class Tests(unittest.TestCase):
+         poller = nnpy.PollSet((sub, nnpy.POLLIN))
+         self.assertEqual(len(poller.poll()), 1)
+         self.assertEqual(poller.poll()[0], 1)
+-        self.assertEqual(sub.recv(), 'FLUB')
++        self.assertEqual(sub.recv().decode(), 'FLUB')
+         self.assertEqual(pub.get_statistic(nnpy.STAT_MESSAGES_SENT), 1)
+         pub.close()
+         sub.shutdown(sub_conn)
diff --git a/dev-python/nnpy/metadata.xml b/dev-python/nnpy/metadata.xml
new file mode 100644
index 000000000000..85cc65f8def9
--- /dev/null
+++ b/dev-python/nnpy/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>djc@gentoo.org</email>
+		<name>Dirkjan Ochtman</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">nanomsg/nnpy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/nnpy/nnpy-1.2-r1.ebuild b/dev-python/nnpy/nnpy-1.2-r1.ebuild
new file mode 100644
index 000000000000..d2bb5f9e6a94
--- /dev/null
+++ b/dev-python/nnpy/nnpy-1.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="cffi-based Python bindings for nanomsg"
+HOMEPAGE="https://github.com/nanomsg/nnpy"
+SRC_URI="https://github.com/nanomsg/nnpy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE=""
+
+DEPEND="
+	dev-python/cffi:=[${PYTHON_USEDEP}]
+	dev-libs/nanomsg:=
+"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	"${PYTHON}" "${S}/test.py" || die
+}
diff --git a/dev-python/nnpy/nnpy-1.3.ebuild b/dev-python/nnpy/nnpy-1.3.ebuild
new file mode 100644
index 000000000000..d2bb5f9e6a94
--- /dev/null
+++ b/dev-python/nnpy/nnpy-1.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="cffi-based Python bindings for nanomsg"
+HOMEPAGE="https://github.com/nanomsg/nnpy"
+SRC_URI="https://github.com/nanomsg/nnpy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE=""
+
+DEPEND="
+	dev-python/cffi:=[${PYTHON_USEDEP}]
+	dev-libs/nanomsg:=
+"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	"${PYTHON}" "${S}/test.py" || die
+}
diff --git a/dev-python/nnpy/nnpy-1.4.1.ebuild b/dev-python/nnpy/nnpy-1.4.1.ebuild
new file mode 100644
index 000000000000..7f1153859ae0
--- /dev/null
+++ b/dev-python/nnpy/nnpy-1.4.1.ebuild
@@ -0,0 +1,29 @@
+# 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
+
+DESCRIPTION="cffi-based Python bindings for nanomsg"
+HOMEPAGE="https://github.com/nanomsg/nnpy"
+SRC_URI="https://github.com/nanomsg/nnpy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE=""
+
+DEPEND="
+	dev-python/cffi:=[${PYTHON_USEDEP}]
+	dev-libs/nanomsg:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/py3.patch" )
+
+python_test() {
+	PYTHONPATH="${S}:${PYTHONPATH}" "${PYTHON}" "${S}/nnpy/tests.py" || die
+}
diff --git a/dev-python/node-semver/Manifest b/dev-python/node-semver/Manifest
new file mode 100644
index 000000000000..d32a476fe0e5
--- /dev/null
+++ b/dev-python/node-semver/Manifest
@@ -0,0 +1,4 @@
+DIST node-semver-0.1.1.tar.gz 18338 SHA256 e29ee4e51efb6d82c55aef5d569b888842e62e6404ce95df18d80c421f8e7dac SHA512 f652a69330907722d1e6449f237ae6c006a11c48f49b450d390700704309672573add77c103fc53d052014e751949348b344b001acf85ae6668e504811a1d198 WHIRLPOOL b4270e8b8d25676328619b6ed325c0991fa7c1f3a30dda136122eca820c1927a1d74511ae0330a0551a7518d6338da3af55a593290aeb1427cbf61801855d436
+EBUILD node-semver-0.1.1.ebuild 880 SHA256 dcb614c76f11b4bfe7ac3e229abe1050965d1833bece6684199b0159b71cc58d SHA512 9425c6e058205dc1dfedcea4f11a0aae702f4922a912ad3495eee06e6876484fac327422de4983b41b81b5709d13e437c142c5d4f211d75e37ed5d36af4645a0 WHIRLPOOL 6463e11e2fca639cb413075ff13effac456b303dd6502f52b9ef4de808775a38936f88f750acde5780538855e87839af6ff5c596ff00d40ecd15ae6b0785dd66
+MISC ChangeLog 297 SHA256 5b58c985635a8cfcaee820c6a741f8780fdb1a64c4ae3324b55d7b322b548eec SHA512 66d3bd8189a6a44d94d3bcfa38b92e47e6ee680b32646727c3d1f212d2a3edee4a5a9f1b853ce1498e1e919979b9391211400ad014b2a8be0df1671b739d3d54 WHIRLPOOL 7ae1d8656b0efccfde14faaa2d84d58e2c7bea428854f504a5fed75d7199a72a06941d291a044e34284b1ff21e4771ed048480f91c67dfc7c18ac59344f44bbc
+MISC metadata.xml 745 SHA256 265faf22446902d2231a9611ab0386c5af0958f6ecca82fe8734b03e995b2b9e SHA512 615429b43049be7deaf2334ff5c1cd73289d42569ccbf0dcfc3dc3cb5851b2f5b162c9a0f5c5466a9b2623eff311ff733e1edb322f9a818bf169f05b59fbd48f WHIRLPOOL 780f263c972b1b34bfe6901fddfc18441dc025487437ba5e25557d95264505254cac030bd1a6be687b1c9765dc842801a64df7d162c619e5cb1bcbf5b6f9601f
diff --git a/dev-python/node-semver/metadata.xml b/dev-python/node-semver/metadata.xml
new file mode 100644
index 000000000000..ea78022d7b82
--- /dev/null
+++ b/dev-python/node-semver/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>luigi.mantellini@gmail.com</email>
+    <name>Luigi Mantellini</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Python port of the semantic versioner for npm (semver).
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">node-semver</remote-id>
+    <remote-id type="github">podhmo/python-semver</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/node-semver/node-semver-0.1.1.ebuild b/dev-python/node-semver/node-semver-0.1.1.ebuild
new file mode 100644
index 000000000000..6285b77acb50
--- /dev/null
+++ b/dev-python/node-semver/node-semver-0.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python version of node-semver, the semantic versioner for npm"
+HOMEPAGE="
+	https://pypi.python.org/pypi/node-semver
+	https://github.com/podhmo/python-semver
+	https://github.com/npm/node-semver"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# https://github.com/podhmo/python-semver/issues/4
+	sed -i -e "/github.com/d" semver/tests/test_negative_range.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/nose-cover3/Manifest b/dev-python/nose-cover3/Manifest
new file mode 100644
index 000000000000..30adc4df9d4a
--- /dev/null
+++ b/dev-python/nose-cover3/Manifest
@@ -0,0 +1,5 @@
+DIST nose-cover3-0.1.0.tar.gz 14494 SHA256 81310a792285615418e749f6e7c60a4f2cfa6b2f13cf0d19bbf26b1f188444d1 SHA512 208dbef5bb46a403cb51a9490e68e2f06c6fb08c016a9e866959f5fef1d091ed5c3e502b4a579566f37016a0b665ff969a14b160c78e0c392452198134c20ef5 WHIRLPOOL 965bc90acf6163699550497666d89592c29567cd71647995fc82e39cb6d1187d1bebaae2bc853194153c27b2a64068cbd400ef67bdf8bdc1cfe9e03db20bf36e
+EBUILD nose-cover3-0.1.0-r1.ebuild 545 SHA256 b33240eb108a832edc84299f2df795c2243be5aa5a6088e244319e0ec3f0f246 SHA512 51f7321f41bfd14b132f10351f28b749f6e8983de3e22c41d6a1f6a07d0461ae4bbcda7fdeb3a26f858d99e37a88c57eb09556ea919c9708b5ee47888b31333a WHIRLPOOL 281bce28701de7211fb43b112d4a5468e33346d16957626f8d68e7b749b7822f24636cdb6f3415fcd608b649acb6fa7bffc66b34d8d4d2577a3ac53f3467ecaa
+MISC ChangeLog 2881 SHA256 aa5c9d58059004f23d5a4130c115539bf99cdb82410dc6919354231ba21f9672 SHA512 3edab42eb0f7afee0bb5f79692508e94b910c2c982077ac2ea085c938449e8d8cbc4f734f7b46ef646684088916c4a432d1b0f519c8a32e4bdc3e97c21af9257 WHIRLPOOL a7f0196a4189950f0d6ae7c5c13681b0fd379dc41e4f2b7007593248b39474957b9625554a0ee9e1d4f27241bd0cad7e6d69b55eba13f98c36c546111706f67a
+MISC ChangeLog-2015 1545 SHA256 829676a7337f0c5ae4b60755c529b72824de2e9f2751397341fcc90b18c512bf SHA512 f08609942ba003b9dafbe3917bb48b47b5693229bbc87e13ababc68d0178d58c7073d8058cb265ceeca2814e40dbff759639f62334243c4f015017596a898b74 WHIRLPOOL c8456f1a11837c2dba189e6f81dcf67ed7025eb264245d018cc9acf372160637dd6b288ee1659133cae594ca2609b7a5b0179af54d3b38bd6e2e36d0e0266b81
+MISC metadata.xml 380 SHA256 4ecd1ec46c6c3af845152cc1fb3b404ecd8498592451499831b70b10ca131247 SHA512 ab22ce51cf402314719b4d03710dcdebaba1cdcdc2eca7922937595728d1c003def562285840e7579385e4b35e9ef44b55fc76a0628959d225e91938888cd464 WHIRLPOOL eacaa0acbe2dee4e5e7e550caed1ed94709a0eed2af9877989851dbba7d2a0741683cb81f640d3b4cbb2d16778ec6b5ff3e785d21d36b9c29ea2f0a196b555e7
diff --git a/dev-python/nose-cover3/metadata.xml b/dev-python/nose-cover3/metadata.xml
new file mode 100644
index 000000000000..2d224f8c756e
--- /dev/null
+++ b/dev-python/nose-cover3/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">nose-cover3</remote-id>
+    <remote-id type="github">ask/nosecover3</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild b/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..203edd309576
--- /dev/null
+++ b/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
@@ -0,0 +1,21 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Coverage 3.x support for Nose"
+HOMEPAGE="https://github.com/ask/nosecover3 https://pypi.python.org/pypi/nose-cover3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/nose-descriptionfixer/Manifest b/dev-python/nose-descriptionfixer/Manifest
new file mode 100644
index 000000000000..ceca1dde4280
--- /dev/null
+++ b/dev-python/nose-descriptionfixer/Manifest
@@ -0,0 +1,4 @@
+DIST nose-descriptionfixer-0.0.4.tar.gz 2889 SHA256 4c74bd38f6fcf158b0681ea4ccb6b4f64c09867d039d5ef9a8c1856395dbac7c SHA512 c52e463282c1574ee35e96f680aeaebb6ec1b8ba1bfe58e387cf41d8708c60a7cb7501717de03a90f47db9c4b3aa3e5a4a57e4769d053fd4883e565369d8fce7 WHIRLPOOL aca6044c5dc11aa30ff9a20370687d2aa33af49e5576711405f7b233a2b5c0a0b02bef6310bcac4da814321872c5cb2f79b628e59550373a4e497f4b944a3b5b
+EBUILD nose-descriptionfixer-0.0.4.ebuild 519 SHA256 587b88f73d4258fdcf6e8bf2a389735e84abb36e72172808e2b9df59d1e85ad7 SHA512 4a175114b7e9a0263d4d1add3b9b0bd4e787042664397ab921dc9db44f9d1e323b94621f93adace0e10afc85daa818f96362e4bbecdfbe3bc1eee6a1c15093aa WHIRLPOOL 9a562dcefc02db2b4fd8c6c62d2787c116dc02b6b6e6e63f56eb57b842f5d2e9c574383df729dff725430fddce97d4ecb364d4d3767798f34128e0f8fc4aa354
+MISC ChangeLog 480 SHA256 a0c9328aa2edf5ccd19612a82576a93297eb82d155b9bac036aa79589daf0981 SHA512 1cd0334e8a6bcfb319569e678fcc56a746ceda81f44c9785eb46f4acb283f66831bd8cc5ab78e4e46569dfa42a395e9557a37dfe6d2c8adc9bdd2b69eef40908 WHIRLPOOL b01e4b076f2880780498f6cd94471aed1187d815a838707ae8b9f94cf549f4d09425e67bb3976e31fc1520ec0ac3c3e5c4bfb602923776b89c3dc5ac0584d5c0
+MISC metadata.xml 345 SHA256 89ad505f748ba1425b6d29bc2d68160abbb619e14a98b2491c3235e91885f4c6 SHA512 9df2f1d74b7674acca3e4cbe6b48cb5b00c5a8405f81d3299e5f204fa00f03960fb1ebcf089792c619802c14ea3b9aea1fe33de817e4f791d8a035739309ee07 WHIRLPOOL 1dd5a853be4cb484f35a30799f7d1c13daf8cc5388d3cfc61e16403faa57d83e3979443f9e366e244a2fc3f446bce0deaba09ac0beb17c774672f31b0bb7b03a
diff --git a/dev-python/nose-descriptionfixer/metadata.xml b/dev-python/nose-descriptionfixer/metadata.xml
new file mode 100644
index 000000000000..28cdeeee5594
--- /dev/null
+++ b/dev-python/nose-descriptionfixer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>klausman@gentoo.org</email>
+    <name>Tobias Klausmann</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">nose-descriptionfixer</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/nose-descriptionfixer/nose-descriptionfixer-0.0.4.ebuild b/dev-python/nose-descriptionfixer/nose-descriptionfixer-0.0.4.ebuild
new file mode 100644
index 000000000000..6407e5fdba1f
--- /dev/null
+++ b/dev-python/nose-descriptionfixer/nose-descriptionfixer-0.0.4.ebuild
@@ -0,0 +1,19 @@
+# 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 pypy3)
+
+inherit distutils-r1
+
+DESCRIPTION="Fix the way tests are described when the verbose flag is used"
+HOMEPAGE="https://pypi.python.org/pypi/nose-descriptionfixer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/nose-exclude/Manifest b/dev-python/nose-exclude/Manifest
new file mode 100644
index 000000000000..b03cd67d6e6d
--- /dev/null
+++ b/dev-python/nose-exclude/Manifest
@@ -0,0 +1,7 @@
+DIST nose-exclude-0.4.1.tar.gz 5930 SHA256 44466a9bcb56d2e568750f91504d1278c74eabb259a305b06e975b87b51635da SHA512 07dd869f948fb6e6f23dbecc316d08f23701f30ace3755e560f94deeb62cb2b5e1f5690477260d8d3a7f634e3e9959142a340f4fe0886e2ad12852444244ca3f WHIRLPOOL 5ef409e2ada229f7e7fc4c32ea86377709d305fa3a1f11543ba7d6aeee67558eeb554cdce06a9a67b7d9ae80d66ce90ca9a5608e4d54610eed8a9a02ea20e7da
+DIST nose-exclude-0.5.0.tar.gz 7359 SHA256 f78fa8b41eeb815f0486414f710f1eea0949e346cfb11d59ba6295ed69e84304 SHA512 2795f2f42430f8622fdeb46accf4a75853f8202ce1849852ec4b1a6e26aeb20accb8c2ec4faf3dad0ea174570fccd67d51140587ee9f47c905eed5d8a2963356 WHIRLPOOL e674cc6f327f33bb85f97fa3d5c82c3cc55f4d812e2e92d5de32349ac378fb0d2c83328d49ef236c0eee88baee02c5b7c38fbc8d93ce14a8fa93c2b7064b05e0
+EBUILD nose-exclude-0.4.1.ebuild 580 SHA256 41fb8d24619058bca34ed00818908d6158d6221d06720f407ce947c42ca6c650 SHA512 1f816328503d4d01a025ab7d2b5c440e6946a184e9503e6848538286202ae4a4388f9b2095c371f9b6aeb862bc35979c6cacaddff90161aa8701266f198025ed WHIRLPOOL 45831e5a4509e2fd09bdc2b73b8508d62a7cd85c54a02e23ef5df96d867f2296903431d16f294fb7b64bc425f2e0efefcaa36ec094c00997ab5840abba5b13ee
+EBUILD nose-exclude-0.5.0.ebuild 590 SHA256 11adb2dae8053f89d3995e91da49c6d789bf0fc2f0d45379b4fdbdf9cb31d051 SHA512 e9a4ad224ada674bd3410c24b484a56aac256e08302fabc6fa5b51bfbadec017371760b71355d05feaa3013afc2c50d2f1860c025bfc0f179acac66717a37a34 WHIRLPOOL 33d0a9b7891b48ab9e54de665753b87bb053782e7c47c76a424f33c32f925501f865a52cf8c5c14af71a8b0a933ee0c4769c3f6ab6427eaa3f83907195d2619a
+MISC ChangeLog 6713 SHA256 fa1ab385e3cc07b90d92e0b155af275f274d97ab590dc24898fae74e08f399b2 SHA512 b63791d41dc2b7f0f129db4ec2cdfc0fb891664f89cfe400b029a69cc3fc82bd039de6132a13ef99511d80572913bb022539cd44c65d35deefdc83a1af1bcfd8 WHIRLPOOL 2e57eda693f394d63687d90222b752979edbac1fbbb42ce38c01446fbf4327a88201f76c0d91e13ad6253c3f8d8d953073fe49ea7d644c683afbadaca410b217
+MISC ChangeLog-2015 2087 SHA256 1b93ab7ba96f38bc6c9a899b855671fc3e468a92095de30c2afb10f0ab2d4e91 SHA512 230b3d6943f3acedd29791f3ddc145e3d7e72ebc00fc31d5475ccf7460194a6320e17b860e74c7abd9b570d14ac64571beb0f2f935954a6ab235e39abe42089c WHIRLPOOL 91ef001d578486fea86b3db94a0adf7b9a1b6b38dddb1a8046bb6d199bc0843978328e81ebe4f1468017a56ee0bd9230cf463f686b5583dfc918490e21a9dece
+MISC metadata.xml 680 SHA256 7e07efdc89d5dda28fdf52311a6896d0c4806757ee4f5dadd2b1a082c0a9d29f SHA512 77c4bd6bf1d654c9b7a5f22235a56a4861b5cd784dba4459916580e623ef5017c52a79af949bc9fcdcf9ac66f8f84d8646a61393f5c45c5d732693486fac5ca7 WHIRLPOOL 42d630608eb26129b56b1ddbf778e5741654c4c91060beec0ec0da19058d33fb72050f2dd111c5f9073b9ffa09b9ed7469b6d0bae8438b63b54088232bc7dfdd
diff --git a/dev-python/nose-exclude/metadata.xml b/dev-python/nose-exclude/metadata.xml
new file mode 100644
index 000000000000..03b1f31309dd
--- /dev/null
+++ b/dev-python/nose-exclude/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Exclude specific directories from nosetests runs.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">nose-exclude</remote-id>
+    <remote-id type="bitbucket">kgrandis/nose-exclude</remote-id>
+    <remote-id type="github">kgrandis/nose-exclude</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild b/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild
new file mode 100644
index 000000000000..f6bb628dd106
--- /dev/null
+++ b/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild
@@ -0,0 +1,23 @@
+# 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="Exclude specific directories from nosetests runs"
+HOMEPAGE="https://github.com/kgrandis/nose-exclude"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/nose-exclude/nose-exclude-0.5.0.ebuild b/dev-python/nose-exclude/nose-exclude-0.5.0.ebuild
new file mode 100644
index 000000000000..a2d03e92203d
--- /dev/null
+++ b/dev-python/nose-exclude/nose-exclude-0.5.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Exclude specific directories from nosetests runs"
+HOMEPAGE="https://github.com/kgrandis/nose-exclude"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/nose-parameterized/Manifest b/dev-python/nose-parameterized/Manifest
new file mode 100644
index 000000000000..d45c9c71503b
--- /dev/null
+++ b/dev-python/nose-parameterized/Manifest
@@ -0,0 +1,4 @@
+DIST nose-parameterized-0.5.0.tar.gz 10363 SHA256 a11c41b0cf8218e7cdc19ab7a1bdf5c141d161cd2350daee819473cc63cd0685 SHA512 812e3e0a44f1db323f9c134b7438ea5e2c63232b04dc4d8aa59d153253183471784fd4960ffb18f23e14c398e4633515ff933bdfbfdb6954c44af97235d3cf91 WHIRLPOOL d25ff1ef662fe6544176ed61a82cbf4725a377d7bb28dc9215623a250d63b4cc0eaff03e193d80b9f48dccc055ea3ba62ece871e10f12e5cc3f353e110d3db00
+EBUILD nose-parameterized-0.5.0.ebuild 559 SHA256 b0c7914d126381b496e44a6772325cfed1839b20c8745e6bf1665ffc39b4de2e SHA512 dc425e274e074efdeb5de2ef3dbdf03bbcda4863b75f6d23ff73b90d18b2279dbab5d6a5df77c46c67eac8efa0cc9acc2f44fd907553120d1e1d00f7e5eca779 WHIRLPOOL 19acd2bc560e581513e87b8c884d1b15b443f31ad5f356d99d37e0a30de78ec90e06e85d29e9bd12799d68cf3bbcc495d681d9851ba85ddb23e08963dee5b8be
+MISC ChangeLog 348 SHA256 cfbfcada56769bca5fd57c1348f6e02c449ee8faef4d709b69f61bf123d69f48 SHA512 5da25fd56d21be1297b9344a89232aac75f9e43299379b4a8dcb7035c754422d4f49293f99582706e8f2877f059c3ddb7715d30a864d2de15e77aa883d3ecfe8 WHIRLPOOL 048a994628d2132317dc368ab922e1dded28fedfb5c658bcde86006f299858e757999ecaa2d31b4e6c26b47f27baf78701e8ae0a818c2ab12f41baf934da7b62
+MISC metadata.xml 557 SHA256 c28efc0fc68cbeb3de1a3b1057729f1cfe4e9aedc0c8ae200c1b80c21ff786ad SHA512 8b5b5040fc5c105f62c02616b5493f3ca7a1fccfb769f1a94dbf24fcbaac62b908005d119b49d115400c9d4b6a0c5e6a5cca2cd368281d8e1678d26750fe2f86 WHIRLPOOL 0dc42d6c7767556934bde65b07934835eaf87dc30911081167da71fdd02b7e1d44e34ccb10e56e50a83fedf4920dd260cfdac8e97da0a91bf35fb749a0c17d42
diff --git a/dev-python/nose-parameterized/metadata.xml b/dev-python/nose-parameterized/metadata.xml
new file mode 100644
index 000000000000..d88277fdfa58
--- /dev/null
+++ b/dev-python/nose-parameterized/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Parameterized testing for nose, parameterized testing for py.test, parameterized testing for unittest.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">nose-parameterized</remote-id>
+    <remote-id type="github">wolever/nose-parameterized</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/nose-parameterized/nose-parameterized-0.5.0.ebuild b/dev-python/nose-parameterized/nose-parameterized-0.5.0.ebuild
new file mode 100644
index 000000000000..fc355afccaf6
--- /dev/null
+++ b/dev-python/nose-parameterized/nose-parameterized-0.5.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Parameterized testing with any Python test framework"
+HOMEPAGE="https://github.com/kgrandis/nose-exclude"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests -v || die
+}
diff --git a/dev-python/nose-show-skipped/Manifest b/dev-python/nose-show-skipped/Manifest
new file mode 100644
index 000000000000..9d9d47bd8700
--- /dev/null
+++ b/dev-python/nose-show-skipped/Manifest
@@ -0,0 +1,4 @@
+DIST nose-show-skipped-0.1.tar.gz 1768 SHA256 a202f9c4b35107e9e1d6d8438eff4a930cb31a7e17517a69b319448f136815ce SHA512 b6f3cbc8fdc6af7f6298ad54a5b06bd053d27197368eef1e006aff438d517dba549154eb3be35996b0bd1c291537729438f52709b76c507e20c496b6e504f5df WHIRLPOOL 9f83b6649ff7f2fbd47b35b5b27c63ac6a732615c773f43b054436fd9df40c86b49b6d7ee3af6473edffd33f2b4498abdd799f5d2d6baa24f144a93c86f51a1e
+EBUILD nose-show-skipped-0.1.ebuild 632 SHA256 9c4c94491fcd6f377bf60c0c0fa7eb50126930270cacdd4baa837d52ef05b508 SHA512 15cdd0863f09a4be6f4406bca847c7ef884da9513e89bcf60fce227e71d08dd0f4d7c3dc790c391479d1acd4210a073e78b5d5b1ed00cd3ce99bd85cf6ccc078 WHIRLPOOL 0e86199fa5f8f913402ecc91e9ef543c8dd4a14afcaeac90fe50ec9cf64aeb8592c966dda7bf1f6a3e73338805044e25d2b735bc3dfea263736d42d03c03b4a6
+MISC ChangeLog 1525 SHA256 31b879073c746aa649779257f470243112d05c35b55a11a39c55bd61cca9c985 SHA512 efb422f18927374175d801bedbe0eee0a42db925788671698af11313f33da7738ed4071661ebe52241e5e8a3e0cdf13469a425f2d898b282511cda8ca5f6c85a WHIRLPOOL 41229457e7d4308672b264a5a6fcd812d11aab8e92b5e63d936f466436739da21f69a8513a4a0be91d75cc57dbd95f8034d2381cf56941cd7d0b6df663909c43
+MISC metadata.xml 521 SHA256 67ec191f33624db3eb564216f3bf52cf4f66722655d25c5e2f6d914c936b190a SHA512 de78277716b856994885a2eb0d7906f3643e1b76ad263385063770581c8c11cdea081cdcd1724182ddef0c799438f5bf94b7de885b4a3f314df6efc935aae2a4 WHIRLPOOL 0574b6e0f5159bf25335dad4a319d8fa7aeda83343139b1a9facf150cea67d46d4950613a7015dd652aff887c3202f7af3d2ba20a287e1364146639f1d96a3ee
diff --git a/dev-python/nose-show-skipped/metadata.xml b/dev-python/nose-show-skipped/metadata.xml
new file mode 100644
index 000000000000..25a895dff504
--- /dev/null
+++ b/dev-python/nose-show-skipped/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">nose-show-skipped</remote-id>
+    <maintainer status="unknown">
+      <email>cpcloud@gmail.com</email>
+      <name>Phillip Cloud</name>
+    </maintainer>
+    <remote-id type="github">cpcloud/nose-show-skipped</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild b/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
new file mode 100644
index 000000000000..584622da603d
--- /dev/null
+++ b/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A nose plugin to show skipped tests and their messages"
+HOMEPAGE="https://github.com/cpcloud/nose-show-skipped http://pypi.python.org/pypi/nose-show-skipped"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/nose-testconfig/Manifest b/dev-python/nose-testconfig/Manifest
new file mode 100644
index 000000000000..82ea69a72d01
--- /dev/null
+++ b/dev-python/nose-testconfig/Manifest
@@ -0,0 +1,7 @@
+DIST nose-testconfig-0.10.tar.gz 9390 SHA256 54328a20ee8e8f877ba31af9ba76f29aa8254581b0ba57d8e306f37b8e1a94c8 SHA512 6bf05e0b82e0b47919da6e7f421c0c06737f9cc6d78eda49ca3d8b206d47313525a57af6c04760cdefc4e7d3288a2c10eaba9666d30a4f8135ed9856d219d7ca WHIRLPOOL 342d1c29a2e7f40f4e39157e58449c4e08b445109481d7711d04a6d174902768c857bcd1ea16a74a3b7f6b9de91794614ceb26401439af55d7601e3ed05686f7
+DIST nose-testconfig-0.9.tar.gz 7614 SHA256 bb6f1dd2dbd3e54a6c456110fb6dced449b5ad5262af712d595c123e4f8c34d3 SHA512 411630f9af56955e5bd87efaf2db0817442f78dc61ea64a29ac186f0a71d23d81220f68bab18ceb7d3bf201bc441b522bf9acff21b541905a5a4397280444a07 WHIRLPOOL e69abb0eb794ed72f54010268a4eeb7356b374efa52caf60cc637a904836ca703b04d36bbbdbb6bc5eefaee6e7d1990cc7d52228864611c91ef631e09624a25b
+EBUILD nose-testconfig-0.10.ebuild 625 SHA256 ede59a2cc5a309d5297821af4431836258da5f61b362bc8ca289d6b3a5599aef SHA512 1a7a2154f75b76f319f946110e95407b08cb99d1527dc4a305d44e1a6634a243e5a80045fefaf838a9f04ce627c7bd13a73bcadf8647b09e20c1947d1880e1ee WHIRLPOOL ade49f99ca4bb93ae00cde56164f2e9f5be45be9545d19e4f4b3e9ca91826d53f5f99cc7e62ee8f6876f84952037748a3de012e319316809ff4976e016aa275a
+EBUILD nose-testconfig-0.9.ebuild 617 SHA256 566209c91a7cf9812398fa8a863f1b2ee32b535520644c9306bb8c4ef4f62845 SHA512 a76cc9501093602bc9e2ef48e77b14c9187d34b0681565a175c91762be02ae79b29fea36639501d772e4f4394d0cc6ab8c95f29d9e8f24d23c0dde356d16a8a2 WHIRLPOOL d0d975ff587feb0c9e7b16dfcae378898cd71e66530e1cbafed790d188587632795b732e147054adc6f5d4d557e57eabae9532a9b154299cb9a9a84297e4b97e
+MISC ChangeLog 2924 SHA256 b9c909c53487d8c7fa9c3476d8f06dce7a7354766e5fbb0f68f63203364b856d SHA512 ee3dccb6d7957653a35cdb73a2b8ce2c165301299fbfaad3b5ddb0b78bfc2e0e1009272c0acf27068081188ecfb00c82694848ab01887f3adb3387aad885e0d9 WHIRLPOOL 31ebc1daabcf02bde9d6d27c86d51a8c29234c3d9e284fe25ae36895199464c81a60c84f18a08717520a80c396b9fefd29e01509bb4de52a2a3e9f799ad2ab0a
+MISC ChangeLog-2015 949 SHA256 35904cfe15d445445e8b879839bb9da97193540dffab23842e9b83f021df1f6d SHA512 d442d3d827e8de3e548938d4f38cc0185a5ccf4a53e8a5fa07fa16a83c40ef1d9698c781100bf906a2d6c466092f3c2ff5f4716728d0f2629be3812223412c9a WHIRLPOOL 5a7eda3d249f7ce865ea6a3878a97de558958fe9a540c304de20241beed7ae28abf1313a7e961d9e03fb841190de7c0a8ba84710f7ed0d7f42ae1fd60ec0219f
+MISC metadata.xml 402 SHA256 a182e22b26f196cf92ba5f88159626d84b75379b8f5f6185492a0adb4c56e44f SHA512 dcfbf6218188c35480b7424f5e661f54b28bead28a220402702890e4890063b1510c622a7d73a241b289c27bc75563bd25685affeb618b95f538623fc6559624 WHIRLPOOL 249209826a174e167806e779f44fc4c533b33a177d1a262203c876a4db9155f9ab5bd35080bdad46c737efad1cdac9a718f23fa7ef4ecbede9b71d76a2996b2c
diff --git a/dev-python/nose-testconfig/metadata.xml b/dev-python/nose-testconfig/metadata.xml
new file mode 100644
index 000000000000..78985d14830d
--- /dev/null
+++ b/dev-python/nose-testconfig/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="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">nose-testconfig</remote-id>
+    <remote-id type="bitbucket">jnoller/nose-testconfig</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/nose-testconfig/nose-testconfig-0.10.ebuild b/dev-python/nose-testconfig/nose-testconfig-0.10.ebuild
new file mode 100644
index 000000000000..14fa44305e2a
--- /dev/null
+++ b/dev-python/nose-testconfig/nose-testconfig-0.10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy  )
+
+inherit distutils-r1
+
+DESCRIPTION="Test Configuration plugin for nosetests"
+HOMEPAGE="https://bitbucket.org/jnoller/nose-testconfig"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="dev-python/nose"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DOCS=( docs/index.txt )
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/nose-testconfig/nose-testconfig-0.9.ebuild b/dev-python/nose-testconfig/nose-testconfig-0.9.ebuild
new file mode 100644
index 000000000000..778020be628b
--- /dev/null
+++ b/dev-python/nose-testconfig/nose-testconfig-0.9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy  )
+
+inherit distutils-r1
+
+DESCRIPTION="Test Configuration plugin for nosetests"
+HOMEPAGE="https://bitbucket.org/jnoller/nose-testconfig"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="dev-python/nose"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DOCS=( docs/index.txt )
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
new file mode 100644
index 000000000000..1ba9a6a091f0
--- /dev/null
+++ b/dev-python/nose/Manifest
@@ -0,0 +1,10 @@
+AUX nose-1.3.7-coverage-4.1-support.patch 950 SHA256 cb035a62795d7153ab1d58580e296cf3b4a6b7329141d327b70d47c75ecb5485 SHA512 2d1512ca1f0572e4ffb17ac4b964e391ed9c5b5bdb78eac7a1710d51804f8c33c6ffbeb9b85565dc2d4162c5a912c864f15c7857e85cb294c1e0712ae540e983 WHIRLPOOL 6ad1406603a6313cd9e1129245ec525befca44cae69649da4717f5b3fb05f3dd0f6ad0c0a656cef9030c2e14a9274ceb86d43d17076d275c9573f988da83416e
+AUX nose-1.3.7-python-3.5-backport.patch 1802 SHA256 27ad021497110ca7714d76d3d33078ee873e9f1e381d350cc57f30a1ebca66c1 SHA512 032c4c291edd76bb594329578e57483942ced2a46c3f6cd4e914d905f3894e420cc4da0ba2a63c266c81dd4d8f40b8df180f56ac75cb3c5e83e0309bbac573b2 WHIRLPOOL c39301a51286d54a376d928a0c3bad9d1d7be9aaf7662739f8865784d659f9d3b31a8c6321c6ba5268e6eba6d0f5ef3839622885818a08595ed3c43addebf246
+AUX nose-1.3.7-python-3.6-test.patch 3289 SHA256 a7dd82d60092a7880175ca1f79db0d2a980d595093e81457e55219b784fe891e SHA512 0be6e49f08a4098b4c5dd1d9678e757c8f1f317fb13bd355a035c44bcdd9cd043be1755bb97c4ca78397985f07f6fc486ddd10cb56dd8d8774d631eebcc81127 WHIRLPOOL 3d3d3665b27b36b389a350ab67be4437b1914cb8c377f7203fe624a821c288eb85afdd678e6d413093aa7905f5d04e9af82daac9262aba63cfd1527ece2aeefd
+DIST nose-1.3.7.tar.gz 280488 SHA256 f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62 WHIRLPOOL 68684b12e18d41b1f49ba3e832adf8a03b3b84ce530f0bde34f8c40c84f38046aac2777090472fefe87ba7abe3fdffa4cdcad74e3b717fcb9dfe932a0657b965
+EBUILD nose-1.3.7-r1.ebuild 2473 SHA256 eee7fe1267d995d4c1259974155c2f250a2e454717a7a0e676e6067581567574 SHA512 a3c1896c7d8d32ba892e0c298df3a034e75ea4139eeb8128dcf971ed8af0378a9630e6dd4991079e8f8a5b7a4362177d32432534bf89385c92689b6aa0a61c38 WHIRLPOOL 14136edec51e50872def78a2e02644fefbda904392715b1e6dc191a1240f821e45cd40c54d89788347fe03508d1c15026fd43724b570ed8546820296f796dcf8
+EBUILD nose-1.3.7-r3.ebuild 2787 SHA256 3e6caaf4e46fb2cae5cd0fcf8d7b4a5d3a1c7c00cd4b772d1d5f16ef1bfce2dc SHA512 de7830662cd825cb9f629c71afad9334a79be1c9d67d8b6f3b5f2a93726f9f596b70b8ee85941c5e26d7a750b60c2ab63997d7f9a86694b8f3b7b91cefddd953 WHIRLPOOL 4ac9a8c469d4190249d81d42c8b2bdd17cbd4d00a74ae5474168b2bdcc3aa51493e9daab52cb567a6b4b1f6715d6a89b8ea82c512dce315091c7b57d79302398
+EBUILD nose-9999.ebuild 2237 SHA256 aee52e64b3ba1ee42162b7c4840cebd5b9ea1363ef8ca3cf8444c10afcb58db6 SHA512 fa26978883453067a1452c62927f96606d7efb71c9934bcab8f835f437c32436610efaccf268d8dd87c169e3ec47d000b5a318dbabf77f5b34e93f5fecfa4df6 WHIRLPOOL 94096a9aa966fa1ed824fb2bd0d203349a03c547c308c062ebb229239558c3f328ad1e4710639b4552b7038ef7bef01d360c4839bc164ae040ab4cd1a87aed1d
+MISC ChangeLog 9422 SHA256 f9451454433788e8be79ee99313b36698cef3954bb5f26af503e4cf921cc7fdf SHA512 a6a7e317cf54d134811ecc3cd3431c5a5880f8a3678489f51931d4eda8393e6de66d5b79d328c76e52eb5d68fa09e482e6996a139704a39cd447da99e79662b5 WHIRLPOOL 9ac5675a7d89537f153d8866b55524c2af9e568160c9ac110aaea25cef950161d1b50c9589e6ab47b9855c2f778d2985b79a1d3ad7d429b2eb46c661db410702
+MISC ChangeLog-2015 19074 SHA256 ffca2b5bc4edd1625d2b044124806144bd435bea8b7fd11f0f9e24b997ad8331 SHA512 31c15a6f30578d706c6bda286a475d2b401fee7bddbcebbef98daf095ffe877a83df10b32df0c0c9c15bc8535db77ab76e8e3a7b14ec08db9fe92dd121ce532e WHIRLPOOL 777c324dd9689252f366cc50e0edd0a6072ac3057f39f3bcda2234114e4eb6f8905673549921c2abe9a2ff483d7bfe29978c47a2df2ff96620dd2200b71dcd5c
+MISC metadata.xml 432 SHA256 53e82e318d1263b44bf3470627bd8a7c806023dbb71e777098327cc523dffc1c SHA512 d4ff137034358979e2b59fa11e18ff17ade90c1c2127f5c769a58c8867a5de1a4736c2d22cad063b9119067578feb6401305f6acfd3e05d897b3f01f273e5530 WHIRLPOOL 710662c65d421dbfe7def2e85d3099ff023af5a96417c78f105d166dc0ddeeb7b005aa0d1ed4fb234a32c38d257723a79290d23278886759b41744fbd7e2fdc7
diff --git a/dev-python/nose/files/nose-1.3.7-coverage-4.1-support.patch b/dev-python/nose/files/nose-1.3.7-coverage-4.1-support.patch
new file mode 100644
index 000000000000..87577871b613
--- /dev/null
+++ b/dev-python/nose/files/nose-1.3.7-coverage-4.1-support.patch
@@ -0,0 +1,20 @@
+--- a/nose/plugins/cover.py	2016-10-11 15:51:26.990868010 +0200
++++ b/nose/plugins/cover.py	2016-10-11 15:52:28.261102027 +0200
+@@ -187,7 +187,7 @@
+                     for name, module in sys.modules.items()
+                     if self.wantModuleCoverage(name, module)]
+         log.debug("Coverage report will cover modules: %s", modules)
+-        self.coverInstance.report(modules, file=stream)
++        self.coverInstance.report(modules, file=stream, show_missing=True)
+ 
+         import coverage
+         if self.coverHtmlDir:
+@@ -207,7 +207,7 @@
+         # make sure we have minimum required coverage
+         if self.coverMinPercentage:
+             f = StringIO.StringIO()
+-            self.coverInstance.report(modules, file=f)
++            self.coverInstance.report(modules, file=f, show_missing=True)
+ 
+             multiPackageRe = (r'-------\s\w+\s+\d+\s+\d+(?:\s+\d+\s+\d+)?'
+                               r'\s+(\d+)%\s+\d*\s{0,1}$')
diff --git a/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch b/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch
new file mode 100644
index 000000000000..8d2f2f05dc29
--- /dev/null
+++ b/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch
@@ -0,0 +1,54 @@
+From 8e7ad3d50012688ca029d126cbc88251831fea88 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57@gmail.com>
+Date: Mon, 1 Feb 2016 00:05:30 +0300
+Subject: [PATCH 1/2] Set __qualname__ equal to __name__ on derived classes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+To make output on Python ≥ 3.5 the same as on previous Python versions.
+
+This fixes #928.
+---
+ functional_tests/test_load_tests_from_test_case.py | 1 +
+ nose/util.py                                       | 1 +
+ unit_tests/test_xunit.py                           | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/functional_tests/test_load_tests_from_test_case.py b/functional_tests/test_load_tests_from_test_case.py
+index 42f8563..13d0c8a 100644
+--- a/functional_tests/test_load_tests_from_test_case.py
++++ b/functional_tests/test_load_tests_from_test_case.py
+@@ -29,6 +29,7 @@ def setUp(self):
+                 pass
+             def tearDown(self):
+                 pass
++        Derived.__qualname__ = Derived.__name__
+         # must use nose loader here because the default loader in 2.3
+         # won't load tests from base classes
+         l = loader.TestLoader()
+diff --git a/nose/util.py b/nose/util.py
+index bfe1658..80ab1d4 100644
+--- a/nose/util.py
++++ b/nose/util.py
+@@ -643,6 +643,7 @@ class C(cls):
+         pass
+     C.__module__ = module
+     C.__name__ = cls.__name__
++    C.__qualname__ = cls.__name__
+     return C
+ 
+ 
+diff --git a/unit_tests/test_xunit.py b/unit_tests/test_xunit.py
+index 944d285..261436b 100644
+--- a/unit_tests/test_xunit.py
++++ b/unit_tests/test_xunit.py
+@@ -16,6 +16,7 @@ def mktest():
+     class TC(unittest.TestCase):
+         def runTest(self):
+             pass
++    TC.__qualname__ = TC.__name__
+     test = TC()
+     return test
+ 
+
diff --git a/dev-python/nose/files/nose-1.3.7-python-3.6-test.patch b/dev-python/nose/files/nose-1.3.7-python-3.6-test.patch
new file mode 100644
index 000000000000..eda10ff036cf
--- /dev/null
+++ b/dev-python/nose/files/nose-1.3.7-python-3.6-test.patch
@@ -0,0 +1,67 @@
+From 84bb82245d10798825439dc13846eb0538d84239 Mon Sep 17 00:00:00 2001
+From: Tomas Orsava <torsava@redhat.com>
+Date: Mon, 12 Dec 2016 14:35:50 +0100
+Subject: [PATCH] Fix compatibility with Python 3.6
+
+Python 3.6 returns ModuleNotFoundError instead of the previous ImportError.
+https://github.com/nose-devs/nose/pull/1029
+---
+ functional_tests/test_loader.py           |  2 +-
+ functional_tests/test_withid_failures.rst | 12 ++++++------
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/functional_tests/test_loader.py b/functional_tests/test_loader.py
+index 104f220..906e2ba 100644
+--- a/functional_tests/test_loader.py
++++ b/functional_tests/test_loader.py
+@@ -372,7 +372,7 @@ def test_failed_import_module_name(self):
+         assert res.errors, "Expected errors but got none"
+         assert not res.failures, res.failures
+         err = res.errors[0][0].test.exc_class
+-        assert err is ImportError, \
++        assert issubclass(err, ImportError), \
+             "Expected import error, got %s" % err
+ 
+     def test_load_nonsense_name(self):
+diff --git a/functional_tests/test_withid_failures.rst b/functional_tests/test_withid_failures.rst
+index cf09d4f..cb20886 100644
+--- a/functional_tests/test_withid_failures.rst
++++ b/functional_tests/test_withid_failures.rst
+@@ -7,16 +7,16 @@
+     >>> support = os.path.join(os.path.dirname(__file__), 'support', 'id_fails')
+     >>> argv = [__file__, '-v', '--with-id', '--id-file', idfile, support]
+     >>> run(argv=argv, plugins=[TestId()]) # doctest: +ELLIPSIS
+-    #1 Failure: ImportError (No module ...apackagethatdoesntexist...) ... ERROR
++    #1 Failure: ... (No module ...apackagethatdoesntexist...) ... ERROR
+     #2 test_b.test ... ok
+     #3 test_b.test_fail ... FAIL
+     <BLANKLINE>
+     ======================================================================
+-    ERROR: Failure: ImportError (No module ...apackagethatdoesntexist...)
++    ERROR: Failure: ... (No module ...apackagethatdoesntexist...)
+     ----------------------------------------------------------------------
+     Traceback (most recent call last):
+     ...
+-    ImportError: No module ...apackagethatdoesntexist...
++    ...: No module ...apackagethatdoesntexist...
+     <BLANKLINE>
+     ======================================================================
+     FAIL: test_b.test_fail
+@@ -35,14 +35,14 @@ Addressing failures works (sometimes).
+     >>> argv.append('1')
+     >>> _junk = sys.modules.pop('test_a', None) # 2.3 requires
+     >>> run(argv=argv, plugins=[TestId()]) #doctest: +ELLIPSIS
+-    #1 Failure: ImportError (No module ...apackagethatdoesntexist...) ... ERROR
++    #1 Failure: ... (No module ...apackagethatdoesntexist...) ... ERROR
+     <BLANKLINE>
+     ======================================================================
+-    ERROR: Failure: ImportError (No module ...apackagethatdoesntexist...)
++    ERROR: Failure: ... (No module ...apackagethatdoesntexist...)
+     ----------------------------------------------------------------------
+     Traceback (most recent call last):
+     ...
+-    ImportError: No module ...apackagethatdoesntexist...
++    ...: No module ...apackagethatdoesntexist...
+     <BLANKLINE>
+     ----------------------------------------------------------------------
+     Ran 1 test in ...s
diff --git a/dev-python/nose/metadata.xml b/dev-python/nose/metadata.xml
new file mode 100644
index 000000000000..1b59d602e352
--- /dev/null
+++ b/dev-python/nose/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">nose</remote-id>
+    <remote-id type="github">nose-devs/nose</remote-id>
+    <remote-id type="bitbucket">jpellerin/nose</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/nose/nose-1.3.7-r1.ebuild b/dev-python/nose/nose-1.3.7-r1.ebuild
new file mode 100644
index 000000000000..04357fb0e9ce
--- /dev/null
+++ b/dev-python/nose/nose-1.3.7-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
+HOMEPAGE="
+	https://pypi.python.org/pypi/nose
+	https://nose.readthedocs.io/en/latest/
+	https://bitbucket.org/jpellerin/nose"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+
+REQUIRED_USE="
+	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+RDEPEND="
+	dev-python/coverage[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
+	test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
+
+PATCHES=( "${FILESDIR}"/${P}-python-3.5-backport.patch )
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_prepare_all() {
+	# Tests need to be converted, and they don't respect BUILD_DIR.
+	use test && DISTUTILS_IN_SOURCE_BUILD=1
+
+	# Disable tests requiring network connection.
+	sed \
+		-e "s/test_resolve/_&/g" \
+		-e "s/test_raises_bad_return/_&/g" \
+		-e "s/test_raises_twisted_error/_&/g" \
+		-i unit_tests/test_twisted.py || die "sed failed"
+	# Disable versioning of nosetests script to avoid collision with
+	# versioning performed by the eclass.
+	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
+		-i setup.py || die "sed2 failed"
+
+	# Prevent un-needed d'loading during doc build
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local add_targets=()
+
+	if use test; then
+		add_targets+=( egg_info )
+		python_is_python3 && add_targets+=( build_tests )
+	fi
+
+	distutils-r1_python_compile ${add_targets[@]}
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	"${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install --install-data "${EPREFIX}/usr/share"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && HTML_DOCS=( doc/.build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/nose/nose-1.3.7-r3.ebuild b/dev-python/nose/nose-1.3.7-r3.ebuild
new file mode 100644
index 000000000000..e97460f08d2e
--- /dev/null
+++ b/dev-python/nose/nose-1.3.7-r3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
+HOMEPAGE="
+	https://pypi.python.org/pypi/nose
+	https://nose.readthedocs.io/en/latest/
+	https://bitbucket.org/jpellerin/nose"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+
+REQUIRED_USE="
+	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+RDEPEND="
+	dev-python/coverage[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
+	test? ( || ( $(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{4,5,6})
+			$(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7)
+		 ) )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-python-3.5-backport.patch
+
+	# Patch against master found in an upstream PR, backported:
+	# https://github.com/nose-devs/nose/pull/1004
+	"${FILESDIR}"/${P}-coverage-4.1-support.patch
+
+	"${FILESDIR}"/${P}-python-3.6-test.patch
+)
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_prepare_all() {
+	# Tests need to be converted, and they don't respect BUILD_DIR.
+	use test && DISTUTILS_IN_SOURCE_BUILD=1
+
+	# Disable tests requiring network connection.
+	sed \
+		-e "s/test_resolve/_&/g" \
+		-e "s/test_raises_bad_return/_&/g" \
+		-e "s/test_raises_twisted_error/_&/g" \
+		-i unit_tests/test_twisted.py || die "sed failed"
+	# Disable versioning of nosetests script to avoid collision with
+	# versioning performed by the eclass.
+	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
+		-i setup.py || die "sed2 failed"
+
+	# Prevent un-needed d'loading during doc build
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local add_targets=()
+
+	if use test; then
+		add_targets+=( egg_info )
+		python_is_python3 && add_targets+=( build_tests )
+	fi
+
+	distutils-r1_python_compile ${add_targets[@]}
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	"${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install --install-data "${EPREFIX}/usr/share"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && HTML_DOCS=( doc/.build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/nose/nose-9999.ebuild b/dev-python/nose/nose-9999.ebuild
new file mode 100644
index 000000000000..3c9d5bb2829d
--- /dev/null
+++ b/dev-python/nose/nose-9999.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
+HOMEPAGE="
+	https://pypi.python.org/pypi/nose
+	https://nose.readthedocs.io/en/latest/
+	https://github.com/nose-devs/nose"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/nose-devs/${PN}.git"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc examples test"
+
+REQUIRED_USE="
+	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+RDEPEND="
+	dev-python/coverage[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
+	test? ( $(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{4,5,6}) )"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_prepare_all() {
+	# Tests need to be converted, and they don't respect BUILD_DIR.
+	use test && DISTUTILS_IN_SOURCE_BUILD=1
+
+	# Disable tests requiring network connection.
+	sed \
+		-e "s/test_resolve/_&/g" \
+		-e "s/test_raises_bad_return/_&/g" \
+		-e "s/test_raises_twisted_error/_&/g" \
+		-i unit_tests/test_twisted.py || die "sed failed"
+	# Disable versioning of nosetests script to avoid collision with
+	# versioning performed by the eclass.
+	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
+		-i setup.py || die "sed2 failed"
+
+	# Prevent un-needed d'loading during doc build
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local add_targets=()
+
+	if use test; then
+		add_targets+=( egg_info )
+		python_is_python3 && add_targets+=( build_tests )
+	fi
+
+	distutils-r1_python_compile ${add_targets[@]}
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	"${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install --install-data "${EPREFIX}/usr/share"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && HTML_DOCS=( doc/.build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/nose2/Manifest b/dev-python/nose2/Manifest
new file mode 100644
index 000000000000..be6a5e6c19cd
--- /dev/null
+++ b/dev-python/nose2/Manifest
@@ -0,0 +1,6 @@
+DIST nose2-0.6.4.tar.gz 134636 SHA256 56831c4caa47e2939f555b33e2c44170c1fab4d13526af838d9d80bef9e091b6 SHA512 4161231ecf195a3c5172f8bea2002f9cf4d55ee4f976f512b1ae758ebe8389f41520594da7ad2b21cfbf998be388993281e126363d24ee00c948d6c57278333a WHIRLPOOL 2905a358ec07d67ff64882f73527044a6bfbd70cb11865ee274b91675c3939b7b018d8dceb667396afae9ed425c14bd6ae3317d97fc2e35931302e6965054c6f
+DIST nose2-0.6.5.tar.gz 134808 SHA256 13c00fd49fe2057688a68860f5de195e50ec85748f102346c74e7692b36d2c23 SHA512 fc84aa19d486ff1441dd43666182212e4a05b3be054f3c8967e36e624c08ee6eb10b01bba45b5f5dbbd38cfd057d53877e0bc0d9aba59b842688a5d4ec944b40 WHIRLPOOL b08589fe1b1467d11f31b702f6dad4c2212e7a47f370138a110ee109d0c078a38a137ef0b21afc6d8e718074c662d28ded8ce19423df4357ade771af3238d229
+EBUILD nose2-0.6.4.ebuild 948 SHA256 5dd40b9e79228ce233959b1b668db209190fc05a584f4f28ca58d7dec47e4b9e SHA512 23adf77ac73ca1511351d451bc27c2651a094c266c64603ec78b7bd047bb6845f5e12271f7d7ffe4f39aa0dd1fd03f7eeceedc1e7338d837503100e7d8837368 WHIRLPOOL 2330bbc11395e7f66026ed2dc2cc1813ae8cfac706321f2cde280a3d7ccb9e3c02a1fb53a79edfa85aee56754169da6689ae58fe88592aba442547177262f178
+EBUILD nose2-0.6.5.ebuild 948 SHA256 5dd40b9e79228ce233959b1b668db209190fc05a584f4f28ca58d7dec47e4b9e SHA512 23adf77ac73ca1511351d451bc27c2651a094c266c64603ec78b7bd047bb6845f5e12271f7d7ffe4f39aa0dd1fd03f7eeceedc1e7338d837503100e7d8837368 WHIRLPOOL 2330bbc11395e7f66026ed2dc2cc1813ae8cfac706321f2cde280a3d7ccb9e3c02a1fb53a79edfa85aee56754169da6689ae58fe88592aba442547177262f178
+MISC ChangeLog 1030 SHA256 7a06f20552159824d5d4936514e7aae3e024533840a6e2d073fea7873fe96745 SHA512 35851e92c00ebcad31551ba17d71c955d2d17f38f81536b3cf9ad291618279d314ef86df99571a6d10495115b31dce3d0b04deb983a3e3002405b11ae4658e14 WHIRLPOOL 75ed9e6b7e628c3c95c400af204b3118f342ee202082b663ed71c5c3ad697522a5ddbcd5d77202d662f0e0d5d5ab8049fa99f1d618dada3b625ef27aed9e2d73
+MISC metadata.xml 326 SHA256 9620c61a553ccbf6e8a6bb86356e483d1af7f2e0d42d02fb1b0094971226b3cb SHA512 f33cbd667bbf3fca39922cc1a57a50fe1fc7cc3b5a5393220d99a1e2a4fa14c90b2cddc4c9fcdd7e472920a2441c5de60deb53b7caf5ecbe2050b7480fc954eb WHIRLPOOL 8007719ce4582d2f1b0c99d99abb6dae10348d0efc13ed2a9729e0c5f7fddcd8b0ef94d25309d7c1c2e7bec2bdbc530deb2c2ccf99be59c34cf553563ff9c5d3
diff --git a/dev-python/nose2/metadata.xml b/dev-python/nose2/metadata.xml
new file mode 100644
index 000000000000..3d296f55960e
--- /dev/null
+++ b/dev-python/nose2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">nose-devs/nose2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/nose2/nose2-0.6.4.ebuild b/dev-python/nose2/nose2-0.6.4.ebuild
new file mode 100644
index 000000000000..aec771d0b8ee
--- /dev/null
+++ b/dev-python/nose2/nose2-0.6.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="nose2 is the next generation of nicer testing for Python"
+HOMEPAGE="https://github.com/nose-devs/nose2"
+SRC_URI="https://github.com/nose-devs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+CDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.1[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${CDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.5[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cov-core-1.12[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" -m nose2.__main__ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/nose2/nose2-0.6.5.ebuild b/dev-python/nose2/nose2-0.6.5.ebuild
new file mode 100644
index 000000000000..aec771d0b8ee
--- /dev/null
+++ b/dev-python/nose2/nose2-0.6.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="nose2 is the next generation of nicer testing for Python"
+HOMEPAGE="https://github.com/nose-devs/nose2"
+SRC_URI="https://github.com/nose-devs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+CDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.1[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${CDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.5[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cov-core-1.12[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" -m nose2.__main__ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/nose_fixes/Manifest b/dev-python/nose_fixes/Manifest
new file mode 100644
index 000000000000..d5449aa8e2d3
--- /dev/null
+++ b/dev-python/nose_fixes/Manifest
@@ -0,0 +1,5 @@
+DIST nose_fixes-1.3.tar.gz 10033 SHA256 dd6aca7f2702b36d4bbcd8bec7b2950fb3478f49f520758252688887db2e0564 SHA512 2e054c04493cf11f06ee8977d4922290dbdd7928a4fe4947a76b6cf300c2d16796b578e48c0ea514f3c5a38e011fa9779e7d308eafa0ec12cc0622e124494d93 WHIRLPOOL 04e1ba50fde31cfdaf4efb5df429b0a607f4a5870835164f7d359071f10b9bd9557f4f7666d4417cfa0a1d3ea3a916061c379dd2f63e36698a5db9cbd102bc28
+EBUILD nose_fixes-1.3.ebuild 977 SHA256 aba96cfdaa3a9330eac2e73b03223ea1c298d47d05e0e0c2d78885aa42f9d324 SHA512 50056f498e3f8bd66938104d2e9617991ca8598ff7aa8fbe038f23e2178a9fc2dfdb3e4c92af8af76149cd96660bde01928fb2998170a4d417754085981060b8 WHIRLPOOL e3c4d457e65db2874d97989a1d33dea21ea9438de559857854b5a919620a0be34904a84abec7573a2ccb9989ddac101801498702cf153247c61c9428ad4bad4c
+MISC ChangeLog 3053 SHA256 d1977c958c00011b163317911e4072f6f1942b7dee41d246ced211d3a0bf6901 SHA512 1439011382b85d78673a8917c016cd01c143e0cdc477570004934d5add287d4e3f143a71cc3fc143907722dff66f7ea536865302d9c895b6ea3d638066da08ce WHIRLPOOL a4a050c56314caf83a17783eb2620057aa1ba9f4585282f834b15b50fdef0e752a8a0f1ff1da3156cf394b02c3078f615c9e6bc1ae3a81d312d3d7162da8a125
+MISC ChangeLog-2015 483 SHA256 dd83044dd6b208a60a4007c9f260af4228bc0a1c8e4008175d6cb93cead52dbb SHA512 ec5e17aeab8f5552285feefb3acbfaacf6e478f0094d677bba94156cae3e6e9892bc5bdfe7da7393b0c23d56cbf92fe036837f8dfee8af9f5e6f2f876c0cef28 WHIRLPOOL bd9a906a67c717a87ffdb705b6982194117d352905a655658715d190eb427455287b2e945ea6e3681cf4bb590392c2ff89770e3219ef88b75d47589f0797bca8
+MISC metadata.xml 323 SHA256 2463c87448418faba13fcb666373ecaa84ac4dac201c27828e2ac10c21594eed SHA512 2795d2ebddc46db61f304647a32627fb1be7370348d66962cd9901dd59e688ab7a230d4903b784eddac317bc9c2a28634fd9c7a90524be580f6979577fbfa95e WHIRLPOOL 8c6f45d3c2517160eea8891efb1e4e43b6f966cddd7be388f360a786ad51c74abedeb5829bc54f80baa3548eb81e51f6324afaed4bc8fb4bb920086587496850
diff --git a/dev-python/nose_fixes/metadata.xml b/dev-python/nose_fixes/metadata.xml
new file mode 100644
index 000000000000..f1e5ee08afe9
--- /dev/null
+++ b/dev-python/nose_fixes/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">nose_fixes</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/nose_fixes/nose_fixes-1.3.ebuild b/dev-python/nose_fixes/nose_fixes-1.3.ebuild
new file mode 100644
index 000000000000..b406653c87f2
--- /dev/null
+++ b/dev-python/nose_fixes/nose_fixes-1.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A plugin to make nose behave better"
+HOMEPAGE="https://pythonhosted.org/nose_fixes/ https://pypi.python.org/pypi/nose_fixes/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]"
+DEPEND="
+	${RDEPEND}
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/pkginfo[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -e 's:../bin/sphinx-build:/usr/bin/sphinx-build:' -i docs/Makefile || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/nose_warnings_filters/Manifest b/dev-python/nose_warnings_filters/Manifest
new file mode 100644
index 000000000000..27106e894436
--- /dev/null
+++ b/dev-python/nose_warnings_filters/Manifest
@@ -0,0 +1,4 @@
+DIST nose_warnings_filters-0.1.5.tar.gz 3895 SHA256 456c5b2ccca24e1d00a7b558274ebf9318305813dcb9585951a73ae11d76bb9d SHA512 7ada463840bb2e3a1c7e357c231f9c7d4c7ce9f24fe7fe1e33404df41711663c8232001f9a258898f49ce89bb542a942240cf7312ee41bc75f86ca2015378405 WHIRLPOOL bff4646af7733229ecfd2b1926aa9036b4ea2b3d219493bcb3a1f1155bab1dc1c064a9a19a6f1ee4c608eaaa118fbba9ff286f9d915a591e7d1fc7ea2536569b
+EBUILD nose_warnings_filters-0.1.5-r2.ebuild 831 SHA256 d56919e8b73697ae7f3f4158184a2bc7953b436d804ee15420cbbeaca8115acb SHA512 67b7ba88e9a3112dd57379b707c18f1e33303e79c57433a74a702268ddf10c3f858dc54d8a8c4b7df497fef50652b35c81ae79c3427e8d79d0bcc8deaba34cd5 WHIRLPOOL f8aa43524368fd17ce5a000b0c70b63c00af4364f350028d27b09c33cde2fd7a630c6b03b7c71340331839fc7b766845c25ada83fb163a5d4f5cd9ff5bc85df3
+MISC ChangeLog 756 SHA256 1708537f4afd00763ea6cf880b2cf58d3d73a529f0a02565ce5cc64e53c2e4b3 SHA512 014312d0e3489896d18fc6b1c7907ecd2c7b4351eeacdbef073602cbc032c10711a64ad094b6c78c3aec69d9bf9a5cfbff6302b7fc6376be075efcc94644bc9b WHIRLPOOL 98536d302be89892ffe1b2f6376f663efdee78622f42d5a1b0fbde2ec344708061ce9366176bbb7e2c77cf37821ec4e0f3a53dddee763cc752b80450725b9f2e
+MISC metadata.xml 393 SHA256 9a85f3b31df940ad9af8c841b414eb4a599fad4f4bb335f1d5ad3d4a30b9d260 SHA512 5a579ee892244135abe424c05a9ed28ccc0d04e2e0dc87cc14187de9b5f86e00f8c51a762c0a55333f92370df2e982cf82babee6dec27205f15ede1aa87bde11 WHIRLPOOL 15380df0c8db332d8c9b9f17d0e5668cd16359f6ac0a6808140bd75d81777e65817f0fe5f5b8c65a729df532e60ac1e8cd055303baebd84a03af1206df80814a
diff --git a/dev-python/nose_warnings_filters/metadata.xml b/dev-python/nose_warnings_filters/metadata.xml
new file mode 100644
index 000000000000..bc60ad566a29
--- /dev/null
+++ b/dev-python/nose_warnings_filters/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Carreau/nose_warnings_filters</remote-id>
+		<remote-id type="pypi">nose_warnings_filters</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r2.ebuild b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r2.ebuild
new file mode 100644
index 000000000000..60ac7101369d
--- /dev/null
+++ b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python module to inject warning filters during nosetest"
+HOMEPAGE="https://github.com/Carreau/nose_warnings_filters"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	# nose_warnings_filters doesn't have a proper
+	# testing suite, hence we run the only testing
+	# script available
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	"${EPYTHON}" "${S}"/${PN}/testing/test_config.py || die "Failed running test script"
+}
diff --git a/dev-python/nosehtmloutput/Manifest b/dev-python/nosehtmloutput/Manifest
new file mode 100644
index 000000000000..20bb8c375d82
--- /dev/null
+++ b/dev-python/nosehtmloutput/Manifest
@@ -0,0 +1,5 @@
+DIST nosehtmloutput-0.0.5.tar.gz 7525 SHA256 98409e4e231e25582f4d657f31bbe9665e8299b4f0f157e55f1f37b46b67271e SHA512 85bf7d2ab9db9e054772a1af85c17b6213edb2c5bcf30e78392470ad79fad51f15a67f5923282b867248828beab4ca5ea57fe18a071c21995cf56cb56c6bec84 WHIRLPOOL ec9664b659ac43c0761d87799513a2f1d57b8276c803193a6e0a33067b98db147d54e69d31b335e1bec723d5982cf67c26ab9873ad03fc5993992d58d9bf1156
+EBUILD nosehtmloutput-0.0.5.ebuild 540 SHA256 760a657543b5e777c5ec5e14a5c60dc704953f46ce6df9f76b2b0e80d147ffcb SHA512 0874e04869aa48b1a2d759623c80ce8a72a285511a441fdb19243b3e15831f065f87f6c291036ea7a0e56d952d8b36beba14540ee3e5cd1942fed2f0e937af4e WHIRLPOOL a85d7ddf52d1e692dcb43195577ec486bb65b32527cfacf3d3ece55e3dcac82b40a66f03538b4e1a7b39869709f31e77ddda3fb98f56f69a235810dae7f91ae4
+MISC ChangeLog 2767 SHA256 d091a5d9a0515000ef1c4d7369c72a36c1b4ad78f0c1b5333fa80117615855b9 SHA512 47b8e6cd1a445ec8868609ee8c8abd1feb216d75941a971b10a1d984ee69bd46dd42f08c9a73665e3af9b067508ac75cee472ebd1b069560cb19b36c19b8c1dc WHIRLPOOL f1783217ec87b8d4e3e47de8e4c37774b53f3e621bbd41df5150226938550a8ef3ede552222ee486abcafda09390ee341f548d1f21c7840151533faf8cd626f7
+MISC ChangeLog-2015 2061 SHA256 3db8f2a6d9b4a656f56342ddf12ef3ab93610cdbad329ed54944853efb2d4c16 SHA512 76594eb5773ee17be36ac75dea934663f17c9940578cb63fc6301ee1fc784a1cf38d6726a98a6a3a1d06bcdefd6fb0df747969888859cd7bde2e553edbb85cfb WHIRLPOOL 6e2bf6ddc14c702257a512b879fe42fcf1319f13e92e43e35d87614dc94b4f1ac4cac34afc031aa46d52cca56399d52db1f84abda9f83d9b74086d06d50c1b91
+MISC metadata.xml 614 SHA256 f89daf3704ea665b2505683d652edc85a24e2c32a307efa9e309f27f16f59a97 SHA512 5b48dfcbfb6dee148d81cb829ff30f90f7717d509e94e346668fabaf61bcef52dddd831ebb4adb29d8ea4593dc8364ec8d623742e14a7702fe4024f9bd92a601 WHIRLPOOL d52dee336fac4c1d586f1ad74880c3f8bba07398de0facb77f5bbff4b9853ed5788cc66bf4c9511352f840da0fe0f93c02fdbd449c9bc478052e7b58ecaa4b0a
diff --git a/dev-python/nosehtmloutput/metadata.xml b/dev-python/nosehtmloutput/metadata.xml
new file mode 100644
index 000000000000..f6206cc06be4
--- /dev/null
+++ b/dev-python/nosehtmloutput/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Nose plugin to produce test results in html.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">nosehtmloutput</remote-id>
+    <remote-id type="github">cboylan/nose-html-output</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/nosehtmloutput/nosehtmloutput-0.0.5.ebuild b/dev-python/nosehtmloutput/nosehtmloutput-0.0.5.ebuild
new file mode 100644
index 000000000000..8139e72c7c0b
--- /dev/null
+++ b/dev-python/nosehtmloutput/nosehtmloutput-0.0.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Nose plugin to produce test results in html"
+HOMEPAGE="https://github.com/cboylan/nose-html-output"
+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/nose[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/nosexcover/Manifest b/dev-python/nosexcover/Manifest
new file mode 100644
index 000000000000..cc87f2c08945
--- /dev/null
+++ b/dev-python/nosexcover/Manifest
@@ -0,0 +1,7 @@
+DIST nosexcover-1.0.10.tar.gz 2744 SHA256 f5b3a7c936c4f703f15418c1f325775098184b69fa572f868edb8a99f8f144a8 SHA512 dbc3bc3379676d56711c96a4cf2d6b46ee77b5b04ac6a5fb2d58fee780ee547664738b9c6b248e3af64b3d0b7e6c9b44310c8e7025551df543c547da4239f52a WHIRLPOOL a7549547b9423ff32977dfea4dfd7babce05e637a3379b3b7e2d63c711608214ddd0495a09f5e7b5ef9560d46f82ef1727ec75e47f96a95245b0c0148093b4ad
+DIST nosexcover-1.0.11.tar.gz 2903 SHA256 298c3c655da587f6cab8a666e9f4b150320032431062dea91353988d45c8b883 SHA512 a4c75aac5095aa8323094b2a4eceb3af26243e6c87dd8720df8cf43ae0f76c28c638fe2c3cbcad621b7c2779115dccbb32e6a2f33a8bc5efb22a0fb0901d64fa WHIRLPOOL 6fdfcffade35ab60360ce70dba8a559bb92d61dddfa2e99d8d39fcddff0971ba216122494595198e856e421a9da483a79cf94ec2832e9b2028805625fbeb212f
+EBUILD nosexcover-1.0.10.ebuild 638 SHA256 5d4fb8df516b976130b1861b26cdae34aaaa0859d3aef25acc65c18044f0da02 SHA512 42f9b1f35986dba5f11e6328173d5efe07e8610278bc2effd5365ff7121bd631749c090974d890194492dca3227de6bf54e1d64209f6f427d80df24c4f96ca24 WHIRLPOOL 5becf130009597c107368a11d73eb4cc26afd766c2529441e64a5624f2e8e7bebb11c403c11a606d2e270bbc0ebc17639b914f3e2eef0d14ebeeaad639e9ea54
+EBUILD nosexcover-1.0.11.ebuild 647 SHA256 09f2ba6b2bdc8983c7eef1a1b67b5fe8af75d85ce1ca92783cb25ca9fe6bbd86 SHA512 2aa4ca8ce3705f6a5025a3e924adaa9fc8cdb2113f2a6e99eda2c21b74551fdd66c5cd0a9647b0d177525e14da99973dfda03f709d310564feac0faa6706d6b8 WHIRLPOOL f40a0185dd21d9bba0e10332856d8a71802224385236fb3b51c26c743c52b79337b6c7f4aca6d5cf27132eb9d2cbff5128064d08e69edea31b69d86525cf9001
+MISC ChangeLog 3002 SHA256 da2eb940d5fbc36f9723d64d1351fa806c4d431492f102c4086269ce7ecdbc4d SHA512 68ed74b98c8040dd8f970a7ea078d03b9cc53585fb3c5969d368d1b4a8bdf338e0b12bfd314a44b3be3dc9814af315ccc4c46a69a590fe85883d461fa0136a6a WHIRLPOOL 798ef8b5f578a3cbba06c23bbec35adb0d90ce7708d0120d44d2468b126ebc3c5dafa91ed2bd2f11d60837c388bacf0052f3d9781b647244b34db92cb9455900
+MISC ChangeLog-2015 2047 SHA256 504bbee999ac0e91ab518eb4433473004899766bc57c1cdc3ef69f9064f20bf7 SHA512 59481104a0ef553ad7fb33486c91b4b0e9c805156000ff53db739237e114061191d75c461b9e8e453d35cab58a0af7278fd701d9377619f67dbb3bef902f3d4e WHIRLPOOL 1e7ef717d5353b8b999e17a1011d68cbf059679330577d0e3e8af506b9df7b0581f95b245fa4ca7e40883c7b41c62564d395bb6c5f17bdb283bd51077983fa50
+MISC metadata.xml 498 SHA256 4b5192e817d8612375dd48c7ffe05cb07fdbd0c49471555a9ae79be2b93c3d00 SHA512 04961083f04775b64d14ef2be39d6a8a2379f6c82234316d29dfaca2941a24dbefff0abca2c5e8efed29a4894885c65ad49bba5acd0a30a8e71ebb2d0fe98e59 WHIRLPOOL 45c2f297ab9b95ac868f7176942597ba3aa5692ba96c8357da57dac1469ba14f6e935f2494738ef0b3c2c31a46ab86194fccf6ebee9aee782c8cadb95baf3c07
diff --git a/dev-python/nosexcover/metadata.xml b/dev-python/nosexcover/metadata.xml
new file mode 100644
index 000000000000..f825ccefa690
--- /dev/null
+++ b/dev-python/nosexcover/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">nosexcover</remote-id>
+    <remote-id type="github">cmheisel/nose-xcover</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/nosexcover/nosexcover-1.0.10.ebuild b/dev-python/nosexcover/nosexcover-1.0.10.ebuild
new file mode 100644
index 000000000000..0c5cdd0443b3
--- /dev/null
+++ b/dev-python/nosexcover/nosexcover-1.0.10.ebuild
@@ -0,0 +1,27 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Extends nose.plugins.cover to add Cobertura-style XML reports"
+HOMEPAGE="https://github.com/cmheisel/nose-xcover/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	>=dev-python/coverage-3.4[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	nosetests -v nosexcover/tests.py || die
+}
diff --git a/dev-python/nosexcover/nosexcover-1.0.11.ebuild b/dev-python/nosexcover/nosexcover-1.0.11.ebuild
new file mode 100644
index 000000000000..c9477899a86a
--- /dev/null
+++ b/dev-python/nosexcover/nosexcover-1.0.11.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Extends nose.plugins.cover to add Cobertura-style XML reports"
+HOMEPAGE="https://github.com/cmheisel/nose-xcover/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	>=dev-python/coverage-3.4[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	nosetests -v nosexcover/tests.py || die
+}
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
new file mode 100644
index 000000000000..eb21a62ccc56
--- /dev/null
+++ b/dev-python/notebook/Manifest
@@ -0,0 +1,17 @@
+AUX notebook-4.2.0-setupbase.py.patch 1357 SHA256 e0783ffd6a83df9e232ee0eda36d2d21b8ca3c7ae9a45f18a98bf36b3ebe9008 SHA512 8e8aac8faf8f791c836e8ad00715006c0d19a9711add07b7fce53f59bcfb38ff23c72aecb006c2523b85b7b2f5fb6c04895a0644d9d574836984ee7145ed1e26 WHIRLPOOL 78e1a48d58fb2fd20a0dc31e5e94f304a30a5c76f3789d9a8fcfe1aaf45211be5ef64f869de5e99ddec1bb9489bf8fb01ea3bbe4999a1333614d6f3dcbb1574a
+AUX notebook-5.0.0-example-execution.patch 941 SHA256 69a0d42d179f720f4217e1ba48b1beb33266b4514d7844274fa1d5c9ceca800b SHA512 f9482d26fc098b9a3d525f5e299cf094cce192c6231d6bf6242e3e8081b7ab69f8f7955a746772aca7aef3d4c973b444f5f04004d1fe54e623bbd84d761f0512 WHIRLPOOL f1c0aecd2d3c2ded1953045016dda1e01d49dd080b97732624d28e767871410dd9a7dc4639b48f42810c272f49231eed023a4488cf7e0e4adaa38dd5d652e63d
+AUX notebook-5.0.0-setupbase.py.patch 1368 SHA256 06323d2478dafa9da7eb767a1d75c8c0eebf9495227e3fde1fbd7fa437cc850e SHA512 14274ae6e2bc664e6c92390d480da0f5615b7f51863c10f3d11a7ec1a788ff357ae8113bac0c3d15932e322137b9e251c31bdf34c36a2dbbc0771407fe614a96 WHIRLPOOL cd49c61fa4fbb84c70434d4c65b205964b64ae24aaccb870ade94d73ef5c1fb676ab898b1aac0442078be05ef37cb85c9646918a325764367ddc87a3f6462730
+DIST notebook-4.0.6.tar.gz 6705277 SHA256 f62e7a6afbc00bab3615b927595d27b1874cff3218bddcbab62f97f6dae567c3 SHA512 9ce9ca21adcb967725aeb7a18543ace8aca4e88497d3d2fd708a603511e8ef4a932b39337d134d684df03b273bbc442958a37ced8cd499cb7b97a1c29758eeb0 WHIRLPOOL 764afabfa220d37e048a359952bd9cc4de0b791de782ed7cf2a22e8c0e9719b39630fd5c1c7acbf163715924662805f92b406bf6198600f2c4a35d239a12df11
+DIST notebook-4.1.0.tar.gz 9170981 SHA256 b597437ba33538221008e21fea71cd01eda9da1515ca3963d7c74e44f4b03d90 SHA512 745e412a737835956dc4238f70dbaf9c519fea55988941174febdc3ad24962031c3c66cb4ac355a9a639f9a383905e863e8eb0a3c6da62bf72026282154874cb WHIRLPOOL a34501e8e0be300905628e0f0df6914e8491a00924150ff0f5f32d1b7ad99046b84958dc267a229797fb13c98085f7556496a1a8e5fb68a1db503b44cad2b380
+DIST notebook-4.2.3.tar.gz 10092423 SHA256 39a9603d3fe88b60de2903680c965cf643acf2c16fb2c6bac1d905e1042b5851 SHA512 1b54e2a16fdb79b9344c0f73bd48fe438b18c529707b15816a3ab20353b2e320067082d51829c670117d77830a21c5a64a15d37d1970fd30aae31272d9650d97 WHIRLPOOL 9cbcfc80dd818c77f1db5226b729e576f7428184001747eda8780c70b3cfb6b9472b8760073e2891ee40bc90e0398e88250b02c8c2eb6b7c2517fa6eecf2ceba
+DIST notebook-4.3.2.tar.gz 10375345 SHA256 fc77edf4ec295542172aa66a3e9d527e75038fcaadd3ed20afbf8596e5629aa9 SHA512 8ff9a4852aafbc2761e82cd1cbacfc85dade97ec58386df55eea1e97f513b3d608106a2cc43305968fd990974daf6c8dac8aab4ab2184c56976289e646a62b7b WHIRLPOOL 4921242a8cfe316e835b88879cbc9cd41abff39daaf6f8e5d373609f3cd64f286052041bcc9e496b5a570dc9126892a1163dfef6df1b037f6ed92f101d8c74d5
+DIST notebook-4.4.1.tar.gz 10377605 SHA256 dfadef2babd7c04c6c257df7d07d7ba587e503dbb4e4c95305f9a95b8d3a9765 SHA512 416500355660e74e87edd1649821eb91154f2f0828dce0f2a6a8d3e6448f0ee4459ad661c9a030b5acb594659d37131c76d9edc30630f91700860dc6bfe4450b WHIRLPOOL f97de24b200d382c1cdd2c27c2344a040230b0b892bad18ac4c884bee8aac58fb0106a8939e1b095069ad258863ae822baba45834f1ff1bd0ba5c04d5e5014c5
+DIST notebook-5.0.0.tar.gz 11481080 SHA256 1cea3bbbd03c8e5842a1403347a8cc8134486b3ce081a2e5b1952a00ea66ed54 SHA512 fbee29cc554f36e94b1fe9804187a50581e840cfb5884bcdf2fef82ad9ae3ae0e2082ea0056f815bfa2a1c2f203679169155e61e53253aa2e9004a43ff7fbcae WHIRLPOOL 00d9f41601f5b6a4063d4323be4e236184f18b8253a6d670c3c18800a5883d28a2e036cab99403bb981bf73ab915664a908b06401c9c4facc17d285a16ba2634
+EBUILD notebook-4.0.6.ebuild 2194 SHA256 c70f673d7c509a1f5cf1e9d3e74f1eb8ca7957d83216f1254b2447d5f19c16bb SHA512 52649f5c79dfd3e20096dd2e7d744f161d2999812b141a35c4c1099d2d8e47d877212bb9ee05feb65391b0b820653fbac391e637f5d43cde4265262a206d2bc1 WHIRLPOOL 1ceecf6e1996948c283348bf0c68ac2209fedb9918dbd61c551e57f4f0cb039b410d02aec14c277c4aeeb606a50a9c1eba4d994dc881125f366f6317faa30014
+EBUILD notebook-4.1.0.ebuild 2193 SHA256 8db3c32313bc324589d03884061dcf1181e2e4f4d55072c505fe19dd6411600b SHA512 9f95d9a5f21233ace6112f46c4ab090b8029ac8a57d8e0e54373d26ed2f93a8625d2511b366f83b75f686280e89b862aa9b7623bbeea94d3bd1bd95389e3f829 WHIRLPOOL f6ccfbd9c8b8fb5636dc3f718e616cb0437323ff43e38987c242115d8b10b169d3002efd6c1d81df2553d9466258f52bd4fbcfed9cca3cca4acddddbe8ea65a0
+EBUILD notebook-4.2.3.ebuild 2232 SHA256 95adee5aedd9dc3b42b6db7f8a996a85ad51cbaf77667ee954b5578ed4ee9ee6 SHA512 4aaee6548f0a57a50d34882f0cc474aad8d25a05d01cbe024cb951280e6b8444d581f2b003c975d4159deb053cd264d182ba330099dabda1b61368bf31e0a92d WHIRLPOOL 5acb89a7f8cec05a5b4cf371a76d60f425e384879a6590ecf4c7e1b22ddf233cab58953025f89408e083483d5d413178348ce6c464f3a0b3e97c493329f09733
+EBUILD notebook-4.3.2.ebuild 2178 SHA256 40ae4700fb03ec8c260fb2417bb18199c64bdb159b7367312f07015ffa1ae6f1 SHA512 74fea68d8da80a0ff479fbd202e9e48f7340a48f6966882449291a7c93d770ae3f45ce0272eb68f91b8529bf27aee594f4fb482003aa95d5c50f36c8c0a66595 WHIRLPOOL fe4145de09d81f5f38f3da020bfd09e189ef3db55f7bc87f67bfddfc7079c9b6113305f950f0b07510acc168b2b02af220f841c901fd1bacc0b762d7e6a3c743
+EBUILD notebook-4.4.1.ebuild 2187 SHA256 648dc550cf1103efb12d861bde7b386f131fe36b964022b0580f632baf3d024a SHA512 73cd8451313befd7b00e747250f15f498ca668a7592f5d8480795c0ab50a9dc66f8827d1a6cd0a32eb05f1c2a52347eca4e9cdc63b8dd09ed0e58b77c817f6a6 WHIRLPOOL 0b6ba4bae15157b91efdcdacac3a275b006d91768254d051884229506b1a24c0835ff3294061bced1143beaeb2db354542256a030f525bf1f2fad683fbb3b4d4
+EBUILD notebook-5.0.0.ebuild 2273 SHA256 b16abffaf3f7a15634dcaad34c3d7b330be27e8091572c144ce89d1937dccbab SHA512 23f7cd555dd1fade2f0567892e98c0e9306e6bd54d92d4d34e18d5d548ab2bd7d9ea4d50d77f8ede6d297b344c9f06be2bbdb30f997327acbf89e04689b7286a WHIRLPOOL a60f442583c6b8261f46d310e31857f68a307fff70013392bb1516502387d016b7071fa37f755e9081bc6be7175260b5e5012d54911e61d00447b75da40850ba
+MISC ChangeLog 2212 SHA256 46dc93a181b14ded234a7240fb5a8b18d78f2a48d49490158f2de2ad3d05c1f8 SHA512 7efb6b1de461a67edc00f56301ff9ed55dda599d4d6d799c539a8a23bc2f711ab5f04aec4361b8d2ba05581f2b9cc41b21c227f0e02e62f828b84967fad2ffbc WHIRLPOOL 05d54ece1e5fe54e13167b23b2bf31bc7f227e5144dbf392c1043a1cd1140601d00a8e857d85e460dd45a6f027a2eded8123fda344e34c05ab302714dcaa7811
+MISC metadata.xml 472 SHA256 70a69714e7ed2474810e4e38ddee3f75fa87b2c9d2ea178a5ca35e358370180b SHA512 23588835d3a40661f3a59b92a9ccfb9e40777f14ff03b6f9c403eb9eee5560e0a805c6a76cd8ae2fb11eeba39b264fa0fedf44cc4fd2231318fe1cefe2c27846 WHIRLPOOL 52652072a5e14267a0d90c8177c680f639766bbae21d1535925dfec7723da8ebb993a10a411d892e4942f230ba22a15619d064ed52e3b5232dab21ed439143b3
diff --git a/dev-python/notebook/files/notebook-4.2.0-setupbase.py.patch b/dev-python/notebook/files/notebook-4.2.0-setupbase.py.patch
new file mode 100644
index 000000000000..a4c29048b925
--- /dev/null
+++ b/dev-python/notebook/files/notebook-4.2.0-setupbase.py.patch
@@ -0,0 +1,42 @@
+Disable bundled mathjax.
+
+Patch by Marius Brehler
+--- a/setupbase.py
++++ b/setupbase.py
+@@ -152,36 +152,6 @@ def find_package_data():
+             if f.endswith(('.js', '.css')):
+                 static_data.append(pjoin(parent, f))
+ 
+-    # Trim mathjax
+-    mj = lambda *path: pjoin(components, 'MathJax', *path)
+-    static_data.extend([
+-        mj('MathJax.js'),
+-        mj('config', 'TeX-AMS_HTML-full.js'),
+-        mj('config', 'Safe.js'),
+-    ])
+-    
+-    trees = []
+-    mj_out = mj('jax', 'output')
+-    
+-    if os.path.exists(mj_out):
+-        for output in os.listdir(mj_out):
+-            path = pjoin(mj_out, output)
+-            static_data.append(pjoin(path, '*.js'))
+-            autoload = pjoin(path, 'autoload')
+-            if os.path.isdir(autoload):
+-                trees.append(autoload)
+-
+-    for tree in trees + [
+-        mj('localization'), # limit to en?
+-        mj('fonts', 'HTML-CSS', 'STIX-Web', 'woff'),
+-        mj('extensions'),
+-        mj('jax', 'input', 'TeX'),
+-        mj('jax', 'output', 'HTML-CSS', 'fonts', 'STIX-Web'),
+-        mj('jax', 'output', 'SVG', 'fonts', 'STIX-Web'),
+-    ]:
+-        for parent, dirs, files in os.walk(tree):
+-            for f in files:
+-                static_data.append(pjoin(parent, f))
+ 
+     os.chdir(os.path.join('tests',))
+     js_tests = glob('*.js') + glob('*/*.js')
diff --git a/dev-python/notebook/files/notebook-5.0.0-example-execution.patch b/dev-python/notebook/files/notebook-5.0.0-example-execution.patch
new file mode 100644
index 000000000000..4516cadf11f6
--- /dev/null
+++ b/dev-python/notebook/files/notebook-5.0.0-example-execution.patch
@@ -0,0 +1,27 @@
+commit db90e16d17acc778efdfff6dca69767b47b60cbd
+Author: Benda Xu <heroxbd@gentoo.org>
+Date:   Sat Aug 19 17:31:38 2017 +0900
+
+    d/s/examples/N/Importing Notebooks.ipynb: disable execution.
+    
+      This notebook example includes writing to the directory of another
+      module, usually resulting in a doc build failure.  Therefore we
+      disable its execution by nbsphinx.
+    
+    Closes: #2372
+    See-Also: https://bugs.gentoo.org/show_bug.cgi?id=626860
+
+diff --git a/docs/source/examples/Notebook/Importing Notebooks.ipynb b/docs/source/examples/Notebook/Importing Notebooks.ipynb
+index ee42ad526..d6db5395e 100644
+--- a/docs/source/examples/Notebook/Importing Notebooks.ipynb	
++++ b/docs/source/examples/Notebook/Importing Notebooks.ipynb	
+@@ -511,6 +511,9 @@
+  ],
+  "metadata": {
+   "gist_id": "6011986",
++  "nbsphinx": {
++   "execute": "never"
++  },
+   "kernelspec": {
+    "display_name": "Python 3",
+    "language": "python",
diff --git a/dev-python/notebook/files/notebook-5.0.0-setupbase.py.patch b/dev-python/notebook/files/notebook-5.0.0-setupbase.py.patch
new file mode 100644
index 000000000000..4dc55d937cae
--- /dev/null
+++ b/dev-python/notebook/files/notebook-5.0.0-setupbase.py.patch
@@ -0,0 +1,43 @@
+Disable bundled mathjax.
+
+Patch by Marius Brehler
+--- a/setupbase.py
++++ b/setupbase.py
+@@ -165,37 +165,6 @@ def find_package_data():
+             if f.endswith(('.js', '.css')):
+                 static_data.append(pjoin(parent, f))
+ 
+-    # Trim mathjax
+-    mj = lambda *path: pjoin(components, 'MathJax', *path)
+-    static_data.extend([
+-        mj('MathJax.js'),
+-        mj('config', 'TeX-AMS-MML_HTMLorMML-full.js'),
+-        mj('config', 'Safe.js'),
+-    ])
+-    
+-    trees = []
+-    mj_out = mj('jax', 'output')
+-    
+-    if os.path.exists(mj_out):
+-        for output in os.listdir(mj_out):
+-            path = pjoin(mj_out, output)
+-            static_data.append(pjoin(path, '*.js'))
+-            autoload = pjoin(path, 'autoload')
+-            if os.path.isdir(autoload):
+-                trees.append(autoload)
+-
+-    for tree in trees + [
+-        mj('localization'), # limit to en?
+-        mj('fonts', 'HTML-CSS', 'STIX-Web', 'woff'),
+-        mj('extensions'),
+-        mj('jax', 'input', 'TeX'),
+-        mj('jax', 'output', 'HTML-CSS', 'fonts', 'STIX-Web'),
+-        mj('jax', 'output', 'SVG', 'fonts', 'STIX-Web'),
+-    ]:
+-        for parent, dirs, files in os.walk(tree):
+-            for f in files:
+-                static_data.append(pjoin(parent, f))
+-
+     os.chdir(os.path.join('tests',))
+     js_tests = glob('*.js') + glob('*/*.js')
+ 
diff --git a/dev-python/notebook/metadata.xml b/dev-python/notebook/metadata.xml
new file mode 100644
index 000000000000..2751ca0bea2b
--- /dev/null
+++ b/dev-python/notebook/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    The Jupyter HTML notebook is a web-based notebook environment
+    for interactive computing.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">notebook</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/notebook/notebook-4.0.6.ebuild b/dev-python/notebook/notebook-4.0.6.ebuild
new file mode 100644
index 000000000000..b20216c53d55
--- /dev/null
+++ b/dev-python/notebook/notebook-4.0.6.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	doc? (
+		app-text/pandoc
+		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	sed \
+		-e "/import setup/s:$:\nimport setuptools:g" \
+		-i setup.py || die
+
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+	sed -i 's/mj(/#mj(/' setupbase.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests --with-coverage --cover-package=notebook notebook || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf "${EPREFIX}/usr/share/mathjax" "${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax
+}
diff --git a/dev-python/notebook/notebook-4.1.0.ebuild b/dev-python/notebook/notebook-4.1.0.ebuild
new file mode 100644
index 000000000000..eb0868e303e7
--- /dev/null
+++ b/dev-python/notebook/notebook-4.1.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	doc? (
+		app-text/pandoc
+		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	sed \
+		-e "/import setup/s:$:\nimport setuptools:g" \
+		-i setup.py || die
+
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+	sed -i 's/mj(/#mj(/' setupbase.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed \
+			-e "/^    'sphinx.ext.intersphinx',/d" \
+			-i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests \
+		--verbosity=3 \
+		notebook || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax
+}
diff --git a/dev-python/notebook/notebook-4.2.3.ebuild b/dev-python/notebook/notebook-4.2.3.ebuild
new file mode 100644
index 000000000000..973ad6e7b439
--- /dev/null
+++ b/dev-python/notebook/notebook-4.2.3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	doc? (
+		app-text/pandoc
+		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
+	)
+	"
+
+PATCHES=( "${FILESDIR}/${PN}"-4.2.0-setupbase.py.patch )
+
+python_prepare_all() {
+	sed \
+		-e "/import setup/s:$:\nimport setuptools:g" \
+		-i setup.py || die
+
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed \
+			-e "/^    'sphinx.ext.intersphinx',/d" \
+			-i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests \
+		--verbosity=3 \
+		notebook || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
diff --git a/dev-python/notebook/notebook-4.3.2.ebuild b/dev-python/notebook/notebook-4.3.2.ebuild
new file mode 100644
index 000000000000..ab0e469467da
--- /dev/null
+++ b/dev-python/notebook/notebook-4.3.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	doc? (
+		app-text/pandoc
+		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
+	)
+	"
+
+PATCHES=( "${FILESDIR}/${PN}"-4.2.0-setupbase.py.patch )
+
+python_prepare_all() {
+	sed \
+		-e "/import setup/s:$:\nimport setuptools:g" \
+		-i setup.py || die
+
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed \
+			-e "/^    'sphinx.ext.intersphinx',/d" \
+			-i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	nosetests \
+		--verbosity=3 \
+		notebook || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT%/}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
diff --git a/dev-python/notebook/notebook-4.4.1.ebuild b/dev-python/notebook/notebook-4.4.1.ebuild
new file mode 100644
index 000000000000..ca67bd63999e
--- /dev/null
+++ b/dev-python/notebook/notebook-4.4.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	doc? (
+		app-text/pandoc
+		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
+	)
+	"
+
+PATCHES=( "${FILESDIR}/${PN}"-4.2.0-setupbase.py.patch )
+
+python_prepare_all() {
+	sed \
+		-e "/import setup/s:$:\nimport setuptools:g" \
+		-i setup.py || die
+
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed \
+			-e "/^    'sphinx.ext.intersphinx',/d" \
+			-i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	nosetests \
+		--verbosity=3 \
+		notebook || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT%/}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
diff --git a/dev-python/notebook/notebook-5.0.0.ebuild b/dev-python/notebook/notebook-5.0.0.ebuild
new file mode 100644
index 000000000000..b37ff0df7791
--- /dev/null
+++ b/dev-python/notebook/notebook-5.0.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	doc? (
+		app-text/pandoc
+		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
+	)
+	"
+
+PATCHES=( "${FILESDIR}/${P}"-setupbase.py.patch
+	"${FILESDIR}/${P}"-example-execution.patch )
+
+python_prepare_all() {
+	sed \
+		-e "/import setup/s:$:\nimport setuptools:g" \
+		-i setup.py || die
+
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed \
+			-e "/^    'sphinx.ext.intersphinx',/d" \
+			-i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	nosetests \
+		--verbosity=3 \
+		notebook || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT%/}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
diff --git a/dev-python/notify-python/Manifest b/dev-python/notify-python/Manifest
new file mode 100644
index 000000000000..5885d83db4e6
--- /dev/null
+++ b/dev-python/notify-python/Manifest
@@ -0,0 +1,6 @@
+AUX notify-python-0.1.1-libnotify-0.7.patch 916 SHA256 aa40124e42ab1a843c0c1e99d4f4b2e74f5fc2e9eb2a1dff4f35973a61e6c40a SHA512 1b8c1e315ecd842925335d2115a941df47569a9557e79eca734a051e838418d0fe0d315e4f8b41de219662271dbb6e1faa8398374d1728e92263c84feb0ccc66 WHIRLPOOL 460d1aa8de138e0a69b7a4893f2070b7338ce7c7d00462cc6f7d04e88be766702528693ebcfb0bde70d5e6dbb8b4a4f1427d9a33da02f59e348d8430b3741d76
+DIST notify-python-0.1.1.tar.bz2 214514 SHA256 7d3bbb7c3d8f56c922cc31d02ef9057a4f06998cc2fd4f3119a576fcf8d504ce SHA512 67021af81d77b6a1ead4ee2a0ab4e8684c2b60c672ab7aa09a8f89d71cf646453d9be76455ac28616d70645019946db1731a7021fbb91fe66d9e057fcb3815a0 WHIRLPOOL 106e71668290ebba145cc88542aac6dbe63eebcac84f7eced68256536b9fe8f3a574bad90362e07c993fdb88df2712826d8d0aa75b7f7a3c8bf5013d3cb3263c
+EBUILD notify-python-0.1.1-r3.ebuild 1293 SHA256 ad941c906ce8f20cd551c5873a9207505033a7845009f7206f86927c1e506649 SHA512 6bc2ca03dc06d55ae33e47d91213092596d5a40a449c2ba7a63512783afe7a5e7ad34caf406f5d389968d37fd550cfac6d9426e239958bc5621cbc3eb4ec8c25 WHIRLPOOL 42ad0f8e2fa91872eedaafba795ea48b3b64a9efec3f72a3eb8ee18ebc94344f9a23e15d1bba97813371c477c5f669f57bab1a5f9fbc5ea58c7b103ce0f4e50d
+MISC ChangeLog 2503 SHA256 b49f27adc5f8021746e8fb2f1cfe8ad482c942bd952d9b032f7851cfee2c7154 SHA512 5db4590c9e0dc8d86a1fa116b995db373c54b9fb5087f463436631c6c94531bb3221614c2a114347afe25bc0690a70e38cbab582c9f2ea42ec281a3f12e1b044 WHIRLPOOL f5f12fdcde9a386d244111082bd6e3eb180492cc28730c1ac0dfa26625357a671196fa52c11d62c5c5223000d3e281e9407469fde7bf413074bdb677f521d2aa
+MISC ChangeLog-2015 6312 SHA256 ebb62c69fbb54262881f17b7d9adb2c1985cb94eb575679b1b6d6327a5f147b6 SHA512 4ed2139b016f406872457bbf8cbbf487405618fbc78985fe22e9f2d8a82634c87136eba788e5156c21afd111710e3fc2e89a80f9e22566219f50f21e73326e25 WHIRLPOOL 4327dadce9c81d0c0735dfea447fff05ad2fe34b111eec4604b7a5affc35484a1231c485cb4e16f33bff5d46c1c5ba79d1ad479d1238076ea41ee71f7bfc8a99
+MISC metadata.xml 361 SHA256 699c15404b96e1ac80c43530653dff96903b734c6f8b1ff9e46aa6eb623dd420 SHA512 f752e04d417b93556d88c32272e0b53b94d09da233b3cd027713fd70a7552aa9ee5b5556bc26aa4cc33a1d333440318238bb7674a6f1172f14e0688e92c4ac9a WHIRLPOOL 125be466b64cbd967677eb7b3c4f32d06d847db2e748921fd445f2e74b212614ad0e83125d92077051a1a071d415c5bc5cd3513e3ed1f46779ae8bb815153630
diff --git a/dev-python/notify-python/files/notify-python-0.1.1-libnotify-0.7.patch b/dev-python/notify-python/files/notify-python-0.1.1-libnotify-0.7.patch
new file mode 100644
index 000000000000..ee146cb6fd84
--- /dev/null
+++ b/dev-python/notify-python/files/notify-python-0.1.1-libnotify-0.7.patch
@@ -0,0 +1,37 @@
+http://pkgs.fedoraproject.org/gitweb/?p=notify-python.git;a=blob_plain;f=libnotify07.patch;hb=HEAD
+
+--- src/pynotify.defs
++++ src/pynotify.defs
+@@ -38,7 +38,6 @@
+     '("const-gchar*" "summary")
+     '("const-gchar*" "message" (null-ok) (default "NULL"))
+     '("const-gchar*" "icon" (null-ok) (default "NULL"))
+-    '("GtkWidget*" "attach" (null-ok) (default "NULL"))
+   )
+ )
+ 
+@@ -53,24 +52,6 @@
+   )
+ )
+ 
+-(define-method attach_to_widget
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_widget")
+-  (return-type "none")
+-  (parameters
+-    '("GtkWidget*" "attach")
+-  )
+-)
+-
+-(define-method attach_to_status_icon
+-  (of-object "NotifyNotification")
+-  (c-name "notify_notification_attach_to_status_icon")
+-  (return-type "none")
+-  (parameters
+-    '("GtkStatusIcon*" "attach")
+-  )
+-)
+-
+ (define-method show
+   (of-object "NotifyNotification")
+   (c-name "notify_notification_show")
diff --git a/dev-python/notify-python/metadata.xml b/dev-python/notify-python/metadata.xml
new file mode 100644
index 000000000000..0f698c2b7126
--- /dev/null
+++ b/dev-python/notify-python/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>dev-zero@gentoo.org</email>
+    <name>Tiziano Müller</name>
+  </maintainer>
+<maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/notify-python/notify-python-0.1.1-r3.ebuild b/dev-python/notify-python/notify-python-0.1.1-r3.ebuild
new file mode 100644
index 000000000000..c61a789aabd8
--- /dev/null
+++ b/dev-python/notify-python/notify-python-0.1.1-r3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools-utils eutils python-r1
+
+DESCRIPTION="Python bindings for libnotify"
+HOMEPAGE="http://www.galago-project.org/"
+SRC_URI="http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+IUSE="examples"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/pygtk-2.24:2[${PYTHON_USEDEP}]
+	>=x11-libs/libnotify-0.7"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-libnotify-0.7.patch )
+
+src_prepare() {
+	# Remove the old pynotify.c to ensure it's properly regenerated #212128.
+	rm -f src/pynotify.c || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	python_foreach_impl autotools-utils_src_configure
+}
+
+src_compile() {
+	python_foreach_impl autotools-utils_src_compile
+}
+
+src_test() {
+	python_foreach_impl autotools-utils_src_test
+}
+
+src_install() {
+	python_foreach_impl autotools-utils_src_install
+	prune_libtool_files --all
+
+	# Requested from bug 351879.
+	if use examples; then
+		docinto examples
+		dodoc tests/*.{png,py}
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/notify2/Manifest b/dev-python/notify2/Manifest
new file mode 100644
index 000000000000..1e8bb9e7768b
--- /dev/null
+++ b/dev-python/notify2/Manifest
@@ -0,0 +1,4 @@
+DIST notify2-0.3.tar.gz 8798 SHA256 684281f91c51fc60bc7909a35bd21d043a2a421f4e269de1ed1f13845d1d6321 SHA512 3290a5ff291d5500bcf631094fcf10302b234353eb8c26b91e7cd264238443866aadc15224d51eb6608e16b7ffbc9316d4bc551e5ad9de2a48b12a31b195739f WHIRLPOOL f28d569baafecaad0b2bf42856c67371ac42660dd6259a91b1d06bbcd0da15c0cfe0a87d72c2171cc23f01cacb104b633c4c386178760441ebcc8c58b32407f9
+EBUILD notify2-0.3.ebuild 653 SHA256 22199495689d3f00972a72e43da1c90f88685819a95cb79c1e970b8c3d884333 SHA512 f278fcf00bd29146f4c09e717a7ec102f363c3b1db1ae87a2a6c07e1efc75adde1c3611578de0c4b41598714ee327723aa13c1773c7f502704b2a08a996ef49f WHIRLPOOL 60e1ab3ae46748f7a9f353a5eccc2a6d5930f200eb11a0ba0020b14f664ae03c107954b903220dcb69f8536c011439008567a837ff889658500ef16cafc25e49
+MISC ChangeLog 325 SHA256 8d319081bea846e324c137e5c7cc895d3a5c36091468b4414dea738ad8c9ad97 SHA512 70c102be810e6a00067677f6ba1c85e77450c88c8fcd8078065ca07346bd549d66afec210e2d59b65791a12093690e688ffa0551a418b484052481dd6aa7842e WHIRLPOOL 07bce655de2e6277e7db3be356aaa365f95676633dc542385b4591f971a9f09274088842ca6b014b40f53282abca7577e2b3d32f1e6011f56a284cf24b38863c
+MISC metadata.xml 465 SHA256 81976400ef24f95b67659ea3a08903e8c65119e07df64b721d6bd62ea46e5766 SHA512 8024b5c580d09b74bf6a258dad507bec09d0c7bbbd10861bc2f866dd71acd7a858e7175dcb1d670cfdbade64da3f607667434a8587de6ceaeee7da028ce332ba WHIRLPOOL ba78331445dd5f213006e2a441f9caa9fb915130a805f23a67e210e901ac6c2054d6c3d4fdb3a6d1a7017085a85e7029d870a577323f794af067f93d62f69643
diff --git a/dev-python/notify2/metadata.xml b/dev-python/notify2/metadata.xml
new file mode 100644
index 000000000000..f05b38bba4f5
--- /dev/null
+++ b/dev-python/notify2/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">takluyver/pynotify2</remote-id>
+		<remote-id type="pypi">notify2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/notify2/notify2-0.3.ebuild b/dev-python/notify2/notify2-0.3.ebuild
new file mode 100644
index 000000000000..a36960451652
--- /dev/null
+++ b/dev-python/notify2/notify2-0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to DBus notifications."
+HOMEPAGE="https://bitbucket.org/takluyver/pynotify2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
+
+python_test() {
+	${EPYTHON} test_notify2.py || die
+}
+
+python_install_all() {
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ntplib/Manifest b/dev-python/ntplib/Manifest
new file mode 100644
index 000000000000..1caa7cbf1037
--- /dev/null
+++ b/dev-python/ntplib/Manifest
@@ -0,0 +1,3 @@
+DIST ntplib-0.3.3.tar.gz 6808 SHA256 c4621b64d50be9461d9bd9a71ba0b4af06fbbf818bbd483752d95c1a4e273ede SHA512 4175ebb78228475b32744a59ad4c404f7b88344859c19874606967c7d83a4680bbc78ff42d13b866b8e6ef939d2f1948b0a0b42819c78a8520856bae48ec907f WHIRLPOOL 611928c70cad85d37089d233875820b6cf7c823f0968c5954fb8b0da8f0c008156b3fa22d3cf2e49b99276de9f76de549c99112c22bcf0ed9047a6bc8ca07c36
+EBUILD ntplib-0.3.3.ebuild 473 SHA256 6377fb92138a2d1ef652c0f5ad8b2e1d5b76c6629a73215a1ce77730856d1029 SHA512 aad0f2f1fa23170e6f1e0647cdc761317cb1fb66e237cd673d3aa69ebc767a447980699747adc2c87979505a7fcb4fd7eaeb1abd4a003510d55390d2f73138fa WHIRLPOOL 8f5e2f1de04a0d898f9b50108c377fb2cbe73ca9625a6f3da632a179f2fd35bbadafe8f99213c2691ee631e5911f5464f05a1a8cf4aa0b158d43731ba0eb6a17
+MISC metadata.xml 287 SHA256 525b667fd7f6c3631ffba0bc8638ebc7894db5d4c911ff556a05e44a0b25cfc0 SHA512 d256e098bdba17370fff6e829dc5eb5b416fce97370aab0b5c96eb2be30376d1295d502731266a975e81001f098f8f030d7b1fb57b3942ef6f20dc99cfd0efe6 WHIRLPOOL 0d18e1e0be9df348f8fc192f4eff4f55c4d26f3712178ec3bbcade795dae659bf205c958a28d77533b654a6f422e1d99317c4a88296fb5f5c2e07e82649f88d4
diff --git a/dev-python/ntplib/metadata.xml b/dev-python/ntplib/metadata.xml
new file mode 100644
index 000000000000..081f4bf20375
--- /dev/null
+++ b/dev-python/ntplib/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">ntplib</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/ntplib/ntplib-0.3.3.ebuild b/dev-python/ntplib/ntplib-0.3.3.ebuild
new file mode 100644
index 000000000000..0d862b5752b8
--- /dev/null
+++ b/dev-python/ntplib/ntplib-0.3.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python NTP library"
+HOMEPAGE="https://pypi.python.org/pypi/ntplib/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# tests fail with network-sandbox
+RESTRICT="test"
+
+python_test() {
+	"${PYTHON:-python}" ./test_ntplib.py
+}
diff --git a/dev-python/numba/Manifest b/dev-python/numba/Manifest
new file mode 100644
index 000000000000..703cbc5dc2af
--- /dev/null
+++ b/dev-python/numba/Manifest
@@ -0,0 +1,10 @@
+AUX numba-0.19.2-docbuild.patch 601 SHA256 a2703db1f22da6cd2adc5814fcaf1fdb24006ccc07d2b046e2d2968114af667f SHA512 86c0ea1f45436c4ff89bed5c00da5ff9be92aa7bf445e37165d174f7e36a0809c48d0f7db665e3c171748822e7f70cdb8dd6cd0396b5f98587fc426de455f033 WHIRLPOOL 5edf6e57746dfec105878e467d9b97171551ee2ac3f78bfa31a9c84c755dcbcabccb17be56c717487766c0cd0a3d5dd6fb99bfa9e1cf688e9ac0b7a33342a42f
+DIST numba-0.27.0.tar.gz 1247144 SHA256 aa75fc2ac7d958d4ac84ad55b279dd95ee5e6ffd247fdcf04800f167731184ca SHA512 3c84fa58bc5e84683b5e593b99f8c48cfc6e9fd0f41a2a18d8a4d9deba618cec1e764a0202bb71166cbeebf27b908044be29e3b183b01f31edc8e85c962df876 WHIRLPOOL 178ec9ddaf5d2a9594eb808350d5e96a8b78ef643595aa6d02d581a7cfb7c86ae4902fccade874244a286957a9d9f4708c89d48d2c914a3528b9abae9db181b2
+DIST numba-0.34.0.tar.gz 1603388 SHA256 d2575be1564883960ce38e684adab62d673917ce90d1a70a0ab6c42a45e9d059 SHA512 270bc9b2ea86e96285bd4075a216a31c3654b782e5e7fb26824ed0e57283a48f753542dab54995c14c0c7c303d8794659a1155eba1deb121c670fc4edde0f3aa WHIRLPOOL 9744c8daff1e22f75854afab93093823cbe01fc75b4c4bb074abfe407dd912f2242f143a8e7580f63a8e01df03d52c36cd23b2566af735dc4caec3c823ea4f83
+DIST numba-0.35.0.tar.gz 1647189 SHA256 32716ed34973326b72d535cfb045b58d1972f1605eb2a53001158dcfb0f155cc SHA512 48ee1e33e7ec1327a78c3485602e911f045df8b8dbb69da3004133e6da8cbb52388712b4aeffa1e41b83d20aaa88cc8c1202ef35aabbf3e0e04ad2875df789f0 WHIRLPOOL 88b9baa5f9b367b1ccfe5cadf534fced9a11d7e44dfcfe0dd0359bcc53485a7a7589adf8115ad66ecb5bb369d7aed1b3ccee232517976b7bedf464435676472d
+EBUILD numba-0.27.0.ebuild 1758 SHA256 768dec222c57ceffdebd489dcf3e86b6ed6e414c551c6a6b81914916f2a61049 SHA512 b0a95ebb91248e955d360be197ba967317b06be161bdbf01b4087095d7bd3135cb3fd3a41d947f9117167adf2a75c6e9cd11a2c5aa9b5643f01d9ce89959e5c8 WHIRLPOOL 9c6a70cc9ab5c4552b246a535152384293404bcc44f9c32087462a6748d0395ee36f51d92f5699c5f862c2f1d7a8faf2f12304aa9ae06bf8ad70fa8d335e8827
+EBUILD numba-0.34.0.ebuild 1067 SHA256 040dde591a5f2734944a4f18b3884c364f127231e9d1757b99718d29dd5a4861 SHA512 7a7dd64c87efd361f51529ac7d361fbd7eb8959764dd66ed9ccbd5296921d04b08a32adf5bd203aa4005c9cca9e0fbd87f2438e972daa8bf1596fb030e8bf196 WHIRLPOOL 3eed2bf0fe2ea975d975a5205670ef2f53ea89abaf68c64bdf67a942e71be321cb7f73fb39f0aebe0cf9ab0bd88b2d6e4b028eea5bb082c7bdb1556ffc09f392
+EBUILD numba-0.35.0.ebuild 1067 SHA256 040dde591a5f2734944a4f18b3884c364f127231e9d1757b99718d29dd5a4861 SHA512 7a7dd64c87efd361f51529ac7d361fbd7eb8959764dd66ed9ccbd5296921d04b08a32adf5bd203aa4005c9cca9e0fbd87f2438e972daa8bf1596fb030e8bf196 WHIRLPOOL 3eed2bf0fe2ea975d975a5205670ef2f53ea89abaf68c64bdf67a942e71be321cb7f73fb39f0aebe0cf9ab0bd88b2d6e4b028eea5bb082c7bdb1556ffc09f392
+MISC ChangeLog 4407 SHA256 567e55fe519329409b76809ee7c99c9bff61ebcfc8ff0e5a7f9d801e6e06034c SHA512 62f3ef25337ccdfda8ea3419f542fbb8e007f5b528b75b6a30f48ee4efe8755e6305bf9154522b1767ab5e5c4c8445b189f7377cef97a1a2f1593c185fcb248d WHIRLPOOL 5bced9c7628da6db206f1e80daf63cd3aec56bfb9815b79ce3d4562f7559b6ba4d9078503f93068d9cbafbb739ae96333775326231dd691886fd546b59453bf6
+MISC ChangeLog-2015 3051 SHA256 aedd5545140df6e4d6106b5ce4abdf221baf266de398e6bb42d69554b6840d05 SHA512 136dbbf36b173f18290797ef1d0ecf1f53ef15065f575cefa7227bc351a72b994389da1b1d52f9b7cb55ff877b7bb055ca2b6ecfc58d9b3031b65c4ef7cfb170 WHIRLPOOL e2db4f0d858dfe1158f45b3ee7d449276dec9b4903ff39a2d9489103594886d3588eeb09fe8334e1de91377cf6940364e2f450caea6aed2308c46e07e1696fd9
+MISC metadata.xml 817 SHA256 ddc75e4f4ec49e40e9082a4fe5f5a03b7c1fa470ec1d5a03de43e8d3726da3fc SHA512 16271bf2dba4edb77e4cf05f95e9bea6c5534890c1303f6d10b9b7449a26b05ab43acc28fd5691d1433ce15ee87214c5a414dc652eb019bb1fb87acfa37150e6 WHIRLPOOL f68b0ab7292f908b806a27f1ec2d0b927baf0d406dc3ee7f769cb43c5bef1f1b52022e651abf0c995dd7e52660d11328a557b175d5cff3049694559060844293
diff --git a/dev-python/numba/files/numba-0.19.2-docbuild.patch b/dev-python/numba/files/numba-0.19.2-docbuild.patch
new file mode 100644
index 000000000000..1c8853c1b11c
--- /dev/null
+++ b/dev-python/numba/files/numba-0.19.2-docbuild.patch
@@ -0,0 +1,17 @@
+Delete intersphinx, delete entry to set sphinxjp.themecore which is absent from portage
+diff -ur numba-0.19.2.orig/docs/source/conf.py numba-0.19.2/docs/source/conf.py
+--- docs/source/conf.py	2015-06-28 15:19:14.573386743 +0800
++++ docs/source/conf.py	2015-06-28 15:20:16.808191183 +0800
+@@ -36,12 +36,9 @@
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+ # ones.
+ extensions = [
+-    'sphinx.ext.intersphinx',
+     'sphinx.ext.todo',
+     #'sphinx.ext.mathjax',
+     'sphinx.ext.autodoc',
+-    #'sphinx.ext.graphviz',
+-    'sphinxjp.themecore',
+ ]
+ 
+ todo_include_todos = True
diff --git a/dev-python/numba/metadata.xml b/dev-python/numba/metadata.xml
new file mode 100644
index 000000000000..2243f301d1ec
--- /dev/null
+++ b/dev-python/numba/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  Numba is a NumPy-aware optimizing compiler for Python. It uses the LLVM
+  compiler infrastructure to compile Python syntax to machine code.
+  It is aware of NumPy arrays as typed memory regions and so can
+  speed-up code using NumPy arrays. Other, less well-typed code will be
+  translated to Python C-API calls effectively removing the
+  "interpreter" but not removing the dynamic indirection.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">numba</remote-id>
+    <remote-id type="github">numba/numba</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/numba/numba-0.27.0.ebuild b/dev-python/numba/numba-0.27.0.ebuild
new file mode 100644
index 000000000000..38e04d182f3b
--- /dev/null
+++ b/dev-python/numba/numba-0.27.0.ebuild
@@ -0,0 +1,65 @@
+# 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
+
+DESCRIPTION="NumPy aware dynamic Python compiler using LLVM"
+HOMEPAGE="http://numba.pydata.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/llvmlite-0.10[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( virtual/python-singledispatch[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Delete intersphinx & entry to set sphinxjp.themecore, which is absent from portage, from conf.py
+PATCHES=( "${FILESDIR}"/${PN}-0.19.2-docbuild.patch )
+
+python_prepare_all() {
+	# Re-set them of doc build to one provided by sphinx
+	if has_version ">=dev-python/sphinx-1.3.1"; then
+		sed -e 's:basicstrap:classic:' -i docs/source/conf.py || die
+	else
+		sed -e 's:basicstrap:default:' -i docs/source/conf.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake -C docs/ html
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	${PYTHON} -c "import numba; numba.test()" || die
+}
+
+python_install_all() {
+	# doc needs obsolete sphinxjp package
+#	use doc && dodoc docs/Numba.pdf
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numba/numba-0.34.0.ebuild b/dev-python/numba/numba-0.34.0.ebuild
new file mode 100644
index 000000000000..40122f0ca614
--- /dev/null
+++ b/dev-python/numba/numba-0.34.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="NumPy aware dynamic Python compiler using LLVM"
+HOMEPAGE="http://numba.pydata.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND="
+	>=dev-python/llvmlite-0.19[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	${PYTHON} -c "import numba; numba.test()" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/numba/numba-0.35.0.ebuild b/dev-python/numba/numba-0.35.0.ebuild
new file mode 100644
index 000000000000..40122f0ca614
--- /dev/null
+++ b/dev-python/numba/numba-0.35.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="NumPy aware dynamic Python compiler using LLVM"
+HOMEPAGE="http://numba.pydata.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND="
+	>=dev-python/llvmlite-0.19[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	${PYTHON} -c "import numba; numba.test()" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/numdisplay/Manifest b/dev-python/numdisplay/Manifest
new file mode 100644
index 000000000000..5497d033902e
--- /dev/null
+++ b/dev-python/numdisplay/Manifest
@@ -0,0 +1,5 @@
+DIST numdisplay-1.6.0.tar.gz 27397 SHA256 66a702b881aa54f31b7e5e3b7283fd75f8ebd469133e5a3e1943928c82fccc34 SHA512 345aaf360ff8768bd3ddd0b176c4369e38b43f6883a841a7d1cd3d8a15f0f95309c1949126afa0e37bd569371b483b5885923e7048f09a46086d192a3894bfec WHIRLPOOL cef9e62e018b1a19ae4e18380776bd92b21431aeb19516023bece8221052ccaa2244fd7513061c7f9cc43f220eedbcd3a802a175300d8a745fb002761ca4edba
+EBUILD numdisplay-1.6.0-r1.ebuild 607 SHA256 57c0ae7b505b173424d34c5ae14e726b4a90149b626c230b6a6f85bed0eea500 SHA512 7d674e5857a17f2073d5a334430576fc40ce39bf5131211bfd72980f38253b7e818b7ca6d8fde8a3aa2d4ba0d75bf69b57aa08b43c9c03769769aca8d900d158 WHIRLPOOL 09a8483d4c75c76a18c296e999148ca7982c0edc56f245ada528cb30c86b50717fd6330abc6a5b44af5fdcdb39259632561def047e4e2853f885372698b83270
+MISC ChangeLog 2444 SHA256 1e76f2107e65814c29111996982f7de0f6858c355b819b00c80ec3d53ca52542 SHA512 4f9b56c4b9df4a27178faf47ebe9fee59d8fb0c5c95de2699a4da000d2c415dcb518816dd7c0c4e24f05588477a84daae70508add52627d1689bd12ef8f953fb WHIRLPOOL bc4697bb3808614792c90cb6c61b377d903724bc4b7415a04434cdd743cfaecc698298ee89201376a18b1380e4e772530e0216881bfa8af2ac8305b7d9c651ba
+MISC ChangeLog-2015 1715 SHA256 3810d0397a43f7980d726a04c22faf8bf5f619914b6287084156e6d9e12807f6 SHA512 bc5afe606b5994a05122ddaa0d2e99cdb33a515edf6ec6f38f046254492c6d5185b5281effb8371240b98b57c0803d20f2b7f978a78a4c9bc0e6bfbc7fe5bf35 WHIRLPOOL 9acdc350097b9728b402ab3b347eb52b1f5c7b3d567ddb08d98adccb8d1c1c059c610c3d77ab616ab4fbd2e65b819ed6265c96002fb1720d2b5f1cb8487e90f5
+MISC metadata.xml 480 SHA256 76a1e205f3e19d261bbd0daa903ac8689351a8cac490bea0beda550bb05fc768 SHA512 4625694205940363584c45faa2de2207fef7adf3490c9883efce85d743d4a56427735a6d632c0132c6273e5657f9d5bdb5cf702d817892934fd539e09cbf6ba1 WHIRLPOOL 697dfb4c4c6695ccadd279109273d70d71714ca35e33c8379ac6c191a0b7f06c2a80d2776d3ab9e081f7fc6cb310a2d7e9b07a9fc807f2489280ff44689ffa68
diff --git a/dev-python/numdisplay/metadata.xml b/dev-python/numdisplay/metadata.xml
new file mode 100644
index 000000000000..0516bbe6d04a
--- /dev/null
+++ b/dev-python/numdisplay/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
+<longdescription lang="en">
+    Numdisplay provides the capability to visualize numarray array objects
+    using astronomical image display tools such as DS9 or XIMTOOL
+    directly from the Python command line.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-python/numdisplay/numdisplay-1.6.0-r1.ebuild b/dev-python/numdisplay/numdisplay-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..3be5e0fdc6b5
--- /dev/null
+++ b/dev-python/numdisplay/numdisplay-1.6.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package for interactively displaying FITS arrays"
+HOMEPAGE="http://stsdas.stsci.edu/numdisplay/"
+SRC_URI="http://stsdas.stsci.edu/download/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+python_install() {
+	distutils-r1_python_install
+	find "${D}" -name LICENSE.txt -delete || die
+}
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
new file mode 100644
index 000000000000..99ef22beae62
--- /dev/null
+++ b/dev-python/numexpr/Manifest
@@ -0,0 +1,7 @@
+DIST numexpr-2.6.1.tar.gz 90819 SHA256 db2ee72f277b23c82d204189290ea4b792f9bd5b9d67744b045f8c2a8e929a06 SHA512 07c88b1788ecad2c59260e7a6a15dfc21d486462a8866091d157286e5ce3b5b77f5fdab401fd30e2a5e4880398af53641d557003497c7d3658421bfcff38c31c WHIRLPOOL ef77ff356f79d2171685aa1267a63dfbd89a120300dd970bb9768df611a734483e21f78d4b1b09c4f3a5943cbbb6e9b48f03191bd7738063df076c07b6663a49
+DIST numexpr-2.6.2.tar.gz 90970 SHA256 6ab8ff5c19e7f452966bf5a3220b845cf3244fe0b96544f7f9acedcc2db5c705 SHA512 730e19e61987ecb00bfc3a65db043c88a1311046f2ea5f0a48c93d6a8d7576dbaa166b0b9b0f547e344b21b5c269be1b5aa2097e88aaac55219884c7ece55261 WHIRLPOOL 2611a752d73fc43d5420ef8001d92bfe0abba73369ce56faa41f56f4324cd0f06990f6d83d70ca66694d7fddeaf6406c91f217711108ceb720605efbf5616055
+EBUILD numexpr-2.6.1.ebuild 1385 SHA256 3d601a3cf457d887cc39e6cb761709619765983957d5fd3611855f416379c554 SHA512 dba9ff2f89c309efd420ef478a1fb8bd75036eeeb66d758c008ca5e8dc33d43f95886fb8883feeec7861108b8173f54b764852f1c5993e19f30d8cff9213e50a WHIRLPOOL 03b4b717712387175b8b0a0a8022db563500ed6bc589abeac8ac8d151c94474241527aad2ac3507faad162f9b80afbe7a4dcb4be2831b98d159a8d8324109b4b
+EBUILD numexpr-2.6.2.ebuild 1387 SHA256 aac684d8ba3918c7e164578d4599fd28b54aca5d49b2a4805f752e2e8f48dac5 SHA512 52618df3453f10c49578df1a8a341978d4908c366f7af3975e8af85086d8f668ec42952fcab02b5e2166cff6020178fc015a0cb3038545979318014206d78471 WHIRLPOOL 03a88f765a4fff8a0a729147aa224ac3a72ff7f76439ba2663c634420e11edc88ef99aa8444eca405c398c415266a52d30952e43294c3a978e6c2b5a80d226d4
+MISC ChangeLog 4671 SHA256 dd434ccf4732ac19b6a74cc7c9cb54e9dc0c793666b6ce47a6939ad9d6a91756 SHA512 6f376aba305e28030a439c2fbe7106c4c7501d8e6e7e6089ef36ae2a1e82f885f9be581975b4e7a066b1c320221db49b6f3646ad4bd1f4c29522f649e4d4d47b WHIRLPOOL aa8e8c414a9c6b87cea26e0170bf423206dc2ed24feaba537c395e76e08ad7e8b4579f5649bbacb7215f7408486a2fb850bda3677d899022a190eaab2e273981
+MISC ChangeLog-2015 4121 SHA256 55f6ecd73d3a0b6d85202453e00ee99d99559a184c1c8625ce82d239ca47ced6 SHA512 8a40e090205750749700cb0030a883bc4458ef17a3b62ac03125ba17dd34876ce482bbc7d898e078f6a49d2c7ab5ae741586c886dfbf0a2bd50e4372c0e73fb2 WHIRLPOOL 2ddec63235a0595a59e2c51576f91377a44aeaea06afc9febda899c6a4fff927bedc7c171d44574326a4b3774d7aa578263b801767c7698f2bd5d413b2e0ea46
+MISC metadata.xml 1086 SHA256 ba424d94f2cb7ff738964a6e75b9fa90ec41f8d13cea4167715b902545536a51 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824 WHIRLPOOL 3ec2822aa9cd842dca82055684e47f3432a49af70b4670f570fe62dc56b50313c026601805a602d11ff478f1701c0bb1038e39de05ed1647490149a0065853c0
diff --git a/dev-python/numexpr/metadata.xml b/dev-python/numexpr/metadata.xml
new file mode 100644
index 000000000000..2915727b034f
--- /dev/null
+++ b/dev-python/numexpr/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  The numexpr package evaluates multiple-operator array expressions
+  many times faster than NumPy can. It accepts the expression as a
+  string, analyzes it, rewrites it more efficiently, and compiles it
+  to faster Python code on the fly. It's the next best thing to
+  writing the expression in C and compiling it with a specialized
+  just-in-time (JIT) compiler, i.e. it does not require a compiler at
+  runtime.
+</longdescription>
+  <use>
+    <flag name="mkl">Enable support for Intel Vector Math Library, part of
+  <pkg>sci-libs/mkl</pkg>.</flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">numexpr</remote-id>
+    <remote-id type="github">pydata/numexpr</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/numexpr/numexpr-2.6.1.ebuild b/dev-python/numexpr/numexpr-2.6.1.ebuild
new file mode 100644
index 000000000000..453de3de466f
--- /dev/null
+++ b/dev-python/numexpr/numexpr-2.6.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
+HOMEPAGE="https://github.com/pydata/numexpr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="mkl"
+
+RDEPEND="
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	mkl? ( sci-libs/mkl )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# TODO: mkl can be used but it fails for me
+	# only works with mkl in tree. newer mkl will use pkgconfig
+	if use mkl; then
+		use amd64 && local ext="_lp64"
+		cat > site.cfg <<- _EOF_ || die
+		[mkl]
+		library_dirs = ${MKLROOT}/lib/em64t
+		include_dirs = ${MKLROOT}/include
+		mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
+		mkl_intel_thread, mkl_core, iomp5
+		_EOF_
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS}"
+		append-cflags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" \
+		-c "import sys;import numexpr;sys.exit(0 if numexpr.test() else 1)" \
+		|| die
+	pushd >/dev/null || die
+}
diff --git a/dev-python/numexpr/numexpr-2.6.2.ebuild b/dev-python/numexpr/numexpr-2.6.2.ebuild
new file mode 100644
index 000000000000..03821ec488ab
--- /dev/null
+++ b/dev-python/numexpr/numexpr-2.6.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
+HOMEPAGE="https://github.com/pydata/numexpr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="mkl"
+
+RDEPEND="
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	mkl? ( sci-libs/mkl )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# TODO: mkl can be used but it fails for me
+	# only works with mkl in tree. newer mkl will use pkgconfig
+	if use mkl; then
+		use amd64 && local ext="_lp64"
+		cat > site.cfg <<- _EOF_ || die
+		[mkl]
+		library_dirs = ${MKLROOT}/lib/em64t
+		include_dirs = ${MKLROOT}/include
+		mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
+		mkl_intel_thread, mkl_core, iomp5
+		_EOF_
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS}"
+		append-cflags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" \
+		-c "import sys;import numexpr;sys.exit(0 if numexpr.test() else 1)" \
+		|| die
+	pushd >/dev/null || die
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
new file mode 100644
index 000000000000..f648ed65165e
--- /dev/null
+++ b/dev-python/numpy/Manifest
@@ -0,0 +1,36 @@
+AUX numpy-1.10.2-no-hardcode-blas.patch 3295 SHA256 fb1ac68398a9c4fbf2396083e85480d46077d7b29069d8b62c4a929ab48216d1 SHA512 456f3b7016d12fea49c8db08cec81e207575a28018490c5b2eece8b4167e22dd93a5811d90f43435a0341ecb3a3cbc6c2fd804869ba9d96b7b2382736805aadd WHIRLPOOL 2a34f1f6f6a3a37a67b7cb1419b0aca7891ab9375cb5489f4ac974e71dff9f6e9442d0b3414437bf3010f271d7782b89b111ef34dcee1530c39e43bebe1a7b08
+AUX numpy-1.11.2-blas_rec_inc_dir.patch 958 SHA256 81d7cd91ad08cc5ae26cb16e955b1b52ba7c373d38b27979e868b300e782cdf8 SHA512 c1a10bc9f14fb42e2bd3e361059cde594c539e360f4388cb7fd202e49b2aee6b2e2d9e299094aaa7972a7495e792c1d3dce23da6813d050f66fccefe41b66228 WHIRLPOOL d13a5d51f5d6189372ac732cdc2f94d14b54fc5faa5d44174dc5377a491b8f50f0d14868a5aaf10c0abd0f5b5d3f65bba1f97a4961063ce161aa97da3fbb5193
+AUX numpy-1.12.1-no-hardcode-blas.patch 3473 SHA256 6c3563123a6fbc8c76648c5c4875af694d161ad8294b02cec3014c10e78c2d7f SHA512 0066fdc822151b13a4f91cab522000ab43bea52539100070949d08e0baf6bd35e9c32e13e877e22c40041c3fa0e8d716d802087b3c9016d6c1e05edd0e48fd6a WHIRLPOOL 700003d10c0681f0a41dd487eb0b2171042eeed70d667bd86fea4b6c9fc8ee842bbcacc6c2bc0d430a1213e311a01fb8ed465ed5b52a11565a2639f3159f8634
+AUX numpy-1.8.0-no-hardcode-blas.patch 1153 SHA256 ad79d788189db97178b73f019a47c502bb9297ae7a1b248da878f3f91ab8af3b SHA512 baa29a0c981ede608d890e776026961fb71156eb7804f702623bce775e3b6ce3bb28ced252d9c6fe991429b690b3eef8468d703f79247820527648d6484d23f3 WHIRLPOOL 38db4618b8fe505b711270b9050c56c1541c2fc3094b02ef6a45e776d56f54fd82b79ddc1b65721e0ac08949c6b9354da8c6ae0437b77e3b474ca941d44de9bb
+AUX numpy-1.9.2-no-hardcode-blas.patch 1821 SHA256 a51524eb39ed9f71667e89179fda3e16a974949629b9a0acb7a0994202a2db63 SHA512 59d498f7b0a1e6f4bc37e0eb7121812e1fe974e06176c7b80e99e41c49067a618bc98d925bcb667607462f5e7823f0f55235c8ddd685e318dfb3385b7eb7dad6 WHIRLPOOL 09e8cf5f27431fa7d5028b5d73690492e7da061f8ac5b82be1d1dbcc46c61c83cb6c5c3fb5f112bb61776075b98f7e1ef7b8a9fd828986f2c4b9358d9acb8d97
+DIST numpy-1.10.4.tar.gz 4069996 SHA256 7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79 WHIRLPOOL 76946c2543b1cade06d71f83fd507bd818c1090baa9c3ddda7d1f48d48ed23672c5d9de76db890df990c6d8b7b26b71d3ce733c448943ad4177374a957360d1c
+DIST numpy-1.12.1.zip 4824784 SHA256 a65266a4ad6ec8936a1bc85ce51f8600634a31a258b722c9274a80ff189d9542 SHA512 156319821e4f0cf8d820e977da704aab274b7a4a4b792f6e40d7c0f2827700c990f55f1ca9650523c62c9e937f0e75f336d091d46ca47aaa9875c68fe32bac2a WHIRLPOOL 1ecd1df77d2a64bc6db1910446f60b477ebf5a1cf33ec2e1fced56dbbf1a7df5fef004c7f84f0dccb0ca20ea7ab73c384e4d247eb9700159a18c9a4a51e4db6d
+DIST numpy-1.13.1.zip 5012881 SHA256 c9b0283776085cb2804efff73e9955ca279ba4edafd58d3ead70b61d209c4fbb SHA512 bfa97ca4f958b04c158a4bcaa366ec2645c972654bd65fb20c287806f40fb7a04b8cc1f1cefb350d477488a93029d75a9f06d01c300cfb1805dd10819a631c43 WHIRLPOOL 9553d157f297c2bf385f16290f7596913d59ba30077a82ff7fa2969f87ea9ba57f88d38cec42aa9a81c4a15096ac0aeb4c409f42fa4b714a9cb45ee904c1bdf0
+DIST numpy-1.13.3.zip 5021189 SHA256 36ee86d5adbabc4fa2643a073f93d5504bdfed37a149a3a49f4dde259f35a750 SHA512 b77969372c8463879b452dc54830afabb719e6814a2bb1ee0062b463155ac709d1cd48839b28b74aacaee8aced7ee35870ba43d59293ff54f90bc0f717ca7737 WHIRLPOOL 8655c99a09ce73d8cd1621dd759c7658d04e2e20a41b79b0bc61ab75fdca1b77964f7dce12ebf065d92c4977845c32089f6e0761b843dd7eb28cb108776c4aa3
+DIST numpy-1.8.2.tar.gz 3792998 SHA256 6d487fc724780d66746bde264ea71f5cd77d3a39e52ee2b073dcaed63bc669db SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c WHIRLPOOL 0d3a05b1e3c0a1ceb0a7b4818406dbb45506e5f25bc2727d4ff44cc0a0520e6556b3c68ae24dbca37ba9d67ae2defbb3ff9c906d4c2635b29ed44452d70e8311
+DIST numpy-1.9.2.tar.gz 3986067 SHA256 325e5f2b0b434ecb6e6882c7e1034cc6cdde3eeeea87dbc482575199a6aeef2a SHA512 70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9 WHIRLPOOL 59f5dc52cb95c7ce80fec3a7feac6cfda1d149596bf6d95c18bd8314e31a8df494b2b470c4cc3d8c296c9fc11c718d70d5b9b5344337175ca75496504c0fd201
+DIST numpy-html-1.10.1.zip 9663942 SHA256 4af48eb5abf2551f01d85aea7e9a99a30096777f02937dc185b16bb72a110366 SHA512 9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9 WHIRLPOOL d6c93e31e31c832fb21f117d03719e0375ee3d27fb6f7975bfcd12469df4a2ed0a25a16bd09a0e2113407446efc220e5bff534f7cd76a715c3d7df26c02f07a1
+DIST numpy-html-1.11.0.zip 9879611 SHA256 0244bff4b585ab417be963f492e69129e54bb83d630b463591f9e89c62807d85 SHA512 7bf416030c273c767a98d0f23adef0e5fd05f96f6bb911e32ec88821a5bc7c47a2799d33fb0706cb2d391ea6e47b3e0eef0d789eb1c0d81c982cfaa991a09822 WHIRLPOOL d7e81340aa1ec46c2b0d36b76e7a1e11ba7d1b39177a8168efe734936e1622808c8997a8cc22f773b9c3e17b51f5861e11eaf7fa89e9b0c61cae937ee7b5fdba
+DIST numpy-html-1.13.0.zip 10324817 SHA256 514f1eba1cfa04a34de79a20da6ca6883dc6e74ac19ecf237d2e4f957899542d SHA512 2dd769ec0d4967ba1797339170b0f9bf694a0a304cffb8482a037ba043a3bd3a9207e63a1ffed2d7ae96205d3a1a72fa1b15eeac4bd2e565544363dd9742f542 WHIRLPOOL 1151179991147698c5bb63d7a4fd9b6389d9251d915a67c54676edc0fbb14c1e9d7ffc69287527127e00c1ee2ca1af9a4a5c48d36608a951861222b49bc92e2a
+DIST numpy-html-1.8.1.zip 9703711 SHA256 f7fc3af4dba7b40deabd1828a86ea2e2eb5b9fa17c7ebddd73ee4cb8625105b1 SHA512 1d52c657931f4eebb5325159444aedd969b201f5098855058f1ef632dc8677372d632291154ebc3db9869cdb8abf7eb820eade1a9edba2d6be1ae918cb38c071 WHIRLPOOL e502b1416bad4b189773ba98035dfbeed0dc251d8f9b76e336450f14e8425caf92d55d2b1c2cc5ef9eb2d33eb2bf7cd55e720c1b265e45539b195fea1d7f046c
+DIST numpy-html-1.9.1.zip 9839137 SHA256 12a24937f8273fcf79090c99b6c4154a0ecfc378386498cf2afe727ea171407c SHA512 647a6be9f93995aca14185e283a2b412678c6e8080fe4f14e7cc9ee63c28eebb64dea6bbe28f30ef6850a5565dd1e06928fd660ac762e9a91454d309eff96ed4 WHIRLPOOL 68c367fd0416d27b1cf43edf7ca48bc8845c02856bbbacdf63c88fe8bbffd5dd86fb3e5cdea8f669dd78adf7bcc4d184953048783802df323126c1b22baf8e92
+DIST numpy-ref-1.10.1.pdf 5382006 SHA256 72ae03348d0375ff2f18056efd04e815cc1d27b738d0685c80f5204a496bc279 SHA512 25085eb7cb80343abffe04ee01ea93603427913ba4443fbfdaa1ef1ad07a8642c47259d0bb1cb91a9059f786c03395bba76f608c6f0a2fd26d1afec4847d885c WHIRLPOOL d904d9b2824bfb08a0eeffeb37f7d646d003c39230d950d387e2ddc8e475a117b8305a0ce3dc479be72f010b1a868f22ddfde17e6c4cd7c56630bbdf09afb90e
+DIST numpy-ref-1.11.0.pdf 5310792 SHA256 a975923b98f4dbd5a4736ab1c74a1c6393f422e3d1f9184bae2f12f041e3ac3e SHA512 a6bed225428645382846fcd60bc7961a44b0dc24cbfab3b4d0a1cee53092860f9db6226faf6597241ad6b9d6034837aace11214e0fc0c338702a574a9acf28df WHIRLPOOL c8757da7b11e4c47813112870dc96868d7bc6886d9454c0d18c6f8cad12c00a2185288233ffc41b580e9e232a1eaa4a19776055cff017ae56ff483fff0da1af1
+DIST numpy-ref-1.13.0.pdf 5047809 SHA256 954a70e3724680603d40ad287201b7999aedd3e803033066f11e95a25a7d4028 SHA512 0fe28be029602f8b8dc12987da273581b42f123a9d605321084d4c05233cd31ccff0efb17b99c3e8cbfec5f8de11252a99c1ee5c43d37aa5fa57d712f4bb4aca WHIRLPOOL 42719ab04688fb27928b286cab1b7427b7542dc7754d598e284243092c371975c49e1b25e4ab1d37696da7021ea2c1841b0a3e798b48a1ecbc1299159165bfcc
+DIST numpy-ref-1.8.1.pdf 5348248 SHA256 973851e66d0d5ab095f444f8aeb966fefe2dd544226395abbb110fc1b60f351d SHA512 340dd8f47430f24fea81bb3a8674e1a58f4290a9d1c5d64bac96d50b31a94a770e78381e42daf8b0a6a90cefe5cafe86b0c89f7cc7635a042a7e85eb74bdbdf5 WHIRLPOOL be13f88bb68944186c564a5c3789daededade240a26e7fb61c980a090249ab3a5b1f40805e97214168fbf0c099fb6b12d981ff313bace572f130023b29e7aaa7
+DIST numpy-ref-1.9.1.pdf 5318122 SHA256 3c8e5881a3460e1cc9da95fe2167044e8f832ab8e980c3606d1f353e7ac6dcee SHA512 5171bb22588117a53e0eac355520581f7817a7e7a099ae83bb73f2ac8248a60e139ae9719dc543b44f25ccf8319c9f149fec1bf5aa55d943fad06a8e6da0d9ba WHIRLPOOL 5c99daf3ae2e6bf235aed287682f1b96d5b6afc9d290f544a8baab892b39c9f6dd9f649abe3e103cc90c990d87e4d653d8157d774a8bd35eccc9cc6ac7a870f9
+DIST numpy-user-1.10.1.pdf 406114 SHA256 5180a5a1333365e474aabba9d6edd25276e79179fd708bb3989d95dc4e76215f SHA512 998bce3777944e7b366c619e968ac4b6cc4351cd2819d6ecba7f422e20b6cd4d7332a8dede4036cd12e85b24c4c3d973bd9ef2d407610369c2591fce990fa8f4 WHIRLPOOL 4b53256663840738d288d38c4151e01ecfb515ebd4f69bb4330f4c5589642b3392a0a300f3def53df6bee8746f127a3af0d284601f288f4c4292df8b6de39f71
+DIST numpy-user-1.11.0.pdf 555403 SHA256 7ea6d24169d9e19d20ff131378d2bb5cd8b41658f242c87a1ffc53c3ac2e4b59 SHA512 8287acea5f6981119dfe223ff9cd2fd14f504b9a70418426ab716b80aea670b30249fbd727664ebf72d6d0660a84a57ff027a42cfe67946a7737a4308eebd786 WHIRLPOOL c72ad351a7f5cbd9c123c9d28c8178c7e463ee74e547a415d65dd6a5854fed090d86f9daa088eb79b48ca40e71d0ced5bc7cf938f631aece1846ae7eea9879b4
+DIST numpy-user-1.13.0.pdf 580593 SHA256 9bba988452f0e58c257833df80658509ccb85af5d946c55b19ffb16367f1704f SHA512 d3891d449b72c2d97af28182e0bcb12559abc114f8dbf0e0c68362c1af50e6aeab565b31b4aa44ab079e8d47f550081a79a4066c37fc52a1c70c05be45eb5c11 WHIRLPOOL ee8ebcf94ee49f892bcfcb4caec2b5fb0fe34ac47fcab9b3944f61522588a4ecf98a38c235a522cb06699e6ae5185150ba65cb7be96838cae7f88543a4447ea1
+DIST numpy-user-1.8.1.pdf 408305 SHA256 be827f2d92ef86c3af7f59c623017e7bc23ee95c64f88e8c9871f3ad1f99b262 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c WHIRLPOOL bf4105093b208b35b1914e842821b8d289b46eb28f1fda110643f5970bbfafe801e9d148c5f535b43eba9a23e09d333e3aecd9a55b33e64827883d253477d19a
+DIST numpy-user-1.9.1.pdf 418111 SHA256 e1f6baed0b73f3d4b106c88924c083f9a519e860c1beb718830bf1aee1892232 SHA512 724302468a8e93daf70d379bb1ee7369953e297c40ea260f080b7aca3c9c81e619a81705bdfb2ea214da5b5325ec2b48e953eceeaa1d60c07593b00c35989f45 WHIRLPOOL f93ed20c5da7b379e3afcafab97c7eb60231ed4f73cebf18184e00b9a8a5a531fa32992f7f28f16d2714b3056c61153c29267c8c6b93cb100e06f53bced1bd6a
+EBUILD numpy-1.10.4.ebuild 4071 SHA256 229b5c44cf5ceafe57655c019b745c8625243f2b89b40accecef3e40776753e0 SHA512 28e2eb0295bf441e968da89cba927fcebeebe8def30cbef8fba2e0f6c1b653249f26abdaf3d6796cb933e2604efc56fcf532164088a73a4e057f6ae072dedad8 WHIRLPOOL 82198bb402f1067e640a82d0845a107f2746fe0f13f1994264dcdbe51d6f88d2137b3e9bebb83212daddb9587a0d8255e81f9ab83e60c69c4d0f037b7d18fe6b
+EBUILD numpy-1.12.1.ebuild 4611 SHA256 3b58456ab7d1c5284d6fee532317e089955c201d1196bca1a26e8583d9d48b8a SHA512 13ce9b1985f951c8a658b5f43d1abb294b2e20182df5c9e60212a93b625d014aeef875de5d1101e46198cfee7bac4b987485b642f8c152f79989168b5fbe36ec WHIRLPOOL c6c937a75da9e4aa2f8d848f2675a2edd01baf718eb2cf842dd85031695cb6a9e75d05c1ab735e4e924a065284d8b37a0331e2d7e469d08f2d16a9913104ad75
+EBUILD numpy-1.13.1.ebuild 4621 SHA256 e86379d181698088b034aed161e68239229e21e801ee92030fad349c20396445 SHA512 2a14957f44d34569efe69ffbdb2c6ec688080fce67c2423da9e4670648f67b6f7b9f9f01f5639d5a82f0c39e8d13af8f83aba89ca31446c57758faabfde81c02 WHIRLPOOL 10602b1f1aac4cdbe1adceb9e60368f317a4c6cb147f0b4bbbfb4c1d13994057e0431247d5772bc776ef11cc9a703b4c6180451e0646938d9fc67a027f73d2d3
+EBUILD numpy-1.13.3.ebuild 4621 SHA256 e86379d181698088b034aed161e68239229e21e801ee92030fad349c20396445 SHA512 2a14957f44d34569efe69ffbdb2c6ec688080fce67c2423da9e4670648f67b6f7b9f9f01f5639d5a82f0c39e8d13af8f83aba89ca31446c57758faabfde81c02 WHIRLPOOL 10602b1f1aac4cdbe1adceb9e60368f317a4c6cb147f0b4bbbfb4c1d13994057e0431247d5772bc776ef11cc9a703b4c6180451e0646938d9fc67a027f73d2d3
+EBUILD numpy-1.8.2.ebuild 3958 SHA256 215cb33bff16b3e2fe723ad6ec8a7e798f64d45ceb055cd20517d60a23f9b71e SHA512 c2ca2bbae41ae787a7d7c0bfdea213a217a67be2cc0c4f8e399ea9c81f0b777563194d733bd350ff0af6c2218c0f1a4f1792e1d77c1472ffdd9eda37e736277b WHIRLPOOL 02ec4a227860373f9ca7e540686f1da171a7da2ae100d1f5ab1e7d86e193c3220e649dd3b52e2e2dcb39175760e8e11f224c1e8b81bba04e1a27dfe81bc14f59
+EBUILD numpy-1.9.2.ebuild 3971 SHA256 1d0d855d76cc8bf011573d5b7aa5142ed058d2aa94d87d4bdd838681c788419c SHA512 b8228e945ed92b73041a676c412e66566333274612dec1f33ecbeb9b5a7ccba377c906fe429fdb760ceafc25fec6ff6a9b1c93655576af04c5ce3b8baa4010f0 WHIRLPOOL d22d4b9d6afd216effc4c3c20f680fe15ff75bae85387e5e5a3bd3a87e0509725d087a5cad651a750336cb86fe8e1b03f323dc3510739af611992705d2c65754
+EBUILD numpy-9999.ebuild 3317 SHA256 9c43124f8086f2d8897e46c1fc6f08c2d6aefb890419bf33ed78744876414f67 SHA512 047856959a3114cd55512cfe8b7029486a2c4e4f4f1f7aedf1184d444c95d2f0a248446745d93dfdfc85895af3875179bcf5dd2e2339e58efec02421b6a87470 WHIRLPOOL 7e2d4f94c9fcb55d3c3bd4234dab574a7eccd4ccbad9bfc3d5843663b98989734e8e1198a89f4b72c53790bc196f1a08aa997e3822fb9b550affcb979349ee48
+MISC ChangeLog 12773 SHA256 d8c37d27eff3e202ccf1cae00d7a0d3271a4359326954b21555d938add50a9a4 SHA512 ab7903bdc758a2e93e21a6747b1919fe9c9d764fe1cc0a87984026e3f9c8eb4e093b55095666d3dd669144a100061a25ed9413075cf88516313cd6051417e93b WHIRLPOOL 58018acf6909f319d6f0a9008e2bdcb5ab61923a9d7ff2763f169709a73eaec265e49df3fb213291827ef3de9461e17409a91b30453f3dde289bb28d70cc94a9
+MISC ChangeLog-2015 35374 SHA256 19e19effc6e923f564961baea6332d3e1e0eb7325839b2f37de16f5e7ad3f282 SHA512 fe7eb4e175850a8be72da34e9537c304ff3bfccdec30139aa2a969d8dc850225c664293791f0473bd359e2c01701cfef56963e2a53753f47d0e3f9e31d60b510 WHIRLPOOL 8cff531c64864b583d00df6a89bd78896173b92960d106a5acd6d30b56ee60222856cd64f96617d0117a138877a6562f57491b8a75839a7b5b7c39e5279c87d3
+MISC metadata.xml 876 SHA256 e95b995924f4ee2df04a6ca11978b72f204bba208e5979b3e4832998a5e954a4 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549 WHIRLPOOL 464a80aaf42947fa71b62134e77f788c5782441e79d0596cdbbfc81d8641c727298fb5eef4fe835c00ecb5ba9c7bd7f123ceff5eaa98dfb3aa9c45eecc75b8c9
diff --git a/dev-python/numpy/files/numpy-1.10.2-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.10.2-no-hardcode-blas.patch
new file mode 100644
index 000000000000..db4a47d4d67c
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.10.2-no-hardcode-blas.patch
@@ -0,0 +1,64 @@
+ numpy/distutils/system_info.py | 29 +++++------------------------
+ 1 file changed, 5 insertions(+), 24 deletions(-)
+
+diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
+index d7eb49e..aa62b09 100644
+--- a/numpy/distutils/system_info.py
++++ b/numpy/distutils/system_info.py
+@@ -306,26 +306,7 @@ def get_info(name, notfound_action=0):
+       1 - display warning message
+       2 - raise error
+     """
+-    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
+-          'atlas_threads': atlas_threads_info,                # ditto
+-          'atlas_blas': atlas_blas_info,
+-          'atlas_blas_threads': atlas_blas_threads_info,
+-          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
+-          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
+-          'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
+-          'atlas_3_10_threads': atlas_3_10_threads_info,                # ditto
+-          'atlas_3_10_blas': atlas_3_10_blas_info,
+-          'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
+-          'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt instead
+-          'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # ditto
+-          'mkl': mkl_info,
+-          # openblas which may or may not have embedded lapack
+-          'openblas': openblas_info,          # use blas_opt instead
+-          # openblas with embedded lapack
+-          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
+-          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
+-          'blas_mkl': blas_mkl_info,          # use blas_opt instead
+-          'x11': x11_info,
++    cl = {'x11': x11_info,
+           'fft_opt': fft_opt_info,
+           'fftw': fftw_info,
+           'fftw2': fftw2_info,
+@@ -1690,7 +1671,7 @@ class blas_info(system_info):
+             lib = self.has_cblas(info)
+             if lib is not None:
+                 info['language'] = 'c'
+-                info['libraries'] = [lib]
++                info['libraries'] = lib
+                 info['define_macros'] = [('HAVE_CBLAS', None)]
+         self.set_info(**info)
+ 
+@@ -1722,16 +1703,16 @@ class blas_info(system_info):
+                 # check for cblas lib, and if not present check for blas lib.
+                 try:
+                     c.link_executable(obj, os.path.join(tmpdir, "a.out"),
+-                                      libraries=["cblas"],
++                                      libraries=info["libraries"],
+                                       library_dirs=info['library_dirs'],
+                                       extra_postargs=info.get('extra_link_args', []))
+-                    res = "cblas"
++                    res = info["libraries"]
+                 except distutils.ccompiler.LinkError:
+                     c.link_executable(obj, os.path.join(tmpdir, "a.out"),
+                                       libraries=["blas"],
+                                       library_dirs=info['library_dirs'],
+                                       extra_postargs=info.get('extra_link_args', []))
+-                    res = "blas"
++                    res = ["blas"]
+             except distutils.ccompiler.CompileError:
+                 res = None
+         finally:
diff --git a/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch b/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch
new file mode 100644
index 000000000000..9a934cc2a40a
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch
@@ -0,0 +1,24 @@
+commit 61e9159569a601315b67c30b6e26bbb2149c0bfa
+Author: Benda Xu <heroxbd@gentoo.org>
+Date:   Wed Feb 15 11:17:05 2017 +0900
+
+    BUG: blas_info should record include_dirs
+    
+      blas specified in site.cfg could have non-standard include dirs.
+      It should be read and saved in distutils/__config__.py
+
+PR: https://github.com/numpy/numpy/pull/8619
+
+diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
+index b8520ac..0fba865 100644
+--- a/numpy/distutils/system_info.py
++++ b/numpy/distutils/system_info.py
+@@ -1667,6 +1667,8 @@ class blas_info(system_info):
+         info = self.check_libs(lib_dirs, blas_libs, [])
+         if info is None:
+             return
++        else:
++            info['include_dirs'] = self.get_include_dirs()
+         if platform.system() == 'Windows':
+             # The check for windows is needed because has_cblas uses the
+             # same compiler that was used to compile Python and msvc is
diff --git a/dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch
new file mode 100644
index 000000000000..81d6084be3d8
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch
@@ -0,0 +1,72 @@
+--- numpy-1.11.1/numpy/distutils/system_info.py
++++ numpy-1.11.1/numpy/distutils/system_info.py
+@@ -312,27 +312,7 @@
+       1 - display warning message
+       2 - raise error
+     """
+-    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
+-          'atlas_threads': atlas_threads_info,                # ditto
+-          'atlas_blas': atlas_blas_info,
+-          'atlas_blas_threads': atlas_blas_threads_info,
+-          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
+-          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
+-          'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
+-          'atlas_3_10_threads': atlas_3_10_threads_info,                # ditto
+-          'atlas_3_10_blas': atlas_3_10_blas_info,
+-          'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
+-          'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt instead
+-          'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # ditto
+-          'mkl': mkl_info,
+-          # openblas which may or may not have embedded lapack
+-          'openblas': openblas_info,          # use blas_opt instead
+-          # openblas with embedded lapack
+-          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
+-          'blis': blis_info,                  # use blas_opt instead
+-          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
+-          'blas_mkl': blas_mkl_info,          # use blas_opt instead
+-          'x11': x11_info,
++    cl = {'x11': x11_info,
+           'fft_opt': fft_opt_info,
+           'fftw': fftw_info,
+           'fftw2': fftw2_info,
+@@ -669,10 +650,7 @@
+         return [b for b in [a.strip() for a in libs.split(',')] if b]
+ 
+     def get_libraries(self, key='libraries'):
+-        if hasattr(self, '_lib_names'):
+-            return self.get_libs(key, default=self._lib_names)
+-        else:
+-            return self.get_libs(key, '')
++        return self.get_libs(key, '')
+ 
+     def library_extensions(self):
+         static_exts = ['.a']
+@@ -1685,7 +1663,7 @@
+             lib = self.has_cblas(info)
+             if lib is not None:
+                 info['language'] = 'c'
+-                info['libraries'] = [lib]
++                info['libraries'] = lib
+                 info['define_macros'] = [('HAVE_CBLAS', None)]
+         self.set_info(**info)
+ 
+@@ -1718,16 +1696,16 @@
+                 # check for cblas lib, and if not present check for blas lib.
+                 try:
+                     c.link_executable(obj, os.path.join(tmpdir, "a.out"),
+-                                      libraries=["cblas"],
++                                      libraries=info["libraries"],
+                                       library_dirs=info['library_dirs'],
+                                       extra_postargs=info.get('extra_link_args', []))
+-                    res = "cblas"
++                    res = info["libraries"]
+                 except distutils.ccompiler.LinkError:
+                     c.link_executable(obj, os.path.join(tmpdir, "a.out"),
+                                       libraries=["blas"],
+                                       library_dirs=info['library_dirs'],
+                                       extra_postargs=info.get('extra_link_args', []))
+-                    res = "blas"
++                    res = ["blas"]
+             except distutils.ccompiler.CompileError:
+                 res = None
+         finally:
diff --git a/dev-python/numpy/files/numpy-1.8.0-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.8.0-no-hardcode-blas.patch
new file mode 100644
index 000000000000..eaf30dd8e130
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.8.0-no-hardcode-blas.patch
@@ -0,0 +1,25 @@
+patch to allow any blas (c or f77) to simulate the
+special treatment atlas libs have in numpy.
+2013: numpy.distutils still horrendous code
+
+--- numpy/distutils/system_info.py.orig	2013-11-25 19:54:45.760217851 -0800
++++ numpy/distutils/system_info.py	2013-11-25 20:00:26.575310888 -0800
+@@ -293,17 +293,7 @@
+       1 - display warning message
+       2 - raise error
+     """
+-    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
+-          'atlas_threads': atlas_threads_info,                # ditto
+-          'atlas_blas': atlas_blas_info,
+-          'atlas_blas_threads': atlas_blas_threads_info,
+-          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
+-          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
+-          'mkl': mkl_info,
+-          'openblas': openblas_info,          # use blas_opt instead
+-          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
+-          'blas_mkl': blas_mkl_info,          # use blas_opt instead
+-          'x11': x11_info,
++    cl = {'x11': x11_info,
+           'fft_opt': fft_opt_info,
+           'fftw': fftw_info,
+           'fftw2': fftw2_info,
diff --git a/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch
new file mode 100644
index 000000000000..674dbfadbf08
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch
@@ -0,0 +1,35 @@
+ numpy/distutils/system_info.py | 21 +--------------------
+ 1 file changed, 1 insertion(+), 20 deletions(-)
+
+diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
+index a050430..d0878a5 100644
+--- a/numpy/distutils/system_info.py
++++ b/numpy/distutils/system_info.py
+@@ -303,26 +303,7 @@ def get_info(name, notfound_action=0):
+       1 - display warning message
+       2 - raise error
+     """
+-    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
+-          'atlas_threads': atlas_threads_info,                # ditto
+-          'atlas_blas': atlas_blas_info,
+-          'atlas_blas_threads': atlas_blas_threads_info,
+-          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
+-          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
+-          'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
+-          'atlas_3_10_threads': atlas_3_10_threads_info,                # ditto
+-          'atlas_3_10_blas': atlas_3_10_blas_info,
+-          'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
+-          'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt instead
+-          'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # ditto
+-          'mkl': mkl_info,
+-          # openblas which may or may not have embedded lapack
+-          'openblas': openblas_info,          # use blas_opt instead
+-          # openblas with embedded lapack
+-          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
+-          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
+-          'blas_mkl': blas_mkl_info,          # use blas_opt instead
+-          'x11': x11_info,
++    cl = {'x11': x11_info,
+           'fft_opt': fft_opt_info,
+           'fftw': fftw_info,
+           'fftw2': fftw2_info,
diff --git a/dev-python/numpy/metadata.xml b/dev-python/numpy/metadata.xml
new file mode 100644
index 000000000000..28902614586a
--- /dev/null
+++ b/dev-python/numpy/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  NumPy is a general-purpose array-processing Python package designed to
+  efficiently manipulate large multi-dimensional arrays of arbitrary
+  records without sacrificing too much speed for small multi-dimensional
+  arrays. There are also basic facilities for discrete fourier transform,
+  basic linear algebra and random number generation.
+  It is the successor of Numeric and numarray.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">numpy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/numpy/numpy-1.10.4.ebuild b/dev-python/numpy/numpy-1.10.4.ebuild
new file mode 100644
index 000000000000..dac126b3caf9
--- /dev/null
+++ b/dev-python/numpy/numpy-1.10.4.ebuild
@@ -0,0 +1,152 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator
+
+DOC_PV="1.10.1"
+DOC_P="${PN}-${DOC_PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://www.numpy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
+	)"
+# It appears the docs haven't been upgraded, still @ 1.8.1
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	lapack? ( virtual/pkgconfig )
+	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
+
+# Uses distutils.command.config.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.2-no-hardcode-blas.patch
+)
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF
+			[blas]
+			include_dirs = $(pc_incdir cblas)
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	# we don't have f2py-3.3
+	sed \
+		-e 's:test_f2py:_&:g' \
+		-i numpy/tests/test_scripts.py || die
+
+	distutils-r1_python_prepare_all
+	epatch_user
+}
+
+python_compile() {
+	distutils-r1_python_compile \
+		$(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
+		${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+	${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+	DOCS+=( COMPATIBILITY DEV_README.txt THANKS.txt )
+
+	if use doc; then
+		HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+
+	docinto f2py
+	dodoc doc/f2py/*.txt
+	doman doc/f2py/f2py.1
+}
diff --git a/dev-python/numpy/numpy-1.12.1.ebuild b/dev-python/numpy/numpy-1.12.1.ebuild
new file mode 100644
index 000000000000..923ecd5f7c46
--- /dev/null
+++ b/dev-python/numpy/numpy-1.12.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs versionator
+
+DOC_PV="1.11.0"
+DOC_P="${PN}-${DOC_PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://www.numpy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
+	doc? (
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
+	)"
+# It appears the docs haven't been upgraded, still @ 1.11.0
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( app-arch/unzip )
+	lapack? ( virtual/pkgconfig )
+	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-hardcode-blas.patch
+	"${FILESDIR}"/${PN}-1.11.2-blas_rec_inc_dir.patch
+)
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = $(pc_incdir cblas)
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	# we don't have f2py-3.3
+	sed \
+		-e 's:test_f2py:_&:g' \
+		-i numpy/tests/test_scripts.py || die
+
+	# QA bug 590464
+	# The .py files from numpy/core/tests are just added, instead
+	# of being bytecode compiled as a proper subdir package.
+	# We trick the buildsystem into accepting it as a bytecode
+	# package by adding a setup.py and an empty __init__.py
+	#cp numpy/{compat/setup.py,core/tests} || die
+	#touch numpy/core/tests/__init__.py || die
+	#sed \
+	#	-e 's:compat:tests:' \
+	#	-i numpy/core/tests/setup.py || die
+	#sed \
+	#	-e "s:config\.add_data_dir('tests'):config\.add_subpackage('tests'):" \
+	#	-i numpy/core/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile \
+		$(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
+		${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing --single-version-externally-managed --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+
+	${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+	DOCS+=( THANKS.txt )
+
+	if use doc; then
+		HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+
+	docinto f2py
+	dodoc doc/f2py/*.txt
+	doman doc/f2py/f2py.1
+}
diff --git a/dev-python/numpy/numpy-1.13.1.ebuild b/dev-python/numpy/numpy-1.13.1.ebuild
new file mode 100644
index 000000000000..3fde5c7bc3dc
--- /dev/null
+++ b/dev-python/numpy/numpy-1.13.1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs versionator
+
+DOC_PV="1.13.0"
+DOC_P="${PN}-${DOC_PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://www.numpy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
+	doc? (
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
+	)"
+# It appears the docs haven't been upgraded, still @ 1.11.0
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/pkgconfig )
+	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.1-no-hardcode-blas.patch
+)
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = $(pc_incdir cblas)
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	# we don't have f2py-3.3
+	sed \
+		-e 's:test_f2py:_&:g' \
+		-i numpy/tests/test_scripts.py || die
+
+	# QA bug 590464
+	# The .py files from numpy/core/tests are just added, instead
+	# of being bytecode compiled as a proper subdir package.
+	# We trick the buildsystem into accepting it as a bytecode
+	# package by adding a setup.py and an empty __init__.py
+	#cp numpy/{compat/setup.py,core/tests} || die
+	#touch numpy/core/tests/__init__.py || die
+	#sed \
+	#	-e 's:compat:tests:' \
+	#	-i numpy/core/tests/setup.py || die
+	#sed \
+	#	-e "s:config\.add_data_dir('tests'):config\.add_subpackage('tests'):" \
+	#	-i numpy/core/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local python_makeopts_jobs=""
+	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
+	distutils-r1_python_compile \
+		${python_makeopts_jobs} \
+		${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing --single-version-externally-managed --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+
+	${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+	DOCS+=( THANKS.txt )
+
+	if use doc; then
+		HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+
+	docinto f2py
+	dodoc doc/f2py/*.txt
+	doman doc/f2py/f2py.1
+}
diff --git a/dev-python/numpy/numpy-1.13.3.ebuild b/dev-python/numpy/numpy-1.13.3.ebuild
new file mode 100644
index 000000000000..3fde5c7bc3dc
--- /dev/null
+++ b/dev-python/numpy/numpy-1.13.3.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs versionator
+
+DOC_PV="1.13.0"
+DOC_P="${PN}-${DOC_PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://www.numpy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
+	doc? (
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
+	)"
+# It appears the docs haven't been upgraded, still @ 1.11.0
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/pkgconfig )
+	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.1-no-hardcode-blas.patch
+)
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = $(pc_incdir cblas)
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	# we don't have f2py-3.3
+	sed \
+		-e 's:test_f2py:_&:g' \
+		-i numpy/tests/test_scripts.py || die
+
+	# QA bug 590464
+	# The .py files from numpy/core/tests are just added, instead
+	# of being bytecode compiled as a proper subdir package.
+	# We trick the buildsystem into accepting it as a bytecode
+	# package by adding a setup.py and an empty __init__.py
+	#cp numpy/{compat/setup.py,core/tests} || die
+	#touch numpy/core/tests/__init__.py || die
+	#sed \
+	#	-e 's:compat:tests:' \
+	#	-i numpy/core/tests/setup.py || die
+	#sed \
+	#	-e "s:config\.add_data_dir('tests'):config\.add_subpackage('tests'):" \
+	#	-i numpy/core/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local python_makeopts_jobs=""
+	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
+	distutils-r1_python_compile \
+		${python_makeopts_jobs} \
+		${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing --single-version-externally-managed --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+
+	${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+	DOCS+=( THANKS.txt )
+
+	if use doc; then
+		HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+
+	docinto f2py
+	dodoc doc/f2py/*.txt
+	doman doc/f2py/f2py.1
+}
diff --git a/dev-python/numpy/numpy-1.8.2.ebuild b/dev-python/numpy/numpy-1.8.2.ebuild
new file mode 100644
index 000000000000..143290901acf
--- /dev/null
+++ b/dev-python/numpy/numpy-1.8.2.ebuild
@@ -0,0 +1,145 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator
+
+DOC_PV="1.8.1"
+DOC_P="${PN}-${DOC_PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://numpy.scipy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
+	)"
+# It appears the docs haven't been upgraded, still @ 1.8.1
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	lapack? ( virtual/pkgconfig )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+# Uses distutils.command.config.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.0-no-hardcode-blas.patch
+)
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		# make sure _dotblas.so gets built
+		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
+		cat >> site.cfg <<-EOF
+			[blas]
+			include_dirs = $(pc_incdir cblas)
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+	${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
+
+	if use doc; then
+		dohtml -r "${WORKDIR}"/html/*
+		dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
+	fi
+
+	docinto f2py
+	dodoc numpy/f2py/docs/*.txt
+	doman numpy/f2py/f2py.1
+}
diff --git a/dev-python/numpy/numpy-1.9.2.ebuild b/dev-python/numpy/numpy-1.9.2.ebuild
new file mode 100644
index 000000000000..64ed20260186
--- /dev/null
+++ b/dev-python/numpy/numpy-1.9.2.ebuild
@@ -0,0 +1,146 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator
+
+DOC_PV="1.9.1"
+DOC_P="${PN}-${DOC_PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://numpy.scipy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
+	)"
+# It appears the docs haven't been upgraded, still @ 1.8.1
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	lapack? ( virtual/pkgconfig )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+# Uses distutils.command.config.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-hardcode-blas.patch
+)
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		# make sure _dotblas.so gets built
+		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
+		cat >> site.cfg <<-EOF
+			[blas]
+			include_dirs = $(pc_incdir cblas)
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+	${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
+
+	if use doc; then
+		dohtml -r "${WORKDIR}"/html/*
+		dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
+	fi
+
+	# absent in 1.9
+	#docinto f2py
+	#dodoc numpy/f2py/docs/*.txt
+	#doman numpy/f2py/f2py.1
+}
diff --git a/dev-python/numpy/numpy-9999.ebuild b/dev-python/numpy/numpy-9999.ebuild
new file mode 100644
index 000000000000..4954f795eaca
--- /dev/null
+++ b/dev-python/numpy/numpy-9999.ebuild
@@ -0,0 +1,132 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 eutils flag-o-matic fortran-2 git-r3 multilib multiprocessing toolchain-funcs versionator
+
+DOC_PV="1.9.1"
+DOC_P="${PN}-${DOC_PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://www.numpy.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/numpy/numpy.git"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="lapack test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	lapack? ( virtual/pkgconfig )
+	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
+
+# Uses distutils.command.config.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.2-no-hardcode-blas.patch
+)
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF
+			[blas]
+			include_dirs = $(pc_incdir cblas)
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	# we don't have f2py-3.3
+#	sed \
+#		-e 's:test_f2py:_&:g' \
+#		-i numpy/tests/test_scripts.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+	${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+	DOCS+=( COMPATIBILITY DEV_README.txt THANKS.txt )
+
+	distutils-r1_python_install_all
+
+	docinto f2py
+	dodoc doc/f2py/*.txt
+	doman doc/f2py/f2py.1
+}
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
new file mode 100644
index 000000000000..a297175b4180
--- /dev/null
+++ b/dev-python/numpydoc/Manifest
@@ -0,0 +1,7 @@
+DIST numpydoc-0.6.0.tar.gz 32464 SHA256 1ec573e91f6d868a9940d90a6599f3e834a2d6c064030fbe078d922ee21dcfa1 SHA512 aa86854cfba93f27540eee8a7937c81fe006e1d96b556b66ac643d9673b413fac357762068ca5675f265c7d2a80b0ba000416f5ddf3fbac2bfe4315fe0f48aa7 WHIRLPOOL da0615ef43ad45c0d016bf940092b87c32b2ae21ea25ba695931e40a301412a56c12277ff4cead7645b75f3a4bd3f13e077ad9b60684a35da98929b3c6ca6aeb
+DIST numpydoc-0.7.0.tar.gz 19047 SHA256 2dc7b2c4e3914745e38e370946fa4c109817331e6d450806285c08bce5cd575a SHA512 1a9bedaa6fe8bcd626b739b458a1647e550ac4489f8ccec2d4b11f93ee5c2a58e5d0e6692330d478a9ba91956da88eabdf020aa04f534e1e445c020903dcf14a WHIRLPOOL 9815a4bf1754706c69104fbf364de70de58048c35a189bed83b1dbd5c33406022b70a8a4a82cebbb80201a1d85e3c24129f5c126060d99d25d94f2a645c6266a
+EBUILD numpydoc-0.6.0.ebuild 726 SHA256 04058b6547ec2c525b2286bba85c43ad9a21cff694f7b302cbc504353aba5c65 SHA512 a9cec75a81f07d533c49c65d4dc7c06335af70d63de6e4b56046f41040c6c6fe924123c3a605db10c064a87e725b4db69f963e29bde92096e5b6d4422a83e605 WHIRLPOOL 81eae069e4eccfb3d8f5d2825c387fe24514f65b3fc969ec4f18e1356001eac95b01a5257dc76300771e0dcc38fa9315f974be0d4c6bcd2d47e9cadd09944ed6
+EBUILD numpydoc-0.7.0.ebuild 737 SHA256 fad8e7af90d9717bdfdcdf13e0f49ba946c378b17cac5ebe79eef5f2e9704703 SHA512 bef125ae79676add5ec08b50599a3c3a330edb4e79bd313a930dcedb45cdd3275ae8748668bbcad24f46996244940aa7117de601d3412259124bd8ca4db1b0fe WHIRLPOOL e90757d2cbe38470aa1c99e8e58237bc22ca8b8a5a016fcadc20624b954994aebcbca4c17d32ba58f77e9c70ed856de6c68b2309054796fceb525d1136361c7e
+MISC ChangeLog 3094 SHA256 079fbf34f7f0afbba92d481f14f5212e1ba626e9f09b98b7ae8d7784f655649b SHA512 efd048a5603bb325f2af03fb82af089241ec7ea053ed6aa3da2c2b0f47976b1b30bfb0630173ef7bb59169887f505ba5a2515791a70e96219843ba945311c42d WHIRLPOOL b15f858edc214cba68cb9ae7a022a3b60b1f66833b752dd566ba54cfd347c03e2197def8ffc9a6de76b9540aae5392b7d486aae7872fc2501816afd3e6c92bce
+MISC ChangeLog-2015 1517 SHA256 a715dc010912416e66d902df962ed68029a0046661fec30edd8876301379454c SHA512 36a611679cdf62ceb0a0ca77a138f002a486fbc4160c0dedfbbd1c28bf06d73a9bb761d1de74d23f53fdca9ac58998740d688d6ef756a1d13349053ca42bc707 WHIRLPOOL 0d2a0202945ec37393f511483a2de1598cc098bb96cc2357b5a8ceae3fd8d256e292f629e8a6b6082b92b95ea08c1a8dd8e379a09d9002f30355c5abf5485b12
+MISC metadata.xml 321 SHA256 7c346bc17df402ad7da333454afefc34733ac3a90bc48abac5ba45ff98880838 SHA512 51803da4bebb8d1ac7fcc0e33ec99234b4f497a2817361032712c35ea57e9e58591fd675c9273d7627f94c60e010878b9dd6a6e8708704f36c945344159880a2 WHIRLPOOL 85c2f079f8e4af2cfa13c5b9edce280893167f34726664d7194fbff6c601a2ace199c019ce7e4e42f2460098360971285116a42c18c17436bb890972bb80a2e1
diff --git a/dev-python/numpydoc/metadata.xml b/dev-python/numpydoc/metadata.xml
new file mode 100644
index 000000000000..03512508d0a1
--- /dev/null
+++ b/dev-python/numpydoc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">numpydoc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/numpydoc/numpydoc-0.6.0.ebuild b/dev-python/numpydoc/numpydoc-0.6.0.ebuild
new file mode 100644
index 000000000000..1d04dac9cc41
--- /dev/null
+++ b/dev-python/numpydoc/numpydoc-0.6.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
+HOMEPAGE="https://pypi.python.org/pypi/numpydoc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/matplotlib-1.4.0[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/numpydoc/numpydoc-0.7.0.ebuild b/dev-python/numpydoc/numpydoc-0.7.0.ebuild
new file mode 100644
index 000000000000..0a61c3ed6b2c
--- /dev/null
+++ b/dev-python/numpydoc/numpydoc-0.7.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
+HOMEPAGE="https://pypi.python.org/pypi/numpydoc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/matplotlib-1.4.0[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/oauth/Manifest b/dev-python/oauth/Manifest
new file mode 100644
index 000000000000..a359b5a7cba8
--- /dev/null
+++ b/dev-python/oauth/Manifest
@@ -0,0 +1,5 @@
+DIST oauth-1.0.1.tar.gz 9533 SHA256 e769819ff0b0c043d020246ce1defcaadd65b9c21d244468a45a7f06cb88af5d SHA512 a503b1bfff18c97a0e666cc376bfcb11e3cc0f3340dd16e0254fcd4340ed28ab0fc52d1de81b573309351a5edaf83d0b437c155580c00e32a81a7c219ee7eca9 WHIRLPOOL c068087ac15061236bb5809d51e4e55c9ea489c36ac27275f69e8e8eb3b1e3fc89a08b75c8cb23091cd68e8722911bb5dfd643c371bc5c3ee7589fe6158392e9
+EBUILD oauth-1.0.1-r1.ebuild 423 SHA256 cc2f649e94602a410577814516fa1f00908a9844307b82da9198334c7996020a SHA512 b894164ce27be3b71db91d66ead4d8a5bccacd059154a64e5f448e18358772a5103a29e45c2f116d3cde82d8f00e2e76bf05799b8f7235631e760cccb7cdef1f WHIRLPOOL 287ecff71de4893d97f61f741000c423725499e1b60f593b100485c71fdc99e3897a9eb9a1254fd38766e6dd24cad9c85db3f1cca8983d5861111b8a87c38798
+MISC ChangeLog 2573 SHA256 dc9b8fd24dc5739cc0e28e4e6bb3161f7c335b4e6efb36c118585bd4df6fef0c SHA512 6e2ed917ad7543918598203d78e3532d0b3ddfc18f659e680074eb28f8b155cc8c267ad367df8bb01b8ead6a076fbb9b92c55e12a15c146feaf2ac0add5aab59 WHIRLPOOL 067fb5253028a3c9680a53316de23432b9805fc19e502750d0e4dd2519e77c733367b3bbddf5a4bf944b1366a1809fd94fe8ea34519a02b25c5c940bbf6436d7
+MISC ChangeLog-2015 1658 SHA256 89edc4076462e4093a8fd07b5348d9fccf2c2cfdec6e5d2f2a646800e50d78c5 SHA512 e8b4d48f3bac7b0dfe3f1f709bee8243755fbb352638d3c9b6f2a443fd6adc661b6c8fcb4eeb22444266526181e33a8e9663b07883bc50f01cc6d724e8546268 WHIRLPOOL 193f919e7dd806d4e03a4e59d142859df7ae0b6be67f7ec32e796e7fca0c46533f5fa2811fc651b807fd6bb8b63a1c305abb3d9b1a62f0bc58c5774aca8ca76a
+MISC metadata.xml 308 SHA256 f0f0c4452087b824134d8e5a9f53631ecb53f9e2433171f2607f19f5875fc96f SHA512 0f14e64b2b19c1895773d57a4814878d825986856cd5b8f383101e8f17e11c762123b57b19e9c9bd74bcb533c084a9cc33e46e990fc6291d623e83603e61882e WHIRLPOOL a987a557ee8f3f8fa0d73e3d514965bcb9560b1bc99057b6c0d290f5a73409c5dd65ee1e8e54a0ea04aadb5fad810106aad9408f2a1226be5c84fd151975427a
diff --git a/dev-python/oauth/metadata.xml b/dev-python/oauth/metadata.xml
new file mode 100644
index 000000000000..b8c2d350f545
--- /dev/null
+++ b/dev-python/oauth/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">oauth</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/oauth/oauth-1.0.1-r1.ebuild b/dev-python/oauth/oauth-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..1a486d40820a
--- /dev/null
+++ b/dev-python/oauth/oauth-1.0.1-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python OAuth module"
+HOMEPAGE="https://pypi.python.org/pypi/oauth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/oauth2/Manifest b/dev-python/oauth2/Manifest
new file mode 100644
index 000000000000..db92f82764a7
--- /dev/null
+++ b/dev-python/oauth2/Manifest
@@ -0,0 +1,7 @@
+AUX 1.9.0_p1-exclude-tests.patch 332 SHA256 a9e2a5b4db1fc02dd40210a80f54682f0f2425ab0165dbb02403f9c923bb687f SHA512 9b4b45d22076517ac6e79ecd74430ee7e53501aea07f0e2c43bae3c119e572d9357dfc32adb036920f4ff15c1344ea3cde20e79ee4c609508feeb9fac3293c57 WHIRLPOOL cfde7c812e8fe6103d05cd30e7a945b939b6417bc20c2041125d045f93c842b09f6bac24b4580b26cfad37143d2d42dcf752a57fde8f19af5d291a2f1c6bc47e
+DIST oauth2-1.9.0.post1.tar.gz 21306 SHA256 c006a85e7c60107c7cc6da1b184b5c719f6dd7202098196dfa6e55df669b59bf SHA512 a3b64eef331d4c4f59c275f14efb2dfb48ad60de47a59a88106f60d64428a09b76d8bedf08c98c113493968d83708b1478b4b61b2b5528b5b01fa22777daff4c WHIRLPOOL 11d7cdf610d297a909e8ae61bbdf8765b8ffbec4cf83cfa81a097619194bfbcec3ce8967e699b6ba56076c84e30fc5747c5f83895997b7e54e19a0c45ed39e5b
+EBUILD oauth2-1.9.0_p1-r1.ebuild 1016 SHA256 7bc628a9f0a38eb828f3c6bbbcf39501f57f0f7830dd70782bc5c886cb60ac5f SHA512 373d863c78f786d049843ef6ca824bf2f1733f95a9c51700172410295a51f19e9415266ddb0f963047c550eec5fa6ec331c5a9f92053ff447ec54460987631b4 WHIRLPOOL 4aafebaeaf2b2ea7a1668b9550a5fa43a14759e75f3bbe35659f3a8f544bcf5684591e3009efe0bc54fb41f2e0f56a6e42d4792c25a70351302a775aedc12a3d
+EBUILD oauth2-1.9.0_p1.ebuild 728 SHA256 f9ad999d777ca4ac2b043d026f6b921238670699d9cc294bfa8ff644e0e0d7b2 SHA512 186f2d908ea528e235562a8fe921e9d4a1440cadb5ddaa31eeda57cb86f066e9ab4b8b94b6b9e79d80f5d80e232ffd72ab0fb5dfa5583c0a4e980a96e117b595 WHIRLPOOL 7e497fe778f5d7670c906ad3e146aab8746edc32eecb4d3e3253b7bec832ab5ba017c315add820090f6006d1a847fa1fbb55058896b4d91ebcf9fd9a15ec638f
+MISC ChangeLog 3604 SHA256 edb04b3b28ecdefcdd3a541a83dfbde24dd786d75d6f1795abce52660faad364 SHA512 879dbf0bd81c8213a820b9e3882a98b8ee1048ba66eaac67db0fd11fd5c0e84bc599fb52bcc7237b67f1becc304d84ada4aa065f3e7e1e42e114cd6e223e0c21 WHIRLPOOL 1a70e32632827186793494434a56b8abe3732ce29849434f7bcca137d3f909a4854e34549e2019487182c927a4b4463e491125ff76cb01de960b0b18f30cc612
+MISC ChangeLog-2015 1779 SHA256 c73c5eb78efa0b2f9cb55163fa3b3c7f7af8dacfef391dc22626377062e43934 SHA512 44e86c6c45ea0e94e70120bfbe1b4a1441c168eb5dc53e2768251df6bdaf4735d754aa89e1a68058fb6af94c5316ecb14dd29ae5b4331205b44e984470a2b06b WHIRLPOOL 206f8aba051b73db4a37dc954640cf0df0f555c900e6d4ff66e9f47062214972a37c1fce00fe66c58a8f0e54f7a1e1f5c52d4c904892f2ec4004beda7abefcfc
+MISC metadata.xml 371 SHA256 7b23721edb9b536d08f1f121b5d30892091af190eba2d1ba249a70de1470b78d SHA512 292d51b2e24153b3351aa1a78e5246ecc0d36f21697f0637390ee5869b770bc24a9dcf01fa26e8ab6feeb61902bbc34659f34969537eac0c647445c03cb086da WHIRLPOOL 87e34d2622cab7e564f8dc72d7adc36e1340577e20275b3d9d8f3de50a0d16040b1f60d6dd44ffaa12a506bf6e181d5c93ef4b41393afa5de6d0b0eaaf3c4170
diff --git a/dev-python/oauth2/files/1.9.0_p1-exclude-tests.patch b/dev-python/oauth2/files/1.9.0_p1-exclude-tests.patch
new file mode 100644
index 000000000000..0d3a0fa962af
--- /dev/null
+++ b/dev-python/oauth2/files/1.9.0_p1-exclude-tests.patch
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -45,7 +45,7 @@
+         "Natural Language :: English",
+         "License :: OSI Approved :: MIT License"
+       ],
+-      packages = find_packages(),
++      packages = find_packages(exclude=['tests']),
+       install_requires = ['httplib2'],
+       license = "MIT License",
+       keywords="oauth",
diff --git a/dev-python/oauth2/metadata.xml b/dev-python/oauth2/metadata.xml
new file mode 100644
index 000000000000..88a621eb46ee
--- /dev/null
+++ b/dev-python/oauth2/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">oauth2</remote-id>
+		<remote-id type="github">joestump/python-oauth2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild b/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
new file mode 100644
index 000000000000..d41d8af9ac43
--- /dev/null
+++ b/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+MY_P="${P/_p/.post}"
+
+DESCRIPTION="Library for OAuth version 1.0"
+HOMEPAGE="https://pypi.python.org/pypi/oauth2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="dev-python/httplib2[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+# https://github.com/joestump/python-oauth2/pull/212
+PATCHES=( "${FILESDIR}/${PV}-exclude-tests.patch" )
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	# Skip tests which require network access
+	py.test -k "not (test_access_token_post or test_access_token_get \
+		or test_two_legged_post or test_two_legged_get)" || die \
+		"tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/oauth2/oauth2-1.9.0_p1.ebuild b/dev-python/oauth2/oauth2-1.9.0_p1.ebuild
new file mode 100644
index 000000000000..f4dca70da95d
--- /dev/null
+++ b/dev-python/oauth2/oauth2-1.9.0_p1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 pypy )
+
+inherit distutils-r1
+
+MY_P="${P/_p/.post}"
+
+DESCRIPTION="Library for OAuth version 1.0"
+HOMEPAGE="https://pypi.python.org/pypi/oauth2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="dev-python/httplib2[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}/${PV}-exclude-tests.patch" )
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/oauth2client/Manifest b/dev-python/oauth2client/Manifest
new file mode 100644
index 000000000000..088a55177531
--- /dev/null
+++ b/dev-python/oauth2client/Manifest
@@ -0,0 +1,13 @@
+DIST oauth2client-1.5.2.tar.gz 131665 SHA256 b8df20b122e4f49a5fe5bc3c825d16015f5012c171c6c81eb4048e4d8c2ffee3 SHA512 15f10b52aa93fc10289658d5ff671a247e5c92c5ff2be424a04617fee1a3a82439b829b0f5dcb04e3e84802e02580e366e08356df7ec6e24563a530d2f6b1db5 WHIRLPOOL 00f3033359eceda12528ef4caffc0a9d7d6561919272fe98e09d2599114f07d9be42eb32a4038c155c621581f98ecc0eb516bcaa018d4376e30906dd4a0adfbc
+DIST oauth2client-2.0.1.tar.gz 153127 SHA256 fa0357fca4ce431073ead236256347aafe3d368c16c5edaeba7f826b1b1d5fb6 SHA512 66179a604418a8aee9ca9dbfc5ad18356d5130a588e85f4dab3330feef194af2114bc2eb18ec625acf791938e4d7f78ee55284f45a67a48c775676697ce2b183 WHIRLPOOL bef0f7394cbeade328f74288bd602973a7828915ff616c7331d6c1910be02bc74a8e11062bd0602a2c4f1681d7d8c6558aecd695df3ef711f74ba81fad0b1ab3
+DIST oauth2client-2.2.0.tar.gz 167484 SHA256 07b44748059d6390ce2247195b2ae2117773617614f76ec9375e56fd43295f06 SHA512 1e23c3f655e955dbf0cdb2b78613768ca4c6eb4336b555e3553da212fd762ba12329584f108d8145810228cf44da018675b38dd152b06e58be4eb18d4f8127c6 WHIRLPOOL 6cb1b3a6dbc4d3e0fca8d72417810873f11428afb4d4f52b08f7028c984bd330acf043ca10c339453c6f4e38c1f179c2e9126a9f6cb419323a53cbc769ebbe8f
+DIST oauth2client-4.0.0.tar.gz 183288 SHA256 7230f52f7f1d4566a3f9c3aeb5ffe2ed80302843ce5605853bee1f08098ede46 SHA512 b59805702c7acb306801a04a92b7f700c0f58d5937b4b27a497018d313922512b5ec3f1711bacf13bc7e01c4f006eda5344a9055f981ba34e116c34c56c5dfec WHIRLPOOL 409ff71754038acb3a67841edfb7dd33865c0db9e55717ea2255eab506d298603034cc5347c6219f8978b5a2ec068a5ccf4e1f0ba53533e9810794016e4822b1
+DIST oauth2client-4.1.2.tar.gz 184731 SHA256 77737f8f831a1306b022deb2cf6f3c9dbe4b338b8b9afcf84e7be5bef4d7e833 SHA512 908f0e32f0ef76c3eb86ee34118d4100bc08fa34aa89c561793bf8c55078f07611935ee6aecb6d2ae2f7e96a18ac3bc25af0321fe564f26042ff2bb5eab30b18 WHIRLPOOL ad4a6c6ac7a5e1831a3c2829d6ca445290e34b03134b94def27a45df0ddea0488087aefa6cd5d9fb4bd3e4843eda75eafbe03e587071eaf25e76d55116a67da0
+EBUILD oauth2client-1.5.2.ebuild 920 SHA256 f536ebc06a53c32d3871818572d350ce33f191ac0f45153a5ec5d245c491067f SHA512 2fd76b033f7853bf91952cd4bb3de1db3f6f91a528de1a2afb6d11f4aaf091d299f3e5e5695765c5c5bce20bab54d8a8deeb7d21a70109583c4e7692011783c2 WHIRLPOOL d9b18b6c0aa5c4cdac791da435a93300b4656be11df69bd1f84ac1dddb62f762f2be96a2c1f095ee47fad4ecdb96d9a19a0b65f275d9399a20bd875f0448a70e
+EBUILD oauth2client-2.0.1.ebuild 1121 SHA256 a7291572e959263cf8a90b3db7b3cfff5bce2d4d582c451df68141a3537cba9a SHA512 500f6738904d42d44684ac4857c6c45abdd978c94eedf3ba30f1fa17c5b51837bd1a7fe8559cab6b37fed2b03af5e4f931af961375445c19cee6a56fa75d2b2f WHIRLPOOL bb1832bbf97b9730bcc497e1b448512098620e80aae3c2e7ac0d94292dd88ba1c66d69c991a6d5456f0858cc91a8cc04b73e35a2b9d7cfa4b432778e630901ee
+EBUILD oauth2client-2.2.0.ebuild 1124 SHA256 b1a80e13a27c51787c7b18b84684b126cedf0cf2e5ccf80eb783d4ef032918f4 SHA512 43601344ec3fa8e34652162c983408aefda4b62c0c3c96fab3478005adba4c8628fbdbfc1fdff068572684103a9fee1a32147be9ef0815320121b3816aa8f4b1 WHIRLPOOL c54b7484bebf95957ab2905e82513c2077ddceeb41930705ea2bf076c794bf46ac0d8d5d56d535b684c32cad170c5b42e282e0e39310c91a1bbbcd2d4d90317b
+EBUILD oauth2client-4.0.0.ebuild 1130 SHA256 aa1c5603c892835b3d0f67e16531fda6bc5f764351b4260c993ce92335de871c SHA512 d64b9cfbfea612c3963c9f2a650156861ae992761a313c6cbf568dd815a74dc2006eb0929acc1cb064e45b92d99558e6061916f2c3ddc9ef6984342b80e30d6d WHIRLPOOL 7833dd378a7c9e3fc9bf81e7ca496ac295389119504d112aedfeaf54e2e42e8aaeff42419ff40eafbfb36c01304fdd837f58647626fb6cb7408d4c3a6c5c2c2f
+EBUILD oauth2client-4.1.2.ebuild 1703 SHA256 34298083c71df178e01ed510e9dbf892d1116987c6abf1030d3d69cd2b27c713 SHA512 1807ee810a4e1f89ac458ac3d3e13cbd0c7d1ff814c44a708355cb67b219e2816feeec985fda6038536af6363bee18eed8569d02318de6c75e4500211d5d3b66 WHIRLPOOL 7e13ffe8c96e1608d2944867480780c2a792a92d5dcc34151b820fa1357118d51410449d64b6439e584b600f88b151eeff97892c27df5fd90c57ee1d4f8acb43
+MISC ChangeLog 5848 SHA256 c0b76d4e48b0fc764500b81387a38701bd4d0cc8db30d5cec3053e75475755f9 SHA512 8e3f50bfe4c7c3b6a5d9f8d24a5e93febbce635d760790e5570a044b343f48473c05851b51079f8f3990995adf5f8b96a1f984f19f9d57b272c13b2279124efa WHIRLPOOL b710297af586de11c00cd72d4245678771da917c27576f99d70a73ca3808f23aed25fc585f431863a51fd50739a035711ab0ce22d28af998b9f962a459ba728b
+MISC ChangeLog-2015 1725 SHA256 53ac13e8a8ea77ab7ea0b6733f3d47de4a8adce5ca5ec86ffb135f7ffaeaffe3 SHA512 031edb144f2ab3f7e2ca5937a59ed40b126cb25e4002bd4419e2490358d3d210192757f57ce8d82d2ecc0cba81ffd0eb5780c4fceb795ddec49e79b3710d7c91 WHIRLPOOL 4867764b94da5feb7a40ce7d9d50b5132ca312622caf1b115fcbe0ebf9ac1e722e6f0a540abe75f522bd607bdb79bcca10adf36e474894800ab0afd5f887e184
+MISC metadata.xml 334 SHA256 497ab178672225bcaa702d7e2441d64f321a7fd25ecf629f16369cf10613386a SHA512 585f6ddeaa1a11022fcb9bab897e02392157abca2e638cfef57d76a97be2d85071405bbd70a256172d6202e4a4deca47ddb2374b98cd810e60541c2d4d3d373c WHIRLPOOL 5a587880d97d7f35aec4c8773827376923f7c8882b67eba4530ba26d61a4154019a731d46a4453be9501277b146823f520968d2808821bc147f2c718797baac7
diff --git a/dev-python/oauth2client/metadata.xml b/dev-python/oauth2client/metadata.xml
new file mode 100644
index 000000000000..76abccb2a81a
--- /dev/null
+++ b/dev-python/oauth2client/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">google/oauth2client</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/oauth2client/oauth2client-1.5.2.ebuild b/dev-python/oauth2client/oauth2client-1.5.2.ebuild
new file mode 100644
index 000000000000..a67b0ceca523
--- /dev/null
+++ b/dev-python/oauth2client/oauth2client-1.5.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
+HOMEPAGE="https://github.com/google/oauth2client"
+SRC_URI="https://github.com/google/oauth2client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+# Needs network
+RESTRICT=test
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/oauth2client/oauth2client-2.0.1.ebuild b/dev-python/oauth2client/oauth2client-2.0.1.ebuild
new file mode 100644
index 000000000000..275a95588e9e
--- /dev/null
+++ b/dev-python/oauth2client/oauth2client-2.0.1.ebuild
@@ -0,0 +1,45 @@
+# 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)
+
+inherit distutils-r1
+
+DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
+HOMEPAGE="https://github.com/google/oauth2client"
+SRC_URI="https://github.com/google/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}"/${P/_p/-post}
+
+# Needs network
+RESTRICT=test
+
+python_prepare_all() {
+	sed \
+		-e "s:find_packages():find_packages(exclude=['tests','tests.*']):" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/oauth2client/oauth2client-2.2.0.ebuild b/dev-python/oauth2client/oauth2client-2.2.0.ebuild
new file mode 100644
index 000000000000..95a85729085a
--- /dev/null
+++ b/dev-python/oauth2client/oauth2client-2.2.0.ebuild
@@ -0,0 +1,45 @@
+# 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)
+
+inherit distutils-r1
+
+DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
+HOMEPAGE="https://github.com/google/oauth2client"
+SRC_URI="https://github.com/google/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}"/${P/_p/-post}
+
+# Needs network
+RESTRICT=test
+
+python_prepare_all() {
+	sed -i \
+		-e "s:find_packages():find_packages(exclude=['tests','tests.*']):" \
+		setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/oauth2client/oauth2client-4.0.0.ebuild b/dev-python/oauth2client/oauth2client-4.0.0.ebuild
new file mode 100644
index 000000000000..9c0d1405c17b
--- /dev/null
+++ b/dev-python/oauth2client/oauth2client-4.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
+HOMEPAGE="https://github.com/google/oauth2client"
+SRC_URI="https://github.com/google/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}"/${P/_p/-post}
+
+# Needs network
+RESTRICT=test
+
+python_prepare_all() {
+	sed -i \
+		-e "s:find_packages():find_packages(exclude=['tests','tests.*']):" \
+		setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/oauth2client/oauth2client-4.1.2.ebuild b/dev-python/oauth2client/oauth2client-4.1.2.ebuild
new file mode 100644
index 000000000000..5f0c4739176f
--- /dev/null
+++ b/dev-python/oauth2client/oauth2client-4.1.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
+HOMEPAGE="https://github.com/google/oauth2client"
+SRC_URI="https://github.com/google/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~arm amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+REQUIRED_USE="|| ( $(python_gen_useflags 'python*') )"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/keyring[${PYTHON_USEDEP}]' 'python*')
+	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}"/${P/_p/-post}
+
+python_prepare() {
+	# keyring is not fuly supported by pypy yet, because dbus-python can't support pypy
+	# oauth2client -> keyring -> secretstorage -> dbus-python
+	# https://github.com/mitya57/secretstorage/issues/10
+	case $PYTHON in
+		pypy|*pypy|*pypy3|pypy3) \
+			find "${BUILD_DIR}/.." -name '*keyring*py' -delete ;;
+	esac
+}
+
+python_test() {
+	nosetests -e appengine -e django_util -e test_multiprocess_file_storage -e test_bad_positional || die
+	# appengine - requires appengine
+	# django_util - requires django
+	# test_multiprocess_file_storage - requires fasteners
+	# test_bad_positional - expects TypeError, gets ValueError
+}
diff --git a/dev-python/oauthlib/Manifest b/dev-python/oauthlib/Manifest
new file mode 100644
index 000000000000..cf16fbda0575
--- /dev/null
+++ b/dev-python/oauthlib/Manifest
@@ -0,0 +1,11 @@
+DIST oauthlib-1.0.3.tar.gz 109095 SHA256 ef4bfe4663ca3b97a995860c0173b967ebd98033d02f38c9e1b2cbb6c191d9ad SHA512 b5df82729edc025f262a18c012f6036f52e97a8a846eeb75e4e205928acfd6e971a58194c4a06853d6743329d397e69b94fb431047b2a17a2cb2472c889c4d4c WHIRLPOOL f63142b667eaed207504494e67de8b58d8c966c19870a2e38714fa6d264a7f57873bb30f3548f9cd0906d9f3abb5c36c9de7255d869f47ebad7662b1dba6ec16
+DIST oauthlib-2.0.1.tar.gz 122966 SHA256 132ad46df25e53a84b33f1fd43f80e973cda2cb018cc0168d7d0c8c4d5cef9b5 SHA512 5d19839d1fec6939d10a26b5a0cf96024783fbf67b91299ad7ad640c5c75170918fcda9ed0e13333a5dde353b86201f033e410b8312f1d9eaaf9af0b289c348f WHIRLPOOL 9048e9d201fb969f6819b7b36c074cf5b153e208901be67f65726a72b589219aca02a9f30dab8b022a8952fb0b23699e8b8f7cd48b8997c51b1c5d8e8dfffe31
+DIST oauthlib-2.0.2.tar.gz 125631 SHA256 b3b9b47f2a263fe249b5b48c4e25a5bce882ff20a0ac34d553ce43cff55b53ac SHA512 ff2a720faf8a649b1e29f34fd4b5b0838937cc1ebef3fa4828aeccb781097d02b9578717de48ddee49e43c86840e38147664a87b81601616792765541cbf18e4 WHIRLPOOL 582070c6af489bc771d1e43f34f863fa88d17d083826d5adea00b00f02c2915b79c280c388dfdc1e45106eea6766f822d244369b27d447d16b2bb21bfed96715
+DIST oauthlib-2.0.3.tar.gz 127155 SHA256 f36c6631d072a2acb8b3b99f94e5e314f1fb4ed996696b18b2723769391c071b SHA512 40eed9aacd6c239745523bf056afce8d76615ef9dcda8ee8a46e2900f940674f4178daf70c18c2bdef9f607db3fba84cc10b2306c608116ef2eb08414268125d WHIRLPOOL 19c9d2679baa8f48410ec76c3cfd9db0933b5478ebbd24b4fbd3243eecbe51c7e75163937616e8fce7ad9ebc3cb6151cc26472c8c23d20702ece893ddd912067
+EBUILD oauthlib-1.0.3.ebuild 1036 SHA256 ffcc250feb426c268b84e55f4d38984cfe60344b40bfe600bb537accc91f8197 SHA512 143732f61737e44b5f1e35847cb64c3e16e190a466ec952697b95f7231157df0356eea7b734ac6e2cf5c250d8834009b53bbd1518c63ec8194ee34cf9fac1e2e WHIRLPOOL 9e03cd05535eb4d9b99dfdefe16076668a3a329c2dbce87d425b4e85d3277922eedabb8165e0d4c41110aec6cb04735a18b3bf3398e212287fd8d5f329d9d69d
+EBUILD oauthlib-2.0.1.ebuild 997 SHA256 460580663177c05a773098a4cac808285c113fd2a6bca80b725c994c410fa671 SHA512 f5adfd7136d19aa45fa52127e5f3175059ccf5bc9b8a3b8f79aa21a24f8e8a2d3b1f079e304fd1a774d7fc67bf2cd0afc00cacdf014cd8620f68a9348c9c1726 WHIRLPOOL 3080cba7979378e3d27d25970a27ec994a445dfe2146c716eef5b5f811de46dc42813ca53e2246b7f7162e1f447184489c3f22450eb50dbcc8a99bf7ea697ef2
+EBUILD oauthlib-2.0.2.ebuild 997 SHA256 460580663177c05a773098a4cac808285c113fd2a6bca80b725c994c410fa671 SHA512 f5adfd7136d19aa45fa52127e5f3175059ccf5bc9b8a3b8f79aa21a24f8e8a2d3b1f079e304fd1a774d7fc67bf2cd0afc00cacdf014cd8620f68a9348c9c1726 WHIRLPOOL 3080cba7979378e3d27d25970a27ec994a445dfe2146c716eef5b5f811de46dc42813ca53e2246b7f7162e1f447184489c3f22450eb50dbcc8a99bf7ea697ef2
+EBUILD oauthlib-2.0.3.ebuild 1002 SHA256 c6a15828fc4d6fdf2779c152fa5c561585bc49ebf69070d8eab181a27b7e92e4 SHA512 240a5187a0a24a9f4513caa8c55030b32967dc30e3ac2ec28afcf58eca385a921eba43e6807f72f6302427d2ee5c5b0ae40b97376ee27ae6383f02b187cb2593 WHIRLPOOL 879b2bca4104aa5bbd5fa24573d2883c8696aa9e2570f85ae4ad7530c26b7a9bfb8219fa02eedc2fa0f7929276447ddac66373c17678a81895f12a2eefad3280
+MISC ChangeLog 3674 SHA256 dbb0b601d457f9fd328bc4b7651ed4fc469b51ea5f5e339c308e21efcc890bc1 SHA512 4a22963e9a2f092c9f9330d2da36a9e2d0ee85c1adea73a2a3b9a2268fe45e89d587e5c93d18dc59b6662253df27686cc1f9b8fb5bceb83004b42eaec7c8f25e WHIRLPOOL 734026b84c55bff7f7af984bb8f0efc6e5fd027d160256dbb5c65b105f329393216a256aa4827233936e3036291333ffce19fb7c6b68efcf439b7b419b958798
+MISC ChangeLog-2015 6288 SHA256 7e7d0d1476d0a9077568da744cf6047fc8173c14e579703147606b8fa2dd255e SHA512 21b6fbf2e530349036e1fad49cf68fb02d2e07d7a936ff2f380f83ef3d6da037b342268e5f57824814e1179c412910fa690d533970db63eff7297f61178125d3 WHIRLPOOL f854df61cbe6b56dcd0e5a313d1a892c31b2a0fce66d41bfc2fb6d5acacfd05fe1c8c1415be0b01b197e21fcdd13c0838b826f4bdd490bdad6296d3e433b15e9
+MISC metadata.xml 376 SHA256 44fee5b1e8ee8e0e11997f493cccf3856030d6b6deb32a4597c3c0481486ce73 SHA512 ec1f35a21ea68091f6fe901d7c05c711f891f7edcf48496dbf57312cf331e7df9465309ca90789b795efa024e3ba3ede3d0416c7d9362823cffab8fbb23fd3fe WHIRLPOOL fce4f7bdaa324e0312848449eafd450156b9f52ce6f340da6cd9fa0d09aacb5182b2fe6ffd30f69fa1c0334ebbbb201b166c033ae8843d6b2882e73b65fcfe34
diff --git a/dev-python/oauthlib/metadata.xml b/dev-python/oauthlib/metadata.xml
new file mode 100644
index 000000000000..ccc9e23ddbd7
--- /dev/null
+++ b/dev-python/oauthlib/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">oauthlib</remote-id>
+    <remote-id type="github">idan/oauthlib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/oauthlib/oauthlib-1.0.3.ebuild b/dev-python/oauthlib/oauthlib-1.0.3.ebuild
new file mode 100644
index 000000000000..0f619e0b8223
--- /dev/null
+++ b/dev-python/oauthlib/oauthlib-1.0.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
+HOMEPAGE="https://github.com/idan/oauthlib https://pypi.python.org/pypi/oauthlib"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+# optional extras hard set as RDEPs. See setup.py
+RDEPEND="
+	dev-python/pycrypto[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7) )
+	"
+
+python_test() {
+	nosetests || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/oauthlib/oauthlib-2.0.1.ebuild b/dev-python/oauthlib/oauthlib-2.0.1.ebuild
new file mode 100644
index 000000000000..8e2670c4e15a
--- /dev/null
+++ b/dev-python/oauthlib/oauthlib-2.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
+HOMEPAGE="https://github.com/idan/oauthlib https://pypi.python.org/pypi/oauthlib"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="test"
+
+# optional extras hard set as RDEPs. See setup.py
+RDEPEND="
+	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7) )
+	"
+
+python_test() {
+	nosetests || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/oauthlib/oauthlib-2.0.2.ebuild b/dev-python/oauthlib/oauthlib-2.0.2.ebuild
new file mode 100644
index 000000000000..8e2670c4e15a
--- /dev/null
+++ b/dev-python/oauthlib/oauthlib-2.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
+HOMEPAGE="https://github.com/idan/oauthlib https://pypi.python.org/pypi/oauthlib"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="test"
+
+# optional extras hard set as RDEPs. See setup.py
+RDEPEND="
+	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7) )
+	"
+
+python_test() {
+	nosetests || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/oauthlib/oauthlib-2.0.3.ebuild b/dev-python/oauthlib/oauthlib-2.0.3.ebuild
new file mode 100644
index 000000000000..3f45f56fd948
--- /dev/null
+++ b/dev-python/oauthlib/oauthlib-2.0.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
+HOMEPAGE="https://github.com/idan/oauthlib https://pypi.python.org/pypi/oauthlib"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+# optional extras hard set as RDEPs. See setup.py
+RDEPEND="
+	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7) )
+	"
+
+python_test() {
+	nosetests -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/objgraph/Manifest b/dev-python/objgraph/Manifest
new file mode 100644
index 000000000000..7e9fd2f6fe3e
--- /dev/null
+++ b/dev-python/objgraph/Manifest
@@ -0,0 +1,9 @@
+DIST objgraph-1.7.2.tar.gz 545016 SHA256 3b08ccf1f06b8c13574c1edf4767fd9b50607a41218cf8a64f12e2f7a8be4d70 SHA512 22012031723060b47058c00cd97035b53238f8cf49c4e51b1f7735bf9c1d5aac9a5f0bcbe605317952f9b9390fc3bf247211082b4540e05cbf76670c27861ac2 WHIRLPOOL 23a017ac5fd9fa7ed266bc92675cb6d20afc38b2291465ba76414f1ff11edd42856732ffab1a187ebf8d683a1393f51cf7406104938fadf0fd286963fba6000e
+DIST objgraph-1.8.1.tar.gz 549402 SHA256 b4d4628adf39176beeb881fc575832256756bf0d73c1746b2b3529fd309b1a67 SHA512 c09e66aecc5dadc5a6e3d93e0f97fa6e816c5cbe968540400ed3d1248b958c955648cb2b4247ba00cd2388302dbcc178c55686cd2b95858b965a2717c6ff0c90 WHIRLPOOL f8e273422079249e0a22aa8f136fed72aa2fb1f8b925acfe52bf4677ac6164cc2ef919b5e4c23ab81ee978c94563366b52c52ed00c82ff8ce17056e644471c17
+DIST objgraph-3.1.0.tar.gz 629772 SHA256 99b3a39e8bb7a3530324ba50f65415448cf5279d8c67c0556a0bdf3c8f7c6510 SHA512 4b997ff1942556fdeece39080ad00d915136d314add94e61e4b3102e332ce3fd029f7082fbbadeffae63f157f05f8af4871dc5b7ee26926d790fb043ad8f2130 WHIRLPOOL 84559968631d3a16e1320f03b6125d8a3b3ed2f98ea4d003647b5d446643005ff44477bd0da4ebf8c713090a3f11e20ee9e2e7135216eb0633179fba7c4cdcb7
+EBUILD objgraph-1.7.2.ebuild 507 SHA256 9f5e947ed4e563e08985c9431fae51e3a05e9bce934d51ed329bb8215d9cdbea SHA512 32c3a2323f20f865bd3a5694ab9384839f98c00fcf5d55e966512ab06bdce78831b3371520c70a88b7602e943b8ff8a1bf8c026744357961c287705f84172dbf WHIRLPOOL 4f6d0d3cf9afeb9a3078b74b0324b3a495aa0a12d3fc6a2369bae6429bef7fea86aa48d87d54747dc73ea9b56388bf93cc7616bd3d588726162a9f3e1e6549c5
+EBUILD objgraph-1.8.1.ebuild 507 SHA256 037eddc3f0733634bf7fc4ac74d500f9ef0836a33f9bffa7b0730c0e109bfe8a SHA512 c0f56c01aba38387bf58a0d5ca2edd997cbac9f553011f57e63a00e5ebb62fe8b6da61c780976d4c14fddfea3c31b58701ce8d48f7fdff30bcf378ac623ad79d WHIRLPOOL fc464c89059b0b705c8b32f00288c5047af5a7ad41dea02f29761ef532b2ac7dc481bb14c00af8820c9d99295a9c45480d7634f28b3e65595bae567bfa9b693b
+EBUILD objgraph-3.1.0.ebuild 607 SHA256 1ecdd17d54824e36f0547f9973c3753e9677a69d8e65e98a8a49bd0b99457ebd SHA512 710693e073f8a592e37908e9315f438129e42acb2e0e0844796497cca9a749fb7112976e0fe5c3ce517c1ac985b7f5ffb117ecf540f9b4abf210d7050abd1e27 WHIRLPOOL 02bf78d41c2659fef958ef9ff7dc496e0fb4856c669a6c9f1a064e57af13d650274707e0175e3b09350918c2dbb215687f9f782d1798f2a5144d2ff113ed1a23
+MISC ChangeLog 2235 SHA256 cf94eeb89541cbc27fa9eb91c791a314fda97b5f5025f861220e9416422fb283 SHA512 6b243ccc7c8a2965f0417508c5c789a3f78ae8d48540987eba6509d9a448d3743e2547216544d5b3d15747f285db1f4e6ae284c59323f8b89dc519d5bd87cc12 WHIRLPOOL 8ed9141f36a10c30ac4bf295662a3f1b8a14b1824d67aa189ffb2e8d7b87d6a7b65ad31a10b46bf4f21a1226b2446f31cb6ac6092c31640247c2f915ed44225f
+MISC ChangeLog-2015 562 SHA256 c65a3ebed70014482801be758e95d3d2cee5c4146b8d893767cb7e7861e07c61 SHA512 3357eebccdd3ca21decb4bc64adcc3e9d679f80bc90ee8852ace92181f8d6100a0aa0d407e205eef4d7cc44fc74b08a5c62b2d26e18b0f251f4fa5f09a17f6d1 WHIRLPOOL 9c4b584cb903c6cb640ee5f5612b4b616f2b7cbb4dd882f6906319c709ce0a265bbcabf5fce0140d909390449bc25e7d9211abf033faf6c0d0e1519c52d02189
+MISC metadata.xml 422 SHA256 a5ae33196556975c49ff48ac53f07614a9a3397dbd303c26c47d233e12a77d51 SHA512 efdbee08e75b435bc2c976b80ff251eeeaea1e806f8cbcfbc288711f31831b4aca279b303d3e261447c3a8eecd5997c8db848812951c86c02f01b74a9c1de146 WHIRLPOOL 27511c07eee2e74f3164c779cbafde14c1bf34dd96dd5774c884f314b1e274e61f56ad8cc58afd1f42e4e609b3739ed8900ff91656e8b01c76cd19d25a58440d
diff --git a/dev-python/objgraph/metadata.xml b/dev-python/objgraph/metadata.xml
new file mode 100644
index 000000000000..d6f6331c46c2
--- /dev/null
+++ b/dev-python/objgraph/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>heroxbd@gentoo.org</email>
+    <name>Benda Xu</name>
+  </maintainer>
+  <longdescription>A module that lets you visually explore Python object graphs.</longdescription>
+  <upstream>
+    <remote-id type="pypi">objgraph</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/objgraph/objgraph-1.7.2.ebuild b/dev-python/objgraph/objgraph-1.7.2.ebuild
new file mode 100644
index 000000000000..72f432f7209f
--- /dev/null
+++ b/dev-python/objgraph/objgraph-1.7.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Draws Python object reference graphs with graphviz"
+HOMEPAGE="http://mg.pov.lt/objgraph/"
+SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND="media-gfx/graphviz"
+
+python_install_all() {
+	use doc && local HTML_DOCS=(  docs/* )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/objgraph/objgraph-1.8.1.ebuild b/dev-python/objgraph/objgraph-1.8.1.ebuild
new file mode 100644
index 000000000000..44d0b197b22f
--- /dev/null
+++ b/dev-python/objgraph/objgraph-1.8.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Draws Python object reference graphs with graphviz"
+HOMEPAGE="http://mg.pov.lt/objgraph/"
+SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND="media-gfx/graphviz"
+
+python_install_all() {
+	use doc && local HTML_DOCS=(  docs/* )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/objgraph/objgraph-3.1.0.ebuild b/dev-python/objgraph/objgraph-3.1.0.ebuild
new file mode 100644
index 000000000000..df22cf88af4e
--- /dev/null
+++ b/dev-python/objgraph/objgraph-3.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Draws Python object reference graphs with graphviz"
+HOMEPAGE="http://mg.pov.lt/objgraph/"
+SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="media-gfx/graphviz"
+DEPEND="dev-python/setuptools"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=(  docs/* )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oct2py/Manifest b/dev-python/oct2py/Manifest
new file mode 100644
index 000000000000..57b69de6dd86
--- /dev/null
+++ b/dev-python/oct2py/Manifest
@@ -0,0 +1,7 @@
+DIST oct2py-3.6.0.tar.gz 668836 SHA256 b356daf63a80c778fcf81b380c187863b86e9aae88f8321bb543c5512835c69f SHA512 f414a0231665bc3bedb7dcdaab8c86f32c140e5107ef80b70e2f99467e737d033de6ff492f2af7233671bff9b148475e0af4881c073ac727d0fd1228b7cf59b6 WHIRLPOOL 498b69f6292fe60b1035ea8ef587b3dc7b49fb4353bf31ce5f19ca3afc74a3b4bdcff7700d77d6bd8e6bf079c590114fee1c2f0352127745d162fc3f6be9b3b9
+DIST oct2py-4.0.6.tar.gz 431738 SHA256 07cbcee467f6bd7bd2430d2ae270fcc035acf2c8ad35f6ad9bb6f7b0f915e179 SHA512 997ca843571d2d68c4c57c0213a525c1be5f8b3e3dbffffb6cd41e423d68c8836dd12a03d5210d7f0cbf8ff19be7bb9d25b48c62a236cae68a0762547e574caa WHIRLPOOL b824f9c21665a70e21e614022ccca7e05032f59d5fd5b1993b31f16dcd9d4d5cf2dfc948873df5ab9234b095d7b188867eac5ab4ee238c046131c0e042e3bb5e
+EBUILD oct2py-3.6.0.ebuild 1448 SHA256 bdff7f7910092f0081dde9612b1711fbb2c91f02ff580162958379acabee3b82 SHA512 f6ce0f0ee26befd1c140495660fa4fd0cb4dc641c89bcab435016d84aca37282e1fdc364c1ef0d6f41b646eae844edbf85e9e81f912a649074790ea8cf6bc16d WHIRLPOOL 80f608b101d4b3727301dafae03b733fbd77fbcb9baec259461f1cdeabef16a9e47e1fa1dfbb94d01f781317804fc0f90b80a5dd181201373466fab3cd1d8483
+EBUILD oct2py-4.0.6.ebuild 1158 SHA256 3a5ee76eba31de3f1d813fb90277f972bb330d4b84d3b030a952bb0d74d11b12 SHA512 34929079793a8f50664fcc94c5209f8747b20a779d5b094600e48c19082382bdfd28cb0efc9b0c4d2a8f82fb1fb7385642e8eec6f4660e937e12d2e6851da36c WHIRLPOOL 461022154242407aea5c88e1c8dbc5c3b77fb9a3b838276bed2624a0fb57d96b3fd1be00b7e460aebb85ed2961945b1fb4c0f4b9daf7948e4efe17e18bae3d3c
+MISC ChangeLog 4997 SHA256 d68bde856388569c1a12d7e8cb10e3548c9ea17fef5a93b237ebb6181b614491 SHA512 3ad7c22f07bfccbdaf746072059d7782cd43dfcceec2c418d9bb297bb0a9e44ed8a53218af9196eb271be60b5e52a9b337d6d44db0598d7e4e76ac3ca0f36392 WHIRLPOOL a2fe80d6a0d87bcc49b78aa037cd0d5ab031399b9836e58c6d9ae80c96859414b71ea453ba7f4a6e4f8aa1935be1f0cc47c2ef1ac9ac5f019a1cc978012b6ccd
+MISC ChangeLog-2015 3476 SHA256 e93046f5c3edd8905e7fa0313df8957b74083359d240ca6a59f5b9ccbdd78adc SHA512 42dbd9e19c0023a874995b5e8e92202ee76806a8d77a3ddad1805007917f426c81e31eb551e999d97c5825d000a409e12946674063c6a33d1d29c09119219c36 WHIRLPOOL 65baf61071b89fa87bd6a6453a9093f8c8bd728558071b567e5cc4e17f2f082c9ba0d3efb05dda905ad54b13a42436070ff0db6efd2ad5f94c74d219e6742ecd
+MISC metadata.xml 615 SHA256 996585b2728eea62d8eab062b60ae264c19e30195b29b6a774db15a80d8d2217 SHA512 e476f193cbbdefdf56caeb8a8a501f57daf1b74a12a32c426b6e9150ea0d5b2538b7bd9bbeb3b7f45ba01aa741be2fd0b4dbf8e8302e867230fc1b2512c10ca2 WHIRLPOOL 1f31e31ca30bc45b334a251d80862c68052d62101ab8015a97219dfe6e3da2efe24a3e7f04a629b982c74c95b59b81bd42c81f44d6c4d9d923bcde191ff56fc9
diff --git a/dev-python/oct2py/metadata.xml b/dev-python/oct2py/metadata.xml
new file mode 100644
index 000000000000..1b0577d069b3
--- /dev/null
+++ b/dev-python/oct2py/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  Uses Octave to run commands and m-files. Supports any Octave
+  function or m-file, passing the data seamlessly between Python and
+  Octave using MAT files.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">oct2py</remote-id>
+    <remote-id type="github">blink1073/oct2py</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/oct2py/oct2py-3.6.0.ebuild b/dev-python/oct2py/oct2py-3.6.0.ebuild
new file mode 100644
index 000000000000..818ad6bda37f
--- /dev/null
+++ b/dev-python/oct2py/oct2py-3.6.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python to GNU Octave bridge"
+HOMEPAGE="
+	https://pypi.python.org/pypi/oct2py
+	http://pythonhosted.org/oct2py/
+	https://github.com/blink1073/oct2py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.12[${PYTHON_USEDEP}]
+	>=sci-mathematics/octave-4.2.0"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# https://github.com/blink1073/oct2py/issues/77
+	sed \
+		-e 's:test_help:disabled:g' \
+		-i oct2py/tests/test_usage.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die
+	fi
+}
+
+python_test() {
+	unset DISPLAY
+	[[ ${EPYTHON} == python2.7 ]] && local OPTIONS="--with-doctest"
+	nosetests --exe -v oct2py ${OPTIONS} || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( html/. )
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oct2py/oct2py-4.0.6.ebuild b/dev-python/oct2py/oct2py-4.0.6.ebuild
new file mode 100644
index 000000000000..cafb9f92a0ff
--- /dev/null
+++ b/dev-python/oct2py/oct2py-4.0.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python to GNU Octave bridge"
+HOMEPAGE="http://blink1073.github.io/oct2py/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/numpy-1.11[${PYTHON_USEDEP}]
+	dev-python/octave_kernel[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.17[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+	)
+"
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die
+		HTML_DOCS=( html/. )
+	fi
+}
+
+python_test() {
+	cd "${BUILD_DIR}/lib" || die
+	py.test -v -v || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/octave_kernel/Manifest b/dev-python/octave_kernel/Manifest
new file mode 100644
index 000000000000..6b6bb480e600
--- /dev/null
+++ b/dev-python/octave_kernel/Manifest
@@ -0,0 +1,3 @@
+DIST octave_kernel-0.26.2.tar.gz 11152 SHA256 cd65d9a888991634ed43f01201ab068bec2b9cea4ae8642d353f6264f5ed6dd3 SHA512 95072ea3e0f74c57e71ef51c3c2050be9c739693bbee22fc5fa63e24fd639daf1bcf4f3a8b5be499de2e4e723bedc8d1f59237ffc1a17ad634a519c96cdde34f WHIRLPOOL b561e422a11a097a48e9a665cf789e97f75471952a15ccf8c57704ed031c21b856b6914629f70be111fb2add8968ee84dcc103bc4857da14455b73b0aea5b397
+EBUILD octave_kernel-0.26.2.ebuild 589 SHA256 d12d5287a9cc83328c006b7bb2be491b30d7930f3b38c66cb73dbc3b0f286284 SHA512 0651bc18a52dfbc16820a841d1d3e1af8c6edebb7bd9a301ba12de1b3940d6b4bec38de1f5c75065e84c6958911d63458c2f6d05d8e7954958c7e5dd47d15210 WHIRLPOOL 367af4f5bae7558a676fb2932c1f42b2c05b997e8ba6e6b0a79b7c1d8bdc5df8e48c12762af5774fbd85dcaae9b36cfcbc8b495781c96bfb459036c725205f88
+MISC metadata.xml 506 SHA256 304beec47f24ef4372b608b5f6bf2575839ff8553de46d3f3922ef3013233119 SHA512 c53f4011a2474c2295d9e3a3f216aba6711b08304c6b59da8b81bc40aa2d3bdf7911e69b23abcec4a0e5e9a3c75663f0c7e693cb2bca6c59a108393185f445fb WHIRLPOOL 4bb1c9318f56b2f8c27fcbf7592f89123093ca62edbcce2f6fd125331d25b39c89cbced0a74bfc642081572e3a59541b02f4b2dcd13a726fff22c62a9a08a1f0
diff --git a/dev-python/octave_kernel/metadata.xml b/dev-python/octave_kernel/metadata.xml
new file mode 100644
index 000000000000..9d7952c3aff4
--- /dev/null
+++ b/dev-python/octave_kernel/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    A Jupyter kernel for Octave.    
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">octave_kernel</remote-id>
+    <remote-id type="github">Calysto/octave_kernel</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/octave_kernel/octave_kernel-0.26.2.ebuild b/dev-python/octave_kernel/octave_kernel-0.26.2.ebuild
new file mode 100644
index 000000000000..f58a601bbbd2
--- /dev/null
+++ b/dev-python/octave_kernel/octave_kernel-0.26.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter kernel for octave"
+HOMEPAGE="https://github.com/Calysto/octave_kernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/metakernel[${PYTHON_USEDEP}]
+	sci-mathematics/octave
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/odfpy/Manifest b/dev-python/odfpy/Manifest
new file mode 100644
index 000000000000..9393bf01ebbc
--- /dev/null
+++ b/dev-python/odfpy/Manifest
@@ -0,0 +1,5 @@
+DIST odfpy-1.3.2.tar.gz 479554 SHA256 5a7431ee60dc5fe6be106f3be7bc71e9e6e5eed7ea38a69918e590775c75e5d5 SHA512 c5be79c4077f40a56821790d4b6062e3715f8b616b1e9ead79977ad00ecf3f506ebbe73790f215bb835a233833fa471af7f619cfcd88320cf8238e4c9502e248 WHIRLPOOL 10fd109c6a61aa4061e264025583952a55fddf93f558ba4b41d30abf22bff8af790855d3f9c193b8b93dbfbd028add7924ea943ac01a0d2997381947e98228a0
+EBUILD odfpy-1.3.2.ebuild 1086 SHA256 fd653621849bb72d1d34392be83f28761f400f7d4c60beb487ceefa401d16b3a SHA512 238c33f124de31ed7a631eadc93c90900c64cccc14a8866d75a21bea7016b9e5fea4ab7d3672ac2ddc11fb401f82d9dfe5e110adf92a2f298b1b3eec5bd83128 WHIRLPOOL 9c0de3b1046511baa90f8116602b481c47667d01c8cbfcd2b058ef1bbfb4f4cb165f3fcab27a8d74f0b996cc00c8803ecbe1c04cb7153e5774ed0fb9a9694568
+MISC ChangeLog 2967 SHA256 05b020c1c0ea7b10ff5e5c39c99b0b7f649e68f88faf25574dfb21e5504c3afb SHA512 682ce14b817a9e1b635a1ae04cd17bf009b4f238884bf3d90f7a01a52e42216a0f0da469dd0508d85e9c33b62120109e7ca121ef0888e29115fd02f4108f9e7f WHIRLPOOL 3893225c177797ceb3de29b1744c25a56053fc053ce03d9e0d0a7dd8c41e7e46ad1f4db9f709c8ea082bd57a417aee592d954aab8734c7180ef6e2bdafa34018
+MISC ChangeLog-2015 1911 SHA256 03079f30c2dad8976da65dc68a737ab26f3e99a0b9d2ed495a9d54ea48d9ec5a SHA512 02be1c9e7afa5027f63214e5bbbeec37bb4f03d1f459c20d314edba7217408dcf93cb6085b19f1893c88363f59c44302bcc933900f18dda8fd7878727ffc4766 WHIRLPOOL 056ad99f3baa2d9c40222e7be226fddb187651d77dc359f12a8b3b18eac00036f9543df96dd2e941138150b2ae88031d7617b6f5ce5bdfe498e9a64398466a48
+MISC metadata.xml 308 SHA256 3ec5e828119644190924a5c37c5543cb48c9f77edbd8060e65edf6e8555aaebc SHA512 919a3c6c182828bf99396da71e83f0b982aadcdf0e0c5e6e7f29e15cab19e2d3c6d5afc26864a324055e97be9563cc30ef10b701716678c7cd44e8403adaccde WHIRLPOOL 0d276a3f2f8f3fa2572911d53bf0ed44e78cf0c7292a05a162b5c5e0de7279a588d182a05d1662a6c377a617471fd15e41a8b9435a48cd1fedfc4e5c9edd6f01
diff --git a/dev-python/odfpy/metadata.xml b/dev-python/odfpy/metadata.xml
new file mode 100644
index 000000000000..eb4477be8452
--- /dev/null
+++ b/dev-python/odfpy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">odfpy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/odfpy/odfpy-1.3.2.ebuild b/dev-python/odfpy/odfpy-1.3.2.ebuild
new file mode 100644
index 000000000000..f20d00b784d8
--- /dev/null
+++ b/dev-python/odfpy/odfpy-1.3.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# Classifier: Programming Language :: Python :: 2 :: Only
+# py3 fails one test, pypy anpother.
+# Notes on page of home repo reports support of python3.
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python API and tools to manipulate OpenDocument files"
+HOMEPAGE="https://github.com/eea/odfpy https://pypi.python.org/pypi/odfpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+# Tarball missing required folder to build docs in html.
+
+python_test() {
+	# Known single fail under python3 suspected to be caused in python3 itself
+	# https://github.com/eea/odfpy/issues/21
+
+	local exit_status=0 test
+	for test in tests/test*.py; do
+		einfo "Running ${test} ..."
+		"${PYTHON}" ${test}
+		[[ $? -ne 0 ]] && exit_status=1
+	done
+	return ${exit_status}
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/odo/Manifest b/dev-python/odo/Manifest
new file mode 100644
index 000000000000..6a886393de63
--- /dev/null
+++ b/dev-python/odo/Manifest
@@ -0,0 +1,6 @@
+DIST odo-0.5.0.tar.gz 129977 SHA256 e892ffe58e87d6b1c12838c4ab252bd0ae8c0ec43e5179409309ded4929905d6 SHA512 699ec7a3640f319d428854c784bac7747b5c50a8d3f1cad9caa02048a012b51e0da655989b749d84b52b9cb23ad26e6c218aac1d36a0966087238f60874f41f3 WHIRLPOOL 159b9ff4f00ddbef4082e6304dc8176482837f90a711662db77d2656b85b71833d7eae1e3241d64155955f77734ecde41ad3797fa893d775d76dbe8a2f3831c9
+EBUILD odo-0.5.0-r1.ebuild 1272 SHA256 7cc8152dca75955d34981aa85aed6b356ce9817869f996c4b13250cd77dd814e SHA512 78fa0fd55d9da6b02ed2464e34fa6905516dd0a878e952c523ed74b826909bf945be3d82c17d938aced034fa1d8b9598e5504740e4adce89438d159d7bc5158f WHIRLPOOL 8bc77f88a8cd14faf1f951729dea50d213e8517f451551cad0ce456e904e49fe6a1c9d8ff5350bf580b41166c221caaada36eff38aca77fce94f6fd80c9bfa28
+EBUILD odo-0.5.0.ebuild 1139 SHA256 066320c970fcf3128fa0ac84ff6c164ab3223afefc776af51534964266705ecd SHA512 7810de367c232b0fd7807e5ab574ec77dfcc315246979992ecbb85ef752e67b0823e30754865cfc0cf2c556bdd43250d8f60dc444d00d381782af7d421910bf0 WHIRLPOOL df2c6aa33094399e866a7f46dda2c2d3cecb556e12b13ebb33b6d280bddee8daa9422c46b63f7760d248273e3f087d76926a6b831b5d382ef555c2ad6bc2bf03
+MISC ChangeLog 3190 SHA256 3b541473ab5f35d9af531721d22e01168359d0e17f5ca6f4f982487d097433d6 SHA512 83febe43f7194e8424f3b4584617a9d36f0433a55904fe0a163bcba992480b7261e2a36be4b3296bf715ecbb7a59f55dc1853e2740a7a77be296e07e0f859f23 WHIRLPOOL ec9c81ab92d5e1e7cc2e7ae041efc37eeb4c119628766d036e6e95062d0676bfb8d4b0f486aa9885fd96d9d90ee9fe62749b285205ce73cb035c264a6dbc34d6
+MISC ChangeLog-2015 701 SHA256 29ee6f1d48f8cbba59253d87738fe0cb51ffca53e75ed3f13ee2445a6e5f6229 SHA512 0fb2fb797b91e0590be9a04bb178afcade403061f6234f440bc19d7fd414e1aa39427f10fd55ee4b6b311a975c04afdd12f0f1be46f6e9d8da81dabface9c8ff WHIRLPOOL 89dcce1e29908fdb2d5cdd1f74eb8db283deb447c06cffd1a66d0b4cf278bdef65b7ba11e53f9d422656a56c26a4d9bb0e0e9d3173982bf7432826b6317917f6
+MISC metadata.xml 373 SHA256 33f19bf544ee2a9d4b8f047f779d2ecd2c17a2d862b7cb157463da53e99075d0 SHA512 1b6f87d7aafc773ab3004adc75b4449a3b90386470ec6f47e1e7c3fde5d54cde883f4e6728b083c2706e4ecc0a76845d28d4f721d653cb8d16dce9687b0d478f WHIRLPOOL dc658535d9ad7826b344452035b5f1fcbc2a880ca99e59124c2f7fdc78ef7a46d001db5b90035758b5655c9a006c1ade1edc9ef4687596348e752997c6c1842d
diff --git a/dev-python/odo/metadata.xml b/dev-python/odo/metadata.xml
new file mode 100644
index 000000000000..3e553038fc8f
--- /dev/null
+++ b/dev-python/odo/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">odo</remote-id>
+    <remote-id type="github">ContinuumIO/odo</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/odo/odo-0.5.0-r1.ebuild b/dev-python/odo/odo-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..e35895d90669
--- /dev/null
+++ b/dev-python/odo/odo-0.5.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Data migration in python"
+HOMEPAGE="https://github.com/blaze/odo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/datashape-0.4.6[${PYTHON_USEDEP}]
+	>=dev-python/dask-0.11.1[${PYTHON_USEDEP}]
+	>=dev-python/multipledispatch-0.4.7[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.7[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.7.3[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/docutils )
+"
+# tests need very heavy deps (such as pyspark), skipping for now
+
+python_prepare_all() {
+	sed -e '/.. toctree::/d' -i docs/source/index.rst|| die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		pushd docs/source > /dev/null
+		mkdir ../build || die
+		local i;
+		for i in ./*
+		do
+				rst2html.py $i > ../build/${i/rst/html} || die
+		done
+		popd > /dev/null
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/odo/odo-0.5.0.ebuild b/dev-python/odo/odo-0.5.0.ebuild
new file mode 100644
index 000000000000..71734e6d7292
--- /dev/null
+++ b/dev-python/odo/odo-0.5.0.ebuild
@@ -0,0 +1,49 @@
+# 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
+
+DESCRIPTION="Data migration in python"
+HOMEPAGE="https://github.com/ContinuumIO/odo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+DEPEND="app-arch/unzip
+	doc? ( dev-python/docutils )"
+RDEPEND=">=dev-python/datashape-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.7[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.15.0[${PYTHON_USEDEP}]
+	dev-python/toolz[${PYTHON_USEDEP}]
+	>=dev-python/multipledispatch-0.4.7[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	"
+
+python_prepare_all() {
+	sed -e '/.. toctree::/d' -i docs/source/index.rst|| die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		pushd docs/source > /dev/null
+		mkdir ../build || die
+		local i;
+		for i in ./*
+		do
+	        	rst2html.py $i > ../build/${i/rst/html} || die
+		done
+		popd > /dev/null
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
new file mode 100644
index 000000000000..5610d3974091
--- /dev/null
+++ b/dev-python/olefile/Manifest
@@ -0,0 +1,3 @@
+DIST olefile-0.44.tar.gz 57903 SHA256 021fbed5c539881d7f1360fb27e942fdfa7c78006bed39e6cd6f3dd9e7bd68da SHA512 92b6ad1bced5b2c8e5332a01e5a2e59527ec2303046d0babd665b0f02fe56966574eff56619de168c50f1ea40df2e61ce589ee61b634222146d049b129514c65 WHIRLPOOL 518a1a29fd3390f816db85a2de4918aa2f81b9d6402faf1c6b410c88a13402139e560d3564da60c75bfd6eba93f5351d8d69581b5e643d259fb421edae9a18e6
+EBUILD olefile-0.44.ebuild 650 SHA256 d475f21dc81ac15746bd51ce53b8b175925fe81edffe036120474d37876fbae3 SHA512 91ad7ac20db39d36f0d9730da7cb6afa46255b4d94c18122bba88976c257009d5ff622cb52ebb7d3588e1a45f9f0f1ff90ebb7c1419fb8ce770f84ff05ebef92 WHIRLPOOL 48e41392b9c20dfa2a6e1690f77fa0957fccb63f85112c985d3010150e6c06c759d2df970af45cb74812c45ae308170b6ca88f80890abeaccd1bd445be08e159
+MISC metadata.xml 383 SHA256 b4cb34f76c6ce18c14a9826f0814cbead6320440bb2df7acafdd9f22ad4af958 SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f WHIRLPOOL d54fe2a18269c96d3416641b2a1c04c4450c7d6cf6a5b297cd328ce8d11aa57c232cfd1528ca5c34b76b59b26af173e8e6bf427539fd6aa6377c7dccaf7ef866
diff --git a/dev-python/olefile/metadata.xml b/dev-python/olefile/metadata.xml
new file mode 100644
index 000000000000..f67f501f4ef3
--- /dev/null
+++ b/dev-python/olefile/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">olefile</remote-id>
+    <remote-id type="github">python-imaging/Pillow</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/olefile/olefile-0.44.ebuild b/dev-python/olefile/olefile-0.44.ebuild
new file mode 100644
index 000000000000..34624a0de347
--- /dev/null
+++ b/dev-python/olefile/olefile-0.44.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package to parse, read and write Microsoft OLE2 files"
+HOMEPAGE="https://www.decalage.info/olefile"
+SRC_URI="https://github.com/decalage2/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	if use doc; then
+	   emake -C doc html
+	   HTML_DOCS=( doc/_build/html/. )
+	fi
+
+}
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
new file mode 100644
index 000000000000..649035239c93
--- /dev/null
+++ b/dev-python/openpyxl/Manifest
@@ -0,0 +1,8 @@
+DIST openpyxl-2.3.0.tar.gz 138746 SHA256 2f9d7350304edb0e94ccc898fb7efa8c22b83bb37fdcfeba9b674d07dae19c24 SHA512 e0d438c753628618748af7511366936681e63046fdb9dfb8509db8701194dc2875394892392e6871a367a68c08b730efdac29a88db6b0589fd619066145fff9f WHIRLPOOL d66436e47f2c807a6ff0b9a9991d1ae52c8bb35ff2e2ec43d0fdee4c0bf2b4e27bf6077fc2b87d720fe97f7d0a46edff35db14cd212685d502d828aa48fcd85b
+DIST openpyxl-2.3.3.tar.gz 141530 SHA256 93d64157d8cab5c7040bc025f0a7a9ad3c05e2d3f11518329c3f1682f5f62ffe SHA512 b5fb65acb711affe40e466c91d58a8dc989ada06cc58cee046311b6e65073e49ebddac8912f1b5642eb2be36ed8ff4f9a8b07acd75cdd067807fa8898b47c065 WHIRLPOOL f5157fdac4439166eada63795b56a61bf87ff3b95b0df419c2fbbb2fe94239c614795c8ccac648bdcf81695d598439f092f4747853025dd8e4a724b076b54a58
+EBUILD openpyxl-2.3.0.ebuild 764 SHA256 84a6e39f45ad8e85e62bc9725ae9309ac2de8b1bd97980b6719bf6bdc1eb0c27 SHA512 252326aafa7753850ec792f121f0c7d455d310072cbb0518fe07a7ee29f3076c70f9507bec3a8fe073ad5ac1fae0bea22a9f27678542c4278175a27a8673d72d WHIRLPOOL 52299c91c7199551a7a398b75e83d9554cd4d4ca11c605fac8c62f359c9969bc7eb6a8a91523c17a61a867d9534ee505f3d661afab0c96c6349a2030281b93f7
+EBUILD openpyxl-2.3.3.ebuild 766 SHA256 6533d5b1f947c9ee366989739446509181b2499f661bf07312e9c879b7cc32bd SHA512 9c31e03c8052b08b286a96773472027bb0fd4f97e20c07c713ab0f29557ad5bb6e9d24c3bf275d489561658b87397b99c1fd4edf7aa690ad38a1873b3df969e0 WHIRLPOOL c179c489de45220329d42653478d60e5d5e1c8e268d108020f52596c8e5917329f24177f2d514a4aaa4f21ca793134c853a8aa802bc685812bbe6dc4c6279a49
+EBUILD openpyxl-9999.ebuild 684 SHA256 26de6b023fdf03451aa417db608ccbe60ca2662dc3e185cea95ce0b7f585b38e SHA512 9b01ca560e6a03542b4d0640c0ae771b803d7d9cb5acc229a8a0e1954448ff3ada2d6e0d64877d59a7da88004cb4812da6d47f36449e76b697c0ac8e7f9376ff WHIRLPOOL 7240c3aee8ddec387a508524f0b451d7cf8a8af39a55f444561175304e3abc2cf252efb1025c3d1afa2c64b77b85d6886ef7bc52446170f9def428abe9fd63b4
+MISC ChangeLog 4533 SHA256 bcb3967e425cbd58d05b60bcc48ebc634c86fcd279f96c0252c175109f9de161 SHA512 b9a8d97a0ac93968cfde368af617da9f8bf476835c791f951eb1d560c2dcba4223c25815265a0e98244b527d3fe46e623607e1f2835b13d9d17052b092707050 WHIRLPOOL cf77393a7f16c8208fe67748995a71ed262b55ade114247da6fe9b4f08ad1196ddc3cb9b86848359b7dfea8c2070cb5ed6c6f32e37fe7e388cf90fc76ed8bc54
+MISC ChangeLog-2015 2538 SHA256 1ce13f1d8601a41b17c706d4a31833d5d687d75e1ba22d22e65124da53a32e51 SHA512 760dbc49b0898d18efc575d99e3cba6ecbf9184bff9896065b96cc129c674b460a7c7dea822632821a35e7baffeed9faa5f83c5073ae7c3439f9d7a3ccb66d1f WHIRLPOOL 8026b7f84b52fbb0a02e95b7b91e6280a012ace2ab4afaf9637bd72008e5caabe61dc19ae1865142f0c77d937c01b9ba0f427b9d92c8bb9003a816f020ccb20a
+MISC metadata.xml 449 SHA256 5a2725734b6cf7157aacf9728144cbbfe008e6c41242635a34a4b70a33fe7fdb SHA512 c9aa0ab803cc15b6ecbcdcb01fb4c224ee32a53b9054b345329f9d66e2aaacece4b2320878e4f09c0bfac1631b6656bc93c6036d3cec84c1fee27d4737aacee0 WHIRLPOOL a42cc86629b982d4a3e317aee1fd818ac5518a1966d89a9e86f11bdef018f9a3d36b981cf1dd32617733f4920f99f8d2cf1b608d6468d5e1f66d1737bd47328f
diff --git a/dev-python/openpyxl/metadata.xml b/dev-python/openpyxl/metadata.xml
new file mode 100644
index 000000000000..c9453db3b537
--- /dev/null
+++ b/dev-python/openpyxl/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+  Openpyxl is a pure Python module to read/write Excel 2007 (OpenXML)
+  xlsx/xlsm files.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">openpyxl</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/openpyxl/openpyxl-2.3.0.ebuild b/dev-python/openpyxl/openpyxl-2.3.0.ebuild
new file mode 100644
index 000000000000..88aee200525d
--- /dev/null
+++ b/dev-python/openpyxl/openpyxl-2.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
+HOMEPAGE="http://openpyxl.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/jdcal[${PYTHON_USEDEP}]
+	dev-python/et_xmlfile[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)"
+
+# tests aren't contained in tarball
+RESTRICT="test"
+
+python_test() {
+	py.test || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/openpyxl/openpyxl-2.3.3.ebuild b/dev-python/openpyxl/openpyxl-2.3.3.ebuild
new file mode 100644
index 000000000000..ef154a5dc827
--- /dev/null
+++ b/dev-python/openpyxl/openpyxl-2.3.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
+HOMEPAGE="http://openpyxl.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/jdcal[${PYTHON_USEDEP}]
+	dev-python/et_xmlfile[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)"
+
+# tests aren't contained in tarball
+RESTRICT="test"
+
+python_test() {
+	py.test || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/openpyxl/openpyxl-9999.ebuild b/dev-python/openpyxl/openpyxl-9999.ebuild
new file mode 100644
index 000000000000..ee7102131b94
--- /dev/null
+++ b/dev-python/openpyxl/openpyxl-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 mercurial
+
+DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
+HOMEPAGE="http://openpyxl.readthedocs.org"
+SRC_URI=""
+EHG_REPO_URI="https://bitbucket.org/openpyxl/openpyxl"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="
+	dev-python/jdcal[${PYTHON_USEDEP}]
+	dev-python/et_xmlfile[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/openstack-nose-plugin/Manifest b/dev-python/openstack-nose-plugin/Manifest
new file mode 100644
index 000000000000..4989950126ae
--- /dev/null
+++ b/dev-python/openstack-nose-plugin/Manifest
@@ -0,0 +1,5 @@
+DIST openstack.nose_plugin-0.11.tar.gz 4120 SHA256 a28d44dc23de8164d7893da7020404c73c4325b46d5507911f0257c15f613b4f SHA512 25139ebd3229cb5e07e296848d5a0bff090bec9b3ba618fe3a4278bdc9b2f7f0eced887285e9e3836b555afcbd74f061ec90a8a63d5c1fdfc53b7aea48a102a2 WHIRLPOOL d102ef5622404f77022f8cf1c04ac6b47b6a735a2e39523681589e92c1579824667fb5a863dd4cd6ac88e0d8915aad7c7aa85b18321d017ed281b6ce80528e05
+EBUILD openstack-nose-plugin-0.11-r2.ebuild 654 SHA256 77326baf59fe661d04157cb02d848d3943573d0a0af6de74e6b3ce5b3d88dc1d SHA512 3c8a17f73ccfdddec6cef30afa692e1fb703ede473e2af2eb5adb20c1ee99df9f416ffbe7279bc178d67155c21dde89dece9d4f26ee41da92eee41c94430a8d1 WHIRLPOOL 88a3eea4c71c31fe4bd08621dae38886baca233c253dd3b58b91bcff988b494a242d254e16dfb1ba9d8cf9c6d739139ded4cfb0ecb7e608da1197aa71b974bcf
+MISC ChangeLog 2475 SHA256 53cdcfd342e7e11abd9df9e574d8dd38387baaa250c03e5b82aa4d0ee09b8979 SHA512 727c6d5ee706315a5a15e5f6d24e0a64ab5d8aca1e8b9aec6e9493fce769c1240dab0841349530ccef918bd5f3c1d04c81d2f102ca4f7ea3905d181505027016 WHIRLPOOL ad2027b1027a967ce63ca32e0bc367cad6175dbf404eef923753b91f2e776b341f32dd1bba389455d49492737346099099e1330a207101350606dd3f963a872b
+MISC ChangeLog-2015 1700 SHA256 f46c081f6f46aafae289e48a06f1bfb0196708e0a0c7ce05adc6f45141944e4d SHA512 f53f1779cbdf249fd8fcf0ce5f40acf6845dcdca278f5b31d3c112b878711d4e9f68fb8560631f3fb5163cb5f29ed5f69b989dd0ed59faeea2515cf3235274a5 WHIRLPOOL fba1700adb12afef0c46d5ecad58233725147b25affa26d2f6b0a33c5c8ee75c9ae89558093bbd03ce6c465d2e8c6a735f40657dd77ffed5c092fae6c0cdfe8d
+MISC metadata.xml 686 SHA256 940c418926692a9a0b53afc4764674c2a87eb8ef96e367396a2134dbea8181ec SHA512 3b6c672090a8cdb6b7c9df3d33a74fc6e772435539c72e78cd326dbb61464004d40cc6e219614ff935ce20186e70e88540f7cc933d045f773d095f427813bab2 WHIRLPOOL a8499b0dacc554260708084f31c3f20bf99d95c01c788026370a20ac1b1eda2e911310209283d363dc4576b73f55c5fd7acf8d8a3b73d125ca919936ee7d2dc3
diff --git a/dev-python/openstack-nose-plugin/metadata.xml b/dev-python/openstack-nose-plugin/metadata.xml
new file mode 100644
index 000000000000..2e84acf70eae
--- /dev/null
+++ b/dev-python/openstack-nose-plugin/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+    openstack.nose_plugin provides a nose plugin that allow's nosetests output
+	to mimic the output of openstack's run_tests.py.
+  </longdescription>
+	<upstream>
+		<remote-id type="pypi">openstack.nose_plugin</remote-id>
+		<remote-id type="github">openstack-dev/openstack-nose</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/openstack-nose-plugin/openstack-nose-plugin-0.11-r2.ebuild b/dev-python/openstack-nose-plugin/openstack-nose-plugin-0.11-r2.ebuild
new file mode 100644
index 000000000000..0dfb9f91f7b5
--- /dev/null
+++ b/dev-python/openstack-nose-plugin/openstack-nose-plugin-0.11-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="openstack run_tests.py style output for nosetests"
+HOMEPAGE="https://github.com/openstack-dev/openstack-nose"
+MY_PN="openstack.nose_plugin"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/termcolor[${PYTHON_USEDEP}]"
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
new file mode 100644
index 000000000000..728334d51e09
--- /dev/null
+++ b/dev-python/openstackdocstheme/Manifest
@@ -0,0 +1,3 @@
+DIST openstackdocstheme-1.16.1.tar.gz 1179830 SHA256 286f6624caeae8523b359aa97c22c82a012d3b9efaacbaf15edb271052ea8c9a SHA512 fb5c6e8d9945603dd2f09799520eaac8586784cbb1a9fa5f5c5f53e04905150646159f1d0fe4ff0e9da0e04a4df348a931272a59dd3893b5ee2cb10b4a271dd7 WHIRLPOOL 0905287aa46d4d7fa3ffe0c7f1f6573850cb515cafa8ecb342d927c919a570d18c01cef4d668eb4af2851116bb74968fe9e3f661b8d52f38c18aec41462bdc91
+EBUILD openstackdocstheme-1.16.1.ebuild 594 SHA256 3cdbc63c303dabf71dabe3cff07be0a7078719d4153fc1aae41b9a5fb9848a63 SHA512 20e9b5b59e160e98bdcd2dd9dc536a805a37670ce55f81b6413c4de5bb8d0d5ffdab7b213b4f6aef63fe57092f998a9baab1bf8add9c67a034f676f441646feb WHIRLPOOL 2b5f7a360eae00748183da359c4fde60d5df93d3387e99644805a78b03f477d3212fd26f669cbb00312d6bf1e274be72c2230c8a58e2d922cd1743852f2eafa2
+MISC metadata.xml 506 SHA256 b863b8cb41a73a16d07814e7a6b5332c923f5d5dbef2f6681e56c145f90fc600 SHA512 6111af92dd3436c323603a2351083701e9ad9108fe94dd4a5ceb29fc5e4408d2732481604f3f57936c243fc0f88f4ef6c1c351915ec65d3e3384e34c5e683ac0 WHIRLPOOL 5e7f03945762ab48a169948136aa665fe0dc6c7d50557ac0498dc301fd34472125260ded0fd729527d6ca9d55392cba4d91d190b6509abac089c0ee5d9e07917
diff --git a/dev-python/openstackdocstheme/metadata.xml b/dev-python/openstackdocstheme/metadata.xml
new file mode 100644
index 000000000000..1d8a6346f61a
--- /dev/null
+++ b/dev-python/openstackdocstheme/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		Theme and extension support for Sphinx documentation that is published to docs.openstack.org and developer.openstack.org.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-1.16.1.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-1.16.1.ebuild
new file mode 100644
index 000000000000..eb3634bf176e
--- /dev/null
+++ b/dev-python/openstackdocstheme/openstackdocstheme-1.16.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Theme and extension support for Sphinx documentation"
+HOMEPAGE="https://docs.openstack.org/openstackdocstheme/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
new file mode 100644
index 000000000000..1a8921515045
--- /dev/null
+++ b/dev-python/openstacksdk/Manifest
@@ -0,0 +1,10 @@
+DIST openstacksdk-0.8.2.tar.gz 209658 SHA256 9a5d29f0d4663d1215342d1174260be7f5fb16a6348b3b485550eb923b899696 SHA512 a752da6580910a382e2a0ac8329e39279140a56a80b6596138e810a40616b848d32fdb57925232290a6117a75eed86d2d7fb1d6dc608a9ed08669e9f7cce43ed WHIRLPOOL dadb64dc8562b711556839d6710bf67a649c068f93cf881642256f1b853d4747384472daaa9520bd6c14b70e440b21c660be495b605ff42ea668e5dbd15f2d38
+DIST openstacksdk-0.9.13.tar.gz 308168 SHA256 7fee2023e600f68eb3d33c7e03d2e54a3e36cc0e74c212fcc3c1a0b36a7f1041 SHA512 1f02b81f227f7f5836ab402a4433abd0a426e182b208a2369042986de3f2bc870749f4762d1d1d2227c10c74d003b6017cf0cfec86e9a05930839161babce077 WHIRLPOOL 9406033881306fee97e847edd5c7e603618a7d5bea365858ca26947b6f06f6ff06372066d57fd9c5775e95f94fcaafb5468dd461ddb10b527b4effa22e188bc1
+DIST openstacksdk-0.9.17.tar.gz 335611 SHA256 992b862df2e13a164055e009694c70c1d6f13cf283768a1b8ef509409d67846a SHA512 4699e80ad68896cea709c861b013404234b1d6acf2fcd8bc4e8b21b8841f8c204e693c4e631a85906b5b415404cf50f35f395df6206e471920c68d2f26726696 WHIRLPOOL fe4604c2c518b92ad1387026d9f3489f3676e58eedea9159c3581d57391c02146ac424b8e18375c5fc59a844878fc5becbc4ca64b44ce1a5ad8be2c4691e28b0
+DIST openstacksdk-0.9.5.tar.gz 264796 SHA256 620ed52b90a6e494b0732b63766264bede8c2fe2b4394fb1dd8d4c75a43ad4c6 SHA512 8aecfb9bbd7f950e40a25d3326d1b26436d92a7d556cb2e71fe02f127eaa96d14712e6805c83bd02109f8dec845bcb1d8857229916682bc7acd0d4a560203dfb WHIRLPOOL 1db2248ad334e8064a7ec4a3f9cd41a4f374de1b46ee82230b6723d7f6a08389c22400989952348a6a212dc39c8902d94833016f8f34464c3437773de7a13701
+EBUILD openstacksdk-0.8.2.ebuild 879 SHA256 c1858b0b81e06336d26b3e1bd9d7fa62f0af12de27ce759c49809f704485a9ff SHA512 c0d76fc17a3b334fa93653983a484ce8e98f318fcf36477fcb72dd69bbc48d5c5db00b987d9571dcfcdfcb13bf4fac0afa50073437e9c7ea9f8e997d93855204 WHIRLPOOL 950c33c93928697b04b458a22d699c82c104733ab11f009df56dc20beb50fb6d01a2cb6eb903607d8723c671cb8919448a3a509abfe24d86b6d7e07a46b62d8b
+EBUILD openstacksdk-0.9.13.ebuild 786 SHA256 527a9ff196316b12baad988668a42d6eb627a434e8e2cdd7acb09a9b882d6c34 SHA512 cad9ac9bd030a33d41ab80018ae4a8399d669174bcab0826887bbee7d2831ebe9bc5a6af16d180bb17cc99f08f7df7ca5c7015a72386d658752837bf6c107d45 WHIRLPOOL 140c55c3d3ac22684805ed7c3915c866dd0efe7424af247afe026743a7c5ec6a56826766435634b63680ac093f73faf0d7ef0e841a41044b23454b5c7fd59360
+EBUILD openstacksdk-0.9.17.ebuild 907 SHA256 afa8eeec865c7310b977fc6b047cde6596848468d6fb070c8e339e45e2a508f2 SHA512 225f9e9a65d17c1dbbe7d140498a2287e8b485d289c17732b482ee4e0ad942bac96c6f0ff211604f2af60cde42a5f8f29778c0b309cbb53b859d122078036a32 WHIRLPOOL eedbce7c5e9f1a091fc1f2150d230d57f2a61bde08d3d60e2816a91611b24f958372d5d6d7c311db8f154a4749047c37f067c0262b5d38025b3bc0916f83c3d9
+EBUILD openstacksdk-0.9.5.ebuild 1066 SHA256 18bebc5fc27cd942e950067f25c892c9cc2fd0b1b916936dd3eba9d76f6d9b56 SHA512 3715e5de931b5266e4a0b11cfc10af0e02f85055791d648cfc3103547a23bde31a18b3ababcd59bebd4a011d78ada6d2160653dcab33a0c4b2547ce5fa80613d WHIRLPOOL c71e807b94bb38868e32a89416b299683edb8bd4da361b5c32756cd5f39dfb6fa3c2d3117b7665a738eaad632b3f6ef4bc3e5fd251531eeefd2ff42284bf262e
+MISC ChangeLog 946 SHA256 3fcc38dbc5f90b9a5c49420ff806b95877c29be0d7da89adcf0fdd90daa17b28 SHA512 c96a17f6b99b33a919c517b3ddd4dc9b5d54977040b77bbfae3c3d05a6635bbe132d9740f99b01c3911d89e4476c81d1e784b78b1fa45b57e5ebdbecc9c2ff7c WHIRLPOOL 60fbf547ade9d3262b3fea6795a0953c98384fbab4e4bcc92dbc1e2ea0bd12f720ad66a664610e46805c0aae95a288e308dccf6b5848f4c9355d1bef8b813923
+MISC metadata.xml 532 SHA256 466694326914a92a93052091803af362ca72340f766fd353e9a7f96b490a6c7d SHA512 1dd04969556dfc8648aefe2358c81dcbb2e6c36fe487d153f0b488d3a066130f99d31edabafd15933892a0b6b1979f0edba37ca88e1d62be9898380890d0977c WHIRLPOOL 7c02459f7f731505d5696643f831db05bf8d8348a52dfc1da4b2f2d5d85e322a57c54bc7cbca93741db768708b20a7726d432f7062312c4485f813ec185fa869
diff --git a/dev-python/openstacksdk/metadata.xml b/dev-python/openstacksdk/metadata.xml
new file mode 100644
index 000000000000..8017b0833878
--- /dev/null
+++ b/dev-python/openstacksdk/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		A collection of libraries for building applications to work with OpenStack clouds.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">openstack/python-openstacksdk</remote-id>
+		<remote-id type="pypi">openstacksdk</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/openstacksdk/openstacksdk-0.8.2.ebuild b/dev-python/openstacksdk/openstacksdk-0.8.2.ebuild
new file mode 100644
index 000000000000..c4e79a29f235
--- /dev/null
+++ b/dev-python/openstacksdk/openstacksdk-0.8.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of libraries for building applications to work with OpenStack."
+HOMEPAGE="https://github.com/openstack/python-openstacksdk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]"
diff --git a/dev-python/openstacksdk/openstacksdk-0.9.13.ebuild b/dev-python/openstacksdk/openstacksdk-0.9.13.ebuild
new file mode 100644
index 000000000000..08b001471336
--- /dev/null
+++ b/dev-python/openstacksdk/openstacksdk-0.9.13.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of libraries for building applications to work with OpenStack."
+HOMEPAGE="https://github.com/openstack/python-openstacksdk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.22.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/openstacksdk/openstacksdk-0.9.17.ebuild b/dev-python/openstacksdk/openstacksdk-0.9.17.ebuild
new file mode 100644
index 000000000000..0014ecc5ed68
--- /dev/null
+++ b/dev-python/openstacksdk/openstacksdk-0.9.17.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of libraries for building applications to work with OpenStack."
+HOMEPAGE="https://github.com/openstack/python-openstacksdk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/jsonpatch-1.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.27.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.21.0[${PYTHON_USEDEP}]
+	>=dev-python/deprecation-1.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/openstacksdk/openstacksdk-0.9.5.ebuild b/dev-python/openstacksdk/openstacksdk-0.9.5.ebuild
new file mode 100644
index 000000000000..a3561c40d170
--- /dev/null
+++ b/dev-python/openstacksdk/openstacksdk-0.9.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of libraries for building applications to work with OpenStack."
+HOMEPAGE="https://github.com/openstack/python-openstacksdk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.19.0[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.19.1[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.20.0[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.20.1[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/optcomplete/Manifest b/dev-python/optcomplete/Manifest
new file mode 100644
index 000000000000..19e383ceb835
--- /dev/null
+++ b/dev-python/optcomplete/Manifest
@@ -0,0 +1,5 @@
+DIST optcomplete-1.2.tar.bz2 15358 SHA256 628481e3908d1f78faae34380b1873cecb3027ce40a18f94a98a2fe8de11e71a SHA512 2b2a902755eae0da0d362e6c504bd007fd13309ac515e6b68d6b2d177648645b7bd9c73d172c5eb2d0473caf261d8d60583a8f83779c901d50c304c03811e7ea WHIRLPOOL 7e1e57958afc9b514c781f47f06dc629bb294ccd48c0f8a936636df11b4b4f51829d29dac71340e254efb5b2b5b520f68cccbc76ef0a2e2d4fec8eabe46e6fd7
+EBUILD optcomplete-1.2-r1.ebuild 616 SHA256 577e14b5abcb050e3d0241f6f718fde64dda3ac1e1acc566df12ea264c24ce93 SHA512 7fe724e6d0f6bfa3e0ebc1eb2ed0dad0b6921e2f5dba3e18aa70f07bcce743ed9d8a5b4db825588deef8800e3b0cba4557ead280fbb208bb6caff53b54dde03f WHIRLPOOL 1ad16c0dd4f6b7793ee6122e34cb89233ac6b758e0883e37abbe62dbabceb5eae16543ff06fbd8c2637b446c8963e8f8df28a1176e3e3fda19ca12a7e15a8993
+MISC ChangeLog 2591 SHA256 faf1f454d7f1d3e3295519f268048113d6db16feb9e5edfc118cdf2cc9851f45 SHA512 8acc547cbc3cdbb7347e28c13973492640d7444f5ee93322231b832b08326919c87b4f2af1474a3dbc45c7be08785df65733751da1e0349247ada4128d0745d0 WHIRLPOOL d7bb8152fbc7ffda1cb352530d9acd2cb6e0db9600dedef161e89580a730346011e2563d35343be6e322795234d39e58e4576c15a0a08b29f0a31d4969156084
+MISC ChangeLog-2015 2304 SHA256 3c8d57462194a3d8a0a8f6c1d43877458af80d68317e1506d75343d1562e3a07 SHA512 eef43ebac052d6d2e5f0fe36c33dd28063bb2b2072e76dd0f9f7ffa0fe89e28a2ae6f0a7cec7cef130142dc96c58b7b2a35fe0dee429fc9e63f49ef11c3c84a5 WHIRLPOOL 8390bc514c7ac4ef34767917696bd92a893d3fea83c51844946652065b09c30eda28f093bee0cd7b6c4763b7e1ed5d4a9c36cc3233b53e6e6de2962c93c9d87f
+MISC metadata.xml 892 SHA256 f456f0ae9988fdaabc91c1b38e9009e8392dd14b6c0206eb68c11d318ac1e6c1 SHA512 5ccd2ef13a6d0a76497e3e1cdf15f819ea456271a269dfed87681111c5fb590e48669291054978aefc83eaa2332d8eb08532278d990a483b61883abb1a4ca4e4 WHIRLPOOL 62b4e822cbf8413bc86830f865ba066d762939bc7e0fe844b6acd6ccfd81c802af7087df3c3b1a2c63da4b2f3d3ace0f1e0fd93e9d99e5deac0d51d0b1b66fd0
diff --git a/dev-python/optcomplete/metadata.xml b/dev-python/optcomplete/metadata.xml
new file mode 100644
index 000000000000..3620338c02cf
--- /dev/null
+++ b/dev-python/optcomplete/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    This Python module aims at providing almost automatically shell completion
+    for any Python program that already uses the optparse module.
+
+    This module aims at placing the shell completion routine and the option
+    parsing code in a single location: in the program itself.
+
+    The logic is that since a program already knows about its options, and in
+    Python we have a standard module to specify them programmatically since
+    Python-2.3 (optparse), the program itself is in the best position to suggest
+    completions for an incomplete command-line to a shell that invokes it.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-python/optcomplete/optcomplete-1.2-r1.ebuild b/dev-python/optcomplete/optcomplete-1.2-r1.ebuild
new file mode 100644
index 000000000000..da4dc461f8e3
--- /dev/null
+++ b/dev-python/optcomplete/optcomplete-1.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Shell completion self-generator for Python"
+HOMEPAGE="http://furius.ca/optcomplete/ https://pypi.python.org/pypi/optcomplete"
+SRC_URI="http://furius.ca/downloads/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-linux"
+IUSE="doc examples"
+
+DEPEND=""
+RDEPEND=""
+
+python_install_all() {
+	use examples && local EXAMPLES=( bin/. )
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ordereddict/Manifest b/dev-python/ordereddict/Manifest
new file mode 100644
index 000000000000..2503db061abf
--- /dev/null
+++ b/dev-python/ordereddict/Manifest
@@ -0,0 +1,5 @@
+DIST ordereddict-1.1.tar.gz 2114 SHA256 1c35b4ac206cef2d24816c89f89cf289dd3d38cf7c449bb3fab7bf6d43f01b1f SHA512 20b2beb1ee6309885b2d702c04d21e683fae3061f19176aceae381688be0fed5b2fbf55a1ff901460e93bf14c83169d2b7a286e3725b008583711134656d86e5 WHIRLPOOL 228d1a6a1926d7c1decc892c53d6260e78af0a32fcee2e04ce46a828648a2fcba16ba637b78cd30f903224baadb1ad78b232d0b8f7d68d0bc8c10daebb8ed86c
+EBUILD ordereddict-1.1.ebuild 499 SHA256 b98894ff1b6a6dea001cdab757d586a0e9481fe68ae6363b7ba87ac6e6db4c52 SHA512 2021ff143c68b3deab7a378f044d8ef948d45f34fa50cb0aa1613f3f0280369cf6d802a0d22772dcf6ccf6afaa5286009bd366c7aeddfee631ad7cdf146fac30 WHIRLPOOL 9f78d442bb7440eb89614a55cba59fc4a978a437828c6b10a5a5e98a24fec315add67c841ef263ae0838d0d001c592bbf5b09d8fcb28ea8041a8502b0817cc79
+MISC ChangeLog 2593 SHA256 61322e5d140527eda110cc49b5a84decc529e96b8eab1fffdda47360879c28f4 SHA512 72ad82ab6d1c1b44d5a0024fd6299428917afec216f7e2ce1cb98008a646f8dc42499810e7d6fe47e0f144351d52a90403380bd7834d316893dcadbe0536b8e5 WHIRLPOOL cc1e895f2c7eb451fc42c76efd5d798998caa2855673e4b62525dc8e2567b4299d5b5ef16f7c1aae76e4373761901ec199bda813520a47b7e4fa743484cbd52c
+MISC ChangeLog-2015 681 SHA256 f24d7e8462492d6fe111b0bbdef18ffc867576cb04d721684d527cb58eb5c997 SHA512 463c5b1e65a38c5959c18df3c38062962c890dc3ffc1e4dcf4bff63e6d879acfdf99d7c4cb3d76afd18b58def1116c07ec663cfe1e178814436ba1e121f88f1c WHIRLPOOL c7fa721d73a62b3247dbefcf48f4f5212f07eef741da8e6db9a52c95fc4746d1b560939b9a9b0e0ca71b8c7f1069775ebb0c0bc14237af37e4ffb0915d07341f
+MISC metadata.xml 593 SHA256 ff2c9db60a94f7ea8b1c424e359d55629a4d66c4a07cdad70f9ad682928dfac8 SHA512 9288b0c209425e2a36f97718995b5c4b9f24edf3335a664e10ad96fc62281ae05c04b7d3e8c4a2c2256c268ef59e55b1ad422aa04ad310fdee91ce7d1cded021 WHIRLPOOL 116e5154d276b1d8fcb8c6f7642fec3db76b7a8721d1acc03e109ef0800e48ac88a8b083441488b84aa5f5d5796d7235d2cf885d6458fbafdec7e5b6cfcd549a
diff --git a/dev-python/ordereddict/metadata.xml b/dev-python/ordereddict/metadata.xml
new file mode 100644
index 000000000000..e8c29484c9e6
--- /dev/null
+++ b/dev-python/ordereddict/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+	A drop-in substitute for Py2.7's new collections.OrderedDict that works in Python 2.4-2.6.
+	</longdescription>
+  <upstream>
+    <remote-id type="pypi">ordereddict</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ordereddict/ordereddict-1.1.ebuild b/dev-python/ordereddict/ordereddict-1.1.ebuild
new file mode 100644
index 000000000000..5c7e9ef9a762
--- /dev/null
+++ b/dev-python/ordereddict/ordereddict-1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A drop-in substitute for Py2.7's new collections.OrderedDict that
+works in Python 2.4-2.6."
+HOMEPAGE="https://pypi.python.org/pypi/ordereddict"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND=""
diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
new file mode 100644
index 000000000000..3c06623eb237
--- /dev/null
+++ b/dev-python/os-brick/Manifest
@@ -0,0 +1,10 @@
+DIST os-brick-1.11.0.tar.gz 140220 SHA256 e8b6eca245b0391475cff31f1fdb85904981846b3da492c29ae1836b8054aef4 SHA512 69eeaa6b1fec9732e07ad2527fec2e624ed352bc18fe6d96546e787869d3d388113bea378e64a1d346be2dcd93eb8f69f94655f0fa8d9230fa8fc8e9a1e48847 WHIRLPOOL a72f406a54ca700bdbfa2ced008f5c4b620e1d50454d6a86a12bd5c392c2f31627b4ed8ca4cb32f4277b5aef8ec7387d07ef61c8e50940a64215a52fe792db29
+DIST os-brick-1.15.2.tar.gz 159500 SHA256 a3937aac00d6f43405576c4dabd1231495c0e4737630166b7ebdd6b4dd3068b3 SHA512 055353f53c3ba27e68d13ffac462a3ff5030dee445e37165319a98bcb76a54cb192df466847ad4e6812027532fd654a177fb8acb5a39a59d2d865e2355a09f7b WHIRLPOOL 4fd1a584556e64209f0f8b2de38b4239b7d2d74b7784938f48e803988b66a256134509b8b179f0ccd6a7d1b1c2e24a90f70e7c6200ea610bd97ce6e33a762bba
+DIST os-brick-1.2.0.tar.gz 90245 SHA256 e8c5931d2a5115a7c484276add6be6b5e3ba13402c8a71e32b2313448010be30 SHA512 9e35d4244f53d495824d7da5dc7cde117b78d0bdbf1bed6234848ce6b965ddb0fb88296a54f76915bbdf1cc337ca308c46f48814c5fa6877979debae3ab58628 WHIRLPOOL 7b7e1bf264313db1d8cc9c2e1966bce7872e755bfa043c38d81a54436ddf3cf0b1362618d4131f1cf947823c775286e32b9adca2b14887e679ff8def35c1fe72
+DIST os-brick-1.6.2.tar.gz 137155 SHA256 47f83b4fe5e06a720481ae0f0a45fb14040c2319465f7d7df9825002bf18e709 SHA512 b7d91f3ee5f86b559326ad8ab354bc107c39f04773fa18a508e46289341ffb47703ff0a7a48b285dfba5a27954fc24c61ba5543bbc121a5d171674aa706d10aa WHIRLPOOL b73ae07c596ffbd1856a6df7b417f691467c132b7cb7c3479e8699e257b49a840448a202d694b549bf8721fde86d185d129b4b56982a7792819513eed00050ea
+EBUILD os-brick-1.11.0.ebuild 1407 SHA256 fcb3e9780886b153ae0015e20f28d324f563effc9b73d812fa5dce9553686db6 SHA512 b4d4f88a23981167a261796ac783333b15ad3462f735b30d76e2d6c6505a57bc4f79cc817b32750a14de6cd2a7480b294f9efb530508a11ae7aa95e3fb9814f1 WHIRLPOOL dad0029580a065cc0b745007e0248df2c8bb8d295c69f59ed6d6824a8e61cb2a4941f228f6abb72211f0c7bd2b22c6d56f31880846b6a04f3124b0be319ffb4e
+EBUILD os-brick-1.15.2.ebuild 1578 SHA256 5770442795011ef0d254c51a3d333f157364524e052fe333bb9aa8ad674ebc53 SHA512 7502e9f117844eea49f3eda936da04156e5168214dc20073c1eed6011db4540fed1c5ad9469ebadfbf8c7a42de9eff745270ade49f6d346314c985c24219c92e WHIRLPOOL ea663505ae584b05131c151f43efa7ce83463c8b3119940103fdf8e46a7c389eb4bc5cd984f8ac08ce64a347efab1df1a61f252a04f7c65051c6946ac3c40fdd
+EBUILD os-brick-1.2.0.ebuild 1307 SHA256 603bc18989b8d09f0aba0aa09ff8b26882875baf1c42679343d11c23f92a3fce SHA512 17630aebdca5e96724189375b2091df6fe7e1418c9661100a6eab51eb79233d97d61d6b2bbeb1e1107eca4f51b404f6d0a6fbed7e69796295a6d601abdb3561b WHIRLPOOL d4645bcd71ddcf9e7794a159b48238096a826037d93407663d1289d99de7d76c46b4122f088b477af3c5d6978979d6ec2de83cea3eb2f0c88a31d90facf27e82
+EBUILD os-brick-1.6.2.ebuild 1409 SHA256 3441d514dfaf651e61a0cad8a4259a89080cc02ce9e86b3fefdbf6bed5f21a4a SHA512 c0c4abf599f7e2d02752785dbb6ef6ec72b4c85262ebb286dac2be7c868e71203c9f221878b61a10be2398b33441ec216099a2a20a208f2a23519f6c0eb0ba7a WHIRLPOOL ca9f0215075a950ee456b1940abc39ad6612bc1a5e1bec239b484cebb03730b979f747f5d6bff86569c42c933a930fa2140a08f23707ce839d1ccf66269ae5aa
+MISC ChangeLog 2547 SHA256 95a434e8aa6544ec585e142e3aa2f11c51638756c2b7288e88ee949e20d75d05 SHA512 b8506db5d84d071b825f21a1cb465e1f63389ffe1c2b969aff7ec8a845ed077e60449e8a65835da914f230adf3dbf03e7d74b5d49695692f1640517d27ee5571 WHIRLPOOL 3229c1179cc07403ce3f9587ccd2861257e55876455b75b05625a8aaab33411eced59360b6524c47687b93602492ebef35944309da09cda25c3e8b9615ed6a4c
+MISC metadata.xml 381 SHA256 d7d4cda0c6585025ac0537b826e88f83f87af2073dc0de30a614cc7c37a27f02 SHA512 b3cdc328f38ade8cd2ebb44c533ec0c79fbd1c187999bcf6c9c04104ba7c29136f0a0d6d57016aa6c7b607e66bfc511eaeff90c6d1a9708c494f4358b324f3b9 WHIRLPOOL 9c1bad179f90f4cd0011b3742d217daedb8014a32d37dd5a98902206977c1d4c122b44c41025eba7947c8b3f73bf9eda18a47a78785ce6b10ee0ecd86cf40d93
diff --git a/dev-python/os-brick/metadata.xml b/dev-python/os-brick/metadata.xml
new file mode 100644
index 000000000000..d65e798a029f
--- /dev/null
+++ b/dev-python/os-brick/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>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">openstack/cinder</remote-id>
+		<remote-id type="pypi">os-brick</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/os-brick/os-brick-1.11.0.ebuild b/dev-python/os-brick/os-brick-1.11.0.ebuild
new file mode 100644
index 000000000000..a0d100a46f60
--- /dev/null
+++ b/dev-python/os-brick/os-brick-1.11.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
+HOMEPAGE="https://github.com/openstack/cinder"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-1.4.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/os-brick/os-brick-1.15.2.ebuild b/dev-python/os-brick/os-brick-1.15.2.ebuild
new file mode 100644
index 000000000000..aee0e1f5e056
--- /dev/null
+++ b/dev-python/os-brick/os-brick-1.15.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
+HOMEPAGE="https://github.com/openstack/cinder"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/os-brick/os-brick-1.2.0.ebuild b/dev-python/os-brick/os-brick-1.2.0.ebuild
new file mode 100644
index 000000000000..b764561c04fd
--- /dev/null
+++ b/dev-python/os-brick/os-brick-1.2.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
+HOMEPAGE="https://github.com/openstack/cinder"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/os-brick/os-brick-1.6.2.ebuild b/dev-python/os-brick/os-brick-1.6.2.ebuild
new file mode 100644
index 000000000000..5086701cfce3
--- /dev/null
+++ b/dev-python/os-brick/os-brick-1.6.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
+HOMEPAGE="https://github.com/openstack/cinder"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-0.2.3[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/os-client-config/Manifest b/dev-python/os-client-config/Manifest
new file mode 100644
index 000000000000..f5a8103b844f
--- /dev/null
+++ b/dev-python/os-client-config/Manifest
@@ -0,0 +1,11 @@
+AUX test_get_all_clouds.patch 662 SHA256 555061a1f1b1a47bdef43896725417817c68049989d015baf1c924034d0274c7 SHA512 614e0bd874ec282b9b90d5cfe7d3693056fc5811d0fbb8f436f57a9f9a55abf4609fc6a647313c3d83ba733f7f57e69b3eb5df4ab8b0664a730f6e9197502cd3 WHIRLPOOL 46973c828e992e661458a924290d9e6e935f97ddd5dbb8f2f1052e400a036a69f94b1db0f270459c9ef3347a8fa2f385c0bb460667f488abfbd7c32ec97d70bf
+DIST os-client-config-1.16.0.tar.gz 53367 SHA256 d25dfb1b74552339442875bedb1e9328de66c5644b8dff0b31cc140f1d6ac9fd SHA512 a10a877dd3bc0245c6bbdaa0cb6daa5a17b519cc4fa73b368626a2e58dd44427309e1d839a3db14128ab4ed4d12fd36aaf366617ded88e14335ced8929c7f527 WHIRLPOOL 58fa3908c9ab756a610e4ce9cd99bf4f0e33602a79a773b71b8c5d5677c251d92b0e13ae33bf5d7ce9c671f672e0edef3d5780d9d806e8c72a2790f369ad5724
+DIST os-client-config-1.21.1.tar.gz 62581 SHA256 ad4c2d07c0468c8d11916ea690b977abb3e903e0c599f6eae02c4776edab2f96 SHA512 74d16d0f3e2980c1ef07134de8bdcb867e80226cb23eeaaeb95a534a2f807b186e7807d14df20003f56e7aa3bd72cafa7839c40937e52d50f8b21a40e7eba00b WHIRLPOOL 13e34ef0e20b16abc9c780d0566a516a2beb41d658f493e15f73a7c5eb6ae85fb7c27b5b60e15fbaabfd4435061400c7609084a4e649d9ab75595f1940c13d2f
+DIST os-client-config-1.26.0.tar.gz 68876 SHA256 77cb506da9fa5e5dc53b1b8b5dca7c5d7816dea91783518e31bbdd98aa87ece9 SHA512 df28c0b0bfe1786e7b66c57c36e229f3d6ee1cc0e1693d2bc272c817d7d3308aeb37600ef0a8b746dfb435c2f0c19c5d022da0e55c7d1525c03df8882a59f336 WHIRLPOOL 3ee7984cb075bb6ad0cf0538f662f1ce888046293e2f3a3b5049ade45bb317ca442f4e6b32625c3cabaffbb2071d1c53ffe278bb463b279528c0042923350cc1
+DIST os-client-config-1.28.0.tar.gz 64102 SHA256 e5be9cfa7a57fe838255236fe4956a91ccb461548883c7b01b37b7b4081af8b8 SHA512 80cea066eeb8dce03afa91a720b2e3449676f019f33c8ab0a3c0ecd5cfd49cd5a061abde1a4f0eb1ff947e505de74d94ba3ce71e763d2e2e4fbd1c72b313d1d9 WHIRLPOOL 306b1ef7fa0d1589aa95ea3973122dddb1006905755432548d70bfaf40198a3e30ad0eeaeb87cf0e0eb7827029767c95e2a351dd6dda93bd694c7467a29d18d5
+EBUILD os-client-config-1.16.0.ebuild 2265 SHA256 4d597c9c7c813833e4025671b6c80aac19699216736ada72e17124482b13f3c6 SHA512 bc4e01f4df76373f7e611c2748aea3bc499fa1573a1d01d7ec11af1104b5f57f0201a8ee6ccf0a6a7764e1ce797f524f5eccb0c559f6893c4b508df05ed81c24 WHIRLPOOL 37426943595e370fb07416172adcbdde8a1a02f724b8e45fa18e5d7799ae56532e7216b5c912d1fbb73bb4f8d371c69bdc7718357099e27aa9d0747bf78f1a6b
+EBUILD os-client-config-1.21.1.ebuild 2271 SHA256 85689fc5369d25b55bddc7ba35d7dda02868ecd1f0bcb719f37c9ae0a3d78f44 SHA512 9e31c57a7883087e38bd47b295dc184d0e96126444d63be0b4c3604c405aa84df8659c1ebb176d1cc5e8f22b2ff85aa087b7b80ff2c4bbbd7f3d8886af799dab WHIRLPOOL fd21dbdbadccabcc716135e1b5be7dd99de96a0a5491000c140e5bdb60e0a20713d41a2c5e4eb3754d8efc63641670f35f0633a4accb40bbbe6b3b6e0e9eafa4
+EBUILD os-client-config-1.26.0.ebuild 2414 SHA256 13608363d3c4fd994d62c88b342dbe77bd87c475aa90289720e6d08d46a954de SHA512 a1bba01155054a3bd4e494146b3c3b26a552d6772f7bfe4c365a4838620bd626a8f7ff1a3e9c3d1d49cf13821518d67f43307a51d3f7e6b5709b16f812cb5448 WHIRLPOOL d737a4b4c76130262bee6e195a822c52981906698ffb2ae58e2bf8b63af783b1b621900be9fe47784d0537f111970b7f93dff495bd214a1b80a442e54e08aa68
+EBUILD os-client-config-1.28.0.ebuild 2283 SHA256 083f18bcc5bc4cfb41ba234d5084448fa48cdd1e9fa442754fd6eeb0023c60e9 SHA512 ebdab2b24800e9467de664c7384ceb0f7878d3ab85a5f987f7b490638a32e98fae1ac0b4985dd03835c2286f6530660aff9cfa425517368039b8a13d4978d995 WHIRLPOOL 96268895cf93bd5b08145a097bd52f53b6ac5a9c8a0725eb1b14eccab0c6f6756663c7e16b57a09f0ca365c8bf85e24450281f5613d2fedab60938702c6cef25
+MISC ChangeLog 3218 SHA256 b57a6afa0ab8aa733725b52a2b0919b7a4c7128ca5ec034a7545b541078c795e SHA512 b818d4be4dff85fde684e1c20d98b948cdaac862da78a710356440ea0ca94393657b70f1e1d2a28ca6900ccda216edfa77acb462759f72aea310ea63649207dc WHIRLPOOL ea32522d7770534935028a28a4a7ad5cb40e87a9cf201fc728cf039a9a11e587e97ba8df040e58e4ebf3c078563e1628acf4f6c390a376198e51ac3f6d8a5384
+MISC metadata.xml 325 SHA256 e404c099c9cef591f6c7281f94166b65bb691318559034d5a7b2c45d9bab73d4 SHA512 6abe49192f78b02ad3079ccdc0dc58558f2fad7c14163addd865efd8835ffeee5a6d5d33da2296d6a14b4d87a54b647157f27ca0c603d9154b89422ea8a65933 WHIRLPOOL 45f964720bce17a28c8970d8bb9573fafa8caa8071a47a4bae1dc83e7a1460618191a74ee2ea3585d1bd4adb7496a9a27f7d9d5f1f9d348bd57c217975442ea1
diff --git a/dev-python/os-client-config/files/test_get_all_clouds.patch b/dev-python/os-client-config/files/test_get_all_clouds.patch
new file mode 100644
index 000000000000..b6c9e822da2b
--- /dev/null
+++ b/dev-python/os-client-config/files/test_get_all_clouds.patch
@@ -0,0 +1,13 @@
+diff --git a/os_client_config/tests/test_config.py b/os_client_config/tests/test_config.py
+index 6bb65fc..743ef76 100644
+--- a/os_client_config/tests/test_config.py
++++ b/os_client_config/tests/test_config.py
+@@ -38,7 +38,7 @@ class TestConfig(base.TestCase):
+             cloud for cloud in base.USER_CONF['clouds'].keys()
+         ] + ['_test_cloud_regions']
+         configured_clouds = [cloud.name for cloud in clouds]
+-        self.assertItemsEqual(user_clouds, configured_clouds)
++        self.assertSetEqual(set(user_clouds), set(configured_clouds))
+ 
+     def test_get_one_cloud(self):
+         c = config.OpenStackConfig(config_files=[self.cloud_yaml],
diff --git a/dev-python/os-client-config/metadata.xml b/dev-python/os-client-config/metadata.xml
new file mode 100644
index 000000000000..0ce12bb73b92
--- /dev/null
+++ b/dev-python/os-client-config/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">os-client-config</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/os-client-config/os-client-config-1.16.0.ebuild b/dev-python/os-client-config/os-client-config-1.16.0.ebuild
new file mode 100644
index 000000000000..4825c9e985e8
--- /dev/null
+++ b/dev-python/os-client-config/os-client-config-1.16.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Client Configuation Library"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+CDEPEND="dev-python/pbr[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		dev-python/extras[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+		!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requestsexceptions-1.1.1[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	local PATCHES=(
+		"${FILESDIR}"/test_get_all_clouds.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/os-client-config/os-client-config-1.21.1.ebuild b/dev-python/os-client-config/os-client-config-1.21.1.ebuild
new file mode 100644
index 000000000000..64fd2a63ec70
--- /dev/null
+++ b/dev-python/os-client-config/os-client-config-1.21.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Client Configuation Library"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+CDEPEND="dev-python/pbr[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		dev-python/extras[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+		!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requestsexceptions-1.1.1[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	local PATCHES=(
+		"${FILESDIR}"/test_get_all_clouds.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/os-client-config/os-client-config-1.26.0.ebuild b/dev-python/os-client-config/os-client-config-1.26.0.ebuild
new file mode 100644
index 000000000000..501add8f5f67
--- /dev/null
+++ b/dev-python/os-client-config/os-client-config-1.26.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Client Configuation Library"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+		!~dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
+		dev-python/extras[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.144[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+		!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requestsexceptions-1.1.1[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}"/test_get_all_clouds.patch
+)
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/os-client-config/os-client-config-1.28.0.ebuild b/dev-python/os-client-config/os-client-config-1.28.0.ebuild
new file mode 100644
index 000000000000..ed735bddb12f
--- /dev/null
+++ b/dev-python/os-client-config/os-client-config-1.28.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Client Configuation Library"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+		dev-python/extras[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.144[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+		!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/sphinx-1.5.1[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.5.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requestsexceptions-1.1.1[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}"/test_get_all_clouds.patch
+)
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/os-diskconfig-python-novaclient-ext/Manifest b/dev-python/os-diskconfig-python-novaclient-ext/Manifest
new file mode 100644
index 000000000000..f22391ed660b
--- /dev/null
+++ b/dev-python/os-diskconfig-python-novaclient-ext/Manifest
@@ -0,0 +1,6 @@
+DIST os_diskconfig_python_novaclient_ext-0.1.3.tar.gz 2543 SHA256 e7d19233a7b73c70244d2527d162d8176555698e7c621b41f689be496df15e75 SHA512 4733c4ef720d0fdfabaa26c4288b933ac7d9e4433b20257cfe206399b71154dc6ee98ab621e67aa4c3446df2ec1929edfb9341538d7d4ab69d71576652a9d591 WHIRLPOOL 005106b366034896814d105397db18a5de871d08b90c5f43336553aa8f6a03f12c98c098ebe4da4ea67a0c73a42cf553425e464396080bbf5cc3cd8e1cfb0eab
+EBUILD os-diskconfig-python-novaclient-ext-0.1.3.ebuild 667 SHA256 8070070a734d379be8acca58375cb0138a94667b8efe241d7c776bec980964ed SHA512 cb8c28b2804f77dc1d34c66f490d48329b77c94704af9f99f3a67a39ce9faf6bc2d9fc41c1589b7ee10e096e493fedce9e81895868734d77e61b7e20cb4ef1d7 WHIRLPOOL ffe6b6f0d29c14bdc3855548f0490cc774a1242931738c29eee324567163c8fc318a8bff480a9a98dea07cc258fbcf1741310800b71d44f1b2dddae1f223ae53
+EBUILD os-diskconfig-python-novaclient-ext-9999.ebuild 609 SHA256 053521f922a0148ddecd403515171382be5062952590e7bff2970e5d63b7af1d SHA512 91139dd51860f5291541dc79feda63a607194e16feb1cf66782c21a0941145b14db53bbdb95b8d84c94b95e00a623a89958011dd48f654639a153a949389aa93 WHIRLPOOL ddaf55180792656dd4327f144587d1ff0566393da78ba9ba6780156342dc2c2dfde114cf8d20908c1f2e98c7faa2faf353ca6da44483e3d3a3bea9428d476bf0
+MISC ChangeLog 3455 SHA256 9f728fe11fd7f27099854d95ca1faf1f176c690f9a5de67bcd1ba9cbc9184b81 SHA512 098dfc2d3d68122e9776bb177e2c5c1e256485ea8cf6280839c64bcf755fc1b9e5e898d7a1aec7706d4a0a409fea91c6f8cff27d1e7c8e73dc87f4f4601d13d5 WHIRLPOOL 4e714ab65cab0ecc20438fa63654c62b3002075aa7581e7cbe841a1275963ab1f17160f400abe8e2d3537a5185d7403f09b170fc56de8b6f80423e3252e84d00
+MISC ChangeLog-2015 1598 SHA256 0603c56bd91e8fc846dafe5d90f3219e2f2f95f0e937649310518891c9c2fe4c SHA512 50e23c96628a85f16382095f23240e268c6f0e62f6199500f37943433411b933588a6c2eb7a4a068da08e54f5340491746c6124f0d5d7f93d89da9294d0a60dd WHIRLPOOL 93824f162d6deef24621bc475ad6f86c20c90ed357c2b98dd9a0e3ee5b0beaa266c4163eae8ad391c658961e44e59dc7248b82d9663411caa523a5e6fa6b986a
+MISC metadata.xml 548 SHA256 0ae1a4d13e0fde2fb6c186fecff80fb21bc99536755fff62624abb349d4d6de1 SHA512 04af40651fbcf6ef3c98b5dfa65a51d05f384ea3c6a51ff20f1c0355f0bc8376f74e17659a98280e2e45650d6c79b2b9f169e8035bb2fa96c4c806c783988616 WHIRLPOOL a62918d335944e557793cdb46d280b8c98a8e205348d089935c04f4e13bab95314ce83fb0000f8c58e7e524eb5f2cc74ac3c380d971fe901e6ca0372ee3707a6
diff --git a/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml b/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml
new file mode 100644
index 000000000000..e3d562fda91a
--- /dev/null
+++ b/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+    Disk Config extension for python-novaclient
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">os_diskconfig_python_novaclient_ext</remote-id>
+    <remote-id type="github">rackspace/os_diskconfig_python_novaclient_ext</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-0.1.3.ebuild b/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-0.1.3.ebuild
new file mode 100644
index 000000000000..c3f4f3ee01fd
--- /dev/null
+++ b/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-0.1.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Disk Config extension for python-novaclient"
+HOMEPAGE="https://github.com/rackspace/os_diskconfig_python_novaclient_ext"
+SRC_URI="mirror://pypi/${PN:0:1}/os_diskconfig_python_novaclient_ext/os_diskconfig_python_novaclient_ext-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/os_diskconfig_python_novaclient_ext-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-9999.ebuild b/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-9999.ebuild
new file mode 100644
index 000000000000..6f2331f0069d
--- /dev/null
+++ b/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 git-2
+
+EGIT_REPO_URI="https://github.com/rackspace/os_diskconfig_python_novaclient_ext.git"
+
+DESCRIPTION="Disk Config extension for python-novaclient"
+HOMEPAGE="https://github.com/rackspace/os_diskconfig_python_novaclient_ext"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+
+S="${WORKDIR}/os_diskconfig_python_novaclient_ext-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-networksv2-python-novaclient-ext/Manifest b/dev-python/os-networksv2-python-novaclient-ext/Manifest
new file mode 100644
index 000000000000..e0a0dc90c519
--- /dev/null
+++ b/dev-python/os-networksv2-python-novaclient-ext/Manifest
@@ -0,0 +1,7 @@
+DIST os_networksv2_python_novaclient_ext-0.25.tar.gz 2363 SHA256 35ba71b027daf4c407d7a2fd94604d0437eea0c1de4d8d5d0f8ab69100834a0f SHA512 ad380001bd03506d0e7f5033f660f445930f1d2ac11d2a66122d2c7c69fdd888ec6408a6f191eb4310725afe7b69f64c9d5abc5c561ad91e41b5676b7e651807 WHIRLPOOL 625025941026ce5b05dc53a66515429b3dd178c634b09580f8ed095a2b8b63f384a309d9a6feb11efb43a9eeec86efa8fcb28ee5747deb137ecf6153aba66584
+DIST os_networksv2_python_novaclient_ext-0.26.tar.gz 2258 SHA256 613a75216d98d3ce6bb413f717323e622386c24fc9cc66148507539e7dc5bf19 SHA512 e262e42204a2c30f059b93ff1e5543b30901e9b005c27a0065ea0b4eeb42b403cfd3587b52b4c1652cf04379fd137373277e4784e7410b395997ac6dc51dd92c WHIRLPOOL c1443c40c43de479c8bcb3fb87b86ffa017c073a241487e4dc040be830b9dd89c194afcc5106f457dd9e4e1e7f12c71664ecb151017a3a8ab07614993e7b16af
+EBUILD os-networksv2-python-novaclient-ext-0.25.ebuild 655 SHA256 d5fe5d1ff7fb96d48699f127158f09adbcdcbe6852e321f28acfd18ddcb42948 SHA512 b183ff2a802ff74ec92a520c47255aab4795fea4f4ca05df17bd81d0e24f67606fec37f96041a667bf817d6037313c823c2d8091724dbfd4c3c70d399b1f58bc WHIRLPOOL a653c5fbb2175e1d1ed2996ec97b14839876d0172dff098888b4201f26cd602194f560a7d3cf57d72ca1fc4567eae1aec677b2efecab12d2d56584040075b31a
+EBUILD os-networksv2-python-novaclient-ext-0.26.ebuild 674 SHA256 4a1247abcd3af0b8c95c73bca3d1f747196076091f919eef955eab84c1f9465e SHA512 b3daada75e230263a609a230803ddfad2fec2e5465af3234d8d325b1c9721e12e476a0063c9f338d7f0956fb45352a55991d587b121de88a6c90aa0410768e71 WHIRLPOOL c8e0f85f2f3faeb297f1a267adea8a15c219d606f5186f70955b489483e6c4e456f7f5718246f1e3a608635416586c3cfa1a2b89221ce744740bfad0c10ea6db
+MISC ChangeLog 3122 SHA256 eca6075f745d4ae1f34d61de2c0238f00fe595c796ee562ab04247994037c478 SHA512 8c7d4c713cbd64a12535a2466549802a077006e0055302e3dd4602bb63ff458e60f01ba6b759150d3d130422a63ecc764ac36f0bfe098302fb43b06df3f4fc15 WHIRLPOOL d185f01997ad4290494d9d69c8400b21462a6c26d515ac4c2e40ee99ba5e2a870bedc48e995d1f300bca9672b23c9803d9da9294324d8dcda5edbfb2e5a3b6cd
+MISC ChangeLog-2015 1640 SHA256 a4e813952aee972cd2949ab4d524cf172596a3320b5bb9452e9b8e2311d126ee SHA512 7738ab5a8cb61d403d3e9bf858bff089bd1f62942e7f1cceb192b0d39821326a3fed4c761966afbef60c072d59c3acc382a6a66e1040ae86743b8fbd8b42c67f WHIRLPOOL f57e3465a0fc2c46bbba81711ba2104edeb4cf8dd47b4cb986b54985460c309e9e3e27d47054068f17f1ea02a3efe288948d4ce0efd78d41b16a2d3b79812730
+MISC metadata.xml 556 SHA256 fce55be68cd7f70cb38753efa704aa2ba906ba3e5c27da7b9afa542300dc95a6 SHA512 0394d2b4cfab2f91c86e147fd50ea7a622ff6aabdb6442ef6f47bc6de93e4d9e6977d473a1c9052ff6716164d6a48e919f9bd274d68e87c5af384088175f3e22 WHIRLPOOL 9fc5f274398f1fa8516df7220e2d6fee2685c706b3ade26ad0b584d246de7f93bc64055cae67570d93f7bfb77d609367d37ae9a86866ceb1fe1dc56ed3cb579b
diff --git a/dev-python/os-networksv2-python-novaclient-ext/metadata.xml b/dev-python/os-networksv2-python-novaclient-ext/metadata.xml
new file mode 100644
index 000000000000..595fa4cc7b17
--- /dev/null
+++ b/dev-python/os-networksv2-python-novaclient-ext/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+    Adds network extension support to python-novaclient
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">os_networksv2_python_novaclient_ext</remote-id>
+    <remote-id type="github">rackspace/os_networksv2_python_novaclient_ext</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/os-networksv2-python-novaclient-ext/os-networksv2-python-novaclient-ext-0.25.ebuild b/dev-python/os-networksv2-python-novaclient-ext/os-networksv2-python-novaclient-ext-0.25.ebuild
new file mode 100644
index 000000000000..714e10f61b45
--- /dev/null
+++ b/dev-python/os-networksv2-python-novaclient-ext/os-networksv2-python-novaclient-ext-0.25.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Adds network extension support to python-novaclient"
+HOMEPAGE="https://github.com/rackspace/os_networksv2_python_novaclient_ext"
+SRC_URI="mirror://pypi/${PN:0:1}/os_networksv2_python_novaclient_ext/os_networksv2_python_novaclient_ext-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/os_networksv2_python_novaclient_ext-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/python-novaclient-2.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-networksv2-python-novaclient-ext/os-networksv2-python-novaclient-ext-0.26.ebuild b/dev-python/os-networksv2-python-novaclient-ext/os-networksv2-python-novaclient-ext-0.26.ebuild
new file mode 100644
index 000000000000..355d4d85c3b5
--- /dev/null
+++ b/dev-python/os-networksv2-python-novaclient-ext/os-networksv2-python-novaclient-ext-0.26.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Adds network extension support to python-novaclient"
+HOMEPAGE="https://github.com/rackspace/os_networksv2_python_novaclient_ext"
+SRC_URI="mirror://pypi/${PN:0:1}/os_networksv2_python_novaclient_ext/os_networksv2_python_novaclient_ext-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/os_networksv2_python_novaclient_ext-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/python-novaclient-3.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-testr/Manifest b/dev-python/os-testr/Manifest
new file mode 100644
index 000000000000..01b35c0e8064
--- /dev/null
+++ b/dev-python/os-testr/Manifest
@@ -0,0 +1,6 @@
+DIST os-testr-0.6.0.tar.gz 36837 SHA256 473faa5d0e9d2f1ed5a92a8b942d79af9225f496ab74d6c734ceae8104138d19 SHA512 20648c8442c7d0adc42537e8ff841ac6766fd836bbe96aca77c5e99e787a27f3e490da09676c95f49371fd491ebfaa8e986a6cd53e16f50c3c83722726ae4d2c WHIRLPOOL f54d18c101a16bc3d9d6eaeb8bf36a423d22bb0ba32cce65b9e31b4d036999aeace1bddcc89644ca8d07f1c284645b512a3e06040911123c7adbe76a6b7236c4
+DIST os-testr-0.8.0.tar.gz 42102 SHA256 5a5361e23afe6032ea1fb160a9244003a070a5ef53be524e86b1f64a616a7656 SHA512 62b5fbb859c1a3b44bc0d57cf4b2cd0a5e6eeff540f5507efd079a73e0f9ee70813e47537b456f1bc600c87da55d05fd23aee0c215b8558cc0b5e71a55950af4 WHIRLPOOL fdcbe03017396293eb7d186021744f04251d63e2e58ae9cf9a9bb22b625e224685c1aaa5996c823bfe438f6f8e219c02fbff5219fe7bc2c7d731899370427930
+EBUILD os-testr-0.6.0.ebuild 1341 SHA256 9421855648ee994b83ced5e23d8675e0fba2f1eeab0faef42104afb4e4e3a444 SHA512 4c3f9356b3c79ae2912dbdd4abeff8eb26b649a016351014d4677339cb4161830fc330f72a566c3784b1d3d70bd9c4d8981ab435523556e16847b08ef2cadb45 WHIRLPOOL f011cc42c0ac2f1b4b0a35bad35387f91ef4c1f74ebeeac7149d19a6d48f0527e87ad7abbc819e36492eaf2a5bca1aeee425a099080fff6b1a64d903f520bc0e
+EBUILD os-testr-0.8.0.ebuild 1257 SHA256 665fb9e5bf19a56beaf6c7a2424ccc9f147ef31fbcbe85fb491e9c0d4b5c5aa1 SHA512 9470c28f42726c1df298ba5b2e5d1cca1cec13fc9ccaf70966fd4fa59cbe4a2b6cd6046035ff1e7d2fde63fb5c802175802252456b2675788d4d902517b0bf70 WHIRLPOOL 9f728c930bdbf81ce55b2fd633ab7a23e62d30d67fdbc34ee2a9e60e2e1ecc0d367086cc7f69ee1ae37908788c1d00a99d8f5a0ec4a7da70da1524a1992461cf
+MISC ChangeLog 2673 SHA256 28c8befe6a41c4f016c0712046552f11a718f7e84861149daf5efa39a6c4eef1 SHA512 def4fa961434ca489050ffc00af6ab12175c9b0342222e451881d87ab6114bdb72c2fc83149cf52421f9677c08c1606bd9d703aa3df9a042641d3da4c49b7bac WHIRLPOOL 1a2cc5b22932728b86720ae6019dc5c8c9a953108093fa302928abee8f91b0b223acf5a41511bf0b643f31254455dafecd5492272aab74ef39594fd437fee409
+MISC metadata.xml 383 SHA256 cf2803925541a4875718eab561bd93210e06dc3a084b4510a8fde679e41cc0e3 SHA512 6e205857c3d2b3d94baceef580f343bee82210bf3003106ac58ad48d0403aa32c38332aee7b030eacd7d0bd272d7bcb34054e5852bd8b4870cebd0af74eb2577 WHIRLPOOL 090b7097487736acdb9852d39744f9eb4649794e6b3c9835785f755de6e92cebd5220f172fab67258b83f44343bc4f2bb0ba38fc44b67e8d1417c4fc69c9ec46
diff --git a/dev-python/os-testr/metadata.xml b/dev-python/os-testr/metadata.xml
new file mode 100644
index 000000000000..4118c7a742e9
--- /dev/null
+++ b/dev-python/os-testr/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>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">os-testr</remote-id>
+		<remote-id type="github">openstack/os-testr</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/os-testr/os-testr-0.6.0.ebuild b/dev-python/os-testr/os-testr-0.6.0.ebuild
new file mode 100644
index 000000000000..be4e7086e067
--- /dev/null
+++ b/dev-python/os-testr/os-testr-0.6.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A testr wrapper to provide functionality for OpenStack projects"
+HOMEPAGE="https://pypi.python.org/pypi/os-testr https://github.com/openstack/os-testr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+	>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? ( ${RDEPEND}
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/ddt-0.4.0[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/os-testr/os-testr-0.8.0.ebuild b/dev-python/os-testr/os-testr-0.8.0.ebuild
new file mode 100644
index 000000000000..16baee12e83d
--- /dev/null
+++ b/dev-python/os-testr/os-testr-0.8.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A testr wrapper to provide functionality for OpenStack projects"
+HOMEPAGE="https://pypi.python.org/pypi/os-testr https://github.com/openstack/os-testr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+	>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? ( ${RDEPEND}
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-3.7.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/os-traits/Manifest b/dev-python/os-traits/Manifest
new file mode 100644
index 000000000000..650d73b0ec32
--- /dev/null
+++ b/dev-python/os-traits/Manifest
@@ -0,0 +1,3 @@
+DIST os-traits-0.3.3.tar.gz 17374 SHA256 130da3936873ded6d607e2cca85c12d603ad0971ace9d8c72fbf7fea67027edf SHA512 bd8a7a29170aee1be59ed21684ed2a5dbb1440841a54b522bd3ec31ef61c9fd4f6eecca812c8a8b927c285142801c3da190d7bb47c7b315312e10c1c81d50e27 WHIRLPOOL 31cbb9a40350d259988269ee9d80c8da826ac02a2d119dd514d7258a284963b5ee505969e04c2b3af41b737f79cd3edf53cdfbbdd563474b2ad39ccccfe3015c
+EBUILD os-traits-0.3.3.ebuild 743 SHA256 28173911f41303ff237f3bdd3ab489a37dd6280fbedc458231b243264f969d07 SHA512 d8e2e9af800940e588c4f14e9bc47d65a4ce3370802de0eec9743f12e54f4848741e87086d783b492fc8419e862d8e879fb85640fc34f343bcd0c7d8beb2e5ad WHIRLPOOL 2ed1e6bc1633ba36c9944eb0fc4daa5be2603e6205dbebc2ce89f44896d6ad258714c711d8fce3eedda96e9e25b05bcd5de7556458ea427bf7d403e31741e7eb
+MISC metadata.xml 385 SHA256 c9d51a5389c56f4def30dac2ad94755f3ee07d774d9c91a34fdba466430e4863 SHA512 9dc66a1191f15d9a8569e229a59164a7527c2ad27c06f67d89a9a25910bdaafe70f6c9269a2482d5770105ce58a64705dde15db56b34f2568add1800df0cc42d WHIRLPOOL 61389c4162f46fb33e45d8e9da637df5463f1bef56087bc2348d8db34da815e1a4f3a83de9c12faece3761d6dcf450a0644c17757826040896aa4bed362e494e
diff --git a/dev-python/os-traits/metadata.xml b/dev-python/os-traits/metadata.xml
new file mode 100644
index 000000000000..6e876e03707b
--- /dev/null
+++ b/dev-python/os-traits/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>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">openstack/os-traits</remote-id>
+		<remote-id type="pypi">os-traits</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/os-traits/os-traits-0.3.3.ebuild b/dev-python/os-traits/os-traits-0.3.3.ebuild
new file mode 100644
index 000000000000..3b5b610f897d
--- /dev/null
+++ b/dev-python/os-traits/os-traits-0.3.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="os-traits is a library containing standardized trait strings."
+HOMEPAGE="https://github.com/openstack/os-traits"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/os-vif/Manifest b/dev-python/os-vif/Manifest
new file mode 100644
index 000000000000..7677960ef9ec
--- /dev/null
+++ b/dev-python/os-vif/Manifest
@@ -0,0 +1,8 @@
+DIST os_vif-1.2.1.tar.gz 41006 SHA256 57d5b306a63bcc7fde7dcab7b15929010ae03863c983368b749f97106a2ee9e5 SHA512 9eb8e2498e5bf4d1a96567fe4bbf0f9f95682db19c0123ec509e6f8f5871a340c529a347fdd8ee29c4981917e8f35396e19770da47f9265500ce4b4567ab6694 WHIRLPOOL 556d51093179f6125840b78ddf653a8da548f52e2b30bd4c2e64c04c540c93365a9332daee5f1c5cd65706bbafa69fde6462ee9855028d9d75f673969e13560d
+DIST os_vif-1.4.1.tar.gz 49559 SHA256 88faa15436b17e59cbfefd425a34cc0ccef200fa8c65ea4a3645f237abf88307 SHA512 e56e3138bdc6fa68ac7cc8efe792d198498fa6f14c5ce060f347042e46af9bd96692a93af332921693037e35f87f87e5f01053671309cb3ebd8dd3e45976dfff WHIRLPOOL ca1903d86e36e2b9ff78a3a2f9d8195bd5916f021d1d9dead8ccb2191465d7d639878db41b3a15592dc5b96eaaf0c6982594cd56fd045b1f08826d9ae3050d4e
+DIST os_vif-1.7.0.tar.gz 55976 SHA256 5e564a285b9fdb0349ecba41f7ae4a9fd74a5fd710578bf8a8313073afe11906 SHA512 815f7ba169ef4c1235ad70f31ec065179fa021701c69304385c1a95a1125db9afc1be9e6ceddfca44fe6ea1866dfdb303f7ded2914a3757b095118e41bfdd19e WHIRLPOOL 7e79a0721d4ee9e72742f0d19d40b2b10cc43ab4ba6ca163abfe3f35182911df2f787cb35e0d2dc7de81488de8e58c060bbb0393a5d56585d6aad397c7479571
+EBUILD os-vif-1.2.1.ebuild 1149 SHA256 6786e0fb39b576db0eeb483adb016efc9740f8151045e8e6ee38c52ff76b0f32 SHA512 76b2265264978ce9eefa7b42d3338f7184b164719b183e2ed719b23738d2f6c2998a63dadfc1cd3af0a16763fbf0c68b7252fd6d87858a265b7ef7c18fb263e6 WHIRLPOOL 08d3a64478a92da8269df6d0c56626610d9769602a343e0d70360750d78f942e417a7415a13e37345794bbf6496fa614fc9b6ee4db16308b58d77303d59a8b93
+EBUILD os-vif-1.4.1.ebuild 1294 SHA256 7c2b3d2092f11a74d1f9b0872649a0b47ef841bafede8755d01fad0e77025e8c SHA512 12a3df46472be31694855a70ecbde29a16757a21cc302e581b06888c7cf981b909dcd0f2be44ab44dc814f681f88eeb2a1869e8de9a449f28f8072f370457b43 WHIRLPOOL 8a538a7b08f1936a94e77b34490429c625ff7c3102d61dc2245626554a4f7c0267368b03afa1239533f7b104cc8f799e8159bfaf5305ffc14ea88f04a673e95a
+EBUILD os-vif-1.7.0.ebuild 1467 SHA256 f0fa4b1d5f82288ba254244fe84fd17928407e87f30e14377db8ce4e17f68618 SHA512 62f01c13b0257c998e103fb53fa5f6549532d62f66f96ef1eb7416970721c4c9b4617b5114880cf16f3ec9e475b258b3536b4f15905b834c85c9df45f7adbb3d WHIRLPOOL d37e58ebb517aa6c19ce3f0e12a5582ae7361927a44fe2a173c677f020440a77e0521cdb141b1ad7159942d1465f116a40d9b04e873e3191a07f45f6db948186
+MISC ChangeLog 457 SHA256 3401f370e939eb29f58e5d18977acc30531f9fe72f4f85fc614f02f7fdd4461a SHA512 ac9cd619fa2c5b6ca268fc2a72c6803c940885fb97fa35d49226d5b98b546aecb11e186e6e2508e74793789236f94b24a5af2177797acd41c52c950de7e958ff WHIRLPOOL e5cff8974ff545a5732c0c177e288387ae4f7be2e0ecd9ae440cc79fbe2db2cf2dff1ee457f74886f7f92851cbde300da8a37e048e8e0f37671a6294a7548d9f
+MISC metadata.xml 379 SHA256 58ea81cdae38d75f24f7b6efabca05057a28356d0ceb260bd867e27d7ba41084 SHA512 3667aff7bf331a2383c2e4a854ceb0b1fa214bc605e98bcc9829dae0eb5e870ad123e9a2989a345134db916541005f54dce777c680e32ec6196785727a89831f WHIRLPOOL 2f089ce4bde1fc321e2a82cd13579d78349e1278945231ec450545d6204569f74a60c1ee931490be845539e310f16b1221f0233882fdd1e2018623b00fe9346e
diff --git a/dev-python/os-vif/metadata.xml b/dev-python/os-vif/metadata.xml
new file mode 100644
index 000000000000..e33ffd76fe13
--- /dev/null
+++ b/dev-python/os-vif/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>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">openstack/os-vif</remote-id>
+		<remote-id type="pypi">os-vif</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/os-vif/os-vif-1.2.1.ebuild b/dev-python/os-vif/os-vif-1.2.1.ebuild
new file mode 100644
index 000000000000..b0694b797579
--- /dev/null
+++ b/dev-python/os-vif/os-vif-1.2.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
+HOMEPAGE="https://github.com/openstack/os-vif"
+SRC_URI="mirror://pypi/${PN:0:1}/os_vif/os_vif-${PV}.tar.gz"
+S="${WORKDIR}/os_vif-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12
+	!~dev-python/netaddr-0.7.16
+	>=dev-python/oslo-config-3.14.0
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/os-vif/os-vif-1.4.1.ebuild b/dev-python/os-vif/os-vif-1.4.1.ebuild
new file mode 100644
index 000000000000..2a7cf98bd97d
--- /dev/null
+++ b/dev-python/os-vif/os-vif-1.4.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
+HOMEPAGE="https://github.com/openstack/os-vif"
+SRC_URI="mirror://pypi/${PN:0:1}/os_vif/os_vif-${PV}.tar.gz"
+S="${WORKDIR}/os_vif-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	sed -i '/^pbr/d' requirements.txt || die  # pbr should be uncapped in stable/ocata
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/os-vif/os-vif-1.7.0.ebuild b/dev-python/os-vif/os-vif-1.7.0.ebuild
new file mode 100644
index 000000000000..4775e0d9203e
--- /dev/null
+++ b/dev-python/os-vif/os-vif-1.7.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
+HOMEPAGE="https://github.com/openstack/os-vif"
+SRC_URI="mirror://pypi/${PN:0:1}/os_vif/os_vif-${PV}.tar.gz"
+S="${WORKDIR}/os_vif-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	sed -i '/^pbr/d' requirements.txt || die  # pbr should be uncapped in stable/ocata
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/os-virtual-interfacesv2-python-novaclient-ext/Manifest b/dev-python/os-virtual-interfacesv2-python-novaclient-ext/Manifest
new file mode 100644
index 000000000000..2feefabe86c2
--- /dev/null
+++ b/dev-python/os-virtual-interfacesv2-python-novaclient-ext/Manifest
@@ -0,0 +1,7 @@
+DIST os_virtual_interfacesv2_python_novaclient_ext-0.19.tar.gz 2675 SHA256 5171370e5cea447019cee5da22102b7eca4d4a7fb3f12875e2d7658d98462c0a SHA512 74ad8e6e3988a90741974491d7ff92c4e614dfd3bb78355c058c4cb6af15b8acfc5a8be15fe9143561fe75bd0645fd935e64dba4dff27dbee7656c963e76e042 WHIRLPOOL 8104c0cd4ff28b51be08f8bcad31564bce8aee3b7a391d9338f87b46d8a47711b72b1ac21522e0027b03c3279b455a81928977f2fec6de34d431f396bdfe2987
+DIST os_virtual_interfacesv2_python_novaclient_ext-0.20.tar.gz 2581 SHA256 6d39ff4174496a0f795d11f20240805a16bbf452091cf8eb9bd1d5ae2fca449d SHA512 7faa2d25c1a9de5907dc0ca23757b8500e0a05d5c0ab56c1d064e6b8d445f91a6c26c2208f69c2ac35f894536a0f2663d7d3caa8f8b96dcf9dd8b7b5e803d1d1 WHIRLPOOL f68dfc6c3f03f67511e38ddab153d301fede112c2e46123b45dfd80ea4ad08e9ce934e8eb04b3970a8ceb7003e00e3178f62c4fbf2a987e5a57b2cc43890fcbb
+EBUILD os-virtual-interfacesv2-python-novaclient-ext-0.19.ebuild 679 SHA256 be50cead08232a7f2c83759b90aba98ed2985fb7187170b77e0447b12c897370 SHA512 7ed8b0f34e09129f07321af34b790ac6a7c1327cac673c856da98d29ce89cca27b9e6fabde2ef6b3ea78fd25060a98f8b3a7f75b364609452edcc77b3c53d8de WHIRLPOOL 8855ed7c017ae43811a9780401ed243ad2012298b389f48a93695e45e5e3dd34875c2b3f2bb989652d3341bb6198cefceeabfca2700161d1d965b9c6276a4d41
+EBUILD os-virtual-interfacesv2-python-novaclient-ext-0.20.ebuild 698 SHA256 baf7a932a76ce7429e9a619a4c1577f14e309334dae17a553872b1a594440480 SHA512 48030b1a53dba90889a3b4fb6f5a4e1bbf36f59f3891839e5f8521b406152dde854d35eca2319eeb02c22b9f8f217a089629979623e6a773f4a3d8edf253084f WHIRLPOOL f810e7dd48f41b8abd5ada96e632692846258fd4b54e25231ec4374ba502ffd1855fdae5b4115e517c1297d998a42f7895c4471f1835f8246223a8432d835f71
+MISC ChangeLog 3184 SHA256 40e3bd1377374183583b2262afd4ed2ffbefb58d31a73d4e9aa31508e10868f4 SHA512 7af0a21bb31f844c5b0793640ba3588ce1e174e7c3a4db553040e4d6a28c4b10e4b2f1ae7d9554155f1705d724d6458a6d5dbab10bf8e8cce6c0c3540e990314 WHIRLPOOL a3bff077f032c5ff1f1aa640a87588f55baa5ff64252fe13e19ad6c14019b97754a59700b4cdb34969fbf2b3edd07ae659c5519cdb299b4813709e354c58b3b6
+MISC ChangeLog-2015 917 SHA256 f3c8a34a79aece7799c5779ae2b348776fb71cba8a7ca139d8bddefdcfbe55ab SHA512 6590c5174babf06f1744513f926dda0c534484ae76db5f57a9b0d9bf9db0b1f3d82e4d06556c895a27cc6b9b8ec2fb2f4a47c314f60d0cf78130df1213d59ffb WHIRLPOOL 0323345771aa75f38948a0401ba407b637d58587613fde1ebe7bb6a500e4b324483e66d4998fdb1d5e13e8281ef3d56291ca838bca6298d81008c38e489cc0ca
+MISC metadata.xml 560 SHA256 8c5ca094139b893de3e9cea2d97af9d6799a3b10d817235931299304b46c8e0a SHA512 cdd8f0d42937d49905650307eacafa171e7bb22fe09f7613f5addec328be7d6810bfeafc457d8ba8eb34fa17464392279d72fba3138c59932fda73018f2db688 WHIRLPOOL 0b6d3188f4187a5194b7d8a89713bf2350b0cc4f1192545766042b92648044369062d40b523a68a8e32dbb75a4b5738e3e26fc362ee96e1b9c9bb15a1fd99898
diff --git a/dev-python/os-virtual-interfacesv2-python-novaclient-ext/metadata.xml b/dev-python/os-virtual-interfacesv2-python-novaclient-ext/metadata.xml
new file mode 100644
index 000000000000..e73db368420f
--- /dev/null
+++ b/dev-python/os-virtual-interfacesv2-python-novaclient-ext/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+    Adds Virtual Interfaces support to python-novaclient
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">os_virtual_interfacesv2_python_novaclient_ext</remote-id>
+    <remote-id type="github">cerberus98/os_virtual_interfacesv2_ext</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/os-virtual-interfacesv2-python-novaclient-ext/os-virtual-interfacesv2-python-novaclient-ext-0.19.ebuild b/dev-python/os-virtual-interfacesv2-python-novaclient-ext/os-virtual-interfacesv2-python-novaclient-ext-0.19.ebuild
new file mode 100644
index 000000000000..520b282e50dc
--- /dev/null
+++ b/dev-python/os-virtual-interfacesv2-python-novaclient-ext/os-virtual-interfacesv2-python-novaclient-ext-0.19.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Adds Virtual Interfaces support to python-novaclient"
+HOMEPAGE="https://github.com/cerberus98/os_virtual_interfacesv2_ext"
+SRC_URI="mirror://pypi/${PN:0:1}/os_virtual_interfacesv2_python_novaclient_ext/os_virtual_interfacesv2_python_novaclient_ext-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/os_virtual_interfacesv2_python_novaclient_ext-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/python-novaclient-2.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-virtual-interfacesv2-python-novaclient-ext/os-virtual-interfacesv2-python-novaclient-ext-0.20.ebuild b/dev-python/os-virtual-interfacesv2-python-novaclient-ext/os-virtual-interfacesv2-python-novaclient-ext-0.20.ebuild
new file mode 100644
index 000000000000..a35717d084be
--- /dev/null
+++ b/dev-python/os-virtual-interfacesv2-python-novaclient-ext/os-virtual-interfacesv2-python-novaclient-ext-0.20.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Adds Virtual Interfaces support to python-novaclient"
+HOMEPAGE="https://github.com/cerberus98/os_virtual_interfacesv2_ext"
+SRC_URI="mirror://pypi/${PN:0:1}/os_virtual_interfacesv2_python_novaclient_ext/os_virtual_interfacesv2_python_novaclient_ext-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/os_virtual_interfacesv2_python_novaclient_ext-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/python-novaclient-3.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-win/Manifest b/dev-python/os-win/Manifest
new file mode 100644
index 000000000000..7075bc8d0c66
--- /dev/null
+++ b/dev-python/os-win/Manifest
@@ -0,0 +1,10 @@
+DIST os-win-0.4.0.tar.gz 134421 SHA256 369d9483340ab48a5c145e4863082d2c611a02a467b7609227e3432a26880283 SHA512 6ffc33c8dbeb834ee588a8b84fb3fc6d7f6bf886d22307cac46c6f769c0d645bc76fd432be0cd8d3b76d0119ef6f5fe3276482cfda7880462f7af6969748a53e WHIRLPOOL 6c3c643b3992f98eb8551d19d067e8a56809a10005abf0940c270a77c4f1066469b367045c6e1be9f453b87db67f4f7fe9d3f614589887bc0e5d1d46c62b2099
+DIST os-win-1.2.1.tar.gz 157535 SHA256 be9749c8bd49d9a65895b8324374e3beafd6e3b0987840e87a888f03e194a7a7 SHA512 2893dda81267fa451afe3e0570b30fc835587237ec20ebc67d0fb454bcf2d0bcf8cfe215e6103f2a165f68c9ccabefd7ff0dbd08b2d52da49f96b2b8fc84cb50 WHIRLPOOL 7189aa28f04cce6d5119030be2fbd875c77d2e2af4f5b93244fbda4817d3090bb78d4d58dbf90b2e26af1ea72220faa14fbe2f8db025e83305d758c34df932cf
+DIST os-win-1.4.1.tar.gz 170022 SHA256 88c95da00bab00672d128943400d9c3fd6ca2c4f17b0d20eaaf242ebf6b0866b SHA512 1bc21be5e336a90c3bc96ee3e727e3192fdc8baab548ba67c5b68d10b88661759d02c006a3f579bc0c66ab0c4d63a4b40f684e4f7c6cab9431256cb2fbc1634c WHIRLPOOL b6458e0e2a4a38b1e9d6972397b6ddcc582bbf1c0cac737282c6ce7c4bd91322d3a326d1203d6d4fb6dd345f41f90ea4ff57252ecf89a2cf0f6544f87f38cfa7
+DIST os-win-2.2.0.tar.gz 192662 SHA256 4f668ce616289ba0a535c14445186b8ae7fd5cbdeb3921ccb50fd4729ca1191f SHA512 02bb9b7ddaa7b3807ce66ce32242fe9938f28bde6880cf9ed461072e764e41a34a1238ccdc8b67ebc95a07ac003bb0771b8943602582ede6c8a41440f865060b WHIRLPOOL 4e14808719305da9d0097d5156e48a40ff180a29038a1605415a03a494c7402c91f65f961b3225fb34c81d275438092619d05af2c08e955a61e98990f2b33367
+EBUILD os-win-0.4.0.ebuild 1051 SHA256 2f851bcb74556adcf4d422b16e258a1a7534b41530190b79384e06af81733889 SHA512 0d9128d4545d993df713a613c4ef364b89db33a910c751f984de8e6cc10165e74d782c319734ef40d78cea48594298dc972fc088f1ffb8186af8959433f12ed6 WHIRLPOOL f0fb9d9ab7f6c3ec67325fabeafd9326a9c9aa72c54cb66026b52edc48179c6d9ae8099de49fa794391f5e1aab890d5ef1e4841a5d08a75dd87b7a7d479e98d0
+EBUILD os-win-1.2.1.ebuild 1056 SHA256 fc2a462983d1a63d2425c7d1dfd9bc2eeaa815c40a11d75f2a40c176c6b0ae1a SHA512 fcb119c311cd5326339fbab55956a171c783a244d26394ba85a225fe199c65e4b209c9c9ee28b5f7ab280421de789b56e118d41758dbe34e8f2cd71dd75ace95 WHIRLPOOL 1a8703ba9d8d2e8e36658f9780b16c32d64bc5fbc2e3fbb0afdc91e12e6052e72c9b1f78388c79e9ee1e2d800801126c8077813cb88bb99e44c00147e43d5563
+EBUILD os-win-1.4.1.ebuild 1055 SHA256 727904153766f4715ed4c6bf463b623e74d3dee737f1889bfb57ebfbcddf7afd SHA512 987419d894a83b19f343ca022a3a6ad197d04aa359bade44b7f037d434708e529513e9272c6993f1886ecf9f796c95acf99d1a82b9b7542c5337489d3e700a6a WHIRLPOOL 3d0809432ce5cadd1a0f16f9b479d06c5dc0ee1ebfb944ddcdfd2a7b1c1f819349bc721c85a155a4647681d1afa3c1facbb4b55b64da46d08df3c5b9f811c1c8
+EBUILD os-win-2.2.0.ebuild 1317 SHA256 c81b13c19257d3cc6bb57ac93e511fc8650e2e96086a2e394bbc0bb61dcbc754 SHA512 e54a571099aa7daa338fec6baa128863bf41d592b0c8a21ae3175a8de381625219278e72e4aeee6bf94a370708be6b87188d45c5e27d4afd06a2a84e06865b49 WHIRLPOOL ffac04c16b89313f986c592872ddcf7605bbffe61fbfa1f758dec5af79cd040d3bc91809163a783a4d282cafbff0c5beaf4d87b33ec992017adee9787379128a
+MISC ChangeLog 1357 SHA256 337271a51e59c5b91b96a1489b4fed0e3db37d5d8c3db82101538aac6ce48fb5 SHA512 f36a23eaab539f2bc1966036438be1734db67e778fc92af2b920e7b618127b28ddc85e9250206602224333dea6d3ddbceb044f0228c1154e3eb3f9b96014f031 WHIRLPOOL 3415f09b4ab23529fdcc5b48fbd60369e62c3c087cfe183e037232b314aea5dd88958eb8cf678f29c1767e22f492b248882c07b1b961c623d0003419a2c8fe57
+MISC metadata.xml 480 SHA256 42a3a99cd8817d7437101a76130f6862ea93edfdedaa390ce284839cea3e7c65 SHA512 6454d56af0f829cf94cd211f78651a6d611eabebd8a3aaf5cf2cb92aef29107ed6efa5e974b5f9e5f6f53ed29565c1c6ac0448de72a3f21efbf73ecbcad2dd3e WHIRLPOOL fc92196fc688c62af4baa8624b2295058fdfb717f76775225186de1fd0ec780df023d3057b70ec32b62005477dd2b6285d22550561896d6fb539126721c8be61
diff --git a/dev-python/os-win/metadata.xml b/dev-python/os-win/metadata.xml
new file mode 100644
index 000000000000..4d5ec9ded55c
--- /dev/null
+++ b/dev-python/os-win/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		Windows / Hyper-V library for OpenStack projects.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">openstack/os-win</remote-id>
+		<remote-id type="pypi">os-win</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/os-win/os-win-0.4.0.ebuild b/dev-python/os-win/os-win-0.4.0.ebuild
new file mode 100644
index 000000000000..a59d688b5cf9
--- /dev/null
+++ b/dev-python/os-win/os-win-0.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Windows / Hyper-V library for OpenStack projects."
+HOMEPAGE="https://github.com/openstack/os-win"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.0.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/os-win/os-win-1.2.1.ebuild b/dev-python/os-win/os-win-1.2.1.ebuild
new file mode 100644
index 000000000000..d8d28be1e582
--- /dev/null
+++ b/dev-python/os-win/os-win-1.2.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Windows / Hyper-V library for OpenStack projects."
+HOMEPAGE="https://github.com/openstack/os-win"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/os-win/os-win-1.4.1.ebuild b/dev-python/os-win/os-win-1.4.1.ebuild
new file mode 100644
index 000000000000..5920ff93365f
--- /dev/null
+++ b/dev-python/os-win/os-win-1.4.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Windows / Hyper-V library for OpenStack projects."
+HOMEPAGE="https://github.com/openstack/os-win"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/os-win/os-win-2.2.0.ebuild b/dev-python/os-win/os-win-2.2.0.ebuild
new file mode 100644
index 000000000000..8906f8520a4c
--- /dev/null
+++ b/dev-python/os-win/os-win-2.2.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Windows / Hyper-V library for OpenStack projects."
+HOMEPAGE="https://github.com/openstack/os-win"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/os-xenapi/Manifest b/dev-python/os-xenapi/Manifest
new file mode 100644
index 000000000000..efb4c42efe33
--- /dev/null
+++ b/dev-python/os-xenapi/Manifest
@@ -0,0 +1,5 @@
+DIST os-xenapi-0.1.1.tar.gz 55493 SHA256 41fcb476b80b32172ec337d1a64a3404d2c8a0dd7ee684d8a4b5fd96d01c49fc SHA512 eafb5d431fef7e3435f3c9c4c7821a3cd98a17b2ad6293a6b90c83ea18d738b8b5de3f5bd43327ac670c13aa8d7585530c330e42df4cd3c8b5b9e2f860373455 WHIRLPOOL d4559eeb2d4773388cabe5b718e4b90fdf62f2c9eae461a2211fde184df937cc5aa077487f90b8131a5cc41fb873a85bc29f0a37170d70544e7f6055e31443e8
+DIST os-xenapi-0.2.0.tar.gz 73753 SHA256 d41fbc50fb3a36364f3e2eae35789332b52fde6ee4cd3e1976f73f1daa613128 SHA512 6eb7a8b8137c6c28cf07af51ddfed9aa08ad5af3cafd48ed72d9fa909d0dd2416e17eed8a587fc5cffac55704652e24ef8e759f60806b569f2765a5fff58884f WHIRLPOOL c952453b9a6c22b135532806b1910f9425deee529eec34a6e219ef61f4d23d3ac27f45a815244ef3da8df7c8a5aa3b1a9f41f18c0cbb311f2e1df207ea952ea6
+EBUILD os-xenapi-0.1.1.ebuild 988 SHA256 49c05b9c8ae6c19fc37275ab19aa6cee2f036d374b31c7cd6191cb997587a1d3 SHA512 0be21860566ad28c1ac98367d7f2e08774220e94b4b1cc02a49bc72350a6aec60d971bee1abdb1b8db0e22ca2740a3420e8c07f6510ff88ea7fb2b35c8db1c37 WHIRLPOOL 626445d1c4fe4d76c1d06ec5b80b4e65b1a9f583c09b66dca889aadd780f825ca747ffa08329ce60e66619b196c7e8489ba3eebf92fd917107c186d24582fbe7
+EBUILD os-xenapi-0.2.0.ebuild 990 SHA256 1de7b3c7991537f13c61debc454050c3eb78fefe105c9631b25a53a43e0b19c2 SHA512 32e9af2a80f638343f7b2c8fbd597b64193cff8ce8cb62ed1091bc63a9055b3a8e1e70f6c9fb3e73a891a6916a796384b656c59ffabf9125581bda9be679129e WHIRLPOOL 83e1420a564adb86acd1ac16e0fb707e2bf51d6b683cf625ea3e5b54709516c7e7d5c5a3781cdbfd6f160056c752e3f91ce7216095047bf1dc619fb0029a53c8
+MISC metadata.xml 385 SHA256 e0a7c62d94e01a804cb048635b22f1f37b8cdc0c4311fee9b745834b7a821f18 SHA512 b8a779ae9c1158dc5d435fdea67f528af82d880b858cacd091d6d9b0e1812cc0c909b46d76396785aeee8f26cb00d5ca53ce38b063c42ae05deb90efd01b586c WHIRLPOOL 9b09d4b2be000f39d94bd8c0ebe3d7a0d8d054a4ab787fb0afae27f5b9929152ff2dd385037fa485755afde7a168a59efe049139130eb7a934983f2648781971
diff --git a/dev-python/os-xenapi/metadata.xml b/dev-python/os-xenapi/metadata.xml
new file mode 100644
index 000000000000..f4222e3876d3
--- /dev/null
+++ b/dev-python/os-xenapi/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>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">openstack/os-xenapi</remote-id>
+		<remote-id type="pypi">os-xenapi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/os-xenapi/os-xenapi-0.1.1.ebuild b/dev-python/os-xenapi/os-xenapi-0.1.1.ebuild
new file mode 100644
index 000000000000..bbee10c3ca2f
--- /dev/null
+++ b/dev-python/os-xenapi/os-xenapi-0.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="XenAPI library for OpenStack projects"
+HOMEPAGE="https://github.com/openstack/os-xenapi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/os-xenapi/os-xenapi-0.2.0.ebuild b/dev-python/os-xenapi/os-xenapi-0.2.0.ebuild
new file mode 100644
index 000000000000..a139b9757d2c
--- /dev/null
+++ b/dev-python/os-xenapi/os-xenapi-0.2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="XenAPI library for OpenStack projects"
+HOMEPAGE="https://github.com/openstack/os-xenapi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/osc-lib/Manifest b/dev-python/osc-lib/Manifest
new file mode 100644
index 000000000000..4a5f4268e4fd
--- /dev/null
+++ b/dev-python/osc-lib/Manifest
@@ -0,0 +1,8 @@
+DIST osc-lib-1.1.0.tar.gz 72875 SHA256 e06ca111b2702d442f5cf70c754b6331cc7742231f0fe0b634cbd03c502610ba SHA512 8fff1c13e034168d1a410d2a86f8f88d8911af1a4bb6823c95e633599984ce06469ec7a4fb5a90a6f8bff7f79cbff1120e906c8ab319111957d663728233d77e WHIRLPOOL 7c64ee245bdfbb6578165f4b860e3e27aa942ec1aeb4ad811a416017b18bdb9b21c9aca71bdfd2039e9adf117aa3769ababc97b6a7b66d958a7db0ac5c940421
+DIST osc-lib-1.3.0.tar.gz 74532 SHA256 32bf892ba828241f93ae0ef5c94d6b92ac3deb9f061dd4ffb61e05120b4ff365 SHA512 53f600f24a0b63db78e21cca2a246dc3278e338198f600689a7e6ee0f75e98699b447df6c4dacea820bca48d25bd4590156f2d9abd75b3324bdcc96966060ece WHIRLPOOL 98cdd842a777653cf9aeedeb63b97e1de341c671a03c31494577ba205b4f4ddfa7293dab9692f4fc49cf539f363be3570b643e1535201f564622157e67556f97
+DIST osc-lib-1.7.0.tar.gz 81917 SHA256 7dee72f13e5478f8d3d836267fa019b99ed4d5e478fc08bbcc9e23029d11ec78 SHA512 a3dd3ceeaf674692fa318809b190df30d1d6be5b59355b8f0b5862f5b220452e3df0185415b35ef596158ce010b47bdfea24e5fcc3d957d38a2a89b8a5905bcf WHIRLPOOL dcca7735c7b64c12564d9c71ff87c534b32e5abc5c0a3404cc0cae888b36a1ab52d6482f7f2abe30549111bdcb857b478438891e192dbf16dc7823b4de9ed331
+EBUILD osc-lib-1.1.0.ebuild 1229 SHA256 1ef81a260879a115184f557dccbb9b2d041dfcda2f6b841eb3c495ea12df7826 SHA512 7417aae93f384c675b08d09e4d53c2b118eb582a94fde109cc9ee4394e90cccb0d569c7fc5a733651cf001a876bccca515d053d4e90070f49d5252105349d173 WHIRLPOOL d07c1cf7201abd943761aa31533f865e93e70c0b51602bd576b5f23d2b42e7499c8a725bb6b21cbbd36c3e768136af38a8c0524b6380bbf5465a5bc51e17338d
+EBUILD osc-lib-1.3.0.ebuild 970 SHA256 fe2686374ceba8f91c4bbfbc86cb3aa2a83b08447b3d01a1a043bdb2c6f934a4 SHA512 fcd624fc575e35dc79f03f8cc64510065431bd801b7b8e9e36407f29d93a90cf959cd13063e94b478b13a7f7a0bed2498c65615173e39153a1c0c3cda45c034a WHIRLPOOL 6671ac834cc2135121938d20d7c32b0dea109e354f662fe85dfa250b12fac22ecfc84a49ba0659afdb0bd85969c5168904282e60191184596c4bb82e0d4b39e8
+EBUILD osc-lib-1.7.0.ebuild 1141 SHA256 efec5318cba8739b079b52ce7b925f41cb1dd66ae721de3799d925a1bf81cd89 SHA512 a4bd61de7bb5cb0839ea8c391c9d9a5569e30e18e888782a7f62144bf5ad37768de56ecce6deeb5e115c7c32729e449e791f09262ca0610ae12d4c60524c87a1 WHIRLPOOL 7a9b8077db4740071db3424e0ecaa88ba02267cf44fa980c3b5d3728817d1b38260e550d432b44bf8ff71de4c77a07b7f4bff1cf07c9a03bed9e3746bd9b55f2
+MISC ChangeLog 461 SHA256 effed48ada1312edc2bc9ef30213dd7198f72fed471b9470914b7b31f1387522 SHA512 1f384b89986c036fceb4bb8774a438fe8a9b2059f289a5e79771fafba9d84b3cab50111edca9bc2b1b4cb5fa0525a0c92ecb28e121f9840844882e78956ba7f3 WHIRLPOOL 1c3c93fcb5f8e3113d7f3faca15261a8f39e4eb47b57c57ea19d96cec2e932ab91ec92cb5bd14c0a87fe89364274014fc70a7318b2a97127cec7deadc3cf658e
+MISC metadata.xml 703 SHA256 9cf7f86ad293399ac1b9af280dfc0cd07b6bf0c2d942a5c83a7072dc25000869 SHA512 78f928551abdf1d6c53aa4f7ab7dc4b3f6a5212157b7c31adb5019a3b88064d06c66c693493ac2bcc6cf62e0f4b3fa2c6b4e329a25ab530df72220f430bd8df4 WHIRLPOOL 6bc50c6d0863dfd162760a0cf0bfd3da6205e94df32466be79bf33efe056017cfe0c5ab2c6dc4fdf7bcc1adf2d92fc22e408556d5f0d11e6b874f57988bf1a6b
diff --git a/dev-python/osc-lib/metadata.xml b/dev-python/osc-lib/metadata.xml
new file mode 100644
index 000000000000..39d1bf4db6f8
--- /dev/null
+++ b/dev-python/osc-lib/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+    OpenStackClient (aka OSC) is a command-line client for OpenStack. osc-lib
+    is a package of common support modules for writing OSC plugins.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">osc-lib</remote-id>
+    <remote-id type="github">openstack/osc-lib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/osc-lib/osc-lib-1.1.0.ebuild b/dev-python/osc-lib/osc-lib-1.1.0.ebuild
new file mode 100644
index 000000000000..bca80aa9d8b3
--- /dev/null
+++ b/dev-python/osc-lib/osc-lib-1.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A package of common support modules for writing OSC plugins."
+HOMEPAGE="https://github.com/openstack/osc-lib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.19.0[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.19.1[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/osc-lib/osc-lib-1.3.0.ebuild b/dev-python/osc-lib/osc-lib-1.3.0.ebuild
new file mode 100644
index 000000000000..6a1ddeeb0ef1
--- /dev/null
+++ b/dev-python/osc-lib/osc-lib-1.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A package of common support modules for writing OSC plugins."
+HOMEPAGE="https://github.com/openstack/osc-lib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/osc-lib/osc-lib-1.7.0.ebuild b/dev-python/osc-lib/osc-lib-1.7.0.ebuild
new file mode 100644
index 000000000000..3281f49dc033
--- /dev/null
+++ b/dev-python/osc-lib/osc-lib-1.7.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A package of common support modules for writing OSC plugins."
+HOMEPAGE="https://github.com/openstack/osc-lib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.21.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
new file mode 100644
index 000000000000..122bd0a21581
--- /dev/null
+++ b/dev-python/oslo-cache/Manifest
@@ -0,0 +1,6 @@
+DIST oslo-cache-1.17.0.tar.gz 47178 SHA256 bd74257b5bc781112af8862ebd6d41cf58359bc78ccd421cc47f0a79d5337c64 SHA512 0ae55959a46624bd0b50cc8161f9428b3f61669f726ebc05d944f7e049c5172a1d9c83778c9632e8b2a21f047884d90d15b95c0e23a0dd19cb78f8d62f06d00e WHIRLPOOL 28c346d092cf8538a0408e4cd60d48959432090cdbb4bb00ea43524b49dceb84afa786b5456aa71a6938d99c195f940a6741ef3d06e380c5c3fe2607223a5ad0
+DIST oslo-cache-1.25.0.tar.gz 51267 SHA256 7b2e17bfb7f5de8fb7836a9e2311044cc62d904486e1cc2ad3b8182ec75e1d65 SHA512 3c21736c864cd63f3a55fe06cedad54a877970d3ede70fe9259cd549fb2a81d425547445238f8c8f9e42929b775216c79b34eead8655588ef8e1c2617bbae6a2 WHIRLPOOL ecc8bc414de18dbcb1911b3d33997884f38aa7470c537a6fc83bc8519e3d110388dee023b79d13f2b0eee300f8b144c2f0c0386023bf92af4bc71a61406a2bbf
+EBUILD oslo-cache-1.17.0.ebuild 1049 SHA256 b9f76356c91ce7a5bfdf0a1157068a080c07a80c03879918284191ab44655fe3 SHA512 b23fe1da5ce175391e582189a6494e0fdbfe7c6cdd351ed33d53ad161aebf7fb905978f479530f69722ae4756fdde1fb6e50578848cb7c8c6f0dd666293d2d2c WHIRLPOOL 64b0a15ec40269f16f6be83d737c926b108460b2b3bcb05a72cd626c8e51a96687f9f1073ff7004fa7741d9da7c3cc10ee8552fa64c2ecf62acfeccf5a44153d
+EBUILD oslo-cache-1.25.0.ebuild 1190 SHA256 8656a61a8a835acf5eab50c2da940c2b9fbdd6ba45fdc3b2cfd0b9aa9dbb703f SHA512 bb2a6e3313fb504275a7a3ec56dc60f8f94b03db0e20b11248e89464bf38502cfbc125528c8f42fb096dffb2965fe9ac16edb392ee3761f0946d01b9481e3a6d WHIRLPOOL bc45dc201c4d2e17e28ea80ed83a52c7fb2e565c0865e6fa3064199a6f5ddc5b6ecf65c3e10975302c5291d2db2edbeb220f034f16d9cc2bf6193803c5d69735
+MISC ChangeLog 1302 SHA256 87604496c4c8bebec76b1c6d8997f28e527c0b8c1875e981460e48a8ecc5c732 SHA512 68d07ec03e91fd6b58222464c5fe0b5c7a8a86cf2de6c37e365bb6deac8941cf0868428b71c56b342f43563ff7fa9435e36262163b4ed27b7354c8a37b2a2432 WHIRLPOOL e564aca341a2c0b3620857ca074df28b191c9ecf9827a45dd23bca61ac77198c2c1d84741f16bbd5ac3d3e0d6a9d01aad59551d1202abdfcf7dd07899880860e
+MISC metadata.xml 457 SHA256 0edde3827cfe28da46bfa66b1fcb7746d1abd35927336885040de06f9c947f68 SHA512 f98547e9de8c502afabf7c53409df90ec687159b5160c8ff2166acff4d6bce0fe69c8eec78d50f52919cd75733f44f82dea5f9cde362d22ed69200d332b9d6b7 WHIRLPOOL 4f732022f633c7fb273e0e612220c29f6b3d9a0812a1517b6c0cdffc046e2e01c2ed280a331544b06fe006c9fac6a0e02349002ffaa48443b9a3cb6f08114743
diff --git a/dev-python/oslo-cache/metadata.xml b/dev-python/oslo-cache/metadata.xml
new file mode 100644
index 000000000000..5bcc8af1ede9
--- /dev/null
+++ b/dev-python/oslo-cache/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		Wraps the dogpile.cache library
+	</longdescription>
+	<upstream>
+		<remote-id type="launchpad">oslo</remote-id>
+		<remote-id type="pypi">oslo.cache</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-cache/oslo-cache-1.17.0.ebuild b/dev-python/oslo-cache/oslo-cache-1.17.0.ebuild
new file mode 100644
index 000000000000..848707757815
--- /dev/null
+++ b/dev-python/oslo-cache/oslo-cache-1.17.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Caching around dogpile.cache"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-cache/oslo-cache-1.25.0.ebuild b/dev-python/oslo-cache/oslo-cache-1.25.0.ebuild
new file mode 100644
index 000000000000..9f4447b6a1cf
--- /dev/null
+++ b/dev-python/oslo-cache/oslo-cache-1.25.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Caching around dogpile.cache"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
new file mode 100644
index 000000000000..5048db6c1192
--- /dev/null
+++ b/dev-python/oslo-concurrency/Manifest
@@ -0,0 +1,7 @@
+DIST oslo.concurrency-3.18.1.tar.gz 47274 SHA256 4314695cf2d0359a488b2f862afcb4262f11c83c9a826f36ac962b85f954ea8c SHA512 bb8eb61fea5995313fb2844fcf3c80ce15cebeb266ea50530569c33d404e75958b7e51a0d11b3cae67d0ccb2738fa8789a902fbcd8d7911283305ac4d4930476 WHIRLPOOL 0e2f1fea00f4671f7d09e128d0ce4a4239a8643426ce184e6bd3820468ab1f3a5a32a9b6b521e990ed92099a10aa7890ea8c8c167f6140d9bf0b2b702e8d3556
+DIST oslo.concurrency-3.21.1.tar.gz 48866 SHA256 e9f42e46a84d355e73f136ba4395a9002c2fbb419fe04942787e5a5a54ebed86 SHA512 6d165ebf952b29d96d2d1a8b938b2ef4746c77b99a62ca596ee93e6fb6d919f183eede380763b6167cb7d372e03803556715523b7a63ad1dbadff4eede7c0bcd WHIRLPOOL a20a5cb9ad7ce7ec7ef53a426e29c8aa4cab83ab7f45e69322bc16bef026f78e266c9b3cdaa94368f65df8c0778f967a7075cd3f5cddec9e5ee7bc4c6ca7ae9e
+EBUILD oslo-concurrency-3.18.1.ebuild 1659 SHA256 3360f587761f7b405e1be19529a061455a54a13935d0bc791af0160e61983838 SHA512 7d11bc83a78a4ebf7c2f2c99a53a3305f3d258f17afcf85fbe4e2e11abd227c9bca0a3cb009eb8665cf38840b7107a43af2ee1388126717717d0533e6d0da05a WHIRLPOOL 60dad2add5fc7c527454a233da9fd7586b8a3b49c5dd0e224d80f863927842b8e0e900978b0a4a96f5489fd835bbf93293efca97b3bbf79941e7a1435c0b9be6
+EBUILD oslo-concurrency-3.21.1.ebuild 1952 SHA256 84c22a94f817d642d1e9180bc60ed2e9aa5853a362abb3ec55f885bf5fd18455 SHA512 f5ed1e768fa298959da1c2d46db9d919ae0d52f09e1b1181dc1969136213a6b7d3a450ac04363ea837801c8e1b2bdccecf901a3927796bc7a32802d7086acfd3 WHIRLPOOL 70a7b00ed5c95084ed1209fbbadb38fb34ca50e73bacd949002b7a48f036827bec099533fd157cb69dff72eaec9ee54bc7b5029d825fbe4c8ee0c4a21ed17661
+MISC ChangeLog 5609 SHA256 2277cb15f373aa04c4a5f7c3c3cce440c5dfd772bc9ad73260b02a5d6831a4c1 SHA512 8faff18e3963e3e4b93e272274b1e67847c6cdbfb309eaaf7c9cd233b48d49f0142b023b3e77bb999bad06a87e9db80cc43fc1c41346fe78ab1ccb8ae091ff47 WHIRLPOOL 9500ef226226f673c38ffb655eef4d0666a7af9f3ebfeaae6f01dd441a9e7f8f61fd1f3e592ec98628a38e50d81a46b3d7dfe2fb767d74ee7e3b219c43b1ee9c
+MISC ChangeLog-2015 1231 SHA256 ac035d6320a3bf164a40fcdda4f18c3e383ed212778c14e1cf3c4c8d80c50cad SHA512 13ba75352225132e550a097c28da16572b5da00cfc3292337e0952ed768524c9cb62cd9b4feb505242e3eaae3c05025780599ac89aa546a5a0683aa8f6e81e95 WHIRLPOOL 4c6ea6f189a1a52ab4cefea1987116cf1738b387044c0a7c9c176676954b45dab2d5e65a66144b9255cf4444515ecb226653ffa6d16a4994962427adeb0f96f5
+MISC metadata.xml 665 SHA256 0ff0fb080be4015f4ad769c20f75bbce323e3f7672a9c996edd170114489e962 SHA512 de8aa8ac698d88f71b8368334e2e9c5edbc559a612e8d92379400fb73d82e44f70b9e23726fef13414e36fc159f3a8bc41753c4c83daa4d31aadef942e9a484e WHIRLPOOL 1550642864084a4189a1ed1a8271d8e14200d68100de7114792f7bfbb98895418f824d28989614993c7cd805158d6b1c309940ab9f203f906212adf3dbb5fbcd
diff --git a/dev-python/oslo-concurrency/metadata.xml b/dev-python/oslo-concurrency/metadata.xml
new file mode 100644
index 000000000000..0913509187b3
--- /dev/null
+++ b/dev-python/oslo-concurrency/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Oslo concurrency library has utilities for safely running multi-thread, multi-process applications using locking mechanisms and for running external processes.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">oslo.concurrency</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.18.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.18.1.ebuild
new file mode 100644
index 000000000000..7e3dda1e031e
--- /dev/null
+++ b/dev-python/oslo-concurrency/oslo-concurrency-3.18.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="library for running  multi-thread, multi-process applications"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.concurrency"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz"
+S="${WORKDIR}/oslo.concurrency-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		virtual/python-futures[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^futures/d' test-requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests ${PN/-/_}/tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.21.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.21.1.ebuild
new file mode 100644
index 000000000000..ccb6375bf6b7
--- /dev/null
+++ b/dev-python/oslo-concurrency/oslo-concurrency-3.21.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="library for running  multi-thread, multi-process applications"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.concurrency"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz"
+S="${WORKDIR}/oslo.concurrency-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		virtual/python-futures[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+		!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+		<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^futures/d' test-requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests ${PN/-/_}/tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
new file mode 100644
index 000000000000..5c3e8ea1c93b
--- /dev/null
+++ b/dev-python/oslo-config/Manifest
@@ -0,0 +1,7 @@
+DIST oslo-config-3.22.1.tar.gz 117975 SHA256 94992fce59bdd654632275527d479ca9426ea0fe43c97cf7fc74305a96e1bb92 SHA512 af84f132d33b1fc4a63f4006231bfe09bd2a1ed0236e14e79d6013d7c697814a23f9318666186a6916c00f0157c2df227ed07fd874a65129e0cc686a90e82704 WHIRLPOOL fbb8f69af03d03e1c533b12011820abb04a603e2312281aa6f1d223fc074549ee53daf311a3313cd9fea29b54d4108d68deec35ac3e6b9a5c99f8cc1e21366d7
+DIST oslo-config-4.11.1.tar.gz 130922 SHA256 1db25885036e1b6ad0ec93b2786e6bc36d88280a0553d1c2d03ca66ec8da84d5 SHA512 c7087080ef336d8aaf262a968495afd599f83528a7eefe6d9d13a819ca4d198964550d516abf4bb674eb4bb95c42e278b65cc9bb8e90ef3d6010e24959d393be WHIRLPOOL 10f94668e276cdba5ed070592a8f074b3e3e40f43d99fef411319d581e31227b709f6da770eccc1243fd9806b9015b3584eccf850cfead1cd7cd24528b4e4a6f
+EBUILD oslo-config-3.22.1.ebuild 2142 SHA256 da263fcf52b5e681e6c5bae0cedfe4736401c6f8d9140316b80551fc6ca75b96 SHA512 f43cf405165075711ad0aa29c25fa00180b8b9285f38081f1c0840b2dfce7a892cd8c93f1266518f6a0c74eb798ec4ade8213787cc39967adf1c89896d627704 WHIRLPOOL 6157296d5b887aa17f64f9715e7359e0df31059600e6838cb39352415e70040c764b61e5af2b51e11782e2f78e337d096144fe90ea8cc597f15d3d09b992a98a
+EBUILD oslo-config-4.11.1.ebuild 2287 SHA256 e924cff6ca774e820bbcee21e20c021ea7dd4fd29ba6480097c8c7fc712bd001 SHA512 82404fe61a991735ba3601725986bad53a66efe4fe04abc2b357cecaf48d04e5368dcf45556b231d0ff2244710d7fdac35dd226f24ef33162083101270f31aca WHIRLPOOL 5b3741d69b86b18a4a23f334172999c0b6a4158f2928a783084fc88bd2da3fa5b206bfad6eb6544465a3e81cc137637d35a86bd69a2246fe5ea80e706999c556
+MISC ChangeLog 5501 SHA256 46a2e311efdd52bec8a68ea0c135e958cb6674c15b4e6d004379d14413bcebc6 SHA512 82c594669de68eaddb7a39fffa754ab3159f12520cdd1dc38dbe60a74e0b229fd2c9e6acd13a1c50915dd82b94d73ba1d152ec02924e15e93ff54f3be5385a6d WHIRLPOOL 919dacf7807a74ab086919822e2dfe6cfa295c457f4e3195237832d8a6ed84dabd3d1ec12128e8bd3c384303c7b0b55eaf0236ad38d3d739f9df70b3e93ab7a4
+MISC ChangeLog-2015 4154 SHA256 cce5a71559a6efb14b55e570c9da0d52797353c4a4a34e601e6d50d565b750cc SHA512 cc467e03927d1a7bbc1ba267d858a438ea6e7d205a0447d81cb7d29ac8f4e586c3b368697f275e95b927dc076c0aaa07da1a3992ba0f9e2797182c71ad576db3 WHIRLPOOL 40d58bb8159d846b35c2dc3fb8febf76c4c173d1a541e13eb1fe17c528cc8007c0270ff084a799664425797cb1deabbdae0f2aaea398492c972fd8717b3b862c
+MISC metadata.xml 670 SHA256 32379f30da48b731105267f8f86813b3bdea5c17001fa4de85d92ef2c7f1f413 SHA512 c09cd1761655f29d25e689ec95939fa59f4fb9a3fbd48509c0a65d2d289e073b3c60faa838e4075efafe32b2caf2b7fc3ae46af556cd50f66c37ac5ed8a1d52c WHIRLPOOL 11772c01f0a8aba5c77fff12da6f992ec950503a2220f210e2f4a58606ef265e4e671c073b8d65428d14682294540bee6e874824b932b5b7dcea05829ec2f14c
diff --git a/dev-python/oslo-config/metadata.xml b/dev-python/oslo-config/metadata.xml
new file mode 100644
index 000000000000..7248bf25a18a
--- /dev/null
+++ b/dev-python/oslo-config/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    The Oslo configuration API supports parsing command line arguments.
+  Oslo also supports .ini style configuration files.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">oslo.config</remote-id>
+    <remote-id type="launchpad">oslo</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-config/oslo-config-3.22.1.ebuild b/dev-python/oslo-config/oslo-config-3.22.1.ebuild
new file mode 100644
index 000000000000..f664eb86e465
--- /dev/null
+++ b/dev-python/oslo-config/oslo-config-3.22.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Configuration API"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	use doc && esetup.py build_sphinx
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-config/oslo-config-4.11.1.ebuild b/dev-python/oslo-config/oslo-config-4.11.1.ebuild
new file mode 100644
index 000000000000..10b4df1c72e3
--- /dev/null
+++ b/dev-python/oslo-config/oslo-config-4.11.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Configuration API"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	use doc && esetup.py build_sphinx
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
new file mode 100644
index 000000000000..5b6ae781b1c4
--- /dev/null
+++ b/dev-python/oslo-context/Manifest
@@ -0,0 +1,7 @@
+DIST oslo.context-2.12.2.tar.gz 26860 SHA256 36decf5f8bd72a986d58c2e603c2e0d96d31da4283f2fbc145c6804113b86f64 SHA512 752d2e9744fbf94d23d6cc3205f3b4974d440bf71ab885de2feea3e706ed93b771b50df264c754cc8f6882f8526de0318cb3d1fc07a28a872f4b02e59118af98 WHIRLPOOL e54612a8fda6ee4a07ad603f54356f6bf5aa8bedcd11f9faaf88ff7f98ef79b0407dc50d9295b8131375fbc4916b5915096ce97a142a2c8c06eb9345749483e6
+DIST oslo.context-2.17.0.tar.gz 27756 SHA256 e4c2080dd4767a843f8f3c287e24f89bc749ec7cac34fa6ec2b4de3b1bff9085 SHA512 158ccfb5517f2e4521d9be0b4864b2f6cc491f2dc00b479ea6314892b24b0293fe1e5e654d1503b73f992d011bf79c0b3c5b1f7b69dc7d32549a8327897957ae WHIRLPOOL e48de23e16422c34b229c74d1d0b789f5db6ed43c3c8ec0db43ebc1b3e8e4ecb1edc22df2ce23e5d83c8c5fd1e01dd228d6b40f7acf44947a234ad9663a4f3c2
+EBUILD oslo-context-2.12.2.ebuild 1308 SHA256 29dd10ff7a58593cdc323593c9aedf9c1bd94857f678a91d3e3686847e8a1b10 SHA512 8e8b630dd2499bc561371eee807d6ea24070758d86200150ac205ca9c6a57064a81e90881045018eedd29d5d2fb8368f824fe4c41ccd517406480b1373ad90c2 WHIRLPOOL 9e53d00650fc9d15d7a560d3dece09bc07e9a126c303d4e1195559f129b67940e2c26f57073915eb9459de167d1157b81b0f73e7c32b987f2bc1b13a147b0526
+EBUILD oslo-context-2.17.0.ebuild 1407 SHA256 c449404272913ce659ac519b3e3c42bb834ba0279c9c2b478efe2239d75d7212 SHA512 d66e30210b403e83820ca69ed8903881dde2657419ab94b2bd8c20ec87f3dc1330b33b067ac78126dc09f2934baf53d251e15ebb398710e955e053925d180d27 WHIRLPOOL 41f748bdf23f9dd8408f82c18653a42371c2b40f223b484ad556e76b7035c5b671bcedc447697a2237e12025ec8ac557b91c1e4fdab2d148650881b3849d2cbf
+MISC ChangeLog 4612 SHA256 9a9655524d233c7962ccde7c6ca8f48e864b04c11a9d338255cdcab93f8c0782 SHA512 4a0aa37a015d9239dab61a05ee2be0df0000746d03e862c1b2c8500a123550d6b5549837b44bc21849251c33ec48974866599d7b3b1889dbb9f3b470cf127ee7 WHIRLPOOL 20575fabc069ad2c46d8b9e8704c46cc7e5bfc5ac184074c7558800c850e110f47190314f1761e864a82dc273633d8265bd417f9e003d22df374e62c21907fbe
+MISC ChangeLog-2015 1223 SHA256 8541bc2a4ace89b8170a7198cd30e77064a01ea1ab78a42b124a95f3f0e87bc8 SHA512 27e86c2b969d2ed7898252dff4d2c7a1d9c7376d80a61187b1eb1d47c5e01f07de95ee58dcaa477b7a263be83a7904dfc5bfac474778ce8d961c606b8d558fe5 WHIRLPOOL d080ee4c4c8377f31cdb0c7a97dba817895af502460098a177e46aac1e223e75cfa84016064e256d40a75bf540c08849a57d457c51b35c602960b8d56006a70d
+MISC metadata.xml 700 SHA256 5ec04d6d5204c95c2609448d4eafbd3b2170d7494b49b82606e4b037d128eaa3 SHA512 2ff5f7f1e4a65feee089f19c189a30668f09000ffe03e852d084d65f4db245e94086dea053620cfbde5a793f3c1014f84e3e3e192deb5e16e94bd46017e88bcb WHIRLPOOL 43aad37384d3d1b1112ebb7f1b0ae54f4186f878bbbecb474e19f69e534bcd31924bc7d09ba5adb265b81c51ab232014b7c18d5c5b433560d881481b1032c11e
diff --git a/dev-python/oslo-context/metadata.xml b/dev-python/oslo-context/metadata.xml
new file mode 100644
index 000000000000..b621cf95e226
--- /dev/null
+++ b/dev-python/oslo-context/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    The Oslo context library has helpers to maintain useful information about a request context. The request context is usually populated in the WSGI pipeline and used by various modules such as logging
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">oslo.context</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-context/oslo-context-2.12.2.ebuild b/dev-python/oslo-context/oslo-context-2.12.2.ebuild
new file mode 100644
index 000000000000..adbcca66fe82
--- /dev/null
+++ b/dev-python/oslo-context/oslo-context-2.12.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Helpers to maintain useful information about a request context"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.context"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/positional-1.1.1[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/oslo.context-${PV}"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+# This time half the doc files are missing; Do you want them?
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-context/oslo-context-2.17.0.ebuild b/dev-python/oslo-context/oslo-context-2.17.0.ebuild
new file mode 100644
index 000000000000..30395570fad4
--- /dev/null
+++ b/dev-python/oslo-context/oslo-context-2.17.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Helpers to maintain useful information about a request context"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.context"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/positional-1.1.1[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/oslo.context-${PV}"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+# This time half the doc files are missing; Do you want them?
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
new file mode 100644
index 000000000000..a4f0def972bb
--- /dev/null
+++ b/dev-python/oslo-db/Manifest
@@ -0,0 +1,7 @@
+DIST oslo.db-4.17.1.tar.gz 159919 SHA256 a38250c599b6d3e04f008251098eab1b7951e29d8e5ba1ff16fb3f1c55bceac9 SHA512 8bbe89feb56784b964778655cc9e12e57d20079ef520f68ca115168273ec86705b27c5551cd7707c6d64b8d87b742c6d7f80d9cce39141751cf77fb51cc9b1de WHIRLPOOL eebdcbe4974a915237bb237a0c484ac6433dedd54aa991ca140e0e802b26ff4a070619d04f2a97501ed59be0dbc3195dfc588f31716f43505e70141ed8b3a7c2
+DIST oslo.db-4.25.0.tar.gz 164879 SHA256 923ad7cde18ee36b11199fa8ac14eff7a6bf6cd02de37b888ac886a4d35b18d3 SHA512 ca027c748cdf5f1a7231b1a9817de449eb06b2002cd5c5cb4a9a70e3dec424caf76308dce2db33236f72ee253492e89ea2b4893e3c64df6306d23848257211ed WHIRLPOOL f5e81573c0b45fc8322549005ce9b9168b33da4fee1b68fbaaa2011b97cb0878f35f1a9c5d55049b795f5b750040dcd0ce04289bef278c0b4be7e8c5846b7d12
+EBUILD oslo-db-4.17.1.ebuild 1579 SHA256 8dd5f5d93087013586297a71964230b6e19bd9e1e8e9f21ef77ab4e0c8c938da SHA512 1124bc6f472023d6974dfc2898eca465d5f5f203e2c1d587e5388ee9f54a7c8a58b3142e86096ec4f8b223903ae6a62c623c4967be07982b8969cb3de0d86333 WHIRLPOOL 5f439b284043fccd3765b6ac8e7ea5b55a36b2a3dee121595fb6b90b752def0e361bc7eb12bcdd79755748707ee0dcbe45fd332ffc0f66897b2cf55bbcba06c7
+EBUILD oslo-db-4.25.0.ebuild 2094 SHA256 027908094df7a5026b2b3b323c293b54e74134be09901a25dced069cda59f153 SHA512 a178cb8805eac1a73fbf6e258d3861fedcba16a5207a875e0f840bdd3462845ffffcce482979af4730b508b0a8be3e4fe0c5f117eb1456ba612bc0d6f303d476 WHIRLPOOL b079d64eb5ea963f1baa67ad39a2048e7021a7bc680048afba20e4fd4b795652546cd4ed81186ad177674d863adf284c282eec6c0b88dd90574f83629011c1e5
+MISC ChangeLog 5418 SHA256 a8c0742e43c5aab4dcd21cc7302ed9ba645787e08f5f263e3512ad2fbd60036b SHA512 641d90f075ec8706d4bf8bb5e04cbff313b6f4ed60c4dea09f4c7f568b6a14f9f26b4dc3c79efebc8ab2391921ba08247a1aaec28f6b8e40fb84b25c1bc686c0 WHIRLPOOL 2029028b0d64f2795a245f781e1900d4b9c00da5eaee835589a929b94d4ea11ec6a7a277c1740b20aa282deba5ad729d6b5e893f63199899fe8e0bd7d746f21b
+MISC ChangeLog-2015 1749 SHA256 2017e63102ca8938f53a0b6e242c05cc0dcd080b20cf9932d1dc45fcc636cc32 SHA512 f106392ba0584be6fe262e3b4223ca399331e0accaf74a98cb3cf8e3ff005dff72f9f82b50277a70e9dfc9962de2917bee60ef8a1388a2bcff200d0505b83b96 WHIRLPOOL 0b565f5240ffd5aa04c5773e3f5ca6dc7242bcbc7d81118724a8feabfc7678312dec099bcb99efcc535a23b3e7db5aa29269e5561a8cb519fb8960189eed5977
+MISC metadata.xml 553 SHA256 ad927dfe8b2030d9866f91be0db3288c6a78db80600e0bf0e0b027e735af90d3 SHA512 381c6771ca698c6d8958ecee9805e079e0194d35ad55d0ce3543428026229450689ae681e80b33cffab498537a8874b0236aad996e843ecc00d39e943ff0f7dd WHIRLPOOL 81098891b12d8d655aa514181a0b3102770422a0c60dd1b8da44cd948005e8c547c3afa427a9c8e3e326243a22bc0a8e60a6faeb22f7ac436c804a187c515876
diff --git a/dev-python/oslo-db/metadata.xml b/dev-python/oslo-db/metadata.xml
new file mode 100644
index 000000000000..de3f3bb3dae2
--- /dev/null
+++ b/dev-python/oslo-db/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+	OpenStack Common DB Code
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">oslo.db</remote-id>
+		<remote-id type="launchpad">oslo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-db/oslo-db-4.17.1.ebuild b/dev-python/oslo-db/oslo-db-4.17.1.ebuild
new file mode 100644
index 000000000000..aeecb3c574e4
--- /dev/null
+++ b/dev-python/oslo-db/oslo-db-4.17.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5)
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Common DB Code"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
+S="${WORKDIR}/oslo.db-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="+sqlite mysql postgres"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	sqlite? (
+		|| (
+			>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+			<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+		)
+	)
+	mysql? (
+		dev-python/mysql-python
+		|| (
+			>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+			<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+		)
+	)
+	postgres? (
+		dev-python/psycopg:2
+		|| (
+			>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+			<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+		)
+	)
+	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/oslo-db/oslo-db-4.25.0.ebuild b/dev-python/oslo-db/oslo-db-4.25.0.ebuild
new file mode 100644
index 000000000000..baf4e552024a
--- /dev/null
+++ b/dev-python/oslo-db/oslo-db-4.25.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5)
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Common DB Code"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
+S="${WORKDIR}/oslo.db-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="+sqlite mysql postgres"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
new file mode 100644
index 000000000000..979d0810d581
--- /dev/null
+++ b/dev-python/oslo-i18n/Manifest
@@ -0,0 +1,11 @@
+DIST oslo-i18n-3.12.0.tar.gz 40514 SHA256 6add28cbbe8254838f7f131de0cf0f3761786d57e5fe5716a488260b725f58d3 SHA512 a19cfec1acb1461d6373ffe5c13c275ce50c4e817e613c3cccd56b90955d99088162089753fba3b3185ee44598013e965c030d011e56140f95958dc9bfec4b61 WHIRLPOOL 64aefcf366b18db65f54b9277c6946ef013e02f49ebae6c8066227324ed807e644a14c17fccd6b5359d6e7fbf49f4e29e2c6fdfeacc8eeac98c79b5816e6ba74
+DIST oslo-i18n-3.17.0.tar.gz 42858 SHA256 168b8c06f03599ac8172eb87112b5054e46bf421db03c367c059e3110d98ad31 SHA512 22d4fb92f94b0d69f719764219fe1234a42feec8d3eb72c9098cd8451a9e26778c209eb3a5ebb1b0f6e793304b8fc48d38578b598f24bc31a43e9468eb44fac4 WHIRLPOOL efd91876ea705c60f71d2f8abe7bc0b06d322b7ef420b6e87e9224afd3d659c57dcc273ba116533d1c2f6720edd3a0a1363daf1df7a27a4c9b543147dc3b10fe
+DIST oslo-i18n-3.5.0.tar.gz 36093 SHA256 5fff5f6ceabed9d09b18d83e049864c29eff038efbbe67e03fe68c49cc189f10 SHA512 156b28fa1db65a57a8db2744d72cb5db2706ec773746e676895121c0d6459f4806d826b76428841ee7124c27eba281095fa50d64cbb68f82133c41560ea15950 WHIRLPOOL 8d599b0e989c650d305c0f2ad85596971e6b0e3c5a8f8daa00ba76b9fdc8cdf5486a346343123247efc8dbaf4d7825a62b5340a957c7e7881c2483ea051e90e1
+DIST oslo-i18n-3.9.0.tar.gz 35973 SHA256 0bcb8108cf38b9ad4feb1ee08d27e34dc358f80dc7a7fe9a5b942ebf3b07c0b5 SHA512 7c176b8ac3ef0b52b2a08a7779c59b01fd32e084b99562eb232f9894ba4c9ae0bd810721fcf6fedf8729e3fdbfebce8b6210698aa0ae9e003855c8f2d66f2b0a WHIRLPOOL 34781968918cf6e7114301f7122f9d8f516be9f2db89798e64ad4589eb78f9b4a11e0f30b034b697734cfa3508cd997f13e8afe4b4abbc970d1705b42b060842
+EBUILD oslo-i18n-3.12.0.ebuild 1599 SHA256 468b17fa09a8f8d9b1587c7fead7a2a5af71ca4baab40aa9b47039bedaf0c965 SHA512 7cc2860dc5119333860b5e80c5159b0f070f886cc868c5f734633db8e627654cee9296b773aab54eea5d6f90d81c9799bd3f900cb135ea94a0ded3968eed5818 WHIRLPOOL 2df2609406d6b9dec008c6182147e7c6382b85681ce0f06180ecec515403ee334f3c3a98ec4a11fba47fba7dd9042b1148cb75ea31fe13aebaacd9fdfa5fb239
+EBUILD oslo-i18n-3.17.0.ebuild 1944 SHA256 8a923b600af069ee29bde643392112634739ca277f8236f35438289a9ad93c82 SHA512 f6be59c97901119f6c9e53adc16249b3b151ee9778be33b2555f350521187039a6baf3633460e1eae848e8db3f41478bb29f3e6ec8d2e71f2e9ed58b8ce3edf2 WHIRLPOOL 4f3577177f5c82cdef7b4fc026e85a54048b896319715b92079f76b8dc2bc8a93227b79dfd9ed068cd74a56555f0deb323190da1d96b46c80532617c01e8aad9
+EBUILD oslo-i18n-3.5.0.ebuild 1525 SHA256 3174ca952b129457542e609114b9fbf4260c11b96a181404e775b89d471a73d9 SHA512 4786e2cec38727f051234d7ff6ea21b7d889ed29ac56df411b82382f54ee67097a5ffbd7db3890766d54f65332fe2676e4c889cb2a000eab31e310bf0ab51888 WHIRLPOOL d5435681dab0bff16d5ac53ce6640cd5113baa910a38f0f0a47c3621937998c0fbcffba4c0ab47ed0c47ffc40e34fb93e496354210fafe505a935216fa2dbe5f
+EBUILD oslo-i18n-3.9.0.ebuild 1536 SHA256 436e5cea6aa3990e8426769c4597b5c1d3a6b819b8f0ec01e09b12adce5fd8cc SHA512 6556de69537c3448854ff5c200eab75767d6356cc7c6bc0758ea610bf6644757c98927aa76f0356cfa408f342ff5915d009279c36ef9ac7a6a6d20fc9cf44e76 WHIRLPOOL c84467a9b96da0f1d14a9e306fb9be4625023a61f506c72b6afc3121f40fbb8aa032d3e9b02d3bd6386ef7bf3cda508cb4d8a533b0fce932fa6f4a5e27aa3382
+MISC ChangeLog 5947 SHA256 09cdcc02b711e6302d7f53e0f5ee8013332f5ae8a899f16cb074cf50e3f41b2a SHA512 c0de53706d663362eb04b6efdbd789a397d4801cca14491c03d0635712650a810e236cdd73288217a05ebbe4bdb9423b7471052206ed861db5cec4e24a97139b WHIRLPOOL a2144af3e1b41a18bfb9c744cadf5939380cb283888679838f816b3b4464f72f625c951da547671b2a98c17566d69f64f7f8d66a1b830db84f8be57beda4027d
+MISC ChangeLog-2015 1723 SHA256 66422a6ee309ab228639d48b5e530765c11bd72dd573b77eff68b831b822d4e1 SHA512 f0707127f3e27723df0b9d2d4efa0c7bf67b1c7e4c7e9de7ef2165e561af675fe240a94125c7876780c388a4eb32e7516cb46718fbd89efb1bfae6de0960baba WHIRLPOOL c5b15e9c22ccda2851eaccdc6c0aae3934b8ffa5ac277a5b7f1d711ca98fdc52e729de3ebf8997e89297c10fec720680da6a595038950a4f3d3f4f64d9405f3c
+MISC metadata.xml 472 SHA256 ad23959ddef7ae03cd52635cb99937fc1d0a5e7da772e3edf71311cf2981f60b SHA512 cd798ff83761c7409f07974012b11443e52cff35588e610d0d047438834198e9a3e35c69a6f6e1f724e8b7a118dd4cc4eb8df38e6017caa22bc061d697c0e97f WHIRLPOOL b33429d420487489fb5bf982c16ab5db3d81908b09283ef21e5db10bcfca188c6f39dd7a97691828f9501b59b33303623f7131b253958d0e2730216ccdc8743f
diff --git a/dev-python/oslo-i18n/metadata.xml b/dev-python/oslo-i18n/metadata.xml
new file mode 100644
index 000000000000..1e70b0b824b8
--- /dev/null
+++ b/dev-python/oslo-i18n/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">oslo.i18n</remote-id>
+		<remote-id type="launchpad">oslo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-i18n/oslo-i18n-3.12.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-3.12.0.ebuild
new file mode 100644
index 000000000000..0cf87b88975e
--- /dev/null
+++ b/dev-python/oslo-i18n/oslo-i18n-3.12.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo i18n library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-i18n/oslo-i18n-3.17.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-3.17.0.ebuild
new file mode 100644
index 000000000000..2e776044c947
--- /dev/null
+++ b/dev-python/oslo-i18n/oslo-i18n-3.17.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo i18n library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-i18n/oslo-i18n-3.5.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-3.5.0.ebuild
new file mode 100644
index 000000000000..aa819d57a44f
--- /dev/null
+++ b/dev-python/oslo-i18n/oslo-i18n-3.5.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo i18n library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+CDEPEND=">dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]"
+CRDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CRDEPEND}
+	test? (
+		${CDEPEND}
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		${CDEPEND}
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CRDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-i18n/oslo-i18n-3.9.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-3.9.0.ebuild
new file mode 100644
index 000000000000..1e02c9edcd96
--- /dev/null
+++ b/dev-python/oslo-i18n/oslo-i18n-3.9.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo i18n library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+CDEPEND=">dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]"
+CRDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CRDEPEND}
+	test? (
+		${CDEPEND}
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		${CDEPEND}
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CRDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
new file mode 100644
index 000000000000..bb9c2dbd0d59
--- /dev/null
+++ b/dev-python/oslo-log/Manifest
@@ -0,0 +1,7 @@
+DIST oslo.log-3.20.1.tar.gz 69615 SHA256 7d2bf72548f7f9bc94649b49fda642e057b35fd00790080c4e04b941e20aff2d SHA512 9f802251177a8a822f5944729ac226e226cf7dbe94b9d5b4e5eedb7c64f6968a35810cc288b774085f16f77eaffabf752636bc51c52d50e87cc2840b76076f13 WHIRLPOOL 1bb65964b5b9d80889825e24b87cd817b7c13ffecc349b3407c778c064d297be838862f554cfafc16c2dd2d98be6fd9f16eda2a13594e332662328e37d842e53
+DIST oslo.log-3.30.0.tar.gz 78044 SHA256 efcb51449f481891f792389fb23d53d84199a1c4f36c2e0602ec466dd5543de2 SHA512 bdfd1ea1e8995b986c252680c26fd7be31ad820532f84fab893758782321be326ce32d063f1e413aaa4609f84fa15de18a0b460bb7c90954567f7a386ef9ff20 WHIRLPOOL fb3a07ecd0da119901ad5e08a8d3fc9e398e3412c5104bcac9b17a706892a2df2e9c14f52c0d940498a34a4ef4cc52711e6798af55ea9c1b1e2f884ae0474f5c
+EBUILD oslo-log-3.20.1.ebuild 1954 SHA256 8eff47fff9bb135d07ef81ddeb975a2af3f9f01d25cd13747c659a0a58eaa256 SHA512 0f4ef9b2b23af2273b2d47fc54a77c6eb058c1adbac7f8f231afeba187898d1a34ea29d79dd271932f50e45ae506eac8a039b41a41f38098a11de4c80907f8f1 WHIRLPOOL e7058b20882eb617f709cff0bf6d1c9a9768b447e3b13f1de98fc6e4a6e59ae7d39829942d286030f0c9eb49d1d537954feb84175e859a99819b7c5f02b195d2
+EBUILD oslo-log-3.30.0.ebuild 2209 SHA256 d6862aa063f0b2ca624245de24a1372f8307538207fb407a381e3a02c188a1cc SHA512 48c0e92c51f7cfad8a7c5218b7a75d9f4ce9c9854bd5653dbac85f722aa190069c51077f02f8a1671b0e81a4ef33da6ba1c82d10349f1222f32cda5f206aa462 WHIRLPOOL ac426d9d4df0ebbd89cb442c40764e4a3bfaa0b6dcce2187c545d90b2cda09cceb2f7341d560be3a73ea0606a0d5ec1e0880a5345036ef50f56bde62a2f09460
+MISC ChangeLog 5378 SHA256 39e554e96139e584771f04cdd9ad59e261b9bf7c74a540da384b07fb793e31da SHA512 4c93922032951d85111496f42b5103710bcbc47b5bc5388078687cfa6d03ee679157bdbf624b878ebfd55ef5af80e7c040ba73bd5721fb172364c917e4646bc2 WHIRLPOOL ac9e6ae13a2a9afc207d84fe444d66875c992b569cd18ce7f6f28bf2d62662136f5935dc628447f2f5aae9ff73bda0df7523b5b02fa0b7ceef003196c5426c4f
+MISC ChangeLog-2015 1123 SHA256 96cb63a681df71489afea0edd31172297b6215869887b36017cfc22586fb4601 SHA512 e3201be5a507405a9b515ab376dc5991bce6ddadbd36a710c39f0df40e3561ccd3143a5e5e86c019b0e6d1132f298e70a0b4885ea929273f4c4e2d385357661f WHIRLPOOL a31b07eab1a0fadec55f4b608a6c1eeb02288503e47cf6776cbf6ec8fcd527757f6d82d6d275fbfe8fdc000f30b98d00072390895fd7a4f7d298882991356bb1
+MISC metadata.xml 882 SHA256 823772519ada2158554e4b6fd99658af77ffd91a2aba89287786cbafd1f47627 SHA512 89df6a639f1b44eccb4409c95237f3b4841312b74e74d315a169b7c6faa8a457507b7c085ebbef56b8e399cf37b27ff02474491a128880e919866a6da01a084e WHIRLPOOL 7cc3163deec28d68c7c98b041696c8c676b9399baf0390b210c2bcb3dca522098b75939fe36f6804433c2dd095d0eac86b6abd2f083105ed8c806543a42ee120
diff --git a/dev-python/oslo-log/metadata.xml b/dev-python/oslo-log/metadata.xml
new file mode 100644
index 000000000000..e7a9ec1dea2b
--- /dev/null
+++ b/dev-python/oslo-log/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+OpenStack logging configuration library provides standardized configuration for all openstack projects.
+It also provides custom formatters, handlers and support for context specific logging (like resource id’s etc).
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">oslo.log</remote-id>
+    <remote-id type="github">openstack/oslo.log</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-log/oslo-log-3.20.1.ebuild b/dev-python/oslo-log/oslo-log-3.20.1.ebuild
new file mode 100644
index 000000000000..fc0db9e7e301
--- /dev/null
+++ b/dev-python/oslo-log/oslo-log-3.20.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
+HOMEPAGE="https://pypi.python.org/pypi/oslo.log https://github.com/openstack/oslo.log"
+SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
+S="${WORKDIR}/oslo.log-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? ( ${RDEPEND}
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/oslo-log/oslo-log-3.30.0.ebuild b/dev-python/oslo-log/oslo-log-3.30.0.ebuild
new file mode 100644
index 000000000000..41ea105dace5
--- /dev/null
+++ b/dev-python/oslo-log/oslo-log-3.30.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
+HOMEPAGE="https://pypi.python.org/pypi/oslo.log https://github.com/openstack/oslo.log"
+SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
+S="${WORKDIR}/oslo.log-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? ( ${RDEPEND}
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
new file mode 100644
index 000000000000..ea5e10b979c9
--- /dev/null
+++ b/dev-python/oslo-messaging/Manifest
@@ -0,0 +1,7 @@
+DIST oslo.messaging-5.17.2.tar.gz 306066 SHA256 42505cf4762c26cc9c454cea288281cbdb499ff61fdca1b51a3d197682cefb06 SHA512 90f60b4813eabf41d03759e12d7a1cbce334169606fac7ab657c3002e01624946cf492d7a1e5984a4d642f64764691da1799eb6ef4e2ce37196651bafc750760 WHIRLPOOL 0b98adaf307240a7419b09077d76c4b7011f99fe87080a2c8be67a9f4bc4d45c00d1bad848e8a09cffb89d016c4a001572da50c4bf65c1a2907f1678a28271ec
+DIST oslo.messaging-5.30.1.tar.gz 316794 SHA256 f7baaab1972de3ef8f552f428c8c001025589436f7ef884f5acee617a243a188 SHA512 e59a17a76963681cd96ef63a5f946ad2e4126f80a7fbdb0d1bc48597ad889862c72450fe526b46d3712eaf92b489e1c0020096e825654c7554c382282923b526 WHIRLPOOL 10029677c1f176f64843cd60d67e077e57b958f09a3543047e5fff66417672da70e9070dadb88a73b3feb8b0043df21aacbc24885df26ef39969c7e1534c0458
+EBUILD oslo-messaging-5.17.2.ebuild 1996 SHA256 937a269c1724f9ff792e5ac807d8b6f46db9ff93528efd74a0e2ba9cd1f31509 SHA512 c79f75f4cbcf3f0bb065d9a5f7b3ae2ee8371a01e86d4f958e95e86c5a5c9411f8dc1b14158449129352d3d85f434ecb0442e37eafc0a96e5d33abcd417f3adc WHIRLPOOL 752d67d229c72f5fc2b654247fdb82e3012861bd3e632964278bd5e2ea6a4a6af5649c7a95a2032836fa198bb999118a8104cd1cd74d14610e49f0214d60c987
+EBUILD oslo-messaging-5.30.1.ebuild 2145 SHA256 3c0db94183cf4a10ff337e9e684f9aa828f60d2be64f101b0e5ca81a9949afdc SHA512 83b8c7a8adb6ef7e670a55b0d23c7b19cd9bac290bd2387363a61e8f6b357a92703df8c41d1c51432e0ae8f003a67456d9b45e3b59f54f8cd9c83e48337df035 WHIRLPOOL 1c87d26ca6487460462f09ce0b8954ca1da078a4671a9d40476b8542511a9ac610979f84bd8ccce4749aa825ec4da7326f1a97cde9705d75819be29c2afaad0a
+MISC ChangeLog 6308 SHA256 176ba6787d5a9df0ce7462cff757684eb855021cf5d7511446dc335b339d283a SHA512 1ac1fba7b51e138db454db98cdbf397e0e5fe4e6764fbf14e69046871e54d479704f4952c68ad39488f6c0839a36df6b372377e2ee9581d68db305cd9bf5ba2b WHIRLPOOL 9807d32abd14f21dbe5e19b2c73dac1dae6479f544efe61762b6748b1f70a90230eb0411294c597c0609c2957317ff037776abb1608d09d7b206cb29420aee87
+MISC ChangeLog-2015 2612 SHA256 2aca8b8b9d8b40c9bb83c0a2dbc06ccd322351eb07550290b6a1146dcde10cb1 SHA512 00c9ea11198e4fbc3b5564e22b77bda1a7bb0e953c444715dc3fef4ac600c1c35bc907766a1bb0e83c0c727ed1a6ecd10f7f5959a1f3b95562d5194031a0eef8 WHIRLPOOL 477ec84d0090f699e200af6026c95a229be5f51d5931099f88b5806ca3b867f70ea0277b45a2497cdaaee457eef1e2530c1e2c7580bea12d9e67c62b0d04993b
+MISC metadata.xml 606 SHA256 45946b4ef70640b3b634eaa6e125715bf86956dbe7284add4e82b64e14ed8c8d SHA512 c59bfd0c40ee7623a4194afa2848759b968c81955986f5b6a692d9ec59cbf11a14734466383da626535f9fb795193ba4994f8e57ff6c6cb732a9748abdccfd35 WHIRLPOOL fc42f519552d247e243391528cea5e763cf652788b0c91af9242cab9bd801781c9a2e7c94b6aa1b2327b37ee7ec863fecd3ac0bd581dbc81baae7f9781ac8999
diff --git a/dev-python/oslo-messaging/metadata.xml b/dev-python/oslo-messaging/metadata.xml
new file mode 100644
index 000000000000..5256a24f8b45
--- /dev/null
+++ b/dev-python/oslo-messaging/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    The Oslo messaging API supports RPC and notifications over a number of different messaging transports.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">oslo.messaging</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.17.2.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.17.2.ebuild
new file mode 100644
index 000000000000..af009c4eb33e
--- /dev/null
+++ b/dev-python/oslo-messaging/oslo-messaging-5.17.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
+S="${WORKDIR}/oslo.messaging-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/py-amqp-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/py-amqp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/kombu-3.0.25[${PYTHON_USEDEP}]
+	!~dev-python/kombu-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pika-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/pika-pool-0.1.3[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.30.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.30.1.ebuild
new file mode 100644
index 000000000000..66dab2f8da61
--- /dev/null
+++ b/dev-python/oslo-messaging/oslo-messaging-5.30.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
+S="${WORKDIR}/oslo.messaging-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/py-amqp-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/py-amqp-2.1.4[${PYTHON_USEDEP}]
+	>=dev-python/kombu-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/kombu-4.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pika-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/pika-pool-0.1.3[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-middleware/Manifest b/dev-python/oslo-middleware/Manifest
new file mode 100644
index 000000000000..bf81e5ed2dc9
--- /dev/null
+++ b/dev-python/oslo-middleware/Manifest
@@ -0,0 +1,9 @@
+DIST oslo.middleware-3.23.2.tar.gz 51645 SHA256 53363b5d92ac23378cfd872720f9dada29afb267c8b303d8910c3f5b6cb208a9 SHA512 0fbf97b3fd5ae69c72f42755cdfdba7dc70570763299cbdbf836b5ad0a70c692cb1249397ed6e6f9d843223f656e5814adcc80e19d283984851216ea7395de83 WHIRLPOOL ecb736218e0c571a2aa6e1f8d2ca5a088496bd06fbb54ff60f2e392fb0fd153b46dc46448136ae34b86276730d1edbcf24453cbc462aa23659e440116de730c6
+DIST oslo.middleware-3.23.3.tar.gz 51949 SHA256 118d7bd056ace85bab1d441df738d1b941658cb122d6c7c49c07c709e1326080 SHA512 f539eb3557399918d069b83b57072cbeec97071e9142d27f21a3fec258885d5a0927722c633d098494a37155600769e1d3832b79c5c8e7526168ea51efe741fc WHIRLPOOL 6a5ee4eb41200f01c716c16d5e3c23e3e4082fa9accd49fb36dbf4b60c828dc17a85c04fb65bde272c00811d09ce0b825ed538c04c8150dba352e707625449f2
+DIST oslo.middleware-3.30.1.tar.gz 56811 SHA256 fd7aec1d4d7a79169e8a99db99fe34c05add26f82d020da10a595fd9db39e207 SHA512 ec70d1a5e932c8da7bc4febce8be6b63ec8fb581e2b30051ab655a2a98689467d8e824d073cd19c8dd320d02a975ce22845ca5ea73f1c4e3b5ac9f725452a9db WHIRLPOOL 9b0ed03eb6ec7c3c269c9f22882e25b6de5649d2cd3cfae138187d6a7d8bbb3a4e526dfacb2a386d5bba52e85dd7821fe86d1428beee3303a3346761cffb4081
+EBUILD oslo-middleware-3.23.2.ebuild 2017 SHA256 14fbda80d800722e377a6cec4c22580b518166856688ae3d50ca865bbacbfbb4 SHA512 787517a41afe7a9cbc7dbd05bc94676c228d450d169dd2fa5c07cb99b7fd8479c85c2466d5fbac66d9e86c1362ad3131b017e3316361d4913601fd35937e3d9a WHIRLPOOL f0d039ebf67990025e53a14262b4e7fd99f99d3bf4c9693b4d86ecdd5fe8fa5ed6fb6f7c5ae13924827e1fbf9c2383ed974e7ebd64fffb73a6956a440433415a
+EBUILD oslo-middleware-3.23.3.ebuild 2019 SHA256 597cbc7ad053246b3b32f518fd2a8ed609b919fdd93149a4a88270753638abfa SHA512 7aa9cddbfb46f17fbe49b58db3c744932e372c9a85299a797ceeeaef32f0fccd890a6fbd9e4862252f580b8671c82e4a1921f937b878997b210f3138098441d6 WHIRLPOOL a33cffee7b04c746eb6f75a75e244677946843ce77ab3f12188d9f40597a23b8311bf57c17baa13fb80b28f216b86d2af2e81c75e41457150140bd18bdcfc005
+EBUILD oslo-middleware-3.30.1.ebuild 2265 SHA256 ee6ae37a6856cd385eedb503848e19b250930a8e13d77a95137954be598d3ba3 SHA512 d1809bdc071a0187b4177b3088605b3a7ca66c8b50c23dc0a4ff3eb5bca33b7e374b65e2d660ae99d9088597c4c397815ca484e356c0ae7947f787c2667d035a WHIRLPOOL 9ac00cdf1d8dbc731369ad9f0c26b5a2946fbab7bc85a5cc6d9db7c1f5cc958121f81ba1711aeb2fc5a429b2d088e881df26a6e1189ab9f1e7bb60d2f4ed22e2
+MISC ChangeLog 5238 SHA256 a886586662f344dabb25acd5b22e733556eeb6908f3dd1ac810c2ccd3af29326 SHA512 ca45e1aae30d41462150fa092588e25e6d49192ac6dfbeb480d40947f791cc7d773b0e8a6eb9497e10023ead9e98502c0f11f7a1b84b4b33905d836c0cc2e709 WHIRLPOOL c5d92a563b6844175a4198306ac613306c575b0e9bfee3c9cc54400e5ed877c3b113ea0439d53f03258b29f1f8d684fe3fbdcc28fb509ebda270f4b0566e306d
+MISC ChangeLog-2015 1532 SHA256 821854b55a4b7ceaf11b9f234b0066f1ecdc109d12bd77b0794b22015bd08d3a SHA512 6ebd7f88a04e1c3173181fc8c3aac5a9f773ecff566bc5446d343c3a31159d981af93b0901e10016bd504408b34eb8784f8d8fbee0f1105033247de56d02de16 WHIRLPOOL bb409aa8a01167ddf8440dca4429545711969135158b318a4576b92a5ad66a95620cc7e8b7e7364226b2fb568ad0697f769f289e808ea49104c9fbb4cdf65fcc
+MISC metadata.xml 766 SHA256 a759840d5508d22d2532d557f08b44c0aba0e90a7ad4bd4421eb5671f56cc0e0 SHA512 38381c4dd993470e01cb5d469f345880a730b9afb3536b467a6e86243174192db346dfad58282e17d1bc0bcfb33e08b0f1797577e938c982e633cec8719d468e WHIRLPOOL a3aff00d18023d2bf613da5be7d959e974ab148ed3f755c0104e4f2655f1be1c8c7351161c3bf98e8ede0fd4abaca44608df3f5ec37f320211a9e8f32fdee9a5
diff --git a/dev-python/oslo-middleware/metadata.xml b/dev-python/oslo-middleware/metadata.xml
new file mode 100644
index 000000000000..b21409de89ab
--- /dev/null
+++ b/dev-python/oslo-middleware/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Oslo middleware library includes components that can be injected into wsgi pipelines to intercept request/response flows. The base class can be enhanced with functionality like add/delete/modification of http headers and support for limiting size/connection etc
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">oslo.middleware</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.23.2.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.23.2.ebuild
new file mode 100644
index 000000000000..67e9cbafb5fc
--- /dev/null
+++ b/dev-python/oslo-middleware/oslo-middleware-3.23.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Components injected into wsgi pipelines to intercept request/response flows."
+HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
+S="${WORKDIR}/oslo.middleware-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/statsd-3.2.1[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.23.3.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.23.3.ebuild
new file mode 100644
index 000000000000..9b958c92ba1e
--- /dev/null
+++ b/dev-python/oslo-middleware/oslo-middleware-3.23.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Components injected into wsgi pipelines to intercept request/response flows."
+HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
+S="${WORKDIR}/oslo.middleware-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/statsd-3.2.1[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.30.1.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.30.1.ebuild
new file mode 100644
index 000000000000..b3d9785d756e
--- /dev/null
+++ b/dev-python/oslo-middleware/oslo-middleware-3.30.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Components injected into wsgi pipelines to intercept request/response flows."
+HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
+S="${WORKDIR}/oslo.middleware-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/statsd-3.2.1[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-policy/Manifest b/dev-python/oslo-policy/Manifest
new file mode 100644
index 000000000000..33ab2d0f0144
--- /dev/null
+++ b/dev-python/oslo-policy/Manifest
@@ -0,0 +1,7 @@
+DIST oslo.policy-1.18.0.tar.gz 64504 SHA256 414e9a63b1976ad90b2c5ad0897f74bc269c3f5ce0c6c21448d23c4797cc76ff SHA512 e7d92d420a54da82988aaa481dc889fba1c954097895fa62fd232f2d129c9050541b6d2f63e59718420ee8b5a35039be4deb46a184fb1a1107b7239a58a299b8 WHIRLPOOL 797f287a57bfd957feb9f0d3845d790bdd73ac1e87ee774fb497286ce0c93aa9af442c0fe93c26afd80583570a6336dffad554c1e4e867acfbde4a3c3c78f2e1
+DIST oslo.policy-1.25.1.tar.gz 73148 SHA256 29a2998bf21b4b74c8b744b69d6afe6f90ff3302a96ba35085024d0494c8f5b0 SHA512 fe320d3b745d1d0499e0ecdea6a6c148982ac7ea9da165474a01b992d6998913e9207d75ace0a387866d7ef8e9ee7d0737f16355ae2425b42b545c656d138d6a WHIRLPOOL 0211191eb46e743df41245294aa7e6210184e60521399dfef7742e0b0572a55f79c1551ab4142c1c9d855df774d8b5e5e688df7c6f8d0f353318cdc7b136cfbb
+EBUILD oslo-policy-1.18.0.ebuild 1186 SHA256 b25a6f3014b152f64519de4a93d3272ebf0fb5dc5ff2e6a6a8b211d7a774eb1f SHA512 2ef2cd9be315146b714b8b36dbc4a377c73f6c4577650bf53cd718bbe34f625b10c01b882cd5a827c35ea5fdb7daa1548c9bd0450f39ddcac14264a2428d9533 WHIRLPOOL 53ba851a48877f53322fc5f410ec1ac4871f98b8259015d0a06ac77cfae9bad4575e695986418ebce22bc41afb5fe132dea4f9fa30d6973da21825be45540149
+EBUILD oslo-policy-1.25.1.ebuild 1322 SHA256 738c216ba93385062ad437796df2f9ecd2e1efbbdba98ef938efb528d8ebced7 SHA512 1e661429bb1e19c495a7f8b945e5762abc69b0293205761a5f4919749af44f5c3d32654ceb6ad31558dc8161ca1b17309130f98c737e91c71e86e889c8d30756 WHIRLPOOL 51fad114839107a9788cb9040fb8ca61d690e838b83550f8704ee955cb37bca68938752ad40a62d75d72158ed2e554d6a500a7823235dc5c5875aa5d45f773d0
+MISC ChangeLog 4712 SHA256 eeb5dd2b86f28ef21b1e0a50abb8c5cf1aef1219100421e9e9af76640bb7d3d1 SHA512 7a30445a4412132606f96a53540136e598346d662f7d36326eddd4d14840143bf1a92a25bf5878c3f26f6dd41eda64902984a85e0bb7d06a4f63b52dc758038a WHIRLPOOL 4c414530b1f19ded8cdb75522fed46bb1ecc9b85aac24b14a6e6b45fe314b6c68f45718864ae792fa0e56e3fc92d71379429a5f2512541230bece6045371f322
+MISC ChangeLog-2015 685 SHA256 f28c0bc90fd1a47837eebe3b07c4d4168d7fc6d429ef053318de89747affdb55 SHA512 51f9c1cbdd3ae9da1b466316bfc8715be9054cf55998f6221b3f19bae6b542c638e06276b9d6e40c1b30c8ae876eafa05ac72ea11a784c6d6c676706f98d8f77 WHIRLPOOL 18f395817de712334f772e79d130a99413da6737bcea22360800aeef2d5a5400aa81aea5b7c6c82fab3b25ed1140ce0380bc35c0d96f9bdbb7882e876e1614d5
+MISC metadata.xml 600 SHA256 c50f3a572168c02dc828353203e289dd3da2df4508ec92475859c48afe18ebf6 SHA512 82a8956e15cd74342d77c66c47b96a5b35c9ccf7871f4f4c4c27970737f69abda5664dba601e98bd9df0bd958d2450462eda4c7477d5dd10af7b7bb11c7f4bbe WHIRLPOOL c94509f80829c13258f9ef9f3edc422e33cdb134c7493e7ed862206308279b40fdd4111b0e5ceaf4186a12dd13bccf8f1902b943ae621c0e5a66151356f668b8
diff --git a/dev-python/oslo-policy/metadata.xml b/dev-python/oslo-policy/metadata.xml
new file mode 100644
index 000000000000..6efb29a58d08
--- /dev/null
+++ b/dev-python/oslo-policy/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    The Oslo Policy library provides support for RBAC policy enforcement across all OpenStack services.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">oslo.policy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-policy/oslo-policy-1.18.0.ebuild b/dev-python/oslo-policy/oslo-policy-1.18.0.ebuild
new file mode 100644
index 000000000000..a2986e4f27e8
--- /dev/null
+++ b/dev-python/oslo-policy/oslo-policy-1.18.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5)
+
+inherit distutils-r1
+
+DESCRIPTION="Provides support for RBAC policy enforcement across all OpenStack services."
+HOMEPAGE="https://pypi.python.org/pypi/oslo.policy"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
+S="${WORKDIR}/oslo.policy-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-policy/oslo-policy-1.25.1.ebuild b/dev-python/oslo-policy/oslo-policy-1.25.1.ebuild
new file mode 100644
index 000000000000..eeb8d81e1a5e
--- /dev/null
+++ b/dev-python/oslo-policy/oslo-policy-1.25.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Support for RBAC policy enforcement across all OpenStack services"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.policy"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/oslo.policy-${PV}"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-privsep/Manifest b/dev-python/oslo-privsep/Manifest
new file mode 100644
index 000000000000..d3126ed31e7b
--- /dev/null
+++ b/dev-python/oslo-privsep/Manifest
@@ -0,0 +1,6 @@
+DIST oslo.privsep-1.16.0.tar.gz 30448 SHA256 bffc4ea46cf6e19c84dbc16f3b1fc7a78fae2480c7609bc97e054a88af7d6773 SHA512 223cb4a32a9a8545833621c7a6e3a9ab5acf84a188f2a6f45df4311e02ec64cef8d7150ddde89ca3c207f5aee599ed655b1f9a5fbdec7f55605d4d3aa251edd5 WHIRLPOOL d6666f7326d83dd64e418b433c0064bbf239c77a09aaaf378e6188f75d5d9ed75114f3eb285c203f1cf816bbe1c7e21f631b74ecbea033a196e7581169c2afca
+DIST oslo.privsep-1.22.0.tar.gz 33179 SHA256 cf088141fd2067afd9549b05adc9744287768d03da4879afafe8cb71253a2029 SHA512 ba4bb9b4fae1dae029a72f1216c23eb7c3ec0d9376c6c1b6ac864b56d3a942e4774ef95830f451c6d2c11cac5089bbca3c7c1cc47f7efd9dc5be58a3bcdf76e5 WHIRLPOOL 4754e89c59f99aca7897cb16076bd49c8cda5f78c761a719dbcb85fda7e3e968650437ea1c6cc9a869a2e2774f4d5b82999bd66181e217302c1f93d987031b64
+EBUILD oslo-privsep-1.16.0.ebuild 1569 SHA256 df0ad66a809ad80fae084d96b1d3b6983e9c70479ebfb288024e3ebdc20b8d49 SHA512 74b826948de43144eb62e8221a2e15ce37f10a436975faaa287d8d16d6d28d570467256c7202ac7965f622011c9b593879e09f9c1d0898cce4b400fc333f11d8 WHIRLPOOL 9c5827e2ae43e22aa379731eb5ddccc94cc491876987748a7d205fc41b9d40827ec52d8287b30ec11ebaf91b40698dbb967059d9930c1ae95de289edfea0fbd0
+EBUILD oslo-privsep-1.22.0.ebuild 1794 SHA256 142c43e0b518e35715e1510efe4ad55033038cf148d53d76776ebb377c1e1108 SHA512 e46645b4149348dc6fe59c11e6fea184e4e3f51ad3e4634bef267591184da60f8ad35965f381ed578ca7328509445ac151e573b49dee6d918e4804b9e7f470c4 WHIRLPOOL 5c3f24ea18f893bfb3039bb5bd55db8bc355b7781279d7413dcebca3c19083feaf88a8015debf3e19e725093da5c9d96b59c4befa3c28979a8574342eb0f89a5
+MISC ChangeLog 652 SHA256 b6a6dac99ce5ed6de5ceecd383ea921f9b4ae589979439cbb430fb8411e32cef SHA512 f5f6ec998b047119a70e6211ea51f50488db5a05d0abb897d9e53ab8b3d428cd7fe9381e105f5836c559cb2dc46a6c2063c2f7d5ec77ef076b5cd4f04bb7dd60 WHIRLPOOL b913bff4d7c53225505fc55a99aa9f30690a5d4d269ca9f310c285da44445fd6e520dc620bda157ea22de42ba5685609a38ba664a3fac2499036189d5d51251a
+MISC metadata.xml 544 SHA256 ebbdb6740d0ee0b1fde83bf0e22b71b50f9f154c33a8a4221b11c5efc434be79 SHA512 f7f8a7194b5439872af70f9ae742bf8cb6e338b8100e3cddbdea34be89c187c5475d6e0523dac5cc886a85133d18bb8669ef9292228e4351d31122c73561dd30 WHIRLPOOL 87e184773beef3dcb100bb5a9b4c13e5e29c69b6c2859c7e3b165dae503cc9097eaa091df36e81b64bde34ef39494aa94f8dc343df1fdaede3b32fb049be60c3
diff --git a/dev-python/oslo-privsep/metadata.xml b/dev-python/oslo-privsep/metadata.xml
new file mode 100644
index 000000000000..43a2333c4012
--- /dev/null
+++ b/dev-python/oslo-privsep/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    OpenStack library for privilege separation
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">oslo.privsep</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.16.0.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.16.0.ebuild
new file mode 100644
index 000000000000..a69b8431978b
--- /dev/null
+++ b/dev-python/oslo-privsep/oslo-privsep-1.16.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack library for privilege separation."
+HOMEPAGE="https://pypi.python.org/pypi/oslo.privsep"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.privsep/oslo.privsep-${PV}.tar.gz"
+S="${WORKDIR}/oslo.privsep-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND="
+	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	dev-python/cffi[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+# python_test() {
+# }
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.22.0.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.22.0.ebuild
new file mode 100644
index 000000000000..2994eb02cc86
--- /dev/null
+++ b/dev-python/oslo-privsep/oslo-privsep-1.22.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack library for privilege separation."
+HOMEPAGE="https://pypi.python.org/pypi/oslo.privsep"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.privsep/oslo.privsep-${PV}.tar.gz"
+S="${WORKDIR}/oslo.privsep-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND="
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	dev-python/cffi[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+# python_test() {
+# }
diff --git a/dev-python/oslo-reports/Manifest b/dev-python/oslo-reports/Manifest
new file mode 100644
index 000000000000..5f9dca631426
--- /dev/null
+++ b/dev-python/oslo-reports/Manifest
@@ -0,0 +1,8 @@
+DIST oslo.reports-1.17.0.tar.gz 47891 SHA256 0f1b825ff32d0b36a1823116a2bddece1bbd17d8f85d8e8e5f8274df80d16852 SHA512 1fded7c8d6149dbbe11fb6fb28f6db656571519fcc093bfa7bf85a8d998c6cf23f28512e0658c9f8f547185f10bfb3b993fdc52942eac5ba884d2ee15556ad20 WHIRLPOOL 61f29933952e474aaac19f77a2165c14db0fc416b2d8e7d38351143dd4ca8af78f9652b099f18fa64ce898bb83a1bb217b97a7985b52dbd451f2cec297e32e77
+DIST oslo.reports-1.17.1.tar.gz 47828 SHA256 dbfc364f7d36065cfc369d98c01101f0833ef47f1786e1184296219067044792 SHA512 2ed6d69c8643901a185f38de34cff663160daa246d372503f17e2102634c6634dfafeaa7d6474b7bd702f43aece27a3e4d16c06ccc0a9f6bee1d79a2204ec704 WHIRLPOOL b10c8c8514963df3e87b4993d8419e48f065a1134ea938cf5f3d7e16b9cbea36e97209c1966def6ca79a43f77744a6a3760028a8ea7235531ef8241522f741c8
+DIST oslo.reports-1.22.0.tar.gz 48141 SHA256 2bcfbe73dcd10c04c44aaab2e1579342fdf00652c236c78a0f168069c0cf4cec SHA512 fa4d6f08531c383fbba3fc2785db0c22a21226d477faebe65ae6ede5e2c7db7fbcbb6edd793c38e6f862679e13f2e7e5838ee48784ae554f18ba9363edbbee54 WHIRLPOOL 35a8b605ee86b4d791961f0d02aa8fcd6c87fee97da12384cc41819b41a447909cba122c6e44e71090eb5ed21b12b0b49db9f810c833e2ef3180467a0fe37a36
+EBUILD oslo-reports-1.17.0.ebuild 1216 SHA256 b50e82e8da42e2a2282b3d0158eb8f806169f136391cfb079f321e706c075b4b SHA512 0ef892ee3ef4fc5c114c623d8a44fcf48276089252182d22e81d6807500efaf121b32523b5907ece493e878443574813380111a7fe16183bd03062bbb85b6008 WHIRLPOOL c36edaa7445a0e6e067c7d206b8c1c54f3212f3d64a8a7be9f00f9f7166fcbf102da7ec9c52d661bb86dad02fda72b8188b5806158d96167ef933598f6c01b25
+EBUILD oslo-reports-1.17.1.ebuild 1218 SHA256 bdd999e513ed5fc1466356ea3f55834565ddb678a27f592fb2f78444241115ce SHA512 c9874eac382be979797970151447313943d6fde38afc3919d1a402824ee92b5214d56e94eef848f35df8d266cb84595d6414f42c0f701d69846bb09c790c475f WHIRLPOOL 0a225c37ca1dfb01214e12a53063ca58ceb85aec9fd8208cba7bd97daaf03d98d6312c44ac1472587f37fcbedcf3cc7cc53176e6ad7a86048d715d5ee1892fdd
+EBUILD oslo-reports-1.22.0.ebuild 1349 SHA256 677f4ce0b49aab47a45daf37dadba525e5040d888eb69b1351e6a99dfa104571 SHA512 34a44e0e2b3feda056aaec1b61996cd7bf7838b9a98304bc74565d543f2f013ec90a2b37181884b61020f16f05d20a365326929b2b717ea84e3a3798c527828e WHIRLPOOL 8531757172993f0e8c76f68282f23751a968bf5e1dea002882146d31e94f64418007cf77dd1a3745130cd9053260e1901a22d65a41cc6c3a342fadc3d83f4671
+MISC ChangeLog 2892 SHA256 92584aef3a40cf0383046ff553e1def5c2f3e96b7c123bc22974adb4f648e170 SHA512 761824f53a1fdfe7cffb108f237dd32352e4cdd1a43e84c554b99a456e1afafc3ff395a6ce126ef735874f88936497b84b050d3cf46ec901075860c40f367e0b WHIRLPOOL e169f874dfbbf8a1f5ffc6f0125cb5278a9e1c8acddf5f4753717036a6427d980945b08680ddea30f003664d58baf5649ebe66049a04f085724885d62af4ae88
+MISC metadata.xml 329 SHA256 8c3ed82fc92a931e575de268625fc80d1f6d2a409e9392fad83705858434d583 SHA512 61b44fd1704b8cee9c664efea764a36fc32e5019e5b9c7fca107b8a3a3272a7f97c525827b6ea918d0f91e9098f19fa164df62c83cf617b8125886aee633c1ec WHIRLPOOL f108a965afe16b1c73b1155281fee5a88d26b32c18fc0f8e1c8590a3afb861516c950c63c29e07a4c314cd5e78d27ebab9108e96c7ae77cd34979757d78c3a44
diff --git a/dev-python/oslo-reports/metadata.xml b/dev-python/oslo-reports/metadata.xml
new file mode 100644
index 000000000000..fb4fb59590e1
--- /dev/null
+++ b/dev-python/oslo-reports/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">oslo.reports</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-reports/oslo-reports-1.17.0.ebuild b/dev-python/oslo-reports/oslo-reports-1.17.0.ebuild
new file mode 100644
index 000000000000..074ad9e09bae
--- /dev/null
+++ b/dev-python/oslo-reports/oslo-reports-1.17.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="generified reports for openstack"
+HOMEPAGE="http://docs.openstack.org/developer/oslo.reports"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.reports/oslo.reports-${PV}.tar.gz"
+S="${WORKDIR}/oslo.reports-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-reports/oslo-reports-1.17.1.ebuild b/dev-python/oslo-reports/oslo-reports-1.17.1.ebuild
new file mode 100644
index 000000000000..62da8e1b81b7
--- /dev/null
+++ b/dev-python/oslo-reports/oslo-reports-1.17.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="generified reports for openstack"
+HOMEPAGE="http://docs.openstack.org/developer/oslo.reports"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.reports/oslo.reports-${PV}.tar.gz"
+S="${WORKDIR}/oslo.reports-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-reports/oslo-reports-1.22.0.ebuild b/dev-python/oslo-reports/oslo-reports-1.22.0.ebuild
new file mode 100644
index 000000000000..aba2422ed1ae
--- /dev/null
+++ b/dev-python/oslo-reports/oslo-reports-1.22.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="generified reports for openstack"
+HOMEPAGE="http://docs.openstack.org/developer/oslo.reports"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.reports/oslo.reports-${PV}.tar.gz"
+S="${WORKDIR}/oslo.reports-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-rootwrap/Manifest b/dev-python/oslo-rootwrap/Manifest
new file mode 100644
index 000000000000..9462d6488aee
--- /dev/null
+++ b/dev-python/oslo-rootwrap/Manifest
@@ -0,0 +1,7 @@
+DIST oslo.rootwrap-5.4.1.tar.gz 42202 SHA256 a76cf545515c1cf6d4d9b1a01a339c1356d1eb78ff3b2190e168dafead3c7e7d SHA512 71980ea266703c7880834cf75b69be9f7bee834a3be314f13ade1bb9903ecf6337237a32a1ed06d020c2fdd3807642af1dd676b6736052d4e57784942782d960 WHIRLPOOL 321a2e9774e3702015510d608e4e145d9fc69c4069865dd5215ad6e94e3692e7e56e029298e908fc007f487d54737d3cd4218dfc93d0625c6950edba45da56b2
+DIST oslo.rootwrap-5.9.0.tar.gz 42352 SHA256 f8947b42d02ae26942f0c1166b410016c7e1796b00f00983f685e9eccb91ba91 SHA512 5c299b8701d308f0f02a8edde08d56145781dfe9d25f4b064b2ce926e38a0be5a5dab20d6d57ebaf289af2758d97b81089407e1851edaca23c36436abf8433fd WHIRLPOOL 94ada80d8cf286fd20786106f37ac3579d387157a8125bd74f819b3fbccb31cbd5a00117507e836609c5dcaa64ce6983cd179aa8cd82333fdffeac7f0ddc3d5b
+EBUILD oslo-rootwrap-5.4.1.ebuild 1539 SHA256 fb7c0e1d8b2433a6ae1775831952cfd64849202e2f27c546ea66dd66ac0711da SHA512 6c0935fd483284d8c3eccfb31452129360a4293f73bb2bb40f083a51406acdce4a1f32cbfde5e41deae710cb1d29820b0bc62019d08683be334cdfc943ccf026 WHIRLPOOL d3f67adc51c40336d1e360914ddc072af733e34dd3ac320b0c22e1f15f3b08d33ae7d7f526505b54753a62581f14d256ac26e3c7ce53f2fc298cc6fae7fd37ce
+EBUILD oslo-rootwrap-5.9.0.ebuild 1669 SHA256 d23a6c7e9f62b77b9b37a2819114da8662b24ca756da697e8a15c4b7cc4659ac SHA512 3cdda533c8eb3d524f19f886734932d5934eae0c81346c502637fcfd6d6bb43b96bbe36f1230f675f750dd4ad637a488c1e76e86af6e8a6fbc19236562a8f159 WHIRLPOOL 953885ac072762242f04af63cadb3f859670cd8be7bd0dc38e6b24b3d142764e92162cfa03029c7ee74e3fa338270294d6ec53b924406b42fbe18574664aecf4
+MISC ChangeLog 4987 SHA256 d6095836e12763331a1e47525c9265255a443d29598e48d2f4de5f199eda2e9f SHA512 03312357a519fa52d2fb4f7ab5ddea50282f274db9a42132867c490b1597c142f8122a902ded82dac1b015308d0fd9eda812a2115da15a0854cbe8051c44e553 WHIRLPOOL f293746fa3981342df3be7e592caf20a775188b97d2caa7e8a6afa6158fc8460556e62dca3624c351f23d990cbb561e04ec2c3a01e0d4f5fe24ad64cdb20771b
+MISC ChangeLog-2015 1349 SHA256 0698f2733b5d2e4e9e720d13a3a81db083475e6a75b8972c0c733a1748a126f7 SHA512 1135ef5b27ebb3d90e063b19a80dfd70ceb84aec2bf3ba4b72ef4542771578750836b8e75a0119fa6a48a183989139eae7b66805dcd585022f074e6fed90b5f3 WHIRLPOOL abbe86a67bb6cf90462e0ad96102be0e4d6d4b529f9c89ab76707e484e4d5b2a44f4b09d3779bcb2360720b697ad09c4e6d867ffd66f09133c82008f31a5d35a
+MISC metadata.xml 600 SHA256 806c624b24fcfa6f9c20de4d383e463754d675cd467ff95a3673296d850764eb SHA512 ad1012d9f43875065679837f787f6a8087876d4ef1e56d24fcd2aa379c85e628848dcf5fa03e84e5929cdfabc4c1b6e2f7167ac0a508f7f26b6b533405932e10 WHIRLPOOL ea094eb9895f5a10dfbf3ee7b9e8ca8d46517914dc28e82478192f76631b845d9e992afb4bd3dd337dc8a8800e9642356fb3466c4971b187a7b6c76c52075bc6
diff --git a/dev-python/oslo-rootwrap/metadata.xml b/dev-python/oslo-rootwrap/metadata.xml
new file mode 100644
index 000000000000..1007566efb08
--- /dev/null
+++ b/dev-python/oslo-rootwrap/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    The Oslo Rootwrap allows fine filtering of shell commands to run as root from OpenStack services.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">oslo.rootwrap</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-5.4.1.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-5.4.1.ebuild
new file mode 100644
index 000000000000..82a554a79ab4
--- /dev/null
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-5.4.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Allows fine filtering of shell commands to run as root from OpenStack services"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.config"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz"
+S="${WORKDIR}/oslo.rootwrap-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=">=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	sed -i 's/sbin\/ip/bin\/ip/g' tests/test_rootwrap.py
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-5.9.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-5.9.0.ebuild
new file mode 100644
index 000000000000..303c7d0579cf
--- /dev/null
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-5.9.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Allows fine filtering of shell commands to run as root from OpenStack services"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.config"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz"
+S="${WORKDIR}/oslo.rootwrap-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+		!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+		<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=">=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	sed -i 's/sbin\/ip/bin\/ip/g' tests/test_rootwrap.py
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
new file mode 100644
index 000000000000..a7a3c0fb53de
--- /dev/null
+++ b/dev-python/oslo-serialization/Manifest
@@ -0,0 +1,9 @@
+DIST oslo-serialization-2.16.0.tar.gz 28204 SHA256 0ef8dfa735a42dcfd7d804c5b14576df92407f842d5e12c1fad7eb0889c444fc SHA512 d6612d99e05e3c634d8b2a2e37183884f7aeec3608080bc2bbfcd8e436a64a678e1bb294024ddec0d276fc216fa92a9117a63eb085bc110500e07f1db172e5b0 WHIRLPOOL 5d43524577569a2ee194bc92f387fad10bf15e6922fa315f9559d6a7a6ecba95dfd977f30e7a9086e6120e38fc56f83d37e64f25bc113b6f212f03753f355cbd
+DIST oslo-serialization-2.16.1.tar.gz 28733 SHA256 306d9982eae272fff05db7637971fd07d2b9b818306c9e3af87aea7f452b4844 SHA512 36e162c8f93d064d103052eb8295de7753ac9739f6c9c9f8d048090f5f2663f643f69507d9c47b9fd6142f5ba14d1eeb49120119cce5c6e60cbe09248e8f5a1d WHIRLPOOL 7cc84da7a5437b91c9f5cd5c3c3f7cb6c6e260cdc7dcceb78f98da7ec2f3af10c444fb76b9e4ff0ed07ddcb98e567c8c86f49fc2b6e3f3274f48d0f46236b2e6
+DIST oslo-serialization-2.20.0.tar.gz 28693 SHA256 fca6fbb350d560aab8a4fdc9a1128dac3b1d38b2fc9bf5ad22136ae090854802 SHA512 f15c55a28d1e99b4e01a579f6a3b20d260f8e911ea801b20b27acf3ce284a2bb0ef8a3fa6d6db2d5a094aea9efaa87308b1166ac23dab169209e06bb23d0880c WHIRLPOOL bd2d4fae43f685e2f307c944cce7b9cad21b571ef7bfe7419fba03bc912a2aaa9a1777292a53bcc518663d5b4ac05b3a1e144350d7acefa1657c0a15bad99af5
+EBUILD oslo-serialization-2.16.0.ebuild 1937 SHA256 58a5b66ee2a4a8e2af6650b676bcf4a0b3fe7026eb28f4308c0dc8c9761a46af SHA512 ecae4ed604c659001c8ab3c48b3af0d003510c1a8dac526be5c4e939a032331f665579ee989bb643f5ba6f6976c2def43e1aed1c431925344c35160cf8df755e WHIRLPOOL 231853e5d196775f3f7059c362fcb40395a18656d3fa4cfbec2d95162abc059225f8a5f1a9bd62f8dd79ef8d2f5e11dec73631e1553738eaddccb1e4fd4d1e77
+EBUILD oslo-serialization-2.16.1.ebuild 1939 SHA256 36f91f8243164f0e869e5daaac9bcee02c5a15e2adb413fa0b63c0ac1b9fc0a9 SHA512 a8ca4ff1a708a175c8d4cfd7f2f92a823acbe0d809c20874beb2697cfed22082ea7f147b517fa280272576fb05ae7f3fb896249d42acd6c7f158cb52814f0148 WHIRLPOOL 9db7112f48284fff58e2354bfe64079ae38ee431f8cad7f2194cfa20fdfb58001372239363f946c460d578d6fad9038ae3d422c42fdd4e796b345862675c4a32
+EBUILD oslo-serialization-2.20.0.ebuild 2040 SHA256 067465a5b4194b3d0151c819dc91223e8629893100ae58ca8b04593cb3fcff6f SHA512 7557be8fb2e8c112ea12744a7aa3140f4634a33806efbc0726ada8b356c8648de5bee4697af0f50f72bfc5a39c793485dc4e0ea107eac31d4f71f15f54b1e3f2 WHIRLPOOL 9968b1f21051ab96fe290422a3a54835c4afb590583f1d5a6c54f38982fd5b10734a2af202fa55a4c1e29029494f3687c62f367d1e7e49001feabe40d96cedbf
+MISC ChangeLog 5721 SHA256 3c4fe97208a0b298fa2550afd1a94cbea5f8281fc84ca0cee4f4b82c294f079d SHA512 d07d92beb25594f326f3fc96f01d721f6acbff40c6e6d048904e8e99ec2c4e4c3569fa92472f0191c89f59f28ca2f369f54ef73a70cee5eac1eada156d8ea600 WHIRLPOOL 3298024431d56ae48be5669d0341a25f7fabf4f820528eb87e6db0894a68e64a9fe3d33eb0b98592037ee81472d3570b22ebb1ec5767072e10c7716566f98d0c
+MISC ChangeLog-2015 1824 SHA256 4ccec52a498894b723319998700c98afbc2b9d1a5cca4cc4d2c371bd2dc6cc37 SHA512 7eac3cfd9a784ef49fe8ddd47cab024cdb4bb59f6cf6f481140d29f349028689dd0b5bc115058256e0ea80406bea2800ff7bffe4bfe58bfb3e5c7f8443f7b263 WHIRLPOOL 2b9abf1853c5dc73ddad40bd4715b6a728c1cae649b3d9757dc1ad0e5eaf295a17210d57385009e9207916e57fbcbfd39466091069d5eb43a54aad37e2ea978a
+MISC metadata.xml 481 SHA256 1ee8c76b67ced1c3a827e3d03efe26413ae6ea727b735a5e779076549e70bf53 SHA512 41eb0d120210769caf9bc59d2ca53d136ec6dafb8e4eeb0dff126eacee1029d49ce18d85b6b19749a590579f63ffffe4c9d69919443c59c36b133d60629a6815 WHIRLPOOL 26bd7917a96c19e0db5215432df6f97e23de8099a2ac62154720034e8945076a9b665c882773ee86a51d2165b768c00e58ce26d08ec5e5fca8603f2554577ff6
diff --git a/dev-python/oslo-serialization/metadata.xml b/dev-python/oslo-serialization/metadata.xml
new file mode 100644
index 000000000000..2a1c017eb94b
--- /dev/null
+++ b/dev-python/oslo-serialization/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">oslo.serialization</remote-id>
+		<remote-id type="launchpad">oslo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-serialization/oslo-serialization-2.16.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.16.0.ebuild
new file mode 100644
index 000000000000..f9c7052e5501
--- /dev/null
+++ b/dev-python/oslo-serialization/oslo-serialization-2.16.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Serialization library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		virtual/python-ipaddress[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+		!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+		>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	use doc && esetup.py build_sphinx
+	distutils-r1_python_prepare_all
+}
+
+# Note: Tests fail due to requiring installation.
+#
+# Installation appears to fail due ot the use of namespace packages but root
+# cause was never truly established.
+RESTRICT="test"
+
+python_test() {
+	distutils_install_for_testing
+
+	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-serialization/oslo-serialization-2.16.1.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.16.1.ebuild
new file mode 100644
index 000000000000..e98506682f1d
--- /dev/null
+++ b/dev-python/oslo-serialization/oslo-serialization-2.16.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Serialization library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		virtual/python-ipaddress[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+		!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+		>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	use doc && esetup.py build_sphinx
+	distutils-r1_python_prepare_all
+}
+
+# Note: Tests fail due to requiring installation.
+#
+# Installation appears to fail due ot the use of namespace packages but root
+# cause was never truly established.
+RESTRICT="test"
+
+python_test() {
+	distutils_install_for_testing
+
+	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-serialization/oslo-serialization-2.20.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.20.0.ebuild
new file mode 100644
index 000000000000..2d9c60b98a5f
--- /dev/null
+++ b/dev-python/oslo-serialization/oslo-serialization-2.20.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Serialization library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		virtual/python-ipaddress[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+		!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+		>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	use doc && esetup.py build_sphinx
+	distutils-r1_python_prepare_all
+}
+
+# Note: Tests fail due to requiring installation.
+#
+# Installation appears to fail due ot the use of namespace packages but root
+# cause was never truly established.
+RESTRICT="test"
+
+python_test() {
+	distutils_install_for_testing
+
+	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
new file mode 100644
index 000000000000..cfa3b6c126d6
--- /dev/null
+++ b/dev-python/oslo-service/Manifest
@@ -0,0 +1,8 @@
+DIST oslo.service-1.19.0.tar.gz 74937 SHA256 4c4e0198b6d87b6566f48c8e89cbe87386d4b44ba03159f28655f911a65dbff8 SHA512 d9f8c5d07d418ab2d0234299071e4ff129ec4af4bf8f2973f7899c1a7636fc67f1ce16e770ada7c7fe8a19f28a156536e1c159546a0dd708f26404dffceb5c70 WHIRLPOOL fc413ac2f7e3acff1664b1a98aeebeac6a2e42b2e82f276f628386754f962542c7c83edbc026ad66ad93067e1c5368f52bdf3bc3c8cb9cf222a2c0ac551cf215
+DIST oslo.service-1.19.1.tar.gz 76246 SHA256 b7106bd22a092b358f929f28b2e4726b42c470b32d3e146d9c69e05661e0c37d SHA512 3298ba9e0dddfe477c324b3eb55d4d20ab5da6231488658b78290d1e9e9eafab758885d350471d1c87c24d01551a4643c1f748323a8455d743f0dbe74d4c5d68 WHIRLPOOL 748820fb92e5a273ff2dcf9a20cf040c30e965ce2dc8743a74679ec961fd7d46325de3c5923949fa60f49f98ec160d568bdfda04ebb06c8fd74270b127fa3d39
+DIST oslo.service-1.25.0.tar.gz 76400 SHA256 6de577c01866c970abd00bea1d6cd03eb8adaea86667ec8accfdfb3f1076e33b SHA512 829c9be54813900c4bce0072e408a4c996548ca123524c76b4a3b99d7bc940d22f7d4a0a1d6e02ce88b252fa34bdedf26129bdfd4894c4b5b14c8ec71b85629c WHIRLPOOL 3b56c1693cbf417e27ba0d02ee4d5ea06018f2fe39ed6f5481d5a70971e37395efd2ecbe6c0899adf3fe643098686ac4e0a232f57949c0a8d9ae78b774da873d
+EBUILD oslo-service-1.19.0.ebuild 2062 SHA256 2449b0edd6043aa259d8515580e3c0b7507cdbc4b0af6c010115de8809f04949 SHA512 7b50b5098986b4bb794c201fe10182ec2f2078a9ab328f193684f526b71c28fc94186b4dfd28645d31ce4fedc24e81510bf3fa5c5a1ef5a846d546a15d5cd41a WHIRLPOOL 4fffe4772dd8557d909894c254d7c382ed33feea895319fe5b0787c0571c23c15814bdd0ef9423906ae575667dfa18bd7490afabe1477ea3c8b606ce96e8f6e2
+EBUILD oslo-service-1.19.1.ebuild 2064 SHA256 aa3c855f061e8ce0ffab5c911a8328979812ac8f54740a4072a63acebb5f69de SHA512 32a3713312f0332458d112ca5504a1982c22534ac973a0ce773f5f7eb9ed3ba21cf3c9617f1f0a9aa66117b4f444bf7862312e87e22dd522876970b4f30c513a WHIRLPOOL a607107a08ac2d495048a6aa4457ae2eb5b7640725c050b53cd0a28a08894af685abccfba371491999c22ce9fec7d925f6d87fd2633c174a8af30acb31cb00a8
+EBUILD oslo-service-1.25.0.ebuild 2207 SHA256 32b3aa860be45f41fc2141007c68f0d2d58e1f83fc090dfb351c70315328b38f SHA512 30109f79017401d8b966283c1a99b3b55b287e4275f057f069fb6c7b66b785c2d5a5b314fc0a8712776e30be11bc3c37ba2782efec80e29131da8fe9b3f3aa43 WHIRLPOOL 379dbdd9ed6e3d08ea3651069e60b353146a475ce29061472c098a78ef77b8344c44ae293944c4fe5f740144821b382cf6d454d97096b80eddc0101feee55cde
+MISC ChangeLog 2254 SHA256 1969b700ab48e6ff24eb5c8dbc17f74a1358ed33e19dd4d06257bfee44502ea0 SHA512 5a9dd9f7d84e96c58eb62d3a183734599efd922e30745256e5a64275c393238776386fc1a1f78b182a2e51d13e972b738792acd3dfa213afde9403620cc04bf1 WHIRLPOOL a9c8fc2fe3bb2bb92b38ba62299b9438c9a46b969797f9c98987494491d90330f793aaa199aaf4ea6206e6e10bee0ac8745bf63d642a6cbece76d8972f6fee10
+MISC metadata.xml 329 SHA256 f2c16f204980fb7147de0548bc5342d197fe88f611555c4498c5b6b165bf2990 SHA512 c02f0b4e37e3dabe1dbc10ca6b5e08627d8e7df5fee71573cda34338249508586bf068c56711521aa20bf80a1fdcf94a1e89df5d17cb5eb21a07b996a071d1ae WHIRLPOOL 038ac1ad9f7c08b10d287f14274755c40529fd6bdfd5c841ead165902cc59e650f3905ca1cf8373fe9ef1a272f65b644f2a769f8cdd7631bda11d29cd11f452c
diff --git a/dev-python/oslo-service/metadata.xml b/dev-python/oslo-service/metadata.xml
new file mode 100644
index 000000000000..4b66ac93587d
--- /dev/null
+++ b/dev-python/oslo-service/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">oslo.service</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-service/oslo-service-1.19.0.ebuild b/dev-python/oslo-service/oslo-service-1.19.0.ebuild
new file mode 100644
index 000000000000..68dd17fdfc1a
--- /dev/null
+++ b/dev-python/oslo-service/oslo-service-1.19.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for running OpenStack services"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.service"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
+S="${WORKDIR}/oslo.service-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		dev-python/doc8[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-service/oslo-service-1.19.1.ebuild b/dev-python/oslo-service/oslo-service-1.19.1.ebuild
new file mode 100644
index 000000000000..0660928ac7c8
--- /dev/null
+++ b/dev-python/oslo-service/oslo-service-1.19.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for running OpenStack services"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.service"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
+S="${WORKDIR}/oslo.service-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		dev-python/doc8[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-service/oslo-service-1.25.0.ebuild b/dev-python/oslo-service/oslo-service-1.25.0.ebuild
new file mode 100644
index 000000000000..4443ed6a468e
--- /dev/null
+++ b/dev-python/oslo-service/oslo-service-1.25.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for running OpenStack services"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.service"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
+S="${WORKDIR}/oslo.service-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
+		dev-python/doc8[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-sphinx/Manifest b/dev-python/oslo-sphinx/Manifest
new file mode 100644
index 000000000000..3ecedf736536
--- /dev/null
+++ b/dev-python/oslo-sphinx/Manifest
@@ -0,0 +1,9 @@
+DIST oslosphinx-3.0.0.tar.gz 25644 SHA256 d39129be6b6076e087ab9a108c1b17f67cbb233ffc2481528df3d76b612cc1f6 SHA512 f2b5f35124bac9bf661ba45af1f18703725d5b5432cc708689a548bde6918975722729f321fb4c1fc8a146011c7e86c1c6abfdc746806d4bf7fa7d640e057a0c WHIRLPOOL 8ccc00a71a3d5f67a33a989120ad2591977169b93a5d81fd2c7798a6b93ad33ce45e6ebd2be69c7e0b0e4fa2e79719e393e63f9a250b50e7b5b9d4621bf03e94
+DIST oslosphinx-4.15.1.tar.gz 33218 SHA256 b5cb9524b938c1c7353b3bd52d1af4e92fa9a8af9c0ec44bfafaf8f1964cd3b9 SHA512 c5039f119e5a144c137c13423f42230fcebfcd527538737e3c3fd50fc9b094a1ef0af15e0fb1ce195a6d5013f6cc736cd2b9c856bbbeee8a68ef3849573b9bbb WHIRLPOOL bfeec21373b0a7fccce0c2e426a450358a5608879b7fba5f1f9e093e31072e3b6f9d3c05f145dc26c8c3416b1c4e2a6b39c9a0704fd2aff47315a60a353b7d06
+DIST oslosphinx-4.7.0.tar.gz 27786 SHA256 f8d353445d96c667c95a07c052694a31906c6a36a8305918d63f855f9040b7d1 SHA512 e7334c17bea387898c6c9943ca79c5073927885bdefaba9cdbac01b21a4dd96bcaa0c539c3907508bee5db5959f161d0a8421c688c6592b691edbd7f9013da75 WHIRLPOOL 8cee688ae62f2f16a753fb18c1c8699ce819715a612b3c549b7cb0b07e7cd5e7822c52b9d8f3189d335e26fc036e28012cb7155ed71d01ec7a1cb5d860ad2aaa
+EBUILD oslo-sphinx-3.0.0.ebuild 1015 SHA256 ec4bce6e89451057ff7b781d57ff2c4c466ca5e2740667f4f9fe89b8ebdf3ed9 SHA512 b3d895fd38770c372ee6161052b2ccda98ccfaaa8423b2386cd4a8146f0c4415ba0659341f8405c6ef28e51b512b76afcfae5b89ee67681bb9922c21614c6881 WHIRLPOOL 08a5e3040eb60106695b8fa9e0a38077eba42230f460336400ec200b95c8f37bc4ecc10af98baacdccd3927352cc50600430bb220c52f5d39eee3e46539fefd3
+EBUILD oslo-sphinx-4.15.1.ebuild 1087 SHA256 10eb29b8abe205fc06c8ae6f0298fb552c96a36878ab3e52dd9b2e87ead4b753 SHA512 1bf99b65045cd1b0ff09bdc40ea00fb968664a6e83589f8aa9e2ea14d4fec1ac8ff664f139e61df43695a85d5c7941d2b917ef4e455c77a307dbb52ae4b40e66 WHIRLPOOL 40925a9d68f786dcc6381d1215c37e65b2f76a728ab4758c5d529dc9134cdc873b51d121b422b35079879f03a372fb838e8c9215d508a39eb762f789b27c1bc1
+EBUILD oslo-sphinx-4.7.0.ebuild 1087 SHA256 10eb29b8abe205fc06c8ae6f0298fb552c96a36878ab3e52dd9b2e87ead4b753 SHA512 1bf99b65045cd1b0ff09bdc40ea00fb968664a6e83589f8aa9e2ea14d4fec1ac8ff664f139e61df43695a85d5c7941d2b917ef4e455c77a307dbb52ae4b40e66 WHIRLPOOL 40925a9d68f786dcc6381d1215c37e65b2f76a728ab4758c5d529dc9134cdc873b51d121b422b35079879f03a372fb838e8c9215d508a39eb762f789b27c1bc1
+MISC ChangeLog 4168 SHA256 693199991a1316325b94bd695ca9d8ab88b28963140b78bbf4cf5c5fd0c59b29 SHA512 101667ecee8e2fb318a7539392f0810af76fa54d1248cbb1e2c35ae7a9f5f57db1cb8e982b496854658338771091aa756092cde916bc10d1de7be435d822ca5f WHIRLPOOL 0c7bc76b651f16123abec1552e6d1bee2cc2e0373ce56a42d4bade215319b9076d2eb5bc228358c29c6ed7b367e5d69957f7368ecae4599b3d43da782bc3ecbd
+MISC ChangeLog-2015 2723 SHA256 f070776e8753add22fc16e1b9c38e61e2fae3934cc43a99daef954ce1305854d SHA512 40064e4ad292e2f478ac55e04b33de387e274a4c927c68f35ad97e8c5ed9c90785465570ebbbb68840485dd6ebe81ad0b23c0579607afc772cedbc4139e6ea55 WHIRLPOOL 6876d04d830c1bd8d8836a305f345e0c8b72e66c6ef4a713942eb043fa0b20039fcaf44bb25da6140fdd2f621d25b17c6b2b954d0664a394068e6ab19cc00bd5
+MISC metadata.xml 586 SHA256 9abb2dbce7ff28ba59a8c0e5b0f4e444246914b917e356cb569cd47c2cf41507 SHA512 ebd5d188edde4955081fa7cb073daeace8c9580dab828d4fd12f10f27bb562ca7736ec77f816e243a02e808b83dc712ab53f40f70e1865cec014413514ffa000 WHIRLPOOL 48a1e5dc6dffeeecdf86920113d7a51df4ddb52806da33f19ccbef2eed28226ce09c5b12d2a9913fd9051d48826220d15b5d2802553462c24c62a79e2d251269
diff --git a/dev-python/oslo-sphinx/metadata.xml b/dev-python/oslo-sphinx/metadata.xml
new file mode 100644
index 000000000000..5f205567f249
--- /dev/null
+++ b/dev-python/oslo-sphinx/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+    Theme and extension support for Sphinx documentation from the OpenStack project.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">oslosphinx</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-sphinx/oslo-sphinx-3.0.0.ebuild b/dev-python/oslo-sphinx/oslo-sphinx-3.0.0.ebuild
new file mode 100644
index 000000000000..2e89b229f771
--- /dev/null
+++ b/dev-python/oslo-sphinx/oslo-sphinx-3.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+MY_PN="${PN//-/}"
+
+DESCRIPTION="OpenStack Sphinx Extensions and Theme"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+IUSE="doc"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND=">=dev-python/requests-2.5.2[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-sphinx/oslo-sphinx-4.15.1.ebuild b/dev-python/oslo-sphinx/oslo-sphinx-4.15.1.ebuild
new file mode 100644
index 000000000000..477a883bfa10
--- /dev/null
+++ b/dev-python/oslo-sphinx/oslo-sphinx-4.15.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+MY_PN="${PN//-/}"
+
+DESCRIPTION="OpenStack Sphinx Extensions and Theme"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+IUSE="doc"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-sphinx/oslo-sphinx-4.7.0.ebuild b/dev-python/oslo-sphinx/oslo-sphinx-4.7.0.ebuild
new file mode 100644
index 000000000000..477a883bfa10
--- /dev/null
+++ b/dev-python/oslo-sphinx/oslo-sphinx-4.7.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+MY_PN="${PN//-/}"
+
+DESCRIPTION="OpenStack Sphinx Extensions and Theme"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+IUSE="doc"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
new file mode 100644
index 000000000000..e084bc7d5c7a
--- /dev/null
+++ b/dev-python/oslo-utils/Manifest
@@ -0,0 +1,7 @@
+DIST oslo-utils-3.22.1.tar.gz 84249 SHA256 9825db6337ce10e7c383d2598f87865605d35af15fa9ece7212838ba7d33730e SHA512 afb21f8267f815e192a667fec247ae2e0d8163d7872805d36c4399928b475e34790136810607e8706ea37e32eb31da2fdc2b9defb2e06f7ba0a7235b2de1abc9 WHIRLPOOL 501cb7c18b2997635b5a2ffd91fd472f84168730e2cc76cb13f4937e657448e535d614e9eea64595bce31211af4e1ce0590cb8e313dd31785fe7700c4776585a
+DIST oslo-utils-3.28.0.tar.gz 85122 SHA256 46abd731d8cfdb682eb5b1d22a2da3c549d79f889bd3db998eac4b64a955769f SHA512 0206f4e0fcf0c3bdc46062a37e14e37d7a2d141665b7f1ff4c0d5966d04403dffba8814d216b3dc010d0e845c983f3335095c1dee0373b82150447c914f37fe4 WHIRLPOOL 40ed09a867e69d46657d76b505705b6161382b11bb5f870b33746d75a67e57320d44df57cf83ea6f68fd48098e49fbb75712e3bf99b695f6f3ae25f78874e3a6
+EBUILD oslo-utils-3.22.1.ebuild 2692 SHA256 d285701e55c833ad41a700f761c4be91b2621f466ee3f662fdbf7866231496b6 SHA512 be67e1492be16e46cdc3468a17b0f1445b841e1cef81dbf5133741645a3e9461d38cca6416cbc182c0428aff13f3db7d5c7fc1dcf375b22f1b4ad4e3558d6e3f WHIRLPOOL da1ccd253e28ecc63d5dad011ffca6f8a15bbbc7a16eb03481779fa934b08246526ea9403eb3ce851a8917d35a42e3498b97a078f72795c8fb3c9151371cf48c
+EBUILD oslo-utils-3.28.0.ebuild 2891 SHA256 c36666f24161d19499c72ab3c1acfc066b5d025288592a4ea7f68318e6eef228 SHA512 9ad7c2519645cea12503f583ad53ed19fdb96ef1e7984e9931b01db241206bc688be8f600d9998926b0671f4278d1cfe1be500400c4bbeebfab90ef3524721f4 WHIRLPOOL fa944464acff82eb76cf72a5a19b1466ab11a4379abf7ba48d2026ebb550d7e2e39d2e9c6cd857cc76e9f1d506ba68861267b8c200407226b260c6b413b536b1
+MISC ChangeLog 5642 SHA256 4795b6d3eeb9394499e1a0f6a3ff5858e2fc988476ac8a6dccf8005b8407ffa6 SHA512 295d19c3197240b118ccabaf82e8eb74a7d04b4fe636e731f380d10e54b3f39f43e45b394399a9a08c41bcaabde4bdbe9765f1971504b17dff5743aa4bddb9b1 WHIRLPOOL 3639f5f1796e46c7e57ab225cee49908ecbc855c49cd71305e278069ed8dc5f7eca56829bab4797e425cfe2eff84ae1081d59e5128215f81df668ab34449ca34
+MISC ChangeLog-2015 1734 SHA256 e91d7526fe0d95586559cafa6ba228c1b27721df8c572408dfb2853ffe8a7904 SHA512 2713fa387ece4fd0b1f70ffc56d4e68e76f8ff96096ed7b252b3f1b307abfb2dd62f8d339cc24a30a9cc2e779d49e15a158f83e04080bdf8c6301a827522ba60 WHIRLPOOL 1036e7335918db7bcba051eccb9a3b47ff733e4ada6b0057f0d4ccc3f2add2885533c664caaec8bca85cfaa61f7543ebdd1af2c3065fd9948e7051d16f607b63
+MISC metadata.xml 473 SHA256 f1e11991e3bb3406953a99669916fd79e366d49a3ff3df53499784f60704f30d SHA512 17ac5a7dca516e43af1409f5800b112c829edb6550cbb7d91eb394e15cebceeff3c895a0250126cfc869f4ce0e1b05dd494ba614934ac06ed91402e3af048634 WHIRLPOOL 9b7f8ff8cffa6b7ce3356310c14e355c49c25b750a3cd6222178851ef22605fdb2de2bdd3df876483aba442386296c0c84b338bd22a19f8661c0df82dbe41d54
diff --git a/dev-python/oslo-utils/metadata.xml b/dev-python/oslo-utils/metadata.xml
new file mode 100644
index 000000000000..3b307a0b67f2
--- /dev/null
+++ b/dev-python/oslo-utils/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">oslo.utils</remote-id>
+		<remote-id type="launchpad">oslo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-utils/oslo-utils-3.22.1.ebuild b/dev-python/oslo-utils/oslo-utils-3.22.1.ebuild
new file mode 100644
index 000000000000..15625afd333e
--- /dev/null
+++ b/dev-python/oslo-utils/oslo-utils-3.22.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Utility library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+# Note: Tests fail due to requiring installation
+#
+# Installation appears to fail due to the use of namespace packages but root
+# cause was never truly established.
+#
+# Tests fail with:
+# ImportError: No module named 'oslo.utils
+
+#RESTRICT="test"
+
+python_test() {
+	distutils_install_for_testing
+
+	cd "${TEST_DIR}"/lib || die
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-utils/oslo-utils-3.28.0.ebuild b/dev-python/oslo-utils/oslo-utils-3.28.0.ebuild
new file mode 100644
index 000000000000..06e1e03afcfa
--- /dev/null
+++ b/dev-python/oslo-utils/oslo-utils-3.28.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Utility library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+# Note: Tests fail due to requiring installation
+#
+# Installation appears to fail due to the use of namespace packages but root
+# cause was never truly established.
+#
+# Tests fail with:
+# ImportError: No module named 'oslo.utils
+
+#RESTRICT="test"
+
+python_test() {
+	distutils_install_for_testing
+
+	cd "${TEST_DIR}"/lib || die
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
new file mode 100644
index 000000000000..bb8de84e85a0
--- /dev/null
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -0,0 +1,6 @@
+DIST oslo.versionedobjects-1.21.1.tar.gz 145514 SHA256 36b8ae529c6415580a9f17ce22cc20af991c4a544a9055e5c4b22360bc32bd05 SHA512 e594d77a923c588a7ca1bc4f1faae4532f28cc2306d548235e0bc3cf0c6c16a5acb54f5b82b97f4ead165bbbbb29982d0f96f20357b1fa0a1b2fde3445ecdc15 WHIRLPOOL 9bcce0de81242b6ec990fb8a7160cf57b015fc5e477f0d496d620f252ef2b72daa67219776acfd4ec13efae9ba2ac35ebc99e5cb0740e07f5e4e19dab062a4f1
+DIST oslo.versionedobjects-1.26.0.tar.gz 146388 SHA256 18d9a5861426d05878cea7db4af2f2057b5b67a27f0673e1d7f776606edfa3de SHA512 633389177b0f4d62e77e5902011bc783f1e7d2993a3d8dee693526c8af435764b1a86e383f861192dfac8d93da7c49b11e16b08485027470107597804c72a81f WHIRLPOOL 64075192158eea536f6d4bd328b53670d91b10bcaddf4c8afa4eadf08d98d60b6678e7bff2566ed1c5b2d6c2fa742606c3dd2d15400ce3bef10a36489d81f6a4
+EBUILD oslo-versionedobjects-1.21.1.ebuild 1377 SHA256 a4e055b3a536253e6c8186736d33923e32ca5d7d86bb6478ffbe872612155926 SHA512 bb959ddf306a4ee951b118d14959de291221b399dd2f1bfd3754be1db9cb805cb8d8a41280a3c654e499686b4215052a6949f1d3d8a6f0b7dd3a6efb0d00cefe WHIRLPOOL b0dce9443244c510e6a8e44cdd6ed531c9bff7c3ecdcc6f5511942f5f1f3d54e75244377390bad75b89bbdbf14af699f03bc524cc0409366f2c3ceadcdd44f39
+EBUILD oslo-versionedobjects-1.26.0.ebuild 1611 SHA256 8c6827282a3952db055c5402c1257eab1692157849c85181c907143e5b04eb10 SHA512 87011ad8ffaa7b9cd17c6ebd1c021d262e9cb8bcc69b5a338ff39f5cee2bb92a7013315e0d8fa2660dc3a636ce158e4b805479d6f8ea42aa103e3a3486745dd9 WHIRLPOOL c1ecf8a1594735b969ed23cbc52b35e59ca733d72f6aa2309a4da1f13add4be51d3f33d018eb84fc272222879f5c1e4d2fc245925b22ae6bb7b1e87ac1055ad9
+MISC ChangeLog 3091 SHA256 1bbe732e21893814dab4817fc091a23787cf4a9fb63bd6edc73194aa6a777e03 SHA512 cda2dfbe90beff0c1ee95d45bf0a09becba7a8e3c7ba8f6b913cf8ebe4fd1d51c14fa9b4cd2b4308618e01a2bc5b19cc2199d77fd55e92e343b8e9703688d7f3 WHIRLPOOL c37ab60a4de9c2717872a59a8d74c991b1a71fed23f8ed5d28ed40af459dd1fd67977d85f9861cf9979a5df718bb59ee8d39c6eb134e9510ecb867594d3d8b79
+MISC metadata.xml 338 SHA256 4e89c97e8656e772852de6925b9f590557d3feb422beea3e6f572caeb1f4ba41 SHA512 6e0c4816549dd4f80d8c344f68148c2815afff2f84714cb570e4199c1bd6bfb4f9c5e27d230478e37890b0617fbd62efe472b37e043d8f8b2cfbe8912cb36fe0 WHIRLPOOL 762f4472842fa2be0d68a5102639318a790b561aa46214df0ae2161bb099dbb616f492f277bdd9a6ebec13fac54df3c619d5b2209453d0f06f023101f8612da6
diff --git a/dev-python/oslo-versionedobjects/metadata.xml b/dev-python/oslo-versionedobjects/metadata.xml
new file mode 100644
index 000000000000..7007d5ea8a1f
--- /dev/null
+++ b/dev-python/oslo-versionedobjects/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">oslo.versionedobjects</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.21.1.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.21.1.ebuild
new file mode 100644
index 000000000000..c9368e1c7258
--- /dev/null
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.21.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library that provides a generic versioned and RPC-friendly  object model."
+HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
+S="${WORKDIR}/oslo.versionedobjects-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.0.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.0.ebuild
new file mode 100644
index 000000000000..589284cf89bd
--- /dev/null
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library that provides a generic versioned and RPC-friendly  object model."
+HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
+S="${WORKDIR}/oslo.versionedobjects-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-vmware/Manifest b/dev-python/oslo-vmware/Manifest
new file mode 100644
index 000000000000..b57899d260b9
--- /dev/null
+++ b/dev-python/oslo-vmware/Manifest
@@ -0,0 +1,7 @@
+DIST oslo.vmware-2.17.1.tar.gz 205998 SHA256 43a306816440dd1571cbdd8625f975aa58389121ba96f90e7bb2fcefa177ad7e SHA512 da8516733ffd10821691e56ca036942dc9f1043452999b42f115e87c83ccb79058bcaea604b7ca990f53f4dd4ad7302989b417ca179898523fade5b136fbca85 WHIRLPOOL 7597acf5337b20aba8b35a04d4bb88243602be72a1b07bd2384178d180628774d3fd4e2e7a6d816a94aac24e370baa13a844fb76f7396336deba251d221e7070
+DIST oslo.vmware-2.23.0.tar.gz 209538 SHA256 7a7a315603a1fb1f51223ef42981b67b36adcf4b5a9bc360383525466e4e4b63 SHA512 74edc7885deda7df102ee35177c663fbf3e91983d45e8f7db82d81749979a7b0f8a71bfc46be82d7b38e2d13f94154f47418e10db74e8ebcb2fccabac6bf8af1 WHIRLPOOL 8161b462704ffbb9bfd5280eab9febb21f3783e8e741bd068c545655d28ddce135b82db6aaea9e70cc024b518f993a89cf10d1ca098f4369362e0dae9ad11144
+EBUILD oslo-vmware-2.17.1.ebuild 2121 SHA256 8336cb44c8d4c69957a07929a690e3e3c2c43001a89726940802a4b82f96af25 SHA512 2b44465761de1f20502d630e3a700ee13e0cf80c59e2af166d00f553b99889ad580846989c8d28dabdda7caf824cf0fe11a520a6d27448a6889b7de31abdac50 WHIRLPOOL a1f9b715b2979ae69c37fb21c125b8260c6581f1761ea319fd2149814d44aadea3ea6f1b6f219c0294cd88c3d631da4c8c4d34a2c5b9376448471c5b4c718a7b
+EBUILD oslo-vmware-2.23.0.ebuild 2340 SHA256 a71a1f3fc0ee5b9da4829b2bb72460835a55a07ca42f56d8251b0fb1cc0d7406 SHA512 c47d6b4a6543f4735fba067a93fccc5cfde3dfd4b43abab1538376668959868025943d1e149bb963be6644c9328e13dc13f9f9173502f5caf1f8933b5f86b839 WHIRLPOOL 190916f00afaed79d847d07a7e8f4eddfff7850dbc285f20cf37c615338bf2368cad75d3bb3619471193d02146b9511d94d66a81771bf18a530061fe0ec553cb
+MISC ChangeLog 5336 SHA256 b5f29b3ced73b9d73c353e62818358b4fce07c4c0f4a77ff6a7ae3b52a5ce8b3 SHA512 cbdf60e259c977f740fcf64037104d8f438f810ee2763c7765ef1f5cb380a59e88c0d1d8869dc55bae32c1682acce5db7d9ed8d3143a50fcafb65ad79cffb04a WHIRLPOOL 611865f044dcfa5604dd6bd9dbe4e91afad8bfdb2eeefeff48ba45ca9f21ecad29327a54b34ee9c35ff8b7a441094b5c13e8f717b5166e25f8dfe4f667929f69
+MISC ChangeLog-2015 1579 SHA256 9e7b303e08847e50dfaa42aefeaa0fd2b3d9bce1c79d75a86159275b9fb14add SHA512 af302dca77bd18c03ded25f48e39833427f80427e5158ab37f5a56d611690c29cd8395fe11723df63c36018cf69ae8522a65923a3f315118f804a843ef267fb1 WHIRLPOOL cdb348de454d1bdd3f87283c6e44779cad98e5efc1c3f6dc210c92cdd6c112d00a6b373b10327b325df43a05cfe96cc219fe24bac54c4246150c0e28afb12135
+MISC metadata.xml 568 SHA256 9b85d98b1168b6679a4249209750743f3a7a606511f9705edfcf82d103f46f29 SHA512 879bcc0237b70f9ab61a3d659e948e5d1289128b3b4f11f6797b0f20809c3cc90efa104a582dd6cb407fd9a7dd4f0e2330d68227dda145c9456875d44db913dc WHIRLPOOL 6563fa33092c2cbe161e97581d1e5d15bfbdcbd47fa276f0749a4478bb254f13b48b2bfd59c733b62b2621ffde9cc9f68dd299fedc6cc960f3242dd14b7e7d1c
diff --git a/dev-python/oslo-vmware/metadata.xml b/dev-python/oslo-vmware/metadata.xml
new file mode 100644
index 000000000000..d75ebc335336
--- /dev/null
+++ b/dev-python/oslo-vmware/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    The Oslo messaging API supports RPC and notifications over a number of different messaging transports.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">oslo.vmware</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/oslo-vmware/oslo-vmware-2.17.1.ebuild b/dev-python/oslo-vmware/oslo-vmware-2.17.1.ebuild
new file mode 100644
index 000000000000..ec1d49fecfed
--- /dev/null
+++ b/dev-python/oslo-vmware/oslo-vmware-2.17.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Oslo VMware library for OpenStack projects"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.vmware"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.vmware/oslo.vmware-${PV}.tar.gz"
+S="${WORKDIR}/oslo.vmware-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/suds-0.6[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+"
+python_prepare() {
+	sed -i '/^suds-jurko/d' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+}
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-vmware/oslo-vmware-2.23.0.ebuild b/dev-python/oslo-vmware/oslo-vmware-2.23.0.ebuild
new file mode 100644
index 000000000000..eebcf46b5b1e
--- /dev/null
+++ b/dev-python/oslo-vmware/oslo-vmware-2.23.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Oslo VMware library for OpenStack projects"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.vmware"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.vmware/oslo.vmware-${PV}.tar.gz"
+S="${WORKDIR}/oslo.vmware-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/suds-0.6[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+"
+python_prepare() {
+	sed -i '/^suds-jurko/d' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+}
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
new file mode 100644
index 000000000000..21a6d24d62c3
--- /dev/null
+++ b/dev-python/oslotest/Manifest
@@ -0,0 +1,5 @@
+DIST oslotest-2.4.0.tar.gz 26392 SHA256 cad9a20b4c26a691e947b826c37ea393c35384ff3d9091ac83c8ad4201795b0d SHA512 20dfbf555741e72cd9ba41c0432e8c8af01ae7c07a9a740f71055f900a994790b420aa062313a59cdfddf4c80b7ca2aa0ee9ae2ee645ad525cbafeae3db68886 WHIRLPOOL e8a5b8dc30bf2aa68e58c07d3a9e2067aa8d037022d22bdc9351950d70f922b61ec7e907652ae04886cd918bccf84ec4f409dc0604cb2a34af87780f1912fba2
+EBUILD oslotest-2.4.0.ebuild 1720 SHA256 0842d60f280b8f1bb6fc732261c0d908697ab3fd9dff24a154d3c5250b712994 SHA512 aca409a3cfff3da8358de290b7bd119a2a13a9b0e4c142cefd8ecd29230dacf4e84fe70f196bd0e4e415f8e263b300210d56c0dae057b2ea68ff030549fe86f1 WHIRLPOOL 691cdf870ce986e804a1cdae0fa95d93f53681aceb30ce8ab113996e1b009efd860cfa330fb3997ebe3e36a0ea09051b2b54cf7d09dc3d1dfb2deb8cf9aba7b7
+MISC ChangeLog 5982 SHA256 16f3333b64b379e9e143f1d3761c894a3bccb775854d9a2a577985b75ee24acb SHA512 bb3aa25e86d8ff5dd2c87b27f7faaa10d97072d4f785f958ce5f24706641da9bdac1447ae64376b4d086d38d03c1f2c96ddbcede494742ab379abefdcc192ac2 WHIRLPOOL e6a7bd56e4c6461a74bbba7d16a158878564f97f4ce1635e0ca7f2edcbe71588544a6989615cb18ae82a0ffcc65e940a2ebf78733790e540a7be977704344365
+MISC ChangeLog-2015 2605 SHA256 53d254aaf16184baa78d9c1c579eb8d675ad4aca367c7de0a9870a9b9dabc80c SHA512 cb277786f6429f85e4904b840691994b545bf4e5224d2ec1e6d22ac2dc037804fbf001ee4aedc6c7c5292d807c2db5572c0d21758678c5131caeed93aac1590e WHIRLPOOL d0e8403dd75a6f6967e66646a8b81c7676aa602be3d5184558b005378d0acebc02ef75a7747cce329ab7b7d7f4d04e251682c584f94102a5248342437adcb5e8
+MISC metadata.xml 829 SHA256 ed78386702ca48b01218c8879befd432acb13823b88ecac557a20f65dee9b6ae SHA512 4e4ddfb87a10f3088508c1b8d4588aafcdc762b267288904d2c672b7fac26ea0d79ee18a33a01ee2d71e9867d30b0b5cda2de648daea4bff89be50b896bce36e WHIRLPOOL fc428a65b676e8c0ccbdaa02942a5b586c8cc5d0630a8c6e57312eec92fb5eebd94efdb1e94f4c7dc5965f552d76fb5263bf8bc9a7417b68ebeece124bb9243c
diff --git a/dev-python/oslotest/metadata.xml b/dev-python/oslotest/metadata.xml
new file mode 100644
index 000000000000..7225a0489225
--- /dev/null
+++ b/dev-python/oslotest/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+    OpenStack test framework and test fixtures
+	The oslotest package is cross-tested against its consuming projects to
+	ensure that no changes to the library break the tests in those other projects.
+  </longdescription>
+	<upstream>
+		<remote-id type="pypi">oslotest</remote-id>
+		<remote-id type="launchpad">oslo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/oslotest/oslotest-2.4.0.ebuild b/dev-python/oslotest/oslotest-2.4.0.ebuild
new file mode 100644
index 000000000000..615478411aae
--- /dev/null
+++ b/dev-python/oslotest/oslotest-2.4.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Oslo test framework"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? ( >=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}] )
+	>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+	!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+	else
+		esetup.py build_sphinx -b man
+	fi
+}
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	doman doc/build/man/oslotest.1
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/osprofiler/Manifest b/dev-python/osprofiler/Manifest
new file mode 100644
index 000000000000..d92e2c16419a
--- /dev/null
+++ b/dev-python/osprofiler/Manifest
@@ -0,0 +1,11 @@
+DIST osprofiler-1.11.0.tar.gz 75301 SHA256 b79081344555e0c7ba6fdd02a774e81728cbe81d82d8bfbe201ebd72899e6132 SHA512 41697a9d3bfb81f0c193bd1bd82cb470f1e7e410192e982c076877026457c9b7eb3d17b72c3d02ba4e1bda6ff4a7006798210f37c67d75ff600e41fa047ca59e WHIRLPOOL 24616173f4f9e5f14ed4a5ea7a5de4fb8a9165ae663c5f2ce8ac73964fb876f08b938b2e73711c7b9499ca6f17baf4cced821270433c4293385a4cbab60ba930
+DIST osprofiler-1.2.0.tar.gz 53375 SHA256 62447e1ed954587036e1fa62b9f7d5f9d23b585f6fd0bf7a4c3b7926880f7f0d SHA512 4c7d9ac8ed447e5b6bf8dabd37a144dad21c176e42abd20348a6f3fe2eccc9f05fa88aa04e63ea730bc9acd52c69a2949b39535363ba47e5b6ad96804fb3c0c5 WHIRLPOOL bee27edabea3ab48b742a0e220f26dc8d4595dc244ed676e402af81096daf533a2fea42ca89a3963d2d8d4eb5dba2e9e23edb8caca2b1c0eccb39956c7a82a8d
+DIST osprofiler-1.4.0.tar.gz 59906 SHA256 cda53436ffc8fc155fd220dd9bc9b2819c89f35baf62cd85f68dd5ea900f33fc SHA512 541f51b949158d7ce5ff31c8d5632a57ce557469e3277d9aae1c589377388e9f57a7abcd436c4452af544ba3d4dd3332e43b8e3594e7aa13a526f0d24360c176 WHIRLPOOL d7f7d2f5d8fd2b09d8e047f69809b7e1e21c8c2276a0a316132db47c5e18430bc866caa2fe3812173c175c1b3076c385226173eb81bb06712e0bdb50a5a2c099
+DIST osprofiler-1.5.0.tar.gz 72539 SHA256 aee63cfd888e6049ea82535ce458ce4844b4ac893dcb18060eda24192505627e SHA512 a4adaf39e4680d5d7d729b27c578919b335209671f911138e135c7554f0af33dce25e46863e65f98a2022a534e0f93c77acbc3bc69d304a28aa846fb5dbf469c WHIRLPOOL c0d55a6ce5db495bf02f619287987dd148ff5e83cbfc1a2b91893a05ff619c5806a02eaa87a3b1c83225699de84fd0f3e0b623fe664e9a0ead5c37eef99aac81
+EBUILD osprofiler-1.11.0.ebuild 925 SHA256 f7128632100ea51511d433d78b74d5f3c7045a7988925a2a1c991afee206cbc1 SHA512 f555fb16240a8ba868bf605adddfeee9d44dab4a4d9e933818d560e8f54a8b1db181234ac3bb374a15f012f7159e0180d7471a94f020d6e1bee4bac85c69618f WHIRLPOOL 8ab007631833ae201f8cbc6552226651975e61f882edbf13e196956cc38392e315645197dda3baddeed68f1267dcf63037cd7b720b3e1a2be6a6f8e43da366b4
+EBUILD osprofiler-1.2.0.ebuild 674 SHA256 517e21f64dc2284d749a297d9bb22779862f159195b776a8c4871acf5159a09d SHA512 0b486513e2d91d276536330da63e14f1baaab1b18568e60c8ad7f568e2489ca005f056b17c469af6dee5abc4ffec5aaa188ee0c334022dd8700d6746997f03dd WHIRLPOOL a3ac842fe3aff1a5d0d1efecc8ca6c839ed1202c3c361c0c9cb759289693adb7774e834a57e34a0a2628c36e42bffd402161561ed2f26311962664fe12beaf05
+EBUILD osprofiler-1.4.0.ebuild 727 SHA256 a17a3fe8cfe0ea2f3012333ca8966cc3d85e689591ab8bd1b7f655a9e1f225cb SHA512 02c8fa98e5fb03fcb2f001d3c543d982f75421218f46fd24ef915900aa5d6a60272d672140846815862fc078a87136927e1d58a978f2f57186a78ce60662055a WHIRLPOOL bfd567a690e6cb2ebb3a5d5afec1ceebb764df6b72b883327c3ad06ac69eafab5826f3f40d585f9eb3fd528c6344c5971bac202380eb4b70a9576b7fcc2ea002
+EBUILD osprofiler-1.5.0.ebuild 925 SHA256 f7128632100ea51511d433d78b74d5f3c7045a7988925a2a1c991afee206cbc1 SHA512 f555fb16240a8ba868bf605adddfeee9d44dab4a4d9e933818d560e8f54a8b1db181234ac3bb374a15f012f7159e0180d7471a94f020d6e1bee4bac85c69618f WHIRLPOOL 8ab007631833ae201f8cbc6552226651975e61f882edbf13e196956cc38392e315645197dda3baddeed68f1267dcf63037cd7b720b3e1a2be6a6f8e43da366b4
+MISC ChangeLog 3722 SHA256 9c27c4678d15d6ba655dbb740348c08bf9a74c9779a302c527666e50efb130b8 SHA512 2740cdf14bfa1d333598ffb57ee7611cd6212d5cd5bab7f099e4b1f94928eb21d3d4ccf60405b2a53923b025b933bb4106f525ab86d0111dbe65690d4d7b4768 WHIRLPOOL d4b046549dfd5a7fe3df1c1b380d29a867c985e1775e1493a4fed58e55fdd6ed1073553aa803b827a2a900fe6b81adbd3bd458c318c360aae479e1f55870d0fe
+MISC ChangeLog-2015 1000 SHA256 21e529755f0c919188d0e16127ac3b952ed450017e1c0225cbc5fe4d8ec1dd8d SHA512 6e1c310bcb56de46d7e0191d55e52e1cd9525f28f9b9de72c7fc42abc1d7d82973db9fb469033b085d23b336b79bbe76ec0773a5e9924a28df7a71823ff7d6d3 WHIRLPOOL 6ec8166ca46cb5bf5c8c5ab3a16e36daa2fea3c1425a2882486af36b5d227261b72e2d41f0d010c4c4afb655ce0420e587fe03b861dd276287d58df1396ae9ed
+MISC metadata.xml 564 SHA256 f61153848c915931d7cb769cd2291e0235264dec3f627a27b0ba85822854a4dd SHA512 2a8070a290ebecb271dec1bb576fd361c937191f69390e1477bac368eb6c9b91ddb3c9eb78af9aa4e4f6e3982a8a83f3ad2c8d5675b1278d6e7191aa3bd36589 WHIRLPOOL bbdd64bb4ca74c3b84ce05506b2eb310b63ded0e3b039c864febed8f03b849676dadf312f53af9a31b262862a28c8cd5c7a20ba22af57863ee00f66f070195eb
diff --git a/dev-python/osprofiler/metadata.xml b/dev-python/osprofiler/metadata.xml
new file mode 100644
index 000000000000..6358b4b13b39
--- /dev/null
+++ b/dev-python/osprofiler/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+	OpenStack Profiler Library
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">osprofiler</remote-id>
+		<remote-id type="launchpad">osprofiler</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/osprofiler/osprofiler-1.11.0.ebuild b/dev-python/osprofiler/osprofiler-1.11.0.ebuild
new file mode 100644
index 000000000000..edb368df8464
--- /dev/null
+++ b/dev-python/osprofiler/osprofiler-1.11.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Profiler Library"
+HOMEPAGE="https://launchpad.net/osprofiler"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/osprofiler/osprofiler-1.2.0.ebuild b/dev-python/osprofiler/osprofiler-1.2.0.ebuild
new file mode 100644
index 000000000000..9bf3f9601395
--- /dev/null
+++ b/dev-python/osprofiler/osprofiler-1.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Profiler Library"
+HOMEPAGE="https://launchpad.net/osprofiler"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/osprofiler/osprofiler-1.4.0.ebuild b/dev-python/osprofiler/osprofiler-1.4.0.ebuild
new file mode 100644
index 000000000000..a4c9141c2754
--- /dev/null
+++ b/dev-python/osprofiler/osprofiler-1.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Profiler Library"
+HOMEPAGE="https://launchpad.net/osprofiler"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/osprofiler/osprofiler-1.5.0.ebuild b/dev-python/osprofiler/osprofiler-1.5.0.ebuild
new file mode 100644
index 000000000000..edb368df8464
--- /dev/null
+++ b/dev-python/osprofiler/osprofiler-1.5.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Profiler Library"
+HOMEPAGE="https://launchpad.net/osprofiler"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/ovs/Manifest b/dev-python/ovs/Manifest
new file mode 100644
index 000000000000..bbe3727fe53e
--- /dev/null
+++ b/dev-python/ovs/Manifest
@@ -0,0 +1,10 @@
+DIST ovs-2.4.0.tar.gz 61230 SHA256 ea38287b56fd19af24dd6d1c0098ccc8ded9e8f9daeb04b152e3835278becd01 SHA512 45dd7e040c56f8ef16a2ca1fddb769c6d2c67c729f1889dcd867d57d6de8fe4f6baafe99113db05e20adf41389feea2ea9f69739256842404edce6ac28782e07 WHIRLPOOL 2dfde0a2eb334deea8bf88ceea15ad8c5e237cdd3e01cf6a0a7a5a1029bb7aca9bfc3ee83f88687d014723e82199776882ac89ccca1cac051142f48e46ad53a5
+DIST ovs-2.6.1.tar.gz 67436 SHA256 939aa4e3135b02143907c850ab573d42c192b14a5c210cd6417a9489a7e65f3f SHA512 967baf44ccb36902fb28eb0df299bd9cca42a5cc030aa059d7cf90c79b8ad79ce8d854801acba4f711753bca47957485d6f4ad7deacd72cbce7d9fa9fba02292 WHIRLPOOL 561ad0cab25e7471cd189f9ea3b1d6a358f2cd48fe78550c2020333db66eb8cb13fac9486a033e96b65abffb7e47924d1987d26b84030e9d568dc13542b6fad5
+DIST ovs-2.7.0.tar.gz 73714 SHA256 a9bc0a530122e45bf0d0f4248dbaab58fec023db005b3038ba79ff20736c9e4a SHA512 6732721f494b0de24dd6b79ca12d45d7e2da8598906384c6fcc4cc0de4dadb87a822c5e0aa4c07065138a0837a850e7d07ae50e6dea9e0752beba667bf154e22 WHIRLPOOL eace56d7fc39d41f8b1dd551daf63dc0ae708f6e52a6752384a8c6f8e2a13b8692695b17afbee77fad8f0ee9d48576dd13cdf0b082c8215cb5e9602d4263d7c3
+DIST ovs-2.7.2.tar.gz 74222 SHA256 24cc9e324b03ba8d5799f07edf6c8eef013d6cbf741707f42200b1674fd60928 SHA512 568f256a2ad204d5b4a237f1f52c903a1041bb03e30b56e390ea4995c646b49225f69eb5804faf996a9db56916398597100a16ff86bd6798d01ee427073c89ac WHIRLPOOL 3e03a9db516fc725b99ad209e7140266097dcc3508df11caa9cd99dd0450fc1c2cb0e5b06bb3d27c461c6917e6c239b75830ef1d7ed6c8440a141e2a3ac6cdde
+EBUILD ovs-2.4.0.ebuild 413 SHA256 70a064a0fd741418486a483dc20cc11be11347cd53f9770c953241b17e97d215 SHA512 48fe676d6371360666c761ab34f09ccdcdc37bdd03e22e5723ba0fdf901a5c949aaf982a940b062d698679e51657156b7e4d470a3b3298ee51d835504beaf71c WHIRLPOOL dbe0b878a281314dac232a958f5111adca7629d75efda73f8fe341782fdc6d7275a510149c5a0a6df7a69ff99fe48835e01363b978a62417f02b2aca764fd3a5
+EBUILD ovs-2.6.1.ebuild 489 SHA256 055445250322937597e2ccac221f8d3aace577a3b833085b810cfbc87baf112a SHA512 0769f6252859597aa3e1cbfe7b7d2383e1ef4afb7ade578616e9ac75d62d1b8cf06828d59ddfaf45e04edbaa39a94c17fb8264445b480dfd0a33b16b1b4d082d WHIRLPOOL 60a14ad7340d18f3aecadf7ecbda8a7e2780fb7be64bd6d24d876eaeea00b2edae8433fd847d408127f4049d37bb41760eaea0008db8f725c1fd06b3f30e89f6
+EBUILD ovs-2.7.0.ebuild 489 SHA256 055445250322937597e2ccac221f8d3aace577a3b833085b810cfbc87baf112a SHA512 0769f6252859597aa3e1cbfe7b7d2383e1ef4afb7ade578616e9ac75d62d1b8cf06828d59ddfaf45e04edbaa39a94c17fb8264445b480dfd0a33b16b1b4d082d WHIRLPOOL 60a14ad7340d18f3aecadf7ecbda8a7e2780fb7be64bd6d24d876eaeea00b2edae8433fd847d408127f4049d37bb41760eaea0008db8f725c1fd06b3f30e89f6
+EBUILD ovs-2.7.2.ebuild 458 SHA256 01aba33ac092c02528f582c8ee7e8792f231504917970848a84f63bf49fd856a SHA512 a82f4698aa8c89cef038e7a102f351dec9202a472d17a152fdcc317143194cec6e958bfef0b380b7343c88eee5f4cac8e3bca98d6fa8e9852dbcf73c48043d93 WHIRLPOOL 8ef92de7fba8d223b3eff41648e62b0816a394bf3c8f5cb66773ba0dec973e1b1af003b9591d9da456ffbf9c9e4d51e0311429e885c5a387e087f309bfecba0b
+MISC ChangeLog 1097 SHA256 b2b781d1df57721a5d77f2147501bdab00d36a48e7db686918d0dc67c09739b4 SHA512 cace5d4343261131358159e46c76c39b8313104b0b5c8e37d4dc6dd8c0150cf257efa1c338be1c3dd4ddd9fe66cbeec13a304883cd2b211d5b85cb114a1b6c10 WHIRLPOOL ef1f3ee16761354b87f8d829ea06a1a388b4a0d9055b869147d4b11c41d15fb3cbb62a194e4032a1c0c939de6eb84bdb726b8f1557c0dc2aa8babea9d4153b23
+MISC metadata.xml 455 SHA256 f33b9f1c142b5a5f799826a2e272db21079adf59e8f043f929a7a5bfba5aae54 SHA512 53fad2964967c6b5d0a17cea549a01a23b0365a22ea53aa8a82d5bc26a2491651cd0ee276566493bc497a2c033b1a2139a516865ef99ba639365d1709410be5b WHIRLPOOL 055567f2751e2a4ab42c64c6279198609a92567b1d5c120a36ea0b0b3c9489ecd238e45c0efc3a0ea075f73d15a6924234d1abf97e4a7107308678194211542e
diff --git a/dev-python/ovs/metadata.xml b/dev-python/ovs/metadata.xml
new file mode 100644
index 000000000000..1e0143ee3736
--- /dev/null
+++ b/dev-python/ovs/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		Openvsywitch python bindings
+	</longdescription>
+	<upstream>
+		<remote-id type="github">openvswitch/ovs</remote-id>
+		<remote-id type="pypi">ovs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ovs/ovs-2.4.0.ebuild b/dev-python/ovs/ovs-2.4.0.ebuild
new file mode 100644
index 000000000000..2a3c619ee2b8
--- /dev/null
+++ b/dev-python/ovs/ovs-2.4.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="OVS bindings for python."
+HOMEPAGE="https://github.com/openvswitch/ovs/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ovs/ovs-2.6.1.ebuild b/dev-python/ovs/ovs-2.6.1.ebuild
new file mode 100644
index 000000000000..10f7756b4463
--- /dev/null
+++ b/dev-python/ovs/ovs-2.6.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OVS bindings for python."
+HOMEPAGE="https://github.com/openvswitch/ovs/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+RDEPEND="!<net-misc/openvswitch-2.6.0-r2"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/ovs/ovs-2.7.0.ebuild b/dev-python/ovs/ovs-2.7.0.ebuild
new file mode 100644
index 000000000000..10f7756b4463
--- /dev/null
+++ b/dev-python/ovs/ovs-2.7.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OVS bindings for python."
+HOMEPAGE="https://github.com/openvswitch/ovs/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+RDEPEND="!<net-misc/openvswitch-2.6.0-r2"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/ovs/ovs-2.7.2.ebuild b/dev-python/ovs/ovs-2.7.2.ebuild
new file mode 100644
index 000000000000..b0aff0382bd3
--- /dev/null
+++ b/dev-python/ovs/ovs-2.7.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OVS bindings for python."
+HOMEPAGE="https://github.com/openvswitch/ovs/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ovsdbapp/Manifest b/dev-python/ovsdbapp/Manifest
new file mode 100644
index 000000000000..db89716f7489
--- /dev/null
+++ b/dev-python/ovsdbapp/Manifest
@@ -0,0 +1,3 @@
+DIST ovsdbapp-0.4.0.tar.gz 35790 SHA256 dad5ce056ade622c90f8e03d3ef43591db03cdaef86e2e0c689687832c2a3e0f SHA512 6eaa98745c2c438f43bfc9ce3fe00b100689a2df7564e487bf9c2abce81a725490813d969ddd9ad56b4933f0822d6d8801297e8b6a0c81db2ccff562c1ca62ec WHIRLPOOL 34bdb33ab22487a9df855a42d9139d911b5b78a9cc7ab23f307b1963eeca6331a3a05e724d26daf5ec5c4108044256533cf8998a64878fa0edce39bbd75f7021
+EBUILD ovsdbapp-0.4.0.ebuild 655 SHA256 2a67db0682657e0f09d46077c72499cc3e4c2f8857c302c4c8bd182e040bca7d SHA512 2c4605eeff18c4dce326426f8ddc694b06ca85bf8ed6b1117b6edbf345b9c6b2192b890b49aa0579d836d1820713ebb2af8ef96bc69a40de566f894b46e2e686 WHIRLPOOL fe215aacccd6c1be01bacbe99a4aa0078dfd73901837476d75f068d2838f1608e541fc4be4f245bdd62ff922870eac44763b29a62269c2578f883a8a5a1dfea9
+MISC metadata.xml 333 SHA256 e9188d1fb45641811bca6273a165eb8c72201576f74a1808cd20f07716b6c4f2 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41 WHIRLPOOL 03f2c89f09ad1d53c243ea7f340bfd30e0053b67f41ee03c76e421cf9443a129e7f1f57d86dbd329e48903e656bad6de10bfdfd6f5b0135abecd2c9479f58f3a
diff --git a/dev-python/ovsdbapp/metadata.xml b/dev-python/ovsdbapp/metadata.xml
new file mode 100644
index 000000000000..3ee70120def4
--- /dev/null
+++ b/dev-python/ovsdbapp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/ovsdbapp/ovsdbapp-0.4.0.ebuild b/dev-python/ovsdbapp/ovsdbapp-0.4.0.ebuild
new file mode 100644
index 000000000000..7b62858c464f
--- /dev/null
+++ b/dev-python/ovsdbapp/ovsdbapp-0.4.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+inherit distutils-r1
+
+DESCRIPTION="A library for creating OVSDB applications"
+HOMEPAGE="http://bugs.launchpad.net/ovsdbapp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/ovs-2.7.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pSQL/Manifest b/dev-python/pSQL/Manifest
new file mode 100644
index 000000000000..73a89bf85cf2
--- /dev/null
+++ b/dev-python/pSQL/Manifest
@@ -0,0 +1,5 @@
+DIST pSQL-1.2.1.tar.gz 21158 SHA256 9467f379656fa3b4053de67baa5bb0e650f1bcc437bbe0c0a7b088d1bf4e31d0 SHA512 39b21327eb2cd1ad6207c08e2ce6507c7d05992ef852fd06427dcb461e5175b24e983e432c8616c759f291d3bfd9906a654834afa79e37cc7c839ddb5e181779 WHIRLPOOL ed997754faa3b100e38656a6cc5b16574327fe0a05de17516bc5b5e6e5329f42c95151f373f45623bb666ed57c314e43d8562f6aa7944ee7afafb4df6ddaf3ed
+EBUILD pSQL-1.2.1.ebuild 616 SHA256 a2ec4a993f6ae5d6dc30f35ad709e583db28e181561190e2a5879f2635ef98ae SHA512 2d601cf49e7642987317711eeb5898d436fd99b814626d177277437a9aeee4ef4a0798946906e5b4ea2f9a21a6a41aff1444a3fa25a1b7fe2ae5ba2f61bfc64f WHIRLPOOL 4908f1fa1bc13f9e96392e64e52362badbc1a2f2661e0e858e1729c7d3f122a47a67f771b7728678812962d3c309f2f4970d826314ccf3a57b41c7463c1af41e
+MISC ChangeLog 2827 SHA256 ffb78fd38fd04292ab3c8584dda47a0c2f2d10f023e204e389c40b3f7420aeda SHA512 9f6cf061411388a6f99064b7c53c27e5034ef24d54975f0122143cf03eb02a4dcf745f7ac3a4e9eb87207bb5afdb877055b38bd7cce215192055b82f8cf35ff4 WHIRLPOOL 9baca300d85447ec2b1acce2fe291cafe9971c112a97c929bdca80fcd8bb67d8bf1ce4d03354b3cde2777061473994fced9d971f9e239ae86f99497d7427bd95
+MISC ChangeLog-2015 715 SHA256 31f129191a88ad6c11d14c70375b55e6614a4656ee856fa178382a6915de833a SHA512 85ee4d3b3226810f2ccf3ba993654e428fbf4201fdab727e68f7d12eef5885151a01634f0c2bd5f0bc78e6aab1c4097f37753e098e7931c2cd23bb0dd76c065b WHIRLPOOL 179aa7ac956e823e35eb686295d5675d1d9233b973c09aba420fead5cf4de01e2c546a1f602dfa760e89fa1669a2163c9f3cf26e1a89a5f9e102c8d089d23d1d
+MISC metadata.xml 357 SHA256 0abc8a293a91598b5404d783719582e62dc4ebd717cf8ba766e69b343b10b310 SHA512 dfb41563c789f2a54bbc591f5560a3c7b0a8680c8507a6299a511476b1fdc2458e8bbf54626a41f12d52e215cdfff2cde008fa77d4c22f49bf402bacbb3f4e17 WHIRLPOOL 2679997391c8f8d250b93ceee9b5c64900c59ad1503cee377b1a8997434f83f9a8dddf3b1cb68d107b0fd8aa2490947dfdc662b696cb84268cd3a1c10ace8ef9
diff --git a/dev-python/pSQL/metadata.xml b/dev-python/pSQL/metadata.xml
new file mode 100644
index 000000000000..6f7676e92615
--- /dev/null
+++ b/dev-python/pSQL/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>ercpe@gentoo.org</email>
+    <name>Johann Schmitz</name>
+  </maintainer>
+<maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/pSQL/pSQL-1.2.1.ebuild b/dev-python/pSQL/pSQL-1.2.1.ebuild
new file mode 100644
index 000000000000..4482535b12e6
--- /dev/null
+++ b/dev-python/pSQL/pSQL-1.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1
+
+DESCRIPTION="MySQL abstraction layer for python"
+HOMEPAGE="http://software.fionet.com/pSQL/"
+SRC_URI="http://software.fionet.com/pSQL/release/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/mysql-python[${PYTHON_USEDEP}]
+	dev-python/egenix-mx-base[${PYTHON_USEDEP}]"
+DEPEND=""
+
+src_install() {
+	python_foreach_impl python_domodule pSQL.py
+
+	dodoc *pSQL
+}
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
new file mode 100644
index 000000000000..9e769e64b82d
--- /dev/null
+++ b/dev-python/packaging/Manifest
@@ -0,0 +1,5 @@
+AUX packaging-16.8-distutils.patch 447 SHA256 a4665d58a0c6e44997e42721443b2ebd7b382a7463aa298b02fe48339f91f4e5 SHA512 080a1af701c81f694beb336e6239661d04932db904cc6c0ea7e9fd2c2d0e9a42ac3690dfd64eee745c12368f222d20d4b2cdd9d578d7a3b7142924f41b1887d3 WHIRLPOOL 53151bb6aa7eb4697427f406082c2e1fab2915ae92aaa7390b44184a24c6333a7eee445bd1dbbe1a29a6a0b0b4a0a2e1177b7dbf305ef602e56738c1edae4c3f
+DIST packaging-16.8.tar.gz 44706 SHA256 5d50835fdf0a7edf0b55e311b7c887786504efea1177abd7e69329a8e5ea619e SHA512 d1a7b65472c7c02dd758f0c469d6c6aeea34de7b798613f7fcdf45fcccbeba1e9085cab113fa89b392a60f758f8747d13b1c265c809566990c22e61ca8db49bb WHIRLPOOL 611db9bbba97140abfa8097335cb13de2d548c0af731167c2d5f7236771cad47eaf66231c364611f1e6526464dedef8addaa9f0155bd5902f9008952f064d430
+EBUILD packaging-16.8.ebuild 1464 SHA256 1e72c35d6a49af9819b456bdd96c12b6d507fe445c6b0a1a97b0811ff70283dc SHA512 bb6a69a0843c376d4d3eb4b501a25047e47e7fb3f2e594ab2cfcba38d073c1c8aa4c1ae8aabf66367a2500d1a92839beb666a3c449415023049462fd67725fea WHIRLPOOL 02799bb7889ef9cd629edd2b141de99bf358ea1a3c41539e4e0b7a821ca109b37115148b1e470afd24fa7e70da392fe89ab11acb95276781016375acf51e8ecb
+MISC ChangeLog 8604 SHA256 b1eb7763fe3f440e7e45d9fa3feb823453422093a857fd2d71cc552ec4648556 SHA512 a97f313d80b40a0de94f24deb2e04ed7d8ee72f6ea4bb8b5e4118a7e98a9599b05a6b03c26ed97c48c988f8f634323bfd58c5a7fa821f681dfbc0a3f6b668d0d WHIRLPOOL 83b35d687f3d1d24da989a1aedb64dfb9fb5c26eaf895019d3e5ffbe1f7d4bfade621bd0fe61c1abd0392d251f14dea93bcfcd375a69c33c85aa6074fc91780c
+MISC metadata.xml 366 SHA256 dadab51670c0df56ef935d9530a45a0cde7c2a4f96ed57e2f684b6405f245f0e SHA512 f326b75f4603bc9e4455665dd526e381eb1973c8edc319e1d69b824f93ee885931fa29e74f9da8582f5af78a1ddba2fcc2d983fb98cbdc4cfd87b82c7a0f3ba4 WHIRLPOOL 8638a60d413feb5c3a7ae434bf204210103b6261daa4f7cbb8b50ecd98ca9d5f851498126ddae56c5f13f6ebc81878ee7d0badc31c646b81498862d705b2f594
diff --git a/dev-python/packaging/files/packaging-16.8-distutils.patch b/dev-python/packaging/files/packaging-16.8-distutils.patch
new file mode 100644
index 000000000000..84bbb618a6fe
--- /dev/null
+++ b/dev-python/packaging/files/packaging-16.8-distutils.patch
@@ -0,0 +1,14 @@
+--- a/setup.py
++++ b/setup.py
+@@ -13,10 +13,7 @@ import re
+ # dependency when projects attempt to unbundle stuff from setuptools and pip.
+ # Though we don't really support that, it makes things easier if we do this and
+ # should hopefully cause less issues for end users.
+-try:
+-    from setuptools import setup
+-except ImportError:
+-    from distutils.core import setup
++from distutils.core import setup
+ 
+ 
+ base_dir = os.path.dirname(__file__)
diff --git a/dev-python/packaging/metadata.xml b/dev-python/packaging/metadata.xml
new file mode 100644
index 000000000000..b995a0f3bbcc
--- /dev/null
+++ b/dev-python/packaging/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">packaging</remote-id>
+		<remote-id type="github">pypa/packaging</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/packaging/packaging-16.8.ebuild b/dev-python/packaging/packaging-16.8.ebuild
new file mode 100644
index 000000000000..62edc8ae2a28
--- /dev/null
+++ b/dev-python/packaging/packaging-16.8.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3  )
+
+inherit distutils-r1
+
+DESCRIPTION="Core utilities for Python packages"
+HOMEPAGE="https://github.com/pypa/packaging https://pypi.python.org/pypi/packaging"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( Apache-2.0 BSD-2 )"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-16.8-distutils.patch"
+)
+
+python_test() {
+	py.test --capture=no --strict -v || die
+}
+
+pkg_preinst() {
+	# https://bugs.gentoo.org/585146
+	cd "${HOME}" || die
+
+	_cleanup() {
+		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
+		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
+		if [[ -d ${egginfo} ]]; then
+			echo rm -r "${egginfo}"
+			rm -r "${egginfo}" || die "Failed to remove egg-info directory"
+		fi
+	}
+	python_foreach_impl _cleanup
+}
diff --git a/dev-python/pafy/Manifest b/dev-python/pafy/Manifest
new file mode 100644
index 000000000000..c188cd49515a
--- /dev/null
+++ b/dev-python/pafy/Manifest
@@ -0,0 +1,5 @@
+DIST pafy-0.5.3.1.tar.gz 25636 SHA256 35e64ff495b5d62f31f65a31ac0ca6dc1ab39e1dbde4d07b1e04845a52eceda8 SHA512 2d8fa30e15b9d500fac9726d9119da9f1ad24021a804b7e75d6251347f8b47f4517425834ba243a749e22517507fc27b67c7258f81bdebaa7d3b0b7f9b18e5ed WHIRLPOOL 4db6ed8f23303aaaad8775f003ca74ac0a32b9af9ce4228b25249bceb25f07147934f5d799297cd159e47b9d88f728ff055d0d49ce6e84c4ac75dd423f4f8959
+EBUILD pafy-0.5.3.1.ebuild 521 SHA256 277864d59447e38db61a10aec00c243d7a0d62d71a1a7a86d15f3637471e33bf SHA512 a3891cf4d769a4515928eb4a5c77b13236aa110db1aab5c6423464b2a898514df768ee545b7ecefa71a62ef526c25467a43b8e68384e9f8e18df6cbbb98a694d WHIRLPOOL f522ba546d6c688feb4d6aa43a19f23b94213c7081a94290bf54012c69b6474943f6201cc38719b2732177aa28430c82a35554b1991d2e790d3b148b8d335a64
+EBUILD pafy-9999.ebuild 637 SHA256 a1371c5b1fe136864a5ab54f4fbdc26b529844dd1f9254701e42bacd40132a2a SHA512 8cc4d17490fe813414a08c3a2ef79cac499f5c521489b2272a0d6a3828e9668bff244481d64f29b99095e400e298041f36ba9fcbcff7136517a4daed4c8e9fd9 WHIRLPOOL ec4f7efbb2efab04bf506c1eda1f629282030fa3cc8986e6b25f01624953762ff2e0f8234a3099c7a9cebddd16e6b8b2d21b3d1df767271a25cd6f7ebf60c148
+MISC ChangeLog 533 SHA256 a1fd54f5e5ed91a0ac238dfe4c420cc895c32e1109d4df54a39a025bbfaa1252 SHA512 5a78f13b5c3813f763f2f3bf81ba0e8682df893227229421ddd0c1aa5e174ab8fc9c9cec03df9365bcb70e008896cfcdaffd766f8ce2f4b2fff7c5ce8cc8ab97 WHIRLPOOL 2b5b880c16ca2d590b3daac15ab478b754dccfa23f6691b92df6e47ba5f3223eed5837f2a692a9b0ba07d75d2371030110f7f8ec6546881aad988de42fe1a76f
+MISC metadata.xml 363 SHA256 d4d0b24de82828b59e754f6ebb9f2db9f207891ecedd12f0bea9f5bc4a92af36 SHA512 7385160f1c9fb564b0b1b136409f853a28c0c4b1e87350f0c2097ea0cd4726bf1f8047e6a33c4f1e2751cfdf1349d80494d3c0149964969d25a8a999fe3dc2ae WHIRLPOOL 5d1fcb4e12379144efa713e76ea18c2147720a9f8e48f08368352a817e7c7943b802b834915de3ad3156d1c1a8de448515ea3d9adb1f15cf0ad940be0d52a08a
diff --git a/dev-python/pafy/metadata.xml b/dev-python/pafy/metadata.xml
new file mode 100644
index 000000000000..25dc6633b75f
--- /dev/null
+++ b/dev-python/pafy/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pafy</remote-id>
+		<remote-id type="github">mps-youtube/pafy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pafy/pafy-0.5.3.1.ebuild b/dev-python/pafy/pafy-0.5.3.1.ebuild
new file mode 100644
index 000000000000..1d0bdc3194a0
--- /dev/null
+++ b/dev-python/pafy/pafy-0.5.3.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Python library to retrieve YouTube content and metadata"
+HOMEPAGE="http://np1.github.io/pafy/ https://pypi.python.org/pypi/pafy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="net-misc/youtube-dl[${PYTHON_USEDEP}]"
diff --git a/dev-python/pafy/pafy-9999.ebuild b/dev-python/pafy/pafy-9999.ebuild
new file mode 100644
index 000000000000..b9d61d9088ce
--- /dev/null
+++ b/dev-python/pafy/pafy-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/mps-youtube/pafy.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Python library to retrieve YouTube content and metadata"
+HOMEPAGE="http://np1.github.io/pafy/ https://pypi.python.org/pypi/pafy"
+
+LICENSE="LGPL-3"
+SLOT="0"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="net-misc/youtube-dl[${PYTHON_USEDEP}]"
diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
new file mode 100644
index 000000000000..bac35b66427b
--- /dev/null
+++ b/dev-python/paho-mqtt/Manifest
@@ -0,0 +1,6 @@
+DIST paho-mqtt-1.1.zip 159529 SHA256 e8585df21f12d0af6295b1484d894d79376621d1cf33f02c26a811d09d6d8efa SHA512 ef6d1a29480671413dbb655bd8f668b99f8587c14589d2180a37142b368e0ce058f8ed967dbfaa82f239c86e295338bc35c9f28a3ea39d21a6034cd8787a63ce WHIRLPOOL 675891b1e26e00a04d1ba7c740a9846d7c4a34a7bafa7e33e9b233bc213e8bda52eda5b85153b8606786d96142889f8dd61d06c85548c4d0e7480047a90d395f
+DIST paho-mqtt-1.2.3.tar.gz 91467 SHA256 3239569cd9c12b363757265f8b2f8418750c5276c5aa0ba29dcd1106dc2ca875 SHA512 3fb15dc856cbae8885a8a379cea8ceb583ef44954cb8743602fae3e9274d4d0222a87409f048f153180be930bb6e570329768297287a2f8e8c812af03a2c012e WHIRLPOOL f497a1ac3c6436da107ac069163c64a15b2b5f43491618ac45ae237a1e839367e84315f629fa56b6b49659d57233711ffa3c96b35eb9c71d11dfed891382d067
+EBUILD paho-mqtt-1.1.ebuild 499 SHA256 38b65a73a5315128985cf36fdd6fb73353513c8093313682e8555ad127313de2 SHA512 b9c0957e161058d9594f7516fb31b2f45168a55fca7780b84e2ca695eb37b5acda3bee064fe2d4f3f603586565c2f806521123844f84924f325b75f9743eb928 WHIRLPOOL f5e4d0a31dc11ac52500b7dc76a18adce8e9c89d763ed4948ea7b46c2dc8c521e494ada683bd0bcfa84328858f22de1b6f4a0201a9be9208bb43d8328dea6263
+EBUILD paho-mqtt-1.2.3.ebuild 620 SHA256 8a7511c414d71dda4cf63335a72ee688ee392621c4aa64846efdb23d8217fbab SHA512 1623fef22a99f52f39f89cca7c93f496ee5790a354b2992c44448e98f0557594731d334ec8fe2ee143a0f7f523d699ad3e12f7afafcf4784132427f90f726926 WHIRLPOOL 9ac116b302a387b7b6a1bc5ac095d1ae960279cf4f1276b320a01697113215d22d5de13786a05431693b1611daf2b1009389552d9afb54a2081516a6769b20f1
+MISC ChangeLog 533 SHA256 003956491e4238379a442e7c81a04687577115b425f9539269c3878fa92019e1 SHA512 555dc8d26add5481bbefee9810333742eb33a513437610d95098092bc0d871bb6cd0bbde767c168084932db37e7709d213a3a2e442c16143a20b3028668f2440 WHIRLPOOL 271b472dbe8cbef646d17e3760a848a18a15d4d87e7b6bb13da0a451f7f6049f9a1b6834489a51bf9185d631fcdd0fd4f470d432aa8479372b5bf47166a8854c
+MISC metadata.xml 453 SHA256 1e2d3ea37c7f663b6b885121406870b0b560b943244a13d9bb6ba4ccc26d2449 SHA512 818cec785b212cbbad8f9abd37eb3fd086d9b7ce1575a564a05c17c84ac47ea79ee4671956cfc7d2d10eebfcda05bd22ab602ca900c69bc129a75e59d0384e7c WHIRLPOOL ef536b0dcc5c49c8de4834f28a8485f407655aa648fcdf0e4d3488526520cb9130ecbe07300f77943566d1fad34f1372d773bcb449cc74f08cadc2a69e0d0602
diff --git a/dev-python/paho-mqtt/metadata.xml b/dev-python/paho-mqtt/metadata.xml
new file mode 100644
index 000000000000..bae7506c7959
--- /dev/null
+++ b/dev-python/paho-mqtt/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>neil@digimed.co.uk</email>
+		<name>Neil Bothwick</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">eclipse/paho.mqtt.python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.1.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.1.ebuild
new file mode 100644
index 000000000000..f91a9e34c585
--- /dev/null
+++ b/dev-python/paho-mqtt/paho-mqtt-1.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client class with support for both MQTT v3.1 and v3.1.1 on Python 2.7 or 3.x."
+HOMEPAGE="https://www.eclipse.org/paho/clients/python/"
+SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/${PV}.zip -> ${P}.zip"
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+S="${WORKDIR}/paho.mqtt.python-${PV}"
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.2.3.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.2.3.ebuild
new file mode 100644
index 000000000000..b066060999e9
--- /dev/null
+++ b/dev-python/paho-mqtt/paho-mqtt-1.2.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client class with support for both MQTT v3.1 and v3.1.1 on Python 2.7 or 3.x."
+HOMEPAGE="https://www.eclipse.org/paho/clients/python/"
+SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/paho.mqtt.python-${PV}"
+
+python_prepare() {
+	sed -i -e "s/python/${EPYTHON}/" test/lib/Makefile || die
+}
+
+python_test() {
+	emake test
+}
diff --git a/dev-python/paisley/Manifest b/dev-python/paisley/Manifest
new file mode 100644
index 000000000000..de1a43cb8173
--- /dev/null
+++ b/dev-python/paisley/Manifest
@@ -0,0 +1,5 @@
+DIST paisley-0.3.1.tar.gz 6373 SHA256 531767b266c82e72d7f58e91b8e8093da6d227c779069894b50253f1fad280a3 SHA512 abfceece7c3156fd3ed234e1c2ed07e8f3e366c735969e382feb3b8c464679d8a9f0a224be0720c351b3e19d576bb5aff6fc11d789bfd879a0f2aba40dfaef73 WHIRLPOOL fe4955aebadf9a508210f55b2a20c47bf5af974949fd1cec1d7192a7f109ae089ed336dd86e8c839dfb5a29a0b455d4268e655ccbc706458857b95e6980fd2e1
+EBUILD paisley-0.3.1-r1.ebuild 711 SHA256 02af24da877543599845625db9558db8438e1c7bf195f45851219daae0709805 SHA512 ccb45d394372d6407eb7cd67e79b25551a9d920cbc696806165d1d81728cd7797ffed96329519e8ac19496f7b81255fa70915d305a213af1871317bfc42fc011 WHIRLPOOL 393a7387542f5e90351813049a3e7fed62c80e160c8a1dfaae32ce65ec3d8d461b9074935669ceddc36cd36be6f8f50caae3062ca7393dcc3c5ba6ce12fdd4e7
+MISC ChangeLog 2860 SHA256 e172cba1a2e5a84bd4358030c76bd611180b566b80394f0184d92e1aa7078f73 SHA512 87f34a8dc0d04f7db3386205c6276272aa1e9fb85fcc53914a15e8e4e8530d110063a4f201b7498e005f78ae0131b0c0762e5b188eac417a38f78ef939d20089 WHIRLPOOL ebba29de20918dfce14303e70bb030ec5dfa5d75578144c828693024f86120e0ba42d203e1515c9035af29747bdd4fa8c3e2ea5576ec832e664c808310c041b0
+MISC ChangeLog-2015 2588 SHA256 ea854c2f6c7963730191508eb9e9353a76af201312d608a5cfc8e1a4b15b3afa SHA512 4e95ceaccbd27af632a1d5b9c0cf070fa4778eada755ddea5da063e2613b29c0470c1c483a6f91c1deec4275646c6bc8272254225c2ea6e3c3a75f8e33790dcd WHIRLPOOL d7f3c84c88359fc0d72504d9c1cc1e745dffc34debfc103e2ccde5e35b987fb99ab2f17e40e40e6596a2d398c39dcb10016b676bba3854ddd3fc49c23b47446a
+MISC metadata.xml 360 SHA256 3de8de8b205212c8af2d0474047b430f95b47d565d4fa5580ff452098bc9ff43 SHA512 ca6e4de92fe0d28e9165200e837d6031be7ff5aec3f83135d51da44aab7a31735a84ff392d4fa42a0c977bccd454c6da061fdd280cd640ec59a76c33cc6ed075 WHIRLPOOL 46910798c8c71276e26961ec03bd1b889aa5a5fba26541c4880aa265c90fc3ef4ade9ef5b25d22804e3f73cd5e0283e2a4501b6e3012af3e7beb0cfd95f35e36
diff --git a/dev-python/paisley/metadata.xml b/dev-python/paisley/metadata.xml
new file mode 100644
index 000000000000..dcdf941f87d8
--- /dev/null
+++ b/dev-python/paisley/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">paisley</remote-id>
+		<remote-id type="launchpad">paisley</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/paisley/paisley-0.3.1-r1.ebuild b/dev-python/paisley/paisley-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..b777ecbff058
--- /dev/null
+++ b/dev-python/paisley/paisley-0.3.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Paisley is a CouchDB client written in Python to be used within a Twisted application"
+HOMEPAGE="https://launchpad.net/paisley https://pypi.python.org/pypi/paisley"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="test"
+
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/twisted-web[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die "tests failed"
+}
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
new file mode 100644
index 000000000000..40077037a5d4
--- /dev/null
+++ b/dev-python/pandas/Manifest
@@ -0,0 +1,19 @@
+AUX pandas-0.17.0-testfix-backport.patch 1175 SHA256 15be2b513d47cc9b6190a028018e4e6ca7402b8dfdbbbd9623f722b978bfeb9a SHA512 1b59919c6a3e3d835af3f1fac2350db596fa420a02f405a4b0de4a751c2a762606557306e4b42cf696730a0c104ef10544a4d0f82a64a6839b38ba14245f30ef WHIRLPOOL 1c7c36c230357828cc2cc6319308ea04bdfc651d5f8fb85c9c386be4c08b70b126d0a7122d801410e3b7e12ed3344bda31217163fd4aee2133ccdd6fb1224d02
+AUX pandas-0.19.1-gapi.patch 799 SHA256 6f5a49af6561f87c1dab007d8b9c3ae55cff297ac4f9641b195b3f957c6b682c SHA512 b1a4e7c5f480efadfaf70caaa3293cb3f16ebf36c4705597a22ecc06de7e5b2379ddb4061279d669d2c66d3ef149a74f300ec1127bd441ad1b9288cb9233c781 WHIRLPOOL d0c5c0e7b545c3ba0c9725a1a9ace994013ffc0e2bf3f86e9b0dd178a900c5a5fa789c6c2668a2be58ce06d91feeac5625bcee50a2a2f74a25fa1f7794d1e44a
+AUX pandas-0.19.1-seqf.patch 14381 SHA256 d8ff9c6bc98029f9f1d112551f5e5794bc7344aef3651c1d4da5f7b5c7729a38 SHA512 b5675c89e087d47b94cfb036047b396d5a94b74bc03e95c92d5152bfc5598feddba88a781b6a11e533c46ba638aa50f0814d383c20d95f4e091deaee480b6d3e WHIRLPOOL 281f3bb00e3d1351b450b42d0c7eba01ff2c53d8f4a2b8b4f7b17ba0f257c771e5e45dfa5d6fe46180ed3e8030e12126729bf8c7c1543445d10715cf1fa34295
+DIST pandas-0.16.2.tar.gz 4931751 SHA256 e01853dfe111f3aea005315573400b7216ddbabbf1f28d482a71217d67ae4f81 SHA512 44874e12a42a01dd7ed88f3f97e954732a534a5e2dc4815ef6203bdb2d88850a607e6631a35ae8fc79f4621a5dfaa34f39bb1c9a0ecfb17da1cf0c10f35ff27b WHIRLPOOL 6f2874ac07b49f4b2aaefdb87375b7c5adb31e3ff60c6b808f3e3467ad82999dd894de884ebbfd64fc7235e875d17ce871b516c96ff71a17310b708597168702
+DIST pandas-0.17.0.tar.gz 6508621 SHA256 320d4fdf734b82adebc8fde9d8ca4b05fe155a72b6f7aa95d76242da8748d6a4 SHA512 bae6964e263c7ff6cac722cdfe23081f23c357d9bc39a670b5627bef4630c236a58aa8c0393eae921721bf7049c8e5266b4dea71dd957da5d89dafc14a04797b WHIRLPOOL d654eb2f9ffbfedbde60e4a6e6ce6f54650a8a68b4d20035744aa55111525d6bba4dae2ccbfce65acf71bb200e2e6029c7f6c9bcc9d0c582d808444738baedb1
+DIST pandas-0.17.1.tar.gz 6674479 SHA256 cfd7214a7223703fe6999fbe34837749540efee1c985e6aee9933f30e3f72837 SHA512 9d9f9064585b1f3551625e0c8f4eedaaa1253790c2a5cb28e58e70eb805cc18f9770d793aa748cbd76798488ff60efdd01eb4b21daf5ad8f1dc4d9c050487234 WHIRLPOOL 5238575bd64b8d38db4f9a0ea987a7f78ffd1821e5a22bad65c84c407feca3af6f3b536a0a2f337291aa04e94c86fdb40382dad4ce50f8a33a5e26d655c628c2
+DIST pandas-0.19.1.tar.gz 8360233 SHA256 2509feaeda72fce03675e2eccd2284bb1cadb6a0737008a5e741fe2431d47421 SHA512 6451990a7fae8c6db8ab0b014a13b4f1828754d3998f13c17b111f891fb9fd23f8e09b907623096dfa55668c42298eee1373210a9fddb95f56dd7d552b964e6f WHIRLPOOL 700c0d819ab62134baf56430b7fa8840636ea377d00397341d33ec5f13474d9eeefea245aede80a80f7c16348ef811788947e5fe0020c9770005c74dd1288ef3
+DIST pandas-0.20.1.tar.gz 10307434 SHA256 42707365577ef69f7c9c168ddcf045df2957595a9ee71bc13c7997eecb96b190 SHA512 d477a815914c825efd6430f7eb19f3f9115c1c4ab03000ca6d4f64023f7b5f53eff512792fea2d8b33c7febb3667fc3a3de55f11eeb453f285cae40e6b473707 WHIRLPOOL fca35c7178441e3cfe990740aecba923d8b3d56d70fa7b0285b09305a0d2f7a6ad01bb906d6d92748a038a3841cda783f01f75f93b67f15c53c9854a43819841
+DIST pandas-0.20.3.tar.gz 10402185 SHA256 a777e07633d83d546c55706420179551c8e01075b53c497dcf8ae4036766bc66 SHA512 891c7e04d075f96fadf3775e903472e279eaeaa4509eb0da81a74261a3ed86ff309de0b5a2c100ee93dd968fed1df6d7e426ca78785b2b36785fe7679218fdc5 WHIRLPOOL 7a2a09e0a0d74cad4c8c89b63ecebad73e8defc99f17cbcd0ab56ca23cf9b1eb7c142b07d52ce9e53c7409ace0d4f71df9c855fef9817fa74f48b90bb51e6cf5
+EBUILD pandas-0.16.2.ebuild 3830 SHA256 adb7f62f0dee72f210d8cfd4db81f63b9bb637ec5e44e102c7dfddf5eec4c537 SHA512 b6e18279292c1772e5d9527e5f4baf520d07f30ee45e3604946cdc2b1731f881519815c229bdda41b2a02740c04f3d70fce6210bac094fb55c23fc5364970808 WHIRLPOOL e7d7002d9a4b2d7c6266bf2fce66206646e81b93079571df695e383eb9648959bec0fafe876db9e3cff171d1dbd1eb8cda5773b4cb32fef1649e9aa75d10ab6f
+EBUILD pandas-0.17.0.ebuild 3983 SHA256 beaa01d095778ec8077b6808cc4bbeae94fb46d4fc15457d013d08d9572f2896 SHA512 6a70c8b7045218f70ade388bde921c0f48c70344623d3ccaa4c0c7dd0ed35198da14e5faa28d1b16ed3a3ff88e174e662c53c2bb5cd6186464e8b718c97d84c7 WHIRLPOOL f6c424e2630317aa93923cfa6608ca2a36b2351bc221188522f300a4ad0428728918bd036c75652cbc64362ec73160c9bff24614b546e9cb844ebe629be743c8
+EBUILD pandas-0.17.1.ebuild 5955 SHA256 0eb646b49a97be79d185e37e455f377ea5d91d6b48f06bfb76c904077a45b73f SHA512 7fd34871cdf5178536c45416c2fcb39d76e3fa3355cee9ce39e44a228da6cb929980e52727683ece946328d0acd7f8a9072f60e1d696d9f00fea7b07f187f941 WHIRLPOOL 56731bb06b8b717fcd1fc4edc1eff9278e90e4bc8247dc93bc749a66a11a4ee04f5e3e56c29a666e5ec27b5e0513bc6f45f4ce716db32e44cd74fddd091159a5
+EBUILD pandas-0.19.1.ebuild 5913 SHA256 64b156ca01585a8e069ec8941e541e0b035f7f03cb207a4f72591932e80c702b SHA512 6e88582440d02ad3adf338692082ff671c0c4f93f56adb029abfa5dea7210de30308371f990e4b2bbcdfbd510040e40c18a373123a862099d779993f81dda714 WHIRLPOOL e5696d87bc8de493d5e9e0e337e760bf8f06ac6115e18801aa549dbf2ad8e5a26987e27bb7f10166dd0c0e42d0b1a3437ce13ddfc1bb8eb145d11f44067d7af2
+EBUILD pandas-0.20.1.ebuild 5846 SHA256 91d2305d0e0b90a65f176516f1234e986170011051c4678d89ca342bc4da4d9b SHA512 9bb42445edb8f4dc62df830e30b8ea2e0856bf214f0621d7cbecebd2adc142bc2a4031e162e9ff93daf5f600d9e405386a32dca515fa6433f91e962c8ae00c37 WHIRLPOOL 864bd412aed25ece04bae43dd77bc729420725b4b26532dc726c09060d6ee8a755f4f6b19207aed5a51640cfbaa8bfa3ac562b55e3f43a68329a2dcd83286b0f
+EBUILD pandas-0.20.3.ebuild 5759 SHA256 e76501b5e8add675f43eacb4ef26148873b069cb561170dbcf936c05386a24ae SHA512 fe6f54a082a50d4ab3edb16c9b2f11cae1440027b06e35b539133b76584c9ae615fa9f72a70328df26de7012c67d250574e47ec0b443eb84e480792b6743846b WHIRLPOOL ca0ec9509718f44a013ac116880a8a0c30f8e96be7340b7e463fbb08406e296eca92b6f8c6cbb82aa8ba2fae179804524cb905b5540427eb7bb0d2c319f01e54
+EBUILD pandas-9999.ebuild 5830 SHA256 6efa18dc578cd73a3cba94fce93931d15f2fa1365d97ddb5e66477273bcf2894 SHA512 b3bacfba75d58b10f0e4861ed7df8127af02ad4b65c71af58a5b68f43df23b0cb9c0646a720edd9f1dbdcc1a7fc59bbfd7d086428cc8e4439b46de24acfc18d7 WHIRLPOOL 65ace82bc9b30006db27ba7a19e919291dad9056175fdbb22b8e9607b0fbe1284f7be30ae380bb8780f6c52a0b74afe4b502a3401034477cd5029ee0f3ede9f9
+MISC ChangeLog 4521 SHA256 c5050821f598293335c7600f041544d671b964bc4aaa192a04be72120c57aef1 SHA512 1545d2199a02c8e38a7946dbe14ad91f3d5223976465512b8a30fe5e888ad611b88fbcdfe5b79efad6c153f973512cb7dc8a716c64d83c813060174141e5c4bd WHIRLPOOL bed06c4bec34e08d98781062da2c55d4840073132c45e5b253413c9612cb763af609f95a34d64fc51a2779cc8bf08d6026c016052d87a7f7413faf4991a644b4
+MISC ChangeLog-2015 9042 SHA256 987166649cbcd0aade8afe74fd18ff40230753dde4655205ec8d878cd3fbf114 SHA512 223baba993032a339753768ec7538b244f1c6bc812f0fc18327bebbc5005c159ac2f98213669f5daae29eaaa18c2bc84306239bb6714643436b1f02e59def4c3 WHIRLPOOL 5b96a18d1d7349200e7665c3ea263b0d1d22224c66f930949a9196d7c2ff36fd3903a2302d93e58ed2504a37ec286091d4586cc1c2c27ccc6ef56ba53e4876bb
+MISC metadata.xml 1077 SHA256 e4a2642d0377f1bb1abcc5f657d6c5aa608e08f652a84e1cfdeddea988f466eb SHA512 60b23a75873ded48dd01a36dae62f45f1cf5d044b88b125bda249fd6cf558ddef42d6677218053ed9d73de31da54f1f85bd1f64eab9b377f1a8b51fe1c510308 WHIRLPOOL af582dd02005329c1483d0c7e1b52856e98151c5d04d97480d1936ffe7ccdaaeb00cb679efd1aa8f092ab1ce5fcf807be9f5de00cc559f4bc1b8b2f02564836b
diff --git a/dev-python/pandas/files/pandas-0.17.0-testfix-backport.patch b/dev-python/pandas/files/pandas-0.17.0-testfix-backport.patch
new file mode 100644
index 000000000000..c83319256f22
--- /dev/null
+++ b/dev-python/pandas/files/pandas-0.17.0-testfix-backport.patch
@@ -0,0 +1,28 @@
+ pandas/tests/test_categorical.py | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/pandas/tests/test_categorical.py b/pandas/tests/test_categorical.py
+old mode 100755
+new mode 100644
+index e97010e..1d14323
+--- a/pandas/tests/test_categorical.py
++++ b/pandas/tests/test_categorical.py
+@@ -86,12 +86,14 @@ class TestCategorical(tm.TestCase):
+         factor = Categorical.from_array(arr, ordered=False)
+         self.assertFalse(factor.ordered)
+ 
+-        # this however will raise as cannot be sorted
+-        # but fixed in newer versions of numpy
+-        if LooseVersion(np.__version__) < "1.10":
++        if compat.PY3:
+             self.assertRaises(TypeError, lambda :  Categorical.from_array(arr, ordered=True))
+         else:
+-            Categorical.from_array(arr, ordered=True)
++            # this however will raise as cannot be sorted (on PY3 or older numpies)
++            if LooseVersion(np.__version__) < "1.10":
++                self.assertRaises(TypeError, lambda :  Categorical.from_array(arr, ordered=True))
++            else:
++                Categorical.from_array(arr, ordered=True)
+ 
+     def test_is_equal_dtype(self):
+ 
diff --git a/dev-python/pandas/files/pandas-0.19.1-gapi.patch b/dev-python/pandas/files/pandas-0.19.1-gapi.patch
new file mode 100644
index 000000000000..7a0456fdacfc
--- /dev/null
+++ b/dev-python/pandas/files/pandas-0.19.1-gapi.patch
@@ -0,0 +1,27 @@
+From 1d6dbb41b26a39121ec8c4f19f5da78bb0ab4af7 Mon Sep 17 00:00:00 2001
+From: Jeff Reback <jeff@reback.net>
+Date: Sat, 12 Nov 2016 12:44:06 -0500
+Subject: [PATCH] TST: skip test_gbq.test_upload_data_if_table_exists_replace
+ for now
+
+---
+ pandas/io/tests/test_gbq.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/pandas/io/tests/test_gbq.py b/pandas/io/tests/test_gbq.py
+index cca1580b8..f6ff35a6d 100644
+--- a/pandas/io/tests/test_gbq.py
++++ b/pandas/io/tests/test_gbq.py
+@@ -824,6 +824,9 @@ class TestToGBQIntegration(tm.TestCase):
+                        private_key=_get_private_key_path())
+ 
+     def test_upload_data_if_table_exists_replace(self):
++
++        raise nose.SkipTest("buggy test")
++
+         destination_table = DESTINATION_TABLE + "4"
+ 
+         test_size = 10
+-- 
+2.11.0
+
diff --git a/dev-python/pandas/files/pandas-0.19.1-seqf.patch b/dev-python/pandas/files/pandas-0.19.1-seqf.patch
new file mode 100644
index 000000000000..c82c14ff8fdd
--- /dev/null
+++ b/dev-python/pandas/files/pandas-0.19.1-seqf.patch
@@ -0,0 +1,357 @@
+From f8bd08e9c2fc6365980f41b846bbae4b40f08b83 Mon Sep 17 00:00:00 2001
+From: Jeff Reback <jeff@reback.net>
+Date: Sat, 12 Nov 2016 10:58:54 -0500
+Subject: [PATCH] BUG: segfault manifesting with dateutil=2.6 w.r.t. replace
+ when timezones are present
+
+closes #14621
+
+Author: Jeff Reback <jeff@reback.net>
+
+Closes #14631 from jreback/replace and squashes the following commits:
+
+3f95042 [Jeff Reback] BUG: segfault manifesting with dateutil=2.6 w.r.t. replace when timezones are present
+---
+ ci/requirements-3.5_OSX.pip            |  2 +-
+ doc/source/whatsnew/v0.19.2.txt        |  3 ++
+ pandas/tseries/offsets.py              |  1 +
+ pandas/tseries/tests/test_offsets.py   | 20 ++++---
+ pandas/tseries/tests/test_timezones.py | 89 +++++++++++++++++++++++++++++--
+ pandas/tseries/tests/test_tslib.py     |  5 +-
+ pandas/tslib.pyx                       | 95 ++++++++++++++++++++++++++++------
+ 7 files changed, 188 insertions(+), 27 deletions(-)
+
+diff --git a/pandas/tseries/offsets.py b/pandas/tseries/offsets.py
+index 051cc8aa4..2e3852a7e 100644
+--- a/pandas/tseries/offsets.py
++++ b/pandas/tseries/offsets.py
+@@ -68,6 +68,7 @@ def apply_wraps(func):
+                 other = other.tz_localize(None)
+ 
+             result = func(self, other)
++
+             if self._adjust_dst:
+                 result = tslib._localize_pydatetime(result, tz)
+ 
+diff --git a/pandas/tseries/tests/test_offsets.py b/pandas/tseries/tests/test_offsets.py
+index 1735ac4e2..768e9212e 100644
+--- a/pandas/tseries/tests/test_offsets.py
++++ b/pandas/tseries/tests/test_offsets.py
+@@ -1,4 +1,5 @@
+ import os
++from distutils.version import LooseVersion
+ from datetime import date, datetime, timedelta
+ from dateutil.relativedelta import relativedelta
+ from pandas.compat import range, iteritems
+@@ -4851,6 +4852,7 @@ class TestDST(tm.TestCase):
+ 
+     def _test_offset(self, offset_name, offset_n, tstart, expected_utc_offset):
+         offset = DateOffset(**{offset_name: offset_n})
++
+         t = tstart + offset
+         if expected_utc_offset is not None:
+             self.assertTrue(get_utc_offset_hours(t) == expected_utc_offset)
+@@ -4890,17 +4892,23 @@ class TestDST(tm.TestCase):
+         return Timestamp(string + offset_string).tz_convert(tz)
+ 
+     def test_fallback_plural(self):
+-        """test moving from daylight savings to standard time"""
++        # test moving from daylight savings to standard time
++        import dateutil
+         for tz, utc_offsets in self.timezone_utc_offsets.items():
+             hrs_pre = utc_offsets['utc_offset_daylight']
+             hrs_post = utc_offsets['utc_offset_standard']
+-            self._test_all_offsets(
+-                n=3, tstart=self._make_timestamp(self.ts_pre_fallback,
+-                                                 hrs_pre, tz),
+-                expected_utc_offset=hrs_post)
++
++            if dateutil.__version__ != LooseVersion('2.6.0'):
++                # buggy ambiguous behavior in 2.6.0
++                # GH 14621
++                # https://github.com/dateutil/dateutil/issues/321
++                self._test_all_offsets(
++                    n=3, tstart=self._make_timestamp(self.ts_pre_fallback,
++                                                     hrs_pre, tz),
++                    expected_utc_offset=hrs_post)
+ 
+     def test_springforward_plural(self):
+-        """test moving from standard to daylight savings"""
++        # test moving from standard to daylight savings
+         for tz, utc_offsets in self.timezone_utc_offsets.items():
+             hrs_pre = utc_offsets['utc_offset_standard']
+             hrs_post = utc_offsets['utc_offset_daylight']
+diff --git a/pandas/tseries/tests/test_timezones.py b/pandas/tseries/tests/test_timezones.py
+index 00e8ee631..db8cda5c7 100644
+--- a/pandas/tseries/tests/test_timezones.py
++++ b/pandas/tseries/tests/test_timezones.py
+@@ -4,7 +4,7 @@ import nose
+ 
+ import numpy as np
+ import pytz
+-
++from distutils.version import LooseVersion
+ from pandas.types.dtypes import DatetimeTZDtype
+ from pandas import (Index, Series, DataFrame, isnull, Timestamp)
+ 
+@@ -518,8 +518,12 @@ class TestTimeZoneSupportPytz(tm.TestCase):
+ 
+         times = date_range("2013-10-26 23:00", "2013-10-27 01:00", freq="H",
+                            tz=tz, ambiguous='infer')
+-        self.assertEqual(times[0], Timestamp('2013-10-26 23:00', tz=tz))
+-        self.assertEqual(times[-1], Timestamp('2013-10-27 01:00', tz=tz))
++        self.assertEqual(times[0], Timestamp('2013-10-26 23:00', tz=tz,
++                                             freq="H"))
++        if dateutil.__version__ != LooseVersion('2.6.0'):
++            # GH 14621
++            self.assertEqual(times[-1], Timestamp('2013-10-27 01:00', tz=tz,
++                                                  freq="H"))
+ 
+     def test_ambiguous_nat(self):
+         tz = self.tz('US/Eastern')
+@@ -1163,6 +1167,85 @@ class TestTimeZones(tm.TestCase):
+     def setUp(self):
+         tm._skip_if_no_pytz()
+ 
++    def test_replace(self):
++        # GH 14621
++        # GH 7825
++        # replacing datetime components with and w/o presence of a timezone
++        dt = Timestamp('2016-01-01 09:00:00')
++        result = dt.replace(hour=0)
++        expected = Timestamp('2016-01-01 00:00:00')
++        self.assertEqual(result, expected)
++
++        for tz in self.timezones:
++            dt = Timestamp('2016-01-01 09:00:00', tz=tz)
++            result = dt.replace(hour=0)
++            expected = Timestamp('2016-01-01 00:00:00', tz=tz)
++            self.assertEqual(result, expected)
++
++        # we preserve nanoseconds
++        dt = Timestamp('2016-01-01 09:00:00.000000123', tz=tz)
++        result = dt.replace(hour=0)
++        expected = Timestamp('2016-01-01 00:00:00.000000123', tz=tz)
++        self.assertEqual(result, expected)
++
++        # test all
++        dt = Timestamp('2016-01-01 09:00:00.000000123', tz=tz)
++        result = dt.replace(year=2015, month=2, day=2, hour=0, minute=5,
++                            second=5, microsecond=5, nanosecond=5)
++        expected = Timestamp('2015-02-02 00:05:05.000005005', tz=tz)
++        self.assertEqual(result, expected)
++
++        # error
++        def f():
++            dt.replace(foo=5)
++        self.assertRaises(ValueError, f)
++
++        def f():
++            dt.replace(hour=0.1)
++        self.assertRaises(ValueError, f)
++
++        # assert conversion to naive is the same as replacing tzinfo with None
++        dt = Timestamp('2013-11-03 01:59:59.999999-0400', tz='US/Eastern')
++        self.assertEqual(dt.tz_localize(None), dt.replace(tzinfo=None))
++
++    def test_ambiguous_compat(self):
++        # validate that pytz and dateutil are compat for dst
++        # when the transition happens
++        tm._skip_if_no_dateutil()
++        tm._skip_if_no_pytz()
++
++        pytz_zone = 'Europe/London'
++        dateutil_zone = 'dateutil/Europe/London'
++        result_pytz = (Timestamp('2013-10-27 01:00:00')
++                       .tz_localize(pytz_zone, ambiguous=0))
++        result_dateutil = (Timestamp('2013-10-27 01:00:00')
++                           .tz_localize(dateutil_zone, ambiguous=0))
++        self.assertEqual(result_pytz.value, result_dateutil.value)
++        self.assertEqual(result_pytz.value, 1382835600000000000)
++
++        # dateutil 2.6 buggy w.r.t. ambiguous=0
++        if dateutil.__version__ != LooseVersion('2.6.0'):
++            # GH 14621
++            # https://github.com/dateutil/dateutil/issues/321
++            self.assertEqual(result_pytz.to_pydatetime().tzname(),
++                             result_dateutil.to_pydatetime().tzname())
++            self.assertEqual(str(result_pytz), str(result_dateutil))
++
++        # 1 hour difference
++        result_pytz = (Timestamp('2013-10-27 01:00:00')
++                       .tz_localize(pytz_zone, ambiguous=1))
++        result_dateutil = (Timestamp('2013-10-27 01:00:00')
++                           .tz_localize(dateutil_zone, ambiguous=1))
++        self.assertEqual(result_pytz.value, result_dateutil.value)
++        self.assertEqual(result_pytz.value, 1382832000000000000)
++
++        # dateutil < 2.6 is buggy w.r.t. ambiguous timezones
++        if dateutil.__version__ > LooseVersion('2.5.3'):
++            # GH 14621
++            self.assertEqual(str(result_pytz), str(result_dateutil))
++            self.assertEqual(result_pytz.to_pydatetime().tzname(),
++                             result_dateutil.to_pydatetime().tzname())
++
+     def test_index_equals_with_tz(self):
+         left = date_range('1/1/2011', periods=100, freq='H', tz='utc')
+         right = date_range('1/1/2011', periods=100, freq='H', tz='US/Eastern')
+diff --git a/pandas/tseries/tests/test_tslib.py b/pandas/tseries/tests/test_tslib.py
+index 21cfe84f1..b45f867be 100644
+--- a/pandas/tseries/tests/test_tslib.py
++++ b/pandas/tseries/tests/test_tslib.py
+@@ -327,8 +327,9 @@ class TestTimestamp(tm.TestCase):
+ 
+         # dateutil zone change (only matters for repr)
+         import dateutil
+-        if dateutil.__version__ >= LooseVersion(
+-                '2.3') and dateutil.__version__ <= LooseVersion('2.4.0'):
++        if (dateutil.__version__ >= LooseVersion('2.3') and
++            (dateutil.__version__ <= LooseVersion('2.4.0') or
++             dateutil.__version__ >= LooseVersion('2.6.0'))):
+             timezones = ['UTC', 'Asia/Tokyo', 'US/Eastern',
+                          'dateutil/US/Pacific']
+         else:
+diff --git a/pandas/tslib.pyx b/pandas/tslib.pyx
+index d4eaaa0b5..685de214c 100644
+--- a/pandas/tslib.pyx
++++ b/pandas/tslib.pyx
+@@ -98,6 +98,7 @@ except NameError: # py3
+ cdef inline object create_timestamp_from_ts(
+         int64_t value, pandas_datetimestruct dts,
+         object tz, object freq):
++    """ convenience routine to construct a Timestamp from its parts """
+     cdef _Timestamp ts_base
+     ts_base = _Timestamp.__new__(Timestamp, dts.year, dts.month,
+                                  dts.day, dts.hour, dts.min,
+@@ -112,6 +113,7 @@ cdef inline object create_timestamp_from_ts(
+ cdef inline object create_datetime_from_ts(
+         int64_t value, pandas_datetimestruct dts,
+         object tz, object freq):
++    """ convenience routine to construct a datetime.datetime from its parts """
+     return datetime(dts.year, dts.month, dts.day, dts.hour,
+                     dts.min, dts.sec, dts.us, tz)
+ 
+@@ -378,7 +380,6 @@ class Timestamp(_Timestamp):
+         # Mixing pydatetime positional and keyword arguments is forbidden!
+ 
+         cdef _TSObject ts
+-        cdef _Timestamp ts_base
+ 
+         if offset is not None:
+             # deprecate offset kwd in 0.19.0, GH13593
+@@ -412,17 +413,7 @@ class Timestamp(_Timestamp):
+             from pandas.tseries.frequencies import to_offset
+             freq = to_offset(freq)
+ 
+-        # make datetime happy
+-        ts_base = _Timestamp.__new__(cls, ts.dts.year, ts.dts.month,
+-                                     ts.dts.day, ts.dts.hour, ts.dts.min,
+-                                     ts.dts.sec, ts.dts.us, ts.tzinfo)
+-
+-        # fill out rest of data
+-        ts_base.value = ts.value
+-        ts_base.freq = freq
+-        ts_base.nanosecond = ts.dts.ps / 1000
+-
+-        return ts_base
++        return create_timestamp_from_ts(ts.value, ts.dts, ts.tzinfo, freq)
+ 
+     def _round(self, freq, rounder):
+ 
+@@ -660,8 +651,80 @@ class Timestamp(_Timestamp):
+     astimezone = tz_convert
+ 
+     def replace(self, **kwds):
+-        return Timestamp(datetime.replace(self, **kwds),
+-                         freq=self.freq)
++        """
++        implements datetime.replace, handles nanoseconds
++
++        Parameters
++        ----------
++        kwargs: key-value dict
++
++        accepted keywords are:
++        year, month, day, hour, minute, second, microsecond, nanosecond, tzinfo
++
++        values must be integer, or for tzinfo, a tz-convertible
++
++        Returns
++        -------
++        Timestamp with fields replaced
++        """
++
++        cdef:
++            pandas_datetimestruct dts
++            int64_t value
++            object tzinfo, result, k, v
++            _TSObject ts
++
++        # set to naive if needed
++        tzinfo = self.tzinfo
++        value = self.value
++        if tzinfo is not None:
++            value = tz_convert_single(value, 'UTC', tzinfo)
++
++        # setup components
++        pandas_datetime_to_datetimestruct(value, PANDAS_FR_ns, &dts)
++        dts.ps = self.nanosecond * 1000
++
++        # replace
++        def validate(k, v):
++            """ validate integers """
++            if not isinstance(v, int):
++                raise ValueError("value must be an integer, received {v} for {k}".format(v=type(v), k=k))
++            return v
++
++        for k, v in kwds.items():
++            if k == 'year':
++                dts.year = validate(k, v)
++            elif k == 'month':
++                dts.month = validate(k, v)
++            elif k == 'day':
++                dts.day = validate(k, v)
++            elif k == 'hour':
++                dts.hour = validate(k, v)
++            elif k == 'minute':
++                dts.min = validate(k, v)
++            elif k == 'second':
++                dts.sec = validate(k, v)
++            elif k == 'microsecond':
++                dts.us = validate(k, v)
++            elif k == 'nanosecond':
++                dts.ps = validate(k, v) * 1000
++            elif k == 'tzinfo':
++                tzinfo = v
++            else:
++                raise ValueError("invalid name {} passed".format(k))
++
++        # reconstruct & check bounds
++        value = pandas_datetimestruct_to_datetime(PANDAS_FR_ns, &dts)
++        if value != NPY_NAT:
++            _check_dts_bounds(&dts)
++
++        # set tz if needed
++        if tzinfo is not None:
++            value = tz_convert_single(value, tzinfo, 'UTC')
++
++        result = create_timestamp_from_ts(value, dts, tzinfo, self.freq)
++
++        return result
+ 
+     def isoformat(self, sep='T'):
+         base = super(_Timestamp, self).isoformat(sep=sep)
+@@ -5041,7 +5104,9 @@ cpdef normalize_date(object dt):
+     -------
+     normalized : datetime.datetime or Timestamp
+     """
+-    if PyDateTime_Check(dt):
++    if is_timestamp(dt):
++        return dt.replace(hour=0, minute=0, second=0, microsecond=0, nanosecond=0)
++    elif PyDateTime_Check(dt):
+         return dt.replace(hour=0, minute=0, second=0, microsecond=0)
+     elif PyDate_Check(dt):
+         return datetime(dt.year, dt.month, dt.day)
+-- 
+2.11.0
+
diff --git a/dev-python/pandas/metadata.xml b/dev-python/pandas/metadata.xml
new file mode 100644
index 000000000000..2633bf05b9c0
--- /dev/null
+++ b/dev-python/pandas/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  Pandas is a Python package providing fast, flexible, and expressive
+  data structures designed to make working with "relational" or
+  "labeled" data both easy and intuitive. It aims to be the
+  fundamental high-level building block for doing practical, real
+  world data analysis in Python. 
+</longdescription>
+  <use>
+    <flag name="full-support">Pull all packages to give pandas full support</flag>
+    <flag name="excel">Pull a few Python packages for Microsoft Excel i/o</flag>
+    <flag name="html">Enable HTML i/o via <pkg>dev-python/beautifulsoup</pkg></flag>
+    <flag name="R">Enable support for R via <pkg>dev-python/rpy</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">pandas</remote-id>
+    <remote-id type="github">pandas-dev/pandas</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pandas/pandas-0.16.2.ebuild b/dev-python/pandas/pandas-0.16.2.ebuild
new file mode 100644
index 000000000000..7b2da1706956
--- /dev/null
+++ b/dev-python/pandas/pandas-0.16.2.ebuild
@@ -0,0 +1,128 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils flag-o-matic virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="http://pandas.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc excel html test R"
+
+EXTRA_DEPEND="
+	>=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
+	dev-python/openpyxl[${PYTHON_USEDEP}]
+	dev-python/pymysql[${PYTHON_USEDEP}]
+	dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
+	dev-python/psycopg:2[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	"
+CDEPEND="
+	>dev-python/numpy-1.7[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+	!~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		dev-python/xlrd[$(python_gen_usedep 'python2_7')]
+		dev-python/xlwt[$(python_gen_usedep 'python2_7')]
+		x11-misc/xclip
+		)
+	test? (
+		${EXTRA_DEPEND}
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+		)"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="${CDEPEND}
+	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
+	dev-python/bottleneck[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pytables[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	excel? (
+		dev-python/xlrd[$(python_gen_usedep 'python2_7')]
+		dev-python/xlwt[$(python_gen_usedep 'python2_7')]
+		|| (
+			dev-python/xlsxwriter[${PYTHON_USEDEP}]
+			>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		)
+	)
+	html? (
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		|| (
+			dev-python/lxml[${PYTHON_USEDEP}]
+			dev-python/html5lib[${PYTHON_USEDEP}] )
+	)
+	R? ( dev-python/rpy[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. "${EPYTHON}" make.py html || die
+	fi
+}
+
+python_test() {
+	local test_pandas='not network and not disabled'
+	[[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
+	pushd  "${BUILD_DIR}"/lib > /dev/null
+	VIRTUALX_COMMAND="nosetests"
+	PYTHONPATH=. MPLCONFIGDIR=. HOME=. \
+		virtualmake --verbosity=3 -A "${test_pandas}" pandas
+	popd > /dev/null
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	local x
+	elog "Please install"
+	for x in ${EXTRA_DEPEND}; do
+		optfeature "additional functionality" "${x%%[*}"
+	done
+}
diff --git a/dev-python/pandas/pandas-0.17.0.ebuild b/dev-python/pandas/pandas-0.17.0.ebuild
new file mode 100644
index 000000000000..22a63f27a32a
--- /dev/null
+++ b/dev-python/pandas/pandas-0.17.0.ebuild
@@ -0,0 +1,137 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils flag-o-matic virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="http://pandas.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc excel html test R"
+
+EXTRA_DEPEND="
+	>=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
+	dev-python/openpyxl[${PYTHON_USEDEP}]
+	dev-python/pymysql[${PYTHON_USEDEP}]
+	dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
+	dev-python/psycopg:2[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	"
+CDEPEND="
+	>dev-python/numpy-1.7[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+	!~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		)
+	test? (
+		${EXTRA_DEPEND}
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+		)"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="${CDEPEND}
+	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
+	dev-python/bottleneck[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pytables[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	excel? (
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		|| (
+			dev-python/xlsxwriter[${PYTHON_USEDEP}]
+			>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		)
+	)
+	html? (
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		|| (
+			dev-python/lxml[${PYTHON_USEDEP}]
+			dev-python/html5lib[${PYTHON_USEDEP}] )
+	)
+	R? ( dev-python/rpy[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-testfix-backport.patch
+)
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die
+
+	# https://github.com/pydata/pandas/issues/11299
+	sed \
+		-e 's:testOdArray:disable:g' \
+		-i pandas/io/tests/test_json/test_ujson.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. "${EPYTHON}" make.py html || die
+	fi
+}
+
+python_test() {
+	local test_pandas='not network and not disabled'
+	[[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
+	pushd  "${BUILD_DIR}"/lib > /dev/null
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	VIRTUALX_COMMAND="nosetests"
+	PYTHONPATH=. MPLCONFIGDIR=. \
+		virtualmake --verbosity=3 -A "${test_pandas}" pandas
+	popd > /dev/null
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	local x
+	elog "Please install"
+	for x in ${EXTRA_DEPEND}; do
+		optfeature "additional functionality" "${x%%[*}"
+	done
+}
diff --git a/dev-python/pandas/pandas-0.17.1.ebuild b/dev-python/pandas/pandas-0.17.1.ebuild
new file mode 100644
index 000000000000..8ddf16d1d5b1
--- /dev/null
+++ b/dev-python/pandas/pandas-0.17.1.ebuild
@@ -0,0 +1,166 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+
+inherit distutils-r1 eutils flag-o-matic virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="http://pandas.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc -minimal full-support test X"
+
+MINIMAL_DEPEND="
+	>dev-python/numpy-1.7[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	!<dev-python/numexpr-2.1[${PYTHON_USEDEP}]
+	!~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
+RECOMMENDED_DEPEND="
+	dev-python/bottleneck[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]"
+OPTIONAL_DEPEND="
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/blosc[${PYTHON_USEDEP}]
+	dev-python/boto[${PYTHON_USEDEP}]
+	>=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
+	|| ( dev-python/html5lib[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] )
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	|| ( >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] dev-python/xlsxwriter[${PYTHON_USEDEP}] )
+	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
+	dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
+	dev-python/rpy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
+	dev-python/xlrd[${PYTHON_USEDEP}]
+	dev-python/xlwt[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	X? (
+		|| (
+			dev-python/PyQt4[${PYTHON_USEDEP}]
+			dev-python/pyside[${PYTHON_USEDEP}]
+			dev-python/pygtk[$(python_gen_usedep python2_7)]
+		)
+		|| (
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+	"
+
+DEPEND="${MINIMAL_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
+	doc? (
+		${VIRTUALX_DEPEND}
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+		x11-misc/xclip
+	)
+	test? (
+		${VIRTUALX_DEPEND}
+		${RECOMMENDED_DEPEND}
+		${OPTIONAL_DEPEND}
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+	)"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="
+	${MINIMAL_DEPEND}
+	!minimal? ( ${RECOMMENDED_DEPEND} )
+	full-support? ( ${OPTIONAL_DEPEND} )"
+
+_PATCHES=(
+	"${FILESDIR}"/${P}-testfix-backport.patch
+)
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die
+
+	# https://github.com/pydata/pandas/issues/11299
+	sed \
+		-e 's:testOdArray:disable:g' \
+		-i pandas/io/tests/test_json/test_ujson.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		VIRTUALX_COMMAND="${EPYTHON}"
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. virtualmake make.py html || die
+	fi
+}
+
+python_test() {
+	local test_pandas='not network and not disabled'
+	[[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
+	pushd  "${BUILD_DIR}"/lib > /dev/null
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	VIRTUALX_COMMAND="nosetests"
+	PYTHONPATH=. MPLCONFIGDIR=. \
+		virtualmake --verbosity=3 -A "${test_pandas}" pandas
+	popd > /dev/null
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "necessary for Amazon S3 access" dev-python/boto
+	optfeature "needed for pandas.io.gbq" dev-python/httplib2 dev-python/setuptools dev-python/python-gflags ">=dev-python/google-api-python-client-1.2.0"
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Plotting support" dev-python/matplotlib
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
+	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
+	optfeature "R I/O support" dev-python/rpy
+	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
+	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
+	optfeature "miscellaneous statistical functions" sci-libs/scipy
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt4 dev-python/pyside dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
diff --git a/dev-python/pandas/pandas-0.19.1.ebuild b/dev-python/pandas/pandas-0.19.1.ebuild
new file mode 100644
index 000000000000..4ed143486987
--- /dev/null
+++ b/dev-python/pandas/pandas-0.19.1.ebuild
@@ -0,0 +1,165 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+
+inherit distutils-r1 eutils flag-o-matic virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="http://pandas.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc -minimal full-support test X"
+
+MINIMAL_DEPEND="
+	>dev-python/numpy-1.7[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	!<dev-python/numexpr-2.1[${PYTHON_USEDEP}]
+	!~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
+RECOMMENDED_DEPEND="
+	dev-python/bottleneck[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]"
+OPTIONAL_DEPEND="
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/blosc[${PYTHON_USEDEP}]
+	dev-python/boto[${PYTHON_USEDEP}]
+	>=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
+	|| ( dev-python/html5lib[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] )
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	|| ( >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] dev-python/xlsxwriter[${PYTHON_USEDEP}] )
+	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
+	dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
+	dev-python/rpy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
+	dev-python/xlrd[${PYTHON_USEDEP}]
+	dev-python/xlwt[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	X? (
+		|| (
+			dev-python/PyQt4[${PYTHON_USEDEP}]
+			dev-python/pyside[${PYTHON_USEDEP}]
+			dev-python/pygtk[$(python_gen_usedep python2_7)]
+		)
+		|| (
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+	"
+
+DEPEND="${MINIMAL_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
+	doc? (
+		${VIRTUALX_DEPEND}
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+		x11-misc/xclip
+	)
+	test? (
+		${VIRTUALX_DEPEND}
+		${RECOMMENDED_DEPEND}
+		${OPTIONAL_DEPEND}
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+	)"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="
+	${MINIMAL_DEPEND}
+	!minimal? ( ${RECOMMENDED_DEPEND} )
+	full-support? ( ${OPTIONAL_DEPEND} )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gapi.patch
+	"${FILESDIR}"/${P}-seqf.patch
+)
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die
+
+	# https://github.com/pydata/pandas/issues/11299
+	sed \
+		-e 's:testOdArray:disable:g' \
+		-i pandas/io/tests/json/test_ujson.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html || die
+	fi
+}
+
+python_test() {
+	local test_pandas='not network and not disabled'
+	[[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
+	pushd  "${BUILD_DIR}"/lib > /dev/null
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	PYTHONPATH=. MPLCONFIGDIR=. \
+		virtx nosetests --verbosity=3 -A "${test_pandas}" pandas
+	popd > /dev/null
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "necessary for Amazon S3 access" dev-python/boto
+	optfeature "needed for pandas.io.gbq" dev-python/httplib2 dev-python/setuptools dev-python/python-gflags ">=dev-python/google-api-python-client-1.2.0"
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Plotting support" dev-python/matplotlib
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
+	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
+	optfeature "R I/O support" dev-python/rpy
+	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
+	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
+	optfeature "miscellaneous statistical functions" sci-libs/scipy
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt4 dev-python/pyside dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
diff --git a/dev-python/pandas/pandas-0.20.1.ebuild b/dev-python/pandas/pandas-0.20.1.ebuild
new file mode 100644
index 000000000000..9e3b7f8bd657
--- /dev/null
+++ b/dev-python/pandas/pandas-0.20.1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+
+inherit distutils-r1 eutils flag-o-matic virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="http://pandas.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc -minimal full-support test X"
+
+MINIMAL_DEPEND="
+	>dev-python/numpy-1.7[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	!<dev-python/numexpr-2.1[${PYTHON_USEDEP}]
+	!~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
+RECOMMENDED_DEPEND="
+	dev-python/bottleneck[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]"
+OPTIONAL_DEPEND="
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/blosc[${PYTHON_USEDEP}]
+	dev-python/boto[${PYTHON_USEDEP}]
+	>=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
+	|| ( dev-python/html5lib[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] )
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	|| ( >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] dev-python/xlsxwriter[${PYTHON_USEDEP}] )
+	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
+	dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
+	dev-python/rpy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
+	dev-python/xlrd[${PYTHON_USEDEP}]
+	dev-python/xlwt[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	X? (
+		|| (
+			dev-python/PyQt4[${PYTHON_USEDEP}]
+			dev-python/pyside[${PYTHON_USEDEP}]
+			dev-python/pygtk[$(python_gen_usedep python2_7)]
+		)
+		|| (
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+	"
+
+DEPEND="${MINIMAL_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.23[${PYTHON_USEDEP}]
+	doc? (
+		${VIRTUALX_DEPEND}
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+		x11-misc/xclip
+	)
+	test? (
+		${VIRTUALX_DEPEND}
+		${RECOMMENDED_DEPEND}
+		${OPTIONAL_DEPEND}
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+	)"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="
+	${MINIMAL_DEPEND}
+	!minimal? ( ${RECOMMENDED_DEPEND} )
+	full-support? ( ${OPTIONAL_DEPEND} )"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed \
+		-e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+
+	# https://github.com/pydata/pandas/issues/11299
+	sed \
+		-e 's:testOdArray:disable:g' \
+		-i pandas/tests/io/json/test_ujson.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html || die
+	fi
+}
+
+python_test() {
+	local test_pandas='not network and not disabled'
+	[[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
+	pushd  "${BUILD_DIR}"/lib > /dev/null
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	PYTHONPATH=. MPLCONFIGDIR=. \
+		virtx nosetests --verbosity=3 -A "${test_pandas}" pandas
+	popd > /dev/null
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "necessary for Amazon S3 access" dev-python/boto
+	optfeature "needed for pandas.io.gbq" dev-python/httplib2 dev-python/setuptools dev-python/python-gflags ">=dev-python/google-api-python-client-1.2.0"
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Plotting support" dev-python/matplotlib
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
+	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
+	optfeature "R I/O support" dev-python/rpy
+	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
+	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
+	optfeature "miscellaneous statistical functions" sci-libs/scipy
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt4 dev-python/pyside dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
diff --git a/dev-python/pandas/pandas-0.20.3.ebuild b/dev-python/pandas/pandas-0.20.3.ebuild
new file mode 100644
index 000000000000..a28647857c1c
--- /dev/null
+++ b/dev-python/pandas/pandas-0.20.3.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+
+inherit distutils-r1 eutils flag-o-matic virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="http://pandas.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc -minimal full-support test X"
+
+MINIMAL_DEPEND="
+	>dev-python/numpy-1.7[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	!<dev-python/numexpr-2.1[${PYTHON_USEDEP}]
+	!~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
+RECOMMENDED_DEPEND="
+	dev-python/bottleneck[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]"
+OPTIONAL_DEPEND="
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/blosc[${PYTHON_USEDEP}]
+	dev-python/boto[${PYTHON_USEDEP}]
+	>=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
+	|| ( dev-python/html5lib[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] )
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	|| ( >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] dev-python/xlsxwriter[${PYTHON_USEDEP}] )
+	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
+	dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
+	dev-python/rpy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
+	dev-python/xarray[${PYTHON_USEDEP}]
+	dev-python/xlrd[${PYTHON_USEDEP}]
+	dev-python/xlwt[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	X? (
+		|| (
+			dev-python/PyQt4[${PYTHON_USEDEP}]
+			dev-python/pyside[${PYTHON_USEDEP}]
+			dev-python/pygtk[$(python_gen_usedep python2_7)]
+		)
+		|| (
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+	"
+
+DEPEND="${MINIMAL_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.23[${PYTHON_USEDEP}]
+	doc? (
+		${VIRTUALX_DEPEND}
+		app-text/pandoc
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+		x11-misc/xclip
+	)
+	test? (
+		${VIRTUALX_DEPEND}
+		${RECOMMENDED_DEPEND}
+		${OPTIONAL_DEPEND}
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+	)"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="
+	${MINIMAL_DEPEND}
+	!minimal? ( ${RECOMMENDED_DEPEND} )
+	full-support? ( ${OPTIONAL_DEPEND} )"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html || die
+	fi
+}
+
+python_test() {
+	local test_pandas='not network and not disabled'
+	[[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
+	pushd  "${BUILD_DIR}"/lib > /dev/null
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	PYTHONPATH=. MPLCONFIGDIR=. \
+		virtx nosetests --verbosity=3 -A "${test_pandas}" pandas
+	popd > /dev/null
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "necessary for Amazon S3 access" dev-python/boto
+	optfeature "needed for pandas.io.gbq" dev-python/httplib2 dev-python/setuptools dev-python/python-gflags ">=dev-python/google-api-python-client-1.2.0"
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Plotting support" dev-python/matplotlib
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
+	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
+	optfeature "R I/O support" dev-python/rpy
+	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
+	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
+	optfeature "miscellaneous statistical functions" sci-libs/scipy
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt4 dev-python/pyside dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
diff --git a/dev-python/pandas/pandas-9999.ebuild b/dev-python/pandas/pandas-9999.ebuild
new file mode 100644
index 000000000000..c29b323ee1ac
--- /dev/null
+++ b/dev-python/pandas/pandas-9999.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+
+inherit distutils-r1 eutils flag-o-matic git-r3 virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="http://pandas.pydata.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/pydata/pandas.git"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS=""
+IUSE="doc -minimal full-support test X"
+
+MINIMAL_DEPEND="
+	>dev-python/numpy-1.7[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	!<dev-python/numexpr-2.1[${PYTHON_USEDEP}]
+	!~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
+RECOMMENDED_DEPEND="
+	dev-python/bottleneck[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]"
+OPTIONAL_DEPEND="
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/blosc[${PYTHON_USEDEP}]
+	dev-python/boto[${PYTHON_USEDEP}]
+	>=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
+	|| ( dev-python/html5lib[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] )
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	|| ( >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] dev-python/xlsxwriter[${PYTHON_USEDEP}] )
+	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
+	dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
+	dev-python/rpy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
+	dev-python/xlrd[${PYTHON_USEDEP}]
+	dev-python/xlwt[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	X? (
+		|| (
+			dev-python/PyQt4[${PYTHON_USEDEP}]
+			dev-python/pyside[${PYTHON_USEDEP}]
+			dev-python/pygtk[$(python_gen_usedep python2_7)]
+		)
+		|| (
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+	"
+
+DEPEND="${MINIMAL_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.23[${PYTHON_USEDEP}]
+	doc? (
+		${VIRTUALX_DEPEND}
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+		x11-misc/xclip
+	)
+	test? (
+		${VIRTUALX_DEPEND}
+		${RECOMMENDED_DEPEND}
+		${OPTIONAL_DEPEND}
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+	)"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="
+	${MINIMAL_DEPEND}
+	!minimal? ( ${RECOMMENDED_DEPEND} )
+	full-support? ( ${OPTIONAL_DEPEND} )"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed \
+		-e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+
+	# https://github.com/pydata/pandas/issues/11299
+	sed \
+		-e 's:testOdArray:disable:g' \
+		-i pandas/tests/io/json/test_ujson.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html || die
+	fi
+}
+
+python_test() {
+	local test_pandas='not network and not disabled'
+	[[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
+	pushd  "${BUILD_DIR}"/lib > /dev/null
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	PYTHONPATH=. MPLCONFIGDIR=. \
+		virtx nosetests --verbosity=3 -A "${test_pandas}" pandas
+	popd > /dev/null
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "necessary for Amazon S3 access" dev-python/boto
+	optfeature "needed for pandas.io.gbq" dev-python/httplib2 dev-python/setuptools dev-python/python-gflags ">=dev-python/google-api-python-client-1.2.0"
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Plotting support" dev-python/matplotlib
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
+	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
+	optfeature "R I/O support" dev-python/rpy
+	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
+	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
+	optfeature "miscellaneous statistical functions" sci-libs/scipy
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt4 dev-python/pyside dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
diff --git a/dev-python/pandocfilters/Manifest b/dev-python/pandocfilters/Manifest
new file mode 100644
index 000000000000..6aca110fc689
--- /dev/null
+++ b/dev-python/pandocfilters/Manifest
@@ -0,0 +1,7 @@
+DIST pandocfilters-1.2.4.tar.gz 7296 SHA256 e2c8e9820e89e52a882b26d3242dccb5931d3a1174d5f6bc31f8ee9e8b37b3cc SHA512 3f819aebc4380ceee57e521e958bb7d29d806d2bfe3c9bddd30661d143069e39b0df79283d6c7ee85ee40fa4fa10df68fa40200395145e47b63fa96177ec226b WHIRLPOOL 676fab4a9fb0d2f872187d3c739e63e08ef49caba405d9646ceec29a948318989f85410bbf1cb9c24c74f93c343cf9e4db3fc2b3390aa95694d7a93062d970bb
+DIST pandocfilters-1.4.1.tar.gz 14265 SHA256 ec8bcd100d081db092c57f93462b1861bcfa1286ef126f34da5cb1d969538acd SHA512 658976a635d6a5783448e18989192ee474f933cea7a4a91c3ec706b097fafd98251e62bbe3649d3779c99bafdadf9a9c1cac6916116aeb16631ad7434de1c9fe WHIRLPOOL 69fdc1ee029dba775123b7901cc7013c5a89f3da8b9ca94a135e606a60c9eac5ea61093e4810cd099984d3e6495bc6f1f084f57c183daac8ca4ef668c73bced7
+DIST pandocfilters-1.4.2.tar.gz 14229 SHA256 b3dd70e169bb5449e6bc6ff96aea89c5eea8c5f6ab5e207fc2f521a2cf4a0da9 SHA512 5e5c0fb18f163430e87750b88d38a5f0fa618b90c84bf08e6f295df3ddd46c1bbf35ec51514af8d6699c7dfc9f0b3ee9edd0484deeb05e5efb3b26e650b5ee1b WHIRLPOOL 03db4025ff8185d3ef1abb796119b8688f7ced257bf9aced3a74baf4888883d5fdef1ea8673f86d4bbe1844de181d0d43ddc6a0ee7d4acd01fce72a7604aeba1
+EBUILD pandocfilters-1.2.4.ebuild 394 SHA256 884e4b65694e6d82645f63b0655b4bbd07b56f5a94625e4dad24710a0bed99bf SHA512 e1e5f575a23f507689830ad8bd5de5bdf8c854d796658bb01ab033e0817e62317d18ebfd9a1de3c6f25c0bf0d6805fd11ab96f8f11662d3cdf815067aa6aab57 WHIRLPOOL beeb6e5645033922d733142b14d1463e26279c24b9d2d7454b5c3ed14c43bcaac118d7f8e7dafb94547b8207950715f6e5f3b15904576a1fae7a9baa2ed85980
+EBUILD pandocfilters-1.4.1.ebuild 394 SHA256 884e4b65694e6d82645f63b0655b4bbd07b56f5a94625e4dad24710a0bed99bf SHA512 e1e5f575a23f507689830ad8bd5de5bdf8c854d796658bb01ab033e0817e62317d18ebfd9a1de3c6f25c0bf0d6805fd11ab96f8f11662d3cdf815067aa6aab57 WHIRLPOOL beeb6e5645033922d733142b14d1463e26279c24b9d2d7454b5c3ed14c43bcaac118d7f8e7dafb94547b8207950715f6e5f3b15904576a1fae7a9baa2ed85980
+EBUILD pandocfilters-1.4.2-r1.ebuild 430 SHA256 02ad9fe3e157cd6ec742876286bf894c2df41f27dd90d1b2477c9653a539d575 SHA512 414f0b350690da016fb18e665ceced6df4765ce37e6e42bc12e076799625fc6c4ce03311397864616717283757ad074bc768ea552d5e9af1401fe3ee932dcbb4 WHIRLPOOL 2654dd4df4e9f44163b41b71b08adadc950c46de31459e54bf569370ac1b694d0a4e6285cd46a8d96d111b22bd087fd2ab0730846d34f103009ed8cada53c171
+MISC metadata.xml 398 SHA256 a7cf82297dcf8da5eef084362afb3c80524d3d1375d686f54a18e6ec79d2b840 SHA512 fa20fb0f6270246612d2f7a7cbde6052d3f27c5ad4e111deaf7a80ac7438fba8c4e48150be615053063197f7902243b12ad149b1d050fc281b71196d4b70daf4 WHIRLPOOL b9881e184cf7caea2262d4791c55fd183944490b6d1ab6795a2fbb6fa3171e2bd5d5136d0b9d16095decb59a0993cf1562733b0e16daadabdf38a555190fefcc
diff --git a/dev-python/pandocfilters/metadata.xml b/dev-python/pandocfilters/metadata.xml
new file mode 100644
index 000000000000..18d97df8a656
--- /dev/null
+++ b/dev-python/pandocfilters/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="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pandocfilters</remote-id>
+    <remote-id type="github">jgm/pandocfilters</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pandocfilters/pandocfilters-1.2.4.ebuild b/dev-python/pandocfilters/pandocfilters-1.2.4.ebuild
new file mode 100644
index 000000000000..a41384bd497e
--- /dev/null
+++ b/dev-python/pandocfilters/pandocfilters-1.2.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utilities for writing pandoc filters in python"
+HOMEPAGE="https://github.com/jgm/pandocfilters"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
diff --git a/dev-python/pandocfilters/pandocfilters-1.4.1.ebuild b/dev-python/pandocfilters/pandocfilters-1.4.1.ebuild
new file mode 100644
index 000000000000..a41384bd497e
--- /dev/null
+++ b/dev-python/pandocfilters/pandocfilters-1.4.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utilities for writing pandoc filters in python"
+HOMEPAGE="https://github.com/jgm/pandocfilters"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
diff --git a/dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild b/dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..bed5f49b3dc4
--- /dev/null
+++ b/dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utilities for writing pandoc filters in python"
+HOMEPAGE="https://github.com/jgm/pandocfilters"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
new file mode 100644
index 000000000000..6ee07e5e3ce2
--- /dev/null
+++ b/dev-python/paramiko/Manifest
@@ -0,0 +1,15 @@
+AUX paramiko-1.16.0-install_requires.patch 438 SHA256 4261783008214f57c620d5a6661c0a61842543558ac43c0ecff4539009468631 SHA512 ace0be9103050e397c584bd42077cbdd10296b0bd3fbf084dbd3242e3451d87c7cadb38d66bfebc128bce45eb1f1465f716c5004e586fd9f82a84a67002344a9 WHIRLPOOL a204d894794671bac9243ec936649b750a442a61ef5195a8cba937ea327b8d8b72da58e6455477b8b30a9efb361fca33de1ccccc39262118a0446173916f9484
+DIST paramiko-1.16.0.tar.gz 1335094 SHA256 3297ebd3cd072f573772f7c7426939a443c62c458d54bb632ff30fd6ecf96892 SHA512 d75ed591c12898bab7d3e64b7281c9054ad49d00b6dba9e51826cca43ce30ae7c089ead0c3396f7542c2635183637e00a16f0b3d57360c0f65ec93d081489962 WHIRLPOOL 10053403a526e11d2e300cfccb8bb95889ee4424621853f8b20f42257c71fdb01aba6358c3fd9dd3ede2aa8d7291affac56582abbb3d9888dc1c217d3757c3f3
+DIST paramiko-2.1.2.tar.gz 1196746 SHA256 5fae49bed35e2e3d45c4f7b0db2d38b9ca626312d91119b3991d0ecf8125e310 SHA512 465c5381b1b0a472d2ad8e690f0916a5f51713880486c7b94cadcf85ea0a52569e18337ccfee5440869e4a0c76bd2b1bc15c414128c07326b40ecd36ea021466 WHIRLPOOL 39014f4ab316ccf13ce336a594befd00c68dd3eb371f9e29592ec32ee1afcc91ae9307b2c9ae4227569fbc5d5d2c639532cce4552780d4e35743cd5c834a28a3
+DIST paramiko-2.2.1.tar.gz 1205818 SHA256 ff94ae65379914ec3c960de731381f49092057b6dd1d24d18842ead5a2eb2277 SHA512 6aa2cce301f32c15d66e2137bc8a5c10ea4a667c599b24047a1e176b10636fe3abd28c7b2974befdde432a86c924acceace056c0572ea3006d3e4a8160b725c3 WHIRLPOOL 90f7d92c2d19343ab4f1ce78284458892af332197192f9368d862aa8d759fdbf37faf14c83f5ffacad4b7228be697bf011bf11e23800d49c5b58eaf149d3e9ff
+DIST paramiko-2.3.0.tar.gz 279279 SHA256 4c4bb490dc861c7f5e0b354c0cb7d51fcbef92fa6a7f3c855020e9bf2ca721fb SHA512 a7935b76805a938e389fcf38beca0eb653cc1bc370ed7869726361d5758235d282e747c42582781c122f7c8e4299e61292c1ac96dc3921d44aedaf8a699c1ebc WHIRLPOOL 335f7c127bf14d595c652b548ab0c10b263716d20099d7a1b5b6143e95d036a9fb8c85713e7d7131cfdff00dd2fdb6d620945fd70493bc1748279db3c8a9713e
+DIST paramiko-2.3.1.tar.gz 282553 SHA256 3b50a5a2ce206cb540c27ce83245f565d0139104ee83af33f695db944c926166 SHA512 b63a177f1f03937d5650d6f2a3ca4c00e0c3ffb0080e5e5a8141aab435c3ad415f5af8c61cb2894d176544b854ff26ee510eaa41081b452dfa6213cdc0566665 WHIRLPOOL e86c29bf83554a54b7e2fbc4c45afac0da17c50769c230c8c9914f6bee472a8541f889dd8b7d63666a6ea45b90de44fbda34dd6764036c1c82643835624ce2cf
+EBUILD paramiko-1.16.0.ebuild 1194 SHA256 e76943c440446c92f47b001b40b19e8a7e47f8419aa933d305e35e20ac60ecb2 SHA512 98dc8c3ee704b82e0f5d9ee05f4f46ef3acf1078ca9ade31e7d19e0f3a14390b299ffd503f4ce10c19e0cfe2f7cc35e22a89533494333ae7cc46d7b8b6efb511 WHIRLPOOL da2941de33af5b1ec7b4a03194773be77f0a57d6f6e0f5ce0a11cdfdf503ecfa8690ca2b08583958dced7497dc44a37d4c71b427ba186a12d2bbc1b6b1f29b68
+EBUILD paramiko-2.1.2.ebuild 1141 SHA256 d81888cda65751c080c2d82d02533607ffbabbba2c9638e5d7807c804c843ef6 SHA512 db85d4e8c14a284c8f82c58a805362fb85c0bc15da075dd86e456ed4e439b35cee278574de5c8ef0496685c1d769dd103e4772f82bcecd2a8d7c691d5416101d WHIRLPOOL 31975aaf2f73f3f8fd308862ff4a355713e4d7fe3a6f191131f256aacbbcc45123cf236c4861f4a2737cb82b710c19c4c3e6e240b8ec8fe9fac7cfa5c818cb56
+EBUILD paramiko-2.2.1.ebuild 1078 SHA256 af549d636905e905859b4affee07ef2ede795fa22ebd56c84ccdf7c78e4dbcba SHA512 8b4ca3e950fdf74e942d0f942c68a37d630612c79e90d48deff64e56091c7a918c740a3fa72a34d757eaa1ac853bd1e110b9d52b4cb8f95a9fa2cbdd2f05b684 WHIRLPOOL eb371b3d1b9ddc557585151cb5de24a85faa8446237e2e223b987218a62b0a17b55bae0b69045e0b077f59eb6b5b8464f604a127e4fb1738bf33dd1d727106a2
+EBUILD paramiko-2.3.0.ebuild 1333 SHA256 e691475539b8e31f4df3f2417773b20e85f1d5044307ed0e667f9111844f1cfb SHA512 6b1e269c54e59c653fdcb42a62e3d4f3631186d6efdfab6c807acbc5d3d8c969971a5a53b88aa154d96d6488d9edc85ae33bb65fb4cc192258d92091464625be WHIRLPOOL e235fdb75d4b84b12c00a07bc895327e083e001247f393f591a20e2f36c07d402e6d06b9a3ad7bbd6dc188c7b3d28141f536674c9782ea88e1afaf02b4c775f4
+EBUILD paramiko-2.3.1.ebuild 1333 SHA256 e691475539b8e31f4df3f2417773b20e85f1d5044307ed0e667f9111844f1cfb SHA512 6b1e269c54e59c653fdcb42a62e3d4f3631186d6efdfab6c807acbc5d3d8c969971a5a53b88aa154d96d6488d9edc85ae33bb65fb4cc192258d92091464625be WHIRLPOOL e235fdb75d4b84b12c00a07bc895327e083e001247f393f591a20e2f36c07d402e6d06b9a3ad7bbd6dc188c7b3d28141f536674c9782ea88e1afaf02b4c775f4
+EBUILD paramiko-9999.ebuild 973 SHA256 9b6c3f95d71fa69496e918dbbb39fd2f149d133c61c8fb47fe974677b13d0e8c SHA512 7cfa47309ea9696805adf419c835fcdcd45e1b4c1f8b4d2c7570eb35245060c411c84ec7db7f86486b84b2ad430f4549eb6dc171553af308d8c445784df54daa WHIRLPOOL 02340aa4b1dbf9dfbb7d5eeffa5a2d60b827fb77cc598bdc53db6a5ed0be41a8d94eecb1aea7d66c19366f496183b3bfada6dc33bf58464e13370705348e5624
+MISC ChangeLog 5906 SHA256 d3fa76a6ce3a115817102cbfc6a7cdf373296f2236e4f1c59f17ccac700dc737 SHA512 19047d8ae22ca28dc3ecc1d94790413cb1ad8fdc572fd88ffeca7ad24018f76fe4174a59a534344822b9182191b0ec305dc3743e29b9773131678a3b69445ce1 WHIRLPOOL c9a995338929d404a3f339133a03fccb96cd4c8a64d652adfc927880f64ebc9fd9c06bfacfacbc10f2f35dacfd2bf03fe483fefab7060cbf759898be268e744b
+MISC ChangeLog-2015 16931 SHA256 bc7e1465ebb99e7cea4ac81cf530b2e7708302c1bca36da6152b717684729603 SHA512 27241d73c6ef3361b0a820749e8c28f14a1633f8ee856c4f4d6ad800efd36dcf260654927a5f4befafeffc828d13b741277981d43373a194fddc98d3b3f5a68d WHIRLPOOL 3985e20db84c410964eba18c23ac5bc52d585153da5362e7a2193f56bcf5ffc7b5a51b1747d1963779f832cfbfc6a32dbd4147f23d8068dda39aebd549be0836
+MISC metadata.xml 1236 SHA256 552cfc9d54ec5a51dd3335c2a71eed34528f6b225dc2ed4337427bbdbca7a6da SHA512 5cffe7297feb05b75be333fac0259655f6992baaa04248ccdb23f82790a0a807ecf328357207507a3b35944b7062d8a1aecb2daf5353d733646bb58d7a151529 WHIRLPOOL f189e094c2b8bfd50e9d96474d0d0e718b7b3c140b0084d1cc44c087038dd2d29fdd46fc592c821bb92c6320df074c47ea5a1734ffd6aa2818b53e9e00414f7b
diff --git a/dev-python/paramiko/files/paramiko-1.16.0-install_requires.patch b/dev-python/paramiko/files/paramiko-1.16.0-install_requires.patch
new file mode 100644
index 000000000000..fde5e11b19e5
--- /dev/null
+++ b/dev-python/paramiko/files/paramiko-1.16.0-install_requires.patch
@@ -0,0 +1,18 @@
+ setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 629c28f..e987dc6 100644
+--- a/setup.py
++++ b/setup.py
+@@ -41,8 +41,8 @@ try:
+     from setuptools import setup
+     kw = {
+         'install_requires': [
+-            'pycrypto >= 2.1, != 2.4',
+-            'ecdsa >= 0.11',
++            'pycrypto >=2.1,!=2.4',
++            'ecdsa >=0.11',
+         ],
+     }
+ except ImportError:
diff --git a/dev-python/paramiko/metadata.xml b/dev-python/paramiko/metadata.xml
new file mode 100644
index 000000000000..054a7be7a59b
--- /dev/null
+++ b/dev-python/paramiko/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>alicef@gentoo.org</email>
+    <name>Alice Ferrazzi</name>
+  </maintainer>
+  <longdescription>
+This is a library for making SSH2 connections (client or server).
+Emphasis is on using SSH2 as an alternative to SSL for making secure
+connections between python scripts.  All major ciphers and hash methods
+are supported. SFTP client mode is now supported too.
+</longdescription>
+  <longdescription lang="ja">
+�れ�SSH2コ�クション(クライアント�サー�ー)を作り出����ライブラリ��。注
+目点�Python言語スクリプト間�セキュア�コ�クションを作り出�SSL�代用�SSHを利
+用���る所��。有��Cipher�Hash処��全��サ�ート�れ����。SFTPクライ
+アントもサ�ート�れ����。
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">paramiko</remote-id>
+    <remote-id type="github">paramiko/paramiko</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/paramiko/paramiko-1.16.0.ebuild b/dev-python/paramiko/paramiko-1.16.0.ebuild
new file mode 100644
index 000000000000..d0620934429f
--- /dev/null
+++ b/dev-python/paramiko/paramiko-1.16.0.ebuild
@@ -0,0 +1,43 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="SSH2 protocol library"
+HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/pycrypto-2.1[${PYTHON_USEDEP}]
+	!=dev-python/pycrypto-2.4[${PYTHON_USEDEP}]
+	>=dev-python/ecdsa-0.11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Required for testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${P}-install_requires.patch
+)
+
+python_test() {
+	"${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	use examples && local EXAMPLES=( demos/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/paramiko/paramiko-2.1.2.ebuild b/dev-python/paramiko/paramiko-2.1.2.ebuild
new file mode 100644
index 000000000000..a17535668170
--- /dev/null
+++ b/dev-python/paramiko/paramiko-2.1.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="SSH2 protocol library"
+HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/cryptography-1.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Required for testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	"${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins demos/*
+	fi
+}
diff --git a/dev-python/paramiko/paramiko-2.2.1.ebuild b/dev-python/paramiko/paramiko-2.2.1.ebuild
new file mode 100644
index 000000000000..4ed5de22e1e4
--- /dev/null
+++ b/dev-python/paramiko/paramiko-2.2.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="SSH2 protocol library"
+HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ia64 ppc ppc64 x86"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.1[${PYTHON_USEDEP}]
+	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Required for testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	"${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins demos/*
+	fi
+}
diff --git a/dev-python/paramiko/paramiko-2.3.0.ebuild b/dev-python/paramiko/paramiko-2.3.0.ebuild
new file mode 100644
index 000000000000..106bbe8627d3
--- /dev/null
+++ b/dev-python/paramiko/paramiko-2.3.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="SSH2 protocol library"
+HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/"
+# pypi tarballs are missing test data
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.5[${PYTHON_USEDEP}]
+	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Required for testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	"${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx -s sites/docs
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( build/sphinx/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins demos/*
+	fi
+}
diff --git a/dev-python/paramiko/paramiko-2.3.1.ebuild b/dev-python/paramiko/paramiko-2.3.1.ebuild
new file mode 100644
index 000000000000..106bbe8627d3
--- /dev/null
+++ b/dev-python/paramiko/paramiko-2.3.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="SSH2 protocol library"
+HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/"
+# pypi tarballs are missing test data
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.5[${PYTHON_USEDEP}]
+	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Required for testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	"${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx -s sites/docs
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( build/sphinx/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins demos/*
+	fi
+}
diff --git a/dev-python/paramiko/paramiko-9999.ebuild b/dev-python/paramiko/paramiko-9999.ebuild
new file mode 100644
index 000000000000..e4db306f700b
--- /dev/null
+++ b/dev-python/paramiko/paramiko-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="SSH2 protocol library"
+HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/paramiko/paramiko.git"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/pycrypto-2.1[${PYTHON_USEDEP}]
+	!=dev-python/pycrypto-2.4[${PYTHON_USEDEP}]
+	>=dev-python/ecdsa-0.11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Required for testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	"${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	use examples && dodoc -r demos
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/paramunittest/Manifest b/dev-python/paramunittest/Manifest
new file mode 100644
index 000000000000..a52c7264fdef
--- /dev/null
+++ b/dev-python/paramunittest/Manifest
@@ -0,0 +1,5 @@
+DIST ParamUnittest-0.2.tar.gz 2482 SHA256 a14509549171465c3a444fa631cb7066787e05970777e6370fbb17cde148e74e SHA512 ad39def15e5983ebe6b018b10f966b7f83085facccc50e71010f88b8bcfdb704e889ce021535b2e4dd84bc1ae413088e7c028990d934d4fe28d3186b4b01a3b7 WHIRLPOOL 48c923527872f075421144c4e9a487ffd974e18a511f292c5746202fe29a803778c1c4c239bceb90fcb1742f76faab5a64b91906b7801c79f6dfa249e3d8ba74
+EBUILD paramunittest-0.2.ebuild 531 SHA256 311f5150669d686b8f4e1ac117f71b51d7d5a7fc93b73c401c2290343fae28b6 SHA512 4358140e31a8974fb93eaf5c8fdf3be3da9cf02fed3d1a26410ecc2af5487c9f4d799c67a9f892b437286381ef31545ebe2c7732b8b9f69895b550b3f5784b14 WHIRLPOOL d24ecb45670644b40a1527c6b61d16725ba6a39ce4a2ff8bf9d08069d9ffc8ad83c89a02f0d4708b68a9259a732517eed7feb4cb8abd76a09a05cfea0cd4d939
+MISC ChangeLog 2324 SHA256 a5d5114e88b6403d217a1197bd37c4ed17afa71eb24e63a93c1ea15f48a06d5a SHA512 6d5b38fb584ebebe45f63bb353b8a9ff05d8b6d02e3afebffbf063c937cb7f360cf4583d3dced792f468a409011e91e3d3c0f8a68444ecdc06758cf55eb8870e WHIRLPOOL b7566c4adda8a4bae185d1d46f7b8e50000a2a1444ef25a651f31c27af5a57009c0761ec7610492a248ab518b8f92f9774effe948a9503837ff3ce3e35988330
+MISC ChangeLog-2015 593 SHA256 4990da12ac172db4d9d43cef149420281e2ef891baea52d996711da6b8e53257 SHA512 11a680d4319a2c699177f017260fc06f0581e5a1d0416aa6c9954795a2399d2b145cb64b05b60e5c042bfb1f7e3fec2ab1ff77881bee86f81417481a1c38cbfb WHIRLPOOL 92f79a75f00feb1794078cef593b7624b73cc89c032e23a22d3c7dfc0427596d26028b8bd7157b2afe595e2ef6136c05a6b4055a43f4c2e4126eb439c74bbcdc
+MISC metadata.xml 380 SHA256 a48168bca9bb2688cd3e6ee827de6fd9e7cb229102fd8ccc6720253e615a2620 SHA512 fc7f9df893b5b178f58724b6bc0c3d52b7b0efc9c09322d3f7f7574ae7d9361c2c727c9fe70e631f5220a271d210a265e101c39e38019b085d0a7e435e8fd0fa WHIRLPOOL 4e30e856a613269427ceb15d3659417f76b5d4c9736e677de358e8012fc25358faa34a26388bd65a184d97e123cfd0dbdf55ec11ef8443d097fd72d1e07f1744
diff --git a/dev-python/paramunittest/metadata.xml b/dev-python/paramunittest/metadata.xml
new file mode 100644
index 000000000000..323d524f9cea
--- /dev/null
+++ b/dev-python/paramunittest/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ParamUnittest</remote-id>
+		<remote-id type="github">rik0/ParamUnittest</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/paramunittest/paramunittest-0.2.ebuild b/dev-python/paramunittest/paramunittest-0.2.ebuild
new file mode 100644
index 000000000000..1c5693e93e6c
--- /dev/null
+++ b/dev-python/paramunittest/paramunittest-0.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN=ParamUnittest
+
+DESCRIPTION="Simple extension to have parametrized unit tests."
+HOMEPAGE="https://github.com/rik0/ParamUnittest"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/parse-type/Manifest b/dev-python/parse-type/Manifest
new file mode 100644
index 000000000000..f9cc15f069c5
--- /dev/null
+++ b/dev-python/parse-type/Manifest
@@ -0,0 +1,7 @@
+AUX parse-type-0.3.4-python-3.5-tests-compat.patch 1382 SHA256 e4628fbc5546a93a5233376d86cefa8ddecded4a6cf861c19ca8a3cc6a13587d SHA512 95f66bbd323f5ca621db2803dcc118c392503188dd4569bee3418be85b644dabc0b15a48a83a66f218466e0764eba409abbe8574b3c7340589428de90a6a0acf WHIRLPOOL 6a8786f7bb7b7353a34a8b083674515e1665e8408f26e4c9cef1b787a1cc28a9fa4dcf1a4f66bc951ee7e647272c58788b614cfa217f3d120840d1c1c423a159
+DIST parse_type-0.3.4.tar.gz 62199 SHA256 3dd0b323bafcb8c25e000ce5589042a1c99cba9c3bec77b9f591e46bc9606147 SHA512 5ef80ed820cc7e2f4fa8fd0fbf64160c81f77b4a1af38015e3ec7e3be3f613ecc2211d5dba15ef600cbe11c556a2c1fb6cdc8374c52c608914aa903fad84267f WHIRLPOOL 236c047e7cbbb22bdde0424bc446404141694492cf4b0c7bb63f99f6fc8c7fa2a02b4a97e4c6b3d957a2d2a2156b3a514e9614761011f20ca4414a363c551e56
+EBUILD parse-type-0.3.4-r1.ebuild 942 SHA256 cff9dfc89039701916712817d9a938ba2732df19c4236e13b460f92df3f32b72 SHA512 3cd0459bc8ee64bdb028f63b987164fb6419cbc11c70316854187b99f9dcd9b562d441bc988014660aaae2a03563dd0fc71ab0d96d28dc2d6b0d5e047abe9d10 WHIRLPOOL 2af480fba2a75e3ddf71e702c74b37b3ca745c4e99e134e52f7a04e371d4cb495c0c2d84a47ba5601d9c77869ccaaf9378736fb9a18acae80a690259004c6af1
+EBUILD parse-type-0.3.4.ebuild 864 SHA256 b451020194fca44541c9e35a169c9bbdb87631114f1501bb5178826e7e843a4c SHA512 50699964cfa963049677baabd0bf8a5b65618eea5998192196e2ba8edf53f4d58235c8ff16bbabe1074d7f0572f3425e09c0a07bff18f4acadc24f9e3a199f9f WHIRLPOOL 58c10b3185fc1d0f039ae7c931371457435bb48e88761c3c70b9df6e7faf0ae10dbd98f4014a7f0b2af1392aaced4bd2f472961c17945f9713032548b550685a
+MISC ChangeLog 2576 SHA256 980b6fef067d94365e57b4c7d2fb4f13c5ab6478213210833765ff77a4d78fb5 SHA512 69ed43c3f67b6f09ce95095b9a5d52ff4dfc7205a1e58872f1e173fa8ea4710d21e3789d639fc2ed50dc19f47df899d358c0310d7d9f3a41a60c816a63e5a6e3 WHIRLPOOL 01ebaf0046cc8cc35c9bf34293d6a306352362ecfcece9c885ca68f5fa538d80af037b12506c53e007d4cae1c64b9b4c23c154524b04603240c42337a5976a73
+MISC ChangeLog-2015 664 SHA256 607691712b3dfea9b7bea3843d5d8ec006f272fb7feda62957b6be64501caf1c SHA512 52b80c614a4da8ea1829fa80fc02eec6fe5b437131b96787aabb385e1a01eb0ba308cedd5e0d6ad8eccc2b44fabcb6589e650b0d44e42e7e2ff1b3025d2a921f WHIRLPOOL 420f16c1b72eaf7eea8fa358d03da960234e5e14ac6ba7ec35faf75f945048ff4c6e3642f09d63fcd9d20d335a9477a7493c984db0933035676d8aef37a22142
+MISC metadata.xml 377 SHA256 5fe4cb03990adff3ac3d816424fab4f28afc224ab9f48d328d48f7c9b1838cb7 SHA512 81adc20b95f5f0772eb5abce5e56087926982a87c994d3d8306c1833828fa4d943c471a5e4a32203dab62dff59b170986e79686321e83c9ae3ab32a79c2f44a5 WHIRLPOOL ade9de564200544aa01b9ece402146f2710c0083d4d5f42234af9ece9dc847710b79d376f1c5f10abe6854724663250ce9e72cc6caaa926925548119da2b085f
diff --git a/dev-python/parse-type/files/parse-type-0.3.4-python-3.5-tests-compat.patch b/dev-python/parse-type/files/parse-type-0.3.4-python-3.5-tests-compat.patch
new file mode 100644
index 000000000000..54cfa59cb801
--- /dev/null
+++ b/dev-python/parse-type/files/parse-type-0.3.4-python-3.5-tests-compat.patch
@@ -0,0 +1,40 @@
+From 8f7ce32dc6bd466f1ea6ccc9260917016061bb4e Mon Sep 17 00:00:00 2001
+From: David King <dking@redhat.com>
+Date: Tue, 15 Dec 2015 08:52:26 +0000
+Subject: [PATCH] Adapt bundled parse for Python 3.5
+
+As the upstream pull request:
+
+https://github.com/r1chardj0n3s/parse/pull/34
+---
+ tests/test_parse_type_parse.py | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_parse_type_parse.py b/tests/test_parse_type_parse.py
+index 4151d37..cab6143 100644
+--- a/tests/test_parse_type_parse.py
++++ b/tests/test_parse_type_parse.py
+@@ -11,6 +11,7 @@
+ 
+ import unittest
+ from datetime import datetime, time
++import re
+ # XXX-ADAPT:
+ # ORIG: import parse
+ from parse_type import parse
+@@ -611,8 +612,13 @@ def test_mixed_type_variant(self):
+         self.assertEqual(r.fixed[21], 'spam')
+ 
+     def test_too_many_fields(self):
+-        p = parse.compile('{:ti}' * 15)
+-        self.assertRaises(parse.TooManyFields, p.parse, '')
++        # Python 3.5 removed the limit of 100 named groups in a regular expression,
++        # so only test for the exception if the limit exists.
++        try:
++            re.compile("".join("(?P<n{n}>{n}-)".format(n=i) for i in range(101)))
++        except AssertionError:
++            p = parse.compile('{:ti}' * 15)
++            self.assertRaises(parse.TooManyFields, p.parse, '')
+ 
+ 
+ class TestSearch(unittest.TestCase):
diff --git a/dev-python/parse-type/metadata.xml b/dev-python/parse-type/metadata.xml
new file mode 100644
index 000000000000..c7fa574c1dda
--- /dev/null
+++ b/dev-python/parse-type/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">parse_type</remote-id>
+		<remote-id type="github">jenisys/parse_type</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/parse-type/parse-type-0.3.4-r1.ebuild b/dev-python/parse-type/parse-type-0.3.4-r1.ebuild
new file mode 100644
index 000000000000..40998643d1cb
--- /dev/null
+++ b/dev-python/parse-type/parse-type-0.3.4-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simplifies to build parse types based on the parse module"
+HOMEPAGE="https://github.com/jenisys/parse_type"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=">=dev-python/parse-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' 'python3_3')"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}/${P}-python-3.5-tests-compat.patch" )
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	py.test tests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/parse-type/parse-type-0.3.4.ebuild b/dev-python/parse-type/parse-type-0.3.4.ebuild
new file mode 100644
index 000000000000..aa50d715f039
--- /dev/null
+++ b/dev-python/parse-type/parse-type-0.3.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simplifies to build parse types based on the parse module"
+HOMEPAGE="https://github.com/jenisys/parse_type"
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/parse-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' 'python3_3')
+"
+
+python_test() {
+	py.test tests || "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/parse/Manifest b/dev-python/parse/Manifest
new file mode 100644
index 000000000000..aba3edd4b347
--- /dev/null
+++ b/dev-python/parse/Manifest
@@ -0,0 +1,8 @@
+AUX parse-1.6.6-python-3.5-tests-compat.patch 1694 SHA256 9c00b7a4a21e9e180ba4e791a760741c28bab795867495f450b70657160d905b SHA512 ed4fa6d689304798f289c11d441bb9c66c21dbde115da4f8bd87f538c5a1ccd7c1ea277ccca6d4c2b2e3560335130213b3d24bfbd6896033c55bd75f01424857 WHIRLPOOL ba122b8a71a44f9b3ea4e61adaef33d17e7c74ea8da6868978ea82aefcd2256290ddba930e0abf7d2c49eef16bb8e9672d783ecc0ffa89721b9a8f6adcac8a72
+DIST parse-1.6.4.tar.gz 24025 SHA256 a7cccad221632f1e2553d585b428b20d362738311e6f58933ef46b4389c16054 SHA512 2848e3331f1b2604bb5f1a8a0084ff0b7e0f12b2d3832395461f4b76729637783250d18a134048106ffa6768794f38fc51534dbe5a88db303f0426530587dcee WHIRLPOOL 2c3b91ec933ac206aaf2c2201b3108bb291a448f458d79aa2e6db5cdee676e05c200f1bf60f3f9810161e126c7ae4633efe498276fb2d1b270b10ebc4ca2047c
+DIST parse-1.6.6.tar.gz 24638 SHA256 71435aaac494e08cec76de646de2aab8392c114e56fe3f81c565ecc7eb886178 SHA512 fae467b6f6e35f04d9e501162117423506701d101b2265e941b5b34420e833a0f4dbc44f62c33d51836a62ef51da9b5b8a3a1d39b3ec490f9eb77c5b6f302cdf WHIRLPOOL c206590ebea8f6b2ef552b0911b83c692a50b0dc395ac76e392a2b4eb16e8c544411da7b7475956183de3d189e6cc27b87752c0aa991dc5e7587e854eea6953c
+EBUILD parse-1.6.4.ebuild 484 SHA256 a7a3f72f3798abebf4cd6874a1d74313f0dc236ae39dda302dd8f14a161f6e20 SHA512 d59d721f3f6f59f6de41521a2e61b337895099370492870544d0344ac5f25894fa27f695f6c8065680c80ecc568a4cee81ed76ac2379501beb9b94fed357456f WHIRLPOOL e659803c6ccce84876c092207b25d48f2aa9ad9701fb57d4a26577340fcd2d8d46462850bd6517a87ccf0c73faf60968736af62d53ca598cefd900ae8def89cd
+EBUILD parse-1.6.6.ebuild 552 SHA256 043646dca295b614ae352ee0be9a73bd3337f0d31d6a7040049ee982ad7dd01b SHA512 d0d07d99114c2d39b7a21728456e3cf2fcaf3fef0078c791b41e2c31c9dafb8092a50701fd2a8c05ad7dddcaf1fe9103e331cb627f1bc680a3902178d6c50250 WHIRLPOOL 744cc4609b1e2d238cc5a37561b707b25f06281001f3f95656dfc324368a63b3ef4acdbac8b822e33525e966db9bd419f2f7bca6668ad11f59f28584cb1b5bac
+MISC ChangeLog 2543 SHA256 c0c6fa6ba0ea8c9ff30bfbdc22c0a2e634162f39d884115c933139a3fb0ccfac SHA512 ee87ad82792dbe7981df0a9e9967e0e08e1e33a7ceb74e2df6d199801ffaffce53682486220d55f6bc99db7362bacf3e37c44db37e1330b35432b0e30c19de3f WHIRLPOOL 7e4a72718511c53b9298103f7725ff8b6dc2607ab6135c38b9aba0dac51d59b1240c66a8cd19deb10730d3bed1673a11c304ea02d2b3f528c3219761f37505f4
+MISC ChangeLog-2015 639 SHA256 0bedcb76903a400d24277a0af80924078d0816fc1adb32385b03eaa7726cb2d5 SHA512 bd9ededa6a55f8a67af5b15bcc70c3fd0d30d36da17573733c1183d145c3310532b037ec18e80985e63970e89569fac1ba930a5341185cd7f98f85e68a8b314e WHIRLPOOL 4eb180b0c34bcf7fe42e71ba025240c1f28b8d6ed1d00bc452e275ea0b396ef3c34ee11777842bfdc6dbdd5b76970b4683f9d9b6f4ad7e89b4bc32fa469099c1
+MISC metadata.xml 372 SHA256 969c7bcc675c0b22761f7a783a929b70d6a06eef4899a23bdd81aa392e4331c3 SHA512 68c884b2b096c6c7f452ce1effc3d61ab882d56bebcbd9e6ca9a1d3fd19e34262800ae6ee604311a5dccf4b04f887a0262e969786342ddf458033945baecaae2 WHIRLPOOL 2b0c8c397427f3b5b0285d9209571ac3d278d79d6d93cb137e4a8d6fb2fd7a717e14920b91e82208516f1cc82f7eff0ca47f01dddb0503d42f9f6b537f89c98f
diff --git a/dev-python/parse/files/parse-1.6.6-python-3.5-tests-compat.patch b/dev-python/parse/files/parse-1.6.6-python-3.5-tests-compat.patch
new file mode 100644
index 000000000000..5183cf5ef32e
--- /dev/null
+++ b/dev-python/parse/files/parse-1.6.6-python-3.5-tests-compat.patch
@@ -0,0 +1,50 @@
+From 32f15cfefb7c7b6476360ac65cba807aa3dfccfa Mon Sep 17 00:00:00 2001
+From: David King <dking@redhat.com>
+Date: Mon, 14 Dec 2015 09:58:19 +0000
+Subject: [PATCH] Fix test_too_many_fields with Python 3.5
+
+Python versions before 3.5 had a limit of 100 groups in regular
+expressions. This limit was removed during 3.5 development:
+
+http://bugs.python.org/issue22437
+https://hg.python.org/cpython/rev/0b85ea4bd1af
+
+The test_too_many_fields test asserts that the limit exists by
+attempting to parse a string with 15 fields, which triggers the 100
+named groups limit.
+
+Adjust the test so that if first checks to see whether the limit of 100
+named groups exists, and only assert that parsing 15 fields fails if
+that is the case.
+---
+ test_parse.py | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/test_parse.py b/test_parse.py
+index c524349..1d50568 100755
+--- a/test_parse.py
++++ b/test_parse.py
+@@ -6,6 +6,7 @@
+ 
+ import unittest
+ from datetime import datetime, time
++import re
+ 
+ import parse
+ 
+@@ -624,8 +625,13 @@ def test_mixed_type_variant(self):
+         self.assertEqual(r.fixed[21], 'spam')
+ 
+     def test_too_many_fields(self):
+-        p = parse.compile('{:ti}' * 15)
+-        self.assertRaises(parse.TooManyFields, p.parse, '')
++        # Python 3.5 removed the limit of 100 named groups in a regular expression,
++        # so only test for the exception if the limit exists.
++        try:
++            re.compile("".join("(?P<n{n}>{n}-)".format(n=i) for i in range(101)))
++        except AssertionError:
++            p = parse.compile('{:ti}' * 15)
++            self.assertRaises(parse.TooManyFields, p.parse, '')
+ 
+ 
+ class TestSearch(unittest.TestCase):
diff --git a/dev-python/parse/metadata.xml b/dev-python/parse/metadata.xml
new file mode 100644
index 000000000000..3a8356cdb06c
--- /dev/null
+++ b/dev-python/parse/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">parse</remote-id>
+		<remote-id type="github">r1chardj0n3s/parse</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/parse/parse-1.6.4.ebuild b/dev-python/parse/parse-1.6.4.ebuild
new file mode 100644
index 000000000000..77bd8c151949
--- /dev/null
+++ b/dev-python/parse/parse-1.6.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="parse() is the opposite of format()"
+HOMEPAGE="https://github.com/r1chardj0n3s/parse"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+python_test() {
+	"${PYTHON}" test_parse.py || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/parse/parse-1.6.6.ebuild b/dev-python/parse/parse-1.6.6.ebuild
new file mode 100644
index 000000000000..e4f2c1b20f20
--- /dev/null
+++ b/dev-python/parse/parse-1.6.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="parse() is the opposite of format()"
+HOMEPAGE="https://github.com/r1chardj0n3s/parse"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}/${P}-python-3.5-tests-compat.patch" )
+
+python_test() {
+	"${PYTHON}" test_parse.py || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/parsedatetime/Manifest b/dev-python/parsedatetime/Manifest
new file mode 100644
index 000000000000..d3edd76c0247
--- /dev/null
+++ b/dev-python/parsedatetime/Manifest
@@ -0,0 +1,7 @@
+DIST parsedatetime-2.1.tar.gz 61170 SHA256 71b90acc68bee9a165b941edcb93913f8c5784370e544bb32f71938cee97d0e0 SHA512 c3447c899aa56319e09b21c117ad4036e23727346d15d8d5fc60f89d439984f032950a9c6534f763c8dd09c74f078ddfaee1c77880dab4a4845393f5145db9a1 WHIRLPOOL 2e43a2ba4d8729f76170cb0b583648370c882d10bae70caf011e36fb0db5a439df8dcd7534577035620c10af32b4926fc773f80b1526bfe2772d8d5d6881ba42
+DIST parsedatetime-2.4.tar.gz 63598 SHA256 2308286bd9c0d1fab39a95e2c1d6c46a6dde6a3cbed4334be66f58d4c11ed9b5 SHA512 0fd8bfa3411476a20d8874b44036bc162735fb7865d39ca98b0a608daec39daac47100314279dbf66229ec333821492744f7505315d955f58216fdaa75cbf046 WHIRLPOOL 887f99a3378a964f16df216d0d3bea967c4cbb98e08a39bdd02b19e3be0bc85fc15a5351ac959149ea96221159b1227c33eaf6013847f0e3297fa221b1424958
+EBUILD parsedatetime-2.1.ebuild 603 SHA256 891f034011c73a3cf7a7c5c98ade1958078fd1e968cf2443978b413207af9bb5 SHA512 8005692170140270a59ac3df483e9984cfea65ca50d899de3215bcbbae70609857561e9339f0f7d457b4a7b929a030c67b438176439404265da5d3fbaf6fe451 WHIRLPOOL 1b5cdc9998f85a711c0bad36a31e38c4929dd2cd2433ab1ee0eacbe7c14032a7cdd1102ee3d1d06a210d15eea89bee0fe1a9c0221631d685d66ed33927ed0190
+EBUILD parsedatetime-2.4-r1.ebuild 663 SHA256 4f96ae8f3023e2650d916fa82304d80ad4c747195f94815f8cadc40542339266 SHA512 2bbdb7fe4c72bd3bab1ade3d0b0ff705758ca078ccbbfd0fd6683e70f082da28a4878122029f5116ecc87a734b24d9578f63883dd7353c78bb1fb8db6a18f12e WHIRLPOOL 4af608f658ee78cfaa46780b735da441a72fd1beaf9d2c99a25871f6857165f180a195459773c3430fbcaa1cf9e0a1fe88ad40021cf2bb04f18c85d5260e9607
+MISC ChangeLog 3080 SHA256 f8ed38c26ba9a93bd2ad7b2b019d70aeb4074d044f34ee909c7490db7cde1a07 SHA512 49a98b87e1e0153e50e2207c084be87a0e0e5f7cd039312e51b71105e147969051d75be5512c2640ad043ccd1f982210975cb1fa1e9d3256fba89e773fcde902 WHIRLPOOL 5abb6408724dc759282742c6f677d1079f223eaf02cf10a3e84e8a6258a11e52f8c1991faecd73c31ec0de5017977e5247154fb28055b604600a4e20ca64e45e
+MISC ChangeLog-2015 384 SHA256 12124d957db6b52d0e65e3a74d19ef535cfbb456a53108808f19835b1708d235 SHA512 36fb7c53b691075d598f74390a1c4c3dc1ee25ebb9cf82027b7e91cdd6eaa9a5077a9149791b1f0186c6acf942ecb2aa141c3774b7d94e5354481b29b790542d WHIRLPOOL 84a22dbe2fa3ceb471f1fc626daaf9ccbfe6c0d0b9d6a98de723fd5fd8372e306f97d08f4b3cb739d423d51788717707b30a6ba7ce0f6cd095e138b5bf00cac2
+MISC metadata.xml 323 SHA256 021a06afa4c90e15d55b83a0976d29a4fa568eb5ee7d4f82d50c0c7ce8c56df6 SHA512 496f1ae871e09c9a218454f32dc7fb1953c484d8b813324bf3a2a2f11226f5788d0a84f78641499b111571ee4487e1849b1401c611b1302e87d581c3e869fff6 WHIRLPOOL 38a0c5da1fabde838588bca5309688ca2606c165b64b977198a2517ce081571a805a6ecf72cf46d47c83649767d464e638fe62724df43b287cdba3ba2d5d06d2
diff --git a/dev-python/parsedatetime/metadata.xml b/dev-python/parsedatetime/metadata.xml
new file mode 100644
index 000000000000..d792ad42067e
--- /dev/null
+++ b/dev-python/parsedatetime/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">bear/parsedatetime</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/parsedatetime/parsedatetime-2.1.ebuild b/dev-python/parsedatetime/parsedatetime-2.1.ebuild
new file mode 100644
index 000000000000..81f31bb3eb4d
--- /dev/null
+++ b/dev-python/parsedatetime/parsedatetime-2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+inherit distutils-r1
+
+DESCRIPTION="Parse human-readable date/time strings"
+HOMEPAGE="https://github.com/bear/parsedatetime"
+SRC_URI="https://github.com/bear/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare() {
+	rm setup.cfg || die
+}
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/parsedatetime/parsedatetime-2.4-r1.ebuild b/dev-python/parsedatetime/parsedatetime-2.4-r1.ebuild
new file mode 100644
index 000000000000..3408d557490b
--- /dev/null
+++ b/dev-python/parsedatetime/parsedatetime-2.4-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+inherit distutils-r1
+
+DESCRIPTION="Parse human-readable date/time strings"
+HOMEPAGE="https://github.com/bear/parsedatetime"
+SRC_URI="https://github.com/bear/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/future[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare() {
+	rm setup.cfg || die
+}
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/parsley/Manifest b/dev-python/parsley/Manifest
new file mode 100644
index 000000000000..59c6a23bf1aa
--- /dev/null
+++ b/dev-python/parsley/Manifest
@@ -0,0 +1,5 @@
+DIST parsley-1.3.tar.gz 108574 SHA256 801defb0586af7964b84995999315d75244d3bc4fefda8ee8319c66688f0e48f SHA512 da749592a585be6c7b45e3d0637e30f0cf79caf71f88cd55a9c53466f5adf9c46a955359b3587f37b8237a5005cda94f62ab349889cb649c786f593b3707dd55 WHIRLPOOL a86937a8fc62c574022c9d773130be7983526b558221424f8d1e7f2b9def5c3149d0d174aaccccd33f3a519cf52884c34eb06ca1325cf7405aab59e6aaa53d5a
+EBUILD parsley-1.3.ebuild 441 SHA256 fe3e91b55d3dd828a121f5cdf64a4a13e9e34964a0eda51c3eddefcfe063ef77 SHA512 d3df87d9b08d58321ad9ab7a32bbee1ef945e66f7642d4e61868232e86366b92509c2eb79f56b736a9a9f6b34e6ff4d5b77f8067228f12660a269e5393cedef1 WHIRLPOOL 2f89dd3af5bef50facb014c54a2f76915cc8b94b9a1615cea5652b34faeae95c2a54ff5fc674b0477873a282e90852c82b8aa1423b1ea8233a71eb961332a59d
+MISC ChangeLog 2349 SHA256 83c76aa23ef5ac9bb55dc545cd0bcf24df6e24fb9ef9df6029e03f6430102c67 SHA512 607b8509677743924d0d4786adf3f3956f3e522efc37e085632fd75a90a014d32296cdcf9887ae91ccb761544aabd11837b5c79d57085977e298a3a14aabea3f WHIRLPOOL a749825a71e0c6405cd8b7fa7d78cf245d7024bb39b4c6c78d0f483536d9c048f2c3657b97fec1953aaf3544290ff5c46eeb21de5bb34d68cd604a799c5b4dec
+MISC ChangeLog-2015 504 SHA256 1a3a9062cb00df78313c49d0fb7579e042254f1b83c0b5f26aca69043c851aa9 SHA512 f2cd4d5ecb2a5f589019e861abbcb2d8ad245f6d148ecc42a77c1cddb6dc9c53e879612d993cb10893337a0c66bb2a993427f4fcc3331d84577ac8df16ea6c2b WHIRLPOOL 18eb3725291b6326666c95cb07c1856b70cca947763a665c8694087945edc877001f63b263ebb15c571f56bfe6dd07c04320f2f10dce5f1114c44e74eb2951c5
+MISC metadata.xml 259 SHA256 f742e56d90e12b8d4647dd80d7bbca5d0c8187f4673b2d5732f36c40da290df5 SHA512 f0b022a8047e4d0fcbfb12f88ac7761c403cb33e7fcb900ec929e06d00251253426815b3293d072e13ab69b643c256554c753b62be63554d408c06f6a6d63a3e WHIRLPOOL 007b8662477822237f7de5614dfd5419b7175ab5365dda17cd08a943b1fc98a280a5bf8e9ba0710b7ce7d7866bdc8a0975e6bdf48f76b5dabcc02ca3167328b9
diff --git a/dev-python/parsley/metadata.xml b/dev-python/parsley/metadata.xml
new file mode 100644
index 000000000000..8879b60cfbe2
--- /dev/null
+++ b/dev-python/parsley/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-needed -->
+  <upstream>
+    <remote-id type="github">python-parsley/parsley</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/parsley/parsley-1.3.ebuild b/dev-python/parsley/parsley-1.3.ebuild
new file mode 100644
index 000000000000..ef259522becb
--- /dev/null
+++ b/dev-python/parsley/parsley-1.3.ebuild
@@ -0,0 +1,17 @@
+# 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
+
+DESCRIPTION="A Pattern-Matching Language Based on OMeta and Python"
+HOMEPAGE="https://github.com/python-parsley/parsley"
+SRC_URI="https://github.com/python-${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/partd/Manifest b/dev-python/partd/Manifest
new file mode 100644
index 000000000000..d6a3c9d4d2b3
--- /dev/null
+++ b/dev-python/partd/Manifest
@@ -0,0 +1,8 @@
+DIST partd-0.3.2.tar.gz 17097 SHA256 0b8a2f313d07548ab5fbca89fae27d63ce81709ee544609b9e515d9c604ca910 SHA512 7d48af79d6a42d7adbca85df1199d266ae115b4160fcaa9ba6a026b92ae813d9a37594dfab06f969a38799f13f23c80bbcd89be4ec4fdd8ad9f85718598707de WHIRLPOOL 4a7abf38f897cc09d061ffa5ccd2eb3f16a8496c60bd36feb170a52bea6789c1597921b69e97f875c8fb72a1b8549787f073f26fb70818038ce6e888afa6d7f0
+DIST partd-0.3.7.tar.gz 17530 SHA256 fdc344bca07f3b10645cc380950a00bbfcdbf993f3396715eb0936d14811cd18 SHA512 84b6cb6af0607dace3bb20a38b4767ec75c92e903ba2cf1069e048d4c9cfba8bcf6d998767817a1310ece2570c2f0d60e5a42c80d38d603c656b74d00e6f0986 WHIRLPOOL 078ca146b7505aeb62e17578ea277b5412e9acee135b95488539370805520bd996a127c35da37fdeb7e9f02883fc8dc53d492a819f9c6d70c2bbaf5386abd328
+DIST partd-0.3.8.tar.gz 19171 SHA256 67291f1c4827cde3e0148b3be5d69af64b6d6169feb9ba88f0a6cfe77089400f SHA512 3b7c642f7452a409eece356d2fe2e9430f6c5859b685c2ebe3d4cd8fbaa1c86e370174454f31b264ff8866ca9a9ab3bc0ca288f7ed123d8233ea3332f373d01d WHIRLPOOL 7260009e9572ebc828f7b57648c144cb851fc040dd73f0b759ffe87bcc0cf969c989bb59b76038031b78953797e5084282f801bae12f7c5303e1894ac4fb8d7d
+EBUILD partd-0.3.2.ebuild 803 SHA256 2f3d75dbfa21ea48a6548ac417724eb5b38936efb27a52ece568ec93117c57ae SHA512 c6c4ca3983a766fb2f5bfddcfc5e4477592523817f34745e9d00ac87b11627d765704d47a80b83f37af02525aabee2f971d5424e95f05fe1c0c26ff55d4df63e WHIRLPOOL 8521a1ea7f79c89ab6ed40ca4f6d1358ca3d59d7430c363afd27dd3f73358f112bf8f65afb947e7acef81614c4e448b921c7db197bfc3f80e1444c2d586e45a7
+EBUILD partd-0.3.7.ebuild 806 SHA256 61a576c4ef802a216398ff70d3dcb41adeb37f56a0462cf921449d39fef2a1cb SHA512 b4cc701e81a15ff2f15c9b9da0d83252cdca2f16bba265747fd37c77329a4775631218c6a204674f98610eeeeb25339d93c6eaec983f8733660481146e1a8048 WHIRLPOOL 0ca97e44cc49a0ab6c8d1c2ed45f25bd90633e4ae167fcb19a6ea2a14236e2691f70095b4ba9c39e3bb3abfc712e7d54c61d857dd5f883947cd7e5eaa4ae1161
+EBUILD partd-0.3.8.ebuild 808 SHA256 e7be0ca5408c4833b8f269a8ee6cdaddf64cb50f209811c82106934d54c6059e SHA512 5d8df98b14d32b8075c4fb86feccc4298cb87f1268df9d5c0a81e896b7c1d1be2e5d58f6772c60231ac6bb39a3879f63ae47afbd0695617bae9f20fd90ad33c0 WHIRLPOOL 72368b7e162d68b70c2534fd31e2544cb5135c3bc8c129671c73b986d191bbd475eeb43a6bc6b20d860da3b5b201738e84ed6af4fa818fd486b00b94ddbc3bed
+MISC ChangeLog 1244 SHA256 9bb0f4a434a6e82a1b53f017e65ab9560f9b990fb09cf21abacae878b097a8dd SHA512 5d2d3a8ba803824380fe386f0608b57fc6c5f06ec41152518bd988f40ca0bd9b7d65cfc49e45258af598dd0065362a14fd57ba4f88730eae8bc978af284886b1 WHIRLPOOL 67caf3b474a70ad159419a3b08be98eafc6aae03694cf9882e34f577b79047e2f128ab2dc92c1b46a1bd0fea45e3f84e7e6939eb783835ccb2ae128730cf9177
+MISC metadata.xml 668 SHA256 61cf17b2ebbc211fa3f2f48703781aed9560a6e68bb81a2be82b7f832def9e55 SHA512 30f9fb68a75ecadd72d03b01be181cc661ddc70b595fcef8cc5d9a98de089d585e2baa9615e9989af68cc4f1e520c8862b41ac769568c8a29a3c8877330fc52f WHIRLPOOL d9c0721949e0aece4e06a1f6109a1c3a83eff4e8edc77bb848ec8ffdc593e9fa915f55154122cffc77fbd49602a51b012ed53f4460e2a3bce656b5e7590c9c4e
diff --git a/dev-python/partd/metadata.xml b/dev-python/partd/metadata.xml
new file mode 100644
index 000000000000..1f38ba605190
--- /dev/null
+++ b/dev-python/partd/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Partd stores key-value pairs. Values are raw bytes. We append on old values.
+    Partd excels at shuffling operations.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">partd</remote-id>
+    <remote-id type="github">dask/partd</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/partd/partd-0.3.2.ebuild b/dev-python/partd/partd-0.3.2.ebuild
new file mode 100644
index 000000000000..143b51370ba0
--- /dev/null
+++ b/dev-python/partd/partd-0.3.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Appendable key-value storage"
+HOMEPAGE="https://github.com/dask/partd/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="dev-python/locket[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+	  dev-python/blosc[${PYTHON_USEDEP}]
+	  dev-python/numpy[${PYTHON_USEDEP}]
+	  dev-python/pandas[${PYTHON_USEDEP}]
+	  dev-python/pytest[${PYTHON_USEDEP}]
+	  dev-python/pyzmq[${PYTHON_USEDEP}]
+	  dev-python/toolz[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test partd --verbose || die
+}
diff --git a/dev-python/partd/partd-0.3.7.ebuild b/dev-python/partd/partd-0.3.7.ebuild
new file mode 100644
index 000000000000..89c19a6550da
--- /dev/null
+++ b/dev-python/partd/partd-0.3.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Appendable key-value storage"
+HOMEPAGE="https://github.com/dask/partd/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="dev-python/locket[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+	  dev-python/blosc[${PYTHON_USEDEP}]
+	  dev-python/numpy[${PYTHON_USEDEP}]
+	  dev-python/pandas[${PYTHON_USEDEP}]
+	  dev-python/pytest[${PYTHON_USEDEP}]
+	  dev-python/pyzmq[${PYTHON_USEDEP}]
+	  dev-python/toolz[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test partd --verbose || die
+}
diff --git a/dev-python/partd/partd-0.3.8.ebuild b/dev-python/partd/partd-0.3.8.ebuild
new file mode 100644
index 000000000000..5f0935f33f87
--- /dev/null
+++ b/dev-python/partd/partd-0.3.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Appendable key-value storage"
+HOMEPAGE="https://github.com/dask/partd/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="dev-python/locket[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+	  dev-python/blosc[${PYTHON_USEDEP}]
+	  dev-python/numpy[${PYTHON_USEDEP}]
+	  dev-python/pandas[${PYTHON_USEDEP}]
+	  dev-python/pytest[${PYTHON_USEDEP}]
+	  dev-python/pyzmq[${PYTHON_USEDEP}]
+	  dev-python/toolz[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test partd --verbose || die
+}
diff --git a/dev-python/passlib/Manifest b/dev-python/passlib/Manifest
new file mode 100644
index 000000000000..94db5d03c431
--- /dev/null
+++ b/dev-python/passlib/Manifest
@@ -0,0 +1,5 @@
+DIST passlib-1.7.1.tar.gz 645724 SHA256 3d948f64138c25633613f303bcc471126eae67c04d5e3f6b7b8ce6242f8653e0 SHA512 3d5f069cd4e44e5e87cdabc46845acbdd6c1eeedb7ce1f611aebee87b0f7af19009b6a47a10ec555fd84260b9f5c933c6429e325d30326de3869f05031674168 WHIRLPOOL b3c7e8587eb080ae9210bec3ff272ee0c4b644753ff5a80182496f6c8599f615480261528ad7ada2f8c785204631f57c38360f1f7c11e142daff0ad6441872f8
+EBUILD passlib-1.7.1-r1.ebuild 927 SHA256 f02398fe3bbc8f8588e2222bd9fb4b63c8786ae581206a407a1cf0bd8ad039b2 SHA512 be289d67b85730f7902ed7e6c4df05aeacad9d7962c5e29a0500baa7b11ce4b2310cb47793a723e8c5bad9d1200e446e4941b23bb8bf1ca0cce85b69bd4c53d0 WHIRLPOOL 87ec2619d50377c6e9214a8998f979f356fd38ed8fc7550beadc0a062fc1e54d468b4fe38e17bb7a06b91916baa58739ce7c6fbf35e3c006134a851f6a440f13
+MISC ChangeLog 3900 SHA256 c4d28045c253e3fc28462b11c688815b1955366b681e45a83fece01a13ed57eb SHA512 d14f485cfa6f9676364aafa2ce85dc426af8895bb5e4726d6779242494558d54304f3ebb8c4ae24a8760b0d6df9ea604fea35608646fc28f1a418a04a30a47b4 WHIRLPOOL 53b8d082efae05be35754668b175dd8dde3581e8b6ec67cfc1b25b564ee2597c76ad8659201080895c64a0ab533b84a9fdf0c01289872cd3525ac799cce05c4c
+MISC ChangeLog-2015 2126 SHA256 ecf0e0f61fc26d123ae5f1c1b9477ab6da02a231f421f5270becc76a57a855ba SHA512 1ae901d8dc0111496a848441101dcd767196bf76b10499e34a5239d66b9b4b4743414b0b0fda9da8366c3b56d347567314dc60736e2407f2654aa2ced986abad WHIRLPOOL 4c4732473c98ede40c3d8e03939fc50e68cc3b7f7a741d5d08472ee3bc49a2b533cc6eae9cd459b7cecf78b96f512cadb60d771f5479784c39eab56d19b7d7d1
+MISC metadata.xml 941 SHA256 4e572d64b26fcdef526bbaeaa07b0c5a3bcaadd4318c2d6dbc2df817d6e96818 SHA512 9b46eb0b2ada1032bc7cf5c447b76b8c5fe2b77dbb2ea5db0e0dfcfef1e824618e5325937c5664e84294089c0786bebe8aceeb0d793b9c0d9cb0b922584e003f WHIRLPOOL 0d55c92329adb44c468f6994e551918cce843b66e34e6606ab897d81a6f84f2f88408877cc6c1bd729910dfee3fbcbc26c190e4e8944190968b04c804cd7c529
diff --git a/dev-python/passlib/metadata.xml b/dev-python/passlib/metadata.xml
new file mode 100644
index 000000000000..2165eac1f821
--- /dev/null
+++ b/dev-python/passlib/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    comprehensive password hashing framework supporting over 20 schemes
+  </longdescription>
+	<use>
+		<flag name="bcrypt">bcrpyt hash algoryptm support</flag>
+		<flag name="totp">time based one time password support</flag>
+		<flag name="scrypt">accelerated scrypt algoythm support</flag>
+	</use>
+  <upstream>
+    <remote-id type="pypi">passlib</remote-id>
+    <remote-id type="bitbucket">ecollins/passlib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/passlib/passlib-1.7.1-r1.ebuild b/dev-python/passlib/passlib-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..8cb5fa14d8b7
--- /dev/null
+++ b/dev-python/passlib/passlib-1.7.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Password hashing framework supporting over 20 schemes"
+HOMEPAGE="https://bitbucket.org/ecollins/passlib/wiki/Home/"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+SLOT="0"
+IUSE="+bcrypt doc +scrypt test +totp"
+
+RDEPEND="bcrypt? ( dev-python/bcrypt[${PYTHON_USEDEP}] )
+	totp? ( dev-python/cryptography[${PYTHON_USEDEP}] )
+	scrypt? ( dev-python/scrypt[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use doc && dodoc docs/{*.rst,requirements.txt,lib/*.rst}
+}
diff --git a/dev-python/passwordmeter/Manifest b/dev-python/passwordmeter/Manifest
new file mode 100644
index 000000000000..4cad34bf0019
--- /dev/null
+++ b/dev-python/passwordmeter/Manifest
@@ -0,0 +1,5 @@
+DIST passwordmeter-0.1.8.tar.gz 51904 SHA256 f4f7df54182072a137bca3e396f2dad354770ba596dd41f6646cd1f0665fee12 SHA512 c7604054812576ab8144523c174f3d1543da3ccc192420a9ce8fe596887d1e53a596c255b9f1ffb9a7ab5e3952f53ff8fde11966a58a2ccb2210f891e43b4ac4 WHIRLPOOL e13a360a4b3398ee6289bd39f1bc17bd20ca259c14fef91d2e93f1f2d0c224e34bd0f06189b0be7595fb7c580872eda431ef240b6e0037cc88171208d561d636
+EBUILD passwordmeter-0.1.8.ebuild 801 SHA256 24512f0be62d5174cc0818a43c2460d9ddd8e538155fd046c4b2c5e30b37edb0 SHA512 74e6e704162ce6614f22527c490e1ffc408fb33944e41aef1368e5d5e45ba9d710e48832811e35ba36ef3fcc12fa7cea1e97bd1a4dd215fc47c2e47bde6f46a9 WHIRLPOOL fcd5e520305b33b40f44444b4459295fb6f04e312bbd2e9debc1650cedf47a0d8a442d15b9cd7cc8ec5ed30e14db0a24098d47db0fb61c7e5d52d4732d03907f
+MISC ChangeLog 3155 SHA256 a64195ac1c58e05dc27ad8b5f5b9b82c06d6348a3e69f1d00539bde9129c20fc SHA512 ceae112e8d458f4853ac9e8d034d3792b2974846a825507bf00d23d7a56122a528019c516a9382bdce05486e648e6d66577941a51c9011b1a38b86feb6c5d41d WHIRLPOOL b55439ec8ae55a143e5aa0edc8c6ee345566133c51dd291d5558099edd3d199af7db3b5f41d7d5ee5e8d9afc09a684ab1c08e41d16c1adb12351120bdd3ee7a4
+MISC ChangeLog-2015 571 SHA256 358bcc71ceae4edb63ec98c72cbe51e9d53e856f0c5dad08d8b342d7b1f3a3c7 SHA512 695e6c11369a8dcfd2a13504924a2b2da4e232b4e44349e7953dc5bb5287896f3731cd6602a423a558e7bbd071724077c040c7f75790f1c9b45deb661260cce9 WHIRLPOOL 00522780ddb9d6e34807e5123ebaf92b68bf63f1bbc8e93b2301c9e49ac350739763141c9d8ae94731c3274c866ef47691afd578effef40503b0b9e670e716a4
+MISC metadata.xml 381 SHA256 e3945939511fbf66497cd9b44dfabe8945eca100e76daa081f216b9b4019a6d3 SHA512 193e98b082bd4db93b501b449e3f276b6b42619f50ef22624675b150c8d68656809217a1622480645767f3e4747c3e5b79b1394d9cf4ec6f7a6cad29202f6af2 WHIRLPOOL b427bdbd8f1e569d185ed4a6f23afd978fda6dae6d92cec92550a7f09d489a1ae3ffb8c8bd5965d449e1a6a835a5557e8a02de44c95a771518da3e925c2b4275
diff --git a/dev-python/passwordmeter/metadata.xml b/dev-python/passwordmeter/metadata.xml
new file mode 100644
index 000000000000..e0d6afee4951
--- /dev/null
+++ b/dev-python/passwordmeter/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">passwordmeter</remote-id>
+		<remote-id type="github">cadithealth/passwordmeter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/passwordmeter/passwordmeter-0.1.8.ebuild b/dev-python/passwordmeter/passwordmeter-0.1.8.ebuild
new file mode 100644
index 000000000000..ebb4a60f3ed5
--- /dev/null
+++ b/dev-python/passwordmeter/passwordmeter-0.1.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A password strength measuring library"
+HOMEPAGE="https://pypi.python.org/pypi/passwordmeter/ https://github.com/cadithealth/passwordmeter"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/asset-0.6.3[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed \
+		-e '/distribute/d' \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
new file mode 100644
index 000000000000..595e0bd4071a
--- /dev/null
+++ b/dev-python/paste/Manifest
@@ -0,0 +1,7 @@
+AUX paste-2.0.3-unbundle-tempita.patch 1260 SHA256 7420cd9a9f34d73200b69451d6a3b6c11be2b77eb475a79f02b7d5542bfc8c57 SHA512 f21894596c81d984bd7820876e7dfc614728beba107294fecbab084ae1e023428d4d86bde31e428c2f0aa78647636d19f476129ff319dd2c90052218cf428c98 WHIRLPOOL 8da25704d482469e0c22b4cfd5211ef9dea0ec64e914fe807b798a6ee237e97367e75e4d8bd03d57fa344177bad56c92c52c3ff2496172a9c6032eb5e99bdd64
+DIST Paste-2.0.3.tar.gz 643935 SHA256 2346a347824c32641bf020c17967b49ae74d3310ec1bc9b958d4b84e2d985218 SHA512 174b06d77bc6e1d4079e8de7df40412ffda098364efd4e3f915f858be1188c8a6fb546fe4ab981ccc067ec77b7171083b2469e7db6fc3b777d5a24151c928362 WHIRLPOOL 0aa15c2c6ffdbf965f3763d296e28c75337d9e582ad8623d70a9a4df572457247d583682b7ecddc5206b1a997f22e4f46f68b013a1ca646b0d6d08559ac1447e
+EBUILD paste-2.0.3-r1.ebuild 1872 SHA256 3a9f274cf3e47c403872ddb7b77125bad503d405117952aa8e2a8260343ced4a SHA512 cdc63f9e497b9434e7b0d62adaaf92b3ad8da6a93acbef85f858e4e1383e81b5c0101261af7dba7902091014c7104d0e973783dcfbbaec72aa2f06c2af229fd3 WHIRLPOOL a9d11809ffc9bc5ebc316574c52635e3ba11b8c72bf9ab589fcae65e738dc3e2c78d277aa661988fadb4ea371a686ff8cde9ffa37065491b9c465dba2c4e0289
+EBUILD paste-2.0.3.ebuild 1783 SHA256 48a085c078c8f63d091ae8a8902faec100041b3ed1312f31699280db4f7e2c09 SHA512 8beb71282d2c3ea118fd86e380a98dd85f8a50aa8d947b742dfcbfd891a669cdfdba56490c92eb02a4343cb282da37df9d0bffe4f85c3714d5ab0810119d02a2 WHIRLPOOL bc9320864ae7f28d972e0b5f0e3418a5a85ba072725fee45871e0a66f2e5a6dd64770cb4aca9965b85bee3f7dd474b4823cf39e255c8c17342baf5d3216db546
+MISC ChangeLog 4068 SHA256 6049ef4d01843bb617ce6db9f539e29fb1d3bb72ae87dc7eb8eb487a3f13ea25 SHA512 3732e33a835ebe771f8a70d726520efb8d85ba894b72ce9a46e24e5c69f4880830f02010eed331d06808b611eced64d6e26a7ecf4fefa5b3fc035e96a7ed5fb2 WHIRLPOOL 7ada9354a91a1c30183542eacda4b77fe2e57b360e28d3651ab29368a3364fa0014f3bd8f4e7f68a85aac576dec9eebec868f5199e5f03981a5fea7f19084f8c
+MISC ChangeLog-2015 4923 SHA256 605bb235d4f2f08d774e664f44ec59f05ce103f9e5308c9c2a7ae15222deba40 SHA512 c8db1159751d0fa5b3522fe5f0ee50d89bb28de02a0392a240ed161fb221b26b167321e371c99e314c2200184f597639dc39ac5018b8751bf173e548497c358f WHIRLPOOL 864d51f7136749cbaf1a17f117c3bbf8c69cc676ef1dee56a5b31fc8898a2acce44d138d4248be84a43eb6ec07d11bedc4c598e0afc0ef8e889875514a16c74c
+MISC metadata.xml 778 SHA256 bdbae4f213108ae60ce9f8f90ceb43f4bea8323155e90f5af7107fff3f2a12c0 SHA512 86b244a3dd365e74dfc12dfc283809840352cbe210b34c34ffda1929db29362d1e02b246920d8461cde70b087020d15cecd3ec5cfe0f168fb69fa45cdb66015a WHIRLPOOL 56a5da700b8b6e4ce0f155f2a863227e614bb94ced351f6f7ca47d12e4782b949d259b1c3f30eec9a127888ea95bfc44c1ad95ab063c25ba12cf5642b4bcaa8f
diff --git a/dev-python/paste/files/paste-2.0.3-unbundle-tempita.patch b/dev-python/paste/files/paste-2.0.3-unbundle-tempita.patch
new file mode 100644
index 000000000000..eef7abb4108e
--- /dev/null
+++ b/dev-python/paste/files/paste-2.0.3-unbundle-tempita.patch
@@ -0,0 +1,36 @@
+ paste/util/looper/__init__.py                     | 4 ++++
+ paste/util/{looper.py => looper/_looper.py}       | 0
+ paste/util/template/__init__.py                   | 6 ++++++
+ paste/util/{template.py => template/_template.py} | 0
+ 4 files changed, 10 insertions(+)
+
+diff --git a/paste/util/looper/__init__.py b/paste/util/looper/__init__.py
+new file mode 100644
+index 0000000..77d7e80
+--- /dev/null
++++ b/paste/util/looper/__init__.py
+@@ -0,0 +1,4 @@
++try:
++    from tempita._looper import *
++except ImportError:
++    from _looper import *
+diff --git a/paste/util/looper.py b/paste/util/looper/_looper.py
+similarity index 100%
+rename from paste/util/looper.py
+rename to paste/util/looper/_looper.py
+diff --git a/paste/util/template/__init__.py b/paste/util/template/__init__.py
+new file mode 100644
+index 0000000..a0a5730
+--- /dev/null
++++ b/paste/util/template/__init__.py
+@@ -0,0 +1,6 @@
++try:
++    from tempita import *
++    from tempita import paste_script_template_renderer
++except ImportError:
++    from _template import *
++    from _template import paste_script_template_renderer
+diff --git a/paste/util/template.py b/paste/util/template/_template.py
+similarity index 100%
+rename from paste/util/template.py
+rename to paste/util/template/_template.py
diff --git a/dev-python/paste/metadata.xml b/dev-python/paste/metadata.xml
new file mode 100644
index 000000000000..0d00d7f04c00
--- /dev/null
+++ b/dev-python/paste/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="flup">enable support for flup (and therefore for various
+		wgsi servers and middleware)</flag>
+		<flag name="openid">enable OpenID support</flag>
+	</use>
+	<longdescription lang="en">This package provides several pieces of "middleware" (or filters) that can
+	be nested to build web applications. Each piece of middleware uses the WSGI
+	(PEP 333) interface, and should be compatible with other middleware based on
+	those interfaces.</longdescription>
+	<upstream>
+		<remote-id type="pypi">Paste</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/paste/paste-2.0.3-r1.ebuild b/dev-python/paste/paste-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..743362b034d6
--- /dev/null
+++ b/dev-python/paste/paste-2.0.3-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="Paste"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
+HOMEPAGE="http://pythonpaste.org https://pypi.python.org/pypi/Paste"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="doc flup openid"
+
+RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/tempita-0.5.2_pre20130828[${PYTHON_USEDEP}]
+	flup? ( dev-python/flup[$(python_gen_usedep 'python2*')] )
+	openid? ( dev-python/python-openid[$(python_gen_usedep 'python2*')] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable failing tests.
+	rm -f tests/test_cgiapp.py || die
+	sed \
+		-e "s/test_find_file/_&/" \
+		-e "s/test_deep/_&/" \
+		-e "s/test_static_parser/_&/" \
+		-i tests/test_urlparser.py || die "sed failed"
+
+	# Remove a test that runs against the paste website.
+	rm -f tests/test_proxy.py || die
+
+	local PATCHES=(
+		"${FILESDIR}"/${P}-unbundle-tempita.patch
+		)
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile egg_info --egg-base "${BUILD_DIR}/lib"
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	nosetests -P -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install egg_info --egg-base "${BUILD_DIR}/lib"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/paste/paste-2.0.3.ebuild b/dev-python/paste/paste-2.0.3.ebuild
new file mode 100644
index 000000000000..a41dcdc1d171
--- /dev/null
+++ b/dev-python/paste/paste-2.0.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+MY_PN="Paste"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
+HOMEPAGE="http://pythonpaste.org https://pypi.python.org/pypi/Paste"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="doc flup openid"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/tempita-0.5.2_pre20130828[${PYTHON_USEDEP}]
+	flup? ( dev-python/flup[$(python_gen_usedep 'python2*')] )
+	openid? ( dev-python/python-openid[$(python_gen_usedep 'python2*')] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable failing tests.
+	rm -f tests/test_cgiapp.py || die
+	sed \
+		-e "s/test_find_file/_&/" \
+		-e "s/test_deep/_&/" \
+		-e "s/test_static_parser/_&/" \
+		-i tests/test_urlparser.py || die "sed failed"
+
+	# Remove a test that runs against the paste website.
+	rm -f tests/test_proxy.py || die
+
+	local PATCHES=(
+		"${FILESDIR}"/${P}-unbundle-tempita.patch
+		)
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile egg_info --egg-base "${BUILD_DIR}/lib"
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	nosetests -P -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install egg_info --egg-base "${BUILD_DIR}/lib"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
new file mode 100644
index 000000000000..eae7ec550e9e
--- /dev/null
+++ b/dev-python/pastedeploy/Manifest
@@ -0,0 +1,8 @@
+AUX pastedeploy-1.5.2-py3-tests.patch 606 SHA256 855572c12728aff8b49cb011ba905c0578af78cbdf169a3c7523651ccf2929d3 SHA512 0301653864071de976bae24a945ba6d8499aaf21d41c5117ad922254055ee8a3b975cdadc6590677cd458a233ad115647a01a05d52feb0dd40d16bcf4de8f5cc WHIRLPOOL 9cd42ef4cc79fc5a13faf0b627d53c7df7c6a8aae0f88364ff4c39e18d03b9916f2abe51e833aea59f9e2d83f831dc17248febd408f704b8ca7b72ddc9c7caa0
+DIST PasteDeploy-1.5.2.tar.gz 24006 SHA256 d5858f89a255e6294e63ed46b73613c56e3b9a2d82a42f1df4d06c8421a9e3cb SHA512 03147b2e735f4504b928066d35f46e7d19a49b85afc506b793fba69c8827a4d5b8185074bdd4a963ac392cc104f5a608d1db9a3538d7d3239da5febcbff4ccab WHIRLPOOL 0a48c72278c71376f8b4ddc708c1b6c3370b13f66fc3d438d1a485e69d413814ca37cf580d8e09e0d49a8a35f7e6e0104744440a3fe6b1dfeb5914d3a0557793
+DIST pastedeploy-1.5.2-r1.tar.gz 29528 SHA256 041a5d524ceb45b5677e0d7e0d94d01c14dc8bca51d35266497532299d9fa7f0 SHA512 5d9f648d4bddb4fa0b018f5e1c100d0899ff9e6a429a0a54aede69800fa13b7bb0d606ff454c516b36c3b056320bbda4581de9d57a154e71493a8bd6208fb3ce WHIRLPOOL a5938beecf0845e31a97f292fdc4ee49bf6bfd23a349a857c19269355e6f2c1b79cfb5b31ebdc7e29494054b94170cfb511530c054e070eebbf373cfee954bf4
+EBUILD pastedeploy-1.5.2-r1.ebuild 1054 SHA256 7f9fbb2b3124055480a4e23bfe08e6d491dbab9284a6b2abe39a4bb764c6b77f SHA512 c9146508fb21311bc63bfd2d1f5bdeac7960d0e6295d16cc18ca142d448f5f97ffe7ba3498d2ff73997fa37d0d2ebea753461a41848fda75fa3e4f271abf0ab1 WHIRLPOOL 8a28005f38169921da50cfc9864afcf02dbcad9d0e2706e0ca23b108b5907bfc25cb622a08c8e1367820308f91a79b10b8a92d4e149d94e98d153f6171d84497
+EBUILD pastedeploy-1.5.2.ebuild 756 SHA256 0b7673113e019845837085b593c912f80ba2252afcf130331f52204ad5198a07 SHA512 d8dfb64442a57535b875302f9e0d7d95a81353c7cc3909c92160842648c08a27e3cb4ddbb62ed4dc3454d30033f9d4c537e6884e0cc7f3fa2c25ade913d51032 WHIRLPOOL 34c7d3b82ed477a9943508b25804144d4f8ffa4d424d1e3f4369b78470ebee550040068e25d4efd3eb064f8fb9bdf0c368c1a0f86229447902c43b8f5c96d08c
+MISC ChangeLog 3204 SHA256 9d10f49e328057b27bdce53170b4d051283530a158c131cd69171f22759c0061 SHA512 39096b9670ec0ba188d00e8f79a36322d3a0a096d0b6a9ff5c9ce32836637498cc2f3f6beca462430b780164e8e984c25a255420befd7fe4f60a6a2d0967b1da WHIRLPOOL 751e87d34120f00b6a149305315ac61e2919fe223dc40fe714efa6ae79c11f5ad5a62b75cd17525247d856918afba648bdfc1793aeaa34b4e2033ae4f52194f6
+MISC ChangeLog-2015 3972 SHA256 ab23420322cbc23433f7ea584ad88275a1f53c85364592acbd2d75904b6afe48 SHA512 8b9d03eead2069cd3b1fb5372170da4fc013b69b41ada361832494487c6647ad26492764f8b16c348841e3684ba37df586209e8dca590e658cf9c75709f052c7 WHIRLPOOL 5f77833699fbbb61a72691bae360b0248b6dcd91b008f850df642fe0f096f5c891ffcffc8fb0b1b2be811a1eb4a9b27e9173edc459c904c299732965d3ef9732
+MISC metadata.xml 806 SHA256 0db93d77e989bb4229b14ad6dde585665841ea43d9ce641a739f99e1fa53dc5e SHA512 da770a4fe1f5918391fa4861dab525dcee34d5aeb362a464307c6c8b32edb4731effd22339056f01d77eea8d3729d3ca57572d1d95ebab8b786cad9029250f7d WHIRLPOOL c21db378b7361f99253d70e5ed881d7885731ab73486aa75f01fe48e805ee31591d5eeefe86f6c68a823299b0444ae0d8f835a275dcf73e5abdaebbbe9db9e75
diff --git a/dev-python/pastedeploy/files/pastedeploy-1.5.2-py3-tests.patch b/dev-python/pastedeploy/files/pastedeploy-1.5.2-py3-tests.patch
new file mode 100644
index 000000000000..0839406813b6
--- /dev/null
+++ b/dev-python/pastedeploy/files/pastedeploy-1.5.2-py3-tests.patch
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User aodag <aodagx@gmail.com>
+# Date 1457425517 -32400
+# Node ID 6aeb907ef222ed071b149f8b07b14f0a61e45dbe
+# Parent  0c2ea2f675bc77f2ee2a889c0e83d61d026fbc7b
+use explicit bytes literal
+
+diff --git a/tests/test_config_middleware.py b/tests/test_config_middleware.py
+--- a/tests/test_config_middleware.py
++++ b/tests/test_config_middleware.py
+@@ -10,7 +10,7 @@
+ 
+ def app_with_exception(environ, start_response):
+     def cont():
+-        yield "something"
++        yield b"something"
+         raise Bug
+     start_response('200 OK', [('Content-type', 'text/html')])
+     return cont()
diff --git a/dev-python/pastedeploy/metadata.xml b/dev-python/pastedeploy/metadata.xml
new file mode 100644
index 000000000000..c40531961758
--- /dev/null
+++ b/dev-python/pastedeploy/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">Paste Deployment is a system for finding and configuring WSGI applications
+	and servers. For WSGI application consumers it provides a single, simple
+	function (loadapp) for loading a WSGI application from a configuration file
+	or a Python Egg. For WSGI application providers it only asks for a single,
+	simple entry point to your application, so that application users don't need
+	to be exposed to the implementation details of your application.</longdescription>
+	<upstream>
+		<remote-id type="pypi">PasteDeploy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild b/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..094cbe4b67ee
--- /dev/null
+++ b/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild
@@ -0,0 +1,42 @@
+# 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 vcs-snapshot
+
+MY_PN="PasteDeploy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Load, configure, and compose WSGI applications and servers"
+HOMEPAGE="http://pythonpaste.org/deploy/ https://pypi.python.org/pypi/PasteDeploy"
+# pypi tarball does not include tests
+SRC_URI="https://bitbucket.org/ianb/pastedeploy/get/${PV}.tar.gz -> ${P}-r1.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc test"
+
+RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${P}-r1
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py3-tests.patch
+)
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	use doc && dodoc docs/*.txt
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild b/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild
new file mode 100644
index 000000000000..77a24a3f5276
--- /dev/null
+++ b/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild
@@ -0,0 +1,30 @@
+# 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
+
+MY_PN="PasteDeploy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Load, configure, and compose WSGI applications and servers"
+HOMEPAGE="http://pythonpaste.org/deploy/ https://pypi.python.org/pypi/PasteDeploy"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	use doc && dodoc docs/*.txt
+}
diff --git a/dev-python/pastescript/Manifest b/dev-python/pastescript/Manifest
new file mode 100644
index 000000000000..9f9fccc77e40
--- /dev/null
+++ b/dev-python/pastescript/Manifest
@@ -0,0 +1,6 @@
+DIST PasteScript-2.0.2.tar.gz 117521 SHA256 c03f249805538cc2328741ae8d262a9200ae1c993119b3d9bac4cd422cb476c0 SHA512 2f093eb982972fed354219c75c2e008931cea553960cea8aaafbe57cde8556de5626e7eb9bb3b9b7328bad3b7d9899f11fc9773a65380396dae506e7531516de WHIRLPOOL 951c16499bb9e120813749871cfdc7b36b04660c4dbb4c0d2c7335312a8b58c412dc0ca49029ce674be90207645eb1657bde8ae869ffb72d29c592ca978cdca9
+EBUILD pastescript-2.0.2-r1.ebuild 1321 SHA256 6b05b854a216643b9b9376c0f725978a977ef3e8c36d83aded330c657507706a SHA512 3feca93a4d9cf5712c874eca4f43c5ad3d937a9fc12f7c37be5e3118cec2ce1d0f8aa8c62e4c1f4e419e74c02f4177a088aae2d572256e3210b5c259b10bee0f WHIRLPOOL 1eae19c25b799a5013d35dd6b5752b479f1d7cc013242cbba1ca94a0aca2893cca8dfb35ceb6a4a5c3fea9af9bfc1a29e69ae84bc7de227d0fe41054ead97c89
+EBUILD pastescript-2.0.2.ebuild 1226 SHA256 699a38cbdabb2e7d1d29d3bb9c66d30172fb57dcb5fa2affce25ef80923c7aea SHA512 e8dc8003d847b4c53a87f8ffcac9dd152c6defdc5e51bab5ae891d042e9b6a358f9cb63ac0ff83e72c12e237adcb8fb89bb81dcd767ff91a2a8904496287e92c WHIRLPOOL 241721ab8c944c269bfdc25351e5ea36358565a71978efa9d3247f29633f16189dc142e63f4a91486595befd610a938754d86b1222d02a060f457341dd455dec
+MISC ChangeLog 2957 SHA256 d7109adb1ea6d2e629816c74b0aab2d95ea087fcf2bafa49d0af2bb32c45a48e SHA512 1a534f1e20c90da23bfe415c7e686677d67fd424a5d7caf937ef342f97aa07c22fa755294c5208fdcbe36b5e0d866cb537cf43517b687998841f51696f7a19f3 WHIRLPOOL 832dd06849f762e4ce031aa96ff2afc3cfb8b4f2b913cf634d543ed6d150f970b622f792beef9e62e687712fec1e510cf2d620369371e142f778e3392a5b1f9c
+MISC ChangeLog-2015 3344 SHA256 18b62082d4f481d224ff287fcee3fe7d088b58b1b3726e5005b2ba61e6ec0739 SHA512 40d5c1ba06afe52cec0c76adc2d5e30ab262c811b64e0739e0a2e9e271be65ee9a17e5e816cb2d077051220e2183aace544068ccc99b98ff8af9d8dcf8e79d5a WHIRLPOOL 5a39b4e7297757f38ec52a47ebd8ce46cf13be3d284503d1583a744c9367b249a327f86944de38bcaba10a1b36bc3f2eb5852a2d64d0d232173912c19d1ccda4
+MISC metadata.xml 324 SHA256 418fce87eac1b9271413dcec07e4c32807062aedfabb5a09f9206493502724bd SHA512 48a93ec635e32513438b44cb67bd7302c6bc55c72281d253ee4cd4b0a7d4c25ec61b028d861fa1acd2b40f22479fc0a1f726d3334c8a2970ad2b45729279ec47 WHIRLPOOL e01855fd308bda427f79b319578ca288d06bf591ba92b37b862a8c77c12ecad9174f48857608a8bdbc3d69705e5180378a3223ccff0ac41ec7c69dfc8cddc514
diff --git a/dev-python/pastescript/metadata.xml b/dev-python/pastescript/metadata.xml
new file mode 100644
index 000000000000..f51d9da0abb6
--- /dev/null
+++ b/dev-python/pastescript/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">PasteScript</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pastescript/pastescript-2.0.2-r1.ebuild b/dev-python/pastescript/pastescript-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..328f1c65c2d6
--- /dev/null
+++ b/dev-python/pastescript/pastescript-2.0.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="PasteScript"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A pluggable command-line frontend, including commands to setup package file layouts"
+HOMEPAGE="http://pythonpaste.org/script/ https://pypi.python.org/pypi/PasteScript"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/namespace-paste[${PYTHON_USEDEP}]
+	>=dev-python/paste-1.3[${PYTHON_USEDEP}]
+	dev-python/pastedeploy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		)
+	test? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Tests are broken.
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	if use doc; then
+		einfo "Generation of documentation"
+		esetup.py build_sphinx
+	fi
+}
+
+python_test() {
+	nosetests -v -v || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		cd "${BUILD_DIR}"/sphinx/html || die
+		dohtml -r [a-z]* _static
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/pastescript/pastescript-2.0.2.ebuild b/dev-python/pastescript/pastescript-2.0.2.ebuild
new file mode 100644
index 000000000000..f47206a3675f
--- /dev/null
+++ b/dev-python/pastescript/pastescript-2.0.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+MY_PN="PasteScript"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A pluggable command-line frontend, including commands to setup package file layouts"
+HOMEPAGE="http://pythonpaste.org/script/ https://pypi.python.org/pypi/PasteScript"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/paste-1.3[${PYTHON_USEDEP}]
+	dev-python/pastedeploy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		)
+	test? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Tests are broken.
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	if use doc; then
+		einfo "Generation of documentation"
+		esetup.py build_sphinx
+	fi
+}
+
+python_test() {
+	nosetests -v -v || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		cd "${BUILD_DIR}"/sphinx/html || die
+		dohtml -r [a-z]* _static
+	fi
+}
diff --git a/dev-python/patch/Manifest b/dev-python/patch/Manifest
new file mode 100644
index 000000000000..8e55e915d2d7
--- /dev/null
+++ b/dev-python/patch/Manifest
@@ -0,0 +1,4 @@
+DIST patch-1.16.zip 12809 SHA256 c62073f356cff054c8ac24496f1a3d7cfa137835c31e9af39a9f5292fd75bd9f SHA512 563be07f0376e6ddcf7fa500006d57def4faa2d9fdbd5232afac625d17d9621787de60dc67f0895e1f54f1d5cf0920594ade0985f1dfb7796f131acc92cd7f0b WHIRLPOOL 9922686830093745168256c106fbc0a26ef17f40992a6b2bb3fd9c48bb0d6f6c978a90f886713eda4a2471f135740549ff7de76e4d14bdf58cae38bb46814ac0
+EBUILD patch-1.16.ebuild 494 SHA256 4968f931df826eb34fb917f69112a61cd13a8298b967d3964f5731d358461656 SHA512 1c2dcfd17e11acf0fa8c796b1e2b724538e196accf28ef1f4f72791b23c59185909cbd00211d3415c23fb72687638a52a1da33c0fd5b85ffca46d3c388493ec0 WHIRLPOOL c3f3da668f772698a853bfae2979a28f8287d048b89d213dc45a6177dbe3f8a59916b944e6876a018b7de8e87bb0893c2702ea2dbd91232ff27c22a5aae3e28a
+MISC ChangeLog 452 SHA256 070416159e8860d525a8bcfc58a67fe82fa3d23b23425181693c79e3eb2f2572 SHA512 ccfb9147726351fa02a663d4f744a94fe7e1a88a6477380ebd44789a5438ffffce1fabec0e53e7e29273436378d14f8009a4187ec11be11ae4337e07b3e2c1a3 WHIRLPOOL ddf0f1e2e65cb13dbe976963c08be1620d30fec3cf33835f96c7a10ad4a7961371db7b65b86ee87777e7d481527347576b261dbbe851d320f8f32ccdef3681fd
+MISC metadata.xml 382 SHA256 1ffb9c2d0212dc58090d1f2e26f2079aff5d3fe9aaebfda7a65fde84970e1eb7 SHA512 997aea675440c86e710e01e3202e4e7d228860166ed568a5289f379461f3c4c9f088e1b31988ca052376acf3442a66908564692eb958455dd1c12ed59920acdc WHIRLPOOL ac235f19fed164682179205c0ba1d6b207fd62458fd44fc850261f3a962e135c83b474beb05ddece2c89138043b2de0eb19c3552c43dfcb8a5258c33fedc1174
diff --git a/dev-python/patch/metadata.xml b/dev-python/patch/metadata.xml
new file mode 100644
index 000000000000..9c559b52821e
--- /dev/null
+++ b/dev-python/patch/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">techtonik/python-patch</remote-id>
+    <remote-id type="pypi">patch</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/patch/patch-1.16.ebuild b/dev-python/patch/patch-1.16.ebuild
new file mode 100644
index 000000000000..058632249601
--- /dev/null
+++ b/dev-python/patch/patch-1.16.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to parse and apply unified diffs"
+HOMEPAGE="https://github.com/techtonik/python-patch/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"
diff --git a/dev-python/path-and-address/Manifest b/dev-python/path-and-address/Manifest
new file mode 100644
index 000000000000..80ca3d72cf05
--- /dev/null
+++ b/dev-python/path-and-address/Manifest
@@ -0,0 +1,4 @@
+DIST path-and-address-1.1.0.zip 7652 SHA256 c9cbea6919464ff2bbe441b996341e97d112ef876d8eeaa7ab127fe9fb811471 SHA512 eb60fabce6a71401b4681bcc1db5253c2043c33bd25f9bc8bf678d45aa459e2398ed482166fa0f85a0365ba8762a46e75c6c497ea25b6c1ba5c91d6a37618062 WHIRLPOOL adc380044564ae44390e9a9c882cbb0a0afb1f8d111480eef57a65c3cde611f415f2220d36d8dbfe0d76871e50643dd99fca87e88266864388c5eeb3a3f8c1ec
+EBUILD path-and-address-1.1.0.ebuild 407 SHA256 7aff7d630b4a166ec6cee33339aadec2f23683a3b47daf5654bd0471f69a541c SHA512 3641394fe3711ddda8837af77fd738e8a2f66583f865c1cced43b3c7735d211874df30842d6a02ce4a920867c729b52ccde14957446f64999aba519702d5d478 WHIRLPOOL 3d41b890ccaf73ad1fcd19c6620897e0306315f67ad3179a4ceecbd7f99491c861ab536d2d791ef063ddfcbfb0c6669a9f5b6508cccd11648f7c828ff2106e18
+MISC ChangeLog 846 SHA256 bb57f00ec5d953df83f1118c13767051b65ee0f5c7e41f296ea531d632540783 SHA512 1920358185e9d3ba0c2d19d9db00e29e72d44ea3e5573f9781ce6bc5ea01c963c746e03da5bee2f4df2ddd243bd11c371dc6f5f0e7f47636f375c5080ddbf26d WHIRLPOOL c3e75f486c2da576daf9e75bed5797039962be8f8960be6039095230bb48e77f01cfa026084703a396d0778fbe7742709cbc39c063eaf6d007a4885c56838b1e
+MISC metadata.xml 372 SHA256 748572d6d337acb9262128047534e450eb76d95ac1036cac1a40983d68e196c8 SHA512 4d300dd69614b1ecb51799e501301294daae24819f7c7fbdeeae73cc9bd9fca49cf96a12441828ec67f7c80ce6f7b0bd8cbc0e32a178673b2053e93afa8cfeb4 WHIRLPOOL b669dc7c719b90436028ece54418a4a8d90dcefad39c470390f5ed5f6848870024d75985ceba619e7d6bc230c2423673ba3147e23a625e70170fc2b7e8be7148
diff --git a/dev-python/path-and-address/metadata.xml b/dev-python/path-and-address/metadata.xml
new file mode 100644
index 000000000000..c007c2aa27eb
--- /dev/null
+++ b/dev-python/path-and-address/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">joeyespo/path-and-address</remote-id>
+    <remote-id type="pypi">path-and-address</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/path-and-address/path-and-address-1.1.0.ebuild b/dev-python/path-and-address/path-and-address-1.1.0.ebuild
new file mode 100644
index 000000000000..174f3ca7f76c
--- /dev/null
+++ b/dev-python/path-and-address/path-and-address-1.1.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy{,3} python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Functions for server CLI applications used by humans"
+HOMEPAGE="https://github.com/joeyespo/path-and-address"
+LICENSE="MIT"
+
+SLOT="0"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+KEYWORDS="~amd64"
diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
new file mode 100644
index 000000000000..33d83dad78ff
--- /dev/null
+++ b/dev-python/path-py/Manifest
@@ -0,0 +1,5 @@
+DIST path.py-8.1.2.tar.gz 33437 SHA256 ada95d117c4559abe64080961daf5badda68561afdd34c278f8ca20f2fa466d2 SHA512 639b6247d99bd7c88e7505f5f41a5896266f23c0517b470ea5c1ec90ca76e87f1971babee623bbd7bea57bbef5f7677a7163bc51bae78c3c54e978eaf7f122d1 WHIRLPOOL 4c71bde2b05ee863f7a7b06313d698463247427ff203bdc6e95c89f8e43e3e42744882b7045103ef56cc2535f595aae9b48ff41efd86ee704bd2063103ca98a4
+EBUILD path-py-8.1.2.ebuild 953 SHA256 90fff9efe21ee1315f307fb89197e4bb0ae3091be8ecc0289a2fb49187956418 SHA512 7ab7497deeb0454aa0816382d12ff25ab580519a5f9780fbe948c633b55eb3c49459ed47a8b1790761337bec3f5221f32e886110239513ee906a6f9157492700 WHIRLPOOL 20f6492168fe95f97203df541817bdba12e1fec698bd3ca692eac17b6021bf6794bd2cbd079dbdb2c07682a38dc1e25133a6b1e79231b9afb709f160b4112894
+MISC ChangeLog 6756 SHA256 ba80e37e178fc92075d6edc71a70f4f8957249a6148a66c0821911ee9e94c529 SHA512 6e584714c73a1ee60f69d2a3dd56968f23304181046c4f894a530d7a5a33cc565dc99d5f6e92eb32db38f78d50605bc76fc91215585a3598e8267b7c11aa2ccb WHIRLPOOL 234e58aeee643126ed8a5e8428151c6260e74b8a1ae6faedc2bf131031dccdde3e7e6dcebc686333ffe9b68c85e4ddb9609ea259c6135c120c5c7eae6cd8e979
+MISC ChangeLog-2015 1168 SHA256 3166537cc2c40038c8e9eb53ca65bcc728db5be082a1b2ea6b4a42e2c47f46da SHA512 29fbc6f0994c5f38feaf1713d4adbd91209dbfa9dd8a675f5def7dc1df2cc826b6f23b4e82d6743d2186afc713292d5c718f65fb8168aece93fb4899249aa900 WHIRLPOOL cdf771fc996569743a9a463d96624799d4189dbb1f40446e667956eab156dd499802f0cf73b7c8de35588717ac28852f9c18cc1cc6a99be731e8ab9086ce7bbe
+MISC metadata.xml 376 SHA256 fcc00f70918f4440a78110995e08277224425d8ce999a6d6fb1906b3c4df23f5 SHA512 6273623109e7f816ecf729a7dd65ae21b0f69049343ad49b6d439312512324aa94f2d5764e2248690718a57a24a50babcf2f29813c4d45f58eef44c9f14cb9bd WHIRLPOOL ccfbc2921a9facbc2fcc5104b6e31af7f67d1b3c1cd24f462297d1224a6c4497a9c8c0e17dd46fbf02717d1fd2cadfca7b0ae0fe8af46721b57b533dc1ddf365
diff --git a/dev-python/path-py/metadata.xml b/dev-python/path-py/metadata.xml
new file mode 100644
index 000000000000..e51461af9e0f
--- /dev/null
+++ b/dev-python/path-py/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">path.py</remote-id>
+    <remote-id type="github">jaraco/path.py</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/path-py/path-py-8.1.2.ebuild b/dev-python/path-py/path-py-8.1.2.ebuild
new file mode 100644
index 000000000000..ec8477569e35
--- /dev/null
+++ b/dev-python/path-py/path-py-8.1.2.ebuild
@@ -0,0 +1,40 @@
+# 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
+
+MY_P="path.py-${PV}"
+
+DESCRIPTION="A module wrapper for os.path"
+HOMEPAGE="https://pypi.python.org/pypi/path.py https://github.com/jaraco/path.py"
+SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed '/setuptools_scm/d' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# https://github.com/jaraco/path.py/issues/122
+	unset XDG_CONFIG_HOME
+	esetup.py test
+}
diff --git a/dev-python/pathlib/Manifest b/dev-python/pathlib/Manifest
new file mode 100644
index 000000000000..43d28eb6dfe0
--- /dev/null
+++ b/dev-python/pathlib/Manifest
@@ -0,0 +1,5 @@
+DIST pathlib-1.0.1.tar.gz 49298 SHA256 6940718dfc3eff4258203ad5021090933e5c04707d5ca8cc9e73c94a7894ea9f SHA512 d85e45dfcc85ce75a7e7b609163dc8c75c688f279c1833510185f280af5501e473376dc09bddc6a804d1fcc3177a939db85af37b7b8d5b183b9bc2b85b3b0f8b WHIRLPOOL 3cb4b7c11e5cd0f3c942ffdd4478999c021a2c8167b586c99fea467bb145a71a51350d61be727f85ae63539d6407fe920cd07cacea654c3002cadf48e52e972a
+EBUILD pathlib-1.0.1-r1.ebuild 497 SHA256 b836140258670e412d77234df226f71c46a6d3740ba5c1a759a223d531f2bb85 SHA512 f8abe2e024443b486a3d703f3f95787f40c35469f792923af7b9b6e2df7fe96e76cd920eb65ef9ce7b0080335c235fca6de9b5b511e1b309ba4f3bab45708418 WHIRLPOOL 252fdbc473f268d70fd36f4cb7b1337d8dc0454c186b845944896379e4242378e5fb71d96998268548fbedf3f53060909e57ac4e3bdf348a85540bdb1c0a05ac
+MISC ChangeLog 3408 SHA256 838699747af8a0d96d407332097d17ab1c1a6f044cec86d4d7bebecffbdbe00b SHA512 ece06325f83558b4abe002c3ebfec0dc85f5396a8c876cd9b5a8345b866a1a8e3288f36ac5e0407f4f7fec5211c365264e30499e2b88cbfb7902c7b2327ef455 WHIRLPOOL e676b721657d80200be379ebf1979c53321ade0116aadcad62bb594db1a96b1b609aa8daeeeb54a21a2585780b222bb0d0ec04237a79c3cedb6d0fae7cee2b1e
+MISC ChangeLog-2015 1430 SHA256 e8966051936c4dc9bf1bd5e30ea9572f86000373cdc21607f2cf11f62d20d8dd SHA512 fe94d40307b0440884a369c8dfd4ff8470f3921fd59c7098da69a563dacc8f3997c1c053625de76067a37bf71f57105e4a358ab55e102f5e738310a189f20250 WHIRLPOOL f16696bc2cb841664da85568253c7ba062a7b97bd1cce7d91fe34516b88a4b2c8c9183e51e7fbc0381a8b584fa0898df9a9ec9df812a2e4f5ed92ab876dd56d8
+MISC metadata.xml 310 SHA256 8be2cf0cc14ce8739d6d29d7f1df3bb79d420bf4d2004dd29f4bf620df09695e SHA512 462b029410c6c013f274599ee749a79541f9a40a1819b168963421d0b8bfbeedae5590a460c7295f0e9a249fa9298e7526b0cace165a29f82383d8943bd9842f WHIRLPOOL 0c73df829dc5b9e2453146f936ec3f1dbd04ee71c793eb290f9ec0411cfe9da990ec6bd2f93a6e68d5dd289f2a3b23c08aee808c18a919d4f361731833ccafdd
diff --git a/dev-python/pathlib/metadata.xml b/dev-python/pathlib/metadata.xml
new file mode 100644
index 000000000000..40129008c248
--- /dev/null
+++ b/dev-python/pathlib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pathlib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..3568ba1c56e1
--- /dev/null
+++ b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# In Python 3.4, pathlib is now part of the standard library.
+PYTHON_COMPAT=( python2_7 pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Object-oriented filesystem paths"
+HOMEPAGE="https://pathlib.readthedocs.org/"
+SRC_URI="mirror://pypi/p/pathlib/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ia64 x86"
+IUSE=""
+
+python_test() {
+	"${PYTHON}" test_pathlib.py || die
+}
diff --git a/dev-python/pathlib2/Manifest b/dev-python/pathlib2/Manifest
new file mode 100644
index 000000000000..8f080acb950a
--- /dev/null
+++ b/dev-python/pathlib2/Manifest
@@ -0,0 +1,6 @@
+DIST pathlib2-2.1.0.tar.gz 30390 SHA256 deb3a960c1d55868dfbcac98432358b92ba89d95029cddd4040db1f27405055c SHA512 5dad54d4bf7a37a2c425afeca030a23d802a8a450186292f3d80aa9ee5c2985701871a0386a2f58e2b05b4bbfd7734a238d0a73625c5839237e4f3984088a8b1 WHIRLPOOL 61507dca96da2ed128fd3f8c0f5afe2c993dc56da3de294db7600aa38016a97891be2e9aede2f067cd52040939bc14ed139553004d4c98df72d32a3516719c73
+DIST pathlib2-2.3.0.tar.gz 34291 SHA256 d32550b75a818b289bd4c1f96b60c89957811da205afcceab75bc8b4857ea5b3 SHA512 715fbd981d42767862dcaf2cc0fee31b9ec5050915ef7d909d14587609a7a5939e32b39736b586a890e7625443bb163832896fcf138b5c2863c451b71c36a124 WHIRLPOOL d8f1ebbf66aecc274b9567280666709595ecff9efcaeafb718b6990fc6f8185c42656ec1aa97d32168d78a207f5a9edcd527f6b25184b96b9b246a9ffcd3fb26
+EBUILD pathlib2-2.1.0.ebuild 581 SHA256 dd4bd9a1fed8e6c822a01d685e12e8c383192e8333fc34ca3c5abd9635213409 SHA512 e14f2bb06e96e63d9812e31da3a27ce9b9d56f1405515c29df695167e48e7f4122f778688f66a20b8ef15630b5dd4fa7affea9b9946362b7124ded7ff0ae2ce3 WHIRLPOOL 30c291f40761e2fb3e7ffab0ba4cac13fe9a69db995cc32b56fa535728ec30581dbed6f986f67ef6664bc81c5b8ca348d04f83d7834d4c3a4a987660e04d0f39
+EBUILD pathlib2-2.3.0.ebuild 668 SHA256 d12171b64985c94dfc050c39ef29ef862e32e905c3707961e24e5a032b79b5a8 SHA512 c25986ad6b02d55d779cc8cc9fac40a7b1a2c13162405eefacedf7b25187557910b8da4bc5ea83a0cd2eddc73003f311b1243a4cea18b81af034341ab7c7a35b WHIRLPOOL 01f85ca6a8be8dbd49edc78e6a95c58a43371da27dc61116ac18a9450f8a78511eb79abada849e3ff334df39c2f4020ff9689827a17505fa6c6d86d606abe259
+MISC ChangeLog 312 SHA256 bc4e3df6d67de0bb525b89ae502cce8260b989f312a1ac17e922e12b583021be SHA512 ae75ddd7f6a1f02bbe7b812b3808b80d8d099584cae6fa83ab933711ad878f71cf4df067eb03b2b4eb44c09e5dcfec9c81933416ff19e325b7dfee246c50e7e6 WHIRLPOOL 08be95750b5d997228f534b06c438134aeb9d832e4d0cecf1a2ea2e5468ac893ff1bc4ff84e9d764d89f330746b2a16901fc5cca1a721bb80fa46ef2196fc21c
+MISC metadata.xml 371 SHA256 12e0f458aaa483854fdca5c6caa5c9d68b79fabab615f011b00eb6727c7f8f59 SHA512 dce5315fa4bc25047346fbf06a9f2da5828475bf0b36a1dcdd6ea9917f29ed4bbefc22aba699a43d7b3c5f771939bd81b3da20df54537b22aa4811a19ab62a6e WHIRLPOOL aea1e420b2d0dac9871dd57569249267ca7c117912c0b16b618b75c25713bb55c591fd279ee5a145a924937830f5f5fcd564949b6511f8625b1defe519bafc16
diff --git a/dev-python/pathlib2/metadata.xml b/dev-python/pathlib2/metadata.xml
new file mode 100644
index 000000000000..c63f13ac24ca
--- /dev/null
+++ b/dev-python/pathlib2/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pathlib2</remote-id>
+		<remote-id type="github">mcmtroffaes/pathlib2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pathlib2/pathlib2-2.1.0.ebuild b/dev-python/pathlib2/pathlib2-2.1.0.ebuild
new file mode 100644
index 000000000000..22c3255434e7
--- /dev/null
+++ b/dev-python/pathlib2/pathlib2-2.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Fork of pathlib aiming to support the full stdlib Python API"
+HOMEPAGE="https://github.com/mcmtroffaes/pathlib2"
+SRC_URI="mirror://pypi/p/pathlib2/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	${EPYTHON} test_pathlib2.py || die
+}
diff --git a/dev-python/pathlib2/pathlib2-2.3.0.ebuild b/dev-python/pathlib2/pathlib2-2.3.0.ebuild
new file mode 100644
index 000000000000..e4c21c8d96a9
--- /dev/null
+++ b/dev-python/pathlib2/pathlib2-2.3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Fork of pathlib aiming to support the full stdlib Python API"
+HOMEPAGE="https://github.com/mcmtroffaes/pathlib2"
+SRC_URI="mirror://pypi/p/pathlib2/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/scandir[${PYTHON_USEDEP}]' 'python2*' python3_4 pypy )
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${EPYTHON}" test_pathlib2.py || die
+}
diff --git a/dev-python/pathtools/Manifest b/dev-python/pathtools/Manifest
new file mode 100644
index 000000000000..112b7a6ccf2c
--- /dev/null
+++ b/dev-python/pathtools/Manifest
@@ -0,0 +1,6 @@
+DIST pathtools-0.1.2.tar.gz 11006 SHA256 7c35c5421a39bb82e58018febd90e3b6e5db34c5443aaaf742b3f33d4655f1c0 SHA512 e014cb17f3d61ce7979e36663f94a44d4f1116c35e3d2ec8c4ac207a81935dde246495ed06597e6edade1509f384b9e5729a97ffd3eec31b1d1c4a8372d1dfd7 WHIRLPOOL b08011d5cea80535a91d7e3145e6f9c3435a9717589b307c7c0f5334c7a249c9aace68b2037682ac0364a623e70847ee1c0752df205b99bd66fa464622e8a0fb
+EBUILD pathtools-0.1.2-r1.ebuild 468 SHA256 e16b541d8497804ae505a5713b68e3ca5b63fb4484b9b1b764de6bfc5e6dc35a SHA512 d59439854125c40bccf1761aab8e2527d88e894e52cec2dbc864faae8abfd6c806b8819fc40ab6de1bc57494c58be08439e5360cca7d0ec3aee95987093ab23e WHIRLPOOL a49966c7044a1637fdadb2fdcfd9183089f9656b4b3478d977379b4e9ad88e8255c517e5a602a0633aefb732d40f68592c6b05f94bf3354ba4e584410bcf662a
+EBUILD pathtools-0.1.2-r2.ebuild 474 SHA256 0ac229351a51ad78bbdc56de8f896858a9c696c3d0aef6e41400cd9b9e761002 SHA512 ad0a62c775fbc73ccec351add73c84d12b4b73265e5fb54b30310a0006c95ac482efea57f35c58ff57db3666c6aa201b26d20fea7cdc4aff7c18184f9760619d WHIRLPOOL a489f5ba5763b30d03b484efcad98dc1bee6bc3236cb4e581db60a5ddead3def5c0a4e8e9581f1718e735417f77fab9f46fcd0307f976fb1d297cbc06969bad4
+MISC ChangeLog 3009 SHA256 05623320763b884919dae0c75531e92590bcb2b4ccc0ea19018ed6c065c30b40 SHA512 c6a9910728d2523769cb80e7a6c37a005b6aa2e14c0b7c9a6b8c5997e7d08bfd1c54009cb0faa1bc2a8187557996d672d533799d2f2b043c592c0b22996ce6d3 WHIRLPOOL 5d5930d667f2611349e2eba0b4c1cca21d9377a1b81d7526783a254863e0110d4cdfddd8f5439ffb75d6bd5b5f379c6e9bfce320f88d0049caaa7120313e8d12
+MISC ChangeLog-2015 1085 SHA256 01af414b8dd4b759ba199e354ca0c19c0c517d73f8f620b3dc1058a7b9c0d7ca SHA512 3bc124638b61934bbad2249b8c19691ae1f96b4eb7c4c2946c3607f8dff8279e01a66318e1ae68869741b38fa3339d603ec4b763fec03db21d3b7aa7953855d9 WHIRLPOOL 7a5239d49d909affdd921b22eff929376a942c5cbeb4c9d5575abb89a56776da6bb955b926cf38815d8fed040016c600ef7fd52bb95a70a5a3b8d899eb0b028f
+MISC metadata.xml 318 SHA256 2022b8faf4ab8767e7a7c86687ebeec848b7c88c5b177c1159974f6c0f351c50 SHA512 55a34f235631ca7357f70c9079ab37d48d3c698d0b29a9ed4e70000d24b0308abc67a22cf1d0ab48295558535c7ef95dab03b3b6df1f0eb28007187e90215750 WHIRLPOOL 203ef93fa21af0c86995755656511cf5097d65631c045e797806c83638536ba4785be5eef639f96e36c49040e01d28d29a1009f601915b8a736d4e2979579041
diff --git a/dev-python/pathtools/metadata.xml b/dev-python/pathtools/metadata.xml
new file mode 100644
index 000000000000..ee5eaa4fbe37
--- /dev/null
+++ b/dev-python/pathtools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+	<upstream>
+		<remote-id type="pypi">pathtools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pathtools/pathtools-0.1.2-r1.ebuild b/dev-python/pathtools/pathtools-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..4c05f22e85e0
--- /dev/null
+++ b/dev-python/pathtools/pathtools-0.1.2-r1.ebuild
@@ -0,0 +1,18 @@
+# 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} pypy)
+inherit distutils-r1
+
+DESCRIPTION="Pattern matching and various utilities for file systems paths"
+HOMEPAGE="https://pypi.python.org/pypi/pathtools/"
+SRC_URI="mirror://pypi/p/pathtools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pathtools/pathtools-0.1.2-r2.ebuild b/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
new file mode 100644
index 000000000000..b7e73414ae61
--- /dev/null
+++ b/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy)
+inherit distutils-r1
+
+DESCRIPTION="Pattern matching and various utilities for file systems paths"
+HOMEPAGE="https://pypi.python.org/pypi/pathtools/"
+SRC_URI="mirror://pypi/p/pathtools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/patsy/Manifest b/dev-python/patsy/Manifest
new file mode 100644
index 000000000000..9c3ffc48537e
--- /dev/null
+++ b/dev-python/patsy/Manifest
@@ -0,0 +1,5 @@
+DIST patsy-0.4.1.zip 425390 SHA256 dc1cc280045b0e6e50c04706fd1e26d2a00ea400aa112f88e8142f88b0b7d3d4 SHA512 24cf2e6f9a33e6dd795a839eb2b2ac9e0d45cd9c3d5250de17722914ac29436d0518388d0696b75d73236eda3c7819dc4fa24d6d9bc37d5ae035dde2af4510c3 WHIRLPOOL 55506dcd5744e769fe1387e8fcaad52743096e0df7d23f02faff20c2c8687fac3cea337bf22c7d9c7984e44c3d107c961ee248d156fafc0dc820574b78903eb6
+EBUILD patsy-0.4.1.ebuild 1108 SHA256 3cf45136dd3f1d7458a32a872d5cc1ce8445bc55f4dc70600b20b03c40836887 SHA512 6a5424428cd8cc91cb955ebfd5e3c0c2dc27fee6ac76e6de2d98ffb6ac5877d0ceceff287f3a9737e815fdd11771faa155f3b36cd3ec7916a3f74236d52f56ba WHIRLPOOL 57c91abd2f35281316026d9c68960afe8f4c6c14f308e6b9c7eecd8c8733569fd94adb27c7078d27dd2295a9f9cca608dd2dfd6f7f21373333208a9fa4c9754a
+MISC ChangeLog 4023 SHA256 e57079fb2be9de883acf0e537195241acbd0fe5f855535cd201dcf160436b0a3 SHA512 189097b8f70fbadac045d774e3aea62641d1521350ac81c371fca177c746cd51389ca5c12cbea2747b70dc36822105ea3d85fefcd98bc4715135c940e4de2e0b WHIRLPOOL 0cd90feaed918b6f1e120ccb104b92b7ebb1d570009c3fdd1ab99b2fc0325b206805df1ce0bc2e3ea3c88ca61a449e5a5f94e9af2e0f079a81e98e74e02a5454
+MISC ChangeLog-2015 1232 SHA256 661ff4f449dd5468adef1a1e8d459ef091d5b587fd2bc8b0e700794d9989bf6c SHA512 7f4d82beab78c63ee12c76684a6eb69ac16076685f926bfbf1761d9c5ced317ef79178afd0a419c5bc0d0073fcda01f4520a1dfc3b6b3edf90705c5d44873363 WHIRLPOOL 455b699742c1836925998b9d792e7a8a13ddd030b4ae22819f0dbe4af15e3b38705475e057c58e75648a8fa4650c5153b70529a32c5951299247dc7ab8334d0c
+MISC metadata.xml 568 SHA256 ca46c400592bca673979813f9c65996c177c1829a47afc09939072106847e904 SHA512 57957dc18e93d9bc8d53d72bf8c9e601856ffb1511943034ff30aa7d93761f8b986e67daadf8dbcd57ef7714ebf3dda13ccd345df294809954c942cb9bdd1310 WHIRLPOOL 878aa5735416e2ba844a47b45b8638abde73caefce1fb7537959acd99d3ad21f59baa5987714dfc4aee3e7786bf052435c709aae8a4ef90b399e57a960cdf7d6
diff --git a/dev-python/patsy/metadata.xml b/dev-python/patsy/metadata.xml
new file mode 100644
index 000000000000..c4917258dafc
--- /dev/null
+++ b/dev-python/patsy/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
+  <longdescription>
+  A Python package for describing statistical models and for building
+  design matrices. It is closely inspired by and compatible with the
+  'formula' mini-language used in R and S.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">patsy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/patsy/patsy-0.4.1.ebuild b/dev-python/patsy/patsy-0.4.1.ebuild
new file mode 100644
index 000000000000..b10300a25936
--- /dev/null
+++ b/dev-python/patsy/patsy-0.4.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module to describe statistical models and design matrices"
+HOMEPAGE="http://patsy.readthedocs.org/en/latest/index.html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		)
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	nosetests -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/paver/Manifest b/dev-python/paver/Manifest
new file mode 100644
index 000000000000..2e0b2295735d
--- /dev/null
+++ b/dev-python/paver/Manifest
@@ -0,0 +1,5 @@
+DIST Paver-1.2.4.tar.gz 328794 SHA256 6e155686eda543f3a863ef1d4389bce389a9738468a02f8aefc4b8b71cf6777e SHA512 ba737f2da0582d4c3364b654a79d9868bb394fcbf1102feea3604821a65075631fbdb7b767ba8977f3231bcb6cf167abd994fb1dd9fd080046ea8bcfde8cdeb7 WHIRLPOOL 924380325dc63ffc9eb77742c7cb428a240c6d18c91977418492cbdb419c60f294c1313dfaeca86b4a78c97487f10cfc600454e0be147a2ad293a1038c6ff3cc
+EBUILD paver-1.2.4.ebuild 986 SHA256 d31460640f2cdfdcb8a707e3e3c4ccb198d8431aa696db6b39ae50ef6c73fd5b SHA512 6c78a16a6cb581c87a7fb1bcbd6695bed4d14fa8d21e404a103227c83f1c6a79384e73e6b0e49fbd95886f11133f3b4078a68c1669d40063feb176eb11fff29d WHIRLPOOL 3ff4bbd8b066e46248f4346f5b8a2f8e58264532c8584f04448548c4282b89be1766dbcc2c3e009d69cb7fd9eb00c1defc70451e82c67df8b117d586cbaad960
+MISC ChangeLog 3279 SHA256 eefff7b16a187563cedc3f258019281e1fc2cad881d03287db3a7c85a5e3e89c SHA512 8cb1223c8e83ad81dd0182f0f41b0c4a744b06647744ac32312ac479a52878cc9fb135f97dde6f2573a87f7f890589eb057685411c39b27ce2ab1acabd136cca WHIRLPOOL 32e7aee17fc80edd76f5dbb374a1dc9f6fac5541fe403fe81110aac23dbd39abb99fb30f9047a61bf39350d2a7815761c2b6b97c9539d0b0bb4e67bb712528ab
+MISC ChangeLog-2015 7551 SHA256 e6ac553049178d05af29e3b1eeecce76fdb86881f3afff4a888bc5c3370411ec SHA512 99efaeb947d16b0cbc6bb61fd049f143f64804605ca6746c6c098d37588953f06c41c23680a3a572db0f3a15aefaa9e2ec164b6929d6a9d00c3021c736a67d71 WHIRLPOOL ba3fe8f71b12151096a21049bc9e5aaa46a95e5f2f579475ebdd7ef254bf96592eeaaaaf1fa85f1e9c26b0c0b3d6a837716310e7834cbf7cdc49be4e54148c31
+MISC metadata.xml 371 SHA256 26635638f7fb7b0933fd0af9ceb33049e99b809323b9a89e1c59555b53137d07 SHA512 94df99ebc516697a06642bd882bd306e35b4dd46b4c0031b3ddae47e44b379d77a90c0b04bf1a3aaf16e4bc35f915cad622bbf8f61f39123b68a2bd51b1b2e31 WHIRLPOOL 6dc13892f659abc84d2185433e610eb62860d5a894767d6bf0205fe11a1fe83203580cf1ae9b6d2295edbfd97fc93c94bdd618c5c664cd765cda1ab7c4cfa01e
diff --git a/dev-python/paver/metadata.xml b/dev-python/paver/metadata.xml
new file mode 100644
index 000000000000..ef141c6fb88d
--- /dev/null
+++ b/dev-python/paver/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Paver</remote-id>
+    <remote-id type="github">paver/paver</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/paver/paver-1.2.4.ebuild b/dev-python/paver/paver-1.2.4.ebuild
new file mode 100644
index 000000000000..5756d5ca5a57
--- /dev/null
+++ b/dev-python/paver/paver-1.2.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+MY_PN=${PN/p/P}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python-based software project scripting tool along the lines of Make"
+HOMEPAGE="http://www.blueskyonmars.com/projects/paver/ https://github.com/paver/paver"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	# https://github.com/paver/paver/issues/143#issuecomment-103943327
+	find paver/tests -name '*.pyc' -delete || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/pbkdf2/Manifest b/dev-python/pbkdf2/Manifest
new file mode 100644
index 000000000000..8a53009f1466
--- /dev/null
+++ b/dev-python/pbkdf2/Manifest
@@ -0,0 +1,5 @@
+DIST pbkdf2-1.3.tar.gz 6360 SHA256 ac6397369f128212c43064a2b4878038dab78dab41875364554aaf2a684e6979 SHA512 1297950d045f9b56f5eb9f771fe65091802c1f12f090a8a80fb5e36bfa10f1c1ac3b9dc8088f4a640b840fb7073aadd3fdf39f3979118046ba5cde477d071244 WHIRLPOOL 85dc9f380d469fc3fe016cb5054c8078dd07d38481df6a7ea51512be238f272dcf1f74a5bed6d5874045edc418913db8d096f355081318803995da5647869a6a
+EBUILD pbkdf2-1.3.ebuild 569 SHA256 3266e9029007321b62d051f66ff7c207ac355d406aac90b4faff3540b662fac2 SHA512 dc50ce35e68e0a375bd630e3ec27285e5c05fac962a75e67ad2967d9ae1772cca4f9e6e44d3f84c450c13d3726d968310410ede1aea5dfc37a5d3283b6a3b37b WHIRLPOOL 5824a5d20a2640e834987b921e153c538a471524d12933c725a7a45d54c86f3d021cc9ff689245beb7eab64ad6e29a71bd4961d7f5e0cd291718244674b64e07
+MISC ChangeLog 2547 SHA256 9c5666bd9cdbcf47918d527703f878adeb36cd3570bcef42912c801e0708d7dd SHA512 f5f257fee070b9a17a33998f10088a8e0bbbda4d4e4b9a57baf964a4e310f4ee80816aafe70a197436163c0a6402b8b85f57b18f73607ef71eac1dff3a223c84 WHIRLPOOL 87ff762cd1966ed72bc32f2513904b6f67667c48493fff872cfa03d4e52b2ecd04ecaa20961d06ff8daddcbf0e1cc9000b425f60044515f3fdf6166d50a73b8e
+MISC ChangeLog-2015 810 SHA256 1b9fd2f8829d818850768c32d067f457e05405160932696e468bca4c5061a574 SHA512 05c1575f5558876dafb1c7ff4b432aaec3d202e674c3f0bc072b3cb34098a091684c4da57e382428a2c18a2eca7c20e78686e9095eb6bbb24dc53f0754128e56 WHIRLPOOL 334a3977864b874071a8c12c8d7041c3f8b00ee757dd2689964d0c39f5bf2f1ba07f16b3e27fa6f8bf7b3c8e63478a27d4a860f3a636f78533d893b44e94443f
+MISC metadata.xml 578 SHA256 9d4b6ff99a3ea54b4018f7d9da1fbee97cf63e57f1eb832b68a583c1d94169b2 SHA512 dff57e44050eac6feeaa13be6ad1cbbdf9c0c7bb91d3ec7110b3e3861e112c4faaf2d4a279751f9b585303eaeb3d1de98b7fe2fa0a8466acf8dd89ec0e95a6a1 WHIRLPOOL e4a04792f42eb989e405583d590b9353f2b8e09dac97235ae07a912cd9764c74925fbce75be0dace3587a490a8b0262d9f04d6853a872e6a1a9056e770ad5eeb
diff --git a/dev-python/pbkdf2/metadata.xml b/dev-python/pbkdf2/metadata.xml
new file mode 100644
index 000000000000..ed4bb5275121
--- /dev/null
+++ b/dev-python/pbkdf2/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>luke-jr+gentoobugs@utopios.org</email>
+    <name>Luke Dashjr</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pbkdf2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pbkdf2/pbkdf2-1.3.ebuild b/dev-python/pbkdf2/pbkdf2-1.3.ebuild
new file mode 100644
index 000000000000..93c9cd914792
--- /dev/null
+++ b/dev-python/pbkdf2/pbkdf2-1.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Implementation of the password-based key derivation function, PBKDF2, specified in RSA PKCS#5 v2.0"
+HOMEPAGE="http://www.dlitz.net/software/python-pbkdf2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux"
+IUSE=""
+
+python_test() {
+	"${PYTHON}" test/test_pbkdf2.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
new file mode 100644
index 000000000000..bf00b7a438c2
--- /dev/null
+++ b/dev-python/pbr/Manifest
@@ -0,0 +1,9 @@
+DIST pbr-0.8.2.tar.gz 77790 SHA256 eef2ace8d65d5902582cbc9ad3b2ecff0e86a6f90ad4837d8b17d568dd9dd20e SHA512 76d7d4c97660d5a6bbe9a33498a93b32528073024520e570739c511c0138ba1af7e35139bf77ca2a94063e5979baccd6252619449d6aed546fd1331be81ab52a WHIRLPOOL d6331fcd6e7d4eb750e3285e92fd21dfdfbb054b880f954156d1e781025a0c0e1c464e0c23cad587799ceba787928af092d34071eb0a5c4595b0e8aa6db52ff0
+DIST pbr-1.10.0.tar.gz 111425 SHA256 186428c270309e6fdfe2d5ab0949ab21ae5f7dea831eab96701b86bd666af39c SHA512 f7f6ce2f70324e2d287f58c3d12e0be2e33ef9ed32311ad2c56410eb67cda20732adff2058ba2fc244249a17a4c95b0d589ba913db4777e63ff1023ae888c864 WHIRLPOOL d70893921cabccf0e147ba1203cc2838feb47afcda90f7b584eb997dc4ae7e30e47b93b04ddaae8215bfa78351a5a2a53bfca5dc9fbb1ee7a268ae166c73c222
+DIST pbr-3.1.1.tar.gz 102665 SHA256 05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1 SHA512 c01fb83678f8fc3acddc153dd341a17ed9d602b6770f0ff244b1c5b54c37d4ddcbd0c3d726f7d7020865819e02797c1c79a0c15e9ee2ae5c1510fce7112b2a3a WHIRLPOOL 00c980b8499c2418e4e2847cbb85fccf921ffa15e1c32c3b3053a46468efd2578faf224334ce81c24177705d66c1c1a2f9d5d8de7c0a0ce4b45adddd017e02da
+EBUILD pbr-0.8.2-r1.ebuild 2101 SHA256 94dfd55b3e73c35b4710becaa9ea94f33950941ffa7051aaba9353dd8b3f95d7 SHA512 bc6d083dadd1d46e7d6f311d43e89e4fef40e7c1a02f826359166c42aa4c075c1336081bea03986519dbc9912785b1f2732326d1bbaa0ddc391c9649356a8b7c WHIRLPOOL e59e36c0b3c7746e68546e1d590fe5981cb4cf6a88d3b6eab344c6a00b2d05d691a4508fff5fbf30a0f1d6f64581543ceb2c512c7d565cabbee66841a6ff1280
+EBUILD pbr-1.10.0-r1.ebuild 2602 SHA256 4509d8dabfd5fa674873d0d7fb8fc4d641c514c50a7675fc6479cc84e1ccc0da SHA512 d516a6d42efebe51e2846721e8292fb402d9ee5a88cea385a281f8f7d828da30c59df9582fac1174c2100f8943b318a52d208d6ee10d294a9a3e915e95c1a589 WHIRLPOOL c7098364bcf76d86b25a38cf159534862e813c70449a5b24c8acff1e55d9315c2755a8a0163a16bfefde420f00fedee5afbaabd702711160adf8c79a98f950a9
+EBUILD pbr-3.1.1.ebuild 2798 SHA256 ad0ddface9de7614f4ec4387bfb7484c8386297a9cec1a3c7aedc54990889c92 SHA512 b874a38425a068aa1d754267c7d4f88d716b117343d0af17cf6f2a22d14b29b005709d813809e0ec9b72ca3febf3b0b464e398e3ea8ea2d8005ee9baaff88c08 WHIRLPOOL 25d4e0cbabcd5cbd1d21b87edf44ec1ad872261dd8b3b0038d47ef3e8ee3b181e075d0402682fd9ab419b3f4f6a67ec1cd13edfbe7167f063855d80c4cb85531
+MISC ChangeLog 13221 SHA256 a4af12198c971393e35bf92ad0bfd0dcc3ed28081a3df3358b777d1a6066857b SHA512 4b32bea10ff883d7f06ee65b973c35948bdb25c618a13b9ff9cb72ef24c59a3106f9e099a9fc67e434726f45db10f11fb0a06abf969c0bad93a465a514e10007 WHIRLPOOL 4e2987539586e61cb7f09c1969bc8c5c449fdfd98893f13dcf8160932a3363f47f1daf6d685397431d2dce7f2bec9df27e45f61643e3f2940601135feeba87cc
+MISC ChangeLog-2015 6172 SHA256 cee510aea25869253d026d9ae8a1e951d50b4afd6f7768a26cf0f8412817e7d3 SHA512 fb417b21495e848f6ceeeb547f12e5258e4970314e7f7627cc28d91a9ba75c77bd28d5cc6deee7be6bc2e110686fc56a5ca7e1ce48a81478920889dc6249e753 WHIRLPOOL 3a5912e34b9ce1c831d42fe5f8d781296a84fd2a60c60979d7097e12cbc38a03a719a809a492ea301c9b73c77af75ec76805b04c01b076e6a7bfe79e76553b75
+MISC metadata.xml 686 SHA256 bf091c6c541283d2173d999ae80ac3fccc1fb0633fc7c67bb232720af67783f2 SHA512 b4bff66d2f42e08f93d723e43bd1b6b32d8bd01a45136a741992af07c11da7fe0db847e46316e5bd237f47cb844fb481e09bff0c6df3d071197686d7dfaa7bc9 WHIRLPOOL d30671039c2dd310f78562ea266679597c09ef4cfefe0fe2f7cbbf20b080c50fcee0a1ceb0d479cde82d655910a6266a84b75ea96c146939827660abf9dba159
diff --git a/dev-python/pbr/metadata.xml b/dev-python/pbr/metadata.xml
new file mode 100644
index 000000000000..cab3820729b0
--- /dev/null
+++ b/dev-python/pbr/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+    Python Build Reasonableness
+  PBR is a library that injects some useful and sensible default behaviors into your setuptools run.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">pbr</remote-id>
+    <remote-id type="github">openstack-dev/pbr</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pbr/pbr-0.8.2-r1.ebuild b/dev-python/pbr/pbr-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..08693bb11aed
--- /dev/null
+++ b/dev-python/pbr/pbr-0.8.2-r1.ebuild
@@ -0,0 +1,64 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Injects 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="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/flake8-2.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+	)"
+PDEPEND=">dev-python/pip-1.4[${PYTHON_USEDEP}]"
+
+# Requ'd for testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+# 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
+	einfo "rogue tests disabled"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Note; removed tests pass once package is emerged,
+	# it's the suite's design that breaks form, not the tests' intended purpose
+	testr init
+	testr run || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/pbr/pbr-1.10.0-r1.ebuild b/dev-python/pbr/pbr-1.10.0-r1.ebuild
new file mode 100644
index 000000000000..e5734de89bba
--- /dev/null
+++ b/dev-python/pbr/pbr-1.10.0-r1.ebuild
@@ -0,0 +1,74 @@
+# 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 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="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-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		<dev-python/fixtures-2.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		dev-python/docutils[${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
+	sed \
+		-e "s:test_wsgi_script_install:_&:" \
+		-i pbr/tests/test_wsgi.py || die
+	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}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/pbr/pbr-3.1.1.ebuild b/dev-python/pbr/pbr-3.1.1.ebuild
new file mode 100644
index 000000000000..bda997f5b9d9
--- /dev/null
+++ b/dev-python/pbr/pbr-3.1.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy 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 arm arm64 hppa ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# 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-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.5.1[$(python_gen_usedep 'python2_7' 'python3_4' 'python3_5' 'python3_6')]
+		!~dev-python/sphinx-1.6.1[$(python_gen_usedep 'python2_7' 'python3_4' 'python3_5' 'python3_6')]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-13.1.0[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		dev-python/docutils[${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}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/pcapy/Manifest b/dev-python/pcapy/Manifest
new file mode 100644
index 000000000000..5ec64cb0e4a4
--- /dev/null
+++ b/dev-python/pcapy/Manifest
@@ -0,0 +1,3 @@
+DIST pcapy-0.11.1.tar.gz 31439 SHA256 92420a5807805fbb38119eb9ac383099317216efeddd3030333d2de430731c65 SHA512 60eebbeae84da33d7bd2eb2398687007a305e8986fcc183d8061fa50bbc0cdf9a66c17461a32a652ca39952dd0935b164bd98a200f82ffef00ffaa55409522a3 WHIRLPOOL b9dad4c5a6dfd67d98323eed849f10d7e627c4cc4c3ca04729a962de264d07822ae8612b3d80d90664a7112a547fe3123a25029a77282b355cc1c1fb8554b3ed
+EBUILD pcapy-0.11.1.ebuild 621 SHA256 1d6660aacde53f98f7ce681c3e8416b316371f547cb833d83229231bed20ec05 SHA512 9b7a94b83d20ab72761bc86ce707980e2aa195a6c8d75c2a1c0c5ae7e10c2ae031f0b31f8ba189ca23cf15eef41b7a0325c1fff0dcd9ef5b30f1473fa94b0755 WHIRLPOOL f4684df1d5cf24992fd880daa78ed8e9dd5a617b452adc34c760b28ae63c2b709168820303bdc4816dbb392e6525a45457fa4a3cb315a7901561cb5e169f0c0c
+MISC metadata.xml 358 SHA256 a0ec717b3c92a0292658be3f9b49c88e3807c4fef6eed620ca79d73897435c6f SHA512 f7a17e837c410ac604a0e1b4493c7219846a8c8cbcd5b4fb84ffc401b98c8eeacba4731dabad6f61bf1e4f172157c174d6a039725174e2f58b9dfbb89998635d WHIRLPOOL b3f8ef642481163608c01d39f12f705922cf6249c369b65f545b616aa64baf67655d4934005ca13dd82c8cd2656c0c9fa0c5f0994d29aa9728c236f3ea17f24a
diff --git a/dev-python/pcapy/metadata.xml b/dev-python/pcapy/metadata.xml
new file mode 100644
index 000000000000..36420f308fae
--- /dev/null
+++ b/dev-python/pcapy/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>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/pcapy/pcapy-0.11.1.ebuild b/dev-python/pcapy/pcapy-0.11.1.ebuild
new file mode 100644
index 000000000000..daa2e92b27fb
--- /dev/null
+++ b/dev-python/pcapy/pcapy-0.11.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python pcap extension"
+HOMEPAGE="https://www.coresecurity.com/corelabs-research/open-source-tools/pcapy"
+SRC_URI="https://github.com/CoreSecurity/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="${DEPEND}
+	 net-libs/libpcap"
+
+python_test() {
+	cd "${S}/tests" || die "Unable to activate test suite"
+	 "${EPYTHON}" pcapytests.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pdfrw/Manifest b/dev-python/pdfrw/Manifest
new file mode 100644
index 000000000000..41b1fcec1632
--- /dev/null
+++ b/dev-python/pdfrw/Manifest
@@ -0,0 +1,7 @@
+DIST pdfrw-0.2.tar.gz 69177 SHA256 09f734df28f9ad712a2c14308b1d60e7202762c3ce2e32a6ad30e7ec149822b2 SHA512 4f1ed3b7ddb42969110291b31e02e15e1f98316ede25eaa4d63cdbc443497a278267309769351e04cff52651cdbc44c93771e521cb953ba08d57152f81ee516f WHIRLPOOL efbe6fa4e2ce53f27f1aed76183d2098ff2e1a9792a581078a219c27ec02c787ad6252a3d0120beda01214bcb3aa85600d23f48e90d8deaf45eec49ae88cfade
+DIST pdfrw-0.3.tar.gz 71576 SHA256 1af18af301d2c07d846cc7203e3c7ca77b2ed2a9eb3421335cc39f5e3e148f36 SHA512 38b6e3dffcc00ae063b4a1184b2fd2444d7bb0e2a78a8262764e609c1ba0697b4c9daf83a986852c18ee3e56b945827816537f36071406f31e94ebac0369ad74 WHIRLPOOL f3de427a5757324cc28f6ab6234573031d8a64d42a3d496124c4a919c5acfb710e3a1ba92f4a3c54b2a88b5998a1c45707d98038abca9bd3c90dad44bcba408f
+EBUILD pdfrw-0.2.ebuild 396 SHA256 425e837025f296acd01be3939d13d4082d181dbbf35f92fac4fdb95bd7c4553a SHA512 7b9f7e3ac9a36eeacc8b86e5e7fc88c7acf0d6eaa3c19e276378c431df3e4262eaff5456e81fae5c4158e599abc23eb9432c6643f43784eadc7a0d376ab90df2 WHIRLPOOL 1539e9a41776b3abd21e2c1c21292bb16aed7dc0717e54e26cfe229b9243b145f29a2983dcd5dd88d1fe3ded24a7031a1321ebe6df0da3ec6f0386401e04df1d
+EBUILD pdfrw-0.3.ebuild 475 SHA256 b0d4a96854750f13f44e520080188855cf0a7614b19227382b86563730d2630a SHA512 14c0ccb6cddb284fca151a26740abf3cc45547f2fa2d637b9236324a5a2c8fd3c109a7eed1913587abdf81ad5aab104e5509bac5b83ce43f4a7bffc68d730a0c WHIRLPOOL bc2da668fd93ec21af07d0908a9f920e29cd44c1a2a816eb5395aca464b3c3c1fa300bcbd855acedcbb429a39419582a3f5270ef98041285d686639e07bc8651
+MISC ChangeLog 3410 SHA256 33c4fc548ed8511ae5ce251ee57e764532a42c2fa4bb95fc5e7905bdf1098989 SHA512 413c72d277fa6e1ceb3a869a0351ddc07016a4bebe86b934885c041ef81da9da5f4641ac71f52c1ca13c9021affda43afc88931f5c9e3b9e7b897051687be3cf WHIRLPOOL b3d1b421fa64eea03076affba4cb2a075afd973cd73fbffc28fa48f8fecb8259b42c30157028f5bb6f78e2c238ece4578081aedfd64fd2aafbbea54d3bd79c0f
+MISC ChangeLog-2015 1284 SHA256 548182d8a00e22ca5c9024359d705aab02df960beb254c5cb74b648a8db258b3 SHA512 3ce59f93f05f8aec5d2af87ccfa2ac730e1dfd10ec0ca1dc44cc4d8662e78e9c0bea5cbb8d04bd3b650da08206d359e35d87b93185e90833da6b149af4de2483 WHIRLPOOL d86e98e1e6662d2ea61d30e47043e16fae2bf774f0fb23c4ade8b2cbc85bf39f5603ed45dcccb43a3ea021754df8c90ab4f6160404232b858670517a46efacd5
+MISC metadata.xml 361 SHA256 9efba35c9d77fbfbbf597416f50601e9586c9d9138cab5caf138f9cb933ade1d SHA512 d48a58a2fa2bf29f2739565e270bced92d417c1c9d0cba507bdd217d1ce61be0f6658e41e8100c814838bf40b79973d39ad8a0f26b04f060451929f2cb6d646e WHIRLPOOL 9bfbb388f216e42b69defb4ee0275e31fb57cfa18a94fa9a57a4d0b5c607858ba075c5300707ed7263186ea6c9f26c54c53f9559106d5c420bf103b14461c7d8
diff --git a/dev-python/pdfrw/metadata.xml b/dev-python/pdfrw/metadata.xml
new file mode 100644
index 000000000000..cd59e4a587a8
--- /dev/null
+++ b/dev-python/pdfrw/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pdfrw</remote-id>
+		<remote-id type="github">pmaupin/pdfrw</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pdfrw/pdfrw-0.2.ebuild b/dev-python/pdfrw/pdfrw-0.2.ebuild
new file mode 100644
index 000000000000..f1f15f17450e
--- /dev/null
+++ b/dev-python/pdfrw/pdfrw-0.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="PDF file reader/writer library"
+HOMEPAGE="https://github.com/pmaupin/pdfrw"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
+IUSE=""
diff --git a/dev-python/pdfrw/pdfrw-0.3.ebuild b/dev-python/pdfrw/pdfrw-0.3.ebuild
new file mode 100644
index 000000000000..ef4623dcce5c
--- /dev/null
+++ b/dev-python/pdfrw/pdfrw-0.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="PDF file reader/writer library"
+HOMEPAGE="https://github.com/pmaupin/pdfrw"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pdoc/Manifest b/dev-python/pdoc/Manifest
new file mode 100644
index 000000000000..135b3588b880
--- /dev/null
+++ b/dev-python/pdoc/Manifest
@@ -0,0 +1,4 @@
+DIST pdoc-0.3.2.tar.gz 76536 SHA256 7835909580d5a14a06bd3de4416cf17f86a146ecb12eeb5cd83d9a93d03e6d27 SHA512 a28f4c20c43339ca89fe93a5e79672033336cdd73c875fa8aeb5649556e39711e0b7f7b680f3c31c242e0263549939a301545d26d5b96b7818f7903d4311a189 WHIRLPOOL db760d98234342600c8e8c53f5ef5a4bf6ce5b41c83fbba937fd58034a691109e5662a49c592e2e4496cc45082cbb253ca3f17dab259c5dce46e75821032442c
+EBUILD pdoc-0.3.2.ebuild 909 SHA256 d00620a2cd8900fda3681e455d038a64b6bb62fc2033f3c646943867a4d6c108 SHA512 08702ce2aa6db4a141cad309035c0375935fc9b236e31055ed7212d8f40074ea5067aab6b9a813b5323414d9471212e99a1350ef0fe82e74e0f15c67952a7798 WHIRLPOOL 3809d87472ae1cad9160f3ea0824c6a35d07546caadc3b56aeec1e53e6cc63a0d9582dddb7e8529f0a651e33339d3220514b08e3747f498acc3bd030c23134a4
+MISC ChangeLog 1454 SHA256 41f09c822a9b6ba0a60f82b388a04f5eadf7db0d7e4e208dcaa8044788fb03ae SHA512 1863c0c66334afeab3f63383d72b241237e93a9f6e36138bc505ecdf3339f94ca618d7b66ecc52cf6ebba38ca8cdc3b4c0d97882c1b228fc83fd403eaf394ccc WHIRLPOOL 1d574684dd82ddb1e951868c6aabe919e802473b7ade46192b53a187cf006785444170a44d3b372903855991f2313a910c5023df060c57e764d0f08df5ff3e66
+MISC metadata.xml 424 SHA256 833f0765f05561d91b07415a704f0083913eee3de98cdd15160ab9b9638acff0 SHA512 d5cacf7c2874eec32bd10036f6fa03f0d357569e99b229b397df2ca1978f3961b9f3e7cd892cba677e4f6c4e39a5d69ef496166285adf089e08e7406446c9a35 WHIRLPOOL 87b3825d816ba0649df6b28f06311c326d25dcd93e230a1a49a32468eea1613f37695a64c5c491b5097d0ff178cc0eda1ce69dec947b2ff5294e7d9be968494f
diff --git a/dev-python/pdoc/metadata.xml b/dev-python/pdoc/metadata.xml
new file mode 100644
index 000000000000..c84b16d0098e
--- /dev/null
+++ b/dev-python/pdoc/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pxml</remote-id>
+		<remote-id type="github">metagriffin/pxml</remote-id>
+		<remote-id type="bitbucket">hpk42/pytest-cache</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pdoc/pdoc-0.3.2.ebuild b/dev-python/pdoc/pdoc-0.3.2.ebuild
new file mode 100644
index 000000000000..f30520b03774
--- /dev/null
+++ b/dev-python/pdoc/pdoc-0.3.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple program and library to auto generate API documentation for Python modules"
+HOMEPAGE="https://pypi.python.org/pypi/pdoc https://github.com/BurntSushi/pdoc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Unlicense"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	# Markdown < 2.5 is only for Python 2.6 support, which we don't support
+	sed \
+		-e "s|markdown < 2.5|markdown|" \
+		-e "s|share/pdoc|share/doc/${PF}|" \
+		-e "s|'UNLICENSE', ||" \
+		-i setup.py || die "sed failed"
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/peak-rules/Manifest b/dev-python/peak-rules/Manifest
new file mode 100644
index 000000000000..eef2c6160cda
--- /dev/null
+++ b/dev-python/peak-rules/Manifest
@@ -0,0 +1,5 @@
+DIST peak-rules-0.5.tar.gz 113173 SHA256 f6883f455f231d8eb72d1fd276eaae2dd91f415ad6abd6e2ec05ba8a2b4a3d55 SHA512 7ab915641829f6366b681b4c576e7213097cbd2be76bd526fdbb4f128762c04c08ee20e3fe3ef36e1df0e544719f71c28079745c9c88f98911074da51ecfa169 WHIRLPOOL 19d7c78c6689b4af1d6386f8146cb915cfe05871d7d596ceeb4c5e35876d855644ea4783ecd7c2906e3f85191cfb9d20f47e282ccef5fabe14232d41380817fc
+EBUILD peak-rules-0.5.ebuild 1313 SHA256 d8864d2d3e99796bf89029d2b7f62a8beb50bed8702db7ee60a961995949e1c9 SHA512 aea7e35276e2d86e03cd92344fdbddc457a3cfe716d20a0bbdf740c047d92bcb5a1e83fa72d7d1f061985d30af7265a64f279d32001ec402cbb805bd1ad43c03 WHIRLPOOL 849701f6cb0b1a25376480fd608ab974dc968547c7cfcadd3a089b7d993fc9dc9d6e90bc8920cd32d9a8f7303caa1072ba9d40bcaa59231555e049c708592e77
+MISC ChangeLog 2434 SHA256 6341d031c0d2f7cd0c58c217091bc85f6fa65c7cba35dfa9d10e3eb27575a332 SHA512 912ba06d61e2d05e0b502c103bb604e2724811fba76be5806690020216b979700fd87bab11f681b8294241198db28c452e5fe3c775cc1776cb646ed88077b265 WHIRLPOOL 4f90299fa09f60bfc70fc0ff4a677045fb769ac581e7f437218a0b9010f115b8579ead2d9c4ed6427a213a7e3ec9c357c71178b6c4657d5f48e7e2d5c6d5d30b
+MISC ChangeLog-2015 795 SHA256 2167afe70559923a848c666fcd63042a99439a8cd0de44a8de40a197e2e5a093 SHA512 d1a4c8bdfe8c8f506889d357cc90cc860ceafed306c2276997357b560ec3f2151412589b211a8f466f7a4725db1821757ce56a6d629129ec8682ae46eb1abd2c WHIRLPOOL ec776133f7e211f6c73d9a07238b488cebf95b0e9c024c2ab04485421edc25c7e3b24c3bec50c479cf967e0777c3ee1d660e8084d616ff75c9267a1a4ef3c311
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/peak-rules/metadata.xml b/dev-python/peak-rules/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/peak-rules/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/peak-rules/peak-rules-0.5.ebuild b/dev-python/peak-rules/peak-rules-0.5.ebuild
new file mode 100644
index 000000000000..edbc5c6550f0
--- /dev/null
+++ b/dev-python/peak-rules/peak-rules-0.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_PN="PEAK-Rules"
+MY_P="${MY_PN}-${PV}a1.dev-r2713"
+
+DESCRIPTION="Generic functions and business rules support systems"
+HOMEPAGE="http://peak.telecommunity.com/ https://pypi.python.org/pypi/PEAK-Rules/"
+SRC_URI="http://peak.telecommunity.com/snapshots/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DOCS=( Code-Generation.txt Criteria.txt Indexing.txt README.txt Syntax-Matching.txt  )
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/bytecodeassembler-0.6[${PYTHON_USEDEP}]
+	>=dev-python/addons-0.6[${PYTHON_USEDEP}]
+	>=dev-python/extremes-1.1[${PYTHON_USEDEP}]
+	test? ( >=dev-python/importing-1.10[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}"/${MY_P}
+
+python_test() {
+	PYTHONPATH=$PYTHONPATH:"${S}"/peak/rules/ "${PYTHON}" test_rules.py \
+		&& einfo "Tests passed under ${EPYTHON}" \
+		|| die "Tests failed under ${EPYTHON}"
+}
+
+src_test() {
+	# Relative import misfires for core.py during emerge
+	sed -e "s:from peak.rules.core:from core:" -i test_rules.py
+	distutils-r1_src_test
+	# Return to original statefor final install
+	sed -e "s:from core:from peak.rules.core:" -i test_rules.py
+}
diff --git a/dev-python/pecan/Manifest b/dev-python/pecan/Manifest
new file mode 100644
index 000000000000..3685f3e4bd80
--- /dev/null
+++ b/dev-python/pecan/Manifest
@@ -0,0 +1,8 @@
+DIST pecan-1.0.4.tar.gz 119575 SHA256 0ecaa56bd3e1643af671dda9c293992b0e086c52cd7d19ab37bd56169a6effa8 SHA512 cbd5bc21658e68553baa55b74f82f7198ba261bf48d2889732ebbdbcb7f00d0a68f85dcaf946e7349000e78217c532d2017606316335211abd1fac15b947ed7f WHIRLPOOL d13c61ea5fced23a745c05f006218e5851418563fb5199fbdf20652edd0aea4d552407ef7ff9d8b4bb32f53c5bfc7d3767e79ba02bb206910a89aa8a90f9c1df
+DIST pecan-1.1.2.tar.gz 120316 SHA256 e7969d9068d0185997f4affca86755771e5db2edf7aa6238be2bebfb4dd6e662 SHA512 672771fb8645bd11f6d89e7be46b6a85ea640b1951cc286cfedc7813f4f076e8435474adcf88d5c149b4d3933fea9c458b155df8b0ce491dac54bad46e4186be WHIRLPOOL c25ce7af4ccc7e3873453e3829ec6b7c3e6dda0fcef9c20efa14e857b54fbde1a65495f5ad27d2b5a00bff95062bf8da78923a19e1042622acc9c7adbe28cbf1
+DIST pecan-1.2.1.tar.gz 120364 SHA256 8d95457b9cedcfda9b467f5cc7dde8cdf72ddba6b402d6a5902843d1b2186c46 SHA512 ce7007f2ea9cf01b7375919c1624b8bf9b8a836d383b6a1906b6d33190b6586ae8700149d862a6a9f16d7eb5e29d055540a13122f67bd3074270e3791a82a233 WHIRLPOOL b220f670f3d498dbc15faaeda3093a422a5469118b223e35295d4ac7413a305d10705c93eeb8a993cb89459029c8f449fd17ee8c34a6f4cb259e37f1c3aa0a10
+EBUILD pecan-1.0.4.ebuild 856 SHA256 9b0d9226c4da372948be43f5c3b3476d446679e4293bfdff457abd708c7047c5 SHA512 3af0b77230b6bbf59e5ad92f1788bfffd6f242427694cc66981eeacaec2d7f76f413d6ab914535d1bbb9032d4dc909de3e872efcc3d3c9839e8c570368c5ef13 WHIRLPOOL cd0ab00be0e8940b7f3f85ea3c2fafbbfbdfae0c811eecaddefee54067c933eab6911cafe50a444dd8c7d7ba662f3b91beb61d2e74661211efa26534cecc8a1c
+EBUILD pecan-1.1.2.ebuild 864 SHA256 fd96811cceca7f3146f33800d129e74ec311024eccf80c3448a02d209de8e6ef SHA512 d9ce19242f121af045423e18f1a38924a85f713549949fca8d94b5964a66b6bd7d25e20a8b40c2d25c142b3cf192f98b45b3c2d4abffc58c6a670c4db1bc6f84 WHIRLPOOL d05ff5bd187c292ecc7e5243b61600ed3813c3b33c261557fc4df7602460bf783db068e8d303c8a131ed5659de1e10dfe4142caef957233f824014ed50d4d769
+EBUILD pecan-1.2.1.ebuild 874 SHA256 8723c5ca9d8da93cf0f70d2e106247338bbd2b5938bd717bdfdfaad9472e79ae SHA512 5f1d83733a570fada7df219268929ce3edb778e6cc6d72fe152fd2eabb8eb3d5ae8630fcbb304048a83d1e69dce74c3c830e3c00baa3d99063783c0057407ca1 WHIRLPOOL 8e596e57693673715b8829d94335a57b98110de14c7f1597a3d7e64dbe5209fc962f2f0fcb9c057e64ab12af71ae766ab08b1ecdbdfda8676d68bc70a8bc6bb0
+MISC ChangeLog 2519 SHA256 09bf38cb72657e1b68f4c92a322a379d7651bad16081322c4ded2a21ca75d279 SHA512 418d0c5680544eec5219b49eb36a1ea4dfdbe87e9ffac826b1eca09b62e472816b8278cbb9c1ca7fdd97c6e54c4bf7059eb394c7add39c106365a79dd42a78e1 WHIRLPOOL 463a3be064efd8b997179bbef3df56648916c12b9c860ce3413ed8b7fb9f4600d7ac61c5dd5e26cf9fca75e8829528c9358f40c7e51f41a0aee4e22682cb3011
+MISC metadata.xml 322 SHA256 3e548b9f5f6eb047a4609aa4c55ff58723ff67e458d004390f006ef8ab0de7e6 SHA512 506ed5b74b1e2383261f2ce34595e4fce40864db017ac9a8b2497de0802949a5d2163956a860d037898cb0885a4990531f200767781615056dac07a4af3a4e7d WHIRLPOOL 374cffb8c94ce1fc0776cb57d6515a903d29691a741e0b1a7c6905d9259ca1f924f48af00e7c278cd5a6c7c2b1f878f482b7752ff312f1dd2dadaf3451b486f9
diff --git a/dev-python/pecan/metadata.xml b/dev-python/pecan/metadata.xml
new file mode 100644
index 000000000000..4a4749206c5d
--- /dev/null
+++ b/dev-python/pecan/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pecan</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pecan/pecan-1.0.4.ebuild b/dev-python/pecan/pecan-1.0.4.ebuild
new file mode 100644
index 000000000000..85b5ec0467b9
--- /dev/null
+++ b/dev-python/pecan/pecan-1.0.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A WSGI object-dispatching web framework,  lean, fast, with few dependencies."
+HOMEPAGE="https://pypi.python.org/pypi/pecan"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
+	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
+	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pecan/pecan-1.1.2.ebuild b/dev-python/pecan/pecan-1.1.2.ebuild
new file mode 100644
index 000000000000..c383f6cb8497
--- /dev/null
+++ b/dev-python/pecan/pecan-1.1.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A WSGI object-dispatching web framework,  lean, fast, with few dependencies."
+HOMEPAGE="https://pypi.python.org/pypi/pecan"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/simplejson-2.1.1[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
+	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
+	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pecan/pecan-1.2.1.ebuild b/dev-python/pecan/pecan-1.2.1.ebuild
new file mode 100644
index 000000000000..82976b0fc88c
--- /dev/null
+++ b/dev-python/pecan/pecan-1.2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="A WSGI object-dispatching web framework,  lean, fast, with few dependencies."
+HOMEPAGE="https://pypi.python.org/pypi/pecan"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/simplejson-2.1.1[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
+	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
+	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
new file mode 100644
index 000000000000..b845806f30a6
--- /dev/null
+++ b/dev-python/peewee/Manifest
@@ -0,0 +1,11 @@
+DIST peewee-2.7.4.tar.gz 608818 SHA256 ff25784ab40d58d659bc8f24e07fe891579b09f74417fca9d8d57772e514c409 SHA512 c72391316c8bd1f712bcb26d4d6e5ef386a415da536d78cade35d42bbb9c8c6d7b0494bf329bd67e3ac5b91a2d76e97365376b0e91a5c6a5b78ab1696f7576cb WHIRLPOOL acc0862963256173b7e918f5456e10dcfb2e533a9cf213841bb42d2bbcea475f8bf329f4227311163de5e9974ea06d1ab9d78b1ab25ce762c11f1d6689556196
+DIST peewee-2.8.1.tar.gz 628870 SHA256 a14cfd248c837987346bada53617d7c298a2bd24e18fb4020e6d6e75bf5df05c SHA512 fd65001f6227f3b470046794f306def4a69b2637d916d4d7ee1057dab5671eaae88f32fe5345e3266829651e7529c53d9928516135af520832f34bfc0b1b9f39 WHIRLPOOL e95f14b16dd134153e4d5180a20546dfca3334c9db1e170b20d7f7c8b5e12331612f96daca7de2eddc0ffd64fe786db40b3482200fcd3268f2e1d407bd65fb72
+DIST peewee-2.8.2.tar.gz 762456 SHA256 f9a62c41b0e38854e420881d316fc5834b1a1900d3d8c97bc3d00cafde22c265 SHA512 8ffab1c6ac8815e409df67eb2a71604a6e1087693b848a0e49dfd7c1c1cdab4271a81cfb5a8b4c363e19c750ec65608dd6f519a1d2e9a84786d47483cd1e8e20 WHIRLPOOL df129ea2009356d34683f0ac54f6533ac9ba611196dcdd5028b8202461302706459e48b222182d9dfa7b91611d625079531672683aebf3e7d258d2e61cbb3fc0
+DIST peewee-2.8.3.tar.gz 639529 SHA256 356dd041b9fa66d6e7cbc4ff44ec87845abf7d7471427d77bef0f8fa3c9ed9dc SHA512 03a2a24acc12c024d9ffc2ccdc70e763e4879f65221b44cda7ee41083e85e8fa5ffa39227a20baa32368d6bd1f104621bb431740430ef6eb0457225fc78e76e4 WHIRLPOOL 8514c94fe7c71a62641c3d4af1674757ef8e4b703a3bdc90646d1a43f4c3208611c1243294e804d96bf57b8bb025a0a355efd973fffa90ad62d5191713748680
+EBUILD peewee-2.7.4.ebuild 1010 SHA256 671a9cbe58be4cdc6550dd0b57be59b761669d0fe3e409ecf4e0e0db2898d121 SHA512 7eb6ee18f605af6cd14a31f2d262fe33d85b27224d7c3c52a1de267b81f9f6c8fff24301aed51d1aa39fdc370f4dfb1f899ed7bffc9b514f32582d139b94eab5 WHIRLPOOL f7f7711fe6c4350cea0255dd7ae8ad6d185803f57c81deec6d6a4730a132f84cf0ecdc45294c98bdedf5cfe184f3f41c41d5593965b951e6f4bc86264499d7e2
+EBUILD peewee-2.8.1.ebuild 1243 SHA256 3c9d5f7eb3474ec566858618beac25531aace0458dbef494f7a2f622d7449054 SHA512 50ad51960399f840ee73410f16df41f376ef90e036525ca7f874be711187afdd4b1e5189397dc7358f5eaa2ea9f2c66a7024479aa0983970254eee0799df4f4a WHIRLPOOL 769c4d66f6e2a94a3bccd1c6e1a441cd4b650ecf5234909b84ecfaaf23f6de0011c7ee1401078319ffd62e4e2504a5a8e927df180671ce03f7c30ceb070e4ae4
+EBUILD peewee-2.8.2.ebuild 1243 SHA256 3c9d5f7eb3474ec566858618beac25531aace0458dbef494f7a2f622d7449054 SHA512 50ad51960399f840ee73410f16df41f376ef90e036525ca7f874be711187afdd4b1e5189397dc7358f5eaa2ea9f2c66a7024479aa0983970254eee0799df4f4a WHIRLPOOL 769c4d66f6e2a94a3bccd1c6e1a441cd4b650ecf5234909b84ecfaaf23f6de0011c7ee1401078319ffd62e4e2504a5a8e927df180671ce03f7c30ceb070e4ae4
+EBUILD peewee-2.8.3.ebuild 1243 SHA256 3c9d5f7eb3474ec566858618beac25531aace0458dbef494f7a2f622d7449054 SHA512 50ad51960399f840ee73410f16df41f376ef90e036525ca7f874be711187afdd4b1e5189397dc7358f5eaa2ea9f2c66a7024479aa0983970254eee0799df4f4a WHIRLPOOL 769c4d66f6e2a94a3bccd1c6e1a441cd4b650ecf5234909b84ecfaaf23f6de0011c7ee1401078319ffd62e4e2504a5a8e927df180671ce03f7c30ceb070e4ae4
+MISC ChangeLog 5087 SHA256 2dff4114fb6dbb4987a0ca512dce506f161c850af902b78e11b1774906153be5 SHA512 d6776797026f7135a12d8044a718d563f2cfdbe7d837ffc3fa24d6d8bc5f05166f4d0ecde60adb445317565898729a5b6061682af08dfef5d5d27b27dc2013c7 WHIRLPOOL 0db744d708b076104c224b6c70ce367fc212e44e15c11b8a7045809413e39a592fdd04785285073a4cd0c20b2af201b11e063f1b94461c8df6f46a674b599ec7
+MISC ChangeLog-2015 4556 SHA256 807de53908eb53b907ed3fad7211fdf95d1c18158c203dca0aec1ed58f00b61f SHA512 f269f116d41f5c2f4fbf8e07c517b46f8af8e970cf62fd451cfcf9fab0963ee02074abbc66700f9247adf7571c282160c492251240039b041da0415557968197 WHIRLPOOL 5b1576ec93376e9d63ec2d619074e3e0ac415baab3a7098fa6389312d0c17e52411b987e171aa2a0e10691638d34ae955542b35a9f582cb205f0af12cc996066
+MISC metadata.xml 330 SHA256 03b05dac24811ba77df21776cc5824cfecf46f3eee2a4e2a196dc44eca3a3e23 SHA512 a75ad6963c2dd0a763e7f11b42a5f92d536a7b4daf59acea56a91b49c11996d316d3fc27b04fcba9c4e7556305543eb44d87ac909a65f937faaf8fd8c57110b2 WHIRLPOOL 36a25b7f61d227141c19fc49bad135fa434a0712bf4107729fd8713eeeb512370f023399121807e0bb62c659b9b47c28b82054ad31eb2eb9b5ea8545dbf7210d
diff --git a/dev-python/peewee/metadata.xml b/dev-python/peewee/metadata.xml
new file mode 100644
index 000000000000..739a565c3106
--- /dev/null
+++ b/dev-python/peewee/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">coleifer/peewee</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/peewee/peewee-2.7.4.ebuild b/dev-python/peewee/peewee-2.7.4.ebuild
new file mode 100644
index 000000000000..e9858741e7ad
--- /dev/null
+++ b/dev-python/peewee/peewee-2.7.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Small python ORM"
+HOMEPAGE="https://github.com/coleifer/peewee/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+# Req'd to ensure a unique tmp.db for each python impl running the testsuite.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Testsuite run using runtests.py does not require deps listed in previous ebuild
+	"${PYTHON}" ./runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/peewee/peewee-2.8.1.ebuild b/dev-python/peewee/peewee-2.8.1.ebuild
new file mode 100644
index 000000000000..453831768e06
--- /dev/null
+++ b/dev-python/peewee/peewee-2.8.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Small python ORM"
+HOMEPAGE="https://github.com/coleifer/peewee/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+# Req'd to ensure a unique tmp.db for each python impl running the testsuite.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed -i -e "s#test_suite='tests',##g;" ./setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Testsuite run using runtests.py does not require deps listed in previous ebuild
+	"${PYTHON}" ./runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/peewee/peewee-2.8.2.ebuild b/dev-python/peewee/peewee-2.8.2.ebuild
new file mode 100644
index 000000000000..453831768e06
--- /dev/null
+++ b/dev-python/peewee/peewee-2.8.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Small python ORM"
+HOMEPAGE="https://github.com/coleifer/peewee/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+# Req'd to ensure a unique tmp.db for each python impl running the testsuite.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed -i -e "s#test_suite='tests',##g;" ./setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Testsuite run using runtests.py does not require deps listed in previous ebuild
+	"${PYTHON}" ./runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/peewee/peewee-2.8.3.ebuild b/dev-python/peewee/peewee-2.8.3.ebuild
new file mode 100644
index 000000000000..453831768e06
--- /dev/null
+++ b/dev-python/peewee/peewee-2.8.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Small python ORM"
+HOMEPAGE="https://github.com/coleifer/peewee/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+# Req'd to ensure a unique tmp.db for each python impl running the testsuite.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed -i -e "s#test_suite='tests',##g;" ./setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Testsuite run using runtests.py does not require deps listed in previous ebuild
+	"${PYTHON}" ./runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
new file mode 100644
index 000000000000..c7e5fbbb2fc3
--- /dev/null
+++ b/dev-python/pep8/Manifest
@@ -0,0 +1,11 @@
+DIST pep8-1.4.5.tar.gz 63021 SHA256 dd908e7df835ebb1b82ba0675e1b7e173ea9c55d7ae62808ecad2e6db2a6ee0e SHA512 c4d8e5b116762480e1aad2ddad1cd02d2d74779adcef8153739c7ca1e56d33bd81b42c984c525797548d915245f24d3cea636d6b89ade8e9e428f31b0a6fe8a6 WHIRLPOOL c597328ce58d226311162c7126c949f92e9142f0fa9a979cdd0ede29f71b839587ef4c5cef57ac8fdd608753f52a6c91220b90807ca9b3b56cc5b5772c688b9a
+DIST pep8-1.5.6.tar.gz 66944 SHA256 1a8be992f8daac6144af0f3972f40159f46d81cb36dde4adeea01576e4bf041a SHA512 9de60df0f56eeb28be835b3f11d060150e08c19403552b769abe0794a1aca65e3a17fd8b45f35b34b11593f527c2f4521ab72823aa1475963b1281c044c71ec1 WHIRLPOOL 97f90d9b4ae69d87cf5eb014998f74d8fc97640a31a457a2b39db495eeb9bc0634d5a56a6bf7636d44dbef70179a3c0c0098e7963a5d63e7d3cfccd0b250675b
+DIST pep8-1.5.7.tar.gz 67302 SHA256 15b42131b25f376165d195fe4e17b0a28311182aaf9330d5eb575bbeda5a6989 SHA512 ae5cc6cc47d71e90059fec0c89f5e8e7b71b08d185c95b0c8cf0aa9acaee4841d0cfc617fb1ca6d7af7f4721480a1992b6178dc845d80dfe87fe3792d515a3eb WHIRLPOOL 09621e17fec73de00ab4840365898084651bab4cbcf982a1393eba5e0bb2d04c0374c5dd69bf6915b6542b4ce6ac13a614395811387badf6384f266d0b61fec3
+DIST pep8-1.7.0.tar.gz 79704 SHA256 a113d5f5ad7a7abacef9df5ec3f2af23a20a28005921577b15dd584d099d5900 SHA512 0077dac97846fe3a5fc654cd3ce8578845cf3b93ee097a3ae6ff2db4ae0797ad5766c69f036d6a5add786eb929a9beb6d657ab693227b8df2ba46ec0f9284b0a WHIRLPOOL 6ff0baa6c1aec5db641cff6cefdb2310f31af482c92e97d27edd3b9ae85d8f255c1283cd9261b9db74d5d5d4c73c72180e55edb3303f2f018889bab7ea9b00a3
+EBUILD pep8-1.4.5.ebuild 679 SHA256 eb57b6ed1330cc74e2525b03a95ee83f5b798fb57f19143f3d22df63a1a43f3a SHA512 a8fd400b687c434e445c24759ffad9f1c0e784123533a2e6edf4c64e3fedfa5dac787f950448179a5e0e27fe32850fecab98c02d1013b8a83fea4adb05285e8a WHIRLPOOL 9fbc6b8bd077e1fdc162df4199f075390749f95a06515218da124ec5d5328ccb071299ee06d5c58d441d6462fd4e1b019eb13322c47004aae8d751e952daa986
+EBUILD pep8-1.5.6.ebuild 911 SHA256 7fbbb6958297beb99568355977084fcf5242197706505f8b07725af633e3f7d2 SHA512 cc21e76371e39ec1442079ae9ca446db9a03a5537042a5097fedd98948f89ee940a1d069f061840c30b2275903dd129ca28af30ca2d9618d17ca265d9237b4e4 WHIRLPOOL 2cdd386fe97f079b99bb935a4d79449199050019ab98e2beb215b2ebf110781d7c87ba481d7d29caeb07f96cce51c64a25f8c74da20e0147a97c0dffc3cb3edc
+EBUILD pep8-1.5.7.ebuild 921 SHA256 065f0297893f5ce65f1eca043e5dd0076c4a6dd171d7b6dc920b0ba2bc931ced SHA512 30ed26b1ed679182e1996ee278097a23cc236f7fa3f059fb1f2ae3e3e4b0d109290793936ffd3786061b2556b4775eadc24fa16eadb3066932da3ed010b22155 WHIRLPOOL bc35550eec7f3ecc56dbb1e60829ce94ff86f02100bbc51d58ee43f45d614c6bc3c0af1367886b984f50abdf409ec04fec34494f10223138135a076541673c4f
+EBUILD pep8-1.7.0.ebuild 1094 SHA256 3ea67adec6fd0e76af3d412a25eea83ff5bd170ad38c8eb1107d3e0d2ce21561 SHA512 d2420918f2ad8cf1efbb925478b880ca0fbf5fafc17ad33bed4bfb03cd3ee0130b46ac2d9c0c1079f81021bf7486b5504a315d46c3f9cb9ea793939635df6293 WHIRLPOOL cc46c69d44aed695108fe13896ea65e7e2fadcbf9342aa6b19d6798a1101d4ab0c15d58d57733610d831d2f81007a4bff037a2e9bd9ccdde7d2eb1bfa6a3b452
+MISC ChangeLog 4199 SHA256 26075d22416575b1ccac0d1182de35bf739787b2a1520bcb67a9acb69ebf7679 SHA512 238b9ce7d7e5808e64e45e8ae8d25b8f1e25c36b896fd7d8d5303d19e244b56cc8d64dd2b4ad8e100b27e2092d2fa836b1d0d7ea201b503f756aa22745418112 WHIRLPOOL 3011585c4b0df618bb1d9b0b8399142875f022d974ac9aa9a57a38acbc6f61a34cbcbe0733f56c685dcd25b6d5807c2e6bf3b9cf3298824b90e8a9132716765a
+MISC ChangeLog-2015 6295 SHA256 b8104da331808680df942a9c50edfecc6bf18058fb999a9ca349a90f44a100e9 SHA512 9d1578ab060f04f9aa6060ff403de4a65781897408937b78adc8819678fe0bc0208ba6b52675d62339cc8dfea8563d41bdf9fab8da358c7bf8740df011f73a2e WHIRLPOOL a4de15f8eb838495f04b1c75786200e9901f75b8cedcb24b8da82ff99b914cbc290cac132c46642deb60e63055d8bb46314040d6ac8db2d73afe7dd8b79e77d7
+MISC metadata.xml 373 SHA256 29c86cc298d2cf1ef945d42e786c46138ba45d726e7f82c4dfea10181174c4ad SHA512 0c3ea303192c4b56bd910168dbac81284231291053b5fbca4a5a0700cb40ae8646f1b201fddc76dfeab52979c4c5944a67a2b0c62cfdf5c020c23e09e034056c WHIRLPOOL 7c046c876c60f09a5ed674258e417c4eb7ee623d9e0ca2a08a0ec9efbd6ae65be73fa781d8a3a882205aaf40e037aac7a529e02e60e133dda3221011685a11e6
diff --git a/dev-python/pep8/metadata.xml b/dev-python/pep8/metadata.xml
new file mode 100644
index 000000000000..5f771ac3bf58
--- /dev/null
+++ b/dev-python/pep8/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pep8</remote-id>
+    <remote-id type="github">jcrocholl/pep8</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pep8/pep8-1.4.5.ebuild b/dev-python/pep8/pep8-1.4.5.ebuild
new file mode 100644
index 000000000000..c32b813b7ea6
--- /dev/null
+++ b/dev-python/pep8/pep8-1.4.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python style guide checker"
+HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.python.org/pypi/pep8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGES.txt )
+
+python_test() {
+	PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die
+	PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die
+}
diff --git a/dev-python/pep8/pep8-1.5.6.ebuild b/dev-python/pep8/pep8-1.5.6.ebuild
new file mode 100644
index 000000000000..ffa72efc8a2c
--- /dev/null
+++ b/dev-python/pep8/pep8-1.5.6.ebuild
@@ -0,0 +1,35 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python style guide checker"
+HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.python.org/pypi/pep8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die
+	PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pep8/pep8-1.5.7.ebuild b/dev-python/pep8/pep8-1.5.7.ebuild
new file mode 100644
index 000000000000..457924b1d0ab
--- /dev/null
+++ b/dev-python/pep8/pep8-1.5.7.ebuild
@@ -0,0 +1,35 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python style guide checker"
+HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.python.org/pypi/pep8"
+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 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die
+	PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pep8/pep8-1.7.0.ebuild b/dev-python/pep8/pep8-1.7.0.ebuild
new file mode 100644
index 000000000000..cc583ce0b856
--- /dev/null
+++ b/dev-python/pep8/pep8-1.7.0.ebuild
@@ -0,0 +1,37 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python style guide checker"
+HOMEPAGE="https://github.com/PyCQA/pep8 https://pypi.python.org/pypi/pep8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --statistics pep8.py || die
+	PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die
+	PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/peppercorn/Manifest b/dev-python/peppercorn/Manifest
new file mode 100644
index 000000000000..e96650b87479
--- /dev/null
+++ b/dev-python/peppercorn/Manifest
@@ -0,0 +1,5 @@
+DIST peppercorn-0.5.tar.gz 19637 SHA256 921cba5d51fa211e6da0fbd2120b9a98d663422a80f5bb669ad81ffb0909774b SHA512 37f9df282872b0c664780f5e27caf81cc379b05009756cf6c79290b09893d88427f3619916688412dabf20e99f264da8832d959563943e2910b1fcac696edc31 WHIRLPOOL a104c3dca197c5bdd32a9a3f4fafb7c93459cbb8da13f8e581990962ac9afc56c22cdbb101d17271983b61fb0e83f4c0b25590a88d8f54c403110067ea3ba12f
+EBUILD peppercorn-0.5.ebuild 1090 SHA256 d190dd2cd7151f6c41ae3a3fbdfecb3fbb968e915a0d114c03bbc6d3e48ca42a SHA512 ee4fd619cb57284b489e75f09f5bc08a620a378ae92db4e04dcc28a3986c44534ce15aa93c726cb83d7024bc58704f05909b87f3ebca66a608b4bb28546a2f6a WHIRLPOOL 3d2dd9626e5b73ae6fa288dc4ae7fa10f93e8f61488a6f6ee9bc414fb97b214d06ee8c2b19f8023201bdeb1787cda5a089e1df29296b6447a8f62ec4a0e668d9
+MISC ChangeLog 2823 SHA256 3b581ca9a50d8fefac8d402e773152dd6073238d16a88102034adbca2eb0dbd7 SHA512 23bde6ca593fa3983e58a36b01d681dc091d2237ed687057ea87911f43e18c1e891314a72d940ea699f454cec8b39af9030923c15a34a08fd7f9552e3f34ac08 WHIRLPOOL 9afd0a6e10fb491a83fc353f5dc06f2aa11414b15e871b7edc7ad800a04640425825f1760bd69bc601b45776b657f21cbedfd2bacfb8a3042f9151ed4e4cc064
+MISC ChangeLog-2015 1746 SHA256 9725d419a4ed6fbd9df84009bfcbe2ede6319653ae85c7cbdbea620aa705c451 SHA512 c17297023a3c904a29cb7cc1596a71a19b1f1b978bd0abbf3f564d9418bf794b38f23bbb988273b91c295d1232952b0362e0e56231d9d8cb9c76fe34b06d7a6a WHIRLPOOL 54cf11a1f6899d3b7db72e797e093f9f7cdb0d93be6e789bef5b92eb50c0fd8c39e7d78c74296f4ca9963e1cb496765e14a0663fbf377ee542bcc80c2cc11829
+MISC metadata.xml 382 SHA256 6187f0df1d2cf9a200b6832442cb298f44c3a69916e9892f4e4a81fb7425b4cb SHA512 87d4af71c685754259be695e02aa5a99e49f9f6c72a57c15ed7e5e6777255cc49f8400d349fd0e1308e25ce36b0a880696c9f8cbc2e6ea991d34901cf38c8235 WHIRLPOOL 50063ea0bbfb018f6086c121f84bafb598eef154465319eb0abdfa90cd0e0f0ab5212148f2b776fc62799315917c3a1ae26b1859abd08a67e3302eb06e1cc4a3
diff --git a/dev-python/peppercorn/metadata.xml b/dev-python/peppercorn/metadata.xml
new file mode 100644
index 000000000000..653753bab731
--- /dev/null
+++ b/dev-python/peppercorn/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">peppercorn</remote-id>
+    <remote-id type="github">Pylons/peppercorn</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/peppercorn/peppercorn-0.5.ebuild b/dev-python/peppercorn/peppercorn-0.5.ebuild
new file mode 100644
index 000000000000..fa04999d3d24
--- /dev/null
+++ b/dev-python/peppercorn/peppercorn-0.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for converting a token stream into a data structure for use in web form posts"
+HOMEPAGE="https://github.com/Pylons/peppercorn https://pypi.python.org/pypi/peppercorn"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+# Include COPYRIGHT.txt because the license seems to require it
+DOCS=( CHANGES.txt README.txt COPYRIGHT.txt )
+
+python_prepare_all() {
+	# Fix Sphinx theme. courtesy of Arfrever
+	sed -e "/# Add and use Pylons theme/,+36d" -i docs/conf.py || die "sed failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
new file mode 100644
index 000000000000..4452dcfcb620
--- /dev/null
+++ b/dev-python/pexpect/Manifest
@@ -0,0 +1,7 @@
+DIST pexpect-3.3.tar.gz 132330 SHA256 dfea618d43e83cfff21504f18f98019ba520f330e4142e5185ef7c73527de5ba SHA512 66cc501f1c7bb8ba0be4cdc0db840629f51416dc54ae44dc770adb38f1a385116b0a8b9bc7f1cc1447f05ede36ef1b519f5c4e710e6cb736c923ecfc87497cfa WHIRLPOOL e708e722d4e2598958f8d724b84148608e9a53041077b1a1a2af84d5281e11f0c6c050ee88489eebc48bd5556c22e0fe9386680d34b1941ddf21539296629513
+DIST pexpect-4.2.1.tar.gz 143980 SHA256 3d132465a75b57aa818341c6521392a06cc660feb3988d7f1074f39bd23c9a92 SHA512 796474c87559cb9f4e2dfe72564d70c75e1aac4f57c4f3e4033a56c8842a48380ae0d5fafdad7f1ea6718b25c272fe4a611a59db44e69afb1f2bbf7e00256261 WHIRLPOOL 35176b56bdee1d7066705925c54014c33e18679e40f9182f15a223190904a6fead235c0d676806cc55a3f0f64666f446182056a29b27217ccc8990ecd9b8184e
+EBUILD pexpect-3.3.ebuild 1068 SHA256 d5ab249b9afb276372db9ab7a35271d9a6ac541186af0c45a3ab1617b0b145e0 SHA512 0273ebbbba5c3ce1f60956fd7c8b99f374d148e40e6fdc6910e0febc71bd6bc64e83f28f01520ed54a0dc1b400e8b9f6131d63020a2d79974f04b673a13bb5b6 WHIRLPOOL 18984dd935a20733b97c73dc7915c5d45d9f64d66226eefb7a169095648a4fca90c26c68b125ceaf4876e738569eb622b00c920001084534932d40420f42eb61
+EBUILD pexpect-4.2.1.ebuild 1171 SHA256 c9ca32480f2078b43c02821bf86c0cfbcd34f9397c0f4eee66dcd79e73819846 SHA512 366dd4e99b56a9b9eaf79c55b5825ff9d7fb1dd4aec16e69152b1f62e6a15f93414dcd962571fd92e4a96cdcc9cc305a23e5a55b3ca241b5c0abecee8da02ad1 WHIRLPOOL 2bfe87b5ac78d891f575a29ce3eafd4e9cbbd3579df99245b14d91c5d8052f1379f3cd7ca6d49bd254f3c563d01e412b9e38456f9e918076e9b01ece130bfbc4
+MISC ChangeLog 5819 SHA256 ce40004ec45a10f2ae2a9a4200bad347eef4111f5ce9f927d015f1cb6292abfb SHA512 ad8d2be641ec91a806f722dc05a101ccdd0a44eda19e75ae14dcff363b504b1310b3c023066437fbdf3cdc2025b7c5371b12e71cf478ffe21263487f6f9b3577 WHIRLPOOL 879905b8ce46670fedc447d1e4aa1ac4a5bf02ca9235c6d365b6e9604075f7dced6ca7620524259dcecbbeeb0fcb0b458db6451ca0f072b6b3d97e878e665b59
+MISC ChangeLog-2015 9840 SHA256 72bd8513660d70da0c3e6f10f8c5768d95c185d6038a3a985a622cbe730bdd3d SHA512 15c7d741bfc96626b9cd87c72d4f1a301ed97e526e5e04ef8f415409f1ecc52475faac2c339189144e3027f70a2ad3bafff743151a6ac6e9bfc4e1a0e6e347c0 WHIRLPOOL de3274b0164e3f154706ce7444fe2c9e8918c4a73274bd7d3f14b861396dbdfb1360d6162e8b5a18d567289c3c94687e363fbbbbaf7c59dc166da3797f247b08
+MISC metadata.xml 377 SHA256 ce566bac90629ab4c9c07dfab27277b6c7e8825452a00b5e5afc8d3cb75e0e88 SHA512 31e65b2ce9ec12e9d3e95ed651841b8aad6a24330fe20b4bfd6351267423ff5005ac3cb2e89dbb8f024cf60705d3f06a8a1309169a029eb5246ddc45a8d76464 WHIRLPOOL 89f3dd9835233d4c20e80550859342aeb86ddbe67b19464f9a5d1cc7be6ed0d1ab1c2d5c883b9af91991dcb4dd93ce7c58a3a3ecec4115688cc5f8ab4774427b
diff --git a/dev-python/pexpect/metadata.xml b/dev-python/pexpect/metadata.xml
new file mode 100644
index 000000000000..311134caccb6
--- /dev/null
+++ b/dev-python/pexpect/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pexpect</remote-id>
+    <remote-id type="github">pexpect/pexpect</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pexpect/pexpect-3.3.ebuild b/dev-python/pexpect/pexpect-3.3.ebuild
new file mode 100644
index 000000000000..92cc05f97ccb
--- /dev/null
+++ b/dev-python/pexpect/pexpect-3.3.ebuild
@@ -0,0 +1,36 @@
+# 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 pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for spawning child applications and responding to expected patterns"
+HOMEPAGE="http://pexpect.sourceforge.net/ https://pypi.python.org/pypi/pexpect/ https://github.com/pexpect/pexpect/"
+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 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+DEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	py.test tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pexpect/pexpect-4.2.1.ebuild b/dev-python/pexpect/pexpect-4.2.1.ebuild
new file mode 100644
index 000000000000..a9e4f2ebcdaa
--- /dev/null
+++ b/dev-python/pexpect/pexpect-4.2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for spawning child applications and responding to expected patterns"
+HOMEPAGE="https://pexpect.readthedocs.io/ https://pypi.python.org/pypi/pexpect/ https://github.com/pexpect/pexpect/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
+DEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	py.test tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pgasync/Manifest b/dev-python/pgasync/Manifest
new file mode 100644
index 000000000000..e4d3a17950b4
--- /dev/null
+++ b/dev-python/pgasync/Manifest
@@ -0,0 +1,5 @@
+DIST pgasync-2.01.tar.gz 22314 SHA256 c38ac6ae200d54c22ad480ea020e0019692e69992344abce287232b30ccfe56c SHA512 36916ce3dcebf82367eace8fd689e0d300ffc040250869794191bfb723053050c9766fa5ce251341c317f7fbab418ace4dc36345d5c73eea92c1d04d36e802af WHIRLPOOL 6ac847535e7e8efdc28cf64323b302ee590bb38103049d19bc8f41aab6d2c9ec50d0493da0fea014e44f610871aed446c713e58b46f80db6414195b6d6327ab3
+EBUILD pgasync-2.01-r1.ebuild 623 SHA256 bc621c7cc16d0720fc7088eb7961ee5c079f32e46a9a982b3f2e65b449b59696 SHA512 a963e57dcc424672fafb86e8f63ebf277112b6da97dcce0021915c20bc037d50b2a78b5822df5d11894a9e459e1962b2795edcf44d12387cd4db3f1f4eafbe55 WHIRLPOOL e4b0f66a425eb7f1a3a7f10fa9752147b32ce959b9a3676f901513bd72138a235e13b814eae6212c9dfaa1280df89c7ec5c798e945b9c8c98a08b860334eadc2
+MISC ChangeLog 2433 SHA256 e4379bf33c672dea9f15bd9398f6065b8276e5b964cf553704363ddd3aa17401 SHA512 834c3f2970cacd1a78ee8feea2cb78ae4d72126aa59c8778af03d755ec3025b6edaa0e0dce01b69b4fde15f331f92a260417f9c154adac10fca8b8b5fce79a5b WHIRLPOOL 4d6e1393056fa727bc4981b54bccfd22deed88acdc84d4672019203a7941946248507db60284c61d35caf1c6f7f29947971da563abfed3ee74b06820aa0ab806
+MISC ChangeLog-2015 909 SHA256 f663be19141f4d11cf61155bee9b0cadf2b6c86a5b23aa4a71e9bacda360e49d SHA512 754955577c72beee70ed445b8686406e511df18b5aeff01cd4287f1e886ddc3baadcc09f53025e8790916f47dd4210d27a2ac0e37c5d11b9b992c59e4de65d93 WHIRLPOOL 312f7aa69ab57c8a60b865c03a03cfdfbef9a29552a5fb24b8ac15803fa24856ae3a496f2ddbdd886fed84e4d96b6a5696ced45b322e2c41ba0f25e862e62125
+MISC metadata.xml 380 SHA256 9d2a7949a2eb5318ba6fd14dd997a2c519e3d5b24d9022d1d2d6455367e19e9d SHA512 1ccdbd9de1596dbb5bafcbedc1dee8cf7c7fb422d62cf9b52579e132d2ef59f400c70e94b4c2ae4d669e131ab9ecc8c72189394a313115251b638b3cfb050fb2 WHIRLPOOL 7744c9e97ef39284c44fbcb3b4ccd5473463c0b77903dcc50acddde73a603f295221adcc80c67a33c62e538db4e048a2d2b094ecde382ee4af899f4f54067cfb
diff --git a/dev-python/pgasync/metadata.xml b/dev-python/pgasync/metadata.xml
new file mode 100644
index 000000000000..2f5f34d7943f
--- /dev/null
+++ b/dev-python/pgasync/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="project">
+		<email>pgsql-bugs@gentoo.org</email>
+		<name>PostgreSQL and Related Package Development</name>
+	</maintainer>
+<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pgasync/pgasync-2.01-r1.ebuild b/dev-python/pgasync/pgasync-2.01-r1.ebuild
new file mode 100644
index 000000000000..272afddb3b93
--- /dev/null
+++ b/dev-python/pgasync/pgasync-2.01-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="An asynchronous API to PostgreSQL for twisted"
+HOMEPAGE="https://github.com/jamwt/pgasync"
+SRC_URI="http://www.jamwt.com/pgasync/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+DEPEND="dev-python/twisted-core[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS="CHANGELOG PKG-INFO README TODO"
+
+src_install() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/pgmagick/Manifest b/dev-python/pgmagick/Manifest
new file mode 100644
index 000000000000..79d3aa79f3a8
--- /dev/null
+++ b/dev-python/pgmagick/Manifest
@@ -0,0 +1,5 @@
+DIST pgmagick-0.6.7.tar.gz 357392 SHA256 c84a5eaa275d7b156376289c38e569bf99d85bc568967e40e014c41c688f2a39 SHA512 0a8812457c0803a1b7ca228c77691ebfb1d51689acfce7a3c36a3b10f16020cc6e4814808985b38a79fe1ecbe77cf29f4ed6b7bf813ecaa72545127919c59c7c WHIRLPOOL 41e2ad56aa0635a3663ce312e38e71454c6840c0708c83875d070c8356c9f3fdbddfe64fd632b46fad35a9989c695575bb8f0435530aefcccdf8e7a8c1c7806c
+EBUILD pgmagick-0.6.7.ebuild 853 SHA256 b011a5e8f058374042690aff37f019e50a182b12ca97d52e200bbef6f7dd674f SHA512 aed3083d41ad17e295eaa76974821aa0831e69003db77f1e8026ba92344c06a15078e921b86eb6bc4cf9623d438c7c2f14de571e549ffe3129baafacd3870f6f WHIRLPOOL 92e1d8ee0785f4057e5aabc56d24fa939803205bf5f0f084d37720cd395ed2dc356e0f280649b3c373449eb173eba975d496318555489726dc11bd00bdab7990
+MISC ChangeLog 2841 SHA256 832ed9a651e1dc4ade03863a45009a82b7f2911a38a55007c27020d0e2d2590f SHA512 a83214f6d0e7293393557668b82485c76cd1906428f916d1d708085a49e5aa4bd38be5a0406c5a8037fb29ac4f8b8c56bddcde35078a9ff78e15372fb5ed0051 WHIRLPOOL a24e6c1a22327cd957c3b6b31698378fd3bca23f34b933e077f55ca6856b12243f244c5ea585ccd5722a12a9fc49da330f4ebe163b24571145cdeecf15f4adf2
+MISC ChangeLog-2015 1552 SHA256 6eb8f086042315f71aed48e612b76924fba9aa9ef84cdff0d226bbecea4c3690 SHA512 2df0b3d77a8371bcb4a8d9b7d2deb20e0d550ee9d6cbdac2177950f42f3991123e39c0cfb91dae6c97e566a18e8ed75fec7b360245748feb66f9d9eac0edc965 WHIRLPOOL 1485fc88503a993757f0e3eb0737139b565b6413f04f1c2d6201fdf9d6b11df59d10358a731909a73dafc18992a168312dc4f58680fd1ba71938d9df81e7d77f
+MISC metadata.xml 369 SHA256 a15a6b7eb6c002b145a5415eacf9d63c2a92fca3f34557f8197542b571f647ff SHA512 0d44d859e8682309c5b257594c122899c0be9658d8f4f60b8c94cf5cd8c64696fde6344b776e9859f3083d10cec41d2a6797f175fa55b77610885de69649e4d1 WHIRLPOOL 5f4e7640be2c178c9828eb7e244887658b7dfc0ebe16ac30ffadb44b366c0e5038ba8836da8453782c2cf9a52aacbd7f061e6bc8cb67faa988131ef876d02e55
diff --git a/dev-python/pgmagick/metadata.xml b/dev-python/pgmagick/metadata.xml
new file mode 100644
index 000000000000..e116cc09bd20
--- /dev/null
+++ b/dev-python/pgmagick/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pgmagick</remote-id>
+		<remote-id type="bitbucket">hhatto/pgmagick</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pgmagick/pgmagick-0.6.7.ebuild b/dev-python/pgmagick/pgmagick-0.6.7.ebuild
new file mode 100644
index 000000000000..7e33e5a5ae01
--- /dev/null
+++ b/dev-python/pgmagick/pgmagick-0.6.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Yet another boost.python based wrapper for GraphicsMagick"
+HOMEPAGE="https://pypi.python.org/pypi/pgmagick/ https://bitbucket.org/hhatto/pgmagick/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	media-gfx/graphicsmagick:=[cxx]
+	dev-libs/boost:=[python,${PYTHON_USEDEP}]"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( media-fonts/corefonts )"
+
+python_test() {
+	cd test || die
+
+	local t
+	for t in test_*.py; do
+		"${EPYTHON}" "${t}" || die "test ${t} failed under ${EPYTHON}"
+	done
+	# As long as the order of python impls is not changed, this will suffice
+}
diff --git a/dev-python/pgpdump/Manifest b/dev-python/pgpdump/Manifest
new file mode 100644
index 000000000000..4a9fa5738352
--- /dev/null
+++ b/dev-python/pgpdump/Manifest
@@ -0,0 +1,5 @@
+DIST pgpdump-1.5.tar.gz 69446 SHA256 1c4700857bf7ba735b08cfe4101aa3a4f5fd839657af249c17b2697c20829668 SHA512 b9fc7f78b920296301acaad2dbbafefff7b5f1658cbb65f5892a28d0b4d5110581bba984ad5cdabde3330025e3828387d7127c689cb86a7163c0b5ac0d0d2de0 WHIRLPOOL 81b3bfc26f89419261d0104d848f584b602f280efa62b078c902224f3c545b757d2864c946adea7800df08ab693b9dd182a9ed43aa617480f9e04865f7372a81
+EBUILD pgpdump-1.5.ebuild 444 SHA256 271a263ef804c8e08d2d5a6d721f12a64da8663836a079144b0ff8ecf2e5ea09 SHA512 0d0dc402b6221edc6fbae91421d11b1a2dcdd000fc5c214785323ab1007f135dadd136d8e55a16d80c16664cd1d4fe4e4dff9524e3ca921cae408c8a70506d8f WHIRLPOOL c4a1183be60968ddab554426f7eae4a0336fa16dbbf3af9b4063e938e33e8526eeca1095a562dcdeb94241aa6a9ffb02aabfa7eec29e822630a446e9f34c14cf
+MISC ChangeLog 2691 SHA256 a8f8149e81738a2059edf426c195f1bb4f8b0dc52d1efc1e342bfe899d15cf5a SHA512 8ca94fa4bdfbeb6f5dace067a147141a940175afe09682888abdb07b56ef8ba567219f2a20f5a3c4a423f0679830a98dfd87f0884e93825062bbe3d840066d89 WHIRLPOOL 459083482c12d9521a6812a1d60b3e0684b1e39c7a493a17830a05730270be2f1e93895ee5d5858115e62b65d9d187b7c3ad4f625083fd45472bb484ef95bb70
+MISC ChangeLog-2015 554 SHA256 c7e986a41b4d9c266bd65fb97bd2ce11724aea3347e3b9707f6b7d7e9b7ff83c SHA512 d3df716be7960dce3a312a66a74caf2eb71e2b7f5cbba2fd6308f60111bc048a68e349418f7016e909f6cd8196c1d29157a1927527f5607363a09caf2817d58d WHIRLPOOL be00bb93d112ec8cf7b23d14b669384e270fb1962bd531e8f47a672aa1c6ca5727cedb82c438816e00eece916f7dda549f2d9b7e831393797b8293a3a75107bb
+MISC metadata.xml 386 SHA256 6629bd681adb2b5372a772478ceec7742a959b1c815e40d8d3c455523949509c SHA512 e7d8886a19a4cae8c44a9546ca41c486965a304da55d623892746d1dd0706348dbd431080ff145bd47d7a629b1e7c464e36f18699172689907c15fd31f79fe27 WHIRLPOOL 583f62568142a2da408a83768fa7e03e07c1fa1b8bbede9aa20428a2dddc44bd15bddd5ee8fb3ce6c9121ad4639dd1ab657ceecf666c2c7c3daee0f084b224b2
diff --git a/dev-python/pgpdump/metadata.xml b/dev-python/pgpdump/metadata.xml
new file mode 100644
index 000000000000..11bf83b1dfc2
--- /dev/null
+++ b/dev-python/pgpdump/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pgpdump</remote-id>
+    <remote-id type="github">toofishes/python-pgpdump</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pgpdump/pgpdump-1.5.ebuild b/dev-python/pgpdump/pgpdump-1.5.ebuild
new file mode 100644
index 000000000000..cc2dbf0f8e51
--- /dev/null
+++ b/dev-python/pgpdump/pgpdump-1.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="PGP packet parser library"
+HOMEPAGE="https://pypi.python.org/pypi/pgpdump https://github.com/toofishes/python-pgpdump"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
new file mode 100644
index 000000000000..36ed74db4c54
--- /dev/null
+++ b/dev-python/phonenumbers/Manifest
@@ -0,0 +1,6 @@
+DIST phonenumbers-7.7.5.tar.gz 4639483 SHA256 dba4d75250ac66e3cbea3a4d8434db5d0baded6d8a670835622b2d649ce49753 SHA512 af7d573cc2a230a9f2fb06cdc4db0d9f424110fb37382eab2f4f0e91801d910f923f87518c5fc99b400a1e99bf61c516d111ae3dbc71a6bb9c4841a067e6012a WHIRLPOOL 9ff10771e3aad307fda023dbbe1956db0eec6a5b1f3b6116eb84747dbbaefc85db4136d2f05460797b11388c5ce3a74b8cf867541da32e572f316c46728213af
+DIST phonenumbers-8.3.1.tar.gz 4718199 SHA256 cf69268771975af524d6f59dbbc976d2738f6a0d32984437897a23123b4300aa SHA512 535a9ef057183c90838bb3a28982bcbb3d95fb2c85ebfb4dff9371f0f41d17e71b9ec2d833809f668a5c53ca9eacaa4f791c829c38ec42ec0ca301332213dd34 WHIRLPOOL 97a198ecd437e56880a201891c73d4630440c31ff6f8f8166238b1f8818222c19bedd9490e28d0226eb3f008d10ce0a61116b4d9b64a0b249dcd6a68e10e9d1c
+EBUILD phonenumbers-7.7.5.ebuild 710 SHA256 22f0074170f43b1ef698078c1f8691300d1126d7465c24bce4c22ee347da0fc2 SHA512 fb6925cf90effe4b483ade58d03b420321433bedc0bcc9eca0c532c3bbab4243151077c9e08609b9613d6e32b9a68a1afa2b92ea7f42f7ac95dc0ec350a7be8f WHIRLPOOL e6da9957d24f5f60887bdf2eab5616e0d982ab7bc822a48cb1f32eddea0895c1faae6b1adeaa2e6aa85dd46bd80ad2dc6b25a258b0f7fa3e6f90f95e0958349c
+EBUILD phonenumbers-8.3.1.ebuild 710 SHA256 22f0074170f43b1ef698078c1f8691300d1126d7465c24bce4c22ee347da0fc2 SHA512 fb6925cf90effe4b483ade58d03b420321433bedc0bcc9eca0c532c3bbab4243151077c9e08609b9613d6e32b9a68a1afa2b92ea7f42f7ac95dc0ec350a7be8f WHIRLPOOL e6da9957d24f5f60887bdf2eab5616e0d982ab7bc822a48cb1f32eddea0895c1faae6b1adeaa2e6aa85dd46bd80ad2dc6b25a258b0f7fa3e6f90f95e0958349c
+MISC ChangeLog 1379 SHA256 7be502a2376cc0c35c10a7a2ccc90fcc9103b0c4cc2b9af4b16d4f8a1c81bf6f SHA512 1a4fd1ec1e5742514498e44ceb672bd7e71c29746ac8c2dc5b4f750c6da190b9e9673d872b4d8373fa801d180f29a5697fe6d5182f20920769723d8d9203d333 WHIRLPOOL de70a41c09038308c7f4ceb5e28749673ccecd1683419f6b6e0575bfb8bdfef2da1f2d9c12a650239d93ed2bbdc180fa2b97adcb76db695867580dfed744d3c0
+MISC metadata.xml 362 SHA256 752ca004f7372c3b3d44ee3478f4b7631cc19f1f807ef81b4f53bb96932ee29d SHA512 d15221d6a54b68f3cd03ad8016f26b970f630d0d78e9834ba8b78b6a691fd90eea1ea1ec2efdb21b09d336ab6f5708c3cc8b24470ede75bdc629eff8f40b7c35 WHIRLPOOL d148c01b517a5146432961c2801a9a432f9388b6029a648962bf08b728307180cd5eec4a5a54f5d8eea6f225d0199ccab56b7b4b8cac01a3e7c2b1300c14196c
diff --git a/dev-python/phonenumbers/metadata.xml b/dev-python/phonenumbers/metadata.xml
new file mode 100644
index 000000000000..be4f069d2123
--- /dev/null
+++ b/dev-python/phonenumbers/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ercpe@gentoo.org</email>
+    <name>Johann Schmitz (ercpe)</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">daviddrysdale/python-phonenumbers</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/phonenumbers/phonenumbers-7.7.5.ebuild b/dev-python/phonenumbers/phonenumbers-7.7.5.ebuild
new file mode 100644
index 000000000000..77ebf1a36080
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-7.7.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="https://github.com/daviddrysdale/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+S="${WORKDIR}/python-${PN}-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	# the locale test compiles and runs a .java file
+	sed -i -r 's/^(alldata:.*)locale/\1/g' tools/python/makefile || die
+	emake -C tools/python test
+}
diff --git a/dev-python/phonenumbers/phonenumbers-8.3.1.ebuild b/dev-python/phonenumbers/phonenumbers-8.3.1.ebuild
new file mode 100644
index 000000000000..77ebf1a36080
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.3.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="https://github.com/daviddrysdale/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+S="${WORKDIR}/python-${PN}-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	# the locale test compiles and runs a .java file
+	sed -i -r 's/^(alldata:.*)locale/\1/g' tools/python/makefile || die
+	emake -C tools/python test
+}
diff --git a/dev-python/photutils/Manifest b/dev-python/photutils/Manifest
new file mode 100644
index 000000000000..f06063c00548
--- /dev/null
+++ b/dev-python/photutils/Manifest
@@ -0,0 +1,6 @@
+DIST photutils-0.3.1.tar.gz 633814 SHA256 de1d102976f359079b00af62068f103d52a5d5b4931160c969a46a8eb9888209 SHA512 62f7b838e09cb76d0c3b400524340861d882455d305fc31bb062c5853018f0133a4364a5b5e5166101328ad931d474823dd59ab7e58fdcb68bd824dd2ed34959 WHIRLPOOL bcb851eca37d604ab40cbc27e434d2e6d92e6e3ffb8f941d21e270aae54644e6d1fc2d5c639d975df7e443c4a806dd69bc9a3eb5c4eff97acbdad94bf3517f4e
+DIST photutils-0.3.2.tar.gz 634159 SHA256 a02a0b205c058467f10d1605acfcef8b56695a81005ee2136c64914e55c1b42d SHA512 69c845cee9e16ab9daa26e87bbd209f9159fbba4cbcbae1eea9e84bf4ab75b7723964bde30ecec4004d00a80370ed599d867d8314675700485eb6190c7aa0300 WHIRLPOOL b04611e6a887a5e9d663affc69ad9e7d1058738911b4217ec6cafc4479948d4b7f828042f209b97e1fdcb91712488df09103a18f9a261b9457fdb51f668e3765
+EBUILD photutils-0.3.1.ebuild 1383 SHA256 986c4929f0bf147285732603b75f9886627d65b08cf9f7961ef5238b25aa7510 SHA512 904da8f969feb5a4f076b996130fd69c116a04cf103979eb8b2b2b77aa230acbfd637b47143a444d971be276cbae9d06c30001a1a41102309e040523782e8b2a WHIRLPOOL 55e1b550908248de21a12fd1ebd2a4034e23559ddaf7d9e7603d7e320c9d63134c16a1f16755a8903217a5db3037bb804003a3ef1e5f0233a92249147f63f926
+EBUILD photutils-0.3.2.ebuild 1387 SHA256 a9fb04fcb3c5e167f621f512067d41504d6d249bb070687ad7c324dabcf1fb02 SHA512 c458cd8dd4885e5c58a4965f81e0c64965746d2950c5a76a9342848726d341bf1a65f99533fe42ac3083246f39cbc878f2b20f37d10e88ba289802239d4c588f WHIRLPOOL 4aabc7519435a92a8dde2bfa115b150207462a7e3b0e11c9d10dfb2393c33e807dca69ad8872626be7610625bcbc3eb086cef694fd0043e2c9ae6ff82ee41040
+MISC ChangeLog 669 SHA256 b560c2e53b5a9db673eb7bcadba698ca1a90876bbcfd994e1b143b5e436a4997 SHA512 64c057032704e1d1a655fbb8ae313be9e21f9c7e0dbe2c90022c1fe2fc01cde79864bab41cb591163be0392415d9576ee424296c5e94b7b7284d1f34d2667441 WHIRLPOOL 3f1e06aaf029bafd5a80aff7ee72921a9916bc296254e3b029ab2e9e4f934fe5432eb8bf9cc60341c2d14d32345fb80f76e4c7a8ef139d784eeea77700020361
+MISC metadata.xml 663 SHA256 5649b0df76c87f4eeccf61ac20c176b828c5e6f909829613086241393e71e5f8 SHA512 5347e693578e31b753d8283362241c1bf5932c6dc36e148e858036d9746214af3cd3584ab3108ee1059483d5bcb301bcf78e0469c51c3844b8135299ae4bb4c5 WHIRLPOOL 219bfaf96f344b6cf1a00ff0c141f1ef4e9e3a3c33e97df0c2ae02355b354c81e923615ff9fcf7ac1c507ad0cc2713b65c39917ce7c04233405ba0e8cb133faa
diff --git a/dev-python/photutils/metadata.xml b/dev-python/photutils/metadata.xml
new file mode 100644
index 000000000000..b72b596902ef
--- /dev/null
+++ b/dev-python/photutils/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    photutils is a python package for determining photometric properties
+    of sources in astronomical images. This includes source detection,
+    centroid and shape parameters, and performing photometry.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">photutils</remote-id>
+    <remote-id type="github">astropy/photutils</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/photutils/photutils-0.3.1.ebuild b/dev-python/photutils/photutils-0.3.1.ebuild
new file mode 100644
index 000000000000..f771db8b3779
--- /dev/null
+++ b/dev-python/photutils/photutils-0.3.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Python package for image astronomical photometry"
+HOMEPAGE="https://photutils.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+DOCS=( README.rst )
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scikits_image[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	export MPLCONFIGDIR="${T}"
+	echo "backend: Agg" > "${MPLCONFIGDIR}"/matplotlibrc
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		VARTEXFONTS="${T}"/fonts \
+				   PYTHONPATH="${BUILD_DIR}"/lib \
+				   esetup.py build_sphinx --no-intersphinx
+	fi
+}
+
+python_test() {
+	virtx esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/photutils/photutils-0.3.2.ebuild b/dev-python/photutils/photutils-0.3.2.ebuild
new file mode 100644
index 000000000000..ddecca604492
--- /dev/null
+++ b/dev-python/photutils/photutils-0.3.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Python package for image astronomical photometry"
+HOMEPAGE="https://photutils.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+DOCS=( README.rst )
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scikits_image[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	export MPLCONFIGDIR="${T}"
+	echo "backend: Agg" > "${MPLCONFIGDIR}"/matplotlibrc
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		VARTEXFONTS="${T}"/fonts \
+				   PYTHONPATH="${BUILD_DIR}"/lib \
+				   esetup.py build_sphinx --no-intersphinx
+	fi
+}
+
+python_test() {
+	virtx esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pickleshare/Manifest b/dev-python/pickleshare/Manifest
new file mode 100644
index 000000000000..865d64ab1ac0
--- /dev/null
+++ b/dev-python/pickleshare/Manifest
@@ -0,0 +1,6 @@
+DIST pickleshare-0.7.3.tar.gz 5930 SHA256 b9710d01f777b1bf3b69c8f889b1d05a5145668f79e980cbd0f849e059edd274 SHA512 c49f41b2778783c0de69838db0c916bbfe88eb651134959bf43a18233a4f1747599e51bdbe4b0cc7f7b13c92fc202c2159a0cdd2331b099034afbfe0df61c19d WHIRLPOOL 53b540170c4a72c70743ae9c472a57fda67646a44c5d3f256a72f95b7f97ebbe1f08dcbb5f1c5de0b9ddfe051bdbd1193abd202aae967ec832c635bd33e4d714
+DIST pickleshare-0.7.4.tar.gz 5981 SHA256 84a9257227dfdd6fe1b4be1319096c20eb85ff1e82c7932f36efccfe1b09737b SHA512 6cd4b70f63378c4f668f3428262aeca66a38ec86ef9069e3fbc5e7b0b8d7a06341e99b387f9cf29502decbb47c188b7b2183fe7d249e68914fead7e6628d7154 WHIRLPOOL 97321c95b8838bb7ed8d4a28f0b8d06e6eb5043d3975f6657eb517c3d9dca04eaebf2141949b9bae897a27dd79d608e9602e9646a2e6543a4d6ccd4f533ebe15
+EBUILD pickleshare-0.7.3.ebuild 682 SHA256 a37b5da47af01e416316783794e573be648df11fcf7b5dcb3bf2d12fd50a397c SHA512 5741e7c3a0d1f08b904310c601ea3e3807f7c26028c937d18dcec698ceda1eedc8d7ee8a77b1856b4433e55cc64a9d077a3f55a4f03925225eda4aaed47a82b8 WHIRLPOOL 31245acd3332c722f3fd13594ef259628927febd8e9d66f625ed3c15025f99798285ab16bb48495c0c318ed165373ba89834c6332697b673597bc64cf4d8922f
+EBUILD pickleshare-0.7.4-r1.ebuild 677 SHA256 6e3367c26ef24c21f59138a416f8987e7dab53e9b9cb1fdc9d3ab00f4182c5b8 SHA512 f0d7fd9a8b1283cd63fbf441ae07862c89591b54625f119f6b9dc3b5555a32d61d825698e2a7e1844430c205f9ea4ee78f0ecf8ea8ba64adcd578ed500f4c7b0 WHIRLPOOL b49c7792fe91ac165a7d7271e3b65d4a79a8b60de7c8da6b2f6550d1ef23fd6a2a48b7057eb5eb49bcdf19486373176ae0e16c4c576564dfc1f10f9cfbb7004e
+MISC ChangeLog 2140 SHA256 41c65bc2ea2852636fbb3e852cfd7c1acde6cf945409a52fa2a89eeae19b8505 SHA512 9295a01815c3d09504d0bfa37ceca4398eeed4b18ef4220ad6db80665861229f551335cfdac79d44ef1fbeae19c41a2d354bad04a03229fba20bc4685d7863a4 WHIRLPOOL 6759a0dd99489ac949c5e8f61cdd1be90bf41895141262b90110d0abe24586f29fbcf2d9c870d53eda6dfc3b41bd0c8fbeb3b08a89695abe9931f161ba83a9a9
+MISC metadata.xml 862 SHA256 750ac0f871ec77121647a673d1118daa5ee915e4ffb7a130ca3dd55d00d1fc03 SHA512 0f9d4a8f540699c18af10123696a2ff91002a9af8ad675769fbbe12fb3fdf160077a1932dcc5ddee5427051a6467054220cab958fc32d4c352a46bf9f4d8aa5a WHIRLPOOL 2cb530e894d88e4df36b9bb5d5f3fae718236649ba786a708baa6f98ad6a6a6e52528707c411f8278682820c66869ebe6485db09107dad34339feac8b9c89dab
diff --git a/dev-python/pickleshare/metadata.xml b/dev-python/pickleshare/metadata.xml
new file mode 100644
index 000000000000..5d8abb4a3532
--- /dev/null
+++ b/dev-python/pickleshare/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="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    Like shelve, a PickleShareDB object acts like a normal dictionary.
+    Unlike shelve, many processes can access the database
+    simultaneously. Changing a value in database is immediately visible
+    to other processes accessing the same database.
+    Concurrency is possible because the values are stored in separate
+    files. Hence the "database" is a directory where all files are
+    governed by PickleShare.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">pickleshare</remote-id>
+    <remote-id type="github">pickleshare/pickleshare</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pickleshare/pickleshare-0.7.3.ebuild b/dev-python/pickleshare/pickleshare-0.7.3.ebuild
new file mode 100644
index 000000000000..574dc72ceb90
--- /dev/null
+++ b/dev-python/pickleshare/pickleshare-0.7.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A small 'shelve' like datastore with concurrency support"
+HOMEPAGE="https://github.com/pickleshare/pickleshare"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm64 x86"
+IUSE="test"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/pathlib[${PYTHON_USEDEP}]' python2_7 python3_3)
+	>=dev-python/path-py-6.2[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild b/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
new file mode 100644
index 000000000000..20d4ad5812d1
--- /dev/null
+++ b/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A small 'shelve' like datastore with concurrency support"
+HOMEPAGE="https://github.com/pickleshare/pickleshare"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' 'python2*')
+	>=dev-python/path-py-6.2[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/pid/Manifest b/dev-python/pid/Manifest
new file mode 100644
index 000000000000..310c744ca1b0
--- /dev/null
+++ b/dev-python/pid/Manifest
@@ -0,0 +1,4 @@
+DIST pid-2.1.1.tar.gz 9591 SHA256 b443169d3dc21397695b4a82016fadb4cfdb0ed8b2ddb4aaa428e1701bb34e1f SHA512 5f20338ca902d68a0c4a614b0b8229cd498712bf1750b68fa49037e9e6915c66ad562564d70d7c9308538f4302e90473a5d253dd6366bfa561f6a2248b21a45e WHIRLPOOL 52d3a196fccab813671b71c3f9d719bc741412b9cd76828902513dcf6b8fb2c4f3c0159e1fd43cbda3d39e436247248862ba5a168b710848aa6ce7b8fc26abd7
+EBUILD pid-2.1.1.ebuild 496 SHA256 ae95f3619aecf5951fd24413c6f0dcb344fcd1cf8309722613b5c59a41cdf841 SHA512 61a10fd5da05311693bb71cd89008de229a70ba82793280155105592fd07c13cb736bc1d6baa407eadb938f42b3ec875f3f48eab9035dd75c50ef478113b1b74 WHIRLPOOL d935c08180374117de54c00eaaaf5cba4e0e3d4224772e89a285dfba76379d9996a8f413e2fe11b805431b9b89884c22de6dddeb7d7e838e2c15aedc91399e0b
+MISC ChangeLog 1497 SHA256 a6f7fbb2791fd25142f90a04bde54824b560fe98aad3e1c9b0d98af1507c9475 SHA512 4588f99c481eb0b43f8c8cf1027742372037dde36fca15b1e97a2fbd2e76093737730e577eeadea8de88ebf70c41a56e910a04bff1e2abfb9816cc8ac7dd54c8 WHIRLPOOL 7d43adcbd1cc3a87157e20e5ad3b3b48dac263a065ce4faad99c59a242cf8a22aab95f79137f0dd3bea62204318fdfa6b84fc69fdc32f5918b7da9e8904bb167
+MISC metadata.xml 560 SHA256 d626c5f8fa78f703281a3e565d35a2c5dca6c96fc98d0d9fceddf8999e47659e SHA512 3ca1077fa0948e659fe7673dd885ba306512f75b3706314919de74910482b99c112f4e1cdf2ada3ceff9ebf18bc72dfb46c263ce4da396e1400a6402757c2dcd WHIRLPOOL 5fe48bdfe01d1bffd755f624d9d1ad4d9a0b5165c5f6b73ef8acc03f782d339710994f7aed77aed03da249a79567aa403c5e620771a76b89fb12b8047c8b1f29
diff --git a/dev-python/pid/metadata.xml b/dev-python/pid/metadata.xml
new file mode 100644
index 000000000000..4e998d163a95
--- /dev/null
+++ b/dev-python/pid/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+    <description>Python team can take the package if they wish.</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pid</remote-id>
+    <remote-id type="github">trbs/pid</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pid/pid-2.1.1.ebuild b/dev-python/pid/pid-2.1.1.ebuild
new file mode 100644
index 000000000000..ed4759e413cc
--- /dev/null
+++ b/dev-python/pid/pid-2.1.1.ebuild
@@ -0,0 +1,22 @@
+# 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
+
+DESCRIPTION="Pidfile featuring stale detection and file-locking"
+HOMEPAGE="https://pypi.python.org/pypi/pid https://github.com/trbs/pid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64"
+
+DEPEND="dev-python/nose[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/piddle/Manifest b/dev-python/piddle/Manifest
new file mode 100644
index 000000000000..f8db2ffb41e9
--- /dev/null
+++ b/dev-python/piddle/Manifest
@@ -0,0 +1,5 @@
+DIST piddle-1.0.15.tar.gz 454044 SHA256 84c33ba0d054e6b585005aae3a4a99aa5e0d735798fb015c220c24a548d1364d SHA512 5ab216f67721b47360a6e757bddb268173b7fbe3d1a54dfc6dda0a7c050064f833e24911f16882e98af1d56a6ee840a205aa4d0d2e394a375c7abc98d0074a07 WHIRLPOOL e32f4246c8a6eebc155b93ba96c6c5c437c0dd70817513e9e2c0dea43bb3940935d5282969c3a0076dfe9015761978f039e9dd26f8a2294dac051a009735f375
+EBUILD piddle-1.0.15-r1.ebuild 484 SHA256 d23148bf90880ee6b6c6200d284ef06c6f8264d9c1d3e3ce23f746211d3df6c3 SHA512 996e9b36ab8002501291d01e2d128cd8ff5b5c891f8b3b37ba0055f60bed72474d553b8330890387ce3d1d720abee13296ca8f0614a4b225be5745238b8cb16e WHIRLPOOL 9e2ad16c9e3ef506d4a1c3f7527230246fabb104692838b9a00f73f5f03da4f5c6790fefc0eaa00091adba9e3a1477a56ee84d6e394755987e41d88f4488fa3d
+MISC ChangeLog 2831 SHA256 54f99e5efe98608a614bb214b020b1615afa0f67db8d4ce5e0aa2d04acc0879a SHA512 cb8ae998552d4263b2430c8acaede51efd79a5d80796f4b998a540f54c4aad109e5783ad0cb1b5ed65cc5b439f5308d38ea0422ef3265aa2b27ce5f8f14b054a WHIRLPOOL 61e13c3fd3396bc9e3976b3abb3e1ca8ce10fbbe116073964a83af0c5e053267555f4e933dd7b4ae7b13d78198b1d5e16247c97f29bf099d28ac41686aae6ebe
+MISC ChangeLog-2015 1769 SHA256 c218f7920ea81f4115e02e4cd0d16014df1be6fd1fcea4d80789f5cb274b7005 SHA512 065b71fbbe28e75e8a4130ec156a60f8618859df2e30996aaedf261f4dd494008fce65922f4805ad9d58d94090c959ca8bb358d4e6bca4b5839a768a8f904c9d WHIRLPOOL e50e81758b31fc5f8ae7bd4feb092555dbe42f462cf36b2eb86e5e0fd98a31b9da17c445ab307fa166f7d64875a42b80b7003e53b1351dd06438c838077442c0
+MISC metadata.xml 1880 SHA256 ce12e63d0e6e4a43a1c11369a336dc16665cfca2e0d89456a3b9d16957f92dbd SHA512 cbe13d492470bb2934620f274aac66ad8a6b3aa8d68acf3d929013ca9801427809d57b4cc1a1f09429621ed67fa1a5717d2630f169cc46e2c3224c3e0aa325f9 WHIRLPOOL b6c87194fe11936abe0b7de2e707b9f1cfd2bba6a78841c60bfafe83c8387366c17f4a28b065385a007cce2e33a7fa0afba7848d73a1eb7cebaa5b24cade44a4
diff --git a/dev-python/piddle/metadata.xml b/dev-python/piddle/metadata.xml
new file mode 100644
index 000000000000..dce2e6da3832
--- /dev/null
+++ b/dev-python/piddle/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+PIDDLE is a Python module for creating two-dimensional graphics in a
+manner that is both cross-platform and cross-media; that is, it can
+support screen graphics (e.g. QuickDraw, Windows, Tk) as well as file
+output (PostScript, PDF, GIF, etc.). It makes use of the native 2D
+drawing calls of each backend, for maximum efficiency and quality. It
+works by defining a base class (piddle.Canvas) with methods for all
+supported drawing primitives. A particular drawing context is provided
+in the form of a derived class. PIDDLE applications will be able to
+automatically select an appropriate backend for the user's environment. 
+</longdescription>
+	<longdescription lang="ja">
+PIDDLE�クロスプラットフォーム�クロスメディア�両方�マナー�沿��二次元画�を
+作��る���Python言語モジュール��。��り��れ�ファイル出力(Postscript, PDF, GIF��)���様�スクリーン・グラフィック(例��QuickDraw, TK)をサ�ート���。最大��効果��質�����イティブ2D�画を��ックエンド�呼出��よ��
+���。�れ�原始的�サ�ート�れ��画方法を指�メソッドを���ベース・クラス
+(Paddle.Canvas)を明確��る事�����。特別�ドロー・コンテキスト�派生元クラス�フォーム��供�れ��。PIDDLEアプリケーション�ユーザー環境��切��ックエ
+ンドを自動的��択�る��ょ�。
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">piddle</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/piddle/piddle-1.0.15-r1.ebuild b/dev-python/piddle/piddle-1.0.15-r1.ebuild
new file mode 100644
index 000000000000..33db772726d2
--- /dev/null
+++ b/dev-python/piddle/piddle-1.0.15-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cross-media, cross-platform 2D graphics package"
+HOMEPAGE="http://piddle.sourceforge.net/"
+SRC_URI="mirror://sourceforge/piddle/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ia64 x86"
+IUSE="doc"
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/piexif/Manifest b/dev-python/piexif/Manifest
new file mode 100644
index 000000000000..a4025eb7b338
--- /dev/null
+++ b/dev-python/piexif/Manifest
@@ -0,0 +1,3 @@
+DIST piexif-1.0.12.zip 1005725 SHA256 312e01e2113d0885088cf43704d8c7337fdb0144789a59b05ebaf7b24e6ebb95 SHA512 71de13b30d041c2de2136e9299bea96a0446352815de5358863324743aac6a5e187800214edd209dd212108ce9a0b0b4602aee54dd54f8b058228b255b543c63 WHIRLPOOL 6adc52a4551e55b70338fbba6c350864353bdaa55a10f225d3fde086f5232c4a9725a94db04695fd87b46662a91dba253aa3ccfa342b700a2e2974c0792affcb
+EBUILD piexif-1.0.12.ebuild 567 SHA256 e39d579bce6a82f150f9ac12bfab15c0d9275b58070dc91fda6e32f4fd55b2ac SHA512 79c318b9d1233d26fd2c75622578ba04e21e654e522f4dbb2ba2200c9879aeb60f03f1e567a77754ef16bc0f2d7d22b3fec87315d7828e41753e7c5b3e529e27 WHIRLPOOL b0eb4bd351e06caeb316388d06b5bd8b3b21f6e1cf55fb2464f6b6ee002ba9f4a3a41917e4eb5c3bdc35e75fb79ce64392d1ea60c82c09749c807b8fcde49b3e
+MISC metadata.xml 216 SHA256 31f776a176c082debc988ddf52bdb7105b90e07f6fcad657f6fa21bde377aff8 SHA512 1de1c9f4b223876125a0321126f2d7b1b564a113d24ae86b380c4d67bdf58ed4f2ae1a1f5d686211ccf4851eea8e970c20109977abbc79d0cd855164b6474e23 WHIRLPOOL 1a6bba154e326af8b8e97789169b18cd09a434b1dd7193d33e53913966be459db5c622bb1662b19c5f15ea9898e286fef44ce52d7e259f11048894aac15f0b55
diff --git a/dev-python/piexif/metadata.xml b/dev-python/piexif/metadata.xml
new file mode 100644
index 000000000000..82b7b7953794
--- /dev/null
+++ b/dev-python/piexif/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/piexif/piexif-1.0.12.ebuild b/dev-python/piexif/piexif-1.0.12.ebuild
new file mode 100644
index 000000000000..a78227b94958
--- /dev/null
+++ b/dev-python/piexif/piexif-1.0.12.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Exif manipulation with pure Python"
+HOMEPAGE="https://github.com/hMatoba/Piexif
+	https://pypi.python.org/pypi/piexif"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	app-arch/unzip
+	test? ( dev-python/pillow )"
+
+python_test() {
+	"${PYTHON}" setup.py test
+}
diff --git a/dev-python/pika-pool/Manifest b/dev-python/pika-pool/Manifest
new file mode 100644
index 000000000000..4f01000fa5d6
--- /dev/null
+++ b/dev-python/pika-pool/Manifest
@@ -0,0 +1,4 @@
+DIST pika-pool-0.1.3.tar.gz 4722 SHA256 f3985888cc2788cdbd293a68a8b5702a9c955db6f7b8b551aeac91e7f32da397 SHA512 2065e4068310cbf0ac27e3fd242a025a1a174d7faa940cc1eb07b5eb7b7313da2b11456b056fe90520c7a39cec679ee06e38fa3327a6a50548200254d376a62e WHIRLPOOL 35887e2b7ebed7bf10444f389e101343afd36cbc0fb0e30cbce9126f340d146ab2560431e9d9781c7f7eb5eb489bc2e6ceb6b1fc009520c86f77b255de34c844
+EBUILD pika-pool-0.1.3.ebuild 528 SHA256 bc575ce4835392a17743c4315ab8e7420b8b4d724295355f80e1bf020941ef56 SHA512 b3f7626eb7c817d207ca74b24945b87e729bee168fcdd9e4b9fdc034dc7580a56dc70ec7a7f690e9800a3c49109784a160332cfcd012bae2a3da4b10616588d4 WHIRLPOOL 374d0f6d1c3fea4f5d0b255177082a78258b3a5dacb6b5f49623a3b69489326a6229cf22f7a490fe981c9ed9393e1ece6c370ed7f8bbf4510bb5ca45adf51168
+MISC ChangeLog 616 SHA256 6e6e06847680263091954ae08bd60af734897d1596047e1f0af1621fa7e2befb SHA512 bde1420c0d9aca900051992ba548ae5973f039e5d014a754e771d0e3176a6cd30fe2c98ee73f5e2cca75e8ecb90a2cd3a94f6bc4c15f40451eae25090ebe3604 WHIRLPOOL 70d2fcb0a5b42de582ece21589713e7f14848931b48f203dbb63c8ad46d032d73ef7344cc7f34ffa288ed299f1e7461fe9f872d23e3e769185eb7fb7bc648401
+MISC metadata.xml 461 SHA256 14bf6c5295667d009d83e29e4e568a87bd86c0bb03b321442556b2b4ac172730 SHA512 6b55d28c9a908dd3fdfb61145086ea970ac733b97472faed403f3118c7586437c2635095b53378f30b5e3739ac1c317f891dc716cf336be70bc221971e180b8d WHIRLPOOL f6d845832319b99f5824c1a09079e53e7095814f50b8497387f35f5950dff5bffc49cf6a0ae5bcacd0412536bf2ee012d454bfd6f7534faea425be1b99be7aae
diff --git a/dev-python/pika-pool/metadata.xml b/dev-python/pika-pool/metadata.xml
new file mode 100644
index 000000000000..1b92d08f4859
--- /dev/null
+++ b/dev-python/pika-pool/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		A connection pool for pika.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">bninja/pika-pool</remote-id>
+		<remote-id type="pypi">pika-pool</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pika-pool/pika-pool-0.1.3.ebuild b/dev-python/pika-pool/pika-pool-0.1.3.ebuild
new file mode 100644
index 000000000000..9eaee5cac093
--- /dev/null
+++ b/dev-python/pika-pool/pika-pool-0.1.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A connection pool for pika."
+HOMEPAGE="https://github.com/bninja/pika-pool"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/pika-0.9[${PYTHON_USEDEP}]
+	<dev-python/pika-0.11[${PYTHON_USEDEP}]"
diff --git a/dev-python/pika/Manifest b/dev-python/pika/Manifest
new file mode 100644
index 000000000000..cd841aba6ce6
--- /dev/null
+++ b/dev-python/pika/Manifest
@@ -0,0 +1,5 @@
+DIST pika-0.10.0.tar.gz 82642 SHA256 7277b4d12a99efa4058782614d84138983f9f89d690bdfcea66290d810806459 SHA512 8a6e8b870aa36f141a24d4886cd8e4d4fb5cb735d87857a16ad963d7a14e0c40e81a3c7e193d879046a7e76fa87ab0b16bfd4a000e169e2452815fcd04db93eb WHIRLPOOL 390a5c31eb2dd7aae183ffbb6a82706c3ecfd6366bf3986adc3455627ac9dcbfb1dd78e057aee05f31f8770ceeb764af885db689b54e22bfabb9f925fdff3d60
+EBUILD pika-0.10.0.ebuild 491 SHA256 1edbf3493a868a6b214745274d25e4971bcc38b660c10e8d0f36230ccde9e90e SHA512 39bf8736acb04bf5aab957ffc0f38bdaf6735816a9749a512f4062479ecad8c20f11c44bb8e24e2e32a8be2916e11d6bb3c659b6be55652c5ee0a0de30fb0ffa WHIRLPOOL ed8930f9d24f053d3c2cfc9be2235deda4667ef717eae6d969f75586e648443b21c717ba9d443788087cea53c51b481a7eb646daa0c8ccb0a9bd84ccaeb7085d
+MISC ChangeLog 3089 SHA256 0db3e5efbe1b6900c85b412fda615186c4311479210c16d8f4c01b36f2ff2975 SHA512 539f71fb4508f284597900c6b0a68b7df9c6b8aecc88a19e7c2dfab2429b04a87a487f9f582aa5d77b5fdd3c2c9668307792ffacba3f60265d653348f69e5bdc WHIRLPOOL 37285568c0977d12d0baf361148869e10228e45f6b229c0ea4ddfbf65aa4dfebddef19acd91d909178edbdc15ccc38f096bde9f07ab4df417cf0099d143087d9
+MISC ChangeLog-2015 566 SHA256 554a45f35197ac45d8e406a63fadd828f3431d65b2735b15fd91d8094e61c5c9 SHA512 6dcf2e9ea5fd66cadacf40f17bcf28b1e587a53176f72f1524b1529a81e021ada954c90bcc4ec3051629ff181e1997a35df7c9bbb0e02622328c730649d3fa4a WHIRLPOOL a4354618d81eb87e7ee600e62c79c30dd152dae6e2a2ec1b0cf5e3682f9617c5f53b417530e342a7d8b2f6e694cf27849fa68a19a476e532815dc7b2a84cbd6a
+MISC metadata.xml 654 SHA256 400aed73b0ae798fdd0ac66e02d06afdc36a5f3ae2d087e4d0d2ce20a28ce4f1 SHA512 dfaf85260ba3acb2c471870c6674d5ac647111168a77f09bde9419831f2a18acb297ef1590b7c944a242bce3deb29aa5dc149e691424d85eafd6f4b678aa2289 WHIRLPOOL dc4bfbc97a70358b7fadb962356cda304362d290a70475ceadf90552d2f20b60ce499477371459e722c0b7765523634265f937f12a9f11a38be00806559c5ea5
diff --git a/dev-python/pika/metadata.xml b/dev-python/pika/metadata.xml
new file mode 100644
index 000000000000..365e52414d5a
--- /dev/null
+++ b/dev-python/pika/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>Pika is a pure-Python implementation of the AMQP 0-9-1 protocol that tries to stay fairly independent of the underlying network support library. Pika was developed primarily for use with RabbitMQ, but should also work with other AMQP 0-9-1 brokers.</longdescription>
+  <upstream>
+    <remote-id type="pypi">pika</remote-id>
+    <remote-id type="github">pika/pika</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pika/pika-0.10.0.ebuild b/dev-python/pika/pika-0.10.0.ebuild
new file mode 100644
index 000000000000..8b4d6dc39c46
--- /dev/null
+++ b/dev-python/pika/pika-0.10.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python implementation of the AMQP"
+HOMEPAGE="https://pika.readthedocs.org/ https://github.com/pika/pika"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
new file mode 100644
index 000000000000..210298c96b41
--- /dev/null
+++ b/dev-python/pillow/Manifest
@@ -0,0 +1,9 @@
+AUX pillow-3.4.2-no-scripts.patch 411 SHA256 597223119626ccd36a0427df401ab9e2ff330099afc307162ddf58f62be07f46 SHA512 51ac7df4e9c6b76bbaf20e243cb171f9d824c94e183f4bbe5047c6932efe6913527a0a4d328266a8984d51d07aaa18cbdbb98de92dc8f027a3d392d0355cdd70 WHIRLPOOL 1863f9eeca9470a072d4cdab1c7c8eab8de242f35fdaeafce469df71b417cc8ae2e9d9122450d6283d9e749d429c53b393f789ce11f4ba7bfedbde44609cb931
+DIST Pillow-3.4.2.zip 11042238 SHA256 85b237840ad8b30a1572bf9e3898a26c77910a56554d73ed4f58a42197c2e4c2 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39 WHIRLPOOL f92d4320ca5fd3e004a2ace41d14f0816dbea6fcfc9b10739a59d2dd393725a47c28f5b9f643d0b3243b9003701094ee953b38118412647155e8ba13fafe0582
+DIST Pillow-4.2.1.tar.gz 12673417 SHA256 c724f65870e545316f9e82e4c6d608ab5aa9dd82d5185e5b2e72119378740073 SHA512 8a1c691f067c1127b941a94ae991c728c94eab876fe2a511ed0ad8af9702d4969325bd565b11e656ffefe867bf385725a5c14e3c28f8945730fa21986f934f69 WHIRLPOOL af93b67a60843d9f853921d5dd1332209cefc87a9680201cca5010f935527abcacac57e9d2afeac6bd3ccf8ab6636ffc2321e0888b73babfdb9ff0a933a77951
+EBUILD pillow-3.4.2-r1.ebuild 2501 SHA256 7e2cc471d164b3fc8bb238eba6aec9644b60d2288158c6c16766e6fb5b8ad6ee SHA512 73e98674e3faef57e55fd5ea3703ec5de7a6c20e1d359ea13582629c6af07cb3f051d60d3313c6661faa1a76ce194e680b1d4324313015a618813953b8e38c39 WHIRLPOOL 71fef3416f125a3e4cd74d137e0238c304fe8389f9b430e997687ea3999366871662fbd72e2e16a4dfc9f70cca8753d4965098e4170a030a6f48b6b25e5bf140
+EBUILD pillow-4.2.1-r1.ebuild 1976 SHA256 20797c58b3cc00e9f919e2a4f026968d253deeba30e9b1f6e317526096790af4 SHA512 c4a27b1010ddc01e12ddb04f65cc69c164ff4ea58be7901caf85d19dba279dc9d1a36d33b6a43a5b1c86cca805c665a6ed38e7726f5f2f143d6f0331b8af97d4 WHIRLPOOL 1c443259ae0a59975bfc0edd376964dff417affd46ac15a11fd24390dc7613021e9d2ce84543a54e7044a557aa77e492b8bb5e097d497e458269a6b81b872766
+EBUILD pillow-4.2.1.ebuild 1989 SHA256 ce2c4034da7fff485477f337c46237805cb12a6b228ecf01d2fafad4126f10ef SHA512 36be85c1eec1ed794332847c279107f2f6f8d1d44b3f78d1c9b1555cf165e64cbf31f4338fa495f9b7cd7488de8ec4d3551112a1e1fd8d4b01276366f95df733 WHIRLPOOL 5405019de1a4627f2c36b16bb5d8eb33e93c3949e3bb2def6829ba6a0b9b90d152a7d4926f678a9e73239ff7a4ad6b015ade77733cccafbd7f0a66e0ac9b72f4
+MISC ChangeLog 11134 SHA256 59cebb3fd3d3d36e347a01a92f22824998406266e856d17f959cb6326b47fdcd SHA512 9e0f14954055628779deebf09171c4c28eb4384128d72e525888389e347e498929da9f36be7a5da5816244899e1a3f841742295973227fd1e5c138d2e7ee9e9f WHIRLPOOL 4e1daf48638a419d0e168b6c5c1ce0ebf3c724a2786d41cc0b79f376cda6e122663c0b0e8ab188d9188cde20d1e269101184da201dabdc6ec885f1ab4188d15e
+MISC ChangeLog-2015 8100 SHA256 e35d62d80a480830916fc6661fc0b2f63d96ce6092ae7a440a88e4a388e03b8b SHA512 3508c7477f1ffcf8497a41c5b316dd1d2f4b98a51a01d09da6263c998320e9e8077073f5ff7d9cb2626a254f5d97c334fdeeb24443cb7e95967a845489c3115d WHIRLPOOL 56c7be042a7f508b1b6c168673d0dbe8deda2c3febad678301fb9db0ea911e627ac8855240e99d96778d4308c7da9f2433dba96f6d5c4ee1d85ac5747bade472
+MISC metadata.xml 538 SHA256 43641f5debac619035cc1382ffb1f09ccbae80556a4b576d9fe3bb620ae90208 SHA512 ad0b456ee31c3b1be536d665158886d788b3abd78f6900d944f7a98ee9a3b90abe410f2d2b03d5e343b335e7c5d88a74209a13482f9af244fda18bba28facab3 WHIRLPOOL 6cb936f3faefa89ae91729dbef9393acad13c5cb524c89f56e182f99bd7b4bea221cb779b069bf45177cb2c59f5e8f5464d77caae8d26c4dc95a5982afd8d4dc
diff --git a/dev-python/pillow/files/pillow-3.4.2-no-scripts.patch b/dev-python/pillow/files/pillow-3.4.2-no-scripts.patch
new file mode 100644
index 000000000000..a8aa0ecc0d0f
--- /dev/null
+++ b/dev-python/pillow/files/pillow-3.4.2-no-scripts.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.py b/setup.py
+index 5257e748..410ce788 100644
+--- a/setup.py
++++ b/setup.py
+@@ -746,7 +746,6 @@ setup(name=NAME,
+       ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
+       include_package_data=True,
+       packages=find_packages(),
+-      scripts=glob.glob("Scripts/*.py"),
+       test_suite='nose.collector',
+       keywords=["Imaging", ],
+       license='Standard PIL License',
diff --git a/dev-python/pillow/metadata.xml b/dev-python/pillow/metadata.xml
new file mode 100644
index 000000000000..d641c40047bf
--- /dev/null
+++ b/dev-python/pillow/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <use>
+    <flag name="ole">Add support for OLE2 image format</flag>
+    <flag name="imagequant">Build with Image Quantization Library support</flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">Pillow</remote-id>
+    <remote-id type="github">pillow-dev/pillow</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pillow/pillow-3.4.2-r1.ebuild b/dev-python/pillow/pillow-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..febde5742856
--- /dev/null
+++ b/dev-python/pillow/pillow-3.4.2-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 eutils virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://github.com/python-imaging/Pillow https://pypi.python.org/pypi/Pillow"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib"
+
+REQUIRED_USE="test? ( jpeg tiff )"
+
+RDEPEND="
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0= )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-better-theme[${PYTHON_USEDEP}]
+		>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx_rtd_theme-0.2[${PYTHON_USEDEP}]
+	)
+	test? (	dev-python/nose[${PYTHON_USEDEP}] )
+	"
+
+S="${WORKDIR}/${MY_P}"
+
+# See _render and _clean in Tests/test_imagefont.py
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}/pillow-3.4.2-no-scripts.patch"
+)
+
+python_prepare_all() {
+	# Disable all the stuff we don't want.
+	local f
+	for f in jpeg lcms tiff tk webp zlib; do
+		if ! use ${f}; then
+			sed -i -e "s:feature.${f} =:& None #:" setup.py || die
+		fi
+	done
+	if ! use truetype; then
+		sed -i -e 's:feature.freetype =:& None #:' setup.py || die
+	fi
+	if ! use jpeg2k; then
+		sed -i -e 's:feature.jpeg2000 =:& None #:' setup.py || die
+	fi
+
+	sed \
+		-e "/required/s:=.*:= set():g" \
+		-e "/if f in/s:'jpeg', 'libz'::g" \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+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/{Imaging.h,ImPlatform.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-4.2.1-r1.ebuild b/dev-python/pillow/pillow-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..1621cc8edf34
--- /dev/null
+++ b/dev-python/pillow/pillow-4.2.1-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 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 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples imagequant jpeg jpeg2k lcms 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= )
+	tiff? ( media-libs/tiff:0=[jpeg?] )
+	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}] )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	# raqm not in portage yet
+	distutils-r1_src_compile \
+		--disable-raqm \
+		$(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-4.2.1.ebuild b/dev-python/pillow/pillow-4.2.1.ebuild
new file mode 100644
index 000000000000..a22b7b1fd8b9
--- /dev/null
+++ b/dev-python/pillow/pillow-4.2.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 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 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples imagequant jpeg jpeg2k ole lcms test tiff tk truetype webp zlib"
+
+REQUIRED_USE="test? ( jpeg tiff )"
+
+RDEPEND="
+	imagequant? ( media-gfx/libimagequant:0 )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	ole? ( dev-python/olefile[${PYTHON_USEDEP}] )
+	tiff? ( media-libs/tiff:0=[jpeg?] )
+	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}] )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	# raqm not in portage yet
+	distutils-r1_src_compile \
+		--disable-raqm \
+		$(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/pillowfight/Manifest b/dev-python/pillowfight/Manifest
new file mode 100644
index 000000000000..751ceade036c
--- /dev/null
+++ b/dev-python/pillowfight/Manifest
@@ -0,0 +1,4 @@
+DIST pillowfight-0.2.tar.gz 2628 SHA256 15bce1925a3d66940ceb9a33c3c55de8d95462ce136c4d46e8673f2919b401d6 SHA512 2eff2fd0bdf5c02513ddb4838675e7b9f392135ff08a784ca2fedf06c5b96a56af75460559066cc6cded65f3d4da087ac679492b7b1dba23fb557e6ac3565e6e WHIRLPOOL 691e985dd6e8da23d117f1a826a99c1cf80fbe01e4e82be10b1cac1277be292ffb4be233e31c7ea4daf98c1c28af1be7d28a5f43e8535c176b15c7cb180f0e10
+EBUILD pillowfight-0.2.ebuild 546 SHA256 805447145deebc05c176ebbe63c14d0ba7708d58d327094cf39394f89ee25f6e SHA512 b684c366b67591b89a7ed7f061aaa894708624d9cca7a453a4c7c8ed3099a04b096a44ad6b524adb9a46428f2b31083b71ee87f651483d42d1a2ac3378677f2a WHIRLPOOL 220db14c17e77243d049bb05b84e7df1bf4f0e9a5aba0561c373a167b6821d340d1e4e78b827cef1d48f6642fd8b3f799f823fd0752fb7624bcf938c12bf1cf4
+MISC ChangeLog 1431 SHA256 8d6d7854dc0c9ae7ac5704cbed25a773b2779d15f42db764d82674327e3e95b9 SHA512 03ffe74235540bad63034381e7e8cd156d92d84ca847892ba58119f82b06f7ff676c47212025c7c9d56ab23c6721d3497586bbac0bd0b4dd3137edf79e30b7c6 WHIRLPOOL e39e073be3ade6524e4a21422bac4e099af29249a78727ecfecb2f6d87e67b6ebad4349d19311261d5306dfed919b6a1f7c13ff6aa3dc7583a9cc514569d1408
+MISC metadata.xml 388 SHA256 957977e34a9e69610219f99d11ad34dd22cd943ad1d39fc97f7f78dcd5dd49c1 SHA512 63a6f23df5433c9c251cb2ef9d4a2f88a1eeaf390b88b74ed8e80468b81de9537fdcbfa9d8a62109167900ed72cd503de495283d84e1b5fd22892538e2723950 WHIRLPOOL 128f9be6f2f086c18a7777fe7a263a0ccd949a85de4b87d959c9590c3e52c633fd6fb7867546b40c08b09ecf53037fa7202e939a141e87d4b42290836f5da797
diff --git a/dev-python/pillowfight/metadata.xml b/dev-python/pillowfight/metadata.xml
new file mode 100644
index 000000000000..0916aa813f42
--- /dev/null
+++ b/dev-python/pillowfight/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">beanbaginc/pillowfight</remote-id>
+    <remote-id type="pypi">pillowfight</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pillowfight/pillowfight-0.2.ebuild b/dev-python/pillowfight/pillowfight-0.2.ebuild
new file mode 100644
index 000000000000..8ecb6623d6ba
--- /dev/null
+++ b/dev-python/pillowfight/pillowfight-0.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Eases the transition from PIL to Pillow"
+HOMEPAGE="https://pypi.python.org/pypi/pillowfight/ https://github.com/beanbaginc/pillowfight"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
new file mode 100644
index 000000000000..df2545285c4f
--- /dev/null
+++ b/dev-python/pip/Manifest
@@ -0,0 +1,13 @@
+AUX pip-6.0.2-disable-version-check.patch 465 SHA256 4e8de45f65f0255615949fd10e168a8a46fbb7f301699145f6c774bf3cb9b1a1 SHA512 fd3413fea4649aa6a34ff7a23e7442267dc07307aeb25398e4620d108ab144703db7431e2a158612d9ee67e448d1d66db7e8103364aa6635844672bea16c7d28 WHIRLPOOL c5d6b94c777d988c4a91bcf0a7c4f10183cf5d9a0467a386c5df446ebf659b0b7c86404da844e578691fbdc75106fe8e8adb572eeb1d7ce53cb15d5602a146e4
+AUX pip-7.1.2-unbundle.patch 1496 SHA256 8d74c370ba7b313843e2eec7e23e738c4133cf17660938a74b687144725f8f5c SHA512 c0daf49d9a596a188fd54751b8ee7333f1c3187657b677a6f61ab9820483b388c3475b5fecb887115aaa34208070a15b56a8eb5e0a4639c3732840cf17a6f16a WHIRLPOOL 8e9065a1d2a621877756a05a131a6c413818eba3c7a2ca229b61491e0ecf591027cc719c89ea4131797b07e781f915ee92d55d6e2e7e48478f1f67493e3269b1
+AUX pip-8.0.0-unbundle.patch 1985 SHA256 dc71b17d6519f96f7fc5e7337a6e1bd4649f8bc90b82287caac570419c33ec07 SHA512 3b5f96160623eb2fad9c5978fc6512b21d48d5b91cb09c9d43deaee6de3c843af137a5df11c83b0d8395625482162d8cf40748b072692b305d6ab1220f3fb0c6 WHIRLPOOL c4463811dc2bac1ca3b4ef24e03cce650fb8603826a637d40917023adc9d35bc55c06f6e20165c92bf7d0f4731d1ee8a996f46570227a864fb0f635feaaee960
+AUX pip-9.0.1-disable-version-check.patch 1031 SHA256 52af2bf2c60498bf90555cf260318d4995a8bd23ffec9ae8e136a83a8c664b8c SHA512 8b5764d3ecdbfc871bdf051b41d9610d5028bc3b95a4bf990db46325d10e5d559449ec97ab052686148d6ab6abfa630fb38101c726b6648d19fa94ac593b0a28 WHIRLPOOL edada578418d7ea8b30161a0bdc12343465932c9f645a20bc2343baa25d807a6ed484a8fe154187ba4b07ce740eeca6939f1ef89c30d6fe681ba733d24a530f1
+AUX pip-disable-system-install.patch 1070 SHA256 c7099b61b806019a9fc4ce946fcce066f85f8a08fc4c090f745506627a9e7ced SHA512 bb0a9a32b2eac0a12276c3f0527534226c03868300f54945d20eec16902ad51cbfdace9d79b0caa304bc641323194031a5ca9e5e784366a44527441bd0f3c231 WHIRLPOOL d43b4f2027bdad7585a9c633f868767f1c673375db2635711dfe019847422d2740b8d41e5a11091548f35c9ca67a9c390168b9b3da0e3fc3190577f4eb62a064
+DIST pip-7.1.2.tar.gz 1049170 SHA256 ca047986f0528cfa975a14fb9f7f106271d4e0c3fe1ddced6c1db2e7ae57a477 SHA512 78082afe6b559bf87f91ae9b6d304cfbfce00206e09be42fdae9d449a55cd8d968df6873e834191d0b0e6baae29e72eb3eee42386ff7c5dc9c29b6c28b754449 WHIRLPOOL 953fdc9104f3ac34c9104ec93948f58c4b0e193f18da60d3247d801c283c574490f8b91146e4278888c0b920090f537095c1a1693ca352d062dd98473390fdc9
+DIST pip-9.0.1.tar.gz 1197370 SHA256 09f243e1a7b461f654c26a725fa373211bb7ff17a9300058b205c61658ca940d SHA512 ee59efb4b009ff6543b7afdea99b9cbbee1981ecc03af586acda76674024d3b66dab23049e68f3da9448734984619fc1eaba6e965c9dd3d731973376c8a42e25 WHIRLPOOL c97a5e9d03943437873d3a49166c28bccf3e0d1f9efe8f500a730607bffcfc26184a6785f1ee55b6867bc4dbd0e77334da7dcf22bd6ba9ae26949c76b6a1c734
+EBUILD pip-7.1.2.ebuild 1958 SHA256 7cfc76f156ea815ecea0de250b0a7be95c9a585c12f96ffe60a6474332744d87 SHA512 b249ca4a90242f55660da9b63e2bebf706b3a2abf0947b5906ae1e3d39b5a083114ae22965fb62a95a64faff8058c1ab16afdb0145ed534917a570fa11008742 WHIRLPOOL d72688809da684e481efcaca2ccbd8ac3c3fbd9b2e00cc0913d0aef10d8f456291b1cfa03cd152773bc55a2bfdb6a5cf904edb4a4be744cfed39589e1d08f2f4
+EBUILD pip-9.0.1-r1.ebuild 2328 SHA256 a703b4ea227da4471e184ad6e10388f34fbb0aecefd4f38a2c1fd39f2b635ebe SHA512 064170d1b0adb1d4032b603b20dab7b5ef5c33a44381fa2e5c4d9c7c01a0db51d6b3cf1bbef7ecbb3979aa00c5a25be5504b26629c565578688fa0faa8618436 WHIRLPOOL 95d1049b174b3fbeb3c3db7d5e5e329ba37a9f6c5ed45d244a7d0a81bc160e6de30bff59d9db44b52e2e7d4fba77ea456213903290e4305f527cae8a579982c7
+EBUILD pip-9.0.1-r2.ebuild 2463 SHA256 51a0cd6fb52a32ef315f2ed41beac4c883541aad264797f52daa1f0d5e38fcc6 SHA512 698eb01a7a1bdfc634a754f009bace1b08f7ee298d598fc0655991632770287d6223a69baa4f008f3d1c3afc1c451894b146e98f08b72ea13677e01f43ece050 WHIRLPOOL 96f192fdc285d373fd94cda2f7c736e4844e06144237785ae0c4a612e58fafc99665488bb3bea062eea7ae47d07898c40101f795066a993702a1800ca8f4deb5
+MISC ChangeLog 11200 SHA256 91fe2e231e7c376bd5ecf446535690774906b58ca206551bcbf2f3ad71088379 SHA512 951166bd271ccb88da6cc0eb0afa05a8eb7b4054ae4fead88715169ccd40048baf7f8af0284e258954e25f49c51837f506850dd086205297996f252dcec99ffc WHIRLPOOL bf985861f04fcd8aa33ed5ba18cbdd1780ae0fd0a63cf0586ebcaaca5e5e7c924ca209394ee0bfec8fa880cdc94256233f0cb3c6e33d53dcef155cc39b21607c
+MISC ChangeLog-2015 8278 SHA256 701685d86a23007d98563f63af64779ebf3c22f4908fcaf8f01715b75dc4ea6e SHA512 27483f01076204c58400635cb61cdb6d24c642bfd3f24bc163b1f64705bda093ae964cf82304a6f92d0c3be30fecccebabe9230ade7b6530a463267271238845 WHIRLPOOL 2763c63a7f6c9c1a2145d3249cd45783a7d3fbf5acf5091013d0eaaf852b8268a486794c02a37620786fc706efd72156b33421648f5e4f70b4b8d217666387e0
+MISC metadata.xml 366 SHA256 7724844eefe00bd38d84325394c6678d5d22dfe764a098b6d6c229f0f20546b9 SHA512 43ccb12f2797cb70b59ff495d149c32c813e5145c65521eda9a86f675eac7756eefadeb9f4ca977e8e8c7019bae144b445240e6d7128da771eaf6d19559336f6 WHIRLPOOL c93513f7503b46162ce3c5f5b613019d4c36a262312539519c605fa40cac99263ec4291fc162d363d15299ebb8df94c902ab422e13a62dc4f7b913270b5e6b80
diff --git a/dev-python/pip/files/pip-6.0.2-disable-version-check.patch b/dev-python/pip/files/pip-6.0.2-disable-version-check.patch
new file mode 100644
index 000000000000..a192c228a997
--- /dev/null
+++ b/dev-python/pip/files/pip-6.0.2-disable-version-check.patch
@@ -0,0 +1,14 @@
+Don't check PyPI for new versions of pip by default, updates will occur when
+new releases are added to the tree.
+
+--- pip-6.0.2/pip/cmdoptions.py
++++ pip-6.0.2/pip/cmdoptions.py
+@@ -404,7 +404,7 @@
+     "--disable-pip-version-check",
+     dest="disable_pip_version_check",
+     action="store_true",
+-    default=False,
++    default=True,
+     help="Don't periodically check PyPI to determine whether a new version "
+          "of pip is available for download.")
+ 
diff --git a/dev-python/pip/files/pip-7.1.2-unbundle.patch b/dev-python/pip/files/pip-7.1.2-unbundle.patch
new file mode 100644
index 000000000000..70adc20ead53
--- /dev/null
+++ b/dev-python/pip/files/pip-7.1.2-unbundle.patch
@@ -0,0 +1,34 @@
+ pip/_vendor/__init__.py | 13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/pip/_vendor/__init__.py b/pip/_vendor/__init__.py
+index ef8851d..349d022 100644
+--- a/pip/_vendor/__init__.py
++++ b/pip/_vendor/__init__.py
+@@ -14,7 +14,7 @@ import sys
+ # Downstream redistributors which have debundled our dependencies should also
+ # patch this value to be true. This will trigger the additional patching
+ # to cause things like "six" to be available as pip.
+-DEBUNDLED = False
++DEBUNDLED = True
+ 
+ # By default, look in this directory for a bunch of .whl files which we will
+ # add to the beginning of sys.path before attempting to import anything. This
+@@ -29,13 +29,10 @@ WHEEL_DIR = os.path.abspath(os.path.dirname(__file__))
+ def vendored(modulename):
+     vendored_name = "{0}.{1}".format(__name__, modulename)
+ 
+-    try:
+-        __import__(vendored_name, globals(), locals(), level=0)
+-    except ImportError:
+-        __import__(modulename, globals(), locals(), level=0)
+-        sys.modules[vendored_name] = sys.modules[modulename]
+-        base, head = vendored_name.rsplit(".", 1)
+-        setattr(sys.modules[base], head, sys.modules[modulename])
++    __import__(modulename, globals(), locals(), level=0)
++    sys.modules[vendored_name] = sys.modules[modulename]
++    base, head = vendored_name.rsplit(".", 1)
++    setattr(sys.modules[base], head, sys.modules[modulename])
+ 
+ 
+ # If we're operating in a debundled setup, then we want to go ahead and trigger
diff --git a/dev-python/pip/files/pip-8.0.0-unbundle.patch b/dev-python/pip/files/pip-8.0.0-unbundle.patch
new file mode 100644
index 000000000000..d508d51ab4fc
--- /dev/null
+++ b/dev-python/pip/files/pip-8.0.0-unbundle.patch
@@ -0,0 +1,43 @@
+ pip/_vendor/__init__.py | 15 +++++----------
+ 1 file changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/pip/_vendor/__init__.py b/pip/_vendor/__init__.py
+index b09a7c3..b9fe6ee 100644
+--- a/pip/_vendor/__init__.py
++++ b/pip/_vendor/__init__.py
+@@ -14,7 +14,7 @@ import sys
+ # Downstream redistributors which have debundled our dependencies should also
+ # patch this value to be true. This will trigger the additional patching
+ # to cause things like "six" to be available as pip.
+-DEBUNDLED = False
++DEBUNDLED = True
+ 
+ # By default, look in this directory for a bunch of .whl files which we will
+ # add to the beginning of sys.path before attempting to import anything. This
+@@ -29,13 +29,10 @@ WHEEL_DIR = os.path.abspath(os.path.dirname(__file__))
+ def vendored(modulename):
+     vendored_name = "{0}.{1}".format(__name__, modulename)
+ 
+-    try:
+-        __import__(vendored_name, globals(), locals(), level=0)
+-    except ImportError:
+-        __import__(modulename, globals(), locals(), level=0)
+-        sys.modules[vendored_name] = sys.modules[modulename]
+-        base, head = vendored_name.rsplit(".", 1)
+-        setattr(sys.modules[base], head, sys.modules[modulename])
++    __import__(modulename, globals(), locals(), level=0)
++    sys.modules[vendored_name] = sys.modules[modulename]
++    base, head = vendored_name.rsplit(".", 1)
++    setattr(sys.modules[base], head, sys.modules[modulename])
+ 
+ 
+ # If we're operating in a debundled setup, then we want to go ahead and trigger
+@@ -85,8 +82,6 @@ if DEBUNDLED:
+     vendored("requests.packages.urllib3.packages.ordered_dict")
+     vendored("requests.packages.urllib3.packages.six")
+     vendored("requests.packages.urllib3.packages.ssl_match_hostname")
+-    vendored("requests.packages.urllib3.packages.ssl_match_hostname."
+-             "_implementation")
+     vendored("requests.packages.urllib3.poolmanager")
+     vendored("requests.packages.urllib3.request")
+     vendored("requests.packages.urllib3.response")
diff --git a/dev-python/pip/files/pip-9.0.1-disable-version-check.patch b/dev-python/pip/files/pip-9.0.1-disable-version-check.patch
new file mode 100644
index 000000000000..7334380c1e1d
--- /dev/null
+++ b/dev-python/pip/files/pip-9.0.1-disable-version-check.patch
@@ -0,0 +1,32 @@
+From 890a1c26018752f2c57c7800968e4b8d1e0987f9 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 20 Nov 2016 19:52:40 +0100
+Subject: [PATCH] Stop checking for new versions
+
+---
+ pip/basecommand.py | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/pip/basecommand.py b/pip/basecommand.py
+index 54c6706..3cffe86 100644
+--- a/pip/basecommand.py
++++ b/pip/basecommand.py
+@@ -241,15 +241,6 @@ class Command(object):
+             logger.critical('Exception:', exc_info=True)
+ 
+             return UNKNOWN_ERROR
+-        finally:
+-            # Check if we're using the latest version of pip available
+-            if (not options.disable_pip_version_check and not
+-                    getattr(options, "no_index", False)):
+-                with self._build_session(
+-                        options,
+-                        retries=0,
+-                        timeout=min(5, options.timeout)) as session:
+-                    pip_version_check(session)
+ 
+         return SUCCESS
+ 
+-- 
+2.10.2
+
diff --git a/dev-python/pip/files/pip-disable-system-install.patch b/dev-python/pip/files/pip-disable-system-install.patch
new file mode 100644
index 000000000000..9e572454315e
--- /dev/null
+++ b/dev-python/pip/files/pip-disable-system-install.patch
@@ -0,0 +1,29 @@
+From 847553da616edabede18c69ba640a32b719b45a8 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Tue, 27 Oct 2015 12:20:44 -0400
+Subject: [PATCH] install: Raise an error to avoid breaking python-exec
+
+Running pip without --target, --root, or --user will result in packages
+being installed systemwide. This has a tendency to break python-exec if
+setuptools gets installed or upgraded.
+---
+ pip/commands/install.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/pip/commands/install.py b/pip/commands/install.py
+index 46cd9f2..36b72f2 100644
+--- a/pip/commands/install.py
++++ b/pip/commands/install.py
+@@ -204,6 +204,9 @@ class InstallCommand(RequirementCommand):
+             )
+             options.ignore_installed = True
+ 
++        if not options.use_user_site and not options.target_dir and not options.root_path:
++            raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec")
++
+         if options.build_dir:
+             options.build_dir = os.path.abspath(options.build_dir)
+ 
+-- 
+2.6.2
+
diff --git a/dev-python/pip/metadata.xml b/dev-python/pip/metadata.xml
new file mode 100644
index 000000000000..f43b849bf497
--- /dev/null
+++ b/dev-python/pip/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pip</remote-id>
+    <remote-id type="github">pypa/pip</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pip/pip-7.1.2.ebuild b/dev-python/pip/pip-7.1.2.ebuild
new file mode 100644
index 000000000000..99f9e2eb5b78
--- /dev/null
+++ b/dev-python/pip/pip-7.1.2.ebuild
@@ -0,0 +1,66 @@
+# 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 pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github.com/pypa/pip/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+# Check pip/_vendor/vendor.txt for this
+VENDOR_DEPEND="
+	>=dev-python/distlib-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-0.999999[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/CacheControl-0.11.5[${PYTHON_USEDEP}]
+	>=dev-python/lockfile-0.10.2[${PYTHON_USEDEP}]
+	>=dev-python/progress-1.2[${PYTHON_USEDEP}]
+	>=dev-python/packaging-15.3[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+"
+RDEPEND="${VENDOR_DEPEND}
+	>=dev-python/setuptools-18.2[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+# required test data isn't bundled with the tarball
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.2-disable-version-check.patch
+	"${FILESDIR}"/${P}-unbundle.patch
+	)
+
+python_prepare_all() {
+	mv pip/_vendor/__init__.py "${T}" || die
+	rm -r pip/_vendor/* || die
+	mv "${T}"/__init__.py pip/_vendor/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS.txt docs/*.rst )
+	distutils-r1_python_install_all
+
+	COMPLETION="${T}"/completion.tmp
+
+	"${PYTHON}" -m pip completion --bash > "${COMPLETION}" || die
+	newbashcomp "${COMPLETION}" ${PN}
+
+	"${PYTHON}" -m pip completion --zsh > "${COMPLETION}" || die
+	insinto /usr/share/zsh/site-functions
+	newins "${COMPLETION}" _pip
+}
diff --git a/dev-python/pip/pip-9.0.1-r1.ebuild b/dev-python/pip/pip-9.0.1-r1.ebuild
new file mode 100644
index 000000000000..dfc2aa6a48fe
--- /dev/null
+++ b/dev-python/pip/pip-9.0.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit eutils bash-completion-r1 distutils-r1
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github.com/pypa/pip/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+# Check pip/_vendor/vendor.txt for this
+#VENDOR_DEPEND="
+#	>=dev-python/distlib-0.2.2[${PYTHON_USEDEP}]
+#	>=dev-python/html5lib-1.0b8[${PYTHON_USEDEP}]
+#	>=dev-python/six-1.10.0${PYTHON_USEDEP}]
+#	>=dev-python/colorama-0.3.6[${PYTHON_USEDEP}]
+#	>=dev-python/requests-2.9.1-r2[${PYTHON_USEDEP}]
+#	>=dev-python/CacheControl-0.11.6[${PYTHON_USEDEP}]
+#	>=dev-python/lockfile-0.12.2[${PYTHON_USEDEP}]
+#	>=dev-python/progress-1.2[${PYTHON_USEDEP}]
+#	>=dev-python/packaging-16.5[${PYTHON_USEDEP}]
+#	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+#	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+#	virtual/python-ipaddress[${PYTHON_USEDEP}]
+#"
+# https://github.com/pypa/pip/issues/3057
+#RDEPEND="${VENDOR_DEPEND}
+#	>=dev-python/setuptools-19.2[${PYTHON_USEDEP}]
+#	<dev-python/setuptools-19.4[${PYTHON_USEDEP}]
+#"
+#DEPEND="${RDEPEND}"
+
+# required test data isn't bundled with the tarball
+RESTRICT="test"
+
+#PATCHES=(
+#	"${FILESDIR}"/${PN}-6.0.2-disable-version-check.patch
+#	"${FILESDIR}"/${PN}-8.0.0-unbundle.patch
+#	)
+
+#python_prepare_all() {
+#	mv pip/_vendor/__init__.py "${T}" || die
+#	rm -r pip/_vendor/* || die
+#	mv "${T}"/__init__.py pip/_vendor/__init__.py || die
+#
+#	distutils-r1_python_prepare_all
+#}
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/pip-disable-system-install.patch"
+	"${FILESDIR}/${PN}-9.0.1-disable-version-check.patch"
+)
+
+python_install_all() {
+	local DOCS=( AUTHORS.txt docs/*.rst )
+	distutils-r1_python_install_all
+
+	COMPLETION="${T}"/completion.tmp
+
+	"${PYTHON}" -m pip completion --bash > "${COMPLETION}" || die
+	newbashcomp "${COMPLETION}" ${PN}
+
+	"${PYTHON}" -m pip completion --zsh > "${COMPLETION}" || die
+	insinto /usr/share/zsh/site-functions
+	newins "${COMPLETION}" _pip
+}
diff --git a/dev-python/pip/pip-9.0.1-r2.ebuild b/dev-python/pip/pip-9.0.1-r2.ebuild
new file mode 100644
index 000000000000..fa6353f956a8
--- /dev/null
+++ b/dev-python/pip/pip-9.0.1-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit eutils bash-completion-r1 distutils-r1
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github.com/pypa/pip/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+IUSE="-vanilla"
+
+# Check pip/_vendor/vendor.txt for this
+#VENDOR_DEPEND="
+#	>=dev-python/distlib-0.2.2[${PYTHON_USEDEP}]
+#	>=dev-python/html5lib-1.0b8[${PYTHON_USEDEP}]
+#	>=dev-python/six-1.10.0${PYTHON_USEDEP}]
+#	>=dev-python/colorama-0.3.6[${PYTHON_USEDEP}]
+#	>=dev-python/requests-2.9.1-r2[${PYTHON_USEDEP}]
+#	>=dev-python/CacheControl-0.11.6[${PYTHON_USEDEP}]
+#	>=dev-python/lockfile-0.12.2[${PYTHON_USEDEP}]
+#	>=dev-python/progress-1.2[${PYTHON_USEDEP}]
+#	>=dev-python/packaging-16.5[${PYTHON_USEDEP}]
+#	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+#	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+#	virtual/python-ipaddress[${PYTHON_USEDEP}]
+#"
+# https://github.com/pypa/pip/issues/3057
+#RDEPEND="${VENDOR_DEPEND}
+#	>=dev-python/setuptools-19.2[${PYTHON_USEDEP}]
+#	<dev-python/setuptools-19.4[${PYTHON_USEDEP}]
+#"
+#DEPEND="${RDEPEND}"
+
+# required test data isn't bundled with the tarball
+RESTRICT="test"
+
+#PATCHES=(
+#	"${FILESDIR}"/${PN}-6.0.2-disable-version-check.patch
+#	"${FILESDIR}"/${PN}-8.0.0-unbundle.patch
+#	)
+
+#python_prepare_all() {
+#	mv pip/_vendor/__init__.py "${T}" || die
+#	rm -r pip/_vendor/* || die
+#	mv "${T}"/__init__.py pip/_vendor/__init__.py || die
+#
+#	distutils-r1_python_prepare_all
+#}
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-9.0.1-disable-version-check.patch"
+	)
+	if ! use vanilla; then
+		PATCHES+=( "${FILESDIR}/pip-disable-system-install.patch" )
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS.txt docs/*.rst )
+	distutils-r1_python_install_all
+
+	COMPLETION="${T}"/completion.tmp
+
+	"${PYTHON}" -m pip completion --bash > "${COMPLETION}" || die
+	newbashcomp "${COMPLETION}" ${PN}
+
+	"${PYTHON}" -m pip completion --zsh > "${COMPLETION}" || die
+	insinto /usr/share/zsh/site-functions
+	newins "${COMPLETION}" _pip
+}
diff --git a/dev-python/pivy/Manifest b/dev-python/pivy/Manifest
new file mode 100644
index 000000000000..666a50f9c508
--- /dev/null
+++ b/dev-python/pivy/Manifest
@@ -0,0 +1,6 @@
+DIST pivy-0.5_alpha20110303.tar.xz 6289744 SHA256 1df886b4976cde03aa528ccf05f16e42e0baff6a762b3284c1551d53705498b6 SHA512 fd0e90daa3efb3edcbed2a29dc218dadd45b728529de1ba278b3be11c3b4cf39832200babc426ca7ba688440e25a6865d38a04f3470dc5f220700fd3fef9f47f WHIRLPOOL 58d76defc763317eb592d1ce8370abdfbd7d84e2f06f8345afb71c1bcb0671b9c364dcebc0568f2ff5d7c256d845a957274b4b26f83511dc839c63ed9192f70b
+EBUILD pivy-0.5_alpha20110303-r1.ebuild 573 SHA256 e21839ff8483930e47f24168bbb87fd79c96f360506272e4c57b8a306b8380a2 SHA512 24d023a84f6479d233b96efa5e77f1064fd89545c1a4e0911bd182b6d9e325bd5dcf88718b05d69a3750977bfe08c63d8d790ff8b2a777d9c61bc29e84d8342c WHIRLPOOL 796378e9008dbc1efa212293f58e39a117b2bfef2fbc85f39fddbee119f20358ff0d0ec10584bccdede5dff71379c793dde76b1810a56ad1a8640973001c3b50
+EBUILD pivy-9999.ebuild 430 SHA256 615c2c6ca4008925d55d1553a378e2cc5acd7459035cfeba9260619d7b2a6174 SHA512 3554ab7e75770895592860455cc4cda7c814e10d09c18e5d206f284bdbfd9e762186aab738b1b067a12144645f4d5cd9767d51b67ea6d66a18da0bccf4340997 WHIRLPOOL bc7bfc4d0bfd39d0ec7513c6421fef8d2fb51a70058e9b5e9326ce1b733cfb892c4ed6100f5bb95d4fb95424f532fcb0208f737e9108d1343535a8bfde43b6b1
+MISC ChangeLog 2672 SHA256 cce633a4809de3c671f2a05eee294a86aaafcf0d0baf42623f1921c6542c510b SHA512 fe39fef553fcfca266cd27df6defdb8f6987c1b539c92023d2f18e0f729d405d3f4e04286af92484f79d361b73cdfcf8bb6be08e1b0fdc5ee4a94f730bcd9466 WHIRLPOOL 1dab8d2f55da53a73437bd4244a5e75ef5bae96aac2756a38f275ec589f64d714bd595003a6162a9183641496caaf6444d97698d9513a89e0562b65e76106007
+MISC ChangeLog-2015 1714 SHA256 fec20cc2def55108debb3407e028592aa7423428aaf02647798b793f22902d34 SHA512 bf9e63203cdc0a5a50e6a431de6d8964511aba8ac04e1df2db8f075a222e99e0d6f940dfc442e7cad590c55aecf3ce0448c3084cfafc052d127c120bfd45c6a3 WHIRLPOOL 71a961b31842aad66cfba8078ef66ef23c040c71fb289a1f7933dc13b9084b94a4857e1357b333f76abaebe1d0b5b9352ea6dff83b9fe516e64088edfd39f2ab
+MISC metadata.xml 237 SHA256 ffb571839c57797d282263369646d2bba2662601a45f7bb3251bb97f716554a6 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f WHIRLPOOL 60d6da846c983457e038ea5ba3c0bf48f939c9586610985a14cac9772fd1d45d781a643abc16482f232f3028e44fe99fe1a382deaebf6589602fc244a4460e3f
diff --git a/dev-python/pivy/metadata.xml b/dev-python/pivy/metadata.xml
new file mode 100644
index 000000000000..a535b8852829
--- /dev/null
+++ b/dev-python/pivy/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>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pivy/pivy-0.5_alpha20110303-r1.ebuild b/dev-python/pivy/pivy-0.5_alpha20110303-r1.ebuild
new file mode 100644
index 000000000000..9994c5edbac7
--- /dev/null
+++ b/dev-python/pivy/pivy-0.5_alpha20110303-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Coin3d binding for Python"
+HOMEPAGE="http://pivy.coin3d.org/"
+SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
+#identical to latest debian tarball at
+# http://ftp.de.debian.org/debian/pool/main/p/pivy/pivy_0.5.0~v609hg.orig.tar.bz2
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/coin
+	>=media-libs/SoQt-1.5.0"
+DEPEND="${RDEPEND}
+	dev-lang/swig"
diff --git a/dev-python/pivy/pivy-9999.ebuild b/dev-python/pivy/pivy-9999.ebuild
new file mode 100644
index 000000000000..91ca8ff44be8
--- /dev/null
+++ b/dev-python/pivy/pivy-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mercurial distutils-r1
+
+DESCRIPTION="Coin3d binding for Python"
+HOMEPAGE="http://pivy.coin3d.org/"
+EHG_REPO_URI="http://hg.sim.no/Pivy/default"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="
+	media-libs/coin
+	>=media-libs/SoQt-1.5.0"
+DEPEND="${RDEPEND}
+	dev-lang/swig"
diff --git a/dev-python/pkgconfig/Manifest b/dev-python/pkgconfig/Manifest
new file mode 100644
index 000000000000..e295a931b2ec
--- /dev/null
+++ b/dev-python/pkgconfig/Manifest
@@ -0,0 +1,5 @@
+DIST pkgconfig-1.2.2.tar.gz 5305 SHA256 3685ba02a9b72654a764b728b559f327e1dbd7dc6ebc310a1bd429666ee202aa SHA512 88cfb27755297871c500f37c422da5d4ae30a14e0b9974afbe63f22c59746be0d175b65d9e3d2ed315b4d942046e7c18be062aef914199c99070a2767699848b WHIRLPOOL ac20a0eaeae63d661901d1055505f5cbc2f094674d40651aafbff0e9e36715f39ba55ebbae19b61d972e4713eed2ba2fc6e027a7a3eba1f7525f4ffd9d9cd5bb
+EBUILD pkgconfig-1.2.2.ebuild 706 SHA256 c383130d78a16f508f255c0998e9132640c769e904aa18d818b32b823b8fef36 SHA512 579a0568d06f40446705403625f037c9962f311625ba92af75525a0bdabecb35a6b2d3def014ae5226d778b765239303af0e2b623d9efae8f2034c2e59ee8ef0 WHIRLPOOL 221835085771f093ec2ef88a8d8fad912901a483d7ec543c99d0274c544aba50ef94f5298e4bbdf5623b56fcf338da51f7e7e313a0d647cdc676837785ba7bc5
+MISC ChangeLog 3030 SHA256 eec6cd53d106a20f02dce55cdceccd9e9c4a89f62514ec5afa8760fd1ed3e38a SHA512 fc143be304c513bb6b016819ae91f4fb538434b9f6dd2c1adb6f7052e058c1a7a17b08bcc871e1d525def6e5a1cb189d036cbd0c400b4dc05dfa1b26fd5fde2d WHIRLPOOL 5e316bc7ad846719dabe14b810658471eec7b7c84c817cef1912b295f6befc7440131c62e6fb86f9036a41b5c263ba6d7057795cdd8720b813cde729c4c3d5aa
+MISC ChangeLog-2015 697 SHA256 b729c57a1342fb1e27eef466851fd5174cac4a2676a4691936c43db3a9aabe2a SHA512 b84d0e4ad5904a999f5cf5a79727de96b241c5bcfc2a74f0ba6847a1a734412c839eed40a2dc8c4f4280049ba450ae2c13b9c483b4ef07edcbc10e459fc3d12a WHIRLPOOL faee13b1790cf080afc3e0279fc057d2960a3dce73a753be64679e65a4d116164bd1dee890586e50719edd4be849eefbae6d0756a8203d44591c78c72543e05c
+MISC metadata.xml 379 SHA256 aaf570c19b00c702d105ca4d2b398bebb6d9bfb98ffe5d598a6f2f94700b9a16 SHA512 2e92f2bbce0b0b8d9524ffdd2950c90ce34776d497c3d3ad47f239cfc562cbc7f52c3690b9df132f8466e386783b5287e63011c0bc8b1ab2ea839d1fc3fd9af4 WHIRLPOOL 0768b9d0b43a9492bc758f31c39215ff72e4818cf01f04c037952c1b6e0619f37529e11bf4bdef5c7c0cc1ee88f95a15ed634f29152d73e45c62932fc35d2c98
diff --git a/dev-python/pkgconfig/metadata.xml b/dev-python/pkgconfig/metadata.xml
new file mode 100644
index 000000000000..7c0bf4d1bc90
--- /dev/null
+++ b/dev-python/pkgconfig/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pkgconfig</remote-id>
+    <remote-id type="github">matze/pkgconfig</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pkgconfig/pkgconfig-1.2.2.ebuild b/dev-python/pkgconfig/pkgconfig-1.2.2.ebuild
new file mode 100644
index 000000000000..382f187d4443
--- /dev/null
+++ b/dev-python/pkgconfig/pkgconfig-1.2.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Interface Python with pkg-config"
+HOMEPAGE="https://pypi.python.org/pypi/pkgconfig/ https://github.com/matze/pkgconfig"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -e '/nose/d' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
new file mode 100644
index 000000000000..b43d27ff340e
--- /dev/null
+++ b/dev-python/pkginfo/Manifest
@@ -0,0 +1,5 @@
+DIST pkginfo-1.2.1.tar.gz 31072 SHA256 ad3f6dfe8a831f96a7b56a588ca874137ca102cc6b79fc9b0a1c3b7ab7320f3c SHA512 8a530a164befdcbc6f1f550e106880e14e9d2c762a5e1055f926ccf0228d9e2312f11598454ef015e97dccb78ac7aeb7309f34279590cd318c19c2bd9a29ed2a WHIRLPOOL 1ab43db82665e0abed88bf59115df726475ba7c611b077803721cd6bfcfcc81120c7a996e8945e74ad18c1ec7f6c9e5a1396df37d4f2c0eca24924f4c22e9ee3
+EBUILD pkginfo-1.2.1.ebuild 1404 SHA256 c64c87a93dc67047b9f8b3c529f8ee9149f65fcd5c228046137f287283efb355 SHA512 586dc0ac518fd8cbe9d438659d4f3cf922c7479f26d0ce439b81dc812baf0044e5b8ffe15feae12df55ce53f6f45501a9e09e735486e84594d93b369f2b305c2 WHIRLPOOL 56d9ae623715e518524f51000c47fd549832ca4e0cf1f3e450c254e2e2b6d6d4d6bc309821f6f0942130fac9cdfa961107145e5ed9a9c25b930247c1f2598077
+MISC ChangeLog 3918 SHA256 2f6ce8856ad91ae06afcdfbc13ab8b8a0768f5e9b8000912282d48b0880d0f39 SHA512 c53bcc16f0085f3b29a3ac0ebd54712e5c4d9efe7c45989a2e42fc45aeb95e819aafff6c32fcda5ffc007c0c3d598ce793f7de8433122d9fe56e40c7df5247e6 WHIRLPOOL c30031f7de1339e2740de7347acee98fa172d7f6592a0d31558d027fe0e92a6306aa072a598e3198577834c4812c6862893961807ca3645f16fbe00f5f42057a
+MISC ChangeLog-2015 1808 SHA256 9b22014c9e4b809e8f2d76e43c1b977a29f161244efd97d631ac07e03bf89c26 SHA512 0af8a8884d2d3ddb65777b81b6e45d9963e293debc8de38e18d9d50cf7b750c525ab4bff0e2ebef941ed423fb7566b6d63cf23c03eeaa815c57384c76315a600 WHIRLPOOL a8536d1c2aad51e9f3ec0a2527b6b3310df33b1c0f19588c7a3c4ada94cee6d6cb21c76b425e0c8803296e72ba1579f54f0624e44a65135ad57a590962fcbef1
+MISC metadata.xml 320 SHA256 8d9cbb543e05091243392dc3ab75e435df6221d970bdb6b37921392f816fb85e SHA512 8f2cf51568e86fb0ebbaf5eb2476f6c7f7121abecec606626aafe5395b2e9530009e77be890d389daa563b6ee47af311cbdeb121518351b0e99da0c591c0502c WHIRLPOOL 5dc63362931063f65d0ff9fd195b4cc1d347eedbb173b188bc6d7dbc3753c48f74888f6e8ab83ab7b024c00285d74427a742089bd698629123c7239cfb97d891
diff --git a/dev-python/pkginfo/metadata.xml b/dev-python/pkginfo/metadata.xml
new file mode 100644
index 000000000000..c10553350506
--- /dev/null
+++ b/dev-python/pkginfo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pkginfo</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pkginfo/pkginfo-1.2.1.ebuild b/dev-python/pkginfo/pkginfo-1.2.1.ebuild
new file mode 100644
index 000000000000..dca8bf6c63ac
--- /dev/null
+++ b/dev-python/pkginfo/pkginfo-1.2.1.ebuild
@@ -0,0 +1,47 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
+HOMEPAGE="https://pypi.python.org/pypi/pkginfo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
+IUSE="doc examples"
+
+LICENSE="MIT"
+SLOT="0"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	# Disable tests that seek to read the version of pkginfo from an installed state
+	# These test will still become installed and testable once installed
+	sed -e 's:test_w_directory_no_EGG_INFO:_&:' \
+		-e 's:test_w_module_and_metadata_version:_&:' \
+		-e 's:test_w_package_name_and_metadata_version:_&:' \
+		-i pkginfo/tests/test_utils.py || die
+	sed -e 's:test_ctor_w_path_nested_egg_info:_&:' \
+		-i pkginfo/tests/test_develop.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" -m unittest discover || die "Test ${test} failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	use examples && local EXAMPLES=( docs/examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pkipplib/Manifest b/dev-python/pkipplib/Manifest
new file mode 100644
index 000000000000..d9fa34147603
--- /dev/null
+++ b/dev-python/pkipplib/Manifest
@@ -0,0 +1,5 @@
+DIST pkipplib-0.07.tar.gz 18704 SHA256 2a2c8fd9fda3d31c30cd48f93d22fe419ec6dc5de53c93183e66fbe579c1908b SHA512 223aaf7dcffa3a435ae9a407c1f7c31cd69a15f8b12f6a6d24f3ea589816b1e641cb1efbdf2ea0415e36d0df07d8dae83a55604e7f31d2f1bd7827a3f4724a2e WHIRLPOOL c672c5150c46d18eea0ed236fbda29b34bdde0a9e5e104d80d58639ed4fc133dd3fcd85823e3301bc8be09cf10dfd404abb74cd2b66a469922aa658211c03045
+EBUILD pkipplib-0.07-r1.ebuild 446 SHA256 3d0afc2feee3dcf1f4b627a7a1f2a8f84b0a76c9f3cf653168e1e851b98ac04a SHA512 1b29b2313d008bc2a450e2a12a002bdeae6496caec1c1b861f03e7119fc56a844a3ee463993c372ce6e685a0045940b6ac808be10d491f22eabf3b5ed5596ded WHIRLPOOL c60e9ef85ea02e80ac07f197febc1f91623537977cc4180b76e9909a9f388ce324a5b257534a5bd59c98312660ee82184d68d7d50e0709b8251d9b3315288cdf
+MISC ChangeLog 2829 SHA256 4f6b2ae55e0df4d387fbbdec06c7034cb9af9a1bad53caf147f814e6ed55bbfc SHA512 1646108112b8adf2dd57d52adac7c4bef81119773bdc75c8dc31249fa72a519bf7bfa446b78225df8045257cb274f67aa4e89e8ade735efb1a9f1f2a31fcf349 WHIRLPOOL d64ba9ab2aeedfe56c4836a23fe173924cf601464e352a59fd413facb404ced71f9a97a48b60640745ad48c944a6edb28490e778959a3fed806a0cf7cd04cef4
+MISC ChangeLog-2015 760 SHA256 999811fb53276ea8c6eca191181e01a151cf38b8f5fd72d972494389558fe799 SHA512 cb3d69f2c3e6080da9ad58b8ec1c2e8ac31f03ef620f25362f0a95f3ea73cbb54ba2be173b10154051bdf991748bcad736e8744d9c0b6d3aee6ef545382deff4 WHIRLPOOL 7830aa25abc389b1013277124136be147aa9244339ddf762ed33e03766a3d3bcd3fd6e5ba2d3642ecb69cbfe5d18291d6d089ea59dfb77e686c3c9cc14d685df
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/pkipplib/metadata.xml b/dev-python/pkipplib/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/pkipplib/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pkipplib/pkipplib-0.07-r1.ebuild b/dev-python/pkipplib/pkipplib-0.07-r1.ebuild
new file mode 100644
index 000000000000..7e0603254d12
--- /dev/null
+++ b/dev-python/pkipplib/pkipplib-0.07-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pkipplib is a Python module which parses IPP requests"
+HOMEPAGE="http://www.pykota.com/software/pkipplib/"
+SRC_URI="http://www.pykota.com/software/pkipplib/download/tarballs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/placefinder/Manifest b/dev-python/placefinder/Manifest
new file mode 100644
index 000000000000..45b3aeadbca2
--- /dev/null
+++ b/dev-python/placefinder/Manifest
@@ -0,0 +1,5 @@
+DIST placefinder-0.3.tar.gz 2632 SHA256 9b42756d46566b681565f352c51fb8e2793338ffe732c56e8d2d500559780d49 SHA512 dcff0ec0e6a1ca361a726bd5996095855d289f0780238aa0371835821294799f13c49919e0966495a9f77b5ea18b3be9deb5d2b5efd6ce0cf8803f13e22f6249 WHIRLPOOL ffb09bafb45c566a300e06704cb672eca5e440cbaaefe44f34a2dce62aa100201fe3d40d5e66605c78974e829464f9a72db0a344268c8e652eeb25eca01c643d
+EBUILD placefinder-0.3.ebuild 477 SHA256 4aad5d35d044904eca26dcb426d52ecce4dbf829c69de15f2e440bae21f56c96 SHA512 8293ae39627e300add1d25531f4a013d501da05f7aca3609a57b6b702e6791cba78eb730a6c7152499d4bd1742f674878fcd4883342cb6bebc304ec48c4cc1e7 WHIRLPOOL e7d8af67ae9592fbdfd5dd86f0d743749486b35a00caff1433afa0b541c415c9a6c343f6c5d8516b808fa4457e6d7ba8cf56c14e4c5243c5552637f37c62bfe5
+MISC ChangeLog 2706 SHA256 91f830178663aeac7706a0193d67b416670c811bc29a469beaf01a482a157a44 SHA512 f186d8ba1afee3fda53f77f1cdf862e068d9c58a3b10b247183ba87ab467833ef80f6e78e082582c8c301a9a38b9e4d7cbe096c771d3519caea53fe50b101a1a WHIRLPOOL fe9c0367619b6273cf18b9035295f6306106dd8aa8d290b4c014ad290882a50d8a58b27caf9a7410296c4e1d0bccbaadb667fb1bfa4a89a638260f97d68ca424
+MISC ChangeLog-2015 786 SHA256 6693e6f4689f6afd1dc957bfeff17f064213c4deff120292dfcbbb8d4bb7032b SHA512 b20ce3a84cd94f7b85ba415061606bf6b302ba33a75d627041ce98cb89cb0959171b94636b00859d3ccb67e60801f654418f555977eacf16874b4fade1e518cb WHIRLPOOL 003d7295f2c368c0407b92f27da2d40b408e31ab218c7a3adea07a1ee9cde19985d8db2a0511b102c9bc637e08869a40384c989e6bc523038b62bd49c37230c5
+MISC metadata.xml 395 SHA256 743ed7170adad0255d1a5170f7cd859e966019ee2227dc2fd5288abb67b75bf9 SHA512 90d623c763dd2b3948ee444bb88221ca64b38b5af8379dafcaa0f267c4a89cc6620f8efebadbd414be8258a5d21cf437b3b4aef263d9e059b155b7001b7878cf WHIRLPOOL f6f28fb599318f63ee84e0c3327e81c57fe2a3eef45aacd737cf72e19ce8ea1b348f6fdc9160669c35ae35e77ae813c4874bb1b721873fb017e5dd1e4eb86fd4
diff --git a/dev-python/placefinder/metadata.xml b/dev-python/placefinder/metadata.xml
new file mode 100644
index 000000000000..ce4fb677f565
--- /dev/null
+++ b/dev-python/placefinder/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">placefinder-py</remote-id>
+    <remote-id type="github">adampresley/placefinder-py</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/placefinder/placefinder-0.3.ebuild b/dev-python/placefinder/placefinder-0.3.ebuild
new file mode 100644
index 000000000000..28a135d26340
--- /dev/null
+++ b/dev-python/placefinder/placefinder-0.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+MY_PN="${PN}"-py
+
+DESCRIPTION="Yahoo! BOSS PlaceFinder Python Client"
+HOMEPAGE=" https://github.com/adampresley/placefinder-py"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/plotly/Manifest b/dev-python/plotly/Manifest
new file mode 100644
index 000000000000..30bc353892bc
--- /dev/null
+++ b/dev-python/plotly/Manifest
@@ -0,0 +1,4 @@
+DIST plotly-1.9.6.tar.gz 546722 SHA256 dda34435910787c40e7622aea2992d1b48301d12eef36a7a0bf6d0f93e420305 SHA512 7564036ed3745fc06ee7428942e45ca6bfaefa1e47b08a5868a918924268ee632515f1de4bf3e90911234f18a4d85b092ecb6ef9f213b939093dcb433a12dec4 WHIRLPOOL 7eb0f75d08c255a3d8fe3d4d673b8346963f6d22c8eba1e57dacffa799fac34b4c7acd3f52b5667e7e2d42054d9efaeb4466290d91f54b8b45e1f7cc63ade902
+EBUILD plotly-1.9.6.ebuild 590 SHA256 18bfa4e4bdca073a338685bfb9382a0fee9fa231f0e4274dca11c5cd9fe6f137 SHA512 3b86bb14ab95c6ae50d877a3a0a11e425173fc2ceff15d6293399881b5a67b1621e24040f5e05735d26a1187c5b58a80e0aef88f137021650a13a8e62bc8dc02 WHIRLPOOL 60b2a982fb0a73794f3555ae70947bd6cbbf205d7da9ddd02063e20e21cbfa36365edd4153abf289b9f8f4ff5e732747ba6ef286f0d534f777abd170a3172981
+MISC ChangeLog 313 SHA256 9dff8fff2368694e593c6df3be6bed411f58028e50d73440956381fe8b1036dd SHA512 9bc12974fa3db13adebf1c5b531785c646bc4764de94cdd7b919d6fb660d29b4d132689004688a782e5c107b2ee011cdd815fadc6e98cb159db58c5b89e1cb62 WHIRLPOOL 258442a25d91db1b497ed5c7cc8807de86764670eadaa088d86aca9877fc60b61ff3af371eee2be3a7a1274f51419db43e64cf5352b5a2b2d902ff503594021b
+MISC metadata.xml 601 SHA256 5cbce202f5d8b753112c62a4305d56c48af66e194146eced03958bf89034defc SHA512 6a9af070fbe6fd992fa2131491b742c7d92c8fdc30993d1c92185c5bb4dbd42c9a9f84bbf6a9b710d5c731d820e3610d00258fcc284ea7388e1acf56fd3840b9 WHIRLPOOL d56e2bbaaa1700796fcfe664f5c06287f38feed5cc9818c82901194dcd0abb22f23b2c652eb3073783f7ef816c50c16c034a7d61476070f6246befd45f9edbde
diff --git a/dev-python/plotly/metadata.xml b/dev-python/plotly/metadata.xml
new file mode 100644
index 000000000000..b92ec11d7525
--- /dev/null
+++ b/dev-python/plotly/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Python plotting library for collaborative, interactive, publication-quality
+    graphs. Plotly is an online collaborative data analysis and graphing tool. 
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">plotly</remote-id>
+    <remote-id type="github">plotly/plotly.py</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/plotly/plotly-1.9.6.ebuild b/dev-python/plotly/plotly-1.9.6.ebuild
new file mode 100644
index 000000000000..ac75ea7f3b33
--- /dev/null
+++ b/dev-python/plotly/plotly-1.9.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Browser-based graphing library for Python"
+HOMEPAGE="https://plot.ly/python/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
new file mode 100644
index 000000000000..fd7e53ae40e6
--- /dev/null
+++ b/dev-python/pluggy/Manifest
@@ -0,0 +1,6 @@
+DIST pluggy-0.4.0.zip 19054 SHA256 dd841b5d290b252cf645f75f3bd37ceecfa0f36394ab313e4f785fe68a4081a4 SHA512 1a6e28df05751767df1ac3dfac4c29ba0367f05ae9c8c6a7f5163bb53de36f90226ed18baedeb41bc8ca23504ca61a9b32ef907d3ec3fee7512bcdf45a56d19c WHIRLPOOL 6fe852f807f8966d5df39a118871097758885c95c7aa1e722278704c8ccfaee14e6c18abf7e2033e4801aa0934a2ff0eb64ac3a8db5a53fc86841f6a9cf688cc
+DIST pluggy-0.5.2.tar.gz 18935 SHA256 bd60171dbb250fdebafad46ed16d97065369da40568ae948ef7117eee8536e94 SHA512 850b1a7b9e55d46d5deb16b8bc71e3f9d6c26b78fe34379b295a9780f3da8abb3c44f524f175d0392b61fc2d36d66d156db3f499a3c1666e2ff3e3c6344153cb WHIRLPOOL ae602eedb539f3e2b995edb474edf9de6a6637e6eee6e78987b43c6bcbfe8e9984beb9d1cbf5f33ac5e50367ea0a4ef2c69620fa3b776b0ed885e95b5878b020
+EBUILD pluggy-0.4.0.ebuild 646 SHA256 df0e85cad358fe18716a1e2fb7cf750b2acbe1ceca28559507a88abeb8eaeedd SHA512 8162cd6fbfa32f89b28219e4a8710e1b81047e76f4f0f709df0065f7210f3144db36e698efc4f8328f4286b6d872fe23aa19421f46786e63b9483f03fced005e WHIRLPOOL 4cf51fcd6e8f7a85f9cf6e63361beb112eba799fa2c6811aa07817d198a7cb09886fa748bb9a08066fb0290119f6f28c552749b9869ba354a8ba155e425eac3b
+EBUILD pluggy-0.5.2.ebuild 734 SHA256 0292836f1a277e55322f2370b8c873e8e9bb51b5f9205d620b306879f1076ce1 SHA512 772f0fb34d578a667a4946f5ff3d028bb96b354067eb77327ccee5715b848f50daa33652f1d7b2a80fd8d36c5aa8b789a4f1851d0208ec6dbbb2dd674d1e6b8a WHIRLPOOL 603875a1eb0ce34cdd5a7f8d3716b061352e18249bc731ad0366815ee744296395db6ae6b59f2a902616bdfa548347c3abca1b85b975ddf4ea3d6a7a7d498fb9
+MISC ChangeLog 625 SHA256 976ca4cc79431cc05aa6a8b6bf9841c1bdac49ec8c2b00c15f955af321eb0b2a SHA512 c813f93009204e2521c1413d8a2df6930ec7ce9a154fc675161aaff484e880a1999c8652a454ef847cbdd76612673ba525ad255438eeaf5f69b698f260255bda WHIRLPOOL 144e8aaa71c35a923fafc7dd95d75bbb3b8fbb2037018bce75585eb80fe7df7b0ddbf55e719b571dd1d5d10e00017189cf89766c1ebb33dd76ed90c269a38ef4
+MISC metadata.xml 444 SHA256 3d74ca22912b635cddc345092c6db3c5f60e861c8c5ee8ed92f4bca966d3b493 SHA512 2ecb5fb612627c44f3499080fcde9241daf2f25a974a8e24fe8190b7d5f8baa6a457b7a902e788f98fe9ed1fdb2cd0f46770337e8f836e430b0aa6f0d323ad50 WHIRLPOOL 7fe2f58f039036f5d73785c55f8d3a3877509719f4ff8588c7d8a01960323d1b0c21447987c7bcee60f0c2bfafd8dc7247496bef28dfbb1d952d4a28604b573d
diff --git a/dev-python/pluggy/metadata.xml b/dev-python/pluggy/metadata.xml
new file mode 100644
index 000000000000..972236293061
--- /dev/null
+++ b/dev-python/pluggy/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pluggy</remote-id>
+    <maintainer status="unknown">
+      <email>holger@merlinux.eu</email>
+      <name>Holger Krekel</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pluggy/pluggy-0.4.0.ebuild b/dev-python/pluggy/pluggy-0.4.0.ebuild
new file mode 100644
index 000000000000..d7f5e8492ece
--- /dev/null
+++ b/dev-python/pluggy/pluggy-0.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="plugin and hook calling mechanisms for python"
+HOMEPAGE="https://pypi.python.org/pypi/pluggy"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v -v || die
+}
diff --git a/dev-python/pluggy/pluggy-0.5.2.ebuild b/dev-python/pluggy/pluggy-0.5.2.ebuild
new file mode 100644
index 000000000000..19a7a49c85c2
--- /dev/null
+++ b/dev-python/pluggy/pluggy-0.5.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="plugin and hook calling mechanisms for python"
+HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.python.org/pypi/pluggy"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pluginbase/Manifest b/dev-python/pluginbase/Manifest
new file mode 100644
index 000000000000..8cfcc36b3ea2
--- /dev/null
+++ b/dev-python/pluginbase/Manifest
@@ -0,0 +1,3 @@
+DIST pluginbase-0.5.tar.gz 41964 SHA256 b4f830242a078a4f44c978a84f3365bba4d008fdd71a591c71447f4df35354dd SHA512 921ddc7dacb6ad63abc90beb1d1d993e7b15c9cfe21e850a5852eb40735436e08b39fd2a6d83e23f641014ee81e718aca147ef1e21b55f94ce04a64ba7780455 WHIRLPOOL c15e58b029c101aea683df671fd7e58bcfa8635a21ca0a5867ac04114b1b9855a1ba4eac590231b408ac69c0f9bf4ef3c0bb3248797e762550af5e6403bf9593
+EBUILD pluginbase-0.5.ebuild 917 SHA256 f126d34af2aa548d92ead53693c60f168440c0c6380d1ef4e62ad6bec2ba96bf SHA512 067e39436d41b0e5c713385560957ed4ec4e393d7e2428e9a7d39fd168e2cdda8dd1b7811b149ee3af299eb50cc21d1826fa733fc160f51027e73a2e89ce7b5f WHIRLPOOL d1596270337d7a9b22893ac356f793fe228c66bbbddbf01e37ae84b7e34cca68901070f5d9e86b5d3654913d52733e24278a5c1abfebd067a63fc2f3fcc172fb
+MISC metadata.xml 385 SHA256 6bc3a367d523c7f6b7c762902fcfe6027aef372b8069ddd09c941d92cf5b0c0c SHA512 166cec1bf4ad16e00b937dca860dedef5f8f766c1e3edae03dd29753ad9590843601723243e702344d1d4853b4d1a87c9c0960f9b70ac3dd4ad40995333516b2 WHIRLPOOL b92a802bd0a41c7d31497d914fa0a1847759bd82b7a332f7dea04eb245a96780bf507ac220739b0fec44f5d60186c88ea7dc5a8e7e133e65cd417e220b7c96fe
diff --git a/dev-python/pluginbase/metadata.xml b/dev-python/pluginbase/metadata.xml
new file mode 100644
index 000000000000..0610970f98a5
--- /dev/null
+++ b/dev-python/pluginbase/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pluginbase</remote-id>
+    <remote-id type="github">mitsuhijo/pluginbase</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pluginbase/pluginbase-0.5.ebuild b/dev-python/pluginbase/pluginbase-0.5.ebuild
new file mode 100644
index 000000000000..8954509650f8
--- /dev/null
+++ b/dev-python/pluginbase/pluginbase-0.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Support library for building plugins sytems in Python"
+HOMEPAGE="https://github.com/mitsuhiko/pluginbase"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -e "s/, 'sphinx.ext.intersphinx'//" \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	cd tests && PYTHONPATH=.. py.test --tb=native || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
new file mode 100644
index 000000000000..217ed9d6181f
--- /dev/null
+++ b/dev-python/plumbum/Manifest
@@ -0,0 +1,6 @@
+DIST plumbum-1.6.0.tar.gz 77092 SHA256 74c931a79d1c1851ee7a2d8b7f594c810930e46a6bdea7961e177d3670ed350e SHA512 0be9461720cb03c56aff8f56705b1753013e02df4b4d3dbc7e8379930b9efb3822df587483ca708f3a16f08d625f03459f8fe377bc50e59439d05f73669003cc WHIRLPOOL 27d24289327ed6e68f47fec995962b6929e804091d44220fcdbf115bd532b4dc0dca154d25077869c484f5682722238aed2cec5c1372846528d904cddefe88b6
+DIST plumbum-1.6.3.tar.gz 82109 SHA256 0249e708459f1b05627a7ca8787622c234e4db495a532acbbd1f1f17f28c7320 SHA512 998148db310d3ede1a641bd0e8875a5b3853a08329d5bc68eea163f9eaa1e0e05548f544084d72ad2d233fd9b9bd1ed7518b0f8047e0e737a7a014fa0cd8fe1f WHIRLPOOL 1b455baca137e09d43ceb0e57fe3e00cf80d0101f46bd882f8a3e57cd934e63c98221428ad40d138979d0a7b4159af9db3e1a11d7d06ff5e8cfe492157d708b9
+EBUILD plumbum-1.6.0.ebuild 391 SHA256 02fad236f5bb82dfaa1793d9be23a4ac2eb4a19175005f86e8dbc954b6242d45 SHA512 07383a75c380b63f9917e8513ae670006cbf9f6e8d6ad8f49b4051f5ff2fca0f5ac2e641043e2314cc938f2eaedd42704282d5ec3fdade353abb542cb80c5c5a WHIRLPOOL 5b9f7db4ee8e8b9a1fb893be1ec9ace206711c04a01f10629626808b3c7bd06e5fdc3f41d9caef75852b66ccf73a056fd98bb16041e0521ceebcdb84072a6c44
+EBUILD plumbum-1.6.3.ebuild 395 SHA256 184390df993e7a65dc794dc11127bf127c31c0d1208c5c5caeefb36eec967173 SHA512 7e66d384bae66ec29d77c7a396d71a56a2cc87342e925a5afda6958b770b8f06ef60b5edb0a7fdceeedc9bd9a2bcd84a3aab4c2658b2818a3dbad1dff02b43f9 WHIRLPOOL d1f088d37d09beee9cf0cfe3a3d3fc5a577cfa74b6488d2666244098084cf3b33c1b6082c18fae0af500af8d44dbec72a16263d644b1014973078970bc72440d
+MISC ChangeLog 1139 SHA256 0b0e32cefc19c1ca8cd9f64378c82e252f77b09bc0b814837ffd035a94e0bf9b SHA512 02339989e9fe33e049d29f83701f8d01f19b998fb6166c1ab02cf1989c8ad222da26c8d5f728c13b7e2de1213ed9de83697472324d1f6217321c980422f73cf2 WHIRLPOOL 96797c75ee801883b0ed19e919604203040db32819c256277491087c2af1a8c1aaa6e86a809ef03e6fee1bd3e5bc689b002724722dc6f5048f6880eeb923895d
+MISC metadata.xml 667 SHA256 da61237165aeed0c6cd1be5624c7d62717cce248a9a900498612e842f928504a SHA512 c44ac643857f1e096d33e7ac3ae9a5a7e135861b7f6e26a3b889d9cc4fd5d302ac9657520c73cdc618b95ee31f168cb2e5704c1bf1b7710b859e57a2abafa812 WHIRLPOOL ab5c4249d58fd4b24e5b0766b307a7dce2045a60b80eac25030253909b26931e625ddf0ec0e5e7448833e02d222833e421cc29b6be76770b8d53557638455e5f
diff --git a/dev-python/plumbum/metadata.xml b/dev-python/plumbum/metadata.xml
new file mode 100644
index 000000000000..a442e52d0d35
--- /dev/null
+++ b/dev-python/plumbum/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+    A library for shell script-like programs in python,
+    attempting to mimic the shell syntax (shell combinators) where it makes sense,
+    while keeping it all Pythonic and cross-platform.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">plumbum</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/plumbum/plumbum-1.6.0.ebuild b/dev-python/plumbum/plumbum-1.6.0.ebuild
new file mode 100644
index 000000000000..4e80f40deec2
--- /dev/null
+++ b/dev-python/plumbum/plumbum-1.6.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+inherit distutils-r1
+
+DESCRIPTION="A library for shell script-like programs in python"
+HOMEPAGE="http://plumbum.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
diff --git a/dev-python/plumbum/plumbum-1.6.3.ebuild b/dev-python/plumbum/plumbum-1.6.3.ebuild
new file mode 100644
index 000000000000..5c8760d9ddb4
--- /dev/null
+++ b/dev-python/plumbum/plumbum-1.6.3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="A library for shell script-like programs in python"
+HOMEPAGE="http://plumbum.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/ply/Manifest b/dev-python/ply/Manifest
new file mode 100644
index 000000000000..60fa93025d22
--- /dev/null
+++ b/dev-python/ply/Manifest
@@ -0,0 +1,11 @@
+AUX 3.6-lextab-None.patch 1705 SHA256 243a8841d80800c00079ed35fe75a754a149037763cde0a6b1b9a61200cf7442 SHA512 c5e0d2976d7633bbde91fc957eb2ee9fdf9d8e0f43dac37163ca01d6f6b33da9f7b4e396fba034a53d1270bd1aa0f1683eb507bdb5562a5d3e82823ccf292109 WHIRLPOOL 4989ed71a000f8d85e0bafb8fafe5a29162f267f5625f249bc15a92fd960e33a5200a0239d2fbf6e757c8a1fdf042d16451f72df800db52739a613e3c7a77459
+AUX 3.6-picklefile-IOError.patch 681 SHA256 7803e49594f43b091ed6301fbb24b6332fd0d7b43f5b3794ec1d7ab773655bc4 SHA512 6dce69df1cc538ff9787cb70617437ac36972b68a998922123bd4f0529dd6f155befe4104741e704e7e8a1ed8822f2e99580867bbc894fc57896aad4130c317b WHIRLPOOL 0f2d10b830b3e2424d26507cbc21d889416119a4c727f6e61f93445b84eab765edf7c405adfb8d581d8ebdda53a5aefabf99e0c66d102aa648de9f2cd3517518
+DIST ply-3.10.tar.gz 150926 SHA256 96e94af7dd7031d8d6dd6e2a8e0de593b511c211a86e28a9c9621c275ac8bacb SHA512 67fa60ea3fe2cafe165b7c105eb4b08c0c75c98720bbbb19da275215b333d3ce0742c90e558fbe97df396c6faaf85da744063728ab211651beae10e0cad01d44 WHIRLPOOL efcf25e904e1a511f659de720afb34b5ca85414285276232427ff5034be03321bd32fa7dec9e666480fc0d7df283412219f7c3d15ad3fb945275949d06731e31
+DIST ply-3.6.tar.gz 281690 SHA256 61367b9eb2f4b819f69ea116750305270f1df8859992c9e356d6a851f25a4b47 SHA512 1a408d7cd4cdc9d747154623672e6baaf37ad2190cb9d6d6a7c1e1cc3cb40f15547734441b8fc99ecd67d7804d767576bdf0ed219cc669bf3d0df37498c55c55 WHIRLPOOL 2868a0046519750a446b683a85966650407afc1ea32ab6d8209b46b280529ca6aa8c47816782020b4c90f6f92d4733dd07565b6518e20c7a036d743edc629496
+DIST ply-3.9.tar.gz 150750 SHA256 0d7e2940b9c57151392fceaa62b0865c45e06ce1e36687fd8d03f011a907f43e SHA512 c3beca6f70e9fdfd11f9fc7beb18efb03f0b32be3cdc949e96c4df3d060e7e9da3ee42d1f58f7a9225d333cb7864a4253fd3a9b75c496364276fe9969ebd7641 WHIRLPOOL bb8371a8a6c95770ba66fd60e1447110ca06fdd124800811c31d9012f99b31bd87cb7aedd0de3f900627135a10556438cc8e0f1a37818d4cea754aceec73f282
+EBUILD ply-3.10.ebuild 1134 SHA256 6cf6e0e8717b2d07ef71501d635f9040a27365f18f946b41cdc7c8afb5c5dacd SHA512 80ef9e752c24b61ff8e45759804016530912cbac42d31df62af81a23f4ed04c74ae409a625a78d4a9e983f9f6b3ba08d7422cb7fcd487fec9354b89fa20f3c00 WHIRLPOOL 60259e065d90d7c1f57b2f63b1fd9923819261f0f9a08c35c388ad631d6834ee6c1e0174bb06a6da58f962a636be11655d472f7f08ca047168ea24735f2be9fc
+EBUILD ply-3.6-r1.ebuild 1147 SHA256 eeda57fca04eff802c51515ce841fd5e9e0e60a2f7ebb14dbb0a1103bbaf6de5 SHA512 220360babcae76e19b959dde0cddae94f8ae740a7e0f23a41f8446dd27be49d856ec356a277f703b0106e96d80351fa5d5ef0827169af8eb53f39ebb7df5a06e WHIRLPOOL 90889fce482118d2a952291c98fba75ac2a625c156013f5087f027a4fc0e3bdbf0f47d47de251ead4695ca27c162a298c2f7334bc67ccbb40891cd3bbe3b4731
+EBUILD ply-3.9.ebuild 1113 SHA256 e4dfe56b1acc6d3edc1ccf1f13e47cfcef711f3c351dfa6b0675ec95f270df6d SHA512 4e9fff602a88c02cc45b1974281b7f73bd0f884a2c39059ad39de70d250ead8631af4c19a1273fe793f61f0617f838fb300a3f6ba13661455fd9f97b1d2d55bf WHIRLPOOL ea93d12ba9bcbb9c329ab94e982d5f4950a4ecac423487e6d39327163d863a66086a64fb1952332dd81628cdec2f51c0229ff880b03f603445841a7c134f9af5
+MISC ChangeLog 5797 SHA256 8bdae12292e63cd04b1dc0917f072b4c446f17185d943526551e7a78ba05bbeb SHA512 16be937bf775fc105bee4c6196a663b84be1eb670c5c035b39a9b8855e3b92fa35fa5806f180da9f025004786925ec336ec6b9a47600ca502c8e06d11a4d0a22 WHIRLPOOL edf8f8419a42d7dc0e22d718286e8e0853d98b8d69de204861755f7edb10846303223399ec837c63e8befc590405b47403ed2e2d74940468e046bd53e720e22f
+MISC ChangeLog-2015 6080 SHA256 64fa8612534839522ab2c96ac39c8e4fe923bb26d017a1a8a547ead167f8dae1 SHA512 6d59b71212488563bb47e77fbb0f5182eaa39ffbbe97ac51786b9fe4095d703119aba27af89ece98fc624399184a2edfd9440562483a9f9631c4fa4aa4cd992e WHIRLPOOL 13a3440e7e9fde5af915d09fbbfedc2affd16fe5cda1102698c1a5ce4ea57af86ca3179e9467dec4a2299c8e178645dce548e62e55871a324ae2bae950169340
+MISC metadata.xml 1418 SHA256 0fcb0af5d041b0392108aa977dcb161d3294af668cb83ed2ac8983a1ca5d49c9 SHA512 92a5a470227858726239f537b3d8559e29d589a8aca0f1d43b8a1ee3ec00470117efb45275b5bfc0ab6d0678863db50aadd36aec326978e7a3e858c0b0be41dc WHIRLPOOL bbd4e2764dc5812ff9316fa4e96ee46cdbe79ee4b06ba324bb277cc56c9025257e363ef1a68c0772e93add6b5e0d0d48d3074ca918732bbcc8bdc85c0e25c66c
diff --git a/dev-python/ply/files/3.6-lextab-None.patch b/dev-python/ply/files/3.6-lextab-None.patch
new file mode 100644
index 000000000000..cab0a466d66f
--- /dev/null
+++ b/dev-python/ply/files/3.6-lextab-None.patch
@@ -0,0 +1,49 @@
+From dbf122652d38ba03ff9f9fe4aa9bee3693e6775f Mon Sep 17 00:00:00 2001
+From: David Beazley <dave@dabeaz.com>
+Date: Fri, 8 May 2015 10:10:55 -0500
+Subject: [PATCH] Minor fix to account for bad None arguments for
+ tabmodule/lextab
+
+---
+ ply/lex.py  | 4 ++++
+ ply/yacc.py | 5 ++++-
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/ply/lex.py b/ply/lex.py
+index ed1e2ed..772325c 100644
+--- a/ply/lex.py
++++ b/ply/lex.py
+@@ -859,6 +859,10 @@ def validate_module(self, module):
+ # -----------------------------------------------------------------------------
+ def lex(module=None, object=None, debug=False, optimize=False, lextab='lextab',
+         reflags=0, nowarn=False, outputdir=None, debuglog=None, errorlog=None):
++
++    if lextab is None:
++        lextab = 'lextab'
++
+     global lexer
+ 
+     ldict = None
+diff --git a/ply/yacc.py b/ply/yacc.py
+index e0b4faf..eb02cc2 100644
+--- a/ply/yacc.py
++++ b/ply/yacc.py
+@@ -2709,7 +2709,7 @@ def write_table(self, tabmodule, outputdir='', signature=''):
+ _lr_method = %r
+ 
+ _lr_signature = %r
+-    ''' % (filename, __tabversion__, self.lr_method, signature))
++    ''' % (os.path.basename(filename), __tabversion__, self.lr_method, signature))
+ 
+             # Change smaller to 0 to go back to original tables
+             smaller = 1
+@@ -3183,6 +3183,9 @@ def yacc(method='LALR', debug=yaccdebug, module=None, tabmodule=tab_module, star
+          check_recursion=True, optimize=False, write_tables=True, debugfile=debug_file,
+          outputdir=None, debuglog=None, errorlog=None, picklefile=None):
+ 
++    if tabmodule is None:
++        tabmodule = tab_module
++
+     # Reference to the parsing method of the last built parser
+     global parse
+ 
diff --git a/dev-python/ply/files/3.6-picklefile-IOError.patch b/dev-python/ply/files/3.6-picklefile-IOError.patch
new file mode 100644
index 000000000000..85b39494a6fd
--- /dev/null
+++ b/dev-python/ply/files/3.6-picklefile-IOError.patch
@@ -0,0 +1,24 @@
+From f50768b0b2176998675e728d84ac05f0eef19614 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 17 May 2015 12:14:16 -0400
+Subject: [PATCH] Catch/ignore IOError when opening picklefile for reading in
+ yacc.yacc()
+
+Should resolve #66.
+---
+ ply/yacc.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ply/yacc.py b/ply/yacc.py
+index eb02cc2..2835c90 100644
+--- a/ply/yacc.py
++++ b/ply/yacc.py
+@@ -3265,6 +3265,8 @@ def yacc(method='LALR', debug=yaccdebug, module=None, tabmodule=tab_module, star
+         errorlog.warning(str(e))
+     except ImportError:
+         pass
++    except IOError:
++        pass
+ 
+     if debuglog is None:
+         if debug:
diff --git a/dev-python/ply/metadata.xml b/dev-python/ply/metadata.xml
new file mode 100644
index 000000000000..383221e6eaea
--- /dev/null
+++ b/dev-python/ply/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+PLY is a Python-only implementation of the popular compiler construction
+tools lex and yacc. The implementation borrows ideas from a number of
+previous efforts; most notably John Aycock's SPARK toolkit. However,
+the overall flavor of the implementation is more closely modeled after
+the C version of lex and yacc. The other significant feature of PLY is
+that it provides extensive input validation and error reporting--much
+more so than other Python parsing tools.
+	</longdescription>
+	<longdescription lang="ja">
+PLY�Lex�Yacc�有��コンパイラ・コンストラクション・ツール�Python言語実装��
+。��実装�以��試��ら幾�も�アイディアを借り����。����ん��John Aycock�SPARKツールキット�ら��。�����ら�実装�全体��C言語�よるLex�Yacc�より近�モデル��。PLY�他���点�幅広�入力�リデーション�エラー報告を�供�る点��。 -- ��二点�他�Python言語パーサーより優れ����。
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">ply</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ply/ply-3.10.ebuild b/dev-python/ply/ply-3.10.ebuild
new file mode 100644
index 000000000000..db6af64006d6
--- /dev/null
+++ b/dev-python/ply/ply-3.10.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Lex-Yacc library"
+HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.python.org/pypi/ply"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="examples"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( ANNOUNCE CHANGES TODO )
+
+PATCHES=( "${FILESDIR}/3.6-picklefile-IOError.patch" )
+
+python_test() {
+	cp -r -l test "${BUILD_DIR}"/ || die
+	cd "${BUILD_DIR}"/test || die
+
+	# Checks for pyc/pyo files
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local t
+	for t in testlex.py testyacc.py; do
+		"${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"
+	done
+}
+
+python_install_all() {
+	local HTML_DOCS=( doc/. )
+	use examples && dodoc -r example
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ply/ply-3.6-r1.ebuild b/dev-python/ply/ply-3.6-r1.ebuild
new file mode 100644
index 000000000000..78598ff6fcbd
--- /dev/null
+++ b/dev-python/ply/ply-3.6-r1.ebuild
@@ -0,0 +1,44 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Lex-Yacc library"
+HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.python.org/pypi/ply"
+SRC_URI="http://www.dabeaz.com/ply/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+DOCS=( ANNOUNCE CHANGES TODO )
+PATCHES=(
+	"${FILESDIR}/3.6-lextab-None.patch"
+	"${FILESDIR}/3.6-picklefile-IOError.patch"
+)
+
+python_test() {
+	cp -r -l test "${BUILD_DIR}"/ || die
+	cd "${BUILD_DIR}"/test || die
+
+	# Checks for pyc/pyo files
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local t
+	for t in testlex.py testyacc.py; do
+		"${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"
+	done
+}
+
+python_install_all() {
+	local HTML_DOCS=( doc/. )
+	use examples && local EXAMPLES=( example/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ply/ply-3.9.ebuild b/dev-python/ply/ply-3.9.ebuild
new file mode 100644
index 000000000000..3624433e01ab
--- /dev/null
+++ b/dev-python/ply/ply-3.9.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Lex-Yacc library"
+HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.python.org/pypi/ply"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="examples"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( ANNOUNCE CHANGES TODO )
+
+PATCHES=( "${FILESDIR}/3.6-picklefile-IOError.patch" )
+
+python_test() {
+	cp -r -l test "${BUILD_DIR}"/ || die
+	cd "${BUILD_DIR}"/test || die
+
+	# Checks for pyc/pyo files
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local t
+	for t in testlex.py testyacc.py; do
+		"${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"
+	done
+}
+
+python_install_all() {
+	local HTML_DOCS=( doc/. )
+	use examples && dodoc -r example
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/plyr/Manifest b/dev-python/plyr/Manifest
new file mode 100644
index 000000000000..d1fa196306a0
--- /dev/null
+++ b/dev-python/plyr/Manifest
@@ -0,0 +1,5 @@
+DIST python-glyr-1.0.6.tar.gz 42952 SHA256 5bb41d3fb860ef02e560942e9f51d9bef167725cef03577af3667465005bacfd SHA512 c4b04b1379116048f78c3ce5f9d30c92fd0d7198bfda456891d3012d115b86a5970595d9b4bc1d43028e87c9d467c35a7d02c7f3a9f4670dae8a17c22d1ab58a WHIRLPOOL 182b43c2611e35455d152e0a7ef32c9da5530b819ae04bd8086e8e96f8e9c5ee661d940a42b31c56a063286074e1842e468c6d4c4a58513bf478ea2280892e8d
+EBUILD plyr-1.0.6.ebuild 1337 SHA256 7cd93f03edbfa2eee3b18462cc16894f354cf6897fd041b92e1a1c8140759136 SHA512 83028d3ef8afbef92c0c021b313cd7dd729687ea7a800b4e54c50af6fb1828d0ec66b9afd12939a901ea3251f1eaf10d1e2ad150a1f36d0d0056ebdaf5a9f789 WHIRLPOOL 57493bed794361dbe2476fdfba7868820d8c8e3e6e24324d9b9cc819c6fd9e8956b061a2c5fd8e84b16f72edadde22e97c9b6662d76ba0d2569966963e4c7153
+MISC ChangeLog 3073 SHA256 97ca67590c244346771d9f6a9dcc9834715f35e4666e07652848b07e9dadd3ea SHA512 8a8661ff7f7804628581d3128e22c95946c0b27322e52a78b080235127bcf5a3b42e33eae039fbe656152f3469a94347253f034ec260c456a31d6301cb3be3d7 WHIRLPOOL 868bd12f6047b59e6634eda070957c65877a8e26f112476e8a7dea95d1a309ffd4f62c320fd5ac17b80f2103bcdddedf8b6eefdd360d9dd772100f6c61f9bdc9
+MISC ChangeLog-2015 1299 SHA256 a2ec044459465385c0bc27b649cf43d19054e083a07092385cdeef3d046cbb30 SHA512 7b7ada33c7ca4a58e3f47129a84b775aadbf8dd266a30184000c6db7677afbc3fede637f1895bbaa8dfb32a63a9ab5d1c4c743224ddb37b8a9c9f7e4475449f9 WHIRLPOOL 0d7feb8aea846704676ee746731f37461c275b76202d56bdc68fe30102cdf7686500669852ee511132a891029695271612c6d07bc218db5c805164bdeae4d8f9
+MISC metadata.xml 598 SHA256 e847074198cb3c1d95dc78896010b704ec72d23bde47cbedba1ce07b37ca4598 SHA512 c7b59753df154341f65ff5ef7ceb56a789ff8771c81a38f7d731efc2ecf7b563eb561dd2daa340c9ec8390b0699faf96875b1654493d130c53c59b437b66307b WHIRLPOOL 592ab671ccc702b94a4e62a9642226381f6dca44f04fafbb03569beb66df8a5cfc31ff1a23800146b0f937d4485a2f0b6c6d989bac1e0e85586598ab47dcedff
diff --git a/dev-python/plyr/metadata.xml b/dev-python/plyr/metadata.xml
new file mode 100644
index 000000000000..7365a65a9a6c
--- /dev/null
+++ b/dev-python/plyr/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>witold.pilat@gmail.com</email>
+		<name>Witold Piłat</name>
+		<description>Proxy maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+		</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">sahib/python-glyr</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/plyr/plyr-1.0.6.ebuild b/dev-python/plyr/plyr-1.0.6.ebuild
new file mode 100644
index 000000000000..1468d315bf5c
--- /dev/null
+++ b/dev-python/plyr/plyr-1.0.6.ebuild
@@ -0,0 +1,57 @@
+# 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 flag-o-matic
+
+MY_PN="python-glyr"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A python wrapper for Glyr"
+HOMEPAGE="https://sahib.github.com/python-glyr/intro.html
+	https://github.com/sahib/python-glyr"
+SRC_URI="https://github.com/sahib/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="media-libs/glyr"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable test requiring internet connection
+	sed -e 's:test_download:_&:' -i tests/test_misc.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html || die "Generating documentation failed"
+	fi
+}
+
+python_test() {
+	"${PYTHON}" -m unittest discover tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/plyvel/Manifest b/dev-python/plyvel/Manifest
new file mode 100644
index 000000000000..25b5c5dec891
--- /dev/null
+++ b/dev-python/plyvel/Manifest
@@ -0,0 +1,4 @@
+DIST plyvel-0.9.tar.gz 121513 SHA256 587d93681ae44936ae086b4b45486eb302e3853ba5af149aac3be9e9713998e9 SHA512 21a3bf0bff075e429fef63418c2a2578b22a4904cc2f4f66fc5fbccec22c762d918bea0622a22dcbeee2e60f8d35210ae8f1e63b6d37405f0fdf29ca2fe80586 WHIRLPOOL baf98bb318bb402ba26d98b1a4657a72b7b1b93dda7e0f0b667b66af798cd6e7723a1ae740265a88266ab608023de8b3d350873560117bf9557f2e8abf792453
+EBUILD plyvel-0.9.ebuild 1155 SHA256 7afeb19a678c7e9f259aae3ba6fdc23d0e59aeeaca42fe9b0568461086e55060 SHA512 e55a74c3bfa5d5e17e5c199ca14dc9589b335214d12669fc25ce9fb40e307e52baa764ff6d812428cf3ef15273e5293b191ed521f3961d1e812ff40ebed16735 WHIRLPOOL e1b0d9a2f2967270a9811ad8418740f2a3b7b228fca29857f273411f0ef1f81f89d1e869fc456189444e3ffb4bd44fd7f3fc4edb97021417c47a397b95fb5fe2
+MISC ChangeLog 823 SHA256 af076c831bb993eec92b329f190d9aafc515b08f4c419eb736d3a0350974318c SHA512 94a07c2b24fd3ad7a83f7a49e2c7e787229d43616bfe22620b222c825a08dda1081a368cfe6ac0ebda43ca0cbe284fa765c46d284fde419988ee44ef598a86b2 WHIRLPOOL 769dca5336fc781fb15535969fc1ae9ac9e64c1348e2e9f5dfd830bf916e57225eaa62e2e014e1fa503bec82bbc69f3e811b1beb836b24a3b6a78fce16d7cbfc
+MISC metadata.xml 628 SHA256 cfe0baade567d24282c9aa5e6dd6a3135b0f02dd6e995ae087ecf7ed205e3022 SHA512 b802a4e7746b14d914cf78631a6a62c791b542c7924e0f6f651bf2be018267889d6528abe40ee82dddd9482bea083056796c84b879b65225daa83e6d7ab496cb WHIRLPOOL ba1e7bd2c44bbfa235f0198c5926151442eb617c1f8c98dfc1039864611cc8fdac59e4b3232ee30a2400957877442fe3195162484f62a37f1a325ca387b228af
diff --git a/dev-python/plyvel/metadata.xml b/dev-python/plyvel/metadata.xml
new file mode 100644
index 000000000000..fe5a06876297
--- /dev/null
+++ b/dev-python/plyvel/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">plyvel</remote-id>
+		<remote-id type="bitbucket">wbolster/plyvel</remote-id>
+		<remote-id type="github">wbolster/plyvel</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/plyvel/plyvel-0.9.ebuild b/dev-python/plyvel/plyvel-0.9.ebuild
new file mode 100644
index 000000000000..ce2e392a5bb7
--- /dev/null
+++ b/dev-python/plyvel/plyvel-0.9.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Python interface to LevelDB"
+HOMEPAGE="https://github.com/wbolster/plyvel"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-libs/leveldb"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile() {
+	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake doc
+}
+
+python_test() {
+	local lib="$(ls "${BUILD_DIR}/lib/${PN}/"*.so | head -n1)"
+	ln -s "${lib}" "${PN}" || die
+	py.test || die "tests failed with ${EPYTHON}"
+	rm "${PN}/$(basename "${lib}")" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build//html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pmw/Manifest b/dev-python/pmw/Manifest
new file mode 100644
index 000000000000..a26b2983cb68
--- /dev/null
+++ b/dev-python/pmw/Manifest
@@ -0,0 +1,10 @@
+AUX pmw-1.3.3-install-no-docs.patch 496 SHA256 75a605b0dd61f083ab1a074b88962a94ff6e9125ededfe47d89805a49c5f264b SHA512 6925199967f5d980285165f13339903947ca3c1841a279a79913c68a3d7a7e381d34b1a3c5af359a5c63b1a0d94dcb6e883c661a222e96cdc1aa8a9239f31811 WHIRLPOOL d2628132e43cf2bf6f8524aab0e09a634a34f75b9f4115022776eafe89cf8a97ba9414f005df578a4cdc2d7943214fc2e9063c894fb0fade987422079d89f678
+DIST Pmw-2.0.1.tar.gz 830448 SHA256 0b9d28f52755a7a081b44591c3dd912054f896e56c9a627db4dd228306ad1120 SHA512 99654e961aa40a64eebc08fe473e94da0ce431e6465255c68c251dfd544a51edef1a5d97dfd89ce756eb5f7fcf917dbef27f646ba9451ab72f3d460daa09a556 WHIRLPOOL 8486016696e0576794b0ca29c73b9df532be1effeaf2e267f1fc8172bfbbc9be43acbfbf550c3f06ff1660b933d31bae9a0dbf2fa65b4fc2d607762bda46eda7
+DIST Pmw.1.3.3.tar.gz 451232 SHA256 0727bada8afe2e8844e95eb007f5331777389e23f9fce8f49c4864b153e4a494 SHA512 d63fad8f8c5bb9b8cb940b10bdf9e3bc1dabe714e10f32c587d5e1097ef0767492602984089172d85cf57c8ebf34acf555b8fe73a2157c6f734ee36042803668 WHIRLPOOL 6b0aaa767d8553637b2fa709f2f8c19f120ddb680fd8e68d6db77e82826f4ab6c5f872a0100371118486d8b07d43e177f2774c51a7ff4e4aa3825ebe3459abe3
+DIST Pmw.2.0.0.tar.gz 422125 SHA256 72bfdbb206a3853c9855bf8527e7720b3b28bdb79d810b49b208dfb964518ff8 SHA512 409b5ccdc8397b48c4d339e297c9729a1bc3f33c2b256d29b99c4c0e2e013d7aeae4b3089b22112b0d8d43dd8cd5208306afbcc4e9f6ab98005c16773aed7117 WHIRLPOOL 066f2851dafb9f8a1995b58378e0432e337d0f5f1170bd5d32a725d546f7de50e2ffa365ebb791404da2fe46d59e4b5c1c9638edc2163df77db04f095265de05
+EBUILD pmw-1.3.3-r2.ebuild 1227 SHA256 33989c5057cf406a3ff7b1d0a54e403d106d6178741ddec0d4749bbd6473ecba SHA512 1c5fa6dcecf737a07309652a046cafbfcdf9333a8dea32626fe8a08fcb1867bdc0746a1bdb79814418203ddd0ab8c38a57fbda0e2c9c83429dd1d571953927ba WHIRLPOOL 1c90f9ae76fc0ee4f45940a2da3a74d1293923931a012fb2f4c8fef40a08efc7d750a56031c28fb2f1d62294360e77a1d20990ff01c42acd580ac001f251c7a1
+EBUILD pmw-2.0.0-r2.ebuild 1245 SHA256 b471b24ff9146fedb204a66535bd9d38d489955d9e0afb7b7831083faeb28735 SHA512 8a5b4d96d817b5684af03c82989afa34fb772cb60358d0cd701674e04f93126d494f40ae8dc14dc9ca7044b102d0a005142038af8628dbe6aad9711b6b69666c WHIRLPOOL 2d7ef1d68d5c5fd38e952fc998d4fe0408571cbb71297ce9a3bb51d1d5cec809f1a1c9dd566f725bf9f589be800238e58583c343fe23485bf27e0277b66ce97e
+EBUILD pmw-2.0.1.ebuild 1207 SHA256 903aadf825a631f632d965c987109329e7fbf4daba0929b981bb814bf6c642f1 SHA512 3e40043d1693ac9c88ce6ef34d822451d0fc1a66c76c38a3e2ca6dcaac1e6e1099185d22e7655d78d5f43ac6e255a802d07d5620a664492af1314df9cdc34e89 WHIRLPOOL 43b7d4d0b1c1efb9a73a524f814da7c8f974e3cfc6c36c966b229b73033395c3256bdbab66372bef0c3b1db6e8df62c45b4d7c424bd322493b10bb69fc805730
+MISC ChangeLog 3753 SHA256 e8e998e0618a5e15a53a0bc4cab89c512e2babc190a1c05f1d16c61241c326e6 SHA512 8cd77fd54fd4bd7c451cbacbf73f6d04d2aa1d331f0d5bbe499475dab2d33f1750929f9eecc2b7ae7a4db2b0e8f391b6574d31908aaf53d28d2490fa9905dbb7 WHIRLPOOL 6aa861e324ea047e46062feb3b07f7682176c4d704b80860d6f3f3c47ab4d691d44b3c332a935325063a6fed284b70080bc772426f26c22521d90540ba4d2692
+MISC ChangeLog-2015 6934 SHA256 6a87065f725b51c52fa6e7aa4b84cf2806c17ca4f2008e4b6eed316001fc24eb SHA512 4bb7891276382941e5ca09e8cf5022472dce9b09ff28a4b2922b94256da6eab3f6732693960b428c84300df46ba29220aa8523ac4de88a89e434d780d93be90a WHIRLPOOL c1eb3d7feea093b491b5c40eb023cd352517e5aed384573146230f89346b6263bfb0293d00f8fa89c7b30185c161679e7ae26c77e9c8c823e2489841ffe9012e
+MISC metadata.xml 366 SHA256 ff83cbaa724e91e3365df1e5ca315cbf166e421593562ccbddef936a4b586227 SHA512 f0bac4e4faad03c83434cc214c0a0befebcbd1cd7eb89663d6058dcb36ee791102b081595e604409d278f01d7c2062f1d1ca1e01e1194e44826f66e6121697f7 WHIRLPOOL f138fdc64a7b851e67b1dcf5ea76691630a05ec5b6a5a9a71963a5c1206fb11e1f49b8a4e353e6616457dbbe44a342ea2534dfeda99f756363f366591a83f077
diff --git a/dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch b/dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch
new file mode 100644
index 000000000000..979e24abf59a
--- /dev/null
+++ b/dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch
@@ -0,0 +1,17 @@
+ src/setup.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/setup.py b/src/setup.py
+index a5f9039..cfcf8a2 100755
+--- a/src/setup.py
++++ b/src/setup.py
+@@ -16,9 +16,7 @@ setup(name="Pmw",
+ 		'Pmw.Pmw_1_3_3.lib',],
+ 
+       package_data={'Pmw': ['Pmw_1_3_3/lib/Pmw.def',
+-			    'Pmw_1_3_3/doc/*',
+ 	                    'Pmw_1_3_3/contrib/*',
+-	                    'Pmw_1_3_3/demos/*',
+ 	                    'Pmw_1_3_3/tests/*',
+                             'Pmw_1_3_3/bin/*',
+ 			   ]
diff --git a/dev-python/pmw/metadata.xml b/dev-python/pmw/metadata.xml
new file mode 100644
index 000000000000..6fdaea218746
--- /dev/null
+++ b/dev-python/pmw/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pmw</remote-id>
+    <remote-id type="sourceforge">pmw</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pmw/pmw-1.3.3-r2.ebuild b/dev-python/pmw/pmw-1.3.3-r2.ebuild
new file mode 100644
index 000000000000..7532cdb63cfe
--- /dev/null
+++ b/dev-python/pmw/pmw-1.3.3-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk"
+
+inherit distutils-r1
+
+MY_P="Pmw.${PV}"
+
+DESCRIPTION="Toolkit for building high-level compound widgets in Python using the Tkinter module"
+HOMEPAGE="http://pmw.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="py2"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc examples"
+
+DEPEND="!dev-python/pmw:0"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/src"
+
+DOCS="Pmw/README"
+# https://sourceforge.net/p/pmw/bugs/39/
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${P}-install-no-docs.patch )
+
+python_test() {
+	cd "${BUILD_DIR}/lib/Pmw/Pmw_1_3_3/" || die
+	PYTHONPATH=PYTHONPATH=tests:../../
+	cp tests/{flagup.bmp,earthris.gif} . || die
+	for test in tests/*_test.py; do
+		echo "running test "$test
+		PYTHONPATH=tests:../../ "${PYTHON}" $test || die
+	done
+}
+
+python_install_all() {
+	local DIR="Pmw/Pmw_1_3_3"
+
+	if use doc; then
+		dohtml -a html,gif,py ${DIR}/doc/*
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins ${DIR}/demos/*
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pmw/pmw-2.0.0-r2.ebuild b/dev-python/pmw/pmw-2.0.0-r2.ebuild
new file mode 100644
index 000000000000..5c71bc92c986
--- /dev/null
+++ b/dev-python/pmw/pmw-2.0.0-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_4 )
+PYTHON_REQ_USE="tk"
+
+inherit distutils-r1
+
+MY_P="Pmw.${PV}"
+
+DESCRIPTION="Toolkit for building high-level compound widgets in Python using the Tkinter module"
+HOMEPAGE="http://pmw.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="py3"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+DEPEND="!dev-python/pmw:0"
+RDEPEND="${DEPEND}"
+# https://sourceforge.net/p/pmw/bugs/39/
+RESTRICT="test"
+
+S="${WORKDIR}/src"
+
+DOCS="Pmw/README"
+
+python_prepare() {
+	distutils-r1_python_prepare
+	2to3 Pmw
+}
+
+python_test() {
+	cd "${BUILD_DIR}/lib/Pmw/Pmw_2_0_0/" || die
+	PYTHONPATH=PYTHONPATH=tests:../../
+	cp tests/{flagup.bmp,earthris.gif} . || die
+	for test in tests/*_test.py; do
+		echo "running test "$test
+		PYTHONPATH=tests:../../ "${PYTHON}" $test || die
+	done
+}
+
+python_install_all() {
+	local DIR="Pmw/Pmw_2_0_0"
+
+	if use doc; then
+		dohtml -a html,gif,py "${DIR}"/doc/*
+	fi
+
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/examples"
+		doins "${DIR}"/demos/*
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pmw/pmw-2.0.1.ebuild b/dev-python/pmw/pmw-2.0.1.ebuild
new file mode 100644
index 000000000000..4bdfc6b21ed6
--- /dev/null
+++ b/dev-python/pmw/pmw-2.0.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="tk"
+
+inherit distutils-r1 virtualx
+
+MY_PN="Pmw"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Toolkit for building high-level compound widgets in Python using the Tkinter module"
+HOMEPAGE="http://pmw.sourceforge.net/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="py3"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+DEPEND="!dev-python/pmw:0"
+RDEPEND="${DEPEND}"
+# https://sourceforge.net/p/pmw/bugs/39/
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare() {
+	distutils-r1_python_prepare
+	2to3 Pmw
+}
+
+python_test() {
+	VIRTUALX_COMMAND="${PYTHON}"
+	cd "${BUILD_DIR}/lib/Pmw/Pmw_${PV//./_}/" || die
+	cp tests/{flagup.bmp,earthris.gif} . || die
+	for test in tests/*_test.py; do
+		echo "running test "$test
+		PYTHONPATH=tests:../../ virtualmake $test || die
+	done
+}
+
+python_install_all() {
+	local DIR="Pmw/Pmw_${PV//./_}"
+
+	use doc && HTML_DOCS=( "${DIR}"/doc/. )
+	use examples && EXAMPLES=( "${DIR}"/demos/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
new file mode 100644
index 000000000000..85b961de4a00
--- /dev/null
+++ b/dev-python/pocketlint/Manifest
@@ -0,0 +1,3 @@
+DIST pocketlint-0.15.tar.gz 22334 SHA256 f2e98e64316a38b56100d2427ca8f9c7ff168b1b08016dc6c10e8a35574ed10d SHA512 0d3e3061635c8d88f4e31aa11f3cbb85a1d9acd3064c17b7bd3c50eb90f824f17a903c55bace8033bdecd626d792ffee091b8b5719b2993f475a4321f033c66b WHIRLPOOL 3aa30bbf687c372adcdeef5c98a50232ab20e916fb7f9ea70d5f56fee840b30245a802c84145ce19549ad1ecbc133bfad31455d673ad7da2a15d990dec025e26
+EBUILD pocketlint-0.15.ebuild 440 SHA256 b0221478f0faca04d30899f0fb0ce835f42647aacae959061201cd9200964b67 SHA512 51a8113c7fcdbd25146407225c3ef2dc52b4f66ccbf9db85dbd2c10652012db66461f31ed4bba1c49814c236dbe39420fd46e4db37bc2df5797eef5486acb2f6 WHIRLPOOL 34efc4e82fb42574a68570ac32537cf56962ea91e8a1df4972a51bab381d2e30a96fc53bbbc25f0df0ead72cf726e61b008cecf4708864eb6b19e44d9d87ccc4
+MISC metadata.xml 348 SHA256 d410bdc76e4b29a83cf8db8eeb9cc312b69e1a79c47c2ed4f0d3a8fdcce3c32b SHA512 925fd532aab036f7bb18011abfdf98daae08e648aa8b64853d721396dedc431254f54ae2168e5572e2e1f101c6e5ffde2b08a26e423407d84e0e849bd7d4d38e WHIRLPOOL bad605806d9ccb05eeff70be883a35f60d7104a70da1ad2dc332c926dc7b82631b63945130e537544f4cb6cd9da99905d572367018123e36c887b3a4ad4d3950
diff --git a/dev-python/pocketlint/metadata.xml b/dev-python/pocketlint/metadata.xml
new file mode 100644
index 000000000000..3b45e273367a
--- /dev/null
+++ b/dev-python/pocketlint/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">rhinstaller/pocketlint</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pocketlint/pocketlint-0.15.ebuild b/dev-python/pocketlint/pocketlint-0.15.ebuild
new file mode 100644
index 000000000000..09a825f63aee
--- /dev/null
+++ b/dev-python/pocketlint/pocketlint-0.15.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Shared code for running pylint against rhinstaller projects"
+HOMEPAGE="https://github.com/rhinstaller/pocketlint"
+SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/pockets/Manifest b/dev-python/pockets/Manifest
new file mode 100644
index 000000000000..15cf18ab3528
--- /dev/null
+++ b/dev-python/pockets/Manifest
@@ -0,0 +1,7 @@
+AUX no_installed_tests.patch 300 SHA256 2490e9b26418b2ee572350fcc70ccc9bad42f06530e0fc58ce44d6853ac267e6 SHA512 9775565373d46c2fbb8d3b3002e9205f1c71a68f0e02c95f177f25451a50579b13efcb3328a0f90d0ba133a0997651ec9697957a6fd76db990e5e83c0e6a10e2 WHIRLPOOL e77f81df014d521aca7cd052ebae8d4dee2342c5a79c2a50fe60dc2b2493228d812de4d317b78212b2f344e994d1a40947086a546579d89b582ff710465a2de1
+DIST pockets-0.3.tar.gz 20441 SHA256 5c9682eeb5b66fbbb69187ad51a4c3a8eb07b6e2718455a04703f7ff5d5f84be SHA512 da208b541aa4e0884e37a7d128d11d1d99fac22f10e5dbc88065487265aca8ca348286c0d0214dae657af824cca08f0585c70abc27be25f4c54040cd44a3e44c WHIRLPOOL 7ea2618aae4a919a9f5a68bc0f96a41743f924eb252788097b18a5c9ecb26bb8419e4f114e18fbe51dafdbcd0fa4ebcf517db9a958ea02ed2c53edd298234b84
+DIST pockets-0.5.1.tar.gz 18437 SHA256 ba8fdd9e87454fb0653912ac9db9577197fa47ac7614e127a0b71e7dd0d7f1f7 SHA512 f0ae52e2260d83ea76acf8996e901a8f1868b578788b9e98233d92850703ef98e3ba18beb4e7adc5883c8d339ea63a8c4b95203ff40c2521b2179fd87cab1391 WHIRLPOOL 4c89d55a2cd4ff2fb7efaa9a5b7d0e8e6da4f3276500091897e46a0a397aae2cc7fb58a7449cdbdf37f7b0d2b55de843b1ed5707182ac50f45d07be930fcff60
+EBUILD pockets-0.3.ebuild 862 SHA256 6b94ac5efc83e7a67c1362a3e9437e7897100afdfa9e8025bbead4cf8f0358a7 SHA512 fc9262b71bac75004b7a63d03af284a311a85484f37dcdc984dbfcef9febedd9988baf3883b384c079b7dee6291d64a73a8964461eb2f62b3acca24383d74fcd WHIRLPOOL d901c47561d9754854cca9a4f75b55aa1729f3c65c70b88d038b0c0d0c509b7c0b366c6b34884307ee9edc6910317898e39ee95bba11ba889501bb0b17ade5f9
+EBUILD pockets-0.5.1.ebuild 603 SHA256 4809dfc889901af48ddc99f52d7b1d2b1729ca2bc9dc3cb680ce12128202ca0b SHA512 5c5e0a4f3465e4376fecce715300e6f29687a551ee1372982425e5880865f78e9ede7f0b018d545fff0863a3a47db74e1e2b6d853ccff4547d6e2d7373968be9 WHIRLPOOL b7b832f1445d20a3c45ed8c3f554cefc38a9ac771d2aa2a6362bad54508cb66c72f06768f7777a68000a9a17ca8e4507905dd488eaf94fefad1c2e78dd24099e
+MISC ChangeLog 449 SHA256 90cb3d45b91dbe1b94208520b041c6138a92bb2c1e9b0592cd750d3b04b75392 SHA512 51e4724d0fff7b335a706019b21f8694b358cd545624597b74e7922d376cd192eb4157620550e240b4b77d8f6f25b9fc4848d2a9fbb04bea79a9fc063ad0f401 WHIRLPOOL 7313c4b361cd918702406be0e374c6f79fa937813f349ce62f74eb471d12d73a333047951a1b471169ef1ca7671430c1b88c10fa7037221e4da301653a4f442b
+MISC metadata.xml 331 SHA256 aafff4ae9162ca3f2defa526b0ab9274a36988a03f47cacb2c6d12287a4cb0a7 SHA512 70933bb4063959e5fa091a416ba3aeb6e8540e03263fd8cfb5680165200e2716a90a19e03afbd9f746cd7ca7673bf309d47307c7e2f49b7f2609d77de65ed4fb WHIRLPOOL e2045ec2b6fe50eb5637f402cb2bfea725ffa2f51564a4597a29ed87f56bcb861049f3026cc93cf34095a0ed91f3b63190e3f9c5c08afed7796e470be2248fac
diff --git a/dev-python/pockets/files/no_installed_tests.patch b/dev-python/pockets/files/no_installed_tests.patch
new file mode 100644
index 000000000000..05c23aaae901
--- /dev/null
+++ b/dev-python/pockets/files/no_installed_tests.patch
@@ -0,0 +1,11 @@
+--- setup.py.orig	2016-08-03 16:30:08.093499589 +0200
++++ setup.py	2016-08-03 16:30:40.861165597 +0200
+@@ -39,7 +39,7 @@
+         'Topic :: Utilities',
+     ],
+     platforms='any',
+-    packages=find_packages(),
++    packages=["pockets"],
+     install_requires=reqs,
+     tests_require=test_reqs
+ )
diff --git a/dev-python/pockets/metadata.xml b/dev-python/pockets/metadata.xml
new file mode 100644
index 000000000000..6c00750775c2
--- /dev/null
+++ b/dev-python/pockets/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>klausman@gentoo.org</email>
+    <name>Tobias Klausmann</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pockets</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pockets/pockets-0.3.ebuild b/dev-python/pockets/pockets-0.3.ebuild
new file mode 100644
index 000000000000..51e8ddb01a74
--- /dev/null
+++ b/dev-python/pockets/pockets-0.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+IUSE="test"
+
+DESCRIPTION="A collection of helpful Python tools"
+HOMEPAGE="https://pypi.python.org/pypi/pockets"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
+	>=dev-python/flake8-2.3.0[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
+	        dev-python/nose[${PYTHON_USEDEP}]
+	      )
+	dev-python/setuptools[${PYTHON_USEDEP}]
+
+"
+src_prepare() {
+	epatch "${FILESDIR}/no_installed_tests.patch" || die
+}
+python_test() {
+	nosetests tests || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pockets/pockets-0.5.1.ebuild b/dev-python/pockets/pockets-0.5.1.ebuild
new file mode 100644
index 000000000000..dbd67e009429
--- /dev/null
+++ b/dev-python/pockets/pockets-0.5.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of helpful Python tools"
+HOMEPAGE="https://pypi.python.org/pypi/pockets"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/coverage[${PYTHON_USEDEP}]
+	dev-python/flake8[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/polib/Manifest b/dev-python/polib/Manifest
new file mode 100644
index 000000000000..9aacfc7a2c5e
--- /dev/null
+++ b/dev-python/polib/Manifest
@@ -0,0 +1,7 @@
+DIST polib-1.0.4.tar.gz 151634 SHA256 8b3276f75ce2fce9442e27db3ae63d842416e17f0e2095f39ff52dc735e5749a SHA512 a38d57acdaded0371be83825a28f14f178aebdbc0435724f33eebda109adb2b8210e33659ebec88d2d9e98aa60c482d7f8a958ec18f6769fda7a2fb14edd2744 WHIRLPOOL 1fe4e5bbf27444c1a6d7d79c70325078d3b2d15f6a5eb84852ccb080dfee4d03a7f8311127b6f93e1cb23ad633155bf93221317ec3518b1c5d7ec52b79fab87d
+DIST polib-1.0.7.tar.gz 156282 SHA256 43ce60d05ffa442ba9d3c5722193aadb93c38174b9fb471c8ea7ccbf8349bbca SHA512 bfec3538f9ab499ff2149bb40e0685b4cb6d5f0bc7ce8dc33e1fc511a6169e01c1a317e652daed7b3bfd9bbfe6ee1d545b4d8913f54e91504c4debb5b1b94b6e WHIRLPOOL 79bb18cb71d4aba5b6d4b91893cfa043f3df56ae11c4b90b9c8c6a8d3757d1f84bc1a75b1fea462e61907518c042496a422085cb352ae105f25ed11925a4e2cf
+EBUILD polib-1.0.4.ebuild 754 SHA256 2d3d7b58cc05cadb0a6d97508c5b732f6c91c00c96c81d16810ecbb357513a37 SHA512 7ed72366cc0bd3b039bf9492143c9627ff9213e86473f7e98004d9f0aa4869cc36d939678ea30fe83206b1b5c19e1df6441d4bdf34bf7958c638d5225fc5e3ee WHIRLPOOL 979380d9486751643bc8bb78c57e9b2fa3748cc8a528bc54b2f0f6276231822a416e5024b6960962c73a0419295f82920a31ba08a28837d7efef7098205c1259
+EBUILD polib-1.0.7.ebuild 763 SHA256 57a294101f7bea14c6d47fd6236ee9c7c222a75061ca25b2f988315811cf38ff SHA512 3a954760a49245616fcf34f79a2cffc0e120b6fd220ef038372e3015871d78840b9f9cda9d48fab771c4dd8776ba73e9d809b8fd1bb26410d3990802965aaf73 WHIRLPOOL 7970491dcd75483855caf739e24c0dd9b7222d63c4a7d5c4210f1562470cc68cba3b69f9e5eb2c63266e3cdf9b9838c3fb53fd5b21e2c2c7b8df806d822a8d9e
+MISC ChangeLog 2835 SHA256 e02a6945b55409c84d4d82af10b248b7b5d85c868f7889e73f8dfc3e1ffa979b SHA512 221ba4112cd9545a63a0d3f602e7585ae04db8ae1c90f6b4160522d32b52de573e8373c9048c1d42ebb40f6ff399f01cddf1a96d5cf812ac02ad05b2a507c9a0 WHIRLPOOL e93d3ab46e376d44ecb62b2d4c0d41562db70cdb9ceeb953512bc3a4998f8e8dd27acc98fd4dcc8b896d72a807520aac9a14fdabdc9356bbe1ce66a7ae695bff
+MISC ChangeLog-2015 1065 SHA256 439c72ac0ea0f3a7c5b4995858b1b1efb4498394e4df2bafb0c795d9ef018b17 SHA512 55c90c00c44e7d33d47fa185673db13a6b414dbb4efc19a83d7adc608ad9c9437a1e56a0ce7d937c90e6ccea232b3423bd9aa1cc4b72fe72bdb35da78ac153aa WHIRLPOOL 03549be3cf1b16c9cceee872d8627384a112dac90830850e98776e76a3c478850cbf3f4c770bed7f0c2c5c9c73ffad05bf6b1cbb36715138da0ccbaeafd30f9b
+MISC metadata.xml 388 SHA256 73be00bb4f9dfb81ed1b09421ae8efc4fbfb1ec6e1a85857ad06171ebf33029a SHA512 7afe518c98f3cbb71d13aa4cea16fe59eae8f711a1d1dd58c982c1dd8946b0a69196e0979612c995d53be215148d05615226eecc4be457adf8cd35b96f3f3f57 WHIRLPOOL f146aa1c550dcfcb77eca09522be0ff5ac84f6f89a836f135feeb92b4c332becd9dc0f6d49e78b121a4d3d8e1a6cfa462c22efba720eaca0ae6051e756b521e8
diff --git a/dev-python/polib/metadata.xml b/dev-python/polib/metadata.xml
new file mode 100644
index 000000000000..e9ef425b4c62
--- /dev/null
+++ b/dev-python/polib/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>tetromino@gentoo.org</email>
+    <name>Alexandre Rostovtsev</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="bitbucket">izi/polib</remote-id>
+    <remote-id type="pypi">polib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/polib/polib-1.0.4.ebuild b/dev-python/polib/polib-1.0.4.ebuild
new file mode 100644
index 000000000000..dd0fc2c7f091
--- /dev/null
+++ b/dev-python/polib/polib-1.0.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to manipulate gettext files (.po and .mo files)"
+HOMEPAGE="https://bitbucket.org/izi/polib/wiki/Home"
+SRC_URI="https://www.bitbucket.org/izi/polib/downloads/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+"
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		emake html
+	fi
+}
+
+python_test() {
+	python tests/tests.py || die
+}
+
+python_install_all() {
+	local DOCS="CHANGELOG README.rst"
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/polib/polib-1.0.7.ebuild b/dev-python/polib/polib-1.0.7.ebuild
new file mode 100644
index 000000000000..6a4df5cfbd1d
--- /dev/null
+++ b/dev-python/polib/polib-1.0.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to manipulate gettext files (.po and .mo files)"
+HOMEPAGE="https://bitbucket.org/izi/polib/wiki/Home"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="doc"
+
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" tests/tests.py || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGELOG README.rst )
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/polygon/Manifest b/dev-python/polygon/Manifest
new file mode 100644
index 000000000000..a7fe5aa4957e
--- /dev/null
+++ b/dev-python/polygon/Manifest
@@ -0,0 +1,7 @@
+DIST Polygon2-2.0.6.zip 73551 SHA256 3e0e1a5125e892faa5964523de28c0349b573ed102547e12a1affc3fed2cac3b SHA512 d0827fe3299449842e201598b59e423bf3029302037ffb9329dae0045b2be1727eb33951dfd22f560476360836305526be58e55d9d4cff36f3d9a4b0262b7aed WHIRLPOOL 50b176f05ade1780e21f8280d884996f04df3894a8479b5d82b1410cc53961c0faedea1b20b431b0eeb2996619abf91392e4c9291856a63c8b080605f646c67b
+DIST Polygon3-3.0.7.zip 76193 SHA256 627852f50fd6002b9a59eef291bb38c075d95e67c47a8d3b32713426ee137744 SHA512 e30cd8e51ad69a2d76b61a7d92ead4ac352e729093546b965f649866fd9c6a860e3cdcd9fcd7f8cc9f8d7735ccd1128fb5af00b3de89e4efd7128e446a70b33b WHIRLPOOL 7123420e402e3cb5034ad3ffaba561a8c250e6788ee6b89ca8376ed6a037a889611afcd34f135b1ee16261e2504a22895c491d91a691e1559628673682e1dead
+EBUILD polygon-2.0.6.ebuild 567 SHA256 ff8fdf08607c1486971fff8f90c8249eb4ff90499b7d297cbb91b400143d16bf SHA512 6c8ec101d6007d364a27ff42f49b3fced611316479745b061fc71c5bbbc29028179dbe7594e5b7ca5a6dac4f5e28888f2a7f2fdd9d211898297998ea7e45c876 WHIRLPOOL c7f495c2aaa7511b829d86a6cce8634453caa3f5cd5b00ae559290558528c76b1490b53d74b8b57dab88de4d0f4fa70ed87b80de64d2a63af6c0d089960db119
+EBUILD polygon-3.0.7.ebuild 879 SHA256 bb6b3e1212597a02fdbcbc05f29d6badc1e4c68e80bbc75580907e151d6e37c6 SHA512 9f4b4ba22096857888162455d6e7a11318f035a8ef906450947e43c1cf54cc25291b807db7beabbaa259f5f297955bed21b4f064daec70b0aeeba6c80b1745a0 WHIRLPOOL 877eff028d983288e051064826b3102e0466a9a355e741363f8fac23d73028584f237e5fc6b2e5efcd1cdbcc5becc651b2fe3188e2d0a16c0a100fa37abaa7ef
+MISC ChangeLog 3368 SHA256 13316152e1e3e82a1473c4811e6f72eef367286805499980cb67dd6a312e9a1f SHA512 88b03f277bcde42e3f9ff14ab3f4f4569a4c6accaefce5151eab56c0dda9c79f27d1a61eb1b839deaba043e3f93b16c9687a1c2e743453e1acd0e5ddd947fd21 WHIRLPOOL 1308fb65f90d0b886d68fdd9742c1488308ef174ac6741168c2aaa615187776afe05e94035ac85f3b8638f45c22a2d5283b2a4baa8aa0bfe46acb2f9bec455da
+MISC ChangeLog-2015 2466 SHA256 147069fa332e6584f83c9fb57e04baceaac64206caa9429841575b7abe31c5f5 SHA512 793561ef08b813bcf414caa22326223cd799a4e17c52e90ae946d8dc8cc6c1193ac9e5d35f9c947d284af060970a5825b87a4c87e30e944e60a904973f5a4a1b WHIRLPOOL c72a6c96103bc01891db709f91499f53fd4f8b973fc95c6dc7c6983fb494c78c27a687f7e4e7fcb12bec2786cca5eada1fe0e3b37b5b7f6b927d659802e7d030
+MISC metadata.xml 494 SHA256 53980d7fd814a3fe55dd4539f7915f44687a76e8d116ec6d293e178e287081d7 SHA512 5f98756dcf5dc6ea48d6d2943e494d5d72e2a0a38a7ef6de582f132d380940538b524e8f56ca59e1cca2d348569b655a68ff27563541b1d48cba98ee36491cb5 WHIRLPOOL d6a01fa361e9eb6453c0dd2970be17370d33ef264e548e4d57b3bf6f24a43be088013bd15399652a98e5b34c66c9651a616b0dcae4a1eb1d652a20e0b7e7b57f
diff --git a/dev-python/polygon/metadata.xml b/dev-python/polygon/metadata.xml
new file mode 100644
index 000000000000..d9b28381e91d
--- /dev/null
+++ b/dev-python/polygon/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<longdescription lang="en">
+  Polygon is a python package that handles polygonal shapes in 2D. It contains 
+  Python bindings for gpc, the General Polygon Clipping Library by 
+  Alan Murta and some extensions written in C and pure Python.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-python/polygon/polygon-2.0.6.ebuild b/dev-python/polygon/polygon-2.0.6.ebuild
new file mode 100644
index 000000000000..1a3a6bbaf25b
--- /dev/null
+++ b/dev-python/polygon/polygon-2.0.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package to handle polygonal shapes in 2D"
+HOMEPAGE="http://www.j-raedler.de/projects/polygon/"
+SRC_URI="https://www.bitbucket.org/jraedler/${PN}2/downloads/Polygon2-${PV}.zip"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/Polygon2-${PV}
+
+DOCS=( HISTORY doc/Polygon.txt )
+
+python_test() {
+	${PYTHON} test/Test.py || die "Tests failed"
+}
diff --git a/dev-python/polygon/polygon-3.0.7.ebuild b/dev-python/polygon/polygon-3.0.7.ebuild
new file mode 100644
index 000000000000..3a694ba4f5c0
--- /dev/null
+++ b/dev-python/polygon/polygon-3.0.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package to handle polygonal shapes in 2D"
+HOMEPAGE="http://www.j-raedler.de/projects/polygon"
+SRC_URI="https://www.bitbucket.org/jraedler/${PN}3/downloads/Polygon3-${PV}.zip"
+
+LICENSE="LGPL-2"
+SLOT="3"
+IUSE="examples"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/Polygon3-${PV}
+
+DOCS=( doc/{Polygon.txt,Polygon.pdf} )
+
+python_prepare_all() {
+	if use examples; then
+		mkdir examples || die
+		mv doc/{Examples.py,testpoly.gpf} examples || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${PYTHON} test/Test.py || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/positional/Manifest b/dev-python/positional/Manifest
new file mode 100644
index 000000000000..a6846921b831
--- /dev/null
+++ b/dev-python/positional/Manifest
@@ -0,0 +1,8 @@
+DIST positional-1.0.1.tar.gz 16398 SHA256 54a73f3593c6e30e9cdd0a727503b7c5dddbb75fb78bb681614b08dfde2bc444 SHA512 1071100fdc3d05520d452ef74a3294c7b16f84f41aac04ebd85fddcbbac58564e7ee836ac2a73af732b137bdf857efbfd15351e913afcdc88885d1b820183699 WHIRLPOOL 1a2a4ac9cc247f4e100f3acd55353d69b3adb79ed610bcc0a81f60816725ce66e60c258561dbbdcb98f42f11b3872873a956e6be838d0eae005918f621f2341f
+DIST positional-1.1.1.tar.gz 15987 SHA256 ef845fa46ee5a11564750aaa09dd7db059aaf39c44c901b37181e5ffa67034b0 SHA512 6bb8984c5a31081a97be3be1eff2d62747e829f7f4d1e6e973ab00e8baae3552ff996500a343b58986bb70399c99026284fd59185b3452dc2b9165e8276eefba WHIRLPOOL 99bee25ec30a1a99a8799ad8edd59fa64cdc37341242f51d865f09ae1999f5cc6b31059701737618533bf30b1deca8f1d067800c8c2b2ef83bed6c4007724445
+DIST positional-1.1.2.tar.gz 16434 SHA256 14e5b502bad1bbccade474602ac773bd9d88aaf3b016985747ea992567f9597b SHA512 864f6c505edea1a0639a97aeae554cbb9cf0141c3c175b836489b6f258d53f6d306e915bd75d6cb7c61f6eda9d36afaef1fdf0cd2f8afa61a6e797b1c81c8cb5 WHIRLPOOL bbc819c2df0c46515a1b0d3b8ad9229a5da632ecb4aa3d367d2fbb21213499f34711ff1b1adb0d71c3cb637651ac25c8432d4edf505eefb4af1fa566779ece1c
+EBUILD positional-1.0.1.ebuild 589 SHA256 a2b528873a25b5f3d96417c4898f0c1535e04b7039762f7a1f6900ce97a5debc SHA512 79a65e125d9173a513a8d8a0b303735c7e28ef1cbe43c7f28f1fcfafb8fd25ee021c90247e1d554aa5da4d3d1e7672fb0df5f7b3c7c0f4abe772d4ae6b5afc62 WHIRLPOOL 37e82763869d28f3418e85ef2d26fc09910e5ff3ac04e8b3a9ef07733a153787ecef5f1101d94fdb3bae645f3b2064026a81517dec94b75c3666212a859e8374
+EBUILD positional-1.1.1.ebuild 621 SHA256 c2844b710139dac689283965e40af978022ae7bd537e6f8a1a2d5ebbda72cd52 SHA512 fedf79b30dbfeeaa9d6c39eb728ca32f2f628824769ae5448d1113957caa2ba385e0b5752387146357889fa03b32add404aec2670b3b690a422856c617b35059 WHIRLPOOL 7766331d778c8c1c1bcef3390bfa3cdef6a063acc75ab6214d2275fb17b3a2d4600e59388b60c2221dbf3c2e0d3c84fce89230b99120ed8fd78c3318d734462a
+EBUILD positional-1.1.2.ebuild 621 SHA256 c2844b710139dac689283965e40af978022ae7bd537e6f8a1a2d5ebbda72cd52 SHA512 fedf79b30dbfeeaa9d6c39eb728ca32f2f628824769ae5448d1113957caa2ba385e0b5752387146357889fa03b32add404aec2670b3b690a422856c617b35059 WHIRLPOOL 7766331d778c8c1c1bcef3390bfa3cdef6a063acc75ab6214d2275fb17b3a2d4600e59388b60c2221dbf3c2e0d3c84fce89230b99120ed8fd78c3318d734462a
+MISC ChangeLog 987 SHA256 16244c4e5087aebf0c3409705dcd136d97e0943bfc938db2b56f565a6bc67d78 SHA512 dfcb3802329977f17cbcfa9b0466e6edc9190ecb1328ec2f87d3ddc06b2f625b0859680b8caa3581b46ba9e22b2a8fbaff68eae15ac913d08b30a827c17413d8 WHIRLPOOL fce854cdc47a2b5b386e9ef7d90328ba4ee131f3db648740ce3f54ec46edefe46fb119ae983f4fdb831fbb3c109f373819562f53cc2bd35b1d0684a09d829a11
+MISC metadata.xml 513 SHA256 4d34628628af8236893d79b7f98558adb43d2e789ae1c282825015b6811c07e1 SHA512 3279a282ce690d0025b82a1ba42298304fd375388afea2b7cfc0981da82a78002077df6c8b3cdf8d6b857872b97e25a1f37312cae5a473fe12f1cd6a50ccdeb9 WHIRLPOOL d9be6a961564c9db613c43986156b1f9bd1f4423bd1ec0f49ef7dc95993ab6a9a6fc3d1a70a18e30ed13e22fed418ee7e3304780c5550ee07f2f21b3b92241d9
diff --git a/dev-python/positional/metadata.xml b/dev-python/positional/metadata.xml
new file mode 100644
index 000000000000..e59bef8d91cf
--- /dev/null
+++ b/dev-python/positional/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		A decorator which enforces only some args may be passed positionally.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">morganfainberg/positional</remote-id>
+		<remote-id type="pypi">positional</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/positional/positional-1.0.1.ebuild b/dev-python/positional/positional-1.0.1.ebuild
new file mode 100644
index 000000000000..85a9c7ced394
--- /dev/null
+++ b/dev-python/positional/positional-1.0.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A decorator which enforces only some args may be passed positionally."
+HOMEPAGE="https://github.com/morganfainberg/positional"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/positional/positional-1.1.1.ebuild b/dev-python/positional/positional-1.1.1.ebuild
new file mode 100644
index 000000000000..b27fc4f42e33
--- /dev/null
+++ b/dev-python/positional/positional-1.1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A decorator which enforces only some args may be passed positionally."
+HOMEPAGE="https://github.com/morganfainberg/positional"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]"
diff --git a/dev-python/positional/positional-1.1.2.ebuild b/dev-python/positional/positional-1.1.2.ebuild
new file mode 100644
index 000000000000..b27fc4f42e33
--- /dev/null
+++ b/dev-python/positional/positional-1.1.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A decorator which enforces only some args may be passed positionally."
+HOMEPAGE="https://github.com/morganfainberg/positional"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]"
diff --git a/dev-python/posix_ipc/Manifest b/dev-python/posix_ipc/Manifest
new file mode 100644
index 000000000000..6fee657590bc
--- /dev/null
+++ b/dev-python/posix_ipc/Manifest
@@ -0,0 +1,5 @@
+DIST posix_ipc-0.9.8.tar.gz 66589 SHA256 271446eb133efb7410eb51265807aa54e0acb8eb7c2abcf027e51b4cb36d36dd SHA512 d0618c302e6d0f9113b9515627095d6baf383dcf4ac603b3a4596ee814873a0baa473e8505918859bda37cb539f98e76fd601e29f6772dbc14f74d6059fd4200 WHIRLPOOL 1c7ff555fdd9050b6c075873141030e0672c6f159ba68ea2f1f9d80cb18539ed7cd9fbfba772ee2be7754fad85943befc11805f8b4ba7eb2bf0cbcf7db5eafe3
+EBUILD posix_ipc-0.9.8.ebuild 529 SHA256 8d241a6532ac62b14c783022e2c113e6dd6b2de024511ddd350596b9db9fb672 SHA512 504e286646bc2f940f43bd95a3e84948a271b98670d40ae575a9ab67e6dc80a97d69d28934586d8713b7699fe01f7495f1e073489b388a6ddb5934f41375b523 WHIRLPOOL d0621804efd06b7654b1f255f0ecd891ac82cc8ecd7677922d4410014ede3dc70dd5597941dd8d3962e956f757f7e164729358eeb231c808978f92d579b65421
+MISC ChangeLog 2721 SHA256 2880e8a4a2e659de1cc1ba535c3c457ddb877b23144ef5719084854b23dea53e SHA512 5b9d0a2cd580a798d795be5266105d643dc5fb41c45f687b9908f48a5c4de843a3265b06d251b0780179b9c38f50ff4ca2fe24a5433b64fa7a13eed91e21de1c WHIRLPOOL 314a5c107019f8accc19aa1c2d9e36ee14e441d9b67025c499d4f87da763e32ba72f7e0022169278162cb3fa4b8cbf4b688c9565905b09febc6436f28c15149b
+MISC ChangeLog-2015 923 SHA256 a3db6c3e2bf88c4f2aaff956e385861b37715fbe6dc03182246651e534d6af51 SHA512 e5b7d25b4bacf1debf98ba697cba66015631c22e7030081ae5e8c55c05e13848c1f6e53c5cb788afdd88f4f8f6c7323aab3e9c9ebec9f0ead4a62a578dcbf23e WHIRLPOOL 44010da61796b5f5366e850ebe661eebbe7410700dcad8b81bd92c1e95996ff702ba9659c4ab81d69cc16863f5074447be16c3a117c0a3c3a039967e238e832c
+MISC metadata.xml 579 SHA256 52e3b8d98c4694027b4f978ba0fcb4bff28f13f48a94a5961b1270925cc11dde SHA512 bddb0b786f132b96319ec0251de2d426a048c5ade0316b248e127156f8a5040bb59451b61d23cb4a9691461e75b86e46e4edc5286fa2109c30cad8e69ddca8ce WHIRLPOOL e508648e9fdd4f8d2c2f8ad521257f8415f23a0b722d863e784842e4ca75ac8508288e8b0e7f21e06f8809915fc35c5d1c0b10de24f078ac25875d2db51d5802
diff --git a/dev-python/posix_ipc/metadata.xml b/dev-python/posix_ipc/metadata.xml
new file mode 100644
index 000000000000..61aa68fd0a8b
--- /dev/null
+++ b/dev-python/posix_ipc/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+	POSIX IPC primitives (semaphores, shared memory and message queues) for Python
+	</longdescription>
+  <upstream>
+    <remote-id type="pypi">posix_ipc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/posix_ipc/posix_ipc-0.9.8.ebuild b/dev-python/posix_ipc/posix_ipc-0.9.8.ebuild
new file mode 100644
index 000000000000..7ba2553775f4
--- /dev/null
+++ b/dev-python/posix_ipc/posix_ipc-0.9.8.ebuild
@@ -0,0 +1,22 @@
+# 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} )
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="POSIX IPC primitives (semaphores, shared memory and message queues) for Python"
+HOMEPAGE="http://semanchuk.com/philip/posix_ipc/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND=""
diff --git a/dev-python/potr/Manifest b/dev-python/potr/Manifest
new file mode 100644
index 000000000000..d2b1585ce423
--- /dev/null
+++ b/dev-python/potr/Manifest
@@ -0,0 +1,5 @@
+DIST python-potr-1.0.1.zip 30200 SHA256 a8a23fc1aac1e9c97b02fe462097f54f2d247f7979f0aa8ce4d66f88f6927bac SHA512 d38f2fc68ce9f72ccee18923183f8640ee51f079da1e79e1f2f22e37383c99da7a6336a8538e28bd90b483fe8e227956ebc052e9c03aa6d7b49e9fc4e8df5281 WHIRLPOOL e0b37d8c5fe6b046a072bebcc8785a55bfba1239de193ac072bc061c58826dc8ba92d35e0e51cc8065578be07af5b272dccde5d5cb2e2506d8e7cfa029a0edf7
+EBUILD potr-1.0.1.ebuild 602 SHA256 5ae9e1a0d90172856d3d51fc8ab6a80662cb6dcb24fc29b2e576ffe8ab473a4e SHA512 c3148205d882499ddaca3f4fc311dadac0047347361438cf8d895e936edd59a025048f570846031c2c2c353139b1aef101ef060153cb19888868587d0e991086 WHIRLPOOL 070afd3296c2a6cc95a703fd220eeab02b466d15717a4e95150a53092596e61d67a3b2ed262ee8d06e66308cc140eca7b97fa513b826004163a9fe490cc2f32d
+MISC ChangeLog 2294 SHA256 533515f2e536c2cf1ce6ced23254f51eafea59277d06ebd5db1d670cf1df31bc SHA512 7f2041cd8ad007606f5ca04338ffd70869aed8986aaf49fe5095833fdd0fd86c6a4d8f0a02823e96cae9c361cf01cf0df79e28d8f7f49b2cfd2abfa8c04b3ffc WHIRLPOOL bc16d155266182b0fba7b3f1c512ad593ad90d6319be168e8172119cbb27a78b27dc568c614b067f70cb3b5d0745c64fac8c5b89384eb58bd63cde75123d57cc
+MISC ChangeLog-2015 654 SHA256 8edfd1c1cacc90d9193fa3b2834224b125f36af67d14ed422befeccb4cbf364b SHA512 0c5970943053ce0c9441c28b29c4e88fd13bab8aeac9238a3a17eb98c041ba46cecfbf1ec7aad642dcdb606d7c483e66af0f53e3dacf8c1d721ec655cb519bd6 WHIRLPOOL c6964c14eefbb6773ab2c0cb499aa998e1931e1dba57c343dc54ac39e6cfe2ddb88c24218517b8d41e5748edf3fdf44b9ab61630ef9653677b6052ee3dd958b1
+MISC metadata.xml 515 SHA256 f80b0932f8744ff28ad305ae6d4e0df82e6816bdc4eebca5fef6e8234715d02e SHA512 3cbc182032fa1e1d868fc1348271840feab79629611316eb3433f11500552c57e1a04cee0b333f9cb6edfb93f9091c3aba25750b64a18ec62f59c5d4fc07da38 WHIRLPOOL 731e79210d0c5633af9d3c334d9951b9a86739d6d471bc3b078c20d2e3d97721f3116307c469daed3106f565e730f156874cd4f4b3f06e3000e2dfc38ce89e89
diff --git a/dev-python/potr/metadata.xml b/dev-python/potr/metadata.xml
new file mode 100644
index 000000000000..0bfe99d903ae
--- /dev/null
+++ b/dev-python/potr/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aidecoe@gentoo.org</email>
+		<name>Amadeusz Żołnowski</name>
+	</maintainer>
+	<longdescription lang="en">
+		This is a pure Python OTR implementation; it does not bind to libotr.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">python-potr</remote-id>
+		<remote-id type="github">python-otr/pure-python-otr</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/potr/potr-1.0.1.ebuild b/dev-python/potr/potr-1.0.1.ebuild
new file mode 100644
index 000000000000..9c8c7e030d8a
--- /dev/null
+++ b/dev-python/potr/potr-1.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="python-${PN}"
+MY_P="${MY_PN}-${PV}"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure Python OTR implementation"
+HOMEPAGE="https://github.com/python-otr/pure-python-otr"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+CDEPEND=">=dev-python/pycrypto-2.1[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/poyo/Manifest b/dev-python/poyo/Manifest
new file mode 100644
index 000000000000..6fd2c2fd5a03
--- /dev/null
+++ b/dev-python/poyo/Manifest
@@ -0,0 +1,6 @@
+DIST poyo-0.4.0.tar.gz 10722 SHA256 8a95d95193eb0838117cc8847257bf17248ef6d157aaa55ea5c20509a87388b8 SHA512 19ab8e8f7bb6e376494516ac455eec36f57f64c59c1f5f3bc2a9ee1dd2faefdccab2755a4875f85553e4f2fbdcb3a13db0f591fc65c005354cc20d10ce2a0d6c WHIRLPOOL 3e42f5e78c9cc2bc310f085b264305221d416da145af9503eb1b37cb5b9cd3a4b3852eeeac880e07be7078acebae6b8ba3a351caeda77a2d5db49c7757e74801
+DIST poyo-0.4.1.tar.gz 10960 SHA256 103b4ee3e1c7765098fe1cabe43f828db2e2a6079646561a2117e1a809f352d6 SHA512 e2dfc504ec9cea8e43363556b875f9b01fbda506ee8e70916d4a018941e4e347a4e8a78a245f980b9c41b20731948fc9e5e131b415856b31593e44b805acc768 WHIRLPOOL 1f65ed3cff7557e39605e919250368274cb1268d9ee26239a6e2362144cdf8e0ee2ee971958f49e9de55b9d6fdc5e6eacb58d8574ef469ed53775ba46ef6bd84
+EBUILD poyo-0.4.0.ebuild 519 SHA256 83c0a4c97efcf5ee26d8b9b6a1f6fe8c53042cec8b7d43303b7dc4656a4a160a SHA512 821fc744c504bb6422a535aea9cc81646e8f4c754dcbf237246cb5d00762f1a0b857ec6d252c07945ed88527e00862a3405a382784e5f27be24b1be654d2d1c8 WHIRLPOOL 1a356c8c65fa460f2751803056b6a45bcc713a57e8fbc4d11b16e8ae1651302bb6e258a6c082f63f27ceba2f4bce165801e0efcfa3fe38c4b4a1e4adaddb5649
+EBUILD poyo-0.4.1.ebuild 519 SHA256 83c0a4c97efcf5ee26d8b9b6a1f6fe8c53042cec8b7d43303b7dc4656a4a160a SHA512 821fc744c504bb6422a535aea9cc81646e8f4c754dcbf237246cb5d00762f1a0b857ec6d252c07945ed88527e00862a3405a382784e5f27be24b1be654d2d1c8 WHIRLPOOL 1a356c8c65fa460f2751803056b6a45bcc713a57e8fbc4d11b16e8ae1651302bb6e258a6c082f63f27ceba2f4bce165801e0efcfa3fe38c4b4a1e4adaddb5649
+MISC ChangeLog 300 SHA256 66263f3d01142dfb54077ffef6790fa68c19d03b349414044fd4ca6fcffe9da6 SHA512 e8ed35f22f92cf20e737772af6fb83dd67d4228c0e4ade90732315a4c4986362bafcb3d3311498fac00eb6926e1607e719ac3e974fc043ebb2e3fac647213796 WHIRLPOOL 5673ccd5f3cea2df869b0e91c5d6b45b0320e21015abcec3b39331feec279453ed433eb1bfde57c2000f77ba8f71b813bc8bf59c7e221edab253c9c909c0f14f
+MISC metadata.xml 361 SHA256 2a23dabee6baf016b3ac774b42761ecb163f0dd3f4c22c6c8dd1f09abfdf3ec5 SHA512 b40df5a8d22697185ef353c30f046ebab34896e43ec3e6aac1eb3c31396b051c026a6e76b00799855953a0f4393103bc2ab95e24fb358b0eff8897293d6762d4 WHIRLPOOL c8a42c07de7198c4dd9b085954f5dc357dc43413f0aead3ea5a91f84c56ce7431cb8b186fb7a0c5e4e9b5706abbe63f8b9a5902bae7c3b23ae68731229dd647e
diff --git a/dev-python/poyo/metadata.xml b/dev-python/poyo/metadata.xml
new file mode 100644
index 000000000000..4d1c77ac98ee
--- /dev/null
+++ b/dev-python/poyo/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hackebrot/poyo</remote-id>
+		<remote-id type="pypi">poyo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/poyo/poyo-0.4.0.ebuild b/dev-python/poyo/poyo-0.4.0.ebuild
new file mode 100644
index 000000000000..6193eadfddad
--- /dev/null
+++ b/dev-python/poyo/poyo-0.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="A lightweight YAML Parser for Python"
+HOMEPAGE="https://github.com/hackebrot/poyo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/poyo/poyo-0.4.1.ebuild b/dev-python/poyo/poyo-0.4.1.ebuild
new file mode 100644
index 000000000000..6193eadfddad
--- /dev/null
+++ b/dev-python/poyo/poyo-0.4.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="A lightweight YAML Parser for Python"
+HOMEPAGE="https://github.com/hackebrot/poyo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/pp/Manifest b/dev-python/pp/Manifest
new file mode 100644
index 000000000000..2e47d5700d0e
--- /dev/null
+++ b/dev-python/pp/Manifest
@@ -0,0 +1,7 @@
+DIST pp-1.6.4.tar.bz2 27166 SHA256 7f932d8eff4b35357bf5b48c1abd7734a955c98a50138c13b7b9eb36aadaf408 SHA512 213322aaa60e1485b855e96336a01c45407185892dede693c013a200554656ce08799ee23ee4a0cf628b382b98e0519445c99dbb89f209b1b907ac0a1fc8147e WHIRLPOOL fce8fe3ceaeb9e1d4133734107924faec6bcc5b4d862a37629443d0ec1774504956271dfa1af7de8dd2c06012e488e99dbe1220705fe3f4ae7c8cc8f721211da
+DIST pp-1.6.5.tar.bz2 27185 SHA256 add7272e135d6cf817b0196fcfe911c75b7e6662f6a410b016cb2955fc2468fd SHA512 b72c3e12b770f386b213a0325748a7e99d225a608a5453929004b06aaaa8fb69b40054a3bcb1d8b30a640f7db7a945b0ae8c1b1a1d753855668553d18a18bbfe WHIRLPOOL 7257f21b45368586ef3b76bc29e68b64e59ba624a264c7fcef96d415289c8b878ecebbc88678f0997d20a1d56f6d985dea0cf760ea0044e4f7b754a365c0946a
+EBUILD pp-1.6.4-r1.ebuild 615 SHA256 a78897ad5861734a1b708902768217128aea9b3362c0e479889eca161eae9084 SHA512 76424d35075bdcffc72457f642616f97c60ef0aaa4dcc2d499416778ad294c09bbfa85c3bc9dd89c6469e4de82148fd629809106ef7714909cacbb3d24a7bfe9 WHIRLPOOL fc48ad3a6167415a8b38e6db366cbfadfab5ca9853883691508efcc89a743e8d67712ceb96a9565c3bd10dc0c01a6a9efafa55c91e8ab30906274aee4f5459d3
+EBUILD pp-1.6.5.ebuild 615 SHA256 c8216969a245238fd3056a2dbbd447d342f5b871bec3280c7d478b5920925039 SHA512 45975afb3c5c39d756e8566b7092c197c2a651453702c345f2ecc76e88e6788ab2d2684df6ea6b686c96f4fd27e35de89fa42f3d8adf48437d1d9e5b2999a2b0 WHIRLPOOL 94552df07a2f74aa0fe9331cc6f638bc000e4def45f16fd4ae49159914c3339a167ca73dbd0390e875a4bb9cd5bf539bd341382700d07c875250ad656dee10b5
+MISC ChangeLog 2420 SHA256 328980a8d499312db35ac663320eb694af7705279b49961aaf0b7684cff9245f SHA512 96d25677dd3be606b82c12f46b3279d0342b16a81ebc1a9084a68dcf72019de5d9f6d3022f872cd4aad51db69062d7c2f90c2790a5df9e4049b216eb5d6546e4 WHIRLPOOL d152583d6a234ed99d3ab3c9e943fa7bbb7d7ee507c059b2b2679db95dd5488cbd303dfd22e58df4b8a6871f211d0d860aab505c43920406cee7be0fc66ac8d9
+MISC ChangeLog-2015 2757 SHA256 8c65f93f4962ea8aa99f8489b90891e60b2f5a75d868ec8126a767d87cf0c25b SHA512 2c3e5037ca60ebaf86378ac6a51629b67f753577333fb4242dd712ec98230a8c02c84aa71c4e4f9504170c8eefd5a86f3a718ccbec1cd0cb13f27dccf5521e4d WHIRLPOOL 32c2a3869c44302a8a7adb1174a6015d6d3036488bad788332bf30aa9c8069fdcbff2b04285112f3c189b9907c61b37c2293fe1cad680939a6569b344d3d1463
+MISC metadata.xml 485 SHA256 9e0d8dc4b10b033e6259e73cc1332d320593133717c864f0078bb0c963ea63fb SHA512 68f07655eb89478f3fd4bd5f2312706ae48ffb23ae5da7c120dbcfed34fb3476bd9aa8b82de033db604bf04a8056b7765d46b83b72c5df4187dbd1d37a907a51 WHIRLPOOL 6978cad7635ed86462bec8f5da4c011d4ff68e2302da87ad6c5285fb0f5bb1c8a9fc7b86ee6abb90300a4b098125e100ea050e29976da16d2d28678e326105bd
diff --git a/dev-python/pp/metadata.xml b/dev-python/pp/metadata.xml
new file mode 100644
index 000000000000..3569a6dd52bf
--- /dev/null
+++ b/dev-python/pp/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  PP is a python module which provides mechanism for parallel
+  execution of python code on SMP (systems with multiple processors or
+  cores) and clusters (computers connected via network).
+</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pp/pp-1.6.4-r1.ebuild b/dev-python/pp/pp-1.6.4-r1.ebuild
new file mode 100644
index 000000000000..d7b3ae615fc5
--- /dev/null
+++ b/dev-python/pp/pp-1.6.4-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Parallel and distributed programming for Python"
+HOMEPAGE="http://www.parallelpython.com/"
+SRC_URI="http://www.parallelpython.com/downloads/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+python_install_all() {
+	doman doc/ppserver.1
+	use doc && HTML_DOCS=( doc/ppdoc.html )
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r "${S}/examples"
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pp/pp-1.6.5.ebuild b/dev-python/pp/pp-1.6.5.ebuild
new file mode 100644
index 000000000000..4370467ae6af
--- /dev/null
+++ b/dev-python/pp/pp-1.6.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Parallel and distributed programming for Python"
+HOMEPAGE="http://www.parallelpython.com/"
+SRC_URI="http://www.parallelpython.com/downloads/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+python_install_all() {
+	doman doc/ppserver.1
+	use doc && HTML_DOCS=( doc/ppdoc.html )
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r "${S}/examples"
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pretend/Manifest b/dev-python/pretend/Manifest
new file mode 100644
index 000000000000..3ec822d7d180
--- /dev/null
+++ b/dev-python/pretend/Manifest
@@ -0,0 +1,5 @@
+DIST pretend-1.0.8.tar.gz 4848 SHA256 930f2c1e18503e8f8c403abe2e02166c4a881941745147e712cdd4f49f3fb964 SHA512 25011216947289d340fb979ebc9e2c7f000571f006cf5ce15f10ff0e013164e4329a3a66933d202acf8ced498929cf9e5a2a3666aafa00f78348400615c5cec8 WHIRLPOOL 3148c08f98deadfea44ff59e673d053fc770a01541fb3bdac6416d156ad720658c42cd72b0f96d138962f636aab8080624400589ac5245d458c2cdff04d22015
+EBUILD pretend-1.0.8.ebuild 634 SHA256 37739ffd47a61154e39663a4a60f37c45951f4455aa9b3e52f407a737ab28863 SHA512 adc4559ecb1826db596b549050b240a2dd8aecf5ddcd4fa8b95551b10fd346476d21297db15becebc76b1cc2abf00e980b1ebc3e56360822842879dd3f9f0bbf WHIRLPOOL 07279f90657886e90658cedb58d407bf2c1705c35543e3f74a3fa18451bace5577224d49ab7c25daf58b7c3138480ab3007167804d834ce4bab65d402505f0cf
+MISC ChangeLog 3457 SHA256 080340b9ad18f27703a615839052af2848c1ef63f632876447d7a38fd7c2d66c SHA512 e025dfc9a7fa67d807241961c321112856309c6151177a0839129094543238d7d9dc0ef31c41026e19e0e59d74f20328eecab67635cea0f1e5330501dd1a316e WHIRLPOOL 2da0cf22a28204e04707b9df8967892ce9d4ed0ef7c217e120094db057b24055d5b074769757ec08cbfdc42e61f155a86c78a3725e1068c2267a6f0f6e58a413
+MISC ChangeLog-2015 2550 SHA256 5826b3fb0a66ac90e72680a835a7766b67893b33f8c3350b9b81103d35ca1fd3 SHA512 7b5d46f059718527197ad49076f511655eda20462c986cc0ee6b8ca2ee6d5963438f16549284dbb94b1f38ef20864de0c63ac2a5f3e020f5363f80e6f1835365 WHIRLPOOL 9d3a358a8ed53779468b23a1f197533a9e7f76ddce7b59cf25103010dda6824db4309912c0342aa2a84648ae4a303f807dd8c5850ec0c87b79793cd9ee05b1f0
+MISC metadata.xml 374 SHA256 5efc2a035ecb3411a98980470e43943bd9478759978d50efb194e0217b1dc13a SHA512 8241b20ba14badb91e36edb5070339dfcea6902e0f192dd1bc066698cc9c87370fbe0f16f61173e207766b84a65193f12ca3d9e1a16f467411762fbe52cc906d WHIRLPOOL bf1496c37e7f772869a1df48730ba5a05225a3deca09e876c76aff8348885c8984cadf7127b9ec93ba4294c1843d5c153c687c27d58c9e95c013a839252797d2
diff --git a/dev-python/pretend/metadata.xml b/dev-python/pretend/metadata.xml
new file mode 100644
index 000000000000..9bb252687296
--- /dev/null
+++ b/dev-python/pretend/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pretend</remote-id>
+    <remote-id type="github">alex/pretend</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pretend/pretend-1.0.8.ebuild b/dev-python/pretend/pretend-1.0.8.ebuild
new file mode 100644
index 000000000000..8d7c467bb0a5
--- /dev/null
+++ b/dev-python/pretend/pretend-1.0.8.ebuild
@@ -0,0 +1,19 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for stubbing in Python"
+HOMEPAGE="https://github.com/alex/pretend/ https://pypi.python.org/pypi/pretend/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pretty-yaml/Manifest b/dev-python/pretty-yaml/Manifest
new file mode 100644
index 000000000000..467c1386167b
--- /dev/null
+++ b/dev-python/pretty-yaml/Manifest
@@ -0,0 +1,7 @@
+DIST pyaml-15.6.3.tar.gz 14459 SHA256 2df761472d0974205b779dab469903cc9ddf257dcd126acc4a97b9d4c970e662 SHA512 9d0789342f59adfc415bef54cdc52b75cbcf1fa71940e1b9534ea0c141c5737449104e45fb0feea968e58d0886a74d9a5bbec0ba05b7d72cf5d93d3a674b5868 WHIRLPOOL 7c2e06dedf40c7c13474824090bf1f5a0453d2d955d446053479be93388c55b30480dc41eaec32a31a2303ae1971de5902922776a48c6d54cdb107a2356a1786
+DIST pyaml-15.8.2.tar.gz 16544 SHA256 9c54fb5f17b58572c4cef50affea60bb73f445ab153580dac07a12383712b5b8 SHA512 74f1fdacdd601f0b6f710457627e4dcbc42e7301fe5faa061d3e8d593842d6e5dd85041625aba576bba9cda2a713ee07ca3067221a720cbddc6dcd417fccee64 WHIRLPOOL 8f443fe904e1da77a78a3a2b8591cd5526b4bd7a07e736d959ad842aede43d31c96391389f666796ec4497b03cd79e72582b5f4b4bc6385c5627ab65ba8df09f
+EBUILD pretty-yaml-15.6.3.ebuild 742 SHA256 efb7a46fd9db6cfadbcfa22e9be76462f6ba72515d5205d47505178c116a960b SHA512 8dd9b33127109b69e409eda665707a7a78a79ab03a0fdbcbd9ea18c976441102ad4c41a0d0a854db74409d9df305f10808c014eec1c7893766c8bfa0d2d9575e WHIRLPOOL 057fb86200cf9b91c877a3b1e5add600de090c37e74dd640f52ffd89f205375d9580844c3024e634c461557e14356499d88002e156853402c9e49d8fb8379720
+EBUILD pretty-yaml-15.8.2.ebuild 763 SHA256 867642064a5ed38977f928ff7f0ba301bf2fbf6bae7299806bccb1091598054e SHA512 903185a2df6846da63e2fcedf9f7f44e9b6ffa820c628fbc4d4afbdb03dab5799fce2dc9effe23959332b2dcf5dd2d2a807224517d5b0c3654bc57b201d6b00b WHIRLPOOL 409c679be50c987f935bea37ce28e2866e73fa4cdb7ece52c526be7536ea1329e48d6247a7b0c246ea8a1e2385ee5c8c1baaaf63c87a939595d759a50e0a2a1b
+MISC ChangeLog 4739 SHA256 94ebee5b14e77c750656998dcab7ff44e3683dde8df823a2bd34ba893d7fe59f SHA512 38698255913223325d46d58ab85bdc91665523ea267078e5b9c66db1219e375c85fa75ce2efc5f7aa8b67e474a3f0b49110f5a60b940a45e39ad862c31171087 WHIRLPOOL 63d129f2ef398df81495429ba438abd4b1e131d20461848a5a3a738c56581be6fc5070493fdf4b36b24c8c1af9100b844e03982b33e7ba7fa025b807d6eb34f1
+MISC ChangeLog-2015 813 SHA256 449a17e36f2b890fa48224045f0f007c2440c4133ab364be7761d283706e2e6b SHA512 e98fbab28c96e0027178a77c9d230df5a83a827a0952d450180c820abb0d4b4b7e5a7289f0b785a317d6e778472bee778c4337316d7430ee78fe153c79794cce WHIRLPOOL 09e880c92e657cf145d6754ac009a654c569e5c797ba403ba1bd2a321086feac741534d4e58f71c9e2bc4e67dc3446240e6fcd5bf5de8bef911bf32616a4666e
+MISC metadata.xml 444 SHA256 6b50c18f7fb75a484ae445c7efc2caf5134711e86f2ce507c461672225eec68a SHA512 70aee75c33eaa54fc003d6879ada0d4fc772d00619273c7b0e7c5829dcffb8ba23171c563e6e922504d9256f53ee207b36b98240bec3d084a8e6de15e0013732 WHIRLPOOL dcce36f8288ec581ee4993228014b64ae71d38fdc4e0ba9aea3ce1a99d05e8a880529a05f6429bf2b020080d8c033e102efbbcdee383eb3b2284fbbcb5c3fdc2
diff --git a/dev-python/pretty-yaml/metadata.xml b/dev-python/pretty-yaml/metadata.xml
new file mode 100644
index 000000000000..c3f03708b939
--- /dev/null
+++ b/dev-python/pretty-yaml/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pyaml</remote-id>
+    <remote-id type="github">mk-fg/pretty-yaml</remote-id>
+    <bugs-to>https://github.com/mk-fg/pretty-yaml/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild b/dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild
new file mode 100644
index 000000000000..c926505676fb
--- /dev/null
+++ b/dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+MY_PN="${PN//retty-}"
+DESCRIPTION="PyYAML-based module to produce pretty and readable YAML-serialized data"
+HOMEPAGE="https://github.com/mk-fg/pretty-yaml"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="test"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/unidecode[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	"${PYTHON}" pyaml/tests/dump.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild b/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild
new file mode 100644
index 000000000000..e8078513f8f9
--- /dev/null
+++ b/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+MY_PN="${PN//retty-}"
+DESCRIPTION="PyYAML-based module to produce pretty and readable YAML-serialized data"
+HOMEPAGE="https://github.com/mk-fg/pretty-yaml"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/unidecode[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	"${PYTHON}" pyaml/tests/dump.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
new file mode 100644
index 000000000000..222f0834c085
--- /dev/null
+++ b/dev-python/prettytable/Manifest
@@ -0,0 +1,7 @@
+DIST prettytable-0.7.1.tar.bz2 21499 SHA256 599bc5b4b9602e28294cf795733c889c26dd934aa7e0ee9cff9b905d4fbad188 SHA512 1a7aa604f608483b107401ddca9721ddea673ea1415d2a514948f7399835784e0a9025f0e5236f4109890e5924da345bd111893200730501b496c136465c204f WHIRLPOOL cbde4e7053eb82749a21f1ac7e0a9ab7368f9dfbe64f0e434da085dc30f24931110e87c508c500bb340adec6d928dae53f1652d1601a5718311a9e414a2b789c
+DIST prettytable-0.7.2.tar.bz2 21755 SHA256 853c116513625c738dc3ce1aee148b5b5757a86727e67eff6502c7ca59d43c36 SHA512 f3a3fe6fa29f4ef090ff6cac06549ebd9db8b387e7b25fc64c4e37c8444586f50355c5573f38caabc72360aa68054aa189a67aa37f0bd13b872862ecd9151e71 WHIRLPOOL 1b27332ea8b2c83ec13b981508f429881bacacb87ac4a8c51a42b6071daa6d1278a48f3359547efae2c7f9eb1fe5d6b13e2d4232543722aa3aab1f30f9fccfbe
+EBUILD prettytable-0.7.1-r1.ebuild 599 SHA256 d8c2a39a2d17f93a58cd9f7ce95128206e624ac613fbc1f88cd2084c44eb7f10 SHA512 4759b8ee7210fc0c0acd409e9298b3fcd4494bbad8407b7c786ab63f2c325dc32b452b9d053064664d5d9afedf74f8799a431985659f2286dfd8abc569813f4a WHIRLPOOL 5241506812d86f4d6e46f7d36e4c593e794ada3f42f9d1268ce35499adb4bf9300c70fcb1d733c0ee112a57eacdc21afdfc3af7df8bb2fde4ba3c601ac82a497
+EBUILD prettytable-0.7.2.ebuild 618 SHA256 7652bb4cc65414a26ddb20d04d0834945ad42920c90b3000dd16ce25756fbaf8 SHA512 aa01e2fbeadc546dd3435896f0e938eab2538288c54cb07c39cedbb1fbd5016e81e02d028a6969f22b12204c41aaf2b21b0c9004031577da13a85222cbbdf0d7 WHIRLPOOL e0ef1f52fec801d30a4dcad34f0999fa427a84a83dd011fdd1a5f1016a38aff3898cd54f91ef829666e5aa76b6ef03d22888af0b40a484a4bc6e29f3d0a2760f
+MISC ChangeLog 3010 SHA256 1fcaf20b36cef636fc86cf202019e52afcc887d5d59cbc0f51633c8ebb2811a2 SHA512 efa3fbc59f63a045f73f0d555ca629025c2a9480fd997da4acfcc05f2cdc34b1e8f22bf964c182e8adf6a5966f2bfcf9da2bd5dae6c317f6c9cfdd8fd67d66b0 WHIRLPOOL 9402981ebf8e5ededd98bbb6e209cd3840e96ad0fde245956606fdda32a7c17bdb0588d91a801a9eaa2b5db5d44feb4dceace13501a83c0992b3ca24ed0b7558
+MISC ChangeLog-2015 2623 SHA256 7fa969f48fa415f505df117437772a25be3c75bb36942306fe5f877741565ff9 SHA512 f62aa772ed4f44c3a75dc81c0aa9643502aa30f36c83db7c358cf3a779708b564dcf9bec1d20d588e4c9e52a0acc81cdabb2416f0331082be2e7156a49cf41e6 WHIRLPOOL 851da6c9007fa2447b0472afcda0aff73870c30413f71061ff5edce12d969d36b7245dfd0b1adf2bc5e232407a4a1412e2cd0c7f76728ea83603b29b527be957
+MISC metadata.xml 388 SHA256 c0755914f7e382ce8af51311d5d1ac9057a4ea62cc640abdf015ddbe40fe0bc3 SHA512 7ac1cfd03216f171bf432f35b21bd6b43d297e77f41dffe5c5c5c4d85614c799252182a06bd5a116b5b831c06df115dcb933f1b2fd051eca8676f0aca7997d58 WHIRLPOOL b123d27466e708f01586a3e995771c02d2fc4e22829617c6d9aad1066089ce24ddfc33282215edc1e715227fcfbfc51e2c2e6d10b1171298f29e56402cc3e49c
diff --git a/dev-python/prettytable/metadata.xml b/dev-python/prettytable/metadata.xml
new file mode 100644
index 000000000000..4a76f215cc7a
--- /dev/null
+++ b/dev-python/prettytable/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="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">prettytable</remote-id>
+    <remote-id type="pypi">PrettyTable</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/prettytable/prettytable-0.7.1-r1.ebuild b/dev-python/prettytable/prettytable-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..8d56cb958571
--- /dev/null
+++ b/dev-python/prettytable/prettytable-0.7.1-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
+HOMEPAGE="https://code.google.com/p/prettytable/"
+SRC_URI="mirror://pypi/P/PrettyTable/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	"${PYTHON}" prettytable_test.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/prettytable/prettytable-0.7.2.ebuild b/dev-python/prettytable/prettytable-0.7.2.ebuild
new file mode 100644
index 000000000000..d80f4b999a5f
--- /dev/null
+++ b/dev-python/prettytable/prettytable-0.7.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
+HOMEPAGE="https://code.google.com/p/prettytable/"
+SRC_URI="mirror://pypi/P/PrettyTable/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	"${PYTHON}" prettytable_test.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
new file mode 100644
index 000000000000..fa701a69adbd
--- /dev/null
+++ b/dev-python/priority/Manifest
@@ -0,0 +1,4 @@
+DIST priority-1.3.0.tar.gz 13827 SHA256 6bc1961a6d7fcacbfc337769f1a382c8e746566aaa365e78047abe9f66b2ffbe SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a WHIRLPOOL 45fe643b70a4c3cb9e3600e73475384a5b339acbb0a801be8c0e6c190bc2e3894443b28c3b691b3c555250175d6d313808c6bf7a0fed3b586c9fe7beb3b4a843
+EBUILD priority-1.3.0.ebuild 881 SHA256 58b223fe7a54b6d759cc76c5e8c64ddd1eed7c187399c75beb80e3f97b046396 SHA512 d69ec85a367fe71cb09bcf18dfb58f198f9156a34e9c46dbe05c02497d7714b718875c6481d0880d78abdbfe26da926d68b0be60070afd4e3c2771673b9cbedb WHIRLPOOL e26bb25cf8b95acafb84dd54a791a3715e576815b1f0a21b2bb7fa5dbba7fb4425a442405f7369f114b30880c2e8d1922f45f059022020fda89e223e860d13fe
+MISC ChangeLog 890 SHA256 4a46fcd1c6978f140b7992695ebbbb172cbe2f462f058f41692a3f10f11ea82d SHA512 e1c81c296ceff454bede58908068837f7fb3033ab8f435533f7ca6cbc432916ecdfcc1315ceead922e54a4164af7314c9a1f924d12090fc4da2219800a16bc8a WHIRLPOOL fe6782799871f00e67ed85c0d0831befb686b82c8ac106f86a3eba2b25af2cf634bda13ab7f08e494cd9dcc45f5b179c9c16f9aad0b2ff32f9952dedc165b786
+MISC metadata.xml 965 SHA256 8fb0c3499ba81ecde836a3a3d643eb9d2fa78d0f6b3dac68bf3717642f9ab3b2 SHA512 bddf7fe4153c705edcf710ccca4cf44875bd8192f80ef0811cad7028e605983f1a8c5b219c82cd2911e77150fb9e1b729450b9e12ba7dd5dbd2f23c89a4028a5 WHIRLPOOL cf22f0310b9947a77ffd514c06086a3732883610a4bb6382fcc1c5331da070ee97015bfad31b1d679fd45dedb0d74708545328d23cd3787da6b2c60db084e506
diff --git a/dev-python/priority/metadata.xml b/dev-python/priority/metadata.xml
new file mode 100644
index 000000000000..6d2ad1246f87
--- /dev/null
+++ b/dev-python/priority/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>cory@lukasa.co.uk</email>
+			<name>Cory Benfield</name>
+		</maintainer>
+		<remote-id type="pypi">priority</remote-id>
+		<remote-id type="github">python-hyper/priority</remote-id>
+	</upstream>
+	<longdescription>Priority is a pure-Python implementation of the priority
+		logic for HTTP/2, set out in RFC 7540 Section 5.3 (Stream Priority).
+		This logic allows for clients to express a preference for how the
+		server allocates its (limited) resources to the many outstanding HTTP
+		requests that may be running over a single HTTP/2 connection.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
new file mode 100644
index 000000000000..09284c99fa61
--- /dev/null
+++ b/dev-python/priority/priority-1.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="A pure-Python implementation of the HTTP/2 priority tree"
+HOMEPAGE="http://python-hyper.org/priority https://github.com/python-hyper/priority https://pypi.python.org/pypi/priority"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 x86"
+IUSE="test"
+
+RDEPEND=""
+
+DEPEND="
+	test? (
+		>=dev-python/pytest-2.9.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.14.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" py.test -v || die "Tests failed under ${EPYTHON}"
+	cd test
+}
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
new file mode 100644
index 000000000000..5747b25d6313
--- /dev/null
+++ b/dev-python/process-tests/Manifest
@@ -0,0 +1,4 @@
+DIST process-tests-1.2.0.tar.gz 5478 SHA256 3a093dd1cb9828b43bf1a732e7221eeda6e1447651f8151c3a6b0087968a7c57 SHA512 b5cbe96dbeb6421b26f5a50cfe91bcac2f5d527830dad678df5e0ed1b2019483eab6102ba548483dd6695c881f29380ead2a8b6851c40119815363549ecf5bb6 WHIRLPOOL 1cb709526f570e865553b212226bb5afde360a5dd9513a302f327e75275249ad9d6502b98b9bf35266aeab93896efb9db326196883c662f025424e63b0420f1e
+EBUILD process-tests-1.2.0.ebuild 605 SHA256 b82c544f9d953ccdcc99b57f25ea3a422859071b4616e09c52a0942d122a9ca5 SHA512 b73a80fb4a94dd6d8175de898786e4445bb239578c443a51a130d8e6a9a88f5559b97fe6514a6dc5cdf8866234883355a5ca971c16de72c7cb0b4383813c22a5 WHIRLPOOL f621388679c30d7f51e2af9a065e36427c3068548e0e8d380eafd4a86850f32224f677c07373239180670a9e8045a12cd26bfe808006acf2b1f3649ebe84f336
+MISC ChangeLog 2179 SHA256 32c5b9f34d8c6dc9466272e8e9e3259c8a4b01786cf43ec1453dda777e1cf0df SHA512 44412d9ab42bab9eafa033a85a098684fb859cbff429563316d123de34e26ad102954ce12226328e523d47d947ac006c464db1cf2b07ec9c25891efd809e38a7 WHIRLPOOL bc5c36a8366a4cccfcad6dd58cc7ec5a5dc67f9466a9d2e9493084c934508fab55693b6fa3a1ec03995c9165133f7a0fd01b9f61b7beb6703313eabee85a0a76
+MISC metadata.xml 363 SHA256 61c15b656f8f58b2abde232ec00a1fdb4ebb3b5f70d5dcf6df67bda3b9d42942 SHA512 f36107242f9361d2ea84f045ad22595c39bb94ba6641a2ffe4348bb7574a3656a57760f75211e9ee3e76b56fe0e3e9c44e941a8192a00476c7bfcfba150fe5e6 WHIRLPOOL 2cac91b46688f45c2352a2e7983e784024aaf3c4df3cbb7722e0e4d90a310a3376c12f988f9c2c095e078921a4fbd9e08502e227ec348291915672a09a2bced7
diff --git a/dev-python/process-tests/metadata.xml b/dev-python/process-tests/metadata.xml
new file mode 100644
index 000000000000..cde5814fe74f
--- /dev/null
+++ b/dev-python/process-tests/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pxml</remote-id>
+		<remote-id type="github">metagriffin/pxml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/process-tests/process-tests-1.2.0.ebuild b/dev-python/process-tests/process-tests-1.2.0.ebuild
new file mode 100644
index 000000000000..c56b949ad9da
--- /dev/null
+++ b/dev-python/process-tests/process-tests-1.2.0.ebuild
@@ -0,0 +1,22 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools for testing processes"
+HOMEPAGE="https://github.com/ionelmc/python-process-tests https://pypi.python.org/pypi/process-tests"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/processing/Manifest b/dev-python/processing/Manifest
new file mode 100644
index 000000000000..217b10f1c859
--- /dev/null
+++ b/dev-python/processing/Manifest
@@ -0,0 +1,5 @@
+DIST processing-0.52.zip 178013 SHA256 976fa4f8d30e8dc8216ae24d44c95587ae05ab39e9ac4bdc10691cab51fca11d SHA512 ce5244eefe1bed629afddf2309ea61f44a2a5fe913b97032752ecd92e58add278f7bcf02c5dc9e1985720ceaaa2e4d547f67e9b018313a26ca084c2a86f0efb3 WHIRLPOOL f0e243253d1ea8d7d67c3f209ad5cafa6d0f9f571a77566db7aa25294f3b252b5b3120450c7b149231edc0c6ffd1901725d0373617553de7c554f6a686f54b88
+EBUILD processing-0.52-r1.ebuild 558 SHA256 39f8de80d6d602e1edc1c13a64ba182310f96d61b2453ccdf893e9d15889677e SHA512 0c1e590930fbb332bdd2b6c43547fde9d8cb19ee834c3e183d5e7a692770ec3a2ee62c264f3507f76ffa817e081b9d14eef0e8098f0c52b5c30d57d888530649 WHIRLPOOL 2d922ecfcdc91a9c301ee0d59a56860338b919866ad101775c391d18b945f23855547bf6a0142665b055263cf8540b34bcf78b1458518119d888389dcc89cc2e
+MISC ChangeLog 2783 SHA256 e52d3b3018925a307e9b44b16e165b79f605a7b585bbde321944ccc4026a5b1a SHA512 ac6643eacc0f41038de52f4667b3a45494536817c3f25df65d00c8e735fb71164f003e9fb89bb6632a73c0439816a7acbfbb705a03eb635a6d7db73912bfcf80 WHIRLPOOL fdbe6656d3ac5c87f215a77079cc3475b61c7dc2540990beea14966b09367955b0bdf88485634eae6c19826187ba6df152627a0f0bac5bb73a1bbd1fe8d589b0
+MISC ChangeLog-2015 1167 SHA256 1a4710e60a93d69e4309b12cddca9825802777a1a5f482862d7468ce2929a92d SHA512 accc29faa6d14938ee7af1016c62bd67b7d1370921e79def3690765dad1fd3192d23de51456a40d1f156a6fc99f75103ba1a5683a0b417f06ff6a89fc70a891d WHIRLPOOL 1b38ede33e4cf2e74fe5bcb35de0db53016938ca60ef00eb8d4fda740315ce729f3c0270ae12760d14dd73c20cc0d57c3c790ecad4e3e7c265fbdd7ff6fd2dfe
+MISC metadata.xml 313 SHA256 da6475d88e2d09e0998b2ba42df38f065cb8257653338083b2b36ede27ad3dcb SHA512 77df3ec80696cb2ab14b05e37e90e06a9aa53c58f2871309b9c754014682c559aa687581fe8642b11d409ec8d520ce795a192cb599505a9faf2ed5743411c57c WHIRLPOOL 18c60cd33882df08601a7bd137b760fa630f4fad64d4accc2ffd6af25058348e046faf3b925dc2f374b0deb7a08cb364bcb64fb89151afd992500aa4bc60ac6a
diff --git a/dev-python/processing/metadata.xml b/dev-python/processing/metadata.xml
new file mode 100644
index 000000000000..74199fc077ef
--- /dev/null
+++ b/dev-python/processing/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">processing</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/processing/processing-0.52-r1.ebuild b/dev-python/processing/processing-0.52-r1.ebuild
new file mode 100644
index 000000000000..b05c393de555
--- /dev/null
+++ b/dev-python/processing/processing-0.52-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Package for using processes, which mimics the threading module API"
+HOMEPAGE="https://pypi.python.org/pypi/processing"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
diff --git a/dev-python/progress/Manifest b/dev-python/progress/Manifest
new file mode 100644
index 000000000000..17dc3346cfd9
--- /dev/null
+++ b/dev-python/progress/Manifest
@@ -0,0 +1,6 @@
+DIST progress-1.2.tar.gz 4951 SHA256 5b6a50f9ac76820f619d7789b5354881c8c10060a64047e415868d8f503cc2eb SHA512 bd09e63a1cc1b24260b66e6f963deaeb6da87b08c376a4e2da179badc23eeb3e9ca213872d1da8caa5e2475cc1b7bb2022389bb8d7f1c9e1ca8f755406648116 WHIRLPOOL 1c6294b4a504f57eb94b50a4c1cf3454203df239315b1f5d5ef62c0ab0152c61b66eae7bdca70bd9230c78585a8620c997f4d67e1011cc89390279b7954ae67f
+DIST progress-1.3.tar.gz 5300 SHA256 c88d89ee3bd06716a0b8b5504d9c3bcb3c1c0ab98f96dc7f1dc5f56812a4f60a SHA512 e94ac3b86ab5391a348130fe97a1bed9c42ed3625b4436b84080f677351a2d64b56e9ebafc65ac6c598ffed825413d30bb0d57210a7835c5e5fec82278b37076 WHIRLPOOL 11090a2dc7251dbd41f372899b5d9713b3b28042abef9f56486993bfcf2c074f9e15e209407a2ce2984dc59fa7ebcb4ec820fc3d09e9251c4b53a21f03fdc0e1
+EBUILD progress-1.2.ebuild 693 SHA256 7897e9f75989eabb4bca97c2583e6e16a472a88309b128992bf25dea88492de7 SHA512 f9dd1a72027de4601bb743b0bff24b00082559007c4a98622cff17234bbc1e8f3ef0d2bc4fc5a013cac7b97ba517f32ed0022b2d4217fc398503aef1948c31e4 WHIRLPOOL e1ea4a8cb90fc45fd3a9861077958e6ba41a39a108beb26a0627fd31246be0fb116fb3cc0f79f5a3ce65f08ca31665c0e6d5eba0491b526fa9ce1ff67f64905e
+EBUILD progress-1.3.ebuild 671 SHA256 def89f6e2183cae4dc245929d8c15401b4d8ab594f2606879e0091b69d78b474 SHA512 f1144156a98b07e298432991ddc8938695daa4ef42605c4dbd429ff7b7946e7ef433836a372e3aa0619a194e144069e7e8720dad641944f8b83e9bfa5822940b WHIRLPOOL 816f8c55192301e3693932a297f5c82aeb9085d7f67e693772d695a8311972533076c658ceda5988f9e5fc8e18832f89a059d2d64277a303216c4e9e0dc82c8e
+MISC ChangeLog 4864 SHA256 15345b01a06ed978496d40baa7995107a8f3a1bb008c2db446c7a45a0451e6f5 SHA512 963e34867e6eb236f611f05c9652619638e685587a5cd8491abe8fafcf64698a7eead74b46192a1616fbe75542e699def7a7ebf6e8b343e94985bf2905720d45 WHIRLPOOL 74a0a2dd2df39fc9675f703397ef74d9b20278ed9ecfeb7b5d1a3a63946169d991d46793311e17cc2cb220395647c102e8357060daea97684b56abf53aed0c9c
+MISC metadata.xml 367 SHA256 39fc99548a6f3bfb02b922f0928e885d36e20f31638ce9786eacdbd35fea6e8b SHA512 cb620893fc0f46e9de21d8adebe9cd8b4946152d770fc88a1417204dfbc2bf9ec24bcd43d0132977e1ffe47da72297d04d0bda8ceafefabf36021a7f796c65ae WHIRLPOOL c8e7110a1b11796cb87fbfa444de9d20b6d7b821462d339cc0400f90d248a38ae3813f32faf5d5c58dcb9ed85cae1279babfc554656221b4c95e42886d8c7f16
diff --git a/dev-python/progress/metadata.xml b/dev-python/progress/metadata.xml
new file mode 100644
index 000000000000..0076cbb33acf
--- /dev/null
+++ b/dev-python/progress/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">progress</remote-id>
+		<remote-id type="github">verigak/progress</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/progress/progress-1.2.ebuild b/dev-python/progress/progress-1.2.ebuild
new file mode 100644
index 000000000000..3ebc1c9b4ff5
--- /dev/null
+++ b/dev-python/progress/progress-1.2.ebuild
@@ -0,0 +1,28 @@
+# 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 pypy3 )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Easy to use progress bars"
+HOMEPAGE="https://pypi.python.org/pypi/progress https://github.com/verigak/progress/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="ISC"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Not bundled
+RESTRICT="test"
+
+python_test() {
+	"${PYTHON}" test_progress.py || die
+}
diff --git a/dev-python/progress/progress-1.3.ebuild b/dev-python/progress/progress-1.3.ebuild
new file mode 100644
index 000000000000..c391e80d3d6c
--- /dev/null
+++ b/dev-python/progress/progress-1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Easy to use progress bars"
+HOMEPAGE="https://pypi.python.org/pypi/progress https://github.com/verigak/progress/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="ISC"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Not bundled
+RESTRICT="test"
+
+python_test() {
+	"${PYTHON}" test_progress.py || die
+}
diff --git a/dev-python/progressbar/Manifest b/dev-python/progressbar/Manifest
new file mode 100644
index 000000000000..40d1905ba00e
--- /dev/null
+++ b/dev-python/progressbar/Manifest
@@ -0,0 +1,7 @@
+AUX progressbar-2.3-python3.3.patch 2646 SHA256 0f414aeb9605c892472c49af588079e2cbc922f985f0d6a5dd6a3a77c4c7e837 SHA512 8f6816119c01809f3116ade0d52188cffa86e59fec516343937e6a624fc077dd75906325a88f514568b0e61d262435bf9c743807df2a4099991e8e3bec804b50 WHIRLPOOL a3cf7382123ed61ffde365c1ba6327fd89f696725bfd5b4534808bbf9a4c00af9d071921ee8a775c95fce2bf508472367b13fcc749b08bac8304d03b134a5711
+DIST progressbar-2.3.tar.gz 9420 SHA256 b2d38a729785149e65323381d2e6fca0a5e9615a6d8bcf10bfa8adedfc481254 SHA512 06fdc8b6664642bd864be8023355316fba23bcc4deb0c5877c5dfa91da5d233301a8f39342f133cbb63f37a20de7b8b24910ac8073127fcbdf43b5200d60ed5f WHIRLPOOL dc29b6d0b11760052e8634ad0cae94d63fea3bdd80b0ba17b9901d54be01fecbca6cb390bda74478df9a6852d91bc16ebaf4c8b9813c5d11b65f0fe0b01d54d1
+EBUILD progressbar-2.3-r2.ebuild 566 SHA256 69b4385192ccf85b59241266ce4972c91327c033070cdae631c0b45d573de89e SHA512 faa4aaf6f646665a65dc77399f69560c92f53f311ae6326bc7e0493c7542b23965b55b9213ee6274c4ec6c62a7b679ceac1f55c3959b97d9d09067004bb1d8cf WHIRLPOOL f963e134b00c234ad4921c32921f50850352a19fedc671e8d18c214819466eaf9b67c9a677640c82fd1b5e1e0e32c0a90c2b5d33424ea68554294e5d4b228d75
+EBUILD progressbar-2.3-r3.ebuild 568 SHA256 95102510a650bacdd760689f1022d08c7078eff797a1aebf990509a2df96b9c5 SHA512 b4fc7198b53cec8f68395a7a21ff742eda772b2de6aafe6d811cd0ae516d4e5106da81f33645bdf4c17176647fe177dadc1fb24b7008688f8601cb356ecd3ec9 WHIRLPOOL 6345b4ec4c24cd034cedb3b402d44d1e278d5197ab99ba8208b6c678d0c8a7063faf7d4f73f249c0c1b7332c60e2c2b144114fb00a043563970c39400df52aa9
+MISC ChangeLog 4791 SHA256 67e69c7741c116bd911dd35c609896833c7f59b39e2dd75ae7cff8728cc0425e SHA512 680fa81fc6d519c3be6460d5fc3b96b35cbade8ba46d1735ff5493a2a1d0c93fa5d3f47c7a840d99e4ccecda4e4c1df2896084c0ce160aacff23f916586955d8 WHIRLPOOL a0ecc0921d6ff6e751451b10bfe0bde56759095ee05cb475de82f71b6a04120ef75717d806cfe1fa014b1fbc4925ee06579fdbbe0ab2619b50ba720f7ca7ebe5
+MISC ChangeLog-2015 2508 SHA256 211f49df8d6accbd4885410d3991743846227d15d2f241af90b35178b791c178 SHA512 80721166d54c722ad2d326631c537073bc92186a39b55109b311a0701c265f6dd8f6833a95b0cc126fb3d7d5743c86563960213a81ad7d82d9c45ff08906d653 WHIRLPOOL 2da5ad88d944e5f039423bb55af4db2e8269ffde19d807fae492513684f10a933823c4ad2807c8f40e1db51119069f4d2bd74ea39b7db7770fc491bfeb51c8cf
+MISC metadata.xml 324 SHA256 9478f33c45a1c11ce2fc03c69cccfdaa98b270040d8ee52a1af19645444b3ee4 SHA512 96cd08f27e9f075bacf7c3aa012b69642d245dbf7b99ced6a6cab24c2183c6304cef7bc25a44392319638d20233f9bb6256990f08c6eff60846815de35ed100b WHIRLPOOL 6e610e5475b685229150f450ab88c09822a625c0842ccd728b932d531df48ea2a48b783fdaac1e2d5517ff654fc1dcd73962f4de8ad20ae1e1dd9ef7ae3869da
diff --git a/dev-python/progressbar/files/progressbar-2.3-python3.3.patch b/dev-python/progressbar/files/progressbar-2.3-python3.3.patch
new file mode 100644
index 000000000000..112bcf4b3779
--- /dev/null
+++ b/dev-python/progressbar/files/progressbar-2.3-python3.3.patch
@@ -0,0 +1,94 @@
+# HG changeset patch
+# User Nilton Volpato <nilton@google.com>
+# Date 1348267873 10800
+#      Fri Sep 21 19:51:13 2012 -0300
+# Node ID 3c94a3a1ebe1325c7c605cc8f11126dcc632b04d
+# Parent  83ece680e4fe06aa704de4c3a967355db21046d4
+Remove format as a slot attribute, as that is not compatible with python 3.3
+
+diff --git a/progressbar/widgets.py b/progressbar/widgets.py
+--- a/progressbar/widgets.py
++++ b/progressbar/widgets.py
+@@ -81,11 +81,11 @@
+ class Timer(Widget):
+     """Widget which displays the elapsed seconds."""
+ 
+-    __slots__ = ('format',)
++    __slots__ = ('format_string',)
+     TIME_SENSITIVE = True
+ 
+     def __init__(self, format='Elapsed Time: %s'):
+-        self.format = format
++        self.format_string = format
+ 
+     @staticmethod
+     def format_time(seconds):
+@@ -97,7 +97,7 @@
+     def update(self, pbar):
+         """Updates the widget to show the elapsed time."""
+ 
+-        return self.format % self.format_time(pbar.seconds_elapsed)
++        return self.format_string % self.format_time(pbar.seconds_elapsed)
+ 
+ 
+ class ETA(Timer):
+@@ -121,9 +121,9 @@
+ class FileTransferSpeed(Widget):
+     """Widget for showing the transfer speed (useful for file transfers)."""
+ 
+-    format = '%6.2f %s%s/s'
+-    prefixes = ' kMGTPEZY'
+-    __slots__ = ('unit', 'format')
++    FORMAT = '%6.2f %s%s/s'
++    PREFIXES = ' kMGTPEZY'
++    __slots__ = ('unit',)
+ 
+     def __init__(self, unit='B'):
+         self.unit = unit
+@@ -138,7 +138,7 @@
+             power = int(math.log(speed, 1000))
+             scaled = speed / 1000.**power
+ 
+-        return self.format % (scaled, self.prefixes[power], self.unit)
++        return self.FORMAT % (scaled, self.PREFIXES[power], self.unit)
+ 
+ 
+ class AnimatedMarker(Widget):
+@@ -168,13 +168,13 @@
+ class Counter(Widget):
+     """Displays the current count."""
+ 
+-    __slots__ = ('format',)
++    __slots__ = ('format_string',)
+ 
+     def __init__(self, format='%d'):
+-        self.format = format
++        self.format_string = format
+ 
+     def update(self, pbar):
+-        return self.format % pbar.currval
++        return self.format_string % pbar.currval
+ 
+ 
+ class Percentage(Widget):
+@@ -197,9 +197,9 @@
+         'value': ('currval', None)
+     }
+ 
+-    __slots__ = ('format',)
++    __slots__ = ('format_string',)
+     def __init__(self, format):
+-        self.format = format
++        self.format_string = format
+ 
+     def update(self, pbar):
+         context = {}
+@@ -213,7 +213,7 @@
+                    context[name] = transform(value)
+             except: pass
+ 
+-        return self.format % context
++        return self.format_string % context
+ 
+ 
+ class SimpleProgress(Widget):
diff --git a/dev-python/progressbar/metadata.xml b/dev-python/progressbar/metadata.xml
new file mode 100644
index 000000000000..6ddc4ee3c402
--- /dev/null
+++ b/dev-python/progressbar/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">progressbar</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/progressbar/progressbar-2.3-r2.ebuild b/dev-python/progressbar/progressbar-2.3-r2.ebuild
new file mode 100644
index 000000000000..156867dba430
--- /dev/null
+++ b/dev-python/progressbar/progressbar-2.3-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3)
+
+inherit distutils-r1
+
+DESCRIPTION="Text progressbar library for python"
+HOMEPAGE="https://pypi.python.org/pypi/progressbar"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 BSD )"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}/progressbar-2.3-python3.3.patch" )
diff --git a/dev-python/progressbar/progressbar-2.3-r3.ebuild b/dev-python/progressbar/progressbar-2.3-r3.ebuild
new file mode 100644
index 000000000000..fda8d2843f91
--- /dev/null
+++ b/dev-python/progressbar/progressbar-2.3-r3.ebuild
@@ -0,0 +1,21 @@
+# 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 pypy3)
+
+inherit distutils-r1
+
+DESCRIPTION="Text progressbar library for python"
+HOMEPAGE="https://pypi.python.org/pypi/progressbar"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 BSD )"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}/progressbar-2.3-python3.3.patch" )
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
new file mode 100644
index 000000000000..5a78fb1217d2
--- /dev/null
+++ b/dev-python/prometheus_client/Manifest
@@ -0,0 +1,4 @@
+DIST prometheus_client-0.0.21.tar.gz 40859 SHA256 8836c8e8ac7bed68b22d7b03552ad1c677c8e73821470c541d4733f4b9d13823 SHA512 e948ecc9044bd6a59fdc58bb3dd638c89d210a5856a360b4270eff206b2280ef7a68c1e94aea64f5cfb68a218499e61627e34c71363ff222b1a3d27403396a31 WHIRLPOOL 83746b1ff1c609acd961589c310c820dec6e3015e4174de8e0d71a0849ed439f858e05e7684965678d5f77f1b1a38438432412851b38c651cbbdf511198a3aed
+EBUILD prometheus_client-0.0.21.ebuild 728 SHA256 4ab192e9929029f6514fc815bc96560f8f8d7e391a472948273c7279a4c27b09 SHA512 b8830fcc2553732db97acf7859cd7fa32c21a80ea3a15083bed368248c9826396c30a11677f6b636e9eb4bafccf9af2176a361f9d8020f9d0187a1d2721f9649 WHIRLPOOL e80dd5690d36b3f55b7988f367cd640e212b94419336f29328ec40b990e9bf96dbcfbd996dee164dc1dd9ffdd440a81be5bae53c01c8a0f94056a3e659aff2dc
+MISC ChangeLog 341 SHA256 c3e5ba257526a78da189b1f971d7cefbd471bf80ee82103098aeaebf987785ca SHA512 0462446f12ecb686ee85a78140090f77df45dba76ecb6c36935516e768980a0b7d89206c50b1c98f5ef78ba527b3ba90f4497f3ccf908d97a4cccaa587670ecc WHIRLPOOL 553e790421de112d6dce392dd9c773d2eb46de4cb8789a00cad45cd9f22ca11f4aaee5c07b1254bb3eb71903a9f13e870de276c6352ef66e0d6980a1b832df77
+MISC metadata.xml 451 SHA256 9f5b530ef933527d08b20aae44d1aff0d7a4603841b93eea912aa3c719b60bf1 SHA512 fec61f65143e869244b519455a7214884de5e72c75cf7e500e5aa156c41eb1e644ece46c402cb4722ec294e876078f9332654901b06f2a6f5ab8449f0181532f WHIRLPOOL ae2d895055743ada6f72f03f907b2dc6a8e3cfdd6431806081f072d24fe2de034a47fc2d8bcce5c5cc2a270ecf6ba29ba1235c57b0d99d80f3f2230e3d25e283
diff --git a/dev-python/prometheus_client/metadata.xml b/dev-python/prometheus_client/metadata.xml
new file mode 100644
index 000000000000..5357dd817d6d
--- /dev/null
+++ b/dev-python/prometheus_client/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mrueg@gentoo.org</email>
+    <name>Manuel Rüger</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">prometheus/client_python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/prometheus_client/prometheus_client-0.0.21.ebuild b/dev-python/prometheus_client/prometheus_client-0.0.21.ebuild
new file mode 100644
index 000000000000..af5a5b0c716d
--- /dev/null
+++ b/dev-python/prometheus_client/prometheus_client-0.0.21.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Python client for the Prometheus monitoring system"
+HOMEPAGE="https://pypi.python.org/pypi/prometheus_client"
+SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+S=${WORKDIR}/client_python-${PV}
+
+RDEPEND="|| ( dev-python/twisted[${PYTHON_USEDEP}] dev-python/twisted-web[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	pytest || die
+}
diff --git a/dev-python/promise/Manifest b/dev-python/promise/Manifest
new file mode 100644
index 000000000000..f4bbc3afa59b
--- /dev/null
+++ b/dev-python/promise/Manifest
@@ -0,0 +1,5 @@
+DIST promise-0.4.2.tar.gz 7309 SHA256 70646a304676fcd021b1b984c1dcc3953c5d569f2f9f52a0fcb2b44191ae29cc SHA512 e3f0bd3dddfe3a304cb51d857418c8b8993f6e97c1a9e64622438869952174275ef4631259d5e6f090bfb39d4a2fd6bca8fe50ada5bb8ccea19ff726adcde7fd WHIRLPOOL 070b04c1cbb8b4636180758c42d47f74ae57204ef8e5046429716c36b9820e6de9aaa196e764ad9c4b09e57cbddb5f64e097f91946c67b75388eba3043cc7fa5
+EBUILD promise-0.4.2.ebuild 674 SHA256 b2973df324c8719e5a9b7758b2b1a0f26349c10c86c1668859813fd27254af9d SHA512 a407e7dd8d0a4fb502c2b1540eed51d219b21d2ce8c1c4936f5ace0e9a6574b447c5ee36c069f3a2057d6e35617dc3248788fd780772032af09d4210d1a1c3e3 WHIRLPOOL 0032e402af57f9c562597b13aa926ca243e10e4537755e0c2ff9bbc3493d7e92f9d7dc8738610c7a93506876257e0822ae12fa860ca89c775c24d0dae59d8664
+MISC ChangeLog 3002 SHA256 3f2445b6734dbd08a311275e205d48562089a8d089798cd4c4790bd6186f48b7 SHA512 3b60f35fc460a3bc4dc275d8032fd3940a2b72674e012aad987aa7cce859330aa9532448b159a4e023892f49439f42eb4c14554c1324d6c2ed1cb9fbfd60bc0f WHIRLPOOL f607632daee1383e1a74afe7fd0a4b12adbbe0757dce5044432213cd6045f8f75ff6104e3310b50e91532bf2a3e7ea9f2b4bdc9f2907b6b25c349e25e30f41c8
+MISC ChangeLog-2015 1234 SHA256 be5609e6753ba143efc6a842d90061f5fee7c5170a202716035949561b49789f SHA512 73bb6a752f158dcac9ab90a83c686d8df3e821de31399a3e1910fbb7e8bdff71f28d86b4409a8d0a4f8d250dad2a6bcf2550e2ad73fb0417fb77ecb20dca0b16 WHIRLPOOL 2558c8633e49d40d53e18967ba8769bf4468aa6579c8057baa759b248572e3a02309b877a69d963e5544223c51cf248f46bd7dbd993b3ef57605ef7fbc0532ef
+MISC metadata.xml 373 SHA256 0ea6c3e0be1f087b96b4212d2a6a47c81701dae52a817e2a1081d7a1982f304c SHA512 a8e678fd1664a3adb4e5f60023acde26c317b37bd742d7e1c386e4847f19fa9c727bf366745ff5a772b8e0eb02f8515048c65c6f78b2a127213236bc7e635b9f WHIRLPOOL 82e5a0b2270c7d0f1173d03fb15befe625a4061f0968cfc0686e7221d52311fc90115338f705168c534226c3e2298e6a98c7c4d0d0a9851c8a0cbf9a0766bc88
diff --git a/dev-python/promise/metadata.xml b/dev-python/promise/metadata.xml
new file mode 100644
index 000000000000..c482c8226f1d
--- /dev/null
+++ b/dev-python/promise/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">promise</remote-id>
+    <remote-id type="github">rfk/promise</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/promise/promise-0.4.2.ebuild b/dev-python/promise/promise-0.4.2.ebuild
new file mode 100644
index 000000000000..21f09b63d864
--- /dev/null
+++ b/dev-python/promise/promise-0.4.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Bytecode optimisation using staticness assertions"
+HOMEPAGE="https://github.com/rfk/promise/ https://pypi.python.org/pypi/promise"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND="${PYTHON_DEPS}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+python_test() {
+	# Timing tests fail.
+	PROMISE_SKIP_TIMING_TESTS="1" nosetests || die "tests failed"
+}
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
new file mode 100644
index 000000000000..bd0250c5c9ea
--- /dev/null
+++ b/dev-python/prompt_toolkit/Manifest
@@ -0,0 +1,5 @@
+DIST prompt_toolkit-1.0.15.tar.gz 243734 SHA256 858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917 SHA512 10981be2ed8b71d0cd9f663c4de047cec9664d9276968c6eec40dc45b388d1acf8eba07d534369254f178931079bf39b04eb2ceac06aa63a2021ebf62387b2f5 WHIRLPOOL 0736b1fa8c17cc86e8fcc729ee77d9aee658f9a505c1ccc7a6d987303a978d0e9d10df12c93f9cf6ffe35b2f9b8f8286bcbc07f29cc12c05e644bb17a8218ea4
+EBUILD prompt_toolkit-1.0.15.ebuild 742 SHA256 98be122057d88aa6d43ccf0d1ac6a3d75414e72e465ae148bc200721f423a57b SHA512 46c14c24182d3c99daf7b9ad38584fbca7a9ef38ae3cdeea87444d3187b49347f3972c11848ffa27156f6c79dc5f941a1859f142d4a8061d735005088d9fd1b9 WHIRLPOOL 5b831c6da96b34183430c53baa0b0cc03475be9da47f608cfd93446319fae479e11640a521387b0f0add2046ef83ca78e0cc2b334c3a8e5c8e726c1492adc36e
+MISC ChangeLog 7880 SHA256 c3b30e7f11947a09fa5b85b47262b571602b8fec84d0d992fc565ebbfbf710b9 SHA512 df90b130894d67e07c10f1f63eac534cd0ce09a93dc30b34169e6303edc322897a97adfbb07954548e90663e399f06ca2c8ad326587684d68a3a644395257b8b WHIRLPOOL 8d8e05d88d0a0cdd1d41bbb66f72ada2414038933450727b69d088658ffd5b79fd2785cd6481824a4540239458b1415954ea19de8265b7ebf3c5d4e651384e3d
+MISC ChangeLog-2015 1765 SHA256 2c3970e4535841f006ca132807931b96330451b306a9efe3d6e16e4822ecbd02 SHA512 dcb50dff971b2848624db5e34ac56b9fb08cb5cae2f63a67a1ae990f718192470459b65a204c4efd70161c9a6dd87f73ab05a09e8b6bf0c4e8075f7061316bcd WHIRLPOOL 24acf4375a278f078064ad04d19952df4b2dbcbf112ada423db9744ecd68b61525de278159901a3c7c64be6e9aaf361286b43d58399bb1dcd64eb749f70fc6a9
+MISC metadata.xml 407 SHA256 f9592da2f63809f809cc3754fdc38bebfe5c44d1c611271442308a65378c8b82 SHA512 7322ba928408db64bb54edf92fd385bd2fc41dea2a857bd2034d3b3e3bfe23b7fc82fd8048a41bb65f0aa103153e9f99f64c5f6abc76cc01a3d2db139b0a98ff WHIRLPOOL c7b629787848033e7a1cd4915d306c378ccab1c7f9bf434de8aef6e15aaf186874aaedc161767100b3f8bbce65fba6df6d4b3950365d96fd72bc470ceca11925
diff --git a/dev-python/prompt_toolkit/metadata.xml b/dev-python/prompt_toolkit/metadata.xml
new file mode 100644
index 000000000000..29e9faaf3f1c
--- /dev/null
+++ b/dev-python/prompt_toolkit/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">prompt_toolkit</remote-id>
+    <remote-id type="github">jonathanslenders/python-prompt-toolkit</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
new file mode 100644
index 000000000000..bc789a6bfbbc
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="https://pypi.python.org/pypi/prompt_toolkit/ https://github.com/jonathanslenders/python-prompt-toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
new file mode 100644
index 000000000000..5bb0a325b886
--- /dev/null
+++ b/dev-python/protobuf-python/Manifest
@@ -0,0 +1,10 @@
+AUX protobuf-python-3.0.0_beta3-link-against-installed-lib.patch 1327 SHA256 3d12159549f8b7291b81f0c21367ce9ce15a29562bad8fe8e10ffa5232023296 SHA512 0d4d79c403327110ed16f47e64027c10d476a75a1b267f513777064151019074fec772e65ee24db2e93b3e169f343f59dc03fe68bd8a3dc299379b615204fa89 WHIRLPOOL e1397df17af26556baa2f3c76539727883986a934e2b4d447d086b5cb3efb998a2c369f6505989d75915138e3c16d2a2f6bbb411d4ca01d0e72b0fce15bfb2c6
+DIST protobuf-3.1.0.tar.gz 4051503 SHA256 0a0ae63cbffc274efb573bdde9a253e3f32e458c41261df51c5dbc5ad541e8f7 SHA512 8d3289a16944c255bd1cceab696e515e52467f2bfe1cc10f6b32fabdf082d5acdc248ec9cadc572223a24d04d431f75921076153109cea2f90ee533f502ab47a WHIRLPOOL b8a0bee9ff549c8da45c2b56b12aafbed5807959cdb11b3888a0f30fd0d6df83a72f3c6ef9e266522754b8901792f65235a6e81a8b0f74cee15d59ecbe6dee68
+DIST protobuf-3.3.0.tar.gz 4336596 SHA256 94c414775f275d876e5e0e4a276527d155ab2d0da45eed6b7734301c330be36e SHA512 0734a55ae92f0539dfb507e174539d290fd8e93633c1edd8810e0d51c37e67254337b75fc5ba9450316f6416e1f8f8cfb59415864657b55f2a1696fbcdfe7636 WHIRLPOOL 4c18120ad784234ebb5308c0f3a2f3814d77f2fc906407f48285f3ba8f84af8e15defa4e7edf2d2e77cf22316df338b3f5bc0c6ca11c7a4fb951105c3aa7d7d4
+DIST protobuf-3.4.1.tar.gz 4490100 SHA256 8e0236242106e680b4f9f576cc44b8cd711e948b20a9fc07769b0a20ceab9cc4 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34 WHIRLPOOL c53dc76155bcfeee11720b08c7d508a35274f2387d6f8a61149565bc72d5539ad598600ad692f01ac7a0ea102d66659f4d516f994c419c56c4420ce69659646b
+EBUILD protobuf-python-3.1.0.ebuild 1305 SHA256 ea171c5e1c3bd096a59d9a77ba0dc2c389888373dc71e27bd88e3ed92d9f4dfc SHA512 9c2cce83ae543f35da04ed38c844cf1e7e2462c3db264d79f2dd8d0b248bfdc49271db4f5d288d17b522e555695f276a73c4a665373e1944af438a7f3050e645 WHIRLPOOL 3aaf9adc9d0f26a6c282ab5f2e22837d3871b84156479babbf428ca36d7814a36c6660f15ffd8470b1beb1931e7fbe1fb2933e4c8a5ffef15cf0b2a46d2718d7
+EBUILD protobuf-python-3.3.0-r1.ebuild 1424 SHA256 00aa2154ce7e487deeedb93506dab942cac6cf72aeaf6c1738625136df48a08f SHA512 e418df42b58de1efef38f54cfa6ff0818d1349d314003759d6f921a03ede7aa45083014955933f21d416d70e551a9525408abafa773934ebf074c9cfdf55e61f WHIRLPOOL 6aafaa1dfc1c2ebd2f1b1bb3f99a2088e2f0d524b1223540cfaddf0ad5dc7470eb5d8f1b5c1858d3ef7507d8c85cea1e884f152284128acc5041f34dcc44ecec
+EBUILD protobuf-python-3.3.0.ebuild 1273 SHA256 1d9d19540d6d12a9453f00c86695d9a4dec6d17bfe1ab8b3ecf3346e4627aa6f SHA512 5f9d1d730877b24133839ccb669416df55e178c5af94a76261445a15b8e15ec4735724d531d2f8ca972ab759a34718974b5636c6f4ac6056348a1386c3b52d4e WHIRLPOOL 6ab5a24ca6c207faf44444372af1e260aabfb510e629f6c0df4bf8ca711aa3d73dcb45d9fd5398470b46ab3a00406237a1c8945776e0d5d27bd1fc54fd76834a
+EBUILD protobuf-python-3.4.1.ebuild 1250 SHA256 90a6b925342b4ad5e3b7aa1cb5d5e4c017bde60066b4079d01cb7f81d445afd6 SHA512 a82b7e00afb6408dfeaf3c70fe5df077792daadca9e0de3b30689fd5ef49405e81f615fa2e586f14548715e189bc9db1a013b69bc17b599a0119801f74857d14 WHIRLPOOL f79a0010abe68728f42aa4784127c65ef8a93755a083e7090d9eb1e31f0e4e67bc86507572ee6983fb35ab8267519dd105107f84bdd5bf3a04115fa2bb3fb6b2
+MISC ChangeLog 2292 SHA256 c770002f77811ec78e86335ab105666d39e1d5aea5e8fbacc6ba026b873c21d5 SHA512 3e0adfe1158ac8b13057b49d8a81aa888c82d6ef031d0c4cc76a2de0e0d26dcee8fa5d9f6ceb09f20082b64a70de07c64798d27c66a6fd72d1a38276b6b188b8 WHIRLPOOL e73a71ea9952cb578629599c151de74d8390fc128a527b7efde19b60866d1b0ab022cca7e2005713ead67b732df1e22533751184c95ac0fc5e925313c2e9e26e
+MISC metadata.xml 684 SHA256 fb1b3b15a0c90c2ba5a595bc76a450e8d4a1d722fcabc62bd3e767340b4f3bd8 SHA512 0df3579cf30f46c98cbc09de65b9e209b41fa28f39ef6d226b8f4b7bf6c68751ca343a5a6d3373822084d2a0379c0cc872fde99d9f0fa4b7210af61a94364fc4 WHIRLPOOL 38fd8afd256063c823e4ec2034c8ccbb799031b4bce68f9c3d45f96bf2b4d53eea41da4305366e00e3933f0b56c2aacf8785c59ad1a1f5695974a1418bcb852e
diff --git a/dev-python/protobuf-python/files/protobuf-python-3.0.0_beta3-link-against-installed-lib.patch b/dev-python/protobuf-python/files/protobuf-python-3.0.0_beta3-link-against-installed-lib.patch
new file mode 100644
index 000000000000..c0b7aadcd6f5
--- /dev/null
+++ b/dev-python/protobuf-python/files/protobuf-python-3.0.0_beta3-link-against-installed-lib.patch
@@ -0,0 +1,33 @@
+diff -Naur python/setup.py python/setup.py
+--- python/setup.py 2015-12-30 22:21:46.000000000 +0100
++++ python/setup.py 2016-04-18 00:51:49.490809789 +0200
+@@ -190,15 +190,27 @@
+       extra_compile_args.append('-Werror')
+       sys.argv.remove(warnings_as_errors)
+ 
++    inclD = ['.', '../src']
++    libD = []
++    try:
++        subprocess.check_call(['pkg-config', '--exists', 'protobuf'])
++        inclD += subprocess.check_output(['pkg-config','--variable=includedir','protobuf']).decode().split()
++        libD = subprocess.check_output(['pkg-config','--variable=libdir','protobuf']).decode().split()
++    except OSError as osex:
++        if osex.errno == errno.ENOENT:
++            info('pkg-config not found')
++        else:
++            warn("Running pkg-config failed - %s." % osex)
++            libD = ['../src/.libs']
+     # C++ implementation extension
+     ext_module_list.extend([
+         Extension(
+             "google.protobuf.pyext._message",
+             glob.glob('google/protobuf/pyext/*.cc'),
+-            include_dirs=[".", "../src"],
++            include_dirs=inclD,
+             libraries=libraries,
+             extra_objects=extra_objects,
+-            library_dirs=['../src/.libs'],
++            library_dirs=libD,
+             extra_compile_args=extra_compile_args,
+         ),
+         Extension(
diff --git a/dev-python/protobuf-python/metadata.xml b/dev-python/protobuf-python/metadata.xml
new file mode 100644
index 000000000000..4c6fe778f353
--- /dev/null
+++ b/dev-python/protobuf-python/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+<maintainer type='person'>
+	<email>vapier@gentoo.org</email>
+</maintainer>
+<maintainer type='person'>
+	<email>tomboy64@sina.cn</email>
+</maintainer>
+<maintainer type="project">
+	<email>python@gentoo.org</email>
+	<name>Gentoo Python Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Gentoo Proxy Maintainers Project</name>
+</maintainer>
+<slots>
+	<subslots>soname major version number of protobuf</subslots>
+</slots>
+<upstream>
+	<remote-id type='github'>google/protobuf</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/protobuf-python/protobuf-python-3.1.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.1.0.ebuild
new file mode 100644
index 000000000000..ac2101c316e4
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.1.0.ebuild
@@ -0,0 +1,39 @@
+# 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 python3_5 )
+
+inherit distutils-r1
+
+MY_PV=${PV/_beta/-beta-}
+MY_PV=${MY_PV/_p/.}
+
+DESCRIPTION="Google's Protocol Buffers - official Python bindings"
+HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
+SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/11"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+# Protobuf is only a build-time dep, but depends on the exact same version
+# (excluding revision), since we are using the same tarball.
+# In case of using the (linked) cpp implementation we should be fine with the same subslot.
+RDEPEND="${PYTHON_DEPS}
+	!<dev-libs/protobuf-3[python(-)]"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/protobuf-3
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.0_beta3-link-against-installed-lib.patch" )
+
+S="${WORKDIR}/protobuf-${MY_PV}/python"
+python_test() {
+	distutils_install_for_testing
+	esetup.py test
+}
diff --git a/dev-python/protobuf-python/protobuf-python-3.3.0-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.3.0-r1.ebuild
new file mode 100644
index 000000000000..ec1907817312
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.3.0-r1.ebuild
@@ -0,0 +1,46 @@
+# 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
+
+MY_PV=${PV/_beta/-beta-}
+MY_PV=${MY_PV/_p/.}
+
+DESCRIPTION="Google's Protocol Buffers - official Python bindings"
+HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
+SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+# Protobuf is only a build-time dep, but depends on the exact same version
+# (excluding revision), since we are using the same tarball.
+# In case of using the (linked) cpp implementation we should be fine with the same subslot.
+RDEPEND="${PYTHON_DEPS}
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	!<dev-libs/protobuf-3[python(-)]
+	~dev-libs/protobuf-${PV}"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.0_beta3-link-against-installed-lib.patch" )
+
+S="${WORKDIR}/protobuf-${MY_PV}/python"
+
+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.3.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.3.0.ebuild
new file mode 100644
index 000000000000..c3076f1f5b6d
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.3.0.ebuild
@@ -0,0 +1,39 @@
+# 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} )
+
+inherit distutils-r1
+
+MY_PV=${PV/_beta/-beta-}
+MY_PV=${MY_PV/_p/.}
+
+DESCRIPTION="Google's Protocol Buffers - official Python bindings"
+HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
+SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+# Protobuf is only a build-time dep, but depends on the exact same version
+# (excluding revision), since we are using the same tarball.
+# In case of using the (linked) cpp implementation we should be fine with the same subslot.
+RDEPEND="${PYTHON_DEPS}
+	!<dev-libs/protobuf-3[python(-)]
+	~dev-libs/protobuf-${PV}"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.0_beta3-link-against-installed-lib.patch" )
+
+S="${WORKDIR}/protobuf-${MY_PV}/python"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/protobuf-python/protobuf-python-3.4.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.4.1.ebuild
new file mode 100644
index 000000000000..156bcde3e958
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.4.1.ebuild
@@ -0,0 +1,46 @@
+# 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 ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	!<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/prov/Manifest b/dev-python/prov/Manifest
new file mode 100644
index 000000000000..210fd417ca4d
--- /dev/null
+++ b/dev-python/prov/Manifest
@@ -0,0 +1,5 @@
+DIST prov-1.5.0.tar.gz 125045 SHA256 96a74efa1b3324961ff66246539ed7bdc06245dcbeef538688c755a0ad5777ee SHA512 d08b924385f587814f6094679649e746bc687e136ddebe1194c5d97921a081b960a5531f13cb8f83d167dbd1cf7114d2e55478431feaf52e547db24a181a2ad2 WHIRLPOOL 1e10dd7066c6b0ce09b5d46330ccdb245c1344dcc650a84d09f5fbca081ed5cb1f328058a250d27b92112929771d90c5ffa5ecd0174942dc7fa04298a0d593b8
+DIST prov-1.5.1.tar.gz 123725 SHA256 7a2d72b0df43cd9c6e374d815c8ce3cd5ca371d54f98f837853ac9fcc98aee4c SHA512 71ff149f7a015a36299413b7fc98e0965684aaa0ece86ff865be1c1ef404a3b24489144d9f8299dd48c2f13b377d16679b26fe93e3463455192a054897af52f7 WHIRLPOOL fe1396f98e4022a66825a3414725ba7e4a2adc31eca68f55f6575d1b2e89ddc9d40c2b9f476a2460ae23daa6f96874bbe3357bafbe351c748216d08c34ca4354
+EBUILD prov-1.5.0.ebuild 944 SHA256 ea75684cd814b9c16c6d8d89d33ceb017855f82cd99d1039830059d4820fd7ec SHA512 ac511df5e3a75d42f413be1b921848f064530b6f01315d66b9f4b6698cabc008cc068d64f51bcd5152576abfe2423cba9c105fe2debfd904ac3e14366fa96841 WHIRLPOOL 5366cbc0a9cbf9dcfd2ed0f04a17940146dcf9e1ce542228b22d54de9def8c29b505ea8aa19f8c8103e84bb8023c6fe0889c2fbcd871c200f258f5f50715cc33
+EBUILD prov-1.5.1.ebuild 760 SHA256 6fae65abf75ab93ff41cf138b73166d84fcc818af724221c751a1f1b62fb106d SHA512 b7539458f6e55035cf5ef7e017b51ffbd1294c22c95e59529274d24cc462a7209e24d57110659aa199b6e658d859d3c213ad2f413f5dc45773f88439b3ae8a49 WHIRLPOOL a472bf04049c6ca0386ea97a6df01859708e2413fadf66d4a69633319ac73a6bb47ede7b1995c5c60ef4c658d848aed032a7ca1ff6d3adc33abf2497d9ac47ca
+MISC metadata.xml 632 SHA256 02398e15b9926d3d06bd9398f1440df12d789562d17794685ed021a12ccf9aa2 SHA512 ecc45c96e15df53bf48de473c0553b3fad1ca42b89b3f1f9059f49f5877e7f3dfdcb725c25b54fb64db910acb657c88cbead3a36ed60be4e4f8068ecafbd52a7 WHIRLPOOL 6c24d2a620d66e390e83045c3fdb439fdc4002403cde65691d26735485a81866523c6c8fdcbe2afa24531bf324514dc36b1ed2ce400cdb0dcba3d2471d719c9a
diff --git a/dev-python/prov/metadata.xml b/dev-python/prov/metadata.xml
new file mode 100644
index 000000000000..28c33bc9d013
--- /dev/null
+++ b/dev-python/prov/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">
+		A library for W3C Provenance Data Model supporting PROV-O
+		(RDF), PROV-XML, PROV-JSON import/export Interface to
+		Graphviz’s Dot language.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">prov</remote-id>
+	</upstream>
+</pkgmetadata>
+
diff --git a/dev-python/prov/prov-1.5.0.ebuild b/dev-python/prov/prov-1.5.0.ebuild
new file mode 100644
index 000000000000..0459f01d6699
--- /dev/null
+++ b/dev-python/prov/prov-1.5.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="W3C provenance data dodel library"
+HOMEPAGE="https://pypi.python.org/pypi/prov"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pydotplus[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	dev-python/rdflib[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? ( ${RDEPEND} )
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+#the test phase fails due to a bug that may be better fixed
+#in setuptools or the yajl package:
+#https://github.com/gentoo/gentoo/pull/4346#issuecomment-291776642
+RESTRICT="test"
+
+python_test() {
+	${EPYTHON} -m unittest discover || die
+}
diff --git a/dev-python/prov/prov-1.5.1.ebuild b/dev-python/prov/prov-1.5.1.ebuild
new file mode 100644
index 000000000000..1e40c222e242
--- /dev/null
+++ b/dev-python/prov/prov-1.5.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="W3C provenance data dodel library"
+HOMEPAGE="https://pypi.python.org/pypi/prov"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pydot[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	dev-python/rdflib[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? ( ${RDEPEND} )
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	${EPYTHON} -m unittest discover || die
+}
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
new file mode 100644
index 000000000000..f409f4c1e50b
--- /dev/null
+++ b/dev-python/psutil/Manifest
@@ -0,0 +1,17 @@
+DIST psutil-1.2.1.tar.gz 167397 SHA256 508e4a44c8253a386a0f86d9c9bd4a1b4cbb2f94e88d49a19c1513653ca66c45 SHA512 9faec6c4139f677252b30f4a8793484658d888535428dfb4e316821bb5f246e1832baedd8704279a7e0da7096d539f1a8dcd49f2d61d943f9299e9204ff47d81 WHIRLPOOL e6b13df0c6f70e5d92a88bd540ad2e2f4d670463e1ec815a3eb3b6b009715dd7c0a96b73a03c5819fb3eb3b30f63a1299d6668ffef992a408d8d1b78d33dea43
+DIST psutil-2.1.3.tar.gz 224008 SHA256 b434c75f01715777391f10f456002e33d0ca14633f96fdbd9ff9139b42d9452c SHA512 12a566c2c53897d858bd75455da8f52d9d9279e28dc0df40594275626f75da716d82c8f67d1fc37df4bd3bc05fef401391cb6c52380c819d1e82fb4edd11f843 WHIRLPOOL 75c8475fc55c5a04858ba8acba0e57f9daa06aed6badf68b484d5ff0dc9c6e52066472bb78350113c1ebe755baf4ab205e347cbb5b2bac3eb4857a2fe0dd8f3f
+DIST psutil-5.0.1.tar.gz 326693 SHA256 9d8b7f8353a2b2eb6eb7271d42ec99d0d264a9338a37be46424d56b4e473b39e SHA512 b455f84da45ee7bfe4d32479bf4c26e293e0d1f71315906677ef72d734bc5fbe4f763f3a140ecff0833f320fb617cac4993e93269365dcaafed606ba90067f79 WHIRLPOOL 702a92a5c6a63172b57212d62c34d6a2ace6a09a72c6a11bfcf601a85302bdf105e9a4cfc0674b8554db82758571161189546626d885fd118ac8027bd574b9a1
+DIST psutil-5.1.3.tar.gz 341980 SHA256 959bd58bdc8152b0a143cb3bd822d4a1b8f7230617b0e3eb2ff6e63812120f2b SHA512 85ccccd5fbfd3ba25f05fd0ad2235956801af31c3fe8d7b80d0ae8870c0542609900e5ccf51e5897ec7bb12b95c1ed89899fe446908b817ae922d43479e83c6a WHIRLPOOL b0356e773d60a9af82591fc88400335709e50551696264d0bcc281e99b97d9246c1d7213da1c9caa15f0dcfd69a47b558042c44d4b3c5feb57acd59c891f8f51
+DIST psutil-5.2.2.tar.gz 348413 SHA256 44746540c0fab5b95401520d29eb9ffe84b3b4a235bd1d1971cbe36e1f38dd13 SHA512 df4878d03a6ff98beb611969edd5a4d704ac269d38dc286d84def3ca271936e03367241470f2a192e0d71d0f64fe1f252223b0d67e964918146334a807d1a997 WHIRLPOOL 3c6a2a74ede27f52f5113b060f9786a75169394309ca42f07cb56f839916c4f263877cd30cdc45328195b3ade3ede09cbbfe707bd360422eb7dbbe29e73428ce
+DIST psutil-5.3.0.tar.gz 397265 SHA256 a3940e06e92c84ab6e82b95dad056241beea93c3c9b1d07ddf96485079855185 SHA512 fbcb467fe5cd7e9e5ed149409e427d992510eac3e8be73a31e71c60d5e576bdb9c36f6ebd1d84730a0ab250973ad618800a0e864076f978f66c1117d90147a40 WHIRLPOOL 6a99aa4df67520acc2706cf98232aa46774033fb7a8d2a250c0badea48f2176f279ec239e3ea27006bb81ee499cf1b713f566daf28122517242d76fc8abf0633
+DIST psutil-5.3.1.tar.gz 397075 SHA256 12dd9c8abbad15f055e9579130035b38617020ce176f4a498b7870e6321ffa67 SHA512 93bfadb19e603f7ccc7eedfc91aea05af41f2aeeeac1f2f11518b011c53f1672e07d550e6db6999fd3574c6b49adf4ffcb1a68f1066e8851be12689b0daf9595 WHIRLPOOL 23dfe92e9870b929c8dd839913cde2be7cf9a4df51cb9fe50f3b2afed58a6f64f4e8a8f200025bc9fb1ebb3bec993ccd2e9a2258b7f5837619bdf36eb5d78780
+EBUILD psutil-1.2.1.ebuild 577 SHA256 7e6489c189cbe3cb3f45c65a3db3d28e74b5d62081ae8d9f4e46208c8e0fa1ed SHA512 8ddbb64a6ef392047d8a23f286aad8427f64122f5040d0f20f363390f9084dde440e19616457919b09b1a41dbd90d099297e77618675e9195a198e5e9153abf1 WHIRLPOOL 46fee079949b022b7c56d08a9684d4febf66f1f09f63884c7345152b909dbb15c0ee9fdcb41464368157e989e07ce1df64c137cb899965a279d11229f15dfc51
+EBUILD psutil-2.1.3.ebuild 673 SHA256 486c4bcbf509295ca38e822216a0be27eefb8853d4135ddb0feee8c30e68e31c SHA512 19eb266d399895dd97a8bff95df71e4dab14bd86ee6fc381b3eb322f139ee49d57c1804c568c3bbb4f0120bd093206d464f462b9fcdc37837014397df04e2bff WHIRLPOOL a4791dd94ac52f7dde8518d7911f8c181f2de8e3d9e11669031da0d21e93db87bb6a1d1fde848e35513aab8486472a2ca677d1b3c0f7b11e57ad81e7b0abdffe
+EBUILD psutil-5.0.1.ebuild 779 SHA256 4a5327bc5fb993d57e99109d93548dd0102aa02680191f8013e4f164ae5a4c96 SHA512 d5b720450aa0f2211a8bf28635c0e47d0a13d1cc4f5977f583c48254e07a3bfd2403f4d2ba6faf299d29a1e88466ed9036375315b7a9579233b47d950cb32009 WHIRLPOOL 5e144a03a535ddc255ba40a609b217275181d094105f29efb1648c67583c1126222f0ce1bd3f522de9a86e763c86c9c3959ecb5d1168e8af92bb963391c24267
+EBUILD psutil-5.1.3.ebuild 782 SHA256 5178a171842f732b63b070f4a0742f02c66495afa40999843552a8375d8e10b1 SHA512 a69266a36f5a8579e024b2fa29c0ca2b47261d0425c5aa4bbe871733a9bc783baadd531b3681d1dbc010074b3c0f66f19c6884b96ab491701e358d42a2b43f23 WHIRLPOOL b9b369b15b72c73da04b5acce49920231febcf2d79f162dd60f54a10e6955a67135e3f61a69b8091934916795a6a54ad14eb84d73b9c02703a6d804723ca01ad
+EBUILD psutil-5.2.2.ebuild 779 SHA256 4a5327bc5fb993d57e99109d93548dd0102aa02680191f8013e4f164ae5a4c96 SHA512 d5b720450aa0f2211a8bf28635c0e47d0a13d1cc4f5977f583c48254e07a3bfd2403f4d2ba6faf299d29a1e88466ed9036375315b7a9579233b47d950cb32009 WHIRLPOOL 5e144a03a535ddc255ba40a609b217275181d094105f29efb1648c67583c1126222f0ce1bd3f522de9a86e763c86c9c3959ecb5d1168e8af92bb963391c24267
+EBUILD psutil-5.3.0.ebuild 782 SHA256 5178a171842f732b63b070f4a0742f02c66495afa40999843552a8375d8e10b1 SHA512 a69266a36f5a8579e024b2fa29c0ca2b47261d0425c5aa4bbe871733a9bc783baadd531b3681d1dbc010074b3c0f66f19c6884b96ab491701e358d42a2b43f23 WHIRLPOOL b9b369b15b72c73da04b5acce49920231febcf2d79f162dd60f54a10e6955a67135e3f61a69b8091934916795a6a54ad14eb84d73b9c02703a6d804723ca01ad
+EBUILD psutil-5.3.1.ebuild 782 SHA256 5178a171842f732b63b070f4a0742f02c66495afa40999843552a8375d8e10b1 SHA512 a69266a36f5a8579e024b2fa29c0ca2b47261d0425c5aa4bbe871733a9bc783baadd531b3681d1dbc010074b3c0f66f19c6884b96ab491701e358d42a2b43f23 WHIRLPOOL b9b369b15b72c73da04b5acce49920231febcf2d79f162dd60f54a10e6955a67135e3f61a69b8091934916795a6a54ad14eb84d73b9c02703a6d804723ca01ad
+MISC ChangeLog 6149 SHA256 624d6ef498b5c2904ce92dc25dd98f2831b909fe48a9f1a1fe0d5b07ff2d55ef SHA512 f0e6e6396907b486248f50a544d4f4b6fb342a41cd2d81e473ac48ba70407b05ce13a5b392b9e1ea7e6b7957d932b4f7369d1620fcf8b70a2c3764358ef1740f WHIRLPOOL 4ebb0455fc448991aa05193ac8f29b94b500b82dec8bb43a71be57b7d651ceb9bea1239d98c62d6f6bd7f0fa9fecc27e9d905255ea56f67cc1182f5ff5d20c47
+MISC ChangeLog-2015 6585 SHA256 ce04bd08bb7993e368874ac7b26feea52bc427ab6042929994b0eabd59b6a8de SHA512 1db8336909c3e28a2b794eaa3fa5bcb2a27d00bfe3e29e12778d86bdfcfc402c5936af82fc424ed7d8a4d29d7e99dd99c058d60c88cb9977e3a3ce4756345e59 WHIRLPOOL 9da9c587d2225c789ff39e46d4437ea04e8afe270d764774c362450d95d76ecd3dcc0f74981ad4ccea47894440306fa6b37292526f23d200c1b1b5810c55f648
+MISC metadata.xml 377 SHA256 5ee32592fb176c7b7297e612bb531ff057c567fbcf4498882ec791c823c00e69 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d WHIRLPOOL 398d572f27a1e2769aa09e6b99314aa2ec333fec74740ae2655db3791edf71c8243b10b03047dd5c1de95733e29e2413a285ecc71afdbfce1525639b5097d8f4
diff --git a/dev-python/psutil/metadata.xml b/dev-python/psutil/metadata.xml
new file mode 100644
index 000000000000..dd5c8b3edf94
--- /dev/null
+++ b/dev-python/psutil/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">psutil</remote-id>
+    <remote-id type="github">giampaolo/psutil</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/psutil/psutil-1.2.1.ebuild b/dev-python/psutil/psutil-1.2.1.ebuild
new file mode 100644
index 000000000000..e8d060d17b10
--- /dev/null
+++ b/dev-python/psutil/psutil-1.2.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Retrieve information on running processes and system utilization"
+HOMEPAGE="https://code.google.com/p/psutil/ https://pypi.python.org/pypi/psutil/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RESTRICT="test"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/psutil/psutil-2.1.3.ebuild b/dev-python/psutil/psutil-2.1.3.ebuild
new file mode 100644
index 000000000000..77cc4fdbbe8e
--- /dev/null
+++ b/dev-python/psutil/psutil-2.1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Retrieve information on running processes and system utilization"
+HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.python.org/pypi/psutil/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/psutil/psutil-5.0.1.ebuild b/dev-python/psutil/psutil-5.0.1.ebuild
new file mode 100644
index 000000000000..babbf0e2aaf1
--- /dev/null
+++ b/dev-python/psutil/psutil-5.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Retrieve information on running processes and system utilization"
+HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.python.org/pypi/psutil/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} psutil/tests/runner.py || die
+}
diff --git a/dev-python/psutil/psutil-5.1.3.ebuild b/dev-python/psutil/psutil-5.1.3.ebuild
new file mode 100644
index 000000000000..ab3ee8d3bb2f
--- /dev/null
+++ b/dev-python/psutil/psutil-5.1.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Retrieve information on running processes and system utilization"
+HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.python.org/pypi/psutil/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} psutil/tests/runner.py || die
+}
diff --git a/dev-python/psutil/psutil-5.2.2.ebuild b/dev-python/psutil/psutil-5.2.2.ebuild
new file mode 100644
index 000000000000..babbf0e2aaf1
--- /dev/null
+++ b/dev-python/psutil/psutil-5.2.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Retrieve information on running processes and system utilization"
+HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.python.org/pypi/psutil/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} psutil/tests/runner.py || die
+}
diff --git a/dev-python/psutil/psutil-5.3.0.ebuild b/dev-python/psutil/psutil-5.3.0.ebuild
new file mode 100644
index 000000000000..ab3ee8d3bb2f
--- /dev/null
+++ b/dev-python/psutil/psutil-5.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Retrieve information on running processes and system utilization"
+HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.python.org/pypi/psutil/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} psutil/tests/runner.py || die
+}
diff --git a/dev-python/psutil/psutil-5.3.1.ebuild b/dev-python/psutil/psutil-5.3.1.ebuild
new file mode 100644
index 000000000000..ab3ee8d3bb2f
--- /dev/null
+++ b/dev-python/psutil/psutil-5.3.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Retrieve information on running processes and system utilization"
+HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.python.org/pypi/psutil/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} psutil/tests/runner.py || die
+}
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
new file mode 100644
index 000000000000..501841417a34
--- /dev/null
+++ b/dev-python/psycopg/Manifest
@@ -0,0 +1,14 @@
+AUX psycopg-2.4.2-setup.py.patch 568 SHA256 9dbdab62bf2018efe48afe72170daff494d6fbcace00da911b44066e2b31b847 SHA512 9111df177d89559b0e397bc0ca9844636f981552d4bac3ae04abfdae5c68bc4f9efc553829da9c3a653536ddb18f01a3049e9ece746d0fe3328684a6ef6b6976 WHIRLPOOL f7a5054b1daffc82e37893592a1444708ebf1e91519b5a47d9d7ae2c962e0883d95141b5dcf558fac8042357759513cfc249f038681b6db6d3f5e9caed2c55cf
+DIST psycopg-1.1.21.tar.gz 213753 SHA256 f487d02e8e8837ec7e62e4e0f50bcb974e73b7765333b032ac50c07bf12ce240 SHA512 2681e8b3c4873f69a1a07aa4d3908a42f8e8be9392adbed189fe72c1a601699ac08643d24454622baf4b26153ef3a687f27a941308368e2227cb98ff948322eb WHIRLPOOL 022a4e1a01ac30338f2be14e549a9f35028c7bef7bb8f8a6e4602425ddff07d89e049d362a9b49f760e89afb52f153f3f0a197b828b79f75245f26fcf48a9c4b
+DIST psycopg2-2.5.3.tar.gz 690689 SHA256 3a2df3bb113187227aa97d0dd3d06e0f26be3d50dcdeeaef67fac59ed51a030a SHA512 88590c37be839e8cf5025b7ac40411c4682269700795c5f8f1b762966d906faf3f1ee85de35fc734a2d10c6a68d7fef569891bd96919bab809b9500625e2a41a WHIRLPOOL dccd694dfb2192992731e982b085ba4feb3b2b89d56c9e69ec88e0efbd14ec7367841849958aa1e9f190179b300ce511532d6b23e51b4f96babc302f37efcf4f
+DIST psycopg2-2.6.2.tar.gz 376348 SHA256 70490e12ed9c5c818ecd85d185d363335cc8a8cbf7212e3c185431c79ff8c05c SHA512 614314b5ab7ab5fa7c5e9c4f861579f90bd73521a9964dcb5a0938f77a9d6dfbea689cef35ad399cda698a45bb736c315912cb5dca85a52132f011d79f4863ac WHIRLPOOL 51f9577abcd495eb688f227751c1f4622ac3c3922b44c455acef54f974809f71829ca5ce901fff9866366c33d6ea91d2616e15ac7d5b9ea1c0b4a30cdb907f7b
+DIST psycopg2-2.7.3.1.tar.gz 425069 SHA256 9b7b16e26448b43cf167f785d8b5345007731ebf153a510e12dae826800caa65 SHA512 206d4cf62a091927daf4b734e0b3597399fc588cb738366711674fc06c39d68a682981bc4756c356d37c41caba49b5df2b915beace8670c190d7d41e374f1eb5 WHIRLPOOL 3bb9f53e42c5d82bb75833921183c4af08ff04755a9ca2efd4c16eb064c48b51724c6d3cd27342d602aa7facc0ba01af0fdcb532c96afc4b0305497f7dc29863
+DIST psycopg2-2.7.3.tar.gz 425004 SHA256 c9bd49848556d04093909faec017c3675efabf78c2b7f383bf7c43ba18324ac8 SHA512 9e673f47190b12ab31e783a3d2b464231b933cc6ad4f12742c457020aab5db36b83829d84b4e63f793f5567e689081fd9479bfc4634b7bb08c7d873a3f42efc9 WHIRLPOOL 51ba355f684e313e811014bc420911857e062b7f07ac92bf626cb4dd4b7a576f46c689c93a7a27f35dd49fb369d32f6b371e15eb48efc35374a8e084bc1e9fd1
+EBUILD psycopg-1.1.21-r1.ebuild 1569 SHA256 10b65c5c92e71aae6423442ecdf204935939d69ee0495dc9dee5df36ac3e98ee SHA512 e69ba12412bc2d3d76fd3eeb4326bd33aec7ca8bf3f6830b6efdfd66640c7dfe036d7e09a8a0340a5b5fb448c57dd01cbb7b1a5a1810ca502ecd6796d285162e WHIRLPOOL ee5f571272a9b6cf37cb14c3ea35de8713f60897aa5dc014618ad59b0a7a3a189b41819803f5419af05a165f939fcc38208358c53df3ef5a4f85e050e8bbcc4e
+EBUILD psycopg-2.5.3.ebuild 1456 SHA256 31bb87615eb6d32e9423d5e7431d8409d7d58233c0c39d2068f751fda11bf176 SHA512 c349bd2b9908bfd33e86d197569e080b52b08fd8255f719fcd625a0a5bffc391e18c66e988f8ba7be5383bf37adc1542c91e018bac76026f29a22c2dbfe81f3c WHIRLPOOL 9b594920e7d7ea9d5d3d312f1ec6fb18606a65751a3a51eed1232147268a7a7e5a5e0618025df61f34472014fc572f337ffb2903fc7a78f00e084733cce8a76e
+EBUILD psycopg-2.6.2.ebuild 1966 SHA256 1b0bcf8ccbc584ccd9d414d777f94c28bab202a957abaa6f10a2a8ff82f8fe69 SHA512 0b87755b75f0ddd72a474795942247327fd8e05ba63f8723b505ac43f96980ebc273b9ace49f8a408c87c7a86d989b6f7627585f3764fed3bb9d11cb86718115 WHIRLPOOL 4953a43f29dcd63073c6d5ee5c9a2e976a9309cac3b29c183ad0ac7a05ff79fa9eaa8bf31ca912afa0ef9213ef35c790b4899b0cadfcc667ba66bbdf350627ae
+EBUILD psycopg-2.7.3.1.ebuild 1928 SHA256 8a01d5e250df6cb985250e3b6056e7f14b70dc08c483be278ce99a5befdda463 SHA512 3608d22ec32acfc50db5dd8c9cbf63138123153071bae3203db718d3ac822ff8da28da648de0268949dcabc71808e0e148bfdd64c153aa46a1c6b6650cece0ec WHIRLPOOL 2f0401f381941ddcdbc565e7fed778232642b810be04acf526dda976845cb0fd778ad912312f90cc7d08ec509c8b40f93159e10d0f9f814aaec66988b74d0bda
+EBUILD psycopg-2.7.3.ebuild 1919 SHA256 a3ffa31f698b703904e7e21cfce4861373179a51b95f3f459d5f7fdae6bc7ac7 SHA512 84cfe36d770054cf31158dff615ce1cd7caf16b8db8af4a411a885f1c80e4ec9e668143c0828f68ccb0ad1fe5c72b2e188cbcccfff51db0ad305c797855c6271 WHIRLPOOL d2fde070ac5b91d367184d4ac1ad425214278429f8774538d19592c15c9b37fb0e4b8f0ac1cce80a8b66ffcca6dd337289fb17ee980e2e2eec6a56a0dbb911c7
+MISC ChangeLog 4208 SHA256 a49648ae3e6756df43d2b82182d609a348965250e5738f7dedfe4503caa85708 SHA512 2108043606f96e440b6d23118e819da94560a579034fc25ef2e458ff2c8896529bd245e037ef8d449df2ab59ffe78004bf1d14307d58aa83dc8c0f49436ce422 WHIRLPOOL f227e09881c43399c6f45e03f12329ac3d312b0f3b066fb006359f8c4cad646e1e60807b473ecc45f0d855cd9098302cd7c3c48ec18d395509258093687636c2
+MISC ChangeLog-2015 26947 SHA256 60134214d329fe88a4d6977bcefdea8b95fe04491fdbf4d47a0c55ccf172a116 SHA512 13113dced8681777c520628776a582dd1d8f0700528b5f4db3e8fca146c0ccb999de2411dcc9bbaa9d063fad60bf26d957c7690d84c8a183ba544124f9a6ac4c WHIRLPOOL 5ff340d555034f54c34d123e6260498e2faf6b602050217795e681f9e29dd545995e58dd8469b6745a083cded323ff2a16abdb4d0a3180996f4a231c54f2558a
+MISC metadata.xml 321 SHA256 e75b08481b27195ef0df1c5d630593762ab621c56884683833279dbb30f349dd SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966 WHIRLPOOL fbf1252483bbb27eece55d28c50f8111892c75237706cd890f4d2d9445d38b4958b81a214952d0950676977d8ac4167a33517a20d82d8f63a5104e8fd4610785
diff --git a/dev-python/psycopg/files/psycopg-2.4.2-setup.py.patch b/dev-python/psycopg/files/psycopg-2.4.2-setup.py.patch
new file mode 100644
index 000000000000..a35502270e1f
--- /dev/null
+++ b/dev-python/psycopg/files/psycopg-2.4.2-setup.py.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index e03876a..f5ec2ac 100644
+--- a/setup.py
++++ b/setup.py
+@@ -461,7 +461,7 @@ if parser.has_option('build_ext', 'mx_include_dir'):
+     mxincludedir = parser.get('build_ext', 'mx_include_dir')
+ else:
+     mxincludedir = os.path.join(get_python_inc(plat_specific=1), "mx")
+-if os.path.exists(mxincludedir):
++if not use_pydatetime and os.path.exists(mxincludedir):
+     # Build the support for mx: we will check at runtime if it can be imported
+     include_dirs.append(mxincludedir)
+     define_macros.append(('HAVE_MXDATETIME', '1'))
\ No newline at end of file
diff --git a/dev-python/psycopg/metadata.xml b/dev-python/psycopg/metadata.xml
new file mode 100644
index 000000000000..9263d11136c4
--- /dev/null
+++ b/dev-python/psycopg/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">psycopg2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/psycopg/psycopg-1.1.21-r1.ebuild b/dev-python/psycopg/psycopg-1.1.21-r1.ebuild
new file mode 100644
index 000000000000..84902f8172ed
--- /dev/null
+++ b/dev-python/psycopg/psycopg-1.1.21-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools-utils python-r1
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="http://www.initd.org/software/psycopg"
+SRC_URI="http://initd.org/pub/software/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+IUSE="examples"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=dev-python/egenix-mx-base-2.0.3[${PYTHON_USEDEP}]
+	dev-db/postgresql:*
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# fix for bug #134873
+	sed -e '1245s/static //' -i cursor.c || die
+	sed -e 's:$(PY_MOD_DIR):$(D)&/$$mod:' \
+		-e '/^CFLAGS/s:-I:-I. &:' \
+		-i Makefile.pre.in || die
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	python_configure() {
+		local myeconfargs=(
+			--with-mxdatetime-includes="$(python_get_includedir)/mx"
+			--with-postgres-includes="/usr/include/postgresql/server"
+		)
+
+		autotools-utils_src_configure
+
+		sed -e 's:$(BLDSHARED):& $(LDFLAGS):' \
+			-i "${BUILD_DIR}"/Makefile || die
+	}
+	python_foreach_impl python_configure
+}
+
+src_compile() {
+	python_foreach_impl autotools-utils_src_compile \
+		OPT="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_test() {
+	:
+}
+
+src_install () {
+	python_install() {
+		dodir "$(python_get_sitedir)"
+		autotools-utils_src_install
+	}
+
+	python_foreach_impl python_install
+
+	dodoc RELEASE-1.0 SUCCESS doc/python-taylor.txt
+
+	if use examples; then
+		dodoc -r doc/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/psycopg/psycopg-2.5.3.ebuild b/dev-python/psycopg/psycopg-2.5.3.ebuild
new file mode 100644
index 000000000000..4fa5833cee8c
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.5.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="http://initd.org/psycopg/ https://pypi.python.org/pypi/psycopg2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc examples"
+
+RDEPEND=">=dev-db/postgresql-8.1:*"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+	[[ ${EPYTHON} != python3* ]] && append-flags -fno-strict-aliasing
+
+	distutils-r1_python_compile
+}
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-2.4.2-setup.py.patch"
+	)
+
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc -j1 html text
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc doc/{HACKING,SUCCESS}
+
+	if use doc; then
+		dodoc doc/psycopg2.txt
+		dohtml -r doc/html/.
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/.
+	fi
+}
diff --git a/dev-python/psycopg/psycopg-2.6.2.ebuild b/dev-python/psycopg/psycopg-2.6.2.ebuild
new file mode 100644
index 000000000000..3ebb4749cd18
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.6.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="http://initd.org/psycopg/ https://pypi.python.org/pypi/psycopg2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc examples"
+
+RDEPEND=">=dev-db/postgresql-8.1:*"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7
+	)"
+
+RESTRICT="test"
+# Remove py3.2 entry from intersphinx setting
+PATCHES=( "${FILESDIR}/"${PN}-2.4.2-setup.py.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+	! python_is_python3 && append-flags -fno-strict-aliasing
+
+	distutils-r1_python_compile
+}
+
+python_prepare_all() {
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+	# Source local copy of objects.inv
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -e "s|'http://docs.python.org/', None|'${PYTHON_DOC}', '${PYTHON_DOC_INVENTORY}'|" \
+			-e "/^    'py3':/d" -i doc/src/conf.py || die
+		einfo "conf.py patched"
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc/src -j1 html text
+}
+
+python_install_all() {
+	if use doc; then
+		dohtml -r doc/src/_build/html/.
+	fi
+
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/psycopg/psycopg-2.7.3.1.ebuild b/dev-python/psycopg/psycopg-2.7.3.1.ebuild
new file mode 100644
index 000000000000..8571410b80b6
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.7.3.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="http://initd.org/psycopg/ https://pypi.python.org/pypi/psycopg2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc examples"
+
+RDEPEND=">=dev-db/postgresql-8.1:*"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7
+	)"
+
+RESTRICT="test"
+# Remove py3.2 entry from intersphinx setting
+PATCHES=(  )
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+	! python_is_python3 && append-flags -fno-strict-aliasing
+
+	distutils-r1_python_compile
+}
+
+python_prepare_all() {
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+	# Source local copy of objects.inv
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -e "s|'http://docs.python.org/', None|'${PYTHON_DOC}', '${PYTHON_DOC_INVENTORY}'|" \
+			-e "/^    'py3':/d" -i doc/src/conf.py || die
+		einfo "conf.py patched"
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc/src -j1 html text
+}
+
+python_install_all() {
+	if use doc; then
+		dohtml -r doc/src/_build/html/.
+	fi
+
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/psycopg/psycopg-2.7.3.ebuild b/dev-python/psycopg/psycopg-2.7.3.ebuild
new file mode 100644
index 000000000000..f70647ab04ca
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.7.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="http://initd.org/psycopg/ https://pypi.python.org/pypi/psycopg2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc examples"
+
+RDEPEND=">=dev-db/postgresql-8.1:*"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7
+	)"
+
+RESTRICT="test"
+# Remove py3.2 entry from intersphinx setting
+PATCHES=(  )
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+	! python_is_python3 && append-flags -fno-strict-aliasing
+
+	distutils-r1_python_compile
+}
+
+python_prepare_all() {
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+	# Source local copy of objects.inv
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -e "s|'http://docs.python.org/', None|'${PYTHON_DOC}', '${PYTHON_DOC_INVENTORY}'|" \
+			-e "/^    'py3':/d" -i doc/src/conf.py || die
+		einfo "conf.py patched"
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc/src -j1 html text
+}
+
+python_install_all() {
+	if use doc; then
+		dohtml -r doc/src/_build/html/.
+	fi
+
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ptpython/Manifest b/dev-python/ptpython/Manifest
new file mode 100644
index 000000000000..a47e5062bbed
--- /dev/null
+++ b/dev-python/ptpython/Manifest
@@ -0,0 +1,6 @@
+DIST ptpython-0.33.tar.gz 43295 SHA256 86bb8bc6b3b2e4c7d4b400867d53fd94ffc4fe029d146f7a54d4e53160479435 SHA512 fce9379e4522b2b644e6159c73e3eff2d0ced8de65462d4ad622f91feb46fa80a9e01a2c7aef1832b4fcf69de5c0c7d229c731149af7029eec46f88a0506ad71 WHIRLPOOL 1b872bd57b5950c229c6777f84449d3d24ccc33ae61744c0f68a45e6432cb417e6dc0bf084487a38f5baaa9196e3dbb3d79abcfbc837b7e62fc21f009fa21866
+EBUILD ptpython-0.33-r1.ebuild 807 SHA256 1033c2aedf8c0c30c02d26220a7b779bf18d2c470df081dff5b5e43a88278e7b SHA512 c49af36bb816ebc536f7b710c4d8244cbaddb7aef7d4d4ba7b11cbeede3ca0d684118a83f35544e828607e1725f81c93a6b4372bd2118cf7ca21e55bf5729e1f WHIRLPOOL 20d23cf58693a6dc11caa53291df38b4f6d219c5063a7a72c4284c1b7d26f2ba07bb7b6305e38357155f2149804435cb173c08ccef511d622105254a128d9686
+EBUILD ptpython-0.33.ebuild 803 SHA256 4aee606b4a0a8b7ffbcd62d61b7cdc860be8ad3c4656faaa41ede306808dc0cc SHA512 e01c52410fcb254c2fd5954ad64f3f8eaacb053bbce1c114ddae611154f93fd7bc102555746efc4d24b08f57744ddeae1391e7a10ac5f47a1997cfeaa41ebd07 WHIRLPOOL 8679bbab77f5bcb238a5812df3bb1b1b966de01a1851c36b0263b7128fa77bc90219ac8307a173d086896966262b093565abb26703c332a22e3ee43d4554b8ab
+MISC ChangeLog 5243 SHA256 1be2106123048718d698d104fc67316b6fee7081251f075bcbc6320bd4e69741 SHA512 76ce4f6ab71ccc3f26b9478fc8c709c38e4b575775c5484f5b110a839d582e4939d73ac7e5531fcdc896b77edecaf9703be29e3bb10e5aa2f220d77dd8cfe8a4 WHIRLPOOL 84a297ee1c8e333423b3d6dfa6f9373c49f72f000fec190fb956ab1febbd25b5c700f39943fde9327797863e126fc76fba9698cb414831e60c3ec524ac4dfd0b
+MISC ChangeLog-2015 1611 SHA256 6aa8e2d43140ac4d255551318a43f603727b9ee1c800e00115e70485e5b2d901 SHA512 5d8dea6f1c33cf701750edc7489fead5289739c1d87d6c2fbe9d6c75cf67492122542a3ff4fc3b635a2eb671e11b8f859d47ded54c95fb47d709680755fd620b WHIRLPOOL fb663ecc45eabb93643c618afb0a9d233e8c5ce146561603a28fcff5bc9e4bb1097e86fbf6662eb0290493819b693737e7e61d3a6314b53e9859a04307cbc5be
+MISC metadata.xml 388 SHA256 93637ac990b4c5576c39f505de81574f9bd84deed0119e3ed17a6a42b15eb7d0 SHA512 c64bb500332e8c5efffaa07034a3a86e0b5ca167a42fc030662562fce80ea69c53f4fe9b4a12a192d2faf693747c981500d4950cbb68fbc069050a5f61c9aa83 WHIRLPOOL 970531f2c836b829fa156fa26736e9b4579d182aa7bf5a743e48a4cb7f1b4d8cd2ff75c87dd4718ca69024551ed930e463ff38d456fde490cac165bef02fb4ea
diff --git a/dev-python/ptpython/metadata.xml b/dev-python/ptpython/metadata.xml
new file mode 100644
index 000000000000..f08e580eb251
--- /dev/null
+++ b/dev-python/ptpython/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">ptpython</remote-id>
+    <remote-id type="github">jonathanslenders/ptpython</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ptpython/ptpython-0.33-r1.ebuild b/dev-python/ptpython/ptpython-0.33-r1.ebuild
new file mode 100644
index 000000000000..45f9f1f33141
--- /dev/null
+++ b/dev-python/ptpython/ptpython-0.33-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python REPL build on top of prompt_toolkit"
+HOMEPAGE="https://pypi.python.org/pypi/ptpython/ https://github.com/jonathanslenders/ptpython"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/docopt[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-0.58[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# Not included
+RESTRICT=test
+
+python_test() {
+	"${PYTHON}" tests/run_tests.py || die
+}
diff --git a/dev-python/ptpython/ptpython-0.33.ebuild b/dev-python/ptpython/ptpython-0.33.ebuild
new file mode 100644
index 000000000000..b1c5fb77f83f
--- /dev/null
+++ b/dev-python/ptpython/ptpython-0.33.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python REPL build on top of prompt_toolkit"
+HOMEPAGE="https://pypi.python.org/pypi/ptpython/ https://github.com/jonathanslenders/ptpython"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/docopt[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-0.58[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# Not included
+RESTRICT=test
+
+python_test() {
+	"${PYTHON}" tests/run_tests.py || die
+}
diff --git a/dev-python/ptyprocess/Manifest b/dev-python/ptyprocess/Manifest
new file mode 100644
index 000000000000..72ba294a32e5
--- /dev/null
+++ b/dev-python/ptyprocess/Manifest
@@ -0,0 +1,9 @@
+DIST ptyprocess-0.5.1.tar.gz 68474 SHA256 0530ce63a9295bfae7bd06edc02b6aa935619f486f0f1dc0972f516265ee81a6 SHA512 9e7481e8e3facde73086ef0728a57516a15b6bc2a5fb6bf6d6f892c396c9376d9d6334ee37737f3469929c4086d5678a2c5deaf44d70589d41644a98f2239dad WHIRLPOOL ba327a02a847f7c5e4b62e6bf8ba0f070f8a22ff584045d7ed3cc134f8a922b9d75e397992cd5df5ca4569f563d234ea2a194b5a557606978a37a4f04559ee1e
+DIST ptyprocess-0.5.2.tar.gz 69297 SHA256 e64193f0047ad603b71f202332ab5527c5e52aa7c8b609704fc28c0dc20c4365 SHA512 cb4e70855d388a6ff691e2a244c072a5a50cf39cdf727e3a4218817bf5ac722c4b49f0dbfd80204259998eba137492690759b8908bfea925842b9f7fc83ee553 WHIRLPOOL de6f42fe487b948b5b7801a9c0375f7586aedcac5c7e7563f0f7cf56a3a8d7c2abea42d256544b32cf5c0bb71bc71602b8582d581199cf0e2234a648a6017be3
+DIST ptyprocess-0.5.tar.gz 14923 SHA256 dcb78fb2197b49ca1b7b2f37b047bc89c0da7a90f90bd5bc17c3ce388bb6ef59 SHA512 6619bfc1dfc7c980ffc72dba62697692eb749f19500616e8783cfdc3c35980276eb39070f4cd7932775abb5e798c921b9320c5f51b9052f526585f01cd56259e WHIRLPOOL b1bd0da485ea106a3d366ab21dc714418b8d392a32fc3386ef734362da8ee455a38f9330cedfe35687be09bea3ff622c54440119fca72d7787d9a29518717b77
+EBUILD ptyprocess-0.5.1.ebuild 608 SHA256 7f0f1246ead310a3278c0ed4b478cd6c2f82dd8008a653a0579d0570e03c6068 SHA512 ac54b2da2df188d90859252012ea1eb0f3445cf76518bd7a631c62b167e43206be31677698c11d5702613d423796dd3bcbcd2b389512690ab7d1b7e194fb5ce8 WHIRLPOOL 00f5b8cccae3cda65c246244812514511356dd444a984062a93a371a4f818834e61d32578b41043a53726b37b59300bf4c31b16fb40ace955d76178163f9939a
+EBUILD ptyprocess-0.5.2.ebuild 628 SHA256 123192b7f51075b035533bd7566694a6c0dcadbc8e29e95c0f913ae25b46f6c5 SHA512 10325f39029c41113f1bd0670b0a2c8a539fbc70e40083aa7599b7da78c649824c2eb163c5d09f8f233abde03db10e0b32fe81f01145e909c0789c514f6ae71c WHIRLPOOL 22a1a3108382ad0384a31d4b90d13a7a1fe568292c0a2e7fae7687e94b9746e5716470bd1e4c5f9393a9449e4a7e881f302f55ccc4c45bf75a8d599de799f45d
+EBUILD ptyprocess-0.5.ebuild 610 SHA256 4ea670f95be32179a1e84e923da9cac8534557e2192157974eaff371f218a51f SHA512 076adc28648cbd054a8988191dbc654c2d6c133232c1d8c36e0327eb815b1d38fdeeb96cbcbe87d574a480ab29efa306d53520f0d0fe9ee0c0418c725f76cfb9 WHIRLPOOL ed94a4fe36815c3227e3243480e18241c12c216f7144c4ee370d0d68e0bf96192d91a4ccd9625132d65fb7094af95338dfb859678f268530d377071900bbea22
+MISC ChangeLog 4460 SHA256 f44f851cdeb6894fbf80620684ab12c3174cc1d919baf2aafaf2f758ebc1fd8f SHA512 f72a44e2d7c1d457da08facf02cd5588ecd69e0d6ae23a69c734ad7a7bc1a4c94838d0c84990813aa1eb0914f6b91d25820ea42fe0a5e898a499a9657c01a500 WHIRLPOOL 27472013506d12aa3ce6d81d95ff4fdb32b96b195fa7116f9f7c289c9e7b18e19006429738d634900d439bcda5e4e80f9c0e8f4ec2ccadb2c7d624a2bbefe010
+MISC ChangeLog-2015 913 SHA256 df7d35e1bb0412b74f404aef420f5362395959b9d6187a97484c3a447d00a410 SHA512 d9cbbea1409e1e5920ea227d887be34af288b4d2272b272bafc40bfb2832ac3d584442e250f714430f7a9552b2a66f116be7ab32d00d05358c311126ffe6a688 WHIRLPOOL ad061a75b7f8b5a12862ee7c374543624491c54d8efc4fbd5b0532cfd8df9fa7163e67a6071ff08aa3f59de2637506d19781319a10566110f03d0a7eefc3c492
+MISC metadata.xml 383 SHA256 8469a4b352086c907b687bcfa9c4df71d7079f03a63e1ba8f89ac2cb2cd1a872 SHA512 4355f5b56f756ee65c09bcc3647050e727abdd9abbee62a3f2fedf18fb97bbd523182c55ac8eb8456b0d8b7c0904372ee92cbfeed50765d6f2d608280655b05a WHIRLPOOL b5fb6ea4d5093651f89b05f2b4a73170e815f5032f33965e43ca8d9b86962be85c1a6ff9d578002378c9ae1bcb1f61c42fc85c0b94f18d6c0a40921708f086fd
diff --git a/dev-python/ptyprocess/metadata.xml b/dev-python/ptyprocess/metadata.xml
new file mode 100644
index 000000000000..bfc26e6d3ec1
--- /dev/null
+++ b/dev-python/ptyprocess/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">ptyprocess</remote-id>
+    <remote-id type="github">pexpect/ptyprocess</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
new file mode 100644
index 000000000000..d9be5e09d48e
--- /dev/null
+++ b/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
@@ -0,0 +1,23 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Run a subprocess in a pseudo terminal"
+HOMEPAGE="https://github.com/pexpect/ptyprocess"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test --verbose --verbose || die
+}
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
new file mode 100644
index 000000000000..e56ab2e7f0c9
--- /dev/null
+++ b/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Run a subprocess in a pseudo terminal"
+HOMEPAGE="https://github.com/pexpect/ptyprocess"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.ebuild
new file mode 100644
index 000000000000..2d1f9df3c7d4
--- /dev/null
+++ b/dev-python/ptyprocess/ptyprocess-0.5.ebuild
@@ -0,0 +1,23 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Run a subprocess in a pseudo terminal"
+HOMEPAGE="https://github.com/pexpect/ptyprocess"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test --verbose --verbose || die
+}
diff --git a/dev-python/pudb/Manifest b/dev-python/pudb/Manifest
new file mode 100644
index 000000000000..3dc6ca191fb8
--- /dev/null
+++ b/dev-python/pudb/Manifest
@@ -0,0 +1,7 @@
+DIST pudb-2016.2.tar.gz 51136 SHA256 e958d7f7b1771cf297714e95054075df3b2a47455d7a740be4abbbd41289505a SHA512 169ee8582b4e23745eea92b50486dedd2dd0decf57b6af226d462bb6d410fb3ef984e21e4a823ae14e6c52d73d765d846a060c03c9b73ca726064aa551848161 WHIRLPOOL 6c9f18e5725eb056185f3c84c11ec12340935eb3f1c1e57c8059914ac097e11f17053ae9500e502c07f8439abb35d70b7f2125fcccb443c74d30d129c5494da7
+DIST pudb-2017.1.4.tar.gz 55322 SHA256 aac8cb5008402e0189055f0288d9379c855c8506ab70f4c47cc7459925fa348a SHA512 7abc4f09eaf0df52f66cfc477e02285c32b1650f92db1e1bbc95cba534acb4bda1b5f853f7a1dd1af61ca7ac0296a10b9082e6c9059af176300b93153d472bc6 WHIRLPOOL 6d11a211f3bf6cbb847e6bb5ef67e4125f6cc360eb9fceefb6184a95db0c33459dec9303b1b32f2893083bb6e333b92861294910271b9b1d7cf67c7458bd65dc
+EBUILD pudb-2016.2.ebuild 553 SHA256 cabd440fc76742d3248b35d6c301ac06d61d66ec65ce5fb557dd3b0946e8c08c SHA512 a799957f166f81b45ca358f5cfbd4aed1541797a3458c9c4b7590b3b963fa85711ada30fbefb290e1a135105a54064b8ed0fad0d64db0b71efcb7b209540c136 WHIRLPOOL ebd6e5b511f67c7cf75e1acb0ed06e2d6052c9117f430f88f103cac3b5ebd563ef45a0aa8ec4eec8e84023aef284105df183203b2d73c62cbdad28c63903e025
+EBUILD pudb-2017.1.4.ebuild 553 SHA256 cabd440fc76742d3248b35d6c301ac06d61d66ec65ce5fb557dd3b0946e8c08c SHA512 a799957f166f81b45ca358f5cfbd4aed1541797a3458c9c4b7590b3b963fa85711ada30fbefb290e1a135105a54064b8ed0fad0d64db0b71efcb7b209540c136 WHIRLPOOL ebd6e5b511f67c7cf75e1acb0ed06e2d6052c9117f430f88f103cac3b5ebd563ef45a0aa8ec4eec8e84023aef284105df183203b2d73c62cbdad28c63903e025
+MISC ChangeLog 3441 SHA256 764ec41b7cf1a803214b43ca66c4fed5de90238b5a74d1923a02a55a4ad8bf04 SHA512 234ed5bfa91091092b6bb00b864fb7d4d163b57e79eea165040122e6255090603e6d41f0760fba158c4625517b1182dee2159aa0393153fe748310dbecc2d603 WHIRLPOOL fbd32116d0f7aec4b39dcb0cc300c7784f1cc214fb9c444eaa02cc53cb83712407647fd9f4d10273c8b55aeae464f5a8f0c05ac11f7ba79eb974d5c343be9904
+MISC ChangeLog-2015 3886 SHA256 f5c7410fe50626d9035e69d0e20c09db598221c49a2412c9a051f3e5cc6d5bab SHA512 cd16c69c191ab7183be8066cadf09c2f83ec55a4b1ede01c28f42099dd6aafee96475fbe81cb6bebc67a07cfd7ee4047afc8000d1e04e3d9b130132ff92dc05a WHIRLPOOL cbb10e1fba710bcce107f1f0064eca4b858afdef913688c0a9a7477c81b83e435f033c7bd16412593806fabe58d40272cd613f8da87776a8dd1be0a7b1c6fe5f
+MISC metadata.xml 495 SHA256 da35d088b6df8e14be62e02e0e1a6c916f9454db7d97de8b2b1755f41b7d9c04 SHA512 21a4c18638b19cef9f1d01f7641be082c20053a0dbd455d2c8a6f5cd41a058224362187c299b96e0735cff6dccb942c060776f17c94d74a47b290ac7f5916b80 WHIRLPOOL 0ba084ee4355d3608ac68423c2d28331d2c5ff79495ead032ab9e705cf237c696160717f6053ccc7d0f765042291268428d9668167bb46af83c69e1a20b489e9
diff --git a/dev-python/pudb/metadata.xml b/dev-python/pudb/metadata.xml
new file mode 100644
index 000000000000..9604635e362a
--- /dev/null
+++ b/dev-python/pudb/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grozin@gentoo.org</email>
+		<name>Andrey Grozin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>A full-screen, console-based Python debugger</longdescription>
+	<upstream>
+		<remote-id type="pypi">pudb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pudb/pudb-2016.2.ebuild b/dev-python/pudb/pudb-2016.2.ebuild
new file mode 100644
index 000000000000..c9c949ad5a4a
--- /dev/null
+++ b/dev-python/pudb/pudb-2016.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A full-screen, console-based Python debugger"
+HOMEPAGE="https://pypi.python.org/pypi/pudb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pudb/pudb-2017.1.4.ebuild b/dev-python/pudb/pudb-2017.1.4.ebuild
new file mode 100644
index 000000000000..c9c949ad5a4a
--- /dev/null
+++ b/dev-python/pudb/pudb-2017.1.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A full-screen, console-based Python debugger"
+HOMEPAGE="https://pypi.python.org/pypi/pudb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pudge/Manifest b/dev-python/pudge/Manifest
new file mode 100644
index 000000000000..4121037b3a09
--- /dev/null
+++ b/dev-python/pudge/Manifest
@@ -0,0 +1,5 @@
+DIST pudge-0.1.3.tar.gz 62396 SHA256 d01c32923be4ded09eb6ca936b01f7d60ad50112ea4515f9e70f1d1f8135adf6 SHA512 149efd60d04a75de23b65b5c10df9b0c347b659d1c998812bd3dc438f2a398aff28352858d17ba3f456c2cba0006707102376bcdead380156338d2a379e6b06f WHIRLPOOL 85d08f8aefdc4e2e0c3464ef85219ddf430114ee60c9af25ba9a05d83dac4cfa267afc229240c261b84f8a21c49981ad5a61ffbb7267c052086f334f64821376
+EBUILD pudge-0.1.3-r1.ebuild 949 SHA256 7219d7cc4f4a73549b95741d10af91257d869fa9c8086ffe8a0cfdf3ceec899f SHA512 0b9c1bb953ffb77f4c6c32f6a5ee6c3acc483bbe9dcdf845cf785e7d03262ea0a1bdf310c1cf300e59c1dcafdc0d5ce8a6de10e58439e1e118c4c3f1646b9f8e WHIRLPOOL d718a34b04dd3c3d860489d6894163225842d841c27a1367303d24c20884505443745c35c0e26077fa2e64c7a9f64e1941f779158ba98e94f22da4ad290bd9dd
+MISC ChangeLog 2573 SHA256 c098a0a06763d4b532c6cfb8173fcb0152200098f64ef0cd0c0ff07c7983b766 SHA512 28b38e223cfe775515715dc57de204e18d7f598017aca85d895177d1fa2086f8322b2fb7748dba7df8da3a9691c7d628958a2d2ab8943adbcf157c2a8e3698ce WHIRLPOOL b2c543f28a2c43a9820b1f93b577df602e598768ede77a513f98e3973ff1a97858692a6b5254fecddb9de1c7e61dfd86c00e150bfae599a5a5a2edb2dc29b352
+MISC ChangeLog-2015 1585 SHA256 143437b0b60737202ec20abb516da40f3a456d11bb77c526e9c54d7edb220280 SHA512 ffad4bb16b2b35bf01248c2a3fc326d7d8ec36e1988c1fd9632572fde8c07dcf547a797984aafac14383be7a22d138feb9f2f95b38055b64b668271693018cd4 WHIRLPOOL 79e6dee5b26d63618dccc5a1e67b26d0ccf967b9876251026ed9d0f3f2a5e809819fde3bed089d959dbb4d4622016a7920d7bee60320a054ddb82d3e2ecab53a
+MISC metadata.xml 308 SHA256 64761c8c49ae76e1db23cfc159c74518f9961e566a07dfa75d7ae4f3ea7b3e32 SHA512 c4d300be17d94d49a294d8dd20d0f98183d442573df5b42e3f9bd7f037858d02a2e668212c45a459da3b96867642f8f7e44c651ad62a8e55093a6dcf47828911 WHIRLPOOL 39f1928b9a27f0141d33c6ba1e274d4a3cc3d1a61d02b2bdc0cd7920396f88d6833911d360834a435956f52ac077a74925076fcf3501e0ea462de469e9f6486b
diff --git a/dev-python/pudge/metadata.xml b/dev-python/pudge/metadata.xml
new file mode 100644
index 000000000000..a9db1b5da032
--- /dev/null
+++ b/dev-python/pudge/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pudge</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pudge/pudge-0.1.3-r1.ebuild b/dev-python/pudge/pudge-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..580deb46e328
--- /dev/null
+++ b/dev-python/pudge/pudge-0.1.3-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A documentation generator for Python projects, using Restructured Text"
+HOMEPAGE="http://pudge.lesscode.org https://pypi.python.org/pypi/pudge"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+RDEPEND="dev-python/docutils[${PYTHON_USEDEP}]
+	>=dev-python/kid-0.9.5[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( ${RDEPEND} )"
+
+python_compile_all() {
+	if use doc; then
+		einfo "Generation of documentation"
+		"${PYTHON}" bin/pudge --modules=pudge --documents=doc/index.rst --dest=doc/html \
+		|| die "Generation of documentation failed"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pupynere/Manifest b/dev-python/pupynere/Manifest
new file mode 100644
index 000000000000..f50952563039
--- /dev/null
+++ b/dev-python/pupynere/Manifest
@@ -0,0 +1,5 @@
+DIST pupynere-1.0.15.tar.gz 8566 SHA256 b759b501406c950b576de1880f1dc080e05536ae42299267093e2379dac9086d SHA512 55b25ca4fb511d80b5eb11b8aa63949c80e9dda336ed1ad406314bbda669ee4ef836a3e01b71065eec0cf0b8556ef36c815a299a5620d50983074a2ff55ca5ba WHIRLPOOL 1dd1e7675c6d147035613e2b549ddf5cae4d6645c75f274691b350afa99e961f5cfaba75bba81b1a80b9057a798df7a531c122af086ac5263d76f95f736db2a3
+EBUILD pupynere-1.0.15-r1.ebuild 650 SHA256 10a45c92108c61de80e3406ece9bba34b3da1216c72126cbd0bc8082a4fd29f6 SHA512 3b137606c751146970d38703fc340763a1eefb54da839fdb74fcf1adb03cc5d94a459838302225d5fef913385641c323a608c59328afcc37d20b585b6c26911e WHIRLPOOL f122862fd5358acc4cb0745f174e6cc50e5134862f86f35a460606c2c2cb615eea864ac97a84d687b5276e3bd4651f3ca1ee2372c7b57c8e4cf8c09a188a618d
+MISC ChangeLog 2588 SHA256 26a7da0122522280e7fd834694455fbcad0da43d5d81c0deb3fc53047615d57c SHA512 f584f6794fd05f615336dab3ff36df5dd0afa146cea344b058366f0459b1b5c0d3b83f3062137f40da6af05a1939d03a43e44e9085f819a33c8d63c5503fc3cf WHIRLPOOL 7f8ddbca57a7832457e4fa4dac04176a75fec0984318b84a56c35c155bd4e864228c34d1af70a8f54b8ffff08b6dcd914d386457a539d542637d0ab9d3d48c4c
+MISC ChangeLog-2015 1854 SHA256 32b0abad7367f052136a0b4b54fb260a8eac9ffb0311562231eacde4a6dc1cb9 SHA512 ebdee8453f30520be7c5e204869b9d42545fd47079717a94163d1ffce322b3d5f700ac875d3ec35e60a843e67cf4aee82a8cb8db9f489f9a76217953072c9a6b WHIRLPOOL e79be7ca32b5e3c2554b374b34e5994100ef254d4213992b701926b42334655a7529ec2929e2a314c940ce8d53da0ef9af1c1fbd6c9ee931d5cfd6207ab54e30
+MISC metadata.xml 497 SHA256 91a128972606b146138c33604d1cbeb4cdd078b4b79f4aeae870a4d942983df1 SHA512 37fc972006e0cebcb3a1186cccc86363dc8f21cf43ca5adff83e7b2ecf148e5564e4f2995f99da8ecb658c9a4ea4ff1656a3c4ad7e7a52d01371578eb314f474 WHIRLPOOL 5636b140a68e5db5a6d50f2861719cbb8cfb99daba0aefb60961917396788b98bcf490f0b0e546eff2671db49f877bfab1226021000be0ecc71624197b257440
diff --git a/dev-python/pupynere/metadata.xml b/dev-python/pupynere/metadata.xml
new file mode 100644
index 000000000000..066e8c64c0a8
--- /dev/null
+++ b/dev-python/pupynere/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">Pupynere is a Python module for reading and writing NetCDF files,
+    using the same API as Scientific.IO.NetCDF and pynetcdf.</longdescription>
+	<upstream>
+		<remote-id type="pypi">pupynere</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pupynere/pupynere-1.0.15-r1.ebuild b/dev-python/pupynere/pupynere-1.0.15-r1.ebuild
new file mode 100644
index 000000000000..86a815f11e7e
--- /dev/null
+++ b/dev-python/pupynere/pupynere-1.0.15-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pupynere is a PUre PYthon NEtcdf REader"
+HOMEPAGE="https://pypi.python.org/pypi/pupynere/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	"${PYTHON}" -m doctest -v "${BUILD_DIR}"/lib/pupynere.py \
+		|| die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pushbullet-py/Manifest b/dev-python/pushbullet-py/Manifest
new file mode 100644
index 000000000000..041c2cdeedc7
--- /dev/null
+++ b/dev-python/pushbullet-py/Manifest
@@ -0,0 +1,6 @@
+AUX pushbullet-py-0.10.0-fix-filetypes-python3.patch 705 SHA256 bda6235894e3de758439786473fec9500640439888cf73eecdc26a7d8844f49b SHA512 b349e98877eaa540c688f7e1d1c3dbfe708e2bda253f8cd177f26510716db58f8c3ac10531722a16706f7e53951cfa99268b9afa0597558630c344f7bea6bf1e WHIRLPOOL 731db0a5592cd1489596479b5e0ab06a36507872dea20bad2b2c8dab9a94b77d9287d38a84bbd496cf7443813f7b4c97e1ef7373f6d9555c6936cfa52e414bcd
+DIST pushbullet-py-0.10.0.tar.gz 18929 SHA256 318c05f743c94803fc2e2cd786fe258e968d1bef26d05039f005763b0f23e703 SHA512 2e259b76413c5e644350a891678eb98f761e56b18f5a06a9d7cc34353c7c7ee67fa875aed575b1b005782b21f4440d682db5c09be7033d52b7b9cf41e9120123 WHIRLPOOL fd0f98887e73dd04c9510550dd97d711319844f82b7e7d34c35e0db886f08df0d4b800a3f95f2e61de4b909079f2eda4813950743f935c08f875f0cc6e2d227f
+DIST pushbullet.py-0.11.0.tar.gz 21653 SHA256 aa9dc7bb46e083e3497d46241154f12944a8f540e29d150330ca94db0b453b8d SHA512 b236f30b99e5bb79eff183529716c1c8f83cfd2526fdf50d86041eb6d3fcd6670d0c4dce407ae6e50aea0fa96d6a5527af980148f0c71ef758c480f972ad9659 WHIRLPOOL 425ac3d558b67e7ea621adb84a6d40876f159e70d22082c3985e0a59d7d8c25d7128f74c404716cdc2b53df3907bf365cb9582e3488efb098ec8e08ccf5789e1
+EBUILD pushbullet-py-0.10.0.ebuild 1314 SHA256 75706facdf446aca878db01c5e09332d37782a9826dee051afe9e3f54986fded SHA512 c92e9f2370b0f9772613f80009fd3999688adc7a0766a2b02177d7c902cb639fc6392288cf79db33b24968a20b8302b782088f635b6c096acc8ab8c366795b4e WHIRLPOOL 2395202e17aaa410c6a6c0d660e98f5fe116390a1a286dc70edaea1755231d5380122bf8d9359fedc56be27061438c4cf4a504949a47a26878c234b9b7773237
+EBUILD pushbullet-py-0.11.0.ebuild 1118 SHA256 6080609922d83150c3a56730c2c88542c7d94e2484bf36ef8f25aef2560049dd SHA512 4186f0297d9b929091b67964f221dd31544157e7165a96db5e7bb2bfdc6dd65a70c125f79a0b853406524ed29e7fce5a18a2fd850e02eb173cb8456578742e52 WHIRLPOOL 382486418fd484915daa46b503ef6809abe678ff2dad17c6c566768903a0ed0469e47c740df8fb2eb51c898f0c255edc700b09cfe8f3678e896066947ce8b67f
+MISC metadata.xml 583 SHA256 7e4ccfba6c041a8dfdb9254808b0887117e31ae131e3903f612bd23de87a6651 SHA512 cbb641621411b1af9a206a7971af536647a14f61b739b8d28372f0158cbeea4018d5b112850b058ea7ce1a72e1bc852b7cac6e5fa547d5ff3855ec94962f58d8 WHIRLPOOL d62936e43d97a11f3b2d641cb48cea794e26ad45f2eb6679286ea42049b38a455d0de2819b6c0b1923ee1f35daf201e4768a3d40625f32c4ab3dd56728db6f96
diff --git a/dev-python/pushbullet-py/files/pushbullet-py-0.10.0-fix-filetypes-python3.patch b/dev-python/pushbullet-py/files/pushbullet-py-0.10.0-fix-filetypes-python3.patch
new file mode 100644
index 000000000000..09ded3540487
--- /dev/null
+++ b/dev-python/pushbullet-py/files/pushbullet-py-0.10.0-fix-filetypes-python3.patch
@@ -0,0 +1,28 @@
+diff --git a/pushbullet/filetype.py b/pushbullet/filetype.py
+index a2f2be0..22ffedf 100644
+--- a/pushbullet/filetype.py
++++ b/pushbullet/filetype.py
+@@ -1,13 +1,22 @@
+ def _magic_get_file_type(f, _):
+     file_type = magic.from_buffer(f.read(1024), mime=True)
+     f.seek(0)
+-    return file_type.decode('utf-8')
++    return maybe_decode(file_type)
+ 
+ 
+ def _guess_file_type(_, filename):
+     return mimetypes.guess_type(filename)[0]
+ 
+ 
++# return str on python3.  Don't want to unconditionally
++# decode because that results in unicode on python2
++def maybe_decode(s):
++    if str == bytes:
++        return s.decode('utf-8')
++    else:
++        return s
++
++
+ try:
+     import magic
+ except ImportError:
diff --git a/dev-python/pushbullet-py/metadata.xml b/dev-python/pushbullet-py/metadata.xml
new file mode 100644
index 000000000000..9baed788c083
--- /dev/null
+++ b/dev-python/pushbullet-py/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pushbullet.py</remote-id>
+		<remote-id type="github">randomchars/pushbullet.py</remote-id>
+		<bugs-to>https://github.com/randomchars/pushbullet.py/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pushbullet-py/pushbullet-py-0.10.0.ebuild b/dev-python/pushbullet-py/pushbullet-py-0.10.0.ebuild
new file mode 100644
index 000000000000..3141c91dae26
--- /dev/null
+++ b/dev-python/pushbullet-py/pushbullet-py-0.10.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+DESCRIPTION="A simple python client for pushbullet.com"
+HOMEPAGE="https://github.com/randomchars/pushbullet.py"
+# tests and examples are missing from PyPI tarballs
+# https://github.com/randomchars/pushbullet.py/pull/104
+SRC_URI="https://github.com/randomchars/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND="
+	dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Backport from upstream git
+PATCHES=( "${FILESDIR}/${P}-fix-filetypes-python3.patch" )
+
+python_test() {
+	# skip tests which require network access
+	PUSHBULLET_API_KEY= py.test \
+		-k "not test_auth" || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r example/.
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pushbullet-py/pushbullet-py-0.11.0.ebuild b/dev-python/pushbullet-py/pushbullet-py-0.11.0.ebuild
new file mode 100644
index 000000000000..4a035f018675
--- /dev/null
+++ b/dev-python/pushbullet-py/pushbullet-py-0.11.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+DESCRIPTION="A simple python client for pushbullet.com"
+HOMEPAGE="https://github.com/randomchars/pushbullet.py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	# skip tests which require network access
+	PUSHBULLET_API_KEY= py.test \
+		-k "not (test_auth or test_decryption)" \
+		|| die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r example/.
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pxml/Manifest b/dev-python/pxml/Manifest
new file mode 100644
index 000000000000..0dfe59b8e17d
--- /dev/null
+++ b/dev-python/pxml/Manifest
@@ -0,0 +1,5 @@
+DIST pxml-0.2.12.tar.gz 21194 SHA256 99604ac9c1b6408f314a57e2e6eb5791220982a7e961168475c682c657ce3c26 SHA512 95c66036d161c1245edfc7924abde9f63e764bfc39037ff2b5d281840e7b306c08091c9845ad4d5738ebe2769f27d90e1b6b226379ee6fd263db323ff629d42b WHIRLPOOL b6de6b1288e8479fa6bc41c2a5b7c6dd917e8ce0988c3bade10cdf78c622f6a9b6cffcf5999cd5a41edd474de834cdc53016dfb5b944d79e09384c6e71576709
+EBUILD pxml-0.2.12.ebuild 749 SHA256 fcb1b0f20c1c20550d59b61dd1a80d3656ac743aeeb3bf9db3f0558a762aa5cb SHA512 a9347396208a9932bc6b1ab295c0f91512439102b845cc282912aa787e6dcde20ad4d3949d4c897b1fb4a282710f31c1b42f7589ee6dbced161d6900dd2bad09 WHIRLPOOL a0f83166df1c7e9bcce621a39b08b7ec68841b9c5eb661fe964ae7bca9ea4a6276cd36e7a7638faa30347ade9e653743636536eac8fc18beeed57ad7356ccbbb
+MISC ChangeLog 3266 SHA256 0541df6e8996e755e2759c8cce73c95e9adcbccf4bd38d52b2ab533ab0406a5f SHA512 289e74e9a7e743c968309dea107e9228da737afc1738e848e73731057b83682792aed307ba27eda3c2216a836b7e0d1926c4d401c9076b399f8e054ac2070df3 WHIRLPOOL 2501d5149f7ea9328c151eb5cfd302071389df092a6fa4681250121e37c8aa34e28e0e878e8b908485d62565221601902f1f3bace6252520d732dffe18f691aa
+MISC ChangeLog-2015 513 SHA256 97f8ab96bd3232b15c4040ef63ecab00285e64db2cef47b6e8891de21da8f684 SHA512 a6c78f7837165e1feb3e8423dfecba265e63d08be0ed2df12cd614acd20d200f351156822ac4496def0aa73e87d5807d4f5169cdb0bb69fc179fd49b6c4e6c15 WHIRLPOOL 8f9aea28bc9dc5bb27354d860f84c433127f213ce4381f57ce188124c7be795fdb5682110f187c17489c1b42b906c01cb2bef03463a42c43a0fce854fe9ab355
+MISC metadata.xml 363 SHA256 61c15b656f8f58b2abde232ec00a1fdb4ebb3b5f70d5dcf6df67bda3b9d42942 SHA512 f36107242f9361d2ea84f045ad22595c39bb94ba6641a2ffe4348bb7574a3656a57760f75211e9ee3e76b56fe0e3e9c44e941a8192a00476c7bfcfba150fe5e6 WHIRLPOOL 2cac91b46688f45c2352a2e7983e784024aaf3c4df3cbb7722e0e4d90a310a3376c12f988f9c2c095e078921a4fbd9e08502e227ec348291915672a09a2bced7
diff --git a/dev-python/pxml/metadata.xml b/dev-python/pxml/metadata.xml
new file mode 100644
index 000000000000..cde5814fe74f
--- /dev/null
+++ b/dev-python/pxml/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pxml</remote-id>
+		<remote-id type="github">metagriffin/pxml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pxml/pxml-0.2.12.ebuild b/dev-python/pxml/pxml-0.2.12.ebuild
new file mode 100644
index 000000000000..f9b96c5fc69b
--- /dev/null
+++ b/dev-python/pxml/pxml-0.2.12.ebuild
@@ -0,0 +1,31 @@
+# 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
+
+DESCRIPTION="A python library and command-line tool to "prettify" and colorize XML"
+HOMEPAGE="https://pypi.python.org/pypi/pxml https://github.com/metagriffin/pxml"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
new file mode 100644
index 000000000000..19bef18e8bc8
--- /dev/null
+++ b/dev-python/py-amqp/Manifest
@@ -0,0 +1,10 @@
+AUX py-amqp-1.3.3-disable_socket_tests.patch 405 SHA256 30c8ca445ae1fe84b44077136f101f7dbf6686013dacbc64c73326adf7bcacdb SHA512 7d801f7392edce5bb0f2b04a974f6005b58cd0e288bdf52fd76a7d63de985e7e8a2696972fdbdbf3e39fba339a3213437d490dffb573b5b52f2f67ed6dfb9e32 WHIRLPOOL ea788d81e4906d106c484783c1a6ac4d129f0c91ee2563fd952ffdc6f8e1197f7109b453c7fbdd0de9e62939e4f0bd2c533062c6effd470198718afdad514703
+DIST amqp-1.4.9.tar.gz 79392 SHA256 2dea4d16d073c902c3b89d9b96620fb6729ac0f7a923bbc777cb4ad827c0c61a SHA512 9c2fecb3c9e1d24333895031a9ae255a858146d498b169a89c3ca8061428c622d85dcee8d2ca45d63a3ecdda34a1efc917aabf42c7c35b579143caf81494a079 WHIRLPOOL 3ef2df26b7d169d10eb780c280cc2174bfdbfbc619a7c441dbba75e72e46cd8b5426163564d2a21414c695d1bc36b1a1bc4e0bb317192b0ae0e5fecc09941d33
+DIST amqp-2.1.4.tar.gz 99677 SHA256 1378cc14afeb6c2850404f322d03dec0082d11d04bdcb0360e1b10d4e6e77ef9 SHA512 42e9deba17ca1abcb6f00cc02abecc3f4b328555a73691dd253a5df79fd9a33cbb594992ec3a74790b3c1e05cf7ca7744058710f5a86222981a7abc304f9b9b5 WHIRLPOOL 65d9fc439459846a1804bebd5c73789bd5617cdbe90cfec330d539cc0a328365439d881d0fd5cd3a6b143738f61f9ce82647b44bf73517f6cacad372d8116e4e
+DIST amqp-2.2.1.tar.gz 103599 SHA256 7ababb2c28672c2a48b907095bc79104531217a98807751b51e0d8c0fa831aff SHA512 dcb6297917d4528cfe3ebc446e97be6fed3c100ea77c68923c923cac466fa2d85ed8afaf19582b281ee6e05d699e8ed3fd6cdcbb0cb4de0451becaf16711af29 WHIRLPOOL 51dfe02efc80175f293ef50b7d746f7d43ce30c21adedd9e9c260cb87e64ace53699cdfd0e18d3df92fef4ef12238259137ad60a6cc2cd2820afb8671bf4725e
+EBUILD py-amqp-1.4.9.ebuild 1619 SHA256 db7fda309444841f9e781d56e040e8437245d4d007d4987e19ad75e8f1138ffd SHA512 65b7b4a67f1122a9052a74f34fa5c5b8fc80feec372bfb906a956923bd9b37c51c49fdf0d964f637dc9b050477ceda6f714b0830732a638bb7285ab4d4d1ab81 WHIRLPOOL 40b8c803a5b38b25b9c4a38543c8a43577b5f15aa46336d15bdfebbc66f35e2bfe7666cae8ac09db5c09b46c247226290be658ab17601388a122ac777475ab65
+EBUILD py-amqp-2.1.4.ebuild 1190 SHA256 d60baca79a68e33c36d1d07eaf50a8b17682cc40f8582c7833badd7f40d5feac SHA512 c07f8fe99f13bb06dc477d75cd41baaa79bb35b8edd0346365ce073dabdd8ee8c78293690aa999f01bf1d3e8d4e05daff7df1e0b28ad9ef1db725780f31a9cff WHIRLPOOL 1b5cb774ea61c2535f08304208945a451088886d23fc75cbfcb7a18e701fe8c84fd7169c05738a46ff8ac6f28f8d5b7fe3dbc7fafc82b284987dc8282cef87f5
+EBUILD py-amqp-2.2.1.ebuild 1188 SHA256 3d0c6cc626985e659fd5e7c54cd4dd00bcb02972b4ed69ae983b793b3b450fe5 SHA512 c76b684c232a913452b43e2afa1717ebf16babea4f37270b8a4d83960bfe3ab80e42963208e5ffec76db7741f69c98be81a7d156207559feddd5bb38003f0eba WHIRLPOOL 98b9b505ba582ecb9c162774cf2f25b3810c26cd101f9c82e18e7a7bc97142bf84416aa6ebea266b7fbb0ea0bb1ac3184b5e93fb63664bbc4972ebd855b7e1a2
+MISC ChangeLog 4221 SHA256 61c3f6775bcf20f256f2a60bfc04e61f4c9787352f0dc019b975c4937c5eca6b SHA512 ea1ecd3da70fcd4903402eb1d62b7fa6a7fdf285844ea3f209032356221c2ae073a9e70f14e03435d1b85b881bec41a19c298e042449a6c132d6ddf9c1b6a114 WHIRLPOOL f9dbde5f78ba4650114a037509b7a6b19741aa04282bdec3b5c9aec895e5ce733e3d7f9dec6f3e51447bfff64138b295bc09ba6096b96494f3f16ef71697d091
+MISC ChangeLog-2015 4297 SHA256 0a225f7ab31572be6ef760a42605fe21bb314956f0996dcc5180ee4b14b78a99 SHA512 4c51de57cd3461575e0f32bf5ae1af2d216b69dd57b9859da7acc7db3b1b72fdcd047ad3a1fd1bf7ee9b0019a8e41cac310ee6aea9e6385c6d6c9e79745f1c4c WHIRLPOOL 8ae1fe47e90990d15694f3fe7de17baff41c3ab07778f55a2973f8cdb7ad514e4863a9435770cf0e85a00d74babf0ea0f85fcb0e972e840ce236c7a1d7787a4f
+MISC metadata.xml 480 SHA256 ef8bb9629dce9ead446961084a435bf1982cf34f7762bc3d6b51f62d135f9afd SHA512 d386da72715c929924505be0c50dbbb0b24fe8087f4b4e47ddf5f6d868dd6c42ac63676364837490eedd7ab32053d360e95cac9416954d9225bd110f3d1df9fd WHIRLPOOL f7b3c92a244d6e151b2e918a2a113db086c68ac7f062ce771153751358ca6ac01917e2576adc8a6a11033b426f9e4ea07454a83cc639d7ea019a55d84a939199
diff --git a/dev-python/py-amqp/files/py-amqp-1.3.3-disable_socket_tests.patch b/dev-python/py-amqp/files/py-amqp-1.3.3-disable_socket_tests.patch
new file mode 100644
index 000000000000..67353e3b8ae0
--- /dev/null
+++ b/dev-python/py-amqp/files/py-amqp-1.3.3-disable_socket_tests.patch
@@ -0,0 +1,15 @@
+diff -ur amqp-1.3.3.orig/funtests/run_all.py amqp-1.3.3/funtests/run_all.py
+--- funtests/run_all.py	2013-11-10 08:53:13.000000000 +0800
++++ funtests/run_all.py	2013-12-18 21:10:54.050283404 +0800
+@@ -23,10 +23,7 @@
+ TEST_NAMES = [
+     'test_exceptions',
+     'test_serialization',
+-    'test_basic_message',
+-    'test_connection',
+-    'test_channel',
+-    'test_with',
++    'test_basic_message'
+ ]
+ 
+ 
diff --git a/dev-python/py-amqp/metadata.xml b/dev-python/py-amqp/metadata.xml
new file mode 100644
index 000000000000..42a95b2addd1
--- /dev/null
+++ b/dev-python/py-amqp/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="extras">Install extra tools to generate initial Python mod
+		from an AMQP XML file</flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">amqp</remote-id>
+		<remote-id type="github">celery/py-amqp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/py-amqp/py-amqp-1.4.9.ebuild b/dev-python/py-amqp/py-amqp-1.4.9.ebuild
new file mode 100644
index 000000000000..cff7689102b2
--- /dev/null
+++ b/dev-python/py-amqp/py-amqp-1.4.9.ebuild
@@ -0,0 +1,65 @@
+# 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 )
+
+inherit distutils-r1
+
+MY_PN="amqp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
+HOMEPAGE="https://github.com/celery/py-amqp https://pypi.python.org/pypi/amqp/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc examples extras test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-issuetracker-0.9[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+# Same tests from before require a socket connection
+PATCHES=( "${FILESDIR}"/${PN}-1.3.3-disable_socket_tests.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cp -r -l funtests "${BUILD_DIR}"/lib/ || die
+	cd "${BUILD_DIR}"/lib || die
+	if [[ ${EPYTHON:6:1} == 3 ]]; then
+		#   -n causes Python to write into hardlinked files
+		2to3 --no-diffs -w funtests || die
+	fi
+	"${PYTHON}" funtests/run_all.py || die "Tests failed under ${EPYTHON}"
+	rm -rf funtests/ || die
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( demo/. )
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	if use extras; then
+		insinto /usr/share/${PF}/extras
+		doins -r extra
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/py-amqp/py-amqp-2.1.4.ebuild b/dev-python/py-amqp/py-amqp-2.1.4.ebuild
new file mode 100644
index 000000000000..399c006bd586
--- /dev/null
+++ b/dev-python/py-amqp/py-amqp-2.1.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="amqp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
+HOMEPAGE="https://github.com/celery/py-amqp https://pypi.python.org/pypi/amqp/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc extras test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/vine-1.1.3[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_celery[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use extras; then
+		insinto /usr/share/${PF}/extras
+		doins -r extra
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/py-amqp/py-amqp-2.2.1.ebuild b/dev-python/py-amqp/py-amqp-2.2.1.ebuild
new file mode 100644
index 000000000000..fa011e5422ba
--- /dev/null
+++ b/dev-python/py-amqp/py-amqp-2.2.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="amqp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
+HOMEPAGE="https://github.com/celery/py-amqp https://pypi.python.org/pypi/amqp/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc extras test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/vine-1.1.3[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_celery[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use extras; then
+		insinto /usr/share/${PF}/extras
+		doins -r extra
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/py-cpuinfo/Manifest b/dev-python/py-cpuinfo/Manifest
new file mode 100644
index 000000000000..721db6aa9572
--- /dev/null
+++ b/dev-python/py-cpuinfo/Manifest
@@ -0,0 +1,6 @@
+DIST py-cpuinfo-0.2.3.tar.gz 21033 SHA256 f6a016fdbc4e7fadf2d519090fcb4fa9d0831bad4e85245d938e5c2fe7623ca6 SHA512 92616d0eaddd47e3fbdad49774aa023a73eb4f9e9b88848c5e2f93540ef8b1b1b8a5011b4148be2f9817eee4d34d5f158b7e37b0f27aab09c86cd4704dd53d7b WHIRLPOOL e07fc52d444acb3fc065c2bb7067e81675d6147f8043beac4458ada5c0ded4d89e4d0091be561099687902ffd4507614c591975e52b3369c07fcefc07370023e
+DIST py-cpuinfo-3.2.0.tar.gz 76019 SHA256 dc48cb481f9c680328e796fad1e296b2eed7d7f20cd0e3323ddec2f1e86c4f8a SHA512 737d5a73d6991ce5cb99125951a75492f48177030986270bbe7dcc0efb4e3200c9957bfbe51bd5a7555bfa8e62db68c3a5227e47e5e6bb2115ff2c10c0bfb688 WHIRLPOOL 9dec8c722ae15a332bcb03bd9489355df451f4aa83f2efc25129f477f6f8bcf3b903f4b0aced049a4c6fe86ef42b88a1db4450b1c88c47065beafc75a8ec748a
+EBUILD py-cpuinfo-0.2.3.ebuild 587 SHA256 5fa463229c586bae4d369ab528cb9b379925c38a249a4377105b427310a76069 SHA512 df5aa07ecb45a8d85d6eed9e4e416317427d659d5232798a72f14f6cc173f6b858cc78c579532506e623c3230153cf82a17bfa4bb3a02094ba037ea1e4718183 WHIRLPOOL 1f8dd503c51523c20e0c549777a35dd8e89263f565217ef6f4967f0925a0c1b6a210b07dacd5d213fc56b555bc72d1a37521085f54d5c3b6d57c17a2c8d8b5ab
+EBUILD py-cpuinfo-3.2.0.ebuild 610 SHA256 b948aa6aa4501ca0ba0a1bca0072ab357bc1c46188306a7ec1cabc8dfd407052 SHA512 4a39799e73050b870b32a2276d8cf7a7f038053121a616868104d09f97afc388f644470dfee8ff90d1dcf42c6279ed52377310fc187d7319fedbd4bf078da488 WHIRLPOOL 73e1e29997bba29bfac9d796b9bedfc65ce876cfa163657ecb12c8bf3d0f53a197443e78adf18d26709d4cae5601f41c58a41cd834b48346f0ff9649c51901af
+MISC ChangeLog 749 SHA256 f1c066f4902bc50ff477ffdf5916253a982df0c8491b14bb36326dc878ec9244 SHA512 4998ceab56af0b81f81c93218dfbfe122fa6ccbb94572f179d4515c8c7adaff9c33bd0ea370da3898bb3b770f6720758ea14e8022c53ba811b34281eeb11bd03 WHIRLPOOL bf5e1990b74c306cd8b05fff16e3d813af0a3902d1eb32053ec12e144c2b945ffd0edab834526e03ce05821269f0b739bd96624a2247e8ffca3cf21cf89ffc3d
+MISC metadata.xml 531 SHA256 231674930ad70ebd43237498786e260f47d57e983bcac579e2dffd157bb3b404 SHA512 388ada1a9c39b57369dfc9f164530a871801149d44a1439679509fc733b90f33256e8f9a5b5ef22af854e5aaa7c9e1857e87943f25f0c4e06eff2c6b64d440d4 WHIRLPOOL 3a5735ffc280943a7278e51db5321b47e8738910543f61d618694bead62c21d0a4dc5a610fb8f3980f5b3abc67e08c6509b386132ec005b8b26dac109ca5b2bb
diff --git a/dev-python/py-cpuinfo/metadata.xml b/dev-python/py-cpuinfo/metadata.xml
new file mode 100644
index 000000000000..61b8d8981414
--- /dev/null
+++ b/dev-python/py-cpuinfo/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">py-cpuinfo</remote-id>
+    <maintainer status="unknown">
+      <email>matthew.brennan.jones@gmail.com</email>
+      <name>Matthew Brennan Jones</name>
+    </maintainer>
+    <remote-id type="github">workhorsy/py-cpuinfo</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-0.2.3.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-0.2.3.ebuild
new file mode 100644
index 000000000000..0e21a1e83f04
--- /dev/null
+++ b/dev-python/py-cpuinfo/py-cpuinfo-0.2.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Get CPU info with pure Python 2 & 3"
+HOMEPAGE="https://github.com/workhorsy/py-cpuinfo http://pypi.python.org/pypi/py-cpuinfo"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" test_suite.py -v || die
+}
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-3.2.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-3.2.0.ebuild
new file mode 100644
index 000000000000..f82e66ada297
--- /dev/null
+++ b/dev-python/py-cpuinfo/py-cpuinfo-3.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Get CPU info with pure Python 2 & 3"
+HOMEPAGE="https://github.com/workhorsy/py-cpuinfo
+	http://pypi.python.org/pypi/py-cpuinfo"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( ChangeLog )
+
+python_test() {
+	"${PYTHON}" test_suite.py -v || die
+}
diff --git a/dev-python/py-gfm/Manifest b/dev-python/py-gfm/Manifest
new file mode 100644
index 000000000000..548202c94d1e
--- /dev/null
+++ b/dev-python/py-gfm/Manifest
@@ -0,0 +1,4 @@
+DIST py-gfm-0.1.1.tar.gz 7326 SHA256 f5e6d720f52328e1826bc5523b7fe631cce865002672f29f2733e527cd1e2bee SHA512 af10b15bb2b565904a8383f8e87d9f83cfbf55a5d20ac258759e74d1fa227a2224381ea9bf3f49c4ecb8718d195fabdae372fe572611428ae82b925a92bba7b5 WHIRLPOOL 251d0b8efd0c8bc8a01a1483a0e043f7b2ec22fef8eb5c9a9216f1a8e9d14144a544239ce8a2e005ca6464bda60851835088b88db65dbed23cbca03ccdeddffb
+EBUILD py-gfm-0.1.1.ebuild 535 SHA256 8995c069f65a91d95d7a1883065557fdd880e296178034165897595afe481303 SHA512 486c69bb234481bff42d033e13b1e8405d3bb8d95f5d40416f37a5808539084aabbabe070c6ca55ca1deae165549f0a806861ef71628fd3f920d37b6b530824d WHIRLPOOL d91f9edf122996a2bb871df7c76384d2610c9fc85ad48dc0d32b39a902ba00a678466c0d75e946063b730004f5b1dc339337182d523a3768b87801a7968588e4
+MISC ChangeLog 1049 SHA256 d4d76d873b00a71440d6fb9b59084f6a43145ac52ea71ce5be44ca971fc04321 SHA512 a229c58209b4312d202cfec9fb7b007dc9127f969a1110ee156292db8ad8490b8bbeb251c714509b816d9418a995f32847ea3994fe0a10cd55fbb34319c33bce WHIRLPOOL 3702613749d025054b8c118266a231518bd8922bfd2d505ea8e07413bb2a4dcd509121bc6e1155fd7c1f9d510002ce4a9594e531847e7751b5f1de074eff38a0
+MISC metadata.xml 311 SHA256 2db4d682770efc17e8c251fa76e33323a54cb79cf1145ea21e0906dfc6e32b68 SHA512 e8b4170b6b16a408b606625e6ab7dd17d0090310e84d1909c0b81d70c9c073cf40d61d56e434a370489cabec0803a22cb70e830ef7649f031fdf0214312627cc WHIRLPOOL 8cdaf1364438806a2c65ec34bccb5f6885c476185125fd97e6f19826d0486200d0e78d4ba3d64a4cc7b64194a82dfc49b858c5cb0b1188d53dafb4add86da911
diff --git a/dev-python/py-gfm/metadata.xml b/dev-python/py-gfm/metadata.xml
new file mode 100644
index 000000000000..06b7854e3cea
--- /dev/null
+++ b/dev-python/py-gfm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<upstream>
+	<remote-id type="github">google/py-gfm</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/py-gfm/py-gfm-0.1.1.ebuild b/dev-python/py-gfm/py-gfm-0.1.1.ebuild
new file mode 100644
index 000000000000..6fe7a61311dd
--- /dev/null
+++ b/dev-python/py-gfm/py-gfm-0.1.1.ebuild
@@ -0,0 +1,21 @@
+# 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
+
+DESCRIPTION="Github-Flavored Markdown for Python-Markdown"
+HOMEPAGE="https://github.com/google/py-gfm"
+SRC_URI="https://github.com/google/py-gfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/py-lz4framed/Manifest b/dev-python/py-lz4framed/Manifest
new file mode 100644
index 000000000000..73809bf3ea9e
--- /dev/null
+++ b/dev-python/py-lz4framed/Manifest
@@ -0,0 +1,3 @@
+DIST py-lz4framed-0.9.6.tar.gz 82402 SHA256 4cac23ac87c2bdc7dea00ea0c39f6751bbeb01cb5337038062e97d5b900c79d8 SHA512 46613146a538189c8035d0e2257bb37bce73e23fb7d4dde5a6c99948a8b7f27fa4fb19c3f6d654ac3d230551b7dce7e46d7beda05a419f39911fa816b44c9a1d WHIRLPOOL 8358a0a13e80a21acbde46616273154c5df44c9f7bfd04d4dc489d581505a59dcbfbf81c3c51b4bf72574d2398b16fdba11f0e27f25ecd8a51bbbe155e97dd92
+EBUILD py-lz4framed-0.9.6.ebuild 559 SHA256 7eee0a951433cf77a62d94153b2a7389b226f08437aa94388441d7dd4f10adac SHA512 db3f0612ea602bde2c8eee8467041a065930d85516378506bdbce3a764aac1b9aee9a845937c0e35e49e75d30bb79c1b32f0cc0c2c152d87eeefb200ff46d08a WHIRLPOOL b980f52ddbf92a5774545fb8c8901fa017f3c6c4d2bca7b56b6d99ae8671f48b13584ccb871159217b8c63c6f20eb8db63b32bf79a0632a39af8da1e96fee83d
+MISC metadata.xml 390 SHA256 08aa240a5386a7bedd86b4be002538e97c6d9f992048d095ab362bd8e8643bb8 SHA512 b449fee19c464b2ceff5a95d95bf455a828c436af7a15d6c717b459c095b7bbf58cc4616caf6448a4303380d58f65fb573d6e9379deb002854741910e56b5ae5 WHIRLPOOL 9d33005c5ce129f431bbabe927745950661774c4fb207ba3867d13200c6838cc838bede1607b00977aca9968ea18a9a0640568c9a56a8afdc7a7f8238483904f
diff --git a/dev-python/py-lz4framed/metadata.xml b/dev-python/py-lz4framed/metadata.xml
new file mode 100644
index 000000000000..7a1c00627929
--- /dev/null
+++ b/dev-python/py-lz4framed/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">py-lz4framed</remote-id>
+    <remote-id type="github">Iotic-Labs/py-lz4framed</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/py-lz4framed/py-lz4framed-0.9.6.ebuild b/dev-python/py-lz4framed/py-lz4framed-0.9.6.ebuild
new file mode 100644
index 000000000000..b39e398a5b18
--- /dev/null
+++ b/dev-python/py-lz4framed/py-lz4framed-0.9.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="LZ4Frame library for Python (via C bindings)"
+HOMEPAGE="https://pypi.python.org/pypi/py-lz4framed/ https://github.com/Iotic-Labs/py-lz4framed"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	${EPYTHON} -m unittest discover -v . || die
+}
diff --git a/dev-python/py-notify/Manifest b/dev-python/py-notify/Manifest
new file mode 100644
index 000000000000..3e08a6f04201
--- /dev/null
+++ b/dev-python/py-notify/Manifest
@@ -0,0 +1,5 @@
+DIST py-notify-0.3.1.tar.gz 144954 SHA256 91f4fd2822403b96037608c0a05e814890edd17601570ae3e96359877320193c SHA512 16d874e6e265edabffe2200484566823251a0a395e979657829a7facc419ec6e21589f97f1675556b48c67ab6b93ded7325d57c8de29a4216211a8c37a3d9075 WHIRLPOOL aedc39f7d71fd08ad83bd90b73a6b28b9253e3f383bc1d146c8d2b5562899a5cd08037c00df8164645acf078ad241c55c89e9753690948c6602dad7d26835b87
+EBUILD py-notify-0.3.1-r1.ebuild 584 SHA256 e1a026db1072c8d1d3ea37f53134f6414bf81394f65eaa2d822eb60f206af845 SHA512 d92c7b53043ceb528a44dc23985d5ea8ef3929304f41e9cf9a70ecaa3f1a59e3ea8e1072a4eb2b21cd40f9f5ca6bfe046a255bc670cf605a9d4d7a30e91da3e2 WHIRLPOOL 0835c3e85c19c860105085dfd9c9e19adbcaaf31bf431b9f0c2e9136b7dd9a5c9345b283ce8a413d85fbad9981b54a304d5e71e339eaf27a87906d2661070f98
+MISC ChangeLog 2834 SHA256 fcaadc078dde2d4f41a7c1c83d00a96e2813de9ce052ce8ee210370c0abc8902 SHA512 5b101242bfc648622e4b57e601cac3c148b2b127820b68b9859afc15a66656f4cd4cc1994ff7395576cdb2d6655bf45ccef5318b86e8736d31ce787e3094c6da WHIRLPOOL 5b1a3cf428dd877c59c761e33e9015963354b90b12f80a72817cbc237222697bd3370d2a54697e6998285563757219ae8f0c3359206e5d85207bbe1213fb5826
+MISC ChangeLog-2015 1232 SHA256 e1d150180a52a4db238071513118111f3236410e569d6ddae0b7ed2a0a38581e SHA512 55e6a4721183f3b4ffc7bfb2c80092acfe004d8957e3cf9657e1595b8012c88d7e513eab30e59c21235f3d6feb85ef08887d6835dcfb90d88a3f3fd7fabe7eea WHIRLPOOL 8f16998e2c08eedc1ba4df17ea2f726f3ec56e1cacc17d480a22b51d69b05fe87c4cf61a95508f34423b6fcec7774491f686e3ea34898dab6f931cd91c58db67
+MISC metadata.xml 246 SHA256 634432e12556106844e569b7ff16962881c6e70887e6fc9650bdd82deb51a834 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc WHIRLPOOL 869ef1c8e23bdae0a11b44ccf38ddec23f0dc0ae2573bc83ccbe2d8a2c6bf5a3f9c3c52149aa2e3690dd66f7fc7ec498f2eb6b9d338440fb54c12d5ac0b9fb7a
diff --git a/dev-python/py-notify/metadata.xml b/dev-python/py-notify/metadata.xml
new file mode 100644
index 000000000000..e24dd86faa2a
--- /dev/null
+++ b/dev-python/py-notify/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/py-notify/py-notify-0.3.1-r1.ebuild b/dev-python/py-notify/py-notify-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..a0fdbfdcc996
--- /dev/null
+++ b/dev-python/py-notify/py-notify-0.3.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools for implementing the Observer programming pattern in Python"
+HOMEPAGE="http://home.gna.org/py-notify"
+SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples test"
+
+python_test() {
+	"${PYTHON}" run-tests.py || die "Tests failed"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/py-smbpasswd/Manifest b/dev-python/py-smbpasswd/Manifest
new file mode 100644
index 000000000000..2b2f279ea48b
--- /dev/null
+++ b/dev-python/py-smbpasswd/Manifest
@@ -0,0 +1,5 @@
+DIST smbpasswd-1.0.2.tgz 13503 SHA256 736a2d2f20f135d7884e8b46b1588496476f8f2e383fe84b7b12d8ce17367602 SHA512 2136e14343037bdd014765c28b9e152c8edc774ce7cf531b0784148db42e88e3abc402389e9b58b2ed938681f42715783504f4854ffe269b02419f13979a7d6c WHIRLPOOL 34ddfe63bfb064897984a09e45d5611613e4dbdf4168139d6221e33cc0e5a76871310de4a8e27241967905a619756a3688c13bf3f858e8c28c314c58ed1458b4
+EBUILD py-smbpasswd-1.0.2.ebuild 538 SHA256 fc8fba196c326464c49a15cc6f1bedc8e7ef683c09820ed52aecea317f1708ff SHA512 9d7d1455d9b7ae51b385d6b34187be302a796bc0b791d038b048ccb6734bcc9f0736f704b283a64916e427531aa8800fd22f063b634c2914793ebda8de815ade WHIRLPOOL d0331bcb1cbe563555e57aef425e1c06f1e0ec2714f52f8dad32d035483bec85305547a9adc937d7899b4b110535fb3ead86f88b9a9281988e8f1efb26bb8b67
+MISC ChangeLog 3328 SHA256 ead82063e98e1614fe04cf1e570fac1dbe3df2e9ef462c54a30b39dd2137dd6e SHA512 4032f4cf7f19f5092fbf8e74ef1dc1ae33a7e5c54633fdf0eb4dd84b5e883de7ea368f80d7863ce0213634dd61d8762d048539f86b25f2457ebd4a86852d94ae WHIRLPOOL 0395e60bab43ff31a14b01a701a3b9338cf22762b82b9f6fbbd480c6a521a77e582975571192853241e98aa6b3fbd9eb07f53befaab3eb712226c2f0c993d6aa
+MISC ChangeLog-2015 2117 SHA256 540301c85090862feb8a51b9d96843750b39537152b5c6aa83f5b0552b11561f SHA512 e7617c29d6929f6731d95f4aad4a4c15dc8c827c738f639af38f1ee30563153de5164e28ac9da78ba08c44be2cc297ec5c224211654d2506650e015c9568f582 WHIRLPOOL 73ad3cbae4e36c616394bb5590d5aa2d0d812f922a7af065adfc34a12b61c7b9cf3b828ea6b3a99c55f94d5e5a826f17024dca2bcafe5ed914a6fe5fa3c659ab
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/py-smbpasswd/metadata.xml b/dev-python/py-smbpasswd/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/py-smbpasswd/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/py-smbpasswd/py-smbpasswd-1.0.2.ebuild b/dev-python/py-smbpasswd/py-smbpasswd-1.0.2.ebuild
new file mode 100644
index 000000000000..6d805a8b5aae
--- /dev/null
+++ b/dev-python/py-smbpasswd/py-smbpasswd-1.0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P="${PN#py-}-${PV}"
+
+DESCRIPTION="Module capable of generating both LANMAN and NT password hashes, for e.g. Samba"
+HOMEPAGE="https://barryp.org/software/py-smbpasswd/"
+SRC_URI="https://barryp.org/static/media/software/download/${PN}/${PV}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ia64 ppc sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/py-ubjson/Manifest b/dev-python/py-ubjson/Manifest
new file mode 100644
index 000000000000..2bc2d815c3bb
--- /dev/null
+++ b/dev-python/py-ubjson/Manifest
@@ -0,0 +1,4 @@
+DIST py-ubjson-0.9.0.tar.gz 43338 SHA256 b405daaa82acdf5989207e1e5ff6865ef7d23bf450513a6d90a1ab64c75bdcf8 SHA512 d9f061e548405d16a22d235f487740b3d4abeab8b555f9684b632cdb5e2f655ba8413a207230f90e7f3f352fa3289b16bb9a56b623c0cc5fe02f61778a8f78a2 WHIRLPOOL 31bac81ba2befb3be62fbddfca270f83a34d7636f0a85ab8d7c40836020665b14aa4e03bf61c231983eebc58c3fb45b524b7a748a06f2dfbcad6ddd2002d8663
+EBUILD py-ubjson-0.9.0.ebuild 469 SHA256 94aa67ede658f738fc2fd823f9aae248d1761d5fa48f94513c9ad9894ac235ca SHA512 61c3ac45c29c47a3e452d8f3ec2e2770d1c1941f9359860f23c9e4af9b58b14dec959dd37759c83eacb12783165cc45b5fab545bb867fd951bed2d2f98613641 WHIRLPOOL 83863c043d8b17d5f66cf0ee6adf163aefc93f7702b907a278098dfe4d904783d4f3e7ed7a1aa42bcbe7877af1bbf1e428d4fb0e091381497ca5cefb83d778b7
+MISC ChangeLog 481 SHA256 1adc2bf2f842b8bb8c84bbd75156902e51699afe95c10e87c4af0d93efee3830 SHA512 07d5425f174ccf4c95f1e855927d6c7ccd6a66a14cd806070edb663e32557ff106d689233334362a0d25f9249fd73b795ea7e20a094e202046c76d9532b5294f WHIRLPOOL 4af7bc15ed566c9f124410841c59c709d210f3b56b9845c5a7f0013d6b4942a1a56007b023a22111dd597f14214927c7dc2c6d2f5e0486ff4f9d7d27387ffe5b
+MISC metadata.xml 760 SHA256 7b7a862bd1b87e5a2b019f2fe317af64635d824acc8a20b2e7181da7af725ff8 SHA512 53dc7185cfb216ccc3327a7253408205f66266455f473f2157cff39de91065f07e832df1c32892682940c12f7ac93cabc83da8f27d36066cdffc16076b0e991c WHIRLPOOL dff2b80470634991211fc570e41214244af44924d389b1c182ef590053422b407fdc04928a2ce9a48e44a606b3d1a055d1c8c12a724a1aae10e000a8fdfc72fb
diff --git a/dev-python/py-ubjson/metadata.xml b/dev-python/py-ubjson/metadata.xml
new file mode 100644
index 000000000000..cf642005f7ee
--- /dev/null
+++ b/dev-python/py-ubjson/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>vilnis.termanis@iotic-labs.com</email>
+			<name>Iotic Labs Ltd</name>
+		</maintainer>
+		<remote-id type="pypi">py-ubjson</remote-id>
+		<remote-id type="github">Iotic-Labs/py-ubjson</remote-id>
+	</upstream>
+	<longdescription>
+		This is a Python v3.2+ (and 2.7+) Universal Binary JSON encoder/decoder
+		based on the draft-12 specification
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/py-ubjson/py-ubjson-0.9.0.ebuild b/dev-python/py-ubjson/py-ubjson-0.9.0.ebuild
new file mode 100644
index 000000000000..57e0fd09c78e
--- /dev/null
+++ b/dev-python/py-ubjson/py-ubjson-0.9.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6})
+
+inherit distutils-r1
+
+DESCRIPTION="Universal Binary JSON encoder/decoder"
+HOMEPAGE="https://github.com/Iotic-Labs/py-ubjson https://pypi.python.org/pypi/py-ubjson"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/py-xmlrpc/Manifest b/dev-python/py-xmlrpc/Manifest
new file mode 100644
index 000000000000..78dbe7a4dbe5
--- /dev/null
+++ b/dev-python/py-xmlrpc/Manifest
@@ -0,0 +1,5 @@
+DIST py-xmlrpc-0.9.tar.gz 51200 SHA256 a2f0d1e01f5b8c8b713b204cdf363273b41c10637ad1acbed2a96f29505d3717 SHA512 5a5c0382975ef25183c9b40cf9795e9c87369efc3b11e31845c2a818e3ff88ea753fa923af7d6c493c02008dce4f3bf92c2f719871b4c7d5a24a20a5f2de32c9 WHIRLPOOL 93b3cd0f2acd4fa6f326cf14a7583880abea4c13576eb4c6e9bfebcea21860f301af30d676b08b2b9cc6df1ad8e05746c717dae7174720da377974ec94909de1
+EBUILD py-xmlrpc-0.9.ebuild 571 SHA256 4767740f0a811274d602f6b0c2e60b0fda239b192f65ee6ca993dc303b83140d SHA512 66cc354573b78116b863de96787a7d40384de62a8a01e08d44c184e19f479134f404a27f2da39cc2bd7dc637ff46d9da35841aa80b0c2cf7b54d630f724c5c6f WHIRLPOOL 9ae2758262f1cb1f32883eb5fa56086d80b33bd032d6bcfe7a580b993649fe6d5765e07a67ee4f7e60092d23648faf05adf2c734a3ee0e685ce6e93b8f2d7a51
+MISC ChangeLog 3012 SHA256 224202168ba63207b8792fe5d7ad1ff43c017b8f2d238e476d58b602ca8ea7d3 SHA512 3ce0c18796ea1bcc1c9a4b441c9fa2c0c77003e638ee9c1ad12283d3bc2701ec7f039bc0f908379ab4c0990cd672de45ea3d1190316c727f5c42ad622948f04f WHIRLPOOL 4b757bc534c4409a3c7a1236dc3346b258f65cff9c2e464c81fab01a4612705a30c1fb81a6ff2d6f808a8b2ff42958cc823bb746261943184e2134dee786c4df
+MISC ChangeLog-2015 3727 SHA256 d2122329d54e7861f515c97b544a4f5409a85a74878d1752b2e664f2576133b0 SHA512 35a967587246f261e6c20545fe53a40a462b64162b4e7fe334f31d8c658d107a71e0328a806b6aa0fcffc390073b6483cf5720dabca57cfb9de51f7e45a9931f WHIRLPOOL ac62347529bfd44257ecc1c64e5ffaa269ae16028a5dc697f35d10933b627372978174d5ef963d0853c03b136b43ede676b9f75cf0e3cdf2dad222d9c055a7c4
+MISC metadata.xml 319 SHA256 43cbb701c47abf324af43409388b39f670e4dad3b4e2b311f8154ee54fe17a35 SHA512 f1e62bf5fb88853fcd863f8ab103aa0d26e63574ccd71f30ef57159cc0e9b9e98a65385a09b9c2ccf5a22ec775f3ecf467f18400c8be99026fd0d418a811ff10 WHIRLPOOL d0926962f3052a9e9710c6d34551af835cc4873552613723f2a039ff5bf99860179dbf2781ccdfb2a2f2956842e29a2f922f54f53d593796239d6b5841489b6b
diff --git a/dev-python/py-xmlrpc/metadata.xml b/dev-python/py-xmlrpc/metadata.xml
new file mode 100644
index 000000000000..27bd92ef205a
--- /dev/null
+++ b/dev-python/py-xmlrpc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">py-xmlrpc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/py-xmlrpc/py-xmlrpc-0.9.ebuild b/dev-python/py-xmlrpc/py-xmlrpc-0.9.ebuild
new file mode 100644
index 000000000000..525070740b45
--- /dev/null
+++ b/dev-python/py-xmlrpc/py-xmlrpc-0.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast XML-RPC implementation for Python"
+HOMEPAGE="https://sourceforge.net/projects/py-xmlrpc/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}"/${PN/py-/}
+
+python_install_all() {
+	use examples && local EXAMPLES=( doc/examples.py )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
new file mode 100644
index 000000000000..90390332409b
--- /dev/null
+++ b/dev-python/py/Manifest
@@ -0,0 +1,11 @@
+DIST py-1.4.30.tar.gz 191796 SHA256 b703e57685ed7c280b1a51c496a4984d83d89def2a930b5e9e5da5a6ca151514 SHA512 dd9d92f8eaf8e5fc61bfb7feb4b07df5ae1745ebf88bcbe9d62589caa9e1f7d8beae5b2d20b407520919e47391cd50cf2d5323556fa5bd90a37e120b1d394d7a WHIRLPOOL 890cd2dbb957c291e80c73a69fad89846e761f745500ab2a99bfb4f725a7e567104fa4a2a957b8c674ebc9498fdbb25373ff0d15ab8da7f8c45138844235c79f
+DIST py-1.4.32.tar.gz 598861 SHA256 c4b89fd1ff1162375115608d01f77c38cca1d0f28f37fd718005e19b28be41a7 SHA512 3596d792d8c242c99088001dee1f993f78b1940d8062cb8b81ab3734467a89d30fec790db0baef7fdec23f012b2ec9f70989f09a63cc915e79fb23b1ace47770 WHIRLPOOL ac03859d54effc1642d210f00f30ae26f6d26e0669f6846c219aa56a0079f97ee1df3a2bf7515e36abc215f6f8e59db7caa44e380d1b114ba8686879e21f3891
+DIST py-1.4.33.tar.gz 193961 SHA256 1f9a981438f2acc20470b301a07a496375641f902320f70e31916fe3377385a9 SHA512 5474ba113b205e499acae78a1bfedcdcea5eb61c35aa17bce73e6a49d316ca2dc9e19c4d17e1dd084424ef9f50b5a4ba045b1bb7a8bd7a6d7062afa552354cb6 WHIRLPOOL b5b67c7c2f925ea966e6be0c1016e3752d4239446274c6af92bd03a8d11400856ecdd57818f70b3257a910964a1ee53597a022f2ea9862b8dd55a8c9b7c1ae9b
+DIST py-1.4.34.tar.gz 194450 SHA256 0f2d585d22050e90c7d293b6451c83db097df77871974d90efd5a30dc12fcde3 SHA512 2e19c82c8315274bffe0ba2c7e20ae3af95f942c40c16121ec953af186f8ff33e8f427c070e137bb04b7cc6dcc6779e35df3911c08595fd3294b5ec9897706e1 WHIRLPOOL 7e7c4b3eb9697af183e4b6c78cea11a2f75e1cfa00f02d80df1ead777baf1e826577175ce06993a1918ede00103249d501594b5245d9b1560501df55e897f835
+EBUILD py-1.4.30.ebuild 1267 SHA256 b06f65986d625f860b4be76f179a3c21959e2014cabf06cdde0cfaa1b715d24c SHA512 0eb97c51441aaa91215adda3cfb127518b4b784d785447e9568a9b6bbc880c9693ec6fe0e370840f56a157eb10102ef7eef1169a302a2f9a4672568ac9d3ca0e WHIRLPOOL 1664047cd64d6cf975ec37d3837e01a8f81be1da5d73607b964a0974510091f96b16f5d665c01a6dc4507fb22c6ae65ebfe5dcf4cce870b95c6421865e8ba5a4
+EBUILD py-1.4.32.ebuild 1280 SHA256 1281bca0016bdde41a91ddb9f30bca73ce2cf13fba7367d38ca3ad7715c1e10d SHA512 39076a753764ff3a27a5fae530517de09f4295ceba6c689e99014935cfd183f86ba25b12997ca05177ce71aca6d5d202476bc9c2a5e2680120fff655954dbabd WHIRLPOOL 80950329daea6ca0ddd9252fc8341b188a08168d7970d62e24d5b0d8bcbed2bd5e69bb09b3c94442a13cbf76924441c2212f539ad1668074d8a4e45a10a7ebdf
+EBUILD py-1.4.33.ebuild 1280 SHA256 1281bca0016bdde41a91ddb9f30bca73ce2cf13fba7367d38ca3ad7715c1e10d SHA512 39076a753764ff3a27a5fae530517de09f4295ceba6c689e99014935cfd183f86ba25b12997ca05177ce71aca6d5d202476bc9c2a5e2680120fff655954dbabd WHIRLPOOL 80950329daea6ca0ddd9252fc8341b188a08168d7970d62e24d5b0d8bcbed2bd5e69bb09b3c94442a13cbf76924441c2212f539ad1668074d8a4e45a10a7ebdf
+EBUILD py-1.4.34.ebuild 1280 SHA256 1281bca0016bdde41a91ddb9f30bca73ce2cf13fba7367d38ca3ad7715c1e10d SHA512 39076a753764ff3a27a5fae530517de09f4295ceba6c689e99014935cfd183f86ba25b12997ca05177ce71aca6d5d202476bc9c2a5e2680120fff655954dbabd WHIRLPOOL 80950329daea6ca0ddd9252fc8341b188a08168d7970d62e24d5b0d8bcbed2bd5e69bb09b3c94442a13cbf76924441c2212f539ad1668074d8a4e45a10a7ebdf
+MISC ChangeLog 4587 SHA256 d5c5c2c2ef5521562812243d5da23a3305eb02930959c8b5f555a4d58558ae50 SHA512 4e6a2392f72e6f8c999389f871a6047bcb1b6193f7540acf8fe9743dd5a024c16049fd552c55b6849d5b8a83c0afcc121351de3576574a1027699f21f23225c9 WHIRLPOOL 3a81b0156d5a8ffb1fc144b9a5b2cd349ee941c27ded82463515b68ef707a65ae72d3e68f461e42eb5a92c711d697c67e557d5d11fbfa636afe6bd32300707cd
+MISC ChangeLog-2015 21544 SHA256 8d03bc7928346770b61f29d5473015025fed033d98724418a1131839b2226f36 SHA512 7fe040aafe306481d34746a07893f733e48f915ae9916980d3115413604c720793dfd82d1a03d95b3875b7938b5c70ab4fa773457e63654966e96d93d942cb88 WHIRLPOOL 6964d80925c89f7baa6c71ebc65ab0ef8b9aacc504252e184b3650d3f9311e6ce550da3b660ef02b6e4038f928564242effe010630b28e2cf4db763677282ebd
+MISC metadata.xml 315 SHA256 a0a52c1bd7d604d32a67c2d60cc60725a0dd0d214ebbc1d455ae62ef1b18ba52 SHA512 e2ede56189d791c18b64d1db6615249e6ae5a3afd31f17b9ae6d23e9123d4c68a22bc61b7935deb284d2fa7e6732679e2286a271854dc818e7f651e9daa54fbe WHIRLPOOL bb50d08bbce3625f290535f835927c4af6a07f109cace832a19f8071e0345083e2b78fe2a9b55ca7dde471ecf77e8702a6000a03b73fb4e483a668f056caed47
diff --git a/dev-python/py/metadata.xml b/dev-python/py/metadata.xml
new file mode 100644
index 000000000000..b207ff96af21
--- /dev/null
+++ b/dev-python/py/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">py</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/py/py-1.4.30.ebuild b/dev-python/py/py-1.4.30.ebuild
new file mode 100644
index 000000000000..8673019ada9b
--- /dev/null
+++ b/dev-python/py/py-1.4.30.ebuild
@@ -0,0 +1,44 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
+HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# 1 failure, test_comments, under both pypy only.
+	# Also appears the home repo has no issue tracker.
+	[[ "${EPYTHON}" == pypy ]] && return
+	py.test -v -v || die "testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/py/py-1.4.32.ebuild b/dev-python/py/py-1.4.32.ebuild
new file mode 100644
index 000000000000..eb54602c31d5
--- /dev/null
+++ b/dev-python/py/py-1.4.32.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
+HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# 1 failure, test_comments, under both pypy only.
+	# Also appears the home repo has no issue tracker.
+	[[ "${EPYTHON}" == pypy ]] && return
+	py.test -v -v || die "testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/py/py-1.4.33.ebuild b/dev-python/py/py-1.4.33.ebuild
new file mode 100644
index 000000000000..eb54602c31d5
--- /dev/null
+++ b/dev-python/py/py-1.4.33.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
+HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# 1 failure, test_comments, under both pypy only.
+	# Also appears the home repo has no issue tracker.
+	[[ "${EPYTHON}" == pypy ]] && return
+	py.test -v -v || die "testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/py/py-1.4.34.ebuild b/dev-python/py/py-1.4.34.ebuild
new file mode 100644
index 000000000000..eb54602c31d5
--- /dev/null
+++ b/dev-python/py/py-1.4.34.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
+HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# 1 failure, test_comments, under both pypy only.
+	# Also appears the home repo has no issue tracker.
+	[[ "${EPYTHON}" == pypy ]] && return
+	py.test -v -v || die "testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/py2neo/Manifest b/dev-python/py2neo/Manifest
new file mode 100644
index 000000000000..32287f8f0e94
--- /dev/null
+++ b/dev-python/py2neo/Manifest
@@ -0,0 +1,7 @@
+DIST py2neo-2.0.9.tar.gz 943617 SHA256 3e06fd82923725fe0f65622abd8d26fbe8403f489e07df16367da1e9bb53820d SHA512 cf0a0fe30e717c32f0a2effc6927e12c6e99173d9592ad549274dd983188f0f09418035b04429b99dac9ab80a8771c3c741a12983a85317eff924cec40f2fc59 WHIRLPOOL 764a96fe01d96553cf1bfe59fc9bbf3b05993cf6d0f2a953b5debdbcc4992ee7fd859d3843d99043030982e53b29c14c097eb3463ac5bc6277c3a06ac10176bb
+DIST py2neo-3.1.2.tar.gz 100101 SHA256 8177a9b2c4d23a3ce26f02d3d6be92ac49cb7520e88ec1b41d8c6e86774938b8 SHA512 1f61e1129effe5e77b72955b34726cde668eeb3f3627a1164b40593ad863ae4f19d534f7174742eccae58d770f5e54d907346bef698d98c33e3f3837e70659d4 WHIRLPOOL 9f66800099cd32fb807116a301f336ca978d79e7fe9c38ccd04765c6d677b090d501f0170fe64e5961356add67ee2de0a665cb4044e032973313908a92afbfb4
+EBUILD py2neo-2.0.9.ebuild 663 SHA256 e2de81209adf560d1a23ac1e08fb14c67958ff058d20355f8be2fe83dee8d665 SHA512 caff0dc7bd53d008a8aca247fe4d4460ad243c8529a484d96a39d14d80dd3d60939d634e1ed74aafa147f853b60fbbbc037f5bd93f9a0475801952ed76e5320b WHIRLPOOL 370f47adbc3ed346a497dd97391098c5d7aaca84f57861bf3e61a12358f7d2c4e31a8134c938d8264baacfe2c0a28e0cf03d22d5623ff2c54144ee5052c1e160
+EBUILD py2neo-3.1.2.ebuild 633 SHA256 80211ebcc4eef964c31fcef63b9ea95b6ae152fc3958501454007ff7184d8f0e SHA512 cb24afb9a702f3596e1de9f51089c947e7cad12d80fb95855f82676a517afde61f974d079bb1fad65c74019e51fa7132e3a0ae3df4e6e9ea8ae1070b1909df84 WHIRLPOOL 3a8ba1977a0933d750f03b0d92628a2a1ee1145a9fb7021fef778b697cd8124ab1f37f90c0828ecd561619ee9610eba08f8434c7c3ec5b41cd7d969c238e2366
+MISC ChangeLog 3200 SHA256 1972256fe972361d4fe258026c9d55f28d343cbc200439b90b9af96075bc6d92 SHA512 592062bdbc2c925a3e8b006e07c389b1da0b7fa2ddd5adb9e6665d421be6dbe181eb4169da1f79e4098e9e23991f9a57ee32645b0ed47e6f6e968d5f2974adae WHIRLPOOL de0e23681876f8e1760891f9d6d553ae06a73656fbe6e09b3d87df2a30ffb8fb037e73f10fbdc2f3a00393f04c0cb8d0ebcf43e6e2ef022a7f17e20df48f5307
+MISC ChangeLog-2015 1811 SHA256 c2a192a03ad013a621fe4b72981d58272054c373f703a7bdb41d32ce3f7acc73 SHA512 577afd0c54e3809686d82086f499dac81342db0e96e74460391098374881d2c1c35e04ec1a4ba03920e22acd57c2b2fe88c779b2b46f15d1bc192e49a330e6e0 WHIRLPOOL a110a03a66fd90f97918e8303d832a7d67af547523c5523c1166390f2c7e98167aa52475acc2f9ff237650da164bd15a43ebaab0a0d3a6981ae1c191bb9ef347
+MISC metadata.xml 473 SHA256 754abf351f391fffbe4cc55710e7c3efe1b698d0c2d4f2cd98ef550e496adc26 SHA512 6433474b000ed04b27ac3562253c009c91f1dfae506471263e1330011e385017de2cd0d35e6ac9c029b19f0eee53ce9a7dfcce2add8070e1990ddf06f7e6ac6f WHIRLPOOL 53105079b9489c7a38289840f041fa306ab594bf60d370da6594d3d2dbcd46662fb6ec5d8d085316deec157c6339d8255657ddad8d1cb27ae4a6c2a374eb57c9
diff --git a/dev-python/py2neo/metadata.xml b/dev-python/py2neo/metadata.xml
new file mode 100644
index 000000000000..62028960879e
--- /dev/null
+++ b/dev-python/py2neo/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ercpe@gentoo.org</email>
+		<name>Johann Schmitz</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">py2neo</remote-id>
+		<remote-id type="github">nigelsmall/py2neo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/py2neo/py2neo-2.0.9.ebuild b/dev-python/py2neo/py2neo-2.0.9.ebuild
new file mode 100644
index 000000000000..27257d606370
--- /dev/null
+++ b/dev-python/py2neo/py2neo-2.0.9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="A simple and pragmatic library which accesses the Neo4j graph database"
+HOMEPAGE="http://py2neo.org"
+SRC_URI="https://github.com/nigelsmall/py2neo/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_compile() {
+	# https://github.com/nigelsmall/py2neo/issues/380
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
diff --git a/dev-python/py2neo/py2neo-3.1.2.ebuild b/dev-python/py2neo/py2neo-3.1.2.ebuild
new file mode 100644
index 000000000000..77e8e49bb32e
--- /dev/null
+++ b/dev-python/py2neo/py2neo-3.1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple and pragmatic library which accesses the Neo4j graph database"
+HOMEPAGE="http://py2neo.org"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_compile() {
+	# https://github.com/nigelsmall/py2neo/issues/380
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
diff --git a/dev-python/py2play/Manifest b/dev-python/py2play/Manifest
new file mode 100644
index 000000000000..a43ea6ce4b13
--- /dev/null
+++ b/dev-python/py2play/Manifest
@@ -0,0 +1,5 @@
+DIST Py2Play-0.1.10.tar.gz 21436 SHA256 70b391e7909e60566df32bfcc5edea75741325a0e488fe83dbde9e3229af698b SHA512 d600c62d20274e71678fc41c3f77fc89d71514032f5b4e98d0bda0119b4c9190c82b84a33240f498a926a6947f8bcd928493f6cbe061004eeddbd7eaef5bebee WHIRLPOOL 52e990bb0cf158c43e8bb9765f0914b81649f335ae4b6ed09e336ec80c3db9726917c0768d9caaabcfe5c5ccc9144e64b93ae9c8025bbbd4b74c1ea83ffb850a
+EBUILD py2play-0.1.10-r1.ebuild 454 SHA256 a7a0c1328a468df774d42657c747a1ba07b32d96a0b81c7458906a718cf71cf7 SHA512 290db2c82962c967f1568142c6483376650c18d4c92e7ee545de105f98617e7133ac15a400c775d3be53d31721e2787b006913a8b1bb494907022ffb54ce5b57 WHIRLPOOL 4c598e5a05b4e4724c36af8e1f32b9dc718f34c0aac173fa7bebc2ed1cb2a6e49e1c7e5fb85a7fc40773636bbf00ae10297a827db6c74262ae4d24af982301ab
+MISC ChangeLog 2437 SHA256 327fc8df8dd3d2d53e5d580946d2d746940fdc491d91d3d924fcd9f3ad7b16a3 SHA512 92eb94124efb3bf57c98bcebbf61f2558424ecc4494994dca7af47a6a543bf51853f9d9dec4213ada262b8b7a6e621162bd29f97361de7b1a22856a6cd4daa8e WHIRLPOOL 171daaac56df52abaef5f540f54f5a849a750a36bcc1a67de5a046d6d0f050d00adf9bd8e01f42a2f109f2444321b200f3dd3d918bad861a46177b5f3e3125b4
+MISC ChangeLog-2015 3594 SHA256 69a2c5f0e249dbfacb8f867ccb8c66d04dbb8ae9fc8ca1c6fc6adbf94ee0b68c SHA512 7df9b461b35528e40c42d8b174c7d26f98331fa0f07f222fb217bddc85f1face85454d4e3e3bc876b2333dec232f5cf13cfc7d7a7822d1de2275909f5807386e WHIRLPOOL 08a70ce8eefcc13a5f8e4fff3dcb19a9eddf947edd9335db54fd1db629f4f2ea5446fab7502b9faf25d75034b941dfca162cab5808ef8e0ece188b6656c771c4
+MISC metadata.xml 346 SHA256 e9d17293c33e335e043fa1537e72a090ad87972be64b577d8328f05b1f8f2b2d SHA512 40fe1e46a4dbdc042db29d69402acdd0ae862e42d7937668f8bc063b4300bd78a4a9900261104b301ba5b89814a5e79316deaec4340258b70773d3661058fa6d WHIRLPOOL f74f15474b494681ee7654e1c0aa1c5507284301274175845897c79e93c046fc9ba63e41343a78d8f372dbc54ce07c815127399c78335b543f48ac3810cdf72a
diff --git a/dev-python/py2play/metadata.xml b/dev-python/py2play/metadata.xml
new file mode 100644
index 000000000000..ba94533f5801
--- /dev/null
+++ b/dev-python/py2play/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/py2play/py2play-0.1.10-r1.ebuild b/dev-python/py2play/py2play-0.1.10-r1.ebuild
new file mode 100644
index 000000000000..8e7436c0eafe
--- /dev/null
+++ b/dev-python/py2play/py2play-0.1.10-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P="${P/py2play/Py2Play}"
+
+DESCRIPTION="A Peer To Peer network game engine"
+HOMEPAGE="http://home.gna.org/oomadness/en/slune"
+SRC_URI="http://download.gna.org/slune/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pyClamd/Manifest b/dev-python/pyClamd/Manifest
new file mode 100644
index 000000000000..a15173aa4cc9
--- /dev/null
+++ b/dev-python/pyClamd/Manifest
@@ -0,0 +1,7 @@
+DIST pyClamd-0.3.10.tar.gz 8929 SHA256 ed77743c32298b151c881cc52a211e188bd24203ae402f2640def858c6a2bca7 SHA512 2c895fbc5897646ad5c23445062fb2e34a2db070471afd8356796f5f458d90b0da824af58b8ba762ce49572acaee6981881169eb33231085dac82ff0169fa2c8 WHIRLPOOL fa9ba64ab721169373572e552450fcee96db0499a9eeb336763ed2ea9e6f24328aece3b46a2c04ba2a6706f8d6a047ea0ef96f1fe53a6ae4663be0980d9e9c43
+DIST pyClamd-0.3.17.tar.gz 10737 SHA256 9921a582c45baa34dabb357c548c5ed331b9a39334881b3a784b593680b07ba0 SHA512 52eda3f5b6612d47b803e6df8a49890167805dc39a30004f979dcd828b2717ebf7fe753ad0305ab3aad00aaaf750e9e862d43a504ccdb8f7df6faceae18da4a8 WHIRLPOOL 4e3f729f30ea65e0f57131087063405efe57b4b54b081cdb84eb9ccdfd77457f2ddb02d47e2ee79a68179eea27cfabfa3d700dd398f0dd21b4aa4663cbe051c4
+EBUILD pyClamd-0.3.10.ebuild 554 SHA256 91855b702fcb3edfecd6a44fcbd5fdd3abf465c3fa0ae2a0371a29905b3db47c SHA512 34b3fe735b507a2cd98715a1cbfe6460c7863edfa9ee23a2ffd86dc638fc5d1dd05cdd3fe251a5f1bdeafec53c58732a8f5d294f2dfaa45d5433c272200ef8d8 WHIRLPOOL 350f5b45d08e0c663d6fd320796b34a7a809c456b5db854ecee56a234501817583a2a632644f077e6dafaa30c13a56f980b71ee277849cf922b34eac3a102ae0
+EBUILD pyClamd-0.3.17.ebuild 554 SHA256 91855b702fcb3edfecd6a44fcbd5fdd3abf465c3fa0ae2a0371a29905b3db47c SHA512 34b3fe735b507a2cd98715a1cbfe6460c7863edfa9ee23a2ffd86dc638fc5d1dd05cdd3fe251a5f1bdeafec53c58732a8f5d294f2dfaa45d5433c272200ef8d8 WHIRLPOOL 350f5b45d08e0c663d6fd320796b34a7a809c456b5db854ecee56a234501817583a2a632644f077e6dafaa30c13a56f980b71ee277849cf922b34eac3a102ae0
+MISC ChangeLog 2512 SHA256 d641e03cfad58c230c4d59853257a17c97acb88ee2f546367e87ccd1ca1aaeb9 SHA512 064c4e3754c87ee01f943b4278a702848816583c91a94cc39667573ef1da966e256e58b888f03b8c03b86d38d1f55cbb1520c027a51093fe62e66e4015cf4806 WHIRLPOOL 7f85f15267921b0c1fed97f57b03948b53270cd530c4ccd3ebf0d341a1dc4e9e206d84481a85949943139c957dabc7d90582d7501de1091aad97c2ba20e96de6
+MISC ChangeLog-2015 612 SHA256 0e4f5c26eb6d23387febf9047f3fd1d55810a3dcbbc08c72079611e2ef545113 SHA512 2a2bd608fd64516527a8039bed8806faff1660789de88732a1ab5f4e3744289b6bf0992209d52f6665c94b22053c74758c7e24af69217f8a1f9eae056b6c29ac WHIRLPOOL 84bc3d0b83d89a59ae0ac1e03f6b1442f41c2cd3226aa604b90e447f0bbea3c7165117f52899579ae3e6b2e416a0000bebe96c32f3c08e0d80af0e1d239ebd44
+MISC metadata.xml 323 SHA256 86e01d1769d908c28e08d1b194330265bb1299d82303934d8eb3dbb9fabc9624 SHA512 d415502fcadfae02999e34a1eb5d526e1e344ee55182ea0790556432df8a63dea1f71a0ebbe47575eafa205dd287e1d2d032de58f87cca6d1fde56154762dc61 WHIRLPOOL f7a1b0b283bc5e7d1bd2833e80f2f1ee7ea2c1f82a6c67e27381097bdb5697a4ed3925991cc04515404e56040820881bcbafc27db0235fbf59d971c0789b2d3f
diff --git a/dev-python/pyClamd/metadata.xml b/dev-python/pyClamd/metadata.xml
new file mode 100644
index 000000000000..ddd3880bfccf
--- /dev/null
+++ b/dev-python/pyClamd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xmw@gentoo.org</email>
+    <name>Michael Weber</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pyClamd</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyClamd/pyClamd-0.3.10.ebuild b/dev-python/pyClamd/pyClamd-0.3.10.ebuild
new file mode 100644
index 000000000000..dda9b5d02ea5
--- /dev/null
+++ b/dev-python/pyClamd/pyClamd-0.3.10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="python interface to Clamd (Clamav daemon)"
+HOMEPAGE="http://xael.org/norman/python/pyclamd/"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e 's:/etc/clamav/clamd.conf:/etc/clamd.conf:' \
+		-i pyclamd/pyclamd.py || die
+}
diff --git a/dev-python/pyClamd/pyClamd-0.3.17.ebuild b/dev-python/pyClamd/pyClamd-0.3.17.ebuild
new file mode 100644
index 000000000000..dda9b5d02ea5
--- /dev/null
+++ b/dev-python/pyClamd/pyClamd-0.3.17.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="python interface to Clamd (Clamav daemon)"
+HOMEPAGE="http://xael.org/norman/python/pyclamd/"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e 's:/etc/clamav/clamd.conf:/etc/clamd.conf:' \
+		-i pyclamd/pyclamd.py || die
+}
diff --git a/dev-python/pyGPG/Manifest b/dev-python/pyGPG/Manifest
new file mode 100644
index 000000000000..b342e02ac56e
--- /dev/null
+++ b/dev-python/pyGPG/Manifest
@@ -0,0 +1,8 @@
+DIST pyGPG-0.1.tar.gz 15441 SHA256 c699192606652ebe1a369770d00110baa490c74c3d858ad0513ec55f315e7735 SHA512 58a89fbee4311b89c5515ad1bc1d901057e8acdfdbcf36813f50a766374100a62efe456d52263711e5c2f46957791def9343d94f019e413506cfdbd353602060 WHIRLPOOL 24862897737516945cdc8e41ced589f4ef4b64cdd4a92ddae22c07e9252c0cf8779b685b6cd35fac5b3244d0000d9bade98d661c67ac904639ebc142281551c1
+DIST pyGPG-0.2.tar.gz 15439 SHA256 0c45b408b080c725832463d15a2227da48c4dbd9fa918c8662631adec5b0a08f SHA512 93d892a57a27b254bfdc9778b73d341dfec654c2104c578014628df78c43beaf93eafb571ac544d52f334e63f6e5b8c0cfad7c8a0d585ee7211e8649efce8c67 WHIRLPOOL 81e2bb285b9aef73edbef91b5ac460c048f8826fe480b356d39ba66105905aa02bf73f56b49918fd45b0765bad03361a11c6684303b37df20fb2d23113a3f7e7
+EBUILD pyGPG-0.1.ebuild 1032 SHA256 0bdbb8320d0e4d2a1ddc39d6e21dca17acf64db8cfd850b56b2f379c831a0b74 SHA512 59ddbeb63e67e5428c6918e7d555a75cdcabd4285a973ecd066e426e421c18b859ecc321f5c82e5312f770d50d165e8d0d4afb468f97d148b9d837129121ebfc WHIRLPOOL e2c6dd28df9dbd3c66bab53985f005cb60c06363a75bec21be8746c6f6dc6003e88315312acb5c3dfe3d21fadd3111c4d22f52016503f06814f0e2f8d67a1940
+EBUILD pyGPG-0.2.ebuild 1051 SHA256 0348d7caa92194d841e51105e6fbc493eba9bedd9d2e1fd78c08bec831bdf548 SHA512 f74205ebabc6ed8827635230e1434229cb3d174cdd15c6d5b06a46ad70cdd111db3ac2444cec5c08919d1149d47df9d42a001d47e250eab32e2a0149a12daf73 WHIRLPOOL dffa54f548ce0b42c99358bf4fe8d2c6dbf189bb749f00179c3d3298b1711e2e4c65f829653b3e51001ae5704df210c216fb4a8be43a810687723ac9071de533
+EBUILD pyGPG-9999.ebuild 1027 SHA256 68cbd01de9818461bd645a99a16d7b92d82b7bb19ca297bc4e849d6b46800d8f SHA512 030cba87e2edd1aa491cec5db3546ce26f67171b316dc56fcf2b01695e0a11bf05e346fe05bdbc4b5db3848c83a38da87ba43d67443405e302301faa7fae6bbe WHIRLPOOL aca6b96705bd3f7a200b27cd820f5363339527bbcdc8220072c629d644e21ee1559f83f11e91247d6e2d5f4de85e26c81d6ba3c85221c5f78545cb5a75590f96
+MISC ChangeLog 3063 SHA256 5945e7c740fc221eaf26d925b985bfbf6795750476c029e990560bfc5cfdf9c9 SHA512 9bc184c10b156a0264ec82a680d5423a1ffa0d1d5a89dff99f12b9b6ddfc2c6482bdb4371195db2ac4fea2283d2fe844940137cbd5aee8ad3062aebde56ca620 WHIRLPOOL f49856290a5d203975eb5c7e0eb563a5e08b112b1158098b125b26b8217f98182dd781ea5c87cc564e1b802075a6095ad5d6e0287ebdb499d3203cfa22d062c3
+MISC ChangeLog-2015 1796 SHA256 75bea04b6e51a6cc10ee0e52378889086ac13c84f5fa8b102f2ae3bb939b2e76 SHA512 17cd3d832a9b85ac95d135132d5ecf6d0736a5990c5fc5086216d9282a536026f126c201fe73019ea74d044cabdd31d3aa4a308c04420ced9fd1174648ee29c9 WHIRLPOOL 04575d399ea10e5446b2e3bf307a09812c01e9d8b1ac54270c08beb50a7dd8405ce10cd8997cc5fa43ab8a74d50f22439b6613e7f5c9552a52075e57be6613b1
+MISC metadata.xml 672 SHA256 8a612f768800882e1ff79d0c6328af959fcce81f1033eed58a1b67145118a3f0 SHA512 3e10843a2625c38e9481e3d7d70318312efdda48c3ebf2c97af5f1319e03840765116856de363da5a7088e0fa25f03c513ec11bbe8eae55d932470e9f3bee420 WHIRLPOOL d77a966b8ad7cf220f6cdb640d6319f691fb639d462e68435e524b04e44b563b1b4184712c1d4d36d35ce8ffd31477c38592df940197ccbafc882b66a99139f2
diff --git a/dev-python/pyGPG/metadata.xml b/dev-python/pyGPG/metadata.xml
new file mode 100644
index 000000000000..ceedf0fea6c0
--- /dev/null
+++ b/dev-python/pyGPG/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
+	<longdescription>A python interface library for wrapping gnupg's gpg command.
+		It also connects to gpg's status-fd output and makes all the status data
+		available as subclassed namedtuple instances.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">dol-sen/pyGPG</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyGPG/pyGPG-0.1.ebuild b/dev-python/pyGPG/pyGPG-0.1.ebuild
new file mode 100644
index 000000000000..73ab8a86e647
--- /dev/null
+++ b/dev-python/pyGPG/pyGPG-0.1.ebuild
@@ -0,0 +1,39 @@
+# 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})
+
+inherit distutils-r1
+
+EGIT_REPO_URI="https://github.com/dol-sen/pyGPG.git"
+
+DESCRIPTION="A python interface wrapper for gnupg's gpg command"
+HOMEPAGE="https://github.com/dol-sen/pyGPG"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/pyGPG/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+	"
+
+pkg_postinst() {
+	einfo
+	einfo "This is experimental software."
+	einfo "The API's it installs should be considered unstable"
+	einfo "and are subject to change."
+	einfo
+	einfo "Please file any enhancement requests, or bugs"
+	einfo "at https://github.com/dol-sen/pyGPG/issues"
+	einfo "I am also on IRC @ #gentoo-keys of the freenode network"
+	einfo
+	ewarn "There may be some python 3 compatibility issues still."
+	ewarn "Please help debug/fix/report them in github or bugzilla."
+}
diff --git a/dev-python/pyGPG/pyGPG-0.2.ebuild b/dev-python/pyGPG/pyGPG-0.2.ebuild
new file mode 100644
index 000000000000..46854436ed53
--- /dev/null
+++ b/dev-python/pyGPG/pyGPG-0.2.ebuild
@@ -0,0 +1,39 @@
+# 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
+
+EGIT_REPO_URI="https://github.com/dol-sen/pyGPG.git"
+
+DESCRIPTION="A python interface wrapper for gnupg's gpg command"
+HOMEPAGE="https://github.com/dol-sen/pyGPG"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/pyGPG/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+	"
+
+pkg_postinst() {
+	einfo
+	einfo "This is experimental software."
+	einfo "The API's it installs should be considered unstable"
+	einfo "and are subject to change."
+	einfo
+	einfo "Please file any enhancement requests, or bugs"
+	einfo "at https://github.com/dol-sen/pyGPG/issues"
+	einfo "I am also on IRC @ #gentoo-keys of the freenode network"
+	einfo
+	ewarn "There may be some python 3 compatibility issues still."
+	ewarn "Please help debug/fix/report them in github or bugzilla."
+}
diff --git a/dev-python/pyGPG/pyGPG-9999.ebuild b/dev-python/pyGPG/pyGPG-9999.ebuild
new file mode 100644
index 000000000000..1ccf96a3fe59
--- /dev/null
+++ b/dev-python/pyGPG/pyGPG-9999.ebuild
@@ -0,0 +1,45 @@
+# 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})
+
+EGIT_BRANCH="master"
+
+inherit distutils-r1 python-r1 git-2
+
+EGIT_REPO_URI="https://github.com/dol-sen/pyGPG.git"
+
+DESCRIPTION="A python interface wrapper for gnupg's gpg command"
+HOMEPAGE="https://github.com/dol-sen/pyGPG"
+SRC_URI=""
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+KEYWORDS=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+	"
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	einfo
+	einfo "This is experimental software."
+	einfo "The API's it installs should be considered unstable"
+	einfo "and are subject to change."
+	einfo
+	einfo "Please file any enhancement requests, or bugs"
+	einfo "at https://github.com/dol-sen/pyGPG/issues"
+	einfo "I am also on IRC @ #gentoo-keys of the freenode network"
+	einfo
+	ewarn "There may be some python 3 compatibility issues still."
+	ewarn "Please help debug/fix/report them in github or bugzilla."
+}
diff --git a/dev-python/pyPdf/Manifest b/dev-python/pyPdf/Manifest
new file mode 100644
index 000000000000..42d49056105f
--- /dev/null
+++ b/dev-python/pyPdf/Manifest
@@ -0,0 +1,5 @@
+DIST pyPdf-1.13.tar.gz 35699 SHA256 3aede4c3c9c6ad07c98f059f90db0b09ed383f7c791c46100f649e1cabda0e3b SHA512 1c00a5a6658054671a396e7b334cbeb9e26dc1e3ad9668e212d05a9483f164931d8bd14fb9ab4d083d7ca3999fee7a2e9eea55b604a06c7d5d0632f0791b7598 WHIRLPOOL d00b28f6d3e4268b94f76f8573c1d11cb6ecde47d33c5068cfe86326e1ee20f674c09248a1117d31819a1992b334bf7084f662234a991de022c335a543d1b966
+EBUILD pyPdf-1.13-r1.ebuild 387 SHA256 4c6d817e3ca0b27fb56559782d9b7a4a32a8487b39bc3b0f6493cfa14a8bf8f3 SHA512 a114191ec364014e64bf3ff23aac7486238632c5548a02add76904c0df68d4fb5597dd385ada117199f83bd62f99b0cbfd8a5082f802117ec9417d1070b39009 WHIRLPOOL 64073d2c594d5d909c7c8e2cbcab7176b63a90316e1f9db2f1c07a67bbb24fb51b2f46aca2fc55eb4a96b229905a2809785252f8233df4fcce4a218a47fe56fc
+MISC ChangeLog 2570 SHA256 953c8c30ca216d9b4200b2e040160f6979aabea348f461f7afdddaa772f184d5 SHA512 f4bc21b59b0d5b963dfcc3a77c2ce87a8d2cca45cce64e45df04999ef9f0203609136e1ab9eb3bf0d6553b3aaa10467c462033f8807f66110c405927abbf3d68 WHIRLPOOL ad705ffaf9ed814678131f1a12c706aec96348e758473b4631800e39cf3d17bfd4e97deae6d44de714feada2482fc53ba50e7b0de96238550257ef8d6c5fff10
+MISC ChangeLog-2015 2149 SHA256 89f9ae748fc081e1616ab18438b58130e39687571631ff5948d6ac91117d7a33 SHA512 be32c7b07c9028851e6a8c718885a014db0b310c3cc29dd0b76c9cb9548256e1831cc26fe9ff1e9aba3fdcfd9c977f3f2d3e8a5913b4a304dc851163e4da5513 WHIRLPOOL bb12c84ffbc056af2d255d321a53ab8f28427c19674a6b2eca3a01e8436324950aeedfe7d7c7b021952d224e604e94f22a57cf787908f7d4f7ddf017ebd2755c
+MISC metadata.xml 730 SHA256 816910d8ecda186d2aa500816a9d471f6d3cb1b1247b4780c429d56f597be96a SHA512 0cdece8ac0eca75cc821714ba1ea696cf295609ce991ffd6d1fcc2b1beeaa2b107dedc57eefafda105daf11e3c20469eb3e74e02d8de81e9d2b0ba7f2097ac3f WHIRLPOOL 34dcfb1c8ddc0863bf41fa343c9835bd64408e8333cc9da808cc207e8ced8917d99e040aed21604f46f69b2285b9072d55c3beff37500f081b8b3cd27768137a
diff --git a/dev-python/pyPdf/metadata.xml b/dev-python/pyPdf/metadata.xml
new file mode 100644
index 000000000000..e7eb74fec115
--- /dev/null
+++ b/dev-python/pyPdf/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>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    A Pure-Python library built as a PDF toolkit. It is capable of:
+    * extracting document information (title, author, ...),
+    * splitting documents page by page,
+    * merging documents page by page,
+    * cropping pages,
+    * merging multiple pages into a single page,
+    * encrypting and decrypting PDF files.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-python/pyPdf/pyPdf-1.13-r1.ebuild b/dev-python/pyPdf/pyPdf-1.13-r1.ebuild
new file mode 100644
index 000000000000..9b1663d88f03
--- /dev/null
+++ b/dev-python/pyPdf/pyPdf-1.13-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to work with pdf files"
+HOMEPAGE="http://pybrary.net/pyPdf/ https://pypi.python.org/pypi/pyPdf/"
+SRC_URI="http://pybrary.net/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
diff --git a/dev-python/pyacoustid/Manifest b/dev-python/pyacoustid/Manifest
new file mode 100644
index 000000000000..6992127c3da4
--- /dev/null
+++ b/dev-python/pyacoustid/Manifest
@@ -0,0 +1,5 @@
+DIST pyacoustid-1.0.0.tar.gz 10476 SHA256 31900428e7b344dca0c2da594b387e88620c319298e3a6400a968078194407d4 SHA512 4eabf32e7d958bf7330e852184f5ddf3105007179ca2c45b75c1a5b0f0898649e703aa333cffccac85eb7b18b54255f2e5d588897adfb9f0ef2596e9c0b2fe5a WHIRLPOOL 084bc175021db2b344484fa5f03bf8b63b78ba21f92e050da93d36dcded494ff62f6344f59f8f0027b8b42a4bb6a1d21d22408a4f5679023c10eb37907ab1b79
+EBUILD pyacoustid-1.0.0-r1.ebuild 654 SHA256 ca4e3407a80087e05ca066fdd8414e155196d6addd7c4f0053454f35014569c0 SHA512 c3970ee1444a2fa13e49d00bb8f1af9bbfa84ecc6049eaec2ffe8db099cada51ea8b5797052ef49b88c7782b2cecd3239e6608356fa4d0c62db8093dc634fa4e WHIRLPOOL 86b93a1bb9ae0d85ed851200af47d1aa25a1558921892117e20e01985bff2dbbbaebb9a33e1f7780bf48533235830a2c25915b26096c7351954cd3dca86b747f
+MISC ChangeLog 2688 SHA256 e088072ac3b91e426be5d46852efcb63d1779695690d7d91b5ca6c612b6f6136 SHA512 fc652984ac9c68a3086f7d81cc3d40a9e434f0c53273aa2deb2092931c4933177db98d215270e9ba1e651afcba2e89dc794a8eaa3899ee1073db8914ae906004 WHIRLPOOL da4e441dbd7d1e429053d473c90f70d521c7ae1f5e49be4a8743e2c4ddeaab5ef80c6b2f3d56426df007b186872e00976de75fa6f9c9e636a22408612ca8d830
+MISC ChangeLog-2015 1480 SHA256 d85c69fa87891c2296b0390af573f90be43f1ba32bcdfb9066c4fbaf3134af8f SHA512 5c534f26024ac77734cbf488fc5432d4e940b875fde9085ae1a17959d89f94b44ac28be9dba0c2036ac14cbac87749f3f762e5610f7d348fbc24667619317df1 WHIRLPOOL 90e5c7462a61ff37572faff98e91e3fbf434471cfff78baf1fd63bc1374b9cbd653731517395d95049c14da7751675ead6696573823f16b247f5cf98fc72beba
+MISC metadata.xml 593 SHA256 bff9a4d016f54fb28b31a8fcf2a29b8a0a5ff023b11d86ee171d01712994788d SHA512 533ecf543ae635df56dc5c523dfbecbcb8f863116610b38c79308f4ed3de6944a740c14f138a8d4fe8c22eba5566bf4bf3042ad646e195ea8d3cc7bb421ced08 WHIRLPOOL e17007cac22c65b70488afbfc7e07c68fe7396721c6c88e9513506228228042064f781095118dddbb352158913f9869dbd4cca70fd5e95b2484757ddb97636fe
diff --git a/dev-python/pyacoustid/metadata.xml b/dev-python/pyacoustid/metadata.xml
new file mode 100644
index 000000000000..28b639ea6f82
--- /dev/null
+++ b/dev-python/pyacoustid/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription lang="en">
+Chromaprint and its associated Acoustid Web service make up a high-quality, open-source acoustic fingerprinting system. This package provides Python bindings for both the fingerprinting algorithm library, which is written in C but portable, and the Web service, which provides fingerprint lookups.
+	</longdescription>
+  <upstream>
+    <remote-id type="pypi">pyacoustid</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyacoustid/pyacoustid-1.0.0-r1.ebuild b/dev-python/pyacoustid/pyacoustid-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..5f12b5a7acf9
--- /dev/null
+++ b/dev-python/pyacoustid/pyacoustid-1.0.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for Chromaprint acoustic fingerprinting and the Acoustid API"
+HOMEPAGE="https://pypi.python.org/pypi/pyacoustid"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="media-libs/chromaprint
+		dev-python/audioread[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	use examples && local EXAMPLES=( ./aidmatch.py)
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyaes/Manifest b/dev-python/pyaes/Manifest
new file mode 100644
index 000000000000..bcf57bcad603
--- /dev/null
+++ b/dev-python/pyaes/Manifest
@@ -0,0 +1,5 @@
+DIST pyaes-1.6.0.tar.gz 28237 SHA256 9cd5a54d914b1eebfb14fcb490315214b6a0304d9f1bb47e90d1d8e0b15ce92e SHA512 32f6bf998b7e200fc73b4852873f60067ac056d646ae87cd8ab55f3ec99c9e26fa2b418b67ba0264a8016311a5f0eb2d40c8e7f917c0715e19f5c3dbf6a8238e WHIRLPOOL 255679d20d40d7a9134465b39365bd6e077601e7882c2f17dd2d1e4198b88712782bfdb8d5d5dc7a74f5c8e5f124da0d396a3aa94dd2a858f53ec45fd8af7a61
+DIST pyaes-1.6.1.tar.gz 28536 SHA256 02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f SHA512 00ce3babf72ea18b0de369860cd884058c7c6f3bd8b961c3ff591ef7d3dc0a69fabad5311f61c9f91d2f1a480c8512e34eeced5ec7145ed9f963bf91c5f8838a WHIRLPOOL 5dd013096329f669afc75bddf18c773d282f4b505185838cafab411ab4ba03b7dfa278e053f8c7101033bae0d3ad1c8d88548278917959116942909a2e095066
+EBUILD pyaes-1.6.0.ebuild 556 SHA256 7e9ab485b30782dde6d1bc57cb719c83ab446a66fb80cf5f35600b41fd79877f SHA512 c4a462428fbddccf281c512e290a0058a7ab40b4aaed6441b8626257a06762e6f5ca7dd9e4badf00ed4e93f88d6f5e6be0f4b426c2d2ee46d44b4f9aabca0145 WHIRLPOOL 2e901921ea9b77ac674980a63f49c40feaef615254792dfd3ecd808ac7718e22b9fce77883b61d3e67d0d124d6ef996eba2f66df59c5fd4053806299b18d8d8e
+EBUILD pyaes-1.6.1.ebuild 556 SHA256 7e9ab485b30782dde6d1bc57cb719c83ab446a66fb80cf5f35600b41fd79877f SHA512 c4a462428fbddccf281c512e290a0058a7ab40b4aaed6441b8626257a06762e6f5ca7dd9e4badf00ed4e93f88d6f5e6be0f4b426c2d2ee46d44b4f9aabca0145 WHIRLPOOL 2e901921ea9b77ac674980a63f49c40feaef615254792dfd3ecd808ac7718e22b9fce77883b61d3e67d0d124d6ef996eba2f66df59c5fd4053806299b18d8d8e
+MISC metadata.xml 330 SHA256 465197fa2d02768602232aef0aeacdfd17c8d06e1ba4c0169422c6d59d941dcc SHA512 709c6dd149b11725af862bb5d43be89be3f2432b0c3315e4d6cbbf45a98345b8bcbc092e9dd4d21b3501753f3fa9001d5d4ed5c6db6580ad311cc96c3c76cb9a WHIRLPOOL bf3c728ff96c46d9d220d3e188a2a89c10388c07dbf7d18de9a2d02a5b7520a9c2699ec0969b2b559472d8369bc1a6b2513982e5b928177ad66ae9902bbd12d0
diff --git a/dev-python/pyaes/metadata.xml b/dev-python/pyaes/metadata.xml
new file mode 100644
index 000000000000..936a7fedbd7d
--- /dev/null
+++ b/dev-python/pyaes/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pyaes</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyaes/pyaes-1.6.0.ebuild b/dev-python/pyaes/pyaes-1.6.0.ebuild
new file mode 100644
index 000000000000..839a967746df
--- /dev/null
+++ b/dev-python/pyaes/pyaes-1.6.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python Implementation of the AES block-cipher and common modes of operation"
+HOMEPAGE="https://pypi.python.org/pypi/pyaes"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	${EPYTHON} tests/test-{aes,blockfeeder,util}.py || die
+}
diff --git a/dev-python/pyaes/pyaes-1.6.1.ebuild b/dev-python/pyaes/pyaes-1.6.1.ebuild
new file mode 100644
index 000000000000..839a967746df
--- /dev/null
+++ b/dev-python/pyaes/pyaes-1.6.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python Implementation of the AES block-cipher and common modes of operation"
+HOMEPAGE="https://pypi.python.org/pypi/pyaes"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	${EPYTHON} tests/test-{aes,blockfeeder,util}.py || die
+}
diff --git a/dev-python/pyalsa/Manifest b/dev-python/pyalsa/Manifest
new file mode 100644
index 000000000000..f35228aadf4f
--- /dev/null
+++ b/dev-python/pyalsa/Manifest
@@ -0,0 +1,6 @@
+AUX pyalsa-1.0.29-no-build-symlinks.patch 775 SHA256 534113bdc34faa82c3bad7a4cbc96d71e6ff4e828bc9004b48b6424cc19ab757 SHA512 647783293e2576e8fe3631bad6082000c315ac4b5312e4e212c7fcadd84082e06964fda66bbeda781f33f75596ef561e18b0652e25beb88d0f883c131b3d2d32 WHIRLPOOL 4bfd897de1d51d12e1dfc8d7e8d191c4f451cc67b1e4cbc1c3fd483e971bb56d8ff673db831a3ac58c4d767998976d81c908efba2b6545fbafce4393aa3ca699
+DIST pyalsa-1.0.29.tar.bz2 39481 SHA256 87ea6d8a2b7a9d7b015cdd84c898dc5e524f770ae6795e0d32ac2234311c953a SHA512 cc885094b020ea6e1735391cfc73a11e29f7d59b1e24a766908d57bec0fae4f490616c59f04eb74648f8ee610e76295a9501ab31a2513e921bcd8b4fdb104683 WHIRLPOOL 492a924d4ce2c22f368df06ea4f213b22c2fef7ac215f0a1c401524e7c510e3d5c5949ea7e8fdb1cbbe5104c6ef51051a7574032e0cb743f20399ef17e79239d
+EBUILD pyalsa-1.0.29.ebuild 732 SHA256 bb6aff388b6f10657f0b07ff359d6dc2dc6ae8d9293aac4d4dc1e2a38bc075bc SHA512 41885c989d98db00b6045a8f9c766e9fa9fd5ae9c02d9eb3051e46f07efbbd04a8091870fd7768a62771b3bed81424af487ecb59236c9d832a51523a4c3337c4 WHIRLPOOL 10746a7dbc86758aa764791cd75dd930ea24ffcb90e531d0002e4389051cbd8179c02ee21a5738d7b8e8037796750ef1fa2a1e641a063420775dc38b24119d04
+MISC ChangeLog 3042 SHA256 f3da6dd8972e4109ca727534db8b9db1fe00dd6705dc05b5b2ea3dc6aa57279b SHA512 0c910ec61557699eb00cbc19f92334b06cf8c808fbd00f2665d12945a1f16638341d7358c80d6eac4cbd501ad5fb222a6842b3bdfbc55e38a989cad81905b049 WHIRLPOOL c59c0770a16b85f926992b137e5b2b896172d8877eb4a686b503fd7528bad643c909ac245c1d6157f01f336d7e7565701a6999353d454611a918decaff1bccc0
+MISC ChangeLog-2015 5825 SHA256 e64c1f63785678005868d8e8f3f2d7b894b081d3f66cb484ffa7cdb88707355f SHA512 d9ef9e2f6f71cbb927209cfb1a4c4e7aab68a724ce086f5c136bcef8ab5cbb2adc8feba2f9c40e3b9eca08f6b6761f3c11f61723c62ac87289c04c28d4fe1d95 WHIRLPOOL a7d6ecc2bb958ec5f50677c21b9916ab50beb324e22d4753afafe17485a842917fd4fc616fe44315dba12c3d7b2d8ed2c977b1b68eda9a2944cac9aeac2713e6
+MISC metadata.xml 349 SHA256 3ec35c25d62d744c4cfa25ca8dba6e4bcb96c860913301cf9dacc877ab4062f6 SHA512 ef94ac2639e61234b2140a6dae1683f99c3c8bf564a37d22e54612340a2d0147037e590ef8f6c639914df05684f3d62ebc96a9e2176cab82ba85e5d87171ec58 WHIRLPOOL 4234da0db2e38a805b4e6c5ed397b7fef415856575ccdd68f28f554685f9072e726f375be4da42afb0537269deff127ad2b32b3097db1aba60ef1f47b2eca25f
diff --git a/dev-python/pyalsa/files/pyalsa-1.0.29-no-build-symlinks.patch b/dev-python/pyalsa/files/pyalsa-1.0.29-no-build-symlinks.patch
new file mode 100644
index 000000000000..72bf0bcb49c5
--- /dev/null
+++ b/dev-python/pyalsa/files/pyalsa-1.0.29-no-build-symlinks.patch
@@ -0,0 +1,24 @@
+diff -ur pyalsa-1.0.29.orig/setup.py pyalsa-1.0.29/setup.py
+--- setup.py	2015-02-26 20:36:18.000000000 +0800
++++ setup.py	2015-03-22 12:53:26.941401236 +0800
+@@ -58,20 +58,3 @@
+     packages=['pyalsa'],
+     scripts=[]
+ )
+-
+-uname = os.uname()
+-a = 'build/lib.%s-%s-%s' % (uname[0].lower(), uname[4], sys.version[:3])
+-for f in ['alsacard.so', 'alsacontrol.so', 'alsahcontrol.so',
+-          'alsamixer.so', 'alsaseq.so']:
+-  if not os.path.exists('pyalsa/%s' % f):
+-    a = '../build/lib.%s-%s-%s/pyalsa/%s' % \
+-                    (uname[0].lower(), uname[4], sys.version[:3], f)
+-    print a, f
+-    p = 'pyalsa/' + f
+-    try:
+-      st = os.lstat(p)
+-      if stat.S_ISLNK(st.st_mode):
+-        os.remove(p)
+-    except:
+-      pass
+-    os.symlink(a, 'pyalsa/%s' % f)
diff --git a/dev-python/pyalsa/metadata.xml b/dev-python/pyalsa/metadata.xml
new file mode 100644
index 000000000000..924dc07b5c11
--- /dev/null
+++ b/dev-python/pyalsa/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="project">
+	<email>alsa-bugs@gentoo.org</email>
+	<name>Gentoo ALSA Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyalsa/pyalsa-1.0.29.ebuild b/dev-python/pyalsa/pyalsa-1.0.29.ebuild
new file mode 100644
index 000000000000..4ab9d25891ae
--- /dev/null
+++ b/dev-python/pyalsa/pyalsa-1.0.29.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )	# Still py2 only it appears
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Python bindings for ALSA library"
+HOMEPAGE="http://alsa-project.org/"
+SRC_URI="mirror://alsaproject/pyalsa/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${P}-no-build-symlinks.patch" )
+
+python_configure_all() {
+	# note: this needs changing when py3 becomes supported
+	append-flags -fno-strict-aliasing
+}
+# Testsuite appears to require installed state
diff --git a/dev-python/pyalsaaudio/Manifest b/dev-python/pyalsaaudio/Manifest
new file mode 100644
index 000000000000..113ca5746c17
--- /dev/null
+++ b/dev-python/pyalsaaudio/Manifest
@@ -0,0 +1,7 @@
+DIST pyalsaaudio-0.7.tar.gz 124577 SHA256 bbd5a9eb351def673800707f48e64680685f397e29da72ea4c9355e1a2b2a0fd SHA512 aea46ebc4a59c791e318e58fa7c307b73ea7e1eafdd6b2055df312e26e8d4868ca582b76dd2f203cb7c632a25e1bfd066f6f9522484aa5db51f404e5f99a38cc WHIRLPOOL 80dd871e66e21ebe34581a0c7ec846dea8b5c5ada93c0b0811334dcf2e90ab97e63852cc47a5355d03e546f335751e949d725f86bc3d26d76ea7aa8e4db9a718
+DIST pyalsaaudio-0.8.2.tar.gz 212747 SHA256 b6df486f1c4035041a5f3800496b86c64e48e4a7d47f94dcbca11b0187aa3a15 SHA512 cba4acaf18b74f990547a590da5bbb824398518444cd09cf80d2e4dcb1176fd5469b107c96b3696ca98ef8ef4d1026feb22b01f730b2558c9dd60ee58500d4b5 WHIRLPOOL 4526ffa3eae6834aa97e8bf55dc90e25c6de5bf6f8345f853a5006a9c7bb1bcb8bd42bbe677d246443213de314400e8e17ef84ef4653d7e7c207151d5a03be33
+EBUILD pyalsaaudio-0.7-r2.ebuild 866 SHA256 5086d61556a3299aa7514f9259add429a5a18c266592b56ade22091e0d2b9a46 SHA512 8c5def961bd6f65d2b0e2a6d0e07bb76209a91839c92f74f31d7aa74ccc3703076539ff2171d26eaf2437fe43143a1c7ca4b7dcb47fe9084db829a72db17ea0a WHIRLPOOL 306f347d9b14fa4f4c9716e2589a4241da1a746713aa39b19d799ae01fd68cd1e96af192936f0da0635a364fed77e40510eedef49a3fb881acff4980cbd29bb1
+EBUILD pyalsaaudio-0.8.2.ebuild 1066 SHA256 12f82fcae2267f0dc6391471b48860776fccb6f69081e14423fef3709d144249 SHA512 a509a92889988503a9074e45d62fa73885141ea390c2730c752929f0657a7e4a3809a2c57f8b23a622661a2b6bbd16ad0bd556748732c8fdfb98dc14d4085eb2 WHIRLPOOL c3f3033e64df7966c6163ed9bbec991e809e0e9b599b938adbfe690f773d9ace3953a27519b83c7367843cfdc439d85d13ce32f383dbcdee6ba2a0ec735d52d0
+MISC ChangeLog 2840 SHA256 9aa6dcce86273dd0054de0012093129b509648983580937c8d6bdeb968fb0ca1 SHA512 9b0b2c142b776fb4067a71700de4f752e37ba21f5820491639f6a4264943f84582d110cd50cd5e5282300beb86e6097da18b739823fef1b5d574da87925216af WHIRLPOOL e0413b7067cc4cd84ae4cf78901be50558129006cca93e41e5998700d97efeec04b303e8c5763d64eac2ac698eba1a78ae1581795bb5d0e99f095a469ed2f299
+MISC ChangeLog-2015 5810 SHA256 18c1e5e3d0a1dd6d5da1fb41262523418554ad50648c30e81ddf553c98174dc7 SHA512 2f71f5c67edde33395631fd6bb206f167efe6332f12e3a12c72ec0d22a8e2e5aaa70561e224ba2590b688063dbae90ae7872120510e7d73c1404f8704722ff8f WHIRLPOOL 199d84b73f35a2f59209839b69ded53d21f9d8d36ab550d20d6aac36473996d3d25993ddd7bcf773851eb9dfcea973d0acebe01887bd51af2b99d7d91263abbf
+MISC metadata.xml 370 SHA256 9e714e20e8b9c247087d2b9bad32ecfe37ae67f535b8afda2316d6f8d62a4ac1 SHA512 8f63acae6a202a3d23c7b7c1777db4734de9e630630d679417ff2f9ea1c3595d855c6bb3d21f5ea6e889bc005fb500cdc95c2b7247725ebb14d0dc66dc8e4ff8 WHIRLPOOL ca8d22e6a434413b446df62433dc74af268e8f9c7e148caa0717c6f3763b044f8c284b6a7cce8bbd718889614842ba29e97e00e0030c7253aa98e6ca092ca2cc
diff --git a/dev-python/pyalsaaudio/metadata.xml b/dev-python/pyalsaaudio/metadata.xml
new file mode 100644
index 000000000000..ee4de466b8ce
--- /dev/null
+++ b/dev-python/pyalsaaudio/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyalsaaudio</remote-id>
+		<remote-id type="sourceforge">pyalsaaudio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild b/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild
new file mode 100644
index 000000000000..d189c982ed9a
--- /dev/null
+++ b/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python wrapper for the ALSA API"
+HOMEPAGE="http://www.sourceforge.net/projects/pyalsaaudio https://pypi.python.org/pypi/pyalsaaudio"
+SRC_URI="mirror://sourceforge/pyalsaaudio/${P}.tar.gz mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ~sparc x86"
+IUSE="doc"
+
+RDEPEND="media-libs/alsa-lib"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )"
+
+RESTRICT="test" # Direct access to ALSA, shouln't be used
+
+DOCS=( CHANGES README )
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	local EXAMPLES=( *test.py )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild b/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild
new file mode 100644
index 000000000000..35756563f285
--- /dev/null
+++ b/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild
@@ -0,0 +1,43 @@
+# 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,5,6}} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="A Python wrapper for the ALSA API"
+HOMEPAGE="http://www.sourceforge.net/projects/pyalsaaudio https://pypi.python.org/pypi/pyalsaaudio"
+SRC_URI="mirror://sourceforge/pyalsaaudio/${P}.tar.gz mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
+IUSE="doc"
+
+RDEPEND="media-libs/alsa-lib"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )"
+
+RESTRICT="test" # Direct access to ALSA, shouln't be used
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	"${PYTHON}" test.py -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	local EXAMPLES=( *test.py )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyamazon/Manifest b/dev-python/pyamazon/Manifest
new file mode 100644
index 000000000000..941c155ff98e
--- /dev/null
+++ b/dev-python/pyamazon/Manifest
@@ -0,0 +1,5 @@
+DIST pyamazon-0.65.zip 4715 SHA256 af185612ddb6a845a88991937f7df36cb2f161135ad2e8ba0369c5b012e066fb SHA512 91da5c766f3c8b24429f92c46d27509e6e7ea4f3fe945920774aad88ab7ccfa9418067d9919f14f7800c767a2c59da52452d9949e7cda46c2626c33db7bd9997 WHIRLPOOL 5a62eb667d08ca0535c6be1f88029ce482ffb91f0be707afb8e74df37e05c6d88ca37fba9760b133d9354a0e8354987bccfc724bc2067a2a3ee7e2c19fd120c3
+EBUILD pyamazon-0.65-r1.ebuild 620 SHA256 dee83732e592feff60659a3a10f937760234120a3db31582abf5e94b16ea7c99 SHA512 34a34e673366d760d80bcf3b432325d37caec96be917f157592408f2d0ddfab5c9204e7939bc7ebaa9dd40db3fbd3c2638902e5097201b5ae37888e36ce5f8bb WHIRLPOOL 0d84157b9689b0d77e12e37bbf0084c36604f8424ea1b0d51793318ce804fd7546fd8011065320df35d058ddfdc6547c953b0eef631d99c701a0110ace5afa4c
+MISC ChangeLog 2953 SHA256 628917eb3e723aa9024620fc3919d69cb6d42d645fea97ad11c6df992cd03237 SHA512 e4a0fe4c905829128ab002e17f0bcb3cb976c380844563b053ab82ec8555b13b5167372ceb76c131837213abad4d5acf69e3f3eb241124ca6b47a7bcca840261 WHIRLPOOL 530cd348fb34f2a2d3dc7e6f8e7e745890ce80253064502e2abfdfad283be0440cb36e8fb416c39576eb00cf7738fa01bddb42713dd704e3bf580f74dddf55fa
+MISC ChangeLog-2015 728 SHA256 5d4ab9f2a5131b75298eb39715acfeef3f05915f18ebaf866e41ff752a3aa3bf SHA512 5690102e42c72eeac85d707cd9c6e644ff6d417aa2c75e597b9d3b980ac077b26002a543375b3c5e11d4cd9c3dc6f28781b50de95c6f4eef3e2b80a69800132e WHIRLPOOL 1afe49b914d6ac80ffcfa2aa9ad480ce034f3dcb2e4802b44e1e24ab44ae01e3f826cd5d02b6e12efc8154c231137618f52a1deb90da7992cf6e38d1503e334e
+MISC metadata.xml 353 SHA256 bc8c169ee6d20b278e4fa97db9855aba0706b54053977d69e9dd925b0bbba6b6 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1 WHIRLPOOL 03d7dba44d17d9499312e3a29c1a0cea78c9b5276f788784d77e47d52b5caff6ac11acf985dc6d3f57fd13095bc7dcafec7e7503494c62ccea08d060ecebede6
diff --git a/dev-python/pyamazon/metadata.xml b/dev-python/pyamazon/metadata.xml
new file mode 100644
index 000000000000..d0913ee5d1cb
--- /dev/null
+++ b/dev-python/pyamazon/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="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyamazon/pyamazon-0.65-r1.ebuild b/dev-python/pyamazon/pyamazon-0.65-r1.ebuild
new file mode 100644
index 000000000000..cb966fe2c805
--- /dev/null
+++ b/dev-python/pyamazon/pyamazon-0.65-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1
+
+DESCRIPTION="A Python wrapper for the Amazon web API"
+HOMEPAGE="http://www.josephson.org/projects/pyamazon"
+SRC_URI="http://www.josephson.org/projects/${PN}/files/${P}.zip"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+	edos2unix amazon.py
+}
+
+src_install() {
+	python_domodule amazon.py
+}
diff --git a/dev-python/pyamf/Manifest b/dev-python/pyamf/Manifest
new file mode 100644
index 000000000000..eabe7333d49c
--- /dev/null
+++ b/dev-python/pyamf/Manifest
@@ -0,0 +1,5 @@
+DIST PyAMF-0.8.0.tar.gz 1651369 SHA256 0455d68983e3ee49f82721132074877428d58acec52f19697a88c03b5fba74e4 SHA512 1da66afbfb6cc32886a8680b5f610d17b3ad6e5cca338deb7f8d8c5e61f0f4e165b6602936590b4053a3bc98d0e36f898e5913e7d59d8444faf385fa036fd81e WHIRLPOOL 259c6164febcbf95b3755b4e05ba2325001ed52e19afb51349803ff7205fb2ca3bce41f1524f46f193748d0b939eb1230fc5a2ea7f9ae739fcb7c859c719066f
+EBUILD pyamf-0.8.0.ebuild 914 SHA256 b93b87e9f7d0bfa0bf88fc3cc809b1fe5b8742f5fd8f23745b0f8a26b8b0b24b SHA512 1ad627c222ab52b9765ca75ac88d54d9d50254bff3c68b50aca4fca6968796766ca04824fbad4abdb76494421e0247c187be0d4b28d96499cdadc4d476a10273 WHIRLPOOL 110216beb0fd3980acf20ce4ed5ea18c7fa3bab066c9255c258e75c044492b7c78e0f226db1c0063b632d9ea3074b5781a5f73b19a3f10a5485eb440dcffeae6
+MISC ChangeLog 3153 SHA256 836ab1672cb1405fa412fed59d7457d57dbad3d72b4b21a807f5bbf82e6e18f4 SHA512 335eaf6f519801d305e43c06f396571ea1f6ba798e2705ab386ab074560ab71696016e6e5935b3a4575d75dfbdd587c0ee85e23f4685d3f1e16210b1005773de WHIRLPOOL 9dbbfba4c9b280b7546f4cab97f73d47759a7b3540d32e20a62734e8d3be554102fb4d4d07189327ba4156406ea3e614e6a1c1f491dfd0527f9e5b2b019d5679
+MISC ChangeLog-2015 356 SHA256 750f1cbaa45981b22a49fba80c4587714e7ea93c23c171b140ec8b27ab4fde9d SHA512 4b8545f0486c5057589cf025cfa64d7ed011d97a33193428c23acc6f7abc83bc3c3744b21c14a224c678a0852d3c43de75259f905846497f278923ce17a7183e WHIRLPOOL ce3d8272c0e1148595deece8841b653d550bf8dbadb6e587af625467e8a2b18867c7b0ec0593cbb4319920dc9f8327ba2ec5e62aef833f3c4e96640593e577d7
+MISC metadata.xml 363 SHA256 38a4f80d3be044dde7797507df4c3e6655d7e1f1cc557c0817d4af6edb97e07d SHA512 0679bdd03e3e056c5687c0cd4269de8a09df3f51aae06a7a0440cb74333b9100cf97dd4070846df0ae03c8a86bff5d2b787c28ca56958efe2e6103c49b6742f3 WHIRLPOOL f133cb9706a67fe2b826164e37137e3179a6773955e623e9562dd2161f6a30f6bb946d0ab858aae6e42ae8da6486a88a859b2382c951529470567f248c3aa39f
diff --git a/dev-python/pyamf/metadata.xml b/dev-python/pyamf/metadata.xml
new file mode 100644
index 000000000000..f66c29721bba
--- /dev/null
+++ b/dev-python/pyamf/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hydralabs/pyamf</remote-id>
+		<remote-id type="pypi">PyAMF</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyamf/pyamf-0.8.0.ebuild b/dev-python/pyamf/pyamf-0.8.0.ebuild
new file mode 100644
index 000000000000..d9e9bd1664e9
--- /dev/null
+++ b/dev-python/pyamf/pyamf-0.8.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN=PyAMF
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Action Message Format (AMF) support for Python"
+HOMEPAGE="https://github.com/hydralabs/pyamf https://pypi.python.org/pypi/PyAMF"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/defusedxml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "PyAMF optionally integrates with several third-party libraries"
+		elog "and web frameworks. See the README or the Optional Extras section at"
+		elog "https://github.com/hydralabs/pyamf/blob/master/doc/install.rst"
+	fi
+}
diff --git a/dev-python/pyamg/Manifest b/dev-python/pyamg/Manifest
new file mode 100644
index 000000000000..e49c304b818d
--- /dev/null
+++ b/dev-python/pyamg/Manifest
@@ -0,0 +1,11 @@
+DIST pyamg-2.1.0.tar.gz 752632 SHA256 060a32ea8805b8e49e6d7304ab771efccd34d5e363a65f4f2cb33d85981225de SHA512 d2574ccb093e6c5bd214c4366ec70bfeae73449f98932a9a4435afb2d606b12a4d479411a88bcac4df500e33dbf635ae981620c584e688abc3f2cca6c6188d4d WHIRLPOOL ccf0817561eae43bb859aaedc9c7b4c94e338a2fc6817467bb5f162df3e63720030d3e36d55e72e9f7e613aab89cf4211f9c20fc97d566e3d7cdec988c9d9f6f
+DIST pyamg-2.2.1.tar.gz 753299 SHA256 e15d91b7650e24e9c70c21483244d59e42cdcb64bb8d6474c4cbd0ecca8d3b8f SHA512 b784626fbdfcfa338560763a38bc5ddde07ace5213225d4c876b09be93019e81e641630e88952aab20a6c4f859bf6260730459d247c35d531433df4ecd209248 WHIRLPOOL f48d131f86eae4b7f15abce84044767afc08708a1ad58b38f1af87278d7ecde7913abd3c17a81f1dcd14d0320d673598d89346303b98312f01c14906368e4b35
+DIST pyamg-3.0.2.tar.gz 759301 SHA256 71276353ab35bc5e7609f0abd8b92b6f65e2e6253c1e48028993df1652ce3d13 SHA512 3075e4e8f042e320c53fed5de7a5ccc7d9698e60cb2f830661468eabc9ba4ebbfff2b2d3254c72c5c376f0e45a59abce7b70a50f6f3a869a75096c33982d1313 WHIRLPOOL 300ef38591e14eada5329b488454309a34986b45020602cd4034fc7a1e08ea45a641cb3b83385ea45e00503e4d256872da4a4efac2f3c4eea3afa230ea9d4889
+DIST pyamg-3.2.1.tar.gz 765723 SHA256 8f0eef4e64323aada5beec1c4bb91d948d31a059e0cad2cfbb3d2a6c892c5141 SHA512 6be0dd068417389934ce97813321367920abf6f9f5e94ce2df8bd796edc797cedd492c9153b62466f7d68055a05821447dcf21578ccdfe3294766a49a9ac220e WHIRLPOOL 597cea1b31e57c837c435d87be5e71bf22ddfc85cac7f6fab76ced107ee2236fdf9355ff7c7f0c71102781deb1e16a9f2bd1553704ed6c091266ba0e4d40c362
+EBUILD pyamg-2.1.0.ebuild 690 SHA256 0518050ef7fcc12392982118d1fcaa8f73695360b4f7d085f98f4cb0f98e824f SHA512 fa60126d07bc00bc69f9cb8b0e80abe64c794bf5a804169e19807dacbc2f9c2e762a1e79390ba53b949c80f9fc67ccb42aa1e0856d6ffdf06e3acca4a4c14eb0 WHIRLPOOL 744cbd98ca0bf0fe7c0e1fe18e84c37f29987bf78c22959143a49f39c13f271f82b3d551750864271152d1533174bd3854746442ca24fd72ec1fc4c9f49cceb5
+EBUILD pyamg-2.2.1.ebuild 721 SHA256 e5fb52d79a2716c2e24db82e3477241af0407ccdaf38dfb0c3dc997cd8e3cbaa SHA512 2d67dd767c1c1cb76f53c48d7ce682a31428ddf11bdf666713c73567867c425542c9ba0dbd6a15ce3f8fa124bc196d87472a26264e1f4b7403345cb240807bdc WHIRLPOOL fbdfff51fccdfae2434507125dd5ae7277b09441dd3c2819721a33caee69ec5fd6c0357ca00ad475f413f3acbe1cd7826d7db530a77819b419ff4c7dbcc716d5
+EBUILD pyamg-3.0.2.ebuild 678 SHA256 ed51edfd1d0f151715f6810d8b6047a94dfcb75499f1316e28f95340ca027145 SHA512 34f6f62b30f82c4a6b348a15965f75825c9d5ef26df96286efc89de1e00f6677a2fb744e2025c7dc8f2311406696fe5d1842554f7de5fd92a4bf7a9ccb6a13d6 WHIRLPOOL c61c60b3b24c76f1f285d8a1664cb3396954b94a08433af08d3e46642acf4d8ae35f9e368f54ac65c56cf25431ccca56389d2f76041f68430b7c53f1a19f63b9
+EBUILD pyamg-3.2.1.ebuild 682 SHA256 98f9c24158f1be429a154b8cb4dbdb9dc78a6b76cf51d9b61790bbedf505e8c5 SHA512 4fde71568f3775d557967e3b0d76e607733225c5a33832fe70eb277920aa90607bff14fc2ea20b1ca4a87d3d9f75dd21dd1c182ebc8d056e48470abbe7d98520 WHIRLPOOL 1838f4c507af912ac48e95b9e9cea2c5f8aeda147aa4fe291cac59e3c7cf6814b0ad42e70ae645f1dbf41d40b60be0bb8e870c336e5b1d9b8af654b6d361e122
+MISC ChangeLog 3642 SHA256 78c1b6f9cda60ac59490a0314e14b0bf57916d30f6a818a687035f8389fc8c16 SHA512 329093853f897a75475ef3a542ca13a45f54319ae69d35095393b4d57057a6d8b45b34aa9d40cc5569e57628712a19f9c2b6693d8ba74bc970e28ab8e4f96173 WHIRLPOOL aca872c12eb8bbad883e9c6c128fec66f3028f56dac67072130486925eabb54ae9185170ab5540412647fa7071be9105f833926dfb18e11e685093d14e623488
+MISC ChangeLog-2015 2153 SHA256 c39ee06617954991a4f7cbe747d96041850df7c9e80c03087ab7dbb78d2c7133 SHA512 9959e4472795b0ada516818d06a3bef362ed1b5c3d04eb0e7814114045fc74fd534c0b05a2bfbbe85cbd981cb8555c755c805c11a090a85034d59d788abeaf39 WHIRLPOOL c95a6e05588199181eed8f60d91c82448c6abfdc4122a08a99e5174d8bbd7c32db0bffeaa2ad34701ab2daceba1eee83d97ea60378c4c29e4ddb5cce7a40f455
+MISC metadata.xml 660 SHA256 0809b7b473d1de86d881749bbf6e5ecf4d2ed27e5294c43bdd5039fc33bab39b SHA512 9900180bd0de0c9cb26205d2de5674f02405499778124c3fc21a3d3be6e7bd6602f4f619b0b983e95e30ff3f8f37e15ebfc66535db144f92e8f0c6d579e5e6f1 WHIRLPOOL b0ed098dabae7b1647d38aff60a463ae11cdf44e175c4b2f54153319b205ebcefaf35ce56f903be82f21bf5919b93624032277aa0a11cb22813b2e30f97a9125
diff --git a/dev-python/pyamg/metadata.xml b/dev-python/pyamg/metadata.xml
new file mode 100644
index 000000000000..186e3de7c9e6
--- /dev/null
+++ b/dev-python/pyamg/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  PyAMG is a library of Algebraic Multigrid (AMG) solvers with a
+  Python interface.
+  The predominant portion of PyAMG is written in Python with a smaller
+  amount of supporting C++ code for performance critical operations.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">pyamg</remote-id>
+    <remote-id type="github">pyamg/pyamg</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyamg/pyamg-2.1.0.ebuild b/dev-python/pyamg/pyamg-2.1.0.ebuild
new file mode 100644
index 000000000000..a7c66a91398c
--- /dev/null
+++ b/dev-python/pyamg/pyamg-2.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Algebraic multigrid solvers in Python"
+HOMEPAGE="http://pyamg.github.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="sci-libs/scipy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	distutils_install_for_testing
+	cd "${T}" || die # need to be away source directory
+	${EPYTHON} -c "
+import pyamg, sys
+r = pyamg.test(verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pyamg/pyamg-2.2.1.ebuild b/dev-python/pyamg/pyamg-2.2.1.ebuild
new file mode 100644
index 000000000000..d2c1e5159ab2
--- /dev/null
+++ b/dev-python/pyamg/pyamg-2.2.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Algebraic multigrid solvers in Python"
+HOMEPAGE="http://pyamg.github.io/ https://github.com/pyamg/pyamg"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	distutils_install_for_testing
+	cd "${T}" || die # need to be away source directory
+	"${PYTHON}" "${S}"/test_pyamg_install.py || die
+}
diff --git a/dev-python/pyamg/pyamg-3.0.2.ebuild b/dev-python/pyamg/pyamg-3.0.2.ebuild
new file mode 100644
index 000000000000..c3d77fab2019
--- /dev/null
+++ b/dev-python/pyamg/pyamg-3.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Algebraic multigrid solvers in Python"
+HOMEPAGE="http://pyamg.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	distutils_install_for_testing
+	cd "${T}" || die # need to be away source directory
+	nosetests --verbose pyamg || die
+}
diff --git a/dev-python/pyamg/pyamg-3.2.1.ebuild b/dev-python/pyamg/pyamg-3.2.1.ebuild
new file mode 100644
index 000000000000..14b7f193c6af
--- /dev/null
+++ b/dev-python/pyamg/pyamg-3.2.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Algebraic multigrid solvers in Python"
+HOMEPAGE="http://pyamg.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	distutils_install_for_testing
+	cd "${T}" || die # need to be away source directory
+	nosetests --verbose pyamg || die
+}
diff --git a/dev-python/pyao/Manifest b/dev-python/pyao/Manifest
new file mode 100644
index 000000000000..b9dd52404ef5
--- /dev/null
+++ b/dev-python/pyao/Manifest
@@ -0,0 +1,6 @@
+AUX pyao-0.82-new_api.patch 1626 SHA256 06f99b0a677d1575f3bd95e0ff8d195d64b4464f47ff652c0ff83c244b842a37 SHA512 f060f764208c0a7015c86eeee5010df78ac3c8eb1b925cc1c08fdedfccf94ec8ddbf635d8f9052034c1cf6ee73c816904e18c945c2e9afca7ffe78147b57d373 WHIRLPOOL 52455cb6fdec727300447a11b29580893625aa85672224bc193b3e5ca1cb5077b19b3078e4c352a37d5377970eb5c8973243d49db0218b44b9b74101883fead4
+DIST pyao-0.82.tar.gz 15399 SHA256 9a444518252f6d747e76a219e5efbc05b4e1742260a7419da9ddf93a519b30c5 SHA512 9c2349a2cfd55f64b8edaa6aaf9cecd4589dab3c6fd8a5cc8ad8c9512bf3595c85e0efaa56d6bb2f89410fbfa82081c8c2ea5ea68071e64afdbd8809f70b36cf WHIRLPOOL 16918ba2a683af4d1df860ff31c6f2a6a86d0fe1ef297ef09269219e3af860e22a8945ca5682f9063e9d4ff7a2a4ab3ed794eb355eb459c73b0290f145ebda8a
+EBUILD pyao-0.82-r3.ebuild 589 SHA256 7d7c6574a8e9e7c8d4cfb50c58dcd29fe4bc649e63197e2b488bac785fc4bb6f SHA512 329b4ab8a1b849cfbf2a54245f7e6ed5cd8e08736bfb0cb8d764872d201399a7b223f09903c73bd37148166885f55a0f88fea1182aca3fce1f5d13c0c5b565ed WHIRLPOOL 6dbed1896c2ee1cba0a5b95e6053badb0876563003f45ff0d765d942084d8027711af7fd8d3686cc381db823662e6672d0f046b31a1a748a36242fdcac4536b1
+MISC ChangeLog 2987 SHA256 ee849ee5fa57344cb630e9f17e8dd8303c5707add16312ed81255a0f8bec1b56 SHA512 59ae2b2c847dba83df9f702de5461ec1e6c3941b23ca1b081b667a229697677d6e6a03d5ec5f264cf0494e8fca747ad5cb051c1cdc5b7e2f55b192c40b12628e WHIRLPOOL b1e1cd541db944272465954f14b71af647a3914e4bcba6ab15832ed399381d525619ea9710fadee800b23de69a1eaef5fdf1c78488423550ad4bccb84f7e2c2e
+MISC ChangeLog-2015 2557 SHA256 2651bf634016c48325b4725279ca3206dc86d21a5794595725cbeed1d6ec0182 SHA512 0d2d0a62b6d3e87b1a76a3456b1f3c25b41d17d80ee9cf7d99ccf1bba18d94060f499b5517a0e3ab5d45f5bdbabb840c743236859fd77671f379992650542f74 WHIRLPOOL 88224c343394b8cf5585f149ee0affefdeec9c1149908acf46df54bed4d7eaa02e9e6e173f5386384a3e70d0869266f30bebad214ef5e2f9b1c5d5cc47180b5f
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/pyao/files/pyao-0.82-new_api.patch b/dev-python/pyao/files/pyao-0.82-new_api.patch
new file mode 100644
index 000000000000..7a77d0ab8a2e
--- /dev/null
+++ b/dev-python/pyao/files/pyao-0.82-new_api.patch
@@ -0,0 +1,71 @@
+http://bugs.gentoo.org/314627
+http://bugs.gentoo.org/257550
+
+--- src/aomodule.c
++++ src/aomodule.c
+@@ -4,7 +4,7 @@
+ static ao_option *
+ dict_to_options(PyObject *dict)
+ {
+-  int pos = 0;
++  Py_ssize_t pos = 0;
+   PyObject *key, *val;
+   ao_option *head = NULL;
+   int ret;
+@@ -71,7 +71,7 @@
+   
+   *overwrite = 0;
+ 
+-  if(PyArg_ParseTupleAndKeywords(args, kwargs, "s|llllO!sl", 
++  if(PyArg_ParseTupleAndKeywords(args, kwargs, "s|iiiiO!si", 
+ 				 (char **) driver_name_kwlist,
+ 				 &driver_name, 
+ 				 &format->bits, 
+@@ -84,7 +84,7 @@
+     *driver_id = ao_driver_id(driver_name);
+   } else {
+     PyErr_Clear();
+-    if(!(PyArg_ParseTupleAndKeywords(args, kwargs, "i|llllO!sl",
++    if(!(PyArg_ParseTupleAndKeywords(args, kwargs, "i|iiiiO!si",
+ 				     (char **) driver_id_kwlist,
+ 				     driver_id, 
+ 				     &format->bits, 
+@@ -141,8 +141,9 @@
+     return NULL;
+   }
+ 
+-  retobj = (ao_Object *) PyObject_NEW(ao_Object, &ao_Type);
++  retobj = (ao_Object *) PyObject_New(ao_Object, &ao_Type);
+   retobj->dev = dev;
++  retobj->driver_id = driver_id;
+   return (PyObject *) retobj;
+ }
+ 
+@@ -150,7 +151,7 @@
+ py_ao_dealloc(ao_Object *self)
+ {
+   ao_close(self->dev);
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ static PyObject *
+@@ -184,7 +185,7 @@
+ 
+     /* It's a method */
+     ao_Object *ao_self = (ao_Object *) self;
+-    info = ao_driver_info(ao_self->dev->driver_id);
++    info = ao_driver_info(ao_self->driver_id);
+ 
+   } else {
+ 
+--- src/aomodule.h
++++ src/aomodule.h
+@@ -9,6 +9,7 @@
+ typedef struct {
+   PyObject_HEAD
+   ao_device *dev;
++  uint32_t driver_id;
+ } ao_Object;
+ 
+ static PyObject *Py_aoError;
diff --git a/dev-python/pyao/metadata.xml b/dev-python/pyao/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/pyao/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyao/pyao-0.82-r3.ebuild b/dev-python/pyao/pyao-0.82-r3.ebuild
new file mode 100644
index 000000000000..85282e85eb17
--- /dev/null
+++ b/dev-python/pyao/pyao-0.82-r3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the libao library"
+HOMEPAGE="http://www.andrewchatham.com/pyogg/"
+SRC_URI="http://www.andrewchatham.com/pyogg/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ia64 ppc -sparc x86"
+IUSE=""
+
+DEPEND=">=media-libs/libao-1.0.0"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-new_api.patch )
+
+python_compile() {
+	"${PYTHON}" config_unix.py || die
+	distutils-r1_python_compile
+}
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
new file mode 100644
index 000000000000..4efe927ce6d0
--- /dev/null
+++ b/dev-python/pyasn1-modules/Manifest
@@ -0,0 +1,11 @@
+DIST pyasn1-modules-0.0.10.tar.gz 63543 SHA256 3d86ab0fa226a60897c8123c505b3d0712e042990f061237799639f6fa742bf3 SHA512 c20322a515e9916e0f8fa2e10972d0543a5ffb7f5d68a1b2fad3b4d7808bcb0bc98fc9e1f81349feabd1a55093aab73b8be4977c0ec34a45e0c3148037fd294a WHIRLPOOL 534d11e3dddc429b69b445df6ee440e967607831629e77f393a787bc9ed8b8b053ec38aa7dbca499fe6686561bdcfd14aafa0bbae198124dc01148faf09d7201
+DIST pyasn1-modules-0.0.5.tar.gz 38710 SHA256 be65f00ed28e30756f1ef39377cb382480a2368699179d646a84d79fe9349941 SHA512 b8fa41ed28087097502e8362022d819fe6914511c09f60f64f173c5674684fa8c45de23ce718700001d9f2d9b11adc17657d7cfd4cb24ea740b8d14eba8d8161 WHIRLPOOL c0df005909ffa4320f0ff7c580410ff2468cdd4002dfa5383e561c9c65721c0a72169e10c72fdc225b308d8fd1d5691dc519b6ee811c167ddc466ba1657e92c8
+DIST pyasn1-modules-0.0.8.tar.gz 38776 SHA256 10561934f1829bcc455c7ecdcdacdb4be5ffd3696f26f468eb6eb41e107f3837 SHA512 6040d4f83c6b00f7a0e6ba0e1264090d0fa96fc39e97b04d624721cef200b6cf4dabfe550127ade4edc181187ca1b4219fb46a95082a39e6291d0e2e08f36d78 WHIRLPOOL 45f3c2ad6e3320f5d7d1f3bef6f0168f2d85b3093f33438aaacc8251d6457d88c2db659d0912a76417196f5ed431c427fc9a47a8a6af5c490d97f931515d2884
+DIST pyasn1-modules-0.1.4.tar.gz 65552 SHA256 b07c17bdb34d6f64aafea6269f2e8fb306a57473f0f38d9a6ca389d6ab30ac4a SHA512 29467aa9fff15b7a7ef999389db01fe696350e29910397f0c867685689a9fa8e5df8128a7703ae0de095804ae20c3759b24656467cec8d086d07a1014ccf5d65 WHIRLPOOL 99ff13b3d4b5749360f9ae9845ccce228e6c1835b3cf692216c4dee49b0ab834ae11aef256e869b18a3517114707ae5eb1b13aaf068c1610bf5c5ad8102a0467
+EBUILD pyasn1-modules-0.0.10.ebuild 905 SHA256 273812cea7b5328fd898084d39e7b7a0b007a67b3b734322f87d4b202f79ae1b SHA512 a74fc0444a3f48ca1351a93396f2b36c16885fb95e839d068cb99c505db74b133c62d12cc12466f6702ee341e1d1251507c1587f51c3b678ec498d6820cdc2c6 WHIRLPOOL 00a6d1d3c6e7e70466bc7da089693246f051e2dfbb2bd6bf58c8cf40aedd4c79255957f26b10d58ed3471c6c84db2d503f8f9fb6811c4ef8f0552633d8d986e1
+EBUILD pyasn1-modules-0.0.5-r1.ebuild 911 SHA256 5bbd49c7d3899e7170d4fe1daa264becdf760a26ea9ddcc1d729e5151062c1fb SHA512 4df6d4a88f2323027c69cc0988786c2049342a379dbd92d57a6c5e9250eaf1fa88cc877bc3773acfc6a41381f58de2533315cafae7f1b0f9bfe2b8329a7f3289 WHIRLPOOL 3455e85ad9d5915fcb4cffda71637088a355a8cde7860251636b63f45c25fa93afda4ab9d35d51d65df07bfb01037286cb239d58edf045f842b67cf051543361
+EBUILD pyasn1-modules-0.0.8.ebuild 896 SHA256 7ab5b5e519d11142086ca3fc6940b95b40e6337df83e50be8e0fbcf7d4b17b49 SHA512 794ab52e8758117f716f69048a199be0c78bf6b5eaa55220aa2048e712ab59f05183d2f0dbfbb55d35a1095d33099b7e0b2a7985b47792937655fc61119d65f9 WHIRLPOOL 54037c2b40f73d108266e640f1873172f2e0efd95886df7d2c36337b3b94bdff3d0e1d394dfc61f5c8c5ef99f21382274f015c6433c499190ff478790eb5f7a9
+EBUILD pyasn1-modules-0.1.4.ebuild 905 SHA256 273812cea7b5328fd898084d39e7b7a0b007a67b3b734322f87d4b202f79ae1b SHA512 a74fc0444a3f48ca1351a93396f2b36c16885fb95e839d068cb99c505db74b133c62d12cc12466f6702ee341e1d1251507c1587f51c3b678ec498d6820cdc2c6 WHIRLPOOL 00a6d1d3c6e7e70466bc7da089693246f051e2dfbb2bd6bf58c8cf40aedd4c79255957f26b10d58ed3471c6c84db2d503f8f9fb6811c4ef8f0552633d8d986e1
+MISC ChangeLog 4565 SHA256 f68cfb0956519ba928e727db77c13175bc0ba0f57d6d6e5e13d274be8684471e SHA512 981b55eb3aed4f15445ee845ad78d04004769a432990ed1848c01092e45efbe797745abf4c0dfa93cbe183a1b4486ff8739e40fe194f78595158bb699649c5bb WHIRLPOOL dd968554889069fed7f2ee48f197442e7d485389b979934f5085a26c7e61012ad6a532bef7b91d87f60809d6a3c8336937a5e03269993bf6c351123d9e87c0ba
+MISC ChangeLog-2015 5771 SHA256 c16802a5987f93b65ec963e3b793247a294c409acae724f4bf239e2fc44420a4 SHA512 0655ad58bd3c0ccfb05fa08c38c2480762902c679149316798facdb8f0b4a2df721fb39a841e4836bf0ed96120c6801b6ac52db9e483d2edae2627106837830c WHIRLPOOL b0a9b405304e066ec93f339b0275de746c69cb4be9177726ffb116b7f7bf6067fbbee83f8d364d8ea7fba727b56aad05836f23ed9832c732c2a63d6b46c61b46
+MISC metadata.xml 380 SHA256 e30d5a3784eecd2a9e6f0506e7ac120108470bed9e6ada536a1aa7cc16ec211a SHA512 0122261838e5789fc995c1e07fd2f8d59fb470d2f525126adb971d7e991e7b7cd76c3fe37ce21949d6ec3fb79af8ccc2d5ce02aab4afda842809916a5c609f15 WHIRLPOOL 0fae07ab9522c40951ffd778a1b85b19032186cd4482543835b0a13b48b850ce8018f88725420d2524a3fe5c9fa9d3cd3508aab337e377a5b8ba4a57710d61a0
diff --git a/dev-python/pyasn1-modules/metadata.xml b/dev-python/pyasn1-modules/metadata.xml
new file mode 100644
index 000000000000..c99bbe94f97f
--- /dev/null
+++ b/dev-python/pyasn1-modules/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pyasn1-modules</remote-id>
+    <remote-id type="sourceforge">pyasn1</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild
new file mode 100644
index 000000000000..e417c99978f8
--- /dev/null
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild
@@ -0,0 +1,37 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="pyasn1 modules"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1-modules"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	echoit() { echo "$@"; "$@"; }
+	local exit_status=0 test
+	cd tools || die
+	for test in ../test/*.sh; do
+		echoit sh "${test}" || exit_status=1
+	done
+	return ${exit_status}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	insinto /usr/share/${P}
+	doins -r tools
+}
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild
new file mode 100644
index 000000000000..2fc7e8c146be
--- /dev/null
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="pyasn1 modules"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1-modules"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+RDEPEND="dev-python/pyasn1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	echoit() { echo "$@"; "$@"; }
+	local exit_status=0 test
+	for test in test/*.sh; do
+		PATH="${S}/tools:${PATH}" \
+			echoit sh "${test}" || exit_status=1
+	done
+	return ${exit_status}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	insinto /usr/share/doc/${PF}/tools
+	doins tools/* || die "doins failed"
+}
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
new file mode 100644
index 000000000000..8a5076c34ae0
--- /dev/null
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
@@ -0,0 +1,37 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="pyasn1 modules"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1-modules"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	echoit() { echo "$@"; "$@"; }
+	local exit_status=0 test
+	cd tools || die
+	for test in ../test/*.sh; do
+		echoit sh "${test}" || exit_status=1
+	done
+	return ${exit_status}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	insinto /usr/share/${P}
+	doins -r tools
+}
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild
new file mode 100644
index 000000000000..e417c99978f8
--- /dev/null
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild
@@ -0,0 +1,37 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="pyasn1 modules"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1-modules"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	echoit() { echo "$@"; "$@"; }
+	local exit_status=0 test
+	cd tools || die
+	for test in ../test/*.sh; do
+		echoit sh "${test}" || exit_status=1
+	done
+	return ${exit_status}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	insinto /usr/share/${P}
+	doins -r tools
+}
diff --git a/dev-python/pyasn1/Manifest b/dev-python/pyasn1/Manifest
new file mode 100644
index 000000000000..61991f23f0bc
--- /dev/null
+++ b/dev-python/pyasn1/Manifest
@@ -0,0 +1,9 @@
+DIST pyasn1-0.1.8.tar.gz 75676 SHA256 5d33be7ca0ec5997d76d29ea4c33b65c00c0231407fff975199d7f40530b8347 SHA512 0a0b9b8018ae80a0e0d84ea3a4f217951bf42dce909a354c97890d4b4fc4f49b19d9d0757103ac9002c17c6c622c8e8d66e1f8242b8545a7da455ef3583acdfa WHIRLPOOL db46e06ef9a6b5858c07f1c154657f998b509c457395b4f2e6286ea90e1b16346e24d92a8d666b5db4216e35129f2d6be13c2fc11aae2d9936163bff3b1400eb
+DIST pyasn1-0.2.3.tar.gz 100099 SHA256 66c70011074ed6f5a74591591a9f0bed4bc2c2a45baef60f8dcc89ab5da11b9d SHA512 c55b95c1995f2fc36ec28f35837ca456a2fac06e90edc6491a3335ae949e4eacbbeb14f6289a17e994b49d4dc60870bba3e79344c44496d5547c38ab1ef183ab WHIRLPOOL d74142002096d49914e8b15a425764a08c02a43326b9ca1511f4e316fd025c0ce9333c748e010794fe788416b38aa7a1e3460c346524200ba4bd3836297d405c
+DIST pyasn1-0.3.6.tar.gz 117506 SHA256 3a263cea3e15f459b1e97b1f7d3840b890eeb29eddaf480203a2929a651c5968 SHA512 0857b957bd29f999858869e02ee84ec86aae6362229da14b47f4c54f1358632d161e417325e0e2cec8a3fa293f52156d703481dac872e7f323e317cf14197dce WHIRLPOOL 84fe36d176482ea296e9434ae17faf6b1bc58667fb7102855e51c8427da81777e80ad3306e50d35ef95b03f15460ff1cf38c83e5adbe436f5588778a023f57f7
+EBUILD pyasn1-0.1.8.ebuild 805 SHA256 429a6b27d6caab3f0e60635afc74b2a317bed8e4b679da0e93df6c5648bdbbec SHA512 29cc6bb41c6198b3b5811198c6645181643eed30e4442791908a091fbfa2b5368e47cf6ba67b3299a8022ecccee23e3f8f76aa300d3440671f00d6498c8e3096 WHIRLPOOL 3b4a67fe6dcb613f9802bece21f032a844cdcbce162fb3ad481f16227fac6da29be39274f373eae3e19eff9742f8aff7a107f39f055c3eba4f1a9f9d902f9eef
+EBUILD pyasn1-0.2.3.ebuild 1136 SHA256 411c5c9ca102d5d9d54ec8f0dcd6bd76ad51c8edc83fbed8856a96794d068d67 SHA512 140f4c42455d4660601b31bd93532d579428de3fd47b9c9638d88a0b92ab1fb9756f4106683a114287e14a9eb9bd9705909a3a597d02712a6cb4ff4c3d9ff4d4 WHIRLPOOL 0df4c64b1a8b217777f505f9586d1548262831a307432dbd5b18ad12a597ed0349a512372e11f169acc19f2501aba4015da7a4d91e29fbcbb24c124359c6b230
+EBUILD pyasn1-0.3.6.ebuild 1150 SHA256 10588bf7f520821c955d3a93bf33b96b2e284719d3e94e5ca409e9537e066d4c SHA512 8bd8d279d3ab025c6a771a2dcf6613f492b38e952ccc97c21cec839c603c0eb64d077485b1dacfd52f0d1fc2a9085fc306e87d2306d53c60ff67b66dd5a313a2 WHIRLPOOL 686ab93ad23f3d1dc73697ad95a07394bef46d9fb63e1c27f16e463951a6329e5b373c860624aa2a1e537e1ae66eea354b8dc5f9f1aca21baa0ca84d58fb4c32
+MISC ChangeLog 5169 SHA256 9c7ef63dd9e44815620d608cce12928d3c185944fdf1c56a508b602b01a4b038 SHA512 23d850c9e001cadeaca2f27427b19fd381c1d2723354b37920955335f5a10cf5e949ca773adafc27aa51442509cc0429d96cdde978f0412fde318735b209a00c WHIRLPOOL b60f1053114ed21d63c2624e5826fa0e23752d08c402024c75318302e71724bc57fbdbf7510a0715e253287d71d5ce33a4986fa8416b59ef194f6438ce5c08c4
+MISC ChangeLog-2015 9675 SHA256 db709028021248977d7524d1647d1bcc31b8bb242af513370b6f71e8cc7fb38b SHA512 3b60e492cd4709fc891735ae8de092652b8b4db1a18979f7b5d97d40bf69d787ad1125e3007221c4e557b3162e0044cc3e1a0d5ce67646f20a8677a08e789384 WHIRLPOOL 79739a03f231dbd594e43dc43e8c8023a07f8fea73614fdaa4ac9171ece427737e8d8d4fd2096d9774c1bfddfd4afe76c63748f6f981a8ca570be52f084710aa
+MISC metadata.xml 428 SHA256 23d7bbb740f55db76a8699083c18b6ec51e2ec192f12a4bd12bd9217369e3ef1 SHA512 b2d4bf181128f2724c450387fd51d971f85fc25ca293b8ebe4029e0559f660a5f5d207db40d683b8d80a6233986a885069ae4e7d82507901151a71f19c6a75ee WHIRLPOOL 6f91d41f3a80cf14739ed93c3335bd66f47d5a872a89b7de123a4e7adfb0017ad0994050be9aed50c9d18ad055a8ee881a80752d39fb393da8629d14bf45bc3e
diff --git a/dev-python/pyasn1/metadata.xml b/dev-python/pyasn1/metadata.xml
new file mode 100644
index 000000000000..570a2abfe911
--- /dev/null
+++ b/dev-python/pyasn1/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pyasn1</remote-id>
+    <remote-id type="sourceforge">pyasn1</remote-id>
+    <remote-id type="github">etingof/pyasn1</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyasn1/pyasn1-0.1.8.ebuild b/dev-python/pyasn1/pyasn1-0.1.8.ebuild
new file mode 100644
index 000000000000..2c39557f9439
--- /dev/null
+++ b/dev-python/pyasn1/pyasn1-0.1.8.ebuild
@@ -0,0 +1,31 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ASN.1 library for Python"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" test/suite.py || die "Tests fail with ${EPYTHON}"
+}
+
+src_install() {
+	local HTML_DOCS=( doc/pyasn1-tutorial.html )
+	use doc && HTML_DOCS=( doc/. )
+
+	distutils-r1_src_install
+}
diff --git a/dev-python/pyasn1/pyasn1-0.2.3.ebuild b/dev-python/pyasn1/pyasn1-0.2.3.ebuild
new file mode 100644
index 000000000000..13d9acacaff2
--- /dev/null
+++ b/dev-python/pyasn1/pyasn1-0.2.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ASN.1 library for Python"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1"
+SRC_URI="https://github.com/etingof/pyasn1/archive/${PV}.tar.gz -> ${P}.tar.gz"
+# The required doc/source/conf.py file is missing from the pypi:
+# https://github.com/etingof/pyasn1/issues/35
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test || die "Tests fail with ${EPYTHON}"
+}
+
+src_compile() {
+	if use doc; then
+		python_setup
+		esetup.py build_sphinx
+	fi
+	distutils-r1_src_compile
+}
+
+src_install() {
+	local HTML_DOCS
+	use doc && HTML_DOCS=( build/sphinx/html/. )
+
+	distutils-r1_src_install
+}
diff --git a/dev-python/pyasn1/pyasn1-0.3.6.ebuild b/dev-python/pyasn1/pyasn1-0.3.6.ebuild
new file mode 100644
index 000000000000..386b3f4ad63b
--- /dev/null
+++ b/dev-python/pyasn1/pyasn1-0.3.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ASN.1 library for Python"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1"
+SRC_URI="https://github.com/etingof/pyasn1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+# The required doc/source/conf.py file is missing from the pypi:
+# https://github.com/etingof/pyasn1/issues/35
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test || die "Tests fail with ${EPYTHON}"
+}
+
+src_compile() {
+	if use doc; then
+		python_setup
+		esetup.py build_sphinx
+	fi
+	distutils-r1_src_compile
+}
+
+src_install() {
+	local HTML_DOCS
+	use doc && HTML_DOCS=( build/sphinx/html/. )
+
+	distutils-r1_src_install
+}
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
new file mode 100644
index 000000000000..bb490760b0de
--- /dev/null
+++ b/dev-python/pyatspi/Manifest
@@ -0,0 +1,8 @@
+AUX pyatspi-2.6.0-examples-python3.patch 791 SHA256 df0236bc825633d3188d6dfc86e61d485eeeefa8c5de4621cc49f7b26b629e13 SHA512 7171f77080fed4ef235d1d3380821939d5a41e919b8509db8dcbe211d63b7b390e66389152c7275128cc8372c2a7fd1bdfaf179fc93b8fa62ed76a6edffd11ed WHIRLPOOL 4e5b66939709da3d4de6171b062ec4c564275d8193c52fb1a9beb8471d2fc43ad23fcd8e914f2c2cc3b7cfd59dd1fd9764b04341081828806a44aae22cd876a5
+DIST pyatspi-2.20.3.tar.xz 297368 SHA256 628f19cc5790b02ae6ec8580902683520087fba503c06c71257c572108cb5850 SHA512 87f9dccb0be1b85ed850abaf28270c2fd5e52a43dcd94e452f650d6aea8a52bb59d9b9e9d4312bd0fe88d549812c1ddbbceb05955687134613ecd6e1b7af4ace WHIRLPOOL 5468c5cc1fc12fad84c10184014167f69b322757eaaa27e4abc25d376be27a6664a53295d66f0909923920316a4dc8c0d018165d5f5b0e382c84dc9e4252714d
+DIST pyatspi-2.24.0.tar.xz 298228 SHA256 e7ef47a5d387fdc64a01722ef2bcced54c4d6b225fbe34867189e1f88ff0a692 SHA512 ea0c3e5a5a417c4d494cfe33ccfcca1996f417e51f5ccd3508372a0df636fb186b9940d7832681af9b353aa50a9aabd64c5477fdabbc5016794a502396b3d67a WHIRLPOOL e39152ebe90a2e5461bbc663910821306a18a524a687cf72985bcb3601ca428ce85aa05cc6e1b9e30992eee64c1c9e434c5a039f8f6b18d7f3d133c51168a33d
+EBUILD pyatspi-2.20.3.ebuild 1298 SHA256 b6d7b8bea1a5505069e87764648d6571f47a8f77f2577673f4713c34bf4ae778 SHA512 09575eea251c648dbc382c7afa8c6af027decb59857d7b2e14f9ee73cc00b1ec42be3b370b6a230a87423a4a732d078cc7f638a588f56f5318eff858ba296921 WHIRLPOOL 941b200d32b65cc529d1999d7d65d97c5556ee3a8c18e4d1ea067d3d892c7dc74bf993555ab4feea0e5fda98b1d7bde22546f5969a67e90a3a1c8d3f638bc7b8
+EBUILD pyatspi-2.24.0.ebuild 1300 SHA256 f9ec34d175f1d1d30db69430edfa34d7764b5e1dce711ede8ab17476acd284ec SHA512 256c66906ffdbe3c9015707f643bef43df1809fd689423c6e3aa6536834640cd6da6b526665947cb7a63eea49e7d2678a33c63bded3fc4ba3167440c5857bd18 WHIRLPOOL 1031bd633536e6778229ae910b17198e4780fd5570ee2c200e72902ffedae59efc84b01967f9cf2148090864ba9dfdf0072abbc76ac4cb8cbd8b20e4cf2529b7
+MISC ChangeLog 6941 SHA256 585544d4072d0ab50b0e91c79d82297d59bb795dd78ae35d11c97f83e4aadbeb SHA512 fcd3dc9b93572baa5e323fba48ecc98d852d83f6c6195401a7d3c360af70134e191210a1a4a6e07aea0f5c1fc19c34234358e8c839ef42011b1b54871a28c024 WHIRLPOOL 0015bd0d03ffc8151ce166af8a33c92ca5b53786c95aafadb9c998641de185d9cf8da62ca3e5623a8f1140dae3296ad5d72498ada5c506669ae9c141c6aad845
+MISC ChangeLog-2015 7970 SHA256 850fd8408e179244af66380bc837ec7df7b5319c5dbc39e8163be55170a19bd2 SHA512 0fb7d5b53848be015acef8e461e4b0e2d8a1697b7f4c3fc9ef4825be11f05dbc9925f032821f07caf0ab0807e0cbccc8152350016e7bfdd36749a9553a048d87 WHIRLPOOL f8d559bb023281b4e2c9c9a0e360bd4026c550c25cd101460d91398cb3fa95c6d8383d141cfb2b378d3885cef443b577b20619e2cf19f4d0bf0477ab86b4ab0e
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/dev-python/pyatspi/files/pyatspi-2.6.0-examples-python3.patch b/dev-python/pyatspi/files/pyatspi-2.6.0-examples-python3.patch
new file mode 100644
index 000000000000..423cd644073c
--- /dev/null
+++ b/dev-python/pyatspi/files/pyatspi-2.6.0-examples-python3.patch
@@ -0,0 +1,26 @@
+From 4f10a696002179082e41568b5109400ac8478a96 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 10 Dec 2012 04:52:03 -0500
+Subject: [PATCH] examples: support python2 and python3 syntax
+
+https://bugzilla.gnome.org/show_bug.cgi?id=689957
+---
+ examples/magFocusTracker.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/examples/magFocusTracker.py b/examples/magFocusTracker.py
+index 47efe00..7ca3b67 100755
+--- a/examples/magFocusTracker.py
++++ b/examples/magFocusTracker.py
+@@ -282,7 +282,7 @@ def main():
+             startTracking()
+         pyatspi.Registry.start()
+     else:
+-        print 'Magnification service not available. Exiting.'
++        print('Magnification service not available. Exiting.')
+ 
+     return 0
+ 
+-- 
+1.8.0
+
diff --git a/dev-python/pyatspi/metadata.xml b/dev-python/pyatspi/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/dev-python/pyatspi/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="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyatspi/pyatspi-2.20.3.ebuild b/dev-python/pyatspi/pyatspi-2.20.3.ebuild
new file mode 100644
index 000000000000..b186e079ea36
--- /dev/null
+++ b/dev-python/pyatspi/pyatspi-2.20.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Python binding to at-spi library"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+# Note: only some of the tests are GPL-licensed, everything else is LGPL
+LICENSE="LGPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+IUSE="" # test
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/atk-2.11.2
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/dbus-1
+	>=app-accessibility/at-spi2-core-2.20.2[introspection]
+	!<gnome-extra/at-spi-1.32.0-r1
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# https://bugzilla.gnome.org/show_bug.cgi?id=689957
+	"${FILESDIR}/${PN}-2.6.0-examples-python3.patch"
+)
+
+src_prepare() {
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure --disable-tests
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install
+
+	docinto examples
+	dodoc examples/*.py
+}
diff --git a/dev-python/pyatspi/pyatspi-2.24.0.ebuild b/dev-python/pyatspi/pyatspi-2.24.0.ebuild
new file mode 100644
index 000000000000..48ca4d41ff72
--- /dev/null
+++ b/dev-python/pyatspi/pyatspi-2.24.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Python binding to at-spi library"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+# Note: only some of the tests are GPL-licensed, everything else is LGPL
+LICENSE="LGPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="" # test
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/atk-2.11.2
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/dbus-1
+	>=app-accessibility/at-spi2-core-2.20.2[introspection]
+	!<gnome-extra/at-spi-1.32.0-r1
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# https://bugzilla.gnome.org/show_bug.cgi?id=689957
+	"${FILESDIR}/${PN}-2.6.0-examples-python3.patch"
+)
+
+src_prepare() {
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure --disable-tests
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install
+
+	docinto examples
+	dodoc examples/*.py
+}
diff --git a/dev-python/pyaudio/Manifest b/dev-python/pyaudio/Manifest
new file mode 100644
index 000000000000..9a42dc8b8390
--- /dev/null
+++ b/dev-python/pyaudio/Manifest
@@ -0,0 +1,7 @@
+DIST PyAudio-0.2.11.tar.gz 37428 SHA256 93bfde30e0b64e63a46f2fd77e85c41fd51182a4a3413d9edfaf9ffaa26efb74 SHA512 64db5542ee60837c9b07677e146fc7b060ff47c8b1c04cbb575bce79dd3ed4776c201e169ff2860f27dbe9e00a77046ba0cb925b55f7c546f8de46c6df68954e WHIRLPOOL 6d67dd7d7205cefcea3c352851818d30ddef0414cf14d69d895e9ac7ad8dea4c64142e11eeccd61fcb184e0dc4f8d86ad8cdf6e99656c78578af75ca99779ce9
+DIST pyaudio-0.2.8.tar.gz 235900 SHA256 4f85367cf79657616684487037957ac38582ecc5389b89420fe61d901b719551 SHA512 af85291932809ceb966d1ace3c866cb6ac7e039b936ca35be668d4a3dc78c53e516070902d35fa6c829b37db376b8b512dc926ff1079e039809cae067be93069 WHIRLPOOL dae98752b6b885ce6f5247b9914fc9fcfd6264030c5f57c7276c6468de79ffdf30ea6196325ab0ff34b6997157ab97f6068ffa6ee27e137bab96c1589723550d
+EBUILD pyaudio-0.2.11.ebuild 723 SHA256 55fbba336b98dd33f1781e88beb2a88a8b97887d6b33d0c0ceee4aa3d44b5a8e SHA512 3fb9e455b25ec340de58e42be335bad2deb8469c6df824334510db1109cd1fdd13ef4282ae164d674de66fc98fc3d005ad5ae582ee8d912401264ddf5528e16b WHIRLPOOL 4e2460050bf44eac8880dae68da9bb1572d198de9c29371a7b37fab7cd064ce20c09b4191d8b7dbdc9d5a630eb20e6878fe3bb5bccdbb64a3ac44467020ddb2f
+EBUILD pyaudio-0.2.8.ebuild 579 SHA256 c43aa324be14949557f8589acef77c0fde0ab2adc8bcfd5d448c5dddd76bf1dc SHA512 c83eddb74edd3d288c512557204036ae75f73afcc5b6d93dd4fa224cc9c8b9376d480d685179fad23311ed82658ef3ad0aeee8411ffeb32fe2ef540ce3ebcdc0 WHIRLPOOL 65f9f8439c460d3c0bf12007e6208916aed4d91b99f0ae2217c73e5af25bbd28b8e1d33c50808c533a839732481bdd37256e1ebe0ba2e5480af9b976a7effcf4
+MISC ChangeLog 2727 SHA256 2b66a3b8121b1b246dd760fb14a277518403ef7d694370824cf2fc4a34ec1cd9 SHA512 a7a52798f48d0fb0c3392fb961d8ce0e7f97955fcfc5259d5c82156d880cecb8c559703ecb3d55b986eccdf7826a0f3036813e4ac67fa062c606a3bc0f0ab261 WHIRLPOOL 380b73315ecfa12c02982a9713ca4f64f2a687e7dd6beb065172d1ffda4a3d56eb983f3cba8f4dfe3e8dac178f0f30f945480c212a917039196aeda2437ee641
+MISC ChangeLog-2015 2683 SHA256 9a64c7632bfc33461ce273a0c56d5e0a2469e0300dda940d8e361dcdae524bfe SHA512 cb6134b43933c4611211a4c153341d54458300ce1ae45acfdb574c587b3d4de2101300d77db95ff02435ddf71916c4e9a3b3aa2cfa5d7582ff6f0e7d2f02fe0d WHIRLPOOL d24b8042dd6a738a79301c1835530aea17e097cf605b52c04ad7322105843c9cf16174f29eefa22631b77f4793fbd2745b6fa95c0fe86632b079eea3cc2862a9
+MISC metadata.xml 472 SHA256 9fd4ff5bcff33ab9733b8f9d82ce2a390ee430ecba3469171d7b8ca52bcd9602 SHA512 ac14049f5d6ef3c9607bc6457cdd5a1b469187fb01490ec6e6611f5a36d2437c44a1ee65372ab038bf5f3aa4ef572f8a4be284c8c941a89dbddc80c01e9a8c52 WHIRLPOOL 97674cb572744983f1a4ffccbc922f781b8204d06d837d9c7bbdc6bddd6ba8fd3fd40fa0dd89afbfb6a63477cf64a878421130ab2dfc84f537235284f8497f04
diff --git a/dev-python/pyaudio/metadata.xml b/dev-python/pyaudio/metadata.xml
new file mode 100644
index 000000000000..6bc91e11e664
--- /dev/null
+++ b/dev-python/pyaudio/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		PyAudio provides Python bindings for PortAudio (media-libs/portaudio),
+		the cross-platform audio I/O library.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">PyAudio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyaudio/pyaudio-0.2.11.ebuild b/dev-python/pyaudio/pyaudio-0.2.11.ebuild
new file mode 100644
index 000000000000..dbfd95fb99f1
--- /dev/null
+++ b/dev-python/pyaudio/pyaudio-0.2.11.ebuild
@@ -0,0 +1,36 @@
+# 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,5,6}} )
+
+inherit distutils-r1
+
+MY_PN="PyAudio"
+
+DESCRIPTION="Python bindings for PortAudio"
+HOMEPAGE="http://people.csail.mit.edu/hubert/pyaudio/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+RDEPEND="media-libs/portaudio"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )"
+
+S=${WORKDIR}/PyAudio-${PV}
+
+src_compile() {
+	distutils-r1_src_compile
+	use doc && emake docs
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyaudio/pyaudio-0.2.8.ebuild b/dev-python/pyaudio/pyaudio-0.2.8.ebuild
new file mode 100644
index 000000000000..efea9bef9936
--- /dev/null
+++ b/dev-python/pyaudio/pyaudio-0.2.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for PortAudio"
+HOMEPAGE="http://people.csail.mit.edu/hubert/pyaudio/"
+SRC_URI="http://people.csail.mit.edu/hubert/pyaudio/packages/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+DEPEND="media-libs/portaudio"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/PyAudio-${PV}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyavm/Manifest b/dev-python/pyavm/Manifest
new file mode 100644
index 000000000000..1e98a63b21d8
--- /dev/null
+++ b/dev-python/pyavm/Manifest
@@ -0,0 +1,5 @@
+DIST PyAVM-0.9.4.tar.gz 221928 SHA256 f298b864e5bc101ecbb0e46252e95e18a180ac28ba6ec362e63c12a7e914e386 SHA512 95b10a57206dcace2941342015155ad46c6d71fd11963e5516d766067d2074d2302b60d6455b2194034beb6668c2a989cbf88908871d2bacd28ba6433a83a89e WHIRLPOOL 2b04bf7ccf67b681ad7d52ae43bff75e152493741cbd252b6a5ed2c51766deaf30b909df161b3dbf4bbc8015e95b758cbe5fa866f9a8d18ae53e58b671d9a55a
+EBUILD pyavm-0.9.4.ebuild 740 SHA256 c728800898a153b47a2edca8e3f5fc3db8741ef81c878308f8cdecf11d7fbb28 SHA512 715c770b3ed640910d15f9eb78267c1452a15f82c0abb016efdbe09b18e2d0c2e2bc1c22651f5600b8f53fd89f3a32f42c28090e5a8050b396cbeb9685a50fc6 WHIRLPOOL 3fb05b7bb3f5ebe846ba6ba538cbcb7af6f095bdf486031d8620d3ce843b115044083efb4638718472c66420b9b12148cd3b66fa66f2d28098008c6bb8db19e9
+MISC ChangeLog 2756 SHA256 3e8a783492df52eff225ad3172bd7485ca60f8063b76fb32f6cd0e1d79f55b74 SHA512 46efdcdb7d1417d3e6e30804e7beaacb0a196cd39542ef0172489097020f880682248a05ece5006f8e97ca70581288b80d7055f40a5c31d3c3f6f29cdfd0a653 WHIRLPOOL 4ef26d90680fb687aa5cfa4b561d9de9b5053566bc6504a9251f705f1fc25522be0d8021d4542d8762f471eb0bfd94e946ce4e7c68d538657b234bf240058ac8
+MISC ChangeLog-2015 536 SHA256 79a5a190c5f657e4e68c5b6916313696add8ea4badf6da492ed828b5080e8a4e SHA512 1b30ab27b2bcf55b641fbc24262b906a84084dcaf5e7f6f4102243eab5b121a8e4102dd43482cb2935f6b63deb1bffe2a7c28f893b8fc4af3254ad68596075d8 WHIRLPOOL 101ecc06db913747ef935ff165132c2af61027fd23a6108b0f851baf5bb40e6297c7aa035b3aae5eb7dd05812bd027c58decaf0bfa3f40fd72f6ce7f68ae3221
+MISC metadata.xml 500 SHA256 0622e8714d749969cd0240ea67ba7f5d98abf577c8629922b98905834bef20a7 SHA512 65a5ae16d81a63ee6823dd9683d25146c1f92d05d00848dfb097d03bca9ce9d93f4610d4b9e3d7381fca29cb1af32c11a96930b0fe38dd11b4aeaa4bc71b0bbd WHIRLPOOL 5d67995e9162a9cfbaf8253808b2ddc354a58234619020872b66eaf0f68d12a1584e520921cbc05040472f933783640d33df23064bb8c168b0fc327a7b05ebca
diff --git a/dev-python/pyavm/metadata.xml b/dev-python/pyavm/metadata.xml
new file mode 100644
index 000000000000..963a3cab357a
--- /dev/null
+++ b/dev-python/pyavm/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>sci-astronomy@gentoo.org</email>
+  <name>Gentoo Astronomy Project</name>
+</maintainer>
+<longdescription lang="en">
+  PyAVM is a module to represent, read, and write metadata following
+  the Astronomy Visualization Metadata (AVM) standard.
+</longdescription>
+<upstream>
+  <remote-id type="pypi">PyAVM</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyavm/pyavm-0.9.4.ebuild b/dev-python/pyavm/pyavm-0.9.4.ebuild
new file mode 100644
index 000000000000..02c42573b380
--- /dev/null
+++ b/dev-python/pyavm/pyavm-0.9.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+MYPN=PyAVM
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="Python module for Astronomy Visualization Metadata i/o"
+HOMEPAGE="http://astrofrog.github.io/pyavm/"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/astropy[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/astropy[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MYP}"
+
+python_test() {
+	py.test || die "tests for ${EPYTHON} failed"
+}
diff --git a/dev-python/pybloomfiltermmap/Manifest b/dev-python/pybloomfiltermmap/Manifest
new file mode 100644
index 000000000000..7cd5a75be679
--- /dev/null
+++ b/dev-python/pybloomfiltermmap/Manifest
@@ -0,0 +1,9 @@
+DIST pybloomfiltermmap-0.3.11.tar.gz 435754 SHA256 0b8e64a9865362a6f4a7a33018c41155322b4485705ad087ed144ff33f6a9f89 SHA512 cce4218ee23382a8633ba9f846e11344a65bc3e04b1e2e6770c017ac3b078a87288e63020f9455eaa34b8920d71ccfdad169261d428a43b32a7ca76664fd3bd8 WHIRLPOOL 8c44b98431b072027dc9e29bb0499d79d78961e8511374084731cf633a8fb5eae169fe1d16c55995f8b2330da8d43f6dc156fcbd4c1115c6104a291abdea1fdf
+DIST pybloomfiltermmap-0.3.14.tar.gz 446760 SHA256 eb21b180ff77b7afd2d586ed9d188cbf9563103e26e7ee72ed11dd492cc37875 SHA512 c2b7414464ffd7feb31b74ad576716554b79ebe59675cb61cd241c270628ce821d97ddef1be7fea9f0b5f2019a7fa009d21e9f14e7f7e514aa6446ca23702cb3 WHIRLPOOL 4cd4b0a09d5077d414b4467e298eddb56713b8f697f1129928635ef9ca1fcc3792b648a07701fd08e43556d40f505df8752dcaf525236a970339bf2d2f73c861
+DIST pybloomfiltermmap-0.3.15.tar.gz 448288 SHA256 efcec29a2cc511dd4e631e4415f68fc450f1e10864db215db21bd8bea7d7bc62 SHA512 36ceff5860e97686387932945d6ee2f342e07dd45b4320b09e8153987c5aa7da678db86179759528c5a4c0d8fbc1e1a98b549c55e17a6d66f1c83c0f1ee46ed1 WHIRLPOOL 1ccc11be0d9d20395d37b6f1ccb7331d86c2cca2e0e09745d24e90d2f089fd38c081981faa1204d1b7cbada635a6609040fb4f398d9a577b2310b3c77723ca98
+EBUILD pybloomfiltermmap-0.3.11-r1.ebuild 398 SHA256 a2f5b86e65bca01a8883470cdc7d2b76b386cded140e2c71f5dbd3fc814f5794 SHA512 b31801896d95a24b981d0ab5b35146791e060c9532aa0a7f7270918ab32eb4f1c87cd46c70ce674b63dbd124a80dde40bdf04d52fcd3999c52afff0421ae68c6 WHIRLPOOL 07ea4af37d57323ff8fb6b5e6e95cbb231f7d84dd9a26487675935e5dbd1799a1c612c61465392d694cd9f0c9f0055b7c56f3191137519f2f3a35f99158f291e
+EBUILD pybloomfiltermmap-0.3.14.ebuild 632 SHA256 2dbe939eed8bd83fcab2deb030e6836cf2ce4f07adab2c857b5cfa01b5968694 SHA512 f5b00cdf3151a645de53095978fcb16e1751e7c3e31746a0243dad616e175456724b16d26d55e05858043cee1da9749b866c18f6e0b2a80413293ec24a5fe2af WHIRLPOOL d4923cee3b4e1012e5b14b796943ab6f18c0ac6f84abeaf14020d678a497d16f08446bec67070bf662d2ff194ec18356757c9ffeca1d6ee46bae08f6643d4367
+EBUILD pybloomfiltermmap-0.3.15.ebuild 632 SHA256 bcf14754366a88a2f9e253483b31dba2cbc3d7b8dbc1185d4e2277ca98609d81 SHA512 c489fabaa652e845418abe5f36f5ba401c7f19b9bbb20d2099f939f4bc5bbe1466120124d02e946a513f178c1c5a11b7af91759e7457b834ac406e7899f76ecf WHIRLPOOL 7bb64faa4686e48b000e7104ba42ed84d7c8269e7098bd4a7521b24552454d734a417183516fbcb622a294e40a1e91928d71ca21b14dc5f833b5c4f6c4adcaa2
+MISC ChangeLog 2733 SHA256 56b1f38b61633ab524ecad805c6277108746f86e50fd3023b0f77c70ca5c4a1b SHA512 2488fe21d75e9c5fae5075772cce38fda6311afe9c98ba79d2a707aba38631773b506e7c23d5efca9ea82222adf9cbc4e7acdcd0529830e51b65fe90b91750cd WHIRLPOOL 6b7f4f9af564e00d7dd097db0f48befc2cd9920d33e152d43104cb9696974e1d3bf26631e08fabb33fd57f58564369542b5f5a78e1ac4e8e913ebd0a9c1825f0
+MISC ChangeLog-2015 2955 SHA256 728fd00557fd2a949ec994f097239ccd4f09ba1d5e02ea24546628ade9b24726 SHA512 9352229bc85477f3087bac3e1b48371bf0304985a8d8cee9fb5330b376f4c68dded2e7058976add15d620ca3ae3d213f3f1313c5e79bd2974889e42651c186e1 WHIRLPOOL b1c8b2a19745cc52d1e65321279fc545456cfaf52087f6de1472f353b74e39ccfd64777f54422383662bee025d455a66ea73c60f09ee9feae10a534643cff498
+MISC metadata.xml 463 SHA256 a6fd909ed4381d29ed0b77d5279eacfa34d28b2461500d1e455ceee8d165e31c SHA512 64862e26324c3fdf73ec2b234e79658333185a81193bc941476b311781f60eebb52b5cec016cdf734be2f9647a8abe79856328aa34b66f54770f49fa343e4437 WHIRLPOOL ccb560ae532a7bf040796f0bcbc589ec7c4d0bbbd9c35ca19feff6f43cf10393fb75e18d8a6a28c63ce37c2c60ec03715d3f17accf8c2e0740748a118390ce98
diff --git a/dev-python/pybloomfiltermmap/metadata.xml b/dev-python/pybloomfiltermmap/metadata.xml
new file mode 100644
index 000000000000..253d5537b3bc
--- /dev/null
+++ b/dev-python/pybloomfiltermmap/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>clabbe.montjoie@gmail.com</email>
+		<name>LABBE Corentin (Montjoie)</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pybloomfiltermmap</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11-r1.ebuild b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11-r1.ebuild
new file mode 100644
index 000000000000..30495941d3b7
--- /dev/null
+++ b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Bloom filter (bloomfilter) for Python built on mmap"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="https://pypi.python.org/pypi/pybloomfiltermmap"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
diff --git a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.14.ebuild b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.14.ebuild
new file mode 100644
index 000000000000..1e62b8ca6965
--- /dev/null
+++ b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.14.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A Bloom filter (bloomfilter) for Python built on mmap"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="https://pypi.python.org/pypi/pybloomfiltermmap"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	# Failures X 2 by pypy are harmless; written for py2, reflect only how pypy handles exceptions
+	"${PYTHON}" -m unittest tests.test_all || die "Tests failed"
+}
diff --git a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild
new file mode 100644
index 000000000000..683066b5c6ab
--- /dev/null
+++ b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A Bloom filter (bloomfilter) for Python built on mmap"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="https://pypi.python.org/pypi/pybloomfiltermmap"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	# Failures X 2 by pypy are harmless; written for py2, reflect only how pypy handles exceptions
+	"${PYTHON}" -m unittest tests.test_all || die "Tests failed"
+}
diff --git a/dev-python/pybluez/Manifest b/dev-python/pybluez/Manifest
new file mode 100644
index 000000000000..1ff9a190bf56
--- /dev/null
+++ b/dev-python/pybluez/Manifest
@@ -0,0 +1,7 @@
+DIST PyBluez-0.18.tar.gz 74501 SHA256 66b2184e0eaad5e1ecc89eb4c81cba0696b3028b85d1301186b45b0bbd761065 SHA512 ddd185ad90f7c6235e25182afccfb586efa0d361f38140f33718dc2d29ca62f3aa68867d075820afffd5ee2fbd306b907b565fbdfdf32f906657f6a3a8c779da WHIRLPOOL 7cc0aaa8f5d33626689c10c4c171d0b5f115cbefda1c561b3146ae0f2b397739bf67a05f7f0ae330620194a54b595d408da81f11e07fcf51f4b176f60e11a7ba
+DIST PyBluez-0.22.zip 109060 SHA256 4ce006716a54d9d18e8186a3f1c8b12a8e6befecffe8fd5828a291fb694ce49d SHA512 c166a976d311eba73516aaf86ab42b100a39ebccd3d70f93ccb89f59c12127a857698dcfe4b25f8f689eee12187b5f35ccc8235e36cf012e73df155ba5adfae6 WHIRLPOOL 932fc01d1444b8f5ecb84ae27dc9f706591f18045129d7980ef9926fb5008ab5f19d879bbdd2c251402c9b41e474ac8284c5996dbe5cb3f81c6cc0a93f57f8f7
+EBUILD pybluez-0.18-r1.ebuild 582 SHA256 74478b187ed56073d77fe84700d537570932782d2c2982189581d2e0a7a3968e SHA512 d582b4d4875a328bda3e76153fadcdb2b83aafb860d61d0504f4f7213676d8570c48675ab2e94dc803c4436eb52af265592a9ae095f7d469a679a38ef9ca050c WHIRLPOOL 50443feb1e9cd7a7608b75241938cadfbd6c26a9078f13d15b214b6249e48f9fb48b75b944c6ce129bd00d6390612da936c847d8d03c88f978026a3958c5736c
+EBUILD pybluez-0.22.ebuild 665 SHA256 75377f64945d45220f456840a06df5292329550fa2e2b9af4ed297cc3a78eaf0 SHA512 3cd1a673e281174ab3135f9421071d841241a417862ec68da22b1c5ff3ad8096e8fc63af13e1ee0d3cd0b9a532feb653956e7d23d6afff247a9fe79c71889627 WHIRLPOOL d65ad44d060b4d67ef57f63a3aeff0414342599742c6ceb052844a968adf4ffee0c43b1d2ba4943c229eeb71418fc6909cb70180e1763a5fcf0c4500c16fcdab
+MISC ChangeLog 3263 SHA256 8058f6f095e1ac1eaa4ae913b2f45bb824b0793670a99b3ebdec16a644a16f89 SHA512 e3ac8857849f15c6010e0fd15837bb37235b9dfba0fbd999413a5ed96822bd7adbe8ea1f05874ad82c7900675673a914cc5b5de727239810cede4099d83f61d0 WHIRLPOOL 1feeaa23d7c7dc35c50a603ea03d896765e5c816ece468aca8610d3e7d78e46c383d76b604cd7574416acca090323a1201ea294030a55749ab0f011e2da72adb
+MISC ChangeLog-2015 4860 SHA256 7a9d0be2dad5283adc944f79a864ee6b0d20fce020ed0655ea2e9dd9e51abf76 SHA512 a2b846c7d651395e05dca529a6ffab3944728e92580f5c88ca850fbce83ace3d574d4bcd3ef551f623f039c743570cc1cb5f342a25a3e54452d2d1b4c9effd8d WHIRLPOOL 4536b0ffae6fd49107aa916930709de7e891933d8047b6d783442c4bf75e85d12cbdef5d154d5bc8fdcc8d220e957f032d832a893a591f3709cd2a28865dfb24
+MISC metadata.xml 614 SHA256 89000c879e2cea784be8aa567c69f469632d0d3267b3e6776ccf75727bf53dc1 SHA512 0a4c61d454bfe82c6491d87c2e807b52b0a223a695359ba6921852b43bc5afd37de44821fe6c65c06c5973d128ef158bb02ad13a1963d1909ae4bddfe64324af WHIRLPOOL 84fb6669f8cc7c0e2100c62246fd9fc0ee13b6d376d1fbea79bf4014e7e8493757b47371002561345620aa46f881a15c8f5ba5e9b24670cf1bc02bac3b0e669d
diff --git a/dev-python/pybluez/metadata.xml b/dev-python/pybluez/metadata.xml
new file mode 100644
index 000000000000..0334f65093e0
--- /dev/null
+++ b/dev-python/pybluez/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>PyBluez is an effort to create Python wrappers around bluez to allow Python
+developers to use system bluetooth resources. It works on machines running the
+GNU/Linux operating system and the bluez bluetooth stack.</longdescription>
+	<upstream>
+		<remote-id type="github">karulis/pybluez</remote-id>
+		<remote-id type="pypi">PyBluez</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pybluez/pybluez-0.18-r1.ebuild b/dev-python/pybluez/pybluez-0.18-r1.ebuild
new file mode 100644
index 000000000000..4067c947963b
--- /dev/null
+++ b/dev-python/pybluez/pybluez-0.18-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_P="PyBluez-${PV}"
+
+DESCRIPTION="Python bindings for Bluez Bluetooth Stack"
+HOMEPAGE="https://github.com/karulis/pybluez"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="examples"
+
+DEPEND="net-wireless/bluez"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pybluez/pybluez-0.22.ebuild b/dev-python/pybluez/pybluez-0.22.ebuild
new file mode 100644
index 000000000000..12ea43bf7891
--- /dev/null
+++ b/dev-python/pybluez/pybluez-0.22.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+MY_P="PyBluez-${PV}"
+
+DESCRIPTION="Python bindings for Bluez Bluetooth Stack"
+HOMEPAGE="https://github.com/karulis/pybluez"
+SRC_URI="mirror://pypi/P/PyBluez/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples"
+
+RDEPEND="net-wireless/bluez"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/pycadf/Manifest b/dev-python/pycadf/Manifest
new file mode 100644
index 000000000000..85d4958d2c75
--- /dev/null
+++ b/dev-python/pycadf/Manifest
@@ -0,0 +1,7 @@
+DIST pycadf-2.5.0.tar.gz 247779 SHA256 a5cbf899266ea25e62e927a31dbf13607f9ebfe1525b4ec95256afc42f43be70 SHA512 af3d7676e671ed702a84052589be7146406c2c53ebfb1ee5922bec93664fac461514c832ce9f225d52a9c6b08ec330e17c5763bee6eda7a931b5dc0af6e57ed5 WHIRLPOOL 75116d8b5d669132d33bdb9f4648c4ce276b25f41dd81e10efa1e0521a0fe7cd4dc3dd95f1786aaf84014534f30cf98544df3800bfe86062db4ed5f2adf944f9
+DIST pycadf-2.6.0.tar.gz 249411 SHA256 75b0e70f4c4fa46fef65671beb562c4bef1007541a38b5f724689209fcbf4b4e SHA512 a581b54a8dae088e015d639f14eb46b3c41bdbfdd55b671e79f34b7392af49e3e8dbb2fd85a43e5f8e010cbcdba1d9a330972b5cb6f7f2c5179c00b6f135b4ec WHIRLPOOL 374fcc4211c69a70c12571ca645c64e36d9ac30e3cbc26a527a533a545aff455724a9a0395464c1f71e1a327a5a46a22c7a43441c6882d789ff8b779fe193a66
+EBUILD pycadf-2.5.0.ebuild 1885 SHA256 817b8b52c21742875b02df985edecd10313db7540f83bea03c51aa249d20804c SHA512 8c755ff37ba0e3c582448916a5ab38b66531ba41eef6a1a76785e45747d2ee6bf50867e726677bd1efb25deccb042af1c819a4c893981e60bed8a6e9ea8f641c WHIRLPOOL 12fe92737ddcf0021f098816247b7ea3e8dbc8c5df51aa531f6988eb172342a3623cb8daa7cdc1dababbcde044825e39bf69242b5479d39522dac0438e14df7e
+EBUILD pycadf-2.6.0.ebuild 1837 SHA256 43b433e04dd536556f2423457f22988e3838963ff83caaa2be8c843ad57844e5 SHA512 011383ccc23ec4009d3317d2139e6fd17ff15517bec8a7ad98312b092c82169fb3e2e5eec15e66c262a78d93f504a77e892f6b3d720a0cdbe8fe2ff02e027de7 WHIRLPOOL f4f2242a81b749e327ddfeaa37dc534aeb43b58923ab4fdb4595716cf13edc25ae36c73acb5e9f9984da0546bfbd957cd69bc0cb6e5b580976ffdce808584f68
+MISC ChangeLog 4634 SHA256 ca220fe5cd5f6ffd53c65701c1b2767e4e079365838560f71042f1b4f0500b13 SHA512 8f774f5c3dc8de4018abe307495d81507f998aa7414cc463c6e301fccc80d6ac1ba68e268fa47c5c517db8c179a1958541e1addcc8942fe6e5147ed6e7391cd0 WHIRLPOOL bc9a5c84d4ceb50184f828204f759179c158eba4794055bd71aed405947f51780c4c4732c1d9a8d911ec31268b5198285d10f461ad199a4f3f0de381550cf777
+MISC ChangeLog-2015 1692 SHA256 ab8a32cc9fd12506b00135b295fa3dc703f8735d276944e9ca6e3aae3d93f962 SHA512 d16a388d06a56163f500fbcb6b16e07880c1dbd8a687d33dc3191d2a922769f5f2153f9d9e6f4e15d8922e0e6b4a2bcd080cd75e0eabbe1d76ebc25043167678 WHIRLPOOL b6f3c6ee1a7932da068485749a63e4a6c1fab36700f31b73fe93720abf3fd6c461ae9094cfe81c137f062ce8f73393162ec3983097287494424b4bcbcda30c05
+MISC metadata.xml 555 SHA256 9ae70a05dab1b40c2e12432e4b01c2f13d1f38d6c5ac6829c43eccc44c08697b SHA512 370b97a8a71e49aa553cd6d56b5060074fbfcf366e84672527e8ce49e086c3393198a6afc7d675ce7db71fb8c2abf7bbd4921140da3180f78eee687a2edadf0d WHIRLPOOL 83cdb3759ef151c257de9ab6713b927e9293f11e581119e1bf3542e6baea6db81fdef54f6890261df5f1c220e90c693fe9421671f04fc53b2ceabdd6ee6d5333
diff --git a/dev-python/pycadf/metadata.xml b/dev-python/pycadf/metadata.xml
new file mode 100644
index 000000000000..8ec77b898826
--- /dev/null
+++ b/dev-python/pycadf/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    python implementation of DMTF Cloud Audit (CADF) data model
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">pycadf</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pycadf/pycadf-2.5.0.ebuild b/dev-python/pycadf/pycadf-2.5.0.ebuild
new file mode 100644
index 000000000000..75af4f8597ef
--- /dev/null
+++ b/dev-python/pycadf/pycadf-2.5.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
+HOMEPAGE="https://pypi.python.org/pypi/pycadf"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycadf/pycadf-2.6.0.ebuild b/dev-python/pycadf/pycadf-2.6.0.ebuild
new file mode 100644
index 000000000000..30e2b250cc46
--- /dev/null
+++ b/dev-python/pycadf/pycadf-2.6.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
+HOMEPAGE="https://pypi.python.org/pypi/pycadf"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	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/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/oslo-config-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
new file mode 100644
index 000000000000..e1d101db7031
--- /dev/null
+++ b/dev-python/pycairo/Manifest
@@ -0,0 +1,28 @@
+AUX py2cairo-1.10.0-ppc-darwin.patch 446 SHA256 c957cd14eb2c3fce0169a54b13665522fe1ada1af61a865903aad595afa309b1 SHA512 003e3266542242d349baa522552392aa448738f91a37ef0e6c8dedc3e0c179ca98167ab2ea7d75bd7d708f24f286099440a7a6a784767530eca161486403b033 WHIRLPOOL 0695123f4c9b3e82c22f1ba632243226d1dfe50442ea515abe440632221984c10aff233b8407a0e8dd4f594a1464c4fb7f121e43cfd0d03a2529ed1163e1a649
+AUX py2cairo-1.10.0-svg_check.patch 2912 SHA256 c35d96be5be571c2f4c3415e4016a7e70a5edd6164818af80d16855e4e4efe72 SHA512 e0069738659db0fa3c0532efa7e53fed5f088ee4ce276fd6ddcfcd0ee1e8b4861a09330afe8a30bb45b912c7a93cf6e42dd6057ad7f5adabfdddeb58bc10bbe8 WHIRLPOOL 90ccae77f2641c1f9f4ad6f6497fd7912a952b7b948fe64845e8c60629d4f70c590fd33dd276c54cbc8251d45e8bd201841d7bc3fa04a37a314f1f375b8250c7
+AUX py2cairo-1.10.0-xpyb.patch 952 SHA256 d6809bf00608d007f866040025392174e0cf3efe3ac03277436e00bacdcef54a SHA512 45fa1d32a8a4fc79b10e9221af286eef3f9d2c2b4991c066b1e18bd329feb764d07c4ebc58e1926ae86c4cb4a2ed0fd172f75f7479cec0be51ec5c5da6d4f13d WHIRLPOOL f8818581d471735748b546ffa0f4ac42bc5f623ae0ab383a70cf5977727ba933509497d3071aeb572e764c5e164680c16f8d476b0d8f1b7659dda7190b226cda
+AUX pycairo-1.10.0-101_pycairo-region.patch 27745 SHA256 93e189149e85c982607e0eafbb622da0b14f259662c8f81b6b59a1f639a52797 SHA512 5a66da5dc1c0888c423e2f62ae618b1ffbe03df9af249fc026cedc927d1eaff43e31fac38a58e4d59a2876be95e17e4a05679420162aaee111caf4d199a38552 WHIRLPOOL 15bac5be6149e86a3e96a72fe4b73c16d285c6fd555787023c91221ad6ed5c0e6977fb9a89af76806d452bb556395bfc3186ab180eacaa924295366bcf298b2e
+AUX pycairo-1.10.0-50_specify-encoding-in-waf.patch 1132 SHA256 611947d3f66fbb3b5a7900a5fb827c21b18ff6c97dad27c874eeef4d8744b842 SHA512 1136413bcecf1e34101d8b7b1930c506a401baa3594c22978e9c6b53eb3d555c40153b608007402428a6a8806348129de6397460a42b219e39f823adcc1951fd WHIRLPOOL d78cc1879a6358f4cfbfe164f75a71a602e1823a25128483727ad2151593016d626124cda293f909944cc76a148a8ed31b81950a3ac6491a195e01f7cd9a3715
+AUX pycairo-1.10.0-80_fix-pickle.patch 1057 SHA256 f42993b81d9c0a7bf2cdd4f23e79f6424a3f6ddd09a096c3a151e396e03f6d1e SHA512 934386e2fb3dd470a067c359e70dc1985a303e9e28a4592e1a482dc253abd80f4933d90448cc4fea10bfaa01a8f3f2b83c865e926db7da699768e05a4e3d53e1 WHIRLPOOL 5792affc16265e7b14cc77ebd7d7ed4c0c5dcd10c8ba280fcc823d429721c9c47b0ce63df52210cff7a6246b9d8758e475d098e3c2811758d53b413d67c0e896
+AUX pycairo-1.10.0-81_pickling-again.patch 973 SHA256 f5445061bb0403edc4d937b3a6842fcbe51a39b278c9fb606e6badd2c2e0d13e SHA512 5379b94ca473541b41af34e8c1f23ff8705a972b87bb1eeba3e21519ca1508be92cc5d603610e89be3188e0dbca1069e19148f54cf8884fe0acb70d934dfd95c WHIRLPOOL 53a67d84f8cdd87059bdf6660a0e669bce6ca9205f14463803c5bf9c44a9ea45be4e13176c7de5cf83939c9f8c16fa319b3246442d9a2ef66c2bb2e7c908542b
+AUX pycairo-1.10.0-svg_check.patch 2924 SHA256 f9d2bac70bcca57c523e69403cb7332bf4ade0427998b6a3dc16730bcc17b6c7 SHA512 a05fc725c9c8ac48b262795c6c6e56b3a432f73d69657565763292f74cbd8b3d4eaabc1a5dd5db0b74cad297cc330caed271c40fbb16d459019b4c75ab33ccef WHIRLPOOL ceaf8bf26f9783bd017fbfb6b81f00ece0122d1f57ad6ae3d87f40b39d7a4bbb47bab89891f3f12357f44f26039a6c63bf46b25765fac2412bd079c6e17dd6cf
+AUX pycairo-1.10.0-waf-py3_4.patch 511 SHA256 a4c5526c045972087ec12f68192e14f3f6910b2c2ea4e7a7b742dfd8520cd475 SHA512 7f8b76483b8f193ba03b89030f9f418632d6a062e4026534404031612c870f206392c82f52f2c64a9960e3e5b43562155449baedd7e3dbd0562a65f32ab33315 WHIRLPOOL 23a846d28676cded354b1b3a9f3e9010fc955d47b4db7d6d6f3bc9247d37afb98f8b928a203d47e454113a5a69d228de36249b4d07d86eeade112c40cc0f23ea
+AUX pycairo-1.10.0-waf-unpack.patch 262 SHA256 ad9f1b924397b5b14fcf2e903f4da9851f06414e25fa4d5fa1a4c36a0586b9ae SHA512 05ff350976729122238d97bf69ec5e55bc489404ec1d8cae478ecb28baa6676a100b520aedc0d3dd6bf77385bc6f34de6cd32d33a5c5b0c593059309e3628d0a WHIRLPOOL b66d080e98a5cb70634b90fb7922c13e7c2bc338b64e1a9f3a38ccd5111592e72668d55e3fbccdcfe904c1296150273005a7b93202b4300ff6f792476873a5f1
+AUX pycairo-1.10.0-xpyb.patch 1112 SHA256 5c6ae65a5f1b6eee0e56fb39f7fade34dc20dc38c7cefa5841a45d8c23bb9a0c SHA512 69c826970b36075b3a1ce63b2db89ac1779902a570af95b28c07536ce91c3c9adce234444a86b6211e9b53b0293a56173de88d76f50f77a0ed3aa17e2aefcfb3 WHIRLPOOL 30d18f9910ed29d798d5eae610f608af76d2b0c1fb89801f25b1ca9b97e58d2a15ab1c948386ad326d249ffe899e0187561c2708b692287b80039e21f5185b88
+DIST py2cairo-1.10.0.tar.bz2 402070 SHA256 d30439f06c2ec1a39e27464c6c828b6eface3b22ee17b2de05dc409e429a7431 SHA512 cb3d54de9af4134460ce731da8166a3127a642c8a2e6184109437ddec115cd55b8dd2413a5c81700277bfe2f22fcfe268db4f3ba0f7649751e85bb34295f79fc WHIRLPOOL 60b57d55b27f06acd62714ac6ad7973ab973d42995fb536ae800263a2e8c7451a24ccafd96fe30f5bfa26e1ae218934d4fafaafec3e9666a39b33c78672407e2
+DIST pycairo-1.10.0.tar.bz2 246556 SHA256 9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be SHA512 a03db6f04cea504985f390b0734042390f491f32ae2bee1299dabbafd369fde36bb506ebb941d22bbc11b0d008c4f758baeacf309a7336880529455092db829f WHIRLPOOL e779d56d67ef18bbd052d81acb38d8b610ca4bbf787f4b0e3982633de55ff54d6dfa3e5ce1957321fba09f0ec2d12ce12057335de9d5ff3f84c2bc0530415e76
+DIST pycairo-1.13.1.tar.gz 123690 SHA256 d8f58de67ddd01eda9e5112de57599b7d0154d71c9474821e98866c228794641 SHA512 705979aec5166d1e750ddf2938934edb18d5093e340d9e604a70dc02499ec478db7b0c84572f7ff287139c1b3982a31a254c36641123aee183b3053efe299d59 WHIRLPOOL 307e052d632a4591b67776b62ea173b647273151411bb8bfa9cc4d6dd066dbba30b3ea2bd1b066f6c91fe0a7275e76d1a6c0ebcb15c9113ab28a3ceec04e59fa
+DIST pycairo-1.15.0.tar.gz 167963 SHA256 b469b782ffabeeeb5973b64ee55e993521f32ac658b24baccbcd3f939c4f44f8 SHA512 e27f1b31225fe6eba7722a412a4eb9c591a3ce4887ba5a7edb738f757efa8372c1e2cd6ecd52386c350bb5058d8fa1806ee1d5ecabc2377d1934ded29b8592c9 WHIRLPOOL fcd5764ba1f71513ae164555eea081f21565c03ebd2a48cf89adfe29b3f7b3bdd364b5b19f403e5ade3109beddfc81bfbcd25666285dec1a2833c11e8559f249
+DIST pycairo-1.15.1.tar.gz 175924 SHA256 987d392270247343595d37591f80639ed902fce7e30bd2f944cb1b0a9093553d SHA512 931b6ca704fcae501b7671dd6cd964746951e08b5d09dc7118e3ff5c3c1f8aba9d211efe7867b77bb30f14f4700f888c7ed297ec5e8afca06d3d7327835c8e1f WHIRLPOOL 3d85ebebfab81a9447e4073f00f77ad0dc204f7f18799cec37b1afde50831faaa8fb01a713548917fa6dc80f7a165a4a032c92224cf09c9837b0b6e47e7bb973
+DIST pycairo-1.15.2.tar.gz 176051 SHA256 a66f30c457736f682162e7b3a33bc5e8915c0f3b31ef9bdb4edf43c81935c914 SHA512 ce0ee0b1775eac75eaee9eddcd9dda21d99a6327bac55e0d2e15ce3a8a1869e4d44c59eada1725ba3cdda16fac4ce33a7c350ffdae3892dac85c5e70033e3ee1 WHIRLPOOL 89d8f9a97c3cd7d5d1b2360641ff361dfca0f2567d01fdc96035f57f5389f49249976c341ff5995d9af515c52171a1e5d0ab222b07d00e4020579b3d35a08a2a
+DIST pycairo-1.15.3.tar.gz 177056 SHA256 8642e36cef66acbfc02760d2b40c716f5f183d073fb063ba28fd29a14044719d SHA512 1fc75d193eacb976f2e5a594aa07409a0f80ccb21921065c1794961143785eed48be1966d2d2d3e2d0428f9b4e956994dd851d21f3c3cb91fbc27b007a901ce8 WHIRLPOOL e9248366c8eb541bc70ad73c9c6eea995a2527d189584a1ec6f6b835fdeae57d1aa63e2deaa9f790042d0670e7d07af8867b111ac107b53befd354c3cfc70ca1
+EBUILD pycairo-1.10.0-r4.ebuild 4045 SHA256 922c9a0faabaf52f1badd0694b19f88de7dd7bcb14d4de7c38c59c1a975d35f4 SHA512 d9de003ee4a8412ec1acefd8bbbb0010a53a516ea1385774ac2b8a8864c95e4ed2d14af7ab1a4df9ce07ebf0739637a03e5bcad5e5db0075a03577cf5c6b9ea6 WHIRLPOOL a6ca16158367d3dbdddb04c50d332dfe4fdff9fb8282547c647efe7b9c2018e4eaa7f5036a52dcbaead22032b32aa9652a831277ba5934b405bbb11d6e67ade3
+EBUILD pycairo-1.10.0-r5.ebuild 4495 SHA256 ad07524254a26ee0c98d4a2b84836ceb8b17c69d8d744899431b787e376b2892 SHA512 31bc472872e47ef634111d74e1e2dd38506938fa27415b42068970b8b753d13e71fbd018cae6bf9e0e68c0ae10111dd0ed60e0f735a103ff5bc6fe7faadc8fa4 WHIRLPOOL c3ba51755525740e1d0a75898c1d6acb851c57ce6a3ef33ab414baa52f5d3039dc3f957f68df912419ec2c0d561d06400bb646de53b2e85819b9ec0af1690465
+EBUILD pycairo-1.13.1-r1.ebuild 1582 SHA256 8034147a9892aff7f60de1252278c0dfcb35ee0c32abed19eaf419f82650fe03 SHA512 032b6a99d81593387db6be0014fa29a20a78c87aa1450a0626729fce31b165e6eecec70797686a93a8342fe69c6ed134117876d6e6e007efe81bf8547fad3b92 WHIRLPOOL 7e84775c8126956dbfe8b72f26b99245a9722f92493c23374317fd7847436777acd07d25afcce6e77169c2512cb981be9a7e6b98486736c7f056f684e31373c5
+EBUILD pycairo-1.15.0.ebuild 1616 SHA256 583f9673168578eb903c857d0b57ab5e38ca22235df654e3f4a0f9edce611680 SHA512 f8fc6a76feb2a2544c558965a2004151e8a259de7466195c02a18657e614fd956b94b21c1038a5868a74c904f8fe20f3eb06c9c352b73a83688d6fcf8ff57c0b WHIRLPOOL 1bc5c48d88fa2cb6fb677bc6e0f69fa9097e18c5d327c7d89b3b709bd5a44f65e7dbdf17e7ae44263b53bfe7dd7e9072d50f645f1dc4a9c18ea1e3e10e22d3df
+EBUILD pycairo-1.15.1.ebuild 1616 SHA256 583f9673168578eb903c857d0b57ab5e38ca22235df654e3f4a0f9edce611680 SHA512 f8fc6a76feb2a2544c558965a2004151e8a259de7466195c02a18657e614fd956b94b21c1038a5868a74c904f8fe20f3eb06c9c352b73a83688d6fcf8ff57c0b WHIRLPOOL 1bc5c48d88fa2cb6fb677bc6e0f69fa9097e18c5d327c7d89b3b709bd5a44f65e7dbdf17e7ae44263b53bfe7dd7e9072d50f645f1dc4a9c18ea1e3e10e22d3df
+EBUILD pycairo-1.15.2.ebuild 1616 SHA256 583f9673168578eb903c857d0b57ab5e38ca22235df654e3f4a0f9edce611680 SHA512 f8fc6a76feb2a2544c558965a2004151e8a259de7466195c02a18657e614fd956b94b21c1038a5868a74c904f8fe20f3eb06c9c352b73a83688d6fcf8ff57c0b WHIRLPOOL 1bc5c48d88fa2cb6fb677bc6e0f69fa9097e18c5d327c7d89b3b709bd5a44f65e7dbdf17e7ae44263b53bfe7dd7e9072d50f645f1dc4a9c18ea1e3e10e22d3df
+EBUILD pycairo-1.15.3.ebuild 1616 SHA256 583f9673168578eb903c857d0b57ab5e38ca22235df654e3f4a0f9edce611680 SHA512 f8fc6a76feb2a2544c558965a2004151e8a259de7466195c02a18657e614fd956b94b21c1038a5868a74c904f8fe20f3eb06c9c352b73a83688d6fcf8ff57c0b WHIRLPOOL 1bc5c48d88fa2cb6fb677bc6e0f69fa9097e18c5d327c7d89b3b709bd5a44f65e7dbdf17e7ae44263b53bfe7dd7e9072d50f645f1dc4a9c18ea1e3e10e22d3df
+MISC ChangeLog 4405 SHA256 0290ffffd0f0c4c7daa5273929bff3e300f971663f78f268b7e6bcc8fff9b321 SHA512 15f3867446f2e1c27cdd63624c4f8014623162394982fdd10d11176118f099522963cddb461f62a6e2c240de8403dadc1a465ee795084b954f728452b55de8f0 WHIRLPOOL 689ea1a3fdbe13cd1253ff04895afddb70ccc278a7e98de65732bbff55564192bd0811ede6dbdf2f1840ec38bd35367d6864a26dfa20eee9ae68ec108538ad0b
+MISC ChangeLog-2015 19702 SHA256 fe08ff0a819ad0b3a356f5f40a1a41df91a1f23b724a40d2f918629c722daccb SHA512 d5a3f9c9798f2a90ddb9ebcaf3883222d2e56fa8836a120ea8ff63890ce46aeeef7dfeb45e0a8c94d93e76aa463c65ca3a965db2a04917169841673eff2120f2 WHIRLPOOL 01e7b92dfefbb54123b9329c032657fc6e63d592b7d6b4d68a4e2a9e506ef0a50c2d680ee16c518d4e07858254a6ed2933260e891da934e3426ee0546fcc9f4e
+MISC metadata.xml 246 SHA256 634432e12556106844e569b7ff16962881c6e70887e6fc9650bdd82deb51a834 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc WHIRLPOOL 869ef1c8e23bdae0a11b44ccf38ddec23f0dc0ae2573bc83ccbe2d8a2c6bf5a3f9c3c52149aa2e3690dd66f7fc7ec498f2eb6b9d338440fb54c12d5ac0b9fb7a
diff --git a/dev-python/pycairo/files/py2cairo-1.10.0-ppc-darwin.patch b/dev-python/pycairo/files/py2cairo-1.10.0-ppc-darwin.patch
new file mode 100644
index 000000000000..e921ac34acd2
--- /dev/null
+++ b/dev-python/pycairo/files/py2cairo-1.10.0-ppc-darwin.patch
@@ -0,0 +1,18 @@
+inspired by:
+http://groups.google.com/group/waf-users/browse_thread/thread/2bd6774056c850bc/
+27bfdcac2fb9ec05?lnk=gst#27bfdcac2fb9ec05
+
+we cannot "fix" the buildsystem, since it's bzip2-tarred *sigh*
+
+
+--- waf
++++ waf
+@@ -154,6 +154,8 @@
+ 
+ wafdir = find_lib()
+ sys.path.insert(0, wafdir)
++from waflib.Tools.c_config import MACRO_TO_DESTOS 
++MACRO_TO_DESTOS['__POWERPC__'] = 'darwin'
+ 
+ if __name__ == '__main__':
+ 	import waflib.extras.compat15
diff --git a/dev-python/pycairo/files/py2cairo-1.10.0-svg_check.patch b/dev-python/pycairo/files/py2cairo-1.10.0-svg_check.patch
new file mode 100644
index 000000000000..4cd755c8d574
--- /dev/null
+++ b/dev-python/pycairo/files/py2cairo-1.10.0-svg_check.patch
@@ -0,0 +1,126 @@
+--- src/cairomodule.c
++++ src/cairomodule.c
+@@ -127,7 +127,7 @@
+ #else
+   0,
+ #endif
+-#ifdef CAIRO_HAS_SVG_SURFACE
++#ifdef PYCAIRO_ENABLE_SVG
+   &PycairoSVGSurface_Type,
+ #else
+   0,
+@@ -223,7 +223,7 @@
+   if (PyType_Ready(&PycairoPSSurface_Type) < 0)
+     return;
+ #endif
+-#ifdef CAIRO_HAS_SVG_SURFACE
++#ifdef PYCAIRO_ENABLE_SVG
+   if (PyType_Ready(&PycairoSVGSurface_Type) < 0)
+     return;
+ #endif
+@@ -305,7 +305,7 @@
+   PyModule_AddObject(m, "PSSurface", (PyObject *)&PycairoPSSurface_Type);
+ #endif
+ 
+-#ifdef CAIRO_HAS_SVG_SURFACE
++#ifdef PYCAIRO_ENABLE_SVG
+   Py_INCREF(&PycairoSVGSurface_Type);
+   PyModule_AddObject(m, "SVGSurface", (PyObject *)&PycairoSVGSurface_Type);
+ #endif
+@@ -379,7 +379,7 @@
+ #else
+   PyModule_AddIntConstant(m, "HAS_PS_SURFACE", 0);
+ #endif
+-#if CAIRO_HAS_SVG_SURFACE
++#if PYCAIRO_ENABLE_SVG
+   PyModule_AddIntConstant(m, "HAS_SVG_SURFACE", 1);
+ #else
+   PyModule_AddIntConstant(m, "HAS_SVG_SURFACE", 0);
+--- src/private.h
++++ src/private.h
+@@ -86,7 +86,7 @@
+ extern PyTypeObject PycairoPSSurface_Type;
+ #endif
+ 
+-#if CAIRO_HAS_SVG_SURFACE
++#if PYCAIRO_ENABLE_SVG
+ extern PyTypeObject PycairoSVGSurface_Type;
+ #endif
+ 
+--- src/pycairo.h
++++ src/pycairo.h
+@@ -182,7 +182,7 @@
+ #define PycairoPSSurface_Type       *(Pycairo_CAPI->PSSurface_Type)
+ #endif
+ 
+-#if CAIRO_HAS_SVG_SURFACE
++#if PYCAIRO_ENABLE_SVG
+ #define PycairoSVGSurface_Type      *(Pycairo_CAPI->SVGSurface_Type)
+ #endif
+ 
+--- src/surface.c
++++ src/surface.c
+@@ -83,7 +83,7 @@
+     type = &PycairoPSSurface_Type;
+     break;
+ #endif
+-#if CAIRO_HAS_SVG_SURFACE
++#if PYCAIRO_ENABLE_SVG
+   case CAIRO_SURFACE_TYPE_SVG:
+     type = &PycairoSVGSurface_Type;
+     break;
+@@ -1015,7 +1015,7 @@
+ 
+ 
+ /* Class SVGSurface(Surface) ----------------------------------------------- */
+-#ifdef CAIRO_HAS_SVG_SURFACE
++#ifdef PYCAIRO_ENABLE_SVG
+ #include <cairo-svg.h>
+ 
+ static PyObject *
+@@ -1125,7 +1125,7 @@
+   0,                                  /* tp_is_gc */
+   0,                                  /* tp_bases */
+ };
+-#endif  /* CAIRO_HAS_SVG_SURFACE */
++#endif  /* PYCAIRO_ENABLE_SVG */
+ 
+ 
+ #if CAIRO_HAS_WIN32_SURFACE
+--- wscript
++++ wscript
+@@ -1,6 +1,7 @@
+ # -*- python -*-
+ 
+ import os
++import subprocess
+ 
+ top = '.'
+ out = 'build_directory'
+@@ -11,6 +12,17 @@
+ cairo_version_required = '1.10.0'
+ 
+ 
++def check_svg():
++  if os.environ.get('PYCAIRO_DISABLE_SVG', None) is None:
++    return_code = subprocess.call(['pkg-config', '--exists', 'cairo-svg'])
++    if return_code == 0:
++      return True
++    else:
++      return False
++  else:
++    return False
++
++
+ def options(ctx):
+   print('  %s/options()' %d)
+   ctx.tool_options('gnu_dirs')
+@@ -39,6 +51,8 @@
+   ctx.define('PYCAIRO_VERSION_MAJOR', version[0])
+   ctx.define('PYCAIRO_VERSION_MINOR', version[1])
+   ctx.define('PYCAIRO_VERSION_MICRO', version[2])
++  if check_svg():
++    ctx.define('PYCAIRO_ENABLE_SVG', 1)
+ 
+   ctx.write_config_header('src/config.h')
+ 
diff --git a/dev-python/pycairo/files/py2cairo-1.10.0-xpyb.patch b/dev-python/pycairo/files/py2cairo-1.10.0-xpyb.patch
new file mode 100644
index 000000000000..c136cb0c39a1
--- /dev/null
+++ b/dev-python/pycairo/files/py2cairo-1.10.0-xpyb.patch
@@ -0,0 +1,38 @@
+--- py2cairo-1.10.0/wscript
++++ py2cairo-1.10.0/wscript
+@@ -10,6 +10,7 @@
+ APPNAME='py2cairo'
+ VERSION='1.10.0'
+ cairo_version_required = '1.10.0'
++xpyb_version_required  = '1.3'
+ 
+ 
+ def check_svg():
+@@ -23,6 +24,17 @@
+     return False
+ 
+ 
++def check_xpyb():
++  if os.environ.get('PYCAIRO_DISABLE_XPYB', None) is None:
++    return_code = subprocess.call(['pkg-config', '--exists', 'xpyb'])
++    if return_code == 0:
++      return True
++    else:
++      return False
++  else:
++    return False
++
++
+ def options(ctx):
+   print('  %s/options()' %d)
+   ctx.tool_options('gnu_dirs')
+@@ -41,6 +53,9 @@
+   ctx.check_python_headers()
+   ctx.check_cfg(package='cairo', atleast_version=cairo_version_required,
+                  args='--cflags --libs')
++  if check_xpyb():
++    ctx.check_cfg(package='xpyb', atleast_version=xpyb_version_required,
++                  args='--cflags --libs', mandatory=False)
+ 
+   # add gcc options
+   if env['CC_NAME'] == 'gcc':
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-101_pycairo-region.patch b/dev-python/pycairo/files/pycairo-1.10.0-101_pycairo-region.patch
new file mode 100644
index 000000000000..4143f33cb247
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.10.0-101_pycairo-region.patch
@@ -0,0 +1,917 @@
+Description: Add support for cairo_region_t
+ This patch fix missing support for cairo_region_t.
+Author: Bug Fly
+Origin: https://bugs.freedesktop.org/attachment.cgi?id=61553
+Bug-Debian: http://bugs.debian.org/688079
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/py3cairo/+bug/1028115
+Last-Update: 2012-08-20
+Applied-Upstream: http://cgit.freedesktop.org/pycairo/commit/?id=75e82a1b3f495a3abbc78e50a5c66356d320fb15
+
+--- py3cairo-1.10.0+dfsg.orig/doc/pycairo_c_api.rst
++++ py3cairo-1.10.0+dfsg/doc/pycairo_c_api.rst
+@@ -51,6 +51,8 @@ Objects::
+   PycairoGradient
+   PycairoLinearGradient
+   PycairoRadialGradient
++  PycairoRectangleInt
++  PycairoRegion
+   PycairoScaledFont
+   PycairoSurface
+   PycairoImageSurface
+@@ -78,6 +80,8 @@ Types::
+   PyTypeObject *Gradient_Type;
+   PyTypeObject *LinearGradient_Type;
+   PyTypeObject *RadialGradient_Type;
++  PyTypeObject *RectangleInt_Type;
++  PyTypeObject *Region_Type;
+   PyTypeObject *ScaledFont_Type;
+   PyTypeObject *Surface_Type;
+   PyTypeObject *ImageSurface_Type;
+@@ -115,6 +119,12 @@ Functions
+ .. c:function::  PyObject * PycairoPattern_FromPattern(cairo_pattern_t *pattern, PyObject *base)
+ 
+ 
++.. c:function::  PyObject * PycairoRectangleInt_FromRectangleInt(const cairo_rectangle_int_t *rectangle_int)
++
++
++.. c:function::  PyObject * PycairoRegion_FromRegion(const cairo_region_t *region)
++
++
+ .. c:function::  PyObject * PycairoScaledFont_FromScaledFont(cairo_scaled_font_t *scaled_font)
+ 
+ 
+--- py3cairo-1.10.0+dfsg.orig/doc/reference/index.rst
++++ py3cairo-1.10.0+dfsg/doc/reference/index.rst
+@@ -15,5 +15,6 @@ Reference
+    matrix
+    paths
+    patterns
++   region
+    surfaces
+    text
+--- /dev/null
++++ py3cairo-1.10.0+dfsg/doc/reference/region.rst
+@@ -0,0 +1,52 @@
++.. _region:
++
++******
++Region
++******
++Region — Representing a pixel-aligned area
++
++.. currentmodule:: cairo
++
++
++class Region()
++==============
++*Region* is a simple graphical data type representing an area of
++integer-aligned rectangles. They are often used on raster surfaces to track
++areas of interest, such as change or clip areas.
++
++
++.. class:: Region([rectangle_int|rectangle_ints])
++
++   :param rectangle_int: a rectangle or a list of rectangle
++   :type rectangle_int: :class:`RectangleInt` or [:class:`RectangleInt`]
++
++   Allocates a new empty region object or a region object with the containing
++   rectangle(s).
++
++
++   .. method:: copy()
++
++      :returns: A newly allocated :class:`Region`.
++      :raises: :exc:`NoMemory` if memory cannot be allocated.
++
++      Allocates a new *Region* object copying the area from original.
++
++
++class RectangleInt()
++====================
++*RectangleInt* is a data structure for holding a rectangle with integer
++coordinates.
++
++
++.. class:: RectangleInt(x=0, y=0, width=0, height=0)
++
++   :param x: X coordinate of the left side of the rectangle
++   :type x: int
++   :param y: Y coordinate of the the top side of the rectangle
++   :type y: int
++   :param width: width of the rectangle
++   :type width: int
++   :param height: height of the rectangle
++   :type height: int
++
++   Allocates a new *RectangleInt* object.
+--- /dev/null
++++ py3cairo-1.10.0+dfsg/src/region.c
+@@ -0,0 +1,598 @@
++/* -*- mode: C; c-basic-offset: 2 -*-
++ *
++ * Copyright © 2005,2010 Steve Chaplin
++ *
++ * This file is part of pycairo.
++ *
++ * Pycairo is free software: you can redistribute it and/or modify it under
++ * the terms of the GNU Lesser General Public License version 3 as published
++ * by the Free Software Foundation.
++ *
++ * Pycairo is distributed in the hope that it will be useful, but WITHOUT ANY
++ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
++ * more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with pycairo. If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#define PY_SSIZE_T_CLEAN
++#include <Python.h>
++#include "structmember.h"
++
++#include "config.h"
++#include "private.h"
++
++/* PycairoRectangleInt_FromRectangleInt
++ * Create a new PycairoRectangleInt from a cairo_rectangle_int_t
++ * rectangle_int - a cairo_rectangle_int_t to 'wrap' into a Python object.
++ *        rectangle_int is unreferenced if the PycairoRectangleInt creation
++ *        fails.
++ * Return value: New reference or NULL on failure
++ */
++PyObject *
++PycairoRectangleInt_FromRectangleInt (cairo_rectangle_int_t *rectangle_int) {
++  PyObject *o;
++
++  assert (rectangle_int != NULL);
++
++  o = PycairoRectangleInt_Type.tp_alloc (&PycairoRectangleInt_Type, 0);
++  if (o)
++    ((PycairoRectangleInt *)o)->rectangle_int = *rectangle_int;
++  return o;
++}
++
++static void
++rectangle_int_dealloc(PycairoRectangleInt *o) {
++#ifdef DEBUG
++  printf("rectangle_int_dealloc start\n");
++#endif
++  //o->ob_type->tp_free((PyObject *)o);
++  Py_TYPE(o)->tp_free(o);
++#ifdef DEBUG
++  printf("rectangle_int_dealloc end\n");
++#endif
++}
++
++static PyObject *
++rectangle_int_new(PyTypeObject *type, PyObject *args, PyObject *kwds) {
++  static char *kwlist[] = { "x", "y", "width", "height", NULL };
++  int x, y, w, h;
++  x = y = w = h = 0;
++  cairo_rectangle_int_t rect;
++
++  if (!PyArg_ParseTupleAndKeywords(args, kwds,
++				   "|iiii:RectangleInt.__new__", kwlist,
++				   &x, &y, &w, &h))
++    return NULL;
++
++  rect.x = x;
++  rect.y = y;
++  rect.width = w;
++  rect.height = h;
++
++  return PycairoRectangleInt_FromRectangleInt(&rect);
++}
++
++static PyObject *
++rectangle_int_str(PycairoRectangleInt *rect_o) {
++  PyObject *s;
++  cairo_rectangle_int_t *rect = &(rect_o->rectangle_int);
++  char buf[80];
++  PyOS_snprintf(buf, sizeof(buf), "cairo.RectangleInt(%d, %d, %d, %d)",
++      rect->x, rect->y, rect->width, rect->height);
++  s = PyUnicode_FromString(buf);
++  return s;
++}
++
++static PyObject *
++rectangle_int_richcompare(PycairoRectangleInt *self,
++    PycairoRectangleInt *other, int op) {
++  int res = 0;
++  PyObject *b;
++
++  if (op != Py_EQ && op != Py_NE) {
++    PyErr_SetString(PyExc_TypeError, "Only support testing for == or !=");
++    return NULL;
++  }
++  if (!PyObject_IsInstance((PyObject*)other,
++        (PyObject*)&PycairoRectangleInt_Type)) {
++    res = 0;
++  }
++  else if (
++      self->rectangle_int.x == other->rectangle_int.x &&
++      self->rectangle_int.y == other->rectangle_int.y &&
++      self->rectangle_int.width == other->rectangle_int.width &&
++      self->rectangle_int.height == other->rectangle_int.height
++      )
++    res = 1;
++  res = op == Py_NE ? !res : res;
++  b = res ? Py_True : Py_False;
++  Py_INCREF(b);
++
++  return b;
++}
++
++static PyMemberDef RectangleInt_members[] = {
++  {"x",      T_INT, sizeof(PyObject), 0,
++    "X coordinate of the left side of the rectangle"},
++  {"y",      T_INT, sizeof(PyObject)+sizeof(int), 0,
++    "Y coordinate of the the top side of the rectangle"},
++  {"width",  T_INT, sizeof(PyObject)+sizeof(int)*2, 0,
++    "width of the rectangle"},
++  {"height", T_INT, sizeof(PyObject)+sizeof(int)*3, 0,
++    "height of the rectangle"},
++  {NULL}
++};
++
++PyTypeObject PycairoRectangleInt_Type = {
++  PyVarObject_HEAD_INIT(&PyType_Type, 0)
++  "cairo.RectangleInt",			/* tp_name */
++  sizeof(PycairoRectangleInt),		/* tp_basicsize */
++  0,					/* tp_itemsize */
++  (destructor)rectangle_int_dealloc,	/* tp_dealloc */
++  0,					/* tp_print */
++  0,					/* tp_getattr */
++  0,					/* tp_setattr */
++  0,					/* tp_compare */
++  0,		                	/* tp_repr */
++  0,					/* tp_as_number */
++  0,              			/* tp_as_sequence */
++  0,					/* tp_as_mapping */
++  0,					/* tp_hash */
++  0,					/* tp_call */
++  (reprfunc)rectangle_int_str,	    	/* tp_str */
++  0,                             	/* tp_getattro */
++  0,					/* tp_setattro */
++  0,					/* tp_as_buffer */
++  Py_TPFLAGS_DEFAULT,			/* tp_flags */
++  0,      				/* tp_doc */
++  0,					/* tp_traverse */
++  0,					/* tp_clear */
++  (richcmpfunc)rectangle_int_richcompare, /* tp_richcompare */
++  0,					/* tp_weaklistoffset */
++  0,              		        /* tp_iter */
++  0,					/* tp_iternext */
++  0,			        	/* tp_methods */
++  RectangleInt_members,			/* tp_members */
++  0,					/* tp_getset */
++  0,                                    /* tp_base */
++  0,					/* tp_dict */
++  0,					/* tp_descr_get */
++  0,					/* tp_descr_set */
++  0,					/* tp_dictoffset */
++  0,	            	                /* tp_init */
++  0,					/* tp_alloc */
++  (newfunc)rectangle_int_new,      	/* tp_new */
++};
++
++/* PycairoRegion_FromRegion
++ * Create a new PycairoRegion from a cairo_region_t
++ * region - a cairo_region_t to 'wrap' into a Python object.
++ *        region is unreferenced if the PycairoRegion creation fails, or if
++ *        region is in an error status.
++ * Return value: New reference or NULL on failure
++ */
++PyObject *
++PycairoRegion_FromRegion (cairo_region_t *region) {
++  PyObject *o;
++
++  assert (region != NULL);
++
++  if (Pycairo_Check_Status (cairo_region_status(region))) {
++    cairo_region_destroy (region);
++    return NULL;
++  }
++
++  o = PycairoRegion_Type.tp_alloc (&PycairoRegion_Type, 0);
++  if (o)
++    ((PycairoRegion *)o)->region = region;
++  else
++    cairo_region_destroy (region);
++  return o;
++}
++
++static void
++region_dealloc(PycairoRegion *o) {
++#ifdef DEBUG
++  printf("region_dealloc start\n");
++#endif
++  if (o->region) {
++    cairo_region_destroy(o->region);
++    o->region = NULL;
++  }
++  //o->ob_type->tp_free((PyObject *)o);
++  Py_TYPE(o)->tp_free(o);
++#ifdef DEBUG
++  printf("region_dealloc end\n");
++#endif
++}
++
++static PyObject *
++region_new(PyTypeObject *type, PyObject *args, PyObject *kwds) {
++  PyObject *s = NULL;
++  PycairoRectangleInt *rect_obj = NULL;
++  cairo_region_t *region = NULL;
++  cairo_rectangle_int_t *rect = NULL;
++
++  if (PyArg_ParseTuple(args, "|O!:Region.__new__",
++        &PycairoRectangleInt_Type, &rect_obj)) {
++      if (rect_obj != NULL) {
++          region = cairo_region_create_rectangle(&(rect_obj->rectangle_int));
++      }
++  } else if (!PyArg_ParseTuple(args, "|O:Region.__new__", &s)) {
++    PyErr_SetString(PyExc_TypeError,
++        "argument must be a RectangleInt or a sequence of RectangleInt.");
++    return NULL;
++  }
++  PyErr_Clear(); /* Clear possible err in the 1st arg parser. */
++
++  /* list of rectangle_int or no args */
++  if (s != NULL) {
++    int i;
++    int rect_size;
++    PyObject *seq = NULL;
++    seq = PySequence_Fast (s,
++        "argument must be a RectangleInt or a sequence of RectangleInt.");
++    if (seq == NULL) {
++      return NULL;
++    }
++    rect_size = PySequence_Fast_GET_SIZE(seq);
++    rect = PyMem_Malloc (rect_size * sizeof(cairo_rectangle_int_t));
++    if (rect == NULL) {
++      Py_DECREF(seq);
++      return PyErr_NoMemory();
++    }
++
++    for(i=0; i<rect_size; i++) {
++      PyObject *obj_tmp = PySequence_Fast_GET_ITEM(seq, i);
++      if (PyObject_IsInstance(obj_tmp,
++            (PyObject*)&PycairoRectangleInt_Type) != 1) {
++        Py_DECREF(seq);
++        PyMem_Free(rect);
++        return NULL;
++      }
++      rect_obj = (PycairoRectangleInt*) obj_tmp;
++      rect[i] = rect_obj->rectangle_int;
++    }
++
++    region = cairo_region_create_rectangles(rect, rect_size);
++
++    Py_DECREF(seq);
++    PyMem_Free(rect);
++  }
++
++  if (region == NULL) {
++      region = cairo_region_create();
++  }
++
++  RETURN_NULL_IF_CAIRO_REGION_ERROR(region);
++  return PycairoRegion_FromRegion(region);
++}
++
++PyObject *
++region_copy (PycairoRegion *o) {
++  cairo_region_t *res;
++  Py_BEGIN_ALLOW_THREADS;
++  res = cairo_region_copy (o->region);
++  Py_END_ALLOW_THREADS;
++  RETURN_NULL_IF_CAIRO_REGION_ERROR(res);
++  return PycairoRegion_FromRegion(res);
++}
++
++
++PyObject *
++region_get_extents (PycairoRegion *o) {
++  cairo_rectangle_int_t rect;
++  Py_BEGIN_ALLOW_THREADS;
++  cairo_region_get_extents(o->region, &rect);
++  Py_END_ALLOW_THREADS;
++
++  return PycairoRectangleInt_FromRectangleInt(&rect);
++}
++
++
++PyObject *
++region_num_rectangles (PycairoRegion *o) {
++  int res;
++  Py_BEGIN_ALLOW_THREADS;
++  res = cairo_region_num_rectangles(o->region);
++  Py_END_ALLOW_THREADS;
++  return Py_BuildValue("i", res);
++}
++
++
++PyObject *
++region_get_rectangle (PycairoRegion *o, PyObject *args) {
++  cairo_rectangle_int_t rect;
++  int i;
++  int total;
++  if (!PyArg_ParseTuple (args, "i:Region.get_rectangle", &i))
++    return NULL;
++  total = cairo_region_num_rectangles(o->region);
++  if (i >= total || i < 0) {
++    if ( i < 0)
++      PyErr_SetString(PyExc_ValueError, "index must be a positive number");
++    else
++      PyErr_SetString(PyExc_ValueError, "index is to big for the region");
++    return NULL;
++  }
++  Py_BEGIN_ALLOW_THREADS;
++  cairo_region_get_rectangle(o->region, i, &rect);
++  Py_END_ALLOW_THREADS;
++  return PycairoRectangleInt_FromRectangleInt(&rect);
++}
++
++
++PyObject *
++region_is_empty (PycairoRegion *o) {
++  cairo_bool_t res;
++  PyObject *b;
++  Py_BEGIN_ALLOW_THREADS;
++  res = cairo_region_is_empty(o->region);
++  Py_END_ALLOW_THREADS;
++  b = res ? Py_True : Py_False;
++  Py_INCREF(b);
++  return b;
++}
++
++
++PyObject *
++region_contains_point (PycairoRegion *o, PyObject *args) {
++  int x, y;
++  cairo_bool_t res;
++  PyObject *b;
++  if (!PyArg_ParseTuple (args, "ii:Region.contains_point", &x, &y))
++    return NULL;
++  Py_BEGIN_ALLOW_THREADS;
++  res = cairo_region_contains_point(o->region, x, y);
++  Py_END_ALLOW_THREADS;
++  b = res ? Py_True : Py_False;
++  Py_INCREF(b);
++  return b;
++}
++
++
++PyObject *
++region_contains_rectangle (PycairoRegion *o, PyObject *args) {
++  cairo_region_overlap_t res;
++  PycairoRectangleInt *rect_int;
++  if (!PyArg_ParseTuple (args, "O!:Region.contains_rectangle",
++			 &PycairoRectangleInt_Type, &rect_int))
++    return NULL;
++  Py_BEGIN_ALLOW_THREADS;
++  res = cairo_region_contains_rectangle(o->region, &(rect_int->rectangle_int));
++  Py_END_ALLOW_THREADS;
++  return Py_BuildValue("i", res);
++}
++
++
++PyObject *
++region_equal (PycairoRegion *o, PyObject *args) {
++  cairo_bool_t res;
++  PyObject *b;
++  PycairoRegion *region_obj;
++  if (!PyArg_ParseTuple (args, "O!:Region.equal",
++			 &PycairoRegion_Type, &region_obj))
++    return NULL;
++  Py_BEGIN_ALLOW_THREADS;
++  res = cairo_region_equal (o->region, region_obj->region);
++  Py_END_ALLOW_THREADS;
++  b = res ? Py_True : Py_False;
++  Py_INCREF(b);
++  return b;
++}
++
++static PyObject *
++region_richcompare(PycairoRegion *self, PycairoRegion *other, int op) {
++  int res = 0;
++  PyObject *b;
++
++  if (op != Py_EQ && op != Py_NE) {
++    PyErr_SetString(PyExc_TypeError, "Only support testing for == or !=");
++    return NULL;
++  }
++  if (!PyObject_IsInstance((PyObject*)other, (PyObject*)&PycairoRegion_Type)) {
++    res = 0;
++  } else {
++    res = cairo_region_equal (self->region, other->region);
++  }
++
++  res = op == Py_NE ? !res : res;
++  b = res ? Py_True : Py_False;
++  Py_INCREF(b);
++
++  return b;
++}
++
++PyObject *
++region_translate (PycairoRegion *o, PyObject *args) {
++  int x, y;
++  if (!PyArg_ParseTuple (args, "ii:Region.translate", &x, &y))
++    return NULL;
++  Py_BEGIN_ALLOW_THREADS;
++  cairo_region_translate (o->region, x, y);
++  Py_END_ALLOW_THREADS;
++  Py_RETURN_NONE;
++}
++
++
++PyObject *
++region_intersect (PycairoRegion *o, PyObject *args) {
++  cairo_status_t res;
++  PyObject *other;
++  if (!PyArg_ParseTuple (args, "O:Region.intersect", &other))
++    return NULL;
++
++  if (PyObject_IsInstance(other, (PyObject*)&PycairoRegion_Type) == 1) {
++      Py_BEGIN_ALLOW_THREADS;
++      res = cairo_region_intersect(o->region,
++              ((PycairoRegion *)other)->region);
++      Py_END_ALLOW_THREADS;
++  } else if (PyObject_IsInstance(other,
++              (PyObject*)&PycairoRectangleInt_Type) == 1) {
++      Py_BEGIN_ALLOW_THREADS;
++      res = cairo_region_intersect_rectangle(o->region,
++          &(((PycairoRectangleInt *)other)->rectangle_int));
++      Py_END_ALLOW_THREADS;
++  } else {
++    PyErr_SetString(PyExc_TypeError,
++        "argument must be a Region or a RectangleInt.");
++    return NULL;
++  }
++
++  RETURN_NULL_IF_CAIRO_ERROR(res);
++  Py_RETURN_NONE;
++}
++
++PyObject *
++region_subtract (PycairoRegion *o, PyObject *args) {
++  cairo_status_t res;
++  PyObject *other;
++  if (!PyArg_ParseTuple (args, "O:Region.subtract", &other))
++    return NULL;
++
++  if (PyObject_IsInstance(other, (PyObject*)&PycairoRegion_Type) == 1) {
++      Py_BEGIN_ALLOW_THREADS;
++      res = cairo_region_subtract(o->region,
++              ((PycairoRegion *)other)->region);
++      Py_END_ALLOW_THREADS;
++  } else if (PyObject_IsInstance(other,
++              (PyObject*)&PycairoRectangleInt_Type) == 1) {
++      Py_BEGIN_ALLOW_THREADS;
++      res = cairo_region_subtract_rectangle(o->region,
++          &(((PycairoRectangleInt *)other)->rectangle_int));
++      Py_END_ALLOW_THREADS;
++  } else {
++    PyErr_SetString(PyExc_TypeError,
++        "argument must be a Region or a RectangleInt.");
++    return NULL;
++  }
++  RETURN_NULL_IF_CAIRO_ERROR(res);
++  Py_RETURN_NONE;
++}
++
++PyObject *
++region_union (PycairoRegion *o, PyObject *args) {
++  cairo_status_t res;
++  PyObject *other;
++  if (!PyArg_ParseTuple (args, "O:Region.union", &other))
++    return NULL;
++
++  if (PyObject_IsInstance(other, (PyObject*)&PycairoRegion_Type) == 1) {
++      Py_BEGIN_ALLOW_THREADS;
++      res = cairo_region_union(o->region,
++              ((PycairoRegion *)other)->region);
++      Py_END_ALLOW_THREADS;
++  } else if (PyObject_IsInstance(other,
++              (PyObject*)&PycairoRectangleInt_Type) == 1) {
++      Py_BEGIN_ALLOW_THREADS;
++      res = cairo_region_union_rectangle(o->region,
++          &(((PycairoRectangleInt *)other)->rectangle_int));
++      Py_END_ALLOW_THREADS;
++  } else {
++    PyErr_SetString(PyExc_TypeError,
++        "argument must be a Region or a RectangleInt.");
++    return NULL;
++  }
++  RETURN_NULL_IF_CAIRO_ERROR(res);
++  Py_RETURN_NONE;
++}
++
++PyObject *
++region_xor (PycairoRegion *o, PyObject *args) {
++  cairo_status_t res;
++  PyObject *other;
++  if (!PyArg_ParseTuple (args, "O:Region.xorg", &other))
++    return NULL;
++
++  if (PyObject_IsInstance(other, (PyObject*)&PycairoRegion_Type) == 1) {
++      Py_BEGIN_ALLOW_THREADS;
++      res = cairo_region_xor(o->region,
++              ((PycairoRegion *)other)->region);
++      Py_END_ALLOW_THREADS;
++  } else if (PyObject_IsInstance(other,
++              (PyObject*)&PycairoRectangleInt_Type) == 1) {
++      Py_BEGIN_ALLOW_THREADS;
++      res = cairo_region_xor_rectangle(o->region,
++          &(((PycairoRectangleInt *)other)->rectangle_int));
++      Py_END_ALLOW_THREADS;
++  } else {
++    PyErr_SetString(PyExc_TypeError,
++        "argument must be a Region or a RectangleInt.");
++    return NULL;
++  }
++  RETURN_NULL_IF_CAIRO_ERROR(res);
++  Py_RETURN_NONE;
++}
++
++static PyMethodDef region_methods[] = {
++  /* methods never exposed in a language binding:
++   * cairo_region_destroy()
++   * cairo_region_get_type()
++   * cairo_region_reference()
++   *
++   * cairo_region_status()
++   * - not needed since Pycairo handles status checking
++   *
++   * _(intersect/subtract/union/xor)_rectangle are merged with the region
++   * ones.
++   */
++  {"copy", (PyCFunction)region_copy,                        METH_NOARGS },
++  {"get_extents", (PyCFunction)region_get_extents,          METH_NOARGS },
++  {"num_rectangles", (PyCFunction)region_num_rectangles,    METH_NOARGS },
++  {"get_rectangle", (PyCFunction)region_get_rectangle,      METH_VARARGS },
++  {"is_empty", (PyCFunction)region_is_empty,                METH_NOARGS },
++  {"contains_point", (PyCFunction)region_contains_point,    METH_VARARGS },
++  {"contains_rectangle", (PyCFunction)region_contains_rectangle,
++    METH_VARARGS },
++  {"equal", (PyCFunction)region_equal,                      METH_VARARGS },
++  {"translate", (PyCFunction)region_translate,              METH_VARARGS },
++  {"intersect", (PyCFunction)region_intersect,              METH_VARARGS },
++  {"subtract", (PyCFunction)region_subtract,                METH_VARARGS },
++  {"union", (PyCFunction)region_union,                      METH_VARARGS },
++  {"xor", (PyCFunction)region_xor,                          METH_VARARGS },
++  {NULL, NULL, 0, NULL},
++};
++
++PyTypeObject PycairoRegion_Type = {
++  PyVarObject_HEAD_INIT(&PyType_Type, 0)
++  "cairo.Region",			/* tp_name */
++  sizeof(PycairoRegion),		/* tp_basicsize */
++  0,					/* tp_itemsize */
++  (destructor)region_dealloc,		/* tp_dealloc */
++  0,					/* tp_print */
++  0,					/* tp_getattr */
++  0,					/* tp_setattr */
++  0,					/* tp_compare */
++  0,		                	/* tp_repr */
++  0,					/* tp_as_number */
++  0,              			/* tp_as_sequence */
++  0,					/* tp_as_mapping */
++  0,					/* tp_hash */
++  0,					/* tp_call */
++  0,	        	        	/* tp_str */
++  0,	                        	/* tp_getattro */
++  0,					/* tp_setattro */
++  0,					/* tp_as_buffer */
++  Py_TPFLAGS_DEFAULT,			/* tp_flags */
++  0,      				/* tp_doc */
++  0,					/* tp_traverse */
++  0,					/* tp_clear */
++  (richcmpfunc)region_richcompare,	/* tp_richcompare */
++  0,					/* tp_weaklistoffset */
++  0,              		        /* tp_iter */
++  0,					/* tp_iternext */
++  region_methods,			/* tp_methods */
++  0,					/* tp_members */
++  0,					/* tp_getset */
++  0,                                    /* tp_base */
++  0,					/* tp_dict */
++  0,					/* tp_descr_get */
++  0,					/* tp_descr_set */
++  0,					/* tp_dictoffset */
++  0,	            	                /* tp_init */
++  0,					/* tp_alloc */
++  (newfunc)region_new,      		/* tp_new */
++};
+--- py3cairo-1.10.0+dfsg.orig/src/py3cairo.h
++++ py3cairo-1.10.0+dfsg/src/py3cairo.h
+@@ -67,6 +67,16 @@ typedef struct {
+ 
+ typedef struct {
+   PyObject_HEAD
++  cairo_rectangle_int_t rectangle_int;
++} PycairoRectangleInt;
++
++typedef struct {
++  PyObject_HEAD
++  cairo_region_t *region;
++} PycairoRegion;
++
++typedef struct {
++  PyObject_HEAD
+   cairo_scaled_font_t *scaled_font;
+ } PycairoScaledFont;
+ 
+@@ -129,6 +139,14 @@ typedef struct {
+ 
+   /* misc functions */
+   int (*Check_Status)(cairo_status_t status);
++
++  PyTypeObject *RectangleInt_Type;
++  PyObject *(*RectangleInt_FromRectangleInt)(
++      const cairo_rectangle_int_t *rectangle_int);
++
++  PyTypeObject *Region_Type;
++  PyObject *(*Region_FromRegion)(const cairo_region_t *region);
++
+ } Pycairo_CAPI_t;
+ 
+ 
+@@ -156,6 +174,13 @@ typedef struct {
+ #define PycairoRadialGradient_Type  *(Pycairo_CAPI->RadialGradient_Type)
+ #define PycairoPattern_FromPattern   (Pycairo_CAPI->Pattern_FromPattern)
+ 
++#define PycairoRectangleInt_Type    *(Pycairo_CAPI->RectangleInt_Type)
++#define PycairoRectangleInt_FromRectangleInt  \
++                                  (Pycairo_CAPI->RectangleInt_FromRectangleInt)
++
++#define PycairoRegion_Type          *(Pycairo_CAPI->Region_Type)
++#define PycairoRegion_FromRegion     (Pycairo_CAPI->Region_FromRegion)
++
+ #define PycairoScaledFont_Type      *(Pycairo_CAPI->ScaledFont_Type)
+ #define PycairoScaledFont_FromScaledFont \
+                                      (Pycairo_CAPI->ScaledFont_FromScaledFont)
+--- py3cairo-1.10.0+dfsg.orig/src/cairomodule.c
++++ py3cairo-1.10.0+dfsg/src/cairomodule.c
+@@ -141,6 +141,12 @@ static Pycairo_CAPI_t CAPI = {
+   PycairoSurface_FromSurface,
+ 
+   Pycairo_Check_Status,
++
++  &PycairoRectangleInt_Type,
++  PycairoRectangleInt_FromRectangleInt,
++
++  &PycairoRegion_Type,
++  PycairoRegion_FromRegion,
+ };
+ 
+ static PyObject *
+@@ -230,6 +236,12 @@ PyInit__cairo(void)
+   if (PyType_Ready(&PycairoRadialGradient_Type) < 0)
+     return NULL;
+ 
++  if (PyType_Ready(&PycairoRectangleInt_Type) < 0)
++    return NULL;
++
++  if (PyType_Ready(&PycairoRegion_Type) < 0)
++    return NULL;
++
+   if (PyType_Ready(&PycairoScaledFont_Type) < 0)
+     return NULL;
+ 
+@@ -315,6 +327,12 @@ PyInit__cairo(void)
+   PyModule_AddObject(m, "RadialGradient",
+ 		     (PyObject *)&PycairoRadialGradient_Type);
+ 
++  Py_INCREF(&PycairoRectangleInt_Type);
++  PyModule_AddObject(m, "RectangleInt", (PyObject *)&PycairoRectangleInt_Type);
++
++  Py_INCREF(&PycairoRegion_Type);
++  PyModule_AddObject(m, "Region", (PyObject *)&PycairoRegion_Type);
++
+   Py_INCREF(&PycairoScaledFont_Type);
+   PyModule_AddObject(m, "ScaledFont", (PyObject *)&PycairoScaledFont_Type);
+ 
+@@ -519,6 +537,10 @@ PyInit__cairo(void)
+   CONSTANT(PS_LEVEL_3);
+ #endif
+ 
++  CONSTANT(REGION_OVERLAP_IN);
++  CONSTANT(REGION_OVERLAP_OUT);
++  CONSTANT(REGION_OVERLAP_PART);
++
+   CONSTANT(SUBPIXEL_ORDER_DEFAULT);
+   CONSTANT(SUBPIXEL_ORDER_RGB);
+   CONSTANT(SUBPIXEL_ORDER_BGR);
+--- py3cairo-1.10.0+dfsg.orig/src/wscript
++++ py3cairo-1.10.0+dfsg/src/wscript
+@@ -25,6 +25,7 @@ def build(ctx):
+                     'font.c',
+                     'path.c',
+                     'pattern.c',
++                    'region.c',
+                     'matrix.c',
+                     'surface.c',
+                     ],
+--- py3cairo-1.10.0+dfsg.orig/src/private.h
++++ py3cairo-1.10.0+dfsg/src/private.h
+@@ -60,6 +60,13 @@ extern PyTypeObject PycairoLinearGradien
+ extern PyTypeObject PycairoRadialGradient_Type;
+ PyObject *PycairoPattern_FromPattern (cairo_pattern_t *pattern,
+ 				      PyObject *base);
++ 
++extern PyTypeObject PycairoRectangleInt_Type;
++PyObject *PycairoRectangleInt_FromRectangleInt (
++				       cairo_rectangle_int_t *rectangle_int);
++
++extern PyTypeObject PycairoRegion_Type;
++PyObject *PycairoRegion_FromRegion (cairo_region_t *region);
+ 
+ extern PyTypeObject PycairoScaledFont_Type;
+ PyObject *PycairoScaledFont_FromScaledFont (cairo_scaled_font_t *scaled_font);
+@@ -153,6 +160,15 @@ int Pycairo_Check_Status (cairo_status_t
+     if (status != CAIRO_STATUS_SUCCESS) {			\
+       Pycairo_Check_Status (status);				\
+       return NULL;						\
++    }								\
++  } while (0)
++
++#define RETURN_NULL_IF_CAIRO_REGION_ERROR(region)               \
++  do {								\
++    cairo_status_t status = cairo_region_status (region);	\
++    if (status != CAIRO_STATUS_SUCCESS) {			\
++      Pycairo_Check_Status (status);				\
++      return NULL;						\
+     }								\
+   } while (0)
+ 
+--- py3cairo-1.10.0+dfsg.orig/test/api_test.py
++++ py3cairo-1.10.0+dfsg/test/api_test.py
+@@ -84,3 +84,65 @@ def test_surface():
+ 
+ def test_text():
+   pass
++
++
++def test_region():
++  a = cairo.Region()
++  assert a.is_empty() == True
++  assert a.num_rectangles() == 0
++
++  b = cairo.RectangleInt(1, 2, 10, 12)
++  d = cairo.RectangleInt(1, 1, 10, 12)
++  e = cairo.RectangleInt(1, 3, 8, 12)
++  assert (b.x, b.y, b.width, b.height) == (1, 2, 10, 12)
++  c = cairo.Region((b, e))
++  assert not c.is_empty()
++  assert c.num_rectangles() == 2
++  assert c.get_rectangle(1).y == 14
++
++  ex = c.get_extents()
++  assert ex == cairo.RectangleInt(1, 2, 10, 13)
++  assert c.contains_rectangle(d) == cairo.REGION_OVERLAP_PART
++
++  c.translate(10, 20)
++  assert c.contains_rectangle(d) == cairo.REGION_OVERLAP_OUT
++  assert c.get_rectangle(1) == cairo.RectangleInt(11, 34, 8, 1)
++
++  cp = c.copy()
++  assert c.num_rectangles() == cp.num_rectangles()
++  assert c.get_rectangle(0) == cp.get_rectangle(0)
++  assert c == cp
++  assert 3 != c
++  assert c != "test"
++
++  c = cairo.Region((b, e))
++  c.intersect(d)
++  assert c.num_rectangles() == 1
++  assert c.get_rectangle(0) == cairo.RectangleInt(1, 2, 10, 11)
++
++  c = cairo.Region((b, e))
++  c.subtract(d)
++  assert c.num_rectangles() == 2
++  assert c == cairo.Region([
++      cairo.RectangleInt(1, 13, 10, 1), cairo.RectangleInt(1, 14, 8, 1) ])
++
++  d = cairo.Region(d)
++  c = cairo.Region((b, e))
++  c.subtract(d)
++  assert c.num_rectangles() == 2
++  assert c.get_rectangle(0) == cairo.RectangleInt(1, 13, 10, 1)
++
++  c = cairo.Region((b, e))
++  c.union(d)
++  assert c.num_rectangles() == 2
++  assert c == cairo.Region([
++      cairo.RectangleInt(1, 1, 10, 13), cairo.RectangleInt(1, 14, 8, 1) ])
++
++  c = cairo.Region((b, e))
++  c.xor(d)
++  assert c.num_rectangles() == 3
++  assert c == cairo.Region([
++      cairo.RectangleInt(1, 1, 10, 1),
++      cairo.RectangleInt(1, 14, 8, 1),
++      cairo.RectangleInt(1, 13, 10, 1),
++      ])
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-50_specify-encoding-in-waf.patch b/dev-python/pycairo/files/pycairo-1.10.0-50_specify-encoding-in-waf.patch
new file mode 100644
index 000000000000..5356554e75fa
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.10.0-50_specify-encoding-in-waf.patch
@@ -0,0 +1,32 @@
+Description: specify encoding in waf
+ This patch specifies utf-8 as the encoding in waf library, because python 3.3
+ doesn't fallback to utf-8 on default.
+Author: Matthias Klose <doko@ubuntu.com>
+Origin: http://launchpadlibrarian.net/120606963/py3cairo_1.10.0%2Bdfsg-3~exp2_1.10.0%2Bdfsg-3~exp2ubuntu1.diff.gz
+Bug-Debian: http://bugs.debian.org/691241
+Last-Update: 2012-10-28
+
+--- py3cairo-1.10.0+dfsg.orig/waflib/Utils.py
++++ py3cairo-1.10.0+dfsg/waflib/Utils.py
+@@ -77,8 +77,8 @@ except ImportError:
+ 				return value
+ is_win32=sys.platform=='win32'
+ indicator=is_win32 and'\x1b[A\x1b[K%s%s%s\r'or'\x1b[K%s%s%s\r'
+-def readf(fname,m='r'):
+-	f=open(fname,m)
++def readf(fname,m='r',enc=None):
++	f=open(fname,m,encoding=enc)
+ 	try:
+ 		txt=f.read()
+ 	finally:
+--- py3cairo-1.10.0+dfsg.orig/waflib/Tools/c_preproc.py
++++ py3cairo-1.10.0+dfsg/waflib/Tools/c_preproc.py
+@@ -44,7 +44,7 @@ def repl(m):
+ 		return' '
+ 	return m.group(3)or''
+ def filter_comments(filename):
+-	code=Utils.readf(filename)
++	code=Utils.readf(filename, enc='utf-8')
+ 	if use_trigraphs:
+ 		for(a,b)in trig_def:code=code.split(a).join(b)
+ 	code=re_nl.sub('',code)
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-80_fix-pickle.patch b/dev-python/pycairo/files/pycairo-1.10.0-80_fix-pickle.patch
new file mode 100644
index 000000000000..3e0cdc3e61f4
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.10.0-80_fix-pickle.patch
@@ -0,0 +1,30 @@
+Description: During the build process, a Context instance is pickled, or at
+ least attempted to be.  This fails because self.node_class is assigned to a
+ class which is nested inside the __init__() method.  Because Python cannot
+ find this class at unpickling time (i.e. it cannot be imported), Python
+ refuses to pickle the Context instance, leading to a FTBFS.  Since there's no
+ obvious reason why the class has to be so nested, moving it to a module
+ global solves the build failure.
+Author: Barry Warsaw <barry@debian.org>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=91561
+
+--- a/waflib/Context.py
++++ b/waflib/Context.py
+@@ -51,6 +51,8 @@
+ 		global classes
+ 		classes.insert(0,cls)
+ ctx=store_context('ctx',(object,),{})
++class node_class(waflib.Node.Node):
++    pass
+ class Context(ctx):
+ 	errors=Errors
+ 	tools={}
+@@ -60,8 +62,6 @@
+ 		except KeyError:
+ 			global run_dir
+ 			rd=run_dir
+-		class node_class(waflib.Node.Node):
+-			pass
+ 		self.node_class=node_class
+ 		self.node_class.__module__="waflib.Node"
+ 		self.node_class.__name__="Nod3"
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-81_pickling-again.patch b/dev-python/pycairo/files/pycairo-1.10.0-81_pickling-again.patch
new file mode 100644
index 000000000000..3aad32593b3c
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.10.0-81_pickling-again.patch
@@ -0,0 +1,37 @@
+Description: Follow up to 80_fix-pickle.patch.  Just disable pickling
+ altogether since the previous patch doesn't really fix the problem, and not
+ storing the pickle seems to have no adverse effects on the build, while
+ avoiding the observed traceback.
+Author: Barry Warsaw <barry@debian.org>
+Forwarded: no
+
+--- a/waflib/Build.py
++++ b/waflib/Build.py
+@@ -151,6 +151,7 @@
+ 				f.close()
+ 		self.init_dirs()
+ 	def store(self):
++		return
+ 		data={}
+ 		for x in SAVED_ATTRS:
+ 			data[x]=getattr(self,x)
+--- a/waflib/Context.py
++++ b/waflib/Context.py
+@@ -51,8 +51,6 @@
+ 		global classes
+ 		classes.insert(0,cls)
+ ctx=store_context('ctx',(object,),{})
+-class node_class(waflib.Node.Node):
+-    pass
+ class Context(ctx):
+ 	errors=Errors
+ 	tools={}
+@@ -62,6 +60,8 @@
+ 		except KeyError:
+ 			global run_dir
+ 			rd=run_dir
++		class node_class(waflib.Node.Node):
++			pass
+ 		self.node_class=node_class
+ 		self.node_class.__module__="waflib.Node"
+ 		self.node_class.__name__="Nod3"
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-svg_check.patch b/dev-python/pycairo/files/pycairo-1.10.0-svg_check.patch
new file mode 100644
index 000000000000..572a5f6cc717
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.10.0-svg_check.patch
@@ -0,0 +1,126 @@
+--- src/cairomodule.c
++++ src/cairomodule.c
+@@ -116,7 +116,7 @@
+ #else
+   0,
+ #endif
+-#ifdef CAIRO_HAS_SVG_SURFACE
++#ifdef PYCAIRO_ENABLE_SVG
+   &PycairoSVGSurface_Type,
+ #else
+   0,
+@@ -247,7 +247,7 @@
+   if (PyType_Ready(&PycairoPSSurface_Type) < 0)
+     return NULL;
+ #endif
+-#ifdef CAIRO_HAS_SVG_SURFACE
++#ifdef PYCAIRO_ENABLE_SVG
+   if (PyType_Ready(&PycairoSVGSurface_Type) < 0)
+     return NULL;
+ #endif
+@@ -337,7 +337,7 @@
+   PyModule_AddObject(m, "PSSurface", (PyObject *)&PycairoPSSurface_Type);
+ #endif
+ 
+-#ifdef CAIRO_HAS_SVG_SURFACE
++#ifdef PYCAIRO_ENABLE_SVG
+   Py_INCREF(&PycairoSVGSurface_Type);
+   PyModule_AddObject(m, "SVGSurface", (PyObject *)&PycairoSVGSurface_Type);
+ #endif
+@@ -399,7 +399,7 @@
+ #else
+   PyModule_AddIntConstant(m, "HAS_PS_SURFACE", 0);
+ #endif
+-#if CAIRO_HAS_SVG_SURFACE
++#if PYCAIRO_ENABLE_SVG
+   PyModule_AddIntConstant(m, "HAS_SVG_SURFACE", 1);
+ #else
+   PyModule_AddIntConstant(m, "HAS_SVG_SURFACE", 0);
+--- src/private.h
++++ src/private.h
+@@ -75,7 +75,7 @@
+ extern PyTypeObject PycairoPSSurface_Type;
+ #endif
+ 
+-#if CAIRO_HAS_SVG_SURFACE
++#if PYCAIRO_ENABLE_SVG
+ extern PyTypeObject PycairoSVGSurface_Type;
+ #endif
+ 
+--- src/py3cairo.h
++++ src/py3cairo.h
+@@ -171,7 +171,7 @@
+ #define PycairoPSSurface_Type       *(Pycairo_CAPI->PSSurface_Type)
+ #endif
+ 
+-#if CAIRO_HAS_SVG_SURFACE
++#if PYCAIRO_ENABLE_SVG
+ #define PycairoSVGSurface_Type      *(Pycairo_CAPI->SVGSurface_Type)
+ #endif
+ 
+--- src/surface.c
++++ src/surface.c
+@@ -72,7 +72,7 @@
+     type = &PycairoPSSurface_Type;
+     break;
+ #endif
+-#if CAIRO_HAS_SVG_SURFACE
++#if PYCAIRO_ENABLE_SVG
+   case CAIRO_SURFACE_TYPE_SVG:
+     type = &PycairoSVGSurface_Type;
+     break;
+@@ -1022,7 +1022,7 @@
+ 
+ 
+ /* Class SVGSurface(Surface) ----------------------------------------------- */
+-#ifdef CAIRO_HAS_SVG_SURFACE
++#ifdef PYCAIRO_ENABLE_SVG
+ #include <cairo-svg.h>
+ 
+ static PyObject *
+@@ -1133,7 +1133,7 @@
+   0,                                  /* tp_is_gc */
+   0,                                  /* tp_bases */
+ };
+-#endif  /* CAIRO_HAS_SVG_SURFACE */
++#endif  /* PYCAIRO_ENABLE_SVG */
+ 
+ 
+ #if CAIRO_HAS_WIN32_SURFACE
+--- wscript
++++ wscript
+@@ -1,6 +1,7 @@
+ # -*- python -*-
+ 
+ import os
++import subprocess
+ 
+ top = '.'
+ out = 'build_directory'
+@@ -11,6 +12,17 @@
+ cairo_version_required = '1.10.0'
+ 
+ 
++def check_svg():
++  if os.environ.get('PYCAIRO_DISABLE_SVG', None) is None:
++    return_code = subprocess.call(['pkg-config', '--exists', 'cairo-svg'])
++    if return_code == 0:
++      return True
++    else:
++      return False
++  else:
++    return False
++
++
+ def options(ctx):
+   print('  %s/options()' %d)
+   ctx.tool_options('gnu_dirs')
+@@ -39,6 +51,8 @@
+   ctx.define('PYCAIRO_VERSION_MAJOR', version[0])
+   ctx.define('PYCAIRO_VERSION_MINOR', version[1])
+   ctx.define('PYCAIRO_VERSION_MICRO', version[2])
++  if check_svg():
++    ctx.define('PYCAIRO_ENABLE_SVG', 1)
+ 
+   ctx.write_config_header('src/config.h')
+ 
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-waf-py3_4.patch b/dev-python/pycairo/files/pycairo-1.10.0-waf-py3_4.patch
new file mode 100644
index 000000000000..6e79db9ba272
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.10.0-waf-py3_4.patch
@@ -0,0 +1,11 @@
+--- a/waflib/Tools/python.py
++++ b/waflib/Tools/python.py
+@@ -169,7 +169,7 @@
+ 		conf.find_program('python-config-%s'%num,var='PYTHON_CONFIG',mandatory=False)
+ 	includes=[]
+ 	if conf.env.PYTHON_CONFIG:
+-		for incstr in conf.cmd_and_log(conf.env.PYTHON+[conf.env.PYTHON_CONFIG,'--includes']).strip().split():
++		for incstr in conf.cmd_and_log([conf.env.PYTHON_CONFIG,'--includes']).strip().split():
+ 			if(incstr.startswith('-I')or incstr.startswith('/I')):
+ 				incstr=incstr[2:]
+ 			if incstr not in includes:
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-waf-unpack.patch b/dev-python/pycairo/files/pycairo-1.10.0-waf-unpack.patch
new file mode 100644
index 000000000000..7d54ba160d68
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.10.0-waf-unpack.patch
@@ -0,0 +1,12 @@
+--- a/waf
++++ b/waf
+@@ -153,6 +153,9 @@
+ 	return dir
+ 
+ wafdir = find_lib()
++if sys.argv[1:] == ['unpack']:
++    print(wafdir)
++    exit()
+ sys.path.insert(0, wafdir)
+ from waflib.Tools.c_config import MACRO_TO_DESTOS 
+ MACRO_TO_DESTOS['__POWERPC__'] = 'darwin'
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-xpyb.patch b/dev-python/pycairo/files/pycairo-1.10.0-xpyb.patch
new file mode 100644
index 000000000000..33de2692f838
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.10.0-xpyb.patch
@@ -0,0 +1,41 @@
+--- pycairo-1.10.0/wscript
++++ pycairo-1.10.0/wscript
+@@ -10,6 +10,7 @@
+ APPNAME='pycairo'
+ VERSION='1.10.0'
+ cairo_version_required = '1.10.0'
++xpyb_version_required  = '1.3'    # optional
+ 
+ 
+ def check_svg():
+@@ -23,6 +24,17 @@
+     return False
+ 
+ 
++def check_xpyb():
++  if os.environ.get('PYCAIRO_DISABLE_XPYB', None) is None:
++    return_code = subprocess.call(['pkg-config', '--exists', 'xpyb'])
++    if return_code == 0:
++      return True
++    else:
++      return False
++  else:
++    return False
++
++
+ def options(ctx):
+   print('  %s/options()' %d)
+   ctx.tool_options('gnu_dirs')
+@@ -42,6 +54,12 @@
+   ctx.check_cfg(package='cairo', atleast_version=cairo_version_required,
+                 args='--cflags --libs')
+ 
++# xpyb for Python 3 is not available yet.
++# the Python 3 version should probably have a different name than 'xpyb'
++#  if check_xpyb():
++#    ctx.check_cfg(package='xpyb', atleast_version=xpyb_version_required,
++#                  args='--cflags --libs', mandatory=False)
++
+   # add gcc options
+   if env['CC_NAME'] == 'gcc':
+     env.append_unique('CCFLAGS', ['-std=c99', '-Wall'])
diff --git a/dev-python/pycairo/metadata.xml b/dev-python/pycairo/metadata.xml
new file mode 100644
index 000000000000..e24dd86faa2a
--- /dev/null
+++ b/dev-python/pycairo/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/pycairo/pycairo-1.10.0-r4.ebuild b/dev-python/pycairo/pycairo-1.10.0-r4.ebuild
new file mode 100644
index 000000000000..4c9419103d4b
--- /dev/null
+++ b/dev-python/pycairo/pycairo-1.10.0-r4.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit eutils python-r1 waf-utils toolchain-funcs
+
+PYCAIRO_PYTHON2_VERSION="${PV}"
+PYCAIRO_PYTHON3_VERSION="${PV}"
+
+DESCRIPTION="Python bindings for the cairo library"
+HOMEPAGE="http://cairographics.org/pycairo/ https://pypi.python.org/pypi/pycairo"
+SRC_URI="http://cairographics.org/releases/py2cairo-${PYCAIRO_PYTHON2_VERSION}.tar.bz2
+	http://cairographics.org/releases/pycairo-${PYCAIRO_PYTHON3_VERSION}.tar.bz2"
+
+# LGPL-3 for pycairo 1.10.0.
+# || ( LGPL-2.1 MPL-1.1 ) for pycairo 1.8.10.
+LICENSE="LGPL-3 || ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples +svg test xcb"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Note: xpyb is used as the C header, not Python modules
+RDEPEND="${PYTHON_DEPS}
+	>=x11-libs/cairo-1.10.0[svg?,xcb?]
+	xcb? ( x11-libs/xpyb )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+src_prepare() {
+
+	pushd "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" > /dev/null
+	rm -f src/config.h || die
+	epatch "${FILESDIR}/${PN}-1.10.0-svg_check.patch"
+	epatch "${FILESDIR}/${PN}-1.10.0-xpyb.patch"
+	epatch "${FILESDIR}/${PN}-1.10.0-waf-unpack.patch"
+	epatch "${FILESDIR}"/py2cairo-1.10.0-ppc-darwin.patch
+	popd > /dev/null
+
+	pushd "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" > /dev/null
+	rm -f src/config.h || die
+	epatch "${FILESDIR}/py2cairo-1.10.0-svg_check.patch"
+	epatch "${FILESDIR}/py2cairo-1.10.0-xpyb.patch"
+	epatch "${FILESDIR}"/py2cairo-1.10.0-ppc-darwin.patch
+	popd > /dev/null
+
+	preparation() {
+		if python_is_python3; then
+			cp -r -l "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" "${BUILD_DIR}" || die
+			pushd "${BUILD_DIR}" > /dev/null
+			wafdir="$(./waf unpack)"
+			pushd "${wafdir}" > /dev/null
+			epatch "${FILESDIR}/${PN}-1.10.0-waf-py3_4.patch"
+			popd > /dev/null
+			popd > /dev/null
+		else
+			cp -r -l "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" "${BUILD_DIR}" || die
+		fi
+	}
+	python_foreach_impl preparation
+}
+
+src_configure() {
+	if ! use svg; then
+		export PYCAIRO_DISABLE_SVG=1
+	fi
+
+	if ! use xcb; then
+		export PYCAIRO_DISABLE_XPYB=1
+	fi
+
+	tc-export PKG_CONFIG
+	# Also export the var with the slightly diff name that waf uses for no good reason.
+	export PKGCONFIG=${PKG_CONFIG}
+
+	# Added by grobian:
+	# If WAF_BINARY is an absolute path, the configure is different and fails to
+	# find Python.h due to a compiler misconfiguration.  If WAF_BINARY is just
+	# ./waf or python waf, it works fine.  Hooray for reinvented buildsystems
+
+	# floppym:
+	# pycairo and py2cairo bundle different versions of waf (bug 447856)
+	WAF_BINARY="./waf"
+	python_foreach_impl run_in_build_dir waf-utils_src_configure --nopyc --nopyo
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir waf-utils_src_compile
+}
+
+src_test() {
+	test_installation() {
+		./waf install --destdir="${T}/tests/${BUILD_DIR}"
+		PYTHONPATH="${T}/tests/${BUILD_DIR}$(python_get_sitedir)" py.test -v
+	}
+	python_foreach_impl run_in_build_dir test_installation
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir waf-utils_src_install
+
+	dodoc AUTHORS NEWS README
+
+	if use doc; then
+		pushd doc/_build/html > /dev/null || die
+		dohtml -r [a-z]* _static
+		popd > /dev/null || die
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/*
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_names; next to waf producing dylibs (not bundles) and
+		# calling them .bundle, it also has no idea what it should do to create
+		# proper ones (dylibs)
+		fix_darwin_install_names() {
+			local x="$(python_get_sitedir)/cairo/_cairo.bundle"
+			install_name_tool -id "${x}" "${ED}${x}"
+		}
+		python_foreach_impl fix_darwin_install_names
+	fi
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null || die
+}
diff --git a/dev-python/pycairo/pycairo-1.10.0-r5.ebuild b/dev-python/pycairo/pycairo-1.10.0-r5.ebuild
new file mode 100644
index 000000000000..7a63fcf48d49
--- /dev/null
+++ b/dev-python/pycairo/pycairo-1.10.0-r5.ebuild
@@ -0,0 +1,148 @@
+# 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} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit eutils python-r1 waf-utils toolchain-funcs
+
+PYCAIRO_PYTHON2_VERSION="${PV}"
+PYCAIRO_PYTHON3_VERSION="${PV}"
+
+DESCRIPTION="Python bindings for the cairo library"
+HOMEPAGE="http://cairographics.org/pycairo/ https://pypi.python.org/pypi/pycairo"
+SRC_URI="
+	http://cairographics.org/releases/py2cairo-${PYCAIRO_PYTHON2_VERSION}.tar.bz2
+	http://cairographics.org/releases/pycairo-${PYCAIRO_PYTHON3_VERSION}.tar.bz2"
+
+# LGPL-3 for pycairo 1.10.0.
+# || ( LGPL-2.1 MPL-1.1 ) for pycairo 1.8.10.
+LICENSE="LGPL-3 || ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples +svg test xcb"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Note: xpyb is used as the C header, not Python modules
+RDEPEND="${PYTHON_DEPS}
+	>=x11-libs/cairo-1.10.0[svg?,xcb?]
+	xcb? ( x11-libs/xpyb )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+src_prepare() {
+	pushd "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" > /dev/null || die
+	rm -f src/config.h || die
+	epatch \
+		"${FILESDIR}/${PN}-1.10.0-svg_check.patch" \
+		"${FILESDIR}/${PN}-1.10.0-xpyb.patch" \
+		"${FILESDIR}/${PN}-1.10.0-waf-unpack.patch" \
+		"${FILESDIR}"/py2cairo-1.10.0-ppc-darwin.patch \
+		"${FILESDIR}"/pycairo-1.10.0-101_pycairo-region.patch
+	popd > /dev/null
+
+	pushd "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" > /dev/null || die
+	rm -f src/config.h || die
+	epatch \
+		"${FILESDIR}/py2cairo-1.10.0-svg_check.patch" \
+		"${FILESDIR}/py2cairo-1.10.0-xpyb.patch" \
+		"${FILESDIR}"/py2cairo-1.10.0-ppc-darwin.patch
+	popd > /dev/null
+
+	preparation() {
+		if python_is_python3; then
+			cp -r -l "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" "${BUILD_DIR}" || die
+			pushd "${BUILD_DIR}" > /dev/null || die
+			wafdir="$(./waf unpack)"
+			pushd "${wafdir}" > /dev/null || die
+			epatch \
+				"${FILESDIR}/${PN}-1.10.0-waf-py3_4.patch" \
+				"${FILESDIR}"/pycairo-1.10.0-50_specify-encoding-in-waf.patch \
+				"${FILESDIR}"/pycairo-1.10.0-80_fix-pickle.patch \
+				"${FILESDIR}"/pycairo-1.10.0-81_pickling-again.patch
+
+			popd > /dev/null
+			popd > /dev/null
+		else
+			cp -r -l "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" "${BUILD_DIR}" || die
+		fi
+	}
+	python_foreach_impl preparation
+}
+
+src_configure() {
+	if ! use svg; then
+		export PYCAIRO_DISABLE_SVG=1
+	fi
+
+	if ! use xcb; then
+		export PYCAIRO_DISABLE_XPYB=1
+	fi
+
+	tc-export PKG_CONFIG
+	# Also export the var with the slightly diff name that waf uses for no good reason.
+	export PKGCONFIG=${PKG_CONFIG}
+
+	# Added by grobian:
+	# If WAF_BINARY is an absolute path, the configure is different and fails to
+	# find Python.h due to a compiler misconfiguration.  If WAF_BINARY is just
+	# ./waf or python waf, it works fine.  Hooray for reinvented buildsystems
+
+	# floppym:
+	# pycairo and py2cairo bundle different versions of waf (bug 447856)
+	WAF_BINARY="./waf"
+	python_foreach_impl run_in_build_dir waf-utils_src_configure --nopyc --nopyo
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir waf-utils_src_compile
+}
+
+src_test() {
+	test_installation() {
+		./waf install --destdir="${T}/tests/${BUILD_DIR}"
+		PYTHONPATH="${T}/tests/${BUILD_DIR}$(python_get_sitedir)" py.test -v
+	}
+	python_foreach_impl run_in_build_dir test_installation
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir waf-utils_src_install
+
+	dodoc AUTHORS NEWS README
+
+	if use doc; then
+		pushd doc/_build/html > /dev/null || die
+		dohtml -r [a-z]* _static
+		popd > /dev/null || die
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/*
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_names; next to waf producing dylibs (not bundles) and
+		# calling them .bundle, it also has no idea what it should do to create
+		# proper ones (dylibs)
+		fix_darwin_install_names() {
+			local suffix=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("EXT_SUFFIX"))')
+			[[ -z ${suffix} || ${suffix} == "None" ]] && suffix=".bundle"
+			local x="$(python_get_sitedir)/cairo/_cairo${suffix}"
+			install_name_tool -id "${x}" "${D}${x}"
+		}
+		python_foreach_impl fix_darwin_install_names
+	fi
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null || die
+}
diff --git a/dev-python/pycairo/pycairo-1.13.1-r1.ebuild b/dev-python/pycairo/pycairo-1.13.1-r1.ebuild
new file mode 100644
index 000000000000..30b7fc97e0c4
--- /dev/null
+++ b/dev-python/pycairo/pycairo-1.13.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the cairo library"
+HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
+SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples test xcb"
+
+# Note: xpyb is used as the C header, not Python modules
+RDEPEND="
+	>=x11-libs/cairo-1.12.0[svg,xcb?]
+"
+DEPEND="${RDEPEND}
+	xcb? ( $(python_gen_cond_dep '>=x11-libs/xpyb-1.3' 'python2*') )
+	doc? ( dev-python/sphinx )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	# Fix pkgconfig path
+	sed -i -e "/libdir =/s:\"lib\":\"$(get_libdir)\":" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local enable_xpyb
+	python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
+
+	esetup.py build ${enable_xpyb}
+}
+
+python_compile_all() {
+	use doc && emake -C docs
+}
+
+python_test() {
+	local enable_xpyb
+	[[ ${EPYTHON} == python2* ]] && enable_xpyb=$(usex xcb "--enable-xpyb" "")
+
+	esetup.py test ${enable_xpyb}
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/. )
+
+	if use examples; then
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycairo/pycairo-1.15.0.ebuild b/dev-python/pycairo/pycairo-1.15.0.ebuild
new file mode 100644
index 000000000000..77146c084dc0
--- /dev/null
+++ b/dev-python/pycairo/pycairo-1.15.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the cairo library"
+HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
+SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples test xcb"
+
+# Note: xpyb is used as the C header, not Python modules
+RDEPEND="
+	>=x11-libs/cairo-1.13.1[svg,xcb?]
+"
+DEPEND="${RDEPEND}
+	xcb? ( $(python_gen_cond_dep '>=x11-libs/xpyb-1.3' 'python2*') )
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Fix pkgconfig path
+	sed -i -e "/libdir =/s:\"lib\":\"$(get_libdir)\":" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local enable_xpyb
+	python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
+
+	esetup.py build ${enable_xpyb}
+}
+
+python_compile_all() {
+	use doc && emake -C docs
+}
+
+python_test() {
+	local enable_xpyb
+	python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
+
+	esetup.py test ${enable_xpyb}
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/. )
+
+	if use examples; then
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycairo/pycairo-1.15.1.ebuild b/dev-python/pycairo/pycairo-1.15.1.ebuild
new file mode 100644
index 000000000000..77146c084dc0
--- /dev/null
+++ b/dev-python/pycairo/pycairo-1.15.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the cairo library"
+HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
+SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples test xcb"
+
+# Note: xpyb is used as the C header, not Python modules
+RDEPEND="
+	>=x11-libs/cairo-1.13.1[svg,xcb?]
+"
+DEPEND="${RDEPEND}
+	xcb? ( $(python_gen_cond_dep '>=x11-libs/xpyb-1.3' 'python2*') )
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Fix pkgconfig path
+	sed -i -e "/libdir =/s:\"lib\":\"$(get_libdir)\":" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local enable_xpyb
+	python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
+
+	esetup.py build ${enable_xpyb}
+}
+
+python_compile_all() {
+	use doc && emake -C docs
+}
+
+python_test() {
+	local enable_xpyb
+	python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
+
+	esetup.py test ${enable_xpyb}
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/. )
+
+	if use examples; then
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycairo/pycairo-1.15.2.ebuild b/dev-python/pycairo/pycairo-1.15.2.ebuild
new file mode 100644
index 000000000000..77146c084dc0
--- /dev/null
+++ b/dev-python/pycairo/pycairo-1.15.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the cairo library"
+HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
+SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples test xcb"
+
+# Note: xpyb is used as the C header, not Python modules
+RDEPEND="
+	>=x11-libs/cairo-1.13.1[svg,xcb?]
+"
+DEPEND="${RDEPEND}
+	xcb? ( $(python_gen_cond_dep '>=x11-libs/xpyb-1.3' 'python2*') )
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Fix pkgconfig path
+	sed -i -e "/libdir =/s:\"lib\":\"$(get_libdir)\":" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local enable_xpyb
+	python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
+
+	esetup.py build ${enable_xpyb}
+}
+
+python_compile_all() {
+	use doc && emake -C docs
+}
+
+python_test() {
+	local enable_xpyb
+	python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
+
+	esetup.py test ${enable_xpyb}
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/. )
+
+	if use examples; then
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycairo/pycairo-1.15.3.ebuild b/dev-python/pycairo/pycairo-1.15.3.ebuild
new file mode 100644
index 000000000000..77146c084dc0
--- /dev/null
+++ b/dev-python/pycairo/pycairo-1.15.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the cairo library"
+HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
+SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples test xcb"
+
+# Note: xpyb is used as the C header, not Python modules
+RDEPEND="
+	>=x11-libs/cairo-1.13.1[svg,xcb?]
+"
+DEPEND="${RDEPEND}
+	xcb? ( $(python_gen_cond_dep '>=x11-libs/xpyb-1.3' 'python2*') )
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Fix pkgconfig path
+	sed -i -e "/libdir =/s:\"lib\":\"$(get_libdir)\":" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local enable_xpyb
+	python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
+
+	esetup.py build ${enable_xpyb}
+}
+
+python_compile_all() {
+	use doc && emake -C docs
+}
+
+python_test() {
+	local enable_xpyb
+	python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
+
+	esetup.py test ${enable_xpyb}
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/. )
+
+	if use examples; then
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycallgraph/Manifest b/dev-python/pycallgraph/Manifest
new file mode 100644
index 000000000000..f6517524b033
--- /dev/null
+++ b/dev-python/pycallgraph/Manifest
@@ -0,0 +1,6 @@
+AUX python3.3-tests.patch 3268 SHA256 befac3ffb7f568f4f33170c740c4e6fb59f9d4596cf874145c8d1922e69e8fc5 SHA512 274b3af41f80058e1bbacf681b8f2ca7e09069dfb7f0a333cfc7ad417a1a88e738abb0d0ad340ab1b342076b7f331977617dce8b46bcd6e158764ffc09ee6a94 WHIRLPOOL 12bdb91bfb105a6f50e4d92a190d31e7ead0180c809f774ce7dd79ab008f20604e0c5b7640974897a18e55c8bb90ef63282510f63fa06f909261423648ed4371
+DIST pycallgraph-1.0.1.tar.gz 458254 SHA256 1ee59de9c9bfbaa51613546103ef7923c644bbc92bce2b7df563522a7c9bd3a8 SHA512 75a20cd8c50f070c961466f89b70384c914129c8ffcbca3ffde8c4729cd5f8a3dc94c4a33d54990e5cb9e502ccd1038c64e878da84cf832065fe4ece74356e2e WHIRLPOOL a6ce038bc6529dca3e6d3b11f95d7ee521785c3ae32356bb95dfad1a3bf8830a240b51f53ca9c801534750dae16b5f14eeda625c045b2db516c8bc88aa760405
+EBUILD pycallgraph-1.0.1.ebuild 1822 SHA256 2858339e72a3672bec5f4290f9afc4b09f610449f457f7f4dc615cbe5f6dec01 SHA512 f061b54300fb2ac8b8204f4d9acd36737efb02a7fba1ff2ceb24c68f881a07ea30d94eb1c2f169193f30000402889a35894ca1f7e1fb79c4eae1b4808bc62355 WHIRLPOOL b59eaa0c5c028c542996a4eb8a16a3867d41be758d6fdb0a0d844794cc741a1344978f8d403bb1b661142e56a740bd086f779e62d73767127621b443158510e5
+MISC ChangeLog 2352 SHA256 7fe93caef3da7e2a209f6fea1c10fb1088a5a38dd9b17e0f321344dbc0dd2ddb SHA512 c642b624342a8e6431acbbe73847445b6270418964c8bd555c9093830663ec5afcff1c8458e059fdb6725949633e36b1ac960eed658464011f915cc774173c2a WHIRLPOOL 04a59071e0999f439a26a529bc959485d7e69c081a612dadc7cba1c27f74836d4b7f1a3e69a03eed2244ef390262b29289b20fa564252067e6b93f5ff92af10f
+MISC ChangeLog-2015 843 SHA256 d281841559b333fe53397fb83f65a9e0aea4070af5465640942e0cc8904e7e92 SHA512 f1a40244a8056c8a1a06c1196b2b14269429084fc15a85b12ed7acb035bb5c2adbc36aea1cf3cdf4ebc9550580aec58d9a886d877b2becfd0715c7576906fd5b WHIRLPOOL 820bc92df0d22f347508512ef0b0d0635cc8b50f05a62f4d363de9f6f595357d53be202cb8b5938e6d3c2c865f75808c7de9382ef84a24d7b583ffa64ffd4380
+MISC metadata.xml 326 SHA256 c9acc386b268afc9f6d8b4e427c913db11890248567b3be9c810abee1bd0a428 SHA512 e2548723ad40698993a02d7a73a7e62046ab1ba7015a9641f240bd1080ff67f502324f3dee203341d26dfaf025d8aa2e106274489c6ec5940c94eecb8bb3feeb WHIRLPOOL 8322a3b43f98bdd7cca47610395beb2b3c82861315a6687595049f849fb94bd2b0480c2626c00e99532e6d7fa3bd277ea6158bddd945e60ae34996b5c6166883
diff --git a/dev-python/pycallgraph/files/python3.3-tests.patch b/dev-python/pycallgraph/files/python3.3-tests.patch
new file mode 100644
index 000000000000..90f31a09ce4b
--- /dev/null
+++ b/dev-python/pycallgraph/files/python3.3-tests.patch
@@ -0,0 +1,87 @@
+diff --git a/pycallgraph/config.py b/pycallgraph/config.py
+index 5911fef..e3492c1 100755
+--- a/pycallgraph/config.py
++++ b/pycallgraph/config.py
+@@ -34,7 +34,7 @@ class Config(object):
+         self.did_init = True
+ 
+         # Update the defaults with anything from kwargs
+-        [setattr(self, k, v) for k, v in kwargs.iteritems()]
++        [setattr(self, k, v) for k, v in kwargs.items()]
+ 
+         self.create_parser()
+ 
+diff --git a/pycallgraph/output/graphviz.py b/pycallgraph/output/graphviz.py
+index 6f10049..d130d65 100644
+--- a/pycallgraph/output/graphviz.py
++++ b/pycallgraph/output/graphviz.py
+@@ -148,7 +148,7 @@ class GraphvizOutput(Output):
+ 
+     def attrs_from_dict(self, d):
+         output = []
+-        for attr, val in d.iteritems():
++        for attr, val in d.items():
+             output.append('%s = "%s"' % (attr, val))
+         return ', '.join(output)
+ 
+@@ -164,7 +164,7 @@ class GraphvizOutput(Output):
+ 
+     def generate_attributes(self):
+         output = []
+-        for section, attrs in self.graph_attributes.iteritems():
++        for section, attrs in self.graph_attributes.items():
+             output.append('{} [ {} ];'.format(
+                 section, self.attrs_from_dict(attrs),
+             ))
+diff --git a/pycallgraph/output/output.py b/pycallgraph/output/output.py
+index 9660d58..48eef49 100644
+--- a/pycallgraph/output/output.py
++++ b/pycallgraph/output/output.py
+@@ -16,14 +16,14 @@ class Output(object):
+         self.edge_label_func = self.edge_label
+ 
+         # Update the defaults with anything from kwargs
+-        [setattr(self, k, v) for k, v in kwargs.iteritems()]
++        [setattr(self, k, v) for k, v in kwargs.items()]
+ 
+     def set_config(self, config):
+         '''
+         This is a quick hack to move the config variables set in Config into
+         the output module config variables.
+         '''
+-        for k, v in config.__dict__.iteritems():
++        for k, v in config.__dict__.items():
+             if hasattr(self, k) and callable(getattr(self, k)):
+                 continue
+             setattr(self, k, v)
+diff --git a/pycallgraph/tracer.py b/pycallgraph/tracer.py
+index 17e9286..74a1477 100644
+--- a/pycallgraph/tracer.py
++++ b/pycallgraph/tracer.py
+@@ -297,7 +297,7 @@ class TraceProcessor(Thread):
+         grp = defaultdict(list)
+         for node in self.nodes():
+             grp[self.group(node.name)].append(node)
+-        for g in grp.iteritems():
++        for g in grp.items():
+             yield g
+ 
+     def stat_group_from_func(self, func, calls):
+@@ -315,14 +315,14 @@ class TraceProcessor(Thread):
+         return stat_group
+ 
+     def nodes(self):
+-        for func, calls in self.func_count.iteritems():
++        for func, calls in self.func_count.items():
+             yield self.stat_group_from_func(func, calls)
+ 
+     def edges(self):
+-        for src_func, dests in self.call_dict.iteritems():
++        for src_func, dests in self.call_dict.items():
+             if not src_func:
+                 continue
+-            for dst_func, calls in dests.iteritems():
++            for dst_func, calls in dests.items():
+                 edge = self.stat_group_from_func(dst_func, calls)
+                 edge.src_func = src_func
+                 edge.dst_func = dst_func
diff --git a/dev-python/pycallgraph/metadata.xml b/dev-python/pycallgraph/metadata.xml
new file mode 100644
index 000000000000..a94530cad28e
--- /dev/null
+++ b/dev-python/pycallgraph/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">gak/pycallgraph</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pycallgraph/pycallgraph-1.0.1.ebuild b/dev-python/pycallgraph/pycallgraph-1.0.1.ebuild
new file mode 100644
index 000000000000..62304425191f
--- /dev/null
+++ b/dev-python/pycallgraph/pycallgraph-1.0.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="library and command line tool to visualise the flow of Python applications"
+HOMEPAGE="http://pycallgraph.slowchop.com/"
+SRC_URI="https://github.com/gak/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples test"
+
+CDEPEND="media-gfx/graphviz"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	doc? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
+	examples? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
+	test? (
+		${CDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/python3.3-tests.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use examples; then
+		cd docs/examples || die "Couldn't change to docs/examples"
+		"${PYTHON}" generate.py || die "Couldn't generate examples"
+		cd - || die "Couldn't return to previous directory"
+
+		cd docs/guide/filtering || die "Couldn't change to docs/guide/filtering"
+		"${PYTHON}" generate.py || die "Couldn't generate filtering examples"
+		cd - || die "Couldn't return to previous directory"
+	fi
+
+	use doc && emake -C docs html
+
+	emake -C docs man
+}
+
+python_test() {
+	# gephi is not in portage; thus, skip the gephi tests
+	rm -f test/test_gephi.py || die "Couldn't remove gephi tests"
+
+	py.test --ignore=pycallgraph/memory_profiler.py test pycallgraph examples || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+
+	doman docs/_build/man/pycallgraph.1
+}
diff --git a/dev-python/pycanberra/Manifest b/dev-python/pycanberra/Manifest
new file mode 100644
index 000000000000..7e885dbb9a5a
--- /dev/null
+++ b/dev-python/pycanberra/Manifest
@@ -0,0 +1,5 @@
+DIST pycanberra-0_pre20130515.zip 14945 SHA256 5d80b30c774bedec1ba37bda6e68d57f8f9f7977590ffe5f5d630a79f348b80f SHA512 9836ed3d5aea9a80a3ffd64ef85b327c7dcdf24793c65010f43139c548d7c77522ab32f407930efed89493509efd117c64ec0fbf4d1d6d567d4d34d12d1936aa WHIRLPOOL d1d81f7cfdbf7097b6fb0e33f127f93524d2921a86bd11d690e4b72ecb0924af9e79686413a68b73dccbc2043ebd6f0b101ea89a715865f2bbd8c25f5a33d8f8
+EBUILD pycanberra-0_pre20130515.ebuild 737 SHA256 1d212acbee37f8e693dbd1c23b85286052521ce5ef9fec03354de996474058eb SHA512 6600916e9b4f074c4f611735ac4805822db82991d5b377cc32587be813a77ea58b93e779745d6e0d26d1b421e4922291a1a5e3a5f5dedf240ba0bf55423d3499 WHIRLPOOL 5af44395039fe491b50f8f59ebc208818caec3dd5dfb86905c8a4c9cc88015d3d8f1b3dda71bf7e7dffbd6a70c24818bb1aac78a11b21929e69e522b1d819a05
+MISC ChangeLog 2731 SHA256 3253b98045e5f17de8e930c117a505e3ff49b72ee936f7131371f858fdb228b6 SHA512 eab15f2515cb0d917a5a39e915be3deb0571fedb043e77498cb297a8df22b7709029b0f4052ef93446fc13626e90635c18c8bc18f837df7671040ccc98e3f1bf WHIRLPOOL 32816b34a45c2548ce147598d1e2171948a2e14f63a7b974c13380f1ddf92f452b4b171464bee4987cfb272029c141835cd89b6dbfc564c2af6fb3b8cea7d543
+MISC ChangeLog-2015 917 SHA256 f522daada716aeb33040d7e4aaf7ed08ec55206ad5ef25ea1b1cf00122f1dcdb SHA512 4f41e10b32f20a0d221a9ba0034c9a7b12fbc8bc8cb83c74c3889cda84dba5091e67e00d4f1b821630c364a04c56faa31c3dcb74cfcf4b29d37177d1a6a45a97 WHIRLPOOL a46ee752dbe13c02d7a92fc22d5108029b5cccdba11c2b0aa267c3bcabd99876e6fe9a6c17bd81af5b496774c3886cc3bdeed8ab60348cd0a696a7e05f28bb99
+MISC metadata.xml 575 SHA256 10f24c1f5e5334e69a3cae6a8b5aab4e83b6db5ce0173491076329ac69d03c09 SHA512 19bc4b110c746d4a0e946164d0d0b4f43f0bbabef179596d6a6b6981a443122ff395aa892e6130be75dd92aeccb263c5ef5f7857b91f076158da11db3d6714ca WHIRLPOOL d19a772fd860d0a4dd6c108bb0f7c32e925967fcd589a3682d158d7b0600dadb32e01e010ca40e0c68b4c606088a2ff1c22993f15388d289bc431ce8f2c0956c
diff --git a/dev-python/pycanberra/metadata.xml b/dev-python/pycanberra/metadata.xml
new file mode 100644
index 000000000000..9bbc26d73cd1
--- /dev/null
+++ b/dev-python/pycanberra/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">psykoyiko/pycanberra</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pycanberra/pycanberra-0_pre20130515.ebuild b/dev-python/pycanberra/pycanberra-0_pre20130515.ebuild
new file mode 100644
index 000000000000..ae8a4c33bfbd
--- /dev/null
+++ b/dev-python/pycanberra/pycanberra-0_pre20130515.ebuild
@@ -0,0 +1,32 @@
+# 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 python-r1
+
+DESCRIPTION="Basic Python wrapper for libcanberra"
+HOMEPAGE="https://github.com/psykoyiko/pycanberra/"
+PCOMMIT="88c53cd44a626ede3b07dab0b548f8bcfda42867"
+SRC_URI="https://github.com/psykoyiko/pycanberra/archive/${PCOMMIT}.zip -> ${P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	media-libs/libcanberra"
+DEPEND="${PYTHON_DEPS}"
+
+S="${WORKDIR}/${PN}-${PCOMMIT}"
+
+src_prepare() { :; }
+src_compile() { :; }
+src_install() {
+	python_foreach_impl python_domodule pycanberra.py
+	default
+}
diff --git a/dev-python/pycapnp/Manifest b/dev-python/pycapnp/Manifest
new file mode 100644
index 000000000000..db8a210dd55d
--- /dev/null
+++ b/dev-python/pycapnp/Manifest
@@ -0,0 +1,7 @@
+AUX capn06.patch 1212 SHA256 79e059baeb8943b18cdb9a3033883f89468caac35407aeca1c75e454aebdd133 SHA512 21f9f7946b93e7ec6c9dfd1a0e360bf2a4bada5ef1a0f917a9287a674f6d993589a5745064e9638880fde037d0df9dd1e1e6ac93004fc63b875908045f97068a WHIRLPOOL 83a98a7ed08d44c46ada5d86dcb1914211ea04879eb6a59926fb7139c7e2420c516b9754688fd0b9f2caf73664c0129c76528dfa3f97302aa5414031b4dca15e
+DIST pycapnp-0.5.12.tar.gz 454294 SHA256 b71a0e71512796e993a5724457d77f36ea21528cf1ca59fc6c7036c8cf61dea3 SHA512 c4344aa30a8b3b0ad7c28c2fe151e7d3c2866910c10a4b96881e5ecf352bc8331dfeff4e0ea8d50cb680eb3013b53ebd4a6dcfb07491cc5292329d9a26c80e29 WHIRLPOOL ef36bcb90f5c7b2175706a11a2f59df3b31a578f7bb61c4480af7c14d2b39721520a1a61484e4365a8dcc9880d02f237d2427ac0282b4371c7da7b656310d594
+DIST pycapnp-0.6.1.tar.gz 454873 SHA256 ea60837533307849e98bb3494555cea28a52ea0c301cfdf32bce661931940696 SHA512 a1bf209626effa9970da3b6492bf4b2b73585ef0f3ac0c8e8634071fe74631dae09a94671dd835d3c7934d697c25631b0d8227b3b23150609476e7c699efbfc9 WHIRLPOOL 0aafef6db12d39d16816d19c730015736e6e9440a1f4ae383ba0d7cfbe608f034fb65c84103feaff0231160e448dbd224bae0c7c3682e99293314cf6dcb880c1
+EBUILD pycapnp-0.5.12-r1.ebuild 635 SHA256 4018608ccf4e558a49bb8e821a1f950e26d27315eeeaa67cb89c34ea0275e24a SHA512 035b7d68aa059348061f46b240cb9f6692eeefb9969c3b12b4f85956d3c8e01884933e7a333aba86fb35a4efd0f71ad7cd5b8cfc09ab79c942e2580694d52628 WHIRLPOOL baa3f40d6d4201d2b9b625794d3d2a1e5d16a23e21e795b6904044c788552dc0ab4fe0c357136217dc464f2d240292dcbd39f0b2a738e4a5d4405e4c7c877f3f
+EBUILD pycapnp-0.6.1.ebuild 595 SHA256 0d0b8b468a2db21b226bc91bdabcc6d2d5e17d02c521812ec55d08e769d1a21f SHA512 63efb976e42915e52f9bbcbf28ae2bb5c2ca55e9e7415722a536bc00457614fccab72f78c1bffc413735a2f83f03600c32165ea9f1b3b4c9944a0d6242fce22b WHIRLPOOL 74489baabe80af3556b456eb4a035192ec4d4228400fd35fe009bef33aa2601d66133009f10c81b139f39858e0d713bb227c5efaed997741c9f8b177d87cf4e1
+MISC ChangeLog 2255 SHA256 9d9e4de76e4350a06eab725eca7b78a6cc9eece5eea702d22fd9c8796d7e4758 SHA512 e44fdee26941a3855e675c2be6515798241062ed8180631059af08ffbdd03149e8b576a46b5cbc9611dccbc3315590b25071e003dff7fd2e257d71ec012d314a WHIRLPOOL 65e66576679133b923e06503b7ff2f2f533ec936b61dc695c8519acc31b69f58b790f4fd3354e0f2885021959bf6326af98554bcacdcf78a5e606144d0faeb86
+MISC metadata.xml 514 SHA256 03f01614a7a082e17e7bba6f94bfc939df02d800aa276bc85ca735837a2052b2 SHA512 10bc088e1650bfa18b74023ba1cd5fd78618051febe89be2756ba0aa706cd695ca98548096392a60a38c94ab168660f347c6e73e2789c32acf7eb927de7d2923 WHIRLPOOL 21547f2d81376fff262d3bc1908ce8e5758dd1b90b2da569de495c0772a3668fa45125546f8919180289da0489b21ea520cefa98af6886a17786bd79fc0b769a
diff --git a/dev-python/pycapnp/files/capn06.patch b/dev-python/pycapnp/files/capn06.patch
new file mode 100644
index 000000000000..e1c1709fe8c0
--- /dev/null
+++ b/dev-python/pycapnp/files/capn06.patch
@@ -0,0 +1,29 @@
+Index: pycapnp-0.5.12/capnp/includes/capnp_cpp.pxd
+===================================================================
+--- pycapnp-0.5.12.orig/capnp/includes/capnp_cpp.pxd
++++ pycapnp-0.5.12/capnp/includes/capnp_cpp.pxd
+@@ -100,8 +100,10 @@ cdef extern from "kj/array.h" namespace
+ ctypedef Promise[PyArray] PyPromiseArray
+ 
+ cdef extern from "kj/time.h" namespace " ::kj":
++    cdef cppclass Unsafe_:
++        Unsafe_()
+     cdef cppclass Duration:
+-        Duration(int64_t)
++        Duration(int64_t, Unsafe_)
+     # cdef cppclass TimePoint:
+     #     TimePoint(Duration)
+     cdef cppclass Timer:
+Index: pycapnp-0.5.12/capnp/lib/capnp.pyx
+===================================================================
+--- pycapnp-0.5.12.orig/capnp/lib/capnp.pyx
++++ pycapnp-0.5.12/capnp/lib/capnp.pyx
+@@ -1688,7 +1688,7 @@ cdef class _Timer:
+         return self
+ 
+     cpdef after_delay(self, time) except +reraise_kj_exception:
+-        return _VoidPromise()._init(self.thisptr.afterDelay(capnp.Duration(time)))
++        return _VoidPromise()._init(self.thisptr.afterDelay(capnp.Duration(time, capnp.Unsafe_())))
+ 
+ def getTimer():
+     return _Timer()._init(helpers.getTimer(C_DEFAULT_EVENT_LOOP_GETTER().thisptr))
diff --git a/dev-python/pycapnp/metadata.xml b/dev-python/pycapnp/metadata.xml
new file mode 100644
index 000000000000..b488f8a61dd2
--- /dev/null
+++ b/dev-python/pycapnp/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+    <description>Python team can take the package if they wish.</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pycapnp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pycapnp/pycapnp-0.5.12-r1.ebuild b/dev-python/pycapnp/pycapnp-0.5.12-r1.ebuild
new file mode 100644
index 000000000000..1c45ebd80c32
--- /dev/null
+++ b/dev-python/pycapnp/pycapnp-0.5.12-r1.ebuild
@@ -0,0 +1,30 @@
+# 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
+
+DESCRIPTION="Python wrapping of the Cap'n Proto library"
+HOMEPAGE="http://jparyani.github.io/pycapnp/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE=""
+
+RDEPEND=">=dev-libs/capnproto-0.6:="
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}/capn06.patch" )
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# regen cython files
+	rm -f capnp/lib/capnp.cpp || die
+}
diff --git a/dev-python/pycapnp/pycapnp-0.6.1.ebuild b/dev-python/pycapnp/pycapnp-0.6.1.ebuild
new file mode 100644
index 000000000000..dcc5d83d6f4c
--- /dev/null
+++ b/dev-python/pycapnp/pycapnp-0.6.1.ebuild
@@ -0,0 +1,28 @@
+# 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
+
+DESCRIPTION="Python wrapping of the Cap'n Proto library"
+HOMEPAGE="http://jparyani.github.io/pycapnp/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE=""
+
+RDEPEND=">=dev-libs/capnproto-0.6:="
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# regen cython files
+	rm -f capnp/lib/capnp.cpp || die
+}
diff --git a/dev-python/pycares/Manifest b/dev-python/pycares/Manifest
new file mode 100644
index 000000000000..407fa218ed08
--- /dev/null
+++ b/dev-python/pycares/Manifest
@@ -0,0 +1,6 @@
+DIST pycares-2.1.0.tar.gz 226838 SHA256 449ad785ecb594ae063c0c86537ef97513385117a2eb172f747ad2a29221e898 SHA512 189851a9488828eb41bd6adbefd14022ae8470bde98c1d1c21d67992acdf721e6a61c3d8d8b4f85fb420e1e0900c54e53893586d6f80cc822371260fc17e55c4 WHIRLPOOL 3c3274e122fcea0edee02e1d1719c5dfbf6d437860d2962da0c18e8e56314df149f5c40e1847f7b9ad58c10a594943419453f594017e8508d7d7acf6197c6d22
+DIST pycares-2.1.1.tar.gz 226787 SHA256 17f06ecc2f7f5950922891dfe179a14382e34d620919c17f18957c6cd319ef43 SHA512 c3524a49f5abe4222c9371ca269918eecf30a77bd52258187766833b4663be861678ebe6f1cb2f50e824d36e75938162d5528abd5445c477f23fb85c24572403 WHIRLPOOL 563b28c8d3ff7ada39d9c270087bfbaab87c8c85882db68fe947feee22fe910db2b3b03bb328224fa9dd57ca4b24587d513625d46811b8ba0ce065ea951025b3
+EBUILD pycares-2.1.0.ebuild 601 SHA256 d3bdc127719fde171c9660d4053257852176d44b4d1a87d6c7c0c31766795442 SHA512 0dd4415c5a30d67c776014025d106f64701ac6017d86da7fca29b39e8f1a060c7a20d47d09ad817eafc64c2a9f892568fd967acd81ec2b9040b59313afd8519e WHIRLPOOL ba98ed4b62bb5ed279658e9b91445222169b14a5437bf728402810c830970ada3f1a25f21ee735fe5836b99cd281e7d7e11c0ac92fd5837d814eaa0ff749f7ab
+EBUILD pycares-2.1.1.ebuild 607 SHA256 ef992c2bd940f2f1b1d04807cd98e34d7c5d1de6b64e006143f5c7f4f6a9f569 SHA512 1c286d7c7a067498fea773a342adb7becceb6497d733af21a57b73c3e8202f0b364f9946d66ebf626fa97deeaf2cfd09e81be99a301403a150ab4a6a1e1a0802 WHIRLPOOL 473237c27156af0425b91c50c900386e914dd2371e699617b76186b7ad2c03ade7816c8dee973a12defe67ffd2b2c0f8f53d9f629107373ef3a3c6cc67e5acbb
+MISC ChangeLog 611 SHA256 042dd25c8ba38e2e97a0404e5fa6e131d088d1a0f15a55c485aec72431e0b8be SHA512 4c54598ded043627a53e09d2f04806e2d2032abdde4be3baccad6260b68f734c265dbe033c0bccb9a4a5258a7669cf866a699f2e1142b01a9ee6b1f792436271 WHIRLPOOL 8414bdb8a3c30c0e26e278c4b91484ec131afa8630a4caf188b1c5b0b845b8ee0f5f87d3a519a5b01be2965798a1f1dc5f23f796f8b6f9c9381d899f3268327b
+MISC metadata.xml 342 SHA256 1e035bb171b287a742032d25125f29a87cd19cf12d37446dd2befbbae17dd2fc SHA512 fdd177da9082fc650173331be63823ef6eb8dd195c526c3f5e7a38521f3203fc12ca591ff2ac4bba5fa64aa2ac8a9b419385285991696c9f02dd29bede7784a6 WHIRLPOOL 027e898097d6592e0b1aa948666b72e30936182bf92f1cd8f395b4fe7e221824d5329142c67b064a136f94c3b41c9c74475f6cdc67eafb226065af0b5ea11d90
diff --git a/dev-python/pycares/metadata.xml b/dev-python/pycares/metadata.xml
new file mode 100644
index 000000000000..afce7552c1ca
--- /dev/null
+++ b/dev-python/pycares/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">pycares</remote-id>
+		<remote-id type="github">saghul/pycares</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pycares/pycares-2.1.0.ebuild b/dev-python/pycares/pycares-2.1.0.ebuild
new file mode 100644
index 000000000000..0da15f536f5c
--- /dev/null
+++ b/dev-python/pycares/pycares-2.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface for c-ares"
+HOMEPAGE="https://github.com/saghul/pycares/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# Tests fail with network-sandbox, since they try to resolve google.com
+RESTRICT="test"
+
+# uses bundled/patched c-ares
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON:-python}" tests/tests.py || die
+}
diff --git a/dev-python/pycares/pycares-2.1.1.ebuild b/dev-python/pycares/pycares-2.1.1.ebuild
new file mode 100644
index 000000000000..2e1b3b368427
--- /dev/null
+++ b/dev-python/pycares/pycares-2.1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface for c-ares"
+HOMEPAGE="https://github.com/saghul/pycares/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# Tests fail with network-sandbox, since they try to resolve google.com
+RESTRICT="test"
+
+# uses bundled/patched c-ares
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON:-python}" tests/tests.py || die
+}
diff --git a/dev-python/pycdf/Manifest b/dev-python/pycdf/Manifest
new file mode 100644
index 000000000000..461588c33cf1
--- /dev/null
+++ b/dev-python/pycdf/Manifest
@@ -0,0 +1,5 @@
+DIST pycdf-0.6-3.tar.gz 167762 SHA256 d81d8079bd5821dfa955fbb44f2b799d21451c596fcdb0e9dd849627e583b31b SHA512 c18ecb46fa3888ab2fdd3449fcc599a22e371996faa273aa67f137a960ad74f8eb40472174a9034ccecc86ddaea14d1955b4cfdd16c8b64d2fd54cc42a75ad86 WHIRLPOOL 2f53c26d31c1ecffae4b8079978a1ca07a2044ddb002483c6579915a84a9b90e6d18ed901a43f03c09758afa104fb8f19f85d5a8b5b670c73ab1c7aa839b022b
+EBUILD pycdf-0.6.3-r1.ebuild 717 SHA256 835435e15a1ae1d32df74ea2738afc49b8abad214f92ca2e7d0ba1cfcc3409d9 SHA512 1425b39f34da66ed576bcf45df4772c598da1629c357a23bd534c980fb58e32a682584510dee4202ec482ae512822b92ba51e2910d7d3a733242e62f60454349 WHIRLPOOL da6674994a003d023323ef0b7580ec66596980b791c9ae8b3632f3ddfef232714d1b38fd845976f083d7604d82bffebe8d9b9d87979b0cbb65ea46653e85754f
+MISC ChangeLog 2429 SHA256 9f1d0950da90037c49f4567131ad332fb8360cc7006461af1001cfcb3cf2fd1b SHA512 a8d0cb1ad0432e1a127eb6501f577b1ab07d5128826c67aefbc2f8b4d2e30884ed9bf9cdffd99c57eb05338ce6b41b100f1cbe16a436f67de5d38c842f5c753a WHIRLPOOL 504dc65245f66765ae76ddcc1d5af3641463a67c05fd3cdeacc107732f03a88391945712f3f00392be2d4522dce464ede76eaa80072fb1ba007067b8bec51b5c
+MISC ChangeLog-2015 2077 SHA256 6dc59c7a8e27f13f78b6ebe51d826afcde2715caa69a5692f65bf9e1b6c9196d SHA512 c3f4eb2ae15c216d5afde092ff25c044c34c386f25c9aea30685dc5038312420ff3c98457f1745559347ff3394b77f4a5115b624c00a8f62eca4a3634e0b4a94 WHIRLPOOL 1ea4a6197b7fa33336c9f7f2933f094fd9096dc1c414963297fee53ae724d00a36c60614b8c2d4aebc9b18ae364ffd033bc3ce21a198e10a87e8eff38d69beae
+MISC metadata.xml 318 SHA256 f368d84f4f1f22b0cde0f07cda4b07c1a90542a261f9ff768c7c842a7aa997fb SHA512 7bd5695f9efa3c1b03f5dcc08e96f425255000b0638fcfaeb96e1b7096df8acda147e6f601fe99f5bb20aacd2a440eb055fc9c318aca5a5535ea9d4a42fad40f WHIRLPOOL e52ce5281c13d499d80a8460bf21105530025b7cc870f85b1f141ecd6fc3192d6000cb95dc3cf91958473dbfc2590698f040a7697feea4b3e74a2b28bf1e51c3
diff --git a/dev-python/pycdf/metadata.xml b/dev-python/pycdf/metadata.xml
new file mode 100644
index 000000000000..f9bcbfa7e57f
--- /dev/null
+++ b/dev-python/pycdf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pysclint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pycdf/pycdf-0.6.3-r1.ebuild b/dev-python/pycdf/pycdf-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..74bd9b0ce220
--- /dev/null
+++ b/dev-python/pycdf/pycdf-0.6.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P="${PN}-${PV:0:3}-${PV:4:1}"
+
+DESCRIPTION="Python interface to scientific netCDF library"
+HOMEPAGE="http://pysclint.sourceforge.net/pycdf/"
+SRC_URI="mirror://sourceforge/pysclint/${MY_P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/netcdf-3.6.1"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	use doc && dohtml doc/pycdf.html
+	dodoc CHANGES doc/pycdf.txt
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycdio/Manifest b/dev-python/pycdio/Manifest
new file mode 100644
index 000000000000..88190d76ac39
--- /dev/null
+++ b/dev-python/pycdio/Manifest
@@ -0,0 +1,5 @@
+DIST pycdio-0.20.tar.gz 197736 SHA256 24b4985b699fc4d12c2d49f7cb25a1ceb65d69278d18458f7b041579c71030d7 SHA512 b53a535440008dc637b31fd2cda22845c91b98e78c30f90c866af3b9bf7cb3faad39f0784b5063a39bd97bb18fc58c75ad0833d53421182d408c2889c491846b WHIRLPOOL 7722efc2398cdcf971ac7c62dc360514f64eb636a6c2c10ab86255e27802e99c4008613541bacf55e7fe20aa1431e1f44b60243722686d69fbc9df9fda6ff619
+EBUILD pycdio-0.20-r1.ebuild 1114 SHA256 cbaefe35e4e01961aa1ea6f334bbeba4722e7f12c2a86b3751c8f80a224dfe47 SHA512 d430c902d9f51da5367e92baddc440c8da7e8a118d0d0f78ade4b7b821c06685578306d88b88618942a24351944745485e9c258d6c3cf5c811355472c3e2d622 WHIRLPOOL a3691897a03e58382d45bff566f5eb6d634c1993f485f6a60fdad4034b0075abed6da8ffdd5006d75fb70c6b8d9312142449abc47bb842fef01aac912e80c703
+MISC ChangeLog 2858 SHA256 0aecc255f09b1facba2911e9b9afc6e4a0c6ad2cdd2243b21087890deffb605d SHA512 85085324b3bb61978070cfef36c4231a79c2f761cfc746ab4b17263bc0d5e021f70b077ac35134b67f70454e5aa0eaf3ab0f7925e2d2eeaf201a252ba7718ab7 WHIRLPOOL a8ea1cb5818cb2c4031f01dd8450364a534c26d7c5a1751a6bf28faf525d07b885d7668f93c30f34d5a2f04ca76f39befc700568d2440c461f53d38f7c0b5a19
+MISC ChangeLog-2015 2036 SHA256 e68b7d5807bd8e618c90d6ad6148d17c16b728d3faccf912f3ba84fda0184319 SHA512 4154594c9906319631394c271ef726fe72dff562af5e63d55f4c077117005ae2ce560a7927c68571294e9e6e198c6606dc5c5a197533b4e5bbd569398efd30f0 WHIRLPOOL 118510df030f3eae66180c91c55f0f4c9ef136b28f6882c184c11d56dfe79baeb59137ebc7db2731de29212dac9e1987dcf65db699234336788833957c59fc6d
+MISC metadata.xml 551 SHA256 dd6e326e5858a0d213cba97591165b6a82a934d7656fa5d86ffec8f18523cb83 SHA512 e74e3c72794ff1356a6d91482162adfbed24320821e8df6ea4043416f586f6e30f91980e4c15281e59c6428a64550986eb69007da30390de6d7de51b250900c7 WHIRLPOOL 304dd30b8b31293cedc17223ebefb54df9b175924b46a64edb7dfc18a6c5cf33aa0b68eec603609d8a31292199415e980d198fa74015e85f327d71509b76a8aa
diff --git a/dev-python/pycdio/metadata.xml b/dev-python/pycdio/metadata.xml
new file mode 100644
index 000000000000..6d6623b91d3b
--- /dev/null
+++ b/dev-python/pycdio/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">The pycdio (and libcdio) libraries encapsulate CD-ROM reading and
+		control. Python programs wishing to be oblivious of the OS- and
+		device-dependent properties of a CD-ROM can use this library.</longdescription>
+	<upstream>
+		<remote-id type="pypi">pycdio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pycdio/pycdio-0.20-r1.ebuild b/dev-python/pycdio/pycdio-0.20-r1.ebuild
new file mode 100644
index 000000000000..755b9a8abdf9
--- /dev/null
+++ b/dev-python/pycdio/pycdio-0.20-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Python OO interface to libcdio (CD Input and Control library)"
+HOMEPAGE="https://savannah.gnu.org/projects/libcdio/ https://pypi.python.org/pypi/pycdio"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND=">=dev-libs/libcdio-0.90"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RESTRICT="test"  # currently tests fail
+
+python_prepare_all() {
+	append-cflags -fno-strict-aliasing
+	# Remove obsolete sys.path and adjust 'data' paths in examples.
+	sed -i \
+		-e "s:^sys.path.insert.*::" \
+		-e "s:\.\./data:./data:g" \
+		example/*.py || die
+
+	# Disable failing tests.
+	sed -i -e "s/test_get_set/_&/" test/test-cdtext.py || die
+	sed -i -e "s/test_fs/_&/" test/test-isocopy.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all(){
+	use examples && local EXAMPLES=( example/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pychart/Manifest b/dev-python/pychart/Manifest
new file mode 100644
index 000000000000..b2f6de204cc6
--- /dev/null
+++ b/dev-python/pychart/Manifest
@@ -0,0 +1,6 @@
+DIST PyChart-1.39.tar.gz 115908 SHA256 882650928776a7ca72e67054a9e0ac98f78645f279c0cfb5910db28f03f07c2e SHA512 b6af817906610f3907508b72e2e95a68893f65f132c7964c803dcb88ca2e999b57f89ead1c6a66e28796f1ed2df512d16513d093fc8de1505f678edda3e41532 WHIRLPOOL c69006c7ee888acfaf8aacd950daa9559af2d0bee0c3c55c7250d2a0376c6d5b633134b86c5ac150e4e535e4a35af19d0b0964a00a6ede2d41fa0f66fb19ceb7
+DIST pychart-doc.tar.gz 302416 SHA256 0188f1c3c0eb6e35b8518d4360f0356e516e81305a040caf2f2c4744b7850d6f SHA512 9a81fea73b37fb8decc1279cc0e52abbdc9f98c7d73c98c9c7d7d2d27e0bf33fa4eb199dc4a09488d5f109a202b23fe950d58e1140f29a720cd14190dff10530 WHIRLPOOL 26af512d7fc0f6ed3f7c1d8bc1d62bdeabd9a7e9975bc4bcafa4082fe3230bab6a03813263e637e35863c8bedcdc9c7b9c20a5a46d8607966df66b6f2edf5567
+EBUILD pychart-1.39-r1.ebuild 713 SHA256 2d2b0f242ce1033c9a7570de5319301b0d67b8fb4abcbe9be9dad8f8ad4d1c4f SHA512 348f7a718127c08854f3e9915d6bd81f400292d95e23aeea24dd4cce15f292c812db985e7f9ef2e77563436e882254a5375ae0d7a6c27faeaa9122f590ff75dd WHIRLPOOL 6026fea9cdab108e9fba3382051e583118a10f13a8318154ceda2b3962649ae97f8c4e594141da0088d64dfb3f1a046be5001340bc6bb98fd28c95f46adbf48b
+MISC ChangeLog 2433 SHA256 a892c437ea6daf9ab71c0bdf486a78bba44ccf867fe0cce58aae4111c3456ec5 SHA512 cd754b375b68f1f3c17df5aa75516932188e2ad73378b7c90e74985a62c7d7889cccc05766d592fcfef73b32c91b63f80addfb96c9b1f9afa1231dffe45e9d45 WHIRLPOOL 7ac14084c9f6d442eb72290f385974455229282304b4ff3704e53fe4758c7a363c473deb1e98f4e670bfbc4695fb9c4cb5f2c1be94a6aa33653f99ad122cd9db
+MISC ChangeLog-2015 2829 SHA256 a581101549fae68d0a6f30dfea1698dab5feaa27c9549d534a14733dfcc40b46 SHA512 9c01e90f4ce36bef77b2b5a226ac83a78976c0700a1a5fa1a3177ce0f90c73f56f6a7b0ab814c35caaa8a43d350e730dbbc99ed3169d3c658aac2398afd39d8c WHIRLPOOL 513c9c3ea80a93072f4f8151d9717d23daf84c368fd6d2425fc783efb89f089e9eb194c4274f78c87ab8e2bfc3ae12db268a47a738db55e8146cf2b76fa28f7c
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/pychart/metadata.xml b/dev-python/pychart/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/pychart/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pychart/pychart-1.39-r1.ebuild b/dev-python/pychart/pychart-1.39-r1.ebuild
new file mode 100644
index 000000000000..1aa68ac64277
--- /dev/null
+++ b/dev-python/pychart/pychart-1.39-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_P=PyChart-${PV}
+
+DESCRIPTION="Python library for creating charts"
+HOMEPAGE="http://home.gna.org/pychart/"
+SRC_URI="http://download.gna.org/pychart/${MY_P}.tar.gz
+	doc? ( http://download.gna.org/pychart/${PN}-doc.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~ppc x86"
+IUSE="doc examples"
+
+DEPEND="app-text/ghostscript-gpl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${WORKDIR}"/${PN}/. )
+	use examples && local EXAMPLES=( demos/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pychecker/Manifest b/dev-python/pychecker/Manifest
new file mode 100644
index 000000000000..3e4ded956882
--- /dev/null
+++ b/dev-python/pychecker/Manifest
@@ -0,0 +1,7 @@
+AUX pychecker-0.8.19-create_script.patch 460 SHA256 ccbbb1575ac5bfbb85867ddfa3f5138ad75c14235bd0b3e7e6e13f2d31edaef2 SHA512 88bc5116b3773130af02598fcaa211678c9577eac7168819f2b41537a2579881e6145614fc222907cc432efdb99c068f13e78826377a84a2420eda1c355a611e WHIRLPOOL edda01efbd560dcfb20ec38478f7b0b1e91219d5d28853ec3cfd92804f5cf1b56a765db68168fd5f630a5be71ff23cf6fb9dfc1d7894faeb409b58988905c201
+AUX pychecker-0.8.19-version.patch 473 SHA256 445907af6d60fa60b9b3b1779a88241d8ae2fc972b454d9b42f7435b1f1a622e SHA512 3cfbf2370a02c0462013d0eddc5c99246b27fc2cb95f7361e7f991ddd9052c8093816088272171ada0d3f20bc814d9d6352deec7de2013a527e3f36ca3418845 WHIRLPOOL d6994d0ddd646c5a4d71c8c920cd3d9e3586a902a7856f3a578d35b5631c3441fff9e8cf9111f7d0aa0e06415c75ffb33aa4cd78adfcaa4f52f73e0d4bcfb81a
+DIST pychecker-0.8.19.tar.gz 99783 SHA256 44fb26668f74aca3738f02d072813762a37ce1242f50dbff573720fa2e953279 SHA512 50f3d87a0ea80235761eb0ff078dc7e815848c356cea2bdf12bb699edc6d3301252acebaf6ab6aa961849d740dc38bc9b6deb7cfe956e7fff83a104750adfa18 WHIRLPOOL 1bf382babfed78a4dbe2805ce3d2c1c0acf38a3f5dc1638c2788d77a3825a1c34714b1a7c256221fec2a1d21cf16d12ecb95f6c3875fcadddcae8044bdb4b292
+EBUILD pychecker-0.8.19-r1.ebuild 1044 SHA256 62eba6d48220d4874a9d4e3719c289aad03d6e5f611056cdbcb043bcc83485f7 SHA512 3099901679007e3f74b71e334c417c59c5229a73c6094e75aa35b353f251a481b3fda859270879dc4d4e268286535771d7e643f08d3ca8c67cf240ced1380267 WHIRLPOOL 317e4f456b5ea0b77200f0c5afa955986771be4159e7ecb39bf89957fe9a5c178c8c2ddad64071e87f8c4de206a22f8fec598d06ac4946a2e3fa69ab3511f7c1
+MISC ChangeLog 3038 SHA256 4504ebf3987dc732b13abcd7f98ee460fb494ee1e06256c0587620f554c224ee SHA512 edefa094da89103ef379ed318c5088e2a3e74b80a5a1032842238dc2bba7cb77724295be7556d165aa869b8ee3df3075118e084e3cd331925fa9c47d9e9d7fca WHIRLPOOL e0a1e92cba59bb77c7c092f4703deaf8380214837a2dc4c32ffff511c6d67885a473dcc6ea083777a8816c707f39153570bf893ddde84946d9a1be498b8bdd61
+MISC ChangeLog-2015 9198 SHA256 42ddf7a146522b873a8b8ae2c16506116597d74599390dba43de66e3e905d870 SHA512 2e1cccfa54c0ec10b513f6ebfa209661abecd03b01c682b4cf3891979f9d7a92e191d373104c46057d4f53ca2d003d0bb818c1d83738690e93a1c7fdd7c5f358 WHIRLPOOL 491ddf36a460b775e2d2bb30b84b091ef901a923c40a5bcc953e58b74142d0b17fa791683c6239e1a7e5e3f2eaf5a0f60e07e523bb62fcb96608fe5bd5e0e7ef
+MISC metadata.xml 319 SHA256 7fdc81185a7bbd9fc6d95a71f00acfaf623913ca8e86d3131cc3f7023b00c10e SHA512 46b9b45d2fc905a2b5a31741e249ead92c8b43eb312bd3d379d6946171858fc86dba75a8ffff71405f50367624ae9940fcca2ed069742e44fc2e2fa6c5c79124 WHIRLPOOL 7ee4c79a5fca3f6e3ffb2c63e425975a672c00cc3327ae6f4a0b60838df0432af7d62948196cbcf4c1942bd19682403471937d404fff8f411b70137590751cfa
diff --git a/dev-python/pychecker/files/pychecker-0.8.19-create_script.patch b/dev-python/pychecker/files/pychecker-0.8.19-create_script.patch
new file mode 100644
index 000000000000..ca4367591174
--- /dev/null
+++ b/dev-python/pychecker/files/pychecker-0.8.19-create_script.patch
@@ -0,0 +1,13 @@
+--- setup.py
++++ setup.py
+@@ -221,7 +221,9 @@
+          script_str = "%s %s %%*\n" % (sys.executable, checker_path)
+       else:
+          script_str = '#! /bin/sh\n\n%s %s "$@"\n' % (sys.executable, checker_path)
+-      open(script_path, "w").write(script_str)
++      script = open(script_path, "w")
++      script.write(script_str)
++      script.close()
+    except Exception, e:
+       print "ERROR: Unable to create %s: %s" % (script_path, e)
+       raise e
diff --git a/dev-python/pychecker/files/pychecker-0.8.19-version.patch b/dev-python/pychecker/files/pychecker-0.8.19-version.patch
new file mode 100644
index 000000000000..9fe8490175a8
--- /dev/null
+++ b/dev-python/pychecker/files/pychecker-0.8.19-version.patch
@@ -0,0 +1,12 @@
+diff -ur pychecker-0.8.19.orig/pychecker/Config.py pychecker-0.8.19/pychecker/Config.py
+--- pychecker/Config.py	2013-02-01 12:06:10.669695876 +0800
++++ pychecker/Config.py	2013-02-01 12:06:26.238695001 +0800
+@@ -33,7 +33,7 @@
+ 
+ _RC_FILE = ".pycheckrc"
+ CHECKER_VAR = '__pychecker__'
+-_VERSION = '0.8.18'
++_VERSION = '0.8.19'
+ 
+ _DEFAULT_BLACK_LIST = [ "Tkinter", "wxPython", "gtk", "GTK", "GDK", ]
+ _DEFAULT_VARIABLE_IGNORE_LIST = [ '__version__', '__warningregistry__', 
diff --git a/dev-python/pychecker/metadata.xml b/dev-python/pychecker/metadata.xml
new file mode 100644
index 000000000000..9b5e980c8695
--- /dev/null
+++ b/dev-python/pychecker/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pychecker</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pychecker/pychecker-0.8.19-r1.ebuild b/dev-python/pychecker/pychecker-0.8.19-r1.ebuild
new file mode 100644
index 000000000000..ea99345e3d09
--- /dev/null
+++ b/dev-python/pychecker/pychecker-0.8.19-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python source code checking tool"
+HOMEPAGE="http://pychecker.sourceforge.net/ https://pypi.python.org/pypi/PyChecker"
+SRC_URI="mirror://sourceforge/pychecker/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DOCS=( pycheckrc ChangeLog KNOWN_BUGS MAINTAINERS NEWS README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-version.patch
+	"${FILESDIR}"/${P}-create_script.patch
+	)
+
+python_prepare_all() {
+	sed \
+		-e '1d' \
+		-i pychecker/checker.py \
+		|| die
+
+	# Disable installation of unneeded files.
+	sed \
+		-e "/'data_files'       :/d" \
+		-i setup.py || die "sed failed"
+
+	# Strip final "/" from root.
+	sed \
+		-e 's:root = self\.distribution\.get_command_obj("install")\.root:&\.rstrip("/"):' \
+		-i setup.py || die "sed failed"
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pychef/Manifest b/dev-python/pychef/Manifest
new file mode 100644
index 000000000000..e5559c9321ae
--- /dev/null
+++ b/dev-python/pychef/Manifest
@@ -0,0 +1,5 @@
+DIST PyChef-0.2.3.tar.gz 21082 SHA256 212df9a0887f7f0dfb420ecc33b554104db7222c1a1ef26e1362b3207a9260cd SHA512 e8e0f3045f23032d8fe3169e9ff66cb3ce78ac1a9910d35c7399eeb252b474668c11dde4205689608c073b95f380738bf34b47d32ee5d24edb61fe3fd1674790 WHIRLPOOL d3ea4dca96e111310ab2a8f1761d10e68b9bf8f6e7d1dc6e9787e1c4aec7e0d14fca56561fd9f5ec164f7544fad6ba896aed0830073dadb0d8ac169a085c2350
+EBUILD pychef-0.2.3.ebuild 604 SHA256 ad6a696ccf6b0aaa0c58627a005537125374d79b6e2bd64a2986c40e2ee91647 SHA512 e5e196fdaacb91a3815148b70e084d1cd078d8eb51a96d803ed34755a963154daa91bc581f285113222e016b5e83c92ea620ec73ebd86afc1b149250ec823c24 WHIRLPOOL 49f134d2218fd8d5369ea7230510dc5babb2a760bb890f90a604a05570121fb5249be9d0d957f59f99f27c0abb6bb75900071eda56496fa22c8e3191e2a9ecf5
+MISC ChangeLog 2476 SHA256 8735cff4a6ceb52ef2576bb0938ff020183ed99dd6c2335d77a2082052d4b033 SHA512 a78ef27d51ade2684fe061d19293a070b018858112ec2da05638cccaffc37a6525a329555eb9f1102ecd4da5f5b4c7eacb45814124b5ff676b5fa3490b256b1b WHIRLPOOL 91f29cb2316f2fae2b64c834511be5ac76639864cf844eedb1221a91592838b632e79453b3538297dcbbca5515e508a7d6cfbe85abd20668c37727f0ec65295c
+MISC ChangeLog-2015 981 SHA256 198bafd99012b7d0c7f1ca8814f8b121d259101b7a8a1ef2601579397b3f28ea SHA512 9eef8ffbaf6393d52afbbe2f8e59914678f5d553ef2d7bf6af62df33e9d79f4000a6cd4a941f01c10c556d6d911c6dedd39c3f817c03d10fbaf5508a2cd0c266 WHIRLPOOL 159cac86978e331ab7de782262fc0f581bb2904963a887b577b9339e380df4cb51c7be522cd3421eed177f09ff538f4db944eaa6300a6629338fc6f81c3a978b
+MISC metadata.xml 603 SHA256 3aa8497d36db691b620a697901026118d475e86bdd0c29fbebdef5c6a0b79f05 SHA512 40d133c9789df0766a9feca76f3515b74ccb82f8e2cd63d8b1f929275985606d17d890cb2e1b1798a1953fca430114fe186ce40019a1a338d5becffd882928ee WHIRLPOOL 6b8af4ef725319d0c046e17f531b264eeb58b346c0c3a880719ef6c5ea549e4ce07cda3e7efc1b91010fabd68b1475288abeb5199a09b0e34be14c2e77753acc
diff --git a/dev-python/pychef/metadata.xml b/dev-python/pychef/metadata.xml
new file mode 100644
index 000000000000..1474fde779fd
--- /dev/null
+++ b/dev-python/pychef/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    A Python API for interacting with a Chef server.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">PyChef</remote-id>
+    <remote-id type="github">coderanger/pychef</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pychef/pychef-0.2.3.ebuild b/dev-python/pychef/pychef-0.2.3.ebuild
new file mode 100644
index 000000000000..81b6e8c8bf81
--- /dev/null
+++ b/dev-python/pychef/pychef-0.2.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python API for interacting with a Chef server"
+HOMEPAGE="https://github.com/coderanger/pychef"
+SRC_URI="mirror://pypi/P/PyChef/PyChef-${PV}.tar.gz"
+S="${WORKDIR}/PyChef-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/versiontools[${PYTHON_USEDEP}]
+		test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/pychm/Manifest b/dev-python/pychm/Manifest
new file mode 100644
index 000000000000..15fcc7b2e476
--- /dev/null
+++ b/dev-python/pychm/Manifest
@@ -0,0 +1,5 @@
+DIST pychm-0.8.4.tar.gz 28803 SHA256 84c99d7b28fb6862ee60a5d1d52fad0da4c95f1934e9c101d3293ee7e8b5357d SHA512 0c0c107e59ea9f5fef97a0c2869349b5e90fc9eb7a37c35e8a929eaf764c7abe5a06a389340a912b9ba2f71172f3c94a78da016707bb201bbd07bdc3feddfe0d WHIRLPOOL dd183874f116a946961cfefb9150bf8bca69570f0bd271b21023b8c1d1b25abc14ff4f1f9deaa84619344c8236034c51d77b4422277e35f8df320391a24d510c
+EBUILD pychm-0.8.4-r1.ebuild 428 SHA256 14ac4e25cb103b5f9263c11464f3c7425bb3a4dac39cf0255cace40c3d35d020 SHA512 b854fa1ef64b8f82d589e0018014548570d89f981c9e47dccd10e3d23e891b08b4e4bc16b89ddadf6ceaaa798046024f14a58433354a7eee454c91f80ec0466e WHIRLPOOL 0c907b7ebf76bf60ca7da12f3d2af3114d8c5c8568b303cabf4bcc6b95a171d451a1ecb91b5c1ca1ae9231751351f3d32199a50ea036bceaa16f9744b7861db5
+MISC ChangeLog 2726 SHA256 3202aea68fe2f824b9a2ea0736acdac481a4e009678e1f16b34d2b9aed5e08b5 SHA512 e9e5bae1f56c8d500b7a67f71ab0f13ab9e4306a4e2fc37de7f7ec48dcdf6f21af2b066123183491c6349c5e11aa7d6cbd52fa1368c416077b6131bd1dbaf4b8 WHIRLPOOL 351682d870f965672f320fc393a67ca05d54bb9fc612be69b2af5f9fb5c9355b44ce3de11a287819ba5767de2eaba79358974c7635b843f09292aafec1e6d9ad
+MISC ChangeLog-2015 1856 SHA256 5e649bbae5a9017e04f9aa17a9c5c58861bb10e7ec212980de6834029a1e5965 SHA512 1a659264399a23d48abffa6e2b6297d90397b073e4a4c16100514da08be476614fe32de0ec3d742fe791d4baedd442a68457cec02c07da337cf02a5e4e538e72 WHIRLPOOL 6deb5f5c4930ad7c8f7a821e1a5ea673fb717a8e78e74a3dda48dbd8472afe9f3c0191798f480719cb05b0ee5ab2004eb409311427fb6bd5e03eb4a2ec9b47a8
+MISC metadata.xml 981 SHA256 4a71e8e339939a280d57ac407ffb1c63b0bb7d65e0162f48515849fcb00af93c SHA512 1ff1b79c5b18961a5ed7aefc06c367968d05e14c47e3b4ac898c62ef8b444c75d092b1a10213197523bb107e8d2a5e04fc19c90b1381420a8d40659c6f950ebe WHIRLPOOL 5b05010407352bdf7c01fb91bd92c4c5c815f6081b55c90e87fa790a2af4a5823967932c6125cfc5bbb74ca4354298da5aa8791b6ba4a14b03ad537b4f8c4964
diff --git a/dev-python/pychm/metadata.xml b/dev-python/pychm/metadata.xml
new file mode 100644
index 000000000000..5c6fd6400c88
--- /dev/null
+++ b/dev-python/pychm/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+The chm package provides three modules, chm, chmlib and extra, which
+provide access to the API implemented by the C library chmlib and some
+additional classes and functions. They are used to access MS-ITSS
+encoded files - Compressed Html Help files (.chm).
+</longdescription>
+	<longdescription lang="ja">
+Chmパッケージ��C言語ライブラリChm�API実装��れ�幾��拡張�れ�クラス�関数
+�アクセス�る手段�chm, chmlib, extra�3��モジュールを�供���。MS-ITSSエン
+コード・ファイル�使�れ����。-- Compressed Html Help ファイル (.chm)。
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">gnochm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pychm/pychm-0.8.4-r1.ebuild b/dev-python/pychm/pychm-0.8.4-r1.ebuild
new file mode 100644
index 000000000000..eccfb6bb99ae
--- /dev/null
+++ b/dev-python/pychm/pychm-0.8.4-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the chmlib library"
+HOMEPAGE="http://gnochm.sourceforge.net/pychm.html"
+SRC_URI="mirror://sourceforge/gnochm/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="dev-libs/chmlib"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/pychroot/Manifest b/dev-python/pychroot/Manifest
new file mode 100644
index 000000000000..7d72a61e84af
--- /dev/null
+++ b/dev-python/pychroot/Manifest
@@ -0,0 +1,6 @@
+DIST pychroot-0.9.18.tar.gz 32879 SHA256 ec78082c9ea8a30733ac1cf9773431fe118fb4cbeaf1098572c3b8e4e16eb7aa SHA512 59c8750c9ba8d601eca485079c04d4153bba92531dbd30fba0104694e4435d76e65b762b76ef89a6a6f8908dd6054d1d95fe4be74825ac1c5a56e473370dfa41 WHIRLPOOL 6e69c740bbb93ab8e88555e0c7e72ec5e4cde577c6b687055385df0ad7174e992f5a9410e03dd041309e57924fb70b92f14078c665c06d05d6c87571815b29e1
+EBUILD pychroot-0.9.18.ebuild 1149 SHA256 aaadd8450e5eaa06ec4bc74f3d307ee45e7e5842d0659fb660b7fba81b8f3142 SHA512 c019b5e5d73cec26a74cd363c2784a4ccb3e8bda0aa5ae472e60f6165b533ead1ad54a67740c3021c17980d11729b66460f7a0ca244eec62c576ba649ab3bd97 WHIRLPOOL b1712cbad68408d50324ff8ffa4feb5734d914e8c781996b5f5675b5a043f593a1768c6a8e937b7c4734554fdd40c409f2e428321810cabcb330a619767b6ca7
+EBUILD pychroot-9999.ebuild 1149 SHA256 aaadd8450e5eaa06ec4bc74f3d307ee45e7e5842d0659fb660b7fba81b8f3142 SHA512 c019b5e5d73cec26a74cd363c2784a4ccb3e8bda0aa5ae472e60f6165b533ead1ad54a67740c3021c17980d11729b66460f7a0ca244eec62c576ba649ab3bd97 WHIRLPOOL b1712cbad68408d50324ff8ffa4feb5734d914e8c781996b5f5675b5a043f593a1768c6a8e937b7c4734554fdd40c409f2e428321810cabcb330a619767b6ca7
+MISC ChangeLog 4244 SHA256 a43e194d0c794470ca85ab5fb6fe927bc850da81f35843f65f34f3da2c283c04 SHA512 8cf05e2b54f72d51b84edf3f6c455a942923bc806fc7536f920c5967333bbb8c9c902c75287e84dae71ae27c3dc27feba1dc0ab769155c24bc4d9c6d563de09f WHIRLPOOL 7f9e33d0d52d3247786083388e428e0c4605c7f1eab378761333a3a1da1a045e95a007a17b58d8c97c559c5cdbd832ce07286e8b173cd4dc21a887d20c6eae75
+MISC ChangeLog-2015 1776 SHA256 ca230c3e63fe2000a60f3197635ff3c3282a39fdd455307a21e2762d70cd8309 SHA512 87abc839a005f9ed6a2569251c82c14b239502e919b18fe72e6ddb0b15971299cd6ab76b9997d9689a7063837299c34cba5216a3071808f273e29a1be82bb6ba WHIRLPOOL c27040298d734711eacda130afd10abbbf98cd56ca8cebf20a3ab45303975c9a49fa42c60be5b69cb0226a09491d1e3018956a219c07cb173d8aafe87b531b89
+MISC metadata.xml 337 SHA256 46ef3afebc5b2d2b219d62ab1f0c50d265d0c68e576e88df490650e6136d118e SHA512 4b0da70f35cd4983f6f5cd8aa02e5555b770d3bc2b7e90a8e8287c64593fadf1fe532cef6becce24de96766f94d24d8ec731ac3acff6f42a2c7b06c3e1e1e4d0 WHIRLPOOL bbef8d2813f58039ee69f7321a11a124516d499abada56f19fea8ba21cd527c16a05be3bda06f2e63fb4c15730ec0faba4e29277e468bb7bc09356fecee98208
diff --git a/dev-python/pychroot/metadata.xml b/dev-python/pychroot/metadata.xml
new file mode 100644
index 000000000000..3f73551c788d
--- /dev/null
+++ b/dev-python/pychroot/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">pkgcore/pychroot</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pychroot/pychroot-0.9.18.ebuild b/dev-python/pychroot/pychroot-0.9.18.ebuild
new file mode 100644
index 000000000000..6cb401faea51
--- /dev/null
+++ b/dev-python/pychroot/pychroot-0.9.18.ebuild
@@ -0,0 +1,49 @@
+# 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
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pychroot.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a python library and cli tool that simplify chroot handling"
+HOMEPAGE="https://github.com/pkgcore/pychroot"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="=dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND=">=dev-python/snakeoil-0.7.4[${PYTHON_USEDEP}]"
+fi
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+[[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	esetup.py build_man
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst README.rst )
+	distutils-r1_python_install install_man
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pychroot/pychroot-9999.ebuild b/dev-python/pychroot/pychroot-9999.ebuild
new file mode 100644
index 000000000000..6cb401faea51
--- /dev/null
+++ b/dev-python/pychroot/pychroot-9999.ebuild
@@ -0,0 +1,49 @@
+# 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
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pychroot.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a python library and cli tool that simplify chroot handling"
+HOMEPAGE="https://github.com/pkgcore/pychroot"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="=dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND=">=dev-python/snakeoil-0.7.4[${PYTHON_USEDEP}]"
+fi
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+[[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	esetup.py build_man
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst README.rst )
+	distutils-r1_python_install install_man
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycipher/Manifest b/dev-python/pycipher/Manifest
new file mode 100644
index 000000000000..6c622035b7ff
--- /dev/null
+++ b/dev-python/pycipher/Manifest
@@ -0,0 +1,5 @@
+DIST pycipher-0.2.py 9174 SHA256 c9acccea93d8f469b0b577f0dcbf4bbaf8a95c869a1c6b75d9e39c55e60e47e1 SHA512 ce3890184affc761fcac7a19284437ca5bd7fd5be6594dc6112eccc27971ca2a62cdff106bffea29c94f3dbc8bbee5f67af3bcd3a53838a1c7bfb19dad45dcda WHIRLPOOL cc61b0b012e52e3363af163f4e79f4bb2780c30dc0a684aeaa8e4959238f74ae73ec1e2d2abf4f6a4450610854ee89e725642c4c40a4971e42aad9aeaa585b7c
+EBUILD pycipher-0.2-r1.ebuild 645 SHA256 9415295884b003457eff103942c71d1ccc5fe4bf6ec240867e66ece598b7b14e SHA512 deaf5f48c44ad65c57584c3aa42f4eb7aad3e65f8b77f1069c9b744d953e75a53143c536a6597cb6f1aeaab4d319482f1fcb190b7f31627062d5c4ec3746f3ad WHIRLPOOL ef677bba8a94d44e2531ecdd333170870edd5f3e97b2d8106815e1889ee4de1a101b36cb974b6b60a60ba4d0cfd3ee3bca6289ce21f84261f1278d27baf2e18d
+MISC ChangeLog 2948 SHA256 763bdc949538cca2d86045c5c20989729f47e29b3f27850782e13e74018868ad SHA512 a491097bc1302ad8309cdde7ff724eb3f206d90ae6d670e72fe671e8c2f5a4e0be8739ba31b45f80461f39056fbf2980e92e00e099863841221271c22ec32b0c WHIRLPOOL 766a1dc399dabf899a4d14bb5bc07a9917506e0b8c24cb1ad47b95ab367c63ee5dca871339184c6013b89cb1eb1f3480c0c5960779095cde86243c406dae907d
+MISC ChangeLog-2015 750 SHA256 cfd7993a0fd12ed33b21bac4f9938517156d35f5d67f70ffc73cb070c28cad85 SHA512 d0cce680e835d81e20f266afb695ed6c48e6f5d3538f7149e001d8790f45c0277dceadac0108b09a7d9e8d8ae27e27231ecc1cc62ac7d0a4d4a2071dc3bed6c6 WHIRLPOOL 7956e888ebbdabf22107798128c3970fb9f51dce6d89f0642ef95784740cd55c30b2816c4afe83d5adf88b33bb3eefe020f947c2adaabe4aeb9eb4f5915cac95
+MISC metadata.xml 318 SHA256 5e2bf4ef860a2355d5adad76be5202d46d2e45e3ede8dbf7507237bdb7714b35 SHA512 5038596f685157e786f10f04e89d766479e8f29262787969d36f2aae2d5ad8031e0233b3a2d1176e4d007cd5c01534d82863ea19ad85715dfb3b0cd979f53a01 WHIRLPOOL 7a698a6632777da0f420cada95cec95e5c7e79d90e128197efa01dc3179392be2d908f5b0c90f76926b47b10a5ab88983d90f0e501f89b40b550bf67feab4ecd
diff --git a/dev-python/pycipher/metadata.xml b/dev-python/pycipher/metadata.xml
new file mode 100644
index 000000000000..f47702af04df
--- /dev/null
+++ b/dev-python/pycipher/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pycipher</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pycipher/pycipher-0.2-r1.ebuild b/dev-python/pycipher/pycipher-0.2-r1.ebuild
new file mode 100644
index 000000000000..5bc7a4dd79db
--- /dev/null
+++ b/dev-python/pycipher/pycipher-0.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit python-r1
+
+DESCRIPTION="A Python module that implements several well-known classical cipher algorithms"
+HOMEPAGE="http://pycipher.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.py"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	mkdir "${S}" || die
+	cp "${DISTDIR}/${A}" "${S}/${PN}.py" || die
+}
+
+src_install() {
+	python_foreach_impl python_domodule ${PN}.py
+}
diff --git a/dev-python/pyclamav/Manifest b/dev-python/pyclamav/Manifest
new file mode 100644
index 000000000000..eec7e2cf067b
--- /dev/null
+++ b/dev-python/pyclamav/Manifest
@@ -0,0 +1,6 @@
+AUX pyclamav-0.4.1-clamav-0.95.patch 4111 SHA256 53d5d29923b2f398ec0d13d82393af99bda2142e3fcf00548741bc854931de1d SHA512 4425ef9edf86c1391d41d925b381bfe068c1db9791a82b942e36f96eb1828ceb170e41877443084d17d45bb365c988f72afa9173d3c701a681ddd953d9a9f474 WHIRLPOOL a3a1fc9aae2474c55671f5feecf9c379a9c4263c9cb2350750c764f6e2bcd832bf138b53d7a9b95d62542972d531076739bc4d062a3d71d91e4e035641deafb0
+DIST pyclamav-0.4.1.tar.gz 12789 SHA256 27f0ea9771a9c5d8f974761df829a85344a19cf47a4b23a3f69836de2717b81c SHA512 ea06ba4706d2a1a98f265f308a72461224d09c44498f2809d31d7576958ecb53038cc3b98ba65e7841bf5082ecf094c2eea6cf7156074461378e98260d42b54f WHIRLPOOL fa9ef9e930e3c886acf2e5e8bc6586bede1e786320d1db03f92e8d4e94f72604adf3879e186b117f324034d9b5011e71168a6bdbff59565c3b3cf163f765ef86
+EBUILD pyclamav-0.4.1-r2.ebuild 759 SHA256 38191179b1446c20f3b78ac695a96b24af18f8caaece7dc1caa98f0ffb9036e0 SHA512 a30199859c7f5a4fb3ba498a9335dbb7cb15ff9b6645737fbeca5fbd8ba1b3d0b024573961fe7684ff308f1aae900058759a46a50324cbc7f86749c10236def8 WHIRLPOOL 1a51f3ddd042468690bfbb702d8debfedf12de1c7b66c21098855360440cad1d8998208efcefe0ee463da7a780f32ab96a9ca7c54af6fdcb1c3c171f32f9aaf3
+MISC ChangeLog 3276 SHA256 9ec55edf41a6803ffb9f457f1ea0f36baaa3a70c7ac0a7b9a182068345fdb52e SHA512 236e16b49956be17831e52b89ee812ce4cc771850c8026242d8376b8767b2020af77dde82476460bb33a2510f5ae422d9e2b3024f379235e593d168366e87dbc WHIRLPOOL 3c93e0602330905e5ad60f9941ff77ea4a4274b3e1ae6b85a42c226576080e2359ccb8b95a9b05184d5d9d4317253a08a8ca21458301c23ff4562c365657c42e
+MISC ChangeLog-2015 3622 SHA256 0bcdefdc026f68a7bd1d104d43716194ecadd54480fdb2738bfa90da823a0357 SHA512 6bcb4e194f0c47f7742c162d4e5c12bfebc06ada13246aeb30abe5fca245729a4735b9039c16fa1fe8cbdada64c390b1413acb301e287dd4d8b6dad4d2570615 WHIRLPOOL 2b6801816b8d3365be124b9bddde5759b4bb5c956bc079e8e879338e630505671b9e3d89261fccf3c4129b7790250509dc52525616d0ae75c691c698e18b2178
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/pyclamav/files/pyclamav-0.4.1-clamav-0.95.patch b/dev-python/pyclamav/files/pyclamav-0.4.1-clamav-0.95.patch
new file mode 100644
index 000000000000..1cf77e1925e7
--- /dev/null
+++ b/dev-python/pyclamav/files/pyclamav-0.4.1-clamav-0.95.patch
@@ -0,0 +1,126 @@
+
+--- python-clamav-0.4.1.orig/pyclamav.c
++++ python-clamav-0.4.1/pyclamav.c
+@@ -33,25 +33,6 @@
+ 
+ /* ********************************************************* */
+ 
+-/* To be able to compile with 
+-   releases 0.75 of libclamav 
+-
+-   Where cl_free was cl_freetrie
+-   and cl_build was cl_buildtrie
+-   CL_SCAN_STDOPT did not exist
+-*/
+-#ifndef CL_SCAN_STDOPT
+-#define CL_SCAN_STDOPT CL_RAW | CL_ARCHIVE | CL_MAIL | CL_DISABLERAR | CL_OLE2 | CL_ENCRYPTED
+-void cl_free(struct cl_node *rootnode) {
+-  cl_freetrie(rootnode);  
+-  return;    
+-} 
+-
+-int cl_build(struct cl_node *rootnode) {  
+-  return cl_buildtrie(rootnode);    
+-} 
+-#endif
+-
+ /* For python prior to 2.3 */
+ #ifndef PyMODINIT_FUNC
+ #define PyMODINIT_FUNC void
+@@ -68,11 +49,9 @@
+ unsigned int signumber = 0;
+  
+ /* Structures for clamav */
+-struct cl_node *root = NULL;
+-struct cl_limits limits;
++struct cl_engine *engine = NULL;
+ struct cl_stat dbstat;
+ 
+-
+ /*
+  * If the virus database has been changed, then
+  * free the current tree and reload the new one
+@@ -85,22 +64,22 @@
+   /* If yes : reload DB                */
+   if (cl_statchkdir(&dbstat) == 1)
+     {
+-      /* free the tree */
+-      cl_free(root); 
++      /* free the engine */
++      cl_engine_free(engine); 
+       signumber=0;
+-      root=NULL;
++      engine=NULL;
+ 
+       /* Load DB */
+-      if((ret = cl_load(cl_retdbdir(), &root, &signumber, CL_DB_STDOPT))) {
++      if((ret = cl_load(cl_retdbdir(), engine, &signumber, CL_DB_STDOPT)) != CL_SUCCESS) {
+ 	/* Raise exception with error message */
+ 	PyErr_SetString(PyclamavError,  cl_strerror(ret));
+ 	return -2;
+       }
+ 
+-      /* build the final tree */
+-      if((ret = cl_build(root))) {
+-	/* free the partial tree */
+-	cl_free(root); 
++      /* prepare the engine */
++      if((ret = cl_engine_compile(engine))) {
++	/* free the engine */
++	cl_engine_free(engine); 
+ 	/* Raise exception with error message */
+ 	PyErr_SetString(PyclamavError, cl_strerror(ret));
+ 	return -2;
+@@ -231,7 +210,7 @@
+     return NULL;     
+   }
+ 
+-  ret = cl_scanfile(file_to_scan, &virname, &size, root, &limits, CL_SCAN_STDOPT);
++  ret = cl_scanfile(file_to_scan, &virname, &size, engine, CL_SCAN_STDOPT);
+ 
+   /* Test return code */
+   switch (ret) {
+@@ -278,17 +257,21 @@
+   /* Set documentation string for the module */
+   PyDict_SetItemString(dict, "__doc__", PyString_FromString("pyclamav :\n\n  This is a python binding to the C libclamav library\n  (from the Clamav project - http://www.clamav.net).\n  It can be used to easily allow a Python script to scan\n  a file or a buffer against known viruses.\n\nAuthor : Alexandre Norman [norman@xael.org]\n\nFunctions :\n  - scanfile(string filename) : Scan a file for virus.\n  - get_numsig() : Return the number of known signatures.\n  - get_version() : Return the version of Clamav.\n  - version() : Return the version of pyclamav.\n"));
+ 
++  /* initialize libclamav */
++  cl_init(CL_INIT_DEFAULT);
++  engine = cl_engine_new();
+ 
+-  if((ret = cl_load(cl_retdbdir(), &root, &signumber, CL_DB_STDOPT))) {
++  if((ret = cl_load(cl_retdbdir(), engine, &signumber, CL_DB_STDOPT))) {
+     /* Raise exception with error message */
+     PyErr_SetString(PyclamavError,  cl_strerror(ret));
++    cl_engine_free(engine);
+     return;
+   }
+ 
+-  /* build the final tree */
+-  if((ret = cl_build(root))) {
+-    /* free the partial tree */
+-    cl_free(root); 
++  /* prepare the engine */
++  if((ret = cl_engine_compile(engine)) != CL_SUCCESS) {
++    /* free up the engine resources */
++    cl_engine_free(engine); 
+     /* Raise exception with error message */
+     PyErr_SetString(PyclamavError, cl_strerror(ret));
+     return;
+@@ -299,15 +282,6 @@
+   memset(&dbstat, 0, sizeof(struct cl_stat));
+   cl_statinidir(cl_retdbdir(), &dbstat);
+ 
+-
+-
+-  /* set up archive limits */
+-  memset(&limits, 0, sizeof(struct cl_limits));
+-  limits.maxfiles = 1000; /* max files */
+-  limits.maxfilesize = 10 * 1048576; /* maximal archived file size == 10 Mb */
+-  limits.maxreclevel = 5; /* maximal recursion level */
+-  limits.archivememlim = 0; /* disable memory limit for bzip2 scanner */
+-
+   return ;
+ }
+ 
+
diff --git a/dev-python/pyclamav/metadata.xml b/dev-python/pyclamav/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/pyclamav/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyclamav/pyclamav-0.4.1-r2.ebuild b/dev-python/pyclamav/pyclamav-0.4.1-r2.ebuild
new file mode 100644
index 000000000000..132b162b653a
--- /dev/null
+++ b/dev-python/pyclamav/pyclamav-0.4.1-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python binding for libclamav"
+HOMEPAGE="http://xael.org/norman/python/pyclamav/ https://pypi.python.org/pypi/pyclamav"
+SRC_URI="http://xael.org/norman/python/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~ppc x86"
+IUSE=""
+
+DEPEND=">=app-antivirus/clamav-0.90"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-clamav-0.95.patch )
+DOCS=( README.txt  example.py )
+
+src_install() {
+	distutils-r1_src_install
+
+	insinto /usr/share/doc/${PF}
+	doins example.py
+}
+
+pkg_postinst() {
+	elog "an example called example.py has been installed into /usr/share/doc/${PF}"
+}
diff --git a/dev-python/pyclimate/Manifest b/dev-python/pyclimate/Manifest
new file mode 100644
index 000000000000..d31092bec49a
--- /dev/null
+++ b/dev-python/pyclimate/Manifest
@@ -0,0 +1,5 @@
+DIST PyClimate-1.2.2.tar.gz 1417758 SHA256 3ee4aadf3d072270aa179c8b2345f5e2136df91c7237a30540be146d7fda8c94 SHA512 b217991873e99ad147e0f4e05bfa900a60486852a803ed6c224321f6fc1f1b6700ad2ad1d6c7c7f8ed8ec94340220c5277456c98ccb408f0bef6888c0adf018f WHIRLPOOL aae764d8d1c53e18d7d190ff78b3619d979501bc14b4c0ef5d3d94aeb274fa56a271f76d3e51e18c6efe20255b52cb43233f67c6664dcaeab03e2365444bf956
+EBUILD pyclimate-1.2.2-r2.ebuild 809 SHA256 c00ac7d4a06eb3d92c7bbe89200f7262f0cb581dc4ec828b832e21dac88b1d86 SHA512 088df66bc3af7331c1fd4b3423395d1845d074cb5036ec6624d009a45e99cf3075456d1f2a08c0f1ef031f946fc4e23b83801e608a42f741dcc5d47435553382 WHIRLPOOL d8a289f2fdd9054825b31e6142ecb50dcfe1c1b82bcc8ea7133461ef213ae9b43956c3342c7f3c04d9e423ebe1353abaab6b9806814caa9f37e6305c16f2c235
+MISC ChangeLog 3216 SHA256 9b78a477b4ff6cf45b751ac3a288f7f9d9e94b2052065f69eeb197668eb19907 SHA512 38f22eea71aec8c2a04e9351671fa5dd7d919ff1e41a093a6999bb77827a15526b6dce546148b575e6434693c1a5b58234a69b6d100192d9ebdd059581851df2 WHIRLPOOL 9eac7fb8e79f8631a7ceab09d2937f6fa82d020ffe95dea436646850d5b66eb19c537c8eaa3c879213795e08b5ef908cd64113d96995f0a75c9ffc26bb4202f4
+MISC ChangeLog-2015 3862 SHA256 d42edaa7b6ae32e91de47ae8e6bc6a0b4ee46ef9bc531ff9689a0be4f367c285 SHA512 88c61e4682d6c292c34734a77d661c566d53010ab00bd3e7f68c2d9eea1ee1215b13e550ad84a5a3892faffb0caba69770643fa15d27fe653ffafbbb68c6778e WHIRLPOOL a3ed4d619cfcd4704a14ff8eb31e2b324d7e73337022562966f87fb54fab2f98a2ec1a1f18547154b4f8142b1bf52064a154de3e659ee42b9e5be7db71c2d38e
+MISC metadata.xml 1380 SHA256 3302df279e7851e3fb68d674bb0ee27533668040c80639de0d2e1c9f6456f1bd SHA512 f5dee80d4ff6a2377de22146f80dadf48f3dec928cd8dadbdde2f7aba80b2dcae6d9792e280455e65cd50fd4177f733a74345b9e2081426243816ce42d8ac622 WHIRLPOOL 7ec9d70efc169d241500bd184f1d6701c5c72ae15ab866faf58845cf3c121d3df33dab6b9212f0927bc7cc68b2c85be3be539585bb4cfa8807654edba39105f9
diff --git a/dev-python/pyclimate/metadata.xml b/dev-python/pyclimate/metadata.xml
new file mode 100644
index 000000000000..4c9e2780a29e
--- /dev/null
+++ b/dev-python/pyclimate/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+ A package designed to accomplish some usual tasks during the analysis of 
+ climate variability using Python. It provides functions to perform some 
+ simple IO operations, operations with COARDS-compliant netCDF files, EOF 
+ analysis, SVD and CCA analysis of coupled data sets, some linear digital 
+ filters, kernel based probability density function estimation and access 
+ to DCDFLIB.C library.
+</longdescription>
+	<longdescription lang="ja">
+��パッケージ�Python言語を使��気候�変化を分��る必��タスクを終�る���
+デザイン�れ���。幾����純�I/O�作�COARDS-compliant netCDFファイル��作
+�EOF解��カップル・データ�SVD�CCA解��幾���リニア・デジタル・フィルター�カー�ル・ベース�プロ�ビリティ・デンシティ・ファンクション・エスティメーショ
+ン�DCDFLIB.Cライブラリ��アクセス等�機能を�供���。
+</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pyclimate/pyclimate-1.2.2-r2.ebuild b/dev-python/pyclimate/pyclimate-1.2.2-r2.ebuild
new file mode 100644
index 000000000000..009559ff3ff8
--- /dev/null
+++ b/dev-python/pyclimate/pyclimate-1.2.2-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+MY_P="${P/pyclimate/PyClimate}"
+
+DESCRIPTION="Climate Data Analysis Module for Python"
+HOMEPAGE="http://www.pyclimate.org/"
+SRC_URI="http://fisica.ehu.es/jsaenz/pyclimate_files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/scientificpython-2.8[${PYTHON_USEDEP}]
+	>=sci-libs/netcdf-3.0"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+	dodoc doc/manual.ps doc/dcdflib_doc/dcdflib*
+}
diff --git a/dev-python/pycmd/Manifest b/dev-python/pycmd/Manifest
new file mode 100644
index 000000000000..f9d8e5799cc3
--- /dev/null
+++ b/dev-python/pycmd/Manifest
@@ -0,0 +1,5 @@
+DIST pycmd-1.2.tar.gz 12896 SHA256 adc1976c0106919e9338db20102b91009256dcfec924a66928d7297026f72477 SHA512 a9506e59889d112a40e1ef115a919644cce31320603904b350cc0a459775dc3d7454dc3f06953b1534cebbf429942bf1577302470bc54665c8dec5eb64b97957 WHIRLPOOL 9c7e185cd96a37f5794bdb5116a6a15327e660e0291c2a4a030d157c2956384d10275907997aa6eb0f569d7b30e406df952d17f5b03a7719af35fe86443b3d7c
+EBUILD pycmd-1.2.ebuild 792 SHA256 ae52cc2ad6cb36ae8727a204fdd50e6ab30aa905abda16dace2a9a60cbeb282f SHA512 52c25c1f9a39b04da157a600a820a778701890dea595ce761064f5aaa6bfc530dd3986a0e500a7dad0a2008f0d4239683dce31c99e0d004266c261557dbda907 WHIRLPOOL 4d3c73a5edd22e0e7fb62205e8fdeb974315f2109da1cdf3c4b9e41123d7c63bb4943070197a2d2db250551cdf758b26ed2128c9087d67c0835f04b9b49f1de5
+MISC ChangeLog 2766 SHA256 e5601783680d25b2c3fabc30d606f9b7b6e528f1bbb974c789be2e448f5c2d3e SHA512 38c58e816388ed1e361c4bad7b608311ab713e4ebc3b65d917c01a0255dbec8e5c467e9e6fa4844e912fc6b8219bac385124730059228e09095110b3fe059f7c WHIRLPOOL 60e4ba339ac52ac396c521b3466c15fcd44adaef524414f4e26ec2f89037c92db2265fc8fbcf0639d7cee99af57a0cf7f9376995eb3264ad0a800866d5a02fc8
+MISC ChangeLog-2015 904 SHA256 cac00438399b7f22606590b99dc00052842c0e25a0b31b015f70121cf545942b SHA512 d1ccd9e7ef9d2b79b84d6306dff6f4674fd8be765b4f40fafc5fc64f532248656201bc3825d0dd63fb48b1a2f8fc5d0689bae94d95e7bb4c1ce72a0663aead5b WHIRLPOOL e89244368aaca10953f812245c91a482a44152c758da22c5fdab5f428766cbcef24c9081cc25bc184d6cd97a87237dfeccd6dea72c6a83776e7090943418dafb
+MISC metadata.xml 308 SHA256 9244f716f30b6fa8fd93978c243d402f9a0e548ed0525a1f55388eb1ae190de7 SHA512 fc624db4af29f488eef3386bfa2ddb2fdb57f1be25fd826e5351fcecdaa2c132ce9b25cf25cbbcb19f38b18de8e936548e5877da88058613ab702ac3073143ac WHIRLPOOL f442e3e395dcf38f751aa61d55f3692bd445c0c3dbfba09e4154ab397d194daab07a62a5706b315b11c8d8aed8139f351fec825004a238922bcb5965945aeb35
diff --git a/dev-python/pycmd/metadata.xml b/dev-python/pycmd/metadata.xml
new file mode 100644
index 000000000000..618608301452
--- /dev/null
+++ b/dev-python/pycmd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pycmd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pycmd/pycmd-1.2.ebuild b/dev-python/pycmd/pycmd-1.2.ebuild
new file mode 100644
index 000000000000..613ea33004bf
--- /dev/null
+++ b/dev-python/pycmd/pycmd-1.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="pycmd: tools for managing/searching Python related files"
+HOMEPAGE="https://pypi.python.org/pypi/pycmd"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=">=dev-python/py-1.4.9[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+# Test files present however are not ready to run as they are supplied in the source
+# The source repo is not listed at all in the page @pypi.
diff --git a/dev-python/pycobertura/Manifest b/dev-python/pycobertura/Manifest
new file mode 100644
index 000000000000..133d59250762
--- /dev/null
+++ b/dev-python/pycobertura/Manifest
@@ -0,0 +1,3 @@
+DIST pycobertura-0.10.0.tar.gz 54209 SHA256 bca6b056dc166081fb6b450bcdd28a49185f0bd97ed9303cdd3fbf914e4777b2 SHA512 47e64c462aa09c871eb6ccffcb5cff8870b332082b79d7642da540014d3b5c3c59fcdef62ee71a2405af48b1393d4f13c79fabb9d182026024cc4887b8681422 WHIRLPOOL 9af42efe7a3080130e5df14c25ed6e99c0404f2d2f96c52feaa65640d46824878fbadd2492f64408191d36ccc1aa3a857d98e8bb998319b0459c9c384630a253
+EBUILD pycobertura-0.10.0.ebuild 866 SHA256 e929854c90015de036105e7968f09fba3f94f079bcaad5e7ff182ed06d39bc74 SHA512 03176638700b42bfbbef6e8214fb2585d765121b0afd8e23b9e8b46d6fdf44ee29c6d5af46644c935881a6b0cbb95b08b303e68d3f005d0dcd14206066a64451 WHIRLPOOL d99b814e4d070e1b4dba30ca34829ccb5a54a3e95b7ca3ed652d2c07ae3b07cf46a068084b487211ed3078e5156b92438e598ff1a50f3ff86ade1a7220d48ce5
+MISC metadata.xml 484 SHA256 9515e0f5c670d441d54308adace9db73bc4e951b2015af12414933ed2cc4f90f SHA512 8098e79df034b8af93335493c5b2532df0755fdd6f605eee2d253ff1f4c9518c9c142707f590a69cba5dda485305e61fbd03f91015c5a1a9745fadf47bfa0a96 WHIRLPOOL 93bb19c9571e80bba034ff74c9fb6c8e67e2f8f22fdd5be856c614c57b40101ab897654208441da88cfbd5642438cabf714c016c30530ea885ae3fe0ddf1f43c
diff --git a/dev-python/pycobertura/metadata.xml b/dev-python/pycobertura/metadata.xml
new file mode 100644
index 000000000000..207d762af9fe
--- /dev/null
+++ b/dev-python/pycobertura/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">SurveyMonkey/pycobertura</remote-id>
+		<remote-id type="pypi">pycoberutra</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pycobertura/pycobertura-0.10.0.ebuild b/dev-python/pycobertura/pycobertura-0.10.0.ebuild
new file mode 100644
index 000000000000..81977de29115
--- /dev/null
+++ b/dev-python/pycobertura/pycobertura-0.10.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Cobertura coverage parser that can diff reports and show coverage progress"
+HOMEPAGE="https://github.com/SurveyMonkey/pycobertura"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/click-4.0[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/tabulate[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
new file mode 100644
index 000000000000..9fbed7dc661e
--- /dev/null
+++ b/dev-python/pycodestyle/Manifest
@@ -0,0 +1,10 @@
+DIST pycodestyle-2.0.0.tar.gz 81701 SHA256 37f0420b14630b0eaaf452978f3a6ea4816d787c3e6dcbba6fb255030adae2e7 SHA512 c003a75bb8873d8ec09cbaf7391c75ebd4739eeab518bbea03c8b2cdc18839773190352166ded78d32992adb56895ee1502003bca11b2d63676c10facb879ac8 WHIRLPOOL 3f162936ea03c8bcd2ba7adbcb77c3d8e44549090875719c888a9fbd86bb9cbf16d4378ffc1c2f28050253520aa86753172816429bc530bc074a2f8fd3e88613
+DIST pycodestyle-2.1.0.tar.gz 85519 SHA256 5b540e4f19b4938c082cfd13f5d778d1ad2308b337abbc687ab9335233f5f3e2 SHA512 901025813884612a04a1f37d2197a7757a050cb38f0dcbff7602b636ad22ae73e943d9b6a5028feda3bec9e55eca91064ace0416ffab8ea0c1721c50dd5c2673 WHIRLPOOL edf365450a7e3440fc5302cef220817fad67832890f72624a5397f8fa69f4e9ff522f7b041788d5852e7875dc707d6b8bb94f481accfcf138c62a0efbaa891dd
+DIST pycodestyle-2.2.0.tar.gz 85811 SHA256 df81dc3293e0123e2e8d1f2aaf819600e4ae287d8b3af8b72181af50257e5d9a SHA512 19c925158d6d0fa704f58387585aa4a618c4973d9f6e99a7831d9a41cb7886a4f1fec8b696162787a84dc575adb6e1cc253fb4af31252ae9cff0ced4b066c346 WHIRLPOOL 49421e7a3a18ce6fa5959fbd22c68022eeef54949fe54ae2c4cc8e4e3c7a1e3356066ae793e4468f8716d0edaffb7c4714c5cdf7750906d533dd5c010574ee4e
+DIST pycodestyle-2.3.1.tar.gz 89460 SHA256 682256a5b318149ca0d2a9185d365d8864a768a28db66a84a2ea946bcc426766 SHA512 276bc21b4e6898e379be88f3582135a21314460ad20d4b6c3e12825ac1a72082b2c08bb62099e704c3222f879a1098d0b305132fac1095aaa60ca239b9763a2d WHIRLPOOL 939ecb7235f92aff8454aec1b10f761dc3b26fcf114802e48753e4063e1c470d2232a50628c39232ac9eb49cff93ca59a84e711f4e7ef230b9e1ab1df53f4b5d
+EBUILD pycodestyle-2.0.0.ebuild 1106 SHA256 c3245f602683639549bd65446bc23606f3f0a7d483bf4880b0acfcacdfa2e3d6 SHA512 3b18f5f5eb919ddcd8468733068d95647ec5950fd322fc4ad029a91b2d172c89d6ae187132f9bd62c9d856fba60b405fc9ab7526244701481d8e6ca8afb910e8 WHIRLPOOL df03517ea78f7d58a07049bc0bc29e68d36f551cff54d4626ca42cb5e39ed6fcd54377b2e40196b36878b345e009aa93912c9d443dbf9fa739d448b3d67545d2
+EBUILD pycodestyle-2.1.0.ebuild 1106 SHA256 c3245f602683639549bd65446bc23606f3f0a7d483bf4880b0acfcacdfa2e3d6 SHA512 3b18f5f5eb919ddcd8468733068d95647ec5950fd322fc4ad029a91b2d172c89d6ae187132f9bd62c9d856fba60b405fc9ab7526244701481d8e6ca8afb910e8 WHIRLPOOL df03517ea78f7d58a07049bc0bc29e68d36f551cff54d4626ca42cb5e39ed6fcd54377b2e40196b36878b345e009aa93912c9d443dbf9fa739d448b3d67545d2
+EBUILD pycodestyle-2.2.0.ebuild 1111 SHA256 91d0c3817416ea111c94906964c0b85b7c7e2f54983d331e259118271df5bd15 SHA512 5878087454217d7e6c8afdc50a74adf2e3193f0055624fff79dae9de349ca41154f8240af31028b9d4745304629affd54416056873c6551e64412ea5a2115cf8 WHIRLPOOL a32aeb9dda62174694289f790ce2d0dd2754a1c49d1b8c7bc1d013cc58d21941c1b9eeee4c4ce0ba60a534c49c0cbae4df1d8fb6b5d471fdffb9d27979250a49
+EBUILD pycodestyle-2.3.1.ebuild 1117 SHA256 dde2eabe5c44bbce41debfbb3bbd6430292a033d3b7d38745e3c1f16e4b1d76e SHA512 3d9c8755bff37ca4c720775e5e13ef230baab6cbe319d6b8d0220acee3b913ce2a374d18e7e115e0bb6967f97bf893f79b965b5d177af0f1d80aba4f4fc98d0e WHIRLPOOL a8a0bc4c403ec266baa92dae428efc95e128a6cf941483e1fae85b5a6880ae71eacd493c553466ac60e5dcc1a3cf64bce1ba449dde398a01e41641a87b23416b
+MISC ChangeLog 699 SHA256 d8289c0a1287612ca2dafdfa2010134578b06af3f89f1af8c3e021c75795b833 SHA512 e5a62618e758bb9998db714fc0a4d160efb39d305c38878e848e9e7077c1c0f22f6091890d7ebea3bd951255be5752759ee78b8f1b6db4c66d614a626bc51cfa WHIRLPOOL e85520e646b50d68acfe2952cd4c2ae5b2a80d5d647cba7bfdfec2214936570d6284e57ea5c51a9ec888a5c59871cf59e1d71ce95017d8af5866edde02654510
+MISC metadata.xml 335 SHA256 dea3ed75cb6ecdd57952b6b7d16608cfab18763a02da0b7c0920dd3a7b7dbdbf SHA512 92e19ab42f44fe1a1da2c8407214bb447262a818b2051e644851178cc7f2274198310a85d7c094839b1764664bd8f8463a6a7a96df83447768082c8ab44909c4 WHIRLPOOL 8dce9f654bcb9b88fda01e9b4f553bbf61eedb2eb02f77ab019957405f6075f7b7e253f7b05feafbaf488261581637957324c85c559932c6a08914916133b389
diff --git a/dev-python/pycodestyle/metadata.xml b/dev-python/pycodestyle/metadata.xml
new file mode 100644
index 000000000000..9771dbcade91
--- /dev/null
+++ b/dev-python/pycodestyle/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>klausman@gentoo.org</email>
+    <name>Tobias Klausmann</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pycodestyle</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pycodestyle/pycodestyle-2.0.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.0.0.ebuild
new file mode 100644
index 000000000000..43b8a0759c75
--- /dev/null
+++ b/dev-python/pycodestyle/pycodestyle-2.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python style guide checker (fka pep8)"
+HOMEPAGE="https://pypi.python.org/pypi/pycodestyle"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --testsuite=testsuite || die
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycodestyle/pycodestyle-2.1.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.1.0.ebuild
new file mode 100644
index 000000000000..43b8a0759c75
--- /dev/null
+++ b/dev-python/pycodestyle/pycodestyle-2.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python style guide checker (fka pep8)"
+HOMEPAGE="https://pypi.python.org/pypi/pycodestyle"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --testsuite=testsuite || die
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycodestyle/pycodestyle-2.2.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.2.0.ebuild
new file mode 100644
index 000000000000..948a84180d7c
--- /dev/null
+++ b/dev-python/pycodestyle/pycodestyle-2.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python style guide checker (fka pep8)"
+HOMEPAGE="https://pypi.python.org/pypi/pycodestyle"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --testsuite=testsuite || die
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild b/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
new file mode 100644
index 000000000000..4e83255e9937
--- /dev/null
+++ b/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python style guide checker (fka pep8)"
+HOMEPAGE="https://pypi.python.org/pypi/pycodestyle"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --testsuite=testsuite || die
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycollada/Manifest b/dev-python/pycollada/Manifest
new file mode 100644
index 000000000000..ce44941af055
--- /dev/null
+++ b/dev-python/pycollada/Manifest
@@ -0,0 +1,6 @@
+DIST pycollada-0.4.tar.gz 519732 SHA256 62a69cce29759900cce0400dac8796d7210de1910dad4c60d4094248c7738121 SHA512 6e9569b858f2014aa08764d0bf328c8317b94edc91e99c2a7c97bf2355983555ea103012d6e6f197862cb3df113ca9263de18fc47edb3c60e74fa8e58b5ca8b0 WHIRLPOOL ce54dcb29cab7e1d97ac8c2eaa3718182373dfa79c7647c7c46f5a2afde88bf7832f98db4a89bdfb58964ccbab041787ac17a25dabc148e963e0739bac27780e
+EBUILD pycollada-0.4.ebuild 1222 SHA256 7b969aac335956b86572fe7fa6bd6d97d42e673995620a22fa325cded3675c64 SHA512 2052333ded6165cda96290846334b38b0c34714a79eff0fe0bc42b450eb6c7259ab5788ecf1416bae55b3fa936cfcf4b5b2273b62305507cd32a1a1a36c839b6 WHIRLPOOL 2956471d4b71c4cffcc08d067c7e677e408e744d3289dda4b9661970dcb57975cfa17484066b7a5154f8bd46cda0470badb88b4dff8a8f19c1764166f6b7c9ab
+EBUILD pycollada-9999.ebuild 1190 SHA256 477d14ea7306d3f0139a47d85dfaa9df155175dcee2614f92840e7158e02410f SHA512 b0b3142eb3117f4e0db3a6606eae1768ef623c25886f5a23f0b5172a5798718f8697df94be2646a89e6e530951c1c22d549c3904954f5f7b95f193ce5d0a8ed8 WHIRLPOOL 2e1ad6d7d2fd73ac9f05a3ce98219c5513d027600663404196343f14f243348e6b102b0caf0b4fd3f250891782f8ce5b02ddc1762ea10e66183a3c7a315b23df
+MISC ChangeLog 3164 SHA256 743fc908c4b8369e22b5ff056ab3dae4a6d0229b2994311f17db842d24b628d3 SHA512 23c81cf7678ca45fa68c86ea54bdc1c4f4da539daeb3499d14f5b9af321a92fe530c6cf4b7b133832a38c950c9c4ae662a943a04ae20d30279801c7c89b3b40b WHIRLPOOL 29f6c6bd8a94e0ff6d7c45e986d406b9489e2d4ae535d1e55b50b3b23abcd52777698723df18c30532959d9456ec8b6d718a9f5df1a9e1511603348b28765fed
+MISC ChangeLog-2015 807 SHA256 77cb4ce2b29cc5c794952f8947a5cb76bf113d98840b5990b79abdfd3412d63b SHA512 497a1cb1008998667535e8c6398f9502a866e127d67e898ec6ca5187a6cfefe944c5fed58c10704e523963d7737295f36305653e77dbc227fb551e164dd0f7ff WHIRLPOOL 21bc9d9b3c46f5d4c1dea5abd69d9a1bb6b9152a753a359b81f2a82f01da68b45ed78ddd558deaee13bbc1deac91bf4c2ec1fffb645f43555a2150e04363aa89
+MISC metadata.xml 327 SHA256 e62eb3ae97b86bda5bdde168d04423b4ed2fc2622229507b967c5ca34b67a088 SHA512 a413c6d76aa3a80cf2f32c4cc75760c0574019eff6d381c1f46aefe4bc7924e59f28d593691b2ac7bb0a7afa7fcdb11a264f3bbc600bfab61148634282307886 WHIRLPOOL efe6b7ed50977052280af4b94a684bec4e96c690d9f663263d519e7d3f647bcb4a64d0c7da842be3f8e5dd3f85c1234bf47b5d7609377487ade068a5b8b99ecf
diff --git a/dev-python/pycollada/metadata.xml b/dev-python/pycollada/metadata.xml
new file mode 100644
index 000000000000..9438ce631d39
--- /dev/null
+++ b/dev-python/pycollada/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pycollada/pycollada</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pycollada/pycollada-0.4.ebuild b/dev-python/pycollada/pycollada-0.4.ebuild
new file mode 100644
index 000000000000..2f8bf9700865
--- /dev/null
+++ b/dev-python/pycollada/pycollada-0.4.ebuild
@@ -0,0 +1,63 @@
+# 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} )
+PYTHON_MULTIPLE_ABI=1
+
+inherit distutils-r1
+
+DESCRIPTION="python library for reading and writing collada documents"
+HOMEPAGE="https://pycollada.github.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+DEPEND="doc? ( dev-python/sphinx )
+	test? ( dev-python/python-dateutil )"
+RDEPEND="dev-python/numpy
+	dev-python/lxml
+	>=dev-python/python-dateutil-2.0"
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if use doc ; then
+		pushd docs
+		emake html
+		popd
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	if use doc ; then
+		pushd docs/_build/html
+		dohtml -r *
+		popd
+	fi
+
+	if use examples ; then
+		insinto /usr/share/${P}/
+		doins -r examples
+	fi
+
+	install_test_data() {
+		insinto $(python_get_sitedir)/collada/tests/
+		doins -r collada/tests/data
+	}
+	python_foreach_impl install_test_data
+}
+
+src_test() {
+	test_collada() {
+		for script in "${S}"/collada/tests/*.py ; do
+			PYTHONPATH="${S}" $EPYTHON "${script}"
+		done
+	}
+	python_foreach_impl test_collada
+}
diff --git a/dev-python/pycollada/pycollada-9999.ebuild b/dev-python/pycollada/pycollada-9999.ebuild
new file mode 100644
index 000000000000..f0b16d863454
--- /dev/null
+++ b/dev-python/pycollada/pycollada-9999.ebuild
@@ -0,0 +1,63 @@
+# 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} )
+PYTHON_MULTIPLE_ABI=1
+
+inherit distutils-r1 git-2
+
+DESCRIPTION="python library for reading and writing collada documents"
+HOMEPAGE="https://pycollada.github.com/"
+EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc examples test"
+
+DEPEND="doc? ( dev-python/sphinx )
+	test? ( dev-python/python-dateutil )"
+RDEPEND="dev-python/numpy
+	dev-python/lxml
+	>=dev-python/python-dateutil-2.0"
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if use doc ; then
+		pushd docs
+		emake html
+		popd
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	if use doc ; then
+		pushd docs/_build/html
+		dohtml -r *
+		popd
+	fi
+
+	if use examples ; then
+		insinto /usr/share/${P}/
+		doins -r examples
+	fi
+
+	install_test_data() {
+		insinto $(python_get_sitedir)/collada/tests/
+		doins -r collada/tests/data
+	}
+	python_foreach_impl install_test_data
+}
+
+src_test() {
+	test_collada() {
+		for script in "${S}"/collada/tests/*.py ; do
+			PYTHONPATH="${S}" $EPYTHON "${script}"
+		done
+	}
+	python_foreach_impl test_collada
+}
diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest
new file mode 100644
index 000000000000..d8f34522c648
--- /dev/null
+++ b/dev-python/pycountry/Manifest
@@ -0,0 +1,7 @@
+DIST pycountry-16.11.8.tar.gz 9042735 SHA256 c9a0536699dfb46fb43ae1449999a921a79361030773bc3d35e00abfecb437c2 SHA512 eb0a91f1efae6aeace0b49cd44b0770efa0b57add208c4247e7f58a3c46774f9f8007c51ee88a0e108c90ced3ad69204b4322c9c23f51df0b2202aa98c314a37 WHIRLPOOL 7eb1bbe51ba14c3b4d1c4e210cf9698fef1b99d0b96c5800985d73431ada5604996f7412e3c0c7440dccaa052fe284f0babd660bc82b28508ed6abbaa7b78f16
+DIST pycountry-17.5.14.tar.gz 9203433 SHA256 d31321e59a134aac326ac07d4b2595d63f7e7f755bcb503bdecca2bd1b54ff2f SHA512 bf5a13ce128f9512287f09c3edb565a3493bf490e420a01c8a45bbb96cfb2482674e8c81cf4db909a92db647f4ba71d03f4aca51995f6c64e4eb59f5c617bcea WHIRLPOOL 2f6b3125f0c1cfa3a7b20833aa74eff652a68a1834f4334fef01f475a340f36a2217c3e564087e77530032c21e46bd4970ca4c49ff3f5f2bf5b4a6b4dadc3c5f
+EBUILD pycountry-16.11.8.ebuild 899 SHA256 89dd63282d5404c68fc62e885e1b12c1bf084f9eafdeafd91a4d9c4ef4dfe32b SHA512 09210a258600481ad258786cfd9762b9abd10a3a0aabab6951232373f566b775297bb376f287f39f34e249ea58b98c14bac5406785976ef151b91787f18e9c18 WHIRLPOOL b2bad51080cb51cd0684b0c2b46ce4ec3f0246206d2e0be99db6e87c672343b7230a435c2075a7d148e3b0aa8d9390ce9a13dbe2134d4113adf8ae5ba327c381
+EBUILD pycountry-17.5.14.ebuild 902 SHA256 bdf964060002e81294a6f062bf314dd0eee40dfdc9e2ab24254979cb6fd0de4f SHA512 99147ddc6406ceafc009e0f7e86fb244d19a2b746e0c63c3ed95bdf60bf3eec0731a596b90dd61de021bac530a6af70b95732a7782640f157aceeb538e1d5bfc WHIRLPOOL aa92820cff2c032b909e18a45847b28ab6db7b97441eb85cfa9e0490ad78c09fd80c699d850dfb27c4e62415eb17b9146693ef404ea90af6b185d1a8caf4d990
+MISC ChangeLog 4052 SHA256 22308c7a123bfa21f0ddd33936b822cdea8eb7ab34f8f0984dd4af99b64ec2d5 SHA512 c0cfca11083eb39f0084b13e949e8f57ab63d41f62fee55b23bcfa1d3873b8857641a220a7280a2f56339671135cb47fb224eacd70bce500f324c2ede4ffa8e6 WHIRLPOOL 8a9b8aa7497c40746fc8af8e6264c4d4374e53f666041b900cbe033c2fcc579b2a37e21d5a1ca54bde9ad3a48e80db60b97f9aba644b166294dc96e46f5c6eee
+MISC ChangeLog-2015 5404 SHA256 197484a59534cac30f229b1e694337a9af9dd10f39c702496cbc121264d5a898 SHA512 5170da2d329c4fcdf01f501ca7afd09fa0ac8a3abba99f0516af64e0237de554fb6ba44a3474025c391802cb0f4cb5ae9e714ff9a439c2004f9bf829fd829510 WHIRLPOOL bd7d0ca1315652ec50bf7cc7664781e05c71e13bd82b12b60befbb46a36e09f144dbd70de2f5945f2ea9f5e209f188511bb98612f635a8457adbaf846296236b
+MISC metadata.xml 516 SHA256 6a09e52b34175a035171b1fdc2d3a6764eb7582cc7ae4c4744428472ab84dcdc SHA512 901c2f02b6dcaacbaae30e82fe886b104051a434ed4c079443a77f5b474cef24f16f658cbe7c01a30966126af78d7950f65207bb8b16e2e1c9bfc71bc05d0c3a WHIRLPOOL 2df71ec33c11095483ec5be77626ce8a77c3ce6d3c13ba5869c1d6c27b710f07e9af8b7ce79cc06d2a4f69afaf4f588f599875b25d6e8d593fb496037db318dc
diff --git a/dev-python/pycountry/metadata.xml b/dev-python/pycountry/metadata.xml
new file mode 100644
index 000000000000..d3c69a8b0ffa
--- /dev/null
+++ b/dev-python/pycountry/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">ISO country, subdivision, language, currency and script definitions and
+		their translations</longdescription>
+	<upstream>
+		<remote-id type="pypi">pycountry</remote-id>
+		<remote-id type="bitbucket">flyingcircus/pycountry</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pycountry/pycountry-16.11.8.ebuild b/dev-python/pycountry/pycountry-16.11.8.ebuild
new file mode 100644
index 000000000000..1cb7ab86604d
--- /dev/null
+++ b/dev-python/pycountry/pycountry-16.11.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Database of countries, subdivisions, languages, currencies and script"
+HOMEPAGE="https://bitbucket.org/flyingcircus/pycountry"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	# https://bitbucket.org/techtonik/pycountry/issue/8/test_locales-pycountry-015-pypy
+	pushd "${BUILD_DIR}"/lib > /dev/null
+	if [[ "${EPYTHON}" == pypy || "${EPYTHON}" == pypy3 ]]; then
+		sed -e 's:test_locales:_&:' -i pycountry/tests/test_general.py || die
+	fi
+	py.test ${PN}/tests/test_general.py || die
+	popd > /dev/null
+}
diff --git a/dev-python/pycountry/pycountry-17.5.14.ebuild b/dev-python/pycountry/pycountry-17.5.14.ebuild
new file mode 100644
index 000000000000..5ab90f36de86
--- /dev/null
+++ b/dev-python/pycountry/pycountry-17.5.14.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Database of countries, subdivisions, languages, currencies and script"
+HOMEPAGE="https://bitbucket.org/flyingcircus/pycountry"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	# https://bitbucket.org/techtonik/pycountry/issue/8/test_locales-pycountry-015-pypy
+	pushd "${BUILD_DIR}"/lib > /dev/null
+	if [[ "${EPYTHON}" == pypy || "${EPYTHON}" == pypy3 ]]; then
+		sed -e 's:test_locales:_&:' -i pycountry/tests/test_general.py || die
+	fi
+	py.test ${PN}/tests/test_general.py || die
+	popd > /dev/null
+}
diff --git a/dev-python/pycparser/Manifest b/dev-python/pycparser/Manifest
new file mode 100644
index 000000000000..4b5bd69b8481
--- /dev/null
+++ b/dev-python/pycparser/Manifest
@@ -0,0 +1,10 @@
+AUX pycparser-2.18-OO.patch 2224 SHA256 2d7eed0b900811c6b6784302d6226488efd6084060e6ee52c307bae2c25fa63c SHA512 b9568bc4fb06015497f8fd7c56ee4312c07d0d7621a84aa946254ebd4e80da8fe4c94c13065780666a44e5d8d3bb72271e9703c7c5af39325f2b699c250bf71b WHIRLPOOL 406933af36a5dd9c7df3c37044e863bf5b7efe7a0a18816bb0b09b66126c567a445a7fd106b1a924b8bbf5f424fdeb53fa87c6d642f55ef1af00ea81a91f9077
+DIST pycparser-2.14.tar.gz 223295 SHA256 7959b4a74abdc27b312fed1c21e6caf9309ce0b29ea86b591fd2e99ecdf27f73 SHA512 d5b9ab434a8944898ac23a4f51189db77b02b993bf3e3ca018852b117fc0eb43e460b156beaa5c1d631ad71c81e1649113e9fff7e33506b1e7d4de24d8b464c6 WHIRLPOOL 4a541ce696298a355d4e3325a10dffd47bd26756b0164da82b70090310edfacf0428ed9e26de7be7e3d4c2c952ee664262a212562852fe29f909ab0631bfd79f
+DIST pycparser-2.17.tar.gz 231163 SHA256 0aac31e917c24cb3357f5a4d5566f2cc91a19ca41862f6c3c22dc60a629673b6 SHA512 c9caaa8d256748e0623d077b11931abb38d19367136c70a835f7587e1f7ceb64f3acb7a983dcb68bedd2cf187517762a5753844e8ed58d1d9ed6f364c55839b4 WHIRLPOOL 4d3585a8c95add8b607bb79b89f8c00d16ab9361cfc72b65a5112b756b8d965cdc9c19af36ab7a73647425788e9121eafd6b0da01c2ca8de6d2b00ed5d097bba
+DIST pycparser-2.18.tar.gz 245897 SHA256 99a8ca03e29851d96616ad0404b4aad7d9ee16f25c9f9708a11faf2810f7b226 SHA512 4754e4e7556d21da328bf7dbabf72f940c9b18f1457260d48208033b05e576919f45ab399e86ea49e82120116980d7d6f53e8b959d21b7b03a3b5bbea3672f13 WHIRLPOOL de6661b661a5b85f39a53183eccfd99d8a89f87e717630964ed1d988b4dd1b5e7ffe7aae6f034fafc2e73b40871dbd75ddf21663356d3152f989d244512019c7
+EBUILD pycparser-2.14.ebuild 933 SHA256 1017ab63dfcb701535b78f3cf824c617b22ac4c63980dcf38a046b521fc78663 SHA512 ba616d6faf9e158c3df3754dfad56cc596f56613cd44f05f9da7b8779b7a8508956852729ad586d47ff33ed77d38eef030ded8be6affa9179ccd080a17cdc9d7 WHIRLPOOL 2433c7d6f990d3499a923618aef29e46514b55f4bedc1563996fb8d7a49cf0c9f80137950ab390a5d6983792a6027a49e7d7cb3c2f9f7fab9bd9fafb847a1a7b
+EBUILD pycparser-2.17.ebuild 1262 SHA256 d4b5fbd3aacdf50ba0c5397f22486a7c8dfa5bd50b34a476497c904dd1dcf34e SHA512 2308dc89f2e277ba7195b892258ba82075365caa7f774f92ed89ab78152b856a83c6d17c473a1162a1d48312164dfdaac7afa1e1f4a47e3ce03bc9e87914e80f WHIRLPOOL ac9b18d3cbb4a4ff4abff2142f0ba07a4000f3807fd0ea720c37894731e55b167df75f72e1626b408f603c67da2c196028b72043e1b67d84f0f6acee1a5cc91e
+EBUILD pycparser-2.18-r1.ebuild 1509 SHA256 9b324fe479b89976a28853475c0c865bac9eb91fff658972e0629569b8fae2de SHA512 fb4e375cff456855f2861464e6da170bf8e2952f56c854e3e5f9a70486859687b9ce227f5b4e982e68a62557c6e631ad89c517a8ae44cc325ab09d0d22152057 WHIRLPOOL db79852e0f2d8c43689a23132ec181eff0ed8d623e76479f027b13a7be921dded037265434225d8bab5ed5af0569e1dfcd9019de1f0d4c7083efc041016ed0aa
+MISC ChangeLog 5881 SHA256 fee6b66b21b5854d390219d0204e0f538081ffc0485cabe23c8b7384723f2c8f SHA512 b4bfafe106b826bba18ebcf262e4bf7426e7b2ed9b6ca7c957cff68b4db3638b43c460a3135eae36c0ea023eed9cc6fc9a2ba7d23f11dcdc1e1e46d4a64bb0e4 WHIRLPOOL ca95a1ba212fe868f37db8912dc3e0a2373679edab2f658c24dc5f3aa596a622561a5113d19b46d5726d6fe3ec0f57b16379be259d0c637eb5f96424046ddefc
+MISC ChangeLog-2015 5195 SHA256 7f7a9c2ebf1ad037405b514632e45b679d2c1a73ba3b887d9e568912825e5a61 SHA512 5de3d9f510baa1f6b4beeedce1132d4636ed02b78fc8adcf8fb00f8db20feda7b01ec9fc6bb475bc2d12092bbe5b93329f6af7dd5886e8d38b06f5bb3bf49bf5 WHIRLPOOL b5ae4c979a4c1a4d4072adb74a9fe3c887174eeba0d9b1a0854f6f3fc786464006e4d775a42c63058a030837737fb95da0fe388da23c1f6e57955c03427474c5
+MISC metadata.xml 380 SHA256 f1d9ff0aee8444270563c08e40b71fba614c3a44fe1d775c45fd6a9213836fa8 SHA512 98ca8c63733123ae6a1d1c8b338d5f98a679b8f84b1e0abed8dc7fefa5549735a7f4de9a5851a26507a6169336fa46689616e46a49df0e9a52f6efb669eac865 WHIRLPOOL 35d626381157e48343305c18f7ba680085990782b51785a0effddaf3a767305e65a12c935604855a60fb3bccddf1a21d0d8b63353b268ed0ef40adf6a2570b0d
diff --git a/dev-python/pycparser/files/pycparser-2.18-OO.patch b/dev-python/pycparser/files/pycparser-2.18-OO.patch
new file mode 100644
index 000000000000..ae42b2b9bd1d
--- /dev/null
+++ b/dev-python/pycparser/files/pycparser-2.18-OO.patch
@@ -0,0 +1,56 @@
+From 673accec311a027c22b0718d753f8da922915305 Mon Sep 17 00:00:00 2001
+From: Eli Bendersky <eliben@gmail.com>
+Date: Thu, 13 Jul 2017 20:25:29 -0700
+Subject: [PATCH] Address an import of pycparser in -OO mode.
+
+In this mode there are no docstrings; we don't want an instantiation of CParser
+to fail, though it won't actually work correctly if used.
+
+See #197 and #198
+---
+ pycparser/plyparser.py | 21 +++++++++++++++++++--
+ 1 file changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/pycparser/plyparser.py b/pycparser/plyparser.py
+index af91922..b6640fa 100644
+--- a/pycparser/plyparser.py
++++ b/pycparser/plyparser.py
+@@ -8,6 +8,7 @@
+ # License: BSD
+ #-----------------------------------------------------------------
+ 
++import warnings
+ 
+ class Coord(object):
+     """ Coordinates of a syntactic element. Consists of:
+@@ -87,12 +88,28 @@ def template(cls):
+ 
+     See `parameterized` for more information on parameterized rules.
+     """
++    issued_nodoc_warning = False
+     for attr_name in dir(cls):
+         if attr_name.startswith('p_'):
+             method = getattr(cls, attr_name)
+             if hasattr(method, '_params'):
+-                delattr(cls, attr_name)  # Remove template method
+-                _create_param_rules(cls, method)
++                # Remove the template method
++                delattr(cls, attr_name)
++                # Create parameterized rules from this method; only run this if
++                # the method has a docstring. This is to address an issue when
++                # pycparser's users are installed in -OO mode which strips
++                # docstrings away.
++                # See: https://github.com/eliben/pycparser/pull/198/ and
++                #      https://github.com/eliben/pycparser/issues/197
++                # for discussion.
++                if method.__doc__ is not None:
++                    _create_param_rules(cls, method)
++                elif not issued_nodoc_warning:
++                    warnings.warn(
++                        'parsing methods must have __doc__ for pycparser to work properly',
++                        RuntimeWarning,
++                        stacklevel=2)
++                    issued_nodoc_warning = True
+     return cls
+ 
+ 
diff --git a/dev-python/pycparser/metadata.xml b/dev-python/pycparser/metadata.xml
new file mode 100644
index 000000000000..27f42a2d52ec
--- /dev/null
+++ b/dev-python/pycparser/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pycparser</remote-id>
+    <remote-id type="github">eliben/pycparser</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pycparser/pycparser-2.14.ebuild b/dev-python/pycparser/pycparser-2.14.ebuild
new file mode 100644
index 000000000000..6b37a293405d
--- /dev/null
+++ b/dev-python/pycparser/pycparser-2.14.ebuild
@@ -0,0 +1,33 @@
+# 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 pypy3 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="C parser and AST generator written in Python"
+HOMEPAGE="https://github.com/eliben/pycparser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_compile() {
+	distutils-r1_python_compile
+	pushd "${BUILD_DIR}/lib/pycparser" > /dev/null || die
+	"${PYTHON}" _build_tables.py || die
+	popd > /dev/null || die
+}
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/pycparser/pycparser-2.17.ebuild b/dev-python/pycparser/pycparser-2.17.ebuild
new file mode 100644
index 000000000000..ba18c49470cd
--- /dev/null
+++ b/dev-python/pycparser/pycparser-2.17.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="C parser and AST generator written in Python"
+HOMEPAGE="https://github.com/eliben/pycparser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+pkg_pretend() {
+	if has_version "=dev-python/pycparser-2.16"; then
+		eerror "You have a broken version of dev-python/pycparser installed."
+		eerror "Please remove the broken version before continuing."
+		eerror "eg. emerge --unmerge =dev-python/pycparser-2.16"
+		die "Broken dev-python/pycparser"
+	fi
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	pushd "${BUILD_DIR}/lib/pycparser" > /dev/null || die
+	"${PYTHON}" _build_tables.py || die
+	popd > /dev/null || die
+}
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/pycparser/pycparser-2.18-r1.ebuild b/dev-python/pycparser/pycparser-2.18-r1.ebuild
new file mode 100644
index 000000000000..6868fa409247
--- /dev/null
+++ b/dev-python/pycparser/pycparser-2.18-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="C parser and AST generator written in Python"
+HOMEPAGE="https://github.com/eliben/pycparser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/pycparser-2.18-OO.patch
+)
+
+python_prepare_all() {
+	# remove the original files to guarantee their regen
+	rm pycparser/{c_ast,lextab,yacctab}.py || die
+
+	# kill sys.path manipulations to force the tests to use built files
+	sed -i -e '/sys\.path/d' tests/*.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# note: tables built by py3.5+ are incompatible with older versions
+	# because of 100 group limit of 're' module -- just generate them
+	# separately optimized for each target instead
+	pushd "${BUILD_DIR}"/lib/pycparser > /dev/null || die
+	"${PYTHON}" _build_tables.py || die
+	popd > /dev/null || die
+}
+
+python_test() {
+	# change workdir to avoid '.' import
+	nosetests -v -w tests || die
+}
diff --git a/dev-python/pycrypto/Manifest b/dev-python/pycrypto/Manifest
new file mode 100644
index 000000000000..a73f34a39c48
--- /dev/null
+++ b/dev-python/pycrypto/Manifest
@@ -0,0 +1,7 @@
+AUX pycrypto-2.6.1-CVE-2013-7459.patch 3808 SHA256 71310698e88a7b960467ec2107e0aaed1cb106d0d7b8b4f381ee9cdf4d9a7c7a SHA512 b34a28fa886ad749878aee17459307fb3006f392304a368e9c80b9beac78b1bca2f35831664e504097996ae1be4e1e81eae5e68b211e47fbf11f2b05b2379fb8 WHIRLPOOL 5736f96de5cb33164ef4aa9cde2a9a8beb86e9a473af42883fc6efaea9c3a271859d12b998d5d5b4f57a91f1f8d15312f595b1aa02f7915d9327951924a20e58
+AUX pycrypto-2.6.1-cross-compile.patch 489 SHA256 6d304658a9df6af7b45726211232ece69a333af822e108d463e0aea7ff6f042a SHA512 fbf1f5b6d065725e84594c1493d0d795a9f8c73d9e873f28b473ebc6bf2f346330d5a92362e1dc09f465227f0bc839ccfaf8dc0011c21323ac80931f74b16fca WHIRLPOOL da5fe27384cc0b96f9644de68ccab3309344a4a8c6a52a1c1ba86782976a440e9114bd05df38bc32a35be33dacfe27451536158d748ceb212ef3b0f8ad68a6d7
+DIST pycrypto-2.6.1.tar.gz 446240 SHA256 f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c SHA512 20a4aed4dac4e9e61d773ebc1d48ea577e9870c33f396be53d075a9bf8487d93e75e200179882d81e452efd0f6751789bac434f6f431b3e7c1c8ef9dba392847 WHIRLPOOL b63734145729f75838357002956297d1ea9e51288939e6f481eaaa12c7da256ab95e4d80d19e618445224fb46a8e2cb1ef5ee0b4b817767d472e3a7c4707371b
+EBUILD pycrypto-2.6.1-r2.ebuild 2105 SHA256 98b0a20fc2f3924008d257bdf083c3075d44696fb4a33842690ff25655bce378 SHA512 122808e523aa259994f6b729ff3fc51db168caa9c95ce30d09ee76ee647233ef0578bca6f6d099ac420828b3537152ac5ca309c2ada25a5ab27ab94f74a07fa4 WHIRLPOOL c722b7c22724b1263a1cc70f98fe2439e1536a3480730dba724b79744b13223506bef9f5e3e256cb52e3cc176719c575ee0817d3985afd087cc0669575fb9843
+MISC ChangeLog 3724 SHA256 a1f05938252306b3ecf0a60712adef6188f514507e51b1d9db77b0a9edd3a429 SHA512 7d71cb6bb8b4bab6a8d80ca955cac690771dfce0607fe8a9785fab3dd6370fda7d4f779f6266c9c02215106ea99880c0944a90043594246e88672103d172465e WHIRLPOOL b709e0564a10a3cf183adeae889c8e0cd9c1b5d185e3f614e37fdcd3370698cc76831f22909155b914f2131e996585a73f04987c680f31c1a734655b8f68ed57
+MISC ChangeLog-2015 20705 SHA256 df7e79d5b6c1f6f38766f62f93d2737a28716afcba9bbd4caf7df210d32761fe SHA512 7282245643d692809eabb17f7dc577e392e588205a18b0eca18ddf20b731cbe8d5aba62bd452f629af9c04be0a0ae65e4ff108d9a28eeadf3be13814331c37aa WHIRLPOOL 440dc71c24353b850e1fe75784e7c3db063b3146e586205f1f350ce0f4f7468b8235ceeedbf10db4845a4faf99b620a2fa462f218c2e771f59716314abcd1b27
+MISC metadata.xml 1865 SHA256 61a22d1f6be3749beb676da24b9e2312829be12f9e0d40075b1a832522358d2a SHA512 fea8edfeb21d9ebd9029a2a68b8612bc62aa5c7fb13b01c940ac9d0c45e60dcaec207cef6db6ad08c551a281daa133b7365e615346b8acf43613aeb40214e763 WHIRLPOOL c4dad89b2933c8179aa8abc50f5e06f08c2a8b313655e3309b8b9339985b22a74b591eccde70c26157f3e7816e9c747d373ac512dfb9b3bb4a458881f0cc3c5b
diff --git a/dev-python/pycrypto/files/pycrypto-2.6.1-CVE-2013-7459.patch b/dev-python/pycrypto/files/pycrypto-2.6.1-CVE-2013-7459.patch
new file mode 100644
index 000000000000..9850f0340510
--- /dev/null
+++ b/dev-python/pycrypto/files/pycrypto-2.6.1-CVE-2013-7459.patch
@@ -0,0 +1,88 @@
+From 8dbe0dc3eea5c689d4f76b37b93fe216cf1f00d4 Mon Sep 17 00:00:00 2001
+From: Legrandin <helderijs@gmail.com>
+Date: Sun, 22 Dec 2013 22:24:46 +0100
+Subject: [PATCH] Throw exception when IV is used with ECB or CTR
+
+The IV parameter is currently ignored when initializing
+a cipher in ECB or CTR mode.
+
+For CTR mode, it is confusing: it takes some time to see
+that a different parameter is needed (the counter).
+
+For ECB mode, it is outright dangerous.
+
+This patch forces an exception to be raised.
+---
+ lib/Crypto/SelfTest/Cipher/common.py | 31 +++++++++++++++++++++++--------
+ src/block_template.c                 | 11 +++++++++++
+ 2 files changed, 34 insertions(+), 8 deletions(-)
+
+diff --git a/lib/Crypto/SelfTest/Cipher/common.py b/lib/Crypto/SelfTest/Cipher/common.py
+index 420b6ff..a5f8a88 100644
+--- a/lib/Crypto/SelfTest/Cipher/common.py
++++ b/lib/Crypto/SelfTest/Cipher/common.py
+@@ -239,19 +239,34 @@ def shortDescription(self):
+         return """%s .decrypt() output of .encrypt() should not be garbled""" % (self.module_name,)
+ 
+     def runTest(self):
+-        for mode in (self.module.MODE_ECB, self.module.MODE_CBC, self.module.MODE_CFB, self.module.MODE_OFB, self.module.MODE_OPENPGP):
++
++        ## ECB mode
++        mode = self.module.MODE_ECB
++        encryption_cipher = self.module.new(a2b_hex(self.key), mode)
++        ciphertext = encryption_cipher.encrypt(self.plaintext)
++        decryption_cipher = self.module.new(a2b_hex(self.key), mode)
++        decrypted_plaintext = decryption_cipher.decrypt(ciphertext)
++        self.assertEqual(self.plaintext, decrypted_plaintext)
++
++        ## OPENPGP mode
++        mode = self.module.MODE_OPENPGP
++        encryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv)
++        eiv_ciphertext = encryption_cipher.encrypt(self.plaintext)
++        eiv = eiv_ciphertext[:self.module.block_size+2]
++        ciphertext = eiv_ciphertext[self.module.block_size+2:]
++        decryption_cipher = self.module.new(a2b_hex(self.key), mode, eiv)
++        decrypted_plaintext = decryption_cipher.decrypt(ciphertext)
++        self.assertEqual(self.plaintext, decrypted_plaintext)
++
++        ## All other non-AEAD modes (but CTR)
++        for mode in (self.module.MODE_CBC, self.module.MODE_CFB, self.module.MODE_OFB):
+             encryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv)
+             ciphertext = encryption_cipher.encrypt(self.plaintext)
+-            
+-            if mode != self.module.MODE_OPENPGP:
+-                decryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv)
+-            else:
+-                eiv = ciphertext[:self.module.block_size+2]
+-                ciphertext = ciphertext[self.module.block_size+2:]
+-                decryption_cipher = self.module.new(a2b_hex(self.key), mode, eiv)
++            decryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv)
+             decrypted_plaintext = decryption_cipher.decrypt(ciphertext)
+             self.assertEqual(self.plaintext, decrypted_plaintext)
+ 
++
+ class PGPTest(unittest.TestCase):
+     def __init__(self, module, params):
+         unittest.TestCase.__init__(self)
+diff --git a/src/block_template.c b/src/block_template.c
+index f940e0e..d555ceb 100644
+--- a/src/block_template.c
++++ b/src/block_template.c
+@@ -170,6 +170,17 @@ ALGnew(PyObject *self, PyObject *args, PyObject *kwdict)
+ 				"Key cannot be the null string");
+ 		return NULL;
+ 	}
++	if (IVlen != 0 && mode == MODE_ECB)
++	{
++		PyErr_Format(PyExc_ValueError, "ECB mode does not use IV");
++		return NULL;
++	}
++	if (IVlen != 0 && mode == MODE_CTR)
++	{
++		PyErr_Format(PyExc_ValueError,
++			"CTR mode needs counter parameter, not IV");
++		return NULL;
++	}
+ 	if (IVlen != BLOCK_SIZE && mode != MODE_ECB && mode != MODE_CTR)
+ 	{
+ 		PyErr_Format(PyExc_ValueError,
diff --git a/dev-python/pycrypto/files/pycrypto-2.6.1-cross-compile.patch b/dev-python/pycrypto/files/pycrypto-2.6.1-cross-compile.patch
new file mode 100644
index 000000000000..2ce24a49cc71
--- /dev/null
+++ b/dev-python/pycrypto/files/pycrypto-2.6.1-cross-compile.patch
@@ -0,0 +1,13 @@
+do not hardcode -I/usr/include as it's useless and breaks cross-compiles
+
+--- a/setup.py
++++ b/setup.py
+@@ -370,7 +370,7 @@ kw = {'name':"pycrypto",
+       'ext_modules': plat_ext + [
+             # _fastmath (uses GNU mp library)
+             Extension("Crypto.PublicKey._fastmath",
+-                      include_dirs=['src/','/usr/include/'],
++                      include_dirs=['src/'],
+                       libraries=['gmp'],
+                       sources=["src/_fastmath.c"]),
+ 
diff --git a/dev-python/pycrypto/metadata.xml b/dev-python/pycrypto/metadata.xml
new file mode 100644
index 000000000000..e3ad12eae841
--- /dev/null
+++ b/dev-python/pycrypto/metadata.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+The Python Cryptography Toolkit is a collection of cryptographic
+algorithms and protocols, implemented for use from Python. Among
+the contents of the package:
+
+	* Hash functions: MD2, MD4, RIPEMD, SHA256.
+	* Block encryption algorithms: AES, ARC2, Blowfish, CAST, DES,
+		Triple-DES, IDEA, RC5.
+	* Stream encryption algorithms: ARC4, simple XOR.
+	* Public-key algorithms: RSA, DSA, ElGamal, qNEW.
+	* Protocols: All-or-nothing transforms, chaffing/winnowing.
+	* Miscellaneous: RFC1751 module for converting 128-key keys into
+		a set of English words, primality testing.
+	* Some demo programs (currently all quite old and outdated).
+
+</longdescription>
+  <longdescription lang="ja">
+��Python言語�クリプトグラフィー・ツールキット��暗�手法�アルゴリズム�プロ
+トコル�集���Python言語�ら利用�れる���実装��。��パッケージ内容�以下
+��。
+
+
+        * Hash ファンクション: MD2, MD4, RIPEMD, SHA256.
+        * ブロック・エンクリプション・アルゴリズム: AES, ARC2, Blowfish, CAST, DES,
+                Triple-DES, IDEA, RC5.
+        * ストリーム・エンクリプション・アルゴリズム: ARC4, simple XOR.
+        * 公開�アルゴリズム: RSA, DSA, ElGamal, qNEW.
+        * プロトコル: All-or-nothing transforms, chaffing/winnowing.
+        * ��他: RFC1751 module for converting 128-key keys into
+                a set of English words, primality testing.
+        * デモ・プログラム(�在��完全���時代�れ�も�)
+
+</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild b/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
new file mode 100644
index 000000000000..d5de62ef8300
--- /dev/null
+++ b/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Python Cryptography Toolkit"
+HOMEPAGE="http://www.dlitz.net/software/pycrypto/ https://pypi.python.org/pypi/pycrypto"
+SRC_URI="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${P}.tar.gz"
+
+LICENSE="PSF-2 public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+IUSE="doc +gmp test"
+
+RDEPEND="gmp? ( dev-libs/gmp:0= )"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/epydoc-3[${PYTHON_USEDEP}]' 'python2*')
+	)"
+
+REQUIRED_USE="test? ( gmp )"
+
+DOCS=( ACKS ChangeLog README TODO )
+PATCHES=(
+	"${FILESDIR}"/${P}-cross-compile.patch
+	"${FILESDIR}"/${P}-CVE-2013-7459.patch
+)
+
+python_prepare_all() {
+	# Fix Crypto.PublicKey.RSA._RSAobj.exportKey(format="OpenSSH") with Python 3
+	# https://github.com/dlitz/pycrypto/commit/ab25c6fe95ee92fac3187dcd90e0560ccacb084a
+	sed \
+		-e "/keyparts =/s/'ssh-rsa'/b('ssh-rsa')/" \
+		-e "s/keystring = ''.join/keystring = b('').join/" \
+		-e "s/return 'ssh-rsa '/return b('ssh-rsa ')/" \
+		-i lib/Crypto/PublicKey/RSA.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# the configure does not interact with python in any way,
+	# it just sets up the C header file.
+	econf \
+		$(use_with gmp) \
+		--without-mpir
+}
+
+python_compile_all() {
+	if use doc; then
+		rst2html.py Doc/pycrypt.rst > Doc/index.html || die
+		epydoc --config=Doc/epydoc-config --exclude-introspect="^Crypto\.(Random\.OSRNG\.nt|Util\.winrandom)$" || die
+		HTML_DOCS=( Doc/apidoc/. Doc/index.html )
+	fi
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS}"
+		append-cflags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
new file mode 100644
index 000000000000..a73408bfeff3
--- /dev/null
+++ b/dev-python/pycryptodome/Manifest
@@ -0,0 +1,7 @@
+DIST pycryptodome-3.4.5.tar.gz 6968315 SHA256 356740c25bee66cf02fce496154f2b9699e5c75c1c6c7e382064d8b6c2cac2dd SHA512 666a90e0cd756b26212df29b2d88c7443bd12fcbf0db6afc6e251a4e92a8528d82495528610c834cd6c066eb384a83f075cb49d52c60c65af04c0e5ff3ce72f8 WHIRLPOOL 41f5d5f64eae7de88b8a6a86f6868a90e3b9eb73f3747cc8e95eb2f30225c3db5ec3b75c9cf92f3542069f3773a0f12a511b113d02046b22473559180d764c03
+DIST pycryptodome-3.4.6.tar.gz 6968560 SHA256 9beefd5d4e468108b43609246274469783945a89123d2525356eb86026967c69 SHA512 40c9ea4cf7fca06bd7cd3a100e1d602e0130fbdcc75544ff1353ced2fae8925d29286200561832f2524a0f3db155a6924bb653d964408d4486aab694bf275cdc WHIRLPOOL e444e6cd45852427360ea32a04cbd2e645d0dc0866180fdcb4605ba8b59958580caee4d2fe5555754ba36e437138eed90866173b12a7869b2662a34bf933a11f
+DIST pycryptodome-3.4.7.tar.gz 6483140 SHA256 18d8dfe31bf0cb53d58694903e526be68f3cf48e6e3c6dfbbc1e7042b1693af7 SHA512 a328df1f3b2cfeccbb5984aca4c5cbd59e8a352c817e82411d2876b2494476027f63e61200b0cc87e9420e8b47e91fffe71865fb2c23a66da0276814641eaab0 WHIRLPOOL 421991b522e97850a5e07b38dac6ef4c76a0136feb437d319e7af901afdeb5ff2ebf40826c8c9cdc8e78429c6c2e57bc1c73fdf07e9a5de39fe3a96829f538a0
+EBUILD pycryptodome-3.4.5.ebuild 799 SHA256 d3aaabab0a380b1698fb0d9a757ed40af7ceada8c27ce4d6057709b398826bdb SHA512 c5bcd876d5ffe2c8d02325122f4f8f11b2b6d2ccef8c95db970b7f1a2a79cb672749821447f4c68a056acc9810c1f2147225cbd4b37f2edc433965799d692cc0 WHIRLPOOL 36d687c013c781f3c9a4d61a22d0fa991eab6d3f7b70f3c34a326ef3b0defb7e2b270536fc5a707e9464110cf52737c85b75322716f4e076d758dd730edfa31e
+EBUILD pycryptodome-3.4.6.ebuild 817 SHA256 fe8647ef2157d592b452a15cc7bc861c7328fb4e686365c5fe34ff3a71b30b8d SHA512 cf8aaa4a28a05a180d1e807e19bcb1ce659a4391ae2ea002fdf26c91b7563306e1973a8a16d6520ae4cae12969291588af76fa6222b6425816e4a1b8e0afbe70 WHIRLPOOL 43ec7b6a4aca0777cf66175052800f8643632a338d96253838d0e639e68f3d1c89117e9216649e364a57dcf68aaf586d07ccdf946261461c6526164c39803cfb
+EBUILD pycryptodome-3.4.7.ebuild 858 SHA256 22a5cf4cf79d4972518b4ba991f2041fb3853cc17ffc58431b7380de006abbb8 SHA512 b39cbe098fa77f2cfab6cecb7de495cc841a905636917cfc58d31b923fa5cdee2483438a5512aec2b9852518dc5db51b205850069dd3117941a057202b151b14 WHIRLPOOL 9952699637f95d67e61cfe6bcabca345f4582b6896a7189e0d4d7ffc5f1597942327cd4a48d0a7e7e30ca6075c764bdd962c59607ac600e4f2815b40f6dde169
+MISC metadata.xml 334 SHA256 c7f911622b633808fa178c34e23a476826f59cf3d71b1a68709aba251d3fe753 SHA512 f314a41851c5f31d68a7fb93ab304aab44007756472c9f18c746a0b0a7bbf464a9f196559f4ecf6f8b68b265b7ba9ef571398e1893d316b48a0fa435eb7a1b3a WHIRLPOOL 43839770c174ef4dd5941ba8d674d7ba65e56d476d010b1ee919a07e8bbd0eac3e7f55a1e1abb319c7652cca4e8d4de9bb104bdcafe6d6749af1e965f73000e9
diff --git a/dev-python/pycryptodome/metadata.xml b/dev-python/pycryptodome/metadata.xml
new file mode 100644
index 000000000000..dae6a54104b8
--- /dev/null
+++ b/dev-python/pycryptodome/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>python@gentoo.org</email>
+		<name>Python project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Legrandin/pycryptodome</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pycryptodome/pycryptodome-3.4.5.ebuild b/dev-python/pycryptodome/pycryptodome-3.4.5.ebuild
new file mode 100644
index 000000000000..ad20a40cdaaa
--- /dev/null
+++ b/dev-python/pycryptodome/pycryptodome-3.4.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A self-contained cryptographic library for Python"
+HOMEPAGE="https://github.com/Legrandin/pycryptodome"
+SRC_URI="https://github.com/Legrandin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2 Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86 ~ppc-aix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-libs/gmp:0
+	virtual/python-cffi[${PYTHON_USEDEP}]
+	!dev-python/pycrypto"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pycryptodome/pycryptodome-3.4.6.ebuild b/dev-python/pycryptodome/pycryptodome-3.4.6.ebuild
new file mode 100644
index 000000000000..d9eae2b53c86
--- /dev/null
+++ b/dev-python/pycryptodome/pycryptodome-3.4.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A self-contained cryptographic library for Python"
+HOMEPAGE="https://github.com/Legrandin/pycryptodome"
+SRC_URI="https://github.com/Legrandin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2 Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-libs/gmp:0
+	virtual/python-cffi[${PYTHON_USEDEP}]
+	!dev-python/pycrypto"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild b/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
new file mode 100644
index 000000000000..b77f9bf463be
--- /dev/null
+++ b/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A self-contained cryptographic library for Python"
+HOMEPAGE="https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.python.org/pypi/pycryptodome"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2 Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-libs/gmp:0
+	virtual/python-cffi[${PYTHON_USEDEP}]
+	!dev-python/pycrypto"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pycryptopp/Manifest b/dev-python/pycryptopp/Manifest
new file mode 100644
index 000000000000..ff664c609a57
--- /dev/null
+++ b/dev-python/pycryptopp/Manifest
@@ -0,0 +1,7 @@
+DIST pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958.tar.gz 2009822 SHA256 116158917bd243da2701cfeba9a6374854bc9a599d1466e1a2dbadf37c802059 SHA512 bdd7d983bc0f8ef50c140a8da0c532883f0f1461d4a91d2761c872403133e9474d4fdbd78e275adbaacd2066cab4121034002a4730258162a618b3af913fdf7a WHIRLPOOL 809aecb84ff38232351b0700225564672d082528d0a98ec071ce40b97e02df59ac41647ae6356ecafca916655555cf533787db5182cd9536177affedbd7b89c3
+DIST pycryptopp-0.7.1.869544967005693312591928092448767568728501330214.tar.gz 1992756 SHA256 08ad57a1a39b7ed23c173692281da0b8d49d98ad3dcc09f8cca6d901e142699f SHA512 8b5996badedcd32345818f95e26487ac938c10e1790495515c74816075261a4fcedd2f80c55beddbdea54ed8899bc7c7b1a192468cb3cf434c50f9a68b65cc25 WHIRLPOOL 7a3b67615cbef44bef5e9d965364f1d10f2622922ebce2e345f58f3b20b56bee0d222d9466c9bb53dd53ae0c988ef192e4feda9ef05d6c3fb5be88cdd181cf88
+EBUILD pycryptopp-0.6.0.ebuild 955 SHA256 a59988783ab324eaa0329d3a16883917c06ac675facb16f4564828f1963c0614 SHA512 9a62383652a38bff4e245dff31dc209396ac68fa7166895862047fa68958ad886f6945e5bcd34383a0a2cf05f5b82cdf8ec8cf8602a292481cb19dccddc3a460 WHIRLPOOL e1943b088160653ad2a5dd511feee004847cc7d841bf249b331357385dfc29103234c7ecfc06e849daee7462b727ac3c06065eb0063c832be5b860ffb944c3f0
+EBUILD pycryptopp-0.7.1.ebuild 956 SHA256 f90ba9816a44ecd2e08a4769e04edaec10e013d8721ed6475c55656948c2c5d1 SHA512 009d2966a513bac311c2bcb1c6a43edcec2f453f5ccea8bdc8c5d948bbdc880497041d03993260fb7fc5173acf4e347ca883a00996dc92172cec1e90905141d0 WHIRLPOOL fef759f608bb097c8774724b1cf99d1524ef10edc15c40061cf3b01499c07e1ee5f7442aa24cfb8149da8d5f2adb846e7a4120f1153a6ddd22f18a4bb2263ae9
+MISC ChangeLog 2717 SHA256 031176a8f6585cc3df41e3b09c427669f5151a7a38056d52c59041934fe03dc5 SHA512 86ba37faf5b4ce0b767cc9f1bb67ed1c5a958c0648282016cd9a7e815d7147b9e2eacee79e8e42c3dd3e3b07cac074221c9c3f10f35dfd54c4f68a6a3d78fc8d WHIRLPOOL 205cbed0e73d01a2b621746208eacad54915769f5d9be1a2009081b1093bf28ecfdbe370bd2475faab10171e4a229a2469b8cb36eb7d7ac44ed5c64b746bc254
+MISC ChangeLog-2015 1504 SHA256 50868f2a814652dbd481c61957a8dec360e80bc76a50432fe13c3aadb31c69be SHA512 d1dc92895d8d9135f702046745addbaef988fbb758d56dbc47452cfc587ecd2afea6d702803b7c5244fa273c71feebc6a3458e37e45a951d3f1898a9682d8cf1 WHIRLPOOL ceaab87e256a8c8c7d373c4c29cd698c979839c542a58ef2c9873b88fe776903e0b149dfc725fd4de4c1ef462c0258a82fec043dc15323a1d51518b38e1e15f9
+MISC metadata.xml 313 SHA256 468997761542f75fc1a01d5757553fbfb4be11ac52395dc147bdcbed84d97147 SHA512 43f568076f481a7172565b251b4e5cd08567a2a0ec204713f9f1d892331d70be656694df66f47961289a99f0aac72733e75d3689054dd88dd52a6d055e19c0dc WHIRLPOOL e7b5f15064c758e0e50810192d975c3cffe7c3ee6d992dcaccd37c789e38e5cbc530e3664b8f1c70e7da46b7e16da844d6d12e589444b69cfaf610600ba231b1
diff --git a/dev-python/pycryptopp/metadata.xml b/dev-python/pycryptopp/metadata.xml
new file mode 100644
index 000000000000..b4a9e3bc1573
--- /dev/null
+++ b/dev-python/pycryptopp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pycryptopp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild b/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
new file mode 100644
index 000000000000..43aa84bb1f47
--- /dev/null
+++ b/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 vcs-snapshot
+
+NUM="1206569328141510525648634803928199668821045408958"
+MY_P="${P}.${NUM}"
+
+DESCRIPTION="Python wrappers for a few algorithms from the Crypto++ library"
+HOMEPAGE="http://tahoe-lafs.org/trac/pycryptopp https://pypi.python.org/pypi/pycryptopp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-libs/crypto++"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS="NEWS.rst"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Don't install license files
+	sed -i -e "/data_files=data_files,/d" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	# use system crypto++ library
+	distutils-r1_python_compile --disable-embedded-cryptopp
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild b/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild
new file mode 100644
index 000000000000..17cb785f7e53
--- /dev/null
+++ b/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 vcs-snapshot
+
+NUM="869544967005693312591928092448767568728501330214"
+MY_P="${P}.${NUM}"
+
+DESCRIPTION="Python wrappers for a few algorithms from the Crypto++ library"
+HOMEPAGE="http://tahoe-lafs.org/trac/pycryptopp https://pypi.python.org/pypi/pycryptopp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/crypto++"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS="NEWS.rst"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Don't install license files
+	sed -i -e "/data_files=data_files,/d" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	# use system crypto++ library
+	distutils-r1_python_compile --disable-embedded-cryptopp
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pycuda/Manifest b/dev-python/pycuda/Manifest
new file mode 100644
index 000000000000..6d12a7f87052
--- /dev/null
+++ b/dev-python/pycuda/Manifest
@@ -0,0 +1,14 @@
+DIST pycuda-2012.1.tar.gz 1473695 SHA256 d5b90467b926c73ceaf2dd2662fef2e21e106f00a0aa0d11f09a891aac3925dc SHA512 bb8889fa46de3d4ae57fb47883232953eba0e12a53431fffdefb12af3134540aec2671f0f2fbbe1d836dab354d407e078e773e84f8ee9a5345400a4a59da7937 WHIRLPOOL b35484ddc8d2c1808a0d706dcdcc9ebe49af153b0aaaf8fc2596f4068c5c2dbdb9fb4f84ac46512b314ef9383f70dfcefa4895191d7a9f6d78eee8ae8a56fe71
+DIST pycuda-2013.1.1.tar.gz 1586425 SHA256 4b541ff7ab4a867e9389b3b9b9456c6957000f39a20a46e872dd25dd3bece2da SHA512 7a7e95fcd4f76d10234558021064cc299e6d93ab9a428c9560e5a8a73b13304ba9ccc3c103674a25effdc01a14aac21981a62de881a9c990ad16d7689b75e502 WHIRLPOOL c1e958defbe4998c0af5a256df51daa3901f0bf2a45e5c5faed9abf5ba60ebd0dddab6fbb4caff41eac588fe7fc3cca1517c032d95d316492f99c307b6a260f3
+DIST pycuda-2014.1.tar.gz 1588986 SHA256 28e8f7425d0bac03a6c80346a4e150024ef0e4740ce11cb54e6aef351127d7af SHA512 57e333941c472feea6974e583f9d27f7f5083011bd8a7cc0bc31d27032885a130f1f57a16b0730696c607b9dca32ad84b96c984cd82351800ec854acdfa8fe9f WHIRLPOOL c71876c6f203a0a8a996a90976ad3f012ce1497ee84534c7fb8876e19293766d4641fbac00a538b1ddb074b29f8d8347f39caae613839b38cf5ee9eb15a86c09
+DIST pycuda-2016.1.2.tar.gz 1603373 SHA256 a7dbdac7e2f0c0d2ad98f5f281d5a9d29d6673b3c20210e261b96e9a2d0b6e37 SHA512 7a1a9d6723651bdc6f584de884c46bbaa17970e622b4d800c7f36ff57817807a51c7e4aa0a40872e46fc1243087af6dda07489bb60b6a33f52740a4d7a9e69a7 WHIRLPOOL f1c169d0bac25f625aa6609bf06fdc7fadce00fd291d27113b9ae92995801cfc2361cfb254bec836c2547ff4b96498c945f73a0ed76032b382e13f315222e711
+DIST pycuda-2017.1.tar.gz 1608187 SHA256 a92725ccd8515b4d7284b9127184b6fdb61f224daa086e7fc6b926e2094b055f SHA512 ce3de28de613352bec4efb86ffaa055f92ccd0c758b903aecc60af5b84f0f0643d04a869d6a23ce329c3d33670cfb266ad69c784ba917a190a11bdfea1fe6690 WHIRLPOOL 47ca3e88007315f67b7147cf534f0c91e979f4c5fdcad28742a51f2062390509fcfeac8696a049557c2a37b659430ad3d148a607b5e0c8da6fc4a71f4bc54fa7
+EBUILD pycuda-2012.1.ebuild 2370 SHA256 1af521a8535bb1c7b9f54fce9afe8955109706351a8991778dc24776f5673b80 SHA512 84ae216bd2b480a195ecaca68cc028a0cd3424af2dcdb37f3462f5c8922aa4e4fc8dca5d7f9afd7deb7f0b66654634a46bea82988847b9e5dda9d6bca933c4bd WHIRLPOOL 615113c425233503bd83242821695213407000db9f4f992b36b8969c85b180b92ebff17d1bba14aa663f8dd2612975bc1c69d34c178dcce71937bf97953ee813
+EBUILD pycuda-2013.1.1.ebuild 2368 SHA256 9f57459cde8b4c607ea2848aa59fffee36e2aeef10f263356ccf5591757d1da2 SHA512 c9914f7be3cca3b5fca2ce9ed466589788d36a08564b2d8f515c80f5641e6cb350af5876a3eb44c2158a8160d50aa12b2620ffb28b415e12b322f7a2d501f75b WHIRLPOOL b394318b00b05a65338ff69aea13cbad09ad1a065c829cbe945475d927a71d22869da53f95dc82f1a1d63ab99afb51e79109de08b40fceb3bff5d1bf3db11d7e
+EBUILD pycuda-2014.1.ebuild 2405 SHA256 2f0ad6c429c6b6cdbb4a57df1a650d2fa6e5823dbc1cb84d9afaaa3db230e847 SHA512 f95dd9915f24ec38d377193be259dbc9d45e5cabf5f924a52a1a8c49a4f7e789bb36bb1023031aae0f4656efc139055fd111e5570457b1a964a5b6e7515bbfeb WHIRLPOOL e009b167ecb26d7e4abbddd6c4f311d2ac62ebd46a8dded4d2654d9a2463995eb988204a65645bf5279d17260d7d62180627094ef5b3e6c4d53bc7e0821be23b
+EBUILD pycuda-2016.1.2.ebuild 2319 SHA256 b1a88de35045729a432931c0bec7ede71e1ce7f7ca1356df33ecd555fc12df62 SHA512 23eb78e93a2a5ec02958254b82b41f2d2df743b9253b372db8ed53c75268e9cfd61bfe4a8564378a293056859d8c1f5d1a70adc3e00077a14ce148df2f2f4dd9 WHIRLPOOL 3e92d208c135e46b7c5be7ded26ff83fb875c9698c0d629cadcefc4495047cfe856705cb2b90bd572242713d43b89fdbfa7d8abea3ebc79892761758d964fd3d
+EBUILD pycuda-2017.1.ebuild 2293 SHA256 a3158202d6ee5f6aca03ab4370545c8c0929f6fea8fd13bd6fdc2b7b64c37e1c SHA512 c57dffa5f495c447ed2a0edbeb4c0327c1455c3b810b573a3c40b043732fac38e6ba182b8ec968f6ad8f863d05de25683b0ed302196d3b52b2b7c9942084e288 WHIRLPOOL e32a609670cb206b022b57ab1ce192adc759f241cc4329252d27bbb66cdd6c8daeedff57f7f2478afd2b90891e2806a19822659b36bc3ca6b32901ba81a87883
+EBUILD pycuda-9999.ebuild 2391 SHA256 98216616521fabac858aca0b4c18a831bf25a33ad56a717e65189a219ee375b4 SHA512 8ceb1e5ba6517cff9cfb2f37ad7190ce5bca76d78d18888b4baedcf3c74d1f3feb25524d391ef1422fb40063608f14e0e7aa83f6da688fa9c6fec62b142348d1 WHIRLPOOL 8fc0c03a119ebdeac929939f5c719c0c23d1707aabc4e9b1645105d7c886a88a2d524b1119f3a00711ceff9ef8220bebb1ad2d62f5cb44acf1fa1dae5f98b571
+MISC ChangeLog 3887 SHA256 ed50898c81f84a561a0d3c99fcd02ddf7fb0e914100eeda49925d3952654e2ec SHA512 f3f471bfd4ca738300f57f645958818d8929d60e63c8bde9b0adce311fde0c1c7c83b1fb7c873e4e8496b29394e756fa751de9f10358c48ab5a899c6e877e664 WHIRLPOOL 4f9fc6c14f1e52bb1d774252d6d68f0441cbcdb2f63c117054535e91279a244d7f49304ecd02034d507ede1b4f82eb34d4d72d9d9e93723a83d3f7417f776e7c
+MISC ChangeLog-2015 4156 SHA256 d1a6e98bc7f7aa17cbe309386701e52619aa2d5e69f895efbc59c78f6eecba2a SHA512 1e3810930fe76a23b43f5b020b2ed13f06b211bb4bfb805c151857d98e386158e60a01d04349af71fde83efdd772023a3160eaf7e0e3e1543ffce7053323f652 WHIRLPOOL a92f0d704cab346b0e8a4f89dee2e5ad94b04ddaaeb27da8b1e952b1eb208074828b420c14d92dbb2e031268e1b6ce4c0b606d9093515004f3668b25d7266c85
+MISC metadata.xml 332 SHA256 e10c83dd1808f1b643903dd2020de71d2d1511d04193c848a376ccace12637c9 SHA512 2a2ba5f70d55593801948a9143fce5ddb2922da30fc7c1ea3ec21ccbb391a09fc34be961e9dbccb53d6575aa347878d105526d85bb7cc3f2f561f1793f0eee5c WHIRLPOOL 59b5ad53d35814fb7bde6f798de3eb6a576a71b0544533d79a63b71f5f4bacdb0d1a2e022350ab8dc83982a0b1c48d74c98205a0445c7405d1fe018a9e4e254e
diff --git a/dev-python/pycuda/metadata.xml b/dev-python/pycuda/metadata.xml
new file mode 100644
index 000000000000..392ea93829c7
--- /dev/null
+++ b/dev-python/pycuda/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pycuda</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pycuda/pycuda-2012.1.ebuild b/dev-python/pycuda/pycuda-2012.1.ebuild
new file mode 100644
index 000000000000..8c8e48ffd028
--- /dev/null
+++ b/dev-python/pycuda/pycuda-2012.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cuda distutils-r1 multilib
+
+DESCRIPTION="Python wrapper for NVIDIA CUDA"
+HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.python.org/pypi/pycuda"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples opengl test"
+
+RDEPEND="
+	dev-libs/boost[python,${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2011.2[${PYTHON_USEDEP}]
+	dev-util/nvidia-cuda-toolkit
+	x11-drivers/nvidia-drivers
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# We need write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
+# user is (usually) not in the video group
+RESTRICT="userpriv"
+
+python_prepare_all() {
+	cuda_sanitize
+	sed \
+		-e "s:'--preprocess':\'--preprocess\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
+		-e "s:\"--cubin\":\'--cubin\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
+		-e "s:/usr/include/pycuda:${S}/src/cuda:g" \
+		-i pycuda/compiler.py || die
+
+	touch siteconf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local myopts=()
+	use opengl && myopts+=( --cuda-enable-gl )
+
+	mkdir "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
+	"${EPYTHON}" "${S}"/configure.py \
+		--boost-inc-dir="${EPREFIX}/usr/include" \
+		--boost-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--boost-python-libname=boost_python-$(echo ${EPYTHON} | sed 's/python//')-mt \
+		--boost-thread-libname=boost_thread-mt \
+		--cuda-root="${EPREFIX}/opt/cuda" \
+		--cudadrv-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--cudart-lib-dir="${EPREFIX}/opt/cuda/$(get_libdir)" \
+		--cuda-inc-dir="${EPREFIX}/opt/cuda/include" \
+		--no-use-shipped-boost \
+		"${myopts[@]}"
+}
+
+src_test() {
+	# we need write access to this to run the tests
+	addwrite /dev/nvidia0
+	addwrite /dev/nvidiactl
+	python_test() {
+			py.test --debug -v -v -v || die "Tests fail with ${EPYTHON}"
+	}
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/pycuda/pycuda-2013.1.1.ebuild b/dev-python/pycuda/pycuda-2013.1.1.ebuild
new file mode 100644
index 000000000000..38d353c8f62b
--- /dev/null
+++ b/dev-python/pycuda/pycuda-2013.1.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cuda distutils-r1 multilib
+
+DESCRIPTION="Python wrapper for NVIDIA CUDA"
+HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.python.org/pypi/pycuda"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples opengl test"
+
+RDEPEND="
+	dev-libs/boost[python,${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2013[${PYTHON_USEDEP}]
+	dev-util/nvidia-cuda-toolkit
+	x11-drivers/nvidia-drivers
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# We need write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
+# user is (usually) not in the video group
+RESTRICT="userpriv"
+
+python_prepare_all() {
+	cuda_sanitize
+	sed \
+		-e "s:'--preprocess':\'--preprocess\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
+		-e "s:\"--cubin\":\'--cubin\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
+		-e "s:/usr/include/pycuda:${S}/src/cuda:g" \
+		-i pycuda/compiler.py || die
+
+	touch siteconf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local myopts=()
+	use opengl && myopts+=( --cuda-enable-gl )
+
+	mkdir "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
+	"${EPYTHON}" "${S}"/configure.py \
+		--boost-inc-dir="${EPREFIX}/usr/include" \
+		--boost-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--boost-python-libname=boost_python-$(echo ${EPYTHON} | sed 's/python//')-mt \
+		--boost-thread-libname=boost_thread-mt \
+		--cuda-root="${EPREFIX}/opt/cuda" \
+		--cudadrv-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--cudart-lib-dir="${EPREFIX}/opt/cuda/$(get_libdir)" \
+		--cuda-inc-dir="${EPREFIX}/opt/cuda/include" \
+		--no-use-shipped-boost \
+		"${myopts[@]}"
+}
+
+src_test() {
+	# we need write access to this to run the tests
+	addwrite /dev/nvidia0
+	addwrite /dev/nvidiactl
+	python_test() {
+			py.test --debug -v -v -v || die "Tests fail with ${EPYTHON}"
+	}
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/pycuda/pycuda-2014.1.ebuild b/dev-python/pycuda/pycuda-2014.1.ebuild
new file mode 100644
index 000000000000..4da48c34850d
--- /dev/null
+++ b/dev-python/pycuda/pycuda-2014.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit cuda distutils-r1 multilib
+
+DESCRIPTION="Python wrapper for NVIDIA CUDA"
+HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.python.org/pypi/pycuda"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples opengl test"
+
+RDEPEND="
+	dev-libs/boost[python,${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2013[${PYTHON_USEDEP}]
+	dev-util/nvidia-cuda-toolkit
+	x11-drivers/nvidia-drivers
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# We need write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
+# user is (usually) not in the video group
+RESTRICT="userpriv"
+
+python_prepare_all() {
+	cuda_sanitize
+	sed \
+		-e "s:'--preprocess':\'--preprocess\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
+		-e "s:\"--cubin\":\'--cubin\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
+		-e "s:/usr/include/pycuda:${S}/src/cuda:g" \
+		-i pycuda/compiler.py || die
+
+	touch siteconf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local myopts=()
+	use opengl && myopts+=( --cuda-enable-gl )
+
+	[[ -d "${BUILD_DIR}" ]] || mkdir "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
+	"${EPYTHON}" "${S}"/configure.py \
+		--boost-inc-dir="${EPREFIX}/usr/include" \
+		--boost-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--boost-python-libname=boost_python-$(echo ${EPYTHON} | sed 's/python//')-mt \
+		--boost-thread-libname=boost_thread-mt \
+		--cuda-root="${EPREFIX}/opt/cuda" \
+		--cudadrv-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--cudart-lib-dir="${EPREFIX}/opt/cuda/$(get_libdir)" \
+		--cuda-inc-dir="${EPREFIX}/opt/cuda/include" \
+		--no-use-shipped-boost \
+		"${myopts[@]}"
+}
+
+src_test() {
+	# we need write access to this to run the tests
+	addwrite /dev/nvidia0
+	addwrite /dev/nvidiactl
+	python_test() {
+			py.test --debug -v -v -v || die "Tests fail with ${EPYTHON}"
+	}
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/pycuda/pycuda-2016.1.2.ebuild b/dev-python/pycuda/pycuda-2016.1.2.ebuild
new file mode 100644
index 000000000000..8118670d6633
--- /dev/null
+++ b/dev-python/pycuda/pycuda-2016.1.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit cuda distutils-r1
+
+DESCRIPTION="Python wrapper for NVIDIA CUDA"
+HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.python.org/pypi/pycuda"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples opengl test"
+
+RDEPEND="
+	dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2013[${PYTHON_USEDEP}]
+	dev-util/nvidia-cuda-toolkit
+	x11-drivers/nvidia-drivers
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# We need write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
+# user is (usually) not in the video group
+RESTRICT="userpriv"
+
+python_prepare_all() {
+	cuda_sanitize
+	sed \
+		-e "s:'--preprocess':\'--preprocess\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
+		-e "s:\"--cubin\":\'--cubin\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
+		-e "s:/usr/include/pycuda:${S}/src/cuda:g" \
+		-i pycuda/compiler.py || die
+
+	touch siteconf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	rm -f ./siteconf.py || die
+	"${EPYTHON}" "${S}"/configure.py \
+		--boost-inc-dir="${EPREFIX}/usr/include" \
+		--boost-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--boost-python-libname=boost_python-$(echo ${EPYTHON} | sed 's/python//')-mt \
+		--boost-thread-libname=boost_thread-mt \
+		--cuda-root="${EPREFIX}/opt/cuda" \
+		--cudadrv-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--cudart-lib-dir="${EPREFIX}/opt/cuda/$(get_libdir)" \
+		--cuda-inc-dir="${EPREFIX}/opt/cuda/include" \
+		--no-use-shipped-boost \
+		$(usex opengl --cuda-enable-gl "") || die
+}
+
+src_test() {
+	# we need write access to this to run the tests
+	addwrite /dev/nvidia0
+	addwrite /dev/nvidiactl
+	python_test() {
+			py.test --debug -v -v -v || die "Tests fail with ${EPYTHON}"
+	}
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/pycuda/pycuda-2017.1.ebuild b/dev-python/pycuda/pycuda-2017.1.ebuild
new file mode 100644
index 000000000000..8e1816be7cb8
--- /dev/null
+++ b/dev-python/pycuda/pycuda-2017.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cuda distutils-r1
+
+DESCRIPTION="Python wrapper for NVIDIA CUDA"
+HOMEPAGE="http://mathema.tician.de/software/pycuda"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples opengl test"
+
+RDEPEND="
+	dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2013[${PYTHON_USEDEP}]
+	dev-util/nvidia-cuda-toolkit
+	x11-drivers/nvidia-drivers
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# We need write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
+# user is (usually) not in the video group
+RESTRICT="userpriv"
+
+python_prepare_all() {
+	cuda_sanitize
+	sed -e "s:'--preprocess':\'--preprocess\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
+		-e "s:\"--cubin\":\'--cubin\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
+		-e "s:/usr/include/pycuda:${S}/src/cuda:g" \
+		-i pycuda/compiler.py || die
+
+	touch siteconf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	rm -f ./siteconf.py || die
+	"${EPYTHON}" "${S}"/configure.py \
+		--boost-inc-dir="${EPREFIX}/usr/include" \
+		--boost-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--boost-python-libname=boost_python-$(echo ${EPYTHON} | sed 's/python//')-mt \
+		--boost-thread-libname=boost_thread-mt \
+		--cuda-root="${EPREFIX}/opt/cuda" \
+		--cudadrv-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--cudart-lib-dir="${EPREFIX}/opt/cuda/$(get_libdir)" \
+		--cuda-inc-dir="${EPREFIX}/opt/cuda/include" \
+		--no-use-shipped-boost \
+		$(usex opengl --cuda-enable-gl "") || die
+}
+
+src_test() {
+	# we need write access to this to run the tests
+	addwrite /dev/nvidia0
+	addwrite /dev/nvidiactl
+	python_test() {
+		py.test --debug -v -v -v || die "Tests fail with ${EPYTHON}"
+	}
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+
+	fi
+}
diff --git a/dev-python/pycuda/pycuda-9999.ebuild b/dev-python/pycuda/pycuda-9999.ebuild
new file mode 100644
index 000000000000..4a27060149fd
--- /dev/null
+++ b/dev-python/pycuda/pycuda-9999.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit cuda distutils-r1 git-r3 multilib
+
+DESCRIPTION="Python wrapper for NVIDIA CUDA"
+HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.python.org/pypi/pycuda"
+SRC_URI=""
+EGIT_REPO_URI="http://git.tiker.net/trees/pycuda.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="examples opengl test"
+
+RDEPEND="
+	dev-libs/boost[python,${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2013[${PYTHON_USEDEP}]
+	dev-util/nvidia-cuda-toolkit
+	x11-drivers/nvidia-drivers
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# We need write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
+# user is (usually) not in the video group
+RESTRICT="userpriv"
+
+python_prepare_all() {
+	cuda_sanitize
+	sed \
+		-e "s:'--preprocess':\'--preprocess\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
+		-e "s:\"--cubin\":\'--cubin\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
+		-e "s:/usr/include/pycuda:${S}/src/cuda:g" \
+		-i pycuda/compiler.py || die
+
+	touch siteconf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local myopts=()
+	use opengl && myopts+=( --cuda-enable-gl )
+
+	mkdir "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
+	"${EPYTHON}" "${S}"/configure.py \
+		--boost-inc-dir="${EPREFIX}/usr/include" \
+		--boost-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--boost-python-libname=boost_python-$(echo ${EPYTHON} | sed 's/python//')-mt \
+		--boost-thread-libname=boost_thread-mt \
+		--cuda-root="${EPREFIX}/opt/cuda" \
+		--cudadrv-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--cudart-lib-dir="${EPREFIX}/opt/cuda/$(get_libdir)" \
+		--cuda-inc-dir="${EPREFIX}/opt/cuda/include" \
+		--no-use-shipped-boost \
+		"${myopts[@]}"
+}
+
+src_test() {
+	# we need write access to this to run the tests
+	addwrite /dev/nvidia0
+	addwrite /dev/nvidiactl
+	python_test() {
+			py.test --debug -v -v -v || die "Tests fail with ${EPYTHON}"
+	}
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/pycups/Manifest b/dev-python/pycups/Manifest
new file mode 100644
index 000000000000..a4f583743c52
--- /dev/null
+++ b/dev-python/pycups/Manifest
@@ -0,0 +1,8 @@
+DIST pycups-1.9.72.tar.bz2 52687 SHA256 7f635cb95149e2fab6693ee0261a4491f3f9521549652a9fdcc9654978037ca7 SHA512 db8b06378bf398073e34c89d62aa64cc8e56e93553346484c2e5dd67d046a3aa2f44020b68a7d479203fb2eeba005f8860ad4cebf72f8d7aa9aa15952a36d816 WHIRLPOOL 03b2f6d12e366961745234e9105337d18e543c31b5f80eb77641dbf01e9d1ca60e988a4ad793dccbee39daca725afe32ff9c1a265eec0773a5275add8a47b104
+DIST pycups-1.9.73.tar.bz2 52732 SHA256 c381be011889ca6f728598578c89c8ac9f7ab1e95b614474df9f2fa831ae5335 SHA512 ee893d64f1645b71805ac358c4a3cc594f6285f04272ff0558aa60cbc90fafdbac30b623ffcc3a6b739218d9fd7a6a6e1d8cb186a5582f2cc30a518ed4dde810 WHIRLPOOL e19ccc7ab6a2e8f9364b5428eeddf365e9e6d34c2b94ae767543f5f3f81de3f6ac539ea6ba58c13cf34f639e7ba9a0ba04c53c7e030647c63085090ae185b3ca
+EBUILD pycups-1.9.72.ebuild 1264 SHA256 ddb1efb0d7b275efa6bbc135b41973568c61599fc36dee861d04b323e8cbf88c SHA512 d3e58b4896c44361a5bc5b9138c68e8ffc7aacf70b98f75e2c4b8423daafe433cfe4a3ba48c68691cffbcffc1497cabcc5243d02a2041dfb4c48c7365956e9a0 WHIRLPOOL b32d3cdae6caf29074d8234e6d5b0185dfcb5617a79af065b377afdd511ecc0074b9c61deaced884b97e735b00534392536a121b90abfa0aee20aa0b916973aa
+EBUILD pycups-1.9.73-r1.ebuild 1427 SHA256 89a68661cd5fe84a0256549e4e85c21f14bd0b80d60661d577a79046faa7ad2f SHA512 4d3fd1fc31dbd7572f6b00d764d39bb6357a007f05436dcf4e9829bee3179e5e0779a6bf72d6da9e820ae0f32fab3e1e83fd24115bbfbd44638c138a4674f47e WHIRLPOOL 6bb5360a5782ab41ba7c7dd00be0e95223a0942972b6dc35a967799a7f8cec85cd2dc5b52926bcf31cd07707363e3d00299714503b84d4573c4881bc2eb8474e
+EBUILD pycups-1.9.73.ebuild 1336 SHA256 9e7a4964672929eb49677ddfaebea6d01c22e679eb44f78407f7c38db216212c SHA512 7a32df04d155db38401f6dcd8ba6041f8c33c85b7a81da58620def7f18e6b36053bdc79f3400192eac82766cc4aedfb5ed957a8a4ca17b6da97b9c84743cc86a WHIRLPOOL c5943f523351f9ec3bd742d958a841aeb60bc6ede17c9b6306da61290ebc2ee1f6fc12cc0dbcfc78f915dd95222b713517cf461c946e542d7b20cd227deb49ed
+MISC ChangeLog 4256 SHA256 cd0afda12ff59440db2ebf8b2e24b0f0f3563cf24f62e4df5c86d6178a2f149c SHA512 bcde1763138fd17fb9d8591f0a39bdfb617f5d4d480358585c7ea91480cceae2da838444250311bcbe1b382e5861c9f36989912159da65d3b1cae72bc9a9ac8c WHIRLPOOL 6166c216bebff8c0092b314e2e01b65890c1c6ff6c946bd89c0b9dced7b1ae7debe9fb267110cb3384c272f935721fe56b69919239645e5809de0a25faa527a9
+MISC ChangeLog-2015 13191 SHA256 567b0837eb10027c03accca79a60b919cbe714258c290a5343f0248dcd90832b SHA512 fb2d85f91dc94ef6278153b3060d4c97deef21235defadd5c88d6f7deed80e5fc9fc9f412179c588f980432b7f430e36c9ebbb924dd10012ee01e3a665a35c33 WHIRLPOOL fa51dc640e1dba007801a9ad2c4eced02c74c0463dd6498c83c6d0df748837cf0d6b993d16a8c6665a63688bd060df5dc5f4264b8de77182e733b3152465b439
+MISC metadata.xml 456 SHA256 703fc381cdcc1a69a01af3b281cce965f63354ecaf8b789442f684568d3c753f SHA512 c8318d150b07e8a369037201bcb9a99a7bc8c406a2a2889f4a1af62166313d4db740e8546f78f0de1e80cddf774f8818e49a4d3e99e906456ffc2f46a562e7ea WHIRLPOOL 338f799bbde7d6be92d54908b4b8131928ac9dfa88d876f26cc795a8dd5232fe9314d4918e6a648214a3cd5ead26c93e97b4502aeeb34e2d75d3ad216ac878f0
diff --git a/dev-python/pycups/metadata.xml b/dev-python/pycups/metadata.xml
new file mode 100644
index 000000000000..5080ddafb1fd
--- /dev/null
+++ b/dev-python/pycups/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>reavertm@gentoo.org</email>
+    <name>Maciej Mrozowski</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pycups</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pycups/pycups-1.9.72.ebuild b/dev-python/pycups/pycups-1.9.72.ebuild
new file mode 100644
index 000000000000..041967b4d1b4
--- /dev/null
+++ b/dev-python/pycups/pycups-1.9.72.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the CUPS API"
+HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
+SLOT="0"
+IUSE="doc examples"
+
+RDEPEND="
+	net-print/cups
+"
+DEPEND="${RDEPEND}"
+
+# epydoc kinda sucks and supports python2 only (it's dead too),
+# and since we're dealing with a binary module we need exact version
+# match. therefore, docbuilding *requires* any python2 being enabled.
+
+DEPEND="${RDEPEND}
+	doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )
+"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+python_compile_all() {
+	if use doc; then
+		# we can't use Makefile since it relies on hardcoded paths
+		epydoc -o html --html cups || die "doc build failed"
+	fi
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( html/ )
+	use examples && local EXAMPLES=( examples/ )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycups/pycups-1.9.73-r1.ebuild b/dev-python/pycups/pycups-1.9.73-r1.ebuild
new file mode 100644
index 000000000000..6822b5b92eee
--- /dev/null
+++ b/dev-python/pycups/pycups-1.9.73-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the CUPS API"
+HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh ~sparc x86"
+SLOT="0"
+IUSE="doc examples"
+
+RDEPEND="
+	net-print/cups
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
+
+# epydoc kinda sucks and supports python2 only (it's dead too),
+# and since we're dealing with a binary module we need exact version
+# match. therefore, docbuilding *requires* any python2 being enabled.
+
+DEPEND="${RDEPEND}
+	doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )
+"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	if use doc; then
+		# we can't use Makefile since it relies on hardcoded paths
+		epydoc -o html --html cups || die "doc build failed"
+		HTML_DOCS=( html/. )
+	fi
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycups/pycups-1.9.73.ebuild b/dev-python/pycups/pycups-1.9.73.ebuild
new file mode 100644
index 000000000000..e3c05c2c09e1
--- /dev/null
+++ b/dev-python/pycups/pycups-1.9.73.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the CUPS API"
+HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
+SLOT="0"
+IUSE="doc examples"
+
+RDEPEND="
+	net-print/cups
+"
+DEPEND="${RDEPEND}"
+
+# epydoc kinda sucks and supports python2 only (it's dead too),
+# and since we're dealing with a binary module we need exact version
+# match. therefore, docbuilding *requires* any python2 being enabled.
+
+DEPEND="${RDEPEND}
+	doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )
+"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_compile_all() {
+	if use doc; then
+		# we can't use Makefile since it relies on hardcoded paths
+		epydoc -o html --html cups || die "doc build failed"
+	fi
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( html/ )
+	use examples && local EXAMPLES=( examples/ )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
new file mode 100644
index 000000000000..42c7df324155
--- /dev/null
+++ b/dev-python/pycurl/Manifest
@@ -0,0 +1,5 @@
+DIST pycurl-7.43.0.tar.gz 182522 SHA256 aa975c19b79b6aa6c0518c0cc2ae33528900478f0b500531dbcdbf05beec584c SHA512 7442462c74c19964b9d72976e9b92bf68bb37debc1401bc399590bea42704065da13d6de710e795eeae79a4651b9a08841d50454243cb0994c7eb1c1bab233a5 WHIRLPOOL 640ef7669273bccdf72f0d98bd5f5c9d882f35ac507d2152f8ab1e2e680298ebe2691b4960713bb39b0a405ba8d0e9a03d69617c5150bb65581efaab99304185
+EBUILD pycurl-7.43.0.ebuild 2530 SHA256 cecdf764667194e7049ff9d7b6fa29735fafe5ca4a48a273b141c643b3dafc88 SHA512 ddaeea8d25f1ae448e99c0774b04a188031f5a05a7367269998fb6b9d0723f6aeebb3e910fc3df8a4d0451de95d1ace69d0543fb6f3d1f51cf8d1cfd326ef3b6 WHIRLPOOL 2c1c8149b2c84339e67cacfe9592595e61ed037dcfe5b063d81b0f6aa636e47718c1ef035d9bfc2871ac66a75b05e570c02e751445e3204f1e0f938e5e6dd4e9
+MISC ChangeLog 6180 SHA256 2d940d3fd52cec26cc04883a7db1bda12ccbf1cb2aba14f9354bec6d067e5251 SHA512 212e6cd7b29b0684ee88e8e740e3c7498fdc879e7cc61e0992d4f6931da6ab80eea888d02a6a6d6656199534b73808c22864236185863ecd9202f320ea8af135 WHIRLPOOL a3e633b9254aaaad3a89d6efce401c3d55b29ab2a8bb73ce3866d13d74e8f9f1791ea1486602f4c0b88792fde6b2b24d2a230613a01e82ae774cc4f8e98c9311
+MISC ChangeLog-2015 16059 SHA256 f0178ac97446c63a65ed8ea8bd91ba6dd5c0cce025266daa6f656f1991dbfeb3 SHA512 4bfde762cb3dd9dcef43a7bbf6190f5d64f79efbafa7e50e7e0a25ab485c29a53714eaeccd98f95eb4e2557b5705fd6cabb7b4e505419ff5aa18e5c1e6e72073 WHIRLPOOL ac212560e6a7cc9d5ddafdd122b7bbb3b3554e2d853eefe642edc2f30e601de55823552f2646a4abf6440e3a9c5bb709652911f8b980c997bf4d80dcf16d37e0
+MISC metadata.xml 1099 SHA256 c94e2805d24dea4d951d2e3b2897d7c5ec3838851a6f5a3b83f93095350e4237 SHA512 8f8b3a10d2f72aa67d1b5f7462ea62803d9150cab3d96792adbd65b379a45c074d68809b25d4a2b558bf28dae72e095c598bd0485fce4c5dafba0784de517a6c WHIRLPOOL d78e56c47e5aa648fc566c88b3bbb0c7c22cee467cfe27e5d322320995e0abbc2c92bc25c86c7fcb737564ddbacbcea3612ddc5e77fb0b0d78f2bdf808472e17
diff --git a/dev-python/pycurl/metadata.xml b/dev-python/pycurl/metadata.xml
new file mode 100644
index 000000000000..7ba6d7c3aadd
--- /dev/null
+++ b/dev-python/pycurl/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+PycURL is a Python interface to libcurl. PycURL can be used to fetch
+objects identified by a URL from a Python program, similar to the urllib
+Python module. All the functionality provided by libcurl can used through
+the pycurl interface.
+  </longdescription>
+  <longdescription lang="ja">
+PycURL�Libcurl��パイソン・インターフェイス��。PycURL�Python言語モジュール�様��Python言語プログラム�らURL�指定�れ�オブジェクトをダウンロード�る�も使���。Libcurl�利用��る機能全��PycURLインターフェイスを通��利用����。
+  </longdescription>
+  <upstream>
+    <remote-id type="github">pycurl/pycurl</remote-id>
+    <remote-id type="sourceforge">pycurl</remote-id>
+    <remote-id type="pypi">pycurl</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pycurl/pycurl-7.43.0.ebuild b/dev-python/pycurl/pycurl-7.43.0.ebuild
new file mode 100644
index 000000000000..ff1de840b0f7
--- /dev/null
+++ b/dev-python/pycurl/pycurl-7.43.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# The selftests fail with pypy, and urlgrabber segfaults for me.
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="python binding for curl/libcurl"
+HOMEPAGE="
+	https://github.com/pycurl/pycurl
+	https://pypi.python.org/pypi/pycurl
+	http://pycurl.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
+
+# Depend on a curl with curl_ssl_* USE flags.
+# libcurl must not be using an ssl backend we do not support.
+# If the libcurl ssl backend changes pycurl should be recompiled.
+# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
+# does not need to initialize gcrypt threading and we do not need to
+# explicitly link to libgcrypt.
+RDEPEND="
+	>=net-misc/curl-7.25.0-r1[ssl=]
+	ssl? (
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
+		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 )
+	)"
+
+# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
+# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose-show-skipped[${PYTHON_USEDEP}]
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),kerberos]
+		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
+	)"
+# Needed for individual runs of testsuite by python impls.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
+	sed -e '/pyflakes/d' -i Makefile || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# Override faulty detection in setup.py, bug 510974.
+	export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	emake -j1 do-test
+}
+
+python_install_all() {
+	local HTML_DOCS=( doc/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycxx/Manifest b/dev-python/pycxx/Manifest
new file mode 100644
index 000000000000..f18535b6e9dd
--- /dev/null
+++ b/dev-python/pycxx/Manifest
@@ -0,0 +1,6 @@
+AUX pycxx-6.2.3-installation.patch 1248 SHA256 f6c47b1d613b01511e55cefbc0e0564c402374fc0a4340848f712011b416f7de SHA512 34eaf885611dddb4b7a650d9b2d162fbe559b5f0fcf19f514e1d9cf65e15944c43a9e0c988da815c00a92652495ef9a94a98634d11d9291d28b1f41289fb9d81 WHIRLPOOL bf2eb66f995a28f27cc55b52093610511802ff126e563c21660da64c5ac5a3af32abd6c90e2f9408d661396d5b740aacef247b388fa15110e8dd7138b24e63ee
+DIST pycxx-6.2.6.tar.gz 141547 SHA256 3e960db53dea640473410ea20063afe7fcfcb61c107334d7ff6af96d384c11fe SHA512 9a6c30acb99c112497c02fb0826dc0197bbf4b813d25eab3f7d6537dfd83db8150c94f617f79810bbcca64496b8d6e67b1a41446523d66031c54c21e0425ea0c WHIRLPOOL 570cc1ccd12748481c74aefe863a2cef2d2d048ddbeceeeea01477a6d1765f38582f3c9112c8d5fddf6f534b91c74aea11b38aab8da04ced18280047a0821090
+EBUILD pycxx-6.2.6.ebuild 984 SHA256 efa5008a29968bee0305170b3b41d8983ce1e752e03189e3b60d417d3e78f2ae SHA512 b250150f61d4fa1f20238e3232f277bcc7aecbe5da5a1b00413b1df6bfa1e469feb9a5602b7f5bf0a71a8f30767850f849f124d76ce98fce7a476db43a16706f WHIRLPOOL 97b85a4c1a2cbec9e0ce8213bd997c64e3d6a14beb3bbb23a7f4ef964931c7e42e5c1ced85e01bcf90bbbefc54d890aa2c65fa1fa21261616bcc5bc09eae5189
+MISC ChangeLog 3483 SHA256 a92bb29b3243c4751f707e5af4d920396881e5703cc3afccf133aea080147394 SHA512 48c4cd71ed0c93705a3c37bcf64af966f6184dd9e47db11b96d18b8c19cc1b1b3e05daa3091cb1c26ce990bb50033aafaa67ab413bc7de31519f8feebd509ba5 WHIRLPOOL e97044a4b7081c5b79652b25ce938058746eeed675bf386c881f92d5de85d5dec08c59e5d9c6851d93c5e708460cfa9afa2fe70938e224f53527739f09039ea2
+MISC ChangeLog-2015 7411 SHA256 6c6260fc7f0bb5fe60db268c523ca27ecf9422157722e4ffc380e2f00b94b9c6 SHA512 0f91d05cb4f84ec8137fb877df75fd75c69ee358343664bf857eafb674abc4bb65a2f5f8fab456f3ef5edb1b796e6aafae11e53d928eced715c23dc66bd40d2e WHIRLPOOL e564e129853876c8ebc9dd2e64ce6b40b1398c1470d9725973a7c008b0391fca6f6b39fca00ac724ee7fd8b6745448746bb29fdf72fc2d7996d835c39122f6b2
+MISC metadata.xml 707 SHA256 1cf36f7d2b8015212efbf31a95b78fa2ef576fec058ad79f6449338a601b3462 SHA512 65b41d39019c453f2e2811592007063676b3652b301f3e629496a08b6dfefe6560c0d1f9644c5dbf7a286c69792d7527e29d75cedfd658a43192457be2f21544 WHIRLPOOL 0b0cd6caa5353124d040a91c2ee51a8c0cb987d283902b437e1a07f2c05f96a5bf4825d8120e9adc845ce6af874f91385f3123179655ebf967ea3cec4e6db147
diff --git a/dev-python/pycxx/files/pycxx-6.2.3-installation.patch b/dev-python/pycxx/files/pycxx-6.2.3-installation.patch
new file mode 100644
index 000000000000..5f6bfa74f4be
--- /dev/null
+++ b/dev-python/pycxx/files/pycxx-6.2.3-installation.patch
@@ -0,0 +1,25 @@
+--- setup.py
++++ setup.py
+@@ -3,10 +3,18 @@
+ from distutils.command.install import install
+ from distutils.core import setup
+ 
+-headers = (glob( os.path.join( "CXX","*.hxx" ) )
+-          +glob( os.path.join( "CXX","*.h" ) ))
+-sources = (glob( os.path.join( "Src", "*.cxx" ) )
+-          +glob( os.path.join( "Src", "*.c" ) ))
++headers = (glob( os.path.join( "CXX", "Python%s" % sys.version_info[0], "*.hxx" ) )
++          +glob( os.path.join( "CXX", "Python%s" % sys.version_info[0], "*.h" ) ))
++headers += [header for header in
++            glob( os.path.join( "CXX", "*.hxx" ) ) +
++            glob( os.path.join( "CXX", "*.h" ) )
++            if os.path.sep.join((os.path.split(header)[0], "Python%s" % sys.version_info[0], os.path.split(header)[1])) not in headers]
++sources = (glob( os.path.join( "Src", "Python%s" % sys.version_info[0], "*.cxx" ) )
++          +glob( os.path.join( "Src", "Python%s" % sys.version_info[0], "*.c" ) ))
++sources += [source for source in
++            glob( os.path.join( "Src", "*.cxx" ) ) +
++            glob( os.path.join( "Src", "*.c" ) )
++            if os.path.sep.join((os.path.split(source)[0], "Python%s" % sys.version_info[0], os.path.split(source)[1])) not in sources]
+ 
+ 
+ class my_install (install):
diff --git a/dev-python/pycxx/metadata.xml b/dev-python/pycxx/metadata.xml
new file mode 100644
index 000000000000..0281b4a393da
--- /dev/null
+++ b/dev-python/pycxx/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+    PyCXX is a set of C++ facilities to make it easier to write Python
+    extensions.  The chief way in which PyCXX makes it easier to write
+    Python extensions is that it increases the probability that
+    your program will not make a reference-counting error and will not
+    have to continually check error returns from the Python C API.
+  </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">cxx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pycxx/pycxx-6.2.6.ebuild b/dev-python/pycxx/pycxx-6.2.6.ebuild
new file mode 100644
index 000000000000..a0dad6d120af
--- /dev/null
+++ b/dev-python/pycxx/pycxx-6.2.6.ebuild
@@ -0,0 +1,36 @@
+# 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 eutils distutils-r1
+
+DESCRIPTION="Set of facilities to extend Python with C++"
+HOMEPAGE="http://cxx.sourceforge.net"
+SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="doc examples"
+
+python_prepare_all() {
+	# Without this, pysvn fails.
+	# CXX/Python2/Config.hxx: No such file or directory
+	sed -e "/^#include/s:/Python[23]/:/:" -i CXX/*/*.hxx || die "sed failed"
+
+	# Remove python2 print statement
+	echo > Lib/__init__.py || die
+
+	local PATCHES=(
+		"${FILESDIR}/${PN}-6.2.3-installation.patch"
+	)
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( Doc/. )
+	use examples && local EXAMPLES=( Demo/Python{2,3}/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pydb/Manifest b/dev-python/pydb/Manifest
new file mode 100644
index 000000000000..4013b00cd358
--- /dev/null
+++ b/dev-python/pydb/Manifest
@@ -0,0 +1,5 @@
+DIST pydb-1.26.tar.bz2 572184 SHA256 01131848a58fce6a529766488884848c06068aa9ec4f39e19f8fb4d260f893f2 SHA512 39365ddcd863404079e4a7159bbbedbfa6a99b3d46e95c07fe14be61a2805b9237df5e51a8a68db159fca2df4b0bd46bddaebbe610d1597064f2df4e64393355 WHIRLPOOL 26a887e19dc157c612d4c4fa07fa1d4e0be0e051e23f680ed1b3368c4b12ad353d631893b81bfa8bbd48358d5ff4383de18876deffa467af2762d49f39cb833e
+EBUILD pydb-1.26-r2.ebuild 889 SHA256 bbc8a8e6f3fb411fb14515be106638050432783778b131c3fe61da584f0ee0a1 SHA512 b243b995d39d025694bde3fa4d8ff64dd9f3b4d4d685c14da8ba6fb28e94aa5fe59fce9b104ff352cd94fe8d37c1e067e20f5896749fec00755a77f63d4ce245 WHIRLPOOL 603bbebac407750d8c699dcacdec7abbea188e2736d7e756f2b5df10a9ffb1c76884b8cb730b1b3bd5233d66ef692efaba2c2f5af6c08f45d9a92036e2381808
+MISC ChangeLog 2670 SHA256 afcf0a6428018a83e11c174058fc6385827f3b9aa949f557fba47d185c52f73c SHA512 67f414c0c851d62b3bc9463af3b7d5bdc309667fa514ae2bc5949426a7306910aa8d56f9bb3e4839045215563b7ee1c2edca772fd84f98ce610fedf8b4e824cb WHIRLPOOL 1d3955e97d400875ae2e8de485edb4897948ad3d33964d775f6c4cc844d9b3f77861ce04cfe59bfcc6d22601f963eaa0fd192e8c812e508508110bc7182386e0
+MISC ChangeLog-2015 1320 SHA256 d91f489320e0c0fc0388569476b497b2a5639133340434ae600bb4dc40887d74 SHA512 78978228b6178b2c78456dfe085ca76c4c803dc949571d1b57f3ad6ad4ef202dd47488224949f9e59de4afa22a11b04d9e4eb18a524f9191b582ba8134385f80 WHIRLPOOL de09337ce4c8619bda7589877544a82f7e480ad092cf4102d6fe750655241dc7ea3459228328590807953a8d8bacc0cdda0fc25e0129fc035d81a6b01b4d2ab6
+MISC metadata.xml 484 SHA256 24961a80b1da1b7fc5c07b09b339bcb644a9b3318055c229b6f677279cf77c49 SHA512 3e2b1a2f9916db2d70bc1b716e1bdc83f2b640c9c284ce49e7ebd34adf608735fb9233848b5d96393e742fac8435a66d6619727a86065bcc029c3fe297ff10a1 WHIRLPOOL f5f0fa3975dd8149ee5e310c9c47e2859a1137337e9ad1c5c5c93107323bb0980676982a9ba24844d73ea0b95002bbf31d7d994c840a395941e8ec5a3747d1c9
diff --git a/dev-python/pydb/metadata.xml b/dev-python/pydb/metadata.xml
new file mode 100644
index 000000000000..c89c9c6aae80
--- /dev/null
+++ b/dev-python/pydb/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grozin@gentoo.org</email>
+		<name>Andrey Grozin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>Extended python debugger</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">bashdb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pydb/pydb-1.26-r2.ebuild b/dev-python/pydb/pydb-1.26-r2.ebuild
new file mode 100644
index 000000000000..78e12b70f397
--- /dev/null
+++ b/dev-python/pydb/pydb-1.26-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit elisp-common python-single-r1
+
+DESCRIPTION="Extended python debugger"
+HOMEPAGE="http://bashdb.sourceforge.net/pydb/"
+SRC_URI="mirror://sourceforge/bashdb/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Fix pydb symlinks.
+	sed -e '/$(LN_S) "$(DESTDIR)$(pkgpythondir)\/$(python_debugger_script)" "$(DESTDIR)$(bindir)\/$(bin_SCRIPTS)"/s/$(DESTDIR)$(pkgpythondir)/$(pkgpythondir)/' -i Makefile.in
+}
+
+src_configure() {
+	econf --with-lispdir="${SITELISP}/${PN}" \
+		EMACS="$(usex emacs "${EMACS}" no)" \
+		--with-python="${PYTHON}"
+#			--with-site-packages=$(python_get_sitedir) \
+}
diff --git a/dev-python/pydecomp/Manifest b/dev-python/pydecomp/Manifest
new file mode 100644
index 000000000000..317fb0e91e6f
--- /dev/null
+++ b/dev-python/pydecomp/Manifest
@@ -0,0 +1,5 @@
+DIST pydecomp-0.1.tar.gz 8793 SHA256 4abff74b3d8814bb48be523d3d3ae91eb28e9d8e7fc887d909dcab09f857d6d6 SHA512 027925589da745bc34f87bf7845dd34f1feb61221bc48b3490e56145f3aef5856dbbce16ea36cc0a65e913b7fa8c042a914fbf9e1e3d82e26f98f8a6fbc6da5c WHIRLPOOL 7f5469291f9c19557adafe14d1dac894d5066391d759c2053f0c600b1bf2fae7543575586fda197af77be2c282a370814331ca07d376ca6d6b7495fdec234321
+EBUILD pydecomp-0.1.ebuild 1244 SHA256 ab6bf8b8fc128d5304e1b2d12fedd33dd7afa5d3e1b3281ffbe9dd8af17a31f8 SHA512 0c0d9f2817f008363e7fc54f00f75edf448c190bbf09b56f1547ff8da85ff26408d00245917e95460921fae248ca376470915f2496fbca36ba8e1dac444bfbba WHIRLPOOL 2b44684e79e6b3f45ea5b82062e58dc4ca0ebe183da47c2dd198dca9dad1801c396b05528f9ef0ad4a50c66f0741d1b004ab795e4e12ef4729bb111b7bcc51d4
+EBUILD pydecomp-9999.ebuild 1244 SHA256 d2a5f7d5c79cb827064d1354f7b70c7d031d6212db6bb6be431d3a186d656237 SHA512 4ed7f64bb6c18f9172f466f2f59be654b1a05c144526036456a8dcfb88f947da72311a280349a23853283bb8eb4461bfcea2946be9b8e5f7bb616dce5cd22348 WHIRLPOOL e12bd5ec819bafa7ee7b14223c84e0069c138668f07e8e05768979cb6b00c3a9ec56322c055e23bb1d720cdbd64b1f2cf02facb4a89dd44cfecc2d317a784e3e
+MISC ChangeLog 1760 SHA256 f6eeafbee291015da3533196948c2dfaee613a2e99eae6e2e8e48f08c38ea8d6 SHA512 0a21d67f226d1f3eb3c3e64153c7103df4fcf3292d2f815d057828bed0d6fbe40b00cc1ed481c42aed4b85d5a10b418e21a7017829640339d6db35d8a5c23c09 WHIRLPOOL c41d87deb4895618782c7c9a9c5a045eaf7af4b01ec11faf757ae577d9fe52a53e678e0b619bc727c714fe9c6fcdf69243996a869dc134e3e01abd2eea295a43
+MISC metadata.xml 796 SHA256 810a19977441db48055aca71509e0c4da9f456941bf91d43fa89cd57abe53947 SHA512 ec96d316559404d556dee6f64807d44a4b201028000d4ba527743b2f6f18fbd3354e4dd5cf811512edf9bfc7cd1ea176bdb7c6ce1e04efc154b0f8f564c675c7 WHIRLPOOL 63444db52cfe25bdf7d30a00c1d33de43cf44511af569ca39e118618fea10455166dc7ce378ea9381a34d76717c8840e7c5b75073e996c495c7700482e6e051b
diff --git a/dev-python/pydecomp/metadata.xml b/dev-python/pydecomp/metadata.xml
new file mode 100644
index 000000000000..89e66023cb0f
--- /dev/null
+++ b/dev-python/pydecomp/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>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tools-portage@gentoo.org</email>
+		<name>Gentoo Portage tools team</name>
+	</maintainer>
+	<longdescription>A python interface library for common compression ,
+		decompression and contents generation.  It aims to create a simple,
+		easily extended and configurable common interface to various compressison
+		routines.  It can easily be extended with custom compression,
+		decompression, and contents definitions.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">dol-sen/pyDeComp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pydecomp/pydecomp-0.1.ebuild b/dev-python/pydecomp/pydecomp-0.1.ebuild
new file mode 100644
index 000000000000..c53046276087
--- /dev/null
+++ b/dev-python/pydecomp/pydecomp-0.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 python-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="https://github.com/dol-sen/pyDeComp.git"
+	inherit git-2
+else
+	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	S="${WORKDIR}/pyDeComp-${PV}"
+fi
+
+DESCRIPTION="A python library of common (de)compression and contents handling"
+HOMEPAGE="https://github.com/dol-sen/pyDeComp"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	einfo
+	einfo "This is new software."
+	einfo "The API's it installs should be considered unstable"
+	einfo "and are subject to change."
+	einfo
+	einfo "Please file any enhancement requests, or bugs"
+	einfo "at https://github.com/dol-sen/pyDeComp/issues"
+	einfo "I am also on IRC @ #gentoo-releng of the freenode network"
+	einfo
+	ewarn "There may be some python 3 compatibility issues still."
+	ewarn "Please help debug/fix/report them in github or bugzilla."
+}
diff --git a/dev-python/pydecomp/pydecomp-9999.ebuild b/dev-python/pydecomp/pydecomp-9999.ebuild
new file mode 100644
index 000000000000..0f094d46e1c6
--- /dev/null
+++ b/dev-python/pydecomp/pydecomp-9999.ebuild
@@ -0,0 +1,43 @@
+# 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 python-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="https://github.com/dol-sen/pyDeComp.git"
+	inherit git-2
+else
+	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	S="${WORKDIR}/pyDeComp-${PV}"
+fi
+
+DESCRIPTION="A python library of common (de)compression and contents handling"
+HOMEPAGE="https://github.com/dol-sen/pyDeComp"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	einfo
+	einfo "This is new software."
+	einfo "The API's it installs should be considered unstable"
+	einfo "and are subject to change."
+	einfo
+	einfo "Please file any enhancement requests, or bugs"
+	einfo "at https://github.com/dol-sen/pyDeComp/issues"
+	einfo "I am also on IRC @ #gentoo-releng of the freenode network"
+	einfo
+	ewarn "There may be some python 3 compatibility issues still."
+	ewarn "Please help debug/fix/report them in github or bugzilla."
+}
diff --git a/dev-python/pydiff/Manifest b/dev-python/pydiff/Manifest
new file mode 100644
index 000000000000..9fdfa1b28130
--- /dev/null
+++ b/dev-python/pydiff/Manifest
@@ -0,0 +1,5 @@
+DIST pydiff-0.2.tar.gz 4108 SHA256 847c7121625de8d5aa9eb2b079edad18a451e134cafa1b8958ea019ee0409aaa SHA512 0f55edf17138c4a1894a1ca03db21e6d6d21fb3961a2738c00d59e05d32a006413aee04005962f1ba6628c012bb018d43fcbbef50665ea10d3397539e5d3def1 WHIRLPOOL d90e257d7449bc5eb5495a45138d74c32ee935cd833718174f4fb0fe9c0edfca13131589732319a3e1610682becaf2a643cf24110a65c533d48cd64663b42c00
+EBUILD pydiff-0.2.ebuild 486 SHA256 0bac2403ec6c0a8a66fbae57f232214ca3c5b893d7847fb41fe28cc751cd6862 SHA512 c12098cdf429e18edb2bec096b8ca12a8942793d3675622758711fee4f708ea005699bd7875c1ab2068df2a2ecd244e75512c33fda059236c685612015eb04ee WHIRLPOOL 889bb9d2a1649057f17865380b2249094ae470d8c1ca915aa8fe0ac62f3238a36c256846998136e0cee295012db2b42af3107b13e1e961bf5500ef63de6a2e74
+MISC ChangeLog 2722 SHA256 8015a2fc2a069ab5a97f01ce5eb915cc8eac87773c7d14ad1e3c58d8fe3bb785 SHA512 3161647d89eead82fd4779493139aa2e9434a40479fb39f42a4fc9bd214a535bc692d8d1b6f83b1d70b9c0ea8a886445bf249228812f28d25164eb49983fbf96 WHIRLPOOL 4aeba59b5b11094bd3c29e7b55d640ea09e8f2760b1fa1f58e1b02cc26226bb1a741eda978282c84b3188c794b456106d5ab17e26af06071863e865134c39c05
+MISC ChangeLog-2015 585 SHA256 d92348f673243f416d1df272485f886d278ea605a01c262097bd80cc20690641 SHA512 062117be69a3144ae73e032c3ec310f5c75d4e5fd483b0b3a88c5b9534857ea0e028a2a655c55abbe2a593dae37e70412f8c259181fd7c59bbfa74e654b96029 WHIRLPOOL 041e82b76ac6c6e3f60c206f1c60d196a7360655c46ae505e7ca2bb696bdae7f47487ed3bd794ad29e06c6fb371d9e8654b44291a7e392806796267a15ceaefe
+MISC metadata.xml 373 SHA256 0f6da31f7346d1310bad51a0d238560b18bf7c4aab252293701f67f122fef0b3 SHA512 cc56455c69ef9816eecb5ca62fa6f660ca124cae7d62d58006133a9d9af79aa4bc45e572ca1d2cf5d9b64c7f7617f62b94b573b65d799327a2088e1f80902402 WHIRLPOOL 09a3efbe6911537c568a656ae4fc30231a99ae2ec326785fc4995f283d224e7b79191576aa7094fe36bbf2e7d823639a1206bcd929864a3fd47617d0d6b7e956
diff --git a/dev-python/pydiff/metadata.xml b/dev-python/pydiff/metadata.xml
new file mode 100644
index 000000000000..9dda17d789eb
--- /dev/null
+++ b/dev-python/pydiff/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pydiff</remote-id>
+    <remote-id type="github">myint/pydiff</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pydiff/pydiff-0.2.ebuild b/dev-python/pydiff/pydiff-0.2.ebuild
new file mode 100644
index 000000000000..0d04f7e30671
--- /dev/null
+++ b/dev-python/pydiff/pydiff-0.2.ebuild
@@ -0,0 +1,20 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Diffs two Python files at the bytecode level"
+HOMEPAGE="https://github.com/myint/pydiff"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+python_test() {
+	"${PYTHON}" test_pydiff.py || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pydispatcher/Manifest b/dev-python/pydispatcher/Manifest
new file mode 100644
index 000000000000..98ffd79e359a
--- /dev/null
+++ b/dev-python/pydispatcher/Manifest
@@ -0,0 +1,5 @@
+DIST pydispatcher-2.0.5.tar.gz 34437 SHA256 5570069e1b1769af1fe481de6dd1d3a388492acddd2cdad7a3bde145615d5caf SHA512 b361463f006a775e1f22cfe07520951649f76c26be35a80ca016620c8ef466129c4abeafe42f0ffdc605e7523287b1e804967f19d951089d24e052fe10d88e6f WHIRLPOOL 482c19525d61c73c4b290491a277ec8ecfd4a8ad247a87a3dab7bf95d9a2923d7b21b9dd06db05cf1b5c0d9efedb13552895a97f9726dc7c666b848b1d7e560f
+EBUILD pydispatcher-2.0.5.ebuild 976 SHA256 f06e10211943094c02574cdeca7b29bde09fb5401dfc97251f5f6e2da848ec9f SHA512 7d0f5932854fa3667df30b95fcc8f349032535411e941cd8785e6f7209826ca582c797e85bbe7abf1214bbffe78a3cd9e40e58b541d8fe539f7467eb38166f51 WHIRLPOOL a48d1f78da51e78c935f87992562952bfdb89bb94a7fd37d45c61592b49024a0f0f275b9ff6ec69d34f831b6ef7874fd5f90bbe8265816760698dcb13833da0b
+MISC ChangeLog 3505 SHA256 fe0bb987fcbedf6c40f3904ed7249b5e847a69c257f51e9557f8f195708d3558 SHA512 87ce75920c6a72dda2e875f2a19f9d7f2698e326c172a5736965c8c14437adb5b12447124e113feb56e9aaa867d287fc9b17fb3ea20a70557a083984a03180fd WHIRLPOOL 0c62d7de0124f51e1b39578cc5f8431327e4ee104cc963d6bb8af019c67dcb68cc87aaa2c3bc60ac8adcae943ba3924da9e61199d6109828878e3a9ef0685820
+MISC ChangeLog-2015 2242 SHA256 36bb6597cd9e3260c691590d3a7b442c74058880636e9b03bf9ccc1ca73e2e5e SHA512 d870cb7f060e2abf5df2cc79259532d3c96bccded741eb2c7c7ede88d0ee9dbe3af14ff7400b0d4947595b363834488bae97a67bbbb4b7c4751805da0beb3681 WHIRLPOOL 433e7d6bb27118cf7fd2ea649d7f3d886be7f66af39a10831a9b3bea5a8ecac1e88e9d236fd7d958f8970ffa814bfbf6ccc939ecbc6c2e10542329218cdcfeb9
+MISC metadata.xml 384 SHA256 9c2f5d831a6f609e5ff247c1efe8d2c506f0948336ddb2cd7d416c1dd7c693cf SHA512 eca464c1e94c156db9c499201ef60c21599d31a5e8b09574ad71226bccd11687c2c340e76338b1054f5efa8e88c72a9d7be27fa287f1975bd0d12ff41b8d3d9c WHIRLPOOL 3eaa3eb6f2277275865733a3c0ba9a8ea9cd5b4f3fdf38feffb8eb00599205d528d8a45063b8d5802ad4b38a23dade02d46243e82c2b8d1e7e7a06fa27c84a00
diff --git a/dev-python/pydispatcher/metadata.xml b/dev-python/pydispatcher/metadata.xml
new file mode 100644
index 000000000000..dc6d976885ba
--- /dev/null
+++ b/dev-python/pydispatcher/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">PyDispatcher</remote-id>
+    <remote-id type="sourceforge">pydispatcher</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pydispatcher/pydispatcher-2.0.5.ebuild b/dev-python/pydispatcher/pydispatcher-2.0.5.ebuild
new file mode 100644
index 000000000000..d9ab7f9d8270
--- /dev/null
+++ b/dev-python/pydispatcher/pydispatcher-2.0.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN="PyDispatcher"
+
+DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism"
+HOMEPAGE="http://pydispatcher.sourceforge.net/ https://pypi.python.org/pypi/PyDispatcher"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE="doc examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_compile_all() {
+	if use doc; then
+		pushd docs/pydoc/ > /dev/null
+		"${PYTHON}" builddocs.py || die "Generation of documentation failed"
+		popd > /dev/null
+	fi
+}
+
+python_test() {
+	"${PYTHON}" -m unittest discover
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/pydoc/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pydl/Manifest b/dev-python/pydl/Manifest
new file mode 100644
index 000000000000..74e798df64df
--- /dev/null
+++ b/dev-python/pydl/Manifest
@@ -0,0 +1,7 @@
+AUX pydl-ignore_entry_points.patch 552 SHA256 5370f4e9fa0311c29bbcda37f1e605f36a44299b4c3ef1e5225d887c55d33169 SHA512 519d3dfef8c09f4d38cc4c4280c3a48c31201badd8c927d905f052f3245eca17e3c479d98b10d3304f93b78049d02758402252910934113d35290fda6e78790e WHIRLPOOL 2b9b5c06d80fee1ad61f90f9b540f2c0f1e39434b7fff26c61d1a76b2b667a97792b87360454a335d4156f65abc0e0193b969c0f232f308d20d54346503a2bbc
+DIST pydl-0.5.3.tar.gz 687705 SHA256 ad9c84b28c25f86411f836d5a1c9267d9e288dc4cffaa7b10843dbbe8e86b33f SHA512 6a18fabdbcfe84e296289c41453eaf549ab7a56f9fcc11720359cf284ba99075e5ec33539ce32118c6982ba1b3a72b54fa307f7fec21adb5b317bda0a9de84d2 WHIRLPOOL cac67d0e8ff19abe721b3c4865ce1faa813a76996b98481715fa33ea1da04174d4932badf0179cf87ae31e738744a76c36d33ac60cb4e6dcf7c408fc39e6e79d
+DIST pydl-0.5.4.tar.gz 697024 SHA256 9995681ef072b57a49886cfb81740532a8a94d4ad98ac3e81a722a2f7f803cd2 SHA512 9a9d086cf42b8cc4364b0079b2af17b1b25090865cc99badef78380b99cf6e2ff0de514ff17e60536c62f85a0bf613a52530a10ab4eb45984a0c45969d332682 WHIRLPOOL 41ca3144d7e7405987875c91ed0239a41b485af68c9d655d19c53e0a0c14e24f068b0cf6b58af117aeef8a8dacca30955cc2f9bf4dc367c8369cdaa0bd517fb9
+EBUILD pydl-0.5.3.ebuild 1342 SHA256 fca7ac553147030dd740cabb84f356a7aac313cb51f39dede9cc524c642234dc SHA512 49d7201ea3e04dd48e78f5f8a5d736a100cb8c1bfa0f5f4718971f2a86be61bacd70bcebe29c25aa9d4c419b9e6107adf02c3d024cc3f6de2c78b610658293b8 WHIRLPOOL 675945e3e604791455fc6b9e968e5ba61f9ce8db8d7097af08ba14834a391f54b160dfcdf99af0c3614a50666aa28ee2f2836a63ed7d931346df7d5267b5fae5
+EBUILD pydl-0.5.4.ebuild 1346 SHA256 2dbff606bdae53431b0865991b94f378920ee5a439d4374263913de1124c5ed2 SHA512 e3937ca511410394a0b58f4316dd61c8516c63004709bca0aca9547b261b3c724e00354cac7b8cba0efbaeccb21f9418b3c004555d79dbc835972934446ac6f0 WHIRLPOOL ca126d41e1a70c107bc3fb959567804660b0dcb44bed4a97bcb81f11ae52d59a16e427089e4ed6b144c178079a638187c704941af158d9cca42548c2bb40e952
+MISC ChangeLog 499 SHA256 1f2be5cacfea3241184c1d8536e47eb05094abae4659e7b10874efebd8a0d7f8 SHA512 f00f30af70cb4fbed5b014757e4a0bf5cecd0b4b6429ae4cf7de63fe10b2128970844c67f9f6c7472ee80bf47f058351c86081808dacde29f3fcc834e6ea9273 WHIRLPOOL 166afedaec3d5be83f3ee10b0ebcc69715dbffe3bd438cf7cbdb6eecb270c290f05faaac95333764715e988dc9690fc7a5aee84e652d1f3dc021bc4c05885fcf
+MISC metadata.xml 702 SHA256 77c3ae66dda43ca2416edf0e9adc35753f1e01e9087fb38e7eb99380da58b751 SHA512 8cbcc10035c042dc6e50952605e1049a07a39db7ecf4ae47752b95004260ace7650d00d5727bb5a64836817af28428d7336afbcff0dfc4bb75f39b654a2cf4f9 WHIRLPOOL 46cfc0c8ed4cb534b42c22ccb801c4dd8799ef863c02d1990ae89448fcea01f3161761e31e0f3d49b0d8676aa51f9cb0f1c2946a105dcde4c5dc91bcebba90b1
diff --git a/dev-python/pydl/files/pydl-ignore_entry_points.patch b/dev-python/pydl/files/pydl-ignore_entry_points.patch
new file mode 100644
index 000000000000..26b3abac6538
--- /dev/null
+++ b/dev-python/pydl/files/pydl-ignore_entry_points.patch
@@ -0,0 +1,14 @@
+Author: Vincent Prat <vinceprat@free.fr>
+Description: Ignore entry points to avoid creating executables
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -31,6 +31,6 @@
+ github_project = weaverba137/pydl
+ 
+ [entry_points]
+-get_juldate = pydl.goddard.astro:get_juldate_main
+-hogg_iau_name = pydl.pydlutils.misc:hogg_iau_name_main
+-compute_templates = pydl.pydlspec2d.spec1d:template_input_main
++#get_juldate = pydl.goddard.astro:get_juldate_main
++#hogg_iau_name = pydl.pydlutils.misc:hogg_iau_name_main
++#compute_templates = pydl.pydlspec2d.spec1d:template_input_main
diff --git a/dev-python/pydl/metadata.xml b/dev-python/pydl/metadata.xml
new file mode 100644
index 000000000000..9c578b94db55
--- /dev/null
+++ b/dev-python/pydl/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+   PyDL consists of Python replacements for functions that are part of the IDL
+   built-in library or part of astronomical IDL libraries.
+   The emphasis is on reproducing results of the astronomical library
+   functions.
+   Only the bare minimum of IDL built-in functions are implemented to support this.   
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">pydl</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pydl/pydl-0.5.3.ebuild b/dev-python/pydl/pydl-0.5.3.ebuild
new file mode 100644
index 000000000000..2af10b5aa4ed
--- /dev/null
+++ b/dev-python/pydl/pydl-0.5.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Library of IDL astronomy routines converted to Python"
+HOMEPAGE="https://pypi.python.org/pypi/pydl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=( ${FILESDIR}/${PN}-ignore_entry_points.patch )
+
+python_prepare_all() {
+	# use system astropy-helpers instead of bundled one
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	xdg_environment_reset
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_sphinx --no-intersphinx
+	fi
+}
+
+python_test() {
+	virtx esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pydl/pydl-0.5.4.ebuild b/dev-python/pydl/pydl-0.5.4.ebuild
new file mode 100644
index 000000000000..ad306d3b1cbf
--- /dev/null
+++ b/dev-python/pydl/pydl-0.5.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Library of IDL astronomy routines converted to Python"
+HOMEPAGE="https://pypi.python.org/pypi/pydl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=( ${FILESDIR}/${PN}-ignore_entry_points.patch )
+
+python_prepare_all() {
+	# use system astropy-helpers instead of bundled one
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	xdg_environment_reset
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_sphinx --no-intersphinx
+	fi
+}
+
+python_test() {
+	virtx esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pydns/Manifest b/dev-python/pydns/Manifest
new file mode 100644
index 000000000000..aaf477612599
--- /dev/null
+++ b/dev-python/pydns/Manifest
@@ -0,0 +1,9 @@
+DIST py3dns-3.1.0.tar.gz 29501 SHA256 124d7833fd0a6fbaebe17d093b028cfa77b155b5feab8e1c6265959a4b9e7fb7 SHA512 ba2cb397351b587539072b608f6be878066bfb317f4cca472c2d3102638432de48a25d8a6efc41a88b9f77d939fa71ffb396d1a2dfab46e8d2b431d0eb89f7a4 WHIRLPOOL 8fdd8e9c75293c86120770da8e09f093cf6b8783b87e8cd7dccbf1fe8e3dfb3aad89fd371cd1a512b83db626a4a627f21ff1a497211cfaa027d08ebc650ed53b
+DIST py3dns-3.1.1.tar.gz 29981 SHA256 bfea628ea61becb79ef83616069957fd5b49058115e347ca7b77c72053af187c SHA512 5f22ba12db502f997be4c2479697cc21fe15aac218da1d347bd400a3ab73d86ad32b57740292a10eacb73e07eba977f67b881e59be16f902afab47053efd6c6e WHIRLPOOL 7176b34a7820ac64fb15a6ba3833e69484f1ca7b0fd80ecbb4ca6c6e89be829bff637b9e684ce51f470ed033b91a032ca359e3d0b619b3af426da9a23cc119c5
+DIST pydns-2.3.6.tar.gz 28220 SHA256 d3cf6fc4ec088e934cf2dd4d71080efdb5c09ae79cbb2512427eb0fc393f2417 SHA512 261598c085c7d9f7adf5ce881814e444cdcf48a946dc17db467268ab6164f6045c204507cc58eff8e6f826b9786715ad2a9e766a72193ac8666969913180954b WHIRLPOOL 76d5f6caaddbaf027e4e7677d767263c270c5fc0db6e35bfb3bc99a8c229fbb2704dbbb2a2bd5207dc9c3a2f571a8b0351a492a16dc3a3fbe0c7f5cf88a91389
+EBUILD pydns-2.3.6-r1.ebuild 1148 SHA256 4f48790d5d695f163523bf425579de81eb946917956304e36cb2218b6e468573 SHA512 fe04302f1f137a5c4a1eca0df809781ccadef8366a9777d99992dd188878d5adfd4d300cb3e8eeb507820521c48307c56de387cd981a531ab2f03ab10dfc4fb5 WHIRLPOOL fc082e597c54c037c90a9bc8d1445756ac4d0813ebc4aad3508126e9c0d064c04b92b45ac2d643491674110539a54d8fb36352907632c895584c8d636e448268
+EBUILD pydns-3.1.0.ebuild 880 SHA256 aeb4583dd94ec42530f50c043ae0e95956b265de5444c6fdfcae0117cf7fb862 SHA512 7944157e36616e2c646deca3afd4c459625a6ae5f6dfd95132b55557b9decb88e9dd5bdc87d675fa2ef63731efed9593ce30cbecd12f9f2998344c51b5b615c8 WHIRLPOOL a21cf3481b93c82415cd56f13c85df1d39634601d83a0fae592ffb4638017b6d4e6058b7aec9c1ac455786ed58f22dbc98c369af441384b6573f2c8b21f48601
+EBUILD pydns-3.1.1.ebuild 861 SHA256 f090a2f9990fa7b4c4755b247990960dddd27b1ac89cfeb94328cc7b0fd90550 SHA512 2b44f04bc0702fb34482c210bdb24c7ae129ad04cbba586ac8bf0b011a8bdeb8067c6226d2f6402c300fb977c48e9ddd26954dd8a42b87f6dc686bcdb7360cfa WHIRLPOOL 4d4954d19fbf33503281727ced44fa3153f9b5c4a8d747e36de84477bd53523cd4e6c7d5b6062c20347d6058662789fd15d03ae3ca6eef11b153dbcd77293a03
+MISC ChangeLog 3460 SHA256 edfd383b02ce8ae14ff16dcbff8b00e4da6078d790026734ed70f1ca1b04cf73 SHA512 bb8a99fb00c0f7f454e1350ef3e40399a6ba77c48def54912b2da4e804f0a701f1a917726c9459d080b079b59868d12ab42eee49ce7eb300354fe0d6e0e9b535 WHIRLPOOL cf810672ed7ef9ba85b6b6c3e88cbc699972822157db896d1f923701211017c530f71597db2a96096d9ee93b4e8de18d6a79f0909f91bb64216d28794bf71d68
+MISC ChangeLog-2015 5075 SHA256 98b9f443004e506ae3e7bb53e4777cacb041f5faea86b4db759b2edfc8d2ab72 SHA512 e065426e8be13d218693f3d79db707ce40b893bbe2c3667c796c04623f9e635052901ee2d95ea241e26747d72e29ef84566ecfc74424ae82c757a67c1ddd60c6 WHIRLPOOL 2680d069ba6b528382bfd597ca5c047a2c106b9c71854f8c639aeabb9e79166c82b7db98246030aace43864778304e5587a8559bc69c4689c639d42c6ea24158
+MISC metadata.xml 662 SHA256 57d2ad282c14c2d81e784232a70645390bb2b3f318328b8e376d1895c25da7f2 SHA512 a87cafcd69bb347d9737d97589211360b71181b80caa73c4f117790596f5482e0b3177dc712eb89afb200c7a56669eb8a805f7c3f4974f9527dcaff8c4cbc821 WHIRLPOOL 181bbe7bb3c4f07957fac7056dd88dd3688143a9973619c2f95ae3e470f0ca5f9db6e3c0a68681bf88c1dec2dd8c40cbd0aac8c4870ec241719ea4844484cc00
diff --git a/dev-python/pydns/metadata.xml b/dev-python/pydns/metadata.xml
new file mode 100644
index 000000000000..199be52bf51b
--- /dev/null
+++ b/dev-python/pydns/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">PyDNS provides a module for performing DNS queries from python
+		applications. This was originally based on Guido van Rossum's DNS
+		library code, but has drifted further and further away from it over
+		time.</longdescription>
+	<upstream>
+		<remote-id type="pypi">pydns</remote-id>
+		<remote-id type="launchpad">py3dns</remote-id>
+		<remote-id type="sourceforge">pydns</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pydns/pydns-2.3.6-r1.ebuild b/dev-python/pydns/pydns-2.3.6-r1.ebuild
new file mode 100644
index 000000000000..61a6144767c1
--- /dev/null
+++ b/dev-python/pydns/pydns-2.3.6-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for DNS (Domain Name Service)"
+HOMEPAGE="http://pydns.sourceforge.net/ https://pypi.python.org/pypi/pydns"
+SRC_URI="http://downloads.sourceforge.net/project/pydns/pydns/${P}/${P}.tar.gz"
+
+LICENSE="CNRI"
+SLOT="2"
+KEYWORDS="amd64 hppa ~ia64 ~ppc ~sparc x86"
+IUSE="examples"
+
+DEPEND="!dev-python/pydns:0
+	virtual/libiconv"
+RDEPEND=""
+
+# Funny a dns package attempts to use the network on tests
+# Await the day that gentoo chills out on such a blanket law.
+RESTRICT=test
+
+python_prepare_all() {
+	# Fix encodings (should be utf-8 but is latin1).
+	local i
+	for i in DNS/{Lib,Type}.py; do
+		iconv -f ISO-8859-1 -t UTF-8 "${i}" > "${i}.utf8" || die
+		mv -f "${i}.utf8" "${i}" || die
+	done
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local test
+	for test in tests/{test.py,test[2-5].py,testsrv.py}
+	do
+		"${PYTHON}" $test || die
+	done
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( ./{tests,tools}/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pydns/pydns-3.1.0.ebuild b/dev-python/pydns/pydns-3.1.0.ebuild
new file mode 100644
index 000000000000..1b0e6e0a85c0
--- /dev/null
+++ b/dev-python/pydns/pydns-3.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+MY_PN="${PN/py/py3}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Python DNS (Domain Name System) library"
+HOMEPAGE="https://launchpad.net/py3dns"
+SRC_URI="https://launchpad.net/${MY_PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="CNRI"
+SLOT="3"
+KEYWORDS="amd64 hppa ~ia64 ~ppc ~sparc x86"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND=""
+
+# Most if not all of the tests require network access.
+RESTRICT=test
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	# Some of the tests are broken.
+	for test in tests/{test{,2,4}.py,testsrv.py}
+	do
+		"${PYTHON}" ${test} || die
+	done
+
+	"${PYTHON}" tests/test5.py example.org || die
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( ./{tests,tools}/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pydns/pydns-3.1.1.ebuild b/dev-python/pydns/pydns-3.1.1.ebuild
new file mode 100644
index 000000000000..6004c2f169d1
--- /dev/null
+++ b/dev-python/pydns/pydns-3.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="${PN/py/py3}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Python DNS (Domain Name System) library"
+HOMEPAGE="https://launchpad.net/py3dns"
+SRC_URI="https://launchpad.net/${MY_PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="CNRI"
+SLOT="3"
+KEYWORDS="amd64 hppa ~ia64 ~ppc ~sparc x86"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Tests require network access
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	"${EPYTHON}" -m unittest || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r tests/. tools/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pydot-ng/Manifest b/dev-python/pydot-ng/Manifest
new file mode 100644
index 000000000000..8f54fbfd35d6
--- /dev/null
+++ b/dev-python/pydot-ng/Manifest
@@ -0,0 +1,3 @@
+DIST pydot-ng-1.0.0.tar.gz 263582 SHA256 63ffae76adf98672ab6e87072637bdfd14b1f6fabab704bc30f2a70b31e963a8 SHA512 b0570a63f89f8c192de93e13f39d715aee987a62476ed0b4d378db0148ba3884c6ea5de6f4035dd92fce1d140b9900630096bdf408037cb430a08b561242e724 WHIRLPOOL fbe7f30b177769d614ba55d364f99226de15f302dbd54b26f2de1a010b1e37ac601fefefe76deca3a53c86683b0ad5048c3d54b070b22e4c28aec8e9f321502a
+EBUILD pydot-ng-1.0.0.ebuild 764 SHA256 3e5fa9b6bb78c18d07c1fb0fea210a38e806412f140b00dda13bf6d5b1251039 SHA512 8a9ca6e4c55612ae3ea9708990d2760038706c2e49c56dc13f4f7a0379830f762f0549e47640843ec5c14591fa6ec6a7b70cda66c103c8694c44ff31d37d93be WHIRLPOOL 31599662489493f9658077c75c3e0bb1324bce67d62d77b7b752b0aefdad518885662f429b5780a729c51ed53fbbaa1e5a7ce66f927333f25e76edbe36df49d8
+MISC metadata.xml 464 SHA256 873c7c57175886dd785a05f61390ac05bfe06c5f112d4b72a7f2a873fcdf952d SHA512 cde32dc44b04826ae3212fe0264c42a3943f81fea26d047a02de189d2d0ea19eef21b2949438792fc3124c26d03f52f296d51c4d286b84cc70c0a22140cc1fa7 WHIRLPOOL 217629ee8fcbffdad0fe794ee0774fcc09d2a88ae119ec073d18434677561a312adcebafa89a0f1d180f7b591c4a9b4148b4eeab0d071c8eb623b0a14e35b739
diff --git a/dev-python/pydot-ng/metadata.xml b/dev-python/pydot-ng/metadata.xml
new file mode 100644
index 000000000000..160df0858f59
--- /dev/null
+++ b/dev-python/pydot-ng/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>Python 2 and 3 bindings for Graphviz dot language</longdescription>
+  <upstream>
+    <remote-id type="pypi">pydot-ng</remote-id>
+    <remote-id type="github">pydot/pydot-ng</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pydot-ng/pydot-ng-1.0.0.ebuild b/dev-python/pydot-ng/pydot-ng-1.0.0.ebuild
new file mode 100644
index 000000000000..4f8e75e2e6ed
--- /dev/null
+++ b/dev-python/pydot-ng/pydot-ng-1.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to Graphviz's Dot language next gen"
+HOMEPAGE="https://github.com/pydot/pydot-ng"
+SRC_URI="https://github.com/pydot/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="test"
+
+RDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	media-gfx/graphviz"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${PYTHON}" -m pytest test || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
new file mode 100644
index 000000000000..a2d21d248181
--- /dev/null
+++ b/dev-python/pydot/Manifest
@@ -0,0 +1,7 @@
+AUX pydot-1.0.23-setup.patch 623 SHA256 47704452635aeae4db252ae2f71eaa386efb0a863b0ad173597d081031c7e29d SHA512 74202787584f9ed4f9aac5038d200fe7c64d0da906226f11e29897a30f371a200787a585d1d151a8ac2191f160d3cd3029ea6f4f4e388e04e7e80d443227dd61 WHIRLPOOL 5334f3b9e40a6e7fb818b4ac63a076a7b1e575dd34ae0b5c9faf4d1043b303ba7eb4c16c414fb4ef256df7f606c69a35e8176c9fbc205c758014e2ea27d16ecd
+AUX pydot-1.0.28-pyparsing2fix.patch 836 SHA256 dc6a43bf9e34b27d92aa0f565f9ea7d96e77463c090ee8b9105d6d1fed53e0d9 SHA512 c50f6a21609acd177cdc954d5adc967d4cb99177467df4c76cad379050968f86375f61d1a17d0377c9dfe4f23ec1b1647cf85d9c3fd1d6c409387d15de81eeb0 WHIRLPOOL 4e5fd3b3b46f7a22a7d0e1461fd13c3703b9f1f003ffe26260283987b4011f01a789f4526b1769bceefc186a95797333bed91eb3195781cd00472a33da4b38e5
+DIST pydot-1.0.28.tar.gz 19711 SHA256 1eeaff7b104fb8f305a98318dafde0b2d15f1efcdf8b16206465551cd46ed9df SHA512 54b4d7bfb01bbcae9a4832d1c3321d4f453a93f062ee55b35e3d59bee3f8989f4a544afb56c3d16b22bca8e6ef24b6286ac2688c9045b16906ef625999b35055 WHIRLPOOL eb06c22418638351def215e8127af1b3afbd193484dec9a3114e4377f8afcccb25cb7f40e9f29121d086723ddb94dd2fd9ac473f3583a9b782940cce9e208318
+DIST pydot-1.2.3.tar.gz 262660 SHA256 5e63808fd1945ac6600e80518f72d6ecc367273bb7bd1054dceb863a90e7b84b SHA512 0527279174bd9d5703131ab6c16365d66e392e27597b5d2d536d43f783a59139913a6dbfa1cc022993f842843f5d79e4e0b2a1435ce3427ebc534ef7b1ef2e9b WHIRLPOOL 3e328560cb4a42e8ff9484aafb6b28250d3913ed79afb17b2385ee8e05226075040e9488f038144bb5f768ef508b7437dbe5ce0567b3e202838157ebaa6bc2c4
+EBUILD pydot-1.0.28-r2.ebuild 744 SHA256 2744dbfbe6754dd4ffa907717b283911d61c5317faf684b4686e463eacd4c1f5 SHA512 2ee828209be3630aef7a49faffc7964ed276e4c0181b64879f98ff24f7c7b33e929c2718ce75c3d38cd8b362bf2940d33d3aef43fd9c7cdbe7df3c18907b9f82 WHIRLPOOL 4da3dc91b0873a82244c92343dee6c2642a506442db3bc46c398f3d050213597bcd542b62b898ced138052554ee0756487ca94ee0f73e2352e2e95234a4f9de9
+EBUILD pydot-1.2.3.ebuild 933 SHA256 09f63093423653f4d647f809b9d9b1c30a7cf40f300e1067f718f132ce7fd1b1 SHA512 2e5b0758dca6a38350989c64515f691517e8064c856b0ec77053056cc25cbc12ccbffe2cc3a05c724a1fdf56aaa26398851b9d4e5402f92772ef69c3a124dfac WHIRLPOOL 74b6b7e48e0e7f546fe1085cf7832b5ff2b7662f6dd5e83dc71cfe06f30cb78c648d797a1392c2f4b04447d3a6204bdac7ae9153e46ff09722b77fc073131a84
+MISC metadata.xml 376 SHA256 cff6999a8dc869ac0e7365a331afcedaeaa7a337afd122fcf42d7acde5713f43 SHA512 0f67a0286f6ff6c6b35e67ff08abb0b86f9ac60e57d321ac7ca0508383b5ce8b0c091a3b023e87d20f3705887db40a5edde2055fa96ec7bca21a5b8aacac31ce WHIRLPOOL 89acac30668c1f913a8ba1ddffc24db8aac6223f530a17101ace3571f0a11c956b18f0398717adec630c90464d23d0cb6aa8b87713d12d91b4af3353a0080e59
diff --git a/dev-python/pydot/files/pydot-1.0.23-setup.patch b/dev-python/pydot/files/pydot-1.0.23-setup.patch
new file mode 100644
index 000000000000..c87cc32b30d1
--- /dev/null
+++ b/dev-python/pydot/files/pydot-1.0.23-setup.patch
@@ -0,0 +1,21 @@
+--- setup.py
++++ setup.py
+@@ -1,9 +1,9 @@
+ #!/usr/bin/env python
+ 
+ try:
+-    from distutils.core import setup
+-except ImportError, excp:
+     from setuptools import setup
++except ImportError, excp:
++    from distutils.core import setup
+     
+ import pydot
+ import os
+@@ -31,5 +31,4 @@
+         'Topic :: Software Development :: Libraries :: Python Modules'],
+     long_description = "\n".join(pydot.__doc__.split('\n')),
+     py_modules = ['pydot', 'dot_parser'],
+-    install_requires = ['pyparsing', 'setuptools'],
+-    data_files = [('.', ['LICENSE', 'README'])] )
++    install_requires = ['pyparsing', 'setuptools'] )
diff --git a/dev-python/pydot/files/pydot-1.0.28-pyparsing2fix.patch b/dev-python/pydot/files/pydot-1.0.28-pyparsing2fix.patch
new file mode 100644
index 000000000000..12a01091223c
--- /dev/null
+++ b/dev-python/pydot/files/pydot-1.0.28-pyparsing2fix.patch
@@ -0,0 +1,14 @@
+diff -up pydot-1.0.28/dot_parser.py.pyparsing2fix pydot-1.0.28/dot_parser.py
+--- pydot-1.0.28/dot_parser.py.pyparsing2fix	2013-12-09 08:59:24.660145534 -0500
++++ pydot-1.0.28/dot_parser.py	2013-12-09 09:00:10.021222397 -0500
+@@ -25,8 +25,9 @@ from pyparsing import __version__ as pyp
+ from pyparsing import ( nestedExpr, Literal, CaselessLiteral, Word, Upcase, OneOrMore, ZeroOrMore,
+     Forward, NotAny, delimitedList, oneOf, Group, Optional, Combine, alphas, nums,
+     restOfLine, cStyleComment, nums, alphanums, printables, empty, quotedString,
+-    ParseException, ParseResults, CharsNotIn, _noncomma, dblQuotedString, QuotedString, ParserElement )
++    ParseException, ParseResults, CharsNotIn, dblQuotedString, QuotedString, ParserElement )
+ 
++_noncomma = "".join( [ c for c in printables if c != "," ] )
+ 
+ class P_AttrList:
+ 
diff --git a/dev-python/pydot/metadata.xml b/dev-python/pydot/metadata.xml
new file mode 100644
index 000000000000..a44c00e7d6b3
--- /dev/null
+++ b/dev-python/pydot/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pydot</remote-id>
+    <remote-id type="github">erocarrera/pydot</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pydot/pydot-1.0.28-r2.ebuild b/dev-python/pydot/pydot-1.0.28-r2.ebuild
new file mode 100644
index 000000000000..3958643fd37b
--- /dev/null
+++ b/dev-python/pydot/pydot-1.0.28-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to Graphviz's Dot language"
+HOMEPAGE="https://pypi.python.org/pypi/pydot"
+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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	media-gfx/graphviz"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.23-setup.patch
+	"${FILESDIR}"/${P}-pyparsing2fix.patch )
diff --git a/dev-python/pydot/pydot-1.2.3.ebuild b/dev-python/pydot/pydot-1.2.3.ebuild
new file mode 100644
index 000000000000..0a313e45f150
--- /dev/null
+++ b/dev-python/pydot/pydot-1.2.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to Graphviz's Dot language"
+HOMEPAGE="https://github.com/erocarrera/pydot https://pypi.python.org/pypi/pydot"
+# pypi releases don't include tests
+SRC_URI="https://github.com/erocarrera/pydot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	media-gfx/graphviz"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/chardet[${PYTHON_USEDEP}] )"
+
+python_test() {
+	cd test || die
+	"${PYTHON}" pydot_unittest.py || die "Test failed with ${EPYTHON}"
+}
diff --git a/dev-python/pydotplus/Manifest b/dev-python/pydotplus/Manifest
new file mode 100644
index 000000000000..cde38bce95c4
--- /dev/null
+++ b/dev-python/pydotplus/Manifest
@@ -0,0 +1,3 @@
+DIST pydotplus-2.0.2.tar.gz 278677 SHA256 91e85e9ee9b85d2391ead7d635e3d9c7f5f44fd60a60e59b13e2403fa66505c4 SHA512 6f06a1f284401123a4514f9e9a4974dee8dc8d01e6b7c40a797fb70eed22b99fe774272f8b106b5632a33f524b356349fe1ff9633101ff61ef2fc3fe69d641ac WHIRLPOOL 5f0662c5f02a0e57ea7480ca3bbbc43d23b9690680bd37fcfe58645476656aee9d4336a5e77643ad2f34da0b5b97483ae012f24378e2642dc21887756110fa17
+EBUILD pydotplus-2.0.2.ebuild 946 SHA256 aec4aff757cdbc996b4ec0b99fd458550b4a7001705cec306c8b5630af27d495 SHA512 2218a410e8168425833a7500b3ca2134bd7dcfebb806882182614e37372ea42073777d001fb0b16a546e76d3c8d60f7aa89aebebbfcb30fdbecc606c1f6426e8 WHIRLPOOL b9f2a630e004481e05b55cda46485bfd71d3eac1d145fc04acc0209e3511061b6b34e1e27d02a36132af5e31c056d508e8af5b689952027cb22b8de49f72d2b8
+MISC metadata.xml 616 SHA256 874a69206454b528839e6c2ae62023be7bb54feb10e6742f6a9ba06779fe8b8f SHA512 684ead6a0a6f5ff7a9afa13e819e0c444e1d87b50f1cc97567de0c9d5b2e22b6b21a44e28887f430c37358eede53521377f89773687ef5d08cd9e626427fd081 WHIRLPOOL 402fcbed1d122866cbef0ab70d11847d90be1fe33fa2121f7c52aa27ec157945258304d3c6e678424622c9009d75565193ec5d2ec910fb7060bbc6f8716ea74e
diff --git a/dev-python/pydotplus/metadata.xml b/dev-python/pydotplus/metadata.xml
new file mode 100644
index 000000000000..6014a676412f
--- /dev/null
+++ b/dev-python/pydotplus/metadata.xml
@@ -0,0 +1,19 @@
+<?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">
+		PyDotPlus is an improved version of the old pydot project that provides a Python
+		Interface to Graphviz’s Dot language.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">pydotplus</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pydotplus/pydotplus-2.0.2.ebuild b/dev-python/pydotplus/pydotplus-2.0.2.ebuild
new file mode 100644
index 000000000000..5ebcde5602be
--- /dev/null
+++ b/dev-python/pydotplus/pydotplus-2.0.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Improved version of the old pydot project"
+HOMEPAGE="http://pydotplus.readthedocs.org/"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+#	test? (
+#		dev-python/flake8[${PYTHON_USEDEP}]
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#		dev-python/pytest-cov[${PYTHON_USEDEP}]
+#		dev-python/sphinx[${PYTHON_USEDEP}]
+#		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+#		dev-python/tox[${PYTHON_USEDEP}]
+#		)
+RDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	"
+
+#test phase curently disabled, waiting on upstream to include
+#the required files:
+#https://github.com/carlos-jenkins/pydotplus/issues/12
+#python_test() {
+#	${EPYTHON} -m unittest discover || die
+#	tox
+#}
diff --git a/dev-python/pyds/Manifest b/dev-python/pyds/Manifest
new file mode 100644
index 000000000000..7fb65d7c4316
--- /dev/null
+++ b/dev-python/pyds/Manifest
@@ -0,0 +1,7 @@
+AUX pyds-0.6.5-py2.3.patch 514 SHA256 ec15f4ece1db7f248d6a5a5587951d7d30e447394911884cfb9976398e5e5a88 SHA512 753c6c482fc5da23490bdd2f4a97a3f2258d116afdbbee61badc979187504c71fafc5d361701e53c67a8e22d34941860cab7617843801ac6b34224fe02c8a067 WHIRLPOOL cbce1e7d6772e00d591c7bd04135590df8c37c435853d86cb2e02ac5f0afdb9c0c2e85abd8473546baa17d65e71010c1ee8904c262d1051c964bf01796c47279
+AUX pyds-pillow.patch 272 SHA256 7c928d7c81a135f54bd4be8572250d687ada93176060b2720bca3a8a87920039 SHA512 f56fa2800e631b1c5075b4a43340b14e3650db5cd34ad0dd7619df6d6845f958f59719e0f90635b3f92cea6590e5fcae43a0d4d41f69e9fcfff9f66affad1aa6 WHIRLPOOL 85c09c9ad0fedff76491cd3ce657ac5d12505834097b6f4f48f523695701c07b126b8803592a2e4fdb3a92b7c76a90570860e0e33c5d35374b6cdd683957f84d
+DIST PyDS-0.7.3.tar.gz 660766 SHA256 9489a1e65e7df4d172223f863c601f7c09bc9101020cb8c0bbd8b884fbf055b7 SHA512 1ac395e9c93c04710c3ffc335c6ead8a4c35401959da3bf882906cf993e2dc316e52d567e218aca07beebc1b32b71abbeb3f92c7f673d2b613ea0bd62b654e6f WHIRLPOOL d5747f9e3dfa21331ce5bce48494c6031dfefb7acd233e8823ec8810c4e10ee490c3608ef9891ef56e77e038d16c34ffa944696bb290fd6dfbfdaaae81efa8ec
+EBUILD pyds-0.7.3-r1.ebuild 890 SHA256 830e69673b7d8acf3578bb1fd585897b366924bee40e775f74866d2495606231 SHA512 1e0dcd9d8b1436f2c509520d4e2cc497c80d5d0dd2594c8556e15713fbd283dfd4dc4de51d28cd8423dbf531714a51d1fb05a5a6d408258e4033ce377b98ba7e WHIRLPOOL 179c2b2ff3504efebce9d01136e4a334ddd83611a6c38e1d253f8beca09ef91b96ce88f4f62a78360bbdfee135f5c6e381f4852de59d759b5a7e8e3e94980c1e
+MISC ChangeLog 3221 SHA256 0b914d9df6ce7cc2ba5fcf261dbf2d4d6c82eb527cbaa070dde664e1befcfcb8 SHA512 d51e36234f30aa489509ec24f10c6ce439670c4ab1ad465af6a4ac5cc7ae585e39b687cc09ce6707aad5d2a3448842c0c2b2dadd859f9fc8e9eea25a253559e7 WHIRLPOOL ec8e790557bd9302ac67ed4c9b31fc511dbc970391738a762dc563a1125758f771a6a8a23e65dce2f4f330bb866a906402e188bd633d417fe413f078092c2f95
+MISC ChangeLog-2015 3490 SHA256 4095507584a882db1f2dc5f2c3a9887d09ed26d77513fe49a05c8cd38f19bb8f SHA512 7c41e58e01a20d7a64fa0cd0f0627292f4012690831379d7335702949244e6e6e03e2f95a1caeb2e5251ed8f8a08ffbea511181f4355b8234aeaebf080b00877 WHIRLPOOL 2cb7fee3ddf1a6aa0c3799a85192a3eeaebd3b808be0b3d55c1b84d5ca06fecedb7ab61d16308821d8fe3c4c581933b48c793f1879794fdfdbbd98f19256ae93
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/pyds/files/pyds-0.6.5-py2.3.patch b/dev-python/pyds/files/pyds-0.6.5-py2.3.patch
new file mode 100644
index 000000000000..e32f7473a3ec
--- /dev/null
+++ b/dev-python/pyds/files/pyds-0.6.5-py2.3.patch
@@ -0,0 +1,19 @@
+--- PyDS/DownstreamTool.py
++++ PyDS/DownstreamTool.py
+@@ -36,6 +36,7 @@
+ import urllib
+ import gzip
+ import mimetypes
++import urlparse
+ 
+ import PyDS.Tool
+ 
+@@ -74,6 +75,8 @@
+ 				for h in self.cache._getUrlHeaders(theurl):
+ 					apply(self.addheader, h)
+ 					self.message += _('<br>adding Header "%s: %s"') % h
++			urlpieces = urlparse.urlparse(url[1])
++			url = (urlpieces[1], url[1])
+ 			res = urllib.URLopener.open_http(self, url, data)
+ 			self.message = self.message.replace('%', '%%')
+ 			if self.verbose:
diff --git a/dev-python/pyds/files/pyds-pillow.patch b/dev-python/pyds/files/pyds-pillow.patch
new file mode 100644
index 000000000000..505a86675e2c
--- /dev/null
+++ b/dev-python/pyds/files/pyds-pillow.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/show_bug.cgi?id=471508
+--- a/PyDS/PictureTool.py
++++ a/PyDS/PictureTool.py
+@@ -35,8 +35,8 @@
+ import string
+ import mimetypes
+ 
+-import Image
+-import ImageDraw
++from PIL import Image
++from PIL import ImageDraw
+ 
+ import PyDS.Tool
+ import PyDS.EXIF
diff --git a/dev-python/pyds/metadata.xml b/dev-python/pyds/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/pyds/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyds/pyds-0.7.3-r1.ebuild b/dev-python/pyds/pyds-0.7.3-r1.ebuild
new file mode 100644
index 000000000000..d3e36a16c0cd
--- /dev/null
+++ b/dev-python/pyds/pyds-0.7.3-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P="PyDS-${PV}"
+
+DESCRIPTION="Python Desktop Server"
+HOMEPAGE="https://wiki.python.org/moin/PyDS"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="app-text/silvercity
+	>=dev-db/metakit-2.4.9.2[python,${PYTHON_USEDEP}]
+	>=dev-python/cheetah-0.9.15[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.3[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	>=dev-python/medusa-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/pyrex-0.5[${PYTHON_USEDEP}]
+	>=dev-python/soappy-0.11.1[${PYTHON_USEDEP}]
+	virtual/jpeg
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( OVERVIEW )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.5-py2.3.patch"
+	"${FILESDIR}/${PN}-pillow.patch"
+)
diff --git a/dev-python/pyds9/Manifest b/dev-python/pyds9/Manifest
new file mode 100644
index 000000000000..4b4db81ca2d8
--- /dev/null
+++ b/dev-python/pyds9/Manifest
@@ -0,0 +1,6 @@
+AUX pyds9-1.8.1-use-system-xpa.patch 1089 SHA256 fd9ac5d2862178056ac99d81dc1583665ab918d7d932fcec94e3d0e05d79e868 SHA512 1cb86d67479485abf95898ca88e5949a6a0e2eb96a2eb1aeda777bc3815653f6e1a8a7be9345b1a50eb4fa63c205b6a2a5ef4838a7b585d7e2d5a74e6e60e08c WHIRLPOOL afac5716c8088825783260dfcc54f677b86ff9b99591e974d1f5bcc4692e0df0ea4da0b20debca6b4d0957eec8770b401eb114fa3a1b4140b970efc0a20f1ba3
+DIST pyds9-1.8.1.tar.gz 899377 SHA256 86ebc33b4f493998751a2f4a1c0141c7a4a7aee2ab01b62119bcd75bb3ca7273 SHA512 6924ba2a1c1ccd0b3c068d4923c6a35127da744b91b97ece7d075bfde68ff49e6d24ae55869aa5e0e462f3f488db697dcdb33d217b33b6d63551286d9a95eec9 WHIRLPOOL 68bdbe1b10fc6c2651d20968eb8e419d1649958d4c0f70bff01ca7a9ad69fad7a8c78eaced497b6a5b0627f6de63f7390c3fdf009947faa5d25276174ea97fc7
+EBUILD pyds9-1.8.1.ebuild 608 SHA256 3a77820230aa443d2e047cde3679d83a7e874811449723e9a5da95012d5429c5 SHA512 e28ded24bfea4d430cdfa46c2df53fad226f11293489750e689203ef9ce896dbb6b1e03645414681d79cb8cbc1a772f7df52c72470a28da89a569d52a82b725a WHIRLPOOL b9782df600f2baf3cce2301672ff1e3ece327dae42cc9762b3d8a9c6576032690e507bd86b9b47f78355a555aae77a41b720193a79e9427504bbe975668ba648
+MISC ChangeLog 3105 SHA256 38eb315cc260b27e17fc6b02909691b1393bc0517ad828963e35eed82564fd26 SHA512 c0600af225ae3397999778a7317b66b4a798666613c714821e6fd69adf51b07771779cdf1b75ef89139df26f6f25b04aeb1b2a18a83b092fc0bb83a6fda6bdbd WHIRLPOOL c2fb0a85b43e0f93f056de3239fa7c6c185a9936af9221da15771b6bd9f5f5339343a9a259c2041d4b4b6840cbbb5d650f7dc5dabad62d15518070b345b6b22c
+MISC ChangeLog-2015 1842 SHA256 80ba1ac7fd663e2b80289e3fbb6a8bebb70b1b76e24f36d586510e19c54265b9 SHA512 1b1416965b91f933d34bb5b1a60ce538a669332b972309d27692f409aee1e11318a5755432be5db5ecbe2e77e6ed8241665d98ed8d02be3ca19a97487580c63d WHIRLPOOL 967f6a8bfae3d7401b5fb123313de0ac026171b320d9033ac9ea0e27a715c370456deb9de5133fb594740abf06ad51498102334db0c0fd66fbb712c1fa357fc4
+MISC metadata.xml 689 SHA256 7f63f4829c6593e81cd592740ee43f18b33c226faa5cefaa955734f4cc34f9eb SHA512 edb6305f963fff8c98d5d24f7873bdaf30a49db7defcb2c1b4e76c8bf82d9d4843f217da5a3a7c19cd6eedd41450d9d53c7638b3296b7e6a906808457458b279 WHIRLPOOL 07e63d602577f023e0d75d10144261f7fbc09a46b70393c421456e6fc76dd8b24fb58a7bcb9e2f8a25a86e61aceccf6486202f952912de0eb6978f30c4ab6e59
diff --git a/dev-python/pyds9/files/pyds9-1.8.1-use-system-xpa.patch b/dev-python/pyds9/files/pyds9-1.8.1-use-system-xpa.patch
new file mode 100644
index 000000000000..b84994f76b08
--- /dev/null
+++ b/dev-python/pyds9/files/pyds9-1.8.1-use-system-xpa.patch
@@ -0,0 +1,36 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Description: Don't install and use the convienience copy provided in the
+ source, but use the one installed by the "libxpa1" package.
+--- a/setup.py
++++ b/setup.py
+@@ -21,7 +21,7 @@
+ xpadir = 'xpa'
+ 
+ 
+-def make(which):
++def _disabled_make(which):
+     curdir = os.getcwd()
+     srcDir = os.path.join(os.path.dirname(os.path.abspath(__file__)), xpadir)
+     os.chdir(srcDir)
+@@ -86,10 +86,5 @@
+       author_email='saord@cfa.harvard.edu',
+       url='http://hea-www.harvard.edu/saord/ds9/',
+       py_modules=['pyds9', 'xpa'],
+-      data_files=[('', [os.path.join(xpadir, xpalib),
+-                        os.path.join(xpadir, xpans)])],
+-      cmdclass={'build_py': my_build_py,
+-                'install_data': my_install_data,
+-                'clean': my_clean},
+       install_requires=['six']
+       )
+--- a/xpa.py
++++ b/xpa.py
+@@ -28,7 +28,7 @@
+         return _fname
+     return None
+ 
+-_libpath = _find_shlib('xpa')
++_libpath = 'libxpa.so.1'
+ if _libpath:
+     libxpa = ctypes.cdll.LoadLibrary(_libpath)
+     _ulist = platform.uname()
diff --git a/dev-python/pyds9/metadata.xml b/dev-python/pyds9/metadata.xml
new file mode 100644
index 000000000000..638486c778fb
--- /dev/null
+++ b/dev-python/pyds9/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  The XPA messaging system provides seamless communication between
+  many kinds of Unix programs, including Tcl/Tk programs such as
+  ds9. The pyds9 module uses a  Python interface to XPA to communicate
+  with ds9. It supports communication with all of ds9’s XPA access
+  points.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">ericmandel/pyds9</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyds9/pyds9-1.8.1.ebuild b/dev-python/pyds9/pyds9-1.8.1.ebuild
new file mode 100644
index 000000000000..018539482069
--- /dev/null
+++ b/dev-python/pyds9/pyds9-1.8.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to XPA to communicate with DS9"
+HOMEPAGE="https://github.com/ericmandel/pyds9"
+SRC_URI="https://github.com/ericmandel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="x11-libs/xpa:0
+	dev-python/six[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS=(changelog README.md)
+
+PATCHES=( "${FILESDIR}/${P}-use-system-xpa.patch" )
diff --git a/dev-python/pydvdread/Manifest b/dev-python/pydvdread/Manifest
new file mode 100644
index 000000000000..6d1e7558fc83
--- /dev/null
+++ b/dev-python/pydvdread/Manifest
@@ -0,0 +1,7 @@
+AUX pydvdread-1.0-api-update.patch 9032 SHA256 c64f8c1bd346c9bece1bee0958f0d54f90799a78678e4191de0e5d7f56a65f2c SHA512 52456ce0a3b7503de4f70d0fd6b8f03cc1cc91db348dbeb41d62c246773e280869149bed30e763ecb0a4ac57413369a1a269669977a5e8465ba56be5b0536be2 WHIRLPOOL 02b233e6fd5545c34a480ff7b0092f355e49831dd73271be8a36c8155ad6d8d5ce92281906838214abcf006adf2ff02681e6aba69735261da416e9660245da02
+AUX pydvdread-1.0-py3k.patch 790 SHA256 a277e81d5ed0c7ff633daee5de4c0bba6aaf7599a5374e6c38228cc9491e0fb0 SHA512 82f8721dc618d79a0684353011a714144143d836fe742878003cfcc122fe171f1c3e11d340bbf3e9a778160a351df50ffb68b0cc858244babcf81e8595690236 WHIRLPOOL 94791a0269391940748dac2ffa7781c0736978193cb89987c137909cf4b50e45e03867afd73df8d043636e8356e24c486ad47286b8ab5cf6ff62c7ca453dd2dc
+DIST pydvdread-1.0.tar.bz2 62072 SHA256 aae9a0ad1ab4d218a52cc7cffcbbeb9c3e59f4f4286acc36d02d46f3e0b31cb2 SHA512 1d403e1b9538113bb5ab1a808147691b806ee57db3fa30f704a0fcb1dbb8e9155e470dc2fbb895788af59c2952d637a2853d613f0619deb5daf07d2e7b675eee WHIRLPOOL 5c65a36b90f68b2e72f3900954a90b99fc51ea3e70f70e06ecba9a2ee172f51f3972f4c96b240954360e85b5a8d338f1039c7e3ed279d4f20b8edc5ecff4ba3e
+EBUILD pydvdread-1.0-r1.ebuild 832 SHA256 d63dce1d59cd43d088369b4ce8c76d5e25e90b4c7b5452df5451ca582b04d4a7 SHA512 16bf146e28b91b95f5d48d0fe4f20208ce711e0bbb86d16b211f8ad809da66ff00ac1a679b3f1c75f631d8bd30018f31d58cbeb9152227446705a28d1e04ffb6 WHIRLPOOL 33e4227040bb3c2a2b20876c7bc6c47af3e94119fa3bbb892644c3e270fe0bd3202badeb06f6191dedac8ef9d2902e2e79d13e23b01325a5e1ea9e506c5fb987
+MISC ChangeLog 2511 SHA256 1eec4ff9d840a4fdcdb1681dff1dcd77d3719a99e17effa88257adc15d711b12 SHA512 7e480d34d0ea1dc4634ca248e82d8945c21b94ed84a2d4c79e8dae025199782428d19c63e29285385f5c0c78afcdac7bd4c546d5484e8500624d9d19681b08f3 WHIRLPOOL abe0277cb8c10b47a7c9f039c74406afb3788aede92e40aebff698eaaaedde5f48a616c1956767c42c069c142edf5911bb1f1818bac2f7dab2cff4026a1286f1
+MISC ChangeLog-2015 955 SHA256 bd452a093c145f3df49a4135a6946f6b3a662331a4eaeeb4236788299c791e01 SHA512 656853233d12dfd2fe496bb1e45641adb84d20077db382091a55db7069a831b57fdf0e8dc9cb9e7ee31c926d6e4cd550b5862ebf1c791fc7d4557c54a21b36aa WHIRLPOOL a43ee7af147a96e51cc78f1594af752bcfddbe13b3149ea61160ace0581729e5b8e112ced8a89860a31cdaa053abcda07a41d9de89e951a4212d06ffaeffdb0c
+MISC metadata.xml 319 SHA256 de727cffef86947388e44b4be2ec6fa6668e91c9fbc236436c49655ef72dcf3c SHA512 73a20bef88f68ec88c854ce4d4418742563267d7a8007aa5c32a421fcac1259cb22a3ede01d2f5e49265902b4957bcf8a1e81512ed4715c49d461044f886d1f8 WHIRLPOOL 4e567480f758ee5e2f0ee22001ee1fc91ecb56407c14a3ab560cb9e0c3fb0976127c57684ec68b5eb786c7b6156562dbc33e8d523b838171d9577ae99b374e30
diff --git a/dev-python/pydvdread/files/pydvdread-1.0-api-update.patch b/dev-python/pydvdread/files/pydvdread-1.0-api-update.patch
new file mode 100644
index 000000000000..71c08158e660
--- /dev/null
+++ b/dev-python/pydvdread/files/pydvdread-1.0-api-update.patch
@@ -0,0 +1,287 @@
+update the module to libdvdread-4.2.0 (at least so tests pass)
+
+--- a/src/dvdread/__init__.py
++++ b/src/dvdread/__init__.py
+@@ -1,6 +1,6 @@
+ """Main package of pydvdread."""
+ 
+-__all__ = ['cmd_print',
++__all__ = [
+            'dvd_reader',
+            'ifo_print',
+            'ifo_read',
+--- a/src/dvdread/all.i
++++ b/src/dvdread/all.i
+@@ -403,7 +403,6 @@
+ %{
+ #include <stdint.h>
+ %}
+-%include "cmd_print.i"
+ %include "dvd_reader.i"
+ %include "ifo_print.i"
+ %include "ifo_read.i"
+--- a/src/dvdread/ifo_types.i
++++ b/src/dvdread/ifo_types.i
+@@ -374,7 +374,7 @@ typedef struct {
+   uint16_t nr_of_pre;
+   uint16_t nr_of_post;
+   uint16_t nr_of_cell;
+-  uint16_t last_byte;
++  uint16_t zero_1;
+   vm_cmd_t *pre_cmds;
+   vm_cmd_t *post_cmds;
+   vm_cmd_t *cell_cmds;
+--- a/src/dvdread/ifo_print.i
++++ b/src/dvdread/ifo_print.i
+@@ -31,6 +31,7 @@ file to stdout."
+ 
+ %{
+ #include <dvdread/ifo_print.h>
++#include <dvdread/ifo_read.h>
+ %}
+ 
+ /**
+@@ -40,21 +41,6 @@ file to stdout."
+ %feature("autodoc", "0");
+ 
+ /* ifoPrint(dvd, title); */
+-void ifoPrint(dvd_reader_t *dvd, int title);
++void ifo_print(dvd_reader_t *dvd, int title);
+ 
+ %feature("autodoc", "1");
+-
+-void ifoPrint_VMGI_MAT(vmgi_mat_t *obj);
+-void ifoPrint_VTSI_MAT(vtsi_mat_t *obj);
+-
+-void ifoPrint_PTL_MAIT(ptl_mait_t *obj);
+-void ifoPrint_VTS_ATRT(vts_atrt_t *obj);
+-void ifoPrint_TT_SRPT(tt_srpt_t *obj);
+-void ifoPrint_VTS_PTT_SRPT(vts_ptt_srpt_t *obj);
+-void ifoPrint_PGC(pgc_t *obj);
+-void ifoPrint_PGCIT(pgcit_t *obj);
+-void ifoPrint_PGCI_UT(pgci_ut_t *obj);
+-void ifoPrint_VTS_TMAPT(vts_tmapt_t *obj);
+-void ifoPrint_C_ADT(c_adt_t *obj);
+-void ifoPrint_VOBU_ADMAP(vobu_admap_t *obj);
+-
+--- a/src/dvdread/ifo_print.py
++++ b/src/dvdread/ifo_print.py
+@@ -16,11 +16,4 @@
+ ## along with this program; if not, write to the Free Software
+ ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+-from all import ifoPrint
+-from all import ifoPrint_VMGI_MAT, ifoPrint_VTSI_MAT
+-from all import ifoPrint_PTL_MAIT, ifoPrint_VTS_ATRT
+-from all import ifoPrint_TT_SRPT, ifoPrint_VTS_PTT_SRPT
+-from all import ifoPrint_PGC, ifoPrint_PGCIT
+-from all import ifoPrint_PGCI_UT, ifoPrint_VTS_TMAPT
+-from all import ifoPrint_C_ADT, ifoPrint_VOBU_ADMAP
+-
++from all import ifo_print
+--- a/src/dvdread/dvd_reader.i
++++ b/src/dvdread/dvd_reader.i
+@@ -59,14 +59,6 @@ reading files located on a DVD."
+ 
+ 
+ /**
+- * DVDVersion
+- */
+-%feature("autodoc", "DVDVersion() -> int\n\n\
+-Returns the version of libdvdread.") DVDVersion;
+-int DVDVersion(void);
+-
+-
+-/**
+  * DVDOpen
+  */
+ %feature("autodoc", "DVDOpen(path) -> dvd\n\n\
+@@ -106,25 +98,6 @@ void DVDClose( dvd_reader_t * );
+ 
+ 
+ /**
+- * DVDInit
+- */
+-%feature("autodoc", "DVDInit()\n\n\
+-Initializes support for multiple threads.\n\n\
+-NOTE: You must call DVDInit before using any of the other functions\n\
+-if you are going to use them in a multithreading app.") DVDInit;
+-void DVDInit(void);
+-
+-
+-/**
+- * DVDFinish
+- */
+-%feature("autodoc", "DVDFinish()\n\n\
+-Frees any dlopened objects.\n\n\
+-NOTE: You must DVDClose all handles opened with DVDOpen before calling this.") DVDFinish;
+-void DVDFinish(void);
+-
+-
+-/**
+  * File Domains
+  */
+ typedef enum {
+--- a/src/dvdread/dvd_reader.py
++++ b/src/dvdread/dvd_reader.py
+@@ -22,9 +22,7 @@ from all import DVD_READ_MENU_VOBS, DVD_READ_TITLE_VOBS
+ 
+ from all import dvd_stat_t
+ 
+-from all import DVDVersion, DVDOpen
+-from all import DVDClose, DVDInit
+-from all import DVDFinish, DVDFileStat
++from all import DVDOpen, DVDClose, DVDFileStat
+ from all import DVDOpenFile, DVDCloseFile
+ from all import DVDReadBlocks, DVDFileSeek
+ from all import DVDReadBytes, DVDFileSize
+--- a/tests/TestAll.py
++++ b/tests/TestAll.py
+@@ -33,7 +33,6 @@ devpath()
+ 
+ import unittest
+ 
+-import Test_cmd_print
+ import Test_dvd_reader
+ import Test_ifo_print
+ import Test_ifo_read
+@@ -49,7 +48,6 @@ import TestStruct_nav_types
+ # Run all tests
+ if __name__ == '__main__':
+     if len(sys.argv) > 1:
+-        Test_cmd_print.DVDPATH = sys.argv[1]
+         Test_dvd_reader.DVDPATH = sys.argv[1]
+         Test_ifo_print.DVDPATH = sys.argv[1]
+         Test_ifo_read.DVDPATH = sys.argv[1]
+@@ -57,8 +55,7 @@ if __name__ == '__main__':
+         Test_nav_print.DVDPATH = sys.argv[1]
+         Test_nav_read.DVDPATH = sys.argv[1]
+         Test_nav_types.DVDPATH = sys.argv[1]
+-    suite = unittest.TestLoader().loadTestsFromModule(Test_cmd_print)
+-    suite.addTest(unittest.TestLoader().loadTestsFromModule(Test_dvd_reader))
++    suite = unittest.TestLoader().loadTestsFromModule(Test_dvd_reader)
+     suite.addTest(unittest.TestLoader().loadTestsFromModule(Test_ifo_print))
+     suite.addTest(unittest.TestLoader().loadTestsFromModule(Test_ifo_read))
+     suite.addTest(unittest.TestLoader().loadTestsFromModule(Test_ifo_types))
+--- a/tests/Test_dvd_reader.py
++++ b/tests/Test_dvd_reader.py
+@@ -49,9 +49,6 @@ class Test1(unittest.TestCase):
+         self.assert_(isinstance(dvd_reader.DVD_READ_MENU_VOBS, int))
+         self.assert_(isinstance(dvd_reader.DVD_READ_TITLE_VOBS, int))
+ 
+-    def test_DVDVersion(self):
+-        self.assert_(isinstance(dvd_reader.DVDVersion(), int))
+-
+ class Test2(unittest.TestCase):
+     
+     def tearDown(self):
+@@ -70,22 +67,6 @@ class Test3(unittest.TestCase):
+     def test_DVDClose(self):
+         dvd_reader.DVDClose(self.dvd)
+ 
+-class Test4(unittest.TestCase):
+-    
+-    def tearDown(self):
+-        dvd_reader.DVDFinish()
+-    
+-    def test_DVDInit(self):
+-        dvd_reader.DVDInit()
+-
+-class Test5(unittest.TestCase):
+-    
+-    def setUp(self):
+-        dvd_reader.DVDInit()
+-    
+-    def test_DVDFinish(self):
+-        dvd_reader.DVDFinish()
+-
+ class Test6(unittest.TestCase):
+ 
+     def setUp(self):
+--- a/tests/Test_ifo_print.py
++++ b/tests/Test_ifo_print.py
+@@ -50,45 +50,8 @@ class Test1(unittest.TestCase):
+         ifo_read.ifoClose(self.ifo)
+         dvd_reader.DVDClose(self.dvd)
+     
+-    def test_ifoPrint(self):
+-        ifo_print.ifoPrint(self.dvd, 1)
+-
+-    def test_ifoPrint_VMGI_MAT(self):
+-        ifo_print.ifoPrint_VMGI_MAT(self.ifo0.vmgi_mat)
+-
+-    def test_ifoPrint_VTSI_MAT(self):
+-        ifo_print.ifoPrint_VTSI_MAT(self.ifo.vtsi_mat)
+-
+-    def test_ifoPrint_PTL_MAIT(self):
+-        if self.ifo0.ptl_mait:
+-            ifo_print.ifoPrint_PTL_MAIT(self.ifo0.ptl_mait)
+-
+-    def test_ifoPrint_VTS_ATRT(self):
+-        ifo_print.ifoPrint_VTS_ATRT(self.ifo0.vts_atrt)
+-
+-    def test_ifoPrint_TT_SRPT(self):
+-        ifo_print.ifoPrint_TT_SRPT(self.ifo0.tt_srpt)
+-
+-    def test_ifoPrint_VTS_PTT_SRPT(self):
+-        ifo_print.ifoPrint_VTS_PTT_SRPT(self.ifo.vts_ptt_srpt)
+-
+-    def test_ifoPrint_PGC(self):
+-        ifo_print.ifoPrint_PGC(self.ifo0.first_play_pgc)
+-
+-    def test_ifoPrint_PGCIT(self):
+-        ifo_print.ifoPrint_PGCIT(self.ifo.vts_pgcit)
+-
+-    def test_ifoPrint_PGCI_UT(self):
+-        ifo_print.ifoPrint_PGCI_UT(self.ifo.pgci_ut)
+-
+-    def test_ifoPrint_VTS_TMAPT(self):
+-        ifo_print.ifoPrint_VTS_TMAPT(self.ifo.vts_tmapt)
+-
+-    def test_ifoPrint_C_ADT(self):
+-        ifo_print.ifoPrint_C_ADT(self.ifo.menu_c_adt)
+-
+-    def test_ifoPrint_VOBU_ADMAP(self):
+-        ifo_print.ifoPrint_VOBU_ADMAP(self.ifo.menu_vobu_admap)
++    def test_ifo_print(self):
++        ifo_print.ifo_print(self.dvd, 1)
+ 
+ 
+ # Run the tests
+--- a/tests/Test_ifo_types.py
++++ b/tests/Test_ifo_types.py
+@@ -189,7 +189,7 @@ def pgc_command_tbl_t(obj, tester):
+     tester.assert_(isinstance(obj.nr_of_pre, int))
+     tester.assert_(isinstance(obj.nr_of_post, int))
+     tester.assert_(isinstance(obj.nr_of_cell, int))
+-    tester.assert_(isinstance(obj.last_byte, int))
++    tester.assert_(isinstance(obj.zero_1, int))
+     tester.assert_(callable(obj.pre_cmds))
+     for i in range(obj.nr_of_pre):
+         tester.assert_(isinstance(obj.pre_cmds(i), ifo_types.vm_cmd_t))
+@@ -457,18 +457,18 @@ def ptl_mait_country_t(obj, tester):
+     tester.assert_(isinstance(obj.zero_1, int))
+     tester.assert_(isinstance(obj.pf_ptl_mai_start_byte, int))
+     tester.assert_(isinstance(obj.zero_2, int))
+-    tester.assert_(isinstance(obj.pf_ptl_mai, ifo_types.pf_level_t))
+-    pf_level_t(obj.pf_ptl_mai, tester)
++    # No idea what's going on here.
++    #tester.assert_(isinstance(obj.pf_ptl_mai, ifo_types.pf_level_t))
++    #pf_level_t(obj.pf_ptl_mai, tester)
+ 
+ def ptl_mait_t(obj, tester):
+     tester.assert_(isinstance(obj.nr_of_countries, int))
+     tester.assert_(isinstance(obj.nr_of_vtss, int))
+     tester.assert_(isinstance(obj.last_byte, int))
+-    tester.assert_(isinstance(obj.countries, list))
+-    tester.assertEqual(len(obj.countries), obj.nr_of_countries)
+-    for elem in obj.countries:
+-        tester.assert_(isinstance(elem, ifo_types.ptl_mait_country_t))
+-        ptl_mait_country_t(elem, tester)
++    tester.assert_(callable(obj.countries))
++    for i in range(obj.nr_of_countries):
++        tester.assert_(isinstance(obj.countries(i), ifo_types.ptl_mait_country_t))
++        ptl_mait_country_t(obj.countries(i), tester)
+ 
+ def vts_attributes_t(obj, tester):
+     tester.assert_(isinstance(obj.last_byte, int))
diff --git a/dev-python/pydvdread/files/pydvdread-1.0-py3k.patch b/dev-python/pydvdread/files/pydvdread-1.0-py3k.patch
new file mode 100644
index 000000000000..338ad6c0ef0c
--- /dev/null
+++ b/dev-python/pydvdread/files/pydvdread-1.0-py3k.patch
@@ -0,0 +1,19 @@
+get it building w/python3
+
+--- a/setup.py
++++ b/setup.py
+@@ -18,11 +18,11 @@ def fixso(filepath):
+ class my_build_ext(build_ext):
+     def build_extension(self, ext):
+         sources = ext.sources
+-        if sources is None or type(sources) not in (ListType, TupleType):
+-            raise DistutilsSetupError, \
++        if sources is None or not isinstance(sources, (list, tuple)):
++            raise DistutilsSetupError(
+                   ("in 'ext_modules' option (extension '%s'), " +
+                    "'sources' must be present and must be " +
+-                   "a list of source filenames") % ext.name
++                   "a list of source filenames") % ext.name)
+         sources = list(sources)
+         fullname = self.get_ext_fullname(ext.name)
+         if self.inplace:
diff --git a/dev-python/pydvdread/metadata.xml b/dev-python/pydvdread/metadata.xml
new file mode 100644
index 000000000000..d1ae6b21ccc0
--- /dev/null
+++ b/dev-python/pydvdread/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pydvdread</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pydvdread/pydvdread-1.0-r1.ebuild b/dev-python/pydvdread/pydvdread-1.0-r1.ebuild
new file mode 100644
index 000000000000..30b1b500bd16
--- /dev/null
+++ b/dev-python/pydvdread/pydvdread-1.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A set of Python bindings for the libdvdread library"
+HOMEPAGE="http://pydvdread.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+RESTRICT="test" # Requires an actual DVD to test.
+
+DEPEND="media-libs/libdvdread
+		dev-lang/swig"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-py3k.patch \
+		"${FILESDIR}"/${P}-api-update.patch )
+
+python_test() {
+	"${PYTHON}" tests/TestAll.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pyee/Manifest b/dev-python/pyee/Manifest
new file mode 100644
index 000000000000..0de10540268e
--- /dev/null
+++ b/dev-python/pyee/Manifest
@@ -0,0 +1,4 @@
+DIST pyee-1.0.2.tar.gz 4263 SHA256 16944f91eb37c0acf7a370feef2c09678220963f24f38134703911f80b33d79c SHA512 73cbb3cc7b06be9d4c92f6bc901fa55e1ca51271177672e8a1636eedc6f82fc940d7dd844d0f4a959e52185c0ef934e9fbe4760b70d62f39b94f5d1c3660ce2c WHIRLPOOL e09230d7e94533aef1b5f00f746e839cfd362eba8ce3a4f4929a323ff15fed4e85c11dc2ff9347c4b9eae7ce211d18e29f9248354394a381a53e45bb06ac0a51
+EBUILD pyee-1.0.2.ebuild 535 SHA256 8a72a07a5dc420f9fe4ec8eb42a6bda848ddf210334393d7bb9410d4ca899ceb SHA512 5141d9b66310f1ec2c5caf480d7f1b590e62d66dc69e4f75f66696212ffcf8ae47c6b7617a978c30b7c0cbf943700003ae791209710075327df2869c9b3a9989 WHIRLPOOL 7a2d009a45e41d97bf91eb3a9e576f41c7475ac34ffb21f9c5c586e95803d95e8b65fe74429466910a4971825dcee6e377dd18230d8d2b915351bf9585e47ac1
+MISC ChangeLog 1522 SHA256 a3601623cef47932889256bf5c742532f1a31a4e73d28ce26a457ebcf1bed08b SHA512 54a205454bed480a41e766de53430b0a417d9c2333869517a3b700fed83d8eb4c40f41b8a67f310007347a161ed2815e6ee2e63c288cf728b7d271b0c5403c29 WHIRLPOOL bd088fe7c138f033062a69a4f70d4f5151db5c82fca3e3502586d028297dab4b7a7c092617db0e2a1107648748f15663b2e9d1b4ee5c77bb7ad363a786e889ab
+MISC metadata.xml 566 SHA256 e5d82264ecc2fc4e751a70ae9af5e056c32d2f10c5122d34859b59ab031e105f SHA512 75bd4c0b9b8120f7240e06c6674976fbe4ca213c8e8652dc0a6f783c2750ea3bbf269cc079ca1ceafdb2af2760e77792c189f2d2c2753a6c2966b8d9c4c0cc47 WHIRLPOOL 06cc17e5242c0a0f0bef2d64f9f7a883e7d20e28c0911ea2390355fd3a632d99d1e91945d19f89af275a95fe36b3f0d4c15b302f5888b2281e6839be310ef34d
diff --git a/dev-python/pyee/metadata.xml b/dev-python/pyee/metadata.xml
new file mode 100644
index 000000000000..35c024b2640c
--- /dev/null
+++ b/dev-python/pyee/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+    <description>Python team can take the package if they wish.</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pyee</remote-id>
+    <remote-id type="github">jfhbrook/pyee</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyee/pyee-1.0.2.ebuild b/dev-python/pyee/pyee-1.0.2.ebuild
new file mode 100644
index 000000000000..12c3825204ad
--- /dev/null
+++ b/dev-python/pyee/pyee-1.0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A port of node.js's EventEmitter to python"
+HOMEPAGE="https://pypi.python.org/pypi/pyee https://github.com/jfhbrook/pyee"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests -v || die
+}
diff --git a/dev-python/pyelemental/Manifest b/dev-python/pyelemental/Manifest
new file mode 100644
index 000000000000..605d3a630cff
--- /dev/null
+++ b/dev-python/pyelemental/Manifest
@@ -0,0 +1,6 @@
+AUX pyelemental-1.2.0-gcc-4.7.patch 641 SHA256 e1bc552e5073fb033de74d00dd986646312990ba218a5691eee5ad5798570e6b SHA512 f48af2ab3a4ae49193d011e4c9e74a1ef6270f4ec80e5968588b8a76d2bc172128723bf4b05e7f34f0caed87577ad80c504b302a7bf8d94eb52dc382ffcdcabb WHIRLPOOL 1a29d2d6f99f4d7bb941e2dfc1b56c1480cae1b9f3426abf7a54836ff68291516c22967c818b3d726e35482c38fb4d2cbed7228b82cc6ad424b4dfd9d6479f13
+DIST pyelemental-1.2.0.tar.bz2 34610 SHA256 83420f754b6700eb585b08a05510e616058a8b0c62ffd1f9dab3eae1df463bc7 SHA512 2053042ed19e73d9fefd1d86d29d6d3f9fbed1b0733273197bf62f908154d96ac4c6f3ca0c314e66fa291ab253e8afcdf514e4fbf3e4ea66741349f45a27b23e WHIRLPOOL cb44b87411c75cb1a1ec09932b1a5c15336063bfac6e430bf6be0415ff820636847b39bfdfffad7c3a1d1017a035895237f556b07ea99b18f0ae228a9ba254e2
+EBUILD pyelemental-1.2.0-r1.ebuild 734 SHA256 962938f52d72f3785bfc9fe39c2d7e428e05bad656715159b73c1061319b7dab SHA512 c77563bc9300870726a38c083a6f8b4e07b6743ecff5bfd8c2e1360b8c74ea7c4fef4987397c21bf8d0f902e1f31067e68d57402921b947a3ac42af9dbcde9d5 WHIRLPOOL dac6c278f464714a101b3e23ae4d8924cab69769d169ce87bd11a6f52bff74d4e6bb78096dec2a467dec3186f525e696bf6516e7f602483b42210cdfbbf39cff
+MISC ChangeLog 2743 SHA256 becbc5945120c8667437767c86bb52c4db2d91fe06c8120ed30273b368217587 SHA512 82d7990b26b8a48b107255f1bf0d4ea7be28760e26cd8716b1673683890121592be45a672e0dca35ae908859d7b5d3cd232a4254b31713d4d4ba7d7843bc6993 WHIRLPOOL 06c658acb17958514e4e6a645185d95ea1f00c562ac5013b68532f5c232a803d67ce80882913c1d9ec796510106d63a70c9cdf78c462c6df3a5115c35335ddc9
+MISC ChangeLog-2015 1324 SHA256 11f2a4aab6f878aaecec84a00284c36c92f90554bfa6977c259b9b1a742b4f21 SHA512 2ba1c92b17e8b46d3a3785ae387051743dc74e0e0248f3a0102b5457f19a2911a329460b8faa2068fe55710e5bb8f4b88ea70efca358c9c2fd09f0e459bf1c77 WHIRLPOOL fac5876088d8f9ab3095ab334a66d65c90a79c05069e1b857b239180eda39def353812dc36fb7b964fe86618d3e54f23831fda3433ce79c6a2c3f57fd252a42a
+MISC metadata.xml 443 SHA256 e495e3de84b30a1d231318f53c04a25a8dab83e6844a5b9b4aaeaf6ed3cf3d30 SHA512 0b62309461f36d934829c7d4223f67001557dc77f1f3433940d9e47282e999c0466b4a54190da5df8157e29a9643212d8de85d42f247d5806e9da059edbf3440 WHIRLPOOL 22c79ac371264e5ffe9520fc8b3d9cacc6d152493667dc0abf39e66c15a34c3a2cb49143406ab3771f859ca638b15c1a6effa3d3479e4365ec78ca7cf958c813
diff --git a/dev-python/pyelemental/files/pyelemental-1.2.0-gcc-4.7.patch b/dev-python/pyelemental/files/pyelemental-1.2.0-gcc-4.7.patch
new file mode 100644
index 000000000000..a0a53a67be28
--- /dev/null
+++ b/dev-python/pyelemental/files/pyelemental-1.2.0-gcc-4.7.patch
@@ -0,0 +1,25 @@
+ value-types.tcc |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/value-types.tcc b/value-types.tcc
+index 5afc8d0..a95ccbf 100644
+--- a/value-types.tcc
++++ b/value-types.tcc
+@@ -44,7 +44,7 @@ ValueType_t (bool)::ready (PyObject* module)
+ 
+ ValueType_t (PyObject*)::wrap (const cxxtype& source)
+ {
+-	return wrap_copy (&type, source);
++	return ValueType::wrap_copy (&type, source);
+ }
+ 
+ 
+@@ -160,7 +160,7 @@ ValueListType_t (bool)::ready (PyObject* module)
+ 
+ ValueListType_t (PyObject*)::wrap (const cxxtype& source)
+ {
+-	return wrap_copy (&type, source);
++	return ValueListType::wrap_copy (&type, source);
+ }
+ 
+ 
diff --git a/dev-python/pyelemental/metadata.xml b/dev-python/pyelemental/metadata.xml
new file mode 100644
index 000000000000..3b58d75ed9a6
--- /dev/null
+++ b/dev-python/pyelemental/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="freecode">gelemental</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyelemental/pyelemental-1.2.0-r1.ebuild b/dev-python/pyelemental/pyelemental-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..39c5e4117997
--- /dev/null
+++ b/dev-python/pyelemental/pyelemental-1.2.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Python bindings for libelemental (sci-chemistry/gelemental)"
+HOMEPAGE="http://freecode.com/projects/gelemental/"
+SRC_URI="http://www.kdau.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=sci-chemistry/gelemental-1.2.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-gcc-4.7.patch )
+
+python_prepare_all() {
+	append-cxxflags -std=c++11
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
new file mode 100644
index 000000000000..56ee1e281785
--- /dev/null
+++ b/dev-python/pyelftools/Manifest
@@ -0,0 +1,5 @@
+DIST pyelftools-0.24.tar.gz 411874 SHA256 e9dd97d685a5b96b88a988dabadb88e5a539b64cd7d7927fac9a7368dc4c459c SHA512 5169617f9a8446ffc21dfc44ee185a388c8945a0296bdc6752483b0756888dccb10e3ee88e529d101cf31a4595de924b5c95f5459d5ee4448f57c0c4f2c56887 WHIRLPOOL 9523129a70f76a89ca6779f00df46f975b38080a2303cf1fb3666188be0aef2602f4970d195a70325f4a44e687e6393eb779a5f7d7431400f96a8ae602a32b26
+EBUILD pyelftools-0.24.ebuild 916 SHA256 39e1a30dcab429455c332aa59039bee4324fb8e1b7b30e041a563ef191000576 SHA512 13f55deef148eb1522ba8dcb0b1c090d95fb61a72036b7d918a5cd08703c935ac7a83d60022965d28709814da98ee1ed3a1ccad07d8a661f2a5199e4d8163cab WHIRLPOOL d856536066af23f518fd23ff206f23977d2a5d1299a574eb932af4dde557f90d500f6ca9f2f0f91e690427d67f961a18e0c64649b34038620f12c5114e29b6ea
+MISC ChangeLog 3912 SHA256 ee02f9bde4c22c30db660ec09b6b14e6d32d12d4bc671600737eac37e98a04e8 SHA512 1be5e3b3cdde03d5e5d574a2d9453c625e07c8cb45ed4cfdda82d4ca1825413fa104f815c3733d77156c1b165d37d18ce3b478844a08b47905a85b4940d1f6d8 WHIRLPOOL 60aded184cfbf3c5ca5d506afe65e61ad4192c92004fd77170f00fbb2bd0883f79e3c758f1ef8c2174b4a774926a6fd3fa3fc64365de7c6f8b4da506dfc17ce7
+MISC ChangeLog-2015 4778 SHA256 861784f63e0a92c2321b9099c3482b54d73f0ce6c80b504897f6aeb9a5b66a37 SHA512 aea39c3bd94163c6d9f5a4b1cd20d4939a6c7d5da88a51e761649a0faa4088721c4901aa8bf3eda60d7be42b5cbdf2ae3e9d01e5ba4c0743c5a0d3cf5e1d14ea WHIRLPOOL e31aef3adf5b57d4ef82099904a13af41c759e2a1141b6e1766ad0e61b413cfdc9912392482aa1fcf0787e2f63fb296b8f339e723bc7eeed4fbdd4117fe786dc
+MISC metadata.xml 448 SHA256 26275cebbdd852515068d9f44338892283453016ec1dde4bda012ea995bf9234 SHA512 550709d86ffcc37b3d63c8ebb4f871ea9fa1539a83fd5eb111d1585a0234b87e15e32ea19e5884fb7efce5fa556402fcf1c6f7bbb414256c2f940e8a4da33d5b WHIRLPOOL 88fd55aa2366dec670e661ef129ad0da936ee1414da4d22ab3c26ca0c948c5f1845f8e0e7ea1b73b611849da4aad33870a2daef3bd71079dab07e67a1003edb8
diff --git a/dev-python/pyelftools/metadata.xml b/dev-python/pyelftools/metadata.xml
new file mode 100644
index 000000000000..49f3b842095a
--- /dev/null
+++ b/dev-python/pyelftools/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vapier@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyelftools</remote-id>
+		<remote-id type="github">eliben/pyelftools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyelftools/pyelftools-0.24.ebuild b/dev-python/pyelftools/pyelftools-0.24.ebuild
new file mode 100644
index 000000000000..57e50c588117
--- /dev/null
+++ b/dev-python/pyelftools/pyelftools-0.24.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
+HOMEPAGE="https://pypi.python.org/pypi/pyelftools https://github.com/eliben/pyelftools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+python_test() {
+	# readelf_tests often fails due to host `readelf` changing output format
+	local t
+	for t in all_unittests examples_test ; do
+		"${PYTHON}" ./test/run_${t}.py || die "Tests fail with ${EPYTHON}"
+	done
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyemf/Manifest b/dev-python/pyemf/Manifest
new file mode 100644
index 000000000000..b3ea184b363a
--- /dev/null
+++ b/dev-python/pyemf/Manifest
@@ -0,0 +1,5 @@
+DIST pyemf-2.0.0.tar.gz 194995 SHA256 6960341434b9683926fba01f1fd81738234848c3f25883fa44c84b9833cf2354 SHA512 013f96356d48db95f9f6f89167d99573e40d8c594b3f6e3183b50d784b653b508662e3b652f8a76dccabeb3933009a06d5786e156284520683d6b3747f2dec66 WHIRLPOOL efdedb5e7707ff95cd628a837ee8e2a397f1b78444083feeeb22d9d621281cd4be934a3b2d85f08a6b7427b3c3463cbc5c2b0a2ee801b72bad0dfaaf50bb5404
+EBUILD pyemf-2.0.0.ebuild 488 SHA256 bcb2b5b7ad8a14e69f849b48ffbfd0819bfed2ece06eae5b4b002720ae697872 SHA512 20885afa71a6cab3a4f2dea48968fb4d264eb7d2f1ff26f8a55fc9091331db9a35f1653a65131de9c34beeb2168e9bff6fac32a87f956721e60b43363feb400e WHIRLPOOL e4d8b61a0570ad34b0a682fcca611f780bf70f685928d98773a7eb7736c7381341c30af169d183bc1a79b422ebc322d2f9a16713cb0226ce1a4d20bc26cdebb2
+MISC ChangeLog 2423 SHA256 cef59cf203267d9fbeb51c29eb6b78a0a03c5c154840ce9a8dbe9feb0eb1cfe6 SHA512 6174af8b1e54e26432f2c8d1e0cee202ceab4f542e67200f7426c7a0f25734f83290040bd55c8eb8948f792556970975ea27e507045229befeb7024a06db8575 WHIRLPOOL 4ddcb96341fb9c04a45d021e06242347b56fe8579919ff0a85057ead8b0dc6e2718b2170ccbff7c8664d10c889483103106d86b9547f52981ee1141735477561
+MISC ChangeLog-2015 545 SHA256 6842358ff3896605de66d42f21730c021380cabfb10089dbe61f8bfca6c61e99 SHA512 746e421320317b4a8f0adf227b38ea33fe1197a4769dc73f247387b236b7a2ff8f9a78bfb5ce523036a352a0f7e9e5be6239d85e6d087e540f71c5fa9a07c74b WHIRLPOOL 11d5928e63166d24358527fc99468617fa977aa72b77fb0ccf09ada410a330b11a45a3a049fdff63177f0dc776edd22e6d397381d3dd7f5986d0d56c41eeaa45
+MISC metadata.xml 730 SHA256 57c3d28e77925ae47933d7de07fa69eb3344fd0ad93a6c7b03e54c3a52951b14 SHA512 37a1462d32fc5d53b3f5fbcd665d9d84c37b242749c20ac1fcb944b2ffd22b6607dd40e09980b1e6a4a0962bae17f1103a2919a61588c3c6daee33567b70c869 WHIRLPOOL 7f3916830a6a9133b007a78e76b62488c381705835358eaa72fa1b663a263d5b93308d657cdbd4a494b7722643bbb96a92b544ca9126eae7a16e6b257d8662ba
diff --git a/dev-python/pyemf/metadata.xml b/dev-python/pyemf/metadata.xml
new file mode 100644
index 000000000000..8194b5815033
--- /dev/null
+++ b/dev-python/pyemf/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+  pyemf is a pure python module that provides a cross-platform ability
+  to generate enhanced metafiles (.emf files), a vector graphics
+  format defined by the ECMA-234 standard. Enhanced metafiles are a
+  natively supported image and scalable clip-art format in the
+  OpenOffice suite of tools and in Windows applications.
+</longdescription>
+	<upstream>
+		<remote-id type="pypi">pyemf</remote-id>
+		<remote-id type="sourceforge">pyemf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyemf/pyemf-2.0.0.ebuild b/dev-python/pyemf/pyemf-2.0.0.ebuild
new file mode 100644
index 000000000000..0268e6564994
--- /dev/null
+++ b/dev-python/pyemf/pyemf-2.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Pure Python Enhanced Metafile Library"
+HOMEPAGE="http://pyemf.sf.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
new file mode 100644
index 000000000000..e7a67eb6e77f
--- /dev/null
+++ b/dev-python/pyenchant/Manifest
@@ -0,0 +1,7 @@
+DIST pyenchant-1.6.6.tar.gz 64010 SHA256 25c9d2667d512f8fc4410465fdd2e868377ca07eb3d56e2b6e534a86281d64d3 SHA512 af6aa1ac77b5718ec4b4aad3d0b88d26e697b472ec8261b23b37fdbf6b399a120ccc3e4ee6579b884c44b0eeb3f95bcdbceea189105c05088a48400a0c8cdb90 WHIRLPOOL 72f6be0f5012fe467395aa9e55378d1aafcdab45e75d2ea2fb8b9bff9ab6aaccbe36806074381ed7c4703dcc93bcc24caf29830302b8986e89ffc29eb0b5042e
+DIST pyenchant-1.6.8.tar.gz 63693 SHA256 7ead2ee74f1a4fc2a7199b3d6012eaaaceea03fbcadcb5df67d2f9d0d51f050a SHA512 1a297cd279a0fbea2657bb42f2018a693b7f1d2da420f8cba436f680fb803282432f86e244a098eb7b9ef801059a3ee3c3bbaa748d30ea6357edf9f778e2f0a0 WHIRLPOOL 5a54fdc53867d726db9c92915dd2e09007a058ad4cf38f5a3964f6ad1ada796f032a07495a924c4311a13f8b2ad5e0d6ca6091b1ec1fb70056d40e68460eaf59
+EBUILD pyenchant-1.6.6.ebuild 754 SHA256 d99a999eabea90da5a43509894af112d6474e70aad2e8a5ce02528d079f4e43d SHA512 73d67c478e65e1f5e16ae5d585ee1555e6db37f2e88f02b10e4812d30a60659810422747bf5437fc562878799f3f0f464453e339b4a6e337b919d77ddb417902 WHIRLPOOL e368ece0206da84609fad51a57fd5926c044b9de6f696cdad158c9e21b2bac8c1de670991dbefaeea6b5136d63cf5eee2aea4fe3eef0e4999bbae6a6ee389ab6
+EBUILD pyenchant-1.6.8.ebuild 761 SHA256 bfcebdde91c949c567183a4e84988637a6b578e16e0707e7f3b86b5d46534b43 SHA512 9e52d116084bfb029c73b0017a5aa453f23bf8d14a52978688003ecfbbbc3b3ab65e301da7e8ac1c5329f00e05b46baa2ff53a107bf676987bd3f4351373e6d7 WHIRLPOOL 166db523add1d7e2dcc467d4aefb12d6cd28ee61c963c446ee31708bf14e217ab7ab6f00c502e09cde1d5af00d0d851fee87ca5326ca64f7cb22b9efb9857a9b
+MISC ChangeLog 3824 SHA256 896dc9e607fba231372884b2b69a3bb3d2d9943804b579c1415d846eca2f5d6e SHA512 8f7daa1496881b2312ec26000f7fbf7f1305097112777fd7264f036b37d43aa9c65026926d42f09d05321a794a67f0ea3e99629d91f4cbe7eb483262dff3530a WHIRLPOOL 3cc0358d5b829064e8ff3caa956f5530164eccc3d7b78c7091449a316bbd6ed66c44489bbba4d1c9b38d57c95b3b891535bf90b0fdb15fbef3d08b272f5d8469
+MISC ChangeLog-2015 6844 SHA256 0f688aa06f0821e697ece6e263838bbe71c40e187ab416d83f090601685d6b16 SHA512 9ef5fce89620c5a29463d849380b7558947ec076105ffb22133b50d3b0a27da9430151a298e0870342d9447a3f99c8dd02dd2de59dc1e28437ac13b8ed09182c WHIRLPOOL 0dcc94d939554bf66e3460fec545e265af6206fb3ea8770b19ef94ee1075c61f4113ee969e7bd2658fa9304eb585bb8ea1a123cd3a5d41fb03998f89d1f58e96
+MISC metadata.xml 825 SHA256 b0c4f3fb07db6158a4f69952dc5ae18ed9c8b79c9291cf62e0ddb1142f0e0e31 SHA512 1887ad3184d91296554b23083071e869fde5df89d313406d083ff64c154464d1b9f5e8f24e3c60175ac546d47f4607488613984362036f0e040d2796e70e3c41 WHIRLPOOL 57665fd4fb5ba9dfdc104c49e434c05451ebc58e03f977d6ba5c7622ce6bc90e73bd8f9b05664ac69ee49f25462036f65f58d0514ac6cbb25c1a38c7024f96b4
diff --git a/dev-python/pyenchant/metadata.xml b/dev-python/pyenchant/metadata.xml
new file mode 100644
index 000000000000..c85d97681c58
--- /dev/null
+++ b/dev-python/pyenchant/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">PyEnchant is a set of language bindings and some wrapper classes to
+		make the excellent Enchant spellchecker available as a Python
+		module. The bindings are generated using SWIG. It includes all the
+		functionality of Enchant with the flexibility of Python and a nice
+		'Pythonic' object-oriented interface. It also aims to provide some
+		higher-level functionality than is available in the C API.</longdescription>
+  <upstream>
+    <remote-id type="pypi">pyenchant</remote-id>
+    <remote-id type="sourceforge">pyenchant</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyenchant/pyenchant-1.6.6.ebuild b/dev-python/pyenchant/pyenchant-1.6.6.ebuild
new file mode 100644
index 000000000000..0c5bec8e0989
--- /dev/null
+++ b/dev-python/pyenchant/pyenchant-1.6.6.ebuild
@@ -0,0 +1,29 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the Enchant spellchecking system"
+HOMEPAGE="http://pyenchant.sourceforge.net https://pypi.python.org/pypi/pyenchant"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
+IUSE="test"
+
+RDEPEND=">=app-text/enchant-${PV%.*}"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	if [[ -n "$(LC_ALL="en_US.UTF-8" bash -c "" 2>&1)" ]]; then
+		ewarn "Disabling tests due to missing en_US.UTF-8 locale"
+	else
+		esetup.py test
+	fi
+}
diff --git a/dev-python/pyenchant/pyenchant-1.6.8.ebuild b/dev-python/pyenchant/pyenchant-1.6.8.ebuild
new file mode 100644
index 000000000000..4a9e1804c308
--- /dev/null
+++ b/dev-python/pyenchant/pyenchant-1.6.8.ebuild
@@ -0,0 +1,29 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the Enchant spellchecking system"
+HOMEPAGE="http://pyenchant.sourceforge.net https://pypi.python.org/pypi/pyenchant"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND=">=app-text/enchant-${PV%.*}"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	if [[ -n "$(LC_ALL="en_US.UTF-8" bash -c "" 2>&1)" ]]; then
+		ewarn "Disabling tests due to missing en_US.UTF-8 locale"
+	else
+		esetup.py test
+	fi
+}
diff --git a/dev-python/pyev/Manifest b/dev-python/pyev/Manifest
new file mode 100644
index 000000000000..3eb279f7328c
--- /dev/null
+++ b/dev-python/pyev/Manifest
@@ -0,0 +1,7 @@
+DIST pyev-0.8.1-4.04.tar.gz 623423 SHA256 5e634953c08d27141f7e64c0c85fb64ea9756545309073ea8cd5b0a7050950e5 SHA512 59fd8564445822c12032889c826ad148b15544462aa72d4658cc5887b5af3542e399d2d47767f935f8638836f9ba954e4c8ceef6f5f630e3ee035ba96d339e1d WHIRLPOOL a66bca355e6ff05730fd9ba51c66d6dd7bd343fa5ddfe83fb5f6a3cd1bf1216d8916249cc9f0310f2db37ad44a3bbc66547fa59fc5aca88e401f9f10f64be443
+DIST pyev-0.9.0.tar.gz 223943 SHA256 5d030a993cb0e9a74034e57b2e1e3f6378f25083bb886583badf68c0e800c665 SHA512 05eafd70b843be8ee84a9a384fea9f222445930de00c5a6ac38c6e798f22165914fab3825be8e98e84fa68fdfe9e477718190a6939737667868b4badeb1eafa8 WHIRLPOOL d89da560e0ab96996ec05b629ec5eb9f8c9efcbb147411658fad89e9a77aaa3e70a6c8b20bd0b2ad99619a363e0335a154de2fe1a519184cdc4e02343a077687
+EBUILD pyev-0.8.1.ebuild 629 SHA256 bdcc1543db4a05f9899d17aeb27a0fd0efc084993dbe995f45e9b21ccea066df SHA512 5b772aea3517f9fafd9be658b764adbdcaa5cc33b0e93ccb8bb98871b28e67f18d96dfd9207780b468234a45fa74a589173f559c493994c48aeb1104fb766346 WHIRLPOOL a688a633a7d836be81a7d836a9aa3d1aa0e35472ee97433d8757577de1436d82642c9648affcf051fb2681a9ad827e3bdeca025aea5731ef5de7e3170341b135
+EBUILD pyev-0.9.0.ebuild 529 SHA256 cb090d508db335ed8d9a724609df4bd5d090cfbc61456c39650fb3257199f4e8 SHA512 de87e2a1127dc25c2cdd42964b068806038654f4fe10c982ec93002d3aebc527d754cae203809fd05cc942428ea587be894f56e0ab58cea3254e4d7c0ac7dbfd WHIRLPOOL f6fc3827aab642747232fc5be9c86ddd101c63dc0b61327ed7d74dbe89a3810df682e76857e9b1a4aa5b5d45a274a982c5d6017d853b21c9858c469707ff81f4
+MISC ChangeLog 2785 SHA256 b948b7bef6cde0cd3601c527e236bfb860cc4ca0a44aa14acc8a117ebd60f019 SHA512 5590b4cd19cd7693c0449e9d7811908e70b184d4d2745410a828febe43901e4be9d7c92110c64647ef75a1e30324c2f0ffe095d07499e11979f9c89b7a3c2f2e WHIRLPOOL 89835a8f71289fe86554adde2d3af8f598670dc13e8b29b33f829787cb93cc2c8271c4a29d4021d8bb1ca52e88b718e782dc63de3568375453475f6df592b18a
+MISC ChangeLog-2015 1557 SHA256 289c4db9b4188405eb209875e2a288524bef407665dc4c3980b571c808c774f6 SHA512 06a60f67fc93d5fbfe83248e7b27237d4651f3db8aa08a451244fc677eef290ad35f3a8fbd0b0cdeafe3e5860c3bd4286ba9cf7845eeb326d5cbb41c14483f58 WHIRLPOOL 05c25f317283caf773b479ee159219e3670aae41f7a53ed16b2217fd7fda3941cd976eec70a7b76e717b4ba426e68a7f5561bcc468b60211d73500b86aa99c23
+MISC metadata.xml 625 SHA256 ab06e9ca9f81e14d41c4d371dc88ecc7a92c0c7570ed9907b7c05b719e0521a3 SHA512 1d2b2f6fea6f5af5e5d9d2a5a39129866bd70c6bc9ab630e21975ee675e58771b1fcd9072e068a82210be71b48b29961096cb8c8c63763dc1a5092981e5c7632 WHIRLPOOL 78ac4f8e00e85ea79f082f67fc16588eb84e538b0f1de841d078967af72bfd1d20b926d6d1a2294fdb612c19aef826c7988c0959f584c811b6b20d335c7aea80
diff --git a/dev-python/pyev/metadata.xml b/dev-python/pyev/metadata.xml
new file mode 100644
index 000000000000..f5d8d2d8b28c
--- /dev/null
+++ b/dev-python/pyev/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+	 Pyev is the python interface of <pkg>dev-libs/libev</pkg>
+	 which provides event loop, support select, poll, the
+	 Linux-specific epoll, and so on.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">pyev</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyev/pyev-0.8.1.ebuild b/dev-python/pyev/pyev-0.8.1.ebuild
new file mode 100644
index 000000000000..e842815355a8
--- /dev/null
+++ b/dev-python/pyev/pyev-0.8.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+MY_P=${P}-4.04
+
+DESCRIPTION="Python libev interface, an event loop"
+HOMEPAGE="https://code.google.com/p/pyev/
+	http://pythonhosted.org/pyev/"
+SRC_URI="mirror://pypi/p/pyev/${MY_P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+RDEPEND="dev-libs/libev
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+HTML_DOCS=( doc/. )
+
+python_prepare() {
+	distutils-r1_python_prepare
+}
diff --git a/dev-python/pyev/pyev-0.9.0.ebuild b/dev-python/pyev/pyev-0.9.0.ebuild
new file mode 100644
index 000000000000..6340dab78734
--- /dev/null
+++ b/dev-python/pyev/pyev-0.9.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python libev interface, an event loop"
+HOMEPAGE="https://code.google.com/p/pyev/
+	http://pythonhosted.org/pyev/"
+SRC_URI="mirror://pypi/p/pyev/${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+RDEPEND="dev-libs/libev"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+HTML_DOCS=( doc/. )
diff --git a/dev-python/pyface/Manifest b/dev-python/pyface/Manifest
new file mode 100644
index 000000000000..5e96e538c269
--- /dev/null
+++ b/dev-python/pyface/Manifest
@@ -0,0 +1,7 @@
+DIST pyface-4.4.0.tar.gz 486490 SHA256 270bc35a5364681b78569619917e1b5890150c882b455b52578f0c0752f3d3fc SHA512 62c93cbd5e956d56c03580876d5f9191210beb3d81cf8fcd0dfc6b2919263e4bf01219f1372e292fcac4462eaffb45cf9cde62dbe16265134b357dabc47d719d WHIRLPOOL 0596a09dad5a026c5726ef18b2c507a8adba1c2783d91f81cae0d5238b0d206f8486120c11824e6494153314749cfb812434e5e7c5ccd29cd231b2b2c9460aab
+DIST pyface-4.5.2.tar.gz 5089390 SHA256 3f909bcc3983ad707c69a83bc96858c52c4a0ff4a3358ce9acd7c3febd9c3410 SHA512 9f5f34960cce2180eec6c4ba1ef6e19069cb64a05db47644a70c1ff70b93927f80bc20f50cee72daf586722ad618bf19f53182986fef4b93ddb95d29f4a1fcbb WHIRLPOOL 80c85018dcfe7d2083a3484871d7ff7daf1fb136fe6bfede31ced4ca26020ab2c1d30434d145289b8c353bffa9014d108111de38c20e210c72c867af15813a8e
+EBUILD pyface-4.4.0.ebuild 1142 SHA256 dca429c7fafb196f7605657e295f5265f16a7af6e748fa50058a103a621abc84 SHA512 dbb05391c77b3f11bcb883821d5367fb888a88c7b514f98e1f1bf16a6bc06f31b27ea9d71820f9428ec47c927b696560b1b24997356a6a439198b68dc76fe42c WHIRLPOOL 4ab4023e7b8323f31e1b20acf84222ae584b499d1c3add911dfee854fefcc11f720d634c2971f8c8d4017adb1e6461830ac11b4099a8720038c9553d2b89ab85
+EBUILD pyface-4.5.2.ebuild 1255 SHA256 49fcf84b79c134d6e6a6e203bc11b571f556d0e4b6b92b5921724f67d2f6308c SHA512 a81c0cb5f6e8a800ba1ef18deba83ba38adf5f4d53b01cc27d90cc7507b94125a347ffe73133c9d3f7ca40e78e0b285a05a25fead8dc43bca9b044e67ce7d3bc WHIRLPOOL 9eebb88729603ed0882c1d366291f05bf5bd8c904aba13474a368735d0948993465d0ac815db57148c5a72e3cf66549fd5703eb95a69522ac2f0502ff0289556
+MISC ChangeLog 3112 SHA256 4240c7c26743204df5785092b971e8dedb2001049428167838e7cdc8f8476726 SHA512 d64d0ad1beab6c1e0fd7ee52707acbbe63f6bb5b57aba49ac720cb70794c815bf8d7a09374809a24f3745fec5677f3cc382e967264997a6496f9115287e60f00 WHIRLPOOL 40c256a7c9a8f44a6541128e87bab70700a3cafc011ab1eb9599dbc8a3acca2b53b3a94cb5170dfcfa1e70aa047e5cdcca71d52d6c8e58c1beb26995981b15e1
+MISC ChangeLog-2015 2488 SHA256 b2d57d99c822dd96d5f36a1db6f7db2c3111d8063cb029c26240fef84efb5af0 SHA512 3fc1b7b34e0af9ff7a289277d90ed281a51d4c003ee36a37f1521e0f061de8460e701a3e716a2b59fb9444d95e5b4d786dadd37c1293178a8db679d658b15207 WHIRLPOOL dd744ad4393cd301596a48480e653740467b1e9cdc178cba65abbb8d91a66ea680edcad8ba9f58c31466d61b419e7581a8987adfb613c361a73beb170ec820a9
+MISC metadata.xml 851 SHA256 1d1d9ff6d94049f9466896bd1d20825850348c5f1b2315423f83758c6f74c9d5 SHA512 a4e74c41f122d690f279ccb7cdf25cb06dfc187564e438dbe2ed94c912069e79dbfcb0c795a20371d75982207791273d37d37b9b54adbe4aaab079bb3a3d4e9c WHIRLPOOL 3fe16966aeb55b0c4984463df1ba0e49f7d0fba1107781fbb3f4b7f90c3e59002cd8ae3c7c5f73b04a63ed49ee08ca2936b8446d03e34d73217082c01e52606d
diff --git a/dev-python/pyface/metadata.xml b/dev-python/pyface/metadata.xml
new file mode 100644
index 000000000000..71665e5d0b75
--- /dev/null
+++ b/dev-python/pyface/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  The pyface project contains a toolkit-independent GUI abstraction
+  layer, which is used to support the "visualization" features of the
+  Traits package. Thus, you can write code in terms of the Traits API
+  (views, items, editors, etc.), and let pyface and your selected
+  toolkit and back-end take care of the details of displaying them.
+  The following GUI backends are supported:
+    * wxPython
+    * PyQt
+    * PySide
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">pyface</remote-id>
+    <remote-id type="github">enthought/pyface</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyface/pyface-4.4.0.ebuild b/dev-python/pyface/pyface-4.4.0.ebuild
new file mode 100644
index 000000000000..72229f597c35
--- /dev/null
+++ b/dev-python/pyface/pyface-4.4.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# https://github.com/enthought/pyface/issues/40 confirms only py2.7
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Enthought Tool Suite: Traits-capable windowing framework"
+HOMEPAGE="https://github.com/enthought/pyface"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/traits-4.1[${PYTHON_USEDEP}]
+	|| (
+		dev-python/wxpython:*[${PYTHON_USEDEP}]
+		dev-python/PyQt4[${PYTHON_USEDEP}]
+		dev-python/pyside[${PYTHON_USEDEP}]
+	)"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/traitsui[${PYTHON_USEDEP}]
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)"
+
+python_test() {
+	export ETS_TOOLKIT=qt4
+	export QT_API=pyqt
+	# set nosetests to ignore tests unpassable by these vars.
+	VIRTUALX_COMMAND="nosetests" virtualmake -v -I 'composite_grid_model_test_case*' \
+		-I 'simple_grid_model_test_case*' \
+		-I 'test_split_editor_area_pane*'
+}
diff --git a/dev-python/pyface/pyface-4.5.2.ebuild b/dev-python/pyface/pyface-4.5.2.ebuild
new file mode 100644
index 000000000000..a9a4621630c0
--- /dev/null
+++ b/dev-python/pyface/pyface-4.5.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# https://github.com/enthought/pyface/issues/40 confirms only py2.7
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Enthought Tool Suite: Traits-capable windowing framework"
+HOMEPAGE="https://github.com/enthought/pyface"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND="
+	>=dev-python/traits-4.1[${PYTHON_USEDEP}]
+	|| (
+		dev-python/wxpython:*[${PYTHON_USEDEP}]
+		dev-python/PyQt4[${PYTHON_USEDEP}]
+		dev-python/pyside[${PYTHON_USEDEP}]
+	)"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/traitsui[${PYTHON_USEDEP}]
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)"
+
+python_test() {
+	export ETS_TOOLKIT=qt4
+	export QT_API=pyqt
+	# set nosetests to ignore tests unpassable by these vars.
+	VIRTUALX_COMMAND="nosetests" virtualmake -v -I 'composite_grid_model_test_case*' \
+		-I 'simple_grid_model_test_case*' \
+		-I 'test_split_editor_area_pane*'
+}
+
+python_install_all() {
+	use examples && EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyfeyn/Manifest b/dev-python/pyfeyn/Manifest
new file mode 100644
index 000000000000..2cdb288009d8
--- /dev/null
+++ b/dev-python/pyfeyn/Manifest
@@ -0,0 +1,6 @@
+AUX pyfeyn-1.0.0.patch 1012 SHA256 3056469b6e76a4bb4d42e6520fbd11714980bd9f0cf66a8c75d8337902296920 SHA512 43811f881c479062af0376c9d3dbe440383599d7e6937481ad2ca8dbca3ff404ab8d04adaa4afcdf1c4eb001340ed1870a7f50730fbc3d4c458f5d6a1936cc73 WHIRLPOOL c497e997bd4e342fe7d8b2730a6f1af9a2fbbd74780d3104899080532ab514265974afd044e920ae9e5b8b06eb1628d0bf6d9426e2f35361147cc0d5629017d2
+DIST pyfeyn-1.0.0.tar.gz 27316 SHA256 134367ea91572bf6a73c188a86265989d7024cb2ab6647992037dc53ad0a5ce1 SHA512 edecbb61cbc63adb5d218cd53e45568f42aa018875bd57485afe612080300a16dd93d1dd0a1286b040a27aaf727a9e35e210f2a2edccaf9e6e114301a91c839a WHIRLPOOL 72db3deb968d4e8dc63d61843b856225b212cc6907649596a4bdfdbe9245dd97c85913f2d9fcf3de863fa1d4bcd5d758693fcf74d305b80278013d81024c7a3a
+EBUILD pyfeyn-1.0.0.ebuild 597 SHA256 8e5ae47566f7840d03ccdcfc22f98d1334307f39861c801159d816429f40c891 SHA512 82a18600952ad2a695b352911c80f91f9a9c1e5e85458e4c9936772b1a8e869feed15ebc7c363e3bf3fbbb66fa901ad89f13caff0aa48a7f12b3852458fe0659 WHIRLPOOL f48ffcbd58bc9705c09bbda4227eeda1134ab004ad5b1df9842faa3155aba8c2730a3d1c248021deb5dec7bcc1d18af84a8e24ef92b4cab98ebe023d5399f0e6
+MISC ChangeLog 3151 SHA256 2f9ceebc28e8dcf781953c5c53167427e66dbb9062d4d80730d523abb6b9addb SHA512 14e0b93981d17664e5aab97c92966413fa7c908ee7930edac7a3b624d4fcbb2e09ad8a0385bfe632c27ba0e22710f0b5cdc40090917cc4510d0fae5fa57739da WHIRLPOOL d946e8b91e18e0181c141701c77e0f1d724388d93a2e13f284d67c99286e316f8b7da1df7493982974a854e5a26848b3043ab4a1eb5ad2945577f7f0141fbe5c
+MISC ChangeLog-2015 974 SHA256 979d4b93a0bf65d335d5d93abf47462191b5e65701ac454f5dc207b39a9fb7f9 SHA512 fc0296325e6899ae87d63b666d1ec36132651aa7a0c7b69e2dacd4e5daae2e1d89307aaa0e7bfcdb7ea2c8706f1c063f2c350590a626f547f331b11483d7b64c WHIRLPOOL e9017dca931883a178419c77516b23b0f3e1850a7db5ce8180e3da8b98cbcd6a82d383de9a49a7ef14141bb1a531d51b62dbff1395d4ed8a16d1fc04806c6a29
+MISC metadata.xml 498 SHA256 6ab469c05a03e55422537e39b9b2abf5c01d904b7876bdb6df8826cb72bbd534 SHA512 19364d290277c99a31dc436a941d66d60a1829c2ffac855cc35c85e4923124d559c8310b0c87a8129d0115e482ba0ec13287e6f1994fb93ae43de969f9082751 WHIRLPOOL 0f994a32fe9c147d76ea41816f726727cabe4f5decc6155697148dd377d0bae8cb3b8146bafe5ce3b6a05ff948409d5af4cec67b95d1632d666b319b10ccb41b
diff --git a/dev-python/pyfeyn/files/pyfeyn-1.0.0.patch b/dev-python/pyfeyn/files/pyfeyn-1.0.0.patch
new file mode 100644
index 000000000000..0b4c29e74033
--- /dev/null
+++ b/dev-python/pyfeyn/files/pyfeyn-1.0.0.patch
@@ -0,0 +1,18 @@
+diff -r -U1 pyfeyn-1.0.0.orig/pyfeyn/feynml.py pyfeyn-1.0.0/pyfeyn/feynml.py
+--- pyfeyn-1.0.0.orig/pyfeyn/feynml.py	2016-02-09 22:48:29.000000000 +0100
++++ pyfeyn-1.0.0/pyfeyn/feynml.py	2016-02-14 13:11:16.034537778 +0100
+@@ -257,3 +257,3 @@
+         if self.root.tag != "feynml":
+-            raise "FeynML Error: <feynml> must be root element" % self.root.tag
++            raise Exception("FeynML Error: <feynml> must be root element" % self.root.tag)
+         for element in self.root:
+@@ -266,3 +266,3 @@
+             else:
+-                raise "FeynML Error: invalid top-level tag <%s>" % element.tag
++                raise Exception("FeynML Error: invalid top-level tag <%s>" % element.tag)
+ 
+@@ -328,3 +328,3 @@
+             except:
+-                raise "FeynML Error: invalid bend amount %s for <propagator> element"%element.attrib["bend"]
++                raise Exception("FeynML Error: invalid bend amount %s for <propagator> element"%element.attrib["bend"])
+         if "style" in element.attrib:
diff --git a/dev-python/pyfeyn/metadata.xml b/dev-python/pyfeyn/metadata.xml
new file mode 100644
index 000000000000..ef28dfdb1e96
--- /dev/null
+++ b/dev-python/pyfeyn/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grozin@gentoo.org</email>
+		<name>Andrey Grozin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>Python package for drawing Feynman diagrams
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">pyfeyn</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyfeyn/pyfeyn-1.0.0.ebuild b/dev-python/pyfeyn/pyfeyn-1.0.0.ebuild
new file mode 100644
index 000000000000..c10f8d9bc59f
--- /dev/null
+++ b/dev-python/pyfeyn/pyfeyn-1.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package for drawing Feynman diagrams"
+HOMEPAGE="http://pyfeyn.hepforge.org/ https://pypi.python.org/pypi/pyfeyn/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="latex"
+
+DEPEND=""
+RDEPEND=">=dev-python/pyx-0.14[${PYTHON_USEDEP}]
+	latex? ( || ( dev-texlive/texlive-mathscience dev-texlive/texlive-science ) )"
+
+PATCHES=( "${FILESDIR}"/${P}.patch )
diff --git a/dev-python/pyfire/Manifest b/dev-python/pyfire/Manifest
new file mode 100644
index 000000000000..fcdb4e4e358b
--- /dev/null
+++ b/dev-python/pyfire/Manifest
@@ -0,0 +1,5 @@
+DIST pyfire-0.3.4.tar.gz 15432 SHA256 cd7518f9277080423960205bc7b673648c939f250ad8f3e8d743b582a73ca963 SHA512 91dac47595b74cd1275f3c4e6e9717447605eb7576a94f2478b33de42e8d9e12f147a3759aec6801bb590cb8fe366cd23dfa0544adffea6dccd93ffe4ff399a8 WHIRLPOOL 9c395685e1d87e921e348ca8c59c9145928928b7678d61a5081be3d02e407b558a9292a1fae0334eb53bd0ff8ef8741621f18159d83015f2225758590bce393e
+EBUILD pyfire-0.3.4-r1.ebuild 536 SHA256 7b1944e34e7678ab6c3e4c66ac496bd87f11f52c48a7755eb38f9f8f301a47e7 SHA512 2a01d2c6637917447481bbcce685049511b1ac1d2a7da1455debd603ffc55aff2a945a3507bf8ed17324b7186130179588d8252a1246bcdb42c76a8a480cc6f5 WHIRLPOOL 2306bd0c4934fda2ca602387983b5558565af92a84b7f9366ad206aa26181955b18fcf7b8b00a1f0ce0355a8980e21a2bdc94197c11d7139db11aa2ab9371db8
+MISC ChangeLog 2181 SHA256 b363b4deebc2da54ac3ecf7928ac82dcb7597ee6c479ff91238d197e8d4fdf5d SHA512 59e29366de7a901f5e7b2a1c8304033ddc98d5bf607aaa4ee7b00078c1534221e7babfa9462103a23ab9fc949340714ebc9d39763d7f863e799f0e89213eaa79 WHIRLPOOL 49cfc67a8980cc64038bae3f474ebb70c94752a0bb00062bfea5150a6242034becca2d5387cd9166d09b198fcb37987626e5cdb48a64722d55a348589cc9ea1e
+MISC ChangeLog-2015 917 SHA256 3dd1931e3de7c6c849f339aeadbec85b270681d4f1b0fbd3555603bb4e940a04 SHA512 b45307ffbe721dce211abae6bf2fd3115bdbf4e46a219eda71653b005684238090e24c38380eaacb76e724be07c391ae3c67e505366a5897868e5c2875ae50ee WHIRLPOOL 15fabf7a6dc856a69b906c77507916a88c41e1c5156cad85f8ba7c71cbfca2b5b05f841347ad5473d3135d66338bc6664daef6321c9d0956a3347c5b0205d898
+MISC metadata.xml 326 SHA256 d36dfd7455c9f96dfc273e702f820efc32b77ce4c900e814ee6488317093f8ff SHA512 3a387dc8ca5a7fce8937c56990780f9aed1eb9631c5e638ad12b0885003645f6177135ae3cd5de67b68a5adca25bc395ce46d151c680d29cd13aa6077d91e03d WHIRLPOOL 0b3a94f9f3944448a5b9970a25c01289052cecae1a70e7861fa9f5fd47b0a3615387cc18f2a80e962388dc86010747be7ac55fe037f1b3fb047ef27be54082d9
diff --git a/dev-python/pyfire/metadata.xml b/dev-python/pyfire/metadata.xml
new file mode 100644
index 000000000000..490717a8d5e1
--- /dev/null
+++ b/dev-python/pyfire/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>pinkbyte@gentoo.org</email>
+    <name>Sergey Popov</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pyfire</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyfire/pyfire-0.3.4-r1.ebuild b/dev-python/pyfire/pyfire-0.3.4-r1.ebuild
new file mode 100644
index 000000000000..620b2235a9c1
--- /dev/null
+++ b/dev-python/pyfire/pyfire-0.3.4-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="A python implementation of the Campfire API"
+HOMEPAGE="http://www.pyfire.org/"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/twisted-web[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pyfits/Manifest b/dev-python/pyfits/Manifest
new file mode 100644
index 000000000000..8468290c1dc4
--- /dev/null
+++ b/dev-python/pyfits/Manifest
@@ -0,0 +1,11 @@
+AUX 01-system-cfitsio.patch 5038 SHA256 4247b506861a6cb801287cf8eab89ed835e4eba375023cded79febf2f77ffc30 SHA512 25369aaf360742b432cd9ad4b4d83c3875dad3eb89daf70483f4dd6a187777a0493f94f365fea171f4adf493d2d5bfcb2223bb362a3fc8aface750c3d29af5b5 WHIRLPOOL 11af1fbee5165f671f8a4cddf67eb4bcf0d21ada2b73381bb3851b76b52150b3d37540ae6c8133d45e0bdf0628bcc6e468d08c14aa708ea6eca978ece4cae756
+AUX 02-numpy-deprecation-warning.patch 902 SHA256 f4437cc094b32707a8ba54a7a318665840d1b61761f2c3dbc7343389e9eef983 SHA512 14123cd3ac5401fe29af59b4d03bc6b8cf2c3f17695cc4d34664298f0031748bc27ff52897e57032bd887743c9acda0c22af16b0a7362898d2d48984fe9c6a2a WHIRLPOOL e14a16165a80bd62ed44329be4eda1193172301e6dd1880dddadfb28631c5e75c90ff5776d5232c6df96c8b5f7405fc9cff1a9954d0cf403a4dcbcfb711e1c7c
+AUX 03-fix-for-cfitsio-3380.patch 1496 SHA256 b149f07548d32e2fe25dcfcf5c53ee471fd3394d11678defda27858ccb322c2a SHA512 f3a842f0c9701233e49b22ba6fa8f672fa6374e025614e9c071ea3a54d01033c0f930fc7649cfd42abe65482927b70246762b9f59992790bccf17bc0ce3e0fdc WHIRLPOOL 55339cf032a204ff8d0cadfa2cdc7d44c4b4b16c7185a2017214b4d5570b6f686bb0ac4277267b656974c932b919410bf9b75cd3ce85b3ccd42c184c3f00cd8a
+AUX pyfits-3.2.1-unbundle-cfitsio.patch 2676 SHA256 eca480bee2d736d79ca98992386d499d2d9ee980b998cbd516d2565c673834d4 SHA512 bea17130b7cb3f593ba8e24a699f4a2d58990ee4aace00117beb68498a56c662f90031a8843cb9b388e3dd757bf1efaf2596ba3a69bcc958e0a344e53d3c0675 WHIRLPOOL dcd0ca12b3df48a365b0d4471ef265bdee85b19a1bd0b69d05992144080ea7717cb74c9424656966337114156011220553488cd1788d08252ad94cff4e2ca09c
+DIST pyfits-3.3.tar.gz 1646403 SHA256 becb6dcc7e443138b9d239db7a0e8ad939e6e047c2c9ca86e84d0672da425fa1 SHA512 561fe61050e61745054e0e4712c4413e129293b062d2020219b61d648d7093ce6952e1f26da955a1bf570f76ba7eddeb1805c99f679300b072ef6bacc2e4c90a WHIRLPOOL 9b4b5dd236713359a9441e4179486e4b56ec11b7fc25c3abb59d30a6267fe87496601778731ba7ff92c55243621aa58ca493821b83224fde41a79f18c21e485b
+DIST pyfits-3.4.tar.gz 1692414 SHA256 ce0319cf6ef40846c5915202e4c8bd8d293ad85af4b14aa5a60fb285b7538c4b SHA512 b569f871f26dcd9cb2fbe9d823d55c525e8101b0fcf83fff4bc3f3ec4bc7f680953a29634518ea19383f533f5e23b3703fffdb4e0d577b1023b4323254ef3a7e WHIRLPOOL a121ca9b4d7b4457d24e905e8506402043679800eddc5c5813b68612bae1ee80940eb723f03504c9136fc5c2bac1a419aa52f87394689ae1099bb5002e77417e
+EBUILD pyfits-3.3-r1.ebuild 1872 SHA256 45f8d98303b90b2a19df869c723849b331418e57cd3b687bd9079b8433527f12 SHA512 22a8ddf7853578355b5b9985e9356a2ea138185d1b92df4b75c5200e0982ade63fa467f112b126585469fa1a24a862c575a6e1760731104175895e0d22fbf754 WHIRLPOOL e9d919075ee24707f06c1ef89986fe52fb64ea773b0847063838ef1c6d3d31f99e754994258f297ccac788b01e34a22bb7889b06eb499a84197b2eaa6dc552b0
+EBUILD pyfits-3.4-r1.ebuild 1952 SHA256 f2e55d8850fca01b00df49ec01a0f713c230f4b1bcb60dc38fbf9fd53bf34a39 SHA512 27845de2c8c478753a227012cae273de9ff48c782c899a4cff33554f83925a61513321e3ac4f1a51b27a65e7966204f6222842bc80d1bc054db937b6f06e87fe WHIRLPOOL d59c9d9f4e0b75315c21f1cc521cb4d93a50e38b8bd3080c59e7ff24d9db1504aa9586c89117644503e9f1e2ae65797f28faa4380876bfaeaf652b442193534d
+MISC ChangeLog 4296 SHA256 89ce92770228d0e14b050363999152a43c79f604a2cf1e53eaa12d60b5f399fa SHA512 e6f6f94b8905dc02e9da7f600897f783eb8e05dba6ac0ee15e9a101de37c10a40f6b7c8a350b97b93114744feb2c9b255478407c08a01651192090a8a8e80195 WHIRLPOOL d72ff27b5191a366ad0812aed4ee823c4a94a950b339511351827084a3e4344276c6665d1d4f25bccdf81caaba276f66d61b8b7359f41d251007cb0435a3e57a
+MISC ChangeLog-2015 7921 SHA256 b0e4d957b0c12457d5a19b722ad7ac0e258602f3cecf394a8c00fe60e4f4c640 SHA512 8b7ab9da6f24cedc37d3c732e9a63b8362aec24ea7568c643cbfdc6603a71c1fa2711fec707ef821cdd997ffbf0b3c18533fdb6c7daa9cc54314fdf9c0e59bec WHIRLPOOL 0a0d197572621fd841ae1bd3261ca728d780b2c3fd8602853e070772bc54eb5746e497fa7bc54521c45e62d4094b8dd5449c0710c38a3f792157aa97801eb648
+MISC metadata.xml 642 SHA256 d6b05d6a13e35af3b6151662e39c6a24d5422bd2ee2e15d6c854ce314799b06f SHA512 fd07a54d6f8273f7e16358da22be2f8484f74bacdeb78c35980046256800701b7fc53e7261074fb84651384f2e821ef3fbe62ba3674ca5fc6cd2fc176335da7c WHIRLPOOL 0d1fdd30fe3477040ee6872fce2b38f1e0ba8ce146ba558f499ed2d4bbc9a55b9e5abcd347618d30a5f1235f7079246d2be95f75803f2a8b187296b45946e101
diff --git a/dev-python/pyfits/files/01-system-cfitsio.patch b/dev-python/pyfits/files/01-system-cfitsio.patch
new file mode 100644
index 000000000000..f2ce935c7ea8
--- /dev/null
+++ b/dev-python/pyfits/files/01-system-cfitsio.patch
@@ -0,0 +1,176 @@
+From 70fe4dac3f68c3eed369d42e6a49e7865db8b250 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 10:31:01 -0700
+Subject: 01-system-cfitsio.diff
+
+Patch-Name: 01-system-cfitsio.diff
+---
+ setup.cfg | 145 +++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 73 insertions(+), 72 deletions(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index 3a05c62..3a64f33 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -40,81 +40,81 @@ scripts =
+ 
+ [extension=pyfits.compression]
+ sources = 
+-	cextern/cfitsio/adler32.c
+-	cextern/cfitsio/buffers.c
+-	cextern/cfitsio/cfileio.c
+-	cextern/cfitsio/checksum.c
+-	cextern/cfitsio/crc32.c
+-	cextern/cfitsio/deflate.c
+-	cextern/cfitsio/drvrfile.c
+-	cextern/cfitsio/drvrgsiftp.c
+-	cextern/cfitsio/drvrmem.c
+-	cextern/cfitsio/drvrnet.c
+-	cextern/cfitsio/drvrsmem.c
+-	cextern/cfitsio/editcol.c
+-	cextern/cfitsio/edithdu.c
+-	cextern/cfitsio/eval_f.c
+-	cextern/cfitsio/eval_l.c
+-	cextern/cfitsio/eval_y.c
+-	cextern/cfitsio/fitscore.c
+-	cextern/cfitsio/fits_hcompress.c
+-	cextern/cfitsio/fits_hdecompress.c
+-	cextern/cfitsio/getcolb.c
+-	cextern/cfitsio/getcol.c
+-	cextern/cfitsio/getcold.c
+-	cextern/cfitsio/getcole.c
+-	cextern/cfitsio/getcoli.c
+-	cextern/cfitsio/getcolj.c
+-	cextern/cfitsio/getcolk.c
+-	cextern/cfitsio/getcoll.c
+-	cextern/cfitsio/getcolsb.c
+-	cextern/cfitsio/getcols.c
+-	cextern/cfitsio/getcolui.c
+-	cextern/cfitsio/getcoluj.c
+-	cextern/cfitsio/getcoluk.c
+-	cextern/cfitsio/getkey.c
+-	cextern/cfitsio/group.c
+-	cextern/cfitsio/grparser.c
+-	cextern/cfitsio/histo.c
+-	cextern/cfitsio/imcompress.c
+-	cextern/cfitsio/infback.c
+-	cextern/cfitsio/inffast.c
+-	cextern/cfitsio/inflate.c
+-	cextern/cfitsio/inftrees.c
+-	cextern/cfitsio/iraffits.c
+-	cextern/cfitsio/modkey.c
+-	cextern/cfitsio/pliocomp.c
+-	cextern/cfitsio/putcolb.c
+-	cextern/cfitsio/putcol.c
+-	cextern/cfitsio/putcold.c
+-	cextern/cfitsio/putcole.c
+-	cextern/cfitsio/putcoli.c
+-	cextern/cfitsio/putcolj.c
+-	cextern/cfitsio/putcolk.c
+-	cextern/cfitsio/putcoll.c
+-	cextern/cfitsio/putcolsb.c
+-	cextern/cfitsio/putcols.c
+-	cextern/cfitsio/putcolu.c
+-	cextern/cfitsio/putcolui.c
+-	cextern/cfitsio/putcoluj.c
+-	cextern/cfitsio/putcoluk.c
+-	cextern/cfitsio/putkey.c
+-	cextern/cfitsio/quantize.c
+-	cextern/cfitsio/region.c
+-	cextern/cfitsio/ricecomp.c
+-	cextern/cfitsio/scalnull.c
+-	cextern/cfitsio/swapproc.c
+-	cextern/cfitsio/trees.c
+-	cextern/cfitsio/uncompr.c
+-	cextern/cfitsio/wcssub.c
+-	cextern/cfitsio/wcsutil.c
+-	cextern/cfitsio/zcompress.c
+-	cextern/cfitsio/zuncompress.c
+-	cextern/cfitsio/zutil.c
++#	cextern/cfitsio/adler32.c
++#	cextern/cfitsio/buffers.c
++#	cextern/cfitsio/cfileio.c
++#	cextern/cfitsio/checksum.c
++#	cextern/cfitsio/crc32.c
++#	cextern/cfitsio/deflate.c
++#	cextern/cfitsio/drvrfile.c
++#	cextern/cfitsio/drvrgsiftp.c
++#	cextern/cfitsio/drvrmem.c
++#	cextern/cfitsio/drvrnet.c
++#	cextern/cfitsio/drvrsmem.c
++#	cextern/cfitsio/editcol.c
++#	cextern/cfitsio/edithdu.c
++#	cextern/cfitsio/eval_f.c
++#	cextern/cfitsio/eval_l.c
++#	cextern/cfitsio/eval_y.c
++#	cextern/cfitsio/fitscore.c
++#	cextern/cfitsio/fits_hcompress.c
++#	cextern/cfitsio/fits_hdecompress.c
++#	cextern/cfitsio/getcolb.c
++#	cextern/cfitsio/getcol.c
++#	cextern/cfitsio/getcold.c
++#	cextern/cfitsio/getcole.c
++#	cextern/cfitsio/getcoli.c
++#	cextern/cfitsio/getcolj.c
++#	cextern/cfitsio/getcolk.c
++#	cextern/cfitsio/getcoll.c
++#	cextern/cfitsio/getcolsb.c
++#	cextern/cfitsio/getcols.c
++#	cextern/cfitsio/getcolui.c
++#	cextern/cfitsio/getcoluj.c
++#	cextern/cfitsio/getcoluk.c
++#	cextern/cfitsio/getkey.c
++#	cextern/cfitsio/group.c
++#	cextern/cfitsio/grparser.c
++#	cextern/cfitsio/histo.c
++#	cextern/cfitsio/imcompress.c
++#	cextern/cfitsio/infback.c
++#	cextern/cfitsio/inffast.c
++#	cextern/cfitsio/inflate.c
++#	cextern/cfitsio/inftrees.c
++#	cextern/cfitsio/iraffits.c
++#	cextern/cfitsio/modkey.c
++#	cextern/cfitsio/pliocomp.c
++#	cextern/cfitsio/putcolb.c
++#	cextern/cfitsio/putcol.c
++#	cextern/cfitsio/putcold.c
++#	cextern/cfitsio/putcole.c
++#	cextern/cfitsio/putcoli.c
++#	cextern/cfitsio/putcolj.c
++#	cextern/cfitsio/putcolk.c
++#	cextern/cfitsio/putcoll.c
++#	cextern/cfitsio/putcolsb.c
++#	cextern/cfitsio/putcols.c
++#	cextern/cfitsio/putcolu.c
++#	cextern/cfitsio/putcolui.c
++#	cextern/cfitsio/putcoluj.c
++#	cextern/cfitsio/putcoluk.c
++#	cextern/cfitsio/putkey.c
++#	cextern/cfitsio/quantize.c
++#	cextern/cfitsio/region.c
++#	cextern/cfitsio/ricecomp.c
++#	cextern/cfitsio/scalnull.c
++#	cextern/cfitsio/swapproc.c
++#	cextern/cfitsio/trees.c
++#	cextern/cfitsio/uncompr.c
++#	cextern/cfitsio/wcssub.c
++#	cextern/cfitsio/wcsutil.c
++#	cextern/cfitsio/zcompress.c
++#	cextern/cfitsio/zuncompress.c
++#	cextern/cfitsio/zutil.c
+ 	src/compressionmodule.c
+ include_dirs = 
+ 	numpy
+-	cextern/cfitsio
++#	cextern/cfitsio
+ extra_compile_args = 
+ 	-Wno-declaration-after-statement
+ 	-Wno-unused-variable
+@@ -125,6 +125,7 @@ extra_compile_args =
+ 	-Wno-unused
+ 	-Wno-comments
+ 	-Wno-switch
++libraries = cfitsio
+ optional = True
+ fail_message = 
+ 	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/dev-python/pyfits/files/02-numpy-deprecation-warning.patch b/dev-python/pyfits/files/02-numpy-deprecation-warning.patch
new file mode 100644
index 000000000000..026e6b829d4d
--- /dev/null
+++ b/dev-python/pyfits/files/02-numpy-deprecation-warning.patch
@@ -0,0 +1,24 @@
+From 90cac05f8a5436a8dd3714ad29e2d81eb8b4d39b Mon Sep 17 00:00:00 2001
+From: Aurelien Jarno <aurelien@aurel32.net>
+Date: Tue, 2 Feb 2016 22:41:09 +0100
+Subject: Avoid DeprecationWarning from Numpy.
+
+Patch-Name: 02-numpy-deprecation-warning.diff
+---
+ pyfits/tests/test_division.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/pyfits/tests/test_division.py b/pyfits/tests/test_division.py
+index da4df72..aa93264 100644
+--- a/pyfits/tests/test_division.py
++++ b/pyfits/tests/test_division.py
+@@ -18,7 +18,8 @@ class TestDivisionFunctions(PyfitsTestCase):
+         a1 = np.rec.array(
+             s,
+             dtype=np.dtype([('c1', '>i4'), ('c2', '|S3'),
+-                         ('c3', '>f4'), ('c4', '|i1')]))
++                         ('c3', '>f4'), ('c4', '|i1')]),
++            shape=len(s) // 12)
+ 
+     def test_card_with_continue(self):
+         h = fits.PrimaryHDU()
diff --git a/dev-python/pyfits/files/03-fix-for-cfitsio-3380.patch b/dev-python/pyfits/files/03-fix-for-cfitsio-3380.patch
new file mode 100644
index 000000000000..d0fac84d1e22
--- /dev/null
+++ b/dev-python/pyfits/files/03-fix-for-cfitsio-3380.patch
@@ -0,0 +1,43 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Update image tests for cfitsio 3.380
+ Make TFORMx check more flexible. The maximal column length in cfitsio
+ changed between version 3370 and 3380. This patch checks their syntax,
+ without a specific length.
+ .
+ HCOMPRESSed images are allowed to deviate from the original by about
+ 1/quantize_level of the RMS in each tile. This patch changes the absolute
+ identity test
+Bug: https://github.com/astropy/astropy/issues/4646
+Bug: https://github.com/astropy/astropy/issues/4647
+Bug-Debian: https://bugs.debian.org/816595
+--- a/pyfits/tests/test_image.py
++++ b/pyfits/tests/test_image.py
+@@ -2,6 +2,7 @@
+ 
+ import math
+ import os
++import re
+ import time
+ import warnings
+ 
+@@ -1014,7 +1015,7 @@
+         hdu.writeto(self.temp('test.fits'))
+ 
+         with fits.open(self.temp('test.fits')) as hdul:
+-            assert (hdul['SCI'].data == cube).all()
++            assert np.abs(hdul['SCI'].data - cube).max() < 1./15.
+ 
+     def test_subtractive_dither_seed(self):
+         """
+@@ -1269,8 +1270,8 @@
+ 
+         with fits.open(self.temp('test.fits'),
+                        disable_image_compression=True) as h:
+-            assert h[1].header['TFORM1'] == '1PB(30)'
+-            assert h[1].header['TFORM2'] == '1PB(359)'
++            assert re.match(r'^1PB\(\d+\)$', h[1].header['TFORM1'])
++            assert re.match(r'^1PB\(\d+\)$', h[1].header['TFORM2'])
+ 
+     def test_compression_update_header(self):
+         """Regression test for
+
diff --git a/dev-python/pyfits/files/pyfits-3.2.1-unbundle-cfitsio.patch b/dev-python/pyfits/files/pyfits-3.2.1-unbundle-cfitsio.patch
new file mode 100644
index 000000000000..a5d7e6217486
--- /dev/null
+++ b/dev-python/pyfits/files/pyfits-3.2.1-unbundle-cfitsio.patch
@@ -0,0 +1,98 @@
+--- setup.cfg.orig	2014-03-10 10:50:38.200531959 -0700
++++ setup.cfg	2014-03-10 10:52:19.288232002 -0700
+@@ -36,92 +36,12 @@
+ 
+ [extension=pyfits.compression]
+ sources = 
+-	cextern/cfitsio/adler32.c
+-	cextern/cfitsio/buffers.c
+-	cextern/cfitsio/cfileio.c
+-	cextern/cfitsio/checksum.c
+-	cextern/cfitsio/crc32.c
+-	cextern/cfitsio/deflate.c
+-	cextern/cfitsio/drvrfile.c
+-	cextern/cfitsio/drvrgsiftp.c
+-	cextern/cfitsio/drvrmem.c
+-	cextern/cfitsio/drvrnet.c
+-	cextern/cfitsio/drvrsmem.c
+-	cextern/cfitsio/editcol.c
+-	cextern/cfitsio/edithdu.c
+-	cextern/cfitsio/eval_f.c
+-	cextern/cfitsio/eval_l.c
+-	cextern/cfitsio/eval_y.c
+-	cextern/cfitsio/fitscore.c
+-	cextern/cfitsio/fits_hcompress.c
+-	cextern/cfitsio/fits_hdecompress.c
+-	cextern/cfitsio/getcolb.c
+-	cextern/cfitsio/getcol.c
+-	cextern/cfitsio/getcold.c
+-	cextern/cfitsio/getcole.c
+-	cextern/cfitsio/getcoli.c
+-	cextern/cfitsio/getcolj.c
+-	cextern/cfitsio/getcolk.c
+-	cextern/cfitsio/getcoll.c
+-	cextern/cfitsio/getcolsb.c
+-	cextern/cfitsio/getcols.c
+-	cextern/cfitsio/getcolui.c
+-	cextern/cfitsio/getcoluj.c
+-	cextern/cfitsio/getcoluk.c
+-	cextern/cfitsio/getkey.c
+-	cextern/cfitsio/group.c
+-	cextern/cfitsio/grparser.c
+-	cextern/cfitsio/histo.c
+-	cextern/cfitsio/imcompress.c
+-	cextern/cfitsio/infback.c
+-	cextern/cfitsio/inffast.c
+-	cextern/cfitsio/inflate.c
+-	cextern/cfitsio/inftrees.c
+-	cextern/cfitsio/iraffits.c
+-	cextern/cfitsio/modkey.c
+-	cextern/cfitsio/pliocomp.c
+-	cextern/cfitsio/putcolb.c
+-	cextern/cfitsio/putcol.c
+-	cextern/cfitsio/putcold.c
+-	cextern/cfitsio/putcole.c
+-	cextern/cfitsio/putcoli.c
+-	cextern/cfitsio/putcolj.c
+-	cextern/cfitsio/putcolk.c
+-	cextern/cfitsio/putcoll.c
+-	cextern/cfitsio/putcolsb.c
+-	cextern/cfitsio/putcols.c
+-	cextern/cfitsio/putcolu.c
+-	cextern/cfitsio/putcolui.c
+-	cextern/cfitsio/putcoluj.c
+-	cextern/cfitsio/putcoluk.c
+-	cextern/cfitsio/putkey.c
+-	cextern/cfitsio/quantize.c
+-	cextern/cfitsio/region.c
+-	cextern/cfitsio/ricecomp.c
+-	cextern/cfitsio/scalnull.c
+-	cextern/cfitsio/swapproc.c
+-	cextern/cfitsio/trees.c
+-	cextern/cfitsio/uncompr.c
+-	cextern/cfitsio/wcssub.c
+-	cextern/cfitsio/wcsutil.c
+-	cextern/cfitsio/zcompress.c
+-	cextern/cfitsio/zuncompress.c
+-	cextern/cfitsio/zutil.c
+ 	src/compressionmodule.c
+ include_dirs = 
+ 	numpy
+-	cextern/cfitsio
+-extra_compile_args = 
+-	-Wno-declaration-after-statement
+-	-Wno-unused-variable
+-	-Wno-parentheses
+-	-Wno-uninitialized
+-	-Wno-format
+-	-Wno-strict-prototypes
+-	-Wno-unused
+-	-Wno-comments
+-	-Wno-switch
+-optional = True
++libraries =
++	cfitsio
++optional = False
+ fail_message = 
+ 	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ 	Failed to build PyFITS tile compression support.  PyFITS will still
diff --git a/dev-python/pyfits/metadata.xml b/dev-python/pyfits/metadata.xml
new file mode 100644
index 000000000000..4e1c8e2ff441
--- /dev/null
+++ b/dev-python/pyfits/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  PyFITS provides an interface to FITS formatted files under the
+  Python scripting language and PyRAF, the Python-based interface to
+  IRAF.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">pyfits</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyfits/pyfits-3.3-r1.ebuild b/dev-python/pyfits/pyfits-3.3-r1.ebuild
new file mode 100644
index 000000000000..89e2e58b9adc
--- /dev/null
+++ b/dev-python/pyfits/pyfits-3.3-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 eutils multilib
+
+DESCRIPTION="Provides an interface to FITS formatted files under python"
+HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/cfitsio:0="
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/d2to1-0.2.5[${PYTHON_USEDEP}]
+	>=dev-python/stsci-distutils-0.3[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' 'python*')
+		dev-python/sphinxcontrib-programoutput[${PYTHON_USEDEP}]
+		dev-python/stsci-sphinxext[${PYTHON_USEDEP}]
+		 )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2.1-unbundle-cfitsio.patch )
+
+python_prepare_all() {
+	sed -i \
+		-e "s/\(hook_package_dir = \)lib/\1$(get_libdir)/g" \
+		"${S}"/setup.cfg || die
+
+	# https://github.com/spacetelescope/PyFITS/issues/95
+	sed \
+		-e "s/except UserWarning, w/except UserWarning as w/" \
+		-i lib/pyfits/scripts/fitscheck.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	nosetests --verbose || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	local binary
+	for binary in "${ED}"/usr/bin/* "${D}$(python_get_scriptdir)"/*; do
+		einfo "Renaming ${binary} to ${binary}-${PN}"
+		mv ${binary}{,-${PN}} || die "failed renaming"
+	done
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	DOCS=( FAQ.txt CHANGES.txt )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyfits/pyfits-3.4-r1.ebuild b/dev-python/pyfits/pyfits-3.4-r1.ebuild
new file mode 100644
index 000000000000..e19f2090613d
--- /dev/null
+++ b/dev-python/pyfits/pyfits-3.4-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 eutils multilib
+
+DESCRIPTION="Provides an interface to FITS formatted files under python"
+HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/cfitsio:0="
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/d2to1-0.2.5[${PYTHON_USEDEP}]
+	>=dev-python/stsci-distutils-0.3[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' 'python*')
+		dev-python/sphinxcontrib-programoutput[${PYTHON_USEDEP}]
+		dev-python/stsci-sphinxext[${PYTHON_USEDEP}]
+		 )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/01-system-cfitsio.patch
+		  "${FILESDIR}"/02-numpy-deprecation-warning.patch
+		  "${FILESDIR}"/03-fix-for-cfitsio-3380.patch )
+
+python_prepare_all() {
+	sed -e "s/\(hook_package_dir = \)lib/\1$(get_libdir)/g" \
+		-i "${S}"/setup.cfg || die
+
+	# https://github.com/spacetelescope/PyFITS/issues/95
+	sed -e "s/except UserWarning, w/except UserWarning as w/" \
+		-i pyfits/scripts/fitscheck.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	nosetests --verbose || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	local binary
+	for binary in "${ED}"/usr/bin/* "${D}$(python_get_scriptdir)"/*; do
+		einfo "Renaming ${binary} to ${binary}-${PN}"
+		mv ${binary}{,-${PN}} || die "failed renaming"
+	done
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	DOCS=( FAQ.txt CHANGES.txt )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
new file mode 100644
index 000000000000..58024078f47d
--- /dev/null
+++ b/dev-python/pyflakes/Manifest
@@ -0,0 +1,16 @@
+AUX 1.0.0-fix-pypy-tests.patch 9242 SHA256 fe0ba7b792e54ff3208ad73f2f1350e9654689259121292c74ca3ba9709e8519 SHA512 4772c32ea90e163030953f3ade2bd2434a10cf0e3c9234f4acaf596a44a812581ba92ef1498998566a7bf78e1bb8c7051260ebf8aca4ca2cd3a04e21e307bbfc WHIRLPOOL a03c86520964ae7a2e48ccc0d532a6e1c2182792cb745438cfdeb4e8144f7a3e112723a6958ea20ce38a610299a68501783f3e3b4c1650463ae485eb94f0bb92
+DIST pyflakes-0.7.2.tar.gz 30107 SHA256 e971804569e26a120ded70ca94882cbbf360390538fc3b5861f8ccecaf291178 SHA512 9f50c78ae47f55e30ed264b351325321f6c5d889ca6b2c7509d6c5cb029e27c230849cecc729bb18664cc2eb3d003a38a2e7a20f48563b6fa72c621a783bea64 WHIRLPOOL b23d09999a550784769444fdb1f3592dd54b1938b73e1ec40951eab5d3fad3dc80c0c79fbaa31e1544d74b5c8bcd96ca2f01ee83e0e79d8bfb6228308c20ae4c
+DIST pyflakes-0.8.1.tar.gz 32981 SHA256 3fa80a10b36d51686bf7744f5dc99622cd5c98ce8ed64022e629868aafc17769 SHA512 b9843637891f3e82a8430121395ceb4ec5df48b5ba73b96a307ebcb4a393e8cebee1681e094ee1f71a85b58bd2f32562b78fbd61d3fa85634f3ac448b1244637 WHIRLPOOL 0939b6ded3659e53316e6707ca5bf57a6702073c376df611a6a473c43ada36ee8822c9bbf2e106cc1836b46f04ce90612f4ebc73c6cb2d557aa6edb89d0eb949
+DIST pyflakes-1.0.0.tar.gz 35365 SHA256 f39e33a4c03beead8774f005bd3ecf0c3f2f264fa0201de965fce0aff1d34263 SHA512 89a9ee2e5be87d32d5c259c0cb88bbeadb96d27a3bc5eb3cf6f86afa51907ea01107a5336decbf003679b7de65ed9a16d7fbf55a457e0c9bbb1b53500f719bcb WHIRLPOOL c4700fcb9f9a62ed8e38db5c2fb7376b1d03e85b1e1f9fb7d570eb905249337f204664fd87a94b32701c0c67fa8624749d36b64721cb0425bad36ded5da26cdb
+DIST pyflakes-1.2.3.tar.gz 44776 SHA256 2e4a1b636d8809d8f0a69f341acf15b2e401a3221ede11be439911d23ce2139e SHA512 e0b49b4cd388b39c4f4f5ab836520cfc2ee940ce24de084fbeca0a2f13beca23b3ca89741e297a6f450d211ec27ebd91a7d23a80105e50d14960a3888d7693f2 WHIRLPOOL adf0d723bf79591d9cd321925bf3974a4456c864bbe7144260c6c99efa76399c0ba3bb25d7322a9e16621b2226a58899731a19b9971f55c27cb19757c5c6781e
+DIST pyflakes-1.5.0.tar.gz 47526 SHA256 aa0d4dff45c0cc2214ba158d29280f8fa1129f3e87858ef825930845146337f4 SHA512 32a676bab3ee7e528b7425b4b9dd5f4e5bdf57c983e2eac9e46f029b98683a55a5281b08886a0ced464db5b5d52213a00822ee86096098a4c55828ffa229b501 WHIRLPOOL 7a1b5ef9632d92eaab931e254a99df755dcf72811b13418cfd31785505defb5c36036bae2a73536dde1d70bbe1395b894b9c9ac85b0b0d00f506d213ba365b08
+DIST pyflakes-1.6.0.tar.gz 48184 SHA256 8d616a382f243dbf19b54743f280b80198be0bca3a5396f1d2e1fca6223e8805 SHA512 7e9c2aad6ebed638a1354cef51c7e1f68b25e59f8caf4694997a9afecd7cd8baa629a9363297ac0d961430f007fd22dcae7dae1bcbd7838a3b5d4285063bc7c5 WHIRLPOOL 403008f6e047a0ed365be383da0224697fc06dce5078c1e284ae30d15b92fccdb43fcf65af8fb5b372511344b5c0a83b67aba184eabba9165bfdd2c552c81046
+EBUILD pyflakes-0.7.2.ebuild 718 SHA256 d44c00a8b5177c117d7038a50f8783768c75bbccf8045ecb54f7e7200c585fdc SHA512 5e57b51f4370dd6b1f23e269dd17548424058e80e340d7e75d915188dd8fdf002c3f54be6df4c2c911a7ff51abe9fa8bb439127c3c4d37e30e69d117117848ab WHIRLPOOL 84abbeba1878e5df81f5ced0e4e5a50e7eb535353badb8a1ae702877f48665baece77e208fda87bce0f95352056c602f57380262094e5e1be5a9f0a97d1b260b
+EBUILD pyflakes-0.8.1.ebuild 736 SHA256 5d217b8bf0a72329987d904ca54f790ebbd11b13f4155cbbae75400bb06f2bf1 SHA512 4e3b513ee627ccdfd3a23efee00e6622c9b150b29ec88ab4589d76fe8f13bc7c602d74f505484eac92cdbe65c386c2c92ed00d998a02c0628fb6aefbf8673bb5 WHIRLPOOL 4f5e93d1597cc285a74cad74b0a917b9b5a05fcfca0907cc22d889ce618bd279fcc7e20d847e201d53fc7de51703852a0da9eddcaf8f5c59cc66bd7ce9b09722
+EBUILD pyflakes-1.0.0.ebuild 767 SHA256 5c129da5867218f4e16882396c80ee0d821078ccbe321f7429cb4eea82068e65 SHA512 98b81862a97d297990feefdab5d2aaec5fac235b7a723a292b7ff41631e1c2144e3ee681b4970c5eb931f2fa0e2ea24ca7d85832d56dc54899a33905e0eadf73 WHIRLPOOL 48dc57ed640c99deb4a4d7173cca1da01af5607064bc9bd830c32acd42361f7785edbb05cbdb8a75db9fd0f622a02861ad04d3a8dfd5db9c2790fbaa2c38eb33
+EBUILD pyflakes-1.2.3.ebuild 709 SHA256 007c1973daa456034826455f2096b83697e322c66e0c58a44f24cd1234f452b1 SHA512 24d34c8c7530f19c76d5a75c72126748b42b5a0eaed26c4fc21a6d2a901499f0fb09f6ceb8aeaa0fe0e2c1e6212611c0d9907ed39589374ef6b473643b9c1fdd WHIRLPOOL 1261a984c57140e7acbe01204d68de9083e92945d21e6180c46f59898fb37c616251d79c2c1c2bab9c959876c2b5e475c9d91d034213fd1e504920769c2344cb
+EBUILD pyflakes-1.5.0.ebuild 717 SHA256 49be12d715363bcace7305941621b02e699c582b68b568fb400c95729ab5ba0f SHA512 5cffe6808c05eceb56a75e9342f526d973ebd9a5008ed758cfa0deb156e671712b4e90dd720a161082fb84103b7086e5aabc2ab11d6405942736edd4dde97e2b WHIRLPOOL 2bc33cf0f36a7ac728bf467d05430f72dc8b9315b38cb75432e4d2aef5bde9c5815e7881162ec2b24aefbd5891ba1eb1bd0277d8c0aa5308eaadc0e13837d917
+EBUILD pyflakes-1.6.0.ebuild 720 SHA256 4a21b03eca9c137105cdcdaa6fa5472b57bdfa5df20b744a4776bfe8f6c1e89d SHA512 04cc9198347eed5b153a793b12a64c7cad24fcf19395cbe238d416771829099a439ca8c15295f9e822900d5b482148294c1e2879948804f63843b4a7ae280508 WHIRLPOOL 0d288961ac0ceae827780c607566c066803b589ffd21ba2b69879bf358ca6c11cf2825b91ebb526fab0f5ca45e0b2832ca8a011086df10d285103375fcec24e5
+MISC ChangeLog 5089 SHA256 819ca1642ab7a9ead72f88aa9b6fc32564a3e9e84e6cde15d8966fe691d3085b SHA512 537999ec9dc0708b07dd2c35935fbd9740d774268c6549a33633b8aaddc309d967e7fbf9327b68019984a740dc1c9d6c3607a4d0785a6c88a102b8b1131e110a WHIRLPOOL 989383545aeb6e292b94f568d4b8329291150b38c478b6c9ac01a3300e2e34dcb5ec463ddf4f1eb4ceaba95b1f5738378812c83091a8d4c2cbf4d35d8b54be7d
+MISC ChangeLog-2015 7279 SHA256 b8c0cf5b4b6aa2161fb3479721495248780a975febcacbbe5741163fb49d6b29 SHA512 8edef4e7ef1dd626b972b39b3483f0af4e6b6b55b21e9cc479904f5124091e417357b1f050cf6a99ec853716721055dac35d5dda4cfd14e5008fb1a289f39d68 WHIRLPOOL e1fd24feb36b9288832ce8142a8163c0c8091fc4f061e1c4aa7adce749975e73707cbd16e4c7bcfb3d43c3fd373b429a63141b0db29f4d38e5a31f1e00b8cfba
+MISC metadata.xml 738 SHA256 7aa2ef6c33d3aaf502b07157e6fac3f6eeb492893e0c9ebe95c987a81a666606 SHA512 6ac45c3c5d1fd3eeae5c8ad9950a2c97ef31d0bb72e6034a1f8b75d2a28e997660df20719431ee138a76544942bc20d609fb6e4a26a77f0ef30f912c6d2c0257 WHIRLPOOL 867ff1a503f3c1ed84cb8696689a7c1cfa96f9d18ed638f43cc5d0573392f414f31a1097e8ce097141374a8e677de67d282428c92759e562f7650dc013a6fbdc
diff --git a/dev-python/pyflakes/files/1.0.0-fix-pypy-tests.patch b/dev-python/pyflakes/files/1.0.0-fix-pypy-tests.patch
new file mode 100644
index 000000000000..41d1fa8ca86d
--- /dev/null
+++ b/dev-python/pyflakes/files/1.0.0-fix-pypy-tests.patch
@@ -0,0 +1,282 @@
+#https://github.com/jayvdb/pyflakes/commit/3088ffbd6256521e0213b361bc2294c1e218e6fb
+diff --git a/pyflakes/api.py b/pyflakes/api.py  #index 3bc2330..2a46a0d 100644
+--- a/pyflakes/api.py
++++ b/pyflakes/api.py
+@@ -41,6 +41,18 @@ def check(codeString, filename, reporter=None):
+
+         (lineno, offset, text) = value.lineno, value.offset, value.text
+ 
++        if checker.PYPY:
++            if text is None:
++                lines = codeString.splitlines()
++                if len(lines) >= lineno:
++                    text = lines[lineno - 1]
++                    if sys.version_info >= (3, ) and isinstance(text, bytes):
++                        try:
++                            text = text.decode('ascii')
++                        except UnicodeDecodeError:
++                            text = None
++            offset -= 1
++
+         # If there's an encoding problem with the file, the text is None.
+         if text is None:
+             # Avoid using msg, since for the only known case, it contains a
+diff --git a/pyflakes/checker.py b/pyflakes/checker.py
+index 753fa9b..f538d3f 100644
+--- a/pyflakes/checker.py
++++ b/pyflakes/checker.py
+@@ -11,6 +11,12 @@
+ PY2 = sys.version_info < (3, 0)
+ PY32 = sys.version_info < (3, 3)    # Python 2.5 to 3.2
+ PY33 = sys.version_info < (3, 4)    # Python 2.5 to 3.3
++try:
++    sys.pypy_version_info
++    PYPY = True
++except AttributeError:
++    PYPY = False
++
+ builtin_vars = dir(__import__('__builtin__' if PY2 else 'builtins'))
+ 
+ try:
+@@ -594,8 +600,13 @@ def getDocstring(self, node):
+             node = node.value
+         if not isinstance(node, ast.Str):
+             return (None, None)
+-        # Computed incorrectly if the docstring has backslash
+-        doctest_lineno = node.lineno - node.s.count('\n') - 1
++
++        if PYPY:
++            doctest_lineno = node.lineno - 1
++        else:
++            # Computed incorrectly if the docstring has backslash
++            doctest_lineno = node.lineno - node.s.count('\n') - 1
++
+         return (node.s, doctest_lineno)
+ 
+     def handleNode(self, node, parent):
+@@ -642,6 +653,8 @@ def handleDoctests(self, node):
+                 tree = compile(example.source, "<doctest>", "exec", ast.PyCF_ONLY_AST)
+             except SyntaxError:
+                 e = sys.exc_info()[1]
++                if PYPY:
++                    e.offset += 1
+                 position = (node_lineno + example.lineno + e.lineno,
+                             example.indent + 4 + (e.offset or 0))
+                 self.report(messages.DoctestSyntaxError, node, position)
+diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py
+index 34a59bc..d2a5036 100644
+--- a/pyflakes/test/test_api.py
++++ b/pyflakes/test/test_api.py
+@@ -23,6 +23,14 @@
+     from io import StringIO
+     unichr = chr
+ 
++try:
++    sys.pypy_version_info
++    PYPY = True
++except AttributeError:
++    PYPY = False
++
++ERROR_HAS_COL_NUM = ERROR_HAS_LAST_LINE = sys.version_info >= (3, 2) or PYPY
++
+ 
+ def withStderrTo(stderr, f, *args, **kwargs):
+     """
+@@ -312,18 +320,25 @@ def evaluate(source):
+             evaluate(source)
+         except SyntaxError:
+             e = sys.exc_info()[1]
+-            self.assertTrue(e.text.count('\n') > 1)
++            if not PYPY:
++                self.assertTrue(e.text.count('\n') > 1)
+         else:
+             self.fail()
+ 
+         sourcePath = self.makeTempFile(source)
++
++        if PYPY:
++            message = 'EOF while scanning triple-quoted string literal'
++        else:
++            message = 'invalid syntax'
++
+         self.assertHasErrors(
+             sourcePath,
+             ["""\
+-%s:8:11: invalid syntax
++%s:8:11: %s
+     '''quux'''
+           ^
+-""" % (sourcePath,)])
++""" % (sourcePath, message)])
+ 
+     def test_eofSyntaxError(self):
+         """
+@@ -331,13 +346,22 @@ def test_eofSyntaxError(self):
+         syntax error reflects the cause for the syntax error.
+         """
+         sourcePath = self.makeTempFile("def foo(")
+-        self.assertHasErrors(
+-            sourcePath,
+-            ["""\
++        if PYPY:
++            result = """\
++%s:1:7: parenthesis is never closed
++def foo(
++      ^
++""" % (sourcePath,)
++        else:
++            result = """\
+ %s:1:9: unexpected EOF while parsing
+ def foo(
+         ^
+-""" % (sourcePath,)])
++""" % (sourcePath,)
++
++        self.assertHasErrors(
++            sourcePath,
++            [result])
+ 
+     def test_eofSyntaxErrorWithTab(self):
+         """
+@@ -345,13 +369,16 @@ def test_eofSyntaxErrorWithTab(self):
+         syntax error reflects the cause for the syntax error.
+         """
+         sourcePath = self.makeTempFile("if True:\n\tfoo =")
++        column = 5 if PYPY else 7
++        last_line = '\t   ^' if PYPY else '\t     ^'
++
+         self.assertHasErrors(
+             sourcePath,
+             ["""\
+-%s:2:7: invalid syntax
++%s:2:%s: invalid syntax
+ \tfoo =
+-\t     ^
+-""" % (sourcePath,)])
++%s
++""" % (sourcePath, column, last_line)])
+ 
+     def test_nonDefaultFollowsDefaultSyntaxError(self):
+         """
+@@ -364,8 +391,8 @@ def foo(bar=baz, bax):
+     pass
+ """
+         sourcePath = self.makeTempFile(source)
+-        last_line = '       ^\n' if sys.version_info >= (3, 2) else ''
+-        column = '8:' if sys.version_info >= (3, 2) else ''
++        last_line = '       ^\n' if ERROR_HAS_LAST_LINE else ''
++        column = '8:' if ERROR_HAS_COL_NUM else ''
+         self.assertHasErrors(
+             sourcePath,
+             ["""\
+@@ -383,8 +410,8 @@ def test_nonKeywordAfterKeywordSyntaxError(self):
+ foo(bar=baz, bax)
+ """
+         sourcePath = self.makeTempFile(source)
+-        last_line = '            ^\n' if sys.version_info >= (3, 2) else ''
+-        column = '13:' if sys.version_info >= (3, 2) else ''
++        last_line = '            ^\n' if ERROR_HAS_LAST_LINE else ''
++        column = '13:' if ERROR_HAS_COL_NUM or PYPY else ''
+ 
+         if sys.version_info >= (3, 5):
+             message = 'positional argument follows keyword argument'
+@@ -407,8 +434,15 @@ def test_invalidEscape(self):
+         sourcePath = self.makeTempFile(r"foo = '\xyz'")
+         if ver < (3,):
+             decoding_error = "%s: problem decoding source\n" % (sourcePath,)
++        elif PYPY:
++            # pypy3 only
++            decoding_error = """\
++%s:1:6: %s: ('unicodeescape', b'\\\\xyz', 0, 2, 'truncated \\\\xXX escape')
++foo = '\\xyz'
++     ^
++""" % (sourcePath, 'UnicodeDecodeError')
+         else:
+-            last_line = '      ^\n' if ver >= (3, 2) else ''
++            last_line = '      ^\n' if ERROR_HAS_LAST_LINE else ''
+             # Column has been "fixed" since 3.2.4 and 3.3.1
+             col = 1 if ver >= (3, 3, 1) or ((3, 2, 4) <= ver < (3, 3)) else 2
+             decoding_error = """\
+@@ -474,8 +508,21 @@ def test_misencodedFileUTF8(self):
+ x = "%s"
+ """ % SNOWMAN).encode('utf-8')
+         sourcePath = self.makeTempFile(source)
++
++        if PYPY and sys.version_info < (3, ):
++            message = ('\'ascii\' codec can\'t decode byte 0xe2 '
++                       'in position 21: ordinal not in range(128)')
++            result = """\
++%s:0:0: %s
++x = "\xe2\x98\x83"
++        ^\n""" % (sourcePath, message)
++
++        else:
++            message = 'problem decoding source'
++            result = "%s: problem decoding source\n" % (sourcePath,)
++
+         self.assertHasErrors(
+-            sourcePath, ["%s: problem decoding source\n" % (sourcePath,)])
++            sourcePath, [result])
+ 
+     def test_misencodedFileUTF16(self):
+         """
+diff --git a/pyflakes/test/test_doctests.py b/pyflakes/test/test_doctests.py
+index f15acb8..6793da9 100644
+--- a/pyflakes/test/test_doctests.py
++++ b/pyflakes/test/test_doctests.py
+@@ -1,3 +1,4 @@
++import sys
+ import textwrap
+ 
+ from pyflakes import messages as m
+@@ -11,6 +12,12 @@
+ from pyflakes.test.test_undefined_names import Test as TestUndefinedNames
+ from pyflakes.test.harness import TestCase, skip
+ 
++try:
++    sys.pypy_version_info
++    PYPY = True
++except AttributeError:
++    PYPY = False
++
+ 
+ class _DoctestMixin(object):
+ 
+@@ -273,12 +280,22 @@ def doctest_stuff():
+         exc = exceptions[0]
+         self.assertEqual(exc.lineno, 4)
+         self.assertEqual(exc.col, 26)
++
++        # PyPy error column offset is 0,
++        # for the second and third line of the doctest
++        # i.e. at the beginning of the line
+         exc = exceptions[1]
+         self.assertEqual(exc.lineno, 5)
+-        self.assertEqual(exc.col, 16)
++        if PYPY:
++            self.assertEqual(exc.col, 13)
++        else:
++            self.assertEqual(exc.col, 16)
+         exc = exceptions[2]
+         self.assertEqual(exc.lineno, 6)
+-        self.assertEqual(exc.col, 18)
++        if PYPY:
++            self.assertEqual(exc.col, 13)
++        else:
++            self.assertEqual(exc.col, 18)
+ 
+     def test_indentationErrorInDoctest(self):
+         exc = self.flakes('''
+@@ -289,7 +306,10 @@ def doctest_stuff():
+             """
+         ''', m.DoctestSyntaxError).messages[0]
+         self.assertEqual(exc.lineno, 5)
+-        self.assertEqual(exc.col, 16)
++        if PYPY:
++            self.assertEqual(exc.col, 13)
++        else:
++            self.assertEqual(exc.col, 16)
+ 
+     def test_offsetWithMultiLineArgs(self):
+         (exc1, exc2) = self.flakes(
+
diff --git a/dev-python/pyflakes/metadata.xml b/dev-python/pyflakes/metadata.xml
new file mode 100644
index 000000000000..e863869c3e50
--- /dev/null
+++ b/dev-python/pyflakes/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+		PyFlakes is a Lint-like tool for Python, like PyChecker. It is focused
+		on identifying common errors quickly without executing Python code.
+
+		Its primary advantage over PyChecker is that it is fast. You don't have
+		to sit around for minutes waiting for the checker to run; it runs on
+		most large projects in only a few seconds.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">pyflakes</remote-id>
+		<remote-id type="github">PyCQA/pyflakes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyflakes/pyflakes-0.7.2.ebuild b/dev-python/pyflakes/pyflakes-0.7.2.ebuild
new file mode 100644
index 000000000000..b63540d566e5
--- /dev/null
+++ b/dev-python/pyflakes/pyflakes-0.7.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=(python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Passive checker for Python programs"
+HOMEPAGE="https://launchpad.net/pyflakes https://pypi.python.org/pypi/pyflakes"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
+
+python_test() {
+	# a known failure of 1 test in py3.2.4
+	# https://bugs.launchpad.net/pyflakes/+bug/1172463
+	esetup.py test --quiet
+}
diff --git a/dev-python/pyflakes/pyflakes-0.8.1.ebuild b/dev-python/pyflakes/pyflakes-0.8.1.ebuild
new file mode 100644
index 000000000000..9b0e88b8032e
--- /dev/null
+++ b/dev-python/pyflakes/pyflakes-0.8.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Passive checker for Python programs"
+HOMEPAGE="https://launchpad.net/pyflakes https://pypi.python.org/pypi/pyflakes"
+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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS=(AUTHORS NEWS.txt README.rst)
+
+python_test() {
+	esetup.py test --quiet
+}
diff --git a/dev-python/pyflakes/pyflakes-1.0.0.ebuild b/dev-python/pyflakes/pyflakes-1.0.0.ebuild
new file mode 100644
index 000000000000..0b5513325c1c
--- /dev/null
+++ b/dev-python/pyflakes/pyflakes-1.0.0.ebuild
@@ -0,0 +1,25 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Passive checker for Python programs"
+HOMEPAGE="https://launchpad.net/pyflakes https://pypi.python.org/pypi/pyflakes"
+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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PV}-fix-pypy-tests.patch )
+
+python_test() {
+	esetup.py test --quiet
+}
diff --git a/dev-python/pyflakes/pyflakes-1.2.3.ebuild b/dev-python/pyflakes/pyflakes-1.2.3.ebuild
new file mode 100644
index 000000000000..89265903f844
--- /dev/null
+++ b/dev-python/pyflakes/pyflakes-1.2.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Passive checker for Python programs"
+HOMEPAGE="https://launchpad.net/pyflakes https://pypi.python.org/pypi/pyflakes"
+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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	esetup.py test --quiet
+}
diff --git a/dev-python/pyflakes/pyflakes-1.5.0.ebuild b/dev-python/pyflakes/pyflakes-1.5.0.ebuild
new file mode 100644
index 000000000000..9a96c68de75a
--- /dev/null
+++ b/dev-python/pyflakes/pyflakes-1.5.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Passive checker for Python programs"
+HOMEPAGE="https://launchpad.net/pyflakes https://pypi.python.org/pypi/pyflakes"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	esetup.py test --quiet
+}
diff --git a/dev-python/pyflakes/pyflakes-1.6.0.ebuild b/dev-python/pyflakes/pyflakes-1.6.0.ebuild
new file mode 100644
index 000000000000..8cb89ccd8342
--- /dev/null
+++ b/dev-python/pyflakes/pyflakes-1.6.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Passive checker for Python programs"
+HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.python.org/pypi/pyflakes"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	esetup.py test --quiet
+}
diff --git a/dev-python/pyflann/Manifest b/dev-python/pyflann/Manifest
new file mode 100644
index 000000000000..bc8cef459ab1
--- /dev/null
+++ b/dev-python/pyflann/Manifest
@@ -0,0 +1,8 @@
+DIST flann-1.8.4-src.zip 561057 SHA256 dfbb9321b0d687626a644c70872a2c540b16200e7f4c7bd72f91ae032f445c08 SHA512 47ac6be66e3ec7303d28febc5a4cea2f8d1b3d81c3b7081f27cf17936074e06e91e30123569b41269a2b97c9960274dc485a575d77c1a386e8f539a76a8d3a0a WHIRLPOOL f7722d8c0a8482809920927353421ebb578464fe6746a4dba20a6c7b6f941715529d5be33aebd1726db36eae3b5d4080c6ae86b0f807e6e384af32b87735b83b
+DIST flann-1.8.4-testdata.tar.xz 26744244 SHA256 4eaecf3a221ea6611e841fa2f459a17b6a5fdd633338bb5bc46c434e37667141 SHA512 f2bee5e2dfe2fbb42953df563f178b67639b62e26fc31be14e07c196ba3e84db21804e594af44991f7cf45ca5e10ff753093cf160abf33e90d19735a9a0b51cb WHIRLPOOL e49e5a594464955241ebc9bdfa908bac8b93b2fb465fc08ab73ec4d57194a8b71361ecb67985cdc641013fb8c3fb51ea2033769f41e558ab86e8f71e477b97da
+DIST flann-1.9.1.tar.gz 485391 SHA256 b23b5f4e71139faa3bcb39e6bbcc76967fbaf308c4ee9d4f5bfbeceaa76cc5d3 SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7 WHIRLPOOL 40c16b3b2d8ef458676c37a246ae1c0d45d14163a42a46172283cf20a377ee43971e7cacce9d575cc7ecfa0eab01377dbd5e592e3e7ae71e74334af18ebab836
+EBUILD pyflann-1.8.4.ebuild 1241 SHA256 dad21a71cf8908847973b71acc24b5df8fcebc9384b986a42106a21e490f83d8 SHA512 9eb93ba7cb4ccbc94f201757a546f929da0bc0eb3e86910669b8fcffdc05b4649bcf5985273e724539cf91d06b6c417099a604db862dbc598c3c1c99f8928c08 WHIRLPOOL 78c6f7f3f9bfe47381e5d53ced0553205e79d29d6d0078e76f41c9ddae27ea3f4196539c54f72ed3a7a700d011117b5c64a4f61f1d64f6167db6df7562c21aaa
+EBUILD pyflann-1.9.1.ebuild 891 SHA256 a5ba3ea36ee1c5a9c341beab0f97622e94f2b20b6f1c81a4d4bc83bd1ed62a1a SHA512 6a3c8349eefbaaefcdbe806eabbc28c48af88fd71121ca135b18c5ca67bc9028844509c852fc8b9e3629355b2aecbd5c3f269aba6c0ec885cea0d91a283b1b69 WHIRLPOOL 672d1fc18958e86a8e35a959612912ae3c2adfd86a9075e5317275b81f8890c7b40a6068b4fa8608efeb5bd2c6db88c73aa00b0558f59a57f75b7edba969a6a0
+MISC ChangeLog 2831 SHA256 dd448c2203e0c228318d7754cd5d816870ffce683e3152de6cf49d3d0b519d65 SHA512 53daa8245ed99285646550ac8257a97ddcd97e7e26b83948c091d37550ed864afbe1dfc73ed70cd8a7b8316a71de42edcc5520bae4dd91c01c7752a5738dc837 WHIRLPOOL e41d6cd7e3e7d99845547b656f40cb2c2054ac3226027a61c926129516072cf888b2748946726100d355831a0e99022a3d123ca663f7c6c2e52d1c38e17686b2
+MISC ChangeLog-2015 696 SHA256 ed9e7c3dc56969512a79332a665ff3cdac8c918486ed6a69ec7295f051d3b3d3 SHA512 6d7feca7b912a4b5e7af7590dcd0f176b7446eb57c89f6a35b049db2e6285a6464c70c4d3c34ee3201328ab18452a212fe81734ffc2aaaa57cb7cf1bb9fa1cf0 WHIRLPOOL 8ba014bea46512b0db972093445640fea579efc4083c616f43cadd5d1401e564410cdcf7f789de19fabc47663ada48aadad03193befe10bafea65c387cdf0dee
+MISC metadata.xml 761 SHA256 71ba6ad880ae450b5cd6446e2c20a3df247d7fa11a553709512ee479eaa2f26e SHA512 e76c36229178e3b37c9b37c77f1e0ce322b8e717bb5c025d28fe538c31d8d021744d7eaf91804d39e62c35e5a1f420197d03be53e362836a2c47c24622932c4d WHIRLPOOL 0be441126d8795b8550dc71092f93cd506584b88a13c78088b3bd040178ef2d838a5bbdf16228e75ce38934d8e4935e887417a5ccad2edcccba380fb6cfc49ee
diff --git a/dev-python/pyflann/metadata.xml b/dev-python/pyflann/metadata.xml
new file mode 100644
index 000000000000..4c7f3d2276e1
--- /dev/null
+++ b/dev-python/pyflann/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">
+  FLANN is a library for performing fast approximate nearest neighbor
+  searches in high dimensional spaces. It contains a collection of
+  algorithms we found to work best for nearest neighbor search and a
+  system for automatically choosing the best algorithm and optimum
+  parameters depending on the dataset.
+  This is the python binding package split from the main package.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">mariusmuja/flann</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyflann/pyflann-1.8.4.ebuild b/dev-python/pyflann/pyflann-1.8.4.ebuild
new file mode 100644
index 000000000000..43f4060e2d8f
--- /dev/null
+++ b/dev-python/pyflann/pyflann-1.8.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for FLANN artificial neural network library"
+HOMEPAGE="http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN/"
+SRC_URI="http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-${PV}-src.zip
+	test? ( https://dev.gentoo.org/~bicatali/distfiles/flann-${PV}-testdata.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	~sci-libs/flann-${PV}"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/flann-${PV}-src/src/python"
+
+python_prepare_all() {
+	sed -e "s/@FLANN_VERSION@/${PV}/" \
+		-e '/package_d/d' \
+		-e "s/,.*'pyflann.lib'//" \
+		setup.py.tpl >> setup.py
+
+	use test && ln -s "${WORKDIR}"/testdata/* "${WORKDIR}"/flann-${PV}-src/test/
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cd "${WORKDIR}"/flann-${PV}-src/test/
+	local t
+	#for t in test*.py; do
+	# test_autotune buggy
+	for t in test_{nn,nn_index,index_save,clustering}.py; do
+		einfo "Running ${t}"
+		PYTHONPATH="${BUILD_DIR}/lib" ${EPYTHON} ${t} || die
+	done
+}
diff --git a/dev-python/pyflann/pyflann-1.9.1.ebuild b/dev-python/pyflann/pyflann-1.9.1.ebuild
new file mode 100644
index 000000000000..44dcefe8be44
--- /dev/null
+++ b/dev-python/pyflann/pyflann-1.9.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for FLANN artificial neural network library"
+HOMEPAGE="http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN/"
+SRC_URI="https://github.com/mariusmuja/flann/archive/${PV}.tar.gz -> flann-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	~sci-libs/flann-${PV}"
+DEPEND="${RDEPEND}"
+# TODO:
+# readd dependencies for test suite,
+# requires repackaging auto-downloaded files
+
+S="${WORKDIR}/flann-${PV}/src/python"
+
+python_prepare_all() {
+	sed -e "s/@FLANN_VERSION@/${PV}/" \
+		-e '/package_d/d' \
+		-e "s/,.*'pyflann.lib'//" \
+		setup.py.tpl >> setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyfltk/Manifest b/dev-python/pyfltk/Manifest
new file mode 100644
index 000000000000..a2be08c52c1a
--- /dev/null
+++ b/dev-python/pyfltk/Manifest
@@ -0,0 +1,7 @@
+AUX fltk_wrap.patch 247 SHA256 bfd4102207c4b4a9432eb3df56e6ede637c1c3c8dc782f08bee85362b60150b0 SHA512 4097f9a657f0cb96e37620b939edb35f4cfcb28b2be643b87f85e5dde8ff9a4f316052cbd5403396698de3e2034bafd164c7111c890a5b6d6bcf818185342bcb WHIRLPOOL 83b5cdd02f8b746c7c9453c9baf2a4c17ab87fe70fa9020d9b25700cd944dba24bd88d541941285cb76cb9f274647e3058bca929c3017f3e8df1d3beba4abd15
+AUX ignore-func.patch 250 SHA256 933c2fa902100598eaa8f93b94db9e2d869b01278a37682585665f981b0de2b7 SHA512 66854b2ce487d1182ada54b437ad79ea5395d87e4b08d89c9ed85b67b21d426609406201c19914e0872ee558d3b3109d3b43a7af036ffb98b781e07731239419 WHIRLPOOL 3c4d6268917d2bc4889698673b53ed2f78ac399dab893bc2a0f1dd6ca9da4b11acad30866f2d951d3b48cc1cc4ca78a38774d6aa12b148deee775383ca7edad0
+DIST pyFltk-1.3.3.tar.gz 946763 SHA256 246b92c99b8d5610532456a4c956b355f6140514324916cf35efbe6468c4a188 SHA512 dd4bbef8e82d455237dd085622e78e046ac522449fe63610ee5405c24d759482a89aeab07435fefb5223db78cc1f810f1eca8355afb1d0ff3e4b5e10b73bef8f WHIRLPOOL 8d94349db36cd78eeee722e75c9e1cef088e0f2743bd522eb0496f76faf70a159d6987902f308478a992bd7f2cb62a5bb770a80eee25c3e9feaf08b513956ce1
+EBUILD pyfltk-1.3.3.ebuild 1093 SHA256 f5ea3f7302e5bfd0fb657040872deb8160b12d473f75b79876c02f846e0d2eda SHA512 a7c5436323ca5720e87f13311777e99c9fcb6b9445301f308214cf91dba8d86ed12e6c2d82c49111e3b4606f1d999662b8b7a23c261cd58eae23d1408aabbfb9 WHIRLPOOL 2247415aea62dd2c1bd6a9c555e55a44421985fb9b74daab4e34a963f52aafde95ab16c4250d2f5a2416accaeff565bb936b5b88503191adb7c32ce4d531ed6b
+MISC ChangeLog 5514 SHA256 e9ddaf3ff59348b04ca3d1d266f4341ba1f4b7c1691ddc90e53613de6c5bca2c SHA512 dc0763c809ffa7097eede541eb237bd8ed2a558d91428e891b6e5651c1e065df73bb533e550078369b893957486157e001581afc72e71439e4a7cd80720c693a WHIRLPOOL 0faf488e6cccb010c7ac6e5e3c1d21d952c392fd4f5482d56054e3ceffd61409ec99c04668b9c785818e57cd1a3be869321589227a13423f80584806eca26bd1
+MISC ChangeLog-2015 6681 SHA256 0ee5ff2a44b0ebe6692533fd65762f296a88fdcc38482a459e36aec6374c09e7 SHA512 e0301510f15bb89359f47cf2c628e7c5f324e16a310d0a8ab4a22918b89e34866db97107d9709850c2261d333b4adedd1fe29bb1402420e44848c78e8e28875f WHIRLPOOL 1bb0a7ee5d2c6fe474579b861e5911352289bd6d6f70748472b42e31e1777bf65c83429c103c94240fa8a570f22cb821fdcd3a798d0062c61c8bcbfdb7e9109d
+MISC metadata.xml 472 SHA256 8174124557c601b128bc2d9fa81cfe371af36f5b867177332b2f31e3e810b85c SHA512 da7ed2d0b264b2a7864f9acd72248c4bd45aa243009265af3c7e5bb6c46c0ac584e02e8c77c1e4eabe05e212e10ab685684f071d73046fe0146149ecf79912eb WHIRLPOOL 5c7b611aea0b5229008ae61163a9b5b21a0d18ae67549e0326c9b31c9ac8afc17f75e61d5057b7209b65b8baec7ea582ce0492a49c2d37e460b6fc09fc8985fe
diff --git a/dev-python/pyfltk/files/fltk_wrap.patch b/dev-python/pyfltk/files/fltk_wrap.patch
new file mode 100644
index 000000000000..e0c7ba3a4133
--- /dev/null
+++ b/dev-python/pyfltk/files/fltk_wrap.patch
@@ -0,0 +1,14 @@
+--- a/python/fltk_wrap.cpp
++++ b/python/fltk_wrap.cpp
+@@ -144,7 +144,9 @@
+ # define _SCL_SECURE_NO_DEPRECATE
+ #endif
+ 
+-
++int _fl_filename_isdir_quick(const char *n)  {
++    return 0;
++}
+ 
+ /* Python.h has to appear first */
+ #include <Python.h>
+
diff --git a/dev-python/pyfltk/files/ignore-func.patch b/dev-python/pyfltk/files/ignore-func.patch
new file mode 100644
index 000000000000..4c3ff48fce54
--- /dev/null
+++ b/dev-python/pyfltk/files/ignore-func.patch
@@ -0,0 +1,12 @@
+https://sourceforge.net/p/pyfltk/code/506/
+
+--- a/swig/filename.i
++++ b/swig/filename.i
+@@ -14,6 +14,7 @@
+ %ignore fl_alphasort;
+ %ignore fl_casealphasort;
+ %ignore fl_casenumericsort;
++%ignore _fl_filename_isdir_quick;
+ 
+ %include "FL/filename.H"
+ 
diff --git a/dev-python/pyfltk/metadata.xml b/dev-python/pyfltk/metadata.xml
new file mode 100644
index 000000000000..68eed5608414
--- /dev/null
+++ b/dev-python/pyfltk/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+  Python wrapper for the Fast Light Tool Kit cross-platform graphical
+  user-interface library, using SWIG.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">pyfltk</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
new file mode 100644
index 000000000000..c668e2245748
--- /dev/null
+++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# FIXME: MakeSwig.py execution should be made work from pyfltk-1.1.5.ebuild
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="pyFltk-${PV}"
+MY_P="pyFltk-${PV}_py3"
+
+DESCRIPTION="Python interface to Fltk library"
+HOMEPAGE="http://pyfltk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz -> ${MY_PN}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86"
+IUSE="doc"
+
+DEPEND="
+	>=x11-libs/fltk-1.3.0:1[opengl]
+	!dev-python/pyfltk:1
+	"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_PN}
+
+PATCHES=(
+	"${FILESDIR}"/ignore-func.patch
+	"${FILESDIR}"/fltk_wrap.patch
+	)
+
+python_prepare_all() {
+	# Disable installation of documentation and tests.
+	sed -i -e '/package_data=/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( fltk/docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyformance/Manifest b/dev-python/pyformance/Manifest
new file mode 100644
index 000000000000..e656bc33053d
--- /dev/null
+++ b/dev-python/pyformance/Manifest
@@ -0,0 +1,5 @@
+DIST pyformance-0.3.4.tar.gz 19394 SHA256 a9294ec48b57711ad60af0badf1354c0e28364e82d2579a0d3d3afbf845547ac SHA512 5dbc83da62bf66767eaaf316824cf5683488d8ee594b72baee327c4ef594f84b5aed07654da483aff29bee98605e5265425be88c165a4bb06e7bdddbbf28e440 WHIRLPOOL 346a1b1d58b3a6be73bff33c6cb943363df2185b26ae709a665b66ab32f594eb3cc3ac7578dcd902652626187715db6fbd48960ec676404e2e2a661ce9e3dff7
+EBUILD pyformance-0.3.4.ebuild 896 SHA256 a6815242ca66c1425e4ba68e936d0aaf3fcfb5366e9bf4ae3a038818bc13354f SHA512 42c81e1d4455a63ed134d0bd378b936b8908322151b49b7ab634f091416280635ca9f5fc40bd3b444806ae3c83ac2d8aeb3f11dc5f4f721b4ad2126abf59b6ee WHIRLPOOL 844947e24214d5ff2439ea34eed9f0cbe582240864cb06afaf41cd64bd9d3ccdfbb04818bffef5bac014821d6902401cde87333b4c179b835981305a6856a279
+MISC ChangeLog 2576 SHA256 f0daf4b324b1b93dd9fe0bb872800317e54af5b528560e7e8c9ca8c0b116d9ac SHA512 94366ba5212a3aedb2f116ce313eb8eaf8f85eca7b22d5337480693484009bc7747586818212e9e546d6be7d033233fda074099eff8aa2a4fe1ef4748d26d8f0 WHIRLPOOL b4889eddc4897b5a66806424c5f5d59c0607c9a0a60d4c0eccb789aa35cfde8ac260a195312111fbe3f22b8402b6931b78977e8c9a88cc8f0b11abad9a839241
+MISC ChangeLog-2015 537 SHA256 d8175ebf460e7898391d1697d2081906b169495a24a967251d9235866572c33b SHA512 742c9e4696cb27922ae74675ad4151652d152fac893ab88983844b9527a05b7568095d3eddd3e6cf330ef19bbcbb46a268e35e16375940594c40124e8cb91ba6 WHIRLPOOL 575455b8ad77a7c59569f83c4ce1eaf0c3f55ee33cca98c3cfdd94b1bf1b5c7378a1fd6747a93a13141e4b9b355e78f7d792e1988b15e247f44644846877a851
+MISC metadata.xml 452 SHA256 6ccd3fcaed3ec91fdad2316386b7d59f41d4fe15f48b147017e9fd3ef98fa1a5 SHA512 d1fb11333e19747774ae686b9c12f221c9b844be16ee6d2381f38d09d775118c4ffc3379d18217f83d2c0cf518de61a448680e78a1650e289c390d6437702240 WHIRLPOOL 3cecd3fc77b1551636eecdbbecd3e643ca506bdf7218fccaac4141ced752312dd5e4ad18105dbc152f1ede37f55fcb32d9f34ac24bef935db92776cd618fe3d4
diff --git a/dev-python/pyformance/metadata.xml b/dev-python/pyformance/metadata.xml
new file mode 100644
index 000000000000..70e21df89218
--- /dev/null
+++ b/dev-python/pyformance/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">pyformance</remote-id>
+		<remote-id type="github">omergertel/pyformance</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyformance/pyformance-0.3.4.ebuild b/dev-python/pyformance/pyformance-0.3.4.ebuild
new file mode 100644
index 000000000000..b9c3c16faf96
--- /dev/null
+++ b/dev-python/pyformance/pyformance-0.3.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Performance metrics, based on Coda Hale's Yammer metrics"
+HOMEPAGE="https://pyformance.readthedocs.org/ https://github.com/omergertel/pyformance/ https://pypi.python.org/pypi/pyformance/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}] )"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+python_prepare() {
+	sed -i -e "s/find_packages()/find_packages(exclude=['tests'])/" setup.py || die
+	sed -i -e "s/URLError, err/URLError as err/" ${PN}/reporters/influx.py || die
+}
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
new file mode 100644
index 000000000000..922af081c3f5
--- /dev/null
+++ b/dev-python/pyftpdlib/Manifest
@@ -0,0 +1,9 @@
+DIST pyftpdlib-1.4.0.tar.gz 116280 SHA256 5fdd1492efe478f4c354f7d65d9308359751c8fb1d0376466b74a76721c5fcf3 SHA512 61cf28d72a3a99bdc9bddcf434275e4edaeff60bf6481c1e854d81a4ea23ae97b73c8da9d0629a705a003ae8a941c529f9b9ed7cfa25759bd5cd6517f9958ff9 WHIRLPOOL 676f58061e07aa8a9dcce9c7076962875866cebca8eacdd624053cab32de3a7bdb0b17337105839b6c997bf2b4263e759c962362930afddaedc1e9a151b855fa
+DIST pyftpdlib-1.5.1.tar.gz 127582 SHA256 7bcd7fc825123414a157718c6dcdcb0978208d3c865d4650564acef4acce3354 SHA512 81bb634aef7190d97b5939b998c8dd8caf1ce77c2ca66d085826880590a03e7fe4aeefb5eb67f30f25b984962eaae740c4c8c1d5900909029702e37c36bb2b9b WHIRLPOOL 2b878db9386d3fc81d0e2749facfa4183704f705afb677fdae0031a721a050d246eda80fb8eb7dfb7b5369269f57b7995f201d07f1b54e133e2e7d85277d0615
+DIST pyftpdlib-1.5.2.tar.gz 179047 SHA256 bcb1a949848302b4a10623e57966d2bdbcf898bf220b587ea287d14de4b1471e SHA512 b458518eb7a57137d5f677bb4f38f4285f5efed4d8c0b4919c78b42350579407664219f4f289a0d6f307bb33869b73033ee82ad2ae777dc9f5a6d38a1af09a2a WHIRLPOOL 8022e311fb36125a10db6872b05209ebcc62c94b5f5603448ac46d769af1cfcb8517fc30d26b072aca30103530465bba58e953752959abe752f28e707422a452
+EBUILD pyftpdlib-1.4.0.ebuild 884 SHA256 d0a8dff8f2693c72d8786a7182885e64a0542c1199b6e19867aa8bac9f6a38e2 SHA512 519fe3d56a8ca2566a101b89cfd5d096241a201f43a5c6f9c3c9e92be9ad21c69a23f573718b3619ec0d5c9143403fffa82246f58a793c35117cc118545a78ce WHIRLPOOL 9f1eab175b2aac34657eb018f949eba56216b450112b74955b933590988843fb2108425bc4e27496998d3d76b2700ac0960a953e2a3a1aedd0076f140cad8827
+EBUILD pyftpdlib-1.5.1.ebuild 1301 SHA256 99ee5a2735ef8d94afe9b95c731e29c0159f132c94dd996aaa88851226882755 SHA512 b424ad067d76550f2a188de757d51498f475ab1bc8f6d6ccaaeca3589b8a1bfd6808380f9d73d4820b7228dfe020504ff7fa48f4e841d39dc9917a72b9f1d9d3 WHIRLPOOL 3f714991e82fb10728c5018332be7e50a67e4647b8fa646b477d78ff3825da12369d4dd904e51b4701e5a87172f60cd5af3b46abe587141c2777bf196266136a
+EBUILD pyftpdlib-1.5.2.ebuild 1396 SHA256 ac3a1a0a91d9f6ce300af376f63c632807b0c339b01537d2c9c5a17efdbdc6ca SHA512 d285d6beae385979115643cad62cb0053ddf1213fd89987f519e659c7272882552f014169c32815861150337903144e3571ba04588afae21eee94110f7a537fd WHIRLPOOL cfb217c10b443d5be46f2fe5e064b2a7df96ea4d85d8def0a5b921ba682be78bc24f5a3708a05c5b26de9c061e098963b5335a6ef7b5c9549e4f832d5fe3081c
+MISC ChangeLog 4590 SHA256 9d1de5a044e4db280dc7d39c4b6b2cf1a792bd950e2ec4881f5323c7a8cad124 SHA512 d07a5a21d5091ec04c27c50db6bde85251b0027b2b666f746e8268efd6066436dab6ac8096406a956e273623f9cc3e932b792e3e6d2bdacc60bb41b3261b4370 WHIRLPOOL a28d05a6f4c4c7b79624a782bbe367754f98e4ae1f77d07d64616d24bbaf188a97d7faa918865dcf257b7380ffa4661d1f9539c6d194345ac82df749cd0529ec
+MISC ChangeLog-2015 7578 SHA256 c71dfc1c28b14cd811ea1acaf2e75d194d3a409310c0e450339077ac6ca48f97 SHA512 9d308a9ca15b71e3dd9df69376c437b9c870bf1d2715279185a87fe817a5f4a44d6014127799ebf92fb2afbcc1ee343da2a759f612b3d05b1f9f757217c3d121 WHIRLPOOL 281e7dead5eacadfcb120e364987084e3fc7a2ac10cad606d93cb25bfecd116ae909779bfd61d2582956097c586adbb40083a2ad2f6e9ccea94b4c6355e15544
+MISC metadata.xml 438 SHA256 2f4ca2e3052ffcd33f7a337f6cea093ad259174fa25cd71f343b5a04648676f9 SHA512 a748827370b53c94fed352cd6bbd7468a22c7ca2f15c4601c98a2689e3a7e652ed28434bcd125fe0f3018d5508600df03130c18d7d67834b28ac0c3480b16345 WHIRLPOOL 310584ee42b13704eb9a88c1fb9758add655c7472a65eaba4467fc482024d96b267eb2ce87d6a93939605b43416913b9eee8568486f2b21d9d5098653266cb1b
diff --git a/dev-python/pyftpdlib/metadata.xml b/dev-python/pyftpdlib/metadata.xml
new file mode 100644
index 000000000000..1a0a7b81d04c
--- /dev/null
+++ b/dev-python/pyftpdlib/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyftpdlib</remote-id>
+		<remote-id type="github">giampaolo/pyftpdlib</remote-id>
+		<bugs-to>https://github.com/giampaolo/pyftpdlib/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.4.0.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.4.0.ebuild
new file mode 100644
index 000000000000..c22a182a18c1
--- /dev/null
+++ b/dev-python/pyftpdlib/pyftpdlib-1.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python FTP server library"
+HOMEPAGE="https://github.com/giampaolo/pyftpdlib https://pypi.python.org/pypi/pyftpdlib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="examples ssl"
+
+DEPEND="ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	"${PYTHON}" test/test_ftpd.py || die
+	"${PYTHON}" test/test_contrib.py || die
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( demo/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.1.ebuild
new file mode 100644
index 000000000000..13721cd858eb
--- /dev/null
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python FTP server library"
+HOMEPAGE="https://github.com/giampaolo/pyftpdlib https://pypi.python.org/pypi/pyftpdlib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="examples ssl test"
+
+RDEPEND="ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}] )"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )
+"
+
+python_test() {
+	"${EPYTHON}" ${PN}/test/runner.py || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r demo/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] && \
+		[[ ${PYTHON_TARGETS} == *python2_7* ]] && \
+		! has_version dev-python/pysendfile ; then
+		elog "dev-python/pysendfile is not installed"
+		elog "It can considerably speed up file transfers for Python 2"
+	fi
+}
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.2.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.2.ebuild
new file mode 100644
index 000000000000..f7df1f99fbcf
--- /dev/null
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python FTP server library"
+HOMEPAGE="https://github.com/giampaolo/pyftpdlib https://pypi.python.org/pypi/pyftpdlib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="examples ssl test"
+
+RDEPEND="ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}] )"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )
+"
+
+python_test() {
+	# Tests may fail occasionally
+	# https://github.com/giampaolo/pyftpdlib/issues/420
+	"${EPYTHON}" ${PN}/test/runner.py || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r demo/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] && \
+		[[ ${PYTHON_TARGETS} == *python2_7* ]] && \
+		! has_version dev-python/pysendfile ; then
+		elog "dev-python/pysendfile is not installed"
+		elog "It can considerably speed up file transfers for Python 2"
+	fi
+}
diff --git a/dev-python/pygal/Manifest b/dev-python/pygal/Manifest
new file mode 100644
index 000000000000..a91534d433fb
--- /dev/null
+++ b/dev-python/pygal/Manifest
@@ -0,0 +1,7 @@
+DIST pygal-2.0.1.tar.gz 66763 SHA256 9af34cdecdb519a5d1d712677fc5123e956a2d0e57814592901da955e00527ae SHA512 a8d34f108cd9116594ed63cb64bf047510e546aac7e42f63e05dfac0c9e7768900f76f70f2555cf9c46bd0fbdcf6e27cc40ab1aaf8a62093d344a096929a5326 WHIRLPOOL a413d29a387acb96e6e642d11a37bda429d9da8ec5a43679b3561d5303a4f1d9a0ca9e6ee22e1da1d4fcd400c47d4b515a2ee503b545bc93d596bab3d7884fbf
+DIST pygal-2.1.1.tar.gz 69757 SHA256 515685964b880aafe27aa8664082ec9719e33e63027913c251cb9760e01be8ce SHA512 79851bd6278a3a71f067ea11f273fcd0755ac0ab2ba51266b161fff1f3b49d690bc2a1b3432255da4f3cd5b9cfcff570d713d0bbfaf6f2dfe5b6f922989c72bd WHIRLPOOL 166ce2f368626bab4c94cde221ae5bd8c7dcabd6830ea1d4f3c174e7a73c908b94c4626d79602e7eff4ae0a5ae0a23bd54fe35ea8d09fabfdda727d1b6806c6c
+EBUILD pygal-2.0.1.ebuild 483 SHA256 0dfa3d04414f38b7e575437f633440d8dee9607b14b5ba85062093599e5438f9 SHA512 7e7825e16c3e08e72f89b3b39d4debe1ca223b19e672d304565ff88bab333656b52ed159dc84af78b8d522281c60bbc9812074fe22047864a6e41eac40e23c95 WHIRLPOOL c482b0c15594c403bbfabe29a22ceb16d72ee09b559f79c708f95aa6cc25b2eaa06a9f46692a9e47793d6708b6e10539cb59642ca4284e69eb89209ef7f5c60c
+EBUILD pygal-2.1.1.ebuild 481 SHA256 9ae0691901692260726baf595330d22b0b219e05ef55e6bdde4fee0f8c4b5d7c SHA512 55d66d7997e72dcdf25b77616d2c817c65e7b488d206b772d6bc8f71e259c2b19031c9011a229bf0795c22d1edf0da16f272c6ea60e988812e5d5ac040adc1bc WHIRLPOOL 163c01a31fb9386577de7a52f3c9fd6c261cb5daf2ef1373c1172748e675b54de65755a935451e9d8de1817bb5e3f25e7c271a39078d5274500a1887b2d11688
+MISC ChangeLog 3811 SHA256 672ba65c8ed65055386c610f12d7d5b02788148ceb32bfb2d494617b356ee50f SHA512 83520872d1991489302026d5e4a28339d65756da1077f6a9ef732391393ff25803e46721d2c63e1a9648c5eb4a211e9353aea8d962f901037dd0fbc2d38ea447 WHIRLPOOL dfcfab9128b38d0bccd189c0289d34d7289b300f8b8093bde2f1dc39048ca0dd4673c31578b55aced645a66b31f2740a00e6a816375d8d45b45ce112de0208cc
+MISC ChangeLog-2015 1699 SHA256 7c7f17a510045d50213650ecf4d46f39e381bff49373e001c731da17f0ebb33d SHA512 151cabde2baa81cca1b2e25e8b60d0cfc6bbf00c1e7922129288c0d1782732e1a6c5a7d008ad59660b65a569659874158af5d83e79c0f2ee18a284b5c2a7d139 WHIRLPOOL 50c72af496c8273ad5a27fdd405004f3569aa8a9a8de1634c1915112f5607a9365fc9b114bcf075dca82696591b1caa9f494d14c0bc856244ea20a77d746c20e
+MISC metadata.xml 318 SHA256 5e9fe8a8d0402b9cdef56a3e7b46db4489f94976c12d8621ad016e036412d851 SHA512 ba609ecf46859eb8806278de9b5bf82e04ec30641b4654c4f842dc6ea8e90636e8d4bc654e84aa181711c34f4714cd1019ae31cfb0a5be0c0709aca9bc41c895 WHIRLPOOL e9af6a10cf1e0234024a09c66ba9159acf9f3b358226320d83e1f050544c8250eafc3b7c13bd9a14a3d4959c2ede97dbb2400d2518f6696862bfbac95a55c423
diff --git a/dev-python/pygal/metadata.xml b/dev-python/pygal/metadata.xml
new file mode 100644
index 000000000000..3ba5ce82d6ca
--- /dev/null
+++ b/dev-python/pygal/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pygal</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pygal/pygal-2.0.1.ebuild b/dev-python/pygal/pygal-2.0.1.ebuild
new file mode 100644
index 000000000000..3692c4396ba9
--- /dev/null
+++ b/dev-python/pygal/pygal-2.0.1.ebuild
@@ -0,0 +1,18 @@
+# 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
+
+DESCRIPTION="A python SVG charts generator"
+HOMEPAGE="http://pygal.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+	media-gfx/cairosvg[${PYTHON_USEDEP}]"
diff --git a/dev-python/pygal/pygal-2.1.1.ebuild b/dev-python/pygal/pygal-2.1.1.ebuild
new file mode 100644
index 000000000000..104826229866
--- /dev/null
+++ b/dev-python/pygal/pygal-2.1.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit distutils-r1
+
+DESCRIPTION="A python SVG charts generator"
+HOMEPAGE="http://pygal.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+	media-gfx/cairosvg[${PYTHON_USEDEP}]"
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
new file mode 100644
index 000000000000..a4af47934c80
--- /dev/null
+++ b/dev-python/pygame/Manifest
@@ -0,0 +1,8 @@
+AUX pygame-1.9.2_pre20120101-import-bdist.patch 1609 SHA256 398af19e4907fea3ff528e22e03878daf635143fda3be6cbb959c163ca4c8b04 SHA512 d40d0141ac44d8081e51ec94c72123b7f59b8328569d5d590b8c54c3b33b1088e8ecbf56f80c2ba11a01c735421e5836d3f06b390da564f03448a6482d2fd319 WHIRLPOOL 68f6d7743079b3b6b3261ff05fe169fe599dbe59b84a8616d965b74490db2bd0533f8235f71d629f828b030525290449c8653dd1d2bcaea767a0efb415aff3a4
+DIST pygame-1.9.2_pre20120101.tar.xz 2263028 SHA256 86d386a84a29387e98f6650edbd7fffe5b800115b69e6b15b2588c13eae56335 SHA512 1e82cf720da28d4e4213f6b7a029ab4c9dd592c3155f3d11da8272a7d81d28c54f93402383fa5fa4a4e8863dfc039062838d0317cfedde30a4455e52ce680576 WHIRLPOOL 437555ba4816e42bb745ad5ce13b7f164d5a1ff467cd7193327856b98047eeb56c1d1043c2cc75c6a0ca71ea96240df75b1dc544122034c7e4628c544f8d9486
+DIST pygame-1.9.3.tar.gz 2974541 SHA256 751021819bdc0cbe5cbd51904abb6ff9e9aee5b0e8955af02284d0e77d6c9ec2 SHA512 8920c598a97b4ff8602391517f070b67263bacb6330e13ea5d7d5432ee592a7c984fe986837b90a032da3d4e717f9df0cc99f0fb39f1cbde1b4f6a4c132feffe WHIRLPOOL 639de0f3fff185c09a145f0aab569358f92a8aca5e549e7f05005717ac081ab6f4d5c8ecd98d93030a2e0dc344913cec86093e9df9d3fe38043372c325c5bb96
+EBUILD pygame-1.9.2_pre20120101-r2.ebuild 1922 SHA256 155fb8044ba6d0c2001eb18f3217fd06d9ad106be1f018364c2991646f570d11 SHA512 41d06f4e001be51355894948abc96a525920302dff2edd63a6371f9bb0631feb79beaa339c8a06c926f3f0da83dc725a3a2a47463aaf476a7ef9551154a170f3 WHIRLPOOL 1c69f569aafc801447296c7844206e1c8ab228a2c8fee7f8df99bcc5d71abde34ac7285b4acacc072b926f26121ba17b3570bf7ff108a90bd29c77bf404d20d8
+EBUILD pygame-1.9.3.ebuild 1767 SHA256 d65c5803b8ea89f05919a2b599c422b784dad9b02867f266d4f31243e7163892 SHA512 9a3282b431a331b14e8a910c7071ae02fae73f3395ca8f4cd6b757313a24cee5d045c70b6880b4c2fed31adaaa0cba1229abf31f7296d9e32b742c18817b076c WHIRLPOOL 5e14c908b75a8959371a0a63d7e28d8a215189e8bf341a3d8c0ec0d657c809bda404ec1435a10b93065da27c80eeec7541a21bb2c44c329badf8f7e49bde323e
+MISC ChangeLog 2827 SHA256 ba979756c43e7f3ac3c0fef392d7c72b1c352b7dea3cc2e3232e2f3d3c933420 SHA512 1b4c7f0343f9ba0c11dea2aa6f42005d7cbd710ccc411db45e755d3bcba3afe1dfd2b44fecc20301989d58a56ed558d873e9ff5f2d85839a5aa70f46e2e187d0 WHIRLPOOL 228c6953e08bed4e1aac71e072ac0562ef70f0885f84697935bdd4953f049ab335c9e663d7ec19ced5e0baaaf117a320785530513cd57f6de0163241d23423cc
+MISC ChangeLog-2015 14297 SHA256 9ef6562b49ac586fd0388e2bdb02582d638c74c181a12c2d0dd9a028dad0e9b2 SHA512 36c8237b53bb1d76f11f4dc36b2f68d569c8e8c2b8f0cc2e74db3218b34a2f063da4859568f2333223a94b9e4812a0f7643a2c2d46ad9e5101742d7e57adaac2 WHIRLPOOL bdff5887ad4423e7f4079fe67ec99708ef091ccc2e9bedae845225770249d76d11b3dd757b9496c3954cbcf4dbd89f1658c7e48dff982ff4528a4c233c46d16c
+MISC metadata.xml 408 SHA256 27d52365049a639d83e56b5d4c2de4b35b61ad4c25f700bf8640ddb59f1c8fef SHA512 a6e06c0bed59d5157166577a2dafa53f28a310c56f251bec36af077a79342c6f954fa63a3fa8d3546ca03cc9358e75eeb1ef04c6e0371e43e0b7bff51ffe35dd WHIRLPOOL 61424bff862c534771a568e8fd1f1c8320e2efe9c4fc170185d1a6ffb2d122961ad9b7aeba5b03fb14c5d48cb47675ae80dfa81837e122b7ae6ce6ebe3d996eb
diff --git a/dev-python/pygame/files/pygame-1.9.2_pre20120101-import-bdist.patch b/dev-python/pygame/files/pygame-1.9.2_pre20120101-import-bdist.patch
new file mode 100644
index 000000000000..f587401ab25d
--- /dev/null
+++ b/dev-python/pygame/files/pygame-1.9.2_pre20120101-import-bdist.patch
@@ -0,0 +1,49 @@
+From f5ee3952769d698d7d03ae61a9c70f2ec4d85874 Mon Sep 17 00:00:00 2001
+From: "Markus (root)" <mo@wurzel.org>
+Date: Sun, 19 Oct 2014 16:56:41 +0200
+Subject: [PATCH] This fails with a TypeError, but offers no functionality.
+
+---
+ pygame-1.9.2_pre20120101-python3_3/setup.py | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/pygame-1.9.2_pre20120101-python3_3/setup.py b/pygame-1.9.2_pre20120101-python3_3/setup.py
+index ecee5d1..b913f18 100644
+--- a/pygame-1.9.2_pre20120101-python3_3/setup.py
++++ b/pygame-1.9.2_pre20120101-python3_3/setup.py
+@@ -99,19 +99,19 @@ if "-setuptools" in sys.argv:
+     sys.argv.remove ("-setuptools")
+ 
+ 
+-# NOTE: the bdist_mpkg_support is for darwin.
+-try:
+-    import bdist_mpkg_support
+-    from setuptools import setup, Extension
+-except ImportError:
+-    pass
+-else:
+-    EXTRAS.update({
+-        'options': bdist_mpkg_support.options,
+-        'setup_requires': ['bdist_mpkg>=0.4.2'],
+-        #'install_requires': ['pyobjc'],
+-        #'dependency_links': ['http://rene.f0o.com/~rene/stuff/macosx/']
+-    })
++# # NOTE: the bdist_mpkg_support is for darwin.
++# try:
++#     import bdist_mpkg_support
++#     from setuptools import setup, Extension
++# except ImportError:
++#     pass
++# else:
++#     EXTRAS.update({
++#         'options': bdist_mpkg_support.options,
++#         'setup_requires': ['bdist_mpkg>=0.4.2'],
++#         #'install_requires': ['pyobjc'],
++#         #'dependency_links': ['http://rene.f0o.com/~rene/stuff/macosx/']
++#     })
+ 
+ #headers to install
+ headers = glob.glob(os.path.join('src', '*.h'))
+-- 
+2.1.2
+
diff --git a/dev-python/pygame/metadata.xml b/dev-python/pygame/metadata.xml
new file mode 100644
index 000000000000..f00627a3b5f9
--- /dev/null
+++ b/dev-python/pygame/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="midi">Enable midi support using <pkg>media-libs/portmidi</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">pygame</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild b/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild
new file mode 100644
index 000000000000..ce055da9ab77
--- /dev/null
+++ b/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit flag-o-matic distutils-r1 virtualx
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="http://www.pygame.org/"
+if [[ "${PV}" == *_pre* ]]; then
+	SRC_URI="http://people.apache.org/~Arfrever/gentoo/${P}.tar.xz"
+else
+	SRC_URI="http://www.pygame.org/ftp/pygame-${PV}release.tar.gz"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~sparc x86 ~x86-fbsd"
+IUSE="doc examples X"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	>=media-libs/sdl-image-1.2.2[png,jpeg]
+	>=media-libs/sdl-mixer-1.2.4
+	>=media-libs/sdl-ttf-2.0.6
+	>=media-libs/smpeg-0.4.4-r1
+	X? ( >=media-libs/libsdl-1.2.5[X,video] )
+	!X? ( >=media-libs/libsdl-1.2.5 )"
+RDEPEND="${DEPEND}"
+
+if [[ "${PV}" != *_pre* ]]; then
+	S="${WORKDIR}/${P}release"
+fi
+
+PATCHES=(
+	# Workaround bug #516434
+	"${FILESDIR}"/${P}-import-bdist.patch
+)
+
+DOCS=( WHATSNEW )
+
+python_configure() {
+	"${EPYTHON}" config.py -auto
+
+	if ! use X; then
+		sed -e "s:^scrap :#&:" -i Setup || die "sed failed"
+	fi
+
+	# Disable automagic dependency on PortMidi.
+	sed -e "s:^pypm :#&:" -i Setup || die "sed failed"
+
+	sed -i -e "s/import _camera/from pygame &/g" lib/camera.py || die #415593
+}
+
+python_compile() {
+	if [[ ${EPYTHON} == python2* ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	VIRTUALX_COMMAND="${PYTHON}" virtualmake run_tests.py
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Bug #497720
+	rm -fr "${D}"$(python_get_sitedir)/pygame/{docs,examples,tests}/ || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		dohtml -r docs/*
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/*
+	fi
+}
diff --git a/dev-python/pygame/pygame-1.9.3.ebuild b/dev-python/pygame/pygame-1.9.3.ebuild
new file mode 100644
index 000000000000..1aa3419789e2
--- /dev/null
+++ b/dev-python/pygame/pygame-1.9.3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit flag-o-matic distutils-r1 virtualx
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="http://www.pygame.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~x86"
+IUSE="doc examples midi X"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	>=media-libs/sdl-image-1.2.2[png,jpeg]
+	>=media-libs/sdl-mixer-1.2.4
+	>=media-libs/sdl-ttf-2.0.6
+	>=media-libs/smpeg-0.4.4-r1
+	midi? ( media-libs/portmidi )
+	X? ( >=media-libs/libsdl-1.2.5[X,video] )
+	!X? ( >=media-libs/libsdl-1.2.5 )"
+RDEPEND="${DEPEND}"
+
+DOCS=( WHATSNEW )
+
+# various module import and data path issues
+RESTRICT=test
+
+python_configure() {
+	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" "${EPYTHON}" config.py -auto
+
+	if ! use X; then
+		sed -e "s:^scrap :#&:" -i Setup || die "sed failed"
+	fi
+
+	# Disable automagic dependency on PortMidi.
+	if ! use midi; then
+		sed -e "s:^pypm :#&:" -i Setup || die "sed failed"
+	fi
+}
+
+python_compile() {
+	if [[ ${EPYTHON} == python2* ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" virtx "${EPYTHON}" -m pygame.tests
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Bug #497720
+	rm -fr "${D}"$(python_get_sitedir)/pygame/{docs,examples,tests}/ || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/*
+	fi
+}
diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
new file mode 100644
index 000000000000..c888c65fb617
--- /dev/null
+++ b/dev-python/pygame_sdl2/Manifest
@@ -0,0 +1,6 @@
+DIST pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz 2294620 SHA256 8e9e101027bfab62d6a4b9a4d5705d168383501af9ba958aaa3135233009bd1d SHA512 eacce553d6729b937c13420d826f2fe327bc7aba499a06bea7f1ceedba3327a9456c023878290ace39e1a8e417f54957345b8b78500ffc9ed3d2ec9952397754 WHIRLPOOL e78d83ee974d4338764e60b844d423534e8a616695f8995d06146a85b1421f77c1a9064c00703de357838fdb1aca1ad809a314d68c2aabcf1ddc744e301332cc
+DIST pygame_sdl2-for-renpy-6.99.6.tar.bz2 133501 SHA256 a6ae1891a3a7fcbf9c4486da708dd90fbfb5d5c489790f0de8985ec07e695403 SHA512 de1a40f7e8acdb46a7e0b13250c7fffdf848bd44c07408928aab6214afbc741aa77e1e8314d9049324328d9ffc645cafe077a468457a721f36e49f98e5217d53 WHIRLPOOL 0e13889f95323cb9ca2315b2915584c53f3578eb959a713802874c101c405c44e9b3b757ead86a2dbaa56b12d031f12ffbd12bc6776804fe1cb6efaec0246ab6
+EBUILD pygame_sdl2-6.99.12.4.ebuild 922 SHA256 90e72f06daea790af98a223bdfa74f6b64561a9a2025b9e5f7344079d62b4443 SHA512 1069188bb58137dbac5e78f62eeff2228e34508434450dc6971bb3d52a92be2677f793c8e9af18951e96b5c5f0ffbdfcf1685ad62dadc3424da164ac86e1ab2a WHIRLPOOL b3b0f4045477e1df36dbfa9a15f939ac4476f8c276b92aea8308a99e545a5e25cffbea484ff54f87dbcf4e361ba6b8d2546409a8ccedff0b5ca93331fba06688
+EBUILD pygame_sdl2-6.99.6-r1.ebuild 729 SHA256 1ec285f95b1495f25af275598d64af0cb818ea1803389c7ff7b11a6559b43559 SHA512 c72b4c6c9be055a6e4301796d123b61bea2a498b7be7644a9b3b166a8425d0668f181dc83ef6956c2829e7ded467e9326bda11b2f07f615539cc5cbf4c0d1db9 WHIRLPOOL 02966750466a72868d2ffbdfc1683fc50daeeb56debee121a8318238ee061f008069c242e78f4e58f982f3f02610c9afad15cfb314759f75bcc72f1732ddfd02
+MISC ChangeLog 2698 SHA256 02cfc9291f8e1308b1af2aa0b78734383c75f0f13f7123476fe8be7e9d21b905 SHA512 35a2e8e5e043528118f83c227777c41741b264222e9dccc769dbbd94228a1805c1cb7bbe8e8f0f122c07da1f20ed88db09de7daa50a467dae69b29a6a84518e0 WHIRLPOOL 089cdedc6eda16a1ff2bc508b20cca75f22b66405b9b335ebab28f08ba4b2b19348aaa6628724e317c9f1ca727e6ce0c28a552157cb38e09d005c4e824a69c27
+MISC metadata.xml 332 SHA256 a822b73e1cc9ed8c2018f10666d9714a85e3eff9e7925fa9f96977d9ac37a0b5 SHA512 ae1f94e0d1f533a9f2db740f0a1c534456cf5a919262aebfcb501269ca3b508e697750c4bbc6eb60db8dda2182ecb712a10dad5d91efce20f24c5a736d9b3521 WHIRLPOOL 60037b1b96d12bcd7a317ec7282f4b847eb1772fb615c65435ecf6da506797ea59d41eeb51830cf31e744d3cdcde0b9dea523f36fdc7abc97f607f3cc463e7a8
diff --git a/dev-python/pygame_sdl2/metadata.xml b/dev-python/pygame_sdl2/metadata.xml
new file mode 100644
index 000000000000..88d1d1b3d9f8
--- /dev/null
+++ b/dev-python/pygame_sdl2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bircoph@gentoo.org</email>
+		<name>Andrew Savchenko</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">renpy/pygame_sdl2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4.ebuild
new file mode 100644
index 000000000000..0655887619e7
--- /dev/null
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+PYSDL="${PN}-2.1.0"
+
+DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
+HOMEPAGE="https://github.com/renpy/pygame_sdl2"
+SRC_URI="http://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/libpng:0
+	media-libs/libsdl2[video]
+	media-libs/sdl2-image[png,jpeg]
+	media-libs/sdl2-mixer
+	media-libs/sdl2-ttf
+	virtual/jpeg:62
+"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${PYSDL}-for-renpy-${PV}
+
+# PyGame distribution for this version has some pregenerated files;
+# we need to remove them
+python_prepare_all()
+{
+	rm -r "${S}"/gen{,3} || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild
new file mode 100644
index 000000000000..cab2f121eb9e
--- /dev/null
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
+HOMEPAGE="https://github.com/renpy/pygame_sdl2"
+SRC_URI="http://www.renpy.org/dl/${PV}/pygame_sdl2-for-renpy-${PV}.tar.bz2"
+
+LICENSE="LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/libpng:0
+	media-libs/libsdl2[video]
+	media-libs/sdl2-image[png,jpeg]
+	media-libs/sdl2-mixer
+	media-libs/sdl2-ttf
+	virtual/jpeg:62
+"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/pygame-sdl2-for-renpy-${PV}
diff --git a/dev-python/pygccxml/Manifest b/dev-python/pygccxml/Manifest
new file mode 100644
index 000000000000..b4d33e2abae0
--- /dev/null
+++ b/dev-python/pygccxml/Manifest
@@ -0,0 +1,7 @@
+DIST pygccxml-1.0.0.zip 21639068 SHA256 743a83ef67838db45e5d810e647e884272a65fe6cbbbda0f3ed1fdb3aeedb529 SHA512 d2a96b5bb27c3620527839051e43fa1eee8884692707a347c76863ff44a04502dcff35fe18b95a35c32fb8a4935ed8d5d91bf41eb98aee74f6df08c48ddc0b67 WHIRLPOOL 260075fe402c9eb40ee7ba93d0263fccd409020d261842983a9f2b39c00d51f3d3777a85fa0d94a258f52f57c5c2e30c499c258364c1c58cb8ba455b6fe148f0
+DIST pygccxml-1.7.5.tar.gz 3150295 SHA256 a8462c0d74c991534f81405fc52eb05ecd88372f3aff7a49f99bb6c98051a553 SHA512 f76e1748646beaf1b16bd498026e177008f5ebe19e4b35ce612bb27f4f9e6174cdfe4459771adbc657b95e8d5edeea0687756f9ba82cabc10703043c4a7e6e1e WHIRLPOOL a3756918f2933696f8d7bc406d571159c14e2d22dc32debcd7ef569492dd88bc9036efd198ff401f43559be5c148647cac9cf8d7c6a7302249cb65d7015e284e
+EBUILD pygccxml-1.0.0.ebuild 808 SHA256 32bb8571d07307c8d8f7210ecbd9c1f35360b00d298c7a9f802e9e2fadbee5b3 SHA512 6d42b8d8ca3fb291ba733c18c5ffca79cfd15b299cd0b51694578991826d7340abebb24925717fc4d7750ee07d75c40ab6997452651ef639d3ac3b48c8ae8716 WHIRLPOOL 7b210d5b684e00e13778befdd92bc7d122c857816b4e95df2055f6b4b5344aa05394366e04d1131a708e9928d12216bfb5b45b11edaf197fbd2adc3094c62fce
+EBUILD pygccxml-1.7.5.ebuild 847 SHA256 a4e37d33dea9d55c04279577bc6076c1ed051a7a97890f1f2d910a61ae146e42 SHA512 ef1f0f1da2944a35a49afb784dfe86721561247f5cdf8ad44a04aeb6586f87db17c04b7de069291c83f8480eb8f42acff1bf182198890313383c5bbc3bdffef8 WHIRLPOOL 0f4d5d2674c837adf721e41c969a82ce57043d9ec99cdad54b6ecabec4e67225ade46b0af0442dc0b38dc6268b0c9ceeb9eb3830a0e5f5fbff5f70b8b768691e
+MISC ChangeLog 2678 SHA256 af6f83099911c6588416b0123417de0ee1d4f4de2ffa886d67bd1e39738a73ed SHA512 37944686ee332a6936d20606f3cf24971f5e6e8ea5e225344a5d3b4a146f41d4807b7240408f36931426913548aa7744e71c62a5c74b2525efc511ef2284b8ff WHIRLPOOL e41a9cfbd20b955dc4eea931be634164f546d9fc2b3b871bcaba6644579e3dacf326d9998ab4d1057a0b21171ca4b0789ce8ddeea3ed2d1657980a8a7eb5ed37
+MISC ChangeLog-2015 680 SHA256 83ef2c345dd8c2d7b2c31a668c8b1e46f1b242a52c93f8fa6cd6eb5eba8c1acb SHA512 61a1da5677e4daa203b6a5a5eab985938931e82d9cb1ce6be9222682d383feaba2f1f027b3e393df9ac37768b0857fa6a479fea7476287b66fff0d8da6e6edb4 WHIRLPOOL 183f3c63bb968777a8692c2bf280a7305f21cd998f868d4f667de04f70a400ad7d01ccf755fc51020773814a472220547656e88589982f0b509dbdd71de21b5b
+MISC metadata.xml 482 SHA256 b988d8d0d716d9f232877684e6f634705a8f1e807949514b7c022d6e7b6bf767 SHA512 56f747acbf8018e5cadee2203ac26751e7cc146d76a7aec6875831da051e21d1ee349d98535a1a2e8c37aae869035f86479b0fdc80756baa501034c773d3398a WHIRLPOOL 79f3f0acfa7938864df0d0bc21c98d8ba9cff666b28ac70139e35da20ed5b479bf05ba68ff00ab1283ecd2611aba513a543fd6b0539ab9a1d33159c6305b36b0
diff --git a/dev-python/pygccxml/metadata.xml b/dev-python/pygccxml/metadata.xml
new file mode 100644
index 000000000000..29fca4f45351
--- /dev/null
+++ b/dev-python/pygccxml/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>heroxbd@gentoo.org</email>
+		<name>Benda Xu</name>
+	</maintainer>
+	<longdescription>pygccxml is an object oriented framework for reading C++ declarations.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">pygccxml</remote-id>
+		<remote-id type="github">gccxml/pygccxml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pygccxml/pygccxml-1.0.0.ebuild b/dev-python/pygccxml/pygccxml-1.0.0.ebuild
new file mode 100644
index 000000000000..c8385483e97d
--- /dev/null
+++ b/dev-python/pygccxml/pygccxml-1.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Generate an XML description of a C++ program from GCC's internal representation"
+HOMEPAGE="http://www.language-binding.net/"
+SRC_URI="mirror://sourceforge/pygccxml/${P}.zip"
+
+LICENSE="freedist Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+DEPEND="
+	app-arch/unzip
+	doc? ( >=dev-python/epydoc-3[${PYTHON_USEDEP}] )"
+RDEPEND=">=dev-cpp/gccxml-0.6"
+
+python_compile_all() {
+	use doc && esetup.py doc
+}
+
+python_test() {
+	"${PYTHON}" unittests/test_all.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/apidocs/. )
+	use examples && local EXAMPLES=( docs/example/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygccxml/pygccxml-1.7.5.ebuild b/dev-python/pygccxml/pygccxml-1.7.5.ebuild
new file mode 100644
index 000000000000..395f97621467
--- /dev/null
+++ b/dev-python/pygccxml/pygccxml-1.7.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Generate an XML description of a C++ program from GCC's internal representation"
+HOMEPAGE="https://github.com/gccxml/pygccxml"
+SRC_URI="https://github.com/gccxml/pygccxml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="freedist Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="
+	app-arch/unzip
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND=">=dev-cpp/gccxml-0.6"
+
+python_compile_all() {
+	use doc && emake html man
+}
+
+python_test() {
+	"${PYTHON}" unittests/test_all.py
+}
+
+python_install_all() {
+	if use doc ; then
+		local HTML_DOCS=( docs/_build/html )
+		doman docs/_build/man/${PN}.1
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygcrypt/Manifest b/dev-python/pygcrypt/Manifest
new file mode 100644
index 000000000000..eca1f95fe4c3
--- /dev/null
+++ b/dev-python/pygcrypt/Manifest
@@ -0,0 +1,3 @@
+DIST pygcrypt-1.0.0.tar.gz 53619 SHA256 9d30a1a0385a71edc7e9af8c3c43c5f252e352538d2c74d521bb6440cd1caad4 SHA512 db0854dcb4bfbdb55674fe83a501eac8ac40c624722972c44c401605820de45f1353cf9b6368ef880a6b3a6f112c4faeccf18246cdc82e88dac797d150f06de3 WHIRLPOOL 560292836bb80ed9525b0fe3903e6dbc4d626a53323fe81a06d274401833bf1f324bd7b181e5011f0a0fd05fe9b28300a6c448008573a16a103e4dd68960f90b
+EBUILD pygcrypt-1.0.0.ebuild 635 SHA256 8406d71d6c65561f7096fab225adc009b8fbeed12a4df3b1977899d8facc86a3 SHA512 83f4396a32ccdded95ae631b6a7087a1da10ba96eae00634ffa83cbbc5c66513c04012ee75a8a1dbff563f194ad241517c66c2d040549f4f996adc3b91e5b7b6 WHIRLPOOL d4bae63a25655134dc0af9e87a08f0943523888379ac85a2db49d0900967b029bbe43934c88c34d6c50cb7b28196c7d6774b9639101cfa648119a91bd82dd328
+MISC metadata.xml 397 SHA256 a94b318bcc04cae028d418b93ab51d3bfc9a7290770683c16089ee009cc6bc1a SHA512 4146517e9433f37fa96a347e225a2881cd8c43dd1a3e5acf639e7f09427d514bcca4384e2a0c18067dc51ed35fe2ea0707178f4911c88c11d07223b92df2c178 WHIRLPOOL aff81e364b5c98b16de5d3634650d033d379b711e8b6f08a40cfea70fd12835ab74c042e94ce21e1dac48fd0cd0843ea76fb36d4d1e948bdaecb97e2948ed7fb
diff --git a/dev-python/pygcrypt/metadata.xml b/dev-python/pygcrypt/metadata.xml
new file mode 100644
index 000000000000..c9b1aa1aec62
--- /dev/null
+++ b/dev-python/pygcrypt/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pygcrypt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pygcrypt/pygcrypt-1.0.0.ebuild b/dev-python/pygcrypt/pygcrypt-1.0.0.ebuild
new file mode 100644
index 000000000000..1dfdb7d44672
--- /dev/null
+++ b/dev-python/pygcrypt/pygcrypt-1.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="CFFI interface to dev-libs/libgcrypt"
+HOMEPAGE="https://framagit.org/okhin/pygcrypt/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-libs/libgcrypt:0=
+	virtual/python-cffi[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die "Tests failed against ${EPYTHON}"
+}
diff --git a/dev-python/pygene/Manifest b/dev-python/pygene/Manifest
new file mode 100644
index 000000000000..5b76caea4237
--- /dev/null
+++ b/dev-python/pygene/Manifest
@@ -0,0 +1,5 @@
+DIST pygene-0.2.1.tar.gz 147178 SHA256 8d24bb4f3fa0fd31f86a1f3478d8699d01e5c3803ff276d876e3c9e9c13c154a SHA512 4f6b32c4e17e85d80530f8f3d94f9726bb5adb80933aa39948ae3824effa780d333ef01ac4a304e63345314a298edd31aa687c6e6947486e74efafa6678951c7 WHIRLPOOL 99e2d2464e9e3cba75d6165f21680ac84589c2666c441701fb585526df9c2aea32f515a012b8d43fa5106d6f988b0f57a595022fe22d972966d712b6aad55beb
+EBUILD pygene-0.2.1-r1.ebuild 1006 SHA256 18f2a54cc1b9b846ca34c645dd72b00001128bb93074e7efdd3d6b3e2657bf86 SHA512 65df6f6d820da5412988bfd0cdecd9b23a9b96142fb5836b99895ee572795f66aa8c2794c774bb3a79150ebc90559defc0063f6ea90c2023753a5ac910f93f5a WHIRLPOOL a3b321a457ff53a724dabef8a1f489c39b844b7c7478ddcb1fb6a9c2b4e67098eb181c0be5b95ccce4cc2b4cb720971f6612789f47d6eec0cc375e0555157eb5
+MISC ChangeLog 2630 SHA256 41fc811fd0bdb5221a1d37c46ef80ab19bb415e19872798585a146a5fa6fc134 SHA512 99c02e85afe9264d5f0c4b0951d6cf8561b072d26fbe53da8ddbc83721215131800e58cf31d209429c6d49b6ea3a1552fd768cbbfbd584b56ddf7453f41dfd60 WHIRLPOOL 8c4869f46d2892da4b431b1c74f8f758a78a9f723a00d1ded6cb7038f251ed46336446f86f59425acde8c9011d1008d30121f1c2f377d8259fdb502be549f494
+MISC ChangeLog-2015 856 SHA256 298489ae80d4329840fec3fc8fd45b1e0d38fba696494c768d90565b839c8208 SHA512 fe888d9480162426c61ad88abeb8417e11381df35b999d014be16ede8ff4f6c79de65b771428922c6317de788a5951d4f7c2df536d8bf6d9684122be5b30a172 WHIRLPOOL 44f026ac2a35693dd0e7d9dc52f262d854b9e655a36afcb625b060c0bfc4d3e68908f8650a95eb88901a157eb5c3b38747a07519a998bc648d293ce49da143e0
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/pygene/metadata.xml b/dev-python/pygene/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/pygene/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pygene/pygene-0.2.1-r1.ebuild b/dev-python/pygene/pygene-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..8f7505711f59
--- /dev/null
+++ b/dev-python/pygene/pygene-0.2.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple python genetic algorithms programming library"
+HOMEPAGE="http://www.freenet.org.nz/python/pygene/"
+SRC_URI="http://www.freenet.org.nz/python/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+DEPEND="doc? ( >=dev-python/epydoc-2.1-r2[${PYTHON_USEDEP}] )"
+RDEPEND="examples? ( >=dev-python/pyfltk-1.1.2:0[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	if use examples; then
+		mkdir examples || die
+		mv demo*.py salesman.gif examples || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		epydoc -n "pygene - Python genetic algorithms" -o doc pygene \
+		|| die "Generation of documentation failed"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygeocoder/Manifest b/dev-python/pygeocoder/Manifest
new file mode 100644
index 000000000000..d6bfe0959924
--- /dev/null
+++ b/dev-python/pygeocoder/Manifest
@@ -0,0 +1,5 @@
+DIST pygeocoder-1.2.5.tar.gz 8105 SHA256 c1b8353ec8877cedd070d58cb597c4a94b70df00dc0c482d43aa9a21c90bbba0 SHA512 eb395d2f334f5a1de9ed8abb6298d16b49ab7c29cc421daecc816737e89fd7c6f205024a553f2b0d559401df8f26729c042604fbb0ed49f5a763fe833db3745f WHIRLPOOL 8b2cf90af2c035afca455d661fdc330f180c89fc23a865dc6aa0df71d6eb7c7265a21cd97bed0420f457ab77e705ad40c680e1297ab0af4a5349030170e2004f
+EBUILD pygeocoder-1.2.5.ebuild 467 SHA256 4c5e6dc2db3fb51dae5ead9fc1130737363ab382f51744ec9e63c1336449d6a9 SHA512 c8a43171e97377c4a7e67095071e7cc0afcbdf726cc05508df741e9aa36830d9af2c6605907ac45b5cce34cf013971b64ece2b9a29acd27fd9bc06a7ff30f6bf WHIRLPOOL b02b9b2af1b9b4f957ab686b89e071ad44ac58ee0933d75d70871a47e4c1ce351fff6125223819d7d7d076aaf4c6df810b6c0bc921e89941bb0a333cb7466b2a
+MISC ChangeLog 2569 SHA256 69c2eacecf45b7c4331bae52a45031266d36ac447ca28356c7cf7e945ed0f193 SHA512 f9388a664215cc5d506d81ae11f28bd927b6fdc3a938ea702915023f22778ab7c9290076d51c2aae5c859c21c8216af6a1e7c22c03db3b4e8143d553a2827055 WHIRLPOOL 38ad31b63c1ccc1f84a161eb951095ec58651293d9f98d5d73c6effea604932d755bab784c3682350157abd4985c341d05c778490248e656cd385238a580c627
+MISC ChangeLog-2015 1141 SHA256 ca5e380045a5866f78a4deadadea4cd8eb3ce468e60d255e9b91961dfeeb2534 SHA512 47f541aa36d66d1fc22fdff8252c063d8d4ad32e5ce7b51b20a248b689fc3e7333d38890133503557f7c4e17c93254bff3221efa228bb25170b30c8bd8403736 WHIRLPOOL 133eb8488177370c4c3831f4d956e88047bf4561533664454139924a0ed969fe97fc84acd835ff6714a80cf86a9f978c906c20134a96e884017b60786786b737
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/pygeocoder/metadata.xml b/dev-python/pygeocoder/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/pygeocoder/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pygeocoder/pygeocoder-1.2.5.ebuild b/dev-python/pygeocoder/pygeocoder-1.2.5.ebuild
new file mode 100644
index 000000000000..d00f2e0076a1
--- /dev/null
+++ b/dev-python/pygeocoder/pygeocoder-1.2.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for Google Geocoding API V3"
+HOMEPAGE="http://code.xster.net/pygeocoder/overview"
+SRC_URI="http://code.xster.net/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/requests-1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
new file mode 100644
index 000000000000..d363147cc97a
--- /dev/null
+++ b/dev-python/pygit2/Manifest
@@ -0,0 +1,10 @@
+AUX pygit2-0.25.1-cffi-1.10.patch 2309 SHA256 4d02d1d9e637428247af14bc1b3cd75596244bc339b960d7c9bbffccab12bc98 SHA512 adcd46ccf81d01afe5d959e50f0acaae392fc2422a7e0582a9d065d860c2d0d9245505ce5c156136921f48c126a3741bb65be5a021b53116ccf5f0f1451c00f3 WHIRLPOOL 7743b9d9db2be31cd4f7d60be3c0024780e1c284f8c34397419a77f1475ee1a2881b48a916bba8e20cd2a49620ecc9a6044d808e71a62567f225aa084aa5b305
+DIST pygit2-0.25.0.tar.gz 472116 SHA256 de0ed85fd840dfeb32bcaa94c643307551dc0d967c3714e49087e7edc0cdc571 SHA512 44f94869718111acbd4ad41bc4c37ac66557e979241dd5a7bb080cf091fec3fc3d5aa53a8a84eb37b2e6f89518b2ac69d058e1970b7cf98c35b8375807fd8f86 WHIRLPOOL 71d8eb87ef9cd2a1d77ecc1258d5d02f2d0075144fc81556e8a2c0b599202cf17b06c548767b956748feaa13d3ece0d3a664cfe95ab93004e345890805c58175
+DIST pygit2-0.25.1.tar.gz 456580 SHA256 e8696033052fa0221114ee7f632d38777cc29e58230cd6a05de5725cd31b4a6a SHA512 19908c874d5c2469609a54893f37367480d27ff03583c38b474ebb125dc9db95dc60776a120bb05662938d6eb62d4bcef24f684688e97e3453ccc27e015736cd WHIRLPOOL 648aabcecde66fd5b1d3cf840c51693c237e75f9da7bb793e4e9c18537cb12e4b35d5dced17389bb24440a4c72f37175e1a0a5e44a9c69811c54cf60d11f7d3f
+DIST pygit2-0.26.0.tar.gz 457263 SHA256 a7f06d61f25ab644c39e0e9bd4846a6cc4af81ae27f889473e6f0e9511226cb1 SHA512 e8626712a3b75aced14997dda0155f5c7be9a7e0e43aeb2c767c848fcbe711780137f663cc9ad5268cd85e2c61fd40be6853573f68b457cd5d46d6c32a644076 WHIRLPOOL 909d3d4f06c04107309b53653f5395f76de61195269ba753b7658725a27235ede94df48b74b547a2bafef7e20f8916c01f6d7d7f2e434965621364d51f4e32fa
+EBUILD pygit2-0.25.0.ebuild 641 SHA256 31d7fc94488e9481bc9fba9b487358744eac40a0455596105a2a993755b157ef SHA512 d884ca94c0b032f1df2de58c91099a16df92239582a2b672dc95a4c3797956c56dd82c36661347129acd4e5be6f57e3c845d2cae34a40d28a4a5d11e8ec0747f WHIRLPOOL 557ae9bc91ae029bb007075f47794aff96087a738e8678192762312a426fcda94340b1ae9cfc6dd138466817fba6140085a1a02792b2192bf7f54ca9faf53343
+EBUILD pygit2-0.25.1.ebuild 699 SHA256 6cbdc00f861e05993f9bae9cb0ce15d5af9322a0551572f8958acd341237bc6f SHA512 5f55fd77acb4ddbf3fdb8d7d56dba9e3882dfe30a271cb5f0bb1a8dc89ee65172fd66ab0f46c543c8722af020be751055c37589e6d9b91f1cefb6d22b4e0f72c WHIRLPOOL 6067e9f5a04b8eaa21a7b7670d8ceaba25af871ca2985d978ff01c59b5cb4f70a22785c16277cee290557a3a9e9e19b61dae2cdf10d72a7aae251bee5b32955f
+EBUILD pygit2-0.26.0.ebuild 619 SHA256 38a0ca9a337993f6873fc9cbe5128d33383460f6ac9be482cdd78a5c056f8587 SHA512 cc8117191d84109951f47045fd4c92183fccf91f73a1abbe3880b71f4d0967874118a2a36ecf4cbf2faa2fb84cf82b5629ca48f185e2e0daf446d7af367995b0 WHIRLPOOL f36233d3c9e860ee7e7db1784c3a3ebc7c3654c0e985aba1a356dab05e13941c557614a98ed15e246ca8ef5ff863ff86131328b3dcb57c21baab3320d03fdaf6
+MISC ChangeLog 3901 SHA256 de7c24d8c956c4378ab2ebd8a064219afec02264b18d667d523a63bbb98b357b SHA512 9506bcbab332e1d4c375dd53425962d609c743bbaf4e6d477e0b50c3f4d405d4c29eb0ec56caa40f12a7a91edb54682f6b518671aff2d90236e4568d0a569a20 WHIRLPOOL 9f4815df943c0af5be22b4889b92b332d9bb86733ad233c89d75a4ccc0fb2ed1a67a10443645184efe1687f94f05ddcbede5e152b4a57801d7c051f76de964e4
+MISC ChangeLog-2015 5270 SHA256 1e405b614fbefad70c3313b3b5aa11fe25b641d551db98d1919540b178d2ad8f SHA512 e05c29cf035e4c77bb7695d29320748841ac741764d3f2249bceb265bc8bd19e4bce5b99e53f2849b107c4baff1651a5a8eb4768e0f2b487698f49677f781de5 WHIRLPOOL 91d562488119ae69758ee46b8d04c623d63c429b178cb94e1ba997203aa715c13c0528b6160177a07d9dc32132cef7d15b050f4caefb2762b02a8a1548629914
+MISC metadata.xml 489 SHA256 59152049942b20526f8d447835d13884d211bbcd90da4c13fab6fbb348c1f498 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e WHIRLPOOL c972dfb9f803a2ce552f06af598216ff0973a46e03a882c9f66812d4a36d84ec0194c99893a84b6f919d98e3993d30cf21f638dea28f5a147336bf576a5abdb5
diff --git a/dev-python/pygit2/files/pygit2-0.25.1-cffi-1.10.patch b/dev-python/pygit2/files/pygit2-0.25.1-cffi-1.10.patch
new file mode 100644
index 000000000000..c071f9e5dd6b
--- /dev/null
+++ b/dev-python/pygit2/files/pygit2-0.25.1-cffi-1.10.patch
@@ -0,0 +1,55 @@
+From b88dc868423af2f760f649960112efd0e37e5335 Mon Sep 17 00:00:00 2001
+From: Lukas Fleischer <lfleischer@lfos.de>
+Date: Sat, 6 May 2017 21:39:33 +0200
+Subject: [PATCH] Fix parameter passing of describe patterns
+
+When ffi.new() is used to build a new pointer object, the returned
+pointer object has ownership on the allocated memory. When it is
+garbage-collected, then the memory is freed. Thus, we need to make sure
+the original object survives its use, otherwise the casted pointer will
+point to garbage.
+
+This fixes one test which was failing with the latest CFFI version, see
+issue #694. Thus, this commit also reverts 803b1cb (cffi 1.10 not yet
+supported, 2017-03-22) where the latest CFFI version was marked as
+unsupported.
+
+Signed-off-by: Lukas Fleischer <lfleischer@lfos.de>
+---
+ .travis.yml          | 2 +-
+ pygit2/repository.py | 6 +++++-
+ setup.py             | 4 ++--
+ 3 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/pygit2/repository.py b/pygit2/repository.py
+index 9377aa2..472f4ff 100644
+--- a/pygit2/repository.py
++++ b/pygit2/repository.py
+@@ -692,7 +692,11 @@ def describe(self, committish=None, max_candidates_tags=None,
+         if describe_strategy is not None:
+             options.describe_strategy = describe_strategy
+         if pattern:
+-            options.pattern = ffi.new('char[]', to_bytes(pattern))
++            # The returned pointer object has ownership on the allocated
++            # memory. Make sure it is kept alive until git_describe_commit() or
++            # git_describe_workdir() are called below.
++            pattern_char = ffi.new('char[]', to_bytes(pattern))
++            options.pattern = pattern_char
+         if only_follow_first_parent is not None:
+             options.only_follow_first_parent = only_follow_first_parent
+         if show_commit_oid_as_fallback is not None:
+diff --git a/setup.py b/setup.py
+index f4a9f8c..18d3eb0 100644
+--- a/setup.py
++++ b/setup.py
+@@ -203,8 +203,8 @@ def run(self):
+       long_description=long_description,
+       packages=['pygit2'],
+       package_data={'pygit2': ['decl.h']},
+-      setup_requires=['cffi<1.10'],
+-      install_requires=['cffi<1.10', 'six'],
++      setup_requires=['cffi'],
++      install_requires=['cffi', 'six'],
+       zip_safe=False,
+       cmdclass=cmdclass,
+       **extra_args)
diff --git a/dev-python/pygit2/metadata.xml b/dev-python/pygit2/metadata.xml
new file mode 100644
index 000000000000..667874d35015
--- /dev/null
+++ b/dev-python/pygit2/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">libgit2/pygit2</remote-id>
+    <remote-id type="pypi">pygit2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pygit2/pygit2-0.25.0.ebuild b/dev-python/pygit2/pygit2-0.25.0.ebuild
new file mode 100644
index 000000000000..a88aff4993c4
--- /dev/null
+++ b/dev-python/pygit2/pygit2-0.25.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 versionator
+
+DESCRIPTION="Python bindings for libgit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.python.org/pypi/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-$(get_version_component_range 1-2)*
+	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pygit2/pygit2-0.25.1.ebuild b/dev-python/pygit2/pygit2-0.25.1.ebuild
new file mode 100644
index 000000000000..35a8f52ddc96
--- /dev/null
+++ b/dev-python/pygit2/pygit2-0.25.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 versionator
+
+DESCRIPTION="Python bindings for libgit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.python.org/pypi/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-$(get_version_component_range 1-2)*
+	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/pygit2-0.25.1-cffi-1.10.patch
+)
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pygit2/pygit2-0.26.0.ebuild b/dev-python/pygit2/pygit2-0.26.0.ebuild
new file mode 100644
index 000000000000..f250bd2d58d2
--- /dev/null
+++ b/dev-python/pygit2/pygit2-0.26.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 eapi7-ver
+
+DESCRIPTION="Python bindings for libgit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.python.org/pypi/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
+}
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
new file mode 100644
index 000000000000..df0cc813d110
--- /dev/null
+++ b/dev-python/pyglet/Manifest
@@ -0,0 +1,7 @@
+DIST pyglet-1.1.4.tar.gz 2946835 SHA256 63a7936dffe4fc0475617a4d804a4b63ab13949cb30afd3c62ab98d8384f7ff3 SHA512 e1acd2e145bddbed2da1e8d66222b7057ecfcc97f93f4972741e87ec8584a944e2cc0c972aa985cb1f51e0dd2e4bbf1332201e8eb66f29945cfdac1b9ac63b64 WHIRLPOOL f31dc562b940454766a188d0ce9ac8a462a9c24e995d28cacafe1437c1f1dc609410b748d9a31f2fe8c85aac7fbfa4bc54ec2c5470560f31251af64dda258c6c
+DIST pyglet-1.2.4.tar.gz 2122017 SHA256 9f62ffbbcf2b202d084bf158685e77d28b8f4f5f2738f4c5e63a947a07503445 SHA512 70cd781936db8c8c156499e524ee73520bc90c19461074264abd62a4854307ef090af5faba521686f247fb4cbee552a428892f59a5b382429acfc000f4c2e22d WHIRLPOOL 24aa15be5819d659274a65eb39a3dcc44c74ddab3d48f8755d1a927427ce4bf05e07b6ebc3a92e1b06e8a1de97f599cb52c506732d3ec6a8a76346c9efd241c9
+EBUILD pyglet-1.1.4-r2.ebuild 760 SHA256 e0eae6c8204fa0f1250dd6efc288443ad0a0e3d16ab71b8a5e3a962cc88c811a SHA512 3c2f9f55d6e0fed6b19fb804487cb2a4f0d33e3d9174333b2bab5405b2b9e145e1fee6fff59f350241f2ad3c7c9879d99da85c76d12cee21e7bca8228a7dcdfb WHIRLPOOL 2f364e79555f656bf77efbcdeaa41820578b5730e13bfd9ffc797373dfc309160b1b82b08266bb51959675c0ac0095e09e831ca88e9d4bf0adcb2786e27d6de3
+EBUILD pyglet-1.2.4.ebuild 944 SHA256 6de0e9a0e34f63b6ab9bb48c4195676fbe6af19b11f0ea59fd701d7685b6023c SHA512 c5f8a593c2c60172bdea8e7ddfa3400cceae8c44f7c4a51d0d22a7445563433163a191190aa2d8ef7d408ff39eae85f1a18dd7b8f62e55e087f0c3a5243182de WHIRLPOOL 589d2e59193c74bc795c73b29674b83644b835287b189b3ffcee00077334db226d5d35071209d59732a495b787a8d7fe35e25cf2a8d2dabfe5bcb74fe94ce56a
+MISC ChangeLog 3471 SHA256 6a1122bae2b453827cf3c68364418ccb3081fecbcb0b10ad4ec6257ec585d1c8 SHA512 b0e3562093dca95e758d58ae4e38cc9dc2b8edfa5ceaab658d70dba49e4d06ce388824d65a4359ed5c8b49b3148e6a6e5f8a62e5f59aa51669c2562287eedb73 WHIRLPOOL fb973224d1380034a3de77b66f11929015eca4620f0366fdbf98b9a2fa5f2d811fe1c6c541f5fe8199c54a0360ff4d7a5f51ad63ee1d49aa38e4c4ab4cc28b85
+MISC ChangeLog-2015 2131 SHA256 c8ffd25ea1658b9dd1158d3e0e97c096a92337647495dac9ea651a2677783b08 SHA512 d0acd0f644d921a871aa6459209708091826f7515935f038c847b3d31394a82c5d07c72d5c18e995756da9b3ffb3de3bac0936fc5d6ad1e182973ae39176a8bb WHIRLPOOL 1c4a10bcbf8aefa7737ba610796b5b68bc489d1671cd838ac96684ddb57a4bfc0f26c8b02c27cf750e54d615a09d5dea971ec99cb27975bcea547a5d3158f08c
+MISC metadata.xml 893 SHA256 532125bdec3f860adc2b1c1a1e6640d069d3dc36a178ca2339833275dd07c80a SHA512 2bf1d8f350103309d98bda2834337acf488726e3ee141509f3423c46695c87d2a61557dec3d3c0e523815e09fd3d02eb3411779b4ce2fac05b83425401480269 WHIRLPOOL 5ef54995f1abe86d29a694f09d43cc8d5e786bb70a7458a147855e8bac5dd3e3ad5d452124654b276208e15a7dfebf92d72e20e5aaae08667c38d5869447230c
diff --git a/dev-python/pyglet/metadata.xml b/dev-python/pyglet/metadata.xml
new file mode 100644
index 000000000000..85c37d9142f7
--- /dev/null
+++ b/dev-python/pyglet/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="project">
+    <email>sci@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">This library provides an object-oriented programming interface
+  for developing games and other visually-rich applications with Python.
+  pyglet has virtually no external dependencies. For most applications
+  and game requirements, pyglet needs nothing else besides Python,
+  simplifying distribution and installation. It also handles
+  multiple windows and fully aware of multi-monitor setups.
+  pyglet might be seen as an alternative to PyGame.</longdescription>
+  <upstream>
+    <remote-id type="pypi">pyglet</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyglet/pyglet-1.1.4-r2.ebuild b/dev-python/pyglet/pyglet-1.1.4-r2.ebuild
new file mode 100644
index 000000000000..e45dc74be7ec
--- /dev/null
+++ b/dev-python/pyglet/pyglet-1.1.4-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="http://www.pyglet.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="alsa doc examples gtk +openal"
+
+RDEPEND="
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib[alisp] )
+	gtk? ( x11-libs/gtk+:2 )
+	openal? ( media-libs/openal )"
+DEPEND="${RDEPEND}"
+#	ffmpeg? ( media-libs/avbin-bin )
+
+DOCS="NOTICE"
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/html/. )
+	use examples && EXAMPLES=( examples )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyglet/pyglet-1.2.4.ebuild b/dev-python/pyglet/pyglet-1.2.4.ebuild
new file mode 100644
index 000000000000..bfe61697a4ae
--- /dev/null
+++ b/dev-python/pyglet/pyglet-1.2.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="http://www.pyglet.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="alsa examples gtk +openal"
+
+RDEPEND="
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib[alisp] )
+	gtk? ( x11-libs/gtk+:2 )
+	openal? ( media-libs/openal )"
+DEPEND="${RDEPEND}"
+#	ffmpeg? ( media-libs/avbin-bin )
+
+# pyglet.gl.glx_info.GLXInfoException: pyglet requires an X server with GLX
+RESTRICT=test
+
+python_test() {
+	python_is_python3 && return
+	VIRTUALX_COMMAND="${PYTHON}"
+	virtualmake tests/test.py
+}
+
+python_install_all() {
+	DOCS=( NOTICE )
+	use examples && EXAMPLES=( examples )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
new file mode 100644
index 000000000000..b6e02cb6303b
--- /dev/null
+++ b/dev-python/pygments/Manifest
@@ -0,0 +1,7 @@
+DIST Pygments-2.1.1.tar.gz 2114190 SHA256 2df7d9a85b56e54c7c021dc98fc877bd216ead652c10da170779c004fb59c01b SHA512 7eb35865074f573ef7d41a1f1ee7576a83c32855018d03570eb70fd6864ddfbbc3f93ae082c4ac7e4a274a0ef387ea4ccb0909423e01efb6bb8e4fefea8f2807 WHIRLPOOL 6b1ebed4b3c456ada335be87d184bfe197f489b445c362c8f1326229e137e859388e1812290bf1d7f6ed19b780dc8487fe9744863833889d961604fb9489b381
+DIST Pygments-2.2.0.tar.gz 2113944 SHA256 dbae1046def0efb574852fab9e90209b23f556367b5a320c0bcb871c77c3e8cc SHA512 cc0a4f73e19fa6cbf46314de2e809460c807c631e39ba05cbe5edb5f40db1a687aafcd9715585a0ed45f791710eb6038305e273f282f8682df76f30e63710b29 WHIRLPOOL f0562ce0b92245050657b6b8b0952bbd719ad8789434a2c87bb45594787839405bc2fcb05ed125fe1801a71739462be5be96263d27075427a4bafaa5b44e3fe7
+EBUILD pygments-2.1.1.ebuild 1676 SHA256 030f837065a820d7029103e7502c1899a30f4a47a9dbcf5ed31c492537d34cc7 SHA512 bb269a3dcdc643453ca34323245411d396e27ad0580880312e869585511fe23571d1c6c1f71adb5ce41e5b9b7fad00bc48228d73705e4aa1011cf52cea60b7dc WHIRLPOOL 2ca69ff65b159c8e66af73eb1a50975b7b5822a478c64ab0a4792da41630e0166d7231cc9cda76ff1f18f32e87ab0b61f86c7fc7a2cd531e6cce06682dac9041
+EBUILD pygments-2.2.0.ebuild 1698 SHA256 2ef9687fce869daabd63ac82fc82c4e3a352282db8eaa05f7602f3e97f5d8d95 SHA512 587cec2cbbd83d77333e378c9d041cdac47ef274da0c604c2031fc84fe44a1b22b7ff126d437fe5cc42e977e8a423f208feacb786785e828a990e5bb1c1f3e92 WHIRLPOOL cc4949622ed10ac9f2e10baea93999a81b947d1fff57f5fd366af602ee6783ac4b3f70168265a16958dbfbc411cd0524fd2bd57366d552427466ecf2cdadd16d
+MISC ChangeLog 7918 SHA256 be4b49328128e69af066e8fac89f37a52ebdfd1d0f798c4c2609b61241dfaeef SHA512 41a5e65391cfd5a8cb475417c09f3d72d4bf6661a0cf4ae8b60990f4339425382f15158f03884cf09105c3f584a43ae52bfedb1e5bbbd8084152d1af815125a2 WHIRLPOOL 28d9a130b4212bca7c0eb9e203a7c3c36570f67d8596b9f4a0885a78b6985f9c9f6335f51c648bc435a86fba15099226dd9639ca8573c49d0354315aaf4f4ff9
+MISC ChangeLog-2015 19560 SHA256 70c84251d476ca3eac0eac22f6bfdb5faa9516149f6dc68155fc26a558af349e SHA512 b0c2d5e3deab15d695368e15f457198881f86691e5e636fb92d7a56ea99a1c73e5a37c589d91c2166d607cfa11e22bb949e41d4446f03b53b4535c604315f780 WHIRLPOOL ba4e36058ff3810f89c17cef2c78cd42cd4777cd9571caa833532ab19afcfa5883723d07b58878dad81ddf9af562ed4e2d6c0d0d7e417c18d9615348bfba8151
+MISC metadata.xml 542 SHA256 6d5740a53ecddfc87bf7cffb8268b388bda1f23d5b58c0b883a46d97e6b11d3a SHA512 f15732bb743ed5ad4049036c7b87118c89be09e260ae483b4c7e25155a31c0ab8844f8a1050386a0ee81d2b1e55d240f90cab3e28749b8f943baf64ec176814b WHIRLPOOL 9fe93599eba59543200bf2ea28d612299fd3d3a942a08935cd66c8eaffe4daa1b1ae4fdd2608c28e46902b41cd4294c283e867094340e1078e98e857252ca94c
diff --git a/dev-python/pygments/metadata.xml b/dev-python/pygments/metadata.xml
new file mode 100644
index 000000000000..c3ac451b5ed0
--- /dev/null
+++ b/dev-python/pygments/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>Pygments is a syntax highlighting package written in Python. Pygments can output to html, bbcode, latex, rtf and other formats.</longdescription>
+	<upstream>
+		<remote-id type="pypi">Pygments</remote-id>
+		<remote-id type="bitbucket">birkenfeld/pygments-main</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pygments/pygments-2.1.1.ebuild b/dev-python/pygments/pygments-2.1.1.ebuild
new file mode 100644
index 000000000000..165fa998814f
--- /dev/null
+++ b/dev-python/pygments/pygments-2.1.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1 bash-completion-r1 vcs-snapshot
+
+MY_PN="Pygments"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		virtual/ttf-fonts )"
+#		dev-texlive/texlive-latexrecommended
+# Removing / commenting out this dep. I can find no mention of it in tests other than
+# importing pygment's own tex module.  If it's there and I missed it just uncomment and re-add
+# Tests pass without it
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	cp -r -l tests "${BUILD_DIR}"/ || die
+	# With pypy3 there is 1 error out of 1556 tests when run as is and
+	# (SKIP=8, errors=1, failures=1) when run with 2to3; meh
+	nosetests --verbosity=3 -w "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+	newbashcomp external/pygments.bashcomp pygmentize
+}
diff --git a/dev-python/pygments/pygments-2.2.0.ebuild b/dev-python/pygments/pygments-2.2.0.ebuild
new file mode 100644
index 000000000000..9c011757b626
--- /dev/null
+++ b/dev-python/pygments/pygments-2.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1 bash-completion-r1 vcs-snapshot
+
+MY_PN="Pygments"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		virtual/ttf-fonts )"
+#		dev-texlive/texlive-latexrecommended
+# Removing / commenting out this dep. I can find no mention of it in tests other than
+# importing pygment's own tex module.  If it's there and I missed it just uncomment and re-add
+# Tests pass without it
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	cp -r -l tests "${BUILD_DIR}"/ || die
+	# With pypy3 there is 1 error out of 1556 tests when run as is and
+	# (SKIP=8, errors=1, failures=1) when run with 2to3; meh
+	nosetests --verbosity=3 -w "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+	newbashcomp external/pygments.bashcomp pygmentize
+}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
new file mode 100644
index 000000000000..4383bb5d74ad
--- /dev/null
+++ b/dev-python/pygobject/Manifest
@@ -0,0 +1,17 @@
+AUX pygobject-2.28.3-fix-codegen-location.patch 1948 SHA256 eb16a71a8e3f45e965797ca99cc5d079b13a0f74dafc7976806d09ccd1f30476 SHA512 6f618d3826a505906669bbbe680a514e61884564f2c3025c438a97f192de6c9fd0e7f43c8e9bfff62776a51a56b0eead6ca54a0c157c071cf0f493b8f0d46506 WHIRLPOOL 5107e45f4596c12c92a4d208ce17ed0dc19811036d8acea5f6c393937eebb72de290b5ddc3b5e190edecbcfef2ad48c150e5c9bf53dc9839bc9dc0fcb3ec53d8
+AUX pygobject-2.28.3-make_check.patch 2705 SHA256 91ddf8f2d1d767f771b91568c1d669019cf4e302baf1dd2eeed4b41ff7cb75b6 SHA512 9829f92ce0ace9d1a6e84428dc16bd0a893a24e784273e79c849618ebf4749e3168e6b1f1b9a9ca7e114ec04612045985823ad34247891d8ba7609279c4c4af4 WHIRLPOOL c2d9f18347abd83b751f0deab38742380905e8be70478a9e13c580bb4a284b8d329ad47f2ddeb1bf65a183b962701b050755aa35d84e009d47057c5433a385bc
+AUX pygobject-2.28.3-support_multiple_python_versions.patch 3938 SHA256 7269f232a9b4ffe1c920c610796cb8f1dc5bcdc5cd5d03ebc7045f45d5f5d089 SHA512 b835c503ea1baa831d1f258221998c5194ea58750e33564ff7b22870a8f47dfef37d986aa282d527dd2ea2b9e598ffede38ed7dd8f966788e32e8719ac94035f WHIRLPOOL e91084a146717ca5de9528a17e8a9e4d1b396704e6a5c4529695ca67f67b2b3f91d12472b846c3b076c24aac1b8fdea66b5e4591acaed1c5f621b372222babc0
+AUX pygobject-2.28.6-disable-failing-tests.patch 3549 SHA256 b75efed51ff82724eab61b08079feb59cdb6ed49bd63ddfcbdafbc89d40e39f6 SHA512 1ff3b9474c1fbf7e4fe7f2346f862f1ba1da0748d955ebcfd606d74b885c12daa2673c31aa594925c441bfaa29390d9324e56696e291d3f7e301cbf114491cb3 WHIRLPOOL b82d77e5ea445f9dee3b9c116a7cd666de6a047e260d1e1172b3fa658ee5b3be6414369ab77ed9a3b4748efe31aefa784087a47172c7e4ac44df99d160e5e061
+AUX pygobject-2.28.6-gio-types-2.32.patch 1231 SHA256 76b8636556b56143eac3afa002c5a8938d87e613668cfce0a73ce1f1e3d6c810 SHA512 86a34f73a4436ff77488743fc15c0cc901c27b55dad9bcfdc9c32ff184bccc277217d5a0e13bc36982e14e34ab5fee5224e055879a0036a1ccdf5dc26bc737d4 WHIRLPOOL 9b66b44a994970a11e75c7ede64403eed01e10bd0e5edda9c1d95771a07457da0fefea425e217633d1eae78c02c4e980a6cb5dbeac580b63e56fd8a962d8e0d1
+AUX pygobject-2.28.6-glib-2.36-class_init.patch 11038 SHA256 02d4ec14ecdea96ffb64c7c58abdea8e38b3076cec872525449823137f7dea63 SHA512 e8acc5970ac540dc01551759591ee693ae12dd1512130b135e397e528d920159f0f8866bb8a611e2c06cd96f899ef7239153b59a2ec0318e1fd08266acf95e04 WHIRLPOOL e18b3e24109c01b61c24f7be69d62f7eea415cf43b4b9683e539d8352b28a8a2b95fd89dbc29ec4978479ea3cb50f06785733d66897c0064f3c7c41027e06d5e
+AUX pygobject-2.28.6-set_qdata.patch 847 SHA256 1dda085e0aadedf70eb8290e9c12fd27227173d3313a28d40ab923316b35bde3 SHA512 19025af51a8387061276ec9d6c8eb0ecadb5124bba2c4ab3755ab653df467896d19c366d80ce9313fd46e43b493b7c536f780014cf18a6ac47f4b1d2ad4bedb4 WHIRLPOOL 4d3be4952242d8b10b47fb3ee7d0d3e9716b6e358c3151e5c472580e3bc15c501040f7a6363b7fdef050c00bf68f65b8eacb918fd85483b0fa098af18ea34a62
+AUX pygobject-2.28.6-tests-no-introspection.patch 1257 SHA256 f10000ce8cf232240099fd319a046920eaa582fcb3f6eb20e3468145f89cd51e SHA512 7d57cb9bbd0b16f4fb0ed9d5eca310c47daf86b89daefa41fb0cf5dd470a6f6a31d0dad31dd261332c039d39bd778f9de8de7260c5856f1b718f72b9aabc01b4 WHIRLPOOL 02100886c5932114fa7ceaabcfceb6297e0bc2f3a12cd4b17e77e863fcfeebbbcab235f1d79c7cd65c201d628e818d58813c4f46b906dce4fa95c7aae8767935
+DIST pygobject-2.28.6.tar.xz 747248 SHA256 fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8 SHA512 37544ea2377258758169b25a2969d5ee1c9ffb9b6e63e05bc7a0471a49ac9169c51ec587d4489172c7d256f53df878a81c1992a08059aa7e43dbbb69f799545c WHIRLPOOL 402f764d6ca73f238784738a1e09832858fd95af5a633e825412e9e6a21e89ab6b2090d3995902ed404fc4fde445cf970c76fcd93f8f64cf9def742452776c00
+DIST pygobject-3.22.0.tar.xz 756820 SHA256 08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8a5cbe7 SHA512 1f6f0ea8014b35d7828a6bebc0fe2cf6519016ca5ad3819dc6b7879154d8e27fdd2971620955c8fc4904625814833c8bc8ec0599152720649864262d3b6e33e4 WHIRLPOOL c285669e4d07a9b0cf79ba06528d3809d0c2807b2345dc6eeec011ed351cd45155119b2691cd10a498fb76d67486026e997d93c80b3a7ea60176e053d4452374
+DIST pygobject-3.24.1.tar.xz 758648 SHA256 a628a95aa0909e13fb08230b1b98fc48adef10b220932f76d62f6821b3fdbffd SHA512 f35968ab12b872c85af6b2410cadedcf9fa7e17352a40f3dc557c86203aa1c38753710aab9ce55e986ee2c98b64e14123c65083655445e993d0b53431db6dc93 WHIRLPOOL 998293b07796b4a5b7db475428f6aea46dbac93fc31e5b210307c1b68390341f92121741cec714dc3e7bc2f460dd1248d7eb37775baef51be9e6b9078ea3b332
+EBUILD pygobject-2.28.6-r55.ebuild 3541 SHA256 246d6c5bc96880bbeb5dc34b6d95748bac59a3e73f30078d45d01d3d65f6e6ed SHA512 d4c7e7a96b5151472b20bb1663b94383acaa526c5df4d545289ca9fe0cc18889238df8b1aeaddf19a1a46cd046b43c46268a65b0e820dc7ebe403d05d664b64b WHIRLPOOL a610f99275efc0a3613dcd6818eaa708bc9876b505a7b4f8fabdb22d1ffb3aaa5651a17b549dbfaa9723e94c322deef19cecbce7b6510a6c3531f70ef6b32483
+EBUILD pygobject-3.22.0.ebuild 2940 SHA256 813d09e3e4040ccf82cede0dd5f2b1cd522d8f8ef7711040d576cae5e9d1db63 SHA512 999d60141ed662a29b0a8f28c57b4bf3e2dbb2770cb82d573553ab18cc7e45587989b99d740bcba4908724f9c2095fc8665b3a24c1bc1185a20b334cb431bf48 WHIRLPOOL 935490fc60ce87d3080102fe8e38203bc93060e165ef12e6b823a97bc2c5e69876afe909c1847e0cd2042fc68ee7b878093c4bf4b6e8722c188f605549707290
+EBUILD pygobject-3.24.1.ebuild 3166 SHA256 b4c5e7c0791df6b3de541ae4bb5db083e9d79d09c9217bb6f260d68cb3a0a599 SHA512 3cc5402d1abd2280e103e32a0b03945ff9dbd5bdf6a8ce66cce9efb148eafc777a5b21bf1e5c61c85d1223936b3a5ab3eb3915a6211e959cbb8394b1017305e5 WHIRLPOOL 71921cad5c69300c82f1bfbaa91a182cbba9b87aa884b65821ab5a36cf5f7d3a120e47601cfbeb80b15ef4a2daf6d4ac5e1b4186b7a1a0b45f85ee12edd083b8
+MISC ChangeLog 8150 SHA256 a7b5d8e590c4ecc63af45b3ad49cbe2fb09cab834b6aff516d287bcf700d554f SHA512 98370efa494e4f087c638aff6d4618876b6d36391535a8c122124bfe6a73ed02e8c1e6fb0c3fb4c323be7aba4d270976c89c88a87cfaa7a600363bc21d70eb58 WHIRLPOOL 9872fb322864299e13e81eca6dc2bfb37874b6d21d5309e1e2d14ca7f389245db1615a54f4fe42ad1cc1a83a41a4d2e933bde52ef4d7122429796f35951cdeed
+MISC ChangeLog-2015 44485 SHA256 582556de49ad97c65ea91b61e79669ac170a57b003d76e5470806e8c4b5428fb SHA512 b69c96788bd338e93ee16aff5144b768df3e574deef4d580c0bceca068f0767e6c5122771c83c1eafad8db91b66878bcd46e2dd7739be87580dea51cd5f27ea0 WHIRLPOOL fa6c5aef01f3d8e2203eb8613314361f0f9843978d936243146b7aca036579cc62cffe7255ee306046b853cdd2128ba0bdb87485ed73c4bc8c2c66f3915c6b87
+MISC metadata.xml 353 SHA256 6c3967e281629b8778beccb842568a41d665f9db5a9899a74a56dc6500bd4214 SHA512 abcb7bb015ebb246584f60f388837ed0638040f730111831b52716cbc5a9c4ab0c422397702e1d87e56b2947108d5cfa5aeac7489bcd6f89db480c68c572bcdc WHIRLPOOL 46c10a493c2d6a836b1de09d32c3d7012067e6935b2daa144f5bc27fe9d492706bfde9ce4f553d5453463ba152fb4f67155bcd5b220ef5426d04ca3abd625779
diff --git a/dev-python/pygobject/files/pygobject-2.28.3-fix-codegen-location.patch b/dev-python/pygobject/files/pygobject-2.28.3-fix-codegen-location.patch
new file mode 100644
index 000000000000..44440a526b81
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.28.3-fix-codegen-location.patch
@@ -0,0 +1,64 @@
+From b3e852d29bfd1e90f7e0da409fd0ae36cc01675a Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 8 Apr 2011 15:36:35 +0200
+Subject: [PATCH 1/3] Move codegen to a non-private directory
+
+---
+ codegen/Makefile.am              |    2 +-
+ codegen/pygobject-codegen-2.0.in |    3 ++-
+ pygobject-2.0.pc.in              |    3 ++-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/codegen/Makefile.am b/codegen/Makefile.am
+index f9886eb..d714ff2 100644
+--- a/codegen/Makefile.am
++++ b/codegen/Makefile.am
+@@ -2,7 +2,7 @@ PLATFORM_VERSION = 2.0
+ 
+ bin_SCRIPTS = pygobject-codegen-$(PLATFORM_VERSION)
+ 
+-codegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen
++codegendir = $(pyexecdir)/gtk-2.0/codegen
+ 
+ codegen_SCRIPTS = \
+ 	code-coverage.py \
+diff --git a/codegen/pygobject-codegen-2.0.in b/codegen/pygobject-codegen-2.0.in
+index c5c912e..c04451b 100644
+--- a/codegen/pygobject-codegen-2.0.in
++++ b/codegen/pygobject-codegen-2.0.in
+@@ -1,9 +1,10 @@
+ #!/bin/sh
+ 
+ prefix=@prefix@
++exec_prefix=@exec_prefix@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+-codegendir=${datadir}/pygobject/2.0/codegen
++codegendir=@pyexecdir@/gtk-2.0/codegen
+ 
+ PYTHONPATH=$codegendir
+ export PYTHONPATH
+diff --git a/pygobject-2.0.pc.in b/pygobject-2.0.pc.in
+index a47b685..0d1a811 100644
+--- a/pygobject-2.0.pc.in
++++ b/pygobject-2.0.pc.in
+@@ -4,6 +4,7 @@ includedir=@includedir@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+ libdir=@libdir@
++pyexecdir=@pyexecdir@
+ 
+ # you can use the --variable=pygtkincludedir argument to
+ # pkg-config to get this value.  You might want to use this to
+@@ -12,7 +13,7 @@ pygtkincludedir=${includedir}/pygtk-2.0
+ fixxref=${datadir}/pygobject/xsl/fixxref.py
+ pygdocs=${datadir}/gtk-doc/html/pygobject
+ defsdir=${datadir}/pygobject/2.0/defs
+-codegendir=${datadir}/pygobject/2.0/codegen
++codegendir=${pyexecdir}/gtk-2.0/codegen
+ overridesdir=@pyexecdir@/gi/overrides
+ 
+ Name: PyGObject
+-- 
+1.7.4.1
+
diff --git a/dev-python/pygobject/files/pygobject-2.28.3-make_check.patch b/dev-python/pygobject/files/pygobject-2.28.3-make_check.patch
new file mode 100644
index 000000000000..45c04b96780e
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.28.3-make_check.patch
@@ -0,0 +1,76 @@
+From b5c4b8b97a1ccb9a4c63ab726ea9c84d81ef51ca Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 5 Nov 2010 23:39:08 +0100
+Subject: [PATCH 2/3] Do not build tests unless needed
+
+---
+ tests/Makefile.am |   12 +++++-------
+ tests/runtests.py |    2 ++
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index bad15f0..5b0859a 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -1,7 +1,7 @@
+ CLEANFILES =
+-noinst_LTLIBRARIES = 
++check_LTLIBRARIES = 
+ if ENABLE_INTROSPECTION
+-noinst_LTLIBRARIES += libregress.la libgimarshallingtests.la
++check_LTLIBRARIES += libregress.la libgimarshallingtests.la
+ 
+ nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
+ libregress_la_CFLAGS = $(GIO_CFLAGS) $(PYCAIRO_CFLAGS)
+@@ -46,7 +46,7 @@ gschemas.compiled: org.gnome.test.gschema.xml
+ CLEANFILES += Regress-1.0.gir Regress-1.0.typelib GIMarshallingTests-1.0.gir GIMarshallingTests-1.0.typelib gschemas.compiled
+ endif
+ 
+-noinst_LTLIBRARIES += testhelper.la
++check_LTLIBRARIES += testhelper.la
+ 
+ testhelper_la_CFLAGS = -I$(top_srcdir)/gobject -I$(top_srcdir)/glib $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
+ testhelper_la_LDFLAGS = -module -avoid-version
+@@ -66,8 +66,6 @@ testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
+ 	test -L $@ || $(LN_S) .libs/$@ $@
+ 
+ 
+-all: $(LTLIBRARIES:.la=.so)
+-
+ TEST_FILES_STATIC = \
+ 	test_gobject.py \
+ 	test_interface.py \
+@@ -109,7 +107,7 @@ EXTRA_DIST = \
+ EXTRA_DIST += $(TEST_FILES_STATIC) $(TEST_FILES_GI) $(TEST_FILES_GIO)
+ 
+ clean-local:
+-	rm -f $(LTLIBRARIES:.la=.so) file.txt~
++	rm -f $(check_LTLIBRARIES:.la=.so) file.txt~
+ 
+ DBUS_LAUNCH=$(shell which dbus-launch)
+ RUN_TESTS_ENV_VARS= \
+@@ -121,7 +119,7 @@ RUN_TESTS_ENV_VARS= \
+ RUN_TESTS_LAUNCH=$(RUN_TESTS_ENV_VARS) $(DBUS_LAUNCH) $(EXEC_NAME) $(PYTHON) $(srcdir)/runtests.py
+ 
+ # run tests in separately to avoid loading static and introspection bindings in the same process
+-check-local: $(LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib gschemas.compiled
++check-local: $(check_LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib gschemas.compiled
+ 	TEST_FILES="$(TEST_FILES_STATIC)" $(RUN_TESTS_LAUNCH)
+ 	TEST_FILES="$(TEST_FILES_GI)" $(RUN_TESTS_LAUNCH)
+ if BUILD_GIO
+diff --git a/tests/runtests.py b/tests/runtests.py
+index 2bb8637..4107bcf 100644
+--- a/tests/runtests.py
++++ b/tests/runtests.py
+@@ -6,6 +6,8 @@ import sys
+ 
+ import unittest
+ 
++# Some tests fail with translated messages.
++os.environ["LC_ALL"] = "C"
+ 
+ # force untranslated messages, as we check for them in some tests
+ os.environ['LC_MESSAGES'] = 'C'
+-- 
+1.7.4.1
+
diff --git a/dev-python/pygobject/files/pygobject-2.28.3-support_multiple_python_versions.patch b/dev-python/pygobject/files/pygobject-2.28.3-support_multiple_python_versions.patch
new file mode 100644
index 000000000000..65d881a43d2a
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.28.3-support_multiple_python_versions.patch
@@ -0,0 +1,103 @@
+From 2f75378f3c56f245cabdcd2c52b561dbb878db2d Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Fri, 8 Apr 2011 15:43:39 +0200
+Subject: [PATCH 3/3] Enable support to build against multiple version of python
+
+---
+ codegen/pygobject-codegen-2.0.in |    2 +-
+ gi/Makefile.am                   |    2 +-
+ gio/Makefile.am                  |    2 +-
+ glib/Makefile.am                 |   10 +++++-----
+ gobject/Makefile.am              |    2 +-
+ 5 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/codegen/pygobject-codegen-2.0.in b/codegen/pygobject-codegen-2.0.in
+index c04451b..194e5ba 100644
+--- a/codegen/pygobject-codegen-2.0.in
++++ b/codegen/pygobject-codegen-2.0.in
+@@ -4,7 +4,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+-codegendir=@pyexecdir@/gtk-2.0/codegen
++codegendir=$(@PYTHON@ -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, prefix='@exec_prefix@')")/gtk-2.0/codegen
+ 
+ PYTHONPATH=$codegendir
+ export PYTHONPATH
+diff --git a/gi/Makefile.am b/gi/Makefile.am
+index 31f6c79..8690522 100644
+--- a/gi/Makefile.am
++++ b/gi/Makefile.am
+@@ -25,7 +25,7 @@ _gi_la_LDFLAGS = \
+ 	-export-symbols-regex "init_gi|PyInit__gi"
+ _gi_la_LIBADD = \
+ 	$(GI_LIBS) \
+-	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
++	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+ _gi_la_SOURCES = \
+ 	pygi-repository.c \
+ 	pygi-repository.h \
+diff --git a/gio/Makefile.am b/gio/Makefile.am
+index 6b3eb57..00e1c54 100644
+--- a/gio/Makefile.am
++++ b/gio/Makefile.am
+@@ -67,7 +67,7 @@ EXTRA_DIST += $(GIO_DEFS) $(GIO_OVERRIDES)
+ gio.c: $(GIO_DEFS) $(GIO_OVERRIDES)
+ _gio_la_CFLAGS = $(GIO_CFLAGS)
+ _gio_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gio
+-_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
++_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+ _gio_la_SOURCES = \
+ 	giomodule.c \
+ 	pygio-utils.c \
+diff --git a/glib/Makefile.am b/glib/Makefile.am
+index e210318..df39687 100644
+--- a/glib/Makefile.am
++++ b/glib/Makefile.am
+@@ -4,7 +4,7 @@ INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -DPY_SSIZE_T_CLEAN
+ pkgincludedir = $(includedir)/pygtk-2.0
+ pkginclude_HEADERS = pyglib.h
+ 
+-lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@.la
++lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+ 
+ pkgpyexecdir = $(pyexecdir)
+ 
+@@ -19,9 +19,9 @@ if PLATFORM_WIN32
+ common_ldflags += -no-undefined
+ endif
+ 
+-libpyglib_2_0_@PYTHON_BASENAME@_la_CFLAGS = $(GLIB_CFLAGS)
+-libpyglib_2_0_@PYTHON_BASENAME@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
+-libpyglib_2_0_@PYTHON_BASENAME@_la_SOURCES = 	\
++libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CFLAGS = $(GLIB_CFLAGS)
++libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
++libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_SOURCES = 	\
+ 	pyglib.c		\
+ 	pyglib.h		\
+ 	pyglib-private.h 	\
+@@ -29,7 +29,7 @@ libpyglib_2_0_@PYTHON_BASENAME@_la_SOURCES = 	\
+ 
+ _glib_la_CFLAGS = $(GLIB_CFLAGS)
+ _glib_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_glib|PyInit__glib"
+-_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@.la
++_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+ _glib_la_SOURCES = 	 	\
+ 	glibmodule.c	 	\
+ 	pygiochannel.c 	 	\
+diff --git a/gobject/Makefile.am b/gobject/Makefile.am
+index 7208329..3f9ad8e 100644
+--- a/gobject/Makefile.am
++++ b/gobject/Makefile.am
+@@ -35,7 +35,7 @@ _gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_gobject|PyInit__
+ _gobject_la_LIBADD = \
+ 	$(GLIB_LIBS) \
+ 	$(FFI_LIBS) \
+-	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
++	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+ _gobject_la_SOURCES =           \
+         gobjectmodule.c         \
+         pygboxed.c              \
+-- 
+1.7.4.1
+
diff --git a/dev-python/pygobject/files/pygobject-2.28.6-disable-failing-tests.patch b/dev-python/pygobject/files/pygobject-2.28.6-disable-failing-tests.patch
new file mode 100644
index 000000000000..f9d396dc4b56
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.28.6-disable-failing-tests.patch
@@ -0,0 +1,98 @@
+From 9d8867a7c67a14d055a0dd8db5f6a9aae5762a04 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 13 Jan 2013 19:50:14 -0500
+Subject: [PATCH] Disable failing tests
+
+---
+ tests/test_gio.py       | 13 ++++++++-----
+ tests/test_overrides.py |  4 ++--
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/tests/test_gio.py b/tests/test_gio.py
+index e14eddf..a4d1bc7 100644
+--- a/tests/test_gio.py
++++ b/tests/test_gio.py
+@@ -650,10 +650,11 @@ class TestInputStream(unittest.TestCase):
+             else:
+                 return read_data
+ 
++    """
+     def testReadAsync(self):
+         def callback(stream, result):
+-            self.assertEquals(result.get_op_res_gssize(), 7)
+             try:
++                self.assertEquals(result.get_op_res_gssize(), 7)
+                 data = stream.read_finish(result)
+                 self.assertEquals(data, "testing")
+                 stream.close()
+@@ -694,7 +695,7 @@ class TestInputStream(unittest.TestCase):
+         self.assertRaises(TypeError, self.stream.read_async, 1024,
+                           priority=1, cancellable="bar")
+         self.assertRaises(TypeError, self.stream.read_async, 1024, 1, "bar")
+-
++    """
+ 
+     # FIXME: this makes 'make check' freeze
+     def _testCloseAsync(self):
+@@ -822,10 +823,11 @@ class TestOutputStream(unittest.TestCase):
+ 
+         self.assertEquals(stream.get_contents(), some_data)
+ 
++    """
+     def testWriteAsync(self):
+         def callback(stream, result):
+-            self.assertEquals(result.get_op_res_gssize(), 7)
+             try:
++                self.assertEquals(result.get_op_res_gssize(), 7)
+                 self.assertEquals(stream.write_finish(result), 7)
+                 self.failUnless(os.path.exists("outputstream.txt"))
+                 self.assertEquals(open("outputstream.txt").read(), "testing")
+@@ -861,6 +863,7 @@ class TestOutputStream(unittest.TestCase):
+         self.assertRaises(TypeError, self.stream.write_async, "foo",
+                           priority=1, cancellable="bar")
+         self.assertRaises(TypeError, self.stream.write_async, "foo", 1, "bar")
++    """
+ 
+     # FIXME: this makes 'make check' freeze
+     def _testCloseAsync(self):
+@@ -1007,7 +1010,7 @@ class TestVfs(unittest.TestCase):
+ class TestVolume(unittest.TestCase):
+     def setUp(self):
+         self.monitor = gio.volume_monitor_get()
+-    
++"""    
+     def testVolumeEnumerate(self):
+         volumes = self.monitor.get_volumes()
+         self.failUnless(isinstance(volumes, list))
+@@ -1018,7 +1021,7 @@ class TestVolume(unittest.TestCase):
+                 for id in ids:
+                     if id is not None:
+                         self.failUnless(isinstance(id, str))
+-
++"""
+ class TestFileInputStream(unittest.TestCase):
+     def setUp(self):
+         self._f = open("file.txt", "w+")
+diff --git a/tests/test_overrides.py b/tests/test_overrides.py
+index 47f38a3..063792d 100644
+--- a/tests/test_overrides.py
++++ b/tests/test_overrides.py
+@@ -337,13 +337,13 @@ class TestPango(unittest.TestCase):
+         desc = Pango.FontDescription('monospace')
+         self.assertEquals(desc.get_family(), 'monospace')
+         self.assertEquals(desc.get_variant(), Pango.Variant.NORMAL)
+-
++"""
+     def test_layout(self):
+         self.assertRaises(TypeError, Pango.Layout)
+         context = Pango.Context()
+         layout = Pango.Layout(context)
+         self.assertEquals(layout.get_context(), context)
+-
++"""
+ class TestGdk(unittest.TestCase):
+ 
+     def test_constructor(self):
+-- 
+1.8.1
+
diff --git a/dev-python/pygobject/files/pygobject-2.28.6-gio-types-2.32.patch b/dev-python/pygobject/files/pygobject-2.28.6-gio-types-2.32.patch
new file mode 100644
index 000000000000..fa0adf54ad04
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.28.6-gio-types-2.32.patch
@@ -0,0 +1,50 @@
+From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt@desrt.ca>
+Date: Mon, 12 Mar 2012 16:44:14 -0400
+Subject: [PATCH] gio-types.defs: change some enums to flags
+
+These flags types were originally incorrectly handled in glib as being
+enums.  That bug was fixed, but they're still enums here, leading to
+warnings about the mismatch.
+
+Change them to flags.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=668522
+---
+ gio/gio-types.defs |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gio/gio-types.defs b/gio/gio-types.defs
+index 331e0bc..7eee5c8 100644
+--- a/gio/gio-types.defs
++++ b/gio/gio-types.defs
+@@ -526,7 +526,7 @@
+   )
+ )
+ 
+-(define-enum MountMountFlags
++(define-flags MountMountFlags
+   (in-module "gio")
+   (c-name "GMountMountFlags")
+   (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
+@@ -545,7 +545,7 @@
+   )
+ )
+ 
+-(define-enum DriveStartFlags
++(define-flags DriveStartFlags
+   (in-module "gio")
+   (c-name "GDriveStartFlags")
+   (gtype-id "G_TYPE_DRIVE_START_FLAGS")
+@@ -770,7 +770,7 @@
+   )
+ )
+ 
+-(define-enum SocketMsgFlags
++(define-flags SocketMsgFlags
+   (in-module "gio")
+   (c-name "GSocketMsgFlags")
+   (gtype-id "G_TYPE_SOCKET_MSG_FLAGS")
+-- 
+1.7.8.5
+
diff --git a/dev-python/pygobject/files/pygobject-2.28.6-glib-2.36-class_init.patch b/dev-python/pygobject/files/pygobject-2.28.6-glib-2.36-class_init.patch
new file mode 100644
index 000000000000..b2f9b147f847
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.28.6-glib-2.36-class_init.patch
@@ -0,0 +1,315 @@
+From 9456ba70fdb98b3a4eb7ee2f630182387a54ca00 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martinpitt@gnome.org>
+Date: Tue, 19 Feb 2013 15:39:56 +0100
+Subject: [PATCH] Move property and signal creation into _class_init()
+
+We must not add class interfaces after g_type_class_ref() has been called the
+first time. Move signal and property creation from pyg_type_register() into
+pyg_object_class_init(), and drop the hack of registering interfaces twice.
+
+This is a backport of commit efcb0f9fd for 2.28.x. This allows old pygtk
+applications to work with pygobject 2.28.x and glib 2.35.x.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=694108
+---
+ gobject/gobjectmodule.c | 177 +++++++++++++++++++-----------------------------
+ 1 file changed, 70 insertions(+), 107 deletions(-)
+
+diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c
+index 2a84606..91f7315 100644
+--- a/gobject/gobjectmodule.c
++++ b/gobject/gobjectmodule.c
+@@ -312,13 +312,6 @@ pyg_object_get_property (GObject *object, guint property_id,
+     pyglib_gil_state_release(state);
+ }
+ 
+-static void
+-pyg_object_class_init(GObjectClass *class, PyObject *py_class)
+-{
+-    class->set_property = pyg_object_set_property;
+-    class->get_property = pyg_object_get_property;
+-}
+-
+ typedef struct _PyGSignalAccumulatorData {
+     PyObject *callable;
+     PyObject *user_data;
+@@ -484,15 +477,14 @@ override_signal(GType instance_type, const gchar *signal_name)
+ }
+ 
+ static PyObject *
+-add_signals (GType instance_type, PyObject *signals)
++add_signals (GObjectClass *klass, PyObject *signals)
+ {
+     gboolean ret = TRUE;
+-    GObjectClass *oclass;
+     Py_ssize_t pos = 0;
+     PyObject *key, *value, *overridden_signals = NULL;
++    GType instance_type = G_OBJECT_CLASS_TYPE (klass);
+ 
+     overridden_signals = PyDict_New();
+-    oclass = g_type_class_ref(instance_type);
+     while (PyDict_Next(signals, &pos, &key, &value)) {
+ 	const gchar *signal_name;
+         gchar *signal_name_canon, *c;
+@@ -530,7 +522,6 @@ add_signals (GType instance_type, PyObject *signals)
+ 	if (!ret)
+ 	    break;
+     }
+-    g_type_class_unref(oclass);
+     if (ret)
+         return overridden_signals;
+     else {
+@@ -800,14 +791,12 @@ pyg_param_spec_from_object (PyObject *tuple)
+ }
+ 
+ static gboolean
+-add_properties (GType instance_type, PyObject *properties)
++add_properties (GObjectClass *klass, PyObject *properties)
+ {
+     gboolean ret = TRUE;
+-    GObjectClass *oclass;
+     Py_ssize_t pos = 0;
+     PyObject *key, *value;
+ 
+-    oclass = g_type_class_ref(instance_type);
+     while (PyDict_Next(properties, &pos, &key, &value)) {
+ 	const gchar *prop_name;
+ 	GType prop_type;
+@@ -873,7 +862,7 @@ add_properties (GType instance_type, PyObject *properties)
+ 	Py_DECREF(slice);
+ 
+ 	if (pspec) {
+-	    g_object_class_install_property(oclass, 1, pspec);
++	    g_object_class_install_property(klass, 1, pspec);
+ 	} else {
+             PyObject *type, *value, *traceback;
+ 	    ret = FALSE;
+@@ -883,7 +872,7 @@ add_properties (GType instance_type, PyObject *properties)
+                 g_snprintf(msg, 256,
+ 			   "%s (while registering property '%s' for GType '%s')",
+                PYGLIB_PyUnicode_AsString(value),
+-			   prop_name, g_type_name(instance_type));
++			   prop_name, G_OBJECT_CLASS_NAME(klass));
+                 Py_DECREF(value);
+                 value = PYGLIB_PyUnicode_FromString(msg);
+             }
+@@ -892,11 +881,63 @@ add_properties (GType instance_type, PyObject *properties)
+ 	}
+     }
+ 
+-    g_type_class_unref(oclass);
+     return ret;
+ }
+ 
+ static void
++pyg_object_class_init(GObjectClass *class, PyObject *py_class)
++{
++    PyObject *gproperties, *gsignals, *overridden_signals;
++    PyObject *class_dict = ((PyTypeObject*) py_class)->tp_dict;
++
++    class->set_property = pyg_object_set_property;
++    class->get_property = pyg_object_get_property;
++
++    /* install signals */
++    /* we look this up in the instance dictionary, so we don't
++     * accidentally get a parent type's __gsignals__ attribute. */
++    gsignals = PyDict_GetItemString(class_dict, "__gsignals__");
++    if (gsignals) {
++	if (!PyDict_Check(gsignals)) {
++	    PyErr_SetString(PyExc_TypeError,
++			    "__gsignals__ attribute not a dict!");
++	    return;
++	}
++	if (!(overridden_signals = add_signals(class, gsignals))) {
++	    return;
++	}
++        if (PyDict_SetItemString(class_dict, "__gsignals__",
++				 overridden_signals)) {
++            return;
++        }
++        Py_DECREF(overridden_signals);
++
++        PyDict_DelItemString(class_dict, "__gsignals__");
++    } else {
++	PyErr_Clear();
++    }
++
++    /* install properties */
++    /* we look this up in the instance dictionary, so we don't
++     * accidentally get a parent type's __gproperties__ attribute. */
++    gproperties = PyDict_GetItemString(class_dict, "__gproperties__");
++    if (gproperties) {
++	if (!PyDict_Check(gproperties)) {
++	    PyErr_SetString(PyExc_TypeError,
++			    "__gproperties__ attribute not a dict!");
++	    return;
++	}
++	if (!add_properties(class, gproperties)) {
++	    return;
++	}
++	PyDict_DelItemString(class_dict, "__gproperties__");
++	/* Borrowed reference. Py_DECREF(gproperties); */
++    } else {
++	PyErr_Clear();
++    }
++}
++
++static void
+ pyg_register_class_init(GType gtype, PyGClassInitFunc class_init)
+ {
+     GSList *list;
+@@ -1068,7 +1109,7 @@ pygobject__g_instance_init(GTypeInstance   *instance,
+  */
+ static void
+ pyg_type_add_interfaces(PyTypeObject *class, GType instance_type,
+-                        PyObject *bases, gboolean new_interfaces,
++                        PyObject *bases,
+                         GType *parent_interfaces, guint n_parent_interfaces)
+ {
+     int i;
+@@ -1082,7 +1123,6 @@ pyg_type_add_interfaces(PyTypeObject *class, GType instance_type,
+         guint k;
+         PyObject *base = PyTuple_GET_ITEM(bases, i);
+         GType itype;
+-        gboolean is_new = TRUE;
+         const GInterfaceInfo *iinfo;
+         GInterfaceInfo iinfo_copy;
+ 
+@@ -1099,16 +1139,6 @@ pyg_type_add_interfaces(PyTypeObject *class, GType instance_type,
+         if (!G_TYPE_IS_INTERFACE(itype))
+             continue;
+ 
+-        for (k = 0; k < n_parent_interfaces; ++k) {
+-            if (parent_interfaces[k] == itype) {
+-                is_new = FALSE;
+-                break;
+-            }
+-        }
+-
+-        if ((new_interfaces && !is_new) || (!new_interfaces && is_new))
+-            continue;
+-
+         iinfo = pyg_lookup_interface_info(itype);
+         if (!iinfo) {
+             gchar *error;
+@@ -1129,7 +1159,7 @@ pyg_type_add_interfaces(PyTypeObject *class, GType instance_type,
+ int
+ pyg_type_register(PyTypeObject *class, const char *type_name)
+ {
+-    PyObject *gtype, *gsignals, *gproperties, *overridden_signals;
++    PyObject *gtype;
+     GType parent_type, instance_type;
+     GType *parent_interfaces;
+     guint n_parent_interfaces;
+@@ -1216,88 +1246,22 @@ pyg_type_register(PyTypeObject *class, const char *type_name)
+     }
+ 
+     /*
+-     * Note: Interfaces to be implemented are searched twice.  First
+-     * we register interfaces that are already implemented by a parent
+-     * type.  The second time, the remaining interfaces are
+-     * registered, i.e. the ones that are not implemented by a parent
+-     * type.  In between these two loops, properties and signals are
+-     * registered.  It has to be done this way, in two steps,
+-     * otherwise glib will complain.  If registering all interfaces
+-     * always before properties, you get an error like:
+-     *
+-     *    ../gobject:121: Warning: Object class
+-     *    test_interface+MyObject doesn't implement property
+-     *    'some-property' from interface 'TestInterface'
+-     *
+-     * If, on the other hand, you register interfaces after
+-     * registering the properties, you get something like:
+-     *
+-     *     ../gobject:121: Warning: cannot add interface type
+-     *    `TestInterface' to type `test_interface+MyUnknown', since
+-     *    type `test_interface+MyUnknown' already conforms to
+-     *    interface
+-     *
+-     * This looks like a GLib quirk, but no bug has been filed
+-     * upstream.  However we have a unit test for this particular
+-     * problem, which can be found in test_interfaces.py, class
+-     * TestInterfaceImpl.
++     * Note, all interfaces need to be registered before the first
++     * g_type_class_ref(), see bug #686149.
+      *
+      * See also comment above pyg_type_add_interfaces().
+      */
+-    pyg_type_add_interfaces(class, instance_type, class->tp_bases, FALSE,
++    pyg_type_add_interfaces(class, instance_type, class->tp_bases,
+                             parent_interfaces, n_parent_interfaces);
+ 
+-    /* we look this up in the instance dictionary, so we don't
+-     * accidentally get a parent type's __gsignals__ attribute. */
+-    gsignals = PyDict_GetItemString(class->tp_dict, "__gsignals__");
+-    if (gsignals) {
+-	if (!PyDict_Check(gsignals)) {
+-	    PyErr_SetString(PyExc_TypeError,
+-			    "__gsignals__ attribute not a dict!");
+-            g_free(parent_interfaces);
+-	    return -1;
+-	}
+-	if (!(overridden_signals = add_signals(instance_type, gsignals))) {
+-            g_free(parent_interfaces);
+-	    return -1;
+-	}
+-        if (PyDict_SetItemString(class->tp_dict, "__gsignals__",
+-				 overridden_signals)) {
+-            g_free(parent_interfaces);
+-            return -1;
+-        }
+-        Py_DECREF(overridden_signals);
+-    } else {
+-	PyErr_Clear();
+-    }
+ 
+-    /* we look this up in the instance dictionary, so we don't
+-     * accidentally get a parent type's __gsignals__ attribute. */
+-    gproperties = PyDict_GetItemString(class->tp_dict, "__gproperties__");
+-    if (gproperties) {
+-	if (!PyDict_Check(gproperties)) {
+-	    PyErr_SetString(PyExc_TypeError,
+-			    "__gproperties__ attribute not a dict!");
+-            g_free(parent_interfaces);
+-	    return -1;
+-	}
+-	if (!add_properties(instance_type, gproperties)) {
+-            g_free(parent_interfaces);
+-	    return -1;
+-	}
+-	PyDict_DelItemString(class->tp_dict, "__gproperties__");
+-	/* Borrowed reference. Py_DECREF(gproperties); */
+-    } else {
+-	PyErr_Clear();
++    gclass = g_type_class_ref(instance_type);
++    if (PyErr_Occurred() != NULL) {
++        g_type_class_unref(gclass);
++        g_free(parent_interfaces);
++        return -1;
+     }
+ 
+-    /* Register new interfaces, that are _not_ already defined by
+-     * the parent type.  FIXME: See above.
+-     */
+-    pyg_type_add_interfaces(class, instance_type, class->tp_bases, TRUE,
+-                            parent_interfaces, n_parent_interfaces);
+-
+-    gclass = g_type_class_ref(instance_type);
+     if (pyg_run_class_init(instance_type, gclass, class)) {
+         g_type_class_unref(gclass);
+         g_free(parent_interfaces);
+@@ -1306,9 +1270,8 @@ pyg_type_register(PyTypeObject *class, const char *type_name)
+     g_type_class_unref(gclass);
+     g_free(parent_interfaces);
+ 
+-    if (gsignals)
+-        PyDict_DelItemString(class->tp_dict, "__gsignals__");
+-
++    if (PyErr_Occurred() != NULL)
++        return -1;
+     return 0;
+ }
+ 
+-- 
+1.8.3.2
+
diff --git a/dev-python/pygobject/files/pygobject-2.28.6-set_qdata.patch b/dev-python/pygobject/files/pygobject-2.28.6-set_qdata.patch
new file mode 100644
index 000000000000..55376b59d829
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.28.6-set_qdata.patch
@@ -0,0 +1,28 @@
+From 42d871eb0b08ee6d55e95cc7e4b90844919555b9 Mon Sep 17 00:00:00 2001
+From: Ivan Stankovic <ivan.stankovic@avl.com>
+Date: Tue, 21 Feb 2012 12:24:58 +0100
+Subject: [PATCH] Fix set_qdata warning on accessing NULL gobject property
+
+https://bugzilla.gnome.org/show_bug.cgi?id=661155
+---
+ gobject/pygobject.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/gobject/pygobject.c b/gobject/pygobject.c
+index 6c2f06c..70dc89a 100644
+--- a/gobject/pygobject.c
++++ b/gobject/pygobject.c
+@@ -991,7 +991,9 @@ pygobject_new(GObject *obj)
+ PyObject *
+ pygobject_new_sunk(GObject *obj)
+ {
+-    g_object_set_qdata (obj, pygobject_ref_sunk_key, GINT_TO_POINTER (1));
++    if (obj)
++       g_object_set_qdata (obj, pygobject_ref_sunk_key, GINT_TO_POINTER (1));
++       
+     return pygobject_new_full(obj, TRUE, NULL);
+ }
+ 
+-- 
+1.7.8.5
+
diff --git a/dev-python/pygobject/files/pygobject-2.28.6-tests-no-introspection.patch b/dev-python/pygobject/files/pygobject-2.28.6-tests-no-introspection.patch
new file mode 100644
index 000000000000..d7e0c68e0dca
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.28.6-tests-no-introspection.patch
@@ -0,0 +1,33 @@
+From 9c8ec7495e9e73855dc284be293828572f408c92 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 25 Dec 2012 00:26:05 -0500
+Subject: [PATCH] Do not run introspection tests when building with
+ introspection disabled
+
+---
+ tests/Makefile.am | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index e60bad5..3a0d1b7 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -120,9 +120,14 @@ RUN_TESTS_ENV_VARS= \
+ RUN_TESTS_LAUNCH=$(RUN_TESTS_ENV_VARS) $(DBUS_LAUNCH) $(EXEC_NAME) $(PYTHON) $(srcdir)/runtests.py
+ 
+ # run tests in separately to avoid loading static and introspection bindings in the same process
+-check-local: $(check_LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib gschemas.compiled
++if ENABLE_INTROSPECTION
++CHECK_LOCAL_INTROSPECTION_REQ = Regress-1.0.typelib GIMarshallingTests-1.0.typelib gschemas.compiled
++endif
++check-local: $(check_LTLIBRARIES:.la=.so) $(CHECK_LOCAL_INTROSPECTION_REQ)
+ 	TEST_FILES="$(TEST_FILES_STATIC)" $(RUN_TESTS_LAUNCH)
++if ENABLE_INTROSPECTION
+ 	TEST_FILES="$(TEST_FILES_GI)" $(RUN_TESTS_LAUNCH)
++endif
+ if BUILD_GIO
+ 	TEST_FILES="$(TEST_FILES_GIO)" $(RUN_TESTS_LAUNCH)
+ endif 
+-- 
+1.8.0.2
+
diff --git a/dev-python/pygobject/metadata.xml b/dev-python/pygobject/metadata.xml
new file mode 100644
index 000000000000..08a5bd43f9b9
--- /dev/null
+++ b/dev-python/pygobject/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="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pygobject/pygobject-2.28.6-r55.ebuild b/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
new file mode 100644
index 000000000000..df30d8f21b53
--- /dev/null
+++ b/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-r1 virtualx
+
+DESCRIPTION="GLib's GObject library bindings for Python"
+HOMEPAGE="http://www.pygtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples libffi test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND=">=dev-libs/glib-2.24.0:2
+	dev-lang/python-exec:2
+	libffi? ( virtual/libffi:= )
+	${PYTHON_DEPS}
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	test? (
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<dev-python/pygtk-2.23"
+
+src_prepare() {
+	# Fix FHS compliance, see upstream bug #535524
+	epatch "${FILESDIR}/${PN}-2.28.3-fix-codegen-location.patch"
+
+	# Do not build tests if unneeded, bug #226345
+	epatch "${FILESDIR}/${PN}-2.28.3-make_check.patch"
+
+	# Support installation for multiple Python versions, upstream bug #648292
+	epatch "${FILESDIR}/${PN}-2.28.3-support_multiple_python_versions.patch"
+
+	# Disable tests that fail
+	epatch "${FILESDIR}/${P}-disable-failing-tests.patch"
+
+	# Disable introspection tests when we build with --disable-introspection
+	epatch "${FILESDIR}/${P}-tests-no-introspection.patch"
+
+	# Fix warning spam
+	epatch "${FILESDIR}/${P}-set_qdata.patch"
+	epatch "${FILESDIR}/${P}-gio-types-2.32.patch"
+
+	# Fix glib-2.36 compatibility, bug #486602
+	epatch "${FILESDIR}/${P}-glib-2.36-class_init.patch"
+
+	sed -i \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
+		configure.ac || die
+
+	eautoreconf
+	gnome2_src_prepare
+
+	python_copy_sources
+
+	prepare_shebangs() {
+		# Make a backup with unconverted shebangs to keep python_doscript happy
+		cp codegen/codegen.py pygobject-codegen-2.0
+		sed -e "s%#! \?/usr/bin/env python%#!${PYTHON}%" \
+			-i codegen/*.py || die "shebang convertion failed"
+	}
+	python_foreach_impl run_in_build_dir prepare_shebangs
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog* NEWS README"
+	# --disable-introspection and --disable-cairo because we use pygobject:3
+	# for introspection support
+	G2CONF="${G2CONF}
+		--disable-introspection
+		--disable-cairo
+		$(use_with libffi ffi)"
+
+	python_foreach_impl run_in_build_dir gnome2_src_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+# FIXME: With python multiple ABI support, tests return 1 even when they pass
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+
+	testing() {
+		export XDG_CACHE_HOME="${T}/${EPYTHON}"
+		run_in_build_dir Xemake -j1 check
+		unset XDG_CACHE_HOME
+	}
+	python_foreach_impl testing
+	unset GIO_USE_VFS
+}
+
+src_install() {
+	installing() {
+		local f prefixed_sitedir
+
+		gnome2_src_install
+
+		python_doscript pygobject-codegen-2.0
+
+		# Don't keep multiple copies of pygobject-codegen-2.0 script
+		prefixed_sitedir=$(python_get_sitedir)
+		dosym "${prefixed_sitedir#${EPREFIX}}/gtk-2.0/codegen/codegen.py" "/usr/lib/python-exec/${EPYTHON}/pygobject-codegen-2.0"
+	}
+	python_foreach_impl run_in_build_dir installing
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null
+}
diff --git a/dev-python/pygobject/pygobject-3.22.0.ebuild b/dev-python/pygobject/pygobject-3.22.0.ebuild
new file mode 100644
index 000000000000..0ad561ad3c44
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.22.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit eutils gnome2 python-r1 virtualx
+
+DESCRIPTION="GLib's GObject library bindings for Python"
+HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cairo examples test +threads"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	test? ( cairo )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/gobject-introspection-1.46.0:=
+	virtual/libffi:=
+	cairo? (
+		>=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
+		x11-libs/cairo )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	cairo? ( x11-libs/cairo[glib] )
+	test? (
+		dev-libs/atk[introspection]
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		x11-libs/cairo[glib]
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+		python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) )
+"
+# gnome-base/gnome-common required by eautoreconf
+
+# We now disable introspection support in slot 2 per upstream recommendation
+# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
+# older versions of slot 2 installed their own site-packages/gi, and
+# slot 3 will collide with them.
+RDEPEND="${COMMON_DEPEND}
+	!<dev-python/pygtk-2.13
+	!<dev-python/pygobject-2.28.6-r50:2[introspection]
+"
+
+src_prepare() {
+	# Test fail with xvfb but not X
+	sed -e 's/^.*TEST_NAMES=compat_test_pygtk .*;/echo "Test disabled";/' \
+		-i tests/Makefile.{am,in} || die
+
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	# Hard-enable libffi support since both gobject-introspection and
+	# glib-2.29.x rdepend on it anyway
+	# docs disabled by upstream default since they are very out of date
+	configuring() {
+		gnome2_src_configure \
+			$(use_enable cairo) \
+			$(use_enable threads thread)
+
+		# Pyflakes tests work only in python2, bug #516744
+		if use test && [[ ${EPYTHON} != python2.7 ]]; then
+			sed -e 's/if type pyflakes/if false/' \
+				-i Makefile || die "sed failed"
+		fi
+	}
+
+	python_foreach_impl run_in_build_dir configuring
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+	export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
+	export SKIP_PEP8="yes"
+
+	testing() {
+		export XDG_CACHE_HOME="${T}/${EPYTHON}"
+		run_in_build_dir virtx emake check
+		unset XDG_CACHE_HOME
+	}
+	python_foreach_impl testing
+	unset GIO_USE_VFS
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install
+
+	dodoc -r examples
+}
diff --git a/dev-python/pygobject/pygobject-3.24.1.ebuild b/dev-python/pygobject/pygobject-3.24.1.ebuild
new file mode 100644
index 000000000000..879666e93fee
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.24.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit eutils gnome2 python-r1 virtualx
+
+DESCRIPTION="GLib's GObject library bindings for Python"
+HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cairo examples test +threads"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	test? ( cairo )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/gobject-introspection-1.46.0:=
+	virtual/libffi:=
+	cairo? (
+		>=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
+		x11-libs/cairo )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	cairo? ( x11-libs/cairo[glib] )
+	test? (
+		dev-libs/atk[introspection]
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		x11-libs/cairo[glib]
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+		python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) )
+"
+# gnome-base/gnome-common required by eautoreconf
+
+# We now disable introspection support in slot 2 per upstream recommendation
+# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
+# older versions of slot 2 installed their own site-packages/gi, and
+# slot 3 will collide with them.
+RDEPEND="${COMMON_DEPEND}
+	!<dev-python/pygtk-2.13
+	!<dev-python/pygobject-2.28.6-r50:2[introspection]
+"
+
+src_prepare() {
+	# Test fail with xvfb but not X
+	sed -e 's/^.*TEST_NAMES=compat_test_pygtk .*;/echo "Test disabled";/' \
+		-i tests/Makefile.{am,in} || die
+
+	# FAIL: test_cairo_font_options (test_cairo.TestPango)
+	# AssertionError: <type 'cairo.SubpixelOrder'> != <type 'int'>
+	sed -e 's/^.*type(font_opts.get_subpixel_order()), int.*/#/' \
+		-i tests/test_cairo.py || die
+
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	# Hard-enable libffi support since both gobject-introspection and
+	# glib-2.29.x rdepend on it anyway
+	# docs disabled by upstream default since they are very out of date
+	configuring() {
+		gnome2_src_configure \
+			$(use_enable cairo) \
+			$(use_enable threads thread)
+
+		# Pyflakes tests work only in python2, bug #516744
+		if use test && [[ ${EPYTHON} != python2.7 ]]; then
+			sed -e 's/if type pyflakes/if false/' \
+				-i Makefile || die "sed failed"
+		fi
+	}
+
+	python_foreach_impl run_in_build_dir configuring
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+	export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
+	export SKIP_PEP8="yes"
+
+	testing() {
+		export XDG_CACHE_HOME="${T}/${EPYTHON}"
+		run_in_build_dir virtx emake check
+		unset XDG_CACHE_HOME
+	}
+	python_foreach_impl testing
+	unset GIO_USE_VFS
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install
+
+	dodoc -r examples
+}
diff --git a/dev-python/pygoocanvas/Manifest b/dev-python/pygoocanvas/Manifest
new file mode 100644
index 000000000000..22e192ecc221
--- /dev/null
+++ b/dev-python/pygoocanvas/Manifest
@@ -0,0 +1,5 @@
+DIST pygoocanvas-0.14.1.tar.bz2 331136 SHA256 640f54dc62eb2bd4be8ef9687c89baadd7d277895841dd24909ad9029effb3f5 SHA512 cd8175eb51358236b6488d01706d719abfdd0f3d00568e7563b2a1d7edc01f3d77b1ef23b7c062ab4a78d46d5f542c483fc883a81d2f31ce9be2b6a7385c2d22 WHIRLPOOL 3fb234d4271efc0d15fa26fc995411ba7d6ef4a3da2ef150cc3d1bd599e6e1283718d3500ec833cd176716a19765248e74d2299770feb73bfe481eecafd58ce8
+EBUILD pygoocanvas-0.14.1-r1.ebuild 1533 SHA256 6639ae772d05d134e95296731049ca370f055ea0eced303fdd2063876cd53258 SHA512 d2bdf4f0bdd579a643f2deb42a7a8f75536217caf77b35892f4e88401cd35badd318a4f0f5bd8c300f2e0df9bc1cd0df8d464d0b97ee0c7004350d18cc5e5ec0 WHIRLPOOL d9206e83fc9665c8d430839c6da0c68261f70e56edd802c3f3ecd3b169671c1e5cf6f33ab8d8807841988d52227e450bc609b0a0aa95ceb162643c4cee5bbbf6
+MISC ChangeLog 2627 SHA256 894908d37585184d7421824d76e477717cec6f30f8a582c2792b86ba5530a8e9 SHA512 362a39f3dabbac27130640d7cc524346548c15a0866ee548124d4e760a8490da54c2c32f6ba955389979daf184624d5d57d3f177c1852622b6205dd1d18893a5 WHIRLPOOL c2acb1ccae692c886b3c0a43602220afe17538bd7631358d190178987d87208706f88ae3ecf7b94a049a3fc562822e4c89bc46a78fb41dc63bfde0e90c13d656
+MISC ChangeLog-2015 3956 SHA256 e7c8fdb8a0792269e8d4886c826f4a7fca759057de0ef38faf5101ab2cf11087 SHA512 463cdb578b65ce2ba0bdf945b3b031a8992486fc285a119b03822b74edee64baa3c1db777a84b9b010dae016bc70cba2cfc219ba2b2316c8ced503c4ec6cee5f WHIRLPOOL b9fb3e3b95c334a5a510cddba505aa717bfc95785b3b9b7e97cd2b4babc1467982cb7f182052f2760a70f894bda225e4c56f9b269ffa71ff155682eb4a0232dc
+MISC metadata.xml 353 SHA256 6c3967e281629b8778beccb842568a41d665f9db5a9899a74a56dc6500bd4214 SHA512 abcb7bb015ebb246584f60f388837ed0638040f730111831b52716cbc5a9c4ab0c422397702e1d87e56b2947108d5cfa5aeac7489bcd6f89db480c68c572bcdc WHIRLPOOL 46c10a493c2d6a836b1de09d32c3d7012067e6935b2daa144f5bc27fe9d492706bfde9ce4f553d5453463ba152fb4f67155bcd5b220ef5426d04ca3abd625779
diff --git a/dev-python/pygoocanvas/metadata.xml b/dev-python/pygoocanvas/metadata.xml
new file mode 100644
index 000000000000..08a5bd43f9b9
--- /dev/null
+++ b/dev-python/pygoocanvas/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="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pygoocanvas/pygoocanvas-0.14.1-r1.ebuild b/dev-python/pygoocanvas/pygoocanvas-0.14.1-r1.ebuild
new file mode 100644
index 000000000000..6f7b0f599aa2
--- /dev/null
+++ b/dev-python/pygoocanvas/pygoocanvas-0.14.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+PYTHON_COMPAT=(python2_7 )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="GooCanvas python bindings"
+HOMEPAGE="https://wiki.gnome.org/Projects/PyGoocanvas"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE="doc examples"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/pygobject-2.11.3:2[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
+	>=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}]
+	>=x11-libs/goocanvas-0.14:0
+"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-util/gtk-doc-1.4 )
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	prepare_binding() {
+		mkdir -p "${BUILD_DIR}" || die
+	}
+	python_foreach_impl prepare_binding
+}
+
+src_configure() {
+	# docs installs gtk-doc and xsltproc is not actually used
+	configure_binding() {
+		ECONF_SOURCE="${S}" gnome2_src_configure \
+			$(use_enable doc docs) \
+			XSLTPROC=$(type -P true)
+	}
+	python_foreach_impl run_in_build_dir configure_binding
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install
+
+	dodoc AUTHORS ChangeLog* NEWS
+
+	if use examples; then
+		rm demo/Makefile* || die
+		cp -R demo "${D}"/usr/share/doc/${PF} || die
+	fi
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null
+}
diff --git a/dev-python/pygpgme/Manifest b/dev-python/pygpgme/Manifest
new file mode 100644
index 000000000000..6f33acbcb378
--- /dev/null
+++ b/dev-python/pygpgme/Manifest
@@ -0,0 +1,5 @@
+DIST pygpgme-0.3.tar.gz 50100 SHA256 5fd887c407015296a8fd3f4b867fe0fcca3179de97ccde90449853a3dfb802e1 SHA512 25fc199a7958adfa3bbb294108792974ba96ee7b15dff98f7933e9b089a6044d83bb7c7b77ca84ea0cab5b182f6d401cee42ecab57ab9ba34aa0b14eb6ce7736 WHIRLPOOL 58657f106702a402f466415301530e56cd7287592da012b8869b5bb0a985b0560be4fb12699c22b1949d6ea2f18a6eed943b5e8af59f80855eace82ef4d21017
+EBUILD pygpgme-0.3-r1.ebuild 539 SHA256 1b127887872c513388d0d8140a3fcad167f6fdc1d49b3809632947f227c28745 SHA512 3bcad495232660ae14b7de08eecd2d67ca4674911cc7a1fd5d1b0a8e6ebb3ee9714be334cfc026fc20a70347bc005e48f69f32d103673e9cc3bf86274cf323cb WHIRLPOOL 82e9cf3f4604abaf9796de53f5235bdbaa3f6c8ee7cf32b2564f723b0db03c00993580b58c6c1c1dc1b26938838f0f13ca1648fa24a30d73852972ee27b4adca
+MISC ChangeLog 3108 SHA256 b601a8b3f1b83aacfc39588d5e051d4433c0a29d40657e2b3579a437580d2fb2 SHA512 af9cb45eb419a9bcf9cc16ef89bc276e7471602edd05531d2f3b83adcffdc86c60b18dc8c22479c45007e1c4d0b443913d7c9131b14173c4fade58602ca9fb6a WHIRLPOOL 4177bbe5a98c57a6f1b888d393b4e6ec3badd96241ca2d01ebb2052015a73ab550accd4c60d85e1d93b3556b5ddb7d55c3f5c942a7e9ef967c5762d5421ac821
+MISC ChangeLog-2015 1839 SHA256 5df599e49d0629cd998155f68969bec9328ffa2f09dcf61f978ee4882e141a69 SHA512 29f691cb25cff1f8f9341df25e4e4650eb5d3a338b6520cae382f1f8fc21fa24bb9193bd8ed8ae7ce484152eda2641ef0a3ef6ce399040a4e59097241d106ace WHIRLPOOL c3a84918811de08a91fbaca3bfb6ee3a004d8537993719a5b83c31327e7469ac6fceb757e99347fd3fedc675d774f7e28dbf3e149d94ddf39eeeb16cec29e8be
+MISC metadata.xml 665 SHA256 1586f191281fb9d35eb3b0eed23d57650e62143983eef6b9d4855ae8a9c107ed SHA512 1e9974929cc266d7dae9f6f9cec2b7dab4f105765b87b22f675a62ebb75743dd2043bfba3bf8732e4edeb9d18f6301d54324815cd90f3db53821ebd2713702c3 WHIRLPOOL f0b9e15d3061a446201c397f95182067ab68300c4689ee424812fc3c87045f7c3a1020739c5ecb6c1a3af8ccd760085929769b8e4aa14f9eff084a095e6001fa
diff --git a/dev-python/pygpgme/metadata.xml b/dev-python/pygpgme/metadata.xml
new file mode 100644
index 000000000000..f8b82e891f39
--- /dev/null
+++ b/dev-python/pygpgme/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>aidecoe@gentoo.org</email>
+		<name>Amadeusz Żołnowski</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		PyGPGME is a Python module that lets you sign, verify, encrypt and
+		decrypt messages using the OpenPGP format.  It is built on top of the
+		GNU Privacy Guard and the GPGME
+		library.
+	</longdescription>
+	<upstream>
+		<remote-id type="launchpad">pygpgme</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pygpgme/pygpgme-0.3-r1.ebuild b/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
new file mode 100644
index 000000000000..f9f61c705048
--- /dev/null
+++ b/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="A Python wrapper for the GPGME library"
+HOMEPAGE="https://launchpad.net/pygpgme"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="app-crypt/gpgme"
+RDEPEND="${DEPEND}"
+
+python_configure_all() {
+	append-cflags $(gpgme-config --cflags)
+}
diff --git a/dev-python/pygpu/Manifest b/dev-python/pygpu/Manifest
new file mode 100644
index 000000000000..7292abc66640
--- /dev/null
+++ b/dev-python/pygpu/Manifest
@@ -0,0 +1,5 @@
+DIST pygpu-0.6.0.tar.gz 232281 SHA256 a58a0624e894475a4955aaea25e82261c69b4d22c8f15ec07041a4ba176d35af SHA512 ef2b37d7752d7b19e6034ca1992dfa0c82806bae7a15ce54aad785f5abbe06e57a77b804699c55b3b7dc94496afb22acaf3a43cfc15148c150f2c93085c23080 WHIRLPOOL bf702ac1a6f7dd38e59bfc3af3854055730f0ac005ef03b206daf43bab90e930fbe04c8c2765bd673ed3d78b501a5c01f0ba93c22565c99e8aedd6a8049873ac
+DIST pygpu-0.6.7.tar.gz 256440 SHA256 5d3d6f54e53ffe1a43ca86329cf3e5b8b8c1b412cf222df092d741a4de212c2e SHA512 39cdb67ec12d0f939d7a3ebef9726c40e64387413200addbeaf205db4151d09efd90118fec4a71b9d1f81fdde9b52e37d2d97763bf2cc9efa1667c5b9ff716b2 WHIRLPOOL 544c5fd2715c4df9a39c497e4bcef22d95eae8a39f3621d57c3b68ace1e43467855b70209e15b1b8dc08c6a190e14d1307c19084006cddbdb964148442b4453d
+EBUILD pygpu-0.6.0.ebuild 894 SHA256 4798a32c7280d4b063da72d5318f750a0621c1d6d4e793eb0ec908a454439dd7 SHA512 8d04cb413c148f5efca5b72b4397a8e04613430b4f98977d40372de8b8d5e6786c71673d91fdb651a453086b36e19f5ed0f8ace52fb39006b3049a0d74c74b04 WHIRLPOOL 59129594af60cf0cb420107fb8e4607e2326fbf1c141e7584957d3ad186e3472a133360d9d464b45416dd14d8de805ddda7e7d235d183ae4e6e93fd2cf6b4007
+EBUILD pygpu-0.6.7.ebuild 894 SHA256 4798a32c7280d4b063da72d5318f750a0621c1d6d4e793eb0ec908a454439dd7 SHA512 8d04cb413c148f5efca5b72b4397a8e04613430b4f98977d40372de8b8d5e6786c71673d91fdb651a453086b36e19f5ed0f8ace52fb39006b3049a0d74c74b04 WHIRLPOOL 59129594af60cf0cb420107fb8e4607e2326fbf1c141e7584957d3ad186e3472a133360d9d464b45416dd14d8de805ddda7e7d235d183ae4e6e93fd2cf6b4007
+MISC metadata.xml 625 SHA256 a804589ceba06e3def37dab4662767ca727d1ef2ddb32dfd6a1236779f1e648e SHA512 370f27b57bd3815ab8b2f177e8d6755c4a70800c37164c99643a8f2e134acbe259e193d20998e47e521cb8f6c15d1a1703afcdd799499ef79dd4f313335979e2 WHIRLPOOL 287d7d943359a94686b09adbed8f52d18244c0e16ba769c5289311d1caedf9aad73bf808711b0f4a9d10a317016f4d2118b91cd039af57d043f6e77841104104
diff --git a/dev-python/pygpu/metadata.xml b/dev-python/pygpu/metadata.xml
new file mode 100644
index 000000000000..e05423a24848
--- /dev/null
+++ b/dev-python/pygpu/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+     This package contains the Python bindings to libgpuarray which
+     are build in the top of NumPy.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">Theano/libgpuarray</remote-id>
+  </upstream>
+  <use>
+    <flag name="cuda">Enable NVIDIA CUDA toolkit support</flag>
+    <flag name="opencl">Enable OpenCL support</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-python/pygpu/pygpu-0.6.0.ebuild b/dev-python/pygpu/pygpu-0.6.0.ebuild
new file mode 100644
index 000000000000..71838169b36f
--- /dev/null
+++ b/dev-python/pygpu/pygpu-0.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+MYPV=${PV/_/-}
+
+DESCRIPTION="Python bindings to libgpuarray"
+HOMEPAGE="http://deeplearning.net/software/libgpuarray/"
+SRC_URI="https://github.com/Theano/libgpuarray/archive/v${MYPV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cuda opencl test"
+
+RDEPEND="
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-libs/libgpuarray:=[cuda?,opencl?]
+"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}/libgpuarray-${MYPV}"
+
+python_test() {
+	local DEVICE=cuda
+	use opencl && DEVICE=opencl
+	nosetests -svw "${BUILD_DIR}/lib/" || die
+}
diff --git a/dev-python/pygpu/pygpu-0.6.7.ebuild b/dev-python/pygpu/pygpu-0.6.7.ebuild
new file mode 100644
index 000000000000..71838169b36f
--- /dev/null
+++ b/dev-python/pygpu/pygpu-0.6.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+MYPV=${PV/_/-}
+
+DESCRIPTION="Python bindings to libgpuarray"
+HOMEPAGE="http://deeplearning.net/software/libgpuarray/"
+SRC_URI="https://github.com/Theano/libgpuarray/archive/v${MYPV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cuda opencl test"
+
+RDEPEND="
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-libs/libgpuarray:=[cuda?,opencl?]
+"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}/libgpuarray-${MYPV}"
+
+python_test() {
+	local DEVICE=cuda
+	use opencl && DEVICE=opencl
+	nosetests -svw "${BUILD_DIR}/lib/" || die
+}
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
new file mode 100644
index 000000000000..d32e5aa9b64f
--- /dev/null
+++ b/dev-python/pygraphviz/Manifest
@@ -0,0 +1,11 @@
+AUX pygraphviz-1.0-setup.py.patch 1215 SHA256 d9b33fb2c9e7a29664f735d050a2f3a4ace7322a0260b6b4a14dc859fb259d25 SHA512 176497d1e61ee74b6ca576b322ec47eccfb67d2fa1341c7f0f857ecc32ccd16660262abe46a90871ee4cba60587670d8b479bfd60944ac0de32b13f4aab4846c WHIRLPOOL c6b81f11eb014787d091d99842e6e64f16651b6646ae2da0e4537eb6cbb87b4c2bd40d87c879c02dc3022e8d02d4c178130c11e542ac3aa3b7a03e4cd6f5cba1
+AUX pygraphviz-1.2-avoid_tests.patch 1620 SHA256 56a331c73eb6b5f12dc67a4d8b4a2b3173d88095099c2b9271469b6bdd2a7e72 SHA512 74c161dbeb69ad2b9f381428b6cc0e0d8411d95b121fb16eb0f1e45344a52c2dafc2bf06cac8a6be8152fb1592bd55bf001da85e4e53ed82bec39f61c7d329f2 WHIRLPOOL 6493194b90fe0100c2e07384cd67e0ffe2a5e7396de822dc89557bd1bda1cfe2771b0f6cdc41a0604ef71ca97929618f867c0d1f100b69bb1f1342ae056a018b
+AUX pygraphviz-1.3.1-docs.patch 929 SHA256 42fe9f7ad1482f701cec8c858b14b8e7e6243df9b3df7923e6bd82ffe4a98c8c SHA512 003ed3275771998a40c162abfc61ebf78cb149b20b2b4c770725459364e08a5afb33fe39b00e2e662706a40c3a91033d9e0aead66a7cd627b3b0b2ceba5a62d2 WHIRLPOOL ac27888416ec8c7bb70a9f2cc313334c8c763efa49b74ae9664ece7ddedb36ca7bc541a5e03133603fe53c00edb2cd6ec955dbc9392b27619b813cdedfa40f66
+AUX pygraphviz-1.3.1-swig-3.patch 790 SHA256 bd502470196cb7a5e43d9840c5ee39deea0cf37e0bdf9c218af6eaf3b7a234ad SHA512 37a5689360aa786a94bd3bbad98bca4bf5f3a61eb2dc54de1c4bec3b6ec677e4f99a817b896687e2506386becc67f5e31308a30ceaedd388e57693ae9e8de2d4 WHIRLPOOL 97a018a85fccbc2cf89b9404ea2d2bf8e6e56123a9bbdfe314b6197cfa52532dc3ba44e28d9915ff5454674a99cd07f3a8dd2c550850127b3547f41e9fdbb583
+DIST pygraphviz-1.2.tar.gz 90913 SHA256 2e8a82a07dcf006b9558d22c5a6357c012193d4cc681776845e515fffeccc6b3 SHA512 e477af635594c3ba1aa6fa499bc5e60df14e76616a1a777f648e2e96d3953dd3d0b3bae4a92275dac2f7466276cf526ecb8b6a63fd3fbad26ee24b67d76ecfa3 WHIRLPOOL 2757d02b130f326ee2638b78761094de1a841293b6de1d5ea2c89c169cbc8525041e06daef9ded32d7c1ac944ef99293ab67fee6c75a2976283f87725635a4d5
+DIST pygraphviz-1.3.1.tar.gz 103336 SHA256 7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408 SHA512 e1957d7daf7ae9e60873cb6f23ac19a3320b4b10579ab24a2307beb558dad11a8e82e1da528799165b761d944efb4860b7296e3218846f7885f715c396a8e3dc WHIRLPOOL dd4ac48c4e4c05a134a6ba076979f9dc1ea7fab03700208aedf9cd6acf3fb5595a26b3a0f1de8d46a61750dea60a6e31f180719cb51b1e916ecc677dde61a618
+EBUILD pygraphviz-1.2.ebuild 984 SHA256 4e31d1f8917bfdee6605ec596e0a5d48980c1fbeb396322356ec61a2a736677d SHA512 fd7921219ec847b4976bb1c00cc053236a0aab1d46d927c621fe93d7664fe334dfd0b0de3e411bd182158046e6b01a1fad29693e8de09a77c11299c57aee8a3a WHIRLPOOL 51757847a8333fbdf12b8207dc8fca94eeff12a7f87623103b5318852333da2182c03005a0df0020bde916df51ca19a38cef038332a15a4db4b8f14664627864
+EBUILD pygraphviz-1.3.1.ebuild 1101 SHA256 473933df9653ea230ad283631df8dccebe81ad85ebba26384e4d4aa31c049d5e SHA512 5676ad5126cf8a611560c5f8ecdb1fab4959324d733d412e6347410cb2da569248e52e93125f1325f71128313c4816ab6e7a3aaec22e0b72f8d993513d3a56db WHIRLPOOL 818d1f58c8ccb801d2ac8d392f9895b41f78e64138b69006f9ce9156645a301d6eda1c949a0b0894a15e514cf7c134c6dcad272c87e6f8cead67777032a79acb
+MISC ChangeLog 4169 SHA256 eaed85e424f7d862ce9c9cb823f21791183c756116c0d180c6675a2928ae3ed6 SHA512 4f71bfc27176aad157e9916d4b52263ec4205c5b112880e176ed621074a731b13a8af4dc0001af062b75e14845cd5dda8d2f90822c544b06ce093ca11e487afb WHIRLPOOL 6fa2c649d4060edd18b2aa592a8286fc9b538974940c5c4ba6ca78ea0caf237c490aab41fc0eb4e5cee18358d4a28c148ece6e5153d4a8f191ea62747813f28a
+MISC ChangeLog-2015 3508 SHA256 ca7a9e80b300c74496668610b9f5dbf13eac1a108591e4eb75ae9dd3080ec85d SHA512 efb454678a58c05fd23389891425791047a522ec92542e33fad55699daccf48ef02fa61c3be82632049a628f6497d11f76f93b80fcea99a053f11237b4266efc WHIRLPOOL 0e4a1df3166d043394235964f9f4f6b0502cdc57edd55e4b14cb49f92c0a548b1a51b8cf95427686f785f70a1f3b26bffac85aed2035c8f671a478355876f665
+MISC metadata.xml 616 SHA256 81130eb6e928a4eed129e5acf39d1fdcbad6346d2f9a7de06201cd97cb91453c SHA512 fd9922ce1c9f9d5381c5ed4f4679b45b5bfbb21c452a1ba4064e26fd33e59f648593d7322d1ee68bb4d3e2268a5a8dd2e7f676679d57147929cdb0493835d34d WHIRLPOOL fcc11919a0b92f193fc81988593719a8b21d96877545928d09d910a0f5640b1065d079f5313f7d685524273eaf00c2f1b86570f2097436fffb11e8f523b06841
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.0-setup.py.patch b/dev-python/pygraphviz/files/pygraphviz-1.0-setup.py.patch
new file mode 100644
index 000000000000..13eb0f213ce1
--- /dev/null
+++ b/dev-python/pygraphviz/files/pygraphviz-1.0-setup.py.patch
@@ -0,0 +1,33 @@
+--- setup_egg.py
++++ setup_egg.py
+@@ -46,7 +46,6 @@
+         download_url     = release.download_url,
+         classifiers      = release.classifiers,
+         packages         = packages,
+-        data_files       = data,
+         ext_modules      = extension,
+         package_data     = package_data,
+         install_requires=['setuptools'],
+--- setup.py
++++ setup.py
+@@ -98,12 +98,6 @@
+ sys.path.pop(0)
+ 
+ packages = ["pygraphviz","pygraphviz.tests"]
+-docdirbase  = 'share/doc/pygraphviz-%s' % release.version
+-data = [(docdirbase, glob("*.txt")),
+-        (os.path.join(docdirbase, 'examples'),glob("examples/*.py")),
+-        (os.path.join(docdirbase, 'examples'),glob("examples/*.dat")),
+-        (os.path.join(docdirbase, 'examples'),glob("examples/*.dat.gz")),
+-        ]
+ extension = [Extension("pygraphviz._graphviz",
+                       ["pygraphviz/graphviz_wrap.c"],
+                       include_dirs=include_dirs,
+@@ -130,7 +124,6 @@
+         download_url     = release.download_url,
+         classifiers      = release.classifiers,
+         packages         = packages,
+-        data_files       = data,
+         ext_modules      = extension,
+         package_data     = package_data
+       )
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.2-avoid_tests.patch b/dev-python/pygraphviz/files/pygraphviz-1.2-avoid_tests.patch
new file mode 100644
index 000000000000..d444ee3d2df7
--- /dev/null
+++ b/dev-python/pygraphviz/files/pygraphviz-1.2-avoid_tests.patch
@@ -0,0 +1,47 @@
+ pygraphviz/__init__.py |  2 --
+ pygraphviz/agraph.py   | 25 -------------------------
+ 2 files changed, 27 deletions(-)
+
+diff --git a/pygraphviz/__init__.py b/pygraphviz/__init__.py
+index a807801..33f727e 100644
+--- a/pygraphviz/__init__.py
++++ b/pygraphviz/__init__.py
+@@ -68,5 +68,3 @@ def version():
+     neato=_get_prog('neato')
+     os.system(neato+' -V')
+ 
+-# import tests: run as pygraphviz.test()
+-from tests import run as test
+diff --git a/pygraphviz/agraph.py b/pygraphviz/agraph.py
+index c9f735b..90a661e 100644
+--- a/pygraphviz/agraph.py
++++ b/pygraphviz/agraph.py
+@@ -1771,28 +1771,3 @@ class ItemAttribute(Attribute):
+                        value.decode(self.encoding))
+             except KeyError: # gv.agxget returned KeyError, skip
+                 continue
+-
+-
+-
+-def _test_suite():
+-    import doctest
+-    suite = doctest.DocFileSuite('tests/graph.txt',
+-                                 'tests/attributes.txt',
+-                                 'tests/layout_draw.txt',
+-                                 'tests/subgraph.txt',
+-                                 package='pygraphviz')
+-    doctest.testmod() # test docstrings in module
+-    return suite
+-
+-
+-if __name__ == "__main__":
+-    import os
+-    import sys
+-    import unittest
+-    if sys.version_info[:2] < (2, 4):
+-        print "Python version 2.4 or later required for tests (%d.%d detected)." %  sys.version_info[:2]
+-        sys.exit(-1)
+-    # directory of package (relative to this)
+-    nxbase=sys.path[0]+os.sep+os.pardir
+-    sys.path.insert(0,nxbase) # prepend to search path
+-    unittest.TextTestRunner().run(_test_suite())
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.3.1-docs.patch b/dev-python/pygraphviz/files/pygraphviz-1.3.1-docs.patch
new file mode 100644
index 000000000000..aed5c9075b88
--- /dev/null
+++ b/dev-python/pygraphviz/files/pygraphviz-1.3.1-docs.patch
@@ -0,0 +1,29 @@
+ setup.py | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index fc0a96f..98b7f58 100644
+--- a/setup.py
++++ b/setup.py
+@@ -36,13 +36,6 @@ release.write_versionfile()
+ sys.path.pop(0)
+ 
+ packages = ["pygraphviz", "pygraphviz.tests"]
+-docdirbase = 'share/doc/pygraphviz-%s' % release.version
+-data = [
+-    (docdirbase, glob("*.txt")),
+-    (os.path.join(docdirbase, 'examples'), glob("examples/*.py")),
+-    (os.path.join(docdirbase, 'examples'), glob("examples/*.dat")),
+-    (os.path.join(docdirbase, 'examples'), glob("examples/*.dat.gz")),
+-]
+ package_data = {'': ['*.txt'], }
+ 
+ if __name__ == "__main__":
+@@ -75,7 +68,6 @@ if __name__ == "__main__":
+         download_url=release.download_url,
+         classifiers=release.classifiers,
+         packages=packages,
+-        data_files=data,
+         ext_modules=extension,
+         cmdclass={
+             'install': AddExtensionInstallCommand,
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.3.1-swig-3.patch b/dev-python/pygraphviz/files/pygraphviz-1.3.1-swig-3.patch
new file mode 100644
index 000000000000..912667e7f5a7
--- /dev/null
+++ b/dev-python/pygraphviz/files/pygraphviz-1.3.1-swig-3.patch
@@ -0,0 +1,23 @@
+ pygraphviz/graphviz.i | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/pygraphviz/graphviz.i b/pygraphviz/graphviz.i
+index 0d9b43b..5f1f6b0 100644
+--- a/pygraphviz/graphviz.i
++++ b/pygraphviz/graphviz.i
+@@ -1,9 +1,9 @@
+-#    Copyright (C) 2004-2006 by 
+-#    Aric Hagberg <hagberg@lanl.gov>
+-#    Dan Schult <dschult@colgate.edu>
+-#    Manos Renieris, http://www.cs.brown.edu/~er/
+-#    Distributed with BSD license.     
+-#    All rights reserved, see LICENSE for details.
++//    Copyright (C) 2004-2006 by 
++//    Aric Hagberg <hagberg@lanl.gov>
++//    Dan Schult <dschult@colgate.edu>
++//    Manos Renieris, http://www.cs.brown.edu/~er/
++//    Distributed with BSD license.     
++//    All rights reserved, see LICENSE for details.
+ 
+ %module graphviz
+ 
diff --git a/dev-python/pygraphviz/metadata.xml b/dev-python/pygraphviz/metadata.xml
new file mode 100644
index 000000000000..42853a572012
--- /dev/null
+++ b/dev-python/pygraphviz/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  Pygraphviz is a Python interface to the Graphviz graph layout and
+  visualization package.
+  With Pygraphviz you can create, edit, read, write, and draw graphs using
+  Python to access the Graphviz graph data structure and layout algorithms.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">pygraphviz</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pygraphviz/pygraphviz-1.2.ebuild b/dev-python/pygraphviz/pygraphviz-1.2.ebuild
new file mode 100644
index 000000000000..25e0035803a5
--- /dev/null
+++ b/dev-python/pygraphviz/pygraphviz-1.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
+HOMEPAGE="http://networkx.lanl.gov/pygraphviz/ https://pypi.python.org/pypi/pygraphviz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="examples"
+
+# Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
+RDEPEND="media-gfx/graphviz"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-setup.py.patch
+	"${FILESDIR}"/${P}-avoid_tests.patch
+)
+
+python_test() {
+	PYTHONPATH=${PYTHONPATH}:${BUILD_DIR}/lib/pygraphviz \
+	"${PYTHON}" \
+		-c "import pygraphviz.tests; pygraphviz.tests.run()" \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild b/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild
new file mode 100644
index 000000000000..6a20231e9340
--- /dev/null
+++ b/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
+HOMEPAGE="http://pygraphviz.github.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="examples test"
+
+# Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
+RDEPEND="media-gfx/graphviz"
+DEPEND="${RDEPEND}
+	dev-lang/swig:0
+	test? (
+		dev-python/doctest-ignore-unicode[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-docs.patch
+	"${FILESDIR}"/${P}-swig-3.patch
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	swig -python pygraphviz/graphviz.i || die
+}
+
+python_test() {
+	PYTHONPATH=${PYTHONPATH}:${BUILD_DIR}/lib/pygraphviz \
+		nosetests -c setup.cfg -x -v || die
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
new file mode 100644
index 000000000000..fe2b01313351
--- /dev/null
+++ b/dev-python/pygresql/Manifest
@@ -0,0 +1,7 @@
+DIST PyGreSQL-4.1.1.tgz 100883 SHA256 bb14092f97c66ed13b8faf71471b8c156c6b46d915858447f3a63e9abe48eef7 SHA512 4b37c56f2112471aa5f3003a1d867382ce1b7510afa0963f0ceeb2f8175ca601bb5bade9ea2038d44a1041f12233e364f138a635bb7b353d0a82aeb7d9d49b7f WHIRLPOOL 323bfd1b72341be6b14d71fd4f05f5005a0f8a387f9b050ef3c786531ea19e057aa67fb5737b5aa0c4ca0912ad697a39d8957d70bb6bb4056e81f406ade5a6b9
+DIST PyGreSQL-4.2.zip 1377728 SHA256 c57adc6b76e8b513e819b8f36710cf906d21617ff6513a0c4dad4acecdfccf3c SHA512 84044480c3f25548137240ac999334546b87987ac6c601608bcae057cf93567f0eb24e343f6ee214ea87e09ac6bd5ce80cfeb5f75deb7896e87b001a2099c78f WHIRLPOOL cac5d4fed22e51316c3c8cc0de367dc5998642c1425a944b147ed059ee3f70387ac704f8465b6fdbde0802e92c21369f0171c2dc0ee2ebbc1e7f0c827b5b900d
+EBUILD pygresql-4.1.1-r2.ebuild 1592 SHA256 1c2b00a0e33ba76aacc3b31bf1ef55dc2af93b90959b701b02e7f889fe2411db SHA512 c862f696772b9b8d6242fc98721d8b1e7e608f3a54ddc2bd4b34e24e782390cb1ac8e4060ab13ae025b9d8c229d4b9bb03cc2a6facb254ec49073477cbe32c2d WHIRLPOOL 894bfb3ca6aa7496e42856ef26941ffa7d2db4e25a2c9efbb20c1cc6fb649d127820a0718e5d05ea2bbe2f9cca7b03f3eb7fa26bcb4e0de477a9e4bba98472ee
+EBUILD pygresql-4.2.ebuild 1599 SHA256 d3b280445ac157b807184a97cf909d1a22bfb905a1ab16742051f53c3deb8bfa SHA512 c1e92d885ad8d6adf971c4b9926f3b2bcecbcbc6a2392bf5da15dc7562deae453ae9ffdc06e80af3267ec8a79caebb70dc3f5822c4bfcab3a455751c066260bf WHIRLPOOL 988c70e7b02acbc1019256dcd6fa53bec275f15e51c973c9202041bf08f969ca51fd1c5a265125cdba11ecf598c32c6a21b6eff0ec0ce73baa53b8a37ccf36cc
+MISC ChangeLog 2698 SHA256 5645174fe24cc6a173c000f8cbdfcf9af1d53158aa8937d4f7d7f8e64ad5895e SHA512 8f7f8d4d0ded75aede0775d3fdcee79c25ba94a570d41af0762b37c357499affe94812109db8085d290847cecab8350308f5869fe5ce3e8c0ab528cf10ba3582 WHIRLPOOL e1981243a2539284d40fbdca0b801ac28333f15f2e569e19c3c177c3fd943b6c76606a007c9b2ea095e744498989c1dced17ba1420bedb9b01cebeeba58d652e
+MISC ChangeLog-2015 11455 SHA256 5c4470a7df73f5c85d4068518af5c11236d9f860bda6d7141d7ce7eeaeb4d2e7 SHA512 06702e88d0a5f317a440d338ccf71aa5d89b3a3071b37ebdf51105843d918f1af0480c3aa04e88cbdefdc88ebf7d72c409504872e208676b371993d9e8683384 WHIRLPOOL 7b4b6f908cdb9c0b144dd129d1af99f392f0dbf0a7550c74e776258de1fe04068fd74741b92619953b0bd71b235acdf369a349955db7ec4eeef7dd45c741f056
+MISC metadata.xml 452 SHA256 207a14b9e71c6a7c6c0660c8ae2f5d8af1ca4d4425c6cff8468f82ebb97acd41 SHA512 f6877e2fd8cb2b6606a29e421d0f0ab4fd66a5e7446a4307718d1c0435c2e8ab3c59db795ca1e18e58eb79d0474c57bf35a3d0544095d2d7d618cf25e96ff55f WHIRLPOOL f97772d03c0c21f5c288539e38b9cff7e3a3ac519c81da3fbdda8255004eac33f169bc2f22a83999f49c241d33f0dba8a4495757575f2524ad28508d9defa90b
diff --git a/dev-python/pygresql/metadata.xml b/dev-python/pygresql/metadata.xml
new file mode 100644
index 000000000000..818344a33d86
--- /dev/null
+++ b/dev-python/pygresql/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>pgsql-bugs@gentoo.org</email>
+		<name>PostgreSQL and Related Package Development</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">PyGreSQL</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pygresql/pygresql-4.1.1-r2.ebuild b/dev-python/pygresql/pygresql-4.1.1-r2.ebuild
new file mode 100644
index 000000000000..c3b79dd202cd
--- /dev/null
+++ b/dev-python/pygresql/pygresql-4.1.1-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+POSTGRES_COMPAT=( 9.{0,1,2,3,4,5} )
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P="PyGreSQL-${PV}"
+
+DESCRIPTION="A Python interface for the PostgreSQL database"
+HOMEPAGE="http://www.pygresql.org/"
+SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tgz"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
+IUSE="doc"
+
+DEPEND="|| (
+	dev-db/postgresql:9.5
+	dev-db/postgresql:9.4
+	dev-db/postgresql:9.3
+	dev-db/postgresql:9.2
+	dev-db/postgresql:9.1
+	dev-db/postgresql:9.0
+)"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+# Verify that the currently selected PostgreSQL slot is set to one of
+# the slots defined in POSTGRES_COMPAT.
+postgres_check_slot() {
+	if ! declare -p POSTGRES_COMPAT &>/dev/null; then
+		die 'POSTGRES_COMPAT not declared.'
+	fi
+
+# Don't die because we can't run postgresql-config during pretend.
+[[ "$EBUILD_PHASE" = "pretend" && -z "$(which postgresql-config 2> /dev/null)" ]] \
+	&& return 0
+
+	local res=$(echo ${POSTGRES_COMPAT[@]} \
+		| grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
+
+	if [[ "$res" -eq "0" ]] ; then
+			eerror "PostgreSQL slot must be set to one of: "
+			eerror "    ${POSTGRES_COMPAT[@]}"
+			return 1
+	fi
+
+	return 0
+}
+
+pkg_pretend() {
+	postgres_check_slot
+}
+
+pkg_setup() {
+	postgres_check_slot || die
+}
+
+python_install_all() {
+	local DOCS=( docs/*.txt )
+	distutils-r1_python_install_all
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}/tutorial
+		doins tutorial/*
+		dohtml docs/*.{html,css}
+	fi
+}
diff --git a/dev-python/pygresql/pygresql-4.2.ebuild b/dev-python/pygresql/pygresql-4.2.ebuild
new file mode 100644
index 000000000000..2f8e16c61059
--- /dev/null
+++ b/dev-python/pygresql/pygresql-4.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+POSTGRES_COMPAT=( 9.{0,1,2,3,4,5} )
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P="PyGreSQL-${PV}"
+
+DESCRIPTION="A Python interface for the PostgreSQL database"
+HOMEPAGE="http://www.pygresql.org/"
+SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.zip"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="|| (
+	dev-db/postgresql:9.5
+	dev-db/postgresql:9.4
+	dev-db/postgresql:9.3
+	dev-db/postgresql:9.2
+	dev-db/postgresql:9.1
+	dev-db/postgresql:9.0
+)"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+# Verify that the currently selected PostgreSQL slot is set to one of
+# the slots defined in POSTGRES_COMPAT.
+postgres_check_slot() {
+	if ! declare -p POSTGRES_COMPAT &>/dev/null; then
+		die 'POSTGRES_COMPAT not declared.'
+	fi
+
+# Don't die because we can't run postgresql-config during pretend.
+[[ "$EBUILD_PHASE" = "pretend" && -z "$(which postgresql-config 2> /dev/null)" ]] \
+	&& return 0
+
+	local res=$(echo ${POSTGRES_COMPAT[@]} \
+		| grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
+
+	if [[ "$res" -eq "0" ]] ; then
+			eerror "PostgreSQL slot must be set to one of: "
+			eerror "    ${POSTGRES_COMPAT[@]}"
+			return 1
+	fi
+
+	return 0
+}
+
+pkg_pretend() {
+	postgres_check_slot
+}
+
+pkg_setup() {
+	postgres_check_slot || die
+}
+
+python_install_all() {
+	local DOCS=( docs/*.rst )
+	distutils-r1_python_install_all
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}/tutorial
+		doins tutorial/*
+		dohtml docs/*.{html,css}
+	fi
+}
diff --git a/dev-python/pygsl/Manifest b/dev-python/pygsl/Manifest
new file mode 100644
index 000000000000..050311259234
--- /dev/null
+++ b/dev-python/pygsl/Manifest
@@ -0,0 +1,7 @@
+DIST pygsl-0.9.5.tar.gz 1674504 SHA256 05d11160ff482e1f1f5f6a047aaef2776eedc1e8e1f98533a95299584fd4752d SHA512 7364e67ff2885be2cbe5410a573071209d3917f4807797b3b8525aacd03e6ab96e157e6d12d631c384e3b66602eab7e6cb89f9ab362f520397df900e77fcc875 WHIRLPOOL 404b5f06b1088d047e7afe56311ad9ce0bdcf465ab6961f3cc9d893f575d54c2a103e4c572a60d93e4cf27ee15d4000b7dfbcd6bd33bbc4cf6638749e87f7e24
+DIST pygsl-2.1.1.tar.gz 727636 SHA256 3d17e6deb5433b331a567a45ff467f41e9059def76e6ef0f21d8e891498f946a SHA512 141232032f0221b756596bc3426160849749642ddaa3667d36b19abf3b4a22b76b5e0b0e9452898494b7f6ce0f8d17a2e392bdaba535633bbfbf1a672bf8d62e WHIRLPOOL e2c6035104ca78cb0eec5ec9bdda8dfbc01182090f1edd176c6d4565f9a71364f107eb38229c5b7758dc455337622e70b5626acbe3552e2e48219ed2f0b1f33c
+EBUILD pygsl-0.9.5-r1.ebuild 657 SHA256 7244f80867b7a5ba0c8dc2b67118213eae963d61a158b6cc1d7e970509359994 SHA512 713a637a7a05df265d66af98afac5be38f0749d9da99344632ba5bc5855a2ca99a7fd57ea5d87c63f8b6293c14ed5669ea220c2cad44dbe5f6874560b9773cda WHIRLPOOL 70eb7767d38f7727cb3dd1f8ec5531a2564c90ea68efca712f23e345d37f9159c4b9595e5cb29b0a1bf1a9cc513bb63194d5da3a7601a3ab1596a009cc00ada7
+EBUILD pygsl-2.1.1.ebuild 676 SHA256 c5acf6c07e8609da1bffe2b5fbd08a522460f8d1ebb5944c98d70fc31666c7c0 SHA512 822a3c715733c84209e13089659507ca9a9d65195b6968c343e852f0e28477cac86f7689bce3550d8fb811918b215f0a9fb92648f89a6ac615485c185ae796e6 WHIRLPOOL ac7a68554263a0536e71963009d1a5fe265a018fa16307fcb9ad96ca4f197700ced75ea25f6522c43087fee9d89198bf0cddb0d6765c9d315fc5c569ceb9cda8
+MISC ChangeLog 3629 SHA256 f306aa3f4da05a1ed38ac33cba048668b3f2ea9ae62e8da2c5131d12e3862cc7 SHA512 4107e49d1ff0bb64ad8d7a9d4c87acdc6fa5a5aadb079a449a0eb40c180b80e128ea4226f97b566e268fff39dab3b7b0984a65569546be985cd7cc435dafd159 WHIRLPOOL c0cf232d8aad931772b568240e8521c3ac226c14e0700106ebb048c0fe65b11b59495501cf1d3191209bf7257e94a0be059baacaf7562fc15b368102af5fffa0
+MISC ChangeLog-2015 2960 SHA256 53d937f1ddcc28b36320a5df47bb3de8e4a718cd9ea992979af9c76c0c984922 SHA512 6fb7f24583831851c0c5b443c603c141bbbb9c3cfa99cccc013e14d8d934902bead0b4723b030cce4bb281c30090765e8094d10d2e060f939ce221420b3c28b6 WHIRLPOOL ff71f22dc42fa42aad67543826c2855d493bc307eff3941995e9b604ef739c0e825b48c7d2b56ade220a60d9f0065f1eeac975329ddd21d32e331c6de3775eac
+MISC metadata.xml 456 SHA256 e01f863ad3c05fde949f70b99e617b55aed11ed9f0983bd628c1e5e59fb55ffb SHA512 428195f5b3ddce2261af63014167de98c620dd48488ca0f07e6ad6bf9386b43d708a4346dcfba3c41505a6fd928bfb2051e1b7bd827b5033f28e1ebd537a698f WHIRLPOOL 562af291be08ee805b0c19dec7c3b44e507bb0f47496375a8d4cd657d4c1eeffeaeb18ad0f7dbc9c31607627e7c314ce4bd220e09b65e0cfc5b671f4c6ad3a96
diff --git a/dev-python/pygsl/metadata.xml b/dev-python/pygsl/metadata.xml
new file mode 100644
index 000000000000..9e4f72faa86d
--- /dev/null
+++ b/dev-python/pygsl/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">
+    PyGSL provides a python interface for the GNU scientific library
+    (gsl).
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">pygsl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pygsl/pygsl-0.9.5-r1.ebuild b/dev-python/pygsl/pygsl-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..f8440315a22e
--- /dev/null
+++ b/dev-python/pygsl/pygsl-0.9.5-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface for the GNU scientific library (gsl)"
+HOMEPAGE="http://pygsl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+DEPEND="
+	<sci-libs/gsl-2
+	dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+# Testsuite written to be run post install
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygsl/pygsl-2.1.1.ebuild b/dev-python/pygsl/pygsl-2.1.1.ebuild
new file mode 100644
index 000000000000..6d96bca0694a
--- /dev/null
+++ b/dev-python/pygsl/pygsl-2.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface for the GNU scientific library (gsl)"
+HOMEPAGE="http://pygsl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+DEPEND="
+	<sci-libs/gsl-2
+	dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+# Testsuite written to be run post install
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
new file mode 100644
index 000000000000..b1f3bf591523
--- /dev/null
+++ b/dev-python/pygtk/Manifest
@@ -0,0 +1,11 @@
+AUX pygtk-2.13.0-fix-codegen-location.patch 507 SHA256 f446a7b3e3ac76a9ab594738b1fbf9105c1ca17e8053b1a8712a966e9cfe54d0 SHA512 382fae5afc3082f0239e1228c226c8ae6ac1b8524cb9a2aa8ca2b3d3cef5b1e280058df1a3c764785f129c4d4c8808e1c4f6fa09f213ee53efa269ca4ad27542 WHIRLPOOL 53773cdb2605acb5987c9b4ec6a52946cccee32cc947f3d62dfdaeaefb458a0ff5bc81b0b65f23f31ec9c5f9bf92f9453ca7a89ec2178665b17f3689848c9ef3
+AUX pygtk-2.14.1-libdir-pc.patch 284 SHA256 bdb29e2491558f8b10ed91ce85b0b05c4d300db4f9ef066e4220c97d202d14be SHA512 cf1fb2731b14d9f96624be0bd250c178c25232f579e585567d8e44436f43f1d5444c9c85acca7cc13511cd036e19eacc40df158b0103c785f22149b76c9fe1a9 WHIRLPOOL 36ea127a98bad0a1c7124fcf8096e1a1a30a3db5dc145066740b711d4b5bfbfa34d1c1cf349692099b7846b830a2555c40e5def6c180d3b730e6e04d743e07c0
+AUX pygtk-2.24.0-fix-leaks.patch 1681 SHA256 af2071bd920cae142c73bd8a74049d8dce608dd4b9a566d9408e46eec7384e69 SHA512 438d72249f3a7073a8cba690610ca551ffa2c88b9df693b00a46178fdb53eec9a6e7db068b7b2700de4e4506810cc0746560db889abfdd2d30e57e8821f9d878 WHIRLPOOL eed88f039dd97bf7863bf2fa805e23f305248d9da3af5e9ee175f618b9f79e2db27b0085a3b477f95b0e1899e5d593a82ee98424292390f8a78ffd022becc036
+AUX pygtk-2.24.0-quartz-objc.patch 1023 SHA256 e9fcf666eacc900fb668525e93c9c675e73dc61d92fdab54767eb5e89647a8e9 SHA512 9e8f2bdfdd5ab4a4296f928fce5da532d16dc135cb58017bd0238deaa6fdf45a0f4b43a6ef76b5f9e117beade8172f230456636f3bc00672502cd126d609c35a WHIRLPOOL efb9a91585fc1d45b07652fc49aa18587d5812032512a9eee0a716dd899401b3e97596d37d94a9020a9fd407dc299d64ff2dc405c0cb673d842cc0af082faa25
+AUX pygtk-2.24.0-test-fail.patch 248 SHA256 6e96744b593f5f085b95a54ac435ea43deb2f285f167716e8fd147c2a55f626d SHA512 e306324fa5542c492942c3a3f0be4d6a53f5641fff4362507195afa89bd73722aa2f65563ce7a8000d04b7824f69d840d3a8a53b8ec39bc31b97d2d215ebfde3 WHIRLPOOL e966f26a2b47634aea1db1c7d5b6da6eef5714e92b51aa924a188ecfa6acda5750c585f07d6cc3a53ed680937bd97fa472470b062ac6393a5e077780823423e1
+AUX pygtk-2.24.0-test_dialog.patch 961 SHA256 2f4a72591435aef26e996a116767c7206c5c8b74ade64c78090013936ba37c90 SHA512 13254063895412641b51cb536892f2c4b9bb76ac1ffa92f8d82fa20b80f5c7748392a968315af3731def20392de917a0ae2b4ac0607cee9e2f38911283d33ca9 WHIRLPOOL 278fda0d8fd74d2fddf02ff9e9024957d5ca3dd684c9389e6794acd4dbaf8108ea7e2fc82f32c2690292f9a83aac0832f66d46ca3d550d6209c8610d0aa6061e
+DIST pygtk-2.24.0.tar.bz2 2361097 SHA256 cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912 SHA512 64f4344fcf7636e0b2016ffd5310250b5c02a1bf87e44aef39b5d4cf4a5fc50d27cb4f030d4c6802cff61fffb88dee7752821e3d8a4cd1c34dc3745d9ff2f0da WHIRLPOOL 6a5acd3fdd63ded08882ec2a8a3beaeb6bea55672a52841f2b41af5feeb20cfd68941c9322a27861b23fd0244173036815d5f122f7edcf3be14dffaa77b10575
+EBUILD pygtk-2.24.0-r4.ebuild 2705 SHA256 85e540875ecc065f0b70a437f66c6b1f5214d91bd608e9ea984dd20e22dc34be SHA512 b8aebf7afa4d5cff53855d870b1e93a7fc6b3ec1bcc31e6998805f1ff5301d1d83415a2a596ab262b6b6b98bdce2488938b2b6072b4acd75668834cbba016d1e WHIRLPOOL 42b189b9eff9220ae3e6256df4c88c0e485a428cdf5a7b1c29a501563330e61d7777960fb7965a1eeb52c98c6af5a45212437aaf17c6e9b46ba32b3cd42168ef
+MISC ChangeLog 3162 SHA256 d28a3e58262f85b28a33303fbf94233b4259b6fee37ed575b7599d27d24c401c SHA512 3b20e529918a9729e9229d34ae06475cab2ed0cddd74ccb7e6dc299c6a45910468969b3bd7cf2811cd2ad7dbb0d1bcbf9c22944a7580039b53e2bda8d51586de WHIRLPOOL 0d180cbe66adad26cae8a627fb16203c939a58c9c368db5984d85b847c65d426ddd310ec5fbff037de30044be2c4064a1b1e570465a82cdb060e37c2ca218263
+MISC ChangeLog-2015 38904 SHA256 31ad3c9f1fd8d888770b43af125e51c78191439b2b6ce3658003c08cec3a2c27 SHA512 7a3d2953e313f60a60787e2c191cb0aefe166e5a193e14adcb59b596db41b5d06ff23533c4dc771b122fee96171c5355af3e52b3ce14f5de6351401a034d833d WHIRLPOOL e2cc525da751228cbdb48cd9496cb7561dfe1bc9d7ad21746afc6c7e68ccb0b09a005a53432f1f040d03f173a09eeb3698edf1f6b0c3f6aecd2466941445c968
+MISC metadata.xml 1105 SHA256 70956029ee36bb533f9ceb0e8adc19994fc0cceda063dec8836dbcaba0b8d6d6 SHA512 037cab51c9a9cab4649559886753432a9e204dfd3fb2f145946a805fda17c3b544014d10b8b59a5b4b3d8e97d15a0048cd6f295bbca36515e963d52e9ad6181c WHIRLPOOL bac6f65f4fbd381b381b22e30ffaa41d3837174d4fdd0b8d5ddfe7ff08da31b8e461432cdf2184bbfa819afe89f73cf24cf3c5dcfa973976bb0181d1c082c810
diff --git a/dev-python/pygtk/files/pygtk-2.13.0-fix-codegen-location.patch b/dev-python/pygtk/files/pygtk-2.13.0-fix-codegen-location.patch
new file mode 100644
index 000000000000..701d828f1f88
--- /dev/null
+++ b/dev-python/pygtk/files/pygtk-2.13.0-fix-codegen-location.patch
@@ -0,0 +1,11 @@
+--- a/pygtk-2.0.pc.in	2007-11-01 12:20:22.000000000 -0400
++++ b/pygtk-2.0.pc.in	2008-05-28 22:21:04.000000000 -0400
+@@ -12,7 +12,7 @@ pygtkincludedir=${includedir}/pygtk-2.0
+ # This is strictly speaking not necessarily so (we refer to another
+ # package), but we want to preserve compatibility with times codegen
+ # was in PyGTK, not PyGObject.
+-codegendir=${datadir}/pygobject/2.0/codegen
++codegendir=${pyexecdir}/gtk-2.0/codegen
+ 
+ Name: PyGTK
+ Description: Python bindings for GTK+ and related libraries
diff --git a/dev-python/pygtk/files/pygtk-2.14.1-libdir-pc.patch b/dev-python/pygtk/files/pygtk-2.14.1-libdir-pc.patch
new file mode 100644
index 000000000000..d943e952a421
--- /dev/null
+++ b/dev-python/pygtk/files/pygtk-2.14.1-libdir-pc.patch
@@ -0,0 +1,12 @@
+https://bugzilla.gnome.org/show_bug.cgi?id=663421
+
+--- a/pygtk-2.0.pc.in
++++ b/pygtk-2.0.pc.in
+@@ -12,6 +12,7 @@
+ includedir=@includedir@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
++libdir=@libdir@
+ pyexecdir=@pyexecdir@
+ 
+ # you can use the --variable=pygtkincludedir argument to
diff --git a/dev-python/pygtk/files/pygtk-2.24.0-fix-leaks.patch b/dev-python/pygtk/files/pygtk-2.24.0-fix-leaks.patch
new file mode 100644
index 000000000000..9106d43c4192
--- /dev/null
+++ b/dev-python/pygtk/files/pygtk-2.24.0-fix-leaks.patch
@@ -0,0 +1,58 @@
+From eca72baa5616fbe4dbebea43c7e5940847dc5ab8 Mon Sep 17 00:00:00 2001
+From: Owen W. Taylor <otaylor@fishsoup.net>
+Date: Tue, 27 Sep 2011 04:17:52 +0000
+Subject: Fix leaks of Pango objects
+
+Gtk.PrintContext.create_pango_context()
+Gtk.PrintContext.create_pango_layout()
+pangocairo.CairoContext.create_layout()
+
+were leaking the objects they returned.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660216
+---
+diff --git a/gtk/gtk-2.10.defs b/gtk/gtk-2.10.defs
+index 69c7e0c..faa45e1 100644
+--- a/gtk/gtk-2.10.defs
++++ b/gtk/gtk-2.10.defs
+@@ -1388,12 +1388,14 @@
+ (define-method create_pango_context
+   (of-object "GtkPrintContext")
+   (c-name "gtk_print_context_create_pango_context")
++  (caller-owns-return #t)
+   (return-type "PangoContext*")
+ )
+ 
+ (define-method create_pango_layout
+   (of-object "GtkPrintContext")
+   (c-name "gtk_print_context_create_pango_layout")
++  (caller-owns-return #t)
+   (return-type "PangoLayout*")
+ )
+ 
+diff --git a/pangocairo.override b/pangocairo.override
+index bb923e6..5101107 100644
+--- a/pangocairo.override
++++ b/pangocairo.override
+@@ -118,11 +118,16 @@ _wrap_pango_cairo_update_context(PyGObject *self, PyObject *args, PyObject *kwar
+ static PyObject *
+ _wrap_pango_cairo_create_layout(PyGObject *self)
+ {
+-    PangoLayout *ret;
++    PangoLayout *layout;
++    PyObject *ret;
+ 
+-    ret = pango_cairo_create_layout(PycairoContext_GET(self));
++    layout = pango_cairo_create_layout(PycairoContext_GET(self));
+     /* pygobject_new handles NULL checking */
+-    return pygobject_new((GObject *)ret);
++    ret = pygobject_new((GObject *)layout);
++    if (layout)
++	g_object_unref(layout);
++
++    return ret;
+ }
+ 
+ static PyObject *
+--
+cgit v0.9.2
diff --git a/dev-python/pygtk/files/pygtk-2.24.0-quartz-objc.patch b/dev-python/pygtk/files/pygtk-2.24.0-quartz-objc.patch
new file mode 100644
index 000000000000..828057e62b73
--- /dev/null
+++ b/dev-python/pygtk/files/pygtk-2.24.0-quartz-objc.patch
@@ -0,0 +1,45 @@
+From: Anders F Bjorklund <afb@users.sourceforge.net>
+Date: Mon, 4 Apr 2011 21:34:20 +0200
+Subject: [PATCH] use objective-c for quartz
+
+https://bugzilla.gnome.org/show_bug.cgi?id=646743
+---
+ configure.ac    | 5 +++++
+ gtk/Makefile.am | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 84c78f6c..27192f9c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -445,6 +445,11 @@ case $gdk_target in
+         ;;
+ esac
+ 
++if test "x$gdk_target" = "xquartz"; then
++  AM_CONDITIONAL(USE_QUARTZ, true)
++else
++  AM_CONDITIONAL(USE_QUARTZ, false)
++fi
+ 
+ dnl checks to see if numpy is installed.
+ AC_ARG_ENABLE(numpy,
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 7bb5d0c8..44d68700 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -9,6 +9,11 @@ INCLUDES = \
+ 	$(PYGOBJECT_CFLAGS) \
+ 	-I$(srcdir)/gtk
+ 
++if USE_QUARTZ
++# same as in gtk+/gdk/quartz/Makefile.am
++INCLUDES += "-xobjective-c"
++endif
++
+ # defs files
+ defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs
+ defs_DATA =
+-- 
+2.12.0
+
diff --git a/dev-python/pygtk/files/pygtk-2.24.0-test-fail.patch b/dev-python/pygtk/files/pygtk-2.24.0-test-fail.patch
new file mode 100644
index 000000000000..5bb1aec13d89
--- /dev/null
+++ b/dev-python/pygtk/files/pygtk-2.24.0-test-fail.patch
@@ -0,0 +1,9 @@
+--- tests/runtests.py
++++ tests/runtests.py
+@@ -41,4 +41,5 @@
+     suite.addTest(loader.loadTestsFromName(name))
+ 
+ testRunner = unittest.TextTestRunner()
+-testRunner.run(suite)
++result = testRunner.run(suite)
++sys.exit(not result.wasSuccessful())
diff --git a/dev-python/pygtk/files/pygtk-2.24.0-test_dialog.patch b/dev-python/pygtk/files/pygtk-2.24.0-test_dialog.patch
new file mode 100644
index 000000000000..832007af2328
--- /dev/null
+++ b/dev-python/pygtk/files/pygtk-2.24.0-test_dialog.patch
@@ -0,0 +1,28 @@
+From eb92ecdfe7e310499743a5686560e18bb48ef0f0 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 2 Oct 2013 14:51:20 -0400
+Subject: [PATCH] tests: fix MessageDialogTest.testSubclass
+
+Don't check sub.__gtype__ until we set sub
+
+https://bugzilla.gnome.org/show_bug.cgi?id=709304
+---
+ tests/test_dialog.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_dialog.py b/tests/test_dialog.py
+index a6a3ce5..6540be3 100644
+--- a/tests/test_dialog.py
++++ b/tests/test_dialog.py
+@@ -20,7 +20,7 @@ class MessageDialogTest(unittest.TestCase):
+         print sub.__gtype__.name
+         self.assertEqual(sub.__gtype__.name, 'GtkMessageDialog')
+ 
+-        type('Sub', (gtk.MessageDialog,), {'__gtype_name__': 'SubDialog'})
++        sub = type('Sub', (gtk.MessageDialog,), {'__gtype_name__': 'SubDialog'})
+         self.assertEqual(sub.__gtype__.name, 'SubDialog')
+ 
+     def testDialogLeak(self):
+-- 
+1.8.3.2
+
diff --git a/dev-python/pygtk/metadata.xml b/dev-python/pygtk/metadata.xml
new file mode 100644
index 000000000000..a6d18544f32e
--- /dev/null
+++ b/dev-python/pygtk/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer type="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<longdescription>
+PyGTK provides a convenient wrapper for the GTK+ library for use in
+Python programs, taking care of many of the boring details such as
+managing memory and type casting. When combined with PyORBit and
+gnome-python, it can be used to write full featured Gnome applications.
+</longdescription>
+<longdescription lang="ja">
+PyGTK��Python言語プログラム�GTK+ライブラリを使�����マ�ージング・メモリ&gt;やタイプ・キャスティング�様�詰�ら��事柄�世話を���れる便利�ラッパーを�
+供���。PyORBit�gnome-python�組����る��GNOME�アプリケーション�特性を
+完全�抑�るも���る�������。
+</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
new file mode 100644
index 000000000000..7766afe1888a
--- /dev/null
+++ b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils flag-o-matic gnome2 python-r1 virtualx
+
+DESCRIPTION="GTK+2 bindings for Python"
+HOMEPAGE="http://www.pygtk.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.8:2
+	>=x11-libs/pango-1.16
+	>=dev-libs/atk-1.12
+	>=x11-libs/gtk+-2.24:2
+	>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-2.26.8-r53:2[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=gnome-base/libglade-2.5:2.0
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		dev-libs/libxslt
+		>=app-text/docbook-xsl-stylesheets-1.70.1 )
+"
+
+src_prepare() {
+	# Fix declaration of codegen in .pc
+	epatch "${FILESDIR}/${PN}-2.13.0-fix-codegen-location.patch"
+	epatch "${FILESDIR}/${PN}-2.14.1-libdir-pc.patch"
+
+	# Fix leaks of Pango objects
+	epatch "${FILESDIR}/${PN}-2.24.0-fix-leaks.patch"
+
+	# Fail when tests are failing, bug #391307
+	epatch "${FILESDIR}/${PN}-2.24.0-test-fail.patch"
+
+	# Fix broken tests, https://bugzilla.gnome.org/show_bug.cgi?id=709304
+	epatch "${FILESDIR}/${P}-test_dialog.patch"
+
+	# Fix build on Darwin
+	epatch "${FILESDIR}/${PN}-2.24.0-quartz-objc.patch"
+
+	# Examples is handled "manually"
+	sed -e 's/\(SUBDIRS = .* \)examples/\1/' \
+		-i Makefile.am Makefile.in || die
+
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466968
+
+	AT_M4DIR="m4" eautoreconf
+
+	prepare_pygtk() {
+		mkdir -p "${BUILD_DIR}" || die
+	}
+	python_foreach_impl prepare_pygtk
+}
+
+src_configure() {
+	use hppa && append-flags -ffunction-sections
+	configure_pygtk() {
+		ECONF_SOURCE="${S}" gnome2_src_configure \
+			$(use_enable doc docs) \
+			--with-glade \
+			--enable-thread
+	}
+	python_foreach_impl run_in_build_dir configure_pygtk
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	# Let tests pass without permissions problems, bug #245103
+	gnome2_environment_reset
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	testing() {
+		cd tests
+		Xemake check-local
+	}
+	python_foreach_impl run_in_build_dir testing
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog INSTALL MAPPING NEWS README THREADS TODO
+
+	if use examples; then
+		rm examples/Makefile*
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+
+	python_foreach_impl run_in_build_dir gnome2_src_install
+	prune_libtool_files --modules
+}
diff --git a/dev-python/pygtkglext/Manifest b/dev-python/pygtkglext/Manifest
new file mode 100644
index 000000000000..f633e0e1a841
--- /dev/null
+++ b/dev-python/pygtkglext/Manifest
@@ -0,0 +1,5 @@
+DIST pygtkglext-1.1.0.tar.bz2 349067 SHA256 7f0104347659a81cd5bd84007b97547d18a8a216f5df2629f379ea7f87a1410a SHA512 1b94725d7f93c3ff01a4c2df7986ec3503493a39e78187ed8b440f9609daaf33d801f24b27acef324ea671ec4d46ca1b8cec508f685aa8f70bbc17cbefb69ebd WHIRLPOOL c4eea46296a21a20d4e357344ded68ce99bbb1ddf8ee1307aed94165d0b286d1453d17a3b07b21777f2989f5c4ac62b76fabf5eb0fd13daa71b01392d62f9c6c
+EBUILD pygtkglext-1.1.0-r1.ebuild 1158 SHA256 601b9880dd2e77b2fad3c3681b367f34271b2754f0fe59ffd6b4c2c756d62650 SHA512 30df8b03fbb2d713c9e32ffbfc5f47c0662983bb6e2dc41dc4b4d4176e14a9e04cafb333432c538e0f4e1fc9b3c0516d4da8138667979eea7c44ec7795f06f43 WHIRLPOOL 93eca154d3f666696ac5d4e87f8a6956ef1ef4a64f529ebd05b315148d6e75cc3a757a680604b97bfd195cd6d13abc41ac74d2b5002f699a248ca9ef89406c96
+MISC ChangeLog 2793 SHA256 f08b23dafb3caa1b9f1fe3d60c6b6385884deb7f2830a1015ca42cce47eafdb1 SHA512 853a075ac57ae8b331f2642133d96c95da8968b3d4b9f1ef3e1c732a7925a4dc6468ea4e6667917fd6c20dadd3717866f858a00f8ecbc781650ffe089694aa2b WHIRLPOOL 2148344e3af1ded784b1514041512372a4c252d94877069e78f07238c53adcfaa383024af7c33f0461d160524af2a1abad91cf96dbee35f6a5b48be21fb898d9
+MISC ChangeLog-2015 6969 SHA256 5ee44687f3ee066633e19bc752b4f0274f0c5118e3f65c725b4dcc1f7135ccf4 SHA512 40cf792d6b0fdbeee6b8a687e0267251bb32998e4b8c67f9c195fe1c030e5bb821c531a99e14a2a795e770a980b6da48bef2015a4db7fd3490206682afa31f51 WHIRLPOOL 2849ba20b77676bd65b8fce1fcd32bb21f43aab0e6326ed0bd102106473d6737cfd3d656a9833b853316bf3e4dd17b2a7b4e77390f8ca63fda3a9d296e96bbc9
+MISC metadata.xml 318 SHA256 5a170201fe7ba103783466203a6970fe97d03793020be3613d368a4582f9f47f SHA512 8a0f450e5eac29ebd11d6390cdacdd2f4cc0971d7124665506cb5fd6c051d5d1b0abe6d421795e212725c4045517effbd34e2f4b75c880b2690508cd8ec5963f WHIRLPOOL 710c4e76e5cc6e28d02b8d56269dd4fc0c4c5637320359e008fe638e980e5626d71bf546862535f0deda7f5372061cc879aa3d6e11d75040cb54da399504cc64
diff --git a/dev-python/pygtkglext/metadata.xml b/dev-python/pygtkglext/metadata.xml
new file mode 100644
index 000000000000..f2f71e8cedb8
--- /dev/null
+++ b/dev-python/pygtkglext/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gtkglext</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild b/dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..9d94ae322f3f
--- /dev/null
+++ b/dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=modules
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools-utils python-r1
+
+DESCRIPTION="Python bindings to GtkGLExt"
+HOMEPAGE="http://gtkglext.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gtkglext/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+IUSE="examples"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/pygtk-2.8:2[${PYTHON_USEDEP}]
+	>=dev-libs/glib-2.0:2
+	>=x11-libs/gtk+-2.0:2
+	>=x11-libs/gtkglext-1.0.0
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	virtual/opengl
+	virtual/glu"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	python_foreach_impl autotools-utils_src_configure
+}
+
+src_compile() {
+	python_foreach_impl autotools-utils_src_compile
+}
+
+src_test() {
+	python_foreach_impl autotools-utils_src_test
+}
+
+src_install() {
+	python_foreach_impl autotools-utils_src_install
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		docinto examples
+		dodoc examples/*.{py,png}
+	fi
+}
diff --git a/dev-python/pygtkhelpers/Manifest b/dev-python/pygtkhelpers/Manifest
new file mode 100644
index 000000000000..3ca8af925449
--- /dev/null
+++ b/dev-python/pygtkhelpers/Manifest
@@ -0,0 +1,5 @@
+DIST pygtkhelpers-0.4.3.tar.gz 118768 SHA256 65417d091c68f6262ebaf18c1358f55ffe9e3735261d4c1bfb0d6e5bed1905b8 SHA512 6736cb77ad7d5f8a9811d6604ef112ed73b27347fb4633c611d3cc77ac28a9b51e03b32a2ffb76fd94effae485b3d890699bdcc3726fcd6be509809045cb3830 WHIRLPOOL f13c6ddad94b2b8aab8ec0c1661c4ac6adc596fb1f378670ef1c973fab35bd137aa4e5d723a6f83f3073664784ec8594237c80facb9343442102143dc59228ce
+EBUILD pygtkhelpers-0.4.3-r1.ebuild 1118 SHA256 799a5ef6d8bd5dcea8f4385ea89c37d4d933ba333052b0643a8ef0372d5bd89b SHA512 fdabff987e6dc2b871ba89318a407be8a385961833b675060822179b0d4320d7e9e507be45cc25180f220706bfcbba60dca6e7fa27b859e6427daedc51321532 WHIRLPOOL ea9f552a436f2517688d2aa26748d82788639ee342e7a59046435446ae251a0ac42bd0429ae35c82ee71755bef1550eed1527f2976954458ac956c5cfec5fac1
+MISC ChangeLog 2880 SHA256 751315e1e9dff4fb8dce6d192a3bdb6f82e375443f6cc523ab6fd256bdc252fc SHA512 3f80787daedd3af55be3d0528f30d1a4824213ced44405098fad0eb4d0c5e6e1edb0643d870c28c03d9b7a5d3e9e515d41a5f2ffd0d383af1ca1e746b6c300c6 WHIRLPOOL d0e31a41af1ba643d7af29895623dd632d2243c4e970ad414fc8670df5d359770afd0e6d03cbfa6364b5deb64eea91e3bef30e67099a141f7263e07e9a0a8ada
+MISC ChangeLog-2015 1593 SHA256 9daf1890ac50cd067d31c71b6b858c3b0b830c880d7fe79a840214f32761cffe SHA512 207c27a2c3d0bab730229fe66f0974eca4a0f9d3987bd796383f95c5262ac45ff9f93bd8fc318aa9350f8475e60070b498ad103356f60290d03f18bfce8959a1 WHIRLPOOL 432af8db1f65b8ca0dfe4366603dc413c0091b3551a76304253d3f6fff478eb9a9ea402cf680a65ea1edc17e639541c8b945492d81215272cfa39dd663480d08
+MISC metadata.xml 315 SHA256 eccc3d4a8e7999e609bdc19b6692f57347de2b928545fece5867a8f4ac8d43d7 SHA512 c9bf832b017bfbb4ee79d2553bdbc6fbcbe27f3ddb11d942ddb7f8fc82926cd442c322ed9a42410c6611e6bed9257d32476a3c87ff8f237d47c48e0244796ca8 WHIRLPOOL 8597cf210320c503e13ac6b5c8d540cc55ef32570072d1fee4732deedf1d050dc090c0fc676a8486fa60dafff9a385d89a707b65a1a68fe226b42e6495360bf9
diff --git a/dev-python/pygtkhelpers/metadata.xml b/dev-python/pygtkhelpers/metadata.xml
new file mode 100644
index 000000000000..1bc45847ec63
--- /dev/null
+++ b/dev-python/pygtkhelpers/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pygtkhelpers</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pygtkhelpers/pygtkhelpers-0.4.3-r1.ebuild b/dev-python/pygtkhelpers/pygtkhelpers-0.4.3-r1.ebuild
new file mode 100644
index 000000000000..4adde39da782
--- /dev/null
+++ b/dev-python/pygtkhelpers/pygtkhelpers-0.4.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="PyGTKHelpers is a library to assist the building of PyGTK applications"
+HOMEPAGE="http://packages.python.org/pygtkhelpers/ https://pypi.python.org/pypi/pygtkhelpers"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="doc examples"
+
+RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx )"
+
+python_prepare_all() {
+	# docs/_static/scope.jpg does not exist.
+	sed -e "s/^\(html_logo =.*\)/#\1/" -i docs/conf.py || die "sed failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		cd "${BUILD_DIR}"/sphinx/html || die
+		docinto html
+		dodoc -r [a-z]* _images _static
+		cd - >/dev/null || die
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+}
diff --git a/dev-python/pygtksourceview/Manifest b/dev-python/pygtksourceview/Manifest
new file mode 100644
index 000000000000..2b73e0ee8136
--- /dev/null
+++ b/dev-python/pygtksourceview/Manifest
@@ -0,0 +1,5 @@
+DIST pygtksourceview-2.10.1.tar.bz2 290249 SHA256 b4b47c5aeb67a26141cb03663091dfdf5c15c8a8aae4d69c46a6a943ca4c5974 SHA512 6f8f35ba36cb26f256861ff7f14c3236cf566d6d02f3dea69f63844081caee969ad6288a2aa48d35d4eb542cda73da9d4bfe2cc57548ca15cd372011cab0276e WHIRLPOOL 237ce7a181c4508a17838cae28cf96fda6ebe4f16dbbbfdc83ca5da104a3422031369dbb870c7219f3031feded0833ac1393a6aabcb1fb45b169b198b3b480dc
+EBUILD pygtksourceview-2.10.1-r1.ebuild 1266 SHA256 8a94a3b0a588d0cdd151d8d252129903bdb912b6527295122323f3e1bdd6ed74 SHA512 6f1d94ed480fe53dd6480e951fc4c856e459117cfde6344ca9410f8a6f0d78112e33f70cd4289cc5f10f5ac62dbf5b4c541dceb40ce8290275eb97fff9cb01bb WHIRLPOOL edcd4d102e29925c01b9dcb2cb5ceb74fc2be29ed7fd541c24793f49a6b8309532ceb8319bab4a2549be8d7030d7e5db11ce8da5d9155b5b3d291829601b7831
+MISC ChangeLog 2607 SHA256 2377e656bf5d7c2855cce9d5d4b48ad1bfc91b4d8730a410edae94ea7c9d9c15 SHA512 72df30d35d19834a5e313fbdc0efebab41afaa9483e33da5c9bc364d09a78ba1a3cee9f6cfc10cab36d476f34062c3f3cb962feabfa189d30b95b1cabfd8d0f3 WHIRLPOOL 065022cbb3d76a14ffcc5bd265848daf09c5f7b14837616039fb26c53b4115a4f5ae450bbcff20e0129807680958c662b8cd4a6415801f08826ad67e38516492
+MISC ChangeLog-2015 8572 SHA256 2e9348df8b6fffee0e95f64dbc5132cfd8529fd264bc841f5f429c3bae785d41 SHA512 aa459d29537142880621b02af7fb371a46ee96a6f0b10c41e15382bf339a3ce5ebf045afa433e8c59bc46d93d106537972ff4299e8a9e7493036c383f17f284f WHIRLPOOL bb864e7eea6a5fd02d116fbcf2e8fc33092abc8b76bba22ca18f318b2b5d71ff99bffa5ba7ceda8d3fd2a7e0c0f8b7f403daaeb6b0432854651c32c378f8878f
+MISC metadata.xml 371 SHA256 cf3c2a9b34effaf44096d8a16fb2f935c1dacbd256a7b48fa091cb351d3dbc54 SHA512 4565cd4175e40911dd6f7ad7880b7a8e2214e0e4bcedc10b4eb37558309717bdae656257e87dbb1c9ee9220321e800336219e370b41e28437d11404b6a20f7ca WHIRLPOOL 5dd326991cfa2614dd09a9ac4af6d9d629025d95ebaf066946a4d395280554b84e502228be550e009ac2209d8804bcac1bf409ca1d4d2292b5e913e7146cebd6
diff --git a/dev-python/pygtksourceview/metadata.xml b/dev-python/pygtksourceview/metadata.xml
new file mode 100644
index 000000000000..f49d4aada970
--- /dev/null
+++ b/dev-python/pygtksourceview/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="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<!-- <herd>python</herd> -->
+<longdescription>
+Python bindings for gtksourceview (text editing widget)
+</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild b/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild
new file mode 100644
index 000000000000..3ccaffae736a
--- /dev/null
+++ b/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="GTK+2 bindings for Python"
+HOMEPAGE="http://www.pygtk.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/pygobject-2.15.2:2[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.8:2[${PYTHON_USEDEP}]
+	>=x11-libs/gtksourceview-2.9.7:2.0
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.10
+	virtual/pkgconfig
+	doc? (
+		dev-libs/libxslt
+		~app-text/docbook-xml-dtd-4.1.2
+		>=app-text/docbook-xsl-stylesheets-1.70.1 )
+"
+
+src_prepare() {
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure $(use_enable doc docs)
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	python_foreach_impl run_in_build_dir gnome2_src_install
+}
diff --git a/dev-python/pygui/Manifest b/dev-python/pygui/Manifest
new file mode 100644
index 000000000000..060f2a571d39
--- /dev/null
+++ b/dev-python/pygui/Manifest
@@ -0,0 +1,5 @@
+DIST PyGUI-2.5.3.tar.gz 594157 SHA256 ef3af16d97dc6f71898d71706ee9e2fe6de44a83ace01d690054804ca16c7315 SHA512 dbbfd95785f37842dab657be7218bf057512fdb43f1c3eda7a9cf1b6d62c83b40b4295572bc6947fe77fc23e25b53c8a69855ddf2272e25410fdb17297483942 WHIRLPOOL 37853cbd2a959c1c9c3e1f69bdd68bfd84094c1db465c490ada16b7081a84b4a6b992ad668f01340295654c15eb0f0137a10f88d38402cee77d50ae196c9acc0
+EBUILD pygui-2.5.3-r1.ebuild 678 SHA256 5ab1e7b60f99afc2b37133390257fd2bb8a4323f265fee9c551b49b2176f0f22 SHA512 95bfe4372db226c8ee25764ed44b517551b3279015f430a628ef1ccfe0d5e26bc9151fcd0d9ffb148e7af979402ff587d6b73f7072b0e642a207c95693e60618 WHIRLPOOL c50f2178a2da37d9e5526276d5089dc7606b7409e52259a20a10690e41c1589c115411fc2af8679cca004219251acf4d6743791782a5e330eb6cc60770c2ab52
+MISC ChangeLog 2747 SHA256 07b97afdc6015a8ec0573912eb2f9c36cd72c8f205482cdfcfd83db523713fa0 SHA512 8a613d57550433876d01e0f76503d4e2d1bb8e6204a4130b9d8d02654c78b5bbffcf199617570eef2eca1970390004f14ea45a8f6ff285924e50537216f736b8 WHIRLPOOL 228e6158e9ab7ef020274dd7d944c58aafccb1b3b0a109450606ac1afc217c9b6daf2a581d62b466f89fd6b9e7294c2d1402ca4cef2a5927dfb7bee20bc6c867
+MISC ChangeLog-2015 1515 SHA256 f74fba6a55b55a5c5040a2d08e84eccc152f1dff0cbf3cbb955dc8bb8979db7b SHA512 ee3bb883f164435810eacdc13232c7ac069c2eb461a06f5c546ec2a1e7b33e6eb06451b7709a788cd6f7f6925b1174cc2459435b1c1d38ad5e93054ecee4ee2b WHIRLPOOL 6595c123e1138c71d3a80dad57fa9a523e7fd9c65acf9c0964ad8b99d047110adfa1c3dcbbde83df9e11f5850bc6453a6db301b476504ebdc1cd1ebb502a8070
+MISC metadata.xml 465 SHA256 aef4b55ebf636276156b712b546b7e3c5febc35b924c15959fdb4ca117826d6c SHA512 05915d538b728381476266924edfb69028e6961377b86d517094a341727931bba1b65520b0de3956758f2e2d1246715148c74f790aec68e9d856671b6d198c30 WHIRLPOOL f7ecd2f639d3177f68064aa0e29dbeda6d3a1dd602995390e565c46949930dd827b28c33b391aeea4b46bd416e35cd00a8ec9321867849f2fca68d1ad8066718
diff --git a/dev-python/pygui/metadata.xml b/dev-python/pygui/metadata.xml
new file mode 100644
index 000000000000..a786950898a6
--- /dev/null
+++ b/dev-python/pygui/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+    A cross-platform graphical application framework for Python.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-python/pygui/pygui-2.5.3-r1.ebuild b/dev-python/pygui/pygui-2.5.3-r1.ebuild
new file mode 100644
index 000000000000..b7ad26812a8d
--- /dev/null
+++ b/dev-python/pygui/pygui-2.5.3-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P="PyGUI-${PV}"
+
+DESCRIPTION="A cross-platform pythonic GUI API"
+HOMEPAGE="http://www.cosc.canterbury.ac.nz/greg.ewing/python_gui/"
+SRC_URI="http://www.cosc.canterbury.ac.nz/greg.ewing/python_gui/${MY_P}.tar.gz"
+
+LICENSE="PyGUI"
+SLOT=0
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+DEPEND="dev-python/pygtk[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( Doc/. )
+	use examples && local EXAMPLES=( Demos/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyh2o/Manifest b/dev-python/pyh2o/Manifest
new file mode 100644
index 000000000000..341089977fec
--- /dev/null
+++ b/dev-python/pyh2o/Manifest
@@ -0,0 +1,4 @@
+EBUILD pyh2o-9999.ebuild 632 SHA256 cebb97554c78197b1e13b4656a7bde90cc4347ee94fb4175865285f5b99384a6 SHA512 c3b4507f033d3b3216cacfe86e29cc5f76a2e19d6d11ed12f97c02706c86fa2cae9e9c298f57153a08fc25eebb5950daff01afa06cfdc1500dcfa54ca6c93117 WHIRLPOOL 81cae5133dc9eb2fcabb33be115074af49b1f0a503629e01599debd4906728a51376ffa00f5e99baf8506e2dc9d14dbe0d5358c26c7c3b08ad3cab94afc4da28
+MISC ChangeLog 2435 SHA256 71b8ce723c38383e8ec22947ade4e0543153ac3fee8c42550ba41ea6441a4309 SHA512 15decb9325fbb349ad7c871fea39167ee110b7f4f72e83a284cb24c2debb20cf2d3d4003b5441ca9f8de3bcd03341353d2987e4f9ba44ccca45301e00f6cd2f3 WHIRLPOOL 1132a288b55802269c3a8ebe1bd8685bc22eb7119d06a71aa9b2aa39a9ad6f916bc0a80af9eb6f9c0c640142c3de98a36494fe6ca53fcccf241fa97e1a315c50
+MISC ChangeLog-2015 1493 SHA256 8c5242d332e1dab4ac7cbd4adfe0d3fb24f372f2309dd9331cadd89c99e3c1ad SHA512 b74517ee13eb6accf33374266e494ec59c00c274875a416ae1d2a64941324f950dcb0995e5cdb0b60cc8c64323ab4be7ec75839d8c0f5e5f628d51d675f277fd WHIRLPOOL c524402b53cd690becab12879d719722400d090ebdba828f0c7f4a60093bd4433314f736035649736767a6502b39de8dc08645572a37a35f60cbf3b68149b416
+MISC metadata.xml 528 SHA256 c2371342a9008b4a63aaafcdfba86bb9e0c11661c78b6f8f04d27004b4447396 SHA512 263e3bcc7be36336d098a63066e1ef83d503bbd8716d32fb45f70b7d0d0a9d42ad5d8af4ede51dd5dda130413223d96d558d680f361b0ece794f47d8253d5696 WHIRLPOOL 03e1cc95dfe68402af66aead7e3bafc27b606544990fd3af8c7b0d66dcb0a76d7f4238c6efc4bc3aaac0a38910aee2d80dfb266f87eb261dff51e88ac51628df
diff --git a/dev-python/pyh2o/metadata.xml b/dev-python/pyh2o/metadata.xml
new file mode 100644
index 000000000000..5ea188e8d80e
--- /dev/null
+++ b/dev-python/pyh2o/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
+  </maintainer>
+  <upstream>
+    <maintainer status="active">
+      <email>mgorny@gentoo.org</email>
+      <name>Michał Górny</name>
+    </maintainer>
+    <bugs-to>https://bitbucket.org/mgorny/pyh2o/issues/</bugs-to>
+    <remote-id type="bitbucket">mgorny/libh2o</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyh2o/pyh2o-9999.ebuild b/dev-python/pyh2o/pyh2o-9999.ebuild
new file mode 100644
index 000000000000..669c5446b717
--- /dev/null
+++ b/dev-python/pyh2o/pyh2o-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+#if LIVE
+AUTOTOOLS_AUTORECONF=yes
+EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
+
+inherit git-r3
+#endif
+
+DESCRIPTION="Library of routines for IF97 water & steam properties"
+HOMEPAGE="https://bitbucket.org/mgorny/libh2o/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=sci-libs/libh2o-0.2.1"
+DEPEND="${RDEPEND}"
+#if LIVE
+
+KEYWORDS=
+SRC_URI=
+#endif
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
new file mode 100644
index 000000000000..709e86b46678
--- /dev/null
+++ b/dev-python/pyhamcrest/Manifest
@@ -0,0 +1,12 @@
+AUX sphinx-rtd.patch 671 SHA256 13cce25797dc77faeef6c89742fe0d48f5ed00d79253bf89298895146ee73889 SHA512 c90fe86017d3173e21eb8013bb433e29999c433709224f180c60ec3d8bb1086eb26b713cd3d5dbea04a60a20d8a8e2b8d87f2252aae9286dd41f3bcdd0b51aaa WHIRLPOOL 14da55384df5637f3c0b69d3550b4fc4a00597004751af8ab67d864d980cdd06f14c9d2daaef4a460dc0d42d241d54bf530df068345c9907db1e4cc059355c55
+DIST PyHamcrest-1.8.2.tar.gz 372308 SHA256 bd14093c561f9af8ce8271a630929f4a45be7a4e79bec53c83b876a0547d303e SHA512 ff90a6bb1e2319d25ba8c29e998796544d5840599e7d9a4a178022e6b5bcabd23d35433073152a2707d555aab3aa96c316b8db54d7ec1c0ca2ef1cdf50e4df40 WHIRLPOOL e207d109420ea3d1eb6cf14c65a3d2eb9e1dcabcc30b7917f4c95cb445a554c2fea8e5766213fd513c9323c33b58a63f0d9b102b52062ed7f61b148aeba3c770
+DIST PyHamcrest-1.8.3.tar.gz 376145 SHA256 118c48351451ec027cceed781841c19b836739e21f71a26649fe97fca0d346d5 SHA512 4e11a3ca93886c58b512b5ad77f95c2df3771476d6ca0e99eb6e20c0292819a5f985b7004b3523c756255e503cfe4e266fdb776b285e430a7bd987164f9df14a WHIRLPOOL 4210a503b5eb1f60e7f6757d21b0887f96cfe8b5f261d490f5589d3bbd0e099b91d1dd0264025e3730c94b78419cc8e762e66ded8e33dba3b37dc3764beba4ea
+DIST PyHamcrest-1.8.5.tar.gz 376456 SHA256 db990f17477bb0e78f726e8b04fe3ac78f697011e5c8ecb0928567db14efca55 SHA512 7841f704fdad8653bad923dc243431b4c3d82a9646d1138528356162bd556bc5d16178fbc6b1f27918e8ac1df6c54afb4d5eb8b3286536df33dd85ace475ea2d WHIRLPOOL 721fd1101a32b44bfd1cc8e8fc5e63a776ce5c5b3e126311f7f185cee092ebe6035151737db1b99edeca0e9d395a4eb1c1811a83aaed015be4dc6ce2499609f3
+DIST PyHamcrest-1.9.0.tar.gz 376623 SHA256 8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd SHA512 3b8393d0079b619b208ec7f06ed5133c4ff9d9dba050f818adf56347fc2225fd1c85d60f3dc262b7b9722061f0b8e4966180b6b96245a371e578d0d51633b4b0 WHIRLPOOL 2fcd5a30131c7bdf87fe79640d2eee9b4c773be9a25fd79fc8b82d8915d5cd00c6c574b02224e8a2b83cf1590d69884d15c5d300e053b8edcf9468fbe03861a5
+EBUILD pyhamcrest-1.8.2.ebuild 1085 SHA256 cd534a0d38f4f75367c647849d632cf9d170e35e9f2034b6bcde61ea48ae7a3d SHA512 231e01a0c1d10ff8c0fe4ba2ea4030af2c46990b026a46579d2e1e182899c2ed0151e0aaae596255821d2dfc3f0f7d9f031ce20c807d4ef81f800762ff2a060f WHIRLPOOL 9c38a729c1eff2642e252290e1059297d3c7c130dae0355c7c7cb502ab5bb8b5bacb446592613f4ed774ef14fc40ceae9a6e555509bcc03da24f6cdf3eae6b7c
+EBUILD pyhamcrest-1.8.3.ebuild 1285 SHA256 c3a8c90ed94c8885bbf5a4a15984150b5b69d025cee29c57d5dd4dd25224bba4 SHA512 d48f80e91e0978346aef2becba2ea1892d1c415e67ae849cbb473ea0c919560012eb862950861a87609df833732241e7ffe988826f93df95f4349eb9c80d84fc WHIRLPOOL 88d1398191b12885a25a4f287974f436367bf56a2812ae0490b66751bba682a4753b8d4bf209e8b9415a8707c1ef2ff6c7826426e320ad1dd4c060b700f95662
+EBUILD pyhamcrest-1.8.5.ebuild 1050 SHA256 ff371f7f8374d6725a7b22af4246ac1675271c3d25f587111b8f0426fd559d25 SHA512 a87720d361612b9a069042e38d1e1eb003e1cbabbdba788bb428afbba623361b6e856669c212df110e98116d1215e0c2d863736f4210e30d0280cc96a1b34001 WHIRLPOOL fb09aff0e400ee2a39a1cb20b1a1ea19406e42b36696bdc86b84ea45ca5cb08235ea39c726893c7a1ad4c2a688cf11c563c7d74b0178b739b4aeff51ba94de31
+EBUILD pyhamcrest-1.9.0.ebuild 1228 SHA256 70f82e4e3b421d717b43a55712ef04ed9f68a93c3a88bf31c4cb7ac0a4154826 SHA512 47b473c3ce3088a2313bb77716ef64e7ba31316dddbf8fa3f7e9b13a2fcff053f72c457440e7711308fbfb39c45d503169d753c2e0e784f4ff8e8ef6dd09353e WHIRLPOOL e9d24edcdaaa30e6f05de23315ceb12e671359fe587589c78658b3d86f9258d608c205a80ceb961f4c91a81781b58c4c4680bc4c858a23559368bd32393b22c6
+MISC ChangeLog 2718 SHA256 70aa30433185990d8f26bc34722bf5fef78ae4c04a177682e17f2aa9e3feeb5c SHA512 878fac2e90cbcc93d85cd24158fb51f30b07e670f8525d5412b09df89d7331ffaca77c3951fc69f8e870ca5c81940dd93f775de382969a7cc32985f2ae4cf124 WHIRLPOOL eb862f2d1839818484c588e0e17899a6629ce26427c6b7027f1420182b9951b10f5bf972f8d525b41050d8752d785d4632c9a8c06f56355dadd98f200eeb491e
+MISC ChangeLog-2015 1592 SHA256 719081054f809a231a895e76803e48628595cb6a665e125f2a3331f56d20772b SHA512 9c114235eaff4ffa9bcc9a6e84621967431ea4f22976a766bafba8713f8e4572b79a1e48d3a7419eb1ecfe6986bcd8f796b63e65e6fb589958e0ff0975fe85ed WHIRLPOOL c7ee2ff5674594c948a7ca828fcd4b8468e0d85ab07f40701f23108d6f838d287629196ca03e9a456582d8a5c963a23917c93cf3615fd79c4c4d476f529fa2a0
+MISC metadata.xml 468 SHA256 86bd836bc99c9e0ba2a731f0c003b273e3e0cc4c154501ccdcc91db36732229a SHA512 3103292cf733c1962b6ef200b1f8dbab17c211dfd4b5ab0dee86d3516d07f8ac9c41b940b384c97924325bfc44b0f804cd7c1d7bcd9d1dd4106c25c279d7957f WHIRLPOOL 0b462d7b3445d8931589dd244dd299dbd41dcbeb0b1605650c541cd120629d6b49d1b310b874d11b0d7b3f3d48f763c6c524e5f0734fe6a3ce92fddcb8b88689
diff --git a/dev-python/pyhamcrest/files/sphinx-rtd.patch b/dev-python/pyhamcrest/files/sphinx-rtd.patch
new file mode 100644
index 000000000000..2974c98a56a3
--- /dev/null
+++ b/dev-python/pyhamcrest/files/sphinx-rtd.patch
@@ -0,0 +1,20 @@
+diff --git a/doc/conf.py b/doc/conf.py
+index fb5d79e..7d3571b 100644
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -13,6 +13,7 @@
+ 
+ import sys, os
+ import six
++import sphinx_rtd_theme
+ 
+ # If extensions (or modules to document with autodoc) are in another directory,
+ # add these directories to sys.path here. If the directory is relative to the
+@@ -106,6 +107,7 @@ html_theme = 'sphinx_rtd_theme'
+ 
+ # Add any paths that contain custom themes here, relative to this directory.
+ #html_theme_path = []
++html_theme_path = [ sphinx_rtd_theme.get_html_theme_path() ]
+ 
+ # The name for this set of Sphinx documents.  If None, it defaults to
+ # "<project> v<release> documentation".
diff --git a/dev-python/pyhamcrest/metadata.xml b/dev-python/pyhamcrest/metadata.xml
new file mode 100644
index 000000000000..a1eae924e1c4
--- /dev/null
+++ b/dev-python/pyhamcrest/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<use>
+		<flag name="numpy">Enable optional dependence on dev-python/numpy</flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">PyHamcrest</remote-id>
+		<remote-id type="github">hamcrest/PyHamcrest</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.8.2.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.8.2.ebuild
new file mode 100644
index 000000000000..7fa0b79b7a0c
--- /dev/null
+++ b/dev-python/pyhamcrest/pyhamcrest-1.8.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+MY_PN="PyHamcrest"
+
+DESCRIPTION="Hamcrest framework for matcher objects"
+HOMEPAGE="https://github.com/hamcrest/PyHamcrest"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples numpy test"
+
+CDEPEND="
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )' 'python*')
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.2.2[${PYTHON_USEDEP}] )
+	test? (
+		${CDEPEND}
+		>=dev-python/pytest-2.6[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.8.3.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.8.3.ebuild
new file mode 100644
index 000000000000..d008ae878f69
--- /dev/null
+++ b/dev-python/pyhamcrest/pyhamcrest-1.8.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+MY_PN="PyHamcrest"
+
+DESCRIPTION="Hamcrest framework for matcher objects"
+HOMEPAGE="https://github.com/hamcrest/PyHamcrest"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples numpy test"
+
+CDEPEND="
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )' 'python*')
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.2.2[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		>=dev-python/pytest-2.6[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/sphinx-rtd.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+	#use doc && emake -C doc html
+}
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.8.5.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.8.5.ebuild
new file mode 100644
index 000000000000..306c22de306b
--- /dev/null
+++ b/dev-python/pyhamcrest/pyhamcrest-1.8.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+MY_PN="PyHamcrest"
+
+DESCRIPTION="Hamcrest framework for matcher objects"
+HOMEPAGE="https://github.com/hamcrest/PyHamcrest"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples test"
+
+CDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.2.2[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		>=dev-python/pytest-2.6[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.9.0.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.9.0.ebuild
new file mode 100644
index 000000000000..b8007ad5a05f
--- /dev/null
+++ b/dev-python/pyhamcrest/pyhamcrest-1.9.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="PyHamcrest"
+
+DESCRIPTION="Hamcrest framework for matcher objects"
+HOMEPAGE="https://github.com/hamcrest/PyHamcrest"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.2.2[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/pytest-2.6[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RESTRICT="test"
+# the pypi tarball is missing the tests
+# and the 1.9.0 tag is missing in GitHub
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+	"${PYTHON}" tests/object_import.py || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyhcl/Manifest b/dev-python/pyhcl/Manifest
new file mode 100644
index 000000000000..87d480680aa0
--- /dev/null
+++ b/dev-python/pyhcl/Manifest
@@ -0,0 +1,5 @@
+DIST pyhcl-0.2.3.tar.gz 21796 SHA256 99f49100162a93a746b36903afef964132949f640f5e74c0e0de9106eaf1ac53 SHA512 09cc9dd53048170ad49794d0944acaacba2c08bc5a05bb8d699bb47dc0a03eb32881ddf4dc0771e8b6ee008f7a47b5e95beed4bd77b173c88c6cc322eff4678f WHIRLPOOL 421b4167ff7a2e2e41d9441eb7a17b16b9830ae430c19c03b8c6a2a4b340e0a2039d1551c1b5fda5aefb6cbae522accd03bf2b2e3363d17db0fac78ee4ce113d
+DIST pyhcl-0.3.6.tar.gz 23682 SHA256 cbb0c2b096570f6af876b9705b6b5302426d4895fb370f71900379de897f140e SHA512 27cb190947162e62766f7f4e33b1fbda8ac6a9750418b17cb8d9fa2b9fd0de28fc3e2c9d27f59af7c4740239794e9c81148b7ef20ad8f5d4fb59348c0cf9c5e8 WHIRLPOOL b7df58970d5eda0cda1df9d42e0ac42cd43838f582c7ff802e18fba36c7b760ef6b2ee9efcf795f949b5675a83c48c3c54c2fe5ee9c9ee03c63b77f6d5067691
+EBUILD pyhcl-0.2.3.ebuild 647 SHA256 3fba43a18def511c5ce9173189a0304b0ee408f06ad38e2ac3f7af6212e12936 SHA512 7ed2978263b9fc2a3a47ce546eee51ae329ea081f6c564c3aeb380a877ddff1b8187b57aa03a249021c41aa32f6b6d09bf0dbe7294091a795a04f4e6c9511a62 WHIRLPOOL 1f899143518996b27250bc2b1db114786a3c69427f67ff09663485fb4623841fea568d255a3c5192ca40036d8b7904c51f353a762047cd6047b4b1c6448621cc
+EBUILD pyhcl-0.3.6.ebuild 647 SHA256 3fba43a18def511c5ce9173189a0304b0ee408f06ad38e2ac3f7af6212e12936 SHA512 7ed2978263b9fc2a3a47ce546eee51ae329ea081f6c564c3aeb380a877ddff1b8187b57aa03a249021c41aa32f6b6d09bf0dbe7294091a795a04f4e6c9511a62 WHIRLPOOL 1f899143518996b27250bc2b1db114786a3c69427f67ff09663485fb4623841fea568d255a3c5192ca40036d8b7904c51f353a762047cd6047b4b1c6448621cc
+MISC metadata.xml 319 SHA256 a45c3cc9735d88c82776ee58f72e9c4b65feadc8abd8b01520ca33ce726c56d8 SHA512 dffa813a0f0b7c76a978c1321d13723b440392647bd2cdbf26366d9fb2d7c572d4b726797cc61c249f25dac38ce9df9d71ef5de517b513b6ac3000ef72e06640 WHIRLPOOL dcea1ad7709f23c826b4fecd8aea68ea13827b8171dd8ad7226d7e40847d7da772bdfe8b146c66df36cb813f538b86ca4718a3b287e11aefab8404a86e9582ab
diff --git a/dev-python/pyhcl/metadata.xml b/dev-python/pyhcl/metadata.xml
new file mode 100644
index 000000000000..be257e4aabf9
--- /dev/null
+++ b/dev-python/pyhcl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">virtuald/pyhcl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyhcl/pyhcl-0.2.3.ebuild b/dev-python/pyhcl/pyhcl-0.2.3.ebuild
new file mode 100644
index 000000000000..a21ac72f71bc
--- /dev/null
+++ b/dev-python/pyhcl/pyhcl-0.2.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="HCL configuration parser for python"
+HOMEPAGE="https://github.com/virtuald/pyhcl"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=">=dev-python/ply-3.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -i -e "s/==.*$//" requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/pyhcl/pyhcl-0.3.6.ebuild b/dev-python/pyhcl/pyhcl-0.3.6.ebuild
new file mode 100644
index 000000000000..a21ac72f71bc
--- /dev/null
+++ b/dev-python/pyhcl/pyhcl-0.3.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="HCL configuration parser for python"
+HOMEPAGE="https://github.com/virtuald/pyhcl"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=">=dev-python/ply-3.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -i -e "s/==.*$//" requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
new file mode 100644
index 000000000000..4d1da5fd726e
--- /dev/null
+++ b/dev-python/pyicu/Manifest
@@ -0,0 +1,6 @@
+DIST PyICU-1.9.5.tar.gz 181878 SHA256 73b052b800861fae3281dbaf9c92d12a81cabf3d31912d94c51862e093ef359b SHA512 19fb3222a68cc67e92ea4171257d00c9a322f993f1303a4432b5c3c4efda32ff4c2372027cf9f3fd31d3dc3cf3bcbcb957dfa420039591044812f0213684e885 WHIRLPOOL 05e931826f445cc989d8d5ad1db10121705e685d53e8696e0befe172ee8e32895482813bcbcac105e3c8ac92ef85d8b96f79c67de35ed6547a7ccc64acee3413
+DIST PyICU-1.9.7.tar.gz 183235 SHA256 db27cd1cc150b879c5465872bec7fdaf340eca140aa922be03891d5b9f855b61 SHA512 ac4b9fa6e73eac9e223d4d3758a80611e4e4d78812b88b6ffb20f4b26012dc794cc242a0307cf16597677a552987dbfec3d047cf836f039721bbebab468c76f2 WHIRLPOOL cc4be8d52ad20ae47370ee590af814263f75f5766eb8686f4f17fee4e427aa581727885bc4bc20b37577aedacbf87cf4cb902393ba7c968b91bf733aee3d6c9c
+EBUILD pyicu-1.9.5.ebuild 1253 SHA256 9be895b7b19e1a02f72a3e7f3b07b1c1bb691fe8bba4f3e6cae26dd575076b30 SHA512 105b89e547c99052fd4caa9cdeba88edb451fa0de4e49f2fa1cf91b938396383b12a7ebed42d05ae01e1e34506afe13dc8e183189d5bbc3afcd72a8d5580869d WHIRLPOOL 1e3fe487304fbe5d26afa8666cc5ff171f72066f4f88f34eefb7c07f4d97caa6f731d66cf289e764ea5df4b54cf2e08aadc6cbe4cc5b4675c52d655ed0c92bbc
+EBUILD pyicu-1.9.7.ebuild 669 SHA256 6b2547d95e2d744a6dd6e5601784f714aaec66f4b499900a9bcd6d5217d6b9d8 SHA512 6bf242216967d27bcb6fc4b54f1cf63b68dfeede3c398225a84db064159e7a6c0f769bacec4f6a87e1c61f57a9d842e262a06f374ec1b2beb9b2372169d8eee8 WHIRLPOOL 5b078243aead10596e8cb1cee14078fd540649371bb533d20637f034feb3a9f1a5fa464aac6080eed4e30dd4318f2e54c934456b06194d200f54a8d6da26887f
+MISC ChangeLog 2161 SHA256 b4f65082538621cbd79a9ffcb2e6f1e759f5d6165030e5a93bb7b4a594b3280e SHA512 8f1e125f50c6aadf679005eda6b02757bf5606c591440db6d4a3edd42b6ded902f3be5f8c23266611cf8b78442974aafeb01424388b905df1b78fba1d8bf66cd WHIRLPOOL 32d8af3e973bf002f546d29e609b60f02a36a8e24d4256fed39cff53c673486b60b0f5de2ca2cfe3c4d53387c064a76ca640c058ef6d9f11ee4f6c5d2ef6f19a
+MISC metadata.xml 358 SHA256 5082d5f8de90eaf93d3b3ff21d50d00c4b21e2b733589212d7db3b3bb42eeae9 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835 WHIRLPOOL 3aa0bba56f6383b8da810ce81a1f98d6420ca7fa7ebcc2850b51649e839af8e7a93bb4111c88a9ff0ddefdaf6811305b0b30dd7a19e99fa2ce6df1f57e0c61c9
diff --git a/dev-python/pyicu/metadata.xml b/dev-python/pyicu/metadata.xml
new file mode 100644
index 000000000000..ce15e15687da
--- /dev/null
+++ b/dev-python/pyicu/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>marecki@gentoo.org</email>
+	<name>Marek Szuba</name>
+</maintainer>
+<upstream>
+	<remote-id type="github">ovalhub/pyicu</remote-id>
+	<remote-id type="pypi">PyICU</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyicu/pyicu-1.9.5.ebuild b/dev-python/pyicu/pyicu-1.9.5.ebuild
new file mode 100644
index 000000000000..a6ccb72671c8
--- /dev/null
+++ b/dev-python/pyicu/pyicu-1.9.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+DISTUTILS_IN_SOURCE_BUILD=1 # setup.py applies 2to3 to tests
+
+inherit distutils-r1
+
+MY_PN="PyICU"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python bindings for dev-libs/icu"
+HOMEPAGE="https://github.com/ovalhub/pyicu"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/icu
+"
+# epydoc supports only python2*
+DEPEND="${RDEPEND}
+	doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )"
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(CHANGES CREDITS README.md)
+
+# we need an exact version match for epydoc to work on a binary module
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_compile_all() {
+	if use doc; then
+		mkdir -p doc/html || die
+		epydoc --html --verbose -o doc/html \
+			--url="${HOMEPAGE}" --name="${MY_P}" \
+			icu.py || die "Making the docs failed!"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use doc; then
+		local HTML_DOCS=( doc/html/. )
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyicu/pyicu-1.9.7.ebuild b/dev-python/pyicu/pyicu-1.9.7.ebuild
new file mode 100644
index 000000000000..887fb5aa2957
--- /dev/null
+++ b/dev-python/pyicu/pyicu-1.9.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+DISTUTILS_IN_SOURCE_BUILD=1 # setup.py applies 2to3 to tests
+
+inherit distutils-r1
+
+MY_PN="PyICU"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python bindings for dev-libs/icu"
+HOMEPAGE="https://github.com/ovalhub/pyicu"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/icu"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(CHANGES CREDITS README.md)
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pyid3lib/Manifest b/dev-python/pyid3lib/Manifest
new file mode 100644
index 000000000000..07d04016448a
--- /dev/null
+++ b/dev-python/pyid3lib/Manifest
@@ -0,0 +1,7 @@
+AUX pyid3lib-0.5.1-gcc-4.4.patch 404 SHA256 dc1668d3d180f0cc0ac005f043875c270a6d6f50e558607484844977df08dba1 SHA512 dec8d4768f48125f2707489355fe3c1a1c5c64c10c4f486a62f26ae55e05b78bf8b3b787f15c5d49c44383bbf3a5a0932e2c259b497983b10470180300330edc WHIRLPOOL 58d702ecf3819c356fd1ef4e8cc15f1a98649adbfad44017e1e61a84fc6399af279a71aae0a22d5681ada23bb365db0e5145ed828d3a7d45821b72e005c782bb
+AUX pyid3lib-0.5.1-py25.patch 1307 SHA256 07716da15662c5d266a3a184181d4825e391959306819f0eab89cd9993551342 SHA512 48da2449be6f7e711a3e9817927a9ed6aaaa2086c14e8674218993fce3f33816fb294ef70033de92950578e477998bc7b1cdce092f7a7e17f66dd24592d757cf WHIRLPOOL 550da5a25e5ef8b7f0b27cd23f2248d55945dbc7e172328b9f16e6bd9d86fa5d1305cad576382a4df0dbe8812151880ff018f2c78ea71867ac4f7f0e3ab4b520
+DIST pyid3lib-0.5.1.tar.bz2 21207 SHA256 2a7bdd52c24ed0e70e4a2d82c697214c4ab5a70f94ea9e7934df15ca202d1169 SHA512 fee073a7bd87540a186122b477e918b2c3d8a234ea5ebd83207115b9d0503cc22645b93f6702b79a1b41104d0cbcaa3c47900bba27ce52d44195a8f8a6331c57 WHIRLPOOL 35bc8cd5645269d0e7d95043188a4dfb789ed868ee0d6975175daf0de3366dd0b7f6a28f0967d3d9ea9b0f3f2de55dd6d871efdcc4a5ac6e19c2d08601af68b6
+EBUILD pyid3lib-0.5.1-r2.ebuild 651 SHA256 65ead2151019aff5752ee5c86f5a8072ef978b49e2a675ef071adca5571619c3 SHA512 be5a74f8479262aeb7c541b0c24fa6fb5f1e30c172d494d38349c421c63c14568078831f1598983d85b32f43ff6f528328b029a667c75f8fee3452b67abefdff WHIRLPOOL 1eea451af9062d58b5adec46e0d983aa31fa1279fe38afbcc0141349825d89197fe9d761cdeea6022a8baebaec5b9388b15d2d69cdc2b5188f06c6ca7afcd408
+MISC ChangeLog 2571 SHA256 3fdec827c9cecf2fc5491526c2ba40b40682e6602812cc593d47091cbf2331c4 SHA512 1a0bd6f2c0c83f75aebede3725620d004674739fa817a256c2864f776799dac855a09f48463f2210ef0d447d62bb78c37abc1c4561944b5b0d5584cd8b25626a WHIRLPOOL 202fd9fb36b048fc21b1e05034330735fa9f97fef1f8d616ac0f9e07efce66e722eb5123764182bc9f50350930789bb436080f8d7a20463b010b1942f129d468
+MISC ChangeLog-2015 2814 SHA256 94cd5c4c8f69e77ff1b09a40c8556336f787223de5c196d149deea2385528aec SHA512 479a33040ce77bf3c824aaba2e64ac4ce33f8267b0a6379be3f3f350c4d3da3af2fed576c5201e8e51987331c1216aef0e6c62f840289faf457e44a6fcdd0b53 WHIRLPOOL 3031274d9088bb42de04976b5f4cd1854ef4d96cb3fe7865c3764b95b7f160ab653dff09d43df95459b2f9f05481259be8f14318018c09d4d4af101d64fec354
+MISC metadata.xml 318 SHA256 24144d74c806ff98639528e397c076adb26c80c7c666e36000280451dc890656 SHA512 1c0f3d96a5bfe335f0ab1c8f637ed5a06938eb53c8c9684beec4b264edea3a3f6360ebe1c34c7f0d11349480b0e20db9f18adb7990a28608dda30a9eb221fa7c WHIRLPOOL d24da12b3427e995a5618acf40a6985f8a8eff05b16aaa34890d1da446c1de1f82fa85b9d24cdffe54a46fbdd1c238529bc09e325ab7b789802ea1206f04cbc5
diff --git a/dev-python/pyid3lib/files/pyid3lib-0.5.1-gcc-4.4.patch b/dev-python/pyid3lib/files/pyid3lib-0.5.1-gcc-4.4.patch
new file mode 100644
index 000000000000..04df9e0a6c98
--- /dev/null
+++ b/dev-python/pyid3lib/files/pyid3lib-0.5.1-gcc-4.4.patch
@@ -0,0 +1,20 @@
+--- pyid3lib.cc
++++ pyid3lib.cc
+@@ -920,7 +920,7 @@ enum frame_type
+ 
+ typedef struct
+ {
+-    char* name;
++    const char* name;
+     ID3_FrameID fid;
+     frame_type type;
+ } magic_attribute;
+@@ -1030,7 +1030,7 @@ static PyObject* id3_getattr( ID3Object* self, char* attrname )
+     {
+         ID3_Frame* frame;
+ 	const char* str;
+-	char* slash;
++	const char* slash;
+         ID3_Field* fld;
+ 	int i;
+ 
diff --git a/dev-python/pyid3lib/files/pyid3lib-0.5.1-py25.patch b/dev-python/pyid3lib/files/pyid3lib-0.5.1-py25.patch
new file mode 100644
index 000000000000..c24cfc97d5ac
--- /dev/null
+++ b/dev-python/pyid3lib/files/pyid3lib-0.5.1-py25.patch
@@ -0,0 +1,57 @@
+--- pyid3lib-0.5.1/pyid3lib.cc.orig	2007-08-08 23:53:08.000000000 +0300
++++ pyid3lib-0.5.1/pyid3lib.cc	2007-08-08 23:53:12.000000000 +0300
+@@ -10,13 +10,19 @@
+ #include <id3/id3lib_frame.h>
+ #include <id3/tag.h>
+ 
++#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
++typedef int Py_ssize_t;
++#define PY_SSIZE_T_MAX INT_MAX
++#define PY_SSIZE_T_MIN INT_MIN
++#endif
++
+ typedef struct
+ {
+     PyObject_HEAD
+ 
+     ID3_Tag* tag;
+     ID3_Frame** frames;
+-    int size, alloc;
++    Py_ssize_t size, alloc;
+ } ID3Object;
+ 
+ typedef struct
+@@ -80,13 +86,24 @@
+ 
+ 
+ static PySequenceMethods tag_as_sequence = {
++#if PY_VERSION_HEX >= 0x02050000
++    (lenfunc)id3_length,
++#else
+     (inquiry)id3_length,
++#endif
+     NULL,
+     NULL,
++#if PY_VERSION_HEX >= 0x02050000
++    (ssizeargfunc)id3_item,
++    (ssizessizeargfunc)id3_slice,
++    (ssizeobjargproc)id3_ass_item,
++    (ssizessizeobjargproc)id3_ass_slice,
++#else
+     (intargfunc)id3_item,
+     (intintargfunc)id3_slice,
+     (intobjargproc)id3_ass_item,
+     (intintobjargproc)id3_ass_slice,
++#endif
+     (objobjproc)id3_contains,
+     NULL,
+     NULL,
+@@ -824,7 +841,7 @@
+ static ID3_Frame* frame_from_dict( ID3_FrameID fid, PyObject* dict )
+ {
+     char* data;
+-    int size;
++    Py_ssize_t size;
+     
+     ID3_Field* field;
+     ID3_FieldID flid;
diff --git a/dev-python/pyid3lib/metadata.xml b/dev-python/pyid3lib/metadata.xml
new file mode 100644
index 000000000000..23324cab5125
--- /dev/null
+++ b/dev-python/pyid3lib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pyid3lib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyid3lib/pyid3lib-0.5.1-r2.ebuild b/dev-python/pyid3lib/pyid3lib-0.5.1-r2.ebuild
new file mode 100644
index 000000000000..2615b2fb6271
--- /dev/null
+++ b/dev-python/pyid3lib/pyid3lib-0.5.1-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Module for manipulating ID3 tags in Python"
+HOMEPAGE="http://pyid3lib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="media-libs/id3lib"
+RDEPEND="${DEPEND}"
+
+HTML_DOCS=( doc.html )
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${P}-gcc-4.4.patch"
+		"${FILESDIR}/${P}-py25.patch"
+	)
+
+	distutils-r1_src_prepare
+
+	append-flags -fno-strict-aliasing
+}
diff --git a/dev-python/pyifp/Manifest b/dev-python/pyifp/Manifest
new file mode 100644
index 000000000000..9ba22a3ae773
--- /dev/null
+++ b/dev-python/pyifp/Manifest
@@ -0,0 +1,6 @@
+AUX pyifp-0.2.2-setup-fix.patch 513 SHA256 2ccbafb38a6965340f378d73316a3ef5400e668d6adec42fb43122aa1f1fb5e1 SHA512 c3c30b89c33e1eebc7bbb8302dcbaeaff0305920695fd526fc6c3838313de4f290564c3d5d4dbb59eb2eb6a2736e9bad718da5009703a4f08db7d4f0f42c6810 WHIRLPOOL 71662526dd9b2347c8774897aefc26be2c16a50315e0baf89bdbfa5f8523d7bcd91f2a1b30066aceff536be1d76666040b3c24442a694ea337f263b08d571ecc
+DIST pyifp-0.2.2.tar.gz 21378 SHA256 df283d037ee206ede1de7e058022a7cd13d55c4d935323c3ae3af923b39f8ff3 SHA512 9d4b2fc41406c784e8fe9bb650760d750fdf9390b2c69baee1032cc33ffc726ec1a688faa043196a0d075f4e10530dac6637e76b4440b92142f69683cd65a281 WHIRLPOOL 666157875f7c2bd4f0b0c479c1ee25ab2aeafd8900f4b25ee31cdfe4153275307e182d6ed068f2cd8c90a7ccc90c5706d0226f8b8be2056f56058f441bf4d2d5
+EBUILD pyifp-0.2.2-r1.ebuild 601 SHA256 dc37ccd08f6cf0cba7de336aed1a7cb1c70697a1201b56e6751e25900c9c2795 SHA512 a22a88c881d81246a03d7ccd7a719cd828dfd8463fc7fa0cd10a3d80f704cfedccf7eac022111625046f7e6cf300ce0b4155ace7acdae693bb287c6910b86481 WHIRLPOOL ff70f380752448145c831dde8eb419e4e0ec62c5b9a8a1973667c6589fc121def118b73d35a32795739d7da1746ebae4b675c81f1c2d9fa1f6f951275ae58263
+MISC ChangeLog 2465 SHA256 7dcb02a9a7a95bb09468f52a516bf096b85e3a8d78ebf4aa8e6d6852006fdca5 SHA512 25ef1e7456f4da24a71cd9a7b70de6b41821f5afa81f70a43098f05f546cf782228b354f9141f095111e00367b45bc2ac5fdf7b649082f206b8f4cba73dfc6a4 WHIRLPOOL 97c943d3bc67fb8624fe6f31763f08cc29b39f2b7974955f142e1e98ddd91fbd1931d89b519792532e6d2d282d4904adfd950de5cb1aebef262d242e8317a9b5
+MISC ChangeLog-2015 1378 SHA256 fc493ee712291fb177a84d49702e41f3f043671bc0e6291e53834f5bf8c81009 SHA512 f462135df17ed11688f9e908a71da27ae8610cab77f9270665669e2711487817827dc0d612aa0424e02b99e9274094c5ca26b98dc43262d0338744bdcc483aa7 WHIRLPOOL d9430b8b86b46182def4d2e35147fedd56dccbfe17ae164f90f2d71eae672adc34b29407226762304873a296b2f20edd4f7e6daf6a3603a681d2bb79b254dfac
+MISC metadata.xml 433 SHA256 f2e90bac915c724a3a21494f2845f1f137d8e684c7e567b4095114e5f0b185b2 SHA512 d747fe4f9127678f0245f2a35d3c8244086a05439c40eaa0e8f6444c6605bbb7c1ee241cd9b22feb06454a972244465e615b5f14e0d158d67c17a0c8ddb3d61c WHIRLPOOL 6cf5f4171ea0616f5799982fdcf2941f268e7bbdff23198e29ece500925af3b31beb24612c63e4d073df95884af51d170d8e18add7418d5a2d953ba32a06eea8
diff --git a/dev-python/pyifp/files/pyifp-0.2.2-setup-fix.patch b/dev-python/pyifp/files/pyifp-0.2.2-setup-fix.patch
new file mode 100644
index 000000000000..2582e0fd8841
--- /dev/null
+++ b/dev-python/pyifp/files/pyifp-0.2.2-setup-fix.patch
@@ -0,0 +1,11 @@
+--- pyifp-0.2.2/setup.py	2005-02-21 01:36:05.000000000 -0500
++++ pyifp-0.2.2-fixed/setup.py	2005-10-15 13:29:26.000000000 -0400
+@@ -54,7 +54,7 @@
+         self.swig_inc = 'SWIG'
+         self.swig_shadow = None        
+     
+-    def swig_sources(self, sources):
++    def swig_sources(self, sources, extension=None):
+         """Override the definition of 'swig_sources' in build_ext.  This
+         is essentially the same function but with better swig support.
+         I will now quote the original docstring:
diff --git a/dev-python/pyifp/metadata.xml b/dev-python/pyifp/metadata.xml
new file mode 100644
index 000000000000..e3560c535fc1
--- /dev/null
+++ b/dev-python/pyifp/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ifp-gnome</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyifp/pyifp-0.2.2-r1.ebuild b/dev-python/pyifp/pyifp-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..e5adcfa496b5
--- /dev/null
+++ b/dev-python/pyifp/pyifp-0.2.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for libifp library for accessing iRiver iFP devices"
+HOMEPAGE="http://ifp-gnome.sourceforge.net"
+SRC_URI="mirror://sourceforge/ifp-gnome/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libifp-1.0.0.2"
+DEPEND="${RDEPEND}
+	dev-lang/swig"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+PATCHES=( "${FILESDIR}"/${P}-setup-fix.patch )
diff --git a/dev-python/pyinotify/Manifest b/dev-python/pyinotify/Manifest
new file mode 100644
index 000000000000..1e3d039d5ab9
--- /dev/null
+++ b/dev-python/pyinotify/Manifest
@@ -0,0 +1,7 @@
+DIST pyinotify-0.9.4.tar.gz 59604 SHA256 a09767e4e0610e2e1e9f9dc89483b0ee4a53764e700f5866a570bec51d003fec SHA512 cdaf9f239a43e3889cdca0ebe1e3559bf6411e4cd829120cc2199cb91122bfe4af62f61a9bf297de28036716f974abd4d7bbeb210e22e96245781fbad08a2b75 WHIRLPOOL aba8f4e4fba5e684e0bade9c3a02a24747f3af4a441209f138223398860da8fdbc6b52546f6cd55134e72c69e6e15b06e45c50767b13ffab6f12afa4484cbfb6
+DIST pyinotify-0.9.6.tar.gz 60998 SHA256 9c998a5d7606ca835065cdabc013ae6c66eb9ea76a00a1e3bc6e0cfe2b4f71f4 SHA512 b52de43293b06b32236e90b7c33fac061f3095cd7d4aecec89a099d56020db1a85440ab9dcc8b521238c001fc49a1f37d1b16d621bc1acab4d7273aebcaadbc5 WHIRLPOOL 19e5c96528e3092d9a0e08e4853afc1765afcb0b286875e9583c703dda066c8372def076416158a740b248ade21b14314464232bdc70f210f306f3d3ca5c4a7f
+EBUILD pyinotify-0.9.4-r1.ebuild 688 SHA256 f942cbcda514c3a9f7c71673bdc9d803a73b7fcd4940a41c92ac80c2fad9bbdf SHA512 000640c3eec6e793aaf07be397dff70db879dd3940abaf3bca24cd3fc8f47d0b7f26e597984a76be775bda8372855bcdf2e23ce524bb40290b86960f393a55cb WHIRLPOOL af92d7669d9ea5301b0c3357514cb639c853681e1b128b05ecaefd7b5261f0ebeae73491a433392a32c79464734258d8ddceb8982dbfdabaea3ef119751388c0
+EBUILD pyinotify-0.9.6.ebuild 742 SHA256 7ab51bdf934b19fde744a10eaf5a1f37418b95c53c92574ad8d6c69a9c8a41d5 SHA512 6fcd7a0e1420f6e71549af29145713640caeba7832d0be5a5f089f6bc077d980468a348964bbbdc6530ded4ea8ffd6e203815fae1877fa06f8e2bdd7084b09df WHIRLPOOL 1bb475d55047f3d7842bf1482099c0c1ca5f72c6b4057879d13aa2edf6f75e2081797ee825f5451b41a8ee2430784053d11d87acbc876ea0e1b1c21b3175d10a
+MISC ChangeLog 3528 SHA256 e964efb0ab624f64f26987da93c9cbda885083d6f9a7540dbf5ae7852dee83d0 SHA512 3b99109008e4f6c8b640fe38a139be82c4568ea9ca16bc1a91da9ed909cdaf4875cab36f66543fd26fe69a51fddd48a4eb9a873b4c3cafe97e7141b17e7fcba8 WHIRLPOOL e4d557ddbca0aa516826a213b3074246c09466b7af3b81823a53e1b1fe725ef4a1998dfce6584d356dcff4d1f0faf378c4f4a0bb6db2bc3f2314879e10a4bf71
+MISC ChangeLog-2015 7853 SHA256 da35f50a90c28f626ffb47368a63b9246f66d434ff5bd863038e31e33193b2f5 SHA512 85e96794dd3bb632b90d6047f9d684582245a7782aa1254749c6f1373689ea95313bc8663fdfe03aacf6a8cc87075783cd466e9f43856ba85a7f658ef238cae7 WHIRLPOOL c4c7c45550f2ae3d0b0864368a06808bd4d46c9440fdcd46c7006dc88e8cbd8d0c71b41888bc018a66d898813d8def297f75b5ca8b036ecfe508f5c47e44f71e
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/pyinotify/metadata.xml b/dev-python/pyinotify/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/pyinotify/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild b/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..5f4dc4f0c83f
--- /dev/null
+++ b/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python module used for monitoring filesystems events"
+HOMEPAGE="http://trac.dbzteam.org/pyinotify https://pypi.python.org/pypi/pyinotify"
+SRC_URI="http://seb.dbzteam.org/pub/pyinotify/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_install_all() {
+	use examples && local EXAMPLES=( python2/examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyinotify/pyinotify-0.9.6.ebuild b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
new file mode 100644
index 000000000000..6579604fd3aa
--- /dev/null
+++ b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -0,0 +1,27 @@
+# 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,5,6}} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python module used for monitoring filesystems events"
+HOMEPAGE="http://trac.dbzteam.org/pyinotify https://pypi.python.org/pypi/pyinotify"
+SRC_URI="http://seb.dbzteam.org/pub/pyinotify/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_install_all() {
+	use examples && local EXAMPLES=( python2/examples/. )
+	EXAMPLES+=( python3/examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyinsane/Manifest b/dev-python/pyinsane/Manifest
new file mode 100644
index 000000000000..405883dfb5ba
--- /dev/null
+++ b/dev-python/pyinsane/Manifest
@@ -0,0 +1,7 @@
+DIST pyinsane-2.0.10.tar.gz 327159 SHA256 6c1067ebc8a0f501c73208b3560013cbd5cb3af05dafd96e878776eaa314a3b3 SHA512 bb882ab51c1e6cea7cad75851ffe5918ee08467d4772d27c23a0c5ec9f2dea3ee7d83601ae35e56e2f717ff7683cec5a45aa47b2a4e167fe4dddb9db3229a3b1 WHIRLPOOL 41fadf8b7e38e0ea938e0ee3b933ece383902ca71f00289398f4cfc054c8ebc7b15f1cf49a7ca2b1397bdd2332b7828fd2da059308c65147c6110dec74e748e9
+DIST pyinsane-2.0.9.tar.gz 325576 SHA256 ffb90c9bbad17182c9f0cb354dd7a898aba5f821628462f9e7a92837f837fd85 SHA512 e882e237ce6c0e7a5055633b79814115e104d4ef0c417fdfff8f3bcac92527f432b3cab96c018445ae40455bb93fc5ef71d5e8cff1977878d1f09c0b121dfa2b WHIRLPOOL 9e0f2f86ba445f74d58d6645f689b5edaf743170aa521ff8c2086f3f18acf21f473d5c83582126540bfb033b93cdebe3eb4e56fb610b2eda12711fd6271d901c
+EBUILD pyinsane-2.0.10.ebuild 851 SHA256 7ca7e55156b4604bd9d757cde44f4db1206f747958ffca7509ad3cbb463ff05b SHA512 14f5240f6080be599afe2cc902f4ee133adeb21292978024f132af70cffe69a069fff6527db1f4fc4fe5204425906e708f51f131dec38de74ad8a3d36ac9e649 WHIRLPOOL 308958dd567915bb38c1a6ab4ff218bed6997cf66e74e75f0c88e8e8d186572c726519145cd2bb7f25e6ee195ba2343a4eec4308dc22163bc3600abf4f7dd302
+EBUILD pyinsane-2.0.9.ebuild 759 SHA256 d47e1583b583773e442cb59d5aaed29ed7e0aa211b3b4d608a903f306c3a1b10 SHA512 86117866d517e0e9efdb5f4420c49d8a6bd9c2c726c855ee418596ee5f7246a25cf78b14f617dc097c4f9400a47432dd233d60a6a124f6da719ea49a88b29cb1 WHIRLPOOL c6d9093157b1acb7226e8f0c35aeb239262f65ee070219ef67629b83f5ad5253d474b6b183f247bdde8e35a6acff324aba0db54ffbc4c24c35cd93943fe3d34a
+MISC ChangeLog 3389 SHA256 be88ddede8462b3b2189958d7ae522d6949362ba985089eecd686f944751cf64 SHA512 a62afff6ae6c243cbb642a3682ed1b6902d35a9638c3a1c468cbc38415ae1d17a054a5fd92e1cb8f2d1628082bca4f37dac2dd7bd67fa7db1581e419c251a64e WHIRLPOOL 43fdbfb4d4007f3372c624c7b262597d2148f372e69fc36a6aa0a1482a66c6c754823f3b4fa5e59f6fe62bdb75006e2a2eecab1f71996e6133ec4fe2eddb894d
+MISC ChangeLog-2015 582 SHA256 582ed0b7df6a31ecd20e6899312a5454656b15e2bfc7869be4cdafceca69f2ab SHA512 6c3265706dce19c6353b2c5ec275015c7fe20700f06da3a00d9c2facc89d3a5f3b535413d41e48a296b8656b60c9cb42efae15ee1cc3a22bd1b8cf356f19d258 WHIRLPOOL 4cc6732d089462294931f67586a59cae73e4a4259b84b0156adc514f5b8d3baa51ad0ae893fe8901816dc8b9d8286539a51679ca21a03b19fe3adacd2f4b0b18
+MISC metadata.xml 921 SHA256 dc506e95113d6caf5c4c66f17496433bc66c6c477a59b61a2861cfecbf270826 SHA512 5f7247aed15fb530cda752989621d2d806dc25f48dbf04ad34115f2d90b0c32f3209bfd7acf6478545e4f52cb3eb5bb97a1e8cff49abefc5ab9cddefdc49f1a9 WHIRLPOOL eb4027eb980e40688d45e00ba53a1a696b8fabe05e8b00450a7849ca295433cc59d81cc664446efb1e4a69f5bea87f10d25677cbf46daddca32f6aa1e8ef28f2
diff --git a/dev-python/pyinsane/metadata.xml b/dev-python/pyinsane/metadata.xml
new file mode 100644
index 000000000000..5682d1ca1823
--- /dev/null
+++ b/dev-python/pyinsane/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
+  <longdescription lang="en">
+Python implementation of the Sane API (using ctypes) and abstration layer.
+
+The code is divided in 3 layers:
+
+ * rawapi : Ctypes binding to the raw Sane API
+ * abstract : An Object-Oriented layer that simplifies the use of the Sane API and try to avoid possible misuse of the Sane API. When scanning, it also takes care of returning a Pillow image.
+ * abstract_th : The Sane API is not thread-safe and cannot be used in a multi-threaded environment easily. This layer solves this problem by using a fully dedicated thread.
+</longdescription>
+  <upstream>
+    <remote-id type="github">openpaperwork/pyinsane</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyinsane/pyinsane-2.0.10.ebuild b/dev-python/pyinsane/pyinsane-2.0.10.ebuild
new file mode 100644
index 000000000000..5eb8db203937
--- /dev/null
+++ b/dev-python/pyinsane/pyinsane-2.0.10.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Sane API and abstration layer"
+HOMEPAGE="https://github.com/openpaperwork/pyinsane"
+SRC_URI="https://github.com/openpaperwork/pyinsane/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="media-gfx/sane-backends
+	dev-python/pillow[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+RESTRICT="test" # Tests require at least one scanner with a flatbed and an ADF
+
+python_prepare_all() {
+	sed -e "/'nose>=1.0'/d" \
+		-e "s/find_packages()/find_packages(exclude=['examples','tests'])/" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyinsane/pyinsane-2.0.9.ebuild b/dev-python/pyinsane/pyinsane-2.0.9.ebuild
new file mode 100644
index 000000000000..02c2710c8c1a
--- /dev/null
+++ b/dev-python/pyinsane/pyinsane-2.0.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Sane API and abstration layer"
+HOMEPAGE="https://github.com/jflesch/pyinsane"
+SRC_URI="https://github.com/jflesch/pyinsane/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="media-gfx/sane-backends
+	dev-python/pillow[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+RESTRICT="test" # Tests require at least one scanner with a flatbed and an ADF
+
+python_prepare_all() {
+	sed -e "/'nose>=1.0'/d" -i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyjade/Manifest b/dev-python/pyjade/Manifest
new file mode 100644
index 000000000000..989a280a1136
--- /dev/null
+++ b/dev-python/pyjade/Manifest
@@ -0,0 +1,4 @@
+DIST pyjade-4.0.0.tar.gz 29251 SHA256 8d95b741de09c4942259fc3d1ad7b4f48166e69cef6f11c172e4b2c458b1ccd7 SHA512 0a384b843d2eb5884f2690ed5bb9b9b253474568ff1e9faca356a5c50749bb53fb759a099c7719bef495dc7af0073f143afad1c0d6d68f0f61d63624506f12b6 WHIRLPOOL d1527b7d792551f6fc015c6c1fd7b6d9d37e252e7e45d2c2915e53f70456ac41caaa97482fa7a0af290df5cfe071e97488e622f0ed41bdd3c4339e681d3e7baa
+EBUILD pyjade-4.0.0.ebuild 782 SHA256 1c741aa5c8d37fb33b4c166fe16cbcd5832a8673ede9a407d3760c2d26dd7f62 SHA512 e6b592b5dad240ad024ef23df1cd6c45265f1dbbcdb2310f1f7247ae3df9cd952ff3a13db914cf30953e0337285860af9bab89a19b09b163bcb04e9082322068 WHIRLPOOL 876d776239763c4f639490e236ad0ad6f2f452cb6b2afa26ffc279c57d73ba3dd19a2ca973b812c7237be2c75ed89802be69c3f5d21a9386cee1e605c41314a2
+MISC ChangeLog 323 SHA256 234500ab2ffd27ed7a17f75c15d0f878f5847ec05d3f012ebc4f21730ef2cb4b SHA512 b3a9a036699f10f389156c8592a82be684f5ebad439db28cd1a12bb199993e5de3cf5dddecf62a638629266648fdc22beaba5a34846e08a19cf811bccf2476e8 WHIRLPOOL dcf743955dc4b92eabe915b65355618934db3e81a9d1794dece9e8c1acb97bb6e4a411f2f2469c7aee66fae18ede3a267becd722737d82fad75ea801794ea3f8
+MISC metadata.xml 811 SHA256 ec7f1395ccff62715b538c17bf38e048f6843b3a8b92721f0a97cc7778094624 SHA512 d04e9d29ab552c03303911d1f7519c998f2a1104e912e296a0ec001ae1f2dfdec8eec790fc98e26653f1e8f1aaf6ac4d190ac8b88843f06b7885595900b11e44 WHIRLPOOL 44009d9059dd3bd7ae5901734bfd393683acc06ce1c958806fadf4fad59b42086fe3519bef80eb3b4026762de8bc997114f14ed109b178b58a0d423a6906e994
diff --git a/dev-python/pyjade/metadata.xml b/dev-python/pyjade/metadata.xml
new file mode 100644
index 000000000000..07e38c2bd8c2
--- /dev/null
+++ b/dev-python/pyjade/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>me@syrusakbary.com</email>
+			<name>Syrus Akbary</name>
+		</maintainer>
+		<remote-id type="pypi">pyjade</remote-id>
+		<remote-id type="github">syrusakbary/pyjade</remote-id>
+	</upstream>
+	<longdescription>PyJade is a high performance port of Jade-lang for python,
+that converts any .jade source to the each Template-language (Django,
+Jinja2, Mako or Tornado).
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pyjade/pyjade-4.0.0.ebuild b/dev-python/pyjade/pyjade-4.0.0.ebuild
new file mode 100644
index 000000000000..901797e02ac4
--- /dev/null
+++ b/dev-python/pyjade/pyjade-4.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Jade syntax adapter for Django, Jinja2 and Mako templates"
+HOMEPAGE="https://github.com/syrusakbary/pyjade"
+SRC_URI="https://pypi.python.org/packages/4a/04/396ec24e806fd3af7ea5d0f3cb6c7bbd4d00f7064712e4dd48f24c02ca95/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		www-servers/tornado[${PYTHON_USEDEP}]
+		dev-python/pyramid[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+	)
+"
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
new file mode 100644
index 000000000000..7d791e56b523
--- /dev/null
+++ b/dev-python/pyjwt/Manifest
@@ -0,0 +1,11 @@
+DIST PyJWT-1.4.0.tar.gz 34613 SHA256 e1b2386cfad541445b1d43e480b02ca37ec57259fd1a23e79415b57ba5d8a694 SHA512 1664864c0566dbeb1e35c977d30e746c844605e1ce90becda8771c4ff8a8dbad911075f5a41f445d405552b2d61bbb1e86011564027f68c6c4fcd332cf704ff1 WHIRLPOOL 4ebd7291b9a9676559703794acdaf0dd2bd1033dd649ef8068bca85fa7ef6ab444e834910fa78b16c15cf324dd4a470d9b40ecdccdb5fdaca7568ab096dc9a8e
+DIST PyJWT-1.5.0.tar.gz 34841 SHA256 fd182b728d13f04c289d9b2623d09256d356c9b4a6778018001454a954d7c54b SHA512 6a811933fc167a5b79a8e0c3cd95154f80e115d50795b4b4593abd95922ff330649b9f6cd8698191c3fb35b27b1b6870702c835eec28306b5349ef8d8d836d04 WHIRLPOOL 1d8a89929ee1e2642fe25054bc15aeaad13eecd283960477f793ad4185b7789c1163f80e6c36597a6593f50cdf9917473c099a706a56423f2d25dee45ab2806a
+DIST PyJWT-1.5.2.tar.gz 72715 SHA256 1179f0bff86463b5308ee5f7aff1c350e1f38139d62a723e16fb2c557d1c795f SHA512 8b9b4e5c96e09a1ec4b2e01aa4b81da217d239dc85eafa6634e6371c9ab19c7a95eabbbb98fd92e02ca7921e6fce771596724dcb44f13be93c9e20f09bbf2192 WHIRLPOOL 5797a2c70ceaa1a7092dec33fc74094453891ca40898da66aac3c28f712ee6560596b6b4b6e80bec699c185c67e566d50239c49a28473c924e74bc85d8a3eca1
+DIST PyJWT-1.5.3.tar.gz 73044 SHA256 500be75b17a63f70072416843dc80c8821109030be824f4d14758f114978bae7 SHA512 b25a9f6a04bd072020fcf00bb559b7560902adb79746fb880432c01fa356748238432f53f6b9a21db50ece3e59ed4c45ca3f48ecec0ca3c4095e6a739a5c150c WHIRLPOOL 67ba8da22ffdc62d8f944a20debc8462a0241bbaede565d10b0886b886af41fd56120fd2b0877f7c81edbb08717cc677559a131a54df3d2cf4bce749ed785e30
+EBUILD pyjwt-1.4.0.ebuild 1214 SHA256 6918be19ed8eb9de626abe432b98f971ab83783baf432bbe87deb5b9be4b78b4 SHA512 31d807038753366624c1f08ab740d158097033a902629829b754b516605467f59c948a7030ad1b32caf2a6c0ec1ad986ef1931a1bd4cd147d2fef10d0a0362dc WHIRLPOOL 2e72d9de5df3ac323fe0a812a141afce96a61ac7af079aea26f5373d3a0b56b19d28fb0cdeeb5166cdb0cfc7aa96960b35c5352a4cfa480de6dbe910745b89a7
+EBUILD pyjwt-1.5.0.ebuild 1262 SHA256 e8d8f43f15f3a76139aeed25fdbc0ac0368d6d70a0c9b8fd71baf46512cfe51d SHA512 3804c294bbf8aa9afc5f179155f7943d8ac7e945ad534c739fed6d4fcb74acb1f6f19b6e8d55edd72d61ffd1680c95e3a7ed0586ebf77705d1a19505566d4dd3 WHIRLPOOL f47b8f3b950311d58b93a61ce3f3144131681ac152fb4fed58cb2a590870bd6f42adf4e4d69303e019d87d9b718bafbd38677bca6ce96b7fba2b40f074e79346
+EBUILD pyjwt-1.5.2.ebuild 1261 SHA256 bc7a8e414518dc278b11eb1268f782e646667979fee34b99685331f3679f7cbe SHA512 f3585b3cfae50eb783ea72319ba642f3b8277da388b5ef0655ca973402fe4e61685b5ad592a81a595f2648147b2ff0fb6c1c7645ad6561201e3854b11ce50c57 WHIRLPOOL 95c2ce67ca394b74ee73e9c9736c0515955a70bf42e23f63857f4335baddfbd4b59c7e061f19479580742093fe007db1dbc2803f8287ead8963c4f8070d47f53
+EBUILD pyjwt-1.5.3.ebuild 1269 SHA256 34fd39f6de504cc94eaa8277ae0ca8c78c0b5ca383243932eeaf7aa542a8cf44 SHA512 03638dc3c396e6d453d35253cc656e72dbb5707da3a83cf5f3653c4b40e023163c05725f4d3d74e69f0b0d7b5a167ad0ddaf48f32eb1dbfe4bb4094f15275d94 WHIRLPOOL 194ebafee57e9fb8598fdb2e747d6b4b85a1fa53d47dd1ecb09e359a41920e31dd4090b9e93b48cabddede2ff10588b1e71ed3a2153b428e24876060d55697f1
+MISC ChangeLog 3108 SHA256 ac918d666314107da8911a5c96b12649bd36d95fc8fc8d3abdfc6e4101139bf5 SHA512 f05dfabad326ca45144d15ddfa18b09e202d1d1e0d05b3d3c5189344f8a01e7bd4e5b8316d2ae886fcf759d0e45076fc6c87394038c4ee116b1e59fa903b72b3 WHIRLPOOL 575382a622da51e19c8653a727ed5e8610411a8230a2e503832e34eac765fa4716a8d9920c21aadbdd149ad6fab53e0d594e672daec3732e21de4966c6efd4df
+MISC ChangeLog-2015 1907 SHA256 c86284bafed72cc6e01a2437dfbacf97b931a6441022bf3c6782c17ae30768e8 SHA512 1082f423465d4db439b9c17b9f1016231f59480a76265b71c37338ccf32ce777bf1ae538ae71d7b84cc925927b0ea6bbf67c4bbf247fd04b76692d9c862aba23 WHIRLPOOL a55adfde705d02ecb05e906ff16bb3a96eaf602797bc880a48aec02d9ea83d3f6dd06469c41b85b61cd342f031403844c40e796967be391cb4e582152cec9d37
+MISC metadata.xml 374 SHA256 a824250af50d37dc792bc1182df30c585a26db97ce0afd128a8be5e3cdd8e719 SHA512 87a019a49c2e355d19148214f8ac7212758f7a36f77e7b959d32df1146c145b764f93707fd7b45a8c5276209a66380c888670181bf78bc4d241d5a7294a032b4 WHIRLPOOL f052be157363eef334a5191face06769006c583abaea9c2816c02bb1b9d20ccea6775c7e8e2c636970322986369d30fa376a6c6133ca1fc3f5d95ea8c58936d0
diff --git a/dev-python/pyjwt/metadata.xml b/dev-python/pyjwt/metadata.xml
new file mode 100644
index 000000000000..d0f901f262dd
--- /dev/null
+++ b/dev-python/pyjwt/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">PyJWT</remote-id>
+    <remote-id type="github">progrium/pyjwt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyjwt/pyjwt-1.4.0.ebuild b/dev-python/pyjwt/pyjwt-1.4.0.ebuild
new file mode 100644
index 000000000000..eb78e8c99f9e
--- /dev/null
+++ b/dev-python/pyjwt/pyjwt-1.4.0.ebuild
@@ -0,0 +1,49 @@
+# 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,5}} pypy )
+
+inherit distutils-r1 eutils
+
+MY_PN="PyJWT"
+
+DESCRIPTION="JSON Web Token implementation in Python"
+HOMEPAGE="https://github.com/progrium/pyjwt https://pypi.python.org/pypi/PyJWT/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE=" MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pytest-runner[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+python_prepare_all() {
+	find . -name '__pycache__' -prune -exec rm -rf {} \; || die "Cleaning __pycache__ failed"
+	find . -name '*.pyc' -exec rm -f {} \; || die "Cleaing *.pyc failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	elog "Available optional features:"
+	optfeature "cryptography" dev-python/cryptography
+	optfeature "flake8" dev-python/flake8
+
+	ewarn "flake8 feature requires 'flake8-import-order' and 'pep8-naming', which are not in portage yet"
+}
diff --git a/dev-python/pyjwt/pyjwt-1.5.0.ebuild b/dev-python/pyjwt/pyjwt-1.5.0.ebuild
new file mode 100644
index 000000000000..b10a65d7c1fb
--- /dev/null
+++ b/dev-python/pyjwt/pyjwt-1.5.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+
+inherit distutils-r1 eutils
+
+MY_PN="PyJWT"
+
+DESCRIPTION="JSON Web Token implementation in Python"
+HOMEPAGE="https://github.com/progrium/pyjwt https://pypi.python.org/pypi/PyJWT/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pytest-runner[${PYTHON_USEDEP}]
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+python_prepare_all() {
+	find . -name '__pycache__' -prune -exec rm -rf {} \; || die "Cleaning __pycache__ failed"
+	find . -name '*.pyc' -exec rm -f {} \; || die "Cleaing *.pyc failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	elog "Available optional features:"
+	optfeature "cryptography" dev-python/cryptography
+	optfeature "flake8" dev-python/flake8
+
+	ewarn "flake8 feature requires 'flake8-import-order' and 'pep8-naming', which are not in portage yet"
+}
diff --git a/dev-python/pyjwt/pyjwt-1.5.2.ebuild b/dev-python/pyjwt/pyjwt-1.5.2.ebuild
new file mode 100644
index 000000000000..1cc2123feb83
--- /dev/null
+++ b/dev-python/pyjwt/pyjwt-1.5.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+
+inherit distutils-r1 eutils
+
+MY_PN="PyJWT"
+
+DESCRIPTION="JSON Web Token implementation in Python"
+HOMEPAGE="https://github.com/progrium/pyjwt https://pypi.python.org/pypi/PyJWT/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE=" MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+python_prepare_all() {
+	find . -name '__pycache__' -prune -exec rm -rf {} \; || die "Cleaning __pycache__ failed"
+	find . -name '*.pyc' -exec rm -f {} \; || die "Cleaing *.pyc failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	elog "Available optional features:"
+	optfeature "cryptography" dev-python/cryptography
+	optfeature "flake8" dev-python/flake8
+
+	ewarn "flake8 feature requires 'flake8-import-order' and 'pep8-naming', which are not in portage yet"
+}
diff --git a/dev-python/pyjwt/pyjwt-1.5.3.ebuild b/dev-python/pyjwt/pyjwt-1.5.3.ebuild
new file mode 100644
index 000000000000..422c20d2efa0
--- /dev/null
+++ b/dev-python/pyjwt/pyjwt-1.5.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+
+inherit distutils-r1 eutils
+
+MY_PN="PyJWT"
+
+DESCRIPTION="JSON Web Token implementation in Python"
+HOMEPAGE="https://github.com/progrium/pyjwt https://pypi.python.org/pypi/PyJWT/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE=" MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/cryptography-1.4.0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+python_prepare_all() {
+	find . -name '__pycache__' -prune -exec rm -rf {} \; || die "Cleaning __pycache__ failed"
+	find . -name '*.pyc' -exec rm -f {} \; || die "Cleaing *.pyc failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	elog "Available optional features:"
+	optfeature "cryptography" dev-python/cryptography
+	optfeature "flake8" dev-python/flake8
+
+	ewarn "flake8 feature requires 'flake8-import-order' and 'pep8-naming', which are not in portage yet"
+}
diff --git a/dev-python/pykerberos/Manifest b/dev-python/pykerberos/Manifest
new file mode 100644
index 000000000000..8476db066986
--- /dev/null
+++ b/dev-python/pykerberos/Manifest
@@ -0,0 +1,7 @@
+DIST pykerberos-1.1.7.tar.gz 35439 SHA256 fc9530c6d1e1cf5c2d6a45e08e4806b50621cab28f981cf428dec67bfb52effd SHA512 ad5882b7e962509af97cc67b118e50fa94fab6848e8121e2b7d40029d27987c8812eed9feb1687ddbb03dc95ef0724f585fc6c7f273c7cb85621e06ecb7ec7bd WHIRLPOOL 0d5b4f693a368b0f0114abfc54f159367074f6f8a54b264858447bf84bb430d5f9d02fe0fd451797ea8e0a4fe744ad129a097cafa864315ed1da1f1feebe8775
+DIST pykerberos-1.1.9.tar.gz 35788 SHA256 a94e9f9826be8870c14f05f4042707bb699b60f6d03edc6635fdafaf9d915575 SHA512 1bf912628b7f069f15a67fa99489eab010dac8af6d42357ee2740a82808a5a3bf9fd29ae8d91571e4fe3069cf70530c98093857df63264b26881542598613323 WHIRLPOOL b3c0f5c109cada76e12f80c532e77ce166d33f15dd2b3b3a6f714d2ffa176f767f6d33d9cfc5a6b7dd5d07af8d490ce65ac8b15c774029f41d6b1e74c1f7f46b
+EBUILD pykerberos-1.1.7.ebuild 553 SHA256 ea337ff1c0d9479f7a05f4ee4b2badf0fb57145ef4d7794da0d5f6273aacd262 SHA512 486753621c5e9f0ba9257d2b6a79b6161d1ac2004f3ceb7922edbdc93432c58c2b335811fcc44ccb920c6e8227aeecd8255ac45a3bba11d75fbe9a276326b436 WHIRLPOOL 2d6a41f5a72a5722ffce1f6456f3a79e3c4f0263b04f7cff857345d6264a9a03a8fbc3fa343519e53a693b8552518c77cda2c22e9953b718263ff73ea1f36532
+EBUILD pykerberos-1.1.9.ebuild 541 SHA256 fd306103d4604f0942a414178160525720f11143a14b2a3f77cf8f14cd27dd5e SHA512 97b57d78357a2b0392d4f4efd79c9f7c4716ffc82dc95d3bfe4feaf51824591cc890b408ecdbbeedcca5c17440573141d0ed680cdac8ffddbaef588f9a861b93 WHIRLPOOL 296356e5a62b3637f9496e16ab8536c68a3e620b52d595518d01556d88a623729e66f5f9787d6d9f344b98fc9f7a353237b35ec8b582fd2ad3283b3a4cb5738b
+MISC ChangeLog 3846 SHA256 69e1596b01a340ef3cfd0eb53271103036bee034107a64ac5ba4a1813d0db398 SHA512 126883593202555d76bae1a459c98d5ab9e8204ebead07a01cea04d3722132fca0bf5a71acd0af847a8409e315ce90306822e571562c8ad426ed56424b0e9ae3 WHIRLPOOL ce4acc814239456d972834caa4c3575bad2d8079655b8219490561758d64abe113a83c56e8df09158ed0dea3aeb72eae54579f37807c373f1876a05cdb42feb2
+MISC ChangeLog-2015 2958 SHA256 c37dd20760a67e11d0ea4ceb38328b4b7f44c3d58195a7f82e91486d1481940c SHA512 4eb91e5a6353f27696ba8a85d66324b3292ff06aa9d95ee93101ed35223a34bbab5fe8c2c63ffa2fc7fe8793308c64ac6b332ba070f3ca40443d0560e2db86d0 WHIRLPOOL 4de2447c1070275653b61878118b6fe80759031201691b5d6e8600ea43ad9a7d51e36fa72d68802d4a08304cc2c05fb18477423c5c1207b079a27ebbbeebe1af
+MISC metadata.xml 332 SHA256 787e946a071252e9970550e21add612ed31ae892b1fc9fb87d769ee13b965a89 SHA512 a3246676e0c2f0430c285ae4f58b5ca754376936860c9d04d9ef46ce111bafbfebcd25e8dc28f1abfeca92dcbc6a329f711272ad7dd501bc9a1c7b34876cbbca WHIRLPOOL 7533c99dc25132b18921b726e7b8af61fd3e5238e6bec493614ba3e7c162cdda202ea8e773d0735c12e37b542b74866960cfa59dc467fa8b6ec7678b59d50b7b
diff --git a/dev-python/pykerberos/metadata.xml b/dev-python/pykerberos/metadata.xml
new file mode 100644
index 000000000000..f77c840a4c11
--- /dev/null
+++ b/dev-python/pykerberos/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>maksbotan@gentoo.org</email>
+    <name>Maxim Koltsov</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pykerberos</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pykerberos/pykerberos-1.1.7.ebuild b/dev-python/pykerberos/pykerberos-1.1.7.ebuild
new file mode 100644
index 000000000000..0d6069a3a6de
--- /dev/null
+++ b/dev-python/pykerberos/pykerberos-1.1.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A high-level Python wrapper for Kerberos/GSSAPI operations"
+HOMEPAGE="http://trac.calendarserver.org/wiki/PyKerberos"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}-1.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	app-crypt/mit-krb5
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/pykerberos/pykerberos-1.1.9.ebuild b/dev-python/pykerberos/pykerberos-1.1.9.ebuild
new file mode 100644
index 000000000000..0b94196ee2b0
--- /dev/null
+++ b/dev-python/pykerberos/pykerberos-1.1.9.ebuild
@@ -0,0 +1,22 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="A high-level Python wrapper for Kerberos/GSSAPI operations"
+HOMEPAGE="http://trac.calendarserver.org/wiki/PyKerberos"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ppc64 x86"
+IUSE=""
+
+DEPEND="
+	app-crypt/mit-krb5
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/pykka/Manifest b/dev-python/pykka/Manifest
new file mode 100644
index 000000000000..914fd3d49c32
--- /dev/null
+++ b/dev-python/pykka/Manifest
@@ -0,0 +1,5 @@
+DIST Pykka-1.2.1.tar.gz 46252 SHA256 e847ffeadee49b563426ab803e8eee67264d773e38ca14763fdcda56411e3c11 SHA512 22eaa735915e33146d8a3fa3f9dd5ea1dd608e7ad45ab21721a108b01ddf058b4cd00da67b762a95ede650c9ba1a79ee3d6fd22a491bc7ff348a56b7c0139cfd WHIRLPOOL e6efd2c78714cba9ec296917ad42e5b495bed751e1339c407fe42796d99cb7bb39e33bfdce70fff8ed42f9706616676f7cf975750672989f833fe1f464e5cd34
+EBUILD pykka-1.2.1.ebuild 565 SHA256 35517df7f81f8d85c2d775a9027cbf01041738e70129cfd1bd0fa2032ba12bd1 SHA512 7997fde01076647c479aeb3dbd4d3607a4ffcc5f9d1a799c603ab2e41c5534977a0f20bab8d022768e5848c608507ef3aa8c544cc039469a816c981e87c78c3a WHIRLPOOL c8e737552ebb7c6d80f5d7d5501d385c102cc295682fc86f439764f0549522d024d87a5f38f3e407acaa8c53ea02496ec133883abd918bc3f530d7b8be9c469a
+MISC ChangeLog 2549 SHA256 6ec5c7654f3990423c4f946fbe3c0ae39ed932972fdb2da122c184ec072c4ee4 SHA512 42fcc52f1b568571e3d698b4e86c4d12ff08505e4ee915dde7ec253abb1a3a306ca92e5efbb925636291c8a5a021f70b6fbad01a554141fe12a439cf863bf049 WHIRLPOOL 8e7558d9035c4855633f8c39b1bbc1694f34ee833c3696f7ed12e35049603fdd480561892a4f6593539e99f6e270dcac19037925eb096cea612fcba6ea8055cc
+MISC ChangeLog-2015 599 SHA256 71ae1e473df5e6c923aed9d967ba83224fe73190aa6613717785f6d19a46bfa1 SHA512 d574d618a6adf2029d9765793aeb816ffcb599153392a81b4e0ea04904fa204f1ab43bb17d3ed307b071831cbece93b7cd8951a71200ed925340b600a41707ef WHIRLPOOL 290da8f2db5bc72360fce7b9f3972d701c1889824f55d612a62c18b10a5fc72f1e65377a7fd12998367ee5fb8c6c3522a17070172f5f38173035dbb45196f240
+MISC metadata.xml 359 SHA256 cca4f87c76aa54235195036d028120d9541c3eb64f680e2d864be8b1fd34f5fe SHA512 ee8b1752f919c781167279d93af37133f06610833603c9c837e84c4f24cf6fa4be66af29097eb738d827a38416d9dd373bc248c6669ef2e5d042162bce0d8f89 WHIRLPOOL ad3acc999fc7079953a95946d027707c152261cc06d2cb88cc520a4ad8e5cb2c00c5c01b9c9e378daf918f831fe66149c17253257988406909f39d6694af3501
diff --git a/dev-python/pykka/metadata.xml b/dev-python/pykka/metadata.xml
new file mode 100644
index 000000000000..3c91ab54b97a
--- /dev/null
+++ b/dev-python/pykka/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Pykka</remote-id>
+		<remote-id type="github">jodal/pykka</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pykka/pykka-1.2.1.ebuild b/dev-python/pykka/pykka-1.2.1.ebuild
new file mode 100644
index 000000000000..33d9c5e41019
--- /dev/null
+++ b/dev-python/pykka/pykka-1.2.1.ebuild
@@ -0,0 +1,25 @@
+# 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,5,6}})
+
+inherit distutils-r1
+
+DESCRIPTION="A Python implementation of the actor model"
+HOMEPAGE="http://pykka.org https://github.com/jodal/pykka"
+SRC_URI="mirror://pypi/P/Pykka/Pykka-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/Pykka-${PV}
+
+python_test() {
+	nosetests -v || die
+}
diff --git a/dev-python/pykwalify/Manifest b/dev-python/pykwalify/Manifest
new file mode 100644
index 000000000000..8040851d2ff2
--- /dev/null
+++ b/dev-python/pykwalify/Manifest
@@ -0,0 +1,6 @@
+AUX pykwalify-1.4.0-S.patch 862 SHA256 fcc8f039ed10d599613899afd8b3ffe936f1c09566fbd617b1a352968a5d67bd SHA512 f7d9189993cd73a0412ef01fcb01a99fcbc61edc6863a1997333de085294b9c5772d026f7ab8f16703568404f2ff76bb1aeed760d7908c7865e0891ad5752dc9 WHIRLPOOL 56f66fa12911d489f9df3bf71e6fabb99896ad9f146365bc26c4d6163f9a511864f209cb0021cb43576700dcd0fb625a1bc2785dcfdd1b8d9185792b44db0080
+DIST pykwalify-1.5.2.tar.gz 42965 SHA256 0d8d6178ceed3163092bd76170595f8673afb1a9b557920b0de74cd8ffccd712 SHA512 1ec425f4a755dfd6e94b7e6ed098b49919e4d0de46c984e73c6452370ecb8898dc00cc383b01b27153b0d5e12dd6f5d1df4f6324e1e4f9413ed7a4d1565c5d50 WHIRLPOOL 6927a4bf759a67578ca0f433fbb7bf9e9bf56fabb5056d7782fb74fde62978d885154c7462c5bd0d528fca0497ef7f322812c1ddf2aa7b61a1a251161f44b19f
+EBUILD pykwalify-1.5.2.ebuild 800 SHA256 645f855b705395c7a9da849e110d0531f29ea96e57b19a1314ab962902cb202a SHA512 c54939987507b268a4bf5ca846e322d129294448c96de280cd0bd319fd3e0e318e11b678a5f80b3849e273bff34768a47d427af82c960073f77360e60f5eccfa WHIRLPOOL f9b752384623d6b35441228b83fea0b5a326b35f48d614df664481011d15372d58c2062c5b896afed280d83d5f9bf2f5edfe7cfb52209e63f8aa84a02f78522c
+EBUILD pykwalify-9999.ebuild 788 SHA256 f2e4096b69a08ba370f51f85bb2c18075487659c10544ee956ed53831c422bd4 SHA512 2d70d61e9cafa742c34aea098ff2764013aa84fefd57c0c59b64c4340618482cb05d0fdd8e371affc23557ba72215423881a1f90d994ca80bc67bd0c706472ab WHIRLPOOL 6262acd03d5216915a677446b5297e4e734637a2ee3b5af58dfab36668f1cc340f6e7e841ccba55c27e4d1c02052a593a3d4ea59cb970706a8aa4ad2ffd740fa
+MISC ChangeLog 2523 SHA256 bfb5b5cc59433edafd67191a1d8877283037f31c9908a04871cb2341d1a50a91 SHA512 48bfbcc836981ccb0c2b4d8c191edcc21c4d5d22b35a9c6ff5ef946ab1e16cf5f1648c7cee67e4f34e3f0cccbaae48ca9f39b35b431566e3d6917833a44dd3af WHIRLPOOL 235c7b56ec32204b2a3c820ebe9dc8fbba1bfb708cd3622768867a89e586f71d7644c759afbc2bfe4131854fea4efcddef23937495f4f0424e5ca1c1ef5877b2
+MISC metadata.xml 371 SHA256 fde44e131812881733e80e9fc17582f81106320f42e295189dedcc3d9d8584cc SHA512 e646c68515652f7321492e9025f6fae17c7ae9d0707690172b4dfba774193903222bb918a11ce17636b688b236c4b26b66ccc7581010929d1e02b12c3569e054 WHIRLPOOL 048d4a6be73af1aa44c61a96eda3d02d0fb97ec41b4564d879162cbac328fe05354162d24ecb2e57e01eeccc6ca5ba735971c72ebbd0df96787903d05675b391
diff --git a/dev-python/pykwalify/files/pykwalify-1.4.0-S.patch b/dev-python/pykwalify/files/pykwalify-1.4.0-S.patch
new file mode 100644
index 000000000000..0f133c9c95c8
--- /dev/null
+++ b/dev-python/pykwalify/files/pykwalify-1.4.0-S.patch
@@ -0,0 +1,24 @@
+ tests/test_core.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/test_core.py b/tests/test_core.py
+index 2fae7bc..0773f88 100644
+--- a/tests/test_core.py
++++ b/tests/test_core.py
+@@ -397,12 +397,12 @@ class TestCore(object):
+         ]
+ 
+         # Add override magic to make it easier to test a specific file
+-        if "S" in os.environ:
+-            pass_tests = [os.environ["S"]]
++        if "_S" in os.environ:
++            pass_tests = [os.environ["_S"]]
+             _fail_tests = []
+-        elif "F" in os.environ:
++        elif "_F" in os.environ:
+             pass_tests = []
+-            _fail_tests = [(os.environ["F"], SchemaError)]
++            _fail_tests = [(os.environ["_F"], SchemaError)]
+ 
+         for passing_test_file in pass_tests:
+             f = self.f(os.path.join("success", passing_test_file))
diff --git a/dev-python/pykwalify/metadata.xml b/dev-python/pykwalify/metadata.xml
new file mode 100644
index 000000000000..c582e79e821f
--- /dev/null
+++ b/dev-python/pykwalify/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+  </maintainer>
+	<upstream>
+		<remote-id type="github">Grokzen/pykwalify</remote-id>
+		<remote-id type="pypi">pykwalify</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pykwalify/pykwalify-1.5.2.ebuild b/dev-python/pykwalify/pykwalify-1.5.2.ebuild
new file mode 100644
index 000000000000..a0b78483c830
--- /dev/null
+++ b/dev-python/pykwalify/pykwalify-1.5.2.ebuild
@@ -0,0 +1,36 @@
+# 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
+
+DESCRIPTION="Python lib/cli for JSON/YAML schema validation"
+HOMEPAGE="https://pypi.python.org/pypi/pykwalify https://github.com/Grokzen/pykwalify"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/docopt-0.6.2
+	>=dev-python/pyyaml-3.11
+	>=dev-python/python-dateutil-2.4.2
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.4.0-S.patch )
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/pykwalify/pykwalify-9999.ebuild b/dev-python/pykwalify/pykwalify-9999.ebuild
new file mode 100644
index 000000000000..dd9495747353
--- /dev/null
+++ b/dev-python/pykwalify/pykwalify-9999.ebuild
@@ -0,0 +1,37 @@
+# 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 git-r3
+
+DESCRIPTION="Python lib/cli for JSON/YAML schema validation"
+HOMEPAGE="https://pypi.python.org/pypi/pykwalify https://github.com/Grokzen/pykwalify"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/Grokzen/pykwalify.git"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/docopt-0.6.2
+	>=dev-python/pyyaml-3.11
+	>=dev-python/python-dateutil-2.4.2
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.4.0-S.patch )
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
new file mode 100644
index 000000000000..1e32c3534459
--- /dev/null
+++ b/dev-python/pylast/Manifest
@@ -0,0 +1,9 @@
+DIST pylast-1.6.0.tar.gz 41307 SHA256 6bf325ee0fdeb35780554843cf64df99304abb98c5ce2e451c0df7e95e08b42e SHA512 2e47eca2282da8637d5fc79b8fc6784f6f7e9c88975f10e5f162be1445f81dbce0a01c6d7e8ff14162bc3b48a8a4171bf4c81239b17fb08ea5c6b1eaf432f18f WHIRLPOOL f76dbae7326c2b973c8ac1e68e4f31145e449a37d5a342f7ab551cdc737fe529bf9839b05f74d67805bd97aa66f7808a56abea6f57bf0e74390a33d59aa07179
+DIST pylast-1.7.0.tar.gz 42433 SHA256 a482a769b6a037e2e9b78433de91a287eaf6aacff60bbb2f4562c3c7ece10430 SHA512 c5f983f651b4d76a004d5521ae3a76d05dc3b424523be365679b7a35f11a5a83894e2bc18365b058b254935fa804575631eacbde4b37d1e2f3d7eb325eeabab4 WHIRLPOOL 04caefd6a7aa11dda40f270587c0a9cfe393c9262411f802a429e5ba893e7320200ba2e8942047f7d583b0e76e4f7edfc2b5671b223c98084287c7a2b255a4b9
+DIST pylast-1.9.0.tar.gz 42584 SHA256 ae1c4105cbe704d9ac10ba57ac4c26bc576cc33978f1b578101b20c6a2360ca4 SHA512 ff3929583d88466738c9a1e964676652717c9f5bd4631f1a0a7855903e77cd394a612b0e2e8fc2f698ac84a34a135f4e940ff7760c2c88bf388ae56fc9c3da65 WHIRLPOOL 701e11a314c60eec50196103c916c107729f5f233d9a00173813f7f33393818a7a4a7b860bdeaec8c680072ca25604acc13d30ace0575623ffa5159da32b14d7
+EBUILD pylast-1.6.0.ebuild 520 SHA256 e6210ae04102465996ac26e4ae7b3e6d69bd318e4dfb4f7969158123340d2aa2 SHA512 88526859c67c2fad9f07ce6895b6cc8b5397b371e07797721ab3781c56b390fee333efbf1d69e2532658e666a916ae3a12b793fca21e73cc3c3a600b6751eb7d WHIRLPOOL 5dda1250f564658d71d2646808663afd0b2781f0eef5fdb693c12150f2f9f165b2c46dfffd54a29cc336fa1bc7079169ff641ca6109268e908ebc67195f4e156
+EBUILD pylast-1.7.0.ebuild 522 SHA256 def21f3797596e0c8393ff9b6bbeacbe58742ca1e5b1c60a261ebb4e1d677e33 SHA512 2cb54583b888efbc2a64bb82e5ff03071ab18dac797461882b8e2793ccb1fda5bb8c9aafa627418385d04670f5b83b24830f547f556f30204494929526fa1eab WHIRLPOOL bbb8f29c599dc73f88e078913300ded6519ba8667caa85ae239aecf9fcccc2850e68641091ef46f833985bd1d2c32f6aadf5dd265413f3a77a8cd4cbab9e098c
+EBUILD pylast-1.9.0.ebuild 615 SHA256 1e5dcf58022f5adf186009b1c9445b0dc77b8fcac19ffe40ec748065f40024fc SHA512 44addfd9e7d1476edf84d7e491ac55173d53da9d729da632bc879f61301ab098beae67856c74aee86bdd572b63fb83194c62625ea516a64fcf2a6a5840121c59 WHIRLPOOL 8eee749a89d63bb117a53ae37c8474cb6dcb4b073a597f0797ddb55285f51355f69b45afc265b733dc2940515a750ceb70f8c9824492912a285484a825c26f94
+MISC ChangeLog 3703 SHA256 fcbf0e33aee0e3b96f4265259e45f6cb6f7198a803f58def8b2bb3aadc4f28c1 SHA512 98841af2cccb393d780697f41b564084bbdf28f75e4b4dff05c23f229b875d3db8eecacdd009a8bee6b901b2d3bf8cfa058cde2ac2537e77cfc8a2f356dd9128 WHIRLPOOL 9d744f03d625004106ec8a6e978930e013b9ec951784e02cd936ebb50468839720ef1fae9c3e6b8ace13d3cdb8335298771682c38e09665945a0e9b8eea4244d
+MISC ChangeLog-2015 1760 SHA256 232ba706d583d935503e7faa8deb3cf971a72307b4b20a80e6926aa38dfe00ed SHA512 70460253aaa4850712a10b7e7d636932a04c527f0020083366b8a9003f90d7a749eaaf07095f4e140bb05d2ecc74b33fa0bc3e00bf688d4259cd2dac75e08106 WHIRLPOOL b8f725e04fed8cbf886882aaf5b96ae93a099c20417064e4294f4c2a4af2127549e7f773df65e2564d1d7855876baf8c59283950281f8c874ae9d1104fe13e61
+MISC metadata.xml 894 SHA256 316a947434e095c7113f545ea1613aba1ee4cdde07e9005e8212aec5aa80a6b4 SHA512 c5eba42bd263c572e7c73a6df8daa3aad56407d4f26eb1560e1a2fd21fff6a4228522d2c4493481ed7e767e24818cf82b6076ff00937d4214ef25b91986f42a9 WHIRLPOOL 9b0b32e5387852528288f7114cdb8e0eb6fcd44b8b449bf6c3b596a6d8b092593fa0c508b69ee2b0a6ee5514c60a62fb82bb449512486cdd8768cfa7a6df9617
diff --git a/dev-python/pylast/metadata.xml b/dev-python/pylast/metadata.xml
new file mode 100644
index 000000000000..8f174790787e
--- /dev/null
+++ b/dev-python/pylast/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
+    Python interface to last.fm and other api-compatible websites
+
+    Features:
+    * Simple public interface.
+    * Access to all the data exposed by the Last.fm webservices.
+    * Scrobbling support.
+    * Full object-oriented design.
+    * Proxy support.
+    * Internal caching support for some webservices calls (disabled by default).
+    * No extra dependencies but python itself.
+    * Support for other API-compatible networks like Libre.fm
+    * Python3-friendly (Starting from 0.5).
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">pylast</remote-id>
+    <remote-id type="github">pylast/pylast</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pylast/pylast-1.6.0.ebuild b/dev-python/pylast/pylast-1.6.0.ebuild
new file mode 100644
index 000000000000..65641f2e94df
--- /dev/null
+++ b/dev-python/pylast/pylast-1.6.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to last.fm and other api-compatible websites"
+HOMEPAGE="https://github.com/pylast/pylast"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+# As the testing requires a last.fm account and online access it is restricted
+RESTRICT="test"
diff --git a/dev-python/pylast/pylast-1.7.0.ebuild b/dev-python/pylast/pylast-1.7.0.ebuild
new file mode 100644
index 000000000000..4a99492062fb
--- /dev/null
+++ b/dev-python/pylast/pylast-1.7.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to last.fm and other api-compatible websites"
+HOMEPAGE="https://github.com/pylast/pylast"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# As the testing requires a last.fm account and online access it is restricted
+RESTRICT="test"
diff --git a/dev-python/pylast/pylast-1.9.0.ebuild b/dev-python/pylast/pylast-1.9.0.ebuild
new file mode 100644
index 000000000000..dce10b85fb36
--- /dev/null
+++ b/dev-python/pylast/pylast-1.9.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to last.fm and other api-compatible websites"
+HOMEPAGE="https://github.com/pylast/pylast"
+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}]"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+# As the testing requires a last.fm account and online access it is restricted
+RESTRICT="test"
diff --git a/dev-python/pyldap/Manifest b/dev-python/pyldap/Manifest
new file mode 100644
index 000000000000..ff0ce538ae72
--- /dev/null
+++ b/dev-python/pyldap/Manifest
@@ -0,0 +1,6 @@
+DIST pyldap-2.4.28.tar.gz 130651 SHA256 d38f31018f0c15925f50aec39f7255c15463f98797af53931e0e2a9ac21f6661 SHA512 d8bdf79c63d94289f2503fefe77b4e5c3edca6bf42a6fc039cffc4ebb9db57808c5f4fbf9265d3f33b672971ba3194c35b3b6034543c4f6f7ff80497ff050a7b WHIRLPOOL ff72c9d451e9d47872f78b4cc27cd51a3f5a156ea9a49a01ade35e1e52d74a92abf69301670fcc8be6eb3e32da69d4290dd4d590ae8971eec2cc1c77491d6bdb
+DIST pyldap-2.4.37.tar.gz 303732 SHA256 ba402b013696d7cb39ed20b38ae8f8be0461f837d3a2818e67f3bdf0cc16987f SHA512 da66669bf9eecebc8ba05ee313453b151a01147bc44c60da4936b80777ec3b69551f77be0e6f3c260dba771920d50fa6f54f1892eb0283761beed1ee8c6d83c2 WHIRLPOOL 23f2745836087874a3bd64835c0da2da8590028ca9a5d96b294ef00ecac00d4402300f2ccc6396606442dbae76ac164c84c4bfd39cfb3dcc6d5b9273b8e69ed1
+EBUILD pyldap-2.4.28.ebuild 2340 SHA256 4263591f03aab34845410ef4ba2c844774fc1455cedf103e94a5b86f52e469af SHA512 0f0984644b0995c8a4a472d729e0e98e3a7b0b7a3a7d6268552c46345456a7b734b9e60d4cce65f8683f2e64e790c4191bd5baa729ff31fe3c8cf9158eeca9c9 WHIRLPOOL edaca4ae0d51d9b0e9560793c27dad4ddc8c8b5f5758377f1cf6b6d68b0692c5c85e50a7b3e85e313c14614dc20d7d9343193c2aa2d96c0f02fcd41bfd9cf354
+EBUILD pyldap-2.4.37.ebuild 2340 SHA256 4263591f03aab34845410ef4ba2c844774fc1455cedf103e94a5b86f52e469af SHA512 0f0984644b0995c8a4a472d729e0e98e3a7b0b7a3a7d6268552c46345456a7b734b9e60d4cce65f8683f2e64e790c4191bd5baa729ff31fe3c8cf9158eeca9c9 WHIRLPOOL edaca4ae0d51d9b0e9560793c27dad4ddc8c8b5f5758377f1cf6b6d68b0692c5c85e50a7b3e85e313c14614dc20d7d9343193c2aa2d96c0f02fcd41bfd9cf354
+MISC ChangeLog 2473 SHA256 2700d2042a691525c80f1d4fda83111df508392212a5c4e21169c67bfae9b15f SHA512 1f8e42a153ab0faf00eedbdb29dbb0e516b3d58c074579816f9ccf0d93054dc7c0b5530dfa919e52beb6de23e588258373b8e1c633f9a686571e4d47e5e240f0 WHIRLPOOL 8210e9c263205f825a59b40b218ff35cdc0f7e3c68d5c8b473fc3a923474d1c65cdb48ca6abf51866b97dcd75e125ce69756a30d2986d38612d983ef0722fdb8
+MISC metadata.xml 529 SHA256 23b4689410e58849323265067ab738bcd94b30b31626f517a2e08664c0051215 SHA512 47560d8da0a2c956d1004cb8dff9371937980c013ccb23038faeb421d859b6fa943cd17c751a277afe6df22b8342550b06a4504a52bfc4b24881d7fa05eedb99 WHIRLPOOL 4cf65e85f3299fd15e3ef4c0e9d968754c95c8a6dd03c5066eb6d8f43c7660be5ae1ed68b87961b08958814057913b47560014e4a572120f05c63c642feb3885
diff --git a/dev-python/pyldap/metadata.xml b/dev-python/pyldap/metadata.xml
new file mode 100644
index 000000000000..6879e4d2de95
--- /dev/null
+++ b/dev-python/pyldap/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+		<description>Upstream of the python3 port</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-ldap</remote-id>
+		<remote-id type="github">pyldap/pyldap</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyldap/pyldap-2.4.28.ebuild b/dev-python/pyldap/pyldap-2.4.28.ebuild
new file mode 100644
index 000000000000..a8f7d202a33b
--- /dev/null
+++ b/dev-python/pyldap/pyldap-2.4.28.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1 multilib
+
+DESCRIPTION="Various LDAP-related Python modules"
+HOMEPAGE="https://pypi.python.org/pypi/pyldap https://github.com/pyldap/pyldap/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris"
+IUSE="doc examples sasl ssl"
+
+# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
+# python team: Please do not remove python-ldap-2.3.9 from the tree.
+# OpenSSL is an optional runtime dep.
+# setup.py sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
+RDEPEND="
+	>net-nds/openldap-2.4.11
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND+=" !dev-python/python-ldap"
+
+python_prepare_all() {
+	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
+		-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
+		-i setup.cfg || die "error fixing setup.cfg"
+
+	local mylibs="ldap"
+	if use sasl; then
+		use ssl && mylibs="ldap_r"
+		mylibs="${mylibs} sasl2"
+	else
+		sed -e 's/HAVE_SASL//g' -i setup.cfg || die
+	fi
+	use ssl && mylibs="${mylibs} ssl crypto"
+	use elibc_glibc && mylibs="${mylibs} resolv"
+
+	sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
+		-i setup.cfg || die "error setting up libs in setup.cfg"
+
+	# set test expected to fail to expectedFailure
+	sed -e "s:^    def test_bad_urls:    @unittest.expectedFailure\n    def test_bad_urls:" \
+		-i Tests/t_ldapurl.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C Doc html
+}
+
+python_test() {
+	# XXX: the tests supposedly can start local slapd
+	# but it requires some manual config, it seems.
+
+	"${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( Doc/.build/html/. )
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r Demo
+		docompress -x /usr/share/doc/${PF}/Demo
+	fi
+}
diff --git a/dev-python/pyldap/pyldap-2.4.37.ebuild b/dev-python/pyldap/pyldap-2.4.37.ebuild
new file mode 100644
index 000000000000..a8f7d202a33b
--- /dev/null
+++ b/dev-python/pyldap/pyldap-2.4.37.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1 multilib
+
+DESCRIPTION="Various LDAP-related Python modules"
+HOMEPAGE="https://pypi.python.org/pypi/pyldap https://github.com/pyldap/pyldap/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris"
+IUSE="doc examples sasl ssl"
+
+# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
+# python team: Please do not remove python-ldap-2.3.9 from the tree.
+# OpenSSL is an optional runtime dep.
+# setup.py sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
+RDEPEND="
+	>net-nds/openldap-2.4.11
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND+=" !dev-python/python-ldap"
+
+python_prepare_all() {
+	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
+		-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
+		-i setup.cfg || die "error fixing setup.cfg"
+
+	local mylibs="ldap"
+	if use sasl; then
+		use ssl && mylibs="ldap_r"
+		mylibs="${mylibs} sasl2"
+	else
+		sed -e 's/HAVE_SASL//g' -i setup.cfg || die
+	fi
+	use ssl && mylibs="${mylibs} ssl crypto"
+	use elibc_glibc && mylibs="${mylibs} resolv"
+
+	sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
+		-i setup.cfg || die "error setting up libs in setup.cfg"
+
+	# set test expected to fail to expectedFailure
+	sed -e "s:^    def test_bad_urls:    @unittest.expectedFailure\n    def test_bad_urls:" \
+		-i Tests/t_ldapurl.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C Doc html
+}
+
+python_test() {
+	# XXX: the tests supposedly can start local slapd
+	# but it requires some manual config, it seems.
+
+	"${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( Doc/.build/html/. )
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r Demo
+		docompress -x /usr/share/doc/${PF}/Demo
+	fi
+}
diff --git a/dev-python/pylibacl/Manifest b/dev-python/pylibacl/Manifest
new file mode 100644
index 000000000000..8778c543bca9
--- /dev/null
+++ b/dev-python/pylibacl/Manifest
@@ -0,0 +1,5 @@
+DIST pylibacl-0.5.0.tar.gz 23886 SHA256 8706291e815547e2e89426508d00fd31d437bdb8e5eb9407777f414b0606e2d6 SHA512 c12390b6a0ca73fd351b84860a9d68d74126dbcd8656916d677a39002a6e4abbac704d450b0b0118bba40987cdd11cc11ad14008de39dac8dc9ca7587ae54c46 WHIRLPOOL e6496a45f81f9bb12bff33f7724768f768a9ad1936ea6efd358fff1ac1ecb8ba1bd662c22b8ce6b9e4cfa879ed32bec5dc4c288fb025960e2e81e5236065c07a
+EBUILD pylibacl-0.5.0-r1.ebuild 937 SHA256 e9bb81fd7c543c62a02a8eb670d1a4531420e68d388c371ec0c692efabf15a14 SHA512 99aed07f81908463d6866460c4b439a5f9b364cbcb3659fc3a7906ec68bb79d38562639536d6df8f6df724ebd521f14fc1529a1805105a547f939e450f6038d2 WHIRLPOOL 8f84646217e3161ce5820fc46363bc4fbf4f66150b16b2a187dcb1788e3ec1b7a48d190a3f1e94ed2c4bb6a079b2a658ab05decf944137030c63d404e6589a6d
+MISC ChangeLog 2833 SHA256 c3ca52b632476698260e311949eb707f9ed9b10ab5a6d30bc16090b92141b147 SHA512 111bc1513f0d987f602723e1934ef0f611c84a378f9b6a9dc4f1ea9cb36d79d064dbcdc29a9c3b426893b4aa43aee22c8fdb0e852a553b7f92d68b67f63b6ad9 WHIRLPOOL 3cffb8058e88aaeac8b37bca59ba9258bb48c7e4bc6ac94dcd5622a87c2c79bebd67e016a7ce0191ee453155f5d06f0fb6902c234b0afa698c41fa9a5824c279
+MISC ChangeLog-2015 5683 SHA256 6fc872e31905872b3d1dda98d8aaecfd89eefdb412aa9d54416be42d2c023d00 SHA512 2ff2e1ae6c398c4623b898fe763cf8260764305dc00a54168a4661f1a2ce574a51ec713a1c528b05594f136003784f0e27694fb538fcb3a7c22650b93d10c632 WHIRLPOOL 5c24ad88870b2bc2d926c8350b86015ffb14b4e40cb491e97d9f70090d324c013fed6c4245a16988b165f1182d4de9e6112eda96717e8d9678fc0db091de767f
+MISC metadata.xml 397 SHA256 81399d55cd4eaeffa646b5dc6a5b28a62d85805dfd5f108ecbad37a20f9b2052 SHA512 c180079a6f20e899a3fe472db2e91c36ae7cf9d67f519dea0f2367aaa7febe3123374d3f5bb847267b5b42e234fe1548208db0eee20cf520ff5eb9b9cc699696 WHIRLPOOL 469bc2b5a4f06cdb520aa7a38ff59605d2d420b385f47959daa026bb56990452de2d10d8207f4c9a6ce3315493d81f46fa7cacf0b5ffaa72d6748bbc80a8f140
diff --git a/dev-python/pylibacl/metadata.xml b/dev-python/pylibacl/metadata.xml
new file mode 100644
index 000000000000..6112c9d184b0
--- /dev/null
+++ b/dev-python/pylibacl/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pylibacl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild b/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..3adbe818e9f7
--- /dev/null
+++ b/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
@@ -0,0 +1,35 @@
+# 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
+
+DESCRIPTION="POSIX ACLs (Access Control Lists) for Python"
+HOMEPAGE="http://pylibacl.k1024.org/ https://pypi.python.org/pypi/pylibacl"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="sys-apps/acl"
+DEPEND="${RDEPEND}
+		dev-python/setuptools[${PYTHON_USEDEP}]"
+# Tests are missing in the tarball.
+RESTRICT="test"
+
+python_test() {
+	if ! "${PYTHON}" test/test_acls.py; then
+		eerror
+		eerror "If you got the following errors:"
+		eerror "\"IOError: [Errno 95] Operation not supported\","
+		eerror "then you should remount the filesystem containing"
+		eerror "build directory with \"acl\" option enabled."
+		eerror
+		die "Tests fail with ${EPYTHON}"
+	fi
+}
diff --git a/dev-python/pyliblzma/Manifest b/dev-python/pyliblzma/Manifest
new file mode 100644
index 000000000000..ebc4b7b97676
--- /dev/null
+++ b/dev-python/pyliblzma/Manifest
@@ -0,0 +1,5 @@
+DIST pyliblzma-0.5.3.tar.bz2 43498 SHA256 08d762f36d5e59fb9bb0e22e000c300b21f97e35b713321ee504cfb442667957 SHA512 272983aac426e86d6d636ccba4fe78a07d7282560081df937114162bfd317bd8023814693b8d473d0f7884e38a968ebeaf8f954a5a27c1f7e5da084f3fd05c65 WHIRLPOOL 289fc18a8cf7b90f53f06bd4cc3865b4e02f87710bf0ade15c11d2774f86ff826171483f746765cda67628ae3d78f7914448e652a6b5e69c0c572d357e3cac20
+EBUILD pyliblzma-0.5.3-r1.ebuild 579 SHA256 d0948f704d0cf0b3080f28637f1fdc8e5fe12fe8e8948a25ef47970d748b5325 SHA512 c61952c4c9442e23e165f826cd25454f1a8eaadd4826dd29ed1fb1b9465a46c349d8b63a74d108948d6e9c2b5e9cfea7d2f6aea8aafca872540d8bc43a52e55b WHIRLPOOL 5e3a6cbe4b29582c0d20f48084878504e28a343174c4ed8c7ef355130c4ae621ed4b7957aa6a28d09d2ce6b70a633a970e41c9575707d24a5ca1e574520c793d
+MISC ChangeLog 2772 SHA256 0e5a091d707a9481c639e5af2510232de340e4148f67e9be8d5590b8de70dbfd SHA512 a48463b0e99f7d866e1bddf8c6a7dfb7d0d7b45427f4340868a78bbf69551bdc957297934fbcbdaa2df83fc5c270a158b407d64261782ae188bf7dee2e288ae0 WHIRLPOOL ba9fcbd991be3c750a8223f08c4bc1970a21834d0889eb3985a47726dc341655b7b781bdb52a0f0b3b6a1087e9613ee74424ace55d5d5b7a99f93f1403d01ff2
+MISC ChangeLog-2015 1249 SHA256 dc47ac1b789a654eb0cdb5b903b321283091e2e9462d9124826954ab3f51a4f3 SHA512 b923d64a0866105bb10187159d5011eaf7d825ca6a320191a3f1fe3336dca59fcc02f4b2b4bf92c358553fe1c93e10561bab007b3a092bc6a43a1b089071ade2 WHIRLPOOL 4d33460c263de9794b361407f2f7692ec9448dced9c93ecc4988b47af4123648df0e9a7fe7789cd179f3e6c121345eca490b905ca2950e28a50a005314762711
+MISC metadata.xml 364 SHA256 a0f457210277825b6add0f4c29717cc9185761ddb477607ac63381cc348cb44a SHA512 9052e6e7da1cda1cf31028b8e8cb84c2fffab93505de75105d8cbe52a862c7f95929a9fc094da7692cf9deff1abeed4496abdbb057b9a6de24e64441648280f5 WHIRLPOOL 578f80296def86db8cc7b5b5de25de78b25dce0a97af0d439cca8d3645c98c47f454c13897fbf6ff4ffe8464bd4b3f4f73a694c630e5ff10d20c2871a809dfa6
diff --git a/dev-python/pyliblzma/metadata.xml b/dev-python/pyliblzma/metadata.xml
new file mode 100644
index 000000000000..483419253126
--- /dev/null
+++ b/dev-python/pyliblzma/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyliblzma</remote-id>
+		<remote-id type="launchpad">pyliblzma</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyliblzma/pyliblzma-0.5.3-r1.ebuild b/dev-python/pyliblzma/pyliblzma-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..d818b884131e
--- /dev/null
+++ b/dev-python/pyliblzma/pyliblzma-0.5.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for liblzma"
+HOMEPAGE="https://launchpad.net/pyliblzma https://pypi.python.org/pypi/pyliblzma"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	app-arch/xz-utils"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS="THANKS"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pylibmc/Manifest b/dev-python/pylibmc/Manifest
new file mode 100644
index 000000000000..04af76f2075d
--- /dev/null
+++ b/dev-python/pylibmc/Manifest
@@ -0,0 +1,7 @@
+DIST pylibmc-1.5.0.tar.gz 53077 SHA256 16255595616a6d78cd786a55cc6431da5b7accf46512df854712a0cdbb3acfaa SHA512 0b89ad56d44205c0a20c5e2b56f70ac5128b46df81b4fcb9c72918b5d32e455dd3d976366872fe1d0acf40b61460d08fa6f30a8fa26977c1d65509e28bbbf80d WHIRLPOOL 3d3b8cd8842a6e0e602b5addfed12db94da4fbfb6d4f215546ca6ba9cfc0b24f5ce333e5f2740ba625a416663097e46dc40749418cc4c1a52f3123a032c4b45f
+DIST pylibmc-1.5.1.tar.gz 69525 SHA256 18fa39885fce5464977d657185f55e491315b84686533db58054605165fd9b06 SHA512 efc40fae9721a6be589f87b66109132d4656725f718e1d63d7d25b9b27790b7c00fc3c7e4e47235895b7127cebc64229ddb284d23d0d903d3a510da7e1ce4549 WHIRLPOOL 668fd46c7d2a9d30bd5055649095fdcc6d38d739c473f66e23293838034b5b8b15aa982f015b029f0d57487080064de9b19600e172e78968c21d94f048666c82
+EBUILD pylibmc-1.5.0.ebuild 866 SHA256 ce324ef1e1821149a7bbc6e4ef97bed550d0da5bd66b5ad1dd42854c663f4554 SHA512 55a6fbb96256827aa74cfd29dc1aeb89ca2d8466ecb896196ec58cda17e9a423f78c2cad5368037747515342ffd15baf3a97987bd00d280633c5a12193ec6bbf WHIRLPOOL b3133ac225f78490d0728dd71a206af1665f4445196be55f3615bd83d297dc82bf55f987fa899eacd42a4243f518b25a0a045cb07d362521f88babc1a3ea0d6b
+EBUILD pylibmc-1.5.1-r1.ebuild 1369 SHA256 fea1695b2184f2c4bd03002e1e48f65f2f8966f8dbe3032f5e6987debdaa266c SHA512 9a8fb00cb7ffcfda74719f16c0d99bed7d34b023f3fb3060271797ed452c5a5dfcc264ff9990ef987e6752e477b28cdb136c20215e9f611fb584f412d527849c WHIRLPOOL 52a37de22301532511bc20b2f3a4646abd668d25708f2e0aec517d140668b2b31546e94d457a2fd6f54afaea9975ee128197319915006ad6c466e2597a63a41d
+MISC ChangeLog 3345 SHA256 71efe727b558ef5789279a829c618ec6a8d82102ede1d8d50e9e9c4170d6f4d7 SHA512 79742bcb20baae6bb41c3746a819761b3c0deda590eba7c62e2584c720961bf4f8d481a793757cd3921f3f8ca54083b20de27948f7bf30c3be1cbce16b1d9f8d WHIRLPOOL 8b128f82954c6017c2e3242f1798fd29b04413da18ba9bea462771da3f03a1774b05af8e76704a40daa04cbbd6044f3f2e68cbfdc1111253f2c5c648debae531
+MISC ChangeLog-2015 2418 SHA256 6c81b7452e8e8dee180df5b6b7bd461223e14c95143e7b12291b83ec4dcb61e5 SHA512 54ae7d737d6d4cd867c8176eee08863e9f76038aa8c96929f542d960415edd5fe1f12072ddb2b986e1a91da808fe993583233405bb4791ac7c913a105e97727a WHIRLPOOL 5e51de9e4b4c516576fd6107f2915556676d1ae26a686231db39f422e242f3cd00c0b12b5247238761ada6daef8184617414c7fe50fad96b870f43a0a617bd06
+MISC metadata.xml 653 SHA256 91b873ac315902cbe319b9f819240e3a9e5c92b2985312d893304b1730b2012d SHA512 77151ca539b87dd9fe67a24df3bea73cf375f59c7586a661238479ad035d960ad8e76b91b8c6cc3c75261b85fc9e1c9ea7cdff58235e2d5fa2e7e8d033e7ce59 WHIRLPOOL 525d8c700db8497f7eb8ea377b37abf0e65b1f2ba2f6f6291a066d3308eec247d12da2b8ea0c3a5c1302812b425d0061f6211ffd056c0d4481f2ce0d4713cac1
diff --git a/dev-python/pylibmc/metadata.xml b/dev-python/pylibmc/metadata.xml
new file mode 100644
index 000000000000..47fcb32bc2fb
--- /dev/null
+++ b/dev-python/pylibmc/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>bugs@bergstroem.nu</email>
+		<name>Johan Bergström</name>
+		<description>Proxy-Maintainer, assign bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pylibmc</remote-id>
+		<remote-id type="github">lericson/pylibmc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pylibmc/pylibmc-1.5.0.ebuild b/dev-python/pylibmc/pylibmc-1.5.0.ebuild
new file mode 100644
index 000000000000..17c6e115af5e
--- /dev/null
+++ b/dev-python/pylibmc/pylibmc-1.5.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Libmemcached wrapper written as a Python extension"
+HOMEPAGE="http://sendapatch.se/projects/pylibmc/ https://pypi.python.org/pypi/pylibmc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND=">=dev-libs/libmemcached-0.32"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -e "/with-info=1/d" -i setup.cfg
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	memcached -d -p 11219 -u nobody -l localhost -P "${T}/m.pid" || die
+	MEMCACHED_PORT=11219 nosetests
+	local ret=${?}
+	kill "$(<"${T}/m.pid")" || die
+	[[ ${ret} == 0 ]] || die "Tests fail with ${EPYTHON}!"
+}
diff --git a/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild b/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..245594294805
--- /dev/null
+++ b/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Libmemcached wrapper written as a Python extension"
+HOMEPAGE="http://sendapatch.se/projects/pylibmc/ https://pypi.python.org/pypi/pylibmc"
+# One image is missing from the doc at PyPI
+# https://github.com/lericson/pylibmc/pull/221
+SRC_URI="https://github.com/lericson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-libs/libmemcached-0.32"
+# Older sphinx versions fail to compile the doc
+# https://github.com/sphinx-doc/sphinx/issues/3266
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.5.1-r1[${PYTHON_USEDEP}] )
+	test? (
+		net-misc/memcached
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -e "/with-info=1/d" -i setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		# This variable is added to sys.path
+		# but it does not seem to be useful
+		PYLIBMC_DIR="." emake -C docs
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	memcached -d -p 11219 -u nobody -l localhost -P "${T}/m.pid" || die
+	MEMCACHED_PORT=11219 nosetests
+	local ret=${?}
+	kill "$(<"${T}/m.pid")" || die
+	[[ ${ret} == 0 ]] || die "Tests fail with ${EPYTHON}!"
+}
diff --git a/dev-python/pylibpcap/Manifest b/dev-python/pylibpcap/Manifest
new file mode 100644
index 000000000000..5f7dc4aa8da0
--- /dev/null
+++ b/dev-python/pylibpcap/Manifest
@@ -0,0 +1,5 @@
+DIST pylibpcap-0.6.4.tar.gz 49517 SHA256 cfc365f2707a7986496acacf71789fef932a5ddbeaa36274cc8f9834831ca3b1 SHA512 5db891bc044065ea72fb24f800adcdc1c80280a95a169f241a926b65ecff9b2cddc8cca1f2210bdd3fa01f4bc358a696eab93438d49b2eea10a22b6afc4ca468 WHIRLPOOL a72881dc5634adeabca3f779ab6bc0b106bcb024bb4f899697dd1004eafda547e4cea530a023962a45f8c8947b9d29ca788ade4bffa2600246bbf04063da4ee6
+EBUILD pylibpcap-0.6.4-r1.ebuild 538 SHA256 382e6656d72d45db3d85dbf991f2ca060a5d74df9bd2933a01abaaa7396685ce SHA512 99121f340ecf98e25cb5abc3a4b97a5976d5abe4f92e915ce09733aceffa01e18a4caef76b08b65ce856ed0bc2eaf8c37376fe4831222360db530c6a986a8b70 WHIRLPOOL e1ee851e54170ca6153a9f25ef9828656326fece3f01d57a923df999dc67dc12ef770cfa883a757e98c9c6d815cdf3fc48bf7fb227f59995d46ec0850bd838d3
+MISC ChangeLog 2640 SHA256 ced8e20893fb6b9f64ab514652abb7b9f0f396d244bbefa8ab08ac18066052a2 SHA512 d86249fa87cd9aeb7c50b47709be4b0fdc63718133153b67693cfee636445e44ed9329e715ba9a554a5f9a13678f98226afbe2240d7cf1d4cf2b4fcbf2c8ddcd WHIRLPOOL f33eea69fe56f50332e3c8b15483681d95968dfa8e8cf35bd08f07442e33a2a432db653aa743d9e6e2b4f2051601fdc818ff06e14a97e3e8a7e0bd5cf45469ac
+MISC ChangeLog-2015 4158 SHA256 15c4f5e7cac34e672ae52e99341e16b92e4089cadd0fafb4f30ff38f42e8491e SHA512 d48df16180cce354e85ce59b030330036245f82c13264795345b906c5a13e703c0622fb18513ba11ec00bed929e0628e4e64f5979c8bdcd95e89f03fc62e4b83 WHIRLPOOL 4d6fd57b17ae36e0cacad0aacaee758972abf35e3f0309d84ba13f6274254c6e02661d6fd3cde82d8b00b13b99aaf8c93fbe29637d9637fcfe162dcb39fc1c6d
+MISC metadata.xml 319 SHA256 e2ee3f44e64b65b0852b97d4a19ebc8c269f44ff599dc474a79ae660b27e696d SHA512 d2d7a2ee304ff8207df767701e491a502e9005a5561656149f10a3b022de36a6dea470e4f9531a44da4e97b6734dcd2d3ab9458cdcbc125f19e3be3a8c1bac75 WHIRLPOOL a2d96251f8e4b4fd5ea7e307ed22f21337205d545c7aa43b7e6af714f2f033950ba8e176e6639ed5d886725caeeab4dea4d2901f3e774128bd3275a10b884f84
diff --git a/dev-python/pylibpcap/metadata.xml b/dev-python/pylibpcap/metadata.xml
new file mode 100644
index 000000000000..5b3b19d3c47f
--- /dev/null
+++ b/dev-python/pylibpcap/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pylibpcap</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pylibpcap/pylibpcap-0.6.4-r1.ebuild b/dev-python/pylibpcap/pylibpcap-0.6.4-r1.ebuild
new file mode 100644
index 000000000000..598903de0bd9
--- /dev/null
+++ b/dev-python/pylibpcap/pylibpcap-0.6.4-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to libpcap"
+HOMEPAGE="https://sourceforge.net/projects/pylibpcap/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ia64 x86"
+IUSE="examples"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}"
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
new file mode 100644
index 000000000000..75ac5d504e06
--- /dev/null
+++ b/dev-python/pylint/Manifest
@@ -0,0 +1,14 @@
+DIST pylint-1.4.4.tar.gz 342461 SHA256 0561af4d6bd4fa9e8e02f3997fe93684f7187c57bcef9db8c2ea9fb0d7d2f022 SHA512 bcbf5439628a071055cea441455f6c0fe0cbfae2617c473bc376b880421f17f78653901d7cf49950653436a0991a3bafbc2df15744ff24a3b059de53e518b331 WHIRLPOOL 9b8f5384691f5e762bfd7313691783e0b1a9148effec0b29f2e538f587dfa03f57413817589f8fc3f152c05330b7f39c8ede27720ff6ad12496f9101d824fedf
+DIST pylint-1.5.6.tar.gz 425251 SHA256 303bdd755048feec2c1fe1ea16e8f4306636f02845510ff3d5922ae2d6fe35cc SHA512 569a747a0d2c4f60ff2c16af6117f501fa1a9a6546fcc1228909b23024e2bc05951985acf56249919b67b11f161cb1855321115ad9fd7a7c409b71faa5dd8278 WHIRLPOOL 286e32ae39dfc3ce8d13efb9e9acec98db698f742bf399ccd6d7e053a2bdb1b7ea30b36a10a65fa4867bb6316da08c1181c5f0f0f39b0a920ddc3cf60e85f462
+DIST pylint-1.6.5.tar.gz 465578 SHA256 a673984a8dd78e4a8b8cfdee5359a1309d833cf38405008f4a249994a8456719 SHA512 2fac352dc752b37f1ce4f7fefe5afbbc880d7e6c38f164d1c50734716af1dd6fe31f7d41e145a8256837d5a63b1989efec40c169fc14840cf8eb4e18d9bb2410 WHIRLPOOL 55201c238f9a6ba473d038ea1739bfb9b1e8183685bf5630405d436df1a0843642a354af698d1b585752c53e270fc4bd2d4d56d509c5d7acf5271a8fd1447eb3
+DIST pylint-1.7.1.tar.gz 489108 SHA256 8b4a7ab6cf5062e40e2763c0b4a596020abada1d7304e369578b522e46a6264a SHA512 e0efbaad3ca3205a2e2e1e4bc444e635540db12e139e008ff2ca8b454dd117488e767f070126074389d6d82c17622da747b9a948711225246877fed69ac81148 WHIRLPOOL 0f041bce357b68d2bd48fd51d6dc3cf7336a51160cf96771bfea059835e9ee1f535d0a19fc5876308040d5d16ef113b464a90b21d4109f11a77ef65da29425a5
+DIST pylint-1.7.2.tar.gz 488628 SHA256 ea6afb93a9ed810cf52ff3838eb3a15e2bf6a81b80de0eaede1ce442caa5ca69 SHA512 268f141f017fa4df6024596bcf1dfb32a578e9459864e2ace8c2725c8f5e117e0b01d9d745f1632bb43102a01f7075dc3fb69b839b79371f7df47740a56fc1cb WHIRLPOOL afe7fea97b32669012d85bf3797a8fb93b93c42f41ebd244c8c783245c5b3674fcbbb9ce43eff2110e74ad4d87f92bbf7877dbd7fd471b4b16595536efe5254c
+EBUILD pylint-1.4.4.ebuild 1756 SHA256 cb2e108d0baa071d3ed97718e59a4e4321070ce69acd548636d847e3b77ae623 SHA512 1fb393fb79a0a38a121a0fa7949fcfc44fe9e41a9cbb49829f000d680d2d42a583d5b7385afb809fea7c42b7eee79168531b52e02e87095e04b735b26f2918a0 WHIRLPOOL 0b0fcef277c7c396899ec8fcdec94df3a65add5b6fbe64db80f3992a504baf322a2e09a733971b3ee44a3e3b5dd8b2cd6b97c8a7bfc80f61ce07d3f32ffd5fab
+EBUILD pylint-1.5.6.ebuild 1671 SHA256 dde010805d5ae93f02670f6ba113de028604c7ce87767135e9f3bde5fe55857b SHA512 834efffc0438edd33dd05ce00ff34b7c92f3b3296b4fbf1709b87e622bcd6e7908d04fcbc731d70c92b9c1c30e09305fa62511ee85b1e876584740b4b21434d6 WHIRLPOOL f9e7f005e6527700dc0a35b0e67eacacfaafbfb194d4d9cb820b6d462d55964a24039fae8e3bcdf8d010bf8eee402967e95ef8ccb066769d84327d600847f9f7
+EBUILD pylint-1.6.5-r1.ebuild 1802 SHA256 80f409f2b5b6ea861368ea2c012dd8aee286535a9e126ac840a7023d245c1af3 SHA512 949f8e72a81581ce69ff517169a2b6c7a86d96c5f6a0cff087c6fb3ef398becd503477f97c6f3422af1d31cfc69c548cebdadbcd028972aabb56614e4e508ee5 WHIRLPOOL b2735c7229bcfb590c67b302df9f7b98ceb41c7c567c6a84f619feb7c64dbc6f172dd6d7f5267f2b76715727b91bb7cc4ae1959f00008873ad2af8d871615fb7
+EBUILD pylint-1.6.5.ebuild 1720 SHA256 c5b1c3c721682083f555354ba874d49f92652f570419401a2042174225450779 SHA512 30b539c069ded628fcceec28fc83969109b02ec8c4619c03fd0bb44176cfb184b7055d4b0fbac3f0bcbe6fa3fccf4f3f3eb5694d77b31b823f0502a959bbc775 WHIRLPOOL d89f97458fc0a3db422126ff7feeac496ddde41c1c848acf44f44df82559253d5262752322dc571c6f11bc6d222a5ad69a3e2aa8c9b845b6361c72e99e47ed1d
+EBUILD pylint-1.7.1-r1.ebuild 1815 SHA256 e29268915dd9234519a2d0759b46f68859d1c253c2e8592bd485d677e07e406f SHA512 7634328b661052ec84bf6e8dc5f6255ed606a6c44858beb90727ab25210c879199018e38d2d63e831e7c2a305cfffc3639d763d98fe7cbf6095022ac09dfe9ba WHIRLPOOL b9b20f4429ec9625cf4412a268db0e570d3b890eae8394925acc303b7c8b963d432e71d940250dedb831bd48b4add11f906ed62720b3a36a9fd31eae7c9e4d45
+EBUILD pylint-1.7.2.ebuild 1833 SHA256 6e2a8d775b1c56907fd784429a0a9f9fca7ec52d0ce940e553b1e38d92edb64d SHA512 177ccf07f9b5961f160922de199f3d15a87baa7c7445b1b20fddebaeabf52189aa48b837107d2442cf674a46ccfbe5488e35e5952b2a1c8490498e7a7316c49d WHIRLPOOL 36fcce09310577884e162060affb166f91d052f1a12f339a9f3e40345db49762b836ece1cc8ad7a5be708ee8488be1f3c3a79c466130ca528d6ba313a41891f8
+MISC ChangeLog 5917 SHA256 8c5a50930fa037ecfdb63dd8375718bef9c443feb9e134633ae7e654b654dc8f SHA512 153e30d510b5454013598ad00e2738f5c7d2aa33f49c40c5f07d68a678f6f8fcba852106e2552e392d9987ea3cad199618d49857bd56d5fc7b45880f758c7c88 WHIRLPOOL 57123d1e773ce24a0377fda0ec88e5a2586d63250c0307b0430241c493f3b61ab7a1a3a685d21dc010f8b6b24352fd5efbb2af05757da880eda3b6241fa2af5e
+MISC ChangeLog-2015 18786 SHA256 ce4e9ce9e05f0fa469173804d26116cf21c8c04870e36584e8d3c9ddf582fa07 SHA512 2824f48458a6b363ae0c7563c60ae2dadc9064873a4e82e2e513db83980d36ad482cc0354cf5377d21918c86cb50ba367391738870dc7b18a3bc255791915a43 WHIRLPOOL e0733941091bb5ef790dfd2ea7f6eefb46f0e4e7496f108dbafcb7ce158882fbdb0875ef25eba63cb68b62e62d5cb2702a73f755754db1e43c8e3670d475b0c3
+MISC metadata.xml 1074 SHA256 1895e20589a68d596221eaa241a2d49810cf2405f1fbee37281848aeb86d439e SHA512 83ad47c0dfcd143d058267fb1c5d250b9316124a91f431356a881937b4a527a0e23575cf353da8aa678645e6ec4a455b9114ac6ecfa0b36d88ac0623ca66ce57 WHIRLPOOL fe9205a3cde74e8b493605663710cc6b32a3619222955924d41eff98714ab3e584d30f495a58b6ed0eaf38de817683c0f26a31e906cc76079f6798cf1dd035e4
diff --git a/dev-python/pylint/metadata.xml b/dev-python/pylint/metadata.xml
new file mode 100644
index 000000000000..4fd10546d5c7
--- /dev/null
+++ b/dev-python/pylint/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Pylint is a Python source code analyzer which looks for programming errors,
+    helps enforcing a coding standard and sniffs for some code smells (as
+    defined in Martin Fowler's Refactoring book). Pylint can be seen as
+    another PyChecker since nearly all tests you can do with PyChecker can also
+    be done with Pylint. However, Pylint offers some more features, like
+    checking length of lines of code, checking if variable names are
+    well-formed according to your coding standard, or checking if declared
+    interfaces are truly implemented, and much more. Additionally, it is
+    possible to write plugins to add your own checks.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">pylint</remote-id>
+    <remote-id type="github">pycqa/pylint</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pylint/pylint-1.4.4.ebuild b/dev-python/pylint/pylint-1.4.4.ebuild
new file mode 100644
index 000000000000..30d279882005
--- /dev/null
+++ b/dev-python/pylint/pylint-1.4.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+RESTRICT="test" # needs pygtk
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="http://www.logilab.org/project/pylint https://pypi.python.org/pypi/pylint"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/logilab-common-0.53.0[${PYTHON_USEDEP}]
+	>=dev-python/astroid-1.3.6[${PYTHON_USEDEP}]
+	<dev-python/astroid-1.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND} )"
+
+# Usual. Requ'd for impl specific failures in test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	# selection of straight html triggers a trivial annoying bug, we skirt it
+	use doc && PYTHONPATH="${S}" emake -e -C doc singlehtml
+}
+
+python_test() {
+	# Test suite appears not to work under Python 3.
+	# https://bitbucket.org/logilab/pylint/issue/240/
+	local msg="Test suite broken with ${EPYTHON}"
+	if python_is_python3; then
+		einfo "${msg}"
+		return 0
+	fi
+
+	pytest || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	doman man/{pylint,pyreverse}.1
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( doc/_build/singlehtml/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	# Optional dependency on "tk" USE flag would break support for Jython.
+	elog "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled."
+}
diff --git a/dev-python/pylint/pylint-1.5.6.ebuild b/dev-python/pylint/pylint-1.5.6.ebuild
new file mode 100644
index 000000000000..e6fd948fc773
--- /dev/null
+++ b/dev-python/pylint/pylint-1.5.6.ebuild
@@ -0,0 +1,59 @@
+# 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 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="
+	http://www.logilab.org/project/pylint
+	https://pypi.python.org/pypi/pylint
+	https://github.com/pycqa/pylint"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/astroid-1.4.5[${PYTHON_USEDEP}]
+	<dev-python/astroid-1.5.0[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND} )"
+
+RESTRICT="test" # multiple failures
+
+# Usual. Requ'd for impl specific failures in test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	# selection of straight html triggers a trivial annoying bug, we skirt it
+	use doc && PYTHONPATH="${S}" emake -e -C doc singlehtml
+}
+
+python_test() {
+	${PYTHON} \
+		-m unittest discover \
+		-s pylint/test/ -p "*test_*".py \
+		--verbose || die
+}
+
+python_install_all() {
+	doman man/{pylint,pyreverse}.1
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( doc/_build/singlehtml/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	# Optional dependency on "tk" USE flag would break support for Jython.
+	optfeature "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled." dev-lang/python[tk]
+}
diff --git a/dev-python/pylint/pylint-1.6.5-r1.ebuild b/dev-python/pylint/pylint-1.6.5-r1.ebuild
new file mode 100644
index 000000000000..bc3c59d97786
--- /dev/null
+++ b/dev-python/pylint/pylint-1.6.5-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="
+	http://www.logilab.org/project/pylint
+	https://pypi.python.org/pypi/pylint
+	https://github.com/pycqa/pylint"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/astroid-1.4.5[${PYTHON_USEDEP}]
+	<dev-python/astroid-1.5.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	dev-python/mccabe
+	$(python_gen_cond_dep '
+		dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
+		dev-python/configparser[${PYTHON_USEDEP}]' python2_7)"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND} )"
+
+RESTRICT="test" # multiple failures
+
+# Usual. Requ'd for impl specific failures in test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	# selection of straight html triggers a trivial annoying bug, we skirt it
+	use doc && PYTHONPATH="${S}" emake -e -C doc singlehtml
+}
+
+python_test() {
+	${EPYTHON} \
+		-m unittest discover \
+		-s pylint/test/ -p "*test_*".py \
+		--verbose || die
+}
+
+python_install_all() {
+	doman man/{pylint,pyreverse}.1
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+	use doc && local HTML_DOCS=( doc/_build/singlehtml/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	# Optional dependency on "tk" USE flag would break support for Jython.
+	optfeature "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled." dev-lang/python[tk]
+}
diff --git a/dev-python/pylint/pylint-1.6.5.ebuild b/dev-python/pylint/pylint-1.6.5.ebuild
new file mode 100644
index 000000000000..b8ad4438224f
--- /dev/null
+++ b/dev-python/pylint/pylint-1.6.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="
+	http://www.logilab.org/project/pylint
+	https://pypi.python.org/pypi/pylint
+	https://github.com/pycqa/pylint"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/astroid-1.4.5[${PYTHON_USEDEP}]
+	<dev-python/astroid-1.5.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	dev-python/mccabe"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND} )"
+
+RESTRICT="test" # multiple failures
+
+# Usual. Requ'd for impl specific failures in test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	# selection of straight html triggers a trivial annoying bug, we skirt it
+	use doc && PYTHONPATH="${S}" emake -e -C doc singlehtml
+}
+
+python_test() {
+	${EPYTHON} \
+		-m unittest discover \
+		-s pylint/test/ -p "*test_*".py \
+		--verbose || die
+}
+
+python_install_all() {
+	doman man/{pylint,pyreverse}.1
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+	use doc && local HTML_DOCS=( doc/_build/singlehtml/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	# Optional dependency on "tk" USE flag would break support for Jython.
+	optfeature "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled." dev-lang/python[tk]
+}
diff --git a/dev-python/pylint/pylint-1.7.1-r1.ebuild b/dev-python/pylint/pylint-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..99cfe7640504
--- /dev/null
+++ b/dev-python/pylint/pylint-1.7.1-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="
+	http://www.logilab.org/project/pylint
+	https://pypi.python.org/pypi/pylint
+	https://github.com/pycqa/pylint"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/astroid-1.5.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	dev-python/mccabe[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
+		dev-python/configparser[${PYTHON_USEDEP}]' -2)"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# remove unused dep
+	sed -i -e '/pytest-runner/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# selection of straight html triggers a trivial annoying bug, we skirt it
+	use doc && PYTHONPATH="${S}" emake -e -C doc singlehtml
+}
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	doman man/{pylint,pyreverse}.1
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+	use doc && local HTML_DOCS=( doc/_build/singlehtml/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	# Optional dependency on "tk" USE flag would break support for Jython.
+	optfeature "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled." 'dev-lang/python[tk]'
+}
diff --git a/dev-python/pylint/pylint-1.7.2.ebuild b/dev-python/pylint/pylint-1.7.2.ebuild
new file mode 100644
index 000000000000..aa368aee7e58
--- /dev/null
+++ b/dev-python/pylint/pylint-1.7.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="http://www.logilab.org/project/pylint
+	https://pypi.python.org/pypi/pylint
+	https://github.com/pycqa/pylint"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~x86 ~amd64-linux"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/astroid-1.5.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	dev-python/mccabe[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
+		dev-python/configparser[${PYTHON_USEDEP}]' -2)"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# remove unused dep
+	sed -i -e '/pytest-runner/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# selection of straight html triggers a trivial annoying bug, we skirt it
+	use doc && PYTHONPATH="${S}" emake -e -C doc singlehtml
+}
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	doman man/{pylint,pyreverse}.1
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+	use doc && local HTML_DOCS=( doc/_build/singlehtml/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	# Optional dependency on "tk" USE flag would break support for Jython.
+	optfeature "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled." 'dev-lang/python[tk]'
+}
diff --git a/dev-python/pylirc/Manifest b/dev-python/pylirc/Manifest
new file mode 100644
index 000000000000..6a797b027343
--- /dev/null
+++ b/dev-python/pylirc/Manifest
@@ -0,0 +1,5 @@
+DIST pylirc-0.0.5.tar.gz 3538 SHA256 a78315e1ddf5af61cf91000a4b2f8e2df0841edd97b2596b2e0c5505bf8330a2 SHA512 c697e100e430dbd9f52322b6494b0cdb0fdd539ea94ea95c025801f1e8a80330ad8d23f075f3cea2ad98f57420658f98445f47969e7408f1f36d48063fb6c540 WHIRLPOOL 539cfc89fcfb1852bbf81145fa1ad357b55a632bdc3ec2cca56c78046fbf952ddb110e80d876383cebe70dcd3002b4ddcbeb4f3a39f8cc04a27533273f468888
+EBUILD pylirc-0.0.5-r1.ebuild 443 SHA256 d4f77a13d02d2620971312697c088e9798552a6f42e51877fe6bdf2c51d51c79 SHA512 2bb0a932969f5abb56308e623d054cf43d778c2eb65e5534b9456e89cb20decf573a6be90976ae0109d5653db72ed6e02a4cdaa99262285bdee9a261f8e20e58 WHIRLPOOL 2aa6bbee35b73b8d686c235b630fb216b96b37638d55005370082e9b44cb130a81a4fd1e74040647a0a7853a19877fa66cb2ceb6e55bf4078067dc1b507e23bb
+MISC ChangeLog 2691 SHA256 64c002efdbc2ae8564d5c5948850db8c50401b944a866ee4d5c11b0b7411f3b8 SHA512 91069da551fcfd65ddd61e307e88e7bc58451191a479e50288784de3a80d689885c5a1e4214cece940987dfda25a25a82368885e1986c3e2c261f0cac61fd6eb WHIRLPOOL e3ea3afff66fb42b971e56eab39479ac83a85aaf99838b158203472fc183342324910247fd9285b4ab8e47970897cf9facf546a195476146d927aa4f02df5ab2
+MISC ChangeLog-2015 2674 SHA256 5745a2e199d6786c8d67316a8cb39370ac57cef5fc0747e7f53874411f8c284e SHA512 4ea1711f657804f84fc5f5a6c73dd54c4b029059c2ae9ce669d214d82fa458d5121541d5f64af993748340eb239593049fdbf888489083c8305a8e3fa5c65459 WHIRLPOOL 3975e07b2bf702949b4e13158e49f704659ad1f7390b570216f18f2544a978d1cd704d0475e3878983a439edb2d6cadd7d4037d6f229fb2996612e1fa2a60cef
+MISC metadata.xml 316 SHA256 65f1f6281664e0eeaeb8a95de9de694de96512e5f5ea8a7976d3562b51f5eba9 SHA512 c5a33b6a974e45179c928388639ea01861b0ff8352be0fbdc50820040d365b399dd81ddfd8cba8a4508681d031f24bb36229cf7b7fc801306c0633c39f982457 WHIRLPOOL 8aa4b2deac14ea00d50950c670f50efd54ea9e3db14e90162d0b7b32bb6fbe1597884ac0ed96c3d548e838723e9ea27f8913e6df86e0b9c4155e5d8269a2c1fe
diff --git a/dev-python/pylirc/metadata.xml b/dev-python/pylirc/metadata.xml
new file mode 100644
index 000000000000..8282f7e5e115
--- /dev/null
+++ b/dev-python/pylirc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pylirc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pylirc/pylirc-0.0.5-r1.ebuild b/dev-python/pylirc/pylirc-0.0.5-r1.ebuild
new file mode 100644
index 000000000000..1064039605e3
--- /dev/null
+++ b/dev-python/pylirc/pylirc-0.0.5-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="lirc module for Python"
+HOMEPAGE="https://sourceforge.net/projects/pylirc/ https://pypi.python.org/pypi/pylirc"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="app-misc/lirc"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/pylzma/Manifest b/dev-python/pylzma/Manifest
new file mode 100644
index 000000000000..d07a80baa86b
--- /dev/null
+++ b/dev-python/pylzma/Manifest
@@ -0,0 +1,5 @@
+DIST pylzma-0.4.8.tar.gz 115234 SHA256 e6239cc4c134083ef6cfee54b1b9f5116dfc081474e093136b1b0e3226ac2532 SHA512 27f9ba035f326fddbfd72b186bf272986838ff88f603f397a8dd503b99681cdf197848ff0e47e1035bd7c3fd40fd2c09026afec30728fd58f065602b0078fbeb WHIRLPOOL 351877b6c46c609b44e171998c336470fbd9a6252fd2639884d813437ed781c3a5e5566ca248a97398af00d1885909b167c4dd57612380cbaf42b2a1a72803e1
+EBUILD pylzma-0.4.8.ebuild 738 SHA256 2d256a4db6919875a5591f648dc5cb8f7751ed22fdc51e85a8addc714c32d989 SHA512 b0ee5433355ba7d18d83b181c712bd9e787df387c58d1e4ca17dd0124206487fa9150de3f325e49f3045418ff533205abdf5cb262c9f1f1c351864f8d3e10699 WHIRLPOOL 5129e5ff34ae763b53c83352e01fba8bd9df9f283ed15abd00fe69a85a4f0ee750d79255eba89a7317aa4ea6d47cc2e5d5ecff48c3a3247296d03b6b9bd566c5
+MISC ChangeLog 2794 SHA256 23e35beb28642a711544c5b71b46e7139e1ed50234decf4b182a745248fcdc35 SHA512 cdcb6cb27e77a8c69fde3fa339e2f2339c1ee33300018fadf2d8e229c33107b96d00199717258a478a3c36e39004b35cd49875d5b3df724869ab64db74dc2a74 WHIRLPOOL 6d90f0c6384d310554d2a02161810d3f11436439e79d5055b3dc2b381a6f639fa686fbce1d1c3dc736a3725f571bf9403540b15a3331639b4394768d5a321c2d
+MISC ChangeLog-2015 2520 SHA256 23406a5c7d156963575a2ee0caf1e34a7162024fc13f4f6527131caee31180b6 SHA512 c067c3ae67dbadb29617f19715addee5c5501331cde2bf7e375b93a67291127045c4ec08bd06933915000dd087424496c24100c7e1f2449c440a0e464b4d9feb WHIRLPOOL 2447145fffa5d5d969dee731a8ed4985ed564a23d212a09f61ad7d88a4b244d830b922ac511987112a9b65e457157e13d749895b788dcd4933368c6586e2ec9a
+MISC metadata.xml 309 SHA256 a13fc59ef8d597836c92ec5791980ab288ec352608e680b50f3349d89a577187 SHA512 2511d647822514d4571c14fd77677fcf275300b12c748645696218608cb0baea9603c1de13599f1ec839783fbe1a99447a0b9c5cfb6be3ed1b354420815daaca WHIRLPOOL f9df3826ed42bb9f0be219b2aae057afe469bdd4b30d5c37d86b4fd465b5ebad327306d34724ab096edfdf5ca08de6938f872aea30d9ecef1c281395544d709a
diff --git a/dev-python/pylzma/metadata.xml b/dev-python/pylzma/metadata.xml
new file mode 100644
index 000000000000..6171c645d955
--- /dev/null
+++ b/dev-python/pylzma/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pylzma</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pylzma/pylzma-0.4.8.ebuild b/dev-python/pylzma/pylzma-0.4.8.ebuild
new file mode 100644
index 000000000000..b72e99e66c37
--- /dev/null
+++ b/dev-python/pylzma/pylzma-0.4.8.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=(python2_7)
+# hashlib module required.
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the LZMA compression library"
+HOMEPAGE="http://www.joachim-bauch.de/projects/python/pylzma/ https://pypi.python.org/pypi/pylzma"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="dev-python/m2crypto[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=(doc/USAGE.md README.md)
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
diff --git a/dev-python/pymad/Manifest b/dev-python/pymad/Manifest
new file mode 100644
index 000000000000..c2195817083d
--- /dev/null
+++ b/dev-python/pymad/Manifest
@@ -0,0 +1,5 @@
+DIST pymad-0.6.tar.gz 22099 SHA256 1c9fc529b78de7d26e9e47cf182c9f8bf43838d8f62a9c1773540d57f5ebc522 SHA512 1493925cf0fca3ede8314071795736354e2f036f41a9e72cfcf77f960c84bba8e76b43ce7c389c15dc9f2f619ce77b0afae1b78558b1617240bdde3012ad753c WHIRLPOOL 843b888f6bb1ac95240ab9b35177d43c562a26cc1513d2e69a19d1477f64dec142b092b34e409a8c20523ed0afab4b6704ac6567fb28c206be922d16c4b3c22c
+EBUILD pymad-0.6-r1.ebuild 592 SHA256 97842e039724cd08b9fc6c814a8242fdf83fabdde2db1fa73057f6241b20146e SHA512 116a0620e3b014b0e7128fa4ccbe55803ba97eb319d123f5f1b5e6e5308f8ef7ba2f961d6ff2adf213381a64d0c89f714b37edea0058a2bf591b32a54ce90bba WHIRLPOOL 3812fcc30e9642ffe1fb232a1f19e8f0d57d58c915cb138fceb770f72c4821d24ba9f60b55504300dc28ad36dc2251ede97ca9aee953c6c1ce985845a5c1ffd3
+MISC ChangeLog 2777 SHA256 e2d005e595135818ace1ebf2e3706565968d54599a4d53e4d83538edd77f88d6 SHA512 154e5c672fcaa3ede1af2ff44ad400cde27e8478735b9f5bccc7aac2946840a15ecb7a77b2cdd61bde626781f56722733a949727540af80176292392ecbd757f WHIRLPOOL 8ae64207a22ce5a197028a47a7bd6ea921224bfe0704e62c8e01618fc55747ceef04b2e89bf41c3106a78853abe24d00aaab5e7d0bbd8d929286f986f587b202
+MISC ChangeLog-2015 3751 SHA256 60b05feaba6099ba5bdf30591ed7912867397806c9a0a61bb29db74686453810 SHA512 02d55d15283a6d611553dc22da537b4f6172f04d06eff932425eb01e86093a2f2cd7f36fc7820cf05f99063c1459e72222bd68274ed4d7883d6c97e06fec9918 WHIRLPOOL 37ef9436bbb1c460163ce3dcf4dd320d57500b84fee8836ca819340e64a7a25772299b043931b05e61d5d673d1914a742889f201f7e8c04ba282b186079d6800
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/pymad/metadata.xml b/dev-python/pymad/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/pymad/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pymad/pymad-0.6-r1.ebuild b/dev-python/pymad/pymad-0.6-r1.ebuild
new file mode 100644
index 000000000000..3fc1e7624ba2
--- /dev/null
+++ b/dev-python/pymad/pymad-0.6-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for libmad MP3 decoding in python"
+HOMEPAGE="http://www.spacepants.org/src/pymad/"
+SRC_URI="http://www.spacepants.org/src/pymad/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="media-libs/libmad"
+RDEPEND="${DEPEND}"
+
+python_configure_all() {
+	set -- "${PYTHON}" config_unix.py --prefix "${EPREFIX}/usr"
+	echo "${@}"
+	"${@}" || die "Configuration failed"
+}
diff --git a/dev-python/pymdstat/Manifest b/dev-python/pymdstat/Manifest
new file mode 100644
index 000000000000..c55e1c9219aa
--- /dev/null
+++ b/dev-python/pymdstat/Manifest
@@ -0,0 +1,4 @@
+DIST pymdstat-0.4.2.tar.gz 5010 SHA256 fef53c6f1864fdfe8616d6e985498b7f05ef19d0952f7ec3e7f8379298b9ada9 SHA512 2e3c07d59151069962e1ba601b3751b331e233fdc6bbdeb0cada69ce36a731c12bcc6447218cc0c1ae4dd63d39d2be2bc3677aba739797cc534c5e38d1c72458 WHIRLPOOL 781fbc8b2217ed1e36a798fd05cc9d309085b75a2f4d56cf280bba63626c1d65a1bed1200d07d891261821e1e0f4a0733f66ba3f53e626b6d8be6a1600d3f801
+EBUILD pymdstat-0.4.2.ebuild 618 SHA256 25718ab567af5d8a73fa14171befc352b9f4539b248dd4c3d1fd819ac4152365 SHA512 43822cb65d9058738fccb1d792af2e2566cbd6e560b9c3d46f0a6347bdc5c91030187a29b2db3730553d9262d8b7f3bf7ec860ea0307315ccc333ed4841f52d2 WHIRLPOOL 5814042245dcc8e5c5630b277025c0f898fb46147ebe7ce9ca9d6546fa7649752e58acaa14c11effcb5f32aa75d0b57f0b707e60b1d9e15f933a3b72869e3fad
+MISC ChangeLog 508 SHA256 e7d5bb3361945a8158639c25837c3e0b315055f1d2635978d20c65a087ef3ccd SHA512 5da9b2ac0673375a67c5a9a971ccc63e568f90fb139cb8c182a7135199bf5d65e79c238bc66a1a745c7a29d5fa020d3aff768829b632666c53dff2ce980cc18b WHIRLPOOL a9d3852ccdb885cd4e16482f87e0302aecec61af84caf14696afc3b126685b8a9e3a2277723b74d9f34ead3ddef5fd6f7ebda12eb3b63e949cc4e51263d4f75a
+MISC metadata.xml 511 SHA256 bfd7df55455ac21aacad70a66dc39b4c35a0014b9a3c93b1114537b4955824b4 SHA512 54862557fb9d9ec32f94086ba8df5dfb5f4e4e804f1ea280157418b46ff9ecdedee8b3e333ec2643b8a09d54c769d010514789c3bc75fa28c75623b732a088ac WHIRLPOOL 8d330cbde80d7fe88b1ef65780a2bfd26402263418de8b6797441d22f413f1b4662167d3e3ca1184a6b8ffed3a42d872c9c32744588aa9ace409330630e48038
diff --git a/dev-python/pymdstat/metadata.xml b/dev-python/pymdstat/metadata.xml
new file mode 100644
index 000000000000..d6b6f33633cb
--- /dev/null
+++ b/dev-python/pymdstat/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pymdstat</remote-id>
+    <maintainer status="unknown">
+      <email>nicolas@nicolargo.com</email>
+      <name>Nicolas Hennion</name>
+    </maintainer>
+    <remote-id type="github">nicolargo/pymdstat</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pymdstat/pymdstat-0.4.2.ebuild b/dev-python/pymdstat/pymdstat-0.4.2.ebuild
new file mode 100644
index 000000000000..baf1e1bd40ee
--- /dev/null
+++ b/dev-python/pymdstat/pymdstat-0.4.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to parse Linux /proc/mdstat"
+HOMEPAGE="https://github.com/nicolargo/pymdstat http://pypi.python.org/pypi/pymdstat"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Not included
+RESTRICT=test
+
+python_test() {
+	${PYTHON} unitest.py || die
+}
diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
new file mode 100644
index 000000000000..ec4dc1b94f48
--- /dev/null
+++ b/dev-python/pymediainfo/Manifest
@@ -0,0 +1,6 @@
+DIST pymediainfo-2.1.5.tar.gz 421120 SHA256 53616f5b87431d7fd0b4c7a2c2592c9071de923c5c0b167f1015905092a86915 SHA512 ef7891bb8e55e11e211f5d7a222176ffea013c4876b2a524ee02af6bcaa3cef272c11e7e39f12790de37f9bc95aa71af049727632092dbaa4c30ea3d149ddf70 WHIRLPOOL 6272df6e234655bc30fe8af811ad644d9062dd5a86837561885144f5a51c6ad931566b9e0fac073c89d99df6b8c82e282655fded66c056315dc10a0b4d30810a
+DIST pymediainfo-2.1.9.tar.gz 420111 SHA256 ca3620c3a99052a687c3b625fdddd27693512814808c7b923709bb397930eb0d SHA512 8bc3abe3146f57cb33b5a3bdd1d902a9ef82211b0755d70d9d33601c6eaeaf397b2dd2428edd72a1541cba3cad5f2a414fc1802cf2c5529ada747c9f3b8f280c WHIRLPOOL e6b220061892e064de7506be596023271c07e7d1d47fd093782123fd27e284a1cceed403b876910fca1f27a044d786c202126507d0de8df9d59ea42eef496435
+EBUILD pymediainfo-2.1.5.ebuild 832 SHA256 dd1ef3447ea10a34e20f993408b41b1ca83dc44746dcc805044300ac4bc2c13f SHA512 0a1efe9de256c389ca1614822442b50b99e87633866c4e9db457d82267b977c4b90a7db223deaba60e122121445feab19f75a20bcf9023c4a08c21d895a41c09 WHIRLPOOL 4abcac2c5305f5bd97d6edbe7ca35f9fab0847b30e125e59f99cd1a863fc76444ecd2e81931098a507b57f2575e6906615f63e823aee6c903ace38cec7e993fd
+EBUILD pymediainfo-2.1.9.ebuild 944 SHA256 58758d8a00548199b657b772a8271c8ea7362931193cf54ec57e4fca73b158ad SHA512 91e6da2e802621f787e07e7b5e9569a4d266b3ac8db7c5d33cdccd5cf890906a6de7c60db708c3fd5364402374d7546139ce2f08ab40cad19e8e59cd85e10478 WHIRLPOOL b3eab11a5ca56963bcbe2434669ad488aa7e167db17b59862292eb489891b0b6cc73b0bcb10af8044d0be39dbfabeafb2f025648d1ad51569a9e3e7b30f1d62f
+MISC ChangeLog 4109 SHA256 8a84f13c8dc94df2fe5d024579c24555827c597c6d7f92a4c413ac0392e61199 SHA512 ea2256bf0b0ad275599a812376f1e80d3665bcfe9733145e4643086f4a2627b432f1940e575476126c25baf20ed62a1dd81cad641b6d2db305ef258e3283eeae WHIRLPOOL f4e3350022c632f031d6c3ee1947a10b1a62ba9b08a0402d031e391250f1acb80f635bccb41e16db3d74f958003ca394631895c86fdaf3fb29ec8f25e9ecb3a0
+MISC metadata.xml 578 SHA256 449561dee6c1d1325613419465ddfce8d8f2f8590eacb092944105569dbaa039 SHA512 5ff33ef00e7b5ecaa5deaa6f5ef3913191786fb4af6bd9efdda0d0a19d4b48f07478a6d5df20b5d9a5abf22cb451d8faad130b8acf6bf45bca9f50dc82c309ca WHIRLPOOL 633bc00626d4b366addfce322a7c1de6d2a87ce80b0427b799bc9b8e24a7e30ec2427bcd0ae597cbb61842120373d902cac9ff6ec7079581407b82cc32335923
diff --git a/dev-python/pymediainfo/metadata.xml b/dev-python/pymediainfo/metadata.xml
new file mode 100644
index 000000000000..b60ae270951a
--- /dev/null
+++ b/dev-python/pymediainfo/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+	  <email>sautier.louis@gmail.com</email>
+	  <name>Louis Sautier</name>
+  </maintainer>
+  <maintainer type="project">
+	  <email>proxy-maint@gentoo.org</email>
+	  <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+	  <remote-id type="pypi">pymediainfo</remote-id>
+	  <remote-id type="github">sbraz/pymediainfo</remote-id>
+	  <bugs-to>https://github.com/sbraz/pymediainfo/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pymediainfo/pymediainfo-2.1.5.ebuild b/dev-python/pymediainfo/pymediainfo-2.1.5.ebuild
new file mode 100644
index 000000000000..85d6bb33e270
--- /dev/null
+++ b/dev-python/pymediainfo/pymediainfo-2.1.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around the mediainfo library"
+HOMEPAGE="https://github.com/sbraz/pymediainfo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="media-libs/libmediainfo"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	nosetests tests || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pymediainfo/pymediainfo-2.1.9.ebuild b/dev-python/pymediainfo/pymediainfo-2.1.9.ebuild
new file mode 100644
index 000000000000..6846d34175cf
--- /dev/null
+++ b/dev-python/pymediainfo/pymediainfo-2.1.9.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around the mediainfo library"
+HOMEPAGE="https://github.com/sbraz/pymediainfo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="media-libs/libmediainfo"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	# requires network access
+	py.test tests/test.py -k "not MediaInfoURLTest" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pymetar/Manifest b/dev-python/pymetar/Manifest
new file mode 100644
index 000000000000..3eb51c41f987
--- /dev/null
+++ b/dev-python/pymetar/Manifest
@@ -0,0 +1,6 @@
+AUX setup_pymetar-0.21.patch 418 SHA256 b17e81744011551aab615f7a483400b455759e805192052728e2d11233ef3a25 SHA512 d7fa72eda9798512bdf1e3464123a4b0934a4b04ebb6e954048a0763e7ac7d20cbbbd2f0734a735b7032d9a58167b640f7355bfa3fc986d52dbefe9635e2154d WHIRLPOOL 2ccaca224eb0a04df052746cfaa36e50f1bb9f04937f2a1a989a71ccc1b92ad421427c760789ceb457041a2f4a697e490214c1a39ffc2e4ae33122e7ba46a225
+DIST pymetar-0.21.tar.gz 22714 SHA256 331978d9c54d49948e3817a782b857f247db6c279b8bb5bebd4f5b1a4bb503ea SHA512 6c9e9e7906fe6fb327c667408d04992ca898d0d6037fe1bce08bc15ded59bcda670094da99e84b553c06c8cf991f33c6b3b7b41a9fbd47ba4c48dd4db1d8a2c0 WHIRLPOOL a48985480b82d66ee3092e0a1843d5ab55e37dbb9a64c56c55657533ea59b4433b251c7e77b7ee4e489e232b6edd33336fe16ab7b1e3bcbc27414b1099177c94
+EBUILD pymetar-0.21.ebuild 547 SHA256 3219bcb5732aaa05175ca7c15cd0aafdf300b78102cea2c632986370dbb0c95c SHA512 19c59c5769ecfd1562e109add1ffc09494488d103bbc7adf04b004632034f231ec9d93909d65a06881904e5d7eda445dd68590fd23c18bcdfdf50845bc67b70d WHIRLPOOL e3b8b90345e1aba14d292ac591895a4a99559ac2747185f8b240a20a3dae8e6eaf90a4cfea1666c46bbbdec3525a54865437f331c0a1de1a05fefbd006480855
+MISC ChangeLog 2978 SHA256 4eb84b778dd70b32d440e1b2c6f0a38e9bb71b79c6dd1321db9fc32a66110f18 SHA512 e3b37862f9876d9ee4962bdcd49afc82cd438068611d4b67e1ebdb157d352fbf89a5e96096c60a49ae744dd3bd5e2735999d32af2ee1087772a9c89d8f6ff124 WHIRLPOOL 960fa556dee0fb5bb043797ac4d158be8fd0bfd238bee3feeeb006e6b637c143c7b64810ed803c38f9519e57b4d4fd9d98d897b2bfff725cc382285d77641ed8
+MISC ChangeLog-2015 3414 SHA256 db123271d69e0c0361e47115ddeee1fd0173f2d04ef82fc9c1d96fc8e0f19f32 SHA512 519d403407f3acad45b2cfe85f8d023c70be5c670cdb492cd202526847213e381c3153f265f453e4174076e02426724d08415f166888679d650fc3b74fcaf5c2 WHIRLPOOL dc3a7181c7b81e335e0c26573bedc262d05304e7ba67028805007cc17937466e83c017d23d8e17b8a39485f7af64099a2ffb1f9ef8394fcad95af0c3cc0fceff
+MISC metadata.xml 959 SHA256 35141815d4d29de07550fecccaab75f5df09dc41b36ed96f8bc572fc47edb1cd SHA512 de0134cfbc608c80cccfd3029faf769fa6e8fae8c3df9ed2bb7afb6231f6d68c68a6bc97fd690987b552aa026c40358e3dbd70d8a8df2633f4c6368ca7651143 WHIRLPOOL acefc090ee157a275dd342eae3b7cc51d89aedd88125273d14578eb239bb1536a0819c6d7da2ba21549ca21e1f939eef702afa235b2084083426924ade7e7813
diff --git a/dev-python/pymetar/files/setup_pymetar-0.21.patch b/dev-python/pymetar/files/setup_pymetar-0.21.patch
new file mode 100644
index 000000000000..6b96d26add6a
--- /dev/null
+++ b/dev-python/pymetar/files/setup_pymetar-0.21.patch
@@ -0,0 +1,10 @@
+--- setup.py.orig	2016-08-24 16:21:38.558828272 +0200
++++ setup.py	2016-08-24 16:22:16.619289653 +0200
+@@ -27,6 +27,6 @@
+       py_modules=["pymetar"],
+       scripts=["bin/pymetar"],
+       data_files=[("share/doc/pymetar-%s" % pymetar.__version__,
+-                   ['README', 'COPYING', 'THANKS', 'librarydoc.txt']),
++                   ['README']),
+                   ("share/man/man1", ['pymetar.1'])]
+       )
diff --git a/dev-python/pymetar/metadata.xml b/dev-python/pymetar/metadata.xml
new file mode 100644
index 000000000000..55440a29c549
--- /dev/null
+++ b/dev-python/pymetar/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<longdescription>
+This library downloads the weather report for a given station
+ID (get yours from http://www.nws.noaa.gov/tg/siteloc.shtml),
+decodes it and provides easy access to all the data found in the
+report. Documentation and a small example app are inside the tarball.
+</longdescription>
+<longdescription lang="ja">
+��ライブラリ�指定��ステーションID( http://www.nws.noaa.gov/tg/siteloc.shtml �入手)�ら天気予報�果をダウンロード��解読��予報データ�ら検索�る��簡�
+�アクセス手段を�供���。ドキュメンテーション��純�サンプル・アプリケーショ
+ン�tarballファイル�中��。
+</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pymetar/pymetar-0.21.ebuild b/dev-python/pymetar/pymetar-0.21.ebuild
new file mode 100644
index 000000000000..9370c8024127
--- /dev/null
+++ b/dev-python/pymetar/pymetar-0.21.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Downloads, decodes and provides access to the weather report for a given station ID"
+HOMEPAGE="http://www.schwarzvogel.de/software-pymetar.shtml"
+SRC_URI="http://www.schwarzvogel.de/pkgs/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+DOCS="librarydoc.txt"
+
+PATCHES=( "${FILESDIR}"/setup_pymetar-0.21.patch )
diff --git a/dev-python/pyminuit/Manifest b/dev-python/pyminuit/Manifest
new file mode 100644
index 000000000000..fca236441feb
--- /dev/null
+++ b/dev-python/pyminuit/Manifest
@@ -0,0 +1,6 @@
+DIST Minuit-1_7_9-patch1.tar.gz 430753 SHA256 3c223b0d145484bd8bff202f6c18efb974218130fa1ca49389db512d02bd58e4 SHA512 741ded2e6e999e8edf1e067ce9c2583784f6c1a7e34709430074d1f312de3a5815249466fe0a1c5be0a2f77932f34cbdb4bd1eb9de1b3528223711f26cbc65b9 WHIRLPOOL a6103d209cb8b97202346acd7ef0fdb37a0eb3a94658e6130ff8013448c5d56730ee3d8985c59f406cbd18e0fbb4586b443fe93a4b3c95bc0e0c9621cd5a09ee
+DIST pyminuit-1.2.1.tgz 17099 SHA256 d065f7f57a524ec322cb95252a6ed6e8056148f0d34fd90ae2bfc1259ac4d4ea SHA512 b5bd954288d57a6c043e336ddb62a42cd4e6cc340847fbd700573db288c4404ef80a86a76b3c4e458913cd73b08ea97b20a4e411043a6ce826d9d88ee54fbe1f WHIRLPOOL 28e84ddd1125e76365cb204079281f184e89ed8033b8535c399ac422c5f02a4c7dc2ac34c488fa8a86557d3bab44b3d4ca72c00890c89fc91adb2f5275c0e6a7
+EBUILD pyminuit-1.2.1-r1.ebuild 817 SHA256 82acccdb58ea48ff98396d1a9f38905f4ea986ba2abb79ff37d53803adb9007e SHA512 826502cbe28d107bbe5dda5fb1dd2bd57732e9144a9f6de608483e6b758258be7084e4acaa66b34b16c36e48cb66183c76e98d38dd76a967641b08742869a649 WHIRLPOOL fa243b8c0228667d2bf07ae106b0baa0e021faba270e11f33908b1d260102ee44078c5d79bdec22fc23fa6646491f10960c535c80bf3d3dc212265852cd23980
+MISC ChangeLog 3207 SHA256 725485942812a93c288c7c4713d0044794b339c913baba175e5410da54188233 SHA512 bfd1e782050f3307b97b6617d51e08b2febdfaf787701fcb6f7f152b8c67f958fdd93f9b9738a0559a9618ad906ab85d1ef53b9c9010473dae2d18da518e55cc WHIRLPOOL 9c2add5189b10ebe6c15bbc3425240ab4ec5d3f0f1f7e7d5f8221af857bd819f5656ab95db49060dc231e1e22758f886f60de7a7de4a486152b78dadf9a9c7b7
+MISC ChangeLog-2015 479 SHA256 35c148d41e2dfe5cb5b386f4317e1f0be5e16c130c4c037e8bc1b8093c35051d SHA512 743256d03e2521c845a0f8b1b9198d9bfab62cd35855fb446fef6346ad5a84ed815ac317499e3f48f0eec7a912e8eeb64f17e1fc67af39f7b168c3735ee16d6f WHIRLPOOL 9dc397e4baf4088d587df5f8fc0bc3a549190c5dca64b91a1da7bccb2dba929b5b2f3fc361a22227da28723212c2459323e3438081d0a48aa1ca12a301a31e3d
+MISC metadata.xml 333 SHA256 9fedefa3da18d5c3b42183eaa46b689751c967ccec8deff13971d56eae4b32d3 SHA512 46169e56ebe63dbd8f7234dd06f9bd7b36f2325ca5c145207b638fde9805bb2d9361f070599aaabe69ed127df3ac419fefd6b10a98e9efe03afcd72aba2eab2d WHIRLPOOL a1dd5ba566a5df86388b39fd91a6593f6394b196d9ba6f0bf18668300bf9fb94bec9a3562d786496b05ec9867d36d9d1f6b83a32fe93346bca51463de60a3e95
diff --git a/dev-python/pyminuit/metadata.xml b/dev-python/pyminuit/metadata.xml
new file mode 100644
index 000000000000..ab211f004c18
--- /dev/null
+++ b/dev-python/pyminuit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jpivarski/pyminuit</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild b/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..fe299de2db48
--- /dev/null
+++ b/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Minuit numerical function minimization in Python"
+HOMEPAGE="https://github.com/jpivarski/pyminuit"
+SRC_URI="
+	https://pyminuit.googlecode.com/files/${P}.tgz
+	https://pyminuit.googlecode.com/files/Minuit-1_7_9-patch1.tar.gz
+	"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}"/${PN}
+
+src_configure() {
+	cd "${WORKDIR}"/Minuit-1_7_9 && econf --disable-static || die
+}
+src_compile() {
+	cd "${WORKDIR}"/Minuit-1_7_9 && emake
+	cd "${S}"
+	distutils-r1_src_compile
+}
+
+python_install_all() {
+	cd "${WORKDIR}"/Minuit-1_7_9 || die
+	default
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyml/Manifest b/dev-python/pyml/Manifest
new file mode 100644
index 000000000000..f3773439db56
--- /dev/null
+++ b/dev-python/pyml/Manifest
@@ -0,0 +1,7 @@
+DIST PyML-0.7.13.2.tar.gz 5880930 SHA256 daec23fb3293d8d00efcbb64464676c196807a81a959e6adac5aceb08b15503b SHA512 8a642cfc8744098e145cf6940c606f53034c3a04aa9665e23bfd30bbd4098bcceaf10508ea9c3b3be40f1b9d964aea793c7e20d4b48eb66656b5fd6b200fca5c WHIRLPOOL 9adbf1b4a75627bf10e93fcea93b9ab60a128a0ec3523fdd3f9ff1a58b8df1a1501617b4684dd56a04c518bbecb13a34b48d41c529057c17477f665f09612879
+DIST PyML-0.7.13.3.tar.gz 5896911 SHA256 607c722d7ca309aa382ba1fc1c8580de11fa3ee4659aee11d4c2d2873fad6f77 SHA512 9933be07122e6fc7ece017b28fbc895cd2ef2778d8d5144c7f084ddd2090e054e37a581341371450fd7c28713ed4c725e229a81daad571150f476945750a51ae WHIRLPOOL f21ce9fe10dffdde92585750f3de4c33f14f5f67638590ffd92df909654c8224aa1d5ca1bbeaf1b529ceab94d595fe188439547a9f7478a94b332f9315a3cdd5
+EBUILD pyml-0.7.13.2-r1.ebuild 780 SHA256 6662b3139f2fe24f91d052abe07031ad23f0aca64cdd87df3c7ce7936b7440d6 SHA512 6883925d901ce3fa38b53b673894dc7ec9f239d94cb4f0cf218293fe29175733bd3b087af7c498766de51eb8512cd95e309051e9428e3a9013c6e3674b18f680 WHIRLPOOL da967c7cf1ebf3c2a3f2772a2705d61d0a2b55201ea41906eae2411b278c6af486326a5ac9a8d9de47ede32a91111877c246aae7421e09e4b95a8393fe20c4d5
+EBUILD pyml-0.7.13.3.ebuild 780 SHA256 6662b3139f2fe24f91d052abe07031ad23f0aca64cdd87df3c7ce7936b7440d6 SHA512 6883925d901ce3fa38b53b673894dc7ec9f239d94cb4f0cf218293fe29175733bd3b087af7c498766de51eb8512cd95e309051e9428e3a9013c6e3674b18f680 WHIRLPOOL da967c7cf1ebf3c2a3f2772a2705d61d0a2b55201ea41906eae2411b278c6af486326a5ac9a8d9de47ede32a91111877c246aae7421e09e4b95a8393fe20c4d5
+MISC ChangeLog 2484 SHA256 7e87d3aa68a0f0332c98e657d73a5322131a00b96ead63fe08442cd6528956c0 SHA512 7ac9cb3e40ccae03f82718fc5cbbee2547d84a16ce0e787c9a4729a038d025ecaa3e7eddf2eb13827de7f9b9a4af10705e83adebe46962b58685402aced5d60e WHIRLPOOL 3f153d0cc388d0bcf2700e4797ecffb75e7854999dd38bf257d56a79406c1b5fdac8aa8d56244c3b0ac9f9646bd49dbbae26bf3f213d6a19b28bf5771f6a42d9
+MISC ChangeLog-2015 1220 SHA256 f517f706ca8f4249d4ae3d5de6aa826743d54596933e919a1b5669a4789ddc08 SHA512 7190b49d60028c901fdf8bffb3d43152c917cb5fa887eb29e2948de0f8fdbad4dfdf69c07ec19592b4b3ed59a82dd7082f0570f785acd4e885bcc7031e7d52a4 WHIRLPOOL 8ea5fce57fa54fc5b63874e122e2864e5114f5b41784bb740917a04675f455e2a64722358de2952a5808ec785f85b946a3dd60e9b5b0ae8e181064ac6b03b62f
+MISC metadata.xml 497 SHA256 dd2697c79072cdf19f5753ee8032535e2c63c4ee8d89a534f39d7f8138884177 SHA512 35cea4e5927fbf8e7f66bdddd1946a3762762a7c8251eb66b0a307312911f472df3290929e8cc20bdb981769845ad54c59b61de6aedccd36b56bd2af01a7eecc WHIRLPOOL e98f72753fb37b913adb39581959402fb7102293d457695fe58c46edfcdb764b1ff86040cf1ec7de5c4f547c8f395d294ef8528379fe2095ec1df0fa83bc34b3
diff --git a/dev-python/pyml/metadata.xml b/dev-python/pyml/metadata.xml
new file mode 100644
index 000000000000..30397520ba44
--- /dev/null
+++ b/dev-python/pyml/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">
+  PyML is a flexible Python framework for using various classification
+  methods including Support Vector Machines (SVM).
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">pyml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyml/pyml-0.7.13.2-r1.ebuild b/dev-python/pyml/pyml-0.7.13.2-r1.ebuild
new file mode 100644
index 000000000000..04dbc22b1f09
--- /dev/null
+++ b/dev-python/pyml/pyml-0.7.13.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MYP=PyML-${PV}
+
+DESCRIPTION="Python machine learning package"
+HOMEPAGE="http://pyml.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MYP}"
+
+python_test() {
+	pushd data > /dev/null
+		"${PYTHON}" -c "from PyML.demo import pyml_test; pyml_test.test('svm')" || die "tests failed"
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && dodoc doc/tutorial.pdf && dohtml -r doc/autodoc/*
+}
diff --git a/dev-python/pyml/pyml-0.7.13.3.ebuild b/dev-python/pyml/pyml-0.7.13.3.ebuild
new file mode 100644
index 000000000000..04dbc22b1f09
--- /dev/null
+++ b/dev-python/pyml/pyml-0.7.13.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MYP=PyML-${PV}
+
+DESCRIPTION="Python machine learning package"
+HOMEPAGE="http://pyml.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MYP}"
+
+python_test() {
+	pushd data > /dev/null
+		"${PYTHON}" -c "from PyML.demo import pyml_test; pyml_test.test('svm')" || die "tests failed"
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && dodoc doc/tutorial.pdf && dohtml -r doc/autodoc/*
+}
diff --git a/dev-python/pymoc/Manifest b/dev-python/pymoc/Manifest
new file mode 100644
index 000000000000..bb2cbddf2605
--- /dev/null
+++ b/dev-python/pymoc/Manifest
@@ -0,0 +1,3 @@
+DIST pymoc-0.5.0.tar.gz 33843 SHA256 08fd88df8c4013803c8c26b2183816e087c500e1d3b6172fed4d98a48269a8ba SHA512 cb327bed6fffa6eb4354c06f9b7e056baa9df1010d722b4fade6873fb862c4b27ea0a11647a510ce4007f7b8158e13eee7e146258d4c58ecee82adddf33bf89c WHIRLPOOL 17d56de5ddc63279d597f3a436a8f3a030cc696fb1495ce3cc9ee93c10a7a60aef1dcf77888514308c64945ec76ef7b38f11715606b512c80f3106b16897e0c1
+EBUILD pymoc-0.5.0.ebuild 688 SHA256 965904893940ae4e8477ab1a50aded26370435da77b94a6edd90623d0d840e9f SHA512 f1b6df1c84f858d7d701b79c1dea2f9f929cadb533b0eec1b4f79c9c8dd246b25f80d17200ccf171a004f7436d136ad8e9ae4998896732df01364370342893a4 WHIRLPOOL 8be8eddad9fb4ca7334916d0492b6d1fe2cc72550c92bd27d73cbb0b5644d308760391a8f6827c462ff8fe4095bf5c717dc5dfefd025fe201cf71a381dc24897
+MISC metadata.xml 1614 SHA256 834fcad4f12d4d075d528ae4f98b3883fb2fdf95c69c0f2e5b239fd1d2725a33 SHA512 5ea8168faa544523fe9f5ddc20e978ba09005fb94e6ac9ca5dbabb50c14fbd9bd3485e9a46960414cb791e9b761b8a9d88990dcbcbb78758b59a178f8ce96622 WHIRLPOOL 16cbfe3d0a4dcbb04ca874d674aa192b70f0bad9ac1e5e5faa2630ed3c0bc9d4e06bd2ab5ea2501b31ddca609641c653817c4aa68cbaed001025049f02850891
diff --git a/dev-python/pymoc/metadata.xml b/dev-python/pymoc/metadata.xml
new file mode 100644
index 000000000000..0539850fc0b0
--- /dev/null
+++ b/dev-python/pymoc/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Frequently astronomical survey catalogues or images are sparse and
+    cover only a small part of the sky.  In a Multi-Order Coverage map
+    the extent of data in a particular dataset is cached as a
+    pre-calculated mask image.  The hierarchical nature enables fast
+    boolean operations in image space, without needing to perform complex
+    geometrical calculations.  Services such as VizieR generally offer the
+    MOC masks, allowing a faster experience in graphical applications
+    such as Aladin, or for researchers quickly needing to locate which
+    datasets may contain overlapping coverage.
+
+    The MOC mask image itself is tessellated and stored in NASA HealPix
+    format, encoded inside a FITS image container.  Using the HealPix
+    (Hierarchical Equal Area isoLatitude Pixelization) tessellation
+    method ensures that more precision (pixels) in the mask are available
+    when describing complex shapes such as approximating survey or
+    polygon edges, while only needing to store a single big cell/pixel
+    when an coverage is either completely inside, or outside of the mask.
+    Catalogues can be rendered on the mask as circles.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">pymoc</remote-id>
+    <remote-id type="github">grahambell/pymoc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pymoc/pymoc-0.5.0.ebuild b/dev-python/pymoc/pymoc-0.5.0.ebuild
new file mode 100644
index 000000000000..98bed1677f21
--- /dev/null
+++ b/dev-python/pymoc/pymoc-0.5.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Python Multi-Order Coverage maps for Virtual Observatory"
+HOMEPAGE="https://pymoc.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/healpy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	PYTHONPATH=lib "${PYTHON}" -m unittest discover -s test || die
+}
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
new file mode 100644
index 000000000000..ae1373eebda1
--- /dev/null
+++ b/dev-python/pymongo/Manifest
@@ -0,0 +1,11 @@
+DIST pymongo-2.7.2.tar.gz 381455 SHA256 8fb45e3edec006f4b11580fc579bec7781a8b3201ce0abf31593f086070e51f6 SHA512 0e78495462d670c168e716a7c34e05f6a11a203f0bf9b32c1488608343588a48cbbb76ce715411b310359de19d9cd57c75f80ac7d8195a122a760cec22e8d0c7 WHIRLPOOL 6cb7eedc530908c2fdb17b6e31561d9c860d6fd1edddb4d66288c3fe11bc199ebc58538a70508b2540b827077f62345a86729644fdf8d37c1b9934de03e77543
+DIST pymongo-2.9.3.tar.gz 433339 SHA256 1a3a75e4998a6b69d9f94c1dbac13116aee90a3f26d02f02fc0289f9e8b332c8 SHA512 7b0c46ef1ca27e8c4d99d00c764aa1ce7775503d5210513ca848215fe0be847871c6d62d14f365474606b4abfdb7d1967d3f393e545cdca8929f7fa6a497c32f WHIRLPOOL 84f6041211022326522f16e02313afbd4763f756a89d12e00714718113926ba32d3b384a22b474fe571a30b23ef49c9c1bf5f9faceb9f3d7293fd795475b5ffe
+DIST pymongo-3.4.0.tar.gz 583303 SHA256 d359349c6c9ff9f482805f89e66e476846317dc7b1eea979d7da9c0857ee2721 SHA512 c59dcc08803f23134aa4a86605fab0f5c59b829325b632fc1e0149f20018a544b3d65f3c1fda6066248cd258715339b1771ca8d40c38be02c301f5b6421abd1b WHIRLPOOL c57dfa17ed0940d2ef956c2ae3dca91375b9f7fcc4e78ba3d809d838285f433141bbf8cd0a46498f1c8332e9731f6f06a40c89ba69568abe51c65c59ef03ac11
+DIST pymongo-3.5.1.tar.gz 1332463 SHA256 e820d93414f3bec1fa456c84afbd4af1b43ff41366321619db74e6bc065d6924 SHA512 67526bcc27233b85226d7ef6aacce6dfb848efc88730fb8207c3b610f3943ac813f6c2842b7e514d733a65a2b7ea4f255574732e42372551b1b333e3437fd82f WHIRLPOOL 07793cda79cfc9b8067fb7f7a491e89f757d7d0672a4b049ea94ffc2a00e39f7d08fef0872553a53da0d0034020a5b45950cf7f584ff963bb11a684fabdd5237
+EBUILD pymongo-2.7.2.ebuild 2786 SHA256 0aedf27c56737fc2b0bb56e3f0527457a0e957a8a112e31f9f8aeade92395ec2 SHA512 b15aaf5a063d4525c5c7039fd875336aeb86d9a859ad71de2a95b65c73e572218aac9b1967c0cb6b8e7f6bc6a56f53c12c62abd669a5705b960ba2bec89a3c71 WHIRLPOOL f5b1c2eff04394df1568ce023449bfa0f957501b9c63d9285e93ee40867092285277666ef3a4afd1eca55fc45fac70f3203df8b79afd5be73be3227db9e70583
+EBUILD pymongo-2.9.3.ebuild 2982 SHA256 787bd51ea7d0e51cf534a1d3be170ecac53025caf3811f8d69c5ade54a05a7f6 SHA512 d10266fcc7e39e55f1bfccb913cee46c4ecf71a36669b4716c7d776786b27d6574fb101a027546f5996abb8238f4a2ad98ae7d21fb02d729e77678434ad50457 WHIRLPOOL 24cf3071accd143bf7d4e14933114b164fa30d11b0d3d863c6ee30fbd17b0d534384df522785c1b0f38f2406cbdb2d51b14991e8c055b079381ee25ae222e6db
+EBUILD pymongo-3.4.0.ebuild 2786 SHA256 74a53af982dd17b2466ce8c715d9ceb092ca92f886b0253112129e85784a1441 SHA512 de374b5dcf5e511f45afb4d47ec6953702e0c19fae4636b0760d327ed24e9c03dd02f25af0f6125d666ba8d492875e3ecd98067f4b14a58716e72b4f3bb9f27e WHIRLPOOL 2bb5023f97e054fdfbe8d8fa1c2a1f062e97b6857b46b40da810a10081c216df842e57d66c728a948de8c619a9852aa48fd6bc8abf8bb3f9c3bc8d1066b5a3e4
+EBUILD pymongo-3.5.1.ebuild 2788 SHA256 7cc2450b40217290fbcd39f45eb3e0c990d9a9188cbfe7bb5e92c5de79520860 SHA512 0fa45a241bcd7662e90df0e77c97adfc7b301e6193f64a33a37eebc723fda8aefe6b484118627ae5b98fbe4fa514a9000ccdf6e04da70c921ed653364da1d4c9 WHIRLPOOL ada909c294b496104ec79863a0de86e345ca07a593a221390103ddde15f373b815324718293a5e0e455d77a3abd047f8a67e3b72d54e404198fea1abbfc6ec9c
+MISC ChangeLog 6343 SHA256 ac4605bced7d05dcf5e6671e81773a04c1fcbfc80724c6a9fdf4ad70a6ad46c6 SHA512 c8ebc478f2348f9cb74da4d020af5f5ff8d7d879f1ff3099f87f1eee5c2e8ff02d04ad76c7bc8151f245746aeae86006410e5dcf00b6d7564280b77f90ed40d7 WHIRLPOOL f1d0b8c6f9a2cd2831c9fcaa21e0f2ddd501f069f299562a46245ec69566da285ece4581b7be8726a933f51d4508a7ef702faf798d9e9864857debc96ae732ae
+MISC ChangeLog-2015 8058 SHA256 4013565930e1e46baa14d2f43b8c50ad14826fd00d1ddabc0e70e19e57d1879e SHA512 15cd1780527bd3f0fa9eef5600eab868d94d940d17cce2a407dac28a602fa4743db82ef0f00dafe534ea05992b75d70f590e0342164ba224539edd4f734fdd92 WHIRLPOOL ed73cedf370d82801be6ee2004ab1bd4067b59f421db85434dcca0e6f039d4f100be39f956f3041d9bffc99ea783bf207762c8b7b60b5bc1c9ba33435150efd9
+MISC metadata.xml 949 SHA256 75444636bc2482663e1cd27cc65b7913c4ba43003e70ebe72a50db9ab6a5c1f4 SHA512 8684aa443f14bdccb557005a8156ff769075c96ab61a6f2b6d476bf3b43396df80bcc9b8cc08a1d784fd74e45eaf38983c62d011d6c75486a44da24751a36fde WHIRLPOOL 033dabd8384e73a978925ae4d9e056a2ba2844023fda388cecb2e5d06181020c7b7d35604b35c53d2f26005ca254b327906dc4282df37b37c8e1e9ca9ea84c2d
diff --git a/dev-python/pymongo/metadata.xml b/dev-python/pymongo/metadata.xml
new file mode 100644
index 000000000000..64db28e6758f
--- /dev/null
+++ b/dev-python/pymongo/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>julien@thebault.co</email>
+		<name>Lujeni</name>
+		<description>Proxy-Maintainer, assign bugs</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>ultrabug@gentoo.org</email>
+		<name>Alexys Jacob</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">PyMongo is a Python distribution containing tools 
+	for working with MongoDB, and is the recommended way to work 
+	with MongoDB from Python.</longdescription>
+	<upstream>
+		<remote-id type="pypi">pymongo</remote-id>
+		<remote-id type="github">mongodb/mongo-python-driver</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pymongo/pymongo-2.7.2.ebuild b/dev-python/pymongo/pymongo-2.7.2.ebuild
new file mode 100644
index 000000000000..9c988e9fbb5a
--- /dev/null
+++ b/dev-python/pymongo/pymongo-2.7.2.ebuild
@@ -0,0 +1,120 @@
+# 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 )
+
+inherit check-reqs distutils-r1
+
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~hppa x86"
+IUSE="doc kerberos test"
+
+RDEPEND="
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-db/mongodb-2.6.0
+	)
+"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+reqcheck() {
+	if use test; then
+		# During the tests, database size reaches 1.5G.
+		local CHECKREQS_DISK_BUILD=1536M
+
+		check-reqs_${1}
+	fi
+}
+
+pkg_pretend() {
+	reqcheck pkg_pretend
+}
+
+pkg_setup() {
+	reqcheck pkg_setup
+}
+
+python_compile_all() {
+	if use doc; then
+		mkdir html || die
+		sphinx-build doc html || die
+	fi
+}
+
+python_test() {
+	# Yes, we need TCP/IP for that...
+	local DB_IP=127.0.0.1
+	local DB_PORT=27000
+
+	export DB_IP DB_PORT
+
+	local dbpath=${TMPDIR}/mongo.db
+	local logpath=${TMPDIR}/mongod.log
+
+	# Now, the hard part: we need to find a free port for mongod.
+	# We're just trying to run it random port numbers and check the log
+	# for bind errors. It shall be noted that 'mongod --fork' does not
+	# return failure when it fails to bind.
+
+	mkdir -p "${dbpath}" || die
+	while true; do
+		ebegin "Trying to start mongod on port ${DB_PORT}"
+
+		LC_ALL=C \
+		mongod --dbpath "${dbpath}" --smallfiles --nojournal \
+			--bind_ip ${DB_IP} --port ${DB_PORT} \
+			--unixSocketPrefix "${TMPDIR}" \
+			--logpath "${logpath}" --fork \
+		&& sleep 2
+
+		# Now we need to check if the server actually started...
+		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+			# yay!
+			eend 0
+			break
+		elif grep -q 'Address already in use' "${logpath}"; then
+			# ay, someone took our port!
+			eend 1
+			: $(( DB_PORT += 1 ))
+			continue
+		else
+			eend 1
+			eerror "Unable to start mongod for tests. See the server log:"
+			eerror "	${logpath}"
+			die "Unable to start mongod for tests."
+		fi
+	done
+
+	local failed
+	#https://jira.mongodb.org/browse/PYTHON-521, py2.[6-7] has intermittent failure with gevent
+	pushd "${BUILD_DIR}"/../ > /dev/null
+	if [[ "${EPYTHON}" == python3* ]]; then
+		2to3 --no-diffs -w test
+	fi
+	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
+
+	mongod --dbpath "${dbpath}" --shutdown || die
+
+	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+	rm -rf "${dbpath}" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pymongo/pymongo-2.9.3.ebuild b/dev-python/pymongo/pymongo-2.9.3.ebuild
new file mode 100644
index 000000000000..8f425e213ac0
--- /dev/null
+++ b/dev-python/pymongo/pymongo-2.9.3.ebuild
@@ -0,0 +1,133 @@
+# 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 )
+
+inherit check-reqs distutils-r1
+
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="doc kerberos test"
+
+RDEPEND="
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-db/mongodb-2.6.0
+	)
+"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+reqcheck() {
+	if use test; then
+		# During the tests, database size reaches 1.5G.
+		local CHECKREQS_DISK_BUILD=1536M
+
+		check-reqs_${1}
+	fi
+}
+
+pkg_pretend() {
+	reqcheck pkg_pretend
+}
+
+pkg_setup() {
+	reqcheck pkg_setup
+}
+
+python_compile_docs() {
+	if use doc; then
+		python_setup 'python2*'
+		mkdir html || die
+		sphinx-build doc html || die
+	fi
+}
+
+python_install_docs() {
+	if use doc; then
+		python_setup 'python2*'
+		local HTML_DOCS=( html/. )
+		einstalldocs
+	fi
+}
+
+python_test() {
+	# Yes, we need TCP/IP for that...
+	local DB_IP=127.0.0.1
+	local DB_PORT=27000
+
+	export DB_IP DB_PORT
+
+	local dbpath=${TMPDIR}/mongo.db
+	local logpath=${TMPDIR}/mongod.log
+
+	# Now, the hard part: we need to find a free port for mongod.
+	# We're just trying to run it random port numbers and check the log
+	# for bind errors. It shall be noted that 'mongod --fork' does not
+	# return failure when it fails to bind.
+
+	mkdir -p "${dbpath}" || die
+	while true; do
+		ebegin "Trying to start mongod on port ${DB_PORT}"
+
+		LC_ALL=C \
+		mongod --dbpath "${dbpath}" --smallfiles --nojournal \
+			--bind_ip ${DB_IP} --port ${DB_PORT} \
+			--unixSocketPrefix "${TMPDIR}" \
+			--logpath "${logpath}" --fork \
+		&& sleep 2
+
+		# Now we need to check if the server actually started...
+		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+			# yay!
+			eend 0
+			break
+		elif grep -q 'Address already in use' "${logpath}"; then
+			# ay, someone took our port!
+			eend 1
+			: $(( DB_PORT += 1 ))
+			continue
+		else
+			eend 1
+			eerror "Unable to start mongod for tests. See the server log:"
+			eerror "	${logpath}"
+			die "Unable to start mongod for tests."
+		fi
+	done
+
+	local failed
+	#https://jira.mongodb.org/browse/PYTHON-521, py2.[6-7] has intermittent failure with gevent
+	pushd "${BUILD_DIR}"/../ > /dev/null
+	if [[ "${EPYTHON}" == python3* ]]; then
+		2to3 --no-diffs -w test
+	fi
+	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
+
+	mongod --dbpath "${dbpath}" --shutdown || die
+
+	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+	rm -rf "${dbpath}" || die
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	python_compile_docs
+}
+
+src_install() {
+	distutils-r1_src_install
+	python_install_docs
+}
diff --git a/dev-python/pymongo/pymongo-3.4.0.ebuild b/dev-python/pymongo/pymongo-3.4.0.ebuild
new file mode 100644
index 000000000000..34dcb88ed5f9
--- /dev/null
+++ b/dev-python/pymongo/pymongo-3.4.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit check-reqs distutils-r1
+
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~hppa x86"
+IUSE="doc kerberos test"
+
+RDEPEND="
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-db/mongodb-2.6.0
+	)
+"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+reqcheck() {
+	if use test; then
+		# During the tests, database size reaches 1.5G.
+		local CHECKREQS_DISK_BUILD=1536M
+
+		check-reqs_${1}
+	fi
+}
+
+pkg_pretend() {
+	reqcheck pkg_pretend
+}
+
+pkg_setup() {
+	reqcheck pkg_setup
+}
+
+python_compile_all() {
+	if use doc; then
+		mkdir html || die
+		sphinx-build doc html || die
+	fi
+}
+
+python_test() {
+	# Yes, we need TCP/IP for that...
+	local DB_IP=127.0.0.1
+	local DB_PORT=27000
+
+	export DB_IP DB_PORT
+
+	local dbpath=${TMPDIR}/mongo.db
+	local logpath=${TMPDIR}/mongod.log
+
+	# Now, the hard part: we need to find a free port for mongod.
+	# We're just trying to run it random port numbers and check the log
+	# for bind errors. It shall be noted that 'mongod --fork' does not
+	# return failure when it fails to bind.
+
+	mkdir -p "${dbpath}" || die
+	while true; do
+		ebegin "Trying to start mongod on port ${DB_PORT}"
+
+		LC_ALL=C \
+		mongod --dbpath "${dbpath}" --smallfiles --nojournal \
+			--bind_ip ${DB_IP} --port ${DB_PORT} \
+			--unixSocketPrefix "${TMPDIR}" \
+			--logpath "${logpath}" --fork \
+		&& sleep 2
+
+		# Now we need to check if the server actually started...
+		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+			# yay!
+			eend 0
+			break
+		elif grep -q 'Address already in use' "${logpath}"; then
+			# ay, someone took our port!
+			eend 1
+			: $(( DB_PORT += 1 ))
+			continue
+		else
+			eend 1
+			eerror "Unable to start mongod for tests. See the server log:"
+			eerror "	${logpath}"
+			die "Unable to start mongod for tests."
+		fi
+	done
+
+	local failed
+	#https://jira.mongodb.org/browse/PYTHON-521, py2.[6-7] has intermittent failure with gevent
+	pushd "${BUILD_DIR}"/../ > /dev/null
+	if [[ "${EPYTHON}" == python3* ]]; then
+		2to3 --no-diffs -w test
+	fi
+	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
+
+	mongod --dbpath "${dbpath}" --shutdown || die
+
+	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+	rm -rf "${dbpath}" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pymongo/pymongo-3.5.1.ebuild b/dev-python/pymongo/pymongo-3.5.1.ebuild
new file mode 100644
index 000000000000..01c003201d56
--- /dev/null
+++ b/dev-python/pymongo/pymongo-3.5.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit check-reqs distutils-r1
+
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.python.org/pypi/pymongo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="doc kerberos test"
+
+RDEPEND="
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-db/mongodb-2.6.0
+	)
+"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+reqcheck() {
+	if use test; then
+		# During the tests, database size reaches 1.5G.
+		local CHECKREQS_DISK_BUILD=1536M
+
+		check-reqs_${1}
+	fi
+}
+
+pkg_pretend() {
+	reqcheck pkg_pretend
+}
+
+pkg_setup() {
+	reqcheck pkg_setup
+}
+
+python_compile_all() {
+	if use doc; then
+		mkdir html || die
+		sphinx-build doc html || die
+	fi
+}
+
+python_test() {
+	# Yes, we need TCP/IP for that...
+	local DB_IP=127.0.0.1
+	local DB_PORT=27000
+
+	export DB_IP DB_PORT
+
+	local dbpath=${TMPDIR}/mongo.db
+	local logpath=${TMPDIR}/mongod.log
+
+	# Now, the hard part: we need to find a free port for mongod.
+	# We're just trying to run it random port numbers and check the log
+	# for bind errors. It shall be noted that 'mongod --fork' does not
+	# return failure when it fails to bind.
+
+	mkdir -p "${dbpath}" || die
+	while true; do
+		ebegin "Trying to start mongod on port ${DB_PORT}"
+
+		LC_ALL=C \
+		mongod --dbpath "${dbpath}" --smallfiles --nojournal \
+			--bind_ip ${DB_IP} --port ${DB_PORT} \
+			--unixSocketPrefix "${TMPDIR}" \
+			--logpath "${logpath}" --fork \
+		&& sleep 2
+
+		# Now we need to check if the server actually started...
+		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+			# yay!
+			eend 0
+			break
+		elif grep -q 'Address already in use' "${logpath}"; then
+			# ay, someone took our port!
+			eend 1
+			: $(( DB_PORT += 1 ))
+			continue
+		else
+			eend 1
+			eerror "Unable to start mongod for tests. See the server log:"
+			eerror "	${logpath}"
+			die "Unable to start mongod for tests."
+		fi
+	done
+
+	local failed
+	#https://jira.mongodb.org/browse/PYTHON-521, py2.[6-7] has intermittent failure with gevent
+	pushd "${BUILD_DIR}"/../ > /dev/null
+	if [[ "${EPYTHON}" == python3* ]]; then
+		2to3 --no-diffs -w test
+	fi
+	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
+
+	mongod --dbpath "${dbpath}" --shutdown || die
+
+	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+	rm -rf "${dbpath}" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pymountboot/Manifest b/dev-python/pymountboot/Manifest
new file mode 100644
index 000000000000..f35f05ec28c3
--- /dev/null
+++ b/dev-python/pymountboot/Manifest
@@ -0,0 +1,8 @@
+DIST pymountboot-0.2.1.tar.bz2 4075 SHA256 0d3b109540380f92ae031b92e195f600165c6d45bf251ac83f82e9610df44406 SHA512 e21f73d832b69bc458a3f220f099bf6a8eabb21c0159b230969f4342e83874bac3983ef6bba19975b17e5185bdeb5cc42c6778f982f4fd4551a077039a2b6a0c WHIRLPOOL 1e644751e04cac4d3a6a1597cb8aaf3fc7e1031b45f269619fcd24f3feb3725364b94f9ee6fa6be26e5fbd5bf91bf94d15b025e6a933a65b014c7cf09b11b380
+DIST pymountboot-0.2.2.tar.bz2 4098 SHA256 d10a94069ee85c4038be7d600cc0ea0f97476a1798e962fb95510a17a018252f SHA512 bb6ec0772300b2edf9864a09ff64f67ad99f0cd29b009793e1b2a590be48146640c927b5772023d27e68fc2fba51652a55ab66d1cf875dd9b4134f043ac353c9 WHIRLPOOL 899180ddb16f65c12df18306fc093ebac694f060c9f183b610c4cb616e6a8c97e41813b07da0ba710aa6ae8923e0f22958af2f8830f3ce44b452172484f66a64
+EBUILD pymountboot-0.2.1.ebuild 461 SHA256 de1474126f0e3ed512eef79951db07bb0ac65cb4faa9dea140a8052439a9c136 SHA512 d0d6123990ab19dd28d0c066c5bddd079ab6a7494ae0a2f9e31b5b7a073c08b45ae3b1621629b12e57ba089f9f1d3b34eded94b8e8d85db06e94caa2bea229c2 WHIRLPOOL 8e0fdb4d8f485443be1413190186972a5edfa5449847bc884fe98c6aa4619895a848d9b6df81dab694619791fed086fe8bd8d22483187fdf860d8d5fc24f203f
+EBUILD pymountboot-0.2.2.ebuild 600 SHA256 f818d0e9f133390bfe63dff23b8821d2619298e60b641f244caadac0c909af1a SHA512 540f0ddae0944f8663ca802b530b23718c08cb0839ce0c0759ece91ea8f1d265f7929a3b8526ad2c92ca260ca83b723618efa2845ed2a9bc486386c027be3bf5 WHIRLPOOL ae4d88787841ff2bf39ca4459c841e8bcfa2dd99f2c6485b694504f2d207c11810224be90b87404401ef10c0e008d004dc081cda9fb9e4ddbac57efeab8f0386
+EBUILD pymountboot-9999.ebuild 725 SHA256 084b184dffdfb661bba935dae17cc55083fff74c60d3ddbaf2b6355da3734aec SHA512 e34f603432578895bfa4380aca112d5d76551acf6fcac3c7cf3aa39ec001958211351f53dea5c41b886382db2b572d9b9ec1d163599b3a9279c668cb43c7f4a7 WHIRLPOOL 278699a7a984505c222ee99eea5a89fed026aa30e94bfb1cb8090f28b07ac9bc5c1a531ed3848d5b62e409e14e3862786e061b4348362877cfaf5e788da8077b
+MISC ChangeLog 2641 SHA256 725ef99d7335b94c379995f6cad2677e3891c9c87a353251a920bb1a6bd11e74 SHA512 8086698c463eb4b3ec75a9f5b7b19aa5a9574cfb5485cd85b70f7cf59a3cfa5a0c38734a77f8d7d30cbb636c0d60fb2c7eb1a4dec9d7d21074df28fddd75770a WHIRLPOOL d7b5f0ac3fafabf2aa568b6450bbb725378f281082a3b3241cdd34f75895cb8b04475d73f5c39ae88dba81e47837da58a8d07231531f4e16e035215f83eb9473
+MISC ChangeLog-2015 2983 SHA256 391b09459853250bc977d99d1707e1f60d722894f8ef777da6256a61efb366b6 SHA512 9023243fb96b41dfc0228c1b8e891bceca9ad3cd86242f8d11513d4c153e4ad140f1f1ccf3a099b746b0dac869a7a6a7648689ef797ad25e8b8d4d2694927a66 WHIRLPOOL e84b6827808b5110f3ffe9178d2ca87d6120ce0db4da6b5b619d717d56194b74bf8678f296f0109534a135a634845bff4c184f01a4df92163b28b2696466520f
+MISC metadata.xml 539 SHA256 3a96f0ad1452aa51b36216ca01bee4bfdad8191c094964d63ac24e2a06a27c81 SHA512 d95f758cbce79b166abc9cf68c5605e03a4b5f168a25e46016c812e667bed8ce40a146beeb02ea236890f081154e2239e87386ccb37aa29acbb134fdf7704756 WHIRLPOOL 5ad8c34f62c907635d64104917c8afce42d37d5e4d5af160798edd37518644568aeec95c32455876fbb2eead8ca16c81a719ec57ab2e8253abbe24ca55a4dd84
diff --git a/dev-python/pymountboot/metadata.xml b/dev-python/pymountboot/metadata.xml
new file mode 100644
index 000000000000..66d4e59e6ec1
--- /dev/null
+++ b/dev-python/pymountboot/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
+  </maintainer>
+  <upstream>
+    <maintainer status="active">
+      <email>mgorny@gentoo.org</email>
+      <name>Michał Górny</name>
+    </maintainer>
+    <bugs-to>https://bitbucket.org/mgorny/pymountboot/issues/</bugs-to>
+    <remote-id type="bitbucket">mgorny/pymountboot</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pymountboot/pymountboot-0.2.1.ebuild b/dev-python/pymountboot/pymountboot-0.2.1.ebuild
new file mode 100644
index 000000000000..f862ee2ca314
--- /dev/null
+++ b/dev-python/pymountboot/pymountboot-0.2.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python extension module to (re)mount /boot"
+HOMEPAGE="https://bitbucket.org/mgorny/pymountboot/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=sys-apps/util-linux-2.20"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/pymountboot/pymountboot-0.2.2.ebuild b/dev-python/pymountboot/pymountboot-0.2.2.ebuild
new file mode 100644
index 000000000000..6390c3678064
--- /dev/null
+++ b/dev-python/pymountboot/pymountboot-0.2.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python extension module to (re)mount /boot"
+HOMEPAGE="https://bitbucket.org/mgorny/pymountboot/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=sys-apps/util-linux-2.20"
+DEPEND="${RDEPEND}"
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
diff --git a/dev-python/pymountboot/pymountboot-9999.ebuild b/dev-python/pymountboot/pymountboot-9999.ebuild
new file mode 100644
index 000000000000..6b4362ffab04
--- /dev/null
+++ b/dev-python/pymountboot/pymountboot-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+#if LIVE
+EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
+inherit git-r3
+#endif
+
+DESCRIPTION="Python extension module to (re)mount /boot"
+HOMEPAGE="https://bitbucket.org/mgorny/pymountboot/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=sys-apps/util-linux-2.20"
+DEPEND="${RDEPEND}"
+
+#if LIVE
+KEYWORDS=
+SRC_URI=
+#endif
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
diff --git a/dev-python/pympler/Manifest b/dev-python/pympler/Manifest
new file mode 100644
index 000000000000..95b338c8712a
--- /dev/null
+++ b/dev-python/pympler/Manifest
@@ -0,0 +1,11 @@
+DIST Pympler-0.4.1.tar.gz 395535 SHA256 6a8bfd2972c4ec34ac8750358515950be4a4ca13dfa6a05a9a22419786745f90 SHA512 3f7e2d88ca431ae73cf49d5140c10de4eab10c1627cdacc12e216c89410add16cb5e1faedc484ea765e4b866b905a5379bb21e7d41b9b8d622c4ac7b1b16a8a3 WHIRLPOOL 4b35b554cabda8b9ab633409f1c91728956cad31c1a41d3b66a8d2cbf2e1283edd32017181d5f9c8bd66a1bac7ba398c292dd60fd9cdc268fec86222b4a790c8
+DIST Pympler-0.4.2.tar.gz 395765 SHA256 3c3f9d8eb3dddf4f29c433433ea77c9c3f2f0dcc06575c0c2a9d81b2602893b2 SHA512 ae6e7718ecf8e7bc46ce968dd3b57543c4a3e882a07d7cb68ee38e60debc157ce2410c66b23c14179c47fef1b89647886289d9e4fdfc5f9e9ecd87a052f204aa WHIRLPOOL cc1e0ddb1509d92f3cc44f8e09c84a4fdc59fb273d0d5c2e10c421c97d0b83468dd7ffbf8d9817a480683afefb0f7dcf79993aa4ec7a7fb6b1789fc655ecb9c6
+DIST pympler-0.4.3.tar.gz 259409 SHA256 80dfbda9c9dc36d8cc6696b9f1066d4c6bdb87371f58fe7940fad8918b8c288f SHA512 de4a36e8e5b639c1b78460677d821a5ad829c01a568496a5df4682ab32fea14e24c47260aed96c68722285e3fdb4b202348a7cbfcb95531ca2954bd8d5cebb68 WHIRLPOOL 21324bd5b30be363e4295e6191aa2bc884b97b4224623c019fe888f394bc5bca59391f69503fbb0c799f3e93b68f6920728843197a0fd8680ac975ec4b6234e4
+DIST pympler-0.5.tar.gz 263627 SHA256 74d26dfb6f02777a5087be181ef7f8ae57625e7ec3ae41e2fdd24f31289e772e SHA512 254b758df70bafe57f315a973de0caeef6cd616bd0cc7b4475c74c3a9a94f52b3ac3da3f073483db3560cd0060536c95ed1297007c24dfe8db89fd893ff1409c WHIRLPOOL fd32c60fd5152e527c2147dad569a1c1369e95c8c05aa67314fad6a09794ca694320ab481e38277c1bba66cb5929fd56099286428a6e12773ae8134fcd97649a
+EBUILD pympler-0.4.1.ebuild 969 SHA256 1eb51153a09c37788f0679b8a45c4eb6c2830bc59f7996bf0837a519025f21e3 SHA512 ccc89e93198590cace6420654ecb19db3b4a769915aac9c868d3421522e4d5ab04b77783935349d8b88c0196aeafb3e4412e7bb2041a2af747594b092a94fa74 WHIRLPOOL 52a478d1011ce501c662a6c1cf1e1341a6c76f8f92beafc1f79a869c46c048b87ae857d802ed0d537429688c229466f139b8dbe2eca9cd27b89d33e929becbd9
+EBUILD pympler-0.4.2.ebuild 1025 SHA256 5688847fe4b09b276363850c75e23026c7d4c1cafdf2df024f13a8df34245516 SHA512 3b3ba247a9c6cfd2dd28ae9e65200e0e86ce218780829f6114a0996e580c01e1f47205f81ae85a6e4c0bb5b4e48020a72677dea562daf78c411d32d30a94fa8b WHIRLPOOL 3604c589be3f23b1c923f9481273a1078f59cd58afdc7a9dbb57c6487377b3213c72a56b2cedbe37076aa15b04d001135fd29b50bbc6d7cd56503e0446ffc4ad
+EBUILD pympler-0.4.3.ebuild 1397 SHA256 db404dc3e13901262192d98fa64b7308c7cfacf602f4d2149963c8d5ba8ad35e SHA512 e71e12e7829a8c92b57f3818fe8d40b4ed0588e4e80ab50fe1b96bc09e419961317a68372e3b912865fb4ace45684ec264de6e037a924fd833fe3f2af6d276a9 WHIRLPOOL 6aac54a9cb8e40e717519f3fbd13e650d89b70f3fba31fb6fcd5af3b261ccf8a2fc92cbddd5d3c92ea6c3a039429b7bc7e9b471e02b100d1700d7b314bf80602
+EBUILD pympler-0.5.ebuild 1068 SHA256 337c589dfc4f24a94dec75e2145f5b147993fedfa2fed5d3effcac5bb8e0791e SHA512 1edc35d7d131ada0d2e617b2a4e588374e594577e2c27c061eab49bbd9d424d90f09d8e1551946ba19401beee1bc6fd053d42815af8c491b02362265f52e690f WHIRLPOOL e8ac7fcb0eff27fbbd540b03b6b35aee3dd349069b000951fd059f9aee398bcbd6b5a1b7293242526c9f1215c206df7aa4f9efaf45e0a3ad6918a28b4f9ad576
+MISC ChangeLog 3578 SHA256 0555e0fa4d0b43a35f9e1dd3ff46e9895ef42019b3e542d29a4cd4701ecc1649 SHA512 10a2b2c34545d5a15bfd7cecddcb847f87177c82b0f10ed15da3091ee53e8ecd92dd2c2532192907c7f95113002ac054f007e0700d71ee63512c49654d062bee WHIRLPOOL c7cbca225b5f71978b8303745991a328b84badde267d61c791ef22ccc7c348cd0f94bae4d464fbc87c5a6ade54512657e2ee607cc83fe2b61e6734a0bea0d961
+MISC ChangeLog-2015 3349 SHA256 56d0c0d880277afcd3b92b03b70a301cfdcbc88d93add12acaa3ec5abbac2d41 SHA512 8724da4e7b6a6559f5f2a10e22198b6f53ac6af3ab5e0a6a6d7b0aa112e290ccbd4782910e4dba37f50d8cb9c4bb1317de7608bc97eb6294a8dd19cd510e3686 WHIRLPOOL 0c6c233c801ef98fce61e769acf9dde7ce2ac1d78d1ebe66efcd4ecd013154925c7dedf8f6273bbd579bf8a0c46610c5b37bf3a53af7b8efc1ca132942cc1c51
+MISC metadata.xml 775 SHA256 fff8d13abe4319d6b511492928615a219a090d741515acc1800483d6c3d3628f SHA512 e97ef9decf71b8f941e1fb54fee0aef66dee9c3e722f590d1d08f87dc20ba709713089c91891f0c686d69053321894fd6c8e6de690154f193e2bb72a5d879d41 WHIRLPOOL 36ee530035205dc3a310d7b22659647fa8f4f8680d4f5d64bd2b2e8e3295c80d3bb948219cde8f1209c7ec01b07512ebb1a256ca8ff214dd47ca072475d2c8c5
diff --git a/dev-python/pympler/metadata.xml b/dev-python/pympler/metadata.xml
new file mode 100644
index 000000000000..b7d64a47521f
--- /dev/null
+++ b/dev-python/pympler/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+Pympler is a development tool to measure, monitor and analyze the memory 
+behavior of Python objects in a running Python application. By pympling a 
+Python application, detailed insight in the size and the lifetime of Python 
+objects can be obtained. Undesirable or unexpected runtime behavior like 
+memory bloat and other "pymples" can easily be identified.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">Pympler</remote-id>
+    <remote-id type="github">pympler/pympler</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pympler/pympler-0.4.1.ebuild b/dev-python/pympler/pympler-0.4.1.ebuild
new file mode 100644
index 000000000000..cdca81dc92e6
--- /dev/null
+++ b/dev-python/pympler/pympler-0.4.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+MY_PN="Pympler"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Memory profiling for Python applications"
+HOMEPAGE="https://code.google.com/p/pympler/ https://pypi.python.org/pypi/Pympler https://github.com/pympler/pympler"
+SRC_URI="mirror://pypi/P/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="dev-python/bottle[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND} )"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	rm pympler/util/bottle.py || die
+	sed \
+		-e '/import bottle/s:^.*$:import bottle:g' \
+		-i pympler/web.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py try
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pympler/pympler-0.4.2.ebuild b/dev-python/pympler/pympler-0.4.2.ebuild
new file mode 100644
index 000000000000..c4cc5bae7afa
--- /dev/null
+++ b/dev-python/pympler/pympler-0.4.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+MY_PN="Pympler"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Memory profiling for Python applications"
+HOMEPAGE="https://code.google.com/p/pympler/ https://pypi.python.org/pypi/Pympler https://github.com/pympler/pympler"
+SRC_URI="mirror://pypi/P/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="dev-python/bottle[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND} )"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	rm pympler/util/bottle.py || die
+	sed \
+		-e '/import bottle/s:^.*$:import bottle:g' \
+		-i pympler/web.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# https://github.com/pympler/pympler/issues/22
+	esetup.py try
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pympler/pympler-0.4.3.ebuild b/dev-python/pympler/pympler-0.4.3.ebuild
new file mode 100644
index 000000000000..bac8394e16ce
--- /dev/null
+++ b/dev-python/pympler/pympler-0.4.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="Pympler"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Memory profiling for Python applications"
+HOMEPAGE="https://code.google.com/p/pympler/ https://pypi.python.org/pypi/Pympler https://github.com/pympler/pympler"
+SRC_URI="https://github.com/pympler/pympler/archive/${PV}.tar.gz -> ${P}.tar.gz"
+# The PyPi tarball is missing the documentation
+#SRC_URI="mirror://pypi/P/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="dev-python/bottle[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND} )"
+
+python_prepare_all() {
+	rm pympler/util/bottle.py || die
+	sed \
+		-e '/import bottle/s:^.*$:import bottle:g' \
+		-i pympler/web.py || die
+	# test_flatsize and AsizeofTest always fail
+	sed '14,106d' -i test/asizeof/test_asizeof.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		sphinx-build -b html doc/{source,html} || die
+	fi
+}
+
+python_test() {
+	# https://github.com/pympler/pympler/issues/22
+	esetup.py try
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pympler/pympler-0.5.ebuild b/dev-python/pympler/pympler-0.5.ebuild
new file mode 100644
index 000000000000..60c4548dd309
--- /dev/null
+++ b/dev-python/pympler/pympler-0.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="Pympler"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Memory profiling for Python applications"
+HOMEPAGE="https://code.google.com/p/pympler/ https://pypi.python.org/pypi/Pympler https://github.com/pympler/pympler"
+SRC_URI="https://github.com/pympler/pympler/archive/${PV}.tar.gz -> ${P}.tar.gz"
+# The PyPi tarball is missing the documentation
+#SRC_URI="mirror://pypi/P/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="dev-python/bottle[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND} )"
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		sphinx-build -b html doc/{source,html} || die
+	fi
+}
+
+python_test() {
+	esetup.py try
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pymssql/Manifest b/dev-python/pymssql/Manifest
new file mode 100644
index 000000000000..278ad2ed2d1c
--- /dev/null
+++ b/dev-python/pymssql/Manifest
@@ -0,0 +1,5 @@
+DIST pymssql-1.0.2.tar.gz 175469 SHA256 c8befb3ec227fb3d1141558ddb1590549a493b677fa2fc85ee3e8dc9ad9a4f7b SHA512 6e9a2d26f2cc33bac093f2a2a41771aa41ba336413076c793137558c05e48cea7409f74f35530939b36a708cc47c66ec0dc765a768bd5f857642553568fe859e WHIRLPOOL 7ef0cfe36de73f26df8edb48eacd4bacac8dc847aee55387e6328c4688678969c6f6b0405552af8c7284e65fa3953f9f807357a4bea8bff88cc395a6a9edb5ef
+EBUILD pymssql-1.0.2-r1.ebuild 663 SHA256 fd47e86b5c5d211f17b6d9f6cd488988b14b94aa0e4c73e22451eafdf3865b3b SHA512 2f9b36c6b61b45b6e809f1ef7975fefa91769a967f2c7c13bccf7e31250868390f6affaf4e003982d98032caa1ca38e6c6aee28c805bf19c15d4ebf322bc67be WHIRLPOOL a9f07dd820a1eb2219bb9de067af1955320ccd30cc97fe579de5d2646252fff68587bff4679aaac204b83663587dc5863bb5085e3b975b27fad9e35efc26eae5
+MISC ChangeLog 2739 SHA256 97ac7217845bd6acf02004da7a4b7fc2f5bc6738fae18caf1cbd4e5a1238f2c5 SHA512 e2634d8ea573461eb25ca47ca5891eebd25ca9004c6285ae73dbe7ae9f24348958858a3513f1bf873869aa878cde3f47498915dec55af3278a3602cffe63724d WHIRLPOOL 8362cff759b624e73ff85883272040ae3006f0bfe080f28d8b3e0174f7a947897f7372cd72125a6c0b38587a30e5509c0b15de60909a06d3746d68572ff798ed
+MISC ChangeLog-2015 6088 SHA256 821b9a5f76c82256ebda838576eb04c850f135a75ccf4f28a243e40fc766e157 SHA512 5ce771ce932299f5839ffa99a08c8b3b5464781e6157b9cee86382ef58bd201bbf39a6a6561b4d3db49fd1d5e64e997e03c57ea836cdf3252646a46c02160f89 WHIRLPOOL f611757744cd1dad4f7ac3a19da9447a07f43e388556f87612f6b750a1d94378d9ffd9f538b6180e3fe8a23734c6ba87420be83ef3152c3c356e7a2fc051c20a
+MISC metadata.xml 396 SHA256 b84cc3b83c96f4a4229df40af21af6a5540eb36b76111eed8116ff5c6a0c916d SHA512 dea6de0ceb2f3661fad588992687c8bcda6204b731756390ad5d1a0f2ca2bcee77075e72b80f72a31ce681b57aafd830ffe984279cd8cfc96f520c04aa2e0eed WHIRLPOOL 22f6c914775bc8e5688418919e467187c25c774fe738ba79bb854f686a75865b25992fbe3467317f0322fab3527bd3dc19306c545ab40b96dc7ddc64500728f5
diff --git a/dev-python/pymssql/metadata.xml b/dev-python/pymssql/metadata.xml
new file mode 100644
index 000000000000..d8a463ccc80d
--- /dev/null
+++ b/dev-python/pymssql/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lordvan@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pymssql</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pymssql/pymssql-1.0.2-r1.ebuild b/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..dd4bf164102e
--- /dev/null
+++ b/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Simple MSSQL python extension module"
+HOMEPAGE="http://pymssql.sourceforge.net/ https://code.google.com/p/pymssql/ https://pypi.python.org/pypi/pymssql"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+DEPEND=">=dev-db/freetds-0.63[mssql]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="${DEPEND}"
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
diff --git a/dev-python/pymtp/Manifest b/dev-python/pymtp/Manifest
new file mode 100644
index 000000000000..088b3e815de7
--- /dev/null
+++ b/dev-python/pymtp/Manifest
@@ -0,0 +1,5 @@
+DIST pymtp_0.0.6.orig.tar.gz 22431 SHA256 c729beddad8d200afeefd0bf59b01065b9fe276a3845a4a4940eca4ea2e3a47b SHA512 f50249c6b2acfe2c86da5e5f8a24e1392d47e0ddd02d10891763a3150f9985ecdb8a0b7c7ce8bc36f53f2bf62073a26dd3a72b6c3f95d59cd447bb55684811b0 WHIRLPOOL fe34509a7a66d7e554fd84a1339758a57525771bea34db0433f503b334aa888556266e98967060acd07431412bab5ca5f87f6fefef3ca74cd692914923f40a73
+EBUILD pymtp-0.0.6.ebuild 666 SHA256 db3ac83082e98a3e33459d37ea91616e67aaf9e6eed3070ce773dd3c22b6156e SHA512 d2359ac19b72edb4d0117de0d8d5af79fe54f55d6e0c2d91e3ca8e974da6d8cbd975cf69942779fe208261481d8eca52ad57553c5e3a406696fd28e44f2a191c WHIRLPOOL c252e3163f3d2ee6b9beb89e613ea2301a1bcccb36635f2b6a6246beb0d37910421c5d4ab558cd0191417a8749622fa095317de8004351998595c28571ef0cd9
+MISC ChangeLog 3236 SHA256 b893f98bc970d48ada8e615fe69c97c106a5c5f86f6b615a196d85ef89cf91f1 SHA512 c28fe020ebbda5030731545e762f67041603bb1908d89a4e1c5b287edc43ce8b88fbc8da70a31ea4eaba42ab347d8dcbac49f47fc2be55382ff343c66876dbc7 WHIRLPOOL cfb95d0673dc19faa2ec0cb234d71e070c8237dc5f14123fdd85614d2140e8a20f8b163e455a8cd4b385d43da77caf5864aaf8e41f230ef9b00c913b55fc10b1
+MISC ChangeLog-2015 2412 SHA256 89058adbec161ff30f354acf6b2af89162e52f2bb8703ea5e4f747906898e259 SHA512 742133bab90e4fde05576d330f84b9ff7b770bc8153dba1bdee72db0840f90422eb2a547f169aeb0a2ae10e7293b12494f83bef39458a82e96c491ebadbc53ce WHIRLPOOL 0be5472158ecdac163a1bffd83e259e66fc1c6f382237d7fe036278990baa4d7cd12387885cf66371506f66f1715db2925ed1de69500b690ff561120de8570cb
+MISC metadata.xml 446 SHA256 1edded73b703001c37e9a15fc39f93feb89b304591a675e9e8667e22e188463a SHA512 f6bdc3515407187d158c02ddf793cc5798025d6fab0d20e912ab12f877a1a5ed7b27534b9dfcd8630cc37fea56513818020dcbadb687e92743b85d9102c36e76 WHIRLPOOL 9188b7a667b793431493685fa4fa06277ced71791d6739a4de6b3bc1c36e1bb0b12f355ecf05de4a2b56fcd2fab61b3aedc306143c5fb0edcbb552fc8f69f440
diff --git a/dev-python/pymtp/metadata.xml b/dev-python/pymtp/metadata.xml
new file mode 100644
index 000000000000..dd9304d2c7dd
--- /dev/null
+++ b/dev-python/pymtp/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">libmtp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pymtp/pymtp-0.0.6.ebuild b/dev-python/pymtp/pymtp-0.0.6.ebuild
new file mode 100644
index 000000000000..9b014dd465e0
--- /dev/null
+++ b/dev-python/pymtp/pymtp-0.0.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="LibMTP bindings for Python"
+HOMEPAGE="http://packages.debian.org/libmtp http://libmtp.sourceforge.net/ https://pypi.python.org/pypi/PyMTP"
+DEB_URI="mirror://debian/pool/main/${PN:0:1}/${PN}"
+SRC_URI="${DEB_URI}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE=GPL-3
+SLOT=0
+KEYWORDS="amd64 ppc x86"
+IUSE="examples"
+
+RDEPEND="media-libs/libmtp"
+DEPEND=${RDEPEND}
+
+S="${WORKDIR}"/PyMTP-${PV}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
new file mode 100644
index 000000000000..0eec25ba2332
--- /dev/null
+++ b/dev-python/pymysql/Manifest
@@ -0,0 +1,9 @@
+DIST pymysql-0.7.11.tar.gz 82213 SHA256 211cc8314663ceedba24df6ceec178945b42370a966f56ddf78c4767e40fe9f8 SHA512 b83fbbf77fad8e775ba48cf56f32deb61d2d54d64bd1f83e097c61d87b33a881787125c839b78f18b413722299c24a8a14dc9b36f5df7ff7f9c6ea56b2597150 WHIRLPOOL 527a41253415710b40a6dc9f55568d67c7d7c4931bfccb1a7f168273c120871db130115419f435d1ebe0857e65fd3d23a2d676a271a79ea2961929c90ab6ecee
+DIST pymysql-0.7.6.tar.gz 81842 SHA256 eb5fd3ef7a0d18a705d00ceb07e6d18653bd8042055181442bfb16231e7505e6 SHA512 02efa79253c9aaf631d77ab7d7acffb96e81d96cea781dd7c80a268f13098e3f2d538db1161417dcd96d0e3a19edf7ff888e791e4a332b1edd9edf2ff9f2de36 WHIRLPOOL e614487700867813921b1c142ac0b6595e8071a7d160e7024b66c876095b5b9c0386c4f6e5d04689f4ba1716f86eeb0351404fe5152efd6bbd4a2eb6e343721a
+DIST pymysql-0.7.9.tar.gz 82247 SHA256 633dca5fc32c0aadb2b43b85b07d0315ecdff9bc85d0e29bb623c863e2478bc9 SHA512 3d1496e33ca7755440219be96f70289ce5f117311dd3f9963e1f8441d0297ee047dd779ceab9c99b7822564fb698c09629153b84a1201ac06a745d42d12513f0 WHIRLPOOL 09c3b0e7fa9fd404d842f22a291bdca936a9fd197331d237a6217e209b52bfc9f93121e017e493f2864869d82d9d7d4a14cd2f53e1c5bd73d44537cc24ac0d37
+EBUILD pymysql-0.7.11.ebuild 691 SHA256 30df74c15183cb25b67fba4fa22802c1a3238af75815ae19194f338ffaef7e15 SHA512 b31309b0a30a479c494221f36c816db3bbeb66d3e373069ea6193a0163f5962f95ea612e0006a8e05cd6c633e7fe641376f8415ec4b8df6991fff858ee59a9d0 WHIRLPOOL 10f2540422c337883cdfd35d5968ff430df2f6e22026ee1ec06e20b2bb9e05b0e85b10b45ccd3b5c0e30175e29572bd322c09b25bff41ca462e9dc5690f1730a
+EBUILD pymysql-0.7.6.ebuild 690 SHA256 b816546ce407e3568de186a83dee5aa1ada3be218d72e75c45e2eb16daf07c4d SHA512 c75cd059aeef4333f0eca856d8a35c241edd115f6147dc5f4f67c73fa256fb25015b794fd35c386731ad71921f0dc793c6e946bbe85aa93e770b14f1a820af63 WHIRLPOOL d3643d0c5b91c57648287dd18d0b7d37e23409b636a1ea0f6c73c7a53baa02db1d513b127b2b0dfeacf05473f764acf82dfec0c6b2e80017e095164d243565ab
+EBUILD pymysql-0.7.9.ebuild 692 SHA256 5a0d742724f8758cfcefb84091a4282dae8b6fbc80846c82fe579b6f43bd279d SHA512 f215a05ef7fea149123d61c25b283b60afb7acca5c52ea71b63b83a21930288e173f3a583a53af36e82128af196c02652790ae625a520bdbe42bcf4c03b6cfa1 WHIRLPOOL 057014c57066b3456a59945dbc0ff678e6370c8cc5578b396b4feea8af502057a5e79ee435843ab781c50622f636cd4173d091471cbf2ef84fdf385c13d877f0
+MISC ChangeLog 3463 SHA256 e6a4818026eeb8954dc5b0ec4103dd25d97b787e9bbcc6f8f043bcc33192fffe SHA512 dcbd712e92728b7a60e4f491d87dafa9c5340227f917fe24c5f0791b8ad4292afcfcc0c97cc422f9a296f72859779f1ad0de6cf60486a98c86f6df7265ea52c9 WHIRLPOOL 8d8e5220477c229ea2a8da9165e01bb06a72dd8983a7f9ee8afb0939aea4a9437b3b9f64f82b031ec30a0b3e7e09c0f29cad4265bee57ed66aa3470da91d3da1
+MISC ChangeLog-2015 1323 SHA256 6a8c2d2092ac1a8cc1223079a02c59e3a1930ee0cdbd077de1388c141f462839 SHA512 917742751768a782b252500714d641f78dcbd9fbf64405b94a32e1a06398c4148ae69a561848b12e0138784746b79245c248ce3936f5f8191a8c370482e471bf WHIRLPOOL 56c649ebf24dbcdc66f9ff19a78f894316dad48746c3bec36144f6ff55a4365457011b3f09c6d8c141d3eca7dcdfa299417792fac17526b97a89983159e5fa78
+MISC metadata.xml 553 SHA256 a5f4fdb1e0a5db6d3c301165810d0a85778efb1ac3126a9dd44f65878a3e0287 SHA512 3799a369db7d62654ead99e579ea2b7f19e33c35654fb4f721e37a46f4a449d67f1173f45abf8e34b330e87a872c0182d7a47dcda97a6d2c40e78ebfab6841bd WHIRLPOOL fbaec96ed91bd40879369bd6c37a65b6d14f7e5722739007d280ee3fd73601c9583c3b54fdd1f079b9506a0a03a94cd9af4b19065932d0870a12f24e80e45d6d
diff --git a/dev-python/pymysql/metadata.xml b/dev-python/pymysql/metadata.xml
new file mode 100644
index 000000000000..9bc048e75d73
--- /dev/null
+++ b/dev-python/pymysql/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grknight@gentoo.org</email>
+    <name>Brian Evans</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>mysql-bugs@gentoo.org</email>
+    <name>MySQL</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">PyMySQL/PyMySQL</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pymysql/pymysql-0.7.11.ebuild b/dev-python/pymysql/pymysql-0.7.11.ebuild
new file mode 100644
index 000000000000..c20e803e1719
--- /dev/null
+++ b/dev-python/pymysql/pymysql-0.7.11.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="PyMySQL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pure-Python MySQL Driver"
+HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# While tests exist, they require an unsecure server to run without manual config file
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} runtests.py || die
+}
diff --git a/dev-python/pymysql/pymysql-0.7.6.ebuild b/dev-python/pymysql/pymysql-0.7.6.ebuild
new file mode 100644
index 000000000000..ed7664dbf5dd
--- /dev/null
+++ b/dev-python/pymysql/pymysql-0.7.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="PyMySQL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pure-Python MySQL Driver"
+HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# While tests exist, they require an unsecure server to run without manual config file
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} runtests.py || die
+}
diff --git a/dev-python/pymysql/pymysql-0.7.9.ebuild b/dev-python/pymysql/pymysql-0.7.9.ebuild
new file mode 100644
index 000000000000..e67fe919bd7c
--- /dev/null
+++ b/dev-python/pymysql/pymysql-0.7.9.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="PyMySQL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pure-Python MySQL Driver"
+HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# While tests exist, they require an unsecure server to run without manual config file
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} runtests.py || die
+}
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
new file mode 100644
index 000000000000..7a2261826a62
--- /dev/null
+++ b/dev-python/pynacl/Manifest
@@ -0,0 +1,6 @@
+DIST pynacl-1.1.1.tar.gz 3099431 SHA256 a251393a93c4bd85e7a2c1c0e938dc8862743ae27d8def87c32b2888ccca049e SHA512 6410f6ed2a474fefd5df425ea7e76fbe527a9d2ed09b36291caf2c5d0e68704e58caa694e06b01ea61323b2ef16ce85c1478191cf49d7eea969395a3d74d09a8 WHIRLPOOL 625589b26591c23976cb0c5c4ec9b53c428f3c3c1a07da187af52183367d625ea5bf4d3038b1fe6c88e5c9d4297b1474137b7f350430faefbdbc43f3e36fd698
+DIST pynacl-1.1.2.tar.gz 3149804 SHA256 448897f0cfe3607dc23a871fa4405ef00926179df27ee8dfd0e46d42c60d8968 SHA512 ce9c720699fc3b808bb569ad9916f5f5ea97fbc49643117b014374ffaf77ce7972a530e9c4cfaca14dcffc8d676b5bce2facf6da99bf2fda4e319b772075e52e WHIRLPOOL e30d1fb88e94976ee334a950726437995cb8aac539cb96c93812f44314d8981dad5969cc1e687638d9100553ed6cf0b5ce2c93e66f3a1cd7aa55db034a76aa33
+EBUILD pynacl-1.1.1.ebuild 887 SHA256 b355c355e1294fd995ff7652e91a0f7791d3065f87a4f59c5873133fb5b431c7 SHA512 733c60faa80eae56229983d66992771f33990dd5853ff16e7db2a6d3d4829a08a7c615a8b7364b1ea986ef8da0eb5f194d21bd5eb8a7ed31b7fac24d0bdbdcb7 WHIRLPOOL 7fb2f6ffccf747b6d9fa431df22c0c258bd55bdb450a6ad2a8a89e31c8fa2b71218d0a8a9f7a2da8f19777da86a4aed05253c520bad5e718ccef9742940f5880
+EBUILD pynacl-1.1.2.ebuild 850 SHA256 ba5f36204502ea77803a1f316858b942fb40f1cc3d729d2fdeb647acd3e1f02d SHA512 8f8b2c6fe427374ae44e34ae4b8c0ae2e48bca1a8c9f5eb6acb563a82fd77d55e7b1433899ad0e95420ce1fe8cd0f142257c66a9d7c8bd2c7d4d25be883083d2 WHIRLPOOL 2562ebf3ff0194ab0ec33e85155f6aa4c14201c651e0d7702ad07e4df75edbfa2b4a264134a3218d09edd7e564dcdc093f89c4715a9c652d724191cc1bee5e89
+MISC ChangeLog 795 SHA256 ddaf6d63f21f4abc117412b33edbd8f4bdbe6c739ebd422f70be90fb75e69936 SHA512 13c18858ffa5c593b2888471784f06cbbe75f4af6dfc4bfd61e2b18f204336d9946c8bb0bc147f71bb33c3b9ae02d9526c617a100b8eaf0a4748b250fec5b940 WHIRLPOOL b5d78246c6e79556ec557fa1189e9349dda62287aea71c620c790fc2a15ffce5cb8049d2f176123cccd5cb6dead4c5e1927e9ee53cad6de6693e4d8d00aa2530
+MISC metadata.xml 927 SHA256 e0fe410c13e44c7765e8798fd5b5886b1da9f0239b0d8d4a6cccceb7f58dba67 SHA512 bc1d0af5e78151fa7a623fb151eb1756e066987493cadca3bd099cf88af02d6b2423f170eaa0e3e141f1113189d1fa0d3b2aa8bcfa1d713b4e830098e14ed1db WHIRLPOOL c8a1173c00473abea9b09d27b903d372884264261f175c680153ade76fb370dd99433c68acbd6fa4a4b1772bab597a23cda475a7f0375ba26e08c6fbb1cd034d
diff --git a/dev-python/pynacl/metadata.xml b/dev-python/pynacl/metadata.xml
new file mode 100644
index 000000000000..71800e048aad
--- /dev/null
+++ b/dev-python/pynacl/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>klausman@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>cryptography-dev@python.org</email>
+			<name>The PyNaCl developers</name>
+		</maintainer>
+		<remote-id type="pypi">PyNaCl</remote-id>
+		<remote-id type="github">pyca/pynacl</remote-id>
+	</upstream>
+	<longdescription>
+		PyNaCl is a Python binding to the Networking and Cryptography library,
+		a crypto library with the stated goal of improving usability, security
+		and speed.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pynacl/pynacl-1.1.1.ebuild b/dev-python/pynacl/pynacl-1.1.1.ebuild
new file mode 100644
index 000000000000..bc9c3cc8e614
--- /dev/null
+++ b/dev-python/pynacl/pynacl-1.1.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6})
+
+inherit distutils-r1
+
+MY_PN="PyNaCl"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python binding to the Networking and Cryptography (NaCl) library"
+HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.python.org/pypi/PyNaCl/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.4.1[${PYTHON_USEDEP}]
+	dev-libs/libsodium:0/18
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}] )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# For not using the bundled libsodium
+	export SODIUM_INSTALL=system
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pynacl/pynacl-1.1.2.ebuild b/dev-python/pynacl/pynacl-1.1.2.ebuild
new file mode 100644
index 000000000000..56ae4040b9b3
--- /dev/null
+++ b/dev-python/pynacl/pynacl-1.1.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6})
+
+inherit distutils-r1
+
+DESCRIPTION="Python binding to the Networking and Cryptography (NaCl) library"
+HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.python.org/pypi/PyNaCl/"
+SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm ia64 ppc ppc64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.4.1[${PYTHON_USEDEP}]
+	dev-libs/libsodium:0/18
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}] )
+"
+
+src_prepare() {
+	# For not using the bundled libsodium
+	export SODIUM_INSTALL=system
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pynag/Manifest b/dev-python/pynag/Manifest
new file mode 100644
index 000000000000..e6a4db9798d6
--- /dev/null
+++ b/dev-python/pynag/Manifest
@@ -0,0 +1,3 @@
+DIST pynag-0.9.1.tar.gz 219909 SHA256 5b44dc74a262f060fdc868065192e91afb52996a3cf28e8500259f112fd54783 SHA512 9a16dc952a4ec468c551d31c9e6d85013da51edd30548e1b8ef886ae228b509578d84e7e7045b70d11b6b1ae77969f7a92afd58a254e0554fa1ffd839a82729f WHIRLPOOL 13a4eb7652f650b633be34acc243263589de0cc3c9ad2aed517a31acc8c57ce361f04091135b188fb066b783b8ebaa3d55fc2ca1f5c8fc7224efc2028325c75a
+EBUILD pynag-0.9.1.ebuild 422 SHA256 05794e3d429ad820889b03014398d5748b82453c0822cd72709b3b1fea1f0be7 SHA512 39807b8719324d2d880aa7cd8530051c2b4a1d6b8bcadf4176ba70189d73ed2440b4e7cd92ffa7411485f5296587ecca2e5ac390ddb21ea00d6dae35d3b11ded WHIRLPOOL cd97caa66e1b32b4557dd9516c23a99daf49b5e01ad0795fa2379890e074b6f7059c7a5fcfe01b6e3d6db5b5c65ea81cfacee9950a8d93a7d869bf7ad39c2e4a
+MISC metadata.xml 483 SHA256 f5a2ff2f9b29cf50146db04dacc204bc418967e9b59b4faadf43e8dbd6199128 SHA512 ba5bd1f53b4f6fea2ffbf071519af08e50c9d433a3474d77105e72640fd6e87d0ed72ac8e80604084a0d40d3747af3e05c0581f4d9d99d5eb3c6d9e280d45e6e WHIRLPOOL e4872130534ef6b9e91b293819116572ffcb8a8285affaa10ebce6c4bbd77e96ac40f1773ad5c20be3e4bad36506e1968ad7159b064a0ed5eddfaa520882d441
diff --git a/dev-python/pynag/metadata.xml b/dev-python/pynag/metadata.xml
new file mode 100644
index 000000000000..92c314843a2e
--- /dev/null
+++ b/dev-python/pynag/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">pynag/pynag</remote-id>
+    <remote-id type="pypi">pynag</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pynag/pynag-0.9.1.ebuild b/dev-python/pynag/pynag-0.9.1.ebuild
new file mode 100644
index 000000000000..e818a07e3dc7
--- /dev/null
+++ b/dev-python/pynag/pynag-0.9.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Python modules for Nagios plugins and configuration"
+HOMEPAGE="http://pynag.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
diff --git a/dev-python/pyndex/Manifest b/dev-python/pyndex/Manifest
new file mode 100644
index 000000000000..3d0e11afa4e1
--- /dev/null
+++ b/dev-python/pyndex/Manifest
@@ -0,0 +1,5 @@
+DIST Pyndex-0.3.2a.tar.gz 34651 SHA256 032564bb4f90da894d2a634b02c65c581db091ce8fee7320b56d487ad27947fe SHA512 f1ddea8cde1f1517ed1c1319cab442ace3e4c9e2a6a2174aca2f348c915c5db2c9fe4c1543f5b16770cc8364cac930a40bef9bce8f7b76c3b0d88c8639acce75 WHIRLPOOL 7c5aa723e222fcffea189f41f29439affbfa66ce2f2326cc87cbd1b2ca72bf00fea19b089e7cb09c1b0b876695ba8702f12cb96f10a59b6f3b7b476f9cee7299
+EBUILD pyndex-0.3.2a-r1.ebuild 620 SHA256 be9004fe8ea3072b39233972fe54d83a32d7c789418260ee4a0e4798f5fdb2fc SHA512 137fda12cb92c415412220fcb428c8836eeec0fae1b09b2d37567643f1c5ae1bbb25a2237777dc218b1422f77351f518aea3a76a170dc1c2bbbd26d3ef9700d8 WHIRLPOOL c518bf907c2ec0279993a4a1fa8f125cbf3b2c925f735378614dd13bae265af1e2650a23e1ea7351dfbe10632956c527cafb0b020e6a20c9d7011ae7c5e2942f
+MISC ChangeLog 2486 SHA256 eabd34519f4188259dcf23b4f60706754e0416c4232a745b2546fedc55266a3e SHA512 13c16d91bd1aa26a0e1431718be44cdfba6b25c485b52fc9ee5cb53faec9519ea30c9b28f374618f17f06da85f6cfaa688f5aee2e184671d5b74ab8d36f50fa0 WHIRLPOOL db787d7bdcb6d710a5e8617a26129399dea6790194bdcb2f4b53f382d1ac9da08ebcc65bf12bec759e3d1d289c5b214f0c481fde0cc85df6572a1d6107066b48
+MISC ChangeLog-2015 1530 SHA256 3aabee59092af92e216074a34073cfd515b132bc326cbb54a71c4652ca977bbe SHA512 4f93b29cbc121f5bfcf857bb429f100a0b3aff786d9cf3d2f48839981cf37541819ea070e6f05df43cd65a5338d61402f6ddca942b3355a27ea3064939a26cb6 WHIRLPOOL ea4a698450589e96011207ec17a68ece23d439351e6f597e190ab6a1e1211948b75675dd447f648feb5550016cc40ebc87bed2048c07adeb9d3f3c42c24a6b87
+MISC metadata.xml 395 SHA256 7f0b708c19f23071a3702a2be5dded5cb937e8384797e797b6338154e78e6354 SHA512 fa248fa63d5870a6a9393c7365d24266782d8f28386abfe372f2b3c6a0c45b2117600521e494da01a18cf26e2c29e8c23bb99661a6e76ae29d3a093eced8b00e WHIRLPOOL f4d2096cc8bc0c99c86422f3f651078dee2930d66d444cb477fb09803d1cf88ead012a62d5383f5eec7efdf442fea0318ebd2ce81c83555631cdf66377f3c799
diff --git a/dev-python/pyndex/metadata.xml b/dev-python/pyndex/metadata.xml
new file mode 100644
index 000000000000..c1b46ba6d8d0
--- /dev/null
+++ b/dev-python/pyndex/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lordvan@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pyndex</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyndex/pyndex-0.3.2a-r1.ebuild b/dev-python/pyndex/pyndex-0.3.2a-r1.ebuild
new file mode 100644
index 000000000000..4d6a605f6fbb
--- /dev/null
+++ b/dev-python/pyndex/pyndex-0.3.2a-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+MY_PN="Pyndex"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple and fast Python full-text indexer (aka search engine) using Metakit as its back-end"
+HOMEPAGE="https://sourceforge.net/projects/pyndex/"
+SRC_URI="mirror://sourceforge/pyndex/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-db/metakit-2.4.9.2[python]"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
diff --git a/dev-python/pynotifier/Manifest b/dev-python/pynotifier/Manifest
new file mode 100644
index 000000000000..469d931ebe7b
--- /dev/null
+++ b/dev-python/pynotifier/Manifest
@@ -0,0 +1,5 @@
+DIST pynotifier_0.7.0.orig.tar.gz 35358 SHA256 2b27bd034b631226e4bf878183c208909f2653102dfa200af5a075ebf54d2723 SHA512 60be00e5a729c3bb3a6f778025e2422268986645bcb461a81db457cb8e4c94b86d7215d7725f0bc9dd1ea1dfaa16a879760c53dd6824fb398d02b7dc8979c3ef WHIRLPOOL d620d9493129061a02a23310eaeb8c32a6d7f0a963e0cde143019bf3ee27907e29305b52dc833bb8933d69cd9ffc7bcbf2276cd624e060df007f85c14222e42c
+EBUILD pynotifier-0.7.0-r3.ebuild 784 SHA256 362be3fb5f7116b3b6ce3d65884d235219cafceb5f77c7aa00dea67c56609478 SHA512 ddbd9cf3d507867323707ccab37d5e22f939e4f9ec5cab794ef08a9162ac6a5b90348c5c77b9f9df18a255779ecf5c3f454d102a15f23526772da7306e76be3b WHIRLPOOL 7a62b620310731cad2594efed09803b54f49913fabf04d88a81fbf52e0d8e2843b1ce93ea15af2b607a3ab1edb6819be94c201a153b6b7d5c677d7e41235cd9c
+MISC ChangeLog 2444 SHA256 b78f822ae8917ba290654669e88e46d28e9d96bfe3c2f98b42a6e3f9d3af2325 SHA512 b0fc353fc9a6f0d82e0c4902fe6ee0e725f0450012a4b2472192fb990a00306732acbfad28fab6505bcdcc6f1d5f6223e38e9dfc0435860091972ba22fe0f508 WHIRLPOOL 01fc5773ae875db467995fd026bd8bc8e7a82639994675f550304b08ca528eff0479a64e48679b0e240df7cd42f38292793515e6d37dc6ccf3e531437318d7e0
+MISC ChangeLog-2015 3644 SHA256 b1929fa286a8c36ecc6c7803fa1998aed58e8a4bd65e50c594a09c527a6a5ccc SHA512 5ede2023c676e8885e0035fd1a4cb6f18abf4531e0b0644ab3791a79db6ee766bd9711c36b9c5463daa68170420083e03f6b27990b5a3801221eaa75db6825d0 WHIRLPOOL ed07982e787bd41b40fe31254d5fdf4bfad03a976575e4bad67c54fb87163fdb954e5697f7f710572ed48ac16a44e8352004509c2718522a711cb320c6906af2
+MISC metadata.xml 438 SHA256 c2c348e72dd2f9498dd0053a9e11100aab6c298a0056c6a182317b90561a58d2 SHA512 7c76ac9bad501f1bf9bad003d7a30c68c70e8e6515f859a953f7176d3749087fb9f342b22ef0587ec01b810b96c0081371a772f8a0c5114ea20e7348526e41d2 WHIRLPOOL 8205e0e6b69a25e536d2a4c3b1dfe64e938552f98cd1d9cd328061087ace8bfccff4f9e865028a9a8bc131d6b5cb52ee428bb00fb5c133642d680c6d8ec8967c
diff --git a/dev-python/pynotifier/metadata.xml b/dev-python/pynotifier/metadata.xml
new file mode 100644
index 000000000000..af88d08ae16b
--- /dev/null
+++ b/dev-python/pynotifier/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+		pyNotifier provides an implementation of a notifier/event
+		scheduler and is capable of wrapping other notifier
+		implementations of GTK+, Qt and wxWidgets.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pynotifier/pynotifier-0.7.0-r3.ebuild b/dev-python/pynotifier/pynotifier-0.7.0-r3.ebuild
new file mode 100644
index 000000000000..54dbdb9aaf2a
--- /dev/null
+++ b/dev-python/pynotifier/pynotifier-0.7.0-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="pyNotifier provides an implementation of a notifier/event scheduler"
+HOMEPAGE="http://www.bitkipper.net/"
+SRC_URI="http://www.bitkipper.net/bytes/debian/dists/unstable/source/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="qt4 gtk"
+
+DEPEND=""
+RDEPEND="
+	|| (
+		dev-python/twisted[${PYTHON_USEDEP}]
+		dev-python/twisted-core[${PYTHON_USEDEP}]
+	)
+	gtk? ( dev-python/pygobject:2[${PYTHON_USEDEP}] )
+	qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	use gtk || rm notifier/nf_gtk.py
+	use qt4 || rm notifier/nf_qt.py
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pynzb/Manifest b/dev-python/pynzb/Manifest
new file mode 100644
index 000000000000..23a5368bab1a
--- /dev/null
+++ b/dev-python/pynzb/Manifest
@@ -0,0 +1,5 @@
+DIST pynzb-0.1.0.tar.gz 5598 SHA256 0735b3889a1174bbb65418ee503629d3f5e4a63f04b16f46ffba18253ec3ef17 SHA512 c1efb43e56c67652bc12ec555700f134b2bd32546b9dd6c0a28a043db5c8ded5758940121b84541bdb972c7c740357cbc656e233ecfb77787d77727e245b1e72 WHIRLPOOL 0012fd21fd90614f51190ea86f50a0acdbf196555d17de0df8c317a98678d0658e2a3cf4719477cb76981c8a221060c3738230621346a5fda21ebe77ddf94a4e
+EBUILD pynzb-0.1.0-r1.ebuild 442 SHA256 09394937f92b1e1e47580defee268fdbb928e5e7dacda61c1929b90b844e7f10 SHA512 7d68e65f9e660c9e8902659453ca46b229d9e9c3e6547fb841f07847001b86d283b95424752a93d3208302b1dca3a14a0773c83fc97b0bde5ce82ee5449f2ca2 WHIRLPOOL 20e1419c9293f6e371e4574b88a37729c2a5c2db672e202d303b597c222954aa2f6cafcd21574acac1a873cd195105a20c8d8297e4f558352c9187c0a3c6be20
+MISC ChangeLog 2831 SHA256 3cd1d516062a821233e63a100f80dad42f6192badab9c297f5b4d25a95dd3035 SHA512 544b3ccb9b7dc14ce1be70607a2ab87162440bf6b186b1f13522f87af806f2700d430c9a80741b9f37073ef2d39121373b2edfbd63cad244f21f9e7154f9a07d WHIRLPOOL d0a611e0dba56739431cda1bf0aeb79ec0b07bc84ee80e9dfef143b18b4a0738e8ecfd9096fb2c1ba8200012b45dc3a89f0886222f4f0cce1b3f90745171785f
+MISC ChangeLog-2015 1349 SHA256 84ec30bcf567c92a2cd99a1a20d619c958ccecafa7ed0a4e5049e4cff6054dc2 SHA512 244b092dae8475edf9c52330a2e5761eced0fa05e6ff453b3574f3163b00c6e8d9749af3eccae5cab6d89a830905c30156ab8613b395b91eaf89223b09bcd50c WHIRLPOOL 7acd61d00d9758175022c0d9fe052a5bf36be1b12207feccc42b1b63257d473995463d80de6ae5274c506a53901b1e1f9b111d27316b406e0a7715343f8c169f
+MISC metadata.xml 308 SHA256 988cd2fa6e73f36daad4e83499f8988ec41fcb46c8ce2ca3a316309cf4dc3e00 SHA512 1772570155906b62858ca36263c7cee30df515af31c67b8bfbdb32417329151e2723257be00b184b5dc27bab3115486f580f4c959130a783e0a938b8c2a57230 WHIRLPOOL a2ede314dc777c92d30abac847f7b4d32f59d2e8fa65cef25a8daa7da2e3501e49055b528a956eba30ca40ccd832b6d2d83055d92c32285292750b5103b7a141
diff --git a/dev-python/pynzb/metadata.xml b/dev-python/pynzb/metadata.xml
new file mode 100644
index 000000000000..d0301727375e
--- /dev/null
+++ b/dev-python/pynzb/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pynzb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pynzb/pynzb-0.1.0-r1.ebuild b/dev-python/pynzb/pynzb-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..b3ce62499337
--- /dev/null
+++ b/dev-python/pynzb/pynzb-0.1.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Unified API for parsing NZB files"
+HOMEPAGE="https://pypi.python.org/pypi/pynzb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/pyocr/Manifest b/dev-python/pyocr/Manifest
new file mode 100644
index 000000000000..b3d0ebd4eef8
--- /dev/null
+++ b/dev-python/pyocr/Manifest
@@ -0,0 +1,8 @@
+DIST pyocr-0.4.6.tar.gz 1282437 SHA256 1b8b8eac73de03750857edfd58cd8b4b73f025493bd08300121a6c26591ed78a SHA512 3543ef444dc729506574120bafaa192a7b2a689ab408cf59960e2b0be2d9a2eb13fa3bcb02c27022ab48257e8ceac824ca9b8d7e9850ddeef0a877117b889c11 WHIRLPOOL a3e8e77889d5655529fb093e4d8f5206945b135cb0703bfaef0a885ccd3abe8b92092ae82b14cb30ae8f10dd752e2665fa2042b586221ce7431913e18ee59924
+DIST pyocr-0.4.7.tar.gz 1283774 SHA256 2ee1b8107deaeef11505daf777a02affa836e3e13dea37c849b47c332e207ced SHA512 ee4433c34058e0c79478dbf4276f55dabadcf5c841e86e1988e574bf91d96b96a314ef5e15047fb510737c956b4deed200eb47799de6fb1c021e407a6d49c192 WHIRLPOOL 022da075eaec5e86be2e6ee21b7cb8265ff8943e20666c10e3d58dbde2512fe0036cbaf594f0f38a8924d286392607e93ac6958a0c5365a36be3a5edbd1e203c
+EBUILD pyocr-0.4.6.ebuild 745 SHA256 9ab5370548cbdebf8db3adcf444d01ca164b10ce2469c58eb157f8d56748c94e SHA512 359fd7441598355279852ce0aaf0716d43552d771f8d70c70698116c1167f6fc8285d945ade54df5758a85c4fcd73ec3f19e8dbce98b6ebfabeffb8beac20459 WHIRLPOOL fbcb559791780a4ee5f6dfb17fd775aabf842668c78e616bd4b3236d6121934fbd5c12e39145abccd1190bdbf8549408c4c10ef060a43be543bd8d9eb6ce09ff
+EBUILD pyocr-0.4.7-r1.ebuild 761 SHA256 287fbfdcc8a41e77735992bfdbcc6260024ba90d814a946d8b976b9f7e07b106 SHA512 68050ad1419fce72d68b419e3d0a0ef8a14acd330408ddab125bffc144d30710de49f3603cd0a3079f2b74fda0956d6d62e56137e9f182cb6d1163960e122d97 WHIRLPOOL 8809d823a30471e793076b139a5790d1a38433b71153b626bfa3363c2cac65fde3ddf0575115c1d42ea6949eb6aecaeaff09dfd2697fdd72413b6b1456289015
+EBUILD pyocr-0.4.7.ebuild 757 SHA256 0912b85b064caa9654cb5ea0cc2044108f31d6c878e971ece151d4b30a69e631 SHA512 eee4c10d8e3ea4b6f06ca0284e2334c28d2b9119d4d397bb7fba7f1004f1023a2b28edca7850f9ddb572d83864e864ef3354026a4517e3a19fe9417dc7d4f89b WHIRLPOOL 2f45d6ac38fcba034bb18ffa8634be861753908c3421413622b98a2267b3c564a43e483330882156da0e52af7221b91b9a5937bce6d598eadba24a2bba794b7a
+MISC ChangeLog 3233 SHA256 4cb5247a9f275a029736f8b81f6a131540a8e51d086415a38b86df2933b620eb SHA512 63f78203a23b1ebeb2d32587c20044e9966e0562a901fcbeb31252412dc7ed1f649ca6366b69b3201568f6c39f69a1a733a175ee930d243d022cbce304c8bade WHIRLPOOL e4ee97a938b86b1eb82d32a6c5d38faf6df885101bba2934188eb388751a3fa634fcbf2ae2be0d94a2556b5ef0c496268bbcb34798ce12384bc231336b857404
+MISC ChangeLog-2015 687 SHA256 905a4fd6806fefbfbe9a6ddb31c5e822b17169812ce08aa2f3c727caf79b8bad SHA512 baca15e19a6e00c30c44b3f2a5042e7e02bdc3b9982b9e971c45c805d44228c81884b2c707b71ceca200b3a83d523fba27d750d380ef9b6b9c4c72de5702eefe WHIRLPOOL 8a31b12db1f5a3018af9ea134a48340b82647f3c701c66b9fd4dbe8458878c20d4d3d5cb3b4bbe5ebe1099fa1097f4265d1334c8d3399d8587ce4c0ee9826e5f
+MISC metadata.xml 1068 SHA256 e9ce6c6c3aef221f63419905d06fccf8998357d28f4d5707617d072cd28e0501 SHA512 c4fe226c68e85011b2470ec1bcd43eb3744df25948c7dd13a8c21ac3b89e6394f21a4d92793366c17bcaa25c24d8979d75a21bb6e2e884dbeef73e2db0f8f52b WHIRLPOOL b2dac010e8a3fa8d80323953d0cba80c0606f8099190af2ab256ba8668763269e05f1fb730276725c0b3b6f3fb52c19b45e30bf3b9407d4bcbe91fd20ad7ee44
diff --git a/dev-python/pyocr/metadata.xml b/dev-python/pyocr/metadata.xml
new file mode 100644
index 000000000000..2270fa30d7b8
--- /dev/null
+++ b/dev-python/pyocr/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription lang="en">
+Pyocr is an optical character recognition (OCR) tool wrapper for python. That is, it helps using OCR tools from a Python program.
+
+It has been tested only on GNU/Linux systems. It should also work on similar systems (*BSD, etc). It doesn't work on Windows, MacOSX, etc.
+
+Pyocr can be used as a wrapper for google's Tesseract-OCR or Cuneiform. It can read all image types supported by Pillow, including jpeg, png, gif, bmp, tiff, and others. It also support bounding box data.
+	</longdescription>
+	<use>
+		<flag name="cuneiform">Enable support for the <pkg>app-text/cuneiform</pkg> OCR engine</flag>
+		<flag name="tesseract">Enable support for the <pkg>app-text/tesseract</pkg> OCR engine</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">openpaperwork/pyocr</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyocr/pyocr-0.4.6.ebuild b/dev-python/pyocr/pyocr-0.4.6.ebuild
new file mode 100644
index 000000000000..1b297d3a7383
--- /dev/null
+++ b/dev-python/pyocr/pyocr-0.4.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="An optical character recognition (OCR) tool wrapper for python"
+HOMEPAGE="https://github.com/jflesch/pyocr"
+SRC_URI="https://github.com/jflesch/pyocr/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+IUSE="cuneiform +tesseract"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="cuneiform? ( app-text/cuneiform )
+	tesseract? ( app-text/tesseract )
+	dev-python/pillow
+	dev-python/six"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="|| ( cuneiform tesseract )"
+
+RESTRICT="test" # reguires tesseract[l10n_fr,l10n_en,l10n_jp]
+
+python_test() {
+	${EPYTHON} run_tests.py || die
+}
diff --git a/dev-python/pyocr/pyocr-0.4.7-r1.ebuild b/dev-python/pyocr/pyocr-0.4.7-r1.ebuild
new file mode 100644
index 000000000000..f1067744bffe
--- /dev/null
+++ b/dev-python/pyocr/pyocr-0.4.7-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="An optical character recognition (OCR) tool wrapper for python"
+HOMEPAGE="https://github.com/openpaperwork/pyocr"
+SRC_URI="https://github.com/openpaperwork/pyocr/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+IUSE="cuneiform +tesseract"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="cuneiform? ( app-text/cuneiform )
+	tesseract? ( app-text/tesseract )
+	dev-python/pillow
+	dev-python/six"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="|| ( cuneiform tesseract )"
+
+RESTRICT="test" # reguires tesseract[l10n_fr,l10n_en,l10n_jp]
+
+python_test() {
+	${EPYTHON} run_tests.py || die
+}
diff --git a/dev-python/pyocr/pyocr-0.4.7.ebuild b/dev-python/pyocr/pyocr-0.4.7.ebuild
new file mode 100644
index 000000000000..634a7ad88580
--- /dev/null
+++ b/dev-python/pyocr/pyocr-0.4.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="An optical character recognition (OCR) tool wrapper for python"
+HOMEPAGE="https://github.com/openpaperwork/pyocr"
+SRC_URI="https://github.com/openpaperwork/pyocr/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+IUSE="cuneiform +tesseract"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="cuneiform? ( app-text/cuneiform )
+	tesseract? ( app-text/tesseract )
+	dev-python/pillow
+	dev-python/six"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="|| ( cuneiform tesseract )"
+
+RESTRICT="test" # reguires tesseract[l10n_fr,l10n_en,l10n_jp]
+
+python_test() {
+	${EPYTHON} run_tests.py || die
+}
diff --git a/dev-python/pyodbc/Manifest b/dev-python/pyodbc/Manifest
new file mode 100644
index 000000000000..88fa7883b883
--- /dev/null
+++ b/dev-python/pyodbc/Manifest
@@ -0,0 +1,9 @@
+DIST pyodbc-3.0.10.tar.gz 68798 SHA256 a66d4f347f036df49a00addf38ca6769ad52f61acdb931c95bc3a9245d8f2b58 SHA512 4e275f2dfd17b3cbb3ee4c019f8a394bb849b032edab7ae5e9c6d4d6a4933e606ab46284c89b98d39cd553e82263d86dc0bee1260cd2fafb53cf19a918096647 WHIRLPOOL 58dd10b9f5eaef3d077dcb434016710047097406744baa2883758d96d510c38c0ae71ee8abb9cfae1737506fb29744fc6c275fd3ecad2c0371f484dc31432a81
+DIST pyodbc-3.0.7.zip 85722 SHA256 d8355f2d43b10386070e8564aa973119fdb6e10864e1bbd73f3224cd3baab351 SHA512 35d4b17324c60f15bc8647961fff0fa74afa02e37e1019a399add468cfd96e0403f2f7259f3c0164e4c7cabce67de7c300c9950602d9293b0b94a84d2ed02ffe WHIRLPOOL 3da4ecf3706a7cfbe8f11e7f3b1891160e02f7331abea6b407cc5809faa8604f291163f3d3342d7bcf5daa54b1f95aca0b397a5412b7bcdb198810f4fcd59eff
+DIST pyodbc-4.0.16.tar.gz 204168 SHA256 6fd7f100983e700ded8a103391429e43f0b814dc2dc028b904b1798000e72d96 SHA512 53f80ee7333210a1e20e89aa17ca7c2b57363826ac09069213454951ae35f8de689535c05b2278783e8b4a71d178860c3e1efebf51980343a59a9b190e41dda5 WHIRLPOOL 638e026d6c8bfd32be77e89c90762c89153331744e53a0b9582c49fbaf9d9f440ffa2a19a46dd5fc269c968fc2dc6e876e6791bcb718084423e3dbfd132c60d2
+EBUILD pyodbc-3.0.10.ebuild 630 SHA256 05597b1fc5564b22125baffa3a2b621b740ddef58e325c4e023c95399334ba03 SHA512 3155cb429a2a2c05a12cba223af7f885f7cc60bf97d14065a271c29dcbb49ebf2080e9e69e48468f89241aba7980844b0c0957680aa19c15d406aab542861d8e WHIRLPOOL 6fe9f38040d242849c77abb982aef09b5e94b3c62f17d0f1405f5875e9f7b2ca8c33eaf5aa448b0059c253a35d20e1960c99304c15eb5fd745c642d5cbf27c10
+EBUILD pyodbc-3.0.7-r1.ebuild 641 SHA256 abccb9eec4c0a62dad3fd1ba6046807f000e55ef840a1408f2fe91a13403a831 SHA512 f9c82dd316f8546173edb5aacb2116c659c57bf345e8a2babbd2a78f9163dcd4e886e706849b45d1392f2256ded848529b0573fbbae871de55d456f30f87d921 WHIRLPOOL 9aed4ae71b23344ca53f8360d54533ba5bd98bbe4517a9e2a4e13c7c9174b8d6afd9823cf6693531c41d28d3ff12dbbe3131dffb6f0e96849fb6b04b0e86f52f
+EBUILD pyodbc-4.0.16.ebuild 626 SHA256 54c838fe3f50ae5929fa3105297cfcbd4fb2e53b5decc009a4abfca3e6c3a063 SHA512 f490b84432d174bb522bb99814115d4cef734c19ee1f42656f77e9934d44c067b0ca130bdadd11a731913b0a1af22b8a770d7c52ecfacaa62376f16b5bc6652e WHIRLPOOL 31cd6fa647bacd1f46efb3a7b9cef929c1cc5d2ac2d4a3f958bf4cf1798027a641d080a01747d5d64fd2bb2baa194a80d241221b1fe2540c052204d7e5078266
+MISC ChangeLog 4053 SHA256 08b30a32c74c058170c83599012210a763ff92bf0aa9de57ae784bce60eef95a SHA512 39b9d7349a8562676f9d268fdd3916825b6dca1cc9cd8a44d077ede692e61d82e10ec5a1cba8eefd0803f4a7570aef4325084c0ece02228097187a6d872b087b WHIRLPOOL ff453db7809cd4349fbba67f8af85964bfa8befeaafac0b0c547df36aa0786434c245efcad2b7061eae23ab1cedd43f6042da0668d4efac24f25d0578fe6ea4a
+MISC ChangeLog-2015 1981 SHA256 2fd6d2de2f9f6517d89c4f5264fc2b2d80e62c130a482a91ca450ac308a760be SHA512 de56a73637ffbd68605661160015866b899af446ce8ef3b8c89ca81fe98be924794c4b0a777f474c71e7f295e5c1d84f57f141360695ffb51fd5a6c61885e757 WHIRLPOOL 6c2c0a16d0955390402285af527b828c51cf6f4ab1e04f2f35352565acaafa647503c72b0a36e7bd2029696ca12f570873ed2878621bf2dff7d1da2c3b72052a
+MISC metadata.xml 367 SHA256 3bccd32865615662d3d8c86f6502e324907d9d046f36a41003d25e15235ecde5 SHA512 4e776353a7d6e61d0572fe852830214d0ee0eafbd9bad6ba19851e093f413e7d5fcd7f8d33c7c75be107b98a3003ddf8432390694c7372b5bf7eae05379ea38f WHIRLPOOL 8cf26bcd11d7d43b4ac8143d1dc7ad16479e8cad502c32509f466829d58f11c7fa3ce47103f144b47e978100a0e103f2459346cb8e8ace30ed8f24dfe91d8843
diff --git a/dev-python/pyodbc/metadata.xml b/dev-python/pyodbc/metadata.xml
new file mode 100644
index 000000000000..3bc6483fe583
--- /dev/null
+++ b/dev-python/pyodbc/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mkleehammer/pyodbc</remote-id>
+		<remote-id type="pypi">pyodbc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyodbc/pyodbc-3.0.10.ebuild b/dev-python/pyodbc/pyodbc-3.0.10.ebuild
new file mode 100644
index 000000000000..239986f3448f
--- /dev/null
+++ b/dev-python/pyodbc/pyodbc-3.0.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="python ODBC module to connect to almost any database"
+HOMEPAGE="https://github.com/mkleehammer/pyodbc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mssql"
+
+RDEPEND=">=dev-db/unixODBC-2.3.0
+	mssql? ( >=dev-db/freetds-0.64[odbc] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_configure_all() {
+	append-cxxflags -fno-strict-aliasing
+}
diff --git a/dev-python/pyodbc/pyodbc-3.0.7-r1.ebuild b/dev-python/pyodbc/pyodbc-3.0.7-r1.ebuild
new file mode 100644
index 000000000000..3c15583d4825
--- /dev/null
+++ b/dev-python/pyodbc/pyodbc-3.0.7-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="python ODBC module to connect to almost any database"
+HOMEPAGE="https://github.com/mkleehammer/pyodbc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="mssql"
+
+RDEPEND=">=dev-db/unixODBC-2.3.0
+	mssql? ( >=dev-db/freetds-0.64[odbc] )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_configure_all() {
+	append-cxxflags -fno-strict-aliasing
+}
diff --git a/dev-python/pyodbc/pyodbc-4.0.16.ebuild b/dev-python/pyodbc/pyodbc-4.0.16.ebuild
new file mode 100644
index 000000000000..88343266e081
--- /dev/null
+++ b/dev-python/pyodbc/pyodbc-4.0.16.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="python ODBC module to connect to almost any database"
+HOMEPAGE="https://github.com/mkleehammer/pyodbc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mssql"
+
+RDEPEND=">=dev-db/unixODBC-2.3.0
+	mssql? ( >=dev-db/freetds-0.64[odbc] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_configure_all() {
+	append-cxxflags -fno-strict-aliasing
+}
diff --git a/dev-python/pyode/Manifest b/dev-python/pyode/Manifest
new file mode 100644
index 000000000000..6a5b96ce71d5
--- /dev/null
+++ b/dev-python/pyode/Manifest
@@ -0,0 +1,5 @@
+DIST PyODE-snapshot-2010-03-22.tar.bz2 55651 SHA256 c934fe2fc76e0b8d71d343eb5db63511ab040b226fd0148708214fc775e2998b SHA512 fd9457d9a9c42a5e9834ce45886d6b57c9ecfdc68868353d986fa219eb57246d4dc175ca5d12c876c359c5bdac5bcdaf6dfc2ee65fff52f53337b1d10458e54c WHIRLPOOL 0051aa48e88bce569c86e517e5992ab8b860f724df9a9d3b8a9d0a700223927c677b0598bc9be7430f035a59cae65d76343f30539456000467f8da63e906a9e5
+EBUILD pyode-1.2.0_p20100322-r1.ebuild 1097 SHA256 43b10468a92f16aa7e6d7c1ce1fdac5d664c0e0f5dacd957034b0f6218b75168 SHA512 cbf3345ec418b1aa0aa361884f0b9b4fc3fdad7b43e3fc73a21b8cfc2122b7c58440a9119f227a1fe8bf72c4f688fbb8330efda3334f53be2691370fa0ea595d WHIRLPOOL 53f94fa2d865e371b7aeca1acf48ec49d7bccfdf0bc2bca74e50f4cb3253cb15062e6885be2c4c274b18340771014fad7c6693b15905b7af2e378efef4b08c07
+MISC ChangeLog 2449 SHA256 ebfb538a848301cb862e967106c8532eae497de08e71821ea20d79e736dfc304 SHA512 cb01a85a01691b875a66e1f051b45dc18d778c1c8e8e84ccaf30cb8f427bc8b810cb7c15d2b17af29e8c353556b1070d3c6d3743a28a7d5959f2590725b0f673 WHIRLPOOL 16699b8acbd8135bc266dc2497145cad0e19ea61a61713b0d8f6dd3cdbbe437faeed7e5b3c7407afa57fda7af33f6ab616adab2d267d7e35d454c77c4752fc82
+MISC ChangeLog-2015 3903 SHA256 e866b8770f4deeeb6ec46cc2ed411211e2ce85973793367914d72b3ea73b533b SHA512 0502e2612bce4db569c4021dd072760b27b3b61fe3ee3db9358ded6c6297c53fb1a167c106c8c8e80805ffbc4e473e09cd6ea05f945814c523a43f4754e804e3 WHIRLPOOL cc72736b46d1a2d8aa850e16480242910d071d1626050c55da213799d35f2076af9756fa8889ec7cf21e49cd08475c7b9cf29657fcf0982df0f553e41ddfb655
+MISC metadata.xml 315 SHA256 5d908b7c926087f6cde7ff3fef4d1e59e2096139c1841f30093dbb8a41e078ff SHA512 7ba6e25932ddc1fd466396957779165b27dca693b347b459da8e774cda05e69dd845f11ae641dbcb3743d047688a2f991edb89aa296cbf3aeb3af5f06869daaf WHIRLPOOL 2aca695973d9bdccf8ed29a9b76302a7433a73f80e2d28805e5b09f9cec9832806b61977cb8613713f55e346684f84eb19956b080aacb83ff308ad6bbfcfdd25
diff --git a/dev-python/pyode/metadata.xml b/dev-python/pyode/metadata.xml
new file mode 100644
index 000000000000..d379d56a54fc
--- /dev/null
+++ b/dev-python/pyode/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pyode</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyode/pyode-1.2.0_p20100322-r1.ebuild b/dev-python/pyode/pyode-1.2.0_p20100322-r1.ebuild
new file mode 100644
index 000000000000..ec445e803c76
--- /dev/null
+++ b/dev-python/pyode/pyode-1.2.0_p20100322-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+inherit distutils-r1
+
+MY_P="${P/pyode/PyODE}"
+SNAPSHOT_DATE="2010-03-22"	# This is a snapshot
+
+DESCRIPTION="Python bindings to the ODE physics engine"
+HOMEPAGE="http://pyode.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/PyODE-snapshot-${SNAPSHOT_DATE}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE="examples"
+
+RDEPEND=">=dev-games/ode-0.7
+	>=dev-python/pyrex-0.9.4.1[${PYTHON_USEDEP}]"
+DEPEND=${RDEPEND}
+
+S=${WORKDIR}/PyODE-snapshot-${SNAPSHOT_DATE}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# The build system doesnt error if it fails to build
+	# the ode library so we need our own sanity check
+	[[ -n $(find "${D}" -name ode.so) ]] || die "ode.so is missing"
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/pyoembed/Manifest b/dev-python/pyoembed/Manifest
new file mode 100644
index 000000000000..c6b97e3fad92
--- /dev/null
+++ b/dev-python/pyoembed/Manifest
@@ -0,0 +1,6 @@
+DIST pyoembed-0.1.1.tar.gz 12941 SHA256 7a50072d8f0e38e9aa586c24fd693f225ccd78936f55fa35c3fed3fadf1b0e13 SHA512 6ce7ec87082179c0f35dffe67f7ce91b71c40c57ed6bf7bd0ecd2ce654fbd1ab0c6f6469cbfb4e0a8dafc970bf496ffbc57f09838cf575e0becf7527553de63e WHIRLPOOL ae3cf3eaf51ea52a1c4349df97fb628b78172bb2bcedcf8d99993c38c5526755a73a921929f5b137a6a2d69a884a540cf69badc8cfcfd872c697e6eb5909f098
+EBUILD pyoembed-0.1.1.ebuild 752 SHA256 24c6a4be8c576cbb34ef1a501be141a28339e86b2a01b2514d5c490516161131 SHA512 c32c70ead9ade63b7e65e36174329ff5bffa632fce01e45230dffc8c0f32ae85dea3a7cb87b2c27b4b163a6d08cd6cbfb63a53380257f03daa9ddcb10640deb4 WHIRLPOOL 07eb734f3a9f12fc712e6b660c086319ddf290802c6026b8d6fbfb3594e854e23fd329cca4bf7427c18193dfde347adb1fad5086c897656e64c0edb7b30aa491
+EBUILD pyoembed-9999.ebuild 752 SHA256 24c6a4be8c576cbb34ef1a501be141a28339e86b2a01b2514d5c490516161131 SHA512 c32c70ead9ade63b7e65e36174329ff5bffa632fce01e45230dffc8c0f32ae85dea3a7cb87b2c27b4b163a6d08cd6cbfb63a53380257f03daa9ddcb10640deb4 WHIRLPOOL 07eb734f3a9f12fc712e6b660c086319ddf290802c6026b8d6fbfb3594e854e23fd329cca4bf7427c18193dfde347adb1fad5086c897656e64c0edb7b30aa491
+MISC ChangeLog 2233 SHA256 2f8bebdfca27181afebbc42f2fb7320a1bd57879359df578efe12f0449ebb4e5 SHA512 89bc57e1ffd58ee92190175ba49634ae7bcd8b71eab8252fbf0d9e72f0153daa5d8e7967a778ab9840062def49b796f1a69c3e31596dbd62b8e7b74ce0c227b5 WHIRLPOOL 58f79b998ec1391c5458b14e424fa7128351dc8f5b3ad4464a911960bfdcf8c556275a6f8fffa6c83973f5fcbab4f9398015fa65e894e939e83242044d000457
+MISC ChangeLog-2015 808 SHA256 caf74a49ebd7b834d98b01249c8faf7b723dd539d20160a4def4f960d814738e SHA512 627df826d0c596c8e7e3928fd9f6b8e02125dd9310ca1f8857d671d49a03ce5b46dd7d2db734dd11b42518b437492143f59472d80c8b12da05905bd38baa0590 WHIRLPOOL 2279766dff884ad94b9dca209723b01ee96cb5c11c80325a739a3f0633dc1a2b82a86cc933bbb56b8d83a6b957d218295bd7db0cc98f75ce545cfbfbde95c116
+MISC metadata.xml 656 SHA256 a3ac295fcf379e68e9abee10bd9760f04f929cefda481178989c105a6a31c488 SHA512 65a38eadbd1450933b37c210be72d594943761bf0fa543e20e9364e97d8e14ec3722906c653842fb1ea47fdbd58851a208cfd124630afad2e25f00d74e585bd5 WHIRLPOOL d80f40227bfe52b80fb0360fd2def217cccf07b0bafd165649b0e2ff724a641eca0db3073354d62daf92a941c8273b2d782d90b6c44acb71fc2aca767be4387c
diff --git a/dev-python/pyoembed/metadata.xml b/dev-python/pyoembed/metadata.xml
new file mode 100644
index 000000000000..20911663d8b3
--- /dev/null
+++ b/dev-python/pyoembed/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+	<longdescription lang="en">
+		A Python library for oEmbed that supports auto-discovered and manually included providers.
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+			<email>rafaelmartins@gentoo.org</email>
+			<name>Rafael G. Martins</name>
+		</maintainer>
+		<remote-id type="pypi">pyoembed</remote-id>
+		<remote-id type="github">rafaelmartins/pyoembed</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyoembed/pyoembed-0.1.1.ebuild b/dev-python/pyoembed/pyoembed-0.1.1.ebuild
new file mode 100644
index 000000000000..3b6c54f2f8c2
--- /dev/null
+++ b/dev-python/pyoembed/pyoembed-0.1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for oEmbed with auto-discovered and manually added providers"
+HOMEPAGE="https://github.com/rafaelmartins/pyoembed"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=
+	KEYWORDS=
+	EGIT_REPO_URI="https://github.com/rafaelmartins/pyoembed.git"
+	inherit git-r3
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pyoembed/pyoembed-9999.ebuild b/dev-python/pyoembed/pyoembed-9999.ebuild
new file mode 100644
index 000000000000..3b6c54f2f8c2
--- /dev/null
+++ b/dev-python/pyoembed/pyoembed-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for oEmbed with auto-discovered and manually added providers"
+HOMEPAGE="https://github.com/rafaelmartins/pyoembed"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=
+	KEYWORDS=
+	EGIT_REPO_URI="https://github.com/rafaelmartins/pyoembed.git"
+	inherit git-r3
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pyogg/Manifest b/dev-python/pyogg/Manifest
new file mode 100644
index 000000000000..b236aca8ab6b
--- /dev/null
+++ b/dev-python/pyogg/Manifest
@@ -0,0 +1,5 @@
+DIST pyogg-1.3-r1.tar.gz 24094 SHA256 10051f2894e901037dfa05b3c604fbdd76d891b9db2213a3c4f24ae79fbcc2a4 SHA512 aac8ac880080b3a0b7008fd52115b0790892a41abc36155fbd7b6b363f0bb0ed14b2c839cafe28233f17fed34f1511d3218db09df728bab6510c7f81e028577f WHIRLPOOL 34035eb0364c84521a035a7648488b94439c819e4205d1ca63a7638a67f47bf3852503d12ad9eb7db7400ca54bdb658d92e614d377ed74886a6e423a9aeb0ea2
+EBUILD pyogg-1.3-r2.ebuild 865 SHA256 f53be4afb2f0cc68a9e0eb1c57422c46bc34ce39ca8499a3ad914bd8d8577381 SHA512 334656c6b52aace662a7581add7797ee39ee003fe2fde6126c9be0c2e936bd9120e129d9770799440946fc7e604af240859c930ccbb013153d5e8c7c65a45c92 WHIRLPOOL e421ffe2a1f9407bd557bd16a4d97df496acc65546241a6edbd462c13276e042633e194cf246278a3a683c03c479bfb83bcee14f8bb83f57d4b326398894362a
+MISC ChangeLog 2425 SHA256 b9166d6c681082fed8c703562fe1756d120c7de63e9319cac68efd1d4b219c6b SHA512 84b98d6448d265d8c6f575f34619f401bcba7c8b186a0c10f9b160dd2e1818a2b763ebf0af29c3e2bc44f5311861699eeb912e210945022165a367a95ae590be WHIRLPOOL 7ae7ae17ae64be4acb9851ba3e528b11153e8dd1afca1d2fc1ddb4dbf7ae6051495991b93cfc9075a0284e6b0a6bd0b700ef8a47c41e189208ab89a7427c48e4
+MISC ChangeLog-2015 4626 SHA256 4ebcc3c10366199436b66a8b7cd25063b26123e9f4669260b1f696ab3bfcea38 SHA512 44fe3d1bfd91780017ce29299d1768e26a7e6a5f35d666048c90af0daf8ea8e9a7ce229842185cdde508e4a98513418977b4a7835859e61eb6017e775281637f WHIRLPOOL 7199a8a1c6c1ce9a51f5afffad4443029ee1f4d9ea1008e710f26017ddeb3f012ddf6189399e62a63aa909f87176cfc90512b144a89b0d580af2495a2095d9af
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/pyogg/metadata.xml b/dev-python/pyogg/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/pyogg/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyogg/pyogg-1.3-r2.ebuild b/dev-python/pyogg/pyogg-1.3-r2.ebuild
new file mode 100644
index 000000000000..ec98a7defffd
--- /dev/null
+++ b/dev-python/pyogg/pyogg-1.3-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Python bindings for the ogg library"
+HOMEPAGE="http://www.andrewchatham.com/pyogg/"
+# Grumble. They changed the tarball without changing the name..
+#SRC_URI="http://www.andrewchatham.com/pyogg/download/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}-r1.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=media-libs/libogg-1.0"
+RDEPEND="${DEPEND}"
+
+DOCS=( COPYING ChangeLog )
+
+python_configure_all() {
+	tc-export CC
+	"${PYTHON}" config_unix.py --prefix /usr || die "Configuration failed"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	insinto /usr/share/doc/${PF}/examples
+	doins test/*
+}
diff --git a/dev-python/pyopenal/Manifest b/dev-python/pyopenal/Manifest
new file mode 100644
index 000000000000..aef85877177b
--- /dev/null
+++ b/dev-python/pyopenal/Manifest
@@ -0,0 +1,6 @@
+AUX pyopenal-0.1.6-setup.patch 635 SHA256 8453234e33bf57b62dfb150a9924a984897680a3775381d4a67ecc2f4d3d492f SHA512 8169b55b387eadc70df6b6c9c850a010660b10410d15540d6a3e960811573b7409122b476cc58bc223df49663fe8fa14ede27b1c7a67f0c42ac4b11e990ec0b2 WHIRLPOOL 353f88bd2041485f0d4d2e8bd12ab4948136380ca00905fe7645cb3bf02b2bb99629cf5da9acbf6e0754f9c1b7ea97b771479d81cf0e1264aa51fb6d30792940
+DIST PyOpenAL-0.1.6.tar.gz 27698 SHA256 94b69cc57fe5e5abe2876865a6e2264d180892e82ac2ed684dc8eaf2cbf1ec5e SHA512 b617781d8253e4ec81fb806709fa5cb0ca3815d11c2fe1b9a74043909bbc3fa57eb8cb0375ad5999c1a7105c5468a75cb7893e186f48e2c440d8b56bb6a87f7b WHIRLPOOL 238f4e65c31972a131858fda02a0858e85af187318a09d5bc5b48d6b68943de1c1eeec5de1715d4124aa49dc2c5efb445bbddadb6cc02c3214e00c23e3d76275
+EBUILD pyopenal-0.1.6-r1.ebuild 791 SHA256 7c886e7469a499e68ed643c0a91fa9e817bfbad002bbdd9dcbdb7c6f4e4fec05 SHA512 877a9d1204f5b8ad9d2dee132ad24f8aee912d0a003840d83a38b381d3c681dda231de88c2ad489e2c1d974c3730928911696db2f0f79fc3c62143333632cb38 WHIRLPOOL ca145ae7a92430da54c4d3fe26d5b0da97578f5e81d8c3e3c525e6a3add8b82e2c305fb5858db05aa068165d68fdad85a270093820f983f4bec428df36d4532a
+MISC ChangeLog 2473 SHA256 e8ab1618519dc1fda3d94c27b1f25080ef23efa869058efe776bc68879fe6f49 SHA512 c23dab996f914698b26916fe4d189fdf70542bc2a84b02025148788a764b3e219ee751e3749b723d9bab3e2ca2e77d21ca5fb75949999ce21ed070dc2b9c814c WHIRLPOOL 801365f135fe728c7cbcc8f7cace34ae472528b33b76a73cc107eed06747d2416f3eb31be87f0baa4b0dfd229fe82b226bb853d9bfd217815aad9494a0fb498a
+MISC ChangeLog-2015 4070 SHA256 98161fbbc607097e632c5480147617079aaecd56411f277819653c2b75b3b5d5 SHA512 85a20cdcda0d57dd96df055fcefe8af40eb8a69426dcd4195e4e0b5646a37f97375865d78fad8f0dd431ca2687899f2f2e905a38d84ac80f2b07fdf51b8e8972 WHIRLPOOL b4d5fcf52bedac735c9356d8177045ebece2beb322d421c08af9b243fdaa1817c6aaa67dd2383d72cfa2f7d55b3d5ae1f12e69bca5f325272bfc97186e77eafe
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/pyopenal/files/pyopenal-0.1.6-setup.patch b/dev-python/pyopenal/files/pyopenal-0.1.6-setup.patch
new file mode 100644
index 000000000000..f9ef9f3c0330
--- /dev/null
+++ b/dev-python/pyopenal/files/pyopenal-0.1.6-setup.patch
@@ -0,0 +1,20 @@
+diff -urN PyOpenAL-0.1.6.orig/setup.py PyOpenAL-0.1.6/setup.py
+--- PyOpenAL-0.1.6.orig/setup.py	2006-04-30 11:23:44.000000000 -0400
++++ PyOpenAL-0.1.6/setup.py	2006-06-13 12:15:46.000000000 -0400
+@@ -4,16 +4,6 @@
+ LIBDIRS = ["/usr/lib", "/usr/local/lib"]
+ LIBS    = ["openal", "alut"]
+ 
+-try:
+-  openal_version = os.popen("openal-config --version").read()
+-  if openal_version[0] == "0":
+-    LIBDIRS = ["/usr/lib", "/usr/local/lib"]
+-    LIBS    = ["openal"]
+-    
+-except:
+-  print "Warning: error while running 'openal-config --version', using default values..."
+-
+-
+ setup(
+   name         = "PyOpenAL",
+   version      = "0.1.6",
diff --git a/dev-python/pyopenal/metadata.xml b/dev-python/pyopenal/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/pyopenal/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyopenal/pyopenal-0.1.6-r1.ebuild b/dev-python/pyopenal/pyopenal-0.1.6-r1.ebuild
new file mode 100644
index 000000000000..21ef78fdc08b
--- /dev/null
+++ b/dev-python/pyopenal/pyopenal-0.1.6-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+MY_P="${P/pyopenal/PyOpenAL}"
+
+DESCRIPTION="OpenAL library port for Python"
+HOMEPAGE="http://home.gna.org/oomadness/en/pyopenal/"
+SRC_URI="http://download.gna.org/pyopenal/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND=">=dev-python/pyogg-1.1[${PYTHON_USEDEP}]
+	>=dev-python/pyvorbis-1.1[${PYTHON_USEDEP}]
+	media-libs/freealut
+	media-libs/openal"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS CHANGES )
+PATCHES=( "${FILESDIR}/${P}-setup.patch" )
+
+python_compile() {
+	local CFLAGS=${CFLAGS}
+	append-cflags -fno-strict-aliasing
+	distutils-r1_python_compile
+}
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
new file mode 100644
index 000000000000..d9fc531115ee
--- /dev/null
+++ b/dev-python/pyopencl/Manifest
@@ -0,0 +1,10 @@
+DIST pyopencl-2014.1.tar.gz 1642825 SHA256 7c8df4f22ef49516a1444760dc622a037c83079ff60ff81779e60cb9fc5410e7 SHA512 da3e4e8d95605381d87db482f61fe7030fe244611a3c35d84c88210bcfb3472dc197be721f92e46e6828cc5d0245981ae004331a7c19e7fd8011a0aab593072f WHIRLPOOL e9d3c742c6ef217cf1f223990f852ae5b5ef50b7eae3513955da00f41134d9805e2078c16cd31429e327ea64a7ea16c15c014a749a3a532c3a11e4babdb91202
+DIST pyopencl-2016.1.tar.gz 311327 SHA256 54b6e8ad02dc437807739bd53e43851efe979bd51ec87996e44b94ab67238297 SHA512 3be8da315f9b4a4e03071152bb5968c5c7b102cbae6c70f358438cfd7951d12970a76dd8e922187ff73e47f7d0ce7a070e6f303dbe364c016796fa65d7e1de71 WHIRLPOOL 23514d2ff8b578d623506033c749df5fd1d5604f5deefda72e817c688df9337c608d291f5ae8efc0e227e857ef16b65adb51ebc20773d0f8e636665990902ea9
+DIST pyopencl-2017.2.tar.gz 350145 SHA256 039b689a58eb98e27a577ac086210deae959f40d657487f3199d2d217c270ff9 SHA512 49f2ff619d8c214a3962b8444e68ba415dda032abaf9eeab259fcd1b21fbaab10bd057035161baef7f0182995834082218a6667464c01645231a94c88aa5c18b WHIRLPOOL 6dbcad877482932641c26c398ed464560c9787f5ef0fb9db0591c82dacdfe2fcfbe22db672b6e319d434e9bae59133c71fa4d1ac05eef4ada5b70bdf4f350f47
+EBUILD pyopencl-2014.1.ebuild 1126 SHA256 55a5bdee63e8d0c6817a31a752087e87594b830a9a068b137479d9338862b82e SHA512 b542a67042a3af992eefac3324e0f9466cfad2f0fc6d7d2ff5b1e9a9d8c52f09783bbab86e57640916bcf38826be5cbc954f4f584e381b02dcb0e42deafdd969 WHIRLPOOL 07d166fea3979fbd5eed863f00313b2638fefdd96b44d7061c21e4cd10aaa58152bc73bb59468c34655229748e543588325c3201e75df9867bab3d6eb23792fd
+EBUILD pyopencl-2016.1.ebuild 1285 SHA256 b600b18ff007542678439c16429f3a2891dec086f1d7ade35fb412adb4d8aa72 SHA512 3489cbf14413d2fbed12dd9c6d5fb21291852ba0495525c93b14c667066533df1920a38623314121283a6fba1c859ea88f7e08ed096dcc7364ea5392c9e1f2a5 WHIRLPOOL dfbe49b8b03755a1164385d1bd00864c9ce5470015f612fbef13849371921788f27b157504a30e5f18d9f8f8c57fa85e68b8edf7722f6d2675acf7d199db1c84
+EBUILD pyopencl-2017.2.ebuild 1287 SHA256 f8c1789334595b3e24c29a081e86f9a61eb1d5ff3cceada628e282ff64811ccb SHA512 1d4208add16d2ee604a526d5a39d11cef7a8108bcdc466767ff359a5962dfad4c63820f98672531134338462824f873848fbb519d5a5b0e3365f50bdff01facf WHIRLPOOL f2f2f675efafef2f0d19fbfec332829bca77a56b794ae13523022ec97454edf2126a8737c4fc9974dedb34ee3569e99098fe3a6d1e74cd60f6e46d4fed35c822
+EBUILD pyopencl-9999.ebuild 1150 SHA256 a5ba0ed69648539f443431239af5a81c3dae1725701f1b815c11f10746177b76 SHA512 37e50f90b2703586efc50e025c2e6c237db908ec39d17801ca72aa1b7c5f336f50bfdd3d7cd5c29b7dd59beb24d95117e78d94bbabea43f966f21e3dddb5b136 WHIRLPOOL 30f2fa0fba446d24b429a668890c6b40f255f8f092bed808e95e86801a705385085c71b9716b952fe1e975621b5158314746cc69f61c766cfc087343d32c9b6b
+MISC ChangeLog 3503 SHA256 c32c93731872b67c869d42037dd15c75100210e296ff324be0b898d3f3e1e4af SHA512 61290cc3029049df9f2310c5823fd0a4875725ebd9aea50b24506cfc4a1c7574e5d8551575bbd029ca4a75038dde62f595cd84222e3482f2f3d76348ee5b0d07 WHIRLPOOL 505ccfb791e701c2d85b4b7c250cb346acd28164038fe2b17aa506a5fea1c091aec9fc0267628eb60235ff0d4c3725e37de9695775f94285a2a775775df02075
+MISC ChangeLog-2015 5050 SHA256 11feb5099e8c5c704f3c015d3683224337300a274f802f6ad42a3fcae0b7ed0c SHA512 c6f3407dea6c20394d009482f2142481b7181c3086cdd0924d9c07ab0482935f68cb8431784ca9630bbbd78d62a01df9fb26ac82fd1da1180327010b90a7532e WHIRLPOOL 3e3cd8aa7c58c5c930ced7b0ca776f191b44119f971ca001f7a07c8586a38ecf4cf2289bba8e2a2fb296fa242ffa323a764860143ad52b72fcbd2e3d2c88955e
+MISC metadata.xml 311 SHA256 41e9ff1d89aab50503aaa78870f88d769409ab225be4199caff2487ee5639ea6 SHA512 14da0f2cb9db48698adc78e6827c161a93ac3307c0a595fbf69c45839dac9178966fa855193adf2f175685b7be31eb161c0281b3a35ef2e455db62f0ba65dde5 WHIRLPOOL 533c18e972ce326b9cc546994c2121ea443920256bfe34e258a10842a3a42d62e3259d59aff9f628f32f8135bda1d49b19c7cc55e2b5a23fa302779656a9ebac
diff --git a/dev-python/pyopencl/metadata.xml b/dev-python/pyopencl/metadata.xml
new file mode 100644
index 000000000000..16b6e3efa20d
--- /dev/null
+++ b/dev-python/pyopencl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyopencl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyopencl/pyopencl-2014.1.ebuild b/dev-python/pyopencl/pyopencl-2014.1.ebuild
new file mode 100644
index 000000000000..95402dfd22c0
--- /dev/null
+++ b/dev-python/pyopencl/pyopencl-2014.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for OpenCL"
+HOMEPAGE="http://mathema.tician.de/software/pyopencl https://pypi.python.org/pypi/pyopencl"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples opengl"
+
+RDEPEND=">=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/pytools[${PYTHON_USEDEP}]
+	>=virtual/opencl-0-r1"
+DEPEND="${RDEPEND}"
+
+src_configure()
+{
+	local myconf=()
+	if use opengl; then
+		myconf+=(--cl-enable-gl)
+	fi
+
+	"${PYTHON}" configure.py \
+		--boost-compiler=gcc \
+		--boost-python-libname=boost_python-${PYTHON_ABI}-mt \
+		--no-use-shipped-boost \
+		"${myconf[@]}"
+}
+
+python_install_all() {
+	if use examples; then
+		local EXAMPLES=( examples/. )
+		einfo "Some of the examples provided by this package require dev-python/matplotlib."
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyopencl/pyopencl-2016.1.ebuild b/dev-python/pyopencl/pyopencl-2016.1.ebuild
new file mode 100644
index 000000000000..6856259e2497
--- /dev/null
+++ b/dev-python/pyopencl/pyopencl-2016.1.ebuild
@@ -0,0 +1,50 @@
+# 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
+
+DESCRIPTION="Python wrapper for OpenCL"
+HOMEPAGE="http://mathema.tician.de/software/pyopencl https://pypi.python.org/pypi/pyopencl"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples opengl"
+
+RDEPEND="
+	>=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2015.1.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=virtual/opencl-0-r1"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local myconf=()
+	if use opengl; then
+		myconf+=(--cl-enable-gl)
+	fi
+
+	"${PYTHON}" configure.py \
+		--boost-compiler=gcc \
+		--boost-python-libname=boost_python-${PYTHON_ABI}-mt \
+		--no-use-shipped-boost \
+		"${myconf[@]}"
+}
+
+python_install_all() {
+	if use examples; then
+		local EXAMPLES=( examples/. )
+		einfo "Some of the examples provided by this package require dev-python/matplotlib."
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyopencl/pyopencl-2017.2.ebuild b/dev-python/pyopencl/pyopencl-2017.2.ebuild
new file mode 100644
index 000000000000..f61d50f65f40
--- /dev/null
+++ b/dev-python/pyopencl/pyopencl-2017.2.ebuild
@@ -0,0 +1,50 @@
+# 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
+
+DESCRIPTION="Python wrapper for OpenCL"
+HOMEPAGE="http://mathema.tician.de/software/pyopencl https://pypi.python.org/pypi/pyopencl"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples opengl"
+
+RDEPEND="
+	>=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2015.1.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=virtual/opencl-0-r1"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local myconf=()
+	if use opengl; then
+		myconf+=(--cl-enable-gl)
+	fi
+
+	"${PYTHON}" configure.py \
+		--boost-compiler=gcc \
+		--boost-python-libname=boost_python-${PYTHON_ABI}-mt \
+		--no-use-shipped-boost \
+		"${myconf[@]}"
+}
+
+python_install_all() {
+	if use examples; then
+		local EXAMPLES=( examples/. )
+		einfo "Some of the examples provided by this package require dev-python/matplotlib."
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyopencl/pyopencl-9999.ebuild b/dev-python/pyopencl/pyopencl-9999.ebuild
new file mode 100644
index 000000000000..51361d489551
--- /dev/null
+++ b/dev-python/pyopencl/pyopencl-9999.ebuild
@@ -0,0 +1,48 @@
+# 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 git-2
+
+EGIT_REPO_URI="http://git.tiker.net/trees/pyopencl.git"
+
+DESCRIPTION="Python wrapper for OpenCL"
+HOMEPAGE="http://mathema.tician.de/software/pyopencl https://pypi.python.org/pypi/pyopencl"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="examples opengl"
+
+RDEPEND=">=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/pytools-9999[${PYTHON_USEDEP}]
+	>=virtual/opencl-0-r1"
+DEPEND="${RDEPEND}"
+
+src_configure()
+{
+	local myconf=()
+	if use opengl; then
+		myconf+=(--cl-enable-gl)
+	fi
+
+	"${PYTHON}" configure.py \
+		--boost-compiler=gcc \
+		--boost-python-libname=boost_python-${PYTHON_ABI}-mt \
+		--no-use-shipped-boost \
+		"${myconf[@]}"
+}
+
+python_install_all() {
+	if use examples; then
+		local EXAMPLES=( examples/. )
+		einfo "Some of the examples provided by this package require dev-python/matplotlib."
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
new file mode 100644
index 000000000000..e183a5c3db24
--- /dev/null
+++ b/dev-python/pyopengl/Manifest
@@ -0,0 +1,5 @@
+DIST PyOpenGL-3.1.0.tar.gz 1172688 SHA256 9b47c5c3a094fa518ca88aeed35ae75834d53e4285512c61879f67a48c94ddaf SHA512 f748017ab3734c7672c3fdbedcea80df297a91a78b111533e260feb0868ebb02935666c041f77db03841ee8f90057d9c53c53b00b097aae4cf67a52c7fc9c2eb WHIRLPOOL 4e7a37a6ac07b4fa7b5a28a280a5b25a2dcb4c83bf27c6e7615c6d8ce60178cbb069eaa502b690897daae79961d47558985fd0e981117c623640e49b72f4a04f
+EBUILD pyopengl-3.1.0.ebuild 845 SHA256 6a6d21bd0654e90e9ddc3f3bf8c2b50bb79c1f0014884e715f64f21c14669efc SHA512 88d18c3ffcb91631f0c62852797ec4a91ca4ff0222f0e0640a146d28b462bb38d85a1c2b0bce6596b48b117b70d799f45b6fbc3d6a503eb2aa39e3cbd155bfa4 WHIRLPOOL a0d8f8c8b038ee0f8b4f004675ea1fff6d83beffa27f2cb2693d4dd70771b9ded47edce755abd153cb9451f2a357d877a8eedb34d16d43f81236f4ce3a746b40
+MISC ChangeLog 3455 SHA256 e3d6c902831ccbf4af7ad36a6436eacb978fd6e4e6def530cd713efbcfffc85c SHA512 a1587b0f6be657cb65144574a5df568c60630ea2506782aef9e243535bdbc6e4c8c7ea0ced47fe46f934641d16a122d3c8d8b5c3428c6bcb25ed0424e21f1928 WHIRLPOOL d30be28ed4f227cb44d05501ac2c32f5e20ef7ec6fd6b94afa4849382afa7ef6dcc6991c0ed07a481934a7f8a8924282577a6d77068275ebad0d22100d3dad23
+MISC ChangeLog-2015 14298 SHA256 75397b65ca612843a292347edc50e25ebf2a0f9b29643ad696d214638c623c04 SHA512 59f074f3eba13809fcff28d171922f05e299695a6dc1d3ae186bbc54b6c77231c89c118aeb94ab540909e183f230cb9f94aed3a54ae13e84d6d1b09f690ffb17 WHIRLPOOL ae60dd6ade20a720820173333773290ddb0867047473a4c68c3c943e38fe34206fa8bbd5b6840f58f754967353c7c15558ee2692c07e0a2eefd34b1a902777c0
+MISC metadata.xml 364 SHA256 eb61e8f2148f3ae57bfd3ec600e52a710e97e217c43dbf21c235bb5ebe5c3693 SHA512 7f81e0f6a601ff3ddd04a391380882edfa45f801bb4afb6fa04673395cee74968745016e9a285908aab6cd701f62b70164b9885493cdfe553d52f30d49509546 WHIRLPOOL f3d0cd2ef1952fcfa139b8d54f9544e0e5231c8115b2043ebbe23782b4f36c7b135b03d3bcdb26efcc3b1a0756c6ca37c6683d60d16edd97933acde5536c5d33
diff --git a/dev-python/pyopengl/metadata.xml b/dev-python/pyopengl/metadata.xml
new file mode 100644
index 000000000000..e99b359b2b99
--- /dev/null
+++ b/dev-python/pyopengl/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">PyOpenGL</remote-id>
+		<remote-id type="sourceforge">pyopengl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyopengl/pyopengl-3.1.0.ebuild b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
new file mode 100644
index 000000000000..6a393610cdf6
--- /dev/null
+++ b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_REQ_USE="tk?"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+MY_PN="PyOpenGL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python OpenGL bindings"
+HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.python.org/pypi/PyOpenGL"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+#	mirror://sourceforge/pyopengl/${MY_P}.tar.gz" # broken mirror for this release
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="tk"
+
+RDEPEND="media-libs/freeglut
+	virtual/opengl
+	x11-libs/libXi
+	x11-libs/libXmu
+	tk? ( dev-tcltk/togl )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pyopengl_accelerate/Manifest b/dev-python/pyopengl_accelerate/Manifest
new file mode 100644
index 000000000000..eda716032670
--- /dev/null
+++ b/dev-python/pyopengl_accelerate/Manifest
@@ -0,0 +1,4 @@
+DIST PyOpenGL-accelerate-3.1.0.tar.gz 323541 SHA256 927f4670b893d46e2f6273ae938bf0a1db27ffae3336eba94813ccef6260c410 SHA512 2ba2f56b02a83225e42b80962b5ae6d4077387f88a4261e21c96b0bf66814922eaed8b6065e0127e819bde9d5d2f6b609100e32c589a1c17bdb4fa8b670dca61 WHIRLPOOL c758b777bf004384806a038f54df8394a032d1120ac6f4992bab1f26a86a466103d3ee4a331c22b2670e39c246dd662a250a9f34fa7719a7dfd0c9d43186b766
+EBUILD pyopengl_accelerate-3.1.0.ebuild 638 SHA256 edd7d3c647765cc1b9c869dbcfafba23bc02d71a9933df1a5207372b7b530561 SHA512 ab12711974edd77ddb665505832696f38c6a376e6b1d72f053a836526461603754b4913bb54934ee50649be32f2f0ca0296faa1a4a33e9848d4cd8f3be8d0e61 WHIRLPOOL 13d18c7cf0a9cebe497da4651ced16e393de385a3d9d98e23fdb3b9b849ad45382eb41008007ee800a98e2b3ae59f8aad3dfbd17b5962fc9ce8d8016607a0085
+MISC ChangeLog 536 SHA256 3ce32f6e629ffb470b1bc5276b83047f1c423b76ba666253e2ee60fb652f7269 SHA512 e627ee56f9efa02d49748bd09f038f81ca364c09abe09f73f5c908c2c1b78bea877444b4f21c3255a6fa7aa0bbbcd3ffade337d55db9dde3fd0eec9744ab1159 WHIRLPOOL 97486a2031a3d835c51e034583ef78d81c4c402bcc6d8f462d5d45ed6c836be9d2f2e6cb929d3fd1ad4b4b23f2261c4e3cc4b2e61c2ebb6e6c407c475b45e247
+MISC metadata.xml 378 SHA256 124ab8ab218d76d66d942d31a45a5e154b882f0c30a80670da9315761814e95f SHA512 0561616de8ec3ed44c6d2f60df4536d0fb0b8ada06c941b8cf718f865417d1afa8e18b18963a0da2c180e709e161725d48d6373e6baae299a5d0be2f2124a604 WHIRLPOOL ccd8b6ebe1cc6cf9c0cc4d316572caa098c6437ec9b21fd1dcc85a7990b2b1889f342933662ee318ff9b9f2b981d11811e5620c9d9bf0e69630f01968b13d593
diff --git a/dev-python/pyopengl_accelerate/metadata.xml b/dev-python/pyopengl_accelerate/metadata.xml
new file mode 100644
index 000000000000..73bae7cf75a7
--- /dev/null
+++ b/dev-python/pyopengl_accelerate/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>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">PyOpenGL-accelerate</remote-id>
+		<remote-id type="sourceforge">pyopengl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
new file mode 100644
index 000000000000..5d64d4a005e8
--- /dev/null
+++ b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
@@ -0,0 +1,24 @@
+# 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
+
+DESCRIPTION="Accelerate module for PyOpenGL"
+HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.python.org/pypi/PyOpenGL-accelerate"
+MY_PN="PyOpenGL-accelerate"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/pyopengl[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
new file mode 100644
index 000000000000..f149ce890b5a
--- /dev/null
+++ b/dev-python/pyopenssl/Manifest
@@ -0,0 +1,16 @@
+AUX pyopenssl-0.15.1-openssl-1.0.2-backport-1.patch 809 SHA256 297622a201b1c8dbb0c7a39497d9c76449e930df9a0774cf3ba1340897c8f0be SHA512 6b6d6358553690c36a84b568bda6d52f6cac0dd599fd54ab0f3bd7c58a5a2223776f8f3434be9ea43e6bc77e0148b4c33c871a2463fd99e65f9cbdb59862c63f WHIRLPOOL ae9e76afe79c2ea8947572dcfae5d59331e12e11fddb5484a727be6838df17a0aafe089f2e60522e3bd31f6a8a95ca815413f76c3fe5bf467b140a35ab8501ed
+AUX pyopenssl-0.15.1-openssl-1.0.2-backport-2.patch 1133 SHA256 57583a51f990ff9d4449454d820d751cba72daba33fb4922bcace98b346b9b3e SHA512 7968d3cd4c59fe15afc857330b1951275b98f281cf8de50033c27c8a4020a910d177afe035a965f7c4560cee555280f0e164264745faba9f32790650ae5b7f52 WHIRLPOOL 5ee55540a59277abacc0fbf5f7c61a93509bc573dc423765abf00828e1e9bcdefbdf9acfb7e0be9851eec64a5d386e4ab48912cd2f5c37433a90ac04ff9e4513
+AUX pyopenssl-0.15.1-openssl-1.0.2-backport.patch 3246 SHA256 f5142d963ccd2896d9f1ad841df181551f474b91a2102a2fdfaed5d761a88453 SHA512 f869ad277f04704a029d952acc52709e85aa4fc9040de72c6432a611dd1ef8329f442c5b8587cf05f707c5938b6bce5c3068daf4060858d896b1e956965901e9 WHIRLPOOL a35a38df774d24243a1cb7bcc7a6fe39ca1d98b54a5dbdf8d927e8a727f18355ff3bb64152dd8e635eb37ea3e283ee14f65e66e0551963f25f20c69e8a482bce
+DIST pyOpenSSL-0.15.1.tar.gz 149887 SHA256 f0a26070d6db0881de8bcc7846934b7c3c930d8f9c79d45883ee48984bc0d672 SHA512 bd204f40c9583a8580cff28b061f02ea772fdda3965dab6ac9e3f8c3b98792bea87b6de76494f7ce81e1ddcc76019432a9ffa3bcd55c5adb063bb639efe62e51 WHIRLPOOL 34badbf11b49cb65019cb55da7c6d6a539971392741d14ea1408c56dc0564d52ffeb947d86549fed17762474d863d59a406cde86daa75a329bd5b6411a77702b
+DIST pyOpenSSL-16.2.0.tar.gz 167305 SHA256 7779a3bbb74e79db234af6a08775568c6769b5821faecf6e2f4143edb227516e SHA512 c1b068137a492564fe958603712d401b7ee0def94c01a28be55f5c89e07c25684ecb0f465f3c56f35924bde038894f2914ac49539144845fb586d12b80307078 WHIRLPOOL 60f2fe38ba773ed52bcfe88da57bd78f2114d7018a6184ec1c0fa2a8ae6dab4cf2495cd2aa75d7a5b2beee49477dbb6b4256034cec83752db0a3c7e5f7c4debb
+DIST pyOpenSSL-17.0.0.tar.gz 167121 SHA256 48abfe9d2bb8eb8d8947c8452b0223b7b1be2383b332f3b4f248fe59ef0bafdd SHA512 819be95f920a70b40ae48ed6740bd1d8cd3bf2fc080f682db8978946929994cb87ac467e220267dcdafc40aa7ed2cce51a334a49b06c1e2665d295157181ddad WHIRLPOOL 8256ad13d35d7c7d1678bd6c35140e13a1f601f149bc38633b3f04eaec7e302853abcb5df857a04fd04dc8ac3feeb35d4247dc979cee0969dafc538ec9b70d5c
+DIST pyOpenSSL-17.2.0.tar.gz 170816 SHA256 5d617ce36b07c51f330aa63b83bf7f25c40a0e95958876d54d1982f8c91b4834 SHA512 aef1628665353445760a0c869c5b88ba1f61a3ade7471bfd1ad9e57672573501574dab5a2491aaac1dc283893fcac1a81dd9b972f43d53fe7ef1aa48e3f0e88a WHIRLPOOL aab3617e825237032efa44d5b89603bcd6b33095f76bb04b53140138066d9c6e96b64bb6def4425b3cf3aa279691142c66bf5c6b9a89ef5e5c64eb83459dc5a9
+DIST pyOpenSSL-17.3.0.tar.gz 168119 SHA256 29630b9064a82e04d8242ea01d7c93d70ec320f5e3ed48e95fcabc6b1d0f6c76 SHA512 2b58a652b8d6e2adadbc620a6b3411cd44169940ef1839fd3365cd343ebe1e630ddbb580d8d4dc79e738e0b4f91db0bdbbaecf18aea74204499c737eebb3fae8 WHIRLPOOL 154cb8beedd57c24aced9c0a37b2395a9c25a0696b803c70d40bc4df98802587e73602c7c74aebd03c60dd54849c293eede1366c0b2f5ccb0967331235754bc0
+EBUILD pyopenssl-0.15.1-r1.ebuild 1416 SHA256 7be89365e33ba5cbb2efa8e826f65fdab20d5c67843ee177956f54eb75b67eb0 SHA512 1f86106bd544bc70483c805ac7a20e17f09237d866d36101c627426052e69bc6e5beb92712b7bc6d1eecfb1cca84e782ed7a6f8dcba07f1138a1c6acb1509436 WHIRLPOOL fb9317ce60a7d5a09be49fdb126ad97649adf91a8a666dde7d10203557ff5eb8aeeab49dfd450bb0e60843c4cad2197517401f7a8f38456dad1df558627408d6
+EBUILD pyopenssl-16.2.0.ebuild 1596 SHA256 bfb30ec6cd042d2a05b9556ab79e09a3c9f9e0f697d5eb5cf377ef4acbd4fc44 SHA512 f91345bef67ef4d002828b6db8cfdde9ea1bd2e502672e2c29be7cedb814127a0d7f08ac0ab1c601b7056a406020bc3569c5a6b163fd3b13d92b6290afeccc2b WHIRLPOOL 44fd4190e89a6509578f985e9d98992fe6bdb959b9bac6e2cb46fe84394cdc53e566be3f0870ed54d51ca1e1387aee3f6f93e260318dc57cd1a5551e84f94c90
+EBUILD pyopenssl-17.0.0.ebuild 1606 SHA256 5e073afa1eaa9038b151024f63ef947ec3ba2970c187a616d9ac1ac61ef1a9e6 SHA512 e8f73d81532e7ccecbd96f6958ed65ebae636efc703bb02543ed27e136f6a48b086b5e3a230685d1ea8a7b19ddbd29340b53e908b9eb8756644645a0fef2fb5f WHIRLPOOL 7b2d4dfaf78c29ecac5f19cb9bcaae5f2982c8b5d02a07d7cd137460de8530dae1507cd79a1df76414d958180d5e2dff54bf2c46a64a1b9f17c1dd468129526d
+EBUILD pyopenssl-17.2.0.ebuild 1587 SHA256 559db4c8692532c60f0f0c3b439453ea6a2ad63e43b8dacf2b4ec79ecef824e1 SHA512 83f26644e5f8010cd148ca721575fc791b7818bda57db5c8e2138ee8cd734f47d97a7f2db9a61ddb6f0eceb81ea1435ad2a04dae3ce0e5c03fdbece785aea9d0 WHIRLPOOL 7505da0d9759548ab00bdaef2e3b4d68175c8dcc05564cf7adcb00bd85a377d45cd339ae369c8761fad0270f1e0c412128e7c5a8878493d9e9b00d60af66a3b8
+EBUILD pyopenssl-17.3.0.ebuild 1596 SHA256 20ebc2ea0d58a320020cb3df9d0b61e83c9d84cd4b4d22597d6af036ec1b267c SHA512 8c78ae11c0c3855a95d4e49fb0d207baeb17671512a77a2d95ed321eff15da62008a0ec9b1a9dc49d810538fff8fe0592de4466bee49b93455d1be4302d22f94 WHIRLPOOL 16b7e002ca3d83eacf691531c02f9d090504f954388df44d847cde8e687ba7e835334615fbdd2f403e0a383c67db92cd6088a7a23af2ac8381874b2ec6fabdc8
+MISC ChangeLog 8426 SHA256 8bce425d7e7c24aaf605b887c4260ba5bae138bc52584a9ac30290549d4abaea SHA512 c7530188fc6cc999de3f270bc87535f6feaf96a5e2bbac6d9c7f9ec24c4d565ebf59d9bdb073e28ea950dc7453f1e1aa901bfa0f8d3b419ac0d5a0cc66fae26c WHIRLPOOL 2702a906b074c1f23a6dde94f0793a66bb5014dcf50b97bf0b982200378502c860da8687123180b3ad632bcd92fc92b02cc7f88a40fc4b709dbd365fd2074915
+MISC ChangeLog-2015 17860 SHA256 1ef7c0a393d8b3f02848a5ae563a9db19816e91dea442fdb71dc0cdc354d0489 SHA512 700d9fc11d518f5e57c141979d49a169baa2b9508f1d67602f075a5831c4ecec631170dc62569be35f4e6f9bc38533a89405f076cb43683349a660a53e5859fe WHIRLPOOL eb72992cca08df2d762da2679a07345fcfe35b6377e6d11d162a135d0742bbffafacc3706dbcfa769829d5fef561e16cc6c2d4e047cae2e537c2a6864467c2e5
+MISC metadata.xml 418 SHA256 68aeb875660dad3988a0aa0cd45248fedf62d9df646bf4aa42a25421836636d8 SHA512 5cd4b0381e79245626500a2a38b9f7bedcc8e4742445ac16f12a96133f1291ec49592f2259294f153d5f1b27969cd6f7f364d49f32d0793b12b2ad38b824f441 WHIRLPOOL c12c999aedb6245a492b1670dd416988777b33fbc4d381b1cb4657c30535065e87e3169104ed7d37cfc9b431a3aeaed4a847cf3ebd251b054d4af51ca757c99d
diff --git a/dev-python/pyopenssl/files/pyopenssl-0.15.1-openssl-1.0.2-backport-1.patch b/dev-python/pyopenssl/files/pyopenssl-0.15.1-openssl-1.0.2-backport-1.patch
new file mode 100644
index 000000000000..3e2c06c1abd1
--- /dev/null
+++ b/dev-python/pyopenssl/files/pyopenssl-0.15.1-openssl-1.0.2-backport-1.patch
@@ -0,0 +1,19 @@
+ OpenSSL/test/test_ssl.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/OpenSSL/test/test_ssl.py b/OpenSSL/test/test_ssl.py
+index bb1c9ae..d3bffe7 100644
+--- a/OpenSSL/test/test_ssl.py
++++ b/OpenSSL/test/test_ssl.py
+@@ -1416,6 +1416,11 @@ class ContextTests(TestCase, _LoopbackMixin):
+         """
+         context = Context(TLSv1_METHOD)
+         for curve in get_elliptic_curves():
++            if curve.name.startswith(u"Oakley-"):
++                # Setting Oakley-EC2N-4 and Oakley-EC2N-3 adds
++                # ('bignum routines', 'BN_mod_inverse', 'no inverse') to the
++                # error queue on OpenSSL 1.0.2.
++                continue
+             # The only easily "assertable" thing is that it does not raise an
+             # exception.
+             context.set_tmp_ecdh(curve)
diff --git a/dev-python/pyopenssl/files/pyopenssl-0.15.1-openssl-1.0.2-backport-2.patch b/dev-python/pyopenssl/files/pyopenssl-0.15.1-openssl-1.0.2-backport-2.patch
new file mode 100644
index 000000000000..be3c18039480
--- /dev/null
+++ b/dev-python/pyopenssl/files/pyopenssl-0.15.1-openssl-1.0.2-backport-2.patch
@@ -0,0 +1,31 @@
+ OpenSSL/crypto.py           | 3 +++
+ OpenSSL/test/test_crypto.py | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/OpenSSL/crypto.py b/OpenSSL/crypto.py
+index 555ba24..2c1eddb 100644
+--- a/OpenSSL/crypto.py
++++ b/OpenSSL/crypto.py
+@@ -464,6 +464,9 @@ class X509Name(object):
+         if isinstance(value, _text_type):
+             value = value.encode('utf-8')
+ 
++        # Make it so OpenSSL generates utf-8 strings.
++        _lib.ASN1_STRING_set_default_mask_asc(b'utf8only')
++
+         add_result = _lib.X509_NAME_add_entry_by_NID(
+             self._name, nid, _lib.MBSTRING_UTF8, value, -1, -1, 0)
+         if not add_result:
+diff --git a/OpenSSL/test/test_crypto.py b/OpenSSL/test/test_crypto.py
+index 1620623..b817451 100644
+--- a/OpenSSL/test/test_crypto.py
++++ b/OpenSSL/test/test_crypto.py
+@@ -1003,7 +1003,7 @@ class X509NameTests(TestCase):
+         self.assertEqual(
+             a.der(),
+             b('0\x1b1\x0b0\t\x06\x03U\x04\x06\x13\x02US'
+-              '1\x0c0\n\x06\x03U\x04\x03\x13\x03foo'))
++              '1\x0c0\n\x06\x03U\x04\x03\x0c\x03foo'))
+ 
+ 
+     def test_get_components(self):
diff --git a/dev-python/pyopenssl/files/pyopenssl-0.15.1-openssl-1.0.2-backport.patch b/dev-python/pyopenssl/files/pyopenssl-0.15.1-openssl-1.0.2-backport.patch
new file mode 100644
index 000000000000..048ede23786e
--- /dev/null
+++ b/dev-python/pyopenssl/files/pyopenssl-0.15.1-openssl-1.0.2-backport.patch
@@ -0,0 +1,84 @@
+From fc18f7bed12f58100c3a5eef3dbae29c9a26f18a Mon Sep 17 00:00:00 2001
+From: Jeff Tang <mrjefftang@users.noreply.github.com>
+Date: Wed, 15 Apr 2015 17:42:33 -0400
+Subject: [PATCH] OpenSSL 1.0.2 Compatibility
+
+- Perform the time comparison in python to fix #192
+- Add root cert has_expired test
+- Self sign test cert to fix issue in #149
+- Change test case to verify digest of a valid certficate
+---
+ OpenSSL/crypto.py           |  9 +++++----
+ OpenSSL/test/test_crypto.py | 15 +++++++++++++--
+ 2 files changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/OpenSSL/crypto.py b/OpenSSL/crypto.py
+index c7bdabc..1b1058e 100644
+--- a/OpenSSL/crypto.py
++++ b/OpenSSL/crypto.py
+@@ -1,5 +1,6 @@
+-from time import time
++from time import time, strptime
+ from base64 import b16encode
++from calendar import timegm
+ from functools import partial
+ from operator import __eq__, __ne__, __lt__, __le__, __gt__, __ge__
+ from warnings import warn as _warn
+@@ -1161,10 +1162,10 @@ def has_expired(self):
+         :return: True if the certificate has expired, false otherwise
+         """
+         now = int(time())
+-        notAfter = _lib.X509_get_notAfter(self._x509)
+-        return _lib.ASN1_UTCTIME_cmp_time_t(
+-            _ffi.cast('ASN1_UTCTIME*', notAfter), now) < 0
++        notAfter = self.get_notAfter().decode('utf-8')
++        notAfterSecs = timegm(strptime(notAfter, '%Y%m%d%H%M%SZ'))
+ 
++        return now > notAfterSecs
+ 
+     def _get_boundary_time(self, which):
+         return _get_asn1_time(which(self._x509))
+diff --git a/OpenSSL/test/test_crypto.py b/OpenSSL/test/test_crypto.py
+index 73e9cc7..b817451 100644
+--- a/OpenSSL/test/test_crypto.py
++++ b/OpenSSL/test/test_crypto.py
+@@ -1562,19 +1562,29 @@ def test_has_not_expired(self):
+         cert.gmtime_adj_notAfter(2)
+         self.assertFalse(cert.has_expired())
+ 
++    def test_root_has_not_expired(self):
++        """
++        :py:obj:`X509Type.has_expired` returns :py:obj:`False` if the certificate's not-after
++        time is in the future.
++        """
++        cert = load_certificate(FILETYPE_PEM, root_cert_pem)
++        self.assertFalse(cert.has_expired())
++
+ 
+     def test_digest(self):
+         """
+         :py:obj:`X509.digest` returns a string giving ":"-separated hex-encoded words
+         of the digest of the certificate.
+         """
+-        cert = X509()
++        cert = load_certificate(FILETYPE_PEM, root_cert_pem)
+         self.assertEqual(
+             # This is MD5 instead of GOOD_DIGEST because the digest algorithm
+             # actually matters to the assertion (ie, another arbitrary, good
+             # digest will not product the same digest).
++            # Digest verified with the command:
++            # openssl x509 -in root_cert.pem -noout -fingerprint -md5
+             cert.digest("MD5"),
+-            b("A8:EB:07:F8:53:25:0A:F2:56:05:C5:A5:C4:C4:C7:15"))
++            b("19:B3:05:26:2B:F8:F2:FF:0B:8F:21:07:A8:28:B8:75"))
+ 
+ 
+     def _extcert(self, pkey, extensions):
+@@ -1587,6 +1597,7 @@ def _extcert(self, pkey, extensions):
+         cert.set_notAfter(when)
+ 
+         cert.add_extensions(extensions)
++        cert.sign(pkey, 'sha1')
+         return load_certificate(
+             FILETYPE_PEM, dump_certificate(FILETYPE_PEM, cert))
+ 
diff --git a/dev-python/pyopenssl/metadata.xml b/dev-python/pyopenssl/metadata.xml
new file mode 100644
index 000000000000..4497991b3740
--- /dev/null
+++ b/dev-python/pyopenssl/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyOpenSSL</remote-id>
+		<remote-id type="launchpad">pyopenssl</remote-id>
+		<remote-id type="sourceforge">pyopenssl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
new file mode 100644
index 000000000000..7133e32ab838
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
@@ -0,0 +1,56 @@
+# 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} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=pyOpenSSL
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="
+	http://pyopenssl.sourceforge.net/
+	https://launchpad.net/pyopenssl
+	https://pypi.python.org/pypi/pyOpenSSL
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-0.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-openssl-1.0.2-backport.patch
+	"${FILESDIR}"/${P}-openssl-1.0.2-backport-1.patch
+	"${FILESDIR}"/${P}-openssl-1.0.2-backport-2.patch
+)
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	esetup.py test
+
+	# https://bugs.launchpad.net/pyopenssl/+bug/1237953
+	rm -rf tmp* *.key *.pem || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild b/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild
new file mode 100644
index 000000000000..2b8579283288
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=pyOpenSSL
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="
+	http://pyopenssl.sourceforge.net/
+	https://launchpad.net/pyopenssl
+	https://pypi.python.org/pypi/pyOpenSSL
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	# Requires network access
+	sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# FIXME: for some reason, no-ops on PyPy
+	py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyopenssl/pyopenssl-17.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.0.0.ebuild
new file mode 100644
index 000000000000..ba3f71d2929a
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-17.0.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=pyOpenSSL
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="
+	http://pyopenssl.sourceforge.net/
+	https://launchpad.net/pyopenssl
+	https://pypi.python.org/pypi/pyOpenSSL
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	# Requires network access
+	sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# FIXME: for some reason, no-ops on PyPy
+	py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild
new file mode 100644
index 000000000000..e417175b253b
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=pyOpenSSL
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="
+	http://pyopenssl.sourceforge.net/
+	https://launchpad.net/pyopenssl
+	https://pypi.python.org/pypi/pyOpenSSL
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 hppa ia64 mips ppc ppc64 x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	# Requires network access
+	sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# FIXME: for some reason, no-ops on PyPy
+	py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyopenssl/pyopenssl-17.3.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.3.0.ebuild
new file mode 100644
index 000000000000..d873a6b97ce3
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-17.3.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=pyOpenSSL
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="
+	http://pyopenssl.sourceforge.net/
+	https://launchpad.net/pyopenssl
+	https://pypi.python.org/pypi/pyOpenSSL
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	# Requires network access
+	sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# FIXME: for some reason, no-ops on PyPy
+	py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyorbit/Manifest b/dev-python/pyorbit/Manifest
new file mode 100644
index 000000000000..ab974b424692
--- /dev/null
+++ b/dev-python/pyorbit/Manifest
@@ -0,0 +1,5 @@
+DIST pyorbit-2.24.0.tar.bz2 293054 SHA256 8754669b8220aa1f151b920360029d5ea28c42bec55769059676725fe28397b8 SHA512 07824722831ac39d853bbcb35f543c6a1f24606a0fea8048881b3b9e370769592b2bc92b2ec6c9c6e88a2a7f84838757a115392fba6e1dbc0d29cff6f8da8141 WHIRLPOOL 50d2fa833d7a38cd7e6481fffdc85d67673ceecb71ec06c7db446aee1895293015f2eac2a95431ce28941f474b16674e0a67ea4e7a9af17db0237ee3bb3a6f09
+EBUILD pyorbit-2.24.0-r1.ebuild 1002 SHA256 ffe4165c5bb0ed65f85be473bea85226a0bd744c1dd2fa6043e8590becfc7221 SHA512 228b124d0503d5632cdf8ec991dd4c76df6a734322314dbf63d274fb4162529ca11b21876b6d911fb0ed8d9d2f8b3ff83ad4142aff10fc4fe50727ec263e4688 WHIRLPOOL bbcbe4d55c4d6e989c2bb8e0d0c8e48fd7da261a7d7118b5d4835b42d14281975692a3b8cb1fb3ce775b97b84b7f359ef13711e4ea7686126436e8bffca8f5af
+MISC ChangeLog 2784 SHA256 8d8311b4e8cfc8dddae3d389d3289b913141fb9c7f0d510fd6f19d212cfd27d4 SHA512 60d0ca005912c02cbf078a2a73f8596f8f4b9c652d05aadfb787c618c47c163210e5359ea0de6d919c8a3c3669ea05039a85f7fa12e865d2a0a3f8c736066db8 WHIRLPOOL 191ecce66cdef70db62cfdf80a58c258c0d312807f7d1966ad73382590784848a2935f3f71d3252f943131292afe32457ada56bcfa83eb55f664164d04f11f84
+MISC ChangeLog-2015 10005 SHA256 f8f09b72337930de7d8cb23667ba6d610773fceb852ac2597da1c064681f79e9 SHA512 435462e72cc47716145349a0b012c7ac25d8a7792738cc5fb510e904aa6ff00c48a00d64b1a79dee97a44101b7e19755150f0883b0a26965a92152e0f555ff7c WHIRLPOOL 9bc4ebde67fc59991278ae4eb9414ed70599809eab62847066d281ec3dba4db4e325612b469e5178caccef64645109f9cbb2af321da3f85adb09931f88d5ac65
+MISC metadata.xml 346 SHA256 4b87f1154df42a81076572760417393762ac1c76a6c1cec8d16c31049097d48b SHA512 e7e631f5ebe3a81d0431366152d6f7a2d21958a031746d6b2fd6ac9ef3f145d78fb30d1014b0912e9d720b3be7c6d2fdc544bb840a9f12fddf37ffdcf65933bd WHIRLPOOL 1d51841db0de7eaec1b024566af146da5323306447445f18c771cb90030c664ce376db8a3bb59d39f125e9abd9dc367fad98a8abfb2acc7bbfe4855b7695cced
diff --git a/dev-python/pyorbit/metadata.xml b/dev-python/pyorbit/metadata.xml
new file mode 100644
index 000000000000..6cd5da0617a4
--- /dev/null
+++ b/dev-python/pyorbit/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="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer type="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild b/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild
new file mode 100644
index 000000000000..77612f317766
--- /dev/null
+++ b/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 multilib python-r1
+
+DESCRIPTION="ORBit2 bindings for Python"
+HOMEPAGE="http://www.pygtk.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	>=gnome-base/orbit-2.12"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
+
+src_prepare() {
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir default_src_test
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install
+}
diff --git a/dev-python/pyosd/Manifest b/dev-python/pyosd/Manifest
new file mode 100644
index 000000000000..7c412646cb88
--- /dev/null
+++ b/dev-python/pyosd/Manifest
@@ -0,0 +1,5 @@
+DIST pyosd-0.2.14.tar.gz 20845 SHA256 a8a52357845f9c84faeab2983f4042b91bbcbb3355d4e70783de7a97aeb3564c SHA512 5781097ec5b082555c5a77953fd939a41d9eaab76fba32a132feec42d01e581f5dcf547fbed13122c56a5778e4b13441ae3d098a9bf7d6db8fac08361ad325a9 WHIRLPOOL 359440f8161d2da66a9319732577b8368f524d3e1636b79a52bb7b286144d86e826db901b7c82e7fd4e7230662744dff01313782bfa178ac81623c1c272a0040
+EBUILD pyosd-0.2.14-r1.ebuild 837 SHA256 5cb6f907c3358e68d225c5e1b4576ec35d12d78ee7d3b210d68d96ce261ddfda SHA512 634531d5fe5e00c3124346bf44f2505422029d2010536b52705bd96be7d84fd44d6f9f09542d87ba481eaadf2117e069b9153811afb881652853c8a4a3836f74 WHIRLPOOL 878f3f3b991cdf25b9b278d6c476ff6d16fe6bebbdc16571a2eae74ec6727984ad7947cf455c5d1ca0b59066875544bd66dd270c8277a0a255aa9ccf01bdf4fa
+MISC ChangeLog 2481 SHA256 780754eab3b96384fcda606f56849ee7ac1e30995a7d09829511916a8ed0ed18 SHA512 2c5d0ec73ed77179f278948db6a2b254850fba724f9cf9d046bb7386f04219d7dd5fc35edbe6fe88d186dc656d5d67ae0cf88a0462f6c7d829eca8b9cdda4877 WHIRLPOOL 67b6c7c4751d50c24a38da69c7319925b4ac5e7a15526242adde785958bd4735b5289ad3b4ff7caab7c8d4a4e4318aaf1a9ff80c25a063ca3a9e2cd9e32fef25
+MISC ChangeLog-2015 3293 SHA256 6272441433f428da555f5c3ed0fafacd73fe74dae103eafcbde1e1bc2ea5378a SHA512 64ae050f6ac77af126e7e272ff112c6a359c8a0b13cd66d3f7cc5c6dc736aad62505b36dafe61c70b30d145e7ae00c6368f971874a6deca0eaf9cf967d300690 WHIRLPOOL bd709068958bdaab258fef2862a7cc123911f8f38ef857667422a4f5fb0eb29a8919194dddea2c3039480adcafca109f60a8a4161fcfa56d57f90a86adfb6dca
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/pyosd/metadata.xml b/dev-python/pyosd/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/pyosd/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyosd/pyosd-0.2.14-r1.ebuild b/dev-python/pyosd/pyosd-0.2.14-r1.ebuild
new file mode 100644
index 000000000000..25009fa7a300
--- /dev/null
+++ b/dev-python/pyosd/pyosd-0.2.14-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for displaying text on your X display, like the 'On Screen Displays' used on TVs"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://ichi2.net/pyosd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc x86"
+IUSE="doc examples"
+
+DEPEND=">=x11-libs/xosd-2.2.4"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	use doc && local HTML_DOCS=( pyosd.html )
+	use examples && local EXAMPLES=( modules/. )
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "If you want to run the included daemon, you will need to install dev-python/twisted-core."
+	elog "Also note that the volume plugin requires media-sound/aumix."
+}
diff --git a/dev-python/pyotherside/Manifest b/dev-python/pyotherside/Manifest
new file mode 100644
index 000000000000..d183b7313461
--- /dev/null
+++ b/dev-python/pyotherside/Manifest
@@ -0,0 +1,3 @@
+DIST pyotherside-1.5.1.tar.gz 181457 SHA256 cb29853d66d2e33f68e28c62c28d054512ab82a763fed8b7b7df9dae722c5de2 SHA512 6f916ce44615c98aa7dffaee073fcb6d7f117996c008c0e3c0e7a8aaedd03f9ba853cc66850112dfc9529d698bd2faeb498a87a0d47c3776ab52b90f83b7067a WHIRLPOOL ad6693efa3aa3a15924010144bb46632fd512fb1af360e56972ddfd28631ff381c06c505acd40b57becb5010c324f4ccc509b3d49ed3716f87b4252027a94405
+EBUILD pyotherside-1.5.1.ebuild 739 SHA256 c547641fd11d0736c754186974c53251b31980dba0c71c889d707a2093e2c084 SHA512 952366dfd4811d3d7cb1643ca70e5e1517d6c19e8d976d978607671282073d56f9d6f10de4262bf1b068cd267f3b3e7409753a6486da2297472c35bf5c00a32d WHIRLPOOL 65bd68cf91154a26612b31546c07c0b6796aac7107d9bb0458d71328af89c82f72610f4b9526f32119710e9808a769c0e3860c1fe33cee34594573e28783183d
+MISC metadata.xml 245 SHA256 6fedd876236c2f1fe2687e73628381650ebecef9734f88f6d483bec5bf475a7f SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4 WHIRLPOOL 4957affde63b54e118270c40ce12683872777b41ec1a798f7b03807a99917148279d392f71cbcf95ec4e5d586ee5fc0400aea77d9e46083873a441a4907ba13d
diff --git a/dev-python/pyotherside/metadata.xml b/dev-python/pyotherside/metadata.xml
new file mode 100644
index 000000000000..97df2a00971b
--- /dev/null
+++ b/dev-python/pyotherside/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>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyotherside/pyotherside-1.5.1.ebuild b/dev-python/pyotherside/pyotherside-1.5.1.ebuild
new file mode 100644
index 000000000000..b30d8b2501dc
--- /dev/null
+++ b/dev-python/pyotherside/pyotherside-1.5.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit qmake-utils python-single-r1
+
+DESCRIPTION="Asynchronous Python 3 Bindings for Qt 5"
+HOMEPAGE="http://github.com/thp/pyotherside http://thp.io/2011/pyotherside"
+SRC_URI="https://github.com/thp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+src_prepare() {
+	sed -i -e "s/qtquicktests//" pyotherside.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+}
diff --git a/dev-python/pypam/Manifest b/dev-python/pypam/Manifest
new file mode 100644
index 000000000000..316c3166a46b
--- /dev/null
+++ b/dev-python/pypam/Manifest
@@ -0,0 +1,11 @@
+AUX PyPAM-0.5.0-dealloc.patch 607 SHA256 5d73ad2efb9b5f0507c1968aa69bcc36d3981e5c02117215982abbb6825863de SHA512 105573489be31763ed01bab02ccaf7147c73b196d85d8318eceda145e86fb5c3fa3a59b7baee9d85f6d5ae40df0335689267650461f5440a9c2991954c367e8e WHIRLPOOL b0527a6c81f9fc4bea9bf5d2a3fcabdc67e9d8b4e7d5e6668949201b53e85f825260cb61152b558ec8a2f473249807687d8667272eb81f03f0caf325bff72fb3
+AUX PyPAM-0.5.0-memory-errors.patch 3708 SHA256 e500628d9ccae7c953967a70a97b3af94c5f6c52849b6615b0d1270789a1d08a SHA512 358e57ba6450b533cbdb39f559813767799e387937a610b15e5e8e78d59b6501785c40c3ffdc5b1914ff6c9220716cdf9b537847373379eb94094f6ffe23c7f5 WHIRLPOOL ba0f6d33eacc9e812baa7089cf24bb6e548ac54e35024a7637c7e756f050c6a92421ecc18c93f97490feb8e62cc68e23c1e49d84a9a0c46615c8755a25be13d5
+AUX PyPAM-0.5.0-nofree.patch 1913 SHA256 ed2964fbc2c0d8b23961cf3a9b5b77d8c4609de54ef0e557ecb64664497f8ff9 SHA512 7292483d60f75d577055f4bf7380b110620669a19b3e2e3a4700e2c816758af865213cf19b329260338e82f9a0cba03a14dea06ba636251f1436ec0c3373f751 WHIRLPOOL e02e958acccaf508497cc87c5abc08398b03a8ddf8d504ecb4da2a63e4f963939b45915273e777ec5ef7d32ac58ffb2a5cfdfcb6dfeacc0a3908269222f137f2
+AUX PyPAM-0.5.0-return-value.patch 1854 SHA256 8a5a7292b415b053a69ccb36f7cd5dfd367f273b0ca8cf1f1bcec96f05769b3e SHA512 73d81d9a7398933011eba0739e3bce7651c3da1bf38f77b510172e26f569d329c3b28e5192a25ee0616875ddad52e67697dabe021d31cc5e51e9e78941333c8d WHIRLPOOL 6bb079b5824a8cd2c2df728f82645ef3ba625c6b0899b57d85eb2f77a677e5647233ce987d2f74c0d1fb55693fd16384acb4c52ce2abba5da26f74045edd9a9f
+AUX PyPAM-python3-support.patch 5987 SHA256 1d81a8c8610c91ddfa8b86be2cfeb0adf2e64e09b89dd084d980054167fc6425 SHA512 8437e5648f4bfe7a4895324c4277e91b5588271ed31a7fa374a4d7f03af18b8f6038c90afe79f16c96219debb10d9dfb6f33883dc097edb2c67714d893acf13a WHIRLPOOL 02e1d61c60e7367913deb226fa7d9070b6ce06a1852c4b66e237034f747704ccdabe5c8ef9d99aab2b51ee13c6a33cff9c409bf5414bf5cf69cc85e474e38f5c
+AUX pypam-0.5.0-stricter.patch 335 SHA256 c6a389f7346a237501b58fa3a0ba9618616a03f506c7df262ad55cc9a5207939 SHA512 6cb56d4610fab8f14af83d64215de24b38c820c61099054c0c02bcc831b0f50dee5746def85e2ae669b8657dce2fe31fcc93f07a93e3b49f0c7a78f48acd74c7 WHIRLPOOL 13fb94ed652c8b7a0a19c951c6ab88fc0df72a3e1e6005b1c1cc92e4d89d02554985680dafcdc762c17260fe4ee88357104f43fc9fcb946611d280519e2fff93
+DIST PyPAM-0.5.0.tar.gz 105206 SHA256 796ac019b9ee805696d0d277d8fb912fa2391b6ac070dc6f9f1a9a0fadbc3a5a SHA512 9e0e919e34930d2283307cd6665c5287c664a76a5de56367bd975867ac26b376ae03d30cb3bc4a16390c977ca2690cfd2e90ac73dcc7886b8c999444da4a07e0 WHIRLPOOL 03e93e671dd4c74252b5c04ea74d389408934ce03206ec47d3dbbb2c19d4dce7b4271765d0967dbbee2c288bc3c6451b1295bf46ba82ed3665711bdc1aa173c4
+EBUILD pypam-0.5.0-r3.ebuild 1037 SHA256 3420f3a97c8749b5ef949887e290a8ee8e83ae478f6702168528403b745bc47e SHA512 9faaeabd4c6797ee5e59ea1d501ee83f1438df9ee81b961a819dc05b083b12bb8fcfd11d57d9f6ff4b2157ce65f4193ca78814a6b156c0e1c04b1f6e0a8fe1cf WHIRLPOOL ce361c5a69a2e65030e5f48cb7bb466ddbeccebd98e8a7b0a469916f09d5f9bccc88e054d20fc1bc1d17ccc72412acc3057129e3b2c9d1c467084b6f3a851113
+MISC ChangeLog 2781 SHA256 b8aa1d2e319902793da11a1f60a6d245080ce6a335da4afb032d97107e181b75 SHA512 6f58268bf721b0ec6a5cec9657b46f2f8a013b78a6f2474c556f4a0669be6c24f808e3d4428a544b4d28f69083f968bfd0b80b270a3b810c2ce0865478271c27 WHIRLPOOL 13dd583b3752c48d321fa57fbfe16c1f4ba10e3a330b29706d1efe59b707e1a4765155960626082368cdeba799dba3d2a5249e13d86f825c9a4a5d0d5220a85a
+MISC ChangeLog-2015 3218 SHA256 4307ba88d07f7363714b1d2e6f81dc4c060ccc8341224d27faafbb4cf23e6c84 SHA512 63475a735b7606bb60d3eaebe0bcdade3c54131fd80acbacd5edc39cef57663d8c45f62cb09a749b2c7b493acaabbb62c4de0037872917f3eb95162f74b94d9f WHIRLPOOL 49810edc0e590e5c2892eaba557a7c1675fe918700b03f67fa590c168d6b5cf5c555de9bf24fb1e8f4f8898eaaefb750713492072c35116cb1a9860c83698b65
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/pypam/files/PyPAM-0.5.0-dealloc.patch b/dev-python/pypam/files/PyPAM-0.5.0-dealloc.patch
new file mode 100644
index 000000000000..b73dd0b08c59
--- /dev/null
+++ b/dev-python/pypam/files/PyPAM-0.5.0-dealloc.patch
@@ -0,0 +1,17 @@
+diff -up PyPAM-0.5.0/PAMmodule.c.dealloc PyPAM-0.5.0/PAMmodule.c
+--- PyPAM-0.5.0/PAMmodule.c.dealloc	2011-01-17 22:48:22.000000000 +0100
++++ PyPAM-0.5.0/PAMmodule.c	2011-01-18 21:24:59.000000000 +0100
+@@ -538,10 +538,11 @@ static void PyPAM_dealloc(PyPAMObject *s
+     free(self->service);
+     free(self->user);
+     free(self->conv);
+-    pam_end(self->pamh, PAM_SUCCESS);
++    if (self->pamh)
++        pam_end(self->pamh, PAM_SUCCESS);
+     dlclose(self->dlh2);
+     dlclose(self->dlh1);
+-    PyMem_DEL(self);
++    PyObject_Del(self);
+ }
+ 
+ static PyObject * PyPAM_getattr(PyPAMObject *self, char *name)
diff --git a/dev-python/pypam/files/PyPAM-0.5.0-memory-errors.patch b/dev-python/pypam/files/PyPAM-0.5.0-memory-errors.patch
new file mode 100644
index 000000000000..6e0b4c0dce4b
--- /dev/null
+++ b/dev-python/pypam/files/PyPAM-0.5.0-memory-errors.patch
@@ -0,0 +1,128 @@
+diff -up PyPAM-0.5.0/PAMmodule.c.memory PyPAM-0.5.0/PAMmodule.c
+--- PyPAM-0.5.0/PAMmodule.c.memory	2012-05-07 17:22:54.503914026 +0200
++++ PyPAM-0.5.0/PAMmodule.c	2012-05-07 17:23:15.644381942 +0200
+@@ -37,33 +37,48 @@ static void PyPAM_Err(PyPAMObject *self,
+ 
+     err_msg = pam_strerror(self->pamh, result);
+     error = Py_BuildValue("(si)", err_msg, result);
+-    Py_INCREF(PyPAM_Error);
+     PyErr_SetObject(PyPAM_Error, error);
++    Py_XDECREF(error);
+ }
+ 
+ static int PyPAM_conv(int num_msg, const struct pam_message **msg,
+     struct pam_response **resp, void *appdata_ptr)
+ {
+-    PyObject                *args;
+-
++    PyObject *args, *msgList, *respList, *item;
++    struct pam_response *response, *spr;
+     PyPAMObject* self = (PyPAMObject *) appdata_ptr;
++
+     if (self->callback == NULL)
+         return PAM_CONV_ERR;
+ 
+     Py_INCREF(self);
+ 
+-    PyObject* msgList = PyList_New(num_msg);
+-    
++    msgList = PyList_New(num_msg);
++    if (msgList == NULL) {
++        Py_DECREF(self);
++        return PAM_CONV_ERR;
++    }
++
+     for (int i = 0; i < num_msg; i++) {
+-        PyList_SetItem(msgList, i,
+-            Py_BuildValue("(si)", msg[i]->msg, msg[i]->msg_style));
++        item = Py_BuildValue("(si)", msg[i]->msg, msg[i]->msg_style);
++        if (item == NULL) {
++            Py_DECREF(msgList);
++            Py_DECREF(self);
++            return PAM_CONV_ERR;
++        }
++        PyList_SetItem(msgList, i, item);
+     }
+-    
++
+     args = Py_BuildValue("(OO)", self, msgList);
+-    PyObject* respList = PyEval_CallObject(self->callback, args);
++    if (args == NULL) {
++        Py_DECREF(self);
++	Py_DECREF(msgList);
++        return PAM_CONV_ERR;
++    }
++    respList = PyEval_CallObject(self->callback, args);
+     Py_DECREF(args);
+     Py_DECREF(self);
+-    
++
+     if (respList == NULL)
+         return PAM_CONV_ERR;
+ 
+@@ -71,11 +86,15 @@ static int PyPAM_conv(int num_msg, const
+         Py_DECREF(respList);
+         return PAM_CONV_ERR;
+     }
+-    
+-    *resp = (struct pam_response *) malloc(
++
++    response = (struct pam_response *) malloc(
+         PyList_Size(respList) * sizeof(struct pam_response));
++    if (response == NULL) {
++        Py_DECREF(respList);
++        return PAM_CONV_ERR;
++    }
++    spr = response;
+ 
+-    struct pam_response* spr = *resp;
+     for (int i = 0; i < PyList_Size(respList); i++, spr++) {
+         PyObject* respTuple = PyList_GetItem(respList, i);
+         char* resp_text;
+@@ -85,7 +104,7 @@ static int PyPAM_conv(int num_msg, const
+                 free((--spr)->resp);
+                 --i;
+             }
+-            free(*resp);
++            free(response);
+             Py_DECREF(respList);
+             return PAM_CONV_ERR;
+         }
+@@ -95,7 +114,8 @@ static int PyPAM_conv(int num_msg, const
+     }
+ 
+     Py_DECREF(respList);
+-    
++    *resp = response;
++
+     return PAM_SUCCESS;
+ }
+ 
+@@ -122,7 +142,11 @@ static PyObject * PyPAM_pam(PyObject *se
+     PyPAMObject_Type.ob_type = &PyType_Type;
+     p = (PyPAMObject *) PyObject_NEW(PyPAMObject, &PyPAMObject_Type);
+ 
++    if (p == NULL)
++        return NULL;
++
+     if ((spc = (struct pam_conv *) malloc(sizeof(struct pam_conv))) == NULL) {
++        Py_DECREF((PyObject *)p);
+         PyErr_SetString(PyExc_MemoryError, "out of memory");
+         return NULL;
+     }
+@@ -455,9 +479,15 @@ static PyObject * PyPAM_getenvlist(PyObj
+     }
+     
+     retval = PyList_New(0);
++    if (retval == NULL)
++	return NULL;
+     
+     while ((cp = *(result++)) != NULL) {
+         entry = Py_BuildValue("s", cp);
++        if (entry == NULL) {
++            Py_DECREF(retval);
++            return NULL;
++        }
+         PyList_Append(retval, entry);
+         Py_DECREF(entry);
+     }
diff --git a/dev-python/pypam/files/PyPAM-0.5.0-nofree.patch b/dev-python/pypam/files/PyPAM-0.5.0-nofree.patch
new file mode 100644
index 000000000000..f27e9d543d06
--- /dev/null
+++ b/dev-python/pypam/files/PyPAM-0.5.0-nofree.patch
@@ -0,0 +1,60 @@
+diff --git a/PAMmodule.c b/PAMmodule.c
+index 03cb799..a7ff8a5 100644
+--- a/PAMmodule.c
++++ b/PAMmodule.c
+@@ -24,8 +24,6 @@ typedef struct {
+     char                *service;
+     char                *user;
+     PyObject            *callback;
+-    struct pam_response *response_data;
+-    int                 response_len;
+     PyObject            *user_data;
+     void                *dlh1, *dlh2;
+ } PyPAMObject;
+@@ -54,15 +52,6 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg,
+ 
+     Py_INCREF(self);
+ 
+-    if (NULL != self->response_data) {
+-        for (int i = 0; i < self->response_len; i++) {
+-            free(self->response_data[0].resp);
+-        }
+-        free(self->response_data);
+-        self->response_data = NULL;
+-        self->response_len = 0;
+-    }
+-
+     PyObject* msgList = PyList_New(num_msg);
+     
+     for (int i = 0; i < num_msg; i++) {
+@@ -92,6 +81,10 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg,
+         char* resp_text;
+         int resp_retcode = 0;
+         if (!PyArg_ParseTuple(respTuple, "si", &resp_text, &resp_retcode)) {
++            while (i > 0) {
++                free((--spr)->resp);
++                --i;
++            }
+             free(*resp);
+             Py_DECREF(respList);
+             return PAM_CONV_ERR;
+@@ -100,10 +93,6 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg,
+         spr->resp_retcode = resp_retcode;
+         Py_DECREF(respTuple);
+     }
+-    
+-    // Save this so we can free it later.
+-    self->response_data = *resp;
+-    self->response_len = PyList_Size(respList);
+ 
+     Py_DECREF(respList);
+     
+@@ -144,8 +133,6 @@ static PyObject * PyPAM_pam(PyObject *self, PyObject *args)
+     p->user = NULL;
+     Py_INCREF(Py_None);
+     p->callback = Py_None;
+-    p->response_data = NULL;
+-    p->response_len = 0;
+     Py_INCREF(Py_None);
+     p->user_data = Py_None;
+     
diff --git a/dev-python/pypam/files/PyPAM-0.5.0-return-value.patch b/dev-python/pypam/files/PyPAM-0.5.0-return-value.patch
new file mode 100644
index 000000000000..6e771e9949a3
--- /dev/null
+++ b/dev-python/pypam/files/PyPAM-0.5.0-return-value.patch
@@ -0,0 +1,57 @@
+diff -up PyPAM-0.5.0/PAMmodule.c.retval PyPAM-0.5.0/PAMmodule.c
+--- PyPAM-0.5.0/PAMmodule.c.retval	2012-05-04 21:47:51.000000000 +0200
++++ PyPAM-0.5.0/PAMmodule.c	2012-05-07 09:42:27.690963206 +0200
+@@ -248,7 +248,7 @@ static PyObject * PyPAM_setcred(PyObject
+     result = pam_setcred(_self->pamh, flags);
+     
+     if (result != PAM_SUCCESS) {
+-        PyErr_SetString(PyPAM_Error, "Not authenticated");
++        PyPAM_Err(_self, result);
+         return NULL;
+     }
+ 
+@@ -270,7 +270,7 @@ static PyObject * PyPAM_acct_mgmt(PyObje
+     result = pam_acct_mgmt(_self->pamh, flags);
+     
+     if (result != PAM_SUCCESS) {
+-        PyErr_SetString(PyPAM_Error, "Not authenticated");
++        PyPAM_Err(_self, result);
+         return NULL;
+     }
+ 
+@@ -292,7 +292,7 @@ static PyObject * PyPAM_chauthtok(PyObje
+     result = pam_chauthtok(_self->pamh, flags);
+     
+     if (result != PAM_SUCCESS) {
+-        PyErr_SetString(PyPAM_Error, "Not authenticated");
++        PyPAM_Err(_self, result);
+         return NULL;
+     }
+ 
+@@ -314,7 +314,7 @@ static PyObject * PyPAM_open_session(PyO
+     result = pam_open_session(_self->pamh, flags);
+     
+     if (result != PAM_SUCCESS) {
+-        PyErr_SetString(PyPAM_Error, "Not authenticated");
++        PyPAM_Err(_self, result);
+         return NULL;
+     }
+ 
+@@ -336,7 +336,7 @@ static PyObject * PyPAM_close_session(Py
+     result = pam_close_session(_self->pamh, flags);
+     
+     if (result != PAM_SUCCESS) {
+-        PyErr_SetString(PyPAM_Error, "Not authenticated");
++        PyPAM_Err(_self, result);
+         return NULL;
+     }
+ 
+@@ -433,7 +433,7 @@ static PyObject * PyPAM_putenv(PyObject
+     result = pam_putenv(_self->pamh, val);
+     
+     if (result != PAM_SUCCESS) {
+-        PyErr_SetString(PyPAM_Error, "Not authenticated");
++        PyPAM_Err(_self, result);
+         return NULL;
+     }
+ 
diff --git a/dev-python/pypam/files/PyPAM-python3-support.patch b/dev-python/pypam/files/PyPAM-python3-support.patch
new file mode 100644
index 000000000000..2aec60eabdf4
--- /dev/null
+++ b/dev-python/pypam/files/PyPAM-python3-support.patch
@@ -0,0 +1,198 @@
+--- PAMmodule.c.python3	2014-06-24 11:29:10.958299393 +0200
++++ PAMmodule.c	2014-06-24 15:20:02.728118493 +0200
+@@ -15,6 +15,14 @@
+ #include <stdio.h>
+ #include <dlfcn.h>
+ 
++#if PY_MAJOR_VERSION >= 3
++#define IS_PY3K
++#else
++// include bytesobject.h to map PyBytes_* to PyString_*
++#include <bytesobject.h>
++#endif
++
++
+ static PyObject *PyPAM_Error;
+ 
+ typedef struct {
+@@ -28,7 +36,11 @@
+     void                *dlh1, *dlh2;
+ } PyPAMObject;
+ 
++#ifdef IS_PY3K
++static PyTypeObject PyPAMObject_Type;
++#else
+ staticforward PyTypeObject PyPAMObject_Type;
++#endif
+ 
+ static void PyPAM_Err(PyPAMObject *self, int result)
+ {
+@@ -139,7 +151,6 @@
+         return NULL;
+     }
+ 
+-    PyPAMObject_Type.ob_type = &PyType_Type;
+     p = (PyPAMObject *) PyObject_NEW(PyPAMObject, &PyPAMObject_Type);
+ 
+     if (p == NULL)
+@@ -562,35 +573,44 @@
+     PyObject_Del(self);
+ }
+ 
+-static PyObject * PyPAM_getattr(PyPAMObject *self, char *name)
+-{
+-    return Py_FindMethod(PyPAMObject_Methods, (PyObject *) self, name);
+-}
+-
+ static PyObject * PyPAM_repr(PyPAMObject *self)
+ {
+     char                buf[1024];
+     
+     snprintf(buf, 1024, "<pam object, service=\"%s\", user=\"%s\", conv=%p, pamh=%p>",
+         self->service, self->user, self->conv, self->pamh);
+-    return PyString_FromString(buf);
++    return PyBytes_FromString(buf);
+ }
+ 
+ static PyTypeObject PyPAMObject_Type = {
+-    PyObject_HEAD_INIT(0)    /* Must fill in type value later */
+-    0,
+-    "pam",
+-    sizeof(PyPAMObject),
+-    0,
+-    (destructor)PyPAM_dealloc,        /*tp_dealloc*/
+-    0,        /*tp_print*/
+-    (getattrfunc)PyPAM_getattr,        /*tp_getattr*/
+-    0,        /*tp_setattr*/
+-    0,        /*tp_compare*/
+-    (reprfunc)PyPAM_repr,            /*tp_repr*/
+-    0,        /*tp_as_number*/
+-    0,        /*tp_as_sequence*/
+-    0,        /*tp_as_mapping*/
++    PyVarObject_HEAD_INIT(NULL, 0)    /* Must fill in type value later */
++    "pam",                              /* tp_name */
++    sizeof(PyPAMObject),                /* tp_basicsize */
++    0,                                  /* tp_itemsize */
++    (destructor)PyPAM_dealloc,          /* tp_dealloc */
++    0,                                  /* tp_print */
++    0,                                  /* tp_getattr */
++    0,                                  /* tp_setattr */
++    0,                                  /* tp_compare */
++    (reprfunc)PyPAM_repr,               /* tp_repr */
++    0,                                  /* tp_as_number */
++    0,                                  /* tp_as_sequence */
++    0,                                  /* tp_as_mapping */
++    0,                                  /* tp_hash */
++    0,                                  /* tp_call */
++    0,                                  /* tp_str */
++    PyObject_GenericGetAttr,            /* tp_getattro */
++    0,                                  /* tp_setattro */
++    0,                                  /* tp_as_buffer */
++    Py_TPFLAGS_DEFAULT,                 /* tp_flags */
++    "PyPAM",                            /* tp_doc */
++    0,                                  /* tp_traverse */
++    0,                                  /* tp_clear */
++    0,                                  /* tp_richcompare */
++    0,                                  /* tp_weaklistoffset */
++    0,                                  /* tp_iter */
++    0,                                  /* tp_iternext */
++    PyPAMObject_Methods,                /* tp_methods */
+ };
+ 
+ static PyMethodDef PyPAM_Methods[] = {
+@@ -607,7 +627,12 @@
+  */
+ static void insint(PyObject *d, char *name, int value)
+ {
+-    PyObject*        v = PyInt_FromLong((long) value);
++    PyObject*        v;
++#ifdef IS_PY3K
++    v = PyLong_FromLong((long) value);
++#else
++    v = PyInt_FromLong((long) value);
++#endif
+ 
+     if (!v || PyDict_SetItemString(d, name, v))
+         PyErr_Clear();
+@@ -615,19 +640,42 @@
+     Py_XDECREF(v);
+ }
+ 
++#ifdef IS_PY3K
++static struct PyModuleDef pamdef = {
++        PyModuleDef_HEAD_INIT,
++        "PAM",
++        NULL,
++        -1,
++        PyPAM_Methods,
++        NULL,
++        NULL,
++        NULL,
++        NULL
++};
++
++#define INITERROR return NULL
++PyObject *PyInit_PAM(void)
++
++#else
++#define INITERROR return
+ void initPAM(void)
++#endif
+ {
+     PyObject            *m, *d;
+ 
++#ifdef IS_PY3K
++    m = PyModule_Create(&pamdef);
++#else
+     m = Py_InitModule("PAM", PyPAM_Methods);
++#endif
+     d = PyModule_GetDict(m);
+     
+     PyPAM_Error = PyErr_NewException("PAM.error", NULL, NULL);
+     if (PyPAM_Error == NULL)
+-        return;
++        INITERROR;
+     PyDict_SetItemString(d, "error", PyPAM_Error);
+ 
+-    PyPAMObject_Type.ob_type = &PyType_Type;
++    Py_TYPE(&PyPAMObject_Type) = &PyType_Type;
+     PyPAMObject_Type.tp_doc = PyPAMObject_doc;
+     Py_INCREF(&PyPAMObject_Type);
+ 
+@@ -692,4 +740,7 @@
+     insint(d, "PAM_BINARY_PROMPT", PAM_BINARY_PROMPT);
+ #endif
+ 
++#ifdef IS_PY3K
++    return m;
++#endif
+ }
+--- setup.py.python3	2014-06-24 15:58:07.792172439 +0200
++++ setup.py	2014-06-24 15:58:13.714909021 +0200
+@@ -12,7 +12,7 @@
+     license='LGPL',
+     ext_modules=[
+         Extension(
+-            'PAMmodule',
++            'PAM',
+             ['PAMmodule.c'],
+             libraries=['pam', 'pam_misc'],
+             extra_compile_args = ['-std=c99'],
+--- tests/PamTest.py.python3	2014-06-24 16:54:28.902998249 +0200
++++ tests/PamTest.py	2014-06-24 17:07:11.392094775 +0200
+@@ -41,13 +41,13 @@
+     def test_userdata_default(self):
+         """The default value for userdata is None."""
+     
+-        self.failUnless(self.pam.get_userdata() is None)
++        self.assertTrue(self.pam.get_userdata() is None)
+ 
+     def test_userdata(self):
+         """The userdata getter and setter will store and return any data."""
+     
+         self.pam.set_userdata(1)
+-        self.failUnless(self.pam.get_userdata() == 1)
++        self.assertTrue(self.pam.get_userdata() == 1)
+ 
+     def test_start(self):
+         """pam.start() works as expected."""
diff --git a/dev-python/pypam/files/pypam-0.5.0-stricter.patch b/dev-python/pypam/files/pypam-0.5.0-stricter.patch
new file mode 100644
index 000000000000..453910349134
--- /dev/null
+++ b/dev-python/pypam/files/pypam-0.5.0-stricter.patch
@@ -0,0 +1,15 @@
+=== modified file 'PAMmodule.c'
+--- PAMmodule.c	2007-05-28 17:50:59 +0000
++++ PAMmodule.c	2007-05-28 18:13:33 +0000
+@@ -9,8 +9,9 @@
+ 
++#include <Python.h>
+ #include <security/pam_appl.h>
+ #include <security/pam_misc.h>
+-#include <Python.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <dlfcn.h>
+ 
+ static PyObject *PyPAM_Error;
+
diff --git a/dev-python/pypam/metadata.xml b/dev-python/pypam/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/pypam/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pypam/pypam-0.5.0-r3.ebuild b/dev-python/pypam/pypam-0.5.0-r3.ebuild
new file mode 100644
index 000000000000..4ed08707692a
--- /dev/null
+++ b/dev-python/pypam/pypam-0.5.0-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="PyPAM"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python Bindings for PAM (Pluggable Authentication Modules)"
+HOMEPAGE="http://www.pangalactic.org/PyPAM"
+SRC_URI="http://www.pangalactic.org/PyPAM/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE=""
+
+DEPEND=">=sys-libs/pam-0.64"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS examples/pamtest.py )
+
+PATCHES=(
+	# Pull patches from fedora.
+	"${FILESDIR}/PyPAM-${PV}-dealloc.patch"
+	"${FILESDIR}/PyPAM-${PV}-nofree.patch"
+	"${FILESDIR}/PyPAM-${PV}-memory-errors.patch"
+	"${FILESDIR}/PyPAM-${PV}-return-value.patch"
+	"${FILESDIR}/PyPAM-python3-support.patch"
+	# Fix a missing include.
+	"${FILESDIR}/${P}-stricter.patch"
+)
+
+src_compile() {
+	append-cflags -fno-strict-aliasing
+	distutils-r1_src_compile
+}
+
+python_test() {
+	"${PYTHON}" tests/PamTest.py
+}
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
new file mode 100644
index 000000000000..0dd3eda2f663
--- /dev/null
+++ b/dev-python/pyparsing/Manifest
@@ -0,0 +1,11 @@
+AUX distutils.patch 227 SHA256 1792891234f2fbfd56e83136f91032120daf33c5da87f41464f0f3f1910747ef SHA512 2a56efd9bea8649e2a07cbf11c74cb1b7c7e55aecfeed7a8fd6523dde3c7fb0be0f313aacc948f960999987a5b26f351139756eede685257bb7331576f1e879f WHIRLPOOL 5e467f121a18d786d2f96fe808a6e2380c56ea6a744661d3070f7dbd1e8aa7f4a92307a6db569758853aa9cab915aacac253de3c0889405ab7f1c5b11426ef46
+AUX pyparsing-2.2.0-distutils.patch 496 SHA256 9b47c9ce1dcad0eaca87dacb2be792d2b9e5eacc179cee8a89c735bea271819f SHA512 0fa30bfa6fbf08b4723e80d4f688daea62589c1aaf6ced8bbe56c1edfb438882a7b0e68969b69e5d2da59b0bbd5f2eba051423b011c1bb01c1d74e2254e66090 WHIRLPOOL cff36a3b5b688064b48efc858a3b878c8e57ff8d5103ab016d3316933d920ef6264407725da1be80e9ed1661253cbf9dded99fbcde9d255312b3fc7c8cf9dbfe
+DIST pyparsing-2.0.3.tar.gz 1462653 SHA256 06e729e1cbf5274703b1f47b6135ed8335999d547f9d8cf048b210fb8ebf844f SHA512 9771851f4b0191c7d3f8d2a2a6d2a9198b173120d3f133d08284b71e792fc59a906d571edea8f44ba04ab00c1d906e1974d1e8a2d6155d492de1358ba99c575a WHIRLPOOL 42b9c7aa0b8d4d91436a01a60cbca64a9c8f7798b7aeb60bd2c4af085f9e13167a5ac5132d55bd890b4890c00428e908dfae32ed78ec153c868ee02ed3cdaa3f
+DIST pyparsing-2.1.10.tar.gz 1230829 SHA256 811c3e7b0031021137fc83e051795025fcb98674d07eb8fe922ba4de53d39188 SHA512 21af73d6f479d52746f269c8fbaf90c1107a8aec756d30af8c7c4e6a2ff0ea9659cc07816b7ea19286bc12d43497f5e8e63351453bf18daf6a1cb380a195532e WHIRLPOOL 1ffbad12d00b99a260cd77c61503aa1800f97028be7c40e67f582c1b497ed1872e51d33887e278cd5203ec379d27886edd9455d1d8f7bef9d1b2d7df38185cc4
+DIST pyparsing-2.2.0.tar.gz 1232522 SHA256 0832bcf47acd283788593e7a0f542407bd9550a55a8a8435214a1960e04bcb04 SHA512 6a409f429d40a5ac202d144e4150de2c80d7c7120147f603f72a4a99797d48c50822a6437f590ec5ae4418d51aa1f6b1d4e5d95a57e19bec0a127b04e4937008 WHIRLPOOL dde3e3ec016671f76976f4b585a027070b3087b46a336363c994dc3e97ad699b5551dc439b8f52230ca48bdd6a50d3ac3576440dcac4802e29e6f9ca4494f2d9
+EBUILD pyparsing-2.0.3.ebuild 1017 SHA256 8e76bdce17e5a760c6f94a0764ddca3bede8fa485f6529538f7f8cce7c083886 SHA512 c034bc881db4034ee89a440364fe2c9381dfea812a365e710b47782752a1d85ea899fd335b929374e6aa195283b958e7159ab4491c7cc4795fc7af43e78f03b3 WHIRLPOOL 17fd2d7231539f64e4dc848e03495d127dbf2eb2e3f946129258b5544205b8a59228e4f13784a29915eb77846f8192de9a2335761c187a5344c9b77cd2fd1d8d
+EBUILD pyparsing-2.1.10.ebuild 1364 SHA256 2ed10d97b5dd9f767e1381dcae364836a19a9d8111a37c80f1e824ab25c90cf6 SHA512 ee223d1ca684eefc69bc756bd1ef3a491a2a6edd16bf9a6d1873634094cbdbbb6114ba19fd4902ec68f58cb741605451a5cea97b95f042dd566f5eda109f3a0e WHIRLPOOL 605f5ad54aef6db5aa1fdc96d8f700c699d67e7736e14f0d06fffffea0157d3ccf2dca9bbab994cf02386a249d66102135f23bf3a0daaebfda1515ac72feb25e
+EBUILD pyparsing-2.2.0.ebuild 1328 SHA256 a97a1148b1cc04aec42e20c6812ea60f9eb9fb16e0cbf1f192c969b3b124b4be SHA512 f0b02b85a3b11ccbbce32d2fcda8b7b17076460ef04a4b6d6801b07da5c713e63e490ee956f0ce964baec072fac509f2c1d2ff1c089fb2ef544417204f4db5bc WHIRLPOOL 6a20e0be807e2cb91390bca63c93c50aa0be3b4606f1855f022ff560ef506690829c2a4e3cd10de950d4ad9467f713beaeef922ce5899a76ebf406e91afbcb9a
+MISC ChangeLog 6752 SHA256 89f078d31f0456db44d33c4202708dc74eff8e47595a7c5197ef8a377a12c1ec SHA512 3d85ec5036c7b5fb18ca5b4a73128fea7c6e6dc0f77d126cf6f7f122c4f521f7fef9df201e5e091a51b47f896b8fab48dad151246371098b2f9adf46e2fed011 WHIRLPOOL 67448a0cb8e5ed7691b21b0196b36a4d16c1799ab0cac2af2774fdb883ec9b59ce3a6ba093700735bf773d64cd6f7dc6951a035203203f959f410431b149db91
+MISC ChangeLog-2015 15116 SHA256 d700474f7c6f5e3213e27fbac7bfebf23d91d1edb29cf2c13f9bd446c20e7795 SHA512 63a09490efb7baedb33a214dd11fdca209e3036914c28e94959f19d7c506c2d3f5ced6e3860180723f1d3392568eaf7e00b17e628d75f8d24aea1517e7462887 WHIRLPOOL 283a30a1de3fc5b48a26429c46ecd258c57b5d06969c067f78b888bf5e7df25f395afc4ff074e299193f78e98bbb741847606d4cc7829f9bd7709f3eb025e902
+MISC metadata.xml 737 SHA256 87dbbbee61f9475d5621d68b9e44061bec88dbe94d041df651618e98cb4d035b SHA512 2cab4251c3444c6479b4d5ff92221399e01ea5e4a6af96631ccf81cdce5f3f9cc2ab06993c9636f36469acb5b28660c41e594d0d7315c6cd9b5dbaec0deda7cf WHIRLPOOL fea63cb38825c534f06d9faca79f9bd88f29e9f97937ec4f4d3f7d53c0b218a34074107f810908d8c7dd147f9e89063fb3d77b90a03e70e8c4fbc08ff4548e2d
diff --git a/dev-python/pyparsing/files/distutils.patch b/dev-python/pyparsing/files/distutils.patch
new file mode 100644
index 000000000000..af6a67301128
--- /dev/null
+++ b/dev-python/pyparsing/files/distutils.patch
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env python

+ 

+ """Setup script for the pyparsing module distribution."""

+-from setuptools import setup

++from distutils.core import setup

+ 

+ import sys

+ import os

diff --git a/dev-python/pyparsing/files/pyparsing-2.2.0-distutils.patch b/dev-python/pyparsing/files/pyparsing-2.2.0-distutils.patch
new file mode 100644
index 000000000000..6fa4a30d92ad
--- /dev/null
+++ b/dev-python/pyparsing/files/pyparsing-2.2.0-distutils.patch
@@ -0,0 +1,17 @@
+Force distutils to be used instead of falling back to it after trying
+setuptools in order to avoid bootstrap issues.
+
+--- pyparsing-2.2.0/setup.py
++++ pyparsing-2.2.0/setup.py
+@@ -4,10 +4,7 @@
+ 

+ # Setuptools depends on pyparsing (via packaging) as of version 34, so allow

+ # installing without it to avoid bootstrap problems.

+-try:

+-    from setuptools import setup

+-except ImportError:

+-    from distutils.core import setup

++from distutils.core import setup

+ 

+ import sys

+ import os

diff --git a/dev-python/pyparsing/metadata.xml b/dev-python/pyparsing/metadata.xml
new file mode 100644
index 000000000000..9a57fea5295c
--- /dev/null
+++ b/dev-python/pyparsing/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    The pyparsing module is an alternative approach to creating and
+    executing simple grammars, vs. the traditional lex/yacc approach, or the
+    use of regular expressions. The pyparsing module provides a library of
+    classes that client code uses to construct the grammar directly in
+    Python code.
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">pyparsing</remote-id>
+    <remote-id type="pypi">pyparsing</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyparsing/pyparsing-2.0.3.ebuild b/dev-python/pyparsing/pyparsing-2.0.3.ebuild
new file mode 100644
index 000000000000..4400c2dc95fb
--- /dev/null
+++ b/dev-python/pyparsing/pyparsing-2.0.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy-to-use Python module for text parsing"
+HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples"
+
+RDEPEND="!dev-python/pyparsing:py2 !dev-python/pyparsing:py3"
+
+# no contained in the tarball
+RESTRICT=test
+
+python_install_all() {
+	local HTML_DOCS=( HowToUsePyparsing.html )
+	if use doc; then
+		HTML_DOCS+=( htmldoc/. )
+		dodoc docs/*.pdf
+	fi
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	${PYTHON} unitTests.py || die
+}
diff --git a/dev-python/pyparsing/pyparsing-2.1.10.ebuild b/dev-python/pyparsing/pyparsing-2.1.10.ebuild
new file mode 100644
index 000000000000..c4b4ed5e850d
--- /dev/null
+++ b/dev-python/pyparsing/pyparsing-2.1.10.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy-to-use Python module for text parsing"
+HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing"
+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 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples"
+
+# not contained in the tarball
+RESTRICT=test
+
+PATCHES=(
+	# Avoid circular dep with setuptools
+	"${FILESDIR}/distutils.patch"
+)
+
+python_install_all() {
+	local HTML_DOCS=( HowToUsePyparsing.html )
+	if use doc; then
+		HTML_DOCS+=( htmldoc/. )
+		dodoc docs/*.pdf
+	fi
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	${PYTHON} unitTests.py || die
+}
+
+pkg_preinst() {
+	_remove_egg_info() {
+		local pyver="$("${PYTHON}" -c 'import sys; print(sys.version[:3])')"
+		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
+		if [[ -d ${egginfo} ]]; then
+			einfo "Removing ${egginfo}"
+			rm -r "${egginfo}" || die
+		fi
+	}
+	python_foreach_impl _remove_egg_info
+}
diff --git a/dev-python/pyparsing/pyparsing-2.2.0.ebuild b/dev-python/pyparsing/pyparsing-2.2.0.ebuild
new file mode 100644
index 000000000000..a8757fd23b38
--- /dev/null
+++ b/dev-python/pyparsing/pyparsing-2.2.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy-to-use Python module for text parsing"
+HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing"
+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 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples"
+
+# not contained in the tarball
+RESTRICT=test
+
+PATCHES=( "${FILESDIR}"/${P}-distutils.patch )
+
+python_install_all() {
+	local HTML_DOCS=( HowToUsePyparsing.html )
+	if use doc; then
+		HTML_DOCS+=( htmldoc/. )
+		dodoc docs/*.pdf
+	fi
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	${PYTHON} unitTests.py || die
+}
+
+pkg_preinst() {
+	_remove_egg_info() {
+		local pyver="$("${PYTHON}" -c 'import sys; print(sys.version[:3])')"
+		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
+		if [[ -d ${egginfo} ]]; then
+			einfo "Removing ${egginfo}"
+			rm -r "${egginfo}" || die
+		fi
+	}
+	python_foreach_impl _remove_egg_info
+}
diff --git a/dev-python/pyparted/Manifest b/dev-python/pyparted/Manifest
new file mode 100644
index 000000000000..6384b8057d67
--- /dev/null
+++ b/dev-python/pyparted/Manifest
@@ -0,0 +1,6 @@
+AUX pyparted-3.10.3-greater.patch 342 SHA256 8f05ff1a9606f7263ab9eaae18960b49ac762df7c8146589aea11307f5d76cfc SHA512 c7a22b6fc2d72c0eb15f0144ea023cbc56257d26afa144039d528add2002af663fb2bc54420216992e32cc77bd699c60b2040291749729468749a09f890c7e2c WHIRLPOOL 9b50c95fc4e1c757d870030df463d7870bad187ab2fdd15e8b1bc0fd3f3bb0765e9ee1f3a95301b70d2db9b480bb3598bd1ed7d78f289877c8305f0748da8412
+DIST pyparted-3.10.7.tar.gz 99879 SHA256 5914e3a60437fe3e3758a9e86ee4a539dfa46cfe18e3df386a5cf1f75a963431 SHA512 c57fed2a8d04511b12891fd59b6dd6840439aada7e5ebeab14a56e6e4f201c249046ee87d9d25af1b3f02960994efb0a2973f25928a9df85d48bbd1bc196ab07 WHIRLPOOL 9ffa320c496e511d4735209dbb7e9c1b6328e11513839a1299f1b5c3d32c7ed225d081db43482ee57774a13de862d3fef24fa80dba34a117386b8f63dd07ba74
+EBUILD pyparted-3.10.7.ebuild 689 SHA256 3fd02fd80a52489b43a1609efecbdfc5f869696b4c20460f11dac2be33c0daf0 SHA512 f362b826de90adc0309508bc764e9db7761d36d90bbb80ecf005fe51999c5e1e5ed9ebedbf6ab347ef04cf973708d9a1d96de0cec44c14c14d0b43493ce85db9 WHIRLPOOL e36bcf788372ae732de30406782ae6e4b67296204d85d41da0c4fc0f5623c626ac618cde040a82234dd36a028397c3c2c1d2a6013f351bfb256ca00ea137d7ef
+MISC ChangeLog 3249 SHA256 59ff3025583e142212a9156051e8db7ee118dc1c7a15bfb91a29cfc9a2572bd5 SHA512 1055f77c139a8a0ec5f652b3cf2943f69c1b3ad266323cabbd2c5a992a1ca9389b57a870f9797f598870518e9603753560d734c33ce7c304c7e9d314c9501cb4 WHIRLPOOL 506aab2b22f45257f55fd05a92f01443db2fdbbdaec34c4489f82f7448dc15ed98d489bbc67267dde76492d34ec93e040d4614efe13a35e7f4fdaae4606799e9
+MISC ChangeLog-2015 13453 SHA256 4192f25d64d17f53b466d0cea50820743170deb74adf2c6bb86713e8f3dec47a SHA512 cd69f1bf0dba7da8dde49e3fa56ab04b2308552d1b980edd70ec46cdac734a3316c0c82e175a300c9625f2f7decec834a6bcd7a71592c57ca66d646c89e2a892 WHIRLPOOL 4ccf2c7e10001902b8fe87131915c2ef121cf67bf379598b7f4c16a73dc5edc507006436f8aa7c8f7814e79f2ae6132466c2cac862024880e726a3b276dd8a03
+MISC metadata.xml 340 SHA256 1f7f73db7d8943c7674867c6e8ba5b612bc17545eefd35fa09c489d3521c04a5 SHA512 dc34de6235dd150a24b2cea6fd14028328a44fbfff6a75819c51fdd623f54b2f4bfa55f13cd827ddacbf11b0f9206c56025234948ec116e9df47ead634d8766e WHIRLPOOL 86058df17fa0e91635fc51ddb184fc90b4e41488694d702ffa2ac6550f99bcfac14321624a11e08076710298400819e19f3c831ed2902eb1b45e3ebc7db9895a
diff --git a/dev-python/pyparted/files/pyparted-3.10.3-greater.patch b/dev-python/pyparted/files/pyparted-3.10.3-greater.patch
new file mode 100644
index 000000000000..53af4fe34e59
--- /dev/null
+++ b/dev-python/pyparted/files/pyparted-3.10.3-greater.patch
@@ -0,0 +1,11 @@
+--- a/tests/test__ped_ped.py
++++ b/tests/test__ped_ped.py
+@@ -228,7 +228,7 @@
+ 
+         self.assertGreater(len(lst), 0)
+         self.assertGreater(
+-            len([e for e in lst if e.path.startswith("/tmp/temp-device-")]), 0)
++            len([e for e in lst]), 0)
+ 
+ class DeviceFreeAllTestCase(RequiresDevice):
+     def runTest(self):
diff --git a/dev-python/pyparted/metadata.xml b/dev-python/pyparted/metadata.xml
new file mode 100644
index 000000000000..e9e596283859
--- /dev/null
+++ b/dev-python/pyparted/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>livecd@gentoo.org</email>
+		<name>Gentoo LiveCD Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rhinstaller/pyparted</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyparted/pyparted-3.10.7.ebuild b/dev-python/pyparted/pyparted-3.10.7.ebuild
new file mode 100644
index 000000000000..86c712c92e3f
--- /dev/null
+++ b/dev-python/pyparted/pyparted-3.10.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for sys-block/parted"
+HOMEPAGE="https://github.com/rhinstaller/pyparted/"
+SRC_URI="${HOMEPAGE}archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="test"
+REQUIRED_USE="
+	test? ( python_targets_python2_7 )
+"
+
+RDEPEND="
+	>=sys-block/parted-3.1
+	dev-python/decorator[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.10.3-greater.patch
+)
+
+python_test() {
+	emake test
+}
diff --git a/dev-python/pypax/Manifest b/dev-python/pypax/Manifest
new file mode 100644
index 000000000000..94302c0ab6b2
--- /dev/null
+++ b/dev-python/pypax/Manifest
@@ -0,0 +1,6 @@
+DIST elfix-0.9.2.tar.gz 398758 SHA256 1a50ec57d6f5d1b25dcaaaf15f82849774e9e4e7e263cee3aa4936c5e3d6f071 SHA512 a7be30722abe7249ec42024d33b2bda00524cfb85da66b4511c5056efbdbfae1d3c2b42048bcf4d5cb7c0ae675f763b74a834d93a25b541ebac42fddcd2c6cf9 WHIRLPOOL aead1a63612ea187dc00aa52ee2c18431036176aae2e0e08d3138ced751f28947ee8045dd63dae67f89946d5b64e705a6b6d45b884d3d9da1d7e6e03b37ed700
+EBUILD pypax-0.9.2.ebuild 1089 SHA256 bb3f3b441630b13a6a02ace6e4f6a76e903a19eab4e3ad6344c9fd182d4cb48d SHA512 49de33ef1c9417d9d3118f489ff428974191547b30a467a52892f83c7e5409aab2000aa6980b760144bcc41f68f4abd44e4afd34373ed282f3f12326503c8368 WHIRLPOOL 77f70c108c74fc5903363b2afc5e247b40ba71c45096cc30a74c8401d16ba5d806281fe489e10e70b367cc8fd3085355a2beab0d824d911e830ff85d91935c65
+EBUILD pypax-9999.ebuild 1100 SHA256 9736749ae54a7f7bc849071a1e6ae5ff697345a4dfe706f8ac9a507ddf3bfc2f SHA512 f4d0260ae9c58141589132d8d7cd8cf0066759b7014eab815e9f8266046595d6210baa61da4d54456f288fe5a38f377838090d322397c8f34e4a104fb44ccd68 WHIRLPOOL 6a6634d3b34bf1b12c56282ceb38f9fe222f3bf56011025794e2a8976ea340c53dba29849db1c9182f0109adc699862e81053b7c1371b137b0bf4af7f6201d30
+MISC ChangeLog 5797 SHA256 a7737098ab02ce4678a541da1fd95c3af17347509b144a9f29c48cb482140242 SHA512 0523e640c9b3887214bce6167eb82fabf24863f43296af9a94dba550ab24a099d4a37e996a295f712c0980e3deb67f52fe0b92a6e3e38465892fc1acfb0198f4 WHIRLPOOL caa87e44ec495dda230d9e2d9bffb632ff05ad198c35aad98b0b6d0506214bbc28c9d471aca50ef1d92482fddede7352fd1809254d2843011d4bd67a395a2eaf
+MISC ChangeLog-2015 12040 SHA256 f4db17e69dbb409cc06ad9b8de295d2a5219ce08f5069b7f868b1bad038a22fa SHA512 cbe9487651e5019a36c7607b0ec74ffa9a65f8bc16a0ae36873c9efb28d2a011ede094e15b683b2c46ccba2bfd60852675155ccd8e2a46f98c244d64e7a04ea2 WHIRLPOOL 2e20773724a3607263f15bc695bbb966f4b4951b8b22120917edce8ef0d9e582754413879a2c101a4faf735b856e1f6043c2a78bbd3cf5a9c40fce9a55e27742
+MISC metadata.xml 597 SHA256 beb633159c631840f1ddb2f700689e6499eaeda6d468a6baf712211fd8182d96 SHA512 d5820da1b741114d7ecaf7cb7f0b6f1c08d675e53992c8fbf87f562c3b949ff7336e093a3a502202e671be299310c14a2a38b8d54d3485e0d9064964eb1ed87b WHIRLPOOL 207f6a858c8981ffc6f3965766bd0d66561609f92598ff283e76a7fc888151733359d8ce74bae6550cb94cbc396afbfa56fd29e85989f4a7d36c1493c34e24df
diff --git a/dev-python/pypax/metadata.xml b/dev-python/pypax/metadata.xml
new file mode 100644
index 000000000000..caddff84b5bc
--- /dev/null
+++ b/dev-python/pypax/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="xtpax">Enable XATTR_PAX_FLAGS support.</flag>
+		<flag name="ptpax">Enable PT_PAX_FLAGS support.</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-python/pypax/pypax-0.9.2.ebuild b/dev-python/pypax/pypax-0.9.2.ebuild
new file mode 100644
index 000000000000..d6d789eeeda0
--- /dev/null
+++ b/dev-python/pypax/pypax-0.9.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git"
+	inherit git-2
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+	S="${WORKDIR}/elfix-${PV}"
+fi
+
+DESCRIPTION="Python module to get or set either PT_PAX and/or XATTR_PAX flags"
+HOMEPAGE="https://dev.gentoo.org/~blueness/elfix/
+	https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+ptpax +xtpax"
+
+REQUIRED_USE="|| ( ptpax xtpax )"
+
+RDEPEND="
+	ptpax? ( dev-libs/elfutils )
+	xtpax? ( sys-apps/attr )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${RDEPEND}"
+
+src_compile() {
+	cd scripts || die
+	unset PTPAX
+	unset XTPAX
+	use ptpax && export PTPAX="yes"
+	use xtpax && export XTPAX="yes"
+	distutils-r1_src_compile
+}
+
+src_install() {
+	cd scripts || die
+	distutils-r1_src_install
+}
diff --git a/dev-python/pypax/pypax-9999.ebuild b/dev-python/pypax/pypax-9999.ebuild
new file mode 100644
index 000000000000..21130e24c551
--- /dev/null
+++ b/dev-python/pypax/pypax-9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git"
+	inherit git-2
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/elfix-${PV}"
+fi
+
+DESCRIPTION="Python module to get or set either PT_PAX and/or XATTR_PAX flags"
+HOMEPAGE="https://dev.gentoo.org/~blueness/elfix/
+	https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+ptpax +xtpax"
+
+REQUIRED_USE="|| ( ptpax xtpax )"
+
+RDEPEND="
+	ptpax? ( dev-libs/elfutils )
+	xtpax? ( sys-apps/attr )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${RDEPEND}"
+
+src_compile() {
+	cd scripts || die
+	unset PTPAX
+	unset XTPAX
+	use ptpax && export PTPAX="yes"
+	use xtpax && export XTPAX="yes"
+	distutils-r1_src_compile
+}
+
+src_install() {
+	cd scripts || die
+	distutils-r1_src_install
+}
diff --git a/dev-python/pypcap/Manifest b/dev-python/pypcap/Manifest
new file mode 100644
index 000000000000..737c6341b546
--- /dev/null
+++ b/dev-python/pypcap/Manifest
@@ -0,0 +1,8 @@
+AUX pypcap-1.1.6-mktemp.patch 380 SHA256 a44faa23da05683b9ac7968545b3f0a9eb220fda09e3b7c0ec6c52413a633877 SHA512 50a0697847af441ec896409c6526f20635d7e47652d49750305102bd01590d0992ab81461abfa091040662a2393ce7db974c21e2a4952d9067ce5e8d12ddce19 WHIRLPOOL dfc3f398e698ebd3fd46fced0ca5afe36c1978d67804d68552c59c12ef1a0fb51a969eb015a7c36b0082da33763d3e191c0e96194a08d5d432bfcf88801da87a
+DIST pypcap-1.1.5.tar.gz 47978 SHA256 04f289783f4920baab4a2144821d0be7e8a2bde7259284dd4a7e775d0016ced0 SHA512 15df8f966abb6e29f3dfbd0c7f39bb2c3616b4352667e62dc08da287c427e611ec32ac543103d0e5864e5beb86bb9353bf1417bc6680a46e79e06496d4bba353 WHIRLPOOL 4d3473ef08faa9a5e4e53e8518187071fc4b4be4a51cf1fe7ddab871501d03c44d7e88b7c21a80cbf9b4dfb653225b600b0c1651ba6a83d92a2970bc59513934
+DIST pypcap-1.1.6.tar.gz 57984 SHA256 c81a16091191c0931a9a39125d7f2cc5c0ebbf04745d970fbafc7d70c9c1dd61 SHA512 3d81364202256b19300b45b570537eead9835d8d58f54f51ed8ae43df1a270c0753c16b2050a999fa0f281e46ac66f71b96b6b4c910f2c18a5efae29a3b4e854 WHIRLPOOL d3d559de1ceb4fd14ef2aea040d4c37de07b2e1d385f992f6d5ac2e277994ded95caaef0bbcc9dfec6eb2c915915ff521f8b770200c4e26d03b1c76936796418
+EBUILD pypcap-1.1.5.ebuild 666 SHA256 657e58b70968c5476a7f63d11b4dc2974694db90bd3e435431c78dad89382893 SHA512 bca226e2aa27d4af6ce40d925b9f87d126be10ad87d7bf75a6910c679fde7161945fb4da0e13bd65dbb6ffecdfc457920c891d1acf28e0969063695d3ee8cae6 WHIRLPOOL a0a02b05be3e8bfb5ba8b3426d79071a1c6e0300e0096a331e49dc7b180b780264b3b0d57651b764ab890eb53c9cbc5ad01aa3dcfe14ab643e6d468b0b174c80
+EBUILD pypcap-1.1.6.ebuild 719 SHA256 02d16c7c814dbb6b1054ebf56dfd5831804dd5a7e4317f8477932f2b06c21813 SHA512 29170c048428d0403bb936e90bd79baa4b96981c8a6c6c336544cd87badfee23def22accba43a210ea8c65f399bf071e4b7f42b8563a2036fbe4f872e41b0a01 WHIRLPOOL 0c8c36a47a90037c5f865f5dcb61b63d3b928ca19a04a76db6d596da9397b19745def50ac43be46ba0791c0e7f2344df49ccef195a4b1ac7743817fbecaaefe3
+MISC ChangeLog 2979 SHA256 59f853029ae66a8b502e4ea232810ae31a7e51562dbfbf1b777e19ab0d3687a3 SHA512 f848f19010e0d14a6db7a63de27b8c7b5a0db516dc92adf97375685398f5759848b99335c1eef46e158406c94fd6441444f586fbb74918c5b0840dd02a69d2bd WHIRLPOOL c26fb372050f4a5c40a778bf1028619706a29a639b90818b015e82ad237f8d108f79acd14fa6a97a98095f83b0425d0d49219e7c346a82cef08a44d61e3d6011
+MISC ChangeLog-2015 2497 SHA256 6f416885eb90e651af2dcfff122ba59b6ee1df55eca4b17937ab35fd8b5c6483 SHA512 4ac60775b8525d81baf397da808b6cfb92aae49d209a6dbbffdfda6df3f56b24aff57f121b950c158dbdc495d55d5034be9f50461654bad44c730a9b96cc614a WHIRLPOOL da764591b429c0c485a3c866e5002cd45210a0c50623f81d45fa559701a4f27bcf315bd800c63c6a733168c3dc0912d514e6add2a0f5c0f140bb809929f131b6
+MISC metadata.xml 577 SHA256 c5eb3ae706c9269da42cdf7b7299aaafbc584bc9bdb3e7c747b23548919c2d46 SHA512 f50b1b47d18538d5a9ef3888eba98cca67fa919a5f3315fda54d098cfea595edbeefb62038035b07bc1b74cad3fdb56399c136512d6cb5b71ddf240594261c98 WHIRLPOOL 0865e11fdf9c642c00284b4d5236248c2591017a1a3b83188a50ef74c171940e6462f9947b9847f2a5465fc6e6e6debd44b66af35529b0b3dfff451c506c9336
diff --git a/dev-python/pypcap/files/pypcap-1.1.6-mktemp.patch b/dev-python/pypcap/files/pypcap-1.1.6-mktemp.patch
new file mode 100644
index 000000000000..9bc3f3639c9f
--- /dev/null
+++ b/dev-python/pypcap/files/pypcap-1.1.6-mktemp.patch
@@ -0,0 +1,19 @@
+--- a/pcap_ex.c
++++ b/pcap_ex.c
+@@ -11,6 +11,7 @@
+ # include <string.h>
+ # include <signal.h>
+ # include <unistd.h>
++# include <stdlib.h>
+ #endif
+ 
+ #include <pcap.h>
+@@ -290,7 +291,7 @@
+ 	char ebuf[PCAP_ERRBUF_SIZE];
+ 	int ret = -1;
+ 	
+-	mktemp(path);
++	mkstemp(path);
+ 	if ((f = fopen(path, "w")) != NULL) {
+ 		hdr.magic = 0xa1b2c3d4;
+ 		hdr.version_major = PCAP_VERSION_MAJOR;
diff --git a/dev-python/pypcap/metadata.xml b/dev-python/pypcap/metadata.xml
new file mode 100644
index 000000000000..dcb1e52969b7
--- /dev/null
+++ b/dev-python/pypcap/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">pypcap</remote-id>
+    <remote-id type="pypi">pypcap</remote-id>
+    <remote-id type="github">pynetwork/pypcap</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pypcap/pypcap-1.1.5.ebuild b/dev-python/pypcap/pypcap-1.1.5.ebuild
new file mode 100644
index 000000000000..580c5f244113
--- /dev/null
+++ b/dev-python/pypcap/pypcap-1.1.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Simplified object-oriented Python extension module for libpcap"
+HOMEPAGE="https://github.com/pynetwork/pypcap https://pypi.python.org/pypi/pypcap"
+SRC_URI="https://github.com/pynetwork/pypcap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_compile() {
+	local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
diff --git a/dev-python/pypcap/pypcap-1.1.6.ebuild b/dev-python/pypcap/pypcap-1.1.6.ebuild
new file mode 100644
index 000000000000..66b6ff129a7a
--- /dev/null
+++ b/dev-python/pypcap/pypcap-1.1.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Simplified object-oriented Python extension module for libpcap"
+HOMEPAGE="https://github.com/pynetwork/pypcap https://pypi.python.org/pypi/pypcap"
+SRC_URI="https://github.com/pynetwork/pypcap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+
+RDEPEND="
+	net-libs/libpcap
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.6-mktemp.patch
+)
+
+python_compile() {
+	local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
diff --git a/dev-python/pypeg2/Manifest b/dev-python/pypeg2/Manifest
new file mode 100644
index 000000000000..79dcbb69086a
--- /dev/null
+++ b/dev-python/pypeg2/Manifest
@@ -0,0 +1,6 @@
+AUX pypeg2-2.15.1-test.patch 399 SHA256 2d54b6c8e24d6f6efc78d5d54cb224bc0e9cf4e07e4204cb2c29577fe572f852 SHA512 20428aa41858da3b73a262ec2f36aed0df8626999eae27438a6bad1908b1dc79056ab33069c273aae56eabc02dfd0c080daaf42fee7e7c92ec32b95244ba41c4 WHIRLPOOL 150c0ae98d9a231f871964076b4840451768c3bd2a012d42294618a93b6a2aa4beefdf75b86304ec1e03d2da94410ed5be7189c5f66bf7f116f0e54e8886be98
+DIST pyPEG2-2.15.2.tar.gz 40334 SHA256 2b2d4f80d8e1a9370b2a91f4a25f4abf7f69b85c8da84cd23ec36451958a1f6d SHA512 f78e3b1294169167809c5fe05f2a69af2bd6c7c4c1bcbebafb4aa6b8ae6ead181a46b051e41193bc31f49c4b4fa7b1ef231d172217c11d301d0ee21d8e411b6f WHIRLPOOL ecbd65cee238b4bcb931ddb255d1ee77046cb551929826294e622afdafcdfe59337680b6e079cc644a3df531313e65796c04ea97e169eb051b099e6233b5385f
+EBUILD pypeg2-2.15.2.ebuild 715 SHA256 7345ebaee10a4fd8f8af4c5861b27ae8bb8737c424142b998d084d6ac9ef8b61 SHA512 f25302481e13af4b7980ba5eebdbc6aeb5c3370078ac5299dbc995a85a7bca4a4e2e5e1de13e986b6fab8e25645e98030cf1a8c114285df7d55360534ea5ea9c WHIRLPOOL 000bdfc8ba3edd14f2de39577d2296ded4638bab2964e9fc47b1b9eb57180ca7d9468bb717e57db90714eec3e22e53ba397967f38a82ce000fc74c087b0f929f
+MISC ChangeLog 2768 SHA256 3a73225abaff0adba7ebe04fae82d8b6a298deaa91cba3185b66d94e94d3a3fb SHA512 f3ddecb9ecf559d59338668a1fc4268c1623cfc206d90f06fa80f16b78e829cb13c785c8b485eb99d9dee1323a8d0dde5201c4ea99d80fc065673f16fd37e0aa WHIRLPOOL 35a56e21aa60c603e050ebdab8d44e6e84c5e5c846e2a8e3122428788dcb68bf26474193ea2719c020af184c7d53926828a8bc9e250d5d8700613b428bcb1650
+MISC ChangeLog-2015 381 SHA256 dcadbb6db63811fe5247f76cf669ebb2a8a795eb660ff19a5852c4de15362a46 SHA512 913c82c39eb6085f036db7f8c88e6909a69f76163f45f594b8445cc332738aa2dab87deb3cbd8e6ee134e9dfab22a26400d3b58e7178fa43f67aa807c6aa4dbd WHIRLPOOL 5b080fe24d27fa28426901c77ced42f7cbbd5b45f41ceb7dc2fe109ef0d0307bb82bdf2e708c05a29fa37ab3f43326f30ecbf366ad846853a33752b942408cbf
+MISC metadata.xml 362 SHA256 0ca0f0d9c080ab8767d897061133579095860d6a1339e376c67efa7948ce2173 SHA512 7eb0a3fbe48ee8f34bb9f697aa951faece1ce5da90319a5bd8f9958d569eebd2c91539d0d1bd46c51cdc77ddb5c858bb6d158be7268666af668a935e1c4998e7 WHIRLPOOL 79c29692ace097b46bea41e2abbd0bc76835f3a7db2e6282440392db73d9ecaa6382b00c4571507f21bb460758b089398812a6379e5bc1b3ece4736afaaae8ac
diff --git a/dev-python/pypeg2/files/pypeg2-2.15.1-test.patch b/dev-python/pypeg2/files/pypeg2-2.15.1-test.patch
new file mode 100644
index 000000000000..6ca8839d7776
--- /dev/null
+++ b/dev-python/pypeg2/files/pypeg2-2.15.1-test.patch
@@ -0,0 +1,12 @@
+Drop seemingly wrong test line that throws an AttributeError.
+
+--- pyPEG2-2.15.1/pypeg2/test/test_pyPEG2.py
++++ pyPEG2-2.15.1/pypeg2/test/test_pyPEG2.py
+@@ -255,7 +255,6 @@
+     def runTest(self):
+         r = pypeg2.parse("!all", type(self).C1)
+         self.assertEqual(str(r), "all")
+-        self.assertEqual(r._ignore1, None)
+ 
+ class ParseOmitTestCase(ParserTestCase):
+     def runTest(self):
diff --git a/dev-python/pypeg2/metadata.xml b/dev-python/pypeg2/metadata.xml
new file mode 100644
index 000000000000..1194ecffea20
--- /dev/null
+++ b/dev-python/pypeg2/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyPEG2</remote-id>
+		<remote-id type="bitbucket">fdik/pypeg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pypeg2/pypeg2-2.15.2.ebuild b/dev-python/pypeg2/pypeg2-2.15.2.ebuild
new file mode 100644
index 000000000000..38cd3e2e042c
--- /dev/null
+++ b/dev-python/pypeg2/pypeg2-2.15.2.ebuild
@@ -0,0 +1,29 @@
+# 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
+
+MY_PN=pyPEG2
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="An intrinsic PEG Parser-Interpreter for Python"
+HOMEPAGE="http://fdik.org/pyPEG/ https://bitbucket.org/fdik/pypeg/ https://pypi.python.org/pypi/pyPEG2"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${PN}-2.15.1-test.patch )
+
+python_test() {
+	"${PYTHON}" -m unittest discover || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
new file mode 100644
index 000000000000..800f389c2ba0
--- /dev/null
+++ b/dev-python/pyperclip/Manifest
@@ -0,0 +1,3 @@
+DIST pyperclip-1.5.27.zip 16938 SHA256 a3cb6df5d8f1557ca8fc514d94fabf50dc5a97042c90e5ba4f3611864fed3fc5 SHA512 cefd79f1d246c9aa9d4d0f3d8cdad291ad31bcc2e000c83e5e05704978bbf7b9b45d49667c2e88305d0a5d6baaeacfb47b26bb69fabf89b6b6e3a1e6f1e23d74 WHIRLPOOL e06951b934afcf16e26588d0bbcc018204b5a941065cd2871ee45a94cd0d2f54967aa0d7e6798b92aa5c64c37e4d7d246eba6bacd42c8b6aec9e4e6d9d3669be
+EBUILD pyperclip-1.5.27.ebuild 480 SHA256 a05f4b60ae3855d1d0ac703ec3abf184e182464855b6caa9e280b07b061f4a66 SHA512 6c5578da9d8733d3136bdcc3e06b31310197ac289636c9f698b40a8e1009616c0743948e99c77c22bb417ae1239416d2019dad5a682b476aba4ddb93fdb6ea4d WHIRLPOOL ff238275a1bbea7ed2b666455cc142cb14a8cf159154bb8ba1ca76f92cd4156153be8fe5e88890f3225423ba0e2009a6ae67babf87c4b2b044cc0997785c8854
+MISC metadata.xml 430 SHA256 d0d2862d09599ab5a8cdc0ca3f9c8887b884586888ce000c0c84a4cbef5efbe2 SHA512 883b80ca383707db508144d0434f091827e1809c9029a380c9369f8f98d920e69653767e9034eadeb730611601a0fbf09a222a45e015e08ef95c7fb54158d228 WHIRLPOOL 99e2c2cd8e833ae0fd3276051272e3315794f637893e1790e38147538b2880af1ce3b62a67d9c96e65eea17c610bb7e6b0597a8082339ced813bef0d77366cd6
diff --git a/dev-python/pyperclip/metadata.xml b/dev-python/pyperclip/metadata.xml
new file mode 100644
index 000000000000..364c5c198e73
--- /dev/null
+++ b/dev-python/pyperclip/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		A cross-platform clipboard module for Python.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pyperclip/pyperclip-1.5.27.ebuild b/dev-python/pyperclip/pyperclip-1.5.27.ebuild
new file mode 100644
index 000000000000..c7870d061ee6
--- /dev/null
+++ b/dev-python/pyperclip/pyperclip-1.5.27.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 pypy)
+inherit distutils-r1
+
+DESCRIPTION="A cross-platform clipboard module for Python."
+HOMEPAGE="https://github.com/asweigart/pyperclip"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/pypgsql/Manifest b/dev-python/pypgsql/Manifest
new file mode 100644
index 000000000000..d76c051a92a2
--- /dev/null
+++ b/dev-python/pypgsql/Manifest
@@ -0,0 +1,5 @@
+DIST pyPgSQL-2.5.1.tar.gz 152840 SHA256 498486f066f11a68f5b02a54ba5a008d01d507038c873bfd901c14d3f5ca18af SHA512 50fc6f9e44f17e116a9122ab010642850d6dcdcbecf8e0ee4c32182eadc593cde2b03aa3cc353cdcc5f79f6e4f7337e6b1250f3b98977b208a98aad282763ab3 WHIRLPOOL 55a21c648d8eeda53def823039f9021982b02ceaa0cac72384c113a1a2ce2a0fdccfa4697dad800d79adc161583cc1a1c281ad602483c7a43cf9952584176124
+EBUILD pypgsql-2.5.1-r1.ebuild 769 SHA256 25716b952b2ebe401dfc59cc66e98d545d87fd648707c167f44b3a784b1cf51a SHA512 9de2769e74134e5879d4ef944fa09ce888afb43498f692bf44d19d0f84ce474fa654fc69a05a3d02c1672c0dc8ea158a5385bd1ca5a4ba2a0433d1439993762d WHIRLPOOL 62ff33e00f33777fca5d62d561bec36380a7e166ddecdad307221009f756d991dffcf0832546cf061ea11c6ea716177b9e7ce199dbc0f905f88890ac7e47bd56
+MISC ChangeLog 3557 SHA256 ff2e1a6c311ecf43dd3ca57d4687aa9e0e8cdb638c4266822a488d2cce08817d SHA512 fd384f0b16c9a4f8d056ebb7a87a27cd967168b949ea2a32148604ae5fc98905804c258db52b08c4922f5574b785093ea88e44c21ce609052718ddb226175317 WHIRLPOOL aae0c8edb7d5c7f40f471290028edef65725fbb9c9d387350387b16605fbec566c367d6e1aa39f4222499c4fae5eecc9dd86016db69661062a790a8e996a6055
+MISC ChangeLog-2015 3598 SHA256 41de078d032f070913dae343a3f7c30aeaccc7e912b993947f44e47cb1d801bc SHA512 f5a7a863258dd9828663cc402dbbb30cad4306e35fcace29aeb49be5182b934d40dbce4e8e3842f55209c6ba017cc77c4c1623679c6950ffcc6128924313d935 WHIRLPOOL ec0d42538da5033e51d294b8b88e880c1cfc902e5b094799328a93eaeb47d77b326ba2e214b33d07236ed9dceedc1e4b0312a85b51545b02c1dd371f6ccca73f
+MISC metadata.xml 317 SHA256 888ebe44c3816ac3ea4eec6707e5af6f854a9ab29bce020f5cce60b5bcd02461 SHA512 4c87753458843cedbcde5e646f90d9bece70bdbc0cb3773522fc8fc1ebb2daa6827ef5099ef9883124205930fed6bc7b39f3e05f40c23f09dd36d9608fd55a1a WHIRLPOOL b366c1955f3420eec108f993cd8e0feefa443a5c404c344eca64b98515d1055b5536b147fd6bdbc57dee7d02d577dfae02fe59b56987bbbe458100bda67bc27c
diff --git a/dev-python/pypgsql/metadata.xml b/dev-python/pypgsql/metadata.xml
new file mode 100644
index 000000000000..3e856604578d
--- /dev/null
+++ b/dev-python/pypgsql/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pypgsql</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pypgsql/pypgsql-2.5.1-r1.ebuild b/dev-python/pypgsql/pypgsql-2.5.1-r1.ebuild
new file mode 100644
index 000000000000..b33da36f0a3a
--- /dev/null
+++ b/dev-python/pypgsql/pypgsql-2.5.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+MY_P="pyPgSQL-${PV}"
+
+DESCRIPTION="Python Interface to PostgreSQL"
+HOMEPAGE="http://pypgsql.sourceforge.net/ https://pypi.python.org/pypi/pyPgSQL"
+SRC_URI="mirror://sourceforge/pypgsql/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ia64 x86"
+IUSE="examples"
+
+DEPEND="dev-db/postgresql:*"
+RDEPEND="${DEPEND}
+	dev-python/egenix-mx-base[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	append-cflags -fno-strict-aliasing
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
new file mode 100644
index 000000000000..7f33205ddb52
--- /dev/null
+++ b/dev-python/pyphen/Manifest
@@ -0,0 +1,5 @@
+DIST Pyphen-0.9.4.tar.gz 1092404 SHA256 abfa9a0ab055341f6e250c1a6bef395c3a06f0e4cba216eeef37f617b32c0bd7 SHA512 b48dcf02c5cdf5d7ee6d6968644958af9f31fba046612016d9ae1b8cfe44d438fe769592961f93f3342cc3f3af2dfc6cd40bbfe1be67e59de9a352c33f102917 WHIRLPOOL 23237754ef3b64aa47f3744660a025e3654498787303930563a2e2b6f6886323cc8b606d23c41067559cef237b1fcba0ee1cc3dad5699c1a4faabdaf66a7d205
+EBUILD pyphen-0.9.4.ebuild 547 SHA256 6707b3e17de1b8e0cac3ea1e5c8b2ff96cc1dd87310b68736c7e96c3e7047c6b SHA512 7a0c0c7a9a8aee31c58c89a165b8655b69e4dc087f60c46424b2444ad576cb639fb9459a8ab1c0502a4b6b1fea149ce116aac0f00488201d4fd3988a931295d5 WHIRLPOOL 18933e08ebfe6397df4693ca2822cdfb0e17a7192c689aaf3367ff0d3fa9e183a2409581d0c9b2b147f0cd581d8f9052964483a6b2c5fef72b49430bbbe96b2b
+MISC ChangeLog 2911 SHA256 c18ecca09bf8b9b369a384589d807b26300ef2bd8b0c6fd14f570f10b112f4b4 SHA512 dbf9004a7dda6991a0f49730345247212d89c9b990b1b49472354c677223c7acb4b485e646a26f1d030dd7825f202ce7a1e8244d8f1ae5b079509072f8c455d9 WHIRLPOOL 0692da5fe01775951bac206f63417b70a846e260a85d699f3f9efc3e0e24ca486e6952c99e7d8f7239eb22adb39ada5812c39c4c2269f0433472319d08785619
+MISC ChangeLog-2015 1215 SHA256 46eaa0098de8a0d7ab019c5a42281583e07164546cee98d9e55e7c9feee8dabc SHA512 3261dd79befc7540f80d5af6278b7eabd72742fa8c35766fb68d73b15a9a3e793d3fcfe43ec40d55701f6a1b1dafaf99772a0b5166b77386c666b8d77fd5e13d WHIRLPOOL e3cc7e08c9b149873c3a03cd0feea1c46c73952700056c87ef84c96af3d3134d7ad5e9951bf337c1b4ecbe07ce46ce5595488387e61181a0591e3f45b71f28b3
+MISC metadata.xml 373 SHA256 14d9b4ad26e05c9d2f9777314d9fece6d4c62968f11c4128f44eed8586aca942 SHA512 9c08d8ea794dab32dcaf659cae7eec1b19d1977fddad2e54bf321e498c85fe2355f4c73bb71c78acfa094c39f20a7775bb84bb8bf163c0e3d0dcccc93d9e998a WHIRLPOOL 80969072d5dec3a06020fd6bad63ca590cb4928fd0cbf0850f5abedcaa0545a0c9a03da629fb0f60c5db45c7230819f8ea69720632af3ab3c1c74072e31d79c4
diff --git a/dev-python/pyphen/metadata.xml b/dev-python/pyphen/metadata.xml
new file mode 100644
index 000000000000..c62819e23a48
--- /dev/null
+++ b/dev-python/pyphen/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Pyphen</remote-id>
+    <remote-id type="github">Kozea/Pyphen</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyphen/pyphen-0.9.4.ebuild b/dev-python/pyphen/pyphen-0.9.4.ebuild
new file mode 100644
index 000000000000..9edcfbd4d314
--- /dev/null
+++ b/dev-python/pyphen/pyphen-0.9.4.ebuild
@@ -0,0 +1,23 @@
+# 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
+
+DESCRIPTION="Python module for hyphenation using hunspell dictionaries"
+MY_PN="Pyphen"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/Kozea/Pyphen"
+
+LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pyplusplus/Manifest b/dev-python/pyplusplus/Manifest
new file mode 100644
index 000000000000..fccaf07a35ac
--- /dev/null
+++ b/dev-python/pyplusplus/Manifest
@@ -0,0 +1,9 @@
+AUX pyplusplus-1.0.0_p20131206-numpy.patch 9236 SHA256 bd2588aac38063e2de5c4409d5e0547f336c1ee4bf53bee1d63dc76b26c0e0b7 SHA512 173655e30525ad60b40a1fb42ca4179aa975622c02545c563658303c0cc56f48c6d0358104d91248cdf27d9dafeef340d4d491556af33fee56848ada21db4e97 WHIRLPOOL 64add1e8a27f860ef2a6990148b3e3ebfd57cc76c0506a955e37566819c015f8b3e3bd4fb27a7b3aebee0d85ba8bf7a00f1eeb67e48af354b788ce62563e2be6
+DIST pyplusplus-1.0.0.zip 7886416 SHA256 dc749514642846d85de148735b44c5f5e03dc0b62feceb0727698f4069d3c963 SHA512 04a9d6f06d8d22da9ac3b4ec1efdf001f0e4a2453ff5d70d6a15b808d7247ace630c4064ab2476a28ed3dede9cdb867c0650810a0c72a0a6474912fc7ef65812 WHIRLPOOL ab12d4c2432155226e66081f72007406c71da11aae5f7e2e4bf80e3e28680cef5ec0370a8fc442f86ed14793bc340f85d203903f348982d355f48f4a52c4f89a
+DIST pyplusplus-1.0.0_p20131206.tar.xz 2984232 SHA256 bcec544fc4520a3f37dc672dfb5c3611ed973ac34912eff5f5c67267680154ba SHA512 5cdf158477d6b93d1b579383657241c48d59ac17fd890016ac68d3b9ca8453726dabb8a7913f6139e24e93c691ead85adb99a6b20aa031603c6471df04fcfea6 WHIRLPOOL ef8d5d193ab334a82a3b364bf525efd3fd588e07993de525cad705aa175041291ffabfd115f8863952a00d9424a802f4c4cb5d09c3837ef67c860d821c212730
+EBUILD pyplusplus-1.0.0-r1.ebuild 930 SHA256 e8aa2d8415a4e91a1ce9943275615a9f574475d462088c3adefa0d762d5e6b1c SHA512 c3cd3c7ebb0001d29bc10b8e5294e746c87091daf2e98205aac94c4902fcfaf693172605082e39c172585baef2c86be4033f7b9d6b081e5ee8e0fbbf8dedfba8 WHIRLPOOL 86189f0b03a721ff4d987bb07b39e77fd10b95eab2a45cfffcca0c24e8c6aa5c41521c3ee673d4b16a3029d938876b542ff2f1468be17f8ee49aab3a6b41d57a
+EBUILD pyplusplus-1.0.0_p20131206.ebuild 1034 SHA256 345a3f280c50fe418da3cf576f3fe62e681e9f88000df2f17ff4f1c66445e4aa SHA512 2d60bf563bff733a9cfd5027bc100edf459b1d366f3ac71d6d32025be0c106e8333dbbb98d54a305dde717416836ae25043ddf03567e583159325edf27b656ad WHIRLPOOL 780d4458232dc627b1d8a097c9c2ffe1759bacfc3ce7c8847cd13949fae770edafc2084df91ec098866fad83c18272a30eca09a516b4291b24682dbeb4dc8ec0
+EBUILD pyplusplus-9999.ebuild 911 SHA256 672c396a92995cc9997b041bd9c8f526a3786e49ef8f222c9542bebac4f64b90 SHA512 2e34f2d25bcdeabd43ffd16c352d66eb1e91f5fa88084de4abcf4a958609d4c35da83137a1a9860204a32b9d9a11c69c3fc4df7134166b932dfbbe74cc4fc92a WHIRLPOOL d7fc0b4890f35038a966e0e7253c3bd2b9342671902b698389eb86c741e3731c703a4b1b49737d2aecdd5ce123dd46835688de787cd0048347e6917f38f3bd89
+MISC ChangeLog 3162 SHA256 d48348d3488c2dc0586a0e204ee1af2e0d7a32eb51b9020fb98bc840fed6b4d5 SHA512 8888f8f4a1ac153aad13249763e254da5ccf5b3cee952296237f388adb7af98d7853a21102ee0bf5feb4d4bb119b2f368ab451e65efa611f0c3ee4ac6a38d840 WHIRLPOOL 16e826f1f8fcfd617264fbfb6ad34a5a575b1dcb0e559786ac653541170b9ecc5c36426e22a5ced6aa90a67d48f350a4060e9bdc7bc8debe7985905fcaba60b3
+MISC ChangeLog-2015 1903 SHA256 6d8d59262c0b1c3304df22b3df1dd5ab4b012d0eba4584ee8942ef4bf3625c08 SHA512 669ee2094a16a46a87bd2f02256ed1e9e901e0928bbfbe444a29beb62b2f851518d738fa1fe5798c809ce291eae10c2a90bc542e6734eaeefe0549be432c82de WHIRLPOOL 805e3f505f4f10a5c257dfcad6c69c88b6f9f7c1ac339128d1005228bc375b9f7d889288ddf2da6a3e45da9623b372edef036316539c763c184a68c785a61b4d
+MISC metadata.xml 659 SHA256 b57f81f82d306a0e74b6b21b039e9aba20fdb94d1f49457a8bb9cb88c53b264b SHA512 d78333a1d7795b1d5f7b8e7e498235051e182993ce3db67133dfc098d6f25fe60b4ea7eda37e393d7253f444f42b18719b9e3ef41604c81b84cfbb626ae61692 WHIRLPOOL 54fb904676b8c7feabef41e639d277d04668bd2ae29e5b067a5250bdf7d3262c35964094cb9f35022d6e703cd149fa9e27bd3d69069d800d7b72ea3f4c8a57c6
diff --git a/dev-python/pyplusplus/files/pyplusplus-1.0.0_p20131206-numpy.patch b/dev-python/pyplusplus/files/pyplusplus-1.0.0_p20131206-numpy.patch
new file mode 100644
index 000000000000..bf33f3810948
--- /dev/null
+++ b/dev-python/pyplusplus/files/pyplusplus-1.0.0_p20131206-numpy.patch
@@ -0,0 +1,179 @@
+generate code for Boost.NumPy[1] to accelerate c 1D array handling

+

+Upstream: https://sourceforge.net/p/pygccxml/patches/2/

+

+Index: pyplusplus/code_creators/__init__.py

+===================================================================

+--- pyplusplus/code_creators/__init__.py.orig

++++ pyplusplus/code_creators/__init__.py

+@@ -110,6 +110,8 @@ from member_variable import bit_field_t

+ from member_variable import bit_field_wrapper_t

+ from member_variable import array_mv_t

+ from member_variable import array_mv_wrapper_t

++from member_variable import array_numpy_t

++from member_variable import array_numpy_wrapper_t

+ from member_variable import mem_var_ref_t

+ from member_variable import mem_var_ref_wrapper_t

+ from member_variable import member_variable_addressof_t

+Index: pyplusplus/code_creators/code_creator.py

+===================================================================

+--- pyplusplus/code_creators/code_creator.py.orig

++++ pyplusplus/code_creators/code_creator.py

+@@ -126,6 +126,7 @@ class code_creator_t(object):

+         files = []

+         if self.code_generator == self.CODE_GENERATOR_TYPES.BOOST_PYTHON:

+             files.append( "boost/python.hpp" )

++            files.append( "boost/numpy.hpp" )

+             files.append( code_repository.named_tuple.file_name )

+         else:

+             files.append( code_repository.ctypes_utils.file_name )

+Index: pyplusplus/code_creators/member_variable.py

+===================================================================

+--- pyplusplus/code_creators/member_variable.py.orig

++++ pyplusplus/code_creators/member_variable.py

+@@ -507,7 +507,95 @@ class array_mv_wrapper_t( code_creator.c

+     def _get_system_files_impl( self ):

+         return [code_repository.array_1.file_name]

+ 

++class array_numpy_t( member_variable_base_t ):

++    """

++    Creates boost.python code that exposes array member variable via boost.numpy.

++    """

++    def __init__(self, variable, wrapper ):

++        member_variable_base_t.__init__( self, variable=variable, wrapper=wrapper )

++        self.works_on_instance = False

++

++    def _create_body( self ):

++        answer = []

++        doc = ''

++        if self.declaration.type_qualifiers.has_static:

++            answer.append( self.parent.class_var_name + '.add_static_property' )

++        else:

++            if self.documentation:

++                doc = self.documentation

++            answer.append( self.parent.class_var_name + '.add_property' )

++        answer.append('( "%s", &%s );' % (self.declaration.name, self.wrapper.wrapper_creator_full_name ))

++        if doc:

++            answer.append( os.linesep )

++            answer.append( self.PARAM_SEPARATOR )

++            answer.append( doc )

++        return ''.join( answer )

++

++    def _create_impl( self ):

++        answer = []

++        answer.append( '{ //%s, type=%s' % ( self.declaration, self.declaration.type ) )

++        answer.append( os.linesep )

++        answer.append( self.indent( self._create_body() ) )

++        answer.append( os.linesep )

++        answer.append( '}' )

++        return ''.join( answer )

++

++    def _get_system_files_impl( self ):

++        return []

+ 

++class array_numpy_wrapper_t( code_creator.code_creator_t

++                          , declaration_based.declaration_based_t ):

++    """registers array class"""

++    def __init__(self, variable ):

++        code_creator.code_creator_t.__init__( self )

++        declaration_based.declaration_based_t.__init__( self, declaration=variable)

++        self.py_class_type = declarations.reference_t(declarations.const_t(declarations.dummy_type_t( "bp::object" )))

++

++    @property

++    def wrapped_class_type( self ):

++        wrapped_cls_type = declarations.declarated_t( self.declaration.parent )

++        if declarations.is_const( self.declaration.type ):

++            wrapped_cls_type = declarations.const_t( wrapped_cls_type )

++        return declarations.reference_t( wrapped_cls_type )

++            

++    @property

++    def wrapper_creator_name(self):

++        return '_'.join( ['pyplusplus', self.declaration.name, 'wrapper'] )

++

++    @property

++    def wrapper_creator_full_name(self):

++        return '::'.join( [self.parent.full_name, self.wrapper_creator_name] )

++

++    def _create_impl( self ):        

++        if self.declaration.type_qualifiers.has_static:

++            tmpl = [ "static %(wrapper_type)s %(wrapper_creator_name)s( ){" ]

++            tmpl.append( self.indent( "return bn::from_data( %(parent_class_type)s::%(mem_var_ref)s," ) )

++        else:

++            tmpl = [ "static %(wrapper_type)s %(wrapper_creator_name)s( %(py_class_type)s inst ){" ]

++            tmpl.append( self.indent( "return bn::from_data(bp::extract< %(wrapped_class_type)s >(inst)().%(mem_var_ref)s," ) )

++        owner = "bp::object()"

++

++        tmpl.append( self.indent(self.indent("bn::dtype::get_builtin< %(item_type)s >(), bp::make_tuple(%(array_size)s),")) )

++        tmpl.append( self.indent(self.indent("bp::make_tuple(sizeof(%(item_type)s)), %(owner)s);")) )

++        tmpl.append( "}" )

++        

++        tmpl = os.linesep.join( tmpl )

++        

++        return tmpl % {

++                'wrapper_type' : "bn::ndarray"

++              , 'parent_class_type' : self.parent.declaration.partial_decl_string

++              , 'wrapper_creator_name' : self.wrapper_creator_name

++              , 'wrapped_class_type' : self.wrapped_class_type.decl_string

++              , 'mem_var_ref' : self.declaration.name

++              , 'py_class_type' : self.py_class_type.decl_string

++              , 'item_type' : declarations.array_item_type( self.declaration.type ).decl_string

++              , 'array_size': declarations.array_size( self.declaration.type )

++              , 'owner': owner

++            }

++

++    def _get_system_files_impl( self ):

++        return []

++        

+ class mem_var_ref_t( member_variable_base_t ):

+     """

+     creates get/set accessors for class member variable, that has type reference.

+Index: pyplusplus/code_creators/module_body.py

+===================================================================

+--- pyplusplus/code_creators/module_body.py.orig

++++ pyplusplus/code_creators/module_body.py

+@@ -18,6 +18,7 @@ class module_body_t(compound.compound_t)

+     def _create_impl(self):

+         result = []

+         result.append( "BOOST_PYTHON_MODULE(%s){" % self.name )

++        result.append( "bn::initialize();" )

+         result.append( compound.compound_t.create_internal_code( self.creators ) )

+         result.append( "}" )

+         return os.linesep.join( result )

+Index: pyplusplus/creators_factory/bpcreator.py

+===================================================================

+--- pyplusplus/creators_factory/bpcreator.py.orig

++++ pyplusplus/creators_factory/bpcreator.py

+@@ -76,10 +76,14 @@ class bpcreator_t( declarations.decl_vis

+         global_ns = declarations.get_global_namespace(decls)

+ 

+         self.__extmodule = code_creators.bpmodule_t( global_ns )

+-        if boost_python_ns_name:

+-            bp_ns_alias = code_creators.namespace_alias_t( alias=boost_python_ns_name

+-                                                           , full_namespace_name='::boost::python' )

+-            self.__extmodule.adopt_creator( bp_ns_alias )

++

++        # alias of boost::numpy is hard-coded here, as it  will be merged into boost::python.

++        for ns_name, full_ns_name in {boost_python_ns_name: '::boost::python'

++                                    , 'bn': '::boost::numpy'}.iteritems():

++            if ns_name:

++                ns_alias = code_creators.namespace_alias_t( alias=ns_name

++                                                          , full_namespace_name=full_ns_name )

++                self.__extmodule.adopt_creator( ns_alias )

+ 

+         self.__module_body = code_creators.module_body_t( name=module_name )

+ 

+@@ -723,8 +727,12 @@ class bpcreator_t( declarations.decl_vis

+                 wrapper = code_creators.bit_field_wrapper_t( variable=self.curr_decl )

+                 maker = code_creators.bit_field_t( variable=self.curr_decl, wrapper=wrapper )

+             elif declarations.is_array( self.curr_decl.type ):

+-                wrapper = code_creators.array_mv_wrapper_t( variable=self.curr_decl )

+-                maker = code_creators.array_mv_t( variable=self.curr_decl, wrapper=wrapper )

++                if declarations.is_arithmetic(declarations.array_item_type( self.curr_decl.type )):

++                    wrapper = code_creators.array_numpy_wrapper_t( variable=self.curr_decl )

++                    maker = code_creators.array_numpy_t( variable=self.curr_decl, wrapper=wrapper )

++                else:

++                    wrapper = code_creators.array_mv_wrapper_t( variable=self.curr_decl )

++                    maker = code_creators.array_mv_t( variable=self.curr_decl, wrapper=wrapper )

+             elif declarations.is_pointer( self.curr_decl.type ):

+                 wrapper = code_creators.member_variable_wrapper_t( variable=self.curr_decl )

+                 maker = code_creators.member_variable_t( variable=self.curr_decl, wrapper=wrapper )

diff --git a/dev-python/pyplusplus/metadata.xml b/dev-python/pyplusplus/metadata.xml
new file mode 100644
index 000000000000..bccf49925aac
--- /dev/null
+++ b/dev-python/pyplusplus/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>heroxbd@gentoo.org</email>
+		<name>Benda Xu</name>
+	</maintainer>
+	<longdescription>pyplusplus is an object-oriented framework for creating a code generator for boost.python library.</longdescription>
+	<use>
+		<flag name="indexing"> Install indexing_suite_v2 to enhance boost python
+		</flag>
+		<flag name="numpy"> Generate code for <pkg>dev-libs/boost-numpy </pkg> to accelerate arrays
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">pygccxml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyplusplus/pyplusplus-1.0.0-r1.ebuild b/dev-python/pyplusplus/pyplusplus-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..5dd33d23d6df
--- /dev/null
+++ b/dev-python/pyplusplus/pyplusplus-1.0.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Object-oriented framework for creating a code generator for Boost.Python library"
+HOMEPAGE="http://www.language-binding.net/"
+SRC_URI="mirror://sourceforge/pygccxml/${P}.zip"
+
+LICENSE="freedist Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +indexing"
+
+DEPEND="app-arch/unzip"
+RDEPEND="=dev-python/pygccxml-1.0.0[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/Py++-${PV}
+
+python_test() {
+	"${PYTHON}" unittests/test_all.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/documentation/apidocs/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	if use indexing; then
+		insinto /usr/include/boost/python/suite/indexing
+		doins indexing_suite_v2/indexing/*.hpp
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyplusplus/pyplusplus-1.0.0_p20131206.ebuild b/dev-python/pyplusplus/pyplusplus-1.0.0_p20131206.ebuild
new file mode 100644
index 000000000000..b6ee0e3bb1ab
--- /dev/null
+++ b/dev-python/pyplusplus/pyplusplus-1.0.0_p20131206.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Object-oriented framework for creating a code generator for Boost.Python library"
+HOMEPAGE="http://www.language-binding.net/"
+
+if [[ ${PV} == 9999 ]]; then
+	ESVN_REPO_URI="https://svn.code.sf.net/p/pygccxml/svn/${PN}_dev"
+	inherit subversion
+	S=${WORKDIR}/${PN}_dev
+else
+	SRC_URI="https://dev.gentoo.org/~heroxbd/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="freedist Boost-1.0"
+SLOT="0"
+IUSE="examples numpy"
+
+DEPEND="app-arch/unzip
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/pygccxml[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	use numpy && epatch --binary "${FILESDIR}"/${PN}-1.0.0_p20131206-numpy.patch
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${PYTHON}" unittests/test_all.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyplusplus/pyplusplus-9999.ebuild b/dev-python/pyplusplus/pyplusplus-9999.ebuild
new file mode 100644
index 000000000000..cc93c46965c5
--- /dev/null
+++ b/dev-python/pyplusplus/pyplusplus-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Object-oriented framework for creating a code generator for Boost.Python library"
+HOMEPAGE="http://www.language-binding.net/"
+
+if [[ ${PV} == 9999 ]]; then
+	ESVN_REPO_URI="https://svn.code.sf.net/p/pygccxml/svn/${PN}_dev"
+	inherit subversion
+	S=${WORKDIR}/${PN}_dev
+else
+	SRC_URI="https://dev.gentoo.org/~heroxbd/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="freedist Boost-1.0"
+SLOT="0"
+IUSE="examples numpy"
+
+DEPEND="app-arch/unzip
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/pygccxml[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" unittests/test_all.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pypng/Manifest b/dev-python/pypng/Manifest
new file mode 100644
index 000000000000..486cb5842079
--- /dev/null
+++ b/dev-python/pypng/Manifest
@@ -0,0 +1,4 @@
+DIST pypng-0.0.18.tar.gz 377942 SHA256 985a1306319e3187e2cb3dabec95a7a0f0f281ae2e1fec04289bed520fecd932 SHA512 3e44b0c86c3ff042c7e4bf03e82281c6807c4eae432c45b9bf4bf9fc844e24031a17245410e9060e6912ef77a30b9ea956422a3d9aac4331e7e81323da632e47 WHIRLPOOL bd01ef51cf85bfd5374543d71a7c437f3dac7e2e1f450065ad547e98eb666a0e11ce714acfae74f36407304d5b10d9e382e2e51f4ee632bd910e8f55db2c3b47
+EBUILD pypng-0.0.18.ebuild 449 SHA256 3014ebd3a117593b0bf9d31d47245175bb6e4752c1c54633fa29d03b377a0bac SHA512 b04d394963ef6635da8d62239292cacc6f0154d480f5f5ef38248b288976e55e9860437b27fe0c7d2e64ed0a17eeb6487d3ecdf985bbaa744d2f8f1712685578 WHIRLPOOL b04d6cd22ee8c06ca2199081c4e00da3e72d13cd8a66a9856ac3d8fb4a6c6d684783d1f1c23d70aea6895a45739b7e2f278902147a554fc5cce7a567eb0e60f2
+MISC ChangeLog 460 SHA256 4404a795cebf7bc64f441c2585e118c44f1d2aacdeec0c9851421035a4f147ea SHA512 aed531ede9edc056e1cff51f306afe75f00c2a63ce7f1b2af2df78cef15c3b9d0fd503bf2d6692827b77f75e67c76b94fff3c2a918ed1468f8e6ea3caff46960 WHIRLPOOL ce6a356e06bbe7ebfee05a2c7d4d68253903b42b8fc58917da8f1bf09f3365b7182b73ccf4dd098a48b646c8d551f1831175f7485953fd6c1d43ad6d61755fdf
+MISC metadata.xml 688 SHA256 00ceadd397606c6dc8e1ccb4729569537ab8896a162a2d3333ef204e5857d0c9 SHA512 b87c78771668d25a8469e7f40025b843739ad7a04e086fef3bdb09fc2d809968dfad21d67b5ba06662bc4d94d4b4233ce7310b1fda44ff4856b4f0ae3cc71997 WHIRLPOOL b95cf4667308db707ed392e4c902891248f9dabd61b25d971f9406673af342b51136464c2a6a4673840e9a9ff7a85f321b165f23bef0412f9f6aaac7b51f1eab
diff --git a/dev-python/pypng/metadata.xml b/dev-python/pypng/metadata.xml
new file mode 100644
index 000000000000..696a6c8f44f2
--- /dev/null
+++ b/dev-python/pypng/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>drj@pobox.com</email>
+			<name>David Jones</name>
+		</maintainer>
+		<remote-id type="pypi">pypng</remote-id>
+		<remote-id type="github">drj11/pypng</remote-id>
+	</upstream>
+	<longdescription>
+		PyPNG allows PNG image files to be read and written using pure Python.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pypng/pypng-0.0.18.ebuild b/dev-python/pypng/pypng-0.0.18.ebuild
new file mode 100644
index 000000000000..318e5214c402
--- /dev/null
+++ b/dev-python/pypng/pypng-0.0.18.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6})
+
+inherit distutils-r1
+
+DESCRIPTION="Pure Python PNG image encoder/decoder"
+HOMEPAGE="https://github.com/drj11/pypng https://pypi.python.org/pypi/pypng"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/pypowervm/Manifest b/dev-python/pypowervm/Manifest
new file mode 100644
index 000000000000..a19f51cc1b37
--- /dev/null
+++ b/dev-python/pypowervm/Manifest
@@ -0,0 +1,3 @@
+DIST pypowervm-1.1.6.tar.gz 872456 SHA256 fb52625007edac666aaf74a536d874e451e100dcc9025a994615d7a620c1ea25 SHA512 31211b93f85cda9067e29700794daf9aed5c43478c27eb6dd5a150120282a7d46d4fa4fdf5fa038023153b02aae85f236d681e66646912a464bc3d265c87fefa WHIRLPOOL 98508ccdfe62c56f2e6cadfd9ae54a0751cdf1b2fe30f08354d3e39078ebdaef1ad8959f97faa67ff2e354e23d5661d211062c234f24891475ff813572612a3d
+EBUILD pypowervm-1.1.6.ebuild 1260 SHA256 3d499268d9596cb7dad01fc063375b963521667b17841d4721c7c1e9149c5618 SHA512 bfebdd378fe1c27fbce70ef65b4ad368ed976ceab474a95ad410adad5fdce5faa7a69b2c926c044180bf0fe285d8be74dab6511d9531516adaa40ebf82936e8d WHIRLPOOL 7186a5b04c2f163e605f29bcedcdc879f25b1c48770b651d4f549649f00272cbea853cc149cbbed4c1c01f0eefed52e01edfcc6b6803c0873d53a4a0c157edbc
+MISC metadata.xml 383 SHA256 aa73989517e7fc0468627259fcfae4d2e0befe8cbd3ad4a51252616e220f8b0c SHA512 e06a03085a277a53d5a04e076d240d59cd81e83d40241856a2878776792366d50bdf3e9fba2dacf2931de17234f87583b3114f3f696db1254d8a185a9da06d17 WHIRLPOOL 6a1eefa3699d8d00dc82d303e725f12c208a57ad43000092a9de6340ed6889d06ded748c6b6f1b8492d671edb9990f7baf4f4e0ae662b4badcff319c232d37c3
diff --git a/dev-python/pypowervm/metadata.xml b/dev-python/pypowervm/metadata.xml
new file mode 100644
index 000000000000..466474501d46
--- /dev/null
+++ b/dev-python/pypowervm/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>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">powervm/pypowervm</remote-id>
+		<remote-id type="pypi">pypowervm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pypowervm/pypowervm-1.1.6.ebuild b/dev-python/pypowervm/pypowervm-1.1.6.ebuild
new file mode 100644
index 000000000000..a0c213a9525a
--- /dev/null
+++ b/dev-python/pypowervm/pypowervm-1.1.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+inherit distutils-r1
+
+DESCRIPTION="Python binding for the PowerVM REST API"
+HOMEPAGE="https://pypi.python.org/pypi/pypowervm"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		${CDEPEND}"
+RDEPEND="${DEPEND}
+	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyprof2calltree/Manifest b/dev-python/pyprof2calltree/Manifest
new file mode 100644
index 000000000000..4fba95dca8c1
--- /dev/null
+++ b/dev-python/pyprof2calltree/Manifest
@@ -0,0 +1,8 @@
+AUX pyprof2calltree-1.4.0-py3-test.patch 895 SHA256 69a397ecfecd7c3d7e3315200874a8053571af4c31c87c63ab31a274adea35f1 SHA512 26f55492e65f8708c0587c594ae05a4ffe2611debe1dacabfa6b959468c02ae5e3c4b8ca0a86fc8f23be1646aef83b9450468483f7f40a8f746e026dac0b70db WHIRLPOOL 6f24c7840fa64085a0213eca4e4fd977eb18e10d7d19cc3c39faba22e59aac3ceb6384b24d35b0b019200cf78dde04074b500ac576fc3cea4b1d0784b2a6b860
+DIST pyprof2calltree-1.3.2.tar.gz 6609 SHA256 28eac89262d0edd86ee2574d24d1840cbca2d4ed6a1de7e1d8fc05f30ea5a22b SHA512 e85c5a21fe52b246ee6080f59e2ff115b43e3ab634e2842aff0d493b8b996105e0c1698e049ae7d11ea53c1f1fd601ef5f12c6fba62dcea28ddff23ec61a2736 WHIRLPOOL b132fe3179bbf7e3dc999fe3f8da1fdb298b515c302e76de4d96cff4392966875df8180aba66b535a122c8521d22755efbc9f46a133f8a758cce0a230d943bc3
+DIST pyprof2calltree-1.4.0.tar.gz 7784 SHA256 90ce43399b3594f21eb2683554a41224c97440f939e0542c7f144251faab21f0 SHA512 b1acba29cd4e5112012eeeffdac53900688a28707306ef3a8a3827f7422c35bc921d59d33db3209db923bb8640014e7d9d7d819eafbcb19e0cf7e6159537bded WHIRLPOOL cc1616b398665845cc8478114bc5bcd52179acbfd8e523c76aeb415fbbe58c49e9eaeaf902b650df3a7e251616ab5b4511e352fee17131fa73976f0cddcd56be
+EBUILD pyprof2calltree-1.3.2.ebuild 448 SHA256 6097c8bebaec7796220d17169bd099ef3462848970289b46fde7ce3ccd638cfe SHA512 c3c6ebc4b423239a32cf5ca29bd372b5faf3e8ff7714270e5f43c38d9a5c00ea92a257d1a0f6ea0945b7133b2bc6b992ec6e1ac446ca15a74e6d89a146641799 WHIRLPOOL 25575c8b763696a5c4eabbe98d9fe0d4f12d0cd95aacd122c47c3119dae0aae78a9ff68aec83c09b78bd1f07a9dfced4a85cd272c41b4b8c613a64e8736661e9
+EBUILD pyprof2calltree-1.4.0.ebuild 679 SHA256 37f250fe13b4af103b145c4eb990f46b7c2452ba363bfa637ddf34269d4ce67c SHA512 99cf40f898dcb494fed690199526182b2895f2b53881abfcaa0bf4087fec143559aac704d9ed2a0f5c55b97176116f445125e35b4e4b82593fc74442f141af75 WHIRLPOOL 46176db6821d0879a9c63e7ebc680c3ea7ae336d3b83d2c4ea674e31881ead3a2a4c831f8d9b58fce2fd1a12adeaee841a57ef32a90911d8d27caf38790e6f10
+MISC ChangeLog 2872 SHA256 a07ce0e784c9c7e3883fb57531f9ec3211ca2023fddadb18c2e0945c317eac2c SHA512 72f2efc19d04e4f2a7a206864cc14793ec14df7a2486a971edd2abd2684de10fc893fd16af80f62627a6a6f2db8a001c00ae788cadbf573082088142e20f9af1 WHIRLPOOL ee446a1d3720d5d15bcb9ba30a4a0bba33d1ece84966c3aeefacdb5eb77fe20a82aac1be8db90776847f815825ce1b2fa6314574cb6243c111ad211c25d24c1f
+MISC ChangeLog-2015 1331 SHA256 a70b64632ecdf8bd6584ff26a49b20e13a14e5e9cda4fdc3406ef7f78ef216fd SHA512 e1b964d02cf58c14e9ea30447aaedfb44e9c99f8739e72b5ea03d5f9117fd76673cbb869a95b1ddaa136f9cc49a9999bf877a470a4674781d11bd13ba216124d WHIRLPOOL a8d81e75c2ba733792a77b9b6358be450190fe596730a169c5e5de6dbdfd7865f60e0f9cc4e0859316f57ad460d18f90bef0dfaeadd8973ee50d6253a7e331eb
+MISC metadata.xml 318 SHA256 54c065877a5b8131bbd36531acb9ed551ee05be257926494885b93239cbf0e15 SHA512 7a75d6efb9f11a6e1ce086cf53e5038b12815fe8110bf16c9b6e781c31cb721ec8694fb6fb0d4d131f9581cb130cecbceadf0e10b1528717cb8f4ab977514372 WHIRLPOOL eb4e737a6e950cc3ae453ff6be33eb2223edad86c5bd3b322799a774d1e130441f7c6eb42950e7acf52337de20c29fb8b5292bd1b320ab3bd0141fff264c1a36
diff --git a/dev-python/pyprof2calltree/files/pyprof2calltree-1.4.0-py3-test.patch b/dev-python/pyprof2calltree/files/pyprof2calltree-1.4.0-py3-test.patch
new file mode 100644
index 000000000000..a91818fca60c
--- /dev/null
+++ b/dev-python/pyprof2calltree/files/pyprof2calltree-1.4.0-py3-test.patch
@@ -0,0 +1,30 @@
+From 582eeeaa930639ccfe9b789b057f170824edd73a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 17 May 2017 20:53:29 +0200
+Subject: [PATCH] tests: Fix StringIO import for Python 3
+
+Python 3 no longer provides a 'cStringIO' module. Use StringIO from 'io'
+module instead.
+---
+ tests/test_integration.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test_integration.py b/tests/test_integration.py
+index e6f432c..cf02a4f 100644
+--- a/tests/test_integration.py
++++ b/tests/test_integration.py
+@@ -3,7 +3,10 @@ import pstats
+ import unittest
+ 
+ from .profile_code import top, expected_output
+-from cStringIO import StringIO
++try:
++    from cStringIO import StringIO
++except ImportError:
++    from io import StringIO
+ from pyprof2calltree import CalltreeConverter
+ 
+ class MockTimeProfile(cProfile.Profile):
+-- 
+2.13.0
+
diff --git a/dev-python/pyprof2calltree/metadata.xml b/dev-python/pyprof2calltree/metadata.xml
new file mode 100644
index 000000000000..ae7e9c912476
--- /dev/null
+++ b/dev-python/pyprof2calltree/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyprof2calltree</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyprof2calltree/pyprof2calltree-1.3.2.ebuild b/dev-python/pyprof2calltree/pyprof2calltree-1.3.2.ebuild
new file mode 100644
index 000000000000..477d26d8b8ab
--- /dev/null
+++ b/dev-python/pyprof2calltree/pyprof2calltree-1.3.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="convert python profile data to kcachegrind calltree form"
+HOMEPAGE="https://pypi.python.org/pypi/pyprof2calltree/"
+SRC_URI="mirror://pypi/p/${PN}/${PF}.tar.gz"
+IUSE=
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyprof2calltree/pyprof2calltree-1.4.0.ebuild b/dev-python/pyprof2calltree/pyprof2calltree-1.4.0.ebuild
new file mode 100644
index 000000000000..f1bf41cedbac
--- /dev/null
+++ b/dev-python/pyprof2calltree/pyprof2calltree-1.4.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="convert python profile data to kcachegrind calltree form"
+HOMEPAGE="https://pypi.python.org/pypi/pyprof2calltree/"
+# pypi tarball lacks tests
+SRC_URI="https://github.com/pwaller/pyprof2calltree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/pyprof2calltree-1.4.0-py3-test.patch
+)
+
+python_test() {
+	"${PYTHON}" -m tests.test_integration || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
new file mode 100644
index 000000000000..b85b7db0b06b
--- /dev/null
+++ b/dev-python/pyproj/Manifest
@@ -0,0 +1,5 @@
+DIST pyproj-1.9.5.1.tar.gz 4424543 SHA256 53fa54c8fa8a1dfcd6af4bf09ce1aae5d4d949da63b90570ac5ec849efaf3ea8 SHA512 b0e0f85be01a3399cb41c4bf29d1a63ecb519fd45d6092a3558060d93c715afafd12f7532c8665839225ad7243e739a117677f6747bf34a0ccbde5e75c85f324 WHIRLPOOL 5ddb28a2ee6bbc3e50a0d76355f51b93c50c078459a6bc582f6a1538abbe349b45b0fe3bbc195e751b575ef5096a47ee6e88cf8e5dd4c69b9e917589da29ac05
+EBUILD pyproj-1.9.5.1.ebuild 922 SHA256 08d78e92a5ae54bf3547bdb086f08ddb1b019a6dc222c99cae4c07ce064f3301 SHA512 cfff518e73bd3d75a10e018d6bc56ff1fee5f3820c8c80fd77bdc6233994123ed335339f475cf3c4c5bb50a4027c711d8701324a7dc4838259b2e399dcdb3df5 WHIRLPOOL 93d938a31546d3bf3b20befc2cec5b4134eca45187ecf7d642d06f7b65c692630a16980a2180230703f10b760bd6293ca61537908b08bff788772b874df746da
+MISC ChangeLog 3186 SHA256 ee0a53d42decfb3202049872a6a095226f122d31f5a1156260ea3326b0cfb328 SHA512 0953a01b888fca14968411c06c3a6505ff1aac674c3966ffc0b505db6397cde426a4fe6c1dcd9f1b001a937dcc5630324ab099022bb86f58c4efde2ae9b9e68f WHIRLPOOL c30208352a8ea12a0702333487df8828cb5c67fd8f3f119c8a1837dc59a06ab2d4c2805761040f4ac14661b6692569a7f91839b8f2d9b6272badc8d997cde720
+MISC ChangeLog-2015 2255 SHA256 b75000e5c29fc1d277447307233f7a52e065678d33effb723fd3d7339b99accb SHA512 0f8b88ff98068b01559957c4ee17486f89094c7d26cb4de97902906ffdb5f0f035442bb151eb85680583146fbfc4af40e01ac2e809746aa47913278775b8d277 WHIRLPOOL 44536795fa6878b12ca06a3041fd19c2afb3149e7f5468381ced4c92c5158706a3dcda221c0f5d2f3f3fe35db3c7175a6a61c4ec854ee5572bcd42bd5a8afc78
+MISC metadata.xml 413 SHA256 b90ad339b135197e60f006a8ef338e03f88115b274117a283f92b76f54e83a65 SHA512 84f84c14bce12374abb5014771c1663bb8877d7808e65fe60f698c60b4c7df17db703c6c1c55cb692b0c8f6a94847758e756d6f9bd7e69f59e915b09c71682ea WHIRLPOOL 471f3fcda605a11a06221526d9ccabb51d865a9b8354da99461316c694149dd8ef41d4648f43772d7e4bddcfc6a99ae831c52052a5a3a376e66ed8aff7ea9040
diff --git a/dev-python/pyproj/metadata.xml b/dev-python/pyproj/metadata.xml
new file mode 100644
index 000000000000..53d0d4271b5f
--- /dev/null
+++ b/dev-python/pyproj/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">pyproj</remote-id>
+		<remote-id type="pypi">pyproj</remote-id>
+		<remote-id type="github">jswhit/pyproj</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyproj/pyproj-1.9.5.1.ebuild b/dev-python/pyproj/pyproj-1.9.5.1.ebuild
new file mode 100644
index 000000000000..1f67541befb1
--- /dev/null
+++ b/dev-python/pyproj/pyproj-1.9.5.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Python interface to PROJ.4 library"
+HOMEPAGE="https://github.com/jswhit/pyproj"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="doc"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	append-cflags -fno-strict-aliasing
+}
+
+python_test() {
+	einfo "Testruns do not have regular unittest type tests, instead for test.py,"
+	einfo "the output need be compared with a separate file, sample.out."
+	"${PYTHON}" test/test.py || die
+
+	einfo ""; einfo "Now the file test2.py is run to test pickling"; einfo ""
+	"${PYTHON}" test/test2.py || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyprotocols/Manifest b/dev-python/pyprotocols/Manifest
new file mode 100644
index 000000000000..9bc1a66317fc
--- /dev/null
+++ b/dev-python/pyprotocols/Manifest
@@ -0,0 +1,6 @@
+AUX SkipTests.patch 619 SHA256 d091bb7656878c457fc24c0fcb4a6f8e200886bf22ec0dfdee55cf3d6b227f1f SHA512 b4f37fdcb0eb10d58813d3bfe776de9a56549f768eb974ec2a8818ca891181a1551cf8c8ee99865aade77f4aef330e617053bde58824f288a876da0beb4f8d51 WHIRLPOOL ee9a6173e981c7a9f548efc01f7487c626b3889a68e9ac883af9cac5d3a5dceaf44860097a0e4fff1e7a60a08611c8bbd6ea2ddd43d36fae8f9b0603e38b2205
+DIST PyProtocols-1.0a0dev_r2306.tar.gz 218555 SHA256 55241280fdb5c9a00e69c51e0fca2d76214d741843753f00c73bf78ea09db284 SHA512 1f18be9548ae29b6111dccd158f5706f3a1ed7074152e9ef2e0d17caaad2227d3f613b50b602b3b1d47b5db7f53e583fce4e06b3e23916ac0daf7a92bcd66ccc WHIRLPOOL 150bedb9f3f531104efb30bc7c49f1dbfbb6bdde32bb706273c8f0c2513e951fa80bf992b4f58e151185ebfaf26df70aecd5b84e1ba55cf907ee78e9c5788f65
+EBUILD pyprotocols-1.0_pre2306-r1.ebuild 1199 SHA256 d6e828ad4e64856805516631dc39fa629997f63c34121a7ab237965307d20f61 SHA512 86b0e1fd391b8ca934d5c1f1c669bba9c7f12e4f3fdd18cd70fa7f6ffa2017cca1763eb3caaf44169e8ef0307cf188e60d8f4935beaad8f3ea7a4cc71030f2c9 WHIRLPOOL 0d5702d6c579ce1d103221cf36f9661956d272d25682ff63c127b0b3552a42068823dd86cc6f97e0ea809f99b218b6da1d8f00f39d740aa7afb735289e1e9092
+MISC ChangeLog 2641 SHA256 697fb0ba0cef8d6ee77d9cc07f7d3165f228a30bfb2e0fc72c90007ccd130ffe SHA512 008be7da37b8e18b2b7c7545e648aef2eedb391dff18890c381647ce758e8aa8b24ae861e48d0015dd0a50f4f11f4bd3ba61f3d6343a9433fd260121e132ff83 WHIRLPOOL 66d0e76392c6fd59ffa2c1c8a48b683598710619bc1f429a2c770d663619ae254b232cd30d7e11302bf9ea84027616c56ceec14f4c8dddeed4ff4c999662c4fa
+MISC ChangeLog-2015 4962 SHA256 816f5fff5e69deed378b81fc62d868beb25770c86cf62975e1d32fcd50d41e5d SHA512 35f19d77a63fd1c61253c0fb5fd97317370f468b0c5a5206795b3358560ac95afe9be9cfcb507ebdc5bf4592705e98b5f054563b78de696f7ee605670b7835ce WHIRLPOOL 1abb2f8ffd09bfb411c6bde8449aa2ff1b95ea4d6f0da7ff9700a6ff8346a4a35c586a0fd7b40d862c4f4506eab2275e360d59e0343a7a577bdde0d628f46f1f
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/pyprotocols/files/SkipTests.patch b/dev-python/pyprotocols/files/SkipTests.patch
new file mode 100644
index 000000000000..293f0a2a0626
--- /dev/null
+++ b/dev-python/pyprotocols/files/SkipTests.patch
@@ -0,0 +1,25 @@
+--- a/src/protocols/tests/__init__.py
++++ b/src/protocols/tests/__init__.py
+@@ -256,22 +256,6 @@
+         makeSuite(GenerationTests,'check'),
+     ]
+ 
+-    try:
+-        import zope.interface
+-    except ImportError:
+-        pass
+-    else:
+-        from protocols.tests import test_zope
+-        tests.append( test_zope.test_suite() )
+-
+-    try:
+-        from twisted.python.components import Interface
+-    except (ImportError, SystemError):
+-        pass
+-    else:
+-        from protocols.tests import test_twisted
+-        tests.append( test_twisted.test_suite() )
+-
+     return TestSuite(
+         tests
+     )
diff --git a/dev-python/pyprotocols/metadata.xml b/dev-python/pyprotocols/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/pyprotocols/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild b/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild
new file mode 100644
index 000000000000..8a8f9f0b4bdc
--- /dev/null
+++ b/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="PyProtocols"
+MY_P="${MY_PN}-${PV/_pre/a0dev_r}"
+
+DESCRIPTION="Extends the PEP 246 adapt function with a new 'declaration API'"
+HOMEPAGE="http://peak.telecommunity.com/PyProtocols.html https://pypi.python.org/pypi/PyProtocols \
+	http://svn.eby-sarna.com/PyProtocols/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+LICENSE="|| ( PSF-2 ZPL )"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=">=dev-python/decoratortools-1.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/pyrex-0.9.9[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES=( "${FILESDIR}"/SkipTests.patch )
+DOCS=( CHANGES.txt README.txt UPGRADING.txt )
+
+python_prepare_all() {
+	# Rm peripheral & rogue failing tests
+	rm -f src//protocols/tests/{test_twisted.py,test_zope.py} || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_test() {
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pyptlib/Manifest b/dev-python/pyptlib/Manifest
new file mode 100644
index 000000000000..1b6ce4274cc1
--- /dev/null
+++ b/dev-python/pyptlib/Manifest
@@ -0,0 +1,5 @@
+DIST pyptlib-0.0.6.tar.gz 239316 SHA256 b98472e3d9e8f4689d3913ca8f89afa5e6cc5383dcd8686987606166f9dac607 SHA512 f54ee3ae51f2d6884b0157f8cec3e9af267f926e50728478b961551d069fc6c4a2840d59e74d5b0f93b4bb305d9f91f31b91fa4425d1931688ffc5783f6192f9 WHIRLPOOL 1144479085e6f9a762638e6b0adee886b7446362233e246a494523ef53afeb394f6d00db0d5cb425491ae1f2e2db60499c05d03a162079e6357deb224bb938ef
+EBUILD pyptlib-0.0.6.ebuild 745 SHA256 cd9c096e5f4983483093b3d240f27e24d11ab418842d343039da6bc4b21e82e7 SHA512 177b0d47cb34619141b9185ea11e9aec03136265784ec8dfe4e92919f1fbf63e02f619c7c88561cd77861c1ebeed892b7185c556e81a84a740e9edcc302e3a14 WHIRLPOOL 1e3616acefdd5a013669256ec6bc569a17a8a508df3d90f790a0c7aab1d8f65cf262e38f52c4ef6aed0a22e42f7d308975fbcf9a2ffc462f5b2de7012fbc3ea2
+MISC ChangeLog 2178 SHA256 842c0563fcd974956ce523650fdd00a035f1f4f22ca0ececc38cb43d270e305d SHA512 92d4f8ff1af67769443c4b428f1fc5421bea8697174547cd790ef42d58725ab50c344ba56fa52c85ca48041f279eba45ea3138f22ec5f42975c9347394c7577c WHIRLPOOL aa300fe223a11502ac73a1148c97bb8cbdfeeeedf11a79d36b8f5648143c2b3b76e27f37acbe7d6bbc2a738ad2f6e83b7886c8000679836957afbf4212381759
+MISC ChangeLog-2015 795 SHA256 f1a36e42246e95710d5231bd57bb31ff0823544c2e1d4a5f126f81f63554c5a3 SHA512 96782a297810a0904e07ce00c1ea9c85762110603e08115e5f4bc3a975b05ad1f4f412e4f16c2e46f0ae7d38dbd4229ed8c9ff7eebcc40fa12831853f6237022 WHIRLPOOL 84ad24600175a69c29049a195e7ea179926d3bfc00ab8f6dc5cec4cf71a521dd76be459094dd68947f25db7ecb2efe86a654ffbc475df75dab2ef570f6fe2d34
+MISC metadata.xml 332 SHA256 3fcad420aed9f4632933e56e19e4a24d37129b049c15957247290d84fb6f18cb SHA512 d60850dcff84f4105ca91f7675403c64e3ec14e11f186282239623b0d58b47c0379cf3af19e0f440b2564d037a80d52c8abe89a4e415b5eaf43b66c6b1748a1f WHIRLPOOL a9d11aa4d19f1f19817fa7192fb46b33176ffd04159c166114c2424c565f9e13e9fe6f8c909f9521e55bd8446cfe0314da8553b4fb65f0a77c01c673f277159a
diff --git a/dev-python/pyptlib/metadata.xml b/dev-python/pyptlib/metadata.xml
new file mode 100644
index 000000000000..c298cbef539c
--- /dev/null
+++ b/dev-python/pyptlib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pyptlib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyptlib/pyptlib-0.0.6.ebuild b/dev-python/pyptlib/pyptlib-0.0.6.ebuild
new file mode 100644
index 000000000000..a5195aa22f60
--- /dev/null
+++ b/dev-python/pyptlib/pyptlib-0.0.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for tor's pluggable transport managed-proxy protocol"
+HOMEPAGE="https://gitweb.torproject.org/pluggable-transports/pyptlib.git"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+IUSE="doc examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DOCS=( README.rst TODO )
+
+python_test() {
+	"${PYTHON}" -m unittest discover || die "tests failed"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
new file mode 100644
index 000000000000..56820730082b
--- /dev/null
+++ b/dev-python/pypy-bin/Manifest
@@ -0,0 +1,33 @@
+AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 SHA256 110c15482123bc6fbf11e237df30eb0daad7f6032e2f73903e9e3c225121737a SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474 WHIRLPOOL 14084d22388b2bbda7fbd19195f448265f99b1437b7cefdac276ccab52785c67b71768303e1d1ea9009f8533ba07de0014eb237b4de675cf8dbc1acbeacb8508
+AUX 4.0.0-gentoo-path.patch 1915 SHA256 106683dc3849851df2d4985f542825ae2b37e0b3ec57ff34d2a5cbd16f79f830 SHA512 d1c9925ddd19c252d4222dbea6db866a867abefff65219f7fa0fe070fa68e675f3a815f418d214eb508375a49911dd3cc4851f42552e5fff0b7fc2d7f0272278 WHIRLPOOL 0c68c232e5ffeb1ce5e5d3e41471cbde45aca7765b2c85227c02b5b759891a33ab404ce5f444c048361e922a90868621845a8839207efceba6a70ebd5c70dfe0
+AUX 5.6.0_all_distutils_cxx.patch 17053 SHA256 77e2274dac32d065f861882daf59f9020064efc3b7ab39d5152538ea343d854c SHA512 79b3e073a57981ef78c42db3f6c6c0b410525d84d5c6166ac7f8947d66a7b00c52d1fd30516708eaf3d33664466302e11a954f73c40ae48a8aedfb554cec86a2 WHIRLPOOL ae97f0e6a8cf2c0b6df946297f4d6dae27fbe4dd0ea3576d6a17e869fa5e610971302c07465ca4018d6e1ced650d6531ae20639fa08a7d69693ff337a60216e1
+AUX 5.7.1_all_distutils_cxx.patch 18249 SHA256 33bf43330f0a2ae0dfb4b4999a7b27c74ba789a18f6f181928e13cb1553bd39e SHA512 a347cf438a0d308c69bc92cd04236be0bcf95f595daff1fbcb19eaadbbd7355e90fd661843d8a8d1588003da3ec37b3e3e9fa8a24af92baa5d2c0c0a866284dc WHIRLPOOL fe363fe49b70e4e291a092b5229e5f17d39f50f5edee97bb4aac8275410d2981c6963e096fa77d7ecf549d0d97ea0c6168947b2c1526e92d3e73919873ef68da
+AUX 5.8.0_all_distutils_cxx.patch 18248 SHA256 2f7c75a5966ebfd0750ca902ea855ca321829a0309a60e6c57f45eb418054dae SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a WHIRLPOOL 807d777cabd6db4cc909f6135de230705f289ac8d1ef851fd872abdbabb3b13e299c98b53e9bf993f044c64702576e15f0d1b3a1a9a4aa9a4458204267c25b92
+DIST pypy-bin-5.6.0-amd64+bzip2+jit+ncurses+shadowstack.tar.lz 13093418 SHA256 5c8c78751a4afd89e98c5a644d4c1d5fa9b1c2dce9a6c6f8f1ad92068f4b26f5 SHA512 c9748eb5850f3948961451436e7d40eea3bb318a73626bcca0cf9bbd605a27de60383a11dcd8a6e9d93116cf811d5c541e4b8545adfe05ba3f56526cc698d114 WHIRLPOOL ba5fac6c6bc31461cbb83a1f68a780d7ce738bb3a9270385d1b35fe8859de7a4b029a8318f5ab90cca9e5f35e10b87a10211550d7685455bf24ef9e23a6806df
+DIST pypy-bin-5.6.0-amd64+bzip2+jit+ncurses.tar.lz 14167380 SHA256 7e8ea31eebcaf102b6c606400259da93a33bcc1a81f40c5c10070aff917e2ae3 SHA512 629bb65af656e1e16e2eb2f536015fa263f477e4a8744cad61b7f9bb65a17511944d09adbd9bef271f2b62445bf0e39405d88d60721d0c635a27d4a1a497d220 WHIRLPOOL 668ce5da583fc784de99d1aa0faa337ff8f769eb9b505d2d229e7c3c7e71a40c24c6437f25bf9e8f18fe2799ec605fb3f9cb745a8a6a646404119b526dfb02d7
+DIST pypy-bin-5.6.0-amd64+bzip2+ncurses.tar.lz 7337932 SHA256 d059ce9862a2cca587de08215caf2c6b814a5302087bc15c385f284b8d46e57a SHA512 7f168f4dc3dc3855dc27789682afbbef35dc8ebc04d1745f5ffeceed56918db3d3c16a5c90989daf3d00b48e994842f5712f77fdf9febdace2381d852336377f WHIRLPOOL 118fd413ac35ca6a77c9c4b3e6d9c8887c7b4880d8678d24606b2a72c4b05a0caa4a31913c0135623e65241b4fa572d6d7461750189b14b6dff5f194ff19beb8
+DIST pypy-bin-5.6.0-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz 10451373 SHA256 34ee937087e78f9d445ad080718f2306dd3540483e968db4102692f841809b66 SHA512 81c7c354e96e6997692e22a2dc51330cd31853df7b9bbd6a17b03874b022fec8cfbbc5afe6bc4f22fdc3f06b36d6dcf7f27f32c88f8022b5850edb92fe8a07ed WHIRLPOOL 98c4cb9aaca48e24c82d2db375744e08859b79d69cbd00b479d304efb8d51ea815756f1a8a0e0c2c5f71b806a7b52cc1378ceab7e2aacb2004e16e4fe5862017
+DIST pypy-bin-5.6.0-x86+bzip2+jit+ncurses+sse2.tar.lz 11678153 SHA256 3a1cafb572f3565862dce0e4a3386bcd63da26eb17a39301637e7751b827c2d4 SHA512 9608eed3c1583c09ce504b47a6efd82edaf27e83fc6471ee4e478a3167fcf38cae57470ba0246ef6e56398922ec270e81ceb75e7a6d0744a02f5bca454fa33cf WHIRLPOOL 24ad25b4cd686976de99494943135ad2fbb56898981f26e1ff339ea5b0d96171f0e65e24afa40374cfabcae75887ce4e59ab8a5f323bc4af41e1ccc38fc5d74c
+DIST pypy-bin-5.6.0-x86+bzip2+ncurses+sse2.tar.lz 6075399 SHA256 14e3dde904e6ee5b8d276f6785cf8a3339e3689f5d151d0b146f76cde77b7ca2 SHA512 b2c6ce1415b7c49be7c69a02c744884b03ccd17227d8c66c0b042f8b5421e006c3e81353f20d6c74bc886ff10927d2efaf0f4b938571e165678135e18870e06b WHIRLPOOL fc3c3e0554d96a52c0a9631080250a6fd825d3ccf5d3c31da172c6f820fea6106b7c4f1094ea2fe838deb786a6ce8b0e78a9a78b7864394c828db32d9c31adc1
+DIST pypy-bin-5.6.0-x86+bzip2+ncurses.tar.lz 6073628 SHA256 a667781d65abee8f535769a08cc9cf7e39ae2c12f6aa71cab32de53baf21ceb3 SHA512 adfe5c01c575378c537dc72eaa6cf98cf2f8f2642abeefcfde70f0930f26202b6c08bb715e0c6cf058495fcf1baa035f43e0452014e90e249a27118bcece4dda WHIRLPOOL 4b74440e22fc76c128d8330df57a54dd48a5d5b4fd390f6b912ace46a34d58b03f4a1f6990a274bd1ea8c88615e5f1d1fe56a124a25e1d6618798d7c3a00646a
+DIST pypy-bin-5.7.1-amd64+bzip2+jit+ncurses.tar.lz 12313034 SHA256 410f32b11f6d28ea4bdc59d6ee9de4239178b16834fcd35bf5e9f462e3a51ebd SHA512 e6a66b2aeb3b3d2fd8b99ef5d0fa49b9e99752f9baa996280d14d9031b4103795bd5f0180755e3a360889b808267e19939b32e504bd91811df3875c9ae634775 WHIRLPOOL 1ab24432bc071d2aea1c0023817a8ef89444b560f21276d7f66c4d5a3c72662eda4b2ec13b39a60920dade363b39051f610af8505f011b5cb626ff2cdebb65cb
+DIST pypy-bin-5.7.1-amd64+bzip2+ncurses.tar.lz 7104886 SHA256 76373ee444a173287d02dda552a07bf029ee7b3c1d5b94784cf13b53d0b12584 SHA512 fed7f2f3ae78f7e1723cb22cd2de1772b2afb633e84714335e06c91ef8062ba1216f3539b2f49e1570e174e823417c83d30d9cff852c6118241b8ff7fe16d627 WHIRLPOOL b661b9a6f4033e15a6d398f724455ad7b9c06bf5ab2a4a06656a4a0888adfee5abfcefe6c27e1d9e4c38c99d38d944523cf1afd2da1084e7fefc9a6c91c89e6a
+DIST pypy-bin-5.7.1-x86+bzip2+jit+ncurses+sse2.tar.lz 9956906 SHA256 25638e27a0939268014c35b94f4b5e9031d5f3a92cb51e96adbe4b59befbb579 SHA512 1ef83113f832a71ee4370381f21a07c24059a3b1bd2cad14846f06aa4d8319c14cb3633314f81f6ee898ecd9d2612bd03b72a3c1a87264ff34214f716e13bc4f WHIRLPOOL 8896245974d5a9b7b524edc888399c88e1dd651561017a8688405ad82d9906ff5c81e899cee57eb64506903af583439045dc5fe7f8f5592d071642fb8bb6d9e2
+DIST pypy-bin-5.7.1-x86+bzip2+ncurses+sse2.tar.lz 5958810 SHA256 05228eabb25b02aea0c80aca4902ee3d81c3767e64daae5662c4797b39ed6a07 SHA512 e27e84e4a060a7c20bcb862da7d0f32508f5588753b067d726d7cd43835307853a7409203c0bbb98844ac59affc03ea43dc650266d74c345a1afcb7e528f1a8f WHIRLPOOL 2169a6e306643669573434dc065235dc5272c8dffd34a09b136e5a23cd2b8bb70fef552cdf3d79018c7e3b3b1c4edb4d7dcde0a4feb550827dbeafea514742aa
+DIST pypy-bin-5.7.1-x86+bzip2+ncurses.tar.lz 5984920 SHA256 a1507fb0d55633b28fe6c249291f4dbf0097cfaf2e2a8d36f20636c5ccd34ea3 SHA512 769f62cb3768b762a09f83926ea695d2aea01f8bb3f33d921607f454a9f1d9ab30fc5400787274d1d94a8ca5b82027d737df4e5e693d639b6944c22eb69e75f8 WHIRLPOOL 825a531ae629015022ce1260e11258ee057535ae8e491f9f08fb90cc38a6eda4f02a5f9e32c8ecb85cdeb81c5de9f2353c415abd83d05e107ebce3669560b484
+DIST pypy-bin-5.8.0-amd64+bzip2+jit+ncurses.tar.lz 13029615 SHA256 236b12d1abfea9bca81247be01d77b6e82ca9ce923f4e21cb1fceedf8b752675 SHA512 4234bb85c527999fc9ec91e7187d7b05e9aa5fa9965ac4a7fa7a652f678b1221cd04d119316073c5f8352d7bd533c4a7b1c79f5cafce6eb04f32b0a764fdf36d WHIRLPOOL 2b411e1eda2cb18c8a823bcc75de457d68eb9b6793431e3a3a2950bad0f8f5ba882f3cfc21064d0b3656b66bd7cb1389889cb70cb3c9181669286a1fbe0d229f
+DIST pypy-bin-5.8.0-amd64+bzip2+ncurses.tar.lz 7617650 SHA256 3b8b42a1bc0ca612951452430fc078b8bf81a0dff42eb966fe0e7dc965401d5d SHA512 532d7fd9bdb92b1d5c8e8ebcf60c56fbe2a32b8b89f8650d91b6e0a7cfe6733e3e6b6b232f02a6f24bf9f30569dd8b9cce0b93268d0bb45cd808671ee41be3ae WHIRLPOOL c1a3051c91c747fe60d4bc080749d6b72c79825368da940c4a3ad701d62687ffa6ad81f2e1deb6d7113239443a1fb8e1d07d1e02563c9e59a82d8bc5da3b6ef1
+DIST pypy-bin-5.8.0-x86+bzip2+jit+ncurses+sse2.tar.lz 10744836 SHA256 9d943e832695ec4d66b07ed9a6dc5e58885ea671d96ba7b728d03b18686111f7 SHA512 bd39bad8f292eabae37b384b9f9f36bc221606b1d2d4aa3df8a45fb1f7ad94755d5fe5dbb7983a49c4e44df87f745ce00691bcb3a5b6c197509c360d9b24d24c WHIRLPOOL b473572a5a84b1ab0510f7274038546836ef3f61ed3cea3260f7ee4e4086093555673064f9fd58c2510b2d80848ec276ca7069372826ef466408c6cabdc74424
+DIST pypy-bin-5.8.0-x86+bzip2+ncurses+sse2.tar.lz 6493961 SHA256 41d51005cf935ab395f318d88f0f80dfaf42d9e6c766f1e65bbfb6af0b25f586 SHA512 97075ef6589d4671dd8ea79fb87c42842023b3f9b5539b3aed8ed90785e001d9725937fb21cf1339df6425ddb50e1e9aab42630770ed39bbd96e953c6369c249 WHIRLPOOL a562152061ee390e033e69fda6508d04e53a5ca6f051a49dd14d78021bff4ed9cb4070bc36f3e175c10538246cdb1bf5cc63f5f70daa50ee079d4cf8ead1fde9
+DIST pypy-bin-5.8.0-x86+bzip2+ncurses.tar.lz 6489741 SHA256 6146c19101d34c1ee8dd03b652f34495b816b93ef5bd41332afd5a302e9385c8 SHA512 e15572f318b0c1f1d68cdb8c1068de853443c7b350b8aa25b41db50d075e2bb6c53530a035c31c98b530e96742c10d0e92ca20081ffefbe475d00e0974aa8b85 WHIRLPOOL cd682aafe11aeed7571186fe99b544f8ea7a182b35c2685d09418df7abe05a49e86e8385d909a1627a2e3b30c9c1e09526de8ef45f69d5ca5e0080a4726a6950
+DIST pypy2-v5.6.0-src.tar.bz2 18388539 SHA256 7411448045f77eb9e087afdce66fe7eafda1876c9e17aad88cf891f762b608b0 SHA512 a92ef611ae2417aaa202b9f5c75dd86e82fc2549e53bab3164cccff37d131542bc71cbce6aaedf428d3dfc7d59a2d3b3a5ed03e3a3439628f29d43c4d30a64de WHIRLPOOL 896894225407f8cd462b094d77723880f6a423d60a79e5d3cf4e0804737fdd0337fc668b05573902fe81f826798b2046cb115c8d230f0810ec0ad2508590ee4a
+DIST pypy2-v5.7.1-src.tar.bz2 18940413 SHA256 d01bee43c6df79f7bbc1149bb3e85f489491fb2358a6a1f9a7f0d6e07715832f SHA512 1ad2dddb40c28d2d3e95a9f0730e765d981dee6e2d0664cf1274eb7c1021690a848c3485c846eac8a8b64425b44946b5b2d223058ec4699155a2122ee7d38b75 WHIRLPOOL e0223d889a26f8a5bc5097561dbe617ff9b11972590f3a8d717d572798a2d685540bc6059e4ce4ff73ce0db9d2476a4274f17dad1f825fb780726d6ecd78a4c8
+DIST pypy2-v5.8.0-src.tar.bz2 19163498 SHA256 504c2d522595baf8775ae1045a217a2b120732537861d31b889d47c340b58bd5 SHA512 222c6ce11b00830e310b766df4c145b7f554f23b87fc6146f214d758d7a6159c5c00af475aa7fa630ef4c37b52cdf2fd73049b6ec3610715b6abc0a925fe1365 WHIRLPOOL 775fbe656996e80fce9cb9a4d4f44fe1b87f0b22f18f74940d5824143337773bb5e3a4d23564bfdc22d010693010f31689026432134a8a2e30ddee670dba1b6d
+DIST python-gentoo-patches-2.7.11-0.tar.xz 12916 SHA256 e14b47bb1fd64d366d7dfb8339cc2cbf4a53fc288b11dd83f575eb36a8a6408d SHA512 f0447bb699a163afc08df39b111394377539935546ae23732d7239e78d2bff0c04bc94949f86aef0c1be83736127dbd25c2c531e49befed2d638c3cd4940ac52 WHIRLPOOL 305992849d9d244da1e308e739c9bf62a3ef5c74eb65c765bdc666fb5767eb16c7a609f7c442c17da17f76c3ab81e4b09fa8c21e43f89366539a6a9d656bea77
+DIST python-gentoo-patches-2.7.13-0.tar.xz 13292 SHA256 271835eb36125d09cc5e904ef23a5263acd8e5f513202a8d4f8a9a0f64fc80a8 SHA512 d70f6baba1a465a752c515e33dfdee2a5cc75400fadfb8ea0bd1e82d50089abdf02d7726c697850dc47de2054aa494bbdc08de2673c260b54e609f29dab259ad WHIRLPOOL 6a6d8b099fa814839bf5b3455b3889205c649ef522b35c3a501831d63d0e916d7747b83ac9b8991f8f8c34b328478d84cf7a12a32161ce0fec37204f9c019e2d
+EBUILD pypy-bin-5.6.0.ebuild 6078 SHA256 6c54fd6211b18e489da8cf1e90dc1753087da35636a761bfa2271e0663020c3f SHA512 16a76d68a01ed73f7dc978332c131e1c1627431d80b52a44f6c82695815e380310b22157048d5a62099801070d58eff13514b6cfa9f89a15ad83a1727be18b39 WHIRLPOOL 5a009b06ec8f10fbe3cbfaf6ca4bac64b238aaaf460bce68f5a3579d6483b390473463d1683495a231c639458d6e5e76f8202cb072f8a9c52b0fe2e0c2166706
+EBUILD pypy-bin-5.7.1.ebuild 5819 SHA256 4ecdec56f1ae5457c36fa8bdafcd8f8ff8ce8c565ba1de8bc82f71b51a72ee68 SHA512 0abf25651d8432a51a32e4129fbee0046d9e1a838a3c866e66407433b4059aedf640d63a371a9934d6d4f7ec5b2a79665606cd9a18ee4b16a656610cc5b93b7f WHIRLPOOL 43db08fdadc7eddb4e292a515ca15f159529115decdf0630828f0bf9bbfe4f52fe56d6897c0426cece3c14f46f788282f32cb4df119e80248045a2ac73c5c342
+EBUILD pypy-bin-5.8.0.ebuild 5819 SHA256 a328766890d2a892513e895518884de98f67d3cf7429aaf18bcd7e182fcf872e SHA512 8ba2d88b641b86a6b7a64f271b56a80aa98139307bb4e294cba6f4ed34a0821a7fae66ec037cbdbf6a6fa00b2d381044b81b24c3f805345c2de77bac0e60b7cf WHIRLPOOL a877c7eec69b9020756a8e0addbc854e2656f897adf476f3fca341a7ed8e24061476843a551611dc6df6b5db1808a5692aaf9e99a50c65855317ad519ea9af3a
+MISC ChangeLog 9199 SHA256 9c47a49b40abc59f48abeb8422551c11d6fd22baa080d4748c480f998e4ab4b9 SHA512 f29475889f803f8e330e2811bd96aebb6bb829ca8043056ca539edacb6d513f772dd4b192a85b995caa626f468ce5bec3f98acbc8dcf41f54f16cebaf6783325 WHIRLPOOL 4231ef2b20556aa4e6853f40f1f89f58205206ea069204efe33ec2a2a5553e3e03d83c3e21b55226b64c4ee377d747b0e6352cc37f0e3b7f93c2862bd3c6ada0
+MISC ChangeLog-2015 7187 SHA256 ea84ecd028b95b790792d4f80386a8c5884a667de5de21d37747412ac6868d66 SHA512 afd832969505f5ea599a10a629fe0e068c3282d5b8f3d880dc04818e25034c9df1821b0dea2b623b91ae6561ca82ec9de6c4907badcc2befc2230dec986c9302 WHIRLPOOL 05c59d774d47ac5eabd74c1af2044ba0c2d2fdd0f4b3bb8f4cc9914c65a8133dcf59ee047c13d676783a84b28a4ea9c2fcbd9c910ec6057581b9c3ca227ef410
+MISC metadata.xml 514 SHA256 418905501db31b0962ef487f62db5c376e6cce16be2e7513553049979dae1968 SHA512 a4f6fbf391b7f566b99cef0dc503d41ad1c0eb119187650b550697c4c10b394bae847fcd809eb9db2883f578e5bcf3416146941cabddc0632b2e10dd50fb0315 WHIRLPOOL a510d10c48a29615969f1332fb78e91b5036c3e7cc5456981a627f96b72bc3fb407b6023d7e564da4ccf4170925d3c3902a42074b11f9af105b200e7cfebe58f
diff --git a/dev-python/pypy-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch b/dev-python/pypy-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
new file mode 100644
index 000000000000..65321bb60e6e
--- /dev/null
+++ b/dev-python/pypy-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
@@ -0,0 +1,11 @@
+--- a/lib-python/2.7/distutils/unixccompiler.py
++++ b/lib-python/2.7/distutils/unixccompiler.py
+@@ -297,7 +297,7 @@
+         # this time, there's no way to determine this information from
+         # the configuration data stored in the Python installation, so
+         # we use this hack.
+-        compiler = os.path.basename(sysconfig.get_config_var("CC"))
++        compiler = os.path.basename(self.compiler[0])
+         if sys.platform[:6] == "darwin":
+             # MacOSX's linker doesn't understand the -R flag at all
+             return "-L" + dir
diff --git a/dev-python/pypy-bin/files/4.0.0-gentoo-path.patch b/dev-python/pypy-bin/files/4.0.0-gentoo-path.patch
new file mode 100644
index 000000000000..4d394f9340df
--- /dev/null
+++ b/dev-python/pypy-bin/files/4.0.0-gentoo-path.patch
@@ -0,0 +1,50 @@
+From 165e05bbdc93e54411217c0198d0a5cbb9de4e33 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 27 Nov 2015 17:02:42 +0100
+Subject: [PATCH] Gentoo: override paths for system-wide install based on
+ sys.prefix
+
+Override all default distutils install paths to ones suitable for
+system-wide install when sys.prefix indicates we're running the Gentoo
+system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
+
+Fixes: https://bugs.gentoo.org/462306
+Fixes: https://bugs.gentoo.org/465546
+---
+ lib-python/2.7/distutils/command/install.py | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/lib-python/2.7/distutils/command/install.py b/lib-python/2.7/distutils/command/install.py
+index fc43951..fed5218 100644
+--- a/lib-python/2.7/distutils/command/install.py
++++ b/lib-python/2.7/distutils/command/install.py
+@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
++    'gentoo': {
++        'purelib': '$base/site-packages',
++        'platlib': '$base/site-packages',
++        'headers': '$base/include',
++        'scripts': '@EPREFIX@/usr/bin',
++        'data'   : '@EPREFIX@/usr',
++        },
+     }
+ 
+ # The keys to an installation scheme; if any new types of files are to be
+@@ -476,7 +483,11 @@ class install (Command):
+         # it's the caller's problem if they supply a bad name!
+         if (hasattr(sys, 'pypy_version_info') and
+             not name.endswith(('_user', '_home'))):
+-            name = 'pypy'
++            if self.install_base == os.path.normpath('@EPREFIX@/usr/@libdir@/pypy'):
++                # override paths for system-wide install
++                name = 'gentoo'
++            else:
++                name = 'pypy'
+         scheme = INSTALL_SCHEMES[name]
+         for key in SCHEME_KEYS:
+             attrname = 'install_' + key
+-- 
+2.6.3
+
diff --git a/dev-python/pypy-bin/files/5.6.0_all_distutils_cxx.patch b/dev-python/pypy-bin/files/5.6.0_all_distutils_cxx.patch
new file mode 100644
index 000000000000..5d9c2cd1a5ad
--- /dev/null
+++ b/dev-python/pypy-bin/files/5.6.0_all_distutils_cxx.patch
@@ -0,0 +1,340 @@
+http://bugs.python.org/issue1222585
+http://bugs.gentoo.org/show_bug.cgi?id=599918
+
+diff -Naur pypy2-v5.6.0-src/lib-python/2.7/_osx_support.py pypy2-v5.6.0-src-patched/lib-python/2.7/_osx_support.py
+--- pypy2-v5.6.0-src/lib-python/2.7/_osx_support.py	2016-11-08 09:52:16.000000000 +0100
++++ pypy2-v5.6.0-src-patched/lib-python/2.7/_osx_support.py	2016-12-08 16:59:26.213690338 +0100
+@@ -14,13 +14,13 @@
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/sysconfig_pypy.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/sysconfig_pypy.py
+--- pypy2-v5.6.0-src/lib-python/2.7/distutils/sysconfig_pypy.py	2016-11-08 09:52:16.000000000 +0100
++++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/sysconfig_pypy.py	2016-12-08 17:01:33.594553801 +0100
+@@ -126,19 +126,56 @@
+         setattr(compiler, executable, command)
+ 
+     if compiler.compiler_type == "unix":
+-        compiler.compiler_so.extend(['-O2', '-fPIC', '-Wimplicit'])
++        cc = ' '.join(compiler.compiler)
++        cxx = ' '.join(compiler.compiler_cxx)
++        ldshared = ' '.join(compiler.linker_so)
++        ldcxxshared = ' '.join(compiler.linker_so_cxx)
++
++        cflags = ''
++        cxxflags = ''
++        ccshared = '-fPIC'
++
++        if 'CC' in os.environ:
++            cc = os.environ['CC']
++        if 'CXX' in os.environ:
++            cxx = os.environ['CXX']
++        if 'LDSHARED' in os.environ:
++            ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
++        if 'CPP' in os.environ:
++            cpp = os.environ['CPP']
++        else:
++            cpp = cc + " -E"           # not always
++        if 'CPPFLAGS' in os.environ:
++            cpp = cpp + ' ' + os.environ['CPPFLAGS']
++            cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
++            ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
++        if 'CFLAGS' in os.environ:
++            cflags = os.environ['CFLAGS']
++            ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
++        if 'LDFLAGS' in os.environ:
++            ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
++
++        cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
++        compiler.set_executables(
++            preprocessor=cpp,
++            compiler=cc_cmd,
++            compiler_so=cc_cmd + ' ' + ccshared,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
++            linker_so=ldshared,
++            linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx)
+         compiler.shared_lib_extension = get_config_var('SO')
+-        if "CPPFLAGS" in os.environ:
+-            cppflags = shlex.split(os.environ["CPPFLAGS"])
+-            for executable in ('compiler', 'compiler_so', 'linker_so'):
+-                customize(executable, cppflags)
+-        if "CFLAGS" in os.environ:
+-            cflags = shlex.split(os.environ["CFLAGS"])
+-            for executable in ('compiler', 'compiler_so', 'linker_so'):
+-                customize(executable, cflags)
+-        if "LDFLAGS" in os.environ:
+-            ldflags = shlex.split(os.environ["LDFLAGS"])
+-            customize('linker_so', ldflags)
+ 
+ 
+ from sysconfig_cpython import (
+diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/cygwinccompiler.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/cygwinccompiler.py
+--- pypy2-v5.6.0-src/lib-python/2.7/distutils/cygwinccompiler.py	2016-11-08 09:52:16.000000000 +0100
++++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/cygwinccompiler.py	2016-12-08 16:59:26.213690338 +0100
+@@ -120,8 +120,10 @@
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -135,9 +137,13 @@
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -163,8 +169,12 @@
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+@@ -330,9 +340,14 @@
+         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
+                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
+                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
++                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
+                              linker_exe='gcc%s' % no_cygwin,
+                              linker_so='%s%s %s %s'
+                                     % (self.linker_dll, no_cygwin,
++                                       shared_option, entry_point),
++                             linker_exe_cxx='g++%s' % no_cygwin,
++                             linker_so_cxx='%s%s %s %s'
++                                    % (self.linker_dll_cxx, no_cygwin,
+                                        shared_option, entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/emxccompiler.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/emxccompiler.py
+--- pypy2-v5.6.0-src/lib-python/2.7/distutils/emxccompiler.py	2016-11-08 09:52:16.000000000 +0100
++++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/emxccompiler.py	2016-12-08 16:59:26.213690338 +0100
+@@ -65,8 +65,12 @@
+         # XXX optimization, warnings etc. should be customizable.
+         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
+-                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
++                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
++                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
++                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
+ 
+         # want the gcc library statically linked (so that we don't have
+         # to distribute a version dependent on the compiler we have)
+@@ -83,8 +87,12 @@
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/sysconfig_cpython.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/sysconfig_cpython.py
+--- pypy2-v5.6.0-src/lib-python/2.7/distutils/sysconfig_cpython.py	2016-11-08 09:52:16.000000000 +0100
++++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/sysconfig_cpython.py	2016-12-08 16:59:26.213690338 +0100
+@@ -171,10 +171,12 @@
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
+-                            'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SO', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -189,19 +191,27 @@
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -210,13 +220,17 @@
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = so_ext
+diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/unixccompiler.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/unixccompiler.py
+--- pypy2-v5.6.0-src/lib-python/2.7/distutils/unixccompiler.py	2016-11-08 09:52:16.000000000 +0100
++++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/unixccompiler.py	2016-12-08 16:59:26.213690338 +0100
+@@ -55,14 +55,17 @@
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -129,12 +132,19 @@
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError, msg:
+             raise CompileError, msg
+ 
+@@ -191,23 +201,16 @@
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i = i + 1
+-
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
diff --git a/dev-python/pypy-bin/files/5.7.1_all_distutils_cxx.patch b/dev-python/pypy-bin/files/5.7.1_all_distutils_cxx.patch
new file mode 100644
index 000000000000..8249fbc91db8
--- /dev/null
+++ b/dev-python/pypy-bin/files/5.7.1_all_distutils_cxx.patch
@@ -0,0 +1,388 @@
+From 9bf4611231faa0dc9ae64c6a7a8b55a3290a3ca2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 25 Apr 2017 07:14:11 +0200
+Subject: [PATCH] Fancy patch for distutils C++ support, rebased for pypy5.7
+
+http://bugs.python.org/issue1222585
+http://bugs.gentoo.org/show_bug.cgi?id=599918
+---
+ _osx_support.py                | 10 ++---
+ distutils/cygwinccompiler.py   | 21 ++++++++--
+ distutils/emxccompiler.py      | 14 +++++--
+ distutils/sysconfig_cpython.py | 26 ++++++++++---
+ distutils/sysconfig_pypy.py    | 37 ++++++++++++++----
+ distutils/unixccompiler.py     | 55 ++++++++++++++-------------
+ 6 files changed, 112 insertions(+), 51 deletions(-)
+
+diff --git a/_osx_support.py b/_osx_support.py
+index d2aaae7..8bcdb05 100644
+--- a/_osx_support.py
++++ b/_osx_support.py
+@@ -14,13 +14,13 @@ __all__ = [
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
+index 767400c..7133097 100644
+--- a/distutils/cygwinccompiler.py
++++ b/distutils/cygwinccompiler.py
+@@ -120,8 +120,10 @@ class CygwinCCompiler (UnixCCompiler):
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -135,9 +137,13 @@ class CygwinCCompiler (UnixCCompiler):
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -163,8 +169,12 @@ class CygwinCCompiler (UnixCCompiler):
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+@@ -330,9 +340,14 @@ class Mingw32CCompiler (CygwinCCompiler):
+         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
+                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
+                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
++                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
+                              linker_exe='gcc%s' % no_cygwin,
+                              linker_so='%s%s %s %s'
+                                     % (self.linker_dll, no_cygwin,
++                                       shared_option, entry_point),
++                             linker_exe_cxx='g++%s' % no_cygwin,
++                             linker_so_cxx='%s%s %s %s'
++                                    % (self.linker_dll_cxx, no_cygwin,
+                                        shared_option, entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff --git a/distutils/emxccompiler.py b/distutils/emxccompiler.py
+index a017205..bdc532c 100644
+--- a/distutils/emxccompiler.py
++++ b/distutils/emxccompiler.py
+@@ -65,8 +65,12 @@ class EMXCCompiler (UnixCCompiler):
+         # XXX optimization, warnings etc. should be customizable.
+         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
+-                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
++                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
++                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
++                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
+ 
+         # want the gcc library statically linked (so that we don't have
+         # to distribute a version dependent on the compiler we have)
+@@ -83,8 +87,12 @@ class EMXCCompiler (UnixCCompiler):
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
+index 35f39e4..8dd032d 100644
+--- a/distutils/sysconfig_cpython.py
++++ b/distutils/sysconfig_cpython.py
+@@ -171,10 +171,12 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
+-                            'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SO', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -189,19 +191,27 @@ def customize_compiler(compiler):
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -210,13 +220,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = so_ext
+diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
+index 368f232..4fe1f08 100644
+--- a/distutils/sysconfig_pypy.py
++++ b/distutils/sysconfig_pypy.py
+@@ -67,6 +67,7 @@ def _init_posix():
+     g['CFLAGS'] = "-DNDEBUG -O2"
+     g['CCSHARED'] = "-fPIC"
+     g['LDSHARED'] = "gcc -pthread -shared"
++    g['LDCXXSHARED'] = "g++ -pthread -shared"
+     g['SO'] = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
+     g['AR'] = "ar"
+     g['ARFLAGS'] = "rc"
+@@ -85,6 +86,7 @@ def _init_posix():
+             # just a guess
+             arch = platform.machine()
+         g['LDSHARED'] += ' -undefined dynamic_lookup'
++        g['LDCXXSHARED'] += ' -undefined dynamic_lookup'
+         g['CC'] += ' -arch %s' % (arch,)
+ 
+     global _config_vars
+@@ -168,37 +170,52 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
+-                            'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SO', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+-            if (sys.platform == 'darwin'
++            if (True
+                     and 'LDSHARED' not in os.environ
+                     and ldshared.startswith(cc)):
+                 # On OS X, if CC is overridden, use that as the default
+                 #       command for LDSHARED as well
++                # Gentoo: s/OS X/every system/
+                 ldshared = newcc + ldshared[len(cc):]
+             cc = newcc
+         if 'CXX' in os.environ:
+-            cxx = os.environ['CXX']
++            newcxx = os.environ['CXX']
++            if ('LDCXXSHARED' not in os.environ
++                    and ldcxxshared.startswith(cxx)):
++                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
++            cxx = newcxx
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -207,13 +224,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = so_ext
+diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
+index dee88a5..558b568 100644
+--- a/distutils/unixccompiler.py
++++ b/distutils/unixccompiler.py
+@@ -55,14 +55,17 @@ class UnixCCompiler(CCompiler):
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -129,12 +132,19 @@ class UnixCCompiler(CCompiler):
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError, msg:
+             raise CompileError, msg
+ 
+@@ -191,23 +201,16 @@ class UnixCCompiler(CCompiler):
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i = i + 1
+-
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+-- 
+2.12.2
+
diff --git a/dev-python/pypy-bin/files/5.8.0_all_distutils_cxx.patch b/dev-python/pypy-bin/files/5.8.0_all_distutils_cxx.patch
new file mode 100644
index 000000000000..f0268e296954
--- /dev/null
+++ b/dev-python/pypy-bin/files/5.8.0_all_distutils_cxx.patch
@@ -0,0 +1,388 @@
+From 9bf4611231faa0dc9ae64c6a7a8b55a3290a3ca2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 25 Apr 2017 07:14:11 +0200
+Subject: [PATCH] Fancy patch for distutils C++ support, rebased for pypy5.7
+
+http://bugs.python.org/issue1222585
+http://bugs.gentoo.org/show_bug.cgi?id=599918
+---
+ _osx_support.py                | 10 ++---
+ distutils/cygwinccompiler.py   | 21 ++++++++--
+ distutils/emxccompiler.py      | 14 +++++--
+ distutils/sysconfig_cpython.py | 26 ++++++++++---
+ distutils/sysconfig_pypy.py    | 37 ++++++++++++++----
+ distutils/unixccompiler.py     | 55 ++++++++++++++-------------
+ 6 files changed, 112 insertions(+), 51 deletions(-)
+
+diff --git a/_osx_support.py b/_osx_support.py
+index d2aaae7..8bcdb05 100644
+--- a/_osx_support.py
++++ b/_osx_support.py
+@@ -14,13 +14,13 @@ __all__ = [
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
+index 767400c..7133097 100644
+--- a/distutils/cygwinccompiler.py
++++ b/distutils/cygwinccompiler.py
+@@ -120,8 +120,10 @@ class CygwinCCompiler (UnixCCompiler):
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -135,9 +137,13 @@ class CygwinCCompiler (UnixCCompiler):
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -163,8 +169,12 @@ class CygwinCCompiler (UnixCCompiler):
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+@@ -330,9 +340,14 @@ class Mingw32CCompiler (CygwinCCompiler):
+         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
+                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
+                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
++                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
+                              linker_exe='gcc%s' % no_cygwin,
+                              linker_so='%s%s %s %s'
+                                     % (self.linker_dll, no_cygwin,
++                                       shared_option, entry_point),
++                             linker_exe_cxx='g++%s' % no_cygwin,
++                             linker_so_cxx='%s%s %s %s'
++                                    % (self.linker_dll_cxx, no_cygwin,
+                                        shared_option, entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff --git a/distutils/emxccompiler.py b/distutils/emxccompiler.py
+index a017205..bdc532c 100644
+--- a/distutils/emxccompiler.py
++++ b/distutils/emxccompiler.py
+@@ -65,8 +65,12 @@ class EMXCCompiler (UnixCCompiler):
+         # XXX optimization, warnings etc. should be customizable.
+         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
+-                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
++                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
++                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
++                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
+ 
+         # want the gcc library statically linked (so that we don't have
+         # to distribute a version dependent on the compiler we have)
+@@ -83,8 +87,12 @@ class EMXCCompiler (UnixCCompiler):
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
+index 35f39e4..8dd032d 100644
+--- a/distutils/sysconfig_cpython.py
++++ b/distutils/sysconfig_cpython.py
+@@ -171,10 +171,12 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
+-                            'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SO', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -189,19 +191,27 @@ def customize_compiler(compiler):
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -210,13 +220,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = so_ext
+diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
+index 368f232..4fe1f08 100644
+--- a/distutils/sysconfig_pypy.py
++++ b/distutils/sysconfig_pypy.py
+@@ -67,6 +67,7 @@ def _init_posix():
+     g['CFLAGS'] = "-DNDEBUG -O2"
+     g['CCSHARED'] = "-fPIC"
+     g['LDSHARED'] = "cc -pthread -shared"
++    g['LDCXXSHARED'] = "c++ -pthread -shared"
+     g['SO'] = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
+     g['AR'] = "ar"
+     g['ARFLAGS'] = "rc"
+@@ -85,6 +86,7 @@ def _init_posix():
+             # just a guess
+             arch = platform.machine()
+         g['LDSHARED'] += ' -undefined dynamic_lookup'
++        g['LDCXXSHARED'] += ' -undefined dynamic_lookup'
+         g['CC'] += ' -arch %s' % (arch,)
+ 
+     global _config_vars
+@@ -168,37 +170,52 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
+-                            'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SO', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+-            if (sys.platform == 'darwin'
++            if (True
+                     and 'LDSHARED' not in os.environ
+                     and ldshared.startswith(cc)):
+                 # On OS X, if CC is overridden, use that as the default
+                 #       command for LDSHARED as well
++                # Gentoo: s/OS X/every system/
+                 ldshared = newcc + ldshared[len(cc):]
+             cc = newcc
+         if 'CXX' in os.environ:
+-            cxx = os.environ['CXX']
++            newcxx = os.environ['CXX']
++            if ('LDCXXSHARED' not in os.environ
++                    and ldcxxshared.startswith(cxx)):
++                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
++            cxx = newcxx
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -207,13 +224,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = so_ext
+diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
+index dee88a5..558b568 100644
+--- a/distutils/unixccompiler.py
++++ b/distutils/unixccompiler.py
+@@ -55,14 +55,17 @@ class UnixCCompiler(CCompiler):
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -129,12 +132,19 @@ class UnixCCompiler(CCompiler):
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError, msg:
+             raise CompileError, msg
+ 
+@@ -191,23 +201,16 @@ class UnixCCompiler(CCompiler):
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i = i + 1
+-
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+-- 
+2.12.2
+
diff --git a/dev-python/pypy-bin/metadata.xml b/dev-python/pypy-bin/metadata.xml
new file mode 100644
index 000000000000..c1d59c6d4a0e
--- /dev/null
+++ b/dev-python/pypy-bin/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alicef@gentoo.org</email>
+		<name>Alice Ferrazzi</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
+	</use>
+	<upstream>
+		<remote-id type="bitbucket">pypy/pypy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pypy-bin/pypy-bin-5.6.0.ebuild b/dev-python/pypy-bin/pypy-bin-5.6.0.ebuild
new file mode 100644
index 000000000000..e15879131bd9
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin-5.6.0.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+inherit eutils multilib pax-utils python-any-r1 unpacker versionator
+
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
+CPY_PATCHSET_VERSION="2.7.11-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/~djc/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
+	amd64? (
+		jit? ( shadowstack? (
+			${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.lz
+		) )
+		jit? ( !shadowstack? (
+			${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz
+		) )
+		!jit? ( !shadowstack? (
+			${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz
+		) )
+	)
+	x86? (
+		cpu_flags_x86_sse2? (
+			jit? ( shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz
+			) )
+			jit? ( !shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz
+			) )
+			!jit? ( !shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz
+			) )
+		)
+		!cpu_flags_x86_sse2? (
+			!jit? ( !shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz
+			) )
+		)
+	)"
+
+# Supported variants
+REQUIRED_USE="!jit? ( !shadowstack )
+	x86? ( !cpu_flags_x86_sse2? ( !jit !shadowstack ) )"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/41"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gdbm +jit +shadowstack sqlite cpu_flags_x86_sse2 test tk"
+
+# yep, world would be easier if people started filling subslots...
+RDEPEND="
+	app-arch/bzip2:0=
+	dev-libs/expat:0=
+	dev-libs/libffi:0=
+	dev-libs/openssl:0=[-bindist]
+	sys-libs/glibc:2.2=
+	sys-libs/ncurses:0/6
+	sys-libs/zlib:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	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
+	doc? ( ${PYTHON_DEPS}
+		dev-python/sphinx )"
+
+S=${WORKDIR}/${MY_P}-src
+
+QA_PREBUILT="
+	usr/lib*/pypy/pypy-c
+	usr/lib*/pypy/libpypy-c.so"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		use doc && python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \
+		"${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
+	epatch "${FILESDIR}"/5.6.0_all_distutils_cxx.patch \
+		"${WORKDIR}"/patches/22_all_turkish_locale.patch \
+		"${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
+	popd > /dev/null || die
+
+	epatch_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
+
+	use doc && emake -C pypy/doc/ html
+	#needed even without jit :( also needed in both compile and install phases
+	pax-mark m pypy-c libpypy-c.so
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy
+	einfo "Installing PyPy ..."
+	insinto "${dest}"
+	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
+	fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
+	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
+	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
+
+	# Install docs
+	use doc && dohtml -r pypy/doc/_build/html/
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy-c
+	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop curses syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${dest}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${dest}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy-bin/pypy-bin-5.7.1.ebuild b/dev-python/pypy-bin/pypy-bin-5.7.1.ebuild
new file mode 100644
index 000000000000..aaa6411b77bb
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin-5.7.1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+inherit pax-utils python-any-r1 unpacker versionator
+
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
+CPY_PATCHSET_VERSION="2.7.13-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? (
+		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
+		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
+	)
+	x86? (
+		cpu_flags_x86_sse2? (
+			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
+			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
+		)
+		!cpu_flags_x86_sse2? (
+			!jit? ( ${BINHOST}/${P}-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/41"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gdbm +jit sqlite cpu_flags_x86_sse2 test tk"
+
+# yep, world would be easier if people started filling subslots...
+RDEPEND="
+	app-arch/bzip2:0=
+	dev-libs/expat:0=
+	dev-libs/libffi:0=
+	dev-libs/openssl:0=[-bindist]
+	sys-libs/glibc:2.2=
+	sys-libs/ncurses:0/6
+	sys-libs/zlib:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	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
+	doc? ( ${PYTHON_DEPS}
+		dev-python/sphinx )"
+
+S=${WORKDIR}/${MY_P}-src
+
+QA_PREBUILT="
+	usr/lib*/pypy/pypy-c
+	usr/lib*/pypy/libpypy-c.so"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		use doc && python-any-r1_pkg_setup
+	fi
+}
+
+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.7.1_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
+
+	use doc && emake -C pypy/doc/ html
+	#needed even without jit :( also needed in both compile and install phases
+	pax-mark m pypy-c libpypy-c.so
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy
+	einfo "Installing PyPy ..."
+	insinto "${dest}"
+	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
+	fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
+	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
+	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
+
+	# Install docs
+	use doc && dodoc -r pypy/doc/_build/html
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy-c
+	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop curses syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${dest}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${dest}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy-bin/pypy-bin-5.8.0.ebuild b/dev-python/pypy-bin/pypy-bin-5.8.0.ebuild
new file mode 100644
index 000000000000..b15095865fdb
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin-5.8.0.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+inherit pax-utils python-any-r1 unpacker versionator
+
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
+CPY_PATCHSET_VERSION="2.7.13-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? (
+		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
+		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
+	)
+	x86? (
+		cpu_flags_x86_sse2? (
+			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
+			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
+		)
+		!cpu_flags_x86_sse2? (
+			!jit? ( ${BINHOST}/${P}-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/41"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gdbm +jit sqlite cpu_flags_x86_sse2 test tk"
+
+# yep, world would be easier if people started filling subslots...
+RDEPEND="
+	app-arch/bzip2:0=
+	dev-libs/expat:0=
+	dev-libs/libffi:0=
+	dev-libs/openssl:0=[-bindist]
+	sys-libs/glibc:2.2=
+	sys-libs/ncurses:0/6
+	sys-libs/zlib:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	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
+	doc? ( ${PYTHON_DEPS}
+		dev-python/sphinx )"
+
+S=${WORKDIR}/${MY_P}-src
+
+QA_PREBUILT="
+	usr/lib*/pypy/pypy-c
+	usr/lib*/pypy/libpypy-c.so"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		use doc && python-any-r1_pkg_setup
+	fi
+}
+
+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
+
+	use doc && emake -C pypy/doc/ html
+	#needed even without jit :( also needed in both compile and install phases
+	pax-mark m pypy-c libpypy-c.so
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy
+	einfo "Installing PyPy ..."
+	insinto "${dest}"
+	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
+	fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
+	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
+	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
+
+	# Install docs
+	use doc && dodoc -r pypy/doc/_build/html
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy-c
+	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop curses syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${dest}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${dest}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
new file mode 100644
index 000000000000..e3178fd109c5
--- /dev/null
+++ b/dev-python/pypy/Manifest
@@ -0,0 +1,19 @@
+AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 SHA256 110c15482123bc6fbf11e237df30eb0daad7f6032e2f73903e9e3c225121737a SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474 WHIRLPOOL 14084d22388b2bbda7fbd19195f448265f99b1437b7cefdac276ccab52785c67b71768303e1d1ea9009f8533ba07de0014eb237b4de675cf8dbc1acbeacb8508
+AUX 2.5.0-shared-lib.patch 734 SHA256 202b90461d5c51fddb3f2adcec8806300895597ee997a8e4352ec9d2c31f4d49 SHA512 c75281cc754d723c184a2e716cdd9d88e23db4041c143864205e7d8b40972507bb0423216cf3cdcee2bf7f8900d034bbc95b318fc347af6e550ec6e6ed1097da WHIRLPOOL 279b72ae78276020dba2ef7dc4f16581a21c742b1c6218a18dc8b3e8c847c50898beaf3868d76e13ceb62ba1189792f6c0ad220650e92799594bd1503b126e34
+AUX 4.0.0-gentoo-path.patch 1915 SHA256 106683dc3849851df2d4985f542825ae2b37e0b3ec57ff34d2a5cbd16f79f830 SHA512 d1c9925ddd19c252d4222dbea6db866a867abefff65219f7fa0fe070fa68e675f3a815f418d214eb508375a49911dd3cc4851f42552e5fff0b7fc2d7f0272278 WHIRLPOOL 0c68c232e5ffeb1ce5e5d3e41471cbde45aca7765b2c85227c02b5b759891a33ab404ce5f444c048361e922a90868621845a8839207efceba6a70ebd5c70dfe0
+AUX 5.6.0_all_distutils_cxx.patch 17053 SHA256 77e2274dac32d065f861882daf59f9020064efc3b7ab39d5152538ea343d854c SHA512 79b3e073a57981ef78c42db3f6c6c0b410525d84d5c6166ac7f8947d66a7b00c52d1fd30516708eaf3d33664466302e11a954f73c40ae48a8aedfb554cec86a2 WHIRLPOOL ae97f0e6a8cf2c0b6df946297f4d6dae27fbe4dd0ea3576d6a17e869fa5e610971302c07465ca4018d6e1ced650d6531ae20639fa08a7d69693ff337a60216e1
+AUX 5.7.1-kill-flto.patch 919 SHA256 aed12afc66592ef9fe4bedd09c4275158fbfc30b4ec5003e9b092974ea020d73 SHA512 a8340c41e55e929521f649d64ee728a8b95e1be3008060a4fb2147e7f3914731640870503b4c06577a052deca00130ff3835b9477feeaf57fc0b8531abcc22c9 WHIRLPOOL 559115c01e6e027948e7cb55577be8d018661e811a3aff8db68a4e98de6f275673738199e928aa7ee17a0cc9b94ab1cc350067cb8a4fe003de8022eedbcbfbc0
+AUX 5.7.1_all_distutils_cxx.patch 18249 SHA256 33bf43330f0a2ae0dfb4b4999a7b27c74ba789a18f6f181928e13cb1553bd39e SHA512 a347cf438a0d308c69bc92cd04236be0bcf95f595daff1fbcb19eaadbbd7355e90fd661843d8a8d1588003da3ec37b3e3e9fa8a24af92baa5d2c0c0a866284dc WHIRLPOOL fe363fe49b70e4e291a092b5229e5f17d39f50f5edee97bb4aac8275410d2981c6963e096fa77d7ecf549d0d97ea0c6168947b2c1526e92d3e73919873ef68da
+AUX 5.8.0_all_distutils_cxx.patch 18248 SHA256 2f7c75a5966ebfd0750ca902ea855ca321829a0309a60e6c57f45eb418054dae SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a WHIRLPOOL 807d777cabd6db4cc909f6135de230705f289ac8d1ef851fd872abdbabb3b13e299c98b53e9bf993f044c64702576e15f0d1b3a1a9a4aa9a4458204267c25b92
+DIST pypy2-v5.6.0-src.tar.bz2 18388539 SHA256 7411448045f77eb9e087afdce66fe7eafda1876c9e17aad88cf891f762b608b0 SHA512 a92ef611ae2417aaa202b9f5c75dd86e82fc2549e53bab3164cccff37d131542bc71cbce6aaedf428d3dfc7d59a2d3b3a5ed03e3a3439628f29d43c4d30a64de WHIRLPOOL 896894225407f8cd462b094d77723880f6a423d60a79e5d3cf4e0804737fdd0337fc668b05573902fe81f826798b2046cb115c8d230f0810ec0ad2508590ee4a
+DIST pypy2-v5.7.1-src.tar.bz2 18940413 SHA256 d01bee43c6df79f7bbc1149bb3e85f489491fb2358a6a1f9a7f0d6e07715832f SHA512 1ad2dddb40c28d2d3e95a9f0730e765d981dee6e2d0664cf1274eb7c1021690a848c3485c846eac8a8b64425b44946b5b2d223058ec4699155a2122ee7d38b75 WHIRLPOOL e0223d889a26f8a5bc5097561dbe617ff9b11972590f3a8d717d572798a2d685540bc6059e4ce4ff73ce0db9d2476a4274f17dad1f825fb780726d6ecd78a4c8
+DIST pypy2-v5.8.0-src.tar.bz2 19163498 SHA256 504c2d522595baf8775ae1045a217a2b120732537861d31b889d47c340b58bd5 SHA512 222c6ce11b00830e310b766df4c145b7f554f23b87fc6146f214d758d7a6159c5c00af475aa7fa630ef4c37b52cdf2fd73049b6ec3610715b6abc0a925fe1365 WHIRLPOOL 775fbe656996e80fce9cb9a4d4f44fe1b87f0b22f18f74940d5824143337773bb5e3a4d23564bfdc22d010693010f31689026432134a8a2e30ddee670dba1b6d
+DIST python-gentoo-patches-2.7.11-0.tar.xz 12916 SHA256 e14b47bb1fd64d366d7dfb8339cc2cbf4a53fc288b11dd83f575eb36a8a6408d SHA512 f0447bb699a163afc08df39b111394377539935546ae23732d7239e78d2bff0c04bc94949f86aef0c1be83736127dbd25c2c531e49befed2d638c3cd4940ac52 WHIRLPOOL 305992849d9d244da1e308e739c9bf62a3ef5c74eb65c765bdc666fb5767eb16c7a609f7c442c17da17f76c3ab81e4b09fa8c21e43f89366539a6a9d656bea77
+DIST python-gentoo-patches-2.7.13-0.tar.xz 13292 SHA256 271835eb36125d09cc5e904ef23a5263acd8e5f513202a8d4f8a9a0f64fc80a8 SHA512 d70f6baba1a465a752c515e33dfdee2a5cc75400fadfb8ea0bd1e82d50089abdf02d7726c697850dc47de2054aa494bbdc08de2673c260b54e609f29dab259ad WHIRLPOOL 6a6d8b099fa814839bf5b3455b3889205c649ef522b35c3a501831d63d0e916d7747b83ac9b8991f8f8c34b328478d84cf7a12a32161ce0fec37204f9c019e2d
+EBUILD pypy-5.6.0.ebuild 7755 SHA256 db94869c55bbb279fd4b70a945aadb21e333a73804b99215346c1ca416e15a1b SHA512 72803f33258e5382c39af0b567951d54bb2902af449a80f27bb21302e75cadbd1c4ecbdb0743c13d6d8a16e942f5a68f87ee4576b39d7efff43cf3f704843288 WHIRLPOOL 47db1d39582906ce8c1894e43d0e849ca3c1342cc99528e8939f7ff2a8774b8ba58cecb43232ef808b96849a50e89f0b431d64ecdea7fa3b6ba38a19afb3d943
+EBUILD pypy-5.7.1.ebuild 7776 SHA256 7a46bb10a331b6718f9a7b5a83709accdfd2fc32480b91812768c0a9f86cc6ff SHA512 00d83430e8ffcb12b8601574a01a0d0d23d4627e32f38025bea333f76e657e1b921dba82c61bd727525ca74582812dcb683218de4d4a3f3a6d0ade721527e927 WHIRLPOOL e3238f4eb5c9c4b17c5c6dfc4cf657e7a09d0cd1b582b41cc8c20365cfad12681f10eab712a2fe173aa30d0bdfd49dd7048555bda4355a24865e56ee190f65b2
+EBUILD pypy-5.8.0.ebuild 7707 SHA256 dae2698f117fd55e6fabbaac608ad7d05b0088c0fd75215f4075976cf17ae8c6 SHA512 5470d85e45363e10cf5f5f3ca3cfb656edc79104fd8998906e8b27c2e76d1150d43ea6108c39b68829e95a4c454c2a7d33312ad13a1cdcb7e98fe4804d93c326 WHIRLPOOL a889931458820d130d67b816f4953618e9f6f8d5143e1a905e2fb2c6c48a3ac91890fd05c8a838f6f96e591bcfe484c86495977a0851ba8cc11e51ea990bb2f1
+EBUILD pypy-9999.ebuild 7717 SHA256 2122d3535ce9f3fb1a7b540c56459999071b720763459c9bd58255a1d97972a9 SHA512 4b01aa163cec4154028487422fc6518aead4a87506cf31cd56eaf8f72aed16afde22d56129d9e0e72a178751477d98133c826983fcc44d9f247d96578b343aeb WHIRLPOOL c82a798c46ce1450e2801649d52e0cde4de257b49d98ada3a85bbddb4490a39be5707b768ec34a67cfbf95a0c6fc288a50ab335dbaa0ebce80ed70a8f574b31d
+MISC ChangeLog 9456 SHA256 2c487622b9a986cf7e958164a53f87c23fec4c87fb491b0d04f5dd96f17f911f SHA512 b639ad32b6eb4e456547d2df9cb739f88e736760ccba2bbbcf044b9140991d2b9a58944ad79dd8199a20a444cd0da79b8a0248f9072d1c4e2fb2e6f299f924ac WHIRLPOOL 6cc1e181530a5a48ac39b6adb8c52d01bd406b7e94f8cb8bd874d25b1eb708c4ee77e52e2bbcc7b40e257e86d1dba3e6db9be387828578d0d28d33b73b0e63b1
+MISC ChangeLog-2015 16042 SHA256 657b5025da42db387e3dd4b8ca2b081412e2fbe4ed95d6b633f7058107538777 SHA512 9395cfaefb8972adb9cc709884eec37094387490fd26b1ed51b45fd957348174f17dc577e826e72f758b4ba215d12af3c7c79989187280d8d58032966571ce4b WHIRLPOOL 69229bea7c34d0c718648dedc4aaf1d46e540961f65a577290649b3f799fb7e47116b2bc55d39b00a92291e21755440f0024abae2053217140c50b5b9f145880
+MISC metadata.xml 985 SHA256 dbe84c030488808bce73f701c292b2ab6a1110273b6f4638de6108a8d640374c SHA512 cbf2f1765dca5391fa08b8f49836e6a3019ca0e95c6783d6c2ee4937a8c323c3c43cc9873ff8fd396fc2646fffff4474facc3be0472d905c195b6fad8e8a5e58 WHIRLPOOL ad1b1663e3bb18e95be36e1d36aa396b9b96867d2b4fb55bd1f47308b9fc45540b8f125db1f094c9833d71f1d4f48109d75fe4e3eab864d61a87f6cd8e251ef1
diff --git a/dev-python/pypy/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch b/dev-python/pypy/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
new file mode 100644
index 000000000000..65321bb60e6e
--- /dev/null
+++ b/dev-python/pypy/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
@@ -0,0 +1,11 @@
+--- a/lib-python/2.7/distutils/unixccompiler.py
++++ b/lib-python/2.7/distutils/unixccompiler.py
+@@ -297,7 +297,7 @@
+         # this time, there's no way to determine this information from
+         # the configuration data stored in the Python installation, so
+         # we use this hack.
+-        compiler = os.path.basename(sysconfig.get_config_var("CC"))
++        compiler = os.path.basename(self.compiler[0])
+         if sys.platform[:6] == "darwin":
+             # MacOSX's linker doesn't understand the -R flag at all
+             return "-L" + dir
diff --git a/dev-python/pypy/files/2.5.0-shared-lib.patch b/dev-python/pypy/files/2.5.0-shared-lib.patch
new file mode 100644
index 000000000000..b5c877bd58b2
--- /dev/null
+++ b/dev-python/pypy/files/2.5.0-shared-lib.patch
@@ -0,0 +1,12 @@
+diff -ur pypy-2.5.0-src.orig/rpython/translator/platform/posix.py pypy-2.5.0-src/rpython/translator/platform/posix.py
+--- a/rpython/translator/platform/posix.py	2015-02-03 05:12:49.000000000 +0800
++++ b/rpython/translator/platform/posix.py	2015-03-22 07:36:01.420116684 +0800
+@@ -183,7 +183,7 @@
+                    'int main(int argc, char* argv[]) '
+                    '{ return $(PYPY_MAIN_FUNCTION)(argc, argv); }" > $@')
+             m.rule('$(DEFAULT_TARGET)', ['$(TARGET)', 'main.o'],
+-                   '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) -o $@ $(RPATH_FLAGS)')
++                   '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) \'-Wl,-rpath,$$ORIGIN\' -o $@')
+ 
+         return m
+ 
diff --git a/dev-python/pypy/files/4.0.0-gentoo-path.patch b/dev-python/pypy/files/4.0.0-gentoo-path.patch
new file mode 100644
index 000000000000..4d394f9340df
--- /dev/null
+++ b/dev-python/pypy/files/4.0.0-gentoo-path.patch
@@ -0,0 +1,50 @@
+From 165e05bbdc93e54411217c0198d0a5cbb9de4e33 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 27 Nov 2015 17:02:42 +0100
+Subject: [PATCH] Gentoo: override paths for system-wide install based on
+ sys.prefix
+
+Override all default distutils install paths to ones suitable for
+system-wide install when sys.prefix indicates we're running the Gentoo
+system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
+
+Fixes: https://bugs.gentoo.org/462306
+Fixes: https://bugs.gentoo.org/465546
+---
+ lib-python/2.7/distutils/command/install.py | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/lib-python/2.7/distutils/command/install.py b/lib-python/2.7/distutils/command/install.py
+index fc43951..fed5218 100644
+--- a/lib-python/2.7/distutils/command/install.py
++++ b/lib-python/2.7/distutils/command/install.py
+@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
++    'gentoo': {
++        'purelib': '$base/site-packages',
++        'platlib': '$base/site-packages',
++        'headers': '$base/include',
++        'scripts': '@EPREFIX@/usr/bin',
++        'data'   : '@EPREFIX@/usr',
++        },
+     }
+ 
+ # The keys to an installation scheme; if any new types of files are to be
+@@ -476,7 +483,11 @@ class install (Command):
+         # it's the caller's problem if they supply a bad name!
+         if (hasattr(sys, 'pypy_version_info') and
+             not name.endswith(('_user', '_home'))):
+-            name = 'pypy'
++            if self.install_base == os.path.normpath('@EPREFIX@/usr/@libdir@/pypy'):
++                # override paths for system-wide install
++                name = 'gentoo'
++            else:
++                name = 'pypy'
+         scheme = INSTALL_SCHEMES[name]
+         for key in SCHEME_KEYS:
+             attrname = 'install_' + key
+-- 
+2.6.3
+
diff --git a/dev-python/pypy/files/5.6.0_all_distutils_cxx.patch b/dev-python/pypy/files/5.6.0_all_distutils_cxx.patch
new file mode 100644
index 000000000000..5d9c2cd1a5ad
--- /dev/null
+++ b/dev-python/pypy/files/5.6.0_all_distutils_cxx.patch
@@ -0,0 +1,340 @@
+http://bugs.python.org/issue1222585
+http://bugs.gentoo.org/show_bug.cgi?id=599918
+
+diff -Naur pypy2-v5.6.0-src/lib-python/2.7/_osx_support.py pypy2-v5.6.0-src-patched/lib-python/2.7/_osx_support.py
+--- pypy2-v5.6.0-src/lib-python/2.7/_osx_support.py	2016-11-08 09:52:16.000000000 +0100
++++ pypy2-v5.6.0-src-patched/lib-python/2.7/_osx_support.py	2016-12-08 16:59:26.213690338 +0100
+@@ -14,13 +14,13 @@
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/sysconfig_pypy.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/sysconfig_pypy.py
+--- pypy2-v5.6.0-src/lib-python/2.7/distutils/sysconfig_pypy.py	2016-11-08 09:52:16.000000000 +0100
++++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/sysconfig_pypy.py	2016-12-08 17:01:33.594553801 +0100
+@@ -126,19 +126,56 @@
+         setattr(compiler, executable, command)
+ 
+     if compiler.compiler_type == "unix":
+-        compiler.compiler_so.extend(['-O2', '-fPIC', '-Wimplicit'])
++        cc = ' '.join(compiler.compiler)
++        cxx = ' '.join(compiler.compiler_cxx)
++        ldshared = ' '.join(compiler.linker_so)
++        ldcxxshared = ' '.join(compiler.linker_so_cxx)
++
++        cflags = ''
++        cxxflags = ''
++        ccshared = '-fPIC'
++
++        if 'CC' in os.environ:
++            cc = os.environ['CC']
++        if 'CXX' in os.environ:
++            cxx = os.environ['CXX']
++        if 'LDSHARED' in os.environ:
++            ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
++        if 'CPP' in os.environ:
++            cpp = os.environ['CPP']
++        else:
++            cpp = cc + " -E"           # not always
++        if 'CPPFLAGS' in os.environ:
++            cpp = cpp + ' ' + os.environ['CPPFLAGS']
++            cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
++            ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
++        if 'CFLAGS' in os.environ:
++            cflags = os.environ['CFLAGS']
++            ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
++        if 'LDFLAGS' in os.environ:
++            ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
++
++        cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
++        compiler.set_executables(
++            preprocessor=cpp,
++            compiler=cc_cmd,
++            compiler_so=cc_cmd + ' ' + ccshared,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
++            linker_so=ldshared,
++            linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx)
+         compiler.shared_lib_extension = get_config_var('SO')
+-        if "CPPFLAGS" in os.environ:
+-            cppflags = shlex.split(os.environ["CPPFLAGS"])
+-            for executable in ('compiler', 'compiler_so', 'linker_so'):
+-                customize(executable, cppflags)
+-        if "CFLAGS" in os.environ:
+-            cflags = shlex.split(os.environ["CFLAGS"])
+-            for executable in ('compiler', 'compiler_so', 'linker_so'):
+-                customize(executable, cflags)
+-        if "LDFLAGS" in os.environ:
+-            ldflags = shlex.split(os.environ["LDFLAGS"])
+-            customize('linker_so', ldflags)
+ 
+ 
+ from sysconfig_cpython import (
+diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/cygwinccompiler.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/cygwinccompiler.py
+--- pypy2-v5.6.0-src/lib-python/2.7/distutils/cygwinccompiler.py	2016-11-08 09:52:16.000000000 +0100
++++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/cygwinccompiler.py	2016-12-08 16:59:26.213690338 +0100
+@@ -120,8 +120,10 @@
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -135,9 +137,13 @@
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -163,8 +169,12 @@
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+@@ -330,9 +340,14 @@
+         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
+                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
+                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
++                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
+                              linker_exe='gcc%s' % no_cygwin,
+                              linker_so='%s%s %s %s'
+                                     % (self.linker_dll, no_cygwin,
++                                       shared_option, entry_point),
++                             linker_exe_cxx='g++%s' % no_cygwin,
++                             linker_so_cxx='%s%s %s %s'
++                                    % (self.linker_dll_cxx, no_cygwin,
+                                        shared_option, entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/emxccompiler.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/emxccompiler.py
+--- pypy2-v5.6.0-src/lib-python/2.7/distutils/emxccompiler.py	2016-11-08 09:52:16.000000000 +0100
++++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/emxccompiler.py	2016-12-08 16:59:26.213690338 +0100
+@@ -65,8 +65,12 @@
+         # XXX optimization, warnings etc. should be customizable.
+         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
+-                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
++                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
++                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
++                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
+ 
+         # want the gcc library statically linked (so that we don't have
+         # to distribute a version dependent on the compiler we have)
+@@ -83,8 +87,12 @@
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/sysconfig_cpython.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/sysconfig_cpython.py
+--- pypy2-v5.6.0-src/lib-python/2.7/distutils/sysconfig_cpython.py	2016-11-08 09:52:16.000000000 +0100
++++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/sysconfig_cpython.py	2016-12-08 16:59:26.213690338 +0100
+@@ -171,10 +171,12 @@
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
+-                            'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SO', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -189,19 +191,27 @@
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -210,13 +220,17 @@
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = so_ext
+diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/unixccompiler.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/unixccompiler.py
+--- pypy2-v5.6.0-src/lib-python/2.7/distutils/unixccompiler.py	2016-11-08 09:52:16.000000000 +0100
++++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/unixccompiler.py	2016-12-08 16:59:26.213690338 +0100
+@@ -55,14 +55,17 @@
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -129,12 +132,19 @@
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError, msg:
+             raise CompileError, msg
+ 
+@@ -191,23 +201,16 @@
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i = i + 1
+-
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
diff --git a/dev-python/pypy/files/5.7.1-kill-flto.patch b/dev-python/pypy/files/5.7.1-kill-flto.patch
new file mode 100644
index 000000000000..92395bdb6cab
--- /dev/null
+++ b/dev-python/pypy/files/5.7.1-kill-flto.patch
@@ -0,0 +1,27 @@
+From 261f9280d9736965a8626c2d6a6fadd4254b2b89 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 25 Apr 2017 17:03:46 +0200
+Subject: [PATCH] Kill -flto
+
+---
+ rpython/translator/platform/posix.py | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/rpython/translator/platform/posix.py b/rpython/translator/platform/posix.py
+index a8d4768..20a2934 100644
+--- a/rpython/translator/platform/posix.py
++++ b/rpython/translator/platform/posix.py
+@@ -130,10 +130,6 @@ class BasePosix(Platform):
+         else:
+             cflags = tuple(self.cflags) + tuple(self.standalone_only)
+ 
+-        # xxx check which compilers accept this option or not
+-        if not config or config.translation.gcrootfinder != 'asmgcc':
+-            cflags = ('-flto',) + cflags
+-
+         m = GnuMakefile(path)
+         m.exe_name = path.join(exe_name.basename)
+         m.eci = eci
+-- 
+2.12.2
+
diff --git a/dev-python/pypy/files/5.7.1_all_distutils_cxx.patch b/dev-python/pypy/files/5.7.1_all_distutils_cxx.patch
new file mode 100644
index 000000000000..8249fbc91db8
--- /dev/null
+++ b/dev-python/pypy/files/5.7.1_all_distutils_cxx.patch
@@ -0,0 +1,388 @@
+From 9bf4611231faa0dc9ae64c6a7a8b55a3290a3ca2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 25 Apr 2017 07:14:11 +0200
+Subject: [PATCH] Fancy patch for distutils C++ support, rebased for pypy5.7
+
+http://bugs.python.org/issue1222585
+http://bugs.gentoo.org/show_bug.cgi?id=599918
+---
+ _osx_support.py                | 10 ++---
+ distutils/cygwinccompiler.py   | 21 ++++++++--
+ distutils/emxccompiler.py      | 14 +++++--
+ distutils/sysconfig_cpython.py | 26 ++++++++++---
+ distutils/sysconfig_pypy.py    | 37 ++++++++++++++----
+ distutils/unixccompiler.py     | 55 ++++++++++++++-------------
+ 6 files changed, 112 insertions(+), 51 deletions(-)
+
+diff --git a/_osx_support.py b/_osx_support.py
+index d2aaae7..8bcdb05 100644
+--- a/_osx_support.py
++++ b/_osx_support.py
+@@ -14,13 +14,13 @@ __all__ = [
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
+index 767400c..7133097 100644
+--- a/distutils/cygwinccompiler.py
++++ b/distutils/cygwinccompiler.py
+@@ -120,8 +120,10 @@ class CygwinCCompiler (UnixCCompiler):
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -135,9 +137,13 @@ class CygwinCCompiler (UnixCCompiler):
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -163,8 +169,12 @@ class CygwinCCompiler (UnixCCompiler):
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+@@ -330,9 +340,14 @@ class Mingw32CCompiler (CygwinCCompiler):
+         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
+                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
+                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
++                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
+                              linker_exe='gcc%s' % no_cygwin,
+                              linker_so='%s%s %s %s'
+                                     % (self.linker_dll, no_cygwin,
++                                       shared_option, entry_point),
++                             linker_exe_cxx='g++%s' % no_cygwin,
++                             linker_so_cxx='%s%s %s %s'
++                                    % (self.linker_dll_cxx, no_cygwin,
+                                        shared_option, entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff --git a/distutils/emxccompiler.py b/distutils/emxccompiler.py
+index a017205..bdc532c 100644
+--- a/distutils/emxccompiler.py
++++ b/distutils/emxccompiler.py
+@@ -65,8 +65,12 @@ class EMXCCompiler (UnixCCompiler):
+         # XXX optimization, warnings etc. should be customizable.
+         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
+-                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
++                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
++                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
++                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
+ 
+         # want the gcc library statically linked (so that we don't have
+         # to distribute a version dependent on the compiler we have)
+@@ -83,8 +87,12 @@ class EMXCCompiler (UnixCCompiler):
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
+index 35f39e4..8dd032d 100644
+--- a/distutils/sysconfig_cpython.py
++++ b/distutils/sysconfig_cpython.py
+@@ -171,10 +171,12 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
+-                            'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SO', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -189,19 +191,27 @@ def customize_compiler(compiler):
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -210,13 +220,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = so_ext
+diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
+index 368f232..4fe1f08 100644
+--- a/distutils/sysconfig_pypy.py
++++ b/distutils/sysconfig_pypy.py
+@@ -67,6 +67,7 @@ def _init_posix():
+     g['CFLAGS'] = "-DNDEBUG -O2"
+     g['CCSHARED'] = "-fPIC"
+     g['LDSHARED'] = "gcc -pthread -shared"
++    g['LDCXXSHARED'] = "g++ -pthread -shared"
+     g['SO'] = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
+     g['AR'] = "ar"
+     g['ARFLAGS'] = "rc"
+@@ -85,6 +86,7 @@ def _init_posix():
+             # just a guess
+             arch = platform.machine()
+         g['LDSHARED'] += ' -undefined dynamic_lookup'
++        g['LDCXXSHARED'] += ' -undefined dynamic_lookup'
+         g['CC'] += ' -arch %s' % (arch,)
+ 
+     global _config_vars
+@@ -168,37 +170,52 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
+-                            'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SO', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+-            if (sys.platform == 'darwin'
++            if (True
+                     and 'LDSHARED' not in os.environ
+                     and ldshared.startswith(cc)):
+                 # On OS X, if CC is overridden, use that as the default
+                 #       command for LDSHARED as well
++                # Gentoo: s/OS X/every system/
+                 ldshared = newcc + ldshared[len(cc):]
+             cc = newcc
+         if 'CXX' in os.environ:
+-            cxx = os.environ['CXX']
++            newcxx = os.environ['CXX']
++            if ('LDCXXSHARED' not in os.environ
++                    and ldcxxshared.startswith(cxx)):
++                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
++            cxx = newcxx
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -207,13 +224,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = so_ext
+diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
+index dee88a5..558b568 100644
+--- a/distutils/unixccompiler.py
++++ b/distutils/unixccompiler.py
+@@ -55,14 +55,17 @@ class UnixCCompiler(CCompiler):
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -129,12 +132,19 @@ class UnixCCompiler(CCompiler):
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError, msg:
+             raise CompileError, msg
+ 
+@@ -191,23 +201,16 @@ class UnixCCompiler(CCompiler):
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i = i + 1
+-
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+-- 
+2.12.2
+
diff --git a/dev-python/pypy/files/5.8.0_all_distutils_cxx.patch b/dev-python/pypy/files/5.8.0_all_distutils_cxx.patch
new file mode 100644
index 000000000000..f0268e296954
--- /dev/null
+++ b/dev-python/pypy/files/5.8.0_all_distutils_cxx.patch
@@ -0,0 +1,388 @@
+From 9bf4611231faa0dc9ae64c6a7a8b55a3290a3ca2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 25 Apr 2017 07:14:11 +0200
+Subject: [PATCH] Fancy patch for distutils C++ support, rebased for pypy5.7
+
+http://bugs.python.org/issue1222585
+http://bugs.gentoo.org/show_bug.cgi?id=599918
+---
+ _osx_support.py                | 10 ++---
+ distutils/cygwinccompiler.py   | 21 ++++++++--
+ distutils/emxccompiler.py      | 14 +++++--
+ distutils/sysconfig_cpython.py | 26 ++++++++++---
+ distutils/sysconfig_pypy.py    | 37 ++++++++++++++----
+ distutils/unixccompiler.py     | 55 ++++++++++++++-------------
+ 6 files changed, 112 insertions(+), 51 deletions(-)
+
+diff --git a/_osx_support.py b/_osx_support.py
+index d2aaae7..8bcdb05 100644
+--- a/_osx_support.py
++++ b/_osx_support.py
+@@ -14,13 +14,13 @@ __all__ = [
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
+index 767400c..7133097 100644
+--- a/distutils/cygwinccompiler.py
++++ b/distutils/cygwinccompiler.py
+@@ -120,8 +120,10 @@ class CygwinCCompiler (UnixCCompiler):
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -135,9 +137,13 @@ class CygwinCCompiler (UnixCCompiler):
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -163,8 +169,12 @@ class CygwinCCompiler (UnixCCompiler):
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+@@ -330,9 +340,14 @@ class Mingw32CCompiler (CygwinCCompiler):
+         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
+                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
+                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
++                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
+                              linker_exe='gcc%s' % no_cygwin,
+                              linker_so='%s%s %s %s'
+                                     % (self.linker_dll, no_cygwin,
++                                       shared_option, entry_point),
++                             linker_exe_cxx='g++%s' % no_cygwin,
++                             linker_so_cxx='%s%s %s %s'
++                                    % (self.linker_dll_cxx, no_cygwin,
+                                        shared_option, entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff --git a/distutils/emxccompiler.py b/distutils/emxccompiler.py
+index a017205..bdc532c 100644
+--- a/distutils/emxccompiler.py
++++ b/distutils/emxccompiler.py
+@@ -65,8 +65,12 @@ class EMXCCompiler (UnixCCompiler):
+         # XXX optimization, warnings etc. should be customizable.
+         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
+-                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
++                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
++                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
++                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
+ 
+         # want the gcc library statically linked (so that we don't have
+         # to distribute a version dependent on the compiler we have)
+@@ -83,8 +87,12 @@ class EMXCCompiler (UnixCCompiler):
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
+index 35f39e4..8dd032d 100644
+--- a/distutils/sysconfig_cpython.py
++++ b/distutils/sysconfig_cpython.py
+@@ -171,10 +171,12 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
+-                            'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SO', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -189,19 +191,27 @@ def customize_compiler(compiler):
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -210,13 +220,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = so_ext
+diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
+index 368f232..4fe1f08 100644
+--- a/distutils/sysconfig_pypy.py
++++ b/distutils/sysconfig_pypy.py
+@@ -67,6 +67,7 @@ def _init_posix():
+     g['CFLAGS'] = "-DNDEBUG -O2"
+     g['CCSHARED'] = "-fPIC"
+     g['LDSHARED'] = "cc -pthread -shared"
++    g['LDCXXSHARED'] = "c++ -pthread -shared"
+     g['SO'] = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
+     g['AR'] = "ar"
+     g['ARFLAGS'] = "rc"
+@@ -85,6 +86,7 @@ def _init_posix():
+             # just a guess
+             arch = platform.machine()
+         g['LDSHARED'] += ' -undefined dynamic_lookup'
++        g['LDCXXSHARED'] += ' -undefined dynamic_lookup'
+         g['CC'] += ' -arch %s' % (arch,)
+ 
+     global _config_vars
+@@ -168,37 +170,52 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
+-                            'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SO', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+-            if (sys.platform == 'darwin'
++            if (True
+                     and 'LDSHARED' not in os.environ
+                     and ldshared.startswith(cc)):
+                 # On OS X, if CC is overridden, use that as the default
+                 #       command for LDSHARED as well
++                # Gentoo: s/OS X/every system/
+                 ldshared = newcc + ldshared[len(cc):]
+             cc = newcc
+         if 'CXX' in os.environ:
+-            cxx = os.environ['CXX']
++            newcxx = os.environ['CXX']
++            if ('LDCXXSHARED' not in os.environ
++                    and ldcxxshared.startswith(cxx)):
++                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
++            cxx = newcxx
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -207,13 +224,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = so_ext
+diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
+index dee88a5..558b568 100644
+--- a/distutils/unixccompiler.py
++++ b/distutils/unixccompiler.py
+@@ -55,14 +55,17 @@ class UnixCCompiler(CCompiler):
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -129,12 +132,19 @@ class UnixCCompiler(CCompiler):
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError, msg:
+             raise CompileError, msg
+ 
+@@ -191,23 +201,16 @@ class UnixCCompiler(CCompiler):
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i = i + 1
+-
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+-- 
+2.12.2
+
diff --git a/dev-python/pypy/metadata.xml b/dev-python/pypy/metadata.xml
new file mode 100644
index 000000000000..d82bf530e9e6
--- /dev/null
+++ b/dev-python/pypy/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alicef@gentoo.org</email>
+		<name>Alice Ferrazzi</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="low-memory">Build using PyPy with the engine configured towards low memory footprint. \
+			This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86,
+			at the cost of lengthened build time. Please note that you will need an extra ~1G of extra RAM or \
+			swap since the translation memory (unused at the time) is not freed when the C compiler is spawned.</flag>
+		<flag name="sandbox">Enable sandboxing functionality</flag>
+		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
+	</use>
+	<upstream>
+		<remote-id type="bitbucket">pypy/pypy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pypy/pypy-5.6.0.ebuild b/dev-python/pypy/pypy-5.6.0.ebuild
new file mode 100644
index 000000000000..a6b8dc6a26ee
--- /dev/null
+++ b/dev-python/pypy/pypy-5.6.0.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+inherit check-reqs eutils multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
+
+# note: remember to update this to newest dev-lang/python:2.7 on bump
+CPY_PATCHSET_VERSION="2.7.11-0"
+MY_P=pypy2-v${PV}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~djc/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/41"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 doc gdbm +jit libressl low-memory ncurses sandbox +shadowstack sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	bzip2? ( app-arch/bzip2:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy-bin:0"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	${PYTHON_DEPS}
+	test? ( dev-python/pytest )"
+
+S="${WORKDIR}/${MY_P}-src"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use low-memory; then
+			if ! python_is_installed pypy; then
+				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+				eerror
+				eerror "  $ emerge -1v dev-python/pypy-bin"
+				eerror
+				eerror "before attempting to build dev-python/pypy[low-memory]."
+				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
+			fi
+
+			CHECKREQS_MEMORY="1750M"
+			use amd64 && CHECKREQS_MEMORY="3500M"
+		else
+			CHECKREQS_MEMORY="3G"
+			use amd64 && CHECKREQS_MEMORY="6G"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_pretend
+
+		if python_is_installed pypy; then
+			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
+				einfo "Using already-installed PyPy to perform the translation."
+				local EPYTHON=pypy
+			else
+				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+				einfo "recommends using PyPy for that. If you wish to do so, please unset"
+				einfo "the EPYTHON variable."
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \
+		"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \
+		"${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
+
+	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
+	epatch "${FILESDIR}"/5.6.0_all_distutils_cxx.patch \
+		"${WORKDIR}"/patches/22_all_turkish_locale.patch \
+		"${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
+	popd > /dev/null || die
+
+	epatch_user
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--shared
+		$(usex jit -Ojit -O2)
+		$(usex shadowstack --gcrootfinder=shadowstack '')
+		$(usex sandbox --sandbox '')
+
+		${jit_backend}
+		--make-jobs=$(makeopts_jobs)
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${PYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${PYTHON}" --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to make them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+
+	# copy back to make sys.prefix happy
+	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
+	pax-mark m pypy-c libpypy-c.so
+
+	use doc && emake -C pypy/doc html
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c 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}"
+	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
+
+	# Install docs
+	use doc && dohtml -r pypy/doc/_build/html/
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy-c
+	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${dest}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${dest}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy/pypy-5.7.1.ebuild b/dev-python/pypy/pypy-5.7.1.ebuild
new file mode 100644
index 000000000000..be54da7a981e
--- /dev/null
+++ b/dev-python/pypy/pypy-5.7.1.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
+
+# note: remember to update this to newest dev-lang/python:2.7 on bump
+CPY_PATCHSET_VERSION="2.7.13-0"
+MY_P=pypy2-v${PV}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/41"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 doc gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	bzip2? ( app-arch/bzip2:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy-bin:0"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	${PYTHON_DEPS}
+	test? ( dev-python/pytest )"
+
+S="${WORKDIR}/${MY_P}-src"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use low-memory; then
+			if ! python_is_installed pypy; then
+				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+				eerror
+				eerror "  $ emerge -1v dev-python/pypy-bin"
+				eerror
+				eerror "before attempting to build dev-python/pypy[low-memory]."
+				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
+			fi
+
+			CHECKREQS_MEMORY="1750M"
+			use amd64 && CHECKREQS_MEMORY="3500M"
+		else
+			CHECKREQS_MEMORY="3G"
+			use amd64 && CHECKREQS_MEMORY="6G"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_pretend
+
+		if python_is_installed pypy; then
+			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
+				einfo "Using already-installed PyPy to perform the translation."
+				local EPYTHON=pypy
+			else
+				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+				einfo "recommends using PyPy for that. If you wish to do so, please unset"
+				einfo "the EPYTHON variable."
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
+	# disarm implicit -flto
+	eapply "${FILESDIR}"/5.7.1-kill-flto.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.7.1_all_distutils_cxx.patch
+	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--shared
+		$(usex jit -Ojit -O2)
+		$(usex sandbox --sandbox '')
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${PYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${PYTHON}" --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to make them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+
+	# copy back to make sys.prefix happy
+	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
+	pax-mark m pypy-c libpypy-c.so
+
+	use doc && emake -C pypy/doc html
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c 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}"
+	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
+
+	# Install docs
+	use doc && dodoc -r pypy/doc/_build/html
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy-c
+	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${dest}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${dest}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy/pypy-5.8.0.ebuild b/dev-python/pypy/pypy-5.8.0.ebuild
new file mode 100644
index 000000000000..8317a80f1480
--- /dev/null
+++ b/dev-python/pypy/pypy-5.8.0.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
+
+# note: remember to update this to newest dev-lang/python:2.7 on bump
+CPY_PATCHSET_VERSION="2.7.13-0"
+MY_P=pypy2-v${PV}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/41"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 doc gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	bzip2? ( app-arch/bzip2:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy-bin:0"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	${PYTHON_DEPS}
+	test? ( dev-python/pytest )"
+
+S="${WORKDIR}/${MY_P}-src"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use low-memory; then
+			if ! python_is_installed pypy; then
+				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+				eerror
+				eerror "  $ emerge -1v dev-python/pypy-bin"
+				eerror
+				eerror "before attempting to build dev-python/pypy[low-memory]."
+				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
+			fi
+
+			CHECKREQS_MEMORY="1750M"
+			use amd64 && CHECKREQS_MEMORY="3500M"
+		else
+			CHECKREQS_MEMORY="3G"
+			use amd64 && CHECKREQS_MEMORY="6G"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_pretend
+
+		if python_is_installed pypy; then
+			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
+				einfo "Using already-installed PyPy to perform the translation."
+				local EPYTHON=pypy
+			else
+				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+				einfo "recommends using PyPy for that. If you wish to do so, please unset"
+				einfo "the EPYTHON variable."
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
+
+	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_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--shared
+		$(usex jit -Ojit -O2)
+		$(usex sandbox --sandbox '')
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${PYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${PYTHON}" --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to make them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+
+	# copy back to make sys.prefix happy
+	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
+	pax-mark m pypy-c libpypy-c.so
+
+	use doc && emake -C pypy/doc html
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c 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}"
+	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
+
+	# Install docs
+	use doc && dodoc -r pypy/doc/_build/html
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy-c
+	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${dest}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${dest}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
new file mode 100644
index 000000000000..eaf3b675ad26
--- /dev/null
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+EHG_REPO_URI="https://bitbucket.org/pypy/pypy"
+inherit check-reqs mercurial pax-utils python-any-r1 toolchain-funcs versionator
+
+# note: remember to update this to newest dev-lang/python:2.7 on bump
+CPY_PATCHSET_VERSION="2.7.13-0"
+MY_P=pypy2-v${PV}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/41"
+KEYWORDS=""
+IUSE="bzip2 doc gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	bzip2? ( app-arch/bzip2:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy-bin:0"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	${PYTHON_DEPS}
+	test? ( dev-python/pytest )"
+
+S="${WORKDIR}/${MY_P}-src"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use low-memory; then
+			if ! python_is_installed pypy; then
+				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+				eerror
+				eerror "  $ emerge -1v dev-python/pypy-bin"
+				eerror
+				eerror "before attempting to build dev-python/pypy[low-memory]."
+				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
+			fi
+
+			CHECKREQS_MEMORY="1750M"
+			use amd64 && CHECKREQS_MEMORY="3500M"
+		else
+			CHECKREQS_MEMORY="3G"
+			use amd64 && CHECKREQS_MEMORY="6G"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_pretend
+
+		if python_is_installed pypy; then
+			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
+				einfo "Using already-installed PyPy to perform the translation."
+				local EPYTHON=pypy
+			else
+				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+				einfo "recommends using PyPy for that. If you wish to do so, please unset"
+				einfo "the EPYTHON variable."
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	default
+	mercurial_src_unpack
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
+
+	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_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--shared
+		$(usex jit -Ojit -O2)
+		$(usex sandbox --sandbox '')
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${PYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${PYTHON}" --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to make them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+
+	# copy back to make sys.prefix happy
+	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
+	pax-mark m pypy-c libpypy-c.so
+
+	use doc && emake -C pypy/doc html
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c 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}"
+	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
+
+	# Install docs
+	use doc && dodoc -r pypy/doc/_build/html
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy-c
+	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${dest}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${dest}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
new file mode 100644
index 000000000000..c225826f0aad
--- /dev/null
+++ b/dev-python/pypy3-bin/Manifest
@@ -0,0 +1,27 @@
+AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 551 SHA256 831bacb5d5c7b23699971aedf7b07a93654ba0cf8d700babe369330115c29896 SHA512 9b6b5ede218cea96a424376677d52cbd7c23cd7f569756403849523fc79f8db27190e0bd80501a9e428688fd393397d2fa4e59a59607212993f4ac6d93b18733 WHIRLPOOL 7124a9a1ec1a65bf1488060189306780e8e6890381a20fab27b00e031e59096b80d0fcd5193d1cd48393d51f4619bb294b846da6190b784aef92f1b09ff2acb8
+AUX 4.0.0-gentoo-path.patch 1906 SHA256 4f01ad3317e62147346d6548e0d5cf51bb1b01c4e4d34e48eb57dbefdaa82140 SHA512 ddf5664d289b3134a30e675a91ab9aec1a81c0df7bd4f6b0b43cd6fdbf99aca8e6d123c1df41f061784e5fe1a0a3ed4a7ebcd16790d76fb8a28cec442037d747 WHIRLPOOL 8e3b2d477a3db79874f679473032f83478bfbcce0d9df1d782f30fb5fcabeb2556efd7a1da85e7d8a0243dbf80ffbef96982d45252beb6c37fbce2ac23edc50e
+AUX 5.2.0-distutils-c++.patch 14234 SHA256 a07e65f2b7e8f8f52af45aec6a146e09390d30856118978d2e4b4d2c7e2967c9 SHA512 dfc404a71f0314988905b976d6beb1e9b8368006840cc199a94eae47a86ab7e2be92d86c53be349928fc0a8b12f3a78c60b07476bfc27cc0f7a383970a2e2e95 WHIRLPOOL 769bb355adaadb980cbb7c77faa8b47b356dc471a25cd1d1b3bc604f7eb84aba6b39e38100c9d1ad5e1dd06fc562a640437917b0c770d8e8ad02627bc309f6c1
+AUX 5.7.1_all_distutils_cxx.patch 15897 SHA256 cc6475551f74f416bd77eec58bab9ab48d6c5fe3f0c1595e197ffe1080bce44b SHA512 f82c4efb258a0ab029faaad35fbd85a9bf9aa98e12d9317920a7872f2f0db75668a37506fd69a3838286e7349948a60e158360b1f3f5d671e91b07a0e56af809 WHIRLPOOL 08c193c5a41ff85d14e6443aa1ba7c3141a7c9ebf15cc6ed99f7e705efe04916bfe3c305ec23f36448521a0d79d3121ab9363491458d7271144914fe6420efbf
+AUX 5.8.0_all_distutils_cxx.patch 15896 SHA256 cbedcf9e08280a99a5f2bf1a033e2b2e17bb0ee2bf00ce82b87b6f89df2718a6 SHA512 195dbc6cc75179c090b7f461f36e3fd19e341343f2d50c0a4ff24032da1074581578d51d62dbfc04349a8a46b9332097bb310bc923ea3813bf1afce91edfcea3 WHIRLPOOL 5ee53a44e6f85f0ceb93843d35856ddfe7da56662836c7ff25e9698e1bed0d75d5d72e4b5c8ee12b7ce4286903be46a6384a243f7f40e4918cfeaaaeca8f9209
+AUX python-3.5-distutils-OO-build.patch 3627 SHA256 9b0b86d8424304fe87a460bbf5ab503811d77ae4e557ad0c4081150a0af89a1f SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511 WHIRLPOOL 4730a9110662a3c45ab5f3e842ebc2f81ecfd98e4e844e71a0fe56d41baaa6bb01aafe313ec8dd12bea40c956ec01f1a68d6bca3d695bf65705a811f4afd0289
+DIST pypy3-bin-5.5.0_alpha-amd64+bzip2+jit+ncurses+shadowstack.tar.lz 10860820 SHA256 46437ffdc3327b11fb116071ec8bb5c93aa94ac143a7105cadb678be708faeb5 SHA512 ed93e8452c82e627699aa876cfa55d2fd84d7ec7c6698e2a20bda2a5bb564def68b51a2e62ca45a36f88805cbca453b0a8a6565016428c4eef22a5539bb24647 WHIRLPOOL 858befe94e009628cee4e8527aaaa1e8e92fe264ff91b382fed74ba31314eccf914c403b376792eec322bcead140e8159d255b265bc88832accb3d65d16fd78c
+DIST pypy3-bin-5.5.0_alpha-amd64+bzip2+jit+ncurses.tar.lz 11610069 SHA256 a400bd9c2df450647278dec93d397e4d040fd058f78309e8cdaff8b0792b8c01 SHA512 e0dca44387c03306691c63263aae7d484a5244b686cfd57315d7c4bd630fd5fba888d8cb57855d3f84c9bda576194597e4048877990456812f747d7d099b5819 WHIRLPOOL 3f61e0b02bbfc77a413fe38aca59c626857b1b8a05b952e7a832e4d3cc20dd5d98d9173161d08cd92587e2a7b44a2a55ba61f516c632611cb4d16a20f3eb4e74
+DIST pypy3-bin-5.5.0_alpha-amd64+bzip2+ncurses.tar.lz 6243046 SHA256 34ae3b199194a90f0867e95306b6530faa3acafb9dc9ef077ba4e229f3a5d0de SHA512 4fdae8644c40734281d81adb5c8273a0f2429c47bff8672a7f98988195c6e9ab82d9a1443e2d1c1bc2ca75d471c112ac40ac403e75808d8610dce94fee15031b WHIRLPOOL ca2c5b4f0334f1193ef5cd6bf7ebe9034fbd176f0ce34b6302125c6e2b175e69129ca53d21ef34327bb064cf90af907c10bd81d62ccb429298020043a41fdfa0
+DIST pypy3-bin-5.5.0_alpha-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz 8656783 SHA256 52bff882b65d4664661c70657c927d69cbc0b9377c7d0ae20ed8ca562d8e13f4 SHA512 6ae588077d92d1c4d494e2b657a3d963989e3f3cf2d689ec4cf460f196d69234d13b88160ebb46334af0733f5ec13720abb0d2bc3184c6744b9218a8a5f6440a WHIRLPOOL 81593ba510a71cc7ef47f3013e89e468bb5671da32a0ca5cdbfc1579cd2df90ce3b53ed59f2974243bc1b21eb8ea8d509d66ea4d2539c56f8a15ba9a3e7c6127
+DIST pypy3-bin-5.5.0_alpha-x86+bzip2+jit+ncurses+sse2.tar.lz 9549100 SHA256 fdd95b1fb91d669e1861b2dff52b97af0d01aaedf61eb11f07c8f92cd398c7f6 SHA512 2ac8cb894cafae8da81bddb601185941b42933aa41bda8d1696eb70ca22cbeaa0c23385e4a4cd640c46f9e301acfc2f9bc89adaf5a7f5cbef4bc23ca8af550bb WHIRLPOOL e4c21be6b52468135ff6e53434a8ae8c0450880d0f5c8d37bdc18a99f9ceb0ae101c82b8a7a6ae2088297f9dbfa7146fcf80a24948dd3316d56f0f798cc7ecec
+DIST pypy3-bin-5.5.0_alpha-x86+bzip2+ncurses+sse2.tar.lz 5231919 SHA256 6a9848bc2d1d948a91bc15ce20768bc7024726ec7afdd2767bfba25926a35c7f SHA512 fbdc955b1c2873d07e8ad36dd697fbb21932ac50726e76fed20da1fca218b329f18c81b8b4a65cd7ece26091859529d5bb56c7ed2efaf14ae8d9988581d88d9b WHIRLPOOL 08ffd98122e4745af4e785ebb986cd7d185472ec0879bb9dc6070b14de6d35e4177e35a85326468329a06617df03880744e23a6bef825f67d40476c92c7d430e
+DIST pypy3-bin-5.5.0_alpha-x86+bzip2+ncurses.tar.lz 5232239 SHA256 d808aa66ecd5b3d868554ad29b0eee3948e3de69390826bcb5e6b8ceb2408037 SHA512 5e107304537855f459cc7bee92d3b2d05e16f2421d2249205c34f40f1f9415ca657f3e0842c79de98fed732e0a2752b280b44880f96eeeaa0d50d4b4bf2c525c WHIRLPOOL 562fe0c00aeb83a74d9f1ccba4ffed70b5efa6592ef04c82ea06c38afc560e97aa02b835de8b69925690149c1d6803ecfbcad7eefd59bdf4462bdbbbf82c2577
+DIST pypy3-bin-5.7.1-amd64+bzip2+jit+ncurses.tar.lz 10329767 SHA256 041d6b6af48ec4a2de0062a2ae48a3d2a8e827d450b76fc4232f4a9eca8cbc47 SHA512 a5959d4bd5d267ea0386e4fab4b86b83f7597aaa3174281f15f180e0c83125af1437c0a693b0d534929c7199df5958a5f48867c72d1ce24494b2238523cde2aa WHIRLPOOL 8eef898eac108726b89751e6af80c112f46800ab1dd4efad118e71adb6c7cbaccbe46360da3be7d5ad5702262a2e377bfc530b7519fc38532123884c84e0c1ee
+DIST pypy3-bin-5.7.1-amd64+bzip2+ncurses.tar.lz 6352387 SHA256 0243a016a7b836af72e6e1172f2a4516b9705169a9ba2318093b5c3005917766 SHA512 a63b02dfc11b7675bd4ccceb58801aeb1fd40d0245196dd7fa9f646e4618f46c8e6c4d95072c6432381064d37bc13cb74fbd383d19f8769f069827a8969e7a95 WHIRLPOOL f09b82a6c8a4dada7597bfbe0b2ecd07d90d724eae3d2cc6f35a69c0f219b420236ed8ad37024ad8f9516d729389cbe919f58a48cf1aa323c3a74220c62b8aa3
+DIST pypy3-bin-5.8.0-amd64+bzip2+jit+ncurses.tar.lz 10706804 SHA256 fd8e3550426d747f65d52fb2edbe5b9133c1946eed5f1ada5a454fe5a99b489f SHA512 38e46503ba50987a36b68e7d6316b64a00c1e2fa0d2d0b0e0e517bbfa96cb777522346d2c4a78cc7bdf44fa237453dc97867f9323785ba38b21c1f1058d5e701 WHIRLPOOL 59ecc9f9c5d4a29819d0911cc1402f38bd9708ec3e28ba90cb33159b88e11a150a33390c2a73e26831de578ec77598018945e001a1bc3e8f2659b17743a3cdf6
+DIST pypy3-bin-5.8.0-amd64+bzip2+ncurses.tar.lz 6626453 SHA256 f840fba90a52e0bfaf9f7f3197f47823154709b86b33dbe61df1f721d8eb46ef SHA512 51d418668c48f8e2d740264855e193353900d56893c0fc81de09e8fab338a36a696a725dd3387ee1d626f82e8319b797bfa4957a5cc8f0b11610b3e6ece67539 WHIRLPOOL 45348517cb0bf8e98ac53149314288716cf8ee972505c354192a46b6472fff694cc037689f2f61707396ed55b9baebe35fa4e99695789f93cb8edeaa08e71fe2
+DIST pypy3-v5.7.1-src.tar.bz2 28811162 SHA256 40ece0145282980ac121390f13709404c0532896507d5767496381180b631bd0 SHA512 f8ead8214ad7d89fe80e24d97b13ece7f2c80b2f11446257a2eab0e3025fc7d8fec26474b0e9eb2b2e3ccd629532dd062829459361b601add12e40793bd5aa60 WHIRLPOOL 180a5cb39c9a5e3840f4940463dd9cccf44486f11a657d2ac644d1eac4561068f08905fdadc495918fb0ceaf018d4b85a3e5756ca6d99a020310b46bdb16ef87
+DIST pypy3-v5.8.0-src.tar.bz2 28986883 SHA256 9d090127335c3c0fd2b14c8835bf91752e62756e55ea06aad3353f24a6854223 SHA512 d78b4c899a5643028664365ed973a7b292a8e5b3989cc75203cd381ea3cda7dd73121c574726e23dca86e8364fcfcf42c372c9deee438c805f30d6e1c4ac115a WHIRLPOOL b7567fa21e3ded400a72ec06197184df37e0b5893adfb55622ea9afb668bfbda7ebbecd9b80660efef42f160838966d103c4181a9b07355e873981b35f4bf104
+DIST pypy3.3-v5.5.0-alpha-src.tar.bz2 25122033 SHA256 d5591c34d77253e9ed57d182b6f49585b95f7c09c3e121f0e8630e5a7e75ab5f SHA512 b2cf9700e45c452293297edffe08e572dffc3c567026b4b5d9165c1ba1b4d858ffc8a6754f5f28781020016c36440e5c02d07562d075b12444c9c32ea5dd2168 WHIRLPOOL 6bde174969413c55d6d077cd14e737c4f034f19935536af1bffaf3a1caa456d2bf6850760a18c274ad99089bd5ab7331d7d185f914cd6c69f708abf857d35df3
+DIST python-gentoo-patches-3.3.5-0.tar.xz 12892 SHA256 a7240de9598033cb40f8f273d8104d4e2b1dcaea028d45ac28efaa3c680ff6f7 SHA512 27eef4c2b3f631b000db3f6a5c426d9b498d63a08fe82b1ab7c2c010fb72208109461a5f008d47703852526655b70a734ea95be8742897026db5750bb9cc9d16 WHIRLPOOL edab9222d7da94cab3b1de0e1a27c6c7dbd49194b813a0a1cf9e532063029c4e4f19151c9f4878eeabed3168ff1f97eae7f008280c7ed2897fc14c5516c68d7e
+EBUILD pypy3-bin-5.5.0_alpha.ebuild 6155 SHA256 2ecdd3d55dee03eb40a2e1cea70fdb95c34466d42a082e96ee8d1f7cda790241 SHA512 b91c633f0688fe20f4db14fe374225a5f30fb1aeddf6c160fa74d273b1859f6702242cd373db4222a06b6a923051ce11569a32f097b6fe8a7e96ca56dfac06aa WHIRLPOOL 5e16861cc4f5380750b15ade16fc84ff1270ae84ce5fcde91a649fa859a88d09259f1ca5f718bbe1618fcaf7dcce24c40f8a6c055b527774269d14302b2b8a7b
+EBUILD pypy3-bin-5.7.1-r1.ebuild 5345 SHA256 0755a2418e5be596f88c334a05651de62e43f4159ce6dced62778ee13b192a7e SHA512 22d5f22f531b675d9db272db7ffab8ede77a1fcf883ea9c2b7d67f3eb8837d83abbed3005f8bc60f904d746cc5b548d7823f6984189a6129318d062a7055413e WHIRLPOOL 815fd636b23cf9e022081faaf8ebe9780b4c6b354d1b6f3435396f9187e0401546ba1b271ffeaed8f157ac51b190b82fa351d569a148fd7ffe0a2c9505688fa5
+EBUILD pypy3-bin-5.8.0-r1.ebuild 5345 SHA256 8737f3cd44ddfcab4482136f839bb9ac57c6a141b5200ca3e50efde9151bbca9 SHA512 e3d34a52716a66b42e37c77dc7d4b3f98ac7a80bc511156fd63ce47c65f549441a1b96667df58d9c2bb51e3b7280244c8619744ba9ccfccc06b73df365cb2d1b WHIRLPOOL f0afc372fd717f09023b650bb1bf5babe775a121357f986683b47add213aad924436cca6243b916f4dc68dff096f1d5cd1c30fb1d4917556aa613d5b433f2aae
+MISC ChangeLog 7700 SHA256 ba2326f1007aebe17871ea81213c69cc07c7dc334bbc267a50353ba79c0c4197 SHA512 e8b2817533bcacc09d120de24278ae3731235f26ce7120fb3f247fb202657667cf4b056e005786b40d2462d6e65f74dc94175e242f209725d24285192b64c2ac WHIRLPOOL de020e520c4befef4ca2bdf167d28ec7bd1b5ced194ecfb58c05d086e77c35abe0e17a20f4a65750c221aae0d1ca76c1cbbc524b9251a97584096aa5cd92ec65
+MISC ChangeLog-2015 975 SHA256 9ec6d637bd1373be724ded99f8deaa041e5587508f68cf15c8537f25235709fb SHA512 58290569acccc81298a0793b797e858365767629c94bc6d8b08790341cfa0c3efd6116c6c54e4585d65d158256767dd762a3eae431b8f3c0ca6571a98bb0bf34 WHIRLPOOL c52470823ec3e6e5b639fe454c705de58d02fd32155b72e49ae8cb94775839d9aee7b0b096f7128bde80f43a78dd6590a71daafc9bf52524161bcd548fc50947
+MISC metadata.xml 514 SHA256 418905501db31b0962ef487f62db5c376e6cce16be2e7513553049979dae1968 SHA512 a4f6fbf391b7f566b99cef0dc503d41ad1c0eb119187650b550697c4c10b394bae847fcd809eb9db2883f578e5bcf3416146941cabddc0632b2e10dd50fb0315 WHIRLPOOL a510d10c48a29615969f1332fb78e91b5036c3e7cc5456981a627f96b72bc3fb407b6023d7e564da4ccf4170925d3c3902a42074b11f9af105b200e7cfebe58f
diff --git a/dev-python/pypy3-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch b/dev-python/pypy3-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
new file mode 100644
index 000000000000..29d99dcfdb73
--- /dev/null
+++ b/dev-python/pypy3-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
@@ -0,0 +1,11 @@
+--- a/lib-python/3/distutils/unixccompiler.py
++++ b/lib-python/3/distutils/unixccompiler.py
+@@ -297,7 +297,7 @@
+         # this time, there's no way to determine this information from
+         # the configuration data stored in the Python installation, so
+         # we use this hack.
+-        compiler = os.path.basename(sysconfig.get_config_var("CC"))
++        compiler = os.path.basename(self.compiler[0])
+         if sys.platform[:6] == "darwin":
+             # MacOSX's linker doesn't understand the -R flag at all
+             return "-L" + dir
diff --git a/dev-python/pypy3-bin/files/4.0.0-gentoo-path.patch b/dev-python/pypy3-bin/files/4.0.0-gentoo-path.patch
new file mode 100644
index 000000000000..cf96d3fb2a53
--- /dev/null
+++ b/dev-python/pypy3-bin/files/4.0.0-gentoo-path.patch
@@ -0,0 +1,50 @@
+From 165e05bbdc93e54411217c0198d0a5cbb9de4e33 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 27 Nov 2015 17:02:42 +0100
+Subject: [PATCH] Gentoo: override paths for system-wide install based on
+ sys.prefix
+
+Override all default distutils install paths to ones suitable for
+system-wide install when sys.prefix indicates we're running the Gentoo
+system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
+
+Fixes: https://bugs.gentoo.org/462306
+Fixes: https://bugs.gentoo.org/465546
+---
+ lib-python/3/distutils/command/install.py | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/lib-python/3/distutils/command/install.py b/lib-python/3/distutils/command/install.py
+index fc43951..fed5218 100644
+--- a/lib-python/3/distutils/command/install.py
++++ b/lib-python/3/distutils/command/install.py
+@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
++    'gentoo': {
++        'purelib': '$base/site-packages',
++        'platlib': '$base/site-packages',
++        'headers': '$base/include',
++        'scripts': '@EPREFIX@/usr/bin',
++        'data'   : '@EPREFIX@/usr',
++        },
+     }
+ 
+ # The keys to an installation scheme; if any new types of files are to be
+@@ -476,7 +483,11 @@ class install (Command):
+         # it's the caller's problem if they supply a bad name!
+         if (hasattr(sys, 'pypy_version_info') and
+             not name.endswith(('_user', '_home'))):
+-            name = 'pypy'
++            if self.install_base == os.path.normpath('@EPREFIX@/usr/@libdir@/pypy3'):
++                # override paths for system-wide install
++                name = 'gentoo'
++            else:
++                name = 'pypy'
+         scheme = INSTALL_SCHEMES[name]
+         for key in SCHEME_KEYS:
+             attrname = 'install_' + key
+-- 
+2.6.3
+
diff --git a/dev-python/pypy3-bin/files/5.2.0-distutils-c++.patch b/dev-python/pypy3-bin/files/5.2.0-distutils-c++.patch
new file mode 100644
index 000000000000..1251694107d8
--- /dev/null
+++ b/dev-python/pypy3-bin/files/5.2.0-distutils-c++.patch
@@ -0,0 +1,284 @@
+From e3afe6721897c8de830055621313bc0659518415 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 9 Jun 2016 20:48:10 +0200
+Subject: [PATCH] distutils c++ fixes, python3.3 patch updated for pypy3.3
+
+---
+ lib-python/3/_osx_support.py                | 10 +++---
+ lib-python/3/distutils/cygwinccompiler.py   | 21 +++++++++--
+ lib-python/3/distutils/emxccompiler.py      | 14 ++++++--
+ lib-python/3/distutils/sysconfig_cpython.py | 25 ++++++++++---
+ lib-python/3/distutils/unixccompiler.py     | 54 ++++++++++++++++-------------
+ 5 files changed, 83 insertions(+), 41 deletions(-)
+
+diff --git a/lib-python/3/_osx_support.py b/lib-python/3/_osx_support.py
+index 50b2d17..1d19599 100644
+--- a/lib-python/3/_osx_support.py
++++ b/lib-python/3/_osx_support.py
+@@ -14,13 +14,13 @@ __all__ = [
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+diff --git a/lib-python/3/distutils/cygwinccompiler.py b/lib-python/3/distutils/cygwinccompiler.py
+index e0074a1..1b383d3 100644
+--- a/lib-python/3/distutils/cygwinccompiler.py
++++ b/lib-python/3/distutils/cygwinccompiler.py
+@@ -124,8 +124,10 @@ class CygwinCCompiler(UnixCCompiler):
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -139,9 +141,13 @@ class CygwinCCompiler(UnixCCompiler):
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -165,8 +171,12 @@ class CygwinCCompiler(UnixCCompiler):
+                 raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError as msg:
+                 raise CompileError(msg)
+ 
+@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
+         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
+                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
+                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
++                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
+                              linker_exe='gcc%s' % no_cygwin,
+                              linker_so='%s%s %s %s'
+                                     % (self.linker_dll, no_cygwin,
++                                       shared_option, entry_point),
++                             linker_exe_cxx='g++%s' % no_cygwin,
++                             linker_so_cxx='%s%s %s %s'
++                                    % (self.linker_dll_cxx, no_cygwin,
+                                        shared_option, entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff --git a/lib-python/3/distutils/emxccompiler.py b/lib-python/3/distutils/emxccompiler.py
+index 3675f8d..17d2afa 100644
+--- a/lib-python/3/distutils/emxccompiler.py
++++ b/lib-python/3/distutils/emxccompiler.py
+@@ -63,8 +63,12 @@ class EMXCCompiler (UnixCCompiler):
+         # XXX optimization, warnings etc. should be customizable.
+         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
+-                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
++                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
++                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
++                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
+ 
+         # want the gcc library statically linked (so that we don't have
+         # to distribute a version dependent on the compiler we have)
+@@ -81,8 +85,12 @@ class EMXCCompiler (UnixCCompiler):
+                 raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError as msg:
+                 raise CompileError(msg)
+ 
+diff --git a/lib-python/3/distutils/sysconfig_cpython.py b/lib-python/3/distutils/sysconfig_cpython.py
+index b947988..3f19020 100644
+--- a/lib-python/3/distutils/sysconfig_cpython.py
++++ b/lib-python/3/distutils/sysconfig_cpython.py
+@@ -191,9 +191,12 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -208,19 +211,27 @@ def customize_compiler(compiler):
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -229,13 +240,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+diff --git a/lib-python/3/distutils/unixccompiler.py b/lib-python/3/distutils/unixccompiler.py
+index 6819d50..19345ee 100644
+--- a/lib-python/3/distutils/unixccompiler.py
++++ b/lib-python/3/distutils/unixccompiler.py
+@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -123,12 +126,19 @@ class UnixCCompiler(CCompiler):
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError as msg:
+             raise CompileError(msg)
+ 
+@@ -186,22 +196,16 @@ class UnixCCompiler(CCompiler):
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i += 1
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+-- 
+2.8.4
+
diff --git a/dev-python/pypy3-bin/files/5.7.1_all_distutils_cxx.patch b/dev-python/pypy3-bin/files/5.7.1_all_distutils_cxx.patch
new file mode 100644
index 000000000000..52a833f29d9e
--- /dev/null
+++ b/dev-python/pypy3-bin/files/5.7.1_all_distutils_cxx.patch
@@ -0,0 +1,342 @@
+From b2f2c9d23996d431d606ac7d8ed731a5302b4e97 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 25 Apr 2017 17:42:33 +0200
+Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5
+
+https://bugs.python.org/issue1222585
+---
+ _osx_support.py                | 10 +++---
+ distutils/cygwinccompiler.py   | 21 +++++++++--
+ distutils/sysconfig_cpython.py | 25 ++++++++++---
+ distutils/sysconfig_pypy.py    | 35 +++++++++++++++----
+ distutils/unixccompiler.py     | 54 ++++++++++++++++-------------
+ 5 files changed, 100 insertions(+), 45 deletions(-)
+
+diff --git a/_osx_support.py b/_osx_support.py
+index 13fcd8b..0525be1 100644
+--- a/_osx_support.py
++++ b/_osx_support.py
+@@ -14,13 +14,13 @@ __all__ = [
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
+index c879646..a6157fb 100644
+--- a/distutils/cygwinccompiler.py
++++ b/distutils/cygwinccompiler.py
+@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
+                 raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError as msg:
+                 raise CompileError(msg)
+ 
+@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
+         self.set_executables(compiler='gcc -O -Wall',
+                              compiler_so='gcc -mdll -O -Wall',
+                              compiler_cxx='g++ -O -Wall',
++                             compiler_so_cxx='g++ -mdll -O -Wall',
+                              linker_exe='gcc',
+                              linker_so='%s %s %s'
+                                         % (self.linker_dll, shared_option,
++                                           entry_point),
++                             linker_exe_cxx='g++',
++                             linker_so_cxx='%s %s %s'
++                                        % (self.linker_dll_cxx, shared_option,
+                                            entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
+index 573724d..0a04f33 100644
+--- a/distutils/sysconfig_cpython.py
++++ b/distutils/sysconfig_cpython.py
+@@ -173,9 +173,12 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -190,19 +193,27 @@ def customize_compiler(compiler):
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -211,13 +222,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
+index a0a8dec..aa97c4e 100644
+--- a/distutils/sysconfig_pypy.py
++++ b/distutils/sysconfig_pypy.py
+@@ -72,6 +72,7 @@ def _init_posix():
+     g['CFLAGS'] = "-DNDEBUG -O2"
+     g['CCSHARED'] = "-fPIC"
+     g['LDSHARED'] = "gcc -pthread -shared"
++    g['LDCXXSHARED'] = "g++ -pthread -shared"
+     g['EXT_SUFFIX'] = so_ext
+     g['SHLIB_SUFFIX'] = so_ext
+     g['SO'] = so_ext  # deprecated in Python 3, for backward compatibility
+@@ -156,36 +157,52 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+-            if (sys.platform == 'darwin'
++            if (True
+                     and 'LDSHARED' not in os.environ
+                     and ldshared.startswith(cc)):
+                 # On OS X, if CC is overridden, use that as the default
+                 #       command for LDSHARED as well
++                # Gentoo: s/OS X/every system/
+                 ldshared = newcc + ldshared[len(cc):]
+             cc = newcc
+         if 'CXX' in os.environ:
+-            cxx = os.environ['CXX']
++            newcxx = os.environ['CXX']
++            if ('LDCXXSHARED' not in os.environ
++                    and ldcxxshared.startswith(cxx)):
++                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
++            cxx = newcxx
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -194,13 +211,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
+index 254b22d..c9cacc1 100644
+--- a/distutils/unixccompiler.py
++++ b/distutils/unixccompiler.py
+@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler):
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError as msg:
+             raise CompileError(msg)
+ 
+@@ -188,22 +198,16 @@ class UnixCCompiler(CCompiler):
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i += 1
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+-- 
+2.12.2
+
diff --git a/dev-python/pypy3-bin/files/5.8.0_all_distutils_cxx.patch b/dev-python/pypy3-bin/files/5.8.0_all_distutils_cxx.patch
new file mode 100644
index 000000000000..5d89ce2711cc
--- /dev/null
+++ b/dev-python/pypy3-bin/files/5.8.0_all_distutils_cxx.patch
@@ -0,0 +1,342 @@
+From b2f2c9d23996d431d606ac7d8ed731a5302b4e97 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 25 Apr 2017 17:42:33 +0200
+Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5
+
+https://bugs.python.org/issue1222585
+---
+ _osx_support.py                | 10 +++---
+ distutils/cygwinccompiler.py   | 21 +++++++++--
+ distutils/sysconfig_cpython.py | 25 ++++++++++---
+ distutils/sysconfig_pypy.py    | 35 +++++++++++++++----
+ distutils/unixccompiler.py     | 54 ++++++++++++++++-------------
+ 5 files changed, 100 insertions(+), 45 deletions(-)
+
+diff --git a/_osx_support.py b/_osx_support.py
+index 13fcd8b..0525be1 100644
+--- a/_osx_support.py
++++ b/_osx_support.py
+@@ -14,13 +14,13 @@ __all__ = [
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
+index c879646..a6157fb 100644
+--- a/distutils/cygwinccompiler.py
++++ b/distutils/cygwinccompiler.py
+@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
+                 raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError as msg:
+                 raise CompileError(msg)
+ 
+@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
+         self.set_executables(compiler='gcc -O -Wall',
+                              compiler_so='gcc -mdll -O -Wall',
+                              compiler_cxx='g++ -O -Wall',
++                             compiler_so_cxx='g++ -mdll -O -Wall',
+                              linker_exe='gcc',
+                              linker_so='%s %s %s'
+                                         % (self.linker_dll, shared_option,
++                                           entry_point),
++                             linker_exe_cxx='g++',
++                             linker_so_cxx='%s %s %s'
++                                        % (self.linker_dll_cxx, shared_option,
+                                            entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
+index 573724d..0a04f33 100644
+--- a/distutils/sysconfig_cpython.py
++++ b/distutils/sysconfig_cpython.py
+@@ -173,9 +173,12 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -190,19 +193,27 @@ def customize_compiler(compiler):
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -211,13 +222,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
+index a0a8dec..aa97c4e 100644
+--- a/distutils/sysconfig_pypy.py
++++ b/distutils/sysconfig_pypy.py
+@@ -72,6 +72,7 @@ def _init_posix():
+     g['CFLAGS'] = "-DNDEBUG -O2"
+     g['CCSHARED'] = "-fPIC"
+     g['LDSHARED'] = "cc -pthread -shared"
++    g['LDCXXSHARED'] = "c++ -pthread -shared"
+     g['EXT_SUFFIX'] = so_ext
+     g['SHLIB_SUFFIX'] = so_ext
+     g['SO'] = so_ext  # deprecated in Python 3, for backward compatibility
+@@ -156,36 +157,52 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+-            if (sys.platform == 'darwin'
++            if (True
+                     and 'LDSHARED' not in os.environ
+                     and ldshared.startswith(cc)):
+                 # On OS X, if CC is overridden, use that as the default
+                 #       command for LDSHARED as well
++                # Gentoo: s/OS X/every system/
+                 ldshared = newcc + ldshared[len(cc):]
+             cc = newcc
+         if 'CXX' in os.environ:
+-            cxx = os.environ['CXX']
++            newcxx = os.environ['CXX']
++            if ('LDCXXSHARED' not in os.environ
++                    and ldcxxshared.startswith(cxx)):
++                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
++            cxx = newcxx
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -194,13 +211,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
+index 254b22d..c9cacc1 100644
+--- a/distutils/unixccompiler.py
++++ b/distutils/unixccompiler.py
+@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler):
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError as msg:
+             raise CompileError(msg)
+ 
+@@ -188,22 +198,16 @@ class UnixCCompiler(CCompiler):
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i += 1
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+-- 
+2.12.2
+
diff --git a/dev-python/pypy3-bin/files/python-3.5-distutils-OO-build.patch b/dev-python/pypy3-bin/files/python-3.5-distutils-OO-build.patch
new file mode 100644
index 000000000000..ff4446662a95
--- /dev/null
+++ b/dev-python/pypy3-bin/files/python-3.5-distutils-OO-build.patch
@@ -0,0 +1,80 @@
+From 90507018442f9adabb586fd3d0a0206b9c2f2f50 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 5 Jun 2016 08:18:01 +0200
+Subject: [PATCH] distutils: make -OO enable both opt-1 and opt-2 optimization
+
+Bug: http://bugs.python.org/issue27226
+Bug: https://bugs.gentoo.org/585060
+---
+ distutils/command/build_py.py    |  8 ++++----
+ distutils/command/install_lib.py | 12 ++++++------
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/distutils/command/build_py.py b/distutils/command/build_py.py
+index cf0ca57..838d4e4 100644
+--- a/distutils/command/build_py.py
++++ b/distutils/command/build_py.py
+@@ -315,9 +315,9 @@ class build_py (Command):
+                 if self.compile:
+                     outputs.append(importlib.util.cache_from_source(
+                         filename, optimization=''))
+-                if self.optimize > 0:
++                for opt in range(1, self.optimize + 1):
+                     outputs.append(importlib.util.cache_from_source(
+-                        filename, optimization=self.optimize))
++                        filename, optimization=opt))
+ 
+         outputs += [
+             os.path.join(build_dir, filename)
+@@ -387,8 +387,8 @@ class build_py (Command):
+         if self.compile:
+             byte_compile(files, optimize=0,
+                          force=self.force, prefix=prefix, dry_run=self.dry_run)
+-        if self.optimize > 0:
+-            byte_compile(files, optimize=self.optimize,
++        for opt in range(1, self.optimize + 1):
++            byte_compile(files, optimize=opt,
+                          force=self.force, prefix=prefix, dry_run=self.dry_run)
+ 
+ class build_py_2to3(build_py, Mixin2to3):
+diff --git a/distutils/command/install_lib.py b/distutils/command/install_lib.py
+index 6154cf0..049b662 100644
+--- a/distutils/command/install_lib.py
++++ b/distutils/command/install_lib.py
+@@ -24,8 +24,8 @@ class install_lib(Command):
+     #   2) compile .pyc only (--compile --no-optimize; default)
+     #   3) compile .pyc and "opt-1" .pyc (--compile --optimize)
+     #   4) compile "opt-1" .pyc only (--no-compile --optimize)
+-    #   5) compile .pyc and "opt-2" .pyc (--compile --optimize-more)
+-    #   6) compile "opt-2" .pyc only (--no-compile --optimize-more)
++    #   5) compile .pyc, "opt-1" and "opt-2" .pyc (--compile --optimize-more)
++    #   6) compile "opt-1" and "opt-2" .pyc (--no-compile --optimize-more)
+     #
+     # The UI for this is two options, 'compile' and 'optimize'.
+     # 'compile' is strictly boolean, and only decides whether to
+@@ -132,8 +132,8 @@ class install_lib(Command):
+             byte_compile(files, optimize=0,
+                          force=self.force, prefix=install_root,
+                          dry_run=self.dry_run)
+-        if self.optimize > 0:
+-            byte_compile(files, optimize=self.optimize,
++        for opt in range(1, self.optimize + 1):
++            byte_compile(files, optimize=opt,
+                          force=self.force, prefix=install_root,
+                          verbose=self.verbose, dry_run=self.dry_run)
+ 
+@@ -167,9 +167,9 @@ class install_lib(Command):
+             if self.compile:
+                 bytecode_files.append(importlib.util.cache_from_source(
+                     py_file, optimization=''))
+-            if self.optimize > 0:
++            for opt in range(1, self.optimize + 1):
+                 bytecode_files.append(importlib.util.cache_from_source(
+-                    py_file, optimization=self.optimize))
++                    py_file, optimization=opt))
+ 
+         return bytecode_files
+ 
+-- 
+2.8.3
+
diff --git a/dev-python/pypy3-bin/metadata.xml b/dev-python/pypy3-bin/metadata.xml
new file mode 100644
index 000000000000..c1d59c6d4a0e
--- /dev/null
+++ b/dev-python/pypy3-bin/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alicef@gentoo.org</email>
+		<name>Alice Ferrazzi</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
+	</use>
+	<upstream>
+		<remote-id type="bitbucket">pypy/pypy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pypy3-bin/pypy3-bin-5.5.0_alpha.ebuild b/dev-python/pypy3-bin/pypy3-bin-5.5.0_alpha.ebuild
new file mode 100644
index 000000000000..98c88850bafc
--- /dev/null
+++ b/dev-python/pypy3-bin/pypy3-bin-5.5.0_alpha.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# some random parts need python 2...
+PYTHON_COMPAT=( python2_7 pypy )
+inherit eutils multilib pax-utils python-any-r1 unpacker versionator
+
+CPY_PATCHSET_VERSION="3.3.5-0"
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${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/pypy3.3-v${PV/_/-}-src.tar.bz2
+	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
+	amd64? (
+		jit? ( shadowstack? (
+			${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.lz
+		) )
+		jit? ( !shadowstack? (
+			${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz
+		) )
+		!jit? ( !shadowstack? (
+			${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz
+		) )
+	)
+	x86? (
+		cpu_flags_x86_sse2? (
+			jit? ( shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz
+			) )
+			jit? ( !shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz
+			) )
+			!jit? ( !shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz
+			) )
+		)
+		!cpu_flags_x86_sse2? (
+			!jit? ( !shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz
+			) )
+		)
+	)"
+
+# Supported variants
+REQUIRED_USE="!jit? ( !shadowstack )
+	x86? ( !cpu_flags_x86_sse2? ( !jit !shadowstack ) )"
+
+LICENSE="MIT"
+# XX from pypy3-XX.so module suffix
+SLOT="0/55"
+KEYWORDS="~amd64 ~x86"
+IUSE="gdbm +jit +shadowstack sqlite cpu_flags_x86_sse2 test tk"
+
+# yep, world would be easier if people started filling subslots...
+RDEPEND="
+	app-arch/bzip2:0=
+	dev-libs/expat:0=
+	dev-libs/libffi:0=
+	dev-libs/openssl:0=
+	sys-libs/glibc:2.2=
+	sys-libs/ncurses:0/6
+	sys-libs/zlib:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy3:0"
+DEPEND="${RDEPEND}
+	app-arch/lzip
+	test? ( ${PYTHON_DEPS} )"
+#	doc? ( ${PYTHON_DEPS}
+#		dev-python/sphinx )
+
+# Who would care about predictable directory names?
+S="${WORKDIR}/pypy3-v${PV%_*}-src"
+
+QA_PREBUILT="
+	usr/lib*/pypy3/pypy-c
+	usr/lib*/pypy3/libpypy-c.so"
+
+src_prepare() {
+	epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \
+		"${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
+	epatch "${FILESDIR}"/5.2.0-distutils-c++.patch \
+		"${WORKDIR}"/patches/24_all_sqlite-3.8.4.patch
+	popd > /dev/null || die
+
+	epatch_user
+}
+
+src_compile() {
+	# Tadaam! PyPy compiled!
+	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
+	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
+	mv pypy/module/cpyext/include/*.h include/ || die
+
+	#use doc && emake -C pypy/doc/ html
+	#needed even without jit :( also needed in both compile and install phases
+	pax-mark m pypy-c libpypy-c.so
+}
+
+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=./pypy-c lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy3
+	einfo "Installing PyPy ..."
+	insinto "${dest}"
+	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
+	fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
+	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
+	dosym ../$(get_libdir)/pypy3/pypy-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+			"${ED%/}${dest}"/lib-python/*3/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
+			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+			"${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
+
+	# Install docs
+	#use doc && dohtml -r pypy/doc/_build/html/
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy-c
+	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
+	python_export pypy3 EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+	cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal )
+	use gdbm && cffi_targets+=( gdbm )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${dest}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${dest}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy3-bin/pypy3-bin-5.7.1-r1.ebuild b/dev-python/pypy3-bin/pypy3-bin-5.7.1-r1.ebuild
new file mode 100644
index 000000000000..a69f3049b290
--- /dev/null
+++ b/dev-python/pypy3-bin/pypy3-bin-5.7.1-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# some random parts need 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}"
+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}-amd64+bzip2+jit+ncurses.tar.lz )
+		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
+	)"
+
+LICENSE="MIT"
+# XX from pypy3-XX.so module suffix
+SLOT="0/57"
+KEYWORDS="~amd64"
+IUSE="gdbm +jit sqlite test tk"
+
+# yep, world would be easier if people started filling subslots...
+RDEPEND="
+	app-arch/bzip2:0=
+	dev-libs/expat:0=
+	dev-libs/libffi:0=
+	dev-libs/openssl:0=[-bindist]
+	sys-libs/glibc:2.2=
+	sys-libs/ncurses:0/6
+	sys-libs/zlib:0=
+	gdbm? ( sys-libs/gdbm: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} )"
+#	doc? ( ${PYTHON_DEPS}
+#		dev-python/sphinx )
+
+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.7.1_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
+
+	#use doc && emake -C pypy/doc/ html
+	#needed even without jit :( also needed in both compile and install phases
+	pax-mark m pypy3-c libpypy3-c.so
+}
+
+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 lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy3
+	einfo "Installing PyPy ..."
+	insinto "${dest}"
+	doins -r include lib_pypy lib-python pypy3-c libpypy3-c.so
+	fperms a+x ${dest}/pypy3-c ${dest}/libpypy3-c.so
+	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
+	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
+
+	# Install docs
+	#use doc && dodoc -r pypy/doc/_build/html
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy3-c
+	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
+	python_export pypy3 EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "ssl": "_ssl_build.py",
+	cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl )
+	use gdbm && cffi_targets+=( gdbm )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${dest}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${dest}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy3-bin/pypy3-bin-5.8.0-r1.ebuild b/dev-python/pypy3-bin/pypy3-bin-5.8.0-r1.ebuild
new file mode 100644
index 000000000000..17abeccf908b
--- /dev/null
+++ b/dev-python/pypy3-bin/pypy3-bin-5.8.0-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# some random parts need 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}"
+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}-amd64+bzip2+jit+ncurses.tar.lz )
+		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
+	)"
+
+LICENSE="MIT"
+# XX from pypy3-XX.so module suffix
+SLOT="0/58"
+KEYWORDS="~amd64"
+IUSE="gdbm +jit sqlite test tk"
+
+# yep, world would be easier if people started filling subslots...
+RDEPEND="
+	app-arch/bzip2:0=
+	dev-libs/expat:0=
+	dev-libs/libffi:0=
+	dev-libs/openssl:0=[-bindist]
+	sys-libs/glibc:2.2=
+	sys-libs/ncurses:0/6
+	sys-libs/zlib:0=
+	gdbm? ( sys-libs/gdbm: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} )"
+#	doc? ( ${PYTHON_DEPS}
+#		dev-python/sphinx )
+
+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
+
+	#use doc && emake -C pypy/doc/ html
+	#needed even without jit :( also needed in both compile and install phases
+	pax-mark m pypy3-c libpypy3-c.so
+}
+
+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 lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy3
+	einfo "Installing PyPy ..."
+	insinto "${dest}"
+	doins -r include lib_pypy lib-python pypy3-c libpypy3-c.so
+	fperms a+x ${dest}/pypy3-c ${dest}/libpypy3-c.so
+	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
+	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
+
+	# Install docs
+	#use doc && dodoc -r pypy/doc/_build/html
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy3-c
+	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
+	python_export pypy3 EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "ssl": "_ssl_build.py",
+	cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl )
+	use gdbm && cffi_targets+=( gdbm )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${dest}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${dest}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
new file mode 100644
index 000000000000..bb98bfa1611e
--- /dev/null
+++ b/dev-python/pypy3/Manifest
@@ -0,0 +1,19 @@
+AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 551 SHA256 831bacb5d5c7b23699971aedf7b07a93654ba0cf8d700babe369330115c29896 SHA512 9b6b5ede218cea96a424376677d52cbd7c23cd7f569756403849523fc79f8db27190e0bd80501a9e428688fd393397d2fa4e59a59607212993f4ac6d93b18733 WHIRLPOOL 7124a9a1ec1a65bf1488060189306780e8e6890381a20fab27b00e031e59096b80d0fcd5193d1cd48393d51f4619bb294b846da6190b784aef92f1b09ff2acb8
+AUX 2.5.0-shared-lib.patch 734 SHA256 202b90461d5c51fddb3f2adcec8806300895597ee997a8e4352ec9d2c31f4d49 SHA512 c75281cc754d723c184a2e716cdd9d88e23db4041c143864205e7d8b40972507bb0423216cf3cdcee2bf7f8900d034bbc95b318fc347af6e550ec6e6ed1097da WHIRLPOOL 279b72ae78276020dba2ef7dc4f16581a21c742b1c6218a18dc8b3e8c847c50898beaf3868d76e13ceb62ba1189792f6c0ad220650e92799594bd1503b126e34
+AUX 4.0.0-gentoo-path.patch 1906 SHA256 4f01ad3317e62147346d6548e0d5cf51bb1b01c4e4d34e48eb57dbefdaa82140 SHA512 ddf5664d289b3134a30e675a91ab9aec1a81c0df7bd4f6b0b43cd6fdbf99aca8e6d123c1df41f061784e5fe1a0a3ed4a7ebcd16790d76fb8a28cec442037d747 WHIRLPOOL 8e3b2d477a3db79874f679473032f83478bfbcce0d9df1d782f30fb5fcabeb2556efd7a1da85e7d8a0243dbf80ffbef96982d45252beb6c37fbce2ac23edc50e
+AUX 5.2.0-distutils-c++.patch 14234 SHA256 a07e65f2b7e8f8f52af45aec6a146e09390d30856118978d2e4b4d2c7e2967c9 SHA512 dfc404a71f0314988905b976d6beb1e9b8368006840cc199a94eae47a86ab7e2be92d86c53be349928fc0a8b12f3a78c60b07476bfc27cc0f7a383970a2e2e95 WHIRLPOOL 769bb355adaadb980cbb7c77faa8b47b356dc471a25cd1d1b3bc604f7eb84aba6b39e38100c9d1ad5e1dd06fc562a640437917b0c770d8e8ad02627bc309f6c1
+AUX 5.7.1-kill-flto.patch 919 SHA256 aed12afc66592ef9fe4bedd09c4275158fbfc30b4ec5003e9b092974ea020d73 SHA512 a8340c41e55e929521f649d64ee728a8b95e1be3008060a4fb2147e7f3914731640870503b4c06577a052deca00130ff3835b9477feeaf57fc0b8531abcc22c9 WHIRLPOOL 559115c01e6e027948e7cb55577be8d018661e811a3aff8db68a4e98de6f275673738199e928aa7ee17a0cc9b94ab1cc350067cb8a4fe003de8022eedbcbfbc0
+AUX 5.7.1_all_distutils_cxx.patch 15897 SHA256 cc6475551f74f416bd77eec58bab9ab48d6c5fe3f0c1595e197ffe1080bce44b SHA512 f82c4efb258a0ab029faaad35fbd85a9bf9aa98e12d9317920a7872f2f0db75668a37506fd69a3838286e7349948a60e158360b1f3f5d671e91b07a0e56af809 WHIRLPOOL 08c193c5a41ff85d14e6443aa1ba7c3141a7c9ebf15cc6ed99f7e705efe04916bfe3c305ec23f36448521a0d79d3121ab9363491458d7271144914fe6420efbf
+AUX 5.8.0_all_distutils_cxx.patch 15896 SHA256 cbedcf9e08280a99a5f2bf1a033e2b2e17bb0ee2bf00ce82b87b6f89df2718a6 SHA512 195dbc6cc75179c090b7f461f36e3fd19e341343f2d50c0a4ff24032da1074581578d51d62dbfc04349a8a46b9332097bb310bc923ea3813bf1afce91edfcea3 WHIRLPOOL 5ee53a44e6f85f0ceb93843d35856ddfe7da56662836c7ff25e9698e1bed0d75d5d72e4b5c8ee12b7ce4286903be46a6384a243f7f40e4918cfeaaaeca8f9209
+AUX python-3.5-distutils-OO-build.patch 3627 SHA256 9b0b86d8424304fe87a460bbf5ab503811d77ae4e557ad0c4081150a0af89a1f SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511 WHIRLPOOL 4730a9110662a3c45ab5f3e842ebc2f81ecfd98e4e844e71a0fe56d41baaa6bb01aafe313ec8dd12bea40c956ec01f1a68d6bca3d695bf65705a811f4afd0289
+DIST pypy3-v5.7.1-src.tar.bz2 28811162 SHA256 40ece0145282980ac121390f13709404c0532896507d5767496381180b631bd0 SHA512 f8ead8214ad7d89fe80e24d97b13ece7f2c80b2f11446257a2eab0e3025fc7d8fec26474b0e9eb2b2e3ccd629532dd062829459361b601add12e40793bd5aa60 WHIRLPOOL 180a5cb39c9a5e3840f4940463dd9cccf44486f11a657d2ac644d1eac4561068f08905fdadc495918fb0ceaf018d4b85a3e5756ca6d99a020310b46bdb16ef87
+DIST pypy3-v5.8.0-src.tar.bz2 28986883 SHA256 9d090127335c3c0fd2b14c8835bf91752e62756e55ea06aad3353f24a6854223 SHA512 d78b4c899a5643028664365ed973a7b292a8e5b3989cc75203cd381ea3cda7dd73121c574726e23dca86e8364fcfcf42c372c9deee438c805f30d6e1c4ac115a WHIRLPOOL b7567fa21e3ded400a72ec06197184df37e0b5893adfb55622ea9afb668bfbda7ebbecd9b80660efef42f160838966d103c4181a9b07355e873981b35f4bf104
+DIST pypy3.3-v5.5.0-alpha-src.tar.bz2 25122033 SHA256 d5591c34d77253e9ed57d182b6f49585b95f7c09c3e121f0e8630e5a7e75ab5f SHA512 b2cf9700e45c452293297edffe08e572dffc3c567026b4b5d9165c1ba1b4d858ffc8a6754f5f28781020016c36440e5c02d07562d075b12444c9c32ea5dd2168 WHIRLPOOL 6bde174969413c55d6d077cd14e737c4f034f19935536af1bffaf3a1caa456d2bf6850760a18c274ad99089bd5ab7331d7d185f914cd6c69f708abf857d35df3
+DIST python-gentoo-patches-3.3.5-0.tar.xz 12892 SHA256 a7240de9598033cb40f8f273d8104d4e2b1dcaea028d45ac28efaa3c680ff6f7 SHA512 27eef4c2b3f631b000db3f6a5c426d9b498d63a08fe82b1ab7c2c010fb72208109461a5f008d47703852526655b70a734ea95be8742897026db5750bb9cc9d16 WHIRLPOOL edab9222d7da94cab3b1de0e1a27c6c7dbd49194b813a0a1cf9e532063029c4e4f19151c9f4878eeabed3168ff1f97eae7f008280c7ed2897fc14c5516c68d7e
+EBUILD pypy3-5.5.0_alpha.ebuild 7540 SHA256 5fbd99e6e2e4d433850381f46ead25fb66bfc1350af64dffcd2e0dc663cfc414 SHA512 cfbad4a2036e33b6e155d4a1882e3ca20a52b427b8b67e4878d063f88e57286088b117de949a3dc5ca5aea1a7e5500e5e6db99f3910087747f87669b1ef479a0 WHIRLPOOL 989e4dac64a088b440dbba8cadace9bd8ead181a39a841fd7189bba9043114928e7a7019350988b5349a10559a9e2e2ceba26a09c0627aa8af8aeaf5ab005ee5
+EBUILD pypy3-5.7.1-r2.ebuild 6858 SHA256 2bdb8e207b87f9ea49b7f0bd2ba5196fd9792343e42f3299427c805dbba584ce SHA512 dcbb02eb791f2df753610fcc5deb561fa2aa10c1424d90738e3e740b9173e1c830484fc2222df799ff35514912381a9c6d5f0205b5544c32bc798e336a7e39fe WHIRLPOOL 979e4f779d61a645947706dd7686cca62bcd7b564061a8a3ad80e7d3b3c415f0bf394c9f675a5648b19062c538e01265e6bfeaae6bfb6b2679e60eeb5a5f4645
+EBUILD pypy3-5.8.0.ebuild 6825 SHA256 d849a0a7b9b7f13b6ce83abbace33d401e7981d435ab5fff8d9aabd1096e47e7 SHA512 6e5149ccc9fa44a0fb06ed2f33b3007f69aeb03f7c41f013d3416441848cd88865b70275221e0f36328bed2a0354e942508597e7d08c6702836debe7dfd8088c WHIRLPOOL aab3a62897fd262dbb8f394e64e71c1fdf8bf850a03968aaa82289d99c74c8f6a996ea8b92d3ebc3064ab67c6543aa28988dede1db6aa23b8d01139c03bc1ae1
+EBUILD pypy3-9999.ebuild 7395 SHA256 9cb1ec1245ec46c4ce6080e4c05b8814bc99eb7dc04a2c34548d99b38bb06bbf SHA512 556650fcc21bae86852323427c323743cee2b335d87d6d190b83e60721635de32f5c6c461470ead954d972c1551786e4f45f9bb73f0290b95997ba99bd1ab5f9 WHIRLPOOL 458f81184d73bb14d27e1385aadc71e23f3f837a74c9897e08d9f9a016310a15d8021eefb2ab61b3ed1951ecf0535ec7d1c31a803ab3c077951fb3fa6b98a3a9
+MISC ChangeLog 7714 SHA256 43954837f6d63a6ac2fa2e265b67bbda3937f9279620f08c62d8b6453ee63969 SHA512 6d51ee24600930fd9788432e3ace144e3699858fe1e3a6ddbb0076f7fff291b9792e581b6e2afc48e81868d43132bab96271a0397511afe03ce8a4c6bb54871c WHIRLPOOL 2c54a361b9007165f2b2ebd0e097fb040d539ceb27ee88b672654631070145645b445f697ee206463b1c80b85022ce52854e1d1f31941dc74a57051e72d401a6
+MISC ChangeLog-2015 1344 SHA256 7977d9be34ce1b3faffeb354d9a2acded00259e353af50632e071b43b026d8e4 SHA512 49ed62552780d9581a2cfe1b78a68d1a3ed4de603729fac05346148c00de9ccf66f4b2aaee38379f209a1ad8dba23b3a0fd773aa315a50e01258960f29796b28 WHIRLPOOL 95cf929498ad50c099b66f6c7b5f036d15ffc53b6c1a69fd60f0a529b104ec018ac2f676fd62b6b7cee4a7fa7fa99389437edc1cdd5efe3c2cbc4df957f6d4bf
+MISC metadata.xml 972 SHA256 b34455d5725b71634fff59851a70a936b8cb5bb200cf0c6e6b13cfa22fce3f62 SHA512 53ee36a6b6f7f1de332013f07829d7e412f0e6ce771f2a0a533e62d4bcd66039603ca7047e1918f9404cb3b2abb6e0701f65d9d643d5b1937c12f897c021f47b WHIRLPOOL 7889bbca3826ab27f80fa0ee6d32db96d6c7e76911610bf5f0bb717b86afa8af949addf186b9703edcc0a55a7e3c2211468acd1a614afdf678e271aa5f73b779
diff --git a/dev-python/pypy3/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch b/dev-python/pypy3/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
new file mode 100644
index 000000000000..29d99dcfdb73
--- /dev/null
+++ b/dev-python/pypy3/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
@@ -0,0 +1,11 @@
+--- a/lib-python/3/distutils/unixccompiler.py
++++ b/lib-python/3/distutils/unixccompiler.py
+@@ -297,7 +297,7 @@
+         # this time, there's no way to determine this information from
+         # the configuration data stored in the Python installation, so
+         # we use this hack.
+-        compiler = os.path.basename(sysconfig.get_config_var("CC"))
++        compiler = os.path.basename(self.compiler[0])
+         if sys.platform[:6] == "darwin":
+             # MacOSX's linker doesn't understand the -R flag at all
+             return "-L" + dir
diff --git a/dev-python/pypy3/files/2.5.0-shared-lib.patch b/dev-python/pypy3/files/2.5.0-shared-lib.patch
new file mode 100644
index 000000000000..b5c877bd58b2
--- /dev/null
+++ b/dev-python/pypy3/files/2.5.0-shared-lib.patch
@@ -0,0 +1,12 @@
+diff -ur pypy-2.5.0-src.orig/rpython/translator/platform/posix.py pypy-2.5.0-src/rpython/translator/platform/posix.py
+--- a/rpython/translator/platform/posix.py	2015-02-03 05:12:49.000000000 +0800
++++ b/rpython/translator/platform/posix.py	2015-03-22 07:36:01.420116684 +0800
+@@ -183,7 +183,7 @@
+                    'int main(int argc, char* argv[]) '
+                    '{ return $(PYPY_MAIN_FUNCTION)(argc, argv); }" > $@')
+             m.rule('$(DEFAULT_TARGET)', ['$(TARGET)', 'main.o'],
+-                   '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) -o $@ $(RPATH_FLAGS)')
++                   '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) \'-Wl,-rpath,$$ORIGIN\' -o $@')
+ 
+         return m
+ 
diff --git a/dev-python/pypy3/files/4.0.0-gentoo-path.patch b/dev-python/pypy3/files/4.0.0-gentoo-path.patch
new file mode 100644
index 000000000000..cf96d3fb2a53
--- /dev/null
+++ b/dev-python/pypy3/files/4.0.0-gentoo-path.patch
@@ -0,0 +1,50 @@
+From 165e05bbdc93e54411217c0198d0a5cbb9de4e33 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 27 Nov 2015 17:02:42 +0100
+Subject: [PATCH] Gentoo: override paths for system-wide install based on
+ sys.prefix
+
+Override all default distutils install paths to ones suitable for
+system-wide install when sys.prefix indicates we're running the Gentoo
+system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
+
+Fixes: https://bugs.gentoo.org/462306
+Fixes: https://bugs.gentoo.org/465546
+---
+ lib-python/3/distutils/command/install.py | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/lib-python/3/distutils/command/install.py b/lib-python/3/distutils/command/install.py
+index fc43951..fed5218 100644
+--- a/lib-python/3/distutils/command/install.py
++++ b/lib-python/3/distutils/command/install.py
+@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
++    'gentoo': {
++        'purelib': '$base/site-packages',
++        'platlib': '$base/site-packages',
++        'headers': '$base/include',
++        'scripts': '@EPREFIX@/usr/bin',
++        'data'   : '@EPREFIX@/usr',
++        },
+     }
+ 
+ # The keys to an installation scheme; if any new types of files are to be
+@@ -476,7 +483,11 @@ class install (Command):
+         # it's the caller's problem if they supply a bad name!
+         if (hasattr(sys, 'pypy_version_info') and
+             not name.endswith(('_user', '_home'))):
+-            name = 'pypy'
++            if self.install_base == os.path.normpath('@EPREFIX@/usr/@libdir@/pypy3'):
++                # override paths for system-wide install
++                name = 'gentoo'
++            else:
++                name = 'pypy'
+         scheme = INSTALL_SCHEMES[name]
+         for key in SCHEME_KEYS:
+             attrname = 'install_' + key
+-- 
+2.6.3
+
diff --git a/dev-python/pypy3/files/5.2.0-distutils-c++.patch b/dev-python/pypy3/files/5.2.0-distutils-c++.patch
new file mode 100644
index 000000000000..1251694107d8
--- /dev/null
+++ b/dev-python/pypy3/files/5.2.0-distutils-c++.patch
@@ -0,0 +1,284 @@
+From e3afe6721897c8de830055621313bc0659518415 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 9 Jun 2016 20:48:10 +0200
+Subject: [PATCH] distutils c++ fixes, python3.3 patch updated for pypy3.3
+
+---
+ lib-python/3/_osx_support.py                | 10 +++---
+ lib-python/3/distutils/cygwinccompiler.py   | 21 +++++++++--
+ lib-python/3/distutils/emxccompiler.py      | 14 ++++++--
+ lib-python/3/distutils/sysconfig_cpython.py | 25 ++++++++++---
+ lib-python/3/distutils/unixccompiler.py     | 54 ++++++++++++++++-------------
+ 5 files changed, 83 insertions(+), 41 deletions(-)
+
+diff --git a/lib-python/3/_osx_support.py b/lib-python/3/_osx_support.py
+index 50b2d17..1d19599 100644
+--- a/lib-python/3/_osx_support.py
++++ b/lib-python/3/_osx_support.py
+@@ -14,13 +14,13 @@ __all__ = [
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+diff --git a/lib-python/3/distutils/cygwinccompiler.py b/lib-python/3/distutils/cygwinccompiler.py
+index e0074a1..1b383d3 100644
+--- a/lib-python/3/distutils/cygwinccompiler.py
++++ b/lib-python/3/distutils/cygwinccompiler.py
+@@ -124,8 +124,10 @@ class CygwinCCompiler(UnixCCompiler):
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -139,9 +141,13 @@ class CygwinCCompiler(UnixCCompiler):
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -165,8 +171,12 @@ class CygwinCCompiler(UnixCCompiler):
+                 raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError as msg:
+                 raise CompileError(msg)
+ 
+@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
+         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
+                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
+                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
++                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
+                              linker_exe='gcc%s' % no_cygwin,
+                              linker_so='%s%s %s %s'
+                                     % (self.linker_dll, no_cygwin,
++                                       shared_option, entry_point),
++                             linker_exe_cxx='g++%s' % no_cygwin,
++                             linker_so_cxx='%s%s %s %s'
++                                    % (self.linker_dll_cxx, no_cygwin,
+                                        shared_option, entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff --git a/lib-python/3/distutils/emxccompiler.py b/lib-python/3/distutils/emxccompiler.py
+index 3675f8d..17d2afa 100644
+--- a/lib-python/3/distutils/emxccompiler.py
++++ b/lib-python/3/distutils/emxccompiler.py
+@@ -63,8 +63,12 @@ class EMXCCompiler (UnixCCompiler):
+         # XXX optimization, warnings etc. should be customizable.
+         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
+-                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
++                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
++                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
++                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
+ 
+         # want the gcc library statically linked (so that we don't have
+         # to distribute a version dependent on the compiler we have)
+@@ -81,8 +85,12 @@ class EMXCCompiler (UnixCCompiler):
+                 raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError as msg:
+                 raise CompileError(msg)
+ 
+diff --git a/lib-python/3/distutils/sysconfig_cpython.py b/lib-python/3/distutils/sysconfig_cpython.py
+index b947988..3f19020 100644
+--- a/lib-python/3/distutils/sysconfig_cpython.py
++++ b/lib-python/3/distutils/sysconfig_cpython.py
+@@ -191,9 +191,12 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -208,19 +211,27 @@ def customize_compiler(compiler):
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -229,13 +240,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+diff --git a/lib-python/3/distutils/unixccompiler.py b/lib-python/3/distutils/unixccompiler.py
+index 6819d50..19345ee 100644
+--- a/lib-python/3/distutils/unixccompiler.py
++++ b/lib-python/3/distutils/unixccompiler.py
+@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -123,12 +126,19 @@ class UnixCCompiler(CCompiler):
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError as msg:
+             raise CompileError(msg)
+ 
+@@ -186,22 +196,16 @@ class UnixCCompiler(CCompiler):
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i += 1
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+-- 
+2.8.4
+
diff --git a/dev-python/pypy3/files/5.7.1-kill-flto.patch b/dev-python/pypy3/files/5.7.1-kill-flto.patch
new file mode 100644
index 000000000000..92395bdb6cab
--- /dev/null
+++ b/dev-python/pypy3/files/5.7.1-kill-flto.patch
@@ -0,0 +1,27 @@
+From 261f9280d9736965a8626c2d6a6fadd4254b2b89 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 25 Apr 2017 17:03:46 +0200
+Subject: [PATCH] Kill -flto
+
+---
+ rpython/translator/platform/posix.py | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/rpython/translator/platform/posix.py b/rpython/translator/platform/posix.py
+index a8d4768..20a2934 100644
+--- a/rpython/translator/platform/posix.py
++++ b/rpython/translator/platform/posix.py
+@@ -130,10 +130,6 @@ class BasePosix(Platform):
+         else:
+             cflags = tuple(self.cflags) + tuple(self.standalone_only)
+ 
+-        # xxx check which compilers accept this option or not
+-        if not config or config.translation.gcrootfinder != 'asmgcc':
+-            cflags = ('-flto',) + cflags
+-
+         m = GnuMakefile(path)
+         m.exe_name = path.join(exe_name.basename)
+         m.eci = eci
+-- 
+2.12.2
+
diff --git a/dev-python/pypy3/files/5.7.1_all_distutils_cxx.patch b/dev-python/pypy3/files/5.7.1_all_distutils_cxx.patch
new file mode 100644
index 000000000000..52a833f29d9e
--- /dev/null
+++ b/dev-python/pypy3/files/5.7.1_all_distutils_cxx.patch
@@ -0,0 +1,342 @@
+From b2f2c9d23996d431d606ac7d8ed731a5302b4e97 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 25 Apr 2017 17:42:33 +0200
+Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5
+
+https://bugs.python.org/issue1222585
+---
+ _osx_support.py                | 10 +++---
+ distutils/cygwinccompiler.py   | 21 +++++++++--
+ distutils/sysconfig_cpython.py | 25 ++++++++++---
+ distutils/sysconfig_pypy.py    | 35 +++++++++++++++----
+ distutils/unixccompiler.py     | 54 ++++++++++++++++-------------
+ 5 files changed, 100 insertions(+), 45 deletions(-)
+
+diff --git a/_osx_support.py b/_osx_support.py
+index 13fcd8b..0525be1 100644
+--- a/_osx_support.py
++++ b/_osx_support.py
+@@ -14,13 +14,13 @@ __all__ = [
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
+index c879646..a6157fb 100644
+--- a/distutils/cygwinccompiler.py
++++ b/distutils/cygwinccompiler.py
+@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
+                 raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError as msg:
+                 raise CompileError(msg)
+ 
+@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
+         self.set_executables(compiler='gcc -O -Wall',
+                              compiler_so='gcc -mdll -O -Wall',
+                              compiler_cxx='g++ -O -Wall',
++                             compiler_so_cxx='g++ -mdll -O -Wall',
+                              linker_exe='gcc',
+                              linker_so='%s %s %s'
+                                         % (self.linker_dll, shared_option,
++                                           entry_point),
++                             linker_exe_cxx='g++',
++                             linker_so_cxx='%s %s %s'
++                                        % (self.linker_dll_cxx, shared_option,
+                                            entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
+index 573724d..0a04f33 100644
+--- a/distutils/sysconfig_cpython.py
++++ b/distutils/sysconfig_cpython.py
+@@ -173,9 +173,12 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -190,19 +193,27 @@ def customize_compiler(compiler):
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -211,13 +222,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
+index a0a8dec..aa97c4e 100644
+--- a/distutils/sysconfig_pypy.py
++++ b/distutils/sysconfig_pypy.py
+@@ -72,6 +72,7 @@ def _init_posix():
+     g['CFLAGS'] = "-DNDEBUG -O2"
+     g['CCSHARED'] = "-fPIC"
+     g['LDSHARED'] = "gcc -pthread -shared"
++    g['LDCXXSHARED'] = "g++ -pthread -shared"
+     g['EXT_SUFFIX'] = so_ext
+     g['SHLIB_SUFFIX'] = so_ext
+     g['SO'] = so_ext  # deprecated in Python 3, for backward compatibility
+@@ -156,36 +157,52 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+-            if (sys.platform == 'darwin'
++            if (True
+                     and 'LDSHARED' not in os.environ
+                     and ldshared.startswith(cc)):
+                 # On OS X, if CC is overridden, use that as the default
+                 #       command for LDSHARED as well
++                # Gentoo: s/OS X/every system/
+                 ldshared = newcc + ldshared[len(cc):]
+             cc = newcc
+         if 'CXX' in os.environ:
+-            cxx = os.environ['CXX']
++            newcxx = os.environ['CXX']
++            if ('LDCXXSHARED' not in os.environ
++                    and ldcxxshared.startswith(cxx)):
++                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
++            cxx = newcxx
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -194,13 +211,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
+index 254b22d..c9cacc1 100644
+--- a/distutils/unixccompiler.py
++++ b/distutils/unixccompiler.py
+@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler):
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError as msg:
+             raise CompileError(msg)
+ 
+@@ -188,22 +198,16 @@ class UnixCCompiler(CCompiler):
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i += 1
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+-- 
+2.12.2
+
diff --git a/dev-python/pypy3/files/5.8.0_all_distutils_cxx.patch b/dev-python/pypy3/files/5.8.0_all_distutils_cxx.patch
new file mode 100644
index 000000000000..5d89ce2711cc
--- /dev/null
+++ b/dev-python/pypy3/files/5.8.0_all_distutils_cxx.patch
@@ -0,0 +1,342 @@
+From b2f2c9d23996d431d606ac7d8ed731a5302b4e97 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 25 Apr 2017 17:42:33 +0200
+Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5
+
+https://bugs.python.org/issue1222585
+---
+ _osx_support.py                | 10 +++---
+ distutils/cygwinccompiler.py   | 21 +++++++++--
+ distutils/sysconfig_cpython.py | 25 ++++++++++---
+ distutils/sysconfig_pypy.py    | 35 +++++++++++++++----
+ distutils/unixccompiler.py     | 54 ++++++++++++++++-------------
+ 5 files changed, 100 insertions(+), 45 deletions(-)
+
+diff --git a/_osx_support.py b/_osx_support.py
+index 13fcd8b..0525be1 100644
+--- a/_osx_support.py
++++ b/_osx_support.py
+@@ -14,13 +14,13 @@ __all__ = [
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
+index c879646..a6157fb 100644
+--- a/distutils/cygwinccompiler.py
++++ b/distutils/cygwinccompiler.py
+@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
+                 raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError as msg:
+                 raise CompileError(msg)
+ 
+@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
+         self.set_executables(compiler='gcc -O -Wall',
+                              compiler_so='gcc -mdll -O -Wall',
+                              compiler_cxx='g++ -O -Wall',
++                             compiler_so_cxx='g++ -mdll -O -Wall',
+                              linker_exe='gcc',
+                              linker_so='%s %s %s'
+                                         % (self.linker_dll, shared_option,
++                                           entry_point),
++                             linker_exe_cxx='g++',
++                             linker_so_cxx='%s %s %s'
++                                        % (self.linker_dll_cxx, shared_option,
+                                            entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
+index 573724d..0a04f33 100644
+--- a/distutils/sysconfig_cpython.py
++++ b/distutils/sysconfig_cpython.py
+@@ -173,9 +173,12 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -190,19 +193,27 @@ def customize_compiler(compiler):
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -211,13 +222,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
+index a0a8dec..aa97c4e 100644
+--- a/distutils/sysconfig_pypy.py
++++ b/distutils/sysconfig_pypy.py
+@@ -72,6 +72,7 @@ def _init_posix():
+     g['CFLAGS'] = "-DNDEBUG -O2"
+     g['CCSHARED'] = "-fPIC"
+     g['LDSHARED'] = "cc -pthread -shared"
++    g['LDCXXSHARED'] = "c++ -pthread -shared"
+     g['EXT_SUFFIX'] = so_ext
+     g['SHLIB_SUFFIX'] = so_ext
+     g['SO'] = so_ext  # deprecated in Python 3, for backward compatibility
+@@ -156,36 +157,52 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+-            if (sys.platform == 'darwin'
++            if (True
+                     and 'LDSHARED' not in os.environ
+                     and ldshared.startswith(cc)):
+                 # On OS X, if CC is overridden, use that as the default
+                 #       command for LDSHARED as well
++                # Gentoo: s/OS X/every system/
+                 ldshared = newcc + ldshared[len(cc):]
+             cc = newcc
+         if 'CXX' in os.environ:
+-            cxx = os.environ['CXX']
++            newcxx = os.environ['CXX']
++            if ('LDCXXSHARED' not in os.environ
++                    and ldcxxshared.startswith(cxx)):
++                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
++            cxx = newcxx
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -194,13 +211,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
+index 254b22d..c9cacc1 100644
+--- a/distutils/unixccompiler.py
++++ b/distutils/unixccompiler.py
+@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler):
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError as msg:
+             raise CompileError(msg)
+ 
+@@ -188,22 +198,16 @@ class UnixCCompiler(CCompiler):
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i += 1
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+-- 
+2.12.2
+
diff --git a/dev-python/pypy3/files/python-3.5-distutils-OO-build.patch b/dev-python/pypy3/files/python-3.5-distutils-OO-build.patch
new file mode 100644
index 000000000000..ff4446662a95
--- /dev/null
+++ b/dev-python/pypy3/files/python-3.5-distutils-OO-build.patch
@@ -0,0 +1,80 @@
+From 90507018442f9adabb586fd3d0a0206b9c2f2f50 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 5 Jun 2016 08:18:01 +0200
+Subject: [PATCH] distutils: make -OO enable both opt-1 and opt-2 optimization
+
+Bug: http://bugs.python.org/issue27226
+Bug: https://bugs.gentoo.org/585060
+---
+ distutils/command/build_py.py    |  8 ++++----
+ distutils/command/install_lib.py | 12 ++++++------
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/distutils/command/build_py.py b/distutils/command/build_py.py
+index cf0ca57..838d4e4 100644
+--- a/distutils/command/build_py.py
++++ b/distutils/command/build_py.py
+@@ -315,9 +315,9 @@ class build_py (Command):
+                 if self.compile:
+                     outputs.append(importlib.util.cache_from_source(
+                         filename, optimization=''))
+-                if self.optimize > 0:
++                for opt in range(1, self.optimize + 1):
+                     outputs.append(importlib.util.cache_from_source(
+-                        filename, optimization=self.optimize))
++                        filename, optimization=opt))
+ 
+         outputs += [
+             os.path.join(build_dir, filename)
+@@ -387,8 +387,8 @@ class build_py (Command):
+         if self.compile:
+             byte_compile(files, optimize=0,
+                          force=self.force, prefix=prefix, dry_run=self.dry_run)
+-        if self.optimize > 0:
+-            byte_compile(files, optimize=self.optimize,
++        for opt in range(1, self.optimize + 1):
++            byte_compile(files, optimize=opt,
+                          force=self.force, prefix=prefix, dry_run=self.dry_run)
+ 
+ class build_py_2to3(build_py, Mixin2to3):
+diff --git a/distutils/command/install_lib.py b/distutils/command/install_lib.py
+index 6154cf0..049b662 100644
+--- a/distutils/command/install_lib.py
++++ b/distutils/command/install_lib.py
+@@ -24,8 +24,8 @@ class install_lib(Command):
+     #   2) compile .pyc only (--compile --no-optimize; default)
+     #   3) compile .pyc and "opt-1" .pyc (--compile --optimize)
+     #   4) compile "opt-1" .pyc only (--no-compile --optimize)
+-    #   5) compile .pyc and "opt-2" .pyc (--compile --optimize-more)
+-    #   6) compile "opt-2" .pyc only (--no-compile --optimize-more)
++    #   5) compile .pyc, "opt-1" and "opt-2" .pyc (--compile --optimize-more)
++    #   6) compile "opt-1" and "opt-2" .pyc (--no-compile --optimize-more)
+     #
+     # The UI for this is two options, 'compile' and 'optimize'.
+     # 'compile' is strictly boolean, and only decides whether to
+@@ -132,8 +132,8 @@ class install_lib(Command):
+             byte_compile(files, optimize=0,
+                          force=self.force, prefix=install_root,
+                          dry_run=self.dry_run)
+-        if self.optimize > 0:
+-            byte_compile(files, optimize=self.optimize,
++        for opt in range(1, self.optimize + 1):
++            byte_compile(files, optimize=opt,
+                          force=self.force, prefix=install_root,
+                          verbose=self.verbose, dry_run=self.dry_run)
+ 
+@@ -167,9 +167,9 @@ class install_lib(Command):
+             if self.compile:
+                 bytecode_files.append(importlib.util.cache_from_source(
+                     py_file, optimization=''))
+-            if self.optimize > 0:
++            for opt in range(1, self.optimize + 1):
+                 bytecode_files.append(importlib.util.cache_from_source(
+-                    py_file, optimization=self.optimize))
++                    py_file, optimization=opt))
+ 
+         return bytecode_files
+ 
+-- 
+2.8.3
+
diff --git a/dev-python/pypy3/metadata.xml b/dev-python/pypy3/metadata.xml
new file mode 100644
index 000000000000..e6215696bbbc
--- /dev/null
+++ b/dev-python/pypy3/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alicef@gentoo.org</email>
+		<name>Alice Ferrazzi</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="low-memory">Build using PyPy with the engine configured towards low memory footprint. This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86, at the cost of lengthened build time. Please note that you will need an extra ~1G of extra RAM or swap since the translation memory (unused at the time) is not freed when the C compiler is spawned.</flag>
+		<flag name="sandbox">Enable sandboxing functionality</flag>
+		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
+	</use>
+	<upstream>
+		<remote-id type="bitbucket">pypy/pypy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pypy3/pypy3-5.5.0_alpha.ebuild b/dev-python/pypy3/pypy3-5.5.0_alpha.ebuild
new file mode 100644
index 000000000000..3c4ac7df716f
--- /dev/null
+++ b/dev-python/pypy3/pypy3-5.5.0_alpha.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 pypy )
+inherit check-reqs eutils multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
+
+CPY_PATCHSET_VERSION="3.3.5-0"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.3) language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/pypy3.3-v${PV/_/-}-src.tar.bz2
+	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
+
+LICENSE="MIT"
+# XX from pypy3-XX.so module suffix
+SLOT="0/55"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox +shadowstack sqlite cpu_flags_x86_sse2 tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	bzip2? ( app-arch/bzip2:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy3-bin:0"
+DEPEND="${RDEPEND}
+	low-memory? ( virtual/pypy:0 )
+	!low-memory? ( ${PYTHON_DEPS} )"
+#	doc? ( dev-python/sphinx )
+
+# Who would care about predictable directory names?
+S="${WORKDIR}/pypy3-v${PV%_*}-src"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use low-memory; then
+			CHECKREQS_MEMORY="1750M"
+			use amd64 && CHECKREQS_MEMORY="3500M"
+		else
+			CHECKREQS_MEMORY="3G"
+			use amd64 && CHECKREQS_MEMORY="6G"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_pretend
+
+		# unset to allow forcing pypy below :)
+		use low-memory && local EPYTHON=
+		if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
+			einfo "Using PyPy to perform the translation."
+			local EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
+		fi
+
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \
+		"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \
+		"${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
+
+	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
+	epatch "${FILESDIR}"/5.2.0-distutils-c++.patch \
+		"${WORKDIR}"/patches/24_all_sqlite-3.8.4.patch
+	popd > /dev/null || die
+
+	epatch_user
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--shared
+		$(usex jit -Ojit -O2)
+		$(usex shadowstack --gcrootfinder=shadowstack '')
+		$(usex sandbox --sandbox '')
+
+		${jit_backend}
+		--make-jobs=$(makeopts_jobs)
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${PYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${PYTHON}" --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to make them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+
+	# copy back to make sys.prefix happy
+	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
+	pax-mark m pypy-c libpypy-c.so
+
+	#use doc && emake -C pypy/doc html
+}
+
+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=./pypy-c lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy3
+	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}"
+	doins -r include lib_pypy lib-python
+	dosym ../$(get_libdir)/pypy3/pypy-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+			"${ED%/}${dest}"/lib-python/*3/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
+			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+			"${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
+
+	# Install docs
+	#use doc && dohtml -r pypy/doc/_build/html/
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy-c
+	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
+	python_export pypy3 EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+	cffi_targets=( audioop syslog pwdgrp resource lzma decimal )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${dest}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${dest}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy3/pypy3-5.7.1-r2.ebuild b/dev-python/pypy3/pypy3-5.7.1-r2.ebuild
new file mode 100644
index 000000000000..e0a8417672ea
--- /dev/null
+++ b/dev-python/pypy3/pypy3-5.7.1-r2.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 pypy )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
+
+MY_P=pypy3-v${PV}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.3) language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
+
+LICENSE="MIT"
+# XX from pypy3-XX.so module suffix
+SLOT="0/57"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	bzip2? ( app-arch/bzip2:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy3-bin:0"
+DEPEND="${RDEPEND}
+	low-memory? ( virtual/pypy:0 )
+	!low-memory? ( ${PYTHON_DEPS} )"
+#	doc? ( dev-python/sphinx )
+
+S="${WORKDIR}/${MY_P}-src"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use low-memory; then
+			CHECKREQS_MEMORY="1750M"
+			use amd64 && CHECKREQS_MEMORY="3500M"
+		else
+			CHECKREQS_MEMORY="3G"
+			use amd64 && CHECKREQS_MEMORY="6G"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_pretend
+
+		# unset to allow forcing pypy below :)
+		use low-memory && local EPYTHON=
+		if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
+			einfo "Using PyPy to perform the translation."
+			local EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
+		fi
+
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
+	# disarm implicit -flto
+	eapply "${FILESDIR}"/5.7.1-kill-flto.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.7.1_all_distutils_cxx.patch
+	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+
+	local args=(
+		--shared
+		$(usex jit -Ojit -O2)
+		$(usex sandbox --sandbox '')
+
+		--jit-backend=auto
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${PYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${PYTHON}" --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to make them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+
+	# copy back to make sys.prefix happy
+	cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
+	pax-mark m pypy3-c libpypy3-c.so
+
+	#use doc && emake -C pypy/doc html
+}
+
+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 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}"
+	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
+
+	# Install docs
+	#use doc && dohtml -r pypy/doc/_build/html/
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy3-c
+	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
+	python_export pypy3 EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "ssl": "_ssl_build.py",
+	cffi_targets=( audioop syslog pwdgrp resource lzma decimal ssl )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${dest}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${dest}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy3/pypy3-5.8.0.ebuild b/dev-python/pypy3/pypy3-5.8.0.ebuild
new file mode 100644
index 000000000000..e2f58d805be1
--- /dev/null
+++ b/dev-python/pypy3/pypy3-5.8.0.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 pypy )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
+
+MY_P=pypy3-v${PV}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.3) language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+SLOT="0/58"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	bzip2? ( app-arch/bzip2:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy3-bin:0"
+DEPEND="${RDEPEND}
+	low-memory? ( virtual/pypy:0 )
+	!low-memory? ( ${PYTHON_DEPS} )"
+#	doc? ( dev-python/sphinx )
+
+S="${WORKDIR}/${MY_P}-src"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use low-memory; then
+			CHECKREQS_MEMORY="1750M"
+			use amd64 && CHECKREQS_MEMORY="3500M"
+		else
+			CHECKREQS_MEMORY="3G"
+			use amd64 && CHECKREQS_MEMORY="6G"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_pretend
+
+		# unset to allow forcing pypy below :)
+		use low-memory && local EPYTHON=
+		if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
+			einfo "Using PyPy to perform the translation."
+			local EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
+		fi
+
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
+
+	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_configure() {
+	tc-export CC
+
+	local args=(
+		--shared
+		$(usex jit -Ojit -O2)
+		$(usex sandbox --sandbox '')
+
+		--jit-backend=auto
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${PYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${PYTHON}" --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to make them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+
+	# copy back to make sys.prefix happy
+	cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
+	pax-mark m pypy3-c libpypy3-c.so
+
+	#use doc && emake -C pypy/doc html
+}
+
+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 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}"
+	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
+
+	# Install docs
+	#use doc && dohtml -r pypy/doc/_build/html/
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy3-c
+	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
+	python_export pypy3 EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "ssl": "_ssl_build.py",
+	cffi_targets=( audioop syslog pwdgrp resource lzma decimal ssl )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${dest}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${dest}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
new file mode 100644
index 000000000000..7291b119ea06
--- /dev/null
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 pypy )
+EHG_PROJECT="pypy"
+EHG_REPO_URI="https://bitbucket.org/pypy/pypy"
+EHG_REVISION="py3k"
+inherit check-reqs mercurial pax-utils python-any-r1 toolchain-funcs versionator
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.3) language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI=""
+
+LICENSE="MIT"
+# XX from pypy3-XX.so module suffix
+SLOT="0/57"
+KEYWORDS=""
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	bzip2? ( app-arch/bzip2:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy3-bin:0"
+DEPEND="${RDEPEND}
+	low-memory? ( virtual/pypy:0 )
+	!low-memory? ( ${PYTHON_DEPS} )"
+#	doc? ( dev-python/sphinx )
+
+# Who would care about predictable directory names?
+S="${WORKDIR}/pypy3-v${PV%_*}-src"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use low-memory; then
+			CHECKREQS_MEMORY="1750M"
+			use amd64 && CHECKREQS_MEMORY="3500M"
+		else
+			CHECKREQS_MEMORY="3G"
+			use amd64 && CHECKREQS_MEMORY="6G"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_pretend
+
+		# unset to allow forcing pypy below :)
+		use low-memory && local EPYTHON=
+		if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
+			einfo "Using PyPy to perform the translation."
+			local EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
+		fi
+
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	default
+	mercurial_src_unpack
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
+
+	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_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--shared
+		$(usex jit -Ojit -O2)
+		$(usex sandbox --sandbox '')
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${PYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${PYTHON}" --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to make them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+
+	# copy back to make sys.prefix happy
+	cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
+	pax-mark m pypy3-c libpypy3-c.so
+
+	#use doc && emake -C pypy/doc html
+}
+
+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 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}"
+	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.py \
+			"${ED%/}${dest}"/lib-python/*3/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
+			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+			"${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
+
+	# Install docs
+	#use doc && dohtml -r pypy/doc/_build/html/
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy3-c
+	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
+	python_export pypy3 EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "ssl": "_ssl_build.py",
+	cffi_targets=( audioop syslog pwdgrp resource lzma decimal ssl )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${dest}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${dest}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pyqrcode/Manifest b/dev-python/pyqrcode/Manifest
new file mode 100644
index 000000000000..bef97d907210
--- /dev/null
+++ b/dev-python/pyqrcode/Manifest
@@ -0,0 +1,4 @@
+DIST pyqrcode-1.2.1.tar.gz 36989 SHA256 fdbf7634733e56b72e27f9bce46e4550b75a3a2c420414035cae9d9d26b234d5 SHA512 784262cb15c10f3581b0caeac6bba046686b35b8c0709ee78684b805b6cba49f4250a004dc5f7d393cc25929cbf815c6c3a94e284a77d20ff7224a8dde3a036a WHIRLPOOL 9911dd1b48aeb68acbe3ba31b719e12dd896d556e5b945070c3c93004415547d405753ee064d772cb15182f8b019239af3d2d452b7767c20efca61b72326020b
+EBUILD pyqrcode-1.2.1.ebuild 671 SHA256 ff9cea49278b7b07e8437ddbfca3b924d0e09ae8f781c9a3f2e145463b24de62 SHA512 38b6b28146109581546ae988deea3431ee5cf7a9888073ceb31e9b68883f3e5f59c58c9db5880a10007aa0e1774015c7b86fd9b7967529df9815685135247c6a WHIRLPOOL c5e98a206809d324eeb269f11fa4e68bb028ebe0b26e592288d78940fca6b6adc7d98c157ebab917e3c110c6a9cc8bc6667815872bd18247a39e4b18f0a37785
+MISC ChangeLog 478 SHA256 870bff4cd1532326e202e86ade9b2b074b98c1e9049a861340fb29a3e7ea6ded SHA512 8b61add094d357931309ee965da53bd0b1d633cd44c54d666e34e599526f7fd51e97b3bbc8874238cf7268bdfd73eeecc7308dca41017c20b11d7fa9d34452b9 WHIRLPOOL 1f0aa1ca68a933246cfd0d0336cd91da2e60dd5befa0733e1f1c91dca3f7f3a8844fac692b7160889dc5b0451149ce81bc88999407ceb028c95703d72abd173a
+MISC metadata.xml 811 SHA256 b7d0674554be4cccd6597205a3e3a55b17659e47e7a8d71c02d0a413f981ca0e SHA512 4803cdc119f717224e9b63d032270cafa0b2b8e32478c10c2945f6fabe50ec850c8be8b702febb68665f3f3a52ec9ab9acb743948e74bec6594c0fb08c16b04a WHIRLPOOL 4084fd2fd1b374cff178b98825eaeef8d31b187131541be2dc3a6ecc106222f6929b2d465a6be12210e15821a5044a1d8416e187744dd035691efca735b596ce
diff --git a/dev-python/pyqrcode/metadata.xml b/dev-python/pyqrcode/metadata.xml
new file mode 100644
index 000000000000..74479c718f04
--- /dev/null
+++ b/dev-python/pyqrcode/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>mnooner256@gmail.com</email>
+			<name>Michael Nooner</name>
+		</maintainer>
+		<remote-id type="pypi">PyQRCode</remote-id>
+		<remote-id type="github">mnooner256/pyqrcode</remote-id>
+	</upstream>
+	<longdescription>
+		The pyqrcode module is a QR code generator that is simple to use and
+		written in pure python. The module can automate most of the building
+		process for creating QR codes.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild b/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
new file mode 100644
index 000000000000..a81e0ffcd6ab
--- /dev/null
+++ b/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6})
+
+inherit distutils-r1
+
+MY_PN="PyQRCode"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A pure Python QR code generator with SVG, EPS, PNG and terminal output"
+HOMEPAGE="https://github.com/mnooner256/pyqrcode https://pypi.python.org/pypi/PyQRCode"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="png"
+
+RDEPEND="
+	png? ( dev-python/pypng[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
new file mode 100644
index 000000000000..cd958915eb9c
--- /dev/null
+++ b/dev-python/pyqtgraph/Manifest
@@ -0,0 +1,5 @@
+DIST pyqtgraph-0.10.0.tar.gz 704972 SHA256 4c851deec81c1dd1ecb4468ff6d5b035349b167cc1b4e4bb724b4b410945d20b SHA512 d995da7b4f13ae0009582aebe3f753dc78566dc50ba9314d3a2d37ad4ed8f2fd8bb497a01bb8b37b6d96bf14c071aad018bcbc7224d9dd9b47589a7b5b640d30 WHIRLPOOL a3435da48e68a4d1dfadfcb3a07f58056291cfac09b09c6459520b781717005cf52037354e2062ad4d81ed4f734ed7acf8f55d2638df720bf22f3723424ceebb
+EBUILD pyqtgraph-0.10.0.ebuild 1222 SHA256 fa1f1691b517114a4ede4655237235d79966078e96e9587f8fdd3168cd4c571d SHA512 8bd56a0d401ac1bc1d5ed34e258d912cfac4dfce5ee5f483710716de73bc072c9f94a342478bfc77c50140b3bd90bc4fc0141dcdd568c5aa3fd7a6d4aa58bff8 WHIRLPOOL f872fe9d4fd1a776da5ef55a8aab6672f12fc5edb6692ae19b1cd7884cca6bb97fa705119eb1f8c2d7f7d83a3469343f2cb9e25d3f1d7b465fd4c8480adda5ee
+MISC ChangeLog 2883 SHA256 acdb8520999112df7f0ed04e58f2ea4137050bb81a63928bf1075283920c4eaa SHA512 433cb7dca164f86ee5025faa7821cb7df2ebe7e741ac7616b6fd3f9f74211c5ef57e4b7706d80bca27eacd24e1cb492f706961423209437677c3a6f8dd87b355 WHIRLPOOL 22335c4c4766fcf2ec4ef3ae644a76e6fb39f14f521f787465e9314d62d3af567a708801faa5468265250a9b5c45ef604e305d0cf1c6986dc7f26d93622d16ed
+MISC ChangeLog-2015 886 SHA256 4dc55cf1e879e4b5edd700fb49f4aa53042762675b29a20772d22272055cafcd SHA512 9a796f002f4518dfda8ff79d012613022cc73cc0239dbda642d59490b81e2a6084d614986d3c9b6283d53e071594a4ee97e31a07ac3807957c9248a3024d29f0 WHIRLPOOL 303adf4e8e02298c4c9b53b3edd2a3fd978389d33b6c3327b658d3728507b749ce7e6515139d5661550965d828567ccbc3fcc832ac0ea40059de3027e31d43b6
+MISC metadata.xml 334 SHA256 643e68544e00133611e303f4dedd087b7f8a88bb02a84b46e8053b0ef8da0a70 SHA512 0508e3e04125aa9ec46c82dd47593ad3055ed8769d4d1499d892986db40deb9f5405a57546e48f06149c0298bd44582efb53b4b21d67d15e8c3b3fb3aee63eba WHIRLPOOL a680e6ab6c03df3e147a0b1dbdd3f4cf120692571fd3f8c642f4735e495e4d3ac7fcf7dbeafe5dfbba9941aa18978f773ca61e24e9249a08c1ada20807bdab4d
diff --git a/dev-python/pyqtgraph/metadata.xml b/dev-python/pyqtgraph/metadata.xml
new file mode 100644
index 000000000000..1dffaf00842a
--- /dev/null
+++ b/dev-python/pyqtgraph/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">pyqtgraph/pyqtgraph</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.10.0.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.10.0.ebuild
new file mode 100644
index 000000000000..dea43636c817
--- /dev/null
+++ b/dev-python/pyqtgraph/pyqtgraph-0.10.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="a pure-python graphics and GUI library built on PyQt/PySide and numpy"
+HOMEPAGE="http://www.pyqtgraph.org/ https://github.com/pyqtgraph/pyqtgraph"
+SRC_URI="https://github.com/pyqtgraph/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples opengl"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	|| (
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/PyQt4[${PYTHON_USEDEP}]
+		dev-python/pyside[${PYTHON_USEDEP}]
+	)
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+S=${WORKDIR}/${PN}-${P}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# fix distutils warning
+	sed -i 's/install_requires/requires/' setup.py || die
+
+	if ! use opengl; then
+		rm -r pyqtgraph/opengl || die
+	fi
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
new file mode 100644
index 000000000000..f8d8217e727f
--- /dev/null
+++ b/dev-python/pyquery/Manifest
@@ -0,0 +1,5 @@
+DIST pyquery-1.2.13.tar.gz 44032 SHA256 fbc95cf422ac79fa00c5107a2f33dff7dd106d6de569493bd938881b75d42e49 SHA512 39a2bfe6f1eaefb6d1a78f73e5bdb4d12a9e223b26f6aff0f979ceaa68005ab08e41bdf11fe808489d22e0506e558621982dc59fa2164cd1e3d8168b0ef8ceb6 WHIRLPOOL 9dfaff7ee82e162bcf3c9ea9ee03320fafee158aabaeea8cd64fb592abf2386e81e240d1f966747707937c614e0164c9f73a70f480e2c6362da02805cee2c746
+EBUILD pyquery-1.2.13.ebuild 1333 SHA256 386183d278d2e7edfe1e2cadc93bbbec22fa7b0dca2fb3eb2f768ca96003e982 SHA512 5c105c9db4cef39eb5ea4021bc2aded6f37660986a45625336797c91d676ced037971175b7d836453538b1d4ca61d39e8d6847cbe227ab399aef5db200020575 WHIRLPOOL 6bd716db779f6dc4059f2e407b58ce0e7d47c603b658259bd6a9e30226f5361e37e9d403b4b265dae8e89bbf9e3d3da3b5da6544324bee3e6a1198465aacf2fc
+MISC ChangeLog 4512 SHA256 1cafe41e5cf6e264f17cf163b7b6fa72804965729c5c147ca0c1cb72ea8f1421 SHA512 a5c5b871b064ce42a0aa230e27228481077ea445c005fdead28e09aa28ceb0883908045190f3b56fa0285006de883f38bea7282940ca92ed585684e73f9342f5 WHIRLPOOL fd4a38a5572e6f406e8e9c0de30ce4fc447e7118652b419c9e375aa7cb3de1ea1d360467efdc232ee2563f53a2f71e887543f66069d3c8c06e3f45e1f09a7b9c
+MISC ChangeLog-2015 7163 SHA256 bb33fe5548532f8918ae90ed65f5aaae04b2f8b3ada06295da1780b5bf2d9e9b SHA512 a103814e1ab3e601c24d7369ce068fb5937f6dd154a50d21219d57dd031066576f979c8e99b0b5579fd48fc34596732a3252cb98b34efcfe00d5c4524d825a57 WHIRLPOOL 5dfaaee639f02414ab47674569b3237f0e0a4aef6fbadeeff8ec5c00891f79ac1834812ef0a035faa430513acf2940e82c2653755d3a29275d6fd4a222c1381c
+MISC metadata.xml 375 SHA256 9d6faed7269d0a77a481905489bc8ed1e47836ceb49a8de904008f68224df2dd SHA512 ebed84e50582171d8a99f7ee1031553a6afc558f5aa6914f2aa5eacccc7efd6c87b284eec803dd81fef3dd91426fd28f93ae21f6cab1e74c9e4541df3904956f WHIRLPOOL 05a6c376de7a7d037754cdaac146ad0b82e20e6a6526cb48e767e89d32d709e3b650f85bdfeba6fa39583a7cfa11fb449215b43ba04446d127756c061f42e4c5
diff --git a/dev-python/pyquery/metadata.xml b/dev-python/pyquery/metadata.xml
new file mode 100644
index 000000000000..622094646888
--- /dev/null
+++ b/dev-python/pyquery/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pyquery</remote-id>
+    <remote-id type="github">gawel/pyquery</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyquery/pyquery-1.2.13.ebuild b/dev-python/pyquery/pyquery-1.2.13.ebuild
new file mode 100644
index 000000000000..eb195d24bc72
--- /dev/null
+++ b/dev-python/pyquery/pyquery-1.2.13.ebuild
@@ -0,0 +1,45 @@
+# 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
+
+DESCRIPTION="A jQuery-like library for python"
+HOMEPAGE="https://github.com/gawel/pyquery"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc64 ~s390 ~sh sparc x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
+	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/restkit[${PYTHON_USEDEP}]' 'python2_7') )"
+
+python_prepare_all() {
+	# Disable tests needing a network connection
+	sed -i -e "s/HAS_REQUEST = True/HAS_REQUEST = False/" tests/test_pyquery.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# The suite, it appears, requires this hard setting of PYTHONPATH!
+	PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
+}
diff --git a/dev-python/pyqwt/Manifest b/dev-python/pyqwt/Manifest
new file mode 100644
index 000000000000..c302906d437a
--- /dev/null
+++ b/dev-python/pyqwt/Manifest
@@ -0,0 +1,5 @@
+DIST PyQwt-5.2.0.tar.gz 2670893 SHA256 98a8c7e0c76d07701c11dffb77793b05f071b664a8b520d6e97054a98179e70b SHA512 8c409ee228d91d625bf9bd8a5704c3d41f70613b420bc8f1527312dd1ebb686b8482bd68c4b3d1a72edd80673533a4f5a39378221967bea70f389c9dde14f265 WHIRLPOOL ab5e8d1b094552df592062ad41d786e58621465d318eaa2e199cdf45163e39be24f8c268aec33b428b4daa92c4c85342925df109792475507425f90c76e86c70
+EBUILD pyqwt-5.2.0-r2.ebuild 1907 SHA256 606c1935c01117d993c195f56590ac70687da97b56813941ee998ed02cb3ef30 SHA512 a3c7827ac631b06c11cd8f17aa5b2f0cd15f05569c4b323fa8bc848f0f1b662025a7778a75824e6ce613fcee28b8a89a0a08b41128a3b9684b223c0273de7caf WHIRLPOOL bb8f4f8d6a231c660ef85541852900f25642efc86d1f80787602dc032d79d8d46c79627bbc83f9711d5fe8cc66ec81483398209e4632b76f899e36e9b9ad606f
+MISC ChangeLog 3738 SHA256 b8c6171c7b26ba374af493c9bafa06ccd5872a7e1c981b7a5bfb1b15878f2a43 SHA512 96d4b5fc99f8a44b47590ec95d2e0dd176b8467e088c318445a18e8e727053866cbddff4c067478d2263db02f9d9565c8d214e8b39b5f2d073f9abb9c87c1ffb WHIRLPOOL df5f95e31923e4d0df3c1bdcdcb707d3cf5619fd6f2f54abe4c4d30a459d15283445772a1822ad68c4ec7913f176994106d1ff4ba5017ed29197952a42c1fbcf
+MISC ChangeLog-2015 3763 SHA256 8fa11408375407fee26562b30a18881beae4d54b2a4ef834ed8e4e7c26c8be95 SHA512 7871c8a634fe36a1ad4c24a481032a4d73796ac414068e3ee24ba84019a2954f0bd4c8de23a869370e150c45b5fe6ddd014ce58d870c9702501a9af6b33f8810 WHIRLPOOL f492d8b1daafe0c6e9cca2d7d8726e918cc740da770f75f59869ce4f9c630a7a2d713b04125939d3450067b0a33257832e2f4b6c3283d1280f9fc6205c1f23e4
+MISC metadata.xml 662 SHA256 4f63ea6d79473f9b489595fe59f46733b296b068896f9ef536fe59250942c55c SHA512 dd9c021d0b2bc9b51d1952643bd7ca475786914fc1ddf125212cfb2450cf1fb930491e47cd0182521a10f975f30770d109f5bdf5c53ae8648257b2a485119fb4 WHIRLPOOL 4aa7c45189743b7b3b8a6eea0d7995701413536a25f3cf963e1dd5bfd1c3e3ee0f37ceb500f2c44140fb0351f7d112a79327e016481bb7a722ddfed47cee79fe
diff --git a/dev-python/pyqwt/metadata.xml b/dev-python/pyqwt/metadata.xml
new file mode 100644
index 000000000000..7f74fabb62c0
--- /dev/null
+++ b/dev-python/pyqwt/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		PyQwt is a set of Python bindings for the Qwt C++ class library which
+		extends the Qt framework with widgets for scientific and engineering
+		applications. It provides a widget to plot 2-dimensional data and
+		various widgets to display and control bounded or unbounded floating
+		point values.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">pyqwt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyqwt/pyqwt-5.2.0-r2.ebuild b/dev-python/pyqwt/pyqwt-5.2.0-r2.ebuild
new file mode 100644
index 000000000000..cd1fb2e2c252
--- /dev/null
+++ b/dev-python/pyqwt/pyqwt-5.2.0-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for the Qwt library"
+HOMEPAGE="http://pyqwt.sourceforge.net/"
+MY_P="PyQwt-${PV}"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+SLOT="5"
+LICENSE="GPL-2"
+KEYWORDS="amd64 arm ia64 x86"
+IUSE="debug doc examples svg"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/PyQt4[${PYTHON_USEDEP},compat(+)]
+	dev-python/sip[${PYTHON_USEDEP}]
+	x11-libs/qwt:5[svg?]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}/configure
+
+src_prepare() {
+	sed -i -e "s|configuration.qt_dir, 'bin'|'$(qt4_get_bindir)'|" configure.py || die
+	python_copy_sources
+	append-flags -fPIC
+}
+
+src_configure() {
+	configuration() {
+		local myconf=()
+		use debug && myconf+=( --debug )
+
+		cd "${BUILD_DIR}" || die
+		# '-j' option can be buggy.
+		"${PYTHON}" configure.py \
+			--extra-cflags="${CFLAGS}" \
+			--extra-cxxflags="${CXXFLAGS}" \
+			--extra-lflags="${LDFLAGS}" \
+			--disable-numarray \
+			--disable-numeric \
+			-I/usr/include/qwt5 \
+			-lqwt \
+			${myconf[@]} \
+			|| die "configure.py failed"
+
+		# Avoid stripping of the libraries.
+		sed -i -e "/strip/d" {iqt5qt4,qwt5qt4}/Makefile || die "sed failed"
+	}
+	python_foreach_impl configuration
+}
+
+src_compile() {
+	compilation() {
+		cd "${BUILD_DIR}" || die
+		default
+	}
+	python_foreach_impl compilation
+
+	if use doc; then
+		cd "${S}"/../sphinx || die
+		emake
+	fi
+}
+
+src_install() {
+	installation() {
+		cd "${BUILD_DIR}" || die
+		emake DESTDIR="${D}" install
+	}
+	python_foreach_impl installation
+
+	cd "${S}"/.. || die
+
+	dodoc ANNOUNCEMENT-${PV} README
+
+	use doc && dodoc -r sphinx/build/.
+	if use examples; then
+		docinto examples
+		dodoc -r qt4examples/.
+	fi
+}
diff --git a/dev-python/pyramid/Manifest b/dev-python/pyramid/Manifest
new file mode 100644
index 000000000000..701348975b23
--- /dev/null
+++ b/dev-python/pyramid/Manifest
@@ -0,0 +1,9 @@
+DIST pyramid-1.5.1.tar.gz 2401767 SHA256 2fe0b4012f10444682acc0df3b9cb85c7cfff2508ba5cbe6db83f5f14b510d86 SHA512 70b04111020d0f02ef21c52c44d7b6a5e78d198daee0068921df048bcae8b07567aee05d57f1a9e7329ef418116a0f7682aee30c6f785a4d1ec847e2519e7cc5 WHIRLPOOL 16e17ccba24f6a76c4ef0f2e361580e832c6450f453f88229bf1204cd123719e08e8565bb46d8b0bef5b395af2dfa87cb7ac7a9dc0dc9a0cc2d019490716e151
+DIST pyramid-1.5.7.tar.gz 2678474 SHA256 c1302d5ccb6833e8794ddb649aa9bb64d86c05adb127c93e329f8863907449b4 SHA512 32b0d4b85bf0f471b7c08ac7353f2859284ee7bb2451b68429074fb5f954e0e02d7bc4bdd86f843d6a5304b56a418e698d614806bbfd09dda9a608db88c25949 WHIRLPOOL 2c12aab5e91eede072f0b45b510699f048f9848753cf134e21dcb775b0f2fa96c815d1573cd11b67afa76f401bdab230b67fe1a24a8a861708309d8b26308619
+DIST pyramid-1.5.8.tar.gz 2546802 SHA256 51474d93b80a9e55cc120f911eeb11c4728bb0ec5ff40495d28ff9977685eda5 SHA512 725f472245c03a50463d9e8946dbc71063ef46d58df8a41804d1c68bb0abe796f7fcd36f7c1708f8597a980f8cb308fbeec0bbad3f82c0e7d3eb449f6719fe16 WHIRLPOOL a2e9ce852fad1e491d6b1cbc01669e1f4fd67b512a345040ac975a6b2b2dc4245c21b479b6009ebfbc9aa05502c216e1bb396e33ed09c7907163960d25b79103
+EBUILD pyramid-1.5.1.ebuild 1198 SHA256 be94543d684900b4a12d07c098de8280cf1fcae640ac35be73ca0a89472bd3a9 SHA512 a8e698df325925c01dad7cec9189bf395627d1e4fb4f7a0515550ed0380a5a5348dfb764afd533e0c3816a4fd98583169af6eb27dae0e9fc486a2758aeed4182 WHIRLPOOL 66d0f0114c8d59011ad5ff563505bef446b22f4a3daf3d4b1bd10516437398b1bc07329ba7fea9fd806b0ef78c2e81d76ae26721b3451d9bff90c7d33adee6c4
+EBUILD pyramid-1.5.7-r1.ebuild 1042 SHA256 dab549801b80a20a0dfdf9434804eb46fc128cb3774a58958b2b3e07d43171cd SHA512 609072e5b327c417d5c69aeda490fb3a8437b2a39c21ff66ec1c141d9a930fe836ea527841d8ce7417a02d38c426a9d1e0b4b2ae210b522b3eea7673d0db9911 WHIRLPOOL ee2d1a93d56f131555460fba31ee2381f92ac1a905661d7579d89df1f90581ddc35a6cf91aa283830e73d369e44bc191acab8427fa12103e24189b3dc8a1e4db
+EBUILD pyramid-1.5.8.ebuild 1046 SHA256 f48ea518c36c2cbd2fcff77fd5fe6314dac1a551e7fc994c60266ab269b10776 SHA512 b347754ff8a10225d99dcd6fb84f3ac70f2c4daf8bbdf922b6ac532bb06e50e2c21d3e88f5a8547e3583c3212aeedadf8c59779064d0300fc364d61622694035 WHIRLPOOL b20fce5d62e3b78f25196e25d30845a2ab7169cfb31a1163e9512bd0a34f278b0be49caf9cc86a51a0a16f02650bf7734abc6a80b919da75041fa951926ecb07
+MISC ChangeLog 2783 SHA256 5cd4e8bdc1e490dada2b74ffa1d83d5c54db66b8034f149ad368903191b48d8e SHA512 73565f695f8264a57d6bba697a7ba3b2f3b4388ce7f9eaed424702cc27779d194fcff77e1f8a2fe88392bb0ef14f27de48f7fb776fe132827ead2f4972e21b87 WHIRLPOOL 2ab4f5566ed35bdd70e023178e6488955b55f49b8d16520797ec28e1f5c5207198b32ab55e899f9369a0425d07bfbb6688b7e8c1329fe39a2e8906134165b631
+MISC ChangeLog-2015 1830 SHA256 8ac245710fcf8b98ef2bd7ec5b34050b08b16655372e7c1b1c6da73d2f6f978e SHA512 ed16d41d8a518bf83ebb71e0fa99143db34873ee004c86f6480fbeb758d9e8ae46b8ab909e67683b222a9d006c07c99f6319552aebafe674b7f51711d9cfcc6d WHIRLPOOL 050adfc9e1e20f43629af126e65223557122194dd71f957b83144d792f999bc4f07525e35817948a96edefb71e307c1e8bb247c3cf0d16ab06e3d5933e435fbf
+MISC metadata.xml 310 SHA256 ee92bd1e7a65bdd002fd4fcbc4256b58efdb156bb1576103204d42e78f5fa96a SHA512 c883e84e3f88d74df21905d73b27c0eca217419610ae128081b368073ec27717405741ab8b57bdda953a273cfcc9412505e01947829c17b3440b83b4f2beaa47 WHIRLPOOL e22f7af15053a1472815ea54f0e114a4b1e7a8f3682b098d5d2fc83e5bb6a11977830e6eaa8fc5268d7846ff840c73d3cd9e5feb71c4e12307752456293527fb
diff --git a/dev-python/pyramid/metadata.xml b/dev-python/pyramid/metadata.xml
new file mode 100644
index 000000000000..4302a8f965df
--- /dev/null
+++ b/dev-python/pyramid/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyramid</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyramid/pyramid-1.5.1.ebuild b/dev-python/pyramid/pyramid-1.5.1.ebuild
new file mode 100644
index 000000000000..183fe915b6fe
--- /dev/null
+++ b/dev-python/pyramid/pyramid-1.5.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+RESTRICT="test" # Can't package dependencies
+
+DESCRIPTION="A small open source Python web framework"
+HOMEPAGE="http://www.pylonsproject.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+#IUSE="test"
+# tests would pull in dev-python/zope-deprecation with its deps - not a good idea
+
+RDEPEND="
+	dev-python/chameleon[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/webob[${PYTHON_USEDEP}]
+	dev-python/repoze-lru[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	dev-python/translationstring[${PYTHON_USEDEP}]
+	dev-python/pastedeploy[${PYTHON_USEDEP}]
+	dev-python/venusian[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
+	#test? ( dev-python/webtest[${PYTHON_USEDEP}]
+	#	dev-python/nose[${PYTHON_USEDEP}]
+	#	dev-python/coverage[${PYTHON_USEDEP}]
+	#	dev-python/virtualenv[${PYTHON_USEDEP}]
+	#	)
+	#"
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pyramid/pyramid-1.5.7-r1.ebuild b/dev-python/pyramid/pyramid-1.5.7-r1.ebuild
new file mode 100644
index 000000000000..99de90acd49b
--- /dev/null
+++ b/dev-python/pyramid/pyramid-1.5.7-r1.ebuild
@@ -0,0 +1,38 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="A small open source Python web framework"
+HOMEPAGE="http://www.pylonsproject.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/chameleon[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/webob[${PYTHON_USEDEP}]
+	dev-python/repoze-lru[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/zope-deprecation[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	dev-python/translationstring[${PYTHON_USEDEP}]
+	dev-python/pastedeploy[${PYTHON_USEDEP}]
+	dev-python/venusian[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/webtest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep \
+			'dev-python/zope-component[${PYTHON_USEDEP}]' \
+			'python2*' pypy)
+	)"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pyramid/pyramid-1.5.8.ebuild b/dev-python/pyramid/pyramid-1.5.8.ebuild
new file mode 100644
index 000000000000..0b72ea6d7c2d
--- /dev/null
+++ b/dev-python/pyramid/pyramid-1.5.8.ebuild
@@ -0,0 +1,38 @@
+# 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,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A small open source Python web framework"
+HOMEPAGE="http://www.pylonsproject.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/chameleon[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/webob[${PYTHON_USEDEP}]
+	dev-python/repoze-lru[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/zope-deprecation[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	dev-python/translationstring[${PYTHON_USEDEP}]
+	dev-python/pastedeploy[${PYTHON_USEDEP}]
+	dev-python/venusian[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/webtest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep \
+			'dev-python/zope-component[${PYTHON_USEDEP}]' \
+			'python2*' pypy)
+	)"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pyrax/Manifest b/dev-python/pyrax/Manifest
new file mode 100644
index 000000000000..76292124d85d
--- /dev/null
+++ b/dev-python/pyrax/Manifest
@@ -0,0 +1,5 @@
+DIST pyrax-1.9.7.tar.gz 313170 SHA256 6f2e2bbe9d34541db66f5815ee2016a1366a78a5bf518810d4bd81b71a9bc477 SHA512 e83c5e79d49eb3095e8e196b4c9db419194131503d95737564e5a1e3e20f06aa4b53196111d8d326ac50041cd0c2590cefeb41d7d6d654112a85df867b7495f3 WHIRLPOOL a41c5d8ba30b72fd3b07fa43300a8123ed3be93bf4d70db9fd3df3ff90d9415c4dfe895ca2f89457a300f1a738e93b6cd1b0bd0f81edc4ee905bad003f05ec1d
+EBUILD pyrax-1.9.7.ebuild 1076 SHA256 f0388bc2042fa3d00146820fb18e47cdeb49c6e0d7d50da485236d57bbdee63e SHA512 dac80fb4d86a79e6a8907dde2c2aa8d02765647ad77d4f547e3c384ce968e47ffde1bc73f9287a430d0284bb089846034773cbe4239f4245daa9286a5b0b9231 WHIRLPOOL 1c27c7c1fe94b32c61f6b16b3424410d0788c1fbdc85fddee16a5c2a2008296b33a47a5d01bde5d3cdd1f41f04071becb6b89e77c1fee1103c5d2e0ac7888242
+MISC ChangeLog 2667 SHA256 bf70664fbcdb77e9184af9051dc75f08f6ac153b31550c6fbb14c9acbbdc93db SHA512 771beff19799c4476ac71aa5d1aacc5f3d5393b93a1b1a3b27f2dfac9cbeb285dc1f1b2097295459f4049a204f76981a81e9ee7777844cdbd6448d6a90ab48d0 WHIRLPOOL b75971e2dcd7063f8cc86d03600685023970c91cd3ff9428a0905e6dedd9eaedd5b71c69660c86723341e4ad048dfa5b4f906a844e0553f1a8b7e02ea7eaab92
+MISC ChangeLog-2015 3609 SHA256 eca6f70ddfd7ae00db3ff5f4918ea8ed33257a08a9eecccf08fe346ffaf2ae0a SHA512 7ea47a56e0d1acd502fd6d5e3d7cfb0149a3a522e59cb0e5f72c572e0ae14212fe67bac8e4c9431e579d118b96a041fe22f8acf0819974d0af58451fa8cdb3f2 WHIRLPOOL 5a91fb742344312a22a70bcd0a08b8072c0544d774c51ca932c9f20276d27c0344e542596c2e3adb09800530c1594402644f7a0e714e83b421369707451a91b3
+MISC metadata.xml 803 SHA256 f0ea07c504d61749d2ff1d7117a30a341c4ff35b97363e0484a4993ad0d66708 SHA512 8be1c472f6b6ad1231d32a58ead0ddf9eb51fbd7fc245f8de2b7905234efd3fd63602934d6048f6beb09166cd6fcdd9b43e5900a1aab680261402c1ab35329f4 WHIRLPOOL 1c0ee5009630b3278bc85f210688bff707573e0511c67e76545f69cb6aea161f167655e17b58f21d8ed2dc9220ee978c708e092a263240f4498849c163ba401f
diff --git a/dev-python/pyrax/metadata.xml b/dev-python/pyrax/metadata.xml
new file mode 100644
index 000000000000..42df4d0552ba
--- /dev/null
+++ b/dev-python/pyrax/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+    Python SDK for OpenStack/Rackspace APIs
+	pyrax should work with most OpenStack-based cloud deployments,
+	though it specifically targets the Rackspace public cloud.
+  </longdescription>
+	<upstream>
+		<remote-id type="pypi">pyrax</remote-id>
+		<remote-id type="github">rackspace/pyrax</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyrax/pyrax-1.9.7.ebuild b/dev-python/pyrax/pyrax-1.9.7.ebuild
new file mode 100644
index 000000000000..364b110b6959
--- /dev/null
+++ b/dev-python/pyrax/pyrax-1.9.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python language bindings for OpenStack Clouds"
+HOMEPAGE="https://github.com/rackspace/pyrax"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+CDEPEND="
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-2.13.0[${PYTHON_USEDEP}]
+	dev-python/rackspace-novaclient[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${CDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/rax-scheduled-images-python-novaclient-ext[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_test() {
+	nosetests tests/unit || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( samples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyregion/Manifest b/dev-python/pyregion/Manifest
new file mode 100644
index 000000000000..387d58a28e38
--- /dev/null
+++ b/dev-python/pyregion/Manifest
@@ -0,0 +1,7 @@
+DIST pyregion-1.1.4.tar.gz 99454 SHA256 2d7d5ce46a3b4177978d4901c9c46ce402165113049006b923f5346b014973b9 SHA512 572a10593dc93f64ad6fd1d7a8f19582df04309b88a73fb41e3b4c71036d61c3857114cc01025e581ddd3a63af92fabb5375c1ee8fe487f83da2780569954236 WHIRLPOOL 54791087d514e9c4b0e850c77219ed4d453a2a86c148ce04f2dc8cbcdc9138e075860acc6c2812e9033cfe15cca2b093d792186a2b47f903c747d2486feab8bd
+DIST pyregion-1.2.tar.gz 1133496 SHA256 4f57070564526974661bbbf96cd1d509a708909002dd34f0354ac80c391b5e61 SHA512 80f851ecc8ec60a287b11b558fab920da7565c3574b0e6e977b8c8e3f40951f0407b27cc1c24e0d9d864f9b853b03053e9fae3ee81a32ab36078f2c8ce6334b9 WHIRLPOOL bef7db8c184d7e9f3aad4ab7d8494ff8b512ecc275e81202f66727658eabb1a6ef3d47fefcf7eac4ea5390a2baad08e5c370efcc6d908130ff265a73701f8e45
+EBUILD pyregion-1.1.4.ebuild 738 SHA256 2c35430e5038531a3f10434d53efb7546847c80e122782b0875d5a11fd2e1400 SHA512 bce60d3c8a038de4a1c1a8c4ce6937a9b434e5848be2863254ff7d7dafda2e3f7c1e6a28ee1bcafeb057dcc60d62a1736d35f2e925ec0cefd44b308bb5b8ab67 WHIRLPOOL ffaf2ad0fa32a14d1b5417508415772634e6831de1970aab164b3edae02733a260467471865b5442d8433d6d6b030dca473ff839b8e29a372d52e53c4638ad08
+EBUILD pyregion-1.2.ebuild 1543 SHA256 eb059a81dab3459024d96f5f08649a3e3bfe283042fbc800e0567e8673d75a40 SHA512 65b302cd2224b88a90bd3a106a2e68899610d33acd0ff3c42d6c7e9551f5deba5cb1f9ac104626e4d5475053930b89f5ae9e452340c5e0e2045f8204e1af3cbc WHIRLPOOL 6aa3d58f9bc1084400914887bcdc3d211bc107ef948c2e4f37cabdf9da0293b3d485df8dad192c694cc7e348155e7f9b0964dd705b4fd402810f2d5e629c137e
+MISC ChangeLog 3174 SHA256 03c2aefd090e6ca29959e0c2f15ce993a6308660d4ab297a00ff1053c6d02eb8 SHA512 c9f84c828f8029f4e190985970ef59add753ad96de724ca5d1cb3fa2f2a3728e088efb35b79807864adcf1951bdaf9b68139c03dc3f9c6e169bd342a516f2cba WHIRLPOOL 6ced26b63122dc5a153c33198a6f83b87d8bdbe6e9122752288db683b8fd90f2792d2f775dc122a641143cdb932d43700c3928101fd07cef27210f706052c6f4
+MISC ChangeLog-2015 1995 SHA256 17202fdc9a7ba2013f43a4c41e42b769cceb4f3e891d31a62bec405c2471c1b4 SHA512 be76add06f6b4b3ce14a866fba9bdb86f4b2da274a2f45c468590ca510d23014fd0c1a46be0e6740ceab0cfdfb41110aa44707b6395436c8358af8e4763cb3bc WHIRLPOOL c1b11f0bcc048e73fc5a7e869c494d254ae6dc2d277004db8669d1ecac3c57105e88755c69d889611a80d7ffef090683577f467760da28d448df3b4a3f931cd2
+MISC metadata.xml 512 SHA256 8aa6e54c2ab49b4fcbe8fe5cbd24d3fc150108b22ac110fdd3e536d395ca6ada SHA512 0187a79d485d66fed785fc6ee8288be4cde62e47a7fec9ae3ffe0b4235125025e63496d53caa606d360ed95cab11fb448bf39ac39601d2913fe59f7a158aa946 WHIRLPOOL dacdc7ed3e47f3d5e72023498d130d8a89c12dc434c2f03dc35d63d1f1cd8f34d47a663de68c0ec19c8a89e1b41672e0ab478ffee7c0b86241e067156002b7c7
diff --git a/dev-python/pyregion/metadata.xml b/dev-python/pyregion/metadata.xml
new file mode 100644
index 000000000000..255624cbc7ce
--- /dev/null
+++ b/dev-python/pyregion/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>sci-astronomy@gentoo.org</email>
+  <name>Gentoo Astronomy Project</name>
+</maintainer>
+<longdescription lang="en">
+  pyregion is a python module to parse ds9 region files. It also
+  support ciao region files, and can draw regions using matplotlib.
+</longdescription>
+<upstream>
+  <remote-id type="pypi">pyregion</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyregion/pyregion-1.1.4.ebuild b/dev-python/pyregion/pyregion-1.1.4.ebuild
new file mode 100644
index 000000000000..69753f59d42f
--- /dev/null
+++ b/dev-python/pyregion/pyregion-1.1.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit distutils-r1
+
+DESCRIPTION="Python module to parse ds9 region file"
+HOMEPAGE="http://pyregion.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="MIT"
+
+IUSE="examples"
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	|| ( dev-python/cython[${PYTHON_USEDEP}]
+		 dev-python/pyrex[${PYTHON_USEDEP}] )"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/pyregion/pyregion-1.2.ebuild b/dev-python/pyregion/pyregion-1.2.ebuild
new file mode 100644
index 000000000000..d4dac7cb0776
--- /dev/null
+++ b/dev-python/pyregion/pyregion-1.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Python module to parse ds9 region file"
+HOMEPAGE="http://pyregion.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="MIT"
+
+IUSE="doc examples test"
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		dev-python/wcsaxes[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# use astropy-helpers from system
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	xdg_environment_reset
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_sphinx --no-intersphinx
+	fi
+}
+
+python_test() {
+	virtx esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/pyrex/Manifest b/dev-python/pyrex/Manifest
new file mode 100644
index 000000000000..2ee9bce2c3b3
--- /dev/null
+++ b/dev-python/pyrex/Manifest
@@ -0,0 +1,5 @@
+DIST Pyrex-0.9.9.tar.gz 255272 SHA256 5f87df06831d0b3412eb4bc9d3fc2ee7bfae1b913d7da8c23ab2bf5699fb6b50 SHA512 724b14278760fffb751bd9dc24e18dbe85732f069d186ee89bc9f28dd8f912d5f69492d28e705f55de2db56c343f10f21c6a1c39bda1d7c234d09a3d5e192f6b WHIRLPOOL e89ab2369d3f73d85c4219f6f652b4450b22d116b5325fd0a7b544946071cc8cd480ca3320343b99acdaa8c48c313ac96e43316efed29f3e698980d19c5e1479
+EBUILD pyrex-0.9.9-r1.ebuild 859 SHA256 03b84a65fa4a63d2cb6700b2a3544e6e28613dfa0f8cb42d2c91ff1523f8aa26 SHA512 c039244cd454f2cb8df2585cb5959f6c3b7fd529c685ab1601b33c71ef0b3b53405c94d4be6d49c689e41bffde3eed51ec1f091ff950cab3967456fe64a884d6 WHIRLPOOL 72154b9ee509bd36e8d2ad3728ef844cf125cc317ae6311b4f1b9719b674348baaefd998813338577a22fa60f4f052f6ebbe5d7070484e8284c2ea6a2154becd
+MISC ChangeLog 2429 SHA256 65cbcb91e2d43b96287c15ef7f11f783604f9b987e419bfe90236c0c317dc6dd SHA512 684a31594133caa18745c4b957019eb7011538c79ee0f0d51a54ef40035e3dd744ad62b3615f2ad215682fe5354d3b68d1fb130d759959b434861a5e09dcb14e WHIRLPOOL c4666f5485af2757bfe1ce0ce1b3738b5a1b1ab8af6275dfa4f3a12e90966fd0913606d80ef424aef27cab0581a572811e0a9a5613fd4ddf5989ac2ae7e1fff4
+MISC ChangeLog-2015 13002 SHA256 8bc62cf9941d6a2aafa863bf2c4eaf2570c23f1b5466dffec5386d8f6f2d4237 SHA512 e33f68716521fbf2579b30769e98345148f9bed69ded30286e146978a06ae53dfe306af57195092f1516707033a12987df65fb3391501f1b1140ed916467bdb5 WHIRLPOOL 948a07944e56744588a5e942f434bc58d9ba493f037973f20a5da754b39cd79b3e55bae684ec04bb22fb9c7ac2b83d89da5ed15e803a9657589fbf2f3f2cc2cc
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/pyrex/metadata.xml b/dev-python/pyrex/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/pyrex/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyrex/pyrex-0.9.9-r1.ebuild b/dev-python/pyrex/pyrex-0.9.9-r1.ebuild
new file mode 100644
index 000000000000..23522a411b19
--- /dev/null
+++ b/dev-python/pyrex/pyrex-0.9.9-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_P="Pyrex-${PV}"
+
+DESCRIPTION="A language for writing Python extension modules"
+HOMEPAGE="http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/"
+SRC_URI="http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="examples"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND=""
+RDEPEND=""
+DOCS=( CHANGES.txt README.txt ToDo.txt USAGE.txt )
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dohtml -A c -r Doc/.
+
+	if use examples; then
+		dodoc -r Demos
+		docompress -x /usr/share/doc/${PF}/Demos
+	fi
+}
diff --git a/dev-python/pyrfc3339/Manifest b/dev-python/pyrfc3339/Manifest
new file mode 100644
index 000000000000..a29b0c76bede
--- /dev/null
+++ b/dev-python/pyrfc3339/Manifest
@@ -0,0 +1,5 @@
+DIST pyRFC3339-1.0.tar.gz 9325 SHA256 8dfbc6c458b8daba1c0f3620a8c78008b323a268b27b7359e92a4ae41325f535 SHA512 abcfcfcf516ab60214dc11de618d37415da2177387f51f85da99ef18b8cc0d37ed55f0ea6ba3e61292ce5a319838f322e01c1c9f3c0c4edb8341b4b135e575e3 WHIRLPOOL e85e475b309c806d133cbde24508cd4e57cb9a8da31c83b8b880aac64acfe577545e48d7fc70b5d6f5a6ea85d813ae72fbb98c54faf534bad5b5750bdf573c5b
+EBUILD pyrfc3339-1.0.ebuild 671 SHA256 ecb8facac1af4957f619e043d4397afd9fc36761bff549cdbbe2515b37cbc599 SHA512 f5628a1a193e4041a9bf4803f9f1d8517a29a80e96cbd169f76c8bf0e1f48ee80bbbfb2d58c418933a0a35b7c8d92ae84b97bb268b35619b590394f8d423101f WHIRLPOOL f1f064d554803b1654b2b8cfc1b13a445b9928bd5f692099b11be0444210bfff90b98b68bf373a6c9643af0ff234d82e4caa886a974d29a4d189de6f2b0f376a
+MISC ChangeLog 3327 SHA256 9a3fc6615e28ef43590bcd4d6bd63e0921daca587d6da1c6cb8f12c643bcc7e2 SHA512 4645a8551603ea7d05f34cf182dca87b07a80cc40557fbaeec282097a6888f25b7196e9fd71a409b04530c90fb422f2b03062f76cf8d4e0c60ad93aec7ee1d23 WHIRLPOOL 64625cff4fb9ec691f1d4691d30d2123a78072dac0caefcdca3146e7a907df7de135739f7252907e2603cdabd60a091e1785985d8593abdd3201e652b16e25b2
+MISC ChangeLog-2015 471 SHA256 22f4a4f164c60b7eaf03d7d2ab3c88989b0185c723f4124c5dfbbc89e086b002 SHA512 409005c1b9fe4abb8214afe0b567e7efee537538dcdeb650772dffddf536457ae36556c696d6719dc6f15856031c27438c7841e5a422c45ac6ea69c5a0c28802 WHIRLPOOL 0bb20646f39bd549b835b1cd493e6100d5cd890afd5b8b53c87b19da219b08e97cba0d1d7c628687676a4160d134068805f6ad48d6ca5aff193ca2808a9f7474
+MISC metadata.xml 373 SHA256 0727c38e09a07d6821dd8db11ccd2d66c78e116a1acecf545da88a902659437e SHA512 0f0ef1e95f7cf557a90cbf2493f0f1ba51c29cbe10769dc40b1dd56eb24e91c7ca6579feaa3afc65c9d90724c726f6d1bb4f978d6485018e19f39ecf81782a87 WHIRLPOOL 3f1eb0b492545f3fa665391f5ab1ee9cf6b4b5895a8d44a3a9b7e13c3d7f9f65dacbf45e25689173ecbf41fb442f494785b0f52187f2c82a80b1fdb027a07478
diff --git a/dev-python/pyrfc3339/metadata.xml b/dev-python/pyrfc3339/metadata.xml
new file mode 100644
index 000000000000..d999c82d3b4f
--- /dev/null
+++ b/dev-python/pyrfc3339/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyRFC3339</remote-id>
+		<remote-id type="github">kurtraschke/pyRFC3339</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild b/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
new file mode 100644
index 000000000000..4d1fa1220e48
--- /dev/null
+++ b/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+inherit distutils-r1
+MY_PN=pyRFC3339
+
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Generates and parses RFC 3339 timestamps"
+HOMEPAGE="https://github.com/kurtraschke/pyRFC3339"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/pyringe/Manifest b/dev-python/pyringe/Manifest
new file mode 100644
index 000000000000..17405e1b67c2
--- /dev/null
+++ b/dev-python/pyringe/Manifest
@@ -0,0 +1,5 @@
+DIST pyringe-1.0.2.tar.gz 42804 SHA256 b93f5710c05c8022d04b0145b54825d8748469c04deb7bc6b12fa44174e39324 SHA512 8da1572fda50bd135dc5d49d41a2f5c9cf2f5a7af729aaa9c34cde892a76e5a1b0a6818a6ed67f0f757910eec77f9931daade627141dd9964e9545ccc75a6052 WHIRLPOOL 68b8ed5a93578ed3d688e1d7cbd5d780cdac911b46bc73ea98380dae905e48241d489388ed9caf11d898a5015b8bdf771ab4ef479d7b80013e4d6bec759f30e2
+EBUILD pyringe-1.0.2.ebuild 477 SHA256 5dbeafdf33f7afff6285cdc522e52fba4e2f0bbd420b334fb01160e060517fa6 SHA512 7a0875170fcad679bf7174279bb72be087dac0775e054d8b8aa06364b8938dfb64e84ef9af4427aec8351d809f938ae5cb6138b93878c15033c715a0c82c6adf WHIRLPOOL e29a9ecb354dac060c91b149cdbe123a9c7a30bd1300fd5f451792bb15bad0f51a8db8796197df9d512abd507b5bc78c0c1349d46deb42696994712599cab3db
+MISC ChangeLog 2320 SHA256 a6c496074bf2b1a3ddd7b609e283dca53c21139921e43eda39ffc0843c176e21 SHA512 a13f852660b649d86eee15f0d02463428b6152055a560b9113a38685abc03cfc1ca579a141cc5241c950248d54651a21b41f752070074fd1f0bfadff5719fc4f WHIRLPOOL f355883d03b5a2035ad843d4120a40f8e9789b920a3d8de392bdc06341212fb8d3f0268c6b794ca070608b57470aae2333ff4319b1afbc53f64a371472dc53fc
+MISC ChangeLog-2015 613 SHA256 ac64c75ab89cd792d5905bf811f08974aa65cbd06ed89bdde8c58b6b284c65a8 SHA512 ca518a3c6d5f43aaaa53f37fa0add5a77dbc484ae9cd39b4b19999cc5945ee257e7b6cbad757100f05f67b1f5b8f1c7c5426641eb9e2a7936a8dd69dd40e159f WHIRLPOOL 1d7c88d8738505b42264c4234013fe81ea404c189dcbcfe75d41d8d4841aeea5a68c9d64241370fe3c8a1888e5533da97dc92390ea64097c77d760783fee00e9
+MISC metadata.xml 269 SHA256 4de5bdc8bc331d63d480452732fb7f0666c1b6d27e5d6a15f550485c7f53e132 SHA512 d3d03322123b7f5014b1c28e0689630db6935a65f3329c6960e27117ea0d4f90d8ed60ed058c54a69103ec6e422871a43c19ce8cedf7e68d72e5bedf7c91c1fe WHIRLPOOL f9b8fdaba2260859deccbaf146804307ce2dcdf628a17e8d064921a60d9ba1544875774625c84248245ff14d104d814186d38f14ec4c09abda13a00add99afdc
diff --git a/dev-python/pyringe/metadata.xml b/dev-python/pyringe/metadata.xml
new file mode 100644
index 000000000000..9223541da6dd
--- /dev/null
+++ b/dev-python/pyringe/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="pypi">pyringe</remote-id>
+    <remote-id type="github">google/pyringe</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyringe/pyringe-1.0.2.ebuild b/dev-python/pyringe/pyringe-1.0.2.ebuild
new file mode 100644
index 000000000000..43f8f7a8d5b1
--- /dev/null
+++ b/dev-python/pyringe/pyringe-1.0.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Debugger capable of attaching and injecting code"
+HOMEPAGE="https://github.com/google/pyringe https://pypi.python.org/pypi/pyringe/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+DOCS=( README.md )
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
new file mode 100644
index 000000000000..ffbd68b73b44
--- /dev/null
+++ b/dev-python/pyro/Manifest
@@ -0,0 +1,9 @@
+DIST Pyro-3.16.tar.gz 298769 SHA256 1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578 SHA512 d0e4ae93120a6566a2b06fa52b66e20daa972324a9d57d639ca68171e1e6e5c412250f7e6af3fc307631d2270be3731ea5898ad35819dc0369e6a2d8341d5965 WHIRLPOOL 0d7efcead6bc7a31a690c012a4213c835d43ca932e461ab25ddb2e12636970de2c3da6feb4915385bdadaf2261558d2041d5e6dad9899f11e450aa0a065460da
+DIST Pyro4-4.41.tar.gz 502294 SHA256 3af4749140e9d4032632277ac19e7fd4761856d2df0f0643c574d1e7174a9703 SHA512 01c3f16448b39cd7a83c845eec86013315ee183a3e50c6caee1d327308e67ff63732833b413b189ebcb77cdb3fc65bbd7417ecbfc8575775ff79550678bce020 WHIRLPOOL 4ff63737b01eca22bc1dcd7e61a81ad3285c90ac1e03764edffe85b003eade780a936bbd74773f8d58d2a34dbe562bdfe332c5dd8ddd052f5a3928caa736d882
+DIST Pyro4-4.56.tar.gz 455253 SHA256 a80c27e1debbd8d8725ee4a8f0d30cf831dde5e80b04bfa9c912932c4c13d6aa SHA512 88805f5d7108432f98d38267a7a881e35fc1e34ae32cc7a1640f4b6e0d69718a86bf195fb4e4eecbd53075667521585b7006cd5c5736e5ff1ed39b5212b91bef WHIRLPOOL 0e82a13c2bf5e23c5fcbf844417888fd2e02270a12d465c6388397c913bbb06ebdc770d3744593d66b9b30ffc30aeda03a50dd934db38840ba1baeeb80961ff7
+EBUILD pyro-3.16-r1.ebuild 742 SHA256 a4f0a07841b652e2e1d177fe191826743ec64cfbdcbcb3a1e6bfacd0a98e0bfc SHA512 5bde2f3ac26eeb775f29a368f1ff5dcb19d12a82a6f627041aba861bc20125c64c0fb483a9e5c158ac7f6b3544eae029a77961aac5a3c00b13f0c23aa89e80dd WHIRLPOOL 8537e95ff59ecf59d4aab1465e31f1ab77a7fc752b01085bba471a53eae26dc8a5665d3912ec201487cae4510bc79746bbea082f8910ea991e6e361eb166caed
+EBUILD pyro-4.41.ebuild 1915 SHA256 9742a619dce3eb60b9db1294512c8db5f4107cd8b20b1c921474e96cb7dea0e8 SHA512 92ca5686041d64ec368ec7f8d31b6560f04c55d4f2ccc8e1f462469e1c44fb8a0850b9c7f33af29c67740da03687a59153933548bfc4cf5c116b789ea0b19a9d WHIRLPOOL 775a85bbb3a2d9e106b6a5977fcec38c22d9bf35717169c81f8ec450abd9af6b120dc0f088cab113ce66532e59b4193c2e263619a5da56b2285d5619cb5761a1
+EBUILD pyro-4.56.ebuild 1917 SHA256 e04d1ee574ccd528dde87fdf7534ad46e2620ed559e63d1cdd14a28d090cc17f SHA512 c4c2e325879f0b3fa77d191f34cf2f16a63517f7141f60078c8747f36473d2a1345d7cf73bba3f12a32d44eb9052d78ff95ff432e43567c938b13349a935d337 WHIRLPOOL f9ed292618600ef18492d643cbc59972e2bedc5c7d588730521ddcbe9e69a114598353dcc63a599feef0d14a058616c4cf1604a12a347ec57c81806e4d1ae9b0
+MISC ChangeLog 4383 SHA256 fb2550efa14deb4b45a495e87fde39a49e6128c499a81b8a24ddbaaff069a547 SHA512 f2a96d427d0c4d2a2dfed32360ff24b031ac2edeb315965fb37c550d26c6735c4cecac7b551e28a8aadf10877668b2c560a9aeaf557c388a2d09bc2f44d0121d WHIRLPOOL 7e61ac8872e2e65a8a9cabe0ca1c0adda3baa6fdba8a452a2b0cb7476c7d3958ffc3d39c864be9a21e46b5f09a83de6bf9fcff7579f4b7010d3d36239ba2911b
+MISC ChangeLog-2015 21253 SHA256 02c7ddadcd0f8eef1163d220ee2725924b927219013fbc66866fa463533621dd SHA512 7583512a4501d726f6238a8fed2b588ca24f9e83215a12910622390e540f74231123e1b22ff6229494e98faaee29ae729a1a034878440226af907aac205bddcc WHIRLPOOL edebf185d9ceafca3372428d66900eb9d95c1f403cf48a62a926ed4eb664565ac6f811b21a29946663c8299e241db1702340357ed8a36927f01340b945f1c278
+MISC metadata.xml 370 SHA256 d7ec5ad29688855eb60213b3cf8dd3d27afb03cbe7ed200ff1ffcc35437e43be SHA512 59ce12c791648049dcaac68c75f9d8af472635442b25c4ba81b37e89d913b5b1954dbc40eac44694e5093008cbc41256ef2a177de1906598bb876ab0ab17d544 WHIRLPOOL 4a63bad3ef116bbc4241874a49fca0b306252f373b537c1121de3fc701f5ceb3f16bda2d5b441f406ad8197070ffd005725767f752dca27445b265e3fb587b34
diff --git a/dev-python/pyro/metadata.xml b/dev-python/pyro/metadata.xml
new file mode 100644
index 000000000000..47aaae3963b3
--- /dev/null
+++ b/dev-python/pyro/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Pyro</remote-id>
+    <remote-id type="github">irmen/Pyro4</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyro/pyro-3.16-r1.ebuild b/dev-python/pyro/pyro-3.16-r1.ebuild
new file mode 100644
index 000000000000..4337e724e785
--- /dev/null
+++ b/dev-python/pyro/pyro-3.16-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_PN="Pyro"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Distributed object middleware for Python (RPC)"
+HOMEPAGE="http://www.xs4all.nl/~irmen/pyro3/ https://pypi.python.org/pypi/Pyro"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+DEPEND="!dev-python/pyro:0"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/${P}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/pyro/pyro-4.41.ebuild b/dev-python/pyro/pyro-4.41.ebuild
new file mode 100644
index 000000000000..b788f9063a01
--- /dev/null
+++ b/dev-python/pyro/pyro-4.41.ebuild
@@ -0,0 +1,77 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+MY_PN="Pyro4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Distributed object middleware for Python (RPC)"
+HOMEPAGE="http://www.xs4all.nl/~irmen/pyro/ https://pypi.python.org/pypi/Pyro4 https://github.com/irmen/Pyro4"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="
+	!dev-python/pyro:0
+	>=dev-python/serpent-1.11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed \
+		-e '/sys.path.insert/a sys.path.insert(1,"PyroTests")' \
+		-i tests/run_testsuite.py || die
+
+	# Disable tests requiring network connection.
+	sed \
+		-e "s/testBCstart/_&/" \
+		-e "s/testDaemonPyroObj/_&/" \
+		-e "s/testLookupAndRegister/_&/" \
+		-e "s/testMulti/_&/" \
+		-e "s/testRefuseDottedNames/_&/" \
+		-e "s/testResolve/_&/" \
+		-e "s/testBCLookup/_&/" \
+		-i tests/PyroTests/test_naming.py || die
+	sed \
+		-e "s/testOwnloopBasics/_&/" \
+		-e "s/testStartNSfunc/_&/" \
+		-i tests/PyroTests/test_naming2.py || die
+
+	sed \
+		-e "s/testServerConnections/_&/" \
+	    -e "s/testServerParallelism/_&/" \
+		-i tests/PyroTests/test_server.py || die
+
+	sed \
+		-e "s/testBroadcast/_&/" \
+		-e "s/testGetIP/_&/" \
+		-e "s/testGetIpVersion[46]/_&/" \
+		-i tests/PyroTests/test_socket.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cd "${S}"/tests || die
+	${PYTHON} -E run_testsuite.py || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyro/pyro-4.56.ebuild b/dev-python/pyro/pyro-4.56.ebuild
new file mode 100644
index 000000000000..60026395443a
--- /dev/null
+++ b/dev-python/pyro/pyro-4.56.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} pypy )
+
+inherit distutils-r1
+
+MY_PN="Pyro4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Distributed object middleware for Python (RPC)"
+HOMEPAGE="http://www.xs4all.nl/~irmen/pyro/ https://pypi.python.org/pypi/Pyro4 https://github.com/irmen/Pyro4"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	!dev-python/pyro:0
+	$(python_gen_cond_dep \
+		'dev-python/selectors34[${PYTHON_USEDEP}]' python{2_7,3_3})
+	>=dev-python/serpent-1.19[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/dill[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-0.4.6[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed \
+		-e '/sys.path.insert/a sys.path.insert(1,"PyroTests")' \
+		-i tests/run_testsuite.py || die
+
+	# Disable tests requiring network connection.
+	rm tests/PyroTests/test_naming.py || die
+	sed \
+		-e "s/testOwnloopBasics/_&/" \
+		-e "s/testStartNSfunc/_&/" \
+		-i tests/PyroTests/test_naming2.py || die
+
+	sed \
+		-e "s/testServerConnections/_&/" \
+	    -e "s/testServerParallelism/_&/" \
+		-i tests/PyroTests/test_server.py || die
+
+	sed \
+		-e "s/testBroadcast/_&/" \
+		-e "s/testGetIP/_&/" \
+		-e "s/testGetIpVersion[46]/_&/" \
+		-i tests/PyroTests/test_socket.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pushd "${S}"/tests >/dev/null || die
+	PYTHONPATH=../src ${PYTHON} run_testsuite.py || die
+	popd >/dev/null || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyroma/Manifest b/dev-python/pyroma/Manifest
new file mode 100644
index 000000000000..e754f0cf8e58
--- /dev/null
+++ b/dev-python/pyroma/Manifest
@@ -0,0 +1,5 @@
+DIST pyroma-1.7.zip 359654 SHA256 5498d46cb690404d70351aacaf04e61a709ca48c24c803ab5aac7fd7a1629518 SHA512 d7c95283273befbed6a747a1f3c0aa0af0db5c8d486128bcf5a3439dfe7204e1025afcf22cbdf5b96b6f4302b8d569c60c1eb9c646c035fd8a324e3d69f7195f WHIRLPOOL e5fc4a47c258db50ab2d5bb033e66cc6d589864c8d63bd448ddf491de849dbc87a1c93ccdde8729ff824e437dc8d2fefb05e536eb772507c0239c91983a22dc9
+EBUILD pyroma-1.7.ebuild 601 SHA256 6e7c76a56c0e82d0eb261077a309655c94e49b3a2c243fbaa64286b1e8dd309f SHA512 108969e5f32aa78d6402c689360db0a11a4816148215a8cdff53381dbdff2821ce0463ec1f74d56821262349dac6507f1ca67c5f858d2d3a015b570f9bfa55cd WHIRLPOOL 120a57f16f5f7c7ae549239b4c35576f1a3371495ace9de5dc015f9bf6f7e5d91dd487fc16d6076f5639da825e0b81e6f9cd843632d9cade024b52e913441b17
+MISC ChangeLog 2438 SHA256 c55b5c5e6f248db718be72111d1f6ce7999784c661ae9cc74dbeb1992abae5ad SHA512 b5760f96287f1398fe0ceb88a779dd19438ef4fcea9f7e12baf4f34032658bfadd0a806004791b674ef37f9fa4eb9a02d7f439dd60ada099536b3c98ffb15441 WHIRLPOOL c99f1dc9356e51934778fedc99c9c602114c0eb1b0c412c6e6a45fe9bc13648fa17c784f6fa180bbfce87e2e944babc6955e1c009e22047d208aff776abd6c20
+MISC ChangeLog-2015 889 SHA256 7d57e5e8a9b673b1d2939fbf028a5a7bc5ed62bd79350ab9c1d6d06f01a3cf3b SHA512 668e28b27cae475d6b8c0534bdc469108bd8a3bdc51db2af8197b350284e27494a91d340df976cd12b875fc992f44a93970dd749ab5af9da2d0e44a67c579f28 WHIRLPOOL cedb7e931e6ba67a46a935f1ac580ab9d19a75e2ca5ab0cbd647b0855a3f7f54e21ff95c35ed54cc90ec8f455deff8f9fbd0fe977d6291c29d07c2c0cbb2cf4c
+MISC metadata.xml 271 SHA256 c0171ebccbffedf15aad76a49f6073e706af040f00d0e00a3b19a04f1ba07878 SHA512 7345d6ef057762aa750573ecce7c46f9dcc53f9f19775b23e6dc4bf66b04ebce7fc076a94ffb3687d6fe27010da5755aacef273addfb672f59c601879d55898a WHIRLPOOL ff43d188be55852e790df82e732941062164de503908d435cc8744eb04556686a27078b152102fc99686c53d6bbf079232a8fe40044bcbae6a189b334357d570
diff --git a/dev-python/pyroma/metadata.xml b/dev-python/pyroma/metadata.xml
new file mode 100644
index 000000000000..55f8d1cfd0ae
--- /dev/null
+++ b/dev-python/pyroma/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="pypi">pyroma</remote-id>
+    <remote-id type="bitbucket">regebro/pyroma</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyroma/pyroma-1.7.ebuild b/dev-python/pyroma/pyroma-1.7.ebuild
new file mode 100644
index 000000000000..f0d268b29565
--- /dev/null
+++ b/dev-python/pyroma/pyroma-1.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Test project's packaging friendliness"
+HOMEPAGE="https://bitbucket.org/regebro/pyroma https://pypi.python.org/pypi/pyroma"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+DOCS=( README.txt HISTORY.txt )
+
+python_test() {
+	"${PYTHON}" setup.py test || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/pyroute2/Manifest b/dev-python/pyroute2/Manifest
new file mode 100644
index 000000000000..49d7ef076c08
--- /dev/null
+++ b/dev-python/pyroute2/Manifest
@@ -0,0 +1,5 @@
+DIST pyroute2-0.4.12.tar.gz 562555 SHA256 98e2e4841541aa180d14e301c5bfbc2d258e697e6dc76c88855cbf8b86375733 SHA512 d666c29cfb8da1e13748976030dc5ec153d2740f6df7f279a6e9fc4ec9b6ad60462c2a2b57905c4a4c8566da1de30dca0bb24b3b6c5a97bb729c074584270e2a WHIRLPOOL 7c26309bd6118bde2ee901a270b3494411f208695e924a96ec623c1a81c02f76e1d915bfc2620cfd21e7d2d935f97dfc963e5bf66de2523f3127b7033ca44e55
+DIST pyroute2-0.4.21.tar.gz 577795 SHA256 7afad28ee0a0f3e7c34adaa9f953d00560ed9910203e93f107833b6e8d151171 SHA512 e8cf2c66d63e4549fd4c0d5ed1b503fc72eb5eb6026b959e1b783aad66cad475118a645f5ca394a1a77e7cb0557d12565857db8e0f1b1cbe8c666be957a7a88e WHIRLPOOL 09b668e39746081c9e37e7b9930323bb4a2a903d9e8cfe4d4072e4bafb4d00508d45808274815763b2c67f4c62248c99c4dff75b003560a974439a1e42557984
+EBUILD pyroute2-0.4.12.ebuild 501 SHA256 b330186eb7dbb84ba318708abaf524452b4eca786719a30ad45d851af982e9f3 SHA512 d91177d5e9ce975a40a090718b3bf65392b073385c76fa2afd9aed6334953defb342d451a959465111fec12409d366a6726c2667653af3b8f8318d6859c66523 WHIRLPOOL 5893b2e8c5107aaafa90a1959ffb14a879cfc9762cd920b37a29a5993f33d10cc3d6d4a142cb1afb1302df26ca36c900fa4e9f8e97629f6b61a6af06ce0da819
+EBUILD pyroute2-0.4.21.ebuild 501 SHA256 b330186eb7dbb84ba318708abaf524452b4eca786719a30ad45d851af982e9f3 SHA512 d91177d5e9ce975a40a090718b3bf65392b073385c76fa2afd9aed6334953defb342d451a959465111fec12409d366a6726c2667653af3b8f8318d6859c66523 WHIRLPOOL 5893b2e8c5107aaafa90a1959ffb14a879cfc9762cd920b37a29a5993f33d10cc3d6d4a142cb1afb1302df26ca36c900fa4e9f8e97629f6b61a6af06ce0da819
+MISC metadata.xml 613 SHA256 e728cc9f00e020965e396f81338c7f231cd07f8a437a86e4ecc7140fed4975b7 SHA512 9c88578b74af7890a2ecd8437581eff4dfbb49696d9c3e6fe1bfa807fffad66f949538aaa08d57f56a11ffe95b48c9ceb9d6b97594635b429a8a54bac3db3912 WHIRLPOOL 3cab4dcff23745b6be81dc176db8b8c732a7c962fac4bf96ca06a92a3e488f3d6773d1bd398dfe8261401a3d1c8e41ce77794ddc4e217e71c673cc8112b3b3f9
diff --git a/dev-python/pyroute2/metadata.xml b/dev-python/pyroute2/metadata.xml
new file mode 100644
index 000000000000..23c656d2c235
--- /dev/null
+++ b/dev-python/pyroute2/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+	Pyroute2 is a pure Python netlink and Linux network configuration library.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">pyroute2</remote-id>
+		<remote-id type="github">svinota/pyroute2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyroute2/pyroute2-0.4.12.ebuild b/dev-python/pyroute2/pyroute2-0.4.12.ebuild
new file mode 100644
index 000000000000..1e5889bbd81e
--- /dev/null
+++ b/dev-python/pyroute2/pyroute2-0.4.12.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure Python netlink and Linux network configuration library."
+HOMEPAGE="https://github.com/svinota/pyroute2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND=""
diff --git a/dev-python/pyroute2/pyroute2-0.4.21.ebuild b/dev-python/pyroute2/pyroute2-0.4.21.ebuild
new file mode 100644
index 000000000000..1e5889bbd81e
--- /dev/null
+++ b/dev-python/pyroute2/pyroute2-0.4.21.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure Python netlink and Linux network configuration library."
+HOMEPAGE="https://github.com/svinota/pyroute2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND=""
diff --git a/dev-python/pyrqlite/Manifest b/dev-python/pyrqlite/Manifest
new file mode 100644
index 000000000000..d4684f0867e3
--- /dev/null
+++ b/dev-python/pyrqlite/Manifest
@@ -0,0 +1,5 @@
+DIST pyrqlite-2.0.tar.gz 7224 SHA256 7d924a66e05087f5a0d768c8727d271ab0005d7f312036000ffdf11378d5fd32 SHA512 9d284161e492683955000dd3e3f0593b79e69ba5eb087bee4d3ffc1e4be9de1c362212936b10e1781538eacd838e6ed22adfc82e8cc0dd00e1d3318a4dc14720 WHIRLPOOL 1ef58c2abda36758cf4379bbf8064068004a5907af373303877a84181db681e74ec3dd3c8726e21d261e9e0095219393d493353c5bd574cc4a1a24d923e9c7e4
+EBUILD pyrqlite-2.0.ebuild 901 SHA256 7c14971b57a4446dc3eda20444c2cbd78847c36c44a670b86828d13efa65fc47 SHA512 8b64908233584ccf2991d0932992664b7d180b57f2fd738b9f88b02631a93a7db520634bd66df57297f43da52a0cdb167ff2dc97cc3ab8b660055d22a4b5918b WHIRLPOOL 98aae580a1e7b1063310d9fdf27ac494b67ec5c6e01ff565ed157b1ac3879044b5cc4a16182ee984fbd237143483c2657bceeccf489cf5e0547215acb55058c6
+EBUILD pyrqlite-9999.ebuild 821 SHA256 a528b90d4861bc8ae1e710296acc0f8f4f8a8b149f4e2b909ffb65743c2bcf62 SHA512 18ea15e1868b8dd47e1639c9d402e8c8c414a0bbb10ba25ad539eee4824fa2be2d1df5506a24ba4649508a7e2843ee4c944b2e3099545b99430af1c13a94e399 WHIRLPOOL a0daaff120ae194330a065204b31f03ac884c423b3b3cd60924e92796f0ca00d0f1a7122cb882ebb9dfef1c481a93ebb5e266f45490542da4142c2363f4c797e
+MISC ChangeLog 356 SHA256 94fbc281d568310c13cdab5d01e1e936ed97e802f0dc53a23267aecd000082d9 SHA512 d0270565ddd75be21aebe71a55909e53149416ff52d27551d773f632d03c6b63b453616971c14ef2d1029a6141d881293d8e2fdbf6b796dd0c7ca034e7b2388e WHIRLPOOL aa4e932be4220403c732964a40871934e1eb8505a9c45bae2d365a4d0f889f3bd5e9a6eaab1e71e1f6759302229d6b7df4dfd5fa1c20d1d32f8294ced1ebb30c
+MISC metadata.xml 306 SHA256 041060ac515f5efe0323cf84f3aa5ffc7b97503130651e9058a6244476a90bd3 SHA512 f26c1056eb200c8b60e2d0f7ff54447465115afecd34949ba8358f812d95dea6d877928010ac81c8d36261479ff6a61982350a403546dd09e7f4bf9a082a9d7f WHIRLPOOL 84362454a7644777511067a3052fb69b765dcdadbc8e3cacb0180515923de6bd63eae96b81a77aaa6a0316cb305dd5040658f03d07b51f58558f13c4db7513f0
diff --git a/dev-python/pyrqlite/metadata.xml b/dev-python/pyrqlite/metadata.xml
new file mode 100644
index 000000000000..7a0a25fc94c3
--- /dev/null
+++ b/dev-python/pyrqlite/metadata.xml
@@ -0,0 +1,10 @@
+<?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>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">rqlite/pyrqlite</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyrqlite/pyrqlite-2.0.ebuild b/dev-python/pyrqlite/pyrqlite-2.0.ebuild
new file mode 100644
index 000000000000..93600a584e2d
--- /dev/null
+++ b/dev-python/pyrqlite/pyrqlite-2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+fi
+
+DESCRIPTION="Python client for rqlite"
+EGIT_REPO_URI="https://github.com/rqlite/pyrqlite.git"
+HOMEPAGE="${EGIT_REPO_URI%.git}/"
+SRC_URI="${EGIT_REPO_URI%.git}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pylint[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	sed -e "s:^__version__ = .*:__version__ = '${PV}':" -i src/${PN}/constants.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	esetup.py test || die "tests failed"
+	esetup.py lint -f text -E || die "pylint failed"
+}
diff --git a/dev-python/pyrqlite/pyrqlite-9999.ebuild b/dev-python/pyrqlite/pyrqlite-9999.ebuild
new file mode 100644
index 000000000000..5ba08115361b
--- /dev/null
+++ b/dev-python/pyrqlite/pyrqlite-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+fi
+
+DESCRIPTION="Python client for rqlite"
+EGIT_REPO_URI="https://github.com/rqlite/pyrqlite.git"
+HOMEPAGE="${EGIT_REPO_URI%.git}/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pylint[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	sed -e "s:^__version__ = .*:__version__ = '${PV}':" -i src/${PN}/constants.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	esetup.py test || die "tests failed"
+	esetup.py lint -f text -E || die "pylint failed"
+}
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
new file mode 100644
index 000000000000..2ee12920d6b0
--- /dev/null
+++ b/dev-python/pyrsistent/Manifest
@@ -0,0 +1,8 @@
+DIST pyrsistent-0.12.0.tar.gz 91666 SHA256 37e19cb03435a81507f3096bec2abfbe6a1bb4098f72159d0cd37f6f8394f3cc SHA512 dd0041011cb5aa41d32cfd632e80079a1e0e19f15366c928eabc040a85e9b574dc2d1a87139b150fa8ec42f6955ddffbf6e7bf8bfd9f498a9089632189949853 WHIRLPOOL b131eaf46a35ec5dd1cdc4818d271f784093faba1d50b67713429c84946811c72cd7d73bec1c5d3a44ac992ca4abbe347bd59155ae94d9703b749cd9f0ec8dd4
+DIST pyrsistent-0.12.1.tar.gz 94031 SHA256 59d97c4a1263a4f6dd730b1622c5b89ad80d307aba99f88ac31151465b51da01 SHA512 e8b1e361a50bdd2986b21d21be6a04f065a8a2008ecdb0873b8d3fc2dfcb8f78b8f1644afb7540955008b5fb6b73ca93eb1f487f96ebd0c109f3ca72291e5f6b WHIRLPOOL 1cbdbf54e3b4e71e0e0049e2c5ed7039b71169eec4f1e4ab258b1641fbf3c9e6db8bbff5d02309c3244f811d3e5816daf87d4183318cecc829f060e04f6c8863
+DIST pyrsistent-0.13.0.tar.gz 96326 SHA256 ede080bd770a6305bac53ac93ef80bbfb19be4c404a9da0593c73f360c9e4107 SHA512 6bfb657841382c4ad402c383cae5092b83e93a3dde0b905f6cb8ca8a50b8acbe0f3241e9cc50cb83892c0d59b13145764faa2a3db1eabecbe6606a35d07bb5ff WHIRLPOOL ec828e74e44a31e3deb32e9ef99bf24cf52c947bc1506c6e1ebc6cd08e37a72536aaf15c626f1e36970ac9b72833f7dab207fa4204836e6ec3b308960f15403f
+EBUILD pyrsistent-0.12.0.ebuild 919 SHA256 7fb1c7c69944d820875f609e3850c037be5379fa3c4e619ef8e5f35257b29e6c SHA512 bf6b3827ca3ec28a28cd04e2ea3dede70f0a678860203d1edc79b513411557b7998b226edfff4364d991aa39c6b61ac5f42d909384ca41dfc73a9374fa501ce7 WHIRLPOOL d24b7b412f8023986c9285d295d5af40e153f0e0f70e558b5eeb1eee5464f222221391dac58093c30d9804f3c646aebbf0166a5f85588b6a900b273311bb6074
+EBUILD pyrsistent-0.12.1.ebuild 919 SHA256 7fb1c7c69944d820875f609e3850c037be5379fa3c4e619ef8e5f35257b29e6c SHA512 bf6b3827ca3ec28a28cd04e2ea3dede70f0a678860203d1edc79b513411557b7998b226edfff4364d991aa39c6b61ac5f42d909384ca41dfc73a9374fa501ce7 WHIRLPOOL d24b7b412f8023986c9285d295d5af40e153f0e0f70e558b5eeb1eee5464f222221391dac58093c30d9804f3c646aebbf0166a5f85588b6a900b273311bb6074
+EBUILD pyrsistent-0.13.0.ebuild 919 SHA256 7fb1c7c69944d820875f609e3850c037be5379fa3c4e619ef8e5f35257b29e6c SHA512 bf6b3827ca3ec28a28cd04e2ea3dede70f0a678860203d1edc79b513411557b7998b226edfff4364d991aa39c6b61ac5f42d909384ca41dfc73a9374fa501ce7 WHIRLPOOL d24b7b412f8023986c9285d295d5af40e153f0e0f70e558b5eeb1eee5464f222221391dac58093c30d9804f3c646aebbf0166a5f85588b6a900b273311bb6074
+MISC ChangeLog 2508 SHA256 b13a54bd852b04828d191e1df9707c9aab9d94b1cb5a37d2c9b0a70126d2acf2 SHA512 d12b8bbbc2854a853e3d27878bbf357602bcf84a62bedf0594633399cb0d47945badd03bf1e7e08bc27cca97c9b539c66066ceafc899d5a56caaf492f4c80c33 WHIRLPOOL a50e9f3ed6ff4282b280f58d5352dc219790c22dcd85a7469493b9c986bdf2d5e58ffc3337abf72e2c7a526b7e2dff66e84b08f81318a4b7215a181019b00d54
+MISC metadata.xml 521 SHA256 32829140f710965990b804f7f7a31b2b1b1f23105fc4884e60d29c80a40bbf6e SHA512 16d13966bbf6d52360d9438a56a949e6e31a9d2ace85e319db27be14f85c8446ee28e00c6bafc9232b3608e3a209396dc601cb3ce193d3cb4e8284cc8b3cfef1 WHIRLPOOL 16b262fe14b4d00b8c003b1b9122338394615abc987e659ebbcc5a933f5d26c778eee37240430fe57ad543b507411588de37964c5c9758555939f7373bea7499
diff --git a/dev-python/pyrsistent/metadata.xml b/dev-python/pyrsistent/metadata.xml
new file mode 100644
index 000000000000..0f975ff05a3a
--- /dev/null
+++ b/dev-python/pyrsistent/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pyrsistent</remote-id>
+    <maintainer status="unknown">
+      <email>tobias.l.gustafsson@gmail.com</email>
+      <name>Tobias Gustafsson</name>
+    </maintainer>
+    <remote-id type="github">tobgu/pyrsistent</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyrsistent/pyrsistent-0.12.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.12.0.ebuild
new file mode 100644
index 000000000000..17a528298f0c
--- /dev/null
+++ b/dev-python/pyrsistent/pyrsistent-0.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Persistent/Functional/Immutable data structures"
+HOMEPAGE="https://github.com/tobgu/pyrsistent/ http://pypi.python.org/pypi/pyrsistent"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+# https://github.com/tobgu/pyrsistent/issues/
+# fails
+#RESTRICT="test"
+
+python_test() {
+	export PYTHONPATH="${S}:${PYTHONPATH}"
+	py.test -v -v -x || die ${PYTHONPATH}
+}
diff --git a/dev-python/pyrsistent/pyrsistent-0.12.1.ebuild b/dev-python/pyrsistent/pyrsistent-0.12.1.ebuild
new file mode 100644
index 000000000000..17a528298f0c
--- /dev/null
+++ b/dev-python/pyrsistent/pyrsistent-0.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Persistent/Functional/Immutable data structures"
+HOMEPAGE="https://github.com/tobgu/pyrsistent/ http://pypi.python.org/pypi/pyrsistent"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+# https://github.com/tobgu/pyrsistent/issues/
+# fails
+#RESTRICT="test"
+
+python_test() {
+	export PYTHONPATH="${S}:${PYTHONPATH}"
+	py.test -v -v -x || die ${PYTHONPATH}
+}
diff --git a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
new file mode 100644
index 000000000000..17a528298f0c
--- /dev/null
+++ b/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Persistent/Functional/Immutable data structures"
+HOMEPAGE="https://github.com/tobgu/pyrsistent/ http://pypi.python.org/pypi/pyrsistent"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+# https://github.com/tobgu/pyrsistent/issues/
+# fails
+#RESTRICT="test"
+
+python_test() {
+	export PYTHONPATH="${S}:${PYTHONPATH}"
+	py.test -v -v -x || die ${PYTHONPATH}
+}
diff --git a/dev-python/pyrtf/Manifest b/dev-python/pyrtf/Manifest
new file mode 100644
index 000000000000..28010006ed58
--- /dev/null
+++ b/dev-python/pyrtf/Manifest
@@ -0,0 +1,5 @@
+DIST PyRTF-0.45.tar.gz 32837 SHA256 7c0b7c35688041978786e959fd83dbdffee66ded9d40e1ad0441c460164a349e SHA512 d07478ba7db6d3ef3e6c1925a58fb50b18936fecc4562338dd5b05d23672a4509a719b657a5b9e60bab5351f2be77551354fc9b856d7a9d3d4539733b05ab360 WHIRLPOOL 625270c32f033e0ff03b4c0419097a7b61a97d3a869d7bdc1f41e8bbaff54565d26922e5d0b87495bef562387fd84056e997b934bbee1cef8b162775aee069cd
+EBUILD pyrtf-0.45-r2.ebuild 560 SHA256 ea46383db592d6d5fc4a9b18ff165a19138f8bacba08b636b4f205b59b23451b SHA512 3b914cf709737990f5cd0cb930e52796ca7f084cb089fb811e0708b987959d9895c20b5f55027455a6d27ebe2c24b3962d5532ff40b3190099ac5200e2131732 WHIRLPOOL 9f6a335d4b14b322b4fdcd5b68b7a3d5cc5d411d73c1f6787e07840b6969f623933b828b263a7fb010e4bcdda70cff01d5c797f349bfd27c261b8f07a9f5c382
+MISC ChangeLog 2945 SHA256 56cb158c299f176b5af255c7274674647f63d4d6ee2ddf468b270bd6f492b182 SHA512 f55676d63abacc8da7a14188780b2317c6dbaca29444114c9ea6e7dac78301dcb6d795168679834ad4dce81cf6cc75fe4c8598a448d2bb840b2919e0012b8579 WHIRLPOOL 999148e74bb6983cc9636ee28091ca2c605c9f5391f00a172a1f382bb2187449928d787114f050d15c85b6d7de091aa7876c076d89fe3958b040bd517a480638
+MISC ChangeLog-2015 1280 SHA256 f0c581d7c3ebd626178d30f3bc4aae61c437b2b161379a9870f5ca0d33c414a2 SHA512 865f5d52ada457557297c7b6c2f4e675f7f4325f6328e277394f18223d0d64b26ac916e6a28e9d16f3a2fbe8513d9a1b28d369d2309c87923d7c18ea1eec3ad2 WHIRLPOOL a31f0378d282d0ad2b5de99d01e8f4229f6f9cbe7e9ccaaec6db7ad9a2d9b536df5666cef0ab0a332fdc057005a781b6231c79dd8286e20dcfae08bb46acf04d
+MISC metadata.xml 315 SHA256 323f33d9e7edef29173f36947fcf48f0e4a58252238ba7d955d6f831432624a5 SHA512 6fd0624545f5bf55ad8ab2c227baa026f0f877619167dbd99df1d5cf0e2929dc687b30b699303b05381449343a85fae5e72395ee4233f1be9a242302d233e3b9 WHIRLPOOL 17c218a59f43f6aed9a5ae31e3662899cdc4691c64766ba5748edc8b2e8eab42368fa2400fc85613f8b300c18ea5a261295ca9fac54866d6e3fe919df6865168
diff --git a/dev-python/pyrtf/metadata.xml b/dev-python/pyrtf/metadata.xml
new file mode 100644
index 000000000000..05ae47510e59
--- /dev/null
+++ b/dev-python/pyrtf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pyrtf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyrtf/pyrtf-0.45-r2.ebuild b/dev-python/pyrtf/pyrtf-0.45-r2.ebuild
new file mode 100644
index 000000000000..09be2245c622
--- /dev/null
+++ b/dev-python/pyrtf/pyrtf-0.45-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="PyRTF"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python library to produce RTF documents"
+HOMEPAGE="http://pyrtf.sourceforge.net https://pypi.python.org/pypi/PyRTF"
+SRC_URI="mirror://sourceforge/$PN/${MY_P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pysaml2/Manifest b/dev-python/pysaml2/Manifest
new file mode 100644
index 000000000000..c8e8bc40886f
--- /dev/null
+++ b/dev-python/pysaml2/Manifest
@@ -0,0 +1,6 @@
+AUX xxe-4.0.2.patch 10657 SHA256 23542dc862b0cfd2739635609280f504bae3c674309efe7ef1547fdb025b3704 SHA512 5c18a3c850526e6fd0410d0526bbf385d3383978b944de80da781301114f6a9081d2a3c662f45990fbd7ed88f971382b1ce30d974e4e76e19c11d6aa74d010d1 WHIRLPOOL cde2e3e392c4de9c8f0e5195ef36c5bbf1c2203476b2c8537ab244d29df08db07214105789d4a220709e2d74b833500187bffe7f9e71cbde3e491b31ca4d6594
+DIST pysaml2-4.0.2.tar.gz 13657558 SHA256 24cec8dbc20a7772854563ffc9a19297afcc38c4c7558c063b4c8c302f8a958b SHA512 debe23c2b193ca9f937bdb4fc9e8f308fa012c18e50e40183f7e531434af52b6e4d36608be3e9b0321190930cdfd9eb24555ed1805083e32db8de0f57e5afb14 WHIRLPOOL 303217ea7408986435a31ac97deae3d2b14393674d360d30cbdacf1c673d265b21505af1dea8c536c4698dc6861058f6e57421aaa5bb411daa68d5d02c1ba2c2
+EBUILD pysaml2-4.0.2-r1.ebuild 1030 SHA256 39b82bc7da8483f369bb452529956d2fbbf2ba0cd535fe1bb3da831f74e7507a SHA512 7f0405c7dcad153ad041e1ced22c8d490e566fd090fd6baf61e9de3977de6d2d90c7b3e34899ce072b4bc0be58055e656546f62eef6ed57561a6ad85b2be3a4a WHIRLPOOL fce89a096c8f0020479cc660396a99a88682b81101d306d0b9f2fe3dade81a00e0115089e34fe3bb92206b0d762f9afbb47aa844cd5aea1752d63f12446735ab
+MISC ChangeLog 3831 SHA256 4edc981b493403b3953512d95c2f9a7108ea1b705f2af15fbccdb2bf8d34e66c SHA512 c7fa4cb396e8cc690d6135ed06f2ce1276638b9706a68d09e8c81950f345af72f0feaa8b9fcb29758859c5c6cd56710ad19ef1bf6287cdc7d54a0cd0359b2289 WHIRLPOOL 7853873c0cb3a02996797832748f442a684afedfaca5ce76a61478dbe5aff0cfeab83f36cd8868a94b87d70cd1f3d156c01ba451b51acdce59484e129944572a
+MISC ChangeLog-2015 917 SHA256 1c446d216c83f23ca8eef8fe654c6deedd5cb609d419df5285a11454ee769690 SHA512 cb37fd45d00f34eb4c2468dd897a64cf5bd336be49c0b4d552d609b324429f464ec8554791676da5e79fe920bd24afb96661ae44eff994444f3a8269a35281aa WHIRLPOOL 841aaff196ce76a308d206e3e91995da2e8cc5b58d9c7bd072f082ac305eefd0d53428c5015fede3c84bdeee13e71fda2b86ece48850c569b49d74cc8ce5b62e
+MISC metadata.xml 606 SHA256 95c5ac166fff49bcde7bf9c03cf8a63365af2ca7c8c6ce97fa193c6c666de450 SHA512 7b4facbe3e25898488fffb7b39f9ff7eedd12492f668fa294952711efb3ca9549f2653ab6bc2a948286deff5f45116b0b8bd9a5fc796e99413acc9334eade348 WHIRLPOOL d745827861c1426adad6872a3dd154b7c8ca675691967ffec0df539068055d74a550424714fd22af9e28945768b2c12ba473fc194b450a1a8e95dab865760c91
diff --git a/dev-python/pysaml2/files/xxe-4.0.2.patch b/dev-python/pysaml2/files/xxe-4.0.2.patch
new file mode 100644
index 000000000000..8e1a2ef53cc0
--- /dev/null
+++ b/dev-python/pysaml2/files/xxe-4.0.2.patch
@@ -0,0 +1,305 @@
+diff -Naur pysaml2/setup.py pysaml2.new/setup.py
+--- pysaml2/setup.py	2015-12-06 00:46:33.000000000 -0600
++++ pysaml2.new/setup.py	2017-01-10 20:31:43.387413477 -0600
+@@ -17,6 +17,7 @@
+     'pytz',
+     'pyOpenSSL',
+     'python-dateutil',
++    'defusedxml',
+     'six'
+ ]
+ 
+diff -Naur pysaml2/src/saml2/__init__.py pysaml2.new/src/saml2/__init__.py
+--- pysaml2/src/saml2/__init__.py	2016-01-07 05:53:57.000000000 -0600
++++ pysaml2.new/src/saml2/__init__.py	2017-01-10 20:34:04.171641116 -0600
+@@ -35,6 +35,7 @@
+         import cElementTree as ElementTree
+     except ImportError:
+         from elementtree import ElementTree
++import defusedxml.ElementTree
+ 
+ root_logger = logging.getLogger(__name__)
+ root_logger.level = logging.NOTSET
+@@ -86,7 +87,7 @@
+     """
+     if not isinstance(xml_string, six.binary_type):
+         xml_string = xml_string.encode('utf-8')
+-    tree = ElementTree.fromstring(xml_string)
++    tree = defusedxml.ElementTree.fromstring(xml_string)
+     return create_class_from_element_tree(target_class, tree)
+ 
+ 
+@@ -268,7 +269,7 @@
+ 
+ 
+ def extension_element_from_string(xml_string):
+-    element_tree = ElementTree.fromstring(xml_string)
++    element_tree = defusedxml.ElementTree.fromstring(xml_string)
+     return _extension_element_from_element_tree(element_tree)
+ 
+ 
+diff -Naur pysaml2/src/saml2/pack.py pysaml2.new/src/saml2/pack.py
+--- pysaml2/src/saml2/pack.py	2015-12-11 07:31:39.000000000 -0600
++++ pysaml2.new/src/saml2/pack.py	2017-01-10 20:35:35.382435020 -0600
+@@ -37,6 +37,7 @@
+         import cElementTree as ElementTree
+     except ImportError:
+         from elementtree import ElementTree
++import defusedxml.ElementTree
+ 
+ NAMESPACE = "http://schemas.xmlsoap.org/soap/envelope/"
+ FORM_SPEC = """<form method="post" action="%s">
+@@ -235,7 +236,7 @@
+     :param text: The SOAP object as XML
+     :return: header parts and body as saml.samlbase instances
+     """
+-    envelope = ElementTree.fromstring(text)
++    envelope = defusedxml.ElementTree.fromstring(text)
+     assert envelope.tag == '{%s}Envelope' % NAMESPACE
+ 
+     # print(len(envelope))
+diff -Naur pysaml2/src/saml2/soap.py pysaml2.new/src/saml2/soap.py
+--- pysaml2/src/saml2/soap.py	2015-05-18 02:54:05.000000000 -0500
++++ pysaml2.new/src/saml2/soap.py	2017-01-10 20:36:16.163808770 -0600
+@@ -19,6 +19,7 @@
+     except ImportError:
+         #noinspection PyUnresolvedReferences
+         from elementtree import ElementTree
++import defusedxml.ElementTree
+ 
+ 
+ logger = logging.getLogger(__name__)
+@@ -133,7 +134,7 @@
+     :param expected_tags: What the tag of the SAML thingy is expected to be.
+     :return: SAML thingy as a string
+     """
+-    envelope = ElementTree.fromstring(text)
++    envelope = defusedxml.ElementTree.fromstring(text)
+ 
+     # Make sure it's a SOAP message
+     assert envelope.tag == '{%s}Envelope' % soapenv.NAMESPACE
+@@ -183,7 +184,7 @@
+     :return: The body and headers as class instances
+     """
+     try:
+-        envelope = ElementTree.fromstring(text)
++        envelope = defusedxml.ElementTree.fromstring(text)
+     except Exception as exc:
+         raise XmlParseError("%s" % exc)
+ 
+@@ -209,7 +210,7 @@
+     :return: dictionary with two keys "body"/"header"
+     """
+     try:
+-        envelope = ElementTree.fromstring(text)
++        envelope = defusedxml.ElementTree.fromstring(text)
+     except Exception as exc:
+         raise XmlParseError("%s" % exc)
+ 
+diff -Naur pysaml2/tests/test_03_saml2.py pysaml2.new/tests/test_03_saml2.py
+--- pysaml2/tests/test_03_saml2.py	2015-06-06 02:15:20.000000000 -0500
++++ pysaml2.new/tests/test_03_saml2.py	2017-01-10 20:38:32.541728380 -0600
+@@ -17,6 +17,7 @@
+         import cElementTree as ElementTree
+     except ImportError:
+         from elementtree import ElementTree
++from defusedxml.common import EntitiesForbidden
+ 
+ ITEMS = {
+     NameID: ["""<?xml version="1.0" encoding="utf-8"?>
+@@ -27,7 +28,7 @@
+ </NameID>
+ """, """<?xml version="1.0" encoding="utf-8"?>
+ <NameID xmlns="urn:oasis:names:tc:SAML:2.0:assertion"
+-  SPNameQualifier="https://foo.example.com/sp" 
++  SPNameQualifier="https://foo.example.com/sp"
+   Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient">_1632879f09d08ea5ede2dc667cbed7e429ebc4335c</NameID>
+ """, """<?xml version="1.0" encoding="utf-8"?>
+ <NameID xmlns="urn:oasis:names:tc:SAML:2.0:assertion"
+@@ -47,9 +48,9 @@
+     SubjectConfirmationData:
+         """<?xml version="1.0" encoding="utf-8"?>
+ <SubjectConfirmationData xmlns="urn:oasis:names:tc:SAML:2.0:assertion"
+-InResponseTo="_1683146e27983964fbe7bf8f08961108d166a652e5" 
+-NotOnOrAfter="2010-02-18T13:52:13.959Z" 
+-NotBefore="2010-01-16T12:00:00Z" 
++InResponseTo="_1683146e27983964fbe7bf8f08961108d166a652e5"
++NotOnOrAfter="2010-02-18T13:52:13.959Z"
++NotBefore="2010-01-16T12:00:00Z"
+ Recipient="http://192.168.0.10/saml/sp" />""",
+     SubjectConfirmation:
+         """<?xml version="1.0" encoding="utf-8"?>
+@@ -166,6 +167,19 @@
+     assert kl == None
+ 
+ 
++def test_create_class_from_xml_string_xxe():
++    xml = """<?xml version="1.0"?>
++    <!DOCTYPE lolz [
++    <!ENTITY lol "lol">
++    <!ELEMENT lolz (#PCDATA)>
++    <!ENTITY lol1 "&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;">
++    ]>
++    <lolz>&lol1;</lolz>
++    """
++    with raises(EntitiesForbidden) as err:
++        create_class_from_xml_string(NameID, xml)
++
++
+ def test_ee_1():
+     ee = saml2.extension_element_from_string(
+         """<?xml version='1.0' encoding='UTF-8'?><foo>bar</foo>""")
+@@ -193,7 +207,7 @@
+ def test_ee_3():
+     ee = saml2.extension_element_from_string(
+         """<?xml version='1.0' encoding='UTF-8'?>
+-        <foo xmlns="urn:mace:example.com:saml:ns" 
++        <foo xmlns="urn:mace:example.com:saml:ns"
+         id="xyz">bar</foo>""")
+     assert ee != None
+     print(ee.__dict__)
+@@ -454,6 +468,19 @@
+     assert nid.text.strip() == "http://federationX.org"
+ 
+ 
++def test_ee_xxe():
++    xml = """<?xml version="1.0"?>
++    <!DOCTYPE lolz [
++    <!ENTITY lol "lol">
++    <!ELEMENT lolz (#PCDATA)>
++    <!ENTITY lol1 "&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;">
++    ]>
++    <lolz>&lol1;</lolz>
++    """
++    with raises(EntitiesForbidden):
++        saml2.extension_element_from_string(xml)
++
++
+ def test_extension_element_loadd():
+     ava = {'attributes': {},
+            'tag': 'ExternalEntityAttributeAuthority',
+diff -Naur pysaml2/tests/test_43_soap.py pysaml2.new/tests/test_43_soap.py
+--- pysaml2/tests/test_43_soap.py	2013-04-28 09:38:07.000000000 -0500
++++ pysaml2.new/tests/test_43_soap.py	2017-01-10 20:39:53.730364008 -0600
+@@ -12,16 +12,20 @@
+         import cElementTree as ElementTree
+     except ImportError:
+         from elementtree import ElementTree
++from defusedxml.common import EntitiesForbidden
++
++from pytest import raises
+ 
+ import saml2.samlp as samlp
+ from saml2.samlp import NAMESPACE as SAMLP_NAMESPACE
++from saml2 import soap
+ 
+ NAMESPACE = "http://schemas.xmlsoap.org/soap/envelope/"
+ 
+ example = """<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/">
+     <Body>
+-        <samlp:Response xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol" 
+-            xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 
++        <samlp:Response xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
++            xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+             ID="_6c3a4f8b9c2d" Version="2.0" IssueInstant="2004-03-27T08:42:00Z">
+         <saml:Issuer>https://www.example.com/SAML</saml:Issuer>
+         <Status>
+@@ -55,7 +59,7 @@
+     envelope.tag = '{%s}Envelope' % NAMESPACE
+     body = ElementTree.Element('')
+     body.tag = '{%s}Body' % NAMESPACE
+-    envelope.append(body)    
++    envelope.append(body)
+     request = samlp.AuthnRequest()
+     request.become_child_element_of(body)
+ 
+@@ -66,3 +70,42 @@
+     assert len(body) == 1
+     saml_part = body[0]
+     assert saml_part.tag == '{%s}AuthnRequest' % SAMLP_NAMESPACE
++
++
++def test_parse_soap_enveloped_saml_thingy_xxe():
++    xml = """<?xml version="1.0"?>
++    <!DOCTYPE lolz [
++    <!ENTITY lol "lol">
++    <!ELEMENT lolz (#PCDATA)>
++    <!ENTITY lol1 "&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;">
++    ]>
++    <lolz>&lol1;</lolz>
++    """
++    with raises(EntitiesForbidden):
++        soap.parse_soap_enveloped_saml_thingy(xml, None)
++
++
++def test_class_instances_from_soap_enveloped_saml_thingies_xxe():
++    xml = """<?xml version="1.0"?>
++    <!DOCTYPE lolz [
++    <!ENTITY lol "lol">
++    <!ELEMENT lolz (#PCDATA)>
++    <!ENTITY lol1 "&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;">
++    ]>
++    <lolz>&lol1;</lolz>
++    """
++    with raises(soap.XmlParseError):
++        soap.class_instances_from_soap_enveloped_saml_thingies(xml, None)
++
++
++def test_open_soap_envelope_xxe():
++    xml = """<?xml version="1.0"?>
++    <!DOCTYPE lolz [
++    <!ENTITY lol "lol">
++    <!ELEMENT lolz (#PCDATA)>
++    <!ENTITY lol1 "&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;">
++    ]>
++    <lolz>&lol1;</lolz>
++    """
++    with raises(soap.XmlParseError):
++        soap.open_soap_envelope(xml)
+diff -Naur pysaml2/tests/test_51_client.py pysaml2.new/tests/test_51_client.py
+--- pysaml2/tests/test_51_client.py	2015-12-11 05:10:01.000000000 -0600
++++ pysaml2.new/tests/test_51_client.py	2017-01-10 20:42:12.819280442 -0600
+@@ -5,6 +5,7 @@
+ import uuid
+ import six
+ from six.moves.urllib.parse import parse_qs, urlencode, urlparse
++from pytest import raises
+ from saml2.cert import OpenSSLWrapper
+ from saml2.xmldsig import SIG_RSA_SHA256
+ from saml2 import BINDING_HTTP_POST
+@@ -21,6 +22,7 @@
+ from saml2.authn_context import INTERNETPROTOCOLPASSWORD
+ from saml2.client import Saml2Client
+ from saml2.config import SPConfig
++from saml2.pack import parse_soap_enveloped_saml
+ from saml2.response import LogoutResponse
+ from saml2.saml import NAMEID_FORMAT_PERSISTENT, EncryptedAssertion, Advice
+ from saml2.saml import NAMEID_FORMAT_TRANSIENT
+@@ -34,6 +36,8 @@
+ from saml2.s_utils import factory
+ from saml2.time_util import in_a_while, a_while_ago
+ 
++from defusedxml.common import EntitiesForbidden
++
+ from fakeIDP import FakeIDP
+ from fakeIDP import unpack_form
+ from pathutils import full_path
+@@ -1445,6 +1449,18 @@
+             'http://www.example.com/login'
+         assert ac.authn_context_class_ref.text == INTERNETPROTOCOLPASSWORD
+ 
++def test_parse_soap_enveloped_saml_xxe():
++    xml = """<?xml version="1.0"?>
++    <!DOCTYPE lolz [
++    <!ENTITY lol "lol">
++    <!ELEMENT lolz (#PCDATA)>
++    <!ENTITY lol1 "&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;">
++    ]>
++    <lolz>&lol1;</lolz>
++    """
++    with raises(EntitiesForbidden):
++        parse_soap_enveloped_saml(xml, None)
++
+ 
+ # if __name__ == "__main__":
+ #     tc = TestClient()
diff --git a/dev-python/pysaml2/metadata.xml b/dev-python/pysaml2/metadata.xml
new file mode 100644
index 000000000000..e06acc272e6a
--- /dev/null
+++ b/dev-python/pysaml2/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+	Python implementation of SAML Version 2 to be used in a WSGI environment
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">pysaml2</remote-id>
+		<remote-id type="github">rohe/pysaml2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pysaml2/pysaml2-4.0.2-r1.ebuild b/dev-python/pysaml2/pysaml2-4.0.2-r1.ebuild
new file mode 100644
index 000000000000..f6c60886769a
--- /dev/null
+++ b/dev-python/pysaml2/pysaml2-4.0.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of SAML Version 2 to be used in a WSGI environment"
+HOMEPAGE="https://github.com/rohe/pysaml2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/xxe-4.0.2.patch" )
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	dev-python/repoze-who[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.5[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pyscaffold/Manifest b/dev-python/pyscaffold/Manifest
new file mode 100644
index 000000000000..d44f8e426189
--- /dev/null
+++ b/dev-python/pyscaffold/Manifest
@@ -0,0 +1,4 @@
+DIST pyscaffold-2.4.4.tar.gz 110337 SHA256 5c817ab302dc6ec82d418750b52f87de3c4b9af1d8c8be3dfa7d0210790d601e SHA512 840d205a84528410674e898d6f32a57d3e89edf71e4773a4aae38a4f1fdd883129f6f7be437c2d07fe89b58152a3b250f4a9a7125d1a6d9461673a7f22094d70 WHIRLPOOL 4e9efe5cde6f7a058e2306efb1718fd07be2b93676c834d1363a363058b1676cd8cb84faf309bb23b0e2680159b2dbc3e58918dc86a706f46b6a461771a48119
+EBUILD pyscaffold-2.4.4.ebuild 1315 SHA256 1b42beb78b34507b5757e1e5b83bdd3a057a0661d74619ded627014a116daaca SHA512 2b06ccfed84ccee5424fc652092b341d58f03e8f2524c82d5563972e1cb497729f35a21caf004f1c1ecc2bd28555018e7cbf1c1e2340b76da725110e1e4a3357 WHIRLPOOL 640df8da411144464421e4fe77ff35f70cc7d059fd8956ec31606fa4c5faa20b7caad0f1e158d35f7b5e8bc80c45933740e592c82448f50956267d1652dfec47
+MISC ChangeLog 1871 SHA256 a23ebd6a7cff7a92fdcdbd456f7f56f6fc6e1d4a2c5355a60ce3c54fbabbfdf9 SHA512 b7bcf70a1717182457692563d1ebcaf79e7f6ff64ce1d85a0c71bbf2ba2681b4b87da63e9469b3e894415cf156a46d7434f37ec571ab2b1a51afd60b81f7a906 WHIRLPOOL 231d039609ec58ec16acb851b7e4e11bc161095368ac2b6ce4364212a1e7b384b13085e3ba46c4037aa5ac4bc315ee70156273664b029763c85201efb35088bb
+MISC metadata.xml 315 SHA256 ed49211b4887b7ca8e9a0b497319ccc714b3a3c4a9dbad16e9509de1ddb01df6 SHA512 d13e5f6cdf044efaa76fd7725070cb979c390951defa7e4495c80392ddce4cc01de248e049aa20b1197e2f6b1f5a309676a0fe9da7acdad49af37c00175d29b2 WHIRLPOOL 2c07680fb96b8decd9a7b6106c4906f2a0cc87c8411d57c0e738dfc7aec1f5efb39ee91ff337c4808bb6e02a7286487a93d97716ec9f8d087eac4c996fe7dd90
diff --git a/dev-python/pyscaffold/metadata.xml b/dev-python/pyscaffold/metadata.xml
new file mode 100644
index 000000000000..6129ef39a58c
--- /dev/null
+++ b/dev-python/pyscaffold/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+  </maintainer>
+	<upstream>
+		<remote-id type="pypi">PyScaffold</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild b/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild
new file mode 100644
index 000000000000..8b179637dc42
--- /dev/null
+++ b/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+MY_PN="PyScaffold"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for easily putting up the scaffold of a Python project"
+HOMEPAGE="https://pypi.python.org/pypi/PyScaffold http://pyscaffold.readthedocs.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.7[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	sed \
+		-e 's: + pytest_runner::g' \
+		-i setup.py || die
+
+	# Creates all sort of mem problem due to fetch restrictions
+	rm tests/test_install.py || die
+
+	# Online tests
+	sed \
+		-e 's:test_api_with_cookiecutter:_&:g' \
+		-e 's:test_pyscaffold_keyword:_&:g' \
+		-i tests/*py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	git config --global user.email "you@example.com"
+	git config --global user.name "Your Name"
+
+	TRAVIS=False py.test -v -v || die
+}
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
new file mode 100644
index 000000000000..3e1ff255a3e6
--- /dev/null
+++ b/dev-python/pyscard/Manifest
@@ -0,0 +1,5 @@
+DIST pyscard-1.9.5.tar.gz 146010 SHA256 7eef027e1939b7595fc13c03616f262f90d118594fdb6f7620af46b54fa06835 SHA512 a0c5cd4ccbe8437ffd37afcf95c71f7d1d6c3ae364063cf81907095625d2062da8e7335ebfd15d1f952e8a8d9395e990b351b1308ab07fa456a7ee10658db4f9 WHIRLPOOL 265045289deb5facfa582461e395b1ab285f01ad747d6e90f3297ccc29586c5794837599b4212dd1c5ce1f990509f979b203bd4c523ae1062bb836e7cef9968b
+EBUILD pyscard-1.9.5.ebuild 715 SHA256 21dfce5c6ae20817d61a7ada6c137af472b77005b3367c97b30ca7b31e47ab3a SHA512 d6aeafc65530f411291587de1afb376d66084264b3b914d204e24b52774da52d01836f48a007a9001f5da342689ef0b69b814344282f5e0c7bc8a5e6300fa67b WHIRLPOOL 7c33720a9040cc2b240c8280583685f11854aaf2c7948c57a948ec9812871f07622cadcaba523426ceb134ab1801a607c630cb53fc81b529e97fc26eef04fada
+MISC ChangeLog 4142 SHA256 4ec95fd71fa59be13ea0244d2b4333b5afd5d083603ee2de959a436138d8b9fc SHA512 d273ba65534fe9ee46fa34e98dc239b7d1a46b1b13cdf38c4ef6ffd1b13e7c0f6f27d9a55d04d5545026a22c6f5cc9b137a3c06f56791c20baf40a5543f8f393 WHIRLPOOL 1117803ba8040b60bb73d7291b397871a662d800d9a8dfbd990b7ed6ddb233fba7dbf1a11000296e37e1457cbad222fa97532b7087d21a27ca4f7f2bc1affbcf
+MISC ChangeLog-2015 1162 SHA256 6f42db4f0bc7fd3e1591c8b46caddd20275c96aff32b00032052a712f94f8ffe SHA512 cd93a5306f212953883ac3b6f14be67dc6e1f9a0212efe83bf9fe689f95ffe50701a0c9e0129f2419ad5ff9c2fa3c21ff0e3d8688e46b0e246399c019c7bc761 WHIRLPOOL 92360c8d1b91f2b6e677417d138edf902f1f917c2f03a2c9caaecdf14f0056986be054e23eb6affadf5c295810ec88112f9f994f810d419b982dccc13b24d7f3
+MISC metadata.xml 418 SHA256 9d002033f72069c188750771447541674c04cc3c7620663692e94a711198ed36 SHA512 88cd5d13d515f02d3c53e62900afbb7ee5307d2073696f4a53358e7f3cf658dc3fa79465b25477c4dcfc165f8a06021e1ce5dbeaacfd932d8efab922cc2b32c4 WHIRLPOOL 5534d148db95ede9f54820a8e2c54ddb9196e2658bda6014804efcb0b0decab9a3686e7d2ef267aa0d5c5df0c1881ad3a2e374af37f72dabf03e4d70df5102fd
diff --git a/dev-python/pyscard/metadata.xml b/dev-python/pyscard/metadata.xml
new file mode 100644
index 000000000000..95a5e2fc5f91
--- /dev/null
+++ b/dev-python/pyscard/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pyscard</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyscard/pyscard-1.9.5.ebuild b/dev-python/pyscard/pyscard-1.9.5.ebuild
new file mode 100644
index 000000000000..4d8569d2425b
--- /dev/null
+++ b/dev-python/pyscard/pyscard-1.9.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Smart cards support in python"
+HOMEPAGE="http://pyscard.sourceforge.net/ https://pypi.python.org/pypi/pyscard"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE=""
+
+RDEPEND="sys-apps/pcsc-lite"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-lang/swig"
+
+# Fails
+RESTRICT=test
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	optfeature "Gui support" dev-python/wxpython
+	optfeature "Support of remote readers with Pyro" dev-python/pyro
+}
diff --git a/dev-python/pysctp/Manifest b/dev-python/pysctp/Manifest
new file mode 100644
index 000000000000..03b02d4432c9
--- /dev/null
+++ b/dev-python/pysctp/Manifest
@@ -0,0 +1,5 @@
+DIST pysctp-0.6.tar.gz 29611 SHA256 4c2b8863a18695575460e432a7386b90be464a94585f2b7fe36ddbc3c3a380fc SHA512 621ddeecaec9eb0114783e2103405ae3eb0c8950a3c76fafe4505ad5311e2c004dd10219d90216fd5f5e79e033e490695e7428ee7c7a5fba26dea7d253e50215 WHIRLPOOL ecd42f69024832558630e36ba1a2788d10aafe9868610c8840d61bdcb5941fa544a6c8adf410672001dc1c6913e8524768abae33b87623acbd86de6d7671ebe1
+EBUILD pysctp-0.6.ebuild 598 SHA256 8aa0b74c323a970298622ec247c6f282c88434f6f2b4b98aea5c2900d43a58cb SHA512 b46e1af44eee7a14679319c7864b7724f0238b88197191918aeaabdf1a22b86dd864e6bdcfd0864117fc9384ab8973e04f201526730c6ed7b087a29a606c4927 WHIRLPOOL 35a8eb04ff200ee9de4d20e36885cf68d442eee3c6db4dbaf2a4118b20f03c4180510c56c1374d9f05b2a7bf1f7e6ca243b6623e2f2d5ec3fdf497b822b11b9e
+MISC ChangeLog 2422 SHA256 77fcb5e1ea56576cc2f122aed02cc1f6c6a17965b2a332df36fa322fe36e0075 SHA512 efca23fdbb796841fc76eda534eacce93025218adbb4023a644d4550fdecd70fc6a8eaed1340e6477291f7fc50a9e9dca373d1e844c7de2a17e3830514bae68e WHIRLPOOL e6ef327e718bcb0104aff4bb007cade52417c7100cff334a54e001f7a7820e4cd33b5df0704f26b1f8a0628b18c5788073f29136b26769956b4c529af8c1d620
+MISC ChangeLog-2015 1153 SHA256 e6c6885b20241d1629f8b954c09077a8313f59490adbeb7dbaf80a9a20defc7c SHA512 c25645a1ba1f40a8430f385245c3a8dd4b07b6d4df82feab31968bd1388af5cc35dfecf975d913092fc9851d65789180b2cddf11529ecc6f84f05a31e96ac0a0 WHIRLPOOL 456611429ffe4ae8ff8c1c4472ed45cf56fc38fe9353bb7ea2854ffa199a7e24e50122ccd5d7445b1e0a5b9444d900af428491a4d87de75c76c5836f057374c6
+MISC metadata.xml 579 SHA256 e8bb867dd5212a66895417071cda148c2836132fb27672d78f487d4157ca8d5e SHA512 f15238f6e01b4f585bf3da4a0ab705b7997e907897bca5e113e757a68a9d59bd2cd742c30782153835a198140caf4ebdc4cacfaaa84d655e1d252b5c3ae15404 WHIRLPOOL 44d56437ecb857c6b8f483f10f71fa7487dd4d8675e52c74074b75ebb2f405fbaa52d6cd8c2f8dacf97dd11bc12960b99603418b0ebd842a8e2c6a1c2c255a03
diff --git a/dev-python/pysctp/metadata.xml b/dev-python/pysctp/metadata.xml
new file mode 100644
index 000000000000..aaa3e499de86
--- /dev/null
+++ b/dev-python/pysctp/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zx2c4@gentoo.org</email>
+    <name>Jason A. Donenfeld</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>phil@p1sec.com</email>
+    <name>Philippe Langlois</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">philpraxis/pysctp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pysctp/pysctp-0.6.ebuild b/dev-python/pysctp/pysctp-0.6.ebuild
new file mode 100644
index 000000000000..af155f705cc2
--- /dev/null
+++ b/dev-python/pysctp/pysctp-0.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="PySCTP gives access to the SCTP transport protocol from Python"
+HOMEPAGE="https://github.com/philpraxis/pysctp"
+SRC_URI="https://github.com/philpraxis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-misc/lksctp-tools"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	distutils-r1_src_install
+	rm -v "${D}usr/_sctp.h"
+	dodoc test_local_cnx.py test_remote_cnx.py
+}
diff --git a/dev-python/pysendfile/Manifest b/dev-python/pysendfile/Manifest
new file mode 100644
index 000000000000..40e1a234a0eb
--- /dev/null
+++ b/dev-python/pysendfile/Manifest
@@ -0,0 +1,5 @@
+DIST pysendfile-2.0.1.tar.gz 19315 SHA256 510a414b270986fba3c79cb76d90a4c910c701bfb43ff983a5d4e92846050e17 SHA512 d6ee08eb251fac30c90a9ee829fd992f3620697eef2893ced5a2c6273486c3c5fd35c70962585a8d747d578817391f91c929bfeeba8c4485d52a15748229ca9c WHIRLPOOL a1f9a54ff2f0111d3c62f3ec17490241270d711b8529b701d27b12f7aa607c13c86ae7e2910770b8626b86909c9943e3ab8395676c5c09eff52274165ab64641
+EBUILD pysendfile-2.0.1.ebuild 536 SHA256 5074b0a5ed3c8dc35c7fa0709ecde8efe7be17db3d2c214fe03bf39d905107fe SHA512 0c67160e870a01fe75a061330379ff978d2e0baabe075dbaa68e9fd5cb2d344910ca52b8354dea21a2c8e5ac6e6eef7fdde3b35d6c0c3e3aa45148e5cb16500b WHIRLPOOL b650b8a17ad9401d77d8ebf8f9f9f9a28f9e6106f22e53392550af8f64f615e4350139a4c7342336ac4511bb117d05e0ab73bb944557350bb3ccc3dec4fe6f40
+MISC ChangeLog 3043 SHA256 455849ae4a6f38fc3d9c4779e8885ad4fb843a22fb2740db08ff4e1c0ed15416 SHA512 8cb5574c307ac917a9a7ffcc184fa4c218810efba481b2badc4b6c449bd723ad5734483cfbbe775265b1aeda10929021c2a378fead82c7258da18024e5a609e4 WHIRLPOOL eb857d4c0ab747b7f638be40796e1f10528305e2e17da47c04ae8713dce2166b16ab74b66b3fa1bfb24ae6cd084d51c798c31989db12df676a1c3f96d085fc0b
+MISC ChangeLog-2015 1057 SHA256 c81e5b538d241093e1202d06da166790e4571c61f45692713c5c3a7617b4ceb6 SHA512 8b15fcd7d8b7a954505846f7e4f2038aedd2c02d395fa64017a12d79c452ade50e34e136581650d1ed15b741086840c2d435b6ea108a9fc747d1562e44543cf0 WHIRLPOOL e7612ee3a6b48b1efe9806e9a745a0920a2265810314bf5b01ed5fb57c6f5af0cbd94bd5aa186de6f57041a3910a3c2332e198629a240cdb23e4bd5f4aa147a0
+MISC metadata.xml 391 SHA256 8025ed90ff1400982926e6c29e54df9e0e22f10ad1e6d422d898c2dde6e056ad SHA512 9f2f7252b4d4f062d63fd392634973c0ad3febc22375631afd41f53f45bce5ae9dd0350f926576bb18883b91f9d5de60881fca77d444703fcfbb706c7802067c WHIRLPOOL 3c5f7e1db0238828a1b0556b41ff28fe517462609504290ef873f1a7abe77a53db388faed40e8b9b1fddc3d64421cbbc458ce6c75e29565e6e7a9124ec6eef50
diff --git a/dev-python/pysendfile/metadata.xml b/dev-python/pysendfile/metadata.xml
new file mode 100644
index 000000000000..95cca6de01c5
--- /dev/null
+++ b/dev-python/pysendfile/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="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pysendfile</remote-id>
+    <remote-id type="github">giampaolo/pysendfile</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pysendfile/pysendfile-2.0.1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
new file mode 100644
index 000000000000..dce56df30bdc
--- /dev/null
+++ b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A python interface to sendfile(2) system call"
+HOMEPAGE="https://github.com/giampaolo/pysendfile"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Testsuite abandonned due to demanding starting a local web type server
diff --git a/dev-python/pyserial/Manifest b/dev-python/pyserial/Manifest
new file mode 100644
index 000000000000..fc4f65c0ae45
--- /dev/null
+++ b/dev-python/pyserial/Manifest
@@ -0,0 +1,10 @@
+AUX mapping.patch 495 SHA256 7d40dcc74fe3359024effd28447380a08f52b4b9cd7e6c96b5ee1797d7714d86 SHA512 2a0a86462291ecd78d06c9b88e8971502a58efa61ad9d47f0df2c94240245a41e7bbf9bfbd93e7761560a16fe15203cf8c5c52eaf3eb24e1499b00dfec3808f8 WHIRLPOOL 39f4024ee0fee9041e45fd2b66d29fac40f0ad2bfd2875a0db0453283386603f68a621c80b38b479c332a1d1d64499e1df93a4feef5165fd7cf29967a151a336
+DIST pyserial-2.7.tar.gz 122081 SHA256 3542ec0838793e61d6224e27ff05e8ce4ba5a5c5cc4ec5c6a3e8d49247985477 SHA512 3fc8d9425a47ebcd37db1fcc58182854b48c9abd6642f35fba2d21458d864ae448105d704dc0d880832ba7516fa16f108f24363bd5fa9f083ea79a4ac614339b WHIRLPOOL ae6b4df86220617f7fbc1f1e4085a7e85dca645a6d84339163b40fc7a15f14b879ef7a729d3d23d0300f9ee04b21d6c24d13a791d520aef3f3ad141c6acd9b68
+DIST pyserial-3.2.1.tar.gz 147338 SHA256 1eecfe4022240f2eab5af8d414f0504e072ee68377ba63d3b6fe6e66c26f66d1 SHA512 8d3e580cc7781fc6549ab6e408642f4321eb90aafbe593f5dcf953001730f89ee32ce6592728764027a7944bfe4a0ebe2cfac1fce071777aac7c4f27ac94ab7f WHIRLPOOL 529c4eb12adf88579d528d3bd9dfec6fd7b43890217392677b7c8428f7ca7b3fe5dded863c4690c9eaa5ea37a2cdb56744e328a47a4b89d5440becceb983ecb8
+DIST pyserial-3.3.tar.gz 149032 SHA256 2949cddffc2b05683065a3cd2345114b1a49b08df8cb843d69ba99dc3e19edc2 SHA512 57a0bcd0684530e1d60022804dd75acd5d9a9a358c92d967076884b2419bcfefae71e949f7aba1737023f6b089c993e98dd7cf6860e9402ed7e0b698953b3ac8 WHIRLPOOL 41174cb26532f563950aa1510d5fe2ab60def9141744ffad5d063f2a0e9cd7e0fdaf68db6c72ec47b2eb8fd37aa064286c27a90288ae1482e1f336574e9a1b1a
+EBUILD pyserial-2.7-r1.ebuild 965 SHA256 5d2bf157dfa08338ea2c315e6a522bb70768a38b169f67bc2d5ef73d328342d7 SHA512 2d3d3e532f9b0f8b03489e474077e9fb41e6c363dbb734d174cdab01df61eabfbfae2f9ac3014b6354f59d75be855cd14710f293a8362569fe57f78808450a32 WHIRLPOOL 4be8858ff79330ae5315f1eb7fe3917715b57b873f829e0389b33a282cf060c4883a3294c7161fb07dea10b3fce0fa8fee750e39884c5a5a03aa08c4d7b27cbf
+EBUILD pyserial-3.2.1.ebuild 1148 SHA256 bab83ce6467c24397c0cc3b93ba7fe50e8de0575100bb4ef64f8c90269b15a69 SHA512 b4d57606a5318c733da926ccfeb2b82e8d779b75316cd56ab8a24e577953d05dd501c8e7b86cb320949e60120577940958c3adb5ac8be760e193c91200faa686 WHIRLPOOL f30c4beaa2f3241d7d962130b79fdb362fb3a52eb1962ea6d8da2aebb820ded01be7cd520b527f2039c61dd035adcfc6b05c2fc4fb403442630689f6b32b0898
+EBUILD pyserial-3.3.ebuild 1157 SHA256 67564ea299b852b2a010f8949cf757de65f49cecf622e8f5923f93564beb7e1d SHA512 6e1f44a648c924fd0c36670c5a96936c3656b81c0a7bd8da6c79a8f1dedb87bde994c7570a126df2ae6c7408018bac5cd24cf7b931720851936a420c2f28dd87 WHIRLPOOL 6f5bf8e259f3ca5682eb0edf9d0d91b8cebf5ce5158db2b2a275e7cefa87ebfe92371ee6ccbb0dc3f4c6a162cc0f4d8c0e3a5bff96e4130fa275d8a31ac61787
+MISC ChangeLog 5396 SHA256 4287320ab76840e8f49e0d2eedd712c73c83dc85b56e00ee117b91f8feb15a98 SHA512 84480fffb06c3dac8fb7edb193301f777d126af3d7174d3dc14d770e1f332ce21c575e80a19d57da4807b08e9445a966a6adc6e422f8df8ca6becf713faa70b9 WHIRLPOOL ce5d8c74407ca3a14ce6f7e19324c1c32d0d0b8a27b3b951cc7a8f839d726f069a02d9f41f0c3256dda890313aa83344cb22333747232566cbe63231bb0c0ae0
+MISC ChangeLog-2015 12633 SHA256 01179fdce2bce3673dd0b99b3baae044116651ce5843e5a53db954702569acc8 SHA512 0b19a86a29d703369a4c0cb1d28cb14c05be2a5dece336d60a018de6f21f5adb1e802405d9e2b44cabdddfac35df18b72472eee80ebf70b43b1ae4276cf508a2 WHIRLPOOL ec06d2923d8e245d7cbbf41adde8b6629ed6721e1ddc55b8164758697945d3f0c7ac314f188b3d843a87e4a62e1bc90dacecb5c465c3a952c883fa2379e6ff1d
+MISC metadata.xml 421 SHA256 dd0a0c9889b96578726ae002b5661484bb3b5083f0c9727abd96f571973485b7 SHA512 30c1232aed930c665c2603443cbff9efbb843b1866d6a4d034a517e0669f28f1e6e7562103a8badbd8fb1efd9e69b058870b9c4fcea8fa5e74e7a1ec8ba17fde WHIRLPOOL 7d913973c8410a615038c6dec76f8da4e76eeadb123b2c086714612234ea8e6fb60af03373c7584c4c4bcb00c7591dd1e2ff4d4e37bc86c702116c9686baa984
diff --git a/dev-python/pyserial/files/mapping.patch b/dev-python/pyserial/files/mapping.patch
new file mode 100644
index 000000000000..dfcb4731bbbd
--- /dev/null
+++ b/dev-python/pyserial/files/mapping.patch
@@ -0,0 +1,13 @@
+diff -ur pyserial-2.7.orig/documentation/conf.py pyserial-2.7/documentation/conf.py
+--- a/documentation/conf.py     2013-10-18 00:29:53.000000000 +0800
++++ b/documentation/conf.py  2014-03-28 12:41:08.848807687 +0800
+@@ -192,9 +192,3 @@
+ 
+ # If false, no module index is generated.
+ #latex_use_modindex = True
+-
+-# for external links to standard library
+-intersphinx_mapping = {
+-        #~ 'python': ('http://docs.python.org', None),
+-        'py': ('http://docs.python.org', None),
+-        }
diff --git a/dev-python/pyserial/metadata.xml b/dev-python/pyserial/metadata.xml
new file mode 100644
index 000000000000..9cabbe4e21b2
--- /dev/null
+++ b/dev-python/pyserial/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyserial</remote-id>
+		<remote-id type="sourceforge">pyserial</remote-id>
+		<remote-id type="github">pyserial/pyserial</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyserial/pyserial-2.7-r1.ebuild b/dev-python/pyserial/pyserial-2.7-r1.ebuild
new file mode 100644
index 000000000000..394397eaec95
--- /dev/null
+++ b/dev-python/pyserial/pyserial-2.7-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Serial Port Extension"
+HOMEPAGE="http://pyserial.sourceforge.net/ https://sourceforge.net/projects/pyserial/ https://pypi.python.org/pypi/pyserial"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc examples"
+
+DEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Usual avoid d'loading un-needed objects.inv file
+PATCHES=( "${FILESDIR}"/mapping.patch )
+
+DOCS=( CHANGES.txt README.txt )
+
+python_compile_all() {
+	use doc && emake -C documentation html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( documentation/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyserial/pyserial-3.2.1.ebuild b/dev-python/pyserial/pyserial-3.2.1.ebuild
new file mode 100644
index 000000000000..59ef3d4e7035
--- /dev/null
+++ b/dev-python/pyserial/pyserial-3.2.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Serial Port extension"
+HOMEPAGE="https://github.com/pyserial/pyserial https://pypi.python.org/pypi/pyserial"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc examples"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+# Usual avoid d'loading un-needed objects.inv file
+PATCHES=( "${FILESDIR}"/mapping.patch )
+
+DOCS=( CHANGES.rst README.rst )
+
+python_compile_all() {
+	use doc && emake -C documentation html
+}
+
+python_test() {
+	${EPYTHON} test/run_all_tests.py || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( documentation/_build/html/. )
+	distutils-r1_python_install_all
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/pyserial/pyserial-3.3.ebuild b/dev-python/pyserial/pyserial-3.3.ebuild
new file mode 100644
index 000000000000..49af25222514
--- /dev/null
+++ b/dev-python/pyserial/pyserial-3.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Serial Port extension"
+HOMEPAGE="https://github.com/pyserial/pyserial https://pypi.python.org/pypi/pyserial"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc examples"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+# Usual avoid d'loading un-needed objects.inv file
+PATCHES=( "${FILESDIR}"/mapping.patch )
+
+DOCS=( CHANGES.rst README.rst )
+
+python_compile_all() {
+	use doc && emake -C documentation html
+}
+
+python_test() {
+	${EPYTHON} test/run_all_tests.py || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( documentation/_build/html/. )
+	distutils-r1_python_install_all
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/pyshark/Manifest b/dev-python/pyshark/Manifest
new file mode 100644
index 000000000000..642adcec9a1f
--- /dev/null
+++ b/dev-python/pyshark/Manifest
@@ -0,0 +1,5 @@
+DIST pyshark-0.3.7.2.tar.gz 27232 SHA256 a60bee95e5359c11f2051ebbb240c41becfa8c1ffe03b2fb24895f477bb1c0fe SHA512 dbd97665fae7d3067582bf7616e025b0c5e5fa14cacdaca59c89b4e70feb3017f2d8c7d899a70c0c8707589e4735b9283914bb6ccbf432e9072c64d7e957bc15 WHIRLPOOL 9e6f58dc6a4e2acf77f016b35583da427ccfc8ed32d508e3e7b754913f9e8f6dce2c48be5adf1c2fa56fabecd99f18e1a678dace1c1423be132bcbdbbb85effd
+EBUILD pyshark-0.3.7.2.ebuild 1258 SHA256 0145641e3294c5279ed2f14bc0b110d6a597907d3d9ff6bd7fcb4915802d0d3a SHA512 77c4737ed931f8f0c7f19aa231c7e68e231756c54f6aa6c0ac97502a0c04a1c22affd00cb0dce4abd2c467961e3be1e7b745a32ca257cb09a128b9285ab4626a WHIRLPOOL b47962ab1f48162c399385d52a70a6ee7d4ca975a900f82e4f440c3cc2e3531aa4327160c340297b9d3797bf24fc9eef363478e89c964bcacbe97bf815713b9e
+MISC ChangeLog 3099 SHA256 cf2bb2f76d18e3301af40855d42c8e08bb94a1f1361e633f6e0725bc6249d3f6 SHA512 5b1581c4f03f16fbe16d09da135291ee23e129c6818a6c60432c330af1254b7f5bfe8147ffa8309cb3ed109f2c66783810ded9f57ee2aed3c9d9f7c9641e9d52 WHIRLPOOL e469a8fbb2968456be6af7ffc2edf39663bb89dc84f540bf17110408ac0cb3700965ed997800bd084b07d65b41d9a2b10fd4f41b45f38c8834240dfa694d73f9
+MISC ChangeLog-2015 901 SHA256 3feddf4854eaf17a5f1661704917985a41b9f53e810e9af4e5663f534b8bcdd8 SHA512 12fd367a08377e83ae1c5dc24bb2af77b4f1b96d070052cfc804373b66722b442dc31929403f9bb7a85aaab67d2891589f6f23e537813b98a6cb2136e3f8a9e6 WHIRLPOOL bd591aed2df677ce3a648d57efad4157204f76f46c2f2c736944b4fbc234fa88dc7d78faa5929d33659de3f5d15b013c152d70482518775e7005a0a9e75d1831
+MISC metadata.xml 378 SHA256 8aa9075f5931308af781c2324f3faf47d89ccd92f14180688bf3d56fd6dccf3e SHA512 17d2661a631633ebf347dfc4def34aa070c4ad5713f6124b668c3ed5336a59b639c30474e4b4cb294661648ef186797144c161a390c0d93a21de82ae8d51d8c7 WHIRLPOOL e3b030a129b13680f182890eb505d955f5484499344471bbeb4e46cf4e064e6c1dc6c953e93527ef261c32733889667178d845f3d48456519eee88c4d9477f48
diff --git a/dev-python/pyshark/metadata.xml b/dev-python/pyshark/metadata.xml
new file mode 100644
index 000000000000..667dc8a5fb8b
--- /dev/null
+++ b/dev-python/pyshark/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pyshark</remote-id>
+    <remote-id type="github">KimiNewt/pyshark</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyshark/pyshark-0.3.7.2.ebuild b/dev-python/pyshark/pyshark-0.3.7.2.ebuild
new file mode 100644
index 000000000000..4d11881ab65e
--- /dev/null
+++ b/dev-python/pyshark/pyshark-0.3.7.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A Python wrapper for tshark output parsing"
+HOMEPAGE="https://pypi.python.org/pypi/pyshark https://github.com/KimiNewt/pyshark"
+# pypi tarball is missing tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/KimiNewt/pyshark/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# See pyshark.egg-info/requires.txt
+RDEPEND="
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/logbook[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/trollius[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	net-analyzer/wireshark"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${P}/src"
+
+python_prepare_all() {
+	# Test fails unless portage can execute /usr/bin/dumpcap
+	# https://github.com/KimiNewt/pyshark/issues/197
+	rm "${WORKDIR}/${P}/tests/capture/test_inmem_capture.py" || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cd "${WORKDIR}/${P}/tests" || die
+	py.test -v || die
+}
diff --git a/dev-python/pyside-tools/Manifest b/dev-python/pyside-tools/Manifest
new file mode 100644
index 000000000000..35540842f86c
--- /dev/null
+++ b/dev-python/pyside-tools/Manifest
@@ -0,0 +1,6 @@
+AUX 0.2.13-fix-pysideuic-test-and-install.patch 1117 SHA256 f03cfa89cdef59b5e94713297aecb5e9cb66d0d6793c21078ebf27df4adc14c6 SHA512 2ba8e7c00dc231ce1a92815697448c71da31e2c84c8b20339f33520428c4a91dc38cd16d861fb5ffb5896f4e91e9416f9f2e04f7ba9cbbcc3f21f12cc1350b63 WHIRLPOOL 03532faaba4b9718f844ac3910c66262ac78d293eccd4b2606d941fd0d7c5f00228b4373ed1546f1f3a94742b7d7c68d95de399bea6fa0ff1014e593cbf1b440
+DIST pyside-tools-0.2.15.tar.gz 78989 SHA256 8a7fe786b19c5b2b4380aff0a9590b3129fad4a0f6f3df1f39593d79b01a9f74 SHA512 7cee288b733e5f83a01683d7fc8f1017c044e46dbb02489c5e763e37db4e24f319ffd593e001ee6ca5a21a34cf1a6009ab1d4c9e4102c60693992b6f2f7c8991 WHIRLPOOL 23d7a325f548cd1d95b91c40d5c2ccbdd70a25328948f93b5232bf8d1177674899bfdd51161873c34be5245d20c4d202a3eed29ce7fa10399cabad9e84b2e698
+EBUILD pyside-tools-0.2.15-r1.ebuild 2064 SHA256 ae49851aa64006136fed3ba9452ad3bdaa0ac7e937ae396c1a9b012582de403c SHA512 a15c3d5d8fe6bdc08b3c06a8c4a27de9cd42a38b1938b9ae11c115543b1f290ced15c4d0b5ccc11c27be7f521b084cd9f11a22f2746b25565a8688e39a7ce67b WHIRLPOOL c932ea399e67ed9a90b670a76c217ed84d8447f04b3d2c1f067f9b69529a358a890b8109650104cc0c35149b41b27b2b98cfd6f99129608aba96ed8eff97a03a
+MISC ChangeLog 2977 SHA256 84ed61daf3b4b0e87a1a9d1075d639348c1ffcf315c3ccb41d628f1b8da62e82 SHA512 47b3f93502ecd71b4e87aa1ddc689bd88aa3b8fc0dfecd5e7850a55a73184998f5d2daa0176f571681b9de71ecc6ad0a7755dd6f14fc03c694cfa2d15c319f44 WHIRLPOOL f8a97264a282f3917cc86cc270abdb25e012d29258ee10ad02c1aef409358666e973688fdcb00b8ef047188796ef124d26b7b7925d1a3df8f81cce74ec6fd61e
+MISC ChangeLog-2015 5547 SHA256 67d81dcab73b0739b4e34664695702b7067b49d1b9393cf4ed063b165ead09e9 SHA512 30228eaf98c174319a853f883c7fadb2bece279a6f7f1fd86cd40442ebbb88c8d198db847968637a0a5d07f6b25519c087306255751dec30ea1c8b191ab0c4f3 WHIRLPOOL 9d3dcc1bd1cded39fc9462b7d0f798d5ae9920c5890e89a79c91f9afb3867a16a2ca4470de0b5c52c84f3f56ed5c7c16dd25f79fb12a51706aaa60ca253934c2
+MISC metadata.xml 334 SHA256 d471a41c19add5301a6cda62e129df25c0ef8e886ffa416f3b33601e0bdc26c7 SHA512 47e7526ae939e698bad3572fc645bc9d22c1c7688f8bc133ac0ab3822523be8d5defd10070af38e6f851b577468b03dcb6e6b52380657032633c65be2a690fed WHIRLPOOL a67262f4cdf8541b9b058a0985cce4353299b82290f8d10928afef8458d184b247d54d9aeddcfc3834fa0fac585a7b23117276932efa680b22b70f7d1feabe87
diff --git a/dev-python/pyside-tools/files/0.2.13-fix-pysideuic-test-and-install.patch b/dev-python/pyside-tools/files/0.2.13-fix-pysideuic-test-and-install.patch
new file mode 100644
index 000000000000..768ae22a8bc2
--- /dev/null
+++ b/dev-python/pyside-tools/files/0.2.13-fix-pysideuic-test-and-install.patch
@@ -0,0 +1,27 @@
+diff -Naur pyside-tools-0.2.13.orig/CMakeLists.txt pyside-tools-0.2.13/CMakeLists.txt
+--- pyside-tools-0.2.13.orig/CMakeLists.txt	2012-03-09 00:46:56.377462594 +0100
++++ pyside-tools-0.2.13/CMakeLists.txt	2012-03-09 00:48:08.888556082 +0100
+@@ -11,7 +11,7 @@
+ set(pyside_tools_MICRO_VERSION "13")
+ set(pyside_tools_VERSION "${pyside_tools_MAJOR_VERSION}.${pyside_tools_MINOR_VERSION}.${pyside_tools_MICRO_VERSION}")
+ 
+-configure_file("pysideuic/__init__.py.in" "__init__.py" @ONLY)
++configure_file("pysideuic/__init__.py.in" "pysideuic/__init__.py" @ONLY)
+ 
+ option(BUILD_TESTS "Build tests." TRUE)
+ 
+@@ -34,13 +34,10 @@
+         GROUP_EXECUTE GROUP_READ
+         WORLD_EXECUTE WORLD_READ)
+ 
+-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/__init__.py"
+-        DESTINATION "${SITE_PACKAGE}/pysideuic")
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pysideuic
+         DESTINATION ${SITE_PACKAGE}
+         PATTERN "*.in" EXCLUDE
+-        PATTERN "*pysideuic/__init__.py" EXCLUDE
+-        PATTERN "*pysideuic\\__init__.py" EXCLUDE)
++        PATTERN "*/pysideuic/*.1" EXCLUDE)
+ 
+ # Man pages for pyside-uic
+ if (NOT win32)
diff --git a/dev-python/pyside-tools/metadata.xml b/dev-python/pyside-tools/metadata.xml
new file mode 100644
index 000000000000..521a755bf028
--- /dev/null
+++ b/dev-python/pyside-tools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">PySide/Tools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild b/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
new file mode 100644
index 000000000000..a69420d6ebf0
--- /dev/null
+++ b/dev-python/pyside-tools/pyside-tools-0.2.15-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_IN_SOURCE_BUILD="1"
+CMAKE_MAKEFILE_GENERATOR="emake" # bug 558248
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit cmake-utils python-r1 vcs-snapshot virtualx
+
+DESCRIPTION="PySide development tools (lupdate, rcc, uic)"
+HOMEPAGE="http://wiki.qt.io/PySide"
+SRC_URI="https://github.com/PySide/Tools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/pyside-1.2.0:${SLOT}[X,${PYTHON_USEDEP}]
+	>=dev-python/shiboken-1.2.0:${SLOT}[${PYTHON_USEDEP}]
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+"
+DEPEND="${RDEPEND}
+	test? ( virtual/pkgconfig )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}"/0.2.13-fix-pysideuic-test-and-install.patch
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	python_copy_sources
+
+	preparation() {
+		pushd "${BUILD_DIR}" >/dev/null || die
+
+		if python_is_python3; then
+			rm -fr pysideuic/port_v2 || die
+
+			# need to run with -py3 to generate proper python 3 interfaces
+			sed -i -e 's:${PYSIDERCC_EXECUTABLE}:"${PYSIDERCC_EXECUTABLE} -py3":' \
+				tests/rcc/CMakeLists.txt || die
+		else
+			rm -fr pysideuic/port_v3 || die
+		fi
+
+		sed -i -e "/pkg-config/ s:shiboken:&-${EPYTHON}:" \
+			tests/rcc/run_test.sh || die
+
+		popd >/dev/null || die
+	}
+	python_foreach_impl preparation
+}
+
+src_configure() {
+	configuration() {
+		local mycmakeargs=(
+			-DPYTHON_BASENAME="-${EPYTHON}"
+			-DPYTHON_SUFFIX="-${EPYTHON}"
+			-DBUILD_TESTS=$(usex test)
+		)
+		CMAKE_USE_DIR="${BUILD_DIR}" cmake-utils_src_configure
+	}
+	python_foreach_impl configuration
+}
+
+src_compile() {
+	compilation() {
+		CMAKE_USE_DIR="${BUILD_DIR}" cmake-utils_src_make
+	}
+	python_foreach_impl compilation
+}
+
+src_test() {
+	testing() {
+		CMAKE_USE_DIR="${BUILD_DIR}" virtx cmake-utils_src_test
+	}
+	python_foreach_impl testing
+}
+
+src_install() {
+	installation() {
+		CMAKE_USE_DIR="${BUILD_DIR}" cmake-utils_src_install DESTDIR="${D}"
+	}
+	python_foreach_impl installation
+}
diff --git a/dev-python/pyside/Manifest b/dev-python/pyside/Manifest
new file mode 100644
index 000000000000..21578946b99a
--- /dev/null
+++ b/dev-python/pyside/Manifest
@@ -0,0 +1,7 @@
+AUX qgtkstyle-1.2.2.patch 1650 SHA256 e01a60c20de3ae33767d5948e20235220ac43e7f40e59372ec3cdcba6892bcda SHA512 ee039cc67bf00ab43d3c6355e7b3e01d753049b2384e23c1a15f78c119b2e85f16b7bb36f0b775bc7d544674161e94eb36265b6590e3b7e593da3b131004bccc WHIRLPOOL 900f90724bc0e071aebcdd11da5436e50f2d624490649f1121fba9474c5a87af05c95b4094dd862468ac1a817e439bb6bd5fa657ad645f47d0c2753cbab62fa8
+AUX rpath.cmake 393 SHA256 b89f3698d321e30afef0f7c32be009d5d926f92ba310ad44b384cdbc1a6a104d SHA512 b9f2d3b34fd31a7e289e3aa1c96110f92bc66f45e5bfaf796f86d52eb832e960caca0e314b87248d0a41c13c95f04402607cbb5ad7d0b3238d5bab5580c3a65f WHIRLPOOL 79dbd32a58b6bf8a408f8fef3dd918c1946c89c32731b515984cb0ed8230c63cd724150db636523484d525c2ebad1f78217c7ccb6a294221aa8d2ca8dcce6a1d
+DIST pyside-qt4.8+1.2.2.tar.bz2 3765472 SHA256 a1a9df746378efe52211f1a229f77571d1306fb72830bbf73f0d512ed9856ae1 SHA512 3a1d46c48ac71c3b138e1dc398d1d2a87aff558eace275303e233f78d03e32c6d53cf390db5e7112f44da9b17aa88ed16a30f6f83b2073c1f494e61b962e4c46 WHIRLPOOL 5ac5eb5032fbc791e955eb0b2b0f1443e43867408a7b6c41854db1cab466714509c035e8271f5b0b3078309be001d5bcea498601b97f540e7775e87bdbc1c0c8
+EBUILD pyside-1.2.2-r1.ebuild 3623 SHA256 72fe3d0791beb834556e6abae1a75535c5d5340cb59d8da207b5977a74213f37 SHA512 d60a5d3b508a349250c7c83e7a1def00ef95da84195ece367f46afe692d179f67021904ff7d1e48d8feedad5e5e7332099db720fab64c4a94caaec5ab6914cdf WHIRLPOOL a54ec6da9512c457bee64f05bb25d134f57082b85c197dd3722f17005b68e55cc1b47e603c0c76f2ff979073b7b43d3259fa2a288498a0ced320a96279cdf58b
+MISC ChangeLog 2966 SHA256 2d22b1332b23233fe7591772629c5bab5f5c2595dffe9f4eb3fada42ebf848f5 SHA512 0bbbe85f2998fd0d58cca5587b461024ab73a7a013e41b1001589a163ebaa076b8f3107b4cc580259ecea8a6838598f963465ae0d9b304a1261aeb0d19758fd7 WHIRLPOOL 13934904b14170e1611c5f0e6be1d668a63cdaf382bcf3d621ca0c122757564dad5fa4d4ae07da0d9ffd6e3c81d0c9437f931c11647f110654fbb6bf0d89195c
+MISC ChangeLog-2015 9770 SHA256 8011e6d7449833d213ce59aa850ae55df9adb2d72e2a85230ee3a8e77d8d0449 SHA512 b480030ca5569db690e961e963f589ff803b4a7a645c846d95db23309942e22024622edd9f616890fc22918ed02b665116318d1d2d598d92071f24ca0596f48c WHIRLPOOL a28185215a7b58e058a4d2284eda0a83c8dc3627c9822a3782e48515d4fac1b1d5972b7df2b27753a2a4221dc75d7069dce0e7c78631865dd3da310ae8fbbb78
+MISC metadata.xml 968 SHA256 2eb07a96993128e823eeeac7e8ade1a7707c38da5e630f3a3ef80eb70c4a946f SHA512 9d01808c11a691c0bdaceec69b067bbfe395cc1d1c6491a2cebf9269462c169f5ff2a6c511855fc760563356f1bba65f2b835de663f4ec11fe7eb2e3ed6dd680 WHIRLPOOL 84c16d0bb413fd14bdbcf2bc112bf88d23cdcdfda927e752228c773c6cb751f4c2fab1eda5b50ed259b390d5ef61eb21d700c70128b2741f91cd8933b832c84f
diff --git a/dev-python/pyside/files/qgtkstyle-1.2.2.patch b/dev-python/pyside/files/qgtkstyle-1.2.2.patch
new file mode 100644
index 000000000000..d782276aba68
--- /dev/null
+++ b/dev-python/pyside/files/qgtkstyle-1.2.2.patch
@@ -0,0 +1,33 @@
+diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt
+index 6e14706..bd60775 100644
+--- a/PySide/QtGui/CMakeLists.txt
++++ b/PySide/QtGui/CMakeLists.txt
+@@ -71,7 +71,6 @@ set(QtGui_OPTIONAL_SRC )
+ set(QtGui_DROPPED_ENTRIES )
+ check_qt_class(QtGui QAbstractPageSetupDialog   QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+ check_qt_class(QtGui QAbstractPrintDialog       QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+-check_qt_class(QtGui QGtkStyle                  QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+ check_qt_class(QtGui QPageSetupDialog           QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+ check_qt_class(QtGui QPrintDialog               QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+ check_qt_class(QtGui QPrintEngine               QtGui_OPTIONAL_SRC QtGui_DROPPED_ENTRIES)
+diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
+index 711d7cc..954aa54 100644
+--- a/PySide/QtGui/typesystem_gui_common.xml
++++ b/PySide/QtGui/typesystem_gui_common.xml
+@@ -6996,16 +6996,6 @@
+     <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
+   </object-type>
+ 
+-  <object-type name="QGtkStyle">
+-    <modify-function signature="standardPixmap(QStyle::StandardPixmap,const QStyleOption*,const QWidget*)const">
+-      <modify-argument index="2">
+-        <replace-default-expression with="0"/>
+-      </modify-argument>
+-      <modify-argument index="3">
+-        <replace-default-expression with="0"/>
+-      </modify-argument>
+-    </modify-function>
+-  </object-type>
+ 
+   <object-type name="QPageSetupDialog">
+     <enum-type name="PageSetupDialogOption" flags="PageSetupDialogOptions"/>
diff --git a/dev-python/pyside/files/rpath.cmake b/dev-python/pyside/files/rpath.cmake
new file mode 100644
index 000000000000..b896c8789185
--- /dev/null
+++ b/dev-python/pyside/files/rpath.cmake
@@ -0,0 +1,10 @@
+# use, i.e. don't skip the full RPATH for the build tree
+SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+
+# when building, don't use the install RPATH already
+# (but later on when installing)
+SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+
+# add the automatically determined parts of the RPATH
+# which point to directories outside the build tree to the install RPATH
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
diff --git a/dev-python/pyside/metadata.xml b/dev-python/pyside/metadata.xml
new file mode 100644
index 000000000000..fafc4012082c
--- /dev/null
+++ b/dev-python/pyside/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="X">Build QtGui and QtTest modules</flag>
+		<flag name="declarative">Build QtDeclarative module</flag>
+		<flag name="designer">Build QtDesigner and QtUiTools modules</flag>
+		<flag name="help">Build QtHelp module</flag>
+		<flag name="multimedia">Build QtMultimedia module</flag>
+		<flag name="opengl">Build QtOpenGL module</flag>
+		<flag name="phonon">Build phonon module</flag>
+		<flag name="script">Build QtScript module</flag>
+		<flag name="scripttools">Build QtScriptTools module</flag>
+		<flag name="sql">Build QtSql module</flag>
+		<flag name="svg">Build QtSvg module</flag>
+		<flag name="webkit">Build QtWebKit module</flag>
+		<flag name="xmlpatterns">Build QtXmlPatterns module</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-python/pyside/pyside-1.2.2-r1.ebuild b/dev-python/pyside/pyside-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..41756cada3e5
--- /dev/null
+++ b/dev-python/pyside/pyside-1.2.2-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cmake-utils multilib python-r1 virtualx
+
+MY_P="${PN}-qt4.8+${PV}"
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="http://wiki.qt.io/PySide"
+SRC_URI="http://download.qt-project.org/official_releases/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+
+IUSE="X declarative designer help multimedia opengl phonon script scripttools sql svg test webkit xmlpatterns"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	declarative? ( X )
+	designer? ( X )
+	help? ( X )
+	multimedia? ( X )
+	opengl? ( X )
+	phonon? ( X )
+	scripttools? ( X script )
+	sql? ( X )
+	svg? ( X )
+	test? ( X )
+	webkit? ( X )
+"
+
+# Minimal supported version of Qt.
+QT_PV="4.8.5:4"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/shiboken-${PV}:${SLOT}[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}[ssl]
+	X? (
+		>=dev-qt/qtgui-${QT_PV}[accessibility]
+		>=dev-qt/qttest-${QT_PV}
+	)
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	help? ( >=dev-qt/qthelp-${QT_PV} )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
+	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+	phonon? ( media-libs/phonon[qt4(+)] )
+	script? ( >=dev-qt/qtscript-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV}[accessibility] )
+	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtgui-${QT_PV}
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( ChangeLog )
+
+src_prepare() {
+	# Fix generated pkgconfig file to require the shiboken
+	# library suffixed with the correct python version.
+	sed -i -e '/^Requires:/ s/shiboken$/&@SHIBOKEN_PYTHON_SUFFIX@/' \
+		libpyside/pyside.pc.in || die
+
+	if use prefix; then
+		cp "${FILESDIR}"/rpath.cmake . || die
+		sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die
+	fi
+
+	epatch "${FILESDIR}/qgtkstyle-${PV}.patch" # bug 530764
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build test TESTS)
+		$(cmake-utils_use_disable X QtGui)
+		$(cmake-utils_use_disable X QtTest)
+		$(cmake-utils_use_disable declarative QtDeclarative)
+		$(cmake-utils_use_disable designer QtDesigner)
+		$(cmake-utils_use_disable designer QtUiTools)
+		$(cmake-utils_use_disable help QtHelp)
+		$(cmake-utils_use_disable multimedia QtMultimedia)
+		$(cmake-utils_use_disable opengl QtOpenGL)
+		$(cmake-utils_use_disable phonon)
+		$(cmake-utils_use_disable script QtScript)
+		$(cmake-utils_use_disable scripttools QtScriptTools)
+		$(cmake-utils_use_disable sql QtSql)
+		$(cmake-utils_use_disable svg QtSvg)
+		$(cmake-utils_use_disable webkit QtWebKit)
+		$(cmake-utils_use_disable xmlpatterns QtXmlPatterns)
+	)
+
+	if use phonon && has_version "media-libs/phonon[qt4(+)]"; then
+		# bug 475786
+		mycmakeargs+=(
+			-DQT_PHONON_INCLUDE_DIR="${EPREFIX}/usr/include/phonon"
+			-DQT_PHONON_LIBRARY_RELEASE="${EPREFIX}/usr/$(get_libdir)/libphonon.so"
+		)
+	fi
+
+	configuration() {
+		local mycmakeargs=(
+			-DPYTHON_SUFFIX="-${EPYTHON}"
+			"${mycmakeargs[@]}"
+		)
+		cmake-utils_src_configure
+	}
+	python_foreach_impl configuration
+}
+
+src_compile() {
+	python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	VIRTUALX_COMMAND="cmake-utils_src_test" python_foreach_impl virtualmake
+}
+
+src_install() {
+	installation() {
+		cmake-utils_src_install
+		mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
+	}
+	python_foreach_impl installation
+}
diff --git a/dev-python/pysmi/Manifest b/dev-python/pysmi/Manifest
new file mode 100644
index 000000000000..3d621679fe6a
--- /dev/null
+++ b/dev-python/pysmi/Manifest
@@ -0,0 +1,3 @@
+DIST pysmi-0.1.3.tar.gz 78325 SHA256 99c74d6a0b502c04cedbf5f8f2d17656b830e5c364b92a947f4cb79240206e1b SHA512 d321fbbc68e4b6b2b18de5c1215dc450ad2ba2ea6c70cbeee9d981d2e2106b59582eae42b09da72bc02af789f7f58a6fc97712869b74f0137d8f7fd7238b2211 WHIRLPOOL 7115b0b8ee3ac3727134c67b20faf7259552f7c3b2186575f4abbc52b7a3d183eaca4e8791b6dba3da75c0a8c721195e2bfff708161567063eb2b5e48af24499
+EBUILD pysmi-0.1.3.ebuild 426 SHA256 bcbb4866c3d031f409f989a79ad3556d08bcb0b9d8a509fc04939f0dcd612441 SHA512 715530734040ce446172310a87fbce6cf4adc057612939ae9c8a339bc79ad856995d5157c4005027d77030a6b839b91aa6e3b61901bc57502b4e406ab6112a9e WHIRLPOOL 1a2c9f4b4a40764d77e6120606f715971cb04b8c9d8d8e54393d11463ebd86e2ac6fe3d88bdf4b27bcbeca0bc276af2775b79446228dade02e10e5edc740d722
+MISC metadata.xml 358 SHA256 a0ec717b3c92a0292658be3f9b49c88e3807c4fef6eed620ca79d73897435c6f SHA512 f7a17e837c410ac604a0e1b4493c7219846a8c8cbcd5b4fb84ffc401b98c8eeacba4731dabad6f61bf1e4f172157c174d6a039725174e2f58b9dfbb89998635d WHIRLPOOL b3f8ef642481163608c01d39f12f705922cf6249c369b65f545b616aa64baf67655d4934005ca13dd82c8cd2656c0c9fa0c5f0994d29aa9728c236f3ea17f24a
diff --git a/dev-python/pysmi/metadata.xml b/dev-python/pysmi/metadata.xml
new file mode 100644
index 000000000000..36420f308fae
--- /dev/null
+++ b/dev-python/pysmi/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>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/pysmi/pysmi-0.1.3.ebuild b/dev-python/pysmi/pysmi-0.1.3.ebuild
new file mode 100644
index 000000000000..42dccdce4f10
--- /dev/null
+++ b/dev-python/pysmi/pysmi-0.1.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit distutils-r1
+
+DESCRIPTION="Python Lex & Yacc"
+HOMEPAGE="https://github.com/etingof/pysmi"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/ply[${PYTHON_USEDEP}]
+"
+DEPEND=""
diff --git a/dev-python/pysnmp-apps/Manifest b/dev-python/pysnmp-apps/Manifest
new file mode 100644
index 000000000000..65e4ad0a635d
--- /dev/null
+++ b/dev-python/pysnmp-apps/Manifest
@@ -0,0 +1,7 @@
+DIST pysnmp-apps-0.4.1.tar.gz 25525 SHA256 57accb8c2fcb255b4da85af07ef9cd6a266dc5143b2834419ec8a39a879edeb7 SHA512 9edf80b3fb2732448a6a9a750ff4e13f1985300e8b45308866faeddfedd234e3b9352407837c1f5d1e6c959164daa9fc135567610a2398e1e83b6e5bdfaa3cd9 WHIRLPOOL fc0bff4b9977e1c9ff4a46dd24f6a35c300633de7aef6e9563fa735b9860efc905d3c23ec4341f95cf7cb094a845eeabd09d9b2f933fe09482c0a8e16c69a8ca
+DIST pysnmp-apps-0.4.2.tar.gz 26490 SHA256 b2b0258bdb90b0f1550b73fafc0f134b208442e91825f9acf5bc3ad9e78ed719 SHA512 a885ee62ff5cc3e40a1649db39e6c8a2285764ea8be6c3408ad1709f621a8ad9eb28df03f966cd9321198a67d8741b914f68888a6cbc55a29e2d75b64c7cb121 WHIRLPOOL d4e8774ea35792f37aa0ac37c6f91cc21ac882e291782a53b1556ab22e25f8b3150fcd1cbea09afd0247e6451759396c9238844d00de2f46381cdae785d8dca2
+EBUILD pysnmp-apps-0.4.1.ebuild 535 SHA256 6554ac613b42440f81625cbb5179c779e712eec9f5b21710bd9dd3bd69602b77 SHA512 83df3a5c8bfad8178c9ba8ab16ef3f570741e44ef1f3cfd4a6bbc9758a67ef8e90e3edf70848d0d0c7ae160b2486a247a2c7b2f86986fe7934d586cf1f69d629 WHIRLPOOL 8ae7457d0883b879116b7b670b3019c9a3745ed8fc5b1aefb4c48a323a5a575942ca93a3d80f55f5d46b217f3dcf077ba964b8cce293bccc7f49223cb12ef128
+EBUILD pysnmp-apps-0.4.2.ebuild 535 SHA256 55b7c4f6122344b9a9892b8fa7626d2d783ea94623d49d067149d1b98fa2fe2f SHA512 555846de621e6fa350f4d9f3173b83a45d5d4e9468babc3fbddf9df323b4d264562378e2be69ecc5a4854352215d1ff0e180661bba00ec4c57c1a376699810d2 WHIRLPOOL 5fcc7614b839dde218b7116f7c6f7fc4f15a912656648511270dd6fa1fb4d2b47ece5874fabcebf4969dfd073525485c6f24b9b9aa583b50297f2d92ef461e4d
+MISC ChangeLog 3322 SHA256 08be8e676c9802170ff064ac20c72e5d7a59a2a43ab151ac22d421fc8e39fad2 SHA512 bde00627cdc42b6f71e5ed09fd39cec61aca78389c6659ac9afcf2f69830a5b78450bae4c202f0ba07ee4fa388af4315adbd11ed50c68d81187b1579da2f724b WHIRLPOOL af536556f954fbbfc5d3f79f4b160c87e63724d93d533ad37eba0386739f6420ed25b25c0b6bd1bff86adb3eabcad4312a509dd31b4711dbbae877bfeb7ade81
+MISC ChangeLog-2015 2327 SHA256 751dfe3f05140931f7d9d02365c9cef60b88be5bbd73b7abc25a4889ea007121 SHA512 7ab8fe3a5c74eb55220603ceaad3d16c419b291b867a33e543b004a47e8b684394733a073f06e74540932143ccb00e127725907fef4959387e4c4bb375a43878 WHIRLPOOL fe8a460e7af8d63ef8323c604a06e2083321e0ed3b1ca00737c52e9b44328566a42507252d1fe2b53e801fd3b3e08b2bc744528fc2d4ead2ae0dfeeab2a13c36
+MISC metadata.xml 1515 SHA256 5484c51943a51f2cd4e15497e119c39ce43775cefa1ca378d65636d250602c1d SHA512 a69fb4136f83b7f61f566802cf8982aa9c84e6f009d104c7791c5c8ad3977c9b6245bbaa87ef135fae126ba1fc15e0d0debe888d0906a03200b7c4a1efaee482 WHIRLPOOL 92858e5477f69fb964d34b2914944199063ca7abd0ba708abd431a75ba86e21b2063c78e08ad67da09ee54ff34d4f2118b6fab8743600c153962901fff15d745
diff --git a/dev-python/pysnmp-apps/metadata.xml b/dev-python/pysnmp-apps/metadata.xml
new file mode 100644
index 000000000000..6ae105f12f75
--- /dev/null
+++ b/dev-python/pysnmp-apps/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <longdescription>
+This is a Python implementation of SNMP v.1/v.2c engine. Its general
+functionality is to assemble/disassemble SNMP messages from/into
+given SNMP Object IDs along with associated values. PySNMP also provides
+a few transport methods specific to TCP/IP networking.
+
+PySNMP is written entirely in Python and is self-sufficient in terms
+that it does not rely on any third party tool (it is not a wrapper!).
+</longdescription>
+  <longdescription lang="ja">
+�れ� SNMP v.1/v.2 エンジン�Python言語��実装��。関連値�沿��SNMPオブジェ
+クトID�ら/�SNMPメッセージをアセンブル/ディスアセンブル�る��一般的�機能��
+。PySNMP�幾���TCP/IP�ットワーキングを特定�るトランス�ート・メソッドも�供
+���。
+
+PySNMP�全体をPython言語�記述�れ���サードパーティ製ツールも信用���立場�
+自給自足���。(�れ�ラッパー・ツール���り��ん。)
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">pysnmp-apps</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pysnmp-apps/pysnmp-apps-0.4.1.ebuild b/dev-python/pysnmp-apps/pysnmp-apps-0.4.1.ebuild
new file mode 100644
index 000000000000..4d0b7b03c100
--- /dev/null
+++ b/dev-python/pysnmp-apps/pysnmp-apps-0.4.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="PySNMP applications"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp-apps"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pysnmp-4.2.2[${PYTHON_USEDEP}]
+	dev-python/pysnmp-mibs[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pysnmp-apps/pysnmp-apps-0.4.2.ebuild b/dev-python/pysnmp-apps/pysnmp-apps-0.4.2.ebuild
new file mode 100644
index 000000000000..b4ffb3b4c477
--- /dev/null
+++ b/dev-python/pysnmp-apps/pysnmp-apps-0.4.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="PySNMP applications"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp-apps"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pysnmp-4.2.2[${PYTHON_USEDEP}]
+	dev-python/pysnmp-mibs[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pysnmp-mibs/Manifest b/dev-python/pysnmp-mibs/Manifest
new file mode 100644
index 000000000000..e46f69c3842c
--- /dev/null
+++ b/dev-python/pysnmp-mibs/Manifest
@@ -0,0 +1,5 @@
+DIST pysnmp-mibs-0.1.6.tar.gz 2113334 SHA256 00fa321ca598e8a14c0ad98702bf10fb5e9d57b7d06bb99dc818fea07683720c SHA512 6956d437f7815e31af13ac54ade7526e07fefb63a4c4bec95fb5d5c8f198f0d7bc8bee2cd9d0072c46d089f579d6cd6227152646a763e3342c626cce367e89b2 WHIRLPOOL e0d2310049212bc87119ee55c42f13e5406aaad19f616cd5f18e0dfdc084ef0a0f36486157032be2ffe9d08f67ab0d0e2fef2b3af88657baaaa0cb5591a75a1f
+EBUILD pysnmp-mibs-0.1.6.ebuild 510 SHA256 0985f5ce130c498b88b198948247e22a39ab7f6abe5286cc4e66c4648d9594b0 SHA512 765086e2631566c30a72ba5aeca2013b060549b17417761dacfd295cf83d8b567fcd1446fa56d042f96287efe188d53f804c260dc11597ca12464347fe719b8c WHIRLPOOL cc1d5ffd1f7b92f2b577d177c3aca0d7e8dd7c5e1df9f596df708257744b73ce306646e8a471e16da1ea74218242f2cfb136a8ee7ad7e8e6711ce4dd8b3c36d6
+MISC ChangeLog 3414 SHA256 af153509eae0e4bedc62b8f50494d6da6e62cf362b08ce7e01fb3b2ea54e6a12 SHA512 f362fc00c5046ed99116c92990bfd8ed34c85b1332b5520b28b44f2727b91a29b55096253cf5247c322ddebb2f5214afd5dd19dab8781db79e5cbf3f25da3bf6 WHIRLPOOL 3e9fdce458353ad61753d101ea613cc632f1858cca20528030ff6deedfdfce03eaafecc7ec45934c990566f094e6ba57a95706e929593c5ce0451621e3b4412a
+MISC ChangeLog-2015 2363 SHA256 34c3d6db196ba52a2b6db54afc300820cb141aae90b88dcc79c3ae380a322d29 SHA512 9bf631e29753cbe0cb93ef5d009419f54048ecaf3d58281cce8165072a5e9e717b5bd8bc4735910f481e9daba2fbcfb3db6897678da5159c2ae02e56579956ed WHIRLPOOL b6101d1371e94fcb465057f8f206355e0b9b8385be0ab04dcaa4436aa5254dd73fb7238d319a686e8df02bb0980c3db4add0b6266bf7e8b03a5b7b64849e0840
+MISC metadata.xml 1515 SHA256 92a953e9d6f9a1fc6aac2c587aa363ff692d29896316ea42b3afa931d205e105 SHA512 99adddec026ae863568b6239dba0aaafbdcbc5b020c0c337c1466900a134de902cea3a304c8d2c8aad12ade54750379a1fde88120e13f879e7f75ced2bfd1be4 WHIRLPOOL 95b6e696b652642e3088b2d2f02b2504e971a899612cb22bcae4307e1e5540c8ff2e356bae36cd6cacb510d788e6d5423b6fb029868afaab403ca672d5b7a82b
diff --git a/dev-python/pysnmp-mibs/metadata.xml b/dev-python/pysnmp-mibs/metadata.xml
new file mode 100644
index 000000000000..37a31ce229ad
--- /dev/null
+++ b/dev-python/pysnmp-mibs/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <longdescription>
+This is a Python implementation of SNMP v.1/v.2c engine. Its general
+functionality is to assemble/disassemble SNMP messages from/into
+given SNMP Object IDs along with associated values. PySNMP also provides
+a few transport methods specific to TCP/IP networking.
+
+PySNMP is written entirely in Python and is self-sufficient in terms
+that it does not rely on any third party tool (it is not a wrapper!).
+</longdescription>
+  <longdescription lang="ja">
+�れ� SNMP v.1/v.2 エンジン�Python言語��実装��。関連値�沿��SNMPオブジェ
+クトID�ら/�SNMPメッセージをアセンブル/ディスアセンブル�る��一般的�機能��
+。PySNMP�幾���TCP/IP�ットワーキングを特定�るトランス�ート・メソッドも�供
+���。
+
+PySNMP�全体をPython言語�記述�れ���サードパーティ製ツールも信用���立場�
+自給自足���。(�れ�ラッパー・ツール���り��ん。)
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">pysnmp-mibs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
new file mode 100644
index 000000000000..13a025289adc
--- /dev/null
+++ b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="SNMP framework in Python - MIBs"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp-mibs"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=dev-python/pysnmp-4.2.3[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pysnmp/Manifest b/dev-python/pysnmp/Manifest
new file mode 100644
index 000000000000..884fa7c815e8
--- /dev/null
+++ b/dev-python/pysnmp/Manifest
@@ -0,0 +1,9 @@
+DIST pysnmp-4.3.10.tar.gz 425950 SHA256 215191e36c8c88bf600c55a2e33afbd1dfdd6366dda42b446e1b9f099b53baa8 SHA512 3eeb0a2afe2deb918c67c7358a7d8528bc420f63a7b35561becc7cc970bc2c75e2df607ba9ee62b7ab790087e7eb6eec965f5fc163f337e8d06c094848ce957d WHIRLPOOL bc6647da861ed9375a5679af4fd91e81eb6ed7687261ec46aae60435bc281b999746ceb3ad5f86c9db64e046a409f1370443712ef06168f828a04eca2c79c9fb
+DIST pysnmp-4.3.3.tar.gz 403779 SHA256 c837d35cbb2c1e067b7b8ed752d962481ef8d7ff11e4cdd8bfb0840c4a786318 SHA512 4b3e4a1785a852eb0b03266d2efbc586c01030f4653482bfea91b64a78098554589e76d38fe43c6b2d734ea3624a42878a2e3b6b7cfbf883e8bf8ad07ff43f81 WHIRLPOOL f04c9f6eece5d31bb4941cfdbfa3216fb5a65b2b2b1b097bd72ca500506262c0458d6d774b99c766f2016fb46ea50bc9a8b741825f820a0a7970dac7ac934977
+DIST pysnmp-4.3.9.tar.gz 425302 SHA256 59c196ce599617ad6f484d20bc61336bff64d3dca4bc99282ba06047248fc70c SHA512 b6992eed9cccb39c77527c871249e98ad758372a7e462ecc9c8b7aa476e29804aefe4974712719428ad8ba80f425f725a97ea7117e43ffd92c0bdc45605ea440 WHIRLPOOL a45695731cdced683c5af8735bbb1cea5aec67e7cf1a3e930832f3866a428c433681b97d9283e454486d362a97b54af9bebeb8a963e7805dc0933e24fb6a0d95
+EBUILD pysnmp-4.3.10.ebuild 1209 SHA256 ff1019abb8d5e4c295ad4c3e00b8c8328aa5084f8cb4196ff7a92d17abb31271 SHA512 c6fd8eff919486fe2d137afa6efecdcce7939c42b4f1ae69587466573012db68814dd0b533c7f727da9cd8182714b7d8c351aeaa445a723770d50f24511341e9 WHIRLPOOL 7bad78aa0458c81d5953f91ba49c7e81f0e27ea7089852b84c945b5b4693896d303b48db8e14e1eed6b3ebd43a9dc140e96c97dfdb2c9016ea18c1d6c304496b
+EBUILD pysnmp-4.3.3.ebuild 1206 SHA256 340d39ed53fa8464dee5f2daab57f90812a392a2d6ea503658e45350a9040b58 SHA512 7ee558df4ba2704bb115c4b8fc07b73952d366fe8604c4a15d94feecc3fba5df904ecbbd232548e693351257eede9714284d8ed0f9ba24a1d0fc33456ac284d7 WHIRLPOOL a9de9bc2771ee0b0e0265793d84f619c0b9404f8661f8881a83a21e9a645735b2b44bb071ad7cfdda6cbdd738f744a7a5c9e712ea151a606318c9e9120ceb8b6
+EBUILD pysnmp-4.3.9.ebuild 1209 SHA256 ff1019abb8d5e4c295ad4c3e00b8c8328aa5084f8cb4196ff7a92d17abb31271 SHA512 c6fd8eff919486fe2d137afa6efecdcce7939c42b4f1ae69587466573012db68814dd0b533c7f727da9cd8182714b7d8c351aeaa445a723770d50f24511341e9 WHIRLPOOL 7bad78aa0458c81d5953f91ba49c7e81f0e27ea7089852b84c945b5b4693896d303b48db8e14e1eed6b3ebd43a9dc140e96c97dfdb2c9016ea18c1d6c304496b
+MISC ChangeLog 4391 SHA256 55d23202a2e62febbc1ccb920ebca7abc20bdaa2e6569bc37c5820ddf66a9b86 SHA512 2cf67f37cc30871c6834cff782e3e2aa15c08abd997a6f1d97896dee0c9568bb684797356433a243ddd74c47d0fa07336bc4caa0fe0128c174af2fe9e8951b6e WHIRLPOOL 9eeb971344c8337aa4048410917d31afc651668ac96c092b48a54a26e03f16dce62f11009a015b6ca29aba728e6e56a4ea479b77be3ae12f966a03b8886ef06a
+MISC ChangeLog-2015 8502 SHA256 f5f120064996eff8783b5224f5f1f1091f1846d2ed7d7f7c0468557eb0437627 SHA512 b26a25218c727f6c95e644350299a9515fbbe9af34076235853490454127dde02035acf7ba59674af2179bcaca5e8e79bef146c30f6d7733e174d1d21c43aac9 WHIRLPOOL b95dca90658ebeaf301e22ed18013f77c0044975bdb9ac6772d3657b1887a55bd59efae9cdeaf37997f34cd634075350c1dd2f3fe32a4261640c07010a44c5ba
+MISC metadata.xml 1567 SHA256 fed20378a70c89327cfd3d34e372b7327cd5bc03f987fa9aea6e1568ebc2f8a8 SHA512 3ec28aa833cf162493be384e095a4aa440dc9fb19941b5c503d81d1bff83428d5aa8af80dfa24c88055c573c09529c12e3fd4962dba3d171ea8d2e87a7bb7822 WHIRLPOOL 0cc71caf34e103aba0f120c62d8b9052cfb43064f88c67c8b30163868af5e7da39c724d421bb0ed90b9c731f85a13f65fa0cb9d79e2be334787a59c75d68644b
diff --git a/dev-python/pysnmp/metadata.xml b/dev-python/pysnmp/metadata.xml
new file mode 100644
index 000000000000..ccc20b0ed3b5
--- /dev/null
+++ b/dev-python/pysnmp/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+  </maintainer>
+  <longdescription>
+This is a Python implementation of SNMP v.1/v.2c engine. Its general
+functionality is to assemble/disassemble SNMP messages from/into
+given SNMP Object IDs along with associated values. PySNMP also provides
+a few transport methods specific to TCP/IP networking.
+
+PySNMP is written entirely in Python and is self-sufficient in terms
+that it does not rely on any third party tool (it is not a wrapper!).
+  </longdescription>
+  <longdescription lang="ja">
+�れ� SNMP v.1/v.2 エンジン�Python言語��実装��。関連値�沿��SNMPオブジェ
+クトID�ら/�SNMPメッセージをアセンブル/ディスアセンブル�る��一般的�機能��
+。PySNMP�幾���TCP/IP�ットワーキングを特定�るトランス�ート・メソッドも�供
+���。
+
+PySNMP�全体をPython言語�記述�れ���サードパーティ製ツールも信用���立場�
+自給自足���。(�れ�ラッパー・ツール���り��ん。)
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">pysnmp</remote-id>
+    <remote-id type="sourceforge">pysnmp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pysnmp/pysnmp-4.3.10.ebuild b/dev-python/pysnmp/pysnmp-4.3.10.ebuild
new file mode 100644
index 000000000000..237ed7a23499
--- /dev/null
+++ b/dev-python/pysnmp/pysnmp-4.3.10.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python SNMP library"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc examples"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	>=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
+	|| (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	default
+
+	if use doc; then
+		touch docs/source/conf.py
+		emake -C docs html
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/* )
+	docinto examples
+	use examples && dodoc -r examples/* docs/mibs
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "You may also be interested in the following packages: "
+	elog "dev-python/pysnmp-apps - example programs using pysnmp"
+	elog "dev-python/pysnmp-mibs - IETF and other mibs"
+	elog "dev-python/pysmi - to dump MIBs in python format"
+}
diff --git a/dev-python/pysnmp/pysnmp-4.3.3.ebuild b/dev-python/pysnmp/pysnmp-4.3.3.ebuild
new file mode 100644
index 000000000000..38083e2b1ad9
--- /dev/null
+++ b/dev-python/pysnmp/pysnmp-4.3.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python SNMP library"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
+IUSE="doc examples"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	>=dev-python/pyasn1-0.1.2[${PYTHON_USEDEP}]
+	|| (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	default
+
+	if use doc; then
+		touch docs/source/conf.py
+		emake -C docs html
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/* )
+	docinto examples
+	use examples && dodoc -r examples/* docs/mibs
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "You may also be interested in the following packages: "
+	elog "dev-python/pysnmp-apps - example programs using pysnmp"
+	elog "dev-python/pysnmp-mibs - IETF and other mibs"
+	elog "dev-python/pysmi - to dump MIBs in python format"
+}
diff --git a/dev-python/pysnmp/pysnmp-4.3.9.ebuild b/dev-python/pysnmp/pysnmp-4.3.9.ebuild
new file mode 100644
index 000000000000..237ed7a23499
--- /dev/null
+++ b/dev-python/pysnmp/pysnmp-4.3.9.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python SNMP library"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc examples"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	>=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
+	|| (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	default
+
+	if use doc; then
+		touch docs/source/conf.py
+		emake -C docs html
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/* )
+	docinto examples
+	use examples && dodoc -r examples/* docs/mibs
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "You may also be interested in the following packages: "
+	elog "dev-python/pysnmp-apps - example programs using pysnmp"
+	elog "dev-python/pysnmp-mibs - IETF and other mibs"
+	elog "dev-python/pysmi - to dump MIBs in python format"
+}
diff --git a/dev-python/pysolr/Manifest b/dev-python/pysolr/Manifest
new file mode 100644
index 000000000000..3231c1f7b311
--- /dev/null
+++ b/dev-python/pysolr/Manifest
@@ -0,0 +1,9 @@
+DIST pysolr-3.3.2.tar.gz 14193 SHA256 eea7b2705b4a24ea658136c55ae5c8c30bb661075600fc64d22e57e73951aa96 SHA512 7252efc42987bdf999d122404e63e6410d2efe7b1a49d378c8ad16c9171d8f26cd5ecd891a8a9daa205333b914ec4f95af105fe1bee25312aa05bb884811aebb WHIRLPOOL b4de2ea699f3acffe84cc6e46a979f01f0a5cf7c8731bad941f6f7f76e8ff41d03d436af7829a07ba05ebee850e5d202f6efd0e195f9e639196289da5d267227
+DIST pysolr-3.5.0.tar.gz 17640 SHA256 afb9e379d3689a12f83ac8cd857785075bad909cd876e81a26dccdada469b3be SHA512 8c5e4e34890b63e301e757e46c19dd82d7e6df03665ece96c233a1a5af0025e54d3db653721af0a2615157b926b7c8a9d5af3c758d740f99f3b2489b96320690 WHIRLPOOL 2ab862044b8ea91ea74ee08153c413927c105e60ec3136f26e3f7ca87fc5aa1c03c4569eafd7f6b0c42bdb69a697a521e267d1c8ab83c1b49df0e60d3eba6c86
+DIST pysolr-3.6.0.tar.gz 28485 SHA256 f94292c1002dbbbfaecaad18fec39cc4bff843b459c8851a2234f2799788ac6f SHA512 15d2599bdfe5b364d0c0497f3125945c8a14a61baca6d32bb775d32fac8a8c2bb9ae46e90e4a08ba144e5f6cc83efba7e456ff7ff617c9af34116432bafbac36 WHIRLPOOL 53695d9aa625fd148eeccc9d5a38a59738ac3a19346d1dd41892511fd2775f33335354208a2286b6a4fc15541027cc0eb313e7e8f32919019b83171f96180fe5
+EBUILD pysolr-3.3.2.ebuild 571 SHA256 fc50090de9d93ce4a8d2f560a40bb0182778c28fa3ddd11ff64c707cb565e9cf SHA512 5fb116c2a828b2239d75925b54a445b84697eb0bf6a4e752c73c18bdf9081b8e28ba6b713057b8f2735e7f43ccd291bdcde9673ac25ae6aefb79f045d3d7addb WHIRLPOOL 3c39fe2f44f4af72f4800480d200534893291debd605aa6bc4fca911023ab38142d13e6f94694543c8f920d10da37f6132e7f7bc64ca0b10b432cd31d89f0914
+EBUILD pysolr-3.5.0.ebuild 570 SHA256 e3b9a2981cd0a202fc990a90eae8d9d0512fc195bf4f6e864516f52428fb709e SHA512 5a9702985cd8d4788a61e926829fc1116ff55150ba94416a0eb388b913d7471266de9a699e9a906829c0b6035f54a7a7d7146965695d2723325df997345f5f44 WHIRLPOOL 97797edc73db0523758d258ef6a54483dc43bb1262a1738a7695bfbf39aa6c369fd2c28c1abcdcc91da8f07864e5181d9d0a42285bbe9b1cab44692c082761f7
+EBUILD pysolr-3.6.0.ebuild 570 SHA256 e3b9a2981cd0a202fc990a90eae8d9d0512fc195bf4f6e864516f52428fb709e SHA512 5a9702985cd8d4788a61e926829fc1116ff55150ba94416a0eb388b913d7471266de9a699e9a906829c0b6035f54a7a7d7146965695d2723325df997345f5f44 WHIRLPOOL 97797edc73db0523758d258ef6a54483dc43bb1262a1738a7695bfbf39aa6c369fd2c28c1abcdcc91da8f07864e5181d9d0a42285bbe9b1cab44692c082761f7
+MISC ChangeLog 3069 SHA256 4cfecbbd736e8364785c29790a1a10c01cd523063ddc4ac923c731007e228e54 SHA512 f02109252752d95cf518badeb3c58243a10e38af97000a3190c74a5bf29286b1335c1a05a01b58f23f48ab13aec6b8110ec591926a695e6d26cbedc884211c40 WHIRLPOOL 2c5239abbb779a3332cf34e1fcbceef6c816a8ee7a0a01f4b6686ef83b457dbe54612f703459e93ba9928840f00eb522ad842c75940d6ce985de64c4c31c8b1e
+MISC ChangeLog-2015 759 SHA256 070458986c7a8546b392c48588d235664231e853005631042fdbe9a2db2c54b9 SHA512 4c6174617b5de59f8f4a607d8b078d77133b3950ddfcb21763a8474782fa46ab659336542ad1633657c188392bd3f63aa186b536e421831518fd7a55ad743a07 WHIRLPOOL 59b0964f52bce4c0dd773eae08c4e4da7f7aa7ba582aacd62590f853ea34ee024945ee8df29f11bb31769e1c90b7d1cfddf7a673efedd58a2fd4c0905c1382b5
+MISC metadata.xml 379 SHA256 aa6502a14b292111ea40cd35388c77bf6235586bee59a792ab13df6b96c8b0d6 SHA512 862fbb61da30df5733458c4a7267a3973bb7763d83ac7b817c42c7edef7dcaea6b1235de8df382c0ae6870ffb330b990b874b6dc169d4407da172959082e6491 WHIRLPOOL 58bdb510c1e165382419f909920ff05c59fc2c9a02999413cb0a94f939527ce553594e0eb550faa2bfe6f3045b50f7bd5d1637e03f21b58534df64db22b7150d
diff --git a/dev-python/pysolr/metadata.xml b/dev-python/pysolr/metadata.xml
new file mode 100644
index 000000000000..556ea46f0190
--- /dev/null
+++ b/dev-python/pysolr/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pysolr</remote-id>
+    <remote-id type="github">toastdriven/pysolr</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pysolr/pysolr-3.3.2.ebuild b/dev-python/pysolr/pysolr-3.3.2.ebuild
new file mode 100644
index 000000000000..0ce697520b2e
--- /dev/null
+++ b/dev-python/pysolr/pysolr-3.3.2.ebuild
@@ -0,0 +1,21 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Lightweight python wrapper for Apache Solr"
+HOMEPAGE="https://pypi.python.org/pypi/pysolr/ https://github.com/toastdriven/pysolr/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pysolr/pysolr-3.5.0.ebuild b/dev-python/pysolr/pysolr-3.5.0.ebuild
new file mode 100644
index 000000000000..02215372aaf7
--- /dev/null
+++ b/dev-python/pysolr/pysolr-3.5.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Lightweight python wrapper for Apache Solr"
+HOMEPAGE="https://pypi.python.org/pypi/pysolr/ https://github.com/toastdriven/pysolr/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pysolr/pysolr-3.6.0.ebuild b/dev-python/pysolr/pysolr-3.6.0.ebuild
new file mode 100644
index 000000000000..02215372aaf7
--- /dev/null
+++ b/dev-python/pysolr/pysolr-3.6.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Lightweight python wrapper for Apache Solr"
+HOMEPAGE="https://pypi.python.org/pypi/pysolr/ https://github.com/toastdriven/pysolr/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyspf/Manifest b/dev-python/pyspf/Manifest
new file mode 100644
index 000000000000..7ad0b720db36
--- /dev/null
+++ b/dev-python/pyspf/Manifest
@@ -0,0 +1,7 @@
+DIST pyspf-2.0.11.tar.gz 63594 SHA256 693e80df3d61d69daaa2590e0f2bc8167d5fa36ce373d43987984cb00ae23928 SHA512 cababa82d1b6c206033a6583a67502d982a2c34baec0ccc08513a2bc9beb4cfc84dd5d615ac852fd25885c4abd43d9e8704f517c70fadb4a600d3b8a6254d755 WHIRLPOOL f1f97b8d0c6207a01d5d48aa3f63948749d3ceca590c146ec846638e263ba8155616e9d34af0bdfde3c1438869a3727a98154c054e0e33632c8cccd23d3f2e3d
+DIST pyspf-2.0.12t.tar.gz 67189 SHA256 8aa21ba0e3aff8a4e8ad8f586c500a5d1f9c4c902c3f11bcc107465857cd41a2 SHA512 1ad23b5dea4aa8edd03b3fd9fc675685bcb0e216474534563c55988df040abd4e2bbc8488bba80d26466877e8b2ec88cbadc2f67eb8c4bf6f26f975d8af81d8d WHIRLPOOL 9159c23a0f9b56e6069f4cf35cadd5af6ab017f8bee4e7d5f98bf94c2cd0a336660d95f35a81c769b19c96235500760e6a9bde504b3e5c9f1419a05d19913d3e
+EBUILD pyspf-2.0.11.ebuild 966 SHA256 b03dd89cccabc6e1a70cf5553752631aca0ccedb0eddaa97f8d71a5a0a9ab75a SHA512 6cb33c80dbeb8d07ac5fbc1caccfa9fcd02f3a7c6f011082c36a7662122d3ac96dec08bb71e97e9c32241330d76ff9a3c7078c498d1cfaf618e38672c3b9efaa WHIRLPOOL 571d99b8f488b18ea419e94bf629988fa1fc0344ccdf99963847cbcb30560b93ab65a5f2c9a238b599f26105d6a52cf3cd7ef0c12684704150777508bdc98907
+EBUILD pyspf-2.0.12.ebuild 975 SHA256 6cc62831257cac1994e1559b70694e298f250e6f5a9a3d744ea00fc8c661095b SHA512 d223ca28914ad6cb2a87511b222210ca59723dea7174ec3f67088de72d1ee516280377e26c6bf96fad595533d16d2e952121b33f20ab26227614a25a3e5350d2 WHIRLPOOL bffeeb31c8a5cccd2b2e020271342a3f2272d7ce2d8e011f7e4cda7af02f59ff9dee39c76afee43de7632609c65edfc455df9ced02e2eff9b3e4edf975b88887
+MISC ChangeLog 3420 SHA256 91afe1536957e1af15c78c3de2677ccb0a1662beb21c95b9f88fa21a6099d00c SHA512 544e09dde721f03bc49fb5c08cf281e0b002471ae23288239c7c4b3d46e53ab4e3a17d312c9c9af74f714ec4abcb4894111b1112cd5900c35f296376b1ad2b0a WHIRLPOOL 9718dd0a0c27f17c37b8da2a524ef296a6c7b14886b6296f5ac828c984cffd5d4aac81bef3ac7e3a8d69550db02562d0715d4c01956af7ce9b306fc373d48de8
+MISC ChangeLog-2015 4206 SHA256 db9342aabb6e5936a66a27385270a76e243f1d7fc798f22cba48c700dc906c00 SHA512 992c93ec0c442fac1d7971133315fe490036a15061e007bc1af1d1925e2e2113e81af809da60d4d9d6725809f07147660f9beb30233bcc88791f2adf44e72ab6 WHIRLPOOL 7d4f1573ce359218bf214f1e51d0472552ab00e521fb045372da1e6965bb852f0af90eb9fa75d545f06e5a8ebef6ac5490a4b58bb54cb1e2bbc457b69c520ba1
+MISC metadata.xml 318 SHA256 caf6e56f8fbf4823d2bf0d520a91553ee7e13881b65380a6e5cc5b9470fc7503 SHA512 561cbdd0b14a8fb091ba9943987d93c8c1323a4b5f8f2b32f094284d683eec5562153a5a8ec77412a0806bac56c5667ec6e9e8d99e77bc2e45a5b7d517c8c483 WHIRLPOOL 0e93929420e9870ad86783035c4fae48b2b5f00ebfad0a933bbb00ae60dc8a6620cb14f53d3c31630214789aaa1a89b83d8bbbab5d8618900bf5324fd564ed4e
diff --git a/dev-python/pyspf/metadata.xml b/dev-python/pyspf/metadata.xml
new file mode 100644
index 000000000000..d9d5ab63ea89
--- /dev/null
+++ b/dev-python/pyspf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pyspf</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyspf/pyspf-2.0.11.ebuild b/dev-python/pyspf/pyspf-2.0.11.ebuild
new file mode 100644
index 000000000000..8425434b3d0f
--- /dev/null
+++ b/dev-python/pyspf/pyspf-2.0.11.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_REQ_USE="ipv6?"
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Sender Policy Framework (SPF) protocol"
+HOMEPAGE="https://pypi.python.org/pypi/pyspf"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="ipv6 test"
+
+# >=python-3.3 comes with the built-in ipaddress module
+RDEPEND="dev-python/authres[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/ipaddr-2.1.10[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/pydns:2[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/pydns:3[${PYTHON_USEDEP}]' 'python3*')"
+
+DEPEND="test? ( ${RDEPEND}
+	dev-python/pyyaml[${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="test? ( ipv6 )"
+
+python_test() {
+	pushd test &> /dev/null
+	"${PYTHON}" testspf.py || die
+	popd &> /dev/null
+}
diff --git a/dev-python/pyspf/pyspf-2.0.12.ebuild b/dev-python/pyspf/pyspf-2.0.12.ebuild
new file mode 100644
index 000000000000..cd41a136bafd
--- /dev/null
+++ b/dev-python/pyspf/pyspf-2.0.12.ebuild
@@ -0,0 +1,34 @@
+# 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} )
+PYTHON_REQ_USE="ipv6?"
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Sender Policy Framework (SPF) protocol"
+HOMEPAGE="https://pypi.python.org/pypi/pyspf"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}t.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="ipv6 test"
+
+# >=python-3.3 comes with the built-in ipaddress module
+RDEPEND="dev-python/authres[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/ipaddr-2.1.10[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/pydns:2[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/pydns:3[${PYTHON_USEDEP}]' 'python3*')"
+
+DEPEND="test? ( ${RDEPEND}
+	dev-python/pyyaml[${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="test? ( ipv6 )"
+
+python_test() {
+	pushd test &> /dev/null
+	"${PYTHON}" testspf.py || die
+	popd &> /dev/null
+}
diff --git a/dev-python/pysrt/Manifest b/dev-python/pysrt/Manifest
new file mode 100644
index 000000000000..db80f99bd628
--- /dev/null
+++ b/dev-python/pysrt/Manifest
@@ -0,0 +1,10 @@
+DIST pysrt-1.0.1.tar.gz 11741 SHA256 5300a1584c8d15a1c49ef8880fa1ef7a4274ce3f24dde83ad581d12d875f6784 SHA512 cd03d40ebef953d7ea67073a114f10a87eb142670ece727d09a31b498835d8485ac0c125f4281b6ababdd6f0757f9549ce38cb05eda79b23ff17950ab891d0eb WHIRLPOOL f7629430ac7ee9b2a69d5618346e2f97f01a68683e8b9ef8c13519a87a7043852c142ba050b338ddccc992c4ada01bbae41b9d2bab2696cdb0fdc50761d7dd81
+DIST pysrt-1.1.0.tar.gz 12171 SHA256 7f5468b15b05341e7b6086b611a326588da8dd7f649b1482cbb63cce7ff88af6 SHA512 31d085ca255cc9a09fe0df8611067ad39db36789b9cce89638382b2bcd5c4cad93a4cf1b19d852eb5a954fff89e602ab6359d4846ba9c6ca05d4b7a3b27ffa24 WHIRLPOOL 535f8f46b801efc1a4addda196a05135e6bda26360c51f7a62f902047017a3458970c4fd8cf6b51cdb0a20bede69e96d9d175bb97ba9dfbefd5ea9351249c409
+DIST pysrt-1.1.1.tar.gz 104027 SHA256 fb4c10424549fc5a32d19cd5091f00316b875461fcd79a7809bb55056974d0aa SHA512 607f80c1f66702d36b6fa54b293f59c6a28415d812bf54d7210075d1c84a7547ce2776c0809910ed3d79c08a3c595ce74719976d8f2818820a3f4a306ffc1825 WHIRLPOOL 9f3e4e76286ad5f2b90bd81eee3165e29295372b2f3c112875ea7c90fa57c04c8985a94b1106ba886a5ed81a6200a938a94c634ef0b5d92c85793b7e36d9fa6f
+EBUILD pysrt-1.0.1.ebuild 823 SHA256 0095d2092dda512ffeb000c9e82b5438a89e229720735353d7a82b76b3b65ae8 SHA512 2e89c6de324a8cb5974d30820da35c4c48f54e320b3e84fca35fe8e0a65c71660121a5caf1abbd28528ac73e3ae34da126914e19cb7f06dba04b5e5d046885f0 WHIRLPOOL ffca6dd4120699549267e70013719c3b6e4f003b3d3e32644427a69547af5c06cec98c12a650dbd5c0d2e916a00e437d3a52eb6795de3170ed35cb3e485d8729
+EBUILD pysrt-1.1.0.ebuild 716 SHA256 5f76c01549cefcf9197feed05a1b3d679d741263245136f5fd3588a4f386ccba SHA512 748df19d36836be33058a15f69532d1211ddbfbba2e952a156ea9b16f306b36f137eacd0ea611e57d1c961fbb9f26615447c6d9e75667003af9d89ffb9833296 WHIRLPOOL 408f315b615b528f320a6a78fd94aaeba6ec36c85e390def3e8ea11015b76c99ba497a8bca5fa4c4562eff86b2a85db20bc2ad25caa0e6cf58536762cc832c21
+EBUILD pysrt-1.1.1.ebuild 788 SHA256 d175120999b667a2c381743fae7fcce2ce9a18d8c5823e35345f16a540af79f6 SHA512 7f15dde11564ef8615a1175f8e756f0771ecb34b64e4f4c1957656933664bf2f6e727c002e45505f14662b59e5c7eacd9ce2b65f9fcca0f01c09b2aac30e8e9e WHIRLPOOL c7ee80e29d2d5beec15ec75fdc7deeb2f950914c2deb1ab5224b65ddfed81d07b798407a3052762140f8064a39edbec1ca65e0e026087bda2f56f159c9f974a6
+EBUILD pysrt-9999.ebuild 716 SHA256 26cd983108cbabfe358e2af8ce2c1be2b2cf631461c894ba88356128dc0120a1 SHA512 9391b47318f7db590b822ef77ef6cb2096111dac8a52136088828901159cc6305f54fcbea5e11f90ecad458eee7b68bf890537991d73bc3b97719879901fda17 WHIRLPOOL 35978bf3ae89f7cbb8a4180d18126a1415432a51ce7fd9dbba4f1e23d71ac32ddd14e7fabd8092c8e376919b7b228320ecb5118c6ee323b463c35b20a0a3a35c
+MISC ChangeLog 3905 SHA256 c350e25b59519c144e505d30f6a48f3ae5b9814f3ead759f08bb2cf244776597 SHA512 d96191ffc2236b2e89ddc3d511cc397451ddf8f6695a5dc5768b7411f8522753593f8bda594408762bda353fcdddf875b3afb549d1d64f058548e20a11c564f5 WHIRLPOOL 7aa531024ef1a06c65c13ea1f9e39d59775377aa27c96ec73f368eff0f5e8855c96a732ec349c5797ea7fd677b666d3efa716bba3a44fdca6431121cceeb353f
+MISC ChangeLog-2015 1610 SHA256 3c26c2f9876f2de9d2d8e86bdc6a1e74822c892e8057026f7ceb27bdb5897734 SHA512 af8fa696413f31329f2f2d3419f79828f80b5188d14204e036d1128411de0bdc890fde62f737ab5622ecb7d6d2e2cd9531cd2a85d1eac9a4a40bd803069e7ce0 WHIRLPOOL fec8ed82aa9b5e1c10acd9d25d791c1e888738182cf9e918a4a6c094b96e4bca52285e83a7b10c0fa7a235e4ebd87b98850abb1dc3578380026d670dc564e51a
+MISC metadata.xml 626 SHA256 10db9492f1481be99b2e459abc0a04d05b6b26f8921bfd1ee16ffefccf002cac SHA512 33a316cb9b5d8010c0bfe429a838a469ab4f2ea7dbf94b5ff05e4a5fc77e55173e8e0f876aeb99b394de6e74d329d5ee57488c35550652571753cb53c6d085e0 WHIRLPOOL 9c0ffadc49de3bff01fcfbf4e996bf44ee775c289e51ff8c00d99cdc597f3d8cededcba325f3dd900c459e5ff3cfe68d5de17a7611ef52fc5e8c38871ed5feef
diff --git a/dev-python/pysrt/metadata.xml b/dev-python/pysrt/metadata.xml
new file mode 100644
index 000000000000..9cc7c5e27320
--- /dev/null
+++ b/dev-python/pysrt/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pysrt</remote-id>
+		<remote-id type="github">byroot/pysrt</remote-id>
+		<bugs-to>https://github.com/byroot/pysrt/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pysrt/pysrt-1.0.1.ebuild b/dev-python/pysrt/pysrt-1.0.1.ebuild
new file mode 100644
index 000000000000..a7ed67b90277
--- /dev/null
+++ b/dev-python/pysrt/pysrt-1.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library used to edit or create SubRip files"
+HOMEPAGE="https://github.com/byroot/pysrt https://pypi.python.org/pypi/pysrt"
+# pypi tarballs don't include tests https://github.com/byroot/pysrt/issues/42
+SRC_URI="https://github.com/byroot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[coverage(+),${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+python_test() {
+	nosetests --with-coverage --cover-package=pysrt \
+		|| die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pysrt/pysrt-1.1.0.ebuild b/dev-python/pysrt/pysrt-1.1.0.ebuild
new file mode 100644
index 000000000000..ab91a666b646
--- /dev/null
+++ b/dev-python/pysrt/pysrt-1.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library used to edit or create SubRip files"
+HOMEPAGE="https://github.com/byroot/pysrt https://pypi.python.org/pypi/pysrt"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[coverage(+),${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+python_test() {
+	nosetests --with-coverage --cover-package=pysrt \
+		|| die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pysrt/pysrt-1.1.1.ebuild b/dev-python/pysrt/pysrt-1.1.1.ebuild
new file mode 100644
index 000000000000..c16e7200f4fb
--- /dev/null
+++ b/dev-python/pysrt/pysrt-1.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library used to edit or create SubRip files"
+HOMEPAGE="https://github.com/byroot/pysrt https://pypi.python.org/pypi/pysrt"
+SRC_URI="https://pypi.python.org/packages/f6/33/16ad65a8973cb8bcb494af09ee1b9ab5ffdd6ff300bce5d3ac7d3cb1f2cc/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[coverage(+),${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+python_test() {
+	nosetests --with-coverage --cover-package=pysrt \
+		|| die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pysrt/pysrt-9999.ebuild b/dev-python/pysrt/pysrt-9999.ebuild
new file mode 100644
index 000000000000..a6d77706d853
--- /dev/null
+++ b/dev-python/pysrt/pysrt-9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Python library used to edit or create SubRip files"
+HOMEPAGE="https://github.com/byroot/pysrt https://pypi.python.org/pypi/pysrt"
+EGIT_REPO_URI="https://github.com/byroot/pysrt.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[coverage(+),${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+python_test() {
+	nosetests --with-coverage --cover-package=pysrt \
+		|| die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pystache/Manifest b/dev-python/pystache/Manifest
new file mode 100644
index 000000000000..3fac1b80c665
--- /dev/null
+++ b/dev-python/pystache/Manifest
@@ -0,0 +1,5 @@
+DIST pystache-0.5.4.tar.gz 75131 SHA256 f7bbc265fb957b4d6c7c042b336563179444ab313fb93a719759111eabd3b85a SHA512 4ac325e1431f58f740218c9ec309821db82d89989ef4ca7fc3536dea0ef1c90e8e85ebaa7df27f33129ca02252b84bcbd7429a1ed999b496f62f174dd66502cb WHIRLPOOL ced73b06095323eb56f215aa68517ea32b8b4ba51b34ab71c861d09bdebbae91e6b05ed162a75592e40f5d18691a5df16e3dd1678789c4e6c4ccee2789201cbd
+EBUILD pystache-0.5.4.ebuild 597 SHA256 60e6331ee7215c95635160d4ad28762895eb53dad00488c2e0a58d1498939fca SHA512 eca0fc97cf0d2eae64a82845755d20c38262ae43fa43a73236935f3fa8dd34c2946f33e82e56610f8f6b0de2c6c24245445f30a7a1a823385b8a48904672500b WHIRLPOOL db26df6731874de2a959d2a83e1521c6a81e888c1c80d10acbb09fc333b4b2b5e65a2a167566450bcf8591612a84b090c5d788fcf12bc87dc9d76d94bf30ca7f
+MISC ChangeLog 2988 SHA256 ce4b2d120da1463122afb3c97c884ce0798777036168754c86eb9e38e0105cf1 SHA512 36136eb84ff49ae2ee0e59a717072c29383c3398ada35945c00acbcc2d4e54b1a2331c189cd0444561906db5f25a8ac9b36baedfa97d715649d1eecdbaed1de7 WHIRLPOOL 72b052f9f1a9660d8c9950d7d742ec6fd4e0f807c36063d13206cba08218e5142708aeaefad83e53bfe5b0f1a80d25178b8695145fc03cbd2398cb5e4d32df8d
+MISC ChangeLog-2015 1163 SHA256 ce7b3d5a7c31636f278d0e88033df7d1d57ba85ded17aac67259dc465a953c72 SHA512 711d436ec7ec6b7f492af0b467410cd1a8993d6881dce14c619094934855aeaa24fce477bd1400e604f66f0bcd34f64eae88f958b5c56d39a1d7a9bfaa069c16 WHIRLPOOL 94296438d5f248bdeb0ee4a908b3ecda6aea4082002ae1d7802ca28a205766eae1f127b0521f9b575a07efbc7d9cb782f6e192644ff645a9aa99e44d1477d375
+MISC metadata.xml 587 SHA256 16e283ff3bd54e0bfc109891231555af6e9c24ee0bc15fa8da30e228595b82ed SHA512 3d044de102f4c06604e6a53930b5232f97721fcd79f1ea3f14de5e4cee6497d6c4603cc3bcc45de5ac8f6358dc2a728002653b30d79af58a17ce627c22e58120 WHIRLPOOL a9d1157c0094730cd14a91919506f3c5e0141757c329c623290aa0ff83defcc1974ea1e47f04b29158d7f97a3c197800d39cdfa7b8811ec930f97e56a93d41ca
diff --git a/dev-python/pystache/metadata.xml b/dev-python/pystache/metadata.xml
new file mode 100644
index 000000000000..60c1f87f0988
--- /dev/null
+++ b/dev-python/pystache/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  Pystache is a Python implementation of Mustache.
+  Mustache is a framework-agnostic, logic-free
+  templating system for Ruby, inspired by ctemplate and etc.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">pystache</remote-id>
+    <remote-id type="github">defunkt/pystache</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pystache/pystache-0.5.4.ebuild b/dev-python/pystache/pystache-0.5.4.ebuild
new file mode 100644
index 000000000000..650c606c58ce
--- /dev/null
+++ b/dev-python/pystache/pystache-0.5.4.ebuild
@@ -0,0 +1,27 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Mustache for Python"
+HOMEPAGE="https://github.com/defunkt/pystache"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	nosetests --verbose || die
+}
diff --git a/dev-python/pystatgrab/Manifest b/dev-python/pystatgrab/Manifest
new file mode 100644
index 000000000000..3e7178318eba
--- /dev/null
+++ b/dev-python/pystatgrab/Manifest
@@ -0,0 +1,5 @@
+DIST pystatgrab-0.7.tar.gz 84472 SHA256 9e79919efdbeb45e28f26cb45d4f1a2861caa2937c5bf86be351c5c096b6550f SHA512 ce239941eebe5390a9154d19891ab45fc410515bb7313083450ffd30cfe23457a1d7e2d0ccab4434c844bb6f2cbfe6080ecfd66db7728720e703ce01ea219366 WHIRLPOOL 2e84b536473da52a70f6bf74dd02d1b88c6eb7f07e787590cb8b3b17a99c4a98c4474510e55bbba62b95c9254add693f7c1ffcb3bf8ff58bfe9e3871a137e976
+EBUILD pystatgrab-0.7.ebuild 693 SHA256 8b7df441a950bd84621b834d75961e1d3eb953729ad0836b39ecae479d94d1c9 SHA512 7f4917d27b76d704c41a79b05b55e1678aa09cf86e8ba62aca6b8ed49a79275eb0c8ec69573585f56f4397e38db8444ddb5988c8322b1f592493f5935af9b8fb WHIRLPOOL bec50fe77ca40e3a419b407ddab3ae49bed96e27937250a7b1d84b22382ee00f2898d8717d9c2ad0b7ecf159a7c9aa5960fa9b1db51a1ae684c9cb0551121a39
+MISC ChangeLog 2581 SHA256 76b666b26c84d75d5d658ee052bfbb8fec5751efe6cb8ff95958cad443ab43fd SHA512 1a048c47e53d5dad2af35b56211ee47900d1a920ed1dc533f216e4b1bbd7d7e6695f046af9d6bd406d2d9453ffe8ca114c5d30dcd544d5e144cc2a14fce76117 WHIRLPOOL 790325c99f994cb889d86b175f5687b54ec303590ddc111dbdf7873092dc315b31337054ff455bc985f5076d2255061e2a33b3a16409150f16e9f6b5ce8ad212
+MISC ChangeLog-2015 2245 SHA256 6969502fb8586c2c54a30dc2bc16c8f8ab9945cacf1e65df81cf8e00b21db563 SHA512 8fb3d1397b21e00fc4f634d0a83f55d32137df91a24b9d1200147b069ba440449a1df1c4b3040f42d1603f593d3323b7134e70f81070472376793ffe52020303 WHIRLPOOL e7668f4469d9dd2cf7c71bde7003cfcc63f4d6bf6f27770ab32b000bfc4d3b89f85805779a54a6481b7f80ae16b5f188ed5eb9e8c7f4bd18e361d50a0bc3362d
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/pystatgrab/metadata.xml b/dev-python/pystatgrab/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/pystatgrab/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pystatgrab/pystatgrab-0.7.ebuild b/dev-python/pystatgrab/pystatgrab-0.7.ebuild
new file mode 100644
index 000000000000..2779df05d2f1
--- /dev/null
+++ b/dev-python/pystatgrab/pystatgrab-0.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION=" pystatgrab is a set of Python bindings for the libstatgrab library"
+HOMEPAGE="http://www.i-scream.org/pystatgrab/"
+SRC_URI="http://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/pystatgrab/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=sys-libs/libstatgrab-0.91"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+python_prepare_all() {
+	append-flags -fno-strict-aliasing
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" test.py || die
+}
diff --git a/dev-python/pystdf/Manifest b/dev-python/pystdf/Manifest
new file mode 100644
index 000000000000..62aa1b13dc86
--- /dev/null
+++ b/dev-python/pystdf/Manifest
@@ -0,0 +1,5 @@
+DIST pystdf-1.3.1.tar.gz 19974 SHA256 f736601a280affe2570f0c162f0c8d9d63a8833f9f094a38f22f5a6681a53051 SHA512 134265a728f3fafab5a536d12bc53c017ec265bbf83b8980fb1a87d59a29c3e872b24d9121a3bb52f5feddacca8d01bcee070f9ac6fd366029129a327847515a WHIRLPOOL 93082640344b36ba5253ec1928c7a0e778723ec9f1140a519fd99bd2224cc75a75cfd35ca4e93d297453cf356a29e30b85f321667dd0c6af7e523f79d4bafb3b
+EBUILD pystdf-1.3.1-r1.ebuild 389 SHA256 186d753c8e272511b561d0f1640895603f5e2d900bb543871512500701fe7ce1 SHA512 986233674f1b6c2c06a8157db327fd98819b33c9a06c87c51d2ce422a8af771d96bca9e329e813978c0a74184fd47285f2bdb9d79b3d213b15a5594e87611ae2 WHIRLPOOL 150ec426ff9c779ba92ae6e01dfa097e0ab8cc7c87d57c6d772d017abebab77b4ecf3ebe479c282ec2ac463fc6abd158cf462abfc969fdb1af3caaf253ce748a
+MISC ChangeLog 2818 SHA256 0de2066975747042e24d13753672b9652f81490d33135365ce277dfccc81c7a7 SHA512 bccc55335e014f1292aefcc7eef0b1da93f742a41775e4ebfffcbff3ceb80cac34a89d2952d91c2d3dea73fc5e6670102d5c82d8c580c1448d46d5f3f4884896 WHIRLPOOL 4b38df8339798eabb048408c4a51dab7941fa11e0633f38204d50ffb4379988838101e948bf4776329cde1aa2cc4576d6bc64eb16b65260cb2bb9e9f0c8ed7ff
+MISC ChangeLog-2015 664 SHA256 c59542c30542bb0898fd1a5b1a5bd8be11bd3a676993b0936db8c1bffc57152b SHA512 4ccde8eb54a918378b48cc1d8f0281cc96c2c2ebe4575e83c12fd7540b996220983a0c70e44773e14510b6a2abddc1451189b78d9d2f886afec813b4f17bce94 WHIRLPOOL 90bebecf2749afe9d9eeee7eab6ea5d0982e018a7a934e2e6c0741380d235f197605a2967b1c93f73c7b157c74fed78668ddcf46dd695c4a18f4ac5720556bbf
+MISC metadata.xml 345 SHA256 2678993030971910b633714d7c373566f5d4d2c30d77c4ee367c73bfad91b87a SHA512 114a3715c7f42397e986eae386d89d8eeff403bf6a7590088cde3b4841362cdbea140aa9713b288e99918e110d91b069228382bc49d2178c8815c1868a90cea2 WHIRLPOOL ad2f275a238735267f38428e547435d85d195d5ae4aca3d62c40c33ad64cc798b74e40333215ff48d66dc246a420b7c1f3f9f4c7dbb2c0e2c1a8015212dfc698
diff --git a/dev-python/pystdf/metadata.xml b/dev-python/pystdf/metadata.xml
new file mode 100644
index 000000000000..4528f6d972af
--- /dev/null
+++ b/dev-python/pystdf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vapier@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">pystdf</remote-id>
+		<remote-id type="github">cmars/pystdf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pystdf/pystdf-1.3.1-r1.ebuild b/dev-python/pystdf/pystdf-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..9ddcd67e4204
--- /dev/null
+++ b/dev-python/pystdf/pystdf-1.3.1-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module that makes it easy to work with STDF"
+HOMEPAGE="https://github.com/cmars/pystdf"
+SRC_URI="https://pystdf.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/pysvg/Manifest b/dev-python/pysvg/Manifest
new file mode 100644
index 000000000000..cee0ed7b02ba
--- /dev/null
+++ b/dev-python/pysvg/Manifest
@@ -0,0 +1,5 @@
+DIST pysvg-0.2.2.zip 623804 SHA256 e7dd51244cd201279dba577704149e5195d4a69d6e6681bda1edb32fac24f2ed SHA512 f0e39903f4290a0615ca7531ccc242b27086b639b2940b53ae185ff354843e56b184c1d1dbf63f0df4f9f9700c4224e878810354a0f0c77bcbb9efd1b4ac2f17 WHIRLPOOL ade85b0853b1563359de47d048e74d0c3ba3ae7347b0d7dec41b0a187b051442afab9cd5675da0042d4266a7aba0620fc33c3bc988b1af9fc854266643c835dd
+EBUILD pysvg-0.2.2.ebuild 423 SHA256 a4268cb5eecedba00260e762815d05b37bd9aed6491bf70190d162ee69e371a7 SHA512 d95570639270e04a1eaa88432e8cd5579ec94192c97599db95702fe79a5bf32c2a5ae3056be9213b2f92922e87755ff8b280bdcf76c4a9155d0abb7f4846a1ce WHIRLPOOL 7401dcbae17306eb46f6136c2d9f5142bed8d2fb9d4876e2a367d3aef3c3a6f3cdba78ce1c3a93bc662c0fe7daee0c011d9f06e1af13e1f0444282ebde0ef001
+MISC ChangeLog 2941 SHA256 8b4cee1c1afbefa001eec124b05bc4e7024c8d855883b45224ec3d7d8ce2fd46 SHA512 e7bbeb054c58d4ce4f41ed42e0e2ebed7004346c59533c5ad45758eff7257f94a4afb22ae1fddcd58f59307c35a749b826fa0e5164f05a9850c34c11c8d498e7 WHIRLPOOL 0a9495ea52d4712bc396b21cc4b494bb55a7a0f905984435a246a4ed611520211ac78effc52af840a4552464b689d08fe3279cf31bdab5b4f056707232979a8f
+MISC ChangeLog-2015 1570 SHA256 a26d77b7d3cde732f0c100790008d82e93a4cf85e83785f070520b618bd72027 SHA512 2afabbecaf8fadbaec7e177e2930c85d630f017fb0e2f093df9657fa1a169c9dd512e537e9c8b4fd128aa7ec8b27594e3758a12c3b744f6f8b3a74c3b18001fa WHIRLPOOL f478324e6a7d8773547b30249d491f2b806b577bdf8a4679cb30fc2411627f50987098f92490e41e452f11d1ece58746c787cb163fb5c44d06c75fc7b707fea7
+MISC metadata.xml 308 SHA256 c445e59e79b9fd61267d557562896fec85d0cf6520059b652eefec6d2e556b6f SHA512 e00b4980b34a2dc446229a3fb4ca928540edac0eb7d338a00cf986dadbff135a0e9d3c1ad2af4a37717916cde9241b3350565ad029391ba0f30cb5c4059c36f1 WHIRLPOOL e698c43ab506e686ea9954a11a63332245b3f4b40f6b50ee8b02fca35aab25fc6ab27d2ce58f10974acb285b85de4d26d8984b90ef3ee9900295478533698a1c
diff --git a/dev-python/pysvg/metadata.xml b/dev-python/pysvg/metadata.xml
new file mode 100644
index 000000000000..a041c65e2054
--- /dev/null
+++ b/dev-python/pysvg/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pysvg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pysvg/pysvg-0.2.2.ebuild b/dev-python/pysvg/pysvg-0.2.2.ebuild
new file mode 100644
index 000000000000..921d35dec963
--- /dev/null
+++ b/dev-python/pysvg/pysvg-0.2.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python SVG document creation library"
+HOMEPAGE="http://codeboje.de/pysvg/
+	https://code.google.com/p/pysvg/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
new file mode 100644
index 000000000000..8396bfaa6a89
--- /dev/null
+++ b/dev-python/pysvn/Manifest
@@ -0,0 +1,6 @@
+AUX pysvn-1.8.0-respect_flags.patch 4633 SHA256 1d51873d71f69924e5f1365b9717f8014fa95181a7c0578a34a2a81ed0bacc26 SHA512 e573b995e45f7129b0e52e702ce1793180b7b2c3ef3ccebc8f1b16af9454beeca581f2486eae519437f41cd195c0dc6535c51e9dcef1258dffa57f5a99c4600b WHIRLPOOL 9d31a614d5ca65d6b39ef8f121099495212eabab91d2818a0de77fb8c743b93a9eff64e728e251e1cedad8b183c8ad2a074261f503145ff30af4585b2f0b43f3
+DIST pysvn-1.8.0.tar.gz 366583 SHA256 39596f4884ed689cdb5a4e210e421724302a566c7ba756cc4d46bbfeb0c8326b SHA512 14a70b910be986eba638a903edde5046c93314fedb08a7c15d464dc51da1c7efeb87147cc68c00ff9ac1b4ca506d099d3aedf7e4d86f92642c7304ef9540653b WHIRLPOOL 90a795f4d6a1c353321a116f5676741ce2121122de0426d045893e2688cc10bcd248ffef98da6d920daba70e2406ce136fed972e8172b7e648c6dd02f04e608d
+EBUILD pysvn-1.8.0.ebuild 1258 SHA256 5de01c2c980a8b87fbe5f4b046a38cc160b38f8a91fb0dfaba3b2c4fb89dd86b SHA512 4ba46661a8cd444db7464b620febb35858b14666cdefa591306e6ca9b73bc1690c411606839467f3787594d431ce5b384f2fbb088b3a01e64d9e73ea3c3792f9 WHIRLPOOL eb842ccf5d8560985b56f9fb94c40ed8959823fec9ea3c23e6c355996ce456d6ebb6acac85247a944cb0698c0399d2f5901bde72b66da7c707273d482d126b3f
+MISC ChangeLog 4283 SHA256 da4862063c48e37ba32f1e4d6bc790008a43134dab90342c8e88fd5a5435726e SHA512 c0dfa4d712d1298028627403f66cc9e138ec086911677863f22a98fdb5ef0b29561fa3baef7e4ef7f2955db718d34f8f7362434d262e56485f96b8c6edc2d97e WHIRLPOOL 9be36d088ad3c4cc189e05c9e680565a89056fe80b5afe2af44f4f0c379fc892ed82e86d61154ee7e2b2828e16affb0f8bb664b66381441ab0a390d586b4ac83
+MISC ChangeLog-2015 6734 SHA256 0b3d4f1ab4103a8b4bc8ac887bc7d6d9b9cc2336b7099695bf5f8d770daf8d5d SHA512 1e8904102927f29ab190a8117cf66f0535de5f8f78e294bf61efd79c077ecbfb01f3ae28901472624adf3cb0af95e095967f4df032eeb411a54f745868e81fd4 WHIRLPOOL 93819d4fa0aa298d79b163a7ead473b34ac57db1b6f3ec1e3cc571056014ea887c8bb1a3198b00411da6500e289de489d91808c3f2e955f9170d5a17eb4d59b3
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/pysvn/files/pysvn-1.8.0-respect_flags.patch b/dev-python/pysvn/files/pysvn-1.8.0-respect_flags.patch
new file mode 100644
index 000000000000..9b4c3a075e8f
--- /dev/null
+++ b/dev-python/pysvn/files/pysvn-1.8.0-respect_flags.patch
@@ -0,0 +1,99 @@
+ Source/setup_configure.py | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/Source/setup_configure.py b/Source/setup_configure.py
+index afeee2d..47f2717 100644
+--- a/Source/setup_configure.py
++++ b/Source/setup_configure.py
+@@ -849,8 +849,8 @@ class CompilerGCC(Compiler):
+     def __init__( self, setup ):
+         Compiler.__init__( self, setup )
+ 
+-        self._addVar( 'CCC',            'g++' )
+-        self._addVar( 'CC',             'gcc' )
++        self._addVar( 'CCC',            '$(CXX)' )
++        self._addVar( 'CC',             '$(CC)' )
+ 
+     def getPythonExtensionFileExt( self ):
+         return '.so'
+@@ -976,8 +976,8 @@ class MacOsxCompilerGCC(CompilerGCC):
+         else:
+             arch_options = ''
+ 
+-        self._addVar( 'CCC',            'g++ %s' % (arch_options,) )
+-        self._addVar( 'CC',             'gcc %s' % (arch_options,) )
++        self._addVar( 'CCC',            '$(CXX) %s' % (arch_options,) )
++        self._addVar( 'CC',             '$(CC) %s' % (arch_options,) )
+ 
+         self._find_paths_pycxx_dir = [
+                         '../Import/pycxx-%d.%d.%d' % pycxx_version,
+@@ -1032,11 +1032,11 @@ class MacOsxCompilerGCC(CompilerGCC):
+ 
+     def setupUtilities( self ):
+         self._addVar( 'CCCFLAGS',
+-                                        '-g  '
++                                        '$(CXXFLAGS) '
+                                         '-Wall -fPIC -fexceptions -frtti '
+                                         '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
+                                         '-D%(DEBUG)s' )
+-        self._addVar( 'LDEXE',          '%(CCC)s -g' )
++        self._addVar( 'LDEXE',          '$(CXX) $(LDFLAGS)' )
+ 
+     def setupPySvn( self ):
+         self._pysvnModuleSetup()
+@@ -1048,7 +1048,7 @@ class MacOsxCompilerGCC(CompilerGCC):
+         self._addVar( 'PYTHON_INC',         distutils.sysconfig.get_python_inc() )
+ 
+         py_cflags_list = [
+-                    '-g',
++                    '$(CXXFLAGS) ',
+                     '-Wall -fPIC -fexceptions -frtti',
+                     '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s',
+                     '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s',
+@@ -1074,13 +1074,12 @@ class MacOsxCompilerGCC(CompilerGCC):
+ 
+         self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) )
+         self._addVar( 'LDLIBS', ' '.join( py_ld_libs ) )
+-        self._addVar( 'LDSHARED',       '%(CCC)s -bundle -g '
++        self._addVar( 'LDSHARED',       '$(CXX) $(LDFLAGS) -bundle '
+                                         '-framework System '
+                                         '%(PYTHON_FRAMEWORK)s '
+                                         '-framework CoreFoundation '
+                                         '-framework Kerberos '
+-                                        '-framework Security '
+-                                        '%(LDLIBS)s' )
++                                        '-framework Security' )
+ 
+ class UnixCompilerGCC(CompilerGCC):
+     def __init__( self, setup ):
+@@ -1140,11 +1139,11 @@ class UnixCompilerGCC(CompilerGCC):
+ 
+     def setupUtilities( self ):
+         self._addVar( 'CCCFLAGS',
+-                                        '-g  '
++                                        '$(CXXFLAGS) '
+                                         '-Wall -fPIC -fexceptions -frtti '
+                                         '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
+                                         '-D%(DEBUG)s' )
+-        self._addVar( 'LDEXE',          '%(CCC)s -g' )
++        self._addVar( 'LDEXE',          '$(CXX) $(LDFLAGS)' )
+ 
+     def setupPySvn( self ):
+         self._pysvnModuleSetup()
+@@ -1155,6 +1154,7 @@ class UnixCompilerGCC(CompilerGCC):
+         self._addVar( 'PYTHON_ARCH_SPECIFIC_INC',     distutils.sysconfig.get_python_inc( True ) )
+ 
+         py_cflags_list = [
++                    '$(CXXFLAGS)',
+                     '-Wall -fPIC -fexceptions -frtti',
+                     '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s',
+                     '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s',
+@@ -1176,7 +1176,7 @@ class UnixCompilerGCC(CompilerGCC):
+ 
+         self._addVar( 'CCCFLAGS',   ' '.join( py_cflags_list ) )
+         self._addVar( 'LDLIBS',     ' '.join( self._getLdLibs() ) )
+-        self._addVar( 'LDSHARED',   '%(CCC)s -shared -g' )
++        self._addVar( 'LDSHARED',   '$(CXX) $(LDFLAGS) -shared' )
+ 
+ #--------------------------------------------------------------------------------
+ class LinuxCompilerGCC(UnixCompilerGCC):
diff --git a/dev-python/pysvn/metadata.xml b/dev-python/pysvn/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/pysvn/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pysvn/pysvn-1.8.0.ebuild b/dev-python/pysvn/pysvn-1.8.0.ebuild
new file mode 100644
index 000000000000..76f70b6b2510
--- /dev/null
+++ b/dev-python/pysvn/pysvn-1.8.0.ebuild
@@ -0,0 +1,59 @@
+# 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 eutils distutils-r1 toolchain-funcs
+
+DESCRIPTION="Object-oriented python bindings for subversion"
+HOMEPAGE="http://pysvn.tigris.org/"
+SRC_URI="http://pysvn.barrys-emacs.org/source_kits/${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="doc examples"
+
+DEPEND="
+	>=dev-python/pycxx-6.2.6[${PYTHON_USEDEP}]
+	dev-vcs/subversion"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-respect_flags.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=true
+
+python_prepare_all() {
+	# Don't use internal copy of dev-python/pycxx.
+	rm -r Import || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	cd Source || die
+	# all config options from 1.7.6 are all already set
+	esetup.py configure
+}
+
+python_compile() {
+	cd Source || die
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+python_test() {
+	cd Tests || die
+	emake
+}
+
+python_install() {
+	cd Source || die
+	python_domodule pysvn
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( Docs/. )
+	use examples && local EXAMPLES=( Examples/Client/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyswisseph/Manifest b/dev-python/pyswisseph/Manifest
new file mode 100644
index 000000000000..eb3f5921442b
--- /dev/null
+++ b/dev-python/pyswisseph/Manifest
@@ -0,0 +1,6 @@
+DIST pyswisseph-2.00.00-2.tar.bz2 458443 SHA256 7b47f54a61ac17863a4d9e75269e53e09ad525780ac731eed6923415caa725cc SHA512 009542d370248989489e4d2a557b5f5cac27923bc06b9a9088b282f3f9cc8b31bfc43bba9cff3a44f8a77e20356b8a9ced60ec200b26815780af5588efbc9e4b WHIRLPOOL 0521769bed1311fe2c59d14f0a100873b06207ab59bf33cd8a54471958690b12b19ca57f3a7d99829f356c2193a5df1562b976ae2726c11e1800bd35aaf7b5c4
+DIST pyswisseph-2.05.01_pre20160529.tar.gz 488382 SHA256 6c6d72a291665bde94cada8d38b7536119a00906d12887a91b9992526eaa802d SHA512 afec6ce93a34ee116ed5247ff0004cf7c3adce33b4e0f95aa251b6b533a8925340d6f6d847ab80dfb2cf75933939d282455e7dc1f812c28ad45a42f21ce1e611 WHIRLPOOL 73b1b3cce401fb9875d3ca0922df842dcbd89132a1d3429255b8ae77f57252cd5175115640f9315c2e7b36d62682a4651ce826eb325883223bbc599f84c3e38a
+EBUILD pyswisseph-2.00.00_p2.ebuild 646 SHA256 9bc7a30fc1b1cc379d5ab0a422c59e8e3bb1fa9e57b81acbd110ad45685bd0e0 SHA512 7f0cd349401692f044d4a7829627d848f6c90dc9ae2c4b45ad6686ea4a1386d7248d53e97d0c7df1d8503586841d4ed646cf4100657a51dc42e60ce1da75b083 WHIRLPOOL f75d3cabfa4763df641c403011f5e2cf6db695572c0d7bd75d1765cc9a533fc00e9d61630a88d4e0b48ac9fc7f950901befe48f02e86242359dda2af779ca41b
+EBUILD pyswisseph-2.05.01_pre20160529.ebuild 665 SHA256 116c17528d715d0151166be75fc66b6a79d9d1494745341a0e417f1bff34aefb SHA512 0a321a8ea2b497e29a062454511997a8da8c6862c280641cf830e49c8f15b6a7ff07a63c38267557e8899e98ead0222d2e072eca5e261ecc887ca8bf6149bbfe WHIRLPOOL 18120ac9fcede5789fafac3017812fe1d063e924ba7421af14d859747a63ad549c6fbdd5a3dee53953c94e1b33430e0db1ea565c1d370141c96fa7f92031473d
+MISC ChangeLog 707 SHA256 ad906a5cbbf436c5262236a310da968c6df9ea5498244ef3fb54d652ab223fbb SHA512 920e57d3d619b0d639f841b6d3a4296d983834d173465f6f431832ccf57360179327623eef6465c7811e77788e591b4bc0e3b97d3b36ce78876f350e626f9248 WHIRLPOOL 69644dee58efe380e8b1425b893c04bb019d2497d5aa5f2abffdb225023e5cd503b830ef566b7c50240305a665d25c2d102ede7d161035e78287d132f536d1b3
+MISC metadata.xml 717 SHA256 dfaef2d50e4620179ceb32730bab85e6d12d31ae0f768dd73fba33464cf0ac78 SHA512 c31a27eea034fa020f648be049b11bbfc86eac7ee83d68db0aa4c0090e7c2200f70f116d6d6691eec48170207fdc0fdef467ad03c0470e21a5097fccf9b5cf27 WHIRLPOOL 4cc41fec3d752da2067dbd44c77ed8755553faed9680709454531f981582e26b83132945bb8e1f5808831d26070a8ae04f6d03f84f3ec260c767b1f73affff44
diff --git a/dev-python/pyswisseph/metadata.xml b/dev-python/pyswisseph/metadata.xml
new file mode 100644
index 000000000000..9ce5a0d1ce7b
--- /dev/null
+++ b/dev-python/pyswisseph/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="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>lluixhi@gmail.com</email>
+    <name>Aric Belsito</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/astrorigin/pyswisseph/issues</bugs-to>
+    <maintainer status="active">
+      <email>smarquis@astrorigin.ch</email>
+      <name>Stanislas Marquis</name>
+    </maintainer>
+    <remote-id type="github">astrorigin/pyswisseph</remote-id>
+    <remote-id type="pypi">pyswisseph</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyswisseph/pyswisseph-2.00.00_p2.ebuild b/dev-python/pyswisseph/pyswisseph-2.00.00_p2.ebuild
new file mode 100644
index 000000000000..0f594661e4af
--- /dev/null
+++ b/dev-python/pyswisseph/pyswisseph-2.00.00_p2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV}-${PLEVEL}
+
+DESCRIPTION="Python extension to the AstroDienst Swiss Ephemeris"
+HOMEPAGE="https://github.com/astrorigin/pyswisseph"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/astrorigin/pyswisseph.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/pyswisseph/pyswisseph-2.05.01_pre20160529.ebuild b/dev-python/pyswisseph/pyswisseph-2.05.01_pre20160529.ebuild
new file mode 100644
index 000000000000..8e263a47436b
--- /dev/null
+++ b/dev-python/pyswisseph/pyswisseph-2.05.01_pre20160529.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python extension to the AstroDienst Swiss Ephemeris"
+HOMEPAGE="https://github.com/astrorigin/pyswisseph"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/astrorigin/${PN}.git"
+else
+	COMMIT_ID=4f76befee7e39dff96b4c068cc6ce5fa66fb021c
+	SRC_URI="https://github.com/astrorigin/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${COMMIT_ID}"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest
new file mode 100644
index 000000000000..3de284b85b74
--- /dev/null
+++ b/dev-python/pytables/Manifest
@@ -0,0 +1,12 @@
+AUX pytables-3.1.1-blosc.patch 418 SHA256 b91909a1e9f2e91b62e24e2afa3d7d686212f39747aa3f84b0cef623a92a75d7 SHA512 fa60a3a5c60faa07b64fa5f0241e8d81a4c86287b86808cd39a5a861f5de91d6c83da7d774c25643e2591e8a04731f10c6b188a6854a9bf4c0bea7a94d51ac35 WHIRLPOOL 2bb4c45564cf91595cc8c8cb8ef131af9d01323dea147b21bb06099a5c197d4532e9928b55d78e20355795f35db67383859dfadb316f510f9645641a8fa601a6
+AUX pytables-3.1.1-cython-backport.patch 2472 SHA256 3c7441ef6cbe36e5cc4e4947af832a9d591db027819b4f2745e932d58bd70511 SHA512 c8f235ab3765410e4c0e488e30e00050d6bbc0f8b6874d4e794fc5edf69ad1877c4290a35c111d44a5626c567bc4fff35213ee6b3005a6bb25d5879489c49a63 WHIRLPOOL 1d5f9eb91af30a1b5e09eb023d3869b37bf983b5a8e1e499559da75a5af55f0ae166f92df4d4966365d1510ad67edd5e6b06a8454ae75d41cad405c7d679696d
+AUX pytables-3.1.1-numpy19-backport.patch 1636 SHA256 9b18bf3ceae99ec4dada2842cb4fc31cfa3dc345103315a6aba233bb8fbe3e36 SHA512 6553229186b6007b67f79c63cf4bcb168f7fe77c62478fcfa29bb27402decb30ec36a2df4f0794bab19d7fb7d77dcd5072caaa88ae2a7aa4025608f610efde75 WHIRLPOOL 73dd5745049571cf4c515feda70f1602fbe6d98b658bc6b6eca030a165be0d3bbd89ca3cb8a8789e8ca0c603b8ff6c8f9a45f75a8c18e70c30e3961ad54f267b
+DIST tables-3.1.1.tar.gz 6715786 SHA256 39b9036376f1185599771c19276f13b5b9119d98f9108f58595745ded3fe2da3 SHA512 b5b2052dd81c4748c5e26c1f61f9f92891f48335b0a553f7602ab11c9029dd673d27b91e24cac0da21a81df0c26dbcd9a438214fa58af1ae831c5f04dfa212a6 WHIRLPOOL 86fd6dc9e12503fdbd23013b75f33a41eadbbac0e6dd5ac9a91476d073195077fc6b3d5ad24b1dd4b4c18ae7ed8abc8ea1708262e52240f4c2c3b1153f8c9e91
+DIST tables-3.3.0.tar.gz 7004337 SHA256 8383ccf02e041a5d55494a09fc5514140b4653055a2732c981b5fd0f7408822c SHA512 e19445f0f5f2530d49ce55f258931babb7b05df2366637ddbc306323a1f75b7f7dcf91d70a8cc1f41b182d4cdd9c83872873168592bdcce7bd5acae9f3274f36 WHIRLPOOL f270f741d6886775cc730fbcb79de215fbbe2d9b7b2b6efc6b5b3fa7d141046e7c69daad140ad7cc533b439bfae801ea0e1567939dc4258e5c3b6a88f27cd86c
+DIST tables-3.4.2.tar.gz 7593471 SHA256 fdbbea4edb6bad0ac0e53fc7bc6970e78e12eef4944aa4146bcdcb573201676c SHA512 8c3bb9113e5082f8b44866b04728a04dae37fbd576c3259309fc305fd4cc0c4f74925557e74f6bd1bd1fc5150d8091648139c4c702e5ed9f53e0ace11c2ac58b WHIRLPOOL 392e117a3ad372ee91a02ee66994f3c03e67b4ae7473f5761e13215ce33084fc3ac8e9e371ca9b59f374066523bcd3ebbced01c49faaa84d4af75a26811ee35f
+EBUILD pytables-3.1.1-r2.ebuild 1609 SHA256 1eeae5da5abad2c87b5dc92e7d7154595297871ca99bdc32dc55187b0ead9c43 SHA512 a0cd26ad7a2191ffe573ec9cd6e327264d2d61690eace3955efc90a244f3f7bf594a987a5c34a9aa8d5a5bf2cddde111004613e917100a01a308440a3c18f702 WHIRLPOOL 428bcfd4932acea979832a8c77868933bebe42943dd4d6104cb9954fdf1df0cf743e52da09fdd46cba7021c9c6c3661bd46a2cce2621cac3ab99e8b2782ba01d
+EBUILD pytables-3.3.0.ebuild 1576 SHA256 4e9576f26e16efd96269f4931d2044f4162998ec38cfbdfc43a86ad593caf76a SHA512 245b0b83df781420beb759ffcd1e66106739e4a56fdc524f1f9ddb0a65c5c91442b17775e123ec474f55a5ad7d6b26993dc4453c2afb8522507f0ec2f66997f6 WHIRLPOOL 408217e74ab64bc82d7da83ad3fd73e3a2aa6f9b5e32f9e9766a324b384c65a13bc6d6265488065c0a0e7672c2419ea91e4b8e600eddf166b48b18cf4fd39f8c
+EBUILD pytables-3.4.2.ebuild 1645 SHA256 e0224efd367f141c2c5f5a766d7b35dac6748689eb14e8f82f5f3e12503dfda7 SHA512 c6d226ba1c1233e6ab02268109fdb363d43e23df114dc9fec407770fd01026f5964c16f29d5e024ec3de371c32af8622f30d460eade6b7e47ffd033f809ea545 WHIRLPOOL f8841e7c8419d27805f12e12ffafe634f7a6ef947bf81710386669a686ba78f428415af194e1279150ad8811ed16bd921335249fee597316032abf6b3c54a8b7
+MISC ChangeLog 4621 SHA256 8137f3d983910823bb53c274beb325b89833e5b90ed02f9b408bd0fe0d0645cb SHA512 13e3a3a86747cfc579867e0adb1bba83d5b03eb708888533559c1c5f33907982a669f582300d07327fae4a909568e2f8875c3f9cca1dec455df7a34f70727889 WHIRLPOOL 256fdfcbdd1837fe8722e4b6b3b5905c3115f36cb25c0e3da6caac79d1f8abbc219ef5f9d6f180362f3afb27b1c2d086430930d9004aa0fbe5b29d92d0aa933b
+MISC ChangeLog-2015 9449 SHA256 68b24a91f265bd48bf296dfe39ec3ce1039decdc2eddb3cfabd02c67afa80819 SHA512 a12596b2df744a8f0d6f7bbd61bfaad8c5f30add4cde27f39d5207a07c1a0ab0cfc6ba9e2b6925ce043f71175c7b7d9d8baf4af547ae2dc8dd791745ebb958f1 WHIRLPOOL c9f2b581bbc177eeb4292f8f65445cfe81fa09a9bfc26dc092e92e06563a8cddc3fb8852f3005d330b18a4d6af38bb1c8c96d30794ac143649d42db5e54c5177
+MISC metadata.xml 894 SHA256 82374f549ee5cdeaa036501a1c952c5e0286a388d2f3ddbf3cff728e036ab6f1 SHA512 88dd752e6014f6f133b5df7db6c2aafce0b9da8cdbc057493916dbfbe1da4bf52e0ed43d570d68035fc8f12302794a381a54f5b07b9726b52601724163bc672c WHIRLPOOL 473a4697f2acaa2421863bb928b724ab6e70b6558c3479eda4d12e903eb78f7c97ad113d5883e070ccf7bdb331b67965969d116f76441b715cbb7dab5136b573
diff --git a/dev-python/pytables/files/pytables-3.1.1-blosc.patch b/dev-python/pytables/files/pytables-3.1.1-blosc.patch
new file mode 100644
index 000000000000..3a4ba18e5e73
--- /dev/null
+++ b/dev-python/pytables/files/pytables-3.1.1-blosc.patch
@@ -0,0 +1,16 @@
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 2c0c126..1448eb1 100755
+--- a/setup.py
++++ b/setup.py
+@@ -768,7 +768,7 @@ if 'BLOSC' not in optional_libs:
+             print("Setting compiler flag '-msse2'")
+             CFLAGS.append("-msse2")
+ else:
+-    ADDLIBS += ['blosc']
++    ADDLIBS += ['blosc', 'blosc_filter']
+ 
+ 
+ utilsExtension_libs = LIBS + ADDLIBS
diff --git a/dev-python/pytables/files/pytables-3.1.1-cython-backport.patch b/dev-python/pytables/files/pytables-3.1.1-cython-backport.patch
new file mode 100644
index 000000000000..7db41d2e1a62
--- /dev/null
+++ b/dev-python/pytables/files/pytables-3.1.1-cython-backport.patch
@@ -0,0 +1,65 @@
+ setup.py               | 13 +++++++------
+ tables/req_versions.py |  2 +-
+ 2 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 0f2f3f7..52cda49 100755
+--- a/setup.py
++++ b/setup.py
+@@ -25,6 +25,7 @@ from distutils.core import Extension
+ from distutils.dep_util import newer
+ from distutils.util import convert_path
+ from distutils.ccompiler import new_compiler
++from distutils.version import LooseVersion
+ 
+ cmdclass = {}
+ setuptools_kwargs = {}
+@@ -106,7 +107,7 @@ def check_import(pkgname, pkgver):
+             "You need %(pkgname)s %(pkgver)s or greater to run PyTables!"
+             % {'pkgname': pkgname, 'pkgver': pkgver})
+     else:
+-        if mod.__version__ < pkgver:
++        if mod.__version__ < LooseVersion(pkgver):
+             exit_with_error(
+                 "You need %(pkgname)s %(pkgver)s or greater to run PyTables!"
+                 % {'pkgname': pkgname, 'pkgver': pkgver})
+@@ -122,21 +123,21 @@ if not has_setuptools:
+ 
+ # Check if Cython is installed or not (requisite)
+ try:
++    from Cython import __version__ as cython_version
+     from Cython.Distutils import build_ext
+-    from Cython.Compiler.Main import Version
+     cmdclass['build_ext'] = build_ext
+ except ImportError:
+     exit_with_error(
+         "You need %(pkgname)s %(pkgver)s or greater to compile PyTables!"
+         % {'pkgname': 'Cython', 'pkgver': min_cython_version})
+ 
+-if Version.version < min_cython_version:
++if LooseVersion(cython_version) < min_cython_version:
+     exit_with_error(
+-        "At least Cython %s is needed so as to generate extensions!"
+-        % (min_cython_version))
++        "You need %(pkgname)s %(pkgver)s or greater to run PyTables!"
++        % {'pkgname': 'Cython', 'pkgver': min_cython_version})
+ else:
+     print("* Found %(pkgname)s %(pkgver)s package installed."
+-          % {'pkgname': 'Cython', 'pkgver': Version.version})
++          % {'pkgname': 'Cython', 'pkgver': cython_version})
+ 
+ VERSION = open('VERSION').read().strip()
+ 
+diff --git a/tables/req_versions.py b/tables/req_versions.py
+index 2c9ca01..bd498c3 100644
+--- a/tables/req_versions.py
++++ b/tables/req_versions.py
+@@ -17,7 +17,7 @@
+ # Minimum recommended versions for mandatory packages
+ min_numpy_version = '1.4.1'
+ min_numexpr_version = '2.0.0'
+-min_cython_version = '0.13'
++min_cython_version = '0.14'
+ 
+ # The THG team has decided to fix an API inconsistency in the definition
+ # of the H5Z_class_t structure in version 1.8.3
diff --git a/dev-python/pytables/files/pytables-3.1.1-numpy19-backport.patch b/dev-python/pytables/files/pytables-3.1.1-numpy19-backport.patch
new file mode 100644
index 000000000000..c2f0c2280f01
--- /dev/null
+++ b/dev-python/pytables/files/pytables-3.1.1-numpy19-backport.patch
@@ -0,0 +1,51 @@
+From 854d5798ca9fd78c00e18710de2e93202f675f3e Mon Sep 17 00:00:00 2001
+From: Antonio Valentino <antonio.valentino@tiscali.it>
+Date: Sun, 6 Jul 2014 21:21:39 +0200
+Subject: [PATCH] Fix a compatibility problem with numpy 1.9 (close: #362)
+
+---
+ RELEASE_NOTES.txt | 6 ++++++
+ tables/table.py   | 6 +++++-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
+index f219eb3..1da20e2 100644
+--- a/RELEASE_NOTES.txt
++++ b/RELEASE_NOTES.txt
+@@ -19,6 +19,12 @@ Improvements
+   requiring strict access alignment.
+ 
+ 
++Bugs fixed
++----------
++
++- Fixed compatibitily problems with numpy 1.9 (closes :issue:`362`)
++
++
+ Changes from 3.1.0 to 3.1.1
+ ===========================
+ 
+diff --git a/tables/table.py b/tables/table.py
+index 235f599..ffe8fd6 100644
+--- a/tables/table.py
++++ b/tables/table.py
+@@ -3406,6 +3406,10 @@ def _getindex(self):
+                      associated with this column (None if the column is not
+                      indexed).""")
+ 
++    @lazyattr
++    def _itemtype(self):
++        return self.descr._v_dtypes[self.name]
++
+     def _getshape(self):
+         return (self.table.nrows,) + self.descr._v_dtypes[self.name].shape
+ 
+@@ -3529,7 +3533,7 @@ def __iter__(self):
+         table = self.table
+         itemsize = self.dtype.itemsize
+         nrowsinbuf = table._v_file.params['IO_BUFFER_SIZE'] // itemsize
+-        buf = numpy.empty((nrowsinbuf, ), self.dtype)
++        buf = numpy.empty((nrowsinbuf, ), self._itemtype)
+         max_row = len(self)
+         for start_row in xrange(0, len(self), nrowsinbuf):
+             end_row = min(start_row + nrowsinbuf, max_row)
diff --git a/dev-python/pytables/metadata.xml b/dev-python/pytables/metadata.xml
new file mode 100644
index 000000000000..7eafceceedf5
--- /dev/null
+++ b/dev-python/pytables/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  PyTables is a hierarchical database package designed to efficently
+  manage very large amounts of data. PyTables is built on top of the
+  HDF5 library and the NumPy package. It features an object-oriented
+  interface that, combined with natural naming and C-code generated
+  from Pyrex sources, makes it a fast, yet extremely easy to use tool
+  for interactively save and retrieve large amounts of data.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">tables</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytables/pytables-3.1.1-r2.ebuild b/dev-python/pytables/pytables-3.1.1-r2.ebuild
new file mode 100644
index 000000000000..f22a4f0c61e9
--- /dev/null
+++ b/dev-python/pytables/pytables-3.1.1-r2.ebuild
@@ -0,0 +1,75 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+MY_PN=tables
+MY_P=${MY_PN}-${PV}
+
+inherit distutils-r1
+
+DESCRIPTION="Hierarchical datasets for Python"
+HOMEPAGE="http://www.pytables.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD"
+IUSE="doc examples"
+
+RDEPEND="
+	app-arch/bzip2:0=
+	dev-libs/c-blosc:0=[hdf5]
+	dev-libs/lzo:2=
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/numexpr[${PYTHON_USEDEP}]
+	sci-libs/hdf5:0="
+DEPEND="${RDEPEND}
+	>=dev-python/cython-0.14[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( ANNOUNCE.txt RELEASE_NOTES.txt THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cython-backport.patch
+	"${FILESDIR}"/${P}-numpy19-backport.patch
+	"${FILESDIR}"/${P}-blosc.patch
+	)
+
+python_prepare_all() {
+	export HDF5_DIR="${EPREFIX}"/usr
+	sed \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		-e 's:"c-blosc/hdf5/blosc_filter.c"::g' \
+		-i setup.py || die
+	rm -r c-blosc/{blosc,hdf5,internal-complibs} || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	${EPYTHON} tables/tests/test_all.py || die
+}
+
+python_install_all() {
+	if use doc; then
+		HTML_DOCS=( doc/html/. )
+		DOCS+=( doc/scripts )
+	fi
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+		doins -r contrib
+	fi
+}
diff --git a/dev-python/pytables/pytables-3.3.0.ebuild b/dev-python/pytables/pytables-3.3.0.ebuild
new file mode 100644
index 000000000000..cb23edbefc05
--- /dev/null
+++ b/dev-python/pytables/pytables-3.3.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+MY_PN=tables
+MY_P=${MY_PN}-${PV}
+
+inherit distutils-r1
+
+DESCRIPTION="Hierarchical datasets for Python"
+HOMEPAGE="http://www.pytables.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD"
+IUSE="doc examples"
+
+RDEPEND="
+	app-arch/bzip2:0=
+	app-arch/lz4:0=
+	>=app-arch/zstd-1.0.0
+	>=dev-libs/c-blosc-1.11.1:0=
+	dev-libs/lzo:2=
+	>=dev-python/numpy-1.8.1[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.5.2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-libs/hdf5-1.8.15:0=
+	<sci-libs/hdf5-1.10
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/cython-0.21[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( ANNOUNCE.txt RELEASE_NOTES.txt THANKS )
+
+python_prepare_all() {
+	export HDF5_DIR="${EPREFIX}"/usr
+	rm tables/*.c || die
+	sed \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		-i setup.py || die
+	rm -r c-blosc/{blosc,internal-complibs} || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	${EPYTHON} tables/tests/test_all.py || die
+}
+
+python_install_all() {
+	if use doc; then
+		HTML_DOCS=( doc/html/. )
+		DOCS+=( doc/scripts )
+	fi
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+		doins -r contrib
+	fi
+}
diff --git a/dev-python/pytables/pytables-3.4.2.ebuild b/dev-python/pytables/pytables-3.4.2.ebuild
new file mode 100644
index 000000000000..02d1be95e967
--- /dev/null
+++ b/dev-python/pytables/pytables-3.4.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+MY_PN=tables
+MY_P=${MY_PN}-${PV}
+
+inherit distutils-r1
+
+DESCRIPTION="Hierarchical datasets for Python"
+HOMEPAGE="http://www.pytables.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD"
+IUSE="doc examples"
+
+RDEPEND="
+	app-arch/bzip2:0=
+	app-arch/lz4:0=
+	>=app-arch/zstd-1.0.0
+	>=dev-libs/c-blosc-1.11.1:0=
+	dev-libs/lzo:2=
+	>=dev-python/numpy-1.8.1[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.5.2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-libs/hdf5-1.8.15:0=
+"
+DEPEND="${RDEPEND}
+	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( ANNOUNCE.txt RELEASE_NOTES.txt THANKS )
+
+python_prepare_all() {
+	export HDF5_DIR="${EPREFIX}"/usr
+	rm tables/*.c || die
+	sed -e "s:/usr:${EPREFIX}/usr:g" \
+		-i setup.py || die
+	rm -r c-blosc/{blosc,internal-complibs} || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	${EPYTHON} tables/tests/test_all.py || die
+}
+
+python_install_all() {
+	if use doc; then
+		HTML_DOCS=( doc/html/. )
+		DOCS+=( doc/scripts )
+	fi
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+		doins -r contrib
+		docompress -x /usr/share/doc/${PF}/examples
+		docompress -x /usr/share/doc/${PF}/contrib
+
+	fi
+}
diff --git a/dev-python/pyte/Manifest b/dev-python/pyte/Manifest
new file mode 100644
index 000000000000..5bb490c039cb
--- /dev/null
+++ b/dev-python/pyte/Manifest
@@ -0,0 +1,6 @@
+DIST pyte-0.5.2.tar.gz 42719 SHA256 d734cf4021035df222a51853e1b40e27dc06e1f5ed547cfefff4ae4865ee7529 SHA512 da903b31bb67e60bc8271c162f3429871d0def039cec5f63f07764fce1994236063876eb069a88783a4c7d8b0eac0646549c00f2a51ab8630287d852f05f4b0d WHIRLPOOL 0707f6a905b46d6e89abff343dd0cb5cb81a096b2b6726a87780beba89a13b12cd554383902025975a8d3d2c2344fdc902912eae33fa0fc77d976fd7e3df0019
+EBUILD pyte-0.5.2-r1.ebuild 761 SHA256 128419366a11aabeb558f7836794b37158842d55462942712bccc58544243634 SHA512 b19d397c57d45acf04f992915f4a5e665987e245ebb49121fdd41ffda3f7726f680aacc56bf74352633bbc6038d6f2609eac4006ca5ebedb6ed0d21af2754832 WHIRLPOOL 42998afc05ff8b7f6d8d37c66d6826395e605563807eb64a0003b4eec3ee6ae33cdc25aa5eba2fec0fa34c38f9156caef26d3254512a3d662745bc5ad221b77d
+EBUILD pyte-0.5.2-r2.ebuild 765 SHA256 01c6946e3fa70a649ce4668e9f47c08b8d1aa08eb0bac7acaa6af09a8ca28433 SHA512 81182edab5649c72d80f3b0ee07eee0d0a6d0ee9f6893945a4dbdc67886a7b184660ec8e19bb8125925d2de5b559e7a4f179cff009b6b535aa00d610802ef327 WHIRLPOOL e25b3df548ab77e65fd05d18e1478da60dc3e154ebc12fd05b76b2d873790c8daa6f79782289f234a7d25a87622bbccc5db9e562de5643f7a4e99675e7c8de67
+MISC ChangeLog 3453 SHA256 16f64a25b2d3d4b7bf0b9e63738bad034a05cdb6a2fdff73f5a5fed479247c6b SHA512 0abb34ea07a6bfdfa98fd5228c1cf97c7ba6218cd3a94ea95f63a9ddcde9b70929cde807378143ab33d56fbe97fab297e0df113720a9b1d986108aec071f1476 WHIRLPOOL 833d1375d3f7c30d1abc6110d641bd7507db63994b1fee4edf8f77cf934362ff50c1d3eeebeeecb50c071bf738221b487ba8c75ba3cd848f6cea31e047bbfa8f
+MISC ChangeLog-2015 546 SHA256 fc3ab8bdd16fa6f536d09b86ea411f1c07846cec04f8b921c1dc02207b6d980f SHA512 2d8c7d09328d5d35733b5980343a9f142bce101ef6e04a469f47cb181ffda8ad4b57a15d391cf7c88b75fc6428ed1d97c4324c18c68f5e1ba186705eb125c99a WHIRLPOOL 2fc65223af17d2125ac49b19484ee9174fc9fb2a796c8bea2dcce4b25dfe63974dbdaf41b646b88118cf9206634f4360128cf34a7ad101bf41c04dbf0bb69fa9
+MISC metadata.xml 372 SHA256 005b9f657914a469bb748b6d68d5fa03128b364d52ba5feca298025392ab5e09 SHA512 6ba189a1a43ff10537319bfdebf23046437a86dec5c6bb219e97076120b31e20aba0e4cdb8abe932c378d17c766ae2ae7a65d9538cf3926cb106bd20206901bc WHIRLPOOL 056ac0104c7b055ef7275f1f3bf2c5b9dd37848a58ab20894bda9a324c3ca776aef19b1b439709958a74dc1bcbe231fc35b6e8f406a5238c1c4567df308d4ef2
diff --git a/dev-python/pyte/metadata.xml b/dev-python/pyte/metadata.xml
new file mode 100644
index 000000000000..0d081bed8ca8
--- /dev/null
+++ b/dev-python/pyte/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pyte</remote-id>
+    <remote-id type="github">selectel/pyte</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyte/pyte-0.5.2-r1.ebuild b/dev-python/pyte/pyte-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..38f19dd8f600
--- /dev/null
+++ b/dev-python/pyte/pyte-0.5.2-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple VTXXX-compatible terminal emulator"
+HOMEPAGE="https://pypi.python.org/pypi/pyte/ https://github.com/selectel/pyte"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-3"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/pytest-runner[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test --verbose
+}
diff --git a/dev-python/pyte/pyte-0.5.2-r2.ebuild b/dev-python/pyte/pyte-0.5.2-r2.ebuild
new file mode 100644
index 000000000000..999ffe7479b7
--- /dev/null
+++ b/dev-python/pyte/pyte-0.5.2-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple VTXXX-compatible terminal emulator"
+HOMEPAGE="https://pypi.python.org/pypi/pyte/ https://github.com/selectel/pyte"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/pytest-runner[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test --verbose
+}
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
new file mode 100644
index 000000000000..c6011676efc2
--- /dev/null
+++ b/dev-python/pytest-aiohttp/Manifest
@@ -0,0 +1,4 @@
+DIST pytest-aiohttp-0.1.3.tar.gz 6192 SHA256 c2391c424b5342f9234f5f56f15183d167050b50c08c96258c1816cdb5a0283f SHA512 2271f7730b91812a619e04522c13b7e2ff76353179a4588226d0b943b67f7397b966c1d3c24016861cc3eda3a541b3f0d3b2858a6ca3586f7707e10581c34e4c WHIRLPOOL 8bf1608b655db5cc3a932316e48fbff6ab4045971e5e0d2e7240219798bcffdb2f130a8270163b67d8f213a15242127721b128b0edb2a97fa8e07f1ce2026d98
+EBUILD pytest-aiohttp-0.1.3.ebuild 567 SHA256 0d2738877639064909f1b505080e8fb450e9d063f71ef2f8c35045859b1c8cfa SHA512 5c8d342844f8db2ef4281f113904e97f07f9900189c608db57298686a61c72db6e49e9277d9c4581d74cb41692893569ee8f61269af44aecca0a7860eb44e9a6 WHIRLPOOL 37ff858e62dcfa96b8d54f29a49d06ffff8545331a78c59ced02bf011b66db6253dafd84693411c5400d0c6a5639a64807a0196bf458057256f0c2b9feffdc97
+MISC ChangeLog 333 SHA256 349ddb0f2728e3816c7c701b8b1fcbb8e308eae0ed62c7ab4bb165f343568e50 SHA512 555148f01d921b26626a58aa4b1574868a25d63b796eb1930d1decea2332a82f41c79d0720217c6bdf6d5676f0ce639bc8398d9f13556085a53ac6fdf9b713fb WHIRLPOOL 4c7e9cc67bb194bfc2a40046ca48792033be986c54b7bea9031973f37e1397796913a6d2fbd8e32c0358b51e8283dcb3150d9f1d0ca77f639158401e270798f0
+MISC metadata.xml 465 SHA256 b4aa1e5efdb6a0c8661b08f1bca4bc5e302d9fcc180270f2999e925cd9478b76 SHA512 545283f1c6686667208d083e47714b66e2da2ff09f27bbdb9b10809945389f912e9e2bcfda4f0398ea0e6bc30586146e2a113bc2f8056406b3716c39ceccf55c WHIRLPOOL 9f5d4286f66ad613baedbd237c86b1ac02629205338cc44d773981665ad508799346a587abf05e38355808f499d4a94bcb233817c24e8d1ce654613e86f16cec
diff --git a/dev-python/pytest-aiohttp/metadata.xml b/dev-python/pytest-aiohttp/metadata.xml
new file mode 100644
index 000000000000..ddd61db2af48
--- /dev/null
+++ b/dev-python/pytest-aiohttp/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">aio-libs/pytest-aiohttp</remote-id>
+		<remote-id type="pypi">pytest-aiohttp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.1.3.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.1.3.ebuild
new file mode 100644
index 000000000000..e0262e7f2199
--- /dev/null
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.1.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin for aiohttp support"
+HOMEPAGE="https://github.com/aio-libs/pytest-aiohttp/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	dev-python/pytest[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-0.22.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pytest-arraydiff/Manifest b/dev-python/pytest-arraydiff/Manifest
new file mode 100644
index 000000000000..98fd302d99d9
--- /dev/null
+++ b/dev-python/pytest-arraydiff/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-arraydiff-0.1.tar.gz 8752 SHA256 4ca5aaa9a8dc55f0cf621ce6cca3060e320e32b1a500e2f87298ade0a5ece7e1 SHA512 321ea04ea7165753cb4d9aff3870d5297f78a0e5ddaf16aecd5dce622f061a2f664479bf8e3af1c7575e968fa66828ed2d0489473e7d8a236c07d1a31adfce5d WHIRLPOOL 08a7fdaa72717d7657ebaa97130aa34096aa0b3cc1ec5a1b507e103441e6991f22f732075416a51a8a34773619a75a3fcc451018f439d986eee5e9e8628c62ea
+EBUILD pytest-arraydiff-0.1.ebuild 645 SHA256 6bc6c4e0fabd5ea9f06a477238f31a2f760e5576b92b8a0405430ea678c6c55d SHA512 88cd6df1f21257b6a92f235068ee508501014149bff17207c0a4d2a54c3b3920a176f4d03a49c94206d1eec6f1bcd06f3e97dbf7aa3108e828750a006d0372e5 WHIRLPOOL 069aa5147d2232b97a093014289f451cdf0391f638661dd6b7c9f4bf8c12933b945a59e3861071bd49bc999db8d5070ddb38d725dc8723eb44119b0f3a8bf407
+MISC metadata.xml 527 SHA256 b14e2f6441966c16f8c9abf3a08f00f0d8ac3e178f2cc680fb3214c2c8cda9fb SHA512 9138033364e009d0bef6499aa1f5353a72033955df26a26869038783bf847c91e8ebdc1b62908e393c4471285420ddeb01118aff5905227b67aeb924bdf2738c WHIRLPOOL 367a22ca731005b3e5dc7443d93fc71120e0c57a7b550e1d45ae963f56cd6b4aacb3dda07a97e64a44aaaaa25b6e8b2ab2f8a1fa21be10aa01fa27d2481211bc
diff --git a/dev-python/pytest-arraydiff/metadata.xml b/dev-python/pytest-arraydiff/metadata.xml
new file mode 100644
index 000000000000..a5905e0e3a81
--- /dev/null
+++ b/dev-python/pytest-arraydiff/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="pypi">pytest-arraydiff</remote-id>
+    <remote-id type="github">astrofrog/pytest-arraydiff</remote-id>
+  </upstream>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    This is a plugin to faciliate image comparison for numpy arrays in Pytest.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-python/pytest-arraydiff/pytest-arraydiff-0.1.ebuild b/dev-python/pytest-arraydiff/pytest-arraydiff-0.1.ebuild
new file mode 100644
index 000000000000..4220d94ae372
--- /dev/null
+++ b/dev-python/pytest-arraydiff/pytest-arraydiff-0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DOCS=( README.rst CHANGES.md )
+
+DESCRIPTION="pytest plugin to facilitate comparison of arrays"
+HOMEPAGE="https://github.com/astrofrog/pytest-arraydiff/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pytest-cache/Manifest b/dev-python/pytest-cache/Manifest
new file mode 100644
index 000000000000..09a8cdb676a2
--- /dev/null
+++ b/dev-python/pytest-cache/Manifest
@@ -0,0 +1,4 @@
+DIST pytest-cache-1.0.tar.gz 16242 SHA256 be7468edd4d3d83f1e844959fd6e3fd28e77a481440a7118d430130ea31b07a9 SHA512 55eb66718a45fb0ad8931780d96fa4715cf0d9f2568be2a1b08b3399d391b818a7ae8b2afeb74b50aaf8ec8f7f0d8da8e7a7483845a50e884822ca6ddbca03ea WHIRLPOOL f1610e5ae8505abc6f6175d029c5afb9e3fbc7d10ba31379305752ebd941209514a054e34d36c794270d4a9eb0001c71aeea9700431798f54a1b40013a3d77a2
+EBUILD pytest-cache-1.0-r1.ebuild 875 SHA256 d118d30c58129c22667f156ba5f8676fe602e628447a2ba7f0cb0a6d46485da2 SHA512 7da2dde5722ab93ee3859c5a70edae4aa9c1f58749937d9653d334c1d0f23e37044cd85446c6116eade26d44745f12b20c5ccb5a7c4c000813d43d9dd0d76ae5 WHIRLPOOL 96153bd5844175eb91ca449eaafd2f3ccd50c9f4c72ac938c796281bcd16cc626804127cf06c605cf0c24bfee904b7e17e1cfd22878199fc743f6b696512bf39
+MISC ChangeLog 1808 SHA256 bc9a90ea3bec3a38123b149ffb88813018346e3bf8824ee8cf3e481704a8f9eb SHA512 ecdf467fc2b3cdbd0db27e931eae959fdaee17b895fc1277de1db7e97a19f70a58948b3ee826685aaf8cd62a667b2e3a0c6838389f0d931bb81d59df71cefc36 WHIRLPOOL be3d03207a3ea2e254d17a20084f1bd6047a2b98179d5076f61ea709ed638a32d08168ce33ee9118b1aa6a40defc5da5aa5eb266a07d4105f57689c7703a9e3b
+MISC metadata.xml 424 SHA256 833f0765f05561d91b07415a704f0083913eee3de98cdd15160ab9b9638acff0 SHA512 d5cacf7c2874eec32bd10036f6fa03f0d357569e99b229b397df2ca1978f3961b9f3e7cd892cba677e4f6c4e39a5d69ef496166285adf089e08e7406446c9a35 WHIRLPOOL 87b3825d816ba0649df6b28f06311c326d25dcd93e230a1a49a32468eea1613f37695a64c5c491b5097d0ff178cc0eda1ce69dec947b2ff5294e7d9be968494f
diff --git a/dev-python/pytest-cache/metadata.xml b/dev-python/pytest-cache/metadata.xml
new file mode 100644
index 000000000000..c84b16d0098e
--- /dev/null
+++ b/dev-python/pytest-cache/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pxml</remote-id>
+		<remote-id type="github">metagriffin/pxml</remote-id>
+		<remote-id type="bitbucket">hpk42/pytest-cache</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild b/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild
new file mode 100644
index 000000000000..ecb5f90c44be
--- /dev/null
+++ b/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild
@@ -0,0 +1,30 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="mechanisms for caching across test runs"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-cache http://bitbucket.org/hpk42/pytest-cache/ http://pythonhosted.org/pytest-cache/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/execnet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	"
+
+# https://bitbucket.org/hpk42/pytest-cache/issues/12
+RESTRICT=test
+
+python_test() {
+	PYTEST_PLUGINS="pytest_cache" py.test -v -v || die
+}
diff --git a/dev-python/pytest-capturelog/Manifest b/dev-python/pytest-capturelog/Manifest
new file mode 100644
index 000000000000..023880462b6b
--- /dev/null
+++ b/dev-python/pytest-capturelog/Manifest
@@ -0,0 +1,5 @@
+DIST pytest-capturelog-0.7.tar.gz 4293 SHA256 b6e8d5189b39462109c2188e6b512d6cc7e66d62bb5be65389ed50e96d22000d SHA512 82567697be2c277f49633cee5c83733b3383b89e987729dc977f4ef3dd08a5ef55d507f5380ac08def7791157208459ee08d686cf532280c665e659938f03c22 WHIRLPOOL 3b292ac5197c13b72019e4051226a7417434fdba6854883273d13f6750e9420987f0af80ec8035d88b318290a190d397c3c7bc892b4930641977bad7ddbcc420
+EBUILD pytest-capturelog-0.7.ebuild 812 SHA256 5193fa5d2792245f2f9d2e8cfcbf90a9c04c53ad0726dcb9e924e449d607b18b SHA512 978350982d183b0fcb6e72f558e644b9054c9d91fa5a6bd5f2f2cf4626b6718fb615e1839814b3001d951d72dee81dbdd956f93db09bd1a08f83b592fbf29b9f WHIRLPOOL 9b80697e9d387b28e734c0ce691734bfd66461d2083d5b02f845b319993c993e67c6497d50b17f37ab26c465caa777e73ac969d5997f54454ce0431b0ce733c1
+MISC ChangeLog 3978 SHA256 c53a740e9a21f32011d5ba75ac64366d51e355662116d530c3efc4ef60f76576 SHA512 446440f264e4553d2ad5d2740cb1208eda1f98dadc393cb783d05baf9de5da1af07824c6065e1f338f603bb4dc2e9314c77a4a544d32ee46457e66bd827fb3fe WHIRLPOOL 361bc5ce838ad7d1ae9e4caae7c6039dda743512a5e36070ac81bdde8f44169775453e4ec6cb080d3045356056a91cdd1fc6abf4643ce6697216356b125d03e7
+MISC ChangeLog-2015 481 SHA256 6d51324d10dc56993f79d2158c7295c678cb3ad65bc2f017ef5394aff31f6ee7 SHA512 0539739e46160c9ffdd261ae94ccb0fa5dd42192d274e95538e0cf2d86940b1eb7c6deacc7cb7062e671a50533dd63303002150071ed325ddfc39316156c2359 WHIRLPOOL c53e91645aac6881e3c2e7d4055d252118f1caddcf427a5578f2c49f4fa8479324f6d80d79d8e5aac3588ad1cd303a33c68c9747cafa1bd78524927fcf814768
+MISC metadata.xml 390 SHA256 d76cabcccc460157c90de982e9d1b9d9a5d39c2d0cf6733372bdef32791f441c SHA512 c4f5af0f5e6ac325f47cced6f6032279bf9109d1581f18c051869cf7ef4526c38245c4b31335f6fb42851ec5ec8c52e2841aee044c25195142917a39000e7525 WHIRLPOOL edef2f2a71a6ae6041f91295ef0e7716c584e17ca3bc34d7bf1123d2d4d5947d8a1a9aed35f3b8d1d012af345574c1bca487e02a7b28d53a42f0218fb0d4aeca
diff --git a/dev-python/pytest-capturelog/metadata.xml b/dev-python/pytest-capturelog/metadata.xml
new file mode 100644
index 000000000000..81c84a630457
--- /dev/null
+++ b/dev-python/pytest-capturelog/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-capturelog</remote-id>
+		<remote-id type="bitbucket">memedough/pytest-capturelog</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-capturelog/pytest-capturelog-0.7.ebuild b/dev-python/pytest-capturelog/pytest-capturelog-0.7.ebuild
new file mode 100644
index 000000000000..fc314eaeead3
--- /dev/null
+++ b/dev-python/pytest-capturelog/pytest-capturelog-0.7.ebuild
@@ -0,0 +1,30 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin to capture log messages"
+HOMEPAGE="https://bitbucket.org/memedough/pytest-capturelog/overview"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="test"
+
+RDEPEND="dev-python/py[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# Not included
+# https://bitbucket.org/memedough/pytest-capturelog/issues/5
+RESTRICT=test
+
+python_test() {
+	PYTEST_PLUGINS=${PN/-/_} py.test -v -v test_capturelog.py || die
+}
diff --git a/dev-python/pytest-catchlog/Manifest b/dev-python/pytest-catchlog/Manifest
new file mode 100644
index 000000000000..9aea26f2e22f
--- /dev/null
+++ b/dev-python/pytest-catchlog/Manifest
@@ -0,0 +1,4 @@
+DIST pytest-catchlog-1.2.2.zip 18028 SHA256 4be15dc5ac1750f83960897f591453040dff044b5966fe24a91c2f7d04ecfcf0 SHA512 bbeeb7213898844a7956712992ddaca1e28c52fc5712339b9730f181a124af5ec90b5460981066638658246da4321840a7583ee14eec7c0482e069e2a824d031 WHIRLPOOL 522f34a6f54f15d1cf1380508517c50f9892553ae8b134c91a399f90c4534762fe88e4b3f7a5608fabf54aee1d53a4eb1e5e5473549bbafe772ba878f4116189
+EBUILD pytest-catchlog-1.2.2.ebuild 726 SHA256 a457722c530d79fcd4fadff3a0093138257e4d30d4ff55536d9ed4b37eaa3072 SHA512 9bd9dc78adb299480d5c37cadb9c6ff439cb1b28f585275467b499b39e78ca12e8d2759bb79e1658127640e6da2bbe976f7aa4c6b237f222924c36715627e4aa WHIRLPOOL 880641748d3e24404ba10467d3ccafaaf09f42af870cf18da0c5ad07261d25aac2299598314962663c7baad6c0dfb2e561c9a686898a84e02f6e1e5b98e1fd81
+MISC ChangeLog 1820 SHA256 dde2d5ee47e26d5eee719a759d8ab78b00f40b777ee6ff90c5be4755d290570b SHA512 ddc576ef75f2f05535a5c8108d60229ed74407ef2369015a5b8e0dead2bdf2c8a68d1a5e465ea73dcb53a5f97be7c6b40f983cb315d8f92deda9909171929c2b WHIRLPOOL fc5d0469efad52530932b859adf89cd079964398657a6157ec9d5dcfa6b5e22679c413c69c8639cc1b2f9d2efbc339ef637a2afb9bec5e521df2bd23679d5552
+MISC metadata.xml 384 SHA256 a244574d516bf72be41421a45e7230126bb945d6de9a7c5933ba7942d2417fe5 SHA512 2a49b6a72107bd42dbb524a060c14a2dafc1172ea5d21427f22589f43f7cf728e0b3d843f59c962bcd8c6a072663ab842606d13827ff9803d1a016da5c09f741 WHIRLPOOL fbb95baff53f5f4f0542e9d01fe704ffbe655a21b7e86f07d2eb37bbf0e25006537e4b35deccf6081847c9dd111eac0e1c40ba1d2901ba6cbc40b2c846edce9f
diff --git a/dev-python/pytest-catchlog/metadata.xml b/dev-python/pytest-catchlog/metadata.xml
new file mode 100644
index 000000000000..ebb00878d434
--- /dev/null
+++ b/dev-python/pytest-catchlog/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-catchlog</remote-id>
+		<remote-id type="github">eisensheng/pytest-catchlog</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
new file mode 100644
index 000000000000..b2170e329858
--- /dev/null
+++ b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin to catch log messages, fork of pytest-capturelog"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-catchlog https://github.com/eisensheng/pytest-catchlog"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=">=dev-python/py-1.1.1[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.7.1[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	PYTEST_PLUGINS=${PN/-/_} py.test -v -v test_pytest_catchlog.py || die
+}
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
new file mode 100644
index 000000000000..141abacb21a7
--- /dev/null
+++ b/dev-python/pytest-cov/Manifest
@@ -0,0 +1,18 @@
+AUX fix-for-deprecation-warnings.patch 678 SHA256 139b0154d8e14765776f16d733333e36fa8bb812fcc715bdcfb804eb666d433f SHA512 3f20f6ef0514d676259e6bfd5c10c1877c4237a4a87161352adeda355dac693a6a43b8be3b29848feca433a9ead3e96967d8e255b62e3b60d816127eb17c4cae WHIRLPOOL db774ddb247bbe1eb535e2d4ddb181a58d44bf3a62ab8608e632d4705ae5eb642d3285b701b176b1d758bc1b64ccbc4bcdbcae8005f88c120eab4004eb9c28e9
+DIST pytest-cov-1.6.tar.gz 8257 SHA256 2e803c89f11e0344111670349f6ef401f831e85cbd287b0c5d61917da5aac454 SHA512 36c18e8e731613f2412e8e377f1911704d4af23a82fe66b822547850c3343204f682d3464c97f2cb4360f5090e7a58e5ac9679e83ae90adc0ccdb5b0e467430f WHIRLPOOL 41543b2e7f61d61d754bfef4c307fc135ab0d69b10d9e057f64bd3f4cacbc6e47316e478dbd797dd7aea0a8360bad5cc183214c742c749991fd5fe73b96503f2
+DIST pytest-cov-1.8.1.tar.gz 8649 SHA256 31e5198c06f290e1e813d30ddd063a0401d9e3a698129ca44267781673a71285 SHA512 dff6c6345bdc2d219800782d7acb3d301c8d67314f0f4af983daa0942a8c97768a2ce6c64f11529a3d8d876c218c62dbf08b7a63cc7345072e70bbc85ad4d112 WHIRLPOOL 90f024e0388323a5d1bd8ffd439c3c6cfb242ac2f539d391f4139a6ab2e251c6ff01831e9a261506d2c1552f1beeacc99db43d3b98a3663828083fec1ae722f8
+DIST pytest-cov-2.1.0.tar.gz 25992 SHA256 6e86c3ae3be9930fa3f1402651819b00169fb5e963d29ed03d390d152a608506 SHA512 f763e611b19f6769183583d275e28467f7cc5cc8a8fe5a4d3eb798ddf8d4e008732ec8c29b757aaf0fba0f5a660d92729499f3d388693f631ba73cc7a570d738 WHIRLPOOL 1ece60dea2fc1ff2da342313a0e67ee63a63cf35ece930f92b59c2283522698df0be4c10fb6951d3afff9fb1acffd37d207dcc4f0400109cb4f8c830d69a5857
+DIST pytest-cov-2.2.0.tar.gz 29965 SHA256 2231d43f07760d6904dadceabca53ab16ef95ba58fff393861b64c0cab96c9d1 SHA512 3e6a2b648b12eff3d8f0aad12dda35a05820f6073e7f87e9c92ed6cca00fe031750da8f6c37eb81cf6ca7b2e4975dafffd7e3e901cb7b91e5c53c83b6e6b8420 WHIRLPOOL 9feff5557af5f4101e9ae508febf3479472781544b54345d5f53f0f19df5f40eb5af4ada2b44037f590445761ee9d3bffe14d729c465f880951d714eeb6ae491
+DIST pytest-cov-2.2.1.tar.gz 33154 SHA256 a8b22e53e7f3b971454c35df99dffe21f4749f539491e935c55d3ff7e1b284fa SHA512 8f20cf1c42b4415c7decf8407582e64045c599aedf1970160d02e35e723f56fa095af26ee4390eabf2d32e209898b0a3dae8b7212ac81ecda64d6dbc7c83f790 WHIRLPOOL 92386bd1ff532e0c98f1dc01b3583315a626a030fb4f38e39eb4f8755e83f3901873fdcd406f9c8bc6393040fa198cc416dae5e176e88084ed6fb16264d3c056
+DIST pytest-cov-2.3.1.tar.gz 35378 SHA256 fa0a212283cdf52e2eecc24dd6459bb7687cc29adb60cb84258fab73be8dda0f SHA512 79770beb53fbb43b5d68311c2efd0accbfd890ab6dad299da8c1c0b3d26b54d984807313b1507900cda7004bfb50fedc0bd4341cfcfce47849a4f24fc8184f11 WHIRLPOOL 8b0fe223f0cbae0bb9c85b3d8d7f80456e164f3565bd7ba146b0eb34c1fd06c0447405dccd2642f0a4aec1819ff74277d2eb9b076e61438fbf69b35c472755e0
+DIST pytest-cov-2.5.1.tar.gz 36201 SHA256 03aa752cf11db41d281ea1d807d954c4eda35cfa1b21d6971966cc041bbf6e2d SHA512 868131d6ea6dd28deec6d653dec23ceb7d3adccfa2c6bcc0a3126bbb11e924e71f200676461b2202f274ce6e14d1799feb0917e3081817d9e8583271c18a43de WHIRLPOOL e7084c4f55b12fab3cd2d99acebb02159f764c20b69e141c7b6779b1c4720c5d6358791559d46074a8af19f89ad3d0c8d9e722ffa7d4b217c9ab88936dece910
+EBUILD pytest-cov-1.6.ebuild 561 SHA256 d8f9f5130ac4645468690f73583124d6a7d7ec1ebfa4937967f86f5a1818f34e SHA512 c4cf5ce68d840d1a8b2e5bb049b9bf2c9774ad1c841f9d85be94139feb4413963bd345bbce16d660a867e80dca79b5064cd6ada55fd5a5d6dc25b1f5d02756d9 WHIRLPOOL a0a64cb8a31f75ce3e21864f0eb2f367196a52d77ab36609222fba8ddda438c716e5ade1a68a664629877e491d31b05d3b0c7cea7c42d04b8f3c224b9fe1afad
+EBUILD pytest-cov-1.8.1.ebuild 959 SHA256 3af6f308f5850705f1ef7cafa13f02217f4b7214259c858a58743cb03caec392 SHA512 84e384cc5afad709603bad3f02f65339b18e0f89e61dabe19d3e433cf399b7e4c8f4afcf4c6702241d936101e1431a8e05dad1c8ca107af3496fa7e6b621cacc WHIRLPOOL 47712101ec311f8853db920a769fdf8162ae82dcfc4ec15a2f24bd62835be33db8ce2fb13fc4226232179abf6ba68ba41f6b61b50a2217459bc82d92c50c34b9
+EBUILD pytest-cov-2.1.0.ebuild 1087 SHA256 facd0cb62e61070dad86be579d2b05530435e33639925a9a499388fea6fd49e6 SHA512 52f32df000e94f98826c7d21c29e1edf5ba800e794bbcc0c182d0d7c65b28697f06640df655a924e0ff3241efaf3fa4732446e9739ee155d887de90aac275c97 WHIRLPOOL 821cfe14e1e78679f3870b7df04598b464f2c064b105bef3bdb8c78a4227f6214f72d4067a8d3e6040cfebe2f926b616cd514c307feeba62356511b0edb533e8
+EBUILD pytest-cov-2.2.0.ebuild 1262 SHA256 83c4071d4577812c6e2419e6b2a264cccd9aae80047df2874d27fa7b33509f33 SHA512 49cd4aba05bb7f9e2f9b1d2a6385a0032f7befb056acc1242123879169240b4fac2d210764c2bf174548a2bb341ea260c530a2c6cf0a40db07ba4222f28154a2 WHIRLPOOL 4f1c953804b37575a6089d03138444b97a4085bfdf3a0c3f37ad0cda8eb19408261cd038a56214fd739d08ead268dd8ba350e2891d57cdf9584563402aaf8f3e
+EBUILD pytest-cov-2.2.1.ebuild 1266 SHA256 e46a5e3b6f4ee8842327800b2ffea44fa3cc135ef9c8ad32c642a4248d00db2f SHA512 b3d295471bce26776e89c9922cd9cc806837eda10c855160e46889706262d8178d6456ec7b3ab3c4a3daadf4e88906c504dffa3c5168bf3be8057717f4ce79fc WHIRLPOOL 78df263246dc0fc5915bbed1b0787f3e589eff75d602e0b6434c89ea352dc532b9d531a3f2ee9877e3667d72556eb373da5e8da0d3d7ae6477b8934b7d8b2542
+EBUILD pytest-cov-2.3.1.ebuild 1535 SHA256 e0513973dd6360fff3e9f0ecf73c138cb3d551bb1e76d2826dc9ac545b0cb222 SHA512 60e2b1992e2adf269352517948df3cca5ea08c91426374fd2e00abd6d8247eb2b5fa6458cadb17b951745faea029846157433d2e2cf770643be2040f041c7477 WHIRLPOOL aaca5c53243bdfe394deeb1565f55734633315fb975612278120e6b260af98cc75560c975b17070070436877a38f6c7860a611305082eb7ee04d9a2a690d08b5
+EBUILD pytest-cov-2.5.1.ebuild 1505 SHA256 d0e9e9c75ac85988291675845534766d4913ae4dcc0cefbd73a15b984073bef9 SHA512 edc8552f7d3c30b1b0cb26ee7cf2ef54f4d6ccc8efaffd35ae721c950271de3a98873d18b40c96c1aa80c2e43cc5541c35e338e52aef367a1b06d88b6c25a744 WHIRLPOOL 9c5b4326587a1f62cae75aaea9c332e75af18d3dbce4e15490a9184c072dda71b70c7d46d58cdaabf57f62bd040daacff0f3c6c8cb60d63842ce22947496ed6b
+MISC ChangeLog 4985 SHA256 ff793083e34eb6772a77ce4019f831c49df1b8eeb6eca839a14af18e6b70e79c SHA512 cb41e15cce2742ba0149e0e3767c9248d38a1141efd6067a7674399854e22ac537af96d4273cee3de615a0d9e831cf89412bb74f379f3f9ffd720d2775f0e47b WHIRLPOOL 6dffcd3769a4cbed223ed5574b2bb0329bdc14e6b017f46c8938e420f5a0ff8c13efcc4f6b8de20b0b67197dadc91ff9dc3f4bc053c3fb62dc1e0895d7b9303c
+MISC ChangeLog-2015 2344 SHA256 25d246201957d79d2b47312c02ad85d82be8467c35c4b9606e9cb69025245022 SHA512 4dd742cecc1577782e6a5aa320add68a841b8d06c7edd4cbbc84bb561a9a05c43ce56b39ddd063588a8a0db899f365b8cbf4865daa2ec641a888e473fb92df46 WHIRLPOOL 2c66ad76f3dbb63bc8cb0e827e957332f5902bff167f230d0711e551f6893d215547db7e3d2264979779176dc429c406a3e9da9ac73eb9596ae61453c71d5a95
+MISC metadata.xml 460 SHA256 3566a7f296e00e83979402930101a9ebaa79a2674adb349f5bb30d6e2cd82f41 SHA512 5600a6e66b683a30d6252699a28fecf727bdbbad6ef40cec0fabb89f5afd3a0cf1e2b8e2b80ffa6cc144ac03f5e7066117d72fc968492bd3b1d6c89a8b035228 WHIRLPOOL 5f8b3d37702903b24acd65d6a5c5c177d50c7eb2fd8f711d8e8b4246ce95117419d0ed0eafab03fb26a10adb246df64fb3ff4b5d7f36fb1b585cc8c97fac621e
diff --git a/dev-python/pytest-cov/files/fix-for-deprecation-warnings.patch b/dev-python/pytest-cov/files/fix-for-deprecation-warnings.patch
new file mode 100644
index 000000000000..a555ca53fc91
--- /dev/null
+++ b/dev-python/pytest-cov/files/fix-for-deprecation-warnings.patch
@@ -0,0 +1,16 @@
+diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py
+index 6cbf341..614e53c 100644
+--- a/tests/test_pytest_cov.py
++++ b/tests/test_pytest_cov.py
+@@ -337,7 +337,10 @@ def test_central_nonspecific(testdir):
+     ])
+ 
+     # multi-module coverage report
+-    assert any(line.startswith('TOTAL ') for line in result.stdout.lines[-4:])
++    # Fix test failure due to pytest deprecation warnings being
++    # added to the expected output.  Look in entire output lines instead.
++    # assert any(line.startswith('TOTAL ') for line in result.stdout.lines[-4:])
++    assert any(line.startswith('TOTAL ') for line in result.stdout.lines[-10:])
+ 
+     assert result.ret == 0
+ 
diff --git a/dev-python/pytest-cov/metadata.xml b/dev-python/pytest-cov/metadata.xml
new file mode 100644
index 000000000000..14ce7f071662
--- /dev/null
+++ b/dev-python/pytest-cov/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pytest-cov</remote-id>
+    <remote-id type="bitbucket">memedough/pytest-cov</remote-id>
+    <remote-id type="github">pytest-dev/pytest-cov</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-cov/pytest-cov-1.6.ebuild b/dev-python/pytest-cov/pytest-cov-1.6.ebuild
new file mode 100644
index 000000000000..859701ba2298
--- /dev/null
+++ b/dev-python/pytest-cov/pytest-cov-1.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for coverage reporting"
+HOMEPAGE="https://bitbucket.org/memedough/pytest-cov/overview"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha ~amd64 arm hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/cov-core[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-cov/pytest-cov-1.8.1.ebuild b/dev-python/pytest-cov/pytest-cov-1.8.1.ebuild
new file mode 100644
index 000000000000..a21dfda7b9b7
--- /dev/null
+++ b/dev-python/pytest-cov/pytest-cov-1.8.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for coverage reporting"
+HOMEPAGE="https://bitbucket.org/memedough/pytest-cov/overview"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/cov-core-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
+	<dev-python/coverage-4[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/virtualenv[${PYTHON_USEDEP}] )"
+
+python_test() {
+	# test_ file produces no output; For FI
+	"${PYTHON}" test_pytest_cov.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-cov/pytest-cov-2.1.0.ebuild b/dev-python/pytest-cov/pytest-cov-2.1.0.ebuild
new file mode 100644
index 000000000000..5f44d70bde40
--- /dev/null
+++ b/dev-python/pytest-cov/pytest-cov-2.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for coverage reporting"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.python.org/pypi/pytest-cov"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/cov-core-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
+	<dev-python/coverage-4[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/process-tests[${PYTHON_USEDEP}]
+		dev-python/pytest-cache[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+		)"
+
+python_test() {
+	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib" \
+		py.test -p pytest_cov -vvx || die
+}
diff --git a/dev-python/pytest-cov/pytest-cov-2.2.0.ebuild b/dev-python/pytest-cov/pytest-cov-2.2.0.ebuild
new file mode 100644
index 000000000000..be456abdf404
--- /dev/null
+++ b/dev-python/pytest-cov/pytest-cov-2.2.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for coverage reporting"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.python.org/pypi/pytest-cov"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/cov-core-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/process-tests[${PYTHON_USEDEP}]
+		|| (
+			>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
+			dev-python/pytest-cache[${PYTHON_USEDEP}]
+		)
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+		)"
+
+# https://github.com/pytest-dev/pytest-cov/issues/99
+RESTRICT=test
+
+python_test() {
+	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib" \
+		PYTEST_PLUGINS=pytest_cov \
+		py.test -v -v -x || die
+}
diff --git a/dev-python/pytest-cov/pytest-cov-2.2.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.2.1.ebuild
new file mode 100644
index 000000000000..3eaf9819fc11
--- /dev/null
+++ b/dev-python/pytest-cov/pytest-cov-2.2.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for coverage reporting"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.python.org/pypi/pytest-cov"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/cov-core-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/process-tests[${PYTHON_USEDEP}]
+		|| (
+			>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
+			dev-python/pytest-cache[${PYTHON_USEDEP}]
+		)
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+		)"
+
+# https://github.com/pytest-dev/pytest-cov/issues/99
+RESTRICT=test
+
+python_test() {
+	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib" \
+		PYTEST_PLUGINS=${PN/-/_} \
+		py.test -v -v -x || die
+}
diff --git a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
new file mode 100644
index 000000000000..5c7a0cdbf23c
--- /dev/null
+++ b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for coverage reporting"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.python.org/pypi/pytest-cov"
+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"
+
+RDEPEND="
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
+	>=dev-python/cov-core-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-py3doc-enhanced-theme[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/process-tests[${PYTHON_USEDEP}]
+		|| (
+			>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
+			dev-python/pytest-cache[${PYTHON_USEDEP}]
+		)
+		=dev-python/pytest-xdist-1.15.0[${PYTHON_USEDEP}]
+		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/fix-for-deprecation-warnings.patch"
+)
+
+python_compile_all() {
+	use doc && sphinx-build -b html docs _build/html
+}
+
+python_test() {
+	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib" \
+		PYTEST_PLUGINS=${PN/-/_} \
+		py.test -v -v -x || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( _build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild
new file mode 100644
index 000000000000..72ead3a4d2c7
--- /dev/null
+++ b/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for coverage reporting"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.python.org/pypi/pytest-cov"
+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 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
+	>=dev-python/cov-core-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-py3doc-enhanced-theme[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/process-tests[${PYTHON_USEDEP}]
+		|| (
+			>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
+			dev-python/pytest-cache[${PYTHON_USEDEP}]
+		)
+		=dev-python/pytest-xdist-1.15.0[${PYTHON_USEDEP}]
+		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	use doc && sphinx-build -b html docs _build/html
+}
+
+python_test() {
+	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib" \
+		PYTEST_PLUGINS=${PN/-/_} \
+		py.test -v -v -x || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( _build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-cython/Manifest b/dev-python/pytest-cython/Manifest
new file mode 100644
index 000000000000..09ab5afe671a
--- /dev/null
+++ b/dev-python/pytest-cython/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-cython-0.1.0.tar.gz 19109 SHA256 90fa7e4e619bababeb433d3ba173a80d20473cce0bf3dce2c0e6f298becf5998 SHA512 65d8d25f95f2419ae76902cad8f0f4c9b810dbbba80621d301f53d2128dfeb11c4d74e2ac4f1e39f63aadfc1404e9000c0668efbab4793d307f0b90345023771 WHIRLPOOL 1d360c1dfafd6059c75741e984ce3d6a7a09bb8ff0135c8d318d8ba345c59e21d16a83a52c2a7ce222dc7ea58bc13fd6ab5e8fd32fa4df22154086e977608d2c
+EBUILD pytest-cython-0.1.0.ebuild 532 SHA256 43d726761a7672f9db1b8b6df9e1d85243760d0e2c3321414809866fd50afc1b SHA512 77f132fa58d9dd1d5b7140de45fa648061c38ccb5f61222132e6f88d6f1f9ded302c3711042027fe155e975e22e12a226b3480a22848c997e1e0f7fa8258aaed WHIRLPOOL d3aa09be6f4e2f2b86bfc4ef96217cf5b3a9474db4f8807a04e09e4ee0ff6d17326329de190e580c2c8d4cc5e532fd3627884bd56168d406643cd2095a59f942
+MISC metadata.xml 388 SHA256 86fa42b5b710c4489ec00c258e9cd0f9c7eb8be406fb1e57ad7472a3fdfb8a85 SHA512 9a0cead855da37845b25a91c72b9211d9a273db49da4fc925c593f7f083f5d7aec6376dfd7db1dea88ee4ca0b51a3ad58e000af37960aa2afc8416ed78b3ff64 WHIRLPOOL 9613d10edc1113a1b97bfddd07f54172b85e0722bc431ba45fc08bd096bbb58ea72ecd2aa900f6c520ba082ea48c741577bfebad95b11206404584acceefb3d7
diff --git a/dev-python/pytest-cython/metadata.xml b/dev-python/pytest-cython/metadata.xml
new file mode 100644
index 000000000000..535d87310a6a
--- /dev/null
+++ b/dev-python/pytest-cython/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pytest-cython</remote-id>
+    <remote-id type="github">lgpage/pytest-cython</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-cython/pytest-cython-0.1.0.ebuild b/dev-python/pytest-cython/pytest-cython-0.1.0.ebuild
new file mode 100644
index 000000000000..60ca2ab4411f
--- /dev/null
+++ b/dev-python/pytest-cython/pytest-cython-0.1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Plugin for testing Cython extension modules"
+HOMEPAGE="https://github.com/lgpage/pytest-cython"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
new file mode 100644
index 000000000000..8ff2cc87b55f
--- /dev/null
+++ b/dev-python/pytest-django/Manifest
@@ -0,0 +1,4 @@
+DIST pytest-django-2.9.1.tar.gz 50570 SHA256 8be15b637738c8cbd1422a6461465c0aeab7839cf76ad2b5d190b6f1f53facd6 SHA512 0e50f45a0cfefb6fa74f7d60d5173e3e8dac49ac669c9c88e46d27a01cff5c4a255d6f707863406b6f8707e25e9bea3408cbffbb75a2680fee365b9c9167d468 WHIRLPOOL b7992224d0cfb655c9faf0af9689a6bdd2c9371114c875f2b1a00e6d972a487346cb6939eac0b04d24b302311d1795696f5c38e362f832a84416d2a0d23b501d
+EBUILD pytest-django-2.9.1.ebuild 930 SHA256 7934cbf089c5e1b4f47397899608d02904830332e5369d021bbadec439224023 SHA512 1733c9fdc6790bb5471162a3d16ba0e5e892448d0938d0a16a7f0a0fb52aa767ef7efcf69ad9754b90e17ea81adff157b5555313fd244f168201c11a7a2fc7e4 WHIRLPOOL 0f7e829490daf332d1d303d850ef0edce74489ad70e742c568915d08455318682c7ffec263645638851510abd7dd6a3a36c65f9b727dfa0ecc737847aa43a75b
+MISC ChangeLog 1561 SHA256 c3355abb56d42f1b604722a96689a559b816af6d2d0184c0f16271fbc4dccce0 SHA512 de20ea52710c9dd850d05219dfd809c4bc134dcf0072decde97aa3e853d588e12d506cfb723f955f7d9599412b8a9c4a192778eb2bd2e35fe0f62b6ff5c561fe WHIRLPOOL e92f1e6d9b967bac9848ba985b8f9b12aca408b5c5f20a67189f7cfb365991ab2a25a5089effd222c9c97f94d25d34ec1ac7e1313e38ae7d19fde9cfd27db822
+MISC metadata.xml 380 SHA256 69e12dbe72e7ba54a02698d7e50ed9029b2651210bcc4544abdd8983822419b7 SHA512 65163d6f99c4d2be86bbedad07b756eda2aa639cd612e0ffaf95dc0707e72de8b406ad51d2a482925790c837bc7c3d4ccd5dc3fd070da6599e13278db03ab006 WHIRLPOOL 33c1a1cf15d0b5b3895a19207501e189860a83abca3fa3390ede116075c4d27574865d9ede6032d86d862779fd1a9fb7256f5769a5303017f27b55975248181d
diff --git a/dev-python/pytest-django/metadata.xml b/dev-python/pytest-django/metadata.xml
new file mode 100644
index 000000000000..6cc31041286c
--- /dev/null
+++ b/dev-python/pytest-django/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-django</remote-id>
+		<remote-id type="github">pytest-dev/pytest-django</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-django/pytest-django-2.9.1.ebuild b/dev-python/pytest-django/pytest-django-2.9.1.ebuild
new file mode 100644
index 000000000000..4e1da3ba941b
--- /dev/null
+++ b/dev-python/pytest-django/pytest-django-2.9.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Django plugin for py.test"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-django https://pytest-django.readthedocs.org https://github.com/pytest-dev/pytest-django"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.8.0[${PYTHON_USEDEP}]
+"
+
+# https://github.com/pytest-dev/pytest-django/issues/290
+RESTRICT=test
+
+src_prepare() {
+	sed \
+		-e '/setuptools_scm/s:==1.8.0::g' \
+		-i setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	PYTEST_PLUGINS=${PN/-/_} \
+	py.test --ds=pytest_django_test.settings_sqlite_file --strict -r fEsxXw || die
+}
diff --git a/dev-python/pytest-expect/Manifest b/dev-python/pytest-expect/Manifest
new file mode 100644
index 000000000000..e5e50049138a
--- /dev/null
+++ b/dev-python/pytest-expect/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-expect-1.1.0.tar.gz 3595 SHA256 36b4462704450798197d090809a05f4e13649d9cba9acdc557ce9517da1fd847 SHA512 41d2b296844e9dab9429f34eec37fe106a4e6c2039824c37067ed048dcc328b13e666b22d3482ccfc6153af4e44b5d895f3011ec45df55ffa07a98459e3caefd WHIRLPOOL b56ca4fb02dc9a844fe12128f09531ba1a199276276f976472e24ca2337990b9b99fac691d6118a714408531d373e25dad23586da43d1ea07cb5821ff0312e93
+EBUILD pytest-expect-1.1.0.ebuild 682 SHA256 812f7cc5e4c45e6c59939251e6c5aac8b63a74de6f26ccffa8303c4d923bd141 SHA512 b9c6a54ca557e5bff774054b3ea3f277de4a2e89c470563f6ea3db9f01a6358f86aa892da9b821667f9a6d746c5408e96362fe02ad53f9d2f248249d61770f4d WHIRLPOOL acbb2e3cd16b2bf28f521c5f5f19e26c5609c36388038a915d8d51e114b7a9bb5f3773a586b2fa938efa8faf17562b0bd8755b91da5d529c8da56866b87c789a
+MISC metadata.xml 357 SHA256 c3a9c50de2a8869ed3931237982cebfaffbe6041c7a46f98a04b19a6fc21480e SHA512 6c6151ca1a141fdbecdb4eae172cf6d21bd41f2827db435f8d1a6a4dd95743fc291f302848b9afad0e1fdb9e7bb8030bf0f8e46a69e8d4ad9ed0d648b1aef870 WHIRLPOOL 9d3e965bfadb717106d6a9674c29c62b94fd22b418502b6130df181e84baf12eb8317602ce1e50158e4fa316ba7301a727c0ee98a2a4abeb0fd156d1e1adbb09
diff --git a/dev-python/pytest-expect/metadata.xml b/dev-python/pytest-expect/metadata.xml
new file mode 100644
index 000000000000..b6e0ef321536
--- /dev/null
+++ b/dev-python/pytest-expect/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">pytest-expect</remote-id>
+		<remote-id type="github">gsnedders/pytest-expect</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
new file mode 100644
index 000000000000..dd16adc315ca
--- /dev/null
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin that stores test expectations by saving the set of failing tests"
+HOMEPAGE="https://github.com/gsnedders/pytest-expect/ https://pypi.python.org/pypi/pytest-expect/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/u-msgpack[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-fixture-config/Manifest b/dev-python/pytest-fixture-config/Manifest
new file mode 100644
index 000000000000..274e27dc99b1
--- /dev/null
+++ b/dev-python/pytest-fixture-config/Manifest
@@ -0,0 +1,5 @@
+DIST pytest-fixture-config-1.2.11.tar.gz 6525 SHA256 6d4c064b614e4afbcd93b56d4ca14c44a295370e7843daf69925ff5c0fbe94a0 SHA512 9d335621c7aec41ce769f450fb618ca1611a0e97bf3bd3bdaf43bb827dde62af28fb255a36643c4e6e9c958e7f7efe3f4fc308b3129fe7625c0504c0c46f1518 WHIRLPOOL 9386794f00575efbc06fcf212f132cf11a91df942e5807ecaad7651b67298dad577a8831450ae462c185732101262278e92a208f08fd11af2d15ae3664290485
+DIST pytest-fixture-config-1.2.2.tar.gz 4995 SHA256 5df71da68709a233a7a9f1aa262091ac17ddfd4c170912d07030801fd360b781 SHA512 c2d2346c50c8a73e37ce217e240eabdecf872700c9f4b020f1ca7532a06e6a5dc6b140356d96b1bf8c83f1cf737d95775abaa206c3dcf7e02555b26aa995f12d WHIRLPOOL 97488a31b1b39f5964df34900e4ff8209e425746a7791172cdc6804c98561fa73a7d28d668bbea4fa55082d81c07a50387891a60c8503eedd761bc8f9639673d
+EBUILD pytest-fixture-config-1.2.11.ebuild 710 SHA256 3c37ad0898b72fce5319fe037048c43819d8c1a5eedbf0150320de1af346c523 SHA512 df62a566209db25b36156ed81c4d0ca3c59da6d3754f194b4fba74c6d74ee295021393585ef051eec6084fdfe20e19d5bee7444863733931a6975975082bc515 WHIRLPOOL 8e548b07ad385dcce5f18f2dd535626fb9db07536db3f86fd0b1302699c4407c7d9f01b525a755cd13a432ff28fb51b1b25b63278e7f04efe34ea9a95c20d58b
+EBUILD pytest-fixture-config-1.2.2.ebuild 707 SHA256 f06b2a6a6f5baec8656414c70322c18af28e992f55af73c05b548ab6c80be7f0 SHA512 e1554212104ddce7d35730af725f612cf646e469b7f154e5af843d555c4e3e8d45d3081a413b4db69deb11f124503d2a4ba75820a7a2cfdb804c2bea23068316 WHIRLPOOL 06a0559364b99a6559e4cf203e5c29655400cf1e821700304ece3365cbc1025e33be514d443ce70dcc30c3ca50e56a11d6c475ea77acbf1bc08ca15354528c58
+MISC metadata.xml 676 SHA256 5d1567ee96b545d501cdb9ca9f1bd24f637a36823c7332b8ee517fcb73ee22a0 SHA512 9e4cc39afad13c0cdce47c59c42c4d71436422d37d4f113a446238036b1f05d38eb8fa6d53b9001ca630483492dd315090062efe221339e63776f126d964620d WHIRLPOOL 73700ae50cf2e7800f17ef6ac85f1c8840d8bd3251bd891b2d658ad5913ba09c57ee0e6e2dc3401a3ea7bc79f4f568895d2595fc2a2dbd11310f0ee54eb6cfeb
diff --git a/dev-python/pytest-fixture-config/metadata.xml b/dev-python/pytest-fixture-config/metadata.xml
new file mode 100644
index 000000000000..6aebd3d199bb
--- /dev/null
+++ b/dev-python/pytest-fixture-config/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>eeaston@gmail.com</email>
+			<name>Edward Easton</name>
+		</maintainer>
+		<remote-id type="pypi">pytest-fixture-config</remote-id>
+		<remote-id type="github">manahl/pytest-plugins</remote-id>
+	</upstream>
+	<longdescription>
+		Simple configuration objects for Py.test fixtures.  Allows you to skip
+		tests when their required config variables aren't set.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
new file mode 100644
index 000000000000..b5fc191522f5
--- /dev/null
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtualenv fixture for py.test"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-fixture-config"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.2.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.2.ebuild
new file mode 100644
index 000000000000..89bdb6e1b147
--- /dev/null
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtualenv fixture for py.test"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-fixture-config"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+	test? ( dev-python/six[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-flake8/Manifest b/dev-python/pytest-flake8/Manifest
new file mode 100644
index 000000000000..0841a1cf9f85
--- /dev/null
+++ b/dev-python/pytest-flake8/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-flake8-0.8.1.tar.gz 7359 SHA256 aa10a6db147485d71dad391d4149388904c3072194d51755f64784ff128845fd SHA512 b49b4d42712040492161f144cce807b661f2d8fe5b484b29ad1a519fd5b0b0cfb6abd42c3ae8999f21263c4776fb773f91bf0776971b6b6727607d33fb49ca89 WHIRLPOOL a1e5531216244617e647f10c0550c8a1b9c74929b0b1dec4d392930b02fbb699e15209ebd705e3571012d7cf7c81ecd0427f5a10e00c61e70dec00917caebb8e
+EBUILD pytest-flake8-0.8.1.ebuild 611 SHA256 5f76a79af6281230a14f91c14988127550b023f8bfd47143e61025591d3b554f SHA512 b564cbeaf3de68d62d70c2d094d9070ee06922008fd1d4e0022e3d4cf9e848120b4b354fe46c0043150a3c64a82cd7efb9ec224ce77f40874dcfed2b57f08fb0 WHIRLPOOL 323627e4bb359b77abe84b66fc06a8c9cf966ad6c7dfa6f60d04798dbc4579bccaca1fe96ae2d5d5aafa27ed6f5d630143fc03236ecbcfa59952087f0490459e
+MISC metadata.xml 507 SHA256 528295931b8b1c1030287f006d5b74f11544e669150c671ed05f16f9bd6bbf19 SHA512 0f022aea078d7eb1b41db5326bf4c1b950344102f4b614ef095e20555a81032687a3312ead75ff33ee8f6dcc81984651dfc110b95113b8c4f2b3e57f52e97baa WHIRLPOOL 836bf5dc9666f705cfe3fef534de6e94c4d4ee51328b7cee6b8414536debf5f2c34aa181d2d95edb0a3aedf70f3a8c16921640b2d39e6b3d8025984930a593c3
diff --git a/dev-python/pytest-flake8/metadata.xml b/dev-python/pytest-flake8/metadata.xml
new file mode 100644
index 000000000000..2ef8e4f36f30
--- /dev/null
+++ b/dev-python/pytest-flake8/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>titanofold@gentoo.org</email>
+    <name>Aaron W. Swenson</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pytest-flake8</remote-id>
+    <remote-id type="github">tholo/pytest-flake8</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild b/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild
new file mode 100644
index 000000000000..3023f8be88d9
--- /dev/null
+++ b/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for flake8"
+HOMEPAGE="https://github.com/tholo/${PN} https://pypi.python.org/pypi/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/flake8-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pytest-forked/Manifest b/dev-python/pytest-forked/Manifest
new file mode 100644
index 000000000000..91bc6e3b4d0f
--- /dev/null
+++ b/dev-python/pytest-forked/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-forked-0.2.tar.gz 9617 SHA256 e4500cd0509ec4a26535f7d4112a8cc0f17d3a41c29ffd4eab479d2a55b30805 SHA512 5e84fcaceed46ee9da8eec051e72acb46f09e2df3458511651604c35d68e3ad06fc41d52578127fd29f0c216dcb5fce1844c614f10501727cbf8fa8f2316f231 WHIRLPOOL 7f34574246d8280b6eaceaffd0e6c1a1517a35336f4aed7ac804ff1e5235c05462fe7b4e09a2908d87499a1fff1ee13e9d58d29a4877b4b40b87e0a92ba5d99d
+EBUILD pytest-forked-0.2.ebuild 900 SHA256 f16db4d1276bc69b29316911187732ae9a1d81d9b557d56fcf18416e8597fbaa SHA512 1183ec8a19a7437cc66709adacf544bd0bb4d9d7debec9b534dad31383d1bfd9794f3a39885df39e058f4e452e067ef760e674560646e4af0b9ba1cc92684500 WHIRLPOOL 83aaf42f418ed315a6f515c746fe94aede26f43c6f679f315146e99b6090fc8c9140a69970938f54ebcc22be7d06cd7fc65cd715eb4124a3bde788a94393233d
+MISC metadata.xml 380 SHA256 b600677efaa8e9ab8e1127bf21a082661b232f8c87727dd3bf14baa7ce27c89b SHA512 9106660bbd3a3197a9beb92d5309d3b1be687cd30f81753364556b2db1aa19e94237c30f2e31a5517097595033fd80b774ceac44cb09c7850a1f6a1eee6325c8 WHIRLPOOL 1a96f8f570fd237083ad6e9cbb61d617ded7b819dba58c519721aa6db5870b4ae7c553c6d7ad4d5b800e597cad3b2da630e1b69b6c0f643887b2f3c087e5bd04
diff --git a/dev-python/pytest-forked/metadata.xml b/dev-python/pytest-forked/metadata.xml
new file mode 100644
index 000000000000..2a3e6f5c321e
--- /dev/null
+++ b/dev-python/pytest-forked/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-forked</remote-id>
+		<remote-id type="github">pytest-dev/pytest-forked</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-forked/pytest-forked-0.2.ebuild b/dev-python/pytest-forked/pytest-forked-0.2.ebuild
new file mode 100644
index 000000000000..1416c6954209
--- /dev/null
+++ b/dev-python/pytest-forked/pytest-forked-0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="run tests in isolated forked subprocesses"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-forked https://github.com/pytest-dev/pytest-forked"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# remove bundled bytecode
+	rm -r testing/__pycache__ || die
+}
+
+python_test() {
+	distutils_install_for_testing
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-html/Manifest b/dev-python/pytest-html/Manifest
new file mode 100644
index 000000000000..3a8310fc0adf
--- /dev/null
+++ b/dev-python/pytest-html/Manifest
@@ -0,0 +1,8 @@
+DIST pytest-html-1.10.1.tar.gz 15380 SHA256 f6fc1ccefe94fb17ba289ee385bebaeccfd44cf4f05eef9116572cae699af6d6 SHA512 56d49fcb293adcf1424b0dfd3f64b62da560b744594007028c02e4bd722f92201709a089afb4283e6b711ae616eebd0bd4da204f4b974e4a4fc38bc7ab11d077 WHIRLPOOL ff2023e5dad07aa790c3b08f5e0ba497d45e7c916de4475d42c07e734650c7f0e88a004a1012092f8fddd75cbcb4cb272f87c502d903ec77c8b0a740d6984ea2
+DIST pytest-html-1.14.2.tar.gz 21577 SHA256 bf6672c2552b26059acf9cd678701c35de18bc1b20467940d830202e7fb1bc66 SHA512 fe5bb0fdaf098c98efdadf9aa106f30850e382dd7910647c335ebb7fc6f195940210e766c041c2a5bc11421bb3ec0127e5b59d845dff8ca94e799511a495457f WHIRLPOOL c01241d0f785a54f1e0809099c43c72fd277753325b03c807ed3f0b6a0937070eb1654fc69a46c3ce680c465abc3d431eb5ad087bad0ec1d32a8a9cf0c747c6a
+DIST pytest-html-1.16.0.tar.gz 23271 SHA256 d973b5bc997f117bd55314d01f6e19433f06a4c405530aa7826481d03b778536 SHA512 ac79122e3cd5704d297030422181414704dd681e695ab6c71d2e569958a4b83216211064a842b11dda19d9c05689bdb39fe51d64f3d6169a305c6eac8c702afd WHIRLPOOL 6e62559e223249dce4ac9f906db3969bb807db6fb7f09b2faf5936c70d5d934368ac3b771fa6427809ed0c5ebd81fca41867e497a9538b425ba67a9feed1673b
+EBUILD pytest-html-1.10.1.ebuild 728 SHA256 536db1c47e18be2a2f6a69c8c60bfb875d026a1565e6af3da8ae36d2a440d7b7 SHA512 84f07fb2a59b565caa9e9d4aaaf65f6fbfb439a25b83687830728e5c22e244b86c7ced3808f113abeb1f873c2f3f87c1c12a8bd61d21a5b8c303b9c0c2424652 WHIRLPOOL 74e6e921cd1fff19446c2bb0cd3f8d1191c2c806fa1426be10717e428848eb24c05ffeaf09301a904aa36c1010783535b445f0587e25ad61cd4777cee04d458c
+EBUILD pytest-html-1.14.2.ebuild 790 SHA256 44034f5f28ef18c5d60b1d7cbc788e239cb1d4a32b9c8a5bf5b6121848afd31b SHA512 4856d5760772241c6ec4582f48b50fc036dd4cc6739921d84a0a33f6f76851e042c010210e26f4526a6760e445f793d547fbbf160fb1960145dfd57dbd2f3447 WHIRLPOOL 3d6e6cc9a6b60a1f9ca083d8eefdc7acfadd43c11c08bd80b0951766719de18b42a43a6208cdde20e2e9e58952b36ee0fbbffc16237c8728b747e03fedd14480
+EBUILD pytest-html-1.16.0.ebuild 790 SHA256 44034f5f28ef18c5d60b1d7cbc788e239cb1d4a32b9c8a5bf5b6121848afd31b SHA512 4856d5760772241c6ec4582f48b50fc036dd4cc6739921d84a0a33f6f76851e042c010210e26f4526a6760e445f793d547fbbf160fb1960145dfd57dbd2f3447 WHIRLPOOL 3d6e6cc9a6b60a1f9ca083d8eefdc7acfadd43c11c08bd80b0951766719de18b42a43a6208cdde20e2e9e58952b36ee0fbbffc16237c8728b747e03fedd14480
+MISC ChangeLog 318 SHA256 4c5aeffd7c8fab7b14a6131102abcda42607099cace0f882ec9da2fbaa8973a5 SHA512 ac7b1797df29ace695174db9754c97fe90b46e2051916ecffe4459d3390c29e9e825c425ad6fe5fae4668baddbeac72da2f2dd920c5c33e81584670d440a5590 WHIRLPOOL 458bb268ac3302847b60a489c93e3c89aaae384f11b04d532529de5cb00ebc8e4db0b24aa4e29a67ead75fea722946f321a0798eddc0fbbee88a9f1f3f092d84
+MISC metadata.xml 354 SHA256 6a0bae2cb9cb4ece85d6454ca367c409fc4c2e5a14acad5fe8849d45554df778 SHA512 196fd5d73634e0dfd0c33c4c26d82b1dc8cfa905414d201c806a19a8c82254d512c31984744a7978a39903391844700745b45e25f2a762c8a9bbf203b839ed57 WHIRLPOOL cb757676926fc2e9b6abfe45e2e64083d9efeff1214724049c65ff76944f22b4b1b583a33c7e672c04e7c7315e3b7e54426481966b2af2cb3b2bc57f3d457c5e
diff --git a/dev-python/pytest-html/metadata.xml b/dev-python/pytest-html/metadata.xml
new file mode 100644
index 000000000000..20841660910b
--- /dev/null
+++ b/dev-python/pytest-html/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">pytest-html</remote-id>
+		<remote-id type="github">pytest-dev/pytest-html</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pytest-html/pytest-html-1.10.1.ebuild b/dev-python/pytest-html/pytest-html-1.10.1.ebuild
new file mode 100644
index 000000000000..d78e29b90e31
--- /dev/null
+++ b/dev-python/pytest-html/pytest-html-1.10.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Plugin for generating HTML reports for py.test results"
+HOMEPAGE="https://github.com/pytest-dev/pytest-html/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# Lots of test failures...
+RESTRICT="test"
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+python_test() {
+	PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH} \
+		py.test test_pytest_html.py || die
+}
diff --git a/dev-python/pytest-html/pytest-html-1.14.2.ebuild b/dev-python/pytest-html/pytest-html-1.14.2.ebuild
new file mode 100644
index 000000000000..339c47814df8
--- /dev/null
+++ b/dev-python/pytest-html/pytest-html-1.14.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Plugin for generating HTML reports for py.test results"
+HOMEPAGE="https://github.com/pytest-dev/pytest-html/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# Lots of test failures...
+RESTRICT="test"
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/pytest-metadata[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+python_test() {
+	PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH} \
+		py.test -v -r a testing/test_pytest_html.py || die
+}
diff --git a/dev-python/pytest-html/pytest-html-1.16.0.ebuild b/dev-python/pytest-html/pytest-html-1.16.0.ebuild
new file mode 100644
index 000000000000..339c47814df8
--- /dev/null
+++ b/dev-python/pytest-html/pytest-html-1.16.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Plugin for generating HTML reports for py.test results"
+HOMEPAGE="https://github.com/pytest-dev/pytest-html/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# Lots of test failures...
+RESTRICT="test"
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/pytest-metadata[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+python_test() {
+	PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH} \
+		py.test -v -r a testing/test_pytest_html.py || die
+}
diff --git a/dev-python/pytest-httpbin/Manifest b/dev-python/pytest-httpbin/Manifest
new file mode 100644
index 000000000000..2bd6924bf3fe
--- /dev/null
+++ b/dev-python/pytest-httpbin/Manifest
@@ -0,0 +1,4 @@
+DIST pytest-httpbin-0.2.3.tar.gz 9498 SHA256 c5b698dfa474ffc9caebcb35e34346b753eb226aea5c2e1b69fefedbcf161bf8 SHA512 f3c4eb67d1b02c27d8edb42622793fa3604e3f0bd5086e4986b8f0402a9fb8d7969a466be92fc6a7e301e829dbeb300183b40dccc9ec5da1d158cb4d08274f8b WHIRLPOOL c7b4c1d4955389d180474aae59ad1ab3d86e1f81f84fb00fecd562c38a2a27cc741562a4f78fe7691fe978533dd8fbfd2c1b5da1a205cb996eea9bdc090c0072
+EBUILD pytest-httpbin-0.2.3.ebuild 876 SHA256 145c983d00a718781029afeec7e51841a5854925b47d9d554e9f0ab5850bd9ff SHA512 b8a9c42316f982c00ac06369b4e4e3b692997f56bbe325a1e1169b3341d1152a79238d1a8c8e7b6ef0883f0d1c23ad0fb0d46041399c0272d1a946effda6a5f8 WHIRLPOOL 8a37ece1f75d95f3b9e77b64897f0227fc5ba33a69e81d4fa53f0b1347d5a090d9f1c75acee6ce37e9e2f02a2e49ec9ee5e3a24ef304e895abd3effea6879565
+MISC ChangeLog 1791 SHA256 033c9c6c26b75e17383af46544c3c0224eaf6068743ff47ea22aee1c83a90444 SHA512 9e6f90f62ca693ad703bf323117db1f9d32dd7cf277cc3afc00c3750c5df884dbf8eea160d9308b993c930abd2354eea851c04089afd53f5b906cf6f47f5e4ca WHIRLPOOL 178fed95487014e26cd7a261a9795c84066289b03de5a8505da5d1fff2e0a5dca784db5668b2b795622b566168cb694e2d1290bb2d42ed4a1d4ca55a7eafa4d3
+MISC metadata.xml 521 SHA256 061b0b68f78a4ccd3c70906b4808296f0661fefc62ee1e5c208beb830133686b SHA512 19e78d9a8706ad253eb0f7873f0e8bf308065d4cdcafc6d2ebed792f31f526c1d4c45bd2f7aecac338bd30c4ebda33b301b056f3075c11231b8d0d5ad4e77d2e WHIRLPOOL 7e66d06351a4de0be5c4adab2841335eda8f7638fad59f4719427e792987bdff65802382fbe32aa7f7bb73404eb58822d0a2b1212317849c7f73e1bd7023ad07
diff --git a/dev-python/pytest-httpbin/metadata.xml b/dev-python/pytest-httpbin/metadata.xml
new file mode 100644
index 000000000000..a488ff2722a6
--- /dev/null
+++ b/dev-python/pytest-httpbin/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pytest-httpbin</remote-id>
+    <maintainer status="unknown">
+      <email>me@kevinmccarthy.org</email>
+      <name>Kevin McCarthy</name>
+    </maintainer>
+    <remote-id type="github">kevin1024/pytest-httpbin</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild
new file mode 100644
index 000000000000..70b44d52dda4
--- /dev/null
+++ b/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild
@@ -0,0 +1,37 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Easily test your HTTP library against a local copy of httpbin"
+HOMEPAGE="https://github.com/kevin1024/pytest-httpbin http://pypi.python.org/pypi/pytest-httpbin"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/httpbin[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+# Not includd
+RESTRICT=test
+
+python_test() {
+	PYTEST_PLUGINS=pytest_httpbin \
+		py.test -v -s || die
+}
diff --git a/dev-python/pytest-isort/Manifest b/dev-python/pytest-isort/Manifest
new file mode 100644
index 000000000000..9d9108ee3486
--- /dev/null
+++ b/dev-python/pytest-isort/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-isort-0.1.0.tar.gz 5502 SHA256 e92798127e21d22513c62070989f0fb3b712650e48a4db13e5b8e8034d367cfe SHA512 86c964b6a998a32c9c474dde0a9400c45da8b26f3e8dd6f4092baa4bf1978a7f67a384bd910ec824f85a8ab49b4ea30967e1e7f908a31619ee88391d3505440b WHIRLPOOL 2cf95b1586ee52ee0f8df44a4a9a6e1ae06fd75dcbc572eab1b7c773c4632f23f5f3e11347c32b9aa67258b433670205dd5102e29d2b6886e94452db9c9e931d
+EBUILD pytest-isort-0.1.0.ebuild 661 SHA256 769988d69563f6811e1dd0406eba42a33cce73da8ed475e32dee865dca405aa1 SHA512 6dff0f4a965a2517b9b0735ea5c1eacca08f5acccd1cc6c0c4a441fcc7b7a116f712cb440d44fd3ef87cba9a7a5844f09cfd7ceb39036cdfbcba1b997f32d1dd WHIRLPOOL e5ee2b4d5e1c07e880297a17635ba370889eca824917753a221bd99a91cb001c4c20d95d55545f38780e37a5ed45655c9137fd40b5ec37c3a209b9c9d9dbf20a
+MISC metadata.xml 505 SHA256 2be385e29f3be6ad3e0d3c0c9637f128d39f0cf3042e647877e4a377d18d86c8 SHA512 3d77c078c21bbc18af28a19cb1d69c9277bcb1fcdcab004b21d18e715242d0d8e97aa05ebb2d232dcc2411cf068ab40ed36728d56f21ec4ba200319012e94fa2 WHIRLPOOL 122ea1230d1cc25a5febf5fa3ff65d0b05477b21dd9273fd2854ad2d2629c31b2654717c40714103abac6a034b8d25b2ee72e0f2f0ac91dee913328cd3310a74
diff --git a/dev-python/pytest-isort/metadata.xml b/dev-python/pytest-isort/metadata.xml
new file mode 100644
index 000000000000..663b809a46e4
--- /dev/null
+++ b/dev-python/pytest-isort/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>titanofold@gentoo.org</email>
+    <name>Aaron W. Swenson</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pytest-isort</remote-id>
+    <remote-id type="github">moccu/pytest-isort</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild b/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild
new file mode 100644
index 000000000000..d0c9bc036a4d
--- /dev/null
+++ b/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for isort"
+HOMEPAGE="https://github.com/moccu/${PN} https://pypi.python.org/pypi/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/isort-3.9.6[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
+	>=dev-python/pytest-cache-1.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pytest-localserver/Manifest b/dev-python/pytest-localserver/Manifest
new file mode 100644
index 000000000000..7414861d2aea
--- /dev/null
+++ b/dev-python/pytest-localserver/Manifest
@@ -0,0 +1,5 @@
+DIST pytest-localserver-0.3.7.tar.gz 19772 SHA256 d828d79232456d0b4eb863e9de2c85699259f436a3185e39d0d5001b8c8521b0 SHA512 48d7e6a27965dafa1d5e5af1efb6118cc1c1c28ac4a46ae2d61b6b804292a126f481295bf13976f66f505789238f3365ff16e6f1207c8bc7fb4b258759fd4d99 WHIRLPOOL e1e77dfa6151e476fb7e38686282ae14fe100b23d1226a1d51464818bf0d8529857d61d5ac63cfa6ba05e9a0651861c3c65167c083f7c9b86aca74ca81ae38fd
+EBUILD pytest-localserver-0.3.7.ebuild 664 SHA256 23a74c5c1d220209587bcea71f370dcdd3593704f2fb328726bae26dd1cd52bb SHA512 83abc98df944055223bd61bb772567e703d765a79c32de52fa939801771f2a25d27711a2e34c318253cce8ed890859c912190ada5f68103280a4ef5ebd7d5e33 WHIRLPOOL 6781a5d0d149901c5d3bb587b7492d0e9d499a3af70e369d60a433497b488e7e0428bc4e4e4bff68396306acecddeec67b88a1a512ea4d2d3b0b3755f7e8feec
+MISC ChangeLog 3028 SHA256 29c708eff89dff97748db214b3b750bec5eefae72adb2e20dde273c2b8b92e54 SHA512 6689554791b8e06dde3fcf33ba342fedd957b05e488fa78d6afb6674f19d65c386a9b07b22c96738905a3eed4c32ef38ae064fc350bce2207e72c4eefb0fa0c2 WHIRLPOOL 769618810ff9ada9c432928a71c08856b3749b03ba1c08f01010e525abdb2857bea9ba4786e0d463ac25571a383799dd073daf29dff8826c331062b2ba3c59ae
+MISC ChangeLog-2015 494 SHA256 19f846b65877ac507f45e1a851e255782a4281ec60489cccc119ce6b7ed8e6e9 SHA512 833f5fe43c90d972fd2631e6f773294d0756c7acd85c40a9c7751da60691e1d5b2913259630f37c9f55ac1f6cd82e4e13234f817012d0fcb303c11d9e59a02e1 WHIRLPOOL 4fcffca2bde69445829a87dc0eed1933f45d3d344c78b0ca0c9ff9a3fca1761ebc697456dd6478eb80327b8b6eda42d6626f10711c5255cfbb0d54306bafcb91
+MISC metadata.xml 321 SHA256 02bc736d7f39d19210ab0da9986b471a8dd19ff3dcbe1705e228548012275d3b SHA512 db2e0fe334587804689d91759326ad5dabf3aad411c9046943562273f89485b1524b0f62173c9bda2daaaab2e0d09309d23896e91b3e2716e36472c87bf5f883 WHIRLPOOL 2ef300cebf01462d68c3b513dcf950bbc8e0b7b498b06194e5ad21d89877eaa1138e10bdbf72e85ef93956cc079db183ec752ebf4c4c6cbf5730bcdb2dcbf2dc
diff --git a/dev-python/pytest-localserver/metadata.xml b/dev-python/pytest-localserver/metadata.xml
new file mode 100644
index 000000000000..1dd74dd642a3
--- /dev/null
+++ b/dev-python/pytest-localserver/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-localserver</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.3.7.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.3.7.ebuild
new file mode 100644
index 000000000000..61c8ba3e2572
--- /dev/null
+++ b/dev-python/pytest-localserver/pytest-localserver-0.3.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Py.test plugin to test server connections locally"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-localserver"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/pytest-metadata/Manifest b/dev-python/pytest-metadata/Manifest
new file mode 100644
index 000000000000..b1186c2b34f9
--- /dev/null
+++ b/dev-python/pytest-metadata/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-metadata-1.3.0.tar.gz 4604 SHA256 2aa89161636c12418b2f8dfe226b6007a50ce3570f2b09fe23d72506fb21a3bc SHA512 94af4defb1115d87fc456db80dbe16da01662d0b87325e433d4d1b30f35f210b7750bbaba091ac73d158296070c87054ce9f4c0687dfe5dfec3f02df56261d98 WHIRLPOOL 26ddc6255b5c68c90f0e1f4fed50abe3e5721e5d764f9f757907215b554e0aa53dae36bdda74d04c2bc2750b994195119b144764b5b52caadc9e5af55d411d8d
+EBUILD pytest-metadata-1.3.0.ebuild 635 SHA256 e9720d42bff61cd47aa4bb6792ba7e55fe3dd58dc24f8ac1b60defd9ca5b3d0e SHA512 7b02194a76629f3f727bbbc2062b6f3fd849cef997c20c0105af5e2e885d7c0e462b383e180350f58027a382fcc5990580b57616a6e1f485139632304e844da6 WHIRLPOOL 289baba3f1ee2622206c2ce983db642b55a008420dc73b5b3b0b6f4d68762f2246dd117fc21567bc83de708e7f646e719bd53317bc316ef49b0f141e4cceee61
+MISC metadata.xml 382 SHA256 595944ca2c1784a6ac928acb829c10658160cb1a318109b6a0de43704ddec07f SHA512 23e048f97fdf324b3b77a05a4245d4f8e29fcf430d029c8a1a5df002e8e447ce4bb4f422a1a401131600511c0252e4003f16236addfd97d593c27ce8c0621a05 WHIRLPOOL b4d51a59c8c0f88fa6672f55fcda5c0ae4c4af907954111ffd731ecbc907a8858916e5e1966a44177132e0c33f61814b4abd76388d8506f7cadd6aa2b1bc0667
diff --git a/dev-python/pytest-metadata/metadata.xml b/dev-python/pytest-metadata/metadata.xml
new file mode 100644
index 000000000000..974ed90410c2
--- /dev/null
+++ b/dev-python/pytest-metadata/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-metadata</remote-id>
+		<remote-id type="github">davehunt/pytest-metadata</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-metadata/pytest-metadata-1.3.0.ebuild b/dev-python/pytest-metadata/pytest-metadata-1.3.0.ebuild
new file mode 100644
index 000000000000..9b9dc1e876f3
--- /dev/null
+++ b/dev-python/pytest-metadata/pytest-metadata-1.3.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A plugin for pytest that provides access to test session metadata"
+HOMEPAGE="https://github.com/davehunt/pytest-metadata/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND=">=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
new file mode 100644
index 000000000000..a5de01a68bc4
--- /dev/null
+++ b/dev-python/pytest-mock/Manifest
@@ -0,0 +1,8 @@
+DIST pytest-mock-1.2.zip 19461 SHA256 f78971ed376fcb265255d1e4bb313731b3a1be92d7f3ecb19ea7fedc4a56fd0f SHA512 9b87c72e9895a16d4829229a070ba2b8143be894dfbc804b1e882eb2cc5843d8da9db258b5a2b9f8ae6738d9d612dbf1bec16790c5f99c27d9f7554cb676f852 WHIRLPOOL 470832b4df4a9392b0cfcbba96b2a52379d7111af0236f5dbe4e22f4e303da248bf2f936b3b66ae0ff3a197f3c87b0419c54c115fe5c6543e255f11666d3031d
+DIST pytest-mock-1.5.0.tar.gz 17199 SHA256 782f23f227874bac4cee878637c2af8efdd2c34c48fcbf9e79b00a0872056ffb SHA512 5b5acb3ae3040d37768692a5289be269d8e12a6188a2dddefb136bdb99f847bedee525d59ac49886a6a27032b672e442ee256410174777675bf92fc82505f807 WHIRLPOOL 7c9c2617944dbf02cce356d12650d89372db252bdf79b92db304bcb1337858a38ae4b9b640210190338feccf4de0cbd64ad1a2d7ffc411c9184e1cd09dd7ec17
+DIST pytest-mock-1.6.0.tar.gz 17780 SHA256 83a17cbcd4dbc7c6c9dc885a0d598f9acd11f2d5142e0718ed32e14538670c1f SHA512 c3b897be9156d57d7012e95b620c543500b849d7076224e3328d3783311210c57141dfb82c01bb98e5e419125dce0f68f6631bd610f4909f5ac1798458a7949f WHIRLPOOL 518c8732f722547a0a87f0e1dd4cf8c80272f4a62f238d5bb16766fe0340c8fc022e409f58e6aa8ed7cb17b33fe160574db199197c0466701fa7e7a668fb5116
+EBUILD pytest-mock-1.2.ebuild 796 SHA256 74fd452ae9f6d9ba20bf292bd0be6aeb465b7ba0c5ab49c60d234f1e9b86a0cd SHA512 8aea21fa51730a6cc912bee6666c649aea6ec7425f49b45958e67da8f49920544b0649e987fa34d0b54a24bb93ee54f93bf05f9609acc7106c1072ada97e65ef WHIRLPOOL 25c80cb868eab7bbfaeef0227b2fa16d190cc841c59aad0d8aa73fa25c28fc5d156817901f2a88b8da84678a895ce92a18cfe2d27ee8e32bd4bacf3341dea1cb
+EBUILD pytest-mock-1.5.0.ebuild 1055 SHA256 1fc5f352976e6289f53c80c9231640c9d9709d9413c3efd3d4af0878872cb3a7 SHA512 67428d7a2be06c3de4103eb6b9f6344f87c27e13d38809ce3215e4d1352c74c251975816a3983af45f4b22071d7fc3959c26923d49db2296dc7c3a411ce5f1f8 WHIRLPOOL ae2bbf6eaddb788067adb462a38464975a5a22dea3e6d1d6cf409e211f8435ac2258666852bc31ac3fb004300d38bb99c365318f460f336a7a4b723ca4e071ee
+EBUILD pytest-mock-1.6.0.ebuild 1060 SHA256 4aa1a30e02ae2ca174f61aa6eb9e249e69db85cccd7892eb552606eea13cd437 SHA512 2c5d6dd6c9f3460bfec3f5dbe51d1e65957025d6c54a5167e6223b7703244ac2bb358cec539d0f6e7ab587b5e48a6bad89d9c52778d8096062d68a18d81a5c36 WHIRLPOOL 0de88c20cd03bfbadae426c3ce5e8d2cc67c1ef5d4dad6b6e06ca824b14c52e1962b76284c3a914d93e0dd2c4ed2161be951d55baf2b126f8c84e7df250f0a8c
+MISC ChangeLog 312 SHA256 97cf1df2daf23cae8b1ae0dc66ddad9fdcd16dc73b666d2e9de3c27a30b69f62 SHA512 db44b605f1fc76018824eb1ec5df5eeab336dad4767b071849849aa3006e6534488f0588b9cc4979c142ea9cc2175ac17b963476e1eac4705d133e31539199ad WHIRLPOOL d9f281985bc5676d3c0735ce42d8b0e54f1ff7f611613378c4696ac82886a035a40f1783ddacc102ab6efce2063121f988007e4d352dfba4d5112a7e32a3e333
+MISC metadata.xml 354 SHA256 e083a9809968a19c662d955492e0e251df5a8e868ebf4fbed9b8791aa55bd229 SHA512 83a168d22f4d604827aa42966ccd1b99d53f069cdfffe69b29fad8f13c4959ff287915c0fdc29e53ce2c3d5625b4f4620861b927571dc91c93ac199a5985a3da WHIRLPOOL 2d5ded63d065fd8687cf0a52115ca71fb28faa2a3e1db9fba6c4b0d2b8b4e7b1a4a72674c522a1d0d1ec8528088d9db2cc6a0c528677a9780e7ebc45c1b2fab2
diff --git a/dev-python/pytest-mock/metadata.xml b/dev-python/pytest-mock/metadata.xml
new file mode 100644
index 000000000000..6c61486a96fd
--- /dev/null
+++ b/dev-python/pytest-mock/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">pytest-mock</remote-id>
+		<remote-id type="github">pytest-dev/pytest-mock</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pytest-mock/pytest-mock-1.2.ebuild b/dev-python/pytest-mock/pytest-mock-1.2.ebuild
new file mode 100644
index 000000000000..2dc05b0a31ce
--- /dev/null
+++ b/dev-python/pytest-mock/pytest-mock-1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Thin-wrapper around the mock package for easier use with py.test"
+HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
+	python_targets_python2_7? (
+		dev-python/mock[python_targets_python2_7]
+	)
+	python_targets_pypy? (
+		dev-python/mock[python_targets_pypy]
+	)"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH} \
+		py.test test_pytest_mock.py || die
+}
diff --git a/dev-python/pytest-mock/pytest-mock-1.5.0.ebuild b/dev-python/pytest-mock/pytest-mock-1.5.0.ebuild
new file mode 100644
index 000000000000..32941be25b3c
--- /dev/null
+++ b/dev-python/pytest-mock/pytest-mock-1.5.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Thin-wrapper around the mock package for easier use with py.test"
+HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
+	python_targets_python2_7? (
+		dev-python/mock[python_targets_python2_7]
+	)
+	python_targets_pypy? (
+		dev-python/mock[python_targets_pypy]
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	if has_version dev-python/mock; then
+		# test fails when standalone mock is installed
+		sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i test_pytest_mock.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH} \
+		py.test test_pytest_mock.py || die
+}
diff --git a/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild b/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
new file mode 100644
index 000000000000..0d8b032e8541
--- /dev/null
+++ b/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Thin-wrapper around the mock package for easier use with py.test"
+HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
+	python_targets_python2_7? (
+		dev-python/mock[python_targets_python2_7]
+	)
+	python_targets_pypy? (
+		dev-python/mock[python_targets_pypy]
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	if has_version dev-python/mock; then
+		# test fails when standalone mock is installed
+		sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i test_pytest_mock.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH} \
+		py.test test_pytest_mock.py || die
+}
diff --git a/dev-python/pytest-mpl/Manifest b/dev-python/pytest-mpl/Manifest
new file mode 100644
index 000000000000..8019ae393703
--- /dev/null
+++ b/dev-python/pytest-mpl/Manifest
@@ -0,0 +1,8 @@
+DIST pytest-mpl-0.5.tar.gz 112523 SHA256 fee0da4a81e2a3e966cf6488a6bcc81a144688e145048ad1f66799a25135dad3 SHA512 9056982403994572a33c861ebe0d7bbcb48579ef95f7cf93f716f06510fa09c187a8daad0ed4a55667444b74461a5a02d7f9217d89de57f3cc10116c88aaa662 WHIRLPOOL 4416015f78113bcfc74119a8a04fa55385e496395be9af2e7bcda317ac846744e0bf1221e18eac28efdc5a2b5a5305b2eaa25eef4c8c1051e1949702e92768d6
+DIST pytest-mpl-0.7.tar.gz 243763 SHA256 cc975b5b905826bd1a04f780ca4a3309b309e5f5eb7824c2cf9252ee878668b7 SHA512 90cb30b21286a87fbb08286ea80ec8278cffb7cae4be626bac2712c056f75e497767a425b1b657387bfac107ece6cf3035e4ff3d5676d85bc9dd327feb739063 WHIRLPOOL 238528e8d206f1d57968946e89c9727dafea2b5e9220ec6a57ad25b867c16d20ce4ba9a3c0cc654e54e1c79fe457f551123b47d1bbc3705fe78d2d8a165149bf
+DIST pytest-mpl-0.8.tar.gz 194633 SHA256 d8c67a781cfd011fd9f20cb5a957f62701afcc5b44685c98369e1c22df960ccd SHA512 4f5f1316d0f545383b9125281b91d9077b52bfa7d91b4eb2f64c6f9642b1abe86c52c9b88171a521d806e579ab9279f49d1405b3f4fcae58a9e75ec5518bacca WHIRLPOOL fa0aae95a7ec0abcb2782d2fe5fa98eb31e279077143c66066a4783242e6b5c9b79b5b5ff32affd41baed1f53c42e0948032dd4acc9a38c8ba81c3a76da225bc
+EBUILD pytest-mpl-0.5.ebuild 770 SHA256 edd3aa318bb0f6432cb190a9ec1c0bc5e2a3ee2f7784e6e52b646c39f510cafc SHA512 63e3a4b1569be7794e4bafbe6c466cb6c5e5ab6795f530a7d3dad0986439b01aabeb0f8688303266694930f25762de450d846924cc31121395e6aae445556959 WHIRLPOOL 5ba1e5373f74d64c1cf9e09396d9dad279119594d98644d5e75cf0672d87cb785e5bca75178579e927d0624da454338f5073850fa4b9d6d464fcf914e0d081a3
+EBUILD pytest-mpl-0.7.ebuild 773 SHA256 e92c7e7af5a0eae6d745600e2a665147356d0d485e9c4daf1260fced1b934b6c SHA512 5fc07128e7dc31596c01c0709a377a3ebed2bde8f2a31ec50b924068a24a6b3f6ea82b4ccebbd5282bad22f683703ed5844c5f60c3d1544bd9e094b923010fb2 WHIRLPOOL 94243fbe8e556001eb41b18259067ee94b5b009b30b4687a4fe7966af10457b1767ed6f7b3e750cd0b70e395829ef479c609c9c0390722568f353cb8f96bb245
+EBUILD pytest-mpl-0.8.ebuild 785 SHA256 6880570a39938e9121e275bd68d178c8bd86dd68eeb0e0a9f6ae05a2ab10fc9a SHA512 79084ee11406af61338d478bef8626003cdce333c932dba35b2ed6d4a565ede53d7d2db881e0090015998912db964467a9a22c6645f2d294824349ae2881f13d WHIRLPOOL 14859eecd00d24aff7a0a88727cf723a54cf2facaacc5d5184b3fd3eaf1d5e4a3c296c5e2e2a20cc69b9b26594ce9f4b9d15f6cec1c40b4e539bccc9f55dc9e1
+MISC ChangeLog 320 SHA256 559e27551cc5c1720174db46bd4157092208a893f1e5947d307f88bb98bae9e3 SHA512 ca262f3b65b818a8c03fd38b1fe98e2c4436ebe3e022dd228cc2b4463921af70bca0bca7022e63bd9361c56c341a96a7474b312cdaa7f316ef1a793f318e3059 WHIRLPOOL 754329951be685f65bdbc82c0bd5a931e8bcf7f233c18054083c241ea32d4d5fbe5c920a7ced9de4744b928ca7543be1e5c6675088b5fdbd35a19328719747f6
+MISC metadata.xml 521 SHA256 f7796f8adfa13f10cf90e6f791ba78ec58f27b7b59c5c7a608a9d9c98d25fb2e SHA512 5b8552f0e0a0c96577e14c8ec98bbdc0f1577d7d25cc41a2fc9d173b0fb45b4c74a9bd66e6357f665c0947c237feceb2d276ef3058046054598804acc6d4430b WHIRLPOOL 57d73030a6c5738e8034ee605359525ec00cfd438da4bcf34d0f5c719de38849f7ac5d3f1def56361efddef55ef4eb25993920febf401dc05ea9dd7c5142f12d
diff --git a/dev-python/pytest-mpl/metadata.xml b/dev-python/pytest-mpl/metadata.xml
new file mode 100644
index 000000000000..53dc3963e0d4
--- /dev/null
+++ b/dev-python/pytest-mpl/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="pypi">pytest-mpl</remote-id>
+    <remote-id type="github">astrofrog/pytest-mpl</remote-id>
+  </upstream>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    This is a plugin to faciliate image comparison for Matplotlib figures in pytest.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-python/pytest-mpl/pytest-mpl-0.5.ebuild b/dev-python/pytest-mpl/pytest-mpl-0.5.ebuild
new file mode 100644
index 000000000000..902888dd5f7d
--- /dev/null
+++ b/dev-python/pytest-mpl/pytest-mpl-0.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1 virtualx
+
+DOCS=( README.md CHANGES.md )
+
+DESCRIPTION="pytest plugin to faciliate image comparison for matplotlib figures"
+HOMEPAGE="https://github.com/astrofrog/pytest-mpl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	echo "backend : Agg" > matplotlibrc || die
+	MPLCONFIGDIR=. virtx py.test -v || die
+}
diff --git a/dev-python/pytest-mpl/pytest-mpl-0.7.ebuild b/dev-python/pytest-mpl/pytest-mpl-0.7.ebuild
new file mode 100644
index 000000000000..5c48b37e1a87
--- /dev/null
+++ b/dev-python/pytest-mpl/pytest-mpl-0.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1 virtualx
+
+DOCS=( README.rst CHANGES.md )
+
+DESCRIPTION="pytest plugin to faciliate image comparison for matplotlib figures"
+HOMEPAGE="https://github.com/astrofrog/pytest-mpl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	echo "backend : Agg" > matplotlibrc || die
+	MPLCONFIGDIR=. virtx py.test -v || die
+}
diff --git a/dev-python/pytest-mpl/pytest-mpl-0.8.ebuild b/dev-python/pytest-mpl/pytest-mpl-0.8.ebuild
new file mode 100644
index 000000000000..866279f7b950
--- /dev/null
+++ b/dev-python/pytest-mpl/pytest-mpl-0.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1 virtualx
+
+DOCS=( README.rst CHANGES.md )
+
+DESCRIPTION="pytest plugin to faciliate image comparison for matplotlib figures"
+HOMEPAGE="https://github.com/astrofrog/pytest-mpl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	echo "backend : Agg" > "${T}"/matplotlibrc || die
+	MPLCONFIGDIR="${T}" virtx py.test -v || die
+}
diff --git a/dev-python/pytest-pep8/Manifest b/dev-python/pytest-pep8/Manifest
new file mode 100644
index 000000000000..44ec06b795ba
--- /dev/null
+++ b/dev-python/pytest-pep8/Manifest
@@ -0,0 +1,5 @@
+AUX 1.0.6-MANIFEST.patch 178 SHA256 5f8d9883f3252a153d545982479cb68c5060cca63fc4f0899cb21c87c5b81a45 SHA512 f63f80ea3ed7bf9241a029e4cfaae2e41ff9553effee7a85cd492cb3b57d9b54a17e684896be443ba5df08be1d07625c4e6769d9cab9dff952f10eedb92ca1cb WHIRLPOOL 84c8482a918a43f990cac633c6bdaae2219ea169f06978fca8a00754ecd28aa13e250fbee704b819a29d2892fdf02377438017fa8927542424a68e9b9308cb95
+DIST pytest-pep8-1.0.6.tar.gz 7271 SHA256 032ef7e5fa3ac30f4458c73e05bb67b0f036a8a5cb418a534b3170f89f120318 SHA512 162d9e25c264ecd82a51c6798ae75493c724a847ad8cdd953225f73e587f9a14298a6281e541695f6e7471a6121e9b0e4f694270f45ead851e392efcd7aeb758 WHIRLPOOL a1132d582b1bab47e3cf61d46111c1c2a59acf0d9a4858153ad0618c3eb514fee6f4ef23dd3b1b5c8d3b7573fb3493ec577e67d6834b0bb3dafa8655fb9ad926
+EBUILD pytest-pep8-1.0.6.ebuild 718 SHA256 9dae297504d98ffc10ff5e57d275e75bcbc5e26db4b2869c5c51678a6dd879ae SHA512 1f6ed65dced97510ef2d9c4d0bbcddc0eea62e7c073c41bd14aa223a913dab00bfb89bf2b5eda6f6c8138b563dfa10d33c5176d0c2773036ff90b13777d45265 WHIRLPOOL fc5e66c0738ab28813d725d825804c20c3631822fc21026c41c82301985d11275a3e0b017591d87897de3a4ac9f2995275ae53f0c58e070c828808e8ac150904
+MISC ChangeLog 327 SHA256 e7896bd5bc0566b4d9f0e348777289e9c779692b62df075eac059601a43d396c SHA512 8629aaf952af354549c97736558f7d548b7d1b4e638615ea7820d4e06d3f0cdc04238492f7ca5cf0c9d9671ec2c31ab5be934a35bf0b967ad32469b669c7d8bc WHIRLPOOL 4356fff3550610067239ae19fa437bc61175197bdd4e458387e4e4cc83ab9839b3fc9e702638a6f91cc1c22fcd0081cb78246ac20c351092732678942f1fb617
+MISC metadata.xml 324 SHA256 7ea8c566c255845ba519d268aafeae92cf3d7aa30196a8be072c5d0ff67964da SHA512 3622d9663e7966ff8a566971b51f886be021d2e58254836d3c5dfa62e5001289d8d9beabb3f980af243a91cbfd527a076db628a1b29fb6562041a88cbc617b59 WHIRLPOOL 0d929a33b783271f55787dfa7c13db03fb0424f35f5c80c98b2ef61254040257ee3c917313aaace102627642b6a1b47b4682dd3de3ca3c2bac0a652c8ee8e7d3
diff --git a/dev-python/pytest-pep8/files/1.0.6-MANIFEST.patch b/dev-python/pytest-pep8/files/1.0.6-MANIFEST.patch
new file mode 100644
index 000000000000..3e9d2f20dcda
--- /dev/null
+++ b/dev-python/pytest-pep8/files/1.0.6-MANIFEST.patch
@@ -0,0 +1,9 @@
+diff --git a/MANIFEST.in b/MANIFEST.in
+--- a/MANIFEST.in
++++ b/MANIFEST.in
+@@ -4,5 +4,3 @@
+ include tox.ini
+ include LICENSE
+ include test_pep8.py
+-graft doc
+-graft test_pep8.py
diff --git a/dev-python/pytest-pep8/metadata.xml b/dev-python/pytest-pep8/metadata.xml
new file mode 100644
index 000000000000..d127354cc52b
--- /dev/null
+++ b/dev-python/pytest-pep8/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pytest-pep8</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild b/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild
new file mode 100644
index 000000000000..5d5ec11517bc
--- /dev/null
+++ b/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin to check PEP8 requirements"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-pep8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pep8-1.3[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
+	dev-python/pytest-cache[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/1.0.6-MANIFEST.patch
+)
+
+python_test() {
+	${EPYTHON} test_pep8.py || die
+}
diff --git a/dev-python/pytest-pylint/Manifest b/dev-python/pytest-pylint/Manifest
new file mode 100644
index 000000000000..67b72268a7ff
--- /dev/null
+++ b/dev-python/pytest-pylint/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-pylint-0.7.1.tar.gz 5648 SHA256 2378eecfef82afc90430fbd578f65d35f6b9cf59319d75f826d9bc30922c5b28 SHA512 e2a7802f90ea25a909094e8bc67570eb631d6ab6dc130bb5cca1738ae09d069b4fa6c3c1349d9d62188a924138e832a3a37c8c5c8964290c95d69eecbadbd09f WHIRLPOOL 848102ab28293954b140a635ec9f0f6b41d3eb591fe00bd665912e689143431b78564316a17b388ad6044c2f4e7caf5c6dda1b1a498e3a20e6959de2f8d55b6d
+EBUILD pytest-pylint-0.7.1.ebuild 1018 SHA256 d6989e62774d2aec92c445edf406822bd2e032624266a96fdea31ec078195492 SHA512 cedfae9fbee109770bfe4b6308261de3a0c38326b073ff8f0bf619ab972ad0792dcc0f630427ed5bd51333a590e79887295fa19f657bdf2dcb90aa633717dbd3 WHIRLPOOL fbdd0e0e62e1d27a0df2ff2342472def97bde588cdef3af87112da2bfde69faa4af6ad0fb8265dd9b1650cddb640b4bb90877b75f96958994a3f2e0a28d26230
+MISC metadata.xml 306 SHA256 cc89da061c6348aa99ef0466d345929d35f88221dbdf9bcdd3d614597c2a7819 SHA512 726037520d25c038ab6a35c14edce11561e281fcfbb6a505bf3ead4d474cb10606b715f95c6df95e22e97f20f840c1694bde08984f9211bc46b5d0afb46f1c4e WHIRLPOOL eeeb27d1de21a2a7aaea6ac44b02ba2d87343adbc8c7f5de6f4f73df1c97e3940d3327bc90569bf541bbba4ecc5bade86ac0fdc5f131aba7ffa5d0345b254b89
diff --git a/dev-python/pytest-pylint/metadata.xml b/dev-python/pytest-pylint/metadata.xml
new file mode 100644
index 000000000000..0e3bc0471a62
--- /dev/null
+++ b/dev-python/pytest-pylint/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">carsongee/pytest-pylint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-pylint/pytest-pylint-0.7.1.ebuild b/dev-python/pytest-pylint/pytest-pylint-0.7.1.ebuild
new file mode 100644
index 000000000000..d8c094245298
--- /dev/null
+++ b/dev-python/pytest-pylint/pytest-pylint-0.7.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin to check source code with pylint"
+HOMEPAGE="https://github.com/carsongee/pytest-pylint"
+SRC_URI="https://github.com/carsongee/pytest-pylint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-pep8[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# pytest grabs the options from tox.ini automatically
+	# but setup.py does not declare pytest-pep8 as a dep,
+	# so it's missing from env created by distutils_install_for_testing
+	sed -i -e 's:--pep8::' tox.ini || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-pythonpath/Manifest b/dev-python/pytest-pythonpath/Manifest
new file mode 100644
index 000000000000..4b5bfcce24dd
--- /dev/null
+++ b/dev-python/pytest-pythonpath/Manifest
@@ -0,0 +1,4 @@
+DIST pytest-pythonpath-0.7.1.tar.gz 1726 SHA256 2d506b8d7dbc2535a16c888211b7319ad32b3e73444bd9dbb1dd19427a6c7414 SHA512 313020c7b38b91079694759ca436e1f7129750372f3a0a567dc2934b093d178c4c64894c2283719b86877a5e359128e83bd6e3b17ded283631ad6747541b2902 WHIRLPOOL c9d84fc853e8fd8be266d7beff93995c27fac5ac0c55c888fcef6d974cb1e73b9450320e609d9992c0f80038b9c13823455e2d8be5cac94d75b12bbab31f5704
+EBUILD pytest-pythonpath-0.7.1.ebuild 577 SHA256 19e3758eac63d45fd6c6e6634d627398d6c0677d3c76aa9e3fd5c8b85293bbf6 SHA512 120d05243bb00790c8e21c7bf608a60d571b99fa8202b4f5c250489daed47bafd66a72c294a7a11cfbb4c17a2af91930efe5c9d43355a83439752f11cf9762f8 WHIRLPOOL fdfa4dba52dcee5be15e16955dfa38981503ee8aa178d8004502dac26cca200d6ac64d0c1389cc89407b45b3fd3d04b78d1ecafb10aaa6dc6f866bb6ff1a2138
+MISC ChangeLog 1329 SHA256 00bf958eccce71c270bc6f1c936acb4e292cf10ddeb77098a614fb9b18ffce7b SHA512 77d3b53f2268916678a8ccc5de0fd9ce9a2ed60454ab59830c06cca98a1d1a36111c060828585a5c36d707e7508c9abd379a554ec14fdebf1284efbe15b6f515 WHIRLPOOL 182e76192b651c3ca85f104d662d2a640e9cdfe4d2a72a3ff25d2d692b291afa39971b31a7ded129aecbc0c4be076cec2e4cc820b96ad8714e670b1ff60b4987
+MISC metadata.xml 386 SHA256 fd09f73f79a87d9f0c8491cf3c47738db838e1b37f43a9d110c0e6a393425a9a SHA512 2403e5bb6c4119ada573f3ac3df72494c11d4fcf23e2b6d64457f914bbfa3dc1128729dd7b5ffbd67974453a8d38d3a6fc791fcebd2ef31c6b381ed506eca451 WHIRLPOOL 8ae0bb42688d89cce9aafa9e066942d0bf1696130abe96f8e7049a564848f578e72e6ee5ef77510f2a1aa410b283b827b1df9fa2c696db7a95bc73d627d8d022
diff --git a/dev-python/pytest-pythonpath/metadata.xml b/dev-python/pytest-pythonpath/metadata.xml
new file mode 100644
index 000000000000..4b9f714e3d11
--- /dev/null
+++ b/dev-python/pytest-pythonpath/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-pythonpath</remote-id>
+		<remote-id type="github">bigsassy/pytest-pythonpath</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-pythonpath/pytest-pythonpath-0.7.1.ebuild b/dev-python/pytest-pythonpath/pytest-pythonpath-0.7.1.ebuild
new file mode 100644
index 000000000000..6db34836ac76
--- /dev/null
+++ b/dev-python/pytest-pythonpath/pytest-pythonpath-0.7.1.ebuild
@@ -0,0 +1,21 @@
+# 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,5,6}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin for adding to the PYTHONPATH from command line or configs"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-pythonpath https://github.com/bigsassy/pytest-pythonpath"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pytest-raisesregexp/Manifest b/dev-python/pytest-raisesregexp/Manifest
new file mode 100644
index 000000000000..3c967e16a4e9
--- /dev/null
+++ b/dev-python/pytest-raisesregexp/Manifest
@@ -0,0 +1,6 @@
+DIST pytest-raisesregexp-2.0.tar.gz 2474 SHA256 0fde8aac1a54f9b56e5f9c61fda76727542ed24968c27c6e3688c6f1885f1e61 SHA512 790de1dd7d8c11455829a1c5b19b93bd1108626b539cb539466f262702ebc3e0cdd954f47c6a3210f3b127870ea86ce47ab2c25814d62d503508f3ac96b1bbc0 WHIRLPOOL 0f7eca4584bc9a61fae8324635ee4be2575530c97ad7413ee090e76658ba358a6c44461f66afc905e29c1f52cad9169d4cdb15e78f7a3d19a978f97d157b9d1a
+DIST pytest-raisesregexp-2.1.tar.gz 3159 SHA256 06fffc525bb688e0823d0db8fd7d87f885067f5b08b8f1ab2e337a8f45a39978 SHA512 2d54413c3e5e1aa203738d5b1ad67cc478a0e57a5d5340908bee7d1da23702f52de45e6b7503b7122075733bde2b83080b20d563d4a485688dd889c7e1421130 WHIRLPOOL 70426c760060d4e10defab2694ae5dd5b6d229cad2919e487a72588b72438ce47c6c5098b3ada7570ca5d440be7d9a4c20b882e88068b6406e349daef2a176e5
+EBUILD pytest-raisesregexp-2.0.ebuild 660 SHA256 0caf0aa087f42dc044a117d0f557a946b95e900a03c3243f72cf084a7b73c794 SHA512 d8dab98047193b1fa2897da789c152509894b021fca6a5fcdb0328993415164917abdeb63e4ec5c3837788c7ec8bb31088bcce5c7d8b0b67ace149741e39aa18 WHIRLPOOL 0cd849ae3bd1ecae70671662ea2c66a88d5bf35aed9e9c36f44992f4299acda433c7b04c92a8899d897573c77839a921014842b05c71bcb081438ca0835da05d
+EBUILD pytest-raisesregexp-2.1.ebuild 745 SHA256 71aacb95f8f41226a98e41e8432d3743985240da2b5763edefdeea1c27643d43 SHA512 58531627c17ef2c565d364678cff92dfba2d1bbc57a03b2fea91dc2561562851ea8adb3a052487f92514febf40e8e2efa55a1d23f6ad35d7a184fce5438f6246 WHIRLPOOL b1a73e8bf34cc977a53018888dc7bcb9730bd2d4bb85f98f8790c631dac5b6f4b0a4a1d424084f77c088e294bfdaaeebbda1cf70d9f156f1b7173000370e6f2a
+MISC ChangeLog 1062 SHA256 24767f7a058ea7bb6874136f5a4395818a20c8ffee2e2294c7e78804d7c50667 SHA512 1e836c4707c69ea1ba30943fbbdc0fb74232b9f2aafe7cc9d8fdcd86b7afc2f97d96281f3bbc79ab3adffa6b54669171f045d1ac6a813e94c0d1c4cf016b487f WHIRLPOOL e705dfe1696184923f161475e050d2327d17a1c37802c658187b29a4a11c4b814bfa33fb0fa245f84c3267d291545368b1e7ab824460fc24369dc609b91df40d
+MISC metadata.xml 395 SHA256 1a4b7a144ced4480bd5488a2c7942f6bf2b621fef68e3983c859d946f7efd137 SHA512 2c117d6b0690770b608b236e0f5dea1f1dcef1a3882af735b5e60ea015df40bffa3c68b1db32b362a9ae4e0e29391563a995b6c4acbe323be70a194ce5225153 WHIRLPOOL e597570ec5514eaaf3eea6e364893a8c6cddb8e54916514f2209f96d5c87a5ddda595bb08ede23d67ca4dd024c7130e0b11ea696d1641ac28e52b0cb901a38ee
diff --git a/dev-python/pytest-raisesregexp/metadata.xml b/dev-python/pytest-raisesregexp/metadata.xml
new file mode 100644
index 000000000000..da7b69b5c238
--- /dev/null
+++ b/dev-python/pytest-raisesregexp/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Walkman/pytest_raisesregexp</remote-id>
+		<remote-id type="pypi">pytest-raisesregexp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.0.ebuild b/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.0.ebuild
new file mode 100644
index 000000000000..0872f42147cc
--- /dev/null
+++ b/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple pytest plugin to look for regex in Exceptions"
+HOMEPAGE="https://github.com/Walkman/pytest_raisesregexp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${CDEPEND} )
+"
+RDEPEND="
+	${CDEPEND}
+	dev-python/py[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	${PYTHON} -m pytest || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.1.ebuild b/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.1.ebuild
new file mode 100644
index 000000000000..746f3517c34c
--- /dev/null
+++ b/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Simple pytest plugin to look for regex in Exceptions"
+HOMEPAGE="https://github.com/Walkman/pytest_raisesregexp"
+SRC_URI="https://github.com/kissgyorgy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${CDEPEND} )
+"
+RDEPEND="
+	${CDEPEND}
+	dev-python/py[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	distutils_install_for_testing
+	${PYTHON} -m pytest || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
new file mode 100644
index 000000000000..8390ee1bd802
--- /dev/null
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-rerunfailures-2.1.0.tar.gz 7687 SHA256 e867cec5eabb20ed38e04b6b9c277e34b0603143ee315beab56296d8329fe3f2 SHA512 9c3da462df07f334dcab865bf7f828f75bc611c93dfeb2306a802f2e6ef973332ef502d97dc8d676e09330ad77c227bc6a20ae67ff31f1446a5fb1d608d638cc WHIRLPOOL d6712ef5815f47687cb23d44edb0bf3ce519f11924245f4f14a9803adefd0f021df6385cf371610f8c9d9d91a44eb1913093ee5cfc5fc01ae4847d8f13dd9cc4
+EBUILD pytest-rerunfailures-2.1.0.ebuild 550 SHA256 2d5567ff1258b36b9ffb8eba46e171225595b6f34d2bfe38dea290ff098e23d2 SHA512 cffb4f7eb4cc208e60ba9be700eac4b53ea1f3ee5d8abfa9f7d035564878528c9e25b43ff7a4e7ea26930702b8af236d93007b6a1f7255ac86a7f0f1de375ad0 WHIRLPOOL 35aa2095f09bc54539e1c6fb78174b04844eb215b33f21ae429c3efa2cb09947e7485213b5a683fe2965fb0dd72efacca2abf2b8f148aa2384289bf5241c4eaa
+MISC metadata.xml 333 SHA256 34ee0ace1dc0adc404be34606f2e92fe83c7ec638108c052d35077a246bfdad1 SHA512 8b08014dec552b96d1e8d79c44404333b62960b2fce3ce3905077af02d1e3436c2cfbf5b6bbe9844df7d87c5bc5f44ad86f4359079ddb8e2e54f30ecc42369e6 WHIRLPOOL 98d4fdffe95b3f7bf45b000726b766ddb36e157ae34ffad5832ccfd8fc49fa2d1d5da0985211c5ecf806449930852421500e129903dfae0ea86edd8b9d4613fb
diff --git a/dev-python/pytest-rerunfailures/metadata.xml b/dev-python/pytest-rerunfailures/metadata.xml
new file mode 100644
index 000000000000..22f4da14655a
--- /dev/null
+++ b/dev-python/pytest-rerunfailures/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pytest-rerunfailures</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild
new file mode 100644
index 000000000000..14de2183e089
--- /dev/null
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin to re-run tests to eliminate flaky failures"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-rerunfailures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/pytest"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/pytest-runner/Manifest b/dev-python/pytest-runner/Manifest
new file mode 100644
index 000000000000..90f4fb4d2dca
--- /dev/null
+++ b/dev-python/pytest-runner/Manifest
@@ -0,0 +1,9 @@
+DIST pytest-runner-2.10.1.tar.gz 8815 SHA256 ecc9549ed1ce9bbfc9e7c9bad33d3f9fa91da2334632070a191a35aa96f0be35 SHA512 11c570051a0a7ff56fbb4fdc2a87185af6bbcccc05be012eeaefd775efbf21a3fb167a95ae603d627461b3775ee8cfb56b10d356044a4ae3966a7bf9f1b1f4a8 WHIRLPOOL c2a0c8a77abf5fedd31e0348a9e28ef60febbab7e4d18d7a8444fe6ca82f61c5f36b1cb183524ed9063e246cf6b8a76ca6427f3a63bba0e3c594e03e4a34fb13
+DIST pytest-runner-2.11.1.tar.gz 9661 SHA256 983a31eab45e375240e250161a556163bc8d250edaba97960909338c273a89b3 SHA512 5249e0a368bab21bb034a9b0121edbcda635f559cc22ba79c87565dcbc070056bfed47a69c16f4733403f61ea5b73adfd1ccf945700116043cbf3940d37d4067 WHIRLPOOL 1b233122ced9ea7bef078a3485fdb10eca6c7c1b4598114426ee7add16cb45911daa3ed72634b1d71c415166e8fa6aa2dfaf0e1fe755d0388a9efeaf28b4d097
+DIST pytest-runner-2.6.2.tar.gz 6379 SHA256 e775a40ee4a3a1d45018b199c44cc20bbe7f3df2dc8882f61465bb4141c78cdb SHA512 6a993e8729d5e203986f2526d46e96b7ac19e65fc26493a55a98e858304ecde0c47576476864a0ee1817ea1a7b02cfda952fc03f79b84fff249021f140f3d00d WHIRLPOOL 968a38864b58d35d4c9fb0fa2855bae9f87bcb68936b5f129c5bc67b2c751e51bf5f9e5f54d27f36ccd6e89df7d4f8c4a6556de408cc8287f52725e1eb73fef5
+EBUILD pytest-runner-2.10.1.ebuild 1050 SHA256 08ced9a9c263968cd74619a01364fafe9fc70f6595829002a76cad7c1c532ad4 SHA512 e3afa865d5049a70eda205908a0499e41c9c679526ac474f32b9afc1b4e4c64e9ff5f456a75c26e3e1fd1aac7ae70ee5841e3bcab2a2a9ce3606df29d8f64f25 WHIRLPOOL c2a5132f8266957c842fd260db538df9c4a3e51cc03dd4fe26d45e47d874ebe4536bd6f13f84887fa537974e5aacaf3a4640783eac6b0e7ec9110684e2b89644
+EBUILD pytest-runner-2.11.1.ebuild 960 SHA256 ad7a24cdaa3eb1220a971b0266149b1aaf56ff196ad4bd871e0c7fd93340ef20 SHA512 8f6af8fbd7586d60a288024ec6a726f027f54be0abf45f3663912ef6a3e83fdb5e008e4705c1d2d01527e4d899cc6fd3482078e51aa6cbc86bcd22afe2793fac WHIRLPOOL d594c6e57bdb5ce7215e6e6eb7311a2ebf5c5ca65cfddaa1407d58814d56a48ac76957fe1a669f30caa302b522aa08d08d344e885670d7099110c019b2382242
+EBUILD pytest-runner-2.6.2.ebuild 1064 SHA256 3a67e8a294f72c6d34cb4d32e680ff4201b6b22b188a8b1dee8b90533b7379c9 SHA512 14078aeaf287c3d20738c180f58f83ec4a31abc63a66b72bf0b2f907a5cd10a1d0a9ffc65302f80aa93dd06bf9bf4242bc7fd498be9cacd032d4f2f4702cfcc0 WHIRLPOOL c9f43d3e4f80fdd62eb40a07c380fa3346d213f55f04fe388afbf48c1daec9b37994e382950b170927118e2c725631c29020cbaa81d90c9269bf63b3e0124c8f
+MISC ChangeLog 6374 SHA256 3c515c9bca2f21e090826c3d36b9c9bfa158feddd3750662919d22ee42550644 SHA512 3fea3da105bb12f4a8bc5112abd401267309faa50a005124bfa95864d01348d1de22c7007e386c878d2bcd9e5c89830de74cd2f3d66aeafd3b61ee79d5c86943 WHIRLPOOL 6c0800dee51e6eabe63447e3666488aa766643ae6bdd39e90cd25b03636229f2431b8b8b187729b47311c71a1dd48f4e9fd1a537c32390f8c7f1002b2abb2cde
+MISC ChangeLog-2015 2379 SHA256 34ddf6920677cb966607a2a78b2f79a6ea8a8f5b9e695e8558a4fd74bcf6b041 SHA512 fa5fe63c3576530e36b600f4e92503e5e483ad68639620a7bb89ea141f9b2128e3a157e0f54a9c3e050283ada186bdceed17927941b6451d778b30197a8b0a13 WHIRLPOOL 3ed27eef6a1bf89e7e01039e3f18670c13fe76500eaa214a2eef19fcaf8f637a9b880c52d76cfb833ef9063c451567db1cd3809828313a786d6cc48bc3468b04
+MISC metadata.xml 630 SHA256 85482abdccdd10be03f0b21caee7fcc81257d71f50db974301af6c2398c988a7 SHA512 59b27215a9ff8d9d5643b6f24436ce194d9e5f3f4e22a9aa4824a85215bf77e8f92e26bc985cedfb46dd67299b5cef9b93b97faa81d9dbff799d6792ff132abb WHIRLPOOL 738b1f427cfe92bfaf9ff194baacbf2733bfdb82083d4fb478fdc989eba27d2d10f6216440ca6637a4931c7582ca3a07d8ab45e1af1994def04a64400763a535
diff --git a/dev-python/pytest-runner/metadata.xml b/dev-python/pytest-runner/metadata.xml
new file mode 100644
index 000000000000..33e275ec751d
--- /dev/null
+++ b/dev-python/pytest-runner/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+		Adds support for tests during installation of setup.py files.
+	</longdescription>
+  <upstream>
+    <remote-id type="pypi">pytest-runner</remote-id>
+    <remote-id type="bitbucket">pytest-dev/pytest-runner</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-runner/pytest-runner-2.10.1.ebuild b/dev-python/pytest-runner/pytest-runner-2.10.1.ebuild
new file mode 100644
index 000000000000..2e89dabfae76
--- /dev/null
+++ b/dev-python/pytest-runner/pytest-runner-2.10.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Adds support for tests during installation of setup.py files"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-runner https://github.com/pytest-dev/pytest-runner"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+SLOT="0"
+IUSE="doc"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? ( dev-python/docutils[${PYTHON_USEDEP}] )
+	"
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+
+# Test not included
+RESTRICT="test"
+
+python_compile_all() {
+	# The build by rst2html.py makes non fatal errors building index.rst
+	if use doc; then
+		rst2html.py docs/history.rst > docs/history.html
+		rst2html.py docs/index.rst > docs/index.html
+		HTML_DOCS=( docs/*.html )
+	fi
+}
+
+python_test() {
+	esetup.py pytest
+}
diff --git a/dev-python/pytest-runner/pytest-runner-2.11.1.ebuild b/dev-python/pytest-runner/pytest-runner-2.11.1.ebuild
new file mode 100644
index 000000000000..60af99f60e31
--- /dev/null
+++ b/dev-python/pytest-runner/pytest-runner-2.11.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Adds support for tests during installation of setup.py files"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-runner https://github.com/pytest-dev/pytest-runner"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? (
+	   dev-python/rst-linker[${PYTHON_USEDEP}]
+	   dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? ( ${RDEPEND} )
+"
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	esetup.py pytest
+}
diff --git a/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild b/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild
new file mode 100644
index 000000000000..8d69d6c3b856
--- /dev/null
+++ b/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild
@@ -0,0 +1,43 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Adds support for tests during installation of setup.py files"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-runner https://github.com/pytest-dev/pytest-runner"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+SLOT="0"
+IUSE="doc"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	"
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+
+# Test not included
+RESTRICT="test"
+
+python_compile_all() {
+	# The build by rst2html.py makes non fatal errors building index.rst
+	if use doc; then
+		rst2html.py docs/history.rst > docs/history.html
+		rst2html.py docs/index.rst > docs/index.html
+	fi
+}
+
+python_test() {
+	esetup.py pytest
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-salt/Manifest b/dev-python/pytest-salt/Manifest
new file mode 100644
index 000000000000..f1bcb54fe26a
--- /dev/null
+++ b/dev-python/pytest-salt/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-salt-0.1_pre20170731.tar.xz 30084 SHA256 9c3a0b2a82e5ff22301ba5e6321319345b37de88c32d91d51c559e68b86fee11 SHA512 700072c9afef3c78ea4fc5cdbc54e28fb9d0635744cea07fa187cf21665f211eda05318d6a945c1dd6cc7a944bdf608ae2d8f78448d0667cba4984fc2fa2c75e WHIRLPOOL f8dd3a2033eac5c2f74638e76bae1869fd1e5b0969a0a98c100908ee78ff6f26d53955b589819215c731a4161c0ce0fa83dcbcbaa5d535bb4f5813ef10ebbb10
+EBUILD pytest-salt-0.1_pre20170731.ebuild 359 SHA256 4a955d62f9f28d8874a47acf37c5a6bb226afb67a82bd54fbeea6f8ac97f7f1e SHA512 8cdbd3d54b3c7480c12b225a38977456ce172d94225e02235b69e8425227ce7568b2e37170f8958b460185ecef12d85e7ccb0015694e94264e88c096f19e9c56 WHIRLPOOL 22bea347d2fa879092a1232556e2bb6595a0b6685d60a5de07ce337a4ae38b5a9ca779a1061594f84752a40fc51c67984b604eae2f2a8b10eb3d8e67bf7dad49
+MISC metadata.xml 328 SHA256 975d4679a653537708680be394acb4f8f2d30bf08542ba64c87b5dea09c525c4 SHA512 7cbdc338820fd09b283ef5686c59a1a7138a3b1e0b315daa0d6e4e4e0cf1f87b1802128ab03939ce24fa1b97954de7fd34096f9d734bf20e1ee8e99276e95941 WHIRLPOOL e6c0e7ac645abff5b7130b3f64e268c1b8d73901bf601730e9e5e49fe20d6d4b50eb97fb6229d6a5967b358ebb0284742b8e511813db01bf4c68087fb43a3324
diff --git a/dev-python/pytest-salt/metadata.xml b/dev-python/pytest-salt/metadata.xml
new file mode 100644
index 000000000000..366c2631e760
--- /dev/null
+++ b/dev-python/pytest-salt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pytest-salt/pytest-salt-0.1_pre20170731.ebuild b/dev-python/pytest-salt/pytest-salt-0.1_pre20170731.ebuild
new file mode 100644
index 000000000000..ad6ebfdf36dd
--- /dev/null
+++ b/dev-python/pytest-salt/pytest-salt-0.1_pre20170731.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="PyTest Salt Plugin"
+HOMEPAGE="https://github.com/saltstack/pytest-salt"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
new file mode 100644
index 000000000000..597ee33e070b
--- /dev/null
+++ b/dev-python/pytest-shutil/Manifest
@@ -0,0 +1,7 @@
+DIST pytest-shutil-1.2.11.tar.gz 18310 SHA256 ace5250c09377f01e62bd50d33bc959fc66ee0123f7b0b10bc440b35d1644494 SHA512 2a998218bb997a6ceb277965e2f150b2d7722ba518f579154f804568f552e2c41ced9a491c1745382dc119d0b92f3ea993ae77a61851809aae59a1e17501bde8 WHIRLPOOL 9deba2d3d1c0ce708ce4ad2aea7e5a918752df2ac80c87b9852ff5930ef3f99e464634073c6cb9c3e905800ae2450ef20fcbe878ff49debee31408c5e025ac37
+DIST pytest-shutil-1.2.4.tar.gz 16327 SHA256 a3fc464033dc39396a67eac9e228a0682e866654b8017819b2511bdbd8ed751f SHA512 9ec6baa3cf53bb80103b1dfbf6c26794090c26dd74b29cd19e76b1037c6939538c7b05ea16368a76cce6969216c291e27b00833a990268239bfd2222f69ddfb4 WHIRLPOOL 5f52535feadf11c5aa33b69cc8d35d361d7345611b9239a8282a94d58bfb4163c1207a60cb3d38998ba777e8b9912a3a63cfa0b820962ce84dba8a5ba8068642
+DIST pytest-shutil-1.2.8.tar.gz 17051 SHA256 924accaec3f3781416139e580386ab4f849cb8662bc1072405a81d3a5e56bf3d SHA512 de73b2c350709e356810f58d2a8a4c7668144701639c45a0690081e707e7147762f650af2e9f826429d0488655dae0e3366611da5e8e3ecd0c6382e215170b2d WHIRLPOOL 433fb2ec4db71cb958f1f7b8278c1fb88de5e56369dec04910947d611f779dea9fb4e5282adeac5014fe601ca19046733039b6cc6733504f94c0503ff57b9ec5
+EBUILD pytest-shutil-1.2.11.ebuild 992 SHA256 df70cfe28b5f8d25f34993583c24e5c53f8f194d317b570f615834137e8ecee5 SHA512 093ad3b15b3e5e2a9daa3c95e8626ea207c1b41e6340f1ef712a365234c68f27f99ee1e92720a97170f988975d8022728ada844ea229daa66b98f5419e41855d WHIRLPOOL a7226c915c3eee30668b344afb3a211a3cf50aa8dd9de4b0cafae6fbd119528ca8c5961ac2dbc1fde5a67d0e65ff16dd53dfcd5a999400f10cb079ffa6b876a5
+EBUILD pytest-shutil-1.2.4.ebuild 872 SHA256 d980a2b0d84734cfb06aa261c18c0f93b97e6a81c140802609d3f8e86cd96d16 SHA512 148ca3da3d06f2d26a9799cc2cc8eba28a99cef29de0dbefd2e0957527655cf53c623fe4bf5ea1a542fdc48ddb9f56608521913b9837cb1c352af8523f62691c WHIRLPOOL 5ddfba1132e451868af2dffcafa0d8287a3e98ef8125c4cf850bf3273e296782ea8b1740aa318641dae45d3924bf6752859dd5da50f051cdde84870c05e7ac80
+EBUILD pytest-shutil-1.2.8.ebuild 872 SHA256 d980a2b0d84734cfb06aa261c18c0f93b97e6a81c140802609d3f8e86cd96d16 SHA512 148ca3da3d06f2d26a9799cc2cc8eba28a99cef29de0dbefd2e0957527655cf53c623fe4bf5ea1a542fdc48ddb9f56608521913b9837cb1c352af8523f62691c WHIRLPOOL 5ddfba1132e451868af2dffcafa0d8287a3e98ef8125c4cf850bf3273e296782ea8b1740aa318641dae45d3924bf6752859dd5da50f051cdde84870c05e7ac80
+MISC metadata.xml 730 SHA256 732e6377e5584e4c0f5b9b0eb8c8eb08c0009a0b2fabc2fe5df31209f07354cc SHA512 c775452390ffa0666b23f3f78bc96fbfbbbd94796ef9bfb79fcf251b97ca94f96b0c2980b2ca1828104499c78da15fbb198eeb000e55006debe9ed03ebebb0ca WHIRLPOOL f2e3545639c61f786be3efc80dc887560be4d36eb2bf39f5e01ff74a84245f3621288547c44d977a0c5273289f49ee8a3da412b3f81e74415c97fe54104e89b9
diff --git a/dev-python/pytest-shutil/metadata.xml b/dev-python/pytest-shutil/metadata.xml
new file mode 100644
index 000000000000..87c19f020cc4
--- /dev/null
+++ b/dev-python/pytest-shutil/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>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>eeaston@gmail.com</email>
+			<name>Edward Easton</name>
+		</maintainer>
+		<remote-id type="pypi">pytest-shutil</remote-id>
+		<remote-id type="github">manahl/pytest-plugins</remote-id>
+	</upstream>
+	<longdescription>
+		This library is a goodie-bag of Unix shell and environment management
+		tools for automated tests.  A summary of the available functions is
+		below, look at the source for the full listing.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
new file mode 100644
index 000000000000..93b17e4a2f69
--- /dev/null
+++ b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-shutil"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/contextlib2[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/path-py[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )
+"
+
+python_test() {
+	# various pickling errors, but code works to run pytest-virtualenv tests
+	[[ ${EPYTHON} == pypy ]] && return
+
+	esetup.py test
+}
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.4.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.4.ebuild
new file mode 100644
index 000000000000..88ce32a9dec9
--- /dev/null
+++ b/dev-python/pytest-shutil/pytest-shutil-1.2.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-shutil"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/contextlib2[${PYTHON_USEDEP}]
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/path-py[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.8.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.8.ebuild
new file mode 100644
index 000000000000..88ce32a9dec9
--- /dev/null
+++ b/dev-python/pytest-shutil/pytest-shutil-1.2.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-shutil"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/contextlib2[${PYTHON_USEDEP}]
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/path-py[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-subtesthack/Manifest b/dev-python/pytest-subtesthack/Manifest
new file mode 100644
index 000000000000..5b29ab2d37d2
--- /dev/null
+++ b/dev-python/pytest-subtesthack/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-subtesthack-0.1.1.tar.gz 2410 SHA256 9700cc25e9dbe49a2d399b14ea107ab985ee40ebd0d1a7d457b05d15aa9ae632 SHA512 0bf6425b535e65dc7f06f74493d10fbb6451e78a817174638661d7525f39f092f67db8da010228cbd54b400485e71e443118f91ebef660b9c00d2b354062a55f WHIRLPOOL e8e05351eaf140148f5fc6e3023cd564253e62781d69578f330e3393c0dffaa3ee265c457fb9234f066ece28d42280402401abba540f780d5137d79b5f161fdf
+EBUILD pytest-subtesthack-0.1.1.ebuild 806 SHA256 a7122360083125d46174b03676851a657fd6b5ac277c8e0f537215d3e1d1fdda SHA512 1e5e6c65aa77268ae0cc47c8694249f0f9c79fb0b0fd1baaa9bd2f476fcc6cb44b37e692a3c421a61a967454b5c37f6f857d0f8908fc9ce1c75c9d1b462de426 WHIRLPOOL ea917edbdb5ab0e624618880467e126dcef8d724f6e7d4f3499a315d2de3bfb357c1b20ab2a206e9a74174efb70e6766b84aaa05eabf593706a1d8b49f5eef65
+MISC metadata.xml 321 SHA256 3946a00b940a867378593dc8b92fcff877fe0f71d55a4b92230b310430a0cfc7 SHA512 f1c6901c39e0eaaf79917b0699ae5d7dc9a94b15ed2db4ff08f0e3f2bfdaa567e3848474934bb4d8aafe56198536a4ff8f5a6b4379c2238ee20e4a718bfd9a58 WHIRLPOOL 32e1cf62e36ada3ea78c6aa72078a42fdef2c18140358b3afcf0a8c08aa3f7a4ff9450be77811ef5ccf9954963331fed0455e4f1cbc37be676f0205e10f278c9
diff --git a/dev-python/pytest-subtesthack/metadata.xml b/dev-python/pytest-subtesthack/metadata.xml
new file mode 100644
index 000000000000..6979d31debc3
--- /dev/null
+++ b/dev-python/pytest-subtesthack/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-subtesthack</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.1.ebuild b/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.1.ebuild
new file mode 100644
index 000000000000..5213ff6241fa
--- /dev/null
+++ b/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="A hack for test fixtures, needed for hypothesis inside py.test"
+HOMEPAGE="https://github.com/untitaker/pytest-subtesthack/"
+# pypi tarball misses tests
+SRC_URI="https://github.com/untitaker/pytest-subtesthack/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	distutils_install_for_testing
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
new file mode 100644
index 000000000000..9bd9b42fe5e6
--- /dev/null
+++ b/dev-python/pytest-timeout/Manifest
@@ -0,0 +1,5 @@
+DIST pytest-timeout-1.2.0.tar.gz 13258 SHA256 c29e3168f10897728059bd6b8ca20b28733d7fe6b8f6c09bb9d89f6146f27cb8 SHA512 b86548843e9ff8c8f7d1c39735025cdfa98befe2860e2a8a5d422d08bd7f542032384f147125a2a2841268154cc3a3874ef0aa4765d454fd5390edb773b106ae WHIRLPOOL b2155fd77c5c1fbfd5ec7679bc92f3aa9c28f67db47f2ad93f6e868c11787c5988a6e612f432c20a32d82d55acc43f520aa5a87b8a1155e98fb6da066cc44685
+EBUILD pytest-timeout-1.2.0.ebuild 557 SHA256 b7ca287f60375e7d11900c62e75ef597b74602a4f0691a713884a99a9326acd5 SHA512 9221abd10e116b9e46630a98124f8297146514e672f2562d41d0c34f903ffba638271c6c82d61306280f64198c7e3757e1e41f23fcfd28a02613d8be58a740d4 WHIRLPOOL ec30868cbaeb74a871bd4abdb849fc93fcdfca242e430375a10ee3245adb3ac7b1adeb1022707dfb37c511f02d91d8473bc384ee908a0f8389777eec490babc8
+MISC ChangeLog 3207 SHA256 8afa6a164b8f636ebdb49b2ea04009f256cc355fef6df49bf7aa8d19754a13f1 SHA512 4469ea4a14471e4b332e470199cd5d63d1270c9409ea0943809331b2498e93ceddaef4d870d21ff90cf7a13dd2141dbac8824bdc83bdd35681e6f9c875a7d0bb WHIRLPOOL e0ef35de4f1a398c64d5c3e717cf74c4ca358225c608632131a51a4aa26e1b1a7732d7abca6418a3dc16a0494c6246741784b55c1326352c84698180e74f962f
+MISC ChangeLog-2015 771 SHA256 ee7a5d41aa0380849c9e311bc4812e404b601b269e058b717aa56f56cdbe1d5d SHA512 9800d19955af62ee2c18464a56479313e4209ff2ca6f4812c303599c9dcf212f6596d5c4ca6ef3085bf6dfbed6fe89127dd576b1925736d14b352302a1faf3af WHIRLPOOL 41821207ad8edba0aee8df452147dc7da858dd787b113737e6560a18f1c37d36e93157a52737ee44a489082f22e18294ff34c295df0f5291e87de637cd222dfa
+MISC metadata.xml 327 SHA256 3b0081c18757072512299803a7d53de817b3cf4a7c668d8b86b21b960abfa4c5 SHA512 6040289d134f65896f2fb80538d9caa4ce628911c5ed21568a30087d1b0ffb14b9acbf874956720b1d9c56290c78bb965ac9299bc400fd89a258f3627180780a WHIRLPOOL 9c4ecea0ea603f68535af94a431c8398c781507bd5fd47deb71b1b7df1c3dc24e91c3106312fa40fbc5bc996c44033042ebc8cb520e6a41dd5091f32c6b6034c
diff --git a/dev-python/pytest-timeout/metadata.xml b/dev-python/pytest-timeout/metadata.xml
new file mode 100644
index 000000000000..53c928b91c5a
--- /dev/null
+++ b/dev-python/pytest-timeout/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pytest-timeout</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild
new file mode 100644
index 000000000000..2f57c1892015
--- /dev/null
+++ b/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin to abort hanging tests"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-timeout"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/pytest"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	${EPYTHON} test_pytest_timeout.py || die
+}
diff --git a/dev-python/pytest-virtualenv/Manifest b/dev-python/pytest-virtualenv/Manifest
new file mode 100644
index 000000000000..d69d07d07a05
--- /dev/null
+++ b/dev-python/pytest-virtualenv/Manifest
@@ -0,0 +1,7 @@
+DIST pytest-virtualenv-1.2.11.tar.gz 9528 SHA256 4d3fe63133bb9c8a191a7d5388ca51b6938e6d1388d04f650dccbde5790dabb0 SHA512 317ef8717f0ad4da6d38167f1f0dd65b6f1b3bd08bd1361fe6a27e6e422cd9fab62f3fac3848082bb24411505ecd41495fc1cbedb970d43945c8f6f8cfbbdf41 WHIRLPOOL a3b48cc848be1fec76e7fb7980e0c0faa2ef1749e3097c6956e7b83b8cf7a69eba9f1be8d2c4846495c2ab9efd29415c4961061e0206896744328c62c98b1f69
+DIST pytest-virtualenv-1.2.5.tar.gz 9480 SHA256 ecd883d6bc9cd70f66b4297dfb0d04415b013cdc3efb8b8a0b917a516b50d22e SHA512 7d437346c3b4aa96078cc4fa8f0b6c83b173572209e71a74c77098ab4e8ad0c571c0932c2b413123cd73f47a4eda36d0c0ae3ece2866afc2d1f5092357c7593a WHIRLPOOL f3fb869b85a5d582afbd297c3dedee6f864e53efcbc11cd5d199649fb0df048ac42f17a25ac2aff1c0c876ccb664361cb6b57865a143899a3d6c75cf6817fbb5
+DIST pytest-virtualenv-1.2.7.tar.gz 9836 SHA256 51fb6468670624b2315aecaf1a2bbd698509e3ea6a1e28b094984c45e1376755 SHA512 046bfe20a08f6081c21a01bb4137b0bb481fddb61ac2cbf1a764dfec1eccf7393236e4358fdfdb5e982aba01cf3ac457c4320c2f56fa542542dd9721403bf9ec WHIRLPOOL 183fe45480c84dadbd34006c92c3d72220ff3e0321781013ff829ad2392963be5d17316a17719bcdd92f51407d7433f73380d3300f631f75fcd354a7b58b2411
+EBUILD pytest-virtualenv-1.2.11.ebuild 803 SHA256 65dbdd143da6934357d19a98f1ba19352dfdaed2a2e3af1f2b7acb455b7e4cfc SHA512 411863ceb48f03e5e93612e2706ed01af2e594d57938e580840cd5ef53c9cb49a062f298f85fff37ef32547bb657f0899877f8d86f544a35f05694529342076a WHIRLPOOL e0c1c48680933fe5938f7437729cf90502647b031140eab9b2ffaddc3c5ae826c46a59514945a22cb884d0d248c96174030506fd6309f70ec12609a6c4dc552f
+EBUILD pytest-virtualenv-1.2.5.ebuild 752 SHA256 b39eb00450fd5f9fa3bf37f901b4e6a56a3e24307cff2a616bb0708534eca498 SHA512 9a0396df7b3c190bc6b1f48afbbe2666f6a2fbcb57391a3d73c1c73a977eb472f5477a354ddb223917830574b0a811aa29e1ea4b75d604a24efa1c8c13bdbb46 WHIRLPOOL 2e0596082c8b168685eca7b1b3d9090318b038b0cc4c5efa9a178046146f1eb52274df83abc63e6a7f61ae08c3d5dc9838b5fc998d8ea0a37044b04c40c4ad9a
+EBUILD pytest-virtualenv-1.2.7.ebuild 798 SHA256 ec074571420d908ece61a778171fe68c73c8df13fc36597710cd271e7c170455 SHA512 0b93b74e7e84d0d9811cc0fb8bd5945465160d5e9e09238a96c9ebcdab65efceb546bd43128962e57da129d60587574c2d4b028a94527cde1813756641471ef5 WHIRLPOOL b8651a8192fcaf861026dfeaf352b2db3dc44b88e29b7a886c4fce71f7fa9606e4d3fbef2b94b46f0742c641eb4a04010197259ddc82f686f513312fe1aaebf9
+MISC metadata.xml 704 SHA256 5dde9bbf2190ababf5d8db7f145a5e96130d4628fdfb14f524560e1b4d60eda6 SHA512 856c8ea08f2f1f4f2e1be19e2a2cb2aaad2a143f270417a2632685b44432c36a947d7d98b51bb87cd6f32943e814a39790943e0c4799dac97d84b92103b759d9 WHIRLPOOL ad2a298654bedd233e1bf548776ba449b57a86aa0e54beb0e4504d3352f72426cee37345ef4afddbcaa871bd34ac1a09b8e423567d4566483c7728bf7716c4b9
diff --git a/dev-python/pytest-virtualenv/metadata.xml b/dev-python/pytest-virtualenv/metadata.xml
new file mode 100644
index 000000000000..faf56311bde0
--- /dev/null
+++ b/dev-python/pytest-virtualenv/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>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>eeaston@gmail.com</email>
+			<name>Edward Easton</name>
+		</maintainer>
+		<remote-id type="pypi">pytest-virtualenv</remote-id>
+		<remote-id type="github">manahl/pytest-plugins</remote-id>
+	</upstream>
+	<longdescription>
+		Create a Python virtual environment in your test that cleans up on
+		teardown. The fixture has utility methods to install packages and list
+		what's installed.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
new file mode 100644
index 000000000000..851e7acce7de
--- /dev/null
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtualenv fixture for py.test"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-virtualenv"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+	dev-python/pytest-shutil[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.5.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.5.ebuild
new file mode 100644
index 000000000000..eae249fb9446
--- /dev/null
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtualenv fixture for py.test"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-virtualenv"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+	dev-python/pytest-shutil[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.7.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.7.ebuild
new file mode 100644
index 000000000000..3cb43868cace
--- /dev/null
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtualenv fixture for py.test"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-virtualenv"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+	dev-python/pytest-shutil[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
new file mode 100644
index 000000000000..c503132cc469
--- /dev/null
+++ b/dev-python/pytest-xdist/Manifest
@@ -0,0 +1,9 @@
+AUX 1.15.0-test_manytests_to_one_import_error.patch 991 SHA256 c45e31a2491f31bf6a87a1804ad34f297f6662153440a2088f353f6cf98224ca SHA512 f46dcc913e408d1af425cc4d444d16d6585062d4debee08164039d3b35020c6c4b3af52c43484ecf32330d0107397d31030ab930965415e0ede6e22449b7d59c WHIRLPOOL 467829dda7e2d019958bfc6c6385aff5e60bea325c6c50975b247e51a4e8f37e50720b6127c03505ac7137bf2b3ca7e97f07b71559a634fba5508dc3809e5c12
+DIST pytest-xdist-1.14.zip 106585 SHA256 4a5e1199122fa29e3017d8d189f59ccc5d82e841474ba2a1eec0e89606153623 SHA512 4cafae77736da6880e8dd42aaa91f68bbc959ff7dabcd231018b144b54f96ccf1b11abb09474e260876bbdf731053005fdbd348ac87461f303d8f8f7af643e36 WHIRLPOOL 7d1f57a6d5cbf08661254f3f47d72c3cfbe931f14985c4b24abb627bd10fdc3f2fa21d05085766c0ed425e74713f991b53bdde957bd64ea4f64a206c2f4feffc
+DIST pytest-xdist-1.15.0.tar.gz 87799 SHA256 6238395f8bd050f9288a3b10f34330edece80f4424cf2b4204d6e7d622f0f00b SHA512 6429bd0c85024a2dcb453e4264f06d4a548637c4dcdeabf73d2b78a112ace70ff61cf0849a4845cc70a7650d10a99e5fe1087d3b7dba4b941ec0a771fc9338ed WHIRLPOOL 0454f615c24b14a86aba58c7bc9dbc2b43af82551ae3912358603450f0e3ac94e849eb2fc57bdda8bd1de5201111a3986d2c12c9f2923f4296718ffee84d661b
+DIST pytest-xdist-1.20.0.tar.gz 56578 SHA256 7924d45c2430191fe3679a58116c74ceea13307d7822c169d65fd59a24b3a4fe SHA512 e91fa6fa2f3130d38d674f62e6332581b88b43d7a63562701edf705de1b8a633b6b2011a6fa5fcece955181f6cf263a8ca7481c5e5f9f1d56ce198327f7dd30a WHIRLPOOL 0a2311d92f372c692c579350792d7051c4dfa046bc22a6eeeeb9b214982f90c12b28f7c0875fec591741bf82a3e6feac2b807a9ccde5c920b14a8b9865d58e3a
+EBUILD pytest-xdist-1.14-r1.ebuild 903 SHA256 85fa092f869ecdf313f3c7ebb5cf5da47c7bdcb620f11454222990526a226366 SHA512 88db842c80a1b3ed730db2b039e16b1118c34e1c9aafbc9ce902f903527891c99f46e6da5316e44bb99c26f49ef61310896fc99ba0d37754824166508d6b078e WHIRLPOOL 6feaa1e17ded3c6fe4204350b1e1ae1c2244e069fb7e603494e104a4f0ef2748514be255d07d2abe16a735b0f8d9429f84dd25ce4fbf91162a43aefd2269a8bc
+EBUILD pytest-xdist-1.15.0.ebuild 1224 SHA256 484cdf42b1183a33150b41b929d27a925c62c635eeddc1f4c59bc618b7cf06f1 SHA512 01af0491146d76e567e5cd1152a16cef8d397b841c4d7d8680791e54f22b9a30b3b0597253c5d1a919940c302ea19e96302f4abd4f4f32ecbbb891ad6532fa9a WHIRLPOOL f2cb0e32fbcacc6ff27960897d2c861de83be1af991d0aed68ddc896f6951d60f7c7572bf34636c831f1dfb2d9e2f5aba19e03ad4f27096edf6fce6fbd2a234e
+EBUILD pytest-xdist-1.20.0.ebuild 912 SHA256 319d8a984b55a6f70e32f5948ca865aad6daa8d2b9fd4e62c3719c6753210bc7 SHA512 b3fef4dfc565643622455acc70494b5f9bd24c1bf149f56d8980baf82ff696993db8df6abb495e534d99d8f18ee7f2b703d64734f28c6c99f0a07425143d39d9 WHIRLPOOL f00c677ebcc49e848de9fa4806452e73d9fe0dfb70b8981c850e894a41ed730deeb26111f27b7aff933b1352b6b7f7f2e3d34b34625075135e787c8f0cf1a21c
+MISC ChangeLog 3511 SHA256 fa4457d04a3d01cf26f7244fb05ad5f8dfb45ff1eb103148451dea3326917a52 SHA512 2b22be9bb85f0ebed510dc55bec1ff0dad87b6402b87f2dbbd47c4a8050d835c712c17b26874993cef5a5adf1cd2adf5ef85e28b6b075fceb38f987d1ffebc7c WHIRLPOOL 0fbe0e6d772e04ff677cf76a579ac467e2ae63613c16a79191c45ae52b19ba6751d5f3c479668261c6dc80a23ffd54e7a0b9ccab147bc9fc09320882a82a3513
+MISC metadata.xml 429 SHA256 73ac3c3c930e2cdc91f8d5f5bd43237eca57dc7ee5bc545fa800acbd072c6095 SHA512 f25800e22c2d0c60991a0544f69e253c5751affd7ba178fdb6fda167baed0b9756bfba1fd850908d9ed05c5cf2091848d91593eec7346d00462cfb54aa1864ae WHIRLPOOL a6d5e70bf96079c7c9ea7886fb0a1f2eda9b01cbc4415d8f71a10afb0c21e68a873fe3ac5434ba30558a26eef0539d5616fa041cddf53b8102771054fafb3ceb
diff --git a/dev-python/pytest-xdist/files/1.15.0-test_manytests_to_one_import_error.patch b/dev-python/pytest-xdist/files/1.15.0-test_manytests_to_one_import_error.patch
new file mode 100644
index 000000000000..9fb56f419ceb
--- /dev/null
+++ b/dev-python/pytest-xdist/files/1.15.0-test_manytests_to_one_import_error.patch
@@ -0,0 +1,27 @@
+From e5d80645347fc7e67efdceb97df8e95d140b283d Mon Sep 17 00:00:00 2001
+From: Bruno Oliveira <nicoddemus@gmail.com>
+Date: Mon, 5 Dec 2016 19:59:19 -0200
+Subject: [PATCH] Test using pytest 3.0
+
+Fix #99
+---
+ .travis.yml                | 42 ++++++++++++++++++++++--------------------
+ appveyor.yml               | 23 +++++++++++++++++++++++
+ setup.py                   |  2 +-
+ testing/acceptance_test.py |  2 +-
+ tox.ini                    |  7 +++----
+ 5 files changed, 50 insertions(+), 26 deletions(-)
+
+diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
+index 21dfd71..2bb7bb1 100644
+--- a/testing/acceptance_test.py
++++ b/testing/acceptance_test.py
+@@ -62,7 +62,7 @@ def test_import():
+                 pass
+         """)
+         result = testdir.runpytest(p1, '--tx=popen', '--tx=popen')
+-        assert result.ret == 1
++        assert result.ret in (1, 2)
+         result.stdout.fnmatch_lines([
+             "E   ImportError: *__import_of_missing_module*",
+         ])
diff --git a/dev-python/pytest-xdist/metadata.xml b/dev-python/pytest-xdist/metadata.xml
new file mode 100644
index 000000000000..c1976c171423
--- /dev/null
+++ b/dev-python/pytest-xdist/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pxml</remote-id>
+		<remote-id type="github">metagriffin/pxml</remote-id>
+		<remote-id type="bitbucket">pytest-dev/pytest-xdist</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.14-r1.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.14-r1.ebuild
new file mode 100644
index 000000000000..423204c76dff
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-1.14-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-xdist https://github.com/pytest-dev/pytest-xdist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/execnet-1.1[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	app-arch/unzip
+"
+
+python_test() {
+	find -name __pycache__ -exec rm -r '{}' + || die
+	py.test -vv -x || die
+}
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild
new file mode 100644
index 000000000000..4b81a266ce00
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild
@@ -0,0 +1,49 @@
+# 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="Distributed testing and loop-on-failing modes"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-xdist https://github.com/pytest-dev/pytest-xdist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/execnet-1.1[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+		dev-python/readme[${PYTHON_USEDEP}]
+	)
+"
+
+# Optional test dep:
+# dev-python/pexpect[${PYTHON_USEDEP}]
+
+PATCHES=(
+	"${FILESDIR}"/1.15.0-test_manytests_to_one_import_error.patch
+)
+
+python_prepare_all() {
+	# pexpect fail
+	sed -i -e 's/test_xfail_passes/_&/' testing/test_looponfail.py
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	py.test -vv || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.20.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.20.0.ebuild
new file mode 100644
index 000000000000..7e6d21d54712
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-1.20.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-xdist https://github.com/pytest-dev/pytest-xdist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/execnet-1.1[${PYTHON_USEDEP}]
+	>=dev-python/pytest-3.0.0[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	distutils_install_for_testing
+	py.test -vv || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
new file mode 100644
index 000000000000..57df180bf4f2
--- /dev/null
+++ b/dev-python/pytest-xprocess/Manifest
@@ -0,0 +1,6 @@
+DIST pytest-xprocess-0.12.1.tar.gz 12078 SHA256 50e0d00d898a867cf2af75168a8bf6d23d582365f8765b73dfc0430d1e53821b SHA512 fda868a12a056070afd5838c4bc466b4906a7138f685d4a0e6e0adbd975e5a1a2b9b37b8de36a45fb700e02ca14ae219cfe29c467f8d03e55d2a375a7efc9927 WHIRLPOOL 2bd27045754f39ba619ed4ecfc5353e4191bba62e3f6200b6fd74672f1b10cd443b104fde6ca84455c581469b2572eaeb186d2376ceddbd938de0a458d0b76d3
+DIST pytest-xprocess-0.9.1.tar.gz 7214 SHA256 f70e60cadb5ca1ac9500158ab0144dc9533586e1152fce1fe37e70dc03c5f49f SHA512 1c77112793d7be892746da3b303421d50be9406c9fc0eb3ad85f9cc6120275bad8994a0b9d2fff61172e67ed68631c9a42c9616d3d3e965cb6d053ccb77b54dd WHIRLPOOL ff85be4228b67247bc35371f9daf7372511df6cc3a95807d79a1f9cd658045a2e56c7c635559f3e5d6d393f232574901bc8cd3470f1ade3b59bbef361f184f80
+EBUILD pytest-xprocess-0.12.1.ebuild 854 SHA256 117cbc3c84dfdaaae4165cd5bffba1a484ccce33fcb5ec78e0c39483c313a2fa SHA512 2a1e4729d0e3e88b78ca84a3e2fe4eecf9e2cd59111b0fe530d6222a634786e0f63ce0a7005ccee8a527b9d5f790e84338419338946a17e677911b02970653da WHIRLPOOL f155129b4fc8d49f71cf47c02846c3665a8487dc20f690ef113678a53510a3b64c77689ef63df19605db4326029ba165440607ffb296f384c6ff73314f4ce059
+EBUILD pytest-xprocess-0.9.1.ebuild 856 SHA256 3d2b3c4be7ed432855f10dcb6fcd70200e9d582febf41e551d4b62578bcf3bc9 SHA512 a441b3b1da240a3c4241df8d00e575a202d54c4e6e8e6c5faabf582b5a3bca20ad8d75dc732bbc11a6c3319c10d5e716cca7216052312c88ebb72240c3fe20fd WHIRLPOOL 7b7e60dc8f19bc8a5efd1457dcb41d0e368fff9c50067d9a2fd439a23a1c3dcaba922bfadc12b185d720e41cc53f079b26679e5e8cd9465ca8015534ab44f79b
+MISC ChangeLog 1802 SHA256 d9a86630db7f7ff1da7d26296d7dbe5e8c986e3977306c9e7fc634f5cb93119c SHA512 a93489968826020f97aa5e26fc27d0348fe7b662eeaee0a256787889f568674ba4131d37c437ec9dd0eb4bd9369a52f579b825ba89d80729c3b088358fa1b8aa WHIRLPOOL 3ca4e209d99f61a24fd85799320593ff2b3d889e67f15b1139aed7c0e6a2579473ed4423c39a0ee03c763e84153ff7d259e3b83d3c8519cef8d7c4dc651e9bda
+MISC metadata.xml 399 SHA256 8994360d9b2a47805d2fce65c5bbac860f9c028f6da37def588aa9b79c01a097 SHA512 ae6d3628465eac8e46b14f8bb00a46884f07e85dc3246c3f3c1c6a85e178c7eab35511e583d08cb3b036f5ac28c8393dac90cf470ffb371a74cfd883a5978830 WHIRLPOOL 3472baa70f5dfa3ccaed50ba44f80e2b28a91c78d9be4b45a0237f1a530436f5b56e66e1fd8919a066196b13adabfbcc874773248837ed008851ec81a9771368
diff --git a/dev-python/pytest-xprocess/metadata.xml b/dev-python/pytest-xprocess/metadata.xml
new file mode 100644
index 000000000000..8303986ecb58
--- /dev/null
+++ b/dev-python/pytest-xprocess/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="bitbucket">pytest-dev/pytest-xprocess</remote-id>
+    <remote-id type="pypi">pytest-xprocess</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1.ebuild
new file mode 100644
index 000000000000..b55a5f2db722
--- /dev/null
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1.ebuild
@@ -0,0 +1,33 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage external processes across test runs"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	|| (
+		dev-python/pytest-cache[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
+	)
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}]
+		dev-python/pytest-cache[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	PYTEST_PLUGINS="pytest_xprocess" py.test -v -v || die
+}
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.9.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.9.1.ebuild
new file mode 100644
index 000000000000..312fcd440e01
--- /dev/null
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.9.1.ebuild
@@ -0,0 +1,33 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage external processes across test runs"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-xprocess/ https://bitbucket.org/pytest-dev/pytest-xprocess"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	|| (
+		dev-python/pytest-cache[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
+	)
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}]
+		dev-python/pytest-cache[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	PYTEST_PLUGINS="pytest_xprocess" py.test -v -v || die
+}
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
new file mode 100644
index 000000000000..e9d2bb310c75
--- /dev/null
+++ b/dev-python/pytest/Manifest
@@ -0,0 +1,15 @@
+DIST pytest-2.7.2.tar.gz 532836 SHA256 b30457f735420d0000d10a44bbd478cf03f8bf20e25bd77248f9bab40f4fd6a4 SHA512 5474a4fe58437a4971fb21b1b37dad3c08e18e5d154931ff23e597f881100a3515bf0cf71d06b143465594ad2a91a96f84f4836d84c39691143c8d88ca7a4360 WHIRLPOOL 6ab7371f952109ac476774222883e1381fe5ee6a54d967f2d90765f6c59c90634a16c42e8e2e1661169db6a9cb1327242ff2281cf1caeabd86a4dacd24f4bb06
+DIST pytest-3.0.3.tar.gz 731934 SHA256 f213500a356800a483e8a146ff971ae14a8df3f2c0ae4145181aad96996abee7 SHA512 ec0b4a5f0d6673a339c5a70b402c004c23db7001005454329eeaea15d890f53b8f2740f6c6254499d0f915b9058bfdfa535d9f22847bb382a060d65204fce4af WHIRLPOOL 1883909fa23832e674cf912b1d88957dd435143dc124df5454c08ad02c8077473168f749ea94539c2c4b5cf08648a0bce7e90937bbdacd4bb69a4ccf15ecff23
+DIST pytest-3.0.6.tar.gz 748748 SHA256 643434a9f1a188271da35e20064cb8b6c5440976c5bb541dc7b5b0e3cf75d940 SHA512 0e983f1f52c18327537d20be30425f4c74037d1fbf6b4aedf2646cf21d450fa9b2b20625f26f5db759b4fe1fd28c6640cb1df88e667efaeea6642e7f02f01e06 WHIRLPOOL 708e5041135883ba31d9712880672f64bf05c0bf40a544061cb42fed4d2aec111bfdf82b63f10e8a87c2b76870e3ea364b396258f0674d2199e43fe93cf2922e
+DIST pytest-3.0.7.tar.gz 743866 SHA256 b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab SHA512 f458929614fca5bc9542b9adfe2fa5d2c5b97ec13e331d3a9caf256d2d005b3dad9c11d01b2eb62332648f90608ba297a1edc2c20b7630ec4f69114299720a2a WHIRLPOOL 2febc111fed67573296f8c4a758ea36c2a2e81bd425442beace139f7e1bd3eaab7aa2fdcf8e0280871b0692e19d70efe18d780e4dd7336c9dd5d6fb0db2df6c5
+DIST pytest-3.1.2.tar.gz 766406 SHA256 795ec29fbba70b22a593691ce8bcd4bdde2dc96e8099731f73c7d8bb3ce879bf SHA512 6b8bf6280481295585169798351105749301a2b088fa89a48c463578a25edcb1fe7ea4100668bc3013a0a6dfd0ceab31c683e9280ece4f79575ca37909502d5c WHIRLPOOL 5c685f928080a5d6d1a979a0dbda1bc851eff855c76bb471ebf131047506c934e68a2e4733c4b265d291558ec1084d0276e77e469bd3d5ec0d91daa97c5eb989
+DIST pytest-3.2.2.tar.gz 786396 SHA256 f46e49e0340a532764991c498244a60e3a37d7424a532b3ff1a6a7653f1a403a SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db WHIRLPOOL 6d41e74696ed879d78f8a50dabb7775fa7631bfd5a6a1dd9df89269d6d3174683776982451f83b32c197cd801796e671e7431b542376a7d343b00e9fc21616b3
+EBUILD pytest-2.7.2.ebuild 1889 SHA256 d1e920bf9ca796613ac5c7c580ee0288d6aa8c0fffafa3be2b6f8f527633f462 SHA512 696c2aeb44dea0987c1732331bbb90703aee1b3b4a918ca198e1f68e0d7dfa509bdefc26bb80df8b0af2f2412126eef2db96e3d63701552a261cfc367a064c4c WHIRLPOOL 13a05d889dadc854dd0de5743d5573ea1ff95961e84ca7008bf35939dd77e2c22db056c149f30d96cef9ac7cf2abc94b5f35d636a4ce70cab9df3bbf65ddc9bf
+EBUILD pytest-3.0.3.ebuild 1962 SHA256 6d63dc454f928287fb2ac41330b2a8e4f090a370280aafbe6abf8cde2340b21b SHA512 05a5ca5914e4ba77779cb583907011203c444f08cc89b703d54b1d6002a39dd5341b5a16fb81f5d147729cfb97a9fc027235a828e26c207ab050a9e001bd65b3 WHIRLPOOL 9218ba8048d041cb97ebf8a6ae7b3cbf8445c22d814e9ad97be168b7b4dd5c98b31719f5303adc47b7374ba13120f4c21410914bf5ad0318f04e27fe7fac3088
+EBUILD pytest-3.0.6.ebuild 1961 SHA256 38df6f0901046768f0eceab7ba896203db2fd6b48b4b14cd9c52f060051b24b1 SHA512 7cca1291255ba66bdc69bb8012393abe644ea0edeca7af7bdf1bb7eb9e3de88842a23b9d69a4b3ac1f7ea2b286f1b204ccbb48fa7d3949bb674b813385df1f2a WHIRLPOOL a23c64c56d741344116c999e60f6ce5f12f95751adbeec6a8e4c0846668978f89c9d6ed13367ba45475561b4f2c6660cb610faf1f4f27ea9a23c5ac486b4b3d9
+EBUILD pytest-3.0.7.ebuild 2039 SHA256 8183f39f3cfff39e75ace8a2a4ea641f014b2246f22d92b390b8cb248988be94 SHA512 a4bb40b4eea8c8ddda1eb7909670836770153cf37d3f9233e8b89642ad5b8c653e2ab6e8865dd962d3dfbf2a2ef1559f9be57c44a1964ae93e980023167a4138 WHIRLPOOL ee4bacf51f0a1f07c05f6c2bbae7cbacfc89d5d00229cb4bbd61d44795f62b4390f80f267c17b1d3af91f064341b34fee2f4cd384f259f252277060094b50b32
+EBUILD pytest-3.1.2.ebuild 2091 SHA256 70e0d357824a8f3c63ce9d3c97479eddb92190bd1f8fcfd8e24e754b14053d7e SHA512 05641d5f99139b41c2cbdec3885648ffb86cfafb1d95e0eb26475e92948b675d6bc1a50b31b3b37104f3ca8e43cc1ac5a564764e717df1facc8bd32f362c3449 WHIRLPOOL aee377b0403f937724e5f4b952127c486b02965b56a231dddb677143eeabe891b5538bdd4032292bddc2aa63fc35ba52eb1a247f0059ab534bbeebfdf1e02098
+EBUILD pytest-3.2.2.ebuild 2091 SHA256 70e0d357824a8f3c63ce9d3c97479eddb92190bd1f8fcfd8e24e754b14053d7e SHA512 05641d5f99139b41c2cbdec3885648ffb86cfafb1d95e0eb26475e92948b675d6bc1a50b31b3b37104f3ca8e43cc1ac5a564764e717df1facc8bd32f362c3449 WHIRLPOOL aee377b0403f937724e5f4b952127c486b02965b56a231dddb677143eeabe891b5538bdd4032292bddc2aa63fc35ba52eb1a247f0059ab534bbeebfdf1e02098
+MISC ChangeLog 12105 SHA256 590aa691f8ab64493aca23d5c3c7fb4e0060a8560960ad9a05cb1bdc97a55cec SHA512 5d5c1f33d6d344fbe28ed13b4e9fcd9f2d60f7068957699db277144f67d5dddc0ab9273be5509fee9dbbfbeea9b84bea3e7aa37a8261b0d85ef48d916c740946 WHIRLPOOL aa82bc3a547fa92428a3a43cc687054cf546e255d286d98900bf96a6654d864087a9ac8bdd8ce2122bcec9ac3a7d2991fa9bf8daae5db54aa257f0368ce7eb9b
+MISC ChangeLog-2015 15727 SHA256 8688ac25ad7926b19068286232de9d74fa6467f88f6c99582453f38a2ead5d1a SHA512 89b9562c4422f790f85ffe60be51514edc74f1026120e8f08f6a239d129320f5009cc12b71712e9f109739986d16edbafb907c65cb81f575789229103ee3a79f WHIRLPOOL b6ee4db981666b1152843a0ac5e5dd708a9848044fd5c7a0b1d38c27568e64d05151a307f77574beb4001f0523d3652ab7ee5c5a181fba48a7402f274ae4a045
+MISC metadata.xml 309 SHA256 111a0412dd611ef0aac38a927660dd833b1bef90e3fa0df26af5de7d5d2cc437 SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f WHIRLPOOL de2705c5d611e06874c6cc2e1da2cccc3c2c65c36cb9bf21d9da5a07ae8bb8f038ab9c80a6ff87d4448f258508ef5ebafef68640049f1087c8dcac04eac4783d
diff --git a/dev-python/pytest/metadata.xml b/dev-python/pytest/metadata.xml
new file mode 100644
index 000000000000..6b44047e16e7
--- /dev/null
+++ b/dev-python/pytest/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest/pytest-2.7.2.ebuild b/dev-python/pytest/pytest-2.7.2.ebuild
new file mode 100644
index 000000000000..ce6683f5f930
--- /dev/null
+++ b/dev-python/pytest/pytest-2.7.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.4.29"
+RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
+
+#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (	dev-python/pexpect[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Disable versioning of py.test script to avoid collision with
+	# versioning performed by the eclass.
+	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Prevent un-needed d'loading
+	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		mkdir doc/en/.build || die
+		emake -C doc/en html
+	fi
+}
+
+python_test() {
+	# test_nose.py not written to suit py3.2 in pypy3
+	if [[ "${EPYTHON}" == pypy3 ]]; then
+		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \
+			--ignore=testing/test_nose.py \
+			|| die "tests failed with ${EPYTHON}"
+	else
+		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \
+			|| die "tests failed with ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use doc && dohtml -r doc/en/_build/html/
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest/pytest-3.0.3.ebuild b/dev-python/pytest/pytest-3.0.3.ebuild
new file mode 100644
index 000000000000..61fe2a0d9fb8
--- /dev/null
+++ b/dev-python/pytest/pytest-3.0.3.ebuild
@@ -0,0 +1,73 @@
+# 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.python.org/pypi/pytest"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 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}]
+	doc? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${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
+"
+
+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.0.6.ebuild b/dev-python/pytest/pytest-3.0.6.ebuild
new file mode 100644
index 000000000000..77e0facf03fb
--- /dev/null
+++ b/dev-python/pytest/pytest-3.0.6.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~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}]
+	doc? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${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
+"
+
+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 -x -v \
+			--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.0.7.ebuild b/dev-python/pytest/pytest-3.0.7.ebuild
new file mode 100644
index 000000000000..620f064201af
--- /dev/null
+++ b/dev-python/pytest/pytest-3.0.7.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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}]
+	doc? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${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
+"
+
+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 -x -v \
+			--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.1.2.ebuild b/dev-python/pytest/pytest-3.1.2.ebuild
new file mode 100644
index 000000000000..c949a1553ce7
--- /dev/null
+++ b/dev-python/pytest/pytest-3.1.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="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 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.4.33"
+COMMON_DEPEND="
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	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
+"
+
+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.2.2.ebuild b/dev-python/pytest/pytest-3.2.2.ebuild
new file mode 100644
index 000000000000..c949a1553ce7
--- /dev/null
+++ b/dev-python/pytest/pytest-3.2.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="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 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.4.33"
+COMMON_DEPEND="
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	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
+"
+
+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/python-afl/Manifest b/dev-python/python-afl/Manifest
new file mode 100644
index 000000000000..686980888d39
--- /dev/null
+++ b/dev-python/python-afl/Manifest
@@ -0,0 +1,3 @@
+DIST python-afl-0.6.1.tar.gz 14795 SHA256 3dc79ae0018a00e936ce2e5ee5ceb2634337103e2cc83bdd78029404b4dca91d SHA512 25662ae96db23560ab0f7df1468f1a4737f8f68853bed75cfcfe6112a6fac110501c66941402f35686d6b96a6d124a2aeeaed79052d618583843528cb3eee3aa WHIRLPOOL 1035d12cbfc0eeffdbb6d824be4ed92a66c8416f4b48e1ffed0c5c600fa076b54ba428942afb4fc736c461b7e2f92e4aeb34be29b2058e84bc65240a35166f59
+EBUILD python-afl-0.6.1.ebuild 656 SHA256 e6d6b661b98db99dd38637f3ef394793d88d18a32a7ae36fb4aa8ebacb1e7795 SHA512 228457a20b3b52cd3e6d9fb2a35c415806c0a6acae42e38b29e00a9f62901fc5aafe552d298b0a7e18aaa24ef7ad9b4e8d41ffd9027ccb007615916c62e47a09 WHIRLPOOL 8388f26e602b4037f9a375ba02592aa3b174dac843e1657b28170edb9e68b496f6290f9be788acdc7c3206b7ba6ab64453fdef740e8ec6c0479ee980fca091c2
+MISC metadata.xml 475 SHA256 19444af060b766282fa9d198fccab4a4cd5e87682af9a89c98bdba6e5eb4b077 SHA512 4e485a3f636a547fb6d618504e6c3fadb16d3f3d36faa2db9282c992239edcd498ed9062486260bd6a005ad68735a50db54f7bbf5e99f964f6404dfd29099388 WHIRLPOOL 70b91fd3adb053670e81def263c122659ec214045db55aec258a7ed3814a06d1b60b60c90c639121ec255dad284ddd950bda6c7221310307983ea77ddbfa1959
diff --git a/dev-python/python-afl/metadata.xml b/dev-python/python-afl/metadata.xml
new file mode 100644
index 000000000000..727252c1b369
--- /dev/null
+++ b/dev-python/python-afl/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jwilk/python-afl</remote-id>
+		<remote-id type="pypi">python-afl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-afl/python-afl-0.6.1.ebuild b/dev-python/python-afl/python-afl-0.6.1.ebuild
new file mode 100644
index 000000000000..1cf0d8b03aa3
--- /dev/null
+++ b/dev-python/python-afl/python-afl-0.6.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Enables American fuzzy lop fork server and instrumentation for pure-Python code"
+HOMEPAGE="https://github.com/jwilk/python-afl http://jwilk.net/software/python-afl"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="app-forensics/afl"
+DEPEND=">=dev-python/cython-0.19[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	PATH="${PATH}:." nosetests --verbose || die
+}
diff --git a/dev-python/python-application/Manifest b/dev-python/python-application/Manifest
new file mode 100644
index 000000000000..8fcf155a1e19
--- /dev/null
+++ b/dev-python/python-application/Manifest
@@ -0,0 +1,4 @@
+DIST python-application-1.5.0.tar.gz 43552 SHA256 9bc00c2c639bf633e2c5e08d4bf1bb5d7edaad6ccdd473692f0362df08f8aafc SHA512 9bf683a88bfb11ab5cf86b2d1ef86e22cf6fcb6004f0059b1d3cb2e1cde46827ced57a1cdd313c1d48dbd1ad610e9d36617619f79af748c55c517089720cb2b1 WHIRLPOOL 321411f6f33d29f2847accc805c78bbca3dc255e4768954d75904cea7f3843d2ff15f51bcc62706d8b6101b61d5e9d294968e607ff63f22a75982b00e8850f3a
+EBUILD python-application-1.5.0.ebuild 391 SHA256 525b1423da02331a68368d4441ad618cf750a91d47e0b7969ffa464481012044 SHA512 2e09c0d0378b87ed55c5b13d6505bc9a44b91a411a7bd9fb9b0c02b00f38daa9d147d9d47a849f535af30d48fd8e177325a8630d673be1394bcd8f5fa48dfbfc WHIRLPOOL 4beba96f31cb4cac24916c8a42199e7664a51a4703d3b1bfc08812f0c65633ece9637927dabbc59c5d6e27ceebba1cf568549e605f7b522a9299ce521bec9fdb
+MISC ChangeLog 991 SHA256 af07ded1c268c659ad17af30537019b861537c857d2c802307c0bed4e14784e5 SHA512 6e85355f2e9478e519694a82e87b63319c1e9b6c400cd548263767b97e7dc374d0bd930364a86ce80e07b84b9d02d72bdef4deaf8bab78d275f5b88ed737394b WHIRLPOOL c528082cf9e601d065c21bf2ed16c272604efe95bdece84087b5fbc2c4407af773a730ee08885946a868e52d30372afd501dbe2c6d55b6dafc5af8d4f97d090e
+MISC metadata.xml 1284 SHA256 f2f0ac35f072f50391d481f3b58153e1281039ac54cf699d3349d1ae2a087d17 SHA512 a40bb81f3a76e9d3012ce5aa6a49f0671c5449856afaeb278f4b7bd32eceaf63cdce667d81385fdcab7af4180f80e46f9123a71140829e5f2d6388b73d919fb1 WHIRLPOOL 994ece284217a6aaf5904dd088169c5fc1d00f9965fb3f05653671531719099cd7c8e10bed7ddb3530f83249c58027542f4f9fac675a99c2650498e986f50fb0
diff --git a/dev-python/python-application/metadata.xml b/dev-python/python-application/metadata.xml
new file mode 100644
index 000000000000..bc01efe4aaae
--- /dev/null
+++ b/dev-python/python-application/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		This package is a collection of modules that are useful when
+		building python applications. Their purpose is to eliminate the
+		need to divert resources into implementing the small tasks that
+		every application needs to do in order to run successfully and
+		focus instead on the application logic itself.
+
+		The modules that the application package provides are:
+		1. process - UNIX process and signal management.
+		2. python - python utility classes and functions.
+		3. configuration - a simple interface to handle configuration files.
+		4. log - an extensible system logger for console and syslog.
+		5. debug - memory troubleshooting and execution timing.
+		6. system - interaction with the underlying operating system.
+		7. notification - an application wide notification system.
+		8. version - manage version numbers for applications and packages.
+		9. dependency - verify package dependencies at runtime.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">python-application</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-application/python-application-1.5.0.ebuild b/dev-python/python-application/python-application-1.5.0.ebuild
new file mode 100644
index 000000000000..0dd28d0ff556
--- /dev/null
+++ b/dev-python/python-application/python-application-1.5.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Basic building blocks for python applications"
+HOMEPAGE="http://ag-projects.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/python-augeas/Manifest b/dev-python/python-augeas/Manifest
new file mode 100644
index 000000000000..df294d7571e5
--- /dev/null
+++ b/dev-python/python-augeas/Manifest
@@ -0,0 +1,9 @@
+DIST python-augeas-0.4.1.tar.gz 89652 SHA256 2d9e618fad03f68033b5ac94d0d57136df9ed75bf21c6e7877d3107866af89bf SHA512 ccd6ea10f927f06eba74dd48c21c7ca9a99c2910741ef925f078c09cd8a3421e63de3b74df2903a2cfd17f3defaa8df4624c9743d20e13bb5bfeacd7d50c5938 WHIRLPOOL bdb389691d85b259f0dba50205f99efa48ccec1676b48b2df2a7180079d1b3a91bd59f1020adbfe0088e7a5912fad6a0313d8c65cfb785fcbea87914d2676aec
+DIST python-augeas-0.4.2_pre131218.tar.xz 77636 SHA256 1ef4547c48e8ea155a1fd9908fc6b8e4d9bdfd9d51aa79488352de4ef3d40f50 SHA512 3677dfa4d7b6bbb22009ebee4ed4b46e50f7e5712354f5061476d5d21c86b956c4408f5ca005b674ad0e14e26c970830572aa077af6bb594dbff116991676e86 WHIRLPOOL 8bd303ce00811a2c686ccb840cb445eaa35e47888f5a53599e49d848020201adfe0a17b37137817d1cafd05d61b0783e6a65bb989bfb7195ec59d6c7eb438046
+DIST python-augeas-0.5.0.tar.gz 90667 SHA256 67d59d66cdba8d624e0389b87b2a83a176f21f16a87553b50f5703b23f29bac2 SHA512 d93d9e21c720084ee3c1841a2172dd1a4cfb41e668de0f557bd214efd65e685a1e5fc713a7d34e0fed727fe908bb1e8a09a1c10587bc27f3708cbcdee575cc51 WHIRLPOOL 155417cb5c03f581101b525d1b5e89ed9f28e9e145fa548061d36a9fe23791cb38422219695d2bd177aaa78989dfb363fd2023a2ec857456e18639bfdf93ee34
+EBUILD python-augeas-0.4.1.ebuild 513 SHA256 33258002ab6733340677a004153ada6ce65083d0b23b0be1cb3b758fe4cca803 SHA512 97e9201ecf56a5a9d4b7683099c11ae81c9a3f85ab9304c97fe27ccc73066feac6978e54ed89c3e1f28f62568606ec3f8d8a90fc8007d2ceb6717413be70d201 WHIRLPOOL b1bf739cdb0065d187e8608c9aab553e3ce79a9959e104caf36e28bdfd122f5fd328e0775ef459c2c98c02f5eb05cdcbd8ba6d4277f7361b8a2bce4b1cb64663
+EBUILD python-augeas-0.4.2_pre131218.ebuild 572 SHA256 5f9ee8df74ce4849f3b36875f00639e601af0d052132c558feef7724f034b43e SHA512 3d7fdb4feeacd9a51e9a08b0e2c1be7e23733c3383b6b75acae9fb62a9bf130eeffc9551b273aea0959b96e470828947826a90fb8d89982293fde8cea59700de WHIRLPOOL 38c125ccb37a3b47cbf2dce7e565948a14ce53c038ea2eb33f26323203a7bf637a15fd2c586a278f88d98117dd3a7b482bed8eae052ce9f55281fec85459a800
+EBUILD python-augeas-0.5.0.ebuild 508 SHA256 ab155efca1052daaf9c320dd597ee4e247b113c361a369a968e063d152da21b3 SHA512 5cd42fd050a0b89af8936d3b8155b96e5682d0eb75f5d192547170ae9ead8753733be971d53b3432d13a46d6a59206d996cf92d8423c6fbdf29773970a4ee651 WHIRLPOOL 537ac521d4fd6086a1568425d1722a7717096c82e0a7433d99f3a5593bab5c49ddc6aaadcb90225f58f5679ae01bca1a5909164e018203b4b8301a03d84c0256
+MISC ChangeLog 2560 SHA256 27bf4f3ff60e393dfb5ecc0b0a1291bb5e752eef7f634534237fc8113649e14d SHA512 f740b1058854a3b9234daecae9ba22e47daf01886df3d76c14ebc989f8877f855f27ff89e14f60ecf4ffc7cf1cbf06a3279cec34732db220bb9418343065fa3c WHIRLPOOL a9ac1faef55cc7d4f8799b82b47312a6029ecf8e72bc85d3ed27345c0980a735205c87f51fe1aef25e1c0bc53ad777be9fceb0a3db7b450cc7cdd0945e69847a
+MISC ChangeLog-2015 2035 SHA256 395a66764dc06e937e4b6370d3d049c43818d7e0f2f434dab600ec94ebe2be86 SHA512 23b6704edf6a72fb56488dbe76eeb2486e7e40c946b94e59203c05db273e5c55f612cbd2f915c52cc7989324a77516a58f5eaf3df7d9174a37ffee3508581888 WHIRLPOOL b3245de01f3943e319d3bd42ed487a105e4549bf5e62c29925c4034728799e1f369366a69c1c7d927a32754abba3393c356cf02694454bd10469a1d54499d3e1
+MISC metadata.xml 417 SHA256 2a451759fb050bd93d3a6e40fe3877b30eab0478eca6b7510ed15cd452f6b08f SHA512 54f17c94e464ce5dde8dfc1135ea90b95ced67eac61f39a2b9e653740463396d2a564753d488e390bcec08b3e4360e92a71ce2ef5c1e1050738e71e61d27d10f WHIRLPOOL 8dc4b3283886d99f9fe8d90f1e193d6bd1cb7a43e5db41f5ec14d24f6bd0e299fb4ef9f35c06e160276cab95ef0988cecf3f0ebba8244e870fc6fbd9c8fddb90
diff --git a/dev-python/python-augeas/metadata.xml b/dev-python/python-augeas/metadata.xml
new file mode 100644
index 000000000000..cdd8abd046a2
--- /dev/null
+++ b/dev-python/python-augeas/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
+python-augeas is a set of Python bindings around augeas.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">python-augeas</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-augeas/python-augeas-0.4.1.ebuild b/dev-python/python-augeas/python-augeas-0.4.1.ebuild
new file mode 100644
index 000000000000..2fba8bd08a00
--- /dev/null
+++ b/dev-python/python-augeas/python-augeas-0.4.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for Augeas"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-admin/augeas"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS README.txt PKG-INFO"
+
+python_test() {
+	cd test || die
+	"${PYTHON}" test_augeas.py || die
+}
diff --git a/dev-python/python-augeas/python-augeas-0.4.2_pre131218.ebuild b/dev-python/python-augeas/python-augeas-0.4.2_pre131218.ebuild
new file mode 100644
index 000000000000..70fca966682e
--- /dev/null
+++ b/dev-python/python-augeas/python-augeas-0.4.2_pre131218.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for Augeas"
+HOMEPAGE="http://augeas.net/"
+#SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-admin/augeas"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS README.txt"
+
+python_test() {
+	cd test || die
+	"${PYTHON}" test_augeas.py || die
+}
diff --git a/dev-python/python-augeas/python-augeas-0.5.0.ebuild b/dev-python/python-augeas/python-augeas-0.5.0.ebuild
new file mode 100644
index 000000000000..a664f0120877
--- /dev/null
+++ b/dev-python/python-augeas/python-augeas-0.5.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for Augeas"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-admin/augeas"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS README.txt"
+
+python_test() {
+	cd test || die
+	"${PYTHON}" test_augeas.py || die
+}
diff --git a/dev-python/python-barbicanclient/Manifest b/dev-python/python-barbicanclient/Manifest
new file mode 100644
index 000000000000..a0bc77e30763
--- /dev/null
+++ b/dev-python/python-barbicanclient/Manifest
@@ -0,0 +1,11 @@
+DIST python-barbicanclient-3.3.0.tar.gz 82210 SHA256 d5c68354fb5d18a6fcdcd0a0788b3f502dd6ffa57a2e47a1426cce2d63ecb6cf SHA512 9c9ea055a375cb631f081ac0dc54ff20f60e6f6c3340b0f0a92a91eed4858202d9f85e00b662a8b3b7b5183633d8f5500f6925df5a182b20046d66be48b34e37 WHIRLPOOL 94a1d91a2bb8c8aaddfe775e7a5e955eace20e75e6c75707bd56aa62a1538193161d14534c1cd9d91ece5fb57a03f0fa7e71370531c576d1f5c35a0ed113830b
+DIST python-barbicanclient-4.0.1.tar.gz 103093 SHA256 6dad260ddb68843fe28e8f0d106d4a4aadf766ba5131123ea18a27e9349c5d5d SHA512 d66d6d21fdd2033ac01fd9275ccedf21925cbf48f3344fa763a3f13ec4796584afa911a3f4f6907e4181b2bf0bf10813e5757e397c4fb87ec266b5753be83d91 WHIRLPOOL ceef7613bdb4124517082be14589fd6a436c4bc735a949d5a74110507d25f3dc91567858188b0b62a545dba59ca2214c8a28edfdc01643220d39864db8eefbf2
+DIST python-barbicanclient-4.2.0.tar.gz 106243 SHA256 e2edbd8189bc13044e91bfc7620863bc270deb4af29f1df13170f867504192d7 SHA512 7753976cccc16983e92761427cfc09fa8f20115df85e85e23d8212c1e80ad649110fb6a9fb58efdb4db41a5c1cd4f20ab9aa66315bc0a162076859ea69990e9b WHIRLPOOL 4c6703a93e007280f22607ffce7101025c70570caaf227dcf4f59b9dea06e78ae44a40db6160e25e168313cbbf32e8df3482ae09201b67ef93f03603bda399d6
+DIST python-barbicanclient-4.5.2.tar.gz 112008 SHA256 b3007e4881ad678a9575824432564edc27a119f6969fabf74d2be0b72dcdf6f6 SHA512 23f6b9d90d9488a9f072092716bd65f8fe42b01b0889061784df909d5e169fb264f1b71f11f8a3f48853522f3d17428e5c4322712e41a57059f7dd45d0d06213 WHIRLPOOL 4459269d33f44769650270b29162bc308ee57b7d5badf75119958510e223243be2653fa514aefa0ca4c4ab4d78d5d85d1d6177a8521e60c31e8ed5dea6d45e9f
+EBUILD python-barbicanclient-3.3.0.ebuild 885 SHA256 a42ddd4101cc2c6723cab6900089313eca0f69ffaef454f3b0c36a4af0d2700d SHA512 b096f9bcc3f419910698367ccf0c8759d77c17ecf0bd7b9c39878a0d0d5834d764d7717fcc5979bd1283824ff868aab8d9c13c290dfc603d799c72cf1fc6bcb1 WHIRLPOOL 3cda008f62e1710b7c7fbd79dd027b87c8b86d71acc43050706e3c6d246d65c139c646a8248f1bdd1a8f8848fd8c1c6589990a8a0dc30709264b95ebf44814a0
+EBUILD python-barbicanclient-4.0.1.ebuild 1008 SHA256 80f89c8dc0b101fc3b45a8225de814f3222426f65e8c3021ee890c4a27808473 SHA512 5aca2c84ff13793d89bd6d2c8e33083264d815f2e0aa0f9d1874abf3d15e558870388d75d05856a2e38df2ac722f51883b501280ae190be14c0ab09845decd17 WHIRLPOOL 723102473b8dca7126d32504c0ecc4d867a50844b942e78e9c2434cb29bfd7db6fb9add9b783f8d149c0b3abc809f54017264051fdf10c5a64f9967578d0f63f
+EBUILD python-barbicanclient-4.2.0.ebuild 1042 SHA256 79a6f7a61cac6926c47a2027173405bcee703e39b1a59acf833302bed35de16b SHA512 7c30a16b519218a2bed3c1b931c35a0680c8a382ff058bc4c2e96e13fa628e770cd57c9dcc1689fbbae6a2dacbc9b5e5b85141abd027d866d55ee97769be81a2 WHIRLPOOL 76af62100d39ca992add4ab2f64ff95e36617f93dbaab0a3f496fadc62edd45b7c79d80984107e9d15ed56650a483a3a3e652db133666e209b525bd164f911bf
+EBUILD python-barbicanclient-4.5.2.ebuild 1009 SHA256 e2dca4842e1ac598ebbbea483fa88017f1a6907d81a332ce61ddae23547a5a28 SHA512 e1608db93c75478c22036053209046debe2e7a6a070b1e875c3b3f3aa7acaab2675b7fbcb5111a55da70ab57bb92ae699b78ef3fd5c3a977dc59839370ca7cdb WHIRLPOOL f3c707e6e207d3712896562cbdd032d4a9fea227fde8445a86598e1c6d6f54fcd7700f35245509315944c1180a826464e8eb9baa4beb5162abe8a44988995079
+MISC ChangeLog 3823 SHA256 6edc6d28acfe953e7ebf942619a7572b1b1ac1f90939000a0c2361ea2735eb7e SHA512 bde7782aedf5457622023fd381e820e550809734b6384344028cd117fd4bb1e6c461c7c7eafdbf8e5548d5efece38061412b6cb14149d992230e46598916e7e4 WHIRLPOOL ac3734f099a64e6b179a753ba52ae2fab09cdb52c744b07fca57280b4894496ef9f08c562b7e08c942ed5cbbcc3549337bbdab609e025fc702ece7eb11c0266c
+MISC ChangeLog-2015 1020 SHA256 26e814c4805d7993613602a38cf3a2bf43acb641b1fcf35f16e37b047195883d SHA512 81b291e42bfedaa85781d2cfb24de4c3db7548ac8ce1ad39e44d2f5b6caaa4be32d3c701bf5645e310c62b4c9c3bde257c97948e2af80fa66fb6bcd77f6bcc75 WHIRLPOOL ec7d0119da2f293bbf3e92e6c7a35aea9a5a4a6573f2a85da99e160967d16d03698a309b7b85b9d2a17acf4d4df9c867c3d744af4fbe037a037f049e20b124ab
+MISC metadata.xml 586 SHA256 ba72cac7bdf0ca66e5991d80a32e8017e5516017743a0d68464aa9ee4986eedf SHA512 7e03d93945bf23a92dce98fdcc0fe7f65d4b709ac5105155cffe338e979802c55c9e6e59b876e9f77cc9719c863b0ee18b2dc94e04be1230d1841e525a019cbc WHIRLPOOL ba003f23e585e8d4355bc6498511b689e998ad27d26df12521c298dd629442838e0287520c886235a13dc5c36e43fd33c074e3eccef14f988cf0d2315c8d0969
diff --git a/dev-python/python-barbicanclient/metadata.xml b/dev-python/python-barbicanclient/metadata.xml
new file mode 100644
index 000000000000..4fdec15d6e3f
--- /dev/null
+++ b/dev-python/python-barbicanclient/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+	Client library for Barbican API.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">python-barbicanclient</remote-id>
+		<remote-id type="github">openstack/barbican</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-3.3.0.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-3.3.0.ebuild
new file mode 100644
index 000000000000..47989f790c15
--- /dev/null
+++ b/dev-python/python-barbicanclient/python-barbicanclient-3.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Client library for Barbican API."
+HOMEPAGE="https://github.com/openstack/barbican"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-4.0.1.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-4.0.1.ebuild
new file mode 100644
index 000000000000..f820e5fad3f6
--- /dev/null
+++ b/dev-python/python-barbicanclient/python-barbicanclient-4.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Client library for Barbican API."
+HOMEPAGE="https://github.com/openstack/barbican"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-4.2.0.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-4.2.0.ebuild
new file mode 100644
index 000000000000..21e2515c1cff
--- /dev/null
+++ b/dev-python/python-barbicanclient/python-barbicanclient-4.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Client library for Barbican API."
+HOMEPAGE="https://github.com/openstack/barbican"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-4.5.2.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-4.5.2.ebuild
new file mode 100644
index 000000000000..f39be7dd6c65
--- /dev/null
+++ b/dev-python/python-barbicanclient/python-barbicanclient-4.5.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Client library for Barbican API."
+HOMEPAGE="https://github.com/openstack/barbican"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/python-bibtex/Manifest b/dev-python/python-bibtex/Manifest
new file mode 100644
index 000000000000..555525d38566
--- /dev/null
+++ b/dev-python/python-bibtex/Manifest
@@ -0,0 +1,5 @@
+DIST python-bibtex-1.2.7.tar.gz 60894 SHA256 37709a19b94858def4ede028e670b14153f98c62c6adc926af8102a3279eeaf0 SHA512 6739824fcdad91e2abb333d9e17a31bd222e6100630b8e4f65a9e718d36eb451600fdc7380cb63b89c4a33a7554b79dd1c52448d19c3359f21deee2134242e6b WHIRLPOOL 9c067e05473da5ec7ac5b6a0e5e5dc1363326aeff38946bef33858df8cc324079bf82bed59c5a7642310b749fcd9a8b62f341256373fcefe6919d54dae1fd034
+EBUILD python-bibtex-1.2.7-r1.ebuild 662 SHA256 f3580984125c7c37c36da16a42e4b31ea2347e95e32f2c3331b6f836c9f736e7 SHA512 8d9f512e261cf292b8b75db0b7c5cefa9ffb6b54162bca9a5b2360d0c788564d6618de1c88c7f77468c9d9fff6feeb5048306697e09864e98f55af65a9b777d5 WHIRLPOOL 01c97feb8fcc7c8303914b83904d34fab682908e623edebeda64bba049973bd864d087a952c3767d93d6bfb7dab9dbe629f3c979a64a0120e73797432aa2dd57
+MISC ChangeLog 2671 SHA256 654cd467aeccd33c929dcb9c21eed721f6ae4b91d5886a85ddd2395eabcedeea SHA512 4c5242ae9403576fff0bb61e4819df0f9c29e3f2f5fe994a2861f1e6c17ce60cfd51db3514caae5268aef2c049bfb2d97010a3cf118622d0f7798ce42f615d53 WHIRLPOOL caa28d85d445d080d232ef9f3e0f85f8169e75dd9038f4908cb4e12ef301a87db86f053bb11fe59d6b7220bb9dd0f204b37702e2fb98f6418aa8b99d3dcd9086
+MISC ChangeLog-2015 4800 SHA256 1b8feca4bb24c07c91f962f422d6717ff8b148a182f0ce3cc9e0a3b39d5cb09e SHA512 8dccf7aa89126190eb98f7e08077913d95068022aa84a47184689a7e3c46e119b1fc46f0df6858de20ddd6060e21f51926b7ce45c8c983683628895ede13a636 WHIRLPOOL e89afbdd93e2e83d9f569b3c3c89dae68be5ff28aba184eaa234552b0aa306d1519de83dd71c9d8533d3833b68213b12acb21159f5bff4b54cfd1b8ac9cc5904
+MISC metadata.xml 433 SHA256 026901564f5a321175e11875507908170fb9c513655bfe5507d35377a506789c SHA512 2f628ff97966f5175f2a5deab9a04f09c7350b2a74a99ad37930cbeee9881d8911d821af89c92eb832560e58cfcb7efd8af0c8f51ab3bac4ab1fbdd94e1639cc WHIRLPOOL f20733da3203c7cd0df5e879e12473ef8c7822c5cbd9a902a8abf4e84a162bdfd587b8dbaaa2f1229125e76c25f60285035d7d8b3d766551eb5a8f7552c266e7
diff --git a/dev-python/python-bibtex/metadata.xml b/dev-python/python-bibtex/metadata.xml
new file mode 100644
index 000000000000..56e91f1d6c4c
--- /dev/null
+++ b/dev-python/python-bibtex/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pybliographer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-bibtex/python-bibtex-1.2.7-r1.ebuild b/dev-python/python-bibtex/python-bibtex-1.2.7-r1.ebuild
new file mode 100644
index 000000000000..6b44d83e3241
--- /dev/null
+++ b/dev-python/python-bibtex/python-bibtex-1.2.7-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A Python extension to parse BibTeX files"
+HOMEPAGE="http://pybliographer.org/"
+SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	>=app-text/recode-3.6-r1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+python_prepare_all() {
+	# Disable tests during installation.
+	sed -e "/self.run_command ('check')/d" -i setup.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py check
+}
diff --git a/dev-python/python-biggles/Manifest b/dev-python/python-biggles/Manifest
new file mode 100644
index 000000000000..7680b42c61ee
--- /dev/null
+++ b/dev-python/python-biggles/Manifest
@@ -0,0 +1,5 @@
+DIST python2-biggles-1.6.6.tar.gz 104256 SHA256 afed6f8d80c7e348391e2ff6d277d234d74af084fa6c14926fefad0785132ce3 SHA512 cb2f3d2bebc30b04423b8e56dab9edf1db7bae7901791365f21d9aac1b1adf767baea0f550f4791d3c9fa48b39d02471447b5821437dfaaae2b82575e8e29597 WHIRLPOOL c5ddf734b01b16d46b4cea79bc2aa500007482bfc2cd324aa289dff74a93598b3f688e507d991a6495f38fdd9d7a7d374279e863d4e128d8a0fb3123f1cb484d
+EBUILD python-biggles-1.6.6-r1.ebuild 711 SHA256 b1f03c82543c159c53a72f022cb5322c667218aae2c2a6c500adaad70f6d6c39 SHA512 66def1b479650da1adfa8f41323b833ba34eb44445895f4d770ec321eaa7e12894efce33100e2bbd716f6e637a4eefb7ac1aab8383039d19fb3a44c989ffb416 WHIRLPOOL 5bc0690747b6a879c876c1ecd0dd7df7e8dbff9ca620f27ad6df103346d42ca47e83a22cb6a9a424ec378564c9a34885d314f51c0e554ffe4b9ca1737fae885f
+MISC ChangeLog 2456 SHA256 636673b20f8efac603f6bcf5a0438ba8d6bee0cb19d73c72b82da5f3f68fbc0b SHA512 8b87b160d3a4d36549919022d1971be5410d6646eeda026b6c164d2b3fab7039a214ea26f458ddde268a136a4d4d906d57a0b59599e5e1fb64046fdc0d154d0b WHIRLPOOL 7d8315aaba961667d4a3df6354aec8640b56f161bda8e4e424885a2e5353f13ecc830e42543348b93e0e912b7886729137ca415b1a992d58accf81dd1c08ea2c
+MISC ChangeLog-2015 3803 SHA256 788d30c3fef55e2bc44be6508dbe535eeb700d79c3c459c8f816068634d608db SHA512 1f18d1f08ac3b7a0b718225afced21e220b09a395b00bbc40d4d4a3b5284d15651194568820b35eaa3c7da8bc72d5313bdcdf38e07fb1603231a7030fd089103 WHIRLPOOL a5312b58f4edda9f0aefa875f333be62c458ce008b42b517964a005084533c30a84a708c39cc926727c52bf3e809dca176e5f5d6677a1163240b56bf422e1321
+MISC metadata.xml 317 SHA256 1552e02a9fe5e41b101a066da26d739256134d639fc05a7cb79f011645614566 SHA512 d6805d02c8262ed0863bb1247b7b425d5274068177dd7c0dc1baf4acbacbb714a5f42ea3391d3418b170ac4716476479b50e927ccfe3ec23b3ffd0b9cbcac606 WHIRLPOOL 6993c8d867ca27e8e527990e13ccd46d1a4e3cffb54d695740da696f1fea0f0b62dcdc5442de67d7907bd703fea3b79ccd5e0e6a5a5a63714933ef7372ddf740
diff --git a/dev-python/python-biggles/metadata.xml b/dev-python/python-biggles/metadata.xml
new file mode 100644
index 000000000000..c13afd9a5514
--- /dev/null
+++ b/dev-python/python-biggles/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">biggles</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-biggles/python-biggles-1.6.6-r1.ebuild b/dev-python/python-biggles/python-biggles-1.6.6-r1.ebuild
new file mode 100644
index 000000000000..64a0799b69c1
--- /dev/null
+++ b/dev-python/python-biggles/python-biggles-1.6.6-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="python2-biggles"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A Python module for creating publication-quality 2D scientific plots"
+HOMEPAGE="http://biggles.sourceforge.net/"
+SRC_URI="mirror://sourceforge/biggles/${MY_P}.tar.gz"
+
+DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/plotutils[X]
+	x11-libs/libSM
+	x11-libs/libXext"
+RDEPEND="${DEPEND}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/${PN}/
+	doins -r examples
+}
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
new file mode 100644
index 000000000000..9fc423e2252e
--- /dev/null
+++ b/dev-python/python-bugzilla/Manifest
@@ -0,0 +1,7 @@
+DIST python-bugzilla-1.2.2.tar.gz 76026 SHA256 e4606c325960f9e3eb90aac26014348c96160d77bbee09b7c31c211d38433922 SHA512 bb4ce43ffbf054097bd537404861848dd4ff5883fa63f156dfa90bea9f2e89cfaf0670980ec290a3d9c90cee268709b914e8bd5bd38b7f2e29c8d7fbd0215ac2 WHIRLPOOL cd37177dd5ebcf3016ab870d76e9a2bb655c3d6d0ef8884820d1646daad9f364c71c62d156bb3f60c5a4fffc5b92255f9db9da9c9771f2c95b7494fd294bc75a
+DIST python-bugzilla-2.1.0.tar.gz 78791 SHA256 f3145ab86c299389f3686fc44bb7c8b70eb1a9ccd4a7bafe578b5c4d450c8250 SHA512 40dd331e2dbb4d70ce6d356eb800d6242ef9878112310087761c8dccb7f05b259f0f5fdee6821713a84c68f1e5f9e0bb6ee45542bc385f00822b97344371239e WHIRLPOOL 4af78e7739a9276c0226d95ff25ba47b89e46de8539f864edae7e2678a90b6defe85684c36df0dc3490fca3f151cc917394bf4c14e95666c488c5979af8be1d8
+EBUILD python-bugzilla-1.2.2.ebuild 626 SHA256 b8a862dbdfafa714e810d38195493afa3c5f2f96b4b54fb0d2b01a40d7bfef52 SHA512 626627e1b879f6d83b248769d09443ea26d86de6ef99c3740d96be08b5c53651e6b9e1fb746ae1402ac71d8bf1f260250f60ca883f758e8fe1b5986aecdd94f1 WHIRLPOOL 408430e0fb0225275bd10dc6a3f5d79c1f9bb27c00b21e1654f6889a166b18492fc4a1cf8801144b94fbf5a58069bb7447396259b08977eb9e5d29bc5e2b690c
+EBUILD python-bugzilla-2.1.0.ebuild 733 SHA256 7933fbe8263ab5eea67719e3f43909d5830e4568a5d6d69aa736e6cda288ea43 SHA512 d0bbb64d1d2d22b2bf7e890a5409af3501f4dec6f4d2d486ec82c4b3997537d8dc552bbe1f5e035f25b1bbe43cf52b136715b1766efa000b4524d8e44b8f9e28 WHIRLPOOL 1b830abef8b4e63082aef17b8a009bdb6626b249c4b0342c33b7b1e09c43f98b5f2000bdf0a09395b10fee7f18318d84f1034f6733071e79c350d98df1df36ac
+MISC ChangeLog 3356 SHA256 3e6897f2d87eafc78d134f5864549ce40d1e5bc5d83adaa6e5f80968c108b6f6 SHA512 0fd0ca05d037efd3362c7eb8dee875a40d6bfa16d123c373f691b8ec18bc5b6cda40e70543c23fe4906248153a2c1ccdc2663059ece6e4bfe160fd7538e5a8f8 WHIRLPOOL 99112bf858e3f95120464d53eb8eb5262b4cd00b5ae5db79edf795cab09c90a484a491cf19b5c39ff2031c756739919394832a9bf46bed32a4438cf0be6c9da4
+MISC ChangeLog-2015 655 SHA256 c73c252d8226c165e5b1d55a761eb51a9efa12ba73ba3a14dbeb83820d78a7ac SHA512 fd8119699e30558030e4c8e84231205e1d27d304382ad51341d758bf35cced2be5c52b822fc869aa54c1f24c3425b9b1e22e5f6e831edd854c878fe6d45893a7 WHIRLPOOL 75274d480af1f50be97a34abeb8c81d50f857bf8f69628e0295990bbbd25ecdcd31bf63deb338f6778012a8257af36fd4d526caf0f94d7433e04ed6f934abfb0
+MISC metadata.xml 415 SHA256 3d41ed1cf48916801d5c139ce5cc137b0aae20609b5a7c1fe5342c5c72a06ab1 SHA512 fe000f7f78ed2ddc76c496368d7697bb36b0984d7d7d0729af9cb0fbec90e2d27eca777dd43d13f41a3f6b14b6a9fd735ebd777e30b6a6943f0af735f9ca9daa WHIRLPOOL 5d8261bcf9a3c38a9c8e6341244cf87dc6601516ba5cc2041c6ab31dd1cd9fdc3a707f553f457635636a43c787ff5ea487f5ef5d128795f44b7a9c341d68f675
diff --git a/dev-python/python-bugzilla/metadata.xml b/dev-python/python-bugzilla/metadata.xml
new file mode 100644
index 000000000000..91e83a14f889
--- /dev/null
+++ b/dev-python/python-bugzilla/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>dilfridge@gentoo.org</email>
+    <name>Andreas K. Huettel</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">python-bugzilla/python-bugzilla</remote-id>
+    <remote-id type="pypi">python-bugzilla</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-bugzilla/python-bugzilla-1.2.2.ebuild b/dev-python/python-bugzilla/python-bugzilla-1.2.2.ebuild
new file mode 100644
index 000000000000..745efac36a7d
--- /dev/null
+++ b/dev-python/python-bugzilla/python-bugzilla-1.2.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
+HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	|| ( dev-python/python-magic[${PYTHON_USEDEP}] sys-apps/file[python,${PYTHON_USEDEP}] )
+	dev-python/requests[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/python-bugzilla/python-bugzilla-2.1.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-2.1.0.ebuild
new file mode 100644
index 000000000000..05c40aa71118
--- /dev/null
+++ b/dev-python/python-bugzilla/python-bugzilla-2.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
+HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	|| ( dev-python/python-magic[${PYTHON_USEDEP}] sys-apps/file[python,${PYTHON_USEDEP}] )
+	dev-python/requests[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage
+		dev-python/pep8
+	)
+"
+
+python_test() {
+	"${EPYTHON}" ./setup.py test
+}
diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
new file mode 100644
index 000000000000..280c8e216eaa
--- /dev/null
+++ b/dev-python/python-caja/Manifest
@@ -0,0 +1,11 @@
+DIST python-caja-1.12.0.tar.xz 265720 SHA256 5418ffcc5c4a33c15348a0f10ded161d26fd1dfb46b3f68b2c6e3d2d1a7ba975 SHA512 fbec1a7f5e560cda2b3bba41dcd93c0484f2b7b7527577a2b2114c84019203df92c136fecbbe6c889785c610035a582f1912ad7da9bb1258ada661b56edf4be7 WHIRLPOOL fdf60f678762480f0a9e5532dad08fddead1f3551b2c74d82889b597389cdf37351f9b82bdcf0420dd0505167cb890a75dda3ae5268ba502717cf020a8b922fd
+DIST python-caja-1.14.0.tar.xz 279432 SHA256 441506e2fd32f77adf1d81dc9748ae27b2123c6a39dc0407932c0f10b11a02ac SHA512 835d9c1df112746fb3ecfe2e661e0c36814f3e2b21c763450354ce9bc0119d055b6773efa64d252ea8a618ec6c36e2d9cbfca698ffa6652cad0b94a499167497 WHIRLPOOL 66df5024c8e47d8973c562a5144dd872adaf02e7ba15ff0c2c4115f33dec1ee5916469d0d28458779800d9543510c557bf629feb8ba9c5360a1ff8f09b811e92
+DIST python-caja-1.16.0.tar.xz 280956 SHA256 14a86d174be0af753c24425469b56432ea3fbc46d954bf06ab679613f15c0ce4 SHA512 ce82fbd6d1127df33153920fbf703f77be2e1dabeb6ba33275fb1b1ba5d8aabc96222cf42280844237f0e182b0eccf764fd8ea33a8de96e844eeb0d5ef0cd5de WHIRLPOOL af036fc96a0a7b9bf322da3c3f1474331cfeaa4ef5d51fbb4eb93a318641ed90c6330487e65b818a3101f4b74db4d9c88308d0ae3336920e23be935864582432
+DIST python-caja-1.18.0.tar.xz 282504 SHA256 45b565de9ec06c05a6f65a49099645f3e82baf588b640c23adb4ab5676474403 SHA512 3836daaa4102da10d2601bc52dd8b8336459172a8ac1275f8d5f945e37cbb41f89e7a1ff737484dd4f5374ca00a0a3c6601fe28a48d7895f8efcaf793695fbcb WHIRLPOOL fbe204dfac8315b3eebe3fa223f26e5f9330e2b83dfcc791c1774d5bf11ab1ef0123dabedeaeeafec747bb6e0b8156878e6c79b18bde33dc47c24cffcad55fce
+EBUILD python-caja-1.12.0-r1.ebuild 1034 SHA256 afdd32d2ef5949bde4797fbef64657f0edf22729710b3007c257d3d3b5f40f37 SHA512 fb5edef48d7677c1c07b4f941015a2fe666f72ab94312b09c64c16d4e2a76d2fa125b74d1105240c3bf6064615da5ce17a0f7d770d1b495d3f32f6aaf734cad1 WHIRLPOOL 0030bb4074c42b926d19d3ac73cae6852809273820eed921d47c833e1b62bf39d072e6007b9b5a221dd9816fc71392307d76230ad825d831c0164bbe0b517afb
+EBUILD python-caja-1.14.0.ebuild 1076 SHA256 16dbe67302d8717d086d8d4f751c58391ec67851995ad1269d9e6c0014f725d9 SHA512 35a380ed78eee70e76b77e953b6825ad10fa487f132784a13fbf658b572ec08a32a54cdd548dbb17cc272dc01ebabb1af4d8fc98f528ff4b373bb91bb2d293fe WHIRLPOOL da7ec59e1a23f31836a9d2fa8dba1705a92477e6b7aa8e03698f0b4f1989b79c3d8b78ecfd5dc41cf5e36f855c5a175638288ee24691a00f87e56f7fb8cc5624
+EBUILD python-caja-1.16.0.ebuild 1076 SHA256 16dbe67302d8717d086d8d4f751c58391ec67851995ad1269d9e6c0014f725d9 SHA512 35a380ed78eee70e76b77e953b6825ad10fa487f132784a13fbf658b572ec08a32a54cdd548dbb17cc272dc01ebabb1af4d8fc98f528ff4b373bb91bb2d293fe WHIRLPOOL da7ec59e1a23f31836a9d2fa8dba1705a92477e6b7aa8e03698f0b4f1989b79c3d8b78ecfd5dc41cf5e36f855c5a175638288ee24691a00f87e56f7fb8cc5624
+EBUILD python-caja-1.18.0.ebuild 990 SHA256 4cba33dbed4801d67d6b1db8f3b3a9df74066ac2c34c4a1fe82eeb4914ea6fe2 SHA512 c350f4d260055592e09c75539bef1914e88e1ac7393a01bc07ccd0d5542433add50d2b2363986de8281c5bf90f929bcbf550de487091325b8718715f8588c684 WHIRLPOOL 26e69b039afb76835ba04bfd0a193c0e2396ddea18790dbbb8736212f28f1b1a8cd79343884bd0dd91c1ee4a54f39bef5bebcb9a7a0d414059dd9613f6676c9e
+MISC ChangeLog 4864 SHA256 b56039b44d791200f2e0ead994312355820848284dcf4423185ae2a8ef293cfc SHA512 880a170d2dc0707dd3b39dafde8392d7351efce5004a03816aa161de0502fc4b089c5470a278bc323169661b66a1cc3774073b398dd9da761974ec1576804574 WHIRLPOOL 47ec52ff7473304126f97589c09562c45221b71f36d4ed740ee72024bae9707d1c97239a8f64f229b3ebb94384cea58838e8f84d1c0313e4e9d076567e2325c9
+MISC ChangeLog-2015 1483 SHA256 e10e1d4781a5351ce548cddb28d8a6654a7acc8ce185a12fd08ce35ddb16602f SHA512 699551424db1ac7d0b07143768ede5f39a7659c511a3ed2c553cf8a68e8976604b11f274068ac2ae320da2fe62aafad2241bdaea92cec184199ddff9d7e06070 WHIRLPOOL 2eaae5ea0aac9cf03405ff27e2e9a92e17915ff7baef88833763cf2df1a48fa6ad9681f1ba27c59473a13c2e2c07d456b458976ffd1f64a0f7060e8d0cc1276e
+MISC metadata.xml 416 SHA256 152c42ec002bbcf68d90d0c4c3b8615c6037d02827aca9ba15e55aca8bd08aa9 SHA512 10b28795c6b8a02478f4896b97bd65c01521e11e2e40c4c2d8b8d5ecd1813a8d4c267af59f005000181b41d151f332eb4d96571c6110b74f6ca14ed9428ca093 WHIRLPOOL 1d9647caa491af8d0c4791752c1e6f2eebc9ff7d69a94ddbdbdc2b2b082d25da5c8d06b1fbb261d0aad86534e182675454a6e261edb2278a8d91e4c845a50ba5
diff --git a/dev-python/python-caja/metadata.xml b/dev-python/python-caja/metadata.xml
new file mode 100644
index 000000000000..9870e15abde1
--- /dev/null
+++ b/dev-python/python-caja/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>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>
+</pkgmetadata>
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
new file mode 100644
index 000000000000..8e84490ede64
--- /dev/null
+++ b/dev-python/python-caja/python-caja-1.12.0-r1.ebuild
@@ -0,0 +1,46 @@
+# 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
new file mode 100644
index 000000000000..8e2f6d0374f6
--- /dev/null
+++ b/dev-python/python-caja/python-caja-1.14.0.ebuild
@@ -0,0 +1,48 @@
+# 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
new file mode 100644
index 000000000000..8e2f6d0374f6
--- /dev/null
+++ b/dev-python/python-caja/python-caja-1.16.0.ebuild
@@ -0,0 +1,48 @@
+# 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.18.0.ebuild b/dev-python/python-caja/python-caja-1.18.0.ebuild
new file mode 100644
index 000000000000..f30cc7c52d15
--- /dev/null
+++ b/dev-python/python-caja/python-caja-1.18.0.ebuild
@@ -0,0 +1,47 @@
+# 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"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/glib:2
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=mate-base/caja-1.17.1[introspection]
+	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-catcher/Manifest b/dev-python/python-catcher/Manifest
new file mode 100644
index 000000000000..dbcab7248bec
--- /dev/null
+++ b/dev-python/python-catcher/Manifest
@@ -0,0 +1,5 @@
+DIST python-catcher-0.1.7.tar.gz 3699 SHA256 9f229680d9a456fd5ae6acf218c34055029b1a72c9b44f90f34711be1b245f78 SHA512 118bc19a7c7072cbf95d25810f95753aa894619c5a92b32f56e02a752e48c1b6ccbedab7d538184ec6dc30061826a7924fb0a4644e5afa26dedff9b9cd710353 WHIRLPOOL cf955b8361104986cd46a9fda89e2907ab909e560339a55383185dad331e7c0d1fc247d505564672f04edcb69e45553b54a7e90c8e6847fa7793e85bdc2fc22e
+EBUILD python-catcher-0.1.7.ebuild 600 SHA256 f5271a95a7d59a6eed6f8989c99106676fbadc25a7353b0e9dce5f2935644ea2 SHA512 03950c86ce50717aa192335b94c4df6f02fdedbb3425efca7f9be7c3fd4ecf3a199161f7cbf3c193f50eea793a4d30a8d763cddb808f51daf597dd176326e6d3 WHIRLPOOL 8b4ebe360af27ab94205f5bea8d58fa7ac3da3611ea49408f96c3812f59f605bd2b28a2188e054bc086f5569dfcdadf89294f833aecd81afd756ff2e1ef0bef3
+MISC ChangeLog 2590 SHA256 d74c5ed2ed4632647c95829817143e69968e911257123cce0a9970a82ef39756 SHA512 bcba0d0a230a367f6f2d100ceabc7d36a6e5ec1003e852c7dacb8223bb85648aab20113ae22e95203e1393803c11249b93b63bf5a45f2c8952d9de6ebfd9dfad WHIRLPOOL c5bed20deaa4ae775bfdf41898cdbd6c75f7941b5c6c6ecc12768737bf6d1fda826ca363518c80fa160bae1f34fcfeed3c0196b0f50d2af2cbf40d497733a8c8
+MISC ChangeLog-2015 590 SHA256 2a79d0b5c0f998b034531d07f86a5c7e45b5010280460e330ecf4a578a136615 SHA512 1496f65c21c0f151fb9157ba3d46fdb5a5ac8d656140cfc2f37cf1851d616b49f534fe576f7a25ac6ec3019628a1b49deda8918f3f82d53c223199f4fdc646fb WHIRLPOOL e777124b911f08c2a4a5fda6c3315b85455f39d793a517a71fc48408794830eaba609a5251ae116063d5370936fe8ec7bf1f8877e4873693ed3c6fb6f7b830ad
+MISC metadata.xml 327 SHA256 d36a5fa8fa32d1675fcb6dfd00b2c4b5778a1aebfdc793fbe74fc5631a20169f SHA512 c2c87719253cef67a0f872192250327649fc7db3417384fe4c96343025656455613b0f6ab02521c6249e68882dcaee03257b36a775acc6dba028ce6a11776c53 WHIRLPOOL 07f78e2e03c0dbc671e41a072a255b78c9ba7bde5944614dc98420cf684b1c7677b0ef2c421ecede391c7d4353e2c96a40ce8c340b24a2621f97a217f920f3f9
diff --git a/dev-python/python-catcher/metadata.xml b/dev-python/python-catcher/metadata.xml
new file mode 100644
index 000000000000..0b5922bf69ed
--- /dev/null
+++ b/dev-python/python-catcher/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">python-catcher</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-catcher/python-catcher-0.1.7.ebuild b/dev-python/python-catcher/python-catcher-0.1.7.ebuild
new file mode 100644
index 000000000000..96a17fbf1f99
--- /dev/null
+++ b/dev-python/python-catcher/python-catcher-0.1.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Beautiful stack traces for Python"
+HOMEPAGE="https://pypi.python.org/pypi/python-catcher/ http://ajenti.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	cd catcher || die
+	"${PYTHON}" -m unittest || die
+}
diff --git a/dev-python/python-cdb/Manifest b/dev-python/python-cdb/Manifest
new file mode 100644
index 000000000000..6aa984272dff
--- /dev/null
+++ b/dev-python/python-cdb/Manifest
@@ -0,0 +1,5 @@
+DIST python-cdb-0.34.tar.gz 18865 SHA256 31c4c272d02c8f9ca66394c36be677fd9ea1813782cac73efacc5add2cbd677c SHA512 712e4c91d6285b8ce3436fb4c18f8cd0db76aad12eda96e860a1f0b72ecd480181e33315595dab4a2242149372166b0ca8a6c367ea808e394af4bd9f15d6733a WHIRLPOOL b4ee8802fb14abb27d78bbab0f28791c1960b65456c1d6ce317976ec322daab4ee85c09b3a50247ae2c9b9d413cf937f533d13a0542797c5eb05bbeee2dd7002
+EBUILD python-cdb-0.34-r1.ebuild 723 SHA256 96204b21aa1bacfbde9f4cf1737bd59da20125da3449d459042625f9f7fe4244 SHA512 a8db5570e45de0976f54f86fb10b337eee41a5f6de727c5ed288551ebe32e21e7c25914d0f67c0c948748068ae91f37a7ac9c67b83fad2bbea43e1abf53317f2 WHIRLPOOL 22048cf53f582aa5c8e4fb28bf632e9b9f16d7a40e19a3e8f5bc89383ce63a1ee465ab414e578c47c933d8ccf3130eed4c2225c3dd89d7e8353422f727edda45
+MISC ChangeLog 2676 SHA256 7b6680d68b4e94b64e08e8caef98dac699d5d217f84e4d500dfcc578faeab070 SHA512 280e11cb08fa94d1c434096690044826c36a3555c986533afe715bff3c6ae5e785bc2d99fc92fd935e75f3de66aee8b6003103298b4b6354a02adb8a055b834c WHIRLPOOL e955a06e1b28f5f5420e4d064e8fd295c2de52dcc755950faed75a02dc2459f6f5ca4db7bf0e17f1a4caaaac403cb1a0cc85865c89377bea85afd113f5dd27bc
+MISC ChangeLog-2015 3595 SHA256 e9efa81f6df32a0f3df5ed0e49bb31d4e5ee9ac9eca127d48e38694cc863d11e SHA512 0c28fed2b2837be9e3996b83e2e862da79ac5091b687926e628a697e0e4fd896a10f58bb03e1f5388b9c8c0e92f6631b1d5397728981f54414521a4fb8496dd4 WHIRLPOOL 6c2b9732bfb9dbc35d90ba3144c084709ff31e8f65adb71062ab5685ba3b0b86a9424a2c5d649ad60d688d7ad0c475e09a4aa2a2a087c38dbbc56aace0135a5c
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/python-cdb/metadata.xml b/dev-python/python-cdb/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/python-cdb/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-cdb/python-cdb-0.34-r1.ebuild b/dev-python/python-cdb/python-cdb-0.34-r1.ebuild
new file mode 100644
index 000000000000..4b103598bb37
--- /dev/null
+++ b/dev-python/python-cdb/python-cdb-0.34-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python extension module for cdb"
+SRC_URI="http://pilcrow.madison.wi.us/python-cdb/${P}.tar.gz"
+HOMEPAGE="http://pilcrow.madison.wi.us/#pycdb"
+
+SLOT="0"
+IUSE=""
+LICENSE="GPL-2"
+KEYWORDS="amd64 arm ia64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="|| ( dev-db/cdb dev-db/tinycdb )"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	"${PYTHON}" setup.py build -b "build-${PYTHON_ABI}" install --home "${T}/test-${PYTHON_ABI}" || return 1
+	# This is not really intended as test but it is better than nothing.
+	"${PYTHON}" < Example
+}
diff --git a/dev-python/python-ceilometerclient/Manifest b/dev-python/python-ceilometerclient/Manifest
new file mode 100644
index 000000000000..acf482c662c1
--- /dev/null
+++ b/dev-python/python-ceilometerclient/Manifest
@@ -0,0 +1,5 @@
+DIST python-ceilometerclient-2.6.2.tar.gz 94001 SHA256 cc2f11868985b50081b36a212f2bbd30dc646c938971b3ec5dcb32e3aae933b1 SHA512 547df2616adbe437a751026554bf11e74ba753a3bc905fa71621d47accabcf6d4e1a67ad2516af91b5ba9600d4721a1f4bce730862fb18b63249d5334a78972d WHIRLPOOL 9351ed84232742bf50d139fffd4ea59ebbc1b93c48c82df15b1a43756c487d0ea89f8368184ca72a4a9ecb793fa16f4960e853d4958f10c8d0d3f556bf4a1e53
+EBUILD python-ceilometerclient-2.6.2.ebuild 1985 SHA256 cc846329befee5910223d07236e6e7b83b3b5605096ae97e93ff35ab1e406b83 SHA512 803afea016186c5ca220048568fed8ab46d76f058fd787b3e89f2d7e11bd620be2d992e506f23d90df79a743691eb968f0bc9be9ff8c3dd388e25878917aeb0f WHIRLPOOL 006034fbbd1a5e6c64ebe743f6fd74894c87474bf4befdd97138babcdf9ceac5a96136b1301931f101c7d5e1f9e3e6e8df4d17e6673612114a325a3117964f7d
+MISC ChangeLog 3950 SHA256 0a7b55e8e64ed3a07d921a3cb9b10922a8fa80b23639972bdff7255085d528bb SHA512 821a52e39e48db6c0e9a2d3b7b851c09f141b3b96c6d011ee64118f2cb10b496288b629367335745918980329142a344bcd8c5740ef5ac6f408b08a35f39dee8 WHIRLPOOL 3d0774723cdf4a2925e4a6027279c191eeeb769ce5fa6119ce25d15ab89952f0d6faa5c9be3ec696d62294c0feaedb7703a44f848f0e569d08e9b48234e7d417
+MISC ChangeLog-2015 1627 SHA256 cd76b49bea0b7fccbd2c8be23d2f1baeeab4689ccf60b9bca8f7014945027e31 SHA512 19ac44beff7f01b639bef60aa112e949d24eb7be8da92005b2598d57cfbbfeea662027e88488c8a6063996efa5f4f3f2d86709bf04793090a0fc8133b4593c56 WHIRLPOOL fc2bf20da0c998a8b8fb5faedeca17134632e082882154480d55e4e8f20ea9f0bf6f56b358af1a2b6705202b8648ca1bdbc7118a8146c092f1fef0bc9aa41ac4
+MISC metadata.xml 737 SHA256 302a457a91474cd707e92da7944b14471046bb02584c4fce8e603677941578a5 SHA512 6ab1a85cf5af8742c0fba38fad7ac354dfc11d0ee6a1a4753e7e0ff9ba04cf74f62f72880a6d3dc675282e962fc493be405dad0879f56e62b55ae680454480f5 WHIRLPOOL 2f739200ba81df9b603336ac3905511060e202a93bd79167da6150ea9a16f21e67846d53cf786b6fe6ed9a1ad863f571a91921d70e4d30ffabd948c472ed668b
diff --git a/dev-python/python-ceilometerclient/metadata.xml b/dev-python/python-ceilometerclient/metadata.xml
new file mode 100644
index 000000000000..4fa2fa31beba
--- /dev/null
+++ b/dev-python/python-ceilometerclient/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+    This is a client library for Ceilometer built on the Ceilometer API. It
+	provides a Python API (the ceilometerclient module) and a command-line tool (ceilometer).
+  </longdescription>
+	<upstream>
+		<remote-id type="pypi">python-ceilometerclient</remote-id>
+		<remote-id type="github">openstack/python-ceilometerclient</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-ceilometerclient/python-ceilometerclient-2.6.2.ebuild b/dev-python/python-ceilometerclient/python-ceilometerclient-2.6.2.ebuild
new file mode 100644
index 000000000000..b3a50f3da657
--- /dev/null
+++ b/dev-python/python-ceilometerclient/python-ceilometerclient-2.6.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="This is a client library for Ceilometer built on the Ceilometer API"
+HOMEPAGE="https://github.com/openstack/python-ceilometerclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		<dev-python/fixtures-2.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.1.0
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run || die "tests failed under python2.7"
+	flake8 ceilometerclient/tests/ || die "run over tests folder by flake8 yielded error"
+}
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
new file mode 100644
index 000000000000..113134710713
--- /dev/null
+++ b/dev-python/python-cinderclient/Manifest
@@ -0,0 +1,11 @@
+DIST python-cinderclient-1.11.0.tar.gz 239521 SHA256 959025508816705f9eb0568ef82e7f13e152ae717af18c3e499506b988335ddc SHA512 fa55a721668dfdc4a338f8a2d7d27aaaba4f11fea6b95858778ce014592198de9a9937a431f79142c60e6fee22fc76365912afb56c0db6de426631c840fec3a7 WHIRLPOOL 6e463025755e12ceba8384a9512659c29a733a2f12b77330d1fb8a75aad46c9c697e8b7dad48c3dd05f3942e8e81a0d0e2b1486e94edd607b4ad4c72a783da12
+DIST python-cinderclient-1.6.0.tar.gz 194134 SHA256 b00b7ffc3394b7ae3f8804a10877f7c980ff65f66d7b0d4b51bf4526933951b2 SHA512 421c665be2d410f511c751687df438dc268c4d2ae5ca83d8ee2d37d3b61cd08f718851c65338e14c8cbb8304703b5f9acf98611246ca6866c5a31cc3dd86e39b WHIRLPOOL 5e3f3326ce1ccd1cb555303b0d9f5ede0cfd4c329a490f79f88ad04e2dc9d6123d294b09d393a2fd7274f5b7a3696efeabdade9b39bd93da5b7e9d421b0e0fba
+DIST python-cinderclient-1.9.0.tar.gz 231331 SHA256 17cab946a64808404c6c6840d43487a5082a730cc517d0ebbe6824b54a267fb7 SHA512 be9c976ad9ef6005100f51bda75234253f9394aeda9ccc28f0b673bf39f5856fae2f23208e05057a58f2155d1b4fb728ec178b7fab21abca9eb88fe2ac82c018 WHIRLPOOL 88bc1c8492f0f508f4332b9cba1dba27c9184ddabd6d9f8131b3760d8229166fd10e9f366199155b4f67adde8ab13eb949cf1af0a9636d44f175e762dfde95c7
+DIST python-cinderclient-3.1.0.tar.gz 278247 SHA256 b1a304291e2b3125a62211ea5adefe7ab35ddd5229f813154fc8cd2ef80f3607 SHA512 6d828a96802d9a5118ab3b463ed9c8619530a69a1ca153f0c3d737e26bd692864ad2ba4c79e74a18ebf820222a75b81a9735f63c989817797689d8f399f76394 WHIRLPOOL c7dcbf3e911a5d8445a0d4cbfaefba00973d5d3be6679ba9e56f089808a51b3381bb63ef62f9433498103415f888be25c07c0a5798b6809089f581f9d415bfdc
+EBUILD python-cinderclient-1.11.0.ebuild 1149 SHA256 026ba4570f8f9cfa6fb35c83ab3f8607a17f814422f22d8f85c73f85879b8c65 SHA512 9c7df1392ed03af6ecad190b3534cad4dbae5049f2b119631bd53f11484f23e74b513e843bfd5a8454b145bb1a7950c9e6a86bf72be3c2e5cfb56081f3603568 WHIRLPOOL 962a7ec8f6c7a9c83a8245e8171d2c4e12ac8932433b4833a60ed59bb6e319294dce37ba5b44eb8f2abb0cad330b52a80f05eda924c78398d0a87e032cee023a
+EBUILD python-cinderclient-1.6.0.ebuild 1269 SHA256 1a19269a1f6c17344b76d8cdc3dbdd88b3bfb16dcbbe622519409098683ab3f0 SHA512 5c232add47932adf16b9d874f766f406044203af8a45938cfd30b65f6e7ab87244534f06bb40081272b210b1964e984531efbab82041f0b7cec4b5028d01294e WHIRLPOOL 7420094e80097e7122e0cd9955ae2c5bee5176829003e78cc5af7a7c6febb9b29652fba02a1626dae3c56ea5a5f1b367e0e4019b5a170cf38374cf30ecafca26
+EBUILD python-cinderclient-1.9.0.ebuild 1099 SHA256 7bcc1b932f57e4638c8329113a184784217c98977f8f0f91a71bc68518a55516 SHA512 2915a6f4a556784cb573ef6444e5904a05f99fe9a6a5504d17186f843ffdce279fc97fc7d66287c7b11390c53c647bb02a4e2f29bcc96fb9d3a7fc04833c3168 WHIRLPOOL 4b752f86e97e8b30e24b71907f4b5b99ad425fe0bae646e89fb2cdbc4aa763cdd4e1d779dbb6e146e437c868ceab7da0ef590d984a4706c759952ed15e3c9269
+EBUILD python-cinderclient-3.1.0.ebuild 1267 SHA256 27dfa604fc58c93905af3874a652deacb40d9560da6296a0d8bf40c6d6891780 SHA512 ecbe8642de0f31747543bf815008c29202f41c85b26d15e885a8cb0aa6552d6bde3331885e1b8fbfac7ed4624e4e1a5f2a6fcbf7a4121d0b017af838ec086ce9 WHIRLPOOL 7123754735463304ed275f3d8c8c06404646a859f80ddd00ab1bdb75d93cea7c1d32299c4877bb0dfadb897957f76b292b3859d2a8d81ba878fcf3a8e1047edc
+MISC ChangeLog 5357 SHA256 79be5ed743a6201e8f9cdca13e4be79d23361fc9bc9252f5b870f35f63e281df SHA512 78315da7fb490f4dd8d9a9c69d7d6b6bc40ce94f5a288d5f1b9f7d59e8423e721c88054abfd5dec42dd6cdd5a6d382b115c4e12ff36f1c7b7e67363142963634 WHIRLPOOL 4d777049faa0b34b81e0cef755ed47e438a3cafad57f29be9db100013e9b2425ede5b23783dc9a5f4f8ee3487907895d0f04d4a5a18600c889e09ad82e3222fb
+MISC ChangeLog-2015 3454 SHA256 2926eb6326f5563c1c882451a774e2d8e196a929aea012713fa9d14181982dc0 SHA512 21b0b7a5513a4ad883678151daa62bf0748532fdade03201ebca2ba7d625f17db4f331e10814192de2517226f2817cf3ed64a823a5d08feeae566a679775ff9b WHIRLPOOL 5746b9f0ed5c9090ae24571997e31e0ed2426a0af6e178a8ecb44839e33b03c53e3cb679152eb2429cc7219cea0249f6a79e556a679258bc2a21122711a7742c
+MISC metadata.xml 625 SHA256 a3e3a8b6fdf2b9d7a20e2346fe2269881140e9a152c6aea1c47a38edd915b466 SHA512 397ec06d3fb289940f654600dd452f5450ab6a87b4584f5486196a5467b7b5b9251c241c28b92a17b92da9d0a094b1a4d4ec303fe8eb3087c50a560f423bf92a WHIRLPOOL f34b82722341c7d15fee79c1da69d929f3674652abfc277d4d1ed0df4e74340a94ca2921d36a8de654249d7901477c8befddabecc9b3c7abfe035a6d0a1b6f02
diff --git a/dev-python/python-cinderclient/metadata.xml b/dev-python/python-cinderclient/metadata.xml
new file mode 100644
index 000000000000..1270d0b5f816
--- /dev/null
+++ b/dev-python/python-cinderclient/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+    This is a client for the OpenStack Cinder API.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">python-cinderclient</remote-id>
+    <remote-id type="launchpad">python-cinderclient</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-cinderclient/python-cinderclient-1.11.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-1.11.0.ebuild
new file mode 100644
index 000000000000..d41b20615d1d
--- /dev/null
+++ b/dev-python/python-cinderclient/python-cinderclient-1.11.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Cinder API"
+HOMEPAGE="https://launchpad.net/python-cinderclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-cinderclient/python-cinderclient-1.6.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-1.6.0.ebuild
new file mode 100644
index 000000000000..d4280cdf33cf
--- /dev/null
+++ b/dev-python/python-cinderclient/python-cinderclient-1.6.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Cinder API"
+HOMEPAGE="https://launchpad.net/python-cinderclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i '/^argparse/d' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-cinderclient/python-cinderclient-1.9.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-1.9.0.ebuild
new file mode 100644
index 000000000000..c4c2e863dece
--- /dev/null
+++ b/dev-python/python-cinderclient/python-cinderclient-1.9.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Cinder API"
+HOMEPAGE="https://launchpad.net/python-cinderclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-cinderclient/python-cinderclient-3.1.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-3.1.0.ebuild
new file mode 100644
index 000000000000..5ace769a82aa
--- /dev/null
+++ b/dev-python/python-cinderclient/python-cinderclient-3.1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Cinder API"
+HOMEPAGE="https://launchpad.net/python-cinderclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-cjson/Manifest b/dev-python/python-cjson/Manifest
new file mode 100644
index 000000000000..98995a2988c9
--- /dev/null
+++ b/dev-python/python-cjson/Manifest
@@ -0,0 +1,4 @@
+DIST python-cjson-1.1.0.tar.gz 12298 SHA256 a01fabb7593728c3d851e1cd9a3efbd18f72650a31a5aa8a74018640da3de8b3 SHA512 039e5f724c3a49d0043f788b0634c4191a6ae5abaa012d8491622e5a9ac22ecc5a342a0243f70b0ac02c8640243aaf8b0cf20a0ab12ee4866d9af966d73c1706 WHIRLPOOL 509817683798ef7e9dd7a22c13bff52ce5eb48cdf4aed996603b89fe8d8270e24e90f240adcd14efd1d5326c45edb4f440269e32b7bcb445409a83d44baf067f
+EBUILD python-cjson-1.1.0.ebuild 367 SHA256 b6911cb3217cb8af2c7d93521d04c5ce0f45c9d509d6f52cb5dcd637e7c91596 SHA512 d7eaa436a7c7354e46edb0d7f75f512831ef90b21a4be1f279f56a18022825203b20767d3e069de93ceb794b482272731b321e69ce6084ebe92a256f210d0ec0 WHIRLPOOL 983b2f61afecfdbe585266e75db5cf068b98d94a7d63be6bb2567024a9ae9d67c51e3e0fa719a4e1f87f28809b7c8b5f5d9635c1dac41d5f4eacf43188d2b63f
+MISC ChangeLog 832 SHA256 b069c3aa6d76adc3183b51ea72efe186d2bf4eb7b438b253f76bd8b37e8e07a2 SHA512 70ac986bea72f2c2197b010531cab7171ef90ceaff6a0293c67c20e2534e3f8814c217285268b399ef54c962d483bd0dd12d54dc3b54b6da4a47da45639a3b23 WHIRLPOOL 75ed8086b8110866ac6565cb969cb378a3002ae0bb2dc15908a2223a96cc6f497d548d1c2c744fd364c5d162e686de575f866b2cf6219ca5bdfe43ac08bd3620
+MISC metadata.xml 1135 SHA256 7ed7e38b927405d8d80da4b4ff0e113dd2a9f7b30a9096b80daa1c26e58c6fd5 SHA512 3375f2d4c74b6e111b9e2b9eb9cd23a6660313e05d82b46c05349c517f78dd2ff0f057aa305601b4e0a22ec7db36754fa23108c4442f883824f67a6b6220aa1c WHIRLPOOL d56752147c1230ce973e3a327d0d3d3bd32ff908e081439c4bf05c347e90e7cde566a41b8c8fd0f07aa5a72db4629fd98de179cca896007f231afaafee7944dc
diff --git a/dev-python/python-cjson/metadata.xml b/dev-python/python-cjson/metadata.xml
new file mode 100644
index 000000000000..ff94a57eb230
--- /dev/null
+++ b/dev-python/python-cjson/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		This module implements a very fast JSON encoder/decoder for Python.
+
+		JSON stands for JavaScript Object Notation and is a text based
+		lightweight data exchange format which is easy for humans to
+		read/write and for machines to parse/generate. JSON is completely
+		language independent and has multiple implementations in most of
+		the programming languages, making it ideal for data exchange and
+		storage.
+
+		The module is written in C and it is up to 250 times faster when
+		compared to the other python JSON implementations which are written
+		directly in python. This speed gain varies with the complexity of
+		the data and the operation and is the the range of 10-200 times for
+		encoding operations and in the range of 100-250 times for decoding
+		operations.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">python-cjson</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-cjson/python-cjson-1.1.0.ebuild b/dev-python/python-cjson/python-cjson-1.1.0.ebuild
new file mode 100644
index 000000000000..f284f1fb32b1
--- /dev/null
+++ b/dev-python/python-cjson/python-cjson-1.1.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast JSON encoder/decoder for Python"
+HOMEPAGE="http://ag-projects.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/python-cluster/Manifest b/dev-python/python-cluster/Manifest
new file mode 100644
index 000000000000..fc55cde935c8
--- /dev/null
+++ b/dev-python/python-cluster/Manifest
@@ -0,0 +1,5 @@
+DIST cluster-1.2.2.tar.gz 44074 SHA256 7d62faf24fa08ef13f71013e9f624c528b12f0d1e6ab58c4bd26b5874d3163d8 SHA512 02600fa1fccdb07251bea83ab81908c22968fcfd4d6ccf382a75ab43117ee8ecc4385f7666f272d1e6cfc0634f7e15778635b50fde572773e564604c981e75cf WHIRLPOOL c5ee445f0b51b5af4e927049ef8cdd5decac3cef73f23d909b4b38b9b896100fffb531af7bf4ac059aae19ca07583d1b60e0e79cb874b718033474bd148d9731
+EBUILD python-cluster-1.2.2.ebuild 563 SHA256 e29aa1cdd58bc662c354fe437cce98d88e0b88901973f1de67386110a4a0f375 SHA512 70c6374abcef0a787e9a880a63a59fb4b5f7d7bebc2a23c404c2db187be0c327c74d0ab251c44c1b07e6fee4c9dbe080eabd77ff2651bc441b287a766ad741ff WHIRLPOOL dbeef4e7fe5b21d226391585df7f847d2b97f3f8b3ad1fb58a35dd868859890e6c35745d236ca4e9258c353e6b0ecf1ae1715104fe721aa4f93532de7a76690a
+MISC ChangeLog 2837 SHA256 29c1abc14d71fa895f748da8cf6eac1748940809257c01f419b5d44434c65a0e SHA512 476166f0f9d2e5dd2bcd63c1761c29b16e121dab93d80d397aac495a24b97326e7bafa843758220aae8585e70a9f79f14ef7e26125890d641403014eccb73766 WHIRLPOOL dc992c892f650b9c903933a12d27638ad5bab3d4baf5f49f03e23224926ff6495acfbe72eb50a7e8d36b0426dcb4047114e205721239b7b5f93875dae4f2a8a5
+MISC ChangeLog-2015 1667 SHA256 7084ccefb4a7f688bfab50bb1fd1f4fbe871a22311dfce6f21b66fca45cf2c3a SHA512 fb4b88160fd3a60cee84f9e681908429b86c7488a85f37bfa124bb028117fb78e5d9c3fe83697a1af37e19365cd0e31e19810007e7262f4a2cee4f670795318b WHIRLPOOL f229a7dd5061b9a972dedaa3d528f7f9fc3881a4561458ea3dadf389eb28ba51a9388db5eb8a283ae41b00419a935526a14a6768e5a6bf7144f0c9ffea42beee
+MISC metadata.xml 383 SHA256 a05c05356281e1dd90423ce8e0a8e92a2854ce9b331f56e89d095602e6493f04 SHA512 35d45b3af02e3f3c1466d9b915bb8bbfe719105ce91ccf4cd3604c3aa6178228c648316ab2c4f17a113fcf50ed9d1eb94187bf8fced7df1f9f82fb5eaffff652 WHIRLPOOL 64fc378f9f69005664979c729d3c72de6447f088fa2e4b82bf4d27d85df9a37fa4bb864014b8714b2db49289053e4cf78a8e21079c01397583062d072efaa81f
diff --git a/dev-python/python-cluster/metadata.xml b/dev-python/python-cluster/metadata.xml
new file mode 100644
index 000000000000..070c122ee7a6
--- /dev/null
+++ b/dev-python/python-cluster/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">cluster</remote-id>
+    <remote-id type="github">exhuma/python-cluster</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-cluster/python-cluster-1.2.2.ebuild b/dev-python/python-cluster/python-cluster-1.2.2.ebuild
new file mode 100644
index 000000000000..77c50fcac203
--- /dev/null
+++ b/dev-python/python-cluster/python-cluster-1.2.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Allows grouping a list of arbitrary objects into related groups (clusters)"
+HOMEPAGE="https://github.com/exhuma/python-cluster"
+SRC_URI="mirror://pypi/c/cluster/cluster-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S="${WORKDIR}/cluster-${PV}"
+
+python_test() {
+	"${PYTHON}" test.py || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-ctags/Manifest b/dev-python/python-ctags/Manifest
new file mode 100644
index 000000000000..218a972b1fe6
--- /dev/null
+++ b/dev-python/python-ctags/Manifest
@@ -0,0 +1,6 @@
+DIST python-ctags3-1.2.3.tar.gz 45646 SHA256 57a0ef06bc4678267aa991086d7643ecb268986ab94a2b643d328f7bbb9a1ad8 SHA512 3bbe730e75a5ae36208113c6e2c43894942002ee37ed700990416fe54d5644b2d2be795935d1392191aae11797ec613ca143343a287596a0a327027c2f170525 WHIRLPOOL 1e4aa102b84f1e8bcbf1a3da89b709fc63497a7840e8c8ca99077c4dcc4a53e36e26248021a93b31a3a270c1935bf0ac672d8cc498db45ed82a577b0a8e8d9eb
+DIST python-ctags3-1.2.4.tar.gz 47774 SHA256 62e1d48a8cd88756767f3f5e3f1b1a81bc84deeb736f0c9480a5b5d066f63c3e SHA512 db6be08164da71b17de1a7fa46aaa60a5b83784f18ca4e2314e3b9954abe8996d5e07ed98aa024f70899fe87cf53d37671c9f42e567766b4a8af0f728df2bcfb WHIRLPOOL b2f36d31fb17112af50d153a75c816e78046edb4dc28da520f143aa081317c515e3043ca6d85c3d57dd44cab2392c6c79567e86a5ee6f7ac9050bccb15eb7661
+EBUILD python-ctags-1.2.3.ebuild 560 SHA256 b5d1449f0cc9d6bab3e0c2620d846c3aa38250e15a72e6e1104edda809a64c90 SHA512 a079511d8c81d637bf8b289d31b1fa367cc8659d3eeeda3a2a7f7e70452c846ace9053d1e99250936cfed19668543b77b5799d2fdf238ecdb0a4ef48cc0338cf WHIRLPOOL b91a1a90e44559c4324a83bd1012422164d7fbbfe4ca0538d2b0b043ff9a7ec5f37eb4f178d0102a31361f8e70dc94f8967d06308a2a46468eb74a67e76b18fc
+EBUILD python-ctags-1.2.4.ebuild 573 SHA256 286d1cdb84a1f57b7b756a55a864fc36aa71ce04eddf12b088217e27266a7566 SHA512 db31dfa573e1ce74f7ec8ab11cbb8a87d8c465347a4f15d6b5ec3386332f9b72941deb089785dc8e82c6e00d4f3f91db4724d9787dc3e56c73718dee30db0cf7 WHIRLPOOL 9d559b4a965891cfcb3b34594193f7177ec9c85e110182cc91bbd5a28c986ebc8e5e0edb1ac2c7fdccf39b35b0a8f275f89958cbb06d7213b3d6f1c553613630
+MISC ChangeLog 1015 SHA256 ff9e5283a9026bb050fba1bae24cdb452f87a197353bc6683064f2a9e86daa33 SHA512 1b0988f4018565c0a8fb97eb0ec5860269304e1224f813d969f7a06b8be0367284c3849ba9a0a60472a603eeba873a7038e9a812b649ff9643cf7e7571fbced9 WHIRLPOOL 31f889a1efe5c66e01d3b7a453e5dbda61c3e4f65e498e3b56f67e031b67b7b1e6956e33f29e314df74e74235e72f9349579ee35524a81666310fe3fd8acad75
+MISC metadata.xml 578 SHA256 0207695afeb41c691f9d5302fda46f18230e431407b4c8a349dcdf4a3a3d8256 SHA512 3279f0da2c0ce53c6675426194c65fb4a293b4e11b87265e8b94f5ac3865e9e67c9b60f1d70cc1190984a187db78fe8439c104c22c33e04be13ecfa7d8c5bd49 WHIRLPOOL c54c24c25595ab26469acda7bfbcb700fc06650f5affe4bf44cf43a820428ac910c172c415662c35f6abe01334dec57dcd56bbd57a5bbc39f94c6a7ab548722d
diff --git a/dev-python/python-ctags/metadata.xml b/dev-python/python-ctags/metadata.xml
new file mode 100644
index 000000000000..d7da71ba73ff
--- /dev/null
+++ b/dev-python/python-ctags/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-ctags3</remote-id>
+		<remote-id type="github">jonashaag/python-ctags3</remote-id>
+		<bugs-to>https://github.com/jonashaag/python-ctags/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-ctags/python-ctags-1.2.3.ebuild b/dev-python/python-ctags/python-ctags-1.2.3.ebuild
new file mode 100644
index 000000000000..d4796aaae819
--- /dev/null
+++ b/dev-python/python-ctags/python-ctags-1.2.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="${PN}3"
+DESCRIPTION="Exuberant Ctags indexing python bindings"
+HOMEPAGE="https://github.com/jonashaag/python-ctags3"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-util/ctags"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-ctags/python-ctags-1.2.4.ebuild b/dev-python/python-ctags/python-ctags-1.2.4.ebuild
new file mode 100644
index 000000000000..f225cc435abd
--- /dev/null
+++ b/dev-python/python-ctags/python-ctags-1.2.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="${PN}3"
+DESCRIPTION="Exuberant Ctags indexing python bindings"
+HOMEPAGE="https://github.com/jonashaag/python-ctags3"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-util/ctags"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-daap/Manifest b/dev-python/python-daap/Manifest
new file mode 100644
index 000000000000..1e0f9aa7518c
--- /dev/null
+++ b/dev-python/python-daap/Manifest
@@ -0,0 +1,5 @@
+DIST PythonDaap-0.7.1.tar.gz 25944 SHA256 ea1d3a8141654781a0df31e6607c4722436fa33eb2e9934492770b3b61be8122 SHA512 9ed6f1964fa0b357ee2d1e81dbdf79303f12feb1e753e6e8c987f28212a2eb3041fe1f443a4e5e43c196808192f116d045b0ea6d42dc76020ff4f252d423eca8 WHIRLPOOL 1099606784e69534d9ab115d6a561ebc6f9bff940c17d3cb1bf907c8484cc74f52f2a9c8aafd06e92cdc742bdf04e0172ca5f18d275666d3ba808ba5e0dfe3f8
+EBUILD python-daap-0.7.1-r1.ebuild 671 SHA256 4b310f71bd57fd006246a2c01a1411d51ff72a07504a5669402cfa1aad14a5ed SHA512 a3ed55833c2bb00ab50f1a49c5ce236b6c32f30c23d18b4c01cf28fe356e8f8fbfa8ba7307689030b96e869bab77a26ffba61019cfbaca6572411600922a2295 WHIRLPOOL 0c21133065057edfdce006a1a5f4a20734e64b2ff855d87efad8a8e7da49cec326c4f0eda224a268e3eb6eaec9838ae8d7a32072763fc3a8e2bef3ab2bbca990
+MISC ChangeLog 2630 SHA256 4b2db1b90d7088231c42e20f396446cdb138d7d6df3f638160988c0da5edb154 SHA512 fc9428931fc35d3910f3091b3cd592baa2cf0ea9af93d72c1c7a80b8d123f6ab8a92088ce925119acb21b7799a20e6c17373c768230257925eda5c6dcf01f8ad WHIRLPOOL 33006a0690fbb71590e8f06a6c214d3808e520cc20bd9f51bbd0e17652fb28e598828553f32c05986595ac079aacc89e41d8335c5dfe6d9a751a699e6ff4243c
+MISC ChangeLog-2015 1215 SHA256 9485f3efdda6e622ee7d774ef96e38ba27c2d8b35bc21f7b62244c232730a36a SHA512 bd47901161618ad79b1e8a6d53c12dd8f99d34e02179ebe8ba17c91f3767a98ab9d42265e871118dc0675d7d228837b1ecf5669b2106f494156d84f82b36a7bb WHIRLPOOL 718e1b4a487e71ce3db11f6211b44e2d80216fa2b463c7ef7e3a02552d2d8a5da3aff5a2145ac4bd15e1418bfbc422b98c101681446e461e709cada903e2c2f1
+MISC metadata.xml 353 SHA256 bc8c169ee6d20b278e4fa97db9855aba0706b54053977d69e9dd925b0bbba6b6 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1 WHIRLPOOL 03d7dba44d17d9499312e3a29c1a0cea78c9b5276f788784d77e47d52b5caff6ac11acf985dc6d3f57fd13095bc7dcafec7e7503494c62ccea08d060ecebede6
diff --git a/dev-python/python-daap/metadata.xml b/dev-python/python-daap/metadata.xml
new file mode 100644
index 000000000000..d0913ee5d1cb
--- /dev/null
+++ b/dev-python/python-daap/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="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-daap/python-daap-0.7.1-r1.ebuild b/dev-python/python-daap/python-daap-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..57fde7244ee8
--- /dev/null
+++ b/dev-python/python-daap/python-daap-0.7.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+MY_P="PythonDaap-${PV}"
+
+DESCRIPTION="PyDaap is a DAAP client implemented in Python, based on PyTunes"
+HOMEPAGE="http://jerakeen.org/code/pythondaap"
+SRC_URI="http://jerakeen.org/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	append-cflags -fno-strict-aliasing
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-daemon/Manifest b/dev-python/python-daemon/Manifest
new file mode 100644
index 000000000000..a6929cc70bcf
--- /dev/null
+++ b/dev-python/python-daemon/Manifest
@@ -0,0 +1,7 @@
+DIST python-daemon-1.6.tar.gz 41564 SHA256 1665fb16bfeae72f16aa2de40bc75661458bd42731a7d463a911a8d5eaf96c0b SHA512 ff9480844d8f57a09f27067aaa78669c167f66b2cc05f9b3baa660bc0aa21228d4894eeaeb3440611c1e0f0d5633b1c60eac60893da4a86d1db4b94d99961299 WHIRLPOOL 35ec95c43b7822fa9abca9bb21442fe2b9f83b7171d8e8a87cc12a7e07a2653fbd5b4aea7adbba799c76d8b4cf3c844b665ae3b90d5b77afe4b33c88dce85ba4
+DIST python-daemon-2.1.1.tar.gz 74276 SHA256 58a8c187ee37c3a28913bef00f83240c9ecd4a59dce09a24d92f5c941606689f SHA512 e2abb9fafea32fe5bc7d239387e3c22aa99f63df31cc4f57908ffdb5dc7f2768358df6ba5f3e827b4f83163628649f58a973b548066e8c79ab3c6c6ce09d8007 WHIRLPOOL 066509bccc63719553749446863996e592cbc28c23ffb6226044ff027c934396c6605938b4554048475dec3cd0fd6a965de5db50ac6c4e4952880abc13ee0c3a
+EBUILD python-daemon-1.6-r1.ebuild 625 SHA256 e43276fba0703f64f46579b726ea2d44013166fa9c69f6dac49635f98bd41c38 SHA512 5c6b45c1e0a35a81f4e9c8e5f03ab0128e0ce8360fdc5af7c9c80bc2d9d92448b91bd94defeada3829c575fa9ddf9684a82c4633de3d27cf4f570f5c2a34f587 WHIRLPOOL 3ac73a9ab7929eac6c25ced6b92c1ecf8a30dcec6e0e35718b7b7b2a476f87dedfdca666706705fc4e40c5c3e1d78b7b8e218c487a2c88daf7ad33ccddf8e8a8
+EBUILD python-daemon-2.1.1.ebuild 827 SHA256 6d9a2fdb4f35e1104b7c63a8187b42717708c291e76900c9c19f5034873ced9a SHA512 97cc93819eff676e4065643c5c81d35455dc3883fb522a4465d6fcc67630e7dee92cba44d3872e11140570d594c09dd533958ca97de9d4eb1e14fc6a3025649d WHIRLPOOL 5788d4f50c5c23437d35c92eeb55da825aa1fca5b8a29dd7d6f714fafdec76d9c58b8e10820a4c1eca51cabc4937cb07d11ed764763da299b690cf7f8a6b63bc
+MISC ChangeLog 3357 SHA256 addc45ddfac79335a0861423abbc1e60fab0537a1e5541d4e502c470926f1dd3 SHA512 8d5e59a88ddb6b8d93c562290113a959dae44ad5b9e7aa82e896e8b479547d8454ea67f071e9f575a0f5d2869ca45872703da05a4eab503eda2948c7f71ea4f8 WHIRLPOOL c810334047cc4750690d544306c71dcea5b60e0bae876f4d131f0097f5a6cd03a93f68c324cd24e1fdb5a39857a4c0f8fe26ef3cff5611550bafd4eb361fc8b2
+MISC ChangeLog-2015 3418 SHA256 d2f52008ffbdbf332294c31c1a3c616f48cf70dc92dfb032356304d12bcb1a12 SHA512 4b87e648cca046bc558fc02b8493ce4ce748bf9a6162987dc8fd053d336ea60e7947f2fad348763d8af50bd467e952fe5a7264620349c94b66de1778038bd8b9 WHIRLPOOL 5871e842814bcb8323281536e89f8efc61052d6793201f154d19bac3001c9c3e4c4cb9a994b8a382288aaff2b68ba43c2b47ff40674dee43f20aae4e228f3fc9
+MISC metadata.xml 316 SHA256 3cb9349455ab9f302b0dda516be484ee89ccbf5dceb4eec05fd9ff27a6b5765c SHA512 b3b79f6094ec59bc09c2a14e3752edc0722c0e50c9559ac59e6c1355577c1f36ff98ccf6af969d0624b1e6b8b907a7886f6daafb6c0d789a403ec402083b06a4 WHIRLPOOL 362ec246102eee16ab7c3bc0c071c9e11ed8924c6cc5855b6a1d48236e0377e212daccdd03830a5dbab404fa8c775de6201d7727dd531773d0973314b26cc885
diff --git a/dev-python/python-daemon/metadata.xml b/dev-python/python-daemon/metadata.xml
new file mode 100644
index 000000000000..19019cc44c02
--- /dev/null
+++ b/dev-python/python-daemon/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-daemon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-daemon/python-daemon-1.6-r1.ebuild b/dev-python/python-daemon/python-daemon-1.6-r1.ebuild
new file mode 100644
index 000000000000..4ef2a6091c63
--- /dev/null
+++ b/dev-python/python-daemon/python-daemon-1.6-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to implement a well-behaved Unix daemon process"
+HOMEPAGE="https://pypi.python.org/pypi/python-daemon"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/lockfile-0.9[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/minimock[${PYTHON_USEDEP}] )"
+
+DOCS=( ChangeLog )
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-daemon/python-daemon-2.1.1.ebuild b/dev-python/python-daemon/python-daemon-2.1.1.ebuild
new file mode 100644
index 000000000000..138f1abc2e54
--- /dev/null
+++ b/dev-python/python-daemon/python-daemon-2.1.1.ebuild
@@ -0,0 +1,33 @@
+# 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
+
+DESCRIPTION="Library to implement a well-behaved Unix daemon process"
+HOMEPAGE="https://pypi.python.org/pypi/python-daemon"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/lockfile-0.9[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/unittest2-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( ChangeLog )
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
new file mode 100644
index 000000000000..05648525d7ba
--- /dev/null
+++ b/dev-python/python-dateutil/Manifest
@@ -0,0 +1,12 @@
+AUX python-dateutil-2.4.2-timelex.patch 468 SHA256 d8ea8e3b2b70a882e0f720024ab40116ca08356ef1cf6adea8a0182a9dde844a SHA512 d8a735921f73c09239838527e8caa7932199bd8d5499b549a00283a7355bd8454b19617b1e6087a58a4393ae01fa63c5814cda7d1b09db28b76d605bf96929f2 WHIRLPOOL c2ea1eea6d1b3a9f2e702e1f707e81939323752d018dc11250f520035e8fc09364c46b17c107932c783c12ca6e8eae569c6fac680eb3ccfae16dfa866b883e0a
+DIST python-dateutil-2.2.tar.gz 259085 SHA256 eec865307ebe7f329a6a9945c15453265a449cdaaf3710340828a1934d53e468 SHA512 cb278b8e18da3b991c6415ff59e9f3aa87cfb2e52048b3f74a9e3d183e0cc5bf71595123c644d0aea75084e653a885cbfa70c8ddd8b6a888bb13183624fcb46b WHIRLPOOL 545495d466cbea8f750b7e997699e2466131ce780ed73e18a880934a5255f759cee470b6f85a16a44f62bacaad14490e72a212c4cf6e53f0fe69b87492f9d055
+DIST python-dateutil-2.4.2.tar.gz 209120 SHA256 3e95445c1db500a344079a47b171c45ef18f57d188dffdb0e4165c71bea8eb3d SHA512 8e38721e6d132850f85e7808d2731285d2c12eae2a3e0cbebe05265d0837ad22d4d94b611e146028ea3d23a3e2611b281dd6224081a69dfe4b58cf3b378d7f0d WHIRLPOOL 88ddb75f52a95a6b7197b41364b80968bf2c21a3bda9c7b992726ef35ca934a66a5d8ccd773d7647f985541d87c66fa94af13600b0165707af9b73d1bff8887e
+DIST python-dateutil-2.6.0.tar.gz 258060 SHA256 62a2f8df3d66f878373fd0072eacf4ee52194ba302e00082828e0d263b0418d2 SHA512 1fec6dd6fc00650821fd826405414bcde79e1542a53608ebd837e924b4abc147a369214ec064adbff682fc5ff67440086f3000eaa77b274c7463c3f58686ced9 WHIRLPOOL 1cae1f1e3dfe09c3215bba031ee5a604ffe86bae7b70999320f37232ddaf5401edbb56697157b9b89316220d932faef07e7d7e6a2e68992fc17bb91bf86b24b3
+DIST python-dateutil-2.6.1.tar.gz 241428 SHA256 891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca SHA512 f16dd29fc975629f594dd2683a525e2a86acb020bf8962558d19040b14ac6f19d4ab07a910d6bb55c9db3cc02b5472774a3a05ccc86cf624ca5e5144463646db WHIRLPOOL 963b2d15373e0d83bfb611c1bd6ac86463f5c88b4a20f42ca13e32ebf9d442994ecc3b22be09e57ed2983b20072d229623ee15aa3e4d9ba884d898723cbe0c72
+EBUILD python-dateutil-2.2.ebuild 1329 SHA256 176ee8ca862bf41dd12ace470afd421a5e7b1712e2eeced3c01aec85e260666f SHA512 214a17457643f7a9630402037fea398f0d432c038c3bbd14bab9811a2cf701bd11b8dd9658f7fe54f54553b2f61c64e74ab9055c5b4044fc02897ac1d68a399b WHIRLPOOL 94931bc3a568a54f2011027bb8a0f6cb0891d48e1c6463c30a66414fecba28dff842d584fc7c4125b08ffd22bd141ef451554d87beca2de3785c45277c93b06e
+EBUILD python-dateutil-2.4.2-r1.ebuild 985 SHA256 ba899e25874a1da0e9d1cfc5d690ac79bb52ea52600bb7356d4e0519d62684e8 SHA512 f719c816007cc83c483412e6436eeb652cbd33bf9f1533762c72449b110c1c703ea2ec0c7ccc8e22b382d418149689f3cb1e1ae39b6c2747bb8f7091b56fa176 WHIRLPOOL 0052f73737a56d6062459179b87f825e35f87dc59b439d21c2ccb02af8a124212d5569c134aae9339795a7da9025ffeca15c983320dce6696ecfa4c1379513a9
+EBUILD python-dateutil-2.6.0.ebuild 946 SHA256 d510b505b773b5c74214a256b10c1ee5424139481ba73adf7f4961dead33fa20 SHA512 7edb361545ebb50c60c553b4a726b613e038657cfd62a86e577e6394482d7488d0d2afe2e650259ef2d8283dcbd87abd471cffeb39d33348213e4c7b9e0d7a34 WHIRLPOOL 550ffb4abaeae3ff1ae2f42f29b684c8a94e78138db4f7bacff617b8f8fc760adda8cbf60adb85d7d78404b3101b724bcef884eefe78915e495f732d356deba8
+EBUILD python-dateutil-2.6.1.ebuild 937 SHA256 219fca4fcc8dbf79961d4d7121019221618996156b09555f36f18ea638aba4d1 SHA512 df34b5e1c8d87b23be9ab7564c1e601557c3f8a5e3093ed4926252c11364ef917714ad1b9768c63d5bbad82cdc3e0dab93ed5a2b3c6d5e24b8aa0b7063382bf4 WHIRLPOOL f858f7362846e4932bdc2b42c27d920afefd1e44ec1e95d61be60660a06289b2eb22fde767b66ffcca2cffdce03d9f124169cc84ec2497624ec7279b2ecc76f9
+MISC ChangeLog 4906 SHA256 a19b62b4b3d86b3b045709ce17b511328ad0ab8ac93e8ed89b988800498eb485 SHA512 af7e5c97eabf3472dee4c03f73db9aa4580aa302473181e13d5088c0e333d2a4d15d29281003edfb2e431af68095cc0a394dfab450935195e20c61bff66b5eef WHIRLPOOL 377286b3363fe1e78d94dcff64fdea2c765a587f0c51fe98b8013f3f607793a57f193ce7fbfb1b5009dc99ba0152ef4be9f9e2c4081aae40329fe27a11b186b6
+MISC ChangeLog-2015 10635 SHA256 636cebef239d2c893b631cac56b4f411b835e5f4957890a4f77f8751d9909d0b SHA512 18af6739457392aabf58dba688fe6a8016c0b4dcc622c1010076ec38ff334f419aaba065a062da376371b2385bccd8e5e0ed5a2bf51e3e2015c1fd7ab2db09cd WHIRLPOOL 7032c6eda78eff8f24d1c7e0f03dd85a1cd9c3fecfc98430203ea56edb31dad70331503acbdb9b64e31b2510efa5647ed64d60f0945cade4165165f0621369e5
+MISC metadata.xml 603 SHA256 f3a4d2cf042eb37dc92f3920e259385541b28c0b5745c658957b72db4c23f925 SHA512 87f5ea8b8918e72b57b91d32ed103d88f93ad9fbbe0a8f3f8b8ea72627d82e5cac25246553a0cb6988af26c30841ca5a3ddccf7f957603283a1b4e455a7c6439 WHIRLPOOL 5d70545ea532b591a934f1dc57b06c9b0d856d7a7b415788ab66fb58518716fff9bd8b1ecbe060ba2b72314c05d86add8d55fa613e611f366e029a036c77e32b
diff --git a/dev-python/python-dateutil/files/python-dateutil-2.4.2-timelex.patch b/dev-python/python-dateutil/files/python-dateutil-2.4.2-timelex.patch
new file mode 100644
index 000000000000..bccec4a56ddc
--- /dev/null
+++ b/dev-python/python-dateutil/files/python-dateutil-2.4.2-timelex.patch
@@ -0,0 +1,13 @@
+diff --git dateutil/parser.py~ dateutil/parser.py
+index 8b6c2d28b8..75453ef49e 100644
+--- dateutil/parser.py~
++++ dateutil/parser.py
+@@ -32,7 +32,7 @@ __all__ = ["parse", "parserinfo"]
+ class _timelex(object):
+ 
+     def __init__(self, instream):
+-        if isinstance(instream, text_type):
++        if not hasattr(instream, 'read'):
+             instream = StringIO(instream)
+         self.instream = instream
+         self.wordchars = ('abcdfeghijklmnopqrstuvwxyz'
diff --git a/dev-python/python-dateutil/metadata.xml b/dev-python/python-dateutil/metadata.xml
new file mode 100644
index 000000000000..4bee24c257f5
--- /dev/null
+++ b/dev-python/python-dateutil/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  The dateutil module provides powerful extensions to the standard
+  datetime module, available in Python 2.3+.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">python-dateutil</remote-id>
+    <remote-id type="github">dateutil/dateutil</remote-id>
+    <remote-id type="launchpad">dateutil</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-dateutil/python-dateutil-2.2.ebuild b/dev-python/python-dateutil/python-dateutil-2.2.ebuild
new file mode 100644
index 000000000000..010d7200f1d1
--- /dev/null
+++ b/dev-python/python-dateutil/python-dateutil-2.2.ebuild
@@ -0,0 +1,52 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensions to the standard Python datetime module"
+HOMEPAGE="http://labix.org/python-dateutil https://pypi.python.org/pypi/python-dateutil"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="examples"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	sys-libs/timezone-data
+	!<dev-python/python-dateutil-2.1"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# Use zoneinfo in /usr/share/zoneinfo.
+	sed -i -e "s/zoneinfo.gettz/gettz/g" test.py || die
+
+	# Fix parsing of date in non-English locales.
+	sed -e 's/subprocess.getoutput("date")/subprocess.getoutput("LC_ALL=C date")/' \
+		-i example.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" test.py || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	rm -f "${D}$(python_get_sitedir)/dateutil/zoneinfo"/*.tar.*
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc example.py sandbox/*.py
+	fi
+}
diff --git a/dev-python/python-dateutil/python-dateutil-2.4.2-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..9be9f248eb87
--- /dev/null
+++ b/dev-python/python-dateutil/python-dateutil-2.4.2-r1.ebuild
@@ -0,0 +1,42 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensions to the standard Python datetime module"
+HOMEPAGE="
+	https://dateutil.readthedocs.org/
+	https://pypi.python.org/pypi/python-dateutil
+	https://github.com/dateutil/dateutil/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	sys-libs/timezone-data"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-timelex.patch
+)
+
+_python_prepare_all() {
+	# don't install zoneinfo tarball
+	sed -i '/package_data=/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-dateutil/python-dateutil-2.6.0.ebuild b/dev-python/python-dateutil/python-dateutil-2.6.0.ebuild
new file mode 100644
index 000000000000..9f4ad2c27a3d
--- /dev/null
+++ b/dev-python/python-dateutil/python-dateutil-2.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensions to the standard Python datetime module"
+HOMEPAGE="
+	https://dateutil.readthedocs.org/
+	https://pypi.python.org/pypi/python-dateutil
+	https://github.com/dateutil/dateutil/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	sys-libs/timezone-data"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# don't install zoneinfo tarball
+	sed -i '/package_data=/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-dateutil/python-dateutil-2.6.1.ebuild b/dev-python/python-dateutil/python-dateutil-2.6.1.ebuild
new file mode 100644
index 000000000000..06286f94fb9e
--- /dev/null
+++ b/dev-python/python-dateutil/python-dateutil-2.6.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensions to the standard Python datetime module"
+HOMEPAGE="
+	https://dateutil.readthedocs.org/
+	https://pypi.python.org/pypi/python-dateutil
+	https://github.com/dateutil/dateutil/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	sys-libs/timezone-data"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# don't install zoneinfo tarball
+	sed -i '/package_data=/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-ddp/Manifest b/dev-python/python-ddp/Manifest
new file mode 100644
index 000000000000..8635a7a521ce
--- /dev/null
+++ b/dev-python/python-ddp/Manifest
@@ -0,0 +1,4 @@
+DIST python-ddp-0.1.5.tar.gz 6032 SHA256 1420f23e89c4ac378ba2f4b311ddcd032e0f0af4f79f8b0829cfad972d2e588f SHA512 25200624a4a2145d3189646c00ba023f1e55010ca1756eb36505f85b6faa24da8a505f2784b8c445232ed471d5d402b4c0f487b3c9460c948295cda74faa7fbb WHIRLPOOL a3c4f3a1570fd4e9c4e30efd11954d6d927bf22beaa47adb4772b43e4bf8f88e42079a263b3ce72647628308bf52e19681cb390041a14cfb9529f74a2cef679c
+EBUILD python-ddp-0.1.5.ebuild 557 SHA256 593d840780e5d62483500ce1cd644273f171567c7b7518820f0b7b78e27fc899 SHA512 a0a095948ef53af441226ee80a9845c8ea5bac5bb663f6df40758589ffcf3c8d8ccd0fef301f37fc1fe801c5e33520f17c7905edd81f9e9eaf3c44b2fee89e86 WHIRLPOOL 399c82d1c461b6474241090ccfe45140ef0f5ceb9c39f1f5f4bb75d8e8801caf6a2e8269c1010e698fe5bfee551fa26c393191cc3bbc7d25636e5cb9ff3fb6a8
+MISC ChangeLog 1298 SHA256 91ef6d9bd18cb89b3271842681fd281c676381145e5b5b9b320a6f25c9029fa0 SHA512 b42137bc4d1a2934787b97c6013f2319ad51c071d3c968780f2061e0add1fa526fc642608808cde9e8451f87c16163c2d9221a744062fe6b27ed83fcf30238a4 WHIRLPOOL f822bcc78c5e1c573936afee939dfdf3a37c64ca5028022ae62b3a5884e3e56b0563dd808caf45228af01ff810e888b3edf1ea63d380fa35816fd9d3591b671f
+MISC metadata.xml 578 SHA256 226027d556bb5529dc32aec2a8fe54f80cd8234e75eab62a75659f1a1616e2e8 SHA512 1e66e8908ef5f4fced36e2d6386cf0f53fa16bbddd0bc08891f8d6cdfa27e3f9546b2fa8015289b8a0a254dcf0b192269fc4c212df1187dba5729249ba5a8c45 WHIRLPOOL bf995d1a04261e7a52861d792957a619682c18027155c2800307cd2d124dec021380b5d3704e93815194e97d3a235662b7f2405eb5a69f8e388bd7c673411164
diff --git a/dev-python/python-ddp/metadata.xml b/dev-python/python-ddp/metadata.xml
new file mode 100644
index 000000000000..1dd8b0430963
--- /dev/null
+++ b/dev-python/python-ddp/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+    <description>Python team can take the package if they wish.</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">python-ddp</remote-id>
+    <remote-id type="github">hharnisc/python-ddp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-ddp/python-ddp-0.1.5.ebuild b/dev-python/python-ddp/python-ddp-0.1.5.ebuild
new file mode 100644
index 000000000000..fe3a30a75405
--- /dev/null
+++ b/dev-python/python-ddp/python-ddp-0.1.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="An event driven ddp client"
+HOMEPAGE="https://pypi.python.org/pypi/python-ddp https://github.com/hharnisc/python-ddp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-python/pyee[${PYTHON_USEDEP}]
+	dev-python/ws4py[${PYTHON_USEDEP}]
+	dev-python/meteor-ejson[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
new file mode 100644
index 000000000000..5889121a6c31
--- /dev/null
+++ b/dev-python/python-debian/Manifest
@@ -0,0 +1,5 @@
+DIST python-debian_0.1.28.tar.xz 292404 SHA256 355edeaa0e2d5a46e4b12c83c7a17386526af4fee34c1d4054fc03bd4f0adf00 SHA512 ffbc924fe2dfd5790d49aacf80109bbaa18126bb8d6c9b8ffa25e9ed8b1cdeb28024a8dc202587682088e2e558da1642385faa4afda925cbb2edf6f304592a0d WHIRLPOOL 6f1778dd6839459e86179f5f02ba0a6e69154efcfc034c1d554d940409e974b57c73839853c86b14d840f27c6a0666a11618f51a125922e58596f28aa888c8ca
+EBUILD python-debian-0.1.28.ebuild 983 SHA256 e8438a343a8832e4f888cdbc005c8e11ebea16a718db39e8b2c664a9ac849a4d SHA512 4c23d9dd33e82dd8a89f2b6aecafe14491024d9d22cd7142cc93382d47119bb8542f7cc7b17e44031838d10e4681965bae3012c05363bac1c91e06d805c7c48f WHIRLPOOL bb8cffad818d65b6fb8695e8d61129cf0921760c52bf5f5a6f84b752e9d88795ff8ea4b6b7f4e95530e72e9abda630d91391979b18fc75f3e475523d64000461
+MISC ChangeLog 3426 SHA256 97c7cd8e4e9db63f44eee89c344efeacdd8028135d0b799bba41b88ec1e34847 SHA512 3e5b3061b1a1860c476e2b88c1ebc4c1bf4a9e84c76774c1f398b708d7b0d87c39b913e8024dd7791f3b9090cc69d10f917b9542a05dec05f74701dd551fedc9 WHIRLPOOL 77b41e162f247253dfef91bc3960a26758c843a4bff5192aa10677de1d299db1e72377d0cf738e0bc4fc6417007a2c4db058103e29c4ef9c1dc5806dca384f31
+MISC ChangeLog-2015 2057 SHA256 6291b25829b72f62e2636a2dae06d2f8fabf24f4e1b8730eced736eaf59db0ef SHA512 313296b453b36e0f95b78324104cdc0e45617fdeab076d3ee8e72505b93d991e8410a2fcaa8ed0e9185546592b446d8c4e47e03c686b60d694cde66abd5b03ec WHIRLPOOL b609ab8cbeb6619fb68e7ac7793b19be413e62d5708e91230ff23a3a183b6bc40a45b93f4f5aec8dd7c2413dfd26098eecac5985b8e9bfebb7527478d85bb738
+MISC metadata.xml 357 SHA256 95dfb9f3359ea566680dc61c7e47ac1f757ba9da96506c4004ce92f1baf306ef SHA512 452510eeb22c1db33118dfcd518488f42be0789b5607c9b76d316b14c6d1a474b6bfeddfc4034389a136c408bc4180ad704b6e1b0eac1381f9a77284b7016e39 WHIRLPOOL c3d60d51c48100d7ef6ee3ba1d5bdc5ce872e81f397127ba0a6612cc2d85d45c4dc42764f8610ce583d76f4d43d080afe1ff966457b4144e9c7c67b585d33ac6
diff --git a/dev-python/python-debian/metadata.xml b/dev-python/python-debian/metadata.xml
new file mode 100644
index 000000000000..b45b94729bb6
--- /dev/null
+++ b/dev-python/python-debian/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>floppym@gentoo.org</email>
+    <name>Mike Gilbert</name>
+  </maintainer>
+<maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-debian/python-debian-0.1.28.ebuild b/dev-python/python-debian/python-debian-0.1.28.ebuild
new file mode 100644
index 000000000000..ba4f1f045850
--- /dev/null
+++ b/dev-python/python-debian/python-debian-0.1.28.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python modules to work with Debian-related data formats"
+HOMEPAGE="http://packages.debian.org/sid/python-debian"
+SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( app-arch/dpkg )"
+
+RESTRICT="test"
+
+python_compile_all() {
+	"${PYTHON}" lib/debian/doc-debtags > README.debtags || die
+}
+
+python_test() {
+	# Tests currently fail with >=app-crypt/gnupg-2.1
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=782904
+	pushd tests > /dev/null || die
+	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
diff --git a/dev-python/python-designateclient/Manifest b/dev-python/python-designateclient/Manifest
new file mode 100644
index 000000000000..515432b6d15e
--- /dev/null
+++ b/dev-python/python-designateclient/Manifest
@@ -0,0 +1,10 @@
+DIST python-designateclient-2.0.0.tar.gz 63215 SHA256 516e883b74726eae0b24755dff682857bb6b11b26dc06eb231ffee5a696e48a8 SHA512 e5c10915d6f5619949b385096e2bce02e1115c4842ae315ffbd4488b29703fb0a038628818c80364c32461b4f9eeb083e2877c38a15bd4f6ec323942957c75bc WHIRLPOOL 732e8d4378074fb8c78ab40659fae8eca7a81fe831714cd1d62588d784be66e43d80fceb5344adb679371fec47a309c2e3c984eae976a29b293ef0788d729c2d
+DIST python-designateclient-2.3.0.tar.gz 78445 SHA256 f41e533cd9eda72638ce288e3dfad1e18cfc4210bd9ca248d70939ff2fccf856 SHA512 f45194f3d04c139148bb11f16b7df0d7a701548c37d99bbac52d1f0badc2cb1ff7a7fda801a2556899fe51ae17903903214a558798e04ccb9ec4b6d994fd5d41 WHIRLPOOL 56472534b08b60bd6e48df0023c7b76beefc09fd02d2163c70721c5346c7fd13ba551cda4a2cd9a97ab6356f43d6ed14e8fcc0622b973b81631b1758253c15dc
+DIST python-designateclient-2.6.0.tar.gz 79803 SHA256 15bea5e50883aa9b0c8807b6e01aefb68a99755cd8b8850b4c88b16689ebc686 SHA512 49f1aaa745680469a3f2143ea0e3860a5f8479fccae2f143920afbb63ff7ac1f0b0516a2f5fc8e4a7977df781077a81476b6d6283befcf07a568cdc1d192394d WHIRLPOOL 00f8edcf81daa591a2ccd8a3be4fe3f14938f290cd2d053556738a693e2f2e2a66066d0eec6710f7553e654bbfaa7e930844a345f672b8fe48453716532bd4bf
+DIST python-designateclient-2.7.0.tar.gz 82808 SHA256 30172b80f49393fed6f6817f54da7d9e99766f86fc6041b5578ca74b7f9c454a SHA512 521399ea4b5da617a3fbb7e291215f4a17d7f0f54f11708d5d3467b43376123abba90586d61a740876770017c6d77a14ef2152ce50cd1816e931d04189ce6b23 WHIRLPOOL 562b7cd282dd572385b5cd97ac9c23ef64a7e1301f58be792e08a3d75e3097b41f8feb54bbaef264994faa6f7f859fe1740caba0e356e4aba19c088e2e703db9
+EBUILD python-designateclient-2.0.0.ebuild 1208 SHA256 0360bfecb408d6b7f90e9d0bfc4db34dd4c614acf3c65c20b162b5bb1b303aa6 SHA512 442962f0d0e5567f93f6d8da4713916110644a0c291f20387de314f03a44e2b647c49cd27db0a2ef43f69ea01fa9eea0d10c99e3ffd70c5cbc009625bbf69865 WHIRLPOOL 78f63fb104d9cd242aee8d8063d0d3b7ada13bafe3708fe74201fcab26fe2266736a09509bd0f09d3adfe3d3d8589e923a864bab1d02318788a2350c3f3e9895
+EBUILD python-designateclient-2.3.0.ebuild 1126 SHA256 3fb990a155e1fdf2596865edfbb767df50532d0ac52b2acfa44022a1bc4c17b3 SHA512 277b26576be929811ee08a04a43ffca5f5b44cf9188eea9d6074864648a4fad2195816329dac3d2753a74980f69c8bde418cfeed2b7ed42653a26c294840d6e7 WHIRLPOOL af80362f388df4506da46f44e3b4c32a4835ac06e1e5efb853c8731c8183f9fc481add3f5ded73f3ac1a0e5f0bc5f05ddbcc54bd3130192e9ac5ac7716447554
+EBUILD python-designateclient-2.6.0.ebuild 1129 SHA256 95bce4f04041f57da7c53acbe066e73dc8eaf07ec13e2c42034f08c597d2ca8c SHA512 5ea1817f4a7dbc5333e9c68fb267af0b9a2d32adf5871074e640903959678a39835f2c839dd18a25b7ac7136fa3f6821fcbaa406c48722c6913df5f09a8d5686 WHIRLPOOL 086b98e7c2f38a5623b5c841aaedb23d0fd78ac0b06e61914630f1388b5ea213ae8e2303fbfa26f007c9b136c7754ebc4342d1767566c537b9c9ab2613e8dc62
+EBUILD python-designateclient-2.7.0.ebuild 1125 SHA256 6ed6971850ea9a60a6842ff8a1135d56c7aa3c831dddd8050e669067eb6723b7 SHA512 1a6e1dea44b059055f00fa2d09696638e59e1027215c8074cf72becc4d87d78b679fecba55078a0c104b92d1e2072394e4caba1c1615e7ee24fbe2cc0479a037 WHIRLPOOL 93f973ed8f31763d3dea413aeeec238b1dc0da6271ce49b873929d194b1490e9b79a35b163a8d9ced4b3added59790ac7de5e37b8208a190507066953dc68b27
+MISC ChangeLog 1028 SHA256 dcbcf06d96a9611173930f4b58aa38de3bebdf6a0fb52c9c25457b4c7c94e9a3 SHA512 29c852569ac3f407a27e218b7c4c84299ce56bd799d263dd3825b9cb049d803075c58ead101c7b7360faeb38e318d293bd7d41dc897d4ebdec91fca1e03fb420 WHIRLPOOL ced54fc8b42be5d9c3df603ea9f35effc515ad353c2420a198692815c306d835435af586df46131e165e60badc3a891975f9bf950dd18563d6ac6466a5b93b76
+MISC metadata.xml 620 SHA256 c7bc49ce7daac4d78fa1e9b868bc6008b22ce837c84f6fc4eb4571f3fc01aa16 SHA512 b42ad7a3863003103bfb4660e9b2ecd02a4ea927337c0ddcb6c3cf0f04562f86f09174218baec94df52f082b0f2b4c8fcf94a130c4cb08ea6f7cb70972b4ba9e WHIRLPOOL 53eebd62154134a5a2d34b513435145a2fa72796419550ef0fbb5558d04cf2c8f0285e7d30d3df3a2799b3054287d6bc9f79fdebac490e04e58d47c2a20c41c1
diff --git a/dev-python/python-designateclient/metadata.xml b/dev-python/python-designateclient/metadata.xml
new file mode 100644
index 000000000000..a1bdd63c1cbb
--- /dev/null
+++ b/dev-python/python-designateclient/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		This is a client library for Designate built on the Designate API. It provides a Python API (the designateclient module) and a command-line tool (designate).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">openstack/python-designateclient</remote-id>
+		<remote-id type="pypi">python-designateclient</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-designateclient/python-designateclient-2.0.0.ebuild b/dev-python/python-designateclient/python-designateclient-2.0.0.ebuild
new file mode 100644
index 000000000000..de24f0bca6fd
--- /dev/null
+++ b/dev-python/python-designateclient/python-designateclient-2.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings to the Designate API."
+HOMEPAGE="https://github.com/openstack/python-designateclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-designateclient/python-designateclient-2.3.0.ebuild b/dev-python/python-designateclient/python-designateclient-2.3.0.ebuild
new file mode 100644
index 000000000000..e90c3b6118fc
--- /dev/null
+++ b/dev-python/python-designateclient/python-designateclient-2.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings to the Designate API."
+HOMEPAGE="https://github.com/openstack/python-designateclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-designateclient/python-designateclient-2.6.0.ebuild b/dev-python/python-designateclient/python-designateclient-2.6.0.ebuild
new file mode 100644
index 000000000000..d92305ea0e1c
--- /dev/null
+++ b/dev-python/python-designateclient/python-designateclient-2.6.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings to the Designate API."
+HOMEPAGE="https://github.com/openstack/python-designateclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/cliff-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-designateclient/python-designateclient-2.7.0.ebuild b/dev-python/python-designateclient/python-designateclient-2.7.0.ebuild
new file mode 100644
index 000000000000..fa1afcdcf036
--- /dev/null
+++ b/dev-python/python-designateclient/python-designateclient-2.7.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings to the Designate API."
+HOMEPAGE="https://github.com/openstack/python-designateclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/cliff-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.5.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.21.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-digest/Manifest b/dev-python/python-digest/Manifest
new file mode 100644
index 000000000000..06526dfa320d
--- /dev/null
+++ b/dev-python/python-digest/Manifest
@@ -0,0 +1,6 @@
+AUX python-digest-1.7-unittest.patch 331 SHA256 54dac56e7e1a1fe426168b5d30eebbbb36f88a00b511c75129cde3c1094efd58 SHA512 65b8c0cdceaa81fe816232b689579ec9a38bf98d7eeef17013588078b9a7a2c63ce54559938034704f8a4fb6605b07dfa70d500c03e7f2657602151321f68809 WHIRLPOOL 50a2b22879c8d6803b7ae1ed54f5904d68cec574552be0ca67fd2b1ab97be17827492b5cfb7cafdccc428e5980ba3989a44524b987bca1cadcd69ead3613fb7a
+DIST python-digest-1.7.tar.gz 10073 SHA256 cda2673e208e95c222b26b8b7717a356d2688e57391c7bd5a77154015e83be45 SHA512 15bfdb8e42275bc8f7fbc10f6f8bcd109852c57b77e98c8c2251784278fb135db494b0224341d34626ad49ea4db2a8803b2eb89d70d88b704819f4e6ca10f7e1 WHIRLPOOL 9b6002b2df7529db3f186a4c81803f8bacd8d14bb8a84b88ece71e36f21e38bd7af3c1394ac427ccd790bd68478c1acecc72b956d7993857eb604356c2b57f0c
+EBUILD python-digest-1.7-r1.ebuild 679 SHA256 46412d7306a54b2200d3223173ba34c881a3d4d26347b965072a2a20eb2a34f5 SHA512 dd7829022bbf8cf07dd0e2ca3e5989661d06a5a303a3bb98f0e517548a7d836374e471331b510eb936fad0d86dfeba58ef5d64070f28c56d491ea086c0796001 WHIRLPOOL 7724c955885076cda8608ddb09ba2da36a188d0b00c33728597969e613604ee8147f128079567cecbf9e239d1fd7be2cc044b9102fe71c4b4902b5315643b3cb
+MISC ChangeLog 2752 SHA256 509c45387b86c2628e54d36ee1c53bf23b553117bf4b9b1423d89704afcbdf7f SHA512 599a1a4745d228b2ec8e7f17ef5214e647b574e15e0f3313edf1ea8d84ed71a8aa0d82b26a480a931d774afad060cb9c49cb2c9a4cc5b56dcab0fec40f5c8c0c WHIRLPOOL 10e77b8e81754e606869aeaa34505363b3e2b2f55295e7c86134f70549e458971709105dd82773fd52e4e67d41a5587d7ae1ff8350e66fea72b84f216647c87f
+MISC ChangeLog-2015 1699 SHA256 507e0e85136141c2509dbf691d6cf341f1e7ac8a71c5e6e30cd19f8cd1f327ef SHA512 a2c95e415738cf13cd1be255fe61ccfb56ce5f1fc4c15e8f9885119bfda98f7f0dab14395b8e3ecc621e68557c51aa8962a2a4d3d485a16a409bcf5757a66bdc WHIRLPOOL 7606843602696ad53c58a52f95d8a51a497dc07068563ebddeacf6d6c2d07ec844544e007e3370f4e704117ca70ec69ec32c3d8ac2c0154feded2c8f7e3910ee
+MISC metadata.xml 390 SHA256 81c1d0d795a699de563dba6eb9c3d418da05baf2ff4d551d24ddea556e74b97d SHA512 1ed20fa80e8f527aa8294af69062629a1b4f166f7f95c9cd7b2854db22fa22f67b5f0dd49109a9fdc4fe4056467833d9c8af58ec838ac312f1287fe5c552b9ec WHIRLPOOL 3ea3cb642a32f5911ebb59c7cf23bc972a7cded4f91878874fbc66d4094ef4efc20cc488b2afc38993657d4ca7dc7188168952690571def2f0467c989f8e1cd3
diff --git a/dev-python/python-digest/files/python-digest-1.7-unittest.patch b/dev-python/python-digest/files/python-digest-1.7-unittest.patch
new file mode 100644
index 000000000000..e3abe0b77c8f
--- /dev/null
+++ b/dev-python/python-digest/files/python-digest-1.7-unittest.patch
@@ -0,0 +1,9 @@
+--- python_digest/tests.py.orig	2012-04-25 11:48:30.212254059 +0200
++++ python_digest/tests.py	2012-04-25 11:48:58.371585156 +0200
+@@ -486,3 +486,6 @@
+             for c in s:
+                 self.assertFalse(fs.character(c))
+             self.assertRaises(ValueError, fs.close)
++
++if __name__ == "__main__":
++    unittest.main()
diff --git a/dev-python/python-digest/metadata.xml b/dev-python/python-digest/metadata.xml
new file mode 100644
index 000000000000..f8d390e6abf6
--- /dev/null
+++ b/dev-python/python-digest/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">python-digest</remote-id>
+    <remote-id type="bitbucket">akoha/python-digest</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-digest/python-digest-1.7-r1.ebuild b/dev-python/python-digest/python-digest-1.7-r1.ebuild
new file mode 100644
index 000000000000..659d513eb335
--- /dev/null
+++ b/dev-python/python-digest/python-digest-1.7-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python library to aid in implementing HTTP Digest Authentication"
+HOMEPAGE="https://pypi.python.org/pypi/python-digest/ https://bitbucket.org/akoha/python-digest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="amd64 x86"
+IUSE="test"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
+
+PATCHES=( "${FILESDIR}"/${P}-unittest.patch )
+
+python_test() {
+	"${PYTHON}" ${PN/-/_}/tests.py || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/python-discid/Manifest b/dev-python/python-discid/Manifest
new file mode 100644
index 000000000000..18ad212ee3be
--- /dev/null
+++ b/dev-python/python-discid/Manifest
@@ -0,0 +1,7 @@
+DIST python-discid-1.1.0.tar.gz 30656 SHA256 823fbf06f1f08f4e3738c5a68349075a8a3b219c6009fe2af55a0277b9122031 SHA512 dd4a0a406d3f1b1d635bfb12c52689b72296f6965dd5d23c540d137ac60841bc39722e710db459281511df992e4db6614472cc741084bebe2ecf6b0b4dc5ab36 WHIRLPOOL 6c0ef1cdd3c4747defc6e717a09dffe79f231fb8b5fff40b1a5b2e4bcf53532e551bc07eaec96f2b075162a6f6c449a55e3efa9875b9e403937e0033d6da0349
+DIST python-discid-1.1.1.tar.gz 30454 SHA256 5ed31ea16d752c0188f2d090cc60c38d8ca2a8b6e6dfb71a22499ca403aca19a SHA512 b040137162a2588c653f390a4d0b549b322bb4e2745a3738c1ba72a1984722358fc85a306f4cd5d41c1e599e40d01c6e2b08d67951a820c2d1116d96eb618c8e WHIRLPOOL 1a823b77db78e8706fec233b8b13a30b2fbb66fe146df7586114d9ca3ee539927048429c0c0b078fdd44118b8cbc00305d9c7f2494ff6870b4742b9da6b80810
+EBUILD python-discid-1.1.0.ebuild 483 SHA256 9f3a5096c0d1afbf7e431767227b503568a8e06cf3aa72c40871843768d2811f SHA512 e6069234b6d49c1ad3b8277452adaa650f722109e3fa18620ac91d0427b3eccd80aec0e2e25af9f4942b2f09ee26d3b223a2cc36a403c169ccf412e4768ea4a3 WHIRLPOOL c97e2215c3bd5c07f6a4802ac35f3e568b57761df81474d5dec9ec12b6f5dbebc7e109afbb539ddf8941a1d7a127283ae870cca3a7fdfbb4f763786c4ee70a75
+EBUILD python-discid-1.1.1.ebuild 740 SHA256 2b6e335b7155ab0533e0f2fb7e01e56b172b9004943e6442e664dfbfb5fbef30 SHA512 4dc03fe17178cb18326b4cd89a7985f8dd6312ecc816ac4b3e33f93a67b595c5b5d4f567b9123c22a7fdb3343da10be2c724f068876d9315446c629d1d059dc5 WHIRLPOOL 131ec1e325e5e90aff11e9f2364c6d1584eeb8226a6954ef1f3c7ac7b6ff04d123e7452fe6dc7736e492de6652e6f42aacf1d475588adfdad68e69ac9f830a3b
+MISC ChangeLog 2836 SHA256 3cd630f38277ea99cfcc4cd3efbd0354e44d610fe2bc9287b4be72d793a421a1 SHA512 65b83e665172fbec6b14457a8cb0152478b82bdc16578de9de2fef00d892babf3a93d7ec615d69c216bf451230cc7a2e63737a33f31e5c57052a9373db60f986 WHIRLPOOL bb866e4a70345f994e433a6a5ffa9d4b1bed2ea4d302f88bda1a1ee52128d60f92415a0960d17e9752505139247df2186116a6d8dbc4e1a0eab44bd8ca2ea9dd
+MISC ChangeLog-2015 487 SHA256 1f4daa9ddd3a93cd6d99b60b0c58bf9e81d316c8a6ea4cbf8925a0e1ab9e77ca SHA512 1fdba426a839ebbe31e024dc2d9ae8d541a3e78d22ae66a32a1bf9e26bd61f6e48ccec14bbef87189b89be2f45cd04e25bf33c1cf004b54b6d6395b726bedebd WHIRLPOOL 65885dddfad37efab829b8d107afd492c128f2d12e221b229c771149f6c214b7b6825840087c66488bfcbcfbcf9a8745d369bd71d32640c8c8df227194f9372e
+MISC metadata.xml 336 SHA256 7cc16963b7a58e1d8c70a9b0421365261b232ebcf0d6cb37e1406c46a8de6a7c SHA512 1a863be4ff2f8741d43bf7cccc8e18e678abf401faac599a32ca363444376ecbebcba02706863d1b750d695561047f99a8777d34ed62ff5a05ed6bddf4e6f5f6 WHIRLPOOL 8299b328a3a3cec3ce8cb4a24f48171cc7ab170dfbf3384e82177a9802e322530040f50765da80b9352c8ecac747891b6285c35a3d2bb3e63111976e7058c2bd
diff --git a/dev-python/python-discid/metadata.xml b/dev-python/python-discid/metadata.xml
new file mode 100644
index 000000000000..3a7e5f5b29a1
--- /dev/null
+++ b/dev-python/python-discid/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">JonnyJD/python-discid</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-discid/python-discid-1.1.0.ebuild b/dev-python/python-discid/python-discid-1.1.0.ebuild
new file mode 100644
index 000000000000..32ce8076c6b4
--- /dev/null
+++ b/dev-python/python-discid/python-discid-1.1.0.ebuild
@@ -0,0 +1,19 @@
+# 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} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for libdiscid"
+HOMEPAGE="https://github.com/JonnyJD/python-discid"
+SRC_URI="https://github.com/JonnyJD/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+DEPEND=">=media-libs/libdiscid-0.2.2
+	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/python-discid/python-discid-1.1.1.ebuild b/dev-python/python-discid/python-discid-1.1.1.ebuild
new file mode 100644
index 000000000000..1cee165f932d
--- /dev/null
+++ b/dev-python/python-discid/python-discid-1.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for libdiscid"
+HOMEPAGE="https://github.com/JonnyJD/python-discid"
+SRC_URI="https://github.com/JonnyJD/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="doc"
+
+RDEPEND=">=media-libs/libdiscid-0.2.2"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+		sphinx-build . _build/html || die
+		HTML_DOCS=( doc/_build/html/. )
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-distutils-extra/Manifest b/dev-python/python-distutils-extra/Manifest
new file mode 100644
index 000000000000..a1df390c4c0c
--- /dev/null
+++ b/dev-python/python-distutils-extra/Manifest
@@ -0,0 +1,7 @@
+DIST python-distutils-extra-2.38.tar.gz 27748 SHA256 3d100d5d3492f40b3e7a6a4500f71290bfa91e2c50dc31ba8e3ff9b5d82ca153 SHA512 bbaea59a8f251f354e6cf3799b67c12225095cc869c7c4e299e719ad7bcfd1292cff99f95ab25f04fb9c3e2432da5ea614ee76154781388c47960fdf2c90a3d7 WHIRLPOOL 10ca7754985aa634aaef7f7fc80777ca4a2b79ecc11e80c48bb2e6c1765cc9f38fbf9696957f974533f50f06db3d1bdb6527f1ed6dbe05619f3d0a17184b885d
+DIST python-distutils-extra-2.39.tar.gz 27389 SHA256 723f24f4d65fc8d99b33a002fbbb3771d4cc9d664c97085bf37f3997ae8063af SHA512 e3b4d1ed22767fb4c6dbbdccef960865b6fda01d18dc38cb8f9357c09c7eabb78466fce053e407a196eca257d07d57c5c1ef47f358a5979c7f22e4b11775124e WHIRLPOOL a485aa70267eaed03dc1174b73ab482ae409aeed5fcbbe82ab4ab377d8a8f91e1fa8aa3b9bb9af8c9b6bc3bc306284974d99943473afdce7f1d6b7322edd0623
+EBUILD python-distutils-extra-2.38.ebuild 1072 SHA256 3e7e25c39bb8cf43474abdf8eb317c27c74301a3bd461f1c4d3b5c31ed24ec4d SHA512 63894d8bc085ebdc9c9b13961448fefe88b55aca7fafedcae289d1b03fcfb41dadb8dc1847703dcc8e910aae7a528b4651c79240bac78d0cd000cbd8a13ea4d5 WHIRLPOOL a1314d58766cb0a2e4ec08e4852f09e2a308009d35219de6f3d60a74cbc0d886410da56c27f594116c185b939ec6843b83bf59427e84659b91861c727d30ee13
+EBUILD python-distutils-extra-2.39.ebuild 1456 SHA256 b99b7c67fce130b54ed4f11f15feb8822b9b1bd528bca7c01ef87b259703ff07 SHA512 84a61095999508262a61e36c8ec8f53c33d9cc791b704f27aa04f30f00169458209d3d4b1c03fa566602984f57ef1965eff4a716df542015fd1365822ff2d668 WHIRLPOOL 8a62a45b77e04a8c882f3449c0849ed6cfaf32136fbb40d2cdeb9da9cecf3f099dd3a7801e150996aca70a12c9084846cc3544fe1afee32932671f4fe9a78956
+MISC ChangeLog 3430 SHA256 3b98817cad08a8645f625e9721d5db2e2e875425f7a2942b8e06eec47a199750 SHA512 69307f3754d0bcc8859ce688ed570e7834f2841505e5e1446cc6b2433c26348b898dd18ebde810ee3e90263fe8feb3e4e0fa663effbd6e574565e247cd80dd6a WHIRLPOOL 5495bb965612849c9598cc788eeeab908d8d9efb8cec55bdc13c66b2bc0712a2eec84f4c8a370649985145e53ef939ce56bf4056e4528ed25b88052de61f15cb
+MISC ChangeLog-2015 6070 SHA256 b8b561d232e0b4bc9e7dbe40e4db97187eb9cc4cbf2d360430e974d6d60edb69 SHA512 71108e84f833a8d84804681735e5561b1cd6d343c6ebf35f4df1801f115cefb747b7aa69e8410be5de795e7831fac1fb53efa7503447788b80e8c73de011547b WHIRLPOOL c756bf819ab7787c9a7d0a0ec925fbda7492bfc4f8bc429edf0d415448edcfa452eaa4d944b204a19843dc9a9ccce4cb295e0b619d087b44ef75c0f2b196b8d8
+MISC metadata.xml 401 SHA256 7d9a066b26ec469a9a24d3746a7d71075c73de3626fbfe613c3e249eb0797e0e SHA512 0dfe7658fe14d75a542a901de11983e7e0d8663b158032f5b8a71814c4caa93c14b4bc32e422c49a19550544c1b1fd4075be8a6644f0ea780bb23e1adc65b402 WHIRLPOOL dad7d9670050aef286230329302b186f6ddd8ad4ce70919572a987e15a1323b6d36e1c9fb1bbbeb79ad0ef9cd737263a04647a2a6342503e096dab921f388e08
diff --git a/dev-python/python-distutils-extra/metadata.xml b/dev-python/python-distutils-extra/metadata.xml
new file mode 100644
index 000000000000..930ec08cf4e8
--- /dev/null
+++ b/dev-python/python-distutils-extra/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">python-distutils-extra</remote-id>
+		<bugs-to>https://bugs.launchpad.net/python-distutils-extra</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.38.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.38.ebuild
new file mode 100644
index 000000000000..dd6552011161
--- /dev/null
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.38.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Gettext support, themed icons and scrollkeeper-based documentation in distutils"
+HOMEPAGE="https://launchpad.net/python-distutils-extra"
+SRC_URI="https://launchpad.net/python-distutils-extra/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/{FAQ,README,setup.cfg.example,setup.py.example} )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Disable broken tests.
+	sed \
+		-e "s/test_desktop/_&/" -e "s/test_po(/_&/" \
+		-e "s/test_policykit/_&/" -e "s/test_requires_provides/_&/" \
+		-i test/auto.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# 5 tests fail with disabled byte-compilation (they rely on exact
+	# output from python).
+	local -x PYTHONDONTWRITEBYTECODE
+	"${PYTHON}" test/auto.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.39.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.39.ebuild
new file mode 100644
index 000000000000..855f84bbdd29
--- /dev/null
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.39.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Gettext support, themed icons and scrollkeeper-based documentation in distutils"
+HOMEPAGE="https://launchpad.net/python-distutils-extra"
+SRC_URI="https://launchpad.net/python-distutils-extra/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( doc/{README,FAQ} )
+
+python_prepare_all() {
+	# This line is run when the file is imported
+	# https://bugs.launchpad.net/python-distutils-extra/+bug/1657919
+	sed -i '/^unittest.main()$/d' test/auto.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# 5 tests fail with disabled byte-compilation (they rely on exact
+	# output from python).
+	# The other 4 are broken.
+	py.test -k "not (test_pot_manual or test_pot_auto_explicit or \
+		test_pot_auto or test_modules or test_packages) and not \
+		(test_desktop or test_po or test_policykit or \
+		test_requires_provides)" test/auto.py || \
+		die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	docinto examples
+	dodoc doc/{setup.cfg.example,setup.py.example}
+	docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/dev-python/python-djvulibre/Manifest b/dev-python/python-djvulibre/Manifest
new file mode 100644
index 000000000000..2022508d0bf0
--- /dev/null
+++ b/dev-python/python-djvulibre/Manifest
@@ -0,0 +1,5 @@
+DIST python-djvulibre-0.8.tar.gz 85436 SHA256 9d6bf3143fa540e8ce330949c9edff7847ad7cd715f7c02e2991212873a5f31b SHA512 c817fc518f398bf16664a5f5dc80e8bd086015c13f82c5265548e5ca5d90f293cb2132961ba8a73cb184bc7883bb5868d2d49ecd950d045d0729f876703e710c WHIRLPOOL c1b23f141ab31eb427aa7b373b55b9886ab2f1189d35837741503e442d7ce80e70550ecfba091052cf5d126b46de8ccf5632205acb8d229993abc75ebdd3c725
+EBUILD python-djvulibre-0.8.ebuild 709 SHA256 7dd2841ab993ad1997907935c8713cef9f64a376dbc9afda9174a6f09aeb4e56 SHA512 a22874c1220ac2888984d08835dc3ca292520013e6cb237be1ce32f58c8fe2e921ba3dc3bd18f5796b64f696c7359ad66d56285ab98d851fa5a3e189b5973566 WHIRLPOOL bc35d196aba84d1008928e5af0923ca96a65dc7c33130ed1d24a1d83850a7fda243a08529e3b00a4f0a2c94d36eef432e3b704fa374eb42997bc0123e55c1ecd
+MISC ChangeLog 2205 SHA256 0f90c3e77c0af06d68bf4812c40c333a0cd5650d2bed5dd42c1f12cf49470f61 SHA512 190c099b7188ed487d7f780a398e5270cd8b489df4237d5984c163a009cf89bb1a5edaa0023ccd6e73a42595afecd34214bfca665bcee472dae81a30174aaf17 WHIRLPOOL c2de11390b234a4927fbaca17719806c49e3f07377e60016c4837531b54165b3ae0404527725b542dcfeceb3b081d0dc4eb4c7e14cb58d5658554fd488fbdf27
+MISC ChangeLog-2015 785 SHA256 68d080a29e239181db00ff62eec3b023f21cd82b6897adc6bbe0f6051a0faf8a SHA512 c31b8d318d28257d0326df710927d25d38b13afea058396bbcd320a162736aebf3365809deea69490ce3016b27ddb66f133cfb9c89e7d08d634c0ff27ca5aad9 WHIRLPOOL 2f74738f3a3faf7acaed5c4efab9ab6152a5034b2d5e40ff299e15a4ffceae8f29e3d050ef84e8081321d4c26fd8580ffc2e64762170c5c32b90eb0fef84bece
+MISC metadata.xml 246 SHA256 82906624d3dafd4a3206a3e8d4851cff673513a5e58e993ad518e786f00ef381 SHA512 6099e01ca48241e19c169add69c7f98fcb503ab4726bc60779c5195c0f3b5f419112a7973eb477cdd3d6a60f34d99d821fa41f17b04f639de5e551e90f5164b6 WHIRLPOOL 6b98bda11f18dc3351443ea9dcd07dde48acd2a23bfed3fe3dfbc0746ef17a2a9c139b0f76ca4c4de905f92ea666a11d50f1d6df3e591ce83b7706d8f90074cb
diff --git a/dev-python/python-djvulibre/metadata.xml b/dev-python/python-djvulibre/metadata.xml
new file mode 100644
index 000000000000..3383b6ee4748
--- /dev/null
+++ b/dev-python/python-djvulibre/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-needed -->
+	<upstream>
+		<remote-id type="pypi">python-djvulibre</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-djvulibre/python-djvulibre-0.8.ebuild b/dev-python/python-djvulibre/python-djvulibre-0.8.ebuild
new file mode 100644
index 000000000000..7eeb2b653895
--- /dev/null
+++ b/dev-python/python-djvulibre/python-djvulibre-0.8.ebuild
@@ -0,0 +1,31 @@
+# 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
+
+DESCRIPTION="Set of Python bindings for the DjVuLibre library"
+HOMEPAGE="http://jwilk.net/software/python-djvulibre"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/djvu"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	ln -s "${S}/tests" "${BUILD_DIR}/tests" || die
+	cd "${BUILD_DIR}" || die
+	nosetests -v || die
+}
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
new file mode 100644
index 000000000000..131f77c43fa2
--- /dev/null
+++ b/dev-python/python-docs/Manifest
@@ -0,0 +1,15 @@
+DIST python-2.7.10-docs-html.tar.bz2 4566934 SHA256 e5f399cccc365f16679a32cd79d2b1bd0906c8838b7ea83f5a0c8236d2324e61 SHA512 a108bf969e3ef457dc7b562bc9ba26425f12e79ab249ab0a7300b829cc8e6473d93582afabf99d0c0f63cba5651c6620b96513a28ad5ddd9f41704ca650d0ce8 WHIRLPOOL 0ea6d4a6aa7d5c249ff1d1c8f64b356f6c84e3e33c4d1c50b6a8b1661bc17e21537a9ac49c9d2716190f4d977b11c921f5ef11cec8316b8faf7630335417239b
+DIST python-2.7.12-docs-html.tar.bz2 4601696 SHA256 40891e010cdd9a752a17bd02e30aa853f9a2a7767ee82911cf4507dfa3b13de8 SHA512 9d8a766d731402df774f2d20dcffba694e2497a17bc78a08f75d7f6bfc75d13227c7f57fdd5c056b75576b5d059b08f8c712c8bc465f5b0b88c04aba3da74198 WHIRLPOOL f835a00df600a045a542bcb39951c9caf92f2db7410135382f48735ecde590c01e4c31b100dc974e734a3dac16f66e6e72d68ffac7c848360b9483a3d843d298
+DIST python-3.3.5-docs-html.tar.bz2 4955315 SHA256 471067c514a33b4ae4fc35ba600130572840326252a565e39157feb2911ef733 SHA512 6cf6d02bf980609561ec829407e0a4d541ddf949db0b6d3156f9fa90ed7c87f9ef16128e9c8226887568489826efcdde5ea38af246ec235a077227d73736ea71 WHIRLPOOL 78a6babcc5c7df64deb324368f32ae5cc5fed6fba9ff7392b7589f81187b893d9c977fa9a25168d60336b46f9237bf09ba5e6fbef888ee3489de57afd09e9067
+DIST python-3.4.3-docs-html.tar.bz2 5444773 SHA256 87d4f8739205fe6f2cbcb10c6f1b33546d3b7f41e6bc96de34f992ccf5c10fbf SHA512 492038df0afb05d60806d56d66e06069d195249db708e4261d39fa6206e0baec5c2db730431b5be03d8d37296d935f39a25bf1d449fb29521bdc4823584b9bf9 WHIRLPOOL c55241d450c6440d4e084a8189b569046352bd65b88a576fd0a8bc9a23665f52cc534da4d32061c0cbc31f41b2b63870fe4098ef28be2fed42311fa8e0decc46
+DIST python-3.5.2-docs-html.tar.bz2 5747460 SHA256 34bb14f352b39e7a9ed8a5e4d8332c464158d0ef3a75dccb373a40fcf6de2342 SHA512 2a9ce5b304c6edf3165728a1fe0c189222f8b105c446ca9026ce453d013c9498b4c53085fdef776b977d058fc138ba3af5ea9bf26291469ce47239ee1a8d9286 WHIRLPOOL 102d9d0a1ccaa5c2ba4c295872b1059498a79e39fdb06a249b62a52a790ed1f98f3dad4903e90e94c1dde41be7cdcc5142a7022d7fec1fd4a8b6415b92c66041
+DIST python-3.6.0-docs-html.tar.bz2 5880912 SHA256 c6a11b760124e0820adbc4d2f57e0eeed0212c17b49e82da6ea22755186990f6 SHA512 433221763e410b1fea9a592b25fa9695af369bfc3d49055d4f912fbe34a54ebdf69a0ad2579d4f886d08d08b107c83264186851bb962c7ef2c1fc863e984f529 WHIRLPOOL a80b14dcfdb21d640218d574cb4f6c28ccd72197edbb93b2dad2f8bcbe38cfa2d50b889e397db9a15baeb38966d14fb720d8fc4839acefb45e06b085bb0a98a8
+EBUILD python-docs-2.7.10.ebuild 950 SHA256 41df706635723f77179cf83118e897b69e6d33ac3de19301983a10373a1714a2 SHA512 daf63b77e844c211dfcfe519d5854d8987e22ee42f670ae2d20c6276f8f82a70c98e0dd41376ec58185a4dad28840c454b01f7f32d8116b52ecc8f59b93e0599 WHIRLPOOL 8b41d4819bebb199d5230b5fc6169037cfe826e5cc212e63ea6752f304329ee35a9c8647275e886f266ac8b9a7c8bbb942218e2d74f420ffa67c896774208355
+EBUILD python-docs-2.7.12.ebuild 759 SHA256 7ab33efef411a3d0d3a9a31a73117bcc46ad546e654d8a2356fb71c21c86ada3 SHA512 51b99b47c0ce081ac32e5d329361ab398b481f7243cf9787c41d57a5ab3e42ece5008e238186c322cc24f92de22bf1c5e1614e42fe534290bc18cf97f2e513d6 WHIRLPOOL 7b17b56d875715732bbe7be24907ae5e45a0f9c39948e3160fcc8b81e2e4c1d1fe18131c325bc158e445c5197ecd8d44db09964f697afd2812c10be891fe64d8
+EBUILD python-docs-3.3.5-r1.ebuild 950 SHA256 9769090a03246b56c30ca04afaff405575a00be7d23b6216a6b68a3bef29fb0c SHA512 de06b0f18eaf0f8733d78f2d5b9025477844fe7ed75fb34baf48775813623e3112d08daf4f50ba99bd136cf0217caf3be7b5036607681e0f8a1c35085d9e771b WHIRLPOOL 216d81b7d24cb92ff0384230bf35e2d41c5472e568774fbb4e862f4f1777247c3c78c58e36c270d6e5127d67d33293c954b33e3e36a7cc95a785aac2edd17be9
+EBUILD python-docs-3.4.3.ebuild 743 SHA256 7f5e1da6c0a5b71853771f07ba67cf212d34d64c15550f2958d6e6be298cdd59 SHA512 d2ad616f01e2fec7ef8701ff95bdd5de2ad7a54412a3a50bb57e1826b466a70c99667fe62e5748e871e9bc7e5e8d2befc8b36062695a03f5539bf9a98b924ab7 WHIRLPOOL ab6f1669d7c4bfa3341b6a84b653714d31b2ca5880ed91bf0c964b6196392885789a6242c6be97e56b2951dd60fc6e2fe49584ffc6ca297b45795097f0deedeb
+EBUILD python-docs-3.5.2.ebuild 883 SHA256 bd460403a69c9387466da8c77dc602b0788437f2f2033c951eed59d3012075e2 SHA512 de3d04689e5382b436fdf05a3e1fa6f4ad845ae26829b544279d3e6dc2f2a5299145d5d35cb5311b3d738d838fcf5dcc8e57f92b65ff95aa402735f54d04cce8 WHIRLPOOL 92586d5a2b2f7fed30eaa44339114816abad80f4c03598895ba83b070832ffc35223a901cd1a00b108e579200e6c8e3a80e50923c1b35e731edbb67dbcd6763a
+EBUILD python-docs-3.6.0.ebuild 883 SHA256 1832955655c2292ee5fb78e1b25490c8e85bbed4f42f6bc369466a7014534301 SHA512 c9b1be4589cdcb2d173f1774a054e4f5289374704cef952bc34ac141e9f002f72f8f40abb876cad30c8aeb812f651397f734bef8208c25aa4752b98dfb141020 WHIRLPOOL 6bf48f3654fe12188d8aadfda4ba042613ed43d006ede0771a54162a0189abf8990069977a1b0e552ffa92bc75267c1cba973b3676ebcc18c0d11f5f9571c8a9
+MISC ChangeLog 5044 SHA256 900d7b152bc58625780b1e6b3803ceb061478993c3ee21bedef094ca25540911 SHA512 ce3db7245cbd9d84ecef9ed028f863b0c416f7ebd1b42cc1e8afec9bf2b1305d39c624ff3c6f4186e03c4482b41307cbe0eb95fbfb7070a543d06653efb790de WHIRLPOOL 3facabcd0a9eb9ba9398bbb8d7c9a1db9712a873d767a1d4cebbf1966ff34b47d3b51859da5d9c8bb6100298e07d8e5bfe7320fc894da61750039ff5e7ff8763
+MISC ChangeLog-2015 28311 SHA256 f862be760789c974f4742bd1d2401b86f41945432c843781e5941ad9824bea43 SHA512 b8a34db39a49b788678a671f607b3e3090f781646c5b078cb62c6310806e285c60fcafba957b8d494027117e065b7b891d406e6a04e04c7ca1c3f8659171292c WHIRLPOOL 16434877f1f2e90425a8c888b6e9fed74d63faaefc82c69b95684e5658205ff59468d6fc91e1fa7b4476fa5ca1eb11b5ad7b4650b11b259bf0ef7db1fc49c560
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/python-docs/metadata.xml b/dev-python/python-docs/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/python-docs/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-docs/python-docs-2.7.10.ebuild b/dev-python/python-docs/python-docs-2.7.10.ebuild
new file mode 100644
index 000000000000..2e8f884d8f99
--- /dev/null
+++ b/dev-python/python-docs/python-docs-2.7.10.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="http://www.python.org/doc/"
+SRC_URI="http://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+
+LICENSE="PSF-2"
+SLOT="2.7"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/python-${PV}-docs-html"
+
+src_install() {
+	dohtml -A xml -A inv -r ./
+	echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}"
+	doenvd "60python-docs-${SLOT}"
+}
+
+pkg_postrm() {
+	if ! has_version "<dev-python/python-docs-${SLOT}_alpha" && ! has_version ">=dev-python/python-docs-${SLOT%.*}.$((${SLOT#*.}+1))_alpha"; then
+		rm -f "${EROOT}etc/env.d/65python-docs"
+	fi
+}
diff --git a/dev-python/python-docs/python-docs-2.7.12.ebuild b/dev-python/python-docs/python-docs-2.7.12.ebuild
new file mode 100644
index 000000000000..a7fb83877cc9
--- /dev/null
+++ b/dev-python/python-docs/python-docs-2.7.12.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+
+LICENSE="PSF-2"
+SLOT="2.7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+S="${WORKDIR}/python-${PV}-docs-html"
+
+src_install() {
+	rm -r _sources || die
+	docinto html
+	dodoc -r .
+
+	echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}" || die
+	doenvd "60python-docs-${SLOT}"
+}
diff --git a/dev-python/python-docs/python-docs-3.3.5-r1.ebuild b/dev-python/python-docs/python-docs-3.3.5-r1.ebuild
new file mode 100644
index 000000000000..1a47c21852de
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.3.5-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="http://www.python.org/doc/"
+SRC_URI="http://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+
+LICENSE="PSF-2"
+SLOT="3.3"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/python-${PV}-docs-html"
+
+src_install() {
+	dohtml -A xml -A inv -r ./
+	echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}"
+	doenvd "60python-docs-${SLOT}"
+}
+
+pkg_postrm() {
+	if ! has_version "<dev-python/python-docs-${SLOT}_alpha" && ! has_version ">=dev-python/python-docs-${SLOT%.*}.$((${SLOT#*.}+1))_alpha"; then
+		rm -f "${EROOT}etc/env.d/65python-docs"
+	fi
+}
diff --git a/dev-python/python-docs/python-docs-3.4.3.ebuild b/dev-python/python-docs/python-docs-3.4.3.ebuild
new file mode 100644
index 000000000000..1a3b0e9b95a3
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.4.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="http://www.python.org/doc/"
+SRC_URI="http://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+
+LICENSE="PSF-2"
+SLOT="3.4"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/python-${PV}-docs-html"
+
+src_install() {
+	dohtml -A xml -A inv -r ./
+	echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}"
+	doenvd "60python-docs-${SLOT}"
+}
diff --git a/dev-python/python-docs/python-docs-3.5.2.ebuild b/dev-python/python-docs/python-docs-3.5.2.ebuild
new file mode 100644
index 000000000000..22a84009c328
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.5.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="http://www.python.org/doc/"
+SRC_URI="mirror://gentoo/python-${PV}-docs-html.tar.bz2"
+# The upstream digest is unstable, see https://bugs.python.org/issue25170
+#SRC_URI="https://docs.python.org/${PV%.*}/archives/python-${PV}-docs-html.tar.bz2"
+
+LICENSE="PSF-2"
+SLOT="3.5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/python-${PV}-docs-html"
+
+src_install() {
+	dohtml -A xml -A inv -r ./
+	echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}"
+	doenvd "60python-docs-${SLOT}"
+}
diff --git a/dev-python/python-docs/python-docs-3.6.0.ebuild b/dev-python/python-docs/python-docs-3.6.0.ebuild
new file mode 100644
index 000000000000..ab26f1660c67
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.6.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="http://www.python.org/doc/"
+SRC_URI="mirror://gentoo/python-${PV}-docs-html.tar.bz2"
+# The upstream digest is unstable, see https://bugs.python.org/issue25170
+#SRC_URI="https://docs.python.org/${PV%.*}/archives/python-${PV}-docs-html.tar.bz2"
+
+LICENSE="PSF-2"
+SLOT="3.6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/python-${PV}-docs-html"
+
+src_install() {
+	dohtml -A xml -A inv -r ./
+	echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}"
+	doenvd "60python-docs-${SLOT}"
+}
diff --git a/dev-python/python-dsv/Manifest b/dev-python/python-dsv/Manifest
new file mode 100644
index 000000000000..4551f8e76799
--- /dev/null
+++ b/dev-python/python-dsv/Manifest
@@ -0,0 +1,9 @@
+AUX python-dsv-1.4.1-env.patch 897 SHA256 1f8e9de931e2880c2d63613bb8d7e01e80a68db4a440e542e05761d702811720 SHA512 798498060977b51b733281a66eeb57ee0bedc21243dd4138e3d0ad7666b1c3581764866c7c721fbbaa49b2bf5579f2ab91de03427e65fef4ff00df4399677794 WHIRLPOOL 377d299fbf3298fa11ab082ffdc09a0a7d0272d5c631cee61d3e341b8a0ab8f48c066f5b1c506143ba76d0a53127e233ed57d953892b3e72ad67ddcbecadb51f
+AUX python-dsv-1.4.1-unicode.patch 880 SHA256 18b398023ba25aab1dbca63121815b88baaba5c883b3517ae9a5ea12628c2f77 SHA512 a4a4c1c912dcfbc3631f329b5a3e17b69d3c7e40c597691ce0b06ceaaa1829641a1474db3b66e39b414c9a55542cdb17633a390093226c91c9b20634c9f46b7d WHIRLPOOL 986823cd502d432e95ca29cbc8fa1de7431fc14fca5722d707d33e4974a35ce8f9d669965cd58b3f0fd3a6547d9c89fbefdb4bfff01f93a4c2afd2699ff716ac
+AUX python-dsv-1.4.1-wx-namespace.patch 21455 SHA256 4cc175ec1a1d84f640517257c132153494bfc33e73e22736a0a9b53d15315009 SHA512 ae7ab49b02775e98243a37198d8614c68dc1b94b935da035aa1d28227f8e1cfbf9865ffead8325a852bf01728e89fe4c0ccb92e07630983b9b5482a4b4a9094e WHIRLPOOL bc34aa933d5cf941d4d481bdee808700437210145e05a46e7ab1a8c6ad4ae7368c4d2f598bade1f472c8c4f59fcb32973215d31d0c8a6bf854de98744d01da9e
+AUX python-dsv-1.4.1-wxpython30.patch 688 SHA256 8a10ffb8bc658b6dc1c842fa4836c3dcd5c21a596e9e29c6ca8fdbb464397323 SHA512 96b9b013f04dd3acf72a94a8a77f1416831358a1fa79b69b8cef7fb10c99120d4f743a311b548df01817491b6a98e07bba92bbb23be1b6686e70d70557f0fe7a WHIRLPOOL 4c9f533ea87ea2fb466847672175e720191090500d87e586eed35d977f5031e0a747c350cff067c658492097978a77a759b20827b3b441a0d23b4e4c4af705d0
+DIST DSV-1.4.1.tar.gz 14682 SHA256 5d0ec99c45f8ea91ea920dcd2cdf2cdc9e721985551ea80718519ce70dc98f15 SHA512 c26df1efabff9e70b6dfd17f6ff928f022ad19cfa39af431ef7ac663687e8d80406b0ad471376e238eeb6fcbab31aa2a84eaeae2949173e22316eb92e51f7ada WHIRLPOOL 565ef07a5c87cc4090b8b75df0fb992561865563ac3a0a8adaac2d1bc893e664d0db4d66836d9f682b2e69f62b2fc1fb1c3cdb649d973672b87a731887ded97d
+EBUILD python-dsv-1.4.1-r2.ebuild 655 SHA256 ecc80de5d405e7b9202f5da543a130027916bce675012504396d82e27efcdac1 SHA512 6c1f87de9eb5ae0720936a66024b5ac06af2818f053a1ed703a83a8bdf76041adb0520986da62458927719162b37f1ab572936261b902514a04ca8557de1d777 WHIRLPOOL bd829c3611e12dab9fd0cfb0f570553d491cfa97d55e7cc8aa4db470be89aa4ddd8225fd1436ecc4ebbe515a32f703a6b14f385cf820eb54b324e2cdf9a74360
+MISC ChangeLog 3162 SHA256 cb55320cd59ce4b9f1a22326e9e46613dea31b9a52dd981c75bf594497897717 SHA512 45bfb4db754e87ae84524fa3488002cda37b80b4ef1c0333ff6ae32346cc541c79ca8f4b8eb1132ac188d666bac2767d12006510b8f76b35b971defc0b1b8217 WHIRLPOOL 4838e7aaba3483571c2d70b7ac7355b095491c8555b0041608ee83caf1794f44ec0b09246f29e0920a57fea407e9fd1b97eb13d3098b22fc24513ddafc2468cc
+MISC ChangeLog-2015 1931 SHA256 2b35eabb604876093b861d326236d428a04d96e65384ed9c4d6048c8dde6aa69 SHA512 d239ad3d4b129b31051b66cf7c7f0f6d48078db98adc6096e971bb1010f6235cda045f848dc00b1a64833625be21d3267d83e14c6378194b3b893c180782bd5c WHIRLPOOL 6300a40f5b7324b41ca8269aa9457c0384b53d4cb5ec4044eb0ab72b90f19f2b624056b5e34fe4a6a6c49f4277ded320f46c990fd307fb29adbe0f3798c70beb
+MISC metadata.xml 501 SHA256 0301b218dbc7055ebd2f516b6c0638ad2cd33ad6dc8d7ad8f8af6924e0053293 SHA512 e8094c00b37097b8f255a6f2ab3461340fcec715bbe63957369f2ee4c60c4e246ba53f3dcf0edcb248937e70316ef9c4c2ff3c2609c2f79ccdd485ceb54918f1 WHIRLPOOL 5a77570278c0091bea89be3e31dbfdbf1d7c378d73e4a5463347d70020a4facde5a8111d29b707696d957bfd76157619a47b0ab02658d70d489a89caedc090aa
diff --git a/dev-python/python-dsv/files/python-dsv-1.4.1-env.patch b/dev-python/python-dsv/files/python-dsv-1.4.1-env.patch
new file mode 100644
index 000000000000..c2e7aee946dc
--- /dev/null
+++ b/dev-python/python-dsv/files/python-dsv-1.4.1-env.patch
@@ -0,0 +1,21 @@
+Index: python-dsv-1.4.1/DSV/DSV.py
+===================================================================
+--- python-dsv-1.4.1.orig/DSV/DSV.py	2003-08-09 06:37:32.000000000 -0400
++++ python-dsv-1.4.1/DSV/DSV.py	2010-01-26 20:38:02.000000000 -0500
+@@ -127,11 +127,11 @@
+ import copy
+ import exceptions
+ import string
+-# RedHat 8.0 (or rather GTK2?) sets LANG = en_us.UTF-8 and apparently some
+-# older apps (including wxGTK) can't handle this.  The fix is to set LANG=C
+-# before running the app.  Thanks to Ahmad Baitalmal for supplying this info.
+-import os
+-os.putenv('LANG', 'C')
++## RedHat 8.0 (or rather GTK2?) sets LANG = en_us.UTF-8 and apparently some
++## older apps (including wxGTK) can't handle this.  The fix is to set LANG=C
++## before running the app.  Thanks to Ahmad Baitalmal for supplying this info.
++# import os
++# os.putenv('LANG', 'C')
+ 
+ try:
+     from wxPython import wx, grid
diff --git a/dev-python/python-dsv/files/python-dsv-1.4.1-unicode.patch b/dev-python/python-dsv/files/python-dsv-1.4.1-unicode.patch
new file mode 100644
index 000000000000..39faebe103b7
--- /dev/null
+++ b/dev-python/python-dsv/files/python-dsv-1.4.1-unicode.patch
@@ -0,0 +1,21 @@
+Index: python-dsv-1.4.1/DSV/DSV.py
+===================================================================
+--- python-dsv-1.4.1.orig/DSV/DSV.py	2010-01-26 20:35:23.000000000 -0500
++++ python-dsv-1.4.1/DSV/DSV.py	2010-01-26 20:35:23.000000000 -0500
+@@ -486,8 +486,14 @@
+       list of lists of data
+     """
+     if type(input) != type([]):
+-        raise InvalidData, "expected list of lists of strings"  
+-    if type(delimiter) != type('') or not delimiter:
++        raise InvalidData, "expected list of lists of strings"
++    # Try to convert Unicode delimiters back to ASCII (wxPython can be
++    # overenthusiastic), but ultimately support either.
++    try:
++        delimiter = delimiter.encode()
++    except:
++        pass
++    if (type(delimiter) != str and type(delimiter) != unicode) or not delimiter:
+         raise InvalidDelimiter, `delimiter`
+ 
+ ##    if textQualifier:
diff --git a/dev-python/python-dsv/files/python-dsv-1.4.1-wx-namespace.patch b/dev-python/python-dsv/files/python-dsv-1.4.1-wx-namespace.patch
new file mode 100644
index 000000000000..c4b819f6bb07
--- /dev/null
+++ b/dev-python/python-dsv/files/python-dsv-1.4.1-wx-namespace.patch
@@ -0,0 +1,435 @@
+Index: python-dsv-1.4.1/DSV/DSV.py
+===================================================================
+--- python-dsv-1.4.1.orig/DSV/DSV.py	2010-01-26 20:35:23.000000000 -0500
++++ python-dsv-1.4.1/DSV/DSV.py	2010-01-26 20:37:59.000000000 -0500
+@@ -2,6 +2,9 @@
+ DSV.py - Cliff Wells, 2002
+   Import/export DSV (delimiter separated values, a generalization of CSV).
+ 
++2007-01-09: Modified by Joe Pham <djpham@bitpim.org> to accommodate
++            wxPython 2.8+
++
+ Basic use:
+ 
+    from DSV import DSV
+@@ -133,8 +136,14 @@
+ # import os
+ # os.putenv('LANG', 'C')
+ 
++##try:
++##    from wxPython import wx, grid
++##except ImportError:
++##    wx = None
++
+ try:
+-    from wxPython import wx, grid
++    import wx
++    import wx.grid as gridlib
+ except ImportError:
+     wx = None
+ 
+@@ -625,19 +634,19 @@
+ 
+ if wx is not None:
+     # ------------------------------------------------------------------------------
+-    class ImportWizardPanel_Delimiters(wx.wxPanel):
++    class ImportWizardPanel_Delimiters(wx.Panel):
+         """
+         CLASS(SUPERCLASS):
+-          ImportWizardPanel_Delimiters(wx.wxPanel)
++          ImportWizardPanel_Delimiters(wx.Panel)
+         DESCRIPTION:
+-          A wx.wxPanel that provides a basic interface for validating and changing the
++          A wx.Panel that provides a basic interface for validating and changing the
+           parameters for importing a delimited text file. Similar to MS Excel's
+           CSV import wizard. Can be used in a series of wizards or embedded in an
+           application.
+         PROTOTYPE:
+           ImportWizardPanel_Delimiters(parent, id, file, data, isValidCallback = None,
+-                                       pos = wx.wxDefaultPosition, size = wx.wxDefaultSize,
+-                                       style = wx.wxTAB_TRAVERSAL, name = 'ImportWizardPanel')
++                                       pos = wx.DefaultPosition, size = wx.DefaultSize,
++                                       style = wx.TAB_TRAVERSAL, name = 'ImportWizardPanel')
+         ARGUMENTS:
+           - parent is the parent window
+           - id is the id of this wizard panel
+@@ -657,24 +666,24 @@
+         """
+ 
+         def __init__(self, parent, id, file, data, isValidCallback = None,
+-                     pos = wx.wxDefaultPosition, size = wx.wxDefaultSize,
+-                     style = wx.wxTAB_TRAVERSAL, name = "ImportWizardPanel"):
+-            wx.wxPanel.__init__(self, parent, id, pos, size, style, name)
+-            self.SetAutoLayout(wx.true)
+-            mainSizer = wx.wxFlexGridSizer(3, 1)
++                     pos = wx.DefaultPosition, size = wx.DefaultSize,
++                     style = wx.TAB_TRAVERSAL, name = "ImportWizardPanel"):
++            wx.Panel.__init__(self, parent, id, pos, size, style, name)
++            self.SetAutoLayout(True)
++            mainSizer = wx.FlexGridSizer(3, 1)
+             self.SetSizer(mainSizer)
+             mainSizer.AddGrowableCol(0)
+ 
+-            self.initialized = wx.false
++            self.initialized = False
+             self.data = data
+             self.isValidCallback = isValidCallback
+             self.Validate = (isValidCallback and self.Validate) or self.BuildPreview
+ 
+-            dlg = wx.wxProgressDialog("Import Wizard",
++            dlg = wx.ProgressDialog("Import Wizard",
+                                    "Analyzing %s... Please wait." % file,
+                                    3,
+                                    parent,
+-                                   wx.wxPD_APP_MODAL | wx.wxPD_AUTO_HIDE)
++                                   wx.PD_APP_MODAL | wx.PD_AUTO_HIDE)
+             textQualifier = guessTextQualifier(data)
+             dlg.Update(1)
+             newdata = organizeIntoLines(data, textQualifier = textQualifier, limit = 100)
+@@ -686,13 +695,13 @@
+             # -------------
+             msg = ("This screen lets you set the delimiters your data contains.\n"
+                    "You can see how your data is affected in the preview below.")
+-            message1 = wx.wxStaticText(self, -1, msg)
++            message1 = wx.StaticText(self, -1, msg)
+ 
+             # -------------
+-            delimiterBox = wx.wxBoxSizer(wx.wxHORIZONTAL)
+-            delimStaticBox = wx.wxStaticBox(self, -1, "Delimiters")
+-            delimStaticSizer = wx.wxStaticBoxSizer(delimStaticBox, wx.wxVERTICAL)
+-            delimGridSizer = wx.wxFlexGridSizer(2, 3)
++            delimiterBox = wx.BoxSizer(wx.HORIZONTAL)
++            delimStaticBox = wx.StaticBox(self, -1, "Delimiters")
++            delimStaticSizer = wx.StaticBoxSizer(delimStaticBox, wx.VERTICAL)
++            delimGridSizer = wx.FlexGridSizer(2, 3)
+ 
+             delims = {
+                 'Tab':       '\t',
+@@ -704,36 +713,36 @@
+             self.delimChecks = {}
+ 
+             for label, value in delims.items():
+-                self.delimChecks[value] = wx.wxCheckBox(self, -1, label)
+-                delimGridSizer.Add(self.delimChecks[value], 0, wx.wxALL, 3)
++                self.delimChecks[value] = wx.CheckBox(self, -1, label)
++                delimGridSizer.Add(self.delimChecks[value], 0, wx.ALL, 3)
+                 wx.EVT_CHECKBOX(self, self.delimChecks[value].GetId(), self.Validate)
+ 
+-            otherSizer = wx.wxBoxSizer(wx.wxHORIZONTAL)
++            otherSizer = wx.BoxSizer(wx.HORIZONTAL)
+ 
+-            self.delimChecks['Other'] = wx.wxCheckBox(self, -1, 'Other:')
++            self.delimChecks['Other'] = wx.CheckBox(self, -1, 'Other:')
+             wx.EVT_CHECKBOX(self, self.delimChecks['Other'].GetId(), self.Validate)
+ 
+-            self.otherDelim = wx.wxTextCtrl(self, -1, size = (20, -1))
++            self.otherDelim = wx.TextCtrl(self, -1, size = (20, -1))
+             wx.EVT_TEXT(self, self.otherDelim.GetId(), self.OnCustomDelim)
+ 
+             if self.delimChecks.has_key(delimiter):
+-                self.delimChecks[delimiter].SetValue(wx.true)
++                self.delimChecks[delimiter].SetValue(True)
+             elif delimiter is not None:
+-                self.delimChecks['Other'].SetValue(wx.true)
++                self.delimChecks['Other'].SetValue(True)
+                 self.otherDelim.SetValue(delimiter)
+ 
+             otherSizer.AddMany([
+-                (self.delimChecks['Other'], 0, wx.wxALL, 3),
+-                (self.otherDelim, 0, wx.wxALIGN_CENTER),
++                (self.delimChecks['Other'], 0, wx.ALL, 3),
++                (self.otherDelim, 0, wx.ALIGN_CENTER),
+                 ])
+             
+             delimGridSizer.Add(otherSizer)
+-            delimStaticSizer.Add(delimGridSizer, 1, wx.wxEXPAND)
+-            delimOtherSizer = wx.wxBoxSizer(wx.wxVERTICAL)
+-            self.consecutiveDelimsAs1 = wx.wxCheckBox(self, -1, "Treat consecutive delimiters as one")
+-            self.consecutiveDelimsAs1.Enable(wx.false)
+-            tqSizer = wx.wxBoxSizer(wx.wxHORIZONTAL)
+-            self.textQualifierChoice = wx.wxChoice(self, -1, choices = ['"', "'", "{None}"])
++            delimStaticSizer.Add(delimGridSizer, 1, wx.EXPAND)
++            delimOtherSizer = wx.BoxSizer(wx.VERTICAL)
++            self.consecutiveDelimsAs1 = wx.CheckBox(self, -1, "Treat consecutive delimiters as one")
++            self.consecutiveDelimsAs1.Enable(False)
++            tqSizer = wx.BoxSizer(wx.HORIZONTAL)
++            self.textQualifierChoice = wx.Choice(self, -1, choices = ['"', "'", "{None}"])
+             wx.EVT_CHOICE(self, self.textQualifierChoice.GetId(), self.BuildPreview)
+             if textQualifier is not None:
+                 self.textQualifierChoice.SetStringSelection(textQualifier)
+@@ -741,52 +750,52 @@
+                 self.textQualifierChoice.SetStringSelection('{None}')
+                 
+             tqSizer.AddMany([
+-                (wx.wxStaticText(self, -1, "Text qualifier:"), 0, wx.wxALIGN_RIGHT | wx.wxALIGN_CENTER_VERTICAL),
+-                (self.textQualifierChoice, 0, wx.wxALL | wx.wxALIGN_LEFT | wx.wxALIGN_CENTER_VERTICAL, 5),
++                (wx.StaticText(self, -1, "Text qualifier:"), 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL),
++                (self.textQualifierChoice, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5),
+                 ])
+             
+             delimOtherSizer.AddMany([
+-                (self.consecutiveDelimsAs1, 1, wx.wxEXPAND | wx.wxALL, 5),
+-                (tqSizer, 1, wx.wxALL | wx.wxALIGN_CENTER, 5),
++                (self.consecutiveDelimsAs1, 1, wx.EXPAND | wx.ALL, 5),
++                (tqSizer, 1, wx.ALL | wx.ALIGN_CENTER, 5),
+                 ])
+ 
+             delimiterBox.AddMany([
+-                (delimStaticSizer, 0, wx.wxALIGN_CENTER),
+-                (delimOtherSizer,  0, wx.wxALIGN_CENTER),
++                (delimStaticSizer, 0, wx.ALIGN_CENTER),
++                (delimOtherSizer,  0, wx.ALIGN_CENTER),
+                 ])
+             
+             delimStaticBox.Fit()
+ 
+             # -------------
+             self.displayRows = 6
+-            previewSettingsBox = wx.wxBoxSizer(wx.wxHORIZONTAL)
+-            self.hasHeaderRow = wx.wxCheckBox(self, -1, "First row is header")
++            previewSettingsBox = wx.BoxSizer(wx.HORIZONTAL)
++            self.hasHeaderRow = wx.CheckBox(self, -1, "First row is header")
+             wx.EVT_CHECKBOX(self, self.hasHeaderRow.GetId(), self.BuildPreview)
+ 
+-            if wx.wxPlatform in ('__WX.WXGTK__', '__WX.WXMSW__'):
+-                # wx.wxSpinCtrl causes seg fault under GTK when <enter> is hit in text - use wx.wxSpinButton instead
+-                self.previewRowsText = wx.wxTextCtrl(self, -1, str(self.displayRows),
+-                                                  size = (30, -1), style = wx.wxTE_PROCESS_ENTER)
++            if wx.Platform in ('__WX.WXGTK__', '__WX.WXMSW__'):
++                # wx.SpinCtrl causes seg fault under GTK when <enter> is hit in text - use wx.SpinButton instead
++                self.previewRowsText = wx.TextCtrl(self, -1, str(self.displayRows),
++                                                  size = (30, -1), style = wx.TE_PROCESS_ENTER)
+                 h = self.previewRowsText.GetSize().height
+-                self.previewRows = wx.wxSpinButton(self, -1, size = (-1, h), style = wx.wxSP_VERTICAL)
++                self.previewRows = wx.SpinButton(self, -1, size = (-1, h), style = wx.SP_VERTICAL)
+                 self.previewRows.SetRange(self.displayRows, 100)
+                 self.previewRows.SetValue(self.displayRows)
+                 wx.EVT_SPIN(self, self.previewRows.GetId(), self.OnSpinPreviewRows)
+                 wx.EVT_TEXT_ENTER(self, self.previewRowsText.GetId(), self.OnTextPreviewRows)
+             else:
+-                self.previewRows = wx.wxSpinCtrl(self, -1, str(self.displayRows),
++                self.previewRows = wx.SpinCtrl(self, -1, str(self.displayRows),
+                                               min = self.displayRows, max = 100, size = (50, -1))
+                 wx.EVT_SPINCTRL(self, self.previewRows.GetId(), self.BuildPreview)
+ 
+             previewSettingsBox.AddMany([
+-                (self.hasHeaderRow, 1, wx.wxALL | wx.wxEXPAND, 5),
+-                (wx.wxStaticText(self, -1, "Preview"), 0, wx.wxWEST | wx.wxALIGN_RIGHT | wx.wxALIGN_CENTER_VERTICAL, 10),
++                (self.hasHeaderRow, 1, wx.ALL | wx.EXPAND, 5),
++                (wx.StaticText(self, -1, "Preview"), 0, wx.WEST | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 10),
+                 ])
+-            if wx.wxPlatform in ('__WX.WXGTK__', '__WX.WXMSW__'):
+-                previewSettingsBox.Add(self.previewRowsText, 0, wx.wxALIGN_CENTER | wx.wxALL, 3)
++            if wx.Platform in ('__WX.WXGTK__', '__WX.WXMSW__'):
++                previewSettingsBox.Add(self.previewRowsText, 0, wx.ALIGN_CENTER | wx.ALL, 3)
+             previewSettingsBox.AddMany([
+-                (self.previewRows, 0, wx.wxALIGN_CENTER | wx.wxALL, 3),
+-                (wx.wxStaticText(self, -1, "rows"), 0, wx.wxALIGN_RIGHT | wx.wxALIGN_CENTER_VERTICAL),
++                (self.previewRows, 0, wx.ALIGN_CENTER | wx.ALL, 3),
++                (wx.StaticText(self, -1, "rows"), 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL),
+                 ])
+ 
+             # -------------
+@@ -804,28 +813,28 @@
+                 hasHeaders = 0
+                 cols = 1
+ 
+-            previewStaticBox = wx.wxStaticBox(self, -1, "Data Preview")
+-            previewStaticSizer = wx.wxStaticBoxSizer(previewStaticBox, wx.wxVERTICAL)
+-            self.preview = grid.wxGrid(self, -1)
++            previewStaticBox = wx.StaticBox(self, -1, "Data Preview")
++            previewStaticSizer = wx.StaticBoxSizer(previewStaticBox, wx.VERTICAL)
++            self.preview = gridlib.Grid(self, -1)
+             self.preview.CreateGrid(self.displayRows, cols)
+-            self.preview.SetDefaultRowSize(self.preview.GetCharHeight() + 4, wx.true)
+-            self.preview.EnableEditing(wx.false)
++            self.preview.SetDefaultRowSize(self.preview.GetCharHeight() + 4, True)
++            self.preview.EnableEditing(False)
+             self.preview.SetColLabelSize(0)
+             self.preview.SetRowLabelSize(0)
+             self.preview.SetMargins(1, 0)
+-            self.initialized = wx.true
++            self.initialized = True
+             self.BuildPreview()
+ 
+             rowheight = self.preview.GetRowSize(0) + 2
+             self.preview.SetSize((-1, rowheight * self.displayRows))
+-            previewStaticSizer.Add(self.preview, 0, wx.wxALL | wx.wxEXPAND, 5)
++            previewStaticSizer.Add(self.preview, 0, wx.ALL | wx.EXPAND, 5)
+ 
+             # -------------
+             mainSizer.AddMany([
+-                (message1,     0, wx.wxALL, 5),
+-                (delimiterBox, 0, wx.wxALL, 5),
+-                (previewSettingsBox, 0, wx.wxALL, 5),
+-                (previewStaticSizer, 0, wx.wxALL | wx.wxEXPAND, 5),
++                (message1,     0, wx.ALL, 5),
++                (delimiterBox, 0, wx.ALL, 5),
++                (previewSettingsBox, 0, wx.ALL, 5),
++                (previewStaticSizer, 0, wx.ALL | wx.EXPAND, 5),
+                 ])
+ 
+             self.Layout()
+@@ -855,9 +864,9 @@
+             if not self.initialized:
+                 return # got triggered before initialization was completed
+ 
+-            if wx.wxPlatform != '__WX.WXGTK__':
+-                wx.wxBeginBusyCursor() # causes a spurious spin event under GTK
+-            wx.wxYield() # allow controls to update first, in case of slow preview
++            if wx.Platform != '__WX.WXGTK__':
++                wx.BeginBusyCursor() # causes a spurious spin event under GTK
++            wx.Yield() # allow controls to update first, in case of slow preview
+             self.preview.BeginBatch()
+             self.preview.DeleteCols(0, self.preview.GetNumberCols())
+             self.preview.DeleteRows(0, self.preview.GetNumberRows())
+@@ -892,7 +901,7 @@
+                 for col in range(cols):
+                     try:    self.preview.SetColLabelValue(col, str(previewData[0][col]))
+                     except: self.preview.SetColLabelValue(col, "")
+-                # self.preview.AutoSizeColumns(wx.true) # size columns to headers
++                # self.preview.AutoSizeColumns(True) # size columns to headers
+             else:
+                 self.preview.SetColLabelSize(0)
+ 
+@@ -902,13 +911,13 @@
+                     except: pass
+ 
+             # if not hasHeaders:
+-            self.preview.AutoSizeColumns(wx.true) # size columns to data
++            self.preview.AutoSizeColumns(True) # size columns to data
+ 
+             rowheight = self.preview.GetRowSize(0)
+             self.preview.SetRowSize(0, rowheight)
+             self.preview.EndBatch()
+-            if wx.wxPlatform != '__WX.WXGTK__':
+-                wx.wxEndBusyCursor()
++            if wx.Platform != '__WX.WXGTK__':
++                wx.EndBusyCursor()
+ 
+             self.delimiters = delimiter
+             self.textQualifier = textQualifier
+@@ -928,17 +937,17 @@
+             return self.hasHeaders
+ 
+     # ------------------------------------------------------------------------------        
+-    class ImportWizardDialog(wx.wxDialog):
++    class ImportWizardDialog(wx.Dialog):
+         """
+         CLASS(SUPERCLASS):
+-          ImportWizardDialog(wx.wxDialog)
++          ImportWizardDialog(wx.Dialog)
+         DESCRIPTION:
+           A dialog allowing the user to preview and change the options for importing
+           a file.
+         PROTOTYPE:
+           ImportWizardDialog(parent, id, title, file,
+-                             pos = wx.wxDefaultPosition, size = wx.wxDefaultSize,
+-                             style = wx.wxDEFAULT_DIALOG_STYLE, name = 'ImportWizardDialog')
++                             pos = wx.DefaultPosition, size = wx.DefaultSize,
++                             style = wx.DEFAULT_DIALOG_STYLE, name = 'ImportWizardDialog')
+         ARGUMENTS:
+           - parent: the parent window
+           - id: the id of this window
+@@ -955,22 +964,22 @@
+         """
+ 
+         def __init__(self, parent, id, title, file,
+-                     pos = wx.wxDefaultPosition, size = wx.wxDefaultSize,
+-                     style = wx.wxDEFAULT_DIALOG_STYLE, name = "ImportWizardDialog"):
+-            wx.wxDialog.__init__(self, parent, id, title, pos, size, style, name)
+-            self.SetAutoLayout(wx.true)
++                     pos = wx.DefaultPosition, size = wx.DefaultSize,
++                     style = wx.DEFAULT_DIALOG_STYLE, name = "ImportWizardDialog"):
++            wx.Dialog.__init__(self, parent, id, title, pos, size, style, name)
++            self.SetAutoLayout(True)
+ 
+             self.file = file
+             f = open(file, 'r')
+             self.data = f.read()
+             f.close()
+ 
+-            sizer = wx.wxBoxSizer(wx.wxVERTICAL)
++            sizer = wx.BoxSizer(wx.VERTICAL)
+             self.delimPanel = ImportWizardPanel_Delimiters(self, -1, file, self.data, self.ValidState)
+             buttonBox = self.ButtonBox()
+             sizer.AddMany([
+-                (self.delimPanel, 0, wx.wxALL, 5),
+-                (buttonBox, 0, wx.wxSOUTH | wx.wxALIGN_CENTER_HORIZONTAL | wx.wxALIGN_TOP, 0),
++                (self.delimPanel, 0, wx.ALL, 5),
++                (buttonBox, 0, wx.SOUTH | wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_TOP, 0),
+                 ])
+ 
+             self.SetSizer(sizer)
+@@ -980,15 +989,15 @@
+             self.Centre()
+ 
+         def ButtonBox(self):
+-            panel = wx.wxPanel(self, -1)
+-            panel.SetAutoLayout(wx.true)
+-            sizer = wx.wxBoxSizer(wx.wxHORIZONTAL)
++            panel = wx.Panel(self, -1)
++            panel.SetAutoLayout(True)
++            sizer = wx.BoxSizer(wx.HORIZONTAL)
+             panel.SetSizer(sizer)
+-            self.ok = wx.wxButton(panel, wx.wxID_OK, "Ok")
+-            cancel = wx.wxButton(panel, wx.wxID_CANCEL, "Cancel")
++            self.ok = wx.Button(panel, wx.ID_OK, "Ok")
++            cancel = wx.Button(panel, wx.ID_CANCEL, "Cancel")
+             sizer.AddMany([
+-                (self.ok, 0, wx.wxALIGN_TOP | wx.wxEAST | wx.wxSOUTH, 10),
+-                (cancel, 0, wx.wxALIGN_TOP | wx.wxWEST | wx.wxSOUTH, 10),
++                (self.ok, 0, wx.ALIGN_TOP | wx.EAST | wx.SOUTH, 10),
++                (cancel, 0, wx.ALIGN_TOP | wx.WEST | wx.SOUTH, 10),
+                 ])
+             panel.Layout()
+             panel.Fit()
+@@ -1002,11 +1011,11 @@
+         def ImportData(self, errorHandler = skipRow):
+             delimiters, qualifier, hasHeaders = self.GetImportInfo()
+             self.data = organizeIntoLines(self.data, textQualifier = qualifier)
+-            dlg = wx.wxProgressDialog("Import DSV File",
++            dlg = wx.ProgressDialog("Import DSV File",
+                                    self.file,
+                                    100,
+                                    self,
+-                                   wx.wxPD_CAN_ABORT | wx.wxPD_APP_MODAL | wx.wxPD_AUTO_HIDE)
++                                   wx.PD_CAN_ABORT | wx.PD_APP_MODAL | wx.PD_AUTO_HIDE)
+             self.data = importDSV(self.data,
+                                   delimiter = delimiters,
+                                   textQualifier = qualifier,
+@@ -1034,12 +1043,12 @@
+ 
+ 
+     def demo():
+-        class SampleApp(wx.wxApp):
++        class SampleApp(wx.App):
+             def OnInit(self):
+-                dlg = wx.wxFileDialog(None, "Choose a file", ".", "",
++                dlg = wx.FileDialog(None, "Choose a file", ".", "",
+                                    "CSV files (*.csv)|*.csv|Text files (*.txt)|*.txt|All files (*.*)|*.*",
+-                                   wx.wxOPEN)
+-                if dlg.ShowModal() == wx.wxID_OK:
++                                   wx.OPEN)
++                if dlg.ShowModal() == wx.ID_OK:
+                     path = dlg.GetPath()
+                     dlg.Destroy()
+ 
+@@ -1049,7 +1058,7 @@
+                         file.write("LINE %d: %s\n" % (linenumber, oldrow))
+ 
+                     dlg = ImportWizardDialog(None, -1, 'CSV Import Wizard (v.%s)' % __version__, path)
+-                    if dlg.ShowModal() == wx.wxID_OK:
++                    if dlg.ShowModal() == wx.ID_OK:
+                         results = dlg.ImportData(errorHandler = logErrors)
+                         dlg.Destroy()
+                         errorLog.close()
+@@ -1074,7 +1083,7 @@
+                 else:
+                     dlg.Destroy()
+ 
+-                return wx.true
++                return True
+ 
+         app = SampleApp()
+         app.MainLoop()
diff --git a/dev-python/python-dsv/files/python-dsv-1.4.1-wxpython30.patch b/dev-python/python-dsv/files/python-dsv-1.4.1-wxpython30.patch
new file mode 100644
index 000000000000..c5ed57380843
--- /dev/null
+++ b/dev-python/python-dsv/files/python-dsv-1.4.1-wxpython30.patch
@@ -0,0 +1,21 @@
+--- a/DSV/DSV.py
++++ b/DSV/DSV.py
+@@ -676,7 +676,7 @@ if wx is not None:
+                      style = wx.TAB_TRAVERSAL, name = "ImportWizardPanel"):
+             wx.Panel.__init__(self, parent, id, pos, size, style, name)
+             self.SetAutoLayout(True)
+-            mainSizer = wx.FlexGridSizer(3, 1)
++            mainSizer = wx.FlexGridSizer(4, 1)
+             self.SetSizer(mainSizer)
+             mainSizer.AddGrowableCol(0)
+ 
+@@ -1089,7 +1089,8 @@ if __name__ == '__main__':
+                 else:
+                     dlg.Destroy()
+ 
+-                return True
++                # return True
++                sys.exit()
+ 
+         app = SampleApp()
+         app.MainLoop()
diff --git a/dev-python/python-dsv/metadata.xml b/dev-python/python-dsv/metadata.xml
new file mode 100644
index 000000000000..0ae34c0a45ea
--- /dev/null
+++ b/dev-python/python-dsv/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>Python module for importing and exporting DSV (delimiter separated values) files.
+DSV is a generalization of CSV (comma separated values) and it is a common file
+format used by many programs to import and export data.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">python-dsv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-dsv/python-dsv-1.4.1-r2.ebuild b/dev-python/python-dsv/python-dsv-1.4.1-r2.ebuild
new file mode 100644
index 000000000000..5a4498fa70a6
--- /dev/null
+++ b/dev-python/python-dsv/python-dsv-1.4.1-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for importing and exporting DSV files"
+HOMEPAGE="http://python-dsv.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/DSV-${PV}.tar.gz"
+
+LICENSE="CNRI"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/wxpython:3.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/DSV-${PV}"
+
+PATCHES=(
+	# From Debian
+	"${FILESDIR}"/${P}-env.patch
+	"${FILESDIR}"/${P}-unicode.patch
+	"${FILESDIR}"/${P}-wx-namespace.patch
+	"${FILESDIR}"/${P}-wxpython30.patch
+)
diff --git a/dev-python/python-ebtables/Manifest b/dev-python/python-ebtables/Manifest
new file mode 100644
index 000000000000..fb48c7cc4278
--- /dev/null
+++ b/dev-python/python-ebtables/Manifest
@@ -0,0 +1,3 @@
+DIST python-ebtables-0.2.0.tar.gz 20290 SHA256 5d5cc3b84dd7ce3bd3299fa276e71bc2dece4b2cb8a388828b54bd92a5c549b3 SHA512 7051672d205b8318dcf7d08b50c8e0f66d9bb6532794d9292a890c5f75a88845f9e0cd9abf41450bf2a0516623c494eb40330021dc99320e5e0ffa56c75b100a WHIRLPOOL a4ab5845367b530b6184c976f2a8a20438d5ed14053379d3c47d44217cc141d7dd3078605d3ece504843a22f921676cc75cd7481dc2a8ad62ae059451a17b074
+EBUILD python-ebtables-0.2.0.ebuild 521 SHA256 47a4b58f49f81f8ed43b603dde3b67876534c119bfa6e21977c9326ccb821547 SHA512 0d4b3eb76b68445b295144410043e5dc550208158b3d16c08718eca7d7dfc5564958b449334fc43eabe69d1a41b15b273517db73600d44f55e9c0fabaa9e8f94 WHIRLPOOL 682cf4dca5261747ea01669e07f8c0a833d4e892a2df8b205ae47ceb315dbe66786ede3f0d3116e45ffd84beb20e50f1c60295d6aca09dacce44c9f7930d09f4
+MISC metadata.xml 508 SHA256 db004755fca09a6201b00e67cb5f8357cbdcde8dec19e8c7aa44bd9ec89c9e22 SHA512 ff808d70776d0dca06f0fc88f0e4f5fd873a85bd9e37d9cb86c88e1d72e24496bb273be2fe3735589884c53621425f1e7b17af2d11d69b96e559e8235141deb8 WHIRLPOOL f55033c925ca18f435b838f521653eb637ec8aaa6dc87fe4edca7887c9ee34b6232e6932dd57e18edd14cd156bf882049b63e9db5a99bc226aab5f955bc87a89
diff --git a/dev-python/python-ebtables/metadata.xml b/dev-python/python-ebtables/metadata.xml
new file mode 100644
index 000000000000..25d80baf6f13
--- /dev/null
+++ b/dev-python/python-ebtables/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Ebtables is used for Ethernet bridge frame table administration on Linux.
+		Python-ebtables is a simple Python binding for Ebtables.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">ldx/python-ebtables</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-ebtables/python-ebtables-0.2.0.ebuild b/dev-python/python-ebtables/python-ebtables-0.2.0.ebuild
new file mode 100644
index 000000000000..d8bec59d8cf3
--- /dev/null
+++ b/dev-python/python-ebtables/python-ebtables-0.2.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for ebtables"
+HOMEPAGE="https://github.com/ldx/python-iptables"
+SRC_URI="https://github.com/ldx/${PN}/archive/v0.2.0.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-firewall/ebtables[-static]
+	dev-python/cffi[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-editor/Manifest b/dev-python/python-editor/Manifest
new file mode 100644
index 000000000000..7bdb2e58a5eb
--- /dev/null
+++ b/dev-python/python-editor/Manifest
@@ -0,0 +1,6 @@
+DIST python-editor-0.4.tar.gz 6516 SHA256 4421a7116bf3af957266f225bc79ad25b92839cc7974c8335bba5a6582edd3bf SHA512 f1fd4660e67e8299a6f9183e85a1e213e1156542d84eae6644e4f42e5e2804f813857ee50bd8833728b320415ee6f2be5df4ca69acb10a709f20d2306eb5e7ad WHIRLPOOL 2c68e5749bf7955315888a3bed45d3f3b68ef575804342e1391269a9f6f05ddce43242dc988dd29e805f9c165e06731b857238bdebd94e2e5c1f2f7181da24d9
+DIST python-editor-1.0.3.tar.gz 6975 SHA256 a3c066acee22a1c94f63938341d4fb374e3fdd69366ed6603d7b24bed1efc565 SHA512 258d1ea17ea1c09d8ef52d3b624cc17710559f4a8db3c64696f72aecfcc0830d3509dcdcc9d1ac272155b2aaab432edb7142b0a37f2c3263a2505bff940a3cab WHIRLPOOL e0bddecfe9c818916b306aab9c4acaf4efa5c1b2e405b221203939d3c01ef5bcc3ed8c2109a45dedbbe447ebeff02c3d17fe23dc8e40698e5206b19dd3ee5337
+EBUILD python-editor-0.4.ebuild 514 SHA256 c0f2786ff67212b4210409dddb48f6c0458fccd8a0388d9462073c8655a88d86 SHA512 b2bd4956d1dbddcba3d4ee673488aa92a2023b297d2399d83ac92077819b487d79059fda255d6d70acb378424e049c36607aaf018fb61204e02664b265000fae WHIRLPOOL 74098df577a7ed42abcb49275106e35ea529d720f9e9236cdd51801fcdde5b783d2c0fae0de9a4fb0fe421bcb71939f9c7a7036076ecab12ebc3b5c63d4700ef
+EBUILD python-editor-1.0.3.ebuild 515 SHA256 4fcde4b3f888079c2989705e2c46890359e962b23d58da322e52447e6e409332 SHA512 d234c0ce062b3eb29324cc21c8ab091e1bd3a9c70408c97d226dd20dac2d938072385fb917f61c984df811fe6a269d162f94433ed748ed9aa9ecaafc858e2e58 WHIRLPOOL f743e18f6831049318f71437961185979de73d9e1f92ede268a9f418bf84d5bb61770a97bd125d71050153c57eceddb72752280f38ded12e0172e6395a7328e6
+MISC ChangeLog 1918 SHA256 26ce704daf37c3338b41d14b1584779920e88853306af0ad75f4468cab330e8c SHA512 a74c6b00bc564dfd63ad140556e6f92c4f965641e48235ef30e925958c777ce5946e5c1ac961426d450baf42d302866bc0010b8db9b3e3ed9d355863076e9b50 WHIRLPOOL 8ce23553c4ae3f75757292c47e02b19faf1c3199aa1a5bcdb3be1560762553b84b3100fc388ba559424ad4b6bb5ce6e332803ae7e72fbb3ac8b53054657f1a41
+MISC metadata.xml 454 SHA256 8a72e07df6a16c65d4d08df0b4363ec70cffe9c27f3070c3ef89adefa5cdbc12 SHA512 2a75117477ebfe097dc4791d65581ccfd010406eeb3d5145c237edcee0b3af409ccee45abd83b18798ace1196206343a94032058f53e20a708c30ddcebe6b432 WHIRLPOOL c73e95774b230fe401edb6a3554db8ea515363d196c51ee2b454ee6a31367b555793dbadeb05d842afbbc85c8cf81bd7a4bdfbd039bb317b3f44d2d77743d759
diff --git a/dev-python/python-editor/metadata.xml b/dev-python/python-editor/metadata.xml
new file mode 100644
index 000000000000..3c5614e4b63d
--- /dev/null
+++ b/dev-python/python-editor/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/fmoo/python-editor/issues</bugs-to>
+		<remote-id type="github">fmoo/python-editor</remote-id>
+		<remote-id type="pypi">python-editor</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-editor/python-editor-0.4.ebuild b/dev-python/python-editor/python-editor-0.4.ebuild
new file mode 100644
index 000000000000..bb371cae4a98
--- /dev/null
+++ b/dev-python/python-editor/python-editor-0.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Programmatically open an editor, capture the result."
+HOMEPAGE="https://github.com/fmoo/python-editor"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-editor/python-editor-1.0.3.ebuild b/dev-python/python-editor/python-editor-1.0.3.ebuild
new file mode 100644
index 000000000000..861c2a058204
--- /dev/null
+++ b/dev-python/python-editor/python-editor-1.0.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Programmatically open an editor, capture the result."
+HOMEPAGE="https://github.com/fmoo/python-editor"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
new file mode 100644
index 000000000000..742eb86c9508
--- /dev/null
+++ b/dev-python/python-efl/Manifest
@@ -0,0 +1,6 @@
+DIST python-efl-1.17.0.tar.xz 8835228 SHA256 9ea0fe0938bd4a970206b2b18f46f4d2a4fd1994e9b5f84af2d5f9fa98739179 SHA512 ff610dbacf72853b6c8fb1dcd41451f97156845efeb67a2d5d6c35d9b20c0f024c145a26a579f675bc2ad5844c23e58d8b21a09374aa195174f1a0c6316c0de4 WHIRLPOOL 0ee05c0cb175128c4719883a4c362ce4b3f98a93a7d960e47be2fa60a375748fc89599a111277d77a44caa9c96ad509d5b1c14c1ebafeb739461914560f2b4ed
+DIST python-efl-1.18.0.tar.xz 8927932 SHA256 1751e119c3fc4ee842c00ae3d667d6bda88d92eff424b06a31e9407db8ee225d SHA512 c1fc8d4129c2ac61b367ad373ad676a60cf0aed4c9150104d7e81bf464c44a3a5ae555d2298bbf1bdf6a3d6ba3b7d934af390e36755a1516972db2675d920c2b WHIRLPOOL cb5e9df770b4dd5fae78b6e7ba0ff8e593f9fa5c1ee098a5976250e2b44e3c428b57ef58dd184abd50beef29af1c08574b8f84be4e3ce06218580f6e559e068a
+EBUILD python-efl-1.17.0.ebuild 1637 SHA256 85524e4ba898df9b79a79431ffbfbb9a494188c5ca2633fee3aadc485af61972 SHA512 cf47dc3fd80f34e1fec86218f50759af69acf835064c658618d1ac4c21fe78d2f119ce33e5c7367811a0418c31b2f24f2d246571f602c24aeeb324b29c67a471 WHIRLPOOL 01edffa4fc08290c560fc7f73a2f9fefc9e7420afd1178e2c6b8bf0e31737c167ecf4b1f5b96d7223dcc506904568351ca19c6f5dd4aedc995e6ad1ad88707ac
+EBUILD python-efl-1.18.0.ebuild 1628 SHA256 8a90a5741365df3e1166435fa115e635dbeb3bccae20e4c41ece58c59a78b63c SHA512 7d9ac3b6be557ea9801f4bf90c9399d9e6f4c4b8d3880fc898c5359aac1f873abe70189d52cbc5f8a8ed3c119da367ba2cb7ca828e39f85582b47cee9cb723fb WHIRLPOOL adf265518a6dd92b6300c502e288b5e1b32611372e005257d3b2967a0af966c1a232a3f258fa7f0747557f7c22704c337b71c7078efac05d8b70c84d481cb13a
+MISC ChangeLog 1569 SHA256 63b57e5cb72b969265060106495666c4f77acc132d6d9db020087c9adff6f5e7 SHA512 d57ee6808ec35f75932ac31a027d530781a71a1b58d18055347a4c07282f0f95c95ac048c4048e7bb72df9e8c5e07a6c1c0dd267eb9daf5fcb383de5d6ddf4e3 WHIRLPOOL 02deeb78639239ff40270a385627ee9dc592e10de39d555d9d5d5826589bd41df8a973886a7eb2f1d053ebb606cccae97ef390979ea9698eb77ec3881ae79455
+MISC metadata.xml 258 SHA256 37dfcf5268b6c72244a1e88ef13818d60253d4814da400b82dd3d9a2cfc165e0 SHA512 59d30cd09990b755f6e1f0198e7ce860fe587038c5c020e44a9219aba431d96393ff0c5bdd5dd0db3512cc3d5c7b9992af242810204883663591432a0fa67997 WHIRLPOOL fbf816d88e3fad8cfab6bd5f4765697c37e9047b5122e4e567994e46c257a66939953d73378dd9c7ff0703315176c72e1e2a7edd5629a31de10c10c13c5707d8
diff --git a/dev-python/python-efl/metadata.xml b/dev-python/python-efl/metadata.xml
new file mode 100644
index 000000000000..8dca222b9693
--- /dev/null
+++ b/dev-python/python-efl/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="project">
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-efl/python-efl-1.17.0.ebuild b/dev-python/python-efl/python-efl-1.17.0.ebuild
new file mode 100644
index 000000000000..a03589e844d2
--- /dev/null
+++ b/dev-python/python-efl/python-efl-1.17.0.ebuild
@@ -0,0 +1,61 @@
+# 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} )
+
+MY_P=${P/_/-}
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_SUB_PROJECT="bindings/python"
+	EGIT_URI_APPEND="${PN}"
+	EGIT_REPO_URI="https://git.enlightenment.org/${EGIT_SUB_PROJECT}/${EGIT_URI_APPEND}.git"
+	inherit git-2
+else
+	SRC_URI="https://download.enlightenment.org/rel/bindings/python/${MY_P}.tar.xz"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for Enlightenment Fundation Libraries"
+HOMEPAGE="http://www.enlightenment.org"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+RDEPEND=">=dev-libs/efl-${PV}
+	>=media-libs/elementary-${PV}
+	>dev-python/dbus-python-0.83[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.17[${PYTHON_USEDEP}]
+	doc? (
+		media-gfx/graphviz[python]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	doc? ( >dev-python/sphinx-1.0[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	if use doc ; then
+		# Point sphinx to right location with builded sources
+		sed -i 's|"../build/"+d|"'"${BUILD_DIR}"'/lib"|g' doc/conf.py
+		esetup.py build_doc --build-dir "${S}"/build/doc/
+	fi
+}
+
+python_test() {
+	cd "${S}"/tests
+	rm -f ecore/test_09_file_download.py # violates sandbox
+	sed -i 's:verbosity=1:verbosity=3:' 00_run_all_tests.py || die
+	${PYTHON} 00_run_all_tests.py --verbose || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && DOCS=( "${S}"/build/doc/html )
+	use examples && EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-efl/python-efl-1.18.0.ebuild b/dev-python/python-efl/python-efl-1.18.0.ebuild
new file mode 100644
index 000000000000..a077d345f65d
--- /dev/null
+++ b/dev-python/python-efl/python-efl-1.18.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+MY_P=${P/_/-}
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_SUB_PROJECT="bindings/python"
+	EGIT_URI_APPEND="${PN}"
+	EGIT_REPO_URI="https://git.enlightenment.org/${EGIT_SUB_PROJECT}/${EGIT_URI_APPEND}.git"
+	inherit git-2
+else
+	SRC_URI="https://download.enlightenment.org/rel/bindings/python/${MY_P}.tar.xz"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for Enlightenment Fundation Libraries"
+HOMEPAGE="http://www.enlightenment.org"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND=">=dev-libs/efl-${PV}
+	>dev-python/dbus-python-0.83[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
+	doc? (
+		media-gfx/graphviz[python]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	doc? ( >dev-python/sphinx-1.0[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	if use doc; then
+		# Point sphinx to right location with built sources
+		sed -i 's|"../build/"+d|"'"${BUILD_DIR}"'/lib"|g' doc/conf.py || die
+		esetup.py build_doc --build-dir "${S}"/build/doc/
+	fi
+}
+
+python_test() {
+	cd "${S}"/tests || die
+	# violates sandbox
+	rm -f ecore/test_09_file_download.py || die
+	sed -i 's:verbosity=1:verbosity=3:' 00_run_all_tests.py || die
+	${PYTHON} 00_run_all_tests.py --verbose || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && DOCS=( "${S}"/build/doc/html )
+	use examples && EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
new file mode 100644
index 000000000000..c3453d6814a8
--- /dev/null
+++ b/dev-python/python-engineio/Manifest
@@ -0,0 +1,6 @@
+DIST python-engineio-1.4.0.tar.gz 20829 SHA256 488f7761aaa4ab84ae4356755efe0e689de1dbc98052c9533a3f1aa9ce13e8c7 SHA512 ab32361d91b0c982a41f7fde7769912e13d8ea9acd9e99cbc36c84cedca2241a175b3b49582589b821457f13270b2beb0c90a9592b7b9dbf625d82fcc36504f5 WHIRLPOOL b9a8f3479c1d3e6c2fd1f14aa88775e09c3de9ce831d761912d03afb58b506232b364f07e4e8a76ebbab379a4f15649397c7a89cbcc65d572db5b3d34710dd47
+DIST python-engineio-1.7.0.tar.gz 22804 SHA256 fca35c7e4af42475552d53eea04a9280e2ccd331a032f41d17290ff3125a2291 SHA512 1d184ccb9d1328d9f4e2fa22006f1d21bd17200bc893ee2588b4342da24775f98648e0e993893eb56a9159f95a114f128dfdacef9fa8ea296c7ace6c7741aea0 WHIRLPOOL 9ad22f4a5964a84d266deec2dfe72d8a0c9719c759c31ab0d84b457e0e5489297d7748ee59338b1ae1919a7ff890a02a118cbb09fcb9063723af67df635904ca
+EBUILD python-engineio-1.4.0.ebuild 734 SHA256 bb078e16e5150578263f15b325fe7ecbf6a58c9b2e7e043e2e6c5a409337c1eb SHA512 647d8e98dfffbf0ffc5a961d9ee3b133230d571ef046b2208eda46cf90f7c83cf55742fcbfb166b5d1c18d5d4adf67b27112a8cc5f219854148e64762779111e WHIRLPOOL 81752bccc76522eb50a562a24bfd6d6ee2138844323a1a93689c00dd07cc463c55640502ece03ed415e7dbbe9d122deeabd0e06db6bd4d74f85dfc89944feafd
+EBUILD python-engineio-1.7.0.ebuild 734 SHA256 bb078e16e5150578263f15b325fe7ecbf6a58c9b2e7e043e2e6c5a409337c1eb SHA512 647d8e98dfffbf0ffc5a961d9ee3b133230d571ef046b2208eda46cf90f7c83cf55742fcbfb166b5d1c18d5d4adf67b27112a8cc5f219854148e64762779111e WHIRLPOOL 81752bccc76522eb50a562a24bfd6d6ee2138844323a1a93689c00dd07cc463c55640502ece03ed415e7dbbe9d122deeabd0e06db6bd4d74f85dfc89944feafd
+MISC ChangeLog 2023 SHA256 1ac74340f4c6cda2302c3068c5f9690c541dec026d6e864f2c2a1f901803bab5 SHA512 49f286b652d9dde92cc6346a29a0fc2086f8d5868048973927701c571ed35527239943a69d8e6f890f870e0f443b01dc3b718a74cee500f5b662ed3366d71bad WHIRLPOOL 489332ac375afcf9d43c9a3f10b949b1de0c5acf5bfc11e4c10ca41fe10e22bf7b218c369c96f4f3f13e5b1189367c04243b58ff5c8d66578e32d38d52c6519c
+MISC metadata.xml 466 SHA256 6d23c622e3064bae5fb466d840fde855196a6762b62ef0fd376ec089a78f4f1c SHA512 4b945547b692e81069a2ae0d70af112945aa2200b935efbddbbcfff4fea60268a9933dcf7ba2936e6c7a6655ef805f93252f157e63771e068a7ac6fb82c4de1a WHIRLPOOL bbc596d01ce5e49793b8b4413c3f8af7e83ed67f24bccd71945612ac0079716a79b0da4abc9b94830a77acdfe621b3f0b0b9ff77c05080b559ccba074c5681f9
diff --git a/dev-python/python-engineio/metadata.xml b/dev-python/python-engineio/metadata.xml
new file mode 100644
index 000000000000..5362121cde22
--- /dev/null
+++ b/dev-python/python-engineio/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">python-engineio</remote-id>
+		<remote-id type="github">miguelgrinberg/python-engineio</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-engineio/python-engineio-1.4.0.ebuild b/dev-python/python-engineio/python-engineio-1.4.0.ebuild
new file mode 100644
index 000000000000..6f3b26b71d31
--- /dev/null
+++ b/dev-python/python-engineio/python-engineio-1.4.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=""
+DESCRIPTION="Python implementation of the Engine.IO realtime server."
+HOMEPAGE="https://${PN}.readthedocs.org/ https://github.com/miguelgrinberg/${PN}/ https://pypi.python.org/pypi/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# pypi tarball does not contain tests
+RESTRICT="test"
+
+python_test() {
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/python-engineio/python-engineio-1.7.0.ebuild b/dev-python/python-engineio/python-engineio-1.7.0.ebuild
new file mode 100644
index 000000000000..6f3b26b71d31
--- /dev/null
+++ b/dev-python/python-engineio/python-engineio-1.7.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=""
+DESCRIPTION="Python implementation of the Engine.IO realtime server."
+HOMEPAGE="https://${PN}.readthedocs.org/ https://github.com/miguelgrinberg/${PN}/ https://pypi.python.org/pypi/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# pypi tarball does not contain tests
+RESTRICT="test"
+
+python_test() {
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/python-etcd/Manifest b/dev-python/python-etcd/Manifest
new file mode 100644
index 000000000000..b0ad9b4b422b
--- /dev/null
+++ b/dev-python/python-etcd/Manifest
@@ -0,0 +1,11 @@
+DIST python-etcd-0.3.2.zip 35994 SHA256 e86c560303bbc7058c64b47e57393ebcfe5213756236c1344c9c97a6029737bb SHA512 0a110e33cccc555a52ec9a5c8ff1c1702bcebbba80f8b948fd72e78baa5fb00e1bb96be08f3839d07230ea905518ec4247a94d7def39f979fe83e01c52da609b WHIRLPOOL 3c70734d23086d2cad0d570d6361ab73f650994c1f30af31a3e1fda22b046f4d72193aa0ef479650788727079593beb261557daa2e0054e0f6381f945cf0052a
+DIST python-etcd-0.3.3.tar.gz 26529 SHA256 d261d6f3a9c11bc20e9541bf444ca7c21348dbf6133ebc6bb981abaea8164dba SHA512 ab7eac02083ee23cadbb5c70ca24001eaa2bc14f9413984ccf3cea2ee91ad660c8dbe2158f7fb238e142585b8f79313f548517ae622236772d5e5f356556ab0a WHIRLPOOL 0a2e09adf6a8c5a628bc5013cd446c111aef14529729090b116ce38fcf4d010a6416e3d92a23fd9f2c82a12811f7bfa572f29134643e3303bcba8e3011c6b593
+DIST python-etcd-0.4.4.tar.gz 38334 SHA256 ab1dfff665f0de8598fe97c3c686ec0a17add89e828fa29a620e4dc9706091c7 SHA512 8b1d51801141c9ea2e65ab3e95d7aff667f52c5888927d493b86f7677bbb37ee80c783aac73c638bfabd32b50df5eff8a2457117156e04b80bc4c6c592194d23 WHIRLPOOL ce6d3d5fcf729da8ec4e7e5b6ac851dc33e278c87b36add21ac8266e6d62e8a72967570a21313b63453e8be2dbcbda0f0097b5cad8cb320bc2ecbf19582d5a08
+DIST python-etcd-0.4.5.tar.gz 37270 SHA256 f1b5ebb825a3e8190494f5ce1509fde9069f2754838ed90402a8c11e1f52b8cb SHA512 c59d7a67492a2e4e72b1ae3ea73ac85a073b9d4516d1ebc48601ba67ac9609fbc45574d97e8dfae3ed4f511f090343ff980160043676252125ce2e2edc7bd154 WHIRLPOOL d0caba86571aed6262465d93ad67c829b25a9c343b6a0a6b7e4b877ef6835d1b5b990b1db89626ca89a71a445124a6c93aa35df724be62b6ec7798ea337b63ca
+EBUILD python-etcd-0.3.2.ebuild 553 SHA256 9c327fd5065e92ad6520f75f5320e656460889866ee728d63b38e509d81fe1ed SHA512 65c282d3a2cb6a2bb87236b8c223ef7f3d7dd1f7f1c0c409928b95006da656ff577417fded26c656eb4882ffb8b41c27d7c735c79c9e0f2672bf4e76816dedfd WHIRLPOOL 52f78943f95363ce70704211f1d6e767a6697f7f86c2e969b7bc92ce11dde6f16298024e841d6fbf4efb1d9d15fd9dbf17ebd38e53d3a0a500e195a49b3d18a5
+EBUILD python-etcd-0.3.3.ebuild 563 SHA256 2a2f41bbcadad0f39d9c7af0a2c8847d01f9d8cd8c275564db5abfd4a850487c SHA512 b157144998c98ca2f6b2e42fc811ce17015c110141e296e52f31c87cbc83bbd6c6d30132e249e5fb4ef75c85b847d5efad044988ed08fbd1c1c230c44a56e964 WHIRLPOOL 9f0bb657e0bd162f1b926f0af41eea93f9d42cd258cc00865520770847774ec4385956827dc65848c66fa0df891cd6804c71baa9c2b341032df622bf0d1c9c39
+EBUILD python-etcd-0.4.4.ebuild 563 SHA256 84893cbdf5c28d859b572abc135096b5b1881108e717068bcebd900da37a0739 SHA512 8289dd3f4a34cf49e294b1b49dfaa2d57b12d65a4b1c070fde23767ded1694bb9b56aa6f0166bc1409cd19445963dfcae5bf3fa4898cf2224e97f6a7ef2c6c7c WHIRLPOOL a5c0bb69a62d7d055e213f1fe871a64510997deaaac7f461882c3b872ebb123a3a3941da5f337f43e1855445f69182a57a3002006b788b37a0af8ca28492acc7
+EBUILD python-etcd-0.4.5.ebuild 723 SHA256 0b1106c70c6c57b27b3b53d06bcdacdefdd0349327aae2bdb428b81bae548136 SHA512 df746bbd377c9727d9f487ca071fee574297d25b74ea60e386e218847fd6907ec27a16ffffe7a8f742514bc99dc0bf68db26f3ffb4029361a9bae74a7b2a1c94 WHIRLPOOL 27cdbc6c9aebe4f71634d56befe046f18985becbf8939f84d6d1d589c1189052194184fdf2dc9f9a71fa50a6ba915356ffd128fc41973454f782061d09297a6b
+MISC ChangeLog 2549 SHA256 937fbc2881b67520b34d51c4eea04a52df19559d18ee11e289e3d054b160c4d9 SHA512 fad3c73ee7cde675f80f3ecdafcdf25f1924419d7d1d37d40cb09005e063e26a067d1f9c35c3ff8f7fe3b6aaf766166723fe960116033fc6bb630acadd6ec5df WHIRLPOOL e60c1f82305a4c0d4ebd7e4847a77c85a7b68a38ac09f5462773c3b3421cdb118ddf8b93818a4cf817f09cb3e1c6861c0d0f4d980529a590bcc4d3d761b69d9f
+MISC ChangeLog-2015 715 SHA256 8f1ce87a01554b97fbc0a9c6535b3dd81ccd63fdadfe8437794f7aa7d168d7af SHA512 5f71e69db29c96997897dd3f65381b89ecb21127a83786574a429c0ed4847016c0d5a291647cc8791765bbff18c215ea84cf92289d1902a66ac9584d0698bdce WHIRLPOOL 62e74f3687e5d23fb0f6733350798caffecd54a8e8ae60cdafc15daf79c2de056da094e10522d26866358bb9f948a99f4488a0f3abfb66a33fb53c63aeb0aa5a
+MISC metadata.xml 524 SHA256 695f1f5246e7f5f58463f4149fd15fdbc50c425ee67b671d70a109c40b427aa4 SHA512 3e629397cf00d97d1fc0e8ebc7edee5410e7dd50e09bde887f05388b788db22835b80bc3492bde3c4169c623605e7d84b2df465b864bf8b65e5623e74bad4f5c WHIRLPOOL 71057e31d21df685b1296911194aaf88f172da94382a757651ff8541b4d03506d0ed91daf4e2275d05cda7a786616c4d6197e330e0eab7bb59b95f92d08d67ba
diff --git a/dev-python/python-etcd/metadata.xml b/dev-python/python-etcd/metadata.xml
new file mode 100644
index 000000000000..0d35f613bc0a
--- /dev/null
+++ b/dev-python/python-etcd/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <bugs-to>https://github.com/jplana/python-etcd/issues</bugs-to>
+    <changelog>https://raw.githubusercontent.com/jplana/python-etcd/master/NEWS.txt</changelog>
+    <doc>http://python-etcd.readthedocs.org/</doc>
+    <remote-id type="github">jplana/python-etcd</remote-id>
+  </upstream>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-etcd/python-etcd-0.3.2.ebuild b/dev-python/python-etcd/python-etcd-0.3.2.ebuild
new file mode 100644
index 000000000000..b0c24014f0e5
--- /dev/null
+++ b/dev-python/python-etcd/python-etcd-0.3.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python client for etcd"
+HOMEPAGE="https://github.com/jplana/python-etcd"
+SRC_URI="https://github.com/jplana/python-etcd/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/urllib3-1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/python-etcd/python-etcd-0.3.3.ebuild b/dev-python/python-etcd/python-etcd-0.3.3.ebuild
new file mode 100644
index 000000000000..26ff78b26e81
--- /dev/null
+++ b/dev-python/python-etcd/python-etcd-0.3.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python client for etcd"
+HOMEPAGE="https://github.com/jplana/python-etcd"
+SRC_URI="https://github.com/jplana/python-etcd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/urllib3-1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/python-etcd/python-etcd-0.4.4.ebuild b/dev-python/python-etcd/python-etcd-0.4.4.ebuild
new file mode 100644
index 000000000000..262d5d994b9d
--- /dev/null
+++ b/dev-python/python-etcd/python-etcd-0.4.4.ebuild
@@ -0,0 +1,23 @@
+# 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,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python client for etcd"
+HOMEPAGE="https://github.com/jplana/python-etcd"
+SRC_URI="https://github.com/jplana/python-etcd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/urllib3-1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/python-etcd/python-etcd-0.4.5.ebuild b/dev-python/python-etcd/python-etcd-0.4.5.ebuild
new file mode 100644
index 000000000000..75ff1044e92b
--- /dev/null
+++ b/dev-python/python-etcd/python-etcd-0.4.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python client for etcd"
+HOMEPAGE="https://github.com/jplana/python-etcd https://pypi.python.org/pypi/python-etcd"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=">=virtual/python-dnspython-2[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.7.1[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? (
+		dev-db/etcd
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-ethtool/Manifest b/dev-python/python-ethtool/Manifest
new file mode 100644
index 000000000000..66443109caca
--- /dev/null
+++ b/dev-python/python-ethtool/Manifest
@@ -0,0 +1,5 @@
+AUX python-ethtool-0.11_include-net-if.h-for-IFF_-macros.patch 622 SHA256 24dad02f99f20bce5c356772315631806c747858e4fb6640ce45e778792b34f8 SHA512 796beab89f476138fbe799fb296631d912155227b4d40118eef20ea69ca244d272756a63c1afbb42f2941243425994428d82699e1026c4c52a9bb4616fde5839 WHIRLPOOL f3fdfb8ff54f5ae2b52c5cf3b82dbb7922805f06a91e5a94785076b1b111335033576b44ad9810a1ee158ab560f564b8bdaa17e5d979b5226954924ab6b17024
+DIST python-ethtool-0.11.tar.bz2 34487 SHA256 686756e4b2b239319e8513025debcc0d97103815b0879f94d8234cbbca6ada24 SHA512 b260e608e1024c48eedb72327b704b01fb42396219ca3d942fe42f22d3e8018fc74bfeffd96e37abd4efd2ce49a73915e0e2af5841a537a02e247d4ba5548f20 WHIRLPOOL 1bb2dc8718fd418f81aa20960712f5c2bd131a1128c291df5e955fef83ea71035f429b0fb9e9d213488b0129631978e7fd48f41b199195c59efa30b91484005a
+EBUILD python-ethtool-0.11.ebuild 603 SHA256 0832aa730818239627466773fc01154703059032ffde7228f2df77d84e6c7e9b SHA512 9b43ada6a87e75d45da8982ca586b7a1876cda635aa805e616a207f451d5c56062711ba79a3f8b2df4da10747c4d30d397920655128c390784847888ab6716cf WHIRLPOOL 6faa42ecae997ecbff5b9f521742d6b4b27fdd3769f6e55d21676c0b9ed385e9a79b29b27e5903e6cedf1ca4ea039405712f9abd297b7a2d930195bdbdc04911
+MISC ChangeLog 406 SHA256 5166700127132c697207c0d5a5d530b571c99debdb943dab6c2ddf44b327518c SHA512 f3bd4a7a7a65552d756e529610fce6cf5583c272b1c69ec18f53230379bb4f4fba13c5ff8b1cce09807e44f282b303af0d6c5821de3bae8b8190565c6a3c7008 WHIRLPOOL dfb97b56581d0de75a3fada80e625cba7275b9aa5095a76bee94b3619da00e89bf231f5276c5715fac4248a35700f97201bb50069fde032ae6367b1bdc0abf76
+MISC metadata.xml 464 SHA256 8bfc17f959fe869a2eb72fac1a4360647da1a6f3f1578e143c02c80c172c2040 SHA512 26faaf69c1bcd592bfd2687b3e805ac9d5ecd155ad86a4d1d92875e96d24a2e21603d1a5a581fdb05bfb9883ddc9ce8bf86a5ca464d7521db65d271b5bc5485d WHIRLPOOL cb77ac4803e02bfe28e0e3b442ded1958df65183a3f434c7786863adc6a6af65a6da45cca72f2f12e2aa1db0104412a7c71359ca74dd6913afa8648ffc0f0c1d
diff --git a/dev-python/python-ethtool/files/python-ethtool-0.11_include-net-if.h-for-IFF_-macros.patch b/dev-python/python-ethtool/files/python-ethtool-0.11_include-net-if.h-for-IFF_-macros.patch
new file mode 100644
index 000000000000..f5cb92984ef9
--- /dev/null
+++ b/dev-python/python-ethtool/files/python-ethtool-0.11_include-net-if.h-for-IFF_-macros.patch
@@ -0,0 +1,24 @@
+From a43f582918d3295b7cdef9e056bf5b1c4eb2ef80 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Mon, 22 Jun 2015 05:18:44 -0500
+Subject: [PATCH] Include net/if.h for IFF_* macros
+
+---
+ python-ethtool/ethtool.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/python-ethtool/ethtool.c b/python-ethtool/ethtool.c
+index 0f9cdbb..5415ec6 100644
+--- a/python-ethtool/ethtool.c
++++ b/python-ethtool/ethtool.c
+@@ -27,6 +27,7 @@
+ #include <sys/types.h>
+ #include <ifaddrs.h>
+ #include <netlink/route/addr.h>
++#include <net/if.h>
+ 
+ #include "etherinfo_struct.h"
+ #include "etherinfo_obj.h"
+-- 
+2.1.0
+
diff --git a/dev-python/python-ethtool/metadata.xml b/dev-python/python-ethtool/metadata.xml
new file mode 100644
index 000000000000..112c4c091ce3
--- /dev/null
+++ b/dev-python/python-ethtool/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Python bindings for the ethtool kernel interface, that allows querying and
+		changing of Ethernet card settings, such as speed, port, auto-negotiation, and
+		PCI locations.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/python-ethtool/python-ethtool-0.11.ebuild b/dev-python/python-ethtool/python-ethtool-0.11.ebuild
new file mode 100644
index 000000000000..8cb759512663
--- /dev/null
+++ b/dev-python/python-ethtool/python-ethtool-0.11.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+# TODO: install scripts and their man pages
+
+inherit eutils distutils-r1
+
+DESCRIPTION="Ethernet settings python bindings"
+HOMEPAGE="https://fedorahosted.org/python-ethtool/"
+SRC_URI="https://fedorahosted.org/releases/p/y/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64"
+IUSE=""
+
+DEPEND="dev-libs/libnl:3"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}_include-net-if.h-for-IFF_-macros.patch"
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
new file mode 100644
index 000000000000..6ddfcce55f33
--- /dev/null
+++ b/dev-python/python-evdev/Manifest
@@ -0,0 +1,9 @@
+DIST python-evdev-0.4.3.tar.gz 27658 SHA256 011db63c94e668997ce0609e4a3cb04b92aca21304657151e6567e938de5efc6 SHA512 7bbc4339bde599f38423f88b3e5a4a4408b9214c9b622915b6f31dad50e08879d914fc83e8d95f66c158d5dd2d29e72907c4e3b0a97a3dbdfb7bde9013e161ec WHIRLPOOL 120aea7069cbe86463975103b87e7eca529df34ce14f69fe2378802f867b434a89aadfcdcab1c991ed25114bfe574452e12b33adbacadd1655e2013dc20f4dcb
+DIST python-evdev-0.4.5.tar.gz 30415 SHA256 70852905a4d0ad541ee0b8c58c566160df5bd08c69c778cbb9ebacfc50a6be61 SHA512 9d2c09c6dddd96bf6c5c639babe8a2c7dc81023de46ffcfe8e4d76126072fb380d3e726a3db1ae8025d4c816218f981ff23df86e20e0dc90c4ee4ca97ac57db5 WHIRLPOOL b548ad9cee8277bf192c30332ca0b0eeee98f90fe77db86ecdf0106948e5c2aba86ae9c950611357c3e41b9ec9e16a96525546d762c4ecf1d05f660d7107eb57
+DIST python-evdev-0.6.1.tar.gz 79415 SHA256 02a77b56596d9a34342eb5f384c736d1e2df0299ebed6d9d4fe46549b9262df0 SHA512 39d3c68352786f5da130addb4d78889987d94b8a0b5ee141e9c9452b0ce3b097884d6ec6832a67d58e0d40290f61ab8dc56cb34cd15de6a9d3da58bab6c1f536 WHIRLPOOL 4b4c6bf35fbe6c2a08695053c432deab928567db97b90f6a9ab95f0704013b48ee71280a0ff6ca76673877a5cd29354eb2b322902aea97b42a3300bb33003ab6
+EBUILD python-evdev-0.4.3.ebuild 454 SHA256 8e715040f8690a1a92401926e127891333d2ab354cb72b4a8bf51e5d25946e02 SHA512 884577c03600ae6cad61b1a92413580165f81de60fd5812cf1091a119e7fa4c86c9e9e01bc9c2c07a59a718618e363652dd289b5a7a8618fc68740d62956af0c WHIRLPOOL 0b437495eac5e52508a8112311bc1a0a1835b38642b560d298a34b1660d68258d1c27815af33e2713dd4b4b24b82b3dfd67d7e41b722f67ca9e1de5d15cc7310
+EBUILD python-evdev-0.4.5.ebuild 460 SHA256 c412c88e9f2d2776825ff763ffab5551b4faeec40e3a7e8b7fa419e4fec9071d SHA512 fd40ab081d24953da2bdfd88be27566246803b0801008c7a726f5feaa4cf4f80b977c5f5c755ef987d10ae55ba769867a6f0141c777f77eead3bc6089f35d041 WHIRLPOOL 37cc5c1eff1316898d8bc28fa6966c7d9d444b85de2b76679a2225151b66d910706cff26a3c48c4962c9b6c8d949f51a4c420243823561c79b8c6e4bf0965fe2
+EBUILD python-evdev-0.6.1.ebuild 467 SHA256 e82f63eea9af45a6ef15985aa744d7c6e72605a99d8523e6650ca0e116af15f6 SHA512 1c2f9a874408054dedb27764161f31d5bc41c90927760bbc439433896d8879a2f9fa8b3344fcebc07c91983b4c4101771c743eb6f752db8e1656892a00dbecef WHIRLPOOL a5b3c686e066a783f179e421139d91d4b4410bd4d7ac0cec97dc2f464a5e9d83086c66295c3304f8467f97828430e05f80593a29e038d01501959095c1f2ca46
+MISC ChangeLog 2618 SHA256 e050cde05a9cf15833b30092fd01e0beb5bb3095e4415639e08b7292afeae093 SHA512 46add3c45dd35bbf5d8d7a51dde91868bde4fd3ff82dfb30288e57c7c3c3c11a6a785215b5d4f19c2f71a63558d23c79cbdaedae7a33cb1a8334c9b4e6a9b9a1 WHIRLPOOL f7e0281bf4bcb8f4fc254e3f393ab2e8f07fa051e3960ee4d191cb60ced5d5a929b1ca3dbd94e4d8ebde74572f432192fe5b1a2201c1ac8c668b108dbd4155de
+MISC ChangeLog-2015 971 SHA256 2cd87cf6bdc14f97de98979608e77debc1551efaaa23a299ab40dacba61f8b56 SHA512 a58ba1cda5902d975ad34b86bb946b17363222748781632e1b25c486bdf9629055d5d85afba5380da4163503437c039d49ad218e0f5cab016a33d60af8153c1a WHIRLPOOL 25adfe9a2b94b32f65bafe52cdd08ac6251287d9295e36c7e5dd634e8c003431c8f3ed19d382d71496b08543acb85f375fa1eb966ff01f7a80fe78b3bd07c4c1
+MISC metadata.xml 310 SHA256 e34aa8af6d0375375b6c07199f8d2a2d82915a5310b0b81fb042fd2d2a008556 SHA512 58c371959e1419c9ba842cba52c11c215d5894e20e6dfa10b1c2b69c14f76d0f3743d34f688876c0c53bffbf04bc05fd4370cc45883eadb3edd1ce897cd0835b WHIRLPOOL 335fccfbaad8b3dd0a3699ba72de5538cfd313cd3b92c5786149b527b307336b309163e0d61e1db433d046428b0c03a0a88366f2386280e499788392bb808810
diff --git a/dev-python/python-evdev/metadata.xml b/dev-python/python-evdev/metadata.xml
new file mode 100644
index 000000000000..01a9e685e689
--- /dev/null
+++ b/dev-python/python-evdev/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>vapier@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">gvalkov/python-evdev</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-evdev/python-evdev-0.4.3.ebuild b/dev-python/python-evdev/python-evdev-0.4.3.ebuild
new file mode 100644
index 000000000000..1a2fbbf0bf06
--- /dev/null
+++ b/dev-python/python-evdev/python-evdev-0.4.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for evdev bindings"
+HOMEPAGE="http://python-evdev.readthedocs.org/"
+SRC_URI="https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-evdev/python-evdev-0.4.5.ebuild b/dev-python/python-evdev/python-evdev-0.4.5.ebuild
new file mode 100644
index 000000000000..e87ce4d63986
--- /dev/null
+++ b/dev-python/python-evdev/python-evdev-0.4.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for evdev bindings"
+HOMEPAGE="http://python-evdev.readthedocs.org/"
+SRC_URI="https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-evdev/python-evdev-0.6.1.ebuild b/dev-python/python-evdev/python-evdev-0.6.1.ebuild
new file mode 100644
index 000000000000..4a7a95efedad
--- /dev/null
+++ b/dev-python/python-evdev/python-evdev-0.6.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for evdev bindings"
+HOMEPAGE="https://python-evdev.readthedocs.org/"
+SRC_URI="https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-eventlib/Manifest b/dev-python/python-eventlib/Manifest
new file mode 100644
index 000000000000..9f91e91ce9bf
--- /dev/null
+++ b/dev-python/python-eventlib/Manifest
@@ -0,0 +1,5 @@
+AUX python-eventlib-0.2.1-libressl.patch 532 SHA256 a10ca76779c1e1e67ac5655ceab701ba1c1c3856261be77006e4eaed50b25c34 SHA512 5bb06ad2028653b0b9991c30b61c26b8b6ec83411c794cdc8a6bd43c1cba06475e306352b0684d8ea61550b21181e79d1a0274ab2fa490d7f044ed323443cdbf WHIRLPOOL c003667186cf9d75b46bd919bd1ba0bc426c8914977cf5db8593628b991211faf8428722c2a33751a9b0b136767560909d74a2dd1d0b543c70484df2f948aa54
+DIST python-eventlib-0.2.1.tar.gz 189314 SHA256 25224794420f430946fe46932718b521a6264903fe8c0ed3563dfdb844c623e7 SHA512 f1ca3c6eb54677068ec209386f09c695c141b08e148475ee3cc69e667dd96af3637a66660e9105a195620f3bde10d4b18087612c501764d52413982c2721e1a6 WHIRLPOOL a95ac7283d1425161d190c17ceb7d58ff81a3ec9aa09066226c177a4d7343c2f99ea19c7866d4a03d281241337efa877020c85956c7c81cfb0444e457fda9f9f
+EBUILD python-eventlib-0.2.1.ebuild 539 SHA256 1f361d75bdc830da6d685b2dd5705caaa0d5ff9b661fd93218cccc952a3104ea SHA512 b7bdc82948a3b592b9555f9a63872747bf9fa166ba35da9d0656dbab8a4f3f1ea4bfdd8ca12bc8779aaf11becdb4946a38b885e15d6a6a1b083be0a7be1200b5 WHIRLPOOL 685f6b60dfefb6bf294ea52c4a853ca4743a62efaf32dc435f2230d75097591c91a1c6c1d0d5ecfd9b0f74b624217877326bfffdb854bf411840d39de60c9036
+MISC ChangeLog 996 SHA256 c78da60195376c66641ac13549be81f61025ebbea06e89103672149642e4b70f SHA512 d3be738016bd756dee4cc645e9acca3d7feb83d5b91c83ecf58b93d8b8b0a2ffccdf0b76367e6b9100239b7d9e5181ce746422fc19741286fa28027e69be0841 WHIRLPOOL 8855a2a95d35d21078204d10e56d73953872eed7288baae33617cf6cf83ab55371624057ed95579094c0c099a92529df822d67834962e397951708f16d8f7f1f
+MISC metadata.xml 565 SHA256 9f35dd58ba8ca4bc9a91c7fe4ac2d89e04fdace80bee7bd6191aec3a98c81684 SHA512 9f75a7858c5b3fb18a2961a78d756afc71b69f2b0d9f1c4e13a0a1cc3b0dcbe70645eba631c1a1b57a0ce8b3f419432f00c5fe2f1052c4be6ddabe9d51ed945f WHIRLPOOL 17f1dd1c8d78b13222b56e441198a0685bfb53bad2d16e0a4337d6d401f3446c6ff8cc340c2eb0f5075107cde4f4d344f29e14cbe0ef92cafd9389adc5536919
diff --git a/dev-python/python-eventlib/files/python-eventlib-0.2.1-libressl.patch b/dev-python/python-eventlib/files/python-eventlib-0.2.1-libressl.patch
new file mode 100644
index 000000000000..faa410352627
--- /dev/null
+++ b/dev-python/python-eventlib/files/python-eventlib-0.2.1-libressl.patch
@@ -0,0 +1,14 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Tue Sep  8 01:22:40 UTC 2015
+Subject: fix compatibility with libressl
+
+--- a/eventlib/green/socket.py
++++ b/eventlib/green/socket.py
+@@ -89,7 +89,6 @@
+ else:
+     # some constants the SSL module exports but not in __all__
+     from eventlib.green.ssl import (RAND_add,
+-                                    RAND_egd,
+                                     RAND_status,
+                                     SSL_ERROR_ZERO_RETURN,
+                                     SSL_ERROR_WANT_READ,
diff --git a/dev-python/python-eventlib/metadata.xml b/dev-python/python-eventlib/metadata.xml
new file mode 100644
index 000000000000..ee0b870b3c50
--- /dev/null
+++ b/dev-python/python-eventlib/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Eventlib is a networking library written in Python. It achieves
+		high scalability by using non-blocking io while at the same time
+		retaining high programmer usability by using coroutines to make
+		the non-blocking io operations appear blocking at the source code
+		level.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/python-eventlib/python-eventlib-0.2.1.ebuild b/dev-python/python-eventlib/python-eventlib-0.2.1.ebuild
new file mode 100644
index 000000000000..4e72a81a629a
--- /dev/null
+++ b/dev-python/python-eventlib/python-eventlib-0.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_REQ_USE="ssl"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Coroutine-based networking library"
+HOMEPAGE="http://sipsimpleclient.org"
+SRC_URI="http://download.ag-projects.com/SipClient/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}/${P}-libressl.patch" )
diff --git a/dev-python/python-exconsole/Manifest b/dev-python/python-exconsole/Manifest
new file mode 100644
index 000000000000..78ae636f8e66
--- /dev/null
+++ b/dev-python/python-exconsole/Manifest
@@ -0,0 +1,5 @@
+DIST python-exconsole-0.1.5.tar.gz 2322 SHA256 252e100dc2f7cff853501edf5580542bd509f8069a54599999b3df10db3a7f7e SHA512 f60dd78050515701c66196e7b62653ee7221b0b9bbe390e0f7b08e14ba781afb8f0c49fe769e702ec6d4854c4a48f6ab033c9066a5e5e604d6258ee393fe1070 WHIRLPOOL ed9d96e3fc75751ab301e3d9cccc16694ee538b87c48c83ede7aede405d9a746cbc7f33df8851fd4fbc72b5abb200ae754951257400719c034871110207a33dd
+EBUILD python-exconsole-0.1.5.ebuild 444 SHA256 02749891efa32d5108afdf022eaa3f078a49f84b7265debfe0abf5dddab75f95 SHA512 462af3a3c7f7a5713605d4125b2011a32f7e34193583aac1815457b16048a4b2db1154cbead83e835825f707ca0b65390dcb662b488a25e272c4e27c1cd3cdf4 WHIRLPOOL c41deac34883a050dfa8f93aadcdf5f2edb5121e445c4fda0990b6ef06eafb1353cac07a1f0105dbe6a3ebcdfcbcdc07b9fed834ab2081731c44808886433dc2
+MISC ChangeLog 2596 SHA256 66c3b10e5b31495a3420361019dd6e8839e599af9a67052775f99ab7417ce413 SHA512 e45a8c54dceab598f6b27c02b13e995bad94e918f635a2029e64832f4c893f01eab1b2cdae818b586c859e11656ce8ac5617c8157241132bb27ab253086436d8 WHIRLPOOL a9adecc3ae0c0bfb5fc4ac4cc9f6b4fdfb5c1e876ea911d36e1d2467d04760a84ef13f1735e1eda4cde6958f0f76c52dc37f258881bc62d19b52ad7a141b2864
+MISC ChangeLog-2015 691 SHA256 2a20a139d8297c7ed46e29fa8fe7a61a91017cca6d69ee0b44abc06b549c3833 SHA512 fce702cd930db0668f8b92adf8e460919824785ab1251366c73dc84638cf8798ae3bc205a7199c257f438f5b95a31d6942a2a7728fec2ea30b8aff7de514536a WHIRLPOOL bbf245beded811103de33272d95b37392d0ba9f6a07f5e39ccb12c2542aab494000267138b58a847440c6a315be52d2fbeeb5ac3cb29218907b21bf09d3164a1
+MISC metadata.xml 387 SHA256 8c4b1ceab6d9463f47f7c3b8170d0804ef832307af5c3677bde2e466a29e11ff SHA512 466f63d6aecd837d5d26f218afdf13d189d9f108c170af5fd4a6f6d63133a45808ae354606a82ebfb6862bc8be16cab3c0bd82a47db6e3a2d958fb9b644ac8cf WHIRLPOOL 4895825ca63b34f35174735f736f4dd0538977e15a2f9a8e3a8893767ec49be7013568ed0bb3356d86c4c4973a94fab3f4d1014c00a6710d6247fe21088df46c
diff --git a/dev-python/python-exconsole/metadata.xml b/dev-python/python-exconsole/metadata.xml
new file mode 100644
index 000000000000..32ae0d89a595
--- /dev/null
+++ b/dev-python/python-exconsole/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">python-exconsole</remote-id>
+    <remote-id type="github">Eugeny/exconsole</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-exconsole/python-exconsole-0.1.5.ebuild b/dev-python/python-exconsole/python-exconsole-0.1.5.ebuild
new file mode 100644
index 000000000000..0450b1d30ced
--- /dev/null
+++ b/dev-python/python-exconsole/python-exconsole-0.1.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Emergency/postmortem Python console"
+HOMEPAGE="https://github.com/Eugeny/exconsole https://pypi.python.org/pypi/python-exconsole"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/python-fastcgi/Manifest b/dev-python/python-fastcgi/Manifest
new file mode 100644
index 000000000000..7c433623c1e0
--- /dev/null
+++ b/dev-python/python-fastcgi/Manifest
@@ -0,0 +1,6 @@
+AUX python-fastcgi-1.1-setup.patch 452 SHA256 8a2f8a851a407e8c8ba09a56f8be762e1c3c354dfdebca0f901f186825acea6c SHA512 715bcc32ac2d9151765e5163860b69fd3bb0fa4d2efb715dc7dcac1d12a10b436b2eb4ee0ce64ce95696c5b44d5a9702a7b60ae650fdf77fd914173ab48cc18e WHIRLPOOL 110426a7d67829db03418ee46a42f001fe60a0d65e9eb6d0430aab10169305d204a56cdb23589e4e5e152b1ac4647e52feddfb79ad9a3a41ba90b461293c17fb
+DIST python-fastcgi-1.1.tar.gz 11180 SHA256 3dff515aecbda371fe5bcb4e449109ce72120ce7bb1edd0e7c2138e75528fd12 SHA512 316c5b07342d27bbad90704909d7a010997801527a9069d23e39975bd3a0e82ab7407bb5e5aa9bdf240039d4c2fec37887540c569d496ca3a328f3323390da89 WHIRLPOOL 9a31809c5ca331b45fa2ab3f2819de4ca0a92fe00c08bfaad6abee8551ccfac56a108dc3b353aed889c85a8563f9a0238da45a6042731522618bfe1cd0583aeb
+EBUILD python-fastcgi-1.1-r1.ebuild 753 SHA256 1fa7dcb8f6be66f9d95276ba1871f079ed1e09d3874227f26d6c66b161aed423 SHA512 91257d9f89945d4dcf1b79182991cfa60b7c7c21b2f337accc641e8f46111ff00f9baa57baf54e3803fe51eb11bce0e59b1fb68fb52271ba3781bfb71b61dae3 WHIRLPOOL 0d1bb7dd2441b38833d7db42198f986d41b6a3d243f64bbfe43f25ac5bde86dd30816f292dfff957d34a4c5b7a3f3d3944b7704e8ecc5c9538d3a6e88ed7d241
+MISC ChangeLog 2828 SHA256 458cc4a840c74abde16a2131289e79705f927eda19e5f0fa6bc87d6238ef3f91 SHA512 af44b0ec1aae552ec1e53a41b483013d6848667e2861b14cff1c87c41de1eef86a16ca321770c18cb53eea3899f04898db9cd93e4c6455d4f9344076a0e698f2 WHIRLPOOL 9cf614869e02025e4732bc8de3809b89fd8fea613075da23a7be82e368f165486bdd96f5349097213064d7e923c5310d1dad8adb6ea3ff7e83be2ae848c77a86
+MISC ChangeLog-2015 1068 SHA256 493a7b724caf08721b3ebde3cd6810978e0991079d6509c5cdc9b5a1db6dc7aa SHA512 4d3d7aac860bc94b674ab378d67dca9fdaf46a07f89c951f9b7bb553b4591926c0dbde495595e2476b41b3acc362f2a82110c194ce60d5eb14e4dcc71eaaf368 WHIRLPOOL c13e867ca161c73b1fd1c217b95a53d289e80b2c763b237f915ae7730edbcf33b60dbd176b63671f3f596f4c18b1535035a2c03507fe1aaaf3ea1c8539d4d46d
+MISC metadata.xml 317 SHA256 03114c1585b03d2643504ff3d5ed404a0e9dc11e2f53b78f321f3fdb282fa673 SHA512 2a826c8c090029b312458c77217502813bb35f5653ae176d60415a38c348d2774cb0a4ae5045ed7b14da530ce88a02854623fcfe2a8d7d7f9b77804ec9f7c117 WHIRLPOOL 4288b1fd751b955e3de78c12bcd8551630e6c87e643fc9fa1a265b7b03d65bbab4f1878f267501d9136a78d724b25a55a9e00e9e74436f7756a213657b0106b8
diff --git a/dev-python/python-fastcgi/files/python-fastcgi-1.1-setup.patch b/dev-python/python-fastcgi/files/python-fastcgi-1.1-setup.patch
new file mode 100644
index 000000000000..6ce721a5e004
--- /dev/null
+++ b/dev-python/python-fastcgi/files/python-fastcgi-1.1-setup.patch
@@ -0,0 +1,15 @@
+--- setup.py
++++ setup.py
+@@ -4,11 +4,7 @@
+ from setuptools import setup, Extension
+ 
+ 
+-c_ext = Extension("fcgi", ["fastcgi/pyfcgi.c"], libraries=["fcgi"],
+-                  include_dirs=["/usr/local/include"],
+-                  library_dirs=["/usr/local/lib"],
+-                  #extra_link_args=["-s"],
+-                 )
++c_ext = Extension("fcgi", ["fastcgi/pyfcgi.c"], libraries=["fcgi"])
+ 
+ setup(name="python-fastcgi",
+       version="1.1",
diff --git a/dev-python/python-fastcgi/metadata.xml b/dev-python/python-fastcgi/metadata.xml
new file mode 100644
index 000000000000..33b2fb0e7bfc
--- /dev/null
+++ b/dev-python/python-fastcgi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-fastcgi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-fastcgi/python-fastcgi-1.1-r1.ebuild b/dev-python/python-fastcgi/python-fastcgi-1.1-r1.ebuild
new file mode 100644
index 000000000000..80a59e5cf117
--- /dev/null
+++ b/dev-python/python-fastcgi/python-fastcgi-1.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Interface to OpenMarket's FastCGI C Library/SDK"
+HOMEPAGE="https://pypi.python.org/pypi/python-fastcgi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND=">=dev-libs/fcgi-2.4.0-r2"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${P}-setup.patch" )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	append-cflags -fno-strict-aliasing
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( example/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-fastimport/Manifest b/dev-python/python-fastimport/Manifest
new file mode 100644
index 000000000000..4eef653983c4
--- /dev/null
+++ b/dev-python/python-fastimport/Manifest
@@ -0,0 +1,7 @@
+DIST fastimport-0.9.6.tar.gz 33333 SHA256 83d0ae7b14f58c90cf56d0bf190d339abbd8bf1be702492c3d15d74c6cd412ab SHA512 cc38c1218d65ef4a9e3a68d8af3fadf98c7cc0dcd8075b338b8f492d25765bc2fe2247000868fd3c95e1f7f4c2b9a05964ef7b4f9196c2777f6a7941f127f416 WHIRLPOOL e141686590d137f5cef3e1dcd6ad32142ccc5a0fce6c74ce9641cece9d7308154f258cec256d039a54c45884d70879c42cf5297f94fad56a2fae6dac11386add
+DIST python-fastimport-0.9.2.tar.gz 30762 SHA256 fd60f1173e64a5da7c5d783f17402f795721b7548ea3a75e29c39d89a60f261e SHA512 8fd9f89267ca88edff94cea7537740431d02680a1eebd085ee376954b47bf5222e7575750895d0d2da246694cdac7a5afe50d857b87c0f36e04eb3511bcbe472 WHIRLPOOL f1d26b8de2180d55f11df3eb937ae3a524b5f55295d264f23a1edd582152cb6ecbc52cba4164e85f5be943c132cb48db0fa3a704eeda5b1c12896233f18d3c76
+EBUILD python-fastimport-0.9.2-r1.ebuild 733 SHA256 e9d93b67fdd82822988d1887cef1ef6c9f289f2de1e19d2cae489483013239fa SHA512 760a4ff1038c958cb02cc7c3f5105d1fe626e775749d17b43437f9f7bf20a747301479b0fe8691a097c0c92f891d6e892ad7d7839918d1a8608c20e3ea4d8fef WHIRLPOOL 298561baef9f0c62a68f0e83da2aceb364d1e5be1c2c58924a1e6ed3255abd3203e2f66a6e92f3af6b70b50548f4dc9735bebb8e0656295672b4648f31f02d44
+EBUILD python-fastimport-0.9.6.ebuild 793 SHA256 3e17a44f4297901c24f26b240724675b1da3830efc1ecab669cae36cf0d54877 SHA512 0628770c410e1540fc43b2bb5fdae9d1484b294a1ab00485d0ec95717900c8ddc0af7dd45de82ac79f29238a5863e2feefa7eceef321116dff2922c46dac2db4 WHIRLPOOL d6796b4fb1ff177c16175f9e2f013f2db15ac09d6c5ad21a8858577fe9b1c8433d5764468322ba3f782a6670f4aeff0252c928842fab416311eb509f7dd1b806
+MISC ChangeLog 3256 SHA256 c49fcded501ee93a3d4660caccbd8668a1df70bb26b6ea21f6eceb9eb9cdefe1 SHA512 17123d18b7579d9cac7256c90c1a34ddd5acfc00c332e62fc024f0dd1747417f718724e10b7e32870c479e635d56037217db21e2192aabf44ac928400dcfc82a WHIRLPOOL 1c67915414d4f54252083d5d719cf4379ae996a22a9dbafd402542f13faf64f3196947624fd10d92835a9eaf220ef50cd36b3788d2118586fb677f513fd32951
+MISC ChangeLog-2015 2252 SHA256 fff6052a8ceff3b2169d81a29f7583b56cdf9ab02e9017567e8c0148de773f28 SHA512 bb8e0ef03856d1e0c9393ec1c0ac875ffb0c66e0b715ca857f351df87635b7fe061cce82d03551337be9e99394db867a1fab55e3f7fadcaefffa4baeaf175823 WHIRLPOOL 576b31faf4b13d823b650f077a5cfe304501946433ba67bb5f4c9ebb58be5c4c574e5cd41359b6253192f1b3ac40fef44e79dd725006aa26a314da1342b8c2b7
+MISC metadata.xml 525 SHA256 1f2d394bf76442cac560a355f50feb20be04d3faaaee28efbd66f36a76f5de37 SHA512 f425168fa9fac4df1cf9af941b79ac92b98aba05b05fbaa9b956ec7d0d97526e4d473c6f349f28f00ca55a2886664661ccb8f77bb793ba5f7c946062516091c5 WHIRLPOOL e6683a145f9fd15059b453d32cac5a74078f65a15262d920db310b09d16a5a9e61acf6157fe87149de3a248c13393ca862a957917a68398bc23761dc67cbc81e
diff --git a/dev-python/python-fastimport/metadata.xml b/dev-python/python-fastimport/metadata.xml
new file mode 100644
index 000000000000..704196730bc7
--- /dev/null
+++ b/dev-python/python-fastimport/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tetromino@gentoo.org</email>
+		<name>Alexandre Rostovtsev</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jelmer/python-fastimport</remote-id>
+		<bugs-to>https://github.com/jelmer/python-fastimport/issues</bugs-to>
+		<remote-id type="launchpad">python-fastimport</remote-id>
+		<remote-id type="pypi">fastimport</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-fastimport/python-fastimport-0.9.2-r1.ebuild b/dev-python/python-fastimport/python-fastimport-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..b490c3a40783
--- /dev/null
+++ b/dev-python/python-fastimport/python-fastimport-0.9.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for parsing the fastimport VCS serialization format"
+HOMEPAGE="https://github.com/jelmer/python-fastimport"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	test? (
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	local test_runner=( "${PYTHON}" -m unittest )
+
+	if [[ ${EPYTHON} == python2.6 ]]; then
+		test_runner=( unit2 )
+	fi
+
+	"${test_runner[@]}" fastimport.tests.test_suite \
+		|| die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/python-fastimport/python-fastimport-0.9.6.ebuild b/dev-python/python-fastimport/python-fastimport-0.9.6.ebuild
new file mode 100644
index 000000000000..b804df2aa6f2
--- /dev/null
+++ b/dev-python/python-fastimport/python-fastimport-0.9.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+MY_PN="${PN#python-}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Library for parsing the fastimport VCS serialization format"
+HOMEPAGE="https://github.com/jelmer/python-fastimport"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	"${PYTHON}" -m unittest fastimport.tests.test_suite \
+		|| die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/python-fchksum/Manifest b/dev-python/python-fchksum/Manifest
new file mode 100644
index 000000000000..2096ca6e027f
--- /dev/null
+++ b/dev-python/python-fchksum/Manifest
@@ -0,0 +1,6 @@
+AUX python-fchksum-1.7.1-md5-align.patch 699 SHA256 287086f2f454e8d840a8d8433d44362fe5fbcb02c2fbbd9c09b3ab00199ec0ba SHA512 53b32029e211ee374c8b3a10680959af36a7a85b2b243bfc13fde6b195236fc2a6295e2d3b66be621773105f709467f48a711b2bc8de2342245a300aa55c557b WHIRLPOOL 42af56b266dda8244940b60ac4336b99d0fd02079f052fc9a036de5039181fd3eb704984299fe2ae6e04ad15533ea3cc531a39d18e48decfaa1c471575996fe7
+DIST python-fchksum-1.7.1.tar.gz 26724 SHA256 407625d2bf38be6fcbe8b01007d1803b5c5bd97249114c076edef4fd061405a7 SHA512 59b561e2938c41bcda2b98eb3fa0670be3fd85f8cb67368132ce239cac21760a5e9a5a05be2429992fa480ccd2e2aa457df7b4a07e709acbe42be9b1559f3060 WHIRLPOOL 474c2045dbe776b162be5388eedaadea8f26f5f9620ffb4c8eb86bbdcb8a124137522f9b20f11596cf828cc965afcfde492802484dae484852ac27ed147d176a
+EBUILD python-fchksum-1.7.1-r1.ebuild 690 SHA256 83187cc6351215e032b442d3c5d8a64ac97e1f75929774b6f33283d525e71bce SHA512 127e5626f4928c20809c1820981e2e3eccfe3e5cac70fda95667e93184c3a39502c3080b97fe286b31bebf216b16d471a63284e0480f51e77667f1887a1d7d4a WHIRLPOOL bf28eafef0307b1f86a7e2af8e61cf62fc4588ae9695c5e9f0bf41ca249d6422bc237dc3027c6fabc94d4fb3ac6f5ed46605db3fb76286299f8716d31d3b5314
+MISC ChangeLog 2503 SHA256 bd76ad02ae5530a2a384f09d191a052289e771c79d860d7a5dd089b323c5314d SHA512 9768c3e0fcd9e0ca9b61f269128da8d5b0dcf3a06ac6a2f32e80fa170eb6b03bd8deaebc65ee21da8e74f7a5f15334e88edc833583c9afebcdc6f887b03ca1ff WHIRLPOOL 462385392e74ca567e1d0f53d8f1dc2fb6e15a8c2175f940f02dd0bded944910d60d91fb4653d76c6caf37b9142f0872e5e92b1971b46faa7c0b1dfcdf2a4ed1
+MISC ChangeLog-2015 5669 SHA256 bcec5de48dffc3f067c5ce4c2dc5030b19ea5516c15ef95d0ef9e7ca980f3a88 SHA512 1f1168864ce5550154b07a48061c26b809850dbf69f47b0ddb4e33bf622a1ef555e35b49f5614fc7adeca081cb58c23cf36b722900a70fd0011568e6bc750966 WHIRLPOOL 22873ab0e3fe053e645867cc5a9e2197c0ec1710e81b26757ec866ff1019a0d6f19076f6dd71327b70e2682d75de1fc2c968f0df830c16610cfdc6e3d0c482e4
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/python-fchksum/files/python-fchksum-1.7.1-md5-align.patch b/dev-python/python-fchksum/files/python-fchksum-1.7.1-md5-align.patch
new file mode 100644
index 000000000000..1adfa627fdd8
--- /dev/null
+++ b/dev-python/python-fchksum/files/python-fchksum-1.7.1-md5-align.patch
@@ -0,0 +1,26 @@
+the alignment of resbuf is not guaranteed, so use memcpy to move
+the bytes in/out.  on arches which can do unaligned accesses, this
+will generate the same code.
+
+patch by Mike Frysinger
+
+--- a/md5.c
++++ b/md5.c
+@@ -74,10 +74,13 @@ md5_read_ctx (ctx, resbuf)
+      const struct md5_ctx *ctx;
+      void *resbuf;
+ {
+-  ((md5_uint32 *) resbuf)[0] = SWAP (ctx->A);
+-  ((md5_uint32 *) resbuf)[1] = SWAP (ctx->B);
+-  ((md5_uint32 *) resbuf)[2] = SWAP (ctx->C);
+-  ((md5_uint32 *) resbuf)[3] = SWAP (ctx->D);
++  md5_uint32 swap;
++#define set(i, c) { swap = SWAP (ctx->c); memcpy (resbuf + (i * 4), &swap, 4); }
++  set (0, A);
++  set (1, B);
++  set (2, C);
++  set (3, D);
++#undef set
+ 
+   return resbuf;
+ }
diff --git a/dev-python/python-fchksum/metadata.xml b/dev-python/python-fchksum/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/python-fchksum/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild b/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..a80d84cefb96
--- /dev/null
+++ b/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module to find the checksum of files"
+HOMEPAGE="http://code.fluffytapeworm.com/projects"
+SRC_URI="http://code.fluffytapeworm.com/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-md5-align.patch )
diff --git a/dev-python/python-gammu/Manifest b/dev-python/python-gammu/Manifest
new file mode 100644
index 000000000000..798ceb08b51b
--- /dev/null
+++ b/dev-python/python-gammu/Manifest
@@ -0,0 +1,4 @@
+DIST python-gammu-2.5.tar.gz 133090 SHA256 871e3450a26397d555c92926382edf0e6a58431fe53613563f5a313ad752ff88 SHA512 e61bb340546cf3f98c20ff5d4ef25ca05676b4dea91e02aeee2856f091ac12fbf07a597637f9562432e298bf9678ff4445d24d8cdf96274b735aa9754b364e58 WHIRLPOOL f2ec5af883de298d71f220eb319c9df8d496328db461ba9e501e4d4d7ce150bbf19f5a07a7560804e46b21e1d848244e932f9b8eb15a60b6cf5d9a86892e45bd
+EBUILD python-gammu-2.5.ebuild 714 SHA256 5139de5a683df3a32e3fc5f610152cb2c0a5cc91e0d8e6239d4e64eeb1457c58 SHA512 5a3e52a1ccc8003d4eb64dbe8575d8a3cbe59252001dc075bd72e18ab3d92d6d337f37f58d92a480f14290c041122d7afd6c61ab0f7071395769bac8b78f778d WHIRLPOOL d2e0370e0a784764910e41c6111a9415d3c82c674e4d1e1667becd9a75c78845e5e75df29e76569faaf5df7c34228ecbfc8eb14c1adb9e1728e212b549d4854e
+MISC ChangeLog 361 SHA256 43a5c17dcd5bace6a4743ba29622128f922ac48ccaa999f418957e0537d19387 SHA512 7601e05d363d7a3285f8a642f28a70a96269c130f9e9d375bf300cd5af231e32f519b2e07780a9cc15fdbeb81c1708adb34735ca7f99ff515caf2ddf345207e8 WHIRLPOOL 6d5a5c70923bf4f55389a5ca666bf9ee1f40e9fba7065714502be35c682d653d0d063d9f0e0fe24133dd442142b97526e40e82bb1a943d717e8d0cd0495f34bb
+MISC metadata.xml 349 SHA256 55d7c7cb549c00e17bfca5611b62de74d7eb3b5ef1bada9e18e7cb1281f1bfc5 SHA512 5483032f1d347017ae5307f278c17fec9c39674b0f739ceb11706b2aa47a8340e547c6fcd5661f76461f0c18a4b78a800daec94a7eb4c956389a074a244a93c4 WHIRLPOOL ee35a932a2e9fd31de1efc4b2f622bbc3ff452aa24e5deb9c8e2cd44d5988d830854bb67275f0fa1722e32dc432e4c77c9cdc2d3c5b0ece7d3e2cde85f730a4c
diff --git a/dev-python/python-gammu/metadata.xml b/dev-python/python-gammu/metadata.xml
new file mode 100644
index 000000000000..76afa3f3bc52
--- /dev/null
+++ b/dev-python/python-gammu/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+		Python bindings for Gammu
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">python-gammu</remote-id>
+		<remote-id type="github">gammu/python-gammu</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-gammu/python-gammu-2.5.ebuild b/dev-python/python-gammu/python-gammu-2.5.ebuild
new file mode 100644
index 000000000000..9f26acf10bbf
--- /dev/null
+++ b/dev-python/python-gammu/python-gammu-2.5.ebuild
@@ -0,0 +1,35 @@
+# 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
+
+DESCRIPTION="Python bindings for Gammu"
+HOMEPAGE="https://wammu.eu/python-gammu/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND=">=app-mobilephone/gammu-1.34.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? (
+		$(python_gen_impl_dep sqlite)
+		app-mobilephone/gammu[dbi]
+	)"
+
+DOCS=( AUTHORS NEWS.rst README.rst )
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-gflags/Manifest b/dev-python/python-gflags/Manifest
new file mode 100644
index 000000000000..36ec6dbc4170
--- /dev/null
+++ b/dev-python/python-gflags/Manifest
@@ -0,0 +1,6 @@
+AUX python-gflags-3.1.1-script-install.patch 1178 SHA256 ee6a136213b2488ff8e32fb70fee2ca75b95d4621242449abb774bab8172ab01 SHA512 7247303c33a845949b1db7104f3170497da980334cb02155501d194eb53eb61ae2231cd4ece06194ca64514271252f8f1fc7c7683cbff2bb8f96d6d4e88123d5 WHIRLPOOL 0864c0243f713b2a95dfe9b41daab7a0fe9e1df9dc23eeba212312b95acb3594efb0dee45f11e485c6b800ac83d4c5bf0e17310debf204cdf4e1617c8da44676
+DIST python-gflags-3.1.1.tar.gz 52633 SHA256 aaff6449ca74320c709052e4664a52337832b2338f4a4267088564f3e98f6c63 SHA512 28009cdc09b94b416af5237d3897d6ab516cc3b6a3eed18a31adb8c199f31a8c7d07b1d69794cb37de84b50eefbde1de57f9f0afaeac0a4747b352f4024ef12c WHIRLPOOL 2b0bdc5150b87d98c07431203c57aa94e535b564ab4cd3a2e307b9d5030360e06172853c9497895c5b42cc5058ac9c4b73d10db14e935f2569693b86cec7de05
+EBUILD python-gflags-3.1.1.ebuild 856 SHA256 ff2d19915e9dc41711c66abd63cb50f6c792f8e42f976bc08070ecbaa0d9b5c9 SHA512 380ec4ea584144f6e7e111283a1ecb08eff940ee13d27dded5ba798bccd8f2bf8c6906c229bddffb764b252d38ab9fa5855b64b8bec658ccdc92d02f34c2ef6a WHIRLPOOL e470e26d5d72a3f9c6f9838d2f6aac9f0374f22f50f63fa76cc7ecff5b537adcc60a39dd5e32d3d5c806516882238c7aab19a30898619b71126e8c6f2649fedd
+MISC ChangeLog 4129 SHA256 6fc366b3b19c08b599ebbb87853a544c056b982a8d042aeca37d796055768a22 SHA512 832ef439a65b1cbbe1c64e56ca43696e0c61b362d38e871f094f8a1878ead670d423101f42a27ba8dcd9a8e9cfa5f993d1a8fc3251f77a9da9d6a6b193b150df WHIRLPOOL b5638176077e93cd159a5706015be7178ce78b950b23ed2948eb77eddd226f79db81f1f34ec75c5000c61fc03467935bcfe83d3261cc8f715ad9044629867329
+MISC ChangeLog-2015 4405 SHA256 dd6b6be96a58ce501cfffb918ea8f41665305aa2f9483727f82f7fa1967ae007 SHA512 edd2c1eeeb2d32ee5906f79ecc545b8e98d303b693b0eff4ad7e0dfc7701a5a50700a6c38ecc149cb4189f0718a9ee27d247b78e0fb2cad7d20c95117fcd274f WHIRLPOOL 72686afc36c69c755658e4da42b7623a47bbe632741ed008a99695fd6817eb09854f117b801116f5d48668db6066a75cef0e9b64891b084a64ba6e42f9e9f9b9
+MISC metadata.xml 376 SHA256 cb5aa6f6bf4dd742ee9fe4e8c160c62c5fcabb6df3e304131ffea4302df543b0 SHA512 acea21fc3fc83a3ab1a24f47ed7250c1ffc15ac4507c4c1472716a55b42fa0740b0a5d2eb20cc3dbfeacc575eed67d59b59e722e96dcbfc87672ddf9b9787c26 WHIRLPOOL 8f401ac745f4bbbddb696b050a2f04d4fb9b2c47c77b5db62f48c9ccdf7de87600e589e0994c35d51749938cf41d3e6e84fd7777f2b594fc9f5e71262df59fc3
diff --git a/dev-python/python-gflags/files/python-gflags-3.1.1-script-install.patch b/dev-python/python-gflags/files/python-gflags-3.1.1-script-install.patch
new file mode 100644
index 000000000000..4fc791383092
--- /dev/null
+++ b/dev-python/python-gflags/files/python-gflags-3.1.1-script-install.patch
@@ -0,0 +1,33 @@
+From 3bc427f5ba0b612430066d5da0ba7a67252ebc75 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 9 May 2017 21:47:08 +0200
+Subject: [PATCH] setup.py: Install the script as 'scripts', rather than
+ 'data_files'
+
+Install the Python script using the 'scripts' key rather than
+the 'data_files' hack. This ensures that it is installed
+in the correct location (respecting install options) and its shebang
+is updated to match the correct Python interpreter.
+
+This is the same patch as I've sent back in 2012, rebased on top
+of the newest release.
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 647db36..1f9e8cb 100644
+--- a/setup.py
++++ b/setup.py
+@@ -39,7 +39,7 @@ setup(name='python-gflags',
+       author_email='google-gflags@googlegroups.com',
+       url='https://github.com/google/python-gflags',
+       packages=['gflags', 'gflags.third_party', 'gflags.third_party.pep257'],
+-      data_files=[('bin', ['gflags2man.py'])],
++      scripts=['gflags2man.py'],
+       requires=['six'],
+       classifiers=[
+           'Programming Language :: Python :: 2.7',
+-- 
+2.13.0.rc2
+
diff --git a/dev-python/python-gflags/metadata.xml b/dev-python/python-gflags/metadata.xml
new file mode 100644
index 000000000000..6edd7784378b
--- /dev/null
+++ b/dev-python/python-gflags/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">google/python-gflags</remote-id>
+		<remote-id type="pypi">python-gflags</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-gflags/python-gflags-3.1.1.ebuild b/dev-python/python-gflags/python-gflags-3.1.1.ebuild
new file mode 100644
index 000000000000..476bc2824667
--- /dev/null
+++ b/dev-python/python-gflags/python-gflags-3.1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Google's Python argument parsing library"
+HOMEPAGE="https://github.com/google/python-gflags"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~sparc ~s390 ~sh x86"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-script-install.patch
+)
+
+python_test() {
+	# note: each test needs to be run separately, otherwise they fail
+	"${PYTHON}" -m gflags._helpers_test -v || die
+	"${PYTHON}" -m gflags.flags_formatting_test -v || die
+	"${PYTHON}" -m gflags.flags_unicode_literals_test -v || die
+}
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
new file mode 100644
index 000000000000..e946cd0cbf12
--- /dev/null
+++ b/dev-python/python-glanceclient/Manifest
@@ -0,0 +1,11 @@
+DIST python-glanceclient-2.0.1.tar.gz 159091 SHA256 77e92a256679ebc76101198482ca34dd0b636f12313c4aa92132b831064b3968 SHA512 48253d70c50ad5b671e0d662612217f76e79b2e15ec1714d578c85ffae3d6b18e019f90946d11cc90e41b981c6bb24c7f47094c046892fdee33034689631af53 WHIRLPOOL 55ba594d226a9dc9bc7d007b7f3bdabed5be084f0c204b93ad604e854ed9db27f180817b8ec0510c06586bcbfc8b7998b20f7777f61ac23fd56550ef08d91abb
+DIST python-glanceclient-2.5.0.tar.gz 157864 SHA256 8c510a089fb4dc8355d5db0de608361888b5e4e0c81e0d153ae1b1366bfb8a08 SHA512 1a702666c9430577e4d6018c95df59600bdb644b224708aaedcef3308d6209f9bc60d5f228126554b27e723414703ef7fe20d0c69058882748eb1e59d63afaa2 WHIRLPOOL a96a7b49ffcd280c085669d4c04a73ad9f6023f774cc56db8142ffb3f52fc68ee0a1eeb047aa31731b15b37f70bb5c1de178172097ae704b05d5e66c2e08b16c
+DIST python-glanceclient-2.6.0.tar.gz 161852 SHA256 59ce6ec4cb17e6cb5b94e12d4563a1b6fe2f6dd11c8e1d4e42e45073c76bcc0b SHA512 c566a261a42cc38db0adea507bbca4790ffa850a81bbf98ff01aa8629bb2d80fe9717a2e17b048367974809c7f7d348881397a53bfeafbc7438b73f9b4bc97e0 WHIRLPOOL 788eda86f6d6d0a0e23c676356881e24d7eb852724caa475dfbb4f5ab45920706de11f6b88eb76de3eb00d985e32510b4d0f2db6149ce5445b9e8e9131d9827b
+DIST python-glanceclient-2.8.0.tar.gz 177172 SHA256 26795c19d9b5a2ec54dfc023f5ea869f8b8ae772669606b4af9125a2db51a813 SHA512 257eaf1d548a3a6277b9c80e8b23b9ae4231586307c43a064754c227f3e3c872451ec0469aca931638ea0f7c9920892878c677b144dc72bad215c38d375a63d3 WHIRLPOOL 49414676f2de742169a0c4259b7a8626db2956e3dd8088d0aaafb5a5acf2b1e0af9d463ec57a4f400586feb9274292cbaece772a9b19723af87ad781a15b01fb
+EBUILD python-glanceclient-2.0.1.ebuild 2937 SHA256 186e5176a8454486e225cc8004c361fd792d513b357d6dfe7139dc6603a003b1 SHA512 4d66740c6cbef3d4f915faca0a9fec14ff90d4587c371e29f2a1c2223935407948c1858fd71d341b97b506160a058c14ea178e6b533f7eeeceb2ccfbd3a940cf WHIRLPOOL 315d74ff81bd9192ce3b7af39d92b2128529b31332b14f0dc992bcb31b366f7539047ef49d440a0f6ba20497ce1e18c9f1711f552105b279adc4efc1a2fa090d
+EBUILD python-glanceclient-2.5.0.ebuild 2674 SHA256 4902a1eed832e849a72d7a0a6fec2f4a1010147ea9f3ba57c6fe7020ca95bfe7 SHA512 05fa60be6a3996fb6c0c6a259046bcbf74afd268f937b14f6df64eba68805382189b4928e5f684ee6900326d1b2d3655a48c9096bd1140a3759b68be6cf3081b WHIRLPOOL 9b26748d4b41600574488e8ecdf4a536da5a4cbaaa97d8bd7fd30aa186feb2fb808cdb96eb489029923b08708c985245f07395ba0b6e1ded05ceb055db46f8e7
+EBUILD python-glanceclient-2.6.0.ebuild 2432 SHA256 74b01fbc4043c0212fc877863d4f6c88172f1c81c0841cd27d09149c8a81d09b SHA512 a22a2cc006f8d71c7383ef922c91ae72346394a02dd697f50124911572922f8beda5cdd0fb210f9b150d154eec398329fdb5454d2b7f59b1265b5c66e185163d WHIRLPOOL a2801142fd06c3a605ae5f5cc438c434916d8c421d22235db0c34b35e9bbd82b39b9ee6bd01f8c7394dae11d4b68f1c57cc3f3e845b6889cb1563b31984e96c7
+EBUILD python-glanceclient-2.8.0.ebuild 2612 SHA256 5842449ae2ad609123368eea174a33f1b7e95533650e656d3597e842fc5e06f1 SHA512 ff395ab1c060e51278a7e5b6cb283827776a7a7d3e008d1fc0932412f05df0373f6d3f0bceec56e0d1e55d93d5256e59e6da6a15171b6f45bfc394a8a6f7abd0 WHIRLPOOL 2003ab97b5ffecbe254f9613a823a5d8ff39d9d5e55450f75ee26ad967852fd0b67c8912c422e377013260962d54bb05bba6bb48325e86dc7e93b0cd88dceada
+MISC ChangeLog 7020 SHA256 1f9e396ba82616c75a7fceba2319463e082f5a1a1e58df89470f7abe70ca4e06 SHA512 75a526ac29b369073a6cc0e452838463208b9792bfe17a56e8f7cad4d4abc410d9f4b62d6a621e3a7a75eae6b8a218ff460c7be0506922656e0915b4c29eb4d2 WHIRLPOOL d39652e0c800a9d78b1ac5a7e4b423bc7da8f85a07e576d9728b96d85d6b5eced4bf4a7e91c1acc56ca6a61e16ef9cf99708c1e516da6b6c6309420dfe6e5c83
+MISC ChangeLog-2015 4239 SHA256 437ee2b83e2e151b27e373a6d7b3a73c6f0350f396b685d09ebcf0cfb043c987 SHA512 7b7a2061832fa68f6577ceb98bfc927ed177910df16da87b720eb81be8bf5b63d10154f5a07347b09342f2b1da2534a3d88d828c218ba3062397aaa69185a8ab WHIRLPOOL a30e9361a60cf0ac72c053aca15a5aac4e37891f1e1602801435bec6b3a3621321b6aedbee7ae3b7e635ba6bdcdde3d1590d29ece399f72ed91a5a8a51876ff8
+MISC metadata.xml 632 SHA256 cc95484b96237f29e439cab70f06e2464d803c826df287eb32bf53b5b5ae97fb SHA512 d807a9aadecb131f92d6a476a8bc0b0293d46c6ac761a2d1ddb596ac219c6c8ac349402e3f56d150e78ad81c5d2838a33b3d35222a18f9a416f969f6d6208d8f WHIRLPOOL 45d65001466c061df2d0b0b4f7865ea971ec5533dcc107802beece6568bc04ac2cc06e159f435dce1f94f5522eca07b511303b7fbe725ea0b97ede40ddbbd252
diff --git a/dev-python/python-glanceclient/metadata.xml b/dev-python/python-glanceclient/metadata.xml
new file mode 100644
index 000000000000..43bba1528f6c
--- /dev/null
+++ b/dev-python/python-glanceclient/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+    This is a client for the OpenStack Glance API.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">python-glanceclient</remote-id>
+    <remote-id type="github">openstack/python-glanceclient</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.0.1.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.0.1.ebuild
new file mode 100644
index 000000000000..4e5987cf4a3c
--- /dev/null
+++ b/dev-python/python-glanceclient/python-glanceclient-2.0.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python{3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Glance API"
+HOMEPAGE="https://github.com/openstack/python-glanceclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+REQUIRED_USE="test? ( doc )"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
+		>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		<dev-python/fixtures-2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.14.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.3.0[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.3.1[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.3.2[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.3.3[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	<dev-python/python-keystoneclient-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/warlock-1.0.1[${PYTHON_USEDEP}]
+	<dev-python/warlock-2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
+	sed -i '/^argparse/d' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+	flake8 tests && einfo "run flake8 over tests folder passed" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.5.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.5.0.ebuild
new file mode 100644
index 000000000000..858a033096d9
--- /dev/null
+++ b/dev-python/python-glanceclient/python-glanceclient-2.5.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Glance API"
+HOMEPAGE="https://github.com/openstack/python-glanceclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+REQUIRED_USE="test? ( doc )"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
+		>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.19.0[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.19.1[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.20.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/warlock-1.0.1[${PYTHON_USEDEP}]
+	!~dev-python/warlock-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/warlock-2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+	flake8 tests && einfo "run flake8 over tests folder passed" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.6.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.6.0.ebuild
new file mode 100644
index 000000000000..0c9a39ad8287
--- /dev/null
+++ b/dev-python/python-glanceclient/python-glanceclient-2.6.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Glance API"
+HOMEPAGE="https://github.com/openstack/python-glanceclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+REQUIRED_USE="test? ( doc )"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
+		>=dev-python/os-client-config-1.22.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/warlock-1.0.1[${PYTHON_USEDEP}]
+	!~dev-python/warlock-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/warlock-2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+	flake8 tests && einfo "run flake8 over tests folder passed" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.8.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.8.0.ebuild
new file mode 100644
index 000000000000..d7d4ae555ce9
--- /dev/null
+++ b/dev-python/python-glanceclient/python-glanceclient-2.8.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Glance API"
+HOMEPAGE="https://github.com/openstack/python-glanceclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+REQUIRED_USE="test? ( doc )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
+		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/warlock-1.0.1[${PYTHON_USEDEP}]
+	!~dev-python/warlock-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/warlock-2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+	flake8 tests && einfo "run flake8 over tests folder passed" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest
new file mode 100644
index 000000000000..b492521cb0af
--- /dev/null
+++ b/dev-python/python-gnupg/Manifest
@@ -0,0 +1,6 @@
+AUX python-gnupg-0.3.6-skip-search-keys-tests.patch 731 SHA256 b7bbbbe0f043c42a2ccc3bdd33aecd9b1c368f745e2ac38783785784d11668aa SHA512 6e5ddce9865f57185713b836ec00aa479456343950d4a40edacf23ce88f155c9f73070684211bdf9cc8cb4c379ec12eea6589a0b9995ac9085ec2a7d6b8ed35f WHIRLPOOL de007a6377a8d8c75af60c5d8b689c7fc7da2fa6058e65a58475a31dc8557c126d17accb220126b96be35432521224bde76366546ce58d2afbda23bb43cfe456
+DIST python-gnupg-0.3.8.tar.gz 38993 SHA256 3872ced77d69203f31817107b324b0dd33d4437a330dc58eca140c8758d26b5a SHA512 128ba1f89e8baf0d1ae53153d7cbe73bfc99617a1aadfd9a02e2e2e2c5f0bb9c7482023bf54f32989e92cc14a9eb32325e4c358c63bce48a70a78d068103ed4f WHIRLPOOL 9080ceeade7e4c614a532eccbd4e9818d62233a6d1751acb159e8e0f13c71edf177d2c1592f0685c7e4139ba59826b8cb13864c11c37e33445a176c693d84f52
+EBUILD python-gnupg-0.3.8-r1.ebuild 673 SHA256 96c99420ad6a67bfe434b273b25c1f0953e7c58ab0c82d24716a72950c781c58 SHA512 da68b9d882b89f6ce71bcda2b4e939579d4c4c82e02839fbbf4d14a152a8efc84d635c2aa7a2aef1b609f2f0dccdf3d77dfe9d7a6688af5944e9bf5a627235dc WHIRLPOOL 21a334965629e790b9763ff63afcee6a26e7253ddcd37ac6f4230fde7ea6b3b4c3e6ccae25a7f206e1f58bf3d20fce6193b4f3c5a9c35bcad02c732190174d07
+MISC ChangeLog 3703 SHA256 79f36321526b4b49cd2a10dde31ae4f718345ff8caee6e972f0c329d9dd5391f SHA512 0afa2ab7f86e8af56089b19468df5f556551dfdb4b10be9f1c541d218846e72fedc19232818f48a8ea2b0f2219abbe26b7b7e7f3a752a190fda037ce8296a084 WHIRLPOOL d08beefc5d582d32918665ef44d0c1d0eeabdf59e0fa3e615a0ca67227cdcbdd99018e0e27caceb8abeeaa89600db3db2263859f3b843a9f6bb5d086d84705e3
+MISC ChangeLog-2015 2425 SHA256 f8ce1daba6a76f1977d5459e99ed958a2d52065aa3b5d8d955726fa8415aefb9 SHA512 ab937456a51cabe1e7199943cb11fd39b5c21e01bf7787ad94ada4daec6a798d34a7be896d0b080663b78d0936ac7351c235b61882d660f0b7d7400f36b72a11 WHIRLPOOL ad0a454a206be237615bb1eaea9b3802c51a9279979dd4cdcb938cd08d810962aae527032e3b8ca8b4d75a123fbd69c43467b401e17086d3eb71917910d0bb1a
+MISC metadata.xml 445 SHA256 571ad6639250e4f49be02dd9d9940a1c23ed347e52f2438a945f32d6cb413ba6 SHA512 4f934dd056cef7f43b98985a52a42ba152c891890f360eb2942167f2ee69ef7fb03476bfde87be8e4e8c178fb7db429d23c695f81dc5d4c3fc266d3a84e827f8 WHIRLPOOL 9355d1a26fbbadf22e87fd6b4b9ae6200f43d87e8178bc3c796ea1e5e833bb00f49d7ba9fac1d14094fd8385704b74d6ed8fa6de42a54ba801cd680a23718a7d
diff --git a/dev-python/python-gnupg/files/python-gnupg-0.3.6-skip-search-keys-tests.patch b/dev-python/python-gnupg/files/python-gnupg-0.3.6-skip-search-keys-tests.patch
new file mode 100644
index 000000000000..66512ab08169
--- /dev/null
+++ b/dev-python/python-gnupg/files/python-gnupg-0.3.6-skip-search-keys-tests.patch
@@ -0,0 +1,20 @@
+--- python-gnupg-0.3.6/gnupg.py
++++ python-gnupg-0.3.6/gnupg.py
+@@ -1078,6 +1078,7 @@
+     def search_keys(self, query, keyserver='pgp.mit.edu'):
+         """ search keyserver by query (using --search-keys option)
+ 
++        # doctest: +SKIP
+         >>> import shutil
+         >>> shutil.rmtree('keys')
+         >>> gpg = GPG(gnupghome='keys')
+--- python-gnupg-0.3.6/test_gnupg.py
++++ python-gnupg-0.3.6/test_gnupg.py
+@@ -493,6 +493,7 @@
+                     os.remove(fn)
+         logger.debug("test_file_encryption_and_decryption ends")
+ 
++    @unittest.skip("requires network access")
+     def test_search_keys(self):
+         "Test that searching for keys works"
+         r = self.gpg.search_keys('<vinay_sajip@hotmail.com>')
diff --git a/dev-python/python-gnupg/metadata.xml b/dev-python/python-gnupg/metadata.xml
new file mode 100644
index 000000000000..454368d9c474
--- /dev/null
+++ b/dev-python/python-gnupg/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">python-gnupg</remote-id>
+    <remote-id type="github">vsajip/python-gnupg</remote-id>
+    <remote-id type="pypi">python-gnupg</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-gnupg/python-gnupg-0.3.8-r1.ebuild b/dev-python/python-gnupg/python-gnupg-0.3.8-r1.ebuild
new file mode 100644
index 000000000000..f10324007a69
--- /dev/null
+++ b/dev-python/python-gnupg/python-gnupg-0.3.8-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for GNU Privacy Guard"
+HOMEPAGE="http://pythonhosted.org/python-gnupg/ https://github.com/vsajip/python-gnupg/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+RDEPEND="app-crypt/gnupg"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.3.6-skip-search-keys-tests.patch )
+
+python_test() {
+	# Note; 1 test fails under pypy only
+	"${PYTHON}" test_gnupg.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/python-gnutls/Manifest b/dev-python/python-gnutls/Manifest
new file mode 100644
index 000000000000..3b4d52585e23
--- /dev/null
+++ b/dev-python/python-gnutls/Manifest
@@ -0,0 +1,4 @@
+DIST python-gnutls-3.1.1.tar.gz 40593 SHA256 8892681519a89adb5bb1fba62199bb83bb86c999c983d46edf306f13c5f99a59 SHA512 471127d548cc4f44fb7b2da4d6db23cff66378b45eefde2ea4950ee08d849b1a5aed86245cd2a8a5f46fd53c652d433d23b658184a00e8e5514da3f518a080ab WHIRLPOOL 1c28e872dea42adc5a97b6a2d71ccc527047f72a0151326d209533b79a6fd144aea0b3a94eb71b124fb4233a4b093ff38dbb8bddaa1382ab0a6965fdda5b4544
+EBUILD python-gnutls-3.1.1.ebuild 425 SHA256 84e02f02700a04e28b6780161b93ceea836c5e65ad5b7d7073d4edc5ef18587c SHA512 1de48e66fd71b80eadee204031aadb58985b421ed45d8403226b2a35d37255959ff706f2155da4a114b3aec9c0521dba1ebe7cd0af51cd7bba7b2eef60362d12 WHIRLPOOL ecaeedccd2f1e03af8d397e0362a9f629d1e7858bdfdeabd09eab104d54061351695f9cf88fcd91cfa0ff43460ab10289f36866e7686d9a7386586ee0d07b01a
+MISC ChangeLog 947 SHA256 fac1307e274acffcab2b3cac8ec0e8b96d92b38e4edff1615e50137e0b2fdf77 SHA512 9a3f11d2420e7692c5fb1c8ec6a4cce01800bb8283d6860b834df28f09a6e8d8576cc46b9cd2141e6c43581798213c29a0bd638c0096086b4728da6f21ca70fe WHIRLPOOL b5d390eab8ebeeefe2f467f01e8f62e04233ebc28af414d99d4c46e5dfa5b85b3747782bf461de447d67c41bc2191232c44e285890e91fdeb561654bdf2e04be
+MISC metadata.xml 1360 SHA256 f36a9f4e9b266a3e0d116e7c210f90ec3c8ebf2e15529d2a50afdf4adb88866d SHA512 c03d9429276eec061d197f0e2c9c623ad1b83ed3a2d45fc8d655faa64326f753f4a6c4fd783feb988e508272071bbb6780b617f122813a1a9b824339dfeeea47 WHIRLPOOL 5491942393c35c183cb9feacfd00e8b76dd4b176d3c47e003c1c7e7d21be65c187643c43969f94109d190aa9e9d3a0765f16c97c3c38a74542a120d043120353
diff --git a/dev-python/python-gnutls/metadata.xml b/dev-python/python-gnutls/metadata.xml
new file mode 100644
index 000000000000..586a4a287087
--- /dev/null
+++ b/dev-python/python-gnutls/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		This package provides a high level object oriented wrapper around
+		libgnutls, as well as low level bindings to the GNUTLS types and
+		functions via ctypes. The high level wrapper hides the details of
+		accessing the GNUTLS library via ctypes behind a set of classes that
+		encapsulate GNUTLS sessions, certificates and credentials and expose
+		them to python applications using a simple API.
+
+		The package also includes a Twisted interface that has seamless
+		intergration with Twisted, providing connectTLS and listenTLS methods
+		on the Twisted reactor once imported (the methods are automatically
+		attached to the reactor by simply importing the GNUTLS Twisted
+		interface module).
+
+		The high level wrapper is written using the GNUTLS library bindings
+		that are made available via ctypes. This makes the wrapper very
+		powerful and flexible as it has direct access to all the GNUTLS
+		internals and is also very easy to extend without any need to write
+		C code or recompile anything.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">python-gnutls</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-gnutls/python-gnutls-3.1.1.ebuild b/dev-python/python-gnutls/python-gnutls-3.1.1.ebuild
new file mode 100644
index 000000000000..b4c46448fa00
--- /dev/null
+++ b/dev-python/python-gnutls/python-gnutls-3.1.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="High level object oriented wrapper around libgnutls"
+HOMEPAGE="http://ag-projects.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-libs/gnutls"
diff --git a/dev-python/python-gtkmvc/Manifest b/dev-python/python-gtkmvc/Manifest
new file mode 100644
index 000000000000..e09df03298be
--- /dev/null
+++ b/dev-python/python-gtkmvc/Manifest
@@ -0,0 +1,5 @@
+DIST python-gtkmvc-1.99.1.tar.gz 1426052 SHA256 a8a74fb0a21d9e229950927a906f5f83ee19e459547138b360a6c60418667ab7 SHA512 f82bbe0f769a57120d3858f77a6531778f4ffbf16191a2f8b3f0cd7da047f756db560e2896504530a92d142c27d61cd010c0ceada059e5dce9428b58950490a0 WHIRLPOOL ded448a1e9ddf4380ea0b0b00fea1f79550a27dc91f05bbf978e00477a7045313507e4baa3c920b24df0c0519fd716bdf8e3c30acd1a16ad7b6db6c377a3ec28
+EBUILD python-gtkmvc-1.99.1.ebuild 707 SHA256 1c18d724fcd711d79672c50198e3592a615f43ff522a616d735e57bfab8b421e SHA512 c797b6760b0ccadc2660edf5eeff73b7c66e89fa695b438c10d70df528e4c2f9212bad8d18777350a2b1e4946f40805eef1b7c2a3f453f764c8999502734d8d7 WHIRLPOOL 7a3ac24efdb4fe886c4f174e323ef5cf4c17e9a6c792ccd7d3e66072a4678a24dd75354cdb0781e06319f7219b3d35d2aef1625de856eeea34407579100c13a3
+MISC ChangeLog 2449 SHA256 8db4a330c1641a0432a9baf6d1dfb46c1dcd2c0fe861f78953576921b59430ef SHA512 09dba863d69acdb55bd28d8cee8031b82f6a77272bf49b8bac511ee1a3f289d11525d55a050f2f0968b4edb3ae15fefc4014c079c0f92506a03002fec2d83a2f WHIRLPOOL ec125bfae4c6110b49382b4cedcd273bea6fae52484ddbb539fd2d7864b5fe59f2617597e1780ca5f58ba69192b55e5ccfe965015c5dcab593d38ce4245640b9
+MISC ChangeLog-2015 1479 SHA256 53fd67ea36f9a81bdd109fe110851aa1f3cf64c9689e4bf6ae890a68dfe57076 SHA512 c6a897c37dfeea43f46524f814e40438678fbff36ae6bbdde45ba9fd67f8f02fa5ba153f42aea03fe87cab2158cce0ace02a460c734af9b84c9b2df874c5fd7f WHIRLPOOL e2d40f60915bd11a668dd0fe8087c033e4adefde9f27b5ab8c37d6fbcfd96e47443fd68a208052795ba267f08e56033c9d07a6d0571cc86fb137b68ed0184934
+MISC metadata.xml 347 SHA256 869b027f9a493af0e1bde8473c27b545548f8ce0f4c2522d3bf965cd3ce9dbc7 SHA512 a9096e6adb8f6ca8dd90ee4199b719d5913a47400b53803d45e31345c3685aa3a732ec420b83fa888dda8e0502973e75be9b0db955d263727e56c01e997eeadd WHIRLPOOL 5ad857a7c4f10cb09afa1e893f98ff6d4e04098846612215e7148a0edfb25ec932cbd600a9e66a0a2bd7b226c7fa8ee5093bf5362330a4a9d751c7a8907b867a
diff --git a/dev-python/python-gtkmvc/metadata.xml b/dev-python/python-gtkmvc/metadata.xml
new file mode 100644
index 000000000000..b6b943cc7dd9
--- /dev/null
+++ b/dev-python/python-gtkmvc/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<!-- <herd>gnome</herd> -->
+	<upstream>
+		<remote-id type="sourceforge">pygtkmvc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-gtkmvc/python-gtkmvc-1.99.1.ebuild b/dev-python/python-gtkmvc/python-gtkmvc-1.99.1.ebuild
new file mode 100644
index 000000000000..15785c344aef
--- /dev/null
+++ b/dev-python/python-gtkmvc/python-gtkmvc-1.99.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="model-view-controller (MVC) implementation for pygtk"
+HOMEPAGE="http://pygtkmvc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pygtkmvc/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+DEPEND=""
+RDEPEND=">=dev-python/pygtk-2.24.0"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	dodoc README
+	use doc && dohtml -r docs/_build/html/
+
+	if use examples; then
+		docompress -x usr/share/doc/${P}/examples/
+		insinto usr/share/doc/${P}/
+		doins -r examples/
+	fi
+}
diff --git a/dev-python/python-gudev/Manifest b/dev-python/python-gudev/Manifest
new file mode 100644
index 000000000000..00eda729b873
--- /dev/null
+++ b/dev-python/python-gudev/Manifest
@@ -0,0 +1,6 @@
+AUX automake.patch 210 SHA256 e90d1dd2bb9d01bb7ef747189a7f6c5f273f8296ef977a8c9bdcfcf2510c1b64 SHA512 14e23d7427a35946bf0b6e80f9a98b3240d91a9e40b41043f5cdf2faf90fd4f95af5e07b34d7bc4d8f38b1e541dea64d7ccde0d365c45cbfa102995501abdeb6 WHIRLPOOL 0f7485aaf7841989cb7aa510a1286699f7d52664d47db7bee48c9890d0ab5b3749df23127c4966469a709e74675a72ecab3ea3af1bc303ac16a4328f6207594d
+DIST python-gudev-147.2.tar.gz 10111 SHA256 09a79c4b8dcf18b55725ac258108551456da111cd9329afd9a23e0da02abe30b SHA512 a022df2989154ac5f358df7ff33d6f976cae4d005756c3b73937e0668751b923a29c3e1f813e89a7297653df7744f10207c2bb33d2a6816470ea2ca10975493f WHIRLPOOL 437fe241650eb9962ed77e1f36e436c491c4e3212aeecb0620d7e535c322379d2e13040db795943295951ccfb04ae56261392b848e350d872c967a5481bdfb8f
+EBUILD python-gudev-147.2-r1.ebuild 1019 SHA256 2fad8367b2d2b8c9dd18c313fa115f9a028485a7754c1b1c412a53e463e12537 SHA512 7d609b0338d015d4557b10e00facc2f46d48c4e10fb203b184f3caa4708e86c03139e356c7515cf9940688ebc6c03039dfc493abdbf7f70fe1e34550cb443e86 WHIRLPOOL 3defdf9027cf3921cfb0391e59a02da03e502fa441631fd395f1da318a9b7512c9aafe839141183bca41574920083119657309adfb3676ee8c08d9d66ffa2d0c
+MISC ChangeLog 2963 SHA256 8a87036125566a4e4e3c36799b85bf2dc4b82f9dc8726ec93dfbe60fb917ee22 SHA512 5ee798ed86c6208c44fcb969a6dde58416414dfe728193c46a9a6dea68a6a9c36202df9bfe3d235b88338f203302155dd5a6a289df2426d301bac1e6e8662ae4 WHIRLPOOL 6ded493fb5c5bfeb0551ef604726f9ec9edd3f05ed8bba4ff3af756e424963bcd0599bdb5c4d5d092f04c8bb664acedf90a62bad8437293fab222a86c27b8578
+MISC ChangeLog-2015 2515 SHA256 31f90b8835e3a0644014a6d74fd37c5d93ac70b23c03b022ce4c271ca7c72555 SHA512 b16471fb7d31dc6b07a5f6f225310832df438513862b7e94bea9d07b96061dda257a4c84e0d995df23b562f7dab62d4f7effca5cd13e2d583c61f0e3607e6ac8 WHIRLPOOL a0d451d4f284bdab1da7e9a81c6bab2833ead91bff45f31fda5a4036fc2fc9aa1836d0c3ca78e7a0a8e1a376cac93bf22258cee6114660ebe509ee16064beb02
+MISC metadata.xml 510 SHA256 b7406f81d6dfc2a2dc19320daa4a182273f2e67f83d3930c8a8e0ef3a97bf843 SHA512 08ed61c5488c6adff26767ffe2c22cc1dcd14bab56e2ef546e9364ad212d65a66f52009560bb32ddbeabbff8abaa51e1720c413a46ed067d3b97188aab8a9b6e WHIRLPOOL 9219caaa2783a1f795d804bf7eab94ea141527c0034fbc16b48713baf5bd8aa6ace262b6a599c0f4dc5e671397c9e6afb7b383d5ed2d50a0591f4457a92eee64
diff --git a/dev-python/python-gudev/files/automake.patch b/dev-python/python-gudev/files/automake.patch
new file mode 100644
index 000000000000..a25c9e4fd31a
--- /dev/null
+++ b/dev-python/python-gudev/files/automake.patch
@@ -0,0 +1,10 @@
+--- configure.org.ac	2013-05-02 00:22:58.181214757 +0200
++++ configure.ac	2013-05-02 00:25:00.463686016 +0200
+@@ -8,7 +8,6 @@
+ AC_PROG_MAKE_SET
+ 
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ 
+ AM_PROG_LIBTOOL
diff --git a/dev-python/python-gudev/metadata.xml b/dev-python/python-gudev/metadata.xml
new file mode 100644
index 000000000000..a6170ed0429d
--- /dev/null
+++ b/dev-python/python-gudev/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>laurento.frittella@gmail.com</email>
+    <description>Proxy Maintainer (please CC on bugs)</description>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">nzjrs/python-gudev</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-gudev/python-gudev-147.2-r1.ebuild b/dev-python/python-gudev/python-gudev-147.2-r1.ebuild
new file mode 100644
index 000000000000..8e07b1e8ef14
--- /dev/null
+++ b/dev-python/python-gudev/python-gudev-147.2-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=modules
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools-utils python-r1 vcs-snapshot eutils
+
+DESCRIPTION="Python binding to the GUDev udev helper library"
+HOMEPAGE="https://github.com/nzjrs/python-gudev"
+SRC_URI="https://github.com/nzjrs/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
+	virtual/libgudev:=
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/automake.patch
+	python_foreach_impl autotools-utils_src_prepare
+}
+
+src_configure() {
+	python_foreach_impl autotools-utils_src_configure
+}
+
+src_compile() {
+	python_foreach_impl autotools-utils_src_compile
+}
+
+src_test() {
+	python_foreach_impl autotools-utils_src_test
+}
+
+src_install() {
+	python_foreach_impl autotools-utils_src_install
+}
diff --git a/dev-python/python-heatclient/Manifest b/dev-python/python-heatclient/Manifest
new file mode 100644
index 000000000000..166692b86a51
--- /dev/null
+++ b/dev-python/python-heatclient/Manifest
@@ -0,0 +1,5 @@
+DIST python-heatclient-1.8.1.tar.gz 163976 SHA256 95558abcb78d747e5516b51f9aabe3bd54013a3c8b4ec06de5415ff2a042009b SHA512 7d9be61f048c2a23b853773009e060517eadff158cca8efc1fbd3a5f3a16d257950021e8afaafc15a536104248d53dfda49698a9d83a3b35955e9e23376655df WHIRLPOOL 6c65266b8495a1502637d08ee53fe5ae0ad8465440ad62ec27a596ff1b816a241328cb9eb9e349a21ec63ccd0ad3b70f4af0cba73128bc9f522e4dfcb01b7c05
+EBUILD python-heatclient-1.8.1.ebuild 2410 SHA256 e8d57fcbfa99fd38ede4bdc5c6c6751112fdd52d67368fbf3288df8102b1b6fe SHA512 95f5ecea31d0160089447e68d624dca7b8ba4c7f0c669847c4dc046feefebc7fd5db9e235bcc3ffccdf36afbe90b11b2f30785663d95b7341d88181e4a998bed WHIRLPOOL aeca41a3cfe998057cef4632c77c0214c857fefd092623f23f3ababb714894be691c637e62266feebe65f2b8627fcfc8ef502530d19b1879cd082d068270a680
+MISC ChangeLog 4260 SHA256 1e6806b64ef9c967e8d414d84d3df0b466c8f94f5460c859ff168d73cadd82d5 SHA512 c3aef5b50992a2413a368a42abb3c282e50b23f395eec4f967a9bb58aa5a65ff38c80370c65de31d364c9d65d0db7fd31389bffb562e46aca9ab9312e2ef23e9 WHIRLPOOL 219452c6a55a576525665414d42f15afee0850b7073c46e18b0312e7d244875f92aedbb7d028ae2bc01f6917e18c8763f596eefb6efbc9418502eda6c14c436d
+MISC ChangeLog-2015 3894 SHA256 4a6f84ea07c6864d69707bd7d65f75bf650c3c4e68a9940237a1dba2c23d80b9 SHA512 427dd709396f961e232bd428b142566b6b71839087eaec3e0920d2f7c851cc1a78da852f987826bda70571b2cbef383702c9cf761b38bb8b59e62fd319e0bcf0 WHIRLPOOL 7ace4ea4721cc7280f9024a0e83ee65d4f3a41e3bc51581d4a68d6cdda9f4c295d326eeca53650094984bda379b6705142979706b617f23c468fac0151a53222
+MISC metadata.xml 582 SHA256 3582e8582506bc61a9b6aee93fd4e8c0d68df3aa60c50a42e32d80bf99b5cbc0 SHA512 b0af42a00c8e7e226f912a056edf53b3fdaf356457fd76edd34cb243d45e7f6427fac8bebd39e1aad57c0d16da8e222b3c6414fa9c5b85728294032afdf5804c WHIRLPOOL be6805d0ebaf3e2f99d5a55c3e49ea9cd137140faf1cda46c9345e01b54af0c3153ca48d5dc958b6958ef311a75e27b231e32a4f343533b677907f22a24b9d89
diff --git a/dev-python/python-heatclient/metadata.xml b/dev-python/python-heatclient/metadata.xml
new file mode 100644
index 000000000000..646822e8986a
--- /dev/null
+++ b/dev-python/python-heatclient/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+    This is a client library for Heat built on the Heat orchestration API
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">python-heatclient</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-heatclient/python-heatclient-1.8.1.ebuild b/dev-python/python-heatclient/python-heatclient-1.8.1.ebuild
new file mode 100644
index 000000000000..ddd3d025fe57
--- /dev/null
+++ b/dev-python/python-heatclient/python-heatclient-1.8.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Orchestration API Client Library"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		!~dev-python/mox3-0.19.0[${PYTHON_USEDEP}]
+		>dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init
+	testr run || die "testsuite failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-iptables/Manifest b/dev-python/python-iptables/Manifest
new file mode 100644
index 000000000000..4110f644d7dd
--- /dev/null
+++ b/dev-python/python-iptables/Manifest
@@ -0,0 +1,7 @@
+DIST python-iptables-0.11.0.tar.gz 73582 SHA256 55bdd0d8e3d0b4c27e4d61bf6f21ada1e19146c0adf65e5093e254a126abcce9 SHA512 5bbaeb09dc256738e3a168fa5941f39e50074eb1ac3ce18545a48c55eb06ef70fd974ad3153dc07ca67b1ef88a2a2c537a9f8d3ac85add990f6d15e9d37aa0a4 WHIRLPOOL 5ecc28a1f65389e63c962408f058ac0795a5ebd846320f4d9de4ad35e6bb7a8ee7dff4555af0c4c9c42d303b7b0f6de372c042d4219141446680ba45b8216ac4
+DIST python-iptables-0.12.0.tar.gz 40831 SHA256 9815fd5ba780fd14b5f8cf8a93e007c0e603019738813a806e37553cd72e4c33 SHA512 bf79288fac53542e523c8ed0e4e0711792cf524100e39f57f10d3581d1b958712875a765f690b3d5ec6e28af9de48d2f3dd0a787c7037ebfc6f8bf87b5e321b2 WHIRLPOOL 360c3dec7c1122ba53cf7f158ff463937a119fbc818ac879403ac943c0f0d04043c89559468274332e3050e4fd84a8d95f8a30b7a783aaa0c023420278c3422c
+EBUILD python-iptables-0.11.0.ebuild 888 SHA256 aaa183501ac3457351956ef43e29f267078fab4f3aa0097d37a5a4bafbd8b221 SHA512 5a9b8dfc069f8024ea1ecffa631453a44a6ac0c932ce5c3fab7d9974aeb9bfd17f4f8cab2948efd87083e91dd0c35b3ec2e7ce7284b78364abe0de6d80ffdc20 WHIRLPOOL 2a3a39b94421230b5b45bbb5b471138b1bc032449e49e4f48190904267254488e8dd631d2c2caf91d9b2421502215d14aa4f9d6f010ca6a98402e7268aca2298
+EBUILD python-iptables-0.12.0.ebuild 888 SHA256 aaa183501ac3457351956ef43e29f267078fab4f3aa0097d37a5a4bafbd8b221 SHA512 5a9b8dfc069f8024ea1ecffa631453a44a6ac0c932ce5c3fab7d9974aeb9bfd17f4f8cab2948efd87083e91dd0c35b3ec2e7ce7284b78364abe0de6d80ffdc20 WHIRLPOOL 2a3a39b94421230b5b45bbb5b471138b1bc032449e49e4f48190904267254488e8dd631d2c2caf91d9b2421502215d14aa4f9d6f010ca6a98402e7268aca2298
+MISC ChangeLog 3519 SHA256 eb81fad89d3e89b5b73997cdd56b902da592218a44efeb25206a14c2ba41377a SHA512 6683d33681ce307884f391c9dcda18856b28af1fb4f21c626cb63a168956188f05c671b056df5afd284f9d04ca5613afa2c778b55932cfcb2ab77480350077a3 WHIRLPOOL 9a858ebe2dd7eeb005c00fa9fd423901067d5e1ede0e749c5bd7756423f5c3f9a708f2e225ef9d9679bb28c8fc65fa7ec40ed4e4393b32c916b788c74bbee896
+MISC ChangeLog-2015 3121 SHA256 c0d22cdb49833b5b4c9566c8f26b503a517e062015376eebaaab690c4af78919 SHA512 65b98552b79b631774b20f9655468341b31d3d7b312df09116ccdfaf5a24604e59a7150e86b810b66b187091a8a3c52591ff28c28f134b51e550f1370ff48017 WHIRLPOOL 7f98103f96c1b3f4816cfe46218320d8d07e6cbb8622395a3d1ce700335b8300d52e17f867730589870b15f67e2a33812f469ce243bc36e9352807ca3dfb200b
+MISC metadata.xml 1340 SHA256 f6a9146de2e718605415221ad698fb2c640d0f4689dbf5efddc351457d7ff257 SHA512 90c875cee0c4ea9e2f34d509152cdd4d83a41010b8a858515fa3bc766bb0ba11e047957f4c005fdaf2e49b088df78cb3b4414a5ecfdb1b6ded550eb6c9dd01d9 WHIRLPOOL 00c9b5372bb1723a0790a60a0cabb3024ec681740421079419d0e385a2fa3a82d204be47c068c6a155b349221ecf2d7e2a3dd2d5d24933e0f5ca9d0a062cf2ab
diff --git a/dev-python/python-iptables/metadata.xml b/dev-python/python-iptables/metadata.xml
new file mode 100644
index 000000000000..65690818b3ab
--- /dev/null
+++ b/dev-python/python-iptables/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Python Bindings for IPtables: Iptables is the tool that is used to manage netfilter,
+		the standard packet filtering and manipulation framework under Linux. As the iptables
+		manpage puts it: Iptables is used to set up, maintain, and inspect the tables of IPv4
+		packet filter rules in the Linux kernel. Several different tables may be defined.
+		Each table contains a number of built-in chains and may also contain user-defined
+		chains. Each chain is a list of rules which can match a set of packets. Each rule
+		specifies what to do with a packet that matches. This is called a target, which may be
+		a jump to a user-defined chain in the same table. Python-iptables provides python
+		bindings to iptables under Linux. Interoperability with iptables is achieved via
+		using the iptables C libraries (libiptc, libxtables, and the iptables extensions), not
+		calling the iptables binary and parsing its output.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">python-iptables</remote-id>
+		<remote-id type="github">ldx/python-iptables</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-iptables/python-iptables-0.11.0.ebuild b/dev-python/python-iptables/python-iptables-0.11.0.ebuild
new file mode 100644
index 000000000000..e294f95ec8fc
--- /dev/null
+++ b/dev-python/python-iptables/python-iptables-0.11.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for iptables"
+HOMEPAGE="https://github.com/ldx/python-iptables"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="net-firewall/iptables
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+# tests manipulate live iptables rules, so disable them by default
+
+python_prepare_all() {
+	# Prevent un-needed d'loading during doc build
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-iptables/python-iptables-0.12.0.ebuild b/dev-python/python-iptables/python-iptables-0.12.0.ebuild
new file mode 100644
index 000000000000..e294f95ec8fc
--- /dev/null
+++ b/dev-python/python-iptables/python-iptables-0.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for iptables"
+HOMEPAGE="https://github.com/ldx/python-iptables"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="net-firewall/iptables
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+# tests manipulate live iptables rules, so disable them by default
+
+python_prepare_all() {
+	# Prevent un-needed d'loading during doc build
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
new file mode 100644
index 000000000000..c552e76ed93b
--- /dev/null
+++ b/dev-python/python-ironicclient/Manifest
@@ -0,0 +1,11 @@
+DIST python-ironicclient-0.9.0.tar.gz 95562 SHA256 8de88260f30625c6eb8c38fa3401945b510485e00189edaa18ca745b738f6a9a SHA512 324aec8ed9861ce2df4b7783b7bd8b98e30efbc8775ddcb4668f760d8916248df0d32def5cb2d30e9e743ff30e5b6717c653ca6e5cb9ea25b536a369ac45be5d WHIRLPOOL 8d992fff69724706b0a2becf84fd2312bba9be59e7b7103f39a0d5905553d9926510ae6dedd28c4f8ed51c179ddfa2cee97f78c7d2cdc59bb86b8b2fd9cb75de
+DIST python-ironicclient-1.11.1.tar.gz 171255 SHA256 0d278cfe3892ed22bd63b727868566f05717550faaef0710c7614d0ddb66ea0b SHA512 d8f164ad46a7fd3d3fd9a11e44384f1acb52b0ce9b4567b08a7e59d32e2098678c74afd2025689df1f0959d72072308867fec57ee0a9e14ba8ea33ec4ca8cbe6 WHIRLPOOL 31abf58bc482487cd419ffde4e43512ebd6a3b40262c612a57b2d1f0f8d3bc2ef54bdab94aa04915fc2a7dd96fea83d2ed290ff7792d3f39174efe2876524d23
+DIST python-ironicclient-1.17.0.tar.gz 206742 SHA256 85b9256e9b1fd4302afe99be5b1dc2aebb17124e61c2a21af3783c3734508cda SHA512 3a1594d499dbfb508a87e87459308cdeb3eac9987116c8a7a250c5751fc1d4785056033e521ec5d99514a2b6c84362e7576dfec9c4941970422cf2757262c651 WHIRLPOOL e46eb8c43539df90bb65b2e17eb31c2035cf8addfc0ae6daabac64e4a4e1d926837f8bbcc2e679e213bece4a75b4ed89d9d08765c5f4265efdce56d388f9d055
+DIST python-ironicclient-1.7.1.tar.gz 147835 SHA256 826f318061205ead8c597c17d7384260c8e685c9538d8e10d7791a18a04750ed SHA512 65d94f745c9544805bd73f77dcdc7f0ab731f932a01629089a952af6f30b85d1db38f518cd4e82ec0346c13dbcaf1eb0e4e166b28d940c77fcbb57ae2465ac08 WHIRLPOOL e911ddda35aef0aa6481fe8a62ca518df0f4e7311a2890a4504fb58f939f6a18cf77890ad29ad2a76501d2be62178f9cdda0d8b6ef5eccd1d86b9290a846f76d
+EBUILD python-ironicclient-0.9.0.ebuild 2203 SHA256 c68892bbc1bb2ccb955ac6711e0a8cbaca39878a366455779560d6938778f963 SHA512 e9670db90712bc76d643c0906889314623eeef2e893390db3909eb95445d615f3f2b7463f2642e34d3194a131b015000acbae00034ae724cdc3c1a5a56e19b46 WHIRLPOOL 6a340e4df9fb27e16a9602ea6e62ce04d0f53079fef2c14f18c6faeb95e39e2687cdb16f7f0e02464d9588c9664f0c32b4c84cc6a883b3b28d090687548b7f87
+EBUILD python-ironicclient-1.11.1.ebuild 2460 SHA256 610e5fdc25fd0677226da410c675b71acbf26e0a82e43dc32a8e74194401ad0c SHA512 776c42ab4568f98b2d26bd06ff014159d43c18a4ddc0d67161d377f9b06f8b2c035691c480299cedbbd97f650f16397881f54e786cfe905e3c349438aa81f61d WHIRLPOOL afc7ff981bb8a7a59f30501bc7b2869cf0fcdb6820a50b48c2574130edb44016fd4d66264ad2e2df32857cafb1d8853e7f5662d74c58e69108c2c7a7d8ef2593
+EBUILD python-ironicclient-1.17.0.ebuild 2782 SHA256 6c2063ac8c2197cce419d9d0cb476321ac83129be165e114349b3117da0bb1f6 SHA512 2b9ee40d5088ce456039a337f53a3db97669b5388698294e4649c750e066b1d28c0d51d76ecf79e51bb08441f145671b36c7fec8dc4140298e942ca21e6d09c6 WHIRLPOOL f5d06c9c00fee46ab4cc67e2fb955476e8178aa7be04b869607867f6878353e61597e7aba204da01916af4a3593839bf011fbae130a1a908e391feb470b00f8e
+EBUILD python-ironicclient-1.7.1.ebuild 2457 SHA256 8921ea9a5ddba31646447a7a052f4df8e4e31bc894c6436a2f91af2e51435ae6 SHA512 f7f8b44fb3a35798ae81bd4a6841781347af600432f8ba54b014a3f581f18008e03c7942457bae8144e663f5a2966e86a6fbbd60949d7aa3363efbdc05fa0e62 WHIRLPOOL 587765892c7466d9febeb901488f1e645459d2deb206c19f99c46881ab3cfabd1a1d42fe98b174e0886350455e446acb92e81265efb8f16fa013395f6c817070
+MISC ChangeLog 3965 SHA256 dd0d6c30f81af483b76f1ab7b1695fd41ddac486262b7faa47f6279863cd5f5d SHA512 230fd9aa5a43bcc6d528f05259df8e74eb96374cd49e1cc00c0212e6aa0b28672ec635a6dabd127baf921459677d44bd8fbbe3cda73ad79b224f45a327fbb51b WHIRLPOOL af85b1c272d7ddb7e0673a8f426f3e365d0de80759ac98743cbf2553a908b7d2b1bee9856ab195c5d14fc81a3c0740ae9d2e43e6754b247c09f8befd1cb24313
+MISC ChangeLog-2015 418 SHA256 ec6d41a09fb789a3e48a4a662629364b42ef89e5a8cf3e05b6092f1751c565b4 SHA512 23e91da7a9a44948e7bb129af33352ad69708bd67c460b91b085ca7678ef16e142395658a63fca34e766e4e98000ee68c7d67b6973d3df17cd9eb7b735a7d8ca WHIRLPOOL 3ca564139fc7ba4ed0d56909dea767d6927b63a98f5b8ac2ad23972cbc4d74d8b5b300015e5b59a0432540afc4402bc4d062a7b927a927760dd8a36dab4dc86a
+MISC metadata.xml 462 SHA256 8d76eb1ac94f139674d2787ad9852c4a39b181cec0367d8cb707a497bea61fba SHA512 8e3b7de241be41bf1af0431ba75d275c5295f197b1c80174d52bc1f38c413300c9a267eedd7034f01200ddced7ddd0143942ebb4a496665ca1105551fb411453 WHIRLPOOL 6781fac2027f4e36adc06ba3af0130480380986840f14a2ac9b940834d06c17d14b89a050dd78423f3fe7b807593e4396349c32062e1cda800ac96f28d69d5d7
diff --git a/dev-python/python-ironicclient/metadata.xml b/dev-python/python-ironicclient/metadata.xml
new file mode 100644
index 000000000000..cc25c556f9b2
--- /dev/null
+++ b/dev-python/python-ironicclient/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		API bindings and client for the OpenStack bare metal provisioning service.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">python-ironicclient</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-ironicclient/python-ironicclient-0.9.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-0.9.0.ebuild
new file mode 100644
index 000000000000..1cd53910dde3
--- /dev/null
+++ b/dev-python/python-ironicclient/python-ironicclient-0.9.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the Ironic API"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
+"
+CRDEPEND="
+	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/python-openstackclient-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${CRDEPEND}
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		dev-python/doc8[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/httpretty-0.8.4[${PYTHON_USEDEP}]
+		<dev-python/httpretty-0.8.7[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	${CRDEPEND}
+"
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	#rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/python-ironicclient/python-ironicclient-1.11.1.ebuild b/dev-python/python-ironicclient/python-ironicclient-1.11.1.ebuild
new file mode 100644
index 000000000000..a325de10acb9
--- /dev/null
+++ b/dev-python/python-ironicclient/python-ironicclient-1.11.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the Ironic API"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
+"
+CRDEPEND="
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${CRDEPEND}
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		dev-python/doc8[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/os-testr-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	${CRDEPEND}
+"
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	sed -i '/^tempest/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	#rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/python-ironicclient/python-ironicclient-1.17.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-1.17.0.ebuild
new file mode 100644
index 000000000000..6902bc8931f7
--- /dev/null
+++ b/dev-python/python-ironicclient/python-ironicclient-1.17.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the Ironic API"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+"
+CRDEPEND="
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
+	!~dev-python/python-openstackclient-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${CRDEPEND}
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		dev-python/doc8[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+		!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/os-testr-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	${CRDEPEND}
+"
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	sed -i '/^tempest/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	#rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/python-ironicclient/python-ironicclient-1.7.1.ebuild b/dev-python/python-ironicclient/python-ironicclient-1.7.1.ebuild
new file mode 100644
index 000000000000..0a9a407e86b1
--- /dev/null
+++ b/dev-python/python-ironicclient/python-ironicclient-1.7.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the Ironic API"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
+"
+CRDEPEND="
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/python-openstackclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${CRDEPEND}
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		dev-python/doc8[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/os-testr-0.7.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	${CRDEPEND}
+"
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	sed -i '/^tempest/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	#rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/python-iwscan/Manifest b/dev-python/python-iwscan/Manifest
new file mode 100644
index 000000000000..41f73b136891
--- /dev/null
+++ b/dev-python/python-iwscan/Manifest
@@ -0,0 +1,6 @@
+AUX python-iwscan-20080402-wireless-tools-30.patch 366 SHA256 fc33b141d7c5f389616f3a952b3f8dcd291c3a1a0da9d8406d69314b39f76dba SHA512 67687e0c3fe5dacc58dca129325542b7b5fe11b761ce1c699d4d38a77738bad8ed1ae191716d7ca10bae056481242454c5afce7b6e4143f34e5c45121fdd4209 WHIRLPOOL dec8fe332bf2aee4d5981cc776aac6a248ed7ae5c6b9c7b4ddb0cbf6ac7da102e62a2e874a565221e5b414ea146f7d046305a59de59ce6ef74cd209fb1d443ef
+DIST python-iwscan-20080402.tar.bz2 16891 SHA256 1e534508597bd86cfab3f3d7b5e1f6d924812f374e3e26c1546c4ecbb07f8b8c SHA512 9e9d5e1b2cc491879a4f8a216044f46253820c6c8f30904a1867f758f6d158a9270c9c70a91f22a80f15fbe0446d786869104c5dc5d6bfcab470a79478f533d2 WHIRLPOOL de4a05b688e160ef721de71304a44731e5d28e803c27619d40a5c467674dcc2c5413c80ed5b97e1a739f6e3a41ec69b26ae3b2d71f17b3d5d088906d1481077d
+EBUILD python-iwscan-20080402-r1.ebuild 578 SHA256 fc1b9d9d8ae765a5ab58b88240f63de69857ea3fd38319a9c2d6af75964f2404 SHA512 16ddd2ab6b23ab481a95d534c8063c403e227167397f0eb326034e19f2d43fe26e47a6b40d22e243b6f1a39ce1647e76feaf8c5d4c6d6139854acfe4d1f6b7c7 WHIRLPOOL c148783d2609af7fe96b91b818f98977420e7ec8a8f938b2704e0fa7a6f1e0b9b651dcbe6bf71d0361966e25b92f60750be5d5e2198a2c304780b435d3c23b3a
+MISC ChangeLog 2516 SHA256 3d24666da80bcfec7cc1ecdc7c652535014158b699ecac779c9671341eedb39e SHA512 0f6eaca1ef5df4e8f30cf79d457e6bbe4656bf7b063409934afdf380720545e91adedccc49d860294ceb4b6695570442cf9a884c46a9ea18360b7a655084a5e7 WHIRLPOOL 85dc320c2b3f04ed082d2088c975d95e19625de3e707f41e7e0c50042ee90cff7999adf6164dfdfbdeca8948191bbcd07af7a432b9f61a92f0ea0088360c73d6
+MISC ChangeLog-2015 2996 SHA256 efe35c0f19f80bef389f283caa2e0ecd5d47f24278a9312f1fa7a684d4052611 SHA512 794044404cf0b293a4afbd49be0867ee6c07c15d14b9b8094f57ed2c717db1dc4147a791d4a12f24fbad02a00d3b7e65ea368ac145df009026ceffa0f330715c WHIRLPOOL b0db7fef7cacb04053d2ff56dca2bf8fbaedbf69e99836fd6f6efeda0d9230af055c45679d3c9081a2f9d799388666724c8ab7a4d0e7363ff0a84495c7c8cb6f
+MISC metadata.xml 238 SHA256 9e09d4dcb7278b727b88408a0535430d9894ad05d2596b5031e0e00842566219 SHA512 47119affb0bb88a6fef7b2121569fa43cc30157b6aa8d1edb7374367a11ea9d422497da9bbc0bb7106b4124c90e3c980ced5ae202d96a48526ecaf875975db6a WHIRLPOOL 9339618d7e20d7f9a6c320505b60efa401dafe71138c1915a51ae0b2d05a9caac7c21c2cee12a73ddf5fee41ac7afbcd60f3eac3fd41a397b2b47e9b94fb8496
diff --git a/dev-python/python-iwscan/files/python-iwscan-20080402-wireless-tools-30.patch b/dev-python/python-iwscan/files/python-iwscan-20080402-wireless-tools-30.patch
new file mode 100644
index 000000000000..16a9dce1858f
--- /dev/null
+++ b/dev-python/python-iwscan/files/python-iwscan-20080402-wireless-tools-30.patch
@@ -0,0 +1,14 @@
+--- pyiwscan.c
++++ pyiwscan.c
+@@ -13,6 +13,11 @@
+ #include <structmember.h>
+ #include <iwlib.h>
+ 
++/* PROC_NET_WIRELESS is defined in iwlib-private.h since wireless-tools-30_pre9 */
++#ifndef PROC_NET_WIRELESS
++#define PROC_NET_WIRELESS "/proc/net/wireless"
++#endif
++
+ #define IWSCAN_VERSION_MAJOR  0
+ #define IWSCAN_VERSION_MINOR  7
+ #define IWSCAN_VERSION_MICRO  0
diff --git a/dev-python/python-iwscan/metadata.xml b/dev-python/python-iwscan/metadata.xml
new file mode 100644
index 000000000000..a5c911a491f5
--- /dev/null
+++ b/dev-python/python-iwscan/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="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-iwscan/python-iwscan-20080402-r1.ebuild b/dev-python/python-iwscan/python-iwscan-20080402-r1.ebuild
new file mode 100644
index 000000000000..e037ac41b7f4
--- /dev/null
+++ b/dev-python/python-iwscan/python-iwscan-20080402-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="A Python extension for iwscan access"
+HOMEPAGE="http://projects.otaku42.de/browser/python-iwscan"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+DEPEND="net-wireless/wireless-tools"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-wireless-tools-30.patch"
+)
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
new file mode 100644
index 000000000000..bc47bbedc1cd
--- /dev/null
+++ b/dev-python/python-keystoneclient/Manifest
@@ -0,0 +1,11 @@
+DIST python-keystoneclient-2.3.1.tar.gz 322240 SHA256 89e93551071cf29780eeafe7a61114cd36b1c2192813d3c2a58a348a6a3ac6ff SHA512 555ad57332ea677242057c34313df0d02a16f5738c584db82611db3e3636e792d30b9dc5ea371ba56a4c3b9a158ba879ca38ff5fd40ae842f8be98e52ea856d8 WHIRLPOOL 095ae83ea61f356a46fc2f8e135ffcb46db205a8bfd9b5b3acd0e7b4baacfa97d315c1b1ae3c422769e683911591d67bdbb5ec21728af91fd4eb709c0f6c3df1
+DIST python-keystoneclient-3.10.0.tar.gz 300635 SHA256 c65fa56791ec02dc942ad08e5c3634b8dca98eda76ee3c2549018b6767e67918 SHA512 606143ed7e1187098e6e0c4168bc0ee19204e1782b3fd1db4bd2fbca1cea193fd924b01a5fb5bc1de592fa961f737788108ac384899d81f747fed2853f5f18bb WHIRLPOOL 72580d0c57efe71d7ec71e12147e69d0bca7df6949a97afb601ec5fa1abac01f08a894f0c2aba5c4724f60e6f30b6ebbcf748de1ea6a6fdb2103bfd9afe8eced
+DIST python-keystoneclient-3.13.0.tar.gz 303828 SHA256 f897eaa6b251a12e5d23130e8435fb5d2ead6f7ea1d1d20faf2ccc1c76c51c90 SHA512 0b4b9297c1661d8ed84c6019ccf93eab495c4ac5d098af456deb244c6db7bd1d40e874ef65c170c6fa9ff4814ac1e714baa9fda0f40dbd4e043ffdbcc9310718 WHIRLPOOL 40c6ac5a7ba10507e88280aac67bb3a08343555f76edd62781cd533a149fa1ce42f7c0d62ed6c40100489e3172bf78a62aad2ceeca706d4c306ef88cc18cd222
+DIST python-keystoneclient-3.5.1.tar.gz 300839 SHA256 d9ff56e7c7d551c21f13be15e469fc0893fdcd4deebf3bbfc31e8a153efcbbc5 SHA512 b9328de923b5a579d093b02c05edb1d01cb6d319414f515016528e1e05db11eb8844d836a85d67ce7c3e802ac1ba60f807ded3dad7a0e98479f82b7076c9e589 WHIRLPOOL 7c927adae25d148fd0b05a28a56d3fb45e1e7938e7f86faa92bc01bcf0290060a934b292901718d22eda16c8f0f4483db0251a8edba8e123c844bd710b4827c8
+EBUILD python-keystoneclient-2.3.1.ebuild 1840 SHA256 a27fc5cad15f7db07260a3096f1f55764efeaaf84c780f2a9e2ab06219c53923 SHA512 12b9f16ddd0e0ea590431e717a94b99edf7dbcf7cf1bb50225360f876bf6aafc0b064a31580289d3a2aa1f2e5396d2cb4c07a3c0587e5dfff888018700f49de4 WHIRLPOOL 6bf0a11806cd56dc3ab4feb5f4ca3216d7cc77825f40f79a74edf184045b8f1cc7650fc0e52d4f5e369cc0ba8fff610f0a293b3cc0513e284cf8b09bf1589c52
+EBUILD python-keystoneclient-3.10.0.ebuild 1289 SHA256 3dda78306cc2099d4645075095564669cc29e29408cf68bf1678e9fbb20ef38f SHA512 2d686e5839d57eb5a0a871ec309cf1f15aeafd01cd5d731337f44d1e46020dc79ec5b0e324b2c0dead8f919106312e25f77741ba60c67457cbd48b7389647de0 WHIRLPOOL 0e5d841ea7d803e2f291e5faab4fd2f70422561c3b9679ba01cbc51c8211666117dba35b5f80f4cb551f76a85f65c487c0db010b49f402a4f446644538c640c2
+EBUILD python-keystoneclient-3.13.0.ebuild 1421 SHA256 db1dc49c5e6a3c89914795aaf0b86a89a3ab98e788165d157280c7325fde576c SHA512 0bab532fd59cf853fea2cd109bb0bd79d13102d287a8e3162d840371a4bac7fe0d9213c272989a67570d220a23bf4e30352d3144d6037c5255fa8488a9c28fe6 WHIRLPOOL 59d2fa9002ae5906a448ea66914c12004960f1125a5d00ad9217cf015a2fa22ca2cea9cf652aa7e306c401f6e94b9bde8abeeff394ae0572cad7394ea27424a0
+EBUILD python-keystoneclient-3.5.1.ebuild 1539 SHA256 bf9977d1949a14b540f4c91423bdcc08b16ed6aa67bde370968c52ee7f416714 SHA512 9f5ba985987ed6e23f13a2f4a78fb0cab20033910d4b54192715c57511bccd32a81fd355ef2950ef1acb52ce97b47bc729ce7e9a7dfa64252be2500f6854a8cb WHIRLPOOL b0d67207255c3689d5fabf8539574332c1519f6bed492a58fc12b7a5fc003a7ff9314c981acf32d58de040af8209485e32b0c870eba062d1e3e67a536178cb4c
+MISC ChangeLog 8452 SHA256 0c007bb3462e2f7a4c0cb519dbbe5200976a5dd0b4862dbbf0c85ff34aa634de SHA512 be76113ecb72eaf4922f6eb50a2700454c49071a8e45359032b90e3bd6f5bfca115f8e581783dc2bb576cab4f2dfc91661bbafb2606b4f8d4dd2da41eeb0f0f8 WHIRLPOOL d2e5bab5ad0c01a818cd335374df28770b166b6851a5e006408dd746bb020b8ff52749ecf56ee4390f8f9b8bedbdc4c078692344b769ec1b754a435f1b0ef37d
+MISC ChangeLog-2015 12793 SHA256 55e64037509c91e714a0a0789e1353a4dee77e882566743c563db84293111381 SHA512 d568842542df79f10e728d003d75f35987da6beeb63ab4df21ab9db1eb0f655a2d3bd968d05b82ee82442de0f03a021ec8fee16824d5e926d618bce574331929 WHIRLPOOL d1b783b1a7a8b7b30e5e03360443af2335700e1d69cd78f5039c6ced689aa96a6a7e552d5c8908705734a689498280231d68e035b0250b1064fc934c23406868
+MISC metadata.xml 557 SHA256 8e8d73032e71ce99ab0433c5d92c1d2df13a4512205fb87f60c41fe47914c622 SHA512 5ec4344a761069fd31f8d86351548d0316c421e9a6795b604ece495883587cd8f579f535076cf43eba2114a4cf62eba77a6f96f49bca3a51acbcee6e3d24a718 WHIRLPOOL f0526e27eb50f541c092532c98316c152d19dea0a28b215f4ecda147df3eaf6beb02ade0ab06b0cc68b600310f09c77f547fdf331aaaf43e1330249c13842aee
diff --git a/dev-python/python-keystoneclient/metadata.xml b/dev-python/python-keystoneclient/metadata.xml
new file mode 100644
index 000000000000..a1e7baa5fad3
--- /dev/null
+++ b/dev-python/python-keystoneclient/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+    A client for the OpenStack Keystone API.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">python-keystoneclient</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-2.3.1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-2.3.1.ebuild
new file mode 100644
index 000000000000..39d3f5484e3c
--- /dev/null
+++ b/dev-python/python-keystoneclient/python-keystoneclient-2.3.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Client Library for OpenStack Identity"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+# Note: blacklist version not in portage:
+#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
+
+CDEPEND="
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+TCDEPEND="
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/positional-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+"
+#PATCHES=(
+#)
+
+python_prepare_all() {
+	sed -i '/^argparse/d' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-3.10.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-3.10.0.ebuild
new file mode 100644
index 000000000000..21aada1b1287
--- /dev/null
+++ b/dev-python/python-keystoneclient/python-keystoneclient-3.10.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Client Library for OpenStack Identity"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+RESTRICT="test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/positional-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+"
+#PATCHES=(
+#)
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-3.13.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-3.13.0.ebuild
new file mode 100644
index 000000000000..e9fb2ff89df5
--- /dev/null
+++ b/dev-python/python-keystoneclient/python-keystoneclient-3.13.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Client Library for OpenStack Identity"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+RESTRICT="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/positional-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+#PATCHES=(
+#)
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-3.5.1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-3.5.1.ebuild
new file mode 100644
index 000000000000..990b25200bd4
--- /dev/null
+++ b/dev-python/python-keystoneclient/python-keystoneclient-3.5.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Client Library for OpenStack Identity"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+RESTRICT="test"
+
+# Note: blacklist version not in portage:
+#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
+
+CDEPEND="
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+TCDEPEND="
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+	>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/positional-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+"
+#PATCHES=(
+#)
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
new file mode 100644
index 000000000000..705eeb0e70f7
--- /dev/null
+++ b/dev-python/python-ldap/Manifest
@@ -0,0 +1,8 @@
+DIST python-ldap-2.4.19.tar.gz 138503 SHA256 02fddb3accbfb54e40ff47a59457e422b253f9fb6cd64bb3851b349295fab048 SHA512 bfa8b87449f03d70d78bf890d1190ef5a153e1b84db97ca4b40465bfba9faedace2a69f4ae1279ef6323c01255f52993cf0e4374bc32d9660a5286dfc7c17b85 WHIRLPOOL 708c6744b41fc4c9dc4473a9ab088016aa722f5b196c080973fedbb07a08dd57f859ddb5d193665349f44d2d08ff9e2f797cfa6af23e34624f1d0a9e21d62d4d
+DIST python-ldap-2.4.32.tar.gz 126025 SHA256 5810f1b5a9ae9255df99fb9c2dcab7352fed325687efda56c0faae1a82c5e3cb SHA512 35a526330852ee87acd240cd285881afe498612fcedbffe93c6e41fb082300cd8b351d9100dc2b3049c658ed062d69cea90f28f9db51a80d94816ce249bbd028 WHIRLPOOL 162208a2dd65069729a4868aa5737f0d6cf312b8e9072978c55d42f6d742ab95a244a6cc996af80a92d422793ad4780a05832a37967262619278007abf51725a
+EBUILD python-ldap-2.4.19-r1.ebuild 2326 SHA256 cd6e632e25480d2894549ef5db545587900d7dc261fb72f02ee790ebbc397c0f SHA512 7c78154fe2287c50038e77c7108abef61dcb2887a708bfb95bff3265b666193776aa6d70a6117d6613f2a323182f8a0fd3f15180c6a11b47b9f264beb167dddc WHIRLPOOL 806e13594989854369ee3127b989c3d521ce087a3128de99db23665ec2e717c50266bbc6f527f0fe8d623b0ce9d48533697c04fe9c3023b6bee54298a4bd6034
+EBUILD python-ldap-2.4.32.ebuild 2113 SHA256 be60f497473d85804e2a521764c99a2ebeaade8981a1c3038c408a4844212808 SHA512 4a471da8762fabe6cf8616badd87ea2289eb6b4d8a9cfccaffb494a41e065cb003b68a23429cb187a0bfacdc7ccf270800028f1dcc616f41b28571857abf8dca WHIRLPOOL 2a24f4766ff728a4f600ebb490d259ae39a3c4e4f0362da507e19f8de11151be63f6764ba40994b0085f3493745501656f833eea92fce4e82b44eef68b9fd80d
+EBUILD python-ldap-9999.ebuild 2174 SHA256 79804ba7348607cd44a8138d22495b0192c2ec14d5f091666fe83773b8f323a3 SHA512 79077fea2f62ac0de8873d6981e7682820c07f54cb0075e8fd39d736289e9f5dbfd207b8af55a1fda6f71e87f6538d0315be32fbed1c1c23ed4dd4c9db17efe4 WHIRLPOOL 66384fc0a1f877ab5fc0b680e033133d0b91a78eaa1c71908b6ecc00e77f9bc25c73dc4935ffcdbea305b85310f439464bf0e758ddad48a6ba4b885a027860cc
+MISC ChangeLog 4630 SHA256 7e559653a804c73f7731cfca544ea95c230efc778a278707eb44a640d9046409 SHA512 f4df08ed0c8a25fb0b9550b90583c40004438c710fb0442f8597075c5af95ce547c32efef0d9d67dbe8ffd82bf4bdb1c43462748dd0e13fca6420b8466bfd507 WHIRLPOOL a4d49bb97c2b82ac27f8c8bd8e5fad083249e62ee21b02f8c71d1024cfc50d8d3a8f19a9bd3e1dfdb33a21f291ec600ea08671188a3c693523aa0b7f2fcc4c82
+MISC ChangeLog-2015 20575 SHA256 cc080610300e24ea6799e19b01166301f120a3ba5cd1a791661e09471d142f7f SHA512 5f3eb98c7abfa5dedd4cdce3205aae313e09ce8a91bb426f41234eb55b368e37ba746363544b32a375e35b42819bb8c553452143e82a5eb4256f7a96d173aa3e WHIRLPOOL 139a35fd4f9de7872fbcf1f7d63453b3f97f2caf7d778fcc95075c5adb984c1bd8e426f67a0b6b587690fc0f8191234e26aa4e02260b4b36cfe197fa8d9b336a
+MISC metadata.xml 476 SHA256 bbdc8aa6e83146dad9fdada3ae4f7b71f24d3dd7cd1a1d96fe1b33ffe8a01d16 SHA512 29197789f521afefd0755dd02489c1ebb1dca85aa3f4b15522d64848189fc59b5c639ccd237f8d35c565147368a9d24bc079283373760c301cc1982e61d4d5e4 WHIRLPOOL a9233d04a0630c90e0a68b33613e29c108128ed718c21134713a94c3793f94f28dc17501a3c1247f37c4cb0aed326d08bea2c97332b299f47494ac3c637bc757
diff --git a/dev-python/python-ldap/metadata.xml b/dev-python/python-ldap/metadata.xml
new file mode 100644
index 000000000000..68178bf72255
--- /dev/null
+++ b/dev-python/python-ldap/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+		<description>Upstream of the python3 port</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-ldap</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
new file mode 100644
index 000000000000..f4e2cb14cf01
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# setup.py is written only for py2, which suits pypy
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1 multilib
+
+DESCRIPTION="Various LDAP-related Python modules"
+HOMEPAGE="http://www.python-ldap.org https://pypi.python.org/pypi/python-ldap"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
+IUSE="doc examples sasl ssl"
+
+# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
+# python team: Please do not remove python-ldap-2.3.9 from the tree.
+# OpenSSL is an optional runtime dep.
+# setup.py incorrectly sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
+RDEPEND=">net-nds/openldap-2.4.11
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND+=" !dev-python/pyldap"
+
+python_prepare_all() {
+	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
+		-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
+		-i setup.cfg || die "error fixing setup.cfg"
+
+	local mylibs="ldap"
+	if use sasl; then
+		use ssl && mylibs="ldap_r"
+		mylibs="${mylibs} sasl2"
+	else
+		sed -e 's/HAVE_SASL//g' -i setup.cfg || die
+	fi
+	use ssl && mylibs="${mylibs} ssl crypto"
+	use elibc_glibc && mylibs="${mylibs} resolv"
+
+	sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
+		-i setup.cfg || die "error setting up libs in setup.cfg"
+
+	# set test expected to fail to expectedFailure
+	sed -e "s:^    def test_bad_urls:    @unittest.expectedFailure\n    def test_bad_urls:" \
+		-i Tests/t_ldapurl.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C Doc html
+}
+
+python_test() {
+	# XXX: the tests supposedly can start local slapd
+	# but it requires some manual config, it seems.
+
+	"${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( Demo/. )
+	use doc && local HTML_DOCS=( Doc/.build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-ldap/python-ldap-2.4.32.ebuild b/dev-python/python-ldap/python-ldap-2.4.32.ebuild
new file mode 100644
index 000000000000..2a53470d7c00
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-2.4.32.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1 multilib
+
+DESCRIPTION="Various LDAP-related Python modules"
+HOMEPAGE="http://www.python-ldap.org https://pypi.python.org/pypi/python-ldap"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+IUSE="examples sasl ssl"
+
+# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
+# python team: Please do not remove python-ldap-2.3.9 from the tree.
+# OpenSSL is an optional runtime dep.
+# setup.py sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
+RDEPEND=">net-nds/openldap-2.4.11
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND+=" !dev-python/pyldap"
+
+python_prepare_all() {
+	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
+		-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
+		-i setup.cfg || die "error fixing setup.cfg"
+
+	local mylibs="ldap"
+	if use sasl; then
+		use ssl && mylibs="ldap_r"
+		mylibs="${mylibs} sasl2"
+	else
+		sed -e 's/HAVE_SASL//g' -i setup.cfg || die
+	fi
+	use ssl && mylibs="${mylibs} ssl crypto"
+	use elibc_glibc && mylibs="${mylibs} resolv"
+
+	sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
+		-i setup.cfg || die "error setting up libs in setup.cfg"
+
+	# set test expected to fail to expectedFailure
+	sed -e "s:^    def test_bad_urls:    @unittest.expectedFailure\n    def test_bad_urls:" \
+		-i Tests/t_ldapurl.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# XXX: the tests supposedly can start local slapd
+	# but it requires some manual config, it seems.
+
+	"${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( Demo/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild
new file mode 100644
index 000000000000..023c4923afbc
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-9999.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# pypy: bug #458558 (wrong linker options due to not respecting CC)
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1 git-2 multilib
+
+DESCRIPTION="Various LDAP-related Python modules"
+HOMEPAGE="http://www.python-ldap.org https://pypi.python.org/pypi/python-ldap"
+EGIT_REPO_URI="https://github.com/xmw/python-ldap.git"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc examples sasl ssl"
+
+# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
+# python team: Please do not remove python-ldap-2.3.9 from the tree.
+RDEPEND=">=net-nds/openldap-2.4
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}] )"
+RDEPEND+=" !dev-python/pyldap"
+
+python_prepare_all() {
+	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
+		-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
+		-i setup.cfg || die "error fixing setup.cfg"
+
+	local mylibs="ldap"
+	if use sasl; then
+		use ssl && mylibs="ldap_r"
+		mylibs="${mylibs} sasl2"
+	else
+		sed -e 's/HAVE_SASL//g' -i setup.cfg || die
+	fi
+	use ssl && mylibs="${mylibs} ssl crypto"
+	use elibc_glibc && mylibs="${mylibs} resolv"
+
+	sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
+		-i setup.cfg || die "error setting up libs in setup.cfg"
+
+	# set test expected to fail to expectedFailure
+	sed -e "s:^    def test_bad_urls:    @unittest.expectedFailure\n    def test_bad_urls:" \
+		-i Tests/t_ldapurl.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C Doc html
+}
+
+python_test() {
+	# XXX: the tests supposedly can start local slapd
+	# but it requires some manual config, it seems.
+
+	"${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( Demo/. )
+	use doc && local HTML_DOCS=( Doc/.build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-levenshtein/Manifest b/dev-python/python-levenshtein/Manifest
new file mode 100644
index 000000000000..74fe2c6beade
--- /dev/null
+++ b/dev-python/python-levenshtein/Manifest
@@ -0,0 +1,8 @@
+AUX genextdoc.py 7029 SHA256 5da35495f806deb7a183094229e184f764d0351f78ab0da629c9ad55b3352cea SHA512 f03a6628e982da094d40e14d63cc2d233677d78ca1ad0dd0817bc69176d8d4374c2a0caa94a4d0891ba3b7ab14cbbad1b530319984df990176e151d79331b906 WHIRLPOOL 5d4c6664f3e46fc241d3f2e7a320368bffa6204fd83aa7c69b4422c238164d2a4b78353bf08a121539443c90b72ad281bf0e3a09279e827f25f11a82c94d0cb2
+DIST python-Levenshtein-0.11.2.tar.gz 45458 SHA256 c1311c71beb5b6eecea4bba200a626331ef67110357448be47ba1bfe3c4aa305 SHA512 67d701e841c9a846948a1f2c70ea06c6473e3ae1437f73df2a2747d576024889a12e00c4a61e95b6c14826554b1ebaf65375cf5be4f26df3b208568403192bf3 WHIRLPOOL 5acbb305efeebd56ce79256efdef870f5ef92832e0b7f6b5b4d7d569c1e51821def06ac0a9ddfa165211b129f109e1089a3982b004a7a1982c93e5ca09aa2c89
+DIST python-Levenshtein-0.12.0.tar.gz 48617 SHA256 033a11de5e3d19ea25c9302d11224e1a1898fe5abd23c61c7c360c25195e3eb1 SHA512 95df064490970618b003bccbef9071b1a2a3ee4645ac8e851f4205bd4e8123d21ee0ee733adfeec79085faa01ba39902e2a4a26bfb21b70678377579157df4a5 WHIRLPOOL e1e0b50efcbe82d8043e352d0e0f4275bdcad27342f699f8ad4516d5591647af8ea2b9c27395c7a982a77a0c9593ad12cb1bf8a68996c943877752bf681b41e1
+EBUILD python-levenshtein-0.11.2.ebuild 1076 SHA256 91f760d3281da6d169f1215b7a8c5ab6b2c8152cb1d006d438125fab0050c017 SHA512 6ce0eeeabc79ed2e5d219d62bf28172a9ca70bbf94fd995dcc2d227758d820407cb98a187904827514c963951956c09a4476113b9e5b3165c0417da9cf076e25 WHIRLPOOL ad9a4854095103a92c186f2a23a6b5b4bc1d7630bbe25bd46816fbebcdf54e302ae0eb0f43b8b4e69bf001101aceab5640f36c7bbb18c1709f8f83b788c6d26c
+EBUILD python-levenshtein-0.12.0.ebuild 1087 SHA256 aaa685c22db1f56641d9ee07685b2b211dd08d0d34f867ba5c26ced4f0a83e18 SHA512 9ab0faf53eaf053abcc6a7132b9f63f9b83f894d10f27f30302106d2af0dbe4e434fab4869a1c17a69a4a6c7313cd77c09b18bf8197664e0c81e09c5bbd12f8c WHIRLPOOL 15b149125401ccbb36d3fe124a8a2e8425156c0286a874ae1328d2bd8ba56ae903a7493a1c73a0ca93324e2f4e41a45065839b8fb90f1acbc31ee7ceb5218659
+MISC ChangeLog 4394 SHA256 b2751ecb594b8640ceca89daabc5166a80987b9a2c64a16a395d8a5fe422e72e SHA512 bff7042e50f33c1253490560ab88c9cf376c2e113b6813bbdd6663161e231fabc791ca615e64f12c80628db12710afca89fd53b24db190c83cc775689cf12bee WHIRLPOOL 409094f40b88a3f1791aa2995cbb725affb2eef41e0f977feeca604c5591e0fd13d66ee4587332517ac6beed0a1a19aea874e16ce5a52062f0c87c74855b90d8
+MISC ChangeLog-2015 3969 SHA256 7ae12058a211299edeaffaacbc023f86047e057a8d4f8746298f62049a8dfee8 SHA512 1ee8a96de47e9612d94ef6e3b01c33597d0df5411e6d8209d10ef95b737f3cd41f2d237efb608220050ea7c5d8d26aa1c04f795d0fcef37110445b22d797ff5a WHIRLPOOL 5475cbf722f5bd5519e66c4b46f88511accbf058799f9e2ea62f21df49fda1755b53365e2dc52f29d64665b2748f85b1c9a698fcc9a8c1481644e8a5f502210d
+MISC metadata.xml 400 SHA256 eb66806624a32c2899cdbfeab6ebbef7f6cf210d7d289e39a48389dec5248e7c SHA512 bdda13940bb23190d6d7c43f69d77a231413dbdfd81de5e35568da70e4ab2bc9906cab76890e78da7b1789a376c44658e476ba7c0a4822e7a97b0f37ce36f0f4 WHIRLPOOL 341f1ffb512ff4402c83a8e636b65365f29ec626d48534d13a7cdaa25777cf01a7bef97d08bce902c622ed3ed7e1d1d531af550d577c566b8363f2742194040b
diff --git a/dev-python/python-levenshtein/files/genextdoc.py b/dev-python/python-levenshtein/files/genextdoc.py
new file mode 100644
index 000000000000..54ce008e88ac
--- /dev/null
+++ b/dev-python/python-levenshtein/files/genextdoc.py
@@ -0,0 +1,214 @@
+#!/usr/bin/python
+# Simple Python extension module doc generator.
+# @(#) $Id: genextdoc.py,v 1.4 2003/12/23 22:38:28 yeti Exp $
+# Written by Yeti <yeti@physics.muni.cz>
+# This program is in the public domain.
+import re, sys, types, inspect
+from cgi import escape as q
+
+args = sys.argv
+args.pop(0)
+if not args: sys.exit(0)
+
+selfcontained = False
+if args[0].startswith('-') and 'selfcontained'.startswith(args[0].strip('-')):
+    selfcontained = True
+    args.pop(0)
+if not args: sys.exit(0)
+modname = args.pop(0)
+plain_docs = args
+
+html_head = """\
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head><title>%s %s</title></head>
+<body>
+"""
+
+html_foot = """\
+</body>
+</html>
+"""
+
+def split_para(doc):
+    p = []
+    for x in doc.split('\n\n'):
+        x = x.strip()
+        if x.find('\n>>>') > -1:
+            h, t = x.split('\n>>>', 1)
+            p.append(h)
+            p.append('>>>' + t)
+        else:
+            p.append(x)
+    return p
+
+def get_doc(members):
+    try: doc = members['__doc__']
+    except KeyError: pass
+    if doc: return doc
+    try: doc = 'Python module %s' % members['__name__']
+    except KeyError: pass
+    if doc: return doc
+    else: return 'A Python module'
+
+def format_synopsis(synopsis, link=False, classname=None):
+    lst = synopsis.split('\n')
+    for i, s in zip(range(len(lst)), lst):
+        m = re.match(r'(?P<func>\w+)(?P<args>.*)', s)
+        args = re.sub(r'([a-zA-Z]\w+)', r'<var>\1</var>', m.group('args'))
+        func = m.group('func')
+        if link:
+            if classname:
+                func = '<a href="#%s-%s">%s</a>' % (classname, func, func)
+            else:
+                func = '<a href="#%s">%s</a>' % (func, func)
+        lst[i] = func + args
+    return '<br/>\n'.join(lst)
+
+def format_para(p):
+    if not p: return ''
+    doc = ''
+    if p.startswith('>>>'): doc += '<pre>\n%s\n</pre>\n' % q(p)
+    else:
+        if not re.search('^- ', p, re.M): doc += '<p>%s</p>\n' % q(p)
+        else:
+            p = re.split('(?m)^- ', p)
+            if p[0]: doc += '<p>%s</p>\n' % q(p[0].strip())
+            del p[0]
+            doc += ('<ul>%s</ul>\n'
+                    % '\n'.join(['<li>%s</li>' % q(p.strip()) for p in p]))
+    return doc
+
+def preprocess_routine(name, doc):
+    parts = split_para(doc)
+    if parts: summary = parts.pop(0)
+    else: summary = 'FIXME'
+    if parts and re.match(r'\w+\(.*\)', parts[0]): synopsis = parts.pop(0)
+    else: synopsis = name + '()'
+    return {'synopsis': synopsis, 'summary': summary, 'details': parts}
+
+def analyse(obj):
+    members = obj.__dict__
+    if inspect.isclass(obj):
+        main_doc = preprocess_routine(obj.__name__, get_doc(members))
+        bases = [x.__name__ for x in obj.__bases__]
+    else:
+        main_doc = split_para(get_doc(members))
+        bases = []
+    routines = {}
+    classes = {}
+    data = {}
+    for name, m in members.items():
+        if name.startswith('__'): continue
+        try:
+            mro = list(inspect.getmro(m))
+            if mro[0] != m: continue
+        except AttributeError: pass
+        if inspect.isroutine(m):
+            try: doc = m.__doc__
+            except KeyError: pass
+            if not doc: doc = 'FIXME'
+            routines[name] = preprocess_routine(name, doc)
+            continue
+        if inspect.isclass(m):
+            classes[name] = analyse(m)
+            continue
+        t = type(m)
+        if t == types.IntType or t == types.StringType:
+            data[name] = repr(m)
+        else:
+            data[name] = m.__doc__
+    return {'name': obj.__name__, 'doc': main_doc, 'routines': routines,
+            'classes': classes, 'data': data, 'bases': bases}
+
+def format(tree, level, prefix=''):
+    name = tree['name']
+    if prefix: fullname = '%s-%s' % (prefix, name)
+    else: fullname = name
+    ##### Main doc
+    doc = []
+    if level > 1:
+        doc = ['<h%d id="%s">' % (level, fullname)]
+        try: doc.append(format_synopsis(tree['doc']['synopsis']))
+        except TypeError:
+            doc.append(name)
+        doc.append('</h%d>\n' % level)
+        if tree.has_key('bases'):
+            doc.append('<p>Bases: %s.</p>\n' % ', '.join(tree['bases']))
+    try: lst = [tree['doc']['summary']] + tree['doc']['details']
+    except TypeError: lst = tree['doc']
+    for p in lst: doc.append(format_para(p))
+    ##### Table of contents
+    routines = tree['routines'].keys()
+    classes = tree['classes'].keys()
+    data = tree['data'].keys()
+    if routines:
+        routines.sort()
+        if level == 1: doc.append('<p><b>Functions:</b></p>\n')
+        else: doc.append('<p><b>Methods:</b></p>\n')
+        doc.append('<ul class="ltoc">\n')
+        for r in routines:
+            synopsis = tree['routines'][r]['synopsis']
+            doc.append('<li>%s</li>\n' % format_synopsis(synopsis, True,
+                                                         fullname))
+        doc.append('</ul>\n')
+    if classes:
+        classes.sort()
+        doc.append('<p><b>Classes:</b></p>\n')
+        doc.append('<ul class="ltoc">\n')
+        for r in classes:
+            synopsis = tree['classes'][r]['doc']['synopsis']
+            doc.append('<li>%s</li>\n' % format_synopsis(synopsis, True,
+                                                         fullname))
+        doc.append('</ul>\n')
+    if data:
+        data.sort()
+        doc.append('<p><b>Data:</b></p>\n')
+        doc.append('<ul class="ltoc">\n')
+        for r in data:
+            doc.append('<li>%s = %s</li>\n' % (r, q(tree['data'][r])))
+        doc.append('</ul>\n')
+    ##### Functions
+    if routines:
+        if level == 1: doc.append('<hr/>\n')
+        doc.append('<dl>\n')
+        for r in routines:
+            doc.append('<dt id="%s-%s">' % (fullname, r))
+            rt = tree['routines'][r]
+            doc.append('%s</dt>\n<dd>' % format_synopsis(rt['synopsis']))
+            for p in [rt['summary']] + rt['details']:
+                doc.append(format_para(p))
+            doc.append('</dd>\n')
+        doc.append('</dl>\n')
+    ##### Classes
+    if classes:
+        for r in classes:
+            doc.append('<hr/>\n')
+            doc.append(format(tree['classes'][r], level+1, fullname))
+    return ''.join(doc)
+
+exec 'import %s as __test__' % modname
+doctree = analyse(__test__)
+document = format(doctree, 1)
+print modname + '.html'
+fh = file(modname + '.html', 'w')
+if selfcontained: fh.write(html_head % (modname, 'module API'))
+fh.write(document)
+if selfcontained: fh.write(html_foot)
+fh.close()
+for f in plain_docs:
+    try: fh = file(f, 'r')
+    except: continue
+    document = fh.read()
+    fh.close()
+    print f + '.xhtml'
+    fh = file(f + '.xhtml', 'w')
+    if selfcontained: fh.write(html_head % (modname, f))
+    fh.write('<h1>%s %s</h1>\n\n' % (modname, f))
+    fh.write('<pre class="main">\n')
+    fh.write(document)
+    fh.write('</pre>\n')
+    if selfcontained: fh.write(html_foot)
+    fh.close()
diff --git a/dev-python/python-levenshtein/metadata.xml b/dev-python/python-levenshtein/metadata.xml
new file mode 100644
index 000000000000..fd06134a3ea0
--- /dev/null
+++ b/dev-python/python-levenshtein/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">python-Levenshtein</remote-id>
+    <remote-id type="github">miohtama/python-Levenshtein</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.11.2.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.11.2.ebuild
new file mode 100644
index 000000000000..1e12a16cff6c
--- /dev/null
+++ b/dev-python/python-levenshtein/python-levenshtein-0.11.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+MY_PN="python-Levenshtein"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
+HOMEPAGE="
+	https://github.com/ztane/python-Levenshtein/
+	https://pypi.python.org/pypi/python-Levenshtein/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ia64 x86"
+IUSE="doc"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*' pypy) ) )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' pypy )
+}
+
+python_compile_all() {
+	if use doc; then
+		einfo "Generation of documentation"
+		"${PYTHON}" "${FILESDIR}/genextdoc.py" Levenshtein \
+			|| die "Generation of documentation failed"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( Levenshtein.html )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild
new file mode 100644
index 000000000000..cd4d52bf3e76
--- /dev/null
+++ b/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+MY_PN="python-Levenshtein"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
+HOMEPAGE="
+	https://github.com/ztane/python-Levenshtein/
+	https://pypi.python.org/pypi/python-Levenshtein/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 x86"
+IUSE="doc"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*' pypy) ) )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' pypy )
+}
+
+python_compile_all() {
+	if use doc; then
+		einfo "Generation of documentation"
+		"${EPYTHON}" "${FILESDIR}/genextdoc.py" Levenshtein \
+			|| die "Generation of documentation failed"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( Levenshtein.html )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-linux-procfs/Manifest b/dev-python/python-linux-procfs/Manifest
new file mode 100644
index 000000000000..eb7228b3fd42
--- /dev/null
+++ b/dev-python/python-linux-procfs/Manifest
@@ -0,0 +1,6 @@
+DIST python-linux-procfs-0.4.6.tar.xz 52640 SHA256 4ff41302b213ba271ee2e367cb2eed4ac258f7fb3aec3e23de6d6c24fb68e5f2 SHA512 81dc936c76c2b3272dde85148bfa929e13531c43f7aa61da3def7546fd8c2a257b130f8ae100f1d53936d3dfaebb1ef5b52c022d146f3ed7ef00359a24d05b89 WHIRLPOOL 5d1e32fcc6002b3482ab1ed5a0d40be1a2fb73df4c405a6fe0ae0210e4f8d66897f749a48fca7674a596b6ff8ffe454fb9852ae87d4b7d9d04f0e0943ea20679
+EBUILD python-linux-procfs-0.4.6.ebuild 533 SHA256 e93309c0855c2f7504d66de2daf0802ec7c3708a40205351b741fa301c0ef29f SHA512 09afc67c4bac441a62525d19b64e9226631f168faa946af88513a8a7506355061ac3aeb3cfdb025eb16ad469730b8cff5f209b8d93e10542db75d06a8a29bafd WHIRLPOOL fc8a753fcea5676dfb72f13a4957d324b4baf1295e6b477dce901f7774180ae905c8b9f7995beb4b4bc0a8241316b57998579e1da598d25f1a0f0e29fa1fe2e3
+EBUILD python-linux-procfs-9999.ebuild 570 SHA256 da928bd2873714b89fa7042c9b4506e7cbaa9079d196330096dfcc2d609e86b7 SHA512 b6e14a493522aec504bbc8869c7725394140a89a18311b20093fe1c66527ce59e39188201ab82fdf7bdbbe281b045cd8d4bd2ee01f13c3a75100e2dd7a6da552 WHIRLPOOL f071c3155f17d691ef1b9471be98547a9da9c2229e148254146aece7509fcbbd83c43df4ce07727bbbed2486119763b2f30f4785f11fffddf85f8f29d7e424ef
+MISC ChangeLog 2288 SHA256 65c090184b61d48f65fd3626a117e3d769e10897f7bb76855b56a250f7e2ec18 SHA512 424e07fda9e850066cd155a5fa7fe152928823994e767ce7a864d5e4393d7ff98ea94e1f6aa93004070d1bc35532c7f431123cb9c441a3f0ee9849da46374f70 WHIRLPOOL 496cfc49ae5a26d50ca91cd89a7d21d0f0a5f43de2addab94904ecce9f2250a5325ea5f1fdf1fab13e33449b0c13d0f3e721ede1eda6c590b10f7a1537d6975d
+MISC ChangeLog-2015 789 SHA256 6f1bb530456322f6e821ecc3adaee94cf417a0c53bb3ea0bb930cfabb6082ddf SHA512 2250dda8eee70fabf26862f34e309a3a87de005d1734bf7487d604b5b41ef7ffdf16f977f19bd2db92dc38439e870ab277ea4b9d6e541b79734a056241dc5f48 WHIRLPOOL 699b9a8ce86b2a662747036487c4edb5bb1124c88c71f9f5b390d26937cdfe16a34cc27e0df816b66e5360c5f8bf944ad6785fc8b6ad1e71f5c2b9075d33b60a
+MISC metadata.xml 237 SHA256 ffb571839c57797d282263369646d2bba2662601a45f7bb3251bb97f716554a6 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f WHIRLPOOL 60d6da846c983457e038ea5ba3c0bf48f939c9586610985a14cac9772fd1d45d781a643abc16482f232f3028e44fe99fe1a382deaebf6589602fc244a4460e3f
diff --git a/dev-python/python-linux-procfs/metadata.xml b/dev-python/python-linux-procfs/metadata.xml
new file mode 100644
index 000000000000..a535b8852829
--- /dev/null
+++ b/dev-python/python-linux-procfs/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>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-linux-procfs/python-linux-procfs-0.4.6.ebuild b/dev-python/python-linux-procfs/python-linux-procfs-0.4.6.ebuild
new file mode 100644
index 000000000000..18a3d31d2dae
--- /dev/null
+++ b/dev-python/python-linux-procfs/python-linux-procfs-0.4.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python classes to extract information from the Linux kernel /proc files"
+HOMEPAGE="https://www.kernel.org/pub/scm/libs/python/python-linux-procfs/
+	https://kernel.googlesource.com/pub/scm/libs/python/python-linux-procfs/python-linux-procfs/"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
diff --git a/dev-python/python-linux-procfs/python-linux-procfs-9999.ebuild b/dev-python/python-linux-procfs/python-linux-procfs-9999.ebuild
new file mode 100644
index 000000000000..731c07adc021
--- /dev/null
+++ b/dev-python/python-linux-procfs/python-linux-procfs-9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 git-2
+
+DESCRIPTION="Python classes to extract information from the Linux kernel /proc files"
+HOMEPAGE="https://www.kernel.org/pub/scm/libs/python/python-linux-procfs/
+	https://kernel.googlesource.com/pub/scm/libs/python/python-linux-procfs/python-linux-procfs/"
+EGIT_REPO_URI="https://www.kernel.org/pub/scm/libs/python/${PN}/${PN}.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
diff --git a/dev-python/python-ly/Manifest b/dev-python/python-ly/Manifest
new file mode 100644
index 000000000000..b7967873b5c3
--- /dev/null
+++ b/dev-python/python-ly/Manifest
@@ -0,0 +1,6 @@
+DIST python-ly-0.9.4.tar.gz 175768 SHA256 c2f87999260af3c9ea00c9997dae1e596fac40f45905d8b7e24e0f441112d63c SHA512 0d94001d6e4d4eb750a974a67cdce1d3b2f09f693b74cb18fa9dc20dac986373380a58e138ab1f7a427bcc3d2de6343e664a6d58ce8bb23b3804fef68a8a9069 WHIRLPOOL 55485a9eea04b802ddc69b57657c267c91af6a67caa0fb142696115f019e653e3a186777b59d48331d61b0029d1d8d7969c41207e4a90900733ea7da0f6c3c16
+DIST python-ly-0.9.5.tar.gz 174780 SHA256 d46151b595093e5d4dc9d5597ba1719f0c473e44de9b80c835e25574cf6e2875 SHA512 f43aa4fce0af970dd64b0cfb75caef57749048d4eb088de6e08e820935c359203de9e99134a0248f7dc26067d0e4eaf2b373a5a2b746e09dea7997437f99812b WHIRLPOOL 778efaac82393122958670ea005d924b45b52f3336cbf3bb02558ec7f82ebdc2269a355f89a53d32e2546a7aa38ebe7ccdc47cc7a02642045f26dfdf5b31b4e9
+EBUILD python-ly-0.9.4.ebuild 426 SHA256 5404412c0c2f9a71a40a33519aa8fcc627a1acf985e3167c688dd23987f45a57 SHA512 ea0150899048dc9324cc2de1ae3eea0a0e6a084500460a288661b5f5709fe46967e4f946821445669c91f48cd101859d17a6a9bc76345d55ec6ae0d6fff7acf9 WHIRLPOOL 4806eeb851dba32501105468dc9bb59226644a27a2a6c99c6863b161f6ed9fb275d95f5ca955349af5cec028f7fb952e7f47c5a006a5697061361decb1a95a71
+EBUILD python-ly-0.9.5.ebuild 430 SHA256 9af22258ecdd37f4eac61f647c79e3aa1d2747133ee3513cde07adb3dabf7968 SHA512 571d67469730d378041bd6c1f05c9b7b2aba554ad5c3ac4fbed32f97201e1c4daf414b715ba2392864c5ea8e275b0bce3a77932311ac96a40c558ff333d742c0 WHIRLPOOL 6569df403f897eec9eeb3bf784f5579447ed65ed193149d5128b16a469e9ac6009d6b6e94d8a4b50a24f32df64f7337f11ec057bbcf620744667946e36074750
+MISC ChangeLog 1502 SHA256 a43dfe25a2e67d43a16d47f50e69999f1a929e4becbe6bb721f1cd1d5de64385 SHA512 0383326975eab746a654dfbdb7465d3b083f91d5e4d1c832b86de640d8707ba5c24cca0631fcb6d740736c8d753c95f04776beea278fbaa63bfbb8af8d79b72e WHIRLPOOL 44e31d395aaa29c65f0fd263b21bc585687c34ce8a4cbbd28040b9f3b447cbb2e7a763b849d263c4659c48398b4d7e02750f95fb3685bd996233abdd12d8af30
+MISC metadata.xml 513 SHA256 978420bba00df3d089edb9f3da93cf289ad871a7bc7bf60772e32a4e97e0df0c SHA512 f90695e7f138a3c7a5397f0fe7170fd1ceac05245e70d922074c3b34b0ca426a12286a8451e02138be035f5fa94bdd9254e8e6f64c1464f52bdf4ec398403cbb WHIRLPOOL 67eba9faca49cdf7acb6468bc5ac26abaa00366894f1e9e0210a3355ab134b6b05013ff33b8e2412f73d6184ff8b1f3800b0b74a816baf4f2efaae16a8472ce7
diff --git a/dev-python/python-ly/metadata.xml b/dev-python/python-ly/metadata.xml
new file mode 100644
index 000000000000..06735e495ec0
--- /dev/null
+++ b/dev-python/python-ly/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>karl.j.linden@gmail.com</email>
+    <name>Karl Linden</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">python-ly</remote-id>
+    <remote-id type="github">wbsoft/python-ly</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-ly/python-ly-0.9.4.ebuild b/dev-python/python-ly/python-ly-0.9.4.ebuild
new file mode 100644
index 000000000000..ed92b771d6c7
--- /dev/null
+++ b/dev-python/python-ly/python-ly-0.9.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tool and library for manipulating LilyPond files"
+HOMEPAGE="https://github.com/wbsoft/python-ly http://pypi.python.org/pypi/python-ly"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/python-ly/python-ly-0.9.5.ebuild b/dev-python/python-ly/python-ly-0.9.5.ebuild
new file mode 100644
index 000000000000..7c579f08c342
--- /dev/null
+++ b/dev-python/python-ly/python-ly-0.9.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tool and library for manipulating LilyPond files"
+HOMEPAGE="https://github.com/wbsoft/python-ly http://pypi.python.org/pypi/python-ly"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/python-lzo/Manifest b/dev-python/python-lzo/Manifest
new file mode 100644
index 000000000000..9221ac67571d
--- /dev/null
+++ b/dev-python/python-lzo/Manifest
@@ -0,0 +1,8 @@
+AUX lzo2compat.patch 417 SHA256 db59a49162a6b79055f9bff2b9140f2a36a0d423cf0d62caaa97da39863190d0 SHA512 eb433f90ac40fc85de8872f2bf94805712ff4b085bbcac168aec230a55b325ab5474746b2aa0a81b0e58b04e9da50e10877bbee66768106a03f7d83c97c7ffb3 WHIRLPOOL 8a32e93774449157aa427c92dc97c273b8073bff0cf85fcc290fd47ec56da30a686ebe5970b0aa07d233f12aa165a0366076ee144923fbbc1c28f8172b99ad56
+DIST python-lzo-1.08.tar.gz 13046 SHA256 2865afe7b995844bf80af94441d1ccf908b0e3aba3eacf5ba602f23e748476c4 SHA512 94b33e3b0e62b9c8a97147507f4516706d25d62c63ea938f0748e520a3e27760f0e3be142cb3e68aea132ae06759c91b3a4dac8e5010cdfab633e6c8d5904d8c WHIRLPOOL 84bcf130df8341ff145d895bc814b58ec2183c15ffedbc345aa6eb89931f22a9c78899c50b7a054beef9d7ca0b0c4be4e5e407a0ee794ee1830e2c6c9e796a31
+DIST python-lzo-1.11.tar.gz 13823 SHA256 38a0ea4ceb27cdd8e3526509fe1b7a936e5dfa57c64608fd32085c129e8be386 SHA512 580c68d2a5fdc43f6cb904507795c25b686c42074f217d067f51b336afa75d3eea10fcb7925c84aea352ce4383c591ff70583bef6c2fbc74116487ae87e1f87f WHIRLPOOL 1773200bbe7dbfe87e121aac733595d713eda4a4139241b11078dca617722a01c4fd5aa041d15be161de6b82dd4982f077c18a7f4edcc9fd18a1d3519eb8c992
+EBUILD python-lzo-1.08-r1.ebuild 622 SHA256 133d58ae211d14e892e015b3ceaacf7105772eb831d7b30a53cb542edabd8e54 SHA512 908c281da215817826e0b9b2dbbc3b5b24179c504d0ddf2aa5b7b58a766a023a52f713a84f61a387518323658850b061c29a48babcee461624711b8d17c05fc7 WHIRLPOOL 3c8172ca58d12ecfa76c6758bec0741a2c92b599cac7871ce0235227966e61349ce1be7c51385a67f1b361acaeb7553ec0605140cd74228f7639ae433deffa94
+EBUILD python-lzo-1.11.ebuild 719 SHA256 359c12be32da8731b3b0d45bb6aa950663370cb5c850e3d9b5b2698c525efbb4 SHA512 d060093a27551a7ae89244161056134d15c16bc7a6e34b718bffe0318fd6a834eaebc8afa6d488f0ec11ddb8f6c583d72ef7b1efd2ad99dbd5f782b7f9b71c0a WHIRLPOOL 00a45c73772bb5cf17dfd1e79e2bfdc8ce558f4bdf29b18b251d4f678d4ba7dd70782266c649fdf384a056a20e5d0abe0081280a029cad23218eef0b3f76756d
+MISC ChangeLog 2467 SHA256 0e3f63ecda37e5b5ec1bf9b48cf959b4593df7860789208fdbfc88a8fd790269 SHA512 43eeeeec4ae90f00cceb0b896225a2150f4170517e952e88e72cdae4a6aa58ca1438fa4081eda72837d1d8c3f4ffdf5d6feb1005031cfb6c9707f1e672c633df WHIRLPOOL b4f5fb5b0529af702ece62768e6aac96eb8148acd3e0db46fbf52ef6e38fa6dd9f1c32d0fad9ee067ccd41550c23a9db0c2eb2f7579b11641e1f93f4603f7845
+MISC ChangeLog-2015 1275 SHA256 99af70d571be4c721fb2c2768362e5aaa24536984aee73474f5e8f9e33551588 SHA512 72cd5a594b484003599a285d16876395843762c5ae219213aa2b135542f761448cfd51f5140521b20f004cb4f3d4150d3d59fe2a4aa15a8e2ca02e7c29083b04 WHIRLPOOL ca3d537ea578dc0506e2d99ede73bb431e48ea90d2b985683efe3dfebd73bec253fd81e847bca4dcc5a7d1b78f1463147858867c3a0c4ac3636eaed55aa33339
+MISC metadata.xml 385 SHA256 2cd95cfe0fd92a8f45a5a2501117b0349b53a41ad100a3036aef7acc39f9475f SHA512 634d30e62ce3a8c09b3de241642e9ce8b059d9d3ff02e6530642dea4b0b4bcc8f108566bdc5ba52f6e63214546e11f734bdc094ef60ad13197b9f74cab71d03c WHIRLPOOL d745918c449bdab4e4d84db92a1b787098076454d407fa8650c9a0d1688bfed33cc84bf7302be35a5f29ddadb362b1d0379c57ec1f1cb30a8e6853dbe499ac9e
diff --git a/dev-python/python-lzo/files/lzo2compat.patch b/dev-python/python-lzo/files/lzo2compat.patch
new file mode 100644
index 000000000000..6ce728753df6
--- /dev/null
+++ b/dev-python/python-lzo/files/lzo2compat.patch
@@ -0,0 +1,13 @@
+--- setup.py
++++ setup.py
+@@ -24,8 +24,8 @@
+     include_dirs.append(os.path.join(CURL_DIR, "include"))
+     extra_objects.append(os.path.join(CURL_DIR, "lzo.lib"))
+ else:
+-    libraries = ["lzo"]
+-    ##include_dirs.append("/usr/local/include")
++    libraries = ["lzo2"]
++    include_dirs.append("/usr/include/lzo")
+     ##library_dirs.append("/usr/local/lib")
+     ##runtime_library_dirs.append("/usr/local/lib")
+ 
diff --git a/dev-python/python-lzo/metadata.xml b/dev-python/python-lzo/metadata.xml
new file mode 100644
index 000000000000..7a73a15e9a73
--- /dev/null
+++ b/dev-python/python-lzo/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">python-lzo</remote-id>
+    <remote-id type="github">jd-boyd/python-lzo</remote-id>
+  </upstream>  
+</pkgmetadata>
diff --git a/dev-python/python-lzo/python-lzo-1.08-r1.ebuild b/dev-python/python-lzo/python-lzo-1.08-r1.ebuild
new file mode 100644
index 000000000000..2c2c9210601d
--- /dev/null
+++ b/dev-python/python-lzo/python-lzo-1.08-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils prefix
+
+DESCRIPTION="Python interface to lzo"
+HOMEPAGE="http://www.oberhumer.com/opensource/lzo/"
+SRC_URI="http://www.oberhumer.com/opensource/lzo/download/LZO-v1/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-libs/lzo:2"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	"${PYTHON}" tests/test.py || die "tests failed"
+}
+
+src_prepare() {
+	epatch "$(PREFIX_LINE_MATCH='/##/!' \
+		prefixify_ro "${FILESDIR}"/lzo2compat.patch)"
+}
diff --git a/dev-python/python-lzo/python-lzo-1.11.ebuild b/dev-python/python-lzo/python-lzo-1.11.ebuild
new file mode 100644
index 000000000000..34f5c61abb3f
--- /dev/null
+++ b/dev-python/python-lzo/python-lzo-1.11.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to lzo"
+HOMEPAGE="https://github.com/jd-boyd/python-lzo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-libs/lzo:2"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+src_prepare() {
+	distutils-r1_src_prepare
+	PREFIX="${EPREFIX}"
+}
+
+python_test() {
+	distutils_install_for_testing
+	PYTHONPATH="${TEST_DIR}"/lib nosetests -v || die "tests failed"
+}
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
new file mode 100644
index 000000000000..eae5ed102dfe
--- /dev/null
+++ b/dev-python/python-magic/Manifest
@@ -0,0 +1,7 @@
+DIST python-magic-0.4.10.tar.gz 3950 SHA256 79fd2865ec96074749825f9e9562953995d5bf12b6793f24d75c37479ad4a2c3 SHA512 8dadfd069bbca574a159dc034fca84fb110a3015ba54fa62c715006b586a5fd10373a5108a4847887bd86c6b7f2c4da90dfb7041cd5e4d51829ac1b94b8e1a03 WHIRLPOOL de890b593b062475a67c1286e8b6f2a1076cc8f0a04281d268f9d72b6df2b457e2b86a14743896283011c27babaf037ecf84d4f02939472dda7ee0114a622a1e
+DIST python-magic-0.4.13.tar.gz 133478 SHA256 604eace6f665809bebbb07070508dfa8cabb2d7cb05be9a56706c60f864f1289 SHA512 2b7104a21a08c54ecb729c00da6922f151f2c69851ab45de681fd620a82adf60c9fdc48b0d5338a48039a318cac2aa5b3bb4ebfa8c6f84708c9a8cf04fc5b21a WHIRLPOOL 34f446662b078de8134754f785fea36461a01094c66ed33c86eca7b78f9c5bc8da930682ebce32874e781379fd0972a05f1fed2b3af15e81ab8453c50324adea
+EBUILD python-magic-0.4.10.ebuild 610 SHA256 daa04669ba31be98f831573ea89340e2f2445211e82e5bf3238e778e83402142 SHA512 58275f8d490033b415fd2e95caeffbe04ea76bcf39186d33ea830e1f7c8a42bc7996286d7ce4cc8b2f18198325603b3c9f429d2ba91ee0c5041f099384177efb WHIRLPOOL 9e1c967283a045ef8e0b74b86871c43dcfcbecc67485542e7f32c1662f0781f807549be661d44015242ef886a5a9f8516f0aa6647f22b91ee5288c1ebb1a85d4
+EBUILD python-magic-0.4.13.ebuild 547 SHA256 0de753b75a2003fcf0c34e0b2f4dd2f60fdc5d8655020146dcdb93b9c375e91f SHA512 c46a6345fd75d5176ac8c4d3c375844a665d6ae9db735f1959551fbf3838cda2d4e4290f6e6112ccb0708eb6c55364a7005b7ab8dfd27118c1816f1f55345643 WHIRLPOOL 79202576616c5c3771c9e4c8458d24e711cd9dc077ef338ebfc76b2e6dd82d939238e806c7852ea8419d0cb6c56b50bde5922cf571f74d16ee48d5f58f2fb668
+MISC ChangeLog 3287 SHA256 79f52916b4b71a0ececdbff5482b0d8a1db7e9900472155e99ebf57c13d08de3 SHA512 957238d6669d203293e73adac35c910f6d1791f6859d83b46c0ffcae3eba142fa99796a7b0bfdde4fc5495719894d75f62097fd85b974ae786531548a1d0f7c0 WHIRLPOOL a17811690d04de079dcca74c56fdc55f9a666a21e04436595e54fb28313ea454e9b1a46ee183eeb70b32775d725a96206994fb9e6393ef6586b6b80d69e94eb1
+MISC ChangeLog-2015 1745 SHA256 06d496a750267cc2d4155ee663ba54da61330897390fc12e6f23eca86e28cfbd SHA512 bae15faa346fff88cee6b84c008f9038eb8c61f27564f1df69795e2e63fd1914f8516b848132ab5f474e45cb6d4218d7b38d69fbdca175a55729a2a87256c828 WHIRLPOOL 85eaeb6e08c12d1b3dd638a51fd20159f921899a1a8b6caf9ca6fbeef9ec9051291453cc935eeed510b679929531d9a2ab017545671a426952dfd123b0957134
+MISC metadata.xml 495 SHA256 df84bb5a5b0a76fd218f780f50a3c13f499af4c4124ac08187ebfde031133b6a SHA512 014c7f81cb02bc8e06ff0f0cebbe15954f48715bcbb2fb34a0d9ab7291447a18359597592f026ac3d5b2082381cc9487257351dbde1bb7a2ed0ed7066563bdfa WHIRLPOOL bc8edd7ca72a009a6daecea4b981e99f0d00b54d6a2053b2b1a8a5e6ff1f1ce9887b678b5472c262390dee03f8b7643639900b7d67fe1c7e26b9fa2ab54da28f
diff --git a/dev-python/python-magic/metadata.xml b/dev-python/python-magic/metadata.xml
new file mode 100644
index 000000000000..fb7c68fe033c
--- /dev/null
+++ b/dev-python/python-magic/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>thev00d00@gentoo.org</email>
+    <name>Ian Whyman</name>
+  </maintainer>
+  <longdescription>Python interface to the libmagic file type identification library.</longdescription>
+  <upstream>
+    <remote-id type="pypi">python-magic</remote-id>
+    <remote-id type="github">ahupp/python-magic</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-magic/python-magic-0.4.10.ebuild b/dev-python/python-magic/python-magic-0.4.10.ebuild
new file mode 100644
index 000000000000..bf88e5cd746b
--- /dev/null
+++ b/dev-python/python-magic/python-magic-0.4.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Access the libmagic file type identification library"
+HOMEPAGE="https://github.com/ahupp/python-magic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ia64 x86"
+IUSE=""
+
+RDEPEND="sys-apps/file[-python]"
+DEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# https://github.com/ahupp/python-magic/issues/97
+RESTRICT="test"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-magic/python-magic-0.4.13.ebuild b/dev-python/python-magic/python-magic-0.4.13.ebuild
new file mode 100644
index 000000000000..9e52235777b7
--- /dev/null
+++ b/dev-python/python-magic/python-magic-0.4.13.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Access the libmagic file type identification library"
+HOMEPAGE="https://github.com/ahupp/python-magic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~x86"
+IUSE=""
+
+RDEPEND="sys-apps/file[-python]"
+DEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-magnumclient/Manifest b/dev-python/python-magnumclient/Manifest
new file mode 100644
index 000000000000..1be54999d19f
--- /dev/null
+++ b/dev-python/python-magnumclient/Manifest
@@ -0,0 +1,4 @@
+DIST python-magnumclient-2.3.1.tar.gz 74501 SHA256 16e2f6923b1ca987bb71f8303b1bab42ed55516cbc9a4845ceebc37c27f3c7f0 SHA512 17af04eeb22d386bd43d7d8e49a418b7b577847fd7ee5751880ac8706fd44993c5af43bd347e0a431013fcbd6ff220e4f38818f95ae0456f7f6cb6ce8de606e3 WHIRLPOOL e72e53bc36196fefa034d3c0bb37dd4ff43a63b69f9516ea1696149b48362dd469dc6f84369b9e4cc64f162cab162bcf6417d9047dc3e15363b4c2c34eb8d3f9
+EBUILD python-magnumclient-2.3.1.ebuild 1665 SHA256 655a57302ab1635c97ecedeff288ead4408cfd3045f55321bc3cf80f3537c5d6 SHA512 751bf90dc497a42d79853d0e7fdf2e9656c3ae1bc591432e899f71ad1106618e9a5a4bdb3101a298e48fd0acf439428bb786570bbdd64e322b2c1b914255da24 WHIRLPOOL b64239fa805ee575b1369d6e8fb6bc4c5c398568ee2f29d2ad7ce5f4afd457e2b04c77d3b1353a5e9ab6338c4a44ab155e412de8fe3e9fd0f3d83e9eab16aa9c
+MISC ChangeLog 738 SHA256 68f0b6d6cc3c854bd4940298cd5ba71de62c81a2f4434226a7ed78f35c68ed0e SHA512 215520a0aa2bbab7ef956eb6cf8fca0c2a75784f64a70d2c2fe9cd96f138a17c1d4d67da54c2eff1e2dd7354d8e1af7e824d6074af9f31cf610eb529d002d769 WHIRLPOOL cc6846250fa5de39823e6fc0f336536dc3aa426ab1ebe39ea85df0b316aa0f3bc378d80b1b70d2b6cc765eb011b1ffcccb37792ab5b679d3e07faf6d382ab2c4
+MISC metadata.xml 613 SHA256 dce9aa65002fff6a4612fbede1d56aa1acaed574817cf355506d51b53a3afa13 SHA512 4e8c52ea8607e8d3b3de2594692da62682c8c17b1722ba6fec1379ff0e08bd9f1903c6792a0b0c5f0070772fd1ba04545ec4ed89318a58295a775ce3ac5d24df WHIRLPOOL 3f5f6203d5a4fe1e856f72a212aeeab896c766e02017839c29dfa7c8b1adf0a5746a3439d66f494565c6bb0ab6d9addc9e3c1af478c768060e3326d30372af5c
diff --git a/dev-python/python-magnumclient/metadata.xml b/dev-python/python-magnumclient/metadata.xml
new file mode 100644
index 000000000000..3f9d9adaf743
--- /dev/null
+++ b/dev-python/python-magnumclient/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+    This is a client for the OpenStack Magnum API.
+  </longdescription>
+	<upstream>
+		<remote-id type="pypi">python-magnumclient</remote-id>
+		<remote-id type="github">openstack/python-magnumclient</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-magnumclient/python-magnumclient-2.3.1.ebuild b/dev-python/python-magnumclient/python-magnumclient-2.3.1.ebuild
new file mode 100644
index 000000000000..b9dacd7f124a
--- /dev/null
+++ b/dev-python/python-magnumclient/python-magnumclient-2.3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Magnum API"
+HOMEPAGE="https://github.com/openstack/python-magnumclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.19.0[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.19.1[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.20.0[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.20.1[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-manilaclient/Manifest b/dev-python/python-manilaclient/Manifest
new file mode 100644
index 000000000000..aaac78e2bb4c
--- /dev/null
+++ b/dev-python/python-manilaclient/Manifest
@@ -0,0 +1,6 @@
+DIST python-manilaclient-1.11.0.tar.gz 167117 SHA256 5a6aa5002be88bf7d3af0d4439fab54b7288165cd17ccbd855c622184ea8b8fc SHA512 7427b3a54d75ad014d3b859a51d9693ab964a1a5376a64e396f16b308619f23183f610299ced2a76aeab2eddf47310435c7c654dec662dad9e13089d93e284b3 WHIRLPOOL d546d55739525eb3e30c217eaa2b7d5a3065299ac710bdabe99cb56980ba66b86ed8dd4048adf7b422811365f0eebe4417bfcb3ea010e034ed0add816afb0fba
+DIST python-manilaclient-1.14.0.tar.gz 193535 SHA256 21b5c2a0b2b74815db653cf3447fa3fd7cb9b8f221fcf46d5f692e79a5add4bd SHA512 9cfeffa8919af788b50b2753d722ee5472b45332a8e8dcfd290719344d1d6e7c7880ba0166ccc1c39b1eb15adaa1d8b012d923a04f4ba5b3a2a9774af981bb6a WHIRLPOOL 1492f8d38ece6e731f75d7437ad9a37f14cf4824025bbd18bc8411ed46cb86fde9483302b272c9e7fd8cae9588a7b295ab001897979b9a162bbfd92a69648fc2
+EBUILD python-manilaclient-1.11.0.ebuild 1298 SHA256 beb62da78c8185140c73df0e4eaf2a2a7f74740c892a07477695cbf4d38f3225 SHA512 e722417aad5ffd25840c22b307f595d5a1bd8350b3597776e681a5c12274a951b3989686feee3285896b4c741b35ee48e9079026178df94f42cb296c3c253034 WHIRLPOOL 06914ec675a617c49433b30401ffccda2ab54ca76934947eeb302fbb5d8fa158db8bbc46a19eb5dcc165356b3287509cbf597f62a7825847e22b8f8e5a32d656
+EBUILD python-manilaclient-1.14.0.ebuild 1339 SHA256 e9fd479cbd5613a13079986ea0fa4080ae885c0354019939ff2acc3498bc7569 SHA512 9c92f935951a86ef8c934f01c050d891061cdfed8f341cb5e4eed62533c92dd9f42c3938200935f320d4f6758610e435c009fa3d3939248706b010a41b3adb4e WHIRLPOOL d9bf759615f4d905db3ae7027bc6b5b9ad0ca6b506c6ec28ce552801b4109009e4812a76dfdc9203b7ea2a792cce726bb8572a5be17458c6f9c6a54cba8bbf31
+MISC ChangeLog 515 SHA256 6b295985af39da4834bb77ad082e00738c0da9cd345a548e41149ab106c49036 SHA512 f0282437a086b393dcb3d94233b75130842619fd3cb6377c106f7ed294714b4c6e24dc4a6a566e6860d15496d2e4cf2aaaada4773ad9dce86a182b0f2ae828e6 WHIRLPOOL f4c2872d0ca79e037a0aa28ccb09d6ec052720dcb56e8342ee64ad721a6dd830c3d1383c1e661a612534ed3752de7e730be1eb075e343d30a405df044bc8bd6d
+MISC metadata.xml 613 SHA256 399bf775e9cc78520b64d4f908d38b49ba9f87011d39c43b891cf5d72284d41e SHA512 e698157bb51e3ec3acb4497bc7ba1be589bfbc0451250c68389f1245a7e756e11e5bfb65bd4662e807680f20234082a149371b4c423ad63012babb4a0ca41a55 WHIRLPOOL bb9d6f0e51ed12c1584f4369ec88a9495ed82f1adc36278c8bca38aa4c6e3a6cdd5a2864f93472727c81f913d021d2c3d6ff0ab9d7085a397c8b884acef81b6a
diff --git a/dev-python/python-manilaclient/metadata.xml b/dev-python/python-manilaclient/metadata.xml
new file mode 100644
index 000000000000..98bf35a41868
--- /dev/null
+++ b/dev-python/python-manilaclient/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+    This is a client for the OpenStack Manila API.
+  </longdescription>
+	<upstream>
+		<remote-id type="pypi">python-manilaclient</remote-id>
+		<remote-id type="github">openstack/python-manilaclient</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-manilaclient/python-manilaclient-1.11.0.ebuild b/dev-python/python-manilaclient/python-manilaclient-1.11.0.ebuild
new file mode 100644
index 000000000000..5519d6c88cb9
--- /dev/null
+++ b/dev-python/python-manilaclient/python-manilaclient-1.11.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Manila API"
+HOMEPAGE="https://github.com/openstack/python-manilaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-manilaclient/python-manilaclient-1.14.0.ebuild b/dev-python/python-manilaclient/python-manilaclient-1.14.0.ebuild
new file mode 100644
index 000000000000..7e26fe8f4b34
--- /dev/null
+++ b/dev-python/python-manilaclient/python-manilaclient-1.14.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Manila API"
+HOMEPAGE="https://github.com/openstack/python-manilaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-memcached/Manifest b/dev-python/python-memcached/Manifest
new file mode 100644
index 000000000000..0a34abd5aba0
--- /dev/null
+++ b/dev-python/python-memcached/Manifest
@@ -0,0 +1,7 @@
+DIST python-memcached-1.53.tar.gz 35025 SHA256 af04ea031b271a54f085166773e028fe053fc1d9a58cd8b3c3a57945990bfb48 SHA512 33ffd2778025a8e15beddf1660c4b5c9f1ba144adab5c36fd679e15508015c00e3e1185b5cc179cfcfc556b7c3ab44ed9914089e5ce9db66a04d0a658dd38bb3 WHIRLPOOL 81b80a05010eec576ce8eb00ac4c799213bfc82af4dd3d3da138d02337d28dcb5fbefcbdf11e8d9344b307ba8b1ab2a770b8130fce2f732e484f283e2fe85aae
+DIST python-memcached-1.58.tar.gz 30562 SHA256 2775829cb54b9e4c5b3bbd8028680f0c0ab695db154b9c46f0f074ff97540eb6 SHA512 48f933f095751b476c122473fa1d9767cfe5c6c339a9ba71825a50cec23cbfc7b6493716458bfb1f2451c634c517519152105a2000be66bd0d389f94ea312138 WHIRLPOOL 391d91a7d40f1d85febf7f90f0593d315854caa6dac0c4f70c2c3ee7af79b049099406683436df6af0e879626d6b42f95eed6a0153ae3874a9b746998cd02b88
+EBUILD python-memcached-1.53-r1.ebuild 1214 SHA256 94f4010a7b4805b074aeedaa2f60f9889db1fa4319add9fc568c3b7a2bd7f207 SHA512 84754ac72f0e7236dba7603f519b8367d2c992fcae59624ebf64359c83ffa7fb5ec52f5200a4810a25f90b133ecaaa8c13d4b46eae16a4a5c5ea3ac73328e225 WHIRLPOOL 118d07807b9766d8ad4a63d8c6c79c6132bcb56175952a296367bd1885ed6873af5aa22a5dc9c4d6848e2a390e2e66c5771647056f147e4c50f1062d61830623
+EBUILD python-memcached-1.58.ebuild 1289 SHA256 269bf9e34734f8a303c15fb9c20f5af97bc2a225530b887ad27ee1a5a4d4d203 SHA512 84477ec80581050699080113a1b919fd2c021f6dea039ed47a489ad4be44c0e8e6513d62e87bb663008280a7342ab996630882e522fa0aa69e09b99488480468 WHIRLPOOL c541121c2785c24961f33534b176b91d335fec33e0cc5cc41e0f2b110a5af74593829ce5fd089b1bd2073fbb4e7ef1665ab740da1c1cb5c96cc6fc0cec305cc0
+MISC ChangeLog 4316 SHA256 fd0236c23663dd8e8bf10ea221061c57c95c77a771500fcdb4d48fbbd207c2bd SHA512 9e5c45a6525bb21bb9ab215668b29ff514d998781a600aa786850b676b36ebb660fb7a96ba92973c3b4549edaffb52f861faa86f25cc6dd86d958e2fa267905c WHIRLPOOL d67d4f592808f0557d39f7e0dfface5e30560d1730baab5662658888be10fa71aae80a9829878cc058caa64ee317fb21986b3007df2c60b29703b2f5fcaa5db8
+MISC ChangeLog-2015 5438 SHA256 09b76d264483e4ae6476489e534f588a2d20ab224498434cd939bd122075a94f SHA512 7c27b87c1f6abb8ca32d74aba6f13deabe1cf77c6ed59fa582adf583b5b47750a956b168468324f9983c41e6a207345148f8f9a4af2b29bdaea2011d1f5974d9 WHIRLPOOL b5e6162c5849f083ccf5b238ddd53c7f1ef928440a2507c69ca670a3928edfb97a4bbd1582da029ca56c203dab2ce7149fa01b24a9bbaa58adad4f4bf3685faa
+MISC metadata.xml 611 SHA256 9f130cdf0da61461233bafa93ab527c74167896a3ba46b4badb9bfd2741935ef SHA512 9070f42bf5f3fb721f41309c7a24f29168f1179f9327f1334dcd5bd7b38ae98bbc682c2f0cfb7874c8e20e92ce25bffdc5d3f21870316c6d35cd57e1049f8d90 WHIRLPOOL 566f88e3e112f8b107d1e33b3686c0b707e4eed3d24588946c28a5ac34b42c5e8c2470bf4955e85b8ee0db094401e422da14d6c188935ac59d9ea87f3eb89675
diff --git a/dev-python/python-memcached/metadata.xml b/dev-python/python-memcached/metadata.xml
new file mode 100644
index 000000000000..5a0000d36d7e
--- /dev/null
+++ b/dev-python/python-memcached/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+This is a Python based API (implemented in 100% python) for communicating with
+the memcached distributed memory object cache daemon.
+</longdescription>
+	<upstream>
+		<remote-id type="pypi">python-memcached</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-memcached/python-memcached-1.53-r1.ebuild b/dev-python/python-memcached/python-memcached-1.53-r1.ebuild
new file mode 100644
index 000000000000..d5b2923582c0
--- /dev/null
+++ b/dev-python/python-memcached/python-memcached-1.53-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python memcached client"
+HOMEPAGE="http://www.tummy.com/Community/software/python-memcached/ https://pypi.python.org/pypi/python-memcached"
+SRC_URI="ftp://ftp.tummy.com/pub/python-memcached/old-releases/${P}.tar.gz"
+
+LICENSE="OSL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( net-misc/memcached )"
+RDEPEND=""
+
+# Tests try to connect to memcached via TCP/IP. Please do not re-enable
+# until you get them all to pass properly while using the UNIX socket
+# only and not even trying to connect to memcached over TCP/IP.
+RESTRICT=test
+
+python_test() {
+	# Note: partial. Needs fixing. Stuff like that.
+
+	cd "${TMPDIR}" || die
+
+	local memcached_opts=( -d -P memcached.pid -s memcached.socket )
+	[[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
+
+	memcached "${memached_opts[@]}" || die
+
+	"${PYTHON}" memcache.py --do-unix || die "Tests fail with ${EPYTHON}"
+
+	kill "$(<memcached.pid)" || die
+	rm memcached.pid || die
+}
diff --git a/dev-python/python-memcached/python-memcached-1.58.ebuild b/dev-python/python-memcached/python-memcached-1.58.ebuild
new file mode 100644
index 000000000000..979976df4e01
--- /dev/null
+++ b/dev-python/python-memcached/python-memcached-1.58.ebuild
@@ -0,0 +1,48 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python memcached client"
+HOMEPAGE="
+	http://www.tummy.com/Community/software/python-memcached/
+	https://pypi.python.org/pypi/python-memcached"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="OSL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		net-misc/memcached
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+# Tests try to connect to memcached via TCP/IP. Please do not re-enable
+# until you get them all to pass properly while using the UNIX socket
+# only and not even trying to connect to memcached over TCP/IP.
+RESTRICT=test
+
+python_test() {
+	# Note: partial. Needs fixing. Stuff like that.
+
+	cd "${TMPDIR}" || die
+
+	local memcached_opts=( -d -P memcached.pid -s memcached.socket )
+	[[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
+
+	memcached "${memached_opts[@]}" || die
+
+	"${PYTHON}" memcache.py --do-unix || die "Tests fail with ${EPYTHON}"
+
+	kill "$(<memcached.pid)" || die
+	rm memcached.pid || die
+}
diff --git a/dev-python/python-meteor/Manifest b/dev-python/python-meteor/Manifest
new file mode 100644
index 000000000000..56c5d837426a
--- /dev/null
+++ b/dev-python/python-meteor/Manifest
@@ -0,0 +1,4 @@
+DIST python-meteor-0.1.6.tar.gz 7656 SHA256 014bd2fd61e73e8f67892a0114fbcb3185db3bc74f70990379aedb5b359a8667 SHA512 c654113714e7a4311d66d7390a996cce126bed2270e15f22791ddb8cec1afd5af321f24c8a83d8dc491c0959b8410fa91d43e2025534390486283f2da78a2233 WHIRLPOOL ab22fe7e64948b2c14aba8c67b36d1426b2183fb87a2c945521c81917f7d231a099101e1ff09a4d2a0e98565ad02947adebabf242ab11137e8a79f0bed2357ac
+EBUILD python-meteor-0.1.6.ebuild 493 SHA256 8779f56ec39e6b80a10702d499dae00f53be81f15eb1db0235ea6b0c1fb87ec3 SHA512 ddc0a0f44cdd42801c18d6ef7878065431c04b0606fa6df946d5d40db1b9a60e091bcadd0ab9ca2b3b5a268de5157ea7220e08a2d2867a7bc6a6084b85f057d2 WHIRLPOOL c5e22d9a007fd90990a378e5cc4385c02a83636d25b7ad5b3fd6d54e3fee7faa4dfd71ccdc4f82206b400fc4de56b03391fce77aadc8aa9e4857c69e65ab7e48
+MISC ChangeLog 1313 SHA256 e8cdf4fb9f317a88b105b4910a772a42cd71f0d8c5fbef26aa56ea526856342c SHA512 6d699539801e171d93811b790cda907bee6735e89ba054862a7cdba42b08ea2ba6a137888565debb5e240141bc894683100efef1fce707ff66fbbd5ca91a367f WHIRLPOOL b4ed8598bd4ee9c26ef69dc182f42cc4661bebf4ff64d391f04910978224c56d8f1d290c91545bdd57ab91a252b265e0d755d5439da98b6ed5497b18255c5df4
+MISC metadata.xml 584 SHA256 2a21a6f2a85ea4b550b17499946f61731380018c066f96f12a79f633ceead26b SHA512 73e3dc166d3e4f019fb9c12a4374a7537fa2529fee80a3ee83f74e75fc790b14dcbe209d171889f6c1f13ada3d510cfa6fd0525aefc02567d95869e2da1f9191 WHIRLPOOL 60c55bdccc074ace9e1035a745fbf742689b16023c538dd4ca43b1d607346406deee669f23375a47155eb34edbe46838b991cc32954b2282cebbef304c675326
diff --git a/dev-python/python-meteor/metadata.xml b/dev-python/python-meteor/metadata.xml
new file mode 100644
index 000000000000..484ef70351c2
--- /dev/null
+++ b/dev-python/python-meteor/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+    <description>Python team can take the package if they wish.</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">python-meteor</remote-id>
+    <remote-id type="github">hharnisc/python-meteor</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-meteor/python-meteor-0.1.6.ebuild b/dev-python/python-meteor/python-meteor-0.1.6.ebuild
new file mode 100644
index 000000000000..609739016d7b
--- /dev/null
+++ b/dev-python/python-meteor/python-meteor-0.1.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="An event driven meteor client"
+HOMEPAGE="https://pypi.python.org/pypi/python-meteor https://github.com/hharnisc/python-meteor"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-python/python-ddp[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/python-mhash/Manifest b/dev-python/python-mhash/Manifest
new file mode 100644
index 000000000000..cae00e1ec2e5
--- /dev/null
+++ b/dev-python/python-mhash/Manifest
@@ -0,0 +1,5 @@
+DIST python-mhash-1.4.tar.gz 17309 SHA256 c61973d91e0ca4cc092ae277346cab8b68279b9aa2fa0d49628daf1c7521e7a8 SHA512 bbb81b35cb19d2dc051c4912e75e679dddeeae39c781240bd3506f58cd5627f56e25cfeaffd2a84db231d0043ee31bedcb833e5245222a80774c51f25908d07a WHIRLPOOL 746b77b0d1ea898f3908ad49fb5701740a2761646faff0ab6c2fcf67164ca6270f1f6a0d6b42354666e2bf7cd90d9ccdfe95bc63f5497a8e86c3848551b62805
+EBUILD python-mhash-1.4-r1.ebuild 727 SHA256 de330703204f419ec797366182ea92cf04a030cbd99cdfb7d5b7bf5fa952c1e2 SHA512 628d940dee40db69f43b2f44a41ee5b9e43f4c61e9663101f73df2a5f3ce1a186b3538fe358f79c026ac0ed04ffc2c6dbbfb943d07eefd07a92fa68171bbafd4 WHIRLPOOL 3c92d21fd8d542c0cc7223244d00417eea1f5e8f09d33aecb0b567d99a55adc0e9bf4d0330d6055b5dde9e574dc286bbec96b746e8f6068112755a0cfae51632
+MISC ChangeLog 2446 SHA256 d25e25f27483b8ba533d98a2637e940bd654dfbddf01c05d40d656b6506975b3 SHA512 277bcd4b8cf92e381cee182bb49f828ec8e62169d18f0a2535d35bae6948124dc0226a554d7cb2cbd8d748d27110894a78b827d1b607d7671a775dc7365deea7 WHIRLPOOL 0a27ef5cff017f4b877573b46afb73f2d6c2fbecc523a604180adc8d4e29f405bbdd65e1c07ca77c31c0877e511b5ea56bb672d0d40a2ce26913bdc686122fce
+MISC ChangeLog-2015 2705 SHA256 fb9a70181ccf350ef07c3aa51142f9977966b9e8b3b34e1ccebd538907d0980e SHA512 24f982d133b88861d12be5362daf7b38116aadab23bfe0b1d73eb585c59be23feac9258123abdef4c5b086c267433ff296a826c257a86f0375b69f2dcb6e728d WHIRLPOOL c702b89173347995da4c886f66e257e7841672cce176fae53b52b8b826ceed35229940e77b399ff69bcde5bb0b301954731ce09f2f702258484d3f1dc415cf09
+MISC metadata.xml 426 SHA256 59779e61ba0375c75c4edf89332cc4bed74d49b2d26ddd3fe1b4ddd9915b688f SHA512 99f1476c3007c40fe76881d7ef0a7aa3b62106bf7ea5ec041f01cc667227ca32ca07a40433c80640e83500410fba668bb44a675f68c233ba19960e87b73a612b WHIRLPOOL c243916ec58dcc9e269b60abc79ef32150176386d73d79e0a6b5a910a94e4f1895c93f1483f5f7dde8f8a60277e054b6fd921d3284d9b0c96dbc5ad3a9948e59
diff --git a/dev-python/python-mhash/metadata.xml b/dev-python/python-mhash/metadata.xml
new file mode 100644
index 000000000000..0aa2d73795b8
--- /dev/null
+++ b/dev-python/python-mhash/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">mhash</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-mhash/python-mhash-1.4-r1.ebuild b/dev-python/python-mhash/python-mhash-1.4-r1.ebuild
new file mode 100644
index 000000000000..f0e2e90e5fe8
--- /dev/null
+++ b/dev-python/python-mhash/python-mhash-1.4-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Python interface to libmhash"
+HOMEPAGE="http://mhash.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="app-crypt/mhash"
+RDEPEND="${DEPEND}"
+
+python_configure_all() {
+	# Note: review this when py3 is supported
+	append-flags -fno-strict-aliasing
+}
+
+python_test() {
+	"${PYTHON}" test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/python-mistralclient/Manifest b/dev-python/python-mistralclient/Manifest
new file mode 100644
index 000000000000..253f6f807e5a
--- /dev/null
+++ b/dev-python/python-mistralclient/Manifest
@@ -0,0 +1,6 @@
+DIST python-mistralclient-3.0.2.tar.gz 78255 SHA256 65371935b8e884de349d30b62e2528655335230a5c6244fdeff02dc5bbac623f SHA512 3f2bcdf7723e3acba9c34947fb26c2ad3814b89ee43a26d3779f4ac7ae0845c4129c98d1a5b6deca2e2dcf77aec128639af4e8e650863cc19b7c03864bae7ab4 WHIRLPOOL 3a7c7c8b59a97453abf01a43a37f5e69c4b051505e778837e54bc60ab42fd2962517951d1e635a466eb935e1e766f787fad0a0017ecb4e7920c435f7778a9828
+DIST python-mistralclient-3.1.3.tar.gz 78743 SHA256 1fff20fe8f7f32e4e00adcd486d0d2548534ae17286256930705c66d5d460816 SHA512 d18c8ed486e83e91904a0bb0fe0cce21d4a603d383d309efa249f145cf89aff5b980828eb928d6cee92184e0444e49ac9e3aba0a3095ed9179c67cdbf82dd243 WHIRLPOOL 7e7190ec1bf11ddfa98916706691a1d31648eb4deb203e256714d425d5c5858757f1c3a5c13c40e442abcda1b6ead227ba58d8222455b952753cd041e1440836
+EBUILD python-mistralclient-3.0.2.ebuild 1176 SHA256 bde5291dae6cc6db32af04f2382d21325e20d6e121726349763664cbd9361821 SHA512 eee25284ab2e9e244149e45ffe9b6f1d91f5e3f4098e687cbdfca2e15fe4cfeba4e152943b525a29a4b76e822f57f411fd35acccdc6d88f42234ef5b6536d3ad WHIRLPOOL b119701e3fc05ba45c371d846c62bd6965a61eb11d27b3fbb7d9f5e9e3ffcbd1f28f78e387f7e3f46b76aa23e624598aa622a8e3bdda8b3e67ee19ef3fd999e0
+EBUILD python-mistralclient-3.1.3.ebuild 1203 SHA256 ca33e52fae810bf58af9b6ee6d9192e31a64f808038501d218f5ce9b1ffad518 SHA512 3e69628018dc33bc83d8fcf20715812ec8d96d6b4e78d6e13eb8c95dbc081ffa78df6f4e2969965807b7b97b4ca1f91b8ac911b6189bbd9d2033818b44356c86 WHIRLPOOL 8d76bf92ea8d1c86fea25e88ee83218335548449d619af141b44c4559fdfdbfb0304ace573e8ebf6e20fce368270e810c169a6c59b3caa25d4821cd8fc1bc401
+MISC ChangeLog 694 SHA256 ca2268654b0ddaa7d6b34f467cf9545fe4fbf08213ff1761eb556c20ca1eb12f SHA512 2cd39a7f07de4dd139f4f43c02ed20eaf708eb5996489b7519d1042f82bb5526e081080d57438d377e253a456c920700cc767a282e49a205658f38214d20959c WHIRLPOOL b983f16d233807333fdb694f62803bfb8ab8e48d9d99af46f391d54683a57f264c7986fc1ec9c3042a60199dbce0d4629e0973280d75d9a6656912eedcba9269
+MISC metadata.xml 635 SHA256 adf74352bf328e7b66eef2160d70ae2754757c60f9f082753137064a7b351d64 SHA512 f3e92e2bb38afdbfc7605c5244d6f60b0c72843617197e7bdb08031d69ca283b544b88af340ce75382bf2135150f9314eaffbf1b0e45c16a9434e15c89131622 WHIRLPOOL 005d1e9e8604ded8ce25efce615acc5fc183a7f89a12871ef76e369729e47b2ccb772cb597a5e64a925d5e9210dd1d22b430474fb4a1b40f34dc250fedee32a5
diff --git a/dev-python/python-mistralclient/metadata.xml b/dev-python/python-mistralclient/metadata.xml
new file mode 100644
index 000000000000..abc88fce0a7b
--- /dev/null
+++ b/dev-python/python-mistralclient/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+    This is a client for the OpenStack Mistral API.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">python-mistralclient</remote-id>
+    <remote-id type="github">openstack/python-mistralclient</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-mistralclient/python-mistralclient-3.0.2.ebuild b/dev-python/python-mistralclient/python-mistralclient-3.0.2.ebuild
new file mode 100644
index 000000000000..6f6d49de874a
--- /dev/null
+++ b/dev-python/python-mistralclient/python-mistralclient-3.0.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Mistral API"
+HOMEPAGE="https://github.com/openstack/python-mistralclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cliff-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-mistralclient/python-mistralclient-3.1.3.ebuild b/dev-python/python-mistralclient/python-mistralclient-3.1.3.ebuild
new file mode 100644
index 000000000000..601d4f3fe550
--- /dev/null
+++ b/dev-python/python-mistralclient/python-mistralclient-3.1.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Mistral API"
+HOMEPAGE="https://github.com/openstack/python-mistralclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-monascaclient/Manifest b/dev-python/python-monascaclient/Manifest
new file mode 100644
index 000000000000..9e89d4eb464d
--- /dev/null
+++ b/dev-python/python-monascaclient/Manifest
@@ -0,0 +1,6 @@
+DIST python-monascaclient-1.5.1.tar.gz 62677 SHA256 ee84c29be50945d59731d11b6d7bc7e5ceacdf04a477982b4e094ce4214b83e2 SHA512 d6513b5d49fcf09a9f7b6c56ac8ef2dd27b5d18148a0ee20d58a62c3b1d332df3f154d559ddadcf972291a2e30bb204d4bc26b28b69a0ae568ab8e8b7ce81a1e WHIRLPOOL e73952f86ffca9785e15cf78cf6fdae7d63859601273a795a9cbbe2954fb1cfd64517df11b27a561f6b58a6e82a42761ea709448868619497f145800e3e87181
+DIST python-monascaclient-1.7.0.tar.gz 50363 SHA256 19ad6dcccbd417c5f43bfa220fc001d7e4ced8e5c2886c07ec76426308f22e07 SHA512 b4cdcd227aa02463be9bcd095c957cd0ab834724a2551fae40b2924a8cabd1dc879c2e1a89c989834a3523055a2f2faeaffe8e4f8b0d50b37dbf9441efbd8942 WHIRLPOOL 2f2c201aaea7a9dee98713732eda1d46d63163bb93e3f343fb5b96063997988a355f4866ff288b249a8d668c207f46eef9fc1590c1d7429bb07f1dec88f29659
+EBUILD python-monascaclient-1.5.1.ebuild 1594 SHA256 44f687b160204a819030c8d691f310d517729262d3cf1a237de69562ca004961 SHA512 c7deaa6e0260f2e055125a2a879d9b211ce3114411abcdeda59d69786012b41c9bbf2753e4a34f41157893ec5cce470666245d37b102880e47bbecc7a0ddc71a WHIRLPOOL 7170350ea133f68eb3d35173097ca327a6e1b44a30aa073c19dc00c9cf3e02ba9eddac89edf7806b233acfc2ef397c11cc6b5c80ad74191c1ec067bc8926e80b
+EBUILD python-monascaclient-1.7.0.ebuild 1253 SHA256 66b8e527bbe5ce911681bfe246ae2dd45734a5ebbc691b722b51d2836f9962a2 SHA512 4cb490153543ce0e1419f8a8847369c417d69930e3b8e90658bb9e9e13d782dc2741e0aee4f7f0506ecb6422dbf1f191ce9d2af80ef2d8c6be66eb79a0827fd6 WHIRLPOOL 3f8d1b5b3421224d7e58a48f2b6d16510b0b898f36325a4ee3a407bccc24c93790bfddcd0cf2d50bff99e41935feb504574c311443980243e8f82a5674156da9
+MISC ChangeLog 515 SHA256 0b9102743f9bb47687e54e96a813f8171ceb51ccc155e12e1fca47deaa31530e SHA512 570ab04c3ccc4b1ea38be81ead0e94b1521abd2522690e75a7126497c0b869e9ff8f5ca0ea035436f852d397942bd32f6cda5a639054f484b0afa7b08f8e5b7b WHIRLPOOL 901fd8e1f1b846c826cb832243f03d940c6eda702a4c83394d27f5d8a8dbbabec3bbd98a9441eef3d3c80ca52778acc722e0d1ac1aba654d9eeef2d085987703
+MISC metadata.xml 635 SHA256 9dbf6504ddb6f7e55dd005a5f9436271edd8aa9a7cba7c75f5e1b5bdce22169e SHA512 48ee0716888ea7082498f9e62a76c9b422bb4595b24ef612f771e93ad634ead94a25eeb77a1dcc89c49bc1fdf529d2e40a3083e273e4155f231c5be6e176fbda WHIRLPOOL b2e9726ea7c4b1316106116db79940c72074c7b2fdca2e2ce2ed9d4302ebb22c0a78bc33aa93f1a1d151e4dd111da2e8aedd9e30410583f3782102ee8e5386b4
diff --git a/dev-python/python-monascaclient/metadata.xml b/dev-python/python-monascaclient/metadata.xml
new file mode 100644
index 000000000000..bf1c1f8f17b2
--- /dev/null
+++ b/dev-python/python-monascaclient/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+    This is a client for the OpenStack Monasca API.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">python-monascaclient</remote-id>
+    <remote-id type="github">openstack/python-monascaclient</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-monascaclient/python-monascaclient-1.5.1.ebuild b/dev-python/python-monascaclient/python-monascaclient-1.5.1.ebuild
new file mode 100644
index 000000000000..941de07cec56
--- /dev/null
+++ b/dev-python/python-monascaclient/python-monascaclient-1.5.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Monasca API"
+HOMEPAGE="https://github.com/openstack/python-monascaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-monascaclient/python-monascaclient-1.7.0.ebuild b/dev-python/python-monascaclient/python-monascaclient-1.7.0.ebuild
new file mode 100644
index 000000000000..eeb49d8c59d0
--- /dev/null
+++ b/dev-python/python-monascaclient/python-monascaclient-1.7.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Monasca API"
+HOMEPAGE="https://github.com/openstack/python-monascaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/osc-lib-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-mpd/Manifest b/dev-python/python-mpd/Manifest
new file mode 100644
index 000000000000..8420fa0419d5
--- /dev/null
+++ b/dev-python/python-mpd/Manifest
@@ -0,0 +1,5 @@
+DIST python-mpd-0.5.5.tar.gz 46334 SHA256 b9b9d3a477359f53b62b2ebc26fda29d96da66f86eac83c5e2277e85894d2ce2 SHA512 d5eec60045561a8a0e29eda2ec2fc341c9b81d61363260c884f0863e931077c31c32534e3c98a488ef31aa61cd3d21bdcfa625b7b062ef24bf3e8024dc1e7c5a WHIRLPOOL b09c2875d06b4d828c71a26c9a2ed6fe9f4373d4158f4cbf31956c5c590424993af4d43d1e24a3d94a81c946f800e73806362e1d077ced8444fe2da675a592b9
+EBUILD python-mpd-0.5.5.ebuild 700 SHA256 986b3da99b6bda3dba9d4685db2aa7898807e0787699f8244ca83da82ed81cb6 SHA512 c86b686fef8a6843bff257e7ec474c53a5d6950d2cf6d4a253347256c687d475c0fe2f43ebb2aff46a14f6f2337024f38561ad5beed5754ff024fc232d019490 WHIRLPOOL 4dfe72a3562ebf15f1432d8c914984a9c2cc3018833f758b59a06f909917e16f168c8dce9a424c7e82d3a9d865719bd1363cdc97afef0417a686be7e8ecbdc23
+MISC ChangeLog 3443 SHA256 91325fa9a536a330b10935361a1c7b05d691452bef0a3e3bc56f0c6976ea611f SHA512 6c81c945b9c5a05e23f3852dacd70c1aa63b3c40125967fa8828b3316dd77a612fd66c5322b663ec2882bcc847612212a7dd587b79d94db0f6abeeaf16b6850c WHIRLPOOL 3cc89d8b6b9b925608362a93b79ebf5c8069edb1e998bcdf15abf660385becd92cdc138b4b3608e2ae67b7e6f384c8dc203bdb0f17f10b3b55b2597a8c75bf41
+MISC ChangeLog-2015 5927 SHA256 faa9a7827bdbe93dc47d7bfa51cf4b4eaa1a89b69e8e3ee9bada68376d4aa8af SHA512 052e0297f530777d86c01652d1fb04be6952ee169013d67572c945fc368ba1dd17804617bb2ffc7af3bbbc58eb0d8fc81f596c883cf1b0395efe6d8a815ebdfb WHIRLPOOL d62c6d12f18cf33a5acf9df33a3ae93bfe07c041c34373ba31eb7badc769171a76d2acb4100308bb7d02bebda00cae9b497bea1479385eb5daae4b3439f6d258
+MISC metadata.xml 382 SHA256 0df1fdc045b49a0b20769e3bb6651997a19c49b577df85434eb6ecb971fd0e1e SHA512 aafaba60498499a806694356fe71b55f3e469a024aad9a74cdbfdd1e7361a7ab33b267796949e10844c25946b34ed0e43db9fada9a76f08084067f741d4ac6a1 WHIRLPOOL e2c3cb63d3ee4de747a0cd83c8c3ee5aaf8f76f5e85212e43e5cdbd7d0945f43e56a0511ce0999badcf4d4636249b22dab0eba063be30844b1965f5df4a07e10
diff --git a/dev-python/python-mpd/metadata.xml b/dev-python/python-mpd/metadata.xml
new file mode 100644
index 000000000000..2026acc8e100
--- /dev/null
+++ b/dev-python/python-mpd/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">python-mpd</remote-id>
+    <remote-id type="github">Mic92/python-mpd2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-mpd/python-mpd-0.5.5.ebuild b/dev-python/python-mpd/python-mpd-0.5.5.ebuild
new file mode 100644
index 000000000000..7fb44e558057
--- /dev/null
+++ b/dev-python/python-mpd/python-mpd-0.5.5.ebuild
@@ -0,0 +1,25 @@
+# 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} pypy )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python MPD client library"
+HOMEPAGE="https://github.com/Mic92/python-mpd2"
+SRC_URI="https://github.com/Mic92/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+SLOT="0"
+IUSE="test"
+
+DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( doc/changes.rst doc/topics/{advanced,commands,getting-started,logging}.rst README.rst )
+
+python_test() {
+	"${PYTHON}" test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/python-msrplib/Manifest b/dev-python/python-msrplib/Manifest
new file mode 100644
index 000000000000..e3bd16a4888f
--- /dev/null
+++ b/dev-python/python-msrplib/Manifest
@@ -0,0 +1,4 @@
+DIST python-msrplib-0.18.0.tar.gz 30234 SHA256 72901c42cf05262890e3bb5ae37364f074632d067f139a8f71e395006e79e96e SHA512 ed260b0183aff543e115951f464d0e3934862439a7c049c3d19304c543805ee364129d2a99c0d132561c8ae0af9fc19cde460723f2754e973bf68a602a18db99 WHIRLPOOL b5edc6f87546173c384452ff1636b5d61a6ac893026362fbfd039a5c80b2fdd887f3eac1220db4843b85889be83658ac46ae5535247aaac2cd63385af03afee5
+EBUILD python-msrplib-0.18.0.ebuild 652 SHA256 c3c0a104a0386090c347e2cc5b9e231067416d3accd541e323a35748d191ca5f SHA512 c0792e7f617fd118d44b6bef4434d65988b28e51bb406b6bfa480ba699483121266e461e234a641f60f574b8f3d9cf6f3cca2874ae0982fd35191ef7280d6080 WHIRLPOOL 3194b258ff179ff4826950327ad289f41c574d1f04106f6cd43d1a1181d14630ede8d8b2e8c96b057f579625f5c766e638b832dc8962df4923d81c4780bcda2c
+MISC ChangeLog 841 SHA256 bc588a6fec5b4a993ffef0183a38dca217362041c14eab46e21266011316421a SHA512 b582d736b2236c83e53c9acc1042ef6f03f1623e720a7ec63c8fc5ef8736519379d4af4be0d18cd497558e2fc5a94e1f974016eeeba2826a4a6998e7a1f14e94 WHIRLPOOL 6018e622398c33bbcb047cb78ea1621a866a6341a18bc165996778b430c12defa72f99a51a1f8bc5df1120d3e2912f432c968c19aed448767599eff0629a1529
+MISC metadata.xml 1408 SHA256 25ac60ff9e51c3e76b03dfca0279056f794cef861e345baa10d990938e3e5e27 SHA512 09c18e4112893d9598b9d56ba1f2fdfad5dfc78e5a97da0b65f3c00b2cc0ad673f68e94e50dda12c8be506e455f47ec5fd8bb00411ab205221241c6cf4b26f8c WHIRLPOOL 5d25eb259391df4785efbbf64eb1799caee26741fea327ef2357b909ab638c5abcebf05c67cea4fc1ffa321606a392a67824e975252df8baba4837c6aa8032a6
diff --git a/dev-python/python-msrplib/metadata.xml b/dev-python/python-msrplib/metadata.xml
new file mode 100644
index 000000000000..d854883a141e
--- /dev/null
+++ b/dev-python/python-msrplib/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Message Session Relay Protocol (MSRP) is a protocol for transmitting a
+		series of related instant messages in the context of a session. Message
+		sessions are treated like any other media stream when set up via a
+		rendezvous or session creation protocol such as the Session Initiation
+		Protocol (SIP).
+
+		A series of related instant messages between two or more parties can be
+		viewed as part of a "message session", that is, a conversational exchange
+		of messages with a definite beginning and end. This is in contrast to
+		individual messages each sent independently. Messaging schemes that track
+		only individual messages can be described as "page-mode" messaging,
+		whereas messaging that is part of a "session" with a definite start and
+		end is called "session-mode" messaging.
+
+		Page-mode messaging is enabled in SIP via the SIP MESSAGE method, as
+		defined in RFC 3428. Session-mode messaging has a number of benefits
+		over page-mode messaging, however, such as explicit rendezvous, tighter
+		integration with other media-types, direct client-to-client operation,
+		and brokered privacy and security.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/python-msrplib/python-msrplib-0.18.0.ebuild b/dev-python/python-msrplib/python-msrplib-0.18.0.ebuild
new file mode 100644
index 000000000000..cc0e91b26aed
--- /dev/null
+++ b/dev-python/python-msrplib/python-msrplib-0.18.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Client library for MSRP protocol and its relay extension"
+HOMEPAGE="http://sipsimpleclient.org"
+SRC_URI="http://download.ag-projects.com/MSRP/python-msrplib-${PV}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/python-application[${PYTHON_USEDEP}]
+	dev-python/python-eventlib[${PYTHON_USEDEP}]
+	dev-python/python-gnutls[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/twisted-names[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/python-musicbrainz-ngs/Manifest b/dev-python/python-musicbrainz-ngs/Manifest
new file mode 100644
index 000000000000..cb1346480212
--- /dev/null
+++ b/dev-python/python-musicbrainz-ngs/Manifest
@@ -0,0 +1,5 @@
+DIST python-musicbrainzngs0.6.tar.gz 110948 SHA256 ec447bcab906fe7c4dbd714a1dff1b00adcd20d0011968df1a740e6b1fb09cb5 SHA512 901729f736b207f2f086e3d44a3515d405f6621706ad9c7ca07dd304349e048c5790bb16b054393651808bac4905ceb9493dd66d9fb17a1612692427c0bd3bd4 WHIRLPOOL 210d2dea5c3f4d55ff40cf44ab806afc02ab0093800a92cc1bf7ffcb6833f6317d96e9d2fabc1b8b1f522ac80e9ad924f6d0393766d81e53636042a089141859
+EBUILD python-musicbrainz-ngs-0.6.ebuild 1067 SHA256 66bd6483bfb4370a1d73ae7dcfdd700e93fd5202bda1ff391d6a9f948a3ea1ea SHA512 5ed64085ec863028d231d8fa1b2ef648cee15f6f9798d8632f912c845e2a1b5c310cf08b5427be92a1e01664fe944f91c3ac64ddf6f382581a56fdeab949864f WHIRLPOOL 8f200d93162120bcb7141a203a41cd91f40931eb1862a6eaed4a343d7236f33cd192085d48c64f9d51e8a2fc50a4d70bb25f69ed8139f6179bc9928e1980c391
+MISC ChangeLog 3949 SHA256 2fba25b3ad1b2e24a139dc6e3c90046eb117cdb1eb6b3591b072b854f0568f02 SHA512 abf27d5e7f6bdfe0906faf33ec38ce1b36b2ce1f9cd6cb703c40287c7026a196b86adcdad663bd354aff0429236b40985663ce0eff80efe250a2f68a4ff1b85e WHIRLPOOL 41cfcf88c8fd35115ae668cbe5e2b85cf24e7ce99790e7b0dace33e59e490a0e47a9966ce6d1d358fe6794dc7b2e53340cbce0aff6e64d6b39ad52023e6de215
+MISC ChangeLog-2015 2163 SHA256 dce01709e07e9c99ed59f8e8b3633d0be49fbe4a0d1f52ec223008d9b44b4898 SHA512 59e4d563b1333d4b0b60b51f17da046bcdd73e00ea82213311b3537d466de9fae1117eb0934b912d4aa8f1257a2d934f0139793aa5cfa8ddda53f7d23a436f3a WHIRLPOOL 1f66d95e6dc3871523ef5471a0b541beee8be94f25f629739a696dd7844a8e1c08349887f0dad1ad2017665b39c06d173ddd0132e65925fea1b6b4a79060ae4b
+MISC metadata.xml 688 SHA256 709074c1bb6e6c73147bd3f8bf604303ce046ee92f8ceb38cd79c4927713613a SHA512 e4d3dda963dd86ad236866f7dc7d6d55f295fe6ebb8f054ff3cd980b9887789a34027738a4bc61871dd8129bb66945b394f6fef08bad78d80be38e21692c969a WHIRLPOOL a81da25581af53deef962ae06dc5c552bbe88e16dec0253889cee8ddfe834845517ed34a261357ce3a5d98010ee807f391e4db46075052533ae4853366240492
diff --git a/dev-python/python-musicbrainz-ngs/metadata.xml b/dev-python/python-musicbrainz-ngs/metadata.xml
new file mode 100644
index 000000000000..3c2fea6062a0
--- /dev/null
+++ b/dev-python/python-musicbrainz-ngs/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gerion.entrup@t-online.de</email>
+		<name>Gerion Entrup</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+This library implements webservice bindings for the Musicbrainz NGS site, also known as /ws/2.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">alastair/python-musicbrainz-ngs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
new file mode 100644
index 000000000000..ebf8f704489d
--- /dev/null
+++ b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="${PN/%-ngs/ngs}"
+
+DESCRIPTION="Python bindings for the MusicBrainz NGS and the Cover Art Archive webservices"
+HOMEPAGE="https://github.com/alastair/python-musicbrainzngs"
+SRC_URI="https://github.com/alastair/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}${PV}.tar.gz"
+
+LICENSE="BSD-2 ISC"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples test"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/,^ *'sphinx.ext.intersphinx'//" -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-musicbrainz/Manifest b/dev-python/python-musicbrainz/Manifest
new file mode 100644
index 000000000000..75db80a2acaf
--- /dev/null
+++ b/dev-python/python-musicbrainz/Manifest
@@ -0,0 +1,5 @@
+DIST python-musicbrainz2-0.7.4.tar.gz 76939 SHA256 728fbe415da98dad5c4d462e56cf106cf50cc28eb6a9f46b8ebabc3029f37fb9 SHA512 dbf72a6f2dfa945398f390f20cbf75a5099ea69075b419ece37f1994c816ae36a62c1bf1d7490110e446b3ce441a7d486002c1e91ea4872aba3f4cc183bbf88e WHIRLPOOL 94568d845ab56939a9c476d16ea76cc7176900bd26d8f47d998597462179ec2a320365986113bd26807d67dec47e74127fd02d90197ae8270ab25b1a42dc0679
+EBUILD python-musicbrainz-0.7.4-r1.ebuild 1001 SHA256 cb15208a0c8bd7b4558db1aac65cbdeabd5a6a83a26862ae4dbf86c8dd26e619 SHA512 cdff7e39e32dd9a7bee04edadf3cb2cafae7467361b52adfbfef383b10fb170c3b7b616372f414173bdea7b332cce006ee4d7d31f2ea029210d33c6a2dc541f1 WHIRLPOOL 79a2ed2ac9958d70a74c4426c3ef1ec59e6582cd1d9d370520e87ffa09c9540f50d2831f37360b31c9a513d82c2f95e0d636e337be497959c44559549c645621
+MISC ChangeLog 2468 SHA256 b94d5a74551547d40e37f4a56a315b791d32c08b5a895ca8c19ee9fb40c10138 SHA512 6da8ad7611529d1873b25c28111e24df21508075d54e0a74a38c998de04b82370214c29cc1e56b84277b509eb3ad89cf0358b66a5b9df0d9815889fae6c5762e WHIRLPOOL 2d0d361536b58d47e8862293215a7436200b2dab4f02767e855a63ffc109356479e0b0d0329597f303319ac80704323f4ce8c7ed70d0328b47a4ffd190e37170
+MISC ChangeLog-2015 3522 SHA256 c5ca6e5e2874e04ecfabe66620da06394995e2e52df77f4d9aba873df394eb14 SHA512 f17f58046f3739180656d1157199d8b7f49052bb008ba27b141f753af203f2e20cbbdbe283f823e486907dab3e33f127e42bef0b220485c3b5b6be139d7a03a4 WHIRLPOOL a8bbc4345c71f2c2191a30d61fb6691efe6b48de83d1b9b9054255d497e22474f49be98d3c5a1445a92f24d639368fa3b1d9a22ad55a0ba766e1cbe22673a471
+MISC metadata.xml 353 SHA256 bc8c169ee6d20b278e4fa97db9855aba0706b54053977d69e9dd925b0bbba6b6 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1 WHIRLPOOL 03d7dba44d17d9499312e3a29c1a0cea78c9b5276f788784d77e47d52b5caff6ac11acf985dc6d3f57fd13095bc7dcafec7e7503494c62ccea08d060ecebede6
diff --git a/dev-python/python-musicbrainz/metadata.xml b/dev-python/python-musicbrainz/metadata.xml
new file mode 100644
index 000000000000..d0913ee5d1cb
--- /dev/null
+++ b/dev-python/python-musicbrainz/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="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-musicbrainz/python-musicbrainz-0.7.4-r1.ebuild b/dev-python/python-musicbrainz/python-musicbrainz-0.7.4-r1.ebuild
new file mode 100644
index 000000000000..2e4cf4af8b07
--- /dev/null
+++ b/dev-python/python-musicbrainz/python-musicbrainz-0.7.4-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python Bindings for the MusicBrainz XML Web Service"
+HOMEPAGE="http://musicbrainz.org"
+SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 x86"
+IUSE="doc examples"
+
+RDEPEND="media-libs/libdiscid"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/epydoc )"
+# epydoc is called as a script, so no PYTHON_USEDEP
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	if use doc; then
+		einfo "Generation of documentation"
+		esetup.py docs
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	dodoc AUTHORS.txt CHANGES.txt README.txt
+
+	if use doc; then
+		dohtml html/*
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.txt
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.py
+	fi
+}
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
new file mode 100644
index 000000000000..0b216766a41b
--- /dev/null
+++ b/dev-python/python-nbxmpp/Manifest
@@ -0,0 +1,7 @@
+DIST python-nbxmpp-0.5.3.tar.gz 1514066 SHA256 b79a6b25a2ed7ac792600544778238b27cf6eef6c8eab79b0bfa46df0c3a9935 SHA512 a55ce4c05683d46c12cf085c5436ba544044f0ab71ad7c87dbb25cba02c28109089131b617ff51191d294efe50e80171dd2305ead4052bec921b0ad5ad920e20 WHIRLPOOL 96d078df5972dde5704dac9fcac31c9ae734c06583c381f5d18d43fca26ae790cebc114991e07b916be35a5dcb24d9ccaad9fe69f22b9bd16099d5d248aea487
+DIST python-nbxmpp-0.5.6.tar.gz 1330311 SHA256 061f3dcc25f80a1033864d47f6b0efe5bfdc32eafbea79a407943f5beadf552c SHA512 1ae90dc6d7117e8fae837975dbc4b84a848caef451c8ef99fb106148a12e29429255d0595c0eee26cb185d01e42a84ddb7636f41d4ee259fedf26cf0d956a43c WHIRLPOOL e0cb0d5766a26d7dcb034f6f6181772aa333604a7e8fa96884b62a232b6a5e7cf28d99f36362692040309d6ba9d7ec466113ef72c0d23927d8de0368612981fa
+EBUILD python-nbxmpp-0.5.3.ebuild 506 SHA256 7e3770ffd65773b58cbc53540a539e12ee9233d43423cf96b74a5d09e46df6c9 SHA512 f757a834a61b2ae023758894dcff03254409f49ed5f4d49d145849b8bd207d50c00e53dd67fb5469c18dd3395551746161c6c2d5d70213469675f975b155d0bb WHIRLPOOL 551133abaafe8263adf0f83282ba032668520271444ad179de40c641c819bc4b034186bc356f2b1d3239d27758857d326a0a9499dd5b0eb8ccf010fee8bc39ba
+EBUILD python-nbxmpp-0.5.6.ebuild 526 SHA256 2c0a74fda9d6c1c4d45f1bd17aa968d100b6fb33fc39c01a95d632f6efcbc30b SHA512 fd81b6eb36dc348f3ced4a12d7644e4b04f901f3363de31adf6ebd97a7b2cc9ec165518b450a98bb929bc6c6905276989031fed656d863b7be4be565422b04b6 WHIRLPOOL 10071ba514795df65330e4c852a811064ead336efca02de5f35cb5a44a8c82d18eaea22e44ac208c6131ce520a9cc98061f255beb3801beb03222fb5e5f7b0b6
+MISC ChangeLog 3935 SHA256 b98f7a82da501ea76bfad9a4be0539c4956447363c0d8da1685a196073aa1a31 SHA512 1e19e7ecd8604a6ddb98a2ae1b485e39d4b1a3112a7bac981bda8a38334bd634428353a764cb9939fde235aaca8da6dd0864ec0eb3e23f28ddc90dd0bda67625 WHIRLPOOL 829567e0df0b3edd5b7754b8f3d6f8e6261584294d50d25f66412ba2add03fac24526d33f3a82fbc1c1328bed3cdbe5ad75f47bfc7ca1a4b860e6bc3797505df
+MISC ChangeLog-2015 3211 SHA256 24d827b049fde216dba6ac3534f2a0d69805bcedc1a810784a440a0ad649aa60 SHA512 d9dd585b855d58f3a0835a90cce971825ba1e79711f3b1c071c4a3a12808f975587df3aa14e2cd4a2abdfd3e34e236c7cf2de9b25eb8d73c08abefd634307350 WHIRLPOOL 602fa27bcc0a900ffe197567488f42a85176d9014e88420741966fbd590730b36437a49b840e72ea0695ecee4dc5f7c7e9b623c01ce6c1249aca19c9e946cecb
+MISC metadata.xml 246 SHA256 634432e12556106844e569b7ff16962881c6e70887e6fc9650bdd82deb51a834 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc WHIRLPOOL 869ef1c8e23bdae0a11b44ccf38ddec23f0dc0ae2573bc83ccbe2d8a2c6bf5a3f9c3c52149aa2e3690dd66f7fc7ec498f2eb6b9d338440fb54c12d5ac0b9fb7a
diff --git a/dev-python/python-nbxmpp/metadata.xml b/dev-python/python-nbxmpp/metadata.xml
new file mode 100644
index 000000000000..e24dd86faa2a
--- /dev/null
+++ b/dev-python/python-nbxmpp/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild
new file mode 100644
index 000000000000..4b733d783ddd
--- /dev/null
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+TAG=8
+
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="http://python-nbxmpp.gajim.org/"
+SRC_URI="http://python-nbxmpp.gajim.org/downloads/${TAG} -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}"/nbxmpp-${PV}
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.5.6.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.5.6.ebuild
new file mode 100644
index 000000000000..8d9534c5a159
--- /dev/null
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.5.6.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="http://python-nbxmpp.gajim.org/"
+SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.gz?ref=nbxmpp-${PV} -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
new file mode 100644
index 000000000000..9288619bf2cb
--- /dev/null
+++ b/dev-python/python-neutronclient/Manifest
@@ -0,0 +1,7 @@
+DIST python-neutronclient-6.1.1.tar.gz 238212 SHA256 3eb2101d6224423eb7acd22e874e5a10a908f8190b213fb05ebe0e7dc52383c7 SHA512 b2cb1261bba6fbd5dfbf3b303f09925420730fc3e8a9d64fa5c57e1f13f1a1e19abffa9d7098d15081f2d49d40a43efb55759d1b52a2a6592a780c9feb451d37 WHIRLPOOL 4edfa91fb4e07bbd38fbdabbadfe0649314a2ca6a6f846e58ea3187ed0fe32568c6623e3acdc4a14c7654c03d12d4330ca78015f7030133e310dbd2c5baa09e6
+DIST python-neutronclient-6.5.0.tar.gz 255893 SHA256 4cdb6b2603c7c9324dfb05d4b75d5467fcfac05c560b1b15afced63d285bb60c SHA512 77d4f86f2bc066026c903c9c694dfe2de747dc7caec268853a3d2ae8e27a47b39695b33bd81b182334717fbab7817873ae468b928e85622204c348e5b18e0930 WHIRLPOOL cad9f5bcf93c9cf44bbe2b5367d98ac1aee451a6072d21b20ce1279d548e47ce6b96aa6552cc06e2643f9224cf55bdaa91cd767a014926c98bb27ff65defa3b8
+EBUILD python-neutronclient-6.1.1.ebuild 3108 SHA256 cfbcb12748dcde5934412f4c8adfc4a81c8bc91bf2aca70f9ec71be8ed2c9c49 SHA512 ab943398e3a9b1e6fcb6c39ace9b9250f575e6899936951a115cc07dcb16915e2796167caf1de1869d98469ad52de12bd0c70ec8eb121b36c6d0027b4a5ae85b WHIRLPOOL b26af535aebacf7fdd91f1daa42385f7caed784fdab8c85994d514b85722fae5ea03caef12165d5bb87ed6bed181f8b896908a15795409f1d3d1a7d4959e0331
+EBUILD python-neutronclient-6.5.0.ebuild 3520 SHA256 e0990aa7c283d60901e6c95c798a2b506988ce3642ac2d40ff3a12ad6513103f SHA512 16699805dda247b841832c04a72ac940405cf623bb40a5560f421e8495ddf70f7ea32da24c54d8b0b877528a55f6641aed4f8a7ddde670876888c211dcface95 WHIRLPOOL ebc19144ea4e0d815772e79bab2c4e078b8afc4ca27daa19ac5c6a6550be120f2741fbec1a381462550b81d01e168c18f51f286e669dd5290eb605b7f8c43921
+MISC ChangeLog 5148 SHA256 3953e8cb2107ec7e1960b5ea34f3321f5ce58b0e6693f26d4365dbc93ac23997 SHA512 db153135b83fb678a8e16ad1e132681d764858ae1bfd98b6bed5914a89e311c2b548f3035ca4f32523d2e8728d221626a095d41280f9bc09b3b5eeeea7c7d1af WHIRLPOOL 682f04a7ce688683397bdb9420a8b7eccfcdb18c84d1caf115dbf573583536a4a014c4318dd6233e5d70c6fbbcc8daa133c6da27f1e1fb9c7449a3e3df568d33
+MISC ChangeLog-2015 4055 SHA256 2dc6b4da870c881207af87dc195d76be8271b96d4fdd1ed0a2a96d0664e3303d SHA512 4b6fc35bded6b400f2274d81c1c7db63f89e72ca08f7cd9937dc7e6b9f6bf4836957f9d37cb97726e59f8d25ead04c7f12cacc407352bfe9045e7eb91552beb2 WHIRLPOOL 50b17a596af910ae02445c3b734f0253851765296407e4796aaf44b07b26392c1969d9ca833d5e82be6f9ae5c8546917a338d20dc5fd1f9f2de5934f47861e80
+MISC metadata.xml 619 SHA256 550926fd45cd41f17aaf099a7365d05fa31cf5d1eb67aae3868d38f209d17327 SHA512 d99562185b29417c559143d8fe8102a062dfda0cd7c07f9f01d1c5f11a75eac521e98c9048a23ce74ed34e198ed06bbe2a40990651caf7f9ecfa98975a8fb91f WHIRLPOOL 3e58d74b30cdaeff60ed6e360acd3019bf7a49d281240cc7b8039c4edb2e43f5e49d4fa81a08c91f24de2f317ce9591b658296e797bcdeb1c3e96723fd3449ba
diff --git a/dev-python/python-neutronclient/metadata.xml b/dev-python/python-neutronclient/metadata.xml
new file mode 100644
index 000000000000..295d065c537d
--- /dev/null
+++ b/dev-python/python-neutronclient/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+    CLI and python client library for OpenStack Neutron
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">python-neutronclient</remote-id>
+    <remote-id type="launchpad">neutron</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-neutronclient/python-neutronclient-6.1.1.ebuild b/dev-python/python-neutronclient/python-neutronclient-6.1.1.ebuild
new file mode 100644
index 000000000000..37561bbca1e4
--- /dev/null
+++ b/dev-python/python-neutronclient/python-neutronclient-6.1.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Quantum API"
+HOMEPAGE="https://launchpad.net/neutron"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+REQUIRED_USE="test? ( doc )"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cliff-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.22.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.17.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+	testr init
+	testr run || die "tests failed under python2.7"
+	flake8 neutronclient/tests || die "run by flake8 over tests folder yielded error"
+}
+
+python_install() {
+	distutils-r1_python_install
+	#stupid stupid
+	local SITEDIR="${D%/}$(python_get_sitedir)" || die
+	cd "${SITEDIR}" || die
+	local egg=( python_neutronclient*.egg-info )
+	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
+	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
+	ln -s neutronclient quantumclient || die
+	ln -s neutron quantumclient/quantum || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-neutronclient/python-neutronclient-6.5.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-6.5.0.ebuild
new file mode 100644
index 000000000000..326d7efcfba3
--- /dev/null
+++ b/dev-python/python-neutronclient/python-neutronclient-6.5.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Quantum API"
+HOMEPAGE="https://launchpad.net/neutron"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+REQUIRED_USE="test? ( doc )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		!~dev-python/mox3-0.19.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
+		!~dev-python/python-openstackclient-3.10.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	sed -i '/^flake8-import-order/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+	testr init
+	testr run || die "tests failed under python2.7"
+	flake8 neutronclient/tests || die "run by flake8 over tests folder yielded error"
+}
+
+python_install() {
+	distutils-r1_python_install
+	#stupid stupid
+	local SITEDIR="${D%/}$(python_get_sitedir)" || die
+	cd "${SITEDIR}" || die
+	local egg=( python_neutronclient*.egg-info )
+	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
+	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
+	ln -s neutronclient quantumclient || die
+	ln -s neutron quantumclient/quantum || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
new file mode 100644
index 000000000000..fec3769b855c
--- /dev/null
+++ b/dev-python/python-novaclient/Manifest
@@ -0,0 +1,11 @@
+DIST python-novaclient-6.0.1.tar.gz 288613 SHA256 2b7d4c660f46d8d7f4eb454fa9da4e8d838a81abc45834891c756393beeb264e SHA512 20bbd40bed2328c6bceba6e0057b541e949d1ea1f7c37190d2ef07bed164a2cf20927b2e7a1b26c349038fca625873e189dad150b4a3e801f9211388ab3996c7 WHIRLPOOL 5cce33c00730cf5e3c81a3c9e3207331161650340bf5b240bfbd687cdf5f2301c81be194b0e19d62e8660b9f4b3622dd241ce4fee511e83afb1769e6a101bb52
+DIST python-novaclient-7.1.2.tar.gz 284152 SHA256 f342470514fd2ac3553e8b7b5967f0f63905bc062202926c5c3a7c87a035a18a SHA512 6b7e4bc80e07b09756f61624d2cf7b81dccd1d102f22cb9609b7e1de6f091061c513691095467e293b742c40a62c8cabc2d3ff8cbc5492d07763655de4d6c516 WHIRLPOOL 719f77ca3c341e446d46ea132ddb698945a806fa8629e20bce95ef5fa0817a2d216381907b07e7fb3e6bc980a1ef30ab6d95a3fcc047601f5cd7989868959f79
+DIST python-novaclient-9.1.0.tar.gz 278196 SHA256 0666571b72cd7a056187795c274838d1b0d2f0d80ef2f1c8ca6924e49660375c SHA512 c71b125fa4a10312ab28eb3929a749d8f3a2fa42b49921f3cd93458f3e00548542e88c25b13e36010ce8bfd68d68028bc5f076cc0081cd05c7dc9a4481d1bb02 WHIRLPOOL 8c0c7bab28c681cbb368cb0c945ee16b7ee56ab0e24b775e5e37aab5fc545998cf1ff6280baa69a201c31c6ebaea8f70ec7428d37aa7a53048a1a5622b723893
+DIST python-novaclient-9.1.1.tar.gz 277784 SHA256 ee65c0b429f4b2654416a8a1472729160523c4545315b8fded1652dfb799e428 SHA512 ceb60a1e88c6ef7b9cc9fba9a192bd781b4404e4cc500b902cc2b4a8cf2f8917f1066df5349d2e421dfaa9fd6b791452872a30440cdec604bad3bee85cd6cd82 WHIRLPOOL 6ca4030158f4b0cf93921f55056ba78e6e7dd55fb691e72e802b51c8ecba88545f84853b15ab3f989d9e53c70f2011824e544b5808539cddc4c33cfe97a6d4ac
+EBUILD python-novaclient-6.0.1.ebuild 2791 SHA256 65e2105f9f76a473abc9e82e31729603ea9811f55a5b9fafa5bac20e3b14f892 SHA512 a3a6565cc64c8ea9b05b48f435c93508cc9fd2cdd829b5c855835491513275dbb60f5f32bc8168dbca5ad7ab1a54b0c3423c480a52c36aeba25a64b02dc7195b WHIRLPOOL 3afb8ba323da0de94b41a3d431f828bc7f6949c6d4c8009b5470487f4d9b5f4fc471eff379b84221533e849a8d9220ffc342e7194f83634de707d8d517d9f6c0
+EBUILD python-novaclient-7.1.2.ebuild 2403 SHA256 087f138e7fadb2ac91934aed535ff62dd745fb196a7ef9d73d004e1505305eba SHA512 dd865239d2c2333151a0f0c7a89f48f2a91a2ce1b7539589741fbedf5cf49145e20f25c2a70ff5b6f7ee034af3a68a832f9aa792afb6a7123341cec7a7c60bf6 WHIRLPOOL ac55ca07d4c5d0dace96c1f13c33794613157ea8867540816b186640d2f2754ea7277c2f5c8f1398e19010b724181f5ff15e528c108ea8dcbccb38fc282d9b14
+EBUILD python-novaclient-9.1.0.ebuild 2576 SHA256 801289bb984428810927ce541d5adfec9d842afe70bfe7ec14313e41f9fb3d79 SHA512 d4b97b506f7404def6a7ed5a6267d326d28687d9392c959c68eece85586ecad6a712ff65430644780e7b34ceadfe6f0acee772cecec60bcdc2629a8ab01ada32 WHIRLPOOL ea57796502facec8ac7ff09f1a7718cf9ef58484b09de32191174cce15c437d0018a21abb691aa8a2ad82e95dde06b4694edc09908a04d57122577b76a92877f
+EBUILD python-novaclient-9.1.1.ebuild 2578 SHA256 19c0ed69d0bbda79b8e4a735de8ac487322d49d47ea62eaacc0587100286de45 SHA512 0f7a5eced2926ae84f94668861ae143d0d184ffd3fff3801d149a24c6037aa71197f4e8280a7954d194de8441754cb4d16929399773444d706108fd2fbc692c3 WHIRLPOOL 00c4ebe3ac5f35406e458ae298cc8566063fb4cb083d85d16db5658ecc10d9f1500fc2d69b4b3990bfa6f5b957e780704deb13664b225e7c4231830556a57a06
+MISC ChangeLog 6541 SHA256 4b6de6bf03f205447bf5d45410bb4477d953d2251eb239f4c4a8f37ffa6c418b SHA512 48d37d364bea1570d95d0fa3548fd778b92b10f2ad41f74db7640829a8a299419fc142774b9e0af1a0479dc0f4325b9e15585b2fe56e9f2d015b0285bc9f34f1 WHIRLPOOL 130515d2352d4ae4ad290f4c778b7c46c8317f5d00549d21bfb9737fb60cfcf58d4129d9f67823141a1d8ce275ed51e4e09ce73b52b61fd7eecaf3b88655b5d5
+MISC ChangeLog-2015 5579 SHA256 5bb8603b43145e6382704748800649269b302769691517e8d0ea9b2005c7d725 SHA512 965f12ab56ccf227cdedc6b1951ae33b7b7fd0a03f14d19127ae9d46946a66a8b735bb8a89dc25656613b880a4902a25389f66c0517642953b526974d007748f WHIRLPOOL 2a51a577c26d3c719eed54b170a8a7c2dc7b2d9bc343bfcf02bb9f0331e41f2c3a8090653992171eb73506bda3cee9ed60bec2f7e10024cbba0b35f0eb696c8f
+MISC metadata.xml 760 SHA256 871ddc44a257d5adf856c4c49ed4b0e50a4de51cc8b848453f16ab8fdc2a2601 SHA512 51fd4adfa2bfeaa4f5a6507d31ad45a5d42df8fb702d629a516766bd25c6f5cc0d1eceeb1d4efe3ff21d51ef0507847f6b24828c017e9200759565be09cf66c1 WHIRLPOOL af9a5f2c6aa94609855d9e6af7dedc278a4552d8b410496ce2059a6e98c744d51ca06c08e137ebe2d162671037ecfc5eeec71dbd8554cbe8d50e6976e1b925c4
diff --git a/dev-python/python-novaclient/metadata.xml b/dev-python/python-novaclient/metadata.xml
new file mode 100644
index 000000000000..4a42bfb639f1
--- /dev/null
+++ b/dev-python/python-novaclient/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+    This is a client for the OpenStack Nova API.
+  There's a Python API (the novaclient module),
+  and a command-line script (nova).
+  Each implements 100% of the OpenStack Nova API.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">python-novaclient</remote-id>
+    <remote-id type="github">openstack/python-novaclient</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-novaclient/python-novaclient-6.0.1.ebuild b/dev-python/python-novaclient/python-novaclient-6.0.1.ebuild
new file mode 100644
index 000000000000..3255bc30b60c
--- /dev/null
+++ b/dev-python/python-novaclient/python-novaclient-6.0.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack/python-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
+		!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
+		!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
+		!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
+		!~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.19.0[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.19.1[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.20.0[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.20.1[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "testsuite failed under python2.7"
+}
diff --git a/dev-python/python-novaclient/python-novaclient-7.1.2.ebuild b/dev-python/python-novaclient/python-novaclient-7.1.2.ebuild
new file mode 100644
index 000000000000..d033672ac343
--- /dev/null
+++ b/dev-python/python-novaclient/python-novaclient-7.1.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack/python-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
+		!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
+		!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/os-client-config-1.22.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "testsuite failed under python2.7"
+}
diff --git a/dev-python/python-novaclient/python-novaclient-9.1.0.ebuild b/dev-python/python-novaclient/python-novaclient-9.1.0.ebuild
new file mode 100644
index 000000000000..ece49317acb5
--- /dev/null
+++ b/dev-python/python-novaclient/python-novaclient-9.1.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack/python-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-cinderclient-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-2.7.0[${PYTHON_USEDEP}]
+		>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/keystoneauth-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.4.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "testsuite failed under python2.7"
+}
diff --git a/dev-python/python-novaclient/python-novaclient-9.1.1.ebuild b/dev-python/python-novaclient/python-novaclient-9.1.1.ebuild
new file mode 100644
index 000000000000..8e02a5636777
--- /dev/null
+++ b/dev-python/python-novaclient/python-novaclient-9.1.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack/python-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-cinderclient-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-2.7.0[${PYTHON_USEDEP}]
+		>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/keystoneauth-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.4.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "testsuite failed under python2.7"
+}
diff --git a/dev-python/python-nss/Manifest b/dev-python/python-nss/Manifest
new file mode 100644
index 000000000000..b9d42a1877f2
--- /dev/null
+++ b/dev-python/python-nss/Manifest
@@ -0,0 +1,5 @@
+DIST python-nss-0.16.0.tar.bz2 208535 SHA256 cecd3a33c4cb4ab0f5a3c303a733b2eb62a3760b500e6b411313ab3b30f8e575 SHA512 3ff7d29f10942f4d36be8e223b518e046b5502f15029aa684b925cbd131bbc2041f7860abd50ec1344479b6e5594735cc9b7fcd801d7c4d1025f68e11a57cc3f WHIRLPOOL 543f27384b5faa61e2b1d26b54ac896c1a8b96308a6f2e6698cd0c2656667a0f1abc08cbc4143b2a5ca333195cf756936f366ecc614134fdf413e6e812b52e34
+EBUILD python-nss-0.16.0.ebuild 1720 SHA256 b1ad742c3d86dd9537255776f9d926ff65143cbeda41d5c4f8e9df40a4baa942 SHA512 cb5da9da5b6e199559b3a1ca6c2703434ba7745720c2c3e0e430aa4f2aed217f224c54e5b59fe954c1b51ef7f86d0bbe960be04f5dd14d75c258ce2054dbcc9a WHIRLPOOL cbb9a623b412143d610daabb66b055e39aa8017a4f4607c06411fb066575cb2dc7c472b1f69e1bc0466d1b7092012ffdfd7b28c1e69eedbeb21e1f9de0ab88fb
+MISC ChangeLog 3101 SHA256 b6295812ce493fa67b58797209d157fa1d075cda341c9a8ec8ac72eddbee281c SHA512 ef920c5f2a578ea3a2d3f0736ceba28cdd6c91e0d3f0cb6fa1e2836c5103a165b6167d2ba11d552f6b64a4ade6bf0a56797f45747a660378fc3036ee6e56fc85 WHIRLPOOL 2a770cec09e52db6b38c863fe45302c8c5e6425251a63b9df114e496ba4c116f81bef20eeb3f93f6a0cc080c86e61312518e2d2483c72e223cfd0a12ce2fa2bf
+MISC ChangeLog-2015 1681 SHA256 002ad4e195f02d0bf6dea6d82154a19c0ae56d03eb5ae67991ea60b7c4a6c2e7 SHA512 69d756120dd476ff6a47fc2a8bfb88bd25de90f7dd0a421440144255514b1ec0918f9f81abfea80710e82a7468bbb2fa7ee27af280484c287ec4d281dd1e34a4 WHIRLPOOL 7a0920f41cabc4fb6b8b659fbc8bf99b4bb6953dd09564df626c596226bd49297d2e5662731df3c1beeab04a369a1e7f13460a1e9a5d4cc46ca92c9076ed953e
+MISC metadata.xml 505 SHA256 5ad205acf037dfce7907f1bd8942cf29774487e84421b790eb5d8b0754648689 SHA512 9b4ae01e2612f9e20b48b279a55b50e98edeca8fd0a22edae789f24e7ac02c31a44986cf281f5acae7d18a443742019011f62151f5eb85ee1de5dd0e22b771b1 WHIRLPOOL b12ac6a40da6bc3a0695e9dc639d8a612dda8ff5a8ab89a27485806e33c5f70cd2c44b84ac732d2278affd977960f91a49d5214e1533fb6b5851be5b4d600aa8
diff --git a/dev-python/python-nss/metadata.xml b/dev-python/python-nss/metadata.xml
new file mode 100644
index 000000000000..0a19f527e50a
--- /dev/null
+++ b/dev-python/python-nss/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+	This package provides Python bindings for Network Security Services (NSS)
+	and the Netscape Portable Runtime (NSPR)
+</longdescription>
+</pkgmetadata>
diff --git a/dev-python/python-nss/python-nss-0.16.0.ebuild b/dev-python/python-nss/python-nss-0.16.0.ebuild
new file mode 100644
index 000000000000..2b7efd1e755a
--- /dev/null
+++ b/dev-python/python-nss/python-nss-0.16.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )	# still only supports py2
+
+inherit distutils-r1 flag-o-matic versionator
+
+MY_PV="$(replace_all_version_separators  '_' )"
+DESCRIPTION="Python bindings for Network Security Services (NSS)"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/python-nss/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/${PN}/releases/PYNSS_RELEASE_${MY_PV}/src/${P}.tar.bz2"
+
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="
+	dev-libs/nspr
+	dev-libs/nss
+"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/epydoc[${PYTHON_USEDEP}]
+	)"
+
+DOCS="README doc/ChangeLog"
+
+python_prepare_all() {
+	append-cflags -fno-strict-aliasing
+	# Remove test file using a dep, called nss-tools, unavailable in portage
+	rm -f test/test_pkcs12.py || die
+	sed -e '/import test_pkcs12/d' \
+		-e '/suite.addTests(loader.loadTestsFromModule(test_pkcs12))/d' \
+		-i test/run_tests || die
+
+	# exclude tests due to absent shared lib file, libnssckbi.so
+	sed -e 's:test_ocsp_default_responder:_&:' \
+		-i test/test_ocsp.py || die
+	sed -e 's:test_ssl:_&:' \
+		-i test/test_client_server.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		einfo "Generating API documentation..."
+		mkdir doc/html
+		epydoc --html --docformat restructuredtext -o doc/html \
+			"${BUILD_DIR}"/lib/nss
+	fi
+}
+
+python_test() {
+	"${PYTHON}" test/run_tests || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	use examples && local EXAMPLES=( doc/examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-oembed/Manifest b/dev-python/python-oembed/Manifest
new file mode 100644
index 000000000000..d1884067185f
--- /dev/null
+++ b/dev-python/python-oembed/Manifest
@@ -0,0 +1,5 @@
+DIST python-oembed-0.2.4.tar.gz 7981 SHA256 e0804ea3bd7ab8ec1460d139b7a92b6a9e4e3cddd83012dfe30cc67e314716ea SHA512 9eaae818e17fcfed2e53e7f730ff6837b3ec55bf977892dc05c79846b0afe6a3b6808e046ac8e41bfca587de07d1be40343d6b0df1a502418990e9bdb8d81abe WHIRLPOOL d705e84c8faf9174f302879e2620154c127762b53892fa9783203cba7e61b4681f3519cc30175b183f262a1bde7d148135bd7e5964dafed1fb16a5b0c11957fa
+EBUILD python-oembed-0.2.4.ebuild 555 SHA256 3576fd026adbf741755d6d2796d834af2ae8824cf1560badf643ef5db79bbc91 SHA512 0a79f16ddeb23e2081a01a78b9d45420b5cd0eb329cc2b38082ffa4408f19f4ce4fc0a380f2f31a0243a34102ce108467dc3509fa1dcf0dbe5ea041c17fcb0cd WHIRLPOOL adc29f4517343bfc614d1a5032ad62bf27949fe9d95a499f46df0c8dffad8a8e236f896f00b252dbdd0532d4d10ddd88f935a9b60993ec5fa34f9d2f567dbbd4
+MISC ChangeLog 2857 SHA256 eb32a6484710d75207187bdee2f22f42248c964d4c3b199e58aea2bc8b2cc29c SHA512 4c3bfce5c69fdadc6f321eeb5f1d02c97e6427e9726f7608ab28aa05489f77e8a7b55d67e422bec1aad7c250d81b0a6023eef2506bb53eb5db9666d4d4c9c346 WHIRLPOOL e53c2efa6cdae5423e0089dfd6cfacc8679d73d4650cc2b330fbdd15b1fbec8183c288333ead34df2abb9521b59e63a2d614069a5fe89267ffdd520f5f3ecc1c
+MISC ChangeLog-2015 935 SHA256 729c956f9425a46f3ad9941844e2a169d3978bd568e3ce1b7a221ca5c55db100 SHA512 0a948e445b8b8a4a1d8720c7013c0cdfc3b2cb89f56a9e4d5742dc95be2c237de3cdfa9d4e827ccd3f71316b14000ff469bf47f2d2601895a0eacfcf98c60a9c WHIRLPOOL 7cd000aba2ac49b21248f8d16c0f45a98604f171352438352306b7fcf376efe22913d8e3a6042022e41e75c64ceff50de4664f7a09ff4f91c2f2eca4e23ecbe8
+MISC metadata.xml 326 SHA256 855447cee7bb2c8c8eb5e020d7ceeecafe8825c1945dfdbbb8c9611542f6f9f5 SHA512 501b084afb50bfdcd4a18fd9ad3e14d394fb6e7c33c6afb41c61345413dd976b5b56af25b4b77e1e43fddabedd152efe8dfd5310a0c2d5d05fd8dc57eb4a6d18 WHIRLPOOL 116f089b46e400547d89990f701bea1d464a4a2496405da63e567f5af93b0613f9788360d7bc60b4334261be2322a70ab3e44d40f0664a8f1c410dedc684480e
diff --git a/dev-python/python-oembed/metadata.xml b/dev-python/python-oembed/metadata.xml
new file mode 100644
index 000000000000..334a97be4e3e
--- /dev/null
+++ b/dev-python/python-oembed/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">python-oembed</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-oembed/python-oembed-0.2.4.ebuild b/dev-python/python-oembed/python-oembed-0.2.4.ebuild
new file mode 100644
index 000000000000..28f9e2e50384
--- /dev/null
+++ b/dev-python/python-oembed/python-oembed-0.2.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python library that implements an OEmbed consumer"
+HOMEPAGE="https://pypi.python.org/pypi/python-oembed"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+python_test() {
+	nosetests || die "tests failed"
+}
diff --git a/dev-python/python-openid/Manifest b/dev-python/python-openid/Manifest
new file mode 100644
index 000000000000..f67dd81b0352
--- /dev/null
+++ b/dev-python/python-openid/Manifest
@@ -0,0 +1,7 @@
+AUX python-openid-2.0.0-gentoo-test_fetchers.diff 566 SHA256 f1628b4743a74cc5bc354531bb58888498d1d46ec802ee5b26f1761356912908 SHA512 60cb8b12312b3727263808647dd592e295ead7cebb384f92a33afe71292267e0ab95196dfdb7a01ac8847c0565c5dc9ad81f3cb95c00d6e4c9d816941b71fa44 WHIRLPOOL 890e07e57bd913dc47d6b1d7ecee65454348dd7dc310a15bea6f0211066a8428da22f7a4fcf15e4d61ecb79ef550c8dadff8bd01bf900e3bf6bc9a945c9ece21
+AUX python-openid-2.2.5-tests.patch 321 SHA256 d1a35aa30acdda3b2934a1733df36f17e432c21a1fbbcd04e804b736b6a5dce7 SHA512 2d0e65763ee5fa4325e03e524ce179c367a1ba3119ce55bec458ed37bee05bb655c6a4dbc0d57ad4c20ebe22246b87da458cc688eed7d10f2cd1003f0da3f70a WHIRLPOOL b3d44aafb2e89c5d2b51ff5266cff54f75c7868cfbcc04ff986cb5cf14c9b399014bbca6132183e107e00d704a72112b63a9d4af3dedb3783bc2d72dd4f7631f
+DIST python-openid-2.2.5.tar.gz 300524 SHA256 cb518b0804ccfa859d143753d33f49204c7d994cb08d1a2736fb841a1e7722e3 SHA512 46ffeb07dc0e94c6e1160c824dfafd4a125746a05af1541e112bc2691bf655f75d0431ea273877899abc2956bb1f82369dea75d9b54282f33875f333f5166e7a WHIRLPOOL 6f53aacde4eef9d18b617d57bfad149c77aa6db6c1aa3e6b4421ee89a920ce9bad76f3b5ca14654719cc9ac297827e21a19685ab6a2ce717c03d5de855eecf16
+EBUILD python-openid-2.2.5-r1.ebuild 1552 SHA256 4ef97928ff353c2c37f166edcf16ef7a79877cb4d36e239a7c0bda5054ae9869 SHA512 eb33263c2b6185f8afbbc9e4d5232dd4018d9c5e79da7889135c83766708de3c3fc4f068b43e22a8ff9c377465c02d6c01ea3d2642c576f6c4c52f9fab24a9e2 WHIRLPOOL 94e78bf7ff9df053c21b06e5150b2a45e41acaa38ae5d43d5a87a70760035cccb2d2cff52442b923308cc096dec571a34004359a371dc6990c99e63b7dccb89c
+MISC ChangeLog 2925 SHA256 34b99873d768ea6fd961e2cf34d33be9cb504f902c59de23205bd523a9e8297a SHA512 048e70500b8f3ce311591a2929d753e9da59810a9f3bd26787bc05e9f7953bbfe29dde0bb288499c573bb1b63627b8c2e641a70aff1a5d5b5dd43f091f8c03bd WHIRLPOOL 612da413c2e977a066c33edb70fb0bf989acf48ba477a0a5182d4be8460c2bca2d92fb0cdf2d7d916cd9bfe61a43f00e968af802e854c11bffae0d97abb826e1
+MISC ChangeLog-2015 4930 SHA256 4df9b45cd5ea214508dcb9e322bd7d0108ceda1c6f9eb41adffb4b636da9ffa0 SHA512 92e3da3f8f919ae664c7824d7e9b97389cf2ab11995bd48759933b44af39b94827a07033263cd09ddf3374d63afc8db1382788adf6f9c69c7f59240ae5b702da WHIRLPOOL 611f5e64eb79bcf56abe99523f0566225cd8d39fa2bd938032f872bef19d7171a18de130ca6da478976b9a8774cd35ff0e350aa9cdf9feab2c989dc5d4cc91b2
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/python-openid/files/python-openid-2.0.0-gentoo-test_fetchers.diff b/dev-python/python-openid/files/python-openid-2.0.0-gentoo-test_fetchers.diff
new file mode 100644
index 000000000000..67587a98533a
--- /dev/null
+++ b/dev-python/python-openid/files/python-openid-2.0.0-gentoo-test_fetchers.diff
@@ -0,0 +1,11 @@
+--- openid/test/test_fetchers.py.orig	2007-06-07 15:53:38.000000000 -0700
++++ openid/test/test_fetchers.py	2007-06-07 15:53:55.000000000 -0700
+@@ -8,6 +8,8 @@
+ # XXX: make these separate test cases
+ 
+ def failUnlessResponseExpected(expected, actual):
++    expected.final_url = expected.final_url.replace("localhost", "127.0.0.1")
++    actual.final_url = actual.final_url.replace("localhost", "127.0.0.1")
+     assert expected.final_url == actual.final_url, (
+         "%r != %r" % (expected.final_url, actual.final_url))
+     assert expected.status == actual.status
diff --git a/dev-python/python-openid/files/python-openid-2.2.5-tests.patch b/dev-python/python-openid/files/python-openid-2.2.5-tests.patch
new file mode 100644
index 000000000000..e5d17463ac95
--- /dev/null
+++ b/dev-python/python-openid/files/python-openid-2.2.5-tests.patch
@@ -0,0 +1,10 @@
+--- admin/runtests.orig	2016-01-01 03:32:55.835000000 +0000
++++ admin/runtests	2016-01-01 03:32:59.163000000 +0000
+@@ -93,7 +93,6 @@
+         'test_htmldiscover',
+         'test_nonce',
+         'test_openidyadis',
+-        'test_parsehtml',
+         'test_urinorm',
+         'test_yadis_discover',
+         'trustroot',
diff --git a/dev-python/python-openid/metadata.xml b/dev-python/python-openid/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/python-openid/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
new file mode 100644
index 000000000000..b6a1cbf1d8e8
--- /dev/null
+++ b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_REQ_USE='sqlite?'
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenID support for servers and consumers"
+HOMEPAGE="http://www.openidenabled.com/openid/libraries/python/ https://pypi.python.org/pypi/python-openid"
+# Downloaded from https://github.com/openid/python-openid/downloads
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+IUSE="examples mysql postgres sqlite test"
+
+RDEPEND="mysql? ( >=dev-python/mysql-python-1.2.2[${PYTHON_USEDEP}] )
+	postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( dev-python/twill
+		dev-python/pycurl )"
+S="${WORKDIR}/openid-python-openid-b666238"
+
+python_prepare_all() {
+	local PATCHES=(
+		# Patch to fix confusion with localhost/127.0.0.1
+		"${FILESDIR}/${PN}-2.0.0-gentoo-test_fetchers.diff"
+		"${FILESDIR}"/"${P}-tests.patch"
+	)
+
+	# Disable broken tests from from examples/djopenid.
+	# Remove test that requires running db server.
+	sed -e "s/django_failures =.*/django_failures = 0/" \
+		-e '/storetest/d' \
+		-i admin/runtests || die "sed admin/runtests failed"
+
+	rm -v openid/test/test_parsehtml.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" admin/runtests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
new file mode 100644
index 000000000000..6b3e0ac78d45
--- /dev/null
+++ b/dev-python/python-openstackclient/Manifest
@@ -0,0 +1,13 @@
+DIST python-openstackclient-2.3.0.tar.gz 329808 SHA256 5cd301fd11ed271175b2a656c0da4148332257b52d994891e61d3535870b4ca1 SHA512 efc58927c109ea227322371f6a6ef165be2878a8559f32b315b73a2d70c1f0aeb96f7dd2fa91b765ab85462a566569d412b13411aa859fef3b8ae5e73d2eceab WHIRLPOOL 92fb3d2834bbb54f16e0f7760f223e5e94e3b933ca016c7b80eb6562af25a9fe1d3428b02fe2c7e1cf413cef6a8eb1abaaae2814acd8914b1bf1f7f8793b403e
+DIST python-openstackclient-3.12.0.tar.gz 617159 SHA256 e74e1561dc0ca9aa2193d3e4968f13fba1726deff3ec026eba319fe706d11950 SHA512 a36c17d2ed138e984af978b436beaca3ae8efddc089ddc6b9fda9e51bdb4c8fc1cc645a68225cc08709acd368ff7d2a70f748f7be752ad8e68fe59b4eb36802d WHIRLPOOL a890352dd6929a75d8601d5cf8242b54f57488b76dac6e8aad4e599b361034c08ff01326ad0307f7cbe0af68924a510a9f493aaf47338d28fc5587e06ffcda3f
+DIST python-openstackclient-3.2.0.tar.gz 431887 SHA256 4f66ccbdb2b3de71d69fee305a9585435cdaa0f9e523240c2f6c756555283c7a SHA512 819e4de30322c3c057799467eb2d9ffa3ef5c5060e49d7fb2c023a077f49c86e6c5626acfd01288cfc5dfdc551ef2702cd61c7c10721c00af579aaee72182f99 WHIRLPOOL 0aaccf7f460e5932257208aec64824271af70db0f64ec44f1f0c644962c77788afc61d7c5e7777d6fd65bdaa45c3c339e8a682b8705cc668473e2d15167c6ec2
+DIST python-openstackclient-3.2.1.tar.gz 433929 SHA256 29b221fb34d347a167037e64619f9d6c2d7f13fe60ba17a43272d686e16d69f5 SHA512 a7c20713e357112f68021cbb4d031b32c16a82622a112241f2b9c3e2b815ec56582ce2a088b99bdef1447698f5c67accce412710238be674cdbb8442126dd31d WHIRLPOOL 1e39f70c9f9a4ef2a64ca03ca8756cc7c8e43ad6e39311a31621fa481bc5a759b6903da11f5ef7240c35f30a4dd00d91650709cf0f39205166362ba7521dabcb
+DIST python-openstackclient-3.8.1.tar.gz 535278 SHA256 a64577380f5a5d1df1b0ca3a5a70b40245ba4744e1f655a58fd70aad2f6a796d SHA512 d0f588dd6e7d978fee7f3a017b591e40d426907d602fa501ba49b5e7b94f9e1d19aee4da0ea8ef99311dc2cad778e2f2414765fa6bc79780346203539c0b5a19 WHIRLPOOL 8020972a87fb02b9d34fad11f6260866281cf55aa4ead237983640b0900bc8a8c00fee45ef2c9af954e055acf7beea5bf30c642449d680d61933e1e21e65736e
+EBUILD python-openstackclient-2.3.0.ebuild 2596 SHA256 402c2d829b75d4ec1eaea440dd6f7aea3882d33949aee6ae110455eaf111bb5c SHA512 c043ba1c92efbda514b6dca3a88e29de36c6bf1b28d6b85ea95b3f6cf09d0c19904015861110489d38b0787f010becdef45c8f33cfa87d7acfb474b2fe2afd96 WHIRLPOOL 6621a2e7aa476d2fd44cf73d1dda42bba91471d90c6de51c7dee32bbdbc912f867c717b902f858145d9e9af9efbb6611e7001292200761b01c728ae7c3383439
+EBUILD python-openstackclient-3.12.0.ebuild 2583 SHA256 7819d0f4947fb694f6549cdd68a179d395c94dd3b3fda595ba091d4a658270c9 SHA512 b9bec6ebe556364d05436f7b13324df99131bcfc5e105ed8fce7a3f3eff67c6b50e94a54851732e03db549fd1dc08f1b415a3da4148f2f993bd2f566f390237a WHIRLPOOL 7be434883bd2e5cca9452c95c85e6ce9521e8d03133e558a804d0d25d866d8803483bfaaa1e2b5b621a86fd3eeb10b03d1d8fb39744b0412daa0cbfa375d3309
+EBUILD python-openstackclient-3.2.0.ebuild 3181 SHA256 f271e25aa920ffcc8feb6f81761517c94e42c86a00c62cb20c50c5757108e791 SHA512 cb7bc2f7b246374479e2a9eb4638be9bb095754616ab2034663ecebee0d55b78d55624bd54a66451b89bf9629ea48495dca2d1d8ccb2558cf462fe399ee1368e WHIRLPOOL 39a2be8d693bd1f377e76b5e1dd0ad2624788fea7b7bde2bc98530faf985ef1166ca7d77bbdb866dfd3ead7d465bd41ee8353cddc7338daa8ca71acaeb8da2cc
+EBUILD python-openstackclient-3.2.1.ebuild 3181 SHA256 9a0c3bf140925c709f0cc13ace532764287734e79f19874978cc51dd9b3940b4 SHA512 44a642e3ea9835f6df944ff6160f8e54c28f0a97dcc118767468fef5020358bf70472fad0cc5fc662cc2e0e1a3b24b66ae87794e8563ddc176d4658e99c461c5 WHIRLPOOL d8e0cf64e30aba371f8a0071a1f2e817138ae7f2db97b64e143d7b10849776b9d809065e78354bfc90b07a705e575be3c2fa4b2b5c6d4088369c8775d0d6862f
+EBUILD python-openstackclient-3.8.1.ebuild 2542 SHA256 2579cff72040d1dc8f2297a3c1421691ef8d2d846381fa8c6708d364725f2673 SHA512 20204673dd647b904c9fc73291c9f397e99ed91daef3e46fd2d877a4598531f1eb443a4a0a199d2a09b0bc2f9a8bfb88132278e3b92a1d77a2509abb62f19d8d WHIRLPOOL 57200556b925d7596f741e8ad2666f21b200de1e10d117388589d5ddb38ad65ebc54a9b50eee26e4723d66758615b118633ca4239619aa0e270808b5718492fb
+MISC ChangeLog 5622 SHA256 c4ccadbcf5e8c0a3bd501405445803d2f1f7195721a0b0955f6d6b1164ba96e3 SHA512 3d6e9395c6fb7ca618c7d193bf90f9b5fa4d46a4f63c1926f02b0f527e9b204a31b0cf6c62ae24fe98c24fdeb853a6166c3a4ef598172551062b452db3438e15 WHIRLPOOL b0ddb53099bfb611bdd518be1e81a6fccd23ab82796302ae7601c28526c5adc83167504f82136cab8caf4c4927a063629db86a37b820c75ab695be1454c21099
+MISC ChangeLog-2015 429 SHA256 ad01346436fbb6e2dae81a433357d8aa4017c5c40a3001c8e859ee3c7d864e5e SHA512 77ac82cec5fc691360abc20cdc2006b372d9bf016b9736a0b519633f5c019ccd152b1cf1a1889815a29a5c7c383cb6d4bffbd276d564781d2cfee743ef35900d WHIRLPOOL 5b7f93986e6c4349df3261d32d113e854a9fffc3f783cacd56480b71a3d1287903cf8d00fe895b4c48f0dfbd1851e5e6e067e95739042270562b1a9acbcc8518
+MISC metadata.xml 632 SHA256 a755ba188c891335e9d4832ccc605ab289a294f575131226bbe907e106863237 SHA512 c37cb6d5ee55b8f7184a2db66dab3e6fbc3627b1869487e9d4e00928cdf1dbfb5d3d28a2d7f72290503b10b393a193a9849c497df6438ce230e418b68fd3ca4c WHIRLPOOL 786c54539773b5693b88ca99952089852c7afaa875176d49de83cbe5fea4787586f602163ac2d0dfee1243aac891aa9b7e5b1c1ffb70a43db19cc62976cb72d1
diff --git a/dev-python/python-openstackclient/metadata.xml b/dev-python/python-openstackclient/metadata.xml
new file mode 100644
index 000000000000..4f42e4205fa0
--- /dev/null
+++ b/dev-python/python-openstackclient/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+    This is a client for the OpenStack APIs.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">python-openstackclient</remote-id>
+    <remote-id type="github">openstack/python-openstackclient</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-openstackclient/python-openstackclient-2.3.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-2.3.0.ebuild
new file mode 100644
index 000000000000..348c5524209b
--- /dev/null
+++ b/dev-python/python-openstackclient/python-openstackclient-2.3.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack APIs"
+HOMEPAGE="https://github.com/openstack/python-openstackclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/os-testr-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.14.0[${PYTHON_USEDEP}]
+		>=dev-python/osprofiler-1.1.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-2.29.0[${PYTHON_USEDEP}]
+	!~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# clients aren't actually needed
+	sed -i '/\-client/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-openstackclient/python-openstackclient-3.12.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-3.12.0.ebuild
new file mode 100644
index 000000000000..f0beb0bb3871
--- /dev/null
+++ b/dev-python/python-openstackclient/python-openstackclient-3.12.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack APIs"
+HOMEPAGE="https://github.com/openstack/python-openstackclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/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/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
+		>=dev-python/os-testr-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.9.17[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.0.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# clients aren't actually needed
+	sed -i '/client\>/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-openstackclient/python-openstackclient-3.2.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-3.2.0.ebuild
new file mode 100644
index 000000000000..0aa98cb488de
--- /dev/null
+++ b/dev-python/python-openstackclient/python-openstackclient-3.2.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack APIs"
+HOMEPAGE="https://github.com/openstack/python-openstackclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+		>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.19.0[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.19.1[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.20.0[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.20.1[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.21.0[${PYTHON_USEDEP}]
+		>=dev-python/os-testr-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.9.4[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
+	!~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-2.29.0[${PYTHON_USEDEP}]
+	!~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-1.6.1[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# clients aren't actually needed
+	sed -i '/client\>/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-openstackclient/python-openstackclient-3.2.1.ebuild b/dev-python/python-openstackclient/python-openstackclient-3.2.1.ebuild
new file mode 100644
index 000000000000..a4369afb564c
--- /dev/null
+++ b/dev-python/python-openstackclient/python-openstackclient-3.2.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack APIs"
+HOMEPAGE="https://github.com/openstack/python-openstackclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+		>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.19.0[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.19.1[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.20.0[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.20.1[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.21.0[${PYTHON_USEDEP}]
+		>=dev-python/os-testr-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.9.4[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
+	!~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-2.29.0[${PYTHON_USEDEP}]
+	!~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-1.6.1[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# clients aren't actually needed
+	sed -i '/client\>/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-openstackclient/python-openstackclient-3.8.1.ebuild b/dev-python/python-openstackclient/python-openstackclient-3.8.1.ebuild
new file mode 100644
index 000000000000..c8d7d6f2f6ec
--- /dev/null
+++ b/dev-python/python-openstackclient/python-openstackclient-3.8.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack APIs"
+HOMEPAGE="https://github.com/openstack/python-openstackclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+		!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+		>=dev-python/os-client-config-1.22.0[${PYTHON_USEDEP}]
+		>=dev-python/os-testr-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.9.13[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-1.6.1[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# clients aren't actually needed
+	sed -i '/client\>/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-otrs/Manifest b/dev-python/python-otrs/Manifest
new file mode 100644
index 000000000000..31b7f66cf99b
--- /dev/null
+++ b/dev-python/python-otrs/Manifest
@@ -0,0 +1,3 @@
+DIST python-otrs-0.3.0.zip 23640 SHA256 069f839f94c5be0d3572d77e843b9fdaef9e4410d67449263dec4c0a5fee0e9a SHA512 d1c08c4f0a147d340af097a15afd0c294ba575172891e4a40385b670b7f157ece05abfdedddc380f5509c7dfc3021f1df81b227b5ad0de71e015c2ba6e067e7c WHIRLPOOL 2440d5dccd56da47cc9b4482643684cb9b2753f7f9d7f450aa56a5ad9a3f550d10d16fe3ab3d49421c290135f57a128a3230ddfa176aa6c81aba88ce21938e0c
+EBUILD python-otrs-0.3.0.ebuild 462 SHA256 992735da139cecbd1b82c09cd7f657733b59911339ae7ef9b8ada630b28be762 SHA512 20495506469359ac8ce9ee7ba5ae30d703e304002f7c355c7ab8ea7fdf0c0da807d2b1e52e555955b9982ca96363d6d8e8a782b7a8d5033aad4a44eb9f9379fa WHIRLPOOL df39a506f1798e7edae7929db6b5a88306628a09172bcbfaf007faae60357fffb64e5417746bf73bba16790c29f4dd262c028684bebc4940aba3dd1803060943
+MISC metadata.xml 489 SHA256 d585c69ba6b2d5aaa958e11f98d06a2a16d038685e381cd7304f9f75e23cd91a SHA512 2dd15d140baeb3f7ceb100eefd96aa2af0753551bbddfa49da17a6bffadc7a57bdb310b4f70b955e20b2b25c103dd34a0dc5168dfeefe9ed245f1b0f1590a447 WHIRLPOOL 7bb2dfc4d9787f3386f10a7711ffcbe2cb927d591ee0e81692b7457638c80f1c841c72d7211a8bc2b2806fac5111d69e87d45439d52b6ccb42a87e0e0cd29a38
diff --git a/dev-python/python-otrs/metadata.xml b/dev-python/python-otrs/metadata.xml
new file mode 100644
index 000000000000..5ddfebb2f48c
--- /dev/null
+++ b/dev-python/python-otrs/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">pynag/pynag</remote-id>
+    <remote-id type="pypi">python-otrs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-otrs/python-otrs-0.3.0.ebuild b/dev-python/python-otrs/python-otrs-0.3.0.ebuild
new file mode 100644
index 000000000000..aec0096d0513
--- /dev/null
+++ b/dev-python/python-otrs/python-otrs-0.3.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A programmatic interface to OTRS SOAP API"
+HOMEPAGE="https://pypi.python.org/pypi/python-otrs"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/python-pam/Manifest b/dev-python/python-pam/Manifest
new file mode 100644
index 000000000000..7cdeaa10a208
--- /dev/null
+++ b/dev-python/python-pam/Manifest
@@ -0,0 +1,5 @@
+DIST pam-0.1.4.tar.gz 2637 SHA256 35e88575afc37a2a5f96e20b22fa55d3e3213370d4ce640af1597c2a1dde226b SHA512 a8bce582f8ed375a5e503ec0b8e4853164125222e9cee40f6f6509def5fbeaf0eb0d2242b0ef7405024b7f8cfc0660ea7c43d266e8923a1a2ff3054135f5da63 WHIRLPOOL 6ee3ae35888d6f07963bc061f457243c8fcc2495e84febb316074d43873e89bf9563c8d00f5202ec6a4aabecc06cfc3e0e9cf5a49814298ba9c61cf5c4ef4491
+EBUILD python-pam-0.1.4.ebuild 501 SHA256 a2c9587d7eba7327be638682892ae582e5d8fe3f3bc0137865555356d68dff88 SHA512 8f70a6d9e28b29814955ca6b38ceef6f65b0a1b0e57216f1daedf7c5892b7841bf387117303c0f84229a68f2fdf293790ac8406fb89c7bac42b605f739bc2d55 WHIRLPOOL bcbaf4be70f93f7f872ad9c8da26e2c093f2b22f8d55895c3f329fa8af4278ca23c77745239d9ad9dad962ab51df8c3d55f1c0056ca4b5844a2e1fdba4b22ad3
+MISC ChangeLog 2187 SHA256 f2814151700c853126c75cb6ccc1497eed550d140d0c473de093be78b3a81858 SHA512 76cbfe27acf5b5484b72f582bc8616250b5d9784d7b709bfa449d36e86fff4b1b8cbb4437f2b741127b5c6fe58e8feedbc8bbc7b451eb2ba2e1638ff574d0211 WHIRLPOOL ea01e87140e32496f997796dd517ab8bdc18e2524dbc16a5b5612d4860b029308073764c537aa3d4cf1d90d145bb6a9886df16c636e6b18472a7294f21d29aeb
+MISC ChangeLog-2015 988 SHA256 239a2f56e1d1ad6c58027e5c44ff4eecb201e1c2736ad38fa916f7ae2af11022 SHA512 8286502bf0935f620fcfa9b8e3927fd67abdc4844af40a351f03fb76778cbeab26654095850bd54586b3fa4a917dbf599064f8d8e9133a07f4cd178b6869b34b WHIRLPOOL 474d8e70351edd2fe2007eb0f7ef92d77b7ce434e83d8d2a6634cc7a248e057757b5f4cd74c323bc591dd9d8b05ec3f884458926b2299062fbfb6ef87f4eb436
+MISC metadata.xml 446 SHA256 1e411e5c0a3b7e3682bca15a24cddaf73779ed671a6d16b7ec1ab7a7c6b97416 SHA512 b69b1ed0f56be4dfa7fb6fbc41bb6d07fa788f6b9a81a9d0aaf066fcaf89b1e2c05475d76f9edf2c71a749e477ab3de71ebb0a05649ea255d5446556d62bec25 WHIRLPOOL 6f54299c7f09c9f0099f07c93378a41b7e2f8c19c319c60bed8bfc8775d0792cdac13834968f9bc7033132728cd936dca1de0c7f010d6ad507cf06729d9da5bd
diff --git a/dev-python/python-pam/metadata.xml b/dev-python/python-pam/metadata.xml
new file mode 100644
index 000000000000..6c6bc5d28824
--- /dev/null
+++ b/dev-python/python-pam/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+    A python interface to the PAM library on linux using ctypes.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">pam</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-pam/python-pam-0.1.4.ebuild b/dev-python/python-pam/python-pam-0.1.4.ebuild
new file mode 100644
index 000000000000..99bc3fe4b05b
--- /dev/null
+++ b/dev-python/python-pam/python-pam-0.1.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN=${PN#python-}
+S="${WORKDIR}/${MY_PN}-${PV}"
+DESCRIPTION="A python interface to the PAM library on linux using ctypes"
+HOMEPAGE="http://atlee.ca/software/pam"
+SRC_URI="mirror://pypi/p/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/python-poppler-qt4/Manifest b/dev-python/python-poppler-qt4/Manifest
new file mode 100644
index 000000000000..4e60284d1495
--- /dev/null
+++ b/dev-python/python-poppler-qt4/Manifest
@@ -0,0 +1,5 @@
+DIST python-poppler-qt4-0.24.0.tar.gz 17452 SHA256 164297bcb03dc0cd943342915bf49e678db13957ebc2f1f3bd988f04145fb236 SHA512 5f03e85f80f2ed4d560ee001a1c0394ddb2ccde504bf8564ceb700af27df8ed41de9fd60e058ce72e32d8ea37cb7706446f0793b25d8475803956653b82e593d WHIRLPOOL 8c242951c47d7552cdf61c55b5074ecc600efe52cc948ea96cab5c06d39f6d2beb72cdd642bb5dfde89952e3799691b0911dd86bdc46e4107f07e96986b3984a
+EBUILD python-poppler-qt4-0.24.0.ebuild 556 SHA256 cc5d15eb60a7d8e6c8f305f8bcd686dcd37541c08308a3660751dc6c707e69f8 SHA512 c3ac5972df04ff3f96f1c056241400f700a7a45d9ac8bc2e414feee77a442dfa0cfebeb45a783421e7aaf73d73e2ce872e0cd271205b65b69daa01d1f5e37d38 WHIRLPOOL c5b171ebb179026b428b3261763a06c8292e5889a68f6b00bd26a55cffb6999178c4b91d189037a0020e897a3ae3576807c720e15556c450ad5a1e44fa8016dc
+MISC ChangeLog 3305 SHA256 979e5075b4821c9685c6ffea9b5c545e75f00ef23366914666d8bee5eae74f27 SHA512 1c11b08fa6e1e3e4a7b0539f5f6dbad68e9ff588387670d724be28b61c79c18df7673f13c763ce1644faddf0b05b85c65ee5ae48163be7063ff20b3c76d122bb WHIRLPOOL d4d788c80fa998135a61b52ddff4a0a2dfddbdadd34e83ef2e4f65d3eff29172315202ab9475e9dd14de59c2de5979c3e9af8d3d18a86a44a4bd32ab121ce394
+MISC ChangeLog-2015 1796 SHA256 bd16664a9e723735918028c7d0f746aa95cd45b645c920ab482d0a0504bfba4e SHA512 a503a04f320816d779494c0318de47816cfc36d3e54aa5a63bb4f60e71e5f5d5a4c9fccaa5e3ea535a7762e611c09146e7ec65ca8ee8fa446f5b63eaecaee557 WHIRLPOOL 07e1f1b1903d8cf398fd32999557201155dae2cd02d949f613256dc52e92d7d6355eebd6da8c3ccb86f89708d68785e1a40297cac232f33849ca66a76d6ef497
+MISC metadata.xml 405 SHA256 1e05b67a98257ce08fe3a7ac37a1b38725086795377b6895678259115a0eebbb SHA512 7b904d2b9fbdc5443ace11cf7fe0c49f74db5bc7d366237e99feec0606ef59dfa8fc96272d514895a14fdba13d2d7444de28f1869b890a5bd8c86385f4713913 WHIRLPOOL e5cfc004ac9082f39714237e5c43b0c0002e9ded63070cefe272e33b493a28a76c522171aeae961125a23c7c16456b2a6d2738590641cfce4bee248599014ad3
diff --git a/dev-python/python-poppler-qt4/metadata.xml b/dev-python/python-poppler-qt4/metadata.xml
new file mode 100644
index 000000000000..9823dbb3d164
--- /dev/null
+++ b/dev-python/python-poppler-qt4/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">python-poppler-qt4</remote-id>
+    <remote-id type="github">wbsoft/python-poppler-qt4</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-poppler-qt4/python-poppler-qt4-0.24.0.ebuild b/dev-python/python-poppler-qt4/python-poppler-qt4-0.24.0.ebuild
new file mode 100644
index 000000000000..8c22b0c799e0
--- /dev/null
+++ b/dev-python/python-poppler-qt4/python-poppler-qt4-0.24.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python binding for libpoppler-qt4"
+HOMEPAGE="https://github.com/wbsoft/python-poppler-qt4"
+SRC_URI="https://github.com/wbsoft/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-text/poppler:=[qt4]
+	dev-python/PyQt4[${PYTHON_USEDEP}]
+	dev-python/sip:=[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/python-poppler/Manifest b/dev-python/python-poppler/Manifest
new file mode 100644
index 000000000000..aacd3a2c28b2
--- /dev/null
+++ b/dev-python/python-poppler/Manifest
@@ -0,0 +1,10 @@
+AUX python-poppler-0.12.1-75_74.diff 1814 SHA256 3df92cfdbc3f3b3868d9d52a44074e6d970aed84cbb6cdab88ab499cce61142f SHA512 e9882f399f45dd0ce59cac91a36719dc88246abf2fd61736bc1be742796e5dfae85ca51d171388e04fe2f16065f5485f6a91ec16697ab1000904295562cb300f WHIRLPOOL 26869bf3680ae87b2cb3ed5505fcc3ca5372cc1265534ad2a6b6434f6ddc68c7c220cb4f5f915b6ad5931aab27bc77126a7048e16af65982bf2d65730ca0c078
+AUX python-poppler-0.12.1-79_78.diff 1434 SHA256 d95a50df3f46d3a86f1ac2e60a179b336e0523435fa92180abfa7966dde8eb9a SHA512 0951d34b751d95d7d38ccfdc1ac4f788486d202ca4a4663cf7ecb8d7f9e27260b026258ac5b26f8fa021f12ce2a168f83442118ee6c4f8c35d2a925417df55e3 WHIRLPOOL 7e6a16ddcfd494c63d00107e4a0be475e2dc255030472139d91599c7d9227c4b6f9a48ef176d61d2d2877dfb79ed34b3e95cddf7c84ecd5d5147b851a5950195
+AUX python-poppler-0.12.1-poppler-0.18.0-minimal-fix.patch 1667 SHA256 e2c60e30eb65d11c01c68ec31e6c1642c9297938cf642228ddc8be423388d40e SHA512 4117f99441ff88a1e77892ba959003d6a5540760222d387e9067c4fc99afcd68dae5043ff8827787a3082f9bc62e779c91ea7f09c576ee9bf94af24017f22023 WHIRLPOOL 9cc6b86a4eaffe19e4593afb09714f0940f7e0a4d8ec4a86c90864b0a4337cb087d99f3fa44e76d0156cd006ac928f8f5cb037807f31df707b6f6126f205dafd
+AUX python-poppler-0.12.1-poppler-0.39.0-changes.patch 542 SHA256 2fcf630eb7925cf1c56e15f3a2cf36bc67a2939fe8619337261f655e87a706b3 SHA512 ac38068df3db8dc92c981e9e7c5f7de8c2e4fb47a39977b9bbb8e735a686a2e64a750ccb27158cc97b060d3c878be300b750505094e9cdf3c7e465b2cdfbf39f WHIRLPOOL 53d1f1a9095a261490d2f5141b3627291cd370a4f0757b9216c2f89b6fa8be66d6bcad31aa05adef1cd8b859cd59c8454331889c9cbaa8396c65e44afb568ac3
+AUX python-poppler-0.12.1-poppler0.15.0-changes.patch 1415 SHA256 e216bf0dc6edba4e414ace0b1911e3e07d06bea5711ecd4378ec2df062b7d532 SHA512 932cad26447a8f8e03199eb91fa2cf422a91575543ad39066f8850f22e80c8ab8f42568d58975fdc73008ed4b2ca1b64cad1b84a1a9dcdf2414772daaa1e2906 WHIRLPOOL 0607bf11e049f0ea685d9ef7b69c66ec3c496de4008572df826ce1d3c98e84cd00017d65c0eafee1bdc03e0215a6719b48ba26187491a886f73a422a04bdfa72
+DIST pypoppler-0.12.1.tar.gz 318142 SHA256 322f183d24798a056f3005d1ab8e3ac27d8cfbbf0982725b323bbfec1bab5355 SHA512 04055411adc19f6af499a7cba0d6c5abb51e0802dd28962f833da3da1caf6ff274ff67d082f9c47548dac7a4ceb1bccf9860cda71fe48b8b7df74c0132498d20 WHIRLPOOL 4419c8dffeea1633374ac0f08222c23850127427543d9ac99385d08567faa402575375bea5595c746adb1d54aa3fe08870bf7a3dc1e84986b44000fea0afbe6b
+EBUILD python-poppler-0.12.1-r4.ebuild 1473 SHA256 b60f279b9e70a545020e83c3607f42e9ef0ecc198c790e4905c41f89cc1bd7dc SHA512 0d4c2fba74e7fbf8e70379b58ec554bb5f981870ed540b25abde977a80dfe277c88f6487ff0d73acdb92be399987eb168cf54cbaf626df9f818b15f5baff6502 WHIRLPOOL e68bd6782049a43ffa61656849f6ea3512123a0d14f8d2c19c697a55a9bbb7411beac3c4a3ce53b422d91c7c8ad6624a8efa3b412c107ea0669f995f1c82539a
+MISC ChangeLog 3795 SHA256 929978c2b7f46ddcd292abb4bb3016b3525301998cf1e9efe63b5f1b56685350 SHA512 824c4c8341548169727f559d51b33edb072395ea6d7eabddd3421b86633489d3551bf0e02143f9a038297c4957000ef086c9940480a7944f8f4f4ecb1e1b3852 WHIRLPOOL 50d396185bd700ebc83a8812e6151c8f5e35f60154d97a3bf9db6eb2ae9fc21eed4f4a0c4b5d2a6e95872e196a50fc9cb4b3b0dfdb0836bf8fc886009978acce
+MISC ChangeLog-2015 4926 SHA256 6292018c34861e5c3112656c04eb0256a313c564768739f0f77d5e2fa0c2320d SHA512 7de21a817174a07553027e45cd2e1d5ffd5497f756ccd112bccde09fc55bf1b7cbe7efbc58b3936ae66ebb0489970eda8d5e4b473823a9a33df44749fff3bf1b WHIRLPOOL 73a61f6f72ddd776a3607c69073c7f6ad6e9af1fd16c5ceeb9a62d09357836d8ecff6b11551d345fd64b783aaca08909e35599ec1fcd7db47a4c2f4a7c38ef51
+MISC metadata.xml 322 SHA256 45d9d5f3fe9dba2115710dc7cc5d8f70336055a4531f88b2ce300daf07a488a4 SHA512 7e1f819e4edfb2783ed2acb264c9d1b2e93c400920d8130b76d4a6a3261f5b7a9b6edb010d4358adda1aff55ba6c751ff8b00c741a742fad4d7c129339dd5ac5 WHIRLPOOL b2e8e62e8ede3e427286c56cdcdb84074fd4e0c55200a8092b8bd468ce0da435518f070a1f8db288b8ea72ced5c4e9709bf02740d1df1860400fab1a5e19ad63
diff --git a/dev-python/python-poppler/files/python-poppler-0.12.1-75_74.diff b/dev-python/python-poppler/files/python-poppler-0.12.1-75_74.diff
new file mode 100644
index 000000000000..47b7a678e3df
--- /dev/null
+++ b/dev-python/python-poppler/files/python-poppler-0.12.1-75_74.diff
@@ -0,0 +1,73 @@
+--- poppler.defs
++++ poppler.defs
+@@ -1642,6 +1642,7 @@
+   (of-object "PopplerPage")
+   (c-name "poppler_page_render_to_pixbuf")
+   (return-type "none")
++  (unblock-threads #t)
+   (parameters
+     '("int" "src_x")
+     '("int" "src_y")
+@@ -1657,6 +1658,7 @@
+   (of-object "PopplerPage")
+   (c-name "poppler_page_render_to_pixbuf_for_printing")
+   (return-type "none")
++  (unblock-threads #t)
+   (parameters
+     '("int" "src_x")
+     '("int" "src_y")
+@@ -1672,12 +1674,14 @@
+   (of-object "PopplerPage")
+   (c-name "poppler_page_get_thumbnail_pixbuf")
+   (return-type "GdkPixbuf*")
++  (unblock-threads #t)
+ )
+ 
+ (define-method render_selection_to_pixbuf
+   (of-object "PopplerPage")
+   (c-name "poppler_page_render_selection_to_pixbuf")
+   (return-type "none")
++  (unblock-threads #t)
+   (parameters
+     '("gdouble" "scale")
+     '("int" "rotation")
+@@ -1694,6 +1698,7 @@
+   (of-object "PopplerPage")
+   (c-name "poppler_page_render")
+   (return-type "none")
++  (unblock-threads #t)
+   (parameters
+     '("cairo_t*" "cairo")
+   )
+@@ -1703,6 +1708,7 @@
+   (of-object "PopplerPage")
+   (c-name "poppler_page_render_for_printing")
+   (return-type "none")
++  (unblock-threads #t)
+   (parameters
+     '("cairo_t*" "cairo")
+   )
+@@ -1712,12 +1718,14 @@
+   (of-object "PopplerPage")
+   (c-name "poppler_page_get_thumbnail")
+   (return-type "cairo_surface_t*")
++  (unblock-threads #t)
+ )
+ 
+ (define-method render_selection
+   (of-object "PopplerPage")
+   (c-name "poppler_page_render_selection")
+   (return-type "none")
++  (unblock-threads #t)
+   (parameters
+     '("cairo_t*" "cairo")
+     '("PopplerRectangle*" "selection")
+@@ -1779,6 +1787,7 @@
+   (of-object "PopplerPage")
+   (c-name "poppler_page_render_to_ps")
+   (return-type "none")
++  (unblock-threads #t)
+   (parameters
+     '("PopplerPSFile*" "ps_file")
+   )
+
diff --git a/dev-python/python-poppler/files/python-poppler-0.12.1-79_78.diff b/dev-python/python-poppler/files/python-poppler-0.12.1-79_78.diff
new file mode 100644
index 000000000000..161ec588e178
--- /dev/null
+++ b/dev-python/python-poppler/files/python-poppler-0.12.1-79_78.diff
@@ -0,0 +1,52 @@
+--- poppler.override
++++ poppler.override
+@@ -266,6 +266,12 @@
+ import gobject.GObject as PyGObject_Type
+ import gtk.gdk.Pixbuf as PyGdkPixbuf_Type
+ %%
++ignore
++poppler_page_free_link_mapping
++poppler_page_free_image_mapping
++poppler_page_free_form_field_mapping
++poppler_page_free_annot_mapping
++%%
+ ignore-glob
+   *_get_type
+   _*
+@@ -359,7 +365,7 @@
+ 
+     item_list = poppler_page_get_link_mapping(POPPLER_PAGE(self->obj));
+     ret = _glist_to_pylist_boxed(item_list, POPPLER_TYPE_LINK_MAPPING);
+-    g_list_free(item_list);
++    poppler_page_free_link_mapping(item_list);
+     return ret;
+ }
+ %%
+@@ -372,7 +378,7 @@
+ 
+     item_list = poppler_page_get_image_mapping(POPPLER_PAGE(self->obj));
+     ret = _glist_to_pylist_boxed(item_list, POPPLER_TYPE_IMAGE_MAPPING);
+-    g_list_free(item_list);
++    poppler_page_free_image_mapping(item_list);
+     return ret;
+ }
+ %%
+@@ -385,7 +391,7 @@
+ 
+     item_list = poppler_page_get_form_field_mapping(POPPLER_PAGE(self->obj));
+     ret = _glist_to_pylist_boxed(item_list, POPPLER_TYPE_FORM_FIELD_MAPPING);
+-    g_list_free(item_list);
++    poppler_page_free_form_field_mapping(item_list);
+     return ret;
+ }
+ %%
+@@ -398,7 +404,7 @@
+ 
+     item_list = poppler_page_get_annot_mapping(POPPLER_PAGE(self->obj));
+     ret = _glist_to_pylist_boxed(item_list, POPPLER_TYPE_ANNOT_MAPPING);
+-    g_list_free(item_list);
++    poppler_page_free_annot_mapping(item_list);
+     return ret;
+ }
+ %%
+
diff --git a/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.18.0-minimal-fix.patch b/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.18.0-minimal-fix.patch
new file mode 100644
index 000000000000..2099e0af11f8
--- /dev/null
+++ b/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.18.0-minimal-fix.patch
@@ -0,0 +1,65 @@
+--- pypoppler-0.12.1/poppler.defs	2011-10-24 11:57:35.000000000 +0200
++++ pypoppler-0.12.1/poppler.defs	2011-10-24 12:01:28.000000000 +0200
+@@ -1646,62 +1646,6 @@
+   (return-type "GType")
+ )
+ 
+-(define-method render_to_pixbuf
+-  (of-object "PopplerPage")
+-  (c-name "poppler_page_render_to_pixbuf")
+-  (return-type "none")
+-  (unblock-threads #t)
+-  (parameters
+-    '("int" "src_x")
+-    '("int" "src_y")
+-    '("int" "src_width")
+-    '("int" "src_height")
+-    '("double" "scale")
+-    '("int" "rotation")
+-    '("GdkPixbuf*" "pixbuf")
+-  )
+-)
+-
+-(define-method render_to_pixbuf_for_printing
+-  (of-object "PopplerPage")
+-  (c-name "poppler_page_render_to_pixbuf_for_printing")
+-  (return-type "none")
+-  (unblock-threads #t)
+-  (parameters
+-    '("int" "src_x")
+-    '("int" "src_y")
+-    '("int" "src_width")
+-    '("int" "src_height")
+-    '("double" "scale")
+-    '("int" "rotation")
+-    '("GdkPixbuf*" "pixbuf")
+-  )
+-)
+-
+-(define-method get_thumbnail_pixbuf
+-  (of-object "PopplerPage")
+-  (c-name "poppler_page_get_thumbnail_pixbuf")
+-  (return-type "GdkPixbuf*")
+-  (unblock-threads #t)
+-)
+-
+-(define-method render_selection_to_pixbuf
+-  (of-object "PopplerPage")
+-  (c-name "poppler_page_render_selection_to_pixbuf")
+-  (return-type "none")
+-  (unblock-threads #t)
+-  (parameters
+-    '("gdouble" "scale")
+-    '("int" "rotation")
+-    '("GdkPixbuf*" "pixbuf")
+-    '("PopplerRectangle*" "selection")
+-    '("PopplerRectangle*" "old_selection")
+-    '("PopplerSelectionStyle" "style")
+-    '("GdkColor*" "glyph_color")
+-    '("GdkColor*" "background_color")
+-  )
+-)
+-
+ (define-method render
+   (of-object "PopplerPage")
+   (c-name "poppler_page_render")
diff --git a/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.39.0-changes.patch b/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.39.0-changes.patch
new file mode 100644
index 000000000000..dd3ee52ad46d
--- /dev/null
+++ b/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.39.0-changes.patch
@@ -0,0 +1,19 @@
+--- poppler.defs	2009-09-27 16:07:59.000000000 +0700
++++ poppler.defs	2015-12-22 16:36:14.000000000 +0600
+@@ -579,16 +579,4 @@
+ )
+ 
+-(define-enum Orientation
+-  (in-module "Poppler")
+-  (c-name "PopplerOrientation")
+-  (gtype-id "POPPLER_TYPE_ORIENTATION")
+-  (values
+-    '("portrait" "POPPLER_ORIENTATION_PORTRAIT")
+-    '("landscape" "POPPLER_ORIENTATION_LANDSCAPE")
+-    '("upsidedown" "POPPLER_ORIENTATION_UPSIDEDOWN")
+-    '("seascape" "POPPLER_ORIENTATION_SEASCAPE")
+-  )
+-)
+-
+ (define-enum PageTransitionType
+   (in-module "Poppler")
diff --git a/dev-python/python-poppler/files/python-poppler-0.12.1-poppler0.15.0-changes.patch b/dev-python/python-poppler/files/python-poppler-0.12.1-poppler0.15.0-changes.patch
new file mode 100644
index 000000000000..a480cfa437a8
--- /dev/null
+++ b/dev-python/python-poppler/files/python-poppler-0.12.1-poppler0.15.0-changes.patch
@@ -0,0 +1,66 @@
+--- poppler.defs
++++ poppler.defs
+@@ -1760,6 +1760,12 @@
+   (return-type "int")
+ )
+ 
++(define-method get_label
++  (of-object "PopplerPage")
++  (c-name "poppler_page_get_label")
++  (return-type "gchar*")
++)
++
+ (define-method get_duration
+   (of-object "PopplerPage")
+   (c-name "poppler_page_get_duration")
+@@ -1805,9 +1811,15 @@
+   (of-object "PopplerPage")
+   (c-name "poppler_page_get_text")
+   (return-type "char*")
++)
++
++(define-method get_selected_text
++  (of-object "PopplerPage")
++  (c-name "poppler_page_get_selected_text")
++  (return-type "char*")
+   (parameters
+     '("PopplerSelectionStyle" "style")
+-    '("PopplerRectangle*" "rect")
++    '("PopplerRectangle*" "selection")
+   )
+ )
+ 
+@@ -1895,6 +1907,16 @@
+   )
+ )
+ 
++(define-function poppler_page_add_annot
++  (of-object "PopplerPage")
++  (c-name "poppler_page_add_annot")
++  (return-type "none")
++  (parameters
++    '("PopplerAnnot*" "annot")
++    '("GList*" "list")
++  )
++)
++
+ (define-method get_crop_box
+   (of-object "PopplerPage")
+   (c-name "poppler_page_get_crop_box")
+@@ -1904,6 +1926,16 @@
+   )
+ )
+ 
++(define-method get_text_layout
++  (of-object "PopplerPage")
++  (c-name "poppler_page_get_text_layout")
++  (return-type "gboolean")
++  (parameters
++    '("PopplerRectangle**" "rectangles")
++    '("guint*" "n_rectangles")
++  )
++)
++
+ (define-function poppler_rectangle_get_type
+   (c-name "poppler_rectangle_get_type")
+   (return-type "GType")
diff --git a/dev-python/python-poppler/metadata.xml b/dev-python/python-poppler/metadata.xml
new file mode 100644
index 000000000000..b062753424c8
--- /dev/null
+++ b/dev-python/python-poppler/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">poppler-python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild b/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild
new file mode 100644
index 000000000000..33723c09a2c6
--- /dev/null
+++ b/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools-utils eutils python-r1
+
+DESCRIPTION="Python bindings to the Poppler PDF library"
+HOMEPAGE="https://launchpad.net/poppler-python"
+SRC_URI="https://launchpad.net/poppler-python/trunk/development/+download/pypoppler-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE="examples"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S=${WORKDIR}/pypoppler-${PV}
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.15.0:=[cairo]
+	>=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+# http://pkgs.fedoraproject.org/gitweb/?p=pypoppler.git;a=tree
+PATCHES=(
+	"${FILESDIR}"/${P}-75_74.diff
+	"${FILESDIR}"/${P}-79_78.diff
+	"${FILESDIR}"/${P}-poppler0.15.0-changes.patch
+	"${FILESDIR}"/${P}-poppler-0.18.0-minimal-fix.patch
+	"${FILESDIR}"/${P}-poppler-0.39.0-changes.patch
+)
+
+src_configure() {
+	python_foreach_impl autotools-utils_src_configure
+}
+
+src_compile() {
+	python_foreach_impl autotools-utils_src_compile
+}
+
+src_test() {
+	python_foreach_impl autotools-utils_src_test
+}
+
+src_install() {
+	python_foreach_impl autotools-utils_src_install
+	prune_libtool_files --modules
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		insinto /usr/share/doc/${PF}/examples
+		doins demo/demo-poppler.py
+	fi
+}
diff --git a/dev-python/python-prctl/Manifest b/dev-python/python-prctl/Manifest
new file mode 100644
index 000000000000..237e7af193a3
--- /dev/null
+++ b/dev-python/python-prctl/Manifest
@@ -0,0 +1,5 @@
+DIST python-prctl-1.6.1.tar.gz 25788 SHA256 31f43b2e7bc3144ce18096eb8468c86acdaefbde2e3fc2aac75eea6be06d3b64 SHA512 9d379f2082523421b69f237042826fb4360d1da6e96dfc3f7e5133cb7041da4e3ea9954b14a063967c6dca2a766d39fbfe7eda71df13ae38ce046ec102949f3a WHIRLPOOL b9adfeaf9ed26e82c1ad49dbf425fb9f86c751b3192673a413457c7c41a1c6e6b5daedd61251c614bb5e77188eed64462e87960e6d8ab099b52cf706c39d2b1e
+EBUILD python-prctl-1.6.1.ebuild 499 SHA256 f0c8306ba655eddacea317363114fc56d1e503f87d9bb6cf19db970685d68f6e SHA512 8053f8a206b0b475de487c834c130970d5215068e29239063d16bc29dacee2048322ea554c162f15028b4abf971baa591b669690faf69c64b639745d5175bf74 WHIRLPOOL a937211d8ba3240805428f698459ad11c86ce51e792e0d57962c0aead31febac2862ea928da27ef5814fe5475107794e77b0d38c2a1ae254320b00765ab8070c
+MISC ChangeLog 2783 SHA256 e3e42f1d7464a29b7695da693232f8bf945f9dcdbc574c036ed55f7dd7396c8a SHA512 184e875bdc436a4d8d9da34ea168a67992f41550f3b28443b658cad81efa4e4a1fbe45eb36bc8d4473b0a75463ffb02c2449058cd60e93b6e700bb4a4c818daf WHIRLPOOL b53352e3e4174e6337e89981414229af741ef099deba8d756d0d460ec1e84493f689fbf34f36a304c3922b44ab409fae060022b8f8d16a3741a7c91c9010f5d1
+MISC ChangeLog-2015 1293 SHA256 a06e4db04e6c06f12807abc2369dc272a1a5d059fe05632d0d5a920095b4d33d SHA512 eff660719a485a3c32b01c30ab6bf324d31ad8c78ad7ce3e279cf8a369cf75338e35f45b716f3d7d23e3f9fca9f8f1b71ee931919e28a962e2361e9e71103dae WHIRLPOOL a5fbae8210ddcbc172b6557887f1894b6ef642b0059452475dbd585bd7aa98191a352f55370e1d520d6676fe3bc3e9c05e5ffa8ca705a72d477c0e92c345156f
+MISC metadata.xml 334 SHA256 18cb0251bbf90b58fc73e65bc8c1f99dcf25d294d922ddc0adc2844674e37f17 SHA512 42e6bed26bbf277f03865d151148646a4077baf61256e67616f04f004b807bc5bcb5122bded7a20d05f1eb57a2850cf0f31e469f3482c0dd214fd408b6494cdb WHIRLPOOL 527bf2008ec3ae6ec67d9b1cde23a0c4f6cdb3797d8309eb6a71aeec38158809758add547d8cbad0efd6f7b6cff34755b5a321dc4d7fd34e9d489ab86e53687b
diff --git a/dev-python/python-prctl/metadata.xml b/dev-python/python-prctl/metadata.xml
new file mode 100644
index 000000000000..76184b8b4383
--- /dev/null
+++ b/dev-python/python-prctl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">seveas/python-prctl</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-prctl/python-prctl-1.6.1.ebuild b/dev-python/python-prctl/python-prctl-1.6.1.ebuild
new file mode 100644
index 000000000000..14554209c2c9
--- /dev/null
+++ b/dev-python/python-prctl/python-prctl-1.6.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Control process attributes through prctl"
+HOMEPAGE="https://github.com/seveas/python-prctl"
+SRC_URI="https://github.com/seveas/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/libcap"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	mv *-${PN}-* "${S}"
+}
diff --git a/dev-python/python-ptrace/Manifest b/dev-python/python-ptrace/Manifest
new file mode 100644
index 000000000000..a141f77bfc59
--- /dev/null
+++ b/dev-python/python-ptrace/Manifest
@@ -0,0 +1,6 @@
+AUX 0.8.1-python3.4.patch 4629 SHA256 3bb83e7303a412854912091394cc29a6a8acf3486b3008bac14669b744e81245 SHA512 3b5c072b55c138c97e9b6456354bdf17c820d448880e0d6bb5ce398b7dfd1bd432f9886da4f8b960578f60e24fb636142bdaa66566ac22e12cda0928753aa46e WHIRLPOOL a8aeaf886a02264170e84b97fbcc6291f8ca09e59dff9d8894debd69a916cf267044ddf527bd7c94cc7c89b7c00fe0fa557d8ff62e2e4ddaf636fb75978f9b86
+DIST python-ptrace-0.8.1.tar.gz 93674 SHA256 779e04c7bdc00150b739e7d49c9c61b7f36f17afd26355f91b10cd0e7d55d19f SHA512 1c3dadf381ad0fe30374fe030fc3a81b5ec0885c31ac9be4ae561cf14ff891fc2e465555133b2efce6be0154b06768121aa068161bb3de10aca6df0eb181e25c WHIRLPOOL 1541571ed580b5852b1fc51f515776463dc622a4a2c334691f0433083a29bc1059549e0b4e938ea7c694517e341cd39bbc3f487f5ea7f83b327aaad1dbd8b7df
+EBUILD python-ptrace-0.8.1-r1.ebuild 833 SHA256 5dee4182df9dd4923efd5e3c25ae3c5440ffb2c0026df66f06bc4ce41ad2c9dc SHA512 0c96fdfc2fe3ce4ebcf1c4b51f8bc08040c7be086ed822bfae16c7cf87d374cdef3dd415dc98f5311ffc4b1252ba177a06f1a3a99dad34ccb6028bc4281807fe WHIRLPOOL e303622ff6e43c4ca902aaf1139db6456850f86fd3ae65fd6980d5fb92e6b9cb9d928015cb08c2ab82d448132da7372aa49c7b0a2da6fecd11dab4a30a88c273
+MISC ChangeLog 3305 SHA256 9a3f9c2714b970cc4ff2d0dae0215d0332be761af89cd7ecfd07ab144c1affb6 SHA512 e24890ca2d15426c42cb9b2045a78eb6988baf8dc2584e9d71bb831faf393f70f5958620561eeaf8a095854fde85fc0e222f31b95b27f3a2e919cab91da8d750 WHIRLPOOL 3a3e6bc0b4d3df64a68becf4562c3377844665df3cc1c43a16b03ecb941d11748dda07da36b795e525112d7969a34b2311a717d95f571ef9d7583c0f23977878
+MISC ChangeLog-2015 3853 SHA256 39f74986e224d8ca77d3a4048f171f806ca7ee739c5f03cbcfa6da47d108fd8e SHA512 5893fb83bfa6fd03f3fb7a4e29ce893a36c589a5928a61caa329b90f404af9b3545dea814ed0a048edab478807c5b36c63d5803f5706fab9f679f8474301f179 WHIRLPOOL 8e23f5c9e551bf60023f70bb9df17c38e6d9a2ed553427ffaecac1ece896c07126a7ea510bef8eeb52de45fa459d364048a2e36242e5e7c9a2a4d18c621fa9ec
+MISC metadata.xml 390 SHA256 3dcc1e37f5e4374db25f42547dd7af3fc6325477960f110713e5fc9562b68219 SHA512 b9c75af73d22d67c125fafeb5615a03ef21cfa501a275d2139ef49364ba6bdd64c3757194e9dae7678aeff8f0cd4a9233796c907d4cfe6427aa43c6986bffa92 WHIRLPOOL 76cb17754ff03026314513ec909fa4bb424e2439cc341f5a05001e4cac3d2e5ba069761d37c1e39d6a68f018f4ef182df3fbd40cc9a602a641fbd3757ec3fde2
diff --git a/dev-python/python-ptrace/files/0.8.1-python3.4.patch b/dev-python/python-ptrace/files/0.8.1-python3.4.patch
new file mode 100644
index 000000000000..2e6e76f8e6df
--- /dev/null
+++ b/dev-python/python-ptrace/files/0.8.1-python3.4.patch
@@ -0,0 +1,147 @@
+# HG changeset patch
+# User Victor Stinner <victor.stinner@gmail.com>
+# Date 1417423044 -3600
+#      Mon Dec 01 09:37:24 2014 +0100
+# Node ID eba1a6dba205559d724d32c80d955a65e078505e
+# Parent  e6fef4231a8a28ef91c1feaf3bfbcbd29822c939
+Issue #17: syscall parser now supports O_CLOEXEC and SOCK_CLOEXEC, fix unit
+tests on Python 3.4 and newer
+
+diff --git a/doc/changelog.rst b/doc/changelog.rst
+--- a/doc/changelog.rst
++++ b/doc/changelog.rst
+@@ -3,6 +3,12 @@
+ Changelog
+ =========
+ 
++python-ptrace 0.8.2
++-------------------
++
++* Issue #17: syscall parser now supports O_CLOEXEC and SOCK_CLOEXEC, fix unit
++  tests on Python 3.4 and newer
++
+ python-ptrace 0.8.1 (2014-10-30)
+ --------------------------------
+ 
+diff --git a/ptrace/syscall/posix_arg.py b/ptrace/syscall/posix_arg.py
+--- a/ptrace/syscall/posix_arg.py
++++ b/ptrace/syscall/posix_arg.py
+@@ -24,7 +24,7 @@
+     return formatBits(argument.value, ACCESS_MODE_BITMASK, "F_OK")
+ 
+ # From /usr/include/bits/fcntl.h (Ubuntu Feisty, i386)
+-OPEN_MODE_BITMASK = (
++OPEN_MODE_BITMASK = [
+     (0o1, "O_WRONLY"),
+     (0o2, "O_RDWR"),
+     (0o100, "O_CREAT"),
+@@ -40,10 +40,17 @@
+     (0o200000, "O_DIRECTORY"),
+     (0o400000, "O_NOFOLLOW"),
+     (0o1000000, "O_NOATIME"),
+-)
++]
++O_CLOEXEC = 0o02000000
+ 
+ def formatOpenMode(argument):
+-    return formatBits(int(argument.value), OPEN_MODE_BITMASK, "O_RDONLY", oct)
++    value = argument.value
++    cloexec = bool(value & O_CLOEXEC)
++    value = value & ~O_CLOEXEC
++    text = formatBits(int(value), OPEN_MODE_BITMASK, "O_RDONLY", oct)
++    if cloexec:
++        text += '|O_CLOEXEC'
++    return text
+ 
+ CLONE_FLAGS_BITMASK = (
+     (0x00000100, "CLONE_VM"),
+diff --git a/ptrace/syscall/posix_constants.py b/ptrace/syscall/posix_constants.py
+--- a/ptrace/syscall/posix_constants.py
++++ b/ptrace/syscall/posix_constants.py
+@@ -1,5 +1,5 @@
+ from ptrace.syscall.socketcall_constants import (
+-    SOCKET_FAMILY, SOCKET_TYPE, SOCKET_PROTOCOL,
++    SOCKET_FAMILY, SOCKET_PROTOCOL,
+     SETSOCKOPT_LEVEL, SETSOCKOPT_OPTNAME)
+ 
+ SYSCALL_ARG_DICT = {
+@@ -51,7 +51,6 @@
+     },
+     "socket": {
+         "domain": SOCKET_FAMILY,
+-        "type": SOCKET_TYPE,
+         "protocol": SOCKET_PROTOCOL,
+     },
+     "getsockopt": {
+diff --git a/ptrace/syscall/socketcall_constants.py b/ptrace/syscall/socketcall_constants.py
+--- a/ptrace/syscall/socketcall_constants.py
++++ b/ptrace/syscall/socketcall_constants.py
+@@ -1,3 +1,5 @@
++import socket
++
+ SOCKETCALL = {
+     1: "socket",
+     2: "bind",
+@@ -56,6 +58,19 @@
+     10: "SOCK_PACKET",
+ }
+ 
++def formatSocketType(argument):
++    value = argument.value
++    text = []
++    if hasattr(socket, 'SOCK_CLOEXEC'):
++        cloexec = value & socket.SOCK_CLOEXEC
++        value &= ~socket.SOCK_CLOEXEC
++    else:
++        cloexec = False
++    text = SOCKET_TYPE.get(value, value)
++    if cloexec:
++        text += '|SOCK_CLOEXEC'
++    return text
++
+ SOCKET_PROTOCOL = {
+      1: "IPPROTO_ICMP",
+     58: "IPPROTO_ICMPV6",
+diff --git a/ptrace/syscall/syscall_argument.py b/ptrace/syscall/syscall_argument.py
+--- a/ptrace/syscall/syscall_argument.py
++++ b/ptrace/syscall/syscall_argument.py
+@@ -22,6 +22,7 @@
+     from ptrace.syscall.freebsd_constants import SYSCALL_ARG_DICT
+ else:
+     SYSCALL_ARG_DICT = {}
++from ptrace.syscall.socketcall_constants import formatSocketType
+ 
+ KNOWN_STRUCTS = []
+ if RUNNING_LINUX:
+@@ -35,6 +36,7 @@
+     "mmap": {"prot": formatMmapProt},
+     "mmap2": {"prot": formatMmapProt},
+     "clone": {"flags": formatCloneFlags},
++    "socket": {"type": formatSocketType},
+     "setsockopt": {"optval": formatOptVal},
+ }
+ 
+diff --git a/tests/test_strace.py b/tests/test_strace.py
+--- a/tests/test_strace.py
++++ b/tests/test_strace.py
+@@ -39,10 +39,19 @@
+             expected = os.fsencode(expected)
+         self.assertEqual(match.group(1), expected)
+ 
++    def test_open(self):
++        if PY3:
++            code = 'open(%a).close()' % __file__
++        else:
++            code = 'open(%r).close()' % __file__
++        stdout = self.strace(sys.executable, '-c', code)
++        pattern = re.compile(br"^open\(.*test_strace\.py', O_RDONLY(\|O_CLOEXEC)?\)", re.MULTILINE)
++        self.assertTrue(pattern.search(stdout), stdout)
++
+     def test_socket(self):
+         code = 'import socket; socket.socket(socket.AF_INET, socket.SOCK_STREAM).close()'
+         stdout = self.strace(sys.executable, '-c', code)
+-        pattern = re.compile(b'^socket\\(AF_INET, SOCK_STREAM, ', re.MULTILINE)
++        pattern = re.compile(br'^socket\(AF_INET, SOCK_STREAM(\|SOCK_CLOEXEC)?, ', re.MULTILINE)
+         self.assertTrue(pattern.search(stdout), stdout)
+ 
+ if __name__ == "__main__":
diff --git a/dev-python/python-ptrace/metadata.xml b/dev-python/python-ptrace/metadata.xml
new file mode 100644
index 000000000000..b9062dfa01ed
--- /dev/null
+++ b/dev-python/python-ptrace/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">python-ptrace</remote-id>
+    <remote-id type="bitbucket">haypo/python-ptrace</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-ptrace/python-ptrace-0.8.1-r1.ebuild b/dev-python/python-ptrace/python-ptrace-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..80a8f01dad6e
--- /dev/null
+++ b/dev-python/python-ptrace/python-ptrace-0.8.1-r1.ebuild
@@ -0,0 +1,30 @@
+# 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,5,6}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A debugger using ptrace (Linux, BSD and Darwin system call to trace processes)"
+HOMEPAGE="https://github.com/haypo/python-ptrace/ https://pypi.python.org/pypi/python-ptrace"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+PATCHES=( "${FILESDIR}/0.8.1-python3.4.patch" )
+
+python_test() {
+	"${PYTHON}" runtests.py -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	# doc folder missing key files to effect a proper doc build
+	use doc && local DOCS=( README doc/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-redmine/Manifest b/dev-python/python-redmine/Manifest
new file mode 100644
index 000000000000..6178a4944f25
--- /dev/null
+++ b/dev-python/python-redmine/Manifest
@@ -0,0 +1,4 @@
+DIST python-redmine-2.0.2.tar.gz 559017 SHA256 e65a0213be1b3b246201e3f52e36ad0971a966f847e84c38f653e5f712bb98a1 SHA512 3f8e11315e8e2b4474e8b981bd801ef75857fe73e8ed18d27f64223703d18ea2061416ed38ea35c4a4460a4ccba167b41ab48e2489930181951e9e2a5f53ec12 WHIRLPOOL 7e2cfe63f67ce2a00145f7510b5e79cf010ec5a823f4d7298873cd800b32b557b08dfbf04bb31c49b4cf56a56b0d08f43ca5da121dc73c48ae63775752a2518a
+EBUILD python-redmine-2.0.2.ebuild 1338 SHA256 7cacb198e5a00995f5caa131806637ec8b652c1e870f26aa109e9c50101a3a72 SHA512 8852df72cf3320c11d38008d53ce89b32ffbe2654d1d612466e28292683d968dd675cd955488088c08123f78d4369bbf6ba7aee03ee4e633b2b11f240b6396da WHIRLPOOL 2d578806a7258f78bf5e6393430544313995407b4d696c9415fda8cfaab39d59974f043781033780784f4b35db08d28f34cd35aeb029bfc913020b268d83a624
+MISC ChangeLog 356 SHA256 5c68699a55181050a6ec5bf9bbab05cc8ff5402906f0ad984597013677a9b2d2 SHA512 4cead6c4df77f7b6de3a5811f33ef8d07037feb11a22ba4e4aad676727e39ad05fafdc9a3b49f5433883b074e8d4e570c9d4cd4bebd360d32858f2c5412620da WHIRLPOOL 6f8bded96a340e6c81685964adfe749bb03ebf16f408abe3c8385df5e5441fe9cc04c47f16f4cdaf96f0dd774e3cd282ba55cfa759e21172182071b1f90875d8
+MISC metadata.xml 400 SHA256 141d780e71a746fdfea8be7e0679d4ee98771a9605f920c988d700f7b2f5f792 SHA512 12d43f2ec4712a7c01ed86aa2b1d05eebb907a8a6bd787ec82aff8ea2a97cc6708255dfad3d386550bcc72887d1b273b6ff3f958bc22e5bbdc4bd8a8d28a57ac WHIRLPOOL 36579880d298817d5c6903619f1b6bd9fb47f11daae445174094fdf7a8b87525d6b45110728471ca096fc7c02c4aba7ce7a1d3d0bb182b408255f27f252aab89
diff --git a/dev-python/python-redmine/metadata.xml b/dev-python/python-redmine/metadata.xml
new file mode 100644
index 000000000000..14e8319ef215
--- /dev/null
+++ b/dev-python/python-redmine/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>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">python-redmine</remote-id>
+    <remote-id type="github">maxtepkeev/python-redmine</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-redmine/python-redmine-2.0.2.ebuild b/dev-python/python-redmine/python-redmine-2.0.2.ebuild
new file mode 100644
index 000000000000..53c1001ea04d
--- /dev/null
+++ b/dev-python/python-redmine/python-redmine-2.0.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to the Redmine REST API"
+HOMEPAGE="https://github.com/maxtepkeev/python-redmine"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+
+# This package bundles dev-python/requests, so setup.py won't check for
+# it. As a result, we don't need RDEPEND in DEPEND unconditionally.
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/coverage[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Remove the bundled copy of dev-python/requests...
+	rm -r redminelib/packages/requests \
+		|| die 'failed to remove the bundled copy of dev-python/requests'
+
+	# and replace its local import statement with a global one.
+	sed -i redminelib/packages/__init__.py \
+		-e 's/from . import requests/import requests/' \
+		|| die 'failed to replace the dev-python/requests library import'
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/python-rethinkdb/Manifest b/dev-python/python-rethinkdb/Manifest
new file mode 100644
index 000000000000..fd906d00aa22
--- /dev/null
+++ b/dev-python/python-rethinkdb/Manifest
@@ -0,0 +1,4 @@
+DIST rethinkdb-2.3.0.tar.gz 116289 SHA256 36330fc409bb14d09a903d830be725cd2b42223048d6214cd423ae83c7c750f7 SHA512 1e710bde31ce45b5cda7463ae0a328c073bbf68544ad790d331163de188855b78257461a5b7367eba7becdaae329f19df545d7dd9834a095c6d01cd2710f481b WHIRLPOOL 89157e76288f0dab4107fd6a5f3089f47c3fe10ffc7bf978eebe850e1aa1cbf6b77f461951ef195fa9fa2382551b2d1a16c969ceeb563b1483c12733013a6836
+EBUILD python-rethinkdb-2.3.0.ebuild 552 SHA256 911fef17d8e8f18802080646f9e2fa1cdc812f6fa724e0fe80ed53c1ef17f1bd SHA512 112b8d2627fc1e0a1ed70f1658434c945f86108f9136430fefd194d86ab3a82f926777169a3d15bad7f6ce2cbded43ab5deeacb59e81be78d8a7401f1393cc7f WHIRLPOOL a2978608956a327909f45ce27ebaccba65fac9ac0a992967ab4ca702a6fd6ea0130f98bfff7f68d354eefc230f6d1347a39f8a32a7a92255c77c40475b9e158e
+MISC ChangeLog 331 SHA256 a76a328ff66daf9f8d643bc43de47518bea6e020e20dd6247109c783730fdcab SHA512 aab5355f28193b7efdc6e63198ba7c1ae1e80ff85a56709f71b506edb8051de67b29262ad7948512a29d7d44910c9dee5255b41d27acdc8a1333b91cb255c43b WHIRLPOOL be4cd5296594998aadd02d683d2b4a5c251a0497571e5eda8fdfc0ed0b4a90df847b2d721a6dedd97f53e27a6641276eb931b75341a471252dc57a522e42e2b4
+MISC metadata.xml 417 SHA256 97b5a593834b8ef44f8457fdcf057f1976c74cdf8e14a241d067cfdb7320707f SHA512 fea28f92d5dd21860db233d8a6b4fd9748d690b437d0c95af08b1497c2f2157fb6c44657b118cb92ab70ad9e621b578fba7eae507f933fdb32d16541bbe4b0ec WHIRLPOOL 28e952e44f77213c3269ef21c5b53a8d9a8c56a1559c7b275da8fe087cc1f8c4043f4e2ade42895f9c91a03840abd2c2a73b6ebd2ce3383af5e86402d0a64d96
diff --git a/dev-python/python-rethinkdb/metadata.xml b/dev-python/python-rethinkdb/metadata.xml
new file mode 100644
index 000000000000..952a3adeafa4
--- /dev/null
+++ b/dev-python/python-rethinkdb/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>ultrabug@gentoo.org</email>
+		<name>Ultrabug</name>
+		</maintainer>
+	<upstream>
+		<remote-id type="pypi">rethinkdb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-rethinkdb/python-rethinkdb-2.3.0.ebuild b/dev-python/python-rethinkdb/python-rethinkdb-2.3.0.ebuild
new file mode 100644
index 000000000000..7cec03590962
--- /dev/null
+++ b/dev-python/python-rethinkdb/python-rethinkdb-2.3.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+MY_PN="rethinkdb"
+DESCRIPTION="Python driver library for the RethinkDB database server."
+HOMEPAGE="http://rethinkdb.com/api/python/"
+SRC_URI="mirror://pypi/r/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+# no tests provided on pypi distribution
+RESTRICT="test"
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/python-saharaclient/Manifest b/dev-python/python-saharaclient/Manifest
new file mode 100644
index 000000000000..084eb97866a3
--- /dev/null
+++ b/dev-python/python-saharaclient/Manifest
@@ -0,0 +1,7 @@
+DIST python-saharaclient-0.11.0.tar.gz 101842 SHA256 0c08bcc7d490a9133ecc261bc8b270f3a4187952b19aa375e59a460491dc40bd SHA512 de30918d23b5b8191b2e49f0f7116510533da15be412d87c9018af2e4144082e9cb127713a4aff3ac03d72867a9855d73cbd56b83db24a9bad9b7b422c451018 WHIRLPOOL 97cd3f7b90f96d010d2f267c7ae593ea9c492a4b75c048596b53f1083dd57027dd79b3f0acb3708536ce1bba2ef3ae1afe4eada22355c7c8792164652a7fbc79
+DIST python-saharaclient-1.1.0.tar.gz 81664 SHA256 cb9c07f8131927886fd17b9c28e33f1aa840db1aac82e120ae531807638b1e80 SHA512 0799549d68bc65792cdf0129f3590667a1a87697182ad24c5c41e9c01abf5e133a16a60fe0331f313da44017aaf0503bbc131e8a62536a692032af36ae9f1386 WHIRLPOOL 6aa4aecff6c97cc432a6c192762ae9e8a5d56567579ca4425c236db3f746d438a57aa320544c16459be6bd750ca0bc5404851d256cfea20a5e2dced8a485a6bd
+EBUILD python-saharaclient-0.11.0.ebuild 2172 SHA256 a6dd40895c700c148a73b560d50cea38083312b8df2845469723b6193cfba53e SHA512 f1a4f3f9daa0ae4262b0cb7211f33f1b93ec13cbe9e6b4dd9844e4c9e2328bb406dc5e7f7f580be73fb6a40465e3410982ec5d742b6466db33cd821e822c1d6f WHIRLPOOL 959d895e2f30cfe68675d20142a52022d074911b387c8cbf937270e6323d3ed1952afe2e3615c9713add1d01296411eb52ff61de7a8b7ead2fbab68e85baed83
+EBUILD python-saharaclient-1.1.0.ebuild 1842 SHA256 625faa6b688e7941e4e8339cbd5c96a83656e907ea4f2e13a4722078be524514 SHA512 8c59dca5e42f64c89b94496e7cdea8ab02ef332d15591f2c41ad9633dc6d64fc658a82b70e5317b1dfd9b9ef72e05ca12fafecb74257fb30ccdb8e15b2c9c438 WHIRLPOOL 17651652f93b54859fff98946ab3c05726bc65894a0358e2f1131e820c25916e2aa8bde10f3814e8ea24f7292a4233e801fcbd5e70fa79ae83c8f5e7ee362fd8
+MISC ChangeLog 3138 SHA256 fb6f6f28764992d7ce9572cf16d91a01f6d4099c236024ff98c3064aa8c67391 SHA512 c07c41dc189a0d395a646bdb200073147aaa4bc1f0805f04828eab46cff90a8879aea85c3e12f3fa5e81e1c11358a69cfa0ac0d3a677415288c70fc891196dcd WHIRLPOOL ec0ce59b613b41ce0ecb3eb36433f2789b03e69dbb23bc8fa940419c683d5851a600542ccc2dc39ffdd16235a9575ab88ddf9c887afd2bdbe968af1c151f658d
+MISC ChangeLog-2015 900 SHA256 9be1a59ec5a02d79b351d3bf4a9bcef75f0573c85c597f55b23a1b4fe63382ca SHA512 00d71db35f3f07cf9ef7724b84e1d290ba2a386905ad5c97ec8bbd317801dfc692f22c5b8264e8537d02eabaabee2f1ab7638bdf050c9fd296ab94aa5d4b818d WHIRLPOOL 3696e8a6d54b8ba27bacf9da882dd31501308ac75c56d26198e13164929f698d11437bc351f2906652558f0d134382c3d731c2f24564887ea061811d0cc4acea
+MISC metadata.xml 643 SHA256 8a333a12e566d1a9bab11090cca65dcdb2dbb958f916c91ca527d5b7a0657760 SHA512 4ab105b6287560e19a7b6ba8e999da16bdb520ff8f1a812e0e17ebff9c1edd2f7ec1475978ee478c556d31af8c201555669c92ff388de45a206b45005ec95d2c WHIRLPOOL 107b5036455c357500d7c5095edd9d52c00751927db27f00b115f2fc57e556604ce7176854a3697224d271b8726928be3affbe3ebc1c8710da16933a75e39ba4
diff --git a/dev-python/python-saharaclient/metadata.xml b/dev-python/python-saharaclient/metadata.xml
new file mode 100644
index 000000000000..0c5d6367e225
--- /dev/null
+++ b/dev-python/python-saharaclient/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+    This is a client for the OpenStack Sahara API, aka HADOOP
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">python-saharaclient</remote-id>
+    <remote-id type="github">openstack/python-saharaclient</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-saharaclient/python-saharaclient-0.11.0.ebuild b/dev-python/python-saharaclient/python-saharaclient-0.11.0.ebuild
new file mode 100644
index 000000000000..44ad54f77a79
--- /dev/null
+++ b/dev-python/python-saharaclient/python-saharaclient-0.11.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="This is a client for the OpenStack Sahara API, aka HADOOP"
+HOMEPAGE="https://github.com/openstack/python-saharaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/python-neutronclient-2.6.0[${PYTHON_USEDEP}]
+		>=dev-python/python-novaclient-2.26.0[${PYTHON_USEDEP}]
+		>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.6.1[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/python-openstackclient-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.10.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^argparse/d' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "testsuite failed under python2.7"
+}
diff --git a/dev-python/python-saharaclient/python-saharaclient-1.1.0.ebuild b/dev-python/python-saharaclient/python-saharaclient-1.1.0.ebuild
new file mode 100644
index 000000000000..6093ccd41c5d
--- /dev/null
+++ b/dev-python/python-saharaclient/python-saharaclient-1.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="This is a client for the OpenStack Sahara API, aka HADOOP"
+HOMEPAGE="https://github.com/openstack/python-saharaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/os-testr-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "testsuite failed under python2.7"
+}
diff --git a/dev-python/python-scsi/Manifest b/dev-python/python-scsi/Manifest
new file mode 100644
index 000000000000..d944cd829b02
--- /dev/null
+++ b/dev-python/python-scsi/Manifest
@@ -0,0 +1,5 @@
+DIST python-scsi-0_pre160211.zip 126606 SHA256 a86f6cb42fbf45b186fdfbdb697b001dfabf773e698b30dae46815b1aa4f90ad SHA512 43218dfe91eba8f79c0cc7b48e5d7ba3026aac3d0c70dc2d8865905ef70bc479c6a32c46104b3284a00b5832d8893daf4285aac84fd43f1a1ba80affeaf5e258 WHIRLPOOL d44417d7461db3c779805f15311bd51ed0af154237516433ef17a5a23c72c502d6cb09ecf36de913f735a9bc0ce6c4608395167e1e5e850babd3e65dd4ca6c3a
+EBUILD python-scsi-0_pre160211.ebuild 645 SHA256 b6d6dc859f35624b4f24fc03dda49ba28681a85d0c30a6c174d0b13cbe875635 SHA512 f3c5e7ba9c98035ab83bd63f84f76891593c666d43c0cbff9b994512705fed965a38f84b595a778e050559e963a9074b13b30f58658a7811a0384612edba153c WHIRLPOOL 7560f87d05b65c28c9a6f53514823f277b7075bee071b941019b16ff00870eeabf81ebd6fe3d5e623319ef055b8cf61aa9bc1a0350c1b89f55501a1e9e55b10c
+EBUILD python-scsi-9999.ebuild 445 SHA256 e96d1c226b69564abc684d9ada9d79086ee5108125b4eb908e53cb93f0b5acec SHA512 0316ce9f7f4245f2fd9efc70724f2c40d6a92d822427b118d4a5feeb090a9545e76bd8c1083bfcf1207054fb41212e4a9a1918b6c250bc7a28e34040875304ef WHIRLPOOL b32b54a56d5c22391416823eb49f950d0cedf2974168f2ccab9526520b04a6138f874b67bbb3f479d6a62da5a4cb2ac08e5cfebbf91d76655bf0455913401719
+MISC ChangeLog 1376 SHA256 e94dfb04dba3916b113083a10b7a4ea004005e64808169dca0b3c1f0384a3917 SHA512 6757219206306be84a39f1764df967781adc5cb59bc27b366463e64b4eb43b20b94b62fea6d22b34044bdff6c1f272579ba0536e124a825fbd904d5b2b169b55 WHIRLPOOL 0453e37ce2aae6538e717f52346362c67f3601dd3f3909d632c9aa73031ec0f9724bbc3d938678a94d51faea2329d1c0141f8686ed8b9c92e0ef570cdc8f9190
+MISC metadata.xml 333 SHA256 21a891caed4fad9f7eb092389ac1bb1ffb28a703bd32b5012b9c72fbaa9633e2 SHA512 bc4d5e48baa7202f81cab953519e91e41e4670df2ad69173f2d046eb73314e66ef62fe58ea740a71fddf9170570c0fd823a6546fa129a666193cebc389fce153 WHIRLPOOL 2aa16673f14761d337c7f55ec96413f92d1ef23f24c82bc7cc5cc60e4c0b2b0c18f3fbe84a9324e514ba6eda21ce44b38ec958e2a8473de97b1c92978916103f
diff --git a/dev-python/python-scsi/metadata.xml b/dev-python/python-scsi/metadata.xml
new file mode 100644
index 000000000000..601c98379736
--- /dev/null
+++ b/dev-python/python-scsi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">rosjat/python-scsi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-scsi/python-scsi-0_pre160211.ebuild b/dev-python/python-scsi/python-scsi-0_pre160211.ebuild
new file mode 100644
index 000000000000..8e947c0ffd85
--- /dev/null
+++ b/dev-python/python-scsi/python-scsi-0_pre160211.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1 eutils
+
+HASH="957e5538d8d441fb792db6fbbdc0a5e8d57d9c7d"
+
+DESCRIPTION="Access to SG_IO scsi devices"
+HOMEPAGE="https://github.com/rosjat/python-scsi/"
+SRC_URI="https://github.com/rosjat/python-scsi/archive/${HASH}.zip -> ${P}.zip"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${PN}-${HASH}
+
+pkg_postinst() {
+	optfeature "iSCSI support" dev-python/libiscsi-python
+}
diff --git a/dev-python/python-scsi/python-scsi-9999.ebuild b/dev-python/python-scsi/python-scsi-9999.ebuild
new file mode 100644
index 000000000000..dbdd181f802e
--- /dev/null
+++ b/dev-python/python-scsi/python-scsi-9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Access to SG_IO scsi devices"
+HOMEPAGE="https://github.com/rosjat/python-scsi/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/rosjat/python-scsi.git"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-scw/Manifest b/dev-python/python-scw/Manifest
new file mode 100644
index 000000000000..edb8802f5680
--- /dev/null
+++ b/dev-python/python-scw/Manifest
@@ -0,0 +1,5 @@
+DIST python-scw-0.4.7.tar.gz 337703 SHA256 2cf8774be0b00dd1f2afff98fa8d27c3dcfda9f3bdf54c006731987550791460 SHA512 c731527ed1c3372440a428335f2f318307c970b6ee4a09af9c4eeaf89e681a335130ed855a3bb239bf5f44bfee1f0772d3f19afd07c7bbc180c586646fdd9a07 WHIRLPOOL a4bb5dea90c3a7bd2996296d1fc5400f375cc3f87111a650268b53af7563133da4f482ddf28a369e5939cec318a7c031c7d637457bc3ee16774b65723c2c019f
+EBUILD python-scw-0.4.7-r1.ebuild 508 SHA256 49323616ded867981193912f40443968b253e2d030fdbcbd2cc178d33c2a56fe SHA512 33546f045d26be54a3e9532179052fa01f55429c89177681911b6b4e1ffd2a8fc4cbeec5a66c849082aab178c5fdf9bbfefa69c0ded06136c08a5ca9fd359f5e WHIRLPOOL 17e7818a7f3044062adac33ce0b976203eca0adf51fe6c8023319c9637a038a9a4d5f94512782a9e05b0c5d2e312576961de26758c484dc4a99f2ab6269ecb9f
+MISC ChangeLog 2444 SHA256 7dc9dcf1840620e70b664831bac8642340626bbcdfdc50797c17a1ba5cef653d SHA512 c47e2c220b14d5d4d4b4e17b1d801464e2d7f31c4c5194f55078ec1c357d18d70e975848118233eec83f1d6cc858c34e60300ccf6b23fb7081c152220ae0639e WHIRLPOOL 9787d71442d766ec06b398c28ec645364fa0e13251a605810391d7fc36571708394de306c547d740a68feddede43721499cb13f2d57a574afeebd35e8c0a92fb
+MISC ChangeLog-2015 1144 SHA256 5bd4531d2f68594733509cf4d60b239c7f77b1806d4111df236f930113bc9304 SHA512 328ad363de4efbd0c66228f59483c20c783264799aebe5979983ee23cb652aca8c343196d4714a4c519e3837e7f28bfbea6f1f7a8f5e723e83fac50c55b53b08 WHIRLPOOL 16a77dc3d1028b9d7c729ea04a094f9b31b7e9090c8730723fc199dcfeffa11a678f8bd4db8efc8cf5d563c8e2aa2cdc3711317e77c5df057c018f86d51188f0
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/python-scw/metadata.xml b/dev-python/python-scw/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/python-scw/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-scw/python-scw-0.4.7-r1.ebuild b/dev-python/python-scw/python-scw-0.4.7-r1.ebuild
new file mode 100644
index 000000000000..7b94ae63ff0e
--- /dev/null
+++ b/dev-python/python-scw/python-scw-0.4.7-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1
+
+DESCRIPTION="Python binding for Scw"
+HOMEPAGE="http://scwwidgets.googlepages.com/"
+SRC_URI="http://scwwidgets.googlepages.com/${P}.tar.gz "
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-python/pygtk-2.4[${PYTHON_USEDEP}]
+	>=x11-libs/scw-0.4.0"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/python-senlinclient/Manifest b/dev-python/python-senlinclient/Manifest
new file mode 100644
index 000000000000..5b5592e9ae99
--- /dev/null
+++ b/dev-python/python-senlinclient/Manifest
@@ -0,0 +1,6 @@
+DIST python-senlinclient-1.0.0.tar.gz 101396 SHA256 eb4fe96425cfc2c8137b97f2ab9071ebea1a2862b334ab1882513379fed12876 SHA512 3e98cc9a238250ca4069289343011d27d9bf6b35e0c8709bbf209b7774ff7b84151533104795fcc21403202cf6c834503685a9994d320a48aa690a854e1570f9 WHIRLPOOL 559b26f5be8ef0e99c63474f79b22e7baa05ca38b804c309fde4459668dbceba022175d8db156fc283af66bb87322ffe31e58cdd39c022d25f1af2e1ae00d497
+DIST python-senlinclient-1.2.0.tar.gz 107117 SHA256 5332f94f1dc533ce63e4b6c3649e6ec6304564f3b213eeb24ce602b73e979870 SHA512 1216e9511715a2cc5a703020a08ebb01bc24111150230f7ae8441ab750865c4cc07535f2b9d15ee8f7c93cc4f2ebd24473fb38b3946476063eff05c103d8ef6b WHIRLPOOL 7769f8d6a859b0a2ff4ffcc620f827ab49686ba3e1414a548c592d6af76ba5e898ac381d4ed584341c3c807b7ec104ef5b9ca806624921bc8c4b6a0882fda1c2
+EBUILD python-senlinclient-1.0.0.ebuild 1204 SHA256 5f6b66653fa6bf8f46a902a999162b2940ac45810bb348293022f87297329bf4 SHA512 9c3a7a294ba3580df651039bc06b3d23a23a7c5fca7cdb064fec8a91913b19605a358d41134b415b0e69005a4db034181c4025b0473630682aba746242a76df4 WHIRLPOOL 983587e9e3a133f6d636546d7ebc5c4f0a3d3ecf8cd235913ca982c66b7e314d8952cc156092582c867e9e50d5398d45373a7b2ab31e7a916b2d2a1058c41940
+EBUILD python-senlinclient-1.2.0.ebuild 1484 SHA256 7fde7f377a4fccffe5a08ef6375628bf5c56a3f3b27e33fc7d585b93ed0a9cae SHA512 4268f017a6b669a0e0aca7e169956c32c23188bfc571eeae61f0e2b1ca72e92221c45042875e8e5dffdf27a362df96791d725cc8b2039a62d394c49a57b085bc WHIRLPOOL 480b699ca70ae9c4c363b54dcd61c0de58446aa2c72d51280cded3d9f9b0761d696e3bc713904b14554f4f5b43a2b8b7f2a66cf7dc23448ee7a6fffe63811282
+MISC ChangeLog 511 SHA256 49e7094773c9055385807ebef56db3c46fa3cb5616b03755a0dd756f647040a9 SHA512 edcaa5c23ea26dd63e688307e01c4762e0867eb49b99017392ae471dfe318db02bc0339a8d4429792065afe20910d1c7f27470c50bb4f73f5c0f82d011ab670c WHIRLPOOL f4ce3d0034f43ccc06e387eca77b9971b03e3ced2365210d979e51efc3322942a6a92b9dc95d0f977ba33daa7a3746b0b870962d0fa2a036ac72629978ebb1c3
+MISC metadata.xml 613 SHA256 75b7d7e8f40280c5a63af7679933af178e62f59cfbd0e1fe9c361e703c720279 SHA512 775f73afb8bfa50b46db016c1ce6d57cfc19afe1cfe16665f8774dd38e5ceca3b72fb66f21dd74afbcd0ee07f0e014c4c35893fa712302be545f391ca19389ad WHIRLPOOL 49882bda80e5e2adae92bf6880ef1086f409ae199d0bd3579f97a5e91c9e621c5fe9ecbe65c406912459560aee8943fe707a4ae6575a66a690b7e83f52246c84
diff --git a/dev-python/python-senlinclient/metadata.xml b/dev-python/python-senlinclient/metadata.xml
new file mode 100644
index 000000000000..77fd7478baeb
--- /dev/null
+++ b/dev-python/python-senlinclient/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+    This is a client for the OpenStack Senlin API.
+  </longdescription>
+	<upstream>
+		<remote-id type="pypi">python-senlinclient</remote-id>
+		<remote-id type="github">openstack/python-senlinclient</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-senlinclient/python-senlinclient-1.0.0.ebuild b/dev-python/python-senlinclient/python-senlinclient-1.0.0.ebuild
new file mode 100644
index 000000000000..a9d63799df86
--- /dev/null
+++ b/dev-python/python-senlinclient/python-senlinclient-1.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Senlin API"
+HOMEPAGE="https://github.com/openstack/python-senlinclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.9.4
+	>=dev-python/osc-lib-1.0.2
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-heatclient-1.4.0
+	>=dev-python/pyyaml-3.1.0
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-senlinclient/python-senlinclient-1.2.0.ebuild b/dev-python/python-senlinclient/python-senlinclient-1.2.0.ebuild
new file mode 100644
index 000000000000..679dc8f19bc5
--- /dev/null
+++ b/dev-python/python-senlinclient/python-senlinclient-1.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Senlin API"
+HOMEPAGE="https://github.com/openstack/python-senlinclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.9.10[${PYTHON_USEDEP}]
+	!~dev-python/openstacksdk-0.9.11[${PYTHON_USEDEP}]
+	!~dev-python/openstacksdk-0.9.12[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/python-heatclient-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-slip/Manifest b/dev-python/python-slip/Manifest
new file mode 100644
index 000000000000..9cee6779e6e7
--- /dev/null
+++ b/dev-python/python-slip/Manifest
@@ -0,0 +1,9 @@
+AUX python-slip-0.4.0-no-selinux.patch 3129 SHA256 b174198c292807362be6ee6c977e1e275dbd2cd515591dd5b9ed8b401b7f7f8b SHA512 14ff496a0d27805eee2bb45ce73c799d5bcdfb12d5bc7a2b5bee0989c9c5d6d6b79bfeb41f06e2de132dcfae220176cc1fb13272e29ad2810e37083f030c4d8c WHIRLPOOL 1de930a015f7418e63a1ff6f443d52de94e6669336550cf334944cee61ea536ec50303d5c0878b3d00677ac2c5ed1dfffbe93b6c11ba7e648c3fb205a6ebf166
+AUX python-slip-0.6.5-no-selinux.patch 2942 SHA256 8d3865dd3cf9e600c8f5c20a2809f35e0c1c938a75dc28392637006e41814792 SHA512 64a742f93a38a2ff15d98e9d22c30a821ecd2044457ac958bf34cd7fd8e333b16a5fd56e80b169cc67c9ab35d13298d0caf418ad7a693372539701bda56f123e WHIRLPOOL 1872eb21fba15b72a12788915e73362d4f19db1f13b686d0935bcc1b1090275689d79f2b7aecf351a4249d075d9bd945d93e4cbaae94b9f068d849f7ee8d971c
+DIST python-slip-0.6.1.tar.bz2 25000 SHA256 bc897f1ab6f5b4989f85548799aaeb84fde67bbba18e40341bfe1d7885c2fd9a SHA512 d7d79b8ee4468d3a3b5e2ff31dcc8af30f70591ba42f74af9787e5c883a137e85c39a6ffc7c36cd2383840aa4ca09cd1ca3d9e40fc4d266b37689a85f084a9ab WHIRLPOOL 95595c7cc45bd403fa8ed1a5a36e32bbcce7aa621ff2d86503487174279e996e3839e7c3033a771274c944f46591f819a0ab1981e1301c4a13757f4787c2586b
+DIST python-slip-0.6.5.tar.bz2 25996 SHA256 c726c086f0dd93a0ac7a0176f383a12af91b6657b78a301e3f5b25d9f8d4d10b SHA512 84dfd4d74602e996797261aa4021fc1579a6aba554d2b3d497c0a7b8618366a9c0a6f12051b00c5653845dda923eedb58afdded37f2a1f31b5b0ce1a0532ccff WHIRLPOOL 54f9d0663cbfada42ab1fee2372919dae7960326719bced4da2e31167a9a92894ec7a0e9ce439cc659fc7511c22d47fe25a6ccf83ffe84ff830b55ca153bdda0
+EBUILD python-slip-0.6.1.ebuild 1179 SHA256 7fc5a1417d4b57ae4f4c74caf506cd148f293fec9c7aa745695f75fa6c14e0bb SHA512 08b5d9f0ef54fe15bf02de1d8d732b8bc7bb0a010daf58fdf2c3dba7c568cc220eea01903d3e42fd3c281ffdad11e9a807e48d24a73c5fc0e36baebdc6a834d4 WHIRLPOOL 05fc2e5946e854ebb989898be7c5e54d20c5b740f0aeed16541531b80e276a521e1cac89f136512a0ea0b675e3abd92de79e335b3e8deeecc2b2228d2b03428f
+EBUILD python-slip-0.6.5.ebuild 1198 SHA256 117b51bc4439402f3edaec59ebf3cd05770cdcaf6387e77124d821435d2da053 SHA512 54474d1b5cf988e5fa52d509ceeab2c47a74509dc11d3cd01cd1a02914efae37e939024c49e30e88bf2634491b16b1eb75cabd462c15227da24be28dcc4ccc2e WHIRLPOOL 350eb7218504bec5daf4f7e61c5e201fb7c202dffbffd1b6e33eb33818f4791b7d06168cce9de61857635837657d92a523b031d129c4f2e851a673a9c3dcc3b6
+MISC ChangeLog 2987 SHA256 d32e02820a50d6db048e5edcaa7651a28e0d412648e5f3d4f239f826ab626fbb SHA512 cecd94f850b57e02789a2c89aaf0fe774d8ee4e3b76e616ccacfebf31aa56e1c00db4b05e7cbaae6e42df99c99c01473294aa05aa81d5f7bb9be3b60f9d7824b WHIRLPOOL de5b333c8a795ad4995c2309e4020ceed64d64bdcf57bdd88aa33d41028aaccab8ab6b58172d26a6f7867f067f41eefad2c3570134b49da79632f277de3f1c2e
+MISC ChangeLog-2015 3277 SHA256 7395b505c2c46ef5cda461eb5608618e052b8e924d5e4dfe0124d84b0503ed09 SHA512 2c7580842aebb6ba2f7b18f55088d94e08f6bce1dc7fa94690b93e33e375072b62c894e131596f4fbfd460d213151d65fc45c4350d161ed9c395e5f4064fa459 WHIRLPOOL e27d1a8c837a57e58dd693443d380d592d861f9f7b610689b06d0cfccd9f7b3160bfe5f3bbe2a9536711efdcb45327a01bc08f738cd6172f1cc91fb482ccb020
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/dev-python/python-slip/files/python-slip-0.4.0-no-selinux.patch b/dev-python/python-slip/files/python-slip-0.4.0-no-selinux.patch
new file mode 100644
index 000000000000..08a4fa80b880
--- /dev/null
+++ b/dev-python/python-slip/files/python-slip-0.4.0-no-selinux.patch
@@ -0,0 +1,93 @@
+From a7bfeeb479d28c9a880d2a08d0102978fa711237 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 18 Jul 2012 20:07:01 -0400
+Subject: [PATCH] Disable selinux
+
+---
+ setup.py.in        |  2 +-
+ slip/util/files.py | 28 ++++++++++++++--------------
+ 2 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/setup.py.in b/setup.py.in
+index d670ed5..d5b8db8 100644
+--- a/setup.py.in
++++ b/setup.py.in
+@@ -7,7 +7,7 @@ setup(name="slip", version="@VERSION@",
+         py_modules=["slip.__init__", "slip.util.__init__",
+             "slip.util.hookable", "slip.util.files",
+             "slip._wrappers.__init__", "slip._wrappers._gobject"],
+-        requires=["selinux"])
++        requires=[ ])
+ 
+ setup(name="slip.dbus", version="@VERSION@",
+         py_modules=["slip.dbus.__init__", "slip.dbus.bus",
+diff --git a/slip/util/files.py b/slip/util/files.py
+index 27ba45c..53869f6 100644
+--- a/slip/util/files.py
++++ b/slip/util/files.py
+@@ -24,7 +24,7 @@ __all__ = ["issamefile", "linkfile", "copyfile", "linkorcopyfile",
+            "overwrite_safely"]
+ 
+ import os
+-import selinux
++# import selinux
+ import shutil
+ import tempfile
+ import errno
+@@ -134,8 +134,8 @@ def copyfile(srcpath, dstpath, copy_mode_from_dst=True, run_restorecon=True):
+ 
+     os.rename(dsttmpfile.name, dstpath)
+ 
+-    if run_restorecon and selinux.is_selinux_enabled() > 0:
+-        selinux.restorecon(dstpath)
++#    if run_restorecon and selinux.is_selinux_enabled() > 0:
++#        selinux.restorecon(dstpath)
+ 
+ 
+ def linkorcopyfile(srcpath, dstpath, copy_mode_from_dst=True,
+@@ -234,8 +234,8 @@ def overwrite_safely(path, content, preserve_mode=True, preserve_context=True):
+ 
+     exists = os.path.exists(path)
+ 
+-    if preserve_context and selinux.is_selinux_enabled() <= 0:
+-        preserve_context = False
++#    if preserve_context and selinux.is_selinux_enabled() <= 0:
++#        preserve_context = False
+ 
+     try:
+         fd, tmpname = tempfile.mkstemp(prefix=base + os.path.extsep,
+@@ -244,10 +244,10 @@ def overwrite_safely(path, content, preserve_mode=True, preserve_context=True):
+         if exists and preserve_mode:
+             shutil.copymode(path, tmpname)
+ 
+-        if exists and preserve_context:
+-            ret, ctx = selinux.getfilecon(path)
+-            if ret < 0:
+-                raise RuntimeError("getfilecon(%r) failed" % path)
++#        if exists and preserve_context:
++#            ret, ctx = selinux.getfilecon(path)
++#            if ret < 0:
++#                raise RuntimeError("getfilecon(%r) failed" % path)
+ 
+         f = os.fdopen(fd, "w")
+         fd = None
+@@ -259,11 +259,11 @@ def overwrite_safely(path, content, preserve_mode=True, preserve_context=True):
+ 
+         os.rename(tmpname, path)
+ 
+-        if preserve_context:
+-            if exists:
+-                selinux.setfilecon(path, ctx)
+-            else:
+-                selinux.restorecon(path)
++#        if preserve_context:
++#            if exists:
++#                selinux.setfilecon(path, ctx)
++#            else:
++#                selinux.restorecon(path)
+ 
+     finally:
+         if f:
+-- 
+1.8.3.2
+
diff --git a/dev-python/python-slip/files/python-slip-0.6.5-no-selinux.patch b/dev-python/python-slip/files/python-slip-0.6.5-no-selinux.patch
new file mode 100644
index 000000000000..b957625f7ecd
--- /dev/null
+++ b/dev-python/python-slip/files/python-slip-0.6.5-no-selinux.patch
@@ -0,0 +1,93 @@
+From 66480a1ee0222d9944f58af945959183b23c26f6 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 16 Aug 2017 10:49:43 +0200
+Subject: [PATCH] Disable selinux
+
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+---
+ setup.py.in        |  2 +-
+ slip/util/files.py | 27 ++++++++++++++-------------
+ 2 files changed, 15 insertions(+), 14 deletions(-)
+
+diff --git a/setup.py.in b/setup.py.in
+index 9e7644b..fb276a7 100644
+--- a/setup.py.in
++++ b/setup.py.in
+@@ -8,7 +8,7 @@ setup(name="slip", version="@VERSION@",
+         py_modules=["slip.__init__", "slip.util.__init__",
+             "slip.util.hookable", "slip.util.files",
+             "slip._wrappers.__init__", "slip._wrappers._glib"],
+-        requires=["selinux"])
++        requires=[])
+ 
+ setup(name="slip.dbus", version="@VERSION@",
+         py_modules=["slip.dbus.__init__", "slip.dbus.bus",
+diff --git a/slip/util/files.py b/slip/util/files.py
+index 98faa7c..a0a3768 100644
+--- a/slip/util/files.py
++++ b/slip/util/files.py
+@@ -33,6 +33,7 @@ __all__ = ["issamefile", "linkfile", "copyfile", "linkorcopyfile",
+ 
+ import os
+ import selinux
++# import selinux
+ import tempfile
+ import errno
+ import stat
+@@ -140,8 +141,8 @@ def copyfile(srcpath, dstpath, copy_mode_from_dst=True, run_restorecon=True):
+ 
+     os.rename(dsttmpfile.name, dstpath)
+ 
+-    if run_restorecon and selinux.is_selinux_enabled() > 0:
+-        selinux.restorecon(dstpath)
++#    if run_restorecon and selinux.is_selinux_enabled() > 0:
++#        selinux.restorecon(dstpath)
+ 
+ 
+ def linkorcopyfile(
+@@ -247,8 +248,8 @@ def overwrite_safely(
+ 
+     exists = os.path.exists(path)
+ 
+-    if preserve_context and selinux.is_selinux_enabled() <= 0:
+-        preserve_context = False
++#    if preserve_context and selinux.is_selinux_enabled() <= 0:
++#        preserve_context = False
+ 
+     try:
+         fd, tmpname = tempfile.mkstemp(prefix=base + os.path.extsep,
+@@ -263,10 +264,10 @@ def overwrite_safely(
+             if preserve_mode:
+                 os.fchmod(fd, stat.S_IMODE(s.st_mode))
+ 
+-            if preserve_context:
+-                ret, ctx = selinux.getfilecon(path)
+-                if ret < 0:
+-                    raise RuntimeError("getfilecon(%r) failed" % path)
++#            if preserve_context:
++#                ret, ctx = selinux.getfilecon(path)
++#                if ret < 0:
++#                    raise RuntimeError("getfilecon(%r) failed" % path)
+ 
+         f = os.fdopen(fd, "w")
+         fd = None
+@@ -278,11 +279,11 @@ def overwrite_safely(
+ 
+         os.rename(tmpname, path)
+ 
+-        if preserve_context:
+-            if exists:
+-                selinux.setfilecon(path, ctx)
+-            else:
+-                selinux.restorecon(path)
++#        if preserve_context:
++#            if exists:
++#                selinux.setfilecon(path, ctx)
++#            else:
++#                selinux.restorecon(path)
+ 
+     finally:
+         if f:
+-- 
+2.14.0
+
diff --git a/dev-python/python-slip/metadata.xml b/dev-python/python-slip/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/dev-python/python-slip/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="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-slip/python-slip-0.6.1.ebuild b/dev-python/python-slip/python-slip-0.6.1.ebuild
new file mode 100644
index 000000000000..7ec1e7fe6ee7
--- /dev/null
+++ b/dev-python/python-slip/python-slip-0.6.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Miscellaneous convenience, extension and workaround code for Python"
+HOMEPAGE="https://github.com/nphilipp/python-slip"
+SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="dbus selinux"
+
+RDEPEND="
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		sys-auth/polkit )
+"
+DEPEND=""
+
+python_prepare_all() {
+	use selinux || epatch "${FILESDIR}/${PN}-0.4.0-no-selinux.patch"
+
+	# hard-disable slip.gtk since it did not get ported to gtk3+ and the only user
+	# of slip (firewalld) does not use it (upstream disables it for py3 already)
+	sed \
+		-e 's|sys.version_info.major == 2|False|' \
+		-e "s:@VERSION@:${PV}:" setup.py.in > setup.py || die "sed failed"
+
+	if ! use dbus; then
+		sed -e '/name="slip.dbus"/ s/\(.*\)/if 0:\n    \1/' \
+			-i setup.py || die "sed 2 failed"
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-slip/python-slip-0.6.5.ebuild b/dev-python/python-slip/python-slip-0.6.5.ebuild
new file mode 100644
index 000000000000..58abc1ead8da
--- /dev/null
+++ b/dev-python/python-slip/python-slip-0.6.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Miscellaneous convenience, extension and workaround code for Python"
+HOMEPAGE="https://github.com/nphilipp/python-slip"
+SRC_URI="https://github.com/nphilipp/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="dbus selinux"
+
+RDEPEND="
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		sys-auth/polkit )
+"
+DEPEND=""
+
+python_prepare_all() {
+	use selinux || epatch "${FILESDIR}"/${PN}-0.6.5-no-selinux.patch
+
+	# hard-disable slip.gtk since it did not get ported to gtk3+ and the only user
+	# of slip (firewalld) does not use it (upstream disables it for py3 already)
+	sed \
+		-e 's|sys.version_info.major == 2|False|' \
+		-e "s:@VERSION@:${PV}:" setup.py.in > setup.py || die "sed failed"
+
+	if ! use dbus; then
+		sed -e '/name="slip.dbus"/ s/\(.*\)/if 0:\n    \1/' \
+			-i setup.py || die "sed 2 failed"
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-social-auth/Manifest b/dev-python/python-social-auth/Manifest
new file mode 100644
index 000000000000..02eb5e01bf77
--- /dev/null
+++ b/dev-python/python-social-auth/Manifest
@@ -0,0 +1,7 @@
+DIST python-social-auth-0.1.26.tar.gz 247579 SHA256 9f0a9e8526850e9d0bdd4e5df4d2a6129c4da5a747887ccbfebafc0d2868120c SHA512 c3637f9a269f2c8465b1896840a5ca0f70bb6c45c93f7d9c08c54434037984538ba95442a164841c069cb5b1fd251d0f3f62baa1dc2754a542baceb2f325bd8b WHIRLPOOL e9d17f1c7b094cf0c20d7cee6ba06e0557b322d24aa6bf53743e49eaa08bf8935e71b7d1793227d53d6ff9cacebae975768feab5f6d37d683df8f16caf19a9ed
+DIST python-social-auth-0.2.10.tar.gz 297210 SHA256 10dd7df9e2bb6143cf33170ae53b7463a6947ed111da7158d8e3fd60fafe5d91 SHA512 af5247cee0b77f36d1bfdd7457708c2f2053bc779bae8eae0cfe79f0f9236c37882afcbd325863255282eb7559d8f84715b3e983f94d55bd3e7815c5469f150d WHIRLPOOL 7bbc97885ce4d74785b4506b3ddb133fb9751625193742194ca6cc78e3a76fb8e07c9440bfac7e661fe76363a78b66c87049282163c9923015ce3251da235881
+EBUILD python-social-auth-0.1.26.ebuild 1475 SHA256 e3e81ec3e7302b29a9bd009e1ccd392e4b1284c90da93002efc2bfbcfe613ea8 SHA512 6418a043c6b63db4fe80d72b8cfeec6612c6dced724d722fbe173bbf8574acf233dab768188887085f79ea8ee0a0bf7ca657c9bede3286092f73170fc1545cc2 WHIRLPOOL 065d5ac59152d5690fce46bcd488cda75f7bce3943a65afaf6098389604fe1bd3af79ee44daee8cf96f7273754c11376a6a98d119c7f1608426e5300a5bec50c
+EBUILD python-social-auth-0.2.10.ebuild 1527 SHA256 18f1d20a74677306c152517a6aa7a7cd217106084002799382c6d7e244c4fdf5 SHA512 c69db0fa4e38f0fcc70221b8bb9a31b8b8a751d084ff8399ab441a2be32c504ba54405eacbeacb58bcdb59f3b231490d2e6bef9ae1c29cf2f059d518d134fd13 WHIRLPOOL 9aa738bf1fcd366d6c5f37123878f058cc32fa3905150c3f95332013fea5040f384cd9d1f1b47682ea4b31b5e9c3b7a8e4f3e2fbc136049e129c8e0aff384a7f
+MISC ChangeLog 2716 SHA256 9c2010ad04f7d786446dbc887414e28c431b10da57a6b1e23408f9f7a673770d SHA512 9bb843e8c68190421c821948cb2677be8cdbda195891e31c6b8571a5def4a42cd5cf26db83bf6ae35ddf923c411837f69efc14728488acd7b69be7c2dc3ed1c2 WHIRLPOOL b0d395b1841d880eccde8a3998f8f25e6058b459e2e9bbc18233e269d6a98de8dd1aa6aafdd0e8d57b9c825254576a5398ccc0826383e7b4921b7d9898eeb939
+MISC ChangeLog-2015 986 SHA256 c07d168a01bd8296190f34834fd1f4dd0ed67a6238c2ec00af8d6b5776fb556c SHA512 7121652ea33bd322919b61dfef6417101169e69b49111bea8bf3e507dd08a8fa70947fdf2d27521f774fc973554b8185d4bdb44d4466316990c6ab3a67c9961b WHIRLPOOL 4b20c0beefeef6d701c310bcd941f7386f6ddf727aac8bb26ce6db3589b66e702fd98eb601a4bdcfcd6584d4f330f14bd2f89001b5d8f63b5dd0d7f3a176ef64
+MISC metadata.xml 338 SHA256 007b8de26feda3ae1690306714d236916a2cf61b453bf8d37b39d5ff8c7e8054 SHA512 368ff17c8b2533952749b5d757fdfde6932977a00ca3278ffd5e403b22aa6c51471c413f6311c05ca3001f077735826cec63ac30c4b1926925e91d74bc50060a WHIRLPOOL 72631ec2c893282b0b81ebaaa6e7dcb7e2932af08ea2fa3d9a2d3eee5d75a6bc873936716934e80aa61890a03370c354c4d7c57388b3c006c79a5b742711728d
diff --git a/dev-python/python-social-auth/metadata.xml b/dev-python/python-social-auth/metadata.xml
new file mode 100644
index 000000000000..2f61c1adb476
--- /dev/null
+++ b/dev-python/python-social-auth/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">omab/python-social-auth</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-social-auth/python-social-auth-0.1.26.ebuild b/dev-python/python-social-auth/python-social-auth-0.1.26.ebuild
new file mode 100644
index 000000000000..7c1e44660d9d
--- /dev/null
+++ b/dev-python/python-social-auth/python-social-auth-0.1.26.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy to setup social auth mechanism with support for several frameworks and auth providers"
+HOMEPAGE="http://psa.matiasaguirre.net/"
+SRC_URI="https://github.com/omab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="doc examples test"
+
+RDEPEND="
+	$(python_gen_cond_dep \
+	    'dev-python/python-openid[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep \
+		'dev-python/python3-openid[${PYTHON_USEDEP}]' 'python3*')
+	>=dev-python/oauthlib-0.3.8[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+	>=dev-python/six-1.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+# tests require internet
+#"
+#	test? (
+#		dev-python/coverage[${PYTHON_USEDEP}]
+#		dev-python/httpretty[${PYTHON_USEDEP}]
+#		dev-python/mock[${PYTHON_USEDEP}]
+#		dev-python/nose[${PYTHON_USEDEP}]
+#		dev-python/sure[${PYTHON_USEDEP}]
+#	)
+#"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
+
+#python_test() {
+#	"${S}"/social/tests/run_tests.sh || die "Tests failed on ${EPYTHON}"
+#}
diff --git a/dev-python/python-social-auth/python-social-auth-0.2.10.ebuild b/dev-python/python-social-auth/python-social-auth-0.2.10.ebuild
new file mode 100644
index 000000000000..8c8f3c7a876e
--- /dev/null
+++ b/dev-python/python-social-auth/python-social-auth-0.2.10.ebuild
@@ -0,0 +1,57 @@
+# 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
+
+DESCRIPTION="Easy to setup social auth mechanism with support for several frameworks and auth providers"
+HOMEPAGE="http://psa.matiasaguirre.net/"
+SRC_URI="https://github.com/omab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="doc examples test"
+
+RDEPEND="
+	$(python_gen_cond_dep \
+	    'dev-python/python-openid[${PYTHON_USEDEP}]' 'python2*')
+	$(python_gen_cond_dep \
+		'dev-python/python3-openid[${PYTHON_USEDEP}]' 'python3*')
+	>=dev-python/oauthlib-0.3.8[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.2.0[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+	>=dev-python/six-1.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+# tests require internet
+#"
+#	test? (
+#		dev-python/coverage[${PYTHON_USEDEP}]
+#		dev-python/httpretty[${PYTHON_USEDEP}]
+#		dev-python/mock[${PYTHON_USEDEP}]
+#		dev-python/nose[${PYTHON_USEDEP}]
+#		dev-python/sure[${PYTHON_USEDEP}]
+#	)
+#"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
+
+#python_test() {
+#	"${S}"/social/tests/run_tests.sh || die "Tests failed on ${EPYTHON}"
+#}
diff --git a/dev-python/python-socketio/Manifest b/dev-python/python-socketio/Manifest
new file mode 100644
index 000000000000..a3393eed481f
--- /dev/null
+++ b/dev-python/python-socketio/Manifest
@@ -0,0 +1,6 @@
+DIST python-socketio-1.7.4.tar.gz 23298 SHA256 9200ee48aec8673027fdc40b0391aa2d681ff994d93b738ebd9f0d29916f24c4 SHA512 fb31072420eca42fa0349f0a9350fe9ab6bbbac7dc32cd7ae76cffa026fdeeb4197b8c441d76bfc46af55a550c5b7e81e387b67d538c500075bc5b4e8f68d5ab WHIRLPOOL 038a0f43a93076cd6a9ccf8c081e54d421a7fcf1256dee350964ca16a5a5b10de9a20e919f761bf2704631562b0965a6825e3b28d8620b096eadc24504a1ea7b
+DIST python-socketio-1.8.0.tar.gz 23557 SHA256 4d662601c2fec639b5bb8fdfdb1c53cac73c44efb0b39ee428184bddf2f49479 SHA512 2514cbad3e429c101f5e247bdf2e4a2b5a0957c19fa97e56ebe8cd78b36e81cfb9dc4500bee367e57460be3a08bbd1e70967a5c87109034ade847ff7f559711d WHIRLPOOL 494438728043f9f2492a9ecae9f5ef26dc4c403b5dff4b99ad079aaa9cb3ce2c10e705213b8937071a187512f7efe6ed92b29c3be493c21028bbca8fcaccf942
+EBUILD python-socketio-1.7.4.ebuild 891 SHA256 3c78fe9af692025b2954f1e9fd8ca9e7c151f795ddbc212c78a93e93a813797d SHA512 c1d870ce333979ef24de81a833c124709e71f6fbd99b51393238fa61ee89600c0bd442713d265dc2a36e96bb88830204468e24679800d410795833475513e12e WHIRLPOOL ed7cb94952e101098223d0d3488cbff0f90b74e885db56acd375ec1b305080c3b78c1735b31699f9c85d0ab1256c8cf86f786065badd934d8ab104f2024bdb5e
+EBUILD python-socketio-1.8.0.ebuild 891 SHA256 3c78fe9af692025b2954f1e9fd8ca9e7c151f795ddbc212c78a93e93a813797d SHA512 c1d870ce333979ef24de81a833c124709e71f6fbd99b51393238fa61ee89600c0bd442713d265dc2a36e96bb88830204468e24679800d410795833475513e12e WHIRLPOOL ed7cb94952e101098223d0d3488cbff0f90b74e885db56acd375ec1b305080c3b78c1735b31699f9c85d0ab1256c8cf86f786065badd934d8ab104f2024bdb5e
+MISC ChangeLog 1705 SHA256 b4563153b2ac64fe72ade9ebabbaccd6d32e1cc0e114e2202a928246f069b67d SHA512 a6a85a49238fccd87142fa9a80bf3723e66d9485f5fb6f100ec569330d9b1ad57f0a4ce63628449b3cc68e50e09d2be1b4961ac5db772d50a5674b6e072c3bb3 WHIRLPOOL 048cb41045a7057048bde43d5528ed08295bbd33c8e9c746d857e1d34f209246ee085047af0f82434c7497050f81baafbefecca161460bf0e47e4d2005acb348
+MISC metadata.xml 466 SHA256 7cc41fcbd69866add1c9f1cb678cd2bfbf5998371e049994255ce513535c8678 SHA512 8e46ce0f84adfe7f52c9a99df6338b78755d097702881515605adbfbe2c68af0afdf6e07b05d2ec915e089bd97b01ad38bc0fce43523eb542a0271788b38e79f WHIRLPOOL 9beb04977ebe8e2a7d12c4241abcf26c7bd02248eb11288da64166a2ccbe1bb14ddd12b02ba046e6e67983bfe9c1e3331efb015a3874df3d85281b88d0868475
diff --git a/dev-python/python-socketio/metadata.xml b/dev-python/python-socketio/metadata.xml
new file mode 100644
index 000000000000..7455acd71c34
--- /dev/null
+++ b/dev-python/python-socketio/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">python-socketio</remote-id>
+		<remote-id type="github">miguelgrinberg/python-socketio</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-socketio/python-socketio-1.7.4.ebuild b/dev-python/python-socketio/python-socketio-1.7.4.ebuild
new file mode 100644
index 000000000000..0dc7a26ee56f
--- /dev/null
+++ b/dev-python/python-socketio/python-socketio-1.7.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Socket.IO realtime server."
+HOMEPAGE="https://${PN}.readthedocs.org/ https://github.com/miguelgrinberg/${PN}/ https://pypi.python.org/pypi/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/python-engineio-1.2.1[${PYTHON_USEDEP}]
+	!dev-python/gevent-socketio"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+# pypi tarball does not contain tests
+RESTRICT="test"
+
+src_prepare() {
+	eapply_user
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	esetup.py test || die
+}
diff --git a/dev-python/python-socketio/python-socketio-1.8.0.ebuild b/dev-python/python-socketio/python-socketio-1.8.0.ebuild
new file mode 100644
index 000000000000..0dc7a26ee56f
--- /dev/null
+++ b/dev-python/python-socketio/python-socketio-1.8.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Socket.IO realtime server."
+HOMEPAGE="https://${PN}.readthedocs.org/ https://github.com/miguelgrinberg/${PN}/ https://pypi.python.org/pypi/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/python-engineio-1.2.1[${PYTHON_USEDEP}]
+	!dev-python/gevent-socketio"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+# pypi tarball does not contain tests
+RESTRICT="test"
+
+src_prepare() {
+	eapply_user
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	esetup.py test || die
+}
diff --git a/dev-python/python-spidermonkey/Manifest b/dev-python/python-spidermonkey/Manifest
new file mode 100644
index 000000000000..b1b6828e5585
--- /dev/null
+++ b/dev-python/python-spidermonkey/Manifest
@@ -0,0 +1,5 @@
+AUX python-spidermonkey-0.0.10-tests.patch 367 SHA256 f006bab989c8a20f15fd4df0c0f3412d354b05d96eaf2e36860458a133ebdd43 SHA512 621375af9ee114ec01d1176e1ccb578a84b81d524a8d762d76998e38906167ba7eb47561ec60aa3f5fb31b5f78668df2be937e79bcb4a2a23e11dbdfe042f0c1 WHIRLPOOL cb33457097a34a34f9014abf03fc86a6c92e575165472b9b6d7c8f54ba1a1e18c2a18c79a0e99fb188c4237ffbe76039a4378004e84db0086fa8c88ce015a351
+DIST python-spidermonkey-0.0.10.tar.gz 787526 SHA256 5409546a68b794a398f8598eddfeb4274559376c54c84c8b752798391712d889 SHA512 e3d45ba2e747f8f382e273962f8015be8e736cbd49246864d894d7db1d436c9e14c5e945f4bd3cf3a7aca8d4f60d0f57855704c5d2cac94630df26e67898f591 WHIRLPOOL 5d6be4f176450005a8cd14cbe9fcebbc38f0750e6366e6860471b0d2f0ece91e75c5d14840f99080b8b49c413b71588edbef11605aea0b0dab4b5eecfbe130dd
+EBUILD python-spidermonkey-0.0.10.ebuild 598 SHA256 adbb7ec4d23fa695802313e76d4065fef99b17464b7461f77960b7944006f6fe SHA512 535b59ee834362dda665dd3fb9c179b8055354bc9502ded06a273dc2a9f4b85651b1d2ae3ebbecfdd487d5128604999cfe5607d1553d129cd87acc9655b2f85a WHIRLPOOL c42a87ca298c1c98fa9911c07400b4394eaee10019ef9bf6396d66cee471711f3c40a5813b1b600aa6d1ea5c0ab8deddc9ce54afee89ca4a6cdf6806ae56160e
+MISC ChangeLog 1235 SHA256 5dd1bc31ab95541d10824bfdf739c6a7caa222abeb9d37aefe288653c5cfe3f8 SHA512 5dc67d41c9fbeef86369833d0829162d327e2578e6e0ce07d392d6da362697eb8037f581b28e18ad0a79a6ad2e71dee8038f7c4572f1fb37dd6d2b3d196a8cd1 WHIRLPOOL e55ca9bb33c2133ef3f495d907026d95f1068afa7141047ad17a4d1933a7dee24da1cae54056666503fc9b0f5352b6ff9f09e641d00aab487e6bd38a31363cb0
+MISC metadata.xml 478 SHA256 2fe70fcef6e5e703b4decf31e72a5dd2487ad8cf95f2c16fcfc21fd4ca67a04f SHA512 4aec619b8aa54a12c0cb1a4f57f51f5f6ec55e737ed505fae1281c22006c31f10e56e68c0af04d53a5747ccff3290f08ac5a661a52889deb7b775a63c4f595b6 WHIRLPOOL 080d2ba74c1cfa70772d0db4267360302a0a40ceda644a3190c6881df328803ff2f637f378d5f5148b4633919e264cf8393a614b0e0570f589c63a5c2c6d4c9e
diff --git a/dev-python/python-spidermonkey/files/python-spidermonkey-0.0.10-tests.patch b/dev-python/python-spidermonkey/files/python-spidermonkey-0.0.10-tests.patch
new file mode 100644
index 000000000000..fca5fdd3d79c
--- /dev/null
+++ b/dev-python/python-spidermonkey/files/python-spidermonkey-0.0.10-tests.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/test-syntax-error.py b/tests/test-syntax-error.py
+index ab14deb..78fc0ed 100644
+--- a/tests/test-syntax-error.py
++++ b/tests/test-syntax-error.py
+@@ -9,7 +9,3 @@ import traceback
+ def test_syntax_error(cx):
+     t.raises(t.JSError, cx.execute, "function(asdf;")
+ 
+-@t.cx()
+-def test_invalid_octal(cx):
+-    t.raises(t.JSError, cx.execute, "09;")
+-
diff --git a/dev-python/python-spidermonkey/metadata.xml b/dev-python/python-spidermonkey/metadata.xml
new file mode 100644
index 000000000000..0307a177ffc4
--- /dev/null
+++ b/dev-python/python-spidermonkey/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>wizardedit@gentoo.org</email>
+    <name>Austin English</name>
+  </maintainer>
+  <longdescription>
+  JavaScript / Python bridge
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">python-spidermonkey</remote-id>
+	<remote-id type="github">davisp/python-spidermonkey</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-spidermonkey/python-spidermonkey-0.0.10.ebuild b/dev-python/python-spidermonkey/python-spidermonkey-0.0.10.ebuild
new file mode 100644
index 000000000000..0d4c1265b247
--- /dev/null
+++ b/dev-python/python-spidermonkey/python-spidermonkey-0.0.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=(python2_7)
+inherit distutils-r1
+
+DESCRIPTION="JavaScript / Python bridge"
+HOMEPAGE="https://github.com/davisp/python-spidermonkey"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+		dev-libs/nspr
+		>=dev-python/nose-0.10.0[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}"
+
+PATCHES=("${FILESDIR}"/${P}-tests.patch)
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-sqlparse/Manifest b/dev-python/python-sqlparse/Manifest
new file mode 100644
index 000000000000..c78f51ef04d8
--- /dev/null
+++ b/dev-python/python-sqlparse/Manifest
@@ -0,0 +1,9 @@
+DIST sqlparse-0.2.1.tar.gz 53463 SHA256 1c98a2bdffe67f1bb817b72a7ba4d38be592e0f07c5acea4adebcec12c4377d1 SHA512 8f70677c73cb3bb2ac11d6b90fd86f6f874b3ba4b402bb776f716d75103c3768c385dbe403290c167f76874e92c36ac4deb1ca3c5d5f6fbc69bed0935505d5ef WHIRLPOOL 65c5ee607e98deda807443b2aa92a05d9fe9087e0fd0f353b77b36bbc1064e5aa25639b4351ed104254821b012d0b5718d5df777a277be4f0d16dd35109e2b69
+DIST sqlparse-0.2.2.tar.gz 57965 SHA256 d446296b2c26f9466860dd85fa32480bec523ab96bda8879262c38e8e8fbba21 SHA512 8d812067364897e96c6ece28bae51983d5560db2be2ed23c6f16e718a9fea220fd9941970208bfbd64becae78f1a1e1c2603c4f3246319ec120ada71515ef5a1 WHIRLPOOL b2f9575748e2ae5599844648bf39da205de9662462cb201b5e1d9187250bef6a6117a2f519281dfc471b72383478df04123d3bea2b09bdf274bc329dac783f42
+DIST sqlparse-0.2.3.tar.gz 60742 SHA256 becd7cc7cebbdf311de8ceedfcf2bd2403297024418801947f8c953025beeff8 SHA512 ec654e680f8ce423a89da92c4c74f85e652bebb19e9a40ab0b8067f61803897e49e1e6f8dd1ab454b1ed130974d76b4f973c799264fd4bf8a87f034ba9c44835 WHIRLPOOL 17f912d555607047180d6b5118b70b9d5e06bf3361493b267a91bbfadc6c74ec93d0b9aeddc78f7cb7c9fbc6732a7f48bfe5257047e6c505f94f3d65afc3643e
+EBUILD python-sqlparse-0.2.1.ebuild 1372 SHA256 ea4011292853c4446f26e64a1a48bd23f0a5cd56cce5dcde92d5292aaba745f9 SHA512 04990aa24b4caec618040843f5a75bc8bbd4a23d643d00805fe294d078cfb3c7168c0d4152fe992324f4c57d665c5210e88131764320add7d6bea78096387039 WHIRLPOOL ed0822e1cfc0a4109ccd96faa9b71fb4d5fbd2490a35cf727a95e0d43277b9b96c22e33b9f2313d72c05e583b855cfd07bbcb3dfdb247514c0455f086c6b0530
+EBUILD python-sqlparse-0.2.2.ebuild 1381 SHA256 4efa4affce4cdc2479768066bb44bd63256e799fc94f3853cffb8b00dfe8c1fa SHA512 209f49b880fc6ee533f293990e78c5f5401b520619e4f183a096fa4cb28391727544038bd538fca2f807057465fe6ddce4dc7178397eb95c3c098226c4a539a7 WHIRLPOOL 4f56b2cb6dd84417433a4e70c2ad949cbfd779ef3aa915b883099d70bdef36478ea234ba73e22cb907bb4f4f256e72c41304d95151c12796c7872493f74b6959
+EBUILD python-sqlparse-0.2.3.ebuild 1374 SHA256 cf8690367d575f2c29817712e4699bc2804ee37677c7c9d9de97ebb9eb527bbd SHA512 ab79e1671b9ff73185b695fec25642f9b8cacf5dd21b8fbc9398f94b3ede04fa5a3460558cffecadc27362e0deaecedef34ca3e6bb95bd8890b40a79c75621c7 WHIRLPOOL ff61204d22986c8421162972d37c87cc1cc72662969d3127170028a14c164670432b798308717a76885c2984c11fce2f55b39b907c269e0253cec3c047c4bdfb
+MISC ChangeLog 5839 SHA256 b8deee8b18bec34763bf29cb6354f55cc70ddc737828f423271fab67566ff932 SHA512 990969df3894ae1d8a211bd87aeb13fb6e9c447910bc8e07ba9fd8aa3f4cf3b97b630a81263971e87835a41bd8e6a918d93cbb62c876eb58ec62b8c92c09b5c8 WHIRLPOOL a1f8e774fa9dce3562574354ad6496453a017307b6a66481df670c799cb3c458a52460b7aab72178196a499b837ff44f5f8dc8a88ca032cbb7ef0f4388aedd03
+MISC ChangeLog-2015 6839 SHA256 dbd5983f7324a835d693e85f5525d8ba9034523b31fb40bf8cce1987d98afd80 SHA512 657f30157ebf5c92e19ffe4f8be374975eb66fd621ea31f3e81b9a599f1df753e28f55ef6e3c49e5afcaf8de5b7b6123156c1309b732629539489f1c12d3f063 WHIRLPOOL b1691d3b331dae47cc5706182798ffa34e8429fb50efd163aed2cdc046b197573c02bf480100a8fcbd2c59b060d5ae27239023a4b20d2abd8e2ac5da6bc525e9
+MISC metadata.xml 453 SHA256 b629246e97b59580e1d6a9ea9d5490fb12c3376d206a7259f16f4331c265935f SHA512 5bb3c69c2dd5bc8ad2bc8c4a174be8627ed54ba0055bc153d36733f964ee289d71d0b392ec63127482a87f5f56fee9cf2900a2830a0ffbb733b1119be4abc0d3 WHIRLPOOL 76d5ca55b67d2a82ef0be79dae30979be982b612d469a6b48764dc4e156938efde4c968a75386a87a84a9f86a0f1ca00dc69a1477f15d3f956ca956c4f92af57
diff --git a/dev-python/python-sqlparse/metadata.xml b/dev-python/python-sqlparse/metadata.xml
new file mode 100644
index 000000000000..2b283af49f15
--- /dev/null
+++ b/dev-python/python-sqlparse/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">python-sqlparse</remote-id>
+    <remote-id type="pypi">python-sqlparse</remote-id>
+    <remote-id type="github">andialbrecht/sqlparse</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.2.1.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.2.1.ebuild
new file mode 100644
index 000000000000..554f45f5583b
--- /dev/null
+++ b/dev-python/python-sqlparse/python-sqlparse-0.2.1.ebuild
@@ -0,0 +1,56 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+MY_PN="${PN##python-}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A non-validating SQL parser module for Python"
+HOMEPAGE="https://code.google.com/p/python-sqlparse/ https://github.com/andialbrecht/sqlparse"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD-2"
+IUSE="doc test"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		)"
+# Required for running tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+S="${WORKDIR}"/${P#python-}
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	if python_is_python3; then
+		2to3 -w --no-diffs -n tests/ sqlparse/
+		py.test ./tests || die "testsuite failed ${EPYTHON}"
+	else
+		py.test tests || die "testsuite failed under ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.2.2.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.2.2.ebuild
new file mode 100644
index 000000000000..d45f7b319bf5
--- /dev/null
+++ b/dev-python/python-sqlparse/python-sqlparse-0.2.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+MY_PN="${PN##python-}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A non-validating SQL parser module for Python"
+HOMEPAGE="https://code.google.com/p/python-sqlparse/ https://github.com/andialbrecht/sqlparse"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD-2"
+IUSE="doc test"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		)"
+# Required for running tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+S="${WORKDIR}"/${P#python-}
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	if python_is_python3; then
+		2to3 -w --no-diffs -n tests/ sqlparse/
+		py.test ./tests || die "testsuite failed ${EPYTHON}"
+	else
+		py.test tests || die "testsuite failed under ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild
new file mode 100644
index 000000000000..8abfe85a5f6e
--- /dev/null
+++ b/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+MY_PN="${PN##python-}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A non-validating SQL parser module for Python"
+HOMEPAGE="https://code.google.com/p/python-sqlparse/ https://github.com/andialbrecht/sqlparse"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD-2"
+IUSE="doc test"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		)"
+# Required for running tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+S="${WORKDIR}"/${P#python-}
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	if python_is_python3; then
+		2to3 -w --no-diffs -n tests/ sqlparse/
+		py.test ./tests || die "testsuite failed ${EPYTHON}"
+	else
+		py.test tests || die "testsuite failed under ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-stdnum/Manifest b/dev-python/python-stdnum/Manifest
new file mode 100644
index 000000000000..f5798ed4a051
--- /dev/null
+++ b/dev-python/python-stdnum/Manifest
@@ -0,0 +1,9 @@
+DIST python-stdnum-1.5.tar.gz 268416 SHA256 10fe3db303aec532057484668ca9a4f421c2e5b3b1caee670b26b047bcbc737e SHA512 8d6394d7039fc5a2e3785eb95ef1793038ae75443224fc5af7f1cae2cb575c2f4e5451bd9668304ba95d3ee3f87dc0103ccf6c35837220f9729cbe1a3e13f656 WHIRLPOOL 530d5b5b5f9ca3d1d6b0a9c2078d90112180724ec05750be1e5d30990cf1fff067e0342c221bbb52fdfc902ab1efc09adb1ab7fce2833d35368e53ae16de8ec1
+DIST python-stdnum-1.6.tar.gz 399518 SHA256 157a0aef01b1e846ddd11252dc516637da6b3347e32f0130825b7fae1d8b4655 SHA512 dc2fba2563e4de658a09b7afc7d0d663f21b5528da9061f126d581e8deb2a88569c83304bde834c0da376dc65ee09274aed82d55abb60b0fe0a181e1b5cfe88f WHIRLPOOL 2bd6203adde32bda1c2971d743fcb9db02c49a65c944e57a3d58d4ca7f3e16c08d82ee018208aff45e1e7c7c347580396aa02fbb2dc0f7cc7608c3b26fb83d9f
+DIST python-stdnum-1.7.tar.gz 411134 SHA256 987c25e1047e8742131bcf29dac7a406987adb1463465749e2daaba8cb19d264 SHA512 323f5e37087e95143eb59345c4ddb5fb1529a136c234c8e9c957cf9914984e758b256facbfbc5de379000b8939460ea25e8105428d67f7052a23676c334a002a WHIRLPOOL 8cff46c9f7406f3f8783ab522c14a3fe43d7469759eccd99dfe1ffe900313c687d378d14e99110219b51783d7786d0efa2df8a66cb52158d8943214eb0dfcd40
+EBUILD python-stdnum-1.5.ebuild 586 SHA256 e948107a3f65f2550de69ee1f40faef197461cfc520fdbf1a8814dada1d102fc SHA512 88d2be7a2078b7ccc7fb7f214324aec72aae4e29afaa8bcb308584ce6e3ab5e8f760b7d28a153e626f82f736797cfa0c67bd5bd6ca0d6ef27af9d2d5a85e89b8 WHIRLPOOL 627413de119857bda7817534c65b588560518da28650ac2070ed0104e0c1c85ddb78e2281822221e4576ff8b8e51d3ca04bf64aa7c4660ee68aeccc192eaa850
+EBUILD python-stdnum-1.6.ebuild 590 SHA256 aa6cbd64c393b1a539360e294665a7869b18093966b8addd3288c72a1d8c8d0f SHA512 97eac31e035313c2c4b1c6d987a702fbb0340c452b48e9ff52f1df8bd43a8d7f1f954b811ab656eccff5b0ef69818d5308347e6649a7f5e9056258ace5d6f7be WHIRLPOOL 39de187015ec31450eb0238f257e4fce6d9c4161cf8022b3052530cfa9fe344261f748bbbecdea367425e59489bb1d289a023e1be6af80c7bbe0bf93b847cf73
+EBUILD python-stdnum-1.7.ebuild 590 SHA256 9c5b94e0e396bdfdee0147698ae9e6740d1969ff7423d0ed4fffbb0b74da5cad SHA512 cae7b899ca9fe76c4b29d2c56d5dd800bd12d75f6b0bc1cda3e2859e6b921eb594c8ecc58fee84c99b71c75e033a0f479ab5f90120900e2bf3740af7f0f48117 WHIRLPOOL bc5dd0ac9ff8c5b31712e66b0a79bdc36ad9a5bf4399c0d746b99c853b691707e6d92abcae9d975f2a80b920898867372d4c7e40192530bf17fb9f1596932c5d
+MISC ChangeLog 3086 SHA256 ed66e877ac51d0f6b564ff1566a624171a8f93b92910800ef7c55ff69d65be2d SHA512 b7b03522ba72679c61b547efce7fcc47a91818f1c6e1ab31dcc77c7be2ecf62da26db9057b81a2cc966d69b1616b58e540e3513c7440709f28825ff9daca85f3 WHIRLPOOL 815bd41605b4fc224a9a3e13efc1fce63e07d9c5623d71c184839acc50bb10122075acac997b39ba74d5bb6637d14d1034988a7f4846692791d6b9db63bfacee
+MISC ChangeLog-2015 913 SHA256 9d0e152fc23ad93d13f4c90f8e9678c5fcc8a99f8228c5d3eedf632be74412cc SHA512 cb3298cc0fc7892b5d7826c538b22cfaefbd7fa728c4c18574005c1402104a860d75a6fd63c9a72feac674c6e76e667a7d60cbd5db4ad3bab8f131cf480e93af WHIRLPOOL c26ad548b9807e2a277d978e831861358faa6984b7131e060253591546e025631b7421ab49364a0ef59a219e2fdea1e8f2f2bcaaa9834e45854524989c256e49
+MISC metadata.xml 475 SHA256 2bc304b7f236e5125b708767a22cd250127e51cc47d7457ba10103c8d0f81694 SHA512 4aae016f69e817168682ce7a08e9cd61da5397d83706b628b4a743491251c80ee0947f5a00f3f3657c2f80f276661f0287a5359041451b997c214ba94cd2430e WHIRLPOOL ab37ba3ffc12a5d87787a28b4be47f424926eff087f04bbd34ad90df7d81540a228dabcd173ed7d58da4f2c87bb6e2bc58f767d3faba169b8ac49c7d11baff03
diff --git a/dev-python/python-stdnum/metadata.xml b/dev-python/python-stdnum/metadata.xml
new file mode 100644
index 000000000000..60baaf8d7a53
--- /dev/null
+++ b/dev-python/python-stdnum/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cedk@gentoo.org</email>
+		<name>Cédric Krier</name>
+	</maintainer>
+	<longdescription lang="en">
+		A module to handle standardized numbers and codes
+	</longdescription>
+	<use>
+		<flag name="vies">Enable VIES</flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">python-stdnum</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-stdnum/python-stdnum-1.5.ebuild b/dev-python/python-stdnum/python-stdnum-1.5.ebuild
new file mode 100644
index 000000000000..65a4b727012c
--- /dev/null
+++ b/dev-python/python-stdnum/python-stdnum-1.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A module to handle standardized numbers and codes"
+HOMEPAGE="http://arthurdejong.org/python-stdnum/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vies test"
+
+RDEPEND="vies? ( dev-python/suds )"
+DEPEND="${DEPEND}
+	dev-python/setuptools
+	test? ( dev-python/nose )"
+
+DOCS=( ChangeLog NEWS README )
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/python-stdnum/python-stdnum-1.6.ebuild b/dev-python/python-stdnum/python-stdnum-1.6.ebuild
new file mode 100644
index 000000000000..f2da42e2503a
--- /dev/null
+++ b/dev-python/python-stdnum/python-stdnum-1.6.ebuild
@@ -0,0 +1,27 @@
+# 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
+
+DESCRIPTION="A module to handle standardized numbers and codes"
+HOMEPAGE="http://arthurdejong.org/python-stdnum/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vies test"
+
+RDEPEND="vies? ( dev-python/suds )"
+DEPEND="${DEPEND}
+	dev-python/setuptools
+	test? ( dev-python/nose )"
+
+DOCS=( ChangeLog NEWS README )
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/python-stdnum/python-stdnum-1.7.ebuild b/dev-python/python-stdnum/python-stdnum-1.7.ebuild
new file mode 100644
index 000000000000..6bb1b062dfbf
--- /dev/null
+++ b/dev-python/python-stdnum/python-stdnum-1.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A module to handle standardized numbers and codes"
+HOMEPAGE="http://arthurdejong.org/python-stdnum/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vies test"
+
+RDEPEND="vies? ( dev-python/suds )"
+DEPEND="${DEPEND}
+	dev-python/setuptools
+	test? ( dev-python/nose )"
+
+DOCS=( ChangeLog NEWS README )
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/python-swiftclient/Manifest b/dev-python/python-swiftclient/Manifest
new file mode 100644
index 000000000000..9a1d0d05975f
--- /dev/null
+++ b/dev-python/python-swiftclient/Manifest
@@ -0,0 +1,11 @@
+DIST python-swiftclient-3.0.0.tar.gz 134376 SHA256 824b8f204c5a7764de51795256e4175fdcd655ae4df85b8ae6e6ea9ec0b41f68 SHA512 4e81504876fb81bf74c3a3e034958c4783a4a9c2c426b7ae849e1968f98d9886c2299c2e67a2b366d6d4721b4635cef90ff49201ba9a4c86da9d61bfb96fa350 WHIRLPOOL d48902f331d04b3250dc6a90aa44f31d403012e10e1617a2fa52cb05b3d615293efc65a4f35872ec019254c096e44a79544d314cd1d4e6065e8e093febb3b3b7
+DIST python-swiftclient-3.1.0.tar.gz 155598 SHA256 7bb5984862b85ba2a18c16b4dc6af2fd14272871ad165eec47e9da111ab3fb9a SHA512 693fcea571721e2f578a21b05a3c908dd6621bcfdd70f09003a981e233e2b3061318d60e301dcfdbb03d08a326ca3f14f3297d8226b5a0a6d78f88b1a72b2ea4 WHIRLPOOL eaf7c4e78e2b642fa124c5044136fffe530450cbabf5bc4132e7d7e2f93d06dcfa2f6a4751e32a6ba1d90abf060ffd9eec679d3ece973594de9650e53557ee5f
+DIST python-swiftclient-3.3.0.tar.gz 166092 SHA256 8b4d38d73ceb2ef4984b39fb924bf9b265050ca2beb5c6bf29cb9f34ccd0bf7d SHA512 03e00e9b1f0f7b71c07e845cd9636031c15beb21a66495ab96be05df7e453160840948696ecb0d65d08c32e318d16425444aaa4ea16ede8268a2cf2b171a3987 WHIRLPOOL f1caa5dea37d3f727642d4e70308e8810d41e8e93716188159bd2b511518047bc12acb62dd1ab3631cf17ddfa773a7c7913093902ff8804f96dddd036cac3722
+DIST python-swiftclient-3.4.0.tar.gz 175823 SHA256 54f7ae339bd076e295dd576ec98e55ba71205ee7e62964b27c8ec80c9351067d SHA512 c7def24f22ced03316ccb74fcd7426b071597a3c7576c14f98fd6d864d6ee3e8a7666966ca2d07b6d996546bfcc2497ab654a67ab0228705f078985a35b97457 WHIRLPOOL bd1bbb5aab8f55f6f3c9aaf0e992efc5f37f49798697f6cebdad1d1938f6522d1217a44833f1e02566691354d316ed65e3a49a8f0303d71c978a7b4449469e55
+EBUILD python-swiftclient-3.0.0.ebuild 1889 SHA256 35206e0490f840b4b6a8e0b6cb63f0416100090e7d726f582a2c0b266763f6fe SHA512 557e270ae06c4d0242c3242f94db262043c7b13ae0a824145a6f496496570ed0f7c5e87317c9484ab697e46ba2f54a082a982359ce16d5ef7d4f5d0d9b16ebf3 WHIRLPOOL 502cf6f8d0ebb3cbc6082c17b85684d605ef44d90329d64697a1db4c2f20e1de38ef148cfab9f7052511346e8fb6daaf777b3c6214f363eb9f312b6edc83bf8a
+EBUILD python-swiftclient-3.1.0.ebuild 1765 SHA256 8d1d7a112d4b069cb1e984f69e47b3910f4839de91326ee27cb7197502b08c12 SHA512 a191106f8358c92a20601d9bec8ffefb0f4743a66860f83fe6cf0cbcc4b6ab7e52a6c97faa7798c9882afea1cf96590bcae3be1210c166cdbeae2b5428a6b725 WHIRLPOOL 1025f0ce9308888d344307c234a33b297a8f973e1c51ef6684836b58eb18193273cf6c4b34a7f028dabcc1d4f3dce332dfbce1a3863699661d215ebce4a7717d
+EBUILD python-swiftclient-3.3.0.ebuild 1781 SHA256 9207af519cba5cf76c4a03e2c85f2fea097c32702f220d5ff262a0dc682911e6 SHA512 dcaac24333ef96ea4a9c4c680d6b8cf588ce8b42b5887ae69c15a08e48c66d5c806697365d7a43d81705bd48c959067387f68fc3eb5558b886c5eaed3c063b0d WHIRLPOOL 3cf2f1e6df16f1f419163a602207ff6189d79c6e8f43e836572a1c370996bdf55589b3dd12970c116f282a5c77c423d58083bcf451a602b221baf9d33906e5a5
+EBUILD python-swiftclient-3.4.0.ebuild 1781 SHA256 9207af519cba5cf76c4a03e2c85f2fea097c32702f220d5ff262a0dc682911e6 SHA512 dcaac24333ef96ea4a9c4c680d6b8cf588ce8b42b5887ae69c15a08e48c66d5c806697365d7a43d81705bd48c959067387f68fc3eb5558b886c5eaed3c063b0d WHIRLPOOL 3cf2f1e6df16f1f419163a602207ff6189d79c6e8f43e836572a1c370996bdf55589b3dd12970c116f282a5c77c423d58083bcf451a602b221baf9d33906e5a5
+MISC ChangeLog 3871 SHA256 d936cd67dac0d7ab3c28d8f0171a4a391c8dc99b2bfc51dcf40ea8a6ba73a021 SHA512 70aeb1de9458f4c53d7fb9df66face651f8fba734ab8ee8dc0f6227d97f238d5883be3d36ee115efb7d38eca2bd8bff2867f04c59b26af78ed9bdec167ebcaf2 WHIRLPOOL ed20d90ec7f9940cd82901ff607c85aac04cdbe620268100fd4d357a6f45b16094be9d81887607d05c28187bbedca276443d53ea312fd79f03ba188857ac2eab
+MISC ChangeLog-2015 3976 SHA256 43c4c45d8baf2a7e16894f3db23ff2bec2f226f2df0e72b7f1cb9c766f612c4e SHA512 e505b12711523c1d5cffaa0321f20473cb6ef65524c589d617cf06550ec5710afc7e103e9dd10218002d0c60efe7eaef7816f81275604a642e0d7deedc259f4f WHIRLPOOL abb949f78c09c2d6ed22a31fffe51ae09e8d362a0fe08d00e251f2cc90aba478c1c4913fd6bf3ebd4903b65d474d5567d15feeff74778a02ef1dd0ca140c1536
+MISC metadata.xml 597 SHA256 6cb401e2f9cc8d3512248d992a8b9ff3d44522452ec210f81bd4b5e5c25ce006 SHA512 fdcb820e96b82093910b251aff11fd5831253b86972435fe6456bdbfbeba4cc0c9d0dcfe10078103d5e7b7f29cb84e5f379293be94c30ea54fe4af741e097435 WHIRLPOOL 4b942b8c4ebbb251ed4d25050b4238cf308d4defe970590ee2edbc4623824132b3d70f1d7bb05f7e1aae6fc65adc7dac310cd74f042b0a28d51fc38b0f91799d
diff --git a/dev-python/python-swiftclient/metadata.xml b/dev-python/python-swiftclient/metadata.xml
new file mode 100644
index 000000000000..619f2612f74a
--- /dev/null
+++ b/dev-python/python-swiftclient/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+    Python bindings to the OpenStack Object Storage API
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">python-swiftclient</remote-id>
+    <remote-id type="launchpad">python-swiftclient</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-swiftclient/python-swiftclient-3.0.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-3.0.0.ebuild
new file mode 100644
index 000000000000..6aa5b9982a9d
--- /dev/null
+++ b/dev-python/python-swiftclient/python-swiftclient-3.0.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings to the OpenStack Object Storage API"
+HOMEPAGE="https://launchpad.net/python-swiftclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		dev-python/oslo-sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/oslo-sphinx[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)"
+RDEPEND="virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]"
+
+#PATCHES=( "${FILESDIR}/CVE-2013-6396.patch" )
+
+python_prepare() {
+	sed -i '/discover/d' "${S}/test-requirements.txt" || die "sed failed"
+	sed -i '/hacking/d' "${S}/test-requirements.txt" || die "sed failed"
+	distutils-r1_python_prepare
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	testr init
+	testr run || die "tests failed under python2_7"
+	flake8 tests && einfo "run of tests folder by flake8 passed"
+	flake8 bin/swift && einfo "run of ./bin/swift by flake8 passed"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( ../${P}-python2_7/doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-swiftclient/python-swiftclient-3.1.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-3.1.0.ebuild
new file mode 100644
index 000000000000..1f4546996a90
--- /dev/null
+++ b/dev-python/python-swiftclient/python-swiftclient-3.1.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings to the OpenStack Object Storage API"
+HOMEPAGE="https://launchpad.net/python-swiftclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		dev-python/oslo-sphinx[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/oslo-sphinx[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)"
+RDEPEND="virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]"
+
+#PATCHES=( "${FILESDIR}/CVE-2013-6396.patch" )
+
+python_prepare_all() {
+	sed -i '/hacking/d' "${S}/test-requirements.txt" || die "sed failed"
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	testr init
+	testr run || die "tests failed under python2_7"
+	flake8 tests && einfo "run of tests folder by flake8 passed"
+	flake8 bin/swift && einfo "run of ./bin/swift by flake8 passed"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( ../${P}-python2_7/doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-swiftclient/python-swiftclient-3.3.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-3.3.0.ebuild
new file mode 100644
index 000000000000..c4cb6240c2ce
--- /dev/null
+++ b/dev-python/python-swiftclient/python-swiftclient-3.3.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings to the OpenStack Object Storage API"
+HOMEPAGE="https://launchpad.net/python-swiftclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)"
+RDEPEND="virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]"
+
+#PATCHES=( "${FILESDIR}/CVE-2013-6396.patch" )
+
+python_prepare_all() {
+	sed -i '/hacking/d' "${S}/test-requirements.txt" || die "sed failed"
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	testr init
+	testr run || die "tests failed under python2_7"
+	flake8 tests && einfo "run of tests folder by flake8 passed"
+	flake8 bin/swift && einfo "run of ./bin/swift by flake8 passed"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( ../${P}-python2_7/doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-swiftclient/python-swiftclient-3.4.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-3.4.0.ebuild
new file mode 100644
index 000000000000..c4cb6240c2ce
--- /dev/null
+++ b/dev-python/python-swiftclient/python-swiftclient-3.4.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings to the OpenStack Object Storage API"
+HOMEPAGE="https://launchpad.net/python-swiftclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)"
+RDEPEND="virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]"
+
+#PATCHES=( "${FILESDIR}/CVE-2013-6396.patch" )
+
+python_prepare_all() {
+	sed -i '/hacking/d' "${S}/test-requirements.txt" || die "sed failed"
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	testr init
+	testr run || die "tests failed under python2_7"
+	flake8 tests && einfo "run of tests folder by flake8 passed"
+	flake8 bin/swift && einfo "run of ./bin/swift by flake8 passed"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( ../${P}-python2_7/doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-systemd/Manifest b/dev-python/python-systemd/Manifest
new file mode 100644
index 000000000000..6622807b672b
--- /dev/null
+++ b/dev-python/python-systemd/Manifest
@@ -0,0 +1,8 @@
+AUX 233-xfail-bind.patch 1077 SHA256 9a829cf2a2644b1d7cb8c175a6a30f9c8184666e298cb3c8a6bb6662de261725 SHA512 63a5325812bb3530a8681b006fc66630a33cc6740ed63171025d4406a68783a3fba0b55141fd9620f049f2225191ce9cffd3d91a9d1c5cef7af94ec82b2ebd6a WHIRLPOOL ad65b428d3de3acb10b5b2a9eba4e93081c95f5e2955b915eb160647ac9d2598b227944ec6096c7130d38d3227f9cdb6d1f4b377c3b542950699dafe4123a384
+DIST python-systemd-230.tar.gz 39329 SHA256 656a83ff695f5de7d63411a86ea38601ad5a918595eebd0817d7b8e68642c64d SHA512 3c26c59b9005a45c3aeea8a6838ece9b5aa27dd7394ebe75319c1536b52462a847f18a79fdc8cf3bf6df9a70af63c84d5ff66a9587519dd9a006cc3df4966ce8 WHIRLPOOL 0de7ff6919bdf1c6c9cdafd71944801396157281fae1583bb060da4cf800369f97bb0c9f484f81635ed8b2e170db2bbbecf59adac0470a910167333f93c607e6
+DIST python-systemd-233.tar.gz 49680 SHA256 efb5c440d7ca05ce1fce48c14508177c0002663ea933e16eaf88105f1ad8dfe7 SHA512 92a6cc7123db586e5ae5fbb56e5065b17be9da47ced9dbc5920d80b7db7f56d15b127e72d30889c5b24b119724a33f68be1ef322529620ed95b0f95707e4c2ab WHIRLPOOL a564098a7362fa48b50ac5a28111746d3a35a6602bf313d04f0e5c63078b8c0e2c84e7e648c572dd09ac13122a709bb4f6d9eb2548e08f75a367bd363a594fb1
+EBUILD python-systemd-230.ebuild 625 SHA256 96bfcd881c18e4e58ee8e4cf23fdea37bc19baf180ef2457ac347f8856e9d903 SHA512 70699e3758df3e05605b38012410af00885dd5c2d4e0bc406e8449d17770e74ef9e1f77e1accfa987253cfec624408c04cd7e128b67580a02ea0da19e73906f5 WHIRLPOOL 5914e41aa1964f6dc908743a069d4051ca97d8c4bd78f260b98c7c5e70d1aa026cb830723c65ded1f114adc1dc3a0b730a132ead5583ea931ffee158f4937068
+EBUILD python-systemd-233.ebuild 824 SHA256 b5d15549fd2066bc3e32eb96d97a6d18ec90ddc86826b0d7ea5f02c6670e232a SHA512 5db0b6d710e58a4729d5ffa4c3d1bb6af42f0efce58fceb871bc95cec2bf8e26ce7b406860bc145d782ae6c6fae10d0c6af3ccd4b35a148d6662466ce95e7784 WHIRLPOOL ad10be9af4042a7204a8d1da2a1749daf086b45200831463eb826ebc3134d2af7792c31f4f268859610711e2bb9c53843518c2086d6bfad312e6ab669239950c
+MISC ChangeLog 5132 SHA256 22354304eee6227f92a5c7a914f10eb93257fc4e0ab03230269e7c13e290b4b2 SHA512 001a1e8c26943650f393623a9b14d33b92c040256111a24c4ba3be06e35ba15655c5a937826df24d879332180237a168e29b6a7f6957aff9deec12204b777a8a WHIRLPOOL 8bcdca3d3736114d0edd5957523e81cd629e44c03d8a9650e880833acb9471b3fe6b9bf49833da82ace4be5fddf0bbcb4b4fee00184d9e95ae6318d9db540e98
+MISC ChangeLog-2015 543 SHA256 570be7466614d3cf54bc9380d46b8a8bc0d83847b7bd876b502f7152e4aa44ac SHA512 72246e55726c752864cac8a37de23aff67c3158c6ce8d7d9aead8d829aea97eeea013eee4475fd00b367974ce2278b91b6ff7968d908a2d005f468239df4959c WHIRLPOOL 6b25f1a474f78782b7b4c44288c0f188a4745ca0834fc6d56d3d1e4e67c6b0d14f51e0753e86e114fc19bec6a934e12757db7abfd8d74a6b56f577ef3c230885
+MISC metadata.xml 306 SHA256 cf7acf7bb77fa75b6716621d587ceba0864e083a6b96d6966236566e202e0cb1 SHA512 ca004982cde4fe1bcbd821109ec70f464a2014a2c0aa77f9976eedaec78ad68dc8d39e2e2f7023192bf807307e08259548f1ebb298ea7f3654c0b8658fba97f9 WHIRLPOOL a531166997ef2d4f0c576604a89032a74858e58617cca5e1b890c00f77d58bb9221853848d79860d050146e244a1b6180105484af999f46fcc1226c415e49c4d
diff --git a/dev-python/python-systemd/files/233-xfail-bind.patch b/dev-python/python-systemd/files/233-xfail-bind.patch
new file mode 100644
index 000000000000..bb0fb761bd59
--- /dev/null
+++ b/dev-python/python-systemd/files/233-xfail-bind.patch
@@ -0,0 +1,31 @@
+From 1c0d575f7c058f227d27b1cb92d3936d0c170a5f Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Tue, 21 Feb 2017 17:34:28 -0500
+Subject: [PATCH] test_daemon: xfail test_notify_with_socket if bind() fails
+
+This bind() call may fail if TMPDIR is too long.
+
+Bug: https://bugs.gentoo.org/610368
+---
+ systemd/test/test_daemon.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/systemd/test/test_daemon.py b/systemd/test/test_daemon.py
+index e827e1d..7733552 100644
+--- a/systemd/test/test_daemon.py
++++ b/systemd/test/test_daemon.py
+@@ -238,7 +238,10 @@ def test_notify_bad_socket():
+ def test_notify_with_socket(tmpdir):
+     path = tmpdir.join('socket').strpath
+     sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
+-    sock.bind(path)
++    try:
++        sock.bind(path)
++    except socket.error as e:
++        pytest.xfail('failed to bind socket (%s)' % e)
+     # SO_PASSCRED is not defined in python2.7
+     SO_PASSCRED = getattr(socket, 'SO_PASSCRED', 16)
+     sock.setsockopt(socket.SOL_SOCKET, SO_PASSCRED, 1)
+-- 
+2.11.1
+
diff --git a/dev-python/python-systemd/metadata.xml b/dev-python/python-systemd/metadata.xml
new file mode 100644
index 000000000000..8986208c5b02
--- /dev/null
+++ b/dev-python/python-systemd/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>systemd@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">systemd/python-systemd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-systemd/python-systemd-230.ebuild b/dev-python/python-systemd/python-systemd-230.ebuild
new file mode 100644
index 000000000000..c07c22224342
--- /dev/null
+++ b/dev-python/python-systemd/python-systemd-230.ebuild
@@ -0,0 +1,25 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for native access to the systemd facilities"
+HOMEPAGE="https://github.com/systemd/python-systemd"
+SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="sys-apps/systemd"
+RDEPEND="${DEPEND}
+	!sys-apps/systemd[python(-)]"
+
+src_compile() {
+	emake systemd/id128-constants.h
+	distutils-r1_src_compile
+}
diff --git a/dev-python/python-systemd/python-systemd-233.ebuild b/dev-python/python-systemd/python-systemd-233.ebuild
new file mode 100644
index 000000000000..080d0a4a9fe3
--- /dev/null
+++ b/dev-python/python-systemd/python-systemd-233.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for native access to the systemd facilities"
+HOMEPAGE="https://github.com/systemd/python-systemd"
+SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86"
+IUSE="test"
+
+COMMON_DEPEND="
+	sys-apps/systemd:0=
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!sys-apps/systemd[python(-)]
+"
+
+PATCHES=(
+	"${FILESDIR}"/233-xfail-bind.patch
+)
+
+python_test() {
+	pushd "${BUILD_DIR}/lib" > /dev/null || die
+	"${EPYTHON}" -m pytest -v . || die
+	popd > /dev/null || die
+}
diff --git a/dev-python/python-termstyle/Manifest b/dev-python/python-termstyle/Manifest
new file mode 100644
index 000000000000..b41f81d98666
--- /dev/null
+++ b/dev-python/python-termstyle/Manifest
@@ -0,0 +1,6 @@
+AUX tests-unicode.patch 212 SHA256 d652a2bccf4b69b6a04c5494f62dd06671f161188d46e311083dd016d97b2a9f SHA512 cdb60f341dd186febe72e09586a7b1d65087c0773b1192d9725188cfa4b9bae902026ec7bb723359863695e08992b2b5bae2a25d7aed0c2018dd22dadb8b850b WHIRLPOOL 34f7d386243f9fc5ce0e14dc1d191bf8de868c0a249d57997e13fb216350c302335b4dcab2ec364748af296d5f9b757ad1aadb40e4c1e1104f2dbce1b43eb79c
+DIST python-termstyle-0.1.10.tar.gz 5025 SHA256 b5af30d1d1b8853c779da97438f237d791d8bf37f577e9cf1c3927198c3c0ca9 SHA512 a0ed484da8da10c7fe1b8422a26861fb115dc29c49ce79c113053f913d3371edf6222de1ccf40e6aa34c3cfa9da5805eb3928fb07bfae18a13683621d7547743 WHIRLPOOL 485d80720c3382e61e46bb85349a7d6136363dab04e4ccf6a63a2ddccfcce29d8b4af0d13fd46de338f473232cfaf032b9ec6d8731d52a3af94e357de687c8f4
+EBUILD python-termstyle-0.1.10.ebuild 836 SHA256 4d068f10d75f922a40d223ee369ba9c99613679c326ae4d7e08af4b8f929053f SHA512 9f9366f1470adce600cc42d3045340e1d2aa99edc4ee79f991c03b374b7fde56ee0ebebe8e57e998bf15bb0969b16d50e1608e482ce84fa1ab29e78416016eae WHIRLPOOL 208c5b3156b69e55a8bf130b13bd3592230ce950180780231f6b52eb487edb00512348d781122b5e9cf4b33cf24e8c4efcf4ac355dc9dfee1db43a385a56538a
+MISC ChangeLog 2581 SHA256 21a044e782e8b059025eb45d794c77a86bd00f28e6923a2447da7cedd04201b4 SHA512 32432ec05219066fed32e2c70767f21fc5590e594380eefc8d0af34572c4406d46dd88e7f2f972e2f0c294bafd7f3089cc70c64e2717747213dfcea7cd42f590 WHIRLPOOL dacb88ff70f31f6e6ddcfbc01d9be28279bb6fa6ea3b3afa7091df692ca098acc1c35e10b1d43552f00a119cb6514917f424f79fef326e1bf5071c56892b1835
+MISC ChangeLog-2015 860 SHA256 a301aca10cf18bf0c4de7f8623ab721188288830c8233db675fd3334b682d2f2 SHA512 ad26069d29132bffb856a770641dadfc41b89b9dd199252d06d5046ca1103b4913e258047960729e65ab8afc6aff2ce542df8b017e2028d59220bd6bdc149786 WHIRLPOOL e8e7a70c77dc776ea9f8738f3e50ad658f03a6bedbf8249df2c6be0995ee91c9333d578ec58696d56ca53317cc44bbf7b2655cf0c6c188110d6b1e8a5d9f1800
+MISC metadata.xml 328 SHA256 3558ae757da069ac66e14cb43a75c798536580914ff1f3d4412b5943fdf0704b SHA512 56d5f1f0af83c0dd151edb1d0607316ce3ee416246d4d8faaffbabc842d9aaa4907bbf4de810ef81e42315183bc606223fe133da84c553419a86a80e07cae882 WHIRLPOOL 6438c1ce8570dcb0fd9fbd9893012f1d9fc6383d92c141fd78eba0a7a98b1bddf24c825c958661faa2f8220f203664fecb45f5e5f49459471aea6108e26e8526
diff --git a/dev-python/python-termstyle/files/tests-unicode.patch b/dev-python/python-termstyle/files/tests-unicode.patch
new file mode 100644
index 000000000000..4cb410fa1984
--- /dev/null
+++ b/dev-python/python-termstyle/files/tests-unicode.patch
@@ -0,0 +1,10 @@
+diff --git a/test2.py b/test2.py
+index 2d84c37..1331545 100755
+--- a/test2.py
++++ b/test2.py
+@@ -2,4 +2,4 @@
+ 
+ from termstyle import *
+ 
+-print green(u"unicod\xe9!")
++print green(u"unicod\xe9!".encode('utf-8'))
diff --git a/dev-python/python-termstyle/metadata.xml b/dev-python/python-termstyle/metadata.xml
new file mode 100644
index 000000000000..92c4a9f7fdc3
--- /dev/null
+++ b/dev-python/python-termstyle/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">gfxmonk/termstyle</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild b/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild
new file mode 100644
index 000000000000..63bbddb076da
--- /dev/null
+++ b/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild
@@ -0,0 +1,36 @@
+# 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 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="console colouring for python"
+HOMEPAGE="http://gfxmonk.net/dist/0install/python-termstyle.xml"
+SRC_URI="https://github.com/gfxmonk/${PN#*-}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/tests-unicode.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	if [[ "${EPYTHON}" = "python2.7" ]]; then
+		"${PYTHON}" test2.py || die "test2.py failed under ${EPYTHON}"
+	else
+		"${PYTHON}" test3.py || die "test3.py failed under ${EPYTHON}"
+	fi
+}
diff --git a/dev-python/python-troveclient/Manifest b/dev-python/python-troveclient/Manifest
new file mode 100644
index 000000000000..9f416d0e1551
--- /dev/null
+++ b/dev-python/python-troveclient/Manifest
@@ -0,0 +1,7 @@
+DIST python-troveclient-1.3.0.tar.gz 130542 SHA256 abb0a5bf2442bd396322c65ea7b386d043e3fcffdaeed6a61d63d8be1a8452f2 SHA512 aa26b587d8e2bd15bb65ff760b89354638f6a77a4e73ec5f37ab6dc3c374d6b8c238391c09347e7fc897138fc0bdc375f69ab479f57e14f21d0882b74cc7c978 WHIRLPOOL 02490089bfea489b51e07f4da5b3ea5bbe2e839c2751c5e98ae384195465fca861a7d156e5ea179a6879d3b44c318e30f560314619705a3d8a3ac7b0f0606752
+DIST python-troveclient-2.5.0.tar.gz 149926 SHA256 03fc7cf8d47f910bc64274f7c24808b6ef79a9a1f34be5b94bea7070c9e00e5b SHA512 83e7cafec8ce4d65a55d8854bc2e2fbc657d567e4dc2b42a64c527c656ba5f253839511582c5ca2dda970bebb4555390b895a882b87a2eacb86ccbfac9c09a97 WHIRLPOOL d0a8057b54725cf102743e6f6cedc39be59bab003c5fa83c0c1244b3f30fc59b02fa96d374393116350e9ad5817067b199f59d950fe2546c98423ece5256d216
+EBUILD python-troveclient-1.3.0.ebuild 1805 SHA256 20ca32c39e065402339d02eb7628f355d15bd42ad099e76bc760384c0876e49f SHA512 5eea913f18f42f64b59a9e545614e5618470742a598399a510b44fdfcad8d5b8e836878f9d6926121927a7285ad7472be1bc74707b2f1ca5514d600e19f434ee WHIRLPOOL bd2f49647489155bb669425bf63b15a064196a6f377da523d63fe8fa6b2ffb377f058df93729615be582943447e171f675d76a82dda9aec95c5c7beb7c25063d
+EBUILD python-troveclient-2.5.0.ebuild 2087 SHA256 c5ad2126facff0e206d9b925b20d1b5fb3e33c65f9d328dd8fd3131723311b43 SHA512 ef062e1a75d8afdf9cdb90d440ee60c61db7a0d8ef866cbde24ab7bc66b88a838f72d4722a709100c2349cef35645f49027a6ce2618d4f797b8acf2c666140ad WHIRLPOOL 9d745d30d43e97284d646da5dd70f2925e5553ed76d09b0be94dce80a789aea64113782059c5530ae02337c09a38235f61be3a688f7203995ec8d5c4453b09c9
+MISC ChangeLog 3461 SHA256 435d3889d2cb3288688d6f860d16c51160b1db7de1cd91e06ab25d64c933d4a3 SHA512 95e378635e5257a54a2741dd47d44dd06c8a382b67622c97b85ac54124a0bd12ab3ee756810c9423bf99a9991e16de2870642991a8527e42937ecd4f0850e40a WHIRLPOOL 84640306a528cdd72324e218e15a5205a243b3ec7cb3a9b36b8a1da4c1c87767ecb8aff6a9c97a6cd1c5a372c839eb2726b75728e4ba329a4788aeb396d501f6
+MISC ChangeLog-2015 1894 SHA256 d317e6062a988af4f8d2c5ab8bad6a8844192d2f2cc5e0331db98f35649b1bc1 SHA512 b84954bab5bb15642603f9a8e97fab244c7d2972b0048682ab95fa2e8f5d5e7927af02b8a5ddadd56346a693c8b9ad7c2b5e46262d10888e35ab13f41e5dd0a4 WHIRLPOOL 26b7ade16b08782707bcd7ffef8c4c688be32a6427a21dc2360a97111f67679af18bff8f503fecf06b013805df9c1ea19ee7eba6ec4f125594b5860dc9c84dcf
+MISC metadata.xml 669 SHA256 608abc59bfa42b4bb03e8e837f9b7226a1170f45525342e127b9fc4973df078c SHA512 ca61691e9d8d0f274e7d187ef24d080059f79f6fab866ded771a08740f15559456a50a5dd97ec2eb73dffec1324097331f4c4185bdd62a6dfbed37b75da2f426 WHIRLPOOL 591cfe47f3906b8a7db4437c2168e6abe8a72fa5912e3ddf6782932dcd6ea21fa878668f0e04a23ef65ac0bcef9588d1210582363a4b6ffb35b4634234d639ac
diff --git a/dev-python/python-troveclient/metadata.xml b/dev-python/python-troveclient/metadata.xml
new file mode 100644
index 000000000000..fb83e0b86415
--- /dev/null
+++ b/dev-python/python-troveclient/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+    This is a client for the OpenStack Trove API, a scalable relational database service.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">python-troveclient</remote-id>
+    <remote-id type="github">openstack/python-troveclient</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-troveclient/python-troveclient-1.3.0.ebuild b/dev-python/python-troveclient/python-troveclient-1.3.0.ebuild
new file mode 100644
index 000000000000..b32de22d9688
--- /dev/null
+++ b/dev-python/python-troveclient/python-troveclient-1.3.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Trove API, a scalable relational database service"
+HOMEPAGE="https://github.com/openstack/python-troveclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^argparse/d' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "testsuite failed under python2.7"
+}
diff --git a/dev-python/python-troveclient/python-troveclient-2.5.0.ebuild b/dev-python/python-troveclient/python-troveclient-2.5.0.ebuild
new file mode 100644
index 000000000000..ed2afc07663e
--- /dev/null
+++ b/dev-python/python-troveclient/python-troveclient-2.5.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Trove API, a scalable relational database service"
+HOMEPAGE="https://github.com/openstack/python-troveclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-mistralclient-2.0.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "testsuite failed under python2.7"
+}
diff --git a/dev-python/python-tvrage/Manifest b/dev-python/python-tvrage/Manifest
new file mode 100644
index 000000000000..69aa46b034af
--- /dev/null
+++ b/dev-python/python-tvrage/Manifest
@@ -0,0 +1,5 @@
+DIST python-tvrage-0.4.1.tar.gz 10646 SHA256 f8a530376c5cf1bc573d1945a8504c3394b228c731a3eff5100c705997a72063 SHA512 cabee676e85206b8c052b79b0f5fd039719ede104607795fe8d1947f2fd810fd9fd08ba8c6e94d1fa68dd5e51060e10fb9c12349f21b752242f7eae2b4771009 WHIRLPOOL a410f1c0cf9b47e5884fcd254b7837fe72cd733460fa05253ca38782b0b3d16666b60fba765bcbf93c3c6d512cfa97f75117aa484770566b0dd84fb3c7ebe368
+EBUILD python-tvrage-0.4.1.ebuild 574 SHA256 ee96ca3ef22fec44bb791eb97470c6529a067801e2b2ffd25ff308291008e89c SHA512 2acd183d6eaccf92caa0486219a6f075ea29b1512d9cd5fe7f90d6b5ceb270f1d6212c12bf38eb6389c7a2418bdaf634900439245275e725c942b2c9d31e48d8 WHIRLPOOL 8ae9942cb391794cd8c4a0effe316da6a5cbda12d75ad7d0082f2f18ffb7cd4fd1ea225b979800f9ef6a1ac79df8a99309370fee02003d839f698dd85cfa7a09
+MISC ChangeLog 2447 SHA256 7c5a193eb3b9dc5bfd3b3dc39ae93d1ca7019c08005773df0f84392d4779cbab SHA512 a5b989510a32922e99db96ccfe0b4c0319f9208238c145d1e3bd9b51bed1d3bc548f11568e0f01ec289b692f3f97b3e63b1dbc1e1bf99b525126bf15819c204c WHIRLPOOL 089003e0aea368b0876729e6001c224deb4d3ecb0c9b13ca863a8a67a6f62c37aa196a817f13f0d915aec734ff11db65bdd03fa6aa33ff4eb0f67372c7f5f3d0
+MISC ChangeLog-2015 864 SHA256 f881fd12d23cb1fd3af35f2e7e26628e8137a50a43c045e5b1bcaf38c947dba7 SHA512 db667372eb7b24aecc07e8ab192268faa673cc0807ab260487fb62872325a21ce33b614120b8619dc5a3c277885e0f334b3c4d4fb9a15e5e0c00d1afe861dba3 WHIRLPOOL 922dffbd556819fa11570aa661fed91a6df59d4c2a73904a7d855e439c459945db7a8259592cb2e5e1f6116d4b546d528caf7921c9565fdcdaf6b0f4a407a59d
+MISC metadata.xml 391 SHA256 e36043803c692cc13ab62f7de31cfe23dc26aacc0256c4381ac0cc4f9adcb175 SHA512 1cae776c246c2337ef4f117db05bc36b5ec362be64a43e1ba1046c0d94d8da7962d58ba5c72ae376774376638cd1fef1a18eba2fdb77b298ef4c64622f605e33 WHIRLPOOL 20c290bfb3d05152dab339297db63e4606339bf5230b8929f618f302383235a574ff794e647e9f66d61a5a5f467770a257705026ebb9714c8906b93f9bafe4fd
diff --git a/dev-python/python-tvrage/metadata.xml b/dev-python/python-tvrage/metadata.xml
new file mode 100644
index 000000000000..9f173cf4616f
--- /dev/null
+++ b/dev-python/python-tvrage/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">python-tvrage</remote-id>
+    <remote-id type="github">ckreutzer/python-tvrage</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-tvrage/python-tvrage-0.4.1.ebuild b/dev-python/python-tvrage/python-tvrage-0.4.1.ebuild
new file mode 100644
index 000000000000..90e3d7bb6bea
--- /dev/null
+++ b/dev-python/python-tvrage/python-tvrage-0.4.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python client for the tvrage.com XML API"
+HOMEPAGE="https://github.com/ckreutzer/python-tvrage"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	"${PYTHON}" tests/api_tests.py || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-twitter/Manifest b/dev-python/python-twitter/Manifest
new file mode 100644
index 000000000000..9a86fe3d531c
--- /dev/null
+++ b/dev-python/python-twitter/Manifest
@@ -0,0 +1,5 @@
+DIST python-twitter-3.3.tar.gz 84696 SHA256 a9f2bd038a05ba384fa03e39949d1445349771ce7897aeb3c6d8774beba08185 SHA512 72e4133abddf86a19b8701f846df7eb99b426b8835e457455935a656f38c266fb2930d8a145d5d280ef2e0f0096511b29dcdf98b94bd53b6a661ea575cfb3265 WHIRLPOOL 49e8e217107b855beae8b62a72cc67f687e8bf0f3b5f782f891c8c162b165c32fcff158306d038805bd3e3b9c18b1353d48395983b0a57efec5494b2487410e6
+EBUILD python-twitter-3.3.ebuild 885 SHA256 18c0c3d00f56a0890b7b87206f8911e1ec67ee699ba13ec9f473c4a5cc77388b SHA512 b38c9d8a3eb38204de4bc968f7a0fb347b4df22a4a06fc2eb437dc3930a52932b2c2afbb75664764a30bc0e3f4f5c497597add698c9de5727b845336df0684af WHIRLPOOL 27b8bdf9b0acd799efddedfc4bdc4af912b18dcc96a0f8d865d9da7acd73d314c1b46c2bc8a2969a7f1ddf7cf9196ea31a5d2d3f5d8d4fa010761d087685712b
+MISC ChangeLog 3250 SHA256 99fe3f04a4e4bc7bd370e9e2fa4df7a90f6dbc7e3e4ba0c73984441caaec9694 SHA512 0d2d0e0314d33b9d712148b00c63d761ed043b4fe55b897857ca09c1496ef5822dbab8b3164ffe9a663306237b81e2b1f935a610f7816c50a993a36d80bebc18 WHIRLPOOL 79fa216a202450597aff388e213116674a24038aa4ce4f04cbef6588e74d41578b1185857e9769e416b5158bb012b1e04aee52ce5a398de20adc8981f67b6799
+MISC ChangeLog-2015 3247 SHA256 621dc80e8a9fe151cbc13f805c051944eaabf50379ed0d5bb70704fa57d6d49c SHA512 550bead329c62c650df02d3a7844adab42680f9c6f0064bc5c9ee6976e47671231bf05b095b3b9f8f8d602b4beaf87ca8a634c918239e5ed48febdbad956350d WHIRLPOOL 1705ec623633a7b79bc1e398db8bf45dcb69e2184e13db4bdfc0786616cda3de75871e830f31e940659d992d4ad65919dae2bca41cb9420b44bb9122b3cea2e1
+MISC metadata.xml 376 SHA256 8d1b4468a80166b54b867ff2d16b560efb17442f12d882d31bde3eb6c94e4e23 SHA512 dac7280dbc8cb31ae961fae685c4bd42cefb2a2615ad42be033733b67c906597311ba1ef1f3ca4120e2789f28486500130000c3cbce1dfb19a625e3cace60e76 WHIRLPOOL 9720e367511dc68e9316f2d2501bce493f3f1e9e954180634503a0e780f8d605fcdd46d25f0ab8466c0f61ac964e49eeff209ca3de73e7bbb2962fc5e936d03a
diff --git a/dev-python/python-twitter/metadata.xml b/dev-python/python-twitter/metadata.xml
new file mode 100644
index 000000000000..3539c025b1c3
--- /dev/null
+++ b/dev-python/python-twitter/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">bear/python-twitter</remote-id>
+		<remote-id type="pypi">python-twitter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-twitter/python-twitter-3.3.ebuild b/dev-python/python-twitter/python-twitter-3.3.ebuild
new file mode 100644
index 000000000000..4e2bcb224be5
--- /dev/null
+++ b/dev-python/python-twitter/python-twitter-3.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper around the Twitter API"
+HOMEPAGE="https://github.com/bear/python-twitter"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-macos"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/oauth2[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-oauthlib[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Testsuite is still not convincing in its completeness
+RESTRICT="test"
+
+src_prepare() {
+	distutils-r1_src_prepare
+}
+
+# https://code.google.com/p/python-twitter/issues/detail?id=259&thanks=259&ts=1400334214
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-uinput/Manifest b/dev-python/python-uinput/Manifest
new file mode 100644
index 000000000000..36f0ee6f1241
--- /dev/null
+++ b/dev-python/python-uinput/Manifest
@@ -0,0 +1,5 @@
+DIST python-uinput-0.10.2.tar.gz 21736 SHA256 913ca8e37dd9e9948d2e81803791ff8b90837230eae3b8563c9d7390bc6315dc SHA512 0009e3c3f82c5a5da61e9adf17d77a2efb9223f02324a4f7c7033b165d5e4e395566c34ccb11ef54cc4ce1623b1432a144614cbae7a88e9c06824b15ef00e1b7 WHIRLPOOL f850346138e59dcbda897e49efbabc77d60ef174fb24e1e62007d47afcb3b0d8a14023255fc74326843f08b2afdce8dd259e44318b73aa194c3a859d78753c65
+EBUILD python-uinput-0.10.2.ebuild 525 SHA256 eabfc737c98415beffb0f30c8f33d94694424c0f82adf7554251203f0db95c01 SHA512 f454fa99b1a19c3c9e424cb4b5284c81087ddf5cd9e9515162dba71e38a5d955a10964554ccce85eccc95fd6663b0b122fc65b323430f0baf2d41289490985bd WHIRLPOOL 6303dea63873a73f17daf5d1fccfb8d2c9a0669a36b707754a2a3699a8cda89c68bceac69f2cf21409a790039488c126fc7ff85cc513d6254ed987864bd5ff8c
+MISC ChangeLog 2577 SHA256 7c5c811f3f6fae06fe1edbdbbc0cc91ebde11834568323622babbae87b0ffb36 SHA512 bffaa87f1213f78e768cd679622e31bffa8e214fbc793c8a36aa6520daec0243e93daac2b994d0c3c05433457e070029237c11b5cbe380c9f65596a83c34d6a4 WHIRLPOOL d348b0fc064f9c4ef7ec78914c98783cd334cd9b3359a1a09d7b2ae6dffe883c28541e525cd10cfe4b083560be00e242b48b787c2fcfca6e9f3d5a722605497e
+MISC ChangeLog-2015 1012 SHA256 d0e52e307a26ca7ef6be00691c4cdf0fb32ff4994e3dc13e62532124cb53260a SHA512 d606342a9fa65a6ff35e639af7d300ecdfaeb3cd1963007c64195dd004e39258e2092747bd695ee1f3ac9f529841ec587772068f0081865504a45bea82011fc9 WHIRLPOOL 89b8f9cb0a50d7c9da2c2c727f4bbbf8baaaf6a31f61845e4513198d6cec1e304c5dd44181574b557e65614dc80b499c7e5e1324eab3d1e62d99e30693e4c592
+MISC metadata.xml 326 SHA256 25566860c0bf373dcbe74cf6657f1981ba81e20a79dacbc9c608f3a9ec1681c6 SHA512 f6fbc6b93ca26169abdcbe1ec78a7e216a90ab9aeee1f0195123e4afb74590216ad4179fe22503ee2b0999cdd394287b5908c094453b79b4d1bef3ccc20a8a12 WHIRLPOOL 7a21be9f41e933f295e73fee8970c9fea9cd4f2f0729fe49b6a0395091e8df18f8cd59200726c5711cf9e5f2d974d61cd8e4ac5f1be4c265725b1d48de919420
diff --git a/dev-python/python-uinput/metadata.xml b/dev-python/python-uinput/metadata.xml
new file mode 100644
index 000000000000..a10aca152207
--- /dev/null
+++ b/dev-python/python-uinput/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">python-uinput</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-uinput/python-uinput-0.10.2.ebuild b/dev-python/python-uinput/python-uinput-0.10.2.ebuild
new file mode 100644
index 000000000000..81d147a11552
--- /dev/null
+++ b/dev-python/python-uinput/python-uinput-0.10.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+inherit distutils-r1
+
+DESCRIPTION="Pythonic API to the Linux uinput kernel module"
+HOMEPAGE="http://tjjr.fi/sw/python-uinput/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="virtual/udev"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	rm libsuinput/src/libudev.h || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-urljr/Manifest b/dev-python/python-urljr/Manifest
new file mode 100644
index 000000000000..ec7ecdcd245d
--- /dev/null
+++ b/dev-python/python-urljr/Manifest
@@ -0,0 +1,6 @@
+AUX python-urljr-1.0.1-gentoo-test_fetchers.patch 540 SHA256 e5abd501e27df586d736a477ee064e4a5807f61032e105e6e18bc3b88522861d SHA512 bb07e8adabdc9d03265d2f651c5c02d62227dddd85905daacc9986f119a7ea7db2743242d79df8cfc35f44ab1f90cbe9199c6457b110d97a8861d84aa92e5365 WHIRLPOOL 92cc9c2bd1d59d8e772009ab99a1dac2552b9814ed123c0e000414d5c29834c940efe06b402932bea8ebea664c3cf4d6112c27b97a7cd96c8be37b37f7229ca5
+DIST python-urljr-1.0.1.tar.gz 16570 SHA256 723bc0c1b58d34ca41b9d3ec57ba5e9cb16283e49d8ac152d455476cc249bff6 SHA512 fff9e5f557ff8fa88e122f535134320043f9a14fd8048234bef762af666f4c088d50c6bc8dd3d173154e80eb8e076f0fb6749e39dd9c6f88c7ab763314dad0ad WHIRLPOOL 5919e01df94373ad98b3fa2622ddf45b9f7abeadbc8b8ace0dc4f8b38ef5be85b43c696cf349f815f6273811bb65940b339667aefcccba8ae9aff5364afb2a20
+EBUILD python-urljr-1.0.1-r1.ebuild 730 SHA256 beeee381e4fbf04e4e6e469bd7b56b7512d4ac2006cf12910a8937b54492c20f SHA512 92643bf7047829ab154be59973ad41fbab0fc82b76b10fd122d402d59d3cb9c7e34527783a3856975fa577c23a0e7c1fca69ba1a5fdfb4f7854d34040cdf4491 WHIRLPOOL 170487c78b07f227ab81f4b38dc5012ba05326dd14bfa5fcab268ac35ab393be869409d8637eeb85649462a433f680d148884cd7be66545ddd0f50b4377d3f84
+MISC ChangeLog 2506 SHA256 863f4abaf7bf42fb59354766669ed5672d2a7820d95654d4ce8da3b954d94826 SHA512 299db99a4a7202b0a48bf3b6319716f6b3873b3c593db2b6aef198822d0a3ea48f1ddae28b9746c99a62cc3ecab07253758fc53a28caee6084c2d7d5d6cfc7e1 WHIRLPOOL 5796f3bbf4952d963a3882d294e8f02e891af2fbd212d033832a21295049c15f55138431a9b2220bdadc113b7068ef0d9b7c3bd57ecd1f54e78e677c809f09ee
+MISC ChangeLog-2015 850 SHA256 a7d5aca8083438fabef680bbcabea86635c23a5e20c66f32be780af9dc7fc0cc SHA512 a8bfac881a960b5d3beff3bb29aa855c5bad30cb43dd08e091d408080f1907a0f0b51abfb76f987690ff5448be0b0437bc71a1419149d7132e754a9863e76ddc WHIRLPOOL 64954b9d7ae23653ac8a0828814b5ac733448386af29fab7e0616fcaded5e13418fd3aafb0815e717f4907778a45c63cfbef7f77b9f27ae8d2deb62358e9f29c
+MISC metadata.xml 300 SHA256 fdef4b82bf250b7ec5c4b2a50cae3cee1aa4a0a020b490440aa63dfcc345ba25 SHA512 6968c0889e20fc4e26fc8626d9dcc25a97e6c755b323c181291bafcb5186e519f48e52664e01b4e14cc49561af1fff365f90bcada9c876ae65487ce81639fc76 WHIRLPOOL 6949403b0c80400be05b15a43bcf97280b4c8d77393e3d118ba1d66472250b65b7a3c6df426dfc62a7f22b8f0fcf72661e81956af9ec490c7d9f66b850a89377
diff --git a/dev-python/python-urljr/files/python-urljr-1.0.1-gentoo-test_fetchers.patch b/dev-python/python-urljr/files/python-urljr-1.0.1-gentoo-test_fetchers.patch
new file mode 100644
index 000000000000..5a451e4a5600
--- /dev/null
+++ b/dev-python/python-urljr/files/python-urljr-1.0.1-gentoo-test_fetchers.patch
@@ -0,0 +1,11 @@
+--- urljr/test/test_fetchers.py.orig	2007-05-31 09:16:31.000000000 -0700
++++ urljr/test/test_fetchers.py	2007-05-31 09:17:47.000000000 -0700
+@@ -8,6 +8,8 @@
+ # XXX: make these separate test cases
+ 
+ def failUnlessResponseExpected(expected, actual):
++    expected.final_url = expected.final_url.replace("localhost", "127.0.0.1")
++    actual.final_url = actual.final_url.replace("localhost", "127.0.0.1")
+     assert expected.final_url == actual.final_url
+     assert expected.status == actual.status
+     assert expected.body == actual.body
diff --git a/dev-python/python-urljr/metadata.xml b/dev-python/python-urljr/metadata.xml
new file mode 100644
index 000000000000..7dddf61089b2
--- /dev/null
+++ b/dev-python/python-urljr/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>JanRain's URL Utilities</longdescription>
+</pkgmetadata>
diff --git a/dev-python/python-urljr/python-urljr-1.0.1-r1.ebuild b/dev-python/python-urljr/python-urljr-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..65ba00ef80e3
--- /dev/null
+++ b/dev-python/python-urljr/python-urljr-1.0.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="JanRain's URL Utilities"
+HOMEPAGE="http://www.openidenabled.com/openid/libraries/python/"
+SRC_URI="http://www.openidenabled.com/resources/downloads/python-openid/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl test"
+
+RDEPEND="curl? ( >=dev-python/pycurl-7.15.1[${PYTHON_USEDEP}] )"
+DEPEND=""
+
+REQUIRED_USE="test? ( curl )"
+# test fails if it finds 'localhost' instead of '127.0.0.1'
+PATCHES=( "${FILESDIR}/${P}-gentoo-test_fetchers.patch" )
+
+python_test() {
+	PYTHONPATH=. "${PYTHON}" admin/runtests || die "tests failed"
+}
diff --git a/dev-python/python-virtkey/Manifest b/dev-python/python-virtkey/Manifest
new file mode 100644
index 000000000000..a6eaca812e47
--- /dev/null
+++ b/dev-python/python-virtkey/Manifest
@@ -0,0 +1,5 @@
+DIST python-virtkey-0.60.0.tar.gz 40328 SHA256 f8de93ded985454484e6d2e52ce86b4c7aae65bc3cd97fc8aa7259def2a091a1 SHA512 96e48fd5ab861d5bccc40dfed1b71c7ea5ce01aeafaa5b1a58ba7a0250dfe191eab35ef0a95f247e64ea49213a20cc596bbfd64e091fd4624daae38edba2840b WHIRLPOOL 2d61955c3e8e8a256f6ca142e4314597de4a324eff46d0f783340fd6123af5bb16b1383ffa421999a89a68f1a9979b801870b81d31f9bbc6fc20d5fd3b8e4f33
+EBUILD python-virtkey-0.60.0-r1.ebuild 725 SHA256 2413a6cd6ca2b224d3953827bd2379a486d493636543a0037d51406832516204 SHA512 9f60ea375a89219dc6e8af33d1912eda7162d58efa46d787536f05b4b26c6f2e4d9f21e1732c61ac1359fadcf91aa6c978ae26bb5e4a051a8aee0c04db5d3a95 WHIRLPOOL 582c321f573aa260dbc03d43e5ef6a29244ed4dc2a0fd932d80b7a62ffbf9b77d34cd63f52f009d83f899b613c1aa6e92d15e273a77abff3d5c407701fe6dcad
+MISC ChangeLog 2989 SHA256 50a0a227c60a8a2f89cc9d89408f58efd3a4774a572cfed4b86360558f641f04 SHA512 530599eb7d8706229d3bc613e148c9934d916bbcb8a1fa0c55040011d6b8310f444f477ed160807f16cc58fbc910fba4f74307f4ec113265f506cc07afd8f428 WHIRLPOOL 3cddf4c0ee31f523876c47a732e7a52577a9526e161a481b067e249c5a2e19bdf37fae7c5b1487f240f6a67707763c4f4d875d9d6ed6d87f231a89d5a995232f
+MISC ChangeLog-2015 2183 SHA256 1b8c7887e917030710a482ac34ad3bcd6def41b983b9bac2a2d9090dd0ce8f99 SHA512 0cabc80dc7f789ce7cf585b52262687180e549540c3dda0e40d7552d29d18e5c932411d62ef5308141aa15d32d217cbff00fd27c780ed473dbc95a76bbcfbe5a WHIRLPOOL 034b0024a4d316f8ccbb2eb37a101b239c3c9d8dd353cd1f07bd0c12201fe2cdb7089fc981a3746d7877758826b879d3527d9a237d1e800c66068aed42154ff4
+MISC metadata.xml 249 SHA256 b7eab8f0da6d363728553813879debc2da148fa2529a53c3f713a2915a3c7950 SHA512 d96c9862d2288c9a38cebbc52ea7880b9593f020c105f969ac900d33a5549131a4f3735f55c82346cbba974f4de696142c58d541fad5d86d7bf76343f47b1df8 WHIRLPOOL 0ae026deb2a648ebc8fc244af5191250aa200c5f8ca66a9349995cd663c99691091c9f29d2e841f88b2fac925108b3bb54c0b56aa385eb3dd188142ce3ba8761
diff --git a/dev-python/python-virtkey/metadata.xml b/dev-python/python-virtkey/metadata.xml
new file mode 100644
index 000000000000..2acdbda35fba
--- /dev/null
+++ b/dev-python/python-virtkey/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-needed -->
+	<upstream>
+		<remote-id type="launchpad">python-virtkey</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-virtkey/python-virtkey-0.60.0-r1.ebuild b/dev-python/python-virtkey/python-virtkey-0.60.0-r1.ebuild
new file mode 100644
index 000000000000..b1a384ee576f
--- /dev/null
+++ b/dev-python/python-virtkey/python-virtkey-0.60.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 flag-o-matic versionator
+
+DESCRIPTION="Python module to simulate keypresses and get current keyboard layout"
+HOMEPAGE="https://launchpad.net/virtkey"
+SRC_URI="https://launchpad.net/python-virtkey/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2[${PYTHON_USEDEP}]
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	append-cflags -fno-strict-aliasing
+	python-single-r1_pkg_setup
+}
diff --git a/dev-python/python-wpactrl/Manifest b/dev-python/python-wpactrl/Manifest
new file mode 100644
index 000000000000..2c44e9de80f1
--- /dev/null
+++ b/dev-python/python-wpactrl/Manifest
@@ -0,0 +1,5 @@
+DIST python-wpactrl-20081102.tar.bz2 16947 SHA256 1e04b5c531e4922f48023e5e09a43b4cb51a53fa483ad0330dbd8db774644b13 SHA512 ddb059b846af21bacd9b6bfe0b5df3661a0d29dd5f56c2343eb24c462eed4771584d7b06a239e484bb89e69376d4e5784d79628cf962a063e640e62cb3b7f588 WHIRLPOOL 89a466f3ede8d8ebc2ac16cbc849d84c1c53c8c73ae03321a85324cb3a9074a5c9c8c72ea3879cff4178f01fbac8a6b8a448387c4d1b12700d0389a953e281d1
+EBUILD python-wpactrl-20081102-r1.ebuild 446 SHA256 a677e32635909be33755c02c89c421cbeee9494dd04facfafda76826c4a5dda2 SHA512 8cc1e64a23c87ea07b31dd60ea10a32f47e92ab4eff8a6d2e20fbd532983cbc68c3601baba1c561b49defa191d5f074b62a8f422eb3ed786d1c459565e995dbe WHIRLPOOL 058884479ae5f88aac605eb7bd495b58c458e68740a69be84cedea88b8de959121f9922dc564d1edb90d81dd8fa2345f120393a34c63b32ca85f8e42d52fb0be
+MISC ChangeLog 2462 SHA256 c15d8b4e843efcf3b189b96e89c3234f5a6118edcc7b3ca5e5783c5873c385a6 SHA512 507398db4759d58c64d7d678549f4b2a4b2329b736fa561984bcdcd573ec52606c531b0d046c04313cff3b6d31ef7679235f1f01ebd96182d11f07caa53a3b7d WHIRLPOOL 16e11c4bca60037f4c470c9f8048706f0d42ae975ad746e3307c043b25af736a413e191b3921da9923a1d8c89039859c1975d24d69c56afab2750408a2294fc6
+MISC ChangeLog-2015 2727 SHA256 97cb944d86f520e95b3170a2ac118758afbd0e813bd99580fd2564e9fe797f63 SHA512 f7a77aced3fc9fd313d40c4e7f016927f8c0601dcc6f5fc80a9ec96cd6ea94ee990d5b1ac988a68599b3d30005b3b39c63de6122dcaa516c90be3c5bea7da3cd WHIRLPOOL c7e6f4f02e10965c9bb34899d1dbfdecf7e8a05207fb58cd52d693f5fc0a282235706b30f9f992feb74cf2632947893a67f1bdf822030a965558b11b1993a3cc
+MISC metadata.xml 238 SHA256 9e09d4dcb7278b727b88408a0535430d9894ad05d2596b5031e0e00842566219 SHA512 47119affb0bb88a6fef7b2121569fa43cc30157b6aa8d1edb7374367a11ea9d422497da9bbc0bb7106b4124c90e3c980ced5ae202d96a48526ecaf875975db6a WHIRLPOOL 9339618d7e20d7f9a6c320505b60efa401dafe71138c1915a51ae0b2d05a9caac7c21c2cee12a73ddf5fee41ac7afbcd60f3eac3fd41a397b2b47e9b94fb8496
diff --git a/dev-python/python-wpactrl/metadata.xml b/dev-python/python-wpactrl/metadata.xml
new file mode 100644
index 000000000000..a5c911a491f5
--- /dev/null
+++ b/dev-python/python-wpactrl/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="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-wpactrl/python-wpactrl-20081102-r1.ebuild b/dev-python/python-wpactrl/python-wpactrl-20081102-r1.ebuild
new file mode 100644
index 000000000000..3f3978751861
--- /dev/null
+++ b/dev-python/python-wpactrl/python-wpactrl-20081102-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python extension for wpa_supplicant/hostapd control interface access"
+HOMEPAGE="http://projects.otaku42.de/wiki/PythonWpaCtrl"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 BSD )"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/python-xcaplib/Manifest b/dev-python/python-xcaplib/Manifest
new file mode 100644
index 000000000000..f39b979f8552
--- /dev/null
+++ b/dev-python/python-xcaplib/Manifest
@@ -0,0 +1,4 @@
+DIST python-xcaplib-1.1.0.tar.gz 22892 SHA256 2f8ea6fe7d005104ef1d854aa87bd8ee85ca242a70cde42f409f8e5557f864b3 SHA512 140a12e39decdd15c06816cf5969baaf82437f010592ee2f4b7309db585aaa6611ab3af50e399bb18d216ae1586b5ebf18490d74c385a99d6673171bcf437395 WHIRLPOOL 711eb094be643613a117044d2c3ea054bf728ff21a1efe668d27bebe912c67463cb15b8e0c052699f01439a6631c2570ba1e79d452cc5250383200fb2f54830b
+EBUILD python-xcaplib-1.1.0.ebuild 550 SHA256 fabcb37522ae4a7f75f8d14c835aeab34720d41dd402c31da3eefa5b24bb2941 SHA512 146b060138860ed504179f1d96c808a54c1cfb2e5d8b27f83df683353b50e200892f73471bc6bddbfc9bd4d8161ca0bd281c428cb96fb126fee3516defa87055 WHIRLPOOL 659daa5147a10555d3e7efc12bb74950c42e1339ba15bd973ee943105d9981e3c7b8293445de259eddad7c2aa650940e449d1acc173a14eb46b84a81d7a23f60
+MISC ChangeLog 973 SHA256 92da3887e170ab0c30db9aa9b27e433c6a2fd229bdbdfb0fd2633c7bf30ea9fc SHA512 906e2d85c91c7fe70f311c01b8aae031145610a8f6f205da0581b8f3e6338a3563bc4d1312c1673b587e7fe4df8ddce4058bdcfd537afbc7116493808bc0f65c WHIRLPOOL 29f276b9f09fc04e576d05de8f19709899cdebbc13c629843ce01a5995255912b999d7afa796bdd7ffc86b3b1894aec0a966720ba479a8e4599a93d6975261e1
+MISC metadata.xml 898 SHA256 1c9c2f2316662d0ff3723cd57dc468ed7a2dda707cfe82f3206e935a9e95ce83 SHA512 6da7eaed0415c31d9ca6591e62a0308ef8f8e7f5849131ee7c4ad26a04f7f8f751784d71e880db304928597be1f0e1352c0e328d3464c147cfe37f1550a3cedf WHIRLPOOL 872a3f2e9a33ee664f2ce1b42d116999d3caf1c33c5466ceaf7fbd0960deaf03fa98559b2cfcca84e52a8f0c9dafbc47281ef7c44fbf442f15c8e677bdd5d81d
diff --git a/dev-python/python-xcaplib/metadata.xml b/dev-python/python-xcaplib/metadata.xml
new file mode 100644
index 000000000000..e28a9e7635cb
--- /dev/null
+++ b/dev-python/python-xcaplib/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		XCAP protocol, defined in RFC 4825, allows a client to read, write,
+		and modify application configuration data stored in XML format on a
+		server. XCAP maps XML document sub-trees and element attributes to
+		HTTP URIs, so that these components can be directly accessed by HTTP.
+		An XCAP server used by XCAP clients to store data like presence
+		policy in combination with a SIP Presence server that supports
+		PUBLISH/SUBSCRIBE/NOTIFY SIP methods can provide a complete SIP
+		SIMPLE solution.
+
+		The XCAP client example script provided by this package can be used to
+		manage documents on an XCAP server.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/python-xcaplib/python-xcaplib-1.1.0.ebuild b/dev-python/python-xcaplib/python-xcaplib-1.1.0.ebuild
new file mode 100644
index 000000000000..4283bacd35f0
--- /dev/null
+++ b/dev-python/python-xcaplib/python-xcaplib-1.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_REQ_USE="ssl,xml"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for managing XML documents on XCAP server"
+HOMEPAGE="http://sipsimpleclient.org"
+SRC_URI="http://download.ag-projects.com/XCAP/python-xcaplib-${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/python-application[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
new file mode 100644
index 000000000000..acef3f5a7f7e
--- /dev/null
+++ b/dev-python/python-xlib/Manifest
@@ -0,0 +1,8 @@
+AUX defs 273 SHA256 066b83dd28b6938e10c50d11ef86028115f93a65e44a516aa42597866ebef65c SHA512 4a51870b0b4de46995eeb2e74487e79eb6bd55fd8c0c736176655b22ff7737957cf16b7f86455bf6e9ae724dc773cd90d5d021c296985b93fbb25da01ac4c211 WHIRLPOOL cc93a5e6c3ccf00709e5aea18570fcef4813f2fbec21bfd6d980619e5d1b7210916fe19634cb2441870bf0edd57346a095328e4992d68ae3d9d44c8daec42e98
+DIST python-xlib-0.15rc1.tar.gz 188750 SHA256 823734489fc8c47113deb606fdc7142759d4c45546014255af8c5b8787b9accb SHA512 e27f56e0d76fac534e6754b1e64316636b49859eb6c9ceef5952c8b42cf53bc798a705fa54c283c896324d9a23778beec583cb62984a6a43b024643a70f3fe3a WHIRLPOOL bdca7c97cfbf438cce6297d5d035488986886d95f6f80014c9d9b1966720b98600b13f6dc09b6aed209787833e3174a0bf8444c3ba9c46e9f106051b978d322b
+DIST python-xlib-0.19.tar.bz2 188359 SHA256 10ba17a7b2aea9f6a7fb0b87caa284383389cf867ba9d31619246577b8cc3408 SHA512 070807eed50ce9a17926c36686dac5c143deff0b687a2967afade1a2f776d42ffbea0bbfad3a7480118ba7b1cf5ac0bb64978fdd3ca125c1df651af456dba5be WHIRLPOOL 7651d564c10bd381508bf69088e88705218be9e9a31442660fd80d1e2d086ae4a3a84aa733fed30b4c4359663b99fe117fcd6a8fb1b7adefd888f267ef8722a8
+EBUILD python-xlib-0.15_rc1-r2.ebuild 918 SHA256 40b91680ded92790efcddcf39629d06469ce3fb041415b460f0fd8dc6e7064e8 SHA512 c18ff04b4aab7892dd16303bb302f5ff08c6d026ae2e9133007050b3bde17faf35915d0762479856be801a3ff87a90e39f546a3300489da6375112cc62a71056 WHIRLPOOL 767827690ad5f3c69068a1207fdb50b84d466441b7f45590cbc589bf0ce08a976f6b5b3ebe93bb6c6c079893d5e1b77157d1739ffe01dd6957ae6e742e18b40d
+EBUILD python-xlib-0.19.ebuild 1074 SHA256 dc29375e067a60768e75a6b1cefb1bf78e5cc66b1d538ccede50c7e43cc7b533 SHA512 c041d1b4d78b673462bb27c926aa4718dd793fe86e58e4ff50505c3011f1335dc5736b476017c55489145006322e6bdfed45ea62d41f244a3736de2eed7f34e0 WHIRLPOOL 1618867863fef2c5318edbcafdc2253b32f19b0d7d67e5b4d1ae5daa9844543abdab59df9beb60fa364091a743967ddcb43e2205a0cf52885e24e5843097738d
+MISC ChangeLog 3980 SHA256 2facde936a7c39fa706664dfdbe8a1bb0cc64b57ed51c994a789dbc18762a01d SHA512 01bc6e71178b3d86edae3fc34a04872a0df984c8514cee7f7a37c0bdc50234e01d1ec94a75d391f824ee78720c7ba3aa88cc678ff1bdcfdfcea48d6718a48421 WHIRLPOOL fd39a6ca4128f2dcdb1aae0c7881f428aa6e581ea3ae9407ceb2dc47cfe4bef660b6f62aa1409a442fec7735c787000cb591227ae3bad80c74ddd7ef980b0140
+MISC ChangeLog-2015 6300 SHA256 843e47a1f8446e5a704ea3d6a8531d9f59b3df40b26d48a1b7535b69f82f557b SHA512 9b8269d068b7bb86efeb4836dca47957a8c5879e634b396373430fdeae4af3aff94a6739861616e9cf3e4ac2e27e4c3a2365e4112a05057bf4c98a3809596c5c WHIRLPOOL 7182e11e4d43daf732ca32042303f1f218d43b02acaa1adc4e8533395284fc26941fa6e5d719f3f553a6218e1a63a8f6f0efd5a23563185daa9641eb4b6c8b4b
+MISC metadata.xml 384 SHA256 18feaa66cfd46232de11e15f2acc964669ce0ec323cd59bff027d85e0f1df9ed SHA512 43a2e7161edf8d2a527f35cbc8e590655df487f699e570dc542ab0b3f25b4c577599fa43a09efb4f8f3f67bd6a964acc8b446aa810ffbb2ea7f6dc9ab0f2ebd4 WHIRLPOOL 342e54a87a0cbdde22344b326ece09ac5bbd0f3e1eb076c3122e4c8c45dd8b0be270d24d29bc0ac57c8cb9fdfbf81410b701625c89d7d7524204dfdd78acd7a3
diff --git a/dev-python/python-xlib/files/defs b/dev-python/python-xlib/files/defs
new file mode 100644
index 000000000000..2da6f932799b
--- /dev/null
+++ b/dev-python/python-xlib/files/defs
@@ -0,0 +1,11 @@
+# Definitions for documentation makefiles
+
+SRCDIR = ../src
+
+TOPSRC = $(SRCDIR)/python-xlib.texi
+
+SRCS = $(TOPSRC) \
+     $(SRCDIR)/concepts.texi $(SRCDIR)/package.texi \
+     $(SRCDIR)/connect.texi $(SRCDIR)/errors.texi \
+     $(SRCDIR)/events.texi $(SRCDIR)/objects.texi
+
diff --git a/dev-python/python-xlib/metadata.xml b/dev-python/python-xlib/metadata.xml
new file mode 100644
index 000000000000..736c78504618
--- /dev/null
+++ b/dev-python/python-xlib/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">python-xlib</remote-id>
+		<remote-id type="github">python-xlib/python-xlib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-xlib/python-xlib-0.15_rc1-r2.ebuild b/dev-python/python-xlib/python-xlib-0.15_rc1-r2.ebuild
new file mode 100644
index 000000000000..f004f5d31e65
--- /dev/null
+++ b/dev-python/python-xlib/python-xlib-0.15_rc1-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_P="${P/_/}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A fully functional X client library for Python, written in Python"
+HOMEPAGE="http://python-xlib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
+IUSE="doc"
+
+python_prepare_all() {
+	sed -e 's:make:$(MAKE):g' -i doc/Makefile || die
+	cp -r "${FILESDIR}"/defs doc/src/ || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+		VARTEXFONTS="${T}"/fonts emake html
+	fi
+}
+
+python_test() {
+	cd test || die
+
+	local t
+	for t in *.py; do
+		"${PYTHON}" "${t}" || die
+	done
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-xlib/python-xlib-0.19.ebuild b/dev-python/python-xlib/python-xlib-0.19.ebuild
new file mode 100644
index 000000000000..2b523c38de56
--- /dev/null
+++ b/dev-python/python-xlib/python-xlib-0.19.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A fully functional X client library for Python, written in Python"
+HOMEPAGE="https://github.com/python-xlib/python-xlib"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed -e 's:make:$(MAKE):g' -i doc/Makefile || die
+	cp -r "${FILESDIR}"/defs doc/src/ || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+		VARTEXFONTS="${T}"/fonts emake html
+	fi
+}
+
+python_test() {
+	cd test || die
+
+	local t
+	for t in *.py; do
+		"${EPYTHON}" "${t}" || die
+	done
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-yadis/Manifest b/dev-python/python-yadis/Manifest
new file mode 100644
index 000000000000..c74c348ef0b4
--- /dev/null
+++ b/dev-python/python-yadis/Manifest
@@ -0,0 +1,6 @@
+AUX python-yadis-1.1.0-gentoo-test.patch 3153 SHA256 6bc1d94e2232ddeb584a395256ed6a423dc73354f1a4fd9a89dfb61fc8ba17f3 SHA512 fda698114472b569031a2d9c6fe2c85d856f9fa7b1118aefb282bda10dc53f20727581f3b9a1fb535cec535cae2b3253c851de7d64ad0e0ce60cbfabf1df9186 WHIRLPOOL 757da86a794213e5114e9b39b5bf49d7562a2e44671b32ef0512d08f31bb624e256b7076d3bc901e68169d3d228803a69be34879b605fdca6905d0de7833c28a
+DIST python-yadis-1.1.0.tar.gz 192569 SHA256 1f9e9c55e82ac0025030e9bb0bcc4e2344ad4b26e6fd0aee10690fb18a3ca307 SHA512 955efbcd13f02c8e112e0f5dfd4ad8a7fb56e0d5d55a2c409ed044f4ac99d5496b9d641916a7af1ddc18628d83cef1f3907d787afd468ceb7573ec192de1e02f WHIRLPOOL 0389fbf85635752b23eeef3ada41a6df8dd181aa89facb208e5f4e20c4d7278cc78a20e335a033456e5e2bfc171e92a22dba990c96fbf9d8a66090cf0573be3c
+EBUILD python-yadis-1.1.0-r2.ebuild 838 SHA256 9320001613fb13b369309959fe9bcbffc7bd3ae83ee9d9b82628abfa932c0bcd SHA512 c125938ebc5a757c9729641a834a729c6bb60e32dc6ce173ceaed4144189e000449fa3d5c9f80f29fefe8c8d58fcec23a094720f2f59491804af731f451a3d5a WHIRLPOOL c23c245fcf58cc958daede3a62b9b1664c266c1f5e9b70c427b859a8d121eb598a0f24c154cff48b450b5b6e0e6087d13649b8bc80f8fb64363ac908ff1226ef
+MISC ChangeLog 2723 SHA256 fff56bb70a1cc66db673e98855b7543c5086b708b593f31b042a2ae99c93040c SHA512 f9b64c04e788bf60cd98e216be7625b33db1df26dc019f526c4149c847ec077aa50e264550db128fc6924c25622be0e6738b600f33b17165d787e49a78819be1 WHIRLPOOL 7b4e4e522ab55ba43e0d6871e8b90d816648e3e1d47fbcb76d2b710616856a387c146c293cb0c13198a043579073ffe38ae327f449174336c22c7e81dd586b52
+MISC ChangeLog-2015 1547 SHA256 0dc8f4d6046f3e76e307fd4c20a4db61e38f0e4f5963aa9d4fe2da504ecd85b9 SHA512 adc9a1828ff4ec63c547b9a44ee659b83cb0c654e920c2e91741bfe884084b20481794bdd40ecac900a5c95b023965df8a8399505f50157ca3728cca92e8b0aa WHIRLPOOL 053ae2e989c9576e3a8639d8271472b4a25743bc5569ab06626c6ab395ef1460a0d1ecb760adbc2c74fbf79f821db5a976ee00e45bc6ee0bd671db0ca06bbfa2
+MISC metadata.xml 308 SHA256 ee787ea98be9bc027a6119d24d4270df5f33fa9062579ce741ac75c4f6a4f173 SHA512 c4cc94efed57dfcce6e258fb46a67b2c49d7575b7cd17da7b95b04451d2180241ec34fa697514bc1f65f2fa5c9de5e841d3ae24ffd4f7e62de37e7c5d7c002a2 WHIRLPOOL f94adbe9f3d5ca958d43259f36d0c0503c16437fb8f43d83be14d41c31846d4ebe2100cd54ce8b7a2596a4cab95b1b3a3a3c19cdcbe7e1f7614fa982862c4bfd
diff --git a/dev-python/python-yadis/files/python-yadis-1.1.0-gentoo-test.patch b/dev-python/python-yadis/files/python-yadis-1.1.0-gentoo-test.patch
new file mode 100644
index 000000000000..ae6a06c9012c
--- /dev/null
+++ b/dev-python/python-yadis/files/python-yadis-1.1.0-gentoo-test.patch
@@ -0,0 +1,82 @@
+--- admin/runtests.orig	2007-05-31 11:30:01.000000000 -0700
++++ admin/runtests	2007-05-31 11:31:26.000000000 -0700
+@@ -1,7 +1,6 @@
+ #!/bin/bash
+ 
+-ADMINDIR=$(dirname $0)
+-YDIR=${ADMINDIR}/..
++YDIR='.'
+ 
+ declare -i errorcode=0
+ 
+@@ -17,13 +16,6 @@
+     echo 'Install pyflakes. http://divmod.org/trac/wiki/DivmodPyflakes'
+ fi
+ 
+-if [[ $1 != "darcs" ]] ; then
+-    echo 'Checking docs... '
+-    if ! ${ADMINDIR}/epyrun check; then
+-        # Who knows?  Epydoc --check doesn't modify the return code.
+-        errorcode=$errorcode+2
+-    fi
+-fi
+ 
+ echo -n 'Running tests... '
+ if ! python ${YDIR}/yadis/test/runtests ; then
+diff -ur python-yadis-1.1.0.orig/yadis/test/test_xri.py python-yadis-1.1.0/yadis/test/test_xri.py
+--- yadis/test/test_xri.py	2006-12-09 06:17:12.000000000 +0900
++++ yadis/test/test_xri.py	2011-11-16 22:03:07.254992928 +0800
+@@ -44,11 +44,6 @@
+             s = u'l\xa1m'
+             expected = 'l%C2%A1m'
+             self.failUnlessEqual(xri.iriToURI(s), expected)
+-    else:
+-        def test_iri_to_url(self):
+-            s = u'l\xa1m\U00101010n'
+-            expected = 'l%C2%A1m%F4%81%80%90n'
+-            self.failUnlessEqual(xri.iriToURI(s), expected)
+ 
+ 
+
+diff -ur /mnt/gen2/tmpdir/portage/dev-python/python-yadis-1.1.0/work/python-yadis-1.1.0.orig/yadis/etxrd.py /mnt/gen2/tmpdir/portage/dev-python/python-yadis-1.1.0/work/python-yadis-1.1.0/yadis/etxrd.py
+--- yadis/etxrd.py	2006-12-09 06:17:12.000000000 +0900
++++ yadis/etxrd.py	2011-11-16 22:26:21.386992510 +0800
+@@ -22,12 +22,8 @@
+ from elementtree.ElementTree import ElementTree
+ 
+ # Use expat if it's present. Otherwise, use xmllib
+-try:
+-    from xml.parsers.expat import ExpatError as XMLError
+-    from elementtree.ElementTree import XMLTreeBuilder
+-except ImportError:
+-    from elementtree.SimpleXMLTreeBuilder import TreeBuilder as XMLTreeBuilder
+-    from xmllib import Error as XMLError
++from elementtree.SimpleXMLTreeBuilder import TreeBuilder as XMLTreeBuilder
++from xmllib import Error as XMLError
+ 
+ from yadis import xri
+ 
+diff -ur /mnt/gen2/tmpdir/portage/dev-python/python-yadis-1.1.0/work/python-yadis-1.1.0.orig/yadis/test/test_etxrd.py /mnt/gen2/tmpdir/portage/dev-python/python-yadis-1.1.0/work/python-yadis-1.1.0/yadis/test/test_etxrd.py
+--- yadis/test/test_etxrd.py	2006-12-09 06:17:12.000000000 +0900
++++ yadis/test/test_etxrd.py	2011-11-16 22:29:00.896992462 +0800
+@@ -40,9 +40,6 @@
+     def _getServices(self, flt=None):
+         return list(services.applyFilter(self.yadis_url, self.xmldoc, flt))
+ 
+-    def testParse(self):
+-        """Make sure that parsing succeeds at all"""
+-        services = self._getServices()
+ 
+     def testParseOpenID(self):
+         """Parse for OpenID services with a transformer function"""
+diff -ur python-yadis-1.1.0.orig/yadis/test/test_parsehtml.py python-yadis-1.1.0/yadis/test/test_parsehtml.py
+--- yadis/test/test_parsehtml.py	2006-12-09 06:17:12.000000000 +0900
++++ yadis/test/test_parsehtml.py	2012-11-08 20:42:34.248733469 +0800
+@@ -3,6 +3,7 @@
+ 
+ import os.path, unittest, sys
+ 
++@unittest.skip("Recently broken test")
+ class _TestCase(unittest.TestCase):
+     reserved_values = ['None', 'EOF']
+ 
diff --git a/dev-python/python-yadis/metadata.xml b/dev-python/python-yadis/metadata.xml
new file mode 100644
index 000000000000..85d4aef0b6da
--- /dev/null
+++ b/dev-python/python-yadis/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>Yadis service discovery library</longdescription>
+</pkgmetadata>
diff --git a/dev-python/python-yadis/python-yadis-1.1.0-r2.ebuild b/dev-python/python-yadis/python-yadis-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..571bae4a83f7
--- /dev/null
+++ b/dev-python/python-yadis/python-yadis-1.1.0-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Yadis service discovery library"
+HOMEPAGE="http://www.openidenabled.com/yadis/libraries/python/"
+SRC_URI="http://www.openidenabled.com/resources/downloads/python-openid/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/elementtree[${PYTHON_USEDEP}]
+	dev-python/python-urljr[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( >=dev-python/pyflakes-0.2.1[${PYTHON_USEDEP}] )"
+
+# Fix broken test
+PATCHES=( "${FILESDIR}/${P}-gentoo-test.patch" )
+
+# Tests are broken.
+RESTRICT='test'
+
+python_test() {
+	./admin/runtests
+	einfo "The pyflake output about XML* redefinitions can be safely ignored"
+}
diff --git a/dev-python/python-zaqarclient/Manifest b/dev-python/python-zaqarclient/Manifest
new file mode 100644
index 000000000000..261723460568
--- /dev/null
+++ b/dev-python/python-zaqarclient/Manifest
@@ -0,0 +1,4 @@
+DIST python-zaqarclient-1.2.0.tar.gz 66649 SHA256 afe1a0a32b9595feb8dd15c8f5affd23e80c4c4ecd73fef3a7d17076cb9cf39b SHA512 1590839460815daa1f0754d47ef789e0c2d2a078265bbb6595eac32114a36c5f15512a2781841955fe99cbdf2cdaa8a13061f535229a284f5b98f97d017dd8a2 WHIRLPOOL 5b47eabb2aba03e1a9168946e9b0018b3ca6e3099a5a34e2147a58786c5bef3c47fc97a8360a042d58c13e30e4cd4fda0d13d2f95d1481364e46719fa11ed40d
+EBUILD python-zaqarclient-1.2.0.ebuild 1240 SHA256 3fa88bfedf9fa3afc211a1faa5557c2246515c4b6c37e879cae39a0f98318a65 SHA512 3a62c878c06efb3748d77a31371f5f5c59a6c51c8580359f8f75efeb835feb517a0be8bfa08387508cbec3c212bd53108dcb4ef8b4e5ceb3f191751b8a237a79 WHIRLPOOL c1891ae0cc9923ab450c748b132b5f56eb9f1cc6e9e739bfc0533b314ce6f79a0842f9ea9ead456226b76f03278a973fa0a28434daaa2fccd5030cbe19d04e0f
+MISC ChangeLog 507 SHA256 52d107cd09967e73de39096424c72020bd593abc365312f15abf0e6ead0573cb SHA512 06b2dd10beab7e5710381b5774b283a12b054ea2abe8b2c98fd53a33bcf9e0b3d405a8d69e4d19fccfa9dcbc56e635f08b573d34c874c1107bd4cc60c44f91d3 WHIRLPOOL 22a7b055c62734917600ac04bec96739a5ac29f98d0e4d0a4533f85691858a06daf7b567352b10bb115d9bd468dda58930cd43d1a281d26c20bbf72f2271630b
+MISC metadata.xml 610 SHA256 74b67ca27b333e69e88c6b8d50ff3ac29a7e41b2886de248814279466ea40afe SHA512 8aff588cc301541b529b0387623c4189830e0ddd837c5570343c7e23a9d49740ed06f6586ef63308e9a3c6968ec1aa785d84d7563a8e7899949d3352e9d75efe WHIRLPOOL 74e5ed92f3700a4364dea871a1b85bff400472bfea4cf8042fa8cbb57d1f4697bcba25c35507364defc4e9adecd321e3001bf7e7ea3b3ec20ef1c571ae4751fb
diff --git a/dev-python/python-zaqarclient/metadata.xml b/dev-python/python-zaqarclient/metadata.xml
new file mode 100644
index 000000000000..f538ac4d0baf
--- /dev/null
+++ b/dev-python/python-zaqarclient/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+    This is a client for the OpenStack Zaqar API.
+  </longdescription>
+	<upstream>
+		<remote-id type="pypi">python-zaqarclient</remote-id>
+		<remote-id type="github">openstack/python-zaqarclient</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-zaqarclient/python-zaqarclient-1.2.0.ebuild b/dev-python/python-zaqarclient/python-zaqarclient-1.2.0.ebuild
new file mode 100644
index 000000000000..332eb2f93810
--- /dev/null
+++ b/dev-python/python-zaqarclient/python-zaqarclient-1.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Zaqar API"
+HOMEPAGE="https://github.com/openstack/python-zaqarclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.0.2[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-zipstream/Manifest b/dev-python/python-zipstream/Manifest
new file mode 100644
index 000000000000..00090e0685ae
--- /dev/null
+++ b/dev-python/python-zipstream/Manifest
@@ -0,0 +1,4 @@
+DIST python-zipstream-1.1.4.tar.gz 21376 SHA256 32a7a4bdb786914445589595273beffbbf9b6a0a3a3dc2cf19ea96114bd2abd7 SHA512 722c1d7db91dc47064fc51f1182417f46923b8f42a56e854f1fa125eaccfc7f86d3deab71709226a798a1caf5a84a8a7fa7d3564065ab91afbad434ed787ce32 WHIRLPOOL 153e6797cb88bcd1115f8678022061008073f0a33a309b9180e699273940956062ea1c69dd83b6a6a5f4b417405933670949ff09179beb59482866f340af1fd5
+EBUILD python-zipstream-1.1.4.ebuild 583 SHA256 55b38010974fac73b3231311dfdcc7a9ffc8f87f5fb2d702567cb540b435fe30 SHA512 70e561a75c1230b1ddd5deeb2e9716cede10b96b1c09f5fec8fac488d5f6d29252dfd40197ff485acaf9b22287525a936a2f950e41997fdc2ba191e77d26792f WHIRLPOOL c390221c91ed5c05935d0594023899e2d96dd80028ff584fef619c8a3ce1b148e71c99127ffdca69a1b1aa26371f3d5ec8d696d0ab3c810e5fda0340e776a913
+MISC ChangeLog 619 SHA256 f34da36080708c836c54a64c4df2b393f49b71948b73d85b3889742bbf518e58 SHA512 9dc809954069920bf2cdc32a06ca9edf708ae6671db1d42dde2bab3ea4afeae0a173181ea575bebdc9a26376907643b6f4e733247f66f9f3bdb14d3c3f11d5ff WHIRLPOOL 4280f5ca46067d40c552cbf01451b30295f77835af452fa1c9c25c69684b72edefd0e8d94401d14de42bf0d4fd99ad819657ca700328bcd855ebc3426d97f1b6
+MISC metadata.xml 330 SHA256 ba47ebef2a1c9df0e8939ee3c83cd133d04ba54e0dfb30b383c70d4f4523b341 SHA512 ad1eb74bf656fd0ae144a6f90b1805718dbc7c8dcb5daa6bdd702bc7c1a4f3f9c41a425995a9b67afc5e0847aa0c5297dcb1faa621d7dbb71f3c026a99759533 WHIRLPOOL 205df926ccf9ba664e065790778e6b80ba05537296a02582e18c403898a3dc84de2370e1aca16dd253dc9208c176b12d1b03bafc2247d87e9a5063ea178589b0
diff --git a/dev-python/python-zipstream/metadata.xml b/dev-python/python-zipstream/metadata.xml
new file mode 100644
index 000000000000..34e9b246a7aa
--- /dev/null
+++ b/dev-python/python-zipstream/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">allanlei/python-zipstream</remote-id>
+		<bugs-to>https://github.com/allanlei/python-zipstream/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild b/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
new file mode 100644
index 000000000000..84ad22d85a23
--- /dev/null
+++ b/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A zip archive generator"
+HOMEPAGE="https://github.com/allanlei/python-zipstream"
+SRC_URI="https://github.com/allanlei/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/python-zunclient/Manifest b/dev-python/python-zunclient/Manifest
new file mode 100644
index 000000000000..9ddc00f24df2
--- /dev/null
+++ b/dev-python/python-zunclient/Manifest
@@ -0,0 +1,3 @@
+DIST python-zunclient-0.4.0.tar.gz 81489 SHA256 e9c52c6160af6dd52478fbc4b0bed019df1c8130f4a6423afe6c82b5865abc46 SHA512 f8ba7ac60fe81c7d1deb7e5f758a7d7554c9f3578a4f84b4d38ff6b6514e846c18d0f92ef494e5257cab8eef981aef540440dfaa0c28348a8adec18c8c6007c4 WHIRLPOOL 84e4cbc6b4824da466aff6a685332b2db16aef4725e026d0d26da8c1eef482e056e7ff28893835e0b62a29ddc6e0112b73eacbaf0432cb985247208db2a5fa2f
+EBUILD python-zunclient-0.4.0.ebuild 1127 SHA256 976d1c88415c6831899b0fff661d5a1f9d10c032191355cb75844116868d0dcf SHA512 03c17c9925ead1cce714de10f3db6b73c0100a639695f638e158a27ca7c4fb1de65678a9bb2821eb924abba68b46aabcfb96d42c3622887d1e5e3fa4a3673b82 WHIRLPOOL 93bd425952815f28bab122ad7197e1e456879e7153f696aac689ea5e4e7251355f2dfe62a701550fee9868228ee731178048d18f819258d0fba41e164f3a5e79
+MISC metadata.xml 333 SHA256 e9188d1fb45641811bca6273a165eb8c72201576f74a1808cd20f07716b6c4f2 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41 WHIRLPOOL 03f2c89f09ad1d53c243ea7f340bfd30e0053b67f41ee03c76e421cf9443a129e7f1f57d86dbd329e48903e656bad6de10bfdfd6f5b0135abecd2c9479f58f3a
diff --git a/dev-python/python-zunclient/metadata.xml b/dev-python/python-zunclient/metadata.xml
new file mode 100644
index 000000000000..3ee70120def4
--- /dev/null
+++ b/dev-python/python-zunclient/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-zunclient/python-zunclient-0.4.0.ebuild b/dev-python/python-zunclient/python-zunclient-0.4.0.ebuild
new file mode 100644
index 000000000000..6b3365583662
--- /dev/null
+++ b/dev-python/python-zunclient/python-zunclient-0.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Zun API"
+HOMEPAGE="https://github.com/openstack/python-zunclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
+	!~dev-python/python-openstackclient-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python3-openid/Manifest b/dev-python/python3-openid/Manifest
new file mode 100644
index 000000000000..8300ee94b7e8
--- /dev/null
+++ b/dev-python/python3-openid/Manifest
@@ -0,0 +1,8 @@
+AUX django-tests.patch 970 SHA256 d0a68e329bbb4d124bc25532343da166b04b5f7f068899af4c257acdf5ce6254 SHA512 7fda9e32b094712b35ce5a8b6a5238b90ff232eaf4ec12a8b3d34c87b133dd1b3e79b44d9e59a11c484a077d15e951300a7c15f60a511f7e77a377196094f8f5 WHIRLPOOL 3d4f8227c434f8b308b8f80a724ed5f15dfe99fa17be1bfaee13ad903ccf7cd8b6e125ae8201e381a38d21367787cf934e559323b0ea0e2d56f1514b28bd322b
+DIST python3-openid-3.0.4_p1.tar.gz 306465 SHA256 eb78cb2288805ee1c51eeaa8941c61be796ac1126e1ca0a2c49dc7582b0c0407 SHA512 6e710dc47c3c1d4f31937b8a4dcf546cdb06128ffddbc3b2e2a2a9e09a8a3a7122326ba2137a92269f58a29f1b264c2e942610098f91f237d45f5ff0887faea0 WHIRLPOOL 8812d4fd0c0ffd3e40f4f8414463f05cf62b37d388039a5287ac412c452a8e7cb142accafdfbd9e32d36cde3d4a6d96954742b542fdc92168d31574de185c152
+DIST python3-openid-3.1.0.tar.gz 299326 SHA256 628d365d687e12da12d02c6691170f4451db28d6d68d050007e4a40065868502 SHA512 9c96efd16191ddb6ddb12c4885a2cce523244d04e70f9418144d0124ef142fd7b6578cd2a01e949995d7dedf0b96cbb3b17d1d3a29db5da8934f7fa875ad8e9c WHIRLPOOL 1b46810f625d0e5a3018b2dd2c1df938bb3df41c3316d04910d1e3ed24e747e0066829782bd978f92a20291a02f1562beb40e498fe1d3f928828cc2b708ce199
+EBUILD python3-openid-3.0.4_p1.ebuild 845 SHA256 1c073e018e028b7a50b4a19d634e323f01243a1c61ce8d04e76a76cb7270742b SHA512 9ef9966571b51b5c432e40884c6410eaa4ba6977e1efc4aa3566fabe6ff0422437e6e307a5419f8c28c94d104c611df36f999fa53a3436d47aee4ba562702cb4 WHIRLPOOL cad9857f751a61eba5c4736f4df6893dd82df7f6ec6ece4105b643aa575f56f57e29f3eca9e887d750cc11fa4b3d15308bd9aab8ba5cf140998e8fb7cf566144
+EBUILD python3-openid-3.1.0.ebuild 697 SHA256 d2112870267479f139dc5a2309653add910089acd963f61efb1926922f9bcc9d SHA512 1bcf11fb571361c31d6be4b6e9aa96b490a17eebbe5deba48bdb712cc41a9c4320ec546f919c98b70161ece502699a394bdc5c8026825af306a5550e30208301 WHIRLPOOL f0b195a16d69dc689911701742f8296899146d6c3d9a7f520e7d8c741a3b5b128f2198ce87fba39ca5d4ce2d5d8f146d00dce886ed7c9201a582c08ee11a74f6
+MISC ChangeLog 2623 SHA256 1566216d72c0dd3fe975f11c0a7b04ad223e82a1ac4c2514aa3647126084fc46 SHA512 fbb7ecf77158667b58e3f3924f52376d64de2d6d65619dbb16d3c239b55e366e095c38f9d55e32525b701339c49bea1acfb62df8e8bfddbbfca25fb5b7cfa8fb WHIRLPOOL 31435893a38bf641d8ad3316b070c06ddc6a2cb19443f35fcd5c8e9e3234d3a6eaf605b7acd90b6061f0904321aa52129dcbbb09ea974e17d807f70e82729c62
+MISC ChangeLog-2015 749 SHA256 5df5a8b6bfa35e62f408c408bf8fe49ca52c9281a7bc0b506b566a8c8ec0b06c SHA512 732ea1567dd95cf51d8abb0ad47d82a3ec636a4037ba11e65d1c053d58619f80d5420e2f26dfc0912b4af83d17227ee7e6bb73176ba2909de3a28c9c2b177176 WHIRLPOOL 1bd7e2b1b8f18c2d9cc4e3ca76d010acd5703565b87c0de896202669057728e5a407a56ac5a685891d177bc91b81e5aa0297b73f3c14e2ac72cefdbaf1b61dbf
+MISC metadata.xml 337 SHA256 3b4504f2c113257dbf0750aed249a0ed46dc3753ac55e2a3d4cd15ec23dc9c2d SHA512 099dc2e5cd089e1638ad20bc476cd8d9e6d173b22611f48b34b9945f92886550f53d86ca672882bd570cd6515c33a2d8b4acb87fbd35abfbc55bd592b570459c WHIRLPOOL f2641df6e9cc421603f5fbe42e4e987ac0faa670d2bd3d0e752fb675954afacdc4091558898c9bd4c66e4141073a3d9042ff02aaf15b082db058f84c03cce24e
diff --git a/dev-python/python3-openid/files/django-tests.patch b/dev-python/python3-openid/files/django-tests.patch
new file mode 100644
index 000000000000..e5fcda877f31
--- /dev/null
+++ b/dev-python/python3-openid/files/django-tests.patch
@@ -0,0 +1,32 @@
+diff --git a/examples/djopenid/consumer/urls.py b/examples/djopenid/consumer/urls.py
+index d55e056..3926e27 100644
+--- a/examples/djopenid/consumer/urls.py
++++ b/examples/djopenid/consumer/urls.py
+@@ -1,5 +1,5 @@
+ 
+-from django.conf.urls.defaults import *
++from django.conf.urls import *
+ 
+ urlpatterns = patterns(
+     'djopenid.consumer.views',
+diff --git a/examples/djopenid/server/urls.py b/examples/djopenid/server/urls.py
+index d6931a4..e61de52 100644
+--- a/examples/djopenid/server/urls.py
++++ b/examples/djopenid/server/urls.py
+@@ -1,5 +1,5 @@
+ 
+-from django.conf.urls.defaults import *
++from django.conf.urls import *
+ 
+ urlpatterns = patterns(
+     'djopenid.server.views',
+diff --git a/examples/djopenid/urls.py b/examples/djopenid/urls.py
+index d91ee1f..16af9a1 100644
+--- a/examples/djopenid/urls.py
++++ b/examples/djopenid/urls.py
+@@ -1,4 +1,4 @@
+-from django.conf.urls.defaults import *
++from django.conf.urls import *
+ 
+ urlpatterns = patterns(
+     '',
diff --git a/dev-python/python3-openid/metadata.xml b/dev-python/python3-openid/metadata.xml
new file mode 100644
index 000000000000..5e866c63a84e
--- /dev/null
+++ b/dev-python/python3-openid/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">necaris/python3-openid</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python3-openid/python3-openid-3.0.4_p1.ebuild b/dev-python/python3-openid/python3-openid-3.0.4_p1.ebuild
new file mode 100644
index 000000000000..a7a1afd54b05
--- /dev/null
+++ b/dev-python/python3-openid/python3-openid-3.0.4_p1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit vcs-snapshot distutils-r1
+
+DESCRIPTION="Python 3 port of the python-openid library"
+HOMEPAGE="https://github.com/necaris/python3-openid https://pypi.python.org/pypi/python3-openid"
+SRC_URI="https://github.com/necaris/${PN}/archive/47a15d30b962a4316473ae9909b3405773d78181.tar.gz -> ${P}.tar.gz"
+#https://github.com/necaris/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="examples test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/django-tests.patch
+)
+
+python_test() {
+	"${S}"/run_tests.sh || die "tests fail on ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES="examples/."
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python3-openid/python3-openid-3.1.0.ebuild b/dev-python/python3-openid/python3-openid-3.1.0.ebuild
new file mode 100644
index 000000000000..1484171e99bd
--- /dev/null
+++ b/dev-python/python3-openid/python3-openid-3.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 3 port of the python-openid library"
+HOMEPAGE="https://github.com/necaris/python3-openid https://pypi.python.org/pypi/python3-openid"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/defusedxml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	${EPYTHON} -m unittest -v openid.test.test_suite || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python_orocos_kdl/Manifest b/dev-python/python_orocos_kdl/Manifest
new file mode 100644
index 000000000000..1bc5955755d3
--- /dev/null
+++ b/dev-python/python_orocos_kdl/Manifest
@@ -0,0 +1,5 @@
+DIST orocos_kinematics_dynamics-1.3.1.tar.gz 202471 SHA256 aff361d2b4e2c6d30ae959308a124022eeef5dc5bea2ce779900f9b36b0537bd SHA512 93abd9dd5aef3710f784f9db8eea4738458bffa5295923993e2d77656c18f7354559412fb7eb5f1e9da7112de19aa36d3f0f68f149852f955bce960fd3b719e7 WHIRLPOOL b7b4d897f4d5f170b73fe5bb48e357051ae37a244b9c44e8c2f120d71fc75c80cc1f69d30cb1463bbe10658ba0af98965f18f3055436910f24ebaab0ce1bd8e7
+EBUILD python_orocos_kdl-1.3.1-r1.ebuild 1342 SHA256 30ac4fe820ff77c42d16b7c7e9d0897c9a9e59e37efa1245a2af8745f1f71cd2 SHA512 4ce0cc92c6011bb7c69784429aca7ba95a090b91bcc7422043d9c8c394750af3e52707dd8a768b7cfadb5478e051cece99332396b0bc76c8d40d2357be659090 WHIRLPOOL a44bf18198479eacdb0d9795bebc41945f56d30f99d8f269172e21a0063942e0783f235a0d8d3d4ab68ff10d18657c18bc36f19cbc3d30eb0e643e59a7a246e1
+EBUILD python_orocos_kdl-9999.ebuild 1342 SHA256 30ac4fe820ff77c42d16b7c7e9d0897c9a9e59e37efa1245a2af8745f1f71cd2 SHA512 4ce0cc92c6011bb7c69784429aca7ba95a090b91bcc7422043d9c8c394750af3e52707dd8a768b7cfadb5478e051cece99332396b0bc76c8d40d2357be659090 WHIRLPOOL a44bf18198479eacdb0d9795bebc41945f56d30f99d8f269172e21a0063942e0783f235a0d8d3d4ab68ff10d18657c18bc36f19cbc3d30eb0e643e59a7a246e1
+MISC ChangeLog 3232 SHA256 4e2891fba96dbe21171e29de80d4d222af179c6b7d0a81478f605e9a94ffa753 SHA512 e290dba41706ba2d189377342e965a8bcf19a82ff4cf66936441a73da05817601b3e9ed86898ad1583569e314357cc8cc1133691f0e98f1dea061775e127b1c7 WHIRLPOOL ec9093884d8ee1344617a06658ebc289f6b13d6ced96401f19f8d88364a32f7ad0ba16ff21fdec14b22aa05b0fbd21985ce41cf277e3ba09689c491600fbda97
+MISC metadata.xml 347 SHA256 36c72daab2dd6ad4adf2df67c2f0af790567f2a1e0a5d8798f691bc0ba084105 SHA512 a32a6de7eece8df29d9542f14dccacb7d046e7205af6bd996d41279175111c9416cddf78cc8a87e2319cc1b25bf880b38e8d2d0573ba6747820a5c328d809074 WHIRLPOOL d63a0dfa5b416524cf0653f55ba2953f31b2aa0c098d98bcb073fd9ac0a017eb5c755e4665686a1a6e4ab1039df0d2d084e87596daa773983ce94c2adbeeaa6a
diff --git a/dev-python/python_orocos_kdl/metadata.xml b/dev-python/python_orocos_kdl/metadata.xml
new file mode 100644
index 000000000000..51b7947249b7
--- /dev/null
+++ b/dev-python/python_orocos_kdl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">orocos/orocos_kinematics_dynamics</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1-r1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..b251ab8dc3bb
--- /dev/null
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.1-r1.ebuild
@@ -0,0 +1,60 @@
+# 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} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
+fi
+
+inherit ${SCM} python-r1 cmake-utils
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
+fi
+
+DESCRIPTION="Python bindings for KDL"
+HOMEPAGE="http://www.orocos.org/kdl"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	sci-libs/orocos_kdl
+	dev-python/sip[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	S=${WORKDIR}/${P}/python_orocos_kdl
+else
+	S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/python_orocos_kdl
+fi
+
+src_configure() {
+	python_foreach_impl cmake-utils_src_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+	python_foreach_impl cmake-utils_src_test
+}
+
+src_install() {
+	python_foreach_impl cmake-utils_src_install
+
+	# Need to have package.xml in our custom gentoo path
+	insinto /usr/share/ros_packages/${PN}
+	doins "${ED}/usr/share/${PN}/package.xml"
+}
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
new file mode 100644
index 000000000000..b251ab8dc3bb
--- /dev/null
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
@@ -0,0 +1,60 @@
+# 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} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
+fi
+
+inherit ${SCM} python-r1 cmake-utils
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
+fi
+
+DESCRIPTION="Python bindings for KDL"
+HOMEPAGE="http://www.orocos.org/kdl"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	sci-libs/orocos_kdl
+	dev-python/sip[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	S=${WORKDIR}/${P}/python_orocos_kdl
+else
+	S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/python_orocos_kdl
+fi
+
+src_configure() {
+	python_foreach_impl cmake-utils_src_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+	python_foreach_impl cmake-utils_src_test
+}
+
+src_install() {
+	python_foreach_impl cmake-utils_src_install
+
+	# Need to have package.xml in our custom gentoo path
+	insinto /usr/share/ros_packages/${PN}
+	doins "${ED}/usr/share/${PN}/package.xml"
+}
diff --git a/dev-python/pythondialog/Manifest b/dev-python/pythondialog/Manifest
new file mode 100644
index 000000000000..7fbe1f7f3350
--- /dev/null
+++ b/dev-python/pythondialog/Manifest
@@ -0,0 +1,11 @@
+DIST python2-pythondialog-3.3.0.tar.gz 1906527 SHA256 3e6f593fead98f8a526bc3e306933533236e33729f552f52896ea504f55313fa SHA512 65ce7f9305e20b0c5e0d4588a241e0f14907ecad64f8a6bb3899a2d6e0245fdd848a8c4fb1da3465f03810a1e408fa97c46d9ec082c4ebba0c04a41293a23ea8 WHIRLPOOL 5fc43839b302956a42110e0d2e64bfb9f9b5ccada90cb69579afbb1211b7f117233a25f5bbb970c8b5033413c5c274e27c689e72c83a5887307fa11abc4dc6b8
+DIST python2-pythondialog-3.4.0.tar.gz 1487867 SHA256 a96d9cea9a371b5002b5575d1ec351233112519268d382ba6f3582323b3d1335 SHA512 f4ec3e3eeab9ee00146b4604a8f72c765fcc164a24def0f1a9cbf083123e55dbe371ce6d4790ad4c0b5ee6905a1877f9b8e90ca3443a780fa0965c9bcf4bf629 WHIRLPOOL 325641f3a89e976ef61a0cbdc9a178fc7376d64eb6c8933d87e8bb0b15ad810880edd6bfa9d2b5957a818044f1652800d34a498a7be66a4fa39ea665f59a13b2
+DIST python3-pythondialog-3.2.2.tar.bz2 1412368 SHA256 bb104bd0512f9eda046b0cda53b5607d68de72b585cd8d5a1eebd549d8f2af99 SHA512 58b84c0dd7b71ec9d1e60c4802cfc8e6cc72f79b8b6accd387553c685a92367d242746065bac6cb1c9d501ac291d9307cb2bb6b26694e9f24a3c5d6637a5bb8e WHIRLPOOL 8e899f910eaaa5112403aed8adcd2e8fc9db371a5023bafdb5d2645b2ade716710b1c826d9208055fc510e8777751f8a43ef501db11c04827b93cb3040f4d793
+DIST python3-pythondialog-3.3.0.tar.bz2 1827891 SHA256 e4ace5b09d712992b7327249e375e49608127666679b2ca9fd48141e218ec998 SHA512 b651593f077f6679be030182ac5f14a02d8bad86206c2733ba8b655d346809a32ea391de91e35101d400c55d9e8ecefaf6f1ba25fec036246186e13530f43a1f WHIRLPOOL 267a2ee4215fd53d7faaf88a02ee544e88eafdd5b1f4c45c4ba535fe46dbed41a1ebae72b0dae00fedb30cfb1fcd245e0439077f538d128137e8c8caca6bba70
+EBUILD pythondialog-3.2.2.ebuild 887 SHA256 8d0b419ca79272c3a9be8fe2737b7ab7faac6ca205f19a221ef027c32ad49330 SHA512 e08875187db07029da90bf2fdeadd4cfe2e351a290c2bb5ebcbc790340c9181951bc6e1a27329b039e714508370b67448c100639723ba55d1359e15c6f89a2d0 WHIRLPOOL 113ef999f9195818c16d02598d428316dead71b577bbfbbb57d2d12e887c95b4f8f07eb43850c11c018389112fbb9707032e584bdb3ea55b0525ff61a2880829
+EBUILD pythondialog-3.3.0-r200.ebuild 972 SHA256 2e750edb2562fa0aea8afbf14a5bf1215e7559a4b4ecf8853c469029f629746a SHA512 65068ffed61eb8415fbac853cc0dcac3ac414eee181188dc3b65525a72c745f69459c013023d1437b497a8475374e6ded8443f59095a2ef03dbaacf2279cfe04 WHIRLPOOL d30345ac9ee28a9fd397d145160e69246c5aae97a20a0c4a877ab17770446c370847caa561e0e808a4a24f0ffc34ed24215f87a17b888ecfc97e4c18c2185dea
+EBUILD pythondialog-3.3.0.ebuild 894 SHA256 ec145a9fd110f2492a59dda9ff5e75bdda6bbfa529ea25ed88cbc9146a5b49d8 SHA512 8c665063eb6c203fcb9918b17cf815166f5b84e948b821c226685dc408b8c4e61084619e3a554497f8dc175a456b5960d3943d24ff4d46d7254cb78e3952cc7a WHIRLPOOL c87eb691623b847251ab149973d5fe5c6b3e3ba7936f8abec9a4456c20efb7774b5e0d0cfbd216afbd0ef071567efff9430d77c1012ff80e3af2fe1cc643375f
+EBUILD pythondialog-3.4.0.ebuild 1108 SHA256 c4e6ef385cbeac485ab8d68e0d063c586fe8e912ea508cd01a74f881589b7e58 SHA512 a225ad37f1b5529deb4f7f1186ebb325694b9dd18b6e782fd90c487728cb38d11bdcceca28f8e9863db471a3e307221ea78a1919a6c813447ba1298357981fae WHIRLPOOL cbd353a231bf44fab9f9d94fe28d0aa44b8c1ec44f39b919cbe5e73568ba9a36310e4fc4ce3acdcd8c9010e0cf5301b1a561ee48acc1de71d041c5a4d8c5cc59
+MISC ChangeLog 4069 SHA256 4742e95b52c9b1e767591662c232d7f2a5195c8638fcedfcf3164a9a8f3aab9b SHA512 c1c0e864c5f45f3d1f1c8f423c56b5e83a26c368b130a06e4e5b981813ba374bb236ebeff1a583bc12d053e66c4ca7ac773fb96a8b0558447639b51693556f9e WHIRLPOOL 3f9a4fefaf12251adb6dddddab931a6ada7b173ac16964822bb255a92461f2533da6e59d5f1d34a8875f9e829d196a45a7674157d0a11740965642d7526c3b2d
+MISC ChangeLog-2015 4976 SHA256 442986fd17e24f1989f85c7f386374b781b250e64dd8f7ba16a07a4d4356c3d2 SHA512 11f418701e08e733433ca2ee782e48c11dce5a27118e93cac00af786e189a76f307493d7bff35ac6a59be67bbd4ab978100c844125ff0fb405a08ba7466922b8 WHIRLPOOL 8262249b5fb7e399641e2e69e9c544ea7b9a56867c8ca6c9dd79758cf5e7a38d505e8ca94e1fc3541eb6521ac1a41aab65084fad27e1aece2b874253e871a0f1
+MISC metadata.xml 380 SHA256 e0a034e321cb7448a1534832a6b7c168c6e69a152154453c773bab859f300b84 SHA512 d806bf2a24b109013cc0dcebbb9bf17a21f0db4fab5a66ac16315c985178de28d0659647d4535123279b2b4ad36f7ee9a9ecf40d2cbb9bb06fbe054a5cfe21c3 WHIRLPOOL fece40d8c49535844bde1de414d0a46f5e2668746569e8a0788ab2622f022837b8df23d1a1a86646eb8b3960c8d815335850714f4b43d5a1e1de93fe94819bda
diff --git a/dev-python/pythondialog/metadata.xml b/dev-python/pythondialog/metadata.xml
new file mode 100644
index 000000000000..c015a85e3f3a
--- /dev/null
+++ b/dev-python/pythondialog/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pythondialog</remote-id>
+		<remote-id type="pypi">python2-pythondialog</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pythondialog/pythondialog-3.2.2.ebuild b/dev-python/pythondialog/pythondialog-3.2.2.ebuild
new file mode 100644
index 000000000000..69af5d8f70ed
--- /dev/null
+++ b/dev-python/pythondialog/pythondialog-3.2.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_4 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
+HOMEPAGE="http://pythondialog.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pythondialog//${PV}/python3-${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ia64 ppc sparc x86"
+IUSE="doc examples"
+
+RDEPEND="dev-util/dialog"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild b/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild
new file mode 100644
index 000000000000..04baa8e3c99f
--- /dev/null
+++ b/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
+HOMEPAGE="http://pythondialog.sourceforge.net/ https://pypi.python.org/pypi/python2-pythondialog"
+SRC_URI="mirror://pypi/${PN:0:1}/python2-${PN}/python2-${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="python-2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-util/dialog"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/python2-${P}
+
+python_prepare_all() {
+	sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pythondialog/pythondialog-3.3.0.ebuild b/dev-python/pythondialog/pythondialog-3.3.0.ebuild
new file mode 100644
index 000000000000..22abfc45710f
--- /dev/null
+++ b/dev-python/pythondialog/pythondialog-3.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_{4,5,6} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
+HOMEPAGE="http://pythondialog.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pythondialog//${PV}/python3-${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ~sparc x86"
+IUSE="doc examples"
+
+RDEPEND="dev-util/dialog"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pythondialog/pythondialog-3.4.0.ebuild b/dev-python/pythondialog/pythondialog-3.4.0.ebuild
new file mode 100644
index 000000000000..35c80c28d2df
--- /dev/null
+++ b/dev-python/pythondialog/pythondialog-3.4.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
+HOMEPAGE="http://pythondialog.sourceforge.net/ https://pypi.python.org/pypi/python2-pythondialog"
+SRC_URI="mirror://pypi/${PN:0:1}/python2-${PN}/python2-${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="python-2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-util/dialog"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/python2-${P}"
+
+python_prepare() {
+	if python_is_python3; then
+		2to3 -w --no-diffs setup.py || die "could not convert to Python 3"
+	fi
+}
+
+python_prepare_all() {
+	sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pythong/Manifest b/dev-python/pythong/Manifest
new file mode 100644
index 000000000000..c5841356165f
--- /dev/null
+++ b/dev-python/pythong/Manifest
@@ -0,0 +1,6 @@
+DIST python.pdf 2547987 SHA256 20e17f365b9f2c5ab0bed656a1ff8797b22b079a238a278674879b807bfd9dd4 SHA512 9d16eb39ff5996be70aa41cb758e73adf1fa72a7e83613626cf6f519def99fd30169a87b1e918902e1aecfb75d925cb7e49d9ad5733dd5274b9a351adaaf201e WHIRLPOOL 47fbcc853901e1df938e20fca1b18adca8985607d1edae60132b5b9490e8f6c1af39733186d079fac32e7e26a28bf7148062e108ad6c748dd110c2860520a49b
+DIST pythonG-2_1_5.tgz 397754 SHA256 6bc89217bfd89717eddd3b27682bb783446bcd3d87ed450e943e0369fa2c9243 SHA512 8a8c3ada425a1d7a0565e495494a8edfcf8b4224cb93ea843669e4d0b2ca9e122d038c728ff8242885e0b320caa6db8ef8f721f99c423b7a8f87a83a4e6f51c6 WHIRLPOOL 072f65639f5a371bf9a27885bc4f515e91f7abe0d6599457f167a7a81e493d8e12bc83d1520d5278421bc34bd1fd6c1c35d849dc653ea8754364c8c81528153e
+EBUILD pythong-2.1.5-r2.ebuild 1308 SHA256 cc1a15be77589a3625225626a1c5bfbceb2334555479257d8a631fc0bc9b5677 SHA512 341e11e27ad91c32063c71e8189ae767662910220da678836c7b8ab643e43f74053597e9ae23cd40f7dc492afb74c68ced54243d7aef319e1714d391f554dad8 WHIRLPOOL 7a318850ba028b4e4522c4792328db3b6c37b956c7ab9c449ae5c8a807c07492715fb60e79e087ec3f67c1d2396cd7a91da5740fb7f04f9d0ac043c31bde2d26
+MISC ChangeLog 2656 SHA256 0e07786b330daa594286bbd3a55205b63ad0e1a830a0cb79707ad3a4b97d6bd2 SHA512 84a210aa417cf67f969e987b0316a3927230d03b9440ff9711d6a5f48b05f413d97af30fcb9319c141be4dcd9031dfbe1fcd7773812ba5b5ebe0643561725c64 WHIRLPOOL b1b6d06ffc7fc955dafd518808ba1c3d804564e8fc0c37f090f0e2c84a74dead1d468d796e34d4afc5bba9cc662c5d0720908567050614ca89a7559e5f7e42d5
+MISC ChangeLog-2015 3652 SHA256 ad47de035d4c23764903317e5a42b3065227d2919bf4c32df99bde604eda87b2 SHA512 9d899b7480888ec6f3a87e5455f9ddb5593c6fe0c88d41843e43e38439147c2c96ba52a41d593c83e05dd7b698e014b79d2238107039bfcbb5068549e286fff6 WHIRLPOOL 507e9540023bd4afbbe44ffd6cbbe97928eb33bbd8a4b80d6fd5aee7183edee84ecbb5fd11895a822a69eedab5db92da077e6dc7b51d01fbd8e7acc558e00af8
+MISC metadata.xml 246 SHA256 634432e12556106844e569b7ff16962881c6e70887e6fc9650bdd82deb51a834 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc WHIRLPOOL 869ef1c8e23bdae0a11b44ccf38ddec23f0dc0ae2573bc83ccbe2d8a2c6bf5a3f9c3c52149aa2e3690dd66f7fc7ec498f2eb6b9d338440fb54c12d5ac0b9fb7a
diff --git a/dev-python/pythong/metadata.xml b/dev-python/pythong/metadata.xml
new file mode 100644
index 000000000000..e24dd86faa2a
--- /dev/null
+++ b/dev-python/pythong/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/pythong/pythong-2.1.5-r2.ebuild b/dev-python/pythong/pythong-2.1.5-r2.ebuild
new file mode 100644
index 000000000000..fa40cbcd91b9
--- /dev/null
+++ b/dev-python/pythong/pythong-2.1.5-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk"
+
+inherit python-single-r1
+
+MY_PN="pythonG"
+MY_PV=${PV/_/-}
+MY_PV=${MY_PV//\./_}
+
+DESCRIPTION="Nice and powerful spanish development environment for Python"
+HOMEPAGE="http://www3.uji.es/~dllorens/PythonG/principal.html"
+SRC_URI="
+	http://www3.uji.es/~dllorens/downloads/pythong/linux/${MY_PN}-${MY_PV}.tgz
+	doc? ( http://marmota.act.uji.es/MTP/pdf/python.pdf )"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ia64 x86"
+SLOT="0"
+IUSE="doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-lang/tk-8.3.4:0=
+	virtual/python-pmw[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+src_prepare() {
+	sed \
+		-e "s:^\(fullpath = \).*:\1'$(python_get_sitedir)':" \
+		-e "/^url_docFuncPG/s:'+fullpath+':/usr/share/doc/${PF}:" \
+		-i pythong.py || die "sed in pythong.py failed"
+}
+
+src_install() {
+	python_domodule modulepythong.py libpythong
+	python_doscript pythong.py
+
+	dodoc leeme.txt
+	insinto /usr/share/doc/${PF}
+	doins -r {LICENCIA,MANUAL,demos}
+	rm -fr "${ED}/usr/share/doc/${PF}/demos/modulepythong.py" || die
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins "${DISTDIR}"/python.pdf
+	fi
+	python_optimize
+}
diff --git a/dev-python/pythonmagick/Manifest b/dev-python/pythonmagick/Manifest
new file mode 100644
index 000000000000..40c2751daabc
--- /dev/null
+++ b/dev-python/pythonmagick/Manifest
@@ -0,0 +1,9 @@
+AUX pythonmagick-0.9.10-Makefile.am.patch 515 SHA256 39618587cdbb95b04f07c059c5d1abab220962d79e4ac16cd40dc22472e49229 SHA512 f66a6c99faf6c3424b1be722814855345011335840c9605eae77c94ed58eeeabaee2168245572fc880f6640c8822bb4426d61decf800c1179bf7d03cb505271f WHIRLPOOL dcdb6e613aa036bc45c480e2f53d2a6774dbe136a212854657dc79528eea1a43978aaa646d3b593e36bfddc40edbfe332ee5fcdb367c49d8b9e2d66de738c256
+AUX pythonmagick-0.9.10-ax_boost_python.patch 930 SHA256 ebacdf272a7d5139591d21e5dcba3bb2ba6089fbf4304f3b3729f2d9b2401a8c SHA512 71c63fe4e01f9f6bab8eb661175202b3054baed68b1b4fe81953034d4d7360196cd8376aaa6341b977470ab6e52351020d784efbc68d9fc8a5eb933641a3a19c WHIRLPOOL e9f8ab813b349ef77662b349af0ad1dedd6243300a1be9f2970a57f2f4ea9819e823b1544d476bf4cf297dd09c66eb38b5b2e0778ced09ed40b3702efbbf9b72
+DIST PythonMagick-0.9.14.tar.xz 270488 SHA256 42fc1fc0def8a9fa0af282c1ba330831d7ba310b5d7dc7b0f03c0536a26b93ba SHA512 a09696d8ebe3c8d38a9148e6f812c149d34fbe1dbe64ecf07b43e153b3c7fd97738491818dec348072ff96e54ac0eddd17eff75c5cef8df21a8a89f58e918e98 WHIRLPOOL dcdd3b78c9b425cefbc8f05b0e3af9be9fa217c5175788ce75d44c985a86fb7c73d85d0e6b41e344685d78db2b66a9ea820b1f30a7fd8e30290e08b22fd20d71
+DIST PythonMagick-0.9.17.tar.xz 271844 SHA256 34aeaab51268432c25f68b36fbd5daca97c0d564cb61c761b018731516d0711e SHA512 e50e5e0d27f2dc8ccd1b251a0311ecca825423b34e85a257bfce42696c4a285977ffb8bade487fb8a3a4f8cad26d0a41fc067b172b733d0c48e951a27badded7 WHIRLPOOL cacbbc04ce0d6ec32ef27e9829a49e88841073ca92b16f636d8111cdd862f163aee77c3191bcaf4b18bc699514fb61e616e8b5ce9960c5a4dc78aa6f78f3711c
+EBUILD pythonmagick-0.9.14.ebuild 1289 SHA256 8743ffc49e560b9e5995aca608ecc494af1bcd0cf110c63264c99ed8ac376b65 SHA512 789fa7c46bb7c1fe72e6ff6e477de308560caf008d1077b309ef7c7491e6a15dfa5ada283b267e7b4b671502262e79d86b61c6594aa3898b01ed3f32b20f82f2 WHIRLPOOL fc364e685766d6c5536d14e723f9a70082d05e8ff3e4b6ea9c20b04d7d96d44afc77b41e459ed4165995dee5cd6843e2e84e955aa9a799bd8099611ae9975e77
+EBUILD pythonmagick-0.9.17.ebuild 1263 SHA256 26af262aed10122e9a23cb3c5e4de9f80a897fdc41d601fd843632f530711193 SHA512 b0f1c8a0114963115c23f093a86a83f48cd09b311abf9103be4f8cc9c15987fbf8f1faf2637b852b89c0e60f5d1df15170c8e7ff8867f3d82bc4f1c54ffbd725 WHIRLPOOL a834f9446f76355a3abaf2bf232e4cef05c9348ee22c8f0c2408b92e6c2b7352ba5611e8a5f31b231b3988f4e234bd24dde721ae3ffe5c157bffa8a2b5f1025e
+MISC ChangeLog 3505 SHA256 4e8e376ed429dd07344365987b8e0dfc91fda57b23dddb2f9e0541b651440a36 SHA512 8fa6ba15acd9e2260b4c3f6fb66fa12376364708e1a414bb8161634b9e2566ed52e3f9e9cb29907133de5cc998365b58bdd7ead78acb0afa7b657a97ef5321c7 WHIRLPOOL 8312f1db50425ee10dc5d33f89d21c3c849af23567ff9057d32006f1ad74cc2a057daf811659867cdce7546cbd2b4a1e93cf6885a8c65d060a40b1ac6e972f0f
+MISC ChangeLog-2015 8637 SHA256 7a554d66354b31be8078eee9dc4c57ee2340b55f8713a7623f885a6485ed4dcd SHA512 797321bdf9e80c809f0bf233125e46e4f20d3b44ed095d809104f659105967acd0cb52696ffc495acc5fba34a507ea66130169617e96174fc6928cb2022a5b30 WHIRLPOOL a585c398f0ebbbcdb5383741742012943de0429580a24e827fcd920ded8ba1c1e98c7a2a6372a48a9c7a0c9fd3f61f20f63dd46e4d2c198492864a938c86e755
+MISC metadata.xml 349 SHA256 b992ba0229d7dedd09f3619c780f1421c98862bb3fe6f9784b78de058c963fe3 SHA512 14d5899e6fcd0ade11aec2f92cfce123a9c1093877e340e49baddfbbde0ca2b3052dc77181e4487c19bb3e4ef7391bc0171b5e26b004517f6f26254c73393a58 WHIRLPOOL 34a1ab59e985a11160c5534ac68f87f205f16adaf65484a43acb9c9418c250b8297e96e1b48e07c05e78a32600b91afdbacfd0669def4c269b44b42373e75342
diff --git a/dev-python/pythonmagick/files/pythonmagick-0.9.10-Makefile.am.patch b/dev-python/pythonmagick/files/pythonmagick-0.9.10-Makefile.am.patch
new file mode 100644
index 000000000000..760aa2293f27
--- /dev/null
+++ b/dev-python/pythonmagick/files/pythonmagick-0.9.10-Makefile.am.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -27,7 +27,7 @@
+ _PythonMagick_la_LDFLAGS = -avoid-version -module $(BOOST_LDFLAGS)
+ 
+ # And the libraries to include
+-_PythonMagick_la_LIBADD = pythonmagick_src/libpymagick.la helpers_src/libhelper.la $(BOOST_LDFLAGS) -lboost_python $(MAGICKPP_LIBS) $(MAGICK_LIBS)
++_PythonMagick_la_LIBADD = pythonmagick_src/libpymagick.la helpers_src/libhelper.la $(BOOST_LDFLAGS) $(BOOST_PYTHON_LIB) $(MAGICKPP_LIBS) $(MAGICK_LIBS)
+ 
+ EXTRA_DIST = autogen.pl SConstruct pyste_src LICENSE
+ 
diff --git a/dev-python/pythonmagick/files/pythonmagick-0.9.10-ax_boost_python.patch b/dev-python/pythonmagick/files/pythonmagick-0.9.10-ax_boost_python.patch
new file mode 100644
index 000000000000..0cc3e8cf64f0
--- /dev/null
+++ b/dev-python/pythonmagick/files/pythonmagick-0.9.10-ax_boost_python.patch
@@ -0,0 +1,18 @@
+--- a/m4/ax_boost_python.m4
++++ b/m4/ax_boost_python.m4
+@@ -82,10 +82,11 @@
+      ax_python_lib=$with_boost_python
+      ax_boost_python_lib=boost_python-$with_boost_python
+    fi])
+-  BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+-  for ax_lib in `ls $BOOSTLIBDIR/libboost_python*.so* $BOOSTLIBDIR/libboost_python*.dylib* $BOOSTLIBDIR/libboost_python*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_python.*\)\.so.*$;\1;' -e 's;^lib\(boost_python.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_python.*\)\.a.*$;\1;' ` $ax_python_lib $ax_boost_python_lib boost_python; do
+-    AC_CHECK_LIB($ax_lib, exit, [BOOST_PYTHON_LIB=$ax_lib break], , [$PYTHON_LDFLAGS])
+-  done
++  LDFLAGS_SAVED="$LDFLAGS"
++  LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
++  export LDFLAGS
++  AC_CHECK_LIB($ax_python_lib, exit, [BOOST_PYTHON_LIB=-l$ax_python_lib], , [$PYTHON_LDFLAGS])
++  LDFLAGS="$LDFLAGS_SAVED"
+   AC_SUBST(BOOST_PYTHON_LIB)
+ fi
+ ])dnl
diff --git a/dev-python/pythonmagick/metadata.xml b/dev-python/pythonmagick/metadata.xml
new file mode 100644
index 000000000000..8dfa66390445
--- /dev/null
+++ b/dev-python/pythonmagick/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  An object-oriented Python interface to ImageMagick.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pythonmagick/pythonmagick-0.9.14.ebuild b/dev-python/pythonmagick/pythonmagick-0.9.14.ebuild
new file mode 100644
index 000000000000..4c141e9c37f6
--- /dev/null
+++ b/dev-python/pythonmagick/pythonmagick-0.9.14.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+WANT_AUTOMAKE="1.12"
+
+inherit autotools eutils python-r1
+
+MY_PN="PythonMagick"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python bindings for ImageMagick"
+HOMEPAGE="http://www.imagemagick.org/script/api.php"
+SRC_URI="mirror://imagemagick/python/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
+	>=media-gfx/imagemagick-6.9.1
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.10-Makefile.am.patch
+	"${FILESDIR}"/${PN}-0.9.10-ax_boost_python.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	python_copy_sources
+}
+
+src_configure() {
+	python_configure() {
+		if ! python_is_python3; then
+			local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+		fi
+		econf \
+			--disable-static \
+			--with-boost-python=boost_python-${EPYTHON#python}
+	}
+
+	python_foreach_impl run_in_build_dir python_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+	prune_libtool_files --modules
+}
diff --git a/dev-python/pythonmagick/pythonmagick-0.9.17.ebuild b/dev-python/pythonmagick/pythonmagick-0.9.17.ebuild
new file mode 100644
index 000000000000..512531606103
--- /dev/null
+++ b/dev-python/pythonmagick/pythonmagick-0.9.17.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit libtool python-r1
+
+MY_PN="PythonMagick"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python bindings for ImageMagick"
+HOMEPAGE="http://www.imagemagick.org/script/api.php"
+SRC_URI="mirror://imagemagick/python/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
+	>=media-gfx/imagemagick-6.9.1
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	elibtoolize
+	python_copy_sources
+}
+
+src_configure() {
+	python_configure() {
+		if ! python_is_python3; then
+			local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+		fi
+		econf \
+			--disable-static \
+			--with-boost-python=boost_python-${EPYTHON#python}
+	}
+
+	python_foreach_impl run_in_build_dir python_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir emake
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir emake check
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-python/pythonutils/Manifest b/dev-python/pythonutils/Manifest
new file mode 100644
index 000000000000..bba54c091b8b
--- /dev/null
+++ b/dev-python/pythonutils/Manifest
@@ -0,0 +1,5 @@
+DIST pythonutils-0.4.0.zip 313577 SHA256 141477cb09ccd51b8a13af746dccbbc16cb0ac7f23187b33e75d4d9fdd4763ea SHA512 1759f1f267a6dfc2252d2a9a90fcf46f6613ee7e9dc60b6484d434443e7bb1dbc748134ec1355dd904a615d1e8a3874386c482a0ca98ffb51cdf3d9fd4f6999c WHIRLPOOL d5e98f51c709849931c9b2e59112208fe5c4d5ad11e472533eb63e6d962479b148fcad396722557f8be010c5d279bfc50ee4883d1f5c06305fade1b107be156d
+EBUILD pythonutils-0.4.0-r1.ebuild 535 SHA256 dcd9f22b361f7616d5a1e57cd8aa95a24713b7f23c3d7d6dc9444172c9b4a95d SHA512 03e9129aa27d14f61ad549881e1ea38859601dcdc2f53240f00f213e4557c8a3aa766eed2ef18f616da07c6b5f5e5fff562e88e6075b8b3a69dd9217463b1b26 WHIRLPOOL 2910c25f0d719848c77da57dc896a25e42123bc4cbfc67c94de1f4a538cb2cc618c56f16565a47d92aeeeed1be50277b6d4e4757b1f286c327270adfcb2dde66
+MISC ChangeLog 2447 SHA256 ca02df150c4b9a19bbcf76d932964daf56796a66ae7a9e147ba595723741fd86 SHA512 130082a5a6e1dd8addca32abae3554d29a0abc292d8bf8a44f81b0440c69dcbe227dcee5dd5560b28b3fc471b8a56f1ef8e54b9bc925849ab900e002426adf83 WHIRLPOOL 8a5f7ba08bd096419f8ecf76f93fca4eb4d17c853f407ddac052e6ac3a47a0e6eed593df2add7654f8f6636c3a2be611e0b15662eae9499904389d185c420184
+MISC ChangeLog-2015 1902 SHA256 a79abd8bac153a4a80841007de4502dd38c1e7ed0421b5203fd1df3a3878c0e6 SHA512 fa24666c91750f37c6d880ed12e099018d137ac412a10187f237b6d04311f8d5033a55e13c26b2664d981f0ab0f8e7c5c5df8f86fcdac804ed8dab027b379a15 WHIRLPOOL 2a06d8fd5370cb0d272307b9408f036569b83f91ec9baf5953591bea3a073b4f690ffa2002e76457b5d2c1757e57d0a9ce0196cff69049b2a8d96d636b498cd6
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/pythonutils/metadata.xml b/dev-python/pythonutils/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/pythonutils/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pythonutils/pythonutils-0.4.0-r1.ebuild b/dev-python/pythonutils/pythonutils-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..68cce676c047
--- /dev/null
+++ b/dev-python/pythonutils/pythonutils-0.4.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Voidspace Python modules"
+HOMEPAGE="http://www.voidspace.org.uk/python/pythonutils.html"
+SRC_URI="http://www.voidspace.org.uk/downloads/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+python_install_all() {
+	dodoc docs/*.txt
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytidylib/Manifest b/dev-python/pytidylib/Manifest
new file mode 100644
index 000000000000..00907050055c
--- /dev/null
+++ b/dev-python/pytidylib/Manifest
@@ -0,0 +1,4 @@
+DIST pytidylib-0.2.4.tar.gz 86650 SHA256 0af07bd8ebd256af70ca925ada9337faf16d85b3072624f975136a5134150ab6 SHA512 443e9af0fd458d4f041e3b72415839838a4edc83f8a978e5cc0bdf53202584e269f1ad5df10967d8ae4b98b24dcffcf9f5a54e0e3f6cd620a8a6a20171da0811 WHIRLPOOL c2b4665982333001a44592e7b80ae69926c6e9e1ad0c5f78eb89a1fb3d0f6e80dc1687b34f8f643ce93dc32c521886e0a010b9d63f71e3b98c65b61c5dad7328
+EBUILD pytidylib-0.2.4.ebuild 630 SHA256 f682cdf23d2af1dd78cd106df7503a65732692f4837abdc510658c01b25e95c2 SHA512 a66aacd2afeae150aaebc9d007e42cd46d0fffd0c9b1279eb7e65049ebf45b5354683f4d34ad1139f6a99a16c6aea539697142dc3088ec4b0872b80c517ab4a1 WHIRLPOOL f5095bdb9e51ba3a75511a8b5c8a33ef2700f61dba379aaf953970020ac59764bc99144b040663787acaaae81f95e03d2828c13a38bea8ed36c3de31e3aacbb5
+MISC ChangeLog 1809 SHA256 c0f722be42aeb5081ed1395ea2dd14d9fb0166ace721adbeb228874258be0584 SHA512 b6f349cba6dd2ca9add47e2c95fd98ab968128c49dfd0a3a266262488fd2d8f8c0e98e6b8d9c4d6f36208690102214767e9604e38df31d69f2cebd8c84c992ab WHIRLPOOL 60faa61c4d61be01df8e6d5f34c3175636271da6cf35c2fccc66abce32c933f40ce8b34d62747f3d0f27e1db4a7e385f349ade7bdbd56cdcac2a1c167dbc9b68
+MISC metadata.xml 385 SHA256 49ede5c804d24dc8c6882b6517fcc570c925d26fc0a5d00e42556d9f8ed58edc SHA512 e41d4897a343c45e469fe4cd52a7ce93d525ea208dd570fe0517feda8f445fa9175d971e4c37b8f1941a7cb6931ff6473526ced82384489f02a11c4040fec933 WHIRLPOOL e4f455f6150a3d3a3318a8d850bd8952a54dec7e77cf924800da1237a7348de5727da0786156a1e6fb64ec8e6fb8bde3daf39a740ede0bd51f16811334a8c21b
diff --git a/dev-python/pytidylib/metadata.xml b/dev-python/pytidylib/metadata.xml
new file mode 100644
index 000000000000..9badc222f9f2
--- /dev/null
+++ b/dev-python/pytidylib/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">countergram/pytidylib</remote-id>
+    <remote-id type="pypi">pytidylib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytidylib/pytidylib-0.2.4.ebuild b/dev-python/pytidylib/pytidylib-0.2.4.ebuild
new file mode 100644
index 000000000000..6e0e640afb9b
--- /dev/null
+++ b/dev-python/pytidylib/pytidylib-0.2.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for HTML Tidy (tidylib)"
+HOMEPAGE="http://countergram.com/open-source/pytidylib https://github.com/countergram/pytidylib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="test"
+
+RDEPEND="app-text/htmltidy"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest )"
+
+python_test() {
+	py.test -vv || die
+}
diff --git a/dev-python/pytoml/Manifest b/dev-python/pytoml/Manifest
new file mode 100644
index 000000000000..3a76b02f19dd
--- /dev/null
+++ b/dev-python/pytoml/Manifest
@@ -0,0 +1,4 @@
+DIST pytoml-0.1.14.tar.gz 7679 SHA256 ced2c5d5c240fa96adf2ccbdfa071d51cc80415dd11a4ea800ff0ec987459d34 SHA512 1a608dfa563ebf979bd72b7fad755d3c02afbda6cff99a0ed9a36ca8eecaaea5f89b7b39ff1f5204dd7302e8957c8304dbc4c221e56589c7654edc0fe93f3178 WHIRLPOOL 08c21677b00368b3de54362840179dc5b37e57072ec57799b60ccf59686eee271492aebdbd0ace93db36fdd316d79309b5b6f42c29ea39e976c32946850e2975
+DIST toml-test-fa9501a192b7c46b82059caddaef978e3de883dc.tar.gz 16627 SHA256 a097166292d39e69b8d95f20d67e3609e48b96d88a11e76382e1e5e8e099209d SHA512 fea37ebf547633016a83c8e59e7d01a8df2e2795fdb8954246d10e4763675474e112fc52adfed38d3d8ce25bb5a60ef820f798aec2477b0fb7755f1cd6a66a98 WHIRLPOOL 1e409d25c3a3b3050e4e268579f48cedea9964a148a8931eb02a5577be05cc52066a160ec5ebbd42919efd670b81e6601968df20887e152a724e1fba72db0412
+EBUILD pytoml-0.1.14.ebuild 761 SHA256 d88093960821f89f6cb2640018e5631cbde240f39e7790b283795d5c24269fdd SHA512 f2d2b977649851808b3929aff22580e8108ad1d46e903b272e8a09976066585a3990b673a20462a42bbbc9785a02d64df121256f4ed258a8ccb22620767abff0 WHIRLPOOL d40c08ef587e45594922d1cb5687e178c38f4b56aa73b988c2df88afe659050c845f33e25d6fe38f24f461bbf0eacd88d3af043ad780eab42563eccee2d24949
+MISC metadata.xml 362 SHA256 987e95dc130b715ca66a6e58db6c18f082abac042de60d0a81346f8cacc508c1 SHA512 6122e392ec59d0c033d04e9b5855c28f81993755a1be2b688608a4efecbb6fd3f61fb5a6d41b3af294b1c0beacfd8edec39a454ff2a34ed0db088399301bdc0a WHIRLPOOL ef9e035b59bed369ba9e76a6541b07a631be7cdd18e0f103c06a6c3859e12da6127d756af431ea2660b8b9f52b9a4062874fe4f9fbe5cbc3a188d00ff4cf0ee6
diff --git a/dev-python/pytoml/metadata.xml b/dev-python/pytoml/metadata.xml
new file mode 100644
index 000000000000..0b02f1b3ec21
--- /dev/null
+++ b/dev-python/pytoml/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">avakar/pytoml</remote-id>
+		<remote-id type="pypi">pytoml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytoml/pytoml-0.1.14.ebuild b/dev-python/pytoml/pytoml-0.1.14.ebuild
new file mode 100644
index 000000000000..4fbf49311c5f
--- /dev/null
+++ b/dev-python/pytoml/pytoml-0.1.14.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+TOML_TEST_COMMIT="fa9501a192b7c46b82059caddaef978e3de883dc"
+
+DESCRIPTION="A TOML-0.4.0 parser/writer for Python"
+HOMEPAGE="https://github.com/avakar/pytoml"
+SRC_URI="https://github.com/avakar/pytoml/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/avakar/toml-test/archive/${TOML_TEST_COMMIT}.tar.gz -> toml-test-${TOML_TEST_COMMIT}.tar.gz )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	cp -R ../toml-test-${TOML_TEST_COMMIT}/* test/toml-test/ || die
+	${EPYTHON} test/test.py || die
+}
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
new file mode 100644
index 000000000000..caa689c08ede
--- /dev/null
+++ b/dev-python/pytools/Manifest
@@ -0,0 +1,10 @@
+DIST pytools-2014.3.5.tar.gz 47522 SHA256 62a77a3c1865d5254ce212473da2af04f43d82eb0020ae9a009f97408e74968e SHA512 94d2b51cdd87dd11263fdc7d04040979240dea0e0090da0ff325112df9770aacb0849e20812b90f807024ad3815313bc344307a30add8f6795a70e7ebd6adfaa WHIRLPOOL bc3b4c118627d790a1d5bf07f1a4f9e5a4a76a1b38d43b9e6cd3130b8f8415a87807fef4b82ebda778a255e7ed71616f7c8e515fd20f1dad56bdac28023247bf
+DIST pytools-2016.2.6.tar.gz 49708 SHA256 6dd49932b8f81a8b622685cff3dd515e351a9290aef0fd5d020e4df00c06aa95 SHA512 87faf5221982815ffecf8bbe4a81eb211111aa8f893132cb5ed0d23e3464b651dcd5070589972c5dc7fac7c4dce768dfe4e064d8346e637af4bfff36aea17833 WHIRLPOOL d44ca24506e48b6005e528f4e8f8aec94a5835aa0841b24a55327a915bad102ed8d1367f6be699be27ee8feff2134252f7abfe1c74208eae8f2835a282083bba
+DIST pytools-2017.4.tar.gz 51339 SHA256 8a44ed4402c765ba714f2f50b1418beb093cf64de9475ec68dac488da922b399 SHA512 4f588b725bc478303d539851110ad627baa2768d5d013434ca20e36fa315a842d0f7c3adebd5ae948f642fc5b9ad4940fbe1ee6afeaf0f16c4bc937210e9fa19 WHIRLPOOL 2d6a5c6b680c272836794bbf4bece47f8c93cfae0fec8a27943dbb33c699aef9bc0ed2a86dd2f448062d565ce7923ee95d43ce3fcbd81b1a39d9b157e7ebcc0e
+EBUILD pytools-2014.3.5-r1.ebuild 755 SHA256 e98c7acf3ca31522be56e30f8c96dd6d2eed6e985ecf3ba5b1a5f7edd2f5edf7 SHA512 8853e1390037dc8982df55dfdc5e99b1fbb519ce1ed518b0986ad12154dad3d008e7ef1b1882c982ab7df51479a31cf93df0ce4be69d22057f654fe31a44938c WHIRLPOOL b2ac0e7d3ba62152e8bb3d5c462b9954fe61c9f7ea92fd36fcf7b2a6402c5805229923549647712b46f6ef7be5b397784c05b57337bc6a07b3043af387f5befb
+EBUILD pytools-2016.2.6-r1.ebuild 870 SHA256 a79827867c4b172e7f7609f1ff6f44a16fae1d98f09ea5d017b4d8fc4bef2a92 SHA512 8aee3035a4a800e7ebfdfb9e91960f5ad7f4947f17972f67135a12c4439ae813b270ed51abbd2e9ee2eab3844e6732b19ae7dbee0f851a8ac6b0739c38c10d2d WHIRLPOOL e4818454a380e05179209d85af4c1f8383e0729c3a497455879a0757e54156fef88e78f5a86f582bd6d1d810047c5c384624570cae4dd352e3ad642ddf451668
+EBUILD pytools-2017.4-r1.ebuild 896 SHA256 a614375594bc35369040f7ed7245f1211683a76c462cad6c47078657c885ef0f SHA512 4b4fd63113cbd8f2b4a62c96cef347b729d6f11eb78384f3c819baef31d2e59e5cb677ceb76c3667129ab77fc7a0138ee07eb039610a8432ea4b157cbbe3f64e WHIRLPOOL 043cd4c4d33dc7bbea4bf514951dd79e4c535fc1dd1d9173f816d2ca6f6985faf700ca0e5f50370355ed7004671c0a8618311f990e2ea98f7efa7f488989dc80
+EBUILD pytools-9999.ebuild 867 SHA256 09ab9e57ef42285a5dec369c23612332297dac9ba36c33e5792c24eba05a1b43 SHA512 0e368fa7ad6ac442feee4423689c442fe2d3e322cb6baa74308c44113bd037af16889942b973cb3ef7756616ca730b1c72a42dbffe123caa09569599482a946c WHIRLPOOL 41bd758f1608bdbeb8b688cde15a13e578d7fde6882aee649e2453c146da6634e7dca5eb55c5f9b32f7de96f4000b3e1c1f972460cc3255e1e176c468c18d1c6
+MISC ChangeLog 3004 SHA256 49757a9303b7765b86d297af228d3a5722c53426c5d1616d94485d69faa32a14 SHA512 105a21b596b5f987984f3fa31ff323f19578bd5a997fcba0a1ff2d5bc01ca45b0d6c6ae695cb847c82cf5c37027735f6ba60c19269bf82fa158a5f90c2430b71 WHIRLPOOL 7444f80c8fb573cf9afdf3bcedf68ed6a1b7da92db840a905a5c7a4372ab719ecd5a720375f55c3100891d80e53e95bce89828d626a03a3ee940e2e3ba7824c7
+MISC ChangeLog-2015 4817 SHA256 b08858c764a583a92aaf6d45296e7c713f689a1631937252a052f4fc969ea93f SHA512 59aae82687668353a9a1c7993e77a3514f8fc61d690a8c45df83862627a5677b68ed055871334cc69e5fe5ce2caeace6830af9c591b11befa2e9c840569eabce WHIRLPOOL ba8624e2d3b014652db9f7cf41a6d24ebca17ebd0d60abcd181f41539ee6e1f41f81635917b71b5e5ef4a66f1d1b2e4aa4ac87c86b1b0b0b9c2b8d38d3b78a7b
+MISC metadata.xml 365 SHA256 ba70067f9e9b4a33c5b53dcc8060b05663e32a261a344d0d964faa0500b7ff9e SHA512 5df10be2b52e92d013020a311d433d36b3d98ad030db8ea9d10becf9f1c46d2fc326c1d77cb9f7ec73778fd9716b74468aa2192f003654bf0ebf3b94bf706a5b WHIRLPOOL 0a3e75432a190f71f10587a8910bf0c7e40982b9972b1944d151039e3faa53d06f77e5e8f457524bf12028275faa4b903e3dd24c3df394e18954f2f2acb674a2
diff --git a/dev-python/pytools/metadata.xml b/dev-python/pytools/metadata.xml
new file mode 100644
index 000000000000..b7577277a95a
--- /dev/null
+++ b/dev-python/pytools/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytools</remote-id>
+		<remote-id type="github">inducer/pytools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytools/pytools-2014.3.5-r1.ebuild b/dev-python/pytools/pytools-2014.3.5-r1.ebuild
new file mode 100644
index 000000000000..5a1dadda3c3d
--- /dev/null
+++ b/dev-python/pytools/pytools-2014.3.5-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of tools missing from the Python standard library"
+HOMEPAGE="https://mathema.tician.de/software/pytools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-0.7.2[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytools/pytools-2016.2.6-r1.ebuild b/dev-python/pytools/pytools-2016.2.6-r1.ebuild
new file mode 100644
index 000000000000..380608c14d90
--- /dev/null
+++ b/dev-python/pytools/pytools-2016.2.6-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of tools missing from the Python standard library"
+HOMEPAGE="https://mathema.tician.de/software/pytools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	>=dev-python/setuptools-0.7.2[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytools/pytools-2017.4-r1.ebuild b/dev-python/pytools/pytools-2017.4-r1.ebuild
new file mode 100644
index 000000000000..c4c9c02a72b1
--- /dev/null
+++ b/dev-python/pytools/pytools-2017.4-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="https://mathema.tician.de/software/pytools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	>=dev-python/setuptools-0.7.2[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytools/pytools-9999.ebuild b/dev-python/pytools/pytools-9999.ebuild
new file mode 100644
index 000000000000..20b83f7f35d8
--- /dev/null
+++ b/dev-python/pytools/pytools-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="A collection of tools missing from the Python standard library"
+HOMEPAGE="https://mathema.tician.de/software/pytools/"
+EGIT_REPO_URI="https://github.com/inducer/pytools"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	>=dev-python/setuptools-0.7.2[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytrie/Manifest b/dev-python/pytrie/Manifest
new file mode 100644
index 000000000000..d20ad7a6ef8c
--- /dev/null
+++ b/dev-python/pytrie/Manifest
@@ -0,0 +1,4 @@
+DIST pytrie-0.3.tar.gz 228709 SHA256 0c1bd0cb7c301b193da4bcf31bdf68bbdbea88be4bea5f680caecc56d9b74020 SHA512 f1dc6f810e51385fa4dcf2cbec76cf7fe5c184208f8d6dccf6212d43260591580126095e68d28ab6c8b01a631e6e16b275fa088643ae81568493ca231dcc6161 WHIRLPOOL a88d6069cc0af607d475fa827dbb8eac847afca342a01dd224a6f253aa0537cba293c5b7c89aa8a2dd8e6682d5f000bef0f9d14dbf2dc07d6dbed3934ac8fccc
+EBUILD pytrie-0.3.ebuild 603 SHA256 d15286b269ae435772f81c16800f17e3ebed0c5897cda014c5d2c55f32929796 SHA512 e7d6cc11c6fcd8415e1506a0dc37b215c8b4acb6e669dd13d5df4d081fa818fa74f1e1b4c7962dcddaaddddb59e22349fd8a1629e94a5f7620820c715da4fb4f WHIRLPOOL 9fccb48b9e59543d674d1934f78aec1bedb329f7afb3a3372d7dbee0d59f87306ce20826b7d508dc1503d5831e78476f4658260fc68c8e54fbb3846c59f5afdb
+MISC ChangeLog 468 SHA256 d990cbd82a7aec22af953c8c5f64be4139e5c1a07f92be4eb38c1e62ae09e065 SHA512 8776f2e5de42a0b72e542188025690dc05bcd83b3aac8048cf6f2459684627983d9e1184e3a483fce5129903fa569b1a431aefbbe98c355024deca00753005bb WHIRLPOOL 85460ec9cc0cd2c5f8a3d6940dc1b5defb96ec472e93d13bc3525531ba5864f5f7ac01847817097515b689c8411e236ba581992ebb020cc45e0c5afc514a9d7e
+MISC metadata.xml 1012 SHA256 a911bd5e65849ac9d3ea50bf069365f7fa30ddf2df799648661b48e30131d62c SHA512 f0aa33c8e8582de94fdc62f53d79f40e5cbc42ed7aef5ba6573e6ac3aebb2853189920cfba8df4276477861639d7ec722ebc702c59f95639e68f298abe62c9d3 WHIRLPOOL 2a44fba52b216479d996fc36d95381994df9e846aa960edd0953d9ed6cea9e97acd84abbc4933797b79e0495a74d30fe9305380facf2707044b1d259dad98e87
diff --git a/dev-python/pytrie/metadata.xml b/dev-python/pytrie/metadata.xml
new file mode 100644
index 000000000000..dbf479be6774
--- /dev/null
+++ b/dev-python/pytrie/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>george.sakkis@gmail.com</email>
+			<name>George Sakkis</name>
+		</maintainer>
+		<remote-id type="pypi">PyTrie</remote-id>
+		<remote-id type="bitbucket">gsakkis/pytrie</remote-id>
+		<remote-id type="github">gsakkis/pytrie</remote-id>
+	</upstream>
+	<longdescription>
+		A *trie* is an ordered tree data structure that is used to store a
+		mapping where the keys are sequences, usually strings over an alphabet.
+		In addition to implementing the mapping interface, tries allow finding
+		the items for a given prefix, and vice versa, finding the items whose
+		keys are prefixes of a given key.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pytrie/pytrie-0.3.ebuild b/dev-python/pytrie/pytrie-0.3.ebuild
new file mode 100644
index 000000000000..543c238f4beb
--- /dev/null
+++ b/dev-python/pytrie/pytrie-0.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="PyTrie"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A pure Python implementation of the trie data structure."
+HOMEPAGE="https://github.com/gsakkis/pytrie/ https://pypi.python.org/pypi/PyTrie"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+DEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
new file mode 100644
index 000000000000..467f4dd560c4
--- /dev/null
+++ b/dev-python/pytz/Manifest
@@ -0,0 +1,10 @@
+AUX 2016.6.1-zoneinfo.patch 569 SHA256 a78b5bd8c4e07776f2436e23c4832b40bd77abb67e0e6fa67c3ef6e08bb67b53 SHA512 d1b2bf717c8099eb5cfbe353d50eb034ed321303f6430c0f4183dd84a64780157615b29b7aaf7c04eb8fe69e48c039e479f22f70f713b2aa5e907ae371c8ba01 WHIRLPOOL 77bfc0ff901fc19588bb4888c6c6f77d0aef142b04a81bac0ae13a90b65e374e0aabd31cecb5791b6947580ae477aca3e02b3cf187864668ba0cf386e0202891
+AUX pytz-2009h-zoneinfo-noinstall.patch 957 SHA256 4f25eeb077fa14f8423b6742de8276b5153f75d97b0f979556cf634a56e4946a SHA512 142d3ac58be3fffc35e2dc1f70ee988a7c9ebec51518d15bee9d36f4d4a08178840fa4d73f9734e92192c3633e517f525a9d583f7b5dc754af83f7c9536bd446 WHIRLPOOL c1a1861f88ee5be2851e4e8a12f1df0c6beac05af1888527d1120ee9a67c3155b4ad5e0d9d3436e46cc6f027f079cf66135422f9576a333801e7597983cfc575
+AUX pytz-2009j-zoneinfo.patch 651 SHA256 5d015c0857cfab9916bb2d3e7de00d12fee5721d5d3556eb5ad049cc350cfd60 SHA512 228d3c59e3e0b5b0b3b80f5b0b6e947815d11191fd5523d17420dde6cea488bc544c05b552619934c4ca72c30ebefd042114abfea6c72f03710e96a776f39038 WHIRLPOOL c5a4565934dae7fd7b9501ff84c72e0707a52bb73c45f8d525da5477995ed226c693c1962b8219aaf964bd69c84df573d520049d8049013b17c694e1a2cece1c
+DIST pytz-2016.3.tar.bz2 170906 SHA256 c193dfa167ac32c8cb96f26cbcd92972591b22bda0bac3effdbdb04de6cc55d6 SHA512 8d91a84500257327361a8ccd19ce2d2e5848c10c7d4105ec1be012be592ec38113611558c7894c1825cc1967303901fce35079fc799cc10e84216864cd00266f WHIRLPOOL b2af20a788fa70c23b04cda3acdff812c30713f00a9aaf2144d85c64341f6fe4e365b558f3f0b5491c6c99ebf633d2d3910c95f7a6ae1f9c53b40da6bcbc23af
+DIST pytz-2017.2.zip 502168 SHA256 f5c056e8f62d45ba8215e5cb8f50dfccb198b4b9fbea8500674f3443e4689589 SHA512 d67d64a64b4c21e0bd41da56020fc7b016aec9da7f3243f79b65704119f70b8a9cd4f5f905631b6761e06ecef93830e5e479e16c7b1611ac70e0cd2b39d5b916 WHIRLPOOL 3a8e5e0c71ba12c8083592582238a17c1db862c1f779e84b4e93dbdadf9f5445d11d7725bc40f8d340569d2374adbf0ef19886c595f2d766a3dd7c57742cda44
+EBUILD pytz-2016.3.ebuild 1008 SHA256 5225cf0302c5218bb4f3e2739dd8d9d12068570347b2cdcb1b4528b5924a63d9 SHA512 acfb68faa2c28b38f6ca8b0a184f0aab55c125ec1eafda8b749d39ed672b46bbbe4e43dbf3d63e8158617ac5e98c691917821a11e364314a7bfe72dc0fd75eb6 WHIRLPOOL 73481d6f013626063f8a2eef826a02417bf400e55da077929b0a677e40f6c9a446eff429e167a6d894747d1a0ab795e136a3fc6dd616710bda1f9a6bb9732642
+EBUILD pytz-2017.2.ebuild 1033 SHA256 9d9e22fb8171cb9ce3323a7c58d4745720a00c60b0184708a93eddcefd7fe28e SHA512 3647051df823d61b9b091ae33bb3f14768fcce6e6fdcc2663950b7c4ce17e5ba5dfbdd0e289fa7a8ee408a36dfee72a10af570580aa76e63aca673360100b9c9 WHIRLPOOL 70eda371b6b0e360ab520d86eda1ab909930ecf5b95bc75644bb9237b0f926228bc021db43884e3c2b01b1a19a30c8494312cc55d5840dc1370215a997b8ede3
+MISC ChangeLog 7090 SHA256 a1c82a57aef600b33f53af9aea3a4211c46760d9d0776287ed19edbc242ae832 SHA512 92fb57ae3779da5ac39afa5dd9559aa297b2aaede9eae5786467ae465dd6725d2eb1718f2459e178e6c7c3afbc422d8625897bf218f62db78039bdaafbf99547 WHIRLPOOL dc95ecfa51a45b469fe5c4c9e3a8412671d9c254f34bd028c028e90e88e89315b27d631fdc917102dd6b23ea4db831d184770a5f5a385495b19f46b2dfe6d3c5
+MISC ChangeLog-2015 23925 SHA256 5d3eedcf346c4124172a300b29a5c16dbe44219f3a2dda1f103afde3302d32a4 SHA512 b613a160e8eabb0b8d967430cb12cc4f978f38d4dba568efebbed2141bffeaa1bc55e50952fa263568998e170c11be83594a7b82faacf00a2453f4e71e1f157e WHIRLPOOL 7a8a692e5eee591692e80b151b78f2a1076fd498f8522c21cfc439c4089606145be92e1fe08bce2813fa19ac67b9a9a34cefde92ff68e69f182969a15a49d7df
+MISC metadata.xml 739 SHA256 48f9d99e4a2b0786cd3a9f85b3ab78522ff768c1ec436b42e3c3a1d752916423 SHA512 b7c9e6ea1b5bd128f1c5ce0a77171d0b7cdbb6f8ffb186d92aa4167d2d84c60c28c647cae66ffc7532350bca13ab65aaab5eb441f68321fc786a14b90f8813e8 WHIRLPOOL f892689ad05404787558af6ac507205a2e6ca2579b99d242f6cf8cc0036a30dedd600ca2d491aeee704635235a2b7d8f7bed9108711819240d2eec6b25a7a7a1
diff --git a/dev-python/pytz/files/2016.6.1-zoneinfo.patch b/dev-python/pytz/files/2016.6.1-zoneinfo.patch
new file mode 100644
index 000000000000..d8223da436cf
--- /dev/null
+++ b/dev-python/pytz/files/2016.6.1-zoneinfo.patch
@@ -0,0 +1,12 @@
+--- a/pytz/__init__.py
++++ b/pytz/__init__.py
+@@ -81,8 +81,7 @@
+     for part in name_parts:
+         if part == os.path.pardir or os.path.sep in part:
+             raise ValueError('Bad path segment: %r' % part)
+-    filename = os.path.join(os.path.dirname(__file__),
+-                            'zoneinfo', *name_parts)
++    filename = os.path.join('/usr/share/zoneinfo', *name_parts)
+     if not os.path.exists(filename):
+         # http://bugs.launchpad.net/bugs/383171 - we avoid using this
+         # unless absolutely necessary to help when a broken version of
diff --git a/dev-python/pytz/files/pytz-2009h-zoneinfo-noinstall.patch b/dev-python/pytz/files/pytz-2009h-zoneinfo-noinstall.patch
new file mode 100644
index 000000000000..2e9709579883
--- /dev/null
+++ b/dev-python/pytz/files/pytz-2009h-zoneinfo-noinstall.patch
@@ -0,0 +1,32 @@
+From e43745593e4627de8027587cb3b4a465c93fa0b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 19 Dec 2012 19:22:29 +0100
+Subject: [PATCH] Do not install zoneinfo files.
+
+---
+ setup.py | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index c8152d5..8f13279 100644
+--- a/setup.py
++++ b/setup.py
+@@ -13,15 +13,8 @@ me = 'Stuart Bishop'
+ memail = 'stuart@stuartbishop.net'
+ packages = ['pytz']
+ resources = ['zone.tab', 'locales/pytz.pot']
+-for dirpath, dirnames, filenames in os.walk(os.path.join('pytz', 'zoneinfo')):
+-    # remove the 'pytz' part of the path
+-    basepath = dirpath.split(os.path.sep, 1)[1]
+-    resources.extend([os.path.join(basepath, filename)
+-                     for filename in filenames])
+ package_data = {'pytz': resources}
+ 
+-assert len(resources) > 10, 'zoneinfo files not found!'
+-
+ setup (
+     name='pytz',
+     version=pytz.VERSION,
+-- 
+1.8.0.2
+
diff --git a/dev-python/pytz/files/pytz-2009j-zoneinfo.patch b/dev-python/pytz/files/pytz-2009j-zoneinfo.patch
new file mode 100644
index 000000000000..ee05d9f5efa4
--- /dev/null
+++ b/dev-python/pytz/files/pytz-2009j-zoneinfo.patch
@@ -0,0 +1,14 @@
+Use the system zoneinfo from sys-libs/timezone-data.
+
+--- pytz/__init__.py
++++ pytz/__init__.py
+@@ -54,8 +54,7 @@
+     for part in name_parts:
+         if part == os.path.pardir or os.path.sep in part:
+             raise ValueError('Bad path segment: %r' % part)
+-    filename = os.path.join(os.path.dirname(__file__),
+-                            'zoneinfo', *name_parts)
++    filename = os.path.join('/usr/share/zoneinfo', *name_parts)
+     if not os.path.exists(filename) and resource_stream is not None:
+         # http://bugs.launchpad.net/bugs/383171 - we avoid using this
+         # unless absolutely necessary to help when a broken version of
diff --git a/dev-python/pytz/metadata.xml b/dev-python/pytz/metadata.xml
new file mode 100644
index 000000000000..afe53148fe95
--- /dev/null
+++ b/dev-python/pytz/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  pytz brings the Olson tz database into Python. This library allows
+  accurate and cross platform timezone calculations using Python 2.3
+  or higher. It also solves the issue of ambiguous times at the end of
+  daylight savings, which you can read more about in the Python
+  Library Reference (datetime.tzinfo).
+  Amost all (over 540) of the Olson timezones are supported.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">pytz</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytz/pytz-2016.3.ebuild b/dev-python/pytz/pytz-2016.3.ebuild
new file mode 100644
index 000000000000..9cf855487073
--- /dev/null
+++ b/dev-python/pytz/pytz-2016.3.ebuild
@@ -0,0 +1,34 @@
+# 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 pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="World timezone definitions for Python"
+HOMEPAGE="http://pythonhosted.org/pytz/ https://pypi.python.org/pypi/pytz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	|| ( >=sys-libs/timezone-data-2015g sys-libs/glibc[vanilla] )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# Use timezone-data zoneinfo.
+	"${FILESDIR}"/${PN}-2009j-zoneinfo.patch
+	# ...and do not install a copy of it.
+	"${FILESDIR}"/${PN}-2009h-zoneinfo-noinstall.patch
+)
+
+python_test() {
+	"${PYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytz/pytz-2017.2.ebuild b/dev-python/pytz/pytz-2017.2.ebuild
new file mode 100644
index 000000000000..72e0867714b9
--- /dev/null
+++ b/dev-python/pytz/pytz-2017.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="World timezone definitions for Python"
+HOMEPAGE="http://pythonhosted.org/pytz/ https://pypi.python.org/pypi/pytz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+PATCHES=(
+	# Use timezone-data zoneinfo.
+	"${FILESDIR}"/2016.6.1-zoneinfo.patch
+	# ...and do not install a copy of it.
+	"${FILESDIR}"/${PN}-2009h-zoneinfo-noinstall.patch
+)
+
+python_test() {
+	"${PYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
new file mode 100644
index 000000000000..a7085755c95f
--- /dev/null
+++ b/dev-python/pyudev/Manifest
@@ -0,0 +1,8 @@
+AUX pyudev-0.19.0-skip-non-deterministic-test.patch 3497 SHA256 23234de419e51950247f189a848df93ed47ff1c4846fee108abaa5ab8ec9adca SHA512 23c305242e4df0bd0d4cde458ca1ee129bef36f98f5b7c3b341c4866b7f21a51ffaf07aa56901aeb67ccb59a4ed6548d4799ae2c519e359b627b29e722119a4d WHIRLPOOL a0cd36fbbadd0008e48953b4a2fb42cee1899b58d56c28e6ea712fa7b47e66a11abb2966a0dc8375acf590d813818be4016a4d0e69d6edaed0e903b2a44554ed
+DIST pyudev-0.20.0.tar.gz 93217 SHA256 14d85bc9611dbf798732996cb7107858f58a3a1b9d246e4063c7a20ade65842a SHA512 e86a776a2b6d29f206cdd0057c6f9b1e705d981ec8c2de49259887647856531af68238b80751102a3ffc8cea6f234cc520d62c8bc2da686e453ed010da3ebb02 WHIRLPOOL 8344c668c1cc2e7971a67d0e628e3ce96254648ad06b48f260dd4ee54e3e205e533e59b692169b38dd656c08d8cd615d0c7c518b5c2a785553b8c6468e70520c
+DIST pyudev-0.21.0.tar.gz 89469 SHA256 094b7a100150114748aaa3b70663485dd360457a709bfaaafe5a977371033f2b SHA512 ba5b6156768b65b9655d809b14378b01173643781b9c4017271e880cdfed442c44ac49eb26c970e4275b820e01678e3001870591fccf88dc713ec941e2b85d11 WHIRLPOOL e69865d8b33ab103e0ff6371df4e05617c3907cbfc98d508285c7464065ccace6dc7d4e963035e19392e6ab39881281e684ddd4f7765fc599874411204ea825b
+EBUILD pyudev-0.20.0.ebuild 1667 SHA256 fc299cdcb278821d5cee6197f13252ec5817bc729f70deb6e181910c067a52fd SHA512 592c4d063140a2946bd029d1a6df488e839b9ea75b506266f21f1d5d394487db5e41a5b6d0d3f06ae96472982affb342de65d0f7e810a94d9a895447369dce2d WHIRLPOOL 781e03182510eecf10317e7114c755dea352bf76e0491a0a32e83ffe1440c65edd34fc0fa512d9de4880b39c0b61ba65f5a9c7b0dba077995e361ae309d5faee
+EBUILD pyudev-0.21.0.ebuild 1576 SHA256 431546861b91dc6ef77a8be0c8fd41738adb5fbf7243465bebf26764c630d198 SHA512 c3fe3e8221ad9945d3f5de545ac29ef2ab3f9910f998368da18fa00c6bd1095bee8b53b5a39726591b5de908c51288f1d0b70e7139e28d34260fd88540018c15 WHIRLPOOL 5eaa71bc0ba067a080bebfbc64780dc705f779a2d804598f9bfaae5abb57a978c58304bc73a00a1105f29e767ed12ac7f8dd77ac937d4268d41d903e2f0aac25
+MISC ChangeLog 3330 SHA256 ee079ba020b4d49d9a77ec912393c6584afbef3596d21ab2382f1bf13d37d94c SHA512 a97a48b1dc13a46268a1fb8f356734cf8b9a52eddb6600c46e7e3f2be94f09ccfcee613b27c28d040ba0bcf8ba692ef663fae63461af97d12bd94f13b7d867bf WHIRLPOOL 12945286dc0db29ca33f193d068453dd8fb6429a93270eaa6a8b802f17989251dd671a83fca91ec2bb89003c0eab9048bde8617c5dc18fcb7496faceb1b35c9f
+MISC ChangeLog-2015 4328 SHA256 85cf75a6b238c78b5d9a6e8dafe90da22bbcc423d21df631354662cf7a58038c SHA512 4f592b66eb0754a17dd28e60be6f8c232359c3cbf9c2b0459747e38bdc03b86324fa863458f0e2bb477b09d1721f77fe80ec82916e8928d650ccc9e470285194 WHIRLPOOL faaf9576962b54c20d66e9214bc65828df35d63e7b0ef0d7f6ae282efd51fc84a0833c0b63989ce194e5c4b879789058aacb704d083a58268bd2a07fc822da6a
+MISC metadata.xml 754 SHA256 83072935dc9c93cf7caa54b8794b679ab7f4bfdfb6ef8bc4badec73563091204 SHA512 e0ed712734759c1710ea8bd2cd9ba1c39801a4355da7ec53a5cc0cec2ac375ee19ca557fb3a13895a2ea7d6ce56b216501106e3fd216281a4f60776aca020170 WHIRLPOOL c9a742e3ddb6ba3197cc0bb2b332d24bedad9d43657ba866bfe2d954dd857cd6c67f9ca0d3711fa93e65f590226a5b6bdc001917dead58ff457e175a6e8f594c
diff --git a/dev-python/pyudev/files/pyudev-0.19.0-skip-non-deterministic-test.patch b/dev-python/pyudev/files/pyudev-0.19.0-skip-non-deterministic-test.patch
new file mode 100644
index 000000000000..268d2bdf1b4c
--- /dev/null
+++ b/dev-python/pyudev/files/pyudev-0.19.0-skip-non-deterministic-test.patch
@@ -0,0 +1,78 @@
+diff --git a/tests/_device_tests/_attributes_tests.py b/tests/_device_tests/_attributes_tests.py
+index 54d8ae6..84e26c3 100644
+--- a/tests/_device_tests/_attributes_tests.py
++++ b/tests/_device_tests/_attributes_tests.py
+@@ -88,6 +88,7 @@ def test_non_iterable(self, a_device):
+         with pytest.raises(TypeError):
+             a_device.attributes['key']
+ 
++    @pytest.mark.skipif(True, reason='Non-deterministic')
+     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
+     @settings(max_examples=5)
+     def test_asstring(self, a_context, device_datum):
+@@ -99,6 +100,7 @@ def test_asstring(self, a_context, device_datum):
+             assert is_unicode_string(device.attributes.asstring(key))
+             assert device.attributes.asstring(key) == value
+ 
++    @pytest.mark.skipif(True, reason='Non-deterministic')
+     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
+     @settings(max_examples=5)
+     def test_asint(self, a_context, device_datum):
+@@ -115,6 +117,7 @@ def test_asint(self, a_context, device_datum):
+             else:
+                 assert device.attributes.asint(key) == value
+ 
++    @pytest.mark.skipif(True, reason='Non-deterministic')
+     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
+     @settings(max_examples=5)
+     def test_asbool(self, a_context, device_datum):
+diff --git a/tests/_device_tests/_device_tests.py b/tests/_device_tests/_device_tests.py
+index 92a767d..175c611 100644
+--- a/tests/_device_tests/_device_tests.py
++++ b/tests/_device_tests/_device_tests.py
+@@ -378,6 +378,7 @@ def test_getitem_nonexisting(self, a_device):
+             a_device['a non-existing property']
+         assert str(excinfo.value) == repr('a non-existing property')
+ 
++    @pytest.mark.skipif(True, reason='Non-deterministic')
+     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
+     @settings(max_examples=5)
+     def test_asint(self, a_context, device_datum):
+@@ -391,6 +392,7 @@ def test_asint(self, a_context, device_datum):
+             else:
+                 assert device.asint(property) == value
+ 
++    @pytest.mark.skipif(True, reason='Non-deterministic')
+     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_DEVICE_DATA))
+     @settings(max_examples=5)
+     def test_asbool(self, a_context, device_datum):
+diff --git a/tests/_device_tests/_devices_tests.py b/tests/_device_tests/_devices_tests.py
+index 8eb8069..b80e550 100644
+--- a/tests/_device_tests/_devices_tests.py
++++ b/tests/_device_tests/_devices_tests.py
+@@ -189,8 +189,8 @@ def test_from_device_file(self, a_context, device_datum):
+ 
+     _device_data = [d for d in _DEVICE_DATA if list(d.device_links)]
+     @pytest.mark.skipif(
+-       len(_device_data) == 0,
+-       reason='no device with a device node'
++       True,
++       reason='non deterministic'
+     )
+     @given(_CONTEXT_STRATEGY, strategies.sampled_from(_device_data))
+     @settings(max_examples=5, min_satisfying_examples=1)
+diff --git a/tests/test_discover.py b/tests/test_discover.py
+index dd336d5..c410a64 100644
+--- a/tests/test_discover.py
++++ b/tests/test_discover.py
+@@ -155,8 +155,8 @@ def test_name(self, a_device):
+ 
+     _devices = [d for d in _DEVICES if list(d.device_links)]
+     @pytest.mark.skipif(
+-        len(_devices) == 0,
+-        reason="no device with device links"
++        True,
++        reason='Non-deterministic'
+     )
+     @given(strategies.sampled_from(_devices))
+     @settings(max_examples=NUM_TESTS, min_satisfying_examples=1)
diff --git a/dev-python/pyudev/metadata.xml b/dev-python/pyudev/metadata.xml
new file mode 100644
index 000000000000..f42881a0924b
--- /dev/null
+++ b/dev-python/pyudev/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		pyudev is a Python binding to libudev, the hardware management library
+		and service found in modern linux systems.
+	</longdescription>
+	<use>
+		<flag name="pygobject">Install PyGobject bindings</flag>
+		<flag name="qt4">Install PyQt4 bindings</flag>
+		<flag name="qt5">Install PyQt5 bindings</flag>
+		<flag name="pyside">Install PySide bindings</flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">pyudev</remote-id>
+		<remote-id type="github">pyudev/pyudev</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyudev/pyudev-0.20.0.ebuild b/dev-python/pyudev/pyudev-0.20.0.ebuild
new file mode 100644
index 000000000000..0cd4b8380612
--- /dev/null
+++ b/dev-python/pyudev/pyudev-0.20.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python binding to libudev"
+HOMEPAGE="http://pyudev.readthedocs.org https://github.com/pyudev/pyudev"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 x86"
+IUSE="pygobject qt4 pyside test"
+
+RDEPEND="virtual/udev
+	dev-python/six[${PYTHON_USEDEP}]
+	pygobject? ( dev-python/pygobject:2[$(python_gen_usedep 'python2*')] )
+	qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
+	pyside? ( dev-python/pyside[$(python_gen_usedep '!(python3_3)')] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( CHANGES.rst README.rst )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.19.0-skip-non-deterministic-test.patch"
+)
+
+REQUIRED_USE="pygobject? ( || ( $(python_gen_useflags 'python2*') ) )
+	pyside? ( || ( $(python_gen_useflags '!(python3_3)') ) )"
+
+python_prepare_all() {
+	if use test; then
+		ewarn "If your PORTAGE_TMPDIR is longer in length then '/var/tmp/',"
+		ewarn "change it to /var/tmp to ensure tests will pass."
+	fi
+
+	# tests are known to pass then fail on alternate runs
+	# tests: fix run_path
+	sed -i -e "s|== \('/run/udev'\)|in (\1,'/dev/.udev')|g" \
+		tests/test_core.py || die
+
+	# test needs needs newer dev-cpp/gccxml
+	rm -f tests/test_libudev.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pyudev/pyudev-0.21.0.ebuild b/dev-python/pyudev/pyudev-0.21.0.ebuild
new file mode 100644
index 000000000000..ac3b0ab16602
--- /dev/null
+++ b/dev-python/pyudev/pyudev-0.21.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python binding to libudev"
+HOMEPAGE="http://pyudev.readthedocs.org https://github.com/pyudev/pyudev"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="pygobject qt4 qt5 pyside test"
+REQUIRED_USE="pygobject? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+RDEPEND="virtual/udev
+	dev-python/six[${PYTHON_USEDEP}]
+	pygobject? ( dev-python/pygobject:2[$(python_gen_usedep 'python2*')] )
+	qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
+	qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
+	pyside? ( dev-python/pyside[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( CHANGES.rst README.rst )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.19.0-skip-non-deterministic-test.patch"
+)
+
+python_prepare_all() {
+	if use test; then
+		ewarn "If your PORTAGE_TMPDIR is longer in length then '/var/tmp/',"
+		ewarn "change it to /var/tmp to ensure tests will pass."
+	fi
+
+	# tests are known to pass then fail on alternate runs
+	# tests: fix run_path
+	sed -i -e "s|== \('/run/udev'\)|in (\1,'/dev/.udev')|g" \
+		tests/test_core.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
new file mode 100644
index 000000000000..78602a8a4063
--- /dev/null
+++ b/dev-python/pyusb/Manifest
@@ -0,0 +1,5 @@
+DIST PyUSB-1.0.0.tar.gz 52559 SHA256 5b34ffa74ac34f330bff949c94ee00ec4a9d147234db17ee2eed2a67c0275368 SHA512 a66cd9e3c95d0ee0959667866101f089d5ba5d425a930cc32fdf679f8c1fde8681aaf464efc96cbdad99fbae9f72086c4704f857c757b12e4ce2016e3451dcc0 WHIRLPOOL c93d3bb289646fc06bebadb7d2d5677d685e49756bbcd4ebf01e0eaec30620fbb3f7d925d3f11b9c8cb1d1af87fb357c27f0266c86b83a2c30aa001787f994ac
+EBUILD pyusb-1.0.0.ebuild 593 SHA256 0c759ce4849571fa0b76697feee27347e725e73f54da279415dbd10731a8e3f1 SHA512 754c715921ec8132f52f77005c63871e6c09fab669195de3de76981d86378c2218c83bdebaad97a2db5e7287b86f34fbb978bed14cc960fe7a6c43beecf670f8 WHIRLPOOL d6ce526f88dbb95db6a8e59d70dcacd38445c83d19c1ce84004b1904a951549f1f8bcfb75e12520a1f80be641562922d69763731a344091fea8779c789dfb633
+MISC ChangeLog 3721 SHA256 0cfa7e54ad5bd2bad5d7bf7e2f6d1a58ee625a4e0085d8bc0e045788ab531e3e SHA512 0272193e34945ada3b9e003f5781f8ed2563301ef7b19267875ec7a9326ab16d3bf80865f94de7da353c00fc5aada534aaadc81b370b313ea6410d6940c2fc6f WHIRLPOOL 7bcaa42f11bc2c41a36145d51468177ad9dd3a55c816ec59aab999b8df1944336028ebde0b994c60a3dd1616bc6de64de5ff6a0b8fdd0df56e7ce2974c6db9c4
+MISC ChangeLog-2015 2902 SHA256 c523e67082d9810dcaaa8de7d2503bbf1737806d13ef02245c068be986ffd842 SHA512 46618df6229383f0a8ed505451c1cbf86095af84301d1864baa767cee6bc494d730a6c78a491be21848ed973be16381985132ed6ec2e8efa694985a8fe8ed5e4 WHIRLPOOL 8d6041f959fcbac2bd32cb23276cd6db48166d058ac37d1dcd78ed605ff2e6ff0d4116baf82bb6413610b77515334eee8217644f507d2f1fc9d615136bddcc0b
+MISC metadata.xml 471 SHA256 a536667938aa97d4d1eef3866ff2bf785e2b16bf5f5aea367d23b0b778a49a93 SHA512 ea70dfe350e02b1e0b16bed27aec5eae3ec12f8161b5d8c423391a8ef3d05ae1ba3e7998f74bc6db94b1c5b9487aafdced020551d5c520ef0b9a1f9d0986d0c6 WHIRLPOOL 41987052f72b60452ab63897002e50a77db94c881df5252c2abf8eef682bd9efd5134551c7422d37bced61a0b98af71ff6d1e2172dc97e2abf3efc79cae3cad9
diff --git a/dev-python/pyusb/metadata.xml b/dev-python/pyusb/metadata.xml
new file mode 100644
index 000000000000..b547c09ec840
--- /dev/null
+++ b/dev-python/pyusb/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription>
+		pyusb is a python wrapper for the libusb user space USB device library.
+	</longdescription>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyusb</remote-id>
+		<remote-id type="sourceforge">pyusb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyusb/pyusb-1.0.0.ebuild b/dev-python/pyusb/pyusb-1.0.0.ebuild
new file mode 100644
index 000000000000..525fc5e8b063
--- /dev/null
+++ b/dev-python/pyusb/pyusb-1.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+MY_P=PyUSB-${PV}
+
+DESCRIPTION="USB support for Python"
+HOMEPAGE="http://walac.github.io/pyusb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+### This version is compatible with both 0.X and 1.X versions of libusb
+DEPEND="virtual/libusb:=
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS="README.rst docs/tutorial.rst"
diff --git a/dev-python/pyutil/Manifest b/dev-python/pyutil/Manifest
new file mode 100644
index 000000000000..90a086224823
--- /dev/null
+++ b/dev-python/pyutil/Manifest
@@ -0,0 +1,5 @@
+DIST pyutil-2.0.0.tar.gz 125079 SHA256 0ca95cb85843c5b09f7b65b5bd6c42d1940e19667b076620585ac45abe4f4fbb SHA512 3704c028fdc3894ae635dabd2bace1af1e805f4158dc6d67eac0c38fa8e7959cd093ad39cb2f539e59dd74e957947464cc8c7aed727835e127311062ed27e60b WHIRLPOOL e8fcdbed85d324732b8216224167f7920cfaf557238f3f70d22ee9afc96d1f72731164b55e1f385b60b0f77f8f42faf4b4db3e3eb55917c92ad004ab7613d447
+EBUILD pyutil-2.0.0.ebuild 647 SHA256 539111ba266cd5b089df0433fbc3b9d513bffbf5da88adac89299c580fbad83e SHA512 a3a6d6ea1f50bb3922cc58af7f76d9403ba7f2df0de5c340dd9d7ff1273c244b513fe45b9b4b1c0e41f81187d3661cd0f94d6b879d1fd9821276d3e69d940626 WHIRLPOOL d8fb8d15f7b9ac1ab95af1cae472b6668b7a03bae10149bc8e2bd0b9508054d44d558a995061cf6750595b0c25e306e72abc6661a5fb68a9801a13571ae66a0b
+MISC ChangeLog 2521 SHA256 2c121f8fad06f6856d90265efe17206e3212863b5be35b02fa0bbed5318aad47 SHA512 d2e8d92b31095b936429c9f731eafbd18382bcaf96218e4d8c647496b2d5942b7c8cccc1522f20372e61434ca82f90775885d3747bea1e077838461e9b5857bd WHIRLPOOL c96674f7b2ed29dd16c3f6eada9d059e19252cf1fa1be7fdea19d3abc21be4aac442ffa5012e999c9a7bc5c5587ae3649c0e47affc4780c431c94faebe010605
+MISC ChangeLog-2015 1569 SHA256 c045052ba85fe63eb3ce4b8f5ee86026eb6eef262be605e9b2e90e2ac1cdc18d SHA512 3f5a4c7074be1c6a3c60fdd9e4b54267378b9aee567bbcd0076758b8d09219afe867e52ed9682e7979bb1b40a755d81ebeb02de744ea209f3b6a01d2579a9154 WHIRLPOOL 5027224881c1c8be0d46135aa33fd9e75fd1083550b8a3a202d43d7ad807581c0b9a5ed3faced9b510dd7ec35d322bdf8f2d53aa112bcf7f4cd2e164d3c73a34
+MISC metadata.xml 744 SHA256 a5f2dbfa508cf1c208ea326da2f461b3cb9b61e3009e401bee353bf8ee6c3382 SHA512 a23c7e3e981737b2a5952cf4ae5fb5017e68c68ded1d2e2dc534cfe630aa95dbe8b32c6fc784cb2a5744d66e91131f97a5c201029df04122cb1ac230a0bd0746 WHIRLPOOL 03425401be7b8013b76e7f157133f64f6d8c9382a61c89e2682ddcd961d27ca87a0fe6ec64cbea1f021b71f26364eb8e4b1815476f0f87aeab1cb66e6ee9f9a8
diff --git a/dev-python/pyutil/metadata.xml b/dev-python/pyutil/metadata.xml
new file mode 100644
index 000000000000..5d4021ab5e7d
--- /dev/null
+++ b/dev-python/pyutil/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		pyutil -- a library of useful Python functions and classes
+		==========================================================
+
+		Many of these utilities (or their ancestors) were developed for
+		the Mojo
+		Nation, Mnet, Allmydata.com "Mountain View", Tahoe-LAFS, or
+		SimpleGeo's
+		products.  (In the case where the code was developed for a
+		for-profit
+		company, the copyright holder donated the pyutil code to the
+		public under
+		these open source licences.)
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">pyutil</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyutil/pyutil-2.0.0.ebuild b/dev-python/pyutil/pyutil-2.0.0.ebuild
new file mode 100644
index 000000000000..3af73fcd4531
--- /dev/null
+++ b/dev-python/pyutil/pyutil-2.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="A collection of utilities for Python programmers"
+HOMEPAGE="https://tahoe-lafs.org/trac/pyutil https://pypi.python.org/pypi/pyutil"
+SRC_URI="mirror://pypi/p/pyutil/pyutil-${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+
+	rm -rf "${ED%/}"/usr/share/doc/${PN}
+}
diff --git a/dev-python/pyutmp/Manifest b/dev-python/pyutmp/Manifest
new file mode 100644
index 000000000000..1f65433b32e2
--- /dev/null
+++ b/dev-python/pyutmp/Manifest
@@ -0,0 +1,5 @@
+DIST pyutmp-0.2.1.tar.gz 33673 SHA256 957ae25bc6997c3b18d8255399eb8409c9f47c9fd47c1ac852e49659bfd54869 SHA512 0b1195b9a485ff9069dc06795f157c4e93e9855c1f1abe904823802e369f32d2fc4676a69e4218aff1aff393ded927ada394f848057f3fdcf45d8c0f8030363c WHIRLPOOL 7813a72d150f4b6bc0c778d68425dd9b763b11a658227237b3330cfb730c56b7c4886587c4901f1c2635f84b189ceb40f8cba7112417c84764988f04df40dfb0
+EBUILD pyutmp-0.2.1.ebuild 427 SHA256 f4661a53d035616a2ebe281f897743cfd83b7b95d5ea8d74c09f3a3742d4f467 SHA512 ad111ebf2d2bc30fa859206ec072e936aa57a6bbf8dac8d25dc64d71d6e544bbd890404b7a15f9a07ef1043f278dffdb934e8a5df92a3e41c2710af5e3ceeac4 WHIRLPOOL 63d261160c16cd8f8c833e28b2405726812c37678f1ed732fa6be912fffcfa72431c3840b66990e70e2d6fbf68ac3ca82cd4e260d95b5bbded539b23fc268c97
+MISC ChangeLog 2792 SHA256 50682e724d5f77fd9aea07beedbb706a9ae86f9011931dd7ba30362afe05ee53 SHA512 fd18da82a607f7fdd789f2ae973157fc25273e469a0e38395f44156eded7f1dd82882d6e5f5f23d7fc532c550f3255647e79ebd1733aadb3931023b80085014c WHIRLPOOL dfa86538ba49c4a198406b463350094c2b24bb29e7cfb645b57021aa8ed47bc18aa1fe269a49cafc5d36924dc6d17583d994370453db0b1e78edbc53410b4e9b
+MISC ChangeLog-2015 369 SHA256 a99e47efcc4629053dd2b4997df1531d8190f069ea66d5ad0e173f36b2d120f2 SHA512 3f696e9a43155ebf848f06640f98076ba20b7d2ed533bf499c4ef90b3022c94754b7bbda8ba29aafb4707c68a09f2ad83bdc948ecc982d16135881fdf03eb20c WHIRLPOOL 29ed7b06a45a41780dd78636a82bf0e82c9930b6490115ea9d944774555e77fcef2dabfcdd6da1f4663f83386486a3cc6fe4e3a2c2f8019f512711855f1a90f8
+MISC metadata.xml 309 SHA256 b61286c54004c1b7e7ba5d40b1643ab1bd1039444c975c2f6ca8537588c65f68 SHA512 377365858dc813dd68192639b330bf45c52e177f75e689bd76dadeadbce31ef346f7e4b37a358cec3c98cb58317545c9cda9df1a7df35dbe2f0a5e9c53c032cb WHIRLPOOL 309397fe946ca91d0037c60c11949c6f5ededcb3136109aaff64f4a4389e441d2cb4c908f409025adddf02cf24e1bf13a1ee5ba2667f6e0fef2c2acdde140f85
diff --git a/dev-python/pyutmp/metadata.xml b/dev-python/pyutmp/metadata.xml
new file mode 100644
index 000000000000..6243e18c4ad4
--- /dev/null
+++ b/dev-python/pyutmp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyutmp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyutmp/pyutmp-0.2.1.ebuild b/dev-python/pyutmp/pyutmp-0.2.1.ebuild
new file mode 100644
index 000000000000..b441c76a87b2
--- /dev/null
+++ b/dev-python/pyutmp/pyutmp-0.2.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python UTMP wrapper for Un*x systems"
+HOMEPAGE="https://pypi.python.org/pypi/pyutmp https://bmc.github.com/pyutmp/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/pyuv/Manifest b/dev-python/pyuv/Manifest
new file mode 100644
index 000000000000..e414c3279399
--- /dev/null
+++ b/dev-python/pyuv/Manifest
@@ -0,0 +1,4 @@
+DIST pyuv-1.2.0.tar.gz 98578 SHA256 9df91c86519574f65e4465884db20565d4ad4287cd6cd651ee0137430b0dd4a7 SHA512 10a8448700c609b6e9844c6bc9bd6428920a455c94bee79569006f783c7f5d2683abe46c4692d0f0016a621d0c6d0ef2decc42a9f0418e1242b79ab0f06ee9f2 WHIRLPOOL 11989f713ba205ff0fa5b76dd742a7c3eb66b00fb6c97e0a0a5aa2e2b3c041a1d35b2bfd950a54fb0a7adb9ae1c5753c97ee4c6278518e46a345a462827835eb
+EBUILD pyuv-1.2.0.ebuild 631 SHA256 369d07c76a4e04890b52627293930e1412f7c8a9eec9f1ec34460e44fa530c65 SHA512 ef78dcdb958fd06914d80dd8d6b9edbf17122158a096aee629546194f571cf985dfa443d3e7bd4525d804b656d0ec7da6b71ab671041182c6d02c33d38ed123a WHIRLPOOL 8f221601504a1d29bc65883a8bc90fd2a58c91683e3ca38bd992223f01d280e151d480ee7e6c88d503a7ff2789b837c43d0ce8dca24b8f7c1a9aa1a162cb7237
+MISC ChangeLog 557 SHA256 2b020f4d2cfb0f1eb231b9e39698d78fd3731a265b43b32e193853880f10b8f8 SHA512 328b6d205af2e2504cb3fc63473febc3cf4051e4db21a388c6840093914d7c79a21075c9bc57ab2191e5441c0d3bcbc3b51bc1d8243bc31df04184dd98643989 WHIRLPOOL 7ec2d7f635a73220ad39b7b52a8a79e9d0e8b8fe10ba9818104c680294436e30120564d879252f8dd752d41f28820e8001780f7e9c2b78f7c44d137d670ff11a
+MISC metadata.xml 1336 SHA256 c53c588e783d86bae6f68af37c047a32e6d8a62705983cbf7835e91ff56ee216 SHA512 5188d8c0336c9583d15da1a82f8c6866bbcd806d4e6025bc9cbdf450ae1d02d394c2bb5186d74b3f7e05c071612071d9033358918fa11cc2114f9c5eaf56d01c WHIRLPOOL 34d440124643f1f9397afb6eb500133c7e9f098e5a8498b62f20bdaf332683a99879b7e61dd1eac2eaf929ef0eb203436d466bde8b9dc95484e6bb2f58068528
diff --git a/dev-python/pyuv/metadata.xml b/dev-python/pyuv/metadata.xml
new file mode 100644
index 000000000000..5631539a3d3f
--- /dev/null
+++ b/dev-python/pyuv/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+		pyuv is a Python module which provides an interface to
+		<pkg>dev-libs/libuv</pkg>.
+		libuv is a high performance asynchronous networking and platform
+		abstraction library.
+
+		libuv is built on top of epoll/kequeue/event ports/etc on Unix and
+		IOCP on Windows systems providing a consistent API on top of them.
+
+		pyuv's features:
+		* Non-blocking TCP sockets
+		* Non-blocking named pipes
+		* UDP support (including multicast)
+		* Timers
+		* Child process spawning
+		* Asynchronous DNS resolution (getaddrinfo)
+		* Asynchronous file system APIs
+		* High resolution time
+		* System memory information
+		* System CPUs information
+		* Network interfaces information
+		* Thread pool scheduling
+		* ANSI escape code controlled TTY
+		* File system events (inotify style and stat based)
+		* IPC and TCP socket sharing between processes
+		* Arbitrary file descriptor polling
+		* Thread synchronization primitives
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+			<email>saghul@gmail.com</email>
+			<name>Saúl Ibarra Corretgé</name>
+		</maintainer>
+		<remote-id type="github">saghul/pyuv</remote-id>
+		<remote-id type="pypi">pyuv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyuv/pyuv-1.2.0.ebuild b/dev-python/pyuv/pyuv-1.2.0.ebuild
new file mode 100644
index 000000000000..75c9bcf18dda
--- /dev/null
+++ b/dev-python/pyuv/pyuv-1.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface for libuv"
+HOMEPAGE="https://pyuv.readthedocs.org/en"
+SRC_URI="https://github.com/saghul/pyuv/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# https://github.com/saghul/pyuv/blob/v1.x/setup_libuv.py#L117
+RDEPEND=">=dev-libs/libuv-1.7.3:0/1"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/pyuv-pyuv-${PV}"
+
+src_configure() {
+	mydistutilsargs=( build_ext --use-system-libuv )
+	distutils-r1_src_configure
+}
diff --git a/dev-python/pyvorbis/Manifest b/dev-python/pyvorbis/Manifest
new file mode 100644
index 000000000000..9d0c2808ec80
--- /dev/null
+++ b/dev-python/pyvorbis/Manifest
@@ -0,0 +1,7 @@
+AUX pyvorbis-1.4-python25.patch 1562 SHA256 d6d3c2494b9965bb7ef06c1f6ea0a70ad527411fa6a0a6675c2a7f6f26d30710 SHA512 9d8e6dfd5e72ccaa2cc4fe67941d44fd607824d94b8f9b62d69bda7abd05abe08f10492f2ddc8b2c11c11371417861f22af48411d51b9d81973dfd6e1af3f631 WHIRLPOOL 312825558170742e643ee326114d95ca2cd273d8b6e40a3f478e963e5ef42dd4bfa10f8a6c9741639a7aeb7ef3fc140679913f9ce86b763f672df2796bea4a27
+AUX pyvorbisfile.c-1.4.patch 564 SHA256 aa3bae161c934eff79d2ed1ee6d0cf4ee524039674744e0a8c6f608c0a6fcd3e SHA512 73426fc32dac932e548555eebbac3a2c2ca252f18882eb815d40da4238b3e0e544e993d395e2c0df04dcc6d2e7b9cdcb6f26417390d91c6ef11c24530dfa7ce1 WHIRLPOOL 9b7a1e28d7736d00e6a17a7a15a086d87e3f8efc729f1cdc5140c2c63a24ff29b0e466ce840971f93354558ffcae9b96d099810c4fa1bbe115e044b0f62a3d98
+DIST pyvorbis-1.4.tar.gz 39045 SHA256 a7154541cea58304feff30752243eab862131c7589d72c200c8ad722d3bf1647 SHA512 c0b5ebb5d22f97b20f56a0b49e43675764fe057afa2d5de22eab9b8b73fb542186e7488cb0ba31b7af433cef1a88e815eb3e88a4609a2657ae5fba1017bdb89c WHIRLPOOL ae1b9025443a987c3dc51e4942ea2f709bee20f93156b8187d2db7a633df342ae9f26605a37da48c22db4bb7bb90fbcc96390ae56d5d2afa5e25d3902d0b0849
+EBUILD pyvorbis-1.4-r4.ebuild 938 SHA256 d70d2f1a7f35dad0fe4f7500dd086db739913283384daaeea58124919a5d94a9 SHA512 7d8185be7469e483fcf83eda9305d58aa4c650df4c2e1b3f038f6d74535fce1fd9045a58b3f52b50e816929a630a46c5a4fa53dd642b262e7d158ddaa42470d3 WHIRLPOOL 6c5e947dd86d3edac4d6de82d5b8b6a7a27b81d939151cc28a9b481402040b7ec819174dc389d0ffb6164f25981ceb56d8fd3264d769d455afa7cac18c6feafd
+MISC ChangeLog 2505 SHA256 d3e7d4ab2e256e37e08e205a09d9306faf7ead2c17f30cea552ef1c038af3002 SHA512 8b3bdffef1c5995870b76536db3f36defffe30abb5788068eb517875f1474b1347923648b200bbbc4f1f873859d7e200d6a82ab0d074f86df2caf793927c6b43 WHIRLPOOL 6ddf27069fe97e12e6743ce56973bd465f3f6646694ae01bc65bace21b0d12d7d77deef36d679a0570f14093537417c9da647674c2a94ef4cf09c64711843058
+MISC ChangeLog-2015 7348 SHA256 eea65c1ef3073e0b626658ed39a82dd3beead9919f09ad0553fd61903cde3d20 SHA512 7c2a90ee63299d31a09dd0c7283129e4d851176ec3704879ba944b1aa5cb5736ce9c97e3defde6d8c08f167870b9b8562d50251c45ba24ed123bad1a602cc76e WHIRLPOOL 6d83ccc66900aa7f9d2ddb3a1c1135cdfacc970c7ec8e536bba4dee050b36c2937564f13049fb2fa31670ceaa1c90e1fe6014a858b44ee9dc30e667f4b9a91b4
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/pyvorbis/files/pyvorbis-1.4-python25.patch b/dev-python/pyvorbis/files/pyvorbis-1.4-python25.patch
new file mode 100644
index 000000000000..18028dc7a8e7
--- /dev/null
+++ b/dev-python/pyvorbis/files/pyvorbis-1.4-python25.patch
@@ -0,0 +1,65 @@
+diff -ur pyvorbis-1.4-old/src/pyvorbiscodec.c pyvorbis-1.4/src/pyvorbiscodec.c
+--- pyvorbis-1.4-old/src/pyvorbiscodec.c	2003-05-13 11:17:13.000000000 +0300
++++ pyvorbis-1.4/src/pyvorbiscodec.c	2007-09-20 01:57:54.000000000 +0300
+@@ -118,7 +118,7 @@
+ {
+   vorbis_dsp_clear(PY_DSP(self));
+   Py_XDECREF(((py_dsp *)self)->parent);
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ static PyObject*
+@@ -447,7 +447,7 @@
+ {
+   vorbis_block_clear(PY_BLOCK(self));
+   Py_XDECREF(((py_block *)self)->parent);
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ static PyObject*
+diff -ur pyvorbis-1.4-old/src/pyvorbisfile.c pyvorbis-1.4/src/pyvorbisfile.c
+--- pyvorbis-1.4-old/src/pyvorbisfile.c	2003-12-19 09:11:02.000000000 +0200
++++ pyvorbis-1.4/src/pyvorbisfile.c	2007-09-20 01:59:41.000000000 +0300
+@@ -173,8 +173,7 @@
+   if (ret == NULL) {
+     PyMem_DEL(newobj);
+     return NULL;
+-  } else
+-    Py_DECREF(ret);
++  }
+ 
+   return (PyObject *) newobj;
+ }
+@@ -195,7 +194,8 @@
+     fclose(py_self->c_file);
+   }
+ 
+-  PyMem_DEL(self);
++  free(py_self->ovf);
++  PyObject_Del(self);
+ }
+ 
+ static PyObject *
+diff -ur pyvorbis-1.4-old/src/pyvorbisinfo.c pyvorbis-1.4/src/pyvorbisinfo.c
+--- pyvorbis-1.4-old/src/pyvorbisinfo.c	2003-12-19 09:51:36.000000000 +0200
++++ pyvorbis-1.4/src/pyvorbisinfo.c	2007-09-20 02:01:58.000000000 +0300
+@@ -134,7 +134,7 @@
+ static void
+ py_ov_info_dealloc(PyObject *self)
+ {
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ #define CMP_RET(x) \
+@@ -418,7 +418,7 @@
+     free(ovc_self->vc);
+   }
+ 
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ 
diff --git a/dev-python/pyvorbis/files/pyvorbisfile.c-1.4.patch b/dev-python/pyvorbis/files/pyvorbisfile.c-1.4.patch
new file mode 100644
index 000000000000..5d1d8ffc7c77
--- /dev/null
+++ b/dev-python/pyvorbis/files/pyvorbisfile.c-1.4.patch
@@ -0,0 +1,20 @@
+--- src/pyvorbisfile.c.orig	2003-12-19 07:11:02.000000000 +0000
++++ src/pyvorbisfile.c	2005-09-03 20:02:19.000000000 +0100
+@@ -190,9 +190,6 @@
+     /* If file was opened from a file object, decref it, so it can
+        close */
+     Py_DECREF(py_self->py_file);
+-  } else {
+-    /* Otherwise, we opened the file and should close it. */
+-    fclose(py_self->c_file);
+   }
+ 
+   PyMem_DEL(self);
+@@ -260,7 +257,6 @@
+   
+   retval = ov_open(file, self->ovf, initial, ibytes);
+ 
+-  self->c_file = file;
+   if (retval < 0) {
+     if (fname != NULL)
+       fclose(file);
diff --git a/dev-python/pyvorbis/metadata.xml b/dev-python/pyvorbis/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/pyvorbis/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild b/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild
new file mode 100644
index 000000000000..a52d1665ce48
--- /dev/null
+++ b/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Python bindings for the ogg.vorbis library"
+HOMEPAGE="http://ekyo.nerim.net/software/pyogg/"
+SRC_URI="http://ekyo.nerim.net/software/pyogg/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=dev-python/pyogg-1.1[${PYTHON_USEDEP}]
+	>=media-libs/libogg-1.0
+	>=media-libs/libvorbis-1.0"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS COPYING ChangeLog NEWS README )
+PATCHES=(
+	"${FILESDIR}/pyvorbisfile.c-1.4.patch"
+	"${FILESDIR}/${P}-python25.patch"
+)
+
+python_configure_all() {
+	tc-export CC
+	"${PYTHON}" config_unix.py --prefix /usr || die "Configuration failed"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	insinto /usr/share/doc/${PF}/examples
+	doins test/*
+}
diff --git a/dev-python/pyvtk/Manifest b/dev-python/pyvtk/Manifest
new file mode 100644
index 000000000000..f64a3519080b
--- /dev/null
+++ b/dev-python/pyvtk/Manifest
@@ -0,0 +1,6 @@
+AUX pyvtk-0.4.74.patch 972 SHA256 34a197ba98c8d88e704526f435c57915acde17557542ade76a99fa280ce85116 SHA512 697f38b9df00528ef1e82fe8302901b92a6f2ff4e38af1bdb45e8c47821b13248a0c79dabfa485eaf2e9b9fa256fac96381e8dcfa76f364e2a8b1a94beecda91 WHIRLPOOL 54b59b40856a4737dd2459693222d9913525ad99a92acb4eab3b685f466f205ae12990ad6d152a7e6265c600a351be62b90c1a4221b80a8776e96d58f944d28e
+DIST PyVTK-0.4.74.tar.gz 25700 SHA256 a34cc4660a85f4828bedf28ff2b4c95baad98fc8f79e2647c59b5ea66c9250c7 SHA512 c3b29dd067339c1708f9757b83a127cbe008b291265181272b69a85c0348bc1388c4914acc24efdefda0421a601eede10af762753e683fbd0518361035313098 WHIRLPOOL 2512351725cbfa744df521b3a4e44179a521a131f3fdcbee78ac6cdbfa7c7c3997a50665b1264d9cd9b9f18e5403854e85eb76c65dea640f1b888da9c66e6b17
+EBUILD pyvtk-0.4.74.ebuild 477 SHA256 5b0bfb6ce9dc7625028f9d676bb025bfd559d2fae679ca2bf827fd75423db4d5 SHA512 80661d3c0efa07f4e1b146b6cc81d295f23d6e52d677751f3f6ccf1120fd6a18b65fc786c51eb5ae96930f9ea2901f9cc4e18dfc53c3e5c24b68f924e3ca754c WHIRLPOOL 6925f729c5b5b7b60d42edc84d78edce04ab57a7983372cf9f1f801c7218a2dc5dde682bc1a5721204350bf8bcb6f0afcd2f2a5685bbf5bc78f33e012465f35e
+MISC ChangeLog 2592 SHA256 71d0025391a7d9d8a545c808a66e354acfbf15da5af32dec4df315b6015ed2e5 SHA512 fe42834d08375395336510c165727548f2ccca9231eba36c5c6f5b2b0851f3dfa3869cb29a3686c28f193dd3c6b10a3cb20e3f63f61daa53a3fbf6893c8be484 WHIRLPOOL 4fe3853090ca8d2a937e4813039fa5b9a7eb858a5246e7d51e20b04fbe17e02628820c357dc3a8b0ec21fdc63c86fd3b6f94f4805b06430f4f78f609854ba628
+MISC ChangeLog-2015 603 SHA256 08fbbd82ba954da1dad6c5fccc6c060518a4073ef8f6924fbdf564504afbf7c6 SHA512 072cf555b7ac6338ebe9c37dc64a51f86030c9ebe62ac7410d83c34a4878864ffa89c8ff841b0ff9f6f551b34560377443e887cd43567ca8436b1ea7b76763c5 WHIRLPOOL fe3a97b045c7023acfe2b6a0792d6b337e959e7ac52cd31ce6ea972dd7970184a61a5f314b757c9b8d9990656f5d6cafecae5e73b3cf878440e776244c9c355a
+MISC metadata.xml 259 SHA256 bbfbeb80ffccffa8e7f837d2c93e994bbe024d565ae3a31d30c6646e80a684c8 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706 WHIRLPOOL 75b8dd1a97dde63f9cc9f73b5951eaf54579460763ef7cbe6f3a9a0739070601d762152ea00df8b476b80e92e5c29b611a494bac5ab747298942530cabe0ee84
diff --git a/dev-python/pyvtk/files/pyvtk-0.4.74.patch b/dev-python/pyvtk/files/pyvtk-0.4.74.patch
new file mode 100644
index 000000000000..651c1f5ec37c
--- /dev/null
+++ b/dev-python/pyvtk/files/pyvtk-0.4.74.patch
@@ -0,0 +1,20 @@
+--- PyVTK-0.4.74/lib/__init__.py    2003-04-07 16:56:08.000000000 +0200
++++ PyVTK-0.4.74/lib/__init__.py   2008-12-03 18:08:35.000000000 +0100
+@@ -202,7 +202,7 @@
+         #print 'Reading file',`filename`
+         f = open(filename,'rb')
+         l = f.readline()
+-        if not l.strip().replace(' ','').lower() == '#vtkdatafileversion2.0':
++        if not l.strip()[-3:] == '1.0' and not l.strip()[-3:] == '2.0' and not l.strip()[-3:] == '3.0':
+             raise TypeError, 'File '+`filename`+' is not VTK 2.0 format'
+         self.header = f.readline().rstrip()
+         format = f.readline().strip().lower()
+@@ -222,7 +222,7 @@
+         for i in range(2):
+             if only_structure: break
+             if not l: break
+-            l = [s.strip() for s in l.lower().split(' ')]
++            l = [s.strip() for s in l.lower().split()]
+             assert len(l)==2 and l[0] in ['cell_data','point_data'], l[0]
+             data = l[0]
+             n = eval(l[1])
diff --git a/dev-python/pyvtk/metadata.xml b/dev-python/pyvtk/metadata.xml
new file mode 100644
index 000000000000..8425c0d53cb0
--- /dev/null
+++ b/dev-python/pyvtk/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="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyvtk/pyvtk-0.4.74.ebuild b/dev-python/pyvtk/pyvtk-0.4.74.ebuild
new file mode 100644
index 000000000000..84c5a47a2357
--- /dev/null
+++ b/dev-python/pyvtk/pyvtk-0.4.74.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P=PyVTK-${PV}
+
+DESCRIPTION="Tools for manipulating VTK files in Python"
+HOMEPAGE="http://cens.ioc.ee/projects/pyvtk/"
+SRC_URI="http://cens.ioc.ee/projects/pyvtk/rel-0.x/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}.patch )
diff --git a/dev-python/pywavelets/Manifest b/dev-python/pywavelets/Manifest
new file mode 100644
index 000000000000..6eda322fb34f
--- /dev/null
+++ b/dev-python/pywavelets/Manifest
@@ -0,0 +1,7 @@
+DIST PyWavelets-0.5.1.tar.gz 4429280 SHA256 7b0634e3588f1d1f9c8bceaf366c8d61bb7e2869096652eb3ca66f723659c9a6 SHA512 34d97ec1147b3c8ab03c086066561d61e21a0f2569699aaa61d3fbdac5847e22f482aed8c94548feaf613c179eb0d0d9c72b6f11a0ed540a5c53993b58895cd6 WHIRLPOOL 67dc1f76fa78528ca327bad1c999afedb09f1cc9cd7ac2f5ef2a7f164da74baeccc022cc3e374861f1bba1895c3898846a6c0cc51b7d90ec6c2734e8aba06dad
+DIST PyWavelets-0.5.2.tar.gz 4430706 SHA256 ce36e2f0648ea1781490b09515363f1f64446b0eac524603e5db5e180113bed9 SHA512 6685b348009076b39a46e5a480189c34e5bc791ac110f47a52a8dbe0cbed1f3dcb64402174480d525bcf3776d12185ac89fe36c839727a14ffbad1ed835824ad WHIRLPOOL e2d16fbf628b2c4e7d0cbe88cdd793b6c73df9a006d7516440dfeb102539a0419a43c7e6f1870a717e8f6691915149b73c35b432493713c6bdcfe8a1e9506771
+EBUILD pywavelets-0.5.1.ebuild 1110 SHA256 02ab1882ee136fa1ddef009290ebd4830fd071c8162171cb6785ec2a31e6df44 SHA512 4a2363f556a0a7928e934732537e7b7f12815be90aa1ff6a04bbde9152e1b33d81da384a8e5b86bfdd137b2e09b4716f54c671b680c18ce0ce7aa629d593b985 WHIRLPOOL c3dac170790bab9cd4b0708b53854bd3ed6084260cab320807f1f649d6138cdf61200aea2b9f6a1bd46ce3ece2d4893a8452a322f217ba6fdeca538e04b011f6
+EBUILD pywavelets-0.5.2.ebuild 1110 SHA256 02ab1882ee136fa1ddef009290ebd4830fd071c8162171cb6785ec2a31e6df44 SHA512 4a2363f556a0a7928e934732537e7b7f12815be90aa1ff6a04bbde9152e1b33d81da384a8e5b86bfdd137b2e09b4716f54c671b680c18ce0ce7aa629d593b985 WHIRLPOOL c3dac170790bab9cd4b0708b53854bd3ed6084260cab320807f1f649d6138cdf61200aea2b9f6a1bd46ce3ece2d4893a8452a322f217ba6fdeca538e04b011f6
+MISC ChangeLog 3220 SHA256 a0cd92b775b94effcc7c8af355cb1fd25f38af63b84c4bd7c45ec67e0069ec3a SHA512 da9d4c829551c0c9b5732b896e686d76bfaedc8d25da38d4973a9105a0413df19046deb931f4241f75b8a08ed7706f5c7f25ec9231c619f45c2238bd2d1ada75 WHIRLPOOL 6bee66def309b34cba99374514a779fb2169cd5f8ae9e3d3b2365a689655ef5a08a20a39ece9d29704c77aeb94ceff7ba5844042616a8a7d475c1c26d556327a
+MISC ChangeLog-2015 2220 SHA256 4af512cc79ee9e54bc498f00cb9ba2437b7a702144c2e9b3223b66848be64189 SHA512 1ebafcbbbf5b48f815cab4cf0c35a4ef2ca77f71dbe3e2bb8e0a811d4e2c3b496ae149c212386de00d3ebf6467db02a7706178a4aafcaf41d8dbed783cdd3210 WHIRLPOOL e1af04362e94a6baf1fc8376f41667b171946eb445a4af24593f6da87922a5cf8b77cd11f394f003eaf68581961cb6576cd1add47a62089094cf4cbd7f32ba4e
+MISC metadata.xml 814 SHA256 77f2856f8f6f5e143d5e791609b59a8b73611f88f07b53aebe850dc8d374cc4c SHA512 02937ffa5a37a9ca5e9f3b8bcee990bbb84bf4b41f770f3f02cb0a447429d127f2d1337cfd26c936469858ee01c850db33a65798144fa65102940414df5f24e1 WHIRLPOOL 74c4fbba1b9df2a4b578f731ae8a452e7d92677529579fb82ae2c3c0a880c0a4f85ebe29f71559fdb4560e4d12ad98a7624279b1c61353038ad281981c4b3c29
diff --git a/dev-python/pywavelets/metadata.xml b/dev-python/pywavelets/metadata.xml
new file mode 100644
index 000000000000..8a4e71211553
--- /dev/null
+++ b/dev-python/pywavelets/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  PyWavelets is a Python wavelet transforms module that can perform:
+  * Discrete Wavelet Transform (1D and 2D)
+  * Inverse Discrete Wavelet Transform (1D and 2D)
+  * Stationary Wavelet Transform
+  * Wavelet Packets decomposition and reconstruction
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">PyWavelets</remote-id>
+    <remote-id type="github">PyWavelets/pywt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pywavelets/pywavelets-0.5.1.ebuild b/dev-python/pywavelets/pywavelets-0.5.1.ebuild
new file mode 100644
index 000000000000..6efa8d000e62
--- /dev/null
+++ b/dev-python/pywavelets/pywavelets-0.5.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+MY_PN="${PN/pyw/PyW}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Discrete Wavelet Transforms in Python"
+HOMEPAGE="http://pywavelets.readthedocs.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}] )
+	test? (
+	   ${RDEPEND}
+	   dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	nosetests -v .
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r demo/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/pywavelets/pywavelets-0.5.2.ebuild b/dev-python/pywavelets/pywavelets-0.5.2.ebuild
new file mode 100644
index 000000000000..6efa8d000e62
--- /dev/null
+++ b/dev-python/pywavelets/pywavelets-0.5.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+MY_PN="${PN/pyw/PyW}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Discrete Wavelet Transforms in Python"
+HOMEPAGE="http://pywavelets.readthedocs.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}] )
+	test? (
+	   ${RDEPEND}
+	   dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	nosetests -v .
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r demo/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/pywebdav/Manifest b/dev-python/pywebdav/Manifest
new file mode 100644
index 000000000000..b110216cd5ba
--- /dev/null
+++ b/dev-python/pywebdav/Manifest
@@ -0,0 +1,5 @@
+DIST PyWebDAV-0.9.8.tar.gz 52605 SHA256 510edb31ff8d4ad5a758c94eee4f12e6178ccb69fe70842d8db52098cedb20ec SHA512 a920e63f1241e41acd7cf02f342fc81e321c50866b103690eee3352de3b0d51c0c9473079bb639d65402719158c6c8113b2c1b7e0bfdc0b863ceb290bcde0145 WHIRLPOOL bde4fef6a8dc909e2278eb2b4b7a5077984dcdbb1f55d3354432985cb16a99795b988b384a826a7dd945e12a2b818b647a493e57d440d37ce8906506aff78e9c
+EBUILD pywebdav-0.9.8-r1.ebuild 668 SHA256 2bb51cebb9dd60cdac10b0a1cf2ccc5727c4106ce60c180558d790f740fa228c SHA512 cc41b34a107ff006f04c8eaab21a0b1627b0f8bb46c3a779690f4a12708e968b0aeb55253b548f9af3760ff8070fdd20370fd67b7b79520cbb63f2175acbc2be WHIRLPOOL 2441c1d659b53c13d758e6e56b5a710dbcb2f5508b7a841a4344632cb8d7d62bfa008654ca8b33ad2ccdb4704cbfdf132b1ad1f070c8eb23cc9a109c7ea211ce
+MISC ChangeLog 2911 SHA256 166a0ec7214465fda2db153a08e49f0615e3b506a87e3e25a08a5947f2daff5a SHA512 6dfe1f9e5acfb69943c8c99e33ff33d27ecfa9dd68233f72148794cad4df052b4b272dbab0c5dedad176fad8dee8fcd2b1ad608c8fc616d05bb55d1bc0de6589 WHIRLPOOL 8e9f9ff02397281e315b5446ff2bc68cc8962acefdf805c4a87a1ec5e6597876397801835b09801fb45fb7deccae55b461430cce94e72702d67e9369c5de31a4
+MISC ChangeLog-2015 3106 SHA256 7dcd232a50ed542de9fbe553cadc9a5914fa618040aeb46c918c34b3f5f0b699 SHA512 7b8b68b9900567311321021993277bbdd203b925a5ce058e3b528f5399c30538d04e7f878cd422b0c71acd3cfa6ddc29e0826e71ef4699dc2cea75268455afa8 WHIRLPOOL 4af2d1335d73954315a825a3758630b1b4ea82c9f1490d517487d7c121be8914ab7a3f26ca349372426cd3acd50786af122d4ebed9941e8d2c69e74237f4c359
+MISC metadata.xml 548 SHA256 bedd36787ee5df14530c058e5824d269242a5154a60babb68c5484db1d62ef73 SHA512 572eea872363c2c2a66073208030f1178d75d15d7fc24b947a34c5253059e44acf7a9b0697c6bda24887d2933c7bd7b7fa870bebbdf34a8bfa2bc1191eb60941 WHIRLPOOL 73ee3986d3cf24c3b5393b351af14b899b4a3fc13ef8874aebfb7b01367354a87b03f750bf14589b83791c743f8e786f85e8c36c4e50e7353f40527d39aa7ce0
diff --git a/dev-python/pywebdav/metadata.xml b/dev-python/pywebdav/metadata.xml
new file mode 100644
index 000000000000..e1e4449e832f
--- /dev/null
+++ b/dev-python/pywebdav/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">A WebDAV server implementation in python. It's aim is to provide a
+		simple interface to webdav services to any application which needs it.
+		It can be run as a daemon on *nix systems</longdescription>
+	<upstream>
+		<remote-id type="google-code">pywebdav</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pywebdav/pywebdav-0.9.8-r1.ebuild b/dev-python/pywebdav/pywebdav-0.9.8-r1.ebuild
new file mode 100644
index 000000000000..82507042ad26
--- /dev/null
+++ b/dev-python/pywebdav/pywebdav-0.9.8-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_P=${P/pywebdav/PyWebDAV}
+
+DESCRIPTION="WebDAV server written in Python"
+HOMEPAGE="https://code.google.com/p/pywebdav/ https://pypi.python.org/pypi/PyWebDAV"
+SRC_URI="https://pywebdav.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc doc/{ARCHITECTURE,Changes,TODO,interface_class,walker}
+}
diff --git a/dev-python/pyx/Manifest b/dev-python/pyx/Manifest
new file mode 100644
index 000000000000..6a93d9d951cb
--- /dev/null
+++ b/dev-python/pyx/Manifest
@@ -0,0 +1,9 @@
+DIST PyX-0.12.1.tar.gz 561989 SHA256 e837b26a8b1c27524cf3f3dd6c0d563451249159edaa2e366d87e7143a867e8e SHA512 4941f5aa21aff3743546495fb073c10d2657ff42b2aff401903498638093d0e31e344cce778980f28a7170c6d29eab72ac074277b9d4088376e8692dc71e55c1 WHIRLPOOL a4d4a21e78b72841ca38dea87296d21f0bc8255e428cb0733fbee9d71c3bfb031d8a9f9fff988dbf0e2af7222553918a9aa924769891c50beb607c6ce3fe2fa4
+DIST PyX-0.13.tar.gz 1237082 SHA256 1952962c965000d8e04a00d1b85c600cdef4588cea88c9face2adbedf21d42c6 SHA512 cab0c22f0862ae20cff92504ededf4fcf5820d5773130fb258de1a95d295ca4fe657b85d5ccd52021a4f84403e6db8eebe9f676fa405781738502456123eb05c WHIRLPOOL 0a6159cd5f2683c70b33aac71278ad6f0df3ae54897d0ab31a9b61897be9b4e531cc41c7772a60a152b3b7a39d383ba669be7401c503704f14cbbf3ceca25c41
+DIST PyX-0.14.1.tar.gz 2475186 SHA256 05d1b7fc813379d2c12fcb5bd0195cab522b5aabafac88f72913f1d47becd912 SHA512 16265bbdcaf28ce194189a2987b32952f296c850b829454bcccce0abd23838bfca0276c3e9c8e96b8cbfaf1473bf14669f9b7f2032ee039b61ae59ea3aa45a20 WHIRLPOOL b87f3cd4cd7620e6fdfe7e25f13bd424272695c8a93b658782b05b797e4424b3e1fe179123c9b1a9ebb610c59534c661f5db1b99d2b99b6f9b48e28215e327fd
+EBUILD pyx-0.12.1-r1.ebuild 1040 SHA256 fa6f32824d2d9bd06b55f4111e6c6b24e263d1d8a163d26251dc5dc8934f48fe SHA512 925eca3a2edcf2160b52cdbbc99c09f6517eb5faf0c68adee79a6e72cee666cc020868e1036c62c1c6873676f10fbe607bddb6d8b1a2faeb5ecd68537bd917f9 WHIRLPOOL 5598f90643f6e88d39fd2a5f6e94d6ea7c8244e2d8aa8f34d85e12b72075499be6bbd23f6ca286484e933019f524a15acb594225f39bdfd4ec90f026045470e5
+EBUILD pyx-0.13.ebuild 1035 SHA256 83d906e76272470c256ea2cf4a60972a0b17c13a7c34c491a0ba19e1ebc0d40b SHA512 75aef766c29f06094201d43df43cea7fe567139946ca77a824e1b8bc1184aedfcc14138687c633a52ead64d329424f28b73a8457869d602cdd2691881febf361 WHIRLPOOL 46b2142bdaa0f1325c00cfbca3f201ecf81239bc659cb08e6464c774b804d5d25d597edff3b9af747c73801e03c44485d79a77e2f333037763622ffcfc655c79
+EBUILD pyx-0.14.1.ebuild 1158 SHA256 42b49491c3803b5f2348d508fde1884d0252292369a715a14f13ce4d57c36335 SHA512 f72854d875ea70795140e65b08604cfbbba575e0d06d6053eb5a8d2b9d9652f898e00548bff2e5147c85574b9a2ab63f951647810416ad4d495f8b8793f6f31e WHIRLPOOL 467eb1fb62df7a736f00dffd3e76dcee12ba850e7fe57b595893214eab09f4d6d77c54f56533ea0ddc8aa2bff046db5809ef703b8f7ec6264e5533e188ea6992
+MISC ChangeLog 2835 SHA256 d02393eb3c60504cf75efdb57ad7513db3ffd1e1613e3b1176379d4d44ef7e35 SHA512 65d18b9a540b98ed0e5126dab9fcbb3a80dd898031a8c37610fae76a29f3f7dde95f9041326b281418803cb5158b6d082244bd0944ed9e4b1372518ac9a4418c WHIRLPOOL b82b5565aa610196139d77be32b23d09c0fe3b0c5a52becc1429a632b124112c9097826575143cad5a682f74bc23bdc0c403f7bff86795ff1ff4086f7a666f9b
+MISC ChangeLog-2015 6296 SHA256 7b07c1c4b623dae0445054b864913886d3ced77ae706689afcdfde1713aa472c SHA512 dd6dbc669233fd77f8aedc3af18f0a05ab3811c6555f91448287c96362b329137e5aefab4c6c0c530023d09aa49c7ec34b5b1f012cf35a8d6267374868b988b7 WHIRLPOOL 61d610fb5e346a64064904abb0f4b95b8b14ec20aed8fcefffb1fab1acaef56327011a25894c95848c4fcff933440dfae2fc951abe219a7aed716069f1df3923
+MISC metadata.xml 642 SHA256 a6a20b730c5d015f8ec27fea09f17a53c2237fe4beda346720009c3b162f84a0 SHA512 c95b0de51a001623d93ef15159eaceb5c62fbe38bd7c21f261d12d131eb00c1764ab4f4f124c4bfdfce575d80a1318a996cb02629cfff0a5f9b853fd078627e9 WHIRLPOOL f671b98c455a34e08eb39308250d00ae49c2617716ce9329514ae4ce6a15712bcb14161b6e0fcd30837d886454df79b6234d1d149748ea7b4c6b0f8e3abb8143
diff --git a/dev-python/pyx/metadata.xml b/dev-python/pyx/metadata.xml
new file mode 100644
index 000000000000..f54711af01e2
--- /dev/null
+++ b/dev-python/pyx/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+PyX is a Python package for the creation of encapsulated PostScript figures.
+It provides both an abstraction of PostScript and a TeX/LaTeX interface.
+Complex tasks like 2d and 3d plots in publication-ready quality are built out
+of these primitives.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">PyX</remote-id>
+		<remote-id type="sourceforge">pyx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyx/pyx-0.12.1-r1.ebuild b/dev-python/pyx/pyx-0.12.1-r1.ebuild
new file mode 100644
index 000000000000..df2728e30563
--- /dev/null
+++ b/dev-python/pyx/pyx-0.12.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_P="${P/pyx/PyX}"
+
+DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
+HOMEPAGE="http://pyx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pyx/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="virtual/tex-base
+		dev-texlive/texlive-basic"
+
+DEPEND="${RDEPEND}
+	doc? ( virtual/latex-base
+		dev-python/sphinx[latex,${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i \
+		-e 's/^build_t1code=.*/build_t1code=1/' \
+		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
+		setup.cfg || die "setup.cfg fix failed"
+}
+
+python_compile_all() {
+	if use doc; then
+		VARTEXFONTS="${T}"/fonts emake -C "${S}"/faq latexpdf
+	fi
+}
+
+python_install_all() {
+	use doc && dodoc faq/_build/latex/pyxfaq.pdf
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyx/pyx-0.13.ebuild b/dev-python/pyx/pyx-0.13.ebuild
new file mode 100644
index 000000000000..c60245391eec
--- /dev/null
+++ b/dev-python/pyx/pyx-0.13.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+MY_P="${P/pyx/PyX}"
+
+DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
+HOMEPAGE="http://pyx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pyx/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="virtual/tex-base
+		dev-texlive/texlive-basic"
+
+DEPEND="${RDEPEND}
+	doc? ( virtual/latex-base
+		dev-python/sphinx[latex,${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i \
+		-e 's/^build_t1code=.*/build_t1code=1/' \
+		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
+		setup.cfg || die "setup.cfg fix failed"
+}
+
+python_compile_all() {
+	if use doc; then
+		VARTEXFONTS="${T}"/fonts emake -C "${S}"/faq latexpdf
+	fi
+}
+
+python_install_all() {
+	use doc && dodoc faq/_build/latex/pyxfaq.pdf
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyx/pyx-0.14.1.ebuild b/dev-python/pyx/pyx-0.14.1.ebuild
new file mode 100644
index 000000000000..2b079741f0dc
--- /dev/null
+++ b/dev-python/pyx/pyx-0.14.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1
+MY_PN=PyX
+MY_P="${P/pyx/PyX}"
+DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
+HOMEPAGE="http://pyx.sourceforge.net/ http://pypi.python.org/pypi/PyX/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="virtual/tex-base
+		dev-texlive/texlive-basic"
+
+DEPEND="${RDEPEND}
+	doc? ( virtual/latex-base
+		dev-python/sphinx[latex,${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i \
+		-e 's/^build_t1code=.*/build_t1code=1/' \
+		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
+		setup.cfg || die "setup.cfg fix failed"
+}
+
+python_compile_all() {
+	if use doc; then
+		VARTEXFONTS="${T}"/fonts
+		emake -C "${S}"/manual latexpdf
+		emake -C "${S}"/faq latexpdf
+	fi
+}
+
+python_install_all() {
+	use doc && dodoc manual/_build/latex/manual.pdf faq/_build/latex/pyxfaq.pdf
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyxattr/Manifest b/dev-python/pyxattr/Manifest
new file mode 100644
index 000000000000..2d54f55a8540
--- /dev/null
+++ b/dev-python/pyxattr/Manifest
@@ -0,0 +1,8 @@
+DIST pyxattr-0.5.5.tar.gz 26718 SHA256 132297c35261dd74b2ae2bd558e725b04834bbdf60997495e0110e255f5f2a3f SHA512 77b732a7e524a7c31a0511df2c96c18b214f93c6ac47276ecdf12ed95133ee506fa882b2532a7159aa2f4e02a7128e33bb8883ea632a5394297d98fb28898327 WHIRLPOOL 42db6c0d603f5bfca951a39194e5b95d4285a68b4c5e3f77ffe806fb5f05e46ce2f12dadc2d598c40178b68b83ee947b50474c7c026dc8e40378fc9c552a5180
+DIST pyxattr-0.6.0.tar.gz 31057 SHA256 09d00ee4235841a5d7d6275837c5cfc37a8b68efdd663f588505fff5a8c46ea8 SHA512 c56bf57729b5f8c8e3e19e29fd903b7365c6644abe3dcebf57ffc2f97a1e92d0e22cdc0a967c5abee3a74ba61a2a379e31a1734f45449095bdb7895b8357a9bb WHIRLPOOL aa312257d527a890c0aea65317d11ad0b6065b28aea18cc84f181cd1476de8cd31bf14af9c60bb0804a37283985830655c4d5ae9c16faec099572fb067c306f7
+EBUILD pyxattr-0.5.5.ebuild 1436 SHA256 46cf69c43f6adfaee56e9a533c0a62b403a5c2f2d1356e5d2755d121f2792ffc SHA512 f468797e54126048d73e709c2df49eaa15e7585995e906d8aade168d51289acfc11f201ac9010ece8bfef5080ae305f3a61ba393389041bf25b9884e75c6d830 WHIRLPOOL 3d061b2257b33d2c754840da5ea4bd8051ec20c27b0e710d47f9c6d0df3de337a8de7e4aeee7991495f03dca9fe05ba870cef1f33ad570b3b6d2cc6f40f20c52
+EBUILD pyxattr-0.6.0.ebuild 1451 SHA256 2cb9368d569a822f95fb845b4b8425c36e8b037597e62ade71e71841fb1266e3 SHA512 8aa97fc46e8eb5df5faf1df7f6560749bfb1c6fedb42e6dab01a2f9f0549af095ea37f9d7bfd2a76bee321621632754c6a5d4545b44d3f0ffe3a7d25b117c3cf WHIRLPOOL ea96ba2f9cb8ecfe65306d93bc5a9d820120d037a5c99f2b2db2dd48ebb6f0fc022dff889328ba1c3b2ff27ec6db8a1a618fda3105a49a3ed9512c240d14129f
+EBUILD pyxattr-9999.ebuild 890 SHA256 0f8e4c2a2934b819720c5be3529561290615fddce8325c3f82e502408c05b712 SHA512 2a1bcc94699a19d51aaf914a728e69ef0c38a4ca08b1d151e5de5067bffbf24b4e8f35b1c4ebc934763676fb2065e27cdf9dc0769fc152bea1b0d8d596fc2402 WHIRLPOOL fb9e2c68c26be2c2d20fce5a229fc90c13e31c0929d84595c40a41bb91df1ccf04490fda542c00b99135f0a25f7f265792670a98a34324784c2cd1e6787e4f06
+MISC ChangeLog 5911 SHA256 768099c0ac1b818c5d129d03e946578785d361e453a8d3436722aa362f99cc09 SHA512 35b0505c406c44c4a449e6d73f8ceb1b342d3da3bd455ad067437b84c67d046c830c5c3d7fff6055ab9b66cb547e5936de5ef07740102a4a2dfad830b2b478ab WHIRLPOOL 65a3cc8295025797d8b94d38e5b362668eac6b00724ee1f366a6f0ede95ae669fb8b7f92005e137a5c0ea9319646eb0faeaf660a74f483f633c3f479529059f3
+MISC ChangeLog-2015 9085 SHA256 b1f5875adef800a67d890b524a8f8cc37c9249624ea3db3973bcad7412a38a86 SHA512 ea42863b3d4e1994b09fed645641487f002429a6e8daf5a3fbfbc95a4a6c08067483289cf859c060602eb54383b764450bcc8909404544732b2e922e7ba692ed WHIRLPOOL 4883f557244b344c4a9ada11c312926113236dd0c828f447efd10ab57d335ed5cf0d0dde25e7cf1ac8354360a95da2a35cffa3f0c161aea351e54b73b6d5aa46
+MISC metadata.xml 609 SHA256 ecffde674ba73dc7439ee578a308a8721aa14599ed3a0b416abf906b8069cf73 SHA512 8a18175143b319bf6f623304ad8f534ad34eaf8b67c57ee1addb8886e34d79bd3a74723bce4f66fb5e9e3dad4768aaf253cec8fb8e97365f152d0b8f772d7df6 WHIRLPOOL 7f8fa51c1bccca6f5f4cd7f66e23a38df3db20b3c32c3a07420da98fe4a6dbc9ff9156b7c7eba1bec1b12dd4d6281a892e594d960934af3560386f7b6a3d6c8f
diff --git a/dev-python/pyxattr/metadata.xml b/dev-python/pyxattr/metadata.xml
new file mode 100644
index 000000000000..5e008f975b7f
--- /dev/null
+++ b/dev-python/pyxattr/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <longdescription>
+  pyxattr is an Python extension module wrapper for libattr. You can
+  use this module to query, list, add and remove extended attributes
+  from files and directories
+</longdescription>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pyxattr</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyxattr/pyxattr-0.5.5.ebuild b/dev-python/pyxattr/pyxattr-0.5.5.ebuild
new file mode 100644
index 000000000000..bb91bfed6a70
--- /dev/null
+++ b/dev-python/pyxattr/pyxattr-0.5.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python interface to xattr"
+HOMEPAGE="http://pyxattr.k1024.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	http://pyxattr.k1024.org/downloads/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="sys-apps/attr"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -i -e 's:, "-Werror"::' setup.py || die
+	# Bug 548486
+	sed -e "s:html_theme = 'default':html_theme = 'classic':" \
+		-i doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake doc
+}
+
+src_test() {
+	# Perform the tests in /var/tmp; that location is more likely
+	# to have xattr support than /tmp which is often tmpfs.
+	export TESTDIR=/var/tmp
+
+	einfo 'Please note that the tests fail if xattrs are not supported'
+	einfo 'by the filesystem used for /var/tmp.'
+	distutils-r1_src_test
+}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyxattr/pyxattr-0.6.0.ebuild b/dev-python/pyxattr/pyxattr-0.6.0.ebuild
new file mode 100644
index 000000000000..dd442451271d
--- /dev/null
+++ b/dev-python/pyxattr/pyxattr-0.6.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python interface to xattr"
+HOMEPAGE="http://pyxattr.k1024.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	http://pyxattr.k1024.org/downloads/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="sys-apps/attr"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -i -e 's:, "-Werror"::' setup.py || die
+	# Bug 548486
+	sed -e "s:html_theme = 'default':html_theme = 'classic':" \
+		-i doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake doc
+}
+
+src_test() {
+	# Perform the tests in /var/tmp; that location is more likely
+	# to have xattr support than /tmp which is often tmpfs.
+	export TESTDIR=/var/tmp
+
+	einfo 'Please note that the tests fail if xattrs are not supported'
+	einfo 'by the filesystem used for /var/tmp.'
+	distutils-r1_src_test
+}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyxattr/pyxattr-9999.ebuild b/dev-python/pyxattr/pyxattr-9999.ebuild
new file mode 100644
index 000000000000..4d14a6c4e273
--- /dev/null
+++ b/dev-python/pyxattr/pyxattr-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1 eutils git-r3
+
+DESCRIPTION="Python interface to xattr"
+HOMEPAGE="http://pyxattr.k1024.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/iustin/${PN}.git"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="sys-apps/attr"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+src_test() {
+	# Perform the tests in /var/tmp; that location is more likely
+	# to have xattr support than /tmp which is often tmpfs.
+	export TESTDIR=/var/tmp
+
+	einfo 'Please note that the tests fail if xattrs are not supported'
+	einfo 'by the filesystem used for /var/tmp.'
+	distutils-r1_src_test
+}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pyxdg/Manifest b/dev-python/pyxdg/Manifest
new file mode 100644
index 000000000000..6c424c4849f4
--- /dev/null
+++ b/dev-python/pyxdg/Manifest
@@ -0,0 +1,6 @@
+AUX sec-patch-CVE-2014-1624.patch 1867 SHA256 1108675e64e51730ff5411f7e7dfab9fa68de66be0afaa73a46a1472d75766e8 SHA512 f0ff5255108b7a5774d376a8892f1120f5056ec92fa543af7e5aabe3792e7ecd347ac78ff5c04ab36db35bba513a412f6aa06fe718933317a903264bd184b712 WHIRLPOOL 9a4df7948bc32fa8f471f6edb7066318231666d90ff4038733ffaae7ceb303c930bc9c552f72a08b978c0b259e802d24bba6e01383a7b836989f339ee673909a
+DIST pyxdg-0.25.tar.gz 48935 SHA256 81e883e0b9517d624e8b0499eb267b82a815c0b7146d5269f364988ae031279d SHA512 86cbf3a54fb8e79043db60dcdbb3fb10013ae25a900fa3592edc8a24bf3f440c19bc04626c7906293c785fcb56eab9d87d209b723b5baa872376ba1eb86758b6 WHIRLPOOL 8e77c83f52c5836f4476645fc1d297311c1537e60a8fe364c75c842baf0530def1a483c19489af87ec78d340e630af18ed9a210cecc56f183037e34e58e0e450
+EBUILD pyxdg-0.25-r1.ebuild 755 SHA256 e2804971f145cabaf5f863be926d8ea37db9eb640d5029121461b087e9f7453a SHA512 f4f92b92d43107ea6d2aad282683b001db8b89d5747a9dcd33ac81b1eb908ab755f70d7484094bc455c578b07798fd149875675fda5e380918182d3653df536f WHIRLPOOL 24d17e3bf211c3ba5ded10e1e533f558e9cb8dbf83228785c6d9d2d38f172ba68e403ed570787c709b512c91b3365230f00f598323f5652d5d97bc67dae10135
+MISC ChangeLog 3867 SHA256 69b4f3a38aae191bf88819dd742cb8d8175d0c2066a98a7cf62ed348bd4d9689 SHA512 f19d25c84f4a908d12164d490ad24043938d1ccde3decc131f05dd8aa0e8aa43cd87b9d9be2565c8f7b9990e2179cf1b4db087b8bd649a13dc0b05e02913b902 WHIRLPOOL 33218839d599545e5317a84856c6b39778cc899f1bd79b931c254f4a62290ed4766b5e2366c40b4d37429df5784821f82e678d40dbc3e8edd8962b6a1b1e67cc
+MISC ChangeLog-2015 15451 SHA256 1d868c3e1f5c914af9129a25ffaae92c842953aa5ebf1d178b296d70c1587a03 SHA512 aea060e1d14cb0b1ebce57a0e39b8c912b6596eef127e3e177a28db5734c1fd29b7f68ffa166ecdc7cf497d8349bfb06439323c1d0a1785a409386fdff7c8471 WHIRLPOOL 63851009dcb9e38ef5d735380634f663e723fbbd17d96fb700ef07b9d9d67abae0a5000531c942364150811c443101a0d64fc85a26ae344b9338cb2c9dc9b997
+MISC metadata.xml 487 SHA256 7ac5dfd197aca1d7078bed530fdf18fb4b774a6766e821ab7742bdc618a12f69 SHA512 f00421023d46b9aa32d8038c5ba8bfdb1b60a732932d64f7d11fe6f0c163b734182e2162dde2ba663d7c74ba8c754ece721dfbfa0b8fa3081be622dfff3949ea WHIRLPOOL aff13a0c29ef2d84012aaae96aed3994e32e8c001b5aae0083f1446869da3185f92eeee854ee7a6a971e0421ec438a4a7384ceddbc3a84f046c6a7819b9e1bcb
diff --git a/dev-python/pyxdg/files/sec-patch-CVE-2014-1624.patch b/dev-python/pyxdg/files/sec-patch-CVE-2014-1624.patch
new file mode 100644
index 000000000000..d94c0a42bddb
--- /dev/null
+++ b/dev-python/pyxdg/files/sec-patch-CVE-2014-1624.patch
@@ -0,0 +1,54 @@
+Improve security of get_runtime_dir(strict=False) 
+https://github.com/takluyver/pyxdg/commit/bd999c1c3fe7ee5f30ede2cf704cf03e400347b4
+diff --git a/xdg/BaseDirectory.py b/xdg/BaseDirectory.py
+index cececa3..a7c31b1 100644
+--- a/xdg/BaseDirectory.py
++++ b/xdg/BaseDirectory.py
+@@ -25,7 +25,7 @@
+ Note: see the rox.Options module for a higher-level API for managing options.
+ """
+ 
+-import os
++import os, stat
+ 
+ _home = os.path.expanduser('~')
+ xdg_data_home = os.environ.get('XDG_DATA_HOME') or \
+@@ -131,15 +131,30 @@ def get_runtime_dir(strict=True):
+         
+         import getpass
+         fallback = '/tmp/pyxdg-runtime-dir-fallback-' + getpass.getuser()
++        create = False
++
+         try:
+-            os.mkdir(fallback, 0o700)
++            # This must be a real directory, not a symlink, so attackers can't
++            # point it elsewhere. So we use lstat to check it.
++            st = os.lstat(fallback)
+         except OSError as e:
+             import errno
+-            if e.errno == errno.EEXIST:
+-                # Already exists - set 700 permissions again.
+-                import stat
+-                os.chmod(fallback, stat.S_IRUSR|stat.S_IWUSR|stat.S_IXUSR)
+-            else: # pragma: no cover
++            if e.errno == errno.ENOENT:
++                create = True
++            else:
+                 raise
+-        
++        else:
++            # The fallback must be a directory
++            if not stat.S_ISDIR(st.st_mode):
++                os.unlink(fallback)
++                create = True
++            # Must be owned by the user and not accessible by anyone else
++            elif (st.st_uid != os.getuid()) \
++              or (st.st_mode & (stat.S_IRWXG | stat.S_IRWXO)):
++                os.rmdir(fallback)
++                create = True
++
++        if create:
++            os.mkdir(fallback, 0o700)
++
+         return fallback
+
diff --git a/dev-python/pyxdg/metadata.xml b/dev-python/pyxdg/metadata.xml
new file mode 100644
index 000000000000..967f6f4f3925
--- /dev/null
+++ b/dev-python/pyxdg/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <doc lang="en">https://pyxdg.readthedocs.org/en/latest/</doc>
+    <bugs-to>https://bugs.freedesktop.org/</bugs-to>
+    <remote-id type="pypi">pyxdg</remote-id>
+    <remote-id type="launchpad">pyxdg</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyxdg/pyxdg-0.25-r1.ebuild b/dev-python/pyxdg/pyxdg-0.25-r1.ebuild
new file mode 100644
index 000000000000..eb164715e435
--- /dev/null
+++ b/dev-python/pyxdg/pyxdg-0.25-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+inherit distutils-r1
+
+DESCRIPTION="A Python module to deal with freedesktop.org specifications"
+HOMEPAGE="https://freedesktop.org/wiki/Software/pyxdg https://cgit.freedesktop.org/xdg/pyxdg/"
+SRC_URI="https://people.freedesktop.org/~takluyver/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}]
+	x11-themes/hicolor-icon-theme )"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+PATCHES=( "${FILESDIR}"/sec-patch-CVE-2014-1624.patch )
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/pyxenstore/Manifest b/dev-python/pyxenstore/Manifest
new file mode 100644
index 000000000000..33b80110cc4a
--- /dev/null
+++ b/dev-python/pyxenstore/Manifest
@@ -0,0 +1,6 @@
+DIST pyxenstore-0.0.2.tar.gz 4471 SHA256 a495add5b6f3f2f524d70b37b068f5e7f69f4e3fa9dc5602d13a6507e8a10a5a SHA512 0c4cfccd1f943d39f0524798504069514bd811886714b121cf03addb344ca4aa10a718178b3e8eb1cfc9ac9e4c2d6e61a1bbfaa47e1ec4941a7429e629f982d0 WHIRLPOOL 8cc88f1786c28495f601c0a055cfbe33387cf8f8eafc1d1e5739648576e30766ac0f93380fb1a05bec53f2e9965a76ce2106bc33e6d7ab3f6e1bd8e2fb4522c7
+EBUILD pyxenstore-0.0.2.ebuild 447 SHA256 d29903ac904e5230734ce3ac9c6e201fd686fa334a0eeb43d3391d0493bc13e3 SHA512 a70a3725fb0ebaff6cc595c2f73b4aff0cbc03e40a60a2904bec71f555b3f4d8cf6ea1d2ed0031602c2100148806f1ec6d531f53b4646981b38a9281c63d0dc9 WHIRLPOOL ecee416ffb5928d10e6d5ad858e71eaaf5f54dea3a4c625a512f32306de344c217c6b331c9a08d9861a1f0fd7a3585a95f859202be31aa7ede08c72e431e9b72
+EBUILD pyxenstore-9999.ebuild 461 SHA256 9c3a09f201c9e1b826618c2cb00626718f98d1788e04be8aee10fd57e1f195ef SHA512 5242a4e64f8caf44d6011873d9f380193a0496e30ff8ff64cf37a05f17932407bf41fec78f267358ad378426ccfd9db49f45eac02271fe2ed8e8e735d4290051 WHIRLPOOL 0338fc2376006cd869001dd3e23c5bf71cdbf6ef0cf7d88865123e57278471582890c9079473a4a950bbe3aec9db00ac53ee736faaff8d6d8d61772544135a2a
+MISC ChangeLog 2625 SHA256 2be8027c7c96ed75d57c52a2dc9dc761f9b671281601f8b5c5b30ce5cf7dde7a SHA512 3e18626c46fd0a9218c56c5c91d75757d1717dd221c519e736e439021aefc6711f4511f0d694c81f08c4f5fa7fd825b8fdf5267230cdeea5acd531ecc8c94f62 WHIRLPOOL 7b9faf0735fd9a2d4e3546f8648e73f1507efe08f94f2e1a4ee27806b475502ce62bf48d28204c892846832ec91cc29a41bdd04d9b2f825c99089219feb0b8e1
+MISC ChangeLog-2015 1098 SHA256 557a6d520a03524a0a892aae8a1a529915e6e410236cfb2917188bf69d359e45 SHA512 59517dbb20ca63ddfa3b0e352af9bf939e7a05e44ef9330004794ea6bdc8f01cf4117716ca7b201e0ed5382622263d42c8795e9f7ac6772fceca7185412f2ad9 WHIRLPOOL 663ba0be4c90d25b466727426f845baaf6636f5fcb649a61c3341e265f36727cd6e4754453e56d027f936aaf8b531dadca08ec2c380401b949af24ecbd6f16d1
+MISC metadata.xml 525 SHA256 5c12df1511e613c16791176f73dfae92cff53064dcd8a4b7d4d1d82ee638d726 SHA512 af90fd310efaa30e7a4602053658824a20debdd9daf283d6701964f645c9c51d95debffe78d65a995b2bbc8d9b06968e9096259ea8a93f4af0cc7ceabccafded WHIRLPOOL 2dbe915839c95c184bb2e4d120e56e7462f438268563e1e596e6eacc43ed7e9fae4a9d836952a8a3ac59a0c3d7c575bb6f4fb90a41e312ac20457d5136dd1a96
diff --git a/dev-python/pyxenstore/metadata.xml b/dev-python/pyxenstore/metadata.xml
new file mode 100644
index 000000000000..526159765e19
--- /dev/null
+++ b/dev-python/pyxenstore/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyxenstore</remote-id>
+		<remote-id type="launchpad">pyxenstore</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyxenstore/pyxenstore-0.0.2.ebuild b/dev-python/pyxenstore/pyxenstore-0.0.2.ebuild
new file mode 100644
index 000000000000..2347be7a9f85
--- /dev/null
+++ b/dev-python/pyxenstore/pyxenstore-0.0.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides Python interfaces for Xen's XenStore"
+HOMEPAGE="https://launchpad.net/pyxenstore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+
+DEPEND="app-emulation/xen-tools"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/pyxenstore/pyxenstore-9999.ebuild b/dev-python/pyxenstore/pyxenstore-9999.ebuild
new file mode 100644
index 000000000000..26a6a6466e68
--- /dev/null
+++ b/dev-python/pyxenstore/pyxenstore-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 bzr
+
+EBZR_REPO_URI="https://code.launchpad.net/~cbehrens/pyxenstore/trunk"
+
+DESCRIPTION="Provides Python interfaces for Xen's XenStore"
+HOMEPAGE="https://launchpad.net/pyxenstore"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="app-emulation/xen-tools"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/pyxml/Manifest b/dev-python/pyxml/Manifest
new file mode 100644
index 000000000000..bd41a9f029db
--- /dev/null
+++ b/dev-python/pyxml/Manifest
@@ -0,0 +1,6 @@
+AUX pyxml-0.8.4-python-2.6.patch 1749 SHA256 03c4eb073c58e7c28a22ff702a296ba4c4fe11a64d931ada6216d1876c6118e8 SHA512 3c79b8d58da01bbfb1ac3d20106e9ed40b1e3c8d52abf216c764efc505a08ce37d1d06d282e7ba311f00f0839c4314d2664efa57228e6007ebf26ca5029f5a9d WHIRLPOOL e24c30aaae8d378cf66cd09b9e8d99971577e942ebb29facfc96bfb674050dcc04b39db80068f362f836376d797075b369fccb76bc00dfdb556a432168cd8551
+DIST PyXML-0.8.4.tar.gz 734954 SHA256 9fab66f9584fb8e67aebd8745a5c97bf1c5a2e2e461adf68862bcec64e448c13 SHA512 68d9802a58b8ce90d668d2ba659136dc5377e224fdb837284fdcaf640f28b3bb400bf485d602689905d56121b9ffaa7f7758b4a2f262d1321c8b9890952c8a1e WHIRLPOOL 5ae5df4be39ca9380ac636c6b84cea71c2def2a1404e5e2895a75e14ce3bd70e8ad60f7368892b172aed56e1aa8443a7554dda10fddefbc6b6c0816f087fc6a6
+EBUILD pyxml-0.8.4-r3.ebuild 1768 SHA256 ddfe254be878a84bfd1d577e0a980735440428e95307478495980509e8544138 SHA512 55dc8fe3984b8611930fe72f61f4275f33dda8b69c025e8ceefe33827d08cdabbceddb37ae67e547d149434fecabe3b324370d15fbf504b384814368297eb6af WHIRLPOOL eb52c99ad44b55fdef1fc50c34b51aaf8ac4064171bd8f3cd268ecc3f42f79108f6be64cbc177d740b298bbc0c1df31568c46d9091cd21e3ec3bf779a6694e76
+MISC ChangeLog 2597 SHA256 43ab8d06a6fb8f9e5c1111a9d4edb0f81c6d0c9efd909ab6b185ff86218b7bf6 SHA512 034baba99b692f291e2a550a2a3b5b028da8438cf7bc77f7d8e3ebc91b5b99a2ed081d9153792ffd44f387a09279a3604e98b62d7b6e502edc523f4dd331c659 WHIRLPOOL 151bd31c494f8e43cd645897f390ee8dd80b5eb2252bf0e057abced9471534ac2f0c5529c972e979e503172a3113d0fe1a295fa8c7c36caf1cf63c39a98d5140
+MISC ChangeLog-2015 11079 SHA256 701147f01961cc97eafbec8fe95dd52aff24ea4484caaffa3316e966bd410a9d SHA512 8587831748c2e257a74556862618ac79f4356c97cdd08f2e58eb5ef743aa62736844c186c1f80d64063f08428b1020f027f71aba8b4ffbea667e14c77f857db4 WHIRLPOOL a321e60ac98e281b525182008d59d610f56227342ce0669ef806dd4d9b8eb4cfad705028440564c003b962cfa776d6f6b04b31626f74b7333ce06e87c18a191b
+MISC metadata.xml 315 SHA256 91007d1cee32388f663b2a3912a87b71e96d99bf95623b54bf8303db06d3ee0f SHA512 36dc9d30db0cf2d1a46dfcf5869fa8f77e762291893b1e51ced88d22d599d06575de9a6a1658a8a3194daa174bcd0f69bbb59c7f671ad448eee0e28b0b56a016 WHIRLPOOL cf998a31daf3eb71718ae5f95ee7b65919c61613dfeb5ffea36a61c9aabcea73afcb87e6319437bea249f73684e10fb71ac05eada60610ea6abd61dad8876de0
diff --git a/dev-python/pyxml/files/pyxml-0.8.4-python-2.6.patch b/dev-python/pyxml/files/pyxml-0.8.4-python-2.6.patch
new file mode 100644
index 000000000000..d29b0b6a9eb2
--- /dev/null
+++ b/dev-python/pyxml/files/pyxml-0.8.4-python-2.6.patch
@@ -0,0 +1,28 @@
+diff -rupN PyXML-0.8.4-old/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py PyXML-0.8.4/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py
+--- PyXML-0.8.4-old/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py	2008-12-15 16:54:36.000000000 +0900
++++ PyXML-0.8.4/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py	2008-12-15 16:57:02.000000000 +0900
+@@ -24,8 +24,8 @@ class ParsedAbbreviatedAbsoluteLocationP
+         self._rel = rel
+         nt = ParsedNodeTest.ParsedNodeTest('node', '')
+         ppl = ParsedPredicateList.ParsedPredicateList([])
+-        as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
+-        self._step = ParsedStep.ParsedStep(as, nt, ppl)
++        as_ = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
++        self._step = ParsedStep.ParsedStep(as_, nt, ppl)
+         return
+ 
+     def evaluate(self, context):
+diff -rupN PyXML-0.8.4-old/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py PyXML-0.8.4/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py
+--- PyXML-0.8.4-old/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py	2008-12-15 16:54:36.000000000 +0900
++++ PyXML-0.8.4/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py	2008-12-15 16:58:58.000000000 +0900
+@@ -28,8 +28,8 @@ class ParsedAbbreviatedRelativeLocationP
+         self._right = right
+         nt = ParsedNodeTest.ParsedNodeTest('node','')
+         ppl = ParsedPredicateList.ParsedPredicateList([])
+-        as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
+-        self._middle = ParsedStep.ParsedStep(as, nt, ppl)
++        as_ = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
++        self._middle = ParsedStep.ParsedStep(as_, nt, ppl)
+ 
+     def evaluate(self, context):
+         res = []
diff --git a/dev-python/pyxml/metadata.xml b/dev-python/pyxml/metadata.xml
new file mode 100644
index 000000000000..3fd7e1e6f1fe
--- /dev/null
+++ b/dev-python/pyxml/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pyxml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyxml/pyxml-0.8.4-r3.ebuild b/dev-python/pyxml/pyxml-0.8.4-r3.ebuild
new file mode 100644
index 000000000000..a21d3cca4dce
--- /dev/null
+++ b/dev-python/pyxml/pyxml-0.8.4-r3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+MY_P=${P/pyxml/PyXML}
+
+DESCRIPTION="A collection of libraries to process XML with Python"
+HOMEPAGE="http://pyxml.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD CNRI MIT PSF-2 public-domain"
+# Other licenses:
+# BeOpen Python Open Source License Agreement Version 1
+# Zope Public License (ZPL) Version 1.0
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples"
+
+DEPEND=">=dev-libs/expat-1.95.6"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${P}-python-2.6.patch"
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	# use the already-installed shared copy of libexpat
+	distutils-r1_python_compile --with-libexpat="${EPREFIX}/usr"
+}
+
+python_test() {
+	# Delete internal copy of old version of unittest module.
+	local BROKENTESTS=(
+		test_filter
+		test_howto
+		test_minidom
+		test_xmlbuilder
+		unittest
+		test_expatreader
+	)
+
+	for test_file in ${BROKENTESTS[@]}; do
+		test_file="test/${test_file}.py"
+		einfo "Removing dubious test \"${test_file}\""
+		rm ${test_file} || die "can't remove ${test_file}"
+		eend $?
+	done
+
+	cd test || die
+	"${PYTHON}" regrtest.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( ANNOUNCE CREDITS doc/*.txt )
+
+	distutils-r1_python_install_all
+
+	doman doc/man/*
+	if use doc; then
+		dohtml -A api,web -r doc/*
+		dodoc doc/*.tex
+	fi
+	use examples && dodoc -r demo
+}
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
new file mode 100644
index 000000000000..5b0040da83b6
--- /dev/null
+++ b/dev-python/pyyaml/Manifest
@@ -0,0 +1,5 @@
+DIST PyYAML-3.12.tar.gz 253011 SHA256 592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab SHA512 e16d8b7f4f026b6a95b11fb59c54ec5f114f6f516294eaa95e718abdf5d37c17a9c4b5e0a0a61fca04e801792d9b7fb801087cf849ff22b9581f6af204b1883a WHIRLPOOL ccea5e8931b8c57958f0cca0c58dfe71c42e878b233ba4d9a08aa361b874c06967998bb460772e311b42ecf4cb012a35c3aa9dbff620c6f413bbad8e3fffbaaf
+EBUILD pyyaml-3.12.ebuild 1049 SHA256 1e6d1787787890d3e04dbf1031963faeaa5f9cbdd98d9d7ec7c6a8f16d14071c SHA512 2cca145f233afc07bbbd42aeab6db276f6c5f9695aa5cf4911c128fdd08dd8f0efa0f80ee9a696356d30c825e5a76cce2c8f56c87f59d7bb575771bb747d8419 WHIRLPOOL 509ec4f5cbcda2c2571c3df796a8833b0710afd4f1fe28dfe57ff62bd2f2815cbaa90d26aa4db714f937fcf09e7a3cb2b22265a747fb56355f083b520f6e6a53
+MISC ChangeLog 4533 SHA256 858ab20c7207f1661ed17a33156393925d929b186b966ab982aca815f63932b9 SHA512 1d383094f095f0f4d82b119553a1e20e03612aab8f3e143085a8b30572584d8fb85af4f1f2ba0a7e1c8ceb151283cacbc8f5945b928eff96b1b1084248df340a WHIRLPOOL 6b9ffaa9a7f9647db8293dcf46cab89f4b14335f7debab9fa476d142e571a4e1ea3d0b390fd905f672395bca6a8bde2ad835e9f45961d497d2ffec2291cf81b3
+MISC ChangeLog-2015 6719 SHA256 1dad907b4b3fe47b2ebb65f53334a655e76ca4b2cee9d284a7bf74e0e9d2d7af SHA512 a7cd5dc976db682187e476a5877206058487455a7984911dbf405796a8dda86730fef4d3b02f0c69d63ebad9bb137dee7d8b77797112d49d637b70dbad8f10ee WHIRLPOOL 321d5918f45df3887dabe1af89c20b7f923538c578f7f14938221a7a6d2019829e14c48c2dd94ba80f33293ef61fe414f93d6eaf15e8a954bb13d9f797751568
+MISC metadata.xml 345 SHA256 58bc72ec4c781ee155cdaf92625034dc9f4bedf6c2edc31d83c0bb59db48adc2 SHA512 1fdee5219c989b3edf11bdb63264c6ca6bd54fb1f44907bf20ce7ee6b1968c9c6f2c94363698be87d92eb6cd07a034acca7dbcffaeac40d2add8d57a240772da WHIRLPOOL 2ddbda833089f2e90a10fb389b147ea888957e9c681bed88f0dd4f60e1ef543f44983b179a0e37cba80501bf616fcd05af653eea7168f848b31c78d162ef8ae1
diff --git a/dev-python/pyyaml/metadata.xml b/dev-python/pyyaml/metadata.xml
new file mode 100644
index 000000000000..98375f20aa10
--- /dev/null
+++ b/dev-python/pyyaml/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <use>
+    <flag name="libyaml">enable support for C implementation using libyaml</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-python/pyyaml/pyyaml-3.12.ebuild b/dev-python/pyyaml/pyyaml-3.12.ebuild
new file mode 100644
index 000000000000..5ba03197eff6
--- /dev/null
+++ b/dev-python/pyyaml/pyyaml-3.12.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_P="PyYAML-${PV}"
+
+DESCRIPTION="YAML parser and emitter for Python"
+HOMEPAGE="http://pyyaml.org/wiki/PyYAML https://pypi.python.org/pypi/PyYAML"
+SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="examples libyaml"
+
+RDEPEND="libyaml? ( dev-libs/libyaml )"
+DEPEND="${RDEPEND}
+	libyaml? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*') )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_configure_all() {
+	mydistutilsargs=( $(use_with libyaml) )
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}
+	fi
+}
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
new file mode 100644
index 000000000000..e6d1e74e7a1a
--- /dev/null
+++ b/dev-python/pyzmq/Manifest
@@ -0,0 +1,7 @@
+DIST pyzmq-14.4.1.tar.gz 995366 SHA256 cb4a59875fdc26315045d800bac008b8e10a4cf2d72ac9af2fc45ef6ac8f330a SHA512 4b71677e4bfa771177a34dbff59cf6dfd54310a8996689a3d62902aaba35c7cf2ad6b7da806f9e189ad4b89fcefe9cbb3e192788eecd5d2c269e8a980b4d50fa WHIRLPOOL f6c093023b4494e1f9293a81ac86dcc55ff05f7ae10bb9677ff4fffd2e38fefe2462eb241c74b1ee283958a8546b128585c78c644dae544aa38f4b9c1f3e3ad8
+DIST pyzmq-16.0.2.tar.gz 1026531 SHA256 0322543fff5ab6f87d11a8a099c4c07dd8a1719040084b6ce9162bcdf5c45c9d SHA512 40eaf8ce39db86ab3866890d74b92bd6f20d4ae827828a8772003656d899d10ffcfc222d21f344d9daba390824e6c43b9f34e31beb604ec5ee1ec199165f4b96 WHIRLPOOL 69db3fc02c16bf16631a56b8cd0a0cd6befa0a8a7251eb72cc53c7cb252dd65304e03b25f27215dc6ed1792ac001b07d2539e40724be0fe0292620f78327161a
+EBUILD pyzmq-14.4.1.ebuild 1562 SHA256 42520bc8d20d582c0a13b083899b06c1289fb586a11b6437226fe01fc83d5421 SHA512 92fede0a5535cf050414e1aaf4e997def66ef18c82708dab3d302973b84dd7309f70af0673d3478fe4fe36e5cc9067e163932d6d5450b834d741af6ddcb3c2ca WHIRLPOOL 894652d5eb8119f31b35e07af885c6c3b16ec82009dc8041c81283e3bea5a7ee9883dfeabb850c4ea38bab3f2bcd2b335d8ee9f1c3f1e571c8c14342c7cdab8c
+EBUILD pyzmq-16.0.2.ebuild 1745 SHA256 5cba66c42e122d803d6b28af5d76de0716f6ae521e175191c13fe73be44ca43f SHA512 99d4c0ab976ce780c7424e08538e11b2f64e3eddf0d754563fb161dd864c4f50d08a507a0e34847d2dfe2d1fa4d7a2313d264dbc4f56c8e08d1c7e9f0166ca46 WHIRLPOOL a161e602928a5f4cfc8745d0b8ced7787d0258c644bd5b3c8883a7c5da3dd963c49a43abe5d862e5d50750d944a640ffcc11ba469e7e52eb3423a04ff68de34d
+MISC ChangeLog 5047 SHA256 84084283547b0e4a9768564a53c2984041beea1620d44bff328dddc4e61e9a27 SHA512 b1342e7d8a3c0f1f76a3d9cbd02884d2479bacb45051f72ef6907baec04103b63b6dc03a08c77afdce47696a9ac6f31d1990a58eabbbcfedb1fd4a66cab08d01 WHIRLPOOL 2fe35cea0587811c5f8af9cccedb78e6f19dc7cf4ba411005d567a93d26a5d02c00940ba9604ff7a0f95a0776b53d228a72d1ddf40740d8494032660d3949004
+MISC ChangeLog-2015 10731 SHA256 0ab010ac1d22a5265250ce5d04a26e37a159b74af8d89076cd1b74cc3145d32a SHA512 9f503f74febe6faff049c8f39ce3577962d9cae581e5d3932cd9bbfd533ef8adcaeaf38c9cef5a1d896f1ffc386e857ca9f1e93e87e2187aed9b81f151e8ba07 WHIRLPOOL a9fc009dc59ba2900eb6a38d846fb54c0406ed37431138db2b26d0176685c703c6203af25087a97ccd515a7b2901d3ed89f6af1f8b0dbef9599fb2811e777ba0
+MISC metadata.xml 405 SHA256 20e79c6cbd5ccccc558b5573a7d45706e68a6129d7ee0858774195b3d4844afc SHA512 9796251e90600e41e8575d25e754dd730e135145ba9b12720763f871a37ada8147f1559a753bb1748021a47588154a2b214d2e151e3f38cef115ed75a9027227 WHIRLPOOL 15113fcbd536865906dbda55b6f15f4c249812adc002bc53346755de2840efdc94a373ead35c549130b6068faff2b77024f1d633a1f64309c8e05e04fdd8d436
diff --git a/dev-python/pyzmq/metadata.xml b/dev-python/pyzmq/metadata.xml
new file mode 100644
index 000000000000..23953d2e43de
--- /dev/null
+++ b/dev-python/pyzmq/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <use>
+    <flag name="green">Enable gevent compatibility with zeromq</flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">pyzmq</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyzmq/pyzmq-14.4.1.ebuild b/dev-python/pyzmq/pyzmq-14.4.1.ebuild
new file mode 100644
index 000000000000..f83f0a659620
--- /dev/null
+++ b/dev-python/pyzmq/pyzmq-14.4.1.ebuild
@@ -0,0 +1,60 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
+HOMEPAGE="http://www.zeromq.org/bindings:python https://pypi.python.org/pypi/pyzmq"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples green test"
+
+# Ensures installation of gevent for test phase
+REQUIRED_USE="test? ( green )"
+
+PY2_USEDEP=$(python_gen_usedep python2_7)
+RDEPEND=">=net-libs/zeromq-2.1.9:=
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/cffi:=[${PYTHON_USEDEP}]
+	green? ( dev-python/gevent[${PY2_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+	)"
+
+python_configure_all() {
+	tc-export CC
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	if python_is_python3; then
+		einfo "Skipping python3 due to lack of support by gevent"
+	else
+		nosetests -svw "${BUILD_DIR}/lib/"
+	fi
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyzmq/pyzmq-16.0.2.ebuild b/dev-python/pyzmq/pyzmq-16.0.2.ebuild
new file mode 100644
index 000000000000..92fea0c9232b
--- /dev/null
+++ b/dev-python/pyzmq/pyzmq-16.0.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit flag-o-matic distutils-r1 toolchain-funcs
+
+DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
+HOMEPAGE="http://www.zeromq.org/bindings:python https://pypi.python.org/pypi/pyzmq"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND="
+	>=net-libs/zeromq-4.1.2:=
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/cffi:=[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7)
+"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2)
+		www-servers/tornado[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	tc-export CC
+	append-cppflags -DZMQ_BUILD_DRAFT_API=1
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_compile() {
+	esetup.py cython --force
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	${EPYTHON} -m pytest -v "${BUILD_DIR}/lib" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyzor/Manifest b/dev-python/pyzor/Manifest
new file mode 100644
index 000000000000..2d2c026b8bb4
--- /dev/null
+++ b/dev-python/pyzor/Manifest
@@ -0,0 +1,7 @@
+DIST pyzor-0.7.0.tar.bz2 78555 SHA256 6d9ca62bd4aa9a0210adb9d4c8ff2b38bb2cd051f1517ce29e88d7fbe4b1026d SHA512 40026fc0276b4cf60fe7dfe30e2d4d4d1f220cf860b8aaef9d983e632a7d87bc8deb3430ded7520a69269ef56550117735a6e3c8d046d4cad7066f8597ead3cd WHIRLPOOL dd8466477e38362fa0a64ec66822ae3820c22f8ae13b40002145b1e688d17c17edfb800eb44679ff961e74b667daa43ef09d8eadb92f683c9e73c9b00fad23b9
+DIST pyzor-1.0.0.tar.gz 126276 SHA256 548bc461c01e790cf8db1f26d9f66b281f3aa3cf5f5a6fd647071360ed663ef1 SHA512 b3fb8b2c5261e187a2ab3a5a3b12d221df7de08766c6bb2ad9990c0f23517534871ecc9d5ad529e79b0d0aef8b2b800728320c57435a8c0d8c3f80a4ba0f7e4a WHIRLPOOL ad92ca30c116b1c22cc49b5643ecb03880ef1911d7f2a59cf9b655ccd5fa5167e0ccdb890d92754ed1b1c0730785c186f6615c569b6bbbc36aed26e2423037b1
+EBUILD pyzor-0.7.0.ebuild 1570 SHA256 95c92d54d74766f4dd5127bfdc2fa51bd307543d076ec8190d0a0bba458c3c49 SHA512 c57af2dfe4662323575d9a992c1d5b385566bd5e7b03b3dc9a3d534b992f93effc991f6b7430eabfb518bc7eaeabb9018b1c6183501a69a948ca3a63c00377fd WHIRLPOOL 5d69dab6f570daa5debd4ef457ec988e062a09d93a1c0f61086dadf167a7e835e6974f7b0c7f074fc6124d4016e12305443d3140fe5090df2e47e03e6f3b75ad
+EBUILD pyzor-1.0.0.ebuild 1790 SHA256 51ba05c0bf2553b394381d3d0c3d12a6ddf5d59698cfa6f9c917e533749f57ce SHA512 1d1ff3d8dea3a968b1244d032767ecbf6819bdc8c869869ba74c81569bb8dcd7dfa61f14a3e844403b5065f12b950daad1b90560a59c2e77a8b93939e3f53b04 WHIRLPOOL 1a14ad28778b88b0c34be9df70939129e702153e6207a105d441b900b6081b90c9bc51b7e191d87f7a322ad3ba5d86f5c73fbbc348a9d7af55d1ab380d45c4b6
+MISC ChangeLog 3542 SHA256 8235388ca136a871a3dafd03912248c1e128b4ced6d8c7ada5af7466c1929cb2 SHA512 ad909bd921877f17ac980fa1476d1b1897786bd93c982dc1db756b37a4a04c0a4e297b20f5b8e31dae765e3151d7bfbe0e3246fca1755ac9afb5de2fa58e3414 WHIRLPOOL 0d0b8bd3afe8e3b5679b38a959faecd8cb2e28625983f23c4ba70bcc090dba6212c72fd1c59a03a03b8a129f8182a69bf463a039c1d9e483ff53c4c0895be79d
+MISC ChangeLog-2015 9029 SHA256 e60081e5a832eb1c4edf495f9b1fa2df7fea5050ceedcdaf8c40f71ead61e94c SHA512 ba37793d917d4cde0149bd61ffbde792790a05db8baa253d095e9716b1dad661ca643dfc4e97bcac3b54fc4cfa3f5666dbc6958bf185b3f354541441661ed290 WHIRLPOOL ccf73280a42dc67e97be685ddc39e9f008d9a8a5247ef16cd6b73a24646e4f61a4ec7fab3ebbc0921887c8e208b7fbf527d259549178c3d614977d57a0ba1448
+MISC metadata.xml 637 SHA256 123353a10d15ca0c0694c62ed5e21b468d103f6947695bc816d00a7a8c5d87c5 SHA512 067c5454713ea8fd1d14378537f65eec5c1c58b0b73a05a9a401b6e80afc46050e5f2020cfefff5d5925140f5b02128f44f179480066f8f325efd61b049899a2 WHIRLPOOL 6a85fdae96db8cfb433b52b03ebe48a1029b2ce9482e982b7769f2b6a986b714533d8d70f100f6bfa3f66716479555656d68b72ebd4bbdaf7fc64a1d28ae80d6
diff --git a/dev-python/pyzor/metadata.xml b/dev-python/pyzor/metadata.xml
new file mode 100644
index 000000000000..601b2a901647
--- /dev/null
+++ b/dev-python/pyzor/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <use>
+    <flag name="pyzord">enable support for pyzord</flag>
+    <flag name="mysql">Enables mysql support</flag>
+    <flag name="redis">Enables redis support</flag>
+    <flag name="gevent">Enable support for the gevent based handler</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">SpamExperts/pyzor</remote-id>
+    <remote-id type="sourceforge">pyzor</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyzor/pyzor-0.7.0.ebuild b/dev-python/pyzor/pyzor-0.7.0.ebuild
new file mode 100644
index 000000000000..e1057b928862
--- /dev/null
+++ b/dev-python/pyzor/pyzor-0.7.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+PYHON_REQ_USE="gdbm"
+
+inherit distutils-r1
+
+DESCRIPTION="A distributed, collaborative spam detection and filtering network"
+HOMEPAGE="http://pyzor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="mysql pyzord redis test"
+
+RDEPEND="mysql? ( $(python_gen_cond_dep '>=dev-python/mysql-python-1.2.5[${PYTHON_USEDEP}]' python2_7) )
+		redis? ( ~dev-python/redis-py-2.9.1[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# https://sourceforge.net/apps/trac/pyzor/attachment/ticket/196/
+DISTUTILS_IN_SOURCE_BUILD=1
+
+REQUIRED_USE="test? ( mysql redis )"
+
+python_test() {
+	# https://sourceforge.net/apps/trac/pyzor/ticket/196
+	# In this ticket it clearly states the suite is written for py2
+	# While it's feasible to make it into a py3 ready state, nah
+	if ! python_is_python3; then
+		PYTHONPATH=. "${PYTHON}" ./tests/unit/__init__.py
+	fi
+}
+
+src_install () {
+	distutils-r1_src_install
+
+	if use pyzord; then
+		dodir /usr/sbin
+		mv "${ED}"usr/bin/pyzord* "${ED}usr/sbin"
+	else
+		rm "${ED}"usr/bin/pyzord*
+	fi
+}
+
+pkg_postinst() {
+	if use pyzord; then
+		ewarn "/usr/bin/pyzord has been moved to /usr/sbin"
+	fi
+
+	einfo "If you want to run the pyzor server you will need to emerge / re-emerge"
+	einfo "with use flag mysql and or redis. Without either flag provides only the pyzor client"
+}
diff --git a/dev-python/pyzor/pyzor-1.0.0.ebuild b/dev-python/pyzor/pyzor-1.0.0.ebuild
new file mode 100644
index 000000000000..00d660a811b1
--- /dev/null
+++ b/dev-python/pyzor/pyzor-1.0.0.ebuild
@@ -0,0 +1,66 @@
+# 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} )
+PYHON_REQ_USE="gdbm"
+
+inherit distutils-r1
+
+MY_PV="1-0-0"
+DESCRIPTION="A distributed, collaborative spam detection and filtering network"
+HOMEPAGE="https://github.com/SpamExperts/pyzor/"
+SRC_URI="https://github.com/SpamExperts/${PN}/archive/release-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc gevent mysql pyzord redis test"
+
+RDEPEND="mysql? ( $(python_gen_cond_dep '>=dev-python/mysql-python-1.2.5[${PYTHON_USEDEP}]' python2_7) )
+	redis? ( ~dev-python/redis-py-2.9.1[${PYTHON_USEDEP}] )
+	gevent? ( $(python_gen_cond_dep '~dev-python/gevent-1.0.1[${PYTHON_USEDEP}]' python2_7) )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# https://sourceforge.net/apps/trac/pyzor/attachment/ticket/196/
+DISTUTILS_IN_SOURCE_BUILD=1
+
+REQUIRED_USE="test? ( mysql redis )"
+S="${WORKDIR}/${PN}-release-${MY_PV}"
+
+python_test() {
+	# The suite is py2 friendly only
+	if ! python_is_python3; then
+		PYTHONPATH=. "${PYTHON}" ./tests/unit/__init__.py
+	fi
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/.build/html/. )
+	distutils-r1_python_install_all
+}
+
+src_install () {
+	distutils-r1_src_install
+
+	if use pyzord; then
+		dodir /usr/sbin
+		mv "${D}"usr/bin/pyzord* "${ED}usr/sbin"
+	else
+		rm "${D}"usr/bin/pyzord*
+	fi
+}
+
+pkg_postinst() {
+	if use pyzord; then
+		ewarn "/usr/bin/pyzord has been moved to /usr/sbin"
+	fi
+
+	einfo "If you want to run the pyzor server you will need to emerge / re-emerge"
+	einfo "with use flag mysql and or redis. Without either flag provides only the pyzor client"
+}
diff --git a/dev-python/qpid-python/Manifest b/dev-python/qpid-python/Manifest
new file mode 100644
index 000000000000..ce7dcd15603e
--- /dev/null
+++ b/dev-python/qpid-python/Manifest
@@ -0,0 +1,5 @@
+DIST qpid-python-0.20.tar.gz 226543 SHA256 0344ffd3af3c03d77e90b0700111b00c18a65770b826a63dfe75806ec8ff22f8 SHA512 c3cc466c3b1e13443c9ac1e04d8dfab8fbdb4460fcc828b91e9d520cacdfa69589ccd1928d8d0cb4012c4d0a22ae9e6dc2803488863ccc53bb568e97f8251b44 WHIRLPOOL 1e7061e9005bf787e8a04ac078a2ff6927e69f101e99507f93a4c283cd18c561523ca910186f1d14c161468e35ef738f2a1ac8f5da04b329c7cc8cd75309f490
+EBUILD qpid-python-0.20.ebuild 1190 SHA256 50b0b4972321aa75327fb15ca5afab8662211a3886c49c7e0f3508a636ca5263 SHA512 0689ba4ecc6fc2e742177dbbff9fde9296c6dbc13022d1acc552d2aef40a72323b04b5c0d86312b5db99ae8dbe5cd2e86b05cd5e28c15b83ecf5af3ee9844b4f WHIRLPOOL 33525f30e77380414305791c65f53af01cab4ab6a003577ae5f922855e9f5e930c6129d7968d8d4815bcd760c52ea25fc9435918120b99dcbc37e856c07adc29
+MISC ChangeLog 2439 SHA256 6e9cb2281aa61ac39ecf17e71e30cce40557a0f6ad4ec7990bb1c9c85ebb7613 SHA512 20d8c0ce29aef6365ee1143db342c1f2250f0a5775e073626b8c7b772d8184626bfa4deb1185bd0d265b91a7fb79188de22c699d1e57629f5b9ac48f769e933a WHIRLPOOL b3ae22583f23c62c426480e48ee1b23f44f28ae95895f361285646c02de7677ab05a9c56320559119fc0e26d97701573df678923e38facbb56a423d4fe34ee23
+MISC ChangeLog-2015 844 SHA256 500852c7ae8e8d4bd74c7bc0f885d851078fd2006803ff99c5a230ecd9a1dcc7 SHA512 dbe0b8eb7979de38c615ca4563ce308d5a3b68d31a958c746d65fea4ec9f5b51e4f89d6820c2a5f98f295d1b1e1f283d0c0eb382d7b440bd171ef9671fee5285 WHIRLPOOL cef30b60c9aebee8182f4b5b646dbba1cc6de3182b58ef35d1bda68c59ada7621c0c2db83ab53618bc04ef2d79d8dd82e211c81f22e6c0d43b75d4ccb9ed864a
+MISC metadata.xml 330 SHA256 cf2d7645db2cbaca9db731afc23fe441d2eee32cf5a826782f2bdca30ad5ad51 SHA512 cbe9b9519505842e97e787edbefe2b6b7c46d25784030834dec9b45e53bc8002a84122b987dfd5a7f677888972e9ab9e93dd0ff6e33cc946f2c59ae533aa6ff9 WHIRLPOOL 7fa3169192f7e7fa84f8af3154ef34e00ed11f739c62d1a6da7b02ca1f428292b18535de84e7fa903d5a883307f9d9302d3d55920a0e1772b3ab9f07967ea47d
diff --git a/dev-python/qpid-python/metadata.xml b/dev-python/qpid-python/metadata.xml
new file mode 100644
index 000000000000..af4614a39307
--- /dev/null
+++ b/dev-python/qpid-python/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">qpid-python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/qpid-python/qpid-python-0.20.ebuild b/dev-python/qpid-python/qpid-python-0.20.ebuild
new file mode 100644
index 000000000000..c7d229bf2153
--- /dev/null
+++ b/dev-python/qpid-python/qpid-python-0.20.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A high-speed platform independent enterprise messaging system for Apache"
+HOMEPAGE="http://qpid.apache.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py doc_option
+}
+
+src_test() {
+	# For now rm failing tests requiring making a connection, ? via a running broker
+	# Seems 'we' need figure how to start a broker
+	sed -e 's:def testReconnect:def _testReconnect:' \
+		-e 's:testEstablish:_&:' \
+		-e 's:testOpen:_&:' \
+		-e 's:testReconnectURLs:_&:' \
+		-e 's:testTcpNodelay:_&:' \
+		-e 's:testOpenCloseResourceLeaks:_&:' \
+		-e 's:testReconnect:_&:' \
+		-i qpid/tests/messaging/endpoints.py
+	./qpid-python-test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( ../"${P}"-python2_7/doc/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/qrcode/Manifest b/dev-python/qrcode/Manifest
new file mode 100644
index 000000000000..dbdec8c91367
--- /dev/null
+++ b/dev-python/qrcode/Manifest
@@ -0,0 +1,6 @@
+AUX qrcode-5.1-unicode.patch 961 SHA256 eebada1296d61089bc97a90ee493e9f5ef69066a820900e3fbe2d16f0f7b38f0 SHA512 f75feb86c8796e73d7089fba8e0c464929452c4be24b2829fd231bd210d2152710529aa3e3266bb88453ee4f69fed2a1f6cdf337a8ff44a345f3f7d56c969af0 WHIRLPOOL e392f72492717cd7df38c8e894aff4cac4cbd89bb71ea44d7ea718067d7acd1334c7952664fb21e4d9d8dd38f11548bb448b148598fbbf248dcf6b3108e29ded
+DIST qrcode-5.1.tar.gz 22259 SHA256 33bdee5e834fc99eb538e1dad198a3a5b70d0a88845629cacf4c592be1ce7f6a SHA512 67a7bb51fe2386f3b1ac0b799d3850d3ca4f61286fdc809654df3f5a1071b503707a9a3e82e595b7611dd9d7b7e74b36e19b86942fb5ad94c256cd7ca9aa02f3 WHIRLPOOL df72f727af2a1342adf61fcde25645cd25f5cfafd454ae2d13567a3c144949738f924082fe78dbb529c9b3757bbf1474e5f4f48fc95538d5d1cdcfdc6452637d
+EBUILD qrcode-5.1-r1.ebuild 937 SHA256 6bb322609605dbd6cf465e4007e892a0e92a249d80f0caa87b55cf42b9e1024a SHA512 ca369f0724afc57b466d567cd61db81dededbd2183dd1ea0c489442d57127c0381cc35d1937b456cbaa5c2effadd7002383d09d119aa59db9efec7d059224ab5 WHIRLPOOL 5c25b51a7c3ffe8d72fa6a7f2095aeda2ad7848d0b130c5e055a97a6e5e88174ea3c407a957f07ad8efdab2fd19dd155bce793cf9361b8b2c08445e72f157efa
+MISC ChangeLog 3352 SHA256 595f2c06b9dd59a1f9b0aeb5623a747e36c71a48daf3ed768cf554e47712281a SHA512 a15d1975b56f88697000b5a031e76f85ca86cc6086b0c99e3d1e802ce2fe39bd4b8aa2546bc905493c9e36779df31c2a828faba6323743301a0d24181f1d5f56 WHIRLPOOL 28b7ad08f4bd5d914a803481fb698ca3004521bd77a89a9fc100fc75d71749779002943331b37ffd266bfad156e8931b3a75522b4911816fa56530513d754a85
+MISC ChangeLog-2015 1382 SHA256 16a54fb22cf6b3810786ecac1b026a5b9e36c255c3131c0279755a2f2865d3b7 SHA512 a12b502b7aba70454e905ea3e63fb136f09476599e42c12a2664cfddfe96977fa04194ec7e83ecbb8b672cb512e9fdb99a5b3b468ba050ddaf5cb72b9e0b145c WHIRLPOOL bbf4ceb560e5a67537f550d4aa34a69337a347e9b246ab66592368e9f4a8f6404b643ace9b3b96981005443fbd3cf7dcc856a9bbb8c560b232e6f6f01c9daab6
+MISC metadata.xml 309 SHA256 01ca17e8c025dcf89f62e45b73caa13874f6f32bf7179d9053b79de996cdf7d5 SHA512 65fa150581939d81a62bcd84b25e733b5cbf394ee6b201aaf7f64b22eeb75a3466ae0a6e1e230a8bb8f08b678544660e4382eb85fe55754bd64014a3c7b35aec WHIRLPOOL e16329029e641883d9774ad9b0ed4ef4d814d174da3bdf156cbadbef9396054c954bac28411ea65f330ff740dbcfb11cbd7f95ced4b8c34693283f18477da37d
diff --git a/dev-python/qrcode/files/qrcode-5.1-unicode.patch b/dev-python/qrcode/files/qrcode-5.1-unicode.patch
new file mode 100644
index 000000000000..2d628c68e5a6
--- /dev/null
+++ b/dev-python/qrcode/files/qrcode-5.1-unicode.patch
@@ -0,0 +1,34 @@
+From 0a9f17d3afb0ff01f68c2276ec0844d329a6add9 Mon Sep 17 00:00:00 2001
+From: Chris Beaven <smileychris@gmail.com>
+Date: Mon, 3 Nov 2014 10:56:14 -0600
+Subject: [PATCH] Fix script piping to stdout in Python 3
+
+Fixes #66
+---
+ qrcode/console_scripts.py | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/qrcode/console_scripts.py b/qrcode/console_scripts.py
+index d215993..c51463b 100755
+--- a/qrcode/console_scripts.py
++++ b/qrcode/console_scripts.py
+@@ -57,7 +57,18 @@ def main(args=sys.argv[1:]):
+         return
+ 
+     img = qr.make_image(image_factory=image_factory)
+-    img.save(sys.stdout)
++
++    sys.stdout.flush()
++    if sys.version_info[0] >= 3:
++        buff = sys.stdout.buffer
++    else:
++        if sys.platform == 'win32':
++            import os
++            import msvcrt
++            msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
++        buff = sys.stdout
++
++    img.save(buff)
+ 
+ 
+ if __name__ == "__main__":
diff --git a/dev-python/qrcode/metadata.xml b/dev-python/qrcode/metadata.xml
new file mode 100644
index 000000000000..be26e2b2cafe
--- /dev/null
+++ b/dev-python/qrcode/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">qrcode</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/qrcode/qrcode-5.1-r1.ebuild b/dev-python/qrcode/qrcode-5.1-r1.ebuild
new file mode 100644
index 000000000000..74e5fa4e258a
--- /dev/null
+++ b/dev-python/qrcode/qrcode-5.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="QR Code generator on top of PIL"
+HOMEPAGE="https://pypi.python.org/pypi/qrcode"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+# optional deps:
+# - pillow and lxml for svg backend, set as hard deps
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-unicode.patch
+)
+
+python_test() {
+	"${PYTHON}" -m unittest discover > /dev/tty | less || die "Testing failed with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/qr.1
+}
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
new file mode 100644
index 000000000000..dbbfe5bd1c2d
--- /dev/null
+++ b/dev-python/qscintilla-python/Manifest
@@ -0,0 +1,9 @@
+DIST QScintilla_gpl-2.10.1.tar.gz 2663446 SHA256 97f98a9d91f908db6ce37fecc6d241d955b388a1c487173b60726cba9a3dfa64 SHA512 ea9b95ca371a8af9262493ab59ecaef77e1697ba21d1d594aab39e836917884fd829aa4f6c4e72cce60b0d3f40eac654157cc507d027945f0034881855123ccc WHIRLPOOL 96261f2c2c38458891afad057716bdfee05f74e9f15a8b8ce2eab4445b8c56256cbcb33326631ac1f3624e2c998d490f5e057c348b3a3eb44a9260c938beda61
+DIST QScintilla_gpl-2.9.2.tar.gz 2491222 SHA256 f2c8ccdc9d3dbb90764ceed53ea096da9bb13b6260da1324e6ab4ecea29e620a SHA512 28f88111d7eb6a016a4b87f04d2b7f5d6481b521a3361a526b3b45a56240f5c8de10310e819234fcba773c6df73bf398ae2dce622976a8e760f506be1defb7c8 WHIRLPOOL a04420c66fd417e5304c92a1ee3c1998f6849bccb9088dae96ed48c06cab0a9b1c012f073aafb1e05aaee46564de9ac89ae07145f3ded35cf47beac78065650a
+DIST QScintilla_gpl-2.9.4.tar.gz 2557199 SHA256 8b3a23023e9f0573caed6f9cee86f898d87b768ee15b8c211a423783a4cfa4e6 SHA512 5a2eebbe523a0f2f1c7bc63ce5ee9cb8793a597d00eea5b638f18f90d6e798e92c281be23ee5e7072d5afced9e1fccb6ae51526a3623d373d57c3db64d026b16 WHIRLPOOL 68aacdcd0fc7102494ccae1f0ea3e222845bdd3f9bef603d89fe50d50dba6ac77471228a84c1c281a46ccf74bdb6902aa3bb21f89388ec5408bdde5876cf8655
+EBUILD qscintilla-python-2.10.1.ebuild 2010 SHA256 ca945f5b9d93ef7a6435f7b30c49b029ea188000f18cab70aa11009e66093bef SHA512 cb7c980d799950a82b183fbb8d9bf97fa2b25299ff33fe169832c1f2c24a1fb6d9618c5e8991de96f4fcec015667b9522bcc8504e0515f1a42072c4605f4082b WHIRLPOOL 919bdef98fd9a7ea93504b269704419ce6e99b99505ccf5026175e1161397cb7953821b70cf5b4bf26b49c1fc79e5ca8c123f9f128c646f77ae8c212e85bd9ae
+EBUILD qscintilla-python-2.9.2-r1.ebuild 1486 SHA256 221fd6bf46fc651d78697c0749328df376d3a64e265270b82bbaf7086f10f398 SHA512 f51fe63953aacd8a8652ccd11dbf5a4875ee9c826b70ca2a751d77777570e2993ddb5bd58570db3d617e51b5d97722df7ee3c9be656bb6f343e997ada9cb5e64 WHIRLPOOL 3a062ba5e21dcac3c9ba41a7c124b072b3cb78177ea9cd5c5e5f80b5173c2aeee447a0730d8ce62a9fb057698fd7f53c2509a7a7432d7d8c39f72b44896518a5
+EBUILD qscintilla-python-2.9.4-r1.ebuild 1772 SHA256 2f06475354a779482882b5a454ca35a4b6e87af9a614376118d73cbd7f888a4b SHA512 7e171629e9f4e52c49a9254f8ab54dd4d27088b19adb5a59c78de4b47646d1cb2149272f5d34e992ce35b40291e7fc7f7c598942e4f13a1aeab3bf8616861698 WHIRLPOOL d51876de703181df2e5dd09bfebf39a7119f37c0e75e8cd674f057e9489ae0cc32d636261a85cd98ca413af0e2bf0a6d1c1faa3689bcfff087e458dfc2daed5b
+MISC ChangeLog 4331 SHA256 299e9fb37d9733ff48a9cd13e087fb962ae1afdb0d742b6f2842e2ac5076590f SHA512 db72b669de88184af4c10893459716edbf7aa357825c838d22f8bcffecd48321b2aea0a29df796edd3847adc2dda43046f315ad225f85452411dca4c61332bdb WHIRLPOOL 3ce85eea261005cce24ccdec913c14aa1dc2fc85f97ceaa6829e2edd44e8235b1c70c63686d5481b23c7ea7bdca10d7b88b181b7677a74bb167e6736950949e1
+MISC ChangeLog-2015 17889 SHA256 89db89a2f66009868ad919e88fddd4c5948804787ebe5ea57ca66415d6555bfc SHA512 659af4bcf5e2ed9a0cdc184e1ef1c1d9a0e114ce50380f53fae751981685b4e4897d5162111ab1227751d3903a6c2300f6b2ccba2cd4bca48bc2b1b82cf07c07 WHIRLPOOL 19208585f37302dc68689e7aa17950b60ea249f7d6031c5b86893a6e6a385f7e807e78d7d7a18705fd50385bbe57643320c541e18dc7e0bbbc2488702f1ff576
+MISC metadata.xml 666 SHA256 a82ce94f00779be34343e403965f42f6b80b9bbec0f3fe326f5d66fae16d3b3f SHA512 f78ce18443d32b17307e96f8177bc5fb46f5b9f6b4d797e79dcacb6eb76bba578f7d666469576bd5e326717bcd9167fe34a5e1bd1ead5679619816ef8f0363da WHIRLPOOL 434d6a2b4e8c6159c0e1a1ed84dd68e9335a0686cc5061085dffa20bcd8ea526b3c4033be92ff86d354acf3125411cb1c89a1bfb62d4dfd0171d8289c9e38306
diff --git a/dev-python/qscintilla-python/metadata.xml b/dev-python/qscintilla-python/metadata.xml
new file mode 100644
index 000000000000..7054692c3439
--- /dev/null
+++ b/dev-python/qscintilla-python/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="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>phil@riverbankcomputing.com</email>
+			<name>Phil Thompson</name>
+		</maintainer>
+		<bugs-to>mailto:qscintilla@riverbankcomputing.com</bugs-to>
+		<doc>http://pyqt.sourceforge.net/Docs/QScintilla2/</doc>
+		<remote-id type="sourceforge">pyqt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.1.ebuild
new file mode 100644
index 000000000000..de393e595d81
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.10.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit multibuild python-r1 qmake-utils
+
+MY_P=QScintilla_gpl-${PV/_pre/.dev}
+
+DESCRIPTION="Python bindings for Qscintilla"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug +qt4 qt5"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( qt4 qt5 )
+"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
+	~x11-libs/qscintilla-${PV}:=[qt4?,qt5?]
+	qt4? (
+		>=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-python/PyQt5[gui,printsupport,widgets,${PYTHON_USEDEP}]
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+	)
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}/Python
+
+src_prepare() {
+	default
+
+	# Fix out-of-source build
+	sed -i -e 's|sip/qscimod[45]\.sip|../Python/&|g' "${S}"/configure.py || die
+
+	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+}
+
+src_configure() {
+	configuration() {
+		local my_qt_ver=4
+		if [[ ${MULTIBUILD_ID} == *qt5* ]]; then
+			my_qt_ver=5
+		fi
+
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--qmake="$(qt${my_qt_ver}_get_bindir)"/qmake
+			--sip-incdir="$(python_get_includedir)"
+			--pyqt=PyQt${my_qt_ver}
+			$(usex debug '--debug --trace' '')
+			--verbose
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Run eqmake to respect toolchain, build flags, and prevent stripping
+		eqmake${my_qt_ver} -recursive
+	}
+	multibuild_foreach_variant python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	multibuild_foreach_variant python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	multibuild_foreach_variant python_foreach_impl run_in_build_dir installation
+}
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.9.2-r1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.9.2-r1.ebuild
new file mode 100644
index 000000000000..185c56368ada
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.9.2-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit python-r1 qmake-utils
+
+MY_P=QScintilla_gpl-${PV}
+
+DESCRIPTION="Python bindings for Qscintilla"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86"
+IUSE="debug"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.18:=[${PYTHON_USEDEP}]
+	>=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	~x11-libs/qscintilla-${PV}:=[qt4(-)]
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S=${WORKDIR}/${MY_P}/Python
+
+src_prepare() {
+	default
+	python_copy_sources
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			configure.py
+			--qmake="$(qt4_get_bindir)"/qmake
+			--destdir="$(python_get_sitedir)"/PyQt4
+			--sip-incdir="$(python_get_includedir)"
+			--pyqt=PyQt4
+			$(usex debug '--debug --trace' '')
+			--verbose
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Run eqmake4 to respect toolchain, build flags, and prevent stripping
+		eqmake4 -recursive
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+}
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.9.4-r1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.9.4-r1.ebuild
new file mode 100644
index 000000000000..91014991d9cc
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.9.4-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit python-r1 qmake-utils
+
+MY_P=QScintilla_gpl-${PV}
+
+DESCRIPTION="Python bindings for Qscintilla"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="debug +qt4 qt5"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	^^ ( qt4 qt5 )
+"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
+	~x11-libs/qscintilla-${PV}:=[qt4(-)?,qt5(+)?]
+	qt4? (
+		>=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-python/PyQt5[gui,printsupport,widgets,${PYTHON_USEDEP}]
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+	)
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}/Python
+
+src_prepare() {
+	default
+	python_copy_sources
+}
+
+src_configure() {
+	local my_qt_ver=$(usex qt5 5 4)
+
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			configure.py
+			--qmake="$(qt${my_qt_ver}_get_bindir)"/qmake
+			--destdir="$(python_get_sitedir)"/PyQt${my_qt_ver}
+			--sip-incdir="$(python_get_includedir)"
+			--pyqt=PyQt${my_qt_ver}
+			$(usex debug '--debug --trace' '')
+			--verbose
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Run eqmake to respect toolchain, build flags, and prevent stripping
+		eqmake${my_qt_ver} -recursive
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+}
diff --git a/dev-python/qserve/Manifest b/dev-python/qserve/Manifest
new file mode 100644
index 000000000000..45c12b99eb7e
--- /dev/null
+++ b/dev-python/qserve/Manifest
@@ -0,0 +1,5 @@
+DIST qserve-0.2.8.zip 18637 SHA256 0b04b2d4d11b464ff1efd42a9ea9f8136187d59f4076f57c9ba95361d41cd7ed SHA512 5311606992c96fcdbd350c47598ea9611ad93fb513bdbed081e570a8674861a3f1bd83211af635f8ec6a943f7c826f5c5872d2e62c672f9065c19e71dbfabd34 WHIRLPOOL 4ee787db25ae8ce9a1d277184df172af734f58e987fa51d5c7aa4ccb78071547ea11336b66fdbec23cf36dc29cf7d404e22a8adebf3d024c0790e478bc16f726
+EBUILD qserve-0.2.8-r1.ebuild 599 SHA256 8f4e8bfd414befdd8e3d19a0c35cbdc58b8c823fb27b61bea334684d7a12f118 SHA512 8de24355cc07eb7fca1f07e24b09f162d3247cf630271f4479c8d0f59ab7fd537b5155c662159d29e23b0af95d20b3b3dc929ef7c0ade2c3189bcfd8c0c2e574 WHIRLPOOL f7e9687498a90d095c9b8ea008354248dc38a1c5db7b6dd2dc57ff50fabe37d3b10c15d40ce14990fa323209263f2f2a2d88851b8318c73116ee043baf06305d
+MISC ChangeLog 2687 SHA256 a38309ede0dd05d866d86e73e7c9d1ad18b5883dc9b15bef5a73331fa050cd76 SHA512 2f2f60fb9a12556c122e3b51e9fa1ddf40e0ef6c693298a5d104bf75358c6cf6485da520e92ff22390a3d8e82d10b6ed529b03c43611e7dc5beefb803fd83f71 WHIRLPOOL ceab86e1e975c73b0576182b1232bb5876437d8e92a3ef21fe35d35ea63d57fa2859e08a7691e7e53b088e2911f3893cc0d3940a53e63bd5597045c3f15b7298
+MISC ChangeLog-2015 1166 SHA256 e60eb15c6c9ae7b7800284fa1040fdd8b7b65a5e583e807e638067ded6fa1e95 SHA512 149c59e053f7f5dd850098a70d792f7db0c6cc13783968d7e9bc05f62193e7b811836259b7eade9ad679dab2da9aa7c9b6f28c7331bb0d758bd4a9e39ed52fe0 WHIRLPOOL 2a8cd9abb627a689f912dca2c469fed8822d98fab50f078075d0befd9ca2e4e054c9492b6f607ed3fb821c459887388930700f4572a102d15c5e6d041e02a137
+MISC metadata.xml 378 SHA256 2bba41aa188fa8c492c360a529dcf690a8498f47ddfac6ed9fa2f5eee6aa3bfa SHA512 a3d0165f485913196a0f766bc6bd9464bbe873f67f847cfe735d0da75fbac220510efa802dbb7ecf63a411748305e9d5bd928e292a2da5e83f73463bc67cc561 WHIRLPOOL b3f15e9d5e51ccbc7a04f0a2d948d5060e087c1303392ea65d982edeae451a34a2fd97e062f5d722b24c041abc9a8571aadb6d051f02fc80e46da86aa22caae8
diff --git a/dev-python/qserve/metadata.xml b/dev-python/qserve/metadata.xml
new file mode 100644
index 000000000000..ddd1cf601d63
--- /dev/null
+++ b/dev-python/qserve/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">qserve</remote-id>
+    <remote-id type="github">pediapress/qserve</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/qserve/qserve-0.2.8-r1.ebuild b/dev-python/qserve/qserve-0.2.8-r1.ebuild
new file mode 100644
index 000000000000..42a420c1f88b
--- /dev/null
+++ b/dev-python/qserve/qserve-0.2.8-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A job queue server"
+HOMEPAGE="https://github.com/pediapress/qserve https://pypi.python.org/pypi/qserve/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/gevent[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
new file mode 100644
index 000000000000..e947dab14713
--- /dev/null
+++ b/dev-python/qtawesome/Manifest
@@ -0,0 +1,6 @@
+DIST QtAwesome-0.3.3.tar.gz 150081 SHA256 c3c98ee4df0133ae42d202fea20253f8746266b4541c5df4269ca4131792ce0f SHA512 2b89a0c2119ff98a5aa1ecd6a60dabc36feafbb8029a39a578376307bdcff7f0a4bed2395dd6aa13b8540671b9deb1dd14b6ef9144a3bfb3640ae78288a6d7eb WHIRLPOOL dc28ccc34ba4391eb90c91da6987f2800ba505ab22aeb05c0be1288079156b5ff7475dc0c052f4f00e6315254c651f854f8c36056a7ffb3de1d2a61d315725de
+DIST QtAwesome-0.4.4.tar.gz 159621 SHA256 50f9c1d9ce34e57f5b13ef76d5c87e06de9804b8dfe1c34c4ba73197200f878a SHA512 9dc8659993b8d61757865a1ec76f76e76db1232c6801f8216688c0578f612897fe189313c27107be264ac61c6ee2a866056acae51241be73a4fc5e9e5825008c WHIRLPOOL c106df987a0b19b4e6d35bcdcf2a98810e678c2b5cbaf33f9c47fa026d2209f83f652b1a85c1a88b0e275dfc1e6c8016d6591153590616f81cb2a712533cf2b5
+EBUILD qtawesome-0.3.3.ebuild 567 SHA256 36087080e79d93fedbc54d5350e6795eecf4e9ca0d36e9ae35f246bcc6d84a78 SHA512 b3f2afbf2ceadf3776328fe2bfc8389be53ebffbc26f559cc572c5059a332bfe115d1ea7f89d1c554e810b5effa5e44c80809e3d7bd567212141f37aa3c9b7fd WHIRLPOOL 5f2472eafe650f97aff591ef7a8a29e34519a7e2874783dc9cdb2a19fcdcc30483f5a266abdf67fa3e0a2a5265adf26f4dc66cc6fb990706fd1e283bc701b712
+EBUILD qtawesome-0.4.4.ebuild 567 SHA256 36087080e79d93fedbc54d5350e6795eecf4e9ca0d36e9ae35f246bcc6d84a78 SHA512 b3f2afbf2ceadf3776328fe2bfc8389be53ebffbc26f559cc572c5059a332bfe115d1ea7f89d1c554e810b5effa5e44c80809e3d7bd567212141f37aa3c9b7fd WHIRLPOOL 5f2472eafe650f97aff591ef7a8a29e34519a7e2874783dc9cdb2a19fcdcc30483f5a266abdf67fa3e0a2a5265adf26f4dc66cc6fb990706fd1e283bc701b712
+MISC ChangeLog 315 SHA256 27381baa4710289ce6af7121f882c1401064d17f008a62f24e9b39ec67613a34 SHA512 0bebb9e63d019f8c57b7bc40a5dd7a2d1e5c93ddd8f12d001ca88759fbc8e5cb726c81a1e4e65c6ac436582476eeaf693e85a55a64cb0b9fd1d4bb9957da41fd WHIRLPOOL be034ca2a06fb77403cd327cd83535abc980b532d62e1a9eaaf644163c66015a0a9ece91c5e5b6573c3d258d7840e6a406a54d4b5e34a35e3cc833f86f1dc674
+MISC metadata.xml 659 SHA256 202d0cf2f7a7f1744648ee18f79de0df74dcf3a4509158c691bdcabcfa29e3c5 SHA512 0e0b4b1ba22fde6a3f2bb78a57575ace1d8761cb3cbe352e5c2de606be7eddb1864f526b51766de3f5194b5eaf7152f1cf7020b1ebc8b785fb76f76ef71c9718 WHIRLPOOL 8505cbfffdd86132a496221cac7ca43b0f6a7861887ae9137238c6f09def9faa4cf5a8c779c084c83d24573a0441c4e4bc010f61fddb75d74b3e1c7294eb9544
diff --git a/dev-python/qtawesome/metadata.xml b/dev-python/qtawesome/metadata.xml
new file mode 100644
index 000000000000..7e3146876da8
--- /dev/null
+++ b/dev-python/qtawesome/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    QtAwesome enables iconic fonts such as Font Awesome and Elusive Icons
+    in PyQt and PySide applications.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">QtAwesome</remote-id>
+    <remote-id type="github">spyder-ide/qtawesome</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/qtawesome/qtawesome-0.3.3.ebuild b/dev-python/qtawesome/qtawesome-0.3.3.ebuild
new file mode 100644
index 000000000000..732768428d88
--- /dev/null
+++ b/dev-python/qtawesome/qtawesome-0.3.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit eutils distutils-r1
+
+DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt"
+HOMEPAGE="https://github.com/spyder-ide/qtawesome/ https://pypi.python.org/pypi/QtAwesome/"
+MY_PN="QtAwesome"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-fonts/fontawesome"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/qtawesome/qtawesome-0.4.4.ebuild b/dev-python/qtawesome/qtawesome-0.4.4.ebuild
new file mode 100644
index 000000000000..732768428d88
--- /dev/null
+++ b/dev-python/qtawesome/qtawesome-0.4.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit eutils distutils-r1
+
+DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt"
+HOMEPAGE="https://github.com/spyder-ide/qtawesome/ https://pypi.python.org/pypi/QtAwesome/"
+MY_PN="QtAwesome"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-fonts/fontawesome"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
new file mode 100644
index 000000000000..865abdea8c94
--- /dev/null
+++ b/dev-python/qtconsole/Manifest
@@ -0,0 +1,4 @@
+DIST qtconsole-4.3.0.tar.gz 416877 SHA256 2821ccf85853b83e4958521f82e36325208787eaf79b19b83905a99cc41aa209 SHA512 50e8d04152b90e85989ee6f1f182ae0f788d5f231311fcd61170b7a7c20a9a32d35918810ccb85e38be6b2092791c7fa9ac8726524100bca12d9ae6a949acc54 WHIRLPOOL 239686bea6e5db6c926b5e4d38e36e8e644df44c3de3a6c4756d9345713586e9e8b3cdf4cbe605aaca3fd77ca502abcd4a3e745955a20e23ab67d934c2f46f7b
+EBUILD qtconsole-4.3.0.ebuild 1554 SHA256 fb1b40b8a5365086f25bc5bad49172128b3f6f23c774c979fcd60c4355ca20e7 SHA512 c9678d938004ad601fbf478c421062c50628dace94d76bbce1f83d99fab819d7e6caa935766079e6b95d81ea1d6555d8a5a420ef61af3358267c7bd2b5665333 WHIRLPOOL 936eb52f195344a556cfc82eb191c0bf5f95464958244815d39e742afa409a3bcd90b9b22e08cd6b7685c27b782e9807efda5025cea9fff27039eb11b6062596
+MISC ChangeLog 1811 SHA256 e13ed1f3a23ca0bbb5fe270e785b6b8482aca7c7a2c2b9274b486010d4816b2e SHA512 c389d7130534653fec89c08b4e1f63960accaa60934d010d6ab721fb745f96b73d3317eee9cde62a5129bfb9225f0ede9f48a95da40f3762e19a99fae025cb65 WHIRLPOOL 42cd79509d9f38933e9360faee2036020e9110659cdf3b0587d13495d22a811d6d7132b17d50a0a826a9b18039e4cc5fd4dd9c020d346a5178b44e724eb8b08d
+MISC metadata.xml 557 SHA256 24ce23ebb9595f43d7489a2950ecb5888d51674b7c6d2b032c46e2af19f49dd2 SHA512 5f176e9d82b9031b0d15c32986074431f03e33843a50f68e94d7aa0ba10c31370e2c4ee0651481d7a5b42f873e0aec4771c9fc7ca996386286255166be20d8cd WHIRLPOOL da4fcefc4dfa666cb045989b81251bbc11281fcceba6f62ec5df9074b23e2612f0bb20ab7a79163a1261d43f7f0798908836cb926e4baf9d280c12ead252a1c2
diff --git a/dev-python/qtconsole/metadata.xml b/dev-python/qtconsole/metadata.xml
new file mode 100644
index 000000000000..1c4f5a322518
--- /dev/null
+++ b/dev-python/qtconsole/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    A rich Qt-based console for working with Jupyter kernels,
+    supporting rich media output, session export, and more.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">qtconsole</remote-id>
+    <remote-id type="github">jupyter/qtconsole</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/qtconsole/qtconsole-4.3.0.ebuild b/dev-python/qtconsole/qtconsole-4.3.0.ebuild
new file mode 100644
index 000000000000..90c0432680ba
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-4.3.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-python/ipython-4.0.0-r2[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP},svg,testlib]
+	)
+	dev-python/PyQt5[${PYTHON_USEDEP},svg]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-13[${PYTHON_USEDEP}]
+	"
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	# jupyter qtconsole --generate-config ... jupyter-qtconsole: cannot connect to X server
+	# ERROR
+	sed \
+		-e 's:test_generate_config:_&:g' \
+		-i qtconsole/tests/test_app.py || die
+	virtx nosetests --verbosity=2 qtconsole
+}
diff --git a/dev-python/queuelib/Manifest b/dev-python/queuelib/Manifest
new file mode 100644
index 000000000000..8d62341bb834
--- /dev/null
+++ b/dev-python/queuelib/Manifest
@@ -0,0 +1,5 @@
+DIST queuelib-1.1.1.tar.gz 6969 SHA256 f771790be92a93c49fa6da0cab349d59e481fef784b8230bf9338d9036e90b8e SHA512 54b649d08ca60ed933d862b9d5845af162843f4f077722c78b7c72be4093406cc44182905a2d21235635afc1139974c08c213ccd8a333e72fd94c06adc34497a WHIRLPOOL 808ef3b957315505157fbac019b8ecab729f5c7539edeb289f47af540cc536ca55bcbbf0bd7edab7a105451fdfc9e2d8667409ea09383b7eb4980c22a0bedeea
+EBUILD queuelib-1.1.1.ebuild 627 SHA256 515cb7a5c3bf28f54f69029ae047b4ac15fdd865c3f9d2448daeb9d363c6d2ff SHA512 db04680a4c326dd7931d2598214572c79e0e42c3d9ad0af9b9e383e76127ece4ff351a00c03f34da6fef0659473d16d359d7b2a0d9ec2e7c12892d762e21a665 WHIRLPOOL 7eb24a8187fb1b82044a3c02f3ee5e346ca008d2ff1c43562161910f6cb1cc133a146dd1577190f3ad4f1bbcd797c7256d8bda7ef951cc6b21731d9771840932
+MISC ChangeLog 2561 SHA256 9841080079ab306d762e5a0bf2255833944d3e80c5d62c53dd8ac7d63fd2263b SHA512 f30f6213613139ec24aeffe890a138ff209866a0283b0a8ebc98da48573a0c246ceee9d303d4a24b86a5a55290b674fcad5afcdffefffaacd20a9c2b1af70f9f WHIRLPOOL c38625b9c5190284592bfebee880eed6caf29ab6980815c6fd6c2827380aee3f4c52a1062e34682352d42ba5ea4ab836c3900066e5e6cddeea4a2ce0e98a2430
+MISC ChangeLog-2015 902 SHA256 712fbc0a6d8f78eb2855437dc5157ff2c625f4c6f27e623c4c167dcdc041c0fc SHA512 128d87ad63b3bc8f900a6fa22fd3b9baabf8c520944f87ae051c99f5eb02ad67d76b540d447eef37dd55c39f62e658eb44e87e3dd34c8d00019c70495c5d8506 WHIRLPOOL 013428098951acf91ee88ca5a7726ece458cbdb0e1478c5a69170a541df17f3011eac321f56eb25e39e579d1ff09656fe4e26f6b31bc1ea76b046ff9dee49b3f
+MISC metadata.xml 330 SHA256 4572b2bc5c649a4bc7734699353043cbb910e2411174b1b8cfca8deabbd3c04f SHA512 4f20bb7cc7a98c0248ee15e30a6dbe38e8e21c727aff1d1549750bdb8e296bc2070cdb6839ca8c5671bbb85a62c39844cc34c979f72aeaead41ab283e955b5db WHIRLPOOL 48767a4bcda18d099d3b15d8dc42b390d44a8651f4118d34d41ccd1141c68e1c7a94133fe1004e1f0fa3ae31c7951dacea0beaa455d1eb1e93199d37baa55e67
diff --git a/dev-python/queuelib/metadata.xml b/dev-python/queuelib/metadata.xml
new file mode 100644
index 000000000000..185bf7a542a5
--- /dev/null
+++ b/dev-python/queuelib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">scrapy/queuelib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/queuelib/queuelib-1.1.1.ebuild b/dev-python/queuelib/queuelib-1.1.1.ebuild
new file mode 100644
index 000000000000..8a91aa73afdb
--- /dev/null
+++ b/dev-python/queuelib/queuelib-1.1.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of persistent (disk-based) queues"
+HOMEPAGE="https://github.com/scrapy/queuelib"
+SRC_URI="https://github.com/scrapy/queuelib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND=""
+
+python_test() {
+	nosetests -v queuelib/tests/ || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/quixote/Manifest b/dev-python/quixote/Manifest
new file mode 100644
index 000000000000..c38272522f56
--- /dev/null
+++ b/dev-python/quixote/Manifest
@@ -0,0 +1,5 @@
+DIST Quixote-2.8.tar.gz 474323 SHA256 454fa9171ed1c100d2df727269f9912548b4d9f4a6156503691be36894c99718 SHA512 d25e82228706966d1e3e24a07b8d1b62a016571f80ad375fa846be9fd720d6c2c8009b53f7abf72cd14ade36b3a69ac9a153d7017a88b5d420d571da45bc6558 WHIRLPOOL 0eed267e6c9d1df9c1872a55b89e7353cb019ab5cd58686739b6dc2e801a3e5bc893e1c5acf87b82557d579457377979e85f75fc5194b5c928c20f74755e58f8
+EBUILD quixote-2.8.ebuild 1044 SHA256 dc20bb80ebc43a6f33fba69c9a0772edfa873d38dff9e8ce9a6edd1623e36af4 SHA512 dd27152e84c5c8c76ca716399ccdb9486c0e145a2bcebc50078244c838cacb77fbc522ca3a1afc2d1bbcda6d8e233f1b48ab1cf22565222d471e04a7f838cb60 WHIRLPOOL e30c415c0f8042bcf5c0a97b32bde94671c0e7271a0544e67094b3e1871f4d6fac3491bfeeb01e22c7a41bce2b1a88c6a9f8e4ce27193d142379de6f4376daa0
+MISC ChangeLog 2425 SHA256 e87751bce3a525679b812f04a83ac7792926f2025a1c3938b68f6ba5fae14002 SHA512 486cfc1693872e5ee3148906b033f826a7d027050f01474248c759dd23336693d094d89cd1b5528c9407791e2ae5ad444e7d662774308db7b96a6b02a3f6539c WHIRLPOOL b465ea3eb0668b457e63a4a4c3b71cb1681f7136eb54941011a178e354812f4832a09aee90bf464977bb3ccd0890101b13bc0e4da2ca761e358d7a985fd915f7
+MISC ChangeLog-2015 5932 SHA256 29f25d84fec9d0af079f83e6f7fe3c6e799e979f59a27bd131cda6c582a120ca SHA512 b15002f36a863cd1520489462870e81a16a8ebfc5398965d8d2137802dff77f712bb97142a9dd660e74137caabd074949725af26e776fe94e60ce027169e4f45 WHIRLPOOL 5168af71213b18a99a26816386efa9b744607e3f6e4627d145a6d3deec37bb3f244c7f03e82a48130296bc223513aa8ca52f301a0eaa7006f1339aaa81fdeea5
+MISC metadata.xml 350 SHA256 d8b96c48c3a6b4e55293b13f1de2c6d8dbd83959fcd8236cfc10fb85fb28f882 SHA512 f0e59fdd63ae61df0a1c12b78d766216aa09d552f5c90d4088cddd85477ad9cba6be93a866a78fa22d46de2c90a01cf4e43b77eb483f0e0b2e5303bb2d62dff5 WHIRLPOOL 0e517a0deebed77c5e133078492030e7bebe0e1ff5d22ab4457c44e0d64c85607f7a0aae2af643714500a8349eee1b1885533b2686482b381d430892cddf37f7
diff --git a/dev-python/quixote/metadata.xml b/dev-python/quixote/metadata.xml
new file mode 100644
index 000000000000..0fc88ced4a7a
--- /dev/null
+++ b/dev-python/quixote/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/quixote/quixote-2.8.ebuild b/dev-python/quixote/quixote-2.8.ebuild
new file mode 100644
index 000000000000..b6c839af7617
--- /dev/null
+++ b/dev-python/quixote/quixote-2.8.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+# Appears to be written only for py2
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+MY_P="${P/q/Q}"
+
+DESCRIPTION="Python HTML templating framework for developing web applications"
+HOMEPAGE="http://quixote.ca"
+SRC_URI="http://quixote.ca/releases/${MY_P}.tar.gz"
+
+LICENSE="CNRI-QUIXOTE-2.4"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc test"
+
+DEPEND="doc? ( dev-python/docutils[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}"/${MY_P}
+# tests require a running quixote server, prob. apt. post install. Tried the demo one but no
+RESTRICT="test"
+
+python_compile() {
+	local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake -C doc
+}
+
+python_test() {
+	nosetests tests || die "tests failed"
+}
+
+python_install_all() {
+	local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rackspace-auth-openstack/Manifest b/dev-python/rackspace-auth-openstack/Manifest
new file mode 100644
index 000000000000..bc520aced57f
--- /dev/null
+++ b/dev-python/rackspace-auth-openstack/Manifest
@@ -0,0 +1,6 @@
+DIST rackspace-auth-openstack-1.3.tar.gz 6799 SHA256 c4c069eeb1924ea492c50144d8a4f5f1eb0ece945e0c0d60157cabcadff651cd SHA512 813fe85d38bc80bae65a3f160f50c17fe8bc7279dc3ad4689012b3fa9c0fdd1577c0491de0c87d3b8fe4e6ba5c1166cf30cc1d0533fa15c516a826ef6c36934c WHIRLPOOL 70ba4b3d88fe8be345dec55dcc145b01eb97ba56a87a63ecdaa5f25f38cac3fd5fdba4c6e094fea9e948fb7092ccdb53a15696dc30a734b6be0e5dd9103eab08
+EBUILD rackspace-auth-openstack-1.3.ebuild 473 SHA256 1a9ab59af89155c5127b72c2e0b61eaca0fe18d41b50b402ecd6e0a3cf4a6e30 SHA512 8b835c41a98e337718c17f649a4994139bc222cd4ffa92b15ff8c630576e0715047fd6be98f789757afbe6ba76fee31ba3f3bf8f8f896e11a1c9a6c7148c0f27 WHIRLPOOL 76e27c5a9f9b08193ba9dfce5528d61fc61fcd1c5b6888f21f4b6722cda24cc086cd329a63cabf97d4bb44a4e8633c08e9809d071a855f945d75be7e80fe5e56
+EBUILD rackspace-auth-openstack-9999.ebuild 449 SHA256 c760dba1599aa73b899d0e8292d12d666e3b9d4732305d337fb404c0f7ea44d5 SHA512 e468a1a0caba60f1601dda90d692663ca7576f888119205841cd097d992f36b362b83c4cbd3871379134ae09be8ac5f9c40a9c113c8eb8e431d1b59a77b956ce WHIRLPOOL 16abcf9d63637096b88707e37ef0809f34da3029a3122550fb1a5f55c76d64a9309cce0bbca6d4f622bd428f517c5b683c5f96b4ec56490a0714b2d219451220
+MISC ChangeLog 2888 SHA256 c88c2d027e27aa8b16dbbf4542dc32f139f8b887cd3f3af6e47d403b86cea6af SHA512 762eed3bae1622ae7504c5160674521af1604ea7cde3339eb73a55fa40b1bf911db1a644f4c761f5062c894b9d7b0b633bf6d07337f94297a64edd22378ea901 WHIRLPOOL dedff5b84eef7f05edd388a2618b7ed2e1c2af37fed3cebc898059bb57a4bc3a0adc62a8b47b370e79dc54f06b762902586eaed545f67ff2025582f9f5db598c
+MISC ChangeLog-2015 1266 SHA256 1e88b8c9b682fd993431186c64ba7769d68acaa372367f4edfb1e2a53d770275 SHA512 424f9963406a30d0bb64ced086acb34253b3eddeb51b4f76c3851cf745d4028990b7417eec6da8e5d09d470b2ceb0ecc7f111186ea49b1882709c53a40aadcec WHIRLPOOL c367acb08b54e63790c5435013b1b6a27ec97dd055c04dfbead87fdc2ba364dbe9b0d4d99a8faf5c7f5c2cb32d4b433bc0428f3f52bcc8d81172088d2d022622
+MISC metadata.xml 590 SHA256 6830f7c2702a8a2a4b25d1dc2b20eaaa4a43953e7edcc973a8cb34fe1c5e9973 SHA512 0acad56e775f8b053dd5355a7d3483be27ee1952093b97892e22b47cbea828e60db221aab90ceec5b6fd30831af1c289f18a125a946b266a68e9d630f0659c99 WHIRLPOOL d70beed9471c6d7f58bab1aac11286d2207d0d7ad415763a063b8bcd2409b9fa40bace53c4b316c872390af398e51c5455e689f37dd6d581893571d41f279067
diff --git a/dev-python/rackspace-auth-openstack/metadata.xml b/dev-python/rackspace-auth-openstack/metadata.xml
new file mode 100644
index 000000000000..248818aef1a8
--- /dev/null
+++ b/dev-python/rackspace-auth-openstack/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+    This is a plugin for OpenStack Clients which provides client support for
+	Rackspace authentication extensions to OpenStack.
+  </longdescription>
+	<upstream>
+		<remote-id type="pypi">rackspace-auth-openstack</remote-id>
+		<remote-id type="github">emonty/rackspace-auth-openstack</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-1.3.ebuild b/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-1.3.ebuild
new file mode 100644
index 000000000000..7eaadc2f5c5c
--- /dev/null
+++ b/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-1.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Rackspace Auth Plugin for OpenStack Clients"
+HOMEPAGE="https://github.com/emonty/rackspace-auth-openstack"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild b/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild
new file mode 100644
index 000000000000..ed097a60fae0
--- /dev/null
+++ b/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 git-2
+
+EGIT_REPO_URI="https://github.com/emonty/${PN}.git"
+
+DESCRIPTION="Rackspace Auth Plugin for OpenStack Clients"
+HOMEPAGE="https://github.com/emonty/rackspace-auth-openstack"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/rackspace-monitoring-cli/Manifest b/dev-python/rackspace-monitoring-cli/Manifest
new file mode 100644
index 000000000000..890a40ced155
--- /dev/null
+++ b/dev-python/rackspace-monitoring-cli/Manifest
@@ -0,0 +1,5 @@
+DIST rackspace-monitoring-cli-0.6.10.tar.gz 156395 SHA256 b3a4c418edd73ad3c281cc0ead19cdc4127791dd80986d6c8a802ce6513d97cf SHA512 538ba6667557e40eb1ab381a7be147805a6cfd46f10d51d30e38f35cfe18b9324f4fdfea051e22b083b510d0501c254c80b4914c07470db9e3a1de7d247d1403 WHIRLPOOL 1d5353d9ee3416b20493c9a068cc394ecf10144e39233b048c14e5f9affc736f5ee07eb0c43fc303184eddf566fa4a98f84a90cdaeec4a119137e1ea92147b79
+EBUILD rackspace-monitoring-cli-0.6.10.ebuild 746 SHA256 d59b59c861784f1511aaab85313350cd6e71eb9d8841d02f261a9612c3236cf7 SHA512 e84914c7bf064c6221965098b800c7620e1640b5050cd4536491aa78162e68a194d28a1f7c8f5107c2bac44e67a2fa199ff33992fd94430422dac983a9e62241 WHIRLPOOL ab1ad572d309c4b40d3306ea1c501746654927005f8b3c2a8d8b72a5be62147efca4e6b2531dfc44588815c4ed70f3a87db8f1e731abc8609777d1c1a4a967c1
+MISC ChangeLog 2687 SHA256 e91bd6cd3a0b22562986a45104d2e2efe08deed2809446859c805c97cb6a765c SHA512 e8013a9c23efe4af6576d7f851a59d69e65617f75a1ae9f4c31f477cbe10963f1a66eedee0ba0b34f559720ec240cd8c31b29d4721163d4c1547886dc2785878 WHIRLPOOL b586fa30bcea56eb63ad5b5a29ec26db77d7c729b16ad9302e377e600e753d76244ce42a04a84e8a76d6de65e273ddd58f70738768e64c252bfd43f31d49eee9
+MISC ChangeLog-2015 1910 SHA256 49f4920c71d5b11e7eafddec51ffe08c0f4d4f0a0f5c61262ad660dc1d8e6061 SHA512 3bcce86396eb853d096d8b5baf7e1ef214a9cabb5d4ada69f509b183dfd37da4886f8b900cae2b92fb26b4d6b5d07102f4d49129e3aa226b4722383ebc45bfc4 WHIRLPOOL 1a566df54daf4d8fd8146ba553abe23e622cab4d2f656d07424e1c0087c62464eea5f6e250639c8a65f144a553a349ae3826753a320737be530be91887c77c87
+MISC metadata.xml 538 SHA256 c97a47cb0700475e6f90504ffb21f1b4648a2dee4eafcc7b4060038ad73ccd0b SHA512 fa68ae31bc75f2a71a9f5f5f99f2407fd6d48592f03f83698d072b84edffab76c2fb661575a2594ae1de87ab575becd0d3ca08ea71505124de00552b558237e9 WHIRLPOOL 383fec49ae4e348f1d6639e79a137f3e6aab49046c39d589f0039f0e0f06de0670dc9b3c58c7eee8e82256ef0f1f62a4e53d72c88e88ac9fd8a70deaf260d5d4
diff --git a/dev-python/rackspace-monitoring-cli/metadata.xml b/dev-python/rackspace-monitoring-cli/metadata.xml
new file mode 100644
index 000000000000..385c4b243b7a
--- /dev/null
+++ b/dev-python/rackspace-monitoring-cli/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+    Command Line Utility for Rackspace Cloud Monitoring (MaaS)
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">rackspace-monitoring-cli</remote-id>
+    <remote-id type="github">racker/rackspace-monitoring-cli</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/rackspace-monitoring-cli/rackspace-monitoring-cli-0.6.10.ebuild b/dev-python/rackspace-monitoring-cli/rackspace-monitoring-cli-0.6.10.ebuild
new file mode 100644
index 000000000000..ea9e10ff2ca1
--- /dev/null
+++ b/dev-python/rackspace-monitoring-cli/rackspace-monitoring-cli-0.6.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+# https://github.com/racker/rackspace-monitoring-cli/issues/49
+RESTRICT="test"
+
+inherit distutils-r1
+
+DESCRIPTION="Command Line Utility for Rackspace Cloud Monitoring (MaaS)"
+HOMEPAGE="https://github.com/racker/rackspace-monitoring-cli"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+TEST_DEPENDS="dev-python/pep8[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/rackspace-monitoring-0.6.5[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( ${TEST_DEPENDS} )"
+
+python_test() {
+	${EPYTHON} setup.py pep8 || die
+}
diff --git a/dev-python/rackspace-monitoring/Manifest b/dev-python/rackspace-monitoring/Manifest
new file mode 100644
index 000000000000..62b6e2eac6db
--- /dev/null
+++ b/dev-python/rackspace-monitoring/Manifest
@@ -0,0 +1,5 @@
+DIST rackspace-monitoring-0.6.5.tar.gz 31397 SHA256 28e91f1054a9fe3b130c9d4fd65cb007e8efdaa89e9d8a8e99479aec73e298c4 SHA512 513e02eb7b823ed4287462ffe6517011c389119dbf37d90df31cc08714f93806188d07e4f8d339453b59f17c067229a3f52f1ae7aaf13a7c6504c0ef63b1f4fe WHIRLPOOL f90a4cfe2d13d4e68c9cfddaf9e6f94e3c721688d82059eeaa722e60278a040cbd87ae92e6d5c492b59fd7dc92e7ed302b690bc7fda4638e0e01ba22610903df
+EBUILD rackspace-monitoring-0.6.5.ebuild 706 SHA256 72b00ea2d51d160a5ba5e9a0b21dd145dc3bdcb141c42335d0a17723fe0ca3e1 SHA512 2bc40f605aa204c6a03851a1bf1db6ef8055b79535ffa21defcccb87dd81e295168ff7c0e8503311681facaffbff15307defc8185052dc53873d418d940fe374 WHIRLPOOL f4eb4081565baa656b7c768603d9acc408fde20432fdf4918d07743da14a2df90e8f23c0ed6c2c2503ec92ebed4ea8dd73c48430ac28721848f903f9748663ab
+MISC ChangeLog 2468 SHA256 325119d4a8cb7bdb528a6cbaa6e6675ea06f218e5b91945894a76e33c93c9a85 SHA512 d0fb4802b22cdff33c5221c59290a787cad1e399dd740e7b3357c78ab5c906ffaef558991e35fcec6aaf0172ee64dfe6e51c82d466984a5e0a49b6bd9ff3f981 WHIRLPOOL 7d572eca2f7a53aff3d1be5067ae1b53a1b99e2e63305bc4182a34bb056e682dda69725828d341e19abfa4c89f6d0f323f3648fe9f47537fd144124241da6805
+MISC ChangeLog-2015 1369 SHA256 aa1542c604c2ca0a18d7ed62b272bffa59e30f7e50789fcfd655ea2ec702f540 SHA512 815161f3f37020c113efea9b007112d189d10c28dec42961030defebb53144473ad7f691689c6c12dc53056fe16170292b551f1a5eaac86b661eb1c6f1e8c0e7 WHIRLPOOL 76edab4920718453529239721d6d60ef0592beb638620b2d61c31c48cefe68cf78ae72d8a94f112ecf15f1c6db3794d257f0ad6cda79d2b8fd178a252fe7592e
+MISC metadata.xml 625 SHA256 d1b335dd44e9c47e62b58b768b057f890e6d6b9ce1fff95106856b5f145b3c72 SHA512 32694d23bf7e16926d283b4cde2d1afe82dddd8da74c29f4c654173883386b54378d4d29ad2ce7bc65452b22a69c6fd582303ccda323d8be6ef6808b5404e326 WHIRLPOOL bd066a9280ac3b9bc248c1adc084af35fcdeb37b5a7e65c5776e6c241b37da73b08b57b50d6edba4af889af5ef7d1bbe0b1c62a03644b34dae6718af249f0367
diff --git a/dev-python/rackspace-monitoring/metadata.xml b/dev-python/rackspace-monitoring/metadata.xml
new file mode 100644
index 000000000000..1908a887aa1e
--- /dev/null
+++ b/dev-python/rackspace-monitoring/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Client library for Rackspace Cloud Monitoring.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">rackspace-monitoring</remote-id>
+    <remote-id type="github">racker/rackspace-monitoring</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/rackspace-monitoring/rackspace-monitoring-0.6.5.ebuild b/dev-python/rackspace-monitoring/rackspace-monitoring-0.6.5.ebuild
new file mode 100644
index 000000000000..b6c4ace0c48c
--- /dev/null
+++ b/dev-python/rackspace-monitoring/rackspace-monitoring-0.6.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Client library for Rackspace Cloud Monitoring"
+HOMEPAGE="https://github.com/racker/rackspace-monitoring"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+TEST_DEPENDS="dev-python/pep8[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+	<dev-python/libcloud-0.16.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${TEST_DEPENDS}
+		${RDEPEND}
+	)
+"
+
+python_test() {
+	${EPYTHON} setup.py test || die
+}
diff --git a/dev-python/rackspace-novaclient/Manifest b/dev-python/rackspace-novaclient/Manifest
new file mode 100644
index 000000000000..ee3affb49e9a
--- /dev/null
+++ b/dev-python/rackspace-novaclient/Manifest
@@ -0,0 +1,7 @@
+DIST rackspace-novaclient-1.4.tar.gz 1706 SHA256 68e1f53411b635f836a53d09e6c85f6a7d5d69d39df2e25a745406140cd5c275 SHA512 d36e6e331f37a9cbd6802122d03d47678ff01a5e0b0aab4def337fccd1cba9b16e088c0b27873c0612fd31c188676471805f81240127d1432613f573c1cf4281 WHIRLPOOL a6015dc091ca1128f7c2d32b2f528eebb4a8e6f8e89e86dcb3502751e8fc81c244fbc09974a78f059f0f1d5591f72a4c0634bc3fc878f9c9d365760426d1f8c6
+DIST rackspace-novaclient-2.1.tar.gz 1729 SHA256 22fc44f623bae0feb32986ec4630abee904e4c96fba5849386a87e88c450eae7 SHA512 81a3c4214ae7500909f2d5b48b86f9be5ff8d2881f5ffa18bc477050608f440cf105f8a461966b998cc98d839719348156035f47059ce631988bb3030ad65d34 WHIRLPOOL fb849ab912ddc428a100b6de36e77c21c68c22ae332754133b6370484eba61782bc1fab84cbd80222cd532e603071b2b00f537f0650ce30a039624451f71c1a3
+EBUILD rackspace-novaclient-1.4.ebuild 1007 SHA256 1fd069f0194c305ab731ef5056ad552754ca596bba6d3316fb2e0318ba9beb0f SHA512 243da418d4c88742c2469fc17cdea22977ae00eaf5b9d38672072d7b3eba528ad0764105f342d36ed4fbf918b77a3aa6496da308728cc47d3daccd02d193c9a1 WHIRLPOOL 51ddfc7ae0ac3dd8c46c5293fc432e4234db09a9614a3704fa05862c4e5e0e6def66045c0b3d936a66113e4066e51a2d69516c33b609c20ec5badc32b55ceac3
+EBUILD rackspace-novaclient-2.1.ebuild 1095 SHA256 31d162910cf97098fafac266555b2c8380ee7e110ae980b587a41ce2a9dbac03 SHA512 b20b951d103427074593af9025b1b015ebe1974ca63431429044fcde1746def049a687e11a7f2dd4394165c3d5b9b59235b60ed87e300cffe727c92dced8ec2a WHIRLPOOL 5c7255b3c65f86d29ef4f0bd65fdaadc5ac1b8009d8b5ee4969f6de0168b3658e19878bee02d77f1bba90531a21314d8232a722c4d9dccb6896261f708143148
+MISC ChangeLog 2881 SHA256 899833276b633508f0acc1ba30448b1a723498467f1cd4ef3247efe1c8c3f8ec SHA512 a0829fbdb9b12b06ca630af7d7ba3238c9f3c59d47c14ed20dd3bad83764934fa44e4e92bf668187cd4a8a6dc1cd1c6b6394dead8826b1a0a815e0795b26e422 WHIRLPOOL e511a2de4a7de3f647e5bf33d266073e95bd9439e50d8a42e1bdd50e63f33ed69d137bae078190e3b15143ca35c5ece53d03fb71ab8eda45d6e4907bdba0b950
+MISC ChangeLog-2015 1842 SHA256 d214b6abae4f8f49e99d2bf7a1c467527c64fc0c4d062ddbf169f71f5352f0e0 SHA512 0e30ddbcf873efc892a4fe847854e0ee9e0d4f6d01b04f73bcf16b612f62b1a3547341b0eaeb4e5d8302f77b18f45d7df0305b9417ef30cf48999e6f609269b4 WHIRLPOOL 8bef01165fc25b0e289e5ce771a64854901ec0e55edc053e4ed1ba93250703d62b24c49891c821826da06cbc35d7a5d894ea95f4746b19153c9628be7687d8db
+MISC metadata.xml 541 SHA256 a14351f3533993e1d46bb82f1d40e1fb5fb3cee717150adc52cc3f9da54a175f SHA512 cde2a0d81876bca001456dd1754fb13d21eb13ba31236dc4fb42cd0bb9bb222a6ca11d808639eacee70711c586e254fc39b44e2e2adfc1a6379bb0921268be9e WHIRLPOOL 54cd177b4ac1169dd7a32c66cd7e3d842fa783361993c91284ee9ad834fb76fd907cf08067b935439ca0cf259ecb3b151f6eca236f42d8069e41caa5b1d3e99e
diff --git a/dev-python/rackspace-novaclient/metadata.xml b/dev-python/rackspace-novaclient/metadata.xml
new file mode 100644
index 000000000000..8048c7c4e5a2
--- /dev/null
+++ b/dev-python/rackspace-novaclient/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+    Metapackage to install python-novaclient and Rackspace extensions
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">rackspace-novaclient</remote-id>
+    <remote-id type="github">rackerlabs/rackspace-novaclient</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/rackspace-novaclient/rackspace-novaclient-1.4.ebuild b/dev-python/rackspace-novaclient/rackspace-novaclient-1.4.ebuild
new file mode 100644
index 000000000000..fd48564fb745
--- /dev/null
+++ b/dev-python/rackspace-novaclient/rackspace-novaclient-1.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/rackerlabs/rackspace-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
+	>=dev-python/rackspace-auth-openstack-1.3[${PYTHON_USEDEP}]
+	>=dev-python/os-diskconfig-python-novaclient-ext-0.1.2[${PYTHON_USEDEP}]
+	!dev-python/rax-backup-schedule-python-novaclient-ext[${PYTHON_USEDEP}]
+	>=dev-python/os-networksv2-python-novaclient-ext-0.21[${PYTHON_USEDEP}]
+	>=dev-python/os-virtual-interfacesv2-python-novaclient-ext-0.15[${PYTHON_USEDEP}]
+	>=dev-python/rax-default-network-flags-python-novaclient-ext-0.2.4[${PYTHON_USEDEP}]"
+
+python_prepare() {
+	mkdir -p "${BUILD_DIR}" || die
+}
diff --git a/dev-python/rackspace-novaclient/rackspace-novaclient-2.1.ebuild b/dev-python/rackspace-novaclient/rackspace-novaclient-2.1.ebuild
new file mode 100644
index 000000000000..c419a1d2996c
--- /dev/null
+++ b/dev-python/rackspace-novaclient/rackspace-novaclient-2.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/rackerlabs/rackspace-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
+	>=dev-python/rackspace-auth-openstack-1.3[${PYTHON_USEDEP}]
+	>=dev-python/os-diskconfig-python-novaclient-ext-0.1.2[${PYTHON_USEDEP}]
+	!dev-python/rax-backup-schedule-python-novaclient-ext[${PYTHON_USEDEP}]
+	>=dev-python/os-networksv2-python-novaclient-ext-0.21[${PYTHON_USEDEP}]
+	>=dev-python/os-virtual-interfacesv2-python-novaclient-ext-0.15[${PYTHON_USEDEP}]
+	>=dev-python/rax-default-network-flags-python-novaclient-ext-0.2.4[${PYTHON_USEDEP}]
+	dev-python/ip-associations-python-novaclient-ext[${PYTHON_USEDEP}]"
+
+python_prepare() {
+	mkdir -p "${BUILD_DIR}" || die
+}
diff --git a/dev-python/radon/Manifest b/dev-python/radon/Manifest
new file mode 100644
index 000000000000..23b2fe5f4728
--- /dev/null
+++ b/dev-python/radon/Manifest
@@ -0,0 +1,9 @@
+DIST radon-1.3.2.tar.gz 3454351 SHA256 2f8f70f9d445ddf9327c750a36ecd0231ced8bc80271333a980368ec282ab69d SHA512 60857e82742c2d1ecb2ddf9a1ffdd23066ca5ad4939ee7afe07b0309385000fb7ba8d69ae58b00174f0ec2f758ed40ccf0677e56e2904fa6d5220a4bb6d31e21 WHIRLPOOL 4aba7ab2a831ed693349f42b9371c1af9f3192e7f93f6e660d19d1d9b9fd0f5c4d91ef54be53a1d333d4b65a0d91586de10050117162ac090d18477e7dd8a8c7
+DIST radon-1.4.0.tar.gz 1645229 SHA256 a9f9171e69b6b57d5f8e58f89c76a79d7e09d790cc8fff0f95cd4c946e8cee8e SHA512 85612cfebfb07c8dd3b7c11b920fbe765cb28142bbf9ba5e787a2c4c1b248aab84bfc5d40236535d0943e78fee30c5feb373980ccc91b701cc7d3216d1b8a2b3 WHIRLPOOL e9b9dd1e97ca5e573ef130ccc9a38c38b0c033ebbee142cfeaf6d058d3691ba7923afd0b7eb4748e03752e47c59d5368a3954a5d76db1ee5e69e41cc7012020f
+DIST radon-1.4.2.tar.gz 1645389 SHA256 4f24ea6215e17c7c6d8548035c56d29e31131d17da1d607359fc07e9b6fabe97 SHA512 0e440b36a7edf0ae8002ee27d00cd14a351261972407b4a960d9033712fc0f7f04c1541d7bcf1dc918f2abd46e1bd720f914f3fa3c101f36bf502bd1ce8cb7a1 WHIRLPOOL f961a3ea0ea12bb9df44e136da32a5fb635cb2e5b7e7049ce8d23fc95157b420382ff94a514187017a07cbaba77abe2028db654ad802ae4cff9c26168c2feba1
+EBUILD radon-1.3.2.ebuild 1114 SHA256 f72d28cf42b4e7a54a7e91135fbe26e09aa8afa976d4fcd0e8838c60c8f1a0d8 SHA512 782d5a501a68e032254c12d87d0597c70458d83e7b5f73a992e76acc543defae35b661f188bf319fadbaccce542a00db949af96a05a66abf7c1dde71a8231ddb WHIRLPOOL 53c3589d4637dc49112854827f1a8d8f71cf3da8eb347bd08a89e79d0c6b3b2a26189308aba3042325d747244b6b665ceb949a21bb8530e5a83c948dca3ba736
+EBUILD radon-1.4.0.ebuild 1114 SHA256 f72d28cf42b4e7a54a7e91135fbe26e09aa8afa976d4fcd0e8838c60c8f1a0d8 SHA512 782d5a501a68e032254c12d87d0597c70458d83e7b5f73a992e76acc543defae35b661f188bf319fadbaccce542a00db949af96a05a66abf7c1dde71a8231ddb WHIRLPOOL 53c3589d4637dc49112854827f1a8d8f71cf3da8eb347bd08a89e79d0c6b3b2a26189308aba3042325d747244b6b665ceb949a21bb8530e5a83c948dca3ba736
+EBUILD radon-1.4.2.ebuild 1171 SHA256 0bf50d38a4104809a5925b3fcdacd7e6aa87625fc32b8e494cd6e77b8d8576b0 SHA512 2619d4e120f1487469216f453fe464b0c67263928fe04c0299f3326a406e77275bfdb7637cfba6d04368a277712ca41c7b65ce556017823128ddd05112f030ac WHIRLPOOL acc1541d82149572ec65e846d4178bb754b61f60e16964970f8e23746b1152fe69ea3bc1d47198534021dfc406d6045df18f96436ec39113879e2bcadf71210a
+MISC ChangeLog 3544 SHA256 f0f204ad30ff018073d8ad048628dfae580554cb98e570ab8cb6414fc1966038 SHA512 fe0354555dd11b2159d9568e835c5395ec2831dec7b78627936d79f1df78b58228acb88ae4b9e5dc96cadb0c0e9cbd38024ab8de7d15881e5ac121955ba53e2c WHIRLPOOL 2adfb501ab242ebf82603078e0803eb6771eac60971c06bd6cad0414c685b1ddb836b8b60e25e2be27e8fb382fd4f5709b7c485e1f41d12f887811bf93d0e3a6
+MISC ChangeLog-2015 827 SHA256 1a4a366b061840873a8a6d4033389c4f736726e53f7dddcae5ca53a945d3c1fe SHA512 a32841f295e0dc47f02ccdfaa1e7e9ac3e8757443291ea2773dc7d89dfdec0167d6d18cab3c9f732d6d23babe66074fe2b1d1c19634b5c7e418b5e1d09bee4df WHIRLPOOL 64f333de35cc99dc86858abd1e5035e0fb1e45f41296adbb39cbffad4556416540ab0be660e9285c70876d16f750ed1f8932388afb8cf9b17939976ac2716f12
+MISC metadata.xml 365 SHA256 fc987d8129e238ca9c5e591139dfba0f8310b8037699fc3871daf6994af1f02c SHA512 48d6844d3f43c3fa80585a5d3d0258b078c6e38075d02c169a95970a980b29d35e9a4358affc260c4f983c2dd47a9292f56cb572b27329c04f07d800fdecc143 WHIRLPOOL 79ea1ea3f8568588db267f7aec616b309025b2b4bba489b08abdbba7ee53440da9234844b6ede02a8b4c90642f4674cef59bc6ce26765712a1f02aaf7c5f6e4a
diff --git a/dev-python/radon/metadata.xml b/dev-python/radon/metadata.xml
new file mode 100644
index 000000000000..8bc3c0ad9930
--- /dev/null
+++ b/dev-python/radon/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">radon</remote-id>
+		<remote-id type="github">rubik/radon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/radon/radon-1.3.2.ebuild b/dev-python/radon/radon-1.3.2.ebuild
new file mode 100644
index 000000000000..e028429b0757
--- /dev/null
+++ b/dev-python/radon/radon-1.3.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Code Metrics in Python"
+HOMEPAGE="https://radon.readthedocs.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RCDEPEND="
+	>=dev-python/colorama-0.3[${PYTHON_USEDEP}]
+	<dev-python/colorama-0.4[${PYTHON_USEDEP}]
+	>=dev-python/mando-0.3[${PYTHON_USEDEP}]
+	<dev-python/mando-0.4[${PYTHON_USEDEP}]
+"
+DEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	${CDEPEND}
+	test? (
+		${RCDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/paramunittest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	${RCDEPEND}
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" radon/tests/run.py || die "tests failed to run under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/radon/radon-1.4.0.ebuild b/dev-python/radon/radon-1.4.0.ebuild
new file mode 100644
index 000000000000..e028429b0757
--- /dev/null
+++ b/dev-python/radon/radon-1.4.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Code Metrics in Python"
+HOMEPAGE="https://radon.readthedocs.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RCDEPEND="
+	>=dev-python/colorama-0.3[${PYTHON_USEDEP}]
+	<dev-python/colorama-0.4[${PYTHON_USEDEP}]
+	>=dev-python/mando-0.3[${PYTHON_USEDEP}]
+	<dev-python/mando-0.4[${PYTHON_USEDEP}]
+"
+DEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	${CDEPEND}
+	test? (
+		${RCDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/paramunittest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	${RCDEPEND}
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" radon/tests/run.py || die "tests failed to run under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/radon/radon-1.4.2.ebuild b/dev-python/radon/radon-1.4.2.ebuild
new file mode 100644
index 000000000000..194ef420b1e9
--- /dev/null
+++ b/dev-python/radon/radon-1.4.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Code Metrics in Python"
+HOMEPAGE="https://radon.readthedocs.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RCDEPEND="
+	>=dev-python/colorama-0.3[${PYTHON_USEDEP}]
+	<dev-python/colorama-0.4[${PYTHON_USEDEP}]
+	dev-python/flake8-polyfill[${PYTHON_USEDEP}]
+	>=dev-python/mando-0.3[${PYTHON_USEDEP}]
+	<dev-python/mando-0.4[${PYTHON_USEDEP}]
+"
+DEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	${CDEPEND}
+	test? (
+		${RCDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/paramunittest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	${RCDEPEND}
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" radon/tests/run.py || die "tests failed to run under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/raet/Manifest b/dev-python/raet/Manifest
new file mode 100644
index 000000000000..ca774f2c2a8e
--- /dev/null
+++ b/dev-python/raet/Manifest
@@ -0,0 +1,7 @@
+DIST raet-0.6.7.tar.gz 806490 SHA256 d1b30e59bfeae1144f319baef4e9a3d5f5f9aaae4a92b9f301a5a3e8c5814870 SHA512 a6148424a18d216ab787801ef6cbc73431321ebe0b360808661b67159f895f351918c3f8a6922aacc560f7e610c1db90ee554823460120148eb493970b90c957 WHIRLPOOL 2c64c7576680ae36e4b5df1ea9e9fe8f1fb69e39719f77ad1b5232c908bc04156dbd83a7bbc3b6e9d99bdf56683b0712858aaa5b1ea82ec482039db2b758868a
+DIST raet-0.6.8.tar.gz 807419 SHA256 0643a8d3565d543b192f3fd50f00c93ceeb3b8a4a5c968fb5d0d5b98b4ba71a6 SHA512 01279e7414ec3edc9f2bc0641cb9e0606ebf5700b5ce37a05fd5919f3274b3b43aad64110baf4c4b1fda3843cb1a87b6be4ab592a8f62e82b3a716a86ae61b20 WHIRLPOOL fbaf66432a06d3b9dfc7fc23153024f7b6db00c674525b69b54e01ebd26cdabb86c3c43b7fa12785134b295ef405abdea618938593755dbb8e24065c7493732a
+EBUILD raet-0.6.7.ebuild 988 SHA256 e843f0499d15b4ade325a356edb500ccaede9d685dafb046799828117b491383 SHA512 ab7f2e125c71c85b364c9efe1fec481fd94349ad46f79d4c761ba449ac8f07034abbfee8edeebbbb3c29ea11bd7a84812c63c0b9fcc9534f1430571d8cf6f11c WHIRLPOOL 921def97592c31b1b8fbc5c04036aba410083c2aef5dca3c50863fa5168caeafc083fe5e8e2dcc1b6e66130db98868b355d2ab66fe40d5be8b75b836a9715e53
+EBUILD raet-0.6.8.ebuild 988 SHA256 e843f0499d15b4ade325a356edb500ccaede9d685dafb046799828117b491383 SHA512 ab7f2e125c71c85b364c9efe1fec481fd94349ad46f79d4c761ba449ac8f07034abbfee8edeebbbb3c29ea11bd7a84812c63c0b9fcc9534f1430571d8cf6f11c WHIRLPOOL 921def97592c31b1b8fbc5c04036aba410083c2aef5dca3c50863fa5168caeafc083fe5e8e2dcc1b6e66130db98868b355d2ab66fe40d5be8b75b836a9715e53
+MISC ChangeLog 2652 SHA256 6fce815314404409a4537bf7d38376bbd0cac2cbaa06383bd690f0024dd2571f SHA512 a2489346f400f3f4c88ac06c7a81e14e5020a420da17dd7059bc322bb08e6496350575696b3018ee8cb7713413f33cfac9b1f4819e8f26abcd448b0f912ccee6 WHIRLPOOL 5e775766dc69fdba9d590c0f53bb6e5ca5731e1e6b9777b8a4fdaa8cd62f349ee768bf728803b6b3d49b3d5a9473ab07ddc2c3cbabf250677d0f00a668440d95
+MISC ChangeLog-2015 809 SHA256 7467f10a62098975d742a485f8a66589a91fa574ca5be6bc064559be05b11a36 SHA512 15d5f1a2f3b94fa8059b3b39d3a13583394953993bc06182c5f0bea0b921060f3435cd1d1f1a51c9abd9806ae40bb0071610e4c5886b7e3a1c55c7c29815905e WHIRLPOOL 96a54c6b75a75404bc2ba3d6b0b6892c9f68b14a72b8cde1e8d13d59e03cfec0c2602d34fb31f827467558b67e88b00095813b958297d031a51f9ca4d33cd4e2
+MISC metadata.xml 489 SHA256 7b2dde76a1869d9bb7cac036715239d1dff4e31a925b96c6b4454dde148ed405 SHA512 0987a39737bc4556adf615ced4c1550f69fd952d32f5208b91763da8d23021fa88c5bfebe0f12fa382fad2a4066f68fe372c637389543a936dfc818f1de5f621 WHIRLPOOL d8bf4258715f1887cbcfcced53f0e91811c583521dba21419ad22a05e9c35b83131396b765e95a18c79cd5af6b3df83a8784943899f4b2b8bb841cd79498eb8c
diff --git a/dev-python/raet/metadata.xml b/dev-python/raet/metadata.xml
new file mode 100644
index 000000000000..c86e60dfed36
--- /dev/null
+++ b/dev-python/raet/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">raet</remote-id>
+    <remote-id type="github">saltstack/raet</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/raet/raet-0.6.7.ebuild b/dev-python/raet/raet-0.6.7.ebuild
new file mode 100644
index 000000000000..d249e5a23417
--- /dev/null
+++ b/dev-python/raet/raet-0.6.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+inherit distutils-r1
+
+DESCRIPTION="Reliable Asynchronous Event Transport Protocol"
+HOMEPAGE="https://github.com/RaetProtocol/raet"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/libnacl-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/ioflo-1.5[${PYTHON_USEDEP}]
+	python_targets_python2_7? ( >=dev-python/enum34-1.0.4[$(python_gen_usedep 'python2*')] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -i -e "/setuptools_git/d" setup.py || die
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib || die
+	${EPYTHON} ${PN}/test/__init__.py || die "tests failed for ${EPYTHON}"
+	popd || die
+}
diff --git a/dev-python/raet/raet-0.6.8.ebuild b/dev-python/raet/raet-0.6.8.ebuild
new file mode 100644
index 000000000000..d249e5a23417
--- /dev/null
+++ b/dev-python/raet/raet-0.6.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+inherit distutils-r1
+
+DESCRIPTION="Reliable Asynchronous Event Transport Protocol"
+HOMEPAGE="https://github.com/RaetProtocol/raet"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/libnacl-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/ioflo-1.5[${PYTHON_USEDEP}]
+	python_targets_python2_7? ( >=dev-python/enum34-1.0.4[$(python_gen_usedep 'python2*')] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -i -e "/setuptools_git/d" setup.py || die
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib || die
+	${EPYTHON} ${PN}/test/__init__.py || die "tests failed for ${EPYTHON}"
+	popd || die
+}
diff --git a/dev-python/ramlfications/Manifest b/dev-python/ramlfications/Manifest
new file mode 100644
index 000000000000..e05f9218d8dd
--- /dev/null
+++ b/dev-python/ramlfications/Manifest
@@ -0,0 +1,6 @@
+DIST ramlfications-0.1.9.tar.gz 1094577 SHA256 7bb89c11b13bc6b4099ee7fa07c5285a54b64a5e9c71eb6ca99660358fb27677 SHA512 5f93556e8f008b86bbe1e3b96dba3b20a31e583800334931b9c3972da897bc19a93ba5fdd687799e99aee79a93e10e58ca1b3eb5b0f38fb2b28d0f0ba0723e82 WHIRLPOOL b58c21ab3d03578fe69bd29f331744c81ff5d88ce0ed7f03c1d0abd72058069638413043d8b63cb6e8a5a2b11b078b60cb5c1baf2491e73c44a33700cd51c97a
+DIST ramlfications-0.1.9_p20160718.tar.gz 1104645 SHA256 4ce2269408eaeb79c7a3cba1b0a9bc5b59ee3b92e25300e1ee5c99ad877c7807 SHA512 a21330cddb2d390744d7c13ee62edd701f74a83c16f87b897460e2353e265f4171e90e8b51bb0c17762a1f3494ddf8aeaa22c36f0aa093f936b9a51e2d75d1f5 WHIRLPOOL 1834be4b0c23580fb5576bfc7e948acedf492bf684dfd39c4a04eb1c9a837ed7815049a67eac9ec9334960afa0c8eb77f5e9e64cfb844a070431a399c7ee7357
+EBUILD ramlfications-0.1.9.ebuild 976 SHA256 e5451572714dc9f7d642c36f015763609556e952379e65c193d9ec913c560846 SHA512 b9d7ada6825217cc6280cdb663066ffd2b05c386666ccfffe9a0eb9bf777113298dab62a89ce82a92e711c2578417573649103c450c1d15067683e12e628de4f WHIRLPOOL 5b70367b8fc0aba92faa11b478395cf22e84ffa0dbbd326a695fbbf26bc90ff347ef2dd15a979984f88e070a2eb1dbcc64e7fe6ecb57b9a3aa928be25e5a0873
+EBUILD ramlfications-0.1.9_p20160718.ebuild 1188 SHA256 100586553f88efefb32bb0b39b8d6b90740e0e43350821c219cba8ddb2b01ed4 SHA512 a0118fbe7975b1f63df28712d9c83f546ea6d9e7d3944af6bc889aac3394e0afed449cd9c613e9da68e8aeec2073bff8516b05ff2fcbdb4dce3e50b28651f320 WHIRLPOOL 0ae5011813be61e28c38b75b5f366430d5c1e22d536e7540736d686c84ee04d51c3dadadb0e31ed0ae00d873e78157e586c4c1d50da60b7aeadb86f83a0bb7be
+MISC ChangeLog 344 SHA256 5fc22249cc5fee0c185f0f6d1264949999031b2c7fb93ccbc89f2e3c41fb4aa8 SHA512 5f0a3ef1f6d6241fa445f0c61ece46956c1bc2d45c3cd7b2ef1bf7011d05b84d4dfa0c890cd8aa7ec1284f996cb176d100f9dba1af91c559292dd12f47db6702 WHIRLPOOL 5ad273a1fce0f02fb01ccbc6f064c7a67ee360d90fdd945ded550c5d6b29a164653db67a40b74641997f76d6852fad5652e45ba7d54cb9d16bbaead93e6856bb
+MISC metadata.xml 846 SHA256 b57327bb23cd9d389561c9a62029b1d9d7cad16ee3dac964c84283ce57433aec SHA512 962b5b6f020e1b02dd1654e86c45e9cfbd3aa5ef6f7833c06a55f1337c9cd97c4a025ee6ecb06b0ba5277843f6e80a39095a22b243a2bc22fa8763f8f5aab1f1 WHIRLPOOL f2d55ff4be251a3c9a1b7957052212b03cf2ab39d0601fc33a8d8f308f7be005ad03c8763579ce9fe1c55c4aa5141579891e448e5d7469d3cc68044003a82f12
diff --git a/dev-python/ramlfications/metadata.xml b/dev-python/ramlfications/metadata.xml
new file mode 100644
index 000000000000..45bdd7a13c7c
--- /dev/null
+++ b/dev-python/ramlfications/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>spam@lynnroot.com</email>
+			<name>Lynn Root</name>
+		</maintainer>
+		<remote-id type="pypi">ramlfications</remote-id>
+		<remote-id type="github">spotify/ramlfications</remote-id>
+	</upstream>
+	<longdescription>ramlfications is an Apache-2.0 licensed reference implementation
+of a RAML parser in Python intended to be used for parsing API definitions
+(e.g. for static documentation-generation).
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/ramlfications/ramlfications-0.1.9.ebuild b/dev-python/ramlfications/ramlfications-0.1.9.ebuild
new file mode 100644
index 000000000000..229e61c21744
--- /dev/null
+++ b/dev-python/ramlfications/ramlfications-0.1.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 pypy)
+
+inherit eutils distutils-r1
+
+DESCRIPTION="RAML reference implementation in Python"
+HOMEPAGE="https://ramlfications.readthedocs.org/ https://pypi.python.org/pypi/ramlfications/"
+SRC_URI="https://github.com/spotify/${PN}/releases/download/0.1.9/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markdown2[${PYTHON_USEDEP}]
+	dev-python/jsonref[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/ramlfications/ramlfications-0.1.9_p20160718.ebuild b/dev-python/ramlfications/ramlfications-0.1.9_p20160718.ebuild
new file mode 100644
index 000000000000..3ad37f9869b9
--- /dev/null
+++ b/dev-python/ramlfications/ramlfications-0.1.9_p20160718.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6})
+
+COMMIT="32a11cd7d75c4c5b3e3fc01c383314be298b0f9b"
+
+inherit eutils distutils-r1
+
+DESCRIPTION="RAML reference implementation in Python"
+HOMEPAGE="https://ramlfications.readthedocs.org/ https://pypi.python.org/pypi/ramlfications/"
+SRC_URI="https://github.com/spotify/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markdown2[${PYTHON_USEDEP}]
+	dev-python/jsonref[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/rarfile/Manifest b/dev-python/rarfile/Manifest
new file mode 100644
index 000000000000..0a029bf0b925
--- /dev/null
+++ b/dev-python/rarfile/Manifest
@@ -0,0 +1,7 @@
+DIST rarfile-2.8.tar.gz 38204 SHA256 2a27e401daa6d8ff0df1112a274a3661ca3e4afaac626217506fb1391069ca61 SHA512 6d249b1be9f286185d37fc5eaeae01c4b7153bf6248e66285099f7b9f920419986c27b006fd5511ffe4ae6e3b5214956ccb37ce5be5fc2673880cd7b2af0f98a WHIRLPOOL 37b28beb98a78403031c6f15d429d42e716401cb7e733b2c405739d022eb54800ee4d4b9223cbcfdd5d78d91689eb24362e6cf6120654b9f22d18423e93c171c
+DIST rarfile-3.0.tar.gz 110665 SHA256 e816409e3b36794507cbe0b678bed3e4703d7412c5f7f9201a510ed6fdc66c35 SHA512 b0b816bf09fe455e4d8d35b447c30e7810468a6927555164a1b513d4161f3fd4e77a37439620bd935c3a12e46b1e5eda3e35d7d281899d2f9fd26b6e989aa6e4 WHIRLPOOL 529097a0ba1e024656e80344162a866eb639ae20df9590c4d51bdd7d289ed28bf79bccbd26b05a86e9e6f1781d10e422d16291d7bc16f81075a67401484053d4
+EBUILD rarfile-2.8.ebuild 448 SHA256 71db48376050b52d86f59b9677fa27caa22f2d24113d50077493e14f8c49c366 SHA512 99c8a36364fec6f8f4824c678c4081cbb4fe4aa3424bda4c7583a5431e1ab72b882e5453fed33c24c666f0db0ded7a3e3f46fe3a930afedcdfa9852346c9fd95 WHIRLPOOL 32302354bf70a6e7c50e96ed4b55310e96ae804bfd20f8444ea57d52ea49cb0b60587af9e31b8e386586cade611f1af33124716fc36ebfb6b70cf5c3900d54bc
+EBUILD rarfile-3.0.ebuild 454 SHA256 2f60281ee5b97aefbdbed96c680bcbbd39d154cc4531a5b65536f856502f379a SHA512 6ea42c5d633a3e3b6d60af1075008eb21b697c86c471b1c0bd7e0b48185f8328703d00242a0476719c5d9eff9d7df3d6153b36d6f2544dcaf3d0f6c306ff0c5c WHIRLPOOL bdea4a38ee466ae3136249e84c8aa8b0b9968916e22bfdb103001f5e739fa6e593a2e3ccb1a830af751e57ed1a6a790a2b0f9c1f3ade96f3b217d83dbdb64f46
+MISC ChangeLog 3124 SHA256 5430af1f2da99dd771ce51461c65962459360a1ee0f86fc30c4f9f010738c5b8 SHA512 b0ac15a4795f55a4f6ad3cd50b8fa42387be52e0944bf51363e0425aa0d5fde65afd1f9e030b53b6ef2c7a1843a26bcb6a30b143ffa147bc39a5eb1cb34be848 WHIRLPOOL 3d0b2c683ee57e820d1065146776026a8cac80c0942afcd4166e0833601802db0ac97df8e36421a64d450f1c52b649f50fb9eca8478a85c723589a0f878ad945
+MISC ChangeLog-2015 872 SHA256 b77465f830ef2d7869349319745e59d66c76f48a17b161d7fad6dee6bf68e377 SHA512 a6f9a231fbd93f10ab129e1ceafa9bf71aa42bf312c87faa989e2ec1832f38ca7b6a443890b0454f109b8aca8c84610ffe5dab14207cd106db15c916fcd7c862 WHIRLPOOL bf5be7505edb5de4eff0fc2b09b88f26e147fe3c09cce08e0cb1b0951cfac4706ed235dd49ca1b6ad33bf936263c078d108db7b36456c95617fea62a7c4f1713
+MISC metadata.xml 665 SHA256 951429b454726d4db3335dd4de647fc7dfe1d60cd6827565235874a77e3711c4 SHA512 265d14703bce5b7955872c2f415e537ebe1a6228a6b5b4eec112103679c8412073ffc9506a5dd4af648c20acac78da4c196e139d7f93bf280c77d28d9f024045 WHIRLPOOL d39ad4a649240bbf4efe715abc09e0156570410d855cb44ced5aaad3834aa5424bd5be0bc79a66b47446b8143c4c503176ec2aecf5b49548cf8acb843ce71bf9
diff --git a/dev-python/rarfile/metadata.xml b/dev-python/rarfile/metadata.xml
new file mode 100644
index 000000000000..87069bfb4d39
--- /dev/null
+++ b/dev-python/rarfile/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>thev00d00@gentoo.org</email>
+    <name>Ian Whyman</name>
+  </maintainer>
+  <longdescription>This is Python module for RAR archive reading. The interface is made as zipfile like as possible.</longdescription>
+  <use>
+    <flag name="compressed">Enables the module to support compressed v3 archives by calling the <pkg>app-arch/unrar</pkg>.</flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">rarfile</remote-id>
+    <remote-id type="github">markokr/rarfile</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/rarfile/rarfile-2.8.ebuild b/dev-python/rarfile/rarfile-2.8.ebuild
new file mode 100644
index 000000000000..fbc32864d4c6
--- /dev/null
+++ b/dev-python/rarfile/rarfile-2.8.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit distutils-r1
+
+DESCRIPTION="Module for RAR archive reading"
+HOMEPAGE="https://github.com/markokr/rarfile"
+SRC_URI="mirror://pypi/r/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+compressed"
+
+RDEPEND="${DEPEND}
+	compressed? ( || ( app-arch/unrar app-arch/rar ) )"
diff --git a/dev-python/rarfile/rarfile-3.0.ebuild b/dev-python/rarfile/rarfile-3.0.ebuild
new file mode 100644
index 000000000000..83767dd2a31a
--- /dev/null
+++ b/dev-python/rarfile/rarfile-3.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Module for RAR archive reading"
+HOMEPAGE="https://github.com/markokr/rarfile"
+SRC_URI="mirror://pypi/r/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+compressed"
+
+RDEPEND="${DEPEND}
+	compressed? ( || ( app-arch/unrar app-arch/rar ) )"
diff --git a/dev-python/ratelimit/Manifest b/dev-python/ratelimit/Manifest
new file mode 100644
index 000000000000..11a5b981ac87
--- /dev/null
+++ b/dev-python/ratelimit/Manifest
@@ -0,0 +1,3 @@
+DIST ratelimit-1.4.1.tar.gz 10700 SHA256 2376d02963fe5b37e18d2d2e8d5b950b692c8d6fcd142cd3491ec716db472af5 SHA512 ab8a2cc95b852f91c614ba5a5a677d2b4b99d5f810ec8a11e69d97af58cef1f67457e1cf686a286073c85b39c2ebbeca0a459382e410c9e8eda12cecdda57f02 WHIRLPOOL 33e4e0bcb81ab2e83bddf081e70cec47a44ad3b5dbd058e0348506b49d9209b18761e33bd9843b2dfe1420eff97f3efbdbd063fec1599a4ab047bbac10df0714
+EBUILD ratelimit-1.4.1.ebuild 566 SHA256 2ad6d5147dac159733b34ddb6f5364d2bf36113de16ad1cd344b68f3d462995b SHA512 a8445d5d480db02949c0693b1e75ba44dcbaf474a7bfbd7b4aed8644c6ac1204e2278a10944ee9efe809e97cac777ebaa43b06990506669b6a899ab474e33ece WHIRLPOOL f40652c4f9865d2e07841405e646241ad978e3196fc345cafe3850f1e831a490f53b85bf46c7128ebd4c8ac508b9e4c2e1fae89ed6ec44282e5840c5901bc0c0
+MISC metadata.xml 724 SHA256 6967f9ac367756ab148245fdfeedd6e5be8af734c8cfe59438143bbbe3df4bbf SHA512 aec024dc134acf8c02150822fdd1b29ac3042aac96a5a54d5c1876e20bd4bf4bd2211374460b8dd4c19b37be44d063b5cd36ac77f196c30b4529c65bd7c45249 WHIRLPOOL aa08ddb8b2e158fe19aaf1ace1ce347070a95f485da87d152b044c48724a3e6026fe6eaf03a1504951c2dc10622b4d927c701eb2ca7bf6e8cd80126e5f630908
diff --git a/dev-python/ratelimit/metadata.xml b/dev-python/ratelimit/metadata.xml
new file mode 100644
index 000000000000..b656231c3c9c
--- /dev/null
+++ b/dev-python/ratelimit/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+		ratelimit introduces a method decorator preventing a method from being
+		called more than once within a given time period. It prevents API providers
+		from banning your applications by conforming to set rate limits.
+	</longdescription>
+	<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>
+	<upstream>
+		<remote-id type="github">tomasbasham/ratelimit"</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ratelimit/ratelimit-1.4.1.ebuild b/dev-python/ratelimit/ratelimit-1.4.1.ebuild
new file mode 100644
index 000000000000..3c01b8f2c100
--- /dev/null
+++ b/dev-python/ratelimit/ratelimit-1.4.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="An API rate limit decorator for Python"
+SRC_URI="https://github.com/tomasbasham/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/tomasbasham/ratelimit"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/raven/Manifest b/dev-python/raven/Manifest
new file mode 100644
index 000000000000..ff2e0fa86c97
--- /dev/null
+++ b/dev-python/raven/Manifest
@@ -0,0 +1,9 @@
+DIST raven-5.2.0.tar.gz 225471 SHA256 01f90e5b15a6676d5ea360e09fb0cd926edad7332584c67d83dc4371c10307aa SHA512 a7e82d9060f466500e429c119a184da1f437632dae76dfd3b24b2101e3fcf0e7fcf8b7371c299e5174c15516c127a3e437269d62d908c59f02c587f3ab528b21 WHIRLPOOL 39e50c0b79f97ec58fdc5d7cee339afd8da4efe8d063361391eb39bdcced36313f08971b93b624b97adbd06895b905b76104757042ee599228316c82cc92391d
+DIST raven-5.3.0.tar.gz 319160 SHA256 271c6eda8763b885eb514e3fc2271b59ae62099c8e9371332180059a298e01ba SHA512 805a0910aea0eed73704dc57a32482a5b01501c27c788c105b84d12241480e70d1454ab54d924e6c8e5ef03764ed5759fc79482ee24417e801e9634353160df2 WHIRLPOOL 2eb3deaff1e029fe1c2c1711e36d939ecef2849401a2b9dad8b5295c9e77ba1dc98ca8024639a1fac13e19f7dd49b0fffc478b513a1c4f18447de8b08d38ed99
+DIST raven-5.31.0.tar.gz 275545 SHA256 9f06a22083b3ff25a8203b1bf5907df4eb8f74ad8575d61a4a023bde456c5cff SHA512 9299f980640dc5aa4d4ddccfcab4b6b514eeba389aab084e267221c0966aebbe56836b07668e74b5362d51928ac4b708913f081b73a439dde8b74a37c159b7de WHIRLPOOL d0680a6e8ec76cebe5b08fbe754ad71f60a79d36b1e642073807346462a3defd582f7f49d07505d0151f601b890849fd4b9518b3ccaa151753f0036777603621
+EBUILD raven-5.2.0.ebuild 481 SHA256 a69aeaab7bd1d36d3d366fbb7ddd72e1d7397c1ae48d63c4fc73ce170b74bd76 SHA512 0b16fd24dfc7ba828eb49abfec0d3c0c6022f4871ce8996d296da4ee9b553ed53d8ec4b878b216689cec43f5a387f854854f88f47f731d400b0f80b975e977e7 WHIRLPOOL efe47bd6b2213e8386a0dd7067620376c3d568cf80ae835702a08de05bb8f532e54f84d5254c63f4bc0619ca2dd158138272d13fe5b214b6f270f8d1665093be
+EBUILD raven-5.3.0.ebuild 481 SHA256 a69aeaab7bd1d36d3d366fbb7ddd72e1d7397c1ae48d63c4fc73ce170b74bd76 SHA512 0b16fd24dfc7ba828eb49abfec0d3c0c6022f4871ce8996d296da4ee9b553ed53d8ec4b878b216689cec43f5a387f854854f88f47f731d400b0f80b975e977e7 WHIRLPOOL efe47bd6b2213e8386a0dd7067620376c3d568cf80ae835702a08de05bb8f532e54f84d5254c63f4bc0619ca2dd158138272d13fe5b214b6f270f8d1665093be
+EBUILD raven-5.31.0.ebuild 543 SHA256 9c83a977c11074ba65e214e62a29001885ee85141d68319a1b811d4f94760e39 SHA512 71df717aedd8a2f09661961c7ce50e03ecebf3821b4294c7740479a9c1f87c03631f64adf2335ea15adec34d0763dbbcf4be64eb246b140204c8af85dfa49b53 WHIRLPOOL 07384d4b25397ed7e620a172aa4db2fce4f53dff34466228b665482c75ac4498e6ab1c16df0c91378f07a4058d5beb7e5e4ae9e6d13b503976d2a414e95a5e39
+MISC ChangeLog 2772 SHA256 af6ce46ece19c94372f6de5fbea6062cc42fe4a4335a647a79dc352be85ba1f3 SHA512 f2ad4d73488c4b9aecb184d1e9f9f01b5f1b6dd2a5afbc03dc5bdbbe4dc8a36d7219a74b14bf7e0defd7ce1e4dd402abe1f54a9de30b90972d44c94c9aa1801f WHIRLPOOL 50bb2b049b5f26dd2881a89fe2a1f0e82b8d5d90532819f7d80cf2685f764d3d908fb6fe325c0d23ccb6604805f5544c01fc2a846045a6bdbae44f5fb5d1a9eb
+MISC ChangeLog-2015 722 SHA256 ae7d77a3d12cdf0ea9005a5189e0de6b628106a484e8974906f44f060350ddfc SHA512 f34839a44c1b94e01cd90cf3d9cb64ef051ca37dec6ec1a2bc0a8fe6e974515f978cbaaf040b5c007e268e2657fbeff358ff48d8dd90b3acbf4d6dd84317fca4 WHIRLPOOL 5785e5b3fce9c5b7b5ad12492b71197d1eb43d9cdadb16eba5b320e03c37c9e46bfa420a9b0578090e53536b4035d874297623af65340015ba4a71ae05d7b194
+MISC metadata.xml 302 SHA256 b8dc656942e388d3d5a08a2fcd901378ad86ec5e57c30e7fb325139c41b82f6d SHA512 d6de354f658e8eab89efec183c341052a34471cf58d339d29e511c0cfaac76771105e7b1b4f72ddc00bf95ee36a4621a7716c479b5c358fb2dbfc60d75083fe8 WHIRLPOOL ada25f8e82da88c2c77acf9dec38f5276bea68b16adc1dd3455e8a1ccb8a1fc661ad5722b3d1af91006a6cb248c865904dc6452625ec310102e79b0fd950901f
diff --git a/dev-python/raven/metadata.xml b/dev-python/raven/metadata.xml
new file mode 100644
index 000000000000..4da41c046989
--- /dev/null
+++ b/dev-python/raven/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="pypi">raven</remote-id>
+    <remote-id type="github">getsentry/raven-python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/raven/raven-5.2.0.ebuild b/dev-python/raven/raven-5.2.0.ebuild
new file mode 100644
index 000000000000..c41df2dc2ebe
--- /dev/null
+++ b/dev-python/raven/raven-5.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Raven is a client for Sentry"
+HOMEPAGE="https://github.com/getsentry/raven-python"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/raven/raven-5.3.0.ebuild b/dev-python/raven/raven-5.3.0.ebuild
new file mode 100644
index 000000000000..c41df2dc2ebe
--- /dev/null
+++ b/dev-python/raven/raven-5.3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Raven is a client for Sentry"
+HOMEPAGE="https://github.com/getsentry/raven-python"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/raven/raven-5.31.0.ebuild b/dev-python/raven/raven-5.31.0.ebuild
new file mode 100644
index 000000000000..c77e0b776b36
--- /dev/null
+++ b/dev-python/raven/raven-5.31.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Raven is a client for Sentry"
+HOMEPAGE="https://github.com/getsentry/raven-python"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/contextlib2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/rax-default-network-flags-python-novaclient-ext/Manifest b/dev-python/rax-default-network-flags-python-novaclient-ext/Manifest
new file mode 100644
index 000000000000..afa028a45523
--- /dev/null
+++ b/dev-python/rax-default-network-flags-python-novaclient-ext/Manifest
@@ -0,0 +1,5 @@
+DIST rax_default_network_flags_python_novaclient_ext-0.4.0.tar.gz 2498 SHA256 852bf49d90e7a1bc16aa0b25b46a45ba5654069f7321a363c8d94c5496666001 SHA512 f19481d70be657b086266d4d933d19ebcc5c5cbd0223afa72c3f14afbdd905d7f37f507f3b4599e9340a34f54dfa7686a30513faeccf3a43b7464d9d53e6d3f9 WHIRLPOOL 4bdde757894acabbc0e3241bea9a09598967538452ebb206e64a6dee18c3557e1f019671269493cb12347745b79e20eb4cc160b8b47fc60aa615879a51d8404d
+EBUILD rax-default-network-flags-python-novaclient-ext-0.4.0.ebuild 715 SHA256 a5c1341a8d363730a3c921dc2a29b207d36235478bf72a16519260a0e261edf6 SHA512 217153e44a6dc4271c1e5fba31c5f679c415d24fcbb0d518686eaeaeb3e5559c93c946435dcbfc94a96030f1eb1f0b47860f9461fabaeaba8f82375784b8d44d WHIRLPOOL f84a1c645da35ff6becbbac947ebb9ed85bb0bc1735cedf94281876df6e1632a60e15b1300eda011001c2b66289d2f4fc74e8c45474b5dd2e6b0d61e48e12000
+MISC ChangeLog 4006 SHA256 4e7ea0186f915ea7d81bd446016a29c5152fd5b94c587b8b8e36f269bb0ecd87 SHA512 fd0073662cd156b2965866c56b2c8f13c4765bceff1d89a1ebcc64c3a8af023f3330de8980d1a0e79c6c573779a5aaae99b485e35bb288ed08e7bc3f305ad6de WHIRLPOOL b30becff5c893e1923cdf17f9892b98c16e29ea858d2872049df02f66678a33c3168fc3fab61bfbf8516cb64b0d1b04732aba102cffc6795727b60ac41bc286a
+MISC ChangeLog-2015 2041 SHA256 e8e3590324b3c482cbad7627e3ce0533e912984c7d8637bce66ca20acdcff1ec SHA512 7e0fa2a4200d7598f40951909b9f759918e16a9a0d658e8c3f6f768fe431f25f3bd12ab6861e2af7935b05455b556b46e5799520a351573e89df3edcfc946796 WHIRLPOOL 88248a34d37a8380afb473cd458015303810f80ba32c6fe7e2c8c4f4c565353e3e0ce3baa852b43f2f2d69fa748c65b0bfb21a236ae5eadf84053a82d3bf29df
+MISC metadata.xml 598 SHA256 245e91ff7797c674441a465011d77b689f0c5c3777240ae603d829479baaefbd SHA512 553858877c24f7d356ba0331800fb0624281aa23ad5430a030931ccef0c97c24ebad5ca0583f90d110c0a7b6aaad6e1da428078f4b3faa9f66ff67e9431273dd WHIRLPOOL 2bda14b01ae9a22697e395e0f365e70e7b613b62e9f685c65a6dedfdd105c31136f0a3e4f617f75106062f5149fb13275b84abc56fee520bf404556cd1a6b2eb
diff --git a/dev-python/rax-default-network-flags-python-novaclient-ext/metadata.xml b/dev-python/rax-default-network-flags-python-novaclient-ext/metadata.xml
new file mode 100644
index 000000000000..c060c965c51f
--- /dev/null
+++ b/dev-python/rax-default-network-flags-python-novaclient-ext/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+    Adds instance default networks extension support to python-novaclient
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">rax_default_network_flags_python_novaclient_ext</remote-id>
+    <remote-id type="github">rackspace/rax_default_network_flags_python_novaclient_ext</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/rax-default-network-flags-python-novaclient-ext/rax-default-network-flags-python-novaclient-ext-0.4.0.ebuild b/dev-python/rax-default-network-flags-python-novaclient-ext/rax-default-network-flags-python-novaclient-ext-0.4.0.ebuild
new file mode 100644
index 000000000000..7400329c8e76
--- /dev/null
+++ b/dev-python/rax-default-network-flags-python-novaclient-ext/rax-default-network-flags-python-novaclient-ext-0.4.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Disk Config extension for python-novaclient"
+HOMEPAGE="https://github.com/rackspace/rax_default_network_flags_python_novaclient_ext"
+SRC_URI="mirror://pypi/${PN:0:1}/rax_default_network_flags_python_novaclient_ext/rax_default_network_flags_python_novaclient_ext-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/rax_default_network_flags_python_novaclient_ext-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/python-novaclient-2.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/rax-scheduled-images-python-novaclient-ext/Manifest b/dev-python/rax-scheduled-images-python-novaclient-ext/Manifest
new file mode 100644
index 000000000000..cfbe73014e60
--- /dev/null
+++ b/dev-python/rax-scheduled-images-python-novaclient-ext/Manifest
@@ -0,0 +1,7 @@
+DIST rax_scheduled_images_python_novaclient_ext-0.2.1.tar.gz 2781 SHA256 17236eb56c7216472d66652579531f0725fe14ee72e8b35a86fc7ca3aa734f01 SHA512 d26fcb8c4cc70b7e4b31f4eb8306d094139d914fbdaf9fda846f13a2bb6336734b2aebc4c7322df5986ba1cc57d4d5894e744ded063f4a01d7a63d3642049672 WHIRLPOOL 4e0cf12f03b08e5a06aeeeef5026e3bf0695f5ed23a229a0507d51c27de7d3cffea14256af3758a1d2070e17593ffb5353071be21e5bc27654c22a2ed888aa16
+DIST rax_scheduled_images_python_novaclient_ext-0.3.1.tar.gz 2850 SHA256 f170cf97b20bdc8a1784cc0b85b70df5eb9b88c3230dab8e68e1863bf3937cdb SHA512 231200aead561c32408237494b0927ba51f05d7f208bdf655d4f0642060899f6f30ab0f68995bbc694f8d0b36962c754c526e93c870b8422f20ddce48247e854 WHIRLPOOL 4eb51952fcce93992c2122e46ac7eb8dece3f848b8799a31c297cbd07a6d6246f0b7482bde7c549a1998bb894134d8d188ad1e8145abe3821a96f3e66d4e5a14
+EBUILD rax-scheduled-images-python-novaclient-ext-0.2.1.ebuild 690 SHA256 5674080d9a95100050817255c8642782d2f954f253f7cce760408feb1717eaa8 SHA512 86436b40ebe38b3e6b731a9739e6f3834135e30b83a24c77a752ae70eced094fca4b83df2a8da46523a599bc3573e28eff44f455dd6b92d0e8d7733058d4e07d WHIRLPOOL 4c932aad55b699058afb48fd840f41009148cc5961a8187b567d3b6d688217e185fa8c645bf3106688757732d9987e0ec2c55b7d16ee20144421b7973d4b4996
+EBUILD rax-scheduled-images-python-novaclient-ext-0.3.1.ebuild 710 SHA256 4e5346162d5e804affb2673784fade6e86bcdf8f9d89b2336a1361ca59ac7851 SHA512 ea986cee30b782806db895d1c5c9fd8035f621b9ba2e9ae25614fbfbea324a743ca71e0724d9d49799cf9f8c81cbf0b9eb0d7eddc44005cd8be25e138c6b8896 WHIRLPOOL 640ace420c5a9c5ef5a791977e1db82e2363edb7ed2a66afe7adcd97c8eae5cfddb89b188c7c34472d32dfa1183fdd8e93c8003d0bbc1023e26e967d0887ba98
+MISC ChangeLog 2757 SHA256 effc38105aa32cbcb3e5644112cf2a2708c0e1e2c134c56f81fcff67d36c7468 SHA512 846dacdc2bd711160a9aeaefaf226e089e86cdfe865a2c6dd88b57bcadf01d596e14881a4d39cf61aa0bac27a24fe69cdf6ebb4075effceafae386873a0d3156 WHIRLPOOL 9cc5fdbdb503cb30d8402853f017d2263ddf77543ec5c3cfa3d7d8c0b4113e5fe8d42be3a532f58e13ad6edeaec558d633e4d406cbc8910e1ff83746ee6c0a74
+MISC ChangeLog-2015 689 SHA256 09c5a75dea16efa0799dbc6977681bb5705661004ea00e7e67ff77eeb108bc4b SHA512 e9a396c4a1d1bedd72023dfff519436d109cc4b311c9a09a6def638827f469b6380cfdaf8acd8d411bf27b969a5a73db848536775a324edc30c99e55c735dc43 WHIRLPOOL 23e13405707f95fd1b4bb6c917271b7d5bbe9ecf574256cca20a97a3d1a836bf168bb62efce66bd72a1f83dbbf35115fd2f288bc92a03e42ffd4d5eb4e3ff656
+MISC metadata.xml 578 SHA256 ab956e17b31ddf5efb9d91bfa268418de0c82d01e6d54a4646e375e2770853c2 SHA512 f7947c2ac98db4afdd605fbaab5510851aa49eb136cdcf6f90c17d014adbea156c91c2c0dd11c2cd089428e582234afbdd6c3b9816c536791ee741ee55928201 WHIRLPOOL b951e84d6bd25a0da4da9f0be66cec39486b5b9018e4ae2f2cee00f84bda7a26531365bd9dbb76bcc9e905be95e61d301b892b90f01d416bcc30cfd6d6c5eb58
diff --git a/dev-python/rax-scheduled-images-python-novaclient-ext/metadata.xml b/dev-python/rax-scheduled-images-python-novaclient-ext/metadata.xml
new file mode 100644
index 000000000000..f168b8098aa0
--- /dev/null
+++ b/dev-python/rax-scheduled-images-python-novaclient-ext/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+    Adds backup-schedule extension support to python-novaclient.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">rax_scheduled_images_python_novaclient_ext</remote-id>
+    <remote-id type="github">rackspace/rax_backup_schedule_python_novaclient_ext</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/rax-scheduled-images-python-novaclient-ext/rax-scheduled-images-python-novaclient-ext-0.2.1.ebuild b/dev-python/rax-scheduled-images-python-novaclient-ext/rax-scheduled-images-python-novaclient-ext-0.2.1.ebuild
new file mode 100644
index 000000000000..a93fb0a5f9a2
--- /dev/null
+++ b/dev-python/rax-scheduled-images-python-novaclient-ext/rax-scheduled-images-python-novaclient-ext-0.2.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Adds backup-schedule extension support to python-novaclient"
+HOMEPAGE="https://github.com/rackspace/rax_backup_schedule_python_novaclient_ext"
+SRC_URI="mirror://pypi/${PN:0:1}/rax_scheduled_images_python_novaclient_ext/rax_scheduled_images_python_novaclient_ext-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/rax_scheduled_images_python_novaclient_ext-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/rax-scheduled-images-python-novaclient-ext/rax-scheduled-images-python-novaclient-ext-0.3.1.ebuild b/dev-python/rax-scheduled-images-python-novaclient-ext/rax-scheduled-images-python-novaclient-ext-0.3.1.ebuild
new file mode 100644
index 000000000000..be8367964d17
--- /dev/null
+++ b/dev-python/rax-scheduled-images-python-novaclient-ext/rax-scheduled-images-python-novaclient-ext-0.3.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Adds backup-schedule extension support to python-novaclient"
+HOMEPAGE="https://github.com/rackspace/rax_backup_schedule_python_novaclient_ext"
+SRC_URI="mirror://pypi/${PN:0:1}/rax_scheduled_images_python_novaclient_ext/rax_scheduled_images_python_novaclient_ext-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/rax_scheduled_images_python_novaclient_ext-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
new file mode 100644
index 000000000000..cbf62ba0d5de
--- /dev/null
+++ b/dev-python/rdflib/Manifest
@@ -0,0 +1,7 @@
+DIST rdflib-4.2.1.tar.gz 889467 SHA256 eb02bd235606ef3b26e213da3e576557a6392ce103efd8c6c8ff1e08321608c8 SHA512 49145f80a9e027847523faed059c16ec1de358bb9d8fc3ab4fd3bf95a88dd181986b1785deedf6e837cf0b064bd74ab8e27fbb5581e33310353da3546ae7b016 WHIRLPOOL 010bb4cf7c544b9a3f28636182b6c1821f390066bfe3de59f58fb7cfd8d809d8b0b5f256134b9c5091327c7ba6319be02135d6ea8a6d8b37772e212f000c3ba7
+DIST rdflib-4.2.2.tar.gz 905094 SHA256 da1df14552555c5c7715d8ce71c08f404c988c58a1ecd38552d0da4fc261280d SHA512 efc24d8ce1080e59950cecc9c779ae0d63673c8690f74db1772f6c2dbf24d6f4de5214d5870a074bffe549b42d8d5f5d131df29bbfd174b763ae1f843aec7d5c WHIRLPOOL f270e89354e601b17a91fb415a01f44ddaf90fec71e71997007f72db15275cae17bb4f2e45e2aacc852d748beda2907e5dc48c930c12632bf5846af335d7ac09
+EBUILD rdflib-4.2.1.ebuild 2687 SHA256 e7f9821a0716383b6116141ac8c89c14c46516b7db143a1d94afc5d13bd7428f SHA512 86091ab53bc5103f5a673678504e8b99520e314c0b290240595f34df13740a4fca2e580082f9cf8fa18c517a220d87eb87c87e8edca97e2d4373ac177a2147dd WHIRLPOOL f2c9b62d6d55c1f531728d31d2a335e1a020dbc69f2d105e07aa325d9e2c71424ee0c5f6ccc0bace89422fc1b6eae0a7b7691a0a43366df2b347ff502e164702
+EBUILD rdflib-4.2.2.ebuild 2719 SHA256 28ba2ba409260c811c8bbb3816f7ced260f405325f9907242ed20c0f45d5e4ef SHA512 26b31cb0f7c476e8be2ffaa18679ee8a195781a1ccbaa1c57925d69fff15cb8fd622ee130578468d14705b22c0197b8dd072c9bf81f48fe5481c288dc08f7e19 WHIRLPOOL 0c271341802ee2d7d2a21efc7afb90b262cf299f43450d7accc520965441e7ae0f30b0a923f274d65c01b917ebb3329cd6a90429c8cfa8c39659f0bc368cfead
+MISC ChangeLog 4770 SHA256 c510cd384fcd4faf6287589be3bf51682e034b53e8c38bb6008a7a02e5d3d8bd SHA512 695d0630b757ba02020fa744bc47ec40ad158a1831e63da28e41163da219b6ff900e120f1327570fdd1102dac69a8edf32ccd0573214ef237e7beacdf766300d WHIRLPOOL 666c8a4585ae658b51e337cbf9093960731aed943569f549006787bcd2a6ff7c314a7705edc7fd06e34a0b83361938547eefeb96be2ac4033a6bb5fd0eae1b68
+MISC ChangeLog-2015 7751 SHA256 303daa55ffdd234b1afaebbbb9b89f62b54882c3ab839b7c240c4767fb15b995 SHA512 2657f7fd24417e58f362951c65b3df467597be39678cfe96f8333b756194133b385534523cb7e9011be4483897d1594129a0a00c24e9e896a06099693cd7d8f6 WHIRLPOOL fc7ea0b0dc9e4bbb63de47d06b49fb0beaca9bd1c71437077a25da4f3d06fa33d2f96ec23dd5adf1b962765578dfe1b1e55b0542c332ec11371b132dd1140f58
+MISC metadata.xml 462 SHA256 ccd63944c14bd816f30d25f5559903477542234b94af4d55be28ee5f2fb2a2ac SHA512 d9b717e12472862a9071d3d2ad3efffcc053f6890a9a307f882040f77e7304addf30fdceaf94b9a752de5daaf7eae21a68d39311f9997bc1e99c598b5093fd78 WHIRLPOOL 088e8d57b918768a4adb237e3606f69292b90f6ce64ddca65cb2b4112be7ce711a63e9195bae48726fbe45d95238af9c3f8db95073c74da6c33886d5515599b9
diff --git a/dev-python/rdflib/metadata.xml b/dev-python/rdflib/metadata.xml
new file mode 100644
index 000000000000..0f9dc9bd02e5
--- /dev/null
+++ b/dev-python/rdflib/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <use>
+    <flag name="redland">enable support for Redland triplestore</flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">rdflib</remote-id>
+    <remote-id type="github">RDFLib/rdflib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/rdflib/rdflib-4.2.1.ebuild b/dev-python/rdflib/rdflib-4.2.1.ebuild
new file mode 100644
index 000000000000..a7d090805bf8
--- /dev/null
+++ b/dev-python/rdflib/rdflib-4.2.1.ebuild
@@ -0,0 +1,85 @@
+# 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} )
+PYTHON_REQ_USE="sqlite?,threads(+)"
+
+# The usual required for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="RDF library containing a triple store and parser/serializer"
+HOMEPAGE="https://github.com/RDFLib/rdflib https://pypi.python.org/pypi/rdflib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="doc berkdb examples mysql redland sqlite test"
+
+RDEPEND="
+	dev-python/isodate[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	berkdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[$(python_gen_usedep python2_7)] )
+	redland? ( dev-libs/redland-bindings[python,$(python_gen_usedep python2_7)] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/sparql-wrapper[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.1-r1[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Upstream manufactured .pyc files which promptly break distutils' src_test
+	find -name "*.py[oc~]" -delete || die
+
+	# Bug 358189; take out tests that attempt to connect to the network
+	 sed -e "/'--with-doctest',/d" -e "/'--doctest-extension=.doctest',/d" \
+		-e "/'--doctest-tests',/d" -i run_tests.py || die
+
+	sed -e "s: 'sphinx.ext.intersphinx',::" -i docs/conf.py || die
+
+	# doc build requires examples folder at the upper level of docs
+	if use doc; then
+		cd docs || die
+		ln -sf ../examples . || die
+		cd ../ || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# https://github.com/RDFLib/rdflib/issues/510
+	if use doc; then
+		einfo ""; einfo "Several warnings and Errors present in the build"
+		einfo "For a complete build, it is required to install"
+		einfo "github.com/gjhiggins/n3_pygments_lexer and"
+		einfo "github.com/gjhiggins/sparql_pygments_lexer"
+		einfo "outside portage via pip or by cloning. These have not been"
+		einfo "given a tagged release by the author and are not in portage"
+		einfo ""
+		emake -C docs html
+	fi
+}
+
+python_test() {
+	# the default; nose with: --where=./ does not work for python3
+	if python_is_python3; then
+		pushd "${BUILD_DIR}/src/" > /dev/null
+		"${PYTHON}" ./run_tests.py || die "Tests failed under ${EPYTHON}"
+		popd > /dev/null
+	else
+		"${PYTHON}" ./run_tests.py || die "Tests failed under ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rdflib/rdflib-4.2.2.ebuild b/dev-python/rdflib/rdflib-4.2.2.ebuild
new file mode 100644
index 000000000000..1347cd05994a
--- /dev/null
+++ b/dev-python/rdflib/rdflib-4.2.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_REQ_USE="sqlite?,threads(+)"
+
+# The usual required for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="RDF library containing a triple store and parser/serializer"
+HOMEPAGE="https://github.com/RDFLib/rdflib https://pypi.python.org/pypi/rdflib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc berkdb examples mysql redland sqlite test"
+
+RDEPEND="
+	dev-python/isodate[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	berkdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[$(python_gen_usedep python2_7)] )
+	redland? ( dev-libs/redland-bindings[python,$(python_gen_usedep python2_7)] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/sparql-wrapper[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.1-r1[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Upstream manufactured .pyc files which promptly break distutils' src_test
+	find -name "*.py[oc~]" -delete || die
+
+	# Bug 358189; take out tests that attempt to connect to the network
+	 sed -e "/'--with-doctest',/d" -e "/'--doctest-extension=.doctest',/d" \
+		-e "/'--doctest-tests',/d" -i run_tests.py || die
+
+	sed -e "s: 'sphinx.ext.intersphinx',::" -i docs/conf.py || die
+
+	# doc build requires examples folder at the upper level of docs
+	if use doc; then
+		cd docs || die
+		ln -sf ../examples . || die
+		cd ../ || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# https://github.com/RDFLib/rdflib/issues/510
+	if use doc; then
+		einfo ""; einfo "Several warnings and Errors present in the build"
+		einfo "For a complete build, it is required to install"
+		einfo "github.com/gjhiggins/n3_pygments_lexer and"
+		einfo "github.com/gjhiggins/sparql_pygments_lexer"
+		einfo "outside portage via pip or by cloning. These have not been"
+		einfo "given a tagged release by the author and are not in portage"
+		einfo ""
+		emake -C docs html
+	fi
+}
+
+python_test() {
+	# the default; nose with: --where=./ does not work for python3
+	if python_is_python3; then
+		pushd "${BUILD_DIR}/src/" > /dev/null
+		"${PYTHON}" ./run_tests.py || die "Tests failed under ${EPYTHON}"
+		popd > /dev/null
+	else
+		"${PYTHON}" ./run_tests.py || die "Tests failed under ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/readlike/Manifest b/dev-python/readlike/Manifest
new file mode 100644
index 000000000000..3d299ae18c95
--- /dev/null
+++ b/dev-python/readlike/Manifest
@@ -0,0 +1,3 @@
+DIST readlike-0.1.2.tar.gz 5068 SHA256 08645493a24eecbcad70a5ed7fbf1a3820ba5e57e9690297edc485c2992f66b2 SHA512 4ecd694c69c615ec37da05341596af4ec26abeeda78ecf10fc3019533a7ab092ed1e1e4f8910a7835d7ffb157b203cb0395a2eba135d3aba861abb75d466980e WHIRLPOOL d41e5998be1219bba36507e9fa5d14197070877ea6c938271df30c7ee5ce46f780b405fdb32d46cb3707779f0af3681b617ba4ea4f51acccca45ebb3100771f4
+EBUILD readlike-0.1.2.ebuild 455 SHA256 4d8d52b01a6d9fe3798c5e164a6ef3930890392afacec048eb0548d05580b969 SHA512 b0b7671235498f27b40cfdf642bea079054216c657a28b5ebdfcb253709bfa888b53a0bd67511b5c2eaf0e7dee6e47a3e95c4adbb48fc108ebfc1a49faa0d4a8 WHIRLPOOL ec74fab230865bed15a73511b8c708aceebd0d40defc409a71601a0dc5e134ffdd0416eb7c3d57f56377c3aa8bc001f11dbe6a113cb721f3c74ca1f3fdd30a07
+MISC metadata.xml 398 SHA256 88f933ffcc0e1c8cd878d92e196d05a6479da67aa60dd18da97d26b29c3f1ccc SHA512 9652d90ccef384118b6a4c10dc1dd2c9e416c2f1a13bff3a2e803e017961b2e99f53fd51befaa80f7d4a43933add48b79aeb0e79780cbc4d9f37bf99dc39fa01 WHIRLPOOL 4279b82485b0a5e0ac98520d7b207fbb394f1ddedee72198128dbb7dd8679162ed2118d00195e097b51601b55c076f16a47357969f1823c035370be4c771516e
diff --git a/dev-python/readlike/metadata.xml b/dev-python/readlike/metadata.xml
new file mode 100644
index 000000000000..12cb16d8db4a
--- /dev/null
+++ b/dev-python/readlike/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">readlike</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/readlike/readlike-0.1.2.ebuild b/dev-python/readlike/readlike-0.1.2.ebuild
new file mode 100644
index 000000000000..ac88189fd790
--- /dev/null
+++ b/dev-python/readlike/readlike-0.1.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="a python library similar to readline"
+HOMEPAGE="https://pypi.python.org/pypi/readlike"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/readme/Manifest b/dev-python/readme/Manifest
new file mode 100644
index 000000000000..0ee85906c45f
--- /dev/null
+++ b/dev-python/readme/Manifest
@@ -0,0 +1,5 @@
+DIST readme-0.6.0.tar.gz 9938 SHA256 150c55626d2be4237616d84367b789e398f4d416029e5c62b09fd1688fe14222 SHA512 73c41c728171a18a963460459aa19d559f38ad34d54a9840820feb1329a0d71c1b0eb32ce773a4f8e9d361e534bfd916e376fe1a3fe8b8a9eb91fffac3ef565c WHIRLPOOL bb45daa786a26a0c3ab7b16583b13d56e782439a06ef53a87a94d60bfb2e6220eb65fc75d7ebfc77d5f6bb3b299438f1c00e88d7edf391ad95231e18be37c523
+EBUILD readme-0.6.0.ebuild 885 SHA256 843f2fd386e4bf2ec2d491b34e2611232d29470086cc40e69e1c95166ad11f4c SHA512 de35c26a8646f16e6fcedbfa5429c6676ffad47c599790872772fbaa7860a4da2b6fb881b1d6419f3fade272a2f7f50bf3f32f83d4e705a54f5e8fc86cc7a3f2 WHIRLPOOL 6a9a8b8362aac537ca79b3f38dea615deb6f2b21bce6be9faa4d253b4c222b440c919a64b2ab06ba862f4713d68f88987a1b615ee75ffab4bb88b72884409a73
+MISC ChangeLog 3292 SHA256 38d88bd4172b8ec65f682d075efebec515ba155583f2ef65cb3ba58e6cdd0083 SHA512 c7f228543d8c337507786f42153411150e21717f1ca8b1a9088bc5ffef94f6230596732d7035da05456fba065cf93073fa3f05442e2da51e47aa59b9412fe9b5 WHIRLPOOL b272433e1a23ddaa67e6af42c6d18ab4e772bd3a53e5346d761a018d47abacc6c8bf8eaff45cfa2727a491c7106ab7a030c912f887012846b4ce9556b1329e76
+MISC ChangeLog-2015 873 SHA256 732bfeaf317e91190effb0a0131012e51e1c911e35f186d21d81af9c5a964bfc SHA512 64eb349562c940476d5a30fee6b500ee2617eab42ce23a0ddc7c7e341478675a1efafc2efa40c689cbe367fe833e5c94c228b2c463c623fd2f5db3054dfb1be1 WHIRLPOOL 6dbfe10a2f8244ff52ed2f4b4022bdc550e56dbf0763b89509fddd52e2e21df6cedd1e3a279227ca7a2cf7e5bba35ed6f34966e2d022b21d2fdd9974aefbd054
+MISC metadata.xml 372 SHA256 916d64bdf5cc8109b671e1a07f73df8a58acfee12022cc1e343e63e48a05f85f SHA512 97168e8c89035983857c0c5d3f3241665d3dfb7088e591563835214cfc2786e11f7a5ab95b0deda2f017dd2c2c3713d8dc6d7c76950ed163285013b6a4b39dda WHIRLPOOL dbda74ec65c6d363925cc18ab360cb3e9ea3559fe90f84452a98bff9d75eadf0efa4d23d1046a72d50c0d18136cf05892c7fc7dc7d69de20d686627f1eee0efa
diff --git a/dev-python/readme/metadata.xml b/dev-python/readme/metadata.xml
new file mode 100644
index 000000000000..c1e6480907b6
--- /dev/null
+++ b/dev-python/readme/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">readme</remote-id>
+    <remote-id type="github">pypa/readme</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/readme/readme-0.6.0.ebuild b/dev-python/readme/readme-0.6.0.ebuild
new file mode 100644
index 000000000000..8cd6555e5b53
--- /dev/null
+++ b/dev-python/readme/readme-0.6.0.ebuild
@@ -0,0 +1,35 @@
+# 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="a library for rendering \"readme\" descriptions for Warehouse"
+HOMEPAGE="https://github.com/pypa/readme https://pypi.python.org/pypi/readme"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+RESTRICT="test"
+
+DOCS=( README.rst )
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
new file mode 100644
index 000000000000..c959c6482ad5
--- /dev/null
+++ b/dev-python/readme_renderer/Manifest
@@ -0,0 +1,3 @@
+DIST readme_renderer-17.2.tar.gz 14643 SHA256 9deab442963a63a71ab494bf581b1c844473995a2357f4b3228a1df1c8cba8da SHA512 2c25eb24b04b88fa8522ff0068e3a3a7b57b035641d0053ff93c295dde50cc6f21af9eeca1061eef794f52b0aff184f97c95b3c232f02b308e09682e50a6d40e WHIRLPOOL b9bcbdfc5778e83b7f4aadaf764895f4263af60f98febac89acafa928dc28e4fbd1022e7660abe2051807df2154dd04bea9d3533fa9fa5cb67a9897853a5caa4
+EBUILD readme_renderer-17.2.ebuild 861 SHA256 f56e72af628664fd3c3d734aec8f3802f060200b6a80f981870e3baca4196ee9 SHA512 7c111855df8cc375b297d6ec6b49fb46c098bd61e837a19dda49d21d781456397641493acab4ddaeab195580ffe79725daa9ff400895800abcf744d60f29df96 WHIRLPOOL f682dff106b8b34f4c28b7e9869c65b52f4576fd6732bbaedbda9d17aa9f85d7d9a88302898bd51456f618a1e085ae2266aabf95fff18ad1e9cb8b5c642008ca
+MISC metadata.xml 390 SHA256 a26686e27bc16a9f1a260dd1b033ed87f823f0d9d4aaba7a0ae4e832ec0f3be3 SHA512 8594fa46429779b659f2a382d3a6607bc36476387c17c493cc7b9217c5e8600694f597ba5657e46ab7b1d3a75aabf3c113a538372b9a4db58a4b986c41bd6b7f WHIRLPOOL 6b61531d17bf252fb24b0f8ccc91af863e97f16b10a35fdef2f017be3b3e41ce0d560a2f3afa57f0c983208a3565da90e5d48b11dcc13763e858f314ebbef934
diff --git a/dev-python/readme_renderer/metadata.xml b/dev-python/readme_renderer/metadata.xml
new file mode 100644
index 000000000000..654b29049752
--- /dev/null
+++ b/dev-python/readme_renderer/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">readme_renderer</remote-id>
+    <remote-id type="github">pypa/readme_renderer</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/readme_renderer/readme_renderer-17.2.ebuild b/dev-python/readme_renderer/readme_renderer-17.2.ebuild
new file mode 100644
index 000000000000..6b476590ba28
--- /dev/null
+++ b/dev-python/readme_renderer/readme_renderer-17.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
+HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.python.org/pypi/readme_renderer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/bleach-2.0[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst )
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/rebulk/Manifest b/dev-python/rebulk/Manifest
new file mode 100644
index 000000000000..ca413ed48205
--- /dev/null
+++ b/dev-python/rebulk/Manifest
@@ -0,0 +1,7 @@
+DIST rebulk-0.8.2.tar.gz 257147 SHA256 8c09901bda7b79a21d46faf489d67d017aa54d38bdabdb53f824068a6640401a SHA512 7abbeb1974102db4846759de6c797b9fb0b81a6ffe573d8a7590342da8ed5b4c006258407540be8563d51fb36ac2a148132e879586a200a923cfe93dcc715bee WHIRLPOOL e50c3ca72801a11f9d926ea42572c910fba1660cdf6827bd2a00755beb808711dd2718a433c983bf20792bd7a05faf3820eb3477dbb639fe170dae68779a28c9
+DIST rebulk-0.9.0.tar.gz 257342 SHA256 e0c69bdddccbba3ef881948ea96f1d62eda91201c306ea568a676507a30985eb SHA512 25a22b3a5f5519f6f8c10abf6a477f212c0500264cfdcc5a9be09d3818462a051b1a7cd78f94991c44ac6bcdc7435b9909e65de48d1bd8138989e0da98d10262 WHIRLPOOL 7b5e280c2598be73a6da96eda2c192698c94f3e8e8a57738f0527b119aa995e7ffb55bb0bfd1b81462b2e8043195e8cd84240df7b4d992374af0f5db674496cd
+EBUILD rebulk-0.8.2.ebuild 938 SHA256 0494bc4717ea465160c8f1fbdfe6db6fc37a07018b19d8c606be2b2c403e013f SHA512 4c040b6a37fad39b7a66c7db165ce7df4850a4659fdc5ae97753c9fbc3213605ae3b69a1a20b7fc6c0034fe483a5a2f62920ff2029e0b3374d1b368b2f890172 WHIRLPOOL 991184931cdf505c3335aaf804c6e404f53c323690543f33f0697b17644edbd6ae6395e79b3be08b11d6596a8d1921d2be8ec8a2a759788e7e2ae15bae6d68ed
+EBUILD rebulk-0.9.0.ebuild 938 SHA256 0494bc4717ea465160c8f1fbdfe6db6fc37a07018b19d8c606be2b2c403e013f SHA512 4c040b6a37fad39b7a66c7db165ce7df4850a4659fdc5ae97753c9fbc3213605ae3b69a1a20b7fc6c0034fe483a5a2f62920ff2029e0b3374d1b368b2f890172 WHIRLPOOL 991184931cdf505c3335aaf804c6e404f53c323690543f33f0697b17644edbd6ae6395e79b3be08b11d6596a8d1921d2be8ec8a2a759788e7e2ae15bae6d68ed
+EBUILD rebulk-9999.ebuild 936 SHA256 a279971fb57986af8fd70025ae20bd1cdbb0a1b4402fafc48075d4884c171be1 SHA512 74cde2d40c07bd9da65885f653a16c3d00b28386fe8665b6616782690bc7ae62f487591e5193bf62e0967a0cf57a79dbc11a47874b8f19e7de38337cc009d284 WHIRLPOOL 8cc684ce9e5765340100d112a226ab75dda979e151739a37013f92f6650f0490f5be53d2cf1c3f5919df474560a2f941e1c08b173e3869861dfc856363de61ac
+MISC ChangeLog 2746 SHA256 be277b3f20e1baf30f09a5c74f93529d78a59f867b767a11ea79b15d947d1e9a SHA512 fadba84935e1c41817db9571f912912e8735fad139e48449e09c655405458c182143471cb3f756451abca7a5766066eafe26f28a29c3c569b1ec8fff01e012ff WHIRLPOOL 00b1334eceb79bb687bde1a1f920ac447dc71f6936643b46cafc4d07386e667457612538aa49d332862ad37ebcc260c93331f3e1b007a17c8b20b344a3cf0471
+MISC metadata.xml 488 SHA256 f4238cb0d304671242324372f9cf94ef08db6021ec172fb6a2b7747439d5988a SHA512 96dc9190f57efa7286206f2eacd5b67307d2677f706e99ed7d575a79e454c38c7038338d8989be76c5fe6c2003b7789e523edd2cc24a29180d7d7a21133febfb WHIRLPOOL adaa1f569e1f9f74bdceca1b4287f9c0649d13421a0c2fd3c9ac5e23fbe8e2f440d05cda761ad6531aaf6dee78cd2c1b07de50bb811a976437da879d3afd907e
diff --git a/dev-python/rebulk/metadata.xml b/dev-python/rebulk/metadata.xml
new file mode 100644
index 000000000000..da5a8b155c95
--- /dev/null
+++ b/dev-python/rebulk/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>itumaykin+gentoo@gmail.com</email>
+		<name>Coacher</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Toilal/rebulk</remote-id>
+		<remote-id type="pypi">rebulk</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/rebulk/rebulk-0.8.2.ebuild b/dev-python/rebulk/rebulk-0.8.2.ebuild
new file mode 100644
index 000000000000..4fbf9cb372d9
--- /dev/null
+++ b/dev-python/rebulk/rebulk-0.8.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library that performs advanced searches in strings"
+HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.python.org/pypi/rebulk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Remove base64-encoded zip archive with pytest.
+	rm runtests.py || die
+
+	# Disable unconditional dependency on dev-python/pytest-runner.
+	sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/rebulk/rebulk-0.9.0.ebuild b/dev-python/rebulk/rebulk-0.9.0.ebuild
new file mode 100644
index 000000000000..4fbf9cb372d9
--- /dev/null
+++ b/dev-python/rebulk/rebulk-0.9.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library that performs advanced searches in strings"
+HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.python.org/pypi/rebulk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Remove base64-encoded zip archive with pytest.
+	rm runtests.py || die
+
+	# Disable unconditional dependency on dev-python/pytest-runner.
+	sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/rebulk/rebulk-9999.ebuild b/dev-python/rebulk/rebulk-9999.ebuild
new file mode 100644
index 000000000000..50658d386ae7
--- /dev/null
+++ b/dev-python/rebulk/rebulk-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Python library that performs advanced searches in strings"
+HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.python.org/pypi/rebulk"
+EGIT_REPO_URI="https://github.com/Toilal/${PN}.git"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Remove base64-encoded zip archive with pytest.
+	rm runtests.py || die
+
+	# Disable unconditional dependency on dev-python/pytest-runner.
+	sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/recaptcha-client/Manifest b/dev-python/recaptcha-client/Manifest
new file mode 100644
index 000000000000..41b91e7ac7f6
--- /dev/null
+++ b/dev-python/recaptcha-client/Manifest
@@ -0,0 +1,5 @@
+DIST recaptcha-client-1.0.6.tar.gz 7389 SHA256 28c6853c1d13d365b7dc71a6b05e5ffb56471f70a850de318af50d3d7c0dea2f SHA512 c41954d722181ece934701df0701101b31cad74c15a123c2c641e671e5117a27ea23e1f52aa9126d7ddfd038438f951d45ec4112323306a91d81072e31b3f5bb WHIRLPOOL a02764e7c67b62f6648cce97f3ba76ce894f0ef622c1a5da4e75f3bb6431257e24de4b9f137ab6a45d5b304b7f1320ef12261d0d17f0f7b80df2589e68cf96a7
+EBUILD recaptcha-client-1.0.6-r1.ebuild 512 SHA256 790b79929d5d8c44b1598a11a29ac12d4bb7bbebc66cf0c8e5f83173dca65e60 SHA512 dc2c0784a571088c95fc653a9ef1f24f8daff71d1c9e5b49cf2e01560a0131cbec549eb0084d75f36b0f140a02aef7a5c3a631a55bb353ba3b2e5dc483f64f03 WHIRLPOOL b8cd8a8344a732eb94c0a0dd2237a56f33f23f599d0cff0c5bd9f1416fd9cf7446e477346a2217a962b0552a8e09cfad6baf34a20151c17f9e331f8b87faa5de
+MISC ChangeLog 2761 SHA256 0eea3ec985c3c3e705356846f7e88b713d37375ecffff8e2c1d693766a90a076 SHA512 b630550430ae280ba343814868073fbae44c8709f1beb8c6fca7ced5f7acdc5139d311cc04ea5a4d7f4dabba3adab8c44585a986fcec8260566f0050823a64ac WHIRLPOOL 433300c37c3811522d02940397ebbc1d53781423ef21867b34a1e9be9b5a049a312bde33fe8ef94319a3c1928c04dc0d000798ae975cdb89de646f29e120239c
+MISC ChangeLog-2015 1104 SHA256 6aa031d7127d06d010eb8a11755ab8028e1b2ba84af20f3ec1341e7402b7bc66 SHA512 6cfb675ae9110c2471994f4b821a6f888e680e18aed307d43ea982bf2134fdef15a2fe324befb8f8ab2785e705d8155199a17965819c719137be9e67accc0b3c WHIRLPOOL 767f1bee3fcae9fc7b17448cc8218986c201a3bc02e4bc60d06286c08a1ad1d74e65561f51bb2a06ce7903e24e37f7ad0fa35639b2a14a7c64b48fe55f3784a8
+MISC metadata.xml 329 SHA256 36cba9ec3caaeb5624de9db94dbd3698432f80ddd6d4f2e1f29ba0773f2069b4 SHA512 aaf06174f9c5b4614c3d310958dda4ddde8a799c122c8fdbe0711dd8ad9375bc6be1912d29b430b79131dfdf9dd198a82860a17f56d59a6b0ac01c108ef51e97 WHIRLPOOL 49372cbebc089e33771d2831b921db4594eb8daae9bcdffc4b7112057d296332fd6aa0c526f0b40d51350627a4d275a898212f86c9d12cf881d07647c9d6a9f8
diff --git a/dev-python/recaptcha-client/metadata.xml b/dev-python/recaptcha-client/metadata.xml
new file mode 100644
index 000000000000..4af40169ce16
--- /dev/null
+++ b/dev-python/recaptcha-client/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">recaptcha-client</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/recaptcha-client/recaptcha-client-1.0.6-r1.ebuild b/dev-python/recaptcha-client/recaptcha-client-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..05781a6a838f
--- /dev/null
+++ b/dev-python/recaptcha-client/recaptcha-client-1.0.6-r1.ebuild
@@ -0,0 +1,19 @@
+# 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
+
+DESCRIPTION="A plugin for reCAPTCHA and reCAPTCHA Mailhide"
+HOMEPAGE="https://pypi.python.org/pypi/recaptcha-client/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest
new file mode 100644
index 000000000000..d26d34c9db9c
--- /dev/null
+++ b/dev-python/recommonmark/Manifest
@@ -0,0 +1,3 @@
+DIST recommonmark-0.4.0.tar.gz 7112 SHA256 6e29c723abcf5533842376d87c4589e62923ecb6002a8e059eb608345ddaff9d SHA512 30d900840093c9ee2c1a322aeaba64c06c6f236e4c86a8d7604edc7d9fb0e78d66387f844619364d9253585db3f38d212242d2798153f343bc01ad281c146c9c WHIRLPOOL 6fec6b972f054cb3c67e5b3815797a8281bbbf5f41d9a3b090eef7d9c7605caa4d832a235f10be1ee8f1de0fa084e7c0628934c836fbc47af977657bcc8eedc7
+EBUILD recommonmark-0.4.0.ebuild 544 SHA256 dcf3eac9c752423e202c570d3f48c4d5185fdbd48444af17acfd68fc13feba49 SHA512 c5e51b8cc1679b418b7126daaaf3ebde05812500e09ba1e1bec71d5c8acd782c9564446e84c6d1391bcb8620479a970597a6a698945f46e696e1d94241388a70 WHIRLPOOL 92961c87f4ff7e910003543e294a4a323eee8cfa8b96496f40b361b16486809b015a4ffdd3b3488895d0614f53a1bd972b247d69513d18b50c89c420276c4c30
+MISC metadata.xml 519 SHA256 90255505befd60b14a797f414de7483b79538605a78075f86292990fcaeec8d3 SHA512 83dde1b703e097ce74627ad0139fe6cb97de26cd080bf0b191effe61ff8bd6593bf02a98be1e27ee142520142adebb48c4cb13066cb8d2109ecd642785b78c9e WHIRLPOOL b20f4306ef7159281eecba1efdec89c16f98ebfebd863b656ae6cfcfff2ba2c1ac0d1931535f8794da725680ef1fb242f69fef106dbbd39048329edc52d61799
diff --git a/dev-python/recommonmark/metadata.xml b/dev-python/recommonmark/metadata.xml
new file mode 100644
index 000000000000..308621cf5b42
--- /dev/null
+++ b/dev-python/recommonmark/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    This allows you to write CommonMark inside of Docutils and Sphinx
+    projects.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">recommonmark</remote-id>
+    <remote-id type="github">rtfd/recommonmark</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/recommonmark/recommonmark-0.4.0.ebuild b/dev-python/recommonmark/recommonmark-0.4.0.ebuild
new file mode 100644
index 000000000000..999927bcac16
--- /dev/null
+++ b/dev-python/recommonmark/recommonmark-0.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python docutils-compatibility bridge to CommonMark"
+HOMEPAGE="https://recommonmark.readthedocs.io/"
+LICENSE="MIT"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<=dev-python/CommonMark-0.5.4[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+IUSE=""
diff --git a/dev-python/reconfigure/Manifest b/dev-python/reconfigure/Manifest
new file mode 100644
index 000000000000..0b23c61d9e53
--- /dev/null
+++ b/dev-python/reconfigure/Manifest
@@ -0,0 +1,5 @@
+DIST reconfigure-0.1.79.tar.gz 31395 SHA256 35feed3dbc161ce84a469d782421cd543af0ec5c22f870949b0f61e7292484bd SHA512 c25e099b8934421356a10bc44a28354bc0c174e2a62bf41f528103561d2a4098056c4e76ba85d88851d58bbe8f4c1996d885a9b3542af68d7d3955d001b4ea6a WHIRLPOOL f39f3842cf2f991706dc90b46de214bd299c1b935ab25f7c347d24762709ce9c018514fba3d122918987fdc95721d884698a9371d9a2085ed5f12e3ab28f3efa
+EBUILD reconfigure-0.1.79.ebuild 460 SHA256 42b0d5c5a6e8ce23bb7d4c52d2fbffa61988ab582bbb8c7c050c3c124e4fd73f SHA512 22a8aa320064937d3b916ae92f812e8faa3f00fcc40391cdd11f1c4a35bec1379300869da1d5f85454b28ee20d8a22d336134ee9b741758d868a24279a137165 WHIRLPOOL 97bfc675ef7661b0876cbc2c27c0289b46b814203550dbd1189fc18a17a04b492346c627882dbb288c7a8fd0adc94de80bd052bf5c2b431795b3dd582e116b92
+MISC ChangeLog 2956 SHA256 d26da33c9be0e8e726ac38ece42f2d2ec7d662fd3cfcc07b6a007e970759c597 SHA512 95ae64db981847c741cd56aa4d078e06a23c01f798ada3915f086b58f9952a38b07bc35cd2d762f2fb147e2e46231d34b4e552e5febba6aa561bee2b47b1a480 WHIRLPOOL 0cbf32cce426f2ea2e76b6de5745c22eab95105d3e2428385a2dc475892551129edacd2a024aa102552474205d12174f88d0eaea77bc25ca1bfa20b37dba7965
+MISC ChangeLog-2015 601 SHA256 fd05b39b1154fb5f9ff04d331b409b7134ce63682785167900c0eeecea154903 SHA512 044f7065d142ae4e3671cbf2d19b63bb2d7cae47bd7da69b68b8f728cba2e0a377e770a633153bd287c27532ef4ed2850f59da2adbac7679a138ff236d3ec138 WHIRLPOOL 67744cdf4768de29f192150c2a39b186419fa48d71b421a44e29b6ee0289ba1d9887a97d4ae433bd54677fcb62d94c2644f1d84efe3ec4f368d6260437cebfda
+MISC metadata.xml 324 SHA256 871934a4f67db6d2c900845dc27d0e1d8dacc21c5c84e48d9d65be3bcea9b95d SHA512 06723f586955d7e935b19b44b92046cf25d9c0b387f12b42395c19459f54cdf622aba9fad3160ea8f7f797a560667906d6a2c143aa6052c9b108b4e8f76c10a0 WHIRLPOOL 13021eaff4988ccffa7b6c47a338d029f9551ee1c36c7eccd2f5b6073293923a78f542360488acf26764c2e3f993f45f3f8b613cfd51d32a286326f7c9a52a44
diff --git a/dev-python/reconfigure/metadata.xml b/dev-python/reconfigure/metadata.xml
new file mode 100644
index 000000000000..dc37173c0b64
--- /dev/null
+++ b/dev-python/reconfigure/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">reconfigure</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/reconfigure/reconfigure-0.1.79.ebuild b/dev-python/reconfigure/reconfigure-0.1.79.ebuild
new file mode 100644
index 000000000000..d327f633f869
--- /dev/null
+++ b/dev-python/reconfigure/reconfigure-0.1.79.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="An ORM for config files"
+HOMEPAGE="https://pypi.python.org/pypi/reconfigure/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/redis-py-cluster/Manifest b/dev-python/redis-py-cluster/Manifest
new file mode 100644
index 000000000000..bed2f5e0c1a2
--- /dev/null
+++ b/dev-python/redis-py-cluster/Manifest
@@ -0,0 +1,3 @@
+DIST redis-py-cluster-1.3.4.tar.gz 32842 SHA256 3189ddde3a04f86f4322026c45a159411bda8f84ababe2c8e8e1fbdcb025f358 SHA512 4119780da7c7633b30d3ea525de82ca44629470b37eb1cc9f7b000d0cf237cfd0265cd2de0c093f064a350172b82334bea12687c49737d11be46d4c670a3e873 WHIRLPOOL 50e4ac4f0ab6128a88a55b1da34735e4d9e5a1304218d78403d3fefcc65ab90beb96dfbc8f53d9dc19d6223d3659b474e449c5a8f42524aa089ce4caf2a00884
+EBUILD redis-py-cluster-1.3.4.ebuild 459 SHA256 1526d8c1605760973662f89d773c3e05af94000a0ef4de667751def10ca33cd6 SHA512 e9daad0d87c1dc82ef9ce96755d198206c2484e0b511fd60f41478a1e7ed7ced4eef6e8113236636f8923d1ab2ca8f062608597d5ddf4bc31aaa6aa56d22aae3 WHIRLPOOL 47cfd01b51488dc42cabacfe427a6d28b4a310ce7162cfede4db824155f6aaee619eebcad1726f95e25975d74f8495be14f1d3c0c81e9a6aff467d81778c8640
+MISC metadata.xml 395 SHA256 c3584d18cf54cdfd3f777f9d97e28f66698883fed6bb757f7719cd5c384483ad SHA512 e7e05cde2b959942181b918f106cd764519890f19de8b0b7af39e606422eb2dffe2f660350a15ac840a4c09bb2d5264bb86df4ec22a343b1fdd450e117b9faa1 WHIRLPOOL 5bd3697747aa103fc635195dd1599ce46e277581472c15a4113ffc9bfcc99efc8d5c0d92007e8c5ef2977d318a370a180b180952ec44226ee0ba912ef3d16a72
diff --git a/dev-python/redis-py-cluster/metadata.xml b/dev-python/redis-py-cluster/metadata.xml
new file mode 100644
index 000000000000..7c4016d59320
--- /dev/null
+++ b/dev-python/redis-py-cluster/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">redis-py-cluster</remote-id>
+    <remote-id type="github">grokzen/redis-py-cluster</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/redis-py-cluster/redis-py-cluster-1.3.4.ebuild b/dev-python/redis-py-cluster/redis-py-cluster-1.3.4.ebuild
new file mode 100644
index 000000000000..ca25dacb34c3
--- /dev/null
+++ b/dev-python/redis-py-cluster/redis-py-cluster-1.3.4.ebuild
@@ -0,0 +1,19 @@
+# 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
+
+DESCRIPTION="Python cluster client for the official redis cluster"
+HOMEPAGE="https://github.com/Grokzen/redis-py-cluster"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-python/redis-py-2.10.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
new file mode 100644
index 000000000000..685746e6dff9
--- /dev/null
+++ b/dev-python/redis-py/Manifest
@@ -0,0 +1,10 @@
+AUX redis-py-2.10.5-test-finalize.patch 543 SHA256 2ae490d7c3ec83fe3d8d5945d042d6f74eb1f70125585a658ac558a94f772079 SHA512 bd1e48117d6ec89fcf86dde41b38deab3782e4e1ee6038123d3b225214b9843703067ca0d4b813d7bf8da1f64e45ff19a1b5a9337f2a9953a7f3ef9766b7a441 WHIRLPOOL 3c2a541fc779fd57c1675d0286edf4e5feefec10997f370a7a7eaa6f8424e461fdf419a584d89241b987579ff48716952ab20745e19941251728f4dbe8792575
+DIST redis-py-2.10.5.tar.gz 88610 SHA256 5dfbae6acfc54edf0a7a415b99e0b21c0a3c27a7f787b292eea727b1facc5533 SHA512 b2e6cb85c274c8f1c63e27256bbab816d016a68c324bf7092cf53feae819a34fa94f45565b0f209ee981919d793b2963462eb1a6f841e9dde9885802e0ebbe8f WHIRLPOOL af0b92b5ddb69346ff285d959a5052df5d65638e70d8d1b3d4b00adb80755eef41b492bfea432507443883f206a4537faf10e82d4253d7612e74ab7a52df47f1
+DIST redis-py-2.10.6.tar.gz 97299 SHA256 a22ca993cea2962dbb588f9f30d0015ac4afcc45bee27d3978c0dbe9e97c6c0f SHA512 e7df464bc3b26e23f6a0d2d2896306c1e4792b9a2a4ecaea6dd8690ffa17853cc85345f063307295dd3c2da399f7f203f4b21d785f7e073c0501732257419dad WHIRLPOOL 10ad4dafe9e2d5f97ceef40133b392d5dc00343151aa08e109576de6dbd5d7401528fc12b04def81d03e3dc41e50afe99338d3692bfb094c568e32da40460382
+DIST redis-py-2.9.1.tar.gz 62204 SHA256 af9747ec2727425b1b09252975e21502ee5a3d8d235c7f49869eb13e09ccf4e4 SHA512 6b4912acafb31c87a5bc47b0420834aa9d1eba57feb0bbacdea943b746fe2f24aee4c9f13e7b03ae4edc562043b22c370cc7f53e45be07c5408cfa9852f8ea38 WHIRLPOOL ae38ea63d605f8dd667d9fc548de972bf38d661ae6ef357070ebe7cba3b484febc45d6b7611916d8a1e262e6bbf4754257e727f41af8caa30597954a1fc20cf5
+EBUILD redis-py-2.10.5.ebuild 1454 SHA256 4dbeeb5ed8323c4c343c1931bf54c650524821f1ca0e1451f54dc50a336a7066 SHA512 7f38ee8032cec9ffc40554672fc29e53f8654747852c56b7a2f30bdb90cae865dc0c234fae8b95d6ad943f73714c9866fd06e0f35ed2cb38b990988293fa9079 WHIRLPOOL e98f606044bd9bf02bd0670a0ad8716e6ccc36f8d94b173124921d201a93929a45486fb64813000844008ecffaba4e567dd713411cf89b83ed7ae6a21747c45f
+EBUILD redis-py-2.10.6.ebuild 1467 SHA256 632c02e3d3ff6493b95caa6c5415117d0f873c18c5ca4e5c7620bd416675a70f SHA512 48800bc3ccee6808fc18288eac74763346e0607ddceb151d8ef47229426d2b8afce1a22b3d28722bbbf96e673d23cffdaebccbda965dc33764c80b4877e6ca48 WHIRLPOOL b1c8280720ec41a5e6067394a7ecfcde15131d845d5d013931b48af290ab823d5299c866916ee6d4f6eabdbb9e8d3e45503f523e28c26d5870325bb2589af6b0
+EBUILD redis-py-2.9.1.ebuild 1527 SHA256 99d7caab6a2514e22531f6bc5a1c949134c5a2c7ef3cc2a7c41a3738d4698bed SHA512 7eb014071ec90b685ad9f86a942e716b695e4f8dafb74faa259811021d2d272721722df883bf47ef9e130579c9ce3768fa26f3ce19175d10b64f2e93339131dd WHIRLPOOL 48b28579576fe98ea6ba29e35954029b1795e35a4c930519949b204eed33711e7e87692ca6e4cb615c4a4ac0f09ea1b5ecf91f71b1ccacd540ed905fe40cc776
+MISC ChangeLog 4838 SHA256 b1cbce92a897999fdccaddb64dc13b51195f2a255df0290e6289e7a4c9645249 SHA512 08e1c8d580f9183339c5ac068fa4348d4a151df92b5352b09b8cbfe1f67c4b6d1721f3788e360b8187f35e4764784eb3b8f332b5a17fa2f9be8c53f58145ebcf WHIRLPOOL d202106164e2d772a72e04c370ee7593126c26d1bcee3e97048d92351ef120b444b15a7bc2c90d801776acd58ca26b6201c1a6d85cc704a2e2dc09d5a75873ac
+MISC ChangeLog-2015 7582 SHA256 ea385c0bf4cffb6974af68c66de233fc43232b4aa00a854073b6e47c9692ca0c SHA512 5b316f00ba34c72a08cf678a4a5d07227aaeb2a7dde8772831979aca8eac34cf35f8e91b407c6f607f684b76ecdcf7be2dfbe633cbe17e4af5553f88aecd4971 WHIRLPOOL fb8796574ecf98de6ff3ae9dc9e8f43530b65742d7f2a1039384ff0988ffd7020d5854f65da0a2eeddef217912044300a9044fbf384a7fc939f1c8dad649d913
+MISC metadata.xml 380 SHA256 6df6ede6f1fd6460d0ca75a3b8fa4cf60fd4dacb6d17a89587c0a6e31ef4a572 SHA512 5e03d25770ee53beb71d1efa039401a5598572bbf6cd441c904fb5c074d212c0c05934c6f86abb566e913ac65bd84db3cdaca8b83c182dad57d0fcffdeb9aa4b WHIRLPOOL 9241138457c38de59a83bb4d3f72e4d729c67a5aa64e0fbe17b26bed9d96ca65f773d6b406206bf7bbff6fee6e3b659654c3b786a830b77bf8c6b7df58eda56e
diff --git a/dev-python/redis-py/files/redis-py-2.10.5-test-finalize.patch b/dev-python/redis-py/files/redis-py-2.10.5-test-finalize.patch
new file mode 100644
index 000000000000..1a807480dfb0
--- /dev/null
+++ b/dev-python/redis-py/files/redis-py-2.10.5-test-finalize.patch
@@ -0,0 +1,19 @@
+ setup.py | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index ed8fd5f..ab648a3 100644
+--- a/setup.py
++++ b/setup.py
+@@ -9,11 +9,6 @@ try:
+     from setuptools.command.test import test as TestCommand
+ 
+     class PyTest(TestCommand):
+-        def finalize_options(self):
+-            TestCommand.finalize_options(self)
+-            self.test_args = []
+-            self.test_suite = True
+-
+         def run_tests(self):
+             # import here, because outside the eggs aren't loaded
+             import pytest
diff --git a/dev-python/redis-py/metadata.xml b/dev-python/redis-py/metadata.xml
new file mode 100644
index 000000000000..521781f755ca
--- /dev/null
+++ b/dev-python/redis-py/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">redis</remote-id>
+    <remote-id type="github">andymccurdy/redis-py</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/redis-py/redis-py-2.10.5.ebuild b/dev-python/redis-py/redis-py-2.10.5.ebuild
new file mode 100644
index 000000000000..f0f244bd48ce
--- /dev/null
+++ b/dev-python/redis-py/redis-py-2.10.5.ebuild
@@ -0,0 +1,65 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+MY_PN="redis"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="https://github.com/andymccurdy/redis-py"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-db/redis
+		>=dev-python/pytest-2.5.0[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test-finalize.patch
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Make sure that tests will be used from BUILD_DIR rather than cwd.
+	mv tests tests-hidden || die
+
+	# Correct local import patch syntax
+	sed -e 's:from .conftest:from conftest:' \
+		-i tests-hidden/{test_connection_pool.py,test_commands.py,test_encoding.py,test_pubsub.py} \
+		|| die
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	if use test; then
+		cp -r tests-hidden "${BUILD_DIR}"/tests || die
+	fi
+}
+
+python_test() {
+	local sock="${T}/redis.sock"
+
+	"${EPREFIX}/usr/sbin/redis-server" - <<- EOF
+		daemonize yes
+		pidfile "${T}/redis.pid"
+		unixsocket ${sock}
+		EOF
+
+	PYTHONPATH="${S}:${S}/tests-hidden"
+	esetup.py test --verbose
+	kill $(<"${T}/redis.pid")
+}
diff --git a/dev-python/redis-py/redis-py-2.10.6.ebuild b/dev-python/redis-py/redis-py-2.10.6.ebuild
new file mode 100644
index 000000000000..b129427e76e6
--- /dev/null
+++ b/dev-python/redis-py/redis-py-2.10.6.ebuild
@@ -0,0 +1,65 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+MY_PN="redis"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="https://github.com/andymccurdy/redis-py"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-db/redis
+		>=dev-python/pytest-2.5.0[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.10.5-test-finalize.patch
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Make sure that tests will be used from BUILD_DIR rather than cwd.
+	mv tests tests-hidden || die
+
+	# Correct local import patch syntax
+	sed -e 's:from .conftest:from conftest:' \
+		-i tests-hidden/{test_connection_pool.py,test_commands.py,test_encoding.py,test_pubsub.py} \
+		|| die
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	if use test; then
+		cp -r tests-hidden "${BUILD_DIR}"/tests || die
+	fi
+}
+
+python_test() {
+	local sock="${T}/redis.sock"
+
+	"${EPREFIX}/usr/sbin/redis-server" - <<- EOF
+		daemonize yes
+		pidfile "${T}/redis.pid"
+		unixsocket ${sock}
+		EOF
+
+	PYTHONPATH="${S}:${S}/tests-hidden"
+	esetup.py test --verbose
+	kill $(<"${T}/redis.pid")
+}
diff --git a/dev-python/redis-py/redis-py-2.9.1.ebuild b/dev-python/redis-py/redis-py-2.9.1.ebuild
new file mode 100644
index 000000000000..c10e206a69e6
--- /dev/null
+++ b/dev-python/redis-py/redis-py-2.9.1.ebuild
@@ -0,0 +1,64 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+MY_PN="redis"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="https://github.com/andymccurdy/redis-py"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-db/redis )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable pubsub and encoding tests, they do not seem to support
+	# UNIX socket connectivity.
+	sed -i -e '/PubSub/d' -e '/Encoding/d' \
+		-e '/use_hiredis:/d' tests/__init__.py || die
+
+	# Make sure that tests will be used from BUILD_DIR rather than cwd.
+	mv tests tests-hidden || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	if use test; then
+		cp -r tests-hidden "${BUILD_DIR}"/tests || die
+	fi
+}
+
+python_test() {
+	local pidfile=${T}/redis-${EPYTHON}.pid
+	local sock=${T}/redis-${EPYTHON}.sock
+
+	sed -i -e "s:port=6379:unix_socket_path=\"${sock}\":" \
+		"${BUILD_DIR}"/tests/*.py || die
+
+	# XXX: find a way to make sure it is killed
+
+	"${EPREFIX}"/usr/sbin/redis-server \
+		--pidfile "${pidfile}" \
+		--port 0 \
+		--unixsocket "${sock}" \
+		--daemonize yes || die
+	PYTHONPATH="${PYTHONPATH}:${BUILD_DIR}" \
+		esetup.py test
+	kill "$(<"${pidfile}")"
+}
diff --git a/dev-python/redlock-py/Manifest b/dev-python/redlock-py/Manifest
new file mode 100644
index 000000000000..bcfc7db036ba
--- /dev/null
+++ b/dev-python/redlock-py/Manifest
@@ -0,0 +1,4 @@
+DIST redlock-py-1.0.8.tar.gz 6035 SHA256 0b8722c4843ddeabc2fc1dd37c05859e0da29fbce3bd1f6ecc73c98396f139ac SHA512 16c5e52019baddf0ff2a996e227d9a469be19dc4cb16a6f33df873c121717f9338ca180f264171e9e0de34c2c9dbc592e47a5c7272b646ec6dd047f46b1349a1 WHIRLPOOL 4e10feb643d27110aaabbd9a2d83dd34defc7b7b4cf30c6ab6ab35db372db59dae531a2228f6450f17cc125dad271a01e01e9b90f753a6c6382de71ce8f21107
+EBUILD redlock-py-1.0.8.ebuild 570 SHA256 70b08ec139e6ea78f361a9b3d466d53838e0ed4d20e30c6c80f1faff6876e5b7 SHA512 0099e71cba542cbcf89f1ab1d936ff5629a2165d85a9709cfbe14e14780efac92603fe1f115fc5095df71f675f178b193662d67fa40254c57d6ae9f72e8e0fb0 WHIRLPOOL edb34208e6cc0877a6ab4e693e391e478ab762223a8459dbfdac7ccf1946ff3772802a7e9c43ae600cf3b3151fa6acf261391a51967ccd58c22e7878242b64c1
+MISC ChangeLog 314 SHA256 893117ca724175f41b6e730bf83a2d88651184e607814bc63ac4287cd4305c89 SHA512 17d2e9b3388aef510d4cdc5e7029385137766f58df56963cc5fc779c6a38148dd435582ed882c369b1c582189a67dbc93cd1ba2a7d0383f2c607c474c1c82ff2 WHIRLPOOL 78b45745565497a06aab5d8ad54f88bf1d92d9b63e3c43937f24b024a4696e8a7bb4b2129879d1e49295754aee90fc40cb809328d2d37b772b8c843e8b01412c
+MISC metadata.xml 353 SHA256 43c2418b4fcfbdf57869d35f72815c98901f851e1d1fa19faf6946622429e01a SHA512 a5558284d50fb55c555137cb67dda3dfdf4d27245f1afa3f30c7aa8242e417c12f546f7d7c422bb98c8627de698f8d413bb9dc0fbeb00494c20cd6b5b5ad2224 WHIRLPOOL 5d35d30c7e6f58a4de38f8f9cf6925f7ff4a6d93c54e071477281a9bfa85f0fb66cecb6b36948f9e083d4ff2f0d2bcdff3edf16e8c03ad2f8d6f345d7bd56511
diff --git a/dev-python/redlock-py/metadata.xml b/dev-python/redlock-py/metadata.xml
new file mode 100644
index 000000000000..0fb0920e1af1
--- /dev/null
+++ b/dev-python/redlock-py/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">redlock-py</remote-id>
+		<remote-id type="github">SPSCommerce/redlock-py</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/redlock-py/redlock-py-1.0.8.ebuild b/dev-python/redlock-py/redlock-py-1.0.8.ebuild
new file mode 100644
index 000000000000..98bd3e8f536d
--- /dev/null
+++ b/dev-python/redlock-py/redlock-py-1.0.8.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( pypy{,3} python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Redis distributed locks in Python"
+HOMEPAGE="https://github.com/SPSCommerce/redlock-py https://pypi.python.org/pypi/redlock-py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-python/redis-py[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}"
diff --git a/dev-python/rednose/Manifest b/dev-python/rednose/Manifest
new file mode 100644
index 000000000000..f1f729f1615b
--- /dev/null
+++ b/dev-python/rednose/Manifest
@@ -0,0 +1,7 @@
+DIST rednose-0.4.1.tar.gz 5888 SHA256 82856136986ec6de3be4863ee2b7ecf0adbaaadb717a3e75fe517a6a5ac26825 SHA512 a9ff3bbbf35e6799a66728feb81f6d83b88ea9804bbebfc64d626d4bdb002c8e7a655027861b694fda15b9b8b24d7e3de2554f284e1683eafbf24eb24c4a192a WHIRLPOOL 0bbefdaf2426561c2712ddda5c77a1bd239e5e12139cebb4237a1c31d709cbf93548448d007a673824a8f4ea1e3c488eb270932c100ff396f3386f7d35cd559c
+DIST rednose-0.4.3.tar.gz 6046 SHA256 6ce5d40574c5569a23b2841678b0b14245ec5ea044a440bc6a1c20baec5464d7 SHA512 e0169599f251cd90a2906e489b870e7d10322a82253a3a814bc71aa257bea34bd5eb833b637dbae3128f8f37df79929aa4d6331e246654c83eb16118d637182a WHIRLPOOL 15937c7812111f780a6aab43b03ed9c8a395aa50ab0689886db0752d2866222be06d39d5491663e6322adc1906a897cc046cf33242e52a11429dff80a01ac37b
+EBUILD rednose-0.4.1.ebuild 481 SHA256 11a53dcc7f3633791582c3fe928da65e4925972aad16b318aa3662f70166ddd4 SHA512 a46fcfbc600ca3f431964bde1f0c9734ff5f7f119b91ccdba5172633f7189f9bd1a3124851cbcd9fec276ae60889bebaaff733e225a1b40adbed38dcf58a290e WHIRLPOOL 3b9b5c36a1f004abc321498ef341cc4c0a85c2f0310e948399e7d125c21afc7b83e698aec20de8fa647dbd57ca202b5d0dfffe41bc2a313b2933ffee02f4aede
+EBUILD rednose-0.4.3.ebuild 591 SHA256 be4b7a28b58191b14bc3b8454b34cad696564422efa39cfc18066d392397eed5 SHA512 61ff86b51f560c0d3059a29ba83f2c970de97cb361ea33b617a85db3094b2a432297601cd04739c1d8d2ee557afe657eec5bfdb451ea05229bf40404d4802aaf WHIRLPOOL e19a50d79a07f4861335b21c556f3cfa01a5353fda8af2d9d2cf9b05895e0b1536b81869415dc90cf3442f46921ee4848fe452bbb362c2f8d989858f1848c20f
+MISC ChangeLog 2584 SHA256 fd853710f4ec5d07b690e95dcd5fcbe21cbf7cca15a8cb679cd8471a6a757cfb SHA512 37aafbf8a201342c1d04a61d3babe01e155dba9adf278795062f88b9f8ed5203b4f4cac663a96d38bada621cbba8e7885afa777f18d2fae213baf92bc3d29315 WHIRLPOOL 36351cc8707f34c93582eef9eb1b7451be5b66a011a288660faaf1777b0c71cf666bc9e4a7dfe78fb526ae02af45c4d5066cf09bf1d56d0243014608d443b743
+MISC ChangeLog-2015 882 SHA256 9a2fa53beb21f7609c211009e39b734b0017140b2f5d796bb6476c1316996706 SHA512 bf2a446b9bafb6195a829ea440705bb3797610e9d86ef169021532a4d2e470fd28fe26ec5be1cb5e90393111849880cce8fd120dfe528db5c7df6aad5b367df4 WHIRLPOOL 07b36c5dd8695addfef1dcae3f26df955045c8f123e561fd5dcc9c1e4cf15e4e49fa0e43e4581d2649f1034a50edcd70c350d5cea9f96a5fb2c5cc2581f883b5
+MISC metadata.xml 326 SHA256 2ef15d8ccc3cddcf8afb8bcc96a5b7fdd7ee965522f47bd1d6cb92e5c560fedc SHA512 d3452ac9aad96711bc603c825a8aa93a84a422c6626d1137a711deefcc24337c289ff7b9cc077d0284f37793197108759432b88b8ed01da8e6b79f59d536b7dc WHIRLPOOL a447d20783febae7f5803efdf54e3f4d253c0064a2f4e68859a7d5b9dd048e0ff73b56f852bba7bf044acb0f3c3f7735516673f1a4ff200f171e3992c934b45d
diff --git a/dev-python/rednose/metadata.xml b/dev-python/rednose/metadata.xml
new file mode 100644
index 000000000000..d42e4154b80d
--- /dev/null
+++ b/dev-python/rednose/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>alunduil@gentoo.org</email>
+    <name>Alex Brandt</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">rednose</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/rednose/rednose-0.4.1.ebuild b/dev-python/rednose/rednose-0.4.1.ebuild
new file mode 100644
index 000000000000..71ff996e3d1d
--- /dev/null
+++ b/dev-python/rednose/rednose-0.4.1.ebuild
@@ -0,0 +1,20 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="coloured output for nosetests"
+HOMEPAGE="http://gfxmonk.net/dist/0install/rednose.xml"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-python/python-termstyle-0.1.7[${PYTHON_USEDEP}]"
diff --git a/dev-python/rednose/rednose-0.4.3.ebuild b/dev-python/rednose/rednose-0.4.3.ebuild
new file mode 100644
index 000000000000..75bdd43e2c56
--- /dev/null
+++ b/dev-python/rednose/rednose-0.4.3.ebuild
@@ -0,0 +1,25 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="coloured output for nosetests"
+HOMEPAGE="http://gfxmonk.net/dist/0install/rednose.xml"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	dev-python/colorama[${PYTHON_USEDEP}]
+	>=dev-python/python-termstyle-0.1.7[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/regendoc/Manifest b/dev-python/regendoc/Manifest
new file mode 100644
index 000000000000..47d6acf99240
--- /dev/null
+++ b/dev-python/regendoc/Manifest
@@ -0,0 +1,6 @@
+DIST regendoc-0.5.tar.gz 5651 SHA256 01f60310371f906b1b3c3cfa710d1334e9be20b4e2cde6fdb6555214ad9ff074 SHA512 4da72c278901d3bb7ec711337c12738903c3686c7b7b30f95842c3fe2b04b4d59f20fa7b4b1c2334e8c7036ec02d551a777a0eb094541316928eae1945708977 WHIRLPOOL 8b290c7a5aaf1f1735f62d684589ba093de31b5dbff7223a828b98bad455ce86c7c1442f47d033e569b28e36270fe18f7b5d19f2d9f9e631147002b7b85fc643
+DIST regendoc-0.6.1.tar.gz 5832 SHA256 db1e8c9ae02c1af559eae105bfd77ba41ed07fc8ca7030ea59db5f3f161236a4 SHA512 bb6551e1e50fc540649e5856bbfa36d7c26aaa609b8361e4f0260246c6479870cdca97b95db6730a0a6763fea626d4d6267fda1593769f90416447a95f34a18c WHIRLPOOL 56182af8c4e509d8deaf6e59e10dfcd76be7e67cd0a720795e84cbf127bccd17b5028ad784f3fbf2c817e25abe517ea56d2cc958d856c5ff32bdc39f57257f55
+EBUILD regendoc-0.5.ebuild 741 SHA256 2fa806c7620c9c7dce6a965e5581eded6fc8551e0734f4b22073e2635d7d5026 SHA512 299f1f1dad54a9f310e80c23346e2824300e514c4d9c8072e86051afa447938d6a7c04a34e15ab282dcd906f4f2a10a533e4cbbebab9908012a11628c09ba4ce WHIRLPOOL 4811a0ee6c2e290d7c30553b832ef2625f719306f23fbcfe46af8e78c782ec46985dfb7c944fb126638de1e7651bea26ae47c31a09596b2bcb22dc4fd314b5c1
+EBUILD regendoc-0.6.1.ebuild 853 SHA256 ecd403a1f02f89c53597627b8b36b743c979a03b679742a0c83c25be88747f0b SHA512 84e053081d3d3c8d877b0e1e85241b7c1516b483b06aa4b328e3f6d8cd7b8d1a0374901fe4d37d559d0a7c90297427bf1d4afcb14ada55c8709aedbe79bac281 WHIRLPOOL e125a17193dad96fe3fa6f809264cf96a5e6df084d35c8e211da2381e4cfaee97f38deb2c0bfb4036f8744aa2bf3288a5b44922f653c406f7a73985aca84d9b0
+MISC ChangeLog 3731 SHA256 03985b4b9b53281e7e94c83a3abfc995026c9d576b8892e36a8cd311be062690 SHA512 bcd88421172314c3d1067c88eff7f17ce6b8f5440c01b61bc1fca496e1b08df0cd1db4e9faec0b717333bd2be90311f8edce7c3c20a1ff3e9c5554ee7f0aec55 WHIRLPOOL e303c07271bf1dab959d9b3a2d32836ca45282d5973777e79e7aea71c7fc3b7e217b7963474d38114734bec484a646da95559250bfe7e2a52fe570d9681e18c3
+MISC metadata.xml 380 SHA256 e51cee56006f73fbd49068e2c1852b38bbdf716b44019ae6f5c2873b806f332b SHA512 f7a80142633d3df1513dabfdbe8f2dea3236a668456bd449cfadda657103f4a4ac9c692145cfa47ff71f076e7f174b184d7a750f1d9aa065a1be80661f776776 WHIRLPOOL 642fb61d2a7381eda2a2157bf3a74cab5e8fcbd3c026e6f7eddbf1cc7e43c9eef39233bf050237f9e27607eddeec54b4e07262e061f642d2bde788a1c4980125
diff --git a/dev-python/regendoc/metadata.xml b/dev-python/regendoc/metadata.xml
new file mode 100644
index 000000000000..743923bd0992
--- /dev/null
+++ b/dev-python/regendoc/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pip</remote-id>
+    <remote-id type="bitbucket">pytest-dev/regendoc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/regendoc/regendoc-0.5.ebuild b/dev-python/regendoc/regendoc-0.5.ebuild
new file mode 100644
index 000000000000..62f2904812ba
--- /dev/null
+++ b/dev-python/regendoc/regendoc-0.5.ebuild
@@ -0,0 +1,25 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+MY_PN="RegenDoc"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Check/update simple file/shell examples in documentation"
+HOMEPAGE="https://pypi.python.org/pypi/RegenDoc http://bitbucket.org/pytest-dev/regendoc/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/regendoc/regendoc-0.6.1.ebuild b/dev-python/regendoc/regendoc-0.6.1.ebuild
new file mode 100644
index 000000000000..67d79e1102d5
--- /dev/null
+++ b/dev-python/regendoc/regendoc-0.6.1.ebuild
@@ -0,0 +1,33 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+MY_PN="RegenDoc"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Check/update simple file/shell examples in documentation"
+HOMEPAGE="https://pypi.python.org/pypi/RegenDoc http://bitbucket.org/pytest-dev/regendoc/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test -v -v || die
+}
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
new file mode 100644
index 000000000000..7545acdab59f
--- /dev/null
+++ b/dev-python/regex/Manifest
@@ -0,0 +1,7 @@
+DIST regex-2016.01.10.tar.gz 574017 SHA256 02a77606e3f4a0a16a2727ed8f067681635a56221e8fca863ff64b196d5d79e0 SHA512 4f4700ca746763f857449003d32d56b5aa8069e3b71b160e719633b0cf00f80efc0766d8e1e193977278f91bd3e73c87aab31bee23aec77557ac9b3652ff6a2f WHIRLPOOL 9d493c0695b5920dfa71d94636d9f2952cbd5db97f60ae68c30fdf81fdbdab05c4726a41dae036541de694ec1ca688acdb20eaa48e514865da26c9a9569e30a0
+DIST regex-2017.04.05.tar.gz 601638 SHA256 d811874ed669165fe1059a54f860db5c6ab5f48100bf4945d915fd2f877b2531 SHA512 4c3e440e11f57e2323892e10fbed7f2c89b35771fdc970164ba69bb154dde535f6edb51a0997c924eb776c61e5efd1d04001abd343110518a89b5b7bf148ae49 WHIRLPOOL 52f9f16312efb2f9a7c3d8995590fc240e4a4c8326db04eea4d45cfcf49e255d273ed78013f1736d35366e97adbdc8388816d24c955935a1ca941a09680f4435
+EBUILD regex-2016.01.10.ebuild 1154 SHA256 aba7b0cfb993fb3c5582817d4799700a2b54bde52b339e1b6b66f5c730c561e9 SHA512 aebd29d84c8a237ef3d544ef777be950232aedcb9b9a6c48482eb03cb4c991e56dc911f75c1da1849cc42239eea06f2e968573aaf03f405f60a50daea11e0d39 WHIRLPOOL 384058fd0544eb16c242c5d31dfa6cc002213079ef312e81b4e3da88130ab4145cc9b9f91f2d5c05bd1acb51e12d621a0f09c0ca0b546937922567b3bc7a47ff
+EBUILD regex-2017.04.05.ebuild 1196 SHA256 5a1ba3727784e08f14846f61e45cd1030b67d09b850e1e4e69d6eefc162426f5 SHA512 2c06f8ad155fcd571b534bb69720fc9648a0f6b0851f8f11134b321e7ce2e572677f0b7efd560a6729c8c3e0ec75a442769e1ab8536f367766d3600c6af01ad2 WHIRLPOOL e0c75fc0248f56304857d0766932317684fdff5b58b0c5be80a601d5f3b1cc7ae5f6dc37ed3cd40a83efbaad6f4e28c91880958bf9b179a16823243a636d5537
+MISC ChangeLog 3394 SHA256 543b47b13f49b5a62d2cb1e4b9975ac877172d140435d7633fe7dde66e21b26a SHA512 4ab3d0018076bfbb10f362e3f9fac88538d0d7498d6958d3d0e471d59b3b85c310f251d85b2cb44d29132624eddd9fc311969bc46dbe689e6f0e0093fc53112a WHIRLPOOL e9c3c98f5478a43b4a92ac71df6614bf0099cad6bd4708ee3ec9f6341f2c37f42ef4caa6cc01398c9f80d4914b3f02f947d82f19d0f695dc1da08f7fbf9cd1b1
+MISC ChangeLog-2015 875 SHA256 6eaadaaaa905d55526a8ef169a192234b1fb207464e51d24ec9b1f28dda11d45 SHA512 cb2cd43587d47a4dc9eef9883fb32284dc21f01010d00acf58b5fe0822c8a9696e9e0ee16990dd634eb87e8341473d3428e9d1913fcabe7f060761d6d7c0c219 WHIRLPOOL 6ad28fd0ed96bdd5c2e2e9b7e83c09b60ecc5576090c89fde244538203bcaaaa963d4acd095afbe2b758e61ed10b26dfcafb3a13971b54ab61218ef7ad6b3f73
+MISC metadata.xml 384 SHA256 fedbfc6d42984e31794e3dbbed4fca94f2b324304e4e2126ce1a0a16353b11f3 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07 WHIRLPOOL b6c0fc493c3d23eeb2d14b22bf7154b48efbca10ab244fd97be50bd94a3d3b189f9d52daaa9b122f715c3786c3ada47a933fd7d7e01bf95771d66357a06ba88a
diff --git a/dev-python/regex/metadata.xml b/dev-python/regex/metadata.xml
new file mode 100644
index 000000000000..91a476b448aa
--- /dev/null
+++ b/dev-python/regex/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">regex</remote-id>
+    <remote-id type="bitbucket">mrabarnett/mrab-regex</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/regex/regex-2016.01.10.ebuild b/dev-python/regex/regex-2016.01.10.ebuild
new file mode 100644
index 000000000000..e682641366e1
--- /dev/null
+++ b/dev-python/regex/regex-2016.01.10.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="doc"
+
+DOCS=( README docs/UnicodeProperties.txt )
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local msg="tests failed under ${EPYTHON}"
+	# https://bitbucket.org/mrabarnett/mrab-regex/issue/145/1-fail-in-testsuite-under-pypy
+	einfo "There is one trivial fail of test test_empty_array under pypy"
+
+	if python_is_python3; then
+		"${PYTHON}" Python3/test_regex.py || die $msg
+	else
+		"${PYTHON}" Python2/test_regex.py || die $msg
+	fi
+}
+
+python_install_all() {
+	local DOCS="${DOCS} docs/UnicodeProperties.txt"
+	use doc && local HTML_DOCS=( docs/Features.html )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/regex/regex-2017.04.05.ebuild b/dev-python/regex/regex-2017.04.05.ebuild
new file mode 100644
index 000000000000..d3a7cebda51d
--- /dev/null
+++ b/dev-python/regex/regex-2017.04.05.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DOCS=( README docs/UnicodeProperties.txt )
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local msg="tests failed under ${EPYTHON}"
+	# https://bitbucket.org/mrabarnett/mrab-regex/issue/145/1-fail-in-testsuite-under-pypy
+	einfo "There is one trivial fail of test test_empty_array under pypy"
+
+	if python_is_python3; then
+		"${PYTHON}" Python3/test_regex.py || die $msg
+	else
+		"${PYTHON}" Python2/test_regex.py || die $msg
+	fi
+}
+
+python_install_all() {
+	local DOCS="${DOCS} docs/UnicodeProperties.txt"
+	use doc && local HTML_DOCS=( docs/Features.html )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/regions/Manifest b/dev-python/regions/Manifest
new file mode 100644
index 000000000000..f9b38bb5f695
--- /dev/null
+++ b/dev-python/regions/Manifest
@@ -0,0 +1,4 @@
+DIST regions-0.2.tar.gz 535230 SHA256 980b8091d935484dde5907ff1631f624c5c0b99f5c1790c6c7879bb1f4d51009 SHA512 1970e55a834057ca7d5ea9e29769e71f4287d184f2576cd03ed810df8381517145fb157f2585dadab483312e2d66dca295f7aea10ca5a65367c3a95726331b19 WHIRLPOOL 06a47176dff8dbbdd32e2b8cd77e2b78f7089e828d1b5184c1e5401f6f13d0c66b81109fe564df29b2ae2039736ee963dec35c21234b66b1848a0f4e3ae193b7
+EBUILD regions-0.2.ebuild 1526 SHA256 83bbfdefa3a0434eeed612115db46520da756d5c66cfec9ba8e988e7bdc888b3 SHA512 e4aa525da0a54c6853d9de99d5a228ebf79cb0640c64a1c264e99444b2bcd77f8ae8b70ac15daaa21ad49f05ea551bc5f7e9a83c2cadd68dfe41cbbc28252687 WHIRLPOOL 15d18ec169382e027036cfdf6d89612462b5f0cd795fa84b90b5bec920c8e2fdad41944d663c8e2765e6207a63f452b4fcc1659d41827180e79cca0c72608e0e
+MISC ChangeLog 311 SHA256 3764e3e9ccbffe5a5e7665f4504564d0d8a975055a503a4911ac39f8d36ab5e3 SHA512 ef08456b5fc2777a0ec9b304906252aacdb70d049bb0112d2056f162a598f2df534c43b9d62efc7cdd377e3715d950f5e02a734e02f2de41515b64a4044f22d0 WHIRLPOOL 68fd072d611eba94e98f94cb557d68fd8f212f38ed706acd01197d7721c137ca7a8873e139c8ff6e8e0b1d1591edfa9004fc02530d8ae00a0cbe5fcb38020c3a
+MISC metadata.xml 538 SHA256 d4681ae0f7362913b0ee01ea4308621b3ac99174672f430067d2ea04c9467b76 SHA512 6a457b10fbc637a3130c8e94bbd441f8030596265864acf1003a314f464c082a49b72d87863ed996d1b80d84c69f88dce1987e48fc413afbc04e2cb949fad41d WHIRLPOOL f995e63f9107c34669853908b88bac9c44281582d06eff3ae9a5baf226573b0fd3fa275d371ec023200034fcb0312b2fe1b3c28e7c0672858c355d38da23f033
diff --git a/dev-python/regions/metadata.xml b/dev-python/regions/metadata.xml
new file mode 100644
index 000000000000..63ff2600215a
--- /dev/null
+++ b/dev-python/regions/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>sci-astronomy@gentoo.org</email>
+  <name>Gentoo Astronomy Project</name>
+</maintainer>
+<longdescription lang="en">
+  The goal is to merge the functionality from pyregion and photutils apertures and then after some time propose this package for inclusion in the Astropy core.
+</longdescription>
+<upstream>
+  <remote-id type="pypi">regions</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/regions/regions-0.2.ebuild b/dev-python/regions/regions-0.2.ebuild
new file mode 100644
index 000000000000..fde1daf2ab69
--- /dev/null
+++ b/dev-python/regions/regions-0.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Astropy affiliated package for region handling"
+HOMEPAGE="http://astropy-regions.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD"
+
+IUSE="doc test"
+RDEPEND="dev-python/astropy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		dev-python/wcsaxes[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest-mpl[${PYTHON_USEDEP}]
+		dev-python/pytest-arraydiff[${PYTHON_USEDEP}]
+		dev-python/wcsaxes[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# use astropy-helpers from system
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	xdg_environment_reset
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_sphinx --no-intersphinx
+	fi
+}
+
+python_test() {
+	echo 'backend: Agg' > ${WORKDIR}/matplotlibrc || die
+	export MATPLOTLIBRC=${WORKDIR}
+	virtx esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rencode/Manifest b/dev-python/rencode/Manifest
new file mode 100644
index 000000000000..5f26e848dd43
--- /dev/null
+++ b/dev-python/rencode/Manifest
@@ -0,0 +1,5 @@
+DIST rencode-1.0.5.tar.gz 24530 SHA256 cbdb8d2473aa5a7246e1a8077055be697fccec88477b78248c5fe93d79e2cd26 SHA512 809d7070b746fe77419e7b4d2eed274e1e0b3b4f15bcddb466806478a90f89965b0b456443b390cce6d1ca9df409367f336dd659f4481cd442e3cc459bd63c18 WHIRLPOOL 105e83bf78cf6f0696f221211e0421c93af81706be764f944c55c690db870a5c66b38eea46effffbf1ca434adceb45c7ebf61d596944e8714170b2e353941cff
+EBUILD rencode-1.0.5.ebuild 507 SHA256 c8a8e957a4d1a2d343d24830ae77d6e58f210176fb5db22c9007798ca8cb5380 SHA512 313a3a3fc5a70e832cee6b31e0105c7fbce2bf55aac176df468363a96ac06d22ebcf9c2653837ccb3b216dba8072640ea33c9a8c26e8f0f9c79e0ca0395d2e94 WHIRLPOOL 81d468e0dd81968a4f24e5dbda82413a9b493de4bf0b5a62216e7c1c7b7f1068c9af7f07b4856eabde293420f724ea704f7a82e0c6f812cfeee07208e7b21f10
+MISC ChangeLog 3046 SHA256 55374976a66201e9bfdb2172bbe06b664361df716481f5794e0846751cfabd56 SHA512 1ce1b784ade5893e523b047cf5eac5347a243c46b06c789c6fc0e0e1786dff570e589c21f4dc1ee1dcd30ff5cadf91e94a51fe36eb49cd6918a548c3a903028f WHIRLPOOL 1ecfc20455f1c987753e1f960921b0ffe1d69b26542f18b561f3f81d4132a2da75d766fae035cdbb6c1c337ac06b2ab9dfd41b65879042a4c6cc2798044258eb
+MISC ChangeLog-2015 466 SHA256 37c8df9bfec9b2eaff3fbf81459b53dcd764482a7f139f698688c7b386354d4e SHA512 fdab28b25392031b117c4f49f2e3a5275250f6baaac23f843eea8b86307a8c413500ad6e9e845ff60dbe71cb1460890d303d195d9d6be71cd05f14b7ed56a302 WHIRLPOOL 805a2e9ef6586e8443f1e8189db1bcf8b9570c71d83810cec476316783925d1132e0b8fb8e2fdd7ebc21d025066950b4da84c7a00b707ad5da345831fd45cdd3
+MISC metadata.xml 742 SHA256 e43356f072063f60f4bdca2d86a8d9aaad735af6765b2b5e35d77d0205e743bb SHA512 0ad2d0d2f08aedc1628d7055ab79a9f29371e8f15efc1627e1dfdc158f3e82557ef1b755b02504c868ef042baeb865aa49860cbeb9c4bceed358531fbff58eee WHIRLPOOL c2e73703c632ad196b49c794bbfc02d7ed51fc075a991ed272e58f35deacff1e5793b2dbb456c2861667b0cf77e4e0195ebdfabfa8feec27ebdd8d41c5f5ec4c
diff --git a/dev-python/rencode/metadata.xml b/dev-python/rencode/metadata.xml
new file mode 100644
index 000000000000..5c16d3beac02
--- /dev/null
+++ b/dev-python/rencode/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<longdescription lang="en">
+The rencode module is similar to bencode from the BitTorrent project. For
+complex, heterogeneous data structures with many small elements, r-encodings
+take up significantly less space than b-encodings. This version of rencode is
+a complete rewrite in Cython to attempt to increase the performance over the
+pure Python module written by Petru Paler, Connelly Barnes et al.
+</longdescription>
+	<upstream>
+		<remote-id type="github">aresch/rencode</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/rencode/rencode-1.0.5.ebuild b/dev-python/rencode/rencode-1.0.5.ebuild
new file mode 100644
index 000000000000..d8b14ff1ed5c
--- /dev/null
+++ b/dev-python/rencode/rencode-1.0.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+inherit distutils-r1
+
+DESCRIPTION="similar to bencode from the BitTorrent project"
+HOMEPAGE="https://github.com/aresch/rencode"
+SRC_URI="https://github.com/aresch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
new file mode 100644
index 000000000000..ac7550f4be49
--- /dev/null
+++ b/dev-python/reno/Manifest
@@ -0,0 +1,6 @@
+DIST reno-2.2.1.tar.gz 56013 SHA256 2feebbeb0fa0cfd4cd19d7fba5bdd334a10a82515b1d8c3c5fc732c076c84ec7 SHA512 278a7a43168f9467342f25c3eb8692e119cac285940b5d3f5a13f8f45acaffde962d2eeac720f2e5d824d085446fe5d660ef7082f95dd3c0360d594de5a65fb1 WHIRLPOOL 30203bbb1f1f8749e43b4c5a3cfe2dd3bfbd5ecf63b9fbcd6a47e8f148d58cd02c895311557919f4e2e27fafda326162edc9df77f71fb3c258b5dc1a6e7295ce
+DIST reno-2.5.0.tar.gz 62819 SHA256 328912f3c4cfb8645fba13d85fca8e490a028e36a627116485eac5e1fd680b66 SHA512 ee7c44235dd1c3c253b426abbafd490658d642d56ebac5688dd1e3fca45451f26855f421b252c64f9e143bd67c8b08a9e4c6b79edc9c7341b26150a576458570 WHIRLPOOL a6ac41c0228750059188deb399994219bec5589dc93f837e283f6c445a978d8438481816f1c2c1935e9a618c82817b00912d2ea924cff18f5a59678ab93d2451
+EBUILD reno-2.2.1.ebuild 749 SHA256 e6116123a9ee10bf706f334ab9793363a7c17341d6e36e87a7bd14d33bfec01e SHA512 ab28318780ee62037b394c1e979a63c1fd54d1c14e071bd300ffa8156903c381c73ac6fe3edb7d734060257771dae8b3f9b29fba8d8ea4f79ed1e7cdec086761 WHIRLPOOL f8f657abe903a7d36a7cd70bceeb959e974710bec4d70f50aadb2c29e9678cb60ac8be87debcd57938a05d5261c664355105466e88e3ef9bb9934437f118b1f6
+EBUILD reno-2.5.0.ebuild 707 SHA256 5dd18bb797b43a42f234c2051d253823377f7097f7f0e6be2dbd540598c97da6 SHA512 0fa946149cce8b25a45770d18cc4950a3746403bd517cc5d487a80a73a14e4cf2f163bb23895c2527f7d697c01b2e9bfb32c33917f70f0410704e28462250d78 WHIRLPOOL ba0363221bfa3287f9dc02b40395921daf2896339b9637c0b3d4ed91e53e918788f87194b8224c5af4c5fc757ebc79c7638343b299f93fe945b0253836f6a2c0
+MISC ChangeLog 1415 SHA256 9b72959dc4ddba930cee1efb5a7369ce8b0021637a1d9acc9d29fcf53e92a1f6 SHA512 3780f5baa9d52bf0357db8146a21715a65bdc6d27fc865b8c310e5df1aac9e9048a748ab787aed756604a44b27f733d44070db6a5ff1818301ed7669dcbaeecb WHIRLPOOL 6793007ec79fd09fbc13c2176e0be8bc7c027bd01d63b2820201cfecd54df16bfb60f484afaa61990467aac69eab1d3116603edfe067475550e88b146c581d6c
+MISC metadata.xml 321 SHA256 984c67eab7053871fef46aadcae57f9f20719a70da2e69c936b9b654f46f9bf8 SHA512 fa7cc33d444469e942598d32710f8fba3999cb738407d96243fb0c2efa0573b330e5dbe38685a5cc8a7c0848ad89611c5ac11d2d9d1a693f9a7674bc8dc0a4f5 WHIRLPOOL f08cfc51f4dfcf80d7102c3e133c35c0fc830a93a26ad9050dc6a316cde29c6da4d55241a8c60568928d343ca878e3da0164d64d75829bad3e1fcf119b6eb813
diff --git a/dev-python/reno/metadata.xml b/dev-python/reno/metadata.xml
new file mode 100644
index 000000000000..d9ed302410fe
--- /dev/null
+++ b/dev-python/reno/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">reno</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/reno/reno-2.2.1.ebuild b/dev-python/reno/reno-2.2.1.ebuild
new file mode 100644
index 000000000000..369edc605c61
--- /dev/null
+++ b/dev-python/reno/reno-2.2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
+HOMEPAGE="https://pypi.python.org/pypi/reno"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.4[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/reno/reno-2.5.0.ebuild b/dev-python/reno/reno-2.5.0.ebuild
new file mode 100644
index 000000000000..14fdb51f401e
--- /dev/null
+++ b/dev-python/reno/reno-2.5.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
+HOMEPAGE="https://pypi.python.org/pypi/reno"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.4[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
new file mode 100644
index 000000000000..d96d4e58acc6
--- /dev/null
+++ b/dev-python/reportlab/Manifest
@@ -0,0 +1,9 @@
+AUX reportlab-no-pip.patch 419 SHA256 9adce87eb85a16446a00d56ce549d9c619c03a11b69522756445e00d318f965c SHA512 1a5f4bced7be3c706b57c262dfd84fb539af42ae49541cf68d01963c8c79c96ad0a8389f36f486a485d258e9aa860c195e061c3c34070cfca3e64b52b6c89cd1 WHIRLPOOL a5b4c99cff2d83fdad4d879524e11c817af7f1702e1a2483bb1b8f241e6824707d9816820c0e5b2792b92f520ca80d788d6dfdecc501c4d91c5dca9fd23ae5e6
+DIST pfbfer-20070710.zip 677333 SHA256 fb1462ff6ce8efae58a0c496f0537c5ac16d4895c68f1640c2973db574ddb376 SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2 WHIRLPOOL 5aad616d063cab1862d77fbbf9f625f20c4bcbf09e45688719e312c1e8d3815f1b295d290b78f6c4789919cef39856ec223c30a2e424eeb1c8137cccc5ceb90f
+DIST reportlab-3.3.0.tar.gz 1959255 SHA256 f48900b9321bcb2871a46543993bd995148d769a11a9e24495f25b4ec0bbe267 SHA512 a6dbe5db13a9e430855ba8139310d8f04ade221c340467c2e0f5bf60c700f17148069358beb057f1667217a09b71ba1ae3112bd02e7c8de00e53a8f852acb8df WHIRLPOOL a62cb9ecd2f85324e8e847365346e4fbd64ef098032a54884149db43f4a9f42a0358747a185f1d87107472689bd08f86f70f976da49d09806fc4acf1b175f4f2
+DIST reportlab-3.4.0.tar.gz 1995779 SHA256 5beaf35e59dfd5ebd814fdefd76908292e818c982bd7332b5d347dfd2f01c343 SHA512 7f00074b93be49e1aa7650e61381e285598599911b12a6b63c0f12d6eb64bc59afb6907b683350740b0a81c99a3164373b27e18cfccc0f9da12405c3dacd1ff7 WHIRLPOOL 7d97433ce15d4730b6b062ae67603e81aa210483f01dcb0b972f048aeac1ef4fff233f6c6b4943e98667a0205d3e8670c21e0f5fa1bd171ec37681d6f2a8b1c2
+EBUILD reportlab-3.3.0-r1.ebuild 1663 SHA256 08a8396bbddcd802022e6e7d8413c961811801c929c3b1f9fd7788c0d9fc09bc SHA512 59f25e15700f62ff308819f59641067b5e32c6d99bb3d18acfbe5e9e53c28df77507ac142be177d9ec8629fbbc5d8b0ec54aebcea623c49c480ad8b2f6a3f431 WHIRLPOOL 3664c53b16cd0b4af5500ffe597752a44a2300689c23d26de57a82e6b2d7dfb354ea2d66ea80424becd1d3cba339119f5ae472738cab539a6b821bcaa3fff54a
+EBUILD reportlab-3.4.0.ebuild 1694 SHA256 1b2a2c6b2cd1dce5a6d1c573717380d65982eda30ef01a6951567cbf5996f9e2 SHA512 3929892657ab5ee98436a04876a793c34664a6208d7966f6814909df92859c22e9b1d1919053c4e88dc3d46c6f4aa9557fa36dfb351a5c129a6c176076124b89 WHIRLPOOL 5de838e603426646ac2a2a42dbb8572166e731086f2bba7380b2eca91ce10f2a08881fa606835e351cf23679f87c559440a7cd49c08fb3559bd977581d2894c4
+MISC ChangeLog 4410 SHA256 2964cab02a01fc3fba9b05455d6b3aad7913497f6c3cf8885285c334a4b5a9c4 SHA512 2f6ef913fff25141576dd40dad6dd2c756447302cfbfdbd7366174e6982abaf96729e4ecefb4fa3aa029a42ab93a6f4f72e99a531d9a6f482e5a0daa733f4177 WHIRLPOOL 80725c8c23e070ab5cb807706db7f6cdeab53c2e1d0371ffd66069c7aebec25b75a9545e74b7ef9f32bd000fc24d1218533671b850feef9e57d15ea07a4a69f6
+MISC ChangeLog-2015 18152 SHA256 595cfb8495f9621f18f23bf5318c55276999bbe302b8b769bc7baa25067e7bfd SHA512 e79f11d240710e2c31f434300f22e052f4ef1fcf369fcfdc55bc9603bbce4761e45570d7c20a9ee8cfe72736eb8ffb8e6bd2a93cab3f20769a78a1cf32734283 WHIRLPOOL 284502a61d5ccde30705b19b8116139076670bee1db8da41f905d7d1049e6f87d53690a5de3506d437da83c4273ec562730c32917dab624e5534407febc58589
+MISC metadata.xml 441 SHA256 03004a8b74c47d8ad5469c215fd4f7fe2456f2cdc7a4c606bfe7b0608cbb8ffd SHA512 4c54b763bedc090a8f16642829e4b2f16068a2cd6a8f1ded89ea9faa6425771a32b85a8b49b2f8dd91a51ef16f37051f76b5f899f7b34c7d4c2f37cb94a253a2 WHIRLPOOL 4510af69940cc0dd604551fbc53a7f4768cd513c20a915aba4b17111d632ec0e8133852356883a9319501269758f4d4dd167b4e840726380b0272b7bc2cdcfff
diff --git a/dev-python/reportlab/files/reportlab-no-pip.patch b/dev-python/reportlab/files/reportlab-no-pip.patch
new file mode 100644
index 000000000000..332878e24dcf
--- /dev/null
+++ b/dev-python/reportlab/files/reportlab-no-pip.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -538,7 +538,7 @@
+                 ],
+             
+             #this probably only works for setuptools, but distutils seems to ignore it
+-            install_requires=['pillow>=2.4.0','pip>=1.4.1', 'setuptools>=2.2'],
++            install_requires=['pillow>=2.4.0'],
+             )
+         print()
+         print('########## SUMMARY INFO #########')
diff --git a/dev-python/reportlab/metadata.xml b/dev-python/reportlab/metadata.xml
new file mode 100644
index 000000000000..e1980044b565
--- /dev/null
+++ b/dev-python/reportlab/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+  The ReportLab Toolkit is a Python library for generating
+  PDFs and graphics.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">reportlab</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/reportlab/reportlab-3.3.0-r1.ebuild b/dev-python/reportlab/reportlab-3.3.0-r1.ebuild
new file mode 100644
index 000000000000..558ab2b237c7
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.3.0-r1.ebuild
@@ -0,0 +1,72 @@
+# 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} ) # Tests crash with pypy
+
+inherit distutils-r1 flag-o-matic prefix
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="http://www.reportlab.com/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/pillow-2.4.0[tiff,truetype,jpeg,${PYTHON_USEDEP}]
+	media-libs/libart_lgpl
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-2.2[${PYTHON_USEDEP}]
+	app-arch/unzip
+"
+
+PATCHES=(
+	"${FILESDIR}"/reportlab-no-pip.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+python_prepare_all() {
+	sed -i \
+		-e 's|/usr/local/Acrobat|/opt/Acrobat|g' \
+		-e 's|%(HOME)s/fonts|%(HOME)s/.fonts|g' \
+		src/reportlab/rl_config.py || die
+
+	eprefixify setup.py
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pushd tests > /dev/null || die
+	"${PYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	use examples && local EXAMPLES=( demos/. tools/pythonpoint/demos )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/reportlab/reportlab-3.4.0.ebuild b/dev-python/reportlab/reportlab-3.4.0.ebuild
new file mode 100644
index 000000000000..ffc0d13ba0a2
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.4.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # Tests crash with pypy
+
+inherit distutils-r1 flag-o-matic prefix
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="http://www.reportlab.com/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/pillow-2.4.0[tiff,truetype,jpeg,${PYTHON_USEDEP}]
+	media-libs/libart_lgpl
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-2.2[${PYTHON_USEDEP}]
+	app-arch/unzip
+"
+
+PATCHES=(
+	"${FILESDIR}"/reportlab-no-pip.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+python_prepare_all() {
+	sed -i \
+		-e 's|/usr/local/Acrobat|/opt/Acrobat|g' \
+		-e 's|%(HOME)s/fonts|%(HOME)s/.fonts|g' \
+		src/reportlab/rl_config.py || die
+
+	eprefixify setup.py
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pushd tests > /dev/null || die
+	"${PYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	if use examples ; then
+		docinto examples
+		dosod -r demos/. tools/pythonpoint/demos
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/repoze-lru/Manifest b/dev-python/repoze-lru/Manifest
new file mode 100644
index 000000000000..5425382973b3
--- /dev/null
+++ b/dev-python/repoze-lru/Manifest
@@ -0,0 +1,6 @@
+DIST repoze.lru-0.6.tar.gz 19814 SHA256 0f7a323bf716d3cb6cb3910cd4fccbee0b3d3793322738566ecce163b01bbd31 SHA512 32732286f41ac6ad55e65fa15907e44558e7fbf089d1565c9c413be7c4af158b7a8ef9fc6be68998f8a9b4cd836028b8e706ba508a328a7fa338e95364e968db WHIRLPOOL b79539325e2529295d8da8b084d698150961ed648470d0f79d2a9533284b146c0713551dab860880cc6fd851c3afe5a99f549e6b0971539bfb24ba1c3ab738b6
+EBUILD repoze-lru-0.6-r2.ebuild 543 SHA256 394358b269d633c6a325be6f3dc932d72d772f3cad281f383ffb24db0a43b0f0 SHA512 ef6d2a319d644f185c244424129b51892f67089d843896dee23949e1917e2185e4a1ff4240ac08f2248e974ceb1af8cf390365ec83ba607f9324152c2690e336 WHIRLPOOL 9e53eef6c17bcb45f31644a2d73da4b20360b4de35d6c72cee2b96c794d8145203cc91c2fdc982c901f6e6ef7e5fe20e883b877aa83873a1f255b234a5923554
+EBUILD repoze-lru-0.6-r3.ebuild 703 SHA256 fb6a9fb76bcd3fa77e6c3b041e6ae0078efccdcc724f83512c509a23070419fe SHA512 f5cadf23b1273465c222075bdb7610e57f1251c0200f5947bae95d23af20c82411157fb46cb43bee9761bfba4bff33854b66c01cfe731fb8530670b93d348c43 WHIRLPOOL 7cb36fc6d929df56c324e7c15485747649d60728e5ada6121d09f751f6284f37848d9a45b61634d9cfb0db8f353adc26df1d01f46b7c5e85de8cb3fd5baba2c7
+MISC ChangeLog 2865 SHA256 2129a75d795f25d7b3c1f7a61daa9893048ce7e422e6120cebbf2da6587e4f4b SHA512 6cbbe36cfc58e4db3fd3d11320e8de3ce58952ee54233542a2bac056746fc21ba3c21fca254f3c73efcbeed89304a2363da126747ddb4381aefd2ddb91d31a25 WHIRLPOOL a12d2b72c734e1dee2530df5c0261a28639867b93b94c40c9c442a93ff60c58d5604aa27b831eabfbd3680a89ead780be70c27bb0c2e28ff6a24124b4014849e
+MISC ChangeLog-2015 1696 SHA256 3c9e51c0ea4d9f6424dd890249ad0dac649ae5570f346abd8dafd9a3d9650962 SHA512 39dcaeb9003dc8cccdac048b786947730b05377986543525dc5c3707237aab9237a1143d2c0a51d61b7102bd75e313637dadf19ffbefaa4a1ea163244bdbe922 WHIRLPOOL f1457c2debfc97c11e44c2b900be182f2da318948a9c369667b3da8d595ba4612773a27ce012d091f6d47f359057afadc869c3e4c6010d28e3a819776ed6b1c0
+MISC metadata.xml 323 SHA256 ed8fa5cfe9c73e35e63028388db4302bc5c6a62bde53877af2dd5baa37965d00 SHA512 cfe029f7e7fa262fecbd930ffd1f08e615e9f746678e28253bb0402bb3036858574595dbc03235e18b02ba08b7288a4f4f663d107f7f900e669d2b502b34e49d WHIRLPOOL 69948aafe058c6dd00ef98adb6db337935a9087e8ad6f619149786131e7e528e0e64414219bcdc829d7c1b2d8f9e84b58eeb2e3badd7540e0284387484dcd072
diff --git a/dev-python/repoze-lru/metadata.xml b/dev-python/repoze-lru/metadata.xml
new file mode 100644
index 000000000000..7b392355222d
--- /dev/null
+++ b/dev-python/repoze-lru/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">repoze.lru</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/repoze-lru/repoze-lru-0.6-r2.ebuild b/dev-python/repoze-lru/repoze-lru-0.6-r2.ebuild
new file mode 100644
index 000000000000..0613fe21fddd
--- /dev/null
+++ b/dev-python/repoze-lru/repoze-lru-0.6-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A tiny LRU cache implementation and decorator"
+HOMEPAGE="http://www.repoze.org"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/repoze-lru/repoze-lru-0.6-r3.ebuild b/dev-python/repoze-lru/repoze-lru-0.6-r3.ebuild
new file mode 100644
index 000000000000..c8b4ec839dc8
--- /dev/null
+++ b/dev-python/repoze-lru/repoze-lru-0.6-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A tiny LRU cache implementation and decorator"
+HOMEPAGE="http://www.repoze.org"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND="dev-python/namespace-repoze[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/repoze-sphinx-autointerface/Manifest b/dev-python/repoze-sphinx-autointerface/Manifest
new file mode 100644
index 000000000000..2a62a7938895
--- /dev/null
+++ b/dev-python/repoze-sphinx-autointerface/Manifest
@@ -0,0 +1,6 @@
+DIST repoze.sphinx.autointerface-0.7.1.tar.gz 7892 SHA256 97ef5fac0ab0a96f1578017f04aea448651fa9f063fc43393a8253bff8d8d504 SHA512 e2b2a41647a6e349bd33df8fcc08d2560f2a58b94a054bfcc9176cdcd97513ce78cc31945c7c12fd14f7906d21b23ba9c3fac0a06ed0c92ad7b89f73b5bf7ff4 WHIRLPOOL 2589c2ec262a9784d7a686550a748795a3892996d8c1efa05c300001471a273f801c085db394b80465ad1f0b2d7afbb680095d201cdbe4102447e8e4b62ffd05
+EBUILD repoze-sphinx-autointerface-0.7.1-r1.ebuild 982 SHA256 423da098e2d8e3e54753d44f45ecff6e724c6e1b2eb5e6049a300add1332c59f SHA512 2725f0e1e7dcbff102ea12b667e8fb127597a8c0cac7a35603b6cded11fbcf006e5fcf3121c93f9a7f6f85abb94f7485688e3087392ebef65c7c9131c824b2dd WHIRLPOOL 1fb21bae47a8ac3cfa53663509e25dafcbb3af205792dca7ccd57e0f7bd15a0996fadada5ee2cc5fc63044de9396ca7d83d25a7a7102a6d15c095334340d2821
+EBUILD repoze-sphinx-autointerface-0.7.1.ebuild 645 SHA256 d2c6dbf61b3018251d1520990cf26315210afe25fbb07d4ec9d9ed2426e15122 SHA512 ed662ba3e5728cb0ec84ec16c3eee90105c672d4a96db83fee84dd072f71594f8929a7a30d8c15f5ba60bb446dfd0f71fdd9bc2175d7c29cbb5c012cb84b6c5c WHIRLPOOL 2d6abfe99cbe4d097e1580835c479d9faaf3a16f24036f5ad1dfadd1af0327764a44fa95d88e2daa91af39b752af8f280cac139ea6a14afd2575a6f7349eb6a6
+MISC ChangeLog 2639 SHA256 44569d31a97a1cb4766fbf5420a4ffa489d3e3bd58d3484c7e954461b0e529b9 SHA512 c88b145fb178b12aef59bae6ccba4e480e72146f68db16f585c546b62ef9e9c7f35c4f8722cb3bfaf9dbd3b418740dbc48655a8509f9866704ded623c1d88199 WHIRLPOOL fb4f3ccef6a7600871ce3f76b49c888e00a860cda1c51d931e6ab83657eba414e12ea687eab149e4558e18422c2a7487b32b093aae8f8f54de2d6afbd5362535
+MISC ChangeLog-2015 832 SHA256 566b4a26c00efedf205e1a55a66bf32afd331582b96b4ab39a96d0d574158c1b SHA512 381d1fd4be0e42a7ae07bc56771ca6d0d85169a699f995f2974f3a5554c8414ce41b8d4c9a5bb8ee78c6b565b11a1f78657581150315d051dc4f9a8e9ae0b4c3 WHIRLPOOL aa9f51a468e6ed83ea62dd1d45b3b21c091a9e25c7f4c4d89af16fddf0f7f1fb55b218d38bbc4d74d25bbd200b15f7ef2e69834101b24de9d0486199b99c1846
+MISC metadata.xml 330 SHA256 8a567ddce454284fc61b18b49efd5656670bb0ef19857695618c82d562a59c22 SHA512 bab37e80962b4bbb37100966f20a648ecc5761dae56d01d09a140b39ee2662a91ea93a8c3e8406c285e94df572645a104baa810c941cf4913e73afe34ca185a5 WHIRLPOOL 595e973fef79f620b8a793e1969042c5bcec59595ed91dc71f272ceafbca6afb77fc6b2750164b0b9d179547616b82f36818d9d2b4a7cc44c859cb0eb921c3ef
diff --git a/dev-python/repoze-sphinx-autointerface/metadata.xml b/dev-python/repoze-sphinx-autointerface/metadata.xml
new file mode 100644
index 000000000000..0afe86792124
--- /dev/null
+++ b/dev-python/repoze-sphinx-autointerface/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">repoze.sphinx.autointerface</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..c50bd018c0d2
--- /dev/null
+++ b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
@@ -0,0 +1,44 @@
+# 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
+
+MY_PN=${PN//-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Sphinx extension: auto-generates API docs from Zope interfaces"
+HOMEPAGE="https://pypi.python.org/pypi/repoze.sphinx.autointerface/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-repoze[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+python_install() {
+	distutils-r1_python_install
+
+	# install the namespace (it's the only subpackage)
+	python_moduleinto repoze.sphinx
+	python_domodule repoze/sphinx/__init__.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1.ebuild b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1.ebuild
new file mode 100644
index 000000000000..8fefe46c3f6c
--- /dev/null
+++ b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+MY_PN=${PN//-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Sphinx extension: auto-generates API docs from Zope interfaces"
+HOMEPAGE="https://pypi.python.org/pypi/repoze.sphinx.autointerface/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/repoze-who/Manifest b/dev-python/repoze-who/Manifest
new file mode 100644
index 000000000000..e193b1de783a
--- /dev/null
+++ b/dev-python/repoze-who/Manifest
@@ -0,0 +1,6 @@
+DIST repoze.who-2.2.tar.gz 308593 SHA256 322629ec7c779dce4700e8f3ba531002b724d2429178c1cbb0dc169255dc9a8b SHA512 1d4ea83e0b5c0d57ff56e19b9922d88b37bca4dfd5ec49df2bf5a1f2aeae15a5698f839e0071cda8cedee69fe4abbfdcb3fa632d4d4c8407739999853df87f63 WHIRLPOOL 24985fd0187131a2062e45529ae656a9de8ff86b3663862872d32cc38b138670b848905d6470496b1b9036c0dccd0ff139282447af133595d4d9f196a0e52915
+EBUILD repoze-who-2.2-r1.ebuild 1050 SHA256 999341af13f537de0932a4882aef33a23580b4336c963889473e38f29e9ceeda SHA512 7e9d22a97a89f90b30bcab18a56478d0a42c90953de725863b2776cde62baca3bb581398f26d4881986bf9962e063c1f30809406876526ba4f4b491a65457efe WHIRLPOOL 7438a90d3e74e3887c9eea0803c86a1bc6a6aa26abc7802e64a64ab157429c6b22ccd1f9750530842877f49eb39385f1d65483d47bc5fb5203b8c16c20894459
+EBUILD repoze-who-2.2.ebuild 642 SHA256 28686ddb2dd5fbb8f9f8f087f807a0215bca9be5da810ffb14533a821f3b84d9 SHA512 85c23deb9a574357e468306c9c76492ca0aea68b71e7f4acc9fa1019169996503b616dfa95c81b8aec93dd3b5106987339e75cf8544e028257d961ee50f0ffab WHIRLPOOL 7ef7b8bbda131147482172e904d278f0b7cd87351e9e4f085f651ab208ccf4def9d158c3e77d320dd35afda2b694b7a0b31406121e6a176796078db139474cd1
+MISC ChangeLog 2992 SHA256 a7978dc7cdb545bfe20c4ad60fae0a1fff56567ddbc3569b7ad68a97a0e79e90 SHA512 3c3d57cd781aa67f7ee3c186a57c770cba255ac61e0a0946a044ae8a60860a6859cbc4dc188e09ee60233b347c3eb63eb0c5e4cd7437340005c878fa552aba8f WHIRLPOOL 5a69f001948965cd3f1bcdbd00dccdbe7920a9e3464154d7c8cb2ab03b6833100eaa8b00fd89adf2fb445a1d1e6e1bbe10fd1ea39f3cab319294ad644d0c3571
+MISC ChangeLog-2015 832 SHA256 7a84b13a43ee28ce47e97dd9322619628ff693ad53c562dc01e8dcffa28892b1 SHA512 8cd128a1d9142a408360752e771d1a867c95393bd2ea84a587cf14083d00f57986378759a335b6fc19f000af871dccf4b8144dfe34a2cd796acb938b8698533d WHIRLPOOL 03668ca714b757c9117e2f084fe2efede5cfc51e54eecf5bf74ab0b14ecdd8d73535dd4e997dfea8c48d8c36e24e94cb3d80856673411114e54eae1b524b954d
+MISC metadata.xml 558 SHA256 afbcf600ece5349fbb50973ad113b883542a9a3921694bb9b75237a9f3e8c7ba SHA512 a1330b0e049ff8546c2a28586a24ca03cf35325d5c831827dad20d513b17dcd188811e3605bc48825a2ebd165491edbd38e3e6f6973502585e276a9e111b2b92 WHIRLPOOL 2bff865f6451c50a83eae7aa57fdf4353266362a7a6932d3873a1ca9da113228c5d4f5c092a760e1aa2bbe44d0a3c00244aabcecbfb410e99c91530d500800ae
diff --git a/dev-python/repoze-who/metadata.xml b/dev-python/repoze-who/metadata.xml
new file mode 100644
index 000000000000..92981f7a7f0d
--- /dev/null
+++ b/dev-python/repoze-who/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+	an identification and authentication framework for WSGI.
+	</longdescription>
+  <upstream>
+    <remote-id type="pypi">repoze.who</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/repoze-who/repoze-who-2.2-r1.ebuild b/dev-python/repoze-who/repoze-who-2.2-r1.ebuild
new file mode 100644
index 000000000000..fb3636b8fe99
--- /dev/null
+++ b/dev-python/repoze-who/repoze-who-2.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="repoze.who is an identification and authentication framework for WSGI"
+HOMEPAGE="http://www.repoze.org"
+SRC_URI="mirror://pypi/${PN:0:1}/repoze.who/repoze.who-${PV}.tar.gz"
+S="${WORKDIR}/repoze.who-${PV}"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	dev-python/namespace-repoze[${PYTHON_USEDEP}]
+	dev-python/webob[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# install __init__.py files for sub-namespaces
+	python_moduleinto repoze.who
+	python_domodule repoze/who/__init__.py
+
+	python_moduleinto repoze.who.plugins
+	python_domodule repoze/who/plugins/__init__.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/repoze-who/repoze-who-2.2.ebuild b/dev-python/repoze-who/repoze-who-2.2.ebuild
new file mode 100644
index 000000000000..1d079fbad658
--- /dev/null
+++ b/dev-python/repoze-who/repoze-who-2.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="repoze.who is an identification and authentication framework for WSGI"
+HOMEPAGE="http://www.repoze.org"
+SRC_URI="mirror://pypi/${PN:0:1}/repoze.who/repoze.who-${PV}.tar.gz"
+S="${WORKDIR}/repoze.who-${PV}"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	dev-python/webob[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/reproject/Manifest b/dev-python/reproject/Manifest
new file mode 100644
index 000000000000..d9200f5bf390
--- /dev/null
+++ b/dev-python/reproject/Manifest
@@ -0,0 +1,4 @@
+DIST reproject-0.3.1.tar.gz 653996 SHA256 4a5d9b290361d3804cd7a1bbbfe8af1a96a451faaa33be80e8e7b6a5f5add998 SHA512 5739ee812862e6558c46ebd79b9b73214093df2b6d0c603d94586c0f8908a4b29004f07380ca143fb59bcc4d33c19b0a81a1185b1a2cc60ff7be943c0f1e243f WHIRLPOOL 77154655b834534e6c6c7c2e2897a3190d770ea92dcd0adf0f58e57342702c61aa8b9fef036378fd367fa42246b09518c707cd8f4598f01b1311e9fb2c666d5c
+EBUILD reproject-0.3.1.ebuild 1024 SHA256 b803488b322f7df387c885fbb6b6e9836bb920e62482121a41c731f692c4837a SHA512 e7b748d58903dffe837866b9404e726ff0045873e4d99d3f92e0b781aaf6c55a46ea8c5184cef16449ebbf2559b6933e282759f8f53f8610091774ad01c4bf63 WHIRLPOOL 4fd657bb4d55b269c839131e02c8467c303971fc1ac24ce27f8f00c588f530b96b6899e6f8b31b3029fb48ab2516d87666f45acbd1e615c4046caaaaaf128b4a
+MISC ChangeLog 480 SHA256 eff07ab71e5523060c610800baf015b11c1ea74311670bdf7c290fa27644ec5e SHA512 c3bcdef9e085ddbd251b5f5ff9b8d0d24b118b8088f5971d81969383119778d992386d8d263be700aa30c7502769037630835a3f56272b9ed000298fa92a5046 WHIRLPOOL 34617d7b8df01a58205b5f87f98a8ed9be2fc8e51a5f6a597636de56e2abb690c2b26d744fcd80ebf08a54f953f2c382d67f935cc25fd0846933e973446cd0e3
+MISC metadata.xml 901 SHA256 416fa4354c412c83c0e1ac2d9842ee2739bcd22684f4ead8bcc8c0983259047d SHA512 6a80440fec75e6cf6419bc946c662ed8a6c4d177299291080d6ff1a36163b4b386ede0706a683dd27bd007167a0a98f671faae6fb813cf62796352c8e2d0acb5 WHIRLPOOL 1ef2b9255827db98e6a091c96c2734ab998c2b4d9f0f5e6313226b5a16af85942b0aa06939ffef1e4cc286c2e951c8d51a67ba61b44a03ef0c7fcc7954731c24
diff --git a/dev-python/reproject/metadata.xml b/dev-python/reproject/metadata.xml
new file mode 100644
index 000000000000..7a7ae6566090
--- /dev/null
+++ b/dev-python/reproject/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    This is a package to reproject astronomical images using various techniques
+    via a uniform interface. Reprojection means the re-gridding of images from
+    one world coordinate system to another (for example changing the pixel
+    resolution, orientation, coordinate system). Currently implemented are
+    reprojection of celestial images by interpolation, as well as by finding the
+    exact overlap between pixels on the celestial sphere. It can also reproject
+    to/from HEALPIX projections.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">reproject</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/reproject/reproject-0.3.1.ebuild b/dev-python/reproject/reproject-0.3.1.ebuild
new file mode 100644
index 000000000000..6324cc1a4441
--- /dev/null
+++ b/dev-python/reproject/reproject-0.3.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Reproject astronomical images with Python"
+HOMEPAGE="http://reproject.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx -w
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
new file mode 100644
index 000000000000..d13786b0de49
--- /dev/null
+++ b/dev-python/requests-cache/Manifest
@@ -0,0 +1,5 @@
+DIST requests-cache-0.4.12.zip 44767 SHA256 efe2319b04b5a89e5c7582630dc47eb206f05d9b20b7a4c64228c39d61339dd3 SHA512 784d630eec99b607596d6ebcb7e51b0b4ed612b131437000391ecea6f3a684d1f61d169d57266ffc044a3939dcd4e7d6f85b9538165ae3613b1d3e55f18585fd WHIRLPOOL bd7892aed9caa5c24f8c8c5ae323f3506b681fc4bc45403c546005dcfc1d32d548dc6223c26579bc3e9c4813416b1438bff6d856aec3d1f2254df341b077d209
+EBUILD requests-cache-0.4.12.ebuild 852 SHA256 44b1fa971a244f98b28faf65738f7e86df11dc53c2d3dc84ade33107f92f1bc9 SHA512 aab80d4c9e5b31f53f4d6951589184a31d9d65c38a62a1b2ef2ab8b72d06e8e631481f2a0a2ad8d0b7479eddf4f5765f0241405331b1d16d1041ba2f43f867b1 WHIRLPOOL 7d8b4572cdc0df95e94dd80c147be491c66292806668d668b54f55bcd1bd1b64536cdccdf8fb8bd47b216493cf4af9a2927582c839d12ce2e46ebd95a02c153d
+MISC ChangeLog 2848 SHA256 835dd0657efb83d7016fbca09d368737f734aa7ca98d701625e583f3e8f27cb6 SHA512 3605ce2f92ce61b3b2f6fd091824af387cf94bd41d2f8e8f5bb96d33abe7facfcb126719c4aa0c3ebe726f9ebb865c2fc2861ba9fda232880563e8833e76b3cd WHIRLPOOL 017c05579ea9a9d65563e56393aa6efc086005a24094988f6bf867dc3f01245972766f62b5f46923816094d19eff28310f389b7cd9f425349539af16249b4e15
+MISC ChangeLog-2015 2725 SHA256 ffa052b81a61e0a9f0c4fb286e3997f7e240e1abe1aaaefadd67e77988729326 SHA512 e2a88d550ba8fd0c190678ef57a08eda649afab66512650da8a85d92af854a9f4cbbe39b3e2541e3ef3b32109ab58078c023234a7ee3460a524244eaa063f3ff WHIRLPOOL b4f4940e000ac018b4609785d4a5e6ccbbe3436c5aeb4ce343336e73881e4b01141b22eaf7bcab8acc5480ee514da97946b11bb14747db2baeede6e9b5d452e4
+MISC metadata.xml 444 SHA256 695e66acfe053697842802593d02c78c04d83f45ddb33b2419f5ba346b4bbdaf SHA512 0cc1b4cee3f1aecef89eb15ffd1e03a0ff4887f9b87a10ea90b6d11e3f5144b8d8d67dcad8c1dd26df3cea9e07140ed1ec76c4b1587d0db1b0f9c60b6daad41f WHIRLPOOL 479602f67840ddd90ce403ec8334086819a727363cd7961de8dd11eff413a2131cfedd70b1def2bc6deb26c0c78bbf675b3c288a7c26c1fbdaad74a5bafb66da
diff --git a/dev-python/requests-cache/metadata.xml b/dev-python/requests-cache/metadata.xml
new file mode 100644
index 000000000000..54115df8f824
--- /dev/null
+++ b/dev-python/requests-cache/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zx2c4@gentoo.org</email>
+    <name>Jason A. Donenfeld</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">requests-cache</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/requests-cache/requests-cache-0.4.12.ebuild b/dev-python/requests-cache/requests-cache-0.4.12.ebuild
new file mode 100644
index 000000000000..3f7de0975d4d
--- /dev/null
+++ b/dev-python/requests-cache/requests-cache-0.4.12.ebuild
@@ -0,0 +1,33 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+HOMEPAGE="https://pypi.python.org/pypi/requests-cache"
+DESCRIPTION="Persistent cache for requests library"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+# Portage only has versions of request >= minimum border
+RDEPEND=">=dev-python/requests-2.6[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Testsuite excels in tests connecting to the network via local server daemons
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/requests-kerberos/Manifest b/dev-python/requests-kerberos/Manifest
new file mode 100644
index 000000000000..5187a5af67f1
--- /dev/null
+++ b/dev-python/requests-kerberos/Manifest
@@ -0,0 +1,3 @@
+DIST requests-kerberos-0.11.0.tar.gz 10742 SHA256 ae734f71f46a7b205a74fb90e160c7ba4cc4e0dff2d4f3129cf74806b51b94ba SHA512 8700a7a305e0e42823bbc87c95ecfd404a76807459ab8a87f3105e817ebd9954fd41d7a2bab421bb5e21c0ec1b62a589c93cccb1f926a3ba66d6adbffe5db265 WHIRLPOOL 6d82e4a5355cf1f53b77330ddcadaf380c52ce84e43de918ec9f0808dcedf4210076f60c3abcfd2a43e3985efe995b3ef4bebaff6350a400b35c6515abde24cf
+EBUILD requests-kerberos-0.11.0.ebuild 613 SHA256 e1b2e2270deffff5a3142b6246e6b39f7775646b72e3e7763f99421e51e3474b SHA512 12aadbf3f07bdff76d1d22026c750ad54713eef24d9b1888757f610fd510ae988da97e557a8e49dd3f21f815253a9dd10d2e2b61e66a6ed969a19850a9cecf87 WHIRLPOOL b852a8759a549a5c1ac41120d01333f331b092d33d9f6f01f0bf853cf1b88cd864c34a3a31702626a825c6c80f87fa0e60569614edf0bd2a3aa126f6cbcf2877
+MISC metadata.xml 320 SHA256 84c212d063128f0ddfca507ebc5130fc980b82b146cfc5245354700f922e59e3 SHA512 a33854d5f3c9a4d077d51a4254d18045a4fb0a50c223e809ea0a7415c869152e30122c3d7e005b25c7e07bd660678db5613449688c086582c172a77d19a9e540 WHIRLPOOL 0b32d3e67938153c38deb8b7127e7c7a4d2e898989ded42c81178e4a84ea017b81d285d2b1178326aa4596e2d64bade303d117202401d85d040276ed58fe964b
diff --git a/dev-python/requests-kerberos/metadata.xml b/dev-python/requests-kerberos/metadata.xml
new file mode 100644
index 000000000000..faa93f153410
--- /dev/null
+++ b/dev-python/requests-kerberos/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">requests-kerberos</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.11.0.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.11.0.ebuild
new file mode 100644
index 000000000000..d5978a9242a6
--- /dev/null
+++ b/dev-python/requests-kerberos/requests-kerberos-0.11.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+HOMEPAGE="https://pypi.python.org/pypi/requests-kerberos"
+DESCRIPTION="A Kerberos authentication handler for python-requests"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-python/requests-1.1.0[${PYTHON_USEDEP}]
+	|| ( >=dev-python/pykerberos-1.1.8[${PYTHON_USEDEP}] <dev-python/pykerberos-2[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
new file mode 100644
index 000000000000..784c76f10e5d
--- /dev/null
+++ b/dev-python/requests-mock/Manifest
@@ -0,0 +1,5 @@
+DIST requests-mock-1.2.0.tar.gz 40219 SHA256 8c89d8db3a5ddbce6121bdeb665891ca27bb37d18bbadd96c6c11fb472f07df1 SHA512 ed24d1809aef597219ae2b0b376156a0760040795ccd660ee38f84cd1ceed58cbc5009764d7a365d31f941ee16e2b537b92ddcff92bcd8d47b7e95c67dc8d82c WHIRLPOOL 1cc27f31611dba6c9d825882c33610ebfa75e87b776680c0da468352883ec1cd615fdf8068d8b9c1e54d35872409620f82f809c53bea154aa83bafd1e53138f0
+EBUILD requests-mock-1.2.0.ebuild 1003 SHA256 1c5a9d9e27a70d4a88487bd35e38332c59efd27127157e3b50a227e1c3967394 SHA512 824e726de49409376cf8bcaa61ec492929e8260481fa054cd6844da7c7ce6e963fb05f106536ddde33614c09821316008b4c8cacd6be8424c5ffa9a5a1ad311f WHIRLPOOL e2c112b4376206c874db66740767fa2ca4d28206b8dfb473470904a4e16124393bfbf13ceb1e59cab86cfd9ff0ada6f271b0fd805419c590b20f71fedd07605a
+MISC ChangeLog 3965 SHA256 f4ebeb7311ab1c42e9ec43aeaefadf3d6ba997ad8a67fc5a09afcc3967a9b23f SHA512 304263f8fd34eba3a5aa6a9ef63e52784ef2f2c6fa4dbb4ff33e570ba3f63edf2f0eac0dc00a20406605d046faa9a127c7bd4e04c1c89f0fc8736fbe09545102 WHIRLPOOL daadd068b0aca6e8561af1a3463eb5b55182de06c8ae787d4e34cd4934271d8e5c65b0f59b189a6a0ae1756f3430b772c11d859f5049618f9500c1f09fe58564
+MISC ChangeLog-2015 1306 SHA256 5e5cfdd37b1267f7974b80c9e1834ed2e3277332fda63793606325b96eb1d486 SHA512 91b6647c1d594c00521154fdc82b84db3580afb9ed7838235666ec79d671a48c924f0670935bb381a684b0d6615694a807a8d9912eedb09929b5d4504ad955a1 WHIRLPOOL 41cee063a9be4eacf4fc044b85177e2d9bebb5f3f08fcb27a8025838b1fc09e9549a74a8af7dd3d018018ff7ebb7ec70a89339f9f1c0addbc55f4fb86e243bfc
+MISC metadata.xml 488 SHA256 9d67e4a4b5ec6233728c7548d80539b50213367eb7373a1d2229b754ec041239 SHA512 d4dfd7e1c4e3e0939a660cef3d993160e069b2f9823e9aa7e0dfbec286e6d87fbda7082fe7ac91b7d4f132e11f62931f33010cec520d534f1721c3bc010e27a2 WHIRLPOOL 5827ec7f6bf57376409d696cce05f61b34152c655d9e83e9f695b70d69f2e6d7b32ea8d14d28bb89fae2dd4511ec6064256a3a93793a5fe54d5aa15db0d0495e
diff --git a/dev-python/requests-mock/metadata.xml b/dev-python/requests-mock/metadata.xml
new file mode 100644
index 000000000000..3290df5c116a
--- /dev/null
+++ b/dev-python/requests-mock/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">requests-mock</remote-id>
+		<remote-id type="github">jamielennox/requests-mock</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/requests-mock/requests-mock-1.2.0.ebuild b/dev-python/requests-mock/requests-mock-1.2.0.ebuild
new file mode 100644
index 000000000000..f1334e757942
--- /dev/null
+++ b/dev-python/requests-mock/requests-mock-1.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock out responses from the requests package"
+HOMEPAGE="https://github.com/jamielennox/requests-mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/requests-oauthlib/Manifest b/dev-python/requests-oauthlib/Manifest
new file mode 100644
index 000000000000..999ffd2f1d3a
--- /dev/null
+++ b/dev-python/requests-oauthlib/Manifest
@@ -0,0 +1,7 @@
+DIST requests-oauthlib-0.6.2.tar.gz 40307 SHA256 29ad3c4cb1e880713a54bee17c6345ccf8be047544429ee62237843f5ec73323 SHA512 da188c6a6449ffa201fae6e2f0a0e5474b140efc55a00dfc31483726cfd860fc22cad654c4af0a4b81144100678ddf4c082f54fc9098a6a99e0a4857f22aae62 WHIRLPOOL 7d2cba69eb5be9205fb0f18fdc696e26cc223e09765dd31f6ba402e498471678baafde067c2f1d709b4d38b90e4957549c714752d658e00abe9f2203ab7d189c
+DIST requests-oauthlib-0.7.0.tar.gz 40641 SHA256 525c56e6cf42e7388e8657b78ceb860f3ab6d2bca966a020c740517c6621b631 SHA512 9de7f3e2f67507acbd6a711d7c3bc4d598214ab658e7e331f2c56d7a6d084e11df8bfc2449c3ec5e985016404a5e7920e26081bcc3af52d6c91b28d1a69f6ed2 WHIRLPOOL 71f3840a5a61154f38595204701fe3bb3ecd5c556f6f75ec237b4308f2220731096e42822bc32c0765a0c69168a9dc0ecade0cca03fbbab59533473b9fc5ea77
+EBUILD requests-oauthlib-0.6.2.ebuild 798 SHA256 fb0bcc75776299647ae897416f37c8e5e45eff42ffd8427506695891e8766efb SHA512 2b667d3f8df4189756ee6e4b1981adc4c2fea38641dd7a9aed066b88b1d4c206729952a18c5380bbda46b2e866acd97740c1d12c2a5821495d734daa8ec689bc WHIRLPOOL 9bbfd5ade06f13ea392c60fddacb09449b15335314565dbef0ab29c7fd1757225558bd4ce2690b40b582fbb3dc61722ec6cd4579b54649f1c84fc8020427ed5b
+EBUILD requests-oauthlib-0.7.0.ebuild 802 SHA256 9a59c8d16ad079bc55795b3f28d76905329fe801f0c37cebb7b7ac439aa5c943 SHA512 0c150723baf5eb2425cfdc114280d437983de59505612a582b4238d22e63c575c4ca2f739fc64b4778c4b240f7e4c2e35c02060029b9f5de2cde1d3d5ded1f58 WHIRLPOOL 566109f01681d53e523827e8a36d7d9f115d3dffce37b2aa2f17d8be9fa7316c7be740e5ac338f24603d07dad65990821ce988ba2ed8dc053087440ee4f5a2bf
+MISC ChangeLog 3089 SHA256 bfbd91f6e4649207155041266a0589749069b8b772d89a1edc7b279bdcbdcbb0 SHA512 e870e2d231233d824b466aa17f1fe9e4a17acdf35e6ff038e82aef2a42a9a343ae93ee8a28c97eee2ac4699ec9336d576e8c9f6db2c4ef72d696f88844f42e11 WHIRLPOOL 0b2f484e426bdb9d8463fc4b528075698833235425f72b2d07a6f82d852122b6bba6048ded39bb3a16ff720566f7bd63a2ea8f8df881fc62a41fa8c8fba0cd74
+MISC ChangeLog-2015 1708 SHA256 93328371b86c3f44f66d73a463aa2ce4e426d498748c2f253af629e8e439c992 SHA512 0a45c1d00665e13a53812381018e639efe4acfc8b6845a69acbdcb4b084b25c702f1a3a980454de091316cf16d7d3b177b25acd85fd703d6bf438ceabba33987 WHIRLPOOL 0ab99945c9f15a79fa8e6b5a2b99c68c8731a7b62ea4b9d2484bab998ca1d07abb392bfd2be0aa9dcb4b6a4c4a324608ecfd67ce041b1a72ef85ffbff5de17cf
+MISC metadata.xml 438 SHA256 00aa6c8b30ffa1e5c23dd458a34af2adc71eae70cd369d9d5c0f5de9c3c8bcfa SHA512 f78e511b9b5cc184a02ccb68db830f2cbf086e58ecace1adc58fce46c4c324aeadf736026596b6c9596f429b03badbbe1e206f61d8f7aef60e952366680e3217 WHIRLPOOL 6258bfc38f963883aef9b9f58b7f54d627c99118d4b59d597b287cdea110c44310bf05b765088cd205c838057784c64e52d365ae2ad65dd32b792ff6e6ffaa65
diff --git a/dev-python/requests-oauthlib/metadata.xml b/dev-python/requests-oauthlib/metadata.xml
new file mode 100644
index 000000000000..b57ad8fe5089
--- /dev/null
+++ b/dev-python/requests-oauthlib/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ercpe@gentoo.org</email>
+		<name>Johann Schmitz</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">requests/requests-oauthlib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/requests-oauthlib/requests-oauthlib-0.6.2.ebuild b/dev-python/requests-oauthlib/requests-oauthlib-0.6.2.ebuild
new file mode 100644
index 000000000000..32cf9d0cb142
--- /dev/null
+++ b/dev-python/requests-oauthlib/requests-oauthlib-0.6.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="This project provides first-class OAuth library support for Requests"
+HOMEPAGE="https://github.com/requests/requests-oauthlib"
+SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="ISC"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND="test? (
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/requests-mock[${PYTHON_USEDEP}]
+		)"
+RDEPEND="
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]"
+
+#Refrain from a doc build for now
+#python_compile_all() {
+#	use doc && emake -C docs html
+#}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild b/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild
new file mode 100644
index 000000000000..8fca85bbe7a4
--- /dev/null
+++ b/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="This project provides first-class OAuth library support for Requests"
+HOMEPAGE="https://github.com/requests/requests-oauthlib"
+SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="ISC"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? (
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/requests-mock[${PYTHON_USEDEP}]
+		)"
+RDEPEND="
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]"
+
+#Refrain from a doc build for now
+#python_compile_all() {
+#	use doc && emake -C docs html
+#}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
new file mode 100644
index 000000000000..825f38bac28b
--- /dev/null
+++ b/dev-python/requests-toolbelt/Manifest
@@ -0,0 +1,8 @@
+DIST requests-toolbelt-0.5.1.tar.gz 187981 SHA256 4f4be5325cf4af12847252406eefca8e9d1cd3cfb23a377aaac5cea32d55d23e SHA512 fff70b7262efae616fe9fe8e25af9856d42ccecdaca71cfde0dd81c5d7c509aec30f7c99f4b886d844c168937197ed8287e873fffe6073e93e48412b5a902997 WHIRLPOOL 6c918a43ab70046545445d217cac0ea9fd18c1938aaa5bfe61645cb95a435630000d2fbe51317c8bc9fcb11c8f68c64c8c1af0ef265c72d2994f16b9365cff3f
+DIST requests-toolbelt-0.7.0.tar.gz 194062 SHA256 33899d4a559c3f0f5e9fbc115d337c4236febdc083755a160a4132d92fc3c91a SHA512 77f11d12643d7cacf0c5dab5c5490359fc6f11c038d56d6ae27939394c5788622edb230d38d2202192eec6a7b1229feeb5669cd6a33c78f6891699d017e8205e WHIRLPOOL 6ce0b79cc4a7d981e77939bbc145e9a7c613067ef451cc084539304c6926cbd712fd47a936d7e3707074f9778f973830d5278c577cb826464e7606101a000586
+DIST requests-toolbelt-0.7.1.tar.gz 194670 SHA256 c3843884269d79e492522f3e9f490917e074c1ddbb80111968970e721fe36eaf SHA512 2559db13054c4d9b7c459603809a16d8d9a9c1a348369e1bc68e557bae10c41291286112e3b4a71e83b42203d40fa5cbc8441028693eeb986162d212a65f68ac WHIRLPOOL 200360434e119eb089d28a68b86685c0a7dad0b1a243dde03b10667184065ec94b29993d24467f43a5dfe6e3b24fe35fec588ea0d5e8768426c044043f9de5f0
+EBUILD requests-toolbelt-0.5.1.ebuild 496 SHA256 ed146aef77bf113caebce43e8f33b35886dc0afe7fe328e8f1f5b250146db703 SHA512 8d91f3a4637944a9b19e8abf93caaf4be208f7a52a1760351b95037485980ace11ca6be63bb1b5465fda5ea8e245e437426e46595d6d5ba1f5754fe9478df801 WHIRLPOOL d91c127eeee2f155235c25e3c688e489d9958f77356425226bf79e233b9eaac8cb89bd2de6a6da4158a312ea5aaf107ef6580729eee49ea039fef43cf6483908
+EBUILD requests-toolbelt-0.7.0.ebuild 496 SHA256 d2a7969c5de8805ddccbfba5bf254bcc794fa80b3b7df2c272fc8a8adb17a4eb SHA512 440173c9a947e5a8f591fcf7aa8c75d5ea2b78ef80db14c59e4da68fcd4d438d1be3247054a89ec17049e102457ba02b928616435ddeb5e775991da3c7cff721 WHIRLPOOL ee7500dded3dc6a71872d921fcfb973f75a2536ff9a3ac238ca3f014970c05ba0f5cb415e722c911a5e45cf7292c526833f83d0407b7fd51fc7f55f8d82de74c
+EBUILD requests-toolbelt-0.7.1.ebuild 764 SHA256 4f86efbc9066565bdba1914e9c4d54285a5c320c66c9b9e3136b9c573c1852c6 SHA512 75103a57b2a0d9edd3429aabfeee53b25a239a7f449c6529b2542c9c9a513fcc58eec610662bdb22d69bdcb3303b1c50a621fbcaf32018bd55f4778789dfd2e2 WHIRLPOOL baf0d84c958c48759cb56251bd28a03e01225684e76d3b93e1c6856d0bffc283046b8236087800719db28ba9ce699804f0efc80f1447e97e3ac669f727544f16
+MISC ChangeLog 865 SHA256 57c416d9317162e3a09da1aa7949205517783145dd25927a5706ecdf0ef690e6 SHA512 510408ae92d35cb6a2fb4549b1d95f0f574d6b9fb5674d822c2a28127f6890d52c745fb820a39c918f670223db17df51eb22eb4991ab718a9c0a61b3a2b1e398 WHIRLPOOL d913df7768041d73ec4da485c4799d7ce19263a769425320fbb1d95b987b2424dbae4892484491a53c00205d91da811fab49fb1d8b13be5e6c29d525f123c6fe
+MISC metadata.xml 297 SHA256 4fc27fb7fdbd9c7908366398371ad51d4e7225c5acb6057eb3bf4f7c71db86a4 SHA512 46897583f3474724b466e1d1a6b5e0d4c4d557730ce38c809ac2224d2b1dec3e844c0b66b7b6d9f5e60f82cd51a791c1a3ddf545d9898d70038ea2af183a8691 WHIRLPOOL f60c60a65cf6904a48df9370d4db8bdd8405ebba208663709e2aaf65fd30a079c56d24f692794abd803d8581351c5b8836fa2771f7d4a4e36181df19726d8f7d
diff --git a/dev-python/requests-toolbelt/metadata.xml b/dev-python/requests-toolbelt/metadata.xml
new file mode 100644
index 000000000000..33dacd3a88b7
--- /dev/null
+++ b/dev-python/requests-toolbelt/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>amynka@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">requests-toolbelt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.5.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.5.1.ebuild
new file mode 100644
index 000000000000..f7193a7674e2
--- /dev/null
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.5.1.ebuild
@@ -0,0 +1,21 @@
+# 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
+
+DESCRIPTION="A utility belt for advanced users of python-requests"
+HOMEPAGE="https://toolbelt.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="<=dev-python/requests-3.0.0"
+
+DOCS=( AUTHORS.rst HISTORY.rst README.rst )
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.7.0.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.7.0.ebuild
new file mode 100644
index 000000000000..89f3470743e7
--- /dev/null
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.7.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A utility belt for advanced users of python-requests"
+HOMEPAGE="https://toolbelt.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="<=dev-python/requests-3.0.0"
+
+DOCS=( AUTHORS.rst HISTORY.rst README.rst )
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.7.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.7.1.ebuild
new file mode 100644
index 000000000000..a41831f89e14
--- /dev/null
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.7.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A utility belt for advanced users of python-requests"
+HOMEPAGE="https://toolbelt.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/betamax[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst HISTORY.rst README.rst )
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
new file mode 100644
index 000000000000..81cf8eadadf5
--- /dev/null
+++ b/dev-python/requests/Manifest
@@ -0,0 +1,24 @@
+AUX requests-2.12.1-system-packages.patch 492 SHA256 05e127d17e8e4f62103e695525096ced64773b51d9fa3a4db669e82dc2fb3212 SHA512 0f85689cfc0f100052de77af818b1e897ba3f199514dd769247d1a58a12bdb6afea12fb7a01199414eca02a4eaa5446f47e1ac7206a47580aa8880121edc7a30 WHIRLPOOL 28f9232b901db3aa467dc0a0979dfaea7241dcf179cc9e87a3c6c0c4ce89575310073da14c682c2cb697cb2259983a21b36a843c4cae95fafc63557368826c87
+AUX requests-2.14.2-system-packages.patch 665 SHA256 8cc2c8937d494e195ea1b68213b585eba883d40fef90eef30a0b51d04da3a3f4 SHA512 0452537662eaadd8336dce1679ef2839ace898a129ce9c10ad4b35558e809fa8705ae29cddfbc8a22ec147c7c57bcf7a742c25e1189fe1f10c091b242f74867d WHIRLPOOL bccdc6333d8f2eaf372f793d94c9c2ddf94bd6e52c946ecf0da2c871cd07fff585c7202cb6255750db8e3b4cc05be86ab1cb6836a3996180fb5ea9735e6b7275
+AUX requests-2.2.0-system-chardet.patch 460 SHA256 da64f0578e0046ab95cef8d2fdcad7a31e0e47bcaece56c08fbda5f4efdedfc1 SHA512 ebd366b2824662e4f3e23032b7269482226bbc3bfc95536cbf56e7b50f499310f357c01f08e772b07180bd3165874a85cfba14ed827a6b1be588f0a7b427eb72 WHIRLPOOL f7b91d40102b63e61435068a8ce211b6f68f9cd93da936ad4b8e6ac6ed40baec174e53f00e7bec303214b33d19aecec6be3c32909a77c12c6fcfa2b34b8fafb5
+AUX requests-2.5.0-system-cacerts.patch 694 SHA256 e2cbb0eb75b61c8afd84d35c12fc847340ba0dcad9d2bdb24cce9c08eabc71de SHA512 804a2e2d46b6377c3f2a675ab367a1410e1f333dc6d087535f7eff73a78da06cef5ef66c3ad947bc1830aa373b963bfd30b4598eb6ca203a0f7e532cf971d145 WHIRLPOOL 3aba2db15012523bf1e10a87db3617e181943a4dd3b6cc7f643a5ba103e73e57b2df9bc5999d66c40c2bf0f018d10686a8301eaeb23b167607d6632bcc274f6c
+AUX requests-2.9.1-system-packages.patch 527 SHA256 ab38e4c77ed2388ae7bdb1939f3dd0644dc5b77fe2c0cd2cf7f83ea2ba966e4a SHA512 f7f77fe81f2d98cf2777c3388aec82ff0bd0188dffd047b46fdf514e19859f23263780e7e9dc828fdfe7f08a8e9ee63602f22208d2927a65fa45b8361444169c WHIRLPOOL 82e5ff9db1a43edfd43a414480b14a0d9539d0dca6991c0bccd885c8a46bf974108ebff947876df21d920e2f31b09f4c94995c577390f4d54e8c545c60a75b29
+DIST requests-2.11.1.tar.gz 485936 SHA256 5acf980358283faba0b897c73959cecf8b841205bb4b2ad3ef545f46eae1a133 SHA512 135cbab1e279ebf314bffca01bc4d9f9e71963c67069e330e78fbe06c4294031d1d616bc5d5e104161c8696b408887053bdd65351f85e9ff34646368c88852e5 WHIRLPOOL 838e3074f56a87766ebeb04eb75fdd6f5c83da7448b5e9297be8143330acaeae540d10939b7118cbd9e86c1749c8db5c6c22d50064e704b9c1d7278a37a48af4
+DIST requests-2.12.5.tar.gz 548336 SHA256 d902a54f08d086a7cc6e58c20e2bb225b1ae82c19c35e5925269ee94fb9fce00 SHA512 3ad60b953c6db98d26c043c7e77c3be8b28389ee1dbf32e75663cf48a8ddc2e487df27c54c64736ff42b79e35a6dbd2788065469a61a520a9818183970274cd9 WHIRLPOOL bc347e966743a940c09ed9bc98fed7422648a9b0354d36aaf94820fb306169842fafe5d34a48effb46547bb44fb46b2499cb1ba7dfd3ec029426cf97418d9c68
+DIST requests-2.13.0.tar.gz 557508 SHA256 5722cd09762faa01276230270ff16af7acf7c5c45d623868d9ba116f15791ce8 SHA512 d3e9c25d1ce7ecf51bd4b137645d06c07170542a78fc847b1c30cad6efa9bcbf36d4b0c809389cbf260dc7d73128ab6bbed1e197cba9497b6ad791b48014ae14 WHIRLPOOL febfabea45aa45093eb04758f40a35b6479e16f833fd83abc798d2b5786bed025bb00c45e8dea9161aff735bde693573e6f5db7e5ee09ad3d2b140673e2cbcf8
+DIST requests-2.14.2.tar.gz 521027 SHA256 a274abba399a23e8713ffd2b5706535ae280ebe2b8069ee6a941cb089440d153 SHA512 f6531ada6d854a261cad874044daa9e7f79d55c8f8fcfec1b25862563127318fbf717ed640644ddf0dbe4d7fe1298d478fcd76825a3604e06cefae5990fa9dd4 WHIRLPOOL e242d8182312b437a27bdc1d4a099d7db0c6135b3de29c0285ba60f6a72e1102941603cc551d8f3a4597f479c7d9409eef073c25b2411df93d0903d9f87b316f
+DIST requests-2.18.1.tar.gz 124229 SHA256 c6f3bdf4a4323ac7b45d01e04a6f6c20e32a052cd04de81e05103abc049ad9b9 SHA512 d7482ddce36ce633bee830bc8d9f9a207e1c20595378f7c60dcef01cab016a16704965f3b52e3faac63dd50fbe7c61d575742e71f51a2b8d41c1922df2dbaa06 WHIRLPOOL c1cf2544fdb4a7eb6536ff97847a15d786a9f1dcb7509e089a9d73e9372e5c6735b35a1c0d6e33580d933f573b3b3c3a1b48af2755563f04893daf66a114c8df
+DIST requests-2.18.2.tar.gz 125381 SHA256 5b26fcc5e72757a867e4d562333f841eddcef93548908a1bb1a9207260618da9 SHA512 b78660e5370f9acc458159edda385fbcbbb33b0703fa2c83400f3c08fe05253f357175e2ad76c5bff4bd942ab18da5df344473e9b5a924d7457596c0ff9bfbc6 WHIRLPOOL ed0d8ffb2cefeab6f3230fcb68e585650afb0772239c33002ae34050fc805256bb2c2c837dcad55aa4029972f9e60595256dee6f89ec493b399c499fd155c71b
+DIST requests-2.18.4.tar.gz 126224 SHA256 9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e SHA512 5c59bed82ac1094194f04a973b299f7d783264d372abd7a5229295bccc6b2f7a9f082ee4b0dff348e9c22cf68ddbd7cb67f60fd0b7d9eda41c02e40d075e9472 WHIRLPOOL ffdf4466188ef2c3545387a04b164eefdbc47d03bdd7d5114f783cd10935ba42d8f7016be40bf4c6710681d96ea37f16840a18e334b9d1d86cabd4b04ab9d6a3
+DIST requests-2.8.1.tar.gz 480803 SHA256 84fe8d5bf4dcdcc49002446c47a146d17ac10facf00d9086659064ac43b6c25b SHA512 bccec89165596df3af3f46eb43b5b28b595752485b00ed73978ef76fa6b8a8961c3db046c3f91ff34fa390f037322f6e13b141ba9b600a836a6d798086bd13fb WHIRLPOOL 445e0e12f5900c3396ae7a76d0010b9c4a4ff2c79c51dfc88f117918e436a4d67ea25de39f252cacaabd737b7b1542374172a2b6f482d7ffe1f7514d1cb4a06b
+EBUILD requests-2.11.1.ebuild 1429 SHA256 1a68f2f96aa813824c6c9899d455917c8405e4182ebb6304f5115f8c6dd19e28 SHA512 9cfbdcb589a1f756f05959ecdabc8f9deac9619cb5ca778283cab8495a39af10dce424c6a755e8f02d1327bffe8176900838670bd70707a0d5b35a24bb46a9f6 WHIRLPOOL 0c45d96f569f8faf79bc42e6ebb25da7b4a85a207c796eb42242a4388c6a3566da2938d197030920370d8dc0c2dbf708fde1cd2f2156e505baae0d4f96b9931c
+EBUILD requests-2.12.5.ebuild 1478 SHA256 371254fffc2dc036835c4d576dda4f092bd1536c316d82846224a55cf7af844b SHA512 6f7abd60817cdfdda8b55b960c4ea82923279f4f6d49e3b306f4f46f0a882a2362dc8a92cda77a65322b6654c822ee90c736f79d270ef9b2866b8567d46a24e4 WHIRLPOOL e40697ab2fe4873b7dbb6899fd3e6efc2686d5541979d989348c30032da268258a986da3baef0e089d7e7a98ca7fe77abf99bfb8f1dba387e5b2ca861ed0d355
+EBUILD requests-2.13.0.ebuild 1457 SHA256 37f2aebfe130c36be5d26396099b5f2890306d71d9c36afcc6794b78812c6a49 SHA512 e5560ba4bccfd3ac325b47edb2b92ce2d2db4186d4bd69eed15970f2e2630e6019684b1b0e131aa2e8c8dd5218ccba3a68ed26207da428adb58b3c3be1ca7289 WHIRLPOOL b133f74e99ce2f70015f260105a33aba4619ed5fd0fd986124b462e359160776b64478aee5acfe8837fe8cd5b6b72ee6a13ed003a23859f50d94e73788a6500b
+EBUILD requests-2.14.2.ebuild 1451 SHA256 3ed6143d6d33aadfcf1ced602feff364bb73cb1f4afa2782cf2f49685b47edf1 SHA512 baa8783bb3cd9d71d6e783aa7ae350373efd8b77eb2fe4983c1af7c082c402012ae6bc596afc8048abd1298ce718c73b986dbb063a34dd84928a99b0d03a9d31 WHIRLPOOL 621a421fe8ae2bfabc3f3f51b7acdcebbbcc730d0125dc81be09f88ab573aa2d2788c8c05ec810c41e4b60d090de6a2c2aafe409af5e330b820d6b1fcef65c61
+EBUILD requests-2.18.1.ebuild 1313 SHA256 1bc8683441388082220fe34c74f49a856697bfd5d0b7727df1864c1dfc69e26c SHA512 16654c7bb2ac20578b8f500916ee3bdce6f223ced93b73bb4aa330ac69530872dbc7c132d68093658291b09079accb3b14a135c4b7f38f247aaca852c3fabaae WHIRLPOOL c01c43293c2e22a9705bfdb8d24aef08dfb742cbf4dfcc0f176e7abb802ddc122ad59ade5af24c60aa0897d67f98501495aeebdbfc82bb3821814f973b8b8e98
+EBUILD requests-2.18.2-r1.ebuild 1353 SHA256 131ca88b6d733b53149d66d325aae3540d26531e7d655903237c62308bace0ba SHA512 34faf6a32ae3ba7e059642c48ab8e44e3d6903686728d50e3c8216858930bdbffd811ca26450bde773852aa9f8a865931cda04037d462a768647aec5be78283f WHIRLPOOL 55cccb4ec0cea2ddae980cc2eb7bb513a6d24e8322a4eeedc9e49b9c203109cf5823007a3f1cd4c8fc0523cf9aa17e6cbbe779dc1a3f55e6c6eadb38ea536c28
+EBUILD requests-2.18.4.ebuild 1414 SHA256 51eff9866c056d24c7ab73aa2464441ffff06a10716eeacbc87839a9ee16831d SHA512 104c744c233653d7aea8f5537137034a594d7d75675e173361efee086342a6fa68cb233f9431455fa5a74badf3530f50f56328a1ea20026a6bbb34437a1d0729 WHIRLPOOL ecce5c3c96ec8fa17989b1c0cd439715b5a39bd3d47517b1fa2be7ad16380afcaf032251864a5eb211207dcfe2c52701cb8c7cd85397967410f4fb5dfaa1dbea
+EBUILD requests-2.8.1.ebuild 1377 SHA256 d711c4164035a6f51c4c344a540d8015d3674be7ac6052dc28d877e05344b592 SHA512 d07d7af27ec4fe248549e29137c8e5e6500e3c67794845552de4db1728ed99afb06319f912eef1973e6c4bae2d22581526d36c09fe86235ed70186325eaf9465 WHIRLPOOL b039d74eba2af9bb3215f87d9636ab5a2bba21275125707be14cd427770bae65e2de6542495be8332298a34cc14268d8f644ad555d9eb5c9b1aac49d3c3f1bf8
+MISC ChangeLog 9643 SHA256 2a02e600ac6ec24ee2c83e61abf9655ed119119c3648c83bff632e0f6fee8d23 SHA512 c90fc678b83927ed8ed251fc504a395e10b7a32d22b483ac0d5e752a3e53a1436023b478e58ca8d56ffaf0907e818b9a3da62a4c200871a6d00b3c048fce1af5 WHIRLPOOL 2dfba4001b062c6b7e4c0f7547a6bce6356271adef9bd2d7558f9100424bfe09f928fcda9ec084119e272dfe1220b80b32f0ef64617709d8313c34ac0e8063d4
+MISC ChangeLog-2015 14781 SHA256 79c4e95d059f55f4f648e7d6dfccfd178412557b23921b2790a8d7bef23e93d8 SHA512 c0cd2037e56125af5d41f969b843979215f56ef57065134f113efaac4596af5808d9305b6c312e893c4597d13325aecd8c91c3d689285dadce971ee829e237bd WHIRLPOOL 1d27cdf9c553cd7118637948bf4fc02869bf135d563780300dea544dd0391a0859299c9badd0ac8971e38b459c3dae11e31281c23afb24cacfe65aa1a01fbe59
+MISC metadata.xml 674 SHA256 da06ce2090e831cc0e41597d0cdb12ef8eb7993ccf65e3b96e0aa40957ed9f81 SHA512 7aa5c27d949a076b09b4c2b9e905124047d9ececc40d9c3fd225c6405aa084db96cab585956db9885b115cd24c6c153ae853187872e77e7d44ae5790c323bac9 WHIRLPOOL 0d85a985e943b8b7f4f937bc63049092156241c526b59f32b0fa5249f911deed06b052681f97e68002d95a8d8256275dc0c2a1f4de8264070e673fa3e2cb06e7
diff --git a/dev-python/requests/files/requests-2.12.1-system-packages.patch b/dev-python/requests/files/requests-2.12.1-system-packages.patch
new file mode 100644
index 000000000000..62fecf9cc7a7
--- /dev/null
+++ b/dev-python/requests/files/requests-2.12.1-system-packages.patch
@@ -0,0 +1,17 @@
+--- requests-2.12.1/setup.py
++++ requests-2.12.1/setup.py
+@@ -36,14 +36,6 @@
+ packages = [
+     'requests',
+     'requests.packages',
+-    'requests.packages.chardet',
+-    'requests.packages.idna',
+-    'requests.packages.urllib3',
+-    'requests.packages.urllib3.packages',
+-    'requests.packages.urllib3.contrib',
+-    'requests.packages.urllib3.util',
+-    'requests.packages.urllib3.packages.ssl_match_hostname',
+-    'requests.packages.urllib3.packages.backports',
+ ]
+ 
+ requires = []
diff --git a/dev-python/requests/files/requests-2.14.2-system-packages.patch b/dev-python/requests/files/requests-2.14.2-system-packages.patch
new file mode 100644
index 000000000000..67627d150fe6
--- /dev/null
+++ b/dev-python/requests/files/requests-2.14.2-system-packages.patch
@@ -0,0 +1,19 @@
+--- requests-2.14.2/setup.py.old	2017-05-15 17:38:45.942532911 +0200
++++ requests-2.14.2/setup.py	2017-05-15 17:39:03.629533611 +0200
+@@ -36,16 +36,6 @@
+ packages = [
+     'requests',
+     'requests.packages',
+-    'requests.packages.chardet',
+-    'requests.packages.chardet.cli',
+-    'requests.packages.idna',
+-    'requests.packages.urllib3',
+-    'requests.packages.urllib3.packages',
+-    'requests.packages.urllib3.contrib',
+-    'requests.packages.urllib3.util',
+-    'requests.packages.urllib3.packages.ssl_match_hostname',
+-    'requests.packages.urllib3.packages.backports',
+-    'requests.packages.urllib3.contrib._securetransport',
+ ]
+ 
+ requires = []
diff --git a/dev-python/requests/files/requests-2.2.0-system-chardet.patch b/dev-python/requests/files/requests-2.2.0-system-chardet.patch
new file mode 100644
index 000000000000..18fc7a992bf5
--- /dev/null
+++ b/dev-python/requests/files/requests-2.2.0-system-chardet.patch
@@ -0,0 +1,21 @@
+--- requests-2.2.0/requests/compat.py
++++ requests-2.2.0/requests/compat.py
+@@ -4,7 +4,7 @@
+ pythoncompat
+ """
+ 
+-from .packages import chardet
++import chardet
+ 
+ import sys
+ 
+--- requests-2.2.0/setup.py
++++ requests-2.2.0/setup.py
+@@ -17,7 +17,6 @@
+ packages = [
+     'requests',
+     'requests.packages',
+-    'requests.packages.chardet',
+     'requests.packages.urllib3',
+     'requests.packages.urllib3.packages',
+     'requests.packages.urllib3.contrib',
diff --git a/dev-python/requests/files/requests-2.5.0-system-cacerts.patch b/dev-python/requests/files/requests-2.5.0-system-cacerts.patch
new file mode 100644
index 000000000000..f0d9e943e90b
--- /dev/null
+++ b/dev-python/requests/files/requests-2.5.0-system-cacerts.patch
@@ -0,0 +1,24 @@
+--- requests-2.5.0/requests/certs.py
++++ requests-2.5.0/requests/certs.py
+@@ -13,13 +13,14 @@
+ """
+ import os.path
+ 
+-try:
+-    from certifi import where
+-except ImportError:
+-    def where():
+-        """Return the preferred certificate bundle."""
+-        # vendored bundle inside Requests
+-        return os.path.join(os.path.dirname(__file__), 'cacert.pem')
++def where():
++    """Return the preferred certificate bundle."""
++    cacerts = '/etc/ssl/certs/ca-certificates.crt'
++    if os.path.exists(cacerts):
++        return cacerts
++
++    # vendored bundle inside Requests
++    return os.path.join(os.path.dirname(__file__), 'cacert.pem')
+ 
+ if __name__ == '__main__':
+     print(where())
diff --git a/dev-python/requests/files/requests-2.9.1-system-packages.patch b/dev-python/requests/files/requests-2.9.1-system-packages.patch
new file mode 100644
index 000000000000..f511d0d6524d
--- /dev/null
+++ b/dev-python/requests/files/requests-2.9.1-system-packages.patch
@@ -0,0 +1,20 @@
+ setup.py | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index b7ed12b..1d5abe4 100755
+--- a/setup.py
++++ b/setup.py
+@@ -18,12 +18,6 @@ if sys.argv[-1] == 'publish':
+ packages = [
+     'requests',
+     'requests.packages',
+-    'requests.packages.chardet',
+-    'requests.packages.urllib3',
+-    'requests.packages.urllib3.packages',
+-    'requests.packages.urllib3.contrib',
+-    'requests.packages.urllib3.util',
+-    'requests.packages.urllib3.packages.ssl_match_hostname',
+ ]
+ 
+ requires = []
diff --git a/dev-python/requests/metadata.xml b/dev-python/requests/metadata.xml
new file mode 100644
index 000000000000..7f45ae4e314e
--- /dev/null
+++ b/dev-python/requests/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Most existing Python modules for sending HTTP requests are extremely verbose and
+    cumbersome. Python’s built-in urllib2 module provides most of the HTTP
+    capabilities you should need, but the API is thoroughly broken. This library is
+    designed to make HTTP requests easy for developers.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">requests</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/requests/requests-2.11.1.ebuild b/dev-python/requests/requests-2.11.1.ebuild
new file mode 100644
index 000000000000..4fadd2dee904
--- /dev/null
+++ b/dev-python/requests/requests-2.11.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="http://python-requests.org/ https://pypi.python.org/pypi/requests"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="
+	app-misc/ca-certificates
+	>=dev-python/chardet-2.2.1[${PYTHON_USEDEP}]
+	dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
+	>=dev-python/py-1.4.30[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[$(python_gen_usedep 'python*' pypy)]
+	>=dev-python/urllib3-1.14[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
+	)
+	"
+#		>=dev-python/pytest-httpbin-0.0.7[${PYTHON_USEDEP}]
+
+# tests connect to various remote sites
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.1-system-packages.patch
+	"${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch
+)
+
+python_prepare_all() {
+	# use system chardet & urllib3
+	rm -r requests/packages/{chardet,urllib3} || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/requests/requests-2.12.5.ebuild b/dev-python/requests/requests-2.12.5.ebuild
new file mode 100644
index 000000000000..4747b802f74b
--- /dev/null
+++ b/dev-python/requests/requests-2.12.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="http://python-requests.org/ https://pypi.python.org/pypi/requests"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="
+	app-misc/ca-certificates
+	>=dev-python/chardet-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
+	>=dev-python/py-1.4.30[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
+	>=dev-python/urllib3-1.14[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
+	)
+	"
+#		>=dev-python/pytest-httpbin-0.0.7[${PYTHON_USEDEP}]
+
+# tests connect to various remote sites
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.12.1-system-packages.patch
+	"${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch
+)
+
+python_prepare_all() {
+	# use system chardet & urllib3
+	rm -r requests/packages/{chardet,urllib3} || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/requests/requests-2.13.0.ebuild b/dev-python/requests/requests-2.13.0.ebuild
new file mode 100644
index 000000000000..ca733c4061c3
--- /dev/null
+++ b/dev-python/requests/requests-2.13.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="http://python-requests.org/ https://pypi.python.org/pypi/requests"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="
+	app-misc/ca-certificates
+	>=dev-python/chardet-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
+	>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
+	)
+	"
+#		>=dev-python/pytest-httpbin-0.0.7[${PYTHON_USEDEP}]
+
+# tests connect to various remote sites
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.12.1-system-packages.patch
+	"${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch
+)
+
+python_prepare_all() {
+	# use system chardet & urllib3
+	rm -r requests/packages/{chardet,urllib3} || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/requests/requests-2.14.2.ebuild b/dev-python/requests/requests-2.14.2.ebuild
new file mode 100644
index 000000000000..c99bc370f19b
--- /dev/null
+++ b/dev-python/requests/requests-2.14.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="http://python-requests.org/ https://pypi.python.org/pypi/requests"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="
+	app-misc/ca-certificates
+	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
+	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
+	)
+	"
+#		>=dev-python/pytest-httpbin-0.0.7[${PYTHON_USEDEP}]
+
+# tests connect to various remote sites
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-system-packages.patch
+	"${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch
+)
+
+python_prepare_all() {
+	# use system chardet & urllib3
+	rm -r requests/packages/{chardet,urllib3} || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/requests/requests-2.18.1.ebuild b/dev-python/requests/requests-2.18.1.ebuild
new file mode 100644
index 000000000000..bbf594bc0e52
--- /dev/null
+++ b/dev-python/requests/requests-2.18.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="http://python-requests.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="socks5 +ssl test"
+
+RDEPEND="
+	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
+	ssl? (
+		 >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+		 >=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
+	)
+"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+# tests connect to various remote sites
+RESTRICT="test"
+#	test? (
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+#		dev-python/pytest-mock[${PYTHON_USEDEP}]
+#		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+#	)
+
+python_test() {
+	py.test -v --boxed || die
+}
diff --git a/dev-python/requests/requests-2.18.2-r1.ebuild b/dev-python/requests/requests-2.18.2-r1.ebuild
new file mode 100644
index 000000000000..ca420b8cdafd
--- /dev/null
+++ b/dev-python/requests/requests-2.18.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="http://python-requests.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="socks5 +ssl test"
+
+RDEPEND="
+	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	<dev-python/idna-2.6[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
+	ssl? (
+		 >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+		 >=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
+	)
+"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+# tests connect to various remote sites
+RESTRICT="test"
+#	test? (
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+#		dev-python/pytest-mock[${PYTHON_USEDEP}]
+#		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+#	)
+
+python_test() {
+	py.test -v --boxed || die
+}
diff --git a/dev-python/requests/requests-2.18.4.ebuild b/dev-python/requests/requests-2.18.4.ebuild
new file mode 100644
index 000000000000..50f154c78a6e
--- /dev/null
+++ b/dev-python/requests/requests-2.18.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="http://python-requests.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="socks5 +ssl"
+
+RDEPEND="
+	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	<dev-python/idna-2.7[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
+	ssl? (
+		 >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+		 >=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
+	)
+"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# tests connect to various remote sites
+RESTRICT="test"
+
+#DEPEND+="
+#	test? (
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+#		dev-python/pytest-mock[${PYTHON_USEDEP}]
+#		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+#		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+#	)
+#"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/requests/requests-2.8.1.ebuild b/dev-python/requests/requests-2.8.1.ebuild
new file mode 100644
index 000000000000..30e3700e6857
--- /dev/null
+++ b/dev-python/requests/requests-2.8.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="http://python-requests.org/ https://pypi.python.org/pypi/requests"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+# bundles dev-python/urllib3 snapshot
+RDEPEND="
+	app-misc/ca-certificates
+	>=dev-python/chardet-2.2.1[${PYTHON_USEDEP}]
+	dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
+	>=dev-python/py-1.4.30[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
+	)
+	"
+
+# tests connect to various remote sites
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.0-system-chardet.patch
+	"${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch
+)
+
+python_prepare_all() {
+	# use system chardet
+	rm -r requests/packages/chardet || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" test_requests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/requestsexceptions/Manifest b/dev-python/requestsexceptions/Manifest
new file mode 100644
index 000000000000..b86e2f1923ac
--- /dev/null
+++ b/dev-python/requestsexceptions/Manifest
@@ -0,0 +1,4 @@
+DIST requestsexceptions-1.1.3.tar.gz 6606 SHA256 d678b872f51f76d875e00e6667f4ddbf013b3a99490ae5fe07cf3e4f846e283e SHA512 33a848b04db500b3481b7df2553e244e1967e5124de1606f73fb38f0b2681253ca2bd921386ce50f1144a8dc8d6f8e07be058a3d9f13c7831f77cade0a42fd38 WHIRLPOOL b806c364b25b05a7659062a92cb1cf5131ebeee1fff2539d1e898d4294595eb4c0d91736a88e05c99b49b0d4d3f984189574055b6aae9e95b302cd9c002d3ba5
+EBUILD requestsexceptions-1.1.3.ebuild 571 SHA256 0038772b3136061d5a1dd15e4fa6df2f5e9897f2a560fb013cf1a1aff88634be SHA512 c64495bf3a1f3f344b5d436e18b65449177db3ed08f417ac5328e4018c7b57474d981783e0ce53c509999cb98b4e0cef3607ee94f46b1aeed7f70308e2e1d164 WHIRLPOOL 64eab323755591fee16f89f6d164eb05ff5de3e354b9fb4c1af32916bd9288d2a6db13f3c65f03399d90b67777153fc9a6330452cd3656cd05d5fff06c0936bd
+MISC ChangeLog 653 SHA256 bc6ba5858f522c935bf664c9ea24cdd63b006dcb4a4da8b59db22596f216ce77 SHA512 74d90c93091bc84940858c3b711d1126fc3cd229c24a3dc6bf508dfd35278e310b16270f35b402e4719fc39924146be6d43eac6d6cdcede307fa79b4e788bd54 WHIRLPOOL 5aee639a9845d043f5bb8873fec86935a05e8fe604fe4b3102a835c872d2dfbbc768ad8d7cac5f031f171c6b6209fb3c6611fd4a3c033ef9b6921cf9c06384a9
+MISC metadata.xml 846 SHA256 59c4a2317720cd07c0e9717fdfd029c39c88117802118eb14e4a3eaf033f8439 SHA512 d2ee4202dd7751d3caddc2c90b3d3c309b29ba1c7caf3427853944a7a5bea1d26a171fa59fff4f80e07235b3853990faa9dbad24ac0075fb813c4b91ddc4ab08 WHIRLPOOL 0d5767987ff047d75af3e303053e40339d63d0a54f46ab1213bc84afe63f8715d77ab4ea4834c4931adb3e2ea9a713c236b95d24350d455812647e5201dc2dd5
diff --git a/dev-python/requestsexceptions/metadata.xml b/dev-python/requestsexceptions/metadata.xml
new file mode 100644
index 000000000000..26800899dbff
--- /dev/null
+++ b/dev-python/requestsexceptions/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		The python requests library bundles the urllib3 library, however, some software distributions modify requests to remove the bundled library. This makes some operations, such as supressing the "insecure platform warning" messages that urllib emits difficult. This is a simple library to find the correct path to exceptions in the requests library regardless of whether they are bundled.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">openstack-infra/requestsexceptions</remote-id>
+		<remote-id type="pypi">requestsexceptions</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/requestsexceptions/requestsexceptions-1.1.3.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.1.3.ebuild
new file mode 100644
index 000000000000..0260b7f92a9d
--- /dev/null
+++ b/dev-python/requestsexceptions/requestsexceptions-1.1.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Finds the correct path to exceptions in the requests library."
+HOMEPAGE="https://github.com/openstack-infra/requestsexceptions"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}"
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
new file mode 100644
index 000000000000..17f661918e6b
--- /dev/null
+++ b/dev-python/responses/Manifest
@@ -0,0 +1,6 @@
+DIST responses-0.5.1.tar.gz 11697 SHA256 6d4c96cadbd2528ac4a9451ccf1bfe33c83fd6a8281bfd89656bdbaa0a8cceff SHA512 bd3dcd0cb97d46519371fbda11b42f2dae6c12e2492e6872f29cab31d5cc3942388d0d1d1d400ddd07bf810951edb75ee20f144b24750a3103a0d0d9ba2f78eb WHIRLPOOL fa5304b87e17fbe74ce532a4795132f0b311c9bd8ef5fd5c5d870ea1770afe4b8f69d9780bccf171dcf46f944f8cea12befc479b176274e1df472c672a7bce1f
+DIST responses-0.6.0.tar.gz 14073 SHA256 c515143ff64d8ccf35a0a1bd9e4fc962f64b8d1e6be0e61d0fb51934dafdd863 SHA512 32d41be5850f0040a4f2ad82a057d6ef73f0f83f7d3c250fa223d5614470b0b8b58790667af76ecc6b0b7e8e2a0a069c46c7913e983730c968c603e2716dec0b WHIRLPOOL 3391098552d264fe625a85b8584720c448c6df2eb84c92093dec0be810a460831ea178a0f81d7148421221643ce377fc13797e0c114080f39750f5ff016f0cb3
+EBUILD responses-0.5.1.ebuild 744 SHA256 42995af701d3a1669eb501de4781e8f80df79d5628fdd54c7ceb98a72c0499c5 SHA512 714c118eb38463f5f2e0e1da6ee4d0b55284c0f028e2d449e7ebd22605b95d116f0dd7b2082e5223fb070d68a19c5fda1bcca6b68af5bd72797ae331af12b089 WHIRLPOOL 7b2bae91a48d541e7d8d80ac9a8c7b3d1687ba6d9eb12600fa2a89808fa765d4fd74b293096b1ace3053161f5c86dc824d667cc33de2c7bcc67c7654d1b9ede7
+EBUILD responses-0.6.0.ebuild 771 SHA256 2fcd2e9b16078c2e90f3c3a63a69758c51f78a6e0da234b65089659781a2216b SHA512 4bc4e41f51989d770b919a8ddc3ce00f0f7d1b2f343d42c6a1476ed72c3a91f4b9a6dea6de927993078934a300b63aa0d539909f5b0445eed61d8f6de6e89f69 WHIRLPOOL 598e9d712ad7f31ece9f1f3567a7da84b9f38698e85bbd6a89e13d4953105aec0865b5286aa94b454a9e65efcc514062e0f9b34e5c71d05a50db3f1e51af1f2b
+MISC ChangeLog 1316 SHA256 0d546ff3be387ab7f3a15e3ca71a00b6b7fa800115e42da6702e4f97b88e8a64 SHA512 22d452750f6d9da5d7b0069b8ccac5466fbe07cc2fd45288e872a4b0f0e6664687a16224de0edbc0162a8ca632c9a4e57daf332da574f8f034844d770bad85ab WHIRLPOOL 9c5fe23b323cae3c3413f64e14ac10fbc3d0904cfe9b9ab0b0dbcacd5c15dc0c88321ae25108df82b33ef7705f91bbfbcdce0c272798c6ac351eaa94c0c4b681
+MISC metadata.xml 324 SHA256 7f250f3028423ddac18ab608d813d95e6183b6fbbd2fc21629d0174f97ca11ef SHA512 79c9288571e7e5d8b7504a4a6eebefc73f9aab2b14e1d4db2f0002d95efcb7402aac8708dcd9da3d6d8e8515bf0e5465b17852e3bbb1849293ecba286a14e6ab WHIRLPOOL 55e212bbbb3649200649541f8b2a7fa5113861c37acb765ba8062582cea5b7e7a1604232e8dcc64371f70e34bd974e30e002919f8503ac17f155bfa3f1d8a219
diff --git a/dev-python/responses/metadata.xml b/dev-python/responses/metadata.xml
new file mode 100644
index 000000000000..21996a4c0e26
--- /dev/null
+++ b/dev-python/responses/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">getsentry/responses</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/responses/responses-0.5.1.ebuild b/dev-python/responses/responses-0.5.1.ebuild
new file mode 100644
index 000000000000..8955f63ba065
--- /dev/null
+++ b/dev-python/responses/responses-0.5.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+inherit distutils-r1
+
+DESCRIPTION="A utility for mocking out the Python Requests library"
+HOMEPAGE="https://github.com/getsentry/responses"
+SRC_URI="https://github.com/getsentry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=">=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( ${RDEPEND}
+	dev-python/pytest[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/responses/responses-0.6.0.ebuild b/dev-python/responses/responses-0.6.0.ebuild
new file mode 100644
index 000000000000..6f8876c60a8a
--- /dev/null
+++ b/dev-python/responses/responses-0.6.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+inherit distutils-r1
+
+DESCRIPTION="Utility for mocking out the Python Requests library"
+HOMEPAGE="https://github.com/getsentry/responses"
+SRC_URI="https://github.com/getsentry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=">=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( ${RDEPEND}
+	dev-python/pytest[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/restkit/Manifest b/dev-python/restkit/Manifest
new file mode 100644
index 000000000000..9d1383a8f00c
--- /dev/null
+++ b/dev-python/restkit/Manifest
@@ -0,0 +1,6 @@
+AUX setup.patch 843 SHA256 0499f32d84001db049fbff5f1737bc0c4e23624d161e5090ab022225602fbda1 SHA512 200c112cb264271d8c1f043acb22ac476d09a0fc325b74658a950939f71edb8fad84a0fbc5f11335152fe5591be98a14df63f57458b84d35c2511a2079778387 WHIRLPOOL 930ce34c70d9d2093b2002e8e97bf8a9603eb5965211620552d7684da4a0a5578cafe873190914cdccb60eaf72a41ac16ed6bbd449a8b167dd03bed94073f13e
+DIST restkit-4.2.2.tar.gz 1275904 SHA256 c0bda8eb7c643b5e818b612dab49121393abc8589c6cbe9b84085079d598599d SHA512 5ed08535e1a54b5594d97b059d8662ab4bc19c68e71a30719c4a533cba0f2d0e18872119752c62136563a32281e8f747414fbf843fd97dba138107ffcb5d1e4b WHIRLPOOL 6a6e336fc1ce5a6499a9886d6a131d7b9e117323467da62ff11278ae1713254d7ebc05a71221ccb9b3f092999902a94282397b9aa983c89758e39221d9dbee96
+EBUILD restkit-4.2.2.ebuild 1302 SHA256 a95d7400b5eeae69d9e021d9084429004619a8eac1054491ed26f79df0ba2588 SHA512 83822a9eae558476d2f9eb46c125df75d0ffda07638b9d4b54e4fc8c88186f3fc9f03b04727fb283b31aac8f177266e7ee46593747e6874da591733c403813f8 WHIRLPOOL 0eb1bd987236a1a84b9a038bbed8b5d747841d76829c1ce62cf9d3ab1703707e8e44adc8c921b102a6aa037a8eae359dd07bc79419bd06b78bc0c95b83ebe910
+MISC ChangeLog 2590 SHA256 3585b6c1d4a182e05bfaaa4023818811d40c02510530832e1618fa771c4a6d40 SHA512 6b5d2f9f2b944b499019dca5f0127837605e126f7aa7015d2b9d9b02968e3cd33c7462f6504ac74d64b592d1c9ce933a47303f75914285d14f48358424ea0427 WHIRLPOOL 627c8dba71dbe26001d40e05fd606556d57b97f17894ce9fc54980b664d047d6de252dd4445179a5902ecd270f9cfb5eeea681eba0d8d7ed2057db2cc4ab6c63
+MISC ChangeLog-2015 4231 SHA256 f17e70d999b3c94a6582be714d49ca1ace33141c184bbd05cfd551dea5744995 SHA512 bd08e6328c8eb034eb739adf9479d3150dc0f4f5b8e309fb751204fdce4604b0bae4cd970e524c842544bd8bf93349479dfdb86440c7d9b9c9d87f5248ef1f93 WHIRLPOOL 5290cbf4da5ccec6b8ece3467b4438a96f472930ed675549574ae00d54f8f05aab5688fc8b8b8323b639078c2cc5028399c6a1206bc0f8e34d22a9408f6dd6f9
+MISC metadata.xml 520 SHA256 dab5fa43393d34719d14818ca8c881f97fd2b9523baa1c317ea0158434e87b06 SHA512 6e5652c44b93cb00a07485b337e4be168e0728ee49485692bb6b3cdc5725f78191ca891059197f3665a9f1ac1f65074843b7a2fa7cfc4ef0d92d52033f685acb WHIRLPOOL 8402f673a9e08a95b86cb5c69dc53cb99f99e9fac1cfcec1934bb95dfefc9a88a57a54f8dab82e0a9d1b4e21e300250765cda8be4904ffcd4a96509cd69d4f5a
diff --git a/dev-python/restkit/files/setup.patch b/dev-python/restkit/files/setup.patch
new file mode 100644
index 000000000000..cfa8959539e1
--- /dev/null
+++ b/dev-python/restkit/files/setup.patch
@@ -0,0 +1,23 @@
+diff -ur restkit-4.2.2.org/setup.py restkit-4.2.2/setup.py
+--- setup.py	2013-08-30 23:07:36.000000000 +0800
++++ setup.py	2015-01-16 21:38:04.342084550 +0800
+@@ -38,11 +38,6 @@
+     with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as f:
+         long_description = f.read()
+ 
+-    DATA_FILES = [
+-        ('restkit', ["LICENSE", "MANIFEST.in", "NOTICE", "README.rst",
+-                        "THANKS", "TODO.txt"])
+-        ]
+-
+     options=dict(
+             name = 'restkit',
+             version = version.__version__,
+@@ -54,7 +49,6 @@
+             url = 'http://benoitc.github.com/restkit',
+             classifiers = CLASSIFIERS,
+             packages = find_packages(exclude=['tests']),
+-            data_files = DATA_FILES,
+             scripts = SCRIPTS,
+             zip_safe =  False,
+             entry_points =  {
diff --git a/dev-python/restkit/metadata.xml b/dev-python/restkit/metadata.xml
new file mode 100644
index 000000000000..6322e79afeb5
--- /dev/null
+++ b/dev-python/restkit/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dev-zero@gentoo.org</email>
+    <name>Tiziano Müller</name>
+  </maintainer>
+  <use>
+    <flag name="cli">Install the restcli command line interface/tool, based on <pkg>dev-python/ipython</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">restkit</remote-id>
+    <remote-id type="github">benoitc/restkit</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/restkit/restkit-4.2.2.ebuild b/dev-python/restkit/restkit-4.2.2.ebuild
new file mode 100644
index 000000000000..0302d85a8b47
--- /dev/null
+++ b/dev-python/restkit/restkit-4.2.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A HTTP ressource kit for Python"
+HOMEPAGE="https://github.com/benoitc/restkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 ppc64 ~s390 ~sh x86"
+IUSE="+cli doc examples test"
+
+PY27_USEDEP="$(python_gen_usedep python2_7)"
+RDEPEND="cli? ( dev-python/ipython[${PY27_USEDEP}] )
+	dev-python/webob[${PYTHON_USEDEP}]
+	>=dev-python/socketpool-0.5.3[${PYTHON_USEDEP}]
+	>=dev-python/http-parser-0.8.3[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/epydoc[${PY27_USEDEP}] )
+	test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+# prevent duplicate install of data files
+PATCHES=( "${FILESDIR}"/setup.patch )
+
+python_compile_all() {
+	if use doc ; then
+		pushd doc > /dev/null
+		emake html
+		popd > /dev/null
+	fi
+}
+
+python_test() {
+	nosetests tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use cli || rm "${D}"/usr/bin/restcli* || die
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/restructuredtext-lint/Manifest b/dev-python/restructuredtext-lint/Manifest
new file mode 100644
index 000000000000..ecbc422c4118
--- /dev/null
+++ b/dev-python/restructuredtext-lint/Manifest
@@ -0,0 +1,4 @@
+DIST restructuredtext_lint-0.12.2.tar.gz 19141 SHA256 d265d774d8295f9e47d35a16bafe2940faccaff19565a596c420603fb75ffab3 SHA512 2634d740d30cafd446e3b5d3ad22e6942ec8e15d20440abe9c31ecfebebc7d1f50cc41492863ff1e6b01a8a3ad7139aa10e94022094dc7c314709e6f72176870 WHIRLPOOL 6b9f733e70bb1ad9ead696de28013ca348ff867891f1276faef69cb47b27f16c9f78841bd33e80bde4180c0e7370880f4d5c304e72f2ba46ac03e396c7f521a2
+EBUILD restructuredtext-lint-0.12.2.ebuild 683 SHA256 295b248d39ff200d28d07f4cc8d98ce2176768f842224d95093856420a5c50d8 SHA512 7c54387adf38e3221cf4a853d87fcb51b482148b6f11fb9cd845f6578164989ba704e487bb840f036a6452d132bd9d6166031da5193a0fa636223ed99498c9aa WHIRLPOOL 85678fb37777668a89556d5389ed88d3c6d7e6dada920ad247e7bec744ab770f9948e9facf0954923a390e7cdaaa817dad14e9088fb154934c706ab1bf950a61
+MISC ChangeLog 1721 SHA256 2da60a2fbdc2c5d5d1f1db836ed0cbe5f9ef53c83d8785db3d5d27a1255ce787 SHA512 53ca486f2b6f71cadfbe6bf18d88ab1ba88e0374851d7445f5ebe78c4aa49030635b7ee75230b03e34ae3806f9a02116e2387a451038dfa48ccec01839edc283 WHIRLPOOL 2fbbfc0bc76891f79ae833c5706f8ebca83c5169ee7e3a45a83b0318e2e816dc2f1d2f23a13f631d43fe5c52e828803d095b5e69247e93954462a8a0b3ea90a1
+MISC metadata.xml 338 SHA256 556f7ff7bb870f612924276b30f2b0cae31dbc8933d6b5b6a0d89b354a1c30d9 SHA512 50f218c3b3fbdc1b639de1fbeb5adbcd6b6864027331f4521c4d52ba5a66d7ff98b75f746ce29dc8fc454ac8d3e12012cb53e8d8b0b157813a4b359d27760265 WHIRLPOOL ab19d10c01693d3d28b0c403c0d83f02b6cbacda4a7ccaf673fe0a02598430813a40be0cfae191e7a68a2a53c935c6faac52e68107be66f43a28dadfcbf1a8ac
diff --git a/dev-python/restructuredtext-lint/metadata.xml b/dev-python/restructuredtext-lint/metadata.xml
new file mode 100644
index 000000000000..88898d732029
--- /dev/null
+++ b/dev-python/restructuredtext-lint/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">restructuredtext_lint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
new file mode 100644
index 000000000000..429501089374
--- /dev/null
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
@@ -0,0 +1,24 @@
+# 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,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Created out of frustration, it sucks to find out your reST is invalid after uploading it."
+HOMEPAGE="https://pypi.python.org/pypi/restructuredtext_lint"
+
+MY_P="restructuredtext_lint"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_P}/${MY_P}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_P}-${PV}"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	<dev-python/docutils-1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/retry-decorator/Manifest b/dev-python/retry-decorator/Manifest
new file mode 100644
index 000000000000..7591cf9c907b
--- /dev/null
+++ b/dev-python/retry-decorator/Manifest
@@ -0,0 +1,5 @@
+DIST retry-decorator-1.0.0.tar.gz 2835 SHA256 95b8861166e162e5259e798eb259217c59bdb8b21f055fd7f5bb4b7686fb5eae SHA512 f650740dd6d05010b7418b4d5ae7351058eb4418dabf7329390eaacceb72db60363bae8ff0bb15284301f0b5bfd9bfb731e71fdffb7231065a4db7ed6ce86da2 WHIRLPOOL ac40c8276423d9ad50e1b46d1981dae0c61e15309d1d217c4064fd0649b4fcaed940d1fd736c7a74da8757ecdfc87debe45bd21310549d35809e0da1d7da57fd
+EBUILD retry-decorator-1.0.0.ebuild 557 SHA256 258841d30bee052b2f8b650879eb4633fc05eb9b8c10393996d38da707ad06db SHA512 598f5d3bd78d2f76ee59d00b9c1650bf08eb350efca00304d3b7ff73122b45e29161e2427b0ff25c4351d3b4b5dfa50614dbae5c2d7010253450746cbe6db670 WHIRLPOOL 58b38702f6cba736655fcc42128d7d78698ec4ef3bd10d69315de1705f6fd6966157c1ea825ca8fed0fe352e1a44f821b0aeb72e24e325eb37e804b283ee1067
+MISC ChangeLog 2689 SHA256 f5d6ae635d8d9777247eac5c6a3b8c954445cc3bd422d09b2400d084b683b75d SHA512 1bb0736db2fe50e171345a8d5ec7d83036da8e1cf153f2321d864965489d5a140784850d559ad5018e55b222b203286b8a89ad02a0699cb1de5b612305513cb5 WHIRLPOOL 73904b2f458162e8cd45ae111559104ad427ce6ba6bc5011c4695ab417a332dd554a3c67c2ee5eff61ec709d43353da228cd4335293fe0fb14a212635bb02d00
+MISC ChangeLog-2015 1159 SHA256 ed073459e42ef3919a4dae0c2e5db348890ee348c8b09eb9f8e1a839151aa91a SHA512 3bf822d887dabe282c64eaa6c22dbb7ea83da83bf1137019864ba6e5b7254b8ac8598cceb8e0084618e77332ca9b1fe4e0131c2a2344a00929fd4a5ee0808186 WHIRLPOOL c8bf9327d3e16b851d4c814074034ed6c6b91c0645c2d38e8c1c2fec2077949907d8ce32dae13b4815b674ec566a989bf33625174a8c66e88f29a13de94adf99
+MISC metadata.xml 337 SHA256 55b3454daf929e35305728467d5b19b9d565496aeb78cd25267c96a45412d5f0 SHA512 b94863fbe276838245ce8de2206145c0a0953cf8ec520ccab8dd4c01d6a58d191740c7ea1af0c1692567f41660ff009a5f5cc3147126e21299864d5957c979b7 WHIRLPOOL 26833585d9b502c64f7ed763dd68e519c5d53ffed6b5af9d9f3aa821085538f89b62ea679b9ba6c60f77c8a79d562d026dfe8d650bf9de1c8e06ec451bb1db4a
diff --git a/dev-python/retry-decorator/metadata.xml b/dev-python/retry-decorator/metadata.xml
new file mode 100644
index 000000000000..17f1f731c3c8
--- /dev/null
+++ b/dev-python/retry-decorator/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">pnpnpn/retry-decorator</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild b/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild
new file mode 100644
index 000000000000..b28d5f52fd0c
--- /dev/null
+++ b/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Decorator for retrying when exceptions occur"
+HOMEPAGE="https://github.com/pnpnpn/retry-decorator"
+SRC_URI="https://github.com/pnpnpn/retry-decorator/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( README.rst )
diff --git a/dev-python/retrying/Manifest b/dev-python/retrying/Manifest
new file mode 100644
index 000000000000..6b9bc2f8078f
--- /dev/null
+++ b/dev-python/retrying/Manifest
@@ -0,0 +1,5 @@
+DIST retrying-1.3.3.tar.gz 10890 SHA256 08c039560a6da2fe4f2c426d0766e284d3b736e355f8dd24b37367b0bb41973b SHA512 99b81560caf63416f0301721ed9b9f9e3527a2fee4c53aeb0630b6e860ed81baf4b12b9819ca5b81346d45c4f40dfcb479a0b25305da1f560657fd3fdf2ffa75 WHIRLPOOL 38837a97a64ae89a5b0540c48310609ffbad071de2f812183ae411999afa74bc0e6e98f69bfc8fe0f1d243356e7ec467a5641be507cd3ef975724e3139e19995
+EBUILD retrying-1.3.3.ebuild 572 SHA256 1d5a02c2dc602a62f88b77332082c1945721b7bd02d215839cdc39aac7088d17 SHA512 61579fe13d85a64895f44b21b97150d1d397d530827e744ab2ab0967a2ee10f0d0c73403a0f53082f14e76fbe8ea0661ec2a0e9c81ee3ee6627409ecc3e5f29c WHIRLPOOL 7e4043bc275ef1acb4e03e25c1945b14a3488d910038036d7ff7cd0b96add0657559621e0d61547b67faf74e01a5ca1fad23fd6173c5d590f8d8cf5caceff1d0
+MISC ChangeLog 6095 SHA256 0d7b77e9ab34e2e5ef61b3fbead23619384932d41c5ef3dcaef1de12ab0fa26e SHA512 8d8b0c55218bd632724956d9309cbeccc55e8359ed232d2799454fdd479c03d5e7e237c7003bc2a536f95b4ba62cc8519fa3a7007b78b902ad289c714673fb51 WHIRLPOOL 20da44c258ef8f158fe8d41e4ac3dfbf730cc8360db6650782d6f9d54b512cd33099e6a36bb96d373f17cfa96ef6ae890a4cbf8d9a5dc20752b69329fa76cd2a
+MISC ChangeLog-2015 775 SHA256 480e1c8bfc29097de2fbde7ab061fbf366ad85f0f9feb098cfc9eeba84015232 SHA512 b7e70812391c58447c7f5b9d5c8afe344b47105664169d7b709b41878a5429c21e9647cded353c2bd211bfd0ca6661f085e266b01208c6957717d5faa632af52 WHIRLPOOL 64859d16a3354d80dcb75b6235581bb899920797eca28370a0dd99f42aad23ea0f6e092d0de82f5e0ae551f3b1f96398105ee60b89596e47064a30a7bef6cddc
+MISC metadata.xml 696 SHA256 f208c9f141890f04343bef739fe0f1394f37dcf2c16b1db4df2afc6a2ac365aa SHA512 e397e072f8f140fa55db71a21156adec37d615f41cd07dd07d86c4d77c7413b675e6a3032f63b5dab11f1f64a4f1ac547c2b8df685500304e9db48c3c5516289 WHIRLPOOL 32c2e1844ac310e409de6a437ac3cd3a9d20520457df4a3281ac34d13ad2aa5be5b428dcec0a51683750337a9a90b56511e1dcdcf40f85ccd93e88bd34f6ae84
diff --git a/dev-python/retrying/metadata.xml b/dev-python/retrying/metadata.xml
new file mode 100644
index 000000000000..f22adaa82cae
--- /dev/null
+++ b/dev-python/retrying/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+	Retrying is an Apache 2.0 licensed general-purpose retrying library, written in Python, to simplify the task of adding retry behavior to just about anything.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">retrying</remote-id>
+		<remote-id type="github">rholder/retrying</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/retrying/retrying-1.3.3.ebuild b/dev-python/retrying/retrying-1.3.3.ebuild
new file mode 100644
index 000000000000..1706888ef364
--- /dev/null
+++ b/dev-python/retrying/retrying-1.3.3.ebuild
@@ -0,0 +1,24 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="General-purpose retrying library"
+HOMEPAGE="https://github.com/rholder/retrying"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/reverend/Manifest b/dev-python/reverend/Manifest
new file mode 100644
index 000000000000..2ed5a6bb641f
--- /dev/null
+++ b/dev-python/reverend/Manifest
@@ -0,0 +1,5 @@
+DIST Reverend-0.4.tar.gz 12147 SHA256 33f801891bc84cd1adcbd8e1c4d53841bb27451f89b32c0418512c655a4c2054 SHA512 6d61c61ccdcca5b8c79fd230f9cd825335c9bf873c3b512170261886d7194b719d9811d7318014d0e931383efc51d995579f3199295c1b545bfd8fa4550a2452 WHIRLPOOL b449d2509f326e6bf194d698211bd4704025ab8f590996ed5e80f622cd41c7494fba345d4e2720fba141a0de1c0f953547a5f00d5f5c6c46b8d90874d4a5d358
+EBUILD reverend-0.4-r1.ebuild 645 SHA256 d6e0497dc991ee86fcf259a874f45d175fcb2cc822848a5dfa6a085e8d70d522 SHA512 55448d69df9f68ffc480220012a31a425686686cafa3cccb906a9b237226889429ceb0fc0efdc658374419952406d3c72cbc3c5c66cfde04e408cad142eee5f2 WHIRLPOOL 6466b1cf9c8279ae0a191ba374f495fe8e8ca8596afd70bfbdc6f45cdd7d77069c180a7ec232b342e7203107dc8dc2a04a5aa9ce794e5a259bc3e7057a5a8acb
+MISC ChangeLog 2700 SHA256 e60c63de1d94479c38599c1d1faa0d74d98f3b6aaf9c72b678c3eaa6150f5f12 SHA512 e209bc64b468cd4141ada80ba76724eb0974823761190161f43fc7e0b739bb6391348f341bc42d76e264382e23ed927aab9bc9608468fcfb67b3c2da247324a5 WHIRLPOOL 595f8a3840850774fe4f81989f9d0af9c32e07f1da87999bd5b58625ccbc17f84e7d6d6e70687bf681d69da8e3f8bb06b1ef1de031e22fa0f78869f36300f73c
+MISC ChangeLog-2015 858 SHA256 ee1c714a70f9b83f71a2bfebb562ef0701b6ae068cb50d724113374899fecb63 SHA512 267d394b2ed7c203cfb2ffdfc6fa95dfb8064368948ff15818adb0325d24cd47aa92c52353f455be3c70f41df2dc6ff3ffd8b684a8f56bc756696e01c320fde9 WHIRLPOOL 4208e356d71674a49c7ded89cbc24c7900bf151b94d151227f4e1f2c16a585af17da3991304827c4c14f30a6f8d64a56e3b311e766f7e6bf4357ec5e9e04d1dd
+MISC metadata.xml 364 SHA256 769529a84128043402d278aad5be4c787192a62224d39af1835b3ae5043ddd32 SHA512 c3bf46a9043b4d1e0f9f932e8c79c8b90ff556d747123b55382f265fd44bfaf4cd149a71589d6c3fac61066f5b92197491afb5779a166a2a9a970e37fed061f1 WHIRLPOOL a0cf8a6b822d81a7ec0aefdad386d174d0514c2d5f52e9f8f12237248d5587a65b52e8302be4e95dfdce42e8765f4f33af9055d028aa480bc7cd1ebcd8ba0956
diff --git a/dev-python/reverend/metadata.xml b/dev-python/reverend/metadata.xml
new file mode 100644
index 000000000000..f5aafbdae2b0
--- /dev/null
+++ b/dev-python/reverend/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Reverend</remote-id>
+		<remote-id type="sourceforge">reverend</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/reverend/reverend-0.4-r1.ebuild b/dev-python/reverend/reverend-0.4-r1.ebuild
new file mode 100644
index 000000000000..fc88c4e3e5c6
--- /dev/null
+++ b/dev-python/reverend/reverend-0.4-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Reverend"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Reverend - Simple Bayesian classifier"
+HOMEPAGE="https://pypi.python.org/pypi/Reverend"
+SRC_URI="mirror://sourceforge/reverend/${MY_P}.tar.gz mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
new file mode 100644
index 000000000000..8d1eef8af499
--- /dev/null
+++ b/dev-python/rfc3986/Manifest
@@ -0,0 +1,9 @@
+DIST rfc3986-0.3.1.tar.gz 21591 SHA256 b94638db542896ccf89dc62785ec26dbcbd6a97d337f64e02615b164b974f2e5 SHA512 47c0cff5b67de5cc54ce3a24eb6d192a8b1414f5bb25e54056561fc0394058ec94853e62b9495dd72e15074921b66153279d4dffd1c199e252d569646a34aaed WHIRLPOOL b2ae2145dd078dfed954eda8e76d41a5776a6760e21d247d50bb06a10400785b5fd78f77e6b01b4de75a076ede123ae501db800458dc0e7fa822d90d7983c229
+DIST rfc3986-0.4.1.tar.gz 22354 SHA256 5ac85eb132fae7bbd811fa48d11984ae3104be30d44d397a351d004c633a68d2 SHA512 a4731206a4179d3970fcf9c21405f7e9686268ef3610ab5ca2413a867d83b83188c0efd5958b0b4ba8fc4076da9bc0cf18aef774213a1b58fc42bfc8a6d5dd92 WHIRLPOOL 9e26818343bc2d174cdb3737902b0edc5c3911c9e2aee7e3a7bf7d40eaa7920345a2103d8f9ec6a8f432d54f856cd37c7fbd9c53da12678fce3e3cecd682186a
+DIST rfc3986-1.1.0.tar.gz 39381 SHA256 8458571c4c57e1cf23593ad860bb601b6a604df6217f829c2bc70dc4b5af941b SHA512 5e43ca7df586011900d2f01edfb20388598f77218e5a63904557bec0f1d0cb0a35f4980014de9c943ecc43a5a7ab3f7b815fbcfc9318e494c24a14fed2d1fac6 WHIRLPOOL 14b2f16d098c8fb592bf7a8944415ddb133870b7defbd1f4d5896e41a856f7b6826659393435438cde2733a74377e78a59567aa801abf800536af673957a1f38
+EBUILD rfc3986-0.3.1.ebuild 688 SHA256 376db1ec94ff8cd0ca6d339237f39c0f4406c8b6c64da3458ec576db9c3b7887 SHA512 1921f69298a8e1140320acc7d09638fab31fe16ae81070e5b1ddabe5f94d1a88c02ddc7ea3ae64ce3a926694c3403d2789d9813015c6bdd9694aae57d9ef64fc WHIRLPOOL 2b5bbdd59cf0c3dba4bf6b76eef055dfecf81cb32ec33f33a9ae018820c6b83f3ad8c2f8c9f59be69b2e579277c8df6c5c4bf02f3b08ef13c79f74aca86c437d
+EBUILD rfc3986-0.4.1.ebuild 692 SHA256 c1f562f1172d16973c3f527b18a07d18da0367722598587d8c9c4750186aec7f SHA512 39c30060b4eb0f1c9cab32b9a080062be3b14e85b7513b0d6504a90a28e611aeb659fcfc3a9401a568067303c45c6e670bf5a144d4243d14601b0b97032297e5 WHIRLPOOL e45111df33dad2e1ef29c7eea405614cc0e8b7d75af877861b8540d6915cd4745c874e3316ff7e57ee5c45c748dc0d1a37fd8c2af55797dbad6c0b4f7fef5ec2
+EBUILD rfc3986-1.1.0.ebuild 688 SHA256 a5813bb86156b44a1a1df906d9bb8173dadc324c5aa3056f0834bab021200f76 SHA512 072d91824c329826215ee49253e75abc79ffa51ed81ef39db71d410e5698eafbe2ca92e1c86aa717370f19189e94850aefe0034bede2c24b6c92654accbad329 WHIRLPOOL 74e971594aa4c6ba5733a6c38ed98d1c55df9c8f23a13aebd0534ce82bee83b16e82afa37a5a160d6888be44167ef8196579dc79ad4ac304afbc7b9f672aa686
+MISC ChangeLog 5476 SHA256 890fa765bb49137055cabd634ddb59fee996ce734415ffd505ad6be77f722d4e SHA512 2776cf5dc893deac8951121dcccd73b44bee4938bfe67510b600dd9e3eac676f1a3506f5b658335e5867d10a4135bcd455dc1d1dacc2535dee87d01703206e31 WHIRLPOOL ea172f518e5cb0355fcdd24f1e25ffea8664256fc90fe88808530939b72dee81255d6f01f63ae36e1e089d1d5bcec7076da06715cddf72cec8733f26dfbcccc8
+MISC ChangeLog-2015 663 SHA256 77031326f3033a34addef2633b1ccfa8dba9b7de00284ebaf0b990ed9bca345d SHA512 b77e1d46248352b9743606a23f2778bcabdc6f7aa47c1810f1c01badbb0b6ddabd4660eed968a046d3c88a6d3420c15e5afeb73b0bc4f1cc095e74674edadbdf WHIRLPOOL a0d815ab866d0f5c8a4043a719b2eaa94ad629d5070eba3b7894d7a9995cc43bfdf57ad957b8a941d746baacdb7c092a60c70731e2018efff980afa2f064053e
+MISC metadata.xml 601 SHA256 ab6d44f886298f8576574c82e6c1fabcb31f4a21c0f39ed74c70e73e78015c8e SHA512 2a535235ea1111e30083c9e7799fa584e624aa39fbbb715b49aefb0ddb8b96135da1533f8bad3e4190b6eada990da906f1bbba66fa9b5a29baf4963161c52426 WHIRLPOOL 6a60015f2b428a8eb837e4076838e5fc791005c1cb68102be2c0cbfaa919b59c60e52e4f651a93bd4fdc0f6014e87e0ab516c2ac66b66e6cd0d6177dc7e003e5
diff --git a/dev-python/rfc3986/metadata.xml b/dev-python/rfc3986/metadata.xml
new file mode 100644
index 000000000000..6bf17e96bd2c
--- /dev/null
+++ b/dev-python/rfc3986/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+  Validating URI References per RFC 3986
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">rfc3986</remote-id>
+    <remote-id type="github">sigmavirus24/rfc3986</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/rfc3986/rfc3986-0.3.1.ebuild b/dev-python/rfc3986/rfc3986-0.3.1.ebuild
new file mode 100644
index 000000000000..20ab7bcecba5
--- /dev/null
+++ b/dev-python/rfc3986/rfc3986-0.3.1.ebuild
@@ -0,0 +1,27 @@
+# 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 pypy3)
+
+inherit distutils-r1
+
+DESCRIPTION="Validating URI References per RFC 3986"
+HOMEPAGE="http://tools.ietf.org/html/rfc3986 https://github.com/sigmavirus24/rfc3986 https://rfc3986.rtfd.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_test() {
+	py.test -vv || die
+}
diff --git a/dev-python/rfc3986/rfc3986-0.4.1.ebuild b/dev-python/rfc3986/rfc3986-0.4.1.ebuild
new file mode 100644
index 000000000000..66dfa30d57f3
--- /dev/null
+++ b/dev-python/rfc3986/rfc3986-0.4.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3)
+
+inherit distutils-r1
+
+DESCRIPTION="Validating URI References per RFC 3986"
+HOMEPAGE="http://tools.ietf.org/html/rfc3986 https://github.com/sigmavirus24/rfc3986 https://rfc3986.rtfd.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_test() {
+	py.test -vv || die
+}
diff --git a/dev-python/rfc3986/rfc3986-1.1.0.ebuild b/dev-python/rfc3986/rfc3986-1.1.0.ebuild
new file mode 100644
index 000000000000..c87afb023b49
--- /dev/null
+++ b/dev-python/rfc3986/rfc3986-1.1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3)
+
+inherit distutils-r1
+
+DESCRIPTION="Validating URI References per RFC 3986"
+HOMEPAGE="http://tools.ietf.org/html/rfc3986 https://github.com/sigmavirus24/rfc3986 https://rfc3986.rtfd.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_test() {
+	py.test -vv || die
+}
diff --git a/dev-python/rfc3987/Manifest b/dev-python/rfc3987/Manifest
new file mode 100644
index 000000000000..3f2084e6c7f8
--- /dev/null
+++ b/dev-python/rfc3987/Manifest
@@ -0,0 +1,4 @@
+DIST rfc3987-1.3.7.tar.gz 20701 SHA256 91a7826b0a26c246a5a91bef09c2c0809c713a689be689b9571e78a13f6557a4 SHA512 c5fa8eb36358f7f42d12adc305031bfff7bd77e83316ad4458ed07acc6094c7d9109b95848b9296dcbc6677ce34aa59b1be8fd57dfcdc6be47eb92aeda51c518 WHIRLPOOL 5c4051d3192edb8124e0350c9cd489f74ec88929f1447c533a5ba6f3105fa937b9b789776a43e762ae4373a83cf92a114bd7f54d970bda2fe72b3ed61c724c1a
+EBUILD rfc3987-1.3.7.ebuild 784 SHA256 43f34471f1f1f54d8c2adaf913ecf87d5a1807566b03c067b5dc2aee9e3fb59a SHA512 b3f6fad4e446f6c4bb1be2ff85ce992d6b9c352101edcceaca6a74482bd125c5e9bfbe0288df7dcd51c407302ed0ecac79002569a49117f42b674f92e42df96c WHIRLPOOL 5e3e6e95895c935cf0285e7b4118109a04bd9841942c5ce653ad22462be67bfa4426941b4f1392be66f8717234782bfbf142e6891f3e7669391b87da87ce4e55
+MISC ChangeLog 933 SHA256 b9e4ff4d24d82d8108b893930ac5378b289d4ce6d5582d98a81ec36a6010ac05 SHA512 5c0a551af59112c3be583b5bc438d1ff22f9cfcac318504aef88fbba64bc24ba98429c41369ae7729de7e95b032d3c87e67db0b21801c4747898b4cc2fb66b86 WHIRLPOOL 9e5b37ee73f4396e4e84d0329506bdebfc549ddab3ef722014dbff6b9299d0537527c0d6f1b0f9ca41e06da11553e9131f56c18407254e9ea655e6d637828660
+MISC metadata.xml 571 SHA256 f10d8fde42286646139b0a1e144d2deb9c0f0e58f3ab56c73e5e25cdc9e12014 SHA512 2ced33f8245fc320ca1795072d9e63b5cc910b90f368306112316dcb444ee24f292e39ff76dfb027edcaf2c7a6dbfa636414ab8f9cfe777b0a2aeed17143e8c0 WHIRLPOOL 5c817ff5a38a933f7634c0e78eb59b96e45ff5e3c60f7e2ff6d4f51dd8ce2d1a98371cc38d05c9691bbdd7cc386717d2149021d7e3867c69964b3927e100725d
diff --git a/dev-python/rfc3987/metadata.xml b/dev-python/rfc3987/metadata.xml
new file mode 100644
index 000000000000..ed37dd5132a7
--- /dev/null
+++ b/dev-python/rfc3987/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+    <description>Python team can take the package if they wish.</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">rfc3987</remote-id>
+    <remote-id type="github">dgerber/rfc3987</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/rfc3987/rfc3987-1.3.7.ebuild b/dev-python/rfc3987/rfc3987-1.3.7.ebuild
new file mode 100644
index 000000000000..6697e1a9c082
--- /dev/null
+++ b/dev-python/rfc3987/rfc3987-1.3.7.ebuild
@@ -0,0 +1,27 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)"
+HOMEPAGE="https://github.com/dgerber/rfc3987 https://pypi.python.org/pypi/rfc3987"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="$(python_gen_cond_dep \
+	'dev-python/regex[${PYTHON_USEDEP}]' python2_7 'python3*' pypy)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	${EPYTHON} -m doctest -v "${S}/${PN}.py" || die
+}
diff --git a/dev-python/riak-python-client/Manifest b/dev-python/riak-python-client/Manifest
new file mode 100644
index 000000000000..26a6703d8855
--- /dev/null
+++ b/dev-python/riak-python-client/Manifest
@@ -0,0 +1,3 @@
+DIST riak-python-client-2.7.0.tar.gz 194141 SHA256 1c676b90fef357f60adc135ccd180ac28945b61b1367198a2a63df86e9bac1ca SHA512 d63d031fb4b3598176480a3f1419158437ea814b46623a9a69e9105ced4172a1609d731bd163dd258c9301fa3b3c406a81f4c1068460b0ea397046fa6a1863e8 WHIRLPOOL b794eb6b5c7472bd487934b3b40ea38fe7b4886e5d209e16344852b3ed8d9041774b4932465ba247bad2999fd4cf5e296198716964b59c75f853ed54322db625
+EBUILD riak-python-client-2.7.0.ebuild 882 SHA256 592873961f495645df8d7f608e33cd74965506efa6ab9ff3ddd0213fd971455e SHA512 40e136812685ccd8e0fc5bd3237f63b2c1a7670c6dee273fba9480930daef963bd9495af78252ee4cd9e33c5fb0aac0261a13c0abd3264a711b277f60ee9918b WHIRLPOOL 42a03a93dc7a46cf4f9932ba42e93295297c1a3b3d3a619ca969251c8e21a8c86d4499f5c51ec01b0db2d6267987b48489a53949c79cbec7086ebbdaf731e448
+MISC metadata.xml 349 SHA256 47fc7f8bef6131be16b3bd5c35b0fa5d5e42dcd530afa682aaf24d2853149c26 SHA512 613f92f27e8ac63fca2634eb9b058a30c26da6ba8751043ac3d107b5bf7bcf6d9af7d6b9bcf95a8a32158b5bcd0d32fef8ad43ee6d03656f94ee067411c48043 WHIRLPOOL b731451f671bb00f00626d9bce8f73e486b3964b58b5bfbfbfff03d1fbf15ab8702dfc23d7e7617c33c6fd2f36fa65941a00bb123665033ed8dba994efda540b
diff --git a/dev-python/riak-python-client/metadata.xml b/dev-python/riak-python-client/metadata.xml
new file mode 100644
index 000000000000..6a8aecae126a
--- /dev/null
+++ b/dev-python/riak-python-client/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">riak</remote-id>
+		<remote-id type="github">basho/riak-python-client</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/riak-python-client/riak-python-client-2.7.0.ebuild b/dev-python/riak-python-client/riak-python-client-2.7.0.ebuild
new file mode 100644
index 000000000000..dd9e09f6080e
--- /dev/null
+++ b/dev-python/riak-python-client/riak-python-client-2.7.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="The Riak client for Python."
+HOMEPAGE="https://github.com/basho/riak-python-client/"
+MY_PN=${PN%%-*}
+MY_P=${MY_PN}-${PV}
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/basho-erlastic[${PYTHON_USEDEP}]
+	dev-libs/protobuf[${PYTHON_USEDEP}]
+	>=dev-python/six-1.8[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+	# delete protobuf requirements that only work for pip
+	sed '17,22d' -i setup.py || die
+	sed -e "s:'\\\\n\\\\027:b\\0:" -i riak/pb/*.py || die
+}
+
+python_test() {
+	esetup.py test || die
+}
diff --git a/dev-python/rlcompleter2/Manifest b/dev-python/rlcompleter2/Manifest
new file mode 100644
index 000000000000..b9ee82d0e965
--- /dev/null
+++ b/dev-python/rlcompleter2/Manifest
@@ -0,0 +1,5 @@
+DIST rlcompleter2-0.98.tar.gz 10581 SHA256 41d00709f4275af49605461cecb935eac5e1d4a39bf0c34f6e0c5a1e00304617 SHA512 577118a8e94fe71a682a1210f5b156f5fa1078ae30efb1913e4b64569adfc44c64eadb993e9180d98243975589555204ede444fdd80d9094d279ede81e9e1801 WHIRLPOOL 03f649df9419e511de417d75294fe39db0ea55a4c09398986c9c59ae93fced6fa9817a0c5f26055c1119a281fbf0355891d5de7ddbd636a361ac72c538a3c929
+EBUILD rlcompleter2-0.98-r1.ebuild 571 SHA256 ef8497d2db269f6226b742ec390c85f96db6a3f3b9ef80289ef4dc07a4283157 SHA512 7ef188acc97e59d8c846eb91038a8647265838a1f074c079df413d6a75dd525ba18f1e598730b8f4d6604fad952924efad6629e4d10491454708dc43d623fbb0 WHIRLPOOL 19f6f71e1a3ad6b8ed7c3f558e553a1e74820422af41524c4f721f272184aa03bc44af10ce13a8ff8aec1a48de1192707a0a1a4d44d62b91bdd96a5006d1045f
+MISC ChangeLog 3237 SHA256 d42f791a17a786bd1af52cac65424aa440fd11b3bfed6aea8f35b861ae75188d SHA512 e731dcca78ea08db53908a40a280fb4cf89b89cc5277029e46b2a690981ffa0de6ce1c89a705b9baeb0ed58aa10455904652a7b739b25860368a08c03077cd33 WHIRLPOOL 08997d34aba12ff28f4247823cfab0ff6513c2a2123aed1b67ce8c8f841f3d245d315d9041dacc24f7c6ad0df47f76f452c4fc3d020a6f1ad135c3695646c97e
+MISC ChangeLog-2015 1836 SHA256 f55e9cc091eb2924cedda211a0a6ddab45043c8c76fa82d61d0aa3c26577c1e8 SHA512 2b11c231099139c1e9e71e5941ce18cad25f75e1b7db8cfeb0a9507451fac3a9c7587d215d583fafa4ec5c60cc20675ae00355ecf97a4755a2b0d200eca2ac3d WHIRLPOOL 38fbf9e273f246cb3e90269a50245eadab4fbbdb74522b1dbe8704ffedac4cccd4a09d3480f89ad46aad282d3bba4faa7a3027f67e9a3201fd82d6bb50c82638
+MISC metadata.xml 315 SHA256 3bc3367087ac89f608ff336069e66b1004f9d2b73e99f6e38d572edc7d516809 SHA512 736c0f4374e2b2632bad58dad660164ab7215bd1cc35de93bfdcfd709dd5811d9cb8ecf8b4df50fcb7f1e31dd2fc374bb9feccd40140fa781ab89008cac4369e WHIRLPOOL 1ae74e46f016e162bb4f3ecf52d91cfa917c9e35bde46f5771d2951d3d6559c1d5cb44d2ddf8846213b4e8e2ca50cf330bb6905dfeeed2be490995d60e09987a
diff --git a/dev-python/rlcompleter2/metadata.xml b/dev-python/rlcompleter2/metadata.xml
new file mode 100644
index 000000000000..86374765d6cf
--- /dev/null
+++ b/dev-python/rlcompleter2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">rlcompleter2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/rlcompleter2/rlcompleter2-0.98-r1.ebuild b/dev-python/rlcompleter2/rlcompleter2-0.98-r1.ebuild
new file mode 100644
index 000000000000..cab29f48ab9a
--- /dev/null
+++ b/dev-python/rlcompleter2/rlcompleter2-0.98-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python command line completion"
+HOMEPAGE="http://codespeak.net/rlcompleter2/ https://pypi.python.org/pypi/rlcompleter2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~ppc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+pkg_postinst() {
+	ewarn "Please read the README, and follow instructions in order to"
+	ewarn "execute and configure rlcompleter2."
+}
diff --git a/dev-python/rnc2rng/Manifest b/dev-python/rnc2rng/Manifest
new file mode 100644
index 000000000000..eb07431eef66
--- /dev/null
+++ b/dev-python/rnc2rng/Manifest
@@ -0,0 +1,6 @@
+DIST rnc2rng-2.4.1.tar.gz 13397 SHA256 997a8fe4eeeb42e7296fdc22ff11ca952c97ccc2efbaae80d67711bd6dffe451 SHA512 d06c35e916c43832bc882fb5af20ad70213efc9d470d4b5cf70caba677874aee441f4c26de26a7996800bf41ef0243fec761a3e38336387c779f9b014c3d6c09 WHIRLPOOL 9349431a85d5d43ba6c4c72471fccf8d351b2bcbcc2f6f875d0eeca2af159d1365c089f10f4b3ea9466b190b120e1d3e8f547fb0dfdbe440c96c8958825889c2
+DIST rnc2rng-2.4.tar.gz 13014 SHA256 c73d9635f6f83883454a92f12ec98d9bf087ce7412eca89aed672204d30a01fc SHA512 082b2985e1fac17792b7513db67c0f467147a69a0c1f1d904665ea99b4ba4042e27cf7398f42b94f26c4fd6dc7a807505429d7d08f0537017d0dbac94cb9474b WHIRLPOOL 23d7b50e32c41ac2be480eaf2d07e5f557441976b33d686b7a0411caf2f96a4ceb5149d5ff26f744357744b3dc088723b8f9f9a4a13804cbe4cb494f3e5c3ff2
+EBUILD rnc2rng-2.4.1.ebuild 512 SHA256 cb93e2d9fabc81efa6c02a6186ff2d5e00b8d3883bf010d5068f30eee86b9adc SHA512 d90fc93e7d6affab163f3328d32e6f5b0c537dd1329d821d5e54a5a54f4a82c690f73feb834e9a2ef97ebd0973b78b78d9b6d625e50ca2700f3863497ed9b800 WHIRLPOOL d830d32dacaefb17c3370ca14b961b0739b0888f7d1a23934765b4ef115818832e8a5eec658ffc7f5fab7d03fbd2c6e4c236f4ebe31068e64576783d9bd73c30
+EBUILD rnc2rng-2.4.ebuild 512 SHA256 cb93e2d9fabc81efa6c02a6186ff2d5e00b8d3883bf010d5068f30eee86b9adc SHA512 d90fc93e7d6affab163f3328d32e6f5b0c537dd1329d821d5e54a5a54f4a82c690f73feb834e9a2ef97ebd0973b78b78d9b6d625e50ca2700f3863497ed9b800 WHIRLPOOL d830d32dacaefb17c3370ca14b961b0739b0888f7d1a23934765b4ef115818832e8a5eec658ffc7f5fab7d03fbd2c6e4c236f4ebe31068e64576783d9bd73c30
+MISC ChangeLog 585 SHA256 6534faf58791f514df12e56067b691c9b360c1370737f6cf12157e9f873a4f6d SHA512 b1555525693de6320f563a7caf7fd4f00a692c696f63fe05319d4a5cf72e35db3f2cd50265227e752eaadc60f75b21dbd906b2e1724aee3415ecaa9e32328f70 WHIRLPOOL ba236afc9694e1a36292ee7e091bdc9d6332f0734b2bbeda0659f6b12d14932ea657475488f0a7edee0ae25be26adbe1ed6917bdb35eaccf867179fbb5a14faf
+MISC metadata.xml 366 SHA256 f5d1cd659c28417db34827990303523c03757bcd101c461383cf92eff23c3ffe SHA512 2c981a0862251c7fdb89078f62ed3eded580c221b3f1bbab7e2941b6e247f03cc7d86efb5174c5649b456bb9c6c5890b0664b32228c2c7ea1d6d18f2e6240198 WHIRLPOOL 8ffad12d8564fd5fdf166f4e0607df33a081f32d62745455dd4f0663896776d650c73996fc350b4f5fe763e7e79a5a49257cd737ca50c2053abd77051b7c12eb
diff --git a/dev-python/rnc2rng/metadata.xml b/dev-python/rnc2rng/metadata.xml
new file mode 100644
index 000000000000..3c8118378ab5
--- /dev/null
+++ b/dev-python/rnc2rng/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>djc@gentoo.org</email>
+		<name>Dirkjan Ochtman</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">djc/rnc2rng</remote-id>
+		<remote-id type="pypi">rnc2rng</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/rnc2rng/rnc2rng-2.4.1.ebuild b/dev-python/rnc2rng/rnc2rng-2.4.1.ebuild
new file mode 100644
index 000000000000..97401b806856
--- /dev/null
+++ b/dev-python/rnc2rng/rnc2rng-2.4.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="RELAX NG Compact to regular syntax conversion library"
+HOMEPAGE="https://github.com/djc/rnc2rng"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/rply[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	"${PYTHON}" test.py
+}
diff --git a/dev-python/rnc2rng/rnc2rng-2.4.ebuild b/dev-python/rnc2rng/rnc2rng-2.4.ebuild
new file mode 100644
index 000000000000..97401b806856
--- /dev/null
+++ b/dev-python/rnc2rng/rnc2rng-2.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="RELAX NG Compact to regular syntax conversion library"
+HOMEPAGE="https://github.com/djc/rnc2rng"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/rply[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	"${PYTHON}" test.py
+}
diff --git a/dev-python/robotframework-selenium2library/Manifest b/dev-python/robotframework-selenium2library/Manifest
new file mode 100644
index 000000000000..89823c0c6c08
--- /dev/null
+++ b/dev-python/robotframework-selenium2library/Manifest
@@ -0,0 +1,5 @@
+DIST robotframework-selenium2library-1.8.0.tar.gz 118945 SHA256 2cb983b3237a6f63842c2c800f35c77a76db88623751054644c50f7a3698c0f9 SHA512 22afab929ed4553cdf804aa0dd85b0700fa3be769d1ca2c023d14d2538472b7fd7f581e549e266b1ec77f5eedd72dc45a74c653b7a8d281b7018c164358c618f WHIRLPOOL c1bb90b5e7ea3260c58920b22df5542e9562ac7e2e742d366eed3fde66643cd518ca4d5021c0fbd52b576ca9f766e78d7b3f4e00037042855dbff2203a9e0f08
+EBUILD robotframework-selenium2library-1.8.0.ebuild 951 SHA256 ca3480f60d53afe3ad3b5f03fd6115809fc6eb7b57d0065e6da352982311d6b8 SHA512 792cf1a31eec5c87c401975277a19709c91d089d5b110580c2ac9d21b7d63f5da5f417e1c90fd63791250d82bf0d04f764814f917c3e769d53d702a26b044ed3 WHIRLPOOL db494bce7d04a3cae40f5a24bf936a058174f9d0b4daaf1ebc1f21635100242c13178c05dce902de2891636ca09bef17fb91e997dc913c00b105874f04c7ca8e
+MISC ChangeLog 3813 SHA256 1df82a1621d2313a2d5c81106904b9e9f91d0c0f2527c0061d8e49ce67894ce8 SHA512 3e49c8e0d3577e8f97d0cd452cee6eba9174ed9115c1a01f1f06659fd96f73b6e8972510065f43a9d3e1bab71330d2ab591a26cd584dd2627b98bcd1a8597f72 WHIRLPOOL 478863345825b0a8138bb4a1de2509aae01fcbd55b10bc7f633f23d1a4ed4b912f1c8200e36854a2b3824b82ad6b5e6e13a7ca61867d1530266aac9abe570469
+MISC ChangeLog-2015 2033 SHA256 90ff14adaa9175fc6ff5db40edc1641da8fdc4213be25880529a4b08755f8e00 SHA512 b35e36edf17f2baec3aa550d4ec59e3a3b27c709df07fc5c409ab66e0fba16f86bb7fddc260c6929cff333327df5535444f60d5c2389df26a039a28bd2325ef0 WHIRLPOOL 377c0f4861b84770880afd349e7cb1e910f6b549eafb7d1d00e2e5074eed93027300947baa2cbce3c4cc24afeeb0d075bf5e1ecb7df27be4fcd4df9a19ff9d26
+MISC metadata.xml 417 SHA256 f43758d28b32dc3d41d8f694fee3374284fb4a5bd4ea155f4f9bafc1447113cb SHA512 22889df955840adee04977741c49698aa55eff8a7f56e33ac2921242c8451d9570688511b65a95c8af0d27322fc13868e3d0fb8e2f975e5060443391df07d167 WHIRLPOOL 466416da1e30f0c55d4472674e7630ff5c7046668ac02c79ca534e0e1274ae103192e3e8b22dfdf08c2a2048b2066d8a270dd9b11a95b4185af51573bde009d6
diff --git a/dev-python/robotframework-selenium2library/metadata.xml b/dev-python/robotframework-selenium2library/metadata.xml
new file mode 100644
index 000000000000..9ab31763e738
--- /dev/null
+++ b/dev-python/robotframework-selenium2library/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">robotframework/Selenium2Library</remote-id>
+    <remote-id type="pypi">robotframework-selenium2library</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/robotframework-selenium2library/robotframework-selenium2library-1.8.0.ebuild b/dev-python/robotframework-selenium2library/robotframework-selenium2library-1.8.0.ebuild
new file mode 100644
index 000000000000..3c4ab2d2e3f1
--- /dev/null
+++ b/dev-python/robotframework-selenium2library/robotframework-selenium2library-1.8.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Web testing library for Robot Framework"
+HOMEPAGE="https://github.com/rtomac/robotframework-selenium2library/
+	https://pypi.python.org/pypi/robotframework-selenium2library/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/selenium-2.32.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.3.2[${PYTHON_USEDEP}]
+	>=dev-python/robotframework-2.6.0[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	# don't use bundled setuptools
+	sed -e '/use_setuptools()/d' \
+		-e '/ez_setup/d' \
+		-i setup.py || die
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst )
+	use doc && local HTML_DOCS=( docs/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/robotframework-sshlibrary/Manifest b/dev-python/robotframework-sshlibrary/Manifest
new file mode 100644
index 000000000000..df204845ee26
--- /dev/null
+++ b/dev-python/robotframework-sshlibrary/Manifest
@@ -0,0 +1,5 @@
+DIST robotframework-sshlibrary-2.1.3.tar.gz 92733 SHA256 ab1daa49d38934ad57433500c1e177b4f3b3a16f5218a687a6061014343dabcb SHA512 3159ea396757341ce5b37fc3db41db4dd052327750cea3a463e5109013a72fa285c1d3c33b9c43a017fc4c180042e32e957a24c9962f5de385a262562cacc52e WHIRLPOOL 17d6dc30fe2bcbe2d0002365ff410ebf9108c17816dd11b0f232432f454b5dd155200904969bd8fd3a79cfa15c0467525c3ec67ce41c8c4db9dc92ae7575919f
+EBUILD robotframework-sshlibrary-2.1.3.ebuild 561 SHA256 9faa552229c59af026620e0c3209f21a51ab314c6863b76d765c91f0a0d67e69 SHA512 b48050ca7f5c2fe643eac047491599054d65e58cf6152ee18e33cf896a2618b1947cc22c9c69496f3763694fa2787e7a656e00cf9ff1fff7802ea80f6ae58652 WHIRLPOOL bbb6aabfacf3c1423c9e2a565a5b976e5daa9ca51872503cef0bb35c253b31589a0ace70540dc235b7496a1c68dad1a1cb35e396f73c265dee8cfc15746deeb6
+MISC ChangeLog 3038 SHA256 bc4e69dff8bbd5881d0932ffac63c47ebd2f85203c274639de67e4447db5b9b5 SHA512 1ea8795441784233fda2a729bcb569baf8cc94c9ab900c05983fdc06002a0d32bce4bf0d8082ccee5b458d5cbfa6ff79958f7dd21b2cb7c86b1f5f3f740433d8 WHIRLPOOL d7a49fe1f0c52a048828e6bd84ed5d1d0a0170f8faa2a3e997e70a05f92978b7b5bf4b46e022d63a9904cc72e097fc2b7f5729f552fce75fb3149231b7a9b94d
+MISC ChangeLog-2015 1466 SHA256 b467810a025250d5d4ba411dd120beef8feabbc228bfdb5a42f4cfae457c79ee SHA512 4c47be0fd1cec5565289b3778abd68435b72ba16f39c9dcd5e71b5c88977740d047b2723c833459ea0b5f3c34187c46621e8fe69d0660f360b582a99f8f48c6a WHIRLPOOL 15020e6b0e47f84f366398bca34e747306edab70af2b83d6026fee80b8b5f1385031f83dfc083565bc7513a3448fde0cb6c9d9dca29aa3293cf818a033f1fd9b
+MISC metadata.xml 405 SHA256 7e3172853a9eb465c3f7c866c2e18a0fd3cab9801fd29346b7e844283b1dc8ef SHA512 c7cb26875948b6d67dc5a381060ed36c1127f9174eab2001c6c96a3815d04663eb631cd8525e8929c0357bca9bb54779016e2ad64d02f614aff73b26e359fd24 WHIRLPOOL 835497e825f46ac9a674ea583a839243fb78151132036b9aca4b3fd34ab6e6791b6806e62fd81f5b7adfd2cf4f7c396bea31539fe5463382b7d56702b54ddb86
diff --git a/dev-python/robotframework-sshlibrary/metadata.xml b/dev-python/robotframework-sshlibrary/metadata.xml
new file mode 100644
index 000000000000..1ab302fd90e9
--- /dev/null
+++ b/dev-python/robotframework-sshlibrary/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">robotframework/SSHLibrary</remote-id>
+    <remote-id type="pypi">robotframework-sshlibrary</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/robotframework-sshlibrary/robotframework-sshlibrary-2.1.3.ebuild b/dev-python/robotframework-sshlibrary/robotframework-sshlibrary-2.1.3.ebuild
new file mode 100644
index 000000000000..fa8b1594e106
--- /dev/null
+++ b/dev-python/robotframework-sshlibrary/robotframework-sshlibrary-2.1.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A test library for Robot Framework that enables SSH and SFTP"
+HOMEPAGE="https://github.com/robotframework/SSHLibrary https://pypi.python.org/pypi/robotframework-sshlibrary/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/paramiko-1.8.0[${PYTHON_USEDEP}]
+	dev-python/robotframework[${PYTHON_USEDEP}]"
diff --git a/dev-python/robotframework/Manifest b/dev-python/robotframework/Manifest
new file mode 100644
index 000000000000..548f9f520a17
--- /dev/null
+++ b/dev-python/robotframework/Manifest
@@ -0,0 +1,5 @@
+DIST robotframework-3.0.2.tar.gz 440465 SHA256 2018f233568227f9af8c366f93e243a157b742f3baf5b649ecc9750ac0ee1ff7 SHA512 b03fb3db627fd6b598615989c09e213cf79cbc7dbe7a08087c483dcc688f45782d54b9f1fa45206fc5adc43db9f2d862ac8f96c0b5f209ada1e09e5506171b4a WHIRLPOOL a1b8272fa202aa67285b1858256700cb7a197e319d173e80bd31e3228b173dbf1b3159a083c8326da6c7022f2c70028413ac36b714b815e4d11f83cb38c4f7cd
+EBUILD robotframework-3.0.2.ebuild 455 SHA256 0ab720cd5531ee8ef8e717a9f55a25f84922f2b751c9c5e1cf676855b7853650 SHA512 51709fd9033907877775e3dff2766d580c1eb814ba77e606f71b9b192989ccc31d572cead37fb71fd6a66ac41fd6c2f908d0ec0ecd54836ac83f36c4d658896a WHIRLPOOL 3d9c9dbcc79af739eb3779aaace550e043650bc5969ff3eddcb62a739b23206f6ba41bce6ee63e5970d63bbac2ffe64093bbf3834cfc68bcf62be9a212eb42f0
+MISC ChangeLog 3127 SHA256 9d25a4434bbbb81acf1e5d3546ee336fa243e9331d815b66ad0e0579cd556819 SHA512 384e79ec1c13425385649446d29ce72f5f9da6a3028aaa64121485077f7e2fe8c638d85e053346352db003b8b1e73b84f4969dcd707621d596c5c824986df6f8 WHIRLPOOL f6659a88c394822b2d4220b5beafc10e16621faa050f33adad0cd5ee2f9f0256d9a1d9911c4d0971118180aaf380ff3dcc39781121c5b723fd50350193293c50
+MISC ChangeLog-2015 1988 SHA256 5db1f99e67b6e66c283ef515300c315e0f359906c365b3504f25366b176556ec SHA512 d62f8341322a5d8b55c26c5b57e1ca0e4a29b2b7eac1d9a319af2e1533ea29e9b289bd63414ca523da121bfce56cc6b56c046d41594815f43b5fad1e75e0ad3f WHIRLPOOL 7f4732b55cb3e479bdbf4ec056b5ef63640f6752f8b414cc4333958282ac926b1ff4f3f41deb11fb773ffa719b8e3807a7a5b3a41025f35852b9aa6eec359829
+MISC metadata.xml 398 SHA256 cc1d4e1db25ad264d5701a55702cca343da99a8bdb9428cb53387f1908184b9d SHA512 dda41087fdeca9037dc39e9ad88a5b7e4ac8472d029a295fa5bab73a189a05ce70b0334d56fd1b45d45d1120fee2af16114c1bf5721b891df53d2a13d470d9d0 WHIRLPOOL 3aced4f1c3a97f07ce6af20050f839b06dc686b7fedae1349b5075df0e51515ce28eb7f7e739da38bbfba1414bb8b0ce06170d0f501a90ac8bbac157f9ad0df2
diff --git a/dev-python/robotframework/metadata.xml b/dev-python/robotframework/metadata.xml
new file mode 100644
index 000000000000..1fe8689d18e6
--- /dev/null
+++ b/dev-python/robotframework/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">robotframework/robotframework</remote-id>
+    <remote-id type="pypi">robotframework</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/robotframework/robotframework-3.0.2.ebuild b/dev-python/robotframework/robotframework-3.0.2.ebuild
new file mode 100644
index 000000000000..ed5213cebb20
--- /dev/null
+++ b/dev-python/robotframework/robotframework-3.0.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# py2 only
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Test automation framework for acceptance testing & test-driven development"
+HOMEPAGE="http://robotframework.org/ https://pypi.python.org/pypi/robotframework/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/roman/Manifest b/dev-python/roman/Manifest
new file mode 100644
index 000000000000..4d7d51a6cef2
--- /dev/null
+++ b/dev-python/roman/Manifest
@@ -0,0 +1,5 @@
+DIST roman-2.0.0.zip 7590 SHA256 90e83b512b44dd7fc83d67eb45aa5eb707df623e6fc6e66e7f273abd4b2613ae SHA512 d62a95e835232821dbf7a81d0c6b7df63f18c4116cfc7eee0c691a0b31d3d7b69d2dc2e4ea26e0a169a8e24bf080e8bb1e195b853be4adf1491335a5b4d5702c WHIRLPOOL 04a0344a9443597b11a052d98c2d552cbb0d2818cc6b7fdef2e352053a5427b101357837b5128a6fa98765e0f0f708305292b0836a213d02f6f34d31e9538f0d
+EBUILD roman-2.0.0.ebuild 621 SHA256 1136f9a940b190d919651a4225441619cc0cb17ff632b040df57df3db8059b5b SHA512 9b9abbf50565a05239213e94037a7a0e6270a4d00ce81d7202a680af83e7c690b34c475fbdae81c1bb6db6a6292c634dd18c3bb6eb549fbfae2e4255d2368e07 WHIRLPOOL 04f75523594b597d1630feb15f6890c7f814431ea2aa30c8c44206a23eebdd1e3f3eda7c388c62d18a2612df3ee38cf0d85de831f2586bd1bdaad16479e2d696
+MISC ChangeLog 2800 SHA256 c8ed83771aaa3b444f17302b02f6d9ef477832f0150a99a5a4170e9200de9355 SHA512 78f7662a5c33da1f4407f3988328a9a135ed29000c6be26c87d03cd92b1150d9ab937c06c9351a71668a937a425fda9370747e80ac3a6e3ed1ab1f715b8b2fe6 WHIRLPOOL 9fc223cde085c13637b26e710888e8f3b908d2648bd22d057abd6ca0c9c669c35cda537e48321391d9d2eb905d29abdb33b0fa58c9631b3d5b163b5a4cff778c
+MISC ChangeLog-2015 1521 SHA256 a950128377513d6efc0b3d8ca96ea015817f2528e51d95c3f224b53963a7d542 SHA512 2e773c4dc080d6e500dc11d1b186c4b9f8963d1362980421bdaf951bd5d312a55fa7cee4d29a64a8addf56aa8c6638eb4475afc8f99537b6e079243fa677f250 WHIRLPOOL 1a75228e210e25062bc2e1bc5155dc11ffd2021f8ac5a121c83c55cbefdafe915e98aafae43a6207b385a4f5eaabfc5850863c1543bd19d82136459f46ffb721
+MISC metadata.xml 318 SHA256 371ad0d1e5a8ee92d2f5ac841cd7ad39bc40f55c57c03155e10df2e0a6c758ce SHA512 a2e3ce30465809bbac2a6684207eb0290787a1e2eafebb457a6754e474340f75208dd269f7d89f2fdf25a3529340310acc9c220feaa1be40fe688a177b2741f0 WHIRLPOOL 6ebf6335be3c5da4ea15da5f8daaa8b63f65663ce4b2a797cca9c2af4485ebb503ad2585b8c970d0f5bbeba071c04cb1865977ae65b0366dab323fd69099ada8
diff --git a/dev-python/roman/metadata.xml b/dev-python/roman/metadata.xml
new file mode 100644
index 000000000000..dbdf422c9195
--- /dev/null
+++ b/dev-python/roman/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">roman</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/roman/roman-2.0.0.ebuild b/dev-python/roman/roman-2.0.0.ebuild
new file mode 100644
index 000000000000..355a44916938
--- /dev/null
+++ b/dev-python/roman/roman-2.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="An Integer to Roman numerals converter"
+HOMEPAGE="https://pypi.python.org/pypi/roman/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="!<dev-python/docutils-0.9[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	app-arch/unzip"
+
+python_test() {
+	cp "${S}/src/tests.py" . || die "copying test file failed"
+	esetup.py test
+}
diff --git a/dev-python/root_numpy/Manifest b/dev-python/root_numpy/Manifest
new file mode 100644
index 000000000000..6b0994ebca18
--- /dev/null
+++ b/dev-python/root_numpy/Manifest
@@ -0,0 +1,11 @@
+DIST root_numpy-3.2.0.tar.gz 316240 SHA256 ff64ebd9c4b8e99703bed8541bbd5f69742da0e442f8ab0833319252a0bf8006 SHA512 da08a33eeb225a57053eafc6247e55fec8c56e231455c255d71d3adfb6119d35d0b41fcf54d5d99690743a525e9d5ecfcde7efe53fb0551e38affa10e336485f WHIRLPOOL d0a105dcc4c03f33d3683fcdebcf8d140e9a6b6ea4fa7f7fcf4773b03dffd4972ff571aeb8c6e85caea09cc4df0fe3e73c9853d980cb0fe944dd7255e07a2e7e
+DIST root_numpy-3.3.0.tar.gz 359688 SHA256 f658bdecada912aed0b92ea84a2e5a64660b28f1476c2387d1e208237da34e5a SHA512 97a75ed46cdb25ff6f7c680c359cc84cf1a9b0f6204d5ee9e7cf0d1bd0847910be7d0599e9a38df42593c56842d7cf6ecd982c2f3620db5c9162442af59c1acb WHIRLPOOL f03a0cf935e4e3ca55cc1d8752e29a5477f4e13972caa3cbfd09ef6902bf059d592af381d232a100cd3e25453def6e8b2530a0f5cb29333d5523d0159b315f7d
+DIST root_numpy-3.3.1.tar.gz 361107 SHA256 932de8dea0d1586fe73c07b1a0859032cce4cd122a96c2aa5f4a0d55b8d47097 SHA512 5fe0340c8e0550492b97bde0a75bef4c3b5a302d61090f79e2858b9adf93e0b522dba341a3fb60ca6557d033c429f6c93c1330caf38568a6060ad41e664063e9 WHIRLPOOL 65507c731a53bbc7617a44e2cebb2b6ca11127b6c05d11998b04360fa32ff1cd9f6716bd391331dfdb97307bef08f72bfadf7b65bdc216a8a3090cf505d8a1e6
+DIST root_numpy-4.4.0.tar.gz 441522 SHA256 91a153de18cb0b364cd796db5756181987eaf67845356191a39543c0ca1e9ad5 SHA512 24afa043e4bdaa74412c36ff90ee8c1fc411801d9dc394ab5036035924910a7f4f304c5c90f4c5f389aaee9dda07b0b7e25566e68c4da424f1b4d59e6184f5b2 WHIRLPOOL 2bee9256663db1be4b2794221ccf0d7e36ec376b411e1127d9ccebbb3f229dc6c378f48293523fa01ddec131d3b9b318b24ce1a98efc9c3de98cfdd7fbec524a
+EBUILD root_numpy-3.2.0.ebuild 792 SHA256 ea18dc1186335776d0df549133a9c2c45d5a2908a3772c698d35c0d3947a0f61 SHA512 468baef03b8c334c772e34c88501457357a5f16bbed3db5b3122057565d1a80503a21ee435a9ea82ceb0e4cf9961b5f8e62dfcfb72e4adf06d3f48778d0b1c52 WHIRLPOOL 5fda0f887501a1cec5b72ab04183542c213718532af4354a20145cc58d5d09fefba6836c41b56ba27b5d85f6a4acf03497666fb42c98b97cc1e35a6e19c713f4
+EBUILD root_numpy-3.3.0.ebuild 792 SHA256 ea18dc1186335776d0df549133a9c2c45d5a2908a3772c698d35c0d3947a0f61 SHA512 468baef03b8c334c772e34c88501457357a5f16bbed3db5b3122057565d1a80503a21ee435a9ea82ceb0e4cf9961b5f8e62dfcfb72e4adf06d3f48778d0b1c52 WHIRLPOOL 5fda0f887501a1cec5b72ab04183542c213718532af4354a20145cc58d5d09fefba6836c41b56ba27b5d85f6a4acf03497666fb42c98b97cc1e35a6e19c713f4
+EBUILD root_numpy-3.3.1.ebuild 792 SHA256 ea18dc1186335776d0df549133a9c2c45d5a2908a3772c698d35c0d3947a0f61 SHA512 468baef03b8c334c772e34c88501457357a5f16bbed3db5b3122057565d1a80503a21ee435a9ea82ceb0e4cf9961b5f8e62dfcfb72e4adf06d3f48778d0b1c52 WHIRLPOOL 5fda0f887501a1cec5b72ab04183542c213718532af4354a20145cc58d5d09fefba6836c41b56ba27b5d85f6a4acf03497666fb42c98b97cc1e35a6e19c713f4
+EBUILD root_numpy-4.4.0.ebuild 792 SHA256 ea18dc1186335776d0df549133a9c2c45d5a2908a3772c698d35c0d3947a0f61 SHA512 468baef03b8c334c772e34c88501457357a5f16bbed3db5b3122057565d1a80503a21ee435a9ea82ceb0e4cf9961b5f8e62dfcfb72e4adf06d3f48778d0b1c52 WHIRLPOOL 5fda0f887501a1cec5b72ab04183542c213718532af4354a20145cc58d5d09fefba6836c41b56ba27b5d85f6a4acf03497666fb42c98b97cc1e35a6e19c713f4
+MISC ChangeLog 2721 SHA256 c4b8db3f489f277d58c10d74dd2b4ed2bb15e139f5755b54131b3ec6732dc92f SHA512 a500c66d3a7e794171100cfd84a1e7c5b763524ae6bb53b41a8ac2649f82c9fd805946a9e6a43543f4244c3c8612b1f388b1af30f80e21c98f1f1072581419cf WHIRLPOOL e2deee5aadd1e6c660403e7a78c9b952dcaebdf449865be47d276f0e78d18b9020955114566bab9e7c5a7488b96f652f1a312196ec1e6258bd264603fb002095
+MISC ChangeLog-2015 1376 SHA256 f08b8424754ee09e1f924de67171102d987e0fc47e3703f731c5d10ab2551868 SHA512 634e9db06394e337aa877df85a9a3ef0b248167d8f7612a17d226501c868f0957d4677d8857a684860a13ce6d0b07bd1cb76a5a48b73b20a58aa386caad79870 WHIRLPOOL a27cc877a11275396d40587546bc87a6fe78f72ab7541d3339bd7d4cd6525ea249a25f4e1559322a6e6d11fe3c0a06e166d528dcb48c3a46fe128fb1bef3704a
+MISC metadata.xml 898 SHA256 2d4ec2f90a6e447ca38f76ea54694b2d7e28f03fa2b57c2e1970d603bf4abba2 SHA512 f013cc8dfb3cb8887bb87195d69c765c39262b4d71fbf92bb46a39915b609469a351efc31e130b313bd8379b2a3c41b5927bcd86be5cad8933acf282fad20cb7 WHIRLPOOL 07d9ae0fd119ff6096ce09d628374946aa814857095d83e1166e6ef3fb9a11e413a32fb147cf7726088b9ed6ba9215b1cadad03b70f16aaacb800dcba444505f
diff --git a/dev-python/root_numpy/metadata.xml b/dev-python/root_numpy/metadata.xml
new file mode 100644
index 000000000000..07c071353ab4
--- /dev/null
+++ b/dev-python/root_numpy/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="project">
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  root_numpy is a Python extension for converting ROOT TTrees into
+  NumPy recarrays or structured arrays. With the core internals
+  written in C++, root_numpy can efficiently handle large amounts of
+  data (limited only by the available memory). 
+  Now that your ROOT data is in NumPy form, you can make use of the many
+  powerful scientific Python packages or perform quick exploratory data
+  analysis in interactive environments like IPython.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">root_numpy</remote-id>
+    <remote-id type="github">rootpy/root_numpy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/root_numpy/root_numpy-3.2.0.ebuild b/dev-python/root_numpy/root_numpy-3.2.0.ebuild
new file mode 100644
index 000000000000..c472f85d8226
--- /dev/null
+++ b/dev-python/root_numpy/root_numpy-3.2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Interface between ROOT and numpy"
+HOMEPAGE="https://github.com/rootpy/root_numpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-physics/root[python,${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	nosetests -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( tutorial/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/root_numpy/root_numpy-3.3.0.ebuild b/dev-python/root_numpy/root_numpy-3.3.0.ebuild
new file mode 100644
index 000000000000..c472f85d8226
--- /dev/null
+++ b/dev-python/root_numpy/root_numpy-3.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Interface between ROOT and numpy"
+HOMEPAGE="https://github.com/rootpy/root_numpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-physics/root[python,${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	nosetests -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( tutorial/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/root_numpy/root_numpy-3.3.1.ebuild b/dev-python/root_numpy/root_numpy-3.3.1.ebuild
new file mode 100644
index 000000000000..c472f85d8226
--- /dev/null
+++ b/dev-python/root_numpy/root_numpy-3.3.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Interface between ROOT and numpy"
+HOMEPAGE="https://github.com/rootpy/root_numpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-physics/root[python,${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	nosetests -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( tutorial/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/root_numpy/root_numpy-4.4.0.ebuild b/dev-python/root_numpy/root_numpy-4.4.0.ebuild
new file mode 100644
index 000000000000..c472f85d8226
--- /dev/null
+++ b/dev-python/root_numpy/root_numpy-4.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Interface between ROOT and numpy"
+HOMEPAGE="https://github.com/rootpy/root_numpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-physics/root[python,${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	nosetests -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( tutorial/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rootpy/Manifest b/dev-python/rootpy/Manifest
new file mode 100644
index 000000000000..9ae34cf897d1
--- /dev/null
+++ b/dev-python/rootpy/Manifest
@@ -0,0 +1,9 @@
+DIST rootpy-0.7.1.tar.gz 305412 SHA256 d36399125ed8540b9a651e7b5c7ddeba686ef3107830d3d6d840cdae4834751c SHA512 460e5d79da08c141c762a5a92cf50694fe1fee8677a2439b5525b67e7d6a1a6af18a4e6dc91d379b394a97dc973da8f6baa534d46e506e0a7a4d0ee632de1a2a WHIRLPOOL d9663274a36c490bb4c872be83527d3dd414d9cca989cf20a2aca1ac5441532c9b29571d0ff885458fd2e820dc7905a679e1c9873305848ccd1fafa7820a84be
+DIST rootpy-0.8.0.tar.gz 415826 SHA256 ec0fc969101b6208e722bb9ae11dfe4a02ea53f8f91f591a5c2ea46f26581948 SHA512 0b9dc9c5bee263a2eb33b464bd96f4f9d0820a03722ca2fe3ccfaf11786caf7ccd6d25ffe4ffd42c4a5481bd3b33576cfbf68c01f2af7a981f6a2c1bedc514e2 WHIRLPOOL 7036db8d78c543259801557ebfd940cec7a3083c21757374cf5464a420643cd95cbadc898fe644181cbaa072587a0e49bd56f74f76a8670636604a32da14ddb4
+DIST rootpy-0.8.3.tar.gz 417400 SHA256 1fac940e1a22f37573db8b83040cf5517464e48c1ef5700a4a651425345c0993 SHA512 b1d3c17fb0a6dfe36bdf3d9a345fc55af8a102d33433c951581f9a61babf377fabb1ae486c78b2d4654cbc7320de122fb3075f27a1565655a3dc17c2b4f56df6 WHIRLPOOL a2f37284270c501715139117071a582c250290d7681bf1274862e364b472a0c04df56ec6d61b9ffcc7f1f0ce5ac8d0bd74f83a5607a929f8fe7de60d572010ea
+EBUILD rootpy-0.7.1.ebuild 1062 SHA256 6cc5dbe14442917adfd644be11b8e874cc7522dd9772d34ab253f2362f9a66b1 SHA512 cf5569fc918bfadcdc03f7960d5ecff8414e553b1b7e908ce0b0d96574f7b5eff2549516a41428e2fbfddde2dec405e75162355e9b4ef3a6f09ebe9a6d5e6acd WHIRLPOOL c9ac535cbca6d00cc18d789f493c81bd0cebe343e06faec53c4dd9bf5304ba59cd3c866ec08dc1f174d3b3e6d381cd413021d1f2fefd0882ef280c4778221cbe
+EBUILD rootpy-0.8.0.ebuild 1062 SHA256 6cc5dbe14442917adfd644be11b8e874cc7522dd9772d34ab253f2362f9a66b1 SHA512 cf5569fc918bfadcdc03f7960d5ecff8414e553b1b7e908ce0b0d96574f7b5eff2549516a41428e2fbfddde2dec405e75162355e9b4ef3a6f09ebe9a6d5e6acd WHIRLPOOL c9ac535cbca6d00cc18d789f493c81bd0cebe343e06faec53c4dd9bf5304ba59cd3c866ec08dc1f174d3b3e6d381cd413021d1f2fefd0882ef280c4778221cbe
+EBUILD rootpy-0.8.3.ebuild 1062 SHA256 675a13e49de134bdbae8126b704eee3f40ace6a3b7a346cda9490f9aaa2e8a79 SHA512 16c48103cdb703323a87757396e731abef22238dd40103ea4e389a5c07e8dc27e20527b5cf58bd5eba1d7bdc1e85249fe76c92eb01774f11f8f08fb99679822e WHIRLPOOL d980e29f7695ba819a7b914bf2e4bc0257f2ce9fc935f106a676a0450654c060a2f8a2a8ac73a76cdc1c384caf5f2734846dd7575f290d40a3f72a5aa856bc7f
+MISC ChangeLog 2739 SHA256 44cfd328cedc992ff21d9ecbdacd928feda815a7e4213bd07eafb63d6d9069ef SHA512 adecbb2ecc50648e0ded56f4b7a74585495f764eb0f0e46477f6aa3076c41f8745e480d7d4cda85596aace5f611ef92e26f3fff320aa582f0ec8838ab3ef7b84 WHIRLPOOL bad312a7143c4fc3cadd086284a868ca95fd8b2e59cab01146e33863f13cf5cc5992e342729479e75425f035a078e315486f4de4e217f63d1a4a3f3d3964ec62
+MISC ChangeLog-2015 693 SHA256 218090d7a73c010916f8f5b54c084c96a85b75ecf3c3fddba63c8ecce1b58d76 SHA512 827d2301ae75878c7147425cf28b1726ae8111db0e5e43f02a91596d6b33d696060d5f76e5a5c66e907f468b29051d4c6f1029ad665f37e26502b64305a1d62d WHIRLPOOL 4e7521d2dbed39db6819ee5c9cfe4c6ce9f193cffbb4fd8d50356435e6a2127a0da28d499bfc2b92e41d58ff5bc998a292888dd28d91c99f66cde3142ce247e0
+MISC metadata.xml 525 SHA256 8277c243c4ee86963cfa963c6455e3c8df66d215f5e86468b1623d46dd080dd8 SHA512 6987f42215b8a3160a7e292499f63e26c05c8ffef69f7ade03fb4b539fb0116f14d7204602264e237d5c4e75436794770061c4d0d508072c06e24c1eec500094 WHIRLPOOL a37e915d99d9853c42c7d321affe94cd48fec6a5a0473c161cf0ea2ba948a2fb9c5c894fcebb9495020b02c54eb78a3f64500e8c3c6fd684589551c85fe1e87a
diff --git a/dev-python/rootpy/metadata.xml b/dev-python/rootpy/metadata.xml
new file mode 100644
index 000000000000..3728d7ab174f
--- /dev/null
+++ b/dev-python/rootpy/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>sci-physics@gentoo.org</email>
+  <name>Gentoo Physics Project</name>
+</maintainer>
+<longdescription lang="en">
+  The rootpy project is a community-driven initiative aiming to provide
+  a more pythonic interface with ROOT on top of the existing PyROOT
+  bindings.
+</longdescription>
+<upstream>
+  <remote-id type="pypi">rootpy</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/rootpy/rootpy-0.7.1.ebuild b/dev-python/rootpy/rootpy-0.7.1.ebuild
new file mode 100644
index 000000000000..c9c51ee65cbd
--- /dev/null
+++ b/dev-python/rootpy/rootpy-0.7.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="readline"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Pythonic layer on top of the ROOT framework's PyROOT bindings"
+HOMEPAGE="http://rootpy.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND="
+	sci-physics/root[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pytables[${PYTHON_USEDEP}]
+	dev-python/root_numpy[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]"
+
+DEPEND="
+	sci-physics/root[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+# TOFIX: tests go in an infinite loop error
+RESTRICT=test
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	nosetests -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/rootpy/rootpy-0.8.0.ebuild b/dev-python/rootpy/rootpy-0.8.0.ebuild
new file mode 100644
index 000000000000..c9c51ee65cbd
--- /dev/null
+++ b/dev-python/rootpy/rootpy-0.8.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="readline"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Pythonic layer on top of the ROOT framework's PyROOT bindings"
+HOMEPAGE="http://rootpy.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND="
+	sci-physics/root[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pytables[${PYTHON_USEDEP}]
+	dev-python/root_numpy[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]"
+
+DEPEND="
+	sci-physics/root[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+# TOFIX: tests go in an infinite loop error
+RESTRICT=test
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	nosetests -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/rootpy/rootpy-0.8.3.ebuild b/dev-python/rootpy/rootpy-0.8.3.ebuild
new file mode 100644
index 000000000000..9823bde1b34e
--- /dev/null
+++ b/dev-python/rootpy/rootpy-0.8.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="readline"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Pythonic layer on top of the ROOT framework's PyROOT bindings"
+HOMEPAGE="http://rootpy.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND="
+	sci-physics/root[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pytables[${PYTHON_USEDEP}]
+	dev-python/root_numpy[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]"
+
+DEPEND="
+	sci-physics/root[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+# TOFIX: tests go in an infinite loop error
+RESTRICT=test
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	nosetests -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
new file mode 100644
index 000000000000..b65e07baef71
--- /dev/null
+++ b/dev-python/rope/Manifest
@@ -0,0 +1,10 @@
+AUX rope-0.10.3-doc-syntax-errors.patch 1207 SHA256 abd2d6c38f5464fd532b7f3c36cbd1a5557cceadc4912e8aa8f7115079bc6248 SHA512 6bf617e20ef8810496b92cb5e55240622ea7285c435b090254cd9211a29f0c8d103322ed772424cdaeb528dabe1a606adea95647480fed9609e71c29584faaf3 WHIRLPOOL e4db8405bb8735a8d06ad0a50b6cc89b23e2ec787a9ecad6bbc054ae77ac3469c6d08470d82363f5ce873e1cbff44c7244522ad913825021e9b606e12d81f0e5
+DIST rope-0.10.3.tar.gz 226123 SHA256 eb45bea0abcf31a1a12ff087b990060e64244b835582ebc7642e6f7ea1fd65a2 SHA512 1d868aeebd086c3fc199316a71e61a8c46c76d85176557842051bb8f51d090f316df6bb84f766db5a46dc164d3e471eb90465805a102e46acb34e39b2b0ce8b4 WHIRLPOOL 16cd8b80f7f3fe729d1d3b4b5b98fcd5b6f16c818ddd67a9d460fe4947e768febf1425e8d20bf0e47c9d49a58b4ba1acac0e6640d61fc187f84fc843128c591d
+DIST rope-0.10.5.tar.gz 243931 SHA256 2ff6099e65798f9e27da5026cc7136b4d9b340fc817031ccb4318f61f448127f SHA512 90a055be51834cc642f06b2bbcad4419d15605393a784a414c069a43816243badcbe5fa131bac48a5899268fcbdc11292c8469d30747614b7c85eebb8f2b6fae WHIRLPOOL bafe308c6f22805256dfe6b8b7e6d11c89afeca51837fac877fd94baa8610386f9e09fd03901271705c8b2fc72754a19e394d6e8999ec6d9f6b23d4cd8791fdd
+DIST rope-0.10.7.tar.gz 244089 SHA256 a09edfd2034fd50099a67822f9bd851fbd0f4e98d3b87519f6267b60e50d80d1 SHA512 80343b8b7af883afbd04734b0fe4dbdab114301234654cbd95b3ae8be8dff40878105b7647209f5e899b981ab6a7ecb987d9bdf942b32ed083c745128c22ef95 WHIRLPOOL e002d4defc2076c9c550a8b4a27df54488a209ce8aaad769a46e25c90b73cf7263bb214f9cc0db7a577f3d81958e20f9028023d5cfd9e4a6590f3ecb40d06408
+EBUILD rope-0.10.3.ebuild 1033 SHA256 c97010e8d832ade31af1e8f3dbbd92d72cbc20fcd17fd2bc7e700504e14c6bff SHA512 78312c709aa2298027ff4a8340b5fc010d742233db9acb1715eede323c85448e96b4f65f7d506bff6374b9437fdd8fae3c8dd85264f78c4922c5ce313fcf911f WHIRLPOOL eec7cffb02385b26715102c2da7d638f8bb66ce18f3bfe9746d825acd825934e42e0a115feab3802ed21c6501ea17d416a325ed7e79eb20954914d5a9c802ff7
+EBUILD rope-0.10.5.ebuild 1043 SHA256 b7d285eebe665b5f095e9f09c3894346789cc05345f462efdf999c4a9bfa13ea SHA512 9cec94184fcbb7c65f4ccd828a4e1718f0acb5a6d769bef8723d3bec16663702ce835970b0721e230fc67a2381b02a8cd68ee6e15bd41ab4c0a0cc26fb848fc7 WHIRLPOOL 38679cbe140d4af4859e8f638978afe7f490cdc1b07ea13cf8be5664e3dd58b91b4a59ce242ef5051cbc3222d1cd7386ea6ef103f401f9988961b977c0ce1c07
+EBUILD rope-0.10.7.ebuild 1059 SHA256 4a6e3c18ee5f7903b93302d16d704960d42c09d8d6275c50baad4f4308129eb2 SHA512 c9557956594ee1b36e61ecab56155910b33e1f352431d1b6b26b653cb1593d92b975975d75089c48501b96dc4bf74ea6d89f878c495fe14b4e76bedadf533ad7 WHIRLPOOL fe184be6a2651fcae818008e4015486e1480a964d6a922dadaff4f3cc4c166ffa4d971a242097bf058390bef4f0f86686db1f749e2b11f111dfeb47c670c93f5
+MISC ChangeLog 4327 SHA256 ab6291860729e4894ffb3efbc164ef265c26182dbab150c9db572b6b7ae8ccbd SHA512 2e8c6944a4c5563bf909c4c0087e7a60be931760faf9db45841b177feb4d4fc969410af74dc64aca1cc4bb8dbdaad7e0031e761bff464adb7dfed83c69e9ac0a WHIRLPOOL 651840dd9611abb394223b7aae389df37c123fdbc43b68329dce43f88bd32555450eb76e809f6c55b4737ef8f60f582af68c3b39f76d359473bf239cbcea7124
+MISC ChangeLog-2015 3313 SHA256 20faecb2825d6d2c5fa4a4f918925be34fd2082891abebe1b596dfc7d9750ab1 SHA512 94a42d59fd0e5e6cb06f86c75e6f3f8ed981d0bcff4e7475dec0b5d3e2a08876fe407cd9428b98d8eb6484f8b5e568abf2bf6b2cb7abf7f1f4c8ad61734fe5cd WHIRLPOOL 827061a8004490ab4e352f07c4234969d4b560824f03416fb2844f13dd0ccf2c76770b4480edee35982019dfb7600d5c3b96cfeee3031438725f974ab1ee1c3c
+MISC metadata.xml 517 SHA256 c8e22cb63773abe081559391df95c6b5f23250e76fb1eaf8dfe0eef2a900ebad SHA512 6289b55677d1e26372017042042229865bad64a396952c21a7d5a1f25322c2ccfed11c0a9ea0c0896573dd1f04dc3263dc3eb28ff7b0b804c2bddf231e924630 WHIRLPOOL 046a1a34f036a4654f22d2c1ab78070fd906d05c1503afa4f190b886fcec984a8aef3a1c5e39ac7cb33bea4ed5f58f084c3b1cae8661ad02359902d645d7217b
diff --git a/dev-python/rope/files/rope-0.10.3-doc-syntax-errors.patch b/dev-python/rope/files/rope-0.10.3-doc-syntax-errors.patch
new file mode 100644
index 000000000000..f219e1bb02ad
--- /dev/null
+++ b/dev-python/rope/files/rope-0.10.3-doc-syntax-errors.patch
@@ -0,0 +1,35 @@
+# Fix syntax errors in doc files
+diff --git a/docs/contributing.rst b/docs/contributing.rst
+index c6cb8a8..9efc3cc 100644
+--- a/docs/contributing.rst
++++ b/docs/contributing.rst
+@@ -45,7 +45,7 @@ about them, don't hesitate to discuss it in the mailing list.
+ Getting Ready For Python 3.0
+ ----------------------------
+
+-Checkout http://bitbucket.org/agr/rope_py3k Mercurial_ repository.
++Checkout http://bitbucket.org/agr/rope_py3k Mercurial repository.
+ Contributions are welcome.
+
+ Write Plugins For Other IDEs
+@@ -79,7 +79,7 @@ Source Repository
+ =================
+
+ Rope uses GitHub_. The repository exists at
+-`https://github.com/python-rope/rope`_.
++`https://github.com/python-rope/rope`.
+
+
+ Submitting patches
+diff --git a/docs/library.rst b/docs/library.rst
+index 390b9c8..ee918bc 100644
+--- a/docs/library.rst
++++ b/docs/library.rst
+@@ -72,7 +72,7 @@ In rope, files and folders in a project are accessed through
+ ``Change``\s (we'll talk about them later) use resources.
+
+ There are two options for creating a ``Resource`` for a path in a project.
+-The first approach uses the `Project.get_resource()`_ method.
++The first approach uses the `Project.get_resource()` method.
+
+ .. code-block:: python
diff --git a/dev-python/rope/metadata.xml b/dev-python/rope/metadata.xml
new file mode 100644
index 000000000000..0070618315a2
--- /dev/null
+++ b/dev-python/rope/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  Rope is a python refactoring library.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">rope</remote-id>
+    <remote-id type="sourceforge">rope</remote-id>
+    <remote-id type="github">python-rope/rope</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/rope/rope-0.10.3.ebuild b/dev-python/rope/rope-0.10.3.ebuild
new file mode 100644
index 000000000000..520fe2fecc00
--- /dev/null
+++ b/dev-python/rope/rope-0.10.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python refactoring library"
+HOMEPAGE="https://github.com/python-rope/rope"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+# Dependency for docbuild documentation which is not noted in
+# setup.py, using standard docutils builds docs successfully.
+DEPEND="doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/${P}-doc-syntax-errors.patch" )
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib:." ${EPYTHON} ropetest/__init__.py
+}
+
+python_compile_all() {
+	if use doc; then
+		pushd docs > /dev/null || die
+		mkdir build || die
+		local i
+		for i in ./*.rst; do
+			rst2html.py $i > ./build/${i/rst/html} || die
+		done
+	   	popd > /dev/null || die
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rope/rope-0.10.5.ebuild b/dev-python/rope/rope-0.10.5.ebuild
new file mode 100644
index 000000000000..cc5138dba16d
--- /dev/null
+++ b/dev-python/rope/rope-0.10.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python refactoring library"
+HOMEPAGE="https://github.com/python-rope/rope"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+# Dependency for docbuild documentation which is not noted in
+# setup.py, using standard docutils builds docs successfully.
+DEPEND="doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.10.3-doc-syntax-errors.patch" )
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib:." ${EPYTHON} ropetest/__init__.py
+}
+
+python_compile_all() {
+	if use doc; then
+		pushd docs > /dev/null || die
+		mkdir build || die
+		local i
+		for i in ./*.rst; do
+			rst2html.py $i > ./build/${i/rst/html} || die
+		done
+	   	popd > /dev/null || die
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rope/rope-0.10.7.ebuild b/dev-python/rope/rope-0.10.7.ebuild
new file mode 100644
index 000000000000..88eae38207d2
--- /dev/null
+++ b/dev-python/rope/rope-0.10.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python refactoring library"
+HOMEPAGE="https://github.com/python-rope/rope"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+# Dependency for docbuild documentation which is not noted in
+# setup.py, using standard docutils builds docs successfully.
+DEPEND="doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.10.3-doc-syntax-errors.patch" )
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib:." ${EPYTHON} ropetest/__init__.py
+}
+
+python_compile_all() {
+	if use doc; then
+		pushd docs > /dev/null || die
+		mkdir build || die
+		local i
+		for i in ./*.rst; do
+			rst2html.py $i > ./build/${i/rst/html} || die
+		done
+	   	popd > /dev/null || die
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rope_py3k/Manifest b/dev-python/rope_py3k/Manifest
new file mode 100644
index 000000000000..79560e39f63b
--- /dev/null
+++ b/dev-python/rope_py3k/Manifest
@@ -0,0 +1,4 @@
+DIST rope_py3k-0.9.4-1.tar.gz 221451 SHA256 feb95047cdb9d94e59414aefce7668920e35cba6d1e3c4d4390c2888c98207fa SHA512 288009f500a6dcf9902e2ba82f0f594a9f8e4a858e5efb9c0bf5a1f2d9948162b7bfc068fc115c126852b65681e41110f0bb03c56894cf62e77ab6da80371150 WHIRLPOOL 9beb63d3d2dbaf0e02fbdae881e5d2f2ef18c01dd01c9a5d21df69079466ccc468ca79b398a4a7f69e2d46579eb48bd35919186d1023e286ecd9b8ed3edcfacf
+EBUILD rope_py3k-0.9.4.ebuild 452 SHA256 75feb9ca828056f9195cd7c065dd578428e75f18a7a289282a9cafd55d9667c6 SHA512 5cc559e78e16746aa3fb1b93e0c849f05ef53bf680586f80577edfafc0b20e59414ea8618cf2e8f0fc8a70068f407dc22c4ee99b14a0a45683d46e2134317a1c WHIRLPOOL 954014543122c5c41552115b161b24b1218b4470b84306e7f2360299c6fc36f4624ecbcb1d753baaa445d8eb522fa3c638b3a8316c457937e6852314f5f05a1e
+MISC ChangeLog 315 SHA256 123fd2ab61b9a7b533def8f41658c8447ba0f8c634418c5e4b7664ce8411b77b SHA512 b92916ee169be23f62203d8235372cc5531c4570c312f7efae91ba69117d09d7fce00e76f3ab6d850b1ede1eb7443cf0e1d244283ef33488b04550a1aa54863e WHIRLPOOL e94aa869bb0ed3ec51c814c1d4113517a720afdbf9ae305af2c0d5d94d8fe01c9f1d46b09d4be1933ed60f61bfeb3a83d4ab07ffe16defcaf435f402e779bac6
+MISC metadata.xml 471 SHA256 c9d3568668bdaa6be78993f9d454fdf02ffe12eb101aa79d01b7267a4f621c82 SHA512 4a583cfa1e8693186e2a66fa73d8ba5da5c639986e16cacb5134c28baf907ee7440835fdfd4e05beecca136badb51c1927a8b362f8f4df683d3812aedf99a68f WHIRLPOOL 0288fa556db583a1557a709efafe7cc1fcd971bf8f98410f81ec9dbee3a1e554278aebed1a5940f3d27ce82b62d98f8fca7ddc5f60b2030bffa94986efe222f0
diff --git a/dev-python/rope_py3k/metadata.xml b/dev-python/rope_py3k/metadata.xml
new file mode 100644
index 000000000000..370e851219ac
--- /dev/null
+++ b/dev-python/rope_py3k/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  Rope is a python refactoring library.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">rope_py3k</remote-id>
+    <remote-id type="github">python-rope/rope</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/rope_py3k/rope_py3k-0.9.4.ebuild b/dev-python/rope_py3k/rope_py3k-0.9.4.ebuild
new file mode 100644
index 000000000000..9b9271c7e89c
--- /dev/null
+++ b/dev-python/rope_py3k/rope_py3k-0.9.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python refactoring library"
+HOMEPAGE="https://github.com/python-rope/rope/ https://pypi.python.org/pypi/rope_py3k/"
+MY_P="${P}-1"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/ropeide/Manifest b/dev-python/ropeide/Manifest
new file mode 100644
index 000000000000..9f1d4326f863
--- /dev/null
+++ b/dev-python/ropeide/Manifest
@@ -0,0 +1,5 @@
+DIST ropeide-1.5.1.tar.gz 88289 SHA256 a590ec73f806e8409c3b53da7a6345232c9b2c0564800921f8bab61160e87a13 SHA512 fbdfc9519e49440c748c4d9fe5e8a3597b983dcee715f92ce3c9d07eb19b1792623dd3a66ee4f43790887848aa85c17b4596b006c4d1c86859c060af69c32dcb WHIRLPOOL 1efe7596c741b928a979c2aeade2df03532d438f26732f1430547739d5e44d0cae4d4d221e604e5f5464e604d7eb3fcde43e0bfbbe2895c224f2fc508faf0fc9
+EBUILD ropeide-1.5.1-r2.ebuild 610 SHA256 94a7c1b73e9b4db7de61b111f3b0afa96552c0ffc9be8084217fa2d79d1a9c10 SHA512 e77a270d44f7d5bd4bd0de8353ff03d716106069205a51cf5815652809516f3c21a76f7b9423c98469f47ed453f1bdef33cfecfa7648e62d6d66e7a8b3cf4803 WHIRLPOOL a65a3f69a9407bba95bebce75d5ae7514da82120927a550e2c381f868f657050e36f2be7997000b921b1b4b21d82f654bfd330cf3a46e3c8f4eb54f9e9746f87
+MISC ChangeLog 2581 SHA256 6b0b27bfb48a31d946018bc4588b58be1bdbeb9620662e4f8f85f79071a17d6e SHA512 f79745f4207a39dbdc829562b320efeb2f22ebcb454b380cff58a7ca279f430cb9e34317a01227bc6d00c0b913a51c5df0081fdf8de301e7f448fc2430657e01 WHIRLPOOL f2f921a88c8b2f90afee778c2954f7edda554bd0c3e2150849ae07bf2ca8e328030f936a672f09f3665a5266f74c1687899beb1f3ff4753369ee9cd9d7d2a524
+MISC ChangeLog-2015 1249 SHA256 4a4dfe48a166e155fdc230d2ff2bd33f9e69a529290f323dab315088c83aafc6 SHA512 7930357344e5652f5144fe4df4b9320e903711f67eafe796e1382a3de1ede1762e75e1b0ccbf5455dfbb0fe3751a610ce6b62719546aa27cefba99a0bbe2dd0f WHIRLPOOL d8a547bf701ac98e64a7dfeae78de0e77fe2098776cf21856578460b56336d1b4af5d5b20e5c188d5455beb3342a08317eac43bac3fadd32f432df296479b37b
+MISC metadata.xml 314 SHA256 e628cb5d87d5f26c4e70975bb9638d9d3579db607089315dc9476070b7740f69 SHA512 c24a36f613f4888cb906e98355c66e491e8b8bfd2b2bbed8c109c3530f21a9c32c77d744b15fbeb590c219e79b5235a6b62326b8b0f64bae634f35d095493e31 WHIRLPOOL d6b42bb6a111647c2292042a8e1c1c0b5871cafe0eae4cb247487577215a3bb407b55534d7377c8f75d920abe009936872bbee7993e01fb9c3c895db71a2595f
diff --git a/dev-python/ropeide/metadata.xml b/dev-python/ropeide/metadata.xml
new file mode 100644
index 000000000000..115dae5b6ac8
--- /dev/null
+++ b/dev-python/ropeide/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">rope</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ropeide/ropeide-1.5.1-r2.ebuild b/dev-python/ropeide/ropeide-1.5.1-r2.ebuild
new file mode 100644
index 000000000000..d6b7c70830e2
--- /dev/null
+++ b/dev-python/ropeide/ropeide-1.5.1-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+PYTHON_REQ_USE="tk"
+
+DESCRIPTION="Python refactoring IDE"
+HOMEPAGE="http://freecode.com/projects/ropeide https://pypi.python.org/pypi/ropeide"
+SRC_URI="mirror://sourceforge/rope/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND=">=dev-python/rope-0.8.4[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	if use doc; then
+		dodoc docs/*.txt || die "dodoc failed"
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ropemacs/Manifest b/dev-python/ropemacs/Manifest
new file mode 100644
index 000000000000..764ab18670eb
--- /dev/null
+++ b/dev-python/ropemacs/Manifest
@@ -0,0 +1,5 @@
+DIST ropemacs-0.8.tar.gz 22161 SHA256 e1ae9691d402eaa525f56d37f5fefff8b8fe9892188e49600d01063a5acb535f SHA512 3e42ce03758c13d8f6e66b69a4b9ab7620956ed0272ecf770c0cea204ffae8c85f41103b29e507db7d68d6dc006b14e6ca5ce31d8ca17b6a66bf743f1110a9b3 WHIRLPOOL 5632799ace9e3c0a40342b3d7be5da3f5763a290931a84fa464bed214cd18c2968b58ee209868e2977524b3cf9bce48fb32f0aeab0897ad9df1cac80e81f838b
+EBUILD ropemacs-0.8.ebuild 834 SHA256 aef47585e452b4a5786597e50f599116f4dfad75a6da56b160118fa45ce5f64e SHA512 6669d5bf07c2bea7f37a482f6de3d09b31326930b8fb032f4594a4fe7e48b14a93f733e78f2c57c08437e3959af2b09813f6130695d18ea5637670f8dfe45fb7 WHIRLPOOL de0ca86d4e2c928e555d03bdd5173a083160e5e5572c52dae46a3d9884887c8ed4cbade8f0b4c15347a02039941f52d8fe5321659dc8395cb1bd1a12ddacc54d
+MISC ChangeLog 3317 SHA256 bd0a0cb8675d53dfebf546e48514402a700fe0ebbe2d3f36fa7fe2f0b3831004 SHA512 e02fc1352fa688ea8b8731bb86dae518e8cc6a745e435ff49e21bbc89350d6f3849863c7fea1990650083cea37a19fbe57d1ba19c503c8c655e244b2ab5fdd09 WHIRLPOOL 69971d2f36dcf6a74c286bd607acdc3321d367501d2f63b8f5ad65d36affa456ffb46e9aa19a63a7220aa84428509b6762a5e0fa223a7d077c9849bcdf224e06
+MISC ChangeLog-2015 1030 SHA256 4680c577d70714db3d14d379fbc6274577282f5d894e73a061677130ae0db26f SHA512 891fbb660bb8afdb46be9e94155dbed6b83efdee8b084e5f74baefa3f5b3bde31baf95d9b70623a808bb0db12a012eafc6f2ffd4126ad0aa9f1354513a40b57c WHIRLPOOL da4cbb213c7aa0fff2a8338f78213e37e4e29b7eb1248fcd0565fa0f04d69aab4d4a914cb6df7048ae1cb5d83e0bfa88b9bc94b0c520f4e6390755602542715e
+MISC metadata.xml 476 SHA256 406ea91e0e09fc5f4c9adb91ad1ed5f462af9f92e44e345d5a80c855ecec72ed SHA512 2f7eb5e71660ad51be770eee8352df5995e4599d50a43f394cb1f532444fc52be98cf6cd9e6d4ccbc1f1067ac36a66e430d1eec12de68f03e3a9d96eda7e6782 WHIRLPOOL 98867dc4c308e311f14f2c8c1b80cd1212fae747faf74582b75ce54b81b4d4ba3ed3c445d66178bae9d11524fefdee01818347a8bddbcd533d16979ff616f202
diff --git a/dev-python/ropemacs/metadata.xml b/dev-python/ropemacs/metadata.xml
new file mode 100644
index 000000000000..f3a018c56488
--- /dev/null
+++ b/dev-python/ropemacs/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+</maintainer>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+  <remote-id type="pypi">ropemacs</remote-id>
+  <remote-id type="sourceforge">rope</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/ropemacs/ropemacs-0.8.ebuild b/dev-python/ropemacs/ropemacs-0.8.ebuild
new file mode 100644
index 000000000000..4413ac115e15
--- /dev/null
+++ b/dev-python/ropemacs/ropemacs-0.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils readme.gentoo
+
+DESCRIPTION="Rope in Emacs"
+HOMEPAGE="https://github.com/python-rope/ropemacs
+	https://pypi.python.org/pypi/ropemacs"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-1+"		# GPL without version
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/rope[${PYTHON_USEDEP}]
+	dev-python/ropemode[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	local DOCS="${DOCS} README.rst docs/*.rst"
+	distutils-r1_src_install
+
+	DOC_CONTENTS="In order to enable ropemacs support in Emacs, install
+		app-emacs/pymacs and add the following line to your ~/.emacs file:
+		\\n\\t(pymacs-load \"ropemacs\" \"rope-\")"
+	readme.gentoo_create_doc
+}
diff --git a/dev-python/ropemode/Manifest b/dev-python/ropemode/Manifest
new file mode 100644
index 000000000000..4f64e400d35b
--- /dev/null
+++ b/dev-python/ropemode/Manifest
@@ -0,0 +1,9 @@
+DIST ropemode-0.2.tar.gz 12268 SHA256 54b2c7b4a04b22d41aa686942dc521a89ac36fd2c7356c2707939bb97980864b SHA512 59b9a8f8caf03f480994c546b48c0be8bd85ebf44b406e216b6651e254b3fd9c6a532a5bab1be1301b12dcf756d3ad325f38e810fe5ea5bbcc700979cfbd5055 WHIRLPOOL ccf2a99abe7c3cc9634dd118f3f65f3b32a09c7f846f8314d8abcfcd15ae761b43be0fa61089ba682b62f75256bb69d54f11f8cf171cc4586295fceb3189c4f2
+DIST ropemode-0.3.tar.gz 12322 SHA256 b81637be131f549262212af5a2d337595dbf56269bebf731c3609637da8c57e5 SHA512 1cbd0bc5122cb0397aeefe471a29de6306981cd54ba753fb1a3baa880674b1a718f328017668846aa973ceb64910cf25f6b3c1df08b16637314de90a336c0feb WHIRLPOOL 4668af1467fa16ef3c5135a41d570d084a478014f96eedb54061a30e5142d3a1811b0d26223166f59be2f684022c56db60cd2705ecd3ac1da876318362721e74
+DIST ropemode-0.4.tar.gz 12846 SHA256 5710bd365a1def5fcb7d4cbe29a936c5079dac7c8d9c0ddf946d814251d126ec SHA512 b8d592b42a6cdeb73b123b94d24bbb0eedc38414b60c931c9d1a7bf3c6fc4958d2db0431f57f281987c89d3b27dd2e45701d386274024a2a79bf8183547c8489 WHIRLPOOL a99ffeba3162f1cec3329449e1556c8f6262461b68d502a6c16a98011e1e92fbdcc737234038623c4ef2b91a91c65e2ae686c78a0c557153b742a2abb64147d0
+EBUILD ropemode-0.2-r1.ebuild 550 SHA256 0a6fce79fd748f84e1d8478909657c663c7bee7b63eb328f23e2de3c6f9f486e SHA512 9a5abaee53a8544b7649b6a7772e81268af8308980aa5070798a2fec85c1e7785058b8d73ca5027fc5027dc7ae89d79da92dafd30bc7ff28fbf96a9b5d4e90d4 WHIRLPOOL 1ae0955c4213f9ff16ab9f484e4aedc5f691cdf7b1e2cecd9f5faa4e90b35fb951e7c8aced7b835420b923273e82de678688191adcae11c20b2fcfe39d11d089
+EBUILD ropemode-0.3.ebuild 552 SHA256 a5032ff9d907ccf9130f2fd701b3e6986624a95ab3b46c6d8674702f16e2cf42 SHA512 dec04bb6a0905fe5450231e5909210767c4eb8a679c3ceb5fe234a5106205632336326d70bc8c2d6c8d1d4f640ac34b1362712fd49daae6175c991f2fa27e8ab WHIRLPOOL 1c59b3c65960103dfbd48edc2bb4a1ff36e167dff09562c30d317f8fa365d08372495b56599d2ce39385634280a3c60c3c826516d1404c992c73e2aa32e476f3
+EBUILD ropemode-0.4.ebuild 769 SHA256 a386ff69edd17f3b5f42dd35fea59dcea6b9e8b1c5bb70a70aa7a40ba0200d66 SHA512 273eab2fe87343dacce2ccbfd3f10453160e61f1b0a73c8572e0fb8a883abcd0f32bdb06b938345e74527535594710a434103c698a5042973d2ca8aa43d8b02d WHIRLPOOL 6f3736d3a9ed9da2b80ad2ec9dc4498a52be2f00d884bf5476a6ddc5014f9ec7d33289ed47f806d57a10166701dbdc3e5eccc7ee6c0e71244cb262ca12bafee0
+MISC ChangeLog 2723 SHA256 7db0d050f110de56051668cfa970edefbe4e7eaf112a522103bd0fc75d5a8597 SHA512 639fe4fdb57e191b1a37947f780cc7c0031ec4b6595368b45550f41d63a8db48b59deb4471ece597b4b44b430b4e04cf7858b477581c5470d2a87331772656dc WHIRLPOOL d27a37f37c279603290aed5d0c8c9a2cf3a516e47cdb0be5f2703e1ad27647ba29692dcb146c0b65ea613d81f477ddf6b5ad1fadef906abb65391cfd45e867b6
+MISC ChangeLog-2015 1108 SHA256 c063c91255524924954343a0461fdc3c98711c836a3bcfc5adc36cc05f4c9167 SHA512 07274d8992bcbf4051392c3a275c78304d418a1d52ba059f6a0f24bd500cfbd5f765654556dd17e9e5e219a1d00e79597748c6186ab55b516e7aeff533b962e4 WHIRLPOOL d40660fa3555aab4c7b111a279fe1438a701b77d8d6523f8af626746668331acbf445c1ff90637f534cffa1cea421c60b0a450054b3b8008284219a722d31988
+MISC metadata.xml 311 SHA256 31e9a083fe82e013137df35322ec6a8aa1ca206e283b7c0bc7c08df414b895ab SHA512 8c8dc80268b8e455abdd3d991500daf13ddf3c1ade4881b8023768b0c6fc0e7be8eb32a8f74a368c9664bcc24153a049362960ef74ab39e82def51248a120ca0 WHIRLPOOL 0b5cb7c3dffb05e3d67bc1064885dbb5bec668f802635cc373724ee9c1dddcb9358d76b6c1bfe4111ae3acefdb88e83f42da5e207171f3021cf97dac7ab61687
diff --git a/dev-python/ropemode/metadata.xml b/dev-python/ropemode/metadata.xml
new file mode 100644
index 000000000000..5aa7fe424b21
--- /dev/null
+++ b/dev-python/ropemode/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ropemode</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ropemode/ropemode-0.2-r1.ebuild b/dev-python/ropemode/ropemode-0.2-r1.ebuild
new file mode 100644
index 000000000000..418e7e7201c4
--- /dev/null
+++ b/dev-python/ropemode/ropemode-0.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P="${P/_rc/-rc}"
+
+DESCRIPTION="A helper for using rope refactoring library in IDEs"
+HOMEPAGE="https://pypi.python.org/pypi/ropemode"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-python/rope-0.9.2[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/ropemode/ropemode-0.3.ebuild b/dev-python/ropemode/ropemode-0.3.ebuild
new file mode 100644
index 000000000000..a702e0f74eb5
--- /dev/null
+++ b/dev-python/ropemode/ropemode-0.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P="${P/_rc/-rc}"
+
+DESCRIPTION="A helper for using rope refactoring library in IDEs"
+HOMEPAGE="https://pypi.python.org/pypi/ropemode"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/rope-0.9.2[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/ropemode/ropemode-0.4.ebuild b/dev-python/ropemode/ropemode-0.4.ebuild
new file mode 100644
index 000000000000..33e4385c3ad3
--- /dev/null
+++ b/dev-python/ropemode/ropemode-0.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A helper for using rope refactoring library in IDEs"
+HOMEPAGE="https://github.com/python-rope/ropemode https://pypi.python.org/pypi/ropemode"
+SRC_URI="https://github.com/python-rope/ropemode/archive/${PV}.tar.gz -> ${P}.tar.gz"
+# pypi releases don't include tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/rope-0.9.4[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" ropemodetest.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/rosdistro/Manifest b/dev-python/rosdistro/Manifest
new file mode 100644
index 000000000000..e4c625a24293
--- /dev/null
+++ b/dev-python/rosdistro/Manifest
@@ -0,0 +1,7 @@
+DIST rosdistro-0.6.1.tar.gz 48699 SHA256 51c9a3a5ff4931310c6c7cf5a23a2c64b2432ed9154a159a9ca3ce55c608600f SHA512 9f7c9eea737da443b1daaacde6bcea163ac2ffc707efb23016fe77c68423ee192e0610b9aa1c8a4b07735d1784e30a509dc78cf256061fcc4de75ed4c4244f75 WHIRLPOOL 3dca25a0cd68efa41e21d71d1528213f9ca54719ea3b1dc3cb8e90b6a932d98d97874d4cf6ef3630f3413a7a15b6004bbba8e3aa72d509d11836d3a6cee79519
+DIST rosdistro-0.6.2.tar.gz 42658 SHA256 834776e7419465b23080b099ddb3b981fbe8623442ed2b446989f3fa998fb178 SHA512 df7da98a2b46d45d978bbb371ea98cf24aafa0704c1cd991db0f1b785eb3330227d42a505b765653bf11d267f676844e1043e5fcff52b7295afa1b21ffc99301 WHIRLPOOL 1e72ee793fef552e8b674e11a90d8a981a63cb109fca499d59c3e75353ffb472777e369b48cabb606d1d863e9e9d591352ac3d5d020b77c750dbbbe68840a95d
+EBUILD rosdistro-0.6.1.ebuild 999 SHA256 30ccfca6bd46263f430d1560f8a5380ca524a63c8b08b87736d7071fd7df1250 SHA512 c48867ae999fb3d5ba998d7136de9044cf370e9de08b0f69ebe8f5224db276bc9182f9fc4fe19a2207e92bbc5bf0889c4e4f790b072aa0fb50f9da856ec5c448 WHIRLPOOL 99a7e35a8a3232920b041dff2648ebf219f4ab89429a7aece10cf36035a648a28c25b02832d011d8da75e2553126db285625b108890efd1f611e89d826fcd8a9
+EBUILD rosdistro-0.6.2.ebuild 999 SHA256 30ccfca6bd46263f430d1560f8a5380ca524a63c8b08b87736d7071fd7df1250 SHA512 c48867ae999fb3d5ba998d7136de9044cf370e9de08b0f69ebe8f5224db276bc9182f9fc4fe19a2207e92bbc5bf0889c4e4f790b072aa0fb50f9da856ec5c448 WHIRLPOOL 99a7e35a8a3232920b041dff2648ebf219f4ab89429a7aece10cf36035a648a28c25b02832d011d8da75e2553126db285625b108890efd1f611e89d826fcd8a9
+EBUILD rosdistro-9999.ebuild 999 SHA256 30ccfca6bd46263f430d1560f8a5380ca524a63c8b08b87736d7071fd7df1250 SHA512 c48867ae999fb3d5ba998d7136de9044cf370e9de08b0f69ebe8f5224db276bc9182f9fc4fe19a2207e92bbc5bf0889c4e4f790b072aa0fb50f9da856ec5c448 WHIRLPOOL 99a7e35a8a3232920b041dff2648ebf219f4ab89429a7aece10cf36035a648a28c25b02832d011d8da75e2553126db285625b108890efd1f611e89d826fcd8a9
+MISC ChangeLog 3311 SHA256 ac5124263d97d6157a297dccb1c59e69d4a942228ec8acecdabd5d388d6aedb5 SHA512 99ba08df44900e02cf5a6201ba503c0933381ca248a134d6c0fa7ea1fa7198dd69e9385eeac64278ba92a78eca74def489761a852d5a43f91c8ada0b4fd05891 WHIRLPOOL 5fd6b7de08b80545fd9bb4177ee43020fcfe223d8debde75e467358885e78519279ed4df17c2e7f186c524a966958d119c35cbfaa6975eac832933f859a43cdc
+MISC metadata.xml 342 SHA256 c790122d0344d916d2f6b500daf1f3bc428f0d791d388abac238f13b20c11852 SHA512 5f55e6edbfd3be1214791b1897ce625f6cc52989ac007d7de9c9eb0bff57c1ca805ee18b911fcc2c29a86a5fb9f68e1b9647f69a38dc6b1d1d74334b35ac106d WHIRLPOOL e9d25810939089b4a1fa25fecb36980dba2bac48fd45f755165d12a101a7727c74516b00175d3484d372e936d616dad50baef2975cfbcbc1b14e234880403ea4
diff --git a/dev-python/rosdistro/metadata.xml b/dev-python/rosdistro/metadata.xml
new file mode 100644
index 000000000000..552fe0204755
--- /dev/null
+++ b/dev-python/rosdistro/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ros-infrastructure/rosdistro</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/rosdistro/rosdistro-0.6.1.ebuild b/dev-python/rosdistro/rosdistro-0.6.1.ebuild
new file mode 100644
index 000000000000..e9ccf8b2beb3
--- /dev/null
+++ b/dev-python/rosdistro/rosdistro-0.6.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdistro"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Tools to work with catkinized rosdistro files"
+HOMEPAGE="http://wiki.ros.org/rosdistro"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		https://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --with-xunit test || die
+}
diff --git a/dev-python/rosdistro/rosdistro-0.6.2.ebuild b/dev-python/rosdistro/rosdistro-0.6.2.ebuild
new file mode 100644
index 000000000000..e9ccf8b2beb3
--- /dev/null
+++ b/dev-python/rosdistro/rosdistro-0.6.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdistro"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Tools to work with catkinized rosdistro files"
+HOMEPAGE="http://wiki.ros.org/rosdistro"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		https://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --with-xunit test || die
+}
diff --git a/dev-python/rosdistro/rosdistro-9999.ebuild b/dev-python/rosdistro/rosdistro-9999.ebuild
new file mode 100644
index 000000000000..e9ccf8b2beb3
--- /dev/null
+++ b/dev-python/rosdistro/rosdistro-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdistro"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Tools to work with catkinized rosdistro files"
+HOMEPAGE="http://wiki.ros.org/rosdistro"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		https://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --with-xunit test || die
+}
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
new file mode 100644
index 000000000000..baf20d7c618f
--- /dev/null
+++ b/dev-python/rospkg/Manifest
@@ -0,0 +1,8 @@
+AUX gentoo.patch 662 SHA256 85c83188b57f605171e10240dcbf849b59c7129619c9420511c0f6fa805a9fc9 SHA512 7525f4e8809b6002000b22d6f5def37054a1bceb3d581fe01bcedd7e21dc757dd04d229e9550bfe1d2248c5804856cd9869149bea9a9ec5423e1a596c0f56153 WHIRLPOOL 3b384bbce4d26766a9a15778621a6474af70dc3b131b8a0d82826651a5a88e82ea8331bac0d3771ebd810193c115d3d8c6d0847c39786b013e770525b45b643d
+DIST rospkg-1.1.2.tar.gz 89536 SHA256 2716ecff9b08ec97f000d716a294a043527ada7e6e46586dac063ea36fce6b58 SHA512 4fcabb88e749c0b756bc7230a8e3343098b3fc35b74bb70332e4a1ffd0df80054b9220604fb168f28ad819a3201c096a9f98ba450921a774aa8400703a7e7525 WHIRLPOOL a41b70a830846678949c4bdbfa6895c3cfb1be12428292540192c683ef62e6023a4b6d4d46c35c0e4be0211beb98009b5b1ee5644f57d79a0f723bb6499d00f0
+DIST rospkg-1.1.3.tar.gz 89534 SHA256 ba0948fbb3be14082f9e83763cbe3a12857127eb78e142748c9d16d41ab4479c SHA512 2bb0521fbb87492dbc83d2582a8de3034f2e5548c1a464cfc558915157f3ef9d34d6166a4378d5e5cb226f2c8f714df86879220f7041d37b58a9ad33be2ce3cd WHIRLPOOL 77082d0927626a5350300c556fd15eceb3527ee3a64239ade75aa2758288c1835e3f7797425ea6921674cab187593ec494406717a8daa88093dea874efad95d0
+EBUILD rospkg-1.1.2.ebuild 1006 SHA256 c5034caaeced20590443ebdf5b1fd565dd245bc56616646c87e5205b32e2d690 SHA512 d81c650b250b40c58a2eb8e8fb6de4822d392121409346dba318b7c2a3844833cdfa6f661c6a57139b8b86a33de0d1e9066bb40e973a43858fb2335a540b56f4 WHIRLPOOL 0b478f904785836e55da0c5a53596e1cc388adf66846b19f575aa1e252435a49f4bb4c273f847b479706b40c30097f2aef13ff60902a752867c82bebf3a61837
+EBUILD rospkg-1.1.3.ebuild 1006 SHA256 c5034caaeced20590443ebdf5b1fd565dd245bc56616646c87e5205b32e2d690 SHA512 d81c650b250b40c58a2eb8e8fb6de4822d392121409346dba318b7c2a3844833cdfa6f661c6a57139b8b86a33de0d1e9066bb40e973a43858fb2335a540b56f4 WHIRLPOOL 0b478f904785836e55da0c5a53596e1cc388adf66846b19f575aa1e252435a49f4bb4c273f847b479706b40c30097f2aef13ff60902a752867c82bebf3a61837
+EBUILD rospkg-9999.ebuild 1006 SHA256 c5034caaeced20590443ebdf5b1fd565dd245bc56616646c87e5205b32e2d690 SHA512 d81c650b250b40c58a2eb8e8fb6de4822d392121409346dba318b7c2a3844833cdfa6f661c6a57139b8b86a33de0d1e9066bb40e973a43858fb2335a540b56f4 WHIRLPOOL 0b478f904785836e55da0c5a53596e1cc388adf66846b19f575aa1e252435a49f4bb4c273f847b479706b40c30097f2aef13ff60902a752867c82bebf3a61837
+MISC ChangeLog 3855 SHA256 636c61f28c5e0013bd5222a3a8f5650517898d095e9b30e8d38e3256241bc81e SHA512 9184674ec8e30e518fb1106f00c3780dcc1a0bfe5994db452dae6ba56752c9689c9a2814d2aa7218b19b9045a45272305b970ab0b87c15037035c040d5ba26cc WHIRLPOOL cdc5a7d3f0013ac99eb014d67a8c81ea46ea973b622f295651a06d649f956d031b35d1feb0867472b50bf111bceb62d12076ede6641691e026b61112b7d80d57
+MISC metadata.xml 339 SHA256 d82004a55dd7c03fbb548e4af6bdfa81d884e3628b7413cd4387669001193a2c SHA512 c9e10c6eecb919a284258e818a9830f6ba2afe095a9f4c565bf086855d5bbb26bf6973455c62a38ab4e20eb88da1f3d44b97597b197ca30227a7e7438a84d8a7 WHIRLPOOL f0c205f78ca65c5afc7d5dfaa82d21c68afb24575e03c6797de29874a35f96e44f498384c96430b5b352a4e740bc0e8637b8e8854306b2dab8a31214b53bc8d7
diff --git a/dev-python/rospkg/files/gentoo.patch b/dev-python/rospkg/files/gentoo.patch
new file mode 100644
index 000000000000..5a9e7738b390
--- /dev/null
+++ b/dev-python/rospkg/files/gentoo.patch
@@ -0,0 +1,15 @@
+Strip ros_packages/ from paths. ros_packages is only for avoiding to crawl the
+whole /usr but the real one in the path without it.
+
+Index: rospkg-1.1.0/src/rospkg/rospack.py
+===================================================================
+--- rospkg-1.1.0.orig/src/rospkg/rospack.py
++++ rospkg-1.1.0/src/rospkg/rospack.py
+@@ -59,6 +59,7 @@ def list_by_path(manifest_name, path, ca
+     path = os.path.abspath(path)
+     basename = os.path.basename
+     for d, dirs, files in os.walk(path, topdown=True, followlinks=True):
++        d = d.replace('ros_packages/', '')
+         if 'CATKIN_IGNORE' in files:
+             del dirs[:]
+             continue  # leaf
diff --git a/dev-python/rospkg/metadata.xml b/dev-python/rospkg/metadata.xml
new file mode 100644
index 000000000000..51380babe574
--- /dev/null
+++ b/dev-python/rospkg/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ros-infrastructure/rospkg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/rospkg/rospkg-1.1.2.ebuild b/dev-python/rospkg/rospkg-1.1.2.ebuild
new file mode 100644
index 000000000000..dff594067afb
--- /dev/null
+++ b/dev-python/rospkg/rospkg-1.1.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the ROS package system"
+HOMEPAGE="http://wiki.ros.org/rospkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+	# Needed for tests
+	S="${WORKDIR}/${PN}"
+	EGIT_CHECKOUT_DIR="${S}"
+else
+	SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+"
+PATCHES=( "${FILESDIR}/gentoo.patch" )
+
+python_test() {
+	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
+}
diff --git a/dev-python/rospkg/rospkg-1.1.3.ebuild b/dev-python/rospkg/rospkg-1.1.3.ebuild
new file mode 100644
index 000000000000..dff594067afb
--- /dev/null
+++ b/dev-python/rospkg/rospkg-1.1.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the ROS package system"
+HOMEPAGE="http://wiki.ros.org/rospkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+	# Needed for tests
+	S="${WORKDIR}/${PN}"
+	EGIT_CHECKOUT_DIR="${S}"
+else
+	SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+"
+PATCHES=( "${FILESDIR}/gentoo.patch" )
+
+python_test() {
+	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
+}
diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
new file mode 100644
index 000000000000..dff594067afb
--- /dev/null
+++ b/dev-python/rospkg/rospkg-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the ROS package system"
+HOMEPAGE="http://wiki.ros.org/rospkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+	# Needed for tests
+	S="${WORKDIR}/${PN}"
+	EGIT_CHECKOUT_DIR="${S}"
+else
+	SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+"
+PATCHES=( "${FILESDIR}/gentoo.patch" )
+
+python_test() {
+	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
+}
diff --git a/dev-python/routes/Manifest b/dev-python/routes/Manifest
new file mode 100644
index 000000000000..1d8081dfd757
--- /dev/null
+++ b/dev-python/routes/Manifest
@@ -0,0 +1,5 @@
+DIST Routes-2.4.1.tar.gz 182403 SHA256 26ee43340fca5a32769ffe0c58edcb396ccce6bc1dfa689ddf844d50877355fd SHA512 b0566f10ca83af0459e9c59fa2217bdc5ebf349d944396bcb21ffa731ad189c642e409381979cb5da3153630c24f20aa974a99711f16aca9f91413976af2bb04 WHIRLPOOL ebbc6f66befc2260c68833cc574eb76a6a1360cbcc45f3a27c9ebe718c21d37c474644ec1d5f6019213dcd018e671fb3d0321227eaa351743ad71afced12354d
+EBUILD routes-2.4.1.ebuild 1546 SHA256 7d1460fc86d373484f022cfbdc5a6a5aeb820f3103c669de285b1d4d2a6c3b2a SHA512 299f0352c1f0804fa4cd2dce22b655e4b969d09f4cc9cf49e8b5abcbe44a547e23542400718bad5b1409f49cb5be0269daa9cc698d26bf3bfc99c24af1ed44de WHIRLPOOL eaac4302e465bb051319daca85a21b9e29ee883403e2f5892e89f9065bc6f371cebb4dfebccf0bdae4b446f905f89d284c3399c3e9bb0a203d150697ee259c6e
+MISC ChangeLog 4519 SHA256 db29c66268f8f2f56121cea9cf6678a94f8e1e6ea820b7bd716e3cc0cdf15de5 SHA512 c727fab901ca98282a938e8c015320f173a202becb77572de0e32e1c9bb7e45709fa8263d9085821b8572f2bfe654b04d8345c0b7ae6ee0dea1b7fc4d81c6baf WHIRLPOOL 9b75847907eabf143ac4608fdde7e1842b6489196c34f43d10d640b6d7fd25669df231343263ae82e5ef410a1a3d6112af77b13002c3d3fa2974e5c9b9aa1295
+MISC ChangeLog-2015 4731 SHA256 aa0221359f220d10c9b431eb086f44c7dbc172bd29cafbd2e18b8eb34900dce0 SHA512 813eadc5ddf1f0966d52f323021b30704fe162da7017e57305d3d21b5f8179220a0742bb8d1cd996e80429b1da5a240cf18b53f5faa00b42dbd0af0d7c980d4e WHIRLPOOL 7d6e0f6e0492d8f950d81171343ee5d4fc3054c9d895baf6a40c3b8a794a7e4f2487b6f28f789bbd96e6da208d282abe2db7941c87278833fcd8ad41329f8505
+MISC metadata.xml 309 SHA256 f21e5c2cb88824f968bbd7d7ebe190f33457b0cd5e31e99e7c6d75b6e50eb589 SHA512 6daa7dcc2ae185c198c2630961d68c19498e98bce96ea3b1390a4c159fb591a89af796f2ac90e00994bda52c36138792797a38975c772d6fabce09cf0536722a WHIRLPOOL 7b00a58315f7ebe44a89b0282d1d57f9e6d2972329f3fe2314539128dd6db337c373e358b45a4c3a933cf5293b47f77bdbc54342e53c17bed75a8447173b3ca9
diff --git a/dev-python/routes/metadata.xml b/dev-python/routes/metadata.xml
new file mode 100644
index 000000000000..7bdfdfe972fe
--- /dev/null
+++ b/dev-python/routes/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Routes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/routes/routes-2.4.1.ebuild b/dev-python/routes/routes-2.4.1.ebuild
new file mode 100644
index 000000000000..eb06f9e027da
--- /dev/null
+++ b/dev-python/routes/routes-2.4.1.ebuild
@@ -0,0 +1,55 @@
+# 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
+
+MY_PN="Routes"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A re-implementation of Rails routes system, mapping URLs to Controllers/Actions"
+HOMEPAGE="http://routes.groovie.org https://pypi.python.org/pypi/Routes"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+RDEPEND=">=dev-python/repoze-lru-0.3[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]"
+
+# The testsuite appears to be held back by the author
+
+S="${WORKDIR}/${MY_P}"
+
+# https://github.com/bbangert/routes/issues/42 presents a patch
+# for the faulty docbuild converted to sed stmnts
+python_prepare_all() {
+	# The default theme in sphinx switched to classic from shpinx-1.3.1
+	if has_version ">=dev-python/sphinx-1.3.1"; then
+		sed -e "s:html_theme_options = {:html_theme = 'classic'\n&:" \
+			-i docs/conf.py || die
+	else
+		sed -e "s:html_theme_options = {:html_theme = 'default'\n&:" \
+			-i docs/conf.py || die
+	fi
+	sed -e "s:changes:changes\n   todo:" \
+		-i docs/index.rst || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rply/Manifest b/dev-python/rply/Manifest
new file mode 100644
index 000000000000..4820962a6f34
--- /dev/null
+++ b/dev-python/rply/Manifest
@@ -0,0 +1,5 @@
+DIST rply-0.7.4.tar.gz 27392 SHA256 5fe9fc7c24dc3cfcaf443ef84fddcf420132746e64eced79b6735e7927e80329 SHA512 e3c3a828eb4b3cb20751ecb2d91efaabddbe3702d52b9adefe1748c07c843da1899e3944bcf0ab79f627ae428b8879cf99739ea7e0c6fd1acffc4ac4dee1b652 WHIRLPOOL 5d1cf3abf224a03a6210254577f388367b41c645fe4464e27e6c3537f933c79d6d004c33765c76a307973b5afde8954266da6d9bb6e850e841b9a987cc7f2e6c
+EBUILD rply-0.7.4.ebuild 909 SHA256 749eb1d9152283099d8c72e2936870b33e21828b466dfba7a9339ba6689a46f5 SHA512 5d2f041f82e0109ab154445b7ced7d2930a93b43bfe406f3798579690837945ce164878c056f7e46138b38432709e80d91c054a9f57ff2a4e27c1df306f79bbd WHIRLPOOL 22327e078ff2ce648448fb94dea7cae142a45e6a7af8d4e8c20ae6b3090d88510912a70a8babf8d1920bd8788aedc239bf873d507d38574790637cce09006aef
+MISC ChangeLog 3156 SHA256 4f6af83b8fc571d44af7e20af472ad9aa8d189dd45afd4073102314ef6c0b362 SHA512 d4cbb76af680f3ad4c0630b313610141d04274dcd76bfe2219c4046d356ec4f40b449f7d9ec34f80cb0a216321d8dc81174d17a8be0530f83e0e4246289201b2 WHIRLPOOL e1b850de33d6a613d16ea8271ec5d8bfc4c29af085254914fd6dd87bc9f6bf2d741e2a3cb88292c13e0f29cb68d9526f65d4661cbee4e1ef0db1b8d278cd14d7
+MISC ChangeLog-2015 1322 SHA256 ea00440a0e4105a05a78bdd429c5e291fa9c1c7eb096aa875859c48c409a4b12 SHA512 b431cf54849e9cad1fef50db50f932fc0c045caf35b2da53884e57c62079f197a442bae0dd45f31fe3341c7fbf80418c93523b8355005150b17b230a568ae76e WHIRLPOOL 893a5d7faf6ee2ba85c784720c33d3e655d142459f2bc20782c7f928f88efee7e608efc063c5d5c421efc971c1fe03a9b160a84ee8c6b1fa727a9fad40e08adb
+MISC metadata.xml 324 SHA256 ea1a96108ad7c521654b1f497d4007ce8625700043bdfc53474e7a97641abfa3 SHA512 9378b0e52729cd011ed824e800aa1af7ed6b9f799de0802950dbf02eeb8dd27e356ea067a46aaa91b05d96f7ec5fc17a43c0d980b7b585fecb8220b0ddc20ba8 WHIRLPOOL e064b06d81e7c3776cf2478f34389acc497494614d0f6b0effb968074fd4c0e39ee0a273c999e1d06c046109180492e5ed4e61bdd5cf77c25b080ce65ce19a9c
diff --git a/dev-python/rply/metadata.xml b/dev-python/rply/metadata.xml
new file mode 100644
index 000000000000..a1678ef4e2d1
--- /dev/null
+++ b/dev-python/rply/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">alex/rply</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/rply/rply-0.7.4.ebuild b/dev-python/rply/rply-0.7.4.ebuild
new file mode 100644
index 000000000000..6157f84c737a
--- /dev/null
+++ b/dev-python/rply/rply-0.7.4.ebuild
@@ -0,0 +1,36 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python parser generator that also works with RPython"
+HOMEPAGE="https://github.com/alex/rply"
+SRC_URI="https://github.com/alex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/appdirs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/py[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare() {
+	# https://github.com/alex/rply/issues/26; fail under py[3-4]
+	if python_is_python3; then
+		sed -e s':test_simple:_&:' -e s':test_empty_production:_&:' \
+			-i tests/test_parsergenerator.py
+	fi
+	distutils-r1_python_prepare
+}
+
+python_test() {
+	py.test || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
new file mode 100644
index 000000000000..6cac556f2727
--- /dev/null
+++ b/dev-python/rpy/Manifest
@@ -0,0 +1,11 @@
+DIST rpy2-2.6.2.tar.gz 171655 SHA256 2e28886b2a6a138cfc057f9b7cddade253e61c9abb43f0eae20dace58b6dfced SHA512 7a060ccc26a03dc93d75edb85d92f1ab31af96ba140932ff8e699cd5855e6078b1e0ffceed135d32deb6c8f273ebcc8b02be38e9b8fc66778cc2adab5745f542 WHIRLPOOL 26d9a9c13e4efa22a232507cfff0b13d650e0528f635dfa9fe464cde50462d2d94a668d1566b537bafaa5462eb66e96005296c6295308b1e3d1c5639da2879b6
+DIST rpy2-2.8.5.tar.gz 184190 SHA256 09c63bc934d666f4ec16e74caf52eb516e035557407a93591e8da694a1718ca6 SHA512 737649bea67f0cb2a73dfedfe6f342b52bd8e73840b0da6eb64c8a61d25665d74394df6070ed67ec7a59632798e12fce05225e5c1ec5de587f1ae40ce5074b99 WHIRLPOOL 2e6c449ca766ff73a20abff12ef6df5791a77d2ca3cf5e90862700370bddf20b9b4ded65c870ef84ab840bb282d66cffc10c078a4417a8e1074dfebc7d87c421
+DIST rpy2-2.8.6.tar.gz 191192 SHA256 004d13734a7b9a85cbc1e7a93ec87df741e28db1273ab5b0d9efaac04a9c5f98 SHA512 614fd404c2bcd51a503e05bd2ea51fe39ddf20b16088496e9d9f0017ccbd06707f26341243c33669ae4ddf5b37ed748546cab9d4d23b9c26fd39319d9831dcfe WHIRLPOOL ef160afafcec1db0c337ae53882586130f8e2d33c836633fe8fbeaf83202c525f1eb46b0ea944b2ef67446809c0cd1456f22bcce107e8157ef9de4a1daefcd8c
+DIST rpy2-2.9.0.tar.gz 193062 SHA256 d1e6c109093965f717293b6c3a8d22d9c172c3721b6a8360c84572dcb284112f SHA512 55be876fb7316a08f507f3a332ed29d71b52f733c1986482f141e694d66d0e01a51a9c3f0260f6fe0086d7bfbc1f58b678cda4570665e4f1ffdb120c793ef1b2 WHIRLPOOL 44610716904ec8e1f53b65b5a3ec1d9be3f492104c7b563867e4d1ea526148e8034c84441a8bc60957e41d662b6185ccd3477fa9baa77d7344fa5e0d5bbd3635
+EBUILD rpy-2.6.2.ebuild 1273 SHA256 4fa4bb5d3093624febfd6fee69f4e1bdc2f8583cb6137641ad125597921d6ab2 SHA512 bfe2bc4a599d48b8906cf971e471e09c59248a8969f82a0873a2468cff8875dc4778056ba7e6c8ca66b8ff42d76b23e98194307bea7a5300d6e9ff1e5932314a WHIRLPOOL e8be88d645bd53442d7eb87f5287505b7822de3e2471a8e2e87ba828953abe67b86ee46058ca1e1e906c1187d6adc7fddf4ae6cefe5b394acdb20f25633056e6
+EBUILD rpy-2.8.5.ebuild 1575 SHA256 3fa4500e6d17c628fc1fbabae093f538fabd0b678faadceed704b2cb0e6e1376 SHA512 5df98a99ec5598e938ee04c3fb751b7bc1377866de075f1254bd67ac3dbfc6cbf7c5335c71cd25f13bf97d91ce01a858d20e911835eddac310e093f2483417bc WHIRLPOOL 51c5959e65787f170d150c4a7e144bb0cfd64a659b91e3a0c76a74b0cfc7cde27dd14b603ce2d295f0e289f78c5f531e13a16bbd7c36db9c795cc7be5478b826
+EBUILD rpy-2.8.6.ebuild 1210 SHA256 2f13db7e160930120d98f9b092d08d02d2d6220c2e6a813fc356ee00d4f83d7e SHA512 6ac5507969b467fc9472a93a899bc273923a634a7c973f4a5c8f6d434fb1219d994b74e5cafb8bdf591a0d0f9da99e9eb90e1a80fda78e54570da733ddd229f8 WHIRLPOOL e1c44cbab416cd831605bce1a481f9e0889bd9721c6835c258e67a52dbde1e8d378bf26b431be1f5adbef8777168ccfdf441f2b2f16ac8e6973cbb866c43007c
+EBUILD rpy-2.9.0.ebuild 1200 SHA256 74ecd12e12527437745b2278964396f4592b0e8e3803f6a40a5791ec90a979ae SHA512 bf0c0f6a4f6b74a62c077e7423eaa4dc59ebeac673be3c8669c03dee08ddd28889c57e47a85e1bd37beca755d54fc1bfa869bb3848b383d34b876beba859aa09 WHIRLPOOL abda33b08f44a5dbadcd8b3b2d5ea68a3aca2fe396c1ca865633a4fabc0ff4109a36e0fa63b11824ed3d77d51b98ea514844a15b8a707b49ede4e0ad63449440
+MISC ChangeLog 5919 SHA256 c5ebc472bc6f1b501db13d587177f34106a3995e227a018d2fbaa4101622f1cf SHA512 54a286204a012dd8ac33ac7e805add23f116e7546038fa6c1e06ecdfe1c37cc0b0e8cb5685e1eba11a1b7e55533311e6d6f243d34eaed58c878e6ee40e69b11d WHIRLPOOL 1d1f5b4190092ef2b804b8af00ee2d23e5ac5cf23c3de731fd81dda00ce735a19e50ce9086860e76d6371d7351755ecc02d9a73b26aabd28e8f64333c9ef3412
+MISC ChangeLog-2015 13757 SHA256 1e85c2794dcd7ff5e38701e87047609508b0b30d8bdb95077ed89d427f0d21af SHA512 cda6e474e5b18745e021f3e6aa2318acae35d66b995ed3ef5b068f66f71cd0de765820147905f834f908d81ac9359b851c769fab752fab295d72e9dadd645e0a WHIRLPOOL 52f8f1bd2cb481a58af2daa76c204db55a219ccf695aa546bb85452a25fd74fe130b7351a781de1b2a475253cb64a46075b43045be609757ab88735313e5d49b
+MISC metadata.xml 700 SHA256 0027523e0654823f46a21711aa14da8aa528ae2e66e85efdb606b77df52cf536 SHA512 f70b91d3a53220b814460d8836d0d04500b0c9fa62395a8264d81a8d952ec8f2090d20cfa55cd60ccd2698a947b61c6284c036abc298a9c18a7807302c15d8af WHIRLPOOL bdc7bfccf1bdec4e819c6590684bada303e7641274ee5f3b2783cce71aee5d7b55f5ff8f783c08f11966503af1a034cc385c35685d58ef80872d30b57241a95a
diff --git a/dev-python/rpy/metadata.xml b/dev-python/rpy/metadata.xml
new file mode 100644
index 000000000000..d11f5cf28f8c
--- /dev/null
+++ b/dev-python/rpy/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  RPy provides a robust Python interface to the R programming
+  language. It can manage R objects and can execute arbitrary R
+  functions. All the errors from the R language are converted to
+  Python exceptions.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">rpy2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/rpy/rpy-2.6.2.ebuild b/dev-python/rpy/rpy-2.6.2.ebuild
new file mode 100644
index 000000000000..1c4e89b019b7
--- /dev/null
+++ b/dev-python/rpy/rpy-2.6.2.ebuild
@@ -0,0 +1,51 @@
+# 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} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 flag-o-matic
+
+MYSLOT=2
+MY_PN=${PN}${MYSLOT}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the R Programming Language"
+HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-lang/R-3.1
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+# ggplot2 is an optional test dep but not in portage
+S="${WORKDIR}/${MY_P}"
+
+# Tarball absent of doc files in doc folder
+# https://bitbucket.org/rpy2/rpy2/issues/229
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	${PYTHON} -m 'rpy2.tests' || die
+}
diff --git a/dev-python/rpy/rpy-2.8.5.ebuild b/dev-python/rpy/rpy-2.8.5.ebuild
new file mode 100644
index 000000000000..46d7f73bd7b0
--- /dev/null
+++ b/dev-python/rpy/rpy-2.8.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 flag-o-matic virtualx
+
+MYSLOT=2
+MY_PN=${PN}${MYSLOT}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the R Programming Language"
+HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-lang/R-3.2
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-lang/R-3.2[X,png] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+# ggplot2 is an optional test dep but not in portage
+S="${WORKDIR}/${MY_P}"
+
+# Tarball absent of doc files in doc folder
+# https://bitbucket.org/rpy2/rpy2/issues/229
+
+python_prepare() {
+	if ! python_is_python3; then
+		# https://bitbucket.org/rpy2/rpy2/pull-requests/56
+		sed -e '1i# coding=utf-8' \
+			-i rpy/rinterface/tests/test_SexpClosure.py \
+			-i rpy/rinterface/tests/test_SexpEnvironment.py || die
+	fi
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	virtx "${EPYTHON}" -m 'rpy2.tests' || die
+}
diff --git a/dev-python/rpy/rpy-2.8.6.ebuild b/dev-python/rpy/rpy-2.8.6.ebuild
new file mode 100644
index 000000000000..860a83e5bc0e
--- /dev/null
+++ b/dev-python/rpy/rpy-2.8.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 flag-o-matic virtualx
+
+MYSLOT=2
+MY_PN=${PN}${MYSLOT}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the R Programming Language"
+HOMEPAGE="http://rpy2.bitbucket.io/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# ggplot2 is a test dep but not in portage
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-lang/R-3.2
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-lang/R-3.2[X,png] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	virtx "${EPYTHON}" -m 'rpy2.tests' || die
+}
diff --git a/dev-python/rpy/rpy-2.9.0.ebuild b/dev-python/rpy/rpy-2.9.0.ebuild
new file mode 100644
index 000000000000..5e0640091ccb
--- /dev/null
+++ b/dev-python/rpy/rpy-2.9.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 flag-o-matic virtualx
+
+MYSLOT=2
+MY_PN=${PN}${MYSLOT}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the R Programming Language"
+HOMEPAGE="http://rpy2.bitbucket.io/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# ggplot2 is a test dep but not in portage
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-lang/R-3.2
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-lang/R-3.2[X,png] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	virtx "${EPYTHON}" -m 'rpy2.tests' || die
+}
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
new file mode 100644
index 000000000000..1ec32f822e0d
--- /dev/null
+++ b/dev-python/rpyc/Manifest
@@ -0,0 +1,6 @@
+DIST rpyc-3.3.0.tar.gz 53541 SHA256 43fa845314f0bf442f5f5fab15bb1d1b5fe2011a8fc603f92d8022575cef8b4b SHA512 c586ab79d2ab3a8e14128c7ac5ae49a3311de0723453f801edb805819b06037ae015825fda32ac7620d99fdeceacbcbc5d1b4fadc3c7b2ac778e883ba9406793 WHIRLPOOL c8cd0dbf8c5c45690b3443fcd6e8a62043fbbfafc8f778dd492467bb6d1e5916d2c489fdd668817006d1105a07e87b7b707e3483b250ae68e745d51ed10e05d4
+EBUILD rpyc-3.3.0-r1.ebuild 487 SHA256 51c61751b879ea57b4d70db96a257701beaa86699a0dddabfc46a963d7178c21 SHA512 4287b11b28e555c953aa962c6827c6f5e2c15f5a31a480d88e236b2242d00176a62ac403da8453160e0a44d4cb99b1c905e7a79054fbf8bec2401a3fdd54180e WHIRLPOOL 61207179a34c20caec0a0c31c0164332ac803d511e1bee94c4691c9580651a562992f4c85240dc92d26bb0942712c2c19279e2acd40e79c8a07ef98f523d4326
+EBUILD rpyc-3.3.0.ebuild 481 SHA256 f6ef549c313458f74683ddf1d895c4d7bf38ba8878535be04bf3d242bbf79f69 SHA512 036568f6c015f3c253f84a173026dfbdf23cc563e6c56bf667a013cd3a97abf6ca80cd26c4fe2f73f18ab117be0d01f67d7c38cc37fd3e1285458bb762d0c450 WHIRLPOOL c1e9e916e99dad52221cd6780e70bfe7f14a7d5260e1906226d0726efcaf01d6597824ddf4db43b557d2aaaf9289435ca3ba9e9f3c6e7d94601a53f83cc17e11
+MISC ChangeLog 3264 SHA256 574c9cd3b29d41a7f1c92446bf14941fec2da41f98597ee496341a6b3c1fe773 SHA512 3795cbb005adcd2809615050136a07cb9097bfb344390caf0f95cc65ed227ef412461a7d394b427ff26d16a97d8b9affc92a70196a4c8af48786f596cc608d5a WHIRLPOOL 99498e1b06b5f0a1c72aaaca32e599943edcf86b063e5310036affa1ffd8933a09fe7268636e60975ab86a352735bf1978bbfb62a8ac96cf20532262b8bf32a7
+MISC ChangeLog-2015 2320 SHA256 8bf95b2acdc2eb34a9be94b01495226289e8b470e7b59f880df4d168cf18d4c8 SHA512 bfd7ad1ee9edcaa73f2fc3f43094d248ffbf48b8673c3afdff4a3edfa1bb9098c2e77442bc414acefc3c508155038c3560026709fd6062d02cc291db7845547c WHIRLPOOL 5e9642a4442adff792c9606b8525dfcd70e6f11b3f0706e309a3734d125e93454b36e67263ed08d2922013db56d5ac45e01740c1d42c353aeb66cc3d78c0a8f7
+MISC metadata.xml 518 SHA256 7b83c08eb7e87d4194dc0b5f9e0a1a770b2b8ca5a06c4e5b1d61a21d3fd1d1ee SHA512 4ae598f55ddf591e0d75a9cfba54948b3ff78825377c8085ca22ad56184f18c44ef94947dbe53d207996f7bcb708454f417a74a72bbdfe22d76410acdad2f584 WHIRLPOOL 9eec979b5fc121e21c44710d38affe9449652ba821b04d2dd90d13d9111d658f0749213c766d89633535f8c2120e634ebbbcbe4d1f056b689db9d6d548a14966
diff --git a/dev-python/rpyc/metadata.xml b/dev-python/rpyc/metadata.xml
new file mode 100644
index 000000000000..d916084a65ec
--- /dev/null
+++ b/dev-python/rpyc/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grozin@gentoo.org</email>
+		<name>Andrey Grozin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>Remote python call</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">rpyc</remote-id>
+		<remote-id type="pypi">rpyc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/rpyc/rpyc-3.3.0-r1.ebuild b/dev-python/rpyc/rpyc-3.3.0-r1.ebuild
new file mode 100644
index 000000000000..9222d6662d17
--- /dev/null
+++ b/dev-python/rpyc/rpyc-3.3.0-r1.ebuild
@@ -0,0 +1,17 @@
+# 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
+
+DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
+HOMEPAGE="http://rpyc.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-python/plumbum"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/rpyc/rpyc-3.3.0.ebuild b/dev-python/rpyc/rpyc-3.3.0.ebuild
new file mode 100644
index 000000000000..ce2b20f0dae1
--- /dev/null
+++ b/dev-python/rpyc/rpyc-3.3.0.ebuild
@@ -0,0 +1,17 @@
+# 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
+
+DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
+HOMEPAGE="http://rpyc.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+RDEPEND="dev-python/plumbum"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
new file mode 100644
index 000000000000..40c2d0a1e60b
--- /dev/null
+++ b/dev-python/rsa/Manifest
@@ -0,0 +1,8 @@
+AUX rsa-3.2.3-CVE-2016-1494.patch 3843 SHA256 83bf8df7def9e6cea4c85e8f40d5cba66845d52555b0d38d673670910e36f2e6 SHA512 9150b25bc1a9dacc8eee0fb93d46b9d024c868d540097b9166be9a7879fe116d8fd47cacaaf5614b86cd44e7cd10602a0ad290eb2ef116539683101d4057a231 WHIRLPOOL decdf0021c3d01f9269e17afcefa349dde2721fa167f901b0dc5b7fd923dfe20aa0a26d79a43d6906c0877f2a4be80c23a90b656046c9f25c10882c215b672f3
+DIST rsa-3.2.3.tar.gz 35628 SHA256 14db288cc40d6339dedf60d7a47053ab004b4a8976a5c59402a211d8fc5bf21f SHA512 52b33e0278e6e1fed64b1cdebed29f7caa31fae733c2d5875e6cba5a045aaa829616799d8de84fdb63c546780dbdafcabf1f85f25930b8e663861151479ef7e2 WHIRLPOOL 5814f912849bed4f98f8bef20dcf2fb9b28af70b970f324cadab90f0c67ff42c32792f7a6306edf1884d4cf6fe35d27f47c833358c2d03c582faba60fba1490d
+DIST rsa-3.4.2.tar.gz 40956 SHA256 25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5 SHA512 62b0ff31fb3b9c18ae65bd102329e69726b853560576b1b66b9b89b26d3ff79154239af7e7a581b6a27c7017cc013f738762cd9662777ef594cc11c5b1f8e267 WHIRLPOOL d8d51f7ffc47af5fbc48199860171c38fe6f08b5a510bfed20513c22df8a614565703c9d89939ff1092a7c6392fbdef8bacf41cc839a9943b120b1fa4cf8d496
+EBUILD rsa-3.2.3-r1.ebuild 779 SHA256 9b4da0643e8efe74b4f8a930e33ed784d0cbfbf84846d3dbb4b9dbf446cf9f59 SHA512 a9d79f2488611d25aea1dc0255c08054328953ca2bd73026c424f81f355450ec21c4e00fa1348ac96a4560f8e1ceca51deb1515b38cf1597575adeb2b2336974 WHIRLPOOL 98779de4f27cd9975f2bf470439fb7c8db370d25a92a0d0476efb293627ebbdf8ea250b4d12b4c3e9b293dfd8f231e2186a9c906e5c14bf7682c149c2d932e5f
+EBUILD rsa-3.4.2.ebuild 736 SHA256 feac335f1b97800f6c6736d6bb8bcd85dded362acbe38bd4af7979346dd7c3fc SHA512 bd828c8b02a32b51f0f0b175bfefbf29d3957117aa449a82c6d1ca3ee085accdbaf8beb5b4599e7f4f8d353cd87081d6e22b8fb965316a4e3d82b08f4a288d0c WHIRLPOOL a0a0daa29f8367b928231648ac7f9548f1ef973b8c9feee6484530abefa32287c9174d10d31ce95a69ca94514bd7f1628da1ec7fc029322ca9d01ab58a1be322
+MISC ChangeLog 4693 SHA256 a44f187d58fa946b560c29b230bb5392cf2eb27df0c2d9628527271142b74e43 SHA512 59fc05b26269b8455a4fdf71f8ad676740e3646bd1a50842ddb57bc966112973270572fc9ecd84f95a6564b4cab3f2ec4b7211010819bf98a54990891842c13b WHIRLPOOL bb6bd453283e71d83a8f1dd277d9907a98760bcf537abb625e0b586d57a789af917b461d33f0e70c9458d806ffccaf1688bcfb10adc68c22638ff5924da2f823
+MISC ChangeLog-2015 1753 SHA256 df896f385bd9064fcc4518ef8fad0f1c3a4ae96aafb805528bd24ec7653e5bf1 SHA512 3d60bfff1eac837799c264d426e4b7884a1dc9db5dac58712fc61c5eebb817fd21505b45f378b275a4006eb5fb0f7dfff2325ed248ce2d8811bf3fac08935c6a WHIRLPOOL ddb1660ae98aa5e8f33be46ccf6bc5974468b200621a830c16cf50919f60b5e4d07d4be24b127e2e88c9ac620335834700b03c2b619572cf5bc462ef9e31049c
+MISC metadata.xml 316 SHA256 4a8d0bb11f587256e0847f1a35a74d53644ef183975d47bc22cc815943c81698 SHA512 4d8c48ae8e4360727f5c4b83e426f42a597a175dfa2a965c9f966e5824a83291c78d3e8e636d21b4f28d73f7e912abc7db1b09078baaa0e3a1b25713abd3d0a1 WHIRLPOOL 1d143ea409a28a21debdb7524a0956899513f985a348f5d984461f001d96cf9f8268abae96f3d7938fef2da91984676bd062cfec306ceaf631fdd3c5f0e8c10b
diff --git a/dev-python/rsa/files/rsa-3.2.3-CVE-2016-1494.patch b/dev-python/rsa/files/rsa-3.2.3-CVE-2016-1494.patch
new file mode 100644
index 000000000000..bfcfc33ed01b
--- /dev/null
+++ b/dev-python/rsa/files/rsa-3.2.3-CVE-2016-1494.patch
@@ -0,0 +1,104 @@
+# HG changeset patch
+# User Filippo Valsorda <hi@filippo.io>
+# Date 1450226563 0
+# Node ID 0cbcc529926afd61c6df4f50cfc29971beafd2c2
+# Parent  2baab06c8b867b01ec82b02118d4872a931a0437
+Fix BB'06 attack in verify() by switching from parsing to comparison
+
+diff --git a/rsa/pkcs1.py b/rsa/pkcs1.py
+--- a/rsa/pkcs1.py
++++ b/rsa/pkcs1.py
+@@ -22,10 +22,10 @@
+ At least 8 bytes of random padding is used when encrypting a message. This makes
+ these methods much more secure than the ones in the ``rsa`` module.
+ 
+-WARNING: this module leaks information when decryption or verification fails.
+-The exceptions that are raised contain the Python traceback information, which
+-can be used to deduce where in the process the failure occurred. DO NOT PASS
+-SUCH INFORMATION to your users.
++WARNING: this module leaks information when decryption fails. The exceptions
++that are raised contain the Python traceback information, which can be used to
++deduce where in the process the failure occurred. DO NOT PASS SUCH INFORMATION
++to your users.
+ '''
+ 
+ import hashlib
+@@ -288,37 +288,23 @@
+     :param pub_key: the :py:class:`rsa.PublicKey` of the person signing the message.
+     :raise VerificationError: when the signature doesn't match the message.
+ 
+-    .. warning::
+-
+-        Never display the stack trace of a
+-        :py:class:`rsa.pkcs1.VerificationError` exception. It shows where in
+-        the code the exception occurred, and thus leaks information about the
+-        key. It's only a tiny bit of information, but every bit makes cracking
+-        the keys easier.
+-
+     '''
+     
+-    blocksize = common.byte_size(pub_key.n)
++    keylength = common.byte_size(pub_key.n)
+     encrypted = transform.bytes2int(signature)
+     decrypted = core.decrypt_int(encrypted, pub_key.e, pub_key.n)
+-    clearsig = transform.int2bytes(decrypted, blocksize)
+-
+-    # If we can't find the signature  marker, verification failed.
+-    if clearsig[0:2] != b('\x00\x01'):
+-        raise VerificationError('Verification failed')
++    clearsig = transform.int2bytes(decrypted, keylength)
+     
+-    # Find the 00 separator between the padding and the payload
+-    try:
+-        sep_idx = clearsig.index(b('\x00'), 2)
+-    except ValueError:
+-        raise VerificationError('Verification failed')
+-    
+-    # Get the hash and the hash method
+-    (method_name, signature_hash) = _find_method_hash(clearsig[sep_idx+1:])
++    # Get the hash method
++    method_name = _find_method_hash(clearsig)
+     message_hash = _hash(message, method_name)
+ 
+-    # Compare the real hash to the hash in the signature
+-    if message_hash != signature_hash:
++    # Reconstruct the expected padded hash
++    cleartext = HASH_ASN1[method_name] + message_hash
++    expected = _pad_for_signing(cleartext, keylength)
++
++    # Compare with the signed one
++    if expected != clearsig:
+         raise VerificationError('Verification failed')
+ 
+     return True
+@@ -351,24 +337,20 @@
+     return hasher.digest()
+ 
+ 
+-def _find_method_hash(method_hash):
+-    '''Finds the hash method and the hash itself.
++def _find_method_hash(clearsig):
++    '''Finds the hash method.
+     
+-    :param method_hash: ASN1 code for the hash method concatenated with the
+-        hash itself.
++    :param clearsig: full padded ASN1 and hash.
+     
+-    :return: tuple (method, hash) where ``method`` is the used hash method, and
+-        ``hash`` is the hash itself.
++    :return: the used hash method.
+     
+     :raise VerificationFailed: when the hash method cannot be found
+ 
+     '''
+ 
+     for (hashname, asn1code) in HASH_ASN1.items():
+-        if not method_hash.startswith(asn1code):
+-            continue
+-        
+-        return (hashname, method_hash[len(asn1code):])
++        if asn1code in clearsig:
++            return hashname
+     
+     raise VerificationError('Verification failed')
+ 
diff --git a/dev-python/rsa/metadata.xml b/dev-python/rsa/metadata.xml
new file mode 100644
index 000000000000..35bbfa239754
--- /dev/null
+++ b/dev-python/rsa/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">rsa</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/rsa/rsa-3.2.3-r1.ebuild b/dev-python/rsa/rsa-3.2.3-r1.ebuild
new file mode 100644
index 000000000000..132b888c45b1
--- /dev/null
+++ b/dev-python/rsa/rsa-3.2.3-r1.ebuild
@@ -0,0 +1,37 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python RSA implementation"
+HOMEPAGE="http://stuvel.eu/rsa https://pypi.python.org/pypi/rsa"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
+	dev-python/traceback2[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-0.6.10[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		)
+	"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-CVE-2016-1494.patch
+)
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/rsa/rsa-3.4.2.ebuild b/dev-python/rsa/rsa-3.4.2.ebuild
new file mode 100644
index 000000000000..437b656e1002
--- /dev/null
+++ b/dev-python/rsa/rsa-3.4.2.ebuild
@@ -0,0 +1,33 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python RSA implementation"
+HOMEPAGE="http://stuvel.eu/rsa https://pypi.python.org/pypi/rsa"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
+	dev-python/traceback2[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-0.6.10[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		)
+	"
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
new file mode 100644
index 000000000000..23d62ff7d6d0
--- /dev/null
+++ b/dev-python/rst-linker/Manifest
@@ -0,0 +1,7 @@
+DIST rst.linker-1.7.tar.gz 6798 SHA256 59038b0dce170f7d6459132a1b7358b01f71f372afbf5b1c07d0862ba4a5042e SHA512 380cd1b36a1153a6512144b7c83be75dfa95ce397437d34cb76c4c41de6266c77cf1f811f4fb0576838e10bd78e1f46394df11b0f7dc5e3fafeef36b6e8c9ba0 WHIRLPOOL 7d323528ed0c7bba5db1159eb18063a4b191d81d400c1e8d02d0dcff3265183ca4ca0d56de5c674883dc1d02ea77eb7ec83c1b08d4622f4d820f5a1702a5833b
+DIST rst.linker-1.9.tar.gz 7618 SHA256 4de05e547d14ac16599d6379a73d394b8eba03afb1f16b6bdb400013957d9999 SHA512 b3e39b025f75bb6ff670f23ee7abd48dcc4e19343626c1ffadd2304a7e3285fe0b7369ace96e47094606e864672c8aeea967a02217b110762e53498dde64b8a7 WHIRLPOOL 15cef12c451a8bffec7303f2909e173993819bdb3d214c07f2b606464fa0ff6d222b33bff3df44a2a1652f2b144f85a11e8dbb4b9a82257bca6123f1944eb828
+EBUILD rst-linker-1.7.ebuild 1201 SHA256 294a9b979a42f822bdb7a11e8002ade474ece533751f01bd1416f452798f2126 SHA512 820770954b0434011803926bf4ba55f71df966ffa5931dde1307a90c693056b25f36f7c799c85d1379e77296931e524f2d06323a09e080edd950812f0486f795 WHIRLPOOL 41a60b6b6a877d62636d411a0556b3a9599ea0fc777642ed5eb830e55c60c3e1ac86dd0705864714816c0d57f73a8c16747433a21a05b917790f6e39b686e638
+EBUILD rst-linker-1.9-r1.ebuild 1382 SHA256 adbaa48add4d6aae49fdccd3c01e1b9802642eca11962de0acdc4bb4ce62aa07 SHA512 cf23915be6e38d956674e8980ba825a6fcbd830b35f9fc9fb8ff0735d725664a40340fe97b22a5efa0a65710172e8331fe3273a4a53a3268ab8f953ea33b42e2 WHIRLPOOL 8bfa91d39570c4c038f4371188cb47a44cc293a56da61ffa9ed15bce38930b1908f34dab66229b45a1dd0d13830d2182bcf55c363c016a822b6162d9af73e4e7
+EBUILD rst-linker-1.9.ebuild 1212 SHA256 34655dc99ced306fb1ca63552eabe845e7cd5721a0bca0eae9a95de85f86cf59 SHA512 ae2b09ff33aa50441528eeed10bb62a2a6d69a746fcd73462e133ea2b7a2bf0944880066511bf3167cf3ec416c8df9333222ffa25265bc81871edceb161612e6 WHIRLPOOL 97f29f0afbf1f3e041b9da70f43856285b3cce784fa9807359ce417e54166575797936796122d6f3c1e5a552f029f83eeefad50900aa0556d4515b3c14036f6a
+MISC ChangeLog 693 SHA256 0125a7faaafa252b0aee5122f2f1110ce1d97f5c6544aca2161e1d6d1ce3e703 SHA512 b3af65ffd3116b702564127505080489cdf293930635872a67cc957f93b70b8ba019c24c9511e1881a7ba141a6e88c9f0a6d633a4f338d0a42062ee69ac098ab WHIRLPOOL ad948ed0c75c37d468625e545783715334a772a3b96858f0506c80dfd1f18da14c16eacd71a8cc77d33d87ee26327d1b56a24bda22efbc9c416135a7a281c78f
+MISC metadata.xml 564 SHA256 38b5cecf737698dec160f97e136d42de98d463bf74986fccdbcfe1cb86ee2516 SHA512 c3fbcb945acb81c57e91ea8b26c797b71e959c2f3d9f0eb7db696e4ae26b9004bb3b6f554740169b9a2c96cde3fbe8b30721b285b82e07ed193a2117e0436f36 WHIRLPOOL 034f7ba8802f3a845a26fd4d370fff518474f279864c1f608e0ad18be4ffd6733dc202fbd41ef6c10aa127ba59652eef020900f93f153a2678bd4edbca77c914
diff --git a/dev-python/rst-linker/metadata.xml b/dev-python/rst-linker/metadata.xml
new file mode 100644
index 000000000000..a5311664a46f
--- /dev/null
+++ b/dev-python/rst-linker/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">rst.linker</remote-id>
+		<remote-id type="github">jaraco/rst.linker</remote-id>
+		<bugs-to>https://github.com/jaraco/rst.linker/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/rst-linker/rst-linker-1.7.ebuild b/dev-python/rst-linker/rst-linker-1.7.ebuild
new file mode 100644
index 000000000000..217bfc609234
--- /dev/null
+++ b/dev-python/rst-linker/rst-linker-1.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Sphinx plugin to add links and timestamps to the changelog"
+HOMEPAGE="https://github.com/jaraco/rst.linker"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/path-py[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	py.test --ignore=rst || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rst-linker/rst-linker-1.9-r1.ebuild b/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
new file mode 100644
index 000000000000..609035b9825a
--- /dev/null
+++ b/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Sphinx plugin to add links and timestamps to the changelog"
+HOMEPAGE="https://github.com/jaraco/rst.linker"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/path-py[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	py.test -v --ignore=rst || die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# namespace used only by this package in Gentoo at the moment
+	python_moduleinto rst
+	python_domodule rst/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/rst-linker/rst-linker-1.9.ebuild b/dev-python/rst-linker/rst-linker-1.9.ebuild
new file mode 100644
index 000000000000..4bdfb051d264
--- /dev/null
+++ b/dev-python/rst-linker/rst-linker-1.9.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Sphinx plugin to add links and timestamps to the changelog"
+HOMEPAGE="https://github.com/jaraco/rst.linker"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/path-py[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	py.test --ignore=rst || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rst2pdf/Manifest b/dev-python/rst2pdf/Manifest
new file mode 100644
index 000000000000..869f0beebef5
--- /dev/null
+++ b/dev-python/rst2pdf/Manifest
@@ -0,0 +1,6 @@
+AUX rst2pdf-0.93-fix-logging.patch 771 SHA256 4de7e14d3d5b88caa2d871787f174ae7687a9b5eab2e5e1469ed9f25df3406a3 SHA512 798a4cc03ddc6bf892ac8388b96d7facfe4054c2a1f648a4d05314bfbb8bf1ba261feea0930388688b183c12b1f561b3753fa2488854651005faf9bfa98f531d WHIRLPOOL 20aaca8e880b5ae64f053670b532474c659c906e2986612b80860a935ec756b3bb9e498b3f9caf29600ee14a8eb7f09b32ce268f48b286139c9f1b09d778da73
+DIST rst2pdf-0.93.tar.gz 1216483 SHA256 37e99ea103790321b29b6f6b0192821ba9c2990a6aec57295585ca6919932a97 SHA512 dfdc6adeb06f4ef3d5fc52b91be1939e9cab25a1979685512f9a05e3da1ee65b84e47478613148401175a06fbfdccf5494918de6281419a0981987d398e836ee WHIRLPOOL e1b198f4a32f164dbd421ee76156e5611c0ff2e7329b85d95c9646209eb05214f359c61880c9b10e0edd45853b0b1fcaf4118d364d6e15f9253e9a68462de3b6
+EBUILD rst2pdf-0.93-r2.ebuild 1565 SHA256 32006003d1d8294505ed536bdcea64b2bb15e068763c8bb44a8d6bfbfead3ed6 SHA512 022b421abcb94206094b4ff7384ec8ef1de7db887235af24c9e6dc002d3e37920b8af518be56c06fdabe88b52bae91193f0c1d1ecf42c410a5e5f9850bb04fad WHIRLPOOL 664e318ff32b45b00704039d17a28b99d2da81b356d6d98a7b16662f56c7ad66d3485474c899ff6b1e2a728a94af932448ea40669d4c06a80b392b407a7ecb2c
+MISC ChangeLog 4272 SHA256 63e26929b97ff29d0787a5befdcc5aa9b4a2cd4aab87c10c3685892d95ba3f6a SHA512 52c49da2439ea2453988f1e104a0cd85fbad3ec87d943202318f80362b5970cefefecd449c3e22c46c0eb7844ec08ad95efea945d997cc16639de6388042e700 WHIRLPOOL bc930d75436e4875d7e564af3660dbea82116752c50553663aa7a49ff26d197d3275c99d9eca95e1975657501cf03c62db275e390e0f6732085c888e448aac84
+MISC ChangeLog-2015 5730 SHA256 efc33707aaf3d523afa80c7555949f66e7675caa66c33531756dc1a76c1ee552 SHA512 3a82a65040e03e8e23077e2c88e2046890380c478fd23e797b3007381c42d6269b12b839d6dd753069801295557407377c3541c93cd64ac869e27f80538ef416 WHIRLPOOL bc49aba99c3bf95673aa6c7a0c84d923f02fcab4b59738a12a33c76c36e89c6acb516570516bfa14cf1fcaa3125952bcc71a221152269cb1f3fcef5c9ecfd136
+MISC metadata.xml 306 SHA256 b36ec190bc01963717ec99da2825f6e5173ee3f8cee0ed9aeec006fefe1cd865 SHA512 5f9c3ae1a900fe722d811e47ed1ca544f308720604a407d6d4a8ada256c12c94c0af903d13b7f443750c1027904075f785372fe1f917ac1901a1c45acdbe30b7 WHIRLPOOL d97eaedc33ad6c87cec3bc706e6118e317b04adcb319129320443744f3e7e8dae51e676d27466fa2cabdb6ef7e55c8f0ec498b2b21c512641f763fc897b370a5
diff --git a/dev-python/rst2pdf/files/rst2pdf-0.93-fix-logging.patch b/dev-python/rst2pdf/files/rst2pdf-0.93-fix-logging.patch
new file mode 100644
index 000000000000..52acf04171d8
--- /dev/null
+++ b/dev-python/rst2pdf/files/rst2pdf-0.93-fix-logging.patch
@@ -0,0 +1,26 @@
+--- rst2pdf/log.py
++++ rst2pdf/log.py
+@@ -4,11 +4,12 @@
+ import logging

+ import sys

+ 

+-logging.basicConfig(

+-    format='[%(levelname)s] %(filename)s:%(lineno)d %(message)s',

+-    level=logging.WARNING)

+-

+ log = logging.getLogger('rst2pdf')

++_fmt = logging.Formatter('[%(levelname)s] %(filename)s:%(lineno)d %(message)s')

++_hdlr = logging.StreamHandler()

++_hdlr.setFormatter(_fmt)

++log.addHandler(_hdlr)

++log.setLevel(logging.WARNING)

+ 

+ def nodeid(node):

+     """Given a node, tries to return a way to see where it was in the 

+@@ -23,4 +24,4 @@
+         if node.source: fname=str(node.source)

+     except:

+         pass

+-    return 'near line %s in file %s'%(line,fname)
+\ No newline at end of file
++    return 'near line %s in file %s'%(line,fname)

diff --git a/dev-python/rst2pdf/metadata.xml b/dev-python/rst2pdf/metadata.xml
new file mode 100644
index 000000000000..3673286b4be4
--- /dev/null
+++ b/dev-python/rst2pdf/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="google-code">rst2pdf</remote-id>
+    <remote-id type="github">rst2pdf/rst2pdf</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild b/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild
new file mode 100644
index 000000000000..0702bafbb182
--- /dev/null
+++ b/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Tool for transforming reStructuredText to PDF using ReportLab"
+HOMEPAGE="http://rst2pdf.ralsina.me/ https://pypi.python.org/pypi/rst2pdf"
+SRC_URI="https://github.com/rst2pdf/rst2pdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
+IUSE="svg"
+
+DEPEND="dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pdfrw[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	svg? ( media-gfx/svg2rlg )"
+RDEPEND="${DEPEND}"
+# >=reportlab-2.6: https://code.google.com/p/rst2pdf/issues/detail?id=474
+
+PATCHES=( "${FILESDIR}/${P}-fix-logging.patch" )
+
+python_install_all() {
+	dodoc doc/*.pdf
+	doman doc/rst2pdf.1
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "rst2pdf can work with the following packages for additional functionality:"
+		elog "   dev-python/sphinx       - versatile documentation creation"
+		elog "   dev-python/pythonmagick - image processing with ImageMagick"
+		elog "   dev-python/matplotlib   - mathematical formulae"
+		elog "It can also use wordaxe for hyphenation, but this package is not"
+		elog "available in the portage tree yet. Please refer to the manual"
+		elog "installed in /usr/share/doc/${PF}/ for more information."
+	fi
+}
diff --git a/dev-python/rtf2xml/Manifest b/dev-python/rtf2xml/Manifest
new file mode 100644
index 000000000000..b71724b25999
--- /dev/null
+++ b/dev-python/rtf2xml/Manifest
@@ -0,0 +1,5 @@
+DIST rtf2xml-1.33.tar.gz 421817 SHA256 8dbfd3b8f266568775c2de812620288543771135212a836d1dd43d5dd45575a0 SHA512 ffca0f091319432e7d3f3b94fe8946a4665b026fe91ad90f3b9fa8671e3d7c31b71739df3655e368c44c26ad3b5d0e6a5b80ebd58856fb135253337b6b703031 WHIRLPOOL ebb8f284b0f257b2de2ef89b25e3f6cda320f398a98e47a0ed0a5740537351dbf5cbc4af7a5d4208d5da3c5fbf7c3c0c1ace4e60719e379210d85830532ee04b
+EBUILD rtf2xml-1.33-r1.ebuild 505 SHA256 7b574f9693f2b72fae04679df334152c26036232c83381df161d8736d1ecc7da SHA512 a4c33a2ef655b5aaab082e896d4c48b80b8db8ec57ed768846d69cac66dc9e92d9cc5d32b15007c74dabdc1f21874e890c21640ba0faa8c961256982e62039d1 WHIRLPOOL 1e593ca5c1b2a4f46d1018398bcbb4630eeb51f73ab8d1b41342c322d41d8f1e37aa638013e9a7aaf3afe475385081b548946fcbc13118d822e7b32f99aa8df1
+MISC ChangeLog 2528 SHA256 93de6314ef416d6c354cb8a096bc68bbdb5a4f3c8e9736ef9f3a262601e2afc4 SHA512 54e3ace75e1260bb5885b4f2badeb2930a165a290e32aa0706e66cf1a0d989a922377235bbb2332a97759f4c468e3899f19a43c71533cec0c15b67eda57b1359 WHIRLPOOL 7d7e22d2289140ff4f648230087ddb18f6898853116c2ce8a3f5eebb4031f9ecde62989254d3ccebd30b73bdaff5a67ba132875af74634cae2e10ee70671e0f6
+MISC ChangeLog-2015 1206 SHA256 a05269ca34d11ae77c7c06d12d44971d1dea59f4939b3282a58a145a09e2ea49 SHA512 792e2d1da86be61d064919c17f08a133fc49706e834588acdd9f94afcdd785751da00202a87601beb3b8fd2ef2201c9efc463cdd6432295d09d194a174e0f3d3 WHIRLPOOL 02f7376c742f250e82dd001ccfb9617106d636746d4fef8ef4681de8f8fe8786b6331bd95a81a2f586b4fd4c5e756d1beea81ba233dc416116609896a644b090
+MISC metadata.xml 244 SHA256 9ca5191036c17d149a9ffff4d0d853a8d33c036d238d3332fb69fa311bc68445 SHA512 6be507453a172dd94ee39a7eceaa4ea8ae9993ec27dd3a1baca423ed0e3fefd205948640d86cfa28db4d90ed4380b0ae4b28936d2da3c63aa4fe495c18c6e082 WHIRLPOOL ddb8875d9fbca655fcc48a6f25e8162d150edcddfa5636ebcdc16910e38e2f4533e94ac342b37ff0042492ff4c3a97f11f6e3e6538dc9a8d19fc784c59f2db81
diff --git a/dev-python/rtf2xml/metadata.xml b/dev-python/rtf2xml/metadata.xml
new file mode 100644
index 000000000000..474028237505
--- /dev/null
+++ b/dev-python/rtf2xml/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-needed -->
+	<upstream>
+		<remote-id type="sourceforge">rtf2xml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/rtf2xml/rtf2xml-1.33-r1.ebuild b/dev-python/rtf2xml/rtf2xml-1.33-r1.ebuild
new file mode 100644
index 000000000000..50ffa736f4e4
--- /dev/null
+++ b/dev-python/rtf2xml/rtf2xml-1.33-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Converts a Microsoft RTF file to structured XML"
+HOMEPAGE="http://rtf2xml.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND=""
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rtgraph/Manifest b/dev-python/rtgraph/Manifest
new file mode 100644
index 000000000000..44908b18a6ff
--- /dev/null
+++ b/dev-python/rtgraph/Manifest
@@ -0,0 +1,5 @@
+DIST rtgraph-0.70.tar.gz 16141 SHA256 e8030cfb63dcd13aa4eca08ea3c5b90f97678fcd5a3be1fecd65e124d93b397a SHA512 73d226ba09a658f6957fa82e4956de967ef7b02ca08ac1e33a16c1c0ffe1426afef35e7c720342524c6389e42d994db9ff3404d413ddec5168980e2e1982ea34 WHIRLPOOL 02bc67d436202be8e772385ddf2146f62c63f600db7186b825c111d2b46feb0ed08f7536653b45d175fbacb8bc59bf668c43d72bbddc4f185ff4ce7db0229a7f
+EBUILD rtgraph-0.70-r1.ebuild 846 SHA256 dc8e2f6500d2b74674a6af956bea28194c2f0c8e7f3b7e02e8ea385186be5c9a SHA512 9dbb6e27861accc493a85a53f6c10031706d1ffa726ef0af2aa67d97988f537e9baa9662596decfce97aff2dd25f6d5baadbd86542e3179a650ec05cc90bbe60 WHIRLPOOL 2203a0070bff77d9163224482a0ab790f0e249711c889fd471b4548d1aaac08cc3cc7464522226060a19c2fcf31c7d42b8311aa5998db942c92d41e0670c8846
+MISC ChangeLog 2433 SHA256 8da35f09ff26f79192a1089a11308871c8d9a2afe1804d3e5d51062d3d2da165 SHA512 ff2d2d9f6e8f699ebf0fd3b1ae029cd24d366cb32bcb955e449e49aa7ad5127e3c1bf39415d8f7d0534735f3f888c7833a1b80a910b228ede41b462430bbc0b0 WHIRLPOOL 2395904339b4c36f96edfadb869d898614ea35b6cf343db2224a190e19ef2e60003ac2a751485ceb382fa4e30b00ab71ef402fb87048a0cc831fe4a7631b1733
+MISC ChangeLog-2015 1556 SHA256 71f80c36b94d135c961497a831694e8f6fe1ce4f2bb9ebf86cffc9ccb32a82c0 SHA512 f95bf1dee3d6c0f4b3ffd852cdcfd33eabdc65f7983bd780e79e3710c57f5c2a0d9f9aa5388874ca8d688f480e536d3842a46038f0cdec4f0e19ee411ea53933 WHIRLPOOL 71c0b6bbdc1d53d0b7c6d87971f48fd8cd0e386ac7b52dcd7225307301644dceb00bccb1572f17a94f565df6b5271e9c50d4cb1f4efa8ef71a2c4409e71d9d38
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/rtgraph/metadata.xml b/dev-python/rtgraph/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/rtgraph/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/rtgraph/rtgraph-0.70-r1.ebuild b/dev-python/rtgraph/rtgraph-0.70-r1.ebuild
new file mode 100644
index 000000000000..2b082cbc1d23
--- /dev/null
+++ b/dev-python/rtgraph/rtgraph-0.70-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Widgets for graphing data in real-time using PyGTK, and UI components for controlling the graphs"
+HOMEPAGE="http://rtgraph.sourceforge.net/"
+SRC_URI="mirror://sourceforge/rtgraph/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE="examples"
+
+DEPEND="dev-python/pygtk:2[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	if use examples; then
+		mkdir examples || die
+		mv ./{cpu_meter.py,graph_ui.py,isometric_graph.py,line_graph.py,polar_graph.py,tweak_graph.py} examples || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rtslib-fb/Manifest b/dev-python/rtslib-fb/Manifest
new file mode 100644
index 000000000000..196fae1fc045
--- /dev/null
+++ b/dev-python/rtslib-fb/Manifest
@@ -0,0 +1,11 @@
+DIST rtslib-fb-2.1.57.tar.gz 30746 SHA256 bca0fb05e3d96fdfc8495a6b1e82d6ff92190c610863c2ec6400bfcf3120361c SHA512 0b46b17498bf2a5f4853c9d989bf6a192280d95416b195c0c9eaede4759612b6c3800fb1d3f44979c10e95ba0c3f06dd9756a805d63f61b292a611003f48059b WHIRLPOOL b707f5f4978dced01e5a92a2f709010925cdfa3ee0485f7bc677ad81df6f0fc177f03ee075763e159990e4f7fbf60ab51c030d309cb2e2bc329f9557b6658145
+DIST rtslib-fb-2.1.58.tar.gz 30706 SHA256 5806f9903557907787abd9c8b9dffb2b312e6c5e3ff40d50d26b10c37b118d47 SHA512 a3f4c22d42b4b76bb9a5ce2d1027c4964385fa427ec55cb92f1acb0f9b647fc0788307354144534e3f216fc12f3fc1a0a55fd4454225324aa13488f21df092c5 WHIRLPOOL 0c773035c7e8502550f2835ae92ed3a31a2bb05661b12c6e4fe59a0f7065a3dc2d08962af69a7e5f07f4a0a4736d5d9e9204c47b6af6e478500c435d642d8324
+DIST rtslib-fb-2.1.61.tar.gz 31144 SHA256 7ad94b13b5cd1667c8faf2c6311a539fce6fdf095a96f94df42c04bc258094ae SHA512 5c2423fd315ca00aede358ee18a7d0b61019c5dbd8f68134b04bb0c3ecdcdeb4117dae9f1421a38dbd4b612b563e733dd683b39fc3e47a3e87affce1f423e508 WHIRLPOOL b74ed93b3086d66fc49fb127c2f2de2ccd5e36c8944aa7a9be8c4609584285fadb497043956768ff1de7938a52687965022338dcb133d60577267db2838d2a67
+DIST rtslib-fb-2.1.62.tar.gz 64481 SHA256 410c7daf3dfbe14fc86820ef73a7386fb4ddb3192175af11b79eb1e3e4026153 SHA512 12202f828234aaaa3a4e86ac45a2e3771baa76406d57496765c4789bae00f7043f0105c71f1f5501a37eff8004788a41dbb788532f93ebee2ab79b3e5eb00c76 WHIRLPOOL 7815e700f701234601ab10a54c6e842ebbf1725540699e96c9c2a9f9c960e57377b81a8c05be9848c4e70c1a3d5034cfd299ca413c3466b4ab935a8a0035b93b
+EBUILD rtslib-fb-2.1.57.ebuild 552 SHA256 84fe7087e805a4efffaf7ddaff4421c9c5db0a67c81f0ee09e500c6a5d319766 SHA512 4ff2679ee9786945df311f7951fb6c644709b78ec6119440d41b4991ec01a24316e2d937363a4244d49e117285e831b527146db63dfde49da3106eaca32f6e60 WHIRLPOOL 30d7a402250f8a1293bf215c41afa1531c229f07678b32367f19ab68abfae1a721aa85a208984bb2567c6327f0184f4b429b505d09fee8b4e447c56b0a0c6bfd
+EBUILD rtslib-fb-2.1.58.ebuild 598 SHA256 ca5a3e60a9a654d96924f99dd2ee2bc2195b27c3f3a850767b3f17a9215540ab SHA512 e08d61fd1246cf30525997064248085d64ee81d86adc11656979c82862d9c294366ff6455b9e876118078fbbcd544ef09fbe9531d121b4e2cdb1e81e7d5b0785 WHIRLPOOL 0eb9bd8d69b4cd8c87c525c3ccefb7821dc4438c58e4362e00c99ca10d60bd8cf94576bdaad4ddb8b492fc7455f6c315b8062d8d6719a5dd3a02aeb71255ef81
+EBUILD rtslib-fb-2.1.61.ebuild 638 SHA256 c74f653875c25d3b04192aaa3714125d8ba8463756a3e162aecd79b6a15fd572 SHA512 7ca06ff27d74afaacbd4967193a091e20f6cae61b5f8aa963cf7f6abc7fc7c75f9becd3ec38688d30a311e4fd569d78343f02143066723c815a4f1febd9a7979 WHIRLPOOL ffce512845ca68958354609ee2a2bbf738b0a14be8757561a934622a96c6caa455c88ff43bcb810027dc1a3156804da8e90f4aea84ac64f8390b42ad56203d61
+EBUILD rtslib-fb-2.1.62.ebuild 616 SHA256 d04c89ad97ac9fc05367f08b1408b40b98be7d4bdef309c8d2c53441f1ec0309 SHA512 685ae458f4eda8dd89f652ae35230c3c1491852bb4b4d14a914de1957c320ed93f5dacd92f0320a1a0165938407776b8f9339e349a6a28b06dbe30961bf35fc4 WHIRLPOOL ae0e2d3b09e7bdb667138d213c56d6077cfc974c0cb163ed72b8f846961cbc1ab83afb98641ea592f269ea30f97a13228b4b466476dd385c528675ff4ea23ca4
+MISC ChangeLog 4086 SHA256 15fd59baec7231dd7e484c6ac67db83689b153f840a6755f4fd6d435e97d18fd SHA512 657ca6ade9185fd256470682ec01d57fd2f57bfc869f1ecd1bf18a83daf93f84a2c54a39d66939cc66e9859db290071ffa198d8d5d91b837992910c515c849f4 WHIRLPOOL 122e0aeb77a5a3c6b6e73cb2802451bcedbdfafe44374223477914bd0c134dbbbaf356fa1966f13602a2b0d93068f472b21bbad2e5a27036a9db5e3defa106dc
+MISC ChangeLog-2015 777 SHA256 1349896539a8c89d557ff032deaf117e6fd4907a5844d4e0da88c9f12145f428 SHA512 f2a75ff37fb978d32d447e3b148b231113bc2b7e44942bd81c28204e95cdb4f8ba355df4884ae057baa11343aacb775d67556f7035f7a8c9b84f4c94cc420f90 WHIRLPOOL 0899c72014e9182c34ff92a0ed7f5398be0b3885e2f9b933cd7420c3231a1aac2e75a08e9c2c6aec48d5a1e659ab0c054109ebab3f5fda3d37f042706e5a2f24
+MISC metadata.xml 625 SHA256 138f8427e530b84bf8620b889df35e660e6c7be6d4eb38e946f264b508738a84 SHA512 838fa39adceaef8854dd2b5f873e0f2253bb1fdf616da974154166d7fde861d11806ae439c573b6cb7d392ec37de18956bb119bcc83e48ce0a9602d6d559e0ec WHIRLPOOL 17ff15fa567a0e47ade33c212fbc373dd53bc63b11459dd9d938f024ed91c070bb7c76da1871f24545ae7f75ec4d0ed807c779b038a9c843a4b207a3fc0354ca
diff --git a/dev-python/rtslib-fb/metadata.xml b/dev-python/rtslib-fb/metadata.xml
new file mode 100644
index 000000000000..60e541eb8419
--- /dev/null
+++ b/dev-python/rtslib-fb/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+     A Python object API for managing the Linux LIO kernel target
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">rtslib-fb</remote-id>
+    <remote-id type="github">agrover/rtslib-fb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild
new file mode 100644
index 000000000000..b11341189bcf
--- /dev/null
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
+HOMEPAGE="https://github.com/agrover/rtslib-fb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	!dev-python/rtslib[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.58.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.58.ebuild
new file mode 100644
index 000000000000..aaa9c0649ce1
--- /dev/null
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.58.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
+HOMEPAGE="https://github.com/agrover/rtslib-fb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	!dev-python/rtslib[${PYTHON_USEDEP}]"
+RDEPEND="!dev-python/rtslib[${PYTHON_USEDEP}]"
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.61.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.61.ebuild
new file mode 100644
index 000000000000..dfc864dac90f
--- /dev/null
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.61.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
+HOMEPAGE="https://github.com/open-iscsi/rtslib-fb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	!dev-python/rtslib"
+RDEPEND="dev-python/pyudev[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	!dev-python/rtslib"
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.62.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.62.ebuild
new file mode 100644
index 000000000000..c8c150c626d3
--- /dev/null
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.62.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
+HOMEPAGE="https://github.com/open-iscsi/rtslib-fb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/pyudev[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	!dev-python/rtslib"
diff --git a/dev-python/rtslib/Manifest b/dev-python/rtslib/Manifest
new file mode 100644
index 000000000000..49f56f1f6adf
--- /dev/null
+++ b/dev-python/rtslib/Manifest
@@ -0,0 +1,6 @@
+DIST rtslib-3.0_pre4.tar.gz 63988 SHA256 1e4359d3897ccee0c6345f8d63292f2c8f71500f242baca12772877fbe25bda8 SHA512 5b4ff3dbaa379f177e08d0ffb54b575e7637c9ebf9ad98cdb2db2b93cde623d0c3a29c3ec9eb0a5542964438d8d5342691f483e2fdb81b7f1f64f37c701e0063 WHIRLPOOL 6ea742a6c756b8c473ef12f017ffc0ecdf2c9dae28f2169b1db99e5ac30f36806414b73c0bcb1e3c191582ae8bfd4ffc9cf15151537ad4354f15cc9c9dc8fa06
+EBUILD rtslib-3.0_pre4.ebuild 923 SHA256 5c11a1263ee4da8caee83a1169abb5c70b5c8aedf12791253dc299eae0d2543f SHA512 dae6829a76890f58d96539f0e0bcdc36c885d64c62935ff9735b54b1f1e17ffea9eb361edaa9d7396d5f9285ed798505faa276febb53790ae8e7b95aed1da654 WHIRLPOOL 85d7488c170f4a731ebe1b9d163653d97f5d1a217ccd07bcb8b8c77b9a142493fa83d23002af58459b8180140e44a64df521a599baadcf13d43077be75bfa1d9
+EBUILD rtslib-9999.ebuild 923 SHA256 5c11a1263ee4da8caee83a1169abb5c70b5c8aedf12791253dc299eae0d2543f SHA512 dae6829a76890f58d96539f0e0bcdc36c885d64c62935ff9735b54b1f1e17ffea9eb361edaa9d7396d5f9285ed798505faa276febb53790ae8e7b95aed1da654 WHIRLPOOL 85d7488c170f4a731ebe1b9d163653d97f5d1a217ccd07bcb8b8c77b9a142493fa83d23002af58459b8180140e44a64df521a599baadcf13d43077be75bfa1d9
+MISC ChangeLog 3388 SHA256 1a754bbc31c743de152b0e0258ae6a459ec8cbe178d79d643bdd5240b0b43cf4 SHA512 25537bbdb5adbe55f5c02915a92b408599e0d0d65298f8698ac8ea221d3baf83483daee8e9ed7065f72877a0c1e6476867b90bc6ed4178be4cdcbf791fef9fbb WHIRLPOOL 4548112c67deba49ad0c31c877d064dba3957d6fbd3e45e92328100e44576fada93e921784b212fa2a39eb56cb7240a278659f08c5ddaf0fd7bf5f08502dc340
+MISC ChangeLog-2015 561 SHA256 97324c955dce5d232cf48efb578dcf57affb34621fdb669500d829d51eaedaf9 SHA512 5f494abcf24d86272ae4f12cef67b6fdb52041dd4e66d303fe9886e29fc19057960f62e02c19fb8ab4509113be197924d632413f847f48fbafbaf3c4458de0f3 WHIRLPOOL d63ad05b80c307069914ea56a8147e93ed7e242044d6018fa4d70cc37f7b3dc0d8cc26258da3016cb9d40e2508122f6b936fdf5bf5b198f9720ff83f16758fec
+MISC metadata.xml 335 SHA256 f25b8ce2993093681b2a7173ac782499b48dd23faa4fa7e28759aa49ae0efd79 SHA512 fa79f68c0d6f9be6d4a5a308e3d3415b348ff5f4b15918b35e9489de0d854ae01ac727fb6095112244054036d40568badf8261d49839816f6e4bbae81e7fb0ca WHIRLPOOL 9c0611d62188ae13721809de52a5ec1ae1fa46fa9255930c43c1d3b9feba4f62f15ec38b7697f313d586f12af110642333b72cc70ea607bb20f6312e045205a9
diff --git a/dev-python/rtslib/metadata.xml b/dev-python/rtslib/metadata.xml
new file mode 100644
index 000000000000..0dbe3c5da042
--- /dev/null
+++ b/dev-python/rtslib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Datera/rtslib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/rtslib/rtslib-3.0_pre4.ebuild b/dev-python/rtslib/rtslib-3.0_pre4.ebuild
new file mode 100644
index 000000000000..6d946acafaf9
--- /dev/null
+++ b/dev-python/rtslib/rtslib-3.0_pre4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="RTSLib Community Edition for target_core_mod/ConfigFS"
+HOMEPAGE="http://linux-iscsi.org/wiki/targetcli"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Datera/${PN}.git"
+	KEYWORDS=""
+else
+	MY_PV=${PV/_/-}
+	SRC_URI="https://github.com/Datera/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/ipaddr[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	!dev-python/rtslib-fb"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	distutils-r1_src_install
+	keepdir /var/target/fabric
+	insinto /var/target/fabric
+	doins specs/*.spec
+}
diff --git a/dev-python/rtslib/rtslib-9999.ebuild b/dev-python/rtslib/rtslib-9999.ebuild
new file mode 100644
index 000000000000..6d946acafaf9
--- /dev/null
+++ b/dev-python/rtslib/rtslib-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="RTSLib Community Edition for target_core_mod/ConfigFS"
+HOMEPAGE="http://linux-iscsi.org/wiki/targetcli"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Datera/${PN}.git"
+	KEYWORDS=""
+else
+	MY_PV=${PV/_/-}
+	SRC_URI="https://github.com/Datera/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/ipaddr[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	!dev-python/rtslib-fb"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	distutils-r1_src_install
+	keepdir /var/target/fabric
+	insinto /var/target/fabric
+	doins specs/*.spec
+}
diff --git a/dev-python/ruledispatch/Manifest b/dev-python/ruledispatch/Manifest
new file mode 100644
index 000000000000..88b8bc01391c
--- /dev/null
+++ b/dev-python/ruledispatch/Manifest
@@ -0,0 +1,6 @@
+AUX ruledispatch_as_syntax_fix.patch 1650 SHA256 39de21047c2a9d1e4f17338c2e9d3c3169f064e6cd343474413223b9beeee0b6 SHA512 c8ba8d570f82975195be4478c8309c62372ec1f3693bfa9b1fb5a208a56f0984c62d0f2ad9f27751197f144acf9795d1cc0d1b599bcd494a3ffe017aa9fdd89c WHIRLPOOL 5e93276b018c2635d68acacf61bc8c2e954cf2cc097a5d04bca82f4557985c9303a548945b314b46c320db8b95013eee4c1f69ff25fd6c8b8d7b213aeb977580
+DIST RuleDispatch-0.5a0.dev-r2306.tar.gz 186405 SHA256 0ce33a6ddda379f8a14c12e43286c31b54a24ccb1cf990078a634722c80d01c6 SHA512 5ee5f22b6ba755e79c108925d321ade10c6a2e06c309e753650385d2dfbeb2830eaeccee6b71338ec38598c877625b95acf21b6059faf91e9f6119e533b133b1 WHIRLPOOL 840b2176f61505619cc9fb615577f839523d68fc644b9b0c48b738744c8f20b0e054c23f951541734f52d605eab8967b0488f23145067b15c78c1127db4bbd33
+EBUILD ruledispatch-0.5_pre2306-r2.ebuild 1333 SHA256 ba309aa81c378f8e0e7d7db7b65033f98a77a322587c050e70a40657675ccfbb SHA512 0205352079acbcae91822cb2f523aaf8f9de483f8fe1d9d87eac87f47a531e5c2c01622263f3ad4bf37008fcdaefa2f966759b851c24e30f1dbf9b9729042005 WHIRLPOOL 88a3b6b296d7c6f4481f65d993ae3bd8230672ba7cd36fa07cd9a1054ec242e8f8278f4b79996da5ebe7e0f59abe573a29456d0e0aa8b4b8269c3dafdc778570
+MISC ChangeLog 2505 SHA256 96d844fb3d0d735542f90ae65f3180c664ab10b29ba7b5391aac94893be8e16a SHA512 8215dc776f929c6168d5d2d8407d529f49311226e32ad908827fd7f2c9980d92b05688f84bf8d6e313d6503bb39bacd411c29d265542b672ca62e07d7b8cad0c WHIRLPOOL 846e246aca435a09f65644c63691e1f58deb7bf0ad5cd91ad3e87c3c5beac4d319ea4fb60f63ef7a012895d2fd7904f4931b4052652f385d5d98ae107b153f95
+MISC ChangeLog-2015 2687 SHA256 95ac4dede5b435c37debe0745bc582ece67770f2065a18d0282adff087c449de SHA512 0d8557e0ed80c86d18e069c862bd707075982f2f3aa2cadf805c77e9da7ecd0ba8d1ce1f1df1bf6bd1ad17fd3f77c29f3dc9b5da9fba09046011cc30b45b3ded WHIRLPOOL c8e8ff80972a482a9ca9f95ddb702b07afdfb38f4eb0e0cf6bcfe9e8fb59d5eae9430c03475876ef3e99e34b09ee61ae4d2d2e51da1ce8fbae51f36e254d2314
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/ruledispatch/files/ruledispatch_as_syntax_fix.patch b/dev-python/ruledispatch/files/ruledispatch_as_syntax_fix.patch
new file mode 100644
index 000000000000..47960b3c23f5
--- /dev/null
+++ b/dev-python/ruledispatch/files/ruledispatch_as_syntax_fix.patch
@@ -0,0 +1,49 @@
+Added by: Jesus Rivero (Neurogeek)
+On: 25 Jul 2009
+Per Upstream bug: https://bugs.launchpad.net/ubuntu/+source/ruledispatch/+bug/342916
+
+diff -uNr RuleDispatch.orig/src/dispatch/__init__.py RuleDispatch/src/dispatch/__init__.py
+--- RuleDispatch.orig/src/dispatch/__init__.py  2009-07-25 13:25:08.000000000 +0000
++++ RuleDispatch/src/dispatch/__init__.py   2009-07-25 13:27:19.000000000 +0000
+@@ -95,7 +95,7 @@
+     return decorate_assignment(callback)
+ 
+ 
+-def as(*decorators):
++def as_(*decorators):
+     """Use Python 2.4 decorators w/Python 2.2+
+ 
+     Example:
+Files RuleDispatch.orig/src/dispatch/__init__.pyc and RuleDispatch/src/dispatch/__init__.pyc differ
+Files RuleDispatch.orig/src/dispatch/interfaces.pyc and RuleDispatch/src/dispatch/interfaces.pyc differ
+diff -uNr RuleDispatch.orig/src/dispatch/predicates.py RuleDispatch/src/dispatch/predicates.py
+--- RuleDispatch.orig/src/dispatch/predicates.py    2009-07-25 13:25:08.000000000 +0000
++++ RuleDispatch/src/dispatch/predicates.py 2009-07-25 13:27:58.000000000 +0000
+@@ -236,7 +236,7 @@
+ 
+         return or_, (EXPR_GETTER_ID,)
+ 
+-    [as(classmethod)]
++    [as_(classmethod)]
+     def immediate(klass,seq):
+         for item in seq:
+             if item:
+@@ -260,7 +260,7 @@
+ 
+         return and_, (EXPR_GETTER_ID,)
+ 
+-    [as(classmethod)]
++    [as_(classmethod)]
+     def immediate(klass,seq):
+         for item in seq:
+             if not item:
+@@ -278,7 +278,7 @@
+             return get(argIds[2])
+         return ifelse, (EXPR_GETTER_ID,)
+ 
+-    [as(classmethod)]
++    [as_(classmethod)]
+     def immediate(klass,seq):
+         if seq[1]: return seq[0]
+         return seq[2]
+
diff --git a/dev-python/ruledispatch/metadata.xml b/dev-python/ruledispatch/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/ruledispatch/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/ruledispatch/ruledispatch-0.5_pre2306-r2.ebuild b/dev-python/ruledispatch/ruledispatch-0.5_pre2306-r2.ebuild
new file mode 100644
index 000000000000..1c538b5e6057
--- /dev/null
+++ b/dev-python/ruledispatch/ruledispatch-0.5_pre2306-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils versionator flag-o-matic
+
+MY_PN="RuleDispatch"
+MY_P="${MY_PN}-$(get_version_component_range 1-2)a0.dev-$(get_version_component_range 3-)"
+MY_P="${MY_P/pre/r}"
+
+DESCRIPTION="Rule-based Dispatching and Generic Functions"
+HOMEPAGE="http://peak.telecommunity.com/"
+# http://svn.eby-sarna.com/RuleDispatch/
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+LICENSE="|| ( PSF-2.4 ZPL )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=">=dev-python/pyprotocols-1.0_pre2306[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES=( "${FILESDIR}/${PN}_as_syntax_fix.patch" )
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_test() {
+	cd "${BUILD_DIR}/lib" || die
+	# parallel build makes a salad; einfo msg lets us see what's occuring
+	for test in dispatch/tests/test_*.py; do
+		"${PYTHON}" $test && einfo "Tests $test passed under ${EPYTHON}" \
+		|| die "Tests failed under ${EPYTHON}"
+	done
+	# doctest appears old and unmaintained, left for just in case
+	# "${PYTHON}" dispatch/tests/doctest.py
+	einfo "Tests passed under ${EPYTHON}"
+}
diff --git a/dev-python/runsnakerun/Manifest b/dev-python/runsnakerun/Manifest
new file mode 100644
index 000000000000..2c6dcfa434d3
--- /dev/null
+++ b/dev-python/runsnakerun/Manifest
@@ -0,0 +1,5 @@
+DIST RunSnakeRun-2.0.4.tar.gz 447278 SHA256 61d03a13f1dcb3c1829f5a146da1fe0cc0e27947558a51e848b6d469902815ef SHA512 2338d44ea57e7e9610e85dda5b2d806795d259e4e33e57e15f0ff8c938ba3dbcfc6df46d69f2fff3558879dd3b14725fdb7e0da939bf803776dc6bc95618ec24 WHIRLPOOL f8796d96a954b5d1b9556ef4e2113f494520b2a99142677581f1aca131c90bbeb9f1277d7892f6d58a9b750cc5a546e7f4c3b37c4372c31734a23e898a068aed
+EBUILD runsnakerun-2.0.4.ebuild 560 SHA256 f95b82479e1856124f2560940baabdc2c40bd3bfa4d5d6a3e8bc052509f85196 SHA512 2b2ba37867e4393d74b427219b1918ff04a689e12399943df85b43abb37416c872522043a7ce4548a9d05e3b8b5d797540d9f5c5eb5e52a0a004f2ed11f4bb40 WHIRLPOOL 9c15b48075f79a012b1b25fb69d844f5fa7ff3669584271d3b7bd07f6abd5e2fc9c07b438f29111984242d29ab2a3bd28a006d3d66ff9f9990cee6d9febfcb71
+MISC ChangeLog 2441 SHA256 d25de801a3adbfbdd13040d029c7d4398fabeb69d5903115fd3df4ba19905a66 SHA512 e7e5aceef04671650a0a54ec7d514909846aba9506477cf130137eb1ee9da1a0c5131bef2810330168f665e11a85f6ddc7cf5e6555210a076f676afdc15d6595 WHIRLPOOL 520f8e26d655ca847fcc7a6d69f7d91872350f8b6e8dc43f29ff7ad42016f084fc121a279d39d757d3bfcd0bef6323ae3f6b6a540aaab812e699da3b4bf21e05
+MISC ChangeLog-2015 934 SHA256 62641060281c290fe3a096ca8931153c8a30cd0793376e15b082c19a8ecf8934 SHA512 545c49bba037c426dcbcb7d8d78beffac38ebf3ac8340d8275866cb70f7aa90fb815c2d5ebd3697f2291a241d2bcf01ef66d5e88ea3724d0287a2643c09eea84 WHIRLPOOL bad94d752910cdee390d99e21eb0a266c04dd5299350880396e554bd5df08445ba5185cb7b3518386f40faca074721ea9ff30cf6bf09b38ead923ff89daf6b42
+MISC metadata.xml 438 SHA256 71258c2488af5f31cdcd809c6fa35c18a3f0e5cd446268c519d10b94c5c7dce2 SHA512 1c42c0f4bb37c94af1675e60392efa46284a89e381372e26f7038b2c782882caf4edfa2be2f836e36708fe3f838ffa7152db637d161191d80e1b94362e1291ac WHIRLPOOL 513e2a6c308c10e913b4fb28dc4891a4bf2e926fc263e3ee47c61c0a36eade3cbd38016fda09db2995fd02a29bb279ad0f1ceb36a3fb98186bfc054fccb7a34b
diff --git a/dev-python/runsnakerun/metadata.xml b/dev-python/runsnakerun/metadata.xml
new file mode 100644
index 000000000000..e64fa8d0c00a
--- /dev/null
+++ b/dev-python/runsnakerun/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>swegener@gentoo.org</email>
+    <name>Sven Wegener</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">RunSnakeRun</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/runsnakerun/runsnakerun-2.0.4.ebuild b/dev-python/runsnakerun/runsnakerun-2.0.4.ebuild
new file mode 100644
index 000000000000..e99e600ade39
--- /dev/null
+++ b/dev-python/runsnakerun/runsnakerun-2.0.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_PN="RunSnakeRun"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="GUI Viewer for Python profiling runs"
+HOMEPAGE="http://www.vrplumber.com/programming/runsnakerun/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	dev-python/squaremap
+	dev-python/wxpython"
+
+S="${WORKDIR}"/${MY_P}
diff --git a/dev-python/ryu/Manifest b/dev-python/ryu/Manifest
new file mode 100644
index 000000000000..804fb57845a6
--- /dev/null
+++ b/dev-python/ryu/Manifest
@@ -0,0 +1,10 @@
+DIST ryu-4.0.tar.gz 1344663 SHA256 bf6d1ad6977fb0b9ee01567fbb7a4ec28d70d14bff8fe4370b617b1228f1ee12 SHA512 fbc0f3f903098c9682215eb8fb99cedeeb29b2bdec94801c3832bbf90e7beaf7aa7173ccb87959846c4fe23d21a8390b6672817aec2cc6bc75ef20a376944154 WHIRLPOOL 32ed4b2f23b09785c28ad99b45e101750866f48ffc57294683db25af88ab19e63966eb9e6c649d3af1160e8381b785b01a3ed95de24929f45db2124ec9e00e59
+DIST ryu-4.10.tar.gz 1430320 SHA256 898342db7e45bd1c97e4d9643b48cf5df95a3f61e2f3ece2132d10325719e5f8 SHA512 956f1f8599ce6b76acefcca53f4c5fc5cb8fefa9dd43eeddb06611989329730afdd1cd3ed0f5bd57223cdfef3ff66233125a850f1f92e0e9cf76ebf3666428b9 WHIRLPOOL 0076fff51171bb0662fdfd55d5b948aa51fd487bde867cd18eb4b1bc1743e9cfdecf0fcd4fea791b4c8069e44bcbd91969a3501f13abba725cb42ec83cd19ee1
+DIST ryu-4.14.tar.gz 1492205 SHA256 84074fb96a394f687834551e7854f8da3bec42c6fc60b6020e70e79fa17476eb SHA512 e3fd7dc340c4b5cd191b8013bfcd8c0d6dd81489032dbb842fd1bd9f1adddddb715d8c8b92e59bf83fc4adeb7d36b9ee81bdb79caab1f4f10559e54f4da37c76 WHIRLPOOL b56aaeb6f4c91572d38e9c4df09b84b317cc687efdc7dd61de3ad6923cf40d2b74096e92be3f559d98748722f14e4327413c1262504315cf8f838d5f27b71485
+DIST ryu-4.5.tar.gz 1368324 SHA256 ef9ee003e4a3d37222119175d98c64f4684124c2c6cdacb16e67b308cd71e8e8 SHA512 5b109d5e88a6a6384ac59597677978e974e5747d2bd9324cc143ee5e29823a76c2e2d0354024ff6680ff090bff129933d6a3bdc227b82d0b157e1942950e2370 WHIRLPOOL 8918aabdf19f45bf47d7dee53003c2b52fcc596a47183531cff091877fa37f29748a15dcdb783161c5b5fe1f71cb0024a6ee210f54f1fcab0026cadf2a6ad815
+EBUILD ryu-4.0.ebuild 506 SHA256 6cd7d40fbb19315b849fe12f3d8dd9c01af83edfe5fb4f76de19be5641d4ae97 SHA512 db85c107b00572ccecfe474a2d5d5f061f0a369625d051d0c6524b0e8cf461add79d554b88be2c263a3b6c5f21ed8cef9af5e71d252c674e3af8c73a833b8803 WHIRLPOOL 64911496b2ddaa388c0e9999641e8c6b8afb9fd85ccb49860ce0ce013ed281e887bd46109559a4a99f71280faf00518735fd8abc2cdeaa7db478292f4a00f33f
+EBUILD ryu-4.10.ebuild 506 SHA256 5c57bbeacacfb2c656da9530d7822b2c2e8820f428f1a7b3db858afdc8041a4a SHA512 0f79562cd1872255efa837a090e6f9f259e60c2d386f514fac34173abf7d82bdac57e8caf4d7e668c3616f16f210e47a85b4ba19638f5c7d9910af630d973563 WHIRLPOOL 782275da47bd8bd9712272d6a4c18562e588b639964e3503b346e398b7c7b744c1ac4370ae651decb428c30c504ad285fe4da2d7231acca4a268a838cdcb8334
+EBUILD ryu-4.14.ebuild 506 SHA256 5c57bbeacacfb2c656da9530d7822b2c2e8820f428f1a7b3db858afdc8041a4a SHA512 0f79562cd1872255efa837a090e6f9f259e60c2d386f514fac34173abf7d82bdac57e8caf4d7e668c3616f16f210e47a85b4ba19638f5c7d9910af630d973563 WHIRLPOOL 782275da47bd8bd9712272d6a4c18562e588b639964e3503b346e398b7c7b744c1ac4370ae651decb428c30c504ad285fe4da2d7231acca4a268a838cdcb8334
+EBUILD ryu-4.5.ebuild 506 SHA256 bec6731464c48d26bfd3d0cc144d4e8d209556b9d8a77e370583ddf295e3a07f SHA512 9b15dfe6c652a6bd7b192f347a12c0e6457f932f4386ae00c15060029eee32b2932f8bdc7077921129dbfe24ef42feef5b4d0b344017c8b5cf841175c8665a2e WHIRLPOOL bb598a10ad83e81f16960ca2dbc61c87610dfe9cba125cd2619a8031e40ef046209ae8efe476d34dd962b113ac15356584822e043242fb0fab9ca88cc2a8e702
+MISC ChangeLog 2263 SHA256 bef5dc81bb6e8d19ebd6089bc55a5469de22417332bd08ac10e8df6c2c13cc9e SHA512 b7f40fa8b34aa1744f92c0504ce9ae2126b6e2771d5814a8e820dced3b63be6bd358af118b2c761470c4a0cf23668171a5486e0691b6cc50fdac78fb4497f9a2 WHIRLPOOL bb328c1186717fec547673733840fd18210b30d0c09706ceaf663976287da28ad5482e9eb7564799016e9bd827f03b0f05e4ccba374963b0f4f1617151cfdb53
+MISC metadata.xml 320 SHA256 97729649e7251f01e5f14cfec72c89378c620e4bb2895dc17c38e9a12a395009 SHA512 44ad18c381ba7c542ed25119d53ebc3ef8e6a2cc46cdd4bfdec51fa07d6250e9a59212e8ce3176f0f6b219726fd869b706f487ac86f5d3b8645ecb485ff68028 WHIRLPOOL a8a5a249063040eb1997b19947434eb1d5f2efe2c19c7b6c17b055ca80b0223510a891f71ab7cdd7f8b8e59bb1e50dba077f7a43dd53ef0d5a8d6a88169b18bc
diff --git a/dev-python/ryu/metadata.xml b/dev-python/ryu/metadata.xml
new file mode 100644
index 000000000000..e491d9a1ccd8
--- /dev/null
+++ b/dev-python/ryu/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ryu</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ryu/ryu-4.0.ebuild b/dev-python/ryu/ryu-4.0.ebuild
new file mode 100644
index 000000000000..45bf2c997655
--- /dev/null
+++ b/dev-python/ryu/ryu-4.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Component-based Software-defined Networking Framework"
+HOMEPAGE="http://osrg.github.io/ryu/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/ryu/ryu-4.10.ebuild b/dev-python/ryu/ryu-4.10.ebuild
new file mode 100644
index 000000000000..53e4a313ee99
--- /dev/null
+++ b/dev-python/ryu/ryu-4.10.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Component-based Software-defined Networking Framework"
+HOMEPAGE="http://osrg.github.io/ryu/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/ryu/ryu-4.14.ebuild b/dev-python/ryu/ryu-4.14.ebuild
new file mode 100644
index 000000000000..53e4a313ee99
--- /dev/null
+++ b/dev-python/ryu/ryu-4.14.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Component-based Software-defined Networking Framework"
+HOMEPAGE="http://osrg.github.io/ryu/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/ryu/ryu-4.5.ebuild b/dev-python/ryu/ryu-4.5.ebuild
new file mode 100644
index 000000000000..08612c0217a6
--- /dev/null
+++ b/dev-python/ryu/ryu-4.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Component-based Software-defined Networking Framework"
+HOMEPAGE="http://osrg.github.io/ryu/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/s3fs/Manifest b/dev-python/s3fs/Manifest
new file mode 100644
index 000000000000..f5e94ab7b7e6
--- /dev/null
+++ b/dev-python/s3fs/Manifest
@@ -0,0 +1,3 @@
+DIST s3fs-0.1.2.tar.gz 24574 SHA256 fba2471624b9840f050afb6d83eaec5e9b463dc497206532fa2b5590b7b58117 SHA512 52be23ccb2dd8c63675287895d00fda94adf010ac878ca12e5c8eefa25c7076c000b53bb4d2bb7886550cdd0d226cdf51aeee12f2ad7bac46537f190ba72ec2f WHIRLPOOL 0f20d14ddfca737f480da26d1a5fa55fcbc90f6966c03f9e9f44799ce8cbdbbe972c2c9283300c42c76edd4ac91575e25957e2fdfa5f9696785161c0b5bc480c
+EBUILD s3fs-0.1.2.ebuild 645 SHA256 12828144c00d46a238bac66fed086b4909eee2e6afe9877eb20d99b3907f3b57 SHA512 013d350b0775915fb8c66ee38287f82a14efb9362204f05a2369be44dda1e82e78aadc2d5ecefdc032eb0e1f80ff5958cce46a31d192af0974e196dd039345e7 WHIRLPOOL f94cc273822d5b32375bb290bb6f156ac9f2e3fe867b2e9c17ac6884e91d7a6d6add6d2b796094e5f54d91daa55d92e12833842c35dbefe7244162d7046739b3
+MISC metadata.xml 519 SHA256 e171f9af1090f78783d393e4136752a3602e992aac4126f10488eb9ebf0d8564 SHA512 f8c6696ea3f62243be9f39ea56dafe0bdf137b49aaa3ac2bd793301c043645d2ce63c6cd7cc1a476a8f554317ce518f501ce0775f89f8bebb66e3d3d806f4926 WHIRLPOOL 2585ed471f5fe2de545a88c9209e35fd00f84b5332a3d98f209f5f6c8e287c439084c9e6acbaba291ed1f98ef5aeab5e418f39a717d5d8837eece5da656b9aae
diff --git a/dev-python/s3fs/metadata.xml b/dev-python/s3fs/metadata.xml
new file mode 100644
index 000000000000..0c08864e363d
--- /dev/null
+++ b/dev-python/s3fs/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Gentoo Python Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    S3Fs builds on boto3 to provide a convenient Python filesystem interface for S3.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">s3fs</remote-id>
+    <remote-id type="github">dask/s3fs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/s3fs/s3fs-0.1.2.ebuild b/dev-python/s3fs/s3fs-0.1.2.ebuild
new file mode 100644
index 000000000000..89fdf050793f
--- /dev/null
+++ b/dev-python/s3fs/s3fs-0.1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pythonic file interface to S3"
+HOMEPAGE="http://s3fs.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/boto3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+	   dev-python/moto[${PYTHON_USEDEP}]
+	   dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
new file mode 100644
index 000000000000..8d87eff0cde5
--- /dev/null
+++ b/dev-python/s3transfer/Manifest
@@ -0,0 +1,6 @@
+DIST s3transfer-0.1.10.tar.gz 95508 SHA256 ba1a9104939b7c0331dc4dd234d79afeed8b66edce77bbeeecd4f56de74a0fc1 SHA512 56ae7d13d0f7818728adc08b458ec1937693e4232383a2a00f03ade725baea239d5fc2625d7d684d20191b51b109c187f3f2ec3633923ed5871db061af00f2e0 WHIRLPOOL d6ad5c58f5e6ce92c16c11dd7d3c6b841a06ddbd8f0cf493f36a6735db522e6d1ac3bc0c15c3dd5133b7f21a030540b0175a4b4ebf32c40e066203cd8f4f0624
+DIST s3transfer-0.1.11.tar.gz 95555 SHA256 76f1f58f4a47e2c8afa135e2c76958806a3abbc42b721d87fd9d11409c75d979 SHA512 83b85dadb696df9dfcd28719ccadba8aa0e8f36b0fe4ce4f61dfe00460617bae74307cbe6ba924a8de86fe527e18a34d66acb72f7a3d9001e670d76dfc8b60a2 WHIRLPOOL 823c8447da8ca7c9fb3507df27b8b7fcef561120017800b8521660ef242751f9d9346cc1e514ecbcb5f4d01d03900b45634b9b1b0495eac6061f593a47d49cac
+EBUILD s3transfer-0.1.10.ebuild 1030 SHA256 790801b21a663c8b4a872e31aa598cd4a9dcf419d0e6c630cfb26def5f76ee55 SHA512 adec1d6c1623fbf35dabf2080a2d48c9ed7fb5313fb7f949c85970a3594774898eba1fb87d9f329f6ded843904fa39c4d6524cfbf227a556ce956ab33e7bd81e WHIRLPOOL 5230669dcd25f289c2337e305f2dc4ec5eadfda240dd3e5b21fa1ea2b5a312d16bbf1a501d1c2a228fa9af45a7f7d4577840e249c02f8cc9c15001ed1148d8bb
+EBUILD s3transfer-0.1.11.ebuild 1028 SHA256 1872255d9fc7ee05e16de6659e1b1a718c8d54d1d692d81737f0d8410e3b5801 SHA512 2a9ad77eb825d0851ad68e02c70f4873925379c1cb91b7fa7faffc8315fe67fc3c47c32d5c696724dc012500a12edf774a4a13ada56579d39bea4c72ac517418 WHIRLPOOL 4363cb82d883f96f2765781424e6836b8c01c11b323ad35a93bb0c4756cac2407ff0669c19e7723713c267bebedab5934499fd5ef423b88e4318e02cf724453e
+MISC ChangeLog 2725 SHA256 5c85d0861764c013380a8e6a7ac1687bea2b49ec0b23c23b58bde7de33a9a63d SHA512 e893f341e88f50389d056943582f70bf434f93a9c96972e6970958a2a43d27e9df09206730f1db28406658d21c5dbc537ded80f0b1a15c05f6af029edfccfd5c WHIRLPOOL be8f8760fc0e2ddd82e3a87b31e4f0c824bfacc35e97d2b54437f2b123ccc45b9937e05774fbb7bde31258028088ec956ec2c7dd549f7b5c0cf7008efc4e4644
+MISC metadata.xml 565 SHA256 243c7cdfd4d6ac967622ad62f2d15e8518dd485483aca2cdfd62b0eb24b8e47e SHA512 7513c3c2a64fb6af4c14f4b1e098b232101eec19cce1db55eb1b87d4d5f63e8ff99f8586f3c508786cf9045762d307430f12fc648fe0d553598cf418b224127f WHIRLPOOL 1d5dde9d2f4f02ff3801f2cdc533efb1f19ed4102406780ecfaf6fe0dadfd6b0d5372f981b851ebcbfdb4a66919732e11bb99983306515b566468e59bd48a639
diff --git a/dev-python/s3transfer/metadata.xml b/dev-python/s3transfer/metadata.xml
new file mode 100644
index 000000000000..32397e5e07f7
--- /dev/null
+++ b/dev-python/s3transfer/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>klausman@gentoo.org</email>
+		<name>Tobias Klausmann</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">boto/s3transfer</remote-id>
+		<remote-id type="pypi">s3transfer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/s3transfer/s3transfer-0.1.10.ebuild b/dev-python/s3transfer/s3transfer-0.1.10.ebuild
new file mode 100644
index 000000000000..13a77a3441db
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.1.10.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="An Amazon S3 Transfer Manager"
+HOMEPAGE="https://github.com/boto/s3transfer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/botocore-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/botocore-2.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/futures-2.2.0[${PYTHON_USEDEP}]' 'python2_7')
+	$(python_gen_cond_dep '<dev-python/futures-4.0.0[${PYTHON_USEDEP}]' 'python2_7')
+"
+# Pin mock to 1.3.0 if testing failures due to mock occur.
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${CDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/s3transfer/s3transfer-0.1.11.ebuild b/dev-python/s3transfer/s3transfer-0.1.11.ebuild
new file mode 100644
index 000000000000..eda0e7e539b9
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.1.11.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="An Amazon S3 Transfer Manager"
+HOMEPAGE="https://github.com/boto/s3transfer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/botocore-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/botocore-2.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/futures-2.2.0[${PYTHON_USEDEP}]' 'python2_7')
+	$(python_gen_cond_dep '<dev-python/futures-4.0.0[${PYTHON_USEDEP}]' 'python2_7')
+"
+# Pin mock to 1.3.0 if testing failures due to mock occur.
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${CDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/sabyenc/Manifest b/dev-python/sabyenc/Manifest
new file mode 100644
index 000000000000..39beccc9bd04
--- /dev/null
+++ b/dev-python/sabyenc/Manifest
@@ -0,0 +1,3 @@
+DIST sabyenc-3.3.1.tar.gz 16072288 SHA256 000eb1c125f43e5652e375890c9437155d0dae76aea743706ec5da547378ea42 SHA512 971a5936eb89c8e34d2a97d4a95a139584a8749c9f7172788c17cc1d184f460477da72e008d57a34ccc235867e0e5b4026b30ad229e31bb96f55a0b74da90263 WHIRLPOOL 56464827a01bc3114c14565df7541166f9b6d8b3908b40eccbd113105a43677fbd590c3608626ed89e12506c88cc693b79a91e7028063076b3a9f119703af32c
+EBUILD sabyenc-3.3.1.ebuild 597 SHA256 8d89d61c90c01591895d8853587835f01d440ac6f4b6fd3f69f31c90a61ac3c6 SHA512 ef04bfd15a693ea915396d025763efa2908daa826258d9532f7891066015054700bf5d3452785011d0e9ec4e1504427ca2f1f16f6b24ee39399ec6cabbab425d WHIRLPOOL 3993756407385f66e7521dbe64762d42b8ebb1e8dca7de20f702349883a497a472d50571af88a6ff5a2df130e78654d4246868b2c6a7316eb3201e701ec97d49
+MISC metadata.xml 220 SHA256 f5e6323054e9208bc11695e184550973ea677e8a34b8c14963e15789b52823d9 SHA512 878b4526d51f7901900ec97fb85bb90e0d1099d29bc8e49dd7cea6258da0737e71aec3377f1bc2621cf96fcf7c5699e424bbc5fb721af2f365742725612fe50d WHIRLPOOL 34f5893d07df7bbf34847492861e50da5a3a90c58828403291c37e8fec126650b9b479eafd897be85ee62d2662ef23a4b49c09baa32e1d2f04a8830f7c57f58a
diff --git a/dev-python/sabyenc/metadata.xml b/dev-python/sabyenc/metadata.xml
new file mode 100644
index 000000000000..664b1a9c9e03
--- /dev/null
+++ b/dev-python/sabyenc/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jsbronder@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/sabyenc/sabyenc-3.3.1.ebuild b/dev-python/sabyenc/sabyenc-3.3.1.ebuild
new file mode 100644
index 000000000000..0a4c2171daf4
--- /dev/null
+++ b/dev-python/sabyenc/sabyenc-3.3.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Module providing raw yEnc encoding/decoding for SABnzbd"
+HOMEPAGE="https://github.com/sabnzbd/sabyenc/"
+SRC_URI="https://github.com/sabnzbd/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
+
+DOCS=( CHANGES.md README.md doc/yenc-draft.1.3.txt )
+
+python_test() {
+	pytest -v || die "Test failed."
+}
diff --git a/dev-python/safety/Manifest b/dev-python/safety/Manifest
new file mode 100644
index 000000000000..87078b9ab7d2
--- /dev/null
+++ b/dev-python/safety/Manifest
@@ -0,0 +1,4 @@
+DIST safety-1.4.1.tar.gz 1506167 SHA256 6c20667a2af864b1f2303a2491d4a640cb3507987cea7a102438a4736cdb875e SHA512 ae26ba6c9de77d42a132cedc398e425efde891a7832ac6a95c736ca00400834a3c5b867e362b9b908e40fcee3c9bbc1009a40e4a0489154960695adaefe1c06a WHIRLPOOL 1a99175bfb92d69c5e1e36d41264945ae1f5891784b50670d528e1a78ad0a1b5d774e4d7d983387be85e7f3984c6b5c0a84c9c5a98b9f3ff3057cd4171c30f71
+EBUILD safety-1.4.1.ebuild 714 SHA256 117dc77dd6403bf23f0d921a46ec23b5bdaa564cf4847ba441f75f6f5a756db2 SHA512 98a0272e3ad916e6627470ae62e52e7956d8de1bcde198501d7949eb607175d7cad8e8c8f62686cbdd6867663e0d337574095e10928e6d3381a8c748ff1af252 WHIRLPOOL 8e125d3dd06e04e3e0ba8b5025771339a4cc0c38b4b109095d239fe2f143857210dec0254a46aa3bd450d662b4fc38144a00578947a722d23e40d4e4e5ca2a06
+MISC ChangeLog 780 SHA256 76698ff99fc2a52d7851ffc3c3baaa6ddda2ffc358792722e6910fc935f08478 SHA512 9929b6f26a162f3b3fa6d650c61179228cd5200a6bc930d25a34044b97ae519054af79cd5fe9cb3eb944b6e090b661950fc8ef481cc67e94314f6e2c74a15a0f WHIRLPOOL 5a82e25a9f3160a67e35b7d90d60354c668d6a7f647f0bca3f83109dbb2a750b52906644605ecbbe34033e3a37a9d2334c2bc1784b57c79561e96de3a1cd5dba
+MISC metadata.xml 245 SHA256 e79326ba32df9dcb4fa695afb1d2789a500b14767e1564c54ffc5b0ea5146622 SHA512 f7920ffedce17524370277be40a0dd6cdaf9771413a2c22ab8b9d2f8d4bd678ee6a9a3305a91ea2b79bb3556ffee79f731e792380531d551902a347839926ba1 WHIRLPOOL b659b6f363fa770263ee13452af75018ca3bae7d4344e41e1f6f2e34ffaee8b8bd49b59337b0f4e7ff6f7fbdd6217ded2b18260de1d38652cb138c154ac859c2
diff --git a/dev-python/safety/metadata.xml b/dev-python/safety/metadata.xml
new file mode 100644
index 000000000000..b13ca56b4121
--- /dev/null
+++ b/dev-python/safety/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-needed -->
+	<upstream>
+		<remote-id type="github">pyupio/safety</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/safety/safety-1.4.1.ebuild b/dev-python/safety/safety-1.4.1.ebuild
new file mode 100644
index 000000000000..5c1e30c010c4
--- /dev/null
+++ b/dev-python/safety/safety-1.4.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Checks your installed dependencies for known security vulnerabilities"
+HOMEPAGE="https://github.com/pyupio/safety"
+SRC_URI="https://github.com/pyupio/safety/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/setuptools-16[${PYTHON_USEDEP}]
+	>=dev-python/click-6.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}"
+
+python_test() {
+	esetup.py test || die
+}
diff --git a/dev-python/sampy/Manifest b/dev-python/sampy/Manifest
new file mode 100644
index 000000000000..e0c44fa8dcaa
--- /dev/null
+++ b/dev-python/sampy/Manifest
@@ -0,0 +1,5 @@
+DIST sampy-1.2.1.tar.gz 63520 SHA256 5c8d913d95cb432c11be29ab42414f05ce13ef16a811b8118d5ff69dceb1fc67 SHA512 a531d797b1ce3539a78cdb6ea9b943adad1537ce4e151925b9ed44513fcff1de625026e2d23abc39cd326f69cf71849124395c3cc874c603ecc60ab14e188d13 WHIRLPOOL 9536e320e983ac1f7e31eb1d4de2ba60834f29dc3000b8b5dd87e70fa6881650b4c2e4cc11478b28046e2cc01974441b1310b4fae76ba550578169cb30ccdf80
+EBUILD sampy-1.2.1.ebuild 460 SHA256 ddc089fbf757408513b29ef533a06e9eb356a0145d282ce322a0f11381c83afe SHA512 d141621bcb46f6662032f74f7e11d729f8a4685a51367dae0433c1d74568acf65874968d80eca3667b0eb14bd0200e4291ef2fd46732ef081c0df1e58d7ad822 WHIRLPOOL d01cd047f43764bf17ef7853d3b25e30d68f517082ffcf8263d79dd0e8887fe0cd4c7afff0053745733be6301e52ed39c4c897454599dfccf8f06541da52b7d9
+MISC ChangeLog 2423 SHA256 187605c4681c9b1ec14c83cec4bf2318a7c9f81f8047f36489b04dfb6a18645f SHA512 3421e3442216bbfd3f55bd02fba814efe2fdd83d71fbd10f8c12b57972458d4a8aa1ff6c8be96724dbefa07131ef44f059ba21c7da5db304e9d34d4e775ec6d4 WHIRLPOOL 13bbb19d34d3a2d9ea78ffcbe45ef5b2390cfabba843a41618b516dde9cdb4ce881a923f5408ae5af2170d55ac2d8ba14702dc4d5bf9782723db927b455547b8
+MISC ChangeLog-2015 537 SHA256 8e8104cc1bb5a4b1339c53158cae4347402eba2d30ecd393a7465327719ffa17 SHA512 6dc477edbc9793b0d296f154b805f4d45ad32a4d71a4f8d875f1d5ffa3069c32d70e7ccfcefec04be144bba0212f3bf5411bc47133347f53921c044282f4b8e1 WHIRLPOOL d5f3a25e1bcf51e529cebd2b71888055a1a0a8b2539be778022d524e9f0b16d041d3297a002d407af8ca4f5486c1085d0c3295f7f9c8403761d6869e16246a9b
+MISC metadata.xml 537 SHA256 46a87dce1e4a7cfd4ce3625640198074799fe43e9eb47e499523f96b0c765556 SHA512 be34835ecfdc10e52648e3c0ce500d5d6341266b16ca8accc12f60832186f39a5ada1ca711645f52eb4c53daf8e1ccfef7eda9191aa4489ee9156311446683cd WHIRLPOOL 207bea7c390809b13ee4e81a4e8658b7f30b2b414542ac37706225ea8c1a141ecd2f781db93d4fd45577a94fe8909ed9f478ea12095349db5b6abd16278f772f
diff --git a/dev-python/sampy/metadata.xml b/dev-python/sampy/metadata.xml
new file mode 100644
index 000000000000..8b8a18adc9e4
--- /dev/null
+++ b/dev-python/sampy/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>sci-astronomy@gentoo.org</email>
+  <name>Gentoo Astronomy Project</name>
+</maintainer>
+<longdescription lang="en">
+  SAMPy is a Python implementation of the Internation Virtual
+  Astronomy Organiztion of the Simple Application
+  Messaging Protocol (with Web Profile support).
+</longdescription>
+<upstream>
+  <remote-id type="pypi">sampy</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/sampy/sampy-1.2.1.ebuild b/dev-python/sampy/sampy-1.2.1.ebuild
new file mode 100644
index 000000000000..2658fc8b64a2
--- /dev/null
+++ b/dev-python/sampy/sampy-1.2.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Simple Application Messaging Protocol messaging system implementation in Python"
+HOMEPAGE="http://packages.python.org/sampy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/sancho/Manifest b/dev-python/sancho/Manifest
new file mode 100644
index 000000000000..70ea4b98881c
--- /dev/null
+++ b/dev-python/sancho/Manifest
@@ -0,0 +1,5 @@
+DIST Sancho-2.4.tar.gz 7962 SHA256 52fdaa6e13e242d0b3be09bac733595a2d6602e0a975d00c72233505a14f35db SHA512 49230ee8a05dbc5bf3d7b3900504f47a3a47f013878e75f93c277610e4d22f9714b9a58a41a779e25b0ddb9c24ff351508c0b72c78fe146b8371024345629e21 WHIRLPOOL 204db0afe5bae499a985b2c41c5b5939a6817c2251a29c39a0797ee26da99195f2a802647586968464f9307ac63283ca6aa2fa4254f753a440436066f6531703
+EBUILD sancho-2.4-r1.ebuild 1076 SHA256 e347f48a8c25225a0c821cad93337a779e36e23823d9fc6ddddebae37a18561b SHA512 504ddcb48fd25ddec2bb7fe3ca38361969240c256c3dc290f4cf74c970e969c7de313badba9ea17257f59dde1c2ef50d97a11167df56ea2cde7c91fdfba31e24 WHIRLPOOL 7f27665b28d842b4abdf34bef37bda5585e6b688e85655150221774c4a45a299fb1c9a92a9ebe19cebba6bb381098d10072ec8eec8048ff25c817f4bf2d87ca2
+MISC ChangeLog 2907 SHA256 374baac7912907005a2b53491d78f93df035c1ebf31de6abf8c5036d4bd70873 SHA512 bb0dda1e277324d00965f993fa4b452edb8013b236f81780ff677ddcd0d624b19b34d8334e200f9186c9009daf98fdd5a20a02af39b508505345fb24ae4f67ac WHIRLPOOL 8017f888668be88aff87ecad7c914b3550bf0e2ecc6c9f2800f23c81cb20c8910ba64b548a3fca825f12ef7455de4ec16c044a825413d79158f9e4e7461dce7d
+MISC ChangeLog-2015 5611 SHA256 5d6116de6aaf2db094143eede94c458a7014d4f2628e5b23323716936557eb28 SHA512 9d274a806b8be819b36a5e89dd20b6ac9f04e41323bcf44dda91ccb482c0e6016c53985ac92a1f5feb4f6e4a3126617e7f957b0b7a78c3d7ad318c5b3a607cfc WHIRLPOOL 23882fb748cdcf4ac3903742c4dc73f7115ede0c3faf1bb0a4ee23abd8e53c905355f6d9dadf67bf83e68d8e8683b32ad2e942fe5ed33f2f65ff385b376ec7d1
+MISC metadata.xml 312 SHA256 062d5583d97b432e93e9707d0eee1147becf0075ebc092c4217c288a13c1ca62 SHA512 088e74f48915eaf8bab9d7a17ba2f4ffa4696b6c93ec291c13406f48665b344dae925cc46468c9d99523eaa848c0aa6fef54bf6a7bee752f4fadbe149bcda59f WHIRLPOOL 7e3d698277c48ea43944017842aca0a0a3e80188fa50887a73d9d41fc146fbfe3ade5a0806e314dd2934b21cba840ee4a1378793d6364768371d75c04b5530a4
diff --git a/dev-python/sancho/metadata.xml b/dev-python/sancho/metadata.xml
new file mode 100644
index 000000000000..9cbbcb5053ac
--- /dev/null
+++ b/dev-python/sancho/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>robbat2@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/sancho/sancho-2.4-r1.ebuild b/dev-python/sancho/sancho-2.4-r1.ebuild
new file mode 100644
index 000000000000..3ae77d7de0e7
--- /dev/null
+++ b/dev-python/sancho/sancho-2.4-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P="Sancho-${PV}"
+
+DESCRIPTION="Sancho is a unit testing framework"
+HOMEPAGE="http://www.mems-exchange.org/software/sancho/"
+SRC_URI="http://www.mems-exchange.org/software/files/${PN}/${MY_P}.tar.gz"
+
+LICENSE="CNRI"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	cd test
+	local test test_failure test_failure_count=0
+	for test in *.py; do
+		test_failure="0"
+		ebegin "Testing ${test}"
+		"${PYTHON}" "${test}" > "${test}.output"
+		grep -Eqv "^${test}: .*:$" "${test}.output" && test_failure="1"
+		eend "${test_failure}"
+		if [[ "${test_failure}" == "1" ]]; then
+			((test_failure_count++))
+			eerror "Failure output for ${test}"
+			cat "${test}.output"
+		fi
+	done
+	if [[ "${test_failure_count}" -gt "0" ]]; then
+		die "${test_failure_count} tests failed"
+	fi
+}
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
new file mode 100644
index 000000000000..235bf9166c7e
--- /dev/null
+++ b/dev-python/scandir/Manifest
@@ -0,0 +1,5 @@
+DIST scandir-1.5.tar.gz 29351 SHA256 c2612d1a487d80fb4701b4a91ca1b8f8a695b1ae820570815e85e8c8b23f1283 SHA512 e6535e92011cc2c5f888ddd083a9dc48921609fd59d9bf9a4bcd596c055dc0510d48f6d3571605bbade3bd0e232e8bae94b44b20ba935e7ffdeec268ba3d2ee4 WHIRLPOOL 87808f7c76be95956a609ff1246fcd74103129883bad7300fbd5db7f743e9fcc93031d2d95d58cd36eb4bb6f5bcceadd5b77a4d2c2f3ce1d902073b9e55c4140
+DIST scandir-1.6.tar.gz 29670 SHA256 e0278a2d4bc6c0569aedbe66bf26c8ab5b2b08378b3289de49257f23ac624338 SHA512 d01e0551696787caded787a430eea787a69a27c725505277420fd607b3fcc892218377bb340651fd906bdeb3a57e99879df3c86aeadd2399fcbe45cb2118b9db WHIRLPOOL 1069eed1d89a56dcbf078c03d37a00e651e38d8692e7f55dbc350cadee94f4e93afb327515498bead20b54698143efe69d159bc222ed095140654c87dfe50f78
+EBUILD scandir-1.5.ebuild 545 SHA256 1d60b39a33dcd27f09afadcdb13d3ef25ac10e0e89a693cf1c72a127261079e6 SHA512 9900677ca6b68ce43222ba4b24eb50db03e012cc247d3f17326e73784e2de770ed079f51072aac89a342dd524009454d099122626d4694c4d7eca18a4fd67799 WHIRLPOOL c827e80632ffb78ae2552e711e60245e4f62a41bf11b150fdc33c5388098488348c8b2109ea52d002e180903eb9eef2c0b924c8e9080c1f0055cc3a9e36218fd
+EBUILD scandir-1.6.ebuild 547 SHA256 1061f5a801fc6ca9ab3ba01dd2c466a8b491cd1783b382b6d4f931c24e189a63 SHA512 cc758553369532297087e3cbdf700d66603dfa4aabc20efb91ba282cad3da88732f4f155c470fdcbaecc612d3f4e0d4459265838c8868e57a48acee14c255db9 WHIRLPOOL 0e6ca779e84da2e80a959cead856f88c40f623bc4b5ec1033e6a0aa36c81e9dd426d274d9ff7ac3018b8fe2a8cbf02ab511ad21ad3c91338a825bae555652d07
+MISC metadata.xml 495 SHA256 42a5686712a5f57b4f3572d572ece353d5baed8d8b85962c47084ceb24bbdda7 SHA512 e762fa761b5b00288870eac3af8aed0d05efba207d83138adc873da902a7e197b710caeb87a3083e5f23436f4a2c799996fe07201195de065bd430b9c35183ee WHIRLPOOL b4891db9b5bd0668add7316835aa38d764eb602aa3b3cda30d420bd5259ae7eda48d7b19f07261ee83956c50c5c1dd34891b43fe78e87fe963615e415b943e05
diff --git a/dev-python/scandir/metadata.xml b/dev-python/scandir/metadata.xml
new file mode 100644
index 000000000000..ddb3745e14bd
--- /dev/null
+++ b/dev-python/scandir/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+    <name>Patrice Clement</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">scandir</remote-id>
+    <remote-id type="github">benhoyt/scandir</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/scandir/scandir-1.5.ebuild b/dev-python/scandir/scandir-1.5.ebuild
new file mode 100644
index 000000000000..b7fc9cae5d25
--- /dev/null
+++ b/dev-python/scandir/scandir-1.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A better directory iterator and faster os.walk()"
+HOMEPAGE="https://github.com/benhoyt/scandir"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	${EPYTHON} test/run_tests.py -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/scandir/scandir-1.6.ebuild b/dev-python/scandir/scandir-1.6.ebuild
new file mode 100644
index 000000000000..536cb8ec1db7
--- /dev/null
+++ b/dev-python/scandir/scandir-1.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A better directory iterator and faster os.walk()"
+HOMEPAGE="https://github.com/benhoyt/scandir"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	${EPYTHON} test/run_tests.py -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/scapy-python3/Manifest b/dev-python/scapy-python3/Manifest
new file mode 100644
index 000000000000..0ca0d31b7603
--- /dev/null
+++ b/dev-python/scapy-python3/Manifest
@@ -0,0 +1,6 @@
+DIST scapy-python3-0.18.tar.gz 2052898 SHA256 23c19d0dbba07b7a7681d97784371f92fb570cdea3ae58e12bf19fe98c7bf7ad SHA512 3b39e8cdb60dfd5d1e92eae681eb08f065ba14bbd647d55f3d4f62383a459c217024311c945c3731f1a58fe47e6b525492e760e2e1c8ea6eb807f7d59c975c5b WHIRLPOOL ce5794f4be40250a05855cdaed2370762f113cd0deb6b1d7160b9198b43ecf1f3301593360183974ec2be1efdbe48c25d8fb20fd210a89254aa4739f8ab65ed9
+DIST scapy-python3-0.21.tar.gz 2179545 SHA256 abe65bb75cb9bcabbb69399c548c7981260f06439a1328d87d3d6ed66a978202 SHA512 d1f5eee914a25a7217f187fe8c757d330aa0375e1c90fb2e5f71ffaa2c7f97d0bf7e62f1e5ed9f9b7238a5d467d3c4f7186f5238b6d7444e94d9d98a1a602f76 WHIRLPOOL 848d00f84a84d74887c7bc628acffc7064971e841811516cbbaeb73f3be52234edec2ccff3b87df0cb64eea20a9eea88e431d2682616a18c4af6fa1408add0d3
+EBUILD scapy-python3-0.18-r1.ebuild 497 SHA256 289e52f72873b234409e8d4f25301c31a910ae5e75b440a686cf60a98ae8085f SHA512 6d0bc515e3cf83558619089761a3aa316a15f77b7697dcb206e753b22755b17a0a9ffef152b7998e86d90a3e0bd02ba775fe6bb689cda5906d71127c6fe9819f WHIRLPOOL 4d188667b7571907720ee36a891b8dd66e24aab9898880a01e4c4087cae45ac05baec424e74928e5cf89c9f2edff531ea3b1ffd49d8eb3ef12dba625f151df39
+EBUILD scapy-python3-0.21.ebuild 497 SHA256 e25e7cca99a70c7d9e268e95b23dc1722cd6a78a0ade46dfe6cc180123451723 SHA512 fa93d82f0a4b7511abe0483c381ec495d67f510087b9b851bdf82e60b9827e23a6f2e63323f0ae2bd79dcbd23cac4f8e8c194d3652d414ce203df8e9440cf0ac WHIRLPOOL 1ea623f1acf9b0a356e7d2a8061167f92f5629830984d0676b264f7270359ec6f80e78e79151f9fb488efd4c95046ee0fd1b73ed758b164d5bf03772990ac375
+MISC ChangeLog 725 SHA256 6ab43d1e6069501aa7c7a8ccaac68e86003517ab82bf9d18b180655ea778de2f SHA512 861a63046095f6661cd599b33d13237b4897c935ceb34329e6b6b37e482f85d19bc1ce8f304b9653b4bbec7af43f7fd455fa20bdef7baf8ecf47f0c08b505c0e WHIRLPOOL e7ab663779d8e7e869a09362a93cf3104ae2e020e6f690508df376e9f33354e876643634ba4f34a314bea33ac854ab3250931c2b8067e9185598bdb3b1a5abd1
+MISC metadata.xml 337 SHA256 5d8ddcca6fbc73ceeec2dc23f998c967b548c66aadd55a1b830e3cf521f29c7b SHA512 f1db650a75e270880cb99040ed60756d8f72abc487289f2e4eb88fad0b5bb40047eef1f4da5eddcbf3086aa9ac0dcd03a79699507e027865ab4e3d06f12d1d04 WHIRLPOOL bdb1456ef4284ab0cf3788de27031dff75025f7640f27fa8b3f8f5b38a6242626cd6084ad76373456a1ca7561bf97796c7ad3d37b91a3e0d32712a1595a29104
diff --git a/dev-python/scapy-python3/metadata.xml b/dev-python/scapy-python3/metadata.xml
new file mode 100644
index 000000000000..f0074601b7d9
--- /dev/null
+++ b/dev-python/scapy-python3/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>klausman@gentoo.org</email>
+    <name>Tobias Klausmann</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">scapy-python3</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/scapy-python3/scapy-python3-0.18-r1.ebuild b/dev-python/scapy-python3/scapy-python3-0.18-r1.ebuild
new file mode 100644
index 000000000000..a8ea7528943a
--- /dev/null
+++ b/dev-python/scapy-python3/scapy-python3-0.18-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+IUSE="test"
+inherit distutils-r1
+
+DESCRIPTION="Packet crafting/sending/... PCAP processing tool with python3 compatibility"
+HOMEPAGE="https://pypi.python.org/pypi/scapy-python3/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	!net-analyzer/scapy
+	"
diff --git a/dev-python/scapy-python3/scapy-python3-0.21.ebuild b/dev-python/scapy-python3/scapy-python3-0.21.ebuild
new file mode 100644
index 000000000000..07ba265c3d9f
--- /dev/null
+++ b/dev-python/scapy-python3/scapy-python3-0.21.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+IUSE="test"
+inherit distutils-r1
+
+DESCRIPTION="Packet crafting/sending/... PCAP processing tool with python3 compatibility"
+HOMEPAGE="https://pypi.python.org/pypi/scapy-python3/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	!net-analyzer/scapy
+	"
diff --git a/dev-python/schedule/Manifest b/dev-python/schedule/Manifest
new file mode 100644
index 000000000000..bcd2e79e7474
--- /dev/null
+++ b/dev-python/schedule/Manifest
@@ -0,0 +1,3 @@
+DIST schedule-0.4.2.tar.gz 10104 SHA256 933fb83fce86826f03abd2850aa693c73fe6533fa1c7db4ef1d90c90a7ae8611 SHA512 f088f82a0449350658028b2035c5fbc71bda4d019856fe6ab3363798e9d8d940cce603be544401ecf5f844606e5891ab560c390f5c334a825bf611e6ebfb00ac WHIRLPOOL 41d6c85c311604594cc14d2c276831ee24af866daa13a72b0ad512988c1d568e56c8a1ec4082458d5a0c98c9ba529eb59b410c3b347de2b759c7857debaff38f
+EBUILD schedule-0.4.2.ebuild 550 SHA256 ff5fdc9306868e2efe7a817a1e03f03120d21431aa9eb2030ca93b8128cb29a1 SHA512 ae5306c39bfbaec7f8f193ab19d024f1cb0abab823cf09b34c04be785dd1b65d7c41309d843a9e696f6c5c85c342bf45eb07f04a58ac8690787db2d020489f07 WHIRLPOOL 549c43aa1d2aaecc399ce29ffb3e6b07c0caea2b9d4628ce0aa8ee37689ce510003f713bb859fb2c6e3ec85879093a2a15a42706dbff5f5b3d6ef6f6e1cdadc4
+MISC metadata.xml 366 SHA256 621cb08b9d625001d5bc7ec505facc27328bfe3582c0282ae5e1b30273a6fcf0 SHA512 79904ea302d7997cab092bbba036ccece5871ae66cb8623d0a828dc71e00c86d4db1e8e0233aa1ddd2d0bc21129d3afc8be13e0f7c4868472bb4a9fbb734fe52 WHIRLPOOL 8e1f25eede48e3a4c70709a278358eade497789d96c07bddfca328b667800fbeae18cd80aa97b08a9c3bd5515443e66c2c11d1a21959ed9af104f1b7e44849a7
diff --git a/dev-python/schedule/metadata.xml b/dev-python/schedule/metadata.xml
new file mode 100644
index 000000000000..724ce6c0f6a6
--- /dev/null
+++ b/dev-python/schedule/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dbader/schedule</remote-id>
+		<remote-id type="pypi">schedule</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/schedule/schedule-0.4.2.ebuild b/dev-python/schedule/schedule-0.4.2.ebuild
new file mode 100644
index 000000000000..121233ddb8e6
--- /dev/null
+++ b/dev-python/schedule/schedule-0.4.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 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 distutils-r1
+
+DESCRIPTION="Python job scheduling for humans"
+HOMEPAGE="https://github.com/dbader/schedule"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/mock-2.0.0
+		>=dev-python/pytest-3.0.3 )"
+
+python_test() {
+	py.test test_schedule.py || die
+}
diff --git a/dev-python/schema/Manifest b/dev-python/schema/Manifest
new file mode 100644
index 000000000000..c3bc13806b1a
--- /dev/null
+++ b/dev-python/schema/Manifest
@@ -0,0 +1,6 @@
+DIST schema-0.5.0.tar.gz 8765 SHA256 fa982e925cfe56ce036b5776aff6179621cae5994b9066d17a33143fd5ddf883 SHA512 8eab5f8dc8e544d14c19b9355ffe5f542dd06003133bcd3fc642f95cf1da8286a0146fae666ba656450d4b564da6f0933b9d64ae54e88202b4c5c5150ffbc033 WHIRLPOOL eb73ab0b399bb123a109721f14f2283c5e7b1ed08d55ba7cc04ccece4b745979515cd5d1913e3f099738fdb64e83f5202ebbfacaed523cd0828245de62fac771
+DIST schema-0.6.6.tar.gz 13490 SHA256 758b59ffc654d3794f6edd6e67db948f26164ddcd3cd7dde8bbeefc4934482d3 SHA512 1a0729b30eb3190396401f1d8b7976119e11acaf2e1902a05e5a8239337004bc0a416939f0b1212dbe16304bfb0c1e28051752c2a81bfd0f14899ef76a166bb6 WHIRLPOOL 8fe3ecd99f53aaf43bf071400d722b7f657faaf7d878cc79d0604741b4042fe750ba2152e00d48c57214c9b00d2f17d6d5f0af1856d747d0db9a0ca7d7384988
+EBUILD schema-0.5.0.ebuild 600 SHA256 18e641f4dbddef681b0b58c890bca85a46536e2ffa57e8835786bef8721f7b26 SHA512 69d7a0aca046f1b6d1b9d82f1be618756b25755e154665e495692d60029455c7ad8512ccc7928961a2100f76281da1ab8f6d31fc432f7b3bc05f699afa9861bc WHIRLPOOL 369b69c6128023645ffb38ee6e9a9d5c3e9aad836546b7cbbc382286765655df7d2304bbcb30798f3b1f7c3fb68bce9301e7981190b11121bbf0ac01e7c42bc0
+EBUILD schema-0.6.6.ebuild 570 SHA256 18b87125e97ab7c325d7c574604f4e638040f23994f1deb195a21b2c785a7d1b SHA512 f121fc16fa07f4b166a9d2d84b0bab249a3ef6672412b480c78c11ec09d66be99947e1b1e92828964478180bdc903614e056119cc320265ba410039949e17899 WHIRLPOOL 0fd25a1b3c5fccea94535425b0b1d77f5dfa2ac103bb466d852f42a718e5ecc3230afe1308b6512d95e19b846eff06b96ed98f37b0d75d69298cd6581269a54d
+MISC ChangeLog 687 SHA256 200dab17d58f29b934a02c9b01173b6d6774aba6a5698c0ed600f293c8e93de8 SHA512 176c358550581b1eadf4edfff92aa9649c592ff07bf5162c3cd65b066addb70e046af5ab496dce3b89d36d56a7e76ba37aa605fa2faaba7f5ad3e57fa781a8b6 WHIRLPOOL 187565630f716e715d5dcb8e1c4bcb24c5d7e9c5540d3281948ffb17ad7c8b776edd398d713694a03930baf472f97b994df7d0f79bc9fb71875dcbecf801a64d
+MISC metadata.xml 376 SHA256 b96d84532950dfc12e1fcb3c5b5e442df8f5d4efedc28a5157027141732885c1 SHA512 0a27a52700fe812f2a0bf7c563caaa3eb47b02e97314dc0d7635597ce958f8898ba187c0b869722e5cfc04a4358dfb78d30383e3be2cb57f1f6becccf475961d WHIRLPOOL 7a95232da645cee66107e5ca86e59d0c2eed14a52716cac7d24d48f86df3be01c3be0dea41dabeccf7be636a9023d6c3f2bab74de372bc8f5b7bac820e04522f
diff --git a/dev-python/schema/metadata.xml b/dev-python/schema/metadata.xml
new file mode 100644
index 000000000000..fba82fd7fede
--- /dev/null
+++ b/dev-python/schema/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">keleshev/schema</remote-id>
+    <remote-id type="pypi">schema</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/schema/schema-0.5.0.ebuild b/dev-python/schema/schema-0.5.0.ebuild
new file mode 100644
index 000000000000..721b7e1e6320
--- /dev/null
+++ b/dev-python/schema/schema-0.5.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for validating Python data structures"
+HOMEPAGE="https://pypi.python.org/pypi/schema https://github.com/keleshev/schema"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://github.com/keleshev/schema/archive/v${PV}.zip -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/schema/schema-0.6.6.ebuild b/dev-python/schema/schema-0.6.6.ebuild
new file mode 100644
index 000000000000..a85bb01f7f3e
--- /dev/null
+++ b/dev-python/schema/schema-0.6.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for validating Python data structures"
+HOMEPAGE="https://pypi.python.org/pypi/schema https://github.com/keleshev/schema"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://github.com/keleshev/schema/archive/v${PV}.zip -> ${P}.tar.gz
+"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/scientificpython/Manifest b/dev-python/scientificpython/Manifest
new file mode 100644
index 000000000000..3c4d4e6d55ea
--- /dev/null
+++ b/dev-python/scientificpython/Manifest
@@ -0,0 +1,7 @@
+AUX scientificpython-2.9-mpi.patch 1176 SHA256 de665a5fbf474253a1fff8b5a929cd68165e5d6dd0d9e0fe52b4ecd39bedc43f SHA512 1a71e79ae1ded669dc8a0796000e663fd19dd805c8756ec2731774a611d39d23a335cfd295b79922ddc6e66a423442147d075bf520a07017bb0735e655327455 WHIRLPOOL 23be6c232903e9121f378aa0b97e5fffa44456108e1648f14d8a6a74fdd21529a53ff1145780542db67351fc1d4fc5e061b5f7a9b514bee740499437afc69fbd
+AUX scientificpython-2.9.3-mpi-netcdf.patch 1736 SHA256 dcac1a1504a452eab13925ef843044ca2b1304d3ab1bef05cfd6984f07afe3dd SHA512 3136066d0a6b8ea489206ed80b024884f85bf2c6920ed758e94425cea7e75631a6907669b7e35a5f6200359c35cf36ac23a57e426e7e52f64513386d876636c2 WHIRLPOOL bb651432e3033493284a80b19e82ea4f94c87e2e1043ff7e838dd681c23d06f283077b81c8ac5383714dd1d8dba74c27ad65138b5e691d58da5ef22864065b0e
+DIST ScientificPython-2.9.4.tar.gz 688704 SHA256 c397fedf76500dc4c010785a82204a45ee51a04a54fabfb6142d594de14f8639 SHA512 8bd3ce3ead090832582711c25f7d4c7a5a55642ef9a1e845fb68b4b3dba833ba86baf9c444fd9948ce761a5357dbf388a2c1a860a66ee13fdf1f26d1010cc8c8 WHIRLPOOL 7890b534cffa53f258a5db8aa974805055773dc9be5ee9862e9c66f7c07df52e2abb36cc30a07e9bb9c8ee61183f44336643191f41e757ce31fa63773b0df8de
+EBUILD scientificpython-2.9.4.ebuild 1523 SHA256 3cd58926a5ff5323a3c4829f72b5228a242a299bfc011b92f8638ad56fde8f2e SHA512 00b30a0cb1bbbe302391d01f889007f36056f2b5313569d4ab21dcfd82376711a35d48916ab80a5ecd65ebe38a578f86d9ffba3b28636bde8fb1d536290f06e2 WHIRLPOOL e762d94ce7eaa7d4f6a728b7ae1f017dd17a03ede405b52f3e7d72a1c2329b2dcbf7078c73f34f61805285c104ccaf18f40eb428ea9bf5b01a334f569be0e45a
+MISC ChangeLog 3161 SHA256 2f93ab9ef14b34500ad2f3422686f40dd724011046206975b216db33ed0dd379 SHA512 7aa2ee7341c84a4fd91a9755c43d015b5d5b34d388ea3f53c6b0b92a6c37efd3a041f20f7e2a9d0551db00704ba7ec08c021c2cc1ecddf823652114f3ec22d71 WHIRLPOOL cbb7ba41c36166cab81c388968907d9283d532fd0d4eae43b4dcc1b3a8cd2fdf6112d29645f3925c02a74a7d693ddab23072c0ff37306f2efb402fb94a285e37
+MISC ChangeLog-2015 9302 SHA256 068e344e5429b2cd9aa2baa615c01fb1459fc6d0621a2531aa15c39400557595 SHA512 b47b47026e5d0e590a4aca76aa82b22ab985ffc244be90baccafe4fbc3e4e3a4267ebbab12f40b82d80dddeda4acd62404153dd7c25f71d6226a5601a0897ab2 WHIRLPOOL 1743b8a5c85feb436a0357d00b40e7ff5a19fac9eb2af96f604e327e5c8b6c4cb2e5c77f7b0b2508e8281c96c8f07eaa3e24f42d4437bd3d7b51590762079dc8
+MISC metadata.xml 926 SHA256 527e0ae2143f6567bcfcde41411100a8bc4c49c691bddd951c4b96b8894cf41c SHA512 f721101cc77917496eb449d6c0bd2fbe39ce1d20342db75a40b8ef4f59cb9e065bdf0f12d6d0773ba46ec0f946e5c184155d2ee0ca01974aee5bd2c96078d572 WHIRLPOOL 0afbfc5f1c0b58201d4919fc88e36a5495bd51abcc6ae547062695398b45451492852515321af7b46617dc0b3288ecbed6988a17327071bea5f7510c804af01d
diff --git a/dev-python/scientificpython/files/scientificpython-2.9-mpi.patch b/dev-python/scientificpython/files/scientificpython-2.9-mpi.patch
new file mode 100644
index 000000000000..3140779c74a9
--- /dev/null
+++ b/dev-python/scientificpython/files/scientificpython-2.9-mpi.patch
@@ -0,0 +1,40 @@
+--- Src/MPI/compile.py
++++ Src/MPI/compile.py
+@@ -4,7 +4,7 @@
+ # Normally nothing needs to be changed below
+ import distutils
+ import distutils.sysconfig
+-import os, sys
++import os, subprocess, sys
+ from Scientific import N
+ 
+ cfgDict = distutils.sysconfig.get_config_vars()
+@@ -32,16 +32,16 @@
+             items[i] = os.path.join(frameworkdir[0], items[i])
+     linkforshared = ' '.join(items)
+ 
+-cmd = '%s %s -o mpipython -I%s %s %s -L%s -lpython%s %s %s' % \
+-    (mpicompiler, 
+-     linkforshared,
+-     cfgDict['INCLUDEPY'],
+-     extra_compile_args,
+-     sources,
+-     cfgDict['LIBPL'],
+-     cfgDict['VERSION'], 
+-     cfgDict['LIBS'], 
+-     cfgDict['LIBM'])
++cmd = [mpicompiler]
++cmd.extend(linkforshared.split())
++cmd.extend(os.environ.get("CFLAGS", "").split())
++cmd.extend(os.environ.get("LDFLAGS", "").split())
++cmd.extend(["-o", "mpipython"])
++cmd.extend(["-I" + x for x in cfgDict['INCLUDEPY'].split()])
++cmd.extend(["-I../../Include"])
++cmd.extend(extra_compile_args.split())
++cmd.extend(sources.split())
++cmd.extend(["-lpython%s" % cfgDict['VERSION']])
+ 
+-print 'cmd = ', cmd 
+-os.system(cmd)
++print 'cmd =', " ".join(cmd)
++sys.exit(subprocess.call(cmd))
diff --git a/dev-python/scientificpython/files/scientificpython-2.9.3-mpi-netcdf.patch b/dev-python/scientificpython/files/scientificpython-2.9.3-mpi-netcdf.patch
new file mode 100644
index 000000000000..c9672948f2f8
--- /dev/null
+++ b/dev-python/scientificpython/files/scientificpython-2.9.3-mpi-netcdf.patch
@@ -0,0 +1,43 @@
+From 71a5e881290c1cec2506a346e2740a1b821c36aa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 13 Mar 2014 15:29:33 +0100
+Subject: [PATCH] Include MPI cflags/ldflags for netcdf.
+
+---
+ setup.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 7f01656..71ac92a 100644
+--- a/setup.py
++++ b/setup.py
+@@ -2,7 +2,7 @@
+ 
+ from distutils.core import setup, Extension
+ from distutils.command.install_headers import install_headers
+-import os, sys, platform
++import os, sys, platform, subprocess
+ from glob import glob
+ 
+ class Dummy:
+@@ -92,13 +92,16 @@ else:
+         netcdf_include = os.path.join(netcdf_prefix, 'include')
+         netcdf_h_file = os.path.join(netcdf_prefix, 'include', 'netcdf.h')
+         netcdf_lib = os.path.join(netcdf_prefix, 'lib')
++    mpi_cflags = subprocess.Popen(["mpicc", "-showme:compile"], stdout=subprocess.PIPE).communicate()[0].rstrip().split()
++    mpi_ldflags = subprocess.Popen(["mpicc", "-showme:link"], stdout=subprocess.PIPE).communicate()[0].rstrip().split()
+     ext_modules = [Extension('Scientific._netcdf',
+                              ['Scientific/_netcdf.c'],
+                              include_dirs=['Include', netcdf_include]
+                                           + numpy_include,
+                              library_dirs=[netcdf_lib],
+                              libraries = ['netcdf'],
+-                             extra_compile_args=extra_compile_args)]
++                             extra_compile_args=extra_compile_args + mpi_cflags,
++                             extra_link_args=mpi_ldflags)]
+ 
+ try:
+     # Add code for including documentation in Mac packages
+-- 
+1.9.0
+
diff --git a/dev-python/scientificpython/metadata.xml b/dev-python/scientificpython/metadata.xml
new file mode 100644
index 000000000000..ead81e593755
--- /dev/null
+++ b/dev-python/scientificpython/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  ScientificPython is a collection of Python modules that are useful for
+  scientific computing. In this collection you will find modules that
+  cover basic geometry (vectors, tensors, transformations, vector and
+  tensor fields), quaternions, automatic derivatives, linear
+  interpolation, polynomials, elementary statistics, nonlinear
+  least-squares fits, unit calculations, Fortran-compatible text
+  formatting, 3D visualization via VRML, and two Tk widgets for simple
+  line plots and 3D wireframe models.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-python/scientificpython/scientificpython-2.9.4.ebuild b/dev-python/scientificpython/scientificpython-2.9.4.ebuild
new file mode 100644
index 000000000000..a760b97ee758
--- /dev/null
+++ b/dev-python/scientificpython/scientificpython-2.9.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="ScientificPython"
+MY_P="${MY_PN}-${PV}"
+DOWNLOAD_NUMBER=4570
+
+DESCRIPTION="Scientific Module for Python"
+SRC_URI="http://sourcesup.cru.fr/frs/download.php/${DOWNLOAD_NUMBER}/${MY_P}.tar.gz"
+HOMEPAGE="http://sourcesup.cru.fr/projects/scientific-py/"
+
+LICENSE="CeCILL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc mpi test"
+
+RDEPEND="
+	<dev-python/numpy-1.9[${PYTHON_USEDEP}]
+	dev-python/pyro:3[${PYTHON_USEDEP}]
+	sci-libs/netcdf
+	mpi? ( virtual/mpi )"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.9-mpi.patch )
+DOCS=( README README.MPI Doc/CHANGELOG Examples/demomodule.c Examples/netcdf_demo.py )
+
+python_prepare_all() {
+	use mpi && PATCHES+=( "${FILESDIR}"/${PN}-2.9.3-mpi-netcdf.patch )
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	if use mpi; then
+		cd Src/MPI || die
+		${PYTHON} compile.py || die
+		mv -f mpipython mpipython-${EPYTHON} || die
+	fi
+}
+
+python_test() {
+	cd "${S}"/Tests || die
+	nosetests -v -v || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	if use mpi; then
+		cd Src/MPI || die
+		python_newexe mpipython-${EPYTHON} mpipython
+	fi
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( Doc/Reference/. )
+	use mpi && EXAMPLES=( Examples/mpi.py )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/scimath/Manifest b/dev-python/scimath/Manifest
new file mode 100644
index 000000000000..4f58833b97b6
--- /dev/null
+++ b/dev-python/scimath/Manifest
@@ -0,0 +1,5 @@
+DIST scimath-4.1.2.tar.gz 119399 SHA256 f175ba482dbd4fa8154c6cb44ce8a582b0724c174b401642319f2316af70147e SHA512 2ceeeca5402da2b8745e0af5dac6a470c47b80529ec56aeb758cea815785be8a38b4ee3a052780c532b474acc4bf36474dd67c802a94971f3010148987c24257 WHIRLPOOL 3e5ef8135086a323429994d1831124d3912b1e765ef65610bd6bdd94ee18a170fd90bc4a3f6f8fa9cc026c635ce368a6c8eb79a3a47bb58db03df6507cc58c5b
+EBUILD scimath-4.1.2-r1.ebuild 1161 SHA256 9dd2459aed30b4492f910d75708b2c81f3773aba8347c3b4cbfe234d5106e5ed SHA512 8024407c212da0fef5b2b2f3f3bbb032e7339f8f93a8e1478d3745b2f5f26914ea3781af9c74090e6a95a7f46cf948d5799f19743cc106aec6bf9a64fc15cad9 WHIRLPOOL 8253921ea10a2d734d4884ac92d11281dda3aea23ea7bfb317955a1dbe9820cd02fe170d529f9f52963b3a95e8b85bbc9ffb4f3b7eb172197b21968bba4edeea
+MISC ChangeLog 2581 SHA256 639c6492fad8273bbf921ab596591dd8c3810782910d6ea325a94b66f6806f5e SHA512 a5472c0bc724dcf5fb9c458ddc1265bcc67f3ca2c2706c10485658d3ff7897ab938e796ff593f11d8414bdec72e3a1aa8d1d80ee859c6439b49969275bbbd023 WHIRLPOOL 89d96a2dfef59f72c283695bfcefca7eebb98a46e43252b052bc8e7c0989fafc9d75fbc1d5aa6408f11f7d8f52bd57b017087a488845a0df6cb1c0e302f015fa
+MISC ChangeLog-2015 2738 SHA256 778e66b4c564f33052171e31970d093ad0b796088096cbb27d849ceaeeb265d7 SHA512 151dbd1c1fe86cea30e7ec250d57cde73dd56d424cb5f7718964aa5e8a02e4e5f9f6bca324af79764f83830c440c98c4614a277c542de8f6d7dc1114b12ef833 WHIRLPOOL 19e582eb6d6ba33da71ee1727fdd367767e1b3af298acadfd3e1b71d97c0379e2965914dd7fed0c3ab2746c4856f871f2f825bfc889078973a3be8d237a16de4
+MISC metadata.xml 670 SHA256 06ee5b85bc081d25bb0d1aff1521c346a2b61d81bf7642cbba1ee0f7d8022d8b SHA512 eccd352c38d4967cd43718b0dc9daabcf2431d2b273056efad81a18a5bd93e9b4478cca105a4e4e68996ca13d3aa1bb4f1c70bba2fd395e43813fdab1578441c WHIRLPOOL 11c63bf358ef5e3c6529dde64cec39bcfa48ed9aa0f68663b4ca6b115714f64454c6a9f074a68880a82debfe7ed3a5c9e0d37a606a04fc58f7c45f584fc9706a
diff --git a/dev-python/scimath/metadata.xml b/dev-python/scimath/metadata.xml
new file mode 100644
index 000000000000..318fee4f61fb
--- /dev/null
+++ b/dev-python/scimath/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    The SciMath project from the Enthought Tool Suite includes
+    packages to support scientific and mathematical calculations,
+    beyond the capabilities offered by SciPy:
+    * enthought.interpolate
+    * enthought.mathematics
+    * enthought.units
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-python/scimath/scimath-4.1.2-r1.ebuild b/dev-python/scimath/scimath-4.1.2-r1.ebuild
new file mode 100644
index 000000000000..dce19f877634
--- /dev/null
+++ b/dev-python/scimath/scimath-4.1.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Enthought Tool Suite: Scientific and mathematical tools"
+HOMEPAGE="http://code.enthought.com/projects/sci_math/ https://pypi.python.org/pypi/scimath"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+RDEPEND=">=dev-python/traits-4.1[${PYTHON_USEDEP}]
+	>=dev-python/traitsui-4.1[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		x11-apps/xhost
+	)"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# ONE test assumes PYTHONPATH in its own dir!!!
+	PYTHONPATH=build/lib/:build/lib/scimath/interpolate/
+	VIRTUALX_COMMAND="nosetests" virtualmake
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/sclapp/Manifest b/dev-python/sclapp/Manifest
new file mode 100644
index 000000000000..3391d2e7adae
--- /dev/null
+++ b/dev-python/sclapp/Manifest
@@ -0,0 +1,6 @@
+AUX sclapp-0.5.3-testsuite-fix-from-r235.patch 1276 SHA256 01a844e9462fa252ab179655b2881a36bb4e25a36b225544725b9eb881e41750 SHA512 2bf15b6423db0ff7fd113eab3014dbf0f8327a683d7c9570ae086164b5a364413d5bc1f5637deebef52b4f04f089cb99ca2a86c00445b372a57358d711618f8f WHIRLPOOL 2c071285411f853a020fe1e6e7cd16c22e0050c5cd10dc5d9178631dde95f062e87172f464bbea80f583976451686c40922ede9a6ff5d9452281d9db4c72141d
+DIST sclapp-0.5.3.tar.gz 47646 SHA256 e8e8b60cea9b09acc08f237e92c8b86057bdfd735412aa88cc993fea29031768 SHA512 e615310b2ede517717cf8ef70aca02c070676d71fb8880e381e3cc66d5c6006e47b4dd7c4355dbcb34e76898ce7a7a2e4522454490353970ac185c5d1963e49f WHIRLPOOL 49b940319e4f87dbc973081ec2ec7ad3b445d79a56ab23bf1ba58950ca3010eb5b2fb8666fe26677214bc07cb5bb2a8d7faeec0878e55c27e3644a19cf46d49f
+EBUILD sclapp-0.5.3-r1.ebuild 577 SHA256 b9853c717149125eb6cee193d0cd38bb462fefc701a2f8eefeec09dff6f37436 SHA512 757a544d7b349101ff75ea2146eb7682cf933fa1be09d6f81a4a2c4b4f91a1d6f389b447160648a44490d828fdffe7efb553a42d9c61eba7f3bba87f274d8920 WHIRLPOOL 2f69643cbdf074719bdf7e263170fa17f0c86fcecb5443ebb24b68dfcc8028e60984adcfbc7e43f2eff9300a65004b54b62b34662ae034762eecebdaa7c45d38
+MISC ChangeLog 2445 SHA256 08bf89994e5c83cc3a0186011355a7dd1cee575a64d58e9f3b7ac2623c820bda SHA512 4391291756b685d7f03a149e9f30eeaab687657afce48b06d9c46f5983ff2bd9bc3cd026638e8203d62eded257e45586f76d055447b0b6878b119ae4369af170 WHIRLPOOL 996f68b61bb2926902c9a9f8251960c6422d99fbd22e7dd26145b586b0b49ad1aeb204c6e5ff93d15c968808be7a365ef3769ba004a2113e4fde5949b92c2965
+MISC ChangeLog-2015 1473 SHA256 a929dd1746156905b166e8f86ce1a13c106f52a04b0ea7ab9032ca0096f0469f SHA512 efabe892e8b9baff371850f7c71b8859cec65ae5544e3f899109082d9724f5db92fd0b9183dbf674bb29a24a29c1150223a0c0505e72d9d1dceac99527ba8850 WHIRLPOOL bb6a7284752f11e6cc456037b5bcdb74f002b8938c621f2a34b164d4d3fe03d6846023aad1f82cc9c2f61b421567ae9ffc9496b8f176991b5f62193433bee36b
+MISC metadata.xml 249 SHA256 abaf8c3d7632caaacd242fc7f4d5b1377778c50c7bfa5c356b35773f377d4f69 SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273 WHIRLPOOL cb6e12eeeb412f25a85ebc6322f4b22a14c7c23fc7d49a46e8168cdbf425e121a276fc4e915c4626ed9b64d7f7aef50ee11c428ed149126999d277adbea1f57f
diff --git a/dev-python/sclapp/files/sclapp-0.5.3-testsuite-fix-from-r235.patch b/dev-python/sclapp/files/sclapp-0.5.3-testsuite-fix-from-r235.patch
new file mode 100644
index 000000000000..45965f01b1de
--- /dev/null
+++ b/dev-python/sclapp/files/sclapp-0.5.3-testsuite-fix-from-r235.patch
@@ -0,0 +1,40 @@
+=== modified file 'NEWS'
+--- NEWS	2009-01-14 11:11:28 +0000
++++ NEWS	2009-12-21 14:12:02 +0000
+@@ -25,6 +25,9 @@
+ 
+    (Forest Bond)
+ 
++ * Fixed output protection test that was failing on some systems.
++   (Forest Bond)
++
+ 
+ sclapp 0.5.3 2008-07-21
+ =======================
+
+=== modified file 'tests/output_protection.py'
+--- tests/output_protection.py	2008-05-18 21:46:03 +0000
++++ tests/output_protection.py	2009-12-21 14:12:02 +0000
+@@ -109,8 +109,10 @@
+   exceptions = ()):
+     def test_fn():
+         pid = failure_fn(main_fn)
+-        assertLogFileContainsExactly('foo', foos)
+-        assertLogFileContainsExactly('bar', bars)
++        if foos is not None:
++            assertLogFileContainsExactly('foo', foos)
++        if bars is not None:
++            assertLogFileContainsExactly('bar', bars)
+         for signal in signals:
+             assertSignalCaught(signal, pid)
+         for exception in exceptions:
+@@ -171,7 +173,7 @@
+         'test_stdout_fails_without_signal_handling_without_output_protection',
+         _stdout_fails,
+         main_without_signal_handling_without_output_protection,
+-        2, 2, ()
++        2, None, ()
+     )))
+     test_stdout_stderr_fail_without_signal_handling_without_output_protection = (
+       staticmethod(_make_test_fn(
+
diff --git a/dev-python/sclapp/metadata.xml b/dev-python/sclapp/metadata.xml
new file mode 100644
index 000000000000..6d2298876faa
--- /dev/null
+++ b/dev-python/sclapp/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>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/sclapp/sclapp-0.5.3-r1.ebuild b/dev-python/sclapp/sclapp-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..9e2c41922be7
--- /dev/null
+++ b/dev-python/sclapp/sclapp-0.5.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Framework for writing simple command-line applications"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://www.alittletooquiet.net/media/release/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/pexpect[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-testsuite-fix-from-r235.patch"
+)
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/scoop/Manifest b/dev-python/scoop/Manifest
new file mode 100644
index 000000000000..bba9ff270beb
--- /dev/null
+++ b/dev-python/scoop/Manifest
@@ -0,0 +1,5 @@
+DIST scoop-0.7.0.release.tar.gz 598566 SHA256 5f4630884bc4e2821f79766e57c07b19c5cb1f6a2440bb8f427f0ef2532be908 SHA512 4e8378b6c73ef7d3d2d6ad8387220e0659b12eed008d834fb99a661ff1ff5f6b842e897156cec41119f5c392e341c3e8e5b912f01f0728b585daab46aa07d270 WHIRLPOOL 48427059868c3fe6cc662c40cfb0cd5c11e34c440084d2b3fb0aab951a41c4d43f67a4b78ef3ba2b2ef29a9584587b3767a6b1469d8313df572cf8188a74b300
+EBUILD scoop-0.7.0-r1.ebuild 577 SHA256 c80f41327b1bca921e88ad51f32c57c9203a5f4185e75f9960972de81d79d1d2 SHA512 ba84f7c157afec52c607862011d5c8a129d0fc6e0e7f2303ca7e46ac58a67b739ce3889f5280c930d6dd6d2364ff7c4c41db4761c0fad46cd616414bd64c243e WHIRLPOOL e729d8944008de8685e9654f50ce965151b2c4fe8282c843f6f1f470b803c7aa6bef966435e6b8dbb3849698b1be9977cdffc37b6d7d4f0e99334b060c7ed07b
+MISC ChangeLog 2451 SHA256 2cdfa157e7677d3480c3fbbd2e1bfca2f1dd2d9dbfecaf971499cfee0edb46bf SHA512 ec6f6b2f49ac3bfc7b10ce2a24a1464d36b75ccd6abc258d426788fded38646f099961f5425117656b4a353cf5fa888bae6959822227da515fd8094af0163515 WHIRLPOOL 526b8912ec6eef70f0ec104f9a19cb6c28c0a6b49b4f884ec3987d39db85bb9a23c47b8c1450ccfd44c346baca3f8a2db8a74fb924ede73c8453d23f77122c3c
+MISC ChangeLog-2015 1051 SHA256 46c472b1f526eb1e5f966d0e651ae01aeb45eb9916bc6592bd90b5d7aab55bbe SHA512 117ec44211bc93cbce678c8e56a6e332201826a6cc0d7d6a9512e326ffd123be207092bc57c26d20f037bf0ffabf6a93bc7997394300f5fede8b30fa38749216 WHIRLPOOL 6af3524744ec143aaf799dcc2522015f90d9f4ea4fe8b58a24aef543c4a0eeb7808afe16ec67e5c6063eb0f731099a6835a11a4e21ac54d612f505f701c94e64
+MISC metadata.xml 532 SHA256 484c60325551b0a757c75928859879cb7bc0a1540ddba4cc97d8328516fbcb87 SHA512 3ceec38b6eceae4b4d8f44c1f423a369f9bb2183fa9b52aeb16f5f32650660910725a48918218a5198462d33a3c6ce0175984a3598639294b05ce01700dba455 WHIRLPOOL 4f4286caade1a2d1b1583d071cb6c7e2129deb8879271651d5ec56e9ea9a8e24a6d17f298e8e2f658811f4955680efe2777f01cdc9f9be50b44efe08838f4d82
diff --git a/dev-python/scoop/metadata.xml b/dev-python/scoop/metadata.xml
new file mode 100644
index 000000000000..71a278e78db4
--- /dev/null
+++ b/dev-python/scoop/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slis@gentoo.org</email>
+  </maintainer>
+  <longdescription>
+    SCOOP (Scalable COncurrent Operations in Python) is a distributed task module
+    allowing concurrent parallel programming on various environments, from
+    heterogeneous grids to supercomputers.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">scoop</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/scoop/scoop-0.7.0-r1.ebuild b/dev-python/scoop/scoop-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..b9418cb1e15b
--- /dev/null
+++ b/dev-python/scoop/scoop-0.7.0-r1.ebuild
@@ -0,0 +1,23 @@
+# 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
+
+DESCRIPTION="Distributed Evolutionary Algorithms in Python"
+HOMEPAGE="https://code.google.com/p/scoop/ https://pypi.python.org/pypi/scoop"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.release.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/greenlet-0.3.4
+	>=dev-python/pyzmq-13.1.0"
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
+
+S="${WORKDIR}/${P}.release"
diff --git a/dev-python/scp/Manifest b/dev-python/scp/Manifest
new file mode 100644
index 000000000000..06bad2c67a50
--- /dev/null
+++ b/dev-python/scp/Manifest
@@ -0,0 +1,3 @@
+DIST scp-0.10.2.tar.gz 6230 SHA256 18f59e48df67fac0b069591609a0f4d50d781a101ddb8ec705f0c2e3501a8386 SHA512 165a0aef1207a2603bb0e15bd6d3171244ebb83b698b7e7d354e7c4d08175a711b168d31e60174c16f1597dcd35b2e070b544c1027d0b52c93be8ed024bac680 WHIRLPOOL 5dfa83a09683aba908f7874be56faa32969a1ad3c4261b9e29744b4bb6bac73075a25e832ebbf349cd7cb638aa71592e0063576463c98ce4ac8ab4253152d40d
+EBUILD scp-0.10.2.ebuild 498 SHA256 8cdf462c426865f9e21de977482fe1883f717f2b6098287a7a5f4aa91be3cd59 SHA512 4ca7f90cac167e7b6532dcb610c70786ce32f273b9b5a83eff36a98075d719ad0e9344f4217131671c57d3ebab6aee9f20ab75e4296a1f8ff69294d658579943 WHIRLPOOL a2721f6348e63e808f995a4fbc5cab9573eabedf0dff67221f64ad71b1bcab8f02103e5169aa972a9bab1af483080a5da154f598e887b718c2794dc13386a5c1
+MISC metadata.xml 484 SHA256 95e96d8b6538f62f3bae668b21e473318334f448de7058d41dfb9614ce3c3556 SHA512 f95b1cf4ec6a3a30183e63cce28f754220a1a9c82511118ac6eb1f3a211734f62f5394a646a1d07fdde7afe2f78120812f0a2e18d43104287f29a17b9d67c08a WHIRLPOOL fe065e11a81f468e194bc54ac18448307bc95dcd54e7fdd5ad9be18711b943e2857ed3250b6982ff17a3724371ab01b955ad8b2acb5fcdc23c1f069f30227e1f
diff --git a/dev-python/scp/metadata.xml b/dev-python/scp/metadata.xml
new file mode 100644
index 000000000000..0a2d4455dbcd
--- /dev/null
+++ b/dev-python/scp/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jbardin/scp.py</remote-id>
+    <remote-id type="pypi">scp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/scp/scp-0.10.2.ebuild b/dev-python/scp/scp-0.10.2.ebuild
new file mode 100644
index 000000000000..3bbbde305abe
--- /dev/null
+++ b/dev-python/scp/scp-0.10.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2016-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="scp module for paramiko"
+HOMEPAGE="https://github.com/jbardin/scp.py"
+LICENSE="LGPL-2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest
new file mode 100644
index 000000000000..51eb4d957337
--- /dev/null
+++ b/dev-python/scrapy/Manifest
@@ -0,0 +1,5 @@
+DIST scrapy-1.0.3.tar.gz 1006911 SHA256 725eb5906b35076ad112b1b0ac27c68dd684e72514eddf95bc7ace64c04b2bb2 SHA512 bf61d449d7309de0ebdc36c73371d01518ee5cfa5d4ac1b68ee42389466ee15dba82690dbc885aa6bc1b9fe0b2e29a03fb3a3af3889842e1039e3a81749fc0c0 WHIRLPOOL 0dee3a82a0368f50420d484252d5d138c8a3bf8257715dad5d74419a7a852ef5d21aef5b52e9959f8f08d7dcdd58988221faff38d9a8d530406cfb83fbb031f9
+EBUILD scrapy-1.0.3.ebuild 2453 SHA256 a211fa472a96eeec115705a70269d5b4ad49a6638daee2c00d50034883a7a326 SHA512 f4130d4a03111fa1a9c1add4cdf8a777563f46cdbf8e1ef25415a33e89060ea283dd13a2736e8561fb3c68fb64627d80de2c6babfc0a050e9d6ad7f1b332e88e WHIRLPOOL 8e6b7fa9abf86a302be12ccd48e93f82a5ef4fecc7e408d9d9d961dcaeebf512c67d3440c7f8725ee1ddfb48b715f54363dc0b753306d70b275c1af07b4982e1
+MISC ChangeLog 3605 SHA256 b7ccec687ed23574c3b9ab7e8f613c03a42784b8e9490e27b3b5121f58c8e8c6 SHA512 4f9a7eaa5683a43b6a0f6022a035e2ab85dcaa5cc85c3dbdc5e1abb6a1a50ba11f0cf5f3c48e6d3d16d3ee0993818863c101ef9f60d370643a2407dd8fc0f272 WHIRLPOOL dde670d441e414e3cbe7bc3d8e87d1bd9143b158e5d469f8598b377d6fb63a0cb8a1ddd99eae8d3ef5887eae22f153357912e839b68469efa6bc4c2ee0e33e39
+MISC ChangeLog-2015 5355 SHA256 e435b0fae880ec5304e6a34ac7a8ee115da87b910aea479556df9d052028e46b SHA512 dfed23eaffb8786866fefe1054d1749c92b189b29c4daebf80ae651f014cdbc8ef2d17f7be9eb79a2cdf65772c69fe7c083071024f8798187662380cf1afeeb3 WHIRLPOOL f2c74a475b6e60bb43f25db7c82e0ea791e122d76261d786a9f76146cfb56c1c0e62bffc2c383eb46aba5abdea29602b0c2a56e7a9c5e6f553f1f709bf38d9d5
+MISC metadata.xml 606 SHA256 06d21cd2aa76afdf41ee74c5399718c2f8851be557f3701a1346cc227a1c3808 SHA512 6c507058cfa5501fd3e8d163ee697b5b00fa341374431e6d7c43dd61cf16fca5c935b26abf17f8be38657463c7e106bdffab5eacac9764b2a3a960b80c24fc9a WHIRLPOOL 97d977b7c2c23d1ceadfd38853a31db72ba0fe806ffc0101b27e4b8323aec33fe8baa8bb19428020ee42d946b49a824c4222d8e5c207350468ab52ffd8bbca42
diff --git a/dev-python/scrapy/metadata.xml b/dev-python/scrapy/metadata.xml
new file mode 100644
index 000000000000..dfa2115e8ffd
--- /dev/null
+++ b/dev-python/scrapy/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>maksbotan@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <use>
+    <flag name="boto">Add support for Amazon S3 via <pkg>dev-python/boto</pkg></flag>
+    <flag name="ibl">Use Instace Based Learning algorithm for automatic extraction</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">scrapy/scrapy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/scrapy/scrapy-1.0.3.ebuild b/dev-python/scrapy/scrapy-1.0.3.ebuild
new file mode 100644
index 000000000000..d4a6a31c3618
--- /dev/null
+++ b/dev-python/scrapy/scrapy-1.0.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit vcs-snapshot distutils-r1
+
+DESCRIPTION="A high-level Python Screen Scraping framework"
+HOMEPAGE="https://github.com/scrapy/scrapy/ http://pypi.python.org/pypi/Scrapy/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boto doc ibl test ssl"
+
+RDEPEND="
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	ibl? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+	boto? ( dev-python/boto[${PYTHON_USEDEP}] )
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/twisted-conch[${PYTHON_USEDEP}]
+	dev-python/twisted-mail[${PYTHON_USEDEP}]
+	dev-python/twisted-web[${PYTHON_USEDEP}]
+	>=dev-python/w3lib-1.8.0[${PYTHON_USEDEP}]
+	dev-python/queuelib[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.9[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	dev-python/service_identity[${PYTHON_USEDEP}]
+	"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		=net-proxy/mitmproxy-0.10.1[${PYTHON_USEDEP}]
+		=dev-python/netlib-0.10.1[${PYTHON_USEDEP}]
+		dev-python/jmespath[${PYTHON_USEDEP}]
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+		net-ftp/vsftpd )"
+# pytest-twisted listed as a test dep but not in portage.
+# Testsuite currently survives without it, so appears optional
+
+REQUIRED_USE="test? ( ssl boto )"
+
+python_prepare_all() {
+	# https://github.com/scrapy/scrapy/issues/1464
+	# Disable failing tests known to pass according to upstream
+	# Awaiting a fix planned by package owner.
+	sed -e 's:test_https_connect_tunnel:_&:' \
+		-e 's:test_https_connect_tunnel_error:_&:' \
+		-e 's:test_https_tunnel_auth_error:_&:' \
+		-e 's:test_https_tunnel_without_leak_proxy_authorization_header:_&:' \
+		-i tests/test_proxy_connect.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		PYTHONPATH="${S}" emake -C docs html || die "emake html failed"
+	fi
+}
+
+python_test() {
+	py.test ${PN} tests || die "tests failed"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/scripttest/Manifest b/dev-python/scripttest/Manifest
new file mode 100644
index 000000000000..fe114ca4c565
--- /dev/null
+++ b/dev-python/scripttest/Manifest
@@ -0,0 +1,7 @@
+DIST ScriptTest-1.2.tar.gz 7208 SHA256 158c34cfa736288c33177588572c2bb3372b836eb4c90b05222911b4ff976942 SHA512 0dc09e6af5554f38aca6ee45b9afad2fa4c1c53a4d3c43edff95bbd6ea8d57e94bf6b7bdcfd26afff6bf2b10690795bd2816013801911f726c67e8171546cad2 WHIRLPOOL 2d23a9fec63c34bd6cf4a06fa01167a9fc05017950fa05bf39a14b5f44393ca38b11d4c7b6c8285ba49cd1a535520ebd83901fadc41497ce7513899356d935d3
+DIST scripttest-1.3.0.tar.gz 14885 SHA256 33c2c5315538598652cecc28984557d55dbe75ff814e50e4307dc8fbfac51cd5 SHA512 038bfb1726bff85b6e3675be51db829d3519b47665266f6ae1d3c5c6f4f06e7b16742262ca1ba240544e9bd39ae96c1be0bd5e8583736f72bb04241a1bb8acf6 WHIRLPOOL a415368739016a2bff8a40ecfee5bf009811a60a463d06c25b25e4c4d408de58ad3e4051b7dcddeb0f9246946d2b1b5420ddb57edcdbb25eeb0bcc6e77b2dd77
+EBUILD scripttest-1.2-r1.ebuild 545 SHA256 7fa2d3520b36e9ba8027eb625c8623292809153167ab11644de9320756a713c9 SHA512 cb688fbe63f34ac59d7d390bf26829a68a9716c7249d63f4c2b758efc0d5eb786c27a97a82b33471c41acf6a03a7cf8bdf54016c35de5ff81a6d59e7c479fe97 WHIRLPOOL 7b7c2f730547ad6e06345854104ff114d875592da9585e67d2b0d0eac0dcf40e9ac03599393c5967d3e2b0df74da2497bad2cf51706ed2ccc1692d6ea72c4b67
+EBUILD scripttest-1.3.0.ebuild 639 SHA256 9b295730fe0ef92222d59cbd3eeb6f8055fa7a4c2b51cac1875d2b003f5b918c SHA512 07170b9de981afda7583499e74923ab47f228652eb7791f5fc3ceb5ccc0f01b8e9814f3d1c0c0e0193cfdfcbf54bc4d46ce6815914285b0d508b7dd903bde49b WHIRLPOOL 57fe3a58b541871bc9a03fdd0122f2df50ca739fbc9e4519595b41a14fe90fba9b584a441be2c2da5efed720d1ad9addd3e620db1394bc212f8f918b6e8637eb
+MISC ChangeLog 2945 SHA256 cfcab5b91debca5afcc673ba66e434dc26d8dd6623b8e4827fc6bb7a20b0c434 SHA512 d28ac76697f17611c96b483735a03583fe2640518753e82001835bf55cee3eec7ab626f53cf09569b3efba508063fbc7f0d61b2005022b02fe1fa2554134d7d5 WHIRLPOOL 5825697685e935cd8cb16f25eb0b3213675b439b205462d5b7a49f29724f021b86546194c914f0ae795e79243367218d4ec313539dd229718aa9adae2efbc0d8
+MISC ChangeLog-2015 915 SHA256 a39ab65cdc888e544301276c90d347d97e0563dafc042afed22c027354bff1dc SHA512 72f4631ea068b4050fdf26f5c9c731425a82d7e387e55ab08b82b2e5d63af7efeffd44fbd169d0f91f96111b73e0102afa5919f5dfe550cf18e5d2f7c80a0d55 WHIRLPOOL 0f9fc066e6ee0af7d9cbbaca6bb2b81c0fd1fb1cbfa06966b66ea03b6f7c53fc01c9fc74f32778cbf10a41edfab972ec784a2ce0c4f05ca1e467a5ad30bb673a
+MISC metadata.xml 313 SHA256 2f8667962a675d1ca68e950730c4bba8cd99b970a22973949bee93078ef21e88 SHA512 ae1c2257d3367ea3bdba8e040c0efd98674fe833f7a025c1b554e8cae6e1a41de6867e63c3d792593fa2f4baab158b046d2efaa08d6c8376f8ec749cdc7d4ff9 WHIRLPOOL 63faa4f80bba6fe067f090b9671925a7d75a12d5386ee568c7ebe168355f89bbb23ddf518d71091890eb8b817562eb4983ec5ca112793580bcf2ed6203846dd3
diff --git a/dev-python/scripttest/metadata.xml b/dev-python/scripttest/metadata.xml
new file mode 100644
index 000000000000..f8b627581028
--- /dev/null
+++ b/dev-python/scripttest/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ScriptTest</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/scripttest/scripttest-1.2-r1.ebuild b/dev-python/scripttest/scripttest-1.2-r1.ebuild
new file mode 100644
index 000000000000..fa3fb17e8f0e
--- /dev/null
+++ b/dev-python/scripttest/scripttest-1.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="ScriptTest"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A very small text templating language"
+HOMEPAGE="http://pythonpaste.org/scripttest/ https://pypi.python.org/pypi/ScriptTest"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/scripttest/scripttest-1.3.0.ebuild b/dev-python/scripttest/scripttest-1.3.0.ebuild
new file mode 100644
index 000000000000..89c29e8fb7f9
--- /dev/null
+++ b/dev-python/scripttest/scripttest-1.3.0.ebuild
@@ -0,0 +1,25 @@
+# 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="A very small text templating language"
+HOMEPAGE="http://pythonpaste.org/scripttest/ https://pypi.python.org/pypi/ScriptTest"
+# pypi tarball lacks tests
+SRC_URI="https://github.com/pypa/scripttest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
new file mode 100644
index 000000000000..8c0023ba910d
--- /dev/null
+++ b/dev-python/scrypt/Manifest
@@ -0,0 +1,3 @@
+DIST scrypt-0.8.0.tar.gz 39042 SHA256 d4a5a4f53450b8ef629bbf1ee4be6105c69936e49b3d8bc621ac2287f0c86020 SHA512 2619b6af84b1bb5b9586af3a0a903baf606985357ff7db34612b032aba65e002998a727882657f19bff6c7a987125d9b2d8daebbe0ba3717f3dfa6650975e52b WHIRLPOOL ddcdab4e7a625e74ec434dc59c73919bba3d1a4798f5e99b0b47682ccd79a26768e4e29b8be264bb10d2f4820c1b859610924cf99c4af9d5faf235615c262e0e
+EBUILD scrypt-0.8.0.ebuild 613 SHA256 d5e7ced2468e327ca4250d21523b78d7e617b66f9793f66b3e66b3af83387682 SHA512 94827254f58aa4649b01ff46a8ee2266e7bc462324b06a06627e8cfa68cd317d939ad2a173a5f98faa151fc5dad2f418a3ef3376c84ad3c2953e2ba465685501 WHIRLPOOL fe902be376836087b3c5a5161176dc7316bc929adafc0e998bffb3f59c1f3d02de7a593b93d1df17a01a36ef89066cc5888446ba0a6870a28a230290426e6393
+MISC metadata.xml 604 SHA256 35107cdda3ef7a7f39ebe6fb5cf8a75e418255382fd82cf7784bc3aa0b6b27bb SHA512 759a30aea4326cdbede58148397ad135167f443b8e9852a6057945cfbaf70db0c6caa961032c434536077435d3395a82dcf1920d8b7f4aacdfe18857859ac6ac WHIRLPOOL cf5b2f1dc8fc28b3695f06a4f03d2fc611fe7178cf82a0ec1c9f0e130d54a958a5751095bc9cd02cc73599c653b57eeb49922d80d9d41f56d61858c1b638f763
diff --git a/dev-python/scrypt/metadata.xml b/dev-python/scrypt/metadata.xml
new file mode 100644
index 000000000000..6404d818f5c2
--- /dev/null
+++ b/dev-python/scrypt/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+	  Bindings for the scrypt key derivation function library
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">scrypt</remote-id>
+	<remote-id type="bitbucket">mhallin/py-scrypt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/scrypt/scrypt-0.8.0.ebuild b/dev-python/scrypt/scrypt-0.8.0.ebuild
new file mode 100644
index 000000000000..e8a275ed3604
--- /dev/null
+++ b/dev-python/scrypt/scrypt-0.8.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Bindings for the scrypt key derivation function library"
+HOMEPAGE="https://bitbucket.org/mhallin/py-scrypt/wiki/Home/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+SLOT="0"
+IUSE="test doc"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# dist tarball does not have tests
+RESTRICT=test
+
+python_test() {
+	esetup.py test || die "tests failed"
+}
diff --git a/dev-python/sdnotify/Manifest b/dev-python/sdnotify/Manifest
new file mode 100644
index 000000000000..49123373a2c7
--- /dev/null
+++ b/dev-python/sdnotify/Manifest
@@ -0,0 +1,3 @@
+DIST sdnotify-0.3.1.tar.gz 2513 SHA256 e69220d4f6cbb02130f43f929350a80cf51033fde47dcb056fbda71e2dff2d5a SHA512 765e75e727ad5128269bfffd4d3f64666df654adc50965a54f3cd622933aca583faee5453f7fec3a23b6f754f4475522dd96a86ba643984cd72a575ec082709c WHIRLPOOL b43831604022cdd5f605138324cda4e43ee7021993e66afaa73b82eff98c11dc087d5f8f5d1b62073d750cfb84ac9168eca12640dc6149df68506826fcbfc0c4
+EBUILD sdnotify-0.3.1.ebuild 494 SHA256 0a253c778ca1d87859b646e755befc78c08f8492d4cedbfd166fa67617b37b81 SHA512 84b03e6a9a4a2c0d6bac5ace9dbb999b7d1c422bd94968140ba239949d2d1c939661d047b522439ecdcb93f0af2dbcb80bbc59c7067f739580e37932b1840e23 WHIRLPOOL 3c5b664e55189aca5e751333a3830648f40605d18ac1382b870b79aa27d5da40299166c60db722e35ff224332f7037680c722b7c5696ec122a9c0341811982cb
+MISC metadata.xml 898 SHA256 59c34273b0f1764d7bfa20e025dbb4b9535cb08ebe57b4ce93afa8bc0b8c2b3c SHA512 3bec05dec5e31a37d823081ff5b30fef06ab6a793801e1163d296d8c6b637dcc964379d53e77fdaaa6c55ccd5095018cb5f14c3252f575ba90eeeb93736ee986 WHIRLPOOL 0d4d270004d3aa2d9d7465075fbab82e146b190d16d7bd1413abe57f3bacd62416e730c058a326f65cdd9b2865fad22c3c09fb531caab34622099238e274fa0f
diff --git a/dev-python/sdnotify/metadata.xml b/dev-python/sdnotify/metadata.xml
new file mode 100644
index 000000000000..24bc40f11d18
--- /dev/null
+++ b/dev-python/sdnotify/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>bbethke@gmail.com</email>
+			<name>Brett Bethke</name>
+		</maintainer>
+		<remote-id type="pypi">sdnotify</remote-id>
+		<remote-id type="github">bb4242/sdnotify</remote-id>
+	</upstream>
+	<longdescription>
+		This is a pure Python implementation of the systemd sd_notify 
+		protocol. This protocol can be used to inform systemd about 
+		service start-up completion, watchdog events, and other service 
+		status changes. Thus, this package can be used to write system 
+		services in Python that play nicely with systemd. sdnotify is 
+		compatible with both Python 2 and Python 3.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/sdnotify/sdnotify-0.3.1.ebuild b/dev-python/sdnotify/sdnotify-0.3.1.ebuild
new file mode 100644
index 000000000000..fe6f98641f01
--- /dev/null
+++ b/dev-python/sdnotify/sdnotify-0.3.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of systemd's service notification protocol (sd_notify)"
+HOMEPAGE="
+	https://github.com/bb4242/sdnotify
+	https://pypi.python.org/pypi/sdnotify"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-python/seaborn/Manifest b/dev-python/seaborn/Manifest
new file mode 100644
index 000000000000..699739981627
--- /dev/null
+++ b/dev-python/seaborn/Manifest
@@ -0,0 +1,5 @@
+DIST seaborn-0.7.1.tar.gz 158146 SHA256 fa274344b1ee72f723bab751c40a5c671801d47a29ee9b5e69fcf63a18ce5c5d SHA512 6c730d87a97f0df3b38b78ee9255d47b900aece1308127e2772dc982b19691efe6afe192752c89cba9e9532b567dc1c3c103675e580e6f1151355ea89d1019b3 WHIRLPOOL 072ac50dfd554160b1225f0b901258915feddca91d47fd1c54e6469d9767478cd01b8585e2e236f2c5658dcbee9f6ea6c0b7f3ea0e3e0e41cdfd21343489b077
+EBUILD seaborn-0.7.1.ebuild 879 SHA256 40b0a5c75a8355e35434bd5cb25354346657d2db8a64f88237422c9acc5b6d19 SHA512 43b9e40b36b6de3e467fea102033587c9623b294dc808d1341cac6bb2846119757ff9a69d5f2461da72a6050a7b575f4da6a74165a9bc861f255074d9dce6695 WHIRLPOOL 708f36f1f84e0458bec882b3991f6075afaab5070cc50f76d47444feebf4206e51ffdde78abf2e323ede86fafea2691f2c8b287104d0e59f799df8d0ceb3d3bd
+MISC ChangeLog 3919 SHA256 c1a90098677f40db0ebc8732390f0c1013cf5a5a64217bd5e82def604f1c2b1b SHA512 e74b05f5a50b04adc27ae540ab878077ca0d6ec74d06be524b517014673d17ccf954b9f1537811136cf1601fc48ea619632767f95b4fcacabf237e761e0990e5 WHIRLPOOL 4c8c2ded14e28ca92dea503e5a1921471e2419b9c08f5f157d68202dc9c5a47c4af4cb00db460e0f7896decaeb8844efa4a2831a6dcc32cd742cf63d88eb27e1
+MISC ChangeLog-2015 468 SHA256 d64131957cc8902877b7cc0ec2a516b8d2b29e9a7de1258652fa2eacc994ad77 SHA512 0d98cd4385a785d3a14e3ffb9d7bac744446b6f0a2890cc5ca0a35aec47aaeb33aa9186bd1d4149086797131e8f1ebed91017504f71eafa4f02e3d8980476ff0 WHIRLPOOL c86d26d4327a9f508b229a207d4b09cfd026ac2c9bbdfe3af0ec0ac6ea724e11fc8c4db313f83917a9841a2539227a3c1665aec6ab3d6088056afe37360225ea
+MISC metadata.xml 1775 SHA256 2128f90b044aa45a6a2a88d735e8a956bfd0d0f1dc51c8d11ba097ca7be86d3b SHA512 8f88a3306453c65b345bf3d676903efa495f3cd65aeb9c5f6aa0243a6677e1e306b4a9e52e44685eff45cc43f73fbb5439d095bf4cfe1b4384b3e76ba7b17ade WHIRLPOOL d2008ee0aa0d153c28160531b847db85840abe416c05920ab4f2486518713c1778f3f0a192e36019ca47d2ad7fc9999d61fb75a7672762c01932cc4eaeb62630
diff --git a/dev-python/seaborn/metadata.xml b/dev-python/seaborn/metadata.xml
new file mode 100644
index 000000000000..86ec3a36c731
--- /dev/null
+++ b/dev-python/seaborn/metadata.xml
@@ -0,0 +1,42 @@
+<?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>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Seaborn is a library for making attractive and informative statistical graphics
+		in Python. It is built on top of matplotlib and tightly integrated with the 
+		PyData stack, including support for numpy and pandas data structures and 
+		statistical routines from scipy and statsmodels.
+	
+		Some of the features that seaborn offers are
+	
+		* Several built-in themes that improve on the default matplotlib aesthetics
+		* Tools for choosing color palettes to make beautiful plots that reveal 
+		  patterns in your data
+		* Functions for visualizing univariate and bivariate distributions or for 
+		  comparing them between subsets of data
+		* Tools that fit and visualize linear regression models for different kinds 
+		  of independent and dependent variables
+		* Functions that visualize matrices of data and use clustering algorithms to 
+		  discover structure in those matrices
+		* A function to plot statistical timeseries data with flexible estimation and 
+		  representation of uncertainty around the estimate
+		* High-level abstractions for structuring grids of plots that let you easily 
+		  build complex visualizations
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">seaborne</remote-id>
+		<remote-id type="github">mwaskom/seaborn</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/seaborn/seaborn-0.7.1.ebuild b/dev-python/seaborn/seaborn-0.7.1.ebuild
new file mode 100644
index 000000000000..1145719eec46
--- /dev/null
+++ b/dev-python/seaborn/seaborn-0.7.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Statistical data visualization"
+HOMEPAGE="http://stanford.edu/~mwaskom/software/seaborn/ https://github.com/mwaskom/seaborn"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/patsy[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	cat > matplotlibrc <<- EOF || die
+	backend : Agg
+	EOF
+	virtx nosetests --verbosity=3 || die
+}
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
new file mode 100644
index 000000000000..1cd26509ff3e
--- /dev/null
+++ b/dev-python/secretstorage/Manifest
@@ -0,0 +1,4 @@
+DIST SecretStorage-2.3.1.tar.gz 16073 SHA256 3af65c87765323e6f64c83575b05393f9e003431959c9395d1791d51497f29b6 SHA512 69a2c86a1abd904b7d71bbb59cead3b2588cf88d7f35cbaf64d18ff9aa9ed62ba9f79d0bebd10136aa8a0edb1ff8a1d1aff70cf8e519dc74303993ef0d564047 WHIRLPOOL d46db6d473130a10256a9c7b231ec29c7dcecaa3c9d428b8265c4849f5753f1cef3f2dfc52dc5287a2e6868305b288df5cd34b13be2163a4621c6b5c2feef3e2
+EBUILD secretstorage-2.3.1.ebuild 691 SHA256 e10c05a807578149935c9bd7bfb9d70b207811996f5a363fcaba2d1c6bb0ee8d SHA512 c931dff26a153e19ca55ec14c78e8ea8238b8312015ee3da5fa79530e5f931851dd846fd451bfd8d9f3a221a6ff8cd0a652b64da85bc90ef9d0c676ce4701b72 WHIRLPOOL 4fd97e822613a69bff4cdf2613d833def6300057db1ac2697c9f7946f5685addddbd11ce227a7aacd574d5516e567be79f1c81fc3a2d32498c18163496755ba5
+MISC ChangeLog 663 SHA256 b1c208b3ad01e1b209170a985f4d2ffa7fba2de67325f882ca1a835c086e62db SHA512 f85772691916553918f966150b5b0deaaabf41850694e188cbf48d5b86d92b3352aa7d981de2aa4dda978455d8adfd3584f5f887a50f8e6df13de6b555289011 WHIRLPOOL 0317465daa287c2eb6ea2e2855b7d53c8af0855ca98a507f7dcd136f493028119ed1354b1718cc9b4729b98a8138d3c991f8937aec6dd74701bcd23b441297fa
+MISC metadata.xml 377 SHA256 6e1c9f1f7f360300d3af2012eb388fd78024d4972de923421249c2a25cd8028b SHA512 56c6fc8a7b58a5ffa5e2d705567203cad260629bcf8581203be8ec2480a16603334e3298583c297a8e093881955fecd457b250af56bac05871476041d217bd95 WHIRLPOOL 67fdde47b8d67fb93005ce9e6b5dab18517e232284b76835c4f416090ec9cf9b8b3a9b042911db6b04bf204573e9553e99477ade64455d5fbd30345756ea65dd
diff --git a/dev-python/secretstorage/metadata.xml b/dev-python/secretstorage/metadata.xml
new file mode 100644
index 000000000000..d0020afc4b26
--- /dev/null
+++ b/dev-python/secretstorage/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">SecretStorage</remote-id>
+		<remote-id type="github">mitya57/secretstorage</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/secretstorage/secretstorage-2.3.1.ebuild b/dev-python/secretstorage/secretstorage-2.3.1.ebuild
new file mode 100644
index 000000000000..959228344f5e
--- /dev/null
+++ b/dev-python/secretstorage/secretstorage-2.3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+MY_PN="SecretStorage"
+
+DESCRIPTION="Python bindings to FreeDesktop.org Secret Service API."
+HOMEPAGE="https://github.com/mitya57/secretstorage https://pypi.python.org/pypi/SecretStorage"
+SRC_URI="mirror://pypi/S/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~arm amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/selectors34/Manifest b/dev-python/selectors34/Manifest
new file mode 100644
index 000000000000..117d502de238
--- /dev/null
+++ b/dev-python/selectors34/Manifest
@@ -0,0 +1,6 @@
+DIST selectors34-1.1.tar.gz 10525 SHA256 84b3743b9046461aebbcd13c15e79ab91e79acfb6e030b54a0ec6360ae0bbc52 SHA512 3c9cae461d7bc629a5ac2f17e7a5967d4a2865528b34e94e1164521e9d720381cca2c395ba62c0f67a4b9db34644dd031c2576a5017282bf4791c805c467408a WHIRLPOOL 67d07956c9c35e3a43e41033254b4ddff86271376f9d72a2503d9bc5e1f8ee5900384a5a71472a77c5c51e9025d7873d57c8f4797ab2035d7cd22e7ba99c0af8
+DIST selectors34-1.2.tar.gz 10145 SHA256 09f5066337f8a76fb5233f267873f89a27a17c10bf79575954894bb71686451c SHA512 66fd545d5163ee3cf7e160e428a36f70d43c5a6a8a5adcd6a3028fe67ca818911bc3de934d862d06806dcf051516856baf34b99d9e2a062c214eca667fdff65d WHIRLPOOL 22f8eb70e2fb5d2ae7fb6abea45faa7e41a6d2f9f2a2f98754c7415831b7d8becf08c6c06d45497bde4c0dc07951e14745c0b5b5b74f40a19248c6d5a2aa7ada
+EBUILD selectors34-1.1.ebuild 496 SHA256 d7732d9d2a6cecc1ac7b81747cadd7be68ebef9fa8f423c383bfc457931db8a5 SHA512 c0f0bf429a01bb9f90a8b99ffbdc606649b7ab569645791fd77e8719cadefbee28a13ecc7eda1672e8f208e99c9acaa0e075ae48a8baaac3ddc79e715b68aed6 WHIRLPOOL 8215d61d9a72781a9a83a76813b1d455c3e196a13ade337f1bbdca9e05e9dbd36c261f3cd86255a656bea495e5fd65e60c3494f60fe6f3be341b7c18c4971db3
+EBUILD selectors34-1.2.ebuild 496 SHA256 d7732d9d2a6cecc1ac7b81747cadd7be68ebef9fa8f423c383bfc457931db8a5 SHA512 c0f0bf429a01bb9f90a8b99ffbdc606649b7ab569645791fd77e8719cadefbee28a13ecc7eda1672e8f208e99c9acaa0e075ae48a8baaac3ddc79e715b68aed6 WHIRLPOOL 8215d61d9a72781a9a83a76813b1d455c3e196a13ade337f1bbdca9e05e9dbd36c261f3cd86255a656bea495e5fd65e60c3494f60fe6f3be341b7c18c4971db3
+MISC ChangeLog 689 SHA256 4279cb3016e44171af109bf074ec0a80b176aa774e837d46ae519b4cdbdf584e SHA512 215d926d0f5e6cb0d45a7d42edab550f6b59dca71e560f38246c5f691d772e6827d9397ce90ab1d4278195c1de49783422da9875ead5d60c99bfa0417b189eb7 WHIRLPOOL 44ec4216191f3385a9bbc434a412851925de1a722b0ceeeafbeb48f87179ddabe1387a76b7b858b611cc289ee399c89960c6c82c036676eebc0f411b6abc6ede
+MISC metadata.xml 378 SHA256 647c1fab1fbb733d8ea640cabd15ca4af0d2847e9511445cdeda1bd2770daa6e SHA512 3aa7b7ec03e37413a17323a3db7633f05044d958b1547c3dd420588ee3056c8b938d30f23b69fb7584cffa9c59d7ee69689be9c5d0d4f248fc9b3a093191d297 WHIRLPOOL 36b35e43c2f7dfb77e9808bd39a61fcf0573ee19e49db014c6c8b756bb364e8c8717ea7d87b1fc3102faac479ec9f8d0752ea96f8e23c4d37a45b093e61cda3b
diff --git a/dev-python/selectors34/metadata.xml b/dev-python/selectors34/metadata.xml
new file mode 100644
index 000000000000..b97e795afe06
--- /dev/null
+++ b/dev-python/selectors34/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">selectors34</remote-id>
+		<remote-id type="github">berkerpeksag/selectors34</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/selectors34/selectors34-1.1.ebuild b/dev-python/selectors34/selectors34-1.1.ebuild
new file mode 100644
index 000000000000..67bbcfc2fdc6
--- /dev/null
+++ b/dev-python/selectors34/selectors34-1.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Backport of the selectors module from Python 3.4"
+HOMEPAGE="https://github.com/berkerpeksag/selectors34"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/selectors34/selectors34-1.2.ebuild b/dev-python/selectors34/selectors34-1.2.ebuild
new file mode 100644
index 000000000000..67bbcfc2fdc6
--- /dev/null
+++ b/dev-python/selectors34/selectors34-1.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Backport of the selectors module from Python 3.4"
+HOMEPAGE="https://github.com/berkerpeksag/selectors34"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
new file mode 100644
index 000000000000..69e301866d79
--- /dev/null
+++ b/dev-python/selenium/Manifest
@@ -0,0 +1,7 @@
+DIST selenium-2.46.0.tar.gz 2621186 SHA256 fffce2696f1dfd64662086aac276e657e33953b32e265e34c4d28f5f1787e62c SHA512 58d2bbc2768ccee7c238ed64c0e73d6e56977581ebda5d71a58dfd262e6b724501b49cac11a56fc79b700810ac8f7e09d968f4135f6aed4abf8147eecdce99ea WHIRLPOOL fb537963360abf0950ee71fff2a6db889800692434f4b98412d52249054cbbf177c8e4bdf19ab1640a825f7bee072af2c4a9fcf8dfc9f9c365de4639bf69c063
+DIST selenium-3.0.2.tar.gz 830314 SHA256 85daad4d09be86bddd4f45579986ac316c1909c3b4653ed471ea4519eb413c8f SHA512 6ddbe68e65d8999dfa362fbafceee008967b73808d51efabbfa5a7e79325597ee6fa226a45347e1c5b7e479cc607af4f0233c31cc7296067566a4dcdf1f86496 WHIRLPOOL f0b571269ce2727cd5d57837efe2a1d02e8d38a832f726a26bb1fe37d2f1b964e33171fa13e715ae7ef20474cb0e49dcf27339715321ee7c79799fe4713148b7
+EBUILD selenium-2.46.0.ebuild 706 SHA256 d719980137516a16bc551cfcc1989e46dce97c6ed034ab46bf83b75fc1116a69 SHA512 99c63aa6137b256958030a8353a9f42135e3b9d0e6a7eba2d99251448da2be051d3692280e2d05b1ef7768026277c2c47a47d81d3376ae74883fa231115129d1 WHIRLPOOL b9973937c9a4c3cdee06a651e1c0caf980d5bfc85f5c57f081d346cf5c399203c9f2e5cf12bf1706d607d3b8eb025f1367ee4d70ab0f03c33d4d837a5acc9b2c
+EBUILD selenium-3.0.2.ebuild 596 SHA256 addf65cf3ed8b75cfa54678bb65fbc8ee0b59addf27da6b047cb2ec5431350f3 SHA512 a9290e17825d75de774f8e3d45d431be11733c66fe70d37cfa6400c65db7ffa4bc1d31e1187ea9e750aaa7b135d0e5b95b7ec24d640c3f8584d74d66cb3c2d62 WHIRLPOOL d280833f695f50b5ef6a17ee2e1caf7aaf4834a3254e905ebdaf487fbdf5fee5eccedb3a9098119f5f39c5dc9eaf24d42fff59ef8fb19aeb019e9423c94ee3ba
+MISC ChangeLog 3923 SHA256 538e50698314046b091d8ce3a96d0021faa06482087bee158d5644c058da5771 SHA512 b75c499d4e8511203cc0c2c78bd0414c20ca5cc3b541f2e9aba427332b9c45a1649beec29d55922bc60cb2682fc234cbc98d27aa69f4bc8f927e21a92743e269 WHIRLPOOL 0572a91f20e217f0ede62f646647faa2a635e4b1d3d0bb087a5c39a6e0e3cf6a2254465cf3681ea8502786cdf87836b1e35f1fe379c9fb5b9b84a859d63d6e06
+MISC ChangeLog-2015 2269 SHA256 6398c6aaad72b9c86298933706e9bdcf67bb5730efd0b4eaa0d646338cf8ee72 SHA512 326135ec51386e3ed4c7831b822e95454ec36ef6f4860e2a33649f58c473cdb1cf5cf77de4cde983eb00f195fda78a253425f3a537b968f684401327d4d8afb6 WHIRLPOOL ba76af1d3a374967cb2210dd66e1b05038d435843d093793e7fd22f62dde57024ca50bf74c6f071add7bbeac0e878921c24605da4c55669a35370118d19adc4d
+MISC metadata.xml 382 SHA256 ffbd847b1fa38882172cea246502720aa0810948db5944feac8a362196360dba SHA512 85f758426e03c1ef8b1e4e9f7098df95965547a10ee9e2168398b9a71b612a61b531860a46d75701d9c4ce0a83df9e4344354ee65ab1ee166f45738a2b1c9955 WHIRLPOOL 448c74297d6e03d03c36de87683496ea5c18e9f82798201964d51a6232852a6aed5d1fae6070a4e3e8ef644fe7a75adec4dd43f82358335629358e040d08ff7b
diff --git a/dev-python/selenium/metadata.xml b/dev-python/selenium/metadata.xml
new file mode 100644
index 000000000000..07a1d68827b4
--- /dev/null
+++ b/dev-python/selenium/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">selenium</remote-id>
+    <remote-id type="github">SeleniumHQ/selenium</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/selenium/selenium-2.46.0.ebuild b/dev-python/selenium/selenium-2.46.0.ebuild
new file mode 100644
index 000000000000..68e2ae6cc005
--- /dev/null
+++ b/dev-python/selenium/selenium-2.46.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python language binding for Selenium Remote Control (version 1.0 and 2.0)"
+HOMEPAGE="https://pypi.python.org/pypi/selenium/ https://github.com/SeleniumHQ/selenium http://www.seleniumhq.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="amd64 arm ppc64 x86"
+IUSE="doc"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( py/CHANGES py/README )
+DISTUTILS_IN_SOURCE_BUILD=1
+QA_PREBUILT="/usr/lib*/python*/site-packages/${PN}/webdriver/firefox/*/x_ignore_nofocus.so"
diff --git a/dev-python/selenium/selenium-3.0.2.ebuild b/dev-python/selenium/selenium-3.0.2.ebuild
new file mode 100644
index 000000000000..06c5367a63e9
--- /dev/null
+++ b/dev-python/selenium/selenium-3.0.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python language binding for Selenium Remote Control"
+HOMEPAGE="http://www.seleniumhq.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="amd64 arm ~ia64 ~ppc ppc64 ~sparc x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( py/CHANGES py/README.rst )
+
+QA_PREBUILT="/usr/lib*/python*/site-packages/${PN}/webdriver/firefox/*/x_ignore_nofocus.so"
diff --git a/dev-python/semantic_version/Manifest b/dev-python/semantic_version/Manifest
new file mode 100644
index 000000000000..f011c0cc7d94
--- /dev/null
+++ b/dev-python/semantic_version/Manifest
@@ -0,0 +1,7 @@
+DIST semantic_version-2.6.0-1.tar.gz 31678 SHA256 110d9c75dc9670a188ab820503c6b40ea4ab3f1450a0aee5a90a24fd60aef358 SHA512 18db9279c2728565b13362c54bedbf569f0878cbe6bb58e631d87ffe7cff7d9131a30a2592cbf511091c03e854851159bbb298fe7469f53e8a2d92cf26ab4d0b WHIRLPOOL 1e9b0411ffe00d0544e71b3b71e78f3f6b858bb75bcf2db92bc86334f97f2c2d796924a477ddd5c43d4a1d16d70e4fce78fe9cebdfeae2836adfafb425475abc
+DIST semantic_version-2.6.0.tar.gz 13919 SHA256 2a4328680073e9b243667b201119772aefc5fc63ae32398d6afafff07c4f54c0 SHA512 805449e7219aaa59d28cc267c27a6abab5cbbbfd52c72d66f24bcace39c9f864e4ed944a3dc614e14a700a5bc92272fa6420312f3169b01a4cfd9ddf3ffb42d6 WHIRLPOOL 293dec8e54ea1214891642e87972955f41286f1d4ef76f59a62a00996588a43aadfec893f451aa1733186f4d76ca67a2efe496f2f20412359c08fb11d5de1206
+EBUILD semantic_version-2.6.0-r1.ebuild 642 SHA256 fbabc2c4b4c30450791956ae23893b3334393620de2193243e821fade9473fcb SHA512 1e5bb504aa841b268298caf7e2745e4dff2ba4d73c6d706caab079bab756009c44bf72fd2168e9da7d68da52978b3821d3b61ef9fe6b4889e76cdaa39e79303a WHIRLPOOL ab66ac675c88d1fbbcccba0b8572c1823204b367c33952cde6ba575f04036110994a8027858bbe2f4a143f42ba143929302182e4b456e2e56581a968469b16fc
+EBUILD semantic_version-2.6.0.ebuild 524 SHA256 68bb0c047beca01d5c997170358953bc45ff06f08f56d5722f55ee79bb85dd03 SHA512 ace4ebbef43448d9832b8383b1038401ed26fbd3980278524dbe9b46964488262d87e38cb0d485e9b5eac28200e74e70398964907033559641ca5a8d8a806879 WHIRLPOOL c19778406d80bb22af32c677e659bc020335576ffebc1c2aefcdf40e7729f9f64a0029a799b088fea70bac0964beeab79b10e6d337c4114b00b1cdb8aef8729c
+MISC ChangeLog 3574 SHA256 48cc514eeb105a7c84fa8a43e62284621520c63156c22961415754cdb45bb587 SHA512 6c8a53c53b29ecaeb4ec8fa0fe012e71e6339b85c8c6a894a274a419a9974d05dba28f880a8f678e2b0851209f221126a32aa3dfce6d6f746de451f7cdb77aee WHIRLPOOL 07bfa04ec2e24ba00407ae066fa602530b16aec68ab639b81e1b584b72a3042c104d235de894426d0202733808c79ba7f58251c44d88407fc65720dfa13edfa7
+MISC ChangeLog-2015 710 SHA256 62a7eaf1dfee218f06d48b51fede3e24cc36b11706abd008449e6ac7dfa03b7e SHA512 62b408447b603fb5cc5636cb6a6464e114a4c4448c51ccb7beff1f8f4b1767f8a49772347e74d02f6283b196c01547c8cd4ce709db7f0354a95f58a59dc1ab3e WHIRLPOOL 6d62853fb2768fbcebf19333d39284094197388c3592c12d40fe20aab9d956d33657174178a07dc72bf48fd1598c870791aecf5ca9729b113d0f7c1de469702c
+MISC metadata.xml 640 SHA256 77439fb45b0befe06cc31ae34ce091e7d237270c8a3d3455e5abfce0b7cd5344 SHA512 acab0ada8f54c74052bf2712b2c956db9e59a47f3b5a5eda759375f9df9a22ef00806c2399113b7666841bbf4351596e79b88e3dfdb51cbe05b6f77eb124271e WHIRLPOOL f9b35e3340b1b1a9e391f08b63c23a8756a7ba58c6c0d8e08ddf092944c9da9f1ce26158750925ccb291c6e597675b6a943e304f2c69113f3a0d2b4fe5aa81b6
diff --git a/dev-python/semantic_version/metadata.xml b/dev-python/semantic_version/metadata.xml
new file mode 100644
index 000000000000..b7eb936c241b
--- /dev/null
+++ b/dev-python/semantic_version/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    This small python library provides a few tools to handle SemVer in Python. It follows strictly the 2.0.0 version of the SemVer scheme.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">semantic_version</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/semantic_version/semantic_version-2.6.0-r1.ebuild b/dev-python/semantic_version/semantic_version-2.6.0-r1.ebuild
new file mode 100644
index 000000000000..3fbc3a46e1fd
--- /dev/null
+++ b/dev-python/semantic_version/semantic_version-2.6.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library providing a few tools handling SemVer in Python"
+HOMEPAGE="https://pypi.python.org/pypi/semantic_version"
+SRC_URI="https://github.com/rbarrois/python-semanticversion/archive/v${PV}.tar.gz -> ${P}-1.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/django[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/python-${P/_/}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/semantic_version/semantic_version-2.6.0.ebuild b/dev-python/semantic_version/semantic_version-2.6.0.ebuild
new file mode 100644
index 000000000000..cedf16e3ec0c
--- /dev/null
+++ b/dev-python/semantic_version/semantic_version-2.6.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library providing a few tools handling SemVer in Python."
+HOMEPAGE="https://pypi.python.org/pypi/semantic_version"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/send2trash/Manifest b/dev-python/send2trash/Manifest
new file mode 100644
index 000000000000..23a5a4f1ffe4
--- /dev/null
+++ b/dev-python/send2trash/Manifest
@@ -0,0 +1,5 @@
+DIST Send2Trash-1.3.0.tar.gz 5563 SHA256 33f4461eae831eb09a21b70ca202c2a6dfd83db6bafa1e1ca11b5001e22c58fe SHA512 d308dd06ef7a11ad7bcb5d9195fb52aa0c0b8e76590ef11b1576d14815501c32c48b96167eb0a325e4f27d0dbf77f41c012a128d30c8f05d9d5ebec9967e21f3 WHIRLPOOL 15d286964183ad44ae51dfed29aa97456d5460b68fd176dd021f7d093d8e6e213818df2fd4346554601b5f87ea1f95727248544e2e78094f696dd7d50d0e89cf
+EBUILD send2trash-1.3.0.ebuild 622 SHA256 d0957fb20c6e5e9bb276100b59f6f7fea104f5a9121f45dcc3e10592995d887a SHA512 97b680c10e190a3f57435032ae0878698ca006d925d0432db983be5f3503044c170b103527b30e5f7b1f5d767bb33d66ee689cd1643038cd5229441327914706 WHIRLPOOL 0cc53e71bd8a0d89b60f880e7a8ebdca11a1eae9b249100e952ee4174b4e53d8645d52d59cc1e79a1767277678b1e375ab8cfdbc820ca4061137c68fcad4803d
+MISC ChangeLog 2750 SHA256 4a953f20de22216745b513ec4e83bfaea0bfcb7ad237375e7433a9e8750c1f2c SHA512 30a191b143adfd28d51b841e355d022e211cc7c35af6f18b71f3db3942fabad10c13e6d50b11b5c66967aa8b35921a6ee6bdc6b331c17d51b2b4c7cfa07330ab WHIRLPOOL 7322775818db43f3139b0de31aac3e19ebafa610c9951993a66fb94c4b0d4073b00fa02162a615aa6478a1337cd604063e8d9fd60a9cb3513a07c6cf0cae5522
+MISC ChangeLog-2015 1556 SHA256 18ee416a142346183307c78ab28e05cc86127e2d7e1c9bbd65fa81cfde9fec26 SHA512 783cc17641302105ae8de1ed31f1bf043d0844f1a9390b8f38c501cc91b9284fdab73ac83365ebbb70b5c8b3347ce5229ab5fd5e8ec7d4e57fdcbc74d51251e8 WHIRLPOOL 09b89d1e1fb9c0b51872f209197f664ca41a3da3af987709fe0fb1c2a97410407bb35db2af064b90613c905e223e74d170310f238c119cca045a7c0e38ab303c
+MISC metadata.xml 381 SHA256 5dcdea0a27d4699735f303413d14f7530839afc61e9ae682f48f3bbd74bae636 SHA512 309a92e88f854e9384519bb8a959025c97a8c75a7ee317a17d2c51c0a444b0fa008fd46fbbe07be3dd95ab2fc1930cfdf2a0c6df7ce68fc190610176f841067c WHIRLPOOL d5320fdfee5df53f7e0e09492129c4c7b469291301464186d21ed01663e68e75935c36765836c73319626cbebf344738be5bb59844b5b15d5deaa908a571f69c
diff --git a/dev-python/send2trash/metadata.xml b/dev-python/send2trash/metadata.xml
new file mode 100644
index 000000000000..9dd529756191
--- /dev/null
+++ b/dev-python/send2trash/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Send2Trash</remote-id>
+    <remote-id type="github">hsoft/send2trash</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/send2trash/send2trash-1.3.0.ebuild b/dev-python/send2trash/send2trash-1.3.0.ebuild
new file mode 100644
index 000000000000..f61666e66ed0
--- /dev/null
+++ b/dev-python/send2trash/send2trash-1.3.0.ebuild
@@ -0,0 +1,29 @@
+# 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,5,6}} pypy )
+
+inherit distutils-r1
+
+MY_PN="Send2Trash"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sends files to the Trash (or Recycle Bin)"
+HOMEPAGE="
+	http://hg.hardcoded.net/send2trash
+	https://pypi.python.org/pypi/Send2Trash
+	https://github.com/hsoft/send2trash"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${MY_P}
diff --git a/dev-python/sepolgen/Manifest b/dev-python/sepolgen/Manifest
new file mode 100644
index 000000000000..c358fd36e4d1
--- /dev/null
+++ b/dev-python/sepolgen/Manifest
@@ -0,0 +1,9 @@
+AUX 0030-default-path-for-tests-also-needed-bug-467264.patch 891 SHA256 9e8627ca85ce1ff98933b9e8c8ab00c6ac320ecec3d082a91b790f9c1cebbf31 SHA512 d4e6cc6084bc76ac1394392a8107b2432ca885b88d8b3252507d28a192022e6252bce7d8a666edbc5a36362ceb76a2157008fc3a110a892964c40904607412b5 WHIRLPOOL b981c25dc65e63f72d7646eaff77b8de92589548c272906f73e1a729b7f54ecd57f0502ed453f95bbdf6d9e85a1a087728ec2c5ec3e2eeabc61bd36487fd4842
+DIST sepolgen-1.2.3.tar.gz 367644 SHA256 3ee1745257fa55301070219c77978c7c9eeb9aa595ce0b6b29c3baa4687d5cf0 SHA512 5fe023f983dc0fe1855da24835cb9bb466ac6c44d07fa939416740ca64968c039be2febff79b2a4c593e54c5ae81448dd06020e9160e4f84eea95d8c0d2b910f WHIRLPOOL 65c663a3398f1ae64e8bf233828701481ac2ee68fa75f2271596628c7dcc80c1193166cfb950f8faa86988c0b309cfbb59f15f38131a9f1f2680b754518bba11
+DIST sepolgen-2.6.tar.gz 367897 SHA256 6a327b1576d914e57ad796a541a7a9bcceefb14c445355559993de0fdb8e7a60 SHA512 b04d0b78416dde4857888f94bad1f6f83909cb4f9fb50519778ec8a50662be38ccac19f5fc6db269754cb63668c5324258ba4a4cb79440789b759ad5eb6148c0 WHIRLPOOL 43ac0abf13830894b3cd843777d5190cdfa25609ddd21e820f4df1e6169b77b76fb6af924fa0376f99a236443b8c38435a7504b8843a017e656bbe17e1da4e17
+EBUILD sepolgen-1.2.3.ebuild 2307 SHA256 904e549b0e79f9b3ce21f2a3b32acddb47a9e2754dde321dd6773b2ff82be047 SHA512 453d5dd6fc21ada16bec8274bc4ad5880ddfb1687d1ae3a73d84d2734d42ffa751757b0e5cc4ba7e6e4a138d4174c34b616c88779ffbb5484e1e41f1f8535bf3 WHIRLPOOL d47f7f0cfa2d30340ce4a5f2087fac1f162b87078d46cf62686f570f7e6ebae86ce3f795f0a715e0c860b0798eae816403982594a6ed0f1499bf98afeed82958
+EBUILD sepolgen-2.6.ebuild 2295 SHA256 48ddd9f3dc1c1a00941ff35b19dc107e443bf602b524acf1219de1e7f8614cde SHA512 1c7a218942f3d0d6afc6b01e81bce60d357f82348b1e8c2acc2e03a66d75ca8c909d2b072b4349363a61975a595d867439de7af0a6d7c1557999594001c43dc8 WHIRLPOOL 078b4c2b010347ccbbec2eb4915e38c471b2df0ddde54592c5b2cffc4c5b7fa1c00257375f705615778c910da45b7771df83cd44a3fa7842713c7856d634e946
+EBUILD sepolgen-9999.ebuild 2297 SHA256 2b08b6c14ba7378f656515ac9c2106e5d9fe2689660a684635e2247cdde72846 SHA512 9521bbf801ebedd1e1da097f37978410a0430ebde0e793e0efb600c9724f4917f06e240aa1e3140db303d625957cc54eac4f070734fd33bb03eff88cbd6fa056 WHIRLPOOL 25a0380496d7b61578e910e128251dc682dee87361aedbc07d48af644f330654e1f7177574f87459bb472ba0c4b02e68386c5bb8066c4c6933edf4a99790935f
+MISC ChangeLog 4415 SHA256 a9cf78cef3c16ea3f6627ff1caf1aef64ad4733f8417a4ca3a26db0d83b15313 SHA512 57e58066d98cc27d3db8095f1206e44be73cb769d17c3bb89282efe70ba29ace6cfa0dde479c81978e04fa5494ccd12dcc4f026b830cfde0074aee1391ecf531 WHIRLPOOL 0fd871c258e315a2fbebb7cff4e7de3e03781f37b4406069e2fb5713f3d075f0d43637b55158829dfec1332aa8575b43860e2898e15a1a2de84183c13ac1ca0c
+MISC ChangeLog-2015 8639 SHA256 4c6103f1923127d465b15fda2927907b2558b7bee67afe7ae17e7132aa581b21 SHA512 ab752e0207cbf5b70f07b8d05439133bf5b85ac46dfe6c0777c830585d5ead4168a96c179e0ea15206b735b093a4328aea540abfc975974c4499be195e1e4f1b WHIRLPOOL cccf452218908955e52e694acadbc0d1b368730096071f190430b820ada3bdeb328bbc6331a8654f2392eb36b0d5bbc0a7693b9d39183655620a058d81df94c9
+MISC metadata.xml 407 SHA256 9757a59cd9286acd8db9ab5750934a37f023c04308e035d76ac6698790a9d008 SHA512 576b46fd09a9a48f19132f006edf0ed27d864d0095415121db0e0ef64013fe6d35b220d305e6042cfb10f51cb05317cea7ea739905675126ed8191a752eb610e WHIRLPOOL 1f14482a8b658937bb20fc6c1a75d8b880564ec5ac66febb8a797827258211eefab8b8f55ba5697a50381b06c0b5b4a423e5545e270bc1a38db36f67bd04d9ea
diff --git a/dev-python/sepolgen/files/0030-default-path-for-tests-also-needed-bug-467264.patch b/dev-python/sepolgen/files/0030-default-path-for-tests-also-needed-bug-467264.patch
new file mode 100644
index 000000000000..c8678604c4fd
--- /dev/null
+++ b/dev-python/sepolgen/files/0030-default-path-for-tests-also-needed-bug-467264.patch
@@ -0,0 +1,12 @@
+diff -uNr sepolgen-1.2.1.orig/src/sepolgen/defaults.py sepolgen-1.2.1/src/sepolgen/defaults.py
+--- sepolgen-1.2.1.orig/src/sepolgen/defaults.py	2013-11-04 22:24:13.620024022 +0100
++++ sepolgen-1.2.1/src/sepolgen/defaults.py	2013-11-04 22:25:05.619024133 +0100
+@@ -27,7 +27,7 @@
+         self.config = dict()
+         if not os.path.exists(pathname):
+             self.config_pathname = "(defaults)"
+-            self.config["SELINUX_DEVEL_PATH"] = "/usr/share/selinux/default:/usr/share/selinux/mls:/usr/share/selinux/devel"
++            self.config["SELINUX_DEVEL_PATH"] = "/usr/share/selinux/strict/include:/usr/share/selinux/mcs/include:/usr/share/selinux/targeted/include:/usr/share/selinux/mls/include:/usr/share/selinux/default:/usr/share/selinux/mls:/usr/share/selinux/devel"
+             return
+         self.config_pathname = pathname
+         ignore = re.compile(r"^\s*(?:#.+)?$")
diff --git a/dev-python/sepolgen/metadata.xml b/dev-python/sepolgen/metadata.xml
new file mode 100644
index 000000000000..2cd2b74b25f5
--- /dev/null
+++ b/dev-python/sepolgen/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="project">
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
+	<longdescription>Python module needed for audit2allow</longdescription>
+	<upstream>
+		<remote-id type="github">SELinuxProject/selinux</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sepolgen/sepolgen-1.2.3.ebuild b/dev-python/sepolgen/sepolgen-1.2.3.ebuild
new file mode 100644
index 000000000000..d7660188b15f
--- /dev/null
+++ b/dev-python/sepolgen/sepolgen-1.2.3.ebuild
@@ -0,0 +1,84 @@
+# 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} )
+
+inherit python-r1 eutils
+
+MY_P="${P//_/-}"
+MY_RELEASEDATE="20160223"
+
+DESCRIPTION="SELinux policy generation library"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN}"
+else
+	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	>=sys-libs/libselinux-2.4[python,${PYTHON_USEDEP}]
+	app-admin/setools[python(+),${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if [[ ${PV} != 9999 ]] ; then
+		# If needed for live ebuilds please use /etc/portage/patches
+		epatch "${FILESDIR}/0030-default-path-for-tests-also-needed-bug-467264.patch"
+	fi
+
+	epatch_user
+
+	python_copy_sources
+}
+
+src_compile() {
+	:
+}
+
+src_test() {
+	if has_version sec-policy/selinux-base-policy; then
+		invoke_sepolgen_test() {
+			emake test
+		}
+		python_foreach_impl invoke_sepolgen_test
+	else
+		ewarn "Sepolgen requires sec-policy/selinux-base-policy to run tests."
+	fi
+}
+
+src_install() {
+	installation() {
+		emake DESTDIR="${D}" PYTHONLIBDIR="$(python_get_sitedir)" install
+		python_optimize
+	}
+	python_foreach_impl installation
+
+	# Create sepolgen.conf with different devel location definition
+	if [[ -f /etc/selinux/config ]];
+	then
+		local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
+		mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
+		echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+	else
+		local selinuxtype="${POLICY_TYPES%% *}";
+		if [[ -n "${selinuxtype}" ]];
+		then
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+		else
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf;
+		fi
+	fi
+}
diff --git a/dev-python/sepolgen/sepolgen-2.6.ebuild b/dev-python/sepolgen/sepolgen-2.6.ebuild
new file mode 100644
index 000000000000..85d43d5ec3b0
--- /dev/null
+++ b/dev-python/sepolgen/sepolgen-2.6.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit python-r1
+
+MY_P="${P//_/-}"
+MY_RELEASEDATE="20161014"
+
+DESCRIPTION="SELinux policy generation library"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN}"
+else
+	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="amd64 ~arm64 ~mips x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	>=sys-libs/libselinux-2.4[python,${PYTHON_USEDEP}]
+	>=app-admin/setools-4.0[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if [[ ${PV} != 9999 ]] ; then
+		# If needed for live ebuilds please use /etc/portage/patches
+		eapply "${FILESDIR}/0030-default-path-for-tests-also-needed-bug-467264.patch"
+	fi
+
+	eapply_user
+
+	python_copy_sources
+}
+
+src_compile() {
+	:
+}
+
+src_test() {
+	if has_version sec-policy/selinux-base-policy; then
+		invoke_sepolgen_test() {
+			emake test
+		}
+		python_foreach_impl invoke_sepolgen_test
+	else
+		ewarn "Sepolgen requires sec-policy/selinux-base-policy to run tests."
+	fi
+}
+
+src_install() {
+	installation() {
+		emake DESTDIR="${D}" PYTHONLIBDIR="$(python_get_sitedir)" install
+		python_optimize
+	}
+	python_foreach_impl installation
+
+	# Create sepolgen.conf with different devel location definition
+	if [[ -f /etc/selinux/config ]];
+	then
+		local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
+		mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
+		echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+	else
+		local selinuxtype="${POLICY_TYPES%% *}";
+		if [[ -n "${selinuxtype}" ]];
+		then
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+		else
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf;
+		fi
+	fi
+}
diff --git a/dev-python/sepolgen/sepolgen-9999.ebuild b/dev-python/sepolgen/sepolgen-9999.ebuild
new file mode 100644
index 000000000000..7b8b32409cef
--- /dev/null
+++ b/dev-python/sepolgen/sepolgen-9999.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit python-r1
+
+MY_P="${P//_/-}"
+MY_RELEASEDATE="20170630"
+
+DESCRIPTION="SELinux policy generation library"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN}"
+else
+	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	>=sys-libs/libselinux-2.4[python,${PYTHON_USEDEP}]
+	>=app-admin/setools-4.0[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if [[ ${PV} != 9999 ]] ; then
+		# If needed for live ebuilds please use /etc/portage/patches
+		eapply "${FILESDIR}/0030-default-path-for-tests-also-needed-bug-467264.patch"
+	fi
+
+	eapply_user
+
+	python_copy_sources
+}
+
+src_compile() {
+	:
+}
+
+src_test() {
+	if has_version sec-policy/selinux-base-policy; then
+		invoke_sepolgen_test() {
+			emake test
+		}
+		python_foreach_impl invoke_sepolgen_test
+	else
+		ewarn "Sepolgen requires sec-policy/selinux-base-policy to run tests."
+	fi
+}
+
+src_install() {
+	installation() {
+		emake DESTDIR="${D}" PYTHONLIBDIR="$(python_get_sitedir)" install
+		python_optimize
+	}
+	python_foreach_impl installation
+
+	# Create sepolgen.conf with different devel location definition
+	if [[ -f /etc/selinux/config ]];
+	then
+		local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
+		mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
+		echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+	else
+		local selinuxtype="${POLICY_TYPES%% *}";
+		if [[ -n "${selinuxtype}" ]];
+		then
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+		else
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf;
+		fi
+	fi
+}
diff --git a/dev-python/serpent/Manifest b/dev-python/serpent/Manifest
new file mode 100644
index 000000000000..2292c117c3e9
--- /dev/null
+++ b/dev-python/serpent/Manifest
@@ -0,0 +1,9 @@
+DIST serpent-1.12.tar.gz 11003 SHA256 1221fc402ab7aa3c3bac85a27e30df2c08658c7bf7a20e8d0025a10edc1788c0 SHA512 af4be554f6bd6f4f4437cdf28c3a34719969896ccf7ad40a42b94dfd666724fde239db17de96003eba78bc51f432c551d80b19dc5064f4d7f8ad9fe060dd2039 WHIRLPOOL 0b29ca2c7008e247914439a95892953b7a25535f66c033436727b9c81ca70f9a17ec23c172a0a28e911d5b3720ea2d46ada130df69d74dfac9bc11278bde374e
+DIST serpent-1.19.tar.gz 12055 SHA256 946b2c837f889971df3575af9dadd8f09bfe48549ebc1b9f6434263b653707ce SHA512 9adac06bb63dfa73ca0043a3ddf868e0afebc81ff7d637e41667314cbe8e0ecb2af807db6c60f5a5a6a6ff8fa11ac42063d83a7376c7e8bcac22abfd3ba5b1dd WHIRLPOOL 61e064006ea9f4f09dd4bced3b494cad8ca243cd7bed76ba25308809e962c8072cfff3b6371fd727fb6ddd5473a52775b41f85dd02e70d7d3b1ca8d824e2cb0e
+DIST serpent-1.7.tar.gz 8799 SHA256 5345587dff787431df668c19de56b74ada02fb893c2d9687572ffecc63d4d33a SHA512 2e885fb06404915506665b2ba6c7fa6dd7a74e31f814fe88f21c847eade5c307f932d45371252d7b690bf95677031a5b5128d9cc5974733dba127e0eab222fa3 WHIRLPOOL 4c3a10fd2519be1ee2d60ae204d949b899e8d77627084ad3ea2eb5b23002a6529cf490ff0503cd5479261ea2fe617b3056518bb6fe838ebc84c008225b9ff10f
+EBUILD serpent-1.12.ebuild 551 SHA256 097ef2680f3c17af20967f7cbe8c027652c4772bb47afa0d5a736ff6d764e021 SHA512 87d7c6415cf79d7bd550260cd67a19569d69788fd7c35228f88e6585d6ed4cc066f51548d76043a4a6190fa2dda7f928a992fbb9ff9f8ae901b56af76099bb8c WHIRLPOOL 39acad9b3f4938b9c68905f33df9451f0b994c0948954a9e89a02fc0f69733f94969bab1c6c16e40c3d74dffa7cb03c1ada65edbbe5afcfaf4f7ec07bbe2a278
+EBUILD serpent-1.19.ebuild 616 SHA256 107880e884012c058ef416d8fc49bd3f96a931abc418715c12fa595647f7f5db SHA512 bf8891ce95390c5a42713c774f4ac8a8324f7c49efbdb1e1bf935ef717dc59785f254e9672f05fc8a18f3c35979a138691bae2cb608244a73849dc9288c24cf5 WHIRLPOOL 1573f1914938aeb669456ef6b160e5defbb110f445979c76e0290d3244470eb7adea77e846cee6d2973e88b2ebc1373cb40ed43e1a9c386d422206df89b2bccf
+EBUILD serpent-1.7.ebuild 444 SHA256 f340fbec8c51a10ebf8b59b449e8ce7b5d78d6b52fb775796f5194c278fe66b8 SHA512 70ee391f6b8ddda30bd93a43302121ae589a8892b0358b36782214a7498afcc0039e0f35b35c4e21f2c351d12aa46ed1ed35089bd760e294dc1bdc3acae4dacd WHIRLPOOL bfe2e8891b63da0378d1d93ea0f0758d091e506cef76ce00954cd2e9f73b0619e5acab1d115ef262d434c79a8935ee9037bd4a746beba8b402a8ded8884c72aa
+MISC ChangeLog 4473 SHA256 1df5434dcbcd3f332a21864cd19470b94fb255412de804d7d12be4e8c1f1e6d9 SHA512 f2ec5845368507a0ada00b989ab8a9728170326b013fb145b08ddf6273aab8b087a675aa7d156b7b5175cf134991925915eeda755a8f6639d369fe0dbc521664 WHIRLPOOL a6add30c2ca21ba080b98c85d4e0d8956c5afb233bd1d547dc6dd1b1d8360c109849d9294c6678cce662edce883ccc0e5adb1f2f51c00ce1e43f125737c9c16d
+MISC ChangeLog-2015 2856 SHA256 76e4206df97af881da7d3535d43edfc943e6bae92f39f40286ae1de1475ff25e SHA512 810a98ac98630234bfff74047c9c70d90bca5ef68cb278fa998ca6d0f4ca2b952f5dc1d26d6d583282fcbf47924773ee6ad8c4defb53dc9c51c6f46d5b6bb810 WHIRLPOOL 648fe1e5152be3c0cf34aa7ac84e2a8be8c3ffda4b6aee34a1bc9fd885597640146709af9a28ba63562410b63e0e3cde517889be9a232be2698e2d5b9aee9eb7
+MISC metadata.xml 363 SHA256 f2a6d49549e074b1bac694f0b753c8630a74bb55a3888a1d56c0cac7c3566f57 SHA512 c0ecbe2e072730e43679dd09334c4fa300c1660a740cdb7071d6d87f112c25493b169f0ca7c5a99fe4a978a8d81f87a409519170cbb69430994f16a8bb193500 WHIRLPOOL 92383715fe8e98c77f4a508a04861bfecd396ee15ab892a4e14b234fccdece291c445de417dd82797fde89e29963f64bdfb89d739418f32fb6d4979e433a3f4a
diff --git a/dev-python/serpent/metadata.xml b/dev-python/serpent/metadata.xml
new file mode 100644
index 000000000000..c33560679134
--- /dev/null
+++ b/dev-python/serpent/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">serpent</remote-id>
+		<remote-id type="github">irmen/Serpent</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/serpent/serpent-1.12.ebuild b/dev-python/serpent/serpent-1.12.ebuild
new file mode 100644
index 000000000000..376bc3b0ff24
--- /dev/null
+++ b/dev-python/serpent/serpent-1.12.ebuild
@@ -0,0 +1,24 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple serialization library based on ast.literal_eval"
+HOMEPAGE="https://pypi.python.org/pypi/serpent https://github.com/irmen/Serpent"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86"
+IUSE=""
+
+# not bundled
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} -bb test_serpent.py || die
+}
diff --git a/dev-python/serpent/serpent-1.19.ebuild b/dev-python/serpent/serpent-1.19.ebuild
new file mode 100644
index 000000000000..27e5ec56cd3d
--- /dev/null
+++ b/dev-python/serpent/serpent-1.19.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple serialization library based on ast.literal_eval"
+HOMEPAGE="https://pypi.python.org/pypi/serpent https://github.com/irmen/Serpent"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+# not bundled
+RESTRICT="test"
+
+python_test() {
+	pushd "${S}"/tests >/dev/null || die
+	${PYTHON} -bb test_serpent.py || die
+	popd >/dev/null || die
+}
diff --git a/dev-python/serpent/serpent-1.7.ebuild b/dev-python/serpent/serpent-1.7.ebuild
new file mode 100644
index 000000000000..847d9cada099
--- /dev/null
+++ b/dev-python/serpent/serpent-1.7.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple serialization library based on ast.literal_eval"
+HOMEPAGE="https://pypi.python.org/pypi/serpent https://github.com/irmen/Serpent"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
new file mode 100644
index 000000000000..6480219eecf4
--- /dev/null
+++ b/dev-python/service_identity/Manifest
@@ -0,0 +1,9 @@
+DIST service_identity-14.0.0.tar.gz 26033 SHA256 3105a319a7c558490666694f599be0c377ad54824eefb404cde4ce49e74a4f5a SHA512 d504ad388defb38a86ca82c8ff9582dbb664a929e4b4ee7f6732b2da5326c33b1764384a8d849972f83ae7800c775daf90c1f3fbc61b8d2c29294f44c7cd36d2 WHIRLPOOL bc6f3cba3e3bec83c527df60dc3cd4387d74baab5a88b5c2cb731661804139c78c86074902060b64e402364ac641b4b2617c98448d4a9e6b367dc0f9d6cd5dac
+DIST service_identity-16.0.0.tar.gz 30270 SHA256 0630e222f59f91f3db498be46b1d879ff220955d7bbad719a5cb9ad14e3c3036 SHA512 0ffa28b3dece2415a058ec159e4f85f3e86c0de520ed5d6933ec49edca91ccc79a57893ace40d5441455791433828ab55a939e90335dfdee8582627e33a896ae WHIRLPOOL 598c046bf0e7428d5d3c34e8315bc67a857377af105bddc7d07fde01eaaffb4be62026fdffab6c81eaaff897290ab735c5f3ad3f7f9c4a1bd9f932a39cef9aaf
+DIST service_identity-17.0.0.tar.gz 23502 SHA256 4001fbb3da19e0df22c47a06d29681a398473af4aa9d745eca525b3b2c2302ab SHA512 4ba35166b520bbeb391c047b5fcca1dbf137a65e0624c92a6b6c2229f9521627be95195a8e502cbcc5a887d904598b1f0e63b47f6a38ee9f78afe13278d692ec WHIRLPOOL efe2d369ff50834e3d63ca11c67cc6a654fd6b9d1e4dde403cf1ed7f0e05e530d34beba383eaf888ea3977ddbdeacec9d26ad1f00374333023eaaabede5910dd
+EBUILD service_identity-14.0.0.ebuild 1164 SHA256 8045ec366c74c8f73c28232b817a5849475b1a8f7e496cf7f05a19c65c329a9e SHA512 9735ba2957261e86dee390d68a85c5c6d37eecdf156de79917120c52640d0ed2776ee2c1ac92bd92cda3d69ea84b2d2e6740b497c7064f201e47e923aab32874 WHIRLPOOL 683a37a3eb303a77bb8f82dc19a02b0716bd7b7dfb15644ba87714daf81250d97ab1a907b61653e8204f1bb79e4285aa3e02ce800934c68977ebb4cf47a085a8
+EBUILD service_identity-16.0.0.ebuild 1158 SHA256 bd494764e9fb0f88a3ba4d4ecd13e0eed13939494e75ddc383f046ff34c8656c SHA512 708d549648792a06790a78acabc476b68beb049a6502349ec03d022a0993b2ad59a543351d896691f1fbfdbfc32606a232c9561c1348a0965cba87897995a173 WHIRLPOOL 50a0710277c57b935e7178fecfd005517d7ee0de10c34bc51f37f11dcce20a3762ecb97412b9056612734efe7cc9d2e839692d8e4c2ff10201c25d71f80ecdbc
+EBUILD service_identity-17.0.0.ebuild 1221 SHA256 326f06335a9711bbb2b6baff0f7aa4fb6cda031cfc77e2160d30b4157b155a50 SHA512 4fb33e20dd590d3f170a8ffe7ec6ae12e2ecc5da5dc0a6c641d7cbc2d5e60807df28fdef661e70b3baa8f3f09fab337b195420aa0e7f5d9f5246a91e688b795d WHIRLPOOL 81bbaec40a0f602e61454e574783350ec00838fc9087a42e39659a49a25dcf3cb0de0d56ab0c0b52660b9a46e5e213afd117d3dc167a83d125ad647c3a03ee88
+MISC ChangeLog 3308 SHA256 cf151955db26b341aad57c50f94aade4bc79a1757415d089e9ea3f2acfd47b5a SHA512 124a1a7aa099b3f87785b03c8b9910ca31e82e4f48af0d2a8cee3c79f7a56ac6172d9cac06fdc2ffc94e8ec5103ac5d64f147c83b507fb4b531814343cfb116a WHIRLPOOL cd652ff8f10a452961729467eb4f6b1addfc460d89df174dbdcfa9846032f9a6858af461597c95010a2285eb221352a9a82b60fce54327142a791acc78a87674
+MISC ChangeLog-2015 1541 SHA256 f2e5605900771175c3684c53baffd65ca8710c03b2b5973725074b1b547b0864 SHA512 4aea2ce479daf25b9d24e8c8ec922c2812b5e4ff364f34630602ca3a2b4b23c42cd567be4d60eac319cb39da065995ef0e985760a2e3907796ee6a7361faedbe WHIRLPOOL 0aa8545bea32483ab3a8014fa2b54553705b99b1aecba7a46fa3f3eadc82d5edddb6d2b089520ad23f468714747a10481150908a84a8ed6aec33a4a9b5a4411c
+MISC metadata.xml 392 SHA256 eda485555df3ed9197d0c70b463dfe46beb2138dd4666299595157deafcaf97d SHA512 2140a0ffee3fee440a0ed3846b557ed7be08e4bf37be391ab3c3b7e6823e1f3a44dd30f143927e4fb75b50b029413dce3a69ff1cbaf640f6e5563fc65d9cb5e8 WHIRLPOOL 1c60f21c315228d80e903acea82bb90274880becef4c6c79d785764601fde66339b5ac42d1ce51bd6e4f9f3e4ee0e0606fb2d2e3aed30af23c3dbf1c01133c2e
diff --git a/dev-python/service_identity/metadata.xml b/dev-python/service_identity/metadata.xml
new file mode 100644
index 000000000000..108fa4e34557
--- /dev/null
+++ b/dev-python/service_identity/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">service_identity</remote-id>
+    <remote-id type="github">pyca/service_identity</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/service_identity/service_identity-14.0.0.ebuild b/dev-python/service_identity/service_identity-14.0.0.ebuild
new file mode 100644
index 000000000000..8f4e0eb22b35
--- /dev/null
+++ b/dev-python/service_identity/service_identity-14.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Service identity verification for pyOpenSSL"
+HOMEPAGE="https://github.com/pyca/service_identity"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE=" MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.12[${PYTHON_USEDEP}]
+	>=dev-python/characteristic-14.0.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent un-needed download during 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() {
+	py.test -v -v -x || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/service_identity/service_identity-16.0.0.ebuild b/dev-python/service_identity/service_identity-16.0.0.ebuild
new file mode 100644
index 000000000000..ba4de3b0af1b
--- /dev/null
+++ b/dev-python/service_identity/service_identity-16.0.0.ebuild
@@ -0,0 +1,45 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Service identity verification for pyOpenSSL"
+HOMEPAGE="https://github.com/pyca/service_identity"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE=" MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent un-needed download during 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() {
+	py.test -v -v -x || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/service_identity/service_identity-17.0.0.ebuild b/dev-python/service_identity/service_identity-17.0.0.ebuild
new file mode 100644
index 000000000000..6d89f19dd8aa
--- /dev/null
+++ b/dev-python/service_identity/service_identity-17.0.0.ebuild
@@ -0,0 +1,48 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Service identity verification for pyOpenSSL"
+HOMEPAGE="https://github.com/pyca/service_identity"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE=" MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# tests not included in this release
+RESTRICT="test"
+
+python_prepare_all() {
+	# Prevent un-needed download during 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() {
+	py.test -v -v -x || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
new file mode 100644
index 000000000000..fcac986bcf71
--- /dev/null
+++ b/dev-python/setproctitle/Manifest
@@ -0,0 +1,7 @@
+DIST setproctitle-1.1.10.tar.gz 24042 SHA256 6283b7a58477dd8478fbb9e76defb37968ee4ba47b05ec1c053cb39638bd7398 SHA512 c976c5b86f59bc6d0f840f495b8256813169d3d7b9edae70207a24d62e1240bfec954fdc4f67b429ae124e3dc74efd7193404785643a52b2d57b55028bb3c533 WHIRLPOOL 5f0f4d890fb0ea1031d3a46aa8e3d572de0ba27bedd4327138afc379f2f36a4a51517a85627663dfab26b223757ec929c5140f0208f941f3e665e00195bc805c
+DIST setproctitle-1.1.8.tar.gz 23208 SHA256 b564cf6488217c7a4632a9fe646fc3a3bea2f9712b4e667e9632b870d1a58211 SHA512 9d0ab8e65afd7e1ac019ea47995498dae1f82d8aebb333dfc4c953e745441cb9a8db942ad8417522d1f9a805bc50ad680f3a37cb4cbbd4214d261d4fed600b20 WHIRLPOOL 4014739eab6ba3d91a15e2c11d9e91ee6a0254a23be1c2f8a7963bc327559a5a7c6197398d6053743a9479562e76873fe47f11a6c810f2c21d3e462440183166
+EBUILD setproctitle-1.1.10.ebuild 1248 SHA256 b318157a7e047ab73521ef88ed0dd2bc092eb83bbb4d3f19a850e1b96ce9da3a SHA512 81b19bf3d55aceee49085dc08a3cd1b47a236fed4f48d9e2fa332418247f2c0a3f6f7f58c87b93a534b1d0ccc8f933f5ed599a887e1c3cf058a55e67ac388af5 WHIRLPOOL c83423ef61a84cc2e2d3136564cdebe077b691327bf9cdba83c4d930ba9c58411ebe24956fface4aacbabbc797a721816034557d6c40be0404fadfe09f83cd04
+EBUILD setproctitle-1.1.8.ebuild 1513 SHA256 ee330c9dc6c980af1f0c32438fa428e82927a000898c8350ffd98a6b2fa9281d SHA512 1d50b356d04b76f1b3f500ef5172492204239976cb8a53bcf08d6bfe0d0125c72341a47ff5deaf0b561c083330f3b0e331cedf53bf9e30db5f5b6824d6a5ecca WHIRLPOOL c2bcebdee2fff7f2f29af5b46c10234eaeb97b4d955bda865e03dc2f9f7a8da4c69989f55a3a66c36b81dffe99c9f52a731d411ed7b1fca7f83c94d76f27a7e5
+MISC ChangeLog 4004 SHA256 2d80556dfa25de78bd67c9e2a6c904300746f175554d69ed937259d8a3d87901 SHA512 e67bc61f9b2ed9ab2f2686ff16568f26565229e94d5009ea23fa6430cdf02a689c17fe72193b05faec2542e508ebc23cd37d11ccdfc0682803659872474d5d29 WHIRLPOOL ac5abc327a569701e8c6983b8e3ff11429cbb9153f18361bc58f752fb45441fdd18abb9f73ca78b50b83194c4deaafa0dfdbe2f7fcbca5a67ff9331915e6f478
+MISC ChangeLog-2015 6409 SHA256 47050d8cdab93fbcaa2514c45bd679018e0f8bc716a37dd67b254e27762782af SHA512 81cc0cd71fe03151dce43d9487908f0420661f1faefbc79d1956e368e4582011152a2dac9b6ba8f9d7902ecf3235750791570ee08896a60c3d92fd79940a1374 WHIRLPOOL 28513b3ee6955e08a39a273011a31c22edb9bf5fbb95a5c3e3bbff79182e6c11b3e4646a399414fb7cc2b928294f83781545070811c58a75486a820353dcbc28
+MISC metadata.xml 380 SHA256 0154cc7bb06e220d496233092f08dea7beca4eecb12c0cb5500c68da35fb5ef1 SHA512 eaca32091baa4a9fcd8ffbac6d250c135c0237552a7229aafc3cbb8bdf43450c114f26676964f80f73c2146b0b47934d77bdfdaf8411c069958bd898f69e8004 WHIRLPOOL 54f14cce60f683b44ebe59bf1151dfc97158fc005a77be0580e2a106e9e3f8ab90fcc3714810a5a28cf352cbfeac34fdb68d0843029becbdb3fed2a3811ea31b
diff --git a/dev-python/setproctitle/metadata.xml b/dev-python/setproctitle/metadata.xml
new file mode 100644
index 000000000000..70895dc7b522
--- /dev/null
+++ b/dev-python/setproctitle/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">setproctitle</remote-id>
+		<remote-id type="github">dvarrazzo/py-setproctitle</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/setproctitle/setproctitle-1.1.10.ebuild b/dev-python/setproctitle/setproctitle-1.1.10.ebuild
new file mode 100644
index 000000000000..bcb13c2bef57
--- /dev/null
+++ b/dev-python/setproctitle/setproctitle-1.1.10.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# pypy doesn't get started in test run. Still required by www-servers/gunicorn
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Allow customization of the process title"
+HOMEPAGE="https://github.com/dvarrazzo/py-setproctitle"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+# Required for re-write of test suite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	# Make a nice html file
+	rst2html.py README.rst > README.html
+	# The README.rst will be duplicated in src_install
+	rm README.rst || die
+}
+
+python_test() {
+	# The suite via the Makefile appears to not cater to pypy
+	[[ ${EPYTHON} =~ pypy ]] && return
+
+	# prepare embedded executable
+	emake \
+		CC="$(tc-getCC)" \
+		PYINC="$(python_get_CFLAGS)" \
+		PYLIB="$(python_get_LIBS)" \
+		check
+}
diff --git a/dev-python/setproctitle/setproctitle-1.1.8.ebuild b/dev-python/setproctitle/setproctitle-1.1.8.ebuild
new file mode 100644
index 000000000000..ba32a44b79aa
--- /dev/null
+++ b/dev-python/setproctitle/setproctitle-1.1.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# pypy doesn't get started in test run. Still required by www-servers/gunicorn
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Allow customization of the process title"
+HOMEPAGE="https://github.com/dvarrazzo/py-setproctitle"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+DOCS=( HISTORY.rst README.rst )
+
+python_prepare_all() {
+	sed -i -e "/pyrun/s:%s'.*):'):" tests/*.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cp -r -l tests "${BUILD_DIR}"/ || die
+
+	if [[ ${EPYTHON} == python3.* ]]; then
+		# Notes:
+		#   -W is not supported by python3.1
+		#   -n causes Python to write into hardlinked files
+		2to3 --no-diffs -w "${BUILD_DIR}"/tests/*.py || die
+	fi
+
+	cd "${BUILD_DIR}" || die
+
+	if [[ ${EPYTHON} =~ pypy ]]; then
+		# The suite via the Makefile appears to not cater to pypy
+		return
+	else
+		CPPFLAGS="${CPPFLAGS} $(python_get_CFLAGS)"
+		LDLIBS="$(python_get_LIBS)"
+	fi
+
+	# prepare embedded executable
+	emake tests/pyrun CC="$(tc-getCC)" \
+		CPPFLAGS="${CPPFLAGS}" \
+		LDLIBS="${LDLIBS}"
+
+	nosetests --verbose || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/setuptools-git/Manifest b/dev-python/setuptools-git/Manifest
new file mode 100644
index 000000000000..da32bcadce19
--- /dev/null
+++ b/dev-python/setuptools-git/Manifest
@@ -0,0 +1,7 @@
+DIST setuptools-git-1.1.tar.gz 9450 SHA256 047d7595546635edebef226bc566579d422ccc48a8a91c7d32d8bd174f68f831 SHA512 39e19c107f6398aaa1b78961c3b0d9d7b57b181d8ce0d93780460867fb7535ce45d266b93af43f45aa7afb89299199df22b0fdea61e9090932aeb4bd69c5f1f0 WHIRLPOOL 76a1ff0944c233655c6966fb8e0787d89b8ceb40a09fedb729d67d15905dd82dead4ed88a682db1b4a9ff664f354963b110339f4d96706e19451058dbe870483
+DIST setuptools-git-1.2.tar.gz 10546 SHA256 ff64136da01aabba76ae88b050e7197918d8b2139ccbf6144e14d472b9c40445 SHA512 c070911618b6b92c862fb0bd40f1daeaf79e2ba10389fa1e69e4c50cfdd39c8e57a612082cbc7d932f8cea12a769e13451e35e1c8fe34f170d4817fd0d44f156 WHIRLPOOL 7015b734c7d5acf3623ddb04351ff268608eb1ac3da051e80fec94cff920c2cb43240055dbb9a71118d9b2da91c97e43025e0fbe3b1bf36507e83d90dc891aec
+EBUILD setuptools-git-1.1-r1.ebuild 631 SHA256 6db4f0f335e3ba13e6d843f454201adc9ebe2b64b71efdd3b98dd5521e8413cb SHA512 00a140936e3adf214b3ddb0d67eb6bc84588d7b245711c43cb1ca47c9db05aa19e605e98b9e4317300e899f00c211e21e0841a5199bcd8d5bfb0a5d715fb0eb0 WHIRLPOOL 41186e4a639d660d7586cff62009b7d34952ed7ba7aed18758368b6d705899d9f6380cfe4ba321bb60143cc0a8143f6bee9c03180370e9022465be32d070df94
+EBUILD setuptools-git-1.2.ebuild 660 SHA256 4a8d3858c7258f7d680b1f48e70bfedc557bd90abbb320825d318e2e14b9c676 SHA512 d1eef71ea15b535ba724c01b9a74ab2076404bc62f4090e11eb11030a78a9b6686322f8fd8058b1848ed210a511a654f42c618bb38eec85b9149c1ebf8d1fbe3 WHIRLPOOL 166153cf9b3af1f50ceaca395eed1c195854092c89aa53977a10eae902e4850e6c4e5de6b2813815e05992eec243bcdb8e19931cd16a1c40aeeb41bf02d8851e
+MISC ChangeLog 2773 SHA256 e647e96d7718f1f421acb3291c9b3685add961070435bce8789c25696b6658f8 SHA512 5e9bee2d0f355a814ca9498c83599755e651fd3a49ab6a07023b3fd81cd8266b752f1bd984319251046aace5d129154be505609955da640a788f598ec61841bf WHIRLPOOL 92f6825a8e912ca8d14980a2b1a3606548cfe35c4d723da237129818ecdb90232fedea148279c5cf20203c6eb628705eb5ad90db480b87972a6e57b4fa22b366
+MISC ChangeLog-2015 1856 SHA256 a64e43c12e8b1a15e3326bc8910a9bc8950dff5daa49581f5c85d242d6937efe SHA512 9485904a9d5e4b1329ed6f577b5ceec2a048a2c5d6397f7ba05027c6442ef8086bbb78977cc445c286f0eebb609506494a0627f820950c9fa0a36cd17738eb86 WHIRLPOOL f65ac930e0979bfb97b2b6a118a33c00f03dad542fcf1437279a4aed1f55a949f5f022474b1da93bc4dbb16e146c4c975fe93f2f8bd99165990e589f6255087d
+MISC metadata.xml 617 SHA256 347726d263b65720dc0dba3be1296d71d019ceee33b40a4c15e21bf7629ee1ed SHA512 057677807a316be80d26eb8aa9b07a87a60251a6185c85ac1042db7040849ef4e9554be1d9ac15d1b8ff212df2f39446f3c56208fe83d12581fb0ba283d1ebff WHIRLPOOL 517aa10fd891f2d965352be1f75ef636a69d469ee7fbdafea29c060a22e72dff2bf735a13f7f3ea4e30e6169d5caf5332fedaf77e668c11402eb32383b8521bf
diff --git a/dev-python/setuptools-git/metadata.xml b/dev-python/setuptools-git/metadata.xml
new file mode 100644
index 000000000000..bf673f4a5b46
--- /dev/null
+++ b/dev-python/setuptools-git/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Setuptools revision control system plugin for Git
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">setuptools-git</remote-id>
+    <remote-id type="github">wichert/setuptools-git</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/setuptools-git/setuptools-git-1.1-r1.ebuild b/dev-python/setuptools-git/setuptools-git-1.1-r1.ebuild
new file mode 100644
index 000000000000..3e771a4a1b29
--- /dev/null
+++ b/dev-python/setuptools-git/setuptools-git-1.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Setuptools revision control system plugin for Git"
+HOMEPAGE="https://github.com/wichert/setuptools-git"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		 dev-vcs/git"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	git config --global user.name "test user" || die
+	git config --global user.email "test@email.com" || die
+	esetup.py test
+	retr=$?
+}
diff --git a/dev-python/setuptools-git/setuptools-git-1.2.ebuild b/dev-python/setuptools-git/setuptools-git-1.2.ebuild
new file mode 100644
index 000000000000..62308224c09d
--- /dev/null
+++ b/dev-python/setuptools-git/setuptools-git-1.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Setuptools revision control system plugin for Git"
+HOMEPAGE="https://github.com/wichert/setuptools-git"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		 dev-vcs/git"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	git config --global user.name "test user" || die
+	git config --global user.email "test@email.com" || die
+	esetup.py test
+	retr=$?
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
new file mode 100644
index 000000000000..f21954c80c29
--- /dev/null
+++ b/dev-python/setuptools/Manifest
@@ -0,0 +1,16 @@
+DIST setuptools-30.4.0.tar.gz 655934 SHA256 2bea341aa5b48ae05521374d9c473713e42dde7f8712a731904a6f8257e896ed SHA512 8239262e11c7702165d7539d57982dadd16e61a992529cb4d5f42141d57ffbab46fd928c765d0439ec4f07db1bc252b9a4604901d8f9951e55076438bdd6f515 WHIRLPOOL 4866efbe00d23291ad07b401d7924f2f150a38664ab0a3d9afe9e00aa4e887de6c9e82f81e7d2ec157b1bf05406b2616a08772fa9f3a45e1e20fddbe27c11fd2
+DIST setuptools-34.0.2.zip 617839 SHA256 a5bdc45a3c123a88c84e089a789ba70bbc61ee888c1306fd9dac04e037e81c37 SHA512 8ff6475620fc18e5992900dffd50158bfea980d3e7f2c7c98e8c99180b2f11b3f81c13a60f93516da580def2543a786940cc164dcdc36802d9657c48e45d9266 WHIRLPOOL c9350f96628957c0bab680a2cd018d27d93f04afded737b317b9ea527e0bad3ea9c4f4af2a31843a3010573cdb0ec1c7fbdeef371cfc8cb5c8de93b6d762bf1d
+DIST setuptools-35.0.1.zip 624263 SHA256 eea7f2ff55d4a810b6bc39be1ad1c60c2702341b78b2365c71306eaa7316beac SHA512 a3f5362ad64dead468172f9989bc62043ce736180d22e50d9815af25aecbceb58e701bb87a643b9fbbf0beedb37a45268b23b1b5e7e6e397aa124f43b1d4bb0d WHIRLPOOL e33041a6f03dc4ceb4a34db4c18a4d76a908b4e5a726ad18598cc202aca24df0a81241aa72812b7a31b1e452dd265e813c58ea23255e37a75c2c2ec2f73d8787
+DIST setuptools-35.0.2.zip 624829 SHA256 1e55496ca8058db68ae12ac29a985d1ee2c2483a5901f7692fb68fa2f9a250fd SHA512 f80789cef8fe86ff1989e7f769637d1f6cb2008c6190609b8f8c5b4fdb63fac83267709895c7f502a09a693779b41e6ee0551e94f3348b64b6108dbc9629a116 WHIRLPOOL 23b22065ced0a7df25ff35b79675b94e6146ec9ca7eff7c27a94d5aea64e4e9356e136fb537f642810a824eb3e0921d817b5739fe9cd3daf083cad99475354e9
+DIST setuptools-36.0.1.zip 711296 SHA256 e17c4687fddd6d70a6604ac0ad25e33324cec71b5137267dd5c45e103c4b288a SHA512 cbcd2591d0d8a7591c5d9a1d4173814afa0b984af29f2e34d26a37c357474b043f371978ac224cea12f50834d91babd9f14b137488c4edcd62594e91aff903d8 WHIRLPOOL 9818d419a11ab6493027fcf27a48b087c80a10fe2bf3b0539893bd57b33be23ed5b90572682f0a27850044482f03d299905e04cc890f724d3cf719d34bf36464
+DIST setuptools-36.5.0.zip 721505 SHA256 ce2007c1cea3359870b80657d634253a0765b0c7dc5a988d77ba803fc86f2c64 SHA512 e61c2f9ee640bf5dd8ab7c7a7c29667d91aa2498a7b027e387493ad7bcc9b56927e6fa63cdb4e083333c57eb355a670ba3df861ed5f8447b216fef0bc77c8b43 WHIRLPOOL a18b45eb750bc92579d0179d0d5797d4cf949c20ab4e6cbf0b4ae154d351285983505829a1f0f0ee71b5b4aa3793bd3306ab3a9c44ea42b8306cb80cf3d273ec
+EBUILD setuptools-30.4.0.ebuild 2058 SHA256 aff2e283d8acd9268d97a81fd7c22106760294a2652f4e03e7a4b0effb9bd727 SHA512 c14b6452d4e7084e3b645981b7b615d223b97e3fd50d75341e27274154d0f2e9362ca6605cc20a4a83dceac26dc65d018400606a43455aa292778911ac9f6cbc WHIRLPOOL cccce3eb867fad9608dfe120dcdd8d022a941fe2dc0747892fc54dd6a3da9abc936f1254d4874d13b44fac7a62e2216a586d97d1ff291db073cf4eec5b3a72af
+EBUILD setuptools-34.0.2-r1.ebuild 2041 SHA256 71c95e890e3b1e9159538ac9e74e619a89f8f87a2d0c28b8e77a586611fdd770 SHA512 8a9db9943611582d5276ed7f009cba5ae5c839b49d21e95ece52d94da6508a70811117e3aa1774f195f976428667d5b3872cc2192f78294456eb83fc50addba2 WHIRLPOOL 68aecc5618c6558a5bcaad96baa99fd3fb582679bf224945831c1c2dff68b65a61d3821e46e8c8ead7b86787381ae277120e5997b18c96730bfecbbbdbb63c2d
+EBUILD setuptools-35.0.1.ebuild 2035 SHA256 0168ab06838a36702973806762e30cbc72a2a4bd55662898f0cf7af8f9175cc5 SHA512 bf2b6cc66a48202471b0c904075376993d26edb0fe4cfeaa56c44d4610019f359404810d4bceff35fb7cc3f5e7dbeb469f69dfa911ffa223cfad51c8e6d18eb4 WHIRLPOOL cfb66cd81c642f03546f01395b2ad1e67a5797c0a97fc701ee2602520ef827aaee7b344bacc79525edac4026120610c5def45768fcc18e388642391e18d10f3d
+EBUILD setuptools-35.0.2.ebuild 2035 SHA256 0168ab06838a36702973806762e30cbc72a2a4bd55662898f0cf7af8f9175cc5 SHA512 bf2b6cc66a48202471b0c904075376993d26edb0fe4cfeaa56c44d4610019f359404810d4bceff35fb7cc3f5e7dbeb469f69dfa911ffa223cfad51c8e6d18eb4 WHIRLPOOL cfb66cd81c642f03546f01395b2ad1e67a5797c0a97fc701ee2602520ef827aaee7b344bacc79525edac4026120610c5def45768fcc18e388642391e18d10f3d
+EBUILD setuptools-36.0.1.ebuild 1902 SHA256 21e17a1e229890cd6bb9e86c9c33bc16fc04fb0e9196341d7d1b1eb1b11bc521 SHA512 b205802dbfe7a2c0962b3399b4cae6fce1437f3922f2f138c5055497e514dd49a52d1513dad9d2323eb2360c4d59f37607f24dfe17176cd1c6f136875198827b WHIRLPOOL c45c02f0e4ee088e6e44fa076abb33ad2317f2344777247eaeb9b33cf3af5105c9b45632644769da62d1ea00cc9865d264ac15b70121b3aea015c6dc9802abb8
+EBUILD setuptools-36.5.0.ebuild 1791 SHA256 bd91c146723054ebfb78d33811b3f998b08ad52c002af6f37205dd0b00e94fba SHA512 3b85d8349146d3f82e0c589934784c96b6f24cf3a1f4ad09eb05cb07ad18ae250dd2daf01816fbbbe2e7c285534a58690e8f5f359baa1c0ea9557acec142fe03 WHIRLPOOL 3b9c38ac6cf7b1ffca735c5c566b96fbcf1171097f244477ceccd22e2d4970017ef00d512c0525ecd1500f056b2b3789788ef096f0fab5e08ccc9add98441617
+EBUILD setuptools-9999.ebuild 1896 SHA256 27917cfbea477fbcc04bab18db0547a18d69cfb9825eaffae785a4bb1a937547 SHA512 4a88df7828f94c34c4131626054fec2d6fb1f1dcf2abe48ae872efb0d020e07fda6c6bfdc126a53e4463d1e7f932f84bf24d992913726dbbe98488d539f9ff64 WHIRLPOOL fd6ab34da65bac9a0bc60bb0dd4fce0ef51920a648dbc87355d44a275e3a2a089be651210a8356330c413289da3323fef2ee3070e594961c761c80d87ca72aad
+MISC ChangeLog 17985 SHA256 b31d25f57897e897354a84f36573decb09bf17e88b4f8ceb1fe0cb8cbef64a3a SHA512 099eb73daea0a5a0035af624f7c59dc7ecdd77523df9de74741cceb01b64514d8b58ce98c13b58729d900f680416e97408a19e46ddca1c9c34f1a845af86ebc8 WHIRLPOOL c5e8a538a838684f6c57ac9eb516b36572c7ca62697ea12b59a9db6c89c7fd555f6af6877aa24761c6ee6fce5b262c4ba31cd9c03b44378532773653164262d6
+MISC ChangeLog-2015 40164 SHA256 688e239d071bc1023126c3f0bb1e62c72a1c217a7290312441ad91829ee51d84 SHA512 d009c942ddc4d8beb2ba9f756a0f00d292c1accd029288727ef23811dba8854b0cdffc4b753883975adaa1572c4cd15e5a1e14d9fb2afb50e852cb14e71b635f WHIRLPOOL dfe2b05139f33b1b94481d040c5b58cd687331b3d96f7d0cb6e49d28574c3b0f4325b22aec97cd5ba138ee7caec989f18c94456cdb0651bb19611328623e11be
+MISC metadata.xml 380 SHA256 569713c1c2db0d1e3d052dcda58cb2c25cec18a554152d646f377affd0c7c09c SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94 WHIRLPOOL 29131f5c4625e3415fa2079dde921e3d8a2849c382e1408edeb35157b4e8c931b6ba43fef383c4fa83cf8279f8eaeaf1a6bbd15dc949e35b1cd9085c61811623
diff --git a/dev-python/setuptools/metadata.xml b/dev-python/setuptools/metadata.xml
new file mode 100644
index 000000000000..3620f425ec5f
--- /dev/null
+++ b/dev-python/setuptools/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">setuptools</remote-id>
+    <remote-id type="github">pypa/setuptools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/setuptools/setuptools-30.4.0.ebuild b/dev-python/setuptools/setuptools-30.4.0.ebuild
new file mode 100644
index 000000000000..5d337ffd3af0
--- /dev/null
+++ b/dev-python/setuptools/setuptools-30.4.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=""
+#	>=dev-python/packaging-16.4[${PYTHON_USEDEP}]
+#	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+#	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+#	>=dev-python/pyparsing-2.0.6[${PYTHON_USEDEP}]
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	if [[ ${PV} == "9999" ]]; then
+		python_setup
+		${EPYTHON} bootstrap.py || die
+	fi
+
+	# rm -r ./pkg_resources/_vendor || die
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools/setuptools-34.0.2-r1.ebuild b/dev-python/setuptools/setuptools-34.0.2-r1.ebuild
new file mode 100644
index 000000000000..1988d6791cbe
--- /dev/null
+++ b/dev-python/setuptools/setuptools-34.0.2-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.4.0-r1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	if [[ ${PV} == "9999" ]]; then
+		python_setup
+		${EPYTHON} bootstrap.py || die
+	fi
+
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools/setuptools-35.0.1.ebuild b/dev-python/setuptools/setuptools-35.0.1.ebuild
new file mode 100644
index 000000000000..9bdebb0a0713
--- /dev/null
+++ b/dev-python/setuptools/setuptools-35.0.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.4.0-r1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	if [[ ${PV} == "9999" ]]; then
+		python_setup
+		${EPYTHON} bootstrap.py || die
+	fi
+
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools/setuptools-35.0.2.ebuild b/dev-python/setuptools/setuptools-35.0.2.ebuild
new file mode 100644
index 000000000000..9bdebb0a0713
--- /dev/null
+++ b/dev-python/setuptools/setuptools-35.0.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.4.0-r1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	if [[ ${PV} == "9999" ]]; then
+		python_setup
+		${EPYTHON} bootstrap.py || die
+	fi
+
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools/setuptools-36.0.1.ebuild b/dev-python/setuptools/setuptools-36.0.1.ebuild
new file mode 100644
index 000000000000..7d871ec24b2e
--- /dev/null
+++ b/dev-python/setuptools/setuptools-36.0.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	if [[ ${PV} == "9999" ]]; then
+		python_setup
+		${EPYTHON} bootstrap.py || die
+	fi
+
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools/setuptools-36.5.0.ebuild b/dev-python/setuptools/setuptools-36.5.0.ebuild
new file mode 100644
index 000000000000..569852df901c
--- /dev/null
+++ b/dev-python/setuptools/setuptools-36.5.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+	KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	if [[ ${PV} == "9999" ]]; then
+		python_setup
+		${EPYTHON} bootstrap.py || die
+	fi
+
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools/setuptools-9999.ebuild b/dev-python/setuptools/setuptools-9999.ebuild
new file mode 100644
index 000000000000..6b01e904a243
--- /dev/null
+++ b/dev-python/setuptools/setuptools-9999.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	if [[ ${PV} == "9999" ]]; then
+		python_setup
+		${EPYTHON} bootstrap.py || die
+	fi
+
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools_hg/Manifest b/dev-python/setuptools_hg/Manifest
new file mode 100644
index 000000000000..7deace83e769
--- /dev/null
+++ b/dev-python/setuptools_hg/Manifest
@@ -0,0 +1,5 @@
+DIST setuptools_hg-0.4.tar.gz 11059 SHA256 a41c3f9e7e503d760068aefd707ad82297a8d734078f478013b50be0dbe28f4e SHA512 95fd8930a8893b8db3f94ca42e51fb0b417818fc96842b0824318a383f4eff2ca54d8e0d51cacfe856abbcfa386aadb0a9cd05017f4b3b26fe8d634d8b5d3908 WHIRLPOOL 92887e231b906b22358806f1e04ae345a58341182745a70acdca8ce9b1831f55ccab129faf4ade6ad56bebfbea45a6b870ebf3e51315f8c08013de6fc479a997
+EBUILD setuptools_hg-0.4-r1.ebuild 573 SHA256 bccdea0c1f21fd415cf2c06b173e64bf9267f575b65fbb2e4cbd1c8625f26fd0 SHA512 8c827308fab48205da5cbca3173efe0dbe0af33e28f1925a2a8eee85982e7a085e44d9ed7943d02ad75485602b9bee5cb37bf3a50873f9b6a410cef3ebc7f27b WHIRLPOOL ae53df2afa3749920f85d5ed8ae851230bbaf84190548b78defdb590c4649bd2ba9ade806da89282e31e92fa0fdbef36ef2ef04bcab739d453ecfb72ba5c6e82
+MISC ChangeLog 2884 SHA256 002fe654e0ca69c9a1b6e988ff0d2ebf1842ae5af3e42e39f2254f9f7ea54841 SHA512 4274f116a73841c6da1dff4ffab6f34e6ed0658663dfab6749597c0c2819335b4e8f34d4a415ad3831c54de5765b6094fe30cf458ba2ddfa54ce0f7eb6aa4019 WHIRLPOOL fbef92ae71e62cef6b6a024cbeab994581a8189a87d789466aca5e93e78f72ed3cd54aa997326f99c71b5fa9a5982a152acf21c0798b62147ae6aafe548a3043
+MISC ChangeLog-2015 1640 SHA256 7d5ad8a54e87ed478e522eb452f71eed8a74e592e0aed175b0ee303aa9863200 SHA512 3c67f56c7fe0d0fe381a0e37b93cc9e081d1d135f4c2450bbef8aa9034b785ea57d6086ab84b4ff6a93aac94f044755866775aaf1cd76ebc8434e8dd819ec072 WHIRLPOOL e945823a560c244c8b91531b219d90141fd500a2d5fdb3a642a32763c55f322a7583b60671e5a2faf12c3f271b0118ba0b13126886f9285d8221f2aa735156a0
+MISC metadata.xml 551 SHA256 2840266fad9caabefa4e7f3091fd7f240e382b671238adfbb381cdae0c2c4303 SHA512 54fbb1b88255f33015c6649b36cd87ae8084d63b0b3b07dc05dbdd53041ed56069533fd4d3de501bf431578e2048ceb3a87b064f847cb4f64a86e6af881b528e WHIRLPOOL e6b2057a7c6e032075bea58052e77c5f2c9850b6502aac927bf6ce1003efeac1a83156aad0d393e59e2960c4ea261f6a92ec73106d9964ac4608c250d163c376
diff --git a/dev-python/setuptools_hg/metadata.xml b/dev-python/setuptools_hg/metadata.xml
new file mode 100644
index 000000000000..4328eaee0175
--- /dev/null
+++ b/dev-python/setuptools_hg/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>setuptools_hg is a plugin for setuptools/distribute to enable it to find files under the Mercurial version control system.</longdescription>
+  <upstream>
+    <remote-id type="pypi">setuptools_hg</remote-id>
+    <remote-id type="bitbucket">jezdez/setuptools_hg</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild b/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild
new file mode 100644
index 000000000000..2107ee18c03f
--- /dev/null
+++ b/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Setuptools/distribute plugin for finding files under Mercurial version control"
+HOMEPAGE="https://pypi.python.org/pypi/setuptools_hg https://bitbucket.org/jezdez/setuptools_hg/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-vcs/mercurial"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
new file mode 100644
index 000000000000..c56f18545ce4
--- /dev/null
+++ b/dev-python/setuptools_scm/Manifest
@@ -0,0 +1,11 @@
+DIST setuptools_scm-1.15.0.tar.gz 23677 SHA256 daf12d05aa2155a46aa357453757ffdc47d87f839e62114f042bceac6a619e2f SHA512 860fd9460f0d1d5ec9369c2936342f9679b8815e1d705999698b7bd82adb41a65048df68e57065e530972ef57e43a251ac41d6587972b1d5af40cd0249bd081d WHIRLPOOL f185851ee05cc8dd538a6b81e2a17a6155aca5c091e9dac5c56937e559551106147e12df8ba1ff97217f1e411cb8d34eadd40220850dd3010e52ad96c5f8a93a
+DIST setuptools_scm-1.15.5.tar.gz 25752 SHA256 145b2a8a609e0fd66108a92a06fe62d0fb329c0eb944f2d5c7ae3ca24222f29e SHA512 4d6f648dbdb90845a8e61c58bde06f3ef65898f9195b4dc97c40662d4cbeaf952f35c29940acfac7315b6ce6201a3af1d2eeab11274a8eaa02c7429c646c369f WHIRLPOOL 4a96a69e92fc256497c1300bcac47615929776e88dafe0eaad670d9337e83aadf38f91fb856f4e518cb811f3cd0c07097820850730f49d828f6c4ac2078e4ebe
+DIST setuptools_scm-1.15.6.tar.gz 25779 SHA256 49ab4685589986a42da85706b3311a2f74f1af567d39fee6cb1e088d7a75fb5f SHA512 ae91ac28d396215be5418df3b36af726b6f2fb89707424383e920072fe8f9f75f613a99fe406cfbfffc61f9a857a3294259191694899351ef78aebba73d08816 WHIRLPOOL dbaf70b0c09ef8b74d3cf114fb1f26032003f88c1081f28f0758ecae24722316e737ca5b404f6db287a85428a9121ff7ab6e13a41343e7ec277de9d85f16e645
+DIST setuptools_scm-1.8.0.tar.bz2 14491 SHA256 ddbf365e60e5f8e3f86fe117edeee4a7e1dd8ce7a9337951c9c163e7c506e602 SHA512 a109fa3ffc89d3f6e515fa58026cebbd8ba98c1a401c49d5008e0dfc693f0e9e9468823621bd7b055911d3c898394e0ed1e498136cecaaa0be25e6312ec059df WHIRLPOOL ed87332ea7c27f1618c5c0c69b95360d48ec3b7d762d928d4cb097310fc0435c1aac15e53155417c0bdc0b9ba6ae6835e28f35735c10d70c6164d91340b09762
+EBUILD setuptools_scm-1.15.0.ebuild 773 SHA256 9cd0563976b40db1c3ca2cc0eef1376e9c8f3b91505f169e7b9c33894a5280cc SHA512 351a80ed2d136152d7291539734a12e13cfeb55f5127227e65033af14c8ee82d57a81a524f461a9eacd3fe7a95e2d4fdaa8ba28be3195ac16e22497bb21e9f6a WHIRLPOOL 08a99e1bbc13153d4c80e4b0fcca9d4e62446228d6f1d705f14220cfe43671cdea2fc6cce50013d46de0a32b861a4ac433671d123fa4f74ff8c4c13c8d083a9f
+EBUILD setuptools_scm-1.15.5.ebuild 782 SHA256 befb486ee329bba775aa174a56c9bf5d4f370639b26a0ab071f1fbcbbdc87895 SHA512 778bc6254f5f5dc6646b9c2e3b16cc59e2e4774dac0a18181a835d944c4798149e20b36f6cb27ff2e1bb71af0e42a1ed989579f454f3939430ca728cf3bebcb9 WHIRLPOOL 457a3a5adc83e74a5b1baf34ca85f8761fb43d6b90f6cdf5f51a2aa5161c217d9b21431b16c35ca9ccd41846962527ff70efc23cb54d87de8e99efe1e18d4226
+EBUILD setuptools_scm-1.15.6.ebuild 795 SHA256 07ee9f967366c958fa9c6ec85e8729e72420bac96db5cd2ca64752e22a81002a SHA512 20397fcfb1fbae455b1f2a6690b42a32a87a75a5f357a8b8485cea59863e26ce9fe1c507b05f48a29f4a1b9221155b37a3be93f5c7966b63ff22d4d8a4a587fa WHIRLPOOL 23bc59ed53bb541eb497fda6c0d688c5bd9057fd1ba7758b0245971391c808dcdcc40140cd03584115e85bc672627ec90571afe1c931effba5ed1e427765d10d
+EBUILD setuptools_scm-1.8.0.ebuild 706 SHA256 aa6a8214862cdad9476e06b89cda995ae14daa5d817ce053269f757a8b17e0c3 SHA512 9657a2001acaec324c544de58d42f79b638e84f79633f5105b02f0f3d94a9a5c8f64624d80b926900402f4d8ec09f19a43a1280d695f8c284afe82614b51cced WHIRLPOOL 0436bd078e30142b3ed00bb5fc2fcd640a5c99f41d43d6de1059dfbc198da689c573a3cc3d106d158ea6fcde971709bb3d3dc5bbf2ad93826b033df303ec239c
+MISC ChangeLog 7422 SHA256 5ddc2d98e8bb794ccb42be4acb6afe127737ecde61f23dc3a00420cde6960028 SHA512 a20983a858e7ec7b3ad5d4680d0bc284c9ff0ec5463a48c4dd859ba753d1040c3661d8c2586f368174e658e723347aa0a27d6c2ebed021f9b0c3e0da74e77d08 WHIRLPOOL 644702206262712ddbf1f15b753bd4ed95d8a587a51f82687ae938aa959a1973b8946d69140187481464d045556981f49c73ec509136f86b1fba20a3d4a97334
+MISC ChangeLog-2015 634 SHA256 c2f8de72646b3221d655e39f4b1b7829c9b542c9fcd0a0f32f80955b04b7595a SHA512 64aa9643baa85f797438d0ae99b4c18f1ece0298f4eb9aeecad5d2fe5fc8cffd01d009a789d9af730c69833e049096853c71139353de891c106c5a72d97faea6 WHIRLPOOL ecc4c81b74c1a9cdd5846c4d3563f4582b5fd2a1ede13776e91bdfffe107385f736d21637fad273713bf2a8d01f15bef86f44c845efbf774583de1c27ef74218
+MISC metadata.xml 438 SHA256 b71a653606775db6117fbb4d5b053c6cf1785309cf8ebd2653ea38bec64ceb6b SHA512 cd0e323a85bb13cfe7ee6b3102e605e800aa93a4d4452c20b85e7f48541f5ebec23140ef7f2e3f282cf3c3e7bc6764c0efbe34eef48ad1fd722d57803d668b01 WHIRLPOOL 11d765f16f43128c388a06beab85be843ce1017bd1f8d670ef02fdb5e9245931e90e0b229e1103cfa454892f44f58e7ed35076c41711cb04ae8ff6d59de99d91
diff --git a/dev-python/setuptools_scm/metadata.xml b/dev-python/setuptools_scm/metadata.xml
new file mode 100644
index 000000000000..3aabcf579918
--- /dev/null
+++ b/dev-python/setuptools_scm/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">setuptools_scm</remote-id>
+		<remote-id type="bitbucket">pypa/setuptools_scm</remote-id>
+		<remote-id type="github">pypa/setuptools_scm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.0.ebuild
new file mode 100644
index 000000000000..5b5c07439dda
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-1.15.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="package to manage versions by scm tags via setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-vcs/git
+		dev-vcs/mercurial
+	)"
+
+python_test() {
+	distutils_install_for_testing
+	py.test -v -v -x || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.5.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.5.ebuild
new file mode 100644
index 000000000000..92fbe871c13f
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-1.15.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="package to manage versions by scm tags via setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-vcs/git
+		dev-vcs/mercurial
+	)"
+
+python_test() {
+	distutils_install_for_testing
+	py.test -v -v -x || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.6.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.6.ebuild
new file mode 100644
index 000000000000..4a9883705d0b
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-1.15.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="package to manage versions by scm tags via setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-vcs/git
+		dev-vcs/mercurial
+	)"
+
+python_test() {
+	distutils_install_for_testing
+	py.test -v -v -x || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild
new file mode 100644
index 000000000000..9362c8c2c46f
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="package to manage versions by scm tags via setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v -v -x || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/setuptools_trial/Manifest b/dev-python/setuptools_trial/Manifest
new file mode 100644
index 000000000000..3a90bc91ff5f
--- /dev/null
+++ b/dev-python/setuptools_trial/Manifest
@@ -0,0 +1,3 @@
+DIST setuptools_trial-0.6.0.tar.gz 6227 SHA256 14220f8f761c48ba1e2526f087195077cf54fad7098b382ce220422f0ff59b12 SHA512 9104b98627f57ed53c90d22042346875c5324d7b30e1ec9ba1718b5c59a786915a8fe0a53789a5dbd9318a12b27122661234f5be403365261db6a8728ce39827 WHIRLPOOL b75ae1cadce7353695fa791edab530bc9a4af0acedb783044cc6405736d8fdb309b77d3a703865e22c4c1c8ae786b7ae5e0342a42fd592aa70fe005bafc79d7e
+EBUILD setuptools_trial-0.6.0.ebuild 678 SHA256 11c0f43591839f26100d3f7067afd8ee5b4b54d1cf4f6ca58cca33144d2bf0f0 SHA512 9049c0677e31d400492ecab3861d9c25bf1315e628841fd8949ac02d3617f0d6fc10ce14ba8be249735e58321cd3832a9cb8d54558b0b0c850b722fe16715674 WHIRLPOOL 9635684d49167706a0bbbf10fd8b99e3abaf9768ceb3725ae263f6487fa260ebbab67765dd24785f649ab6f3d7f6234331ca805b8b7ae27d07f5ae3bb5274030
+MISC metadata.xml 864 SHA256 caf8b4726107810125d778826d6476753826fe3146019caadbfb91f30be2528b SHA512 778bf7a09bd81f5480da6cfda01507ea409395e9cbfd8ecdc1d1cf2d49813752ebadfcc0bb1f51b52e6b42031cf50f127c504207a51101a9d188843885a6867a WHIRLPOOL e7a293141e09a20438923e68035b9cdb3f2bc7d890472bcb226486f85f16cdf79e4fc0e6ac2ce3be78b84135cf6ee21e81bef9c1f628382401448a0b50deed63
diff --git a/dev-python/setuptools_trial/metadata.xml b/dev-python/setuptools_trial/metadata.xml
new file mode 100644
index 000000000000..9a5eb73ce3b9
--- /dev/null
+++ b/dev-python/setuptools_trial/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>vladimir@rutsky.org</email>
+			<name>Vladimir Rutsky</name>
+		</maintainer>
+		<remote-id type="pypi">setuptools_trial</remote-id>
+		<remote-id type="github">rutsky/setuptools-trial</remote-id>
+	</upstream>
+	<longdescription>
+		This is a plugin for setuptools that integrates Twisted trial. Once
+		installed, “python ./setup.py trial� will run the package’s unit tests
+		using Twisted trial. The package can also optionally be configured so
+		that “python ./setup.py test� will use Twisted trial instead of pyunit
+		a.k.a. unittest.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild b/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild
new file mode 100644
index 000000000000..b94353678127
--- /dev/null
+++ b/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Setuptools plugin that makes unit tests execute with trial instead of pyunit"
+HOMEPAGE="https://github.com/rutsky/setuptools-trial https://pypi.python.org/pypi/setuptools_trial"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7)
+"
+
+DEPEND="
+	${RDEPEND}
+"
diff --git a/dev-python/sexpdata/Manifest b/dev-python/sexpdata/Manifest
new file mode 100644
index 000000000000..3bc2a951cbde
--- /dev/null
+++ b/dev-python/sexpdata/Manifest
@@ -0,0 +1,5 @@
+DIST sexpdata-0.0.3.tar.gz 13105 SHA256 6cfa0ddfd69410599d143a5b4fe8bf80fafbf325fd10ec86a0ff49eda5cc2afa SHA512 03d4d1557bcc950124e408d6870894c8ee9e72a2ee83c881adf48f8e53bdf3744b4f3e3e133a74a195d236424b434cc690583a68d8395324ca4e84947e548501 WHIRLPOOL 654a37e8352dc947775e9375e929016e9074f17d4625037627e7416637aa38cdefd4d3fed0be4c388b28fc3a22a89122a028896c5d865f3fa54f369aba273390
+EBUILD sexpdata-0.0.3-r1.ebuild 507 SHA256 3e2085e6e5dc8beda58bdc1b35d34aadd4bd0232a04ee0d39603bb8151ebb0d0 SHA512 7f1bbaaf5b1a14ae9dcbaae2c9d470993fe98bb1c79bc160393e03941f67fb255025bcccbb4bc4d6b3dc1670e0e1c9a62285c87e3e635667281c8791e945c5e1 WHIRLPOOL 5cf8b66aa8c84d2bc1f7c20f60a5b24deccbc0ba49ac1168394cc725b185e872e4626b1ff365427e895aeaf540df8072d2512d51e465782e20487970920222c8
+MISC ChangeLog 2783 SHA256 e37a2d1f133124f1a435c0afa4faad6a9a7510404e5450db6f07d6ddd6e5c446 SHA512 1f9d9e22566cccf89297272a497096cb1ef260285b50ad29c560f5cade634dcb6c50e9821bcd66db4543739830499c978f43a1a3e6ff5415cba2303c61efd6ee WHIRLPOOL fac42e8624fff3d4bfc53926cdf6e76415e77ce40a3421d10ae20f148f36f9f1a9169a775ea912ae9b925b072cd4f796271e9a7715e6189a1d9be7b363d6bdda
+MISC ChangeLog-2015 557 SHA256 958cec19dfd29f3a23abe11bf418f4753233338dbd7764f45f877ddfebdd6004 SHA512 8781652b04abeca859eb5815223c42a9f06a787cb04ed6b46c274035326fbdec94042586c597da459746415db80124d515ab259f97a0ff765bde8b8885d951d7 WHIRLPOOL 572138032ff30b6a93081025b182ae03ba0201041f3ba064d91632fde5695ee8a3cf6cae21db1b23a3d7afe6a6aedc0a67ed0c17e12d5ec7f93ac469b9d83d20
+MISC metadata.xml 220 SHA256 ae11e2cd6e6bc53a1deaa20313d6e2d0c04e8444260a2d8d371ebb181e3e3ee9 SHA512 6d5e0b0f03275b339a2447c81365962abe55791c508e85862a098b740dcb09fc5307d4b0c98d1c86f3673694d255a4b786c8aafd6c54382de6e4da9c793ece80 WHIRLPOOL 51962be78d338a436b9bfe098f02c6e2f183be9ebd8f8edca5efe529fd9dd16ba972ca1c302ace8cb65f61d3c3d306ff674ecfd51b92323b35715f78ebea7080
diff --git a/dev-python/sexpdata/metadata.xml b/dev-python/sexpdata/metadata.xml
new file mode 100644
index 000000000000..df41c99cdb7b
--- /dev/null
+++ b/dev-python/sexpdata/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="github">tkf/sexpdata</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild b/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
new file mode 100644
index 000000000000..5fec53a2f4fe
--- /dev/null
+++ b/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+inherit distutils-r1
+
+DESCRIPTION="a simple S-expression parser/serializer"
+HOMEPAGE="https://github.com/tkf/sexpdata"
+SRC_URI="https://github.com/tkf/sexpdata/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
new file mode 100644
index 000000000000..dda48fd88371
--- /dev/null
+++ b/dev-python/sh/Manifest
@@ -0,0 +1,9 @@
+AUX sh-1.12.9-python2-unicode-tests.patch 674 SHA256 6efee7fb2669dcbd66847df042c740d10b4109e8742b24e76aafbbefdf657a29 SHA512 c33cc195c54232dc7790aba2b34750f623a00ada51f55fc5da3ff9979f2c83359a904e47c0c3ded9f016ff256fafe5099be824261d91af0603f2d714c01e2342 WHIRLPOOL 45013d97834a4ff8f05130f1b3cf34bd3e0e9bbc5f0ef8381beafb0f1d8b84ca8bfbf556e8f4758b6fb2b4dc6b393457996174241c721706227f0393284a85f0
+DIST sh-1.11.tar.gz 36821 SHA256 590fb9b84abf8b1f560df92d73d87965f1e85c6b8330f8a5f6b336b36f0559a4 SHA512 ccaf178384b5a609c00bb44796a6bec088750414385f19b2d8ffcb93cc8f5ddb6bf82fb966d2bf519651f6efed54258a3c6542a9827d01e6be64af8cb8f86d3d WHIRLPOOL 9d13a3364ec467b492fb5818ae00e3a02f81aa779319382450df76a3041efb047dac82bd249cb51bf819664a5e7a8f9def3a672b8eb2edaa24f2a2aa80d66129
+DIST sh-1.12.9.tar.gz 54077 SHA256 579aa19bae7fe86b607df1afaf4e8537c453d2ce3d84e1d3957e099359a51677 SHA512 378ebfe148de6d1fb0f6488a42a39570f1fde6bb2d3ce40cbe29a6920e102f4c31d38a686663e52b2968099d85a0b5867e112c5d53ca0a4527a2f2bc9e607d35 WHIRLPOOL af177f97f21db7df68a8645fc5da83721ae10961df1ff441a816b028bdd4177b1f197d541c91cb1542c4cedf19eb6bcd1ac0576ccd2cce8ec6d5e0e4e19adbb5
+EBUILD sh-1.11-r1.ebuild 512 SHA256 05c89a1277aad435eb4554cf6301647cab5abb753d8aa9f8128e3726c1e7f9f9 SHA512 5b96da77018fe1f8b5104ad20e22affc65b4b7a10f55909891d1b7a06b80c89c5c27d4e8f63a4c8386e6c52f0a5cff16ba603cc9f539168e14f03e33562f7e5b WHIRLPOOL d9ea1c0804b5251a8dd44581dad070cae6cb79b1da11e80057ad1c0325c7f009b1d57a1953577e597f2bae273c0380a349d26c41f6aa2e7a073aacf6929dad5c
+EBUILD sh-1.11.ebuild 508 SHA256 5c37c46f1be7d2173802e2c05e81b2228b83dc95058578036eeab7d604003b00 SHA512 54f6375f364482039f95fedf21ce556b9daa94302b1e36a06b733025b16411b9f01bc538bde5456d4b99d95b3a163a85e49781031971cb6589729ddc0ea41726 WHIRLPOOL 447f8626bc1e9972117be1f7b21bef822d2ee4de2821a395e5cfbb85fbdd0f6be6f5bd3c26b1e2029e27e5818de91bb8f1e65ad830e71cb629d72b38e2279cf0
+EBUILD sh-1.12.9.ebuild 580 SHA256 662cc3737628174e5473864545264e01f9fc0b5726262cf33a7f4417b8c3a376 SHA512 4f03c4674f5b06a513ba95d71348c6641dab0d26e0081a984717a7b4815e4db5016c73e726c08c6a4afe6c4fec32b3b675fb5fe22116212032fa9ee965f868aa WHIRLPOOL 48101bf29cc0c9c43a1dcac4a572d151e04d4a2ef5323cdddaac2b7bf75ae5773e1d322bfd214746d848543669edf2e8e77db562c9347835ddc4d21c438d7df7
+MISC ChangeLog 2725 SHA256 64e91e7c4d039965c9187e062b3be1547f556f8c1e3cd657e1096b865991d1ee SHA512 ad12e05303905a205ee36e24b931984e227f7ad5a51e9576200c8caaccc4c9c3eb7187021fae0c9a434d784f2d753d837c41b7630400d8bb5d74262e4607fe4b WHIRLPOOL a231402808c1d14d8c668c6cd47e8fd0a7d078fb70634fe601f3d9a2cf418c9597e096d73b7f74252dfba0835578f665b5848321dec95e9d7bfa31b2e2210bb0
+MISC ChangeLog-2015 1471 SHA256 552ed9f21c629cc8cdf058a5b7744498db1791ff4453a1bde966edae8c8ac9ec SHA512 bdeb7cdc37a57754fb106f5d3f94e0cef1ec34df4d65ca9168b3bb5160ca0fec2926e6ae056d35eb1c3bf730cf48c8c7aff46e3c9acd67f76b8309cddb27f5d6 WHIRLPOOL 75e950d9fcf054349b8de67ed5de45b4ad694cd89b9e4fa041e0a4820c16b02eca74b2ab31812410dc81471b0e59169b03f5bcc7495cea10c49de6369803033e
+MISC metadata.xml 676 SHA256 115ec46916929a26a3662ffc9783b6497af86f57a466076a7fd1276fb9f4cfee SHA512 4d4633de70608259eb2bb288af89992c90fe192258ac157d07f2d568922a88b497cf6a3e2961b266603089e55ce7cfcd7ae2831879ed9afce4c3c740479c2756 WHIRLPOOL 02ab243a49dae741e8cde1f61023d45988ad7bb657656278667cf865796cf8f1b3bc321a894e1c4e9b5043fd8b9007c99103d46ed91fd9a51b1792c0964519ca
diff --git a/dev-python/sh/files/sh-1.12.9-python2-unicode-tests.patch b/dev-python/sh/files/sh-1.12.9-python2-unicode-tests.patch
new file mode 100644
index 000000000000..230b16ae5fb1
--- /dev/null
+++ b/dev-python/sh/files/sh-1.12.9-python2-unicode-tests.patch
@@ -0,0 +1,22 @@
+diff --git a/test.py b/test.py
+index 78e00ab..0487594 100644
+--- a/test.py
++++ b/test.py
+@@ -502,7 +502,7 @@ for key in osx_cruft:
+ print(os.environ["HERP"] + " " + str(len(os.environ)))
+ """ % osx_cruft)
+         out = python(py.name, _env=env).strip()
+-        self.assertEqual(out, "DERP 1")
++        self.assertEqual(out, u"DERP 12")
+ 
+         py = create_tmp_test("""
+ import os, sys
+@@ -515,7 +515,7 @@ for key in osx_cruft:
+ print(sh.HERP + " " + str(len(os.environ)))
+ """ % osx_cruft)
+         out = python(py.name, _env=env, _cwd=THIS_DIR).strip()
+-        self.assertEqual(out, "DERP 1")
++        self.assertEqual(out, u"DERP 12")
+ 
+ 
+     def test_which(self):
diff --git a/dev-python/sh/metadata.xml b/dev-python/sh/metadata.xml
new file mode 100644
index 000000000000..07e719850609
--- /dev/null
+++ b/dev-python/sh/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<longdescription lang="en">
+	sh (previously pbs) is a full-fledged subprocess interface 
+	for Python 2.6 - 3.2 that allows you to call any program 
+	as if it were a function:
+
+	from sh import ifconfig
+	print ifconfig("eth0")
+
+	sh is not a collection of system commands implemented in Python.
+</longdescription>
+	<upstream>
+		<remote-id type="pypi">sh</remote-id>
+		<remote-id type="github">amoffat/sh</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sh/sh-1.11-r1.ebuild b/dev-python/sh/sh-1.11-r1.ebuild
new file mode 100644
index 000000000000..9bc359e57766
--- /dev/null
+++ b/dev-python/sh/sh-1.11-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python subprocess interface"
+HOMEPAGE="https://github.com/amoffat/sh"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+		dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	${PYTHON} test.py || die
+}
diff --git a/dev-python/sh/sh-1.11.ebuild b/dev-python/sh/sh-1.11.ebuild
new file mode 100644
index 000000000000..a4e9e8ae7468
--- /dev/null
+++ b/dev-python/sh/sh-1.11.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python subprocess interface"
+HOMEPAGE="https://github.com/amoffat/sh"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+		dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	${PYTHON} test.py || die
+}
diff --git a/dev-python/sh/sh-1.12.9.ebuild b/dev-python/sh/sh-1.12.9.ebuild
new file mode 100644
index 000000000000..168127d102d9
--- /dev/null
+++ b/dev-python/sh/sh-1.12.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python subprocess interface"
+HOMEPAGE="https://github.com/amoffat/sh"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/sh-1.12.9-python2-unicode-tests.patch"
+)
+
+python_test() {
+	${PYTHON} test.py || die
+}
diff --git a/dev-python/shiboken/Manifest b/dev-python/shiboken/Manifest
new file mode 100644
index 000000000000..cc6b3c16a41f
--- /dev/null
+++ b/dev-python/shiboken/Manifest
@@ -0,0 +1,8 @@
+AUX 1.2.2-Fix-tests-with-Python-3.patch 1864 SHA256 5a91f5c87bbbfcccd402744be19cfb84ce82ecf174264f6ff6cc91c71cb3e014 SHA512 969972ed55360ebaa5db68c81467b71d579ea03a0e1f7a21227bc8e3500289be7f6bcf2df6676a2449e19cf1a28f74a29dcd3c6a26817712814790cfd3a3d571 WHIRLPOOL 8032e726caca1797fffa8667824a546dbb041a2fe85d89b77aefdb0a57cdbc6038b1a4ded837f6e3627b25d7bfe44514634be14e0a6e788047e5e40e4fb9a3b6
+AUX rpath.cmake 393 SHA256 b89f3698d321e30afef0f7c32be009d5d926f92ba310ad44b384cdbc1a6a104d SHA512 b9f2d3b34fd31a7e289e3aa1c96110f92bc66f45e5bfaf796f86d52eb832e960caca0e314b87248d0a41c13c95f04402607cbb5ad7d0b3238d5bab5580c3a65f WHIRLPOOL 79dbd32a58b6bf8a408f8fef3dd918c1946c89c32731b515984cb0ed8230c63cd724150db636523484d525c2ebad1f78217c7ccb6a294221aa8d2ca8dcce6a1d
+AUX shiboken-1.2.2-gcc6.patch 463 SHA256 b6cc4c2aab3bb5eeab404cfc24d86af6756819a40fee7f5fcd42d67b16c543c9 SHA512 ebea09b697bba76bc909dc61cfaabc50d2220c0ebbdcc9004b20bc9bf2f088685767f0d105cf07be77283714dfd5ad766239813dd2f6926c5d104abd528a702d WHIRLPOOL 8c58892993e8250a97cd563a9edad503f08d4f0979183757ba6d460b1c41a0357967244467e9fd47eaaa2b68051203d09c0f3c7785f5e599f6a8724b8a96ec4e
+DIST shiboken-1.2.2.tar.bz2 1073776 SHA256 7625bbcf1fe313fd910c6b8c9cf49ac5495499f9d00867115a2f1f2a69fce5c4 SHA512 9f5c1219ce699df6b5ee4bd68cf422cb69476bd062346fcc8b4d34d314001ba60dbd52a73d772aec16285a0aabb600034630beba754ca54f5e6a4b744a720073 WHIRLPOOL 3d585201e88ea969e07595c5364eb630d0a8ce8096104bd0177aae26e549a10eedd8a930ce2bda88fdf3b6a50e0a5eff7494707642032e779a61a8cf110552d2
+EBUILD shiboken-1.2.2.ebuild 2058 SHA256 d38cbfa9a6479f65ca9cec33cac368b24593110dcad16ed1b8b42eafc1bdd73c SHA512 31d48bc4bc5a0e468246a11adc7c79b8fd6109f631c20431a2eb875d025c71aff50f60fe2aba3ba75e8cba513f67700c75a88689548f39bf0fc757c27b00a3bf WHIRLPOOL e036465cfb364bd44e3c59256a98c3481c9d641d76f472ec97975f03b03dfed5c940182996ce27f5e03176dacc297e9bb24f362dd130126105f9990873373406
+MISC ChangeLog 2806 SHA256 eea00a9b8c22e9c244aabda9186f05a5f3afc487b3fccc92e1ca030042909240 SHA512 6ff8871a689add2d4647affba88eea542e0f775e7f3b7b567e4ece242423d111b0dd8fa057d4b6817ad2e457f06caa68ecf87dc297ac24781fbf77773f798fca WHIRLPOOL d44e7603adac1ccea707321f3078628b8928fe95fe1d8811af7fe51c902f891e2b680981dbe0289ba3f6fb83fa329d09a0af4220b23d6449a5c52b08d5112b92
+MISC ChangeLog-2015 8765 SHA256 dc8c9e03d511b0fab240529fee2f352dcc8043dbc4cf79cab19a320369872ebd SHA512 972c4436bf7a0413411a9533686a51797a779fa61e3f2ecbc165dbe7aa96c760cde7045227b6f1e6ded5cff06b68a2a142de78727593948a52202b01e050b8e7 WHIRLPOOL a55209545921a8a71a3345f6498ab4d64664184521948cbedb2fa7ecc339a86f13c75f043e56193d6b2cc4b8e9be85f5ce74765c06bbed323c84cd83c7bf6c03
+MISC metadata.xml 253 SHA256 36bd209de009a489b24e922a4d2e3fb8ff0d8c68ef9943eb0f4c2a9ec6638a3f SHA512 5417d2869e029c2e156185a3263bef4e78109b9306575cfcf072105a61ad2f75ee7bc6401db3564c1ae5c7630aadf551e09234b4448cd64341380f687ee47436 WHIRLPOOL a0d96df37ca16a58705d8ad4c8ac3da87f0bd059c6c5d85b7c109a1c83b917f72688a79baaa496c4b7badc0960a469dced4127166481a07df05da3de261bbcdb
diff --git a/dev-python/shiboken/files/1.2.2-Fix-tests-with-Python-3.patch b/dev-python/shiboken/files/1.2.2-Fix-tests-with-Python-3.patch
new file mode 100644
index 000000000000..48e401d1be1d
--- /dev/null
+++ b/dev-python/shiboken/files/1.2.2-Fix-tests-with-Python-3.patch
@@ -0,0 +1,49 @@
+From 7f793442316599ca25014a3d39c5de56c384990f Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Fri, 23 May 2014 18:10:20 +1000
+Subject: [PATCH] Fix tests with Python 3.
+
+Change-Id: Ibbf54406ba33dd1f645a46d63c04269868288768
+---
+ tests/minimalbinding/typedef_test.py | 2 +-
+ tests/samplebinding/overflow_test.py | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/minimalbinding/typedef_test.py b/tests/minimalbinding/typedef_test.py
+index 089b279..b5535fb 100644
+--- a/tests/minimalbinding/typedef_test.py
++++ b/tests/minimalbinding/typedef_test.py
+@@ -30,7 +30,7 @@ from py3kcompat import IS_PY3K
+ 
+ try:
+     import numpy as np
+-except ImportError, e:
++except ImportError:
+     np = None
+ 
+ 
+diff --git a/tests/samplebinding/overflow_test.py b/tests/samplebinding/overflow_test.py
+index 5020872..c294c13 100644
+--- a/tests/samplebinding/overflow_test.py
++++ b/tests/samplebinding/overflow_test.py
+@@ -45,7 +45,7 @@ class OverflowTest(unittest.TestCase):
+         '''C++ function receives an long long argument and raise OverflowError if the value is negative.'''
+         val = 100
+         self.assertEqual(doubleLongLong(val), 2 * val)
+-        val = long(100)
++        val = int(100)
+         self.assertEqual(doubleLongLong(val), 2 * val)
+         val = (2 << 64) + 1
+         self.assertRaises(OverflowError, doubleLongLong, val)
+@@ -54,7 +54,7 @@ class OverflowTest(unittest.TestCase):
+         '''C++ function receives an unsigned long long argument and raise OverflowError if the value is negative.'''
+         val = 100
+         self.assertEqual(doubleUnsignedLongLong(val), 2 * val)
+-        val = long(100)
++        val = int(100)
+         self.assertEqual(doubleUnsignedLongLong(val), 2 * val)
+         val *= -1
+         self.assertRaises(OverflowError, doubleUnsignedLongLong, val)
+-- 
+2.1.0
+
diff --git a/dev-python/shiboken/files/rpath.cmake b/dev-python/shiboken/files/rpath.cmake
new file mode 100644
index 000000000000..b896c8789185
--- /dev/null
+++ b/dev-python/shiboken/files/rpath.cmake
@@ -0,0 +1,10 @@
+# use, i.e. don't skip the full RPATH for the build tree
+SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+
+# when building, don't use the install RPATH already
+# (but later on when installing)
+SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+
+# add the automatically determined parts of the RPATH
+# which point to directories outside the build tree to the install RPATH
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
diff --git a/dev-python/shiboken/files/shiboken-1.2.2-gcc6.patch b/dev-python/shiboken/files/shiboken-1.2.2-gcc6.patch
new file mode 100644
index 000000000000..65734232472c
--- /dev/null
+++ b/dev-python/shiboken/files/shiboken-1.2.2-gcc6.patch
@@ -0,0 +1,20 @@
+Bug: https://bugs.gentoo.org/619332
+PR: https://github.com/pyside/Shiboken/pull/84
+
+--- a/tests/libsample/simplefile.cpp
++++ b/tests/libsample/simplefile.cpp
+@@ -90,13 +90,13 @@ bool
+ SimpleFile::exists() const
+ {
+     std::ifstream ifile(p->m_filename);
+-    return ifile;
++    return static_cast<bool>(ifile);
+ }
+
+ bool
+ SimpleFile::exists(const char* filename)
+ {
+     std::ifstream ifile(filename);
+-    return ifile;
++    return static_cast<bool>(ifile);
+ }
diff --git a/dev-python/shiboken/metadata.xml b/dev-python/shiboken/metadata.xml
new file mode 100644
index 000000000000..a7f1abb3029b
--- /dev/null
+++ b/dev-python/shiboken/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="project">
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/shiboken/shiboken-1.2.2.ebuild b/dev-python/shiboken/shiboken-1.2.2.ebuild
new file mode 100644
index 000000000000..038b7b41135e
--- /dev/null
+++ b/dev-python/shiboken/shiboken-1.2.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cmake-utils multilib python-r1
+
+DESCRIPTION="A tool for creating Python bindings for C++ libraries"
+HOMEPAGE="http://qt-project.org/wiki/PySide"
+SRC_URI="http://download.qt-project.org/official_releases/pyside/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-qt/qtcore:4
+	dev-qt/qtxmlpatterns:4
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-qt/qtgui:4
+		dev-qt/qttest:4
+	)"
+
+DOCS=( AUTHORS ChangeLog )
+PATCHES=(
+	"${FILESDIR}/${PV}-Fix-tests-with-Python-3.patch"
+	"${FILESDIR}/${P}-gcc6.patch"
+)
+
+src_prepare() {
+	# Fix inconsistent naming of libshiboken.so and ShibokenConfig.cmake,
+	# caused by the usage of a different version suffix with python >= 3.2
+	sed -i -e "/get_config_var('SOABI')/d" \
+		cmake/Modules/FindPython3InterpWithDebug.cmake || die
+
+	if use prefix; then
+		cp "${FILESDIR}"/rpath.cmake . || die
+		sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	configuration() {
+		local mycmakeargs=(
+			$(cmake-utils_use_build test TESTS)
+			-DPYTHON_EXECUTABLE="${PYTHON}"
+			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
+			-DPYTHON_SUFFIX="-${EPYTHON}"
+		)
+
+		if [[ ${EPYTHON} == python3* ]]; then
+			mycmakeargs+=(
+				-DUSE_PYTHON3=ON
+				-DPYTHON3_EXECUTABLE="${PYTHON}"
+				-DPYTHON3_INCLUDE_DIR="$(python_get_includedir)"
+				-DPYTHON3_LIBRARY="$(python_get_library_path)"
+			)
+		fi
+
+		cmake-utils_src_configure
+	}
+	python_foreach_impl configuration
+}
+
+src_compile() {
+	python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+	python_foreach_impl cmake-utils_src_test
+}
+
+src_install() {
+	installation() {
+		cmake-utils_src_install
+		mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
+	}
+	python_foreach_impl installation
+}
diff --git a/dev-python/shm/Manifest b/dev-python/shm/Manifest
new file mode 100644
index 000000000000..f60a6e8de08f
--- /dev/null
+++ b/dev-python/shm/Manifest
@@ -0,0 +1,6 @@
+AUX shm-1.2.2-compiler.patch 464 SHA256 c2558b041808f281e0b7d67b0d6b73a1faa5edd567ad306cc58f331bd5dd4c87 SHA512 165d898892eca56abd410ab0c70879055eefe1429afce42df2b0af48f0182c8f926e08772013efbb4551d2a684d425c7c6ea9f280af51ed5745b9ecd860d9ad2 WHIRLPOOL cdc34aae0c0a989d1110bd2b9b923975bce32f901f890efb1b8ab1fcc2d1f4677e043feb460bdfbd1232a590abdf88fa9238b2b696659a87796a217eaaab6d1f
+DIST shm-1.2.2.tar.gz 25258 SHA256 5d733f61b26c2b71e46add5db6a74b50cb88e7339a30d91931bd10b85ddc8189 SHA512 d3da728d7c314b208b235490ae45b9f9ed4e7ac5c233867844b842ee511e50b684c52e75cc9258d0f65aa93ff2b10bca6a4bebfa6aef9b43d07ab284c0cab2a6 WHIRLPOOL 77c4ceb2e666aa3fa412de80dd25712d81d48cc859e1a2d993a08f82644dbbcee439396dc7a06a53dd408b3d38ee053399e23d8c5e3e82e437bfacd6300bbc1b
+EBUILD shm-1.2.2-r1.ebuild 662 SHA256 54d3deaf8abb47629868db61c048238321f755afbf7b836243e6499965b62df4 SHA512 457cbd2b5ad0c9357297e9b83ff2ecafead74befa755fea99cc2d326cc179833a89a555d512c16b8bf166af40a16ae20112d9e15b5bfc1abd16d2a4800b68522 WHIRLPOOL 0bde4a1368c11fc85fc3331ae9752cd45d0317113de19889f0607d46b2e56900b8ff9d83619b57533ab608960db7e6b35e78347a2551533266a30c6906df6e46
+MISC ChangeLog 2456 SHA256 90f6e818f1bd5480d964b6b8dd8afaa0afd756523b9909c4b87b5f697580e759 SHA512 21958de8f49908ebe6b0cb9d64d0c40536d494e21e2fdcec4af082e2b9583423d3cd804113f8bb1ac4bb8c4a12005e8594e6fc5ce42bbfe94e02661972ac0879 WHIRLPOOL f8a235b9754a217752ed8ab93de493d3a4f38319e18bac05a0779980ee206c55687ae53c9bbd2d24bf33023b3b9e4ce876ab700d319995019bba67fdc2fb165c
+MISC ChangeLog-2015 1599 SHA256 da3212a6b81b0c9440cb6bb032cf60ebfc1d5ebb4613ad1040f8c54a53035c48 SHA512 dcafcc6e13dfe5c51ad1d7d581ad999ecf1c407fceb6a222b3a8844448f75b3b58731156798c5fbc690d2fa20cf54323bd4b8c2da4faa2488f987a95158a4ba4 WHIRLPOOL 19a42dca7c1c033cc2f40f4457165795b2a2fe4e89fd0b9ab40a31e22e2c4edffcb07e5f88c2ee335972e6a8cb5d4bde87e6333f366d73cc224bf68c0320ce56
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/shm/files/shm-1.2.2-compiler.patch b/dev-python/shm/files/shm-1.2.2-compiler.patch
new file mode 100644
index 000000000000..e9e1bd22a3a1
--- /dev/null
+++ b/dev-python/shm/files/shm-1.2.2-compiler.patch
@@ -0,0 +1,11 @@
+--- setup.py	2010-06-26 03:29:30.000000000 +0200
++++ setup.py	2010-06-26 03:30:10.000000000 +0200
+@@ -84,7 +84,7 @@
+         filename = "%d.c" % i
+         file(path + filename, "w").write(src % ('_' * i))
+         
+-        cmd = ["cc", "-c", "-o", "/dev/null", "%s" % path + filename]
++        cmd = [os.environ.get("CC", "cc"), "-c", "-o", "/dev/null", "%s" % path + filename]
+ 
+         po = popen2.Popen4(cmd)
+         if not po.wait(): underscores[i] = True
diff --git a/dev-python/shm/metadata.xml b/dev-python/shm/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/shm/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/shm/shm-1.2.2-r1.ebuild b/dev-python/shm/shm-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..5a0f1e3388bd
--- /dev/null
+++ b/dev-python/shm/shm-1.2.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python modules to access System V shared memory and semaphores"
+HOMEPAGE="http://nikitathespider.com/python/shm/"
+SRC_URI="http://nikitathespider.com/python/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-compiler.patch )
+
+python_install_all() {
+	dohtml ReadMe.html
+	use examples && local EXAMPLES=( demo/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/shortuuid/Manifest b/dev-python/shortuuid/Manifest
new file mode 100644
index 000000000000..8399e2578880
--- /dev/null
+++ b/dev-python/shortuuid/Manifest
@@ -0,0 +1,7 @@
+DIST shortuuid-0.4.2.tar.gz 5367 SHA256 47fa452b53fcf15427e539efd9fee8e625a9aebeb81db9339df7aeede52c2b61 SHA512 c60122bffdf458fb6aaf8ff4883d15f121ce8e5c0b24b99609171cc7bb103a1dbbf876b39e84129b50cc6ebfc1310740ffe684f7dfd93c750d0ff55d483273a3 WHIRLPOOL 648a63a48ecc2b8609b6d83cff41314b90b78488d85cfa2eed4b363029905d0d0238e52dad4f014dc419a6e8ed72fe1cdfc48f02d6e363aaf0ef1ac5b387a7f9
+DIST shortuuid-0.4.3.tar.gz 6096 SHA256 4606dbb19124d98109c00e2cafae2df8117aec02115623e18fb2abe3f766d293 SHA512 409bcaaff421a392640e39a7d25d4eaa320826971dca9d13270b61f21c78f65c617c302b3f7db5d0a3400c8ed4380a3a8eda90d1e9ad13d0a3a7eca53440ea7e WHIRLPOOL 3b9494b9332ab6fb04bdc6ab50271bc192a6c93fdbddab9d58ebee5d4e33f9823db389b1318dddb9518eb10b57ff30e74328c5ad109684310a8aa22465cb2503
+EBUILD shortuuid-0.4.2.ebuild 457 SHA256 d3952789d7711bd81737167dcb116f315151c370504d81547d482a47fc3c0fab SHA512 21eb948bc9f372719519dfe9721b223e90ebf6b91cfd8e67f250b513818602cd748228a77aafd2842e3eacab12be0e645ccbd5aa177411038edff03310dc820c WHIRLPOOL 23c6cc5f439ed41a760fa376dfec3c53cb059cb74e46c0379a9d00ca5249b96bc3698f4ee1788668fb18770e94d440975560341b64829667923260e8b5ed7125
+EBUILD shortuuid-0.4.3.ebuild 599 SHA256 f5c9fde3016a59b823cc60784c757bf356fbc945ffd371d462060fb31bf9bfd7 SHA512 9ccad404a56eb95cf7f2df03dd6c264dd85ec46ffb77b9d898b219f197605358267085bd0f5e814249af3655e9b05840d981cb7b84b4c9671f3131528c0421ab WHIRLPOOL b4b7ab783a3150612fb0ae7f7f855cac046a24319b1cd546ccb30fc540f79075589c6933b25e1ee428fd1d59a2e946d30695ba5e27ac4d250ee5c91e60c8bdcd
+MISC ChangeLog 2947 SHA256 251ef4299be9752e8a00be4bb83b72a72362ec18e29e0a6c6e2dce6d4a429849 SHA512 e36a6ed0a70e213df7bd244f51b5c37bdf9ebe957f9e1762275c805dcb9be752a792c9c742a6e1e3d931dcc5916fac3255f8e70f67b2bbd8a4140c2649926038 WHIRLPOOL cdd90dc792d2ff9d0adaea88dc76b610c0ac68ebd8637b88347c24174720cf02636d842b298f37509d8ed77e56243ae03cc5ab8c996a914b3fe1183f336f3e25
+MISC ChangeLog-2015 940 SHA256 305154e9ad62b22c85c12bb6cb4f7a0af5d1def6fe1c121cc2642ddf9a20b6a2 SHA512 9400f32870912a1b0fd7049f376bb2ce198fcbbce26d28498b0bc43440fddc0146966b1aeeb64af5d88c88040eb05f806a6980516e6d5986fd6fca6ad5abab6a WHIRLPOOL bc0e48a98d5f2a540c57e38c4235091c76fefb2838c8e2bc4c1c073a63d53407ae746d474206bf1b0e7d237b83ebac34288f231ab6d9f680ed43889b216ef914
+MISC metadata.xml 691 SHA256 7aad770d07d21bdc6fbf35179fe73a39ea952bdf09c168059b07c3509aaee9c4 SHA512 277cdfa5935e51484767c65867e529d9d171f8ac7b4761ce3483f1c76c682c6c3d51953e7ffc2315510c6ef2774e9ea6db6834b3eccf98c1ed1a9cc4e744cffa WHIRLPOOL 5bebc4d6c49f14c63b614b803f340fcf932fe1c80417c02aac277b65967661c95bb256df4d4315b48868801d2a1f64b293dc138d8c0eca64d25869ce8ecd382f
diff --git a/dev-python/shortuuid/metadata.xml b/dev-python/shortuuid/metadata.xml
new file mode 100644
index 000000000000..31825f366c26
--- /dev/null
+++ b/dev-python/shortuuid/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ercpe@gentoo.org</email>
+    <name>Johann Schmitz (ercpe)</name>
+  </maintainer>
+  <longdescription>A library that generates short, pretty, unambiguous unique IDs by using an extensive, case-sensitive alphabet and omitting similar-looking letters and numbers.</longdescription>
+  <upstream>
+    <remote-id type="pypi">shortuuid</remote-id>
+    <remote-id type="github">stochastic-technologies/shortuuid</remote-id>
+    <bugs-to>https://github.com/stochastic-technologies/shortuuid/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/shortuuid/shortuuid-0.4.2.ebuild b/dev-python/shortuuid/shortuuid-0.4.2.ebuild
new file mode 100644
index 000000000000..ab63380795df
--- /dev/null
+++ b/dev-python/shortuuid/shortuuid-0.4.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A generator library for concise, unambiguous and URL-safe UUIDs"
+HOMEPAGE="https://pypi.python.org/pypi/shortuuid"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/shortuuid/shortuuid-0.4.3.ebuild b/dev-python/shortuuid/shortuuid-0.4.3.ebuild
new file mode 100644
index 000000000000..dede6fca8011
--- /dev/null
+++ b/dev-python/shortuuid/shortuuid-0.4.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A generator library for concise, unambiguous and URL-safe UUIDs"
+HOMEPAGE="https://pypi.python.org/pypi/shortuuid"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/pep8[${PYTHON_USEDEP}] )"
+
+python_test() {
+	${EPYTHON} ${PN}/tests.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/shutilwhich/Manifest b/dev-python/shutilwhich/Manifest
new file mode 100644
index 000000000000..a836ed0e1270
--- /dev/null
+++ b/dev-python/shutilwhich/Manifest
@@ -0,0 +1,3 @@
+DIST shutilwhich-1.1.0.tar.gz 2300 SHA256 db1f39c6461e42f630fa617bb8c79090f7711c9ca493e615e43d0610ecb64dc6 SHA512 94001875c428ce1ad1c92e5f5be1ed497630ac0e2221dbb93fde8438f128f4f2663a0a13e17b94852e4813aadec694fa21c24f647500e8053c89ec610eb7fe21 WHIRLPOOL 31fbd1cfaacd52d271fbd7751ee2ba9ac41a310d410975fa425a1763ffcdc50be0ebec89aa9a817bf06a93152a6cae48cc343946eda118400dc865e98c217cd1
+EBUILD shutilwhich-1.1.0.ebuild 472 SHA256 eedab3cb6307e9d6c818924a3fd43bc00a9760a0988ea6d9e2704b57a8b13fc4 SHA512 310a0426a75029e48076c388f892c9eed126d8fb8e87f87d782482b63c287f70299aa8f682b282b0c6d2ce0dd4757d209734daba3e7ac822cf92f3001bff1898 WHIRLPOOL 85ad4a0420968697a7bbf1c37275739bc443ecca86cfc89fc080456b5f5a1b6c667e842e91c04f60ce2ebed89e2d1f273423fa4ada1a0c6660741d034722a8ad
+MISC metadata.xml 759 SHA256 31229b1eb8dd7949b7323aa9516ac8f77a89d25171fd737529348d267bc5eee3 SHA512 e0cafde29e32a4596bd881c35f1c1dd7137f971e37efa38a24c86d9e3b377befb1355bac5a7ba6513833c9852f94ee5c44a911af9223eec4f93f90eb936fc2bd WHIRLPOOL b8204badf08be63a85df2cb41ea3f15612aa4bcc1bd4fa698cddbec2b47c595cefae61cc450f47b7be65836555dd174c43f1f423db92734f79bb58984afccbc8
diff --git a/dev-python/shutilwhich/metadata.xml b/dev-python/shutilwhich/metadata.xml
new file mode 100644
index 000000000000..ff479cb63caf
--- /dev/null
+++ b/dev-python/shutilwhich/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>git@marcbrinkmann.de</email>
+			<name>Marc Brinkmann</name>
+		</maintainer>
+		<remote-id type="pypi">shutilwhich</remote-id>
+		<remote-id type="github">mbr/shutilwhich</remote-id>
+	</upstream>
+	<longdescription>
+		shutilwhich will monkey-patch the shutil package, so from that 
+		point on you can simply import the which function.  On Python 
+		3.3 and above, the module never do anything but return the 
+		stdlib shutil.which function.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
new file mode 100644
index 000000000000..a831a85242ba
--- /dev/null
+++ b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A copy & paste backport of Python 3.3's shutil.which function"
+HOMEPAGE="https://pypi.python.org/pypi/shutilwhich https://github.com/mbr/shutilwhich"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/simplebayes/Manifest b/dev-python/simplebayes/Manifest
new file mode 100644
index 000000000000..0ff5022e4018
--- /dev/null
+++ b/dev-python/simplebayes/Manifest
@@ -0,0 +1,4 @@
+DIST simplebayes-1.5.7.tar.gz 19260 SHA256 71cb029768bd25c172bdb3bd37174d42f872da92c33329ec736c3748ffa3b4a7 SHA512 417af72db13418e5a9df2fdb642fc63ed3eb4fbbf88cc7252a9e3603d31e35ccb68ae5838d8bb7d77554c1820a9db8aa944c639af4eb6418babb9d360ef3ddbc WHIRLPOOL 826617d920c45411a138bc405f760229e79959b25f4cd7e3d6b4525cdd2e9fec43b88f0df011dd820a72484df5bf988e3a18b357fe2966e15a8349c686eba308
+EBUILD simplebayes-1.5.7.ebuild 643 SHA256 b00e3286b524115bb66adc8009d0f14b7c3b6607040aa3b0854709f09b975868 SHA512 34f56f96cc21a458a301140ec818ed86f55433795fd9f4bc71d56d2284c48b508f7d1112ec1f936f55eb5e5b08bdc924c244eb25de7589f948ae9d07345629db WHIRLPOOL 4db32383401997cc319825bece7a2cfbc9c61a9843534464b67ad8f270272d8a66e3511f6784d85ee07b4997304137622d2cbcf5726ce03864e6cac37b4c3d87
+MISC ChangeLog 460 SHA256 70d9575cb417075aa274cd7de619fa77075dec643b3fed2fb95e2b5732786b9f SHA512 9b9dd9bfe26592c4b51401bd81d9a6bf4c3d0fa5c8fc83713c90712ec660b2224d330474ed1cb0c9212e1c8db7027bd6d0649247f5129c03bbe3dd835331b9a5 WHIRLPOOL 456ffac47eb007523a073fdfdb87b422f5659a55c450994d1b645d0af7e9a381a5c9009bf2e55ca0e02f58a575f71cb1ace0dd48c50490c9f8d50dabf469bed8
+MISC metadata.xml 617 SHA256 ce7a2379cbedee952cdc906f99735b97af5c6edaceebb4dc2e9276c66f81a903 SHA512 2a9daf6f53869780724a8083bbe250e29d1ec4ffe380885e44ebb13e749bb5e3ef8e340d178e50d7775069bfc01ee98b7a1b784813601b91ec4fbc685217b454 WHIRLPOOL 32f38264b64c8d239d6bf1711f86a0779ee1293b882303d178c2998498c98174e14301226706a784268dce7f783b0b8fbb4b492502df0d757121f5d4cf70db7f
diff --git a/dev-python/simplebayes/metadata.xml b/dev-python/simplebayes/metadata.xml
new file mode 100644
index 000000000000..9d1e5c16ae1b
--- /dev/null
+++ b/dev-python/simplebayes/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription lang="en">
+A memory-based, optional-persistence naïve bayesian text classifier.
+
+This work is heavily inspired by the python "redisbayes" module found here:
+[https://github.com/jart/redisbayes] and [https://pypi.python.org/pypi/redisbayes]
+	</longdescription>
+	<upstream>
+		<remote-id type="github">hickeroar/simplebayes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/simplebayes/simplebayes-1.5.7.ebuild b/dev-python/simplebayes/simplebayes-1.5.7.ebuild
new file mode 100644
index 000000000000..b7c3fc7c6d22
--- /dev/null
+++ b/dev-python/simplebayes/simplebayes-1.5.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="memory-based, optional-persistence naive bayesian text classifier"
+HOMEPAGE="https://github.com/hickeroar/simplebayes"
+SRC_URI="https://github.com/hickeroar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/simplecv/Manifest b/dev-python/simplecv/Manifest
new file mode 100644
index 000000000000..df66f93fd83c
--- /dev/null
+++ b/dev-python/simplecv/Manifest
@@ -0,0 +1,7 @@
+AUX new-support-for-opencv-2.4.3-added.patch 4889 SHA256 7ba7671ee56b81e69d38a022cb4f2a5efa540c5c97f88a07f85e4e4213756765 SHA512 248a0cdaf74af780c10bbc805aa286c3dee4b93456cb2097460e5916ac94a791665355d1b814f593ac5fedbcbb12a797eff21290ce4db8a04b7c870b82db9293 WHIRLPOOL 38430e0d353961b8fc2be1f3e08c77fb904ef9aefb3110eea4ba33f37a68586757878174e11e50c67a390007670856a8a14e20fcbc86e4700f1fdab71bbcb464
+AUX remove-failing-test.patch 1476 SHA256 9fb4e06794b72f63c2e78ae12cdf87748962ae6222ed0263d8e7a5c745d585e0 SHA512 d07daa7addc1f824a2e7bc70e51da05917e559ace9779035a032ce5358b1e0dee3184e44f9eaab137bf8f7a261a136f1f909ea1617e54a8eb7735876b5e74316 WHIRLPOOL 5d36fec3ead4f7bb25afec3fc6bef7172c48b2ae092e077598fd324ecaa0a928090701ada332eb9c0464e6ede18c0d347c42802a2d7788fb5458879ace3a3928
+DIST simplecv-1.3.tar.gz 42860284 SHA256 3510727fa5e219c811cf89bce21ecf29647bdd4ef48a0a78aa29b10b9f583947 SHA512 47fa3c0bb41057ae17323aeb68711ef4716c4fe6607162218477af9070a1b1a03a7300f38b2c2a5c54ff69b916267504aeeac7c3108d6a45045a1469a93005b8 WHIRLPOOL 0206dfc06627b78e96aa7487b6c3450cde043e1527044e413b6111831aa48b32dd043fbebbb33c61ffb1aab7683187bf76db4f0a641cdcd0c3dbd6c8d36e1b18
+EBUILD simplecv-1.3.ebuild 1226 SHA256 872f7b26c95e1ae5c95a914ba5a89481e67ca711f82f63352a18e7e830055b37 SHA512 d479226dd26038fe8eb575bb32a8ee14359dc0e6c6a4991cb1e524a60b040a19c70412fd8c5b4b292a9199d2a7d366c4b44fcff5a7b16c3f1b6236537433415e WHIRLPOOL c28d9cd0035ddc5a69df41f5a5d2c1df5017c0de8862989a7fa5b3c56554292fed3faef666da141f523c34318ca502bd225432dbbb4c2cc6e6ae28ca6861fedf
+MISC ChangeLog 2596 SHA256 b060f822eba8a08768f45ad122d1ab1d3e65990439118cce6aa6c974e455a949 SHA512 a685b6878ce7a3c0b112b23daf648141ac9c28eea9558c41daa8971eeba50f5c3e98398dc0fa97f25a028f21628eebed8f231c1425784937662f049f6674bc63 WHIRLPOOL ed1ffbf7db0324713acf5b7aba78bdff2d4f570a404dbca1184e6fe33e16e5013f4cebf8730825e5f7a3365a99a0b4ee7ec3b8cb67d40a561309aeb6c27b5cc9
+MISC ChangeLog-2015 1093 SHA256 3b905dec992c2a4d5575b8c763c74d8e056e8ae1dcca92695be5ce661b61f595 SHA512 03358b60136b5abeb04a83a2fdd9a04d74a783d22d3ea8b95dc2c3b79f07b1179d678e67b27626507be1a7e2047be3e9350d05892ef1144031cadaa42dd9de58 WHIRLPOOL 3e79638f0e2d2e3c3ec2517ddb47e980d2863b6fb6f5e6d891f525cc44ed2aa717bfcb6808a688c1287aeaf96d4f5e62df0fbae61624d6710ed1b6223cd6d292
+MISC metadata.xml 395 SHA256 939544cee7ffbefb6292c09463e0795248899b2a8d0cf2ae7beff7e038c53cfc SHA512 604a83919efa9e0b8ffecc3e8edc7058b6d4a1c5caefde04f0494911417bdc390f1436094602f5cc11d2c38fc034c96c209f1406386c890b027af8aed8872454 WHIRLPOOL 45324cee5bce59883f665d477367f32bb33e8b7cddd05cd6cd01adf8189ac689f90d1f4dcb6dd1dc98294d3b0ba461b26026c3729cda4c9781b6cbaf6baf22d6
diff --git a/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch b/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch
new file mode 100644
index 000000000000..58f8639ea064
--- /dev/null
+++ b/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch
@@ -0,0 +1,111 @@
+From 164d39c1be66eb35b02fb7c30f65b5929c9e407d Mon Sep 17 00:00:00 2001
+From: Vijay Mahantesh SM <vijay@vijay.(none)>
+Date: Sat, 8 Dec 2012 01:55:24 +0530
+Subject: [PATCH] new support for opencv 2.4.3 added
+
+---
+ SimpleCV/ImageClass.py | 52 ++++++++++++++++++++++++++++++++------------------
+ 1 file changed, 33 insertions(+), 19 deletions(-)
+
+diff --git a/SimpleCV/ImageClass.py b/SimpleCV/ImageClass.py
+index a545b50..6fab39a 100644
+--- a/SimpleCV/ImageClass.py
++++ b/SimpleCV/ImageClass.py
+@@ -7610,11 +7610,12 @@ class Image:
+             new_version = 0
+             #For OpenCV versions till 2.4.0,  cv2.__versions__ are of the form "$Rev: 4557 $" 
+             if not ver.startswith('$Rev:'):
+-	        if int(ver.replace('.','0'))>=20400 :
+-                    new_version = 1
+-                if int(ver.replace('.','0'))>=20402 :     
+-                    new_version = 2
+-                    
++              if int(ver.replace('.','0'))>=20400:
++                 new_version = 1
++              if int(ver.replace('.','0'))>=20402:
++                 new_version = 2
++              if int(ver.replace('.','0'))>=20403:
++                 new_version = 3    
+         except:
+             logger.warning("Can't run Keypoints without OpenCV >= 2.3.0")
+             return
+@@ -7622,11 +7623,11 @@ class Image:
+         if( forceReset ):
+             self._mKeyPoints = None
+             self._mKPDescriptors = None
+-            
+-        if( self._mKeyPoints is None or self._mKPFlavor != flavor ):
++        
++        if( not(self._mKeyPoints) or self._mKPFlavor != flavor ):
+             if ( new_version == 0):
+                 if( flavor == "SURF" ):
+-                    surfer = cv2.SURF(thresh,_extended=highQuality,_upright=1) 
++                    surfer = cv2.SURF(thresh,_extended=highQuality,_upright=1)
+                     self._mKeyPoints,self._mKPDescriptors = surfer.detect(self.getGrayNumpy(),None,False)
+                     if( len(self._mKPDescriptors) == 0 ):
+                         return None, None                     
+@@ -7659,10 +7660,9 @@ class Image:
+                     self._mKPDescriptors = None
+                     self._mKPFlavor = "STAR"
+                     del starer
+-            
+-            
+-            elif( new_version == 2 and flavor in ["SURF", "FAST"] ): 
+-                if( flavor == "SURF" ):
++
++            elif( new_version >= 2 and flavor in ["SURF", "FAST"] ): 
++                if( flavor == "SURF" and new_version==2):
+                     surfer = cv2.SURF(hessianThreshold=thresh,extended=highQuality,upright=1)
+                     #mask = self.getGrayNumpy()                    
+                     #mask.fill(255) 
+@@ -7678,6 +7678,20 @@ class Image:
+                     self._mKPFlavor = "SURF"
+                     del surfer
+             
++                if( flavor == "SURF" and new_version==3):
++                    surfer = cv2.SURF(hessianThreshold=thresh,extended=highQuality,upright=1)
++                    self._mKeyPoints,self._mKPDescriptors = surfer.detectAndCompute(self.getGrayNumpy(),None,useProvidedKeypoints = False)
++                    if( len(self._mKPDescriptors) == 0 ):
++                        return None, None                     
++                
++                    if( highQuality == 1 ):
++                        self._mKPDescriptors = self._mKPDescriptors.reshape((-1,128))
++                    else:
++                        self._mKPDescriptors = self._mKPDescriptors.reshape((-1,64))
++                
++                    self._mKPFlavor = "SURF"
++                    del surfer
++
+                 elif( flavor == "FAST" ):
+                     faster = cv2.FastFeatureDetector(threshold=int(thresh),nonmaxSuppression=True)
+                     self._mKeyPoints = faster.detect(self.getGrayNumpy())
+@@ -7693,19 +7707,19 @@ class Image:
+                if( len(self._mKPDescriptors) == 0 ):
+                     return None, None     
+                self._mKPFlavor = flavor
+-	       del FeatureDetector
++               del FeatureDetector
+ 
+             elif( new_version >= 1 and flavor in ["FAST", "STAR", "MSER", "Dense"] ):
+                FeatureDetector = cv2.FeatureDetector_create(flavor)
+                self._mKeyPoints = FeatureDetector.detect(self.getGrayNumpy())
+                self._mKPDescriptors = None
+                self._mKPFlavor = flavor
+-               del FeatureDetector   
+-               
+-	    else:
+-                logger.warning("ImageClass.Keypoints: I don't know the method you want to use")
+-                return None, None
+-
++               del FeatureDetector
++        
++            else:
++               logger.warning("ImageClass.Keypoints: I don't know the method you want to use")
++               return None, None
++        
+         return self._mKeyPoints,self._mKPDescriptors 
+ 
+     def _getFLANNMatches(self,sd,td):
+-- 
+1.8.1.5
+
diff --git a/dev-python/simplecv/files/remove-failing-test.patch b/dev-python/simplecv/files/remove-failing-test.patch
new file mode 100644
index 000000000000..7ee326df02a5
--- /dev/null
+++ b/dev-python/simplecv/files/remove-failing-test.patch
@@ -0,0 +1,57 @@
+From d8abe3346d7aa2b192d384476d5f2c89ca9c70e9 Mon Sep 17 00:00:00 2001
+From: Justin Bronder <jsbronder@gmail.com>
+Date: Fri, 14 Jun 2013 20:35:11 -0400
+Subject: [PATCH] remove failing test
+
+According to the docs, the UserWarning that is raised should not be an
+issue.  Ignore the failure during testings.
+---
+ SimpleCV/tests/tests.py | 32 --------------------------------
+ 1 file changed, 32 deletions(-)
+
+diff --git a/SimpleCV/tests/tests.py b/SimpleCV/tests/tests.py
+index 94f4fc7..ce442e3 100644
+--- a/SimpleCV/tests/tests.py
++++ b/SimpleCV/tests/tests.py
+@@ -1731,38 +1731,6 @@ def test_movement_feature():
+ 
+   pass 
+ 
+-def test_keypoint_extraction():
+-  try:
+-    import cv2
+-  except:
+-    pass
+-    return 
+-
+-  img1 = Image("../sampleimages/KeypointTemplate2.png")
+-  img2 = Image("../sampleimages/KeypointTemplate2.png")
+-  img3 = Image("../sampleimages/KeypointTemplate2.png")
+-
+-  kp1 = img1.findKeypoints()
+-  kp2 = img2.findKeypoints(highQuality=True)
+-  kp3 = img3.findKeypoints(flavor="STAR")
+-  kp1.draw()
+-  kp2.draw()
+-  kp3.draw()
+-  #TODO: Fix FAST binding
+-  #~ kp4 = img.findKeypoints(flavor="FAST",min_quality=10)
+-  if( len(kp1)==190 and 
+-      len(kp2)==190 and
+-      len(kp3)==37
+-      #~ and len(kp4)==521
+-    ):
+-    pass
+-  else:
+-    assert False
+-  results = [img1,img2,img3]
+-  name_stem = "test_keypoint_extraction"
+-  perform_diff(results,name_stem,tolerance=3.0)    
+-
+-
+ def test_keypoint_match():
+   try:
+     import cv2
+-- 
+1.8.1.5
+
diff --git a/dev-python/simplecv/metadata.xml b/dev-python/simplecv/metadata.xml
new file mode 100644
index 000000000000..b317bb249d88
--- /dev/null
+++ b/dev-python/simplecv/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>jsbronder@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="shell">Enable the iPython SimpleCV shell</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">sightmachine/SimpleCV</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/simplecv/simplecv-1.3.ebuild b/dev-python/simplecv/simplecv-1.3.ebuild
new file mode 100644
index 000000000000..146b07ce85cd
--- /dev/null
+++ b/dev-python/simplecv/simplecv-1.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=SimpleCV
+
+DESCRIPTION="Python interface to several powerful open source computer vision libraries"
+HOMEPAGE="http://simplecv.org/"
+SRC_URI="https://github.com/sightmachine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="shell test"
+
+DEPEND="
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+RDEPEND="
+	>=media-libs/opencv-2.4.8[python,${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pygame[${PYTHON_USEDEP}]
+	shell? ( dev-python/ipython[${PYTHON_USEDEP}] )"
+
+# 1. FeatureDetector being called with the wrong number of arguments
+# 2. Remove test that according to docs shouldn't be an issue
+PATCHES=(
+	"${FILESDIR}"/new-support-for-opencv-2.4.3-added.patch
+	"${FILESDIR}"/remove-failing-test.patch
+)
+
+src_test() {
+	cd "${S}/SimpleCV/tests"
+	nosetests tests.py || die "tests failed"
+}
+
+src_install() {
+	distutils-r1_src_install
+	if ! use shell; then
+		rm -rf "${D}"/usr/bin
+	fi
+}
diff --git a/dev-python/simpleeval/Manifest b/dev-python/simpleeval/Manifest
new file mode 100644
index 000000000000..df142028e3df
--- /dev/null
+++ b/dev-python/simpleeval/Manifest
@@ -0,0 +1,9 @@
+DIST simpleeval-0.8.7.tar.gz 11654 SHA256 ea13bcbe38178eebb4d374cdcb6591e0cc281a63669c29c99a6aa4fec7640117 SHA512 7fef73e3b4d62e24048be164f156f19cfd844116fb9603ac88753b216b984f873babb351216ec6f96e29009fadcebd9c81f7e49f6577197c098e4f10ba2116a1 WHIRLPOOL f85124a0caf211b45b675de523ef3e32fae960a354f039f66bfb38f9356fbf70378e10ca20ec74701f6a0db3dc9a6e8689270d71f241507003158cb25ad076b4
+DIST simpleeval-0.9.3.tar.gz 14582 SHA256 6dafe47d4ccc062fa4fed50ce1b991d169aebafb68182e1a6fd7a048bd4892c1 SHA512 8f9dc5076da57e40388e3e247028cea7db7328c10d88047d68b36e86383209abd7c63e64fa0d64901f82dc4274825700ca7caeb0546e56a1a3a584237d7f8f1d WHIRLPOOL 579718dcc255f067d882c565e905c1948bd1bcd5c17f8803b1b7eaf0c35c4ba1e4178a387d9578ba83e10ab5e9c80748e0a084bbb98a3bf4789d39b7557163b8
+DIST simpleeval-0.9.5.tar.gz 16893 SHA256 2306c97328bd3ba97f662322ae5275e6e9bfba55ae7e164f9084a687d708aa69 SHA512 27e50b3927fa45045cd9d40bcc1959d0d456aacb5c080b490d305cef1a5785889cb151512f2eeace6ffebffa69d155b3495f3e16dbaad244d16d7486a3a1708f WHIRLPOOL 6f526c0b985f6aac25b3233fcf68e8bab2944b6d4925152fd9e677a1480e0f6430ddbef9f23370838e329c778214aeb3e6fe9fc5a21456b95aaa88ab3183b4f1
+EBUILD simpleeval-0.8.7.ebuild 521 SHA256 1b5ceec7c399fa3e9db9d043f5e171acb09f4c3f2f9b05715ae4675f71af2187 SHA512 932547b689f19c83a293f4d24a248a01759753d87e04b9a3446f9117b592163774c8ea8540d4d21647bb6fcd76eb8831f7300caee2697ca8c774504a51ec07c0 WHIRLPOOL 82b56f6b059c8d1e9b203f0888986fab43bd5683b30f5a4fa9eaead1cd20fe2ad3c071074f4fbc796b4e9119a3ad1170bce62d1ea512fbf5b42979575f5b1e98
+EBUILD simpleeval-0.9.3.ebuild 521 SHA256 f75859ff8ab5200717884b9986baa3754b3601c0754df8a779133b6c49566495 SHA512 056fcb74642f40a843ea0febe9829ecad1418bb44a949325fca7440ef4c55dd483f16b1b9db89a8e91ee8f4b702db9ca7fac1ea3d8708fbdc886646ed0bf84f5 WHIRLPOOL 5557f61edf5ed733676fd5a582a29b23dd5627024a3b9503eb94badae308d6aa749d20f0051d6c93ee9ef7c12062b683a4d8460b30490958984ed371ad81374e
+EBUILD simpleeval-0.9.5.ebuild 525 SHA256 e6e45afbbc3081e97384aa3fcbea680d9c814e39c976b557903479aaf8ef0d7a SHA512 65b3523cdbabd750c3de95a6d7d34a7fd3f73c436226833a0e564a988ef7e35aa52c638af01f613ba47f2a4e94ca5d9e14cf8343726de6212b2c1ba5a2e07742 WHIRLPOOL 1193067de91501c4204b95a07a0f632da62853596a83c99c956add3fba6a04356c04c0a1d7e44a9793093e90c530aa38281e71710340dce5185ba721da227a11
+MISC ChangeLog 3323 SHA256 d9945175654a8d8153f66cccb455bd5b8cf46a9f689519939bb90b0e5ac0f1b9 SHA512 5a3a670ee34685125f2d8f6dc0c8a4e352220e2c9919cc047dfcaa0e76756c41fe6428864ec033f593e465e6696fee8de01eca5e4836d17c85812b79586b8636 WHIRLPOOL b09b200ab39d6ba24a71c8ca288b4444765177a8632ca45bd1878ec94e5367045504bf988e0ccc7e42615e429fc36a657270cb8f424c787698cbee13e6d01a40
+MISC ChangeLog-2015 802 SHA256 3320ec6b79ecad9e6c0016425eda0c547d0de9d27106bea66bbfe57029cf0b83 SHA512 bbfc3b5194bd02e1aea5acf2ee134f0eaa7940c32087e1733c4e9207d57a0387db33db801b3660e276a24ec2e7cd190037f356fa0c74bb34370412bcb6c74b79 WHIRLPOOL a179ca49b9468d0ad804c3905f6bf23e0160bd38327ec8f332d6f88278d000329e8ad56b753d72f1a415856364ca146bf5bdf1926b2a3c0ef7d7cc5ed5474cc7
+MISC metadata.xml 483 SHA256 bd854f80225dc5f3411225a1c1b4f03fe1d81e3bcb4d8a9c9d7361070e3a185a SHA512 a2f3d2ad7fb0d4d887022003498692c18db8e4ea6de1f5c5eb2a10e48af624a887dc2a06d91a73023c17a2fadb52e30e9e14b9686f0c0d73b60b6fe35ac39222 WHIRLPOOL d104434993a69ed6d1c4cf1917d8a3d1726508a739d712646c25893e1cb1e08a114ba64876b49765ece63867b08660674a0f09306eee1563dc093e8bae8e210e
diff --git a/dev-python/simpleeval/metadata.xml b/dev-python/simpleeval/metadata.xml
new file mode 100644
index 000000000000..dd01d5037e96
--- /dev/null
+++ b/dev-python/simpleeval/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cedk@gentoo.org</email>
+		<name>Cédric Krier</name>
+	</maintainer>
+	<longdescription lang="en">
+		A simple, safe single expression evaluator library.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">simpleeval</remote-id>
+		<remote-id type="github">danthedeckie/simpleeval</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/simpleeval/simpleeval-0.8.7.ebuild b/dev-python/simpleeval/simpleeval-0.8.7.ebuild
new file mode 100644
index 000000000000..f9ef468ee78b
--- /dev/null
+++ b/dev-python/simpleeval/simpleeval-0.8.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple, safe single expression evaluator library"
+HOMEPAGE="https://github.com/danthedeckie/simpleeval"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS="README.rst"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/simpleeval/simpleeval-0.9.3.ebuild b/dev-python/simpleeval/simpleeval-0.9.3.ebuild
new file mode 100644
index 000000000000..88f0269569a1
--- /dev/null
+++ b/dev-python/simpleeval/simpleeval-0.9.3.ebuild
@@ -0,0 +1,26 @@
+# 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
+
+DESCRIPTION="A simple, safe single expression evaluator library"
+HOMEPAGE="https://github.com/danthedeckie/simpleeval"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS="README.rst"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/simpleeval/simpleeval-0.9.5.ebuild b/dev-python/simpleeval/simpleeval-0.9.5.ebuild
new file mode 100644
index 000000000000..dacb7bcd0b14
--- /dev/null
+++ b/dev-python/simpleeval/simpleeval-0.9.5.ebuild
@@ -0,0 +1,26 @@
+# 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
+
+DESCRIPTION="A simple, safe single expression evaluator library"
+HOMEPAGE="https://github.com/danthedeckie/simpleeval"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS="README.rst"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/simplegeneric/Manifest b/dev-python/simplegeneric/Manifest
new file mode 100644
index 000000000000..46bd8fffad77
--- /dev/null
+++ b/dev-python/simplegeneric/Manifest
@@ -0,0 +1,5 @@
+DIST simplegeneric-0.8.1.zip 12663 SHA256 dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173 SHA512 74c25d4e04fe197058cb43fabe3702cc5901989dc0b0bcf7511369f4f3d90fd98e4225174db0680c8f39389914f82824bdbdaf4c302b53998fbabbf0dba393e4 WHIRLPOOL 6aca8477513ce67c97d5e172a1e2445eb89a44c936733b2f6493cf5876b104bcd992617602713dba85d81539ddd1b8670991f482ae0a6ff963753699a047f8e6
+EBUILD simplegeneric-0.8.1-r1.ebuild 621 SHA256 52323081ee940024e605c3451cdc22b255e3a8663c39d221cb0da0ad9962fa47 SHA512 3867da758ee5f00d5409adb51c390f0a29f232860a86be2d13d1177a8440f66bc1117bd7ddcb24f8f1a2c5abcc40f570283bd6cb213fe04c076ae0a91805ef90 WHIRLPOOL ebcabb94ab7530a5aec3c07a52b278611c77078b96ee6b42255c78e5f06d5c04bc26f0270a06013bd8e7a5aaca44013009a0ff0cfb62e09d2882c6a563c5d1fd
+MISC ChangeLog 2929 SHA256 e1d87446ea5f9765e5413dc02285b1dd2d4d8283e7767cb659644a2606646d62 SHA512 a374996640890e8a0b8fab04ded71c413487b80b36b610584839607fc66e5371488a7c8448445556f0d6f7fcba321df30611ae52fb9a729844f88e2b33675d4d WHIRLPOOL b0907270ea7648bbdf2116f80b4eb16c4bc908f736f0f5fe6d48c548dff75d07b3eb232230f45011c1411ea7541191f6dee3bf46b10847321d354269a053d91a
+MISC ChangeLog-2015 2922 SHA256 1b224df02aff3452165ccf0b717bed72a6036be2903dbcc177e008b192678ea2 SHA512 1b798372485884121e32c93285a20818185c7d39e3332e415f195426d7287476b27f5a69d0445f5ffe1054da43560d2ab61e4c811d8ca1b74d3dd28a6ec2c6d7 WHIRLPOOL 432503ede5158d58746fb7ac478ad98730b11be5d29288d50af5681c5ca2ed60a026741318784e084fdca29e889f7abe19e1ac1c460256f8b8c768b569d8bf11
+MISC metadata.xml 727 SHA256 ef054ed8e9c454b413cae8ce61c4b17d3059840c961bb60f0e24e9570660062c SHA512 e7fcab45db6af1ea1b814508e933d50a96deace17076a1010c99a54b248fd566e9f718e2782c00b1a45e1a4d5854d7428d9cf8450b9e718f6e32953ae31aec83 WHIRLPOOL 1ee4819225b7e43e304bedcb59a399933c83fe70f761e519ee562e77f08c6d43a5ba60fb4b3714baa1dd2fea3e902786fa468a81b84586a39fb6febce93778c9
diff --git a/dev-python/simplegeneric/metadata.xml b/dev-python/simplegeneric/metadata.xml
new file mode 100644
index 000000000000..f08c902ec6b2
--- /dev/null
+++ b/dev-python/simplegeneric/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>The simplegeneric module lets you define simple single-dispatch
+  generic functions, akin to Python's built-in generic functions like len(),
+  iter() and so on. However, instead of using specially-named methods, these
+  generic functions use simple lookup tables, akin to those used by
+  e.g. pickle.dump() and other generic functions found in the Python
+  standard library.</longdescription>
+	<upstream>
+		<remote-id type="pypi">simplegeneric</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..3f5962302f11
--- /dev/null
+++ b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
@@ -0,0 +1,26 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple generic functions for Python"
+HOMEPAGE="https://pypi.python.org/pypi/simplegeneric"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
new file mode 100644
index 000000000000..c72ac3fe6c0d
--- /dev/null
+++ b/dev-python/simplejson/Manifest
@@ -0,0 +1,7 @@
+DIST simplejson-3.10.0.tar.gz 77953 SHA256 953be622e88323c6f43fad61ffd05bebe73b9fd9863a46d68b052d2aa7d71ce2 SHA512 c8782fe434f3f1e29562092fe81f46fc272f0b83fdb3ca31fc03707fe09f4d30696ad7ec07a33de873bd08a41b19f97b9d09e3079658952e5110cf8f68eb53c6 WHIRLPOOL 53458b102f64e2fb841bf8c57b56bc0f9ded3d968eecad47ab184eb17be35ff2574ea8abe70867438e46f3f946afc17f7ef9cea3b66d300355e879531dfdafc1
+DIST simplejson-3.11.1.tar.gz 78145 SHA256 01a22d49ddd9a168b136f26cac87d9a335660ce07aa5c630b8e3607d6f4325e7 SHA512 f4cdb6a77b39d099630e1774cf8bf33b9d138f69d4e766bfc70fb710e24ace00d7a92b4b30b3047e361212a030864055b9de4cc5f78d231cffd930284b209377 WHIRLPOOL d9d5e9e4fcecc8f11b334e48502b258016a09e4b794bdf91166f06f22dec1da78bdc1931f1e42eb5e3e843f49a1e2204dec7a3dc104871958107c22f96c81a44
+EBUILD simplejson-3.10.0.ebuild 874 SHA256 8a482f6f49c6075a04ca72886d080859ff0fac934df806a5633f11b1ece89c59 SHA512 726a6de9c147987a57f9c9378c1815b0f7ee66395e09baffdc15e00619a2ce6bbfece3b7b24fda4900002e877a84b08b1770655b8ac801dafcd709968d306ac2 WHIRLPOOL d05f481352c6a9b28fe6b55d733467c49619b2d32c02ef5242226fe35df000c7bc3a68b52021f68b3e4a99b5ad1c5f81caa07521ebd8b7920876d3645380305c
+EBUILD simplejson-3.11.1.ebuild 884 SHA256 e0a414108d970a67e5294de6a3f3ad5c2b3583d760b77ad5f03f0093441a3405 SHA512 1bc29bebf6acfa9abe94b3fd5bf25e043dcb952336fdd202d0d35e8cf80fd7444a7c8bcbff74d00bc609a124d82dc54d9700fd2f7ee7dc4dcfabd9d04311e8b0 WHIRLPOOL e7fb756c912f7be316963ba75897ef49c841363ef9c7b698add77aa2534d3a002957674fb40f05b9ca4e2101f95bfd5eac735134da6f5fbf95787463dd777ac1
+MISC ChangeLog 6088 SHA256 91b20329601d757ddf56e50a9521a3a8ea11c05d282170eb395bb172f36a2074 SHA512 2190af7c271646d6174e4c0cd74c3659befb21f328d8ee38343f1672ef0bc3d5f32faf8481aa13e558f086e72c49bd31eedb99aa20d73dadb48685483e3b039f WHIRLPOOL b33ccca86a1ef76f9779d32e46cb94acfa6e852c6f77d82047e46e65e52be012a13bc2d186286be281f87f3a01da2023eccd23f9bd07dd5680d9c5892d598abc
+MISC ChangeLog-2015 20012 SHA256 e39d4c6cd4cd924788d2bd4049fedd1b381afcd33616a7895d9cdf02f65e7345 SHA512 9fd0346a823a3c1ae7e67455b7ef6ae3feca5efcf28d96415cc26e7bc33da53e9c9c1a08427b700341c0745a4466dfaa7bf03630a5131ae0e45bd85b3fef2240 WHIRLPOOL 8dd15b3b94a879cad184e28e4a5a8d5c88c6580408f4a4fa5e36d7fb9c1c717d8d8cc1e6298911b0c8fc0d5196f9781df91f26f6edacb7ef566fa5db3208953a
+MISC metadata.xml 323 SHA256 6f1563c9361d4418d81507f4bdd861fcbb2114298178840a07e9bba23335ea0a SHA512 7db760ee80a6281bcc370303bafc40aea566465bf3264381336222c6f6002f573bfac205f2e42cca557c7b31855f082e1ed29ec9ab3b1125e455cf84bdaf54ec WHIRLPOOL f03d961cb2dd5366d3280d1edb1b4df127ad2ce83ea55b31650e7e8a6c4c997b3d6e138ed2ef13dfe9fbc27797e66342fad7ada6ccf279663f87fc2372948776
diff --git a/dev-python/simplejson/metadata.xml b/dev-python/simplejson/metadata.xml
new file mode 100644
index 000000000000..a074e88efd6a
--- /dev/null
+++ b/dev-python/simplejson/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">simplejson</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/simplejson/simplejson-3.10.0.ebuild b/dev-python/simplejson/simplejson-3.10.0.ebuild
new file mode 100644
index 000000000000..84b7013548e3
--- /dev/null
+++ b/dev-python/simplejson/simplejson-3.10.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
+HOMEPAGE="http://undefined.org/python/#simplejson https://pypi.python.org/pypi/simplejson"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( MIT AFL-2.1 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( README.rst CHANGES.txt )
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/simplejson/simplejson-3.11.1.ebuild b/dev-python/simplejson/simplejson-3.11.1.ebuild
new file mode 100644
index 000000000000..63006c9caf2e
--- /dev/null
+++ b/dev-python/simplejson/simplejson-3.11.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
+HOMEPAGE="https://github.com/simplejson/simplejson https://pypi.python.org/pypi/simplejson"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( MIT AFL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( README.rst CHANGES.txt )
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/simplekv/Manifest b/dev-python/simplekv/Manifest
new file mode 100644
index 000000000000..03c385dfcb3f
--- /dev/null
+++ b/dev-python/simplekv/Manifest
@@ -0,0 +1,11 @@
+DIST simplekv-0.10.0.tar.gz 16142 SHA256 61ea1b6deba90c459b2b886598a86af324f7182f90f9f9b85a02f6a017618915 SHA512 58cf95e963631d11f55fa654e3a536ea5ce3deb8f9abefc05c2eb192fd87cd7cc5ff54d17da3651289d4fe1b7e827f82a27ee77e62df87e7f0b5a39f4067389d WHIRLPOOL bb5f2dc027ca363f1501c5c25c04281d4001807aa5dcda359410e147a387650c06e416b58b008f6ffaf4f176086026a5ed93b1764753a5b5ff26a79c9e8ac4b2
+DIST simplekv-0.11.1.tar.gz 19286 SHA256 d7a34c7cca226c6f8545f10563b88519dc1be3581e5f56b5ebeb01a1343d42c6 SHA512 ad9fb57fea115ad9bdcfd1b2aba4ce1adb3c6b36f859527a311ec0f281e915db4c145d33217e6966b527a81e3f2912e63d5be9b9af0640adc77f3f519b1e1c66 WHIRLPOOL 655b6a33777e62906d40b1273fc688e9e737dae6685c0009e4efd85376d12079592c00f88775cc6f2b7a89b1ed20da049e8b1e166ba918a8b282824b87d545af
+DIST simplekv-0.11.2.tar.gz 19325 SHA256 d1a62057e3184bfdde71271c22b714659bbf69164ec72fb3ba10d5a02438ff88 SHA512 73846870068e260bf44a716805e89184e68a7d348b3b3e47b4f6ac46e541188bffb6e37485cfe82a2b5f4eb0fc61391042d82a709cc25ce9b16853ebe9a4ae95 WHIRLPOOL 60d626174937976c20302ec8e7ea2c50fdc065da92e86c7f8fc9a9fe7f6f5f7b28c3db35688f488545ad7e685d4ddb21453c5d6bb1805d2eccb28b31ca8e4a00
+DIST simplekv-0.9.2.tar.gz 13750 SHA256 448608199a9f76a25529005b5a28a4e548afd623e2b7109563b9ebe6ef4f3aac SHA512 cfa17cc0920d4a0513c56443c30ed07a77130f689d71130a058e2a46a5b9dbfc22b1fd21d6fee973fc00242c6b9391143a4db91f9c1937ea7f64daa898a8f045 WHIRLPOOL 40f62efaba344aed99b3e6bae80eb22021a93958654a2fe2d881ece808a93f830923fbd2f00d96adb46442d6bcf3c66a71fc805a49f46e331db10df24c1b2621
+EBUILD simplekv-0.10.0.ebuild 462 SHA256 1488f15e98e31d10c950865b1528fcade0a16801ad7dbcafbec625a7f82c3df6 SHA512 dc865254aaef5f98054479ae2558a52c9de00e17f96caf03d3033023e5408cfaf7f4d9657f40e8eaca39c7e5a08edf0adf40677447e4b929418cca11015dd16d WHIRLPOOL 1e4ef00503fcb0380796288be5462072f966bbc0f8d2ffbf2791b81d29d83fc32d3d2b7731c09abf45bb457905c5cec714a611d4e784f306f697786bef51687e
+EBUILD simplekv-0.11.1.ebuild 462 SHA256 1488f15e98e31d10c950865b1528fcade0a16801ad7dbcafbec625a7f82c3df6 SHA512 dc865254aaef5f98054479ae2558a52c9de00e17f96caf03d3033023e5408cfaf7f4d9657f40e8eaca39c7e5a08edf0adf40677447e4b929418cca11015dd16d WHIRLPOOL 1e4ef00503fcb0380796288be5462072f966bbc0f8d2ffbf2791b81d29d83fc32d3d2b7731c09abf45bb457905c5cec714a611d4e784f306f697786bef51687e
+EBUILD simplekv-0.11.2.ebuild 462 SHA256 1488f15e98e31d10c950865b1528fcade0a16801ad7dbcafbec625a7f82c3df6 SHA512 dc865254aaef5f98054479ae2558a52c9de00e17f96caf03d3033023e5408cfaf7f4d9657f40e8eaca39c7e5a08edf0adf40677447e4b929418cca11015dd16d WHIRLPOOL 1e4ef00503fcb0380796288be5462072f966bbc0f8d2ffbf2791b81d29d83fc32d3d2b7731c09abf45bb457905c5cec714a611d4e784f306f697786bef51687e
+EBUILD simplekv-0.9.2.ebuild 447 SHA256 db6040799a62ad137a20ebd02856fa9f9e7681f0831eea7c6501de27f13487a6 SHA512 348c87cc0280d4877f7d08c21a0db437996668a7392cc5c91ff9f2a9c9c0ad0bca2afbb5b9cb2734349cc29f49361f9039796e44fb32023ab97a536cffffea8c WHIRLPOOL 3a73f6633d068fcf8d4a78b462809c3a655c2d9e705a0e7a3ee6d16f5fb09eff37b6ed8e7d5d2f2d38c2888c85694477eadc5367c646ee161f13535efe542f62
+MISC ChangeLog 2662 SHA256 cc927f74ee4be9dec5c1414e629f08752c4f86d574fdb5594c0e7ed177fe6dee SHA512 cfa6090cfa812136c7a8f4d82d430940707e6b389ffca99b2bc43c7bbc434506ed81bab6916db548d836fe37889e71db966ffc2748a3dc5dd6b4697e89fabce4 WHIRLPOOL f0cc4cc9f50bec5efa95122a0d0b490b9b30ba5b7d6d1d7bde6a99ce6fac3388181e465c2245bd4b2b1d7b7b8bbd40db401e83cadd611f202f87e2a07730ae3d
+MISC ChangeLog-2015 783 SHA256 ce14efeab9ee74a7b10a60855e9d02209a3db3b1c00af88e176705e541a13dae SHA512 0b2e6c0948c1fa3fbcf7d19e1bb784fde1595000125d50c32107ebf6b6b09a60c728be8621e1a0e54c4a05b23a03efa12d66b573fbc964a6361ffe21182aee92 WHIRLPOOL 4f57a866e37c8560304d7dfd05ca9c986fbb7b51f6e79e0f14c7f7e5c14e3dcbea335b63ca691d361a2c3cb98b307cdb0220979189d9ca4c77efbb2c0078dfbf
+MISC metadata.xml 569 SHA256 2ab78748c1dd13f152df7d2a388c528ee45d29981ab495aa6228dbc80ada4e1a SHA512 15775631b85b66248deed75545717ef7ccc4c2426851d651ddf29fc8fa9a225bd139415a43ce068510c323c143c1fac64e8ee143a0fa3a4e53827f7c6b82f7c6 WHIRLPOOL df19208fe77ae1fecf488a55bd740d8c846b07d9f33723cded51707343b0fdc821f9bf2a36d60795905a18e03ba75eba6e8b0401ba2e94576ad433cb256b2e96
diff --git a/dev-python/simplekv/metadata.xml b/dev-python/simplekv/metadata.xml
new file mode 100644
index 000000000000..de64c905abc8
--- /dev/null
+++ b/dev-python/simplekv/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+    <description>Python team can take the package if they wish.</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">simplekv</remote-id>
+    <remote-id type="github">mbr/simplekv</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/simplekv/simplekv-0.10.0.ebuild b/dev-python/simplekv/simplekv-0.10.0.ebuild
new file mode 100644
index 000000000000..8f596d13dff9
--- /dev/null
+++ b/dev-python/simplekv/simplekv-0.10.0.ebuild
@@ -0,0 +1,19 @@
+# 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
+
+DESCRIPTION="A key-value storage for binary data, support many backends."
+HOMEPAGE="https://pypi.python.org/pypi/simplekv/ https://github.com/mbr/simplekv"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/simplekv/simplekv-0.11.1.ebuild b/dev-python/simplekv/simplekv-0.11.1.ebuild
new file mode 100644
index 000000000000..8f596d13dff9
--- /dev/null
+++ b/dev-python/simplekv/simplekv-0.11.1.ebuild
@@ -0,0 +1,19 @@
+# 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
+
+DESCRIPTION="A key-value storage for binary data, support many backends."
+HOMEPAGE="https://pypi.python.org/pypi/simplekv/ https://github.com/mbr/simplekv"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/simplekv/simplekv-0.11.2.ebuild b/dev-python/simplekv/simplekv-0.11.2.ebuild
new file mode 100644
index 000000000000..8f596d13dff9
--- /dev/null
+++ b/dev-python/simplekv/simplekv-0.11.2.ebuild
@@ -0,0 +1,19 @@
+# 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
+
+DESCRIPTION="A key-value storage for binary data, support many backends."
+HOMEPAGE="https://pypi.python.org/pypi/simplekv/ https://github.com/mbr/simplekv"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/simplekv/simplekv-0.9.2.ebuild b/dev-python/simplekv/simplekv-0.9.2.ebuild
new file mode 100644
index 000000000000..02d166f1451b
--- /dev/null
+++ b/dev-python/simplekv/simplekv-0.9.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A key-value storage for binary data, support many backends."
+HOMEPAGE="https://pypi.python.org/pypi/simplekv/ https://github.com/mbr/simplekv"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/simpleparse/Manifest b/dev-python/simpleparse/Manifest
new file mode 100644
index 000000000000..2b178fdb5419
--- /dev/null
+++ b/dev-python/simpleparse/Manifest
@@ -0,0 +1,5 @@
+DIST SimpleParse-2.1.1.tar.gz 207078 SHA256 2f1393790dd7b0af9775bd9c828430ffdd8bccd6227783c09e835e1aced415d9 SHA512 b0a46b8b708ba711c81f739177d7df3814dc7f0ba3a0a7e4ec9b9ade045f1ee90dfdaf76de96306c490238b901275adafbff4efdd2ab46d7a78bf9082c2da0a8 WHIRLPOOL 31a27f533942f07324684969fb8a6d687753b7f105942c7a7e660f670ed11b6009b62c56d4ddc7e2933bbb82f0b1f75a5db1d5748744c45f04f2006696a76e93
+EBUILD simpleparse-2.1.1-r1.ebuild 889 SHA256 bfd2b6b4f2b52b5435e743f148408636ee7cc2a2cf48210ba34cd03538a33927 SHA512 e194e6a86f472f278349769fbd6b541fce09e3d804b706eac107774ca7198782ddb1b29033755feb8e64a986355ab061807a400f52d5eb5926b71a765875cc37 WHIRLPOOL f25b112658c74d2b87c8ec4c1eebbae76f228ad6ffd348080b691c39e69471f9b0502f8ec22455b433091dc4edf9a3d12d7a5e73bac742743587e17b30846d7d
+MISC ChangeLog 3726 SHA256 ebaed3137d6b2ce2b536b677ba45c3c098cacc711e15e79bb3fb1d4e1c1aba15 SHA512 f6d66369489ddfb46fbb8ca075ae15ed2cd231b76be521ae219f336fe128fed36a14474c662d70a378fd44f8040a4014aa4a4133282afff0660f3d704b189ec5 WHIRLPOOL bc20fc0865b491a0a834b47b9c469d5e5e9f81ac0e888b544e7a36ae7067fc9cf47692c6915dab73f36a97174769c5ea335ec37909af4b79dc289348e43d2e45
+MISC ChangeLog-2015 5267 SHA256 a3b5377b6ba7f130a36315624091a314a1195abf91cf0ddc10dd6c026f1b99a4 SHA512 c356ff1535ed2d07ac8fc6f51c8164b2cc54cddfbba8e46cf23abc1127c34ab08832ceb479619339ce8c495e1cee6660ed89fcac6f164a940d1af9343a6741e6 WHIRLPOOL b0abf4d153770a4a54a1fdaf77fd8343dcc115071dbbcaa69617f93fe63025457aa71788234a29b37a4e3f619d4805f1e930bb704927ba7a85e9b31fe7a025aa
+MISC metadata.xml 370 SHA256 bdc405bee1ddb2cf9d87fd19c0cb78a19a1b9aeaee9a79c22295d3d237f25c09 SHA512 0877167d21e0ef79140c4bed17510462a6cf1f22bd768fe7159a8f73e520c64f55296ba0f15e9c62ceced53b3c75cfef8476e044e65f1c19b3b1e1172019c97a WHIRLPOOL dae1c09a750e7f55f9bdc5a17fe775c7e8795646530dab15ff3144c0e233bf1f16d93b138d0e3e25e3cb698255534b880237980a69347a2f48c977240a9c2b27
diff --git a/dev-python/simpleparse/metadata.xml b/dev-python/simpleparse/metadata.xml
new file mode 100644
index 000000000000..011e63f9fbe0
--- /dev/null
+++ b/dev-python/simpleparse/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">SimpleParse</remote-id>
+		<remote-id type="sourceforge">simpleparse</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/simpleparse/simpleparse-2.1.1-r1.ebuild b/dev-python/simpleparse/simpleparse-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..fb5234006edd
--- /dev/null
+++ b/dev-python/simpleparse/simpleparse-2.1.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=(python2_7)
+inherit distutils-r1
+
+MY_PN="SimpleParse"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A Parser Generator for mxTextTools"
+HOMEPAGE="http://simpleparse.sourceforge.net https://pypi.python.org/pypi/SimpleParse"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="eGenixPublic-1.1 HPND"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="doc examples test"
+
+S="${WORKDIR}/${MY_P}"
+
+# tests segfault, bug #454680
+RESTRICT=test
+
+src_prepare() {
+	distutils-r1_src_prepare
+	rm -f {examples,tests}/__init__.py
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	if use doc ; then
+		dohtml -r doc/*
+	fi
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
+
+python_test() {
+	PYTHONPATH=${BUILD_DIR}/lib python tests/test.py || die
+}
diff --git a/dev-python/simples3/Manifest b/dev-python/simples3/Manifest
new file mode 100644
index 000000000000..cac7ba833433
--- /dev/null
+++ b/dev-python/simples3/Manifest
@@ -0,0 +1,5 @@
+DIST simples3-1.0.tar.gz 14630 SHA256 2f3d3ef5a691741a489971e292cca2fd69bb11937b542bd1838793da2014f0fc SHA512 3f715eb9dc7cae22f0d08e01599d15e33f5f52441d17a85b6017c15bdfeb125d473ef0d0f19de712f7d09d4127f71e423adc6aaeec461c32fd7568e9ed4c7e54 WHIRLPOOL f0a32d367cf3fc208d0cd6b6254c6bba96dcf8d3ec90350595f468d4254429b3c30949643ab0d17ad9d60e80e01a1f0c956deb42d74ea59fe8e7b13a7fb52000
+EBUILD simples3-1.0.ebuild 740 SHA256 6b70c0c2b63cf3da08df912868bbb4962ba630df25b2c8f861a8cd896f0d6657 SHA512 8470223c9a40ff42016e984aad73a1944b6357bdd1b0e9d66bce8ce221db8537c2914d7add5b776ea639c730d8cd17d0ab81c22b0bd0ed78e0fb5b5eecfbff05 WHIRLPOOL 40ea3efd68566a7c1af61096d070b88b68b75efce2eb80da741633a034d4d1c5b3d1d83aaf7bd2e716689b81450a96c6ebdc94d3060091eecca578e7034245c0
+MISC ChangeLog 2570 SHA256 a7b14392275465f024bb5529b4456f0aeac0482c8b651176170fa3490417f6e7 SHA512 f5c0fc5c1fc722786f9ca86855a7d962188a145a7bd947ffdfb11e222165ceb80b092426adad15b2aae0d3326a10081923ad4b5c149f1d958186f571abfaebbc WHIRLPOOL 3753a2cd73732d8c5be004d4c217b021c96dbc8294f7a901663a2e6d77ab0bb8961a66266f6086845aefc60703de5a24430c84088f5155e3f16e0ed9ca0d2d28
+MISC ChangeLog-2015 2038 SHA256 46076b59e1dae7977252125f77889460a1ecaaea41d1a0d22b856e96ef953440 SHA512 2f2f725ede2ff603d9b0e06100c7854951b67cdfb11d110052f68adef7f4619595cc479bfe16ef0f7dff09aa54babe47a9062980dc603e904765bf6e7b4795be WHIRLPOOL f99723895eb06673f213523d0accd0d60aefcdce1f8c32ca7e839147545243636a660f6f0c251913a7dfc883abb39deb57693fe45aa92b9e535d7c5a46e48826
+MISC metadata.xml 598 SHA256 86b886b2d6e2e05372afd9bfc7dbe7c7dd55550f3361e09e5efb1f1d8c81e63b SHA512 c4328ef370bc37d860879c7245bb4ad3165bf0da8cf031674457e395c2fabc30a298b3855b093e5761dfd71fb3dde7a680aa48d5629b1df929e83717ceaf6997 WHIRLPOOL 8df0ce515a93f6a4b927980faa2748dcc36a1872ba173b9ad63587aa5f1f9c3baecd1b7dd7f02fc0166533ea80a2bb52d98587135b851ebe9a944cd456685e39
diff --git a/dev-python/simples3/metadata.xml b/dev-python/simples3/metadata.xml
new file mode 100644
index 000000000000..3f9f9ae5d1a0
--- /dev/null
+++ b/dev-python/simples3/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bugs@bergstroem.nu</email>
+		<name>Johan Bergström</name>
+		<description>Proxy-Maintainer, assign bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">simples3</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/simples3/simples3-1.0.ebuild b/dev-python/simples3/simples3-1.0.ebuild
new file mode 100644
index 000000000000..5ca55e95ada0
--- /dev/null
+++ b/dev-python/simples3/simples3-1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A fairly simple, decently quick python interface to Amazon's S3 storage service"
+HOMEPAGE="http://sendapatch.se/projects/simples3/ https://pypi.python.org/pypi/simples3/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+DOCS=( changes.rst README TODO )
+
+python_prepare_all() {
+	sed -i -e "s/setuptools/distutils.core/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/simplesettings/Manifest b/dev-python/simplesettings/Manifest
new file mode 100644
index 000000000000..86052bdbdbe9
--- /dev/null
+++ b/dev-python/simplesettings/Manifest
@@ -0,0 +1,5 @@
+DIST simplesettings-0.5.tar.gz 5998 SHA256 477096c53a6f9a6287232a626cec65011bbc550410b2624f4fe6d80bf241486e SHA512 7d7fdfb827dcf86558560b96594016896b9c62843509acf4fb47b8b669e12bb3cb3093eb65312198978c1ace689b848c251f1943fa9fc9952479618ecc9658b5 WHIRLPOOL 19fd7d581e98e139d63e614c0b02bcab37c774cdee9b0c3fcd05ee88fd0ee3870ba4e0811b2d7fed87151a40d6385c2b9c8647ce2d5b1ac3507532c6a619fe11
+EBUILD simplesettings-0.5-r1.ebuild 441 SHA256 d8911823283d1fb344cb8a73c136fbf567574d337c098dd4ecd4fcc83f388dcf SHA512 5c44961bf98f7e2abcba753af3bafd5295f271fbd5b24e882f5d229ff62a2505a62533df1bc6f116feb539d5af56cdf2d0c547cd717e93e279069ec9f2e9e3aa WHIRLPOOL 023e150652e23fa75b3a9bdbed97032db1ebe1e3a022ab9093dc5ee25fffd961ff6bfc2c007f3a310864e0ea8f331803d59d397863c0749194922fa201744e34
+MISC ChangeLog 2603 SHA256 941a163b86bf34d3a28ea801dada6544d5dc7437f9e966b2180e1e84082af2f0 SHA512 bf45d11f7077e4d9389ef175fe55bb94669b882d1dfdceec31ae49424069a656e0b4a3f07d7701d301ee842a9375ae0c22b92c0df0a856e016aeddee3690b893 WHIRLPOOL 353f79e5a3afe3c93c2a207a7a4b3a65b18bc3fa7949068456a918a4e2652d07f65df583d1b746939964a0335654ed392a19691409567a6f7e6f3eb574be0fe4
+MISC ChangeLog-2015 954 SHA256 2e8d876dd5aabf28f2c9db9f0bbe20e7b9bd4c9d662a607e3a1b76f0b28f5122 SHA512 5092ed29be854645e89d924b13096544785b6d9270f7357ec5874786dc9698f5ef1e7e35ad8e44ef954f28f89a0bcbaa567de5525d1a6ea60b10adb5ff31874e WHIRLPOOL 6585513938cf198ee88dc3aace935e9b63d9356909abe3c19d4242aa4d6d477cc52841b044c2c486ff4ff3939e5cd34709c8c416435b6234c783acec574e4dbe
+MISC metadata.xml 317 SHA256 404d4a703d0c8084ec1f09c9b1c28100c21321232bc35ca7ae22320ff41e963f SHA512 2e4c46a1ecffd587f5ffd0794b435cd3e9ebb69d8e5dbb57253bfe488c2d96868084934fff752bb3627d4efabee377ffdd4a2a8cba35c1a4ffb97350d59cf2a7 WHIRLPOOL 76c376e44734341ed2378a2710efec2ad3087c008d1dd5d2b5ce4ef429fdf44c003ed7fb725093afa1a2c251bcf79dd330094fb66b39b857236362b1d301b473
diff --git a/dev-python/simplesettings/metadata.xml b/dev-python/simplesettings/metadata.xml
new file mode 100644
index 000000000000..87631f147a0f
--- /dev/null
+++ b/dev-python/simplesettings/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">simplesettings</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/simplesettings/simplesettings-0.5-r1.ebuild b/dev-python/simplesettings/simplesettings-0.5-r1.ebuild
new file mode 100644
index 000000000000..9e33251a2b64
--- /dev/null
+++ b/dev-python/simplesettings/simplesettings-0.5-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple settings initialization"
+HOMEPAGE="https://pypi.python.org/pypi/simplesettings"
+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}]"
+RDEPEND=""
diff --git a/dev-python/simpy/Manifest b/dev-python/simpy/Manifest
new file mode 100644
index 000000000000..fe9aa49b60e0
--- /dev/null
+++ b/dev-python/simpy/Manifest
@@ -0,0 +1,5 @@
+DIST simpy-3.0.8.tar.gz 402664 SHA256 e127921510773f7b6189ab3596362809a37b87b7c2ae298b29ba3a6cca03e677 SHA512 c8c468ab60da1b357a1c62ca516a0cce51c6941f7b7795ee57c905cd8457f5614c5ff1f6d7586c0b9d9148e03251fd4f77b4e2c3c3d438e532e49bc4583fb08b WHIRLPOOL 736b72632cba64f419512fda90565bfe912c120f9bd9647bbe0446d926485819c760c51594e68d6d410f95fbce99ad7a27687cb607030864459cf53ed64036ba
+EBUILD simpy-3.0.8.ebuild 948 SHA256 dff70d537467d4dd85213a37d1c8c19c9d741bfe3d523a4bd80e6ef7e3afd737 SHA512 7839cd5858c1edcb75c1aa838c941d8c126bbfa2cdce623ce4a9bc74fd7dfb1b9ca0fafdae2636398dc14f99eb8f51a0eb0581a809895b12b7220ee98c4d399f WHIRLPOOL 2054f1dc8dbb34c1a7579057262207d0d265a217bd67c5d84d1e1d5cd8e6526d161246385fdafcefe0ba57ab1ac70ff2cda9c53e4c74f523850d571248a8f8e7
+MISC ChangeLog 3642 SHA256 ac1af8ba78f2204fc76d0e6a90319d265bb17b44665b16de8f9ad466d2709a40 SHA512 8a5fd7bc4ece602900ba72d374e7fa2d7495d93d1298ea77f9481ba53e8a092fe2e1bcdeef508ba1aa7cc9d9b743da8dbddc50c090ed233f47a9497064b73c57 WHIRLPOOL 0111525d3fb2cd1afdc35f0f4177b654bc7abf9065e451070768e3023f272d64715eb8af8ab4adf032a85811a6e8e2f11d3816ac151c9f05c7bd71248405615d
+MISC ChangeLog-2015 1905 SHA256 c3ee84b34eeb3d09aea9a488ba1a986b8dd4bf302724aaf6bd8323845fe6ef12 SHA512 538eced6b1fdc159c7aaf782d452e0faac611bb8ef101f9d08b16e97794abeda38e1ac8075916aa710e2d93b5731a4c2abacd6a5d5c203931d7bb446ae3c90a8 WHIRLPOOL 3ec717fbe260a45bba81d6df01e24478d40d1d0e2393c3d2ece7f0574b6a800740d61d2cd91a91eba02f9ea616ec748597d3d0b25017026df59ee72a001c7064
+MISC metadata.xml 383 SHA256 2e3fad3e9453cb4a14be7961b5c2825274e42cd4fded3fcad8b39cc24e584dc4 SHA512 fe339084efea01b5fe7375a1fbb2a8c21105164fea3881de4b5499771d6c649f6cbadde20cca9d02050d8a143311d2bcabea48dc30bd518e7e3ff2bb2f1ab169 WHIRLPOOL 6b477c2ace3e5a1ee807f1b10d578aca071357757581d33ca35c54df0199bd8da9e285c32481f6a0ccd82b7219146d038d3252b9a8d81e542534984f7f35f4ea
diff --git a/dev-python/simpy/metadata.xml b/dev-python/simpy/metadata.xml
new file mode 100644
index 000000000000..0cfd86e00cf2
--- /dev/null
+++ b/dev-python/simpy/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="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">simpy</remote-id>
+    <remote-id type="sourceforge">simpy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/simpy/simpy-3.0.8.ebuild b/dev-python/simpy/simpy-3.0.8.ebuild
new file mode 100644
index 000000000000..7dc2e14baec0
--- /dev/null
+++ b/dev-python/simpy/simpy-3.0.8.ebuild
@@ -0,0 +1,40 @@
+# 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} )
+PYTHON_REQ_USE="tk"
+
+inherit distutils-r1
+
+MY_P="${P/simpy/SimPy}"
+
+DESCRIPTION="Object-oriented, process-based discrete-event simulation language"
+HOMEPAGE="http://simpy.readthedocs.org/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -vv || die
+}
+
+python_install_all() {
+	DOCS=( AUTHORS.txt CHANGES.txt README.txt )
+	if use doc; then
+		pushd docs > /dev/null || die
+		PYTHONPATH=.. emake html && HTML_DOCS=( docs/_build/html/. docs/_build/doctrees/. )
+		popd > /dev/null || die
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/singledispatch/Manifest b/dev-python/singledispatch/Manifest
new file mode 100644
index 000000000000..8b01c7f03819
--- /dev/null
+++ b/dev-python/singledispatch/Manifest
@@ -0,0 +1,5 @@
+DIST singledispatch-3.4.0.3.tar.gz 9529 SHA256 5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c SHA512 ba065d36092ddee6527be3d7cb777c51c0949855bf6dd0ffb7c25acaedaa35d36fe6dc096587acddcd1e9e54c6ac5f92c196b11f9ee1270cc0c1cf2f410446cf WHIRLPOOL 183ff853db1743b9a55023a62afc806d60dc095f8a1a32392ad3d48c31f0c9b2b2001dc9bd264c90dbfc7acb92670342a2ff770886aa81afe9b5badde4dbe22a
+EBUILD singledispatch-3.4.0.3.ebuild 602 SHA256 ce24274f9d3bf5c8db5231c8963aef92c41ecc99cf1158cd81069a3ff8c86180 SHA512 d0fd2f4af4ca0a10e1d013704b78cdf08322f5bfd2c85cdbde24d492f2c6d63110455b7205295c6ec16af9d3bdfe2f88d543c53f43557e2abc137f753ff73e8d WHIRLPOOL c869457d984b1d221047304ec8a5a2935890e5b8e7d5667eebb246305b3630b88e5a98db4da9ccf9cd6cdbc9aac05439461a726db39d7b640ffec072ef1ed289
+MISC ChangeLog 5807 SHA256 4e49d1966f57c02fb507c556cba72afbf26db6a6e0cae7bd6cd7abf5d9c59ceb SHA512 ea9f6d155dedcc70befc7139254ad106e972c003abd91023ace93bf6eaf58c92e18462a551a42d46384bc11054e935bd94a67d4346c03e6143f814f077b17ecc WHIRLPOOL 9e16f1a4fc0c3daa13643e6d77d61b78ffce8df4789f3242573775a792956de433ceb711863b244bc789b7c3cacee7f3461ac4837efbc9e82cdce9d8425aa3bc
+MISC ChangeLog-2015 1385 SHA256 c28f9428c1d7656edc3ff544f3ef24c8ed13db6020a230c213e5b1c1e7621164 SHA512 fa23049c5ee07f8c8f06376b0c48639f02d7d8eca304805cc14f43e3a73b4643eea2c4ccdd3912fd4e2c4d80f9335ad5339a65ce9fc4b42021f853c0b5de5f3d WHIRLPOOL a635d949789fe212e10222db74c2b1d72508aaed330f6bb4b1740b81821d4edba26114cb75c61b24e693f94ece69f018e773983b553acc10c82a2d06f8797cf5
+MISC metadata.xml 509 SHA256 a1934e60cf888659ae1ef28bd3ac93443cc98e02d02b666efea6d227e35c221e SHA512 a8bade1abd688b4c1788ef4e62d986fd76e8d17c8f0e142fb94eb34e7a0d783ea208deedc058f571ad3aa50eedbd32d019bcdb1715f720be30d067ba0556735e WHIRLPOOL 51a2c56a65449e764263a0ad494f5ab779c5cca0a8ec06aa5c486f310499e42399d21360517c0f4865b02cdbcae4b7b497cf9458771fa04291af51c138fdf1b6
diff --git a/dev-python/singledispatch/metadata.xml b/dev-python/singledispatch/metadata.xml
new file mode 100644
index 000000000000..23c9132739f3
--- /dev/null
+++ b/dev-python/singledispatch/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>timo@rothenpieler.org</email>
+		<name>Timo Rothenpieler</name>
+		<description>proxy maintainer</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">singledispatch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild b/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
new file mode 100644
index 000000000000..eee91417d804
--- /dev/null
+++ b/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to bring functools.singledispatch from Python 3.4 to Python 2.6-3.3"
+HOMEPAGE="http://docs.python.org/3/library/functools.html#functools.singledispatch"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PF}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
new file mode 100644
index 000000000000..5a0baa32a0c7
--- /dev/null
+++ b/dev-python/sip/Manifest
@@ -0,0 +1,11 @@
+AUX sip-4.18-darwin.patch 1187 SHA256 a4ef0943e992b6313368805f093ffff261697887acae39d4e33a7bfa02c40174 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e WHIRLPOOL 834ef3eb9b75dc887b684ec2b3537668617f183b456b522e2d7a401b2547a4c041d7ebc6201fe6f82b97ae20a3b02bc8539d934f1c8cd28edfe05b4db4fcea79
+DIST sip-4.19.1.tar.gz 1000644 SHA256 501852b8325349031b769d1c03d6eab04f7b9b97f790ec79f3d3d04bf065d83e SHA512 fd98002117e9526f7f981b46362c41171e703a0e18e57112fcabf33d71fa13a4a091fdcb05c879ea721da59fa8c03087b8dc983fb2f832f764e5ad950c9bbecf WHIRLPOOL 87deee5786ca5009ca139bf6993e82231b1dd5be9bf7ee1d94eb5c8aabf5bda980f6b0fa4571e838275ac7cd8615757a58d0b9d7e776705834db35a1dc92125d
+DIST sip-4.19.2.tar.gz 1000746 SHA256 432b4aad25254e6997913e33b1ca3cf5fd21d5729a50a3ce2edccbea82c80533 SHA512 6f14f387a899130cf15820d2b58d937d134a2eefd53c65a82af060e88a6ca039442b21f822880c4a3742d6f26328853a552239873c55d7b22de62a6cc5037b3e WHIRLPOOL e6a59dfde801b38c5ab2524e8142cf5f87edcd8171512241f88096bdfc43734cc0346d2d6a607ea2a14a41b7f05c820af30aa0b125a3f06be263d65b99c7b239
+DIST sip-4.19.3.tar.gz 1007481 SHA256 740df844f80cc45dcc9b23294a92492923bc403ce88e68c35783f27c177c4b74 SHA512 b2dea0cb5e1b23531f35e94bd604ec9874f0875badb5b20eb5abd2732a1005b2dd15bb42e0007b65053a2153b50659f24671abd83a434991661168a5778b94bc WHIRLPOOL 6283491e6baf6b7806a9fd68e77463983c475f7ea721832e573dc86158e226428d5bd9da084a554180ac4308ccf23d98f4c51f9af11fcfb5ecda8bf4dee028f7
+EBUILD sip-4.19.1.ebuild 2113 SHA256 0fd02f37c4e77038a4027e635ef5cf5aba5512e15696cbd13660114070e204f5 SHA512 ce4a55289b9b1b53d2c48803e4b9ff013fe8c9fc577af73000aa6d39b1bbb0fd5f83d808743d44a86949183d2621bfc7d8ac072eb7ffd341971ad8aae4eef1aa WHIRLPOOL a46fafce6d3758c74d30f1f802efa72a1cfef14d48058ada3bdbf8a6fd53ef673322f5088ebbb09086dd046e03012fa71d304c66c12b2fc777a98fff8730d52a
+EBUILD sip-4.19.2.ebuild 2128 SHA256 0643be8db6bf2685aa02f85628d29de925251d390bc976a51f97c35ce8004121 SHA512 fd5bfc20f613f79a9a57d3cc138864a70cb3c333a719adc7705e854d9bb3354eadc47f341b2246f36ae93ef0203ae45039f88b3d9f795a5ce5ff262b8653ff5c WHIRLPOOL ddcf098b12e490302b0ac55dea40230646f6b66ad44e338a3adcd8fee908922a3255aa01debf730341c428129fdacab635e3caaff3f08b302ccdb39808b7afc6
+EBUILD sip-4.19.3.ebuild 2128 SHA256 0643be8db6bf2685aa02f85628d29de925251d390bc976a51f97c35ce8004121 SHA512 fd5bfc20f613f79a9a57d3cc138864a70cb3c333a719adc7705e854d9bb3354eadc47f341b2246f36ae93ef0203ae45039f88b3d9f795a5ce5ff262b8653ff5c WHIRLPOOL ddcf098b12e490302b0ac55dea40230646f6b66ad44e338a3adcd8fee908922a3255aa01debf730341c428129fdacab635e3caaff3f08b302ccdb39808b7afc6
+EBUILD sip-4.9999.ebuild 2275 SHA256 283f411de6357a250a7d3685a20a9159e629408a134e0ff4f5ef7719e0c7b121 SHA512 6f682b3254e4abf899d0d8ff02f6b32676771171170aed2562ce6de2224261839c992681b6f561040308f622d2a9198c036465f1ad0149851a79c38d41f0b9e8 WHIRLPOOL c11d4ef865da8c6c253981655fdbb380e2bb51b617de2744a1825b528ec5acaebe0deeca5dd6df98527b65b5994d20e81c89e1350f7d1710be97e4400073ac8d
+MISC ChangeLog 6672 SHA256 6456ef04eb08319575ff464d5a2836c75ea7f7e7efadbbdb9c349f06dc4d6c4a SHA512 220d43de36be4829a2dfa23b7239cc68070d0033c9bef9444890c5b3d51f685a8fb54949e2eff61fe85742cc95d32b57ea11ef99162351783a588da668eddd2c WHIRLPOOL ee02f69254fd24504598b76fa0506e3998857f8eb5a7d238718a703759a999742d70226cb02c281457c45f633bc10c90cba1bd7ea65d4dae58dae78757055bda
+MISC ChangeLog-2015 37462 SHA256 4472562d9fb77fa3bd61325e5e038b7d155b9854c055efe54460cbd70e50204f SHA512 d73800b8fc3e163f77b895284eea54b07b6eb17a8494d3bb9d2c0da223815b372382e7b7238544421ddab6a8d999c6dc2e91c8be672519142c426bcbdce58d28 WHIRLPOOL 24b6a8684791c6faed989cd4f46042c57231a2ffe0bf226059c9c87506337c80b11cc8f7dd0aedaab1dd3f877cb85572f7606d6210a1094bf11ce3b42e2719a3
+MISC metadata.xml 593 SHA256 dc36f709f65a14b880b37ba425adcf21670e319b130c2e33cadba4935b18fa6d SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5 WHIRLPOOL 51ef4d0340bd324a2364c5f70b6822c512204dd658ff89b9ba53ff49434bf08d294a3853f8e5dd50ceedf1f1c1662e3899bba5a951c1b7743b18d616f5f391ab
diff --git a/dev-python/sip/files/sip-4.18-darwin.patch b/dev-python/sip/files/sip-4.18-darwin.patch
new file mode 100644
index 000000000000..6dd45ac024e3
--- /dev/null
+++ b/dev-python/sip/files/sip-4.18-darwin.patch
@@ -0,0 +1,30 @@
+diff -ru sip-4.18.orig/siputils.py sip-4.18/siputils.py
+--- sip-4.18.orig/siputils.py	2016-04-16 22:38:22.662502890 +0200
++++ sip-4.18/siputils.py	2016-04-16 22:38:39.881551111 +0200
+@@ -946,8 +946,6 @@
+         """
+         if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
+             plib = clib + ".lib"
+-        elif sys.platform == "darwin" and framework:
+-            plib = "-framework " + clib
+         else:
+             plib = "-l" + clib
+ 
+@@ -962,8 +960,6 @@
+         """
+         if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
+             prl_name = os.path.join(self.config.qt_lib_dir, clib + ".prl")
+-        elif sys.platform == "darwin" and framework:
+-            prl_name = os.path.join(self.config.qt_lib_dir, clib + ".framework", clib + ".prl")
+         else:
+             prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib + ".prl")
+ 
+@@ -1639,7 +1635,7 @@
+             if sys.platform == "win32":
+                 ext = "pyd"
+             elif sys.platform == "darwin":
+-                ext = "so"
++                ext = "bundle"
+             elif sys.platform == "cygwin":
+                 ext = "dll"
+             else:
diff --git a/dev-python/sip/metadata.xml b/dev-python/sip/metadata.xml
new file mode 100644
index 000000000000..9b8cb511f250
--- /dev/null
+++ b/dev-python/sip/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>phil@riverbankcomputing.com</email>
+			<name>Phil Thompson</name>
+		</maintainer>
+		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
+		<doc>http://pyqt.sourceforge.net/Docs/sip4/</doc>
+		<remote-id type="pypi">SIP</remote-id>
+		<remote-id type="sourceforge">pyqt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sip/sip-4.19.1.ebuild b/dev-python/sip/sip-4.19.1.ebuild
new file mode 100644
index 000000000000..21a766bf9cda
--- /dev/null
+++ b/dev-python/sip/sip-4.19.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit python-r1 toolchain-funcs
+
+DESCRIPTION="Python extension module generator for C and C++ libraries"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
+SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
+
+# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
+SLOT="0/12"
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+KEYWORDS="alpha amd64 arm 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}"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
+
+src_prepare() {
+	# 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.in)
+	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/sip/sip-4.19.2.ebuild b/dev-python/sip/sip-4.19.2.ebuild
new file mode 100644
index 000000000000..de3979095c5c
--- /dev/null
+++ b/dev-python/sip/sip-4.19.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit python-r1 toolchain-funcs
+
+DESCRIPTION="Python extension module generator for C and C++ libraries"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
+SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
+
+# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
+SLOT="0/12"
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
+
+src_prepare() {
+	# 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.in)
+	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/sip/sip-4.19.3.ebuild b/dev-python/sip/sip-4.19.3.ebuild
new file mode 100644
index 000000000000..de3979095c5c
--- /dev/null
+++ b/dev-python/sip/sip-4.19.3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit python-r1 toolchain-funcs
+
+DESCRIPTION="Python extension module generator for C and C++ libraries"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
+SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
+
+# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
+SLOT="0/12"
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
+
+src_prepare() {
+	# 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.in)
+	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/sip/sip-4.9999.ebuild b/dev-python/sip/sip-4.9999.ebuild
new file mode 100644
index 000000000000..04bf7478ce7f
--- /dev/null
+++ b/dev-python/sip/sip-4.9999.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit python-r1 toolchain-funcs mercurial
+
+DESCRIPTION="Python extension module generator for C and C++ libraries"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
+EHG_REPO_URI="https://www.riverbankcomputing.com/hg/sip"
+
+# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
+SLOT="0/12"
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+KEYWORDS=""
+IUSE="debug doc"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )
+"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( $(python_gen_useflags 'python2*') )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
+
+src_prepare() {
+	python_setup 'python2*'
+	"${PYTHON}" build.py prepare || die
+	if use doc; then
+		"${PYTHON}" build.py doc || die
+	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.in)
+	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/six/Manifest b/dev-python/six/Manifest
new file mode 100644
index 000000000000..675662725029
--- /dev/null
+++ b/dev-python/six/Manifest
@@ -0,0 +1,9 @@
+AUX 1.10.0-no-setuptools.patch 545 SHA256 02d3be746002fff940528270efce49b6d51025eef3f6cff5f75d799101127cb0 SHA512 f1d5c25815fb9e2ecfccaecef52383d468163feff0391214650f109560282ce2eff51513a60824a15ccc3a5af09fe0411b387314978af9a1f51fccc387521ffe WHIRLPOOL e7093ab60a1297ca5a29e1b800a99013be7fc9ca4e9388f901d61bc0eb85eaa0f782f26a09671eccf8f5711c18d6f87fc659738125dbd7bf5c77c1697951f5ea
+AUX 1.9.0-mapping.patch 561 SHA256 0379b9cf39254db964f48ca52c6b721929ab17f2a0996f217db1fcfd01289070 SHA512 92d5bb1643264a04d5faf36bed16379e8844648a31739921bd97e2dd88e34a9b302c37a12a15a64aceb3d26c53f7cdbcbde2ce8d289a7a43f692af47bf05f58c WHIRLPOOL d9f919ac9057f416ce3c79b86eb8b33e07159a8297a2f1b6fb795861cbb744c4c8b6f50c6b7d4d41b4a96b009e4733534fa2ff54de995de1a959042e8c38206f
+DIST six-1.10.0.tar.gz 29630 SHA256 105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a SHA512 9a53b7bc8f7e8b358c930eaecf91cc5639176a699830153f586780c3e6d637f1bd31349a69c383574f99da19cb3a36524e7733a318f3572b27aefb69c6409c2e WHIRLPOOL aad2fc7438b0df029bf477a783161dc169795c355be1281f1fe7aa4eb959eae5abf3bc96d097a221e0e5ad0b0494c29025bbe99bc28ff0c29ae1776e8691a70a
+DIST six-1.11.0.tar.gz 29860 SHA256 70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9 SHA512 33f246a2e987141e17e5edad9d3537cf3aba0cbdd0bc2a907ea52ce0d674b1474f29c3dd5cc26605fd960396054b189ca5f501708333cad234c223131483fe24 WHIRLPOOL 08e33e1742d69558faa67fad1807b567595aa4c838bb643c993bcb88661246a0f14974ff89d1f9d25842212bfaeac0cb3a69272deacb8872b9ca3fb2f55570b9
+EBUILD six-1.10.0.ebuild 1823 SHA256 e1b6c9d6b2fb0049ca606570cca61e264a454739fb1a0a437ef4d33f3a70ac72 SHA512 258b5e8d0d9221d916260a1c2053b90224109933d3c87054588c2253910fcfb177e4bc329da491987eb88d7d7ff85b13a0057127c285855c2b896ba9ed8b9f51 WHIRLPOOL a021d06f28d0df18cdee3bbb848c758574ae36d69c31f72e8375de5e7fa49bc9783f3f4ee589f511e9ee7b94344b64e14cbd8cda741fa2f56891d4842a6eb580
+EBUILD six-1.11.0.ebuild 1095 SHA256 a6aa44063bc7fdb29c3e930748695e03451d25dbb9048af4d48d2523529e2269 SHA512 87da6beb6dab97b5f20c6c84a69a7fc23a5f005958dd413ef299281db273691a6d97a3822619b12b5ca1bd47d36d0a9ba6ffa5c5c39703831709a660d61f16c5 WHIRLPOOL 7e8a261398432538d4accb316e34d0f69e582fcef50686076c003fd86abe06d95771f91dd6bd6932edd7bc260673627644e6a3b45b8b8dee5cb9333301ebc34b
+MISC ChangeLog 8947 SHA256 d3a119aace105921374185a467d3a742333228531a42764ed0a78bc62c821bd4 SHA512 cedc06f5593d8a2afdaf100e027ac1c14777fc0eee38e3a27d37a70f2130671c1f4c2315351863a5e37159282bf650466c94881ef37a1532ad98349c26747305 WHIRLPOOL 0e98fcef0240877282a14166874a4825f7575a63911bdf852e55863d129509a140f9fa3af33688678f32a690c8f7642fafed8603e783993a50af3d0037e8f376
+MISC ChangeLog-2015 8432 SHA256 f8702aa8815c9560e6ac791a0529133fba0550b856902065bc1c1050820f7a1b SHA512 b2795ad91e3be336a8af5b8199b22dfe9d3b8947578255f1dcb8f5a795574d852b7d7091e92eab7a6bf5e19f30a0c8e847c48ad4129d99f152e269b9a3360049 WHIRLPOOL 90ec283742f3afdf9b37e994931218fd0ebcaea89b8d018604598081257fb1209fcfa87ad9b642e1dcbefc57b49484d42090842893bb81354b8d95a76a3cf524
+MISC metadata.xml 371 SHA256 6ea4fc6d9ab2b7a3e2c8f9b3d71d0b8a572e71eaf12b715fe52deada60dcc0c5 SHA512 8171125815ab60f7c9a2756367ee6532fd862c5f411ff828b6555e4e21e6d43672f2c764f92134f6625abb161380bdbb739af259ba88c974cf3583f35af76a91 WHIRLPOOL 99972abe648415461046d57e7c70f3b7943b5632017ee4712dc959d1bf2e26a2a1f3ab23c1a4d13868efa6c15aaf153722c3c9b5674c339ab1506514b2b88a56
diff --git a/dev-python/six/files/1.10.0-no-setuptools.patch b/dev-python/six/files/1.10.0-no-setuptools.patch
new file mode 100644
index 000000000000..d4309181902a
--- /dev/null
+++ b/dev-python/six/files/1.10.0-no-setuptools.patch
@@ -0,0 +1,22 @@
+Force distutils to avoid depending on setuptools
+
+distutils and setuptools have differing behavior in regard to egg-info
+directories versus files, so we need to ensure that no automagic behavior
+occurs here.
+
+We cannot hard-depend on setuptools due to a circular dependency.
+
+diff --git a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -1,9 +1,6 @@
+ from __future__ import with_statement
+ 
+-try:
+-    from setuptools import setup
+-except ImportError:
+-    from distutils.core import setup
++from distutils.core import setup
+ 
+ import six
+ 
diff --git a/dev-python/six/files/1.9.0-mapping.patch b/dev-python/six/files/1.9.0-mapping.patch
new file mode 100644
index 000000000000..4423eacbbba3
--- /dev/null
+++ b/dev-python/six/files/1.9.0-mapping.patch
@@ -0,0 +1,12 @@
+Patch prevents downloading non essential .inv files during the doc build
+diff -ur six-1.5.2.orig/documentation/conf.py six-1.5.2/documentation/conf.py
+--- a/documentation/conf.py	2013-09-15 21:52:34.000000000 +0800
++++ b/documentation/conf.py	2014-01-07 18:19:24.958916446 +0800
+@@ -211,7 +211,3 @@
+      [u"Benjamin Peterson"], 1)
+ ]
+ 
+-# -- Intersphinx ---------------------------------------------------------------
+-
+-intersphinx_mapping = {"py2" : ("https://docs.python.org/2/", None),
+-                       "py3" : ("https://docs.python.org/3/", None)}
diff --git a/dev-python/six/metadata.xml b/dev-python/six/metadata.xml
new file mode 100644
index 000000000000..2d3e4a72698e
--- /dev/null
+++ b/dev-python/six/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">six</remote-id>
+    <remote-id type="github">benjaminp/six</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
new file mode 100644
index 000000000000..950dd2975ff8
--- /dev/null
+++ b/dev-python/six/six-1.10.0.ebuild
@@ -0,0 +1,65 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 2 and 3 compatibility library"
+HOMEPAGE="https://github.com/benjaminp/six https://pypi.python.org/pypi/six"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+DEPEND="
+	doc? ( dev-python/sphinx )
+	test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/1.10.0-no-setuptools.patch
+	"${FILESDIR}"/1.9.0-mapping.patch
+)
+
+python_prepare_all() {
+	# https://bitbucket.org/gutworth/six/issues/139/
+	sed \
+		-e 's:test_assertCountEqual:_&:g' \
+		-e 's:test_assertRegex:_&:g' \
+		-e 's:test_assertRaisesRegex:_&:g' \
+		-i test_six.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C documentation html
+}
+
+python_test() {
+	py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( documentation/_build/html/ )
+	distutils-r1_python_install_all
+}
+
+# Remove pkg_preinst in the next version bump
+pkg_preinst() {
+	# https://bugs.gentoo.org/585146
+	cd "${HOME}" || die
+
+	_cleanup() {
+		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
+		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
+		if [[ -d ${egginfo} ]]; then
+			echo rm -r "${egginfo}"
+			rm -r "${egginfo}" || die "Failed to remove egg-info directory"
+		fi
+	}
+	python_foreach_impl _cleanup
+}
diff --git a/dev-python/six/six-1.11.0.ebuild b/dev-python/six/six-1.11.0.ebuild
new file mode 100644
index 000000000000..62c67ff19017
--- /dev/null
+++ b/dev-python/six/six-1.11.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 2 and 3 compatibility library"
+HOMEPAGE="https://github.com/benjaminp/six https://pypi.python.org/pypi/six"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx )
+	test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/1.9.0-mapping.patch
+)
+
+python_compile_all() {
+	use doc && emake -C documentation html
+}
+
+python_test() {
+	py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( documentation/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/skype4py/Manifest b/dev-python/skype4py/Manifest
new file mode 100644
index 000000000000..034a5d905f0c
--- /dev/null
+++ b/dev-python/skype4py/Manifest
@@ -0,0 +1,5 @@
+DIST skype4py-1.0.35.tar.gz 143453 SHA256 47b61664a47d29f3d5d4a3d6f01a7c5c13c1610767b6ed9e48c07439003533b8 SHA512 daf07b08e5a3dda47f1e643ebbf6d8d01175e7f3a23cf6daf852c75f4b2552b8c68f255e27c89ea8773836b2b154193fed1b3b5e28ed07b503b5c2f95ee4314f WHIRLPOOL 567aa5247959881277449a49f3250831fbd3ce416eadb78f3931b6b2a6a6812dbf2bfbf4cff3a1bef2a53791aaecf124ef152146de0f1c1c22f62047ea6da964
+EBUILD skype4py-1.0.35-r1.ebuild 638 SHA256 4d57130ae86d4a4b73f238f2350aac4658a67f78c585e66d301a45d0011ad979 SHA512 901228add45e877b9a8478860f947c289d6e89bdfb46a9086dfc9985069a084af5c2831cdedc88adc5dce182ef65dc4bcaccce8698a4cdc922f8ce01fb4c8618 WHIRLPOOL 69288692efd09121fea2ba1fe9f0aceb5c6d0c60aa09236b73b71f5bdc8ae68d1d8c93ae73720406afcbdffdff28b941b947004d3b580dcea646b3c4cb2e5295
+MISC ChangeLog 2683 SHA256 6a830f2e10e92ce7c06be00432a0d5546f08378f5de5ab52f4850312da7d6ce3 SHA512 ba9692e8d8f2016a98796f44c0ff5b870d8d086ee6d0d00a95db95f5eeafe4f9f458d70911b03b1ade9480d541ffa3d444a71ed35108b102fc373c1a1ee87935 WHIRLPOOL 8e2ea01a3f51ef085291e3393e1d3e1dc2c16888a82bb5ead1008ad524501972ed62f1fc99134bfd8a6639c5ae95f7db1b8fed43f91e729126fc78051db9e9d6
+MISC ChangeLog-2015 3514 SHA256 3be41d4723c90aa54baab05b1557138283c654243707c8a187a1730c88de6667 SHA512 537718ce4b5382fd3513a7e20e1d07acd2976d9892a806b94548214ef8bee4540fa21cf0c241d6be5adea51b5c800b109d10f2d8642ca60a487ea53f603537d3 WHIRLPOOL 98343d6e0718a6a45e64d0c80f95a77a5b86f3fb89201d5adca4e328bb1eefd87d8a11a102717466fc8901a9b0c2dd08de6314d186bbf7b59081093a9ef6195c
+MISC metadata.xml 301 SHA256 2c550e3d24685d9e232c9c7dd7bbe6f8e0398dc8304b0765401324ef2c85a1fc SHA512 0a9e882437820758d7d0895a64f4b1e2865f80cd14ceddea77db1d54bbff48be10df376a0942449b439776401b302c80d1ea0492fdeb257811985e51cc300b66 WHIRLPOOL 162e01691b7d3ad5e1d870921f53195fd38b447bd897419e2c03a7926dd8fa80d87ae6fe389ff565dce8e61dcf4b2fe829159261e7a061e1629e3e05b26d42d8
diff --git a/dev-python/skype4py/metadata.xml b/dev-python/skype4py/metadata.xml
new file mode 100644
index 000000000000..5d1b574dbf17
--- /dev/null
+++ b/dev-python/skype4py/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="pypi">Skype4Py</remote-id>
+    <remote-id type="github">awahlig/skype4py</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/skype4py/skype4py-1.0.35-r1.ebuild b/dev-python/skype4py/skype4py-1.0.35-r1.ebuild
new file mode 100644
index 000000000000..244b3299f346
--- /dev/null
+++ b/dev-python/skype4py/skype4py-1.0.35-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for the Skype API"
+HOMEPAGE="https://github.com/awahlig/skype4py https://pypi.python.org/pypi/Skype4Py/"
+SRC_URI="https://github.com/awahlig/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-im/skype
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	|| ( dev-python/dbus-python[${PYTHON_USEDEP}] x11-libs/libX11 )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( CHANGES.rst README.rst )
diff --git a/dev-python/sleekxmpp/Manifest b/dev-python/sleekxmpp/Manifest
new file mode 100644
index 000000000000..ef23b8fbba46
--- /dev/null
+++ b/dev-python/sleekxmpp/Manifest
@@ -0,0 +1,5 @@
+DIST sleekxmpp-1.3.1.tar.gz 1014004 SHA256 72f2887ccb29bd53f9bbf09225274d11d75e88507ea3ddee97cef0b289bcb04f SHA512 1f3c68672536da0d20cd8717f7835096003019f03a05fb08ce87f784b0636d781aa78691ee54927d4755e71a57956972af0a653deb6eff0f7eb16b9a236baa65 WHIRLPOOL 464de44bff78c294d35c01b89319b82bb6f782269c0b880ddb2692b85b0e05ed5ab47e0acb3476187c10440f3bb77f1487f6795a6a08dd6f34cdcfdf8a5ff6cb
+EBUILD sleekxmpp-1.3.1-r1.ebuild 644 SHA256 dd2363df0c4aed9aa989d5f3da425a6ed463517502514022870bf2be44f2cc87 SHA512 2fb3f63dda74fed4465c03d9604113639433db250322a74592a04fd9ec1308224bd8c89d5c40df2921f6edbd490dd595708604c70370ff8322f5bc717ddf919c WHIRLPOOL 2841e038717d241c9cc5864ebb46f127cb0fb771a3e7b6d85532d32e84015ca91611a1a3b0a853adf3c6de84553f443778afd12fe1a4fe9e3560d3638f1cc9d4
+MISC ChangeLog 2882 SHA256 191f169aa9d0a55617055da487c210ff1cd97072c3d3807e658d6610a83c3fb6 SHA512 b4499eb2a963c9fdb577a7066f63e85123723c96e20d066a45c11cfcb16e6051496432bbfcd5ddceb96ddc0ee57cedeefd97d4e6089d4ff6e9448d67c444c23c WHIRLPOOL 9a58b05c926ff9676d15d277ab0d614efe7dae5b7d65c848fcb48213b223fa8145ab9cb2885f5dc1d5a460ee37749006293e33b337329a8f65bca4c7c7e0265a
+MISC ChangeLog-2015 1613 SHA256 ed98bd7ff6871d086e5d6b04044575b130b2ada3a1c7f89e08e908f9f3e0c0f5 SHA512 45fe2125b664f3564b66e46896464ac41e67f182a4f84a8ec86fc4402889b5195cda5c46a5e63a6bbc91132e58d9249f03ae75fae65b165b017430086b9bfc2f WHIRLPOOL 62fc3cf6137d75b1821f8c968b4952182ae6826fe2d343a3ef6706a16762b89fd537437aaea802eae912abc2e29257d102a7c5d1d66660ef3d91f75b40d84055
+MISC metadata.xml 331 SHA256 66b040cc49a396c2369a8a525c65f3177d4f36c413a6d00d950e1369baa66493 SHA512 f3d68d2a4052973dcf2a984bdc524d9f82254a3678f37d2b75db220b363efc6f2fe8155c544189f88869dfce840d487650e76ad2df7e06066522b1230e09c826 WHIRLPOOL dc8004e5af444090d3edabde6d869740eaf1ac68d7fbd5f65fe5e5c0683c591bfba34faf6742299db48abc0850fe529bfbf15906b50d6d239dffbcb4273d0734
diff --git a/dev-python/sleekxmpp/metadata.xml b/dev-python/sleekxmpp/metadata.xml
new file mode 100644
index 000000000000..4a8bc08fec87
--- /dev/null
+++ b/dev-python/sleekxmpp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">fritzy/SleekXMPP</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sleekxmpp/sleekxmpp-1.3.1-r1.ebuild b/dev-python/sleekxmpp/sleekxmpp-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..a0d4b80e6e2e
--- /dev/null
+++ b/dev-python/sleekxmpp/sleekxmpp-1.3.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit eutils distutils-r1
+
+MY_PN=SleekXMPP
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python library for XMPP"
+HOMEPAGE="http://sleekxmpp.com/ https://github.com/fritzy/SleekXMPP/"
+SRC_URI="https://github.com/fritzy/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="crypt? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/slowaes/Manifest b/dev-python/slowaes/Manifest
new file mode 100644
index 000000000000..2a104325b3d9
--- /dev/null
+++ b/dev-python/slowaes/Manifest
@@ -0,0 +1,5 @@
+DIST slowaes-0.1a1.tar.gz 7017 SHA256 83658ae54cc116b96f7fdb12fdd0efac3a4e8c7c7064e3fac3f4a881aa54bf09 SHA512 09126a6cf2a0da27c45b12d25c3a9147f47448311f9e36b6db2aa62d8b85f3fdf66f10f8f5d84edf48cde7f6c766d9ed384832f9ca0e28f95104149a7f424d95 WHIRLPOOL 85090de0ddb947470bc932ddc80f28316bd193329711c9e4e83982914ab18379b0fbdd986c087ba1ea9929a80bb0975bc09610a92d3b0d3d05d046e561c3f27e
+EBUILD slowaes-0.1-r2.ebuild 447 SHA256 fd52ba9eae86022a14cd7ff488a49f016d72d221d08b3c95645bae1a17bf2125 SHA512 a0374a0f43f390c0c1a550dca3f3f95d0447b16b15a11847d93a893391dccc19e5c7c7e0ba96d0d0282f8f0305886f06c68405d3e91cae3365c23d1a09bb7e03 WHIRLPOOL c018d37090603032d61104a71bd1e9d19f044dc5d760070b02586a2ef6f1791ef12a8b57360f6a0b61237b392df98299347500e5c9837401876ec2d5932d3aab
+MISC ChangeLog 2587 SHA256 7830f4fe672a243eef647bce7929fe4b676f3136b6669f6edc01d449d365d577 SHA512 333c631194fe689edeb47f0aabdb0cb4e51660b9d90ff2a554ce59385323c6a50db4a99233f43e8d927a83fc6c97546da7a01e3bf1ec2733c03b8b5041033175 WHIRLPOOL dfefd6df34565273498f9c0eca5de0aa82988de08fde3308741cbde6178dd5ca7bff391a1f2cb0e055f7fc039265660fdcb0781e5c6479bfe77284ea1aa102a8
+MISC ChangeLog-2015 1289 SHA256 da4ee9a8af8e14610cd948650e1566fa05e80597caa023e5c0cb0ab142af6bc3 SHA512 cf2789e4ea3dc33feb180fb53965d25d79bc7c49628b5f8209e88ce754f5e3510bac3c9100f6306a8bc31f73de970fcbf03d10a53a911bd9d5677b3a4591302d WHIRLPOOL 3a8d5c4cfb0cf39fa20a52a2d21a7005a52a377ade45d73f935ccb38fa6535c8f913df8e4afbe4f843e1f8522c72df1a10216d514aa99e6e7fffee8fd68d9f88
+MISC metadata.xml 697 SHA256 c1fcebd1fde45d4f0ec594b19cb0bbe8c0dbbe03f32aa1a75287f05786e6eb22 SHA512 e9c973a2d67f277dad5c4e5240616ac48e39d6e5a53a47a65ec2cd6e05fc6eb944b526147d0d1b70107dd48dac4fa8eb4310adf6849bb97f545183bfe12f4549 WHIRLPOOL 481bc2837e9ae2bc08aeea6fb95867c3113599dcb632065e6c4cd4b354dc6ec436677f54fc571c768eb5791fef1564b593c2c2dc07ec5221ad2d1ba513b25e31
diff --git a/dev-python/slowaes/metadata.xml b/dev-python/slowaes/metadata.xml
new file mode 100644
index 000000000000..1d395a8eff06
--- /dev/null
+++ b/dev-python/slowaes/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>luke-jr+gentoobugs@utopios.org</email>
+    <name>Luke Dashjr</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>maksverver@geocities.com</email>
+    <name>Maks Verver</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">slowaes</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/slowaes/slowaes-0.1-r2.ebuild b/dev-python/slowaes/slowaes-0.1-r2.ebuild
new file mode 100644
index 000000000000..b219bb74776a
--- /dev/null
+++ b/dev-python/slowaes/slowaes-0.1-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_P=${P}a1
+DESCRIPTION="AES implementation in pure Python"
+HOMEPAGE="https://code.google.com/p/slowaes/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools"
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/smmap/Manifest b/dev-python/smmap/Manifest
new file mode 100644
index 000000000000..3a01f378125f
--- /dev/null
+++ b/dev-python/smmap/Manifest
@@ -0,0 +1,5 @@
+DIST smmap-0.9.0.tar.gz 22082 SHA256 0e2b62b497bd5f0afebc002eda4d90df9d209c30ef257e8673c90a6b5c119d62 SHA512 704e1c67b1f3e1303578cc26d4af8296a11b5f5013e8e8d933d3096e588911b801ddfb162d0e35a49c00256032824386d77e4f38d58704cd57baf21586b40e03 WHIRLPOOL 9fb316ee42e7d0e9ee46cda05659d3abbe1c0b17917d675c774b1b34e35e16497afef97b0575478bf7d795c6242d77e1456630b3d7739ef979ca8d08ba042498
+EBUILD smmap-0.9.0.ebuild 680 SHA256 63fd83ddf9767cec24665b5b802a0067012e5171bcfe7fc750af033c31029153 SHA512 735ea026c573b8bb13c96ce5a7f8a2b8df6132bed139891c5e004c05a6fbb6795b4e9ee9244ac748555a13c6a272c66bca762eb15ec0d16c09412d31e3b8172b WHIRLPOOL c8c2a59b0b51ac480f5a68ea35f22d4dfe2c7f98fd8ed196b40b9a7173f7a40db37c59df78b439400fe43a3b0db2b0e644d1277f2ad122fd15d63e9e45b18a5b
+MISC ChangeLog 2958 SHA256 e10d1a665e166addd2739fa75eda38f2ce4a44affebe57bbc3c30ae742726413 SHA512 a55e76fabe5bbc28f9261c84782a281f1d8f91e628ad98f7beb6b3cdafd7cc1ac6d079aad85621d274886fbc8207d49e331a637cd155f92a2a67e57d0d177e3f WHIRLPOOL d498c7ba05dc5adf35d146baa4c06bbe534e25d8359793deb4cd830045d2fb62d55c9005b995e72f510180b6a2a414d81ac227ab147f215b8cb516aa9272d87c
+MISC ChangeLog-2015 1649 SHA256 cf8dc74978108a9a51585b5e34718707d1962f8066a0c6b5afc1dab84eab7321 SHA512 0c6bb7bc0fc62d53f7c943afa67f57bc80b1f378cb3cab18746d096cad7ac65e415efd9d43d93b868b8f11869a2be5e2bbee9cf0846ba4c3183bc3420c2d40b9 WHIRLPOOL f4de6e608c6b8e2546934eda35631e5b84b0aa28c8357f308a8982433963e01e3c57682236b59d4e3e618fb62fae3ff8df867ea3adcb71b25dc75ac99f33351e
+MISC metadata.xml 371 SHA256 aad3faa6e6a898720b859086ab5e4677b55b09995876d64f5ff759615e345c8c SHA512 9f6f41b53acf58ff0b7ed064469b5b66820f6c173b657ce59d9501d78f87ff2667b84bd0be275f6aa2d06752d875c5aba83105f5414b2b50a86fce9008685f3c WHIRLPOOL 51daad0ca84b3ca421d89823551714de67f7dae049e55de738f37c474480b6200a4e3aa86b05eb60790ee7ad650654e5da27e58a8279183f14d30b8d7dd7fee5
diff --git a/dev-python/smmap/metadata.xml b/dev-python/smmap/metadata.xml
new file mode 100644
index 000000000000..3aaa661d0ecf
--- /dev/null
+++ b/dev-python/smmap/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">smmap</remote-id>
+    <remote-id type="github">Byron/smmap</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/smmap/smmap-0.9.0.ebuild b/dev-python/smmap/smmap-0.9.0.ebuild
new file mode 100644
index 000000000000..4fe8891a07db
--- /dev/null
+++ b/dev-python/smmap/smmap-0.9.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure git implementation of a sliding window memory map manager"
+HOMEPAGE="
+	https://pypi.python.org/pypi/smmap
+	https://github.com/Byron/smmap"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="amd64 ~arm64 x86"
+SLOT="0"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+	)"
+RDEPEND=""
+
+python_test() {
+	nosetests || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/smmap2/Manifest b/dev-python/smmap2/Manifest
new file mode 100644
index 000000000000..30deebf44cfa
--- /dev/null
+++ b/dev-python/smmap2/Manifest
@@ -0,0 +1,5 @@
+DIST smmap2-2.0.1.tar.gz 21948 SHA256 5c9fd3ac4a30b85d041a8bd3779e16aa704a161991e74b9a46692bc368e68752 SHA512 7c8d27c06befdabf65049e5e0bac5beb07c19ff398a343d953120b9cb1c9ed203232012f4b12180af20fa0dde8feb0d6e8af3e389932407688bcc345548f2501 WHIRLPOOL 973d82e6cd679a82189c617469cb4d749f12d56f8aa0d0cdac9177fb09ae71c3986200730a1b320479a4ee87e9796602f17aadf5b2e12f29d0e950ec9ebcbbbf
+DIST smmap2-2.0.3.tar.gz 23049 SHA256 c7530db63f15f09f8251094b22091298e82bf6c699a6b8344aaaef3f2e1276c3 SHA512 f5623247fbdb6b0e94bbfe7104ffd84ee4563a0c32781256d92d46fd23e05280d7a0e3952a573b6834e253e9b68175784babc36d91ab61edf6d0d072830e1fde WHIRLPOOL ac3c7d934130ef71e54c03fd328c54a598d041eb0e74abae80832e2bb0b7a7dbc9f466f348d760cf73df19e491e959fe5b81f4e8eac41c93ebdfc91133c702f2
+EBUILD smmap2-2.0.1-r1.ebuild 692 SHA256 a33067d2046d4bad6e821be682b86ebb32e6892a71b6a985225e846bb9cfb589 SHA512 1bdabd1ff85c4760d31b2ad567e5eb2a537f82001d59ceb283ba799d915ef3b60272667339f547ac0f2e4d376168f2d9a460e4b87d14b452f989096d39cb88f9 WHIRLPOOL 4410b35c4243b94449ad62c88cc5318f4c0460824b0bb7ac5afe6e4e680fbd4f4fe55247aa2be909f9119dd8428d5115c5377e156e1e7a32f82c14be8a0e2071
+EBUILD smmap2-2.0.3.ebuild 692 SHA256 a33067d2046d4bad6e821be682b86ebb32e6892a71b6a985225e846bb9cfb589 SHA512 1bdabd1ff85c4760d31b2ad567e5eb2a537f82001d59ceb283ba799d915ef3b60272667339f547ac0f2e4d376168f2d9a460e4b87d14b452f989096d39cb88f9 WHIRLPOOL 4410b35c4243b94449ad62c88cc5318f4c0460824b0bb7ac5afe6e4e680fbd4f4fe55247aa2be909f9119dd8428d5115c5377e156e1e7a32f82c14be8a0e2071
+MISC metadata.xml 387 SHA256 b45b6cd310c8262db8620613949b403e572433c3d37683798f1218c33061468e SHA512 88990d23bd28d820c1c6ff4827ed74dcd381ddaaace31efcde02cc66905f4a96ebfa05dc5de080273dc60f88c50fd3111649a34cd1bb8f68e65574f92b55793d WHIRLPOOL 8bf49fefb940b28638122434fc5a9175b16eca80039e5054d11b5ab6313bebbdf9a7a628dfecf5c33d831bd19aaef3e21859169adf87723f93f066a763621e3d
diff --git a/dev-python/smmap2/metadata.xml b/dev-python/smmap2/metadata.xml
new file mode 100644
index 000000000000..8c3e7214bd47
--- /dev/null
+++ b/dev-python/smmap2/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">smmap2</remote-id>
+    <remote-id type="github">gitpython-developers/smmap</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/smmap2/smmap2-2.0.1-r1.ebuild b/dev-python/smmap2/smmap2-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..27eb3c7208c4
--- /dev/null
+++ b/dev-python/smmap2/smmap2-2.0.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure python implementation of a sliding window memory map manager"
+HOMEPAGE="
+	https://pypi.python.org/pypi/smmap2
+	https://github.com/gitpython-developers/smmap"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	!dev-python/smmap[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/smmap2/smmap2-2.0.3.ebuild b/dev-python/smmap2/smmap2-2.0.3.ebuild
new file mode 100644
index 000000000000..27eb3c7208c4
--- /dev/null
+++ b/dev-python/smmap2/smmap2-2.0.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure python implementation of a sliding window memory map manager"
+HOMEPAGE="
+	https://pypi.python.org/pypi/smmap2
+	https://github.com/gitpython-developers/smmap"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	!dev-python/smmap[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/snakefood/Manifest b/dev-python/snakefood/Manifest
new file mode 100644
index 000000000000..6f87ceb15fee
--- /dev/null
+++ b/dev-python/snakefood/Manifest
@@ -0,0 +1,5 @@
+DIST snakefood-1.3.1.tar.bz2 1026656 SHA256 3f8dd02c3cd4a5ef3524db9c81f3fe2a6fc10c7355399874213d76832e0a247d SHA512 9609e593e3d0adc946cc78ee1734f6f0ab710205b8fbbbddac9fd25525522c31864b3593476b3f0dd319986238f270e5a1854b9e0abee96f8be3ca2f4bf81a38 WHIRLPOOL 7ab2f0dad2a01e97d363c21ff5463c871ca17f954fb36f928f397291568bf4fcd45b21f261c2cdee9b31a18e983d7565470a614f05a7af19cefd7817feba1a70
+EBUILD snakefood-1.3.1-r1.ebuild 407 SHA256 24e2b70013987bb1bd931cb878f4f0795cd30f1b0c3e59c45487b87da5777969 SHA512 230d9b3807e5366415979278ff5437c9a6aee952d9c42f3e7ceb4ca726bbc2817208222e28e9e5ce236718671a17128fbbbcc4796ab72f0dc4a3ef07189422c2 WHIRLPOOL a714a3d60a8f0ab0ab6ba63500cc663d25fff49a494c1daf7f85c69d3f7d5bd5a613d5c10d779073cc5ee3886f759e437b60b0b9d333edd152032b82aac881ab
+MISC ChangeLog 2441 SHA256 d35d294d9581948a2549cb9f036324dffae4697c67bd1b567b0c225081b33f04 SHA512 913e0dd73c880ee6a081ba7b5e674a29ba295e5cfe64fcbc8aa30cd9c20aca29a7e9af9271b107bd674ed8ffc1425170a620fd475c2f3e54fbf25bae31d58dd0 WHIRLPOOL 8c08799862c7e816f6030e87e2a8403c90a4e2c380cca9097ed44975e9af4854bd75aa7d854be61436e2c1c0987a9b72ef2b2ae0b083f5fb998c35b0a5074284
+MISC ChangeLog-2015 722 SHA256 d1d6772d1aab1440868bcc58adcf7b8d6af6b0a9ff3d33a8179d63c347e1d2c3 SHA512 14a850107f31b70b3a4fa5dfa92237eeed776f897bd07bc103840839f87c6e70983d00203c2ec83eb2c6d2875c34820fcee5bb9b4818bcc542534e4f58f48e1d WHIRLPOOL 8f3d388812429ae5ce5a215fe1beb451ebaf441ee98643b6ba256a64eef11f3a2978d6fa7480d9a02dc06fbc83082029d00c25390625bb29072677e9d2c2b54c
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/snakefood/metadata.xml b/dev-python/snakefood/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/snakefood/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/snakefood/snakefood-1.3.1-r1.ebuild b/dev-python/snakefood/snakefood-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..8f6a82906885
--- /dev/null
+++ b/dev-python/snakefood/snakefood-1.3.1-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Generate dependency graphs from Python code"
+HOMEPAGE="http://furius.ca/snakefood/"
+SRC_URI="http://furius.ca/downloads/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
new file mode 100644
index 000000000000..4c7f222ceb72
--- /dev/null
+++ b/dev-python/snakeoil/Manifest
@@ -0,0 +1,6 @@
+DIST snakeoil-0.7.4.tar.gz 301878 SHA256 67280c86e4b02c34100603d7525270c0017e0d182df54ad31ec2e5c145e69ceb SHA512 b3ae2223a267fa74699664470a4c4f6888cf2b68e688fe61d3acca85e00a138c3a037482ef304ee26f326cba252b473d265dcd72d0e0ab5723f4b0ed6e5e04ce WHIRLPOOL c76905b7540ad1ab2186d2ce9a75a55660eb343a1cfefc835f8012f3cf10ad706ee837a995085fa327f38de8f790cc2155c540e5b0d2a6f90a0aebbf7198c7bb
+EBUILD snakeoil-0.7.4.ebuild 937 SHA256 0654b57ac19779a53e63a04793d8903bfff7dfb0629bd5039a1637722d626b89 SHA512 f47c6e9dc49a0221c082da07d2e69e00bf1a3ddf3ad59afbe82087369bd9e3e9bb4ef0b99c5871d9af6a122ca3b7ee24b10ad8d1f31c52bdb5c356960c65c76f WHIRLPOOL 2b3ab26f929989cdede48693a42e5f889d2350e5ce4724aa35eb420d4340e415615056ceafc76013525f72e55ec926a83cae56ecf47f184662f7b28fe66bec9e
+EBUILD snakeoil-9999.ebuild 937 SHA256 0654b57ac19779a53e63a04793d8903bfff7dfb0629bd5039a1637722d626b89 SHA512 f47c6e9dc49a0221c082da07d2e69e00bf1a3ddf3ad59afbe82087369bd9e3e9bb4ef0b99c5871d9af6a122ca3b7ee24b10ad8d1f31c52bdb5c356960c65c76f WHIRLPOOL 2b3ab26f929989cdede48693a42e5f889d2350e5ce4724aa35eb420d4340e415615056ceafc76013525f72e55ec926a83cae56ecf47f184662f7b28fe66bec9e
+MISC ChangeLog 4152 SHA256 9545ed5fd6cff0349c13ac49fcf390a5ecb050ac44a8e6de15ee7e232fc9f682 SHA512 1d6d572701a534fa2e889c2cbe3e40709a5eed44b78962c394cc274fc8a0cdf5d7513eba4b0e404cf793ac42b0f5f02d02708b2e892994309fca9bd4ebab70dd WHIRLPOOL 8713b2bf95d7ad9f220a376f1b78648818dcfd8aaa587a45a3ed753dc84dfe9be803c6e31e7835f30b6aaabfbe4b9fb31d2b97ec8154425102660d8cc5ad79c1
+MISC ChangeLog-2015 13095 SHA256 e8dd17a13603d005814e5afca2c6d7c3bd9f54e72780573263a0d6a5655eee7a SHA512 9283b4cf5cadbf7dab573063242caa4fe48624c27b04e0d4283bd825a1d8fc752976b174c55bb884d9550d245b8f4c6650adbc8c1dacfe918a094640b9d3b7e6 WHIRLPOOL 46c632f700f5db12ab658f98792bda693195bf50e2dc6e12bfa2eddb3c2cb52383490355171ccbd8b77a45b20bc6446ffda28bdae194938fb50b80eac36e57a5
+MISC metadata.xml 337 SHA256 390bf3df19860eff32d02ef1f8feb30a508fa9d1c3ad021dbc1a85c86fe715bf SHA512 3b9d2eb9da814c4143282cfd1ef4384ac5ab09324c1f83d0ce7caa1d1897d2a46b30964a0fa42d4690d975030abd6d3fd5bca761db4c2cf2caec549a94a8ef83 WHIRLPOOL 1a5b64d624e22da9ae7ec1be1073fd4764ef99218d1cf2272fa5fdc3e986cb5ce57c5a7c96b9fdc4a42bcf8596211282503377d8bd6596c5222b4d9e520be7db
diff --git a/dev-python/snakeoil/metadata.xml b/dev-python/snakeoil/metadata.xml
new file mode 100644
index 000000000000..632e3554b912
--- /dev/null
+++ b/dev-python/snakeoil/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">pkgcore/snakeoil</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/snakeoil/snakeoil-0.7.4.ebuild b/dev-python/snakeoil/snakeoil-0.7.4.ebuild
new file mode 100644
index 000000000000..c037456a6ebe
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.7.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="misc common functionality and useful optimizations"
+HOMEPAGE="https://github.com/pkgcore/snakeoil"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+[[ ${PV} == 9999 ]] && DEPEND+=" $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' 'python3*')"
+
+python_configure_all() {
+	# disable snakeoil 2to3 caching
+	unset PY2TO3_CACHEDIR
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
new file mode 100644
index 000000000000..c037456a6ebe
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="misc common functionality and useful optimizations"
+HOMEPAGE="https://github.com/pkgcore/snakeoil"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+[[ ${PV} == 9999 ]] && DEPEND+=" $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' 'python3*')"
+
+python_configure_all() {
+	# disable snakeoil 2to3 caching
+	unset PY2TO3_CACHEDIR
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/snappy/Manifest b/dev-python/snappy/Manifest
new file mode 100644
index 000000000000..d0218f584953
--- /dev/null
+++ b/dev-python/snappy/Manifest
@@ -0,0 +1,8 @@
+DIST python-snappy-0.5.1.tar.gz 15252 SHA256 385fb216e7d1241f70c14c2bea3f042ec235caa65d708294f1ece50d3efa5de3 SHA512 95a6389c58790aaeff61419bb9f183a29ad801733cae8144a67eb6203a8ebf6c6790bea7c025b37588dc98ebd2fed20f37857d2f30199f507f52653d2475c16b WHIRLPOOL 5119e737f44fc6346c2c4a2dbb4cea3ddd5b59d0ba886e81d7f1ebcef6298b165034d10e49db41f2deb24d2a292555981b67d9052ee0fc050943b4243cc8c2c1
+DIST python-snappy-0.5.tar.gz 12495 SHA256 c7fe37679ebfc73840c7cc83657a76bc1ac978efa286b8ac3569fd0630d2b80d SHA512 0be15ea133e3a47c6cdb2a340061bf2779d4aae4b34848cd60e6657c168a76970c41f2bae4f57993862bb65c75baa7cf6a562fcbff4c81e22fe7bac69e7d73b1 WHIRLPOOL e0a3afb0d21bd11f6935701fdd7ebc4f0149502d36852c930ea8600cef44f25eb68d3848c96560090d56e4a1c88990d8a3fb9ac6cc854e0b9eb00496501f9759
+EBUILD snappy-0.5-r2.ebuild 623 SHA256 caee6b0199f855717cb6fe7a3a2839a625732c454673a12c887af67535ea7238 SHA512 0c1c6b72bb5db6ea46dd3f101fdf5b8b2aa4418c2118a4935c4157043a4b42aa0038c3839a61a83282bb434e65717ac29f05525e78d38fb25ce2f23d256f362a WHIRLPOOL 5fd95adb986b0f02df24e73985da236de8568f2acdad1606f2deb856e8beea778c823318965c3de9259bec10ee6be4c62d086de62baacbd885c04ff8ad856e37
+EBUILD snappy-0.5-r3.ebuild 672 SHA256 fa98a74789ad3795a8e0047dc74b5386a89d233637f98f089eb1199781b55580 SHA512 647353ef9dbb7838ad465d589e9090deb60ccfad1cc22d747c2c5e713d56449691b374b19edffc8ce06129fb07772fe47813805fd0cd921b0502c64a760067d9 WHIRLPOOL 12d111b9766332300b6ce0f44b729d71d4b51ad724461fd80ab887bc40fc17bd68f3c87a548dc12e11f19888426b97ca29de6ef089a286fd436537e9eaa8a852
+EBUILD snappy-0.5.1.ebuild 698 SHA256 80c6ccba02e04946d797e34847a1bf8ff100c0d7c7d8b7c89a4ecfa248edb3c8 SHA512 146c1ada755ffe7b282dcba1d4304e772739f7cc4fe969e910770de41a36bdbe69f8b1b3ee3d51c1a5869f56b4fc2d5481fd1ceae53a4f9e9f6ec9d1473a9dbd WHIRLPOOL 64fb6f1c1f71ab5cd98b956e96b4aa6cc3daa35fcf5ce025d45ac30cb7d0418109095281436be71674d586c806a664f82ebbd3fac8e930a304b5219122ef5c52
+MISC ChangeLog 2699 SHA256 74fc98822f6083f62ac326af8f4b116895a9fbcd020f98170a39125547c21d29 SHA512 c5c2e49444753f0865c00081bbcdf64009fb22dd17f019ced21a53e812b0c23b31e59e7a18b075b7a6fa3c8849795046e141a5b922e26461c2791464f67ae022 WHIRLPOOL 984333041a33b4862f35034c1d957869ce6e50d93e17697e561190a5d690b9ad439f1b0c7264823776f016d4bf6b2e97938e5b8270ff0a8f1d00d1c31c96d449
+MISC ChangeLog-2015 1916 SHA256 f40c564442038416cd280bbf1a46ed37b68e3ce54f82831b461be9c2f78d3e2f SHA512 169a3cd6e48bd3996442c5d08fd54189cf23c19b6fcad80e38157ed501fcfb7ff4d42d87be0f9ff6c47410a8badf9fc43650acebbd5f0c1b357883cf3170c9fc WHIRLPOOL 0b72ee812db932d5ad69040680a0dd29a3af10e3b58d2d14d399cc12cd89e448ffac72ab4ba412587965547ec0b1b38f19bc0f3f5e358aecffe59caa55a6e049
+MISC metadata.xml 376 SHA256 f70a31016470697c23e1fe41ea878c1572bf277ce59e1d775b7e568c6ea893da SHA512 6760eff3990221e541650ff83fa59902230892c992209ab707ac1e8da67be6c097e50b80496500938073026ec4f81ba4016a7b43a84ddfa0f07f3171163fc1ef WHIRLPOOL 44f7a5dc40ba20113eaa96096a6c72e820ccaa5e72a1009b317796f9491832d4ed50f5c2453b065f29a32e98de4c356d6b4ab289527224f4fe0d4b824756647a
diff --git a/dev-python/snappy/metadata.xml b/dev-python/snappy/metadata.xml
new file mode 100644
index 000000000000..0c0b8793dd9c
--- /dev/null
+++ b/dev-python/snappy/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-snappy</remote-id>
+		<remote-id type="github">andrix/python-snappy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/snappy/snappy-0.5-r2.ebuild b/dev-python/snappy/snappy-0.5-r2.ebuild
new file mode 100644
index 000000000000..ca35ece82a65
--- /dev/null
+++ b/dev-python/snappy/snappy-0.5-r2.ebuild
@@ -0,0 +1,28 @@
+# 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
+
+MY_PN=python-${PN}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python library for the snappy compression library from Google"
+HOMEPAGE="https://pypi.python.org/pypi/python-snappy"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="amd64 arm x86"
+SLOT="0"
+
+DEPEND=">=app-arch/snappy-1.0.2"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	"${PYTHON}" test_snappy.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/snappy/snappy-0.5-r3.ebuild b/dev-python/snappy/snappy-0.5-r3.ebuild
new file mode 100644
index 000000000000..0aa8de1a48b7
--- /dev/null
+++ b/dev-python/snappy/snappy-0.5-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+MY_PN=python-${PN}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python library for the snappy compression library from Google"
+HOMEPAGE="https://pypi.python.org/pypi/python-snappy"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+
+RDEPEND=">=app-arch/snappy-1.0.2"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	"${EPYTHON}" test_snappy.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/snappy/snappy-0.5.1.ebuild b/dev-python/snappy/snappy-0.5.1.ebuild
new file mode 100644
index 000000000000..3460b9855fa1
--- /dev/null
+++ b/dev-python/snappy/snappy-0.5.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+MY_PN=python-${PN}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python library for the snappy compression library from Google"
+HOMEPAGE="https://pypi.python.org/pypi/python-snappy"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND=">=app-arch/snappy-1.0.2:="
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	"${EPYTHON}" test_snappy.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/snowballstemmer/Manifest b/dev-python/snowballstemmer/Manifest
new file mode 100644
index 000000000000..3f2dd3b923dd
--- /dev/null
+++ b/dev-python/snowballstemmer/Manifest
@@ -0,0 +1,7 @@
+DIST snowballstemmer-1.2.0.tar.gz 49639 SHA256 6d54f350e7a0e48903a4e3b6b2cabd1b43e23765fbc975065402893692954191 SHA512 3359657867b9478bb58e6cc67a08212a490d5af07fed7098871b1e6a59def0031bd0c2a846cc9a0d70c94c64ba4d2ccb2f41afedde61d4a7235d26f68374bd02 WHIRLPOOL bf84c482c35ef9e121f13865e43bfc4bcc6ed13959069d5da4f047309986795bcaf09a5cecaf16361d8ea8365f9bf26ca6987574b7ad2cc25572d0992946a44b
+DIST snowballstemmer-1.2.1.tar.gz 49626 SHA256 919f26a68b2c17a7634da993d91339e288964f93c274f1343e3bbbe2096e1128 SHA512 09f860f383d84d12a83c87ef6654fba4ac10bca07e8d2ce88dd428c72754110d56a4b698e125a18818699a289455bf61cf67ea68e349ee8a12d6dfff0a3fbed9 WHIRLPOOL 4e622a80688a70d29554b313ba0d15cb9e4c93c07832279c4b1c2510aeaaf051c532a53f0aea4a3e64d12ad59608b9ae6c6d881d3878f55c44c09f03e3443347
+EBUILD snowballstemmer-1.2.0.ebuild 530 SHA256 f2357e47c2258aa4fe1c913c2058bfd670396003881c06cd4cc3fddf9589a078 SHA512 ac7561a67ee2efa979d0f66035bf8419d3f53af864b87b921a78306fdb0c6d13fc63fec80953fd895a32505843b2b4ce30bd49ce5aec13ac73bde227cea8f101 WHIRLPOOL 6926e170f05e9d041509916b316782928d67395f828f5ebd2e47b27e7a994bec1675b31307d81ce65949c0938a2df9b0a94525a6df6a46e9724a7aeac975e873
+EBUILD snowballstemmer-1.2.1.ebuild 550 SHA256 5631c5144ef510794807d5edb29ba1005938048c60a50e6f444f5dd5bf3f4bab SHA512 75ad83e0a9888f1a5fed9af5bb48b329c87db29714067dc19c276f1bb26bd3185f3f11acff4fe1bfdd7c235ae564d1b415e78477334072bc6036ee6880109b37 WHIRLPOOL 3790da0339617ead95c85b6757f2948aeaad8e1967bd2cc7d5f191243692011e5c5925b42a326c0d8c7b2580ef51f03a1cb7dc79914336010ca64ffe15413a21
+MISC ChangeLog 4285 SHA256 b7747b6264b759214c4b097ec5d779253772a8898d32ab32517ca3e3ff0047ad SHA512 ce6ed8f405e59f98699f375b0412baac78ec688be1b6f41ec151ae144051cef697bd9acc4c3069584be09a1d63bdee26e37dc52371c715955b232a0fda0b5305 WHIRLPOOL f613a27ed17197c5a3955ac2a2da5b661404aed888226f7a3ac2136a2b2ba700ddb62006a54af3949ce4d79bba518e54d98c6941c089fb0ce01a64beba58e90b
+MISC ChangeLog-2015 845 SHA256 fbbc4809ce2d5e4bfe2361d71f397b772820b892c89980920492c762d2bc9cd9 SHA512 f4aee204da69b4f39b35062f259a6956fa32b3cb6e4486fab9cd46ebb5e9ccbd7b54ff5c21abecc6ad8784b0ffe51f266d1e328f746f9e3b4c808e90d5df7573 WHIRLPOOL 0f4127a9feee248581231a204553591a7055fedc04b950f1c5a340570f5e5bbdb63f4b85fd9ed75e098f20f9757eeb0ba5cf3426bc7a9b70e3f1b571368ff1a0
+MISC metadata.xml 391 SHA256 722cc9194e7b6eb516aa6e34d6e6bfd2b179006bb481ff20ce66e1ab479a4d41 SHA512 2cb0d71838a3b58a45d09a14f4205388f116011372d14a14d092a0674f4a9288609a2d7fbfd108302983997ff03f5f056e64903f0e6daa89b313df1a43891f93 WHIRLPOOL e1699c1282c2e7352b8a480dbd4cb10023850efb717f47473c6444ccaf84af8391ccec6d5fe0a0855097008c8060cf481511daece469658aa25bd891a6acbac4
diff --git a/dev-python/snowballstemmer/metadata.xml b/dev-python/snowballstemmer/metadata.xml
new file mode 100644
index 000000000000..c13062f17f29
--- /dev/null
+++ b/dev-python/snowballstemmer/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">snowballstemmer</remote-id>
+    <remote-id type="github">shibukawa/snowball_py</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
new file mode 100644
index 000000000000..3c652e497046
--- /dev/null
+++ b/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
@@ -0,0 +1,17 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Stemmer algorithms generated from Snowball algorithms"
+HOMEPAGE="https://github.com/shibukawa/snowball_py https://pypi.python.org/pypi/snowballstemmer/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
new file mode 100644
index 000000000000..b89366bc8a62
--- /dev/null
+++ b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
@@ -0,0 +1,17 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Stemmer algorithms generated from Snowball algorithms"
+HOMEPAGE="https://github.com/shibukawa/snowball_py https://pypi.python.org/pypi/snowballstemmer/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-solaris"
+IUSE=""
diff --git a/dev-python/soappy/Manifest b/dev-python/soappy/Manifest
new file mode 100644
index 000000000000..d72e9acb5838
--- /dev/null
+++ b/dev-python/soappy/Manifest
@@ -0,0 +1,5 @@
+DIST SOAPpy-0.12.22.zip 172855 SHA256 e70845906bb625144ae6a8df4534d66d84431ff8e21835d7b401ec6d8eb447a5 SHA512 d75d0bf8e88c8ecae57f51a201f9ab6f24fc41856ee2093e7e2e73e5d8618c9a766a69140df28a24b6d8493b53555c09502684c6d2fd78e90a3c53bba52f388b WHIRLPOOL 8ac248d98f9da45bcbdd9a9bf55bb7fd4b83de097ca641453c7cf18833c4dc5cd5b4e09e3e5bce3cf4be0c6c09e4e10638aa6a5244afc6cc791996b63a1c3d5e
+EBUILD soappy-0.12.22.ebuild 980 SHA256 2d727c245a54b52d955dc7e6a1ffae41d2049ae5f8146917d6c1938fc2564905 SHA512 a8f04606b5a2ab0c435b62d86af84504b8dfffb96de83106031aa731237fd46e8b5c864904b06f50a5d5aaded8faf0ddc1167936b334f959e1fe392a9f771a2e WHIRLPOOL 495ac8cc2a1e3878f25dd94b61ae0c8a6d5bf3e3cd8f6da3a9e73228b11633c367613b6246e8b1cedb4a9223eebb7a626ac2ba0897209aca65ab6590356c083d
+MISC ChangeLog 4196 SHA256 eaed1829d8f3c2cadf94ace3047801e1217b09e56e300df3e52aee566e3059b4 SHA512 a08cbd7f2c6af45270f45d1590f35b2eb6287c2989be1c428b44f13d542f94980c39bfcd9e1bbf93e449a76880de9646bcb2b6c5ba7e8f317a4b469cad5b49d5 WHIRLPOOL 4cf8fcb0207fa0251f17d14568550b6b5901c50ace95ed502952a805d19688bd6583511a78eed1fe5decf8ca21ef31a268f72eee64e9a5e4726233e084d5d714
+MISC ChangeLog-2015 7993 SHA256 b03be99ad5684ff80632b986a4cf65533f9887b5c67b87ebd7e34376cfd29594 SHA512 09595c0be6a2e27b8dac0e8e001af22e982f4f3f599887dc902678ce6afb71e8f0842c63405f3b199ff5a4ed77d53c778b7dc6fb91cfdc5d16a2d85133718076 WHIRLPOOL a5eb9317bf521514f31d36179a83f02eaa81f74716f1b476546f87082bcbfcdf3168ccc0cf13193baeebf80bad8588f16e11afde6de224c87fcd305f000428b0
+MISC metadata.xml 363 SHA256 c6a6a90920d1d54c80b6e48b95d1b7f906b588f159650bd8b57ec8e29874cbf7 SHA512 09455c1710a40712fec6cbe5680091f3186d755fbcc2c64ae4fe4c9dd50bcbcab681a2e9aefd6390c12c775b76bc76aa7a04a78a8ac23b281efc908d14285742 WHIRLPOOL 4ab1fb97fb35ecb3fef9551c808cd9915c6ba33d9e42b0f149fccff035e1eac2f0e13865e577d31e92a1497a6b08858d941e957ce89f49cf0f998208d731260f
diff --git a/dev-python/soappy/metadata.xml b/dev-python/soappy/metadata.xml
new file mode 100644
index 000000000000..d2c4066507b2
--- /dev/null
+++ b/dev-python/soappy/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">SOAPpy</remote-id>
+		<remote-id type="sourceforge">pywebsvcs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/soappy/soappy-0.12.22.ebuild b/dev-python/soappy/soappy-0.12.22.ebuild
new file mode 100644
index 000000000000..7b5ba97dfc28
--- /dev/null
+++ b/dev-python/soappy/soappy-0.12.22.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl?,xml"
+
+inherit distutils-r1
+
+MY_PN="SOAPpy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SOAP Services for Python"
+HOMEPAGE="http://pywebsvcs.sourceforge.net/ https://pypi.python.org/pypi/SOAPpy"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+
+IUSE="examples ssl"
+
+RDEPEND="dev-python/wstools[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	ssl? ( dev-python/m2crypto[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGES.txt README.txt docs/. )
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r bid contrib tools validate
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/socketio-client/Manifest b/dev-python/socketio-client/Manifest
new file mode 100644
index 000000000000..0cee43e52049
--- /dev/null
+++ b/dev-python/socketio-client/Manifest
@@ -0,0 +1,5 @@
+DIST socketio-client-0.6.6.tar.gz 21829 SHA256 beac1c1e155ca87da805f20483926535a965509b541b422bdf60ba0676fb8aed SHA512 aa21d31bf9e9062578fc6892a7624ea41ef3437eff132ff3ef2829a589c0fd19953fc514ab05161a32d06578708fb7f41b2f636d3d60a2700094e676d72cee47 WHIRLPOOL 61ab1f68bb2ede21a78e5af2788be92c0078116d498a533dae5c80516e5f6cada8bf9427df855a48c788bc857771b720f97a5ce7cdacb2e3f5637e3c12f0a470
+EBUILD socketio-client-0.6.6.ebuild 1437 SHA256 4a8bd26f23a8e455d511df317cdf8c8c949b11d8a4b01a97e849108e11c13d73 SHA512 a17df64719cc84314b3aaba03e05e5760db126c055aea5eff280d155c13b5755fe95ad2a611b169726e07f648aaa29c04fcea3f7a796919f328cec30b47787bd WHIRLPOOL 2ad0eade5dd5a092c0800bc57e05751c75a57a1b92a8ce5560e162441840d0276cdbe01f8ad7f2db840cc998b68449b7f69c93883b46596bbb35dadedc8180e6
+MISC ChangeLog 3482 SHA256 1e7895eb577390243ba544dba01b8714fa45b54c97a1dcc85a54aa319dcaf3a4 SHA512 87c6f6b0e9e67fdd1f280eb5b88a2a5acb588a0da93dbe5f44012f22deb51310255fe80b3192f89652180921cd0b4d2c92d9dddacafc2e4e6d5b21785c8cf8a9 WHIRLPOOL e381fdeed7c3dda25e51b69d714462207b04cad0e1c6c15944dfa66da8e30d0b4c1bad4d5b31827a2b3278df74eda886fe96fe578828db53e880d06299427646
+MISC ChangeLog-2015 382 SHA256 036c8c09f1c134664eea29a59a80f1f8718986cdd274d70a7b0e251a2c308581 SHA512 48909f6f47c8677255458653bd3b34725a6ffd4b6546d323ad9ec8f2cb806e522097df9a0feafc5ea3de3f91fba052cfe167bf9485bb80cef6fd6da202d0e5ce WHIRLPOOL df51851f7487eb43bd8591a50baf16e68b7ba2bfc29cf1061ffb91219d4089c526a7274bae09c3d5aac245726b4d715b22655682443cd405c6e708dfd1c88022
+MISC metadata.xml 466 SHA256 172850afbef17058fde1c040b953c8956be61fc35936d04f743bb29ed9ef3f9f SHA512 a5d48ac121de3b0334d12ff4e472aa04be849f87f8ef39222a5a112674d36390d1ca69936d675cb7a42d11e73cdc5019540091ac64b727842d515b2c96b68c09 WHIRLPOOL f5148b57c39a9ae1528e4b004c5964e9af004c6c9cc0c55aa9e547c21e0dcdbe3545d269b1f712c1591317f2b2a130de8a18d35bb9bc1c9912cb6d628755af39
diff --git a/dev-python/socketio-client/metadata.xml b/dev-python/socketio-client/metadata.xml
new file mode 100644
index 000000000000..3d1c3fb2038d
--- /dev/null
+++ b/dev-python/socketio-client/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">socketIO-client</remote-id>
+		<remote-id type="github">invisibleroads/socketIO-client</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/socketio-client/socketio-client-0.6.6.ebuild b/dev-python/socketio-client/socketio-client-0.6.6.ebuild
new file mode 100644
index 000000000000..8907a3192734
--- /dev/null
+++ b/dev-python/socketio-client/socketio-client-0.6.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="socketIO-client"
+REPO_PN="socketIO_client"
+DESCRIPTION="A socket.io client library for Python"
+HOMEPAGE="https://github.com/invisibleroads/${MY_PN}/ https://pypi.python.org/pypi/${MY_PN}"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${REPO_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/websocket-client[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${REPO_PN}-${PV}"
+
+python_test() {
+	# https://github.com/invisibleroads/socketIO-client/issues/90
+	# This runs the suite but has nill output to the screen
+	# The bug filed will hopefully yield a more conventional testsuite
+
+	# The import of SocketIO need be made with abs path to run the tests
+	sed -e 's:from .. import:from socketIO_client import:' \
+		-i ${REPO_PN}/tests/__init__.py || die
+
+	"${PYTHON}" ${REPO_PN}/tests/__init__.py || die "Tests failed under ${EPYTHON}"
+
+	# Return to original form for final install
+	 sed -e 's:from socketIO_client import:from .. import:' \
+		-i ${REPO_PN}/tests/__init__.py || die
+}
diff --git a/dev-python/socketpool/Manifest b/dev-python/socketpool/Manifest
new file mode 100644
index 000000000000..0976262ab870
--- /dev/null
+++ b/dev-python/socketpool/Manifest
@@ -0,0 +1,6 @@
+AUX socketpool-0.5.2-locale.patch 615 SHA256 630da83aeebcb1712b801afe4feddf8c7f1eb94e6f8b13e48569c0fac418afaf SHA512 df27a0b1cc8ef2475ad8c68e3f77153ccf5397e962bfae2f6116dd37d1ad3a1a45cfa0912ee4d4597560004b8875b609bb8b0a6298861651ff23ff2e70955dce WHIRLPOOL fe2ef2be3e8b6e62bd020b05bb164a2069e356db82588331d315fdf1c3d9ee746f6b0bd77dc1603e9980029cb94bd1442191a32b389b8588a46f935e8ce670b9
+DIST socketpool-0.5.3.tar.gz 9793 SHA256 a06733434a56c4b60b8fcaa168102d2386253d36425804d55532a6bbbda6e2ec SHA512 6d16a18927672157703fb5a29f4332241f9ddf743dfee8f2606d600dbb75d547f2e0dcc0398febe55df3319829a80b3f537b5877679e4f674569ef55de78c1b7 WHIRLPOOL 048693619a9813d97a82408ca26c66e847fa4710fc6051379a36e26f32f0310ae33561a6e2529a584e14795de577ce424af5b793fd4fbae9aa53c324c437fa85
+EBUILD socketpool-0.5.3.ebuild 825 SHA256 dbf4323a0b41d28c836a9b717ac06028768c9556a58178404724949d2b33c960 SHA512 2151bdc4e5b6ace91ecc0c6c81f0c10b2e8a470f2c85bdd02532bcfbd9ad4c8994a5654a473f0c63c59a4c52e934fbfe443b82b6c547b178cc2df24f6209a52c WHIRLPOOL caa8876c37e1c0e6676dc7b56af6f7df3d4f89f15ee7a50d69418215e0202c6c77fcfa36d697e84ed72a94cc8a4ee59878ecae448beff4b90d010830f576d94a
+MISC ChangeLog 3879 SHA256 ce2a7e2b9d0db7fccc49ca8244ad41179045128717190bc74ebb30bb294a9d6a SHA512 188bf5fe16ad373ab6934537ac351997026f03c9e44853ff15e5b7284fff31051131bc22f93a771656e622d26f25353db05f5ce915605b07c2c28d58157cb87e WHIRLPOOL cc66c180847f303b80a9a794cf2506c19d02424cf45255932bf95a6591d97fb24734a8924bfc2ad346a96fa88844b06158dd0bf85616acc60dfc6df49dfa4f62
+MISC ChangeLog-2015 3455 SHA256 dda640413b16ac5252a44c8991aba0a289428d7dbdaed0f1a0248e187a57bca1 SHA512 bdbfcf45563b47845530a53a4b17d52eb043054aae4b3451ebba351656b6bf734860a6d62aad463fb2bcbc5d6b72ad1093b88016387cb6519a21fc6cd309766a WHIRLPOOL 2d559830f46cbc5b9ac282dab7c729fd37b05390fb176b585ef7dc17cea6fdb50939069a3a4f3c6c2cb7f069a1d0b8749461a52fd83aab16112535798fda808b
+MISC metadata.xml 383 SHA256 a652e817862819ba421cb9624f21c10633b0610926392f16aaf951eee609bd93 SHA512 3051b0487ab4dcdf440c36b12829a30c03db7256c99eef6623497b8223ebf6cf188a9ae054342c468771b2a38f8b3508ff0f49aa19398f3aec0a25a7bc1e9248 WHIRLPOOL 90306e567a91d2c9330f33bf6bf2a0ab07e93b142c3e1b62e8fcfc81e8a15145c023730490fdb8381cd2e1882ad5375bc512963609915a3ad3b74658be9749e4
diff --git a/dev-python/socketpool/files/socketpool-0.5.2-locale.patch b/dev-python/socketpool/files/socketpool-0.5.2-locale.patch
new file mode 100644
index 000000000000..aa0af681a768
--- /dev/null
+++ b/dev-python/socketpool/files/socketpool-0.5.2-locale.patch
@@ -0,0 +1,21 @@
+diff -ur socketpool-0.5.2.orig/setup.py socketpool-0.5.2/setup.py
+--- socketpool-0.5.2.orig/setup.py	2012-08-05 12:33:47.000000000 +0800
++++ socketpool-0.5.2/setup.py	2013-02-05 00:22:13.685705089 +0800
+@@ -5,7 +5,7 @@
+ # See the NOTICE for more information.
+ 
+ 
+-import os
++import os, io
+ from setuptools import setup, find_packages
+ 
+ CLASSIFIERS = [
+@@ -22,7 +22,7 @@
+ 
+ 
+ # read long description
+-with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as f:
++with io.open(os.path.join(os.path.dirname(__file__), 'README.rst'), encoding='utf8') as f:
+     long_description = f.read()
+ 
+ DATA_FILES = [
diff --git a/dev-python/socketpool/metadata.xml b/dev-python/socketpool/metadata.xml
new file mode 100644
index 000000000000..a948c85adc2a
--- /dev/null
+++ b/dev-python/socketpool/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">socketpool</remote-id>
+    <remote-id type="github">benoitc/socketpool</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/socketpool/socketpool-0.5.3.ebuild b/dev-python/socketpool/socketpool-0.5.3.ebuild
new file mode 100644
index 000000000000..60c307504a97
--- /dev/null
+++ b/dev-python/socketpool/socketpool-0.5.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple Python socket pool"
+HOMEPAGE="https://github.com/benoitc/socketpool/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~s390 ~sh x86"
+IUSE="examples test"
+LICENSE="|| ( MIT public-domain )"
+SLOT="0"
+
+RDEPEND="$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' 'python2*')"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.5.2-locale.patch )
+
+python_test() {
+	py.test tests || die
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/sortedcollections/Manifest b/dev-python/sortedcollections/Manifest
new file mode 100644
index 000000000000..3254bcafce21
--- /dev/null
+++ b/dev-python/sortedcollections/Manifest
@@ -0,0 +1,3 @@
+DIST sortedcollections-0.5.3.tar.gz 7021 SHA256 d56d6708e36aec959b08e64c3e5a0e01df518d6e6693d0f5b5c89529288edde6 SHA512 e0076017d1a97d7dc18b02bc4e3739c535ab001260be739fab2784cb58deac4323957fe21b4c679f55a790d864ca696695a603298709225b04eae740d859ab28 WHIRLPOOL ce3693115a2e694c8908c8a1ce9027b9adccf15e38ebad36c456265440174b77620d525d898d1a914626a0a698fc75280aca549e8c78d082f6888b6c3433173f
+EBUILD sortedcollections-0.5.3.ebuild 611 SHA256 063f4c82077c2fffdd82281b8c2a150f0ed18dc543bbafc7baaf47778f622828 SHA512 1fd62359c0726bb6d4a143268119a72af47a6fa24a21f550a27f76c3778620997750c73060d6d4776c582c14d42b0ffd9b60d365fe7c650079810e28c0c0a3aa WHIRLPOOL fde06a7bde58611ecb28d45bfbc794c10854672b611fc778c12cc5a7695da7386e3fea137a936b6f4dbc86b54a930340f1a047d7d7d42904b5d6f776679c8791
+MISC metadata.xml 498 SHA256 334ec83b616ed46a85ad579be0c9a00cb1da2b41220d6577c9925aba14d96681 SHA512 d332e588cdf6194708c1e3f00e9e8159669eb36cb21b4c6eed8e5af44f09f7e71f12fe437ce889b96599994f7a9c9d7c4fa6642c2ab74cedb0490d21a3165d21 WHIRLPOOL d408a45e4c5e01377b9689ff5e6ac7e90d9a666a94007a831e6f5ec407139daf6e62d20a36190e61ef3620821fc533423f0a8bd7be6986b6857c28b202e9ce34
diff --git a/dev-python/sortedcollections/metadata.xml b/dev-python/sortedcollections/metadata.xml
new file mode 100644
index 000000000000..4c79be884169
--- /dev/null
+++ b/dev-python/sortedcollections/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Pure python sorted collection library.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">sortedcollections</remote-id>
+    <remote-id type="github">grantjenks/sortedcollections</remote-id>    
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild b/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
new file mode 100644
index 000000000000..a000cde4c13a
--- /dev/null
+++ b/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to sort collections and containers"
+HOMEPAGE="http://www.grantjenks.com/docs/sortedcontainers/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/sortedcontainers/Manifest b/dev-python/sortedcontainers/Manifest
new file mode 100644
index 000000000000..8dffc77e9cdf
--- /dev/null
+++ b/dev-python/sortedcontainers/Manifest
@@ -0,0 +1,3 @@
+DIST sortedcontainers-1.5.7.tar.gz 11970881 SHA256 0ff0442865e492bc50476b18000fb8400cf2472d14d21a92b27cd7c5184550ea SHA512 a9f2ba152c47eddfda6ad8ef7ecfbfa5d51b17afb4042b0b1e6d8b3dbc6caf6f8281af415dfcf1e356aaf80aa3212865ba926fe0d6e08961c8fbbc68adb34108 WHIRLPOOL ac1c64a49705b2a02d2eb05e8306a1ee21d494819b7331256fc8c17d5fda89c82eaf2267981408c9de92bde0c4569a0e87fa4d7d12297881c4b8b295b1df9788
+EBUILD sortedcontainers-1.5.7.ebuild 568 SHA256 79b2a41b1cba47271ca3f9c507437de70937250737bfca95e3f41edbf97b5461 SHA512 e00305d569145aec18c058765dc41d887124c5cbf27e67d16da4560a6a7278b42d0d371ad378e5e518f5457711d6e344bc55cb7f1889c0c9b4a4abf40e3cee2c WHIRLPOOL 2be491a3760e8395a9ad204071a1469495ccaf16d40e60b54b0c826de527ae58a27b2c8d842a0d7bea4ca050f0b591c801ce6a81570b77575c978f92289ed202
+MISC metadata.xml 528 SHA256 f720b726128e8d98036d319b4511f9f65ef7aefad537e5383d94f67a8c28a262 SHA512 a5783cd12e4f0e372da9b4256ab4d7cbf42727e773342d110126f5509611a335d95b949aff706658508d6bd37e633635af0f32b72f514661eae68a79072e5531 WHIRLPOOL d42dc26465c7abeed7c00a3a3f29d15da0f8486746171b781aab7a6f641a2309eab410f771c63d3b4a2e8a6d24447da66567fa548f5f67a0233df77486838da8
diff --git a/dev-python/sortedcontainers/metadata.xml b/dev-python/sortedcontainers/metadata.xml
new file mode 100644
index 000000000000..3853ea8fb1f6
--- /dev/null
+++ b/dev-python/sortedcontainers/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Python Sorted Container Types: SortedList, SortedDict, and SortedSet 
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">sortedcontainers</remote-id>
+    <remote-id type="github">grantjenks/sorted_containers</remote-id>    
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sortedcontainers/sortedcontainers-1.5.7.ebuild b/dev-python/sortedcontainers/sortedcontainers-1.5.7.ebuild
new file mode 100644
index 000000000000..2a25c2cc15f5
--- /dev/null
+++ b/dev-python/sortedcontainers/sortedcontainers-1.5.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to sort collections and containers"
+HOMEPAGE="http://www.grantjenks.com/docs/sortedcontainers/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/soya/Manifest b/dev-python/soya/Manifest
new file mode 100644
index 000000000000..5269ad9b57fa
--- /dev/null
+++ b/dev-python/soya/Manifest
@@ -0,0 +1,11 @@
+AUX soya-0.14-glu.patch 501 SHA256 523443a2dae6e24c0d3a8502475a8d7a6fef03fa3d098630f57f21297b230778 SHA512 aa834bceba523b387104cb7717701b841fb4c54be4fdd97867031ccad7303f79b99cc42cd855c81d5fcf626e6687205d8c52069da1354b9ad59c7fa7caf3c6b7 WHIRLPOOL 38e6eed05386c03ebb8f244859c7e2f9b9b3f5a085bb3f5092ae11330bb2882b4197863ceae25c03537498483e5c38efa327d9a39249f36c25b5d5c2807a5004
+AUX soya-0.15_rc1-glu.patch 515 SHA256 49d13fc1418de884d2d2d8321f814dcf04c842c5ebf5bd95abc4ea960da1808d SHA512 b9316c5e1514f7dff1c25a7c3864e02b29c4e8d84bde920186a53fd938680e487484af2c6541d285a595abab5a87e7547949f4eb7f6aee03988105e29fb09a07 WHIRLPOOL a665a3ba0b1323bd0d4e8e12690edc3bf87e2218f1f881934f72179819a850f886e3500c732061ea9537df5406ebe6a9445a115a0ea873f9a65a9053f67311ce
+AUX soya-pillow.patch 607 SHA256 cd9014c6642c918c5541084480b3768c07fcbfc7421d90a10a362110dd1413a9 SHA512 2c3bc0626a7c03dcfd9085434c372a06a68fd03bec9293a314c1f4c3a42f99aaedba8d56ca04983ddea9c94acf85c116e1a6e2cc4da7df4fa8e5a6247eb76676 WHIRLPOOL 4905391db04e457037b9c8e2abb26227e1a1d47ebf665f5242def0480f15843d40eb7c1d128d98acd960f86a18ceff0b319c9040bc82eb0ead22f6b168601c7e
+DIST Soya-0.14.tar.bz2 905659 SHA256 dcb93206d7154dc575ec6eeb7fa3ecfd6bfb78fa233db639e423857cd2a99590 SHA512 3a6d8d0523cd13d1e9e8e2260612f23dfd2d33526b40d11ea1568a3b3c3eb7172ab94b8c8e9490203128c1fbe0b840d29a04d1c7b9d93bd273eb318ad286b711 WHIRLPOOL 1e0df42cb2a066ed9d5faa043c85844729a8f637051c945ad573c3d9510b8c650583b0e5e4162b8ca4ea098c500181e2d11729e39272c9a2fadecf6b0cb83141
+DIST Soya-0.15rc1.tar.bz2 910576 SHA256 2567714bc312a171bb5b31cb854804a78cff878e8d5cd2352cf37f48c8eb6dd6 SHA512 698ad3ebb446b49dc6fb70f53cfa6b1d9f35fc854d6f5fd1dafcb1478fce01c8de694a86af02580bb2b149f086122450f1bd6fe002f87d45a5c7555911c23fc6 WHIRLPOOL 93f87c5b93fe243e3828268fb157f66fc4288c3da2cfafa3c269f0c68f486751d3958db2c705ee07c2f342f95024fdefaa6aae35e1d69fdcba96504ac7f9ac98
+DIST SoyaTutorial-0.14.tar.bz2 5223674 SHA256 86d5b8189e7f7b4269976a65f23a51291bb99c6272f2884cbd129a6e9cc6cbec SHA512 484bc93c2561aa1f2c8bd7101b75c8ea5d42a2bae7c0431ef1e7719bd86da2f47fb68129d60ce1923b26cce1b7915ab6576d0c5f6c8ee889736971be166b4623 WHIRLPOOL 035bb56a66e231cb2d7600003519c9eeca540a9eae2ccbfd15c7bda09450bc4ad5ef086f8f871d0f8284cd397e26df34a74a74e7323272b972f1789de771a612
+EBUILD soya-0.14-r1.ebuild 1408 SHA256 66eb673595a2d7723b367559a5028c7d967e46a26b34dcea2731a22093cb91df SHA512 c768eb73e0ad6c5f0468301947efe2bfec5b73364a8d6081586a30a1afd1126ed4d0cb6c8248686f3715c97b274847e30f7eadd17e52f52c6a3b726544198b9a WHIRLPOOL 5b55df86d061788125919af47f193bc38777325417d2c127796f52c5bc304fe8ae1fca91bbc5f283cd6f2b5175fc33f6251f378d15bc6a4c99a769543968ddc9
+EBUILD soya-0.15_rc1.ebuild 1424 SHA256 28e5ee8e397b4d7828b59cfe0b7c80b4b48ced9149294ab80bd58ba080f94543 SHA512 d62461204bcd0e26b596108fa967861c06fbc51cabc28cad849f0f62f821e7a77f0e5f54d60d09e7b9ddcf0cb80043a9b480eaaec857cc5561f9e4524e18f5f8 WHIRLPOOL 82bff87f57dd0bf3b4f88ed1d1ba5d51aca5ff2d2bba1b172d1afdc92ed20c9d6cb36e4b2058a436484f3d097528617e9b942dc8eb2c283db7273ea66c494062
+MISC ChangeLog 2953 SHA256 27ee5fac0e74023e648f7e72d4b111b62c22fc11ccc309a954a0f403231e72fc SHA512 5a9a3b329727bf88696293459e9890a93e5c4b57fa98ca6054bf258abda023e6e53dc31e168239101c2348c5f665c902dcba2517afbe672ffaf7c7cbb53fcf95 WHIRLPOOL 1d8500dfdefe27380d095f3fcc3187d3c9a84dac97983edb0972c062f9db281b602d31b100e493cfa0b581d0efe9c498b9653d07aaa43a76e02d14771a4406e5
+MISC ChangeLog-2015 5472 SHA256 66cd98ca6d3c9851cedc527dd0345d655386e6db66665a0bfef844e16b2b5c19 SHA512 8f77c1bf1bdbc3ddb4aad5c65edf51458d315b5203be2710ea1e93578d236e7a8c951b9c966af7865b8ecc13a42a6c8698f2247e92a517ba2991f2fa5ee0d788 WHIRLPOOL 25f936d2a8b478db5a03d8844c957f69e3d62d29c4cba6a6b032fc73e9d02e0f294c2e03839ba458e3adefcaf8de0b4937043a89e857bf46777d93f7dca27d30
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/soya/files/soya-0.14-glu.patch b/dev-python/soya/files/soya-0.14-glu.patch
new file mode 100644
index 000000000000..606114a22fb7
--- /dev/null
+++ b/dev-python/soya/files/soya-0.14-glu.patch
@@ -0,0 +1,13 @@
+Index: setup.py
+===================================================================
+--- setup.py	(revision 550)
++++ setup.py	(working copy)
+@@ -130,7 +130,7 @@
+ if sys.platform[:3] == "win":
+ 	LIBS = ["m", "glew32", "SDL", "SDL_mixer", "freetype", "cal3d", "stdc++", "ode"]
+ else:
+-	LIBS = ["m", "GLEW", "SDL", "freetype", "cal3d", "stdc++","ode"]
++	LIBS = ["m", "GLEW", "GLU" , "SDL", "freetype", "cal3d", "stdc++","ode"]
+ 	FRAMEWORKS=[]
+ 
+ SOYA_PYREX_SOURCES  = ["_soya.pyx", "matrix.c", "chunk.c"]
diff --git a/dev-python/soya/files/soya-0.15_rc1-glu.patch b/dev-python/soya/files/soya-0.15_rc1-glu.patch
new file mode 100644
index 000000000000..39463e725a5e
--- /dev/null
+++ b/dev-python/soya/files/soya-0.15_rc1-glu.patch
@@ -0,0 +1,12 @@
+diff -rupN a/setup.py b/setup.py
+--- a/setup.py	2010-01-18 15:39:57.000000000 -0600
++++ b/setup.py	2012-07-19 21:19:48.054609136 -0500
+@@ -109,7 +109,7 @@ if endian == "big":
+ if sys.platform[:3] == "win":
+ 	LIBS = ["m", "glew32", "SDL", "SDL_mixer", "freetype", "cal3d", "stdc++", "ode"]
+ else:
+-	LIBS = ["m", "GLEW", "SDL", "freetype", "cal3d", "stdc++","ode"]
++	LIBS = ["m", "GLEW", "GLU", "SDL", "freetype", "cal3d", "stdc++","ode"]
+ 	FRAMEWORKS=[]
+ 
+ SOYA_PYREX_SOURCES  = ["_soya.pyx", "matrix.c", "chunk.c"]
diff --git a/dev-python/soya/files/soya-pillow.patch b/dev-python/soya/files/soya-pillow.patch
new file mode 100644
index 000000000000..4f8df982ccf2
--- /dev/null
+++ b/dev-python/soya/files/soya-pillow.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/show_bug.cgi?id=471510
+--- a/editor/__init__.py
++++ b/editor/__init__.py
+@@ -52,7 +52,7 @@
+ 		
+ 		if obj.face.material and obj.face.material.texture:
+ 			try:
+-				import Image, ImageTk
++				from PIL import Image, ImageTk
+ 
+ 				self.image = Image.open(os.path.join(soya.path[0], obj.face.material.texture.filename))
+ 				
+@@ -71,7 +71,7 @@
+ 		self.cancel = self.master.cancel
+ 		
+ 	def label_conf(self, event = None):
+-		import Image, ImageTk
++		from PIL import Image, ImageTk
+ 		
+ 		if self.image_width != self.label.winfo_width():
+ 			self.image_width  = self.label.winfo_width()
diff --git a/dev-python/soya/metadata.xml b/dev-python/soya/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/soya/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/soya/soya-0.14-r1.ebuild b/dev-python/soya/soya-0.14-r1.ebuild
new file mode 100644
index 000000000000..edbd531a388f
--- /dev/null
+++ b/dev-python/soya/soya-0.14-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV="${PV/_}"
+MY_P="Soya-${MY_PV}"
+TUT_P="SoyaTutorial-${MY_PV}"
+
+DESCRIPTION="A high-level 3D engine for Python, designed with games in mind"
+HOMEPAGE="http://oomadness.nekeme.net/Soya/FrontPage"
+SRC_URI="
+	http://download.gna.org/soya/${MY_P}.tar.bz2
+	doc? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )
+	examples? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+DEPEND="
+	=dev-games/ode-0.11.1
+	dev-python/editobj
+	>=dev-python/pyopenal-0.1.6[${PYTHON_USEDEP}]
+	media-fonts/freefonts
+	media-libs/freetype:2
+	>=media-libs/cal3d-0.10
+	media-libs/freeglut
+	>=media-libs/freetype-2.5
+	>=media-libs/glew-1.3.3:*
+	>=media-libs/libsdl-1.2.8[opengl]
+	media-libs/openal
+	virtual/opengl
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-glu.patch"
+	"${FILESDIR}/${PN}-pillow.patch"
+)
+
+python_compile() {
+	local CFLAGS=${CFLAGS}
+	append-cflags -fno-strict-aliasing
+	distutils-r1_python_compile
+}
+
+python_install_all() {
+	use doc && DOCS=( "${WORKDIR}/${TUT_P}/doc"/{soya_guide,pudding/pudding}.pdf )
+	use examples && EXAMPLES=( "${WORKDIR}/${TUT_P}"/tutorial )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/soya/soya-0.15_rc1.ebuild b/dev-python/soya/soya-0.15_rc1.ebuild
new file mode 100644
index 000000000000..874b44e3b510
--- /dev/null
+++ b/dev-python/soya/soya-0.15_rc1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python2_7)
+
+inherit distutils-r1 eutils
+
+MY_PN="Soya"
+MY_PV="${PV/_}"
+MY_P="Soya-${MY_PV}"
+TUT_P="SoyaTutorial-0.14"
+
+DESCRIPTION="A high-level 3D engine for Python, designed with games in mind"
+HOMEPAGE="http://home.gna.org/oomadness/en/soya3d/index.html"
+SRC_URI="http://download.gna.org/soya/${MY_P}.tar.bz2
+	doc? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )
+	examples? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+DEPEND=">=dev-games/ode-0.10[-double-precision]
+	dev-python/editobj
+	dev-python/pillow
+	>=dev-python/pyopenal-0.1.6
+	media-fonts/freefonts
+	>=media-libs/cal3d-0.10
+	media-libs/freeglut
+	>=media-libs/freetype-2.1.5
+	>=media-libs/glew-1.3.3:*
+	>=media-libs/libsdl-1.2.8[opengl]
+	media-libs/openal
+	virtual/opengl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-glu.patch"
+)
+
+src_unpack() {
+	if [ ${A} != "" ]; then
+		unpack ${A}
+	fi
+
+	mv "${WORKDIR}/${MY_P}" "${WORKDIR}/${MY_PN}"
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	insinto /usr/share/${PF}
+	if use doc; then
+		cd "${WORKDIR}/${TUT_P}/doc"
+		doins soya_guide.pdf pudding/pudding.pdf || die "doins failed"
+	fi
+	if use examples; then
+		cd "${WORKDIR}/${TUT_P}"
+		doins -r tutorial || die "doins failed"
+	fi
+}
diff --git a/dev-python/spark-parser/Manifest b/dev-python/spark-parser/Manifest
new file mode 100644
index 000000000000..dd07edce52d7
--- /dev/null
+++ b/dev-python/spark-parser/Manifest
@@ -0,0 +1,8 @@
+DIST spark_parser-1.5.1.tar.gz 111933 SHA256 b6753103f3744deefde7f841c275e4d15d813059a5b575ca7df28fa45480f83a SHA512 d46e4bf27b867e7e20e5d9d226d606428cc2173afdca27d5f8d26db2515a7ecb89b7a27cb091ff3d7d7c9cde748cc0e027b1f9212a2fc7b75144e156d16c8916 WHIRLPOOL 878054b393b6c2d74e46dcf2ba88f8966c45fedacc08557e31900718bd995cbc51a34b822657c8ee81af11b712cedda7358dfb77261dd5cb9a2150144d52b989
+DIST spark_parser-1.6.0.tar.gz 133871 SHA256 3311ad40c8e0b4aa29edfd1ec93a6c81c3f406a4e8ec4d02db1ec39402fb60a9 SHA512 56a89114b35449f0bcd34e2d8c6363d249b839395827fde791c0ec2e425f75a5e5e48d960a5a3c115ca4c7088ea720aba1be03c8b55611d14b18d07f9873a91c WHIRLPOOL c76d0da7c24b7b9a8bf5b4c79dcb8c9ab5d0dbd6f413df1f4e651a99fb75e003279e8fc5010fa63398c1576ac02df6b142ee3f6b37214d7e1146812e240af97c
+DIST spark_parser-1.6.1.tar.gz 134114 SHA256 77bc483450edb0d6ab22023799e6c77e7c64603774bf716a4effb3b280bdeda5 SHA512 290069ebe37aa4d5dddacefe3a4d48607076990fe1f27f914d154fa48a5249cddd0c9d238b7e4c7a9a52ddfc054a3cd5639e52b618b5f4bc5b833c4e38b21c2b WHIRLPOOL 97552df0c4228c2bde498873c7de36866a6d9d3abcfc69f9fe7101ab889094fcf92ac87e1c62230c9093cc3ecf5705205123a3872ee1e2f8a8540708d16ef2fd
+EBUILD spark-parser-1.5.1-r1.ebuild 699 SHA256 f8cad6021c40ba8f6e3dc262b69642f3ebbf3403da1eac6fb706fa3d4da13be3 SHA512 4442cb5d9701bf0c0c49bbe135e9f57dc36979b8529ae2b1fb7780470b8aa280b712abef8bc884be2ff32ae174c32b8d7e02271228b59015d1fe7ee870ce81c0 WHIRLPOOL 76b90db5c602469ea11ccaf4ae927c8ec003d983ce8b7f3ec0c944204aa85ee28f68205ae6fe239b928e5ce11745816dba8d4e96b1e5960924e342c6b6a087d3
+EBUILD spark-parser-1.6.0.ebuild 701 SHA256 606f90cae4348e7095b49914e0d1e5c3a7b8751ad08c598b893c2ac5343f508f SHA512 5f5ac355734935b021a15ab4bfc4d5ef47cd20c192d16236433b5defed394bfa96fc1b3fd212877a542a06871430dcb8a7190284b2014cb574e77008d951f066 WHIRLPOOL d2e3de16c0808936ffd97e79b2dda5db658be838f30b58f552f1fd0cfb981cfa68fc559161110739dfc6bcab97c3c47ffc58b63d231b43d7090878871947f68f
+EBUILD spark-parser-1.6.1.ebuild 701 SHA256 606f90cae4348e7095b49914e0d1e5c3a7b8751ad08c598b893c2ac5343f508f SHA512 5f5ac355734935b021a15ab4bfc4d5ef47cd20c192d16236433b5defed394bfa96fc1b3fd212877a542a06871430dcb8a7190284b2014cb574e77008d951f066 WHIRLPOOL d2e3de16c0808936ffd97e79b2dda5db658be838f30b58f552f1fd0cfb981cfa68fc559161110739dfc6bcab97c3c47ffc58b63d231b43d7090878871947f68f
+MISC ChangeLog 1250 SHA256 2530a3e73ccb3bab3e452e2029ae3da6a6466cf06cb0f32d5853a1ca8d4d0d80 SHA512 f48533b138191d811c1afa2ab0002ebcf8b95f1c1b6ce8e9d88d4646583f92b52138e9d7a2191675320b21152726778dcc165b459bc94263af01af770b5df6fa WHIRLPOOL cae014c424469ddc77892315c537409b517559ae931f8929a5c38746554aa198a5da47d7e8445fc5950973fa2df084fdd2f827cbc40c2367263a189193061dca
+MISC metadata.xml 918 SHA256 36a7c2d461fc8226a8285fe6c0b9f2bec8603896f0f8ff0714ac18fc63153656 SHA512 922a9467a1a162e331316b6d92305c88cf6074d7e713be5f21fc3af59fc4b2c958038b939476545820cdffa1b91d7a16911e0a45205bfa2f426c1eb9f516d17d WHIRLPOOL 06875106d06a146246997336b2b271dd65e658730e9dd04a482503ceea2f5741550b65c40a31e1b07b386d28299521cd9de4e74bd7daa44830dfe462538d3268
diff --git a/dev-python/spark-parser/metadata.xml b/dev-python/spark-parser/metadata.xml
new file mode 100644
index 000000000000..8728c4b35be4
--- /dev/null
+++ b/dev-python/spark-parser/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>rb@dustyfeet.com</email>
+			<name>Rocky Bernstein</name>
+		</maintainer>
+		<remote-id type="pypi">spark_parser</remote-id>
+		<remote-id type="github">rocky/python-spark</remote-id>
+	</upstream>
+	<longdescription>SPARK stands for Scanning, Parsing, and Rewriting Kit.
+		It uses Jay Early’s algorithm for parsing context free grammars, and
+		comes with some generic Abstract Syntax Tree routines. There is also a
+		prototype scanner which does its job by combining Python regular
+		expressions.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/spark-parser/spark-parser-1.5.1-r1.ebuild b/dev-python/spark-parser/spark-parser-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..f2dccf0862cd
--- /dev/null
+++ b/dev-python/spark-parser/spark-parser-1.5.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy)
+
+inherit distutils-r1
+
+MY_PN="spark_parser"
+
+DESCRIPTION="An Early-Algorithm Context-free grammar Parser"
+HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.python.org/pypi/spark_parser"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	emake check
+}
diff --git a/dev-python/spark-parser/spark-parser-1.6.0.ebuild b/dev-python/spark-parser/spark-parser-1.6.0.ebuild
new file mode 100644
index 000000000000..032761c8c32d
--- /dev/null
+++ b/dev-python/spark-parser/spark-parser-1.6.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+MY_PN="spark_parser"
+
+DESCRIPTION="An Early-Algorithm Context-free grammar Parser"
+HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.python.org/pypi/spark_parser"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	emake check
+}
diff --git a/dev-python/spark-parser/spark-parser-1.6.1.ebuild b/dev-python/spark-parser/spark-parser-1.6.1.ebuild
new file mode 100644
index 000000000000..032761c8c32d
--- /dev/null
+++ b/dev-python/spark-parser/spark-parser-1.6.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+MY_PN="spark_parser"
+
+DESCRIPTION="An Early-Algorithm Context-free grammar Parser"
+HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.python.org/pypi/spark_parser"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	emake check
+}
diff --git a/dev-python/sparql-wrapper/Manifest b/dev-python/sparql-wrapper/Manifest
new file mode 100644
index 000000000000..c5428a52547a
--- /dev/null
+++ b/dev-python/sparql-wrapper/Manifest
@@ -0,0 +1,7 @@
+DIST SPARQLWrapper-1.7.6.tar.gz 26597 SHA256 dccabec900eb9c97cb47834bd4b66ceaeb4d9ea11bae24a24fe734e9f48522f8 SHA512 cbaafe8986f7da88efc383ee7e694559c9314244a03f616e5f2afd186205ad625fe0601a2316013add4c11621fc697aa6d4672f8bbabdc485c11e873ca6342cb WHIRLPOOL 818cd215224a1d362c1e03286190e5ec8b7f465cbc837b136963e70948272450fc99dbcf22b065101546664dd5a7c1088703a578a2b8e0fb378dbb74630ef254
+DIST SPARQLWrapper-1.8.0.tar.gz 28775 SHA256 3b46d0f18ca0b65b8b965d6d1ae257b229388400b06e7dc19f0a51614dc1abde SHA512 bdfa3d5efc2deb8202a27e8a4770cb69ce57c1a71133788fe7acf8aa4cbc2d74024fd5f7fe5188a0fbebd399d31f62ca23d85f7ebae5562046b5b782311d8907 WHIRLPOOL bb925f312aa94c081eb3129348bc79b3bf7a3cabadfee8ad0929e8aa0b9e7d1a21679411f5043464b26ef32a65ddb258d8d5d3e96347740a1d3dc2620828e30b
+EBUILD sparql-wrapper-1.7.6.ebuild 607 SHA256 3c0bce79f10c63110ea003a3692966e6dd7fcccbfbc16107fffa50f3e8a368e4 SHA512 cbe8508cfdc3eaac33ba07cee40fe8410aeac49d192e854854dc865af61cadc6a9b93bad42d12458b283638c2eea074ce3617db5bf4aac4de47a654d09711016 WHIRLPOOL d9f619b7c9c12fac64be67cfbfc139ad2f74e8ba86bc466e5b86a31cd35ef9713557d9333e1f98484f03b1e9de590809113542b337fe8409f569980a2a8903a9
+EBUILD sparql-wrapper-1.8.0.ebuild 619 SHA256 d2831b57da40ea8aa808b455821469340f55cc0c5b3c41738888681521b7bf20 SHA512 afc4f31832d006dbc21a21312839204cb31b4da59ac2bb49d0df34167e3a282554d0dc1476667db92cefac06fe87b0c781b4b789d69f7994902512cc505e15df WHIRLPOOL f80ae0c43948578e1c7cbd60a111d981fb3f2d66752b9ed36fed3b5544faf0d5013b738541af237c5869a01284b4c5a9819115b122f36d0261d268e551cfd05f
+MISC ChangeLog 3949 SHA256 3c5064e635ff900e6701ae81d9c6dcbac09ecffe4de5d3fa717267d4c6ce6677 SHA512 b2be4716b020f2414fa51657b514d1c83b0c023a6d8cc693fd929e3cb65d5bedbab0ea628f25a9aef17910f865c2e5d6f4907b1c76bf062316bbfce48fa3f95e WHIRLPOOL c952ecb30fa3d396ba36d6fa30b2e8ebc58a7273567f9560b435240b12220f271608d9064a85d9985abc4fee87cae68262cfa19ecd263302b10baec10bdc8f4a
+MISC ChangeLog-2015 2328 SHA256 4827b58526e45ce350303bbb37f2955d45d7fd0c4f0c963aa8e94ef32e80882b SHA512 e479ccfea016a043de07126285ca546e6851904714d5243a4dbd6488f7da0fe90f712d125956df379d93e8967eb87ec69c23518ba96badbe0b8939a9826001e7 WHIRLPOOL b1825a82e5347b977abafa18c75bed8ee00909848fbed86f3355085ea6ba976c664e5a99c0d40052105ef9dfb05073a47392644ae9af1cc69dc463154af30d59
+MISC metadata.xml 326 SHA256 8cce05965ba44b69229b73d1887f8b2ad20dccc7e201194fc9e8c3ad2ec55019 SHA512 9cc7b41b1ba7fbcde0ecce7638a3b2df50d6290d65d9854ae6611ed144220d9b292235ab8916330c828a4f9a1c5605de6d0d71d1a08fb0f6ddf37f7302c03e40 WHIRLPOOL 866f61d9e6d3ca34381314fe42075f39750a8be3b907c29d5f1c53eebdcd2ea638c8418db68537631641e13478d0dc857cefe97898cf8aa82b5fe395e2c910cd
diff --git a/dev-python/sparql-wrapper/metadata.xml b/dev-python/sparql-wrapper/metadata.xml
new file mode 100644
index 000000000000..5e6f0d6069be
--- /dev/null
+++ b/dev-python/sparql-wrapper/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">SPARQLWrapper</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.7.6.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.7.6.ebuild
new file mode 100644
index 000000000000..2304f727fd38
--- /dev/null
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.7.6.ebuild
@@ -0,0 +1,24 @@
+# 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
+
+MY_PN=SPARQLWrapper
+DESCRIPTION="Wrapper around a SPARQL service"
+HOMEPAGE="https://pypi.python.org/pypi/SPARQLWrapper"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/rdflib-2.4.2[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
new file mode 100644
index 000000000000..179b9cf30636
--- /dev/null
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+MY_PN=SPARQLWrapper
+DESCRIPTION="Wrapper around a SPARQL service"
+HOMEPAGE="https://pypi.python.org/pypi/SPARQLWrapper"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/rdflib-2.4.2[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/speaklater/Manifest b/dev-python/speaklater/Manifest
new file mode 100644
index 000000000000..515bedd51b50
--- /dev/null
+++ b/dev-python/speaklater/Manifest
@@ -0,0 +1,5 @@
+DIST speaklater-1.3.tar.gz 3582 SHA256 59fea336d0eed38c1f0bf3181ee1222d0ef45f3a9dd34ebe65e6bfffdd6a65a9 SHA512 ae137d94c497cd4214e230c8906f3ba40e092f248206d37b61de2571567e39e27b7f58bcf2145bd0c81c195c3c5ed03fc0428e0a50c657c5c909ec82719454ef WHIRLPOOL 9e9edc0f6b9943f515eb36a13b038402e4093dfeb302f856858000ce87316508d31aafaf85e67e332b8bdfccec518912d87c61b3e45c930bd22bafc3dae8e1f9
+EBUILD speaklater-1.3-r1.ebuild 800 SHA256 a48e625be3c381956b402c02f0f227d7e550d875c6414dc7a5191969197a7333 SHA512 ad57ebea2ffc6a8c2b8ddef9ba1b07ded60615b1b41fd3137b01d3938650210a0840091246a77a74ededcfa885e67b26b25fcca61285290c0ecebe831225453f WHIRLPOOL 53a874c92122a6b837b9888529fc101144d7b1488f1546836619d5babc059fdfef487808787f28eb63cca81a518802f37d8d2a325119ccb70341d52d9074856a
+MISC ChangeLog 2851 SHA256 d72de598751f885532b0155663ab482d504506ea78d0fb8b70e38963c97d4280 SHA512 111d015834abbc15a65e41fcfa9c03bf6053244b2ed2035dd9525528b64af0e20925266446f122a4ae12d873f1aff1a35abf98e69a72a8234eed5d41f71b714e WHIRLPOOL f02c7f5a3bcdd3e247810836d8046606d6c16146f8128c6741074cdbf963b3f3b577639e0c04c3764d81403ad865cdb8e77ee6c15b659aa37148c7a528b9de9e
+MISC ChangeLog-2015 1361 SHA256 d5ff6d09c5b2097f65c8e3b08c41ab73b85301a99c79ab3a33b7c23a5fb98a09 SHA512 2e4e763186acf427a2b9c5a638b83c1324af54fdb915fe85cf3506cb2603ecb3222c5c95f7c4061a9362b331caa929e25ca97fea56d40dd53ee8dae13d9589b7 WHIRLPOOL 00d7a4034e68e63c355a0d18b96d11621650283dd4ad113d023ee23cc8fe7148275427a735210979fa2edd2193159f7a570907a73d7db0f9fd19b107650c7d6e
+MISC metadata.xml 455 SHA256 4df3190756bda26368b6b28c1f27002e39315c5cbc07429b20466da27625ed87 SHA512 8108151c4b3dec1c435e76c7caea98d68913812d32ae75cc72d000fbe90d20ad726dbbaa1186ea1443d1c4323785bab06006a4bb3176684fea6e534ab3d21e91 WHIRLPOOL 209cddb7f410ccaf331bb9c871fd4a9dab8324e4e0f895d780e52c4f537b6bd220578cb3e0f469151a0dcfebfe2c16e8342d508ef9e20ebb3ea3508251e4f79a
diff --git a/dev-python/speaklater/metadata.xml b/dev-python/speaklater/metadata.xml
new file mode 100644
index 000000000000..f4503d2e5e21
--- /dev/null
+++ b/dev-python/speaklater/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">speaklater</remote-id>
+    <remote-id type="github">mitsuhiko/speaklater</remote-id>
+    <bugs-to>https://github.com/mitsuhiko/speaklater/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/speaklater/speaklater-1.3-r1.ebuild b/dev-python/speaklater/speaklater-1.3-r1.ebuild
new file mode 100644
index 000000000000..dc338920e916
--- /dev/null
+++ b/dev-python/speaklater/speaklater-1.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+inherit distutils-r1
+
+DESCRIPTION="Lazy strings for Python"
+HOMEPAGE="https://github.com/mitsuhiko/speaklater"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_prepare() {
+	# https://github.com/mitsuhiko/speaklater/issues/2
+	if python_is_python3; then
+		2to3 -n -w --no-diffs ${PN}.py || die
+		2to3 -d -n -w --no-diffs ${PN}.py || die
+		# fix unicode in doctests
+		sed -ri "s/(^ {4}l?)u'/\1'/" ${PN}.py || die
+	fi
+}
+
+python_test() {
+	"${PYTHON}" -m doctest -v ${PN}.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/spectral-cube/Manifest b/dev-python/spectral-cube/Manifest
new file mode 100644
index 000000000000..4dc4c5ca445d
--- /dev/null
+++ b/dev-python/spectral-cube/Manifest
@@ -0,0 +1,5 @@
+AUX spectral-cube-0.4.0-looseversion.patch 6250 SHA256 26a56223699fcb448efce2ab0a35e8dc42893c3f91fc5a9b5ea961da4e4fcceb SHA512 caaec6f1e405e6986a148495be716e120ac8a6abb0738d7f1906efde4d4097966b10fce73dd8b538b3ea616a5245ffb1b876c1a16ad85e2362206b7d0d52ffdb WHIRLPOOL 070914bae28f9671505dd88301e45a69a65b78104272e539f3e4e6cf19ca6ee5de04a1b55f0500d0872b3b0c2ebed262f355c9bfd65a24aaf76d0545821688e8
+DIST spectral-cube-0.4.0.tar.gz 290453 SHA256 a08e60b314c0f6e44a3207725f962e4b9d4c9196232344f83828ca376d4c7877 SHA512 20970d1be0d836bd07ea96ee909300f28eaf2ab4ded7b4525eb68399d242b864fe93120a16ef2ef35eba5f547c0cbe90b07c27ef44ab1910dbbe97230fbab84e WHIRLPOOL 66c7d9b6d41c050dcd56048951a5a6a8c0306ae180a3042a7a066d4edd5f4ae654fad27ab325ca3e78d7a3e92d0167bc5057ca069e8db960aa23c4b18fcf78ab
+EBUILD spectral-cube-0.4.0.ebuild 1220 SHA256 997721224047bfd44d5a86a302103a60e7f2b15d7f6eab5b2031e68182a38c96 SHA512 ce81e06d16155c7ede52b180a5068d9cbda36c59657d6d8f2aecb6dd4f6d49457af2195169ef771a6fc5ee2dd55c1f7c26bda8114465c438b07e63b94da79a9b WHIRLPOOL 1538df1de461877c7f228fca53ee4560db3cc1edec31c3c8252830d0b63edc37490a0341f17dc23310b8dc8f72ddf87f5bdd4e309adec0bbb6a0a25db471b1c0
+MISC ChangeLog 382 SHA256 ec1e930d0cd892be7bdd9ad7740d1d1430f03581506e7e34bc0c4f550f80ba70 SHA512 e82a3b2383e37624cbef7518f0e4937a6e58b0122b550f23d306a332cad4b96c4851c612286bededf79ff9e6fe67a30d2e02b022748adf6b57c170394799538c WHIRLPOOL 0b7c350427ad220e8fe6c51c932382bf0fb59b453f70f6cfa03f70813d06dc0753c7b3108300e9549bd1b72cdf906231e90d541fe857d4bdc031153d05aa5e58
+MISC metadata.xml 773 SHA256 c097f01e6f5b77eddceec4f49b7a3abc96ba110cd64478bba381febc18119327 SHA512 407cdc09e494af2429bf809dc946bc7e05c300e9e4cbad68e75021628f2cfc187561c3a183081cf13cb7b892631d2bceebd5ae0a0109957a1936ec64ea4f6d4f WHIRLPOOL d00c818f543e02c99a2f6ef845e72a5ee34ce10e62c59265c9981b48249dade29de4f51c3cde5f860fca9493af20e8a825871240522180b0c31001f639e3f48b
diff --git a/dev-python/spectral-cube/files/spectral-cube-0.4.0-looseversion.patch b/dev-python/spectral-cube/files/spectral-cube-0.4.0-looseversion.patch
new file mode 100644
index 000000000000..42147de559a5
--- /dev/null
+++ b/dev-python/spectral-cube/files/spectral-cube-0.4.0-looseversion.patch
@@ -0,0 +1,139 @@
+From: Ole Streicher <olebole@debian.org>
+Date: Tue, 12 Jul 2016 08:54:59 +0200
+Subject: Use LooseVersion instead of StrictVersion.
+
+StrictVersion fails on numpy RCs. LooseVersion is a compromise until something better is available.
+---
+ spectral_cube/np_compat.py                |  4 ++--
+ spectral_cube/spectral_cube.py            |  4 ++--
+ spectral_cube/tests/test_masks.py         |  4 ++--
+ spectral_cube/tests/test_moments.py       |  4 ++--
+ spectral_cube/tests/test_spectral_cube.py | 10 +++++-----
+ 5 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/spectral_cube/np_compat.py b/spectral_cube/np_compat.py
+index e72b4d9..dd9080a 100644
+--- a/spectral_cube/np_compat.py
++++ b/spectral_cube/np_compat.py
+@@ -1,7 +1,7 @@
+ from __future__ import print_function, absolute_import, division
+ 
+ import numpy as np
+-from distutils.version import StrictVersion
++from distutils.version import LooseVersion
+ 
+ def allbadtonan(function):
+     """
+@@ -11,7 +11,7 @@ def allbadtonan(function):
+     """
+     def f(data, axis=None):
+         result = function(data, axis=axis)
+-        if StrictVersion(np.__version__) >= StrictVersion('1.9.0'):
++        if LooseVersion(np.__version__) >= LooseVersion('1.9.0'):
+             if axis is None:
+                 if np.all(np.isnan(data)):
+                     return np.nan
+diff --git a/spectral_cube/spectral_cube.py b/spectral_cube/spectral_cube.py
+index 231245d..fa61119 100644
+--- a/spectral_cube/spectral_cube.py
++++ b/spectral_cube/spectral_cube.py
+@@ -34,7 +34,7 @@ from .lower_dimensional_structures import (Projection, Slice, OneDSpectrum,
+                                            LowerDimensionalObject)
+ from .base_class import BaseNDClass, SpectralAxisMixinClass, DOPPLER_CONVENTIONS
+ 
+-from distutils.version import StrictVersion
++from distutils.version import LooseVersion
+ 
+ __all__ = ['SpectralCube', 'VaryingResolutionSpectralCube']
+ 
+@@ -2072,7 +2072,7 @@ class BaseSpectralCube(BaseNDClass, SpectralAxisMixinClass):
+         import yt
+ 
+         if ('dev' in yt.__version__ or
+-            StrictVersion(yt.__version__) >= StrictVersion('3.0')):
++            LooseVersion(yt.__version__) >= LooseVersion('3.0')):
+ 
+             from yt.frontends.fits.api import FITSDataset
+             from yt.units.unit_object import UnitParseError
+diff --git a/spectral_cube/tests/test_masks.py b/spectral_cube/tests/test_masks.py
+index 9116cb3..42a2125 100644
+--- a/spectral_cube/tests/test_masks.py
++++ b/spectral_cube/tests/test_masks.py
+@@ -14,7 +14,7 @@ from .. import (BooleanArrayMask, SpectralCube, LazyMask, LazyComparisonMask,
+                 FunctionMask, CompositeMask)
+ from ..masks import is_broadcastable_and_smaller, dims_to_skip, view_of_subset
+ 
+-from distutils.version import StrictVersion
++from distutils.version import LooseVersion
+ 
+ 
+ def test_spectral_cube_mask():
+@@ -370,7 +370,7 @@ def test_flat_mask():
+     assert np.all(cube.sum(axis=0)[mask_array] == mcube.sum(axis=0)[mask_array])
+     assert np.all(np.isnan(mcube.sum(axis=0)[~mask_array]))
+ 
+-@pytest.mark.skipif(StrictVersion(np.__version__) < StrictVersion('1.7'),
++@pytest.mark.skipif(LooseVersion(np.__version__) < LooseVersion('1.7'),
+                     reason='Numpy <1.7 does not support multi-slice indexing.')
+ def test_flat_mask_spectral():
+     cube, data = cube_and_raw('adv.fits')
+diff --git a/spectral_cube/tests/test_moments.py b/spectral_cube/tests/test_moments.py
+index 9b118fd..82eff40 100644
+--- a/spectral_cube/tests/test_moments.py
++++ b/spectral_cube/tests/test_moments.py
+@@ -1,7 +1,7 @@
+ from __future__ import print_function, absolute_import, division
+ 
+ import warnings
+-from distutils.version import StrictVersion
++from distutils.version import LooseVersion
+ 
+ import pytest
+ import numpy as np
+@@ -78,7 +78,7 @@ axis_order = pytest.mark.parametrize(('axis', 'order'),
+                                      (1, 0), (1, 1), (1, 2),
+                                      (2, 0), (2, 1), (2, 2)))
+ 
+-if StrictVersion(astropy.__version__[:3]) >= StrictVersion('1.0'):
++if LooseVersion(astropy.__version__[:3]) >= LooseVersion('1.0'):
+     # The relative error is slightly larger on astropy-dev
+     # There is no obvious reason for this.
+     rtol = 2e-7
+diff --git a/spectral_cube/tests/test_spectral_cube.py b/spectral_cube/tests/test_spectral_cube.py
+index 025e6bd..4dce3bb 100644
+--- a/spectral_cube/tests/test_spectral_cube.py
++++ b/spectral_cube/tests/test_spectral_cube.py
+@@ -4,7 +4,7 @@ import operator
+ import itertools
+ import warnings
+ import mmap
+-from distutils.version import StrictVersion, LooseVersion
++from distutils.version import LooseVersion, LooseVersion
+ 
+ # needed to test for warnings later
+ warnings.simplefilter('always', UserWarning)
+@@ -468,12 +468,12 @@ class TestNumpyMethods(BaseTest):
+         scmed = self.c.apply_numpy_function(np.median, axis=0)
+         # this checks whether numpy <=1.9.3 has a bug?
+         # as far as I can tell, np==1.9.3 no longer has this bug/feature
+-        #if StrictVersion(np.__version__) <= StrictVersion('1.9.3'):
++        #if LooseVersion(np.__version__) <= LooseVersion('1.9.3'):
+         #    # print statements added so we get more info in the travis builds
+-        #    print("Numpy version is: {0}".format(StrictVersion(np.__version__)))
++        #    print("Numpy version is: {0}".format(LooseVersion(np.__version__)))
+         #    assert np.count_nonzero(np.isnan(scmed)) == 5
+         #else:
+-        #    print("Numpy version is: {0}".format(StrictVersion(np.__version__)))
++        #    print("Numpy version is: {0}".format(LooseVersion(np.__version__)))
+         assert np.count_nonzero(np.isnan(scmed)) == 6
+ 
+         scmed = self.c.apply_numpy_function(np.nanmedian, axis=0)
+@@ -667,7 +667,7 @@ def test_read_write_rountrip(tmpdir):
+     assert cube.shape == cube.shape
+     assert_allclose(cube._data, cube2._data)
+     if (((hasattr(_wcs, '__version__')
+-          and StrictVersion(_wcs.__version__) < StrictVersion('5.9'))
++          and LooseVersion(_wcs.__version__) < LooseVersion('5.9'))
+          or not hasattr(_wcs, '__version__'))):
+         # see https://github.com/astropy/astropy/pull/3992 for reasons:
+         # we should upgrade this for 5.10 when the absolute accuracy is
diff --git a/dev-python/spectral-cube/metadata.xml b/dev-python/spectral-cube/metadata.xml
new file mode 100644
index 000000000000..0cc45ca202a5
--- /dev/null
+++ b/dev-python/spectral-cube/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    The spectral-cube astronomy python module provides an easy way to
+    read, manipulate, analyze, and write data cubes with two
+    positional dimensions and one spectral dimension, optionally with
+    Stokes parameters. It aims to be a versatile data container for
+    building custom analysis routines.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">spectral-cube</remote-id>
+    <remote-id type="github">astropy/spectral-cube</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/spectral-cube/spectral-cube-0.4.0.ebuild b/dev-python/spectral-cube/spectral-cube-0.4.0.ebuild
new file mode 100644
index 000000000000..a3c130ebbf28
--- /dev/null
+++ b/dev-python/spectral-cube/spectral-cube-0.4.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit distutils-r1
+
+DESCRIPTION="Manipulate astronomical data cubes with Python"
+HOMEPAGE="https://spectral-cube.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="dev-python/astropy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${P}-looseversion.patch )
+
+python_prepare_all() {
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		PYTHONPATH="${BUILD_DIR}"/lib \
+				  esetup.py build_sphinx --no-intersphinx
+	fi
+}
+
+python_test() {
+	pushd spectral_cube/tests/data > /dev/null
+	"${PYTHON}" make_test_cubes.py
+	popd > /dev/null
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/specutils/Manifest b/dev-python/specutils/Manifest
new file mode 100644
index 000000000000..f613cdf39434
--- /dev/null
+++ b/dev-python/specutils/Manifest
@@ -0,0 +1,6 @@
+DIST specutils-0.2.2.tar.gz 3349951 SHA256 85dba626e4ea2750eadb65e0a16147bc33e174f68e412c5d53688560e0e3f6f7 SHA512 34afeaa33dc529372b926d905024c88786fd622864b35c3d811ce9f99ac26146b13951ed6334e1041c98b0f31ed86e60f21ec9306808b5d52167d9349f139e07 WHIRLPOOL fb177acb76f53314db1c786ad5811861553254939d9568d7acbef774e877a7a085943f99b956a32fd5b378905e19258d6000d437c4c56230bd31b9dd70d82a65
+DIST specutils-0.2.tar.gz 3348219 SHA256 e232013a0615105b07a388be1a5faca2b26a71ee19dcf454508229188356df98 SHA512 ac05a795ddf3e690c7f5f7fe1a4b0340b546363ac132ce78bedc6ce364feb7418d896e18302ce391717cc507dbd37de210f5b6dfcfda2c44f9f8e0191619bace WHIRLPOOL 885e8060519842652d845a5afb69fecea5768ba00d7e05877e31349a546ad80b36a132fb0e4ca6ae82b8eb9a7c49dc5180baaf245051c62f3776c74f060f35ca
+EBUILD specutils-0.2.2.ebuild 1245 SHA256 540d903ecb1a74587e516d2f59c067edb37c94b8b00693a67e3404628d610694 SHA512 72a2c8a9eb81ee112101db51b6df8611574e0fbacd9f3b76a7d33c247c95877b3d41ffcc8589d4e593b9545a6f069f5c2fd6de20e41fc1e0248e2cabef57a31e WHIRLPOOL f40fa089cf8728e4e0822967cc88e865eba8d9138b1afedc826407862a3d698a2a2b5ae05e2d18a97142bb14809a73f044c4bf2e1d07a6cf1c0da8df6567009f
+EBUILD specutils-0.2.ebuild 1245 SHA256 540d903ecb1a74587e516d2f59c067edb37c94b8b00693a67e3404628d610694 SHA512 72a2c8a9eb81ee112101db51b6df8611574e0fbacd9f3b76a7d33c247c95877b3d41ffcc8589d4e593b9545a6f069f5c2fd6de20e41fc1e0248e2cabef57a31e WHIRLPOOL f40fa089cf8728e4e0822967cc88e865eba8d9138b1afedc826407862a3d698a2a2b5ae05e2d18a97142bb14809a73f044c4bf2e1d07a6cf1c0da8df6567009f
+MISC ChangeLog 769 SHA256 53cff683109341372aaf114fe7003978143ccdcae7eb725bb9ea2ff7d1bec4fa SHA512 99d79beb52ae8f08127042c8aa368a87a02d691b2235df63b4e5ca33b0e96fb9c3550c48f59cee38616eb36e370f60b5c9ca36c0cc34816ca74b1bd50a4aa88f WHIRLPOOL 84ab78ecb24ea748fd746c2a2308620a3fa6896171ffaeeae8a6b2068e94532e54ffd830c2dfc361b6fbc600c6aa39d22628dfdd006ce959a9857f694b653aae
+MISC metadata.xml 663 SHA256 e3593451eea949bcec8f82eadcdc04ed17d2d6be7c5efbbbf89593b8b816c0c4 SHA512 8d7a288e937215506aba4ad3cbd82fa693aa10395d71dfe371d6c9ac783521d1349e9f6cddf5abed730b918c48c77fb4162f199a75288469781ecd01ac7dbf00 WHIRLPOOL 4955b32b74c12b7944b55b886f5212ebc7a30e22673a6d556c64b0d1799ec036034351e4dde86c7abfb997f783a27f2bf71a616e1009630c90022d4217716d53
diff --git a/dev-python/specutils/metadata.xml b/dev-python/specutils/metadata.xml
new file mode 100644
index 000000000000..45d4e24160ef
--- /dev/null
+++ b/dev-python/specutils/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    specutils is a package to implement utilities and data structures to
+    analyse astronomical spectra within python. It extends NDData from Astropy
+    into a class with special handling of 1D spectra.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">specutils</remote-id>
+    <remote-id type="github">astropy/specutils</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/specutils/specutils-0.2.2.ebuild b/dev-python/specutils/specutils-0.2.2.ebuild
new file mode 100644
index 000000000000..5e5b599b61c2
--- /dev/null
+++ b/dev-python/specutils/specutils-0.2.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit distutils-r1
+
+DESCRIPTION="Python package for astronomy spectral operations"
+HOMEPAGE="https://specutils.readthedocs.org/"
+SRC_URI="https://github.com/astropy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+DOCS=( README.rst )
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		  dev-python/matplotlib[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_sphinx
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/specutils/specutils-0.2.ebuild b/dev-python/specutils/specutils-0.2.ebuild
new file mode 100644
index 000000000000..5e5b599b61c2
--- /dev/null
+++ b/dev-python/specutils/specutils-0.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit distutils-r1
+
+DESCRIPTION="Python package for astronomy spectral operations"
+HOMEPAGE="https://specutils.readthedocs.org/"
+SRC_URI="https://github.com/astropy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+DOCS=( README.rst )
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		  dev-python/matplotlib[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_sphinx
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/sphinx-better-theme/Manifest b/dev-python/sphinx-better-theme/Manifest
new file mode 100644
index 000000000000..189e58304029
--- /dev/null
+++ b/dev-python/sphinx-better-theme/Manifest
@@ -0,0 +1,5 @@
+DIST sphinx-better-theme-0.1.5.tar.gz 7276 SHA256 420570d80d8cab25b35cef2b79619104675777dff5a23deebe9ba2191d48c1ce SHA512 06e50079967e166d5daf58a44c18e477cfc71d326ecf2e0a5932200c911e73ee188f720fd5bd15c2e298e14f7e3358e02e94381470bb7958edb0b0aed334ef9c WHIRLPOOL 41d09f5c94d9473af8096896291c2ee464eef5a80c29dd4347b009da43510f31b1859e357b871cc598a3be0c66182e6d213c3755a63c3f9446c8fe6570a8e2a3
+EBUILD sphinx-better-theme-0.1.5.ebuild 587 SHA256 c8ee4ff8fdd940de69a72e2d569db53e0c94ed92a577991f2501af184250a4cd SHA512 85937d912015563732d6ec71e698aa9f8c2dc8fb4145d3e1c7ea9f1c228915b85532ed7e088ad17f58b68114afb9fae7af8bc6dee864f5ef087a65493e686701 WHIRLPOOL 7b4e9fa3a9a1e482d157b23cb9ce8800a3d347d6470629f93bb31b6b3e8370912202314fbca73fca86c892d49fa3b83c90f86f5c3ddd99957887da1b93ab8817
+MISC ChangeLog 2799 SHA256 9c87300e4d4af9d1752903723c34cd13a4dec413397750ce2479c631a21ef086 SHA512 b56767b9d0ccf88b6c845ded6e47b2f2174562729ba83113bdab8f1763831548b316596b8eabfd56eae0680259c24cd3ee3c62d96dfbcc6ae47d2f91c4b240e5 WHIRLPOOL b3854a74da5e3dd6f6d2036949971fb78dfde3aa9a837eea5521f6dd560be75b1e6fd6ae7a9c836c20c0586c93fea9a74214531e2ebf28cafa517b8f749ff25f
+MISC ChangeLog-2015 2174 SHA256 b46d81a4bec05c66a56d0d8698c312eb55db16b07c1871b49d308fe9b59cd992 SHA512 9d7b62b8a44f8d063e114ba210490d8f83a93a8035f1ae2543861be259c2b0b1614d0a0adc8f2533856d7998f9a7b82bb1b1e7bef6452f2f94b5885d6650ec87 WHIRLPOOL 96a8f0131ab06b2f5a42d16add85337091ef1a7d170f574381f8f9e392a4d36e527e00e7360b474839996cb1148f8a936253efc22597aaccd260d99c915315f7
+MISC metadata.xml 400 SHA256 f6db5365aac621689bd4427993fbcf6ac43555a0de11e84cbc6d6364f78fa636 SHA512 7f8d3408daa82c2cb5576757172ed26d05c3bbdcd0dc6d1c474a60683d13f3ad4839fcb71521c30d2ccb0dc126c9fd2f676ee758830cbaf39c13c88bd7a6484f WHIRLPOOL eba278b0a9200a6c6ac1c533e3e2815960ea1758cb1464e778cbcca746bae4b050abbe06c04952c5f4a358c5acf4601596d19b8c865eb1aab8d6326763baa240
diff --git a/dev-python/sphinx-better-theme/metadata.xml b/dev-python/sphinx-better-theme/metadata.xml
new file mode 100644
index 000000000000..db4efec193d7
--- /dev/null
+++ b/dev-python/sphinx-better-theme/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">sphinx-better-theme</remote-id>
+    <remote-id type="github">irskep/sphinx-better-theme</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild b/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
new file mode 100644
index 000000000000..37b77e574527
--- /dev/null
+++ b/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
@@ -0,0 +1,19 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="A nice-looking, customizable theme for Sphinx"
+HOMEPAGE="
+	https://github.com/irskep/sphinx-better-theme
+	https://pypi.python.org/pypi/sphinx-better-theme"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE=""
diff --git a/dev-python/sphinx-bootstrap-theme/Manifest b/dev-python/sphinx-bootstrap-theme/Manifest
new file mode 100644
index 000000000000..8a9f6d83cd63
--- /dev/null
+++ b/dev-python/sphinx-bootstrap-theme/Manifest
@@ -0,0 +1,7 @@
+DIST sphinx-bootstrap-theme-0.4.9.tar.gz 1146587 SHA256 2b83be16737c96ef44fba6fffab74f30a2826bc29ebb53d5a28fab1b2e789cb3 SHA512 73bf129fb037aa7c14b6fbd8db2b4b02e9f514c9e4828745c51f8ee02e754c68dbaf3f57497566a996cb8c7b7da57fdc37ecc1e7704fa0780aa07c9eb219ac01 WHIRLPOOL f7f5fe565438183347efba6269721e8b451f7f9aa0e635581b834753777ac2dbf5f2f0e02c5e24e1579c6f647d8a892a7dda5be586550510c37ce9a06d5ef8ff
+DIST sphinx-bootstrap-theme-0.6.0.tar.gz 1232454 SHA256 bfc7c2048ab5eabd6556914de1e40441ee2bb10677fd795286c674ba072e2747 SHA512 92b81b95dd49e577bbade188544936193f0a14dd49012edc184c44de2876cb78c94fe0ef1d0a928e17c6e5d91aadf077ea07edf2064f992b40ae3f456f535fbf WHIRLPOOL e655a8e209902c4b2c611e885eb8ba6f385baf5c97f126678162806c52417de5734631448d973bc021eae8bdeaedc1ebb50f42bb77d230dfc643ba24e79ab012
+EBUILD sphinx-bootstrap-theme-0.4.9.ebuild 539 SHA256 5e4dabe59102baa05059fcce5d507b23be7e040aa1be4068ad7efc2ebd4dd5a6 SHA512 19509140cbd242e1f47cabe21bd579e1ff4a22809b3739188216477f21b24d4a94de0746ea4c3ad7be60332ac895e8f5c8d4a7b3724fc3642d0c395e4ff6e14a WHIRLPOOL 60e3fd629bd192d72317dd1a2c2c2dd288ec9e00b5b45cc08c7924f1cf93c26c1e9588264218cac52c463214f7ad5a3486f8d2bcffade5dd9939f407b0dc190a
+EBUILD sphinx-bootstrap-theme-0.6.0.ebuild 543 SHA256 445152aad0aa9ad6cce24d0b8a53f375036894c9aa739efe6cfd845fb20feef7 SHA512 59faa751313344386fe2f6ff0a4f6d6284f1a8a131f0c027d29be542326820317eabb09a2b38d0bec05e4a8b3330fa2c536061e485826a85a508307ae0331766 WHIRLPOOL 2316c849b427191ca328866460dc5721f167701f2a18ee19817e0763505b1ac483b510db6bfcf7cec7b893c43c6609812a62d951d6b634066cc4d629c6e2b845
+MISC ChangeLog 3604 SHA256 410879a6e85300f2c6fa0d73e306a4015621832451521c190ec96b9108364802 SHA512 faa0c30aab61495fa2eebf2d0867c5df07688646bcef1203f335a24f31db7746d94464b5d5db71ef4f0e90b1ecb286cce632a95131ff56ca96887ac786e9a3a0 WHIRLPOOL 9926fa81a688210ce8130bf174b8ee5c2c838f12e2ec623b4507170046686477271ff77f803df36a50d471e7a4d3ea5541cec06a854091441a73c5fc79f3e4fb
+MISC ChangeLog-2015 1792 SHA256 fa98d677fff2be78e7e4f8bcc7e8c1c98b5aaa712b115568fc1267a702413c77 SHA512 e29e2fff63a80e4402b860e7ae73459fb44b0f5f38ba4ce6ee0b4aad9590e1f3f0d2fda9b7e53aa48199682bbcb3074eda61d22d74abf5df2238ca98fdaa6f13 WHIRLPOOL 30029a0b4abad2c0fec4c4b1b913e43146158610f9b47cc4eada0a5f76db592c5e2356b9133520a048f825a0b07cf8287b91969f225905048b4b600d3fd89668
+MISC metadata.xml 335 SHA256 53d0fdcd56daa8b88bccfcf8d1cbecb899866767f309285600ba96e766595cb9 SHA512 91483310a424cee90a300e31f435b01ae54fa28bf1178a7c20ead400143056e34917a8eec6ddc387d14dbd6aef6b8d5592bd77b1e2c8370a3d3192752e531d54 WHIRLPOOL ec4ef83f780d94d74ba875f4bdae878a8a5c9d63ef521644f5bf2cc1d9e282ab09f74be5dd3674c5e12cac58111221dd4fc8421519c176fa4083ce973f890f17
diff --git a/dev-python/sphinx-bootstrap-theme/metadata.xml b/dev-python/sphinx-bootstrap-theme/metadata.xml
new file mode 100644
index 000000000000..a212499267ed
--- /dev/null
+++ b/dev-python/sphinx-bootstrap-theme/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">sphinx-bootstrap-theme</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.4.9.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.4.9.ebuild
new file mode 100644
index 000000000000..375f82fa6cf8
--- /dev/null
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.4.9.ebuild
@@ -0,0 +1,19 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx theme integrates the Bootstrap CSS / JavaScript framework"
+HOMEPAGE="https://ryan-roemer.github.com/sphinx-bootstrap-theme/README.html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.0.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.0.ebuild
new file mode 100644
index 000000000000..554082b543a7
--- /dev/null
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx theme integrates the Bootstrap CSS / JavaScript framework"
+HOMEPAGE="https://ryan-roemer.github.com/sphinx-bootstrap-theme/README.html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-gallery/Manifest b/dev-python/sphinx-gallery/Manifest
new file mode 100644
index 000000000000..8cdb460b9b18
--- /dev/null
+++ b/dev-python/sphinx-gallery/Manifest
@@ -0,0 +1,5 @@
+DIST sphinx-gallery-0.1.12.tar.gz 68976 SHA256 16ede5720d3d78631e20f47196fadf0f2d19d61908313160aa485557a7da0ccb SHA512 57e8fc3746c2f5c941ddc3e00c749a6bfa63fb5741b3e5551df02f798858c417acee05a6b35512506aa0c4866b14a093cb4269284501672c3bbbf2edfc1edc1d WHIRLPOOL bb550bb3eddad4f2d5902c91e0a0128d535f16e2c4981284c24f8fc8a004bd8af036a78ac24b05578d1a556b54f3972025494a1fe146985a0baa23895b68fc1b
+DIST sphinx-gallery-0.1.7.tar.gz 59166 SHA256 594da5b4ed08e6531798c735608f4fe65a8bd394ea3b7b9194d9e659e48a4ea0 SHA512 0c14d35ed07db3988c9f119037676752e3f793a74000d7397f49e5b749a96db77ff4ba2e9ceb12993650e0c81042899a5056f3181e5360a738a5c62259c58ff5 WHIRLPOOL a307ddb0e4b0844ec823399fd8d00ea7fb7aa55cf243c63d7d6ad151cf3285c1f48eebb7f8e8f78b329688e9c73b54b5be0c14fe1ce264896f50af4dddd9d7b7
+EBUILD sphinx-gallery-0.1.12.ebuild 659 SHA256 c2a9dad98ac16449c4df03293b15ecfa2f83fdb767db82893869372a1facc4ee SHA512 3a2922228e4f8b82e643c9bb1309dc8ecf4036b694fb537a9c88a23b74103924680ad925c25ecdcd09205fbf3397bb09ffd915b3edfc55cb51e3d83323fc2b58 WHIRLPOOL 4c22f020b3fc315fff9ce947db7fb2d7db2a6a338ea8dfc6886d1cddee455558e6e3940819eaa899edc763b8dd0ec7fd39ba2e45f99028d5a61ad4ab2f4f28ea
+EBUILD sphinx-gallery-0.1.7-r1.ebuild 1024 SHA256 5ac58f0bf1b7f671c2db8bf5155ba91171a6241eaa09de837780aba53a86885e SHA512 20775c5f7c446de598e7be56354f8ebeaf31f92988d3111a3a6b98d6eadd601ccea703a31c27d5aa18f6b92f7e365f357405c66778d57e6d19b26304715ddf2a WHIRLPOOL ae24d6277dd49dadf34bd27dc7800f9cd7d3db8b9bacabb2558a0ea96736cea736ce9c0636415b425988fc9f75808fe0221c7253f09eb98be41f43feeb5ec642
+MISC metadata.xml 398 SHA256 df69b643b1f882a8ae5cb5a84c206f27aa0ce2cec3de7318e7db97b5b9379e14 SHA512 3b9762099b163b539d7de52602291433608ef33a9e60d3713e07bcf0b2b8345a52a0b162f6be52c9a88cfd419e5bc4e59307d07213f1d5aa3c4ca892d91f8b9b WHIRLPOOL 73bfac12f2bf4548658d51a007e0749783a0bd858ef647b41acc6634e5956285ff79281f122402d24e1c6bba7b361b1a4505dae230644734193a68030125d21b
diff --git a/dev-python/sphinx-gallery/metadata.xml b/dev-python/sphinx-gallery/metadata.xml
new file mode 100644
index 000000000000..d2a56513871a
--- /dev/null
+++ b/dev-python/sphinx-gallery/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">sphinx-gallery</remote-id>
+    <remote-id type="github">sphinx-gallery/sphinx-gallery</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.1.12.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.1.12.ebuild
new file mode 100644
index 000000000000..c4a8581f41cd
--- /dev/null
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.1.12.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension to automatically generate an examples gallery"
+HOMEPAGE="http://sphinx-gallery.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# tests need extra files not distributed
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.1.7-r1.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.1.7-r1.ebuild
new file mode 100644
index 000000000000..333d76c55a7a
--- /dev/null
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.1.7-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension to automatically generate an examples gallery"
+HOMEPAGE="http://sphinx-gallery.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+# yes nose is somehow required besides testing
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	# Remove setup_requires=['nose']
+	sed -i -e /setup_requires/d setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	echo 'backend: agg' > matplotlibrc
+	VARTEXFONTS="${T}"/fonts MPLCONFIGDIR="${BUILD_DIR}" \
+			   nosetests -v || die
+}
diff --git a/dev-python/sphinx-jinja/Manifest b/dev-python/sphinx-jinja/Manifest
new file mode 100644
index 000000000000..d672eb40d127
--- /dev/null
+++ b/dev-python/sphinx-jinja/Manifest
@@ -0,0 +1,3 @@
+DIST sphinx-jinja-0.2.1.tar.gz 6676 SHA256 3f2019339aadc40d0a2161dfbbe9ec1b42028b23fa7b8c13e76ae7710a8356ff SHA512 4b5239c76493f8eabc2a079d82d52b8bb34e884e308aa7e1205cfa40690854ddd1e4c1aee9f7ff0624eee2588a3af9196a83a79f0f49359df315cb0886f09c94 WHIRLPOOL eb1993579c0b2d8f2e485b5d3780c42f4fbbb42592c7c19b5bea0b416fc7db093c25791b4793257bed2f6b1050ddb1e8a96a80ee2a3ddea9c70142e5ba6e8828
+EBUILD sphinx-jinja-0.2.1.ebuild 849 SHA256 290b0f8df90f0b7ad9dcac26e8c3c13cc342a045bdb012626aa1c0e103fd46d4 SHA512 d2c3b858f9f9128b4c814918dd4dc61caa86958be895b6b14a4d6f32951ee719e1198e9f58c252ea2e218ff848ab25ac9578a32f9a5a786d29798f0e0f0d7961 WHIRLPOOL 62d2e39299ca9fc9617952a6ce8c073556e5ab6aa2243ebd1666ff239822910d40cfd928bece6b4795c87ab9015a8a8ba20e71db0c50e1446152ecfd052049bf
+MISC metadata.xml 575 SHA256 18b478c0dbebac3c84b874ef3171d608618207529d31b270f8dd8170b9319a5c SHA512 f9a56f712f16ee55b60e005a92f893a8a97de67a52d615537e10cee4ce9435388200ae832edf080ef1c78731974b42d415f597b04ab934d785d60bbbd93fd865 WHIRLPOOL 123ea8acb85b460ad7b3cfa31bcaefe33b32e46f9ba2f467f5f9c7dfcd0541ec52ee03b0275b9242ab24b8223ebc1d121de676a2c82215160b6be4e05c818823
diff --git a/dev-python/sphinx-jinja/metadata.xml b/dev-python/sphinx-jinja/metadata.xml
new file mode 100644
index 000000000000..5d26a6d415b1
--- /dev/null
+++ b/dev-python/sphinx-jinja/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>tardyp@gmail.com</email>
+			<name>Pierre Tardy</name>
+		</maintainer>
+		<remote-id type="pypi">sphinx-jinja</remote-id>
+		<remote-id type="github">tardyp/sphinx-jinja</remote-id>
+	</upstream>
+	<longdescription>A sphinx extension to include jinja based templates
+	based documentation into a sphinx doc
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild
new file mode 100644
index 000000000000..9c388a00c4c0
--- /dev/null
+++ b/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A sphinx extension to include jinja based templates into a sphinx doc"
+HOMEPAGE="https://github.com/tardyp/sphinx-jinja https://pypi.python.org/pypi/sphinx-jinja"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/sphinx-testing[${PYTHON_USEDEP}] )"
+
+python_prepare() {
+	if python_is_python3; then
+		sed -i -e "s/import urllib/import urllib.request as urllib/" sphinxcontrib/jinja.py || die
+	fi
+}
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/Manifest b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
new file mode 100644
index 000000000000..22570471b592
--- /dev/null
+++ b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
@@ -0,0 +1,4 @@
+DIST sphinx-py3doc-enhanced-theme-2.3.2.tar.gz 41894 SHA256 af600d39d4ffa6cb27d499730ac42af34045f5553ca5eadc087d865d6f32c602 SHA512 efeeaf1bbb7f5557f5e1500dd0a49aa001b714f329f594e95676d8833eede7eb5e0fa978257caeab9630360b05f48132ffb00137262c7a5b663cae6a009ed42d WHIRLPOOL b536517b64c398c9db7d664b633279915848f5741675e83362227d1905271dbda9b744ba6d09353c1a45c3cdb6f0b3f580a29b9d9e8da9a330aa0e821e51b643
+EBUILD sphinx-py3doc-enhanced-theme-2.3.2.ebuild 554 SHA256 7eaf5e46bb35d1ee22399aea645784939c93604d456c4aba9de2c25b0941e556 SHA512 3d9c863023449ac7f371203843b38c3ad3669b3a8e3ff5bd1e52dfd064cf279f8f80829b64d536c1f4aa507871698d2485af16622e30d2a76038a1c76fcd98d0 WHIRLPOOL a22d21265ca3e71607200ace2131f36abd5cbe578d1b4d30aed1118d89e0d6fd81ed9af6d957b9847ed52e6818afde52b01ca6f521fcc70e2e74349ddb8cc5bf
+MISC ChangeLog 546 SHA256 3b59f2611d99200282636b270feb015bd4033d80fd169bdad346b21fc93cb059 SHA512 92b527c5e3095f73c3f66ff6c751e0b76b98e51e5fcb7b9ab0e92611e180071916198912076ad856c7c0208a6938e2b2c388c150e6a9ab6e7cc7b20ed8f81b8f WHIRLPOOL c599c3014e8665e120e7eaa7f3345b556074a6f37e0e60b82d76b5ee15042807f61201c9775463be219c97530e5ce05a9462d4433690e7380ffc3e656f4a063b
+MISC metadata.xml 641 SHA256 9511de962ca80bdaf40c801daba159338fd9d3daee9264efecaa9523b852c0e1 SHA512 d3207b791985d44dbe0a37a1006365553286ec664e10e433c2046c8e385313a402c68f1c75fe7ccf1f04c2a8ad709e87d590aa9307897314562f6b8828e0cd97 WHIRLPOOL d458503268e7f883e315e98379c2eb08aceb6a338f84f84dcb69ae9b057f335a3c28051237c68a85b1ce27526a2841ac8ff656f606d7724b2c2c08ec2c2a75e7
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml b/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml
new file mode 100644
index 000000000000..3a8ee7aef942
--- /dev/null
+++ b/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>contact@ionelmc.ro</email>
+			<name>Ionel Cristian Mărieș</name>
+		</maintainer>
+		<remote-id type="pypi">sphinx-py3doc-enhanced-theme</remote-id>
+		<remote-id type="github">ionelmc/sphinx-py3doc-enhanced-theme</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
new file mode 100644
index 000000000000..8147b176c26d
--- /dev/null
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Enhanced Sphinx theme (based on Python 3 docs)"
+HOMEPAGE="https://github.com/ionelmc/sphinx-py3doc-enhanced-theme https://pypi.python.org/pypi/sphinx-py3doc-enhanced-theme"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/sphinx-testing/Manifest b/dev-python/sphinx-testing/Manifest
new file mode 100644
index 000000000000..67390d6dd3fb
--- /dev/null
+++ b/dev-python/sphinx-testing/Manifest
@@ -0,0 +1,3 @@
+DIST sphinx-testing-0.7.2.tar.gz 11040 SHA256 9d30f93007620e137b33edf19f52a7225eab853546b7e588ef09d1342e821e94 SHA512 d267c74d97443db2df69914a825da969021e37fc61b8a664ef382504fa826387a95230bf9259b58c6f26721f33985fa2168d2714342a2166b59740cf1b3ad724 WHIRLPOOL 78ea240607f62c7c3ca98fc2ba0ec197b54aba6c0782d82c4da8fd695a37baae4d0b9bcd056b790dc610979a0031cce250d19c8360ffeb07463e4335af0df026
+EBUILD sphinx-testing-0.7.2.ebuild 675 SHA256 5536c50933f81c1c5133d0924f1cc47cfff92d5d91c5a7397c86f793edc6fb2f SHA512 d841d3db510092f314bad29e355ea5603b8fa263b518b9261d576494e75d27c1eb49aa95353e059d46d9b99d4f74b8ce9d07c71f7d6ceecdc4e3edb9db338464 WHIRLPOOL 25b5f260298f7d273c7fa0a9a4cb51a5f0237e136d3f6f2a68d87abfd29fe2178eefada793403512ca55ec6b910f7a734e1c8628decebf2abff44cd45098d336
+MISC metadata.xml 340 SHA256 3e6d12eab874800d701938fc6a0696a1a61c32de6f9a0903911a7643ba62c3ff SHA512 f5299851dc6aa3c3ad1109123ac6c4eb5b5c7e1177fa1f068da5cef0920bbece63a8f1c424c5b95addf661e5a7d15a05a427676f6c272a54741495c77e316b78 WHIRLPOOL 06a4dfd300baaa96cd8d49c17a18b227262d946bcee9d2485f51f9a6598e18ef02e19fd5d8d36af1a95301cd8178a30e33f698c93297e7c58558fa4bc92e2b95
diff --git a/dev-python/sphinx-testing/metadata.xml b/dev-python/sphinx-testing/metadata.xml
new file mode 100644
index 000000000000..605d625f69e7
--- /dev/null
+++ b/dev-python/sphinx-testing/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sphinx-doc/sphinx-testing</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinx-testing/sphinx-testing-0.7.2.ebuild b/dev-python/sphinx-testing/sphinx-testing-0.7.2.ebuild
new file mode 100644
index 000000000000..71a84edcf47b
--- /dev/null
+++ b/dev-python/sphinx-testing/sphinx-testing-0.7.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Testing utility classes and functions for Sphinx extensions"
+HOMEPAGE="https://github.com/sphinx-doc/sphinx-testing"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*') )"
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
new file mode 100644
index 000000000000..4f2f5b721566
--- /dev/null
+++ b/dev-python/sphinx/Manifest
@@ -0,0 +1,17 @@
+AUX sphinx-1.5.1-fix-pycode-grammar.patch 525 SHA256 f861e106aef16571e26a9db8166b253c64a53e7ee6d10baac13c6354a5b81319 SHA512 9aae50a1089fc64fd0bf11890e08cc2d22f14adcb191985925811d819bcb59031fcb91e9281171ed11849644e277aadecf9b98c1b3cc2347e1cb6daa9032e3dd WHIRLPOOL 5ef43cd354e4f9167f9a64e3d04ee7aa0ce73c6dbffcd60f392f0f076ec92e68b5f99377272445182137752b44ace10780ed9a4e2960eb7553c51e69e95b4e92
+DIST Sphinx-1.2.2.tar.gz 3143671 SHA256 2d3415f5b3e6b7535877f4c84fe228bdb802a8993c239b2d02c23169d67349bd SHA512 44073c215f9d0e7f6c7bc91cb85b0508a96e5cfff5f940fef86e2fc6f11281d03b54e87e51e5a99a23e96b470a93f3af86a6a3ab7c317c747406c55b4c37791c WHIRLPOOL c5ed15b51682d3be9f8349ab838c6758cb4e25023b6ad13622d748b771594ed75f786709a25fb2d61ad245ecef0925e5bcc1aafb93fc355a0f0ea50df63efcd7
+DIST Sphinx-1.2.3.tar.gz 3200548 SHA256 94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04 SHA512 00346516e826a65145a3a7fd25ef7cee569ae7fdcc0c1bec3a7301fc08d5d8730d02eee792c3efedfcac17e712ea7e2ad70ea1fcdedc11720ad54f6bcb51ad05 WHIRLPOOL 0c0e2e21a52829893857939f977e8312c4eac11f5d2aec3b8e4f9c8ffdbf14c4aa46a6c26dac0ad4abfe92b3bdad72a3468e6d2ff2485df6efaf3fccd17ae69b
+DIST Sphinx-1.3.1.tar.gz 3469782 SHA256 1a6e5130c2b42d2de301693c299f78cc4bd3501e78b610c08e45efc70e2b5114 SHA512 8b92b69c4ced242c5e608ea03a7a061b0d2908f34f3150048ff4ce08b5d56be4a642a6aec13fa249ff8208fa8dd2d38d8a10d37ebbcc68385ee51f527ede0b94 WHIRLPOOL f3e442fd1f1c260b21f3e2381f028884b6247758448439e7be4cf784f50ec12494e384c77a0c4ccac473f25d7bb88f5424be937d72bb3fac1b6f6387a5746f66
+DIST Sphinx-1.3.5.tar.gz 3679978 SHA256 b7d133bb4990d010a2ad934c319b52d8a2156cb0491484f5e2a558619bc9ae04 SHA512 90eda9cdbd24575d9f763e5c35e176d9970d1c83dd06dd41e9137f5c6035738fd21c4c57ff98810fc8adf91fa625192e6534bf0bbf70e78cc98f73df59eaabbc WHIRLPOOL 5877015f700ed0818e0879868f2190ec818d088e235d9c12fe6bd472b0006bd8d26156273023ff93a098c8503bdc440cedd1ba8758fdc25f742bb5794940559f
+DIST Sphinx-1.5.2.tar.gz 4418646 SHA256 049c48393909e4704a6ed4de76fd39c8622e165414660bfb767e981e7931c722 SHA512 32c8fb98d72e998fcce8c46ceddcbb0a0776d0e9ce75dc96cef48139b8b47ebe9636243fb48b9e04c8e1d5c56e09fc4c60248fbbef810fba9813b83a3e6cbe88 WHIRLPOOL 08fcf21ea37834e52a89f3956df289dc2ffe97e419cc0463815b3f10b95042dae5cf41be74fd1780529d5525ea349c10dd0e0bda6ac24b330ccb21e4a79e22e1
+DIST Sphinx-1.6.3.tar.gz 4674251 SHA256 af8bdb8c714552b77d01d4536e3d6d2879d6cb9d25423d29163d5788e27046e6 SHA512 d5aec58e19239db4e61fcd6b103fcc838d97aad5a7aaf9279ff1097791d9cd1ba245989307a2d1049c123058b84ca4e91db192a1672c040d80fafed3907736ae WHIRLPOOL 1b950701f72d54b7f03aa096f11ed7689ff843709b11cb61aa6fa02322e29260700693495230643fa2f07003e6411e3d00eed0463f8662b6aadfe55ab37742e4
+EBUILD sphinx-1.2.2-r1.ebuild 3048 SHA256 8ecc6c5262ab49d008ed87ef2891a3f2c97164f3491deeb5f949a1899735d613 SHA512 ae2a68a69515191020e983ce10ce740d09d472e5bf665be6bff02c9ff959d7a9fe09a346b3b51afb3b360995d24eaa277f233e336d4e15aaf0bcd764bef1050d WHIRLPOOL 1e14e0da9c97836770a12e9d838d833f452a45581982023dab4701c2869f7957fbd0051da62b4fc325752d9698d80fd9c5e94a6b78166318c00b7460ed2b3903
+EBUILD sphinx-1.2.3-r1.ebuild 3110 SHA256 86ff62da3aaf9ba3f2aeeaac16ac8799ae573604edd9001f20fe1db3775f2b51 SHA512 98a43b62068f49cdb1f8bc998836c2b65bc83a92ea0833a7971711ca4d5fef557d93d4e1d1d9b58757ca3567e2a65fbd35fe5a4409f3d5ec0d464ff0c106cf0a WHIRLPOOL e8f19433039cd262b31f6d7b16ae0e29dd6c882fe7f40043d3f68f7ed42efa8d795618f23ffeae3864162ae6af2f183ff8d112a6bbf6452d5bb37348f6c75885
+EBUILD sphinx-1.3.1-r2.ebuild 3466 SHA256 f5800dc2d2d95eb2887b04d15ef353e5a48872fa2b4f9458b57c3791cff2dde0 SHA512 0705fa10d01ec6a215e25416d65c96e407f7230c33c1e2f81ab87f55f0a162bd6c3ceb6ad5bba343eaa3cf407f97d1b570b2f7dadcec0bce2f1870f03a739eb0 WHIRLPOOL d90cd137126b11c075c927adb557b348bace9aa0a02e7893e123fd49a710385851ee130dcf61092a2028fac6ca928b17b59d96a6a72544c9df782ffb646061c8
+EBUILD sphinx-1.3.5-r1.ebuild 3580 SHA256 3a295ba622cd16a4c378efd1323d04e42f6dbc6b9b75079a5400ec2ae207fcfb SHA512 5d7a9b3e083b0f28e4774c5a51895cace0287cc581984ce5b8d4403670663b6bb79cffe1c0d516dcbf57fee8752e3723b1e18c80e5a495a7add224c2835957e9 WHIRLPOOL ad5b3f01e23f596fc4d8c9ab4528121db4e8abacf679487802afb3949dc86ed19dd308108b07ac5f5513cab06523682ba665e54cf8f13f2d98690d1237206a26
+EBUILD sphinx-1.5.2.ebuild 3424 SHA256 200fa51b786dce66e218ae45f3f6ce24405066692b8369f7c6186ab1e1754836 SHA512 65a23cf4ab228b325301ac6ac07187fa3b4000e52f36d3fcb2d29b0b2bb7e0f171b70ab008a3f3641893618fc2adcae1ceb2f8e49f6e200493ef5704a89b7428 WHIRLPOOL 1f3a74a895cd08ae485285ef6c6a4bfc8fb6ed1ac68e965940d28d3623d3a0607f29bf327716bf8f7aa894d42901049ce66b49ced6c09f08b892f691698d4d1d
+EBUILD sphinx-1.6.3-r1.ebuild 3400 SHA256 a43d4f6034848a030c5cd2c76e3d8259a16a68a7c42799ecb4abd1a29cdfff03 SHA512 571647d383ade15d9484124c04ea1b75eaa24a4fb0e835a864e2c15e8c1938d89fd09b9b86cdb4d64b385c016ed6dddb88e2796e9079e7db7160d1cff6f86988 WHIRLPOOL cf2ae88534602b3abc902764e7be67a41e11b1d056b8fb875fb4c954652980c8f3172e7d4c14360e380f9554b5f153fa1228863ad81c5a735895e30b0e07d84e
+EBUILD sphinx-1.6.3-r2.ebuild 3408 SHA256 64dbebfc8744fb4d8146273f04ea45bb5d4fda401b461b376824a70b7a517eba SHA512 709fd49fb62a069fb8cf1f268fcaaacf64e1ce7e705d1282d56e2958c0b4d69b0fceef1d0215da9e1dc98ae66db30cc29c564aa78d29771c0c98f122e7fa27b2 WHIRLPOOL f4f70757dd9b10367d7bdf99b17d59779e57a64f435e7e92843f3f6d433c096ff69da00b047a76e5830c21dce44653f9e4cabcb149eabb44ef4ebf2f3bb1011b
+MISC ChangeLog 6428 SHA256 0ddd88197c75ce2cde0b111f2cf34ae208dddf482abc691eb477d334731bfa11 SHA512 a972e574773f6b768bb558aae26d2f10f2cf579a0702f60579c350d389301b05e92703c8f700f6771626d8bdda3db064f6f8848ca78069c7200a3c8e5b9645cd WHIRLPOOL fd416c0c19401cddd15922a47122c54cb59d0bd6c7c71b62cf9d7f36873892e494d26451a0498426261d22c4a9ccb0708feab7507e48619f21e6ce474c1bef57
+MISC ChangeLog-2015 23594 SHA256 c2a0cf0d8688ea2e6c937e39e266c466dbc78c21fc9e4c65f2537c04b61ccdbc SHA512 f1aa8cb91173dc3e8dab8d12f50e837efe55077d285f09031e48b5b9dfbacc99f9380fa7ee007a0f0e47595a1173bc568b7f701fb53816f2fa3806b88b4ecda0 WHIRLPOOL 02f43cf7ae610c7b53bec1c720d20e8a4519dfb5ad4b819964f5b337b75ad49c8c7dcf3124720538eb673dc30085e09e009c0e880853e1e28b0dc370ea1c4054
+MISC metadata.xml 556 SHA256 08f79471dfb1514ae1916cbffcf09fb0e9b1475e71b441bbcefa4f78d7b54b2e SHA512 bff6813bf9c5110c2e4f5764f911309325923cb58300c19c079d1e6de3d6c4c0bcaf4e206fa4bc11ebf54b961c7e09217310b5647029350d4f9602da6325db0c WHIRLPOOL 885c0912aa69366250a9ea0e58fd185058f50ff53e5465e46f2e3f8ccfde4b4cbb6637229c905593785aae48091dfa2543ce687cc607c39d2027603fe51a123d
diff --git a/dev-python/sphinx/files/sphinx-1.5.1-fix-pycode-grammar.patch b/dev-python/sphinx/files/sphinx-1.5.1-fix-pycode-grammar.patch
new file mode 100644
index 000000000000..e72d4d45132c
--- /dev/null
+++ b/dev-python/sphinx/files/sphinx-1.5.1-fix-pycode-grammar.patch
@@ -0,0 +1,14 @@
+environment.py has been turned into a directory,
+without actually porting the code using it.
+
+--- a/sphinx/pycode/__init__.py
++++ b/sphinx/pycode/__init__.py
+@@ -352,7 +352,7 @@
+     import pprint
+     x0 = time.time()
+     # ma = ModuleAnalyzer.for_file(__file__.rstrip('c'), 'sphinx.builders.html')
+-    ma = ModuleAnalyzer.for_file('sphinx/environment.py',
++    ma = ModuleAnalyzer.for_file('sphinx/environment/__init__.py',
+                                  'sphinx.environment')
+     ma.tokenize()
+     x1 = time.time()
diff --git a/dev-python/sphinx/metadata.xml b/dev-python/sphinx/metadata.xml
new file mode 100644
index 000000000000..fe4bfd29c81f
--- /dev/null
+++ b/dev-python/sphinx/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">Sphinx is a tool to create documentation for Python projects (or other documents consisting of multiple reStructuredText sources).</longdescription>
+	<upstream>
+		<remote-id type="pypi">Sphinx</remote-id>
+	</upstream>
+	<use>
+		<flag name="net">enable internet capabilities</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-python/sphinx/sphinx-1.2.2-r1.ebuild b/dev-python/sphinx/sphinx-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..4df1f6a06baf
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.2.2-r1.ebuild
@@ -0,0 +1,123 @@
+# 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 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils versionator
+
+MY_PN="Sphinx"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc latex test"
+
+# Split the jinja dep to allow different slots to satisfy it
+RDEPEND="
+	<dev-python/docutils-0.13[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.2[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		app-text/dvipng
+	)"
+DEPEND="${DEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib > /dev/null || die
+	"${PYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc && emake -C doc SPHINXBUILD='"${PYTHON}" "${S}/sphinx-build.py"' html
+}
+
+python_test() {
+	cp -r -l tests "${BUILD_DIR}"/ || die
+
+	if $(python_is_python3); then
+		2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
+	fi
+
+	nosetests -w "${BUILD_DIR}"/tests -v \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
+
+replacing_python_eclass() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.1.3-r4 ${pv}; then
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+pkg_preinst() {
+	if replacing_python_eclass; then
+		# the old python.eclass ebuild will want to remove our pickles...
+		backup_pickle() {
+			# array to enable filename expansion
+			local pickle_name=(
+				"${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle
+			)
+
+			local dest=${ROOT}${pickle_name[0]#${D}}.backup
+
+			eumask_push 022
+			mkdir -p "${dest%/*}" || die
+			eumask_pop
+
+			cp -p -v "${pickle_name[0]}" "${dest}" \
+				|| die "Unable to backup grammar pickle from overwriting"
+		}
+
+		python_foreach_impl backup_pickle
+	fi
+}
+
+pkg_postinst() {
+	if replacing_python_eclass; then
+		local warned
+
+		restore_pickle() {
+			local backup_name=(
+				"${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup
+			)
+			local dest=${backup_name[0]%.backup}
+
+			mv -v "${backup_name[0]}" "${dest}" \
+				|| die "Unable to restore grammar pickle backup"
+		}
+
+		python_foreach_impl restore_pickle
+
+		[[ ${warned} ]] && ewarn "Please try rebuilding the package."
+	fi
+}
diff --git a/dev-python/sphinx/sphinx-1.2.3-r1.ebuild b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..dff5692f906a
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
@@ -0,0 +1,125 @@
+# 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 pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils versionator
+
+MY_PN="Sphinx"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc latex test"
+
+# Portage has only >= minimum required versions of all rdeps making
+# setting of version borders unnecessary
+RDEPEND="
+	<dev-python/docutils-0.13[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		app-text/dvipng
+	)"
+DEPEND="${DEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib > /dev/null || die
+	"${PYTHON}" -m sphinx.pycode.__init__ \
+		|| die "Grammar generation failed."
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc && emake -C doc SPHINXBUILD='"${PYTHON}" "${S}/sphinx-build.py"' html
+}
+
+python_test() {
+	cp -r -l tests "${BUILD_DIR}"/ || die
+
+	if $(python_is_python3); then
+		2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
+	fi
+
+	nosetests -w "${BUILD_DIR}"/tests -v \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
+
+replacing_python_eclass() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.1.3-r4 ${pv}; then
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+pkg_preinst() {
+	if replacing_python_eclass; then
+		# the old python.eclass ebuild will want to remove our pickles...
+		backup_pickle() {
+			# array to enable filename expansion
+			local pickle_name=(
+				"${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle
+			)
+
+			local dest=${ROOT}${pickle_name[0]#${D}}.backup
+
+			eumask_push 022
+			mkdir -p "${dest%/*}" || die
+			eumask_pop
+
+			cp -p -v "${pickle_name[0]}" "${dest}" \
+				|| die "Unable to backup grammar pickle from overwriting"
+		}
+
+		python_foreach_impl backup_pickle
+	fi
+}
+
+pkg_postinst() {
+	if replacing_python_eclass; then
+		local warned
+
+		restore_pickle() {
+			local backup_name=(
+				"${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup
+			)
+			local dest=${backup_name[0]%.backup}
+
+			mv -v "${backup_name[0]}" "${dest}" \
+				|| die "Unable to restore grammar pickle backup"
+		}
+
+		python_foreach_impl restore_pickle
+
+		[[ ${warned} ]] && ewarn "Please try rebuilding the package."
+	fi
+}
diff --git a/dev-python/sphinx/sphinx-1.3.1-r2.ebuild b/dev-python/sphinx/sphinx-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..d8392674210d
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.3.1-r2.ebuild
@@ -0,0 +1,134 @@
+# 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)
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils versionator
+
+MY_PN="Sphinx"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc latex test"
+
+RDEPEND="
+	=dev-python/alabaster-0.7*[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.13[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		app-text/dvipng
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib > /dev/null || die
+	"${PYTHON}" -m sphinx.pycode.__init__ \
+		|| die "Grammar generation failed."
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc && emake -C doc SPHINXBUILD='"${PYTHON}" "${S}/sphinx-build.py"' html
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	export SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+	cp -r -l tests "${BUILD_DIR}"/ || die
+
+	if $(python_is_python3); then
+		2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
+	fi
+
+	nosetests -w "${BUILD_DIR}"/tests -v \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
+
+replacing_python_eclass() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.1.3-r4 ${pv}; then
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+pkg_preinst() {
+	if replacing_python_eclass; then
+		# the old python.eclass ebuild will want to remove our pickles...
+		backup_pickle() {
+			# array to enable filename expansion
+			local pickle_name=(
+				"${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle
+			)
+
+			local dest=${ROOT}${pickle_name[0]#${D}}.backup
+
+			eumask_push 022
+			mkdir -p "${dest%/*}" || die
+			eumask_pop
+
+			cp -p -v "${pickle_name[0]}" "${dest}" \
+				|| die "Unable to backup grammar pickle from overwriting"
+		}
+
+		python_foreach_impl backup_pickle
+	fi
+}
+
+pkg_postinst() {
+	if replacing_python_eclass; then
+		local warned
+
+		restore_pickle() {
+			local backup_name=(
+				"${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup
+			)
+			local dest=${backup_name[0]%.backup}
+
+			mv -v "${backup_name[0]}" "${dest}" \
+				|| die "Unable to restore grammar pickle backup"
+		}
+
+		python_foreach_impl restore_pickle
+
+		[[ ${warned} ]] && ewarn "Please try rebuilding the package."
+	fi
+}
diff --git a/dev-python/sphinx/sphinx-1.3.5-r1.ebuild b/dev-python/sphinx/sphinx-1.3.5-r1.ebuild
new file mode 100644
index 000000000000..46bcb37d3524
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.3.5-r1.ebuild
@@ -0,0 +1,136 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils versionator
+
+MY_PN="Sphinx"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc latex test"
+
+RDEPEND="
+	=dev-python/alabaster-0.7*[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.13[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	!=dev-python/Babel-2.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
+	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		app-text/dvipng
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib > /dev/null || die
+	"${PYTHON}" -m sphinx.pycode.__init__ \
+		|| die "Grammar generation failed."
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc && emake -C doc SPHINXBUILD='"${PYTHON}" "${S}/sphinx-build.py"' html
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	export SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+	cp -r -l tests "${BUILD_DIR}"/ || die
+
+	if $(python_is_python3); then
+		2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
+	fi
+
+	nosetests -w "${BUILD_DIR}"/tests -v \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
+
+replacing_python_eclass() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.1.3-r4 ${pv}; then
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+pkg_preinst() {
+	if replacing_python_eclass; then
+		# the old python.eclass ebuild will want to remove our pickles...
+		backup_pickle() {
+			# array to enable filename expansion
+			local pickle_name=(
+				"${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle
+			)
+
+			local dest=${ROOT}${pickle_name[0]#${D}}.backup
+
+			eumask_push 022
+			mkdir -p "${dest%/*}" || die
+			eumask_pop
+
+			cp -p -v "${pickle_name[0]}" "${dest}" \
+				|| die "Unable to backup grammar pickle from overwriting"
+		}
+
+		python_foreach_impl backup_pickle
+	fi
+}
+
+pkg_postinst() {
+	if replacing_python_eclass; then
+		local warned
+
+		restore_pickle() {
+			local backup_name=(
+				"${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup
+			)
+			local dest=${backup_name[0]%.backup}
+
+			mv -v "${backup_name[0]}" "${dest}" \
+				|| die "Unable to restore grammar pickle backup"
+		}
+
+		python_foreach_impl restore_pickle
+
+		[[ ${warned} ]] && ewarn "Please try rebuilding the package."
+	fi
+}
diff --git a/dev-python/sphinx/sphinx-1.5.2.ebuild b/dev-python/sphinx/sphinx-1.5.2.ebuild
new file mode 100644
index 000000000000..90b991d5aef6
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.5.2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~x86"
+IUSE="doc latex net test"
+
+RDEPEND="
+	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
+	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		app-text/dvipng
+	)
+	net? (
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/simplejson[${PYTHON_USEDEP}]' pypy)
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'pypy*' 'python2*')
+		$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' 'pypy*' 'python2*' python3_4 )
+	)"
+
+S="${WORKDIR}/${P^}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-fix-pycode-grammar.patch
+)
+
+python_prepare_all() {
+	# remove tests that fail due to network-sandbox
+	rm tests/test_websupport.py || die "Failed to remove web tests"
+	rm tests/test_searchadapters.py || die "Failed to remove web tests"
+	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C doc SPHINXBUILD='"${EPYTHON}" "${S}/sphinx-build.py"' html
+		HTML_DOCS=( doc/_build/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+	cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests"
+	cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile"
+	emake test
+}
+
+pkg_postinst() {
+	replacing_python_eclass() {
+		local pv
+		for pv in ${REPLACING_VERSIONS}; do
+			if ! version_is_at_least 1.1.3-r4 ${pv}; then
+				return 0
+			fi
+		done
+
+		return 1
+	}
+
+	if replacing_python_eclass; then
+		ewarn "Replaced a very old sphinx version. If you are"
+		ewarn "experiencing problems, please re-emerge sphinx."
+	fi
+}
diff --git a/dev-python/sphinx/sphinx-1.6.3-r1.ebuild b/dev-python/sphinx/sphinx-1.6.3-r1.ebuild
new file mode 100644
index 000000000000..4633c97a8418
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.6.3-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://www.sphinx-doc.org/"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc latex net test"
+
+RDEPEND="
+	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
+	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
+	dev-python/typing[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+	net? (
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+	)"
+PDEPEND="dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${P^}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-fix-pycode-grammar.patch
+)
+
+python_prepare_all() {
+	# remove tests that fail due to network-sandbox
+	rm tests/test_websupport.py || die "Failed to remove web tests"
+	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C doc SPHINXBUILD='"${EPYTHON}" "${S}/sphinx-build.py"' html
+		HTML_DOCS=( doc/_build/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+	cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests"
+	cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile"
+	emake test
+}
+
+pkg_postinst() {
+	replacing_python_eclass() {
+		local pv
+		for pv in ${REPLACING_VERSIONS}; do
+			if ! version_is_at_least 1.1.3-r4 ${pv}; then
+				return 0
+			fi
+		done
+
+		return 1
+	}
+
+	if replacing_python_eclass; then
+		ewarn "Replaced a very old sphinx version. If you are"
+		ewarn "experiencing problems, please re-emerge sphinx."
+	fi
+}
diff --git a/dev-python/sphinx/sphinx-1.6.3-r2.ebuild b/dev-python/sphinx/sphinx-1.6.3-r2.ebuild
new file mode 100644
index 000000000000..a836d2260438
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.6.3-r2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://www.sphinx-doc.org/"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="doc latex net test"
+
+RDEPEND="
+	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
+	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
+	dev-python/typing[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+	net? (
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+	)"
+PDEPEND="dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${P^}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-fix-pycode-grammar.patch
+)
+
+python_prepare_all() {
+	# remove tests that fail due to network-sandbox
+	rm tests/test_websupport.py || die "Failed to remove web tests"
+	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C doc SPHINXBUILD='"${EPYTHON}" "${S}/sphinx-build.py"' html
+		HTML_DOCS=( doc/_build/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+	cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests"
+	cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile"
+	emake test
+}
+
+pkg_postinst() {
+	replacing_python_eclass() {
+		local pv
+		for pv in ${REPLACING_VERSIONS}; do
+			if ! version_is_at_least 1.1.3-r4 ${pv}; then
+				return 0
+			fi
+		done
+
+		return 1
+	}
+
+	if replacing_python_eclass; then
+		ewarn "Replaced a very old sphinx version. If you are"
+		ewarn "experiencing problems, please re-emerge sphinx."
+	fi
+}
diff --git a/dev-python/sphinx_celery/Manifest b/dev-python/sphinx_celery/Manifest
new file mode 100644
index 000000000000..a1c6349d8f83
--- /dev/null
+++ b/dev-python/sphinx_celery/Manifest
@@ -0,0 +1,3 @@
+DIST sphinx_celery-1.3.1.tar.gz 15334 SHA256 490eff4b56ab716a8bf53dc614916a89627b24b698e9fd14137be431a677a416 SHA512 b3d11204fd02f85426e1f4bcb81e61557f04440656be946a18e142087180a50f864ca4bbb53d3fff4eabd7623bf5c3682d3c1e00b9adf9184de99a27de98b2f6 WHIRLPOOL 15df69372faeaca1a2babee1c20e711b6f81d465be44977378cfc9d56471d5974a8fd985d1cda1ce9c518f5275cd56d33548050caa0d7a74bb9737273abe2b55
+EBUILD sphinx_celery-1.3.1.ebuild 539 SHA256 8af723fa5421712619b8420621227ca704a135532a98a5073f2ae8950641f0fa SHA512 49b5a8dac91d91f087a74e36a0e0e67e8d9fa8538f0252fc307d76ea85246e1d1f44d3226323867b27410f92fd24913068a3d37317a01d5d2720d8afab206436 WHIRLPOOL 556590274002a7914d779528411c97837d9c6bdd686313474456695fc3fa2a138dcbca4e22ba1a818867f11ed3e67459e7143e89ea877ca5fedf237b3f45cbad
+MISC metadata.xml 354 SHA256 c2c7fffe426335c3e123d53f0e055dc01b2a72af2b427ad17c7e26ece4a717a1 SHA512 4cf6fdfa14fca7fe26e253a25bc81221e25220f34b13e08c88496d44a3f779dd2607fe4698682b27fc66158128d5a2e5f9d61a0ee58ca59f7b744ae37f909dc7 WHIRLPOOL 442b6be77bd82698bd1f219dbe7e51b3d95305d18304df6f0ea2f45d86fd4a59d2e16e5f20907e750c490df42da99dfd55eadd8e5781bf0ab228f0f56397c196
diff --git a/dev-python/sphinx_celery/metadata.xml b/dev-python/sphinx_celery/metadata.xml
new file mode 100644
index 000000000000..4c1119be9c63
--- /dev/null
+++ b/dev-python/sphinx_celery/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sphinx_celery</remote-id>
+		<remote-id type="github">celery/sphinx_celery</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild b/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild
new file mode 100644
index 000000000000..0589c0a2be92
--- /dev/null
+++ b/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Celery Sphinx Theme and Utilities"
+HOMEPAGE="https://pypi.python.org/pypi/${PN} https://github.com/celery/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
new file mode 100644
index 000000000000..f21ce3d26570
--- /dev/null
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -0,0 +1,7 @@
+DIST sphinx_rtd_theme-0.1.9.tar.gz 698461 SHA256 273846f8aacac32bf9542365a593b495b68d8035c2e382c9ccedcac387c9a0a1 SHA512 e793a4da6209c26acb261efd03e6591561d7fbad97b3d7ab0a105e125a15a035d2066a1b1572a95954304d361abec39d9e1e401cd7200c6206cc8c89ad134d0f WHIRLPOOL 77edc637b20b86a0273c9365fabdec7712dc40e6dae8533085c6c1f6261df9b0ada32f8b0d0d818f2c20902ce1c6619d9fe534da9c524f034638fb729a204052
+DIST sphinx_rtd_theme-0.2.4.tar.gz 1392456 SHA256 2df74b8ff6fae6965c527e97cca6c6c944886aae474b490e17f92adfbe843417 SHA512 865b09febc1c289d47a8be3f3d7caa9d2a4715b350e2e2d058855831321a6f870e8339b2ef22eafc2b9fe72ad48f96b8d2fda4bc032c5f8dcdf23f314869cfbb WHIRLPOOL 54977693305ccbb94b7075e2ef6198e4ccea8885fbec1aee161439ebd09691aec802f56f96c6589531b723d400b8d9f498f3d83336278cfb29b4ee9f6ac20aa1
+EBUILD sphinx_rtd_theme-0.1.9.ebuild 537 SHA256 09722fc4b478fc0d8f031ec33309a46b72a7f096eb48d7d02a9a179c97b45040 SHA512 90d7a1b32f4949fc2ae7f4c07c6d564a3cae186bcaf828e9fb45b659fbd8b4645184e47622175528d4f13888824fe6118eca82733ef05c84d6bee48ba180f7bb WHIRLPOOL 81ffe986771103c63431726d2b8751d581432c27742111b6d610026949ace70e9d3767d47d834306f7d0952d56ff5ff428d29606399f3ad3fe07aa0dad44001b
+EBUILD sphinx_rtd_theme-0.2.4.ebuild 559 SHA256 18186db588b0f4ced414ce519313d71d32735d90f9a6d2f821869723f6f41f1f SHA512 bd19259f7f4369360d66a4df95167eda627b600ba87064d85314760c7fa5872cbe01e7a70e5737faa2e6d90bb6ab4b51c05814d65c9a610b2803b41e3ff72990 WHIRLPOOL 480e3bb54b2747b93f8d849805256aa3861985c71da8cc07ff072ab2885b98f1e1a5b98581ccbe3967f0a201c09d548ce35cc64f55a8102ace8d7d58d7a5e23c
+MISC ChangeLog 5943 SHA256 815a92a25fa250a03f4670b9e2fdb85faf666ccac732a9549426e27c3bae3967 SHA512 577c3162733fb488f1031f3d011f6584d337d3d8a26b74c4d5e633a05bf347bc640242dda393d0c18d0e2454c2518ee3c51030a53a3d2f896607a58d36bc2f3d WHIRLPOOL c28cff1137957c7a6eb745203c21fc81b7304f08460e4e5e5205e5471053db3eeea3094374ff1e55f3d34cae94f1ad858ca2c7c36c82da04d7595a692f2d5bb6
+MISC ChangeLog-2015 1881 SHA256 c164061b17c098b20c12626ade0b571d9723e9e3ae46638327efb82dd7227a28 SHA512 f6f8f43b78b48fa444598bd09533dfa9a6a8ab6d577430f091e418d527561f6c89731e84cba72070e6f7b3540b42d8401645820299ff42926bbfbac1d2615027 WHIRLPOOL ad28d993029dc8392135406670fe27e366642260582b5aed8cec275817175d4d716da8bdf0465e79115dc1d72c340135d18befcd603995091ce08b7dc65b107c
+MISC metadata.xml 393 SHA256 9821d9692474c8efe4f00f1cb47a7d768f766375688ea23b7207d96eddf87d29 SHA512 f3ccf901c6d0a891880bf06e1708a1e19225cf1ba60c3cad1e8bf5dfb665274fac7de87b4363734f8f299a9af589e3de64b9e38ca14a405fe33e4c63321e4572 WHIRLPOOL 43c1cbcf981600f9771d00857b399de907d64591c199c7b5fbfc30001353af6b450a925da292c16de1083fa1b0156b076253c31c63a17f37ab6211a8f3c0e44b
diff --git a/dev-python/sphinx_rtd_theme/metadata.xml b/dev-python/sphinx_rtd_theme/metadata.xml
new file mode 100644
index 000000000000..0bded0541893
--- /dev/null
+++ b/dev-python/sphinx_rtd_theme/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">sphinx_rtd_theme</remote-id>
+    <remote-id type="github">snide/sphinx_rtd_theme</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
new file mode 100644
index 000000000000..64713e35109e
--- /dev/null
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
@@ -0,0 +1,19 @@
+# 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="ReadTheDocs.org theme for Sphinx"
+HOMEPAGE="https://github.com/snide/sphinx_rtd_theme/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
new file mode 100644
index 000000000000..dbcfccfe0a42
--- /dev/null
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="ReadTheDocs.org theme for Sphinx"
+HOMEPAGE="https://github.com/snide/sphinx_rtd_theme/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-asyncio/Manifest b/dev-python/sphinxcontrib-asyncio/Manifest
new file mode 100644
index 000000000000..840914534b96
--- /dev/null
+++ b/dev-python/sphinxcontrib-asyncio/Manifest
@@ -0,0 +1,5 @@
+DIST sphinxcontrib-asyncio-0.2.0.tar.gz 10689 SHA256 96627b1ec4eba08d09ad577ff9416c131910333ef37a2c82a2716e59646739f0 SHA512 2ca25717c03385ae9bf879b8efeab8d508292d07f96d941032720d755d3db2e7bbc3c9a33c6103af9d83849ed8878bea1048d349bd0873288ee2addfee9756b7 WHIRLPOOL 7fa99d9857b7e58bd57c9de94b49aeae3614f958f697db26e384106bda853d78dc5fb6b08e72631615d4eaf9f150290e651bf87c1866139238eb5c2b0f4d8017
+EBUILD sphinxcontrib-asyncio-0.2.0-r1.ebuild 1050 SHA256 1e6ac185adfb8fd47fab639a4424261ed202fe814cd1788959499b4c001aa6c0 SHA512 c9545013ef9c8060ca3607659d5f5231009e746ef05d42093e6688813442ea17e0992820f62134de2518ea2e80987241bc1eb87b24afc653e3c2e3d0acfa5119 WHIRLPOOL d89da62dabcc7be0406024c8b103f76ecded721138415a5c9f07720460a6cab083d8c25a6933437f3793ea5434a091eaea10789c9b45b00048550437195638f5
+EBUILD sphinxcontrib-asyncio-0.2.0.ebuild 873 SHA256 9b120f9db21235f47b574821772d04c2898fb00223186efd81ce06a1ce270a88 SHA512 7f9d37e5101b98b4ce16925ba0e9a4bdae18f6d723732c183bad228720ef89eabea0f4598c7cde2c873fbcbd0ff38302b9dc1aadaef8be1eb5e734dd867e8ff2 WHIRLPOOL 6978e5b542cf8b374c4d12ee58333fb8c648afc849774b36fe5979b378e966709f721500a604d61aa89482ac027345cf33d59cb8528b5ca46028f79b18ed2db9
+MISC ChangeLog 354 SHA256 d10b9f5ff0961516aead7bbd726b32d38d2d52f828db289bc532a5b62f77041b SHA512 87b98b4420bf938483f364198fbcbf96a5f962b55c5f058d1d396382cb7317c80fd1298aacd30f80a3af12f8d73aad4745b64ad045979fc49f42bf9d04074d93 WHIRLPOOL aeb8591a9fd19bbe4649797274407ef8da7fdce49ff67498a4616224bdc50d3a3e0e5565ecbdd65e8891fd1d3791231e38381fe33c9d30eb650f8b0880f06f54
+MISC metadata.xml 479 SHA256 93cab27f4d1b60bc4eef8ad7408514eeaf10c5c5ab937607d33475ae47591920 SHA512 ea288acf888e29a1213e200599e7cc9528c99899edb613b6b77c80aa761cd0b0630837a9c1529fa8ca5e36935f263c8a37978b3afc0ea32cd8b5e3c1671dfaf5 WHIRLPOOL 23656401679004ad3aeb1a111f00d2602d4d241dac53689b0bd773f5409032d629c48a05aeed57ee60b4f642c17f11975a88bb0cf5410f8c390d80bb69087e85
diff --git a/dev-python/sphinxcontrib-asyncio/metadata.xml b/dev-python/sphinxcontrib-asyncio/metadata.xml
new file mode 100644
index 000000000000..6f73ef4c918d
--- /dev/null
+++ b/dev-python/sphinxcontrib-asyncio/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">aio-libs/sphinxcontrib-asyncio</remote-id>
+		<remote-id type="pypi">sphinxcontrib-asyncio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r1.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..fe969fc8bbac
--- /dev/null
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="sphinx extension to support coroutines in markup"
+HOMEPAGE="https://github.com/aio-libs/sphinxcontrib-asyncio"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+	# clean up pth files bug #623852
+	find "${ED}" -name '*.pth' -delete || die
+	# collision bug #625872
+	_namespace_cleanup() {
+		rm "${D%/}"$(python_get_sitedir)/sphinxcontrib/__init__.py || die
+	}
+	python_foreach_impl _namespace_cleanup
+}
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0.ebuild
new file mode 100644
index 000000000000..98201f217f7c
--- /dev/null
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="sphinx extension to support coroutines in markup"
+HOMEPAGE="https://github.com/aio-libs/sphinxcontrib-asyncio"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	${PYTHON} -m pytest tests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
new file mode 100644
index 000000000000..7ef6d552ce67
--- /dev/null
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -0,0 +1,4 @@
+DIST sphinxcontrib-blockdiag-1.5.5.tar.gz 12066 SHA256 eb9085b7125b2f33e3f33770733cdc470a3404c40e6a251cc8b624e5e25c295c SHA512 4c007e2c394bf90ff84a000cf44ec1d50b39286a32929c89a64320299a70f10e44da35d942e7bb8697a9d61eb6a551f74bd15349cf0b439369aaaf12d175635a WHIRLPOOL a50fe5c5abbd77dbcb4c19815d974ab22f620a5075ef954b4a30f8294671d7ddd1666c0222c05162377e5c48e6380e01674acd0a7454f38095171000da43b82e
+EBUILD sphinxcontrib-blockdiag-1.5.5-r1.ebuild 864 SHA256 2a14dd457a550f6206b3ddfbd7de6ea0732c10cae06e9dcb8557c4d716dfe670 SHA512 d8abca6cf6e8c8633f9ce872531a7c3be58362fa1135bb1d51591dfb61751b4d1cb767494641a5b393d6b594ab4ff0582a9a7483827b084fb419121078998b8f WHIRLPOOL 679f642e1d0d6959a57a957719235818439d15fe7644fd6b788e818de48bfbea025d997892660f37989225dafa604cb69ac2ae25fedfafa58f52210cdccdfc81
+EBUILD sphinxcontrib-blockdiag-1.5.5.ebuild 679 SHA256 25f4c4d28e2cbe6fa9e447045159c14cd1309d43fc6bdf0faf856f4d2fa28d3c SHA512 1a1b68c4dbb051f35f19a05bec35103192111df977afa688e90b185a36a3676c6bcfda5a2160499edf6141b6220f709d08ba4d809fe727f7f13a2c2b0d31c2ed WHIRLPOOL ea661229e4c4eec71ddc936fe18af0fda04d102856d4c45e3b3f047ad2f8c2224dd7c773cce2586b2cba2e7fc7b52a41fbc634f610ae8a2d8a114a78ff3cab9d
+MISC metadata.xml 415 SHA256 e4e8cca40d49fbc5affa74a89c4a4dd6a480dc3fed03cc62698b09de336ffe4b SHA512 857a231d759fecabeaa764a2ec8181788f5ae4d9271414f75d001ef60b0a146f533a277dd6473678d398013fbde58c4f0479291089653a521d30cc1931f7da89 WHIRLPOOL 0590669e0a33dbb06675cac42084ca88c733f98061b62028cb603b3f246baaeccf08fa49afaafb3864c50f96a4905d2f9e1c70811a8fef1744cd6e676958aea7
diff --git a/dev-python/sphinxcontrib-blockdiag/metadata.xml b/dev-python/sphinxcontrib-blockdiag/metadata.xml
new file mode 100644
index 000000000000..c0b469c17c97
--- /dev/null
+++ b/dev-python/sphinxcontrib-blockdiag/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>i.tkomiya@gmail.com</email>
+			<name>Takeshi KOMIYA</name>
+		</maintainer>
+		<remote-id type="github">blockdiag/sphinxcontrib-blockdiag</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild
new file mode 100644
index 000000000000..775f0da1e163
--- /dev/null
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A sphinx extension for embedding block diagrams using blockdiag"
+
+HOMEPAGE="https://github.com/blockdiag/sphinxcontrib-blockdiag"
+
+SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+
+DEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=dev-python/blockdiag-1.5.0[${PYTHON_USEDEP}]
+"
+
+RDEPEND="${DEPEND}
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i -e /build-base/d setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild
new file mode 100644
index 000000000000..c2d09ca7e7df
--- /dev/null
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A sphinx extension for embedding block diagrams using blockdiag"
+
+HOMEPAGE="https://github.com/blockdiag/sphinxcontrib-blockdiag"
+
+SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+DEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=dev-python/blockdiag-1.5.0[${PYTHON_USEDEP}]
+"
+
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	sed -i -e /build-base/d setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/sphinxcontrib-cheeseshop/Manifest b/dev-python/sphinxcontrib-cheeseshop/Manifest
new file mode 100644
index 000000000000..9a91fa48d6a8
--- /dev/null
+++ b/dev-python/sphinxcontrib-cheeseshop/Manifest
@@ -0,0 +1,7 @@
+DIST sphinxcontrib-cheeseshop-0.2.tar.gz 3568 SHA256 d1a3bc4c1842868f959f7e14fa7390e64fa717823144286e7d15a25c3624b1ec SHA512 5d6c88c0c43f37b94ebe6a2a62f795a6f7d5d6c407b808d6b21d54c1775fc4b5f22466c13e61adc16ac7973ba11e99a66da8650c869856f766e6bb3a6e99923b WHIRLPOOL 171762e8e197b54412a48db928395a62a8003eec614584df36d427afb44ee55cbfb8d75534dc38046cfef1a72c1f9eb2e37617afc755ea5b40187f48a493fbf2
+EBUILD sphinxcontrib-cheeseshop-0.2-r1.ebuild 563 SHA256 80c83c68af60b225913dab8ab3cfc90780e48a1f80a2df18f2fcbd07432c2dd7 SHA512 116fd554fd47a462205f8f0d20cc65b662596cc992ba8dc527b953c2ef1835e2961ccc8ddea6eb73853bb716f97d3bb424ca6e5bf658fa71a954dce119b75ede WHIRLPOOL c7d41cb1033be84c8146d12ad1c6373751f21493fa2000c5eb56bebc9a44a75e83d59dc032a90e57c7723da4d22e620d9aab4b75b6ae0ea5c2d1a3cf11e920b0
+EBUILD sphinxcontrib-cheeseshop-0.2-r2.ebuild 748 SHA256 12c79680c28fd55350b2694628f56f31979f78aa5839819bc806047c90fa05a2 SHA512 8df85762fcb7d922f3e8bf3c8fdcbfb853f741c70a89d4f0a4eabc0b9c98626397d68cfd80c3e7b1ee2e443479bc2c255e15d28464b71b905ba206e04285a638 WHIRLPOOL 58f227998794962f8354fd71a6c08882f93e0354e4b183ccf852852d92a50a320d8a2458616bcfea46990e10c80a46da520306deb2a0e368c0baff520fa1388b
+EBUILD sphinxcontrib-cheeseshop-0.2.ebuild 635 SHA256 ae55ce84bb087cc7b3401b1eeca591e98417ae4d36ee759f14b50262445181ff SHA512 335d0bba92433a2a2241da2b14e505a4a29c4038207fbfee9a1818b3282db1ed88700dd78b69542b58382518c877e9e08bf3b8d006c862911eef8d956859aa7e WHIRLPOOL 35882a823b484e6f9e22009bea9fe66bdc60cd8a82337d2c140e303296beaa6251fecb742b0dfd508059f90a2a07c9d494beccc8b6837417bc3b998334ad75d8
+MISC ChangeLog 2755 SHA256 ffcd81d222d52d6cd589d10fa24598be6d4d2d1cb611b2e8aae9bd49b69cb2e2 SHA512 36646ace563497873060fbc6beac0ea6fbc2f399baca5eda61663e7629e23cb7c1174a69dab2963274da4321d1b46303990dbbdf8dcff018ceaa11a2f8d59436 WHIRLPOOL ee79ca9f7377ecae0c5d2036351adc7c167c0972f20994ba66e62e0549beb62a055422d7357650a1a3c6b2d9d76fbd78d92383d04ac4d98794bf60f30f6b924b
+MISC ChangeLog-2015 626 SHA256 09a20677cd669307147c62c624a24543d3e5093d5525f87131a886bf0039930c SHA512 7cdb659dc84d34743164d596e98cf4f07b68a8cfdead2ec57e30274d87bb086e6e111ecf5a5a9bf1347d43ab79c379ad7857e1d1ae264ab26c9ce81fe14ca046 WHIRLPOOL f314eb812e812f43f745e7fc63813bbf39978de447fa2f1c995e3c7d16cf67590144931d4e051d8aff54bb98fc5df1943bdd317ce4ed1fc6658391a4e18f5747
+MISC metadata.xml 401 SHA256 fcb69a89b79970077ac9bd2bbec9baddb7226f5721327595ad19b6af0b90a175 SHA512 59d529898e8ddd9af3a5653a40c69d18b0b3adaf90ca72011c1308b50a23afc35d6ffc5d7300e6fe7b3b9aa610674dec2fbd55dcdee10b693ff8280907cb95f1 WHIRLPOOL b5cf07d12d60c3d59595f231fb0858fe8fab8e641a960e87a20d9c52a68cdef3e07a19d26194a65a342553bd54932517b6588d2b38c47dc5a2f9b69159bc13a8
diff --git a/dev-python/sphinxcontrib-cheeseshop/metadata.xml b/dev-python/sphinxcontrib-cheeseshop/metadata.xml
new file mode 100644
index 000000000000..01421b28c4ad
--- /dev/null
+++ b/dev-python/sphinxcontrib-cheeseshop/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sphinxcontrib-cheeseshop</remote-id>
+		<remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-cheeseshop/sphinxcontrib-cheeseshop-0.2-r1.ebuild b/dev-python/sphinxcontrib-cheeseshop/sphinxcontrib-cheeseshop-0.2-r1.ebuild
new file mode 100644
index 000000000000..87a6776212e4
--- /dev/null
+++ b/dev-python/sphinxcontrib-cheeseshop/sphinxcontrib-cheeseshop-0.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension cheeseshop"
+HOMEPAGE="https://bitbucket.org/birkenfeld/sphinx-contrib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-python/sphinx-1.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed \
+		-e '5s/file/open/' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/sphinxcontrib-cheeseshop/sphinxcontrib-cheeseshop-0.2-r2.ebuild b/dev-python/sphinxcontrib-cheeseshop/sphinxcontrib-cheeseshop-0.2-r2.ebuild
new file mode 100644
index 000000000000..0dad495679ab
--- /dev/null
+++ b/dev-python/sphinxcontrib-cheeseshop/sphinxcontrib-cheeseshop-0.2-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension cheeseshop"
+HOMEPAGE="https://bitbucket.org/birkenfeld/sphinx-contrib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed \
+		-e '5s/file/open/' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-cheeseshop/sphinxcontrib-cheeseshop-0.2.ebuild b/dev-python/sphinxcontrib-cheeseshop/sphinxcontrib-cheeseshop-0.2.ebuild
new file mode 100644
index 000000000000..6ce0d6aec346
--- /dev/null
+++ b/dev-python/sphinxcontrib-cheeseshop/sphinxcontrib-cheeseshop-0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension cheeseshop"
+HOMEPAGE="https://bitbucket.org/birkenfeld/sphinx-contrib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-python/sphinx-1.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	ebegin 'patching setup.py'
+	sed \
+		-e '5s/file/open/' \
+		-i setup.py
+	STATUS=$?
+	eend ${STATUS}
+	[[ ${STATUS} -gt 0 ]] && die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/sphinxcontrib-ditaa/Manifest b/dev-python/sphinxcontrib-ditaa/Manifest
new file mode 100644
index 000000000000..226529e1075b
--- /dev/null
+++ b/dev-python/sphinxcontrib-ditaa/Manifest
@@ -0,0 +1,3 @@
+DIST sphinxcontrib-ditaa-0.2.tar.gz 7293 SHA256 ec8123067c8f5457e983313380570353406a21035a14b8f00bb661d9a63297e1 SHA512 fc9f9b1475b7efb3f057156bd56be51414068c80f62cccd0fb5bf404b7047d296b3de05a1825b42e2b51a7ff6f0ccf1f3a7935ec494440ccd0fda487786adae5 WHIRLPOOL fdcda3a8c5edd0883f6a8a14c6a9d59193233e073dce4d7ebc7892755996baa157fb52382962ed460990478e8a7fb2a0553db0134b844784f35367b5a3bd10f3
+EBUILD sphinxcontrib-ditaa-0.2.ebuild 641 SHA256 4a1d0936a9c5716b51989967ada72002b7d02a10bc06cc08344ae05923e4c32a SHA512 4b357a9eab5487659524139f997b91a6649f7a678fde2b6f32280c759dd4ed18f725ac9d9bd1855df6d5a229d86e1e7a71482e1fd095371f0505193e86a33f52 WHIRLPOOL c9f8186d123a55a2a313f476221e135a66c3c7e713124409ccde5e9cc8a240a1fa210a43bd57b9997cfe9fb16abb2fe0b074d533f16eafbfb7c027f00e4a02ea
+MISC metadata.xml 326 SHA256 c49c8d0fd402ee68a843a6109415c1cc301ff475316584daa00129794997fa65 SHA512 fe55a4d96c90929f68cc2f6a1b211975cc0f6e26061d2f1956d8bf460623d7ab1d611f0145b1269b37dc15dda84845425e62fb03b711c4e2de6e132ac85fd959 WHIRLPOOL 6c0088958ab1f64a4079bcfc2884b44d6432436790bc501c92006a663d653881a1e68c6b796e0b69d02385daca2d911f04803e45453271380083ece2911321f5
diff --git a/dev-python/sphinxcontrib-ditaa/metadata.xml b/dev-python/sphinxcontrib-ditaa/metadata.xml
new file mode 100644
index 000000000000..7caa7628e112
--- /dev/null
+++ b/dev-python/sphinxcontrib-ditaa/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sphinxcontrib-ditaa</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-ditaa/sphinxcontrib-ditaa-0.2.ebuild b/dev-python/sphinxcontrib-ditaa/sphinxcontrib-ditaa-0.2.ebuild
new file mode 100644
index 000000000000..0b34d44162cc
--- /dev/null
+++ b/dev-python/sphinxcontrib-ditaa/sphinxcontrib-ditaa-0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Ditaa Sphinx extension"
+HOMEPAGE="https://pypi.python.org/pypi/sphinxcontrib-ditaa"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+	media-gfx/ditaa"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
new file mode 100644
index 000000000000..19d5c6d68052
--- /dev/null
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -0,0 +1,6 @@
+DIST sphinxcontrib-doxylink-1.3.tar.gz 12401 SHA256 95dd12637b2d28aae50f2abbf57dcb339be01f7b829dc435432d314a8f37a9c4 SHA512 5a53061cddda22b682b4b640725d4cd763b54d9dfa3599b666dd55d72660f07fc89318abeab07d114d01313b215e69e421a3b5251125d28c3dd326426830f9ee WHIRLPOOL 6db488051e0b2758182a1be6f21601500f473974a1d780e986a7347dceac8f441744c29ded49312021947bd623421237d36f395aac285ff0acba01b78e715f68
+EBUILD sphinxcontrib-doxylink-1.3-r1.ebuild 933 SHA256 7cb7327cb29f15bca9ccdb9d4105747a7d36e9bdaf7b5065a90a593098991db3 SHA512 481683a5ebc2283c9f9c38ddce73797edeb384c51faeab25fab337e4028aa35649a489c67eee60bdbc5e5774976128706dbb6726fe65adf324080ba770eca720 WHIRLPOOL cffeae76d457e07d74375c8d848afebdfe48558ff06ecfdd2a8df73d63c8e6a61d90d30462b9d72bebc27796e621823840a7ae167ec09edc918511dd545b46d2
+EBUILD sphinxcontrib-doxylink-1.3.ebuild 748 SHA256 358645897676ac6271783a1ae9bbe7cfab0f2c72621892878fe601a6de30d833 SHA512 e2240f41ccc81fb56df0fcaee4d3d24b728e5d61b62a2cf9f9c0385d72b376418d0d9438b0db04a0aa2e4d8a51f61c4ad5920347d71b91065efdac9691ae6b1c WHIRLPOOL d44bda4dceae0eebd33b93139b87964be8b1ad65962cb0f461211805da967e927f27127983dacf84a00c0cf0c6215fdbdd7039867cf3273cd1bf4b496cfb7d0a
+MISC ChangeLog 2613 SHA256 5fab769d42e04efa93f5c8f1d1b6fdb8110cfeb1175120ab42f09a61282c272a SHA512 79dd6ab24512591ab38a0be7c0efa015918ce526753e446fa036ffd1dd6820115611e1588ee6097fed38affc602ace4f62083ef598b99a25befad6d2e754def9 WHIRLPOOL 33ad53713fe35332ea1a7ec239dc33913da28ee5e074dfa072e74788fcd343716d0005deeeda345b68f64514654fc2783f38cc31d46db95b8d30cb3c3f7c9477
+MISC ChangeLog-2015 730 SHA256 72944eb6e2988c9f103ee2addbaf6944c56b9dfa04211be471d8177841977dce SHA512 926149ee17449b160d3e44aca60035b90227433547d14f6243c40dba61906fabca92df3f49a0f1b959f8eece95f63ecc6d36ff18dc7b98f2e6c9d688dced5586 WHIRLPOOL fec4fac227315a07d81f2e02aa3ce536810a0e59f384b35f8be57dcc35db093c2d167c861a11ac51a23ac1659ec050de78e29302b05aea483a828fb419426962
+MISC metadata.xml 599 SHA256 b30826945f96b5b04e3cbf30dd0c83a0d4cd09c5d7b2e5ed256c7ea9bc600d04 SHA512 5f025fc40b2f4a0d36600d98dc205637abab07dc40bef0dde88babb5bb676734882145e087b7f6c4d11374d94340b226b5c37271044a70c9cb1ceedad3864fee WHIRLPOOL 35919d0a1af4d79dd9cf9ed55617c5bbf7a4722310c4bf89bf093eb28a0f8adc9b98e9d511d9c95d00ad36e61f3aac79e5d13a551db385decbc8b95fc47e2ab6
diff --git a/dev-python/sphinxcontrib-doxylink/metadata.xml b/dev-python/sphinxcontrib-doxylink/metadata.xml
new file mode 100644
index 000000000000..de11f8437f1d
--- /dev/null
+++ b/dev-python/sphinxcontrib-doxylink/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+    <description>Python team can take the package if they wish.</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">sphinxcontrib-doxylink</remote-id>
+    <remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild
new file mode 100644
index 000000000000..961bd0d2d977
--- /dev/null
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild
@@ -0,0 +1,34 @@
+# 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
+
+DESCRIPTION="Extension to link to external Doxygen API documentation"
+HOMEPAGE="https://pypi.python.org/pypi/sphinxcontrib-doxylink https://pythonhosted.org/sphinxcontrib-doxylink/ https://bitbucket.org/birkenfeld/sphinx-contrib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	# any better idea ?
+	rm -rf tests
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3.ebuild
new file mode 100644
index 000000000000..0879fe816952
--- /dev/null
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3.ebuild
@@ -0,0 +1,28 @@
+# 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
+
+DESCRIPTION="Extension to link to external Doxygen API documentation"
+HOMEPAGE="https://pypi.python.org/pypi/sphinxcontrib-doxylink https://pythonhosted.org/sphinxcontrib-doxylink/ https://bitbucket.org/birkenfeld/sphinx-contrib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+
+RDEPEND="
+	>=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	# any better idea ?
+	rm -rf tests
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/sphinxcontrib-googleanalytics/Manifest b/dev-python/sphinxcontrib-googleanalytics/Manifest
new file mode 100644
index 000000000000..f6ce0d088b56
--- /dev/null
+++ b/dev-python/sphinxcontrib-googleanalytics/Manifest
@@ -0,0 +1,7 @@
+AUX setup.py.utf-8.patch 413 SHA256 2c0c675bedc9b20f9d4df38b390bb0f787b7749cb636fb5fdeab7e1cf77f1955 SHA512 dcf01e5d306cf41c5092328de26d0d83d183c9a969898ae42e19025c45f8412f9c1bdc18ba7b247e10ac5d33e77b5211eac7fe4d36c69603ec6c6526f61a90d8 WHIRLPOOL 9b8c2768116d08e90d3098ed73531b04157221aeaa8a71a14a41539075252b0dad76c805113e841eb48b1e38fa31ea0452df884d30ef9d09cb66411f29980477
+DIST sphinxcontrib-googleanalytics-0.1.tar.gz 2892 SHA256 92b7d74a45defb01e7d29e86fd8206eba42c896b2272cbd1b4b4f6a7d178d5a8 SHA512 fdec9108f9c1d86c6c59cd2bcfa55d82cd5cd48aca5b7aecec7734f3cd29b0f6c080aad7b7009148e3d95b7cf80af38ffb6ba230879495f3c1488ddb661fbf48 WHIRLPOOL 32115511eb21cdb7a202b9b63a4568f31f64a9d98d4dfd25cd6d15628cbd7873d8666f9969d25a3db569f25389d43028214d7d805ec07961c9d96f9991f9c10f
+EBUILD sphinxcontrib-googleanalytics-0.1-r1.ebuild 529 SHA256 096a35d30bf78aded060b523e5b2b95161455a77422b5762f68919b7295d1f56 SHA512 54a5a3cae53216b236562981f413e619d62013363ec0e3091ff99ad2149143bb98d0f657650dfa04653cd29e20606b9f7939f0e1ee99caf3d2ebf55f16d2e5a3 WHIRLPOOL 058eed01294e5afb6f7f076e530f9597e26daf150fbae107eb773cd7bb8dde6af83450b927ef09c8732c5c12308836e1e01badb332a9702785ac2d89af5b9569
+EBUILD sphinxcontrib-googleanalytics-0.1-r2.ebuild 721 SHA256 ecee903713553620fd3b6ee7f5d6a77d87721597ea9c446dace6f3f56fb22f58 SHA512 305bc573562918cb744e299f9f7ebc72342fd46655081fc2d860de6e759ed00390edcc33ba97edd32ee58313341976e270d613c930c6197faf5194eb46410435 WHIRLPOOL 99c7f736d04b6431abd564ba8dee1ea0e11e18aa212112f47a66d70a8cd7ed2ab876af09b01a684e1dca185d74a26885afa4f2dd73aff026cbe86daf0b9b81dd
+MISC ChangeLog 2696 SHA256 68fde5f0f3538ab971f576405e82a95f1826fb9e3fd9382a482039e77f5427b5 SHA512 313e5551307999777c547923210fb604e299b48e37b1e52f3dfa1776a65eaf225524891e128dcce1755787068a79691aa954a312d5c117571641a6ca7bff08d3 WHIRLPOOL 57aca4195d00b5261494b4226d13d2e1ab0f927d0f90606913eb4054280660484d1174411c52bebea203ed1c482d0434ffecd551cfd9aa471ea5052d9b00d82c
+MISC ChangeLog-2015 1441 SHA256 0d365b6f3259e42d3ce5034ecf197027382f06c87b9cff6630fcca51f423da44 SHA512 b6f1c58e7dd77981d74fae3e7554bebd255e6d4d9aa379523e53bdc910de9ebc994d62cea7680e04a3292893baad5877020d241aebb00bade9d79b73c01e8e33 WHIRLPOOL 3c02dfd9e02ce99951a7b39429f0ec0f708bf2766dcb2a286c8126eafb4ee640d4067ab143e9850191697bd0fcc6a2ff33f1088fc364108974843b1abc81787e
+MISC metadata.xml 412 SHA256 ad483fc6f9127c27069c90f14578bf63e4f7e3cddb753a11209e99799ecfb2ad SHA512 46c62c4de72309bf938f9d91b89183968e51741b4ce25646c359de043ff463fa6690b4f91484388007b96fcff64b0c293907bc07ffe6160d29cb68c391b15afa WHIRLPOOL 187e9a94bccb9a0cd42fda0d4db3e9cfe53aeb743850752322214b2de537a06e164c17789fd4d7f5836509f2672bcaad64246ecf4fb964d5c0077165bd7849ce
diff --git a/dev-python/sphinxcontrib-googleanalytics/files/setup.py.utf-8.patch b/dev-python/sphinxcontrib-googleanalytics/files/setup.py.utf-8.patch
new file mode 100644
index 000000000000..a45ae42b188a
--- /dev/null
+++ b/dev-python/sphinxcontrib-googleanalytics/files/setup.py.utf-8.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/show_bug.cgi?id=429914
+--- a/setup.py
++++ b/setup.py
+@@ -1,10 +1,11 @@
+ # -*- coding: utf-8 -*-
+ 
++import codecs
+ import os
+ from setuptools import setup, find_packages
+ 
+ HERE = os.path.dirname(os.path.abspath(__file__))
+-long_desc = open(os.path.join(HERE, 'README')).read()
++long_desc = codecs.open(os.path.join(HERE, 'README'), encoding='utf-8').read()
+ 
+ requires = ['Sphinx>=0.6']
+ 
diff --git a/dev-python/sphinxcontrib-googleanalytics/metadata.xml b/dev-python/sphinxcontrib-googleanalytics/metadata.xml
new file mode 100644
index 000000000000..59d4f18d4f76
--- /dev/null
+++ b/dev-python/sphinxcontrib-googleanalytics/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">sphinxcontrib-googleanalytics</remote-id>
+    <remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r1.ebuild b/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r1.ebuild
new file mode 100644
index 000000000000..00daa2122a81
--- /dev/null
+++ b/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension googleanalytics"
+HOMEPAGE="https://bitbucket.org/birkenfeld/sphinx-contrib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/sphinx-0.6[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/setup.py.utf-8.patch" )
diff --git a/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r2.ebuild b/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r2.ebuild
new file mode 100644
index 000000000000..ab505c55c22d
--- /dev/null
+++ b/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension googleanalytics"
+HOMEPAGE="https://bitbucket.org/birkenfeld/sphinx-contrib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/setup.py.utf-8.patch" )
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-httpdomain/Manifest b/dev-python/sphinxcontrib-httpdomain/Manifest
new file mode 100644
index 000000000000..19d94d9a8c43
--- /dev/null
+++ b/dev-python/sphinxcontrib-httpdomain/Manifest
@@ -0,0 +1,7 @@
+DIST sphinxcontrib-httpdomain-1.4.0.tar.gz 12192 SHA256 9db07b047b8799378ae532d6b9b17080035da8d889082ad7f124de0469feeea4 SHA512 85d4d0898a1703a1742755814200253b875795b5f267b08adb00c7d8d7c15c434718ce0f93656e7b698df89c958a9f6f3f3403bdc6d08f6df322fd80371f1d70 WHIRLPOOL 1365183bd1ba9edff7c82c5c509c6d1f4fe36a35a7f88c168755d330217e4bd70600679d8a501fbacc7730901196ae62c2f6487ded513b8efed1a0012d93a1a8
+DIST sphinxcontrib-httpdomain-1.5.0.tar.gz 13981 SHA256 eab097505caee272ca6a313edb2cbc3d2103bb6bcc09923ef43054e238452f6b SHA512 e393690314cb7a7b81207ee42826eb5360ca6cfa8ad1b57c9a8dd5897ed1ed97bad4a46d8348aad9d5f6b6145e5456af629b14973ad2561d5b90b2f8dbf2163a WHIRLPOOL becf70b6b871bdd5e08be168d5b255f312389baee0b91b95aee9ad35150e9f56363ea95023206290b23e6df7b8b5e27326dbf68850349305c433518c22129534
+EBUILD sphinxcontrib-httpdomain-1.4.0.ebuild 631 SHA256 77c26e6f91f51842a1a2e897541dc43a85c2250b4cc2eb9ae9670295c6666e1f SHA512 304d9d37c3cab1feaa437bca7126db6ab17d4d0786bf0781368f7f84e193b3a36b06d5cb5e35d374bbfc385ac3448364e10b492edf84bee90fb1fd32b1b09d8b WHIRLPOOL a972f71847bc2486eea6f89ccebb0fd987e2658fa6e53cc76f2e090d2fdc8a4d06cc592bdedbcb2f6383aedefa0fc68d56251fe09004d7c3febabba318f66c6f
+EBUILD sphinxcontrib-httpdomain-1.5.0.ebuild 755 SHA256 81118e91094733bb0c22e5787e8b51e175bbb22e5d982dfe7a926d3d16753966 SHA512 130ad3482d513abbd3c74f4d244d1311dbe715e7a224ff6d75c5e09608fe1a3b65b859793bf64455ccbb4c101d8c7c8679a78124711001af0e46ce3e09ff71b1 WHIRLPOOL 2a54032b6dfddfa67fc89ce494655f7c0393a50c014830d21efbdc590acb844ec5eaa4a1118d548a2b5452683195bb137217210aeeac33d81cf8bf157bfe56b7
+MISC ChangeLog 3569 SHA256 f80b3beda6ded442eaaab624fa1dd284393eb2875555c9292747c811241902ea SHA512 0b4021a61df19c283bc6c1153d42fcfd29ba760c5b279a77786f7118ad154f0b78a8732c319a544fff8bd022639e64e4581de4724a96beba65a06f6670b94262 WHIRLPOOL 2002e4e6f421adda7f1a6df4605cc53db8c30fde7d9bf5e2faf86fd1d40ead657a44648ca8b36e07001e3caa2ce8bd1e4186b9a742d0eda544a9fe848f37c191
+MISC ChangeLog-2015 2065 SHA256 c620d41004b3d5da62911c24cb458255ef8f62a1885fc71d4d4654b4cf32f5db SHA512 78f020c965d33736e875a2578dc1d4d7927489605e5ec74f22f669eb2a3fdf3df37ec0a508246cd7cea0a2c9946f4271414b419ad32a17e9e158438f05bc4ffe WHIRLPOOL 5f762afb7f04536d8099662bb48d9e35acff09a7417778dfd17f2c58199dbc5d10e0bd718386ee2cf954a3d7fb0669b31d388d35413651d3dc7ae44ed9620517
+MISC metadata.xml 407 SHA256 46e4baad2477c3da15b28dae3ef103aa3232c70d07b400b287b15fc5ffbbc804 SHA512 155696e449933084fbe56dd900e15d17e12d52d6af29eb4fcb6c05ddfe8c6fa716974fa27085c34ae2e1af0d1739dba2616eb12092c606b2645f2008e51d64a3 WHIRLPOOL 92b478e213f343a543015e204d1c5559d0e7c5f1454a6a940ccc5dd3352be0461c25e1adafb1c0d83f5fcbb4c6b8e98862b383b62b3810dc5eb847c9d2be19d5
diff --git a/dev-python/sphinxcontrib-httpdomain/metadata.xml b/dev-python/sphinxcontrib-httpdomain/metadata.xml
new file mode 100644
index 000000000000..592df77578dc
--- /dev/null
+++ b/dev-python/sphinxcontrib-httpdomain/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">sphinxcontrib-httpdomain</remote-id>
+    <remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.0.ebuild
new file mode 100644
index 000000000000..670e1c924e27
--- /dev/null
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Extension providing a Sphinx domain for describing RESTful HTTP APIs"
+HOMEPAGE="https://bitbucket.org/birkenfeld/sphinx-contrib/ \
+	http://packages.python.org/sphinxcontrib-httpdomain/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND=">=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild
new file mode 100644
index 000000000000..10e5eef85a82
--- /dev/null
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Extension providing a Sphinx domain for describing RESTful HTTP APIs"
+HOMEPAGE="http://packages.python.org/sphinxcontrib-httpdomain/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-issuetracker/Manifest b/dev-python/sphinxcontrib-issuetracker/Manifest
new file mode 100644
index 000000000000..558c0bec147c
--- /dev/null
+++ b/dev-python/sphinxcontrib-issuetracker/Manifest
@@ -0,0 +1,6 @@
+DIST sphinxcontrib-issuetracker-0.11.tar.gz 30351 SHA256 843753d8b5e989116378ab45ecccb368fb78dc56eaa1554ed25e4fbf22745f4e SHA512 fb4a977bea22451a3d90b16821fc2a38ed53b17913666ca250e9aab8bb1726bbdb52fb2b6dbb2ae512a0ca6cc3d33dcddeba758c02c77b099180443d67e147c9 WHIRLPOOL f49f01b6b9de9bb21473ee810c9bb663ec76e7744c4c58b96c698d1ffb177bdcda08c9de60311d62789a065fd0322336a60930715d362691e74458070df2c7ca
+EBUILD sphinxcontrib-issuetracker-0.11-r1.ebuild 1376 SHA256 95fc962ab7c2d7e7ad97f82dd661eef718e65d5df6dc57d68821430f83010e40 SHA512 dbe2e63afe4384889d2c492bc154492de5b3e7ef187914fbd6169d24b28f37665bbced82a8e44b2e0952df77db4bd438f4daa52ca22135835a093611cc7ad77a WHIRLPOOL ded726b9c6a424f89c506753c883debe90cc86d6ffc6c3c32e5c0c899d7222c4a2346f484f1e3c9aee56846a0f9b073a9377090d2f8a5a0bf252cbad4736be3e
+EBUILD sphinxcontrib-issuetracker-0.11-r2.ebuild 1552 SHA256 88af2a6018388cb7691edfca52719443eecc107ed61b24db7b1bafd52f2d75ff SHA512 9c064d855275e3ae7295e47b4e8e320267827066e20f0c46684e65005c0b18add8b662f595f488cf9f3619843ca29386a2c5720929ef4b7ec228ba68237c98e6 WHIRLPOOL e2bfee471ebd16986a62ea2a442532b1765cb034b876d2fe992143c897c7b6f5d0882a9f813f4f5b590f6e6ca71d5b18f262ea96292efe811990ae3b345fba95
+MISC ChangeLog 3689 SHA256 ad2db85cb5097f9ab4a1084f6a788a44c8f51b0e1b2cac68ae1cd7aab81ad5f8 SHA512 d727ca9c4121b63c585f3c2126f515ee2b083f33207835d63a3b601193f666435394768bf93681b94de88ac983e9791da7e7933178cc71ce6af51c73c3a80016 WHIRLPOOL 73476fcdd6d8946b9e8c3ae05bf9f300da924ab6710f8ea8314ce8a115f61dd3389e084aa7d44335b6ee34b294d13b0739501e8f3f562c141c2f53af2d0cdfce
+MISC ChangeLog-2015 3745 SHA256 b80b15282a14ab33e750064306446d3451ca175ac02756547ce3b7acf1f2d9b9 SHA512 d2a762e3edeb0e37d88ec7ceeb08e1dd064d9f25d8ca4b5bf11a469892495a2036ae440966893f6e4929582744b28165bb960c7d58acd9a209d080ba6d75cc1a WHIRLPOOL 1a59782a466777c76c6e095ef54dd09d51d210e607e327445d1b8bbd38595ba958816e93df1ceabb249545a580c7962a12467461b70a2f89a6ebbad49e873658
+MISC metadata.xml 329 SHA256 31737d9596c1b666703a95b7d1b3a5c0b7d62bd6a780593dcd47b7f9fc290bcf SHA512 16db67eafefac64ab7b17d99e0520c1c6f58cfd929274e9f82af85aa4842278ebe29fda98ad824c673b3bc56fe8c5cf469260fec9ec2c977ca11d51b8343a2bd WHIRLPOOL c376b134f60d81c8e409f075c1eb67cbb98930477e252e4b9cac4e1d68ff3f438301e6c4dd710f37e726ad4beb0aad55a93a656564815babd846f476b0b05d61
diff --git a/dev-python/sphinxcontrib-issuetracker/metadata.xml b/dev-python/sphinxcontrib-issuetracker/metadata.xml
new file mode 100644
index 000000000000..e27bdf9248f7
--- /dev/null
+++ b/dev-python/sphinxcontrib-issuetracker/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sphinxcontrib-issuetracker</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
new file mode 100644
index 000000000000..62bfbec5ce28
--- /dev/null
+++ b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Extension to sphinx to create links to issue trackers"
+HOMEPAGE="http://sphinxcontrib-issuetracker.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/requests-0.13[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# test requires network access (bug #425694)
+	rm tests/test_builtin_trackers.py || die
+
+	# Tests from tests/test_stylesheet.py require dev-python/PyQt4[X,webkit]
+	# and virtualx.eclass.
+	rm tests/test_stylesheet.py || die
+
+	# Avoid redundant objects.inv from downloading, sed more lightwieght
+	if use doc; then
+		sed -e "s:^intersphinx_mapping:#intersphinx_mapping:" \
+			-e "s:^                       'sphinx':#:" \
+			-i doc/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C doc html
+		HTML_DOCS=( doc/_build/html/. )
+	fi
+}
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
new file mode 100644
index 000000000000..8215945209c1
--- /dev/null
+++ b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Extension to sphinx to create links to issue trackers"
+HOMEPAGE="http://sphinxcontrib-issuetracker.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# test requires network access (bug #425694)
+	rm tests/test_builtin_trackers.py || die
+
+	# Tests from tests/test_stylesheet.py require dev-python/PyQt4[X,webkit]
+	# and virtualx.eclass.
+	rm tests/test_stylesheet.py || die
+
+	# Avoid redundant objects.inv from downloading, sed more lightweight
+	if use doc; then
+		sed -e "s:^intersphinx_mapping:#intersphinx_mapping:" \
+			-e "s:^                       'sphinx':#:" \
+			-i doc/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C doc html
+		HTML_DOCS=( doc/_build/html/. )
+	fi
+}
+
+python_test() {
+	py.test || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-napoleon/Manifest b/dev-python/sphinxcontrib-napoleon/Manifest
new file mode 100644
index 000000000000..273b1126a40a
--- /dev/null
+++ b/dev-python/sphinxcontrib-napoleon/Manifest
@@ -0,0 +1,7 @@
+AUX no_installed_tests.patch 354 SHA256 83dc03c8eaeddc26275219d8dfa2e16ab4c7cd872751f4fb2a4cee2b7ca01668 SHA512 94bce4612ec269d10dbc74823a7c3cb6d37787b738aa99c31afab4bf6137449358d61ca9bc63d5eb450e1921eca6cdbce15abff88d91ce11ffeab2213d25af7e WHIRLPOOL 024cab905137c45874a7ec9d5adbb7b924ace1ff92d374e92b7827b79659ad815fd812abce4824c0b56eb5e54c167567d27942798f584f03ae30eae681c67e7c
+DIST sphinxcontrib-napoleon-0.5.2.tar.gz 24939 SHA256 3babaf7da3d062a2feba71f747946d123187e12ef68329eb6974026b25d218b8 SHA512 5f8d31c4ce66a042aa0c79ec06b7592539154bd7a397c1898db0cbed15b9891c908bb1d51334ef0b759e5d44ac99cf124616f0e4b3a1b1253f0f92312c949a8c WHIRLPOOL e577861c4357719a75ef84166f4cb9059fadded3b629606674beb5bfbd242bf4efb15c2889731690f4be8555b7561fb7c7ded14df925ebc2d926f26c91889bf4
+DIST sphinxcontrib-napoleon-0.6.1.tar.gz 20057 SHA256 614b779888629f14dfdfad6c17bffbb6d3813a0a0917a9541651d85384d4d6bd SHA512 1809fcadf964622bd75cc3ae17aaad467b7003f82e6df4de039a0ba86daa5c5b199af0c185129e79d3c4f8738c0d6c2411950888969fee3bb32ecc8cdfbc84b0 WHIRLPOOL 2d10156012e8032abcf76f4de524fabc628420137df6a2bf307da93903a16293e7416ce11fa5c6f8104909d9ccb2fe6a195586257989cc13a5adf50e35c776d2
+EBUILD sphinxcontrib-napoleon-0.5.2.ebuild 991 SHA256 47f92d5009cb10f7af635ccaa9412d805cbb19a5767d7021844ed4f39b672517 SHA512 0b1a9fe80f78c8794fb313565ea9cc9a020e69d107187e7c7ebf80982092ea21fccfad202d1226b4c6525f1c85d714109afa6e94a0069da876cc0402c1aefc86 WHIRLPOOL 3f67fb0c2560cc7bb5cc343ce7d6d77efb0f7f782d548d4657732385b6c3eeda4504dfb84eea77775d2f573a504dc60acb311bdc2e4d4d14e4f692deb9051ed0
+EBUILD sphinxcontrib-napoleon-0.6.1.ebuild 823 SHA256 f233fa8085ab3ad9aa650e8e083cb6db787cbc7ebb1e4858b22475d3401cd8b4 SHA512 005fc890980561c90a89817cdffc16c18d45d2466d65935340e2e9ffa4336d77206548fcbee5e6c4ecbc1b222077e2c20951fbf888712cbd654a696db57c908c WHIRLPOOL b2027e2a158759cf681ba2a78a8fc5099008c40fc64dd4636d08fbf4c2751647c8fd2c4e2f47ea37acd0a7b85300d2539640ef77152d2f8d628750333cda1065
+MISC ChangeLog 519 SHA256 747840b9c1c24770b03c4b9f1dbdc40f0f21b38d6e8f0f10d28a1e0eddc99325 SHA512 f803dc4afdb5a50e3367287a7ac4b75bd94e159718c4c641fe5556c85388df78bb83c8dc40365a2add296735fd3507ebfc7207bbf1ffdcad3ea31a7ef20b1cea WHIRLPOOL c10ad64e36b4a882fc84a606850caa997a083ab3027fd4bed35d8f45a1c45b72a5f470688227f31fa160d4eec0cc3e541142585bf69dd80b134a52a95a34540f
+MISC metadata.xml 346 SHA256 609f6f9b9f0d75687222d36b06bc67899468fe08e4749ba22feb76d458e395a2 SHA512 7b97ddc38c9d50f07fdc4188d22425c6e8ef8dfeb8a874c5160ac39d76367ef9bbcf198da2d0de08a1e952bef588fd20f316fcb762bcf4dd9780b4ca00d45d68 WHIRLPOOL c398bd0203a9657d39bca922a311bad916f3f033ee5983a8486d58c0537d64408087eb36f1f10a09a8b0edca4c271e9c93995f69dcb11ed245155dc8a2c8f48c
diff --git a/dev-python/sphinxcontrib-napoleon/files/no_installed_tests.patch b/dev-python/sphinxcontrib-napoleon/files/no_installed_tests.patch
new file mode 100644
index 000000000000..20ba790b8523
--- /dev/null
+++ b/dev-python/sphinxcontrib-napoleon/files/no_installed_tests.patch
@@ -0,0 +1,11 @@
+--- setup.py.orig	2016-08-03 16:43:35.775261808 +0200
++++ setup.py	2016-08-03 16:43:56.126054227 +0200
+@@ -43,7 +43,7 @@
+         'Framework :: Sphinx :: Extension',
+     ],
+     platforms='any',
+-    packages=find_packages(),
++    packages=["sphinxcontrib"],
+     include_package_data=True,
+     install_requires=reqs,
+     test_suite='nose.collector',
diff --git a/dev-python/sphinxcontrib-napoleon/metadata.xml b/dev-python/sphinxcontrib-napoleon/metadata.xml
new file mode 100644
index 000000000000..d208b433100e
--- /dev/null
+++ b/dev-python/sphinxcontrib-napoleon/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>klausman@gentoo.org</email>
+    <name>Tobias Klausmann</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">sphinxcontrib-napoleon</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.5.2.ebuild b/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.5.2.ebuild
new file mode 100644
index 000000000000..c1ae8fd6f291
--- /dev/null
+++ b/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.5.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Allow a different format in dosctrings for better clarity"
+HOMEPAGE="https://pypi.python.org/pypi/sphinxcontrib-napoleon"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=test
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/pockets-0.3[${PYTHON_USEDEP}]
+	test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+			>=dev-python/flake8-2.0[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+			>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+			>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+	)
+"
+src_prepare() {
+	epatch "${FILESDIR}/no_installed_tests.patch" || die
+}
+
+python_test() {
+	nosetests tests || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.6.1.ebuild b/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.6.1.ebuild
new file mode 100644
index 000000000000..7816e405392f
--- /dev/null
+++ b/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.6.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Allow a different format in dosctrings for better clarity"
+HOMEPAGE="https://sphinxcontrib-napoleon.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/sphinx-1.2[${PYTHON_USEDEP}]
+	<dev-python/sphinx-1.33[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/pockets[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-newsfeed/Manifest b/dev-python/sphinxcontrib-newsfeed/Manifest
new file mode 100644
index 000000000000..10c826741cf0
--- /dev/null
+++ b/dev-python/sphinxcontrib-newsfeed/Manifest
@@ -0,0 +1,4 @@
+DIST sphinxcontrib-newsfeed-0.1.4.tar.gz 10862 SHA256 f78c865b1a32d249644a9c46f395b547df0dc21ed69b70898d64235b4755efb4 SHA512 96d9d0c15fca8b62f945bafc8f0eafa62df9c471f7510e2f153e47b66534e5f3041e5c01df772e6c35a9f09baa70064642f7f0fa43ccfd33dd64c2604494f2fc WHIRLPOOL f14e5c8e9a5b6c35ae1311ed2efa9c8e71223c1d35bbe09dc1f097d07547748b8f73aa7170e1b422681cac44d40524ea5e017bc2b730f7581f1d91c9b057adc0
+EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 818 SHA256 5259e9eb0ebf7c444484e5c228297ede912c74acec7af5f5dc2c2af439bc5592 SHA512 029d18bbf16392402280f58faafabb41ec8ebd4bd7fcf0c6611ba34bffe3b2d2bad2686efcc96b8ff7b421a93cf355edb07e6bf41574d3d12715106a4e25ed55 WHIRLPOOL a7401262acbb24ec1db9e09072ab9b8c3e7b5a9512ed44933feec423526617e76cfb16edd0b0382f7714ed00f819a03a81b0d9db8b856f5fe879fbbc34174916
+MISC ChangeLog 2239 SHA256 612fda078a3fa0a3d2ba9a7c8504000268a66b7c8708dc4fc356e6605369f026 SHA512 6f8f1f84a7c5285689a37e2354cc4c4537c2bd0515ca1c64945f6ed0ef8cde758a79d3bbf300232eefd7782b37370a4952cb14432876c66c17617bcceb3adb3d WHIRLPOOL 5a9257af83dc446095af1cf5002bb095e91be214ded334d279c383334f81871a437b758cd0fb4addba056f9f401d325c0386d2c0d1233059e404a0b5133470a4
+MISC metadata.xml 407 SHA256 79a3892d40910fd045db0f7d53a1725d723bca766f154c8ce0509466d3070967 SHA512 eb34602ad402ca0e4591fa446ba72081285e39ec049f8e72d3ab565a2ea10646d8f630770eb9ac84053ed204bbc1cce8da7cf18d32ededff150a59ea9c8bb254 WHIRLPOOL 6ba70739f636417ee9e6ddd31d8c136fbd297d6122023968141d3833b69a94f829eb5a723c8743d93ca1428bf2007bf9b8964634ffdd81af09f894414a59cd95
diff --git a/dev-python/sphinxcontrib-newsfeed/metadata.xml b/dev-python/sphinxcontrib-newsfeed/metadata.xml
new file mode 100644
index 000000000000..68a6a99fb5f8
--- /dev/null
+++ b/dev-python/sphinxcontrib-newsfeed/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sphinxcontrib-newsfeed</remote-id>
+		<remote-id type="bitbucket">prometheus/sphinxcontrib-newsfeed</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
new file mode 100644
index 000000000000..b53938a825e9
--- /dev/null
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="News Feed extension for Sphinx"
+HOMEPAGE="https://bitbucket.org/prometheus/sphinxcontrib-newsfeed"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r demo/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/sphinxcontrib-programoutput/Manifest b/dev-python/sphinxcontrib-programoutput/Manifest
new file mode 100644
index 000000000000..b82cdf15ec50
--- /dev/null
+++ b/dev-python/sphinxcontrib-programoutput/Manifest
@@ -0,0 +1,7 @@
+DIST sphinxcontrib-programoutput-0.11.tar.gz 18267 SHA256 cbec3ee1c3abd09e105115ab69cb5ade8ca1be9811565a844f973e93e0314837 SHA512 4aa655f8632093035de986fa31291f95e95c4c0f4d1458bb8c8cc077cca73d579b16a8bf103d7b34faafb2171c617c40200008d89186f8ed37a812459f0376cf WHIRLPOOL 584b3c582217df7b24e08e27e0580d9af6f1f729ae823d4525ad7aa5105ca6048f4854928043231789f52f333cbc0a8a71a186b3d57b666d6e2a19249f750881
+DIST sphinxcontrib-programoutput-0.8.tar.gz 14419 SHA256 1776a03124bab87e35576f7f3992fc21d5bb457321b35e6023eb011dbed10a25 SHA512 9ab769f794cf8c47f2d755b343c1326b8335c1f8161294727abada81af189545d549350536d28ac2c5f27cc309330f875b7affef6f997651e3a9f9dfbe6bd174 WHIRLPOOL a6cf5edfd1ba9926af1327e95cc923147cae3c4d297ddb0ae7577f676c6bcb928b396459113cac3226f74446ea38ee9604722da5b4ddeebeb2f6bc6bc0d5fb52
+EBUILD sphinxcontrib-programoutput-0.11.ebuild 978 SHA256 8decd95aed128d656481e7f2a83da8ac478099b49364395a83361386c9ba3ad3 SHA512 115804035204fffc99fe17303292f0f02ba87b3bbd877782bf3f064fb674718103819c7885cf58326e791b27367ffbf47db295a6027d62a7912dcf9bb96b5bee WHIRLPOOL f64b2fbff204bdffa89bc5d5b84267b0caef61d33216f9c1d5ee3b206014e8686479d715338824f4e4588b10838ccf7395de65f9f874c278c737730e30ee726a
+EBUILD sphinxcontrib-programoutput-0.8.ebuild 853 SHA256 e884aa40749ea23acd754df1e4e295b91fad15a3b2401a5d65a91a65d5268f61 SHA512 180bee1b6eb21d634cf4fd73bdd13a2098fac610cc5dfc8f2e7f4a9e66c2f5bab7dad7bc61f86d23281bbb2927a0ca17b690b5da4a9138c2b17833f275950885 WHIRLPOOL c7da1248092844eff9ea50a042e1814b07c057c892739a00c78a4b4838915f7f8f2a81f3cef94fbb64d7df363554717cb8e2e1eeab85652ab5874575573b704c
+MISC ChangeLog 2907 SHA256 85d164295a9b6ee6dc71bab7004530ec925792feeb4a4cc82a24d6c3aa0ecae7 SHA512 4fe77aacb42a20d39905ad900f7effae461158bb4a503c75f9e3365cf747c1dbda68c3b92e4d566a646442bb0d666d6f3807c5eb102e86143fc006bbc7f2fd85 WHIRLPOOL 0118d2b3897efd8dcdc2a267be7fba7a891923ce2a308bd9f02a7b2ba9033a27756e38294d3644ae474245fb0b4a68a599a257e793ae7ca683e99d0ae343d522
+MISC ChangeLog-2015 1231 SHA256 15a0002cc11391c57168e869581bd0873a3efa6ead75b922d18f2a1d0f005872 SHA512 cc444b1d646b7d46a7a899e7b142c44875f1c6c0ca2f1f5b551cfc9dd9e912680e603bca2304a5f83f66bba610d643b2a38eaff600934d62f2f845f7be4f9bb0 WHIRLPOOL e5e085c7fcedfa6bf628c836230d41c65bcc757fd3a03b7bed51d659d6b5f99a2ce327fd3eae9b08e63df75aa9cbcf7652479084d2bd03e9719e2ea4c2dfb9ad
+MISC metadata.xml 527 SHA256 763162655d07fee163be401badc29dc7262a3d51eb25edb8d672b067fa6ab427 SHA512 27ca1eab6719f5d577938ea7c105fd2aec99fd94d80b8d1beb14f18233ee3290a5c9a3046314c07645306a7967e14d6dff269cc377c0bbac72e309a5d669d181 WHIRLPOOL b483f1641cf8092891d8a50e1d5774482c1c298d80cba705325c3e2366037d90c33bde45e5c62fde6ee900ce34046f9fdb343476cb546f5afd572a345d06091e
diff --git a/dev-python/sphinxcontrib-programoutput/metadata.xml b/dev-python/sphinxcontrib-programoutput/metadata.xml
new file mode 100644
index 000000000000..21388a87325d
--- /dev/null
+++ b/dev-python/sphinxcontrib-programoutput/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+  A Sphinx extension to literally insert the output of arbitrary
+  commands into documents, helping you to keep your command examples
+  up to date.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">sphinxcontrib-programoutput</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.ebuild
new file mode 100644
index 000000000000..6920695aabd8
--- /dev/null
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Extension to sphinx to include program output"
+HOMEPAGE="http://sphinxcontrib-programoutput.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc test"
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
+	fi
+}
+
+python_test() {
+	esetup.py pytest || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.8.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.8.ebuild
new file mode 100644
index 000000000000..151c9d443617
--- /dev/null
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Extension to sphinx to include program output"
+HOMEPAGE="http://sphinxcontrib-programoutput.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc test"
+
+RDEPEND=">=dev-python/sphinx-1.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	py.test -v -v || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
new file mode 100644
index 000000000000..3cbc71f208b9
--- /dev/null
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -0,0 +1,6 @@
+DIST sphinxcontrib-spelling-2.1.2.tar.gz 35411 SHA256 c5ac488141408564cb60f355c50efd90b826a9fc7723738a07ab907a0384f086 SHA512 993f371e064e8748eb61faae649fb293b154a35955ff84d86fd041f4e2cc4c6e22c686007a67c3b63b0c50fc01ed226708f27db347e58847a46ca733c997d51f WHIRLPOOL 3258a991dbeb36ee1a3da64c64d2f05a1978a2c9348be1c2112afaf0cb40414cfe5f139d199cad7f534ade40db61666c133d70bc0605bd878e414e1dbe0f7e6a
+DIST sphinxcontrib-spelling-2.3.0.tar.gz 35687 SHA256 008ec060f312367222992824abed00124cce0dd31c375a89b2053010df0e3be8 SHA512 194023d2c5ba594a264740a2a45ebd90d37fc17fbd3bc8c53fa303581a652c58332f998a159c9c6c58718dd9898c9b4639e98ee114a2ee1e5f2097e545134a1a WHIRLPOOL 644c066bcbf393b670082cae51a8278788a562e59112a4c47adb7e3e291e6f508254a05f4792148f44cefc835b28e7c51b1522842526480304c01d43da48e7b6
+EBUILD sphinxcontrib-spelling-2.1.2.ebuild 1001 SHA256 9a1e4ddc07a0211f984e673ec76f1ef56bb9d7e21878b2778df927cb071b7272 SHA512 9a8e53ab29256122f6c8f66fdf3ff9b80384234bffde56c3ad9d563d64a334e9e9ebbf8c7650d7c5b67eba228ee539a6c3757d0ed595edd8c23435bb3629523f WHIRLPOOL 69ed1a6de01897112886baabc7143c81fc07937ae5e68baa15d257448f1a2c30107105d88f84df1aa0532a1f8b9b04cbd8ad1fb3b412a6ca3a48d98033e208a9
+EBUILD sphinxcontrib-spelling-2.3.0.ebuild 971 SHA256 02de9f87998bdcfdbd864e88a1dc8a8e9fb135b4b8b71228131cfd069ae536df SHA512 3f06b34566d2bfe98154a33e32a99965e25110d1619dd8bbd78f1698c53e749b18336be000e5766db6a2e1e8ff0fcbc8b556bf398f9375817e3820b9da5f4cd4 WHIRLPOOL fad77a4c6783bd94fc47eac1acbf8967e12b9b97ef737eeb2ede4bb36634547471f402753e8e54c74e0cf2fec81485c81e6f0483b6797bf54a7fa793c8b1db0b
+MISC ChangeLog 2239 SHA256 525c074e7736fc6b78cde0a08d37a2d28e3b4ae122b1d9f5f4a5948bab81298b SHA512 47d05e8fe6ee1dd9a0187c4f47c6a479859bf7273471d2a53cae68ed07210ea3cdb7df7e45f0bca12323764e6d2dd3b507392b7b1d9165b31fc9059abdb898ba WHIRLPOOL 4edcbb2ccb7506847d227e049109e89438b71b47e8c117960a213c2c5e24cead6429b11ecbe9fa111c7b148d26819f46a80cd1ae37b536287feef4b13992d9e7
+MISC metadata.xml 406 SHA256 3f32cc3336c6c59ba1ec60a988d5f762adf0889bf67de62ec8b25d7b0dc137bf SHA512 43aa8f4a32db2d4604bd839ad0fb310abc1c832ab75c08ab65fde71a932f2279148edb937ea50c8465ed82c6cc70cbde3de068149fb9e35328f58672bcca9cd1 WHIRLPOOL 09ac610575bfeb68a3b12c3850519f4f41ce64dfa9c709c3e5df15d874fdd9905aec56e31ada7f23362ac737c820c6d09bce185df91d6a3730ebe07c6ea3e772
diff --git a/dev-python/sphinxcontrib-spelling/metadata.xml b/dev-python/sphinxcontrib-spelling/metadata.xml
new file mode 100644
index 000000000000..73181e9d64d7
--- /dev/null
+++ b/dev-python/sphinxcontrib-spelling/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sphinxcontrib-spelling</remote-id>
+		<remote-id type="bitbucket">dhellmann/sphinxcontrib-spelling</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild
new file mode 100644
index 000000000000..066a206f23d4
--- /dev/null
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx spelling extension"
+HOMEPAGE="https://bitbucket.org/dhellmann/sphinxcontrib-spelling"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="doc test"
+
+CDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	>=dev-python/pyenchant-1.6.5[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-0.6[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
+	test? (
+		${CDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.3.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.3.0.ebuild
new file mode 100644
index 000000000000..b98bdbe2bdab
--- /dev/null
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx spelling extension"
+HOMEPAGE="https://bitbucket.org/dhellmann/sphinxcontrib-spelling"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+CDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+RDEPEND="${CDEPEND}
+		dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
new file mode 100644
index 000000000000..754ecaa16386
--- /dev/null
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -0,0 +1,3 @@
+DIST sphinxcontrib-websupport-1.0.1.tar.gz 590480 SHA256 7a85961326aa3a400cd4ad3c816d70ed6f7c740acd7ce5d78cd0a67825072eb9 SHA512 67807b2505e063639163b020f0e62469b0c2838c303516cce9a8d90181cc7b8a10d76532adb1267556d40f95966efc20ec9f8ee1a6731056bda827a6f97f40ec WHIRLPOOL febeb18363cb8f7a0fafbaa0e318b935fdeb44e039454561e29548404bf95f5412ef49270f6957ed109265c95db8a236ac3b7cb981a400fb8d4e896f2f01731c
+EBUILD sphinxcontrib-websupport-1.0.1.ebuild 1032 SHA256 18c3dcfaecb73be43becd9f813248880499ab5b551e1e00ecba9febc71c61998 SHA512 5125f6164ce94ee795d60561a3abfc3f3953c52196e18b5e0ade6c4242e8db9cdbdb9720950ac785c7b00536d9cd63bc7f74dd46d3ef5acad3dbde6943737ac1 WHIRLPOOL 7de683e1364a496f87df255b7fd4f670236fc5720cf69cd9c732d960b35a658903f613cd1f511c89bda4f8b7493125ccb2bfd849a9dc2e5bad45867a6a2a476e
+MISC metadata.xml 588 SHA256 cb9e19ad041a7faa672f84b64bcd7aabf0f5417cdf9002d9fa4afa03c0e067cb SHA512 eeab14e556d91f99f5bff45a490eaecf47bcab9e295c992b817c94359fe87483947f43986bdf4633257b1ff69ffffd7b2f250e411e728f68b39a65f5b53a29bf WHIRLPOOL 8cb43a051e48883229c72a89b38c1aa8a2dc9fb3d41369aab8f62766aded2d60f5c925c39bd677a05e08e0c6b49ab4067eac51fe7841f36610eee786dbcd3de3
diff --git a/dev-python/sphinxcontrib-websupport/metadata.xml b/dev-python/sphinxcontrib-websupport/metadata.xml
new file mode 100644
index 000000000000..1fd50daef800
--- /dev/null
+++ b/dev-python/sphinxcontrib-websupport/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    sphinxcontrib-webuspport provides a Python API to easily integrate
+    Sphinx documentation into your Web application.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">sphinxcontrib-websupport</remote-id>
+    <remote-id type="github">sphinx-doc/sphinxcontrib-websupport</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.0.1.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.0.1.ebuild
new file mode 100644
index 000000000000..de32cdd8d0c9
--- /dev/null
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx websupport extension"
+HOMEPAGE="http://www.sphinx-doc.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+	>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.5.3[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/tox[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
+
+python_test(){
+	${EPYTHON} -m pytest tests/
+}
diff --git a/dev-python/sphinxtogithub/Manifest b/dev-python/sphinxtogithub/Manifest
new file mode 100644
index 000000000000..ce648cf7e7dc
--- /dev/null
+++ b/dev-python/sphinxtogithub/Manifest
@@ -0,0 +1,5 @@
+DIST sphinxtogithub-1.1.0.tar.gz 11103 SHA256 15222b1ea55f83dfdf1e09a76d4ef1b9273a2590b73a5a16c4bff972894eae4e SHA512 190c57535c58f86a84a3e80bde61f99d35b8d3826d18d77d9eaf857be853c84b35e49cbb517fb13d8993934757892cbda4a820ecd24f3e5ff2908e814e53d664 WHIRLPOOL 232d8ecccab473bf690275883eed4e2a8bf6a10b8d3f52da56287fba8aefe9a75aee5ccbae1f70f9746d0732254bf8da7a953c65d10153f72a3a6377f674f7aa
+EBUILD sphinxtogithub-1.1.0.ebuild 769 SHA256 86a5ff872d92894adf3dad35d537725270748fc4067a93b5e8575ed1b98a1b98 SHA512 657ec05028781ff1c460e9ae0913f59562bcc6ccfaf02dd587284e5231d6bebc17b82eb5101cdc3608a22ef4437bfb3ab695d0cd8911db1c1259c8a634c15e44 WHIRLPOOL e21aac475677b9a2008668c655db18246ec25bede27e83b03a4bd859802faeee4e647fad4380762b68f685dca96a5963221bb6bea234115b661bf7497f3a7ad4
+MISC ChangeLog 2697 SHA256 8006c15d1f7fa12a225a8b0a092dc947dcb40fd364e2dd3dd5281e35e1ee6c75 SHA512 18963adf7429a37b1daf6979da04948652f860d78819f54185f984a80405214d5d859a6d38f5341f2d0923f1542d903f716c58a82c057e6c1bd5f94f66c4d3a7 WHIRLPOOL 83e3dcb5a6ce7808ceafe8681645729e0cd97b401e73a79d2abbf2d9b79398458d6fdaa8db658a8730c390b2b3bb672c547fcd1cec5979e37fbe442e590184c6
+MISC ChangeLog-2015 1475 SHA256 d2de66a8395cedf01018ea6fd844cccebfb00f4960334354c25ae36f6397958f SHA512 7bc8ebbf749a64288d424d6c68409fa993fd1a5b0a81a8008cac83f81a148e2a15a5cf76b495e311d0b8ee5a7588395b1afdd274a521a2dd22dc3e153105a7c5 WHIRLPOOL aab035ee630c249bc077df2d1c842498eea0e661078691222fc442f837239a1a9192c7a101e3098ee42e1c3571b67d1db79b47d5bae3c328b93ce3a757579699
+MISC metadata.xml 398 SHA256 413cda8acf7b6eb5dccc75cf242ed863a72e388678d1911ac1ac90e8c57fa4b7 SHA512 e15d63d81faf57bee3099a25418ec787c0e89b68e12a217d1748156f43598b56b5f870916c14728bf3a8749f68cb9cc8f3c6c8041639407642bad9bf7cea6d86 WHIRLPOOL 3e1d75920f154d2aec94c624e3f114c454e8cfad6b5b595f59cf012dc044b7b77522a75edceb06479e026a8476a6607d31a363a0e5daff74cf7faf5b3706d540
diff --git a/dev-python/sphinxtogithub/metadata.xml b/dev-python/sphinxtogithub/metadata.xml
new file mode 100644
index 000000000000..a64594a5468d
--- /dev/null
+++ b/dev-python/sphinxtogithub/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">sphinxtogithub</remote-id>
+    <remote-id type="github">michaeljones/sphinx-to-github</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxtogithub/sphinxtogithub-1.1.0.ebuild b/dev-python/sphinxtogithub/sphinxtogithub-1.1.0.ebuild
new file mode 100644
index 000000000000..30fe193c91a1
--- /dev/null
+++ b/dev-python/sphinxtogithub/sphinxtogithub-1.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A python script for preparing the html output of Sphinx documentation for github pages"
+HOMEPAGE="https://github.com/michaeljones/sphinx-to-github/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+
+IUSE=""
+
+RDEPEND=">=dev-python/sphinx-1.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# Req'd to avoid file collisions
+	sed -e s":find_packages():find_packages(exclude=['tests']):" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
new file mode 100644
index 000000000000..b2caa4ec3ef9
--- /dev/null
+++ b/dev-python/spyder/Manifest
@@ -0,0 +1,9 @@
+AUX spyder-3.0.2-build.patch 6024 SHA256 e13de17f2700fc98df2bb391e6fc6fbc3a87070de1e33855f1a37854ca68ec3d SHA512 7c743a086f8abb99757731ef02c90042c57475c8ab07239ae75ddebd1aa1b1573dbd4e050dff4710fed38338687ca4be9d5eb0e7277c41334e8595d9a1907e41 WHIRLPOOL 952a98088ae1f7d93886666d5279d6a3abd0c32e7a94d464fee99ac3020391414412f32101a715ef1dd69adf1a043b8e90a7ebbc8f8908b7ee43ad4a8dca94d2
+AUX spyder-3.2.3-build.patch 5706 SHA256 1ab0ab394d37f5d7f450cdbc929e52b875549af879cd192bdd51e6950c0dce25 SHA512 41fa116652af0b2a93e25e1c39c450c9bc5cc7bf76afde75e8b53845d7fa8be822c6763ca48ea4cbcb64e72cac927c832233bb681c9950a272da517234464123 WHIRLPOOL 2b7c4cd9a40c0b13b8f74b468b6f0ddc569aefc38424cdd88d54a0fcec110a91302a3c81c95993d5e5ce530dc9e3ea35dc499ef8c0456556ee3286a90f40a9a5
+DIST spyder-3.0.2.tar.gz 3207709 SHA256 c308cae5d963a7332548db2dd91ebf105263eb493ce208221a59ad77592399c1 SHA512 7f3723bd98876aa4769877327a93aa02510689708012afc72148c67acd91ab134501ae57471d9cf0e17c9e3892a541b7730a2392ace3c6525443058d0ed01612 WHIRLPOOL 5f1f278fa3c6a98b8d7050bb32e9186cd7053e21d9050bf92b29088154ea3494995bf9953e04d63db4c71ccc37d3a2cdd7e38222b1f82decc2b763144cdf3642
+DIST spyder-3.2.3.tar.gz 3342954 SHA256 714c9b9941c1883c810bf87f34d6d46fc4458053e3d138d9e12435ea236b0dd2 SHA512 873a1a0c319fc6580dfbe7370dc5ca132d973b5baf75ba0b6cda228adb7fe7baf4fbdebf4d1984ed6f204c7d27b1bfc2c449199ab02aeb8caf9ebded738f3491 WHIRLPOOL 49729a844157bdd75ced53c1cdfea87cc5366590821f732334dab81bebf094f0d7f09095e88fe584b0d65434f61c71d2bcdb8da29f6af91781bcab1fb2e951e4
+EBUILD spyder-3.0.2-r3.ebuild 1677 SHA256 3fb3d64b911193d370daca27320ec78c7a069d05f6b6b796cb69cbc802bfa00e SHA512 94b33f77268021422d49b5022000f9589eeb5d4bbb8675bd5d4066e3577995df9802137914db06d9366d01cf7cfd7c1d0b3ba8b078b2035f7f3ecf50882dcc08 WHIRLPOOL c0bd49b0842cdda07719d8743e38fab14a0c14a86002f9b5ac0113ec1d34de56912f8cbd5e335c1971ea4d63a85d89618f22598b5b336038ecb9e84b176159d4
+EBUILD spyder-3.2.3.ebuild 1721 SHA256 83d1a986f83e14b13563d2377c70ce3d46f1cb04bf4cd0be73b805a69b6da481 SHA512 e7dd7d4a25b96314e02f6b8c1d2e5928f7c9100444165f9c1303e67c14c7a164e0754f728d9521f5c324f815b20a9079727f00b7501e836b3ea97ffe5828cb4f WHIRLPOOL 29da6561bbd68515bba8dfa73bf318c31f041c33acad0884313a5591b20d33f2ed18226283c0298d00adf4a2a8bdf573eeae463bb54d5c46e2ca7ded2e14ffff
+MISC ChangeLog 4375 SHA256 dba1984e7377b06138f3a7ba2757fa996f97afef197ebaf9f03976c5f572cfab SHA512 6adef23f4811e6da6037b36bfe90878b080dafe5bcd29d61abb644cb7fd3ecd3023cd3571157af408d96038496863a8f0da907473b6345e7c0071d2de24ba6fe WHIRLPOOL edb3c2c76d70b2ddb086092fed1196a2181fe18fb15aae3df33d7ebd5885e549010784f4c893476ce3291762b3edf1e701c09e3b7683c642869d599ef544268d
+MISC ChangeLog-2015 7476 SHA256 f3322b577b0921df14db830283d466d9b801eb3a7a48115be0f2f967cc59bf3b SHA512 6bdec9455aae1be9144ae996595bcfcef91625bcafabd258c284cbc1469702098cdd84fa1442b25fed46eb1ddc2334b51f29a2947b4affbd5453161e4e6ad5fe WHIRLPOOL ad22b78763a665246a3c1de099512889d1d4286a8a345acf41f8335fd17536d8cbb5cf9f57946f1ddde921a73b392acd149c449afccc8850cf9bf9e1c0349932
+MISC metadata.xml 825 SHA256 61551f0b10689505fd8890245cd36b1ba070f985cab0b102baf13066ae6a1d59 SHA512 d15dd90b0db7e1ee2718dcf4cf3aff509775bc72b0352ef401308b7fd78063792c02596e1f8fabbfc2f19e9016f670e396589411e5fe8609f020222ffa9ac4db WHIRLPOOL 94038d2609a392cde8b10507402ad9849c81abe6899d760197e00201f3e1112ec808707daa2da7c1f1abefbdf60e7aeba74bdcc95d0fdfad28b301a7ca2debdf
diff --git a/dev-python/spyder/files/spyder-3.0.2-build.patch b/dev-python/spyder/files/spyder-3.0.2-build.patch
new file mode 100644
index 000000000000..f476401b5c1e
--- /dev/null
+++ b/dev-python/spyder/files/spyder-3.0.2-build.patch
@@ -0,0 +1,140 @@
+diff -r -U3 spyder-3.0.2.orig/setup.py spyder-3.0.2/setup.py
+--- spyder-3.0.2.orig/setup.py	2016-10-25 07:05:22.000000000 +0700
++++ spyder-3.0.2/setup.py	2016-12-12 19:44:13.840412632 +0700
+@@ -77,12 +77,7 @@
+ def get_data_files():
+     """Return data_files in a platform dependent manner"""
+     if sys.platform.startswith('linux'):
+-        if PY3:
+-            data_files = [('share/applications', ['scripts/spyder3.desktop']),
+-                          ('share/pixmaps', ['img_src/spyder3.png'])]
+-        else:
+-            data_files = [('share/applications', ['scripts/spyder.desktop']),
+-                          ('share/pixmaps', ['img_src/spyder.png'])]
++        data_files = [('share/pixmaps', ['img_src/spyder.png'])]
+     elif os.name == 'nt':
+         data_files = [('scripts', ['img_src/spyder.ico',
+                                    'img_src/spyder_reset.ico'])]
+@@ -105,111 +100,9 @@
+ 
+ 
+ #==============================================================================
+-# Make Linux detect Spyder desktop file
+-#==============================================================================
+-class MyInstallData(install_data):
+-    def run(self):
+-        install_data.run(self)
+-        if sys.platform.startswith('linux'):
+-            try:
+-                subprocess.call(['update-desktop-database'])
+-            except:
+-                print("ERROR: unable to update desktop database",
+-                      file=sys.stderr)
+-CMDCLASS = {'install_data': MyInstallData}
+-
+-
+-#==============================================================================
+-# Sphinx build (documentation)
+-#==============================================================================
+-def get_html_help_exe():
+-    """Return HTML Help Workshop executable path (Windows only)"""
+-    if os.name == 'nt':
+-        hhc_base = r'C:\Program Files%s\HTML Help Workshop\hhc.exe'
+-        for hhc_exe in (hhc_base % '', hhc_base % ' (x86)'):
+-            if osp.isfile(hhc_exe):
+-                return hhc_exe
+-        else:
+-            return
+-
+-try:
+-    from sphinx import setup_command
+-
+-    class MyBuild(build):
+-        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
+-                       + build.user_options
+-        def __init__(self, *args, **kwargs):
+-            build.__init__(self, *args, **kwargs)
+-            self.no_doc = False
+-        def with_doc(self):
+-            setup_dir = os.path.dirname(os.path.abspath(__file__))
+-            is_doc_dir = os.path.isdir(os.path.join(setup_dir, 'doc'))
+-            install_obj = self.distribution.get_command_obj('install')
+-            return (is_doc_dir and not self.no_doc and not install_obj.no_doc)
+-        sub_commands = build.sub_commands + [('build_doc', with_doc)]
+-    CMDCLASS['build'] = MyBuild
+-
+-
+-    class MyInstall(install):
+-        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
+-                       + install.user_options
+-        def __init__(self, *args, **kwargs):
+-            install.__init__(self, *args, **kwargs)
+-            self.no_doc = False
+-    CMDCLASS['install'] = MyInstall
+-
+-
+-    class MyBuildDoc(setup_command.BuildDoc):
+-        def run(self):
+-            build = self.get_finalized_command('build')
+-            sys.path.insert(0, os.path.abspath(build.build_lib))
+-            dirname = self.distribution.get_command_obj('build').build_purelib
+-            self.builder_target_dir = osp.join(dirname, 'spyder', 'doc')
+-
+-            if not osp.exists(self.builder_target_dir):
+-                os.mkdir(self.builder_target_dir)
+-
+-            hhc_exe = get_html_help_exe()
+-            self.builder = "html" if hhc_exe is None else "htmlhelp"
+-
+-            try:
+-                setup_command.BuildDoc.run(self)
+-            except UnicodeDecodeError:
+-                print("ERROR: unable to build documentation because Sphinx "\
+-                      "do not handle source path with non-ASCII characters. "\
+-                      "Please try to move the source package to another "\
+-                      "location (path with *only* ASCII characters).",
+-                      file=sys.stderr)
+-            sys.path.pop(0)
+-
+-            # Building chm doc, if HTML Help Workshop is installed
+-            if hhc_exe is not None:
+-                fname = osp.join(self.builder_target_dir, 'Spyderdoc.chm')
+-                subprocess.call('"%s" %s' % (hhc_exe, fname), shell=True)
+-                if osp.isfile(fname):
+-                    dest = osp.join(dirname, 'spyder')
+-                    try:
+-                        shutil.move(fname, dest)
+-                    except shutil.Error:
+-                        print("Unable to replace %s" % dest)
+-                    shutil.rmtree(self.builder_target_dir)
+-
+-    CMDCLASS['build_doc'] = MyBuildDoc
+-except ImportError:
+-    print('WARNING: unable to build documentation because Sphinx '\
+-          'is not installed', file=sys.stderr)
+-
+-
+-#==============================================================================
+ # Main scripts
+ #==============================================================================
+-# NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
+-# platforms due to a bug in pip installation process (see Issue 1158)
+-SCRIPTS = ['%s_win_post_install.py' % NAME]
+-if PY3 and sys.platform.startswith('linux'):
+-    SCRIPTS.append('spyder3')
+-else:
+-    SCRIPTS.append('spyder')
++SCRIPTS = ['spyder']
+ 
+ 
+ #==============================================================================
+@@ -259,8 +152,7 @@
+                    'Programming Language :: Python :: 3',
+                    'Development Status :: 5 - Production/Stable',
+                    'Topic :: Scientific/Engineering',
+-                   'Topic :: Software Development :: Widget Sets'],
+-      cmdclass=CMDCLASS)
++                   'Topic :: Software Development :: Widget Sets'])
+ 
+ 
+ #==============================================================================
diff --git a/dev-python/spyder/files/spyder-3.2.3-build.patch b/dev-python/spyder/files/spyder-3.2.3-build.patch
new file mode 100644
index 000000000000..2a1fee52131b
--- /dev/null
+++ b/dev-python/spyder/files/spyder-3.2.3-build.patch
@@ -0,0 +1,130 @@
+--- spyder-3.2.3.orig/setup.py	2017-08-29 00:42:56.000000000 +0200
++++ spyder-3.2.3/setup.py	2017-09-16 20:57:08.610147911 +0200
+@@ -77,13 +77,7 @@
+ def get_data_files():
+     """Return data_files in a platform dependent manner"""
+     if sys.platform.startswith('linux'):
+-        if PY3:
+-            data_files = [('share/applications', ['scripts/spyder3.desktop']),
+-                          ('share/pixmaps', ['img_src/spyder3.png']),
+-                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
+-        else:
+-            data_files = [('share/applications', ['scripts/spyder.desktop']),
+-                          ('share/pixmaps', ['img_src/spyder.png'])]
++        data_files = [('share/pixmaps', ['img_src/spyder.png'])]
+     elif os.name == 'nt':
+         data_files = [('scripts', ['img_src/spyder.ico',
+                                    'img_src/spyder_reset.ico'])]
+@@ -106,102 +100,6 @@
+ 
+ 
+ #==============================================================================
+-# Make Linux detect Spyder desktop file
+-#==============================================================================
+-class MyInstallData(install_data):
+-    def run(self):
+-        install_data.run(self)
+-        if sys.platform.startswith('linux'):
+-            try:
+-                subprocess.call(['update-desktop-database'])
+-            except:
+-                print("ERROR: unable to update desktop database",
+-                      file=sys.stderr)
+-CMDCLASS = {'install_data': MyInstallData}
+-
+-
+-#==============================================================================
+-# Sphinx build (documentation)
+-#==============================================================================
+-def get_html_help_exe():
+-    """Return HTML Help Workshop executable path (Windows only)"""
+-    if os.name == 'nt':
+-        hhc_base = r'C:\Program Files%s\HTML Help Workshop\hhc.exe'
+-        for hhc_exe in (hhc_base % '', hhc_base % ' (x86)'):
+-            if osp.isfile(hhc_exe):
+-                return hhc_exe
+-        else:
+-            return
+-
+-try:
+-    from sphinx import setup_command
+-
+-    class MyBuild(build):
+-        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
+-                       + build.user_options
+-        def __init__(self, *args, **kwargs):
+-            build.__init__(self, *args, **kwargs)
+-            self.no_doc = False
+-        def with_doc(self):
+-            setup_dir = os.path.dirname(os.path.abspath(__file__))
+-            is_doc_dir = os.path.isdir(os.path.join(setup_dir, 'doc'))
+-            install_obj = self.distribution.get_command_obj('install')
+-            return (is_doc_dir and not self.no_doc and not install_obj.no_doc)
+-        sub_commands = build.sub_commands + [('build_doc', with_doc)]
+-    CMDCLASS['build'] = MyBuild
+-
+-
+-    class MyInstall(install):
+-        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
+-                       + install.user_options
+-        def __init__(self, *args, **kwargs):
+-            install.__init__(self, *args, **kwargs)
+-            self.no_doc = False
+-    CMDCLASS['install'] = MyInstall
+-
+-
+-    class MyBuildDoc(setup_command.BuildDoc):
+-        def run(self):
+-            build = self.get_finalized_command('build')
+-            sys.path.insert(0, os.path.abspath(build.build_lib))
+-            dirname = self.distribution.get_command_obj('build').build_purelib
+-            self.builder_target_dir = osp.join(dirname, 'spyder', 'doc')
+-
+-            if not osp.exists(self.builder_target_dir):
+-                os.mkdir(self.builder_target_dir)
+-
+-            hhc_exe = get_html_help_exe()
+-            self.builder = "html" if hhc_exe is None else "htmlhelp"
+-
+-            try:
+-                setup_command.BuildDoc.run(self)
+-            except UnicodeDecodeError:
+-                print("ERROR: unable to build documentation because Sphinx "\
+-                      "do not handle source path with non-ASCII characters. "\
+-                      "Please try to move the source package to another "\
+-                      "location (path with *only* ASCII characters).",
+-                      file=sys.stderr)
+-            sys.path.pop(0)
+-
+-            # Building chm doc, if HTML Help Workshop is installed
+-            if hhc_exe is not None:
+-                fname = osp.join(self.builder_target_dir, 'Spyderdoc.chm')
+-                subprocess.call('"%s" %s' % (hhc_exe, fname), shell=True)
+-                if osp.isfile(fname):
+-                    dest = osp.join(dirname, 'spyder')
+-                    try:
+-                        shutil.move(fname, dest)
+-                    except shutil.Error:
+-                        print("Unable to replace %s" % dest)
+-                    shutil.rmtree(self.builder_target_dir)
+-
+-    CMDCLASS['build_doc'] = MyBuildDoc
+-except ImportError:
+-    print('WARNING: unable to build documentation because Sphinx '\
+-          'is not installed', file=sys.stderr)
+-
+-
+-#==============================================================================
+ # Main scripts
+ #==============================================================================
+ # NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
+@@ -261,8 +159,7 @@
+                    'Programming Language :: Python :: 3',
+                    'Development Status :: 5 - Production/Stable',
+                    'Topic :: Scientific/Engineering',
+-                   'Topic :: Software Development :: Widget Sets'],
+-      cmdclass=CMDCLASS)
++                   'Topic :: Software Development :: Widget Sets'])
+ 
+ 
+ #==============================================================================
diff --git a/dev-python/spyder/metadata.xml b/dev-python/spyder/metadata.xml
new file mode 100644
index 000000000000..00c53afbbf33
--- /dev/null
+++ b/dev-python/spyder/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  Spyder development environment and its PyQt5-based IDE tools:
+  interactive Python shell, Python code editor, workspace
+  (dict/list/string/array editor), doc viewer, history log,
+  environment variables editor, ...
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">spyder</remote-id>
+    <remote-id type="bitbucket">spyder-ide/spyderlib</remote-id>
+    <remote-id type="github">spyder-ide/spyder</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/spyder/spyder-3.0.2-r3.ebuild b/dev-python/spyder/spyder-3.0.2-r3.ebuild
new file mode 100644
index 000000000000..1543c8de8e56
--- /dev/null
+++ b/dev-python/spyder/spyder-3.0.2-r3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="Python IDE with matlab-like features"
+HOMEPAGE="https://github.com/spyder-ide/spyder/ https://pypi.python.org/pypi/spyder/ http://pythonhosted.org/spyder/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc hdf5"
+
+RDEPEND="
+	dev-python/PyQt5[${PYTHON_USEDEP},svg,webkit]
+	dev-python/QtPy[${PYTHON_USEDEP},svg,webkit]
+	dev-python/qtconsole[${PYTHON_USEDEP}]
+	>=dev-python/rope-0.10.7[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/pyflakes[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}]
+	dev-python/pep8[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/qtawesome[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+# Courtesy of Arfrever
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build doc doc/html || die "Generation of documentation failed"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript scripts/${PN} ${PN}${EPYTHON:6:1}
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+	doicon spyder/images/spyder.svg
+	make_desktop_entry spyder Spyder spyder "Development;IDE"
+}
diff --git a/dev-python/spyder/spyder-3.2.3.ebuild b/dev-python/spyder/spyder-3.2.3.ebuild
new file mode 100644
index 000000000000..485bde91fcf7
--- /dev/null
+++ b/dev-python/spyder/spyder-3.2.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="Python IDE with matlab-like features"
+HOMEPAGE="https://github.com/spyder-ide/spyder/ https://pypi.python.org/pypi/spyder/ http://pythonhosted.org/spyder/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc hdf5"
+
+RDEPEND="
+	dev-python/PyQt5[${PYTHON_USEDEP},svg,webkit]
+	dev-python/QtPy[${PYTHON_USEDEP},svg,webkit]
+	dev-python/qtconsole[${PYTHON_USEDEP}]
+	>=dev-python/rope-0.10.7[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/pyflakes[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}]
+	dev-python/pep8[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-0.4.1[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.3.0
+	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+# Courtesy of Arfrever
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build doc doc/html || die "Generation of documentation failed"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript scripts/${PN} ${PN}${EPYTHON:6:1}
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+	doicon spyder/images/spyder.svg
+	make_desktop_entry spyder Spyder spyder "Development;IDE"
+}
diff --git a/dev-python/sqlalchemy-migrate/Manifest b/dev-python/sqlalchemy-migrate/Manifest
new file mode 100644
index 000000000000..91be8f89e223
--- /dev/null
+++ b/dev-python/sqlalchemy-migrate/Manifest
@@ -0,0 +1,9 @@
+DIST sqlalchemy-migrate-0.11.0.tar.gz 128299 SHA256 e68af5e3e0561f629d4eb23d9d0ea77d2649747f2eff37fd29aece74615ca251 SHA512 5ce76f221cab54ca7436f30a907db4a17e7e338af2cc2d324f06e73bfeda99569584227f925f8a078d01c17761878b865af665a9eb7c1de306cbc0f9b8d7a451 WHIRLPOOL 728a8651d6aa4d651b8973f9be836c6b117660b68b74a154f059ec7b7bdb5d54771a097a58ff88d806114d57622e9f9bf30fb0d97ee66f79f8e38ad42f67c0e5
+DIST sqlalchemy-migrate-0.7.2.tar.gz 105862 SHA256 7f55c768ee26f143fedb11b365a4c57c3bbdb5211e049c7f04b8ae8107c28333 SHA512 31c56da755ccccdc0aa5eacddcb097a4bd6431ab72a5b964689b0943b50ae4b23e034ae84d8dad4707d4cf9bea5b538e015ff755318685cc17dd82497a4cb4a9 WHIRLPOOL 51a058edea0b48db8377a69366f2b30a44e0ed9621d662fa347df3b2a6b9605ee8866ee21e86153c649f5e4e627fef39dc1a68d333c5f334e96be2cf20aceee1
+DIST sqlalchemy-migrate-0.9.2.tar.gz 124175 SHA256 578fa857615f05f9c73f024147c75019535d3d276ca46f5ec84cc0d606820893 SHA512 25b218ae97e9a99ad126e4185621bff04da2e9d47d2e47620965974a0b865a9dad161c4d284aaf316f01f0241743d11dd6578942ad6673f2843476fbeaaa4688 WHIRLPOOL ca9952c56dafde150126001aa1b58b43cb95fd751c4d2361037424bca8d5b2080f72f7ed3c5b39a2a504fa30f5f310857331b23d9f244b1106858d068c4cbb49
+EBUILD sqlalchemy-migrate-0.11.0.ebuild 1647 SHA256 8606be519643756f9027f8f01fd6fdcb9c5f5533303960b89ad53c8d028cef85 SHA512 6ec42d2e494ff31a668f7d44d298e7344e0f1713b8832b931acab72396af1250e83797b47df6ecd16b1fcfef14e3ca2a488e8fa80b38f552599d6c43d8312efd WHIRLPOOL 6ee79d60f2a936fe7be57d8614f16988521edfbb06d35c8863ab96979f257467487c2facddd97c5d2c1ec6403236b9e2a570247e4662f3ad4628fca3e6f8dda5
+EBUILD sqlalchemy-migrate-0.7.2-r1.ebuild 706 SHA256 a5026a9fbc6aabd66db7bb8ad2b90152a07ee79979f2ae2c8fb00163e34e3ce9 SHA512 9fb8db6980729ae1e6577db700fed3176e102c66a1f9792c0bbf4628324323ab5157a896903434ce4f8466531e822e2c462ee602e2886e95c3157cdc28a9ca5a WHIRLPOOL 38a7a6635d85a9a1d5a4f52eb9e7dcac2c4a4dd3831fc3035c1cdfae49a44ed63544bf904ebd3c5ca0d5a738b407ce1cfd561c0c7a3525859029b144486fd6c4
+EBUILD sqlalchemy-migrate-0.9.2.ebuild 848 SHA256 89d01bbcce9cf0973af4c8d0a1d35caa97b98b4567c00de3b775858ba8914a45 SHA512 afa5a437b09d95ad5368482f869a563f41f45ee585945f3d649607b3dd59d151d3972240a673f8ed4705a80b6f4836066921d6b3cd7d8cc0a4077917a4aeae0a WHIRLPOOL efaf5faae350ff03511a01d98206fe3d277f9ddf8c2821944079d3935f49852863b98a508add723e6cc0e939d3399b87d916a7f8d4d43cb77966f3ed05f5ded6
+MISC ChangeLog 6685 SHA256 5e420e9e1680a67475143eb473d073b475892eb5e366bcecec4fc32754c02bec SHA512 4779943184593a1c260353a9df7fb5fee5643b09fb0e53aa8b7036ad1fdaba7ed882fe1b01393e2c89a4da1f539e5c907675f77bc1c86ff774f3a8b0f311ef4c WHIRLPOOL 7f875029755337967eb04e6bcb7598276e04a83800bf2c0a65cddd40d7bd256555aa073f8d88c3968f62817e30a89fa117ab14904a9f8930cee2882b5f615a11
+MISC ChangeLog-2015 8900 SHA256 e050856902b09e86216c8a054507cc40ba76d0dae19b8639ecffcfc4e74752f5 SHA512 423b42f267ba05db1035d7c803722898b0d61b2bcb3ae116c75b30f0bf119c945a44f4ae9f39af73ccfe5fed983e8c371bdbe03c7f71e65aeef560ad86d97493 WHIRLPOOL 6d566fa62451983dbf58c9f03b01baba7e625e5c47d147049100f1670499447c23572c7c40d2df8329284cc1ddd454319f1ed98300d46b8488f16fee41a1adac
+MISC metadata.xml 331 SHA256 6e22dfe940e86d954878d94ba456cbefa0e1d1a2e155d63e1d65f06d69cb6e70 SHA512 6c683c14c1fe2acf94b25f6d17cd02d3d74db9259df9d241b3a2efe9abab2076f04a70e00327a06a3d8411244323a3061cfd1bd82d59eaec8b56682e79e41fc0 WHIRLPOOL 8b5566c8984a0fbeb8d9e392a75972e53d0044345522c60d3fa0a719a3e377741003ca0168579ac1e8079ddbfeec9c1e81bb64417259f22c6e8356e9cce33b93
diff --git a/dev-python/sqlalchemy-migrate/metadata.xml b/dev-python/sqlalchemy-migrate/metadata.xml
new file mode 100644
index 000000000000..bcf30d2e1e47
--- /dev/null
+++ b/dev-python/sqlalchemy-migrate/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">sqlalchemy-migrate</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild
new file mode 100644
index 000000000000..1e40eb75fa36
--- /dev/null
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="SQLAlchemy Schema Migration Tools"
+HOMEPAGE="https://pypi.python.org/pypi/sqlalchemy-migrate"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="doc"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-issuetracker[${PYTHON_USEDEP}] )"
+RDEPEND=">=dev-python/sqlalchemy-0.7.8[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}]
+		dev-python/decorator[${PYTHON_USEDEP}]
+		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+		dev-python/python-sqlparse[${PYTHON_USEDEP}]
+		>=dev-python/tempita-0.4[${PYTHON_USEDEP}]"
+# Testsuite requires a missing dep and errors with poor report output
+
+python_prepare_all() {
+	# Prevent d'loading during the doc build via sphinx.ext.intersphinx
+	sed -e "s: 'sphinx.ext.intersphinx',::" -i doc/source/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		einfo ""; einfo "The build seeks to import modules from an installed state of the package"
+		einfo "simply ignore all warnings / errors of failure to import module migrate.<module>"; einfo ""
+		emake -C doc/source html || die "Generation of documentation failed"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/source/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.7.2-r1.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..4511a6463737
--- /dev/null
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.7.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="SQLAlchemy Schema Migration Tools"
+HOMEPAGE="https://pypi.python.org/pypi/sqlalchemy-migrate"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+DEPEND="dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.6[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
+	dev-python/tempita[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+# for tests: unittest2 and scripttest
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild
new file mode 100644
index 000000000000..678cb06f4b8c
--- /dev/null
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+# py3 has a syntax errors. On testing it is underdone
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="SQLAlchemy Schema Migration Tools"
+HOMEPAGE="https://pypi.python.org/pypi/sqlalchemy-migrate"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-0.7.8[${PYTHON_USEDEP}]
+		dev-python/decorator[${PYTHON_USEDEP}]
+		>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/tempita-0.4[${PYTHON_USEDEP}]
+		dev-python/python-sqlparse[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/sqlalchemy-rqlite/Manifest b/dev-python/sqlalchemy-rqlite/Manifest
new file mode 100644
index 000000000000..2a380818f3d1
--- /dev/null
+++ b/dev-python/sqlalchemy-rqlite/Manifest
@@ -0,0 +1,5 @@
+DIST sqlalchemy-rqlite-1.0.tar.gz 3910 SHA256 69505027aa6c3e8c7d8ac95bc33635c92641970b46b1399e53d5ca65462d40ef SHA512 794d0a1d80803f624af4b530efe277947d3a8fa7001df2177de6bdb34ffc9fc76e22c8b73caad7cda02429ddc251fdcbdd8e95ea286a6540054efb28ee53d2bb WHIRLPOOL de38d8d234d55c0ea3cd86568e1cd6961b97a2ae6f77e74615781267070a692faf55b1bd98dc80bb9b05e2ca62be49efb91f1c4d28f9d680c5e268464a50b396
+EBUILD sqlalchemy-rqlite-1.0.ebuild 1009 SHA256 59e2525b3b0d960a7a8c037731466f693bf050b31b8017678a813e4613bfd7ba SHA512 fdbeec0236a147829e38d307c5c5a0aa1b8e192ec1ac62c577eab86fe5b35302db46b977a00b946711538945bf21b91cd06d7fa6b9758e4346dfe151ae7cc690 WHIRLPOOL ccc06c3a16b252716b82652d8f5bce66bcbb5c90eacb78d0fea5f5deb5a93063e9fc613239a8ebdfb9bb7e1e027117cdb82c9eaa1e1393ccb6795bff6b24f297
+EBUILD sqlalchemy-rqlite-9999.ebuild 929 SHA256 bdc24a3619993395d1f1219843e3422a4de801c94cfc1df0c77eec5f91910aeb SHA512 f170ce89dcb9ba47558ef4dc9643a47866e98aa3127bc2c157d6365bec18d14d8b904f19e266490cfbf311df43e784077f1a4a9ed0f0111cbabb45290ca64c7c WHIRLPOOL 5fc97d987c0a20f201477271a58a3a7703e49981c39994eff2da2b21b08f34857dc328519b7bdafa0db9a8995645654d98d0db734301c72c33e8a3c07de6dc33
+MISC ChangeLog 533 SHA256 34cd3618daef7ada2e5ec935528766c282e3be27be72dd6c6175725578ae9f23 SHA512 3916afca9884334886326335730b83eb0144433e25661fdfb42f179a6b27597e95bf3daf9b6934cf9a2339178fc5ebf0c5d1a8d8a40778753742b7d9b08d836f WHIRLPOOL c12bea6b607c323257541c0ab01128e0650e0675b160ab5013fda52f71d05ee8df88d8718de901e915582dd4e4fa4c18e1f09cb51895fcbde21c1261fc59d2e3
+MISC metadata.xml 307 SHA256 8f9beb3cde8c98161e1f3fa21fe07522943694d40d5bae8383d34e579a502fa9 SHA512 ed97acffcf63e1d7d8ec644d8e050848645f93d77b2114e11e49fc841cdc35f7e2a5be4a1fedc235b1ceb4bbf14a03db47d6aa805b48537acd164357638582d9 WHIRLPOOL 0cac6f2c936032a76ef03487aac12bbbe1363256d0db6949d53fe349f5f1cea51b711b1f9c81390f51ae994871d1adbcd34d6e0b715b4d7347aec3a36182d253
diff --git a/dev-python/sqlalchemy-rqlite/metadata.xml b/dev-python/sqlalchemy-rqlite/metadata.xml
new file mode 100644
index 000000000000..c010c6f7d415
--- /dev/null
+++ b/dev-python/sqlalchemy-rqlite/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">rqlite/sqlalchemy-rqlite</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild
new file mode 100644
index 000000000000..731a6fd8e72b
--- /dev/null
+++ b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+fi
+
+DESCRIPTION="A SQLAlchemy dialect for rqlite"
+EGIT_REPO_URI="https://github.com/rqlite/sqlalchemy-rqlite.git"
+HOMEPAGE="${EGIT_REPO_URI%.git}/"
+SRC_URI="${EGIT_REPO_URI%.git}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pyrqlite[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pylint[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	sed -e "s:^__version__ = .*:__version__ = '${PV}':" -i src/sqlalchemy_rqlite/constants.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	esetup.py test || die "tests failed"
+	esetup.py lint -f text -E || die "pylint failed"
+}
diff --git a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild
new file mode 100644
index 000000000000..575a0522f0ad
--- /dev/null
+++ b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+fi
+
+DESCRIPTION="A SQLAlchemy dialect for rqlite"
+EGIT_REPO_URI="https://github.com/rqlite/sqlalchemy-rqlite.git"
+HOMEPAGE="${EGIT_REPO_URI%.git}/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pyrqlite[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pylint[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	sed -e "s:^__version__ = .*:__version__ = '${PV}':" -i src/sqlalchemy_rqlite/constants.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	esetup.py test || die "tests failed"
+	esetup.py lint -f text -E || die "pylint failed"
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
new file mode 100644
index 000000000000..99cc8f1a6861
--- /dev/null
+++ b/dev-python/sqlalchemy/Manifest
@@ -0,0 +1,22 @@
+AUX sqlalchemy-0.7-logging.handlers.patch 466 SHA256 3e2034457bbd4f4cd775f41cad156e27006c0b87cb3bec502b9b405a969d1099 SHA512 a09af91fdd6a1cc9f219c9b45fbe2fa5d9a675d2c2dc769545af52fda44ced40f673426975a09dd943e6ba5087cf0c0caa771c106e0eb755c3ed97c4ddc267fa WHIRLPOOL 8691dd7dbb09a45296dc6890644b06de63bd779cefbfe7b90d2d5753d7d752c5f6836151e26734090e69e928deb396b9a7c70fe8c980bf1a8442e623211ebdc6
+DIST SQLAlchemy-0.7.10.tar.gz 3541639 SHA256 77aa39d65c9d043eba6ba329b359ff867424fd6c403b7c0cb112b65e507e1d66 SHA512 631bc4ffb419defa531a66d82449fe48f93c88371ba0b8ab4217d900a0d1d90efe9699d8a9048d5c2ed33948c6d2f7cae46452ee45d442914018f3361e804367 WHIRLPOOL 74ffc17efbcbb2ac67712b9e11aa48431d18970f46ae5985aaa345aa8691f96e4acc4cf6fa37606699fbba83fcb7f74b0360fea2ac5e93a451585019e110f2ed
+DIST SQLAlchemy-0.9.8.tar.gz 4080098 SHA256 de3ac04ecab0a7e0af64eee30a71e723ba5886b958205f7354dd62439da60389 SHA512 3df7d7a64cdfe7b684be98e7e9d6836da54c391343bb047224a11df888041034bcc54cc30d15dc3d56b5d397b35e6aabe5732e7ca8fbf553bd8d98731c249ea5 WHIRLPOOL 2cedf7713753a6cf8838741fcf06c5510387aa4e661ea3c0ecc2bb7bdb5b03fb90f072ccd1a5671f03943952340c6c3525836e1ebe9246506143b055a1ca1991
+DIST SQLAlchemy-1.0.17.tar.gz 4787165 SHA256 4352b8ddc625fe648e9e93929fa217c234d7b1a1a2412a3021924b5c2bd95194 SHA512 18fc00bd80d136a65d5ad6929dac97a67514e001baaeaa57e95b31243cfe11aab9ab62ba8f7e68a5e833fbf024507c4908f99277445c8c3c9a3314981567978c WHIRLPOOL 7bfe9479f8cd8290d8065bc62d4ecd6ee1fdc17ada0ebc056ae2a90643a7c8e361b4456f8b93fc9cffa1e72316146975b0fe4f3ce44a8e4f76cb0994fe052a13
+DIST SQLAlchemy-1.1.11.tar.gz 5197520 SHA256 76f76965e9a968ba3aecd2a8bc0d991cea04fd9a182e6c95c81f1551487b0211 SHA512 322ec0baa6360099eb000ddd36e28267f64019eb72201ecf60fc478591679e0dd5d2b1139a93036d2ec0165c588ea5836a67ed21dbf7c423b64432589bd73de4 WHIRLPOOL cebae426ff588ccf59e940fb11812abe60cf53fa1f67da954bbdbe06f558c5185f548e9446149e3187219608b1c9782af82c14bb41606b083f58103583d055bb
+DIST SQLAlchemy-1.1.12.tar.gz 5178158 SHA256 d501527319f51a3d9eb639b654222c6f67287228a98ba102b1d0b598eb3266c9 SHA512 f9d14b3d4eab049e9d7377008cf11678c1413e204baad898093282d1812d242a544bbb6606b4e9a83b37d5c17bcec3c115ffe402dda8b6a84d0d5186415645e3 WHIRLPOOL b6ab34dfb6eaf57d2440cc2edadc518785896b82b1c72b3cd2e3cf5296cb7db13e6705b11387412fd02db40a29380c04260dae84d774a4de1d5990ebb3ac385e
+DIST SQLAlchemy-1.1.13.tar.gz 5179952 SHA256 2a98ac87b30eaa2bee1f1044848b9590e476e7f93d033c6542e60b993a5cf898 SHA512 556222ff6b8218e7c3b892bf15ee24966aea366bf9d4e94db9762c56120aac3cde8eb174763a1edc1686744dd5c10f16791ac83111cb9d3da15f0ca5bdfad377 WHIRLPOOL a8a8ab2b18beb23164c26a42ef542fc8da3345657a67944d70885da632ef2bc1523144c5c8e280f74c767308f58db261cfc6f1a30ecbd2e53f4da1d046fb1ed1
+DIST SQLAlchemy-1.1.14.tar.gz 5183519 SHA256 f1191e29e35b6fe1aef7175a09b1707ebb7bd08d0b17cb0feada76c49e5a2d1e SHA512 82b9a97553a27e8d366401b1b99ebc884ee3a95f7ccefc27dae50bc335e30a4c019906caf07238c2a91b7b89a4a5a5e1118defb11e6a2719b631ca0d1e0905a1 WHIRLPOOL 9649bb860a09829b45a8ffc2097491d6853337258c14f8a7496ed8d177add425da183dc69e0f7cb926ef9706a7ccee4158eb11969a0b00048155d10d6e97f880
+DIST SQLAlchemy-1.1.5.tar.gz 5134252 SHA256 68fb40049690e567ebda7b270176f5abf0d53d9fbd515fec4e43326f601119b6 SHA512 94cfa2a94c21a7f40a34f7bebacf74cafcd8cfc24cabd5a79e0ed28a7a6d0c4182c9ceb076b07e1ee5ca1bd01a38a25ca264bbfdf5344c40e0c59b59582eb043 WHIRLPOOL 2264a5f23e91854d9ad6dcdabc2622658e900be560e7f6f5461357850c445574a982ea81c9ae1b5fb35bea70c419b98f8f3ab6dd4ef1990b9ac647d7f7e80ef5
+DIST SQLAlchemy-1.1.9.tar.gz 5164787 SHA256 b65cdc73cd348448ef0164f6c77d45a9f27ca575d3c5d71ccc33adf684bc6ef0 SHA512 95df08e6bca0013ddc7e61aa82d7d51eb133a9b34aa430a785bd8cec8eb79a2b6e1503c1757a71487b09e2f292b5916e6797efb2026d43175e34a52b68cf81c6 WHIRLPOOL c5ee51e72f4364d5c2c0bef0603212019d7f6d62f6cd153c88c31477f5363c37922e86e98821a17d0597ab1d360110629f53ec1257cc859204fcb7d05b3cb55e
+EBUILD sqlalchemy-0.7.10.ebuild 1583 SHA256 c35c94708252aee483dfdf097afca27d94ae8c92ae8f5c29340f612bbb172f8c SHA512 a080a72f9596945ec353b10ceda491cf35de92ddb1068ae0949a247547c0d864fe08774887b665f91a02f4536fc4a250d8ae01891e7ebe957c946d08a9584cff WHIRLPOOL 3403c6f6e8a882aec8d5bca4a406714034d032e5c51f2031275340070966dcf8720fb041db40cd6bd9e595767f184bb286f6285872ac0e4c01a5515277fbeae0
+EBUILD sqlalchemy-0.9.8.ebuild 2459 SHA256 68f0d9ea2068c395882c57eb1c2d5926f2bec2670a117ee1934aa0caa2eb1bd2 SHA512 319800805e7b97f12e9da7ceadb5e8a39f413184890431e79fceade338a19cc34a0e78b9df12623f12eb736c3c97031ec065f90bcb62e9acad233a30377f6ab4 WHIRLPOOL 0c9ee4a0b2d6109f65431ac1e7f732db25926fc767e1187154e053b83e291c01fe51ccf8325e50a38ded1bb283fc9879d06f23f9af16761196de2de4b88e17aa
+EBUILD sqlalchemy-1.0.17.ebuild 2139 SHA256 00579d6e985cd86bc7fdcdc477d10043a3bce8b66e592944c585996b778ef2c5 SHA512 dda12647bc92fb67a6416d6506708b4918cd300de177a0c073a38ed2fde3fdf5e79c2a1d773a5f2819de17a6eb3d7f07c1e84c556b4a145c5251996a896e754e WHIRLPOOL 942edd9d3014eb1a5eaed496a092efd7297f1654a171853463b822efdc01a2fe1ca47345351b94042ce1e774eae3252e2c1897f67405e0f2f821b0f09a3eea0a
+EBUILD sqlalchemy-1.1.11.ebuild 2141 SHA256 930ed3e914e57b475fd770d7fd5cf1ecdf56fd0615eb3ae4fe68d442cbdf4307 SHA512 b0898a2d08a532bbcad7cabe097f0b6ba020e4513ceb0a4513614c5eb73f46e135554946f5a8394d8b89f2b81ec83f9ef22d1171d25782c923592c7f36c1545f WHIRLPOOL 1a231527a13c593e7835a88b7ea9d80f75d33fcfa3fd003397da6e76f1d7f0fe2425eb446e65fbad6187cbd4396a2ebc9747d59738d0084ab571b162ae2d79c2
+EBUILD sqlalchemy-1.1.12.ebuild 2132 SHA256 8506bb883d9d3f598b323c7ffa6483a126b6d259dd6d57af041536e60bcdded9 SHA512 9a8322c01756d6c3f567364c1f17f80de03e4e9cc21ce2169ae6e2ec212957a07efe1e3c9794344a8a348fb7ca88d6795724c9842e56952ed6a6197fd1f66f68 WHIRLPOOL 19158693a4255f4ee34aaa6a29985ba38197a47b4aa8072563805bfb1c0ff6c06cd02f418bed32f740887cf771bbdd0ec7debbdab571adee6dd84decbfd4518f
+EBUILD sqlalchemy-1.1.13.ebuild 2154 SHA256 5e8ff5d901a4a650a119f861dc687cd386e3ed4d7bed4c3204462eef82039f96 SHA512 24a8109243abd342d31029b21ec2110b40c194d66a7afe020be2806229a29bed8ede5e55b31a57f70e873766452a6e67e76efb46d3f017456d67213b1e606138 WHIRLPOOL 1a3f4dbcd3293e1ae70b208d70de86eebbdfc7548e32f7efe220bc86537692ceff2ce727db65b395a6ae99892de2e34513800dcf60237165d7ad0b4d54d36ff6
+EBUILD sqlalchemy-1.1.14.ebuild 2154 SHA256 5e8ff5d901a4a650a119f861dc687cd386e3ed4d7bed4c3204462eef82039f96 SHA512 24a8109243abd342d31029b21ec2110b40c194d66a7afe020be2806229a29bed8ede5e55b31a57f70e873766452a6e67e76efb46d3f017456d67213b1e606138 WHIRLPOOL 1a3f4dbcd3293e1ae70b208d70de86eebbdfc7548e32f7efe220bc86537692ceff2ce727db65b395a6ae99892de2e34513800dcf60237165d7ad0b4d54d36ff6
+EBUILD sqlalchemy-1.1.5.ebuild 2141 SHA256 930ed3e914e57b475fd770d7fd5cf1ecdf56fd0615eb3ae4fe68d442cbdf4307 SHA512 b0898a2d08a532bbcad7cabe097f0b6ba020e4513ceb0a4513614c5eb73f46e135554946f5a8394d8b89f2b81ec83f9ef22d1171d25782c923592c7f36c1545f WHIRLPOOL 1a231527a13c593e7835a88b7ea9d80f75d33fcfa3fd003397da6e76f1d7f0fe2425eb446e65fbad6187cbd4396a2ebc9747d59738d0084ab571b162ae2d79c2
+EBUILD sqlalchemy-1.1.9.ebuild 2141 SHA256 930ed3e914e57b475fd770d7fd5cf1ecdf56fd0615eb3ae4fe68d442cbdf4307 SHA512 b0898a2d08a532bbcad7cabe097f0b6ba020e4513ceb0a4513614c5eb73f46e135554946f5a8394d8b89f2b81ec83f9ef22d1171d25782c923592c7f36c1545f WHIRLPOOL 1a231527a13c593e7835a88b7ea9d80f75d33fcfa3fd003397da6e76f1d7f0fe2425eb446e65fbad6187cbd4396a2ebc9747d59738d0084ab571b162ae2d79c2
+MISC ChangeLog 9263 SHA256 fe698bea2bd1dc022573807acc2beba66a6c3a8ad687d128da8a14a0730eec61 SHA512 49ba9000827629534e0ce7db1153e67811d0cde2f795daf8c0b9be474792bf1594d5af3477965cd357b016020615f6c0dd906566d8d83a527448179ae6d19571 WHIRLPOOL 176a37ee8a11bd94f79095eabe3df4d228a528543126bf1a51d698dc1d47c9df4c8400d04ef409784c1e89464b750a3f8ba90bdfe81c22f3f2c18892eb7e0556
+MISC ChangeLog-2015 24307 SHA256 1f9f356d0733a2ad8dff5676313b4b03cd2312b9bf469c8910ac35a6332fe18e SHA512 4fd5189cd103a2996a7c9b8e27e5131444ca975835416634e4e9d4c8a335d95d572c334c94982d2ce06b7f238c4f79d8492fc51f8e31d7ab64ad891835300e5f WHIRLPOOL 8b12bb366ed61a8bbccc0ad61d3f399b919ca93b98bb13cb6cd93cf41f39f9259d5c6d46f28f690712930971e68e06ed7520165a14e665f102d48c569cb55f88
+MISC metadata.xml 313 SHA256 58648a22cdd7987775690f0e4c50c90349066e882ff3c627a1405e2fe51537df SHA512 ef6298f9e38312117a0d1ab1e63f2fb21ae51ff149053603c19437b90d954827858579ab8f021cb52919aff4474a27f5a598d8515a7e5a9f2e7e35aee53c5326 WHIRLPOOL 2319bcaf15fa2b5895e29eb2b2600f5a30ce56d20efb86e9ea412818b92d59c936bc9852536a784834e700d15f5d0aefc466af35bf95bdc18ec1c620f7356334
diff --git a/dev-python/sqlalchemy/files/sqlalchemy-0.7-logging.handlers.patch b/dev-python/sqlalchemy/files/sqlalchemy-0.7-logging.handlers.patch
new file mode 100644
index 000000000000..122ae43fe338
--- /dev/null
+++ b/dev-python/sqlalchemy/files/sqlalchemy-0.7-logging.handlers.patch
@@ -0,0 +1,12 @@
+https://bitbucket.org/sqlalchemy/sqlalchemy/pull-request/41
+--- a/test/engine/test_execute.py
++++ b/test/engine/test_execute.py
+@@ -9,7 +9,7 @@
+ import sqlalchemy as tsa
+ from test.lib import testing, engines
+ from test.lib.engines import testing_engine
+-import logging
++import logging, logging.handlers
+ from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam
+ from sqlalchemy.engine import base, default
+ from sqlalchemy.engine.base import Connection, Engine
diff --git a/dev-python/sqlalchemy/metadata.xml b/dev-python/sqlalchemy/metadata.xml
new file mode 100644
index 000000000000..c94fc8af5aeb
--- /dev/null
+++ b/dev-python/sqlalchemy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">SQLAlchemy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
new file mode 100644
index 000000000000..6681b0d832d0
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+# py3 appears underdone,
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples mssql mysql postgres +sqlite test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	mssql? ( dev-python/pymssql )
+	mysql? ( dev-python/mysql-python )
+	postgres? ( >=dev-python/psycopg-2 )
+	sqlite? (
+		>=dev-db/sqlite-3.3.13 )"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-db/sqlite-3.3.13
+		>=dev-python/nose-0.10.4[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.7-logging.handlers.patch" )
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -fr test/aaa_profiling
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_test() {
+	"${PYTHON}" sqla_nose.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		pushd doc > /dev/null
+		rm -fr build
+		dohtml -r [a-z]* _images _static
+		popd > /dev/null
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.9.8.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.9.8.ebuild
new file mode 100644
index 000000000000..c266d7dc3343
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-0.9.8.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples +sqlite test"
+REQUIRED_USE="test? ( sqlite )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? (	dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Create copies of necessary files in BUILD_DIR.
+	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
+	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" > /dev/null
+	if [[ "${EPYTHON}" == "python3.2" ]]; then
+		2to3 --no-diffs -w test
+	fi
+	# Recently upstream elected to make the testsuite also pytest capable
+	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+	py.test test || die "Testsuite failed under ${EPYTHON}"
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if ! has_version dev-python/mysql-python; then
+		        elog "For MySQL support, install dev-python/mysql-python"
+		fi
+
+		if ! has_version dev-python/pymssql; then
+			elog "For mssql support, install dev-python/pymssql"
+		fi
+
+		if ! has_version dev-python/psycopg:2; then
+			elog "For postgresql support, install dev-python/psycopg:2"
+		fi
+	fi
+
+	elog "mysql backend support can be enabled by installing mysql-python for cpython py2.7 only,"
+	elog "or mysql-connector-python for support of cpythons 2.7 3.3 and 3.4"
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.0.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.0.17.ebuild
new file mode 100644
index 000000000000..2c12159a3490
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.0.17.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 eutils flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples +sqlite test"
+
+REQUIRED_USE="test? ( sqlite )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Create copies of necessary files in BUILD_DIR.
+	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
+	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" > /dev/null || die
+	if [[ "${EPYTHON}" == "python3.2" ]]; then
+		2to3 --no-diffs -w test || die
+	fi
+	# Recently upstream elected to make the testsuite also pytest capable
+	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.1.11.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.1.11.ebuild
new file mode 100644
index 000000000000..1e0a6318de86
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.1.11.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 eutils flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples +sqlite test"
+
+REQUIRED_USE="test? ( sqlite )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Create copies of necessary files in BUILD_DIR.
+	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
+	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" > /dev/null || die
+	if [[ "${EPYTHON}" == "python3.2" ]]; then
+		2to3 --no-diffs -w test || die
+	fi
+	# Recently upstream elected to make the testsuite also pytest capable
+	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.1.12.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.1.12.ebuild
new file mode 100644
index 000000000000..b559e60ed4d3
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.1.12.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 eutils flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples +sqlite test"
+
+REQUIRED_USE="test? ( sqlite )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Create copies of necessary files in BUILD_DIR.
+	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
+	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" > /dev/null || die
+	if [[ "${EPYTHON}" == "python3.2" ]]; then
+		2to3 --no-diffs -w test || die
+	fi
+	# Recently upstream elected to make the testsuite also pytest capable
+	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.1.13.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.1.13.ebuild
new file mode 100644
index 000000000000..3bce72a347fd
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.1.13.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 eutils flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc examples +sqlite test"
+
+REQUIRED_USE="test? ( sqlite )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Create copies of necessary files in BUILD_DIR.
+	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
+	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" > /dev/null || die
+	if [[ "${EPYTHON}" == "python3.2" ]]; then
+		2to3 --no-diffs -w test || die
+	fi
+	# Recently upstream elected to make the testsuite also pytest capable
+	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.1.14.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.1.14.ebuild
new file mode 100644
index 000000000000..3bce72a347fd
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.1.14.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 eutils flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc examples +sqlite test"
+
+REQUIRED_USE="test? ( sqlite )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Create copies of necessary files in BUILD_DIR.
+	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
+	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" > /dev/null || die
+	if [[ "${EPYTHON}" == "python3.2" ]]; then
+		2to3 --no-diffs -w test || die
+	fi
+	# Recently upstream elected to make the testsuite also pytest capable
+	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.1.5.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.1.5.ebuild
new file mode 100644
index 000000000000..1e0a6318de86
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.1.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 eutils flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples +sqlite test"
+
+REQUIRED_USE="test? ( sqlite )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Create copies of necessary files in BUILD_DIR.
+	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
+	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" > /dev/null || die
+	if [[ "${EPYTHON}" == "python3.2" ]]; then
+		2to3 --no-diffs -w test || die
+	fi
+	# Recently upstream elected to make the testsuite also pytest capable
+	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.1.9.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.1.9.ebuild
new file mode 100644
index 000000000000..1e0a6318de86
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.1.9.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 eutils flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples +sqlite test"
+
+REQUIRED_USE="test? ( sqlite )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Create copies of necessary files in BUILD_DIR.
+	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
+	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" > /dev/null || die
+	if [[ "${EPYTHON}" == "python3.2" ]]; then
+		2to3 --no-diffs -w test || die
+	fi
+	# Recently upstream elected to make the testsuite also pytest capable
+	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlite3dbm/Manifest b/dev-python/sqlite3dbm/Manifest
new file mode 100644
index 000000000000..d389cd03ee54
--- /dev/null
+++ b/dev-python/sqlite3dbm/Manifest
@@ -0,0 +1,5 @@
+DIST sqlite3dbm-0.1.4-git.tar.gz 18962 SHA256 635cbf3f554c0cd75d68a6ebff57b2e29686bad1469a283a70f28ae8dd71c905 SHA512 1b420839482cf5881b744855393afa9eaa1cd0ea2195d03c6576f97804851dcfa5b5fe6a80d9d77eb00b9ee49ebb7cdb7ba7b86f57e4c700178a0bf46d598bab WHIRLPOOL 5e7789b042732edd8c4f3b06868582fff4164b4fa461d297f44ba2a3491a71b607f1b0b4b910e2edc1cddd1b86cc3c6a0bec482be7b36185d59d812a78ea7b8c
+EBUILD sqlite3dbm-0.1.4-r1.ebuild 973 SHA256 e929bbe7dea374132a8def5101173f76e0a9d0514e8e9245a4fdb48e9133be45 SHA512 5ee62c0b203cc77ec969672613c4864241c667861074de2cd27c3d6c9db3942117283f1d74ac99de7582786209e8a836cfa0e297ef7f4457bc92af698685f26d WHIRLPOOL dbc027c722e6e256b1b98d5916fc6fc5959cbb1b87c63a2ffb26fa63bb72a55f9d7cad1c825aa6ad6cfe998fa5188b6056fda34e5248dec2c1c8e136aa42610e
+MISC ChangeLog 2703 SHA256 057060e0e02578b8c4abb7bfccf1670b5eaef402aac93b89167541ef71d4d85e SHA512 c760845af8463ee228f32474b00b062cf0276a1e456fb9a1033640c4014ebb763a0b96fcb3196b265676c92a609adb35395492e1ffabbc4bb4a5aa389258dadf WHIRLPOOL 1d65bb5eac9a8169f31909b2e5112c84cb3d82319353082299b124dc1d16ff35d69d2a9a6a28ba4c0f7896dec9818cb17af37bda64279ae1c3377a4ab4f78a7c
+MISC ChangeLog-2015 1376 SHA256 f2a6f6fb552a337ad4bb67df0fb83d40f1e691a3ac697fde22f201998adf5b6c SHA512 bd130466bbc23fb78d6fd1dc3d2541a11ac4714fa80cb6e890fe91b224db73a30532ffb62431bb72c81a7dd4c74df5401e4de0727d7e793c3dbc47c9cf8301fd WHIRLPOOL aeadcd35af57a1752afdc724665e614c6211bc6aa9f8648c17c6bcc2b49c1a28bba2e5f8471697a51a5b186d3e19dc5856d653721ac8d81067f13faf321d0642
+MISC metadata.xml 330 SHA256 d4b33b2b448e57a9af86c155854698109b1fd31309503ecbf8de211b0d57c318 SHA512 77d26c5ca1d907bc82caff2060b73ebf58d4de60466e2415a8a4f1010653865a573aad75a76a0f610b3ab7af738efdc592a0031e0f523f78560075d47f566809 WHIRLPOOL 4eb9d95b03d55c57cf238da60ab676076b9dafe36b5b5978752767b2d38134733f5ff0407e08063c554c255e1abeea53feee44de479638795aa7b1c97eec1b3d
diff --git a/dev-python/sqlite3dbm/metadata.xml b/dev-python/sqlite3dbm/metadata.xml
new file mode 100644
index 000000000000..26e280528171
--- /dev/null
+++ b/dev-python/sqlite3dbm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">Yelp/sqlite3dbm</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sqlite3dbm/sqlite3dbm-0.1.4-r1.ebuild b/dev-python/sqlite3dbm/sqlite3dbm-0.1.4-r1.ebuild
new file mode 100644
index 000000000000..5743e08112b7
--- /dev/null
+++ b/dev-python/sqlite3dbm/sqlite3dbm-0.1.4-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+# TODO: strip the -git at some version bump, introduced to avoid clash with
+# earlier tarball
+DESCRIPTION="An sqlite-backed dictionary"
+HOMEPAGE="https://github.com/Yelp/sqlite3dbm https://pypi.python.org/pypi/sqlite3dbm/"
+SRC_URI="https://github.com/Yelp/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx )
+	test? ( dev-python/testify[${PYTHON_USEDEP}] )"
+
+DOCS=(AUTHORS.txt CHANGES.txt README.md)
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
+
+src_test() {
+	testify tests || die
+}
diff --git a/dev-python/sqlitecachec/Manifest b/dev-python/sqlitecachec/Manifest
new file mode 100644
index 000000000000..f3f97f733554
--- /dev/null
+++ b/dev-python/sqlitecachec/Manifest
@@ -0,0 +1,5 @@
+DIST yum-metadata-parser-1.1.4.tar.gz 16469 SHA256 f1560a284541feb720c3ae35b6b31f80c2be5cb9ca86b3a1ee9459846f821ada SHA512 51c1c3652171713a6decc165a4f8c4ddb5641f2ad3ee9b84fba3514d5c9afbb0c7ebc7dbb26156194b58c29227ef7b8d40ad760082da1c568254bcbee129d68c WHIRLPOOL ae479b4f93f605b0f19ec7f1c729cac2e19af408e46568209be711aae22b1296b45f77b0eb5309ff855545fdc323dcd64899541156a9f0079ab6afd504b1eb4c
+EBUILD sqlitecachec-1.1.4-r1.ebuild 688 SHA256 9a1cf4c1ce345d1f8b0e9762a9dcc0232e9ca9eb1fa08e1f157051d9a75ef7fb SHA512 4c15fe13a2e06c79b78339c21885e5f089cf3af0bf3483818adfab977585ee562cad7021bd396ef321bd682474f7843972f71ba6a78ded8b9d6bb6aa682031e9 WHIRLPOOL 5468a729204a3d0ea419906e2db14b4b73355a3e437f44c26545bd5b6085afdbb7e77db6b72b5333eddb498f8ffec23cb15bf1ad00c17ef6f26372f3e7764e1d
+MISC ChangeLog 2450 SHA256 539bd7449c3e844bd2cb59af308371d6f46eff5553bfa5d88d06dcd1fb62866f SHA512 7fecb781499c8ac169c2bcac5144b9fe9e5063a2154de1718be933933c3b6995a947f73e01d21e544a4f3cd195b630b7eb348fea4fe90b6dd6ea0e28e36b6edc WHIRLPOOL 7a1e41e6ba99114bc3032242175761e143c9ff028cc2b1fdb690bff4bf6fd23e34b6ba073b4f5370b0e58fb63ce2a3725461e844f2ee250d7b53045619c3a38a
+MISC ChangeLog-2015 1948 SHA256 881f8fa9ec5e67f94a8295bcb26387a4ae466d64759925a0ef55b634c72e36f9 SHA512 f423bd2e57db6aa46f3e253ebb0d3dafe703b31258f954719e0fe2c06a71a0f503674c77144a29c69e455af24f4956ba3b53c4ae290f505bc4dbf519ba8aa496 WHIRLPOOL 25fcb92af25adbd3dc66ac77e26177df9395e73205cc0660cea30c6922324c62d5b7f5c18c9a36612b836c11feb42a5f1e8260a3e152a9e7e5ea9d1494d1fb4c
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/sqlitecachec/metadata.xml b/dev-python/sqlitecachec/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/sqlitecachec/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/sqlitecachec/sqlitecachec-1.1.4-r1.ebuild b/dev-python/sqlitecachec/sqlitecachec-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..4a52424e5a67
--- /dev/null
+++ b/dev-python/sqlitecachec/sqlitecachec-1.1.4-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+MY_P="yum-metadata-parser-${PV}"
+
+DESCRIPTION="sqlite cacher for python applications"
+HOMEPAGE="http://yum.baseurl.org/"
+SRC_URI="http://yum.baseurl.org/download/yum-metadata-parser/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+# glib and libxml2 are used via an extension module written in C.
+# No need to add PYTHON_USEDEP here.
+RDEPEND="dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/sqlobject/Manifest b/dev-python/sqlobject/Manifest
new file mode 100644
index 000000000000..e779d7ab2194
--- /dev/null
+++ b/dev-python/sqlobject/Manifest
@@ -0,0 +1,7 @@
+DIST SQLObject-2.1.1.tar.gz 888532 SHA256 35675d9c6c5a373b68c1e597a51c2723e1a8471911f89b7ec9ab3cc380064874 SHA512 9f51452afb728b3eaa0b113aca7086af6cd858d3b6e84c557af56a086d9a04c7e061f1b45179d0c74ef6a175e593376e1ea3ce561a337d71df6eea0f7bd09fee WHIRLPOOL 0526d02b1815281724b1c5ad1fadf16a5dc3e765bb6c9e6b59db83e95a1f3bfa20134acad459e19583694739a38b3dece3bdc328ad7f57f09c95094759143a50
+DIST SQLObject-3.4.0.tar.gz 1269199 SHA256 cead8baf7642535ad68c1dce7bcba8ca4cc6e10913b82b35c5600a8d290d36f2 SHA512 f10e2b950d5e404aec57442acebae06e2a95adf386de57f73339f62fadd627965667b462055f12586cbfa9be485cc1ab46a21b8fa43da9d6696489d058421aca WHIRLPOOL 938a2a312b1c06903f8ab6ac3f89bac6464d4af625bc8f051ca99bf406291a4b84871f1dab0423f58f6769ba07550bea6194d99d68371e4ba816b0b42819260f
+EBUILD sqlobject-2.1.1-r1.ebuild 1065 SHA256 7dc3bd79dee7a67028640c5362ca0964eb39ccd053511f343f66443a6732ad87 SHA512 c167aee151c8b7c089f02aa7c499021d0ba16d3024e0d3725f422666a0a44ea6bb36412e22111fc47883b3ce81c8f459dd5c99f44388ce40347ecb471d354f87 WHIRLPOOL d69d369ffc8719714e718dfc841be8857e4640af5d6d13b31c9e1066ae6d6909b15c664b9959801ee604b43a148e4ec0f438c61f5b286613fd204dd54880b4b6
+EBUILD sqlobject-3.4.0.ebuild 1065 SHA256 2b6d1a1683f3ab645a13c4cb72aef2d1602dda55b056ea8097802da03b632c15 SHA512 2176e954d9f1fa4cb34e07302ad0ac50db543be57a269f6d98790934b7e1c9a60e4d80b59fb79140011cd77ff87b2552322f4fad2993f60b1bffba633a01a33c WHIRLPOOL fad8441509e09201a741881f994c6b864dcd02a119eb81ecb5c840ba3de9a89c798fa6340f5cfdb79f2c9920ec747169d7419b53a8310c551beb09c08b23e8f1
+MISC ChangeLog 2589 SHA256 0d97e56065138265c99213d27679b3dd403bbc844fd94974ff1d70a31f09d1d3 SHA512 5d69dbe8a7456c02b69eb1443618e1f9dafd8930b7bb1e7f9474bce63e1af0d4b52733e1b7fbdbce09c0daade2aa0a5bc4f83ed094c745a2280c079effe11d95 WHIRLPOOL 0bfe34af0add3ba6c20cf5e8c80cdd914140409acd1dd7af47cd1e69e7ed36f7908dae705fab72ae1ea3544db4b9a35702851ca65f38961d55d0dc20ffef914d
+MISC ChangeLog-2015 10305 SHA256 43cb8da7272b55877ffbdd8731135a52ec9f4bae4d189322112deb3adc8a4783 SHA512 1e0a5544bef8f97a57ee305bd0858726bc700dfe1601aeb8f446519ffdd5218e97a1664a5eafa064ef94d22bcbdf57434f2649345de7e2a83a13dcd496d3d8a9 WHIRLPOOL cc343822858a154b63faa4619c4c06fdc03840267ac8451410bd9be240ab268304260abbb8279061e3a12b2ee8639b22a03c9b899ce25f2f7b16ca7ca7e73b38
+MISC metadata.xml 820 SHA256 d435c1bdb05e269238c482c7284cb2cc68d12eb2f5c14b7d5d3a1cdb43daeb87 SHA512 7003895fa358feb4534bba81f634cd8eda7b3ddb94ab129da2b431ed0a44f0e7507fbf29059abe04908c217e8d342a7a035393e869b367b130a1405e41475601 WHIRLPOOL c9b8bd0ea922b550e695b0556b2e530d4329576694fd9e653e1b4adc7da099197c04803512d2f2a838617e2edba5cc13027df75ac7ef79606649e1a416a5ec04
diff --git a/dev-python/sqlobject/metadata.xml b/dev-python/sqlobject/metadata.xml
new file mode 100644
index 000000000000..57cf8e8ce055
--- /dev/null
+++ b/dev-python/sqlobject/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>SQLObject is an object-relational mapper. It allows you to translate RDBMS table rows into Python objects and manipulate
+	those objects to transparently manipulate the database.</longdescription>
+	<longdescription lang="ja">SQLObject �オブジェクト・リレーショナル・マッパ��。�れ�データベース��作を明瞭��る���RDBMS �テーブル列を Python
+	言語�オブジェクト����作��るよ�����。</longdescription>
+	<upstream>
+		<remote-id type="pypi">SQLObject</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sqlobject/sqlobject-2.1.1-r1.ebuild b/dev-python/sqlobject/sqlobject-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..531bf5da1ce0
--- /dev/null
+++ b/dev-python/sqlobject/sqlobject-2.1.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1
+
+MY_PN="SQLObject"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Object-Relational Manager, aka database wrapper"
+HOMEPAGE="http://sqlobject.org/ https://pypi.python.org/pypi/SQLObject"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc mysql postgres sqlite"
+
+RDEPEND="
+	>=dev-python/formencode-1.1.1[${PYTHON_USEDEP}]
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed -e '/..docs/d' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	if use doc; then
+		HTML_DOCS=( docs/html/. )
+		DOCS=( docs/europython/. )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/sqlobject/sqlobject-3.4.0.ebuild b/dev-python/sqlobject/sqlobject-3.4.0.ebuild
new file mode 100644
index 000000000000..576d9165bf84
--- /dev/null
+++ b/dev-python/sqlobject/sqlobject-3.4.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1
+
+MY_PN="SQLObject"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Object-Relational Manager, aka database wrapper"
+HOMEPAGE="http://sqlobject.org/ https://pypi.python.org/pypi/SQLObject"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc mysql postgres sqlite"
+
+RDEPEND="
+	>=dev-python/formencode-1.1.1[${PYTHON_USEDEP}]
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed -e '/..docs/d' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	if use doc; then
+		HTML_DOCS=( docs/html/. )
+		DOCS=( docs/europython/. )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/squaremap/Manifest b/dev-python/squaremap/Manifest
new file mode 100644
index 000000000000..20f1deed623a
--- /dev/null
+++ b/dev-python/squaremap/Manifest
@@ -0,0 +1,5 @@
+DIST SquareMap-1.0.4.tar.gz 7439 SHA256 feab6cb3b222993df68440e34825d8a16de2c74fdb290ae3974c86b1d5f3eef8 SHA512 d01e61697571360b58e762787237bb8533b3de238f26323380a8b0b90d72d2f00e2a43e7f6742fbbb3483573493b0d83568e0651cbf9bdd463b911d09bf27e76 WHIRLPOOL 482682b6aff35cbe3c3605266f9b08ba5f4e6fdf8bf41a31843d04a5b280976e8144e61f1e23ce6aa376af9b14658f687e7b89bec77414aed3817a9a53b2a0f5
+EBUILD squaremap-1.0.4.ebuild 539 SHA256 95aaeeff8dd4810f878300630b69a14c29fcea088d15b1555d24cf3d36827b5a SHA512 2807a2e6beba9cd7a6546e392f70d51e8a30328f962085f5bbdb9f95995fd641473b62855472b5b60763d9ebad7bd73aff49e871a6c454d16f73b8d7cf4363d7 WHIRLPOOL 6e290e3e1dbfe0efbfc1c28a2f8ad695bb598d300ad6772ff17e7ec5cf3e9b19876c0663661d9fb4ad8d21ac0722fe1c27a5c0d001871c5ef6384694c64a50f0
+MISC ChangeLog 2662 SHA256 cebe9aeee77a72cbc0f4936ca200140eee13e69a7950f94960ccc46af9b59245 SHA512 1d075a5c971a7b6aad5eb33fd1c8790a61eee93af1886bf4cba3716e57084dac3dbdd85b0d3685b1af8b50d7f9e6a6c8dd59ec028ac5f56190b2660b256900aa WHIRLPOOL 08fedc4b6937e9515ab76e3bb3079e62348cf2516dc603801978063dabd447ef8cc07ccfdd10eaf8f33abe2687c1d3bd4efa32611c607f713024b20467d564d6
+MISC ChangeLog-2015 1104 SHA256 bf973c0f5c5ea978441ca617828afa0bdd0238ffd1a3f05d87b52eb673cd5e08 SHA512 b54fef86c111f775f1aa6183965d8c7b9d26e8ea79f4b34536cc17f08b0f8c0b0abd3dd30d7f3a5364034f8359041625983bd6c5955d663c6c4223bf9f5627bb WHIRLPOOL 42a81a2d895576695a6aea4fed729545bf26a8fef3ae63e508c6ae7f2d6a4c455fa9587b9a75001a04783e654819946e7348adaa778a827b83630fe0466cbde1
+MISC metadata.xml 436 SHA256 dfe59cd4080db726aac35b7e449ad28bf601000ffd502b1ea028e38f7795440d SHA512 dce36b184260ccdea3585f5f688006a438347cbe18b2358d95fce4f96f3675d5f0f9a8080a814ac56bc58332d901dc9272f00b6085b8e3e0f0ccfeb9e25f497e WHIRLPOOL de7e7bd135d66624f2e39b0970ee9d0a6ec403041b78d3f8dcde873869a46a18c1a3434f12e9527d4e35150f45e4488285e016c3467044b6abaac464f3a229c5
diff --git a/dev-python/squaremap/metadata.xml b/dev-python/squaremap/metadata.xml
new file mode 100644
index 000000000000..b6d7cc2ced82
--- /dev/null
+++ b/dev-python/squaremap/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>swegener@gentoo.org</email>
+    <name>Sven Wegener</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">SquareMap</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/squaremap/squaremap-1.0.4.ebuild b/dev-python/squaremap/squaremap-1.0.4.ebuild
new file mode 100644
index 000000000000..ab9646cdd0a3
--- /dev/null
+++ b/dev-python/squaremap/squaremap-1.0.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_PN="SquareMap"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Hierarchic data-visualisation control for wxPython"
+HOMEPAGE="https://pypi.python.org/pypi/SquareMap"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	dev-python/wxpython"
+
+S="${WORKDIR}"/${MY_P}
diff --git a/dev-python/ssh/Manifest b/dev-python/ssh/Manifest
new file mode 100644
index 000000000000..e339adf58c21
--- /dev/null
+++ b/dev-python/ssh/Manifest
@@ -0,0 +1,5 @@
+DIST ssh-1.8.0.tar.gz 795832 SHA256 b0aca1faf8a12e6aae24ab9cfae90d061a8741b680c8afad21da6ff8b8ae28d7 SHA512 bac32c2cf078c2a06b4b530c905e4b8e0c09b457d9d9feaee163d3a96d71b43c74d159a25ad65bcb4beba692b05b7587e60b4a13be7d049f8493977f9a032da7 WHIRLPOOL 78dd28b1c5a26f4beeca07cb85761dbf1d9b4c17ec656e882163b383b30e6307a2dad34ceafb2ed0500afff0593c908e7da4180955f1fca98d6aa68be710b28d
+EBUILD ssh-1.8.0-r1.ebuild 888 SHA256 65a1831083da1ebc9b86a4f91a98d64100c3f84ec9ec535f916bab57f66b6c4c SHA512 c562bf0cab04ff7235db61a36ab500a3db69b094e3ff5a42727116a5616b52353c15dc579d6df45c6a9bcfe649ad4cf227f8e2697447f9a5bbf2c12d921caa0b WHIRLPOOL e367058f9b7f6ce54abc86a9befe0efe1a6bf5af938d81e77ad76af7fadae35910fe8da86b72202484bd136100943079106c7e61e6d5daced8b87e70188163e1
+MISC ChangeLog 2565 SHA256 047f8e89ea0ed917c24529770f8c7fd64563facff1e5b5e13e694afa70e9a6aa SHA512 c28f511ec7cf0008ca1b836b74437808e0b492dee589981ac18629715cb4ac3bd582e5e57b014e7225d2eff1b710e5fe11b255da62350c54c6e322cbc119112c WHIRLPOOL 64da2181e2049b86bd4bc8d5ac921a6d0acf2b1ca90079c0be29ec5cdce20327f29a44204afbd85ebd38f60a0606ad19a87cdfe967c0c1dcaf932f8c4f8a7d23
+MISC ChangeLog-2015 1086 SHA256 1e807619bf12311f6047257cedd8cff69eb78e04c1067ea83c6510cef2b8ebdf SHA512 ecb721fb4a9750ae9efd466681816372fc6361b4425e843cdc80fa416cd009a600fd0dac98ace8edbbc4a460b51c1cdb059ee80678c4ddad8294645564d58956 WHIRLPOOL 2e2e0d0dc9b8b62c1d8c90836368fa33d0f033346efb89f4178cc31af5a4a85cb109e5507d9c6ab5e26ffe01d6964b10f2641203a9a9d32046f4978f70034750
+MISC metadata.xml 306 SHA256 09a13ddcc9debc9a80f8d09eb5f39247b007d426a81096fbb941f47bf7a0e491 SHA512 b81d4d42ceba01fab29fade723f7230774eede86fc89db99db36f6d6305d2cf4df199ab47e9ed192cee4f616e214254b8b4d57398e0256c197c94310b6ce4f12 WHIRLPOOL abe3615d5a0784c5444f47e00eb881a576b255777ceefc87bfea2e16c5c21877813f71bd114548fd863666cb4acee672a05df06e2e89cf945822ab359277eecb
diff --git a/dev-python/ssh/metadata.xml b/dev-python/ssh/metadata.xml
new file mode 100644
index 000000000000..6f8061eb91d5
--- /dev/null
+++ b/dev-python/ssh/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ssh</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ssh/ssh-1.8.0-r1.ebuild b/dev-python/ssh/ssh-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..6f7071951626
--- /dev/null
+++ b/dev-python/ssh/ssh-1.8.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="SSH2 protocol library"
+HOMEPAGE="https://pypi.python.org/pypi/ssh"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="doc examples"
+
+RDEPEND=">=dev-python/pycrypto-2.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+		dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" test.py --verbose || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dohtml docs/*
+	fi
+
+	if use examples; then
+		docompress -x usr/share/doc/${PF}/demos/
+		insinto /usr/share/doc/${PF}
+		doins -r demos
+	fi
+}
diff --git a/dev-python/ssl-fetch/Manifest b/dev-python/ssl-fetch/Manifest
new file mode 100644
index 000000000000..5554bc8a79bc
--- /dev/null
+++ b/dev-python/ssl-fetch/Manifest
@@ -0,0 +1,12 @@
+DIST ssl-fetch-0.2.1.tar.gz 10703 SHA256 2905a8301477cf309484e3beef892d68b33910db71be45c08720f70791690b9d SHA512 ca4c4d29463d5761fbcea151f1229152bd0092418254ce614154b012af9a23c0c52bb733f64815499b5ae0ae9325a808ae2157e7ff707345e92352b672c98966 WHIRLPOOL 4bea8540fce0a2bcc0f8d55b4d87e7c544321b14967af95ded400f4ae0af3fd14c8390ed808352aa89c6ba7d267536d2ef8956dcba4b871226e2be9d4e71a2f8
+DIST ssl-fetch-0.2.tar.gz 10945 SHA256 027f63c5797e0fd84d4ed2195e42141316cceeed0b91058dd700b55482e40a78 SHA512 30aa040503eb05d8b0a7775ce843215ebbc198483fba2133e78a5da57f8b998c65018a1241f4f7bb3fbf66045c45bf050b59adb94a68c694aa3aeb6c0b5f726f WHIRLPOOL b4442b55d98741906eb1f3c0fda80cfbb0be42d2d8491c6bf1b86c0833a021ccfbae2887d2f833e9a297556d25c49cb4d617743a338e02299061f6e281d3563c
+DIST ssl-fetch-0.3.tar.gz 11283 SHA256 cee2f05899e729bba8942b26d17b0a97ddfb0a5d0beea4123bf7f2635db088e8 SHA512 82fddbccd3a5da73e81803ce252171d42428d88d301a772127071130ce4336742e46093359f0a996c679cd12ced02d09035af283d4d2f505c67a551283328756 WHIRLPOOL 49938e39c386a83e60caa0260643c31d2c180e93f3be59757dd17c1c9bc05338d5c580e997a96f698d4e1f4cf317bba9f6738044696c6949fcc1a5351e19f6c2
+DIST ssl-fetch-0.4.tar.gz 11663 SHA256 9f646fdabfc3e80b1c464c2ff4471ce917f706fdbbce6f8f904f70e6fe7a153d SHA512 6b31a5dc5d3a566eded6ca284a3edac8c308596dd5a1971d13223e55abdd2ddc4d3e1eca5f369c1c05540bafcb6c273e5ef1eae627a7a9170bc262a0cda06696 WHIRLPOOL 002814cebc942e3daf14907efb22a6141b14b28a96e0a6f7811f642930b5e27864a5f5c8795826c20988a8be9a35f430e39382d20b526bf2439b5a70c9c7cc20
+EBUILD ssl-fetch-0.2.1.ebuild 1190 SHA256 909b61790a78f3bc450a62b0b875d2ed0676d1058631f89f517e52c28f7ea4ce SHA512 eda99d106c18e6e478bf5b01219a2c691e693cf1e445a8917cd9ea87b48ccb5edcbbb9ff782cf3285bb8c41aaad967489af6cacb63ffd6cc616bb821d66dd5b1 WHIRLPOOL b692e6a20f357120fce49dacd59232013449c7f15a2c384888a29d3b6e33bb0b5487ef27312e279dd8ca0af24ad062b629bf640c56f79efbabe0c62c60787e14
+EBUILD ssl-fetch-0.2.ebuild 1139 SHA256 67990f6e4ceb34a492ec018966ad8da6a0bb3f02f916efd814804169a6baf44d SHA512 b4f62fa1589c0445ecb7d884ac6775eea3d40430eb647ae6f01e63dcc360cd21efeb7fe1aad08137071512c158cf60725eadd82d43449784694ecb2186d11b2e WHIRLPOOL 01d47da61dd7ac19f42f56b7574c62a813db1f3c11cc09d0695a73882b7bc55135dd37097930b0b3d187dc67c81ed090eff980028157c98bce7151cf647dd86b
+EBUILD ssl-fetch-0.3.ebuild 1189 SHA256 eb39730656516b444aeed4f7a364057d7ff0cbe78176d74f549ee807160c2b72 SHA512 1bdccaca073b9ef7cb4935f0f5dd8b3abea4f733293261198ea70783ec68bc934d43160ac3754ab1a85b839d522844189c0676b1684878e6ad28446c63c159d5 WHIRLPOOL dbd735d3095fb5cbdb071f2945d53faa652f31e093a0475fb6b451593d8db7e6c24fb82aae3ac7e69cc264216859209e0181b621b84950a028a1a60f9a7091fa
+EBUILD ssl-fetch-0.4.ebuild 1210 SHA256 ecf6cacc119b050bdabbda8c88f1b26215b9484b3dacf287df3e659bacca88cb SHA512 43e2921a5fdcb33eb96d5aa67c2c10e24fbeac8336292ffb35ca690060e2c03ad9ac15a725e5cdeb0ab034faab578abe559470f79b708b86a84d4410df29d8a8 WHIRLPOOL 14464d32ad7ddd4e7759634f09cb339496575fd0becd87b5863fa2075f4d5c42b5cd540b64923f92ac4c2f0efb4b84f58adb3c1499657aa55c11ccf08776edfc
+EBUILD ssl-fetch-9999.ebuild 1092 SHA256 b9bfda0dd891b45eb6cbfb5db21d485877adf2f32a899d5913daf3adc18f7be0 SHA512 3fe14a2dcffc91568225e8d889d03d7e12bb53638f137756bfbbedaaeaa3aa540fe324765d3377c2282eab76c415c23c87578eb6516ca0c44418cd0326ae5bf3 WHIRLPOOL 24e650c7d5c5ca993c1a68e9bf689cc852d8f1979944444ef9361c46b184b3800b0f2bf0c2c639c4c26d82117874ce946309fb3c192da9ea37fb18ea7fcc461d
+MISC ChangeLog 3591 SHA256 f3938e2aee1eeb342f777fbd406d63f92f9d941ad0e1397dd3bf6372992a2f22 SHA512 e2e3059a7f945d532cd17b7a7d55c4588ea45d3102f9972ea58a1cc7c24744d3c00c860efdd34672219c9dcba8ed7f497d218d359ab5277a56d584050d5345fb WHIRLPOOL 6566142d58fbad425bd3d51788cd7ec40977d5715f2ed151ac2f836b6fb9343117b9ec79b6aa6f67ef4a4129210893a13f17119dfb836f094c7e98df92282c0b
+MISC ChangeLog-2015 4117 SHA256 51fb11909444a07721a6184b6bb4e61b4cd824c6935013df6d2a67e7efb70eaf SHA512 62437dfbeb7a00d2939c8161a32fd267122b026a3f99fd31de4ca15d5c16c673d1dce877ec6ccda9eb7198864866cf590af797c585f6ed7a4ae5773fc1e2840d WHIRLPOOL 5d6d5395713373bb79abd8f842de68c573a03461ea0ceea83c21f2b93125add7d6c9530c9fd6e5f37e4b28ffccadcc476958fd340e398e9baef6b63ccb723299
+MISC metadata.xml 585 SHA256 f8fff7d61cd687cca677478715fe4bf0155275253905d0ecc5c206b61e9a654d SHA512 e654050b05973990c8ff763039fd131a2f08916f81caf09d36cb5baa8fc91c4b15522319e22ffc689ce52a0d0c8fb63af5bacd894d9904e993242b3a8d653ae5 WHIRLPOOL fc78cf1931de74099287d190456ab03dc95bb1e79a0fa8b82898d9f916d670db2ca883b40b105580aff4e21005f782561d6d182c9e4d0f047753af1e797b48f7
diff --git a/dev-python/ssl-fetch/metadata.xml b/dev-python/ssl-fetch/metadata.xml
new file mode 100644
index 000000000000..c664dd3ad2e6
--- /dev/null
+++ b/dev-python/ssl-fetch/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dolsen@gentoo.org</email>
+    <name>Brian Dolbec</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>dastergon@gentoo.org</email>
+    <name>Pavlos Ratis</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>tools-portage@gentoo.org</email>
+    <name>Gentoo Portage tools team</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">dol-sen/ssl-fetch</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.2.1.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.2.1.ebuild
new file mode 100644
index 000000000000..f0d50aefc881
--- /dev/null
+++ b/dev-python/ssl-fetch/ssl-fetch-0.2.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A small convenience library for fetching files securely"
+HOMEPAGE="https://github.com/dol-sen/ssl-fetch"
+SRC_URI="https://github.com/dol-sen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos"
+
+DEPEND=""
+
+RDEPEND="${DEPEND}
+	>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
+	python_targets_python2_7? (
+		dev-python/ndg-httpsclient[python_targets_python2_7]
+		dev-python/pyasn1[python_targets_python2_7]
+		>=dev-python/pyopenssl-0.13[python_targets_python2_7]
+		)
+	"
+
+pkg_postinst() {
+	einfo
+	einfo "This is beta software."
+	einfo "The APIs it installs should be considered unstable"
+	einfo "and are subject to change in these early versions."
+	einfo
+	einfo "Please file any enhancement requests, or bugs"
+	einfo "at https://github.com/dol-sen/ssl-fetch/issues"
+	einfo "I am also on IRC @ #gentoo-portage, #gentoo-keys,... of the freenode network"
+	einfo
+}
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.2.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.2.ebuild
new file mode 100644
index 000000000000..3b726ab6a531
--- /dev/null
+++ b/dev-python/ssl-fetch/ssl-fetch-0.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A small convenience library for fetching files securely"
+HOMEPAGE="https://github.com/dol-sen/ssl-fetch"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/ssl-fetch/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+
+DEPEND=""
+
+RDEPEND="${DEPEND}
+	>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
+	python_targets_python2_7? (
+		dev-python/ndg-httpsclient[python_targets_python2_7]
+		dev-python/pyasn1[python_targets_python2_7]
+		>=dev-python/pyopenssl-0.13[python_targets_python2_7]
+		)
+	"
+
+pkg_postinst() {
+	einfo
+	einfo "This is beta software."
+	einfo "The APIs it installs should be considered unstable"
+	einfo "and are subject to change in these early versions."
+	einfo
+	einfo "Please file any enhancement requests, or bugs"
+	einfo "at https://github.com/dol-sen/ssl-fetch/issues"
+	einfo "I am also on IRC @ #gentoo-portage, #gentoo-keys,... of the freenode network"
+	einfo
+}
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.3.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.3.ebuild
new file mode 100644
index 000000000000..830e56014351
--- /dev/null
+++ b/dev-python/ssl-fetch/ssl-fetch-0.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A small convenience library for fetching files securely"
+HOMEPAGE="https://github.com/dol-sen/ssl-fetch"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/ssl-fetch/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+DEPEND=""
+
+RDEPEND="${DEPEND}
+	>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
+	python_targets_python2_7? (
+		dev-python/ndg-httpsclient[python_targets_python2_7]
+		dev-python/pyasn1[python_targets_python2_7]
+		>=dev-python/pyopenssl-0.13[python_targets_python2_7]
+		)
+	"
+
+pkg_postinst() {
+	echo
+	einfo "This is beta software."
+	einfo "The APIs it installs should be considered unstable"
+	einfo "and are subject to change in these early versions."
+	einfo
+	einfo "Please file any enhancement requests, or bugs"
+	einfo "at https://github.com/dol-sen/ssl-fetch/issues"
+	einfo "I am also on IRC @ #gentoo-portage, #gentoo-keys,... of the Freenode network"
+	echo
+}
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
new file mode 100644
index 000000000000..37bd889cfd86
--- /dev/null
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -0,0 +1,41 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="A small convenience library for fetching files securely"
+HOMEPAGE="https://github.com/dol-sen/ssl-fetch"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/ssl-fetch/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+DEPEND=""
+
+RDEPEND="${DEPEND}
+	>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
+	python_targets_python2_7? (
+		dev-python/ndg-httpsclient[python_targets_python2_7]
+		dev-python/pyasn1[python_targets_python2_7]
+		>=dev-python/pyopenssl-0.13[python_targets_python2_7]
+		)
+	"
+
+pkg_postinst() {
+	echo
+	einfo "This is beta software."
+	einfo "The APIs it installs should be considered unstable"
+	einfo "and are subject to change in these early versions."
+	einfo
+	einfo "Please file any enhancement requests, or bugs"
+	einfo "at https://github.com/dol-sen/ssl-fetch/issues"
+	einfo "I am also on IRC @ #gentoo-portage, #gentoo-keys,... of the Freenode network"
+	echo
+}
diff --git a/dev-python/ssl-fetch/ssl-fetch-9999.ebuild b/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
new file mode 100644
index 000000000000..c7f7e4129fca
--- /dev/null
+++ b/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+EGIT_BRANCH="master"
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="A small convenience library for fetching files securely"
+HOMEPAGE="https://github.com/dol-sen/ssl-fetch"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/dol-sen/ssl-fetch.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS=""
+
+DEPEND=""
+
+RDEPEND="${DEPEND}
+	>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
+	python_targets_python2_7? (
+		dev-python/ndg-httpsclient[python_targets_python2_7]
+		dev-python/pyasn1[python_targets_python2_7]
+		>=dev-python/pyopenssl-0.13[python_targets_python2_7]
+		)
+	"
+
+pkg_postinst() {
+	echo
+	einfo "This is experimental software."
+	einfo "The APIs it installs should be considered unstable"
+	einfo "and are subject to change."
+	echo
+	einfo "Please file any enhancement requests, or bugs"
+	einfo "at https://github.com/dol-sen/ssl-fetch/issues"
+	einfo "I am also on IRC @ #gentoo-portage, #gentoo-keys,... of the freenode network"
+	echo
+}
diff --git a/dev-python/starcluster/Manifest b/dev-python/starcluster/Manifest
new file mode 100644
index 000000000000..29a72c1cde94
--- /dev/null
+++ b/dev-python/starcluster/Manifest
@@ -0,0 +1,6 @@
+AUX starcluster-0.93.3-requires.patch 877 SHA256 e3e49b3bc206d7538e567d83ecf8fbe62f607cffa8a418ae31f90d66bf36c148 SHA512 82d061d8b0461f8f0a686a1a4d4369471ca5846e6dea7f2b31b60ee314fcf9872b3c3e3aaec9e3a8eea795985c4f9ef44c6276be542ee71fba5ecb430540c85a WHIRLPOOL 523e8e793b2028424a8cf0d33248c1172ee4bd39adb60785ed2d0868e78fbf3fad827f760c8ccfbdc4bbd90d82e78df0fecf3673db8b8eb089e0a0200a2557f2
+DIST StarCluster-0.93.3.tar.gz 2334885 SHA256 fcda894be33ba309b1c7a94d6c28f1674c3f05ec756133138a39db2138d080d0 SHA512 f81cfc528a00f45f6e720645f44666947f1c51dd3453ac5d78b201d6c3a3cd9f6d97cb7a2802eaf04603d9a19810045ca6071722c9af884ba7e407ffc99078ea WHIRLPOOL b6bfde98f3b660211c5e08965cc6ee31fc9038ec4039ef5aa12ab9c5d474f60f66c1745fb93cce7e05cb361cff6091f60714168ffca81e4033f2fecc5d9d448f
+EBUILD starcluster-0.93.3-r2.ebuild 1724 SHA256 8bf14c3d91d364d4a80dc67a4ce25ee5022e717f5b7aefb611f84bbd9c5b0f73 SHA512 2ad932638b5543478e60a58fc2daa3468d7a627757a5616f6c3abfde77ee545d81076ca40aa9006a1721de9a058747e123ce9ff4cd0793c9ecdf387ec4d1cac8 WHIRLPOOL 7f9d823053078bd56164f692615131b09a1bdc20a2dcb36e1ccba5fc5bf7454f25a3169837b6c8c8194faba41e8a1d25b573b054bb954bc86f9de4b820068379
+MISC ChangeLog 2603 SHA256 a10c8069347c6c1c29704396d0e2343f87eed28a9efd7425bc9c2116e69a817d SHA512 4a41f9d354d1b106626a2c6a62c2c592b967fb9e96a195fe0a050488bae78e53fbbd13fef5b69597e8d67e17aa1a4203f28a64e071a166e94cb3b77673a8d4a5 WHIRLPOOL fc2df278fb9c8d706b5295c79398896bbb2414fc3afa0337d59f3798aa1628268cb6cb66058367366ed9171b3a652865bb9b9fb071ced1faa865bc4942eb3472
+MISC ChangeLog-2015 2104 SHA256 f3199f7088e4fb953e05d688f0d5bc0ba0e9f25bc168de55e096f3feaf24deb3 SHA512 9af1de5f8c8433705a75a97336d7eee135f411500a5531cbe3a49ed5747ae0549d12bad3781126fcb6a5b47062f20ff1605815395de9f725f038af7268810748 WHIRLPOOL 6816858dd59750b449e6970d05e5f3bb05f1e331cbca3e3d86dcf4464a6866137ef3401bd2a4d55cf21ecf8ec879cff5904ea80e067e0bba753b14a2592d4489
+MISC metadata.xml 339 SHA256 ebab3ebdf38b1a4cb01381f20ef6d5e70ef860f720010af41adc6c5030d62a5c SHA512 7fe1d0c89ab68ec44c46c89664769a1a505dd0cdedb915b363d39fc1e68257543dc68a100a02a3ba6c7290c9d4d1b52ff39740e5292cc8b93f37f744fa6fc1ad WHIRLPOOL 41d49f23e043bbb29b64f6fb01c4ddc84901406c60e1c52f2a512efee83f02315ae89e564255850d25b04c038a413f9c4aa8eb0dde0ecba931d287ff5e67c60c
diff --git a/dev-python/starcluster/files/starcluster-0.93.3-requires.patch b/dev-python/starcluster/files/starcluster-0.93.3-requires.patch
new file mode 100644
index 000000000000..fb3f284ecb7a
--- /dev/null
+++ b/dev-python/starcluster/files/starcluster-0.93.3-requires.patch
@@ -0,0 +1,19 @@
+Patch by JT Riley, Bug #437912
+diff --git a/setup.py b/setup.py
+index 241b7ce..3c52c68 100644
+--- a/setup.py
++++ b/setup.py
+@@ -12,9 +12,9 @@ try:
+     console_scripts = ['starcluster = starcluster.cli:main']
+     extra = dict(test_suite="starcluster.tests",
+                  tests_require="nose",
+-                 install_requires=["ssh==1.7.13", "boto==2.3.0",
+-                                   "workerpool==0.9.2", "Jinja2==2.6",
+-                                   "decorator==3.3.1", "pyasn1==0.0.13b"],
++                 install_requires=["ssh>=1.7.13", "boto>=2.3.0",
++                                   "workerpool>=0.9.2", "Jinja2>=2.6",
++                                   "decorator>=3.3.1", "pyasn1>=0.0.13b"],
+                  include_package_data=True,
+                  entry_points=dict(console_scripts=console_scripts),
+                  zip_safe=False)
+
diff --git a/dev-python/starcluster/metadata.xml b/dev-python/starcluster/metadata.xml
new file mode 100644
index 000000000000..7c2b58b443a8
--- /dev/null
+++ b/dev-python/starcluster/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <use>
+    <flag name="epydoc">Enable build of apidocs in html using epydoc</flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">StarCluster</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/starcluster/starcluster-0.93.3-r2.ebuild b/dev-python/starcluster/starcluster-0.93.3-r2.ebuild
new file mode 100644
index 000000000000..a3c1657337fa
--- /dev/null
+++ b/dev-python/starcluster/starcluster-0.93.3-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 bash-completion-r1
+MY_PN=StarCluster
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Utility for creating / managing general purpose computing clusters"
+HOMEPAGE="http://web.mit.edu/star/cluster"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="doc epydoc"
+
+RDEPEND=">=dev-python/ssh-1.7.13[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.6-r1[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.1.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.0.13_beta[${PYTHON_USEDEP}]
+	>=dev-python/workerpool-0.9.2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/epydoc[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-requires.patch )
+
+python_compile_all() {
+	use doc && emake -C docs/sphinx html
+	mkdocs() {
+		local exit_status=0
+		local msg="build with epydoc failed"
+		pushd docs/epydoc/
+		PATH=$PATH:./ PYTHONPATH="${BUILD_DIR}/lib" ./build.sh || exit_status=1
+		[[ $exit_status != 0 ]] && eerror "$msg"
+		popd sets
+		return $exit_status
+	}
+	use epydoc && mkdocs
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newbashcomp "${S}"/completion/${PN}-completion.sh ${PN}
+	use doc && dohtml -r docs/sphinx/_build/html/
+	if use epydoc; then
+		docompress -x usr/share/doc/${PF}/apidocs/api-objects.txt
+		insinto usr/share/doc/${PF}/
+		doins -r "${S}"/docs/apidocs/
+	fi
+}
+
+python_test() {
+	nosetests || die -v ${PN}/tests || die
+}
diff --git a/dev-python/statistics/Manifest b/dev-python/statistics/Manifest
new file mode 100644
index 000000000000..31f3eaa121bd
--- /dev/null
+++ b/dev-python/statistics/Manifest
@@ -0,0 +1,4 @@
+DIST statistics-1.0.3.5.tar.gz 8303 SHA256 2dc379b80b07bf2ddd5488cad06b2b9531da4dd31edb04dc9ec0dc226486c138 SHA512 1d7fd2304a885dbd9ebc564323349f9c5ad1ea1ecea8182b52a1f42308963bd49f07c9dc9f0b87a35d2f6ed3c37429dbc38183c0b1bd65a527558e4504a9a3a0 WHIRLPOOL ce4b7309119da0eaa2a01678ce2b7e048fc895b82d31ec12e4b28371fa6c5e928537433d05afddc10a9f01434ba5be072bb52bd70fe7f724f12c55c25d85f852
+EBUILD statistics-1.0.3.5.ebuild 543 SHA256 71c4a03518b7579e1f1d9030ebd3a669b3108080cbf77091d3ca485ad0eabd5f SHA512 1cc0eafa7bb5b0c2896e2b6257b53b889eb004a07023e9ddd0181312cdd6031dcbaef954012fe5c43d9a905728a3942d5546113a8a28da4a39299254e249b0ea WHIRLPOOL 5e22a93bf49372c7024babb32cd8cb4d511e27ef94bbb5983ff0572c0c2214c276556d221b15fa1b2d946c6c34660824174169fe40c5800cd389d3fcc08d4329
+MISC ChangeLog 1586 SHA256 f93e33e01d6935d9be70478e84742f2e5308124102fc73e3d639ce7028866a82 SHA512 3845056140804236fd1830ce7e9479247278b6db0b55db918510b7384da06e8a21ac3700c94502807a93c2fab0b6c2d8016b2f8a3cc3b8c2ef1ef26d87481e80 WHIRLPOOL 5fa99eceaad26fbcd00e5d8bd5da31b06c9acfe6a2e658fc2f6c74fcea3700109f52c56c0c259852039b8f45cbef8991c5594ee0390197f5d6c83680e23171ab
+MISC metadata.xml 527 SHA256 e2a7e6583eea50055e58ff184833f98032cff6be99d16860d9a9d02932817e79 SHA512 a8a996bf135883825f9857cbb3a8608a1f340bdb32393b7438fa863c617fea26ce0ef05e2985b2bd763a73aaed9a7c565a7b789e98bdc231831b1b315fca0251 WHIRLPOOL ec6fb3f2280cddeabcdbe35a6be06c1409e9cfa87ced6321c3abe219563b722b11e0c4728902e5a4f18b2d1e90d8c2541bad2ac32b114a2c32faf9f87ea3ce67
diff --git a/dev-python/statistics/metadata.xml b/dev-python/statistics/metadata.xml
new file mode 100644
index 000000000000..41bf24bdbdc8
--- /dev/null
+++ b/dev-python/statistics/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">statistics</remote-id>
+    <maintainer status="unknown">
+      <email>stefano@digitalemagine.com</email>
+      <name>Stefano Crosta</name>
+    </maintainer>
+    <remote-id type="github">digitalemagine/py-statistics</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/statistics/statistics-1.0.3.5.ebuild b/dev-python/statistics/statistics-1.0.3.5.ebuild
new file mode 100644
index 000000000000..059465ec6f49
--- /dev/null
+++ b/dev-python/statistics/statistics-1.0.3.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python 2.* port of 3.4 Statistics Module"
+HOMEPAGE="https://github.com/digitalemagine/py-statistics http://pypi.python.org/pypi/statistics"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/statsd/Manifest b/dev-python/statsd/Manifest
new file mode 100644
index 000000000000..8278d7c21ce0
--- /dev/null
+++ b/dev-python/statsd/Manifest
@@ -0,0 +1,4 @@
+DIST statsd-3.2.1.tar.gz 166047 SHA256 3fa92bf0192af926f7a0d9be031fe3fd0fbaa1992d42cf2f07e68f76ac18288e SHA512 c5166fabcef2158aeb29b07b9bd1d241bc30847eb0e2c7694ee097b3a262e2590189ee10daecb368807002bd96fed16e749ca744b51b5e946d48fe2931a0d8e8 WHIRLPOOL 1ae98a9c16fdb7a1be8135c232c99d771e292dab7d87c12e6a989c18dad1c600c4ac2bb186a96dcdce49812fc26c30925ca30be3c2e85cb736797cb1c35c6571
+EBUILD statsd-3.2.1.ebuild 615 SHA256 a30d026faee78dc7198cb030c54a357403cc00dccbad83e9b13fde28677033bb SHA512 bb96978041f8e9f2f90ced6201be13602258337725a1f2e9c9e57011efe7e6b8ab3a20232db2d3a6d45d69be6d6f571379fdd5cd764daa359a085942a72423fc WHIRLPOOL 27082d209321e6a9197b1d97f995556e6fc962e312a6f034c507f4862ceb24af1f192afad0b0475b1cb5d0f16d369d64d314a0a119e7106838aa474ff596f33b
+MISC ChangeLog 500 SHA256 de29abdb8e4e3892fd2de63cf49bbead88973d5f1facc0035554c9c3638aa159 SHA512 9a299ba16ded086a4ff5f02dbe86f536d9aaba16fce978a13d7aa1a35d565632f0a29e01cecca1582dab613968614cc5ca28f37f13cdd9edc85f6e686334b7d5 WHIRLPOOL c33fe3506fc65c82b9049155287fe40d4b967a1f9810b612031efa9bec85cb0d9779abcc2648ae985ac7aae1fae926d06bdcd7b5e71cd5a14b787104fc18cc7c
+MISC metadata.xml 498 SHA256 0b920a1fd7336e3fa1d4ddc8d02cd99e38763f6c1201eb8a8067558282a5600f SHA512 02243a16aaec81a9d06a08f0ff1c741d5bcf6f9d8fbf3c2037b03c1752112257c9c357720957871e25f963e84c93121fe4a5ddb69208bcfb2c29937ec7743ebd WHIRLPOOL eef6524cc12d1d668c2d0e75e6cd9bf16d6729cc964f47b2a0e46244bec553883f9950bd8894e6a96c360a2fd99ba446d2016551716afe43a0034256a9c4882f
diff --git a/dev-python/statsd/metadata.xml b/dev-python/statsd/metadata.xml
new file mode 100644
index 000000000000..548cee11e68a
--- /dev/null
+++ b/dev-python/statsd/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">statsd</remote-id>
+    <maintainer status="unknown">
+      <email>james@mozilla.com</email>
+      <name>James Socol</name>
+    </maintainer>
+    <remote-id type="github">jsocol/pystatsd</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/statsd/statsd-3.2.1.ebuild b/dev-python/statsd/statsd-3.2.1.ebuild
new file mode 100644
index 000000000000..5f8b41b4cc99
--- /dev/null
+++ b/dev-python/statsd/statsd-3.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple statsd client"
+HOMEPAGE="https://github.com/jsocol/pystatsd http://pypi.python.org/pypi/statsd"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
new file mode 100644
index 000000000000..5aea0bd36a1e
--- /dev/null
+++ b/dev-python/statsmodels/Manifest
@@ -0,0 +1,9 @@
+AUX statsmodels-0.6.1-numpy-1.10.patch 910 SHA256 0b374a7f02a86b720481412ff717b39c3d9112a1c5a4f02e222ffff45e0b8434 SHA512 deffc2539641a91e728f3b8b5e4d6d98efe2b874491aca360ca945d8dc6774bf14b3e14796e1440728a8faad4472c846c69d4278301e37a29689adbab1e74c63 WHIRLPOOL 5f1db1b15a289c78e709861d67610acf980ddfcc24bb8b5854e8fc9d219fb6140433de4bb30e679dd1eaab01ea7f5b5ba091cf56bf6af6237ab052b78c3a5f23
+AUX statsmodels-0.6.1-pandas-0.17.0.patch 1043 SHA256 de6ff7e54e51cdc05203727014208c4c18dd6535b1d702a242f655df7b296e02 SHA512 0a4394d672105337fd03d435a402dbd31862a39b8010658f859114ed9694de9be4d6c3d641b5f385986a6651f0434a3602659d7192bf99f749e49f33f53a634b WHIRLPOOL 8181317a6ae3cbefccfac4ac4fb0ef75c1c54c199e4a1d96e6c924a9ed89642ed6514f345787a29c9800a069e7821df3a8150a5df59712422068980389503042
+DIST statsmodels-0.6.1.tar.gz 6980841 SHA256 be4e44374aec9e848b73e5a230dee190ac0c4519e1d40f69a5813190b13ec676 SHA512 9047b8cf4b9d19bd697867cecef1c4608fd86f3d16e67e44d8c152e1e25918f5aff6b4843c58395e71614be401551e3e48d4dcf158480cbdb45d9735b1c5ea77 WHIRLPOOL b14c7f5b734b26190f23edbf4020ace135571d4c0fa45e3e174647879d4c6547273abbab6c8911c346bf85b433a1908bd230fa52a1e09ede0e74c5e5167a8ecf
+DIST statsmodels-0.8.0.tar.gz 9464851 SHA256 26431ab706fbae896db7870a0892743bfbb9f5c83231644692166a31d2d86048 SHA512 32bb7f36acc16796c445e5f695d958af4525fbbb2d374376fb4a73c972e3796fad05532456cef4aa5ee59d6fce11921174e17bbfc2e05d2488ce1ceac5175239 WHIRLPOOL 92dd92c9c5af6c73d90d2122e17306431be0263ae719db393400e5553ab4cbf3003603d0979b1528fd90bc1f5063d13d6778832f45f74e43ec70c829a684fedd
+EBUILD statsmodels-0.6.1.ebuild 1780 SHA256 cbd128de35ec470f5f13aae9ef1894c328bd0b5c001c130d9fb35646a45b2de6 SHA512 dde6908cb7d8d70721e022aeca4ad460c2dfc03426a407f3daebc327f1d89591a570a360e56a3c0d2227bae51e9bc1b7209e1790a4ee2543f5c9c49f199b4a27 WHIRLPOOL 20ad81579456bb61772321242dd2904ff7d1ee4a1bb8f6ef6ea259ac79c41ffe36088e7fa9f9195ec79e067fa976fe0e16ab712e052672e9adde12eeea04b0e3
+EBUILD statsmodels-0.8.0.ebuild 1936 SHA256 9ad93dfdad9fec467b66fd585f598ae4e86fdf28d5524a5ec2fe7b207f792064 SHA512 46af987b7bfd458272f5831b7ba1f58978f309dacbd3d36b41f770c5fff56dd17d73babf3e2544d1aebb7cb30cef63c54ddc5b291ccd9af9c8e94ffd24bc0a27 WHIRLPOOL 0eb1d23b41fbcf72a106e8688e1047eef5f83f92d956c1b7ce6963ce2da7a9609934ee2e610def7622aba04476031fa2c0a64b783caf852ca69662114d9b92b4
+MISC ChangeLog 3157 SHA256 c14c18362907bda074595c973e7f06ac03f4a8dc04bdb7dc080b1588595038a4 SHA512 e162f1a186b7ab39c58e0c2bb0dc7b449bd6fec6b1203ef390f71c24c2543e2fa7ba3a719e30cdd7e6469aae97143984e6747e6d1b98fae68011fba51a7e1948 WHIRLPOOL b0a26f2d26f580c25f4510efff9f5b530d6946e68fb5f16aeacc329e21a7755b95c8db3908620d4e237be00599fafb53a8841b83dbad06985cf1c68f05161da3
+MISC ChangeLog-2015 1552 SHA256 dde34613ad0a8077515a5136c091a6520c145ca523b4e5073fa76de43e66f286 SHA512 9be2c29acfe40d7de0c9b7aa93d535ad408eed4c098c20f9426aa9019b3a88679e44b13ff862a74e6fd0e82fb46a725f41632ab74ad7db81803cf99109eb2946 WHIRLPOOL cd9de6d82f6ce0742c64075210c7004f083920d79bb6e3867a5ee17155ff0fa3903a25a2a8e7f3d4d1e5fb6885f67e5bc226f8939f8020dd425bdda9ba9edd3b
+MISC metadata.xml 1075 SHA256 92d0b6c361ce278a04d30b5d746233211b38d41d12f6f210f06418da6c0aef18 SHA512 7e9c385a1820da33e55db49d582d750f01fd11c0dd1616470f2cd71f12c673010cf76c8af984472daa8787704d353f2d42f60798e419d182c9e24ba4dd7dd97f WHIRLPOOL 700dc3488cb824265ed6b92f8083acf9bf544f0b4a1c1405103f82651fac7f264bcf4ffb49397e465c2aa9c0c82483ad43e71e5458cd17c2b330326d13e17ab5
diff --git a/dev-python/statsmodels/files/statsmodels-0.6.1-numpy-1.10.patch b/dev-python/statsmodels/files/statsmodels-0.6.1-numpy-1.10.patch
new file mode 100644
index 000000000000..2d9720c5fec6
--- /dev/null
+++ b/dev-python/statsmodels/files/statsmodels-0.6.1-numpy-1.10.patch
@@ -0,0 +1,20 @@
+ statsmodels/tsa/ar_model.py | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/statsmodels/tsa/ar_model.py b/statsmodels/tsa/ar_model.py
+index f0af7ee..fe05634 100644
+--- a/statsmodels/tsa/ar_model.py
++++ b/statsmodels/tsa/ar_model.py
+@@ -256,10 +256,8 @@ class AR(tsbase.TimeSeriesModel):
+ 
+         Vpinv = np.zeros((p, p), dtype=params.dtype)
+         for i in range(1, p1):
+-            Vpinv[i-1, i-1:] = np.correlate(params0, params0[:i],
+-                                            old_behavior=False)[:-1]
+-            Vpinv[i-1, i-1:] -= np.correlate(params0[-i:], params0,
+-                                             old_behavior=False)[:-1]
++            Vpinv[i-1, i-1:] = np.correlate(params0, params0[:i])[:-1]
++            Vpinv[i-1, i-1:] -= np.correlate(params0[-i:], params0)[:-1]
+ 
+         Vpinv = Vpinv + Vpinv.T - np.diag(Vpinv.diagonal())
+         return Vpinv
diff --git a/dev-python/statsmodels/files/statsmodels-0.6.1-pandas-0.17.0.patch b/dev-python/statsmodels/files/statsmodels-0.6.1-pandas-0.17.0.patch
new file mode 100644
index 000000000000..540135c9e125
--- /dev/null
+++ b/dev-python/statsmodels/files/statsmodels-0.6.1-pandas-0.17.0.patch
@@ -0,0 +1,30 @@
+ setup.py                     | 2 +-
+ statsmodels/tools/testing.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 1a7da9a..a6d1b33 100644
+--- a/setup.py
++++ b/setup.py
+@@ -134,7 +134,7 @@ def check_dependency_versions(min_versions):
+                               (spversion, min_versions['scipy']))
+ 
+     try:
+-        from pandas.version import short_version as pversion
++        from pandas import __version__ as pversion
+     except ImportError:
+         install_requires.append('pandas')
+     else:
+diff --git a/statsmodels/tools/testing.py b/statsmodels/tools/testing.py
+index 1fde1de..92e77fc 100644
+--- a/statsmodels/tools/testing.py
++++ b/statsmodels/tools/testing.py
+@@ -17,7 +17,7 @@ def strip_rc(version):
+ def is_pandas_min_version(min_version):
+     '''check whether pandas is at least min_version
+     '''
+-    from pandas.version import short_version as pversion
++    from pandas import __version__ as pversion
+     return StrictVersion(strip_rc(pversion)) >= min_version
+ 
+ 
diff --git a/dev-python/statsmodels/metadata.xml b/dev-python/statsmodels/metadata.xml
new file mode 100644
index 000000000000..cb9b89704bd8
--- /dev/null
+++ b/dev-python/statsmodels/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    statsmodels is a Python module that allows users to explore data,
+    estimate statistical models, and perform statistical tests. An
+    extensive list of descriptive statistics, statistical tests,
+    plotting functions, and result statistics are available for
+    different types of data and each estimator. Researchers across
+    fields may find that statsmodels fully meets their needs for
+    statistical computing and data analysis in Python.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">statsmodels</remote-id>
+    <remote-id type="github">statsmodels</remote-id>
+    <remote-id type="sourceforge">statsmodels</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/statsmodels/statsmodels-0.6.1.ebuild b/dev-python/statsmodels/statsmodels-0.6.1.ebuild
new file mode 100644
index 000000000000..30bc2b7ef2c7
--- /dev/null
+++ b/dev-python/statsmodels/statsmodels-0.6.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Statistical computations and models for use with SciPy"
+HOMEPAGE="http://statsmodels.sourceforge.net/"
+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"
+
+CDEPEND="
+	>=dev-python/numpy-1.5.1[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/patsy-0.3.0[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.9.0[${PYTHON_USEDEP}]
+	"
+RDEPEND="${CDEPEND}
+	examples? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
+DEPEND="${CDEPEND}
+	>=dev-python/cython-0.20.1[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/matplotlib-1.1[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		)
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pandas-0.17.0.patch
+	"${FILESDIR}"/${P}-numpy-1.10.patch
+)
+
+pkg_setup() {
+	export MPLCONFIGDIR="${T}" HOME="${T}"
+}
+
+python_compile_all() {
+	if use doc; then
+		VARTEXFONTS="${T}"/fonts ${EPYTHON} setup.py build_sphinx || die
+	fi
+}
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	VIRTUALX_COMMAND="nosetests"
+	virtualmake --verbosity=3
+}
+
+python_install() {
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	find "${S}" -name \*LICENSE.txt -delete
+	use doc && HTML_DOCS=( build/sphinx/html/* )
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "plotting functionality" ">=dev-python/matplotlib-1.1"
+}
diff --git a/dev-python/statsmodels/statsmodels-0.8.0.ebuild b/dev-python/statsmodels/statsmodels-0.8.0.ebuild
new file mode 100644
index 000000000000..f97c490c2a60
--- /dev/null
+++ b/dev-python/statsmodels/statsmodels-0.8.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Statistical computations and models for use with SciPy"
+HOMEPAGE="http://www.statsmodels.org/"
+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"
+
+CDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/patsy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+RDEPEND="${CDEPEND}
+	examples? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+"
+DEPEND="${CDEPEND}
+	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/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}"
+	export HOME="${T}"
+	echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die
+	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
+	virtx nosetests -v || die
+}
+
+python_install_all() {
+	find "${S}" -name \*LICENSE.txt -delete
+	use doc && HTML_DOCS=( docs/build/html/* )
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Plotting functionality" "dev-python/matplotlib"
+}
diff --git a/dev-python/steadymark/Manifest b/dev-python/steadymark/Manifest
new file mode 100644
index 000000000000..d2b4c8f6f338
--- /dev/null
+++ b/dev-python/steadymark/Manifest
@@ -0,0 +1,5 @@
+DIST steadymark-0.5.3.tar.gz 8180 SHA256 1e38274f27516fe337279b41049603e18aa3383980dc2665b836e3e0461b7cae SHA512 c30971675216f2afcb9f59fba5239fd6f37bc0d570b1ab34820f2fb83388330886a53ff3a31bf96e07b455ccfa8df3fda5bcd3d2212360419ec2b7290d1ddbaa WHIRLPOOL 0b48afe16589aeecec5a4622a6e89f47560d4c989b326edf8803549fc86f42cd320e7b01d6682633999ca429ac5b657e22218f316a3fc52a9f567fd0285f70b9
+EBUILD steadymark-0.5.3.ebuild 476 SHA256 2fcfec09672066e617a8d0f2c7f4d0ff45ab44b9198bfbb5ff930d774dd71da8 SHA512 fca58d69bb0e3004d49d35e4dbd4e2ce223ef8ed4d63789114fb3b9f8af9a4dc9252d9c35bbba6a397c189ce1c9659a42ed1c160e30d65fe8da3f3fae8ad7ba9 WHIRLPOOL a1043ceab3bf8e0d22106e7ab85f1b1432d52af9d543215dfcefbfbd182b8459aca6eba070e1eb16249ee853a6db6797c287814b123ac8bf0547d4c12ebb51f8
+MISC ChangeLog 2584 SHA256 21cebf414769a8d540fdd57ad77067d073f9634c5114aba80918bfcea5f8d22c SHA512 35d8556373b4534c71b39b0fe050e777aa15c33302b92a677ede55b6c6efcc123072c959b1e05afa1fb7763c83859cc833039380db0c5e50302befee588bfeb4 WHIRLPOOL 559ac1bae0441216226572eb5f4fde9c66acfd49773d1f6c828d7db5203d2f31fe5f72e082eb14ce8d9f550d5518e56a84fcde44f0913c8bd3c0317dc596e4ea
+MISC ChangeLog-2015 690 SHA256 b45875668cee44327e7d066482d56d32c2f8349af412d32f702930a2d7865bd0 SHA512 08a8bdae113f1e3f7dedaa645d496a95993a94a9e6466851fc049fd8bfe8451ed80a19ea79551cbd3dba3633b65efe3fe85f8749d647dd32385ab38e3df713c9 WHIRLPOOL 34bf9d1ec2972b3fb6e3ae09c833d127c464ad7d2175cdba5ff906836d843fd44387e4ad90bb85d2825310f1dca4c1511ac53d49df573e38ebe42bdf23f2797d
+MISC metadata.xml 395 SHA256 cb86449230ff3dd6d8b1965c340bc496ac14bd02b2f7f2717a4e814d726ba72e SHA512 8f256e4d6dc743b0857228749adfa8fabc7cc103e883838d673a2104e1a24977481062a874243d3260a013b7c60a50246ff50a57ba81a4b1753e4b528fb5b744 WHIRLPOOL 6276d8abb758e52f69191da22873d999655fafd9c878f7baa195f2b30813450e4e9cb3485eef751c2df1cd9824ef30980e453ff47624a273069f1292906c33fc
diff --git a/dev-python/steadymark/metadata.xml b/dev-python/steadymark/metadata.xml
new file mode 100644
index 000000000000..ce982d426fa8
--- /dev/null
+++ b/dev-python/steadymark/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="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">steadymark</remote-id>
+    <remote-id type="github">gabrielfalcao/steadymark</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/steadymark/steadymark-0.5.3.ebuild b/dev-python/steadymark/steadymark-0.5.3.ebuild
new file mode 100644
index 000000000000..da87828d93d3
--- /dev/null
+++ b/dev-python/steadymark/steadymark-0.5.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Markdown-based test runner for python"
+HOMEPAGE="https://github.com/gabrielfalcao/steadymark"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/misaka[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
new file mode 100644
index 000000000000..07baaf1316db
--- /dev/null
+++ b/dev-python/stevedore/Manifest
@@ -0,0 +1,7 @@
+DIST stevedore-1.20.1.tar.gz 505908 SHA256 046200a915780b58bf1c84436e86701b741d664893aefa84d8aceadd15ed4734 SHA512 7518fb4cac2ea15867a616373521169fd114152ae7e657deb26dbcf874f2442336824ded480973b4334e9b56c349abd165aab7779defc219f57d7ba7f670048c WHIRLPOOL e67a89733def07e8425750d9bc742388de83f8cb13d95dd0001fba4136449e74c465b847a7218df423633d311f0af0003eda8087eb0a4e071ab4d2e78949fca7
+DIST stevedore-1.25.0.tar.gz 505985 SHA256 c8a373b90487b7a1b52ebaa3ca5059315bf68d9ebe15b2203c2fa675bd7e1e7e SHA512 d0e01312e75f7166c49bc4b57f5ea54492f6bbb0dbb02ae8cd50ce4e4ba4e71db936715f3076c49e554d9f6cc87a5b0166a1814072c56d69950fb9b6cbecf05c WHIRLPOOL 62454f1b1d349f30d0ce5a0324261e42497a821803491c082b1c4ed4266cdd151b11e0584f1add4e7dd4b50ab83f3991beacc03393d5e7ffa4ea303ae760b869
+EBUILD stevedore-1.20.1.ebuild 1596 SHA256 1c7b5bfad309b2788801d6dbdaed8fa3fe02dc5a570da0503d0835415f5ba516 SHA512 a29892736b4c95e13daf3e021d51dd2ddcffcc2717d15d02d5740f4d3d4ccb2d5be7e76557b560627e1b3b4755ec329ef262fc2b2b75d4b35bb9551541659d43 WHIRLPOOL 1205d407dfd62273dfc228284472c9d5ab375ed5b6f61c823e76c0662e009811d16ea4f21741c543e6ecbc0a945116954fa77cbd7cf780e66a03c349ba9dd296
+EBUILD stevedore-1.25.0.ebuild 1639 SHA256 d37fe37fa2f525ec1a53c8b7498e988ae61f8685aafe619bc3215ede58de639a SHA512 569951c819fdad8d551e1fe17e6167a865af84e3ac6bb07b992adeb4b64254702a9d71af12dc1adbe99b36bb1eb74bcf0fb834e0e4b01976fc4319c12f16443b WHIRLPOOL 49d1d66514fe5b2d4d26c37cbe7758ec66837f09432009fd7c44e022a7c2b68a4ba17beff070c27dd68d8390eb5fd065ed025c52ff33aaca731cd7ddfd9fb078
+MISC ChangeLog 4620 SHA256 8273f7644f17cf660a17dce59b47b18b0522375cb1eec9b118b7c68b5e034762 SHA512 21b88f8d5741067130f3e74001f294a2ef3162057496c07448e4c7312f38b5b0d01eae087b6e1a4c1e59b75860c750d1905f2bec1df81c1036903495a4927359 WHIRLPOOL 7bdc80ba1374a094e5bb72d151bc4206205c091c13e625d41cfb220b8f93c505fd3ed7a4de8a98f8b7daee76a67ba20e0a788b0d48cfcff1269a0d1741215e65
+MISC ChangeLog-2015 5460 SHA256 4c96f4c380b45b497c99a730881ae1b0974749254a9a5781d32fd2bceb3283ba SHA512 c1b6e568563daf00694021369d0c928afa1077953e7e2002acbf68ba24365b57e6f10cae2e7396b1a0a54d568fc1f4d7c21678307c4b4f14b096d2680f54d3cd WHIRLPOOL 87ee236eb455d8987533cf2c05d0fcb09f7527eb6c8ab2c4792f276b277b5a17c6c54f012857a6e1419d148b05737b7e7305b406be69ecdf7e26120aa0f06225
+MISC metadata.xml 496 SHA256 0d39615641c99c1b8347dba53d0f3657eb3e1f24326120a2d4ec1bdd04a77a57 SHA512 569ee9efc45e2445b71ffe7201ea92a7bdae048de528664d2a908b94c3fb23f6632e2457623c5b0d961dcf7aac2d96c6385d225628a3c5234363159f56961f00 WHIRLPOOL 487aea0ac5bb7ceab77f504aa337e8f78902834a2593c5582bc775f23560cc7fd9be3075d6b0b295575ce8e91c331b6c8b81cb851892261e6303f71420b0e30b
diff --git a/dev-python/stevedore/metadata.xml b/dev-python/stevedore/metadata.xml
new file mode 100644
index 000000000000..830af2ad2c64
--- /dev/null
+++ b/dev-python/stevedore/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">stevedore</remote-id>
+    <remote-id type="github">openstack/stevedore</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/stevedore/stevedore-1.20.1.ebuild b/dev-python/stevedore/stevedore-1.20.1.ebuild
new file mode 100644
index 000000000000..f1c2d7db1060
--- /dev/null
+++ b/dev-python/stevedore/stevedore-1.20.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage dynamic plugins for Python applications"
+HOMEPAGE="https://github.com/openstack/stevedore https://pypi.python.org/pypi/stevedore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/pillow-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# Delete spurious data in requirements.txt
+	sed -e '/^pbr/d' -i requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	nosetests --verbosity=3 stevedore || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/stevedore/stevedore-1.25.0.ebuild b/dev-python/stevedore/stevedore-1.25.0.ebuild
new file mode 100644
index 000000000000..6b0288917a58
--- /dev/null
+++ b/dev-python/stevedore/stevedore-1.25.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage dynamic plugins for Python applications"
+HOMEPAGE="https://github.com/openstack/stevedore https://pypi.python.org/pypi/stevedore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/pillow-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# Delete spurious data in requirements.txt
+	sed -e '/^pbr/d' -i requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	nosetests --verbosity=3 stevedore || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/stomper/Manifest b/dev-python/stomper/Manifest
new file mode 100644
index 000000000000..50684e8b3f2a
--- /dev/null
+++ b/dev-python/stomper/Manifest
@@ -0,0 +1,5 @@
+DIST stomper-0.3.0.tar.gz 21051 SHA256 ceaacc016c0e8e98c3d3155f22069d18d403637d57492d9cf678813e27c9ecb0 SHA512 ba6feef44bb33a9b63f789043b131a314b903fda847dbb3ad909614a2a6b2b39f2d98dcd5bf19b070f4de9cec9dbce9cd79eb135911f16c1e8dc6d5f52158516 WHIRLPOOL 002bc793f6451ebcea03a1345930ba72df4e34aab288031371ba708daf06e58cb556c333f8c4fc640d129c2754171106679c28f983ceada4c5159208b6c895ff
+EBUILD stomper-0.3.0.ebuild 760 SHA256 6e2a793023b1175cf2e7e81ef73eb7242815a8ae45966650c07558dcc2fbc672 SHA512 e8e0b0b048d2da47d6f15d9cc51a6965c816898a482646d952050ccb215b96808648065ef92406d98dbe6e3fd8925ff3318db8a938eb25bcb6af7d138c8fbb96 WHIRLPOOL 0d49f1dbabc3325b89945521910541080be43bc72bf927703f9f5d396bf0c6a44658da632dba31e25663249b3d08c5d4f8ac9a1a727c0cec3a460057d7fe7f6d
+MISC ChangeLog 2572 SHA256 6fce445d81969da294a112ccaaa88240338d338c5133c16ff5ec2aa1f10156b4 SHA512 a03484883a2b54cd07e89bbd333c4bb822e44547939351014285c5e4c2b79a83c5e542ba89fb63df9e6ab711ab648310c49b5cd35654b55907da2bab214268a1 WHIRLPOOL ee339cf4e07eed07f20be3b440ce81763af858e180604e1ec9b5a83a90b18920fe4af273a13a9da17ba4459ec32b3852e1deb9bf8c885c0808aacb038a2fb106
+MISC ChangeLog-2015 3224 SHA256 f730d967d6d0595e77215ea561e631d1c9bd350e1d31fddc1163f1168f7c57bc SHA512 78ef0283f3169a29b916052b04d79c4e9eefbaa517c6964077b027713fd55b8559549d8b7881c3b9e7ef18c6725ef1647453592aa28bb05d45abdb9e57d9466a WHIRLPOOL 5f66b54499ee6a10ef763dd8c0f6218a584c1ceff23b4456e44d4a6d8f36160f26ea872ac7b841e5aa83fda809c55719a44a48cbccdda8d7ef5fd3b4c51c47f9
+MISC metadata.xml 310 SHA256 7d6c468d7b8e180d274f589f91b923e8f9ec4fae5ef7b030ffa52d6fa52484e6 SHA512 9362afa04362bb46d638abdbba185063f8620836c458f18901bdb5fb6333b6a46ff873f9593cafe9e9149c35372fafe432121ecabc249400f11979bc6e66e5d2 WHIRLPOOL 30ea6eb26c9a156c4137bc5d869c25188d768643d0f474e9361be49efe3fc0e559773496244d5c0ec54e00e163fbece70c315669591500c25b5bb8e710245c38
diff --git a/dev-python/stomper/metadata.xml b/dev-python/stomper/metadata.xml
new file mode 100644
index 000000000000..171eb326de15
--- /dev/null
+++ b/dev-python/stomper/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">stomper</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/stomper/stomper-0.3.0.ebuild b/dev-python/stomper/stomper-0.3.0.ebuild
new file mode 100644
index 000000000000..f05a394683d1
--- /dev/null
+++ b/dev-python/stomper/stomper-0.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+# Supports only py2 pypy
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Transport neutral client implementation of the STOMP protocol"
+HOMEPAGE="https://pypi.python.org/pypi/stomper"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_prepare_all() {
+	mv lib/${PN}/examples . || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/storm/Manifest b/dev-python/storm/Manifest
new file mode 100644
index 000000000000..f273d135937c
--- /dev/null
+++ b/dev-python/storm/Manifest
@@ -0,0 +1,5 @@
+DIST storm-0.20.tar.bz2 213069 SHA256 1fe016c9ec40520eafc3cf359f1ec2b7fa86be91e45c9279bfb0ea3b06390a82 SHA512 7a22c6a6fa45f7bbeeb5c6f934d6f889a6d90d78a6d3e3b9c6a6825485ec35301f573d08c619693a2587e795582db633254631c0be7cd8f1fee6b03a88378a8d WHIRLPOOL e18fb39e127eedd0f7691fc9b3c043b79da02beaab8088dc1f461cfdd23c91034ae6dbf3450a778ea2e06b93239463d5813015f5b6b6901f775da38b4188d2b1
+EBUILD storm-0.20-r1.ebuild 1952 SHA256 c20326a43880d92e0f43e77bc02031b5c43a3aa19046fa8cce94bc5a5338cad6 SHA512 f779ff7d9ed2be0500e3ef3433ab82c24078b7c05040aa412b4f52b20e734df4baa8926cba0b777762ea466f5f3340333fc4cb5e16675e8a9235018bdce4ddac WHIRLPOOL 0c81e905d8d6ad8f10e1817e6fbcfbac1f3ab055a660d38331ae5908bf03132c3cdb619de5f21713ce276e388b8a44e8fe7a921592dcfd1bfb2b88321029277a
+MISC ChangeLog 2922 SHA256 b69e25ecd7d8c9736ea9d1ade81705378b76f29bf50424e9402a2c900c439ac0 SHA512 0f7c9320d2cc11cf123e065ba530171b3a4b7cea9fdb909fc5eb740d64841c33bc715f48608873a5db8d981dc7c46a6dc5d1a919d09f67dfb4d01a8976215e7a WHIRLPOOL b0094d4238121dd4af6d48001f3e264c077f45b8fb27892f151c8e218c759cce4896be2a073052d77dcf58236b740c7faf8232dfdc94ca01f2ab753c73b1903f
+MISC ChangeLog-2015 3052 SHA256 a3de21a6b7b365816f26eb5e1e11e71ed2e13f58c38fba553b4372723bf0a871 SHA512 2efbb29cfa6b4a310a06d8853cae3343b710d41a9afe0879363ecd590ee68913cf2317f2f721d17aeb490fbe8fb05468967dd6cd6c6fc15cb3b199f229ef99a3 WHIRLPOOL 0192cc7742aa2562fa6b6e2190708be7cdeebb98a4af9fb2957c418c36219eb9d39d1822dc9060feb2ab927378af741e46d8a9a5a41321cf3be0901d43b681d2
+MISC metadata.xml 313 SHA256 841713c29bae7fb1fd248ba5dd9c94aad945ca94fd37c92ad54aa07cf4abb4ce SHA512 ea41959e22a82110ac4c87551d1f41b02b6f190da6ca140335c085137db32af3a56abcfb517f5086af12990a289223fd920f1ddd4a60b59d81cc3dcdee630965 WHIRLPOOL 492921c5e1f9f2ce425f29fc9dd5720bac68287ba6a23c83ac7c74def044d51517c5d88ff73b58df14b40edf414ab73931c7540e72b388db381e8e9e77fdf92c
diff --git a/dev-python/storm/metadata.xml b/dev-python/storm/metadata.xml
new file mode 100644
index 000000000000..5ff1e589f865
--- /dev/null
+++ b/dev-python/storm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">storm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/storm/storm-0.20-r1.ebuild b/dev-python/storm/storm-0.20-r1.ebuild
new file mode 100644
index 000000000000..4d02bf52610a
--- /dev/null
+++ b/dev-python/storm/storm-0.20-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="An object-relational mapper for Python developed at Canonical"
+HOMEPAGE="https://storm.canonical.com/ https://pypi.python.org/pypi/storm"
+SRC_URI="https://launchpad.net/storm/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql postgres sqlite test"
+
+RDEPEND="mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	postgres? ( =dev-python/psycopg-2*[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/fixtures[${PYTHON_USEDEP}] )"
+
+DOCS="tests/tutorial.txt"
+
+pkg_setup() {
+	append-cflags -fno-strict-aliasing
+	python-single-r1_pkg_setup
+}
+
+python_prepare_all() {
+	sed -e "s:find_packages():find_packages(exclude=['tests','tests.*']):" \
+		-i setup.py || die
+
+	# delete rogue errors in setting exceptions
+	sed -e '/module_exception is not None:/d' \
+		-e '/module_exception.__bases__ += (exception,)/d' \
+		-i storm/exceptions.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	if use mysql; then
+		elog "To run the MySQL-tests, you need:"
+		elog "  - a running mysql-server"
+		elog "  - an already existing database 'db'"
+		elog "  - a user 'user' with full permissions on that database"
+		elog "  - and an environment variable STORM_MYSQL_URI=\"mysql://user:password@host:1234/db\""
+	fi
+	if use postgres; then
+		elog "To run the PostgreSQL-tests, you need:"
+		elog "  - a running postgresql-server"
+		elog "  - an already existing database 'db'"
+		elog "  - a user 'user' with full permissions on that database"
+		elog "  - and an environment variable STORM_POSTGRES_URI=\"postgres://user:password@host:1234/db\""
+	fi
+
+	# Some tests require a server instance which is absent
+	"${PYTHON}" test --verbose || die
+}
diff --git a/dev-python/stormpath/Manifest b/dev-python/stormpath/Manifest
new file mode 100644
index 000000000000..c56da6f7825b
--- /dev/null
+++ b/dev-python/stormpath/Manifest
@@ -0,0 +1,8 @@
+DIST stormpath-2.4.2.tar.gz 4345932 SHA256 17fb42c24c39830bb39589eff757e3b5c9d09d74c88dba520fa1031b5785e3ff SHA512 0b63308f179f83e409c24dabd75b96b0384b0eae4f729c1351e16c1158a61548c218e94e6d68fab196b6166e67a9132173205d52d03af334d690315f7756efff WHIRLPOOL 536a5899ba68788cd8a4b7c1acebf5126a301e52643da3e66fa7bd26f23b38c3a58adf271db03fa1eb92332c4bac83a4cb434027684c7b46ee53c1de5d69eaca
+DIST stormpath-2.4.4.tar.gz 4347668 SHA256 6630abba74bc5de5f295b78fd1c32a60a9d1f3b09863ce4353ea568a99fc175c SHA512 41c06dc8c96f363493777e4d65a559d12af0b4fc85e5bdd1a799d7191f24d06e4c1bad5364771e5aff5788e896a4d8bc5dd9209243f558062444da5201e21747 WHIRLPOOL a9277465fb21d127c7b75f4836ee89b5c98203b68af12b46bb9cb82842a79c7f8c6fc82533b677bd2815d8e5d88007ea44dc82cc8c40af3fe2fbca5883a2cb89
+DIST stormpath-2.4.5.tar.gz 3821801 SHA256 93446387a369483d219db9a1f760743fe97c19fe09f1a1ab6c074f576ff31f22 SHA512 8bf3ad45cabd9c16a615f3303a4253d7f81bfb39a9c1542bc9662be54075f85013624e9ace7ec6ae7a81ef3ebb6864919458bbeca685879a8623ab7fb13cfbb4 WHIRLPOOL ebff05e9bc7346a034d8c3ae643fa65629e29425db7067d8a995b7b63fd8c24d3c987134a03f9bb1817c783a636fa7a5987bdf47d81f7330db0ee9704be6a062
+EBUILD stormpath-2.4.2.ebuild 1265 SHA256 61dc5ceb181e048f32b9e68bbe5f725581007d938c1f2ee470c6e9ceb223c6e8 SHA512 df4d8b66e2ccd71c9d016758544dec5edf1d39ee21d0fc2f7c1b74c2def1c9aa43737a722a47c21289b6083c5e571a35a9bb4eabc86715909a5272c7e0a3254c WHIRLPOOL 560b51103f4a99289d66a67285f1582dce7039cdeca118f344f804599341c6bc6dfd919c5492b24793e110045e64a4819dcf0fd4d00de8a70d3bbe3a127c949a
+EBUILD stormpath-2.4.4.ebuild 1250 SHA256 447d32ffd25c42b42e16b05c0807a2dad60de8978b660d46a9c1598c6e3abb37 SHA512 b4dbdf394cd54fbb23b12f0e42b8b51f0532c8c85312ab99bd62ecc4ac3153603fa5b56721aa878b78bcfe9963ec31b53b046835a6f893eba7c50afe4ca34d73 WHIRLPOOL 4464af452c534dbb4e7ee5d8bd5d514af782b084dcc09a98b358709cda82b24688dc55d50420133935a59453cd99115187136abeebbaad8cf364ab5cc26d095a
+EBUILD stormpath-2.4.5.ebuild 1254 SHA256 3e7a6a3902bfbbdeb2b603d01695cffc0815bf3c22cb6b638582df050cffcfc9 SHA512 2a8cd69cc0846e098aa41fe52855e897311d97a020ab7c799ec96a6cde1d8757c096ebc782c32f4b23cbd2aa78bc7842da8c4e6b76ec4b49e411db88f982316b WHIRLPOOL a7b36ef21214b7126b88e17a87a77c2103235a904e3033f52f3ed48323ab84dcabb4dd18ffa0cf601e6dec0413e35e4733469684726ebe6408b9d9e53a617558
+MISC ChangeLog 5502 SHA256 e57e83955a7d882f9e40c7a082274a13fdc4f1f60707fb9d2905d739d4d0f5b0 SHA512 9284ae275234101fd5255b3314e4bf84dde074c8161695a6b61c9f7d59ab9a10b43543e175be9f25519f3f562bd3896490319d789a3fcf977e3c567526476a73 WHIRLPOOL 19104b963b16a5a020f604bac2e93498bd26709bfed2929c83a16294d44141ec73ef6724221c4bfb9a78f84c1a852e81ccbecf4a836837c218ad8683d987fa00
+MISC metadata.xml 388 SHA256 d2db96222670b4851348005ed137d3da410509978de26d30d7cfd443cc6670dc SHA512 35b190cb89d3ce22ae834759aa1c90b5710d233517b4989f0e6ddb20cfe32500625ebc22759e52592e81afbaa4f40ea1f1520075c61356e22b3a12f4df72b125 WHIRLPOOL 144d0158e28381ce5d6a4309c385cdf9e4a8a8baf672a31a1b14b72a591ca6e796a6e27ec2f5a21faea3dc68d28f6fd561488922afe5408fcd2f800f43ad970d
diff --git a/dev-python/stormpath/metadata.xml b/dev-python/stormpath/metadata.xml
new file mode 100644
index 000000000000..202e1fb9e19f
--- /dev/null
+++ b/dev-python/stormpath/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">stormpath/stormpath-sdk-python</remote-id>
+		<remote-id type="pypi">stormpath</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/stormpath/stormpath-2.4.2.ebuild b/dev-python/stormpath/stormpath-2.4.2.ebuild
new file mode 100644
index 000000000000..6d6ea046e437
--- /dev/null
+++ b/dev-python/stormpath/stormpath-2.4.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Official Stormpath SDK, used to interact with the Stormpath REST API."
+HOMEPAGE="https://github.com/stormpath/stormpath-sdk-python"
+SRC_URI="https://github.com/stormpath/${PN}-sdk-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.3[${PYTHON_USEDEP}]
+	>=dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/stormpath/stormpath-2.4.4.ebuild b/dev-python/stormpath/stormpath-2.4.4.ebuild
new file mode 100644
index 000000000000..b470140f20b1
--- /dev/null
+++ b/dev-python/stormpath/stormpath-2.4.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Official Stormpath SDK, used to interact with the Stormpath REST API."
+HOMEPAGE="https://github.com/stormpath/stormpath-sdk-python"
+SRC_URI="https://github.com/stormpath/${PN}-sdk-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
+	<=dev-python/oauthlib-1.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	esetup.py docs
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/stormpath/stormpath-2.4.5.ebuild b/dev-python/stormpath/stormpath-2.4.5.ebuild
new file mode 100644
index 000000000000..506294b5f5a2
--- /dev/null
+++ b/dev-python/stormpath/stormpath-2.4.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Official Stormpath SDK, used to interact with the Stormpath REST API."
+HOMEPAGE="https://github.com/stormpath/stormpath-sdk-python"
+SRC_URI="https://github.com/stormpath/${PN}-sdk-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
+	<=dev-python/oauthlib-1.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	esetup.py docs
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/strict-rfc3339/Manifest b/dev-python/strict-rfc3339/Manifest
new file mode 100644
index 000000000000..eaa1801bde80
--- /dev/null
+++ b/dev-python/strict-rfc3339/Manifest
@@ -0,0 +1,6 @@
+DIST strict-rfc3339-0.6.tar.gz 16856 SHA256 8d505093cff2a65144eecee09a171ec3401a4d725438381c22011eceddf549df SHA512 7f1e15d60c2295c00647af84b31a1836b6c3994fadbb2695f5709861caae543ae69a3199dffd6dcf7e0768eadf39e496a5e600e291dd0befbe8fc35fa60897af WHIRLPOOL 39f6c8ba67bf84d9c208ae96c32fe25d85a8043d55474994372fe68ed0d6e7254db89df956204c606e950d9d35fd1896c18b65a81d980aafc873da010ff710e8
+DIST strict-rfc3339-0.7.tar.gz 17552 SHA256 5cad17bedfc3af57b399db0fed32771f18fc54bbd917e85546088607ac5e1277 SHA512 94a2992a9ea41b75527348f0f8dae1d118d57b0764122f874baa85f5e3b523beb219ed83c2d7224725e504cd3737a6bde485957135856dcde470f32675e44e77 WHIRLPOOL e687f876172d298eefef5e62e1d8af0241b49a2d27f6206446ac2f7d2fd87baa077080dfc3d7c4e140b320b941b348665505eda0a86be5d3512129f8a7569184
+EBUILD strict-rfc3339-0.6.ebuild 644 SHA256 aaf510b6dcc6a2695ad059fd86b0c64d1599df8a91af389aa4604f34027e79e3 SHA512 93d35abf9efc33ec00c127beceb26509cf3fa851512825df94b878ffcacc156276aaeb437452d6409678c8e31d0c935df0794048ac7a8742f3b3c2ad0eae3415 WHIRLPOOL b28f2fdd76e364ebd2763f729f74db30e1c8f54a826bd390203b6b87d2fbdfab9214ff6840436de8c9fd97cf4c6fc6b2ad8647cf7029960ccace04943325c70b
+EBUILD strict-rfc3339-0.7.ebuild 651 SHA256 d26856ebdbefe073ca20c933eb3a08844d79a6c1a7dfc151ec9c32902de3a7b5 SHA512 761e9a84774e0334a88a1e6a96a41824597c2193c0bd733aced7cb112d83d3b80062d445aa90abf786b1d7b2a497dfcef4ea9a6144e80183480b720da6533dc4 WHIRLPOOL 7209cd54000092090ddf4be6fb6861b840f44b798bff9f69b080e3779f1833b23a3bdf53f7d14f3c0f8c20d02790e1d579ab41006069c7e12f4335de39252455
+MISC ChangeLog 2986 SHA256 7ccf6f198cd87ba5fcf397c34b74657636edffe5b3954055066a15c6c41feac6 SHA512 528deefde87fd754d3efd7f4098828a14ab1851c9d9d14046bd82323be3c893c83cd8dde9d8d65561698685e41d2bb79dd30dd620ba78bbaa9778a231eeebbeb WHIRLPOOL d1da67153a31c9d562deebbb72b34bc337a01236fa61645117749ab743715b4f606e7f7125a9c67f054338aff3938f6eaa605d4efd4e050b659d7a266392195d
+MISC metadata.xml 385 SHA256 08ea4059bf09d6a39e16a3b4d83b7875bfeef5c0936f0f4f6aba9358ba4c7379 SHA512 c825fc57c6aad0acc8775432fe511055f26a7bb453628340e56c1615b777cac4ae43dafe6d648a7ded7dd4138ebccc3e5620ec9c5f947f2f491d544d2c69ccaa WHIRLPOOL 4e34c358f5fde4edf33129e8514877039c4e06078a9e77aedbaf8f94afcf3ab284e33eb99387691f2e4ed07f1feb8d6891efcad67f675312e0b5081d7a99242d
diff --git a/dev-python/strict-rfc3339/metadata.xml b/dev-python/strict-rfc3339/metadata.xml
new file mode 100644
index 000000000000..25ebfea6eda7
--- /dev/null
+++ b/dev-python/strict-rfc3339/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">strict-rfc3339</remote-id>
+		<remote-id type="github">danielrichman/strict-rfc3339</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
new file mode 100644
index 000000000000..b0dbeac0aeac
--- /dev/null
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
@@ -0,0 +1,24 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Strict, simple, lightweight RFC3339 functions"
+HOMEPAGE="https://pypi.python.org/pypi/strict-rfc3339 https://github.com/danielrichman/strict-rfc3339"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3+"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+# Not shipped
+RESTRICT=test
+
+python_test() {
+	${PYTHON} test_strict_rfc3339.py || die
+}
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
new file mode 100644
index 000000000000..e49ff748b2de
--- /dev/null
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
@@ -0,0 +1,24 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Strict, simple, lightweight RFC3339 functions"
+HOMEPAGE="https://pypi.python.org/pypi/strict-rfc3339 https://github.com/danielrichman/strict-rfc3339"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+# Not shipped
+RESTRICT=test
+
+python_test() {
+	${PYTHON} test_strict_rfc3339.py || die
+}
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
new file mode 100644
index 000000000000..eec3c62ba159
--- /dev/null
+++ b/dev-python/stripe/Manifest
@@ -0,0 +1,3 @@
+DIST stripe-1.66.0.tar.gz 191304 SHA256 d9fe9527de58ddcf05b6cfd07c444c43d53811a7fc0d58bd7a82ed4006cdbbc6 SHA512 bb98837a662f36ed4d25f45bfff6614962552abeab1240890c139333064effd911b8cb20c181f54fb540ed5315b98172aebc2785d8bc215ea61d421ad49b1ee5 WHIRLPOOL 8b8ba83a5f109f28e033d1df6157209982a33527b76cf15d7a6ad0c57b928e5778f8785be691db25c5df16b4cfe37e8676f47a270c2a8da6b09bd6da08a95af8
+EBUILD stripe-1.66.0.ebuild 600 SHA256 7cc40d3e81166b31ede7fbffa6b1496c209aeb36881f852f6515690005d9e43f SHA512 d80be59c9ce388abd60ca672a6e08e5ff25281ef1cc80aefc0b94f9a59a35d11d0ce8da0d2a6efedaa71538ed0a5540e667c44f017825f98c4aa7f1bbd424308 WHIRLPOOL 567926b6a77e2e417d9da7803d44b17312f830d66935b3794b4ef2e06c308c8b8fac5e4e2786b42e2f651ec30897fbed60aa6e5a5aa98c3e8b04b178496af658
+MISC metadata.xml 539 SHA256 3d87cd039dea943fe3e0c0eb1cc85ddebde4bee94e9e0f5cf0cbbc5d0660ae90 SHA512 f0052ba8457139d76ddce67313bc973564237b409801d3d6da181c495c2d80184076cbe36468850a1ddcd60de50327e728fc3433a8a4bfe9608713a33fdbe9c1 WHIRLPOOL 41ebfc64a5c8632aa3cb6b78e8df13fa62695a130b2188ed26427babcfb529557df7ee036c37bae94e6ea88d97d28c298816bc2af31ffba8dcd295eaab8397d0
diff --git a/dev-python/stripe/metadata.xml b/dev-python/stripe/metadata.xml
new file mode 100644
index 000000000000..00a5d2222be1
--- /dev/null
+++ b/dev-python/stripe/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>cedk@gentoo.org</email>
+		<name>Cédric Krier</name>
+	</maintainer>
+	<longdescription lang="en">
+		Official Stripe Bindings for Python
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">stripe</remote-id>
+		<remote-id type="github">stripe/stripe-python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/stripe/stripe-1.66.0.ebuild b/dev-python/stripe/stripe-1.66.0.ebuild
new file mode 100644
index 000000000000..674033205871
--- /dev/null
+++ b/dev-python/stripe/stripe-1.66.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Stripe python bindings"
+HOMEPAGE="https://github.com/stripe/stripe-python"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/requests-0.8.8"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/unittest2
+		dev-python/mock
+		dev-python/pycurl
+		)"
+
+DOCS="LONG_DESCRIPTION.rst"
+
+python_test() {
+	${PYTHON:-python} -Wall setup.py test || die
+}
diff --git a/dev-python/stripogram/Manifest b/dev-python/stripogram/Manifest
new file mode 100644
index 000000000000..783807929116
--- /dev/null
+++ b/dev-python/stripogram/Manifest
@@ -0,0 +1,5 @@
+DIST stripogram-1.5.tar.gz 12195 SHA256 8666a1884b9c356cb69bd307d8e728b3b5a7dbc777c0daa3df99f7491eb2007f SHA512 7973f22492bdc564b8aa6cefd68c3c52cb77a079d97c867cec9e2e69dd495a2f9cd555ef3ea48c4b90897fd21fe0509fbc22a59f4de3f56bfddcb15e803bbf68 WHIRLPOOL fea0eeb6ac16ef4fade469be8b97db743966e869925353181b8422dc04de3ce47314248590404e0f87d1dfe35a04ea46365a639edbcffbe8c61cdc57fb4bd678
+EBUILD stripogram-1.5-r1.ebuild 447 SHA256 ea751e138e6cd42fe3e032355626a8167baa65ea3d6e32aafe5f62b8980fd379 SHA512 078db442cee342b0dddce5df710a092e051add742144ca6176baab263dce1cdf38d9c3cf571cf575ed7d06fc6774e4dbb718f68cc843be053a8df0112581a216 WHIRLPOOL dffa0889c70556b823d0c5a0a01132a02870fdf158b6309f08a03f98d6c2a6a6fc71dd5052b0365ea7761c3a167a649bd11b7a190764d869a59708353007ddfa
+MISC ChangeLog 2587 SHA256 9521758433c177a5bc976384c05d1e64dde901e4ed56dc2454ffdacf7fcc4aa5 SHA512 a554a3b5f37ec4e238335a9a2b02eb9a6a2a2de2c74c666ba13419379c632cd40f3f832818c9078692febb66b9855036b9c97ef231512f64e8c59090c362d7f0 WHIRLPOOL 5def5dbb709086ef6281aa2be07192682f1390636d9123d942218f6c536b2792c5c7f13cd2f963b6c589f165339ff918a8f8a36f530e44a4c77cf800987dd4b0
+MISC ChangeLog-2015 1299 SHA256 82d243fc4848114aa1cc0145ad50b01f3626da7b6ad4a344c83950f2d7408287 SHA512 ec611558249aed8c71907c5452c6f0de41320232c94fa6f43b3560070b6264f9a508b2c8d7487aba27865ed15874999727aa7cc25401dbb994135bbd99db7dba WHIRLPOOL 41086a6bab0cd61e5a5e63c6231492faa28232600d4c00ab88af437fccb84004658c2d38bfd17c2f462a70b1e6a397207970f7a25697fdc9d33c19fb48ae024e
+MISC metadata.xml 313 SHA256 01dcfd8363658669578d53413fe585383c916025f430e20f2369d955ff049baa SHA512 a1b891e8cd09a5b724c362af841a03d1eb3359579c05ec0b01b7da4d829082bf75826770fbf8a05558a8fa2eac8a1bad5ebc8289a28696a3edfcdbe4ea9be108 WHIRLPOOL 785a466789c2614a360677f446380e8f0471f1af4f775bb54893277517e12ac51592f6491095e557590f8c7efadc389e7fd7c83296468bb31ea6d875ae007008
diff --git a/dev-python/stripogram/metadata.xml b/dev-python/stripogram/metadata.xml
new file mode 100644
index 000000000000..34a7fa0a8e41
--- /dev/null
+++ b/dev-python/stripogram/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">stripogram</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/stripogram/stripogram-1.5-r1.ebuild b/dev-python/stripogram/stripogram-1.5-r1.ebuild
new file mode 100644
index 000000000000..091f02807895
--- /dev/null
+++ b/dev-python/stripogram/stripogram-1.5-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Strip-o-Gram HTML Conversion Library"
+HOMEPAGE="https://pypi.python.org/pypi/stripogram"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/structlog/Manifest b/dev-python/structlog/Manifest
new file mode 100644
index 000000000000..7e889f857e6c
--- /dev/null
+++ b/dev-python/structlog/Manifest
@@ -0,0 +1,4 @@
+DIST structlog-16.1.0.tar.gz 150604 SHA256 46883e8a48918f18ab99c6413e166dc544acd1ad8bba659d152ac6e82c81c2ca SHA512 eafa89516b99adb02527d0b374f12b438e83a961f08cf42aa10a7196ec81df6ad5492772ae7c52747ac926d8f5a7ca8d89cc12f4dc6d37d21b9935f009894a37 WHIRLPOOL c47376833046c89060cb5a4fdc63d1613d52ce920a8060fb5a736141abd61feb1ce7493334b7099fbc86fc007cf8472b5e2349801b4066bf203ae7f4bf385d6d
+EBUILD structlog-16.1.0.ebuild 473 SHA256 c2711fbc4b5cc768a4dc00b022bc1edb4ca743b9c9a374bfc9634bf0c7626784 SHA512 64eb1e27e7429ea1052a491f405ce643ae9f95eac755e9dec6fe30a614ba2a8488234e30b78def07106fc5acadb4183a2e7f311dcc57407ca0dede13a956c4ec WHIRLPOOL 06c7abfdf7c92f198ffb6461e24258110c700d2725d5ed25a3f695eb55c6f97e4cb2b8080d2a94c3688d92744be5193f151a098434ad1f1b4e1b2f6c610cbe74
+MISC ChangeLog 334 SHA256 6a9a678642668e0c4065a6bf204616a5ae2a413962446edb47155f1aaa7887ad SHA512 f8b621b939f9d84b83a99ec726e3831185a9359ada98a54e7f2be5ceae509aa0446b47059789eb66874dec031debce24bb59f0242255d86f9a08c826a806e106 WHIRLPOOL 9e5010910172136d10c874a0b4ac658ffe1c9ee064cd51d32fa41bb19644dea52121343c9f52922fb22cb43d4380637630a22baad368e05477a479987219fb9a
+MISC metadata.xml 475 SHA256 b2dcb4e68c8dba1ce8356a601a82c6040f901bce659487009f6e01707a4315a1 SHA512 68586f9e4f089f6b13ea44afefda4cf2c08a1e91e9d4a6422c78bafc7ff87eb2412918ed8749ddcd91c5e9428c3ae82deae6d79a42985517fb6f554837f4dc7b WHIRLPOOL 2e04aadcc1eb9cf535e72c6dfcd807f3c4f932a238ffecb313e0acf31b109db9327b6f88591b9b74e82272a3148a9ffd8f0bb52072c0654e5a082bfc729ee601
diff --git a/dev-python/structlog/metadata.xml b/dev-python/structlog/metadata.xml
new file mode 100644
index 000000000000..f04762cdc67e
--- /dev/null
+++ b/dev-python/structlog/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>wizardedit@gentoo.org</email>
+    <name>Austin English</name>
+  </maintainer>
+  <longdescription lang="en">
+    Structured Logging for Python
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">structlog</remote-id>
+    <remote-id type="github">hynek/structlog</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/structlog/structlog-16.1.0.ebuild b/dev-python/structlog/structlog-16.1.0.ebuild
new file mode 100644
index 000000000000..8b1255ed3724
--- /dev/null
+++ b/dev-python/structlog/structlog-16.1.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python2_7 python3_{4,5} pypy)
+inherit distutils-r1
+
+DESCRIPTION="Structured Logging for Python"
+HOMEPAGE="http://www.structlog.org/en/stable/"
+SRC_URI="https://github.com/hynek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/stsci-distutils/Manifest b/dev-python/stsci-distutils/Manifest
new file mode 100644
index 000000000000..a755e091f856
--- /dev/null
+++ b/dev-python/stsci-distutils/Manifest
@@ -0,0 +1,5 @@
+DIST stsci.distutils-0.3.7.tar.gz 48831 SHA256 e0f115126ec1e27b345e338ce9cbca0fe87cd30e409e052acccfea05a9e9783c SHA512 8ef81afe43dc080d28ce7e640c1e03cd0e0a857151ad307af742ef434e3a1abb489213a63a95618bac39a743624510a0d59a2817b6cadb929a2bcf64406ac85e WHIRLPOOL ae63e727add7e8eefb3c38f35f5f9bea7caaf9f75e74cdbfd04135184e5710d35bb3014712c6de0440375dcfa2f86b75ee31324a0108f06fd348882324477b72
+EBUILD stsci-distutils-0.3.7.ebuild 636 SHA256 80fa1045d5877b6e2a9fe31c8c2cf3bb37f399562db685c4a4603180b338d269 SHA512 9d1f9f07e8812aee94210211eb000fe3cbefc450e7a0d9b86cceb5a1b41f2ab715fcba18cd6371d2747c42ecc10708c046a4c836161b1c19336c8dcbd59eb2f0 WHIRLPOOL 2e58e2c223cff94ddb1a06398bedbffdf80a57cb4142a948cdc1e6a78d9ef5182c8d74df888393e27e6075394a4cfe6857fda4678de86f286072da9111068f6a
+MISC ChangeLog 2791 SHA256 f899233f97be1e474a2d254babb8634040287c1e3b74b3d2a4730102879ec314 SHA512 ed6e5555e70a6ce5e0ba41c626874c8bbe4146a72ef5471d381212aceb3779832eb3eaa4f2e98b1d5bc8ab25092b94a09992239221abb0e90b24a4245b011077 WHIRLPOOL 1bfc54216a3b008a3b0fac67ac40194718209205e3930ca533d47cd669a6cb099b5e3c494d75c27c00f84fbe697c809ff933bd540e1b2f1263be6cabc77f1aaf
+MISC ChangeLog-2015 3354 SHA256 ea81f2545228c6278475f1ea39c52841d56e538f40b8601dac9413958932fe6b SHA512 cd56bf80b367ffb46d791bdfbb50d8d456db52b312250e3c0252e7c8e0ae0d92e1a2f0c938353770b02c9bfb955e4664daedd8710fc3a9498d685723fba5cb8f WHIRLPOOL 9269d9f458a52179d188f536868e6a8abbeb6a624bbcb7e74db73bd187028bde334abaa9b8a38a5992585bb4326ddfbc659fd9289bebef3e3bd9892696afe643
+MISC metadata.xml 840 SHA256 3fcdee470b7ae92772da67337541bc6583856e4b7281a80dbf4cdbfd562d4be2 SHA512 c438ce545bc4de08dd5de0d0c0ab3b19dc9b87169d8847078e2e3bcb4fde113f0db7dd073a42a047ae268eaf4e25efece85eeac210b6f2e5260b53de48d4987d WHIRLPOOL 62ce30fced068392c7eb2decb6e0ab1425288b6f08cbe1e0c5090fc8a598f9874a8fc349a4cb7448fedbc5924d0b76eb387ecf8397580c4ff6e38c7e056f615d
diff --git a/dev-python/stsci-distutils/metadata.xml b/dev-python/stsci-distutils/metadata.xml
new file mode 100644
index 000000000000..e839bf3d66e9
--- /dev/null
+++ b/dev-python/stsci-distutils/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription>
+  This package contains utilities used to package some of STScI's Python
+  projects; specifically those projects that comprise stsci_python and
+  Astrolib.
+  It currently consists mostly of some setup_hook scripts meant for use with
+  distutils2/packaging and/or d2to1, and a customized easy_install command
+  meant for use with distribute.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">stsci.distutils</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/stsci-distutils/stsci-distutils-0.3.7.ebuild b/dev-python/stsci-distutils/stsci-distutils-0.3.7.ebuild
new file mode 100644
index 000000000000..5486f48a8f9b
--- /dev/null
+++ b/dev-python/stsci-distutils/stsci-distutils-0.3.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Utilities used to package some of STScI's Python projects"
+HOMEPAGE="http://www.stsci.edu/resources/software_hardware/stsci_python"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="
+	dev-python/d2to1[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/stsci-sphinxext/Manifest b/dev-python/stsci-sphinxext/Manifest
new file mode 100644
index 000000000000..c75fd511d298
--- /dev/null
+++ b/dev-python/stsci-sphinxext/Manifest
@@ -0,0 +1,5 @@
+DIST stsci.sphinxext-1.2.1.tar.gz 75591 SHA256 17ae92d3ee683b0ac11a0f9a8b3862207aa7790f188147dd0de6a99721776f5a SHA512 98860d6748a6be00a853b12adb283ec138c8111d7c990c5ae7f493089eb5974943aa9fb101ec8b4f280b77c49d07ce6d44c50384477d57710ded0f3382155943 WHIRLPOOL 7a44b4097e1adb88cd8bbc7c900f42702eb8cc9f100239cbdc902ec0be667085bf639c7bd37ca633e33a873edd570fd3f8b624134dd68213d49173de2e701f9d
+EBUILD stsci-sphinxext-1.2.1.ebuild 788 SHA256 9d2abc9bbc352807778507e56730db1533dee155a115fa58818b5e217c4dbf96 SHA512 754a55e1b8d8cd13a9708979f65759acc4791643b7c618bb31b895bc8f35d772954a27b7037257baaae637d867b60eb850b676cd086b64089a395c3809e0ac51 WHIRLPOOL 5c3e8d0ebffc0997fc0758824fd2f3e6163424aa939f5be35d66ad9eb2c9fb56e3be87303043c5de3fe783efd8cd449e14687b1eeb9f76c8e24fad884a6f7bb8
+MISC ChangeLog 2853 SHA256 5d7293db07dfa903e3d33fef9fe15b5a3079b398436b35d6f8fa5106d92811a8 SHA512 b1fd41ec1f693afa85bc116692251603a47ab2448ef8f01525ea433d2cc1353d1c948ae38e659af7ae225627e3b64bb15e8a9e2f721b4f0c8974b987d40a480b WHIRLPOOL 14c38cce782fb710255402c51392a2329a9bdc22607dc10d214ac131250a13249a119b76476089a85218eb45fbca8d32d7f9bb779463d3ed7c6b6ecc91da7c8c
+MISC ChangeLog-2015 894 SHA256 04fb7571ff20ec67b8cce0101a32266a8610b03bc53087e465bb06e16be9d528 SHA512 3201bc3fd8054118a39e7192f4536c85911d90f42ffbea7dadc9936483844fcc36f4f442d63400e22a8485c460db43dee8177e09e319d5bc1c030acdc72281e2 WHIRLPOOL 7bf2bc3c0b008fe65fcc1c53fc31f09c59fee3fabfa8a3c0197faf96d49107330824acad13d85291effd69e4175616be2e3ce95d33f7a2297d6051726bd8e352
+MISC metadata.xml 477 SHA256 0387954ee4dd4b74ec4d62b5a461badd9a401dee46af919699116137e08a9d7f SHA512 67126020b606cd33cbfb87afbcd912f75e11393670e2c655e6f4e1b7406eb1db44fb4897b5101526ef4889c71b083547bc255eecf1a53bf097fc293342425862 WHIRLPOOL 9ed0c38a353344886b82572780dc7b4d249a47a1730d7832bc0753f62c9e21fd67f05fdaee96fcc2dc997714ccd52d73bfbf7e2806d22132d1c91eed0e36acdf
diff --git a/dev-python/stsci-sphinxext/metadata.xml b/dev-python/stsci-sphinxext/metadata.xml
new file mode 100644
index 000000000000..2c7222a77c29
--- /dev/null
+++ b/dev-python/stsci-sphinxext/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+  This project contains extensions to Sphinx to build documentation
+  from Space Telescope Science Institute.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">stsci.sphinxext</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/stsci-sphinxext/stsci-sphinxext-1.2.1.ebuild b/dev-python/stsci-sphinxext/stsci-sphinxext-1.2.1.ebuild
new file mode 100644
index 000000000000..0c3b5c5cd13f
--- /dev/null
+++ b/dev-python/stsci-sphinxext/stsci-sphinxext-1.2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+inherit distutils-r1
+
+DESCRIPTION="Tools and templates to customize Sphinx for STScI projects"
+HOMEPAGE="http://www.stsci.edu/resources/software_hardware/stsci_python"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpydoc[$(python_gen_usedep python2_7)]"
+DEPEND="${RDEPEND}
+	>=dev-python/d2to1-0.2.9[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/stsci-distutils-0.3.2[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/subprocess32/Manifest b/dev-python/subprocess32/Manifest
new file mode 100644
index 000000000000..f8cc5c20b479
--- /dev/null
+++ b/dev-python/subprocess32/Manifest
@@ -0,0 +1,4 @@
+AUX subprocess32-3.2.7-sandbox-test-fix.patch 672 SHA256 feb894827cf604a5831fc4c06d3ed0ee130d682482e685a2f61519859746b631 SHA512 cdfa5b9ee56df54c2d122624815e472f9dd13e101a8d221adb48d21b1f7cd0ff3187d69f91c0ed7f164ee69348ffedde22a1d32a101d1eade85d6882ad47b6d0 WHIRLPOOL 17ee59de0f019359c209c32c4930fbc79f8806ba850b42d177f816982678b29c82c081f066f3055e39f15725aa0bda42c2828621e9322709b8357751ab9f68d2
+DIST subprocess32-3.2.7.tar.gz 54240 SHA256 1e450a4a4c53bf197ad6402c564b9f7a53539385918ef8f12bdf430a61036590 SHA512 d897d6a48824991e2a63ea417ca15222f28c3a4117c9bba8cbb4eceabfba9769acce1166aafa7aee8a025d6ebe7e133ce0dd617f90cb07e11bdb73dc1e21dec6 WHIRLPOOL 41226d999895439a089a319e8b805468d1913ec098d5f92705076ae707efb59c8a92f56e1068927065c5c1060ad84388fbaaf575a6e5c4d12a2b2b1e588f3e0a
+EBUILD subprocess32-3.2.7.ebuild 573 SHA256 97fad8182aa12d358ff536621010b555aace27667e6a2c8f9d73256a952eb8f7 SHA512 01ceb834c7b05138f7969126fbbc2734085ff41af6f43b3bd6667f52b01bfe6fff547eec31967a78f61e38efd1d08394e8ce860110b6f1e0feeaceb3dd21e24c WHIRLPOOL a38a8119ce6475f7395cd121da0066e8c37cad4312a889008e9c0f7b00a1c41ff638a047f34fe45ed777c11a22fd75b922d3fd6eba26daedb19075af55a35f71
+MISC metadata.xml 393 SHA256 ec1b03759c5b7c168c659b15a6c75c36dd0f8a353c00f39ec61d09e62f16edd3 SHA512 0c015bdd15a504432cc6b804c66384260d2cf0b77ffbdc8af36a82e31e2c6ecf6a62c2c4d156afbaf30afcadcb3f5fdedff70b73a4c2381b5bc7fedcb5f36d4a WHIRLPOOL 7d5acc216b37e3cca393b7e19920bd409497b2e472deaeab2276207ae2011b82d8122d72b1e87b694a21ac11db8114d6407531f6c75cce3e86cc79d12865f91e
diff --git a/dev-python/subprocess32/files/subprocess32-3.2.7-sandbox-test-fix.patch b/dev-python/subprocess32/files/subprocess32-3.2.7-sandbox-test-fix.patch
new file mode 100644
index 000000000000..50e4a511fc4b
--- /dev/null
+++ b/dev-python/subprocess32/files/subprocess32-3.2.7-sandbox-test-fix.patch
@@ -0,0 +1,14 @@
+diff --git a/test_subprocess32.py b/test_subprocess32.py
+index c312949..000f7d6 100644
+--- a/test_subprocess32.py
++++ b/test_subprocess32.py
+@@ -538,7 +538,8 @@ class ProcessTestCase(BaseTestCase):
+                 [sys.executable, "-c",
+                  'import os; '
+                  'print([k for k in os.environ.keys() '
+-                 '       if ("VERSIONER" not in k and "__CF" not in k)])'],
++                 '       if ("VERSIONER" not in k and "__CF" not in k and '
++                 '           "LD_PRELOAD" not in k and "SANDBOX_" not in k)])'],
+                 stdout=subprocess.PIPE, env={})
+         try:
+             stdout, stderr = p.communicate()
diff --git a/dev-python/subprocess32/metadata.xml b/dev-python/subprocess32/metadata.xml
new file mode 100644
index 000000000000..d06e7b26e195
--- /dev/null
+++ b/dev-python/subprocess32/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">subprocess32</remote-id>
+    <remote-id type="github">google/python-subprocess32</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/subprocess32/subprocess32-3.2.7.ebuild b/dev-python/subprocess32/subprocess32-3.2.7.ebuild
new file mode 100644
index 000000000000..34149511c432
--- /dev/null
+++ b/dev-python/subprocess32/subprocess32-3.2.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A backport of the subprocess module from Python 3.2/3.3 for use on 2.x"
+HOMEPAGE="https://github.com/google/python-subprocess32"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+PATCHES=( "${FILESDIR}"/${P}-sandbox-test-fix.patch )
+
+python_test() {
+	"${PYTHON}" test_subprocess32.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest
new file mode 100644
index 000000000000..641d3c1f8a8d
--- /dev/null
+++ b/dev-python/subunit/Manifest
@@ -0,0 +1,6 @@
+AUX 1.0.0-tests.patch 1058 SHA256 f83089e4cdfcd5a6a3898fb8dd94689808e47a1bb35c3b362cd6e2ccfbf0597b SHA512 b1accf4434415357a8c235c6b660cec440096616887e62fb45a2d15e314a3abb9be825bf4e8ec8d4b18d7ab08197cacd6916bbde87dc5b88c6f3e80ca89b1de0 WHIRLPOOL 2ff71e98fedca6f6cbd32ecd43a5ee0c9f3dfb68701c3a562e600cbc4f57db1a048af81914a66637ef30310e820bf215ea6b1414f46f27d4f896b1acbaac6f57
+DIST subunit-1.2.0.tar.gz 460532 SHA256 27f0561297a7d56d85a8f5491f47e44303d0bb1d99c5627486774ea1bcb3d5c3 SHA512 f6559fd771ad0732985230d11a9a8326ef35c817b62d1f50dc332f0032f7b08559a46d2534983b7d3964e45682ac49b3e348581ee0983861390abcd4ec20459c WHIRLPOOL c30b4a2c9ab17f49f87e206fe5833ae564452b99af447f8c4cbf969b2f2dd96e482fc583e84264be815b051b1bd12e6c132cd779c88d0d68da53956fef0b25b7
+EBUILD subunit-1.2.0-r1.ebuild 2645 SHA256 a86faeb8b8ce788bebd8d5702dd65288919caabf57760120bb965c3afc78fbc7 SHA512 bcf3e0f6bc1734fa40e09b1c991bda4bf0d36289140ee206423331b9aab9595f9df19e2fdff0baa4ab044564bd040dd323841770e09568d777558e30a2d22bde WHIRLPOOL ce4468d2cfe3261749600126b8b60d7305998c453634c0ab2f72185f97fe7aae20016980bfc4414c7756b6906a3934c9f5266b6714f840de8aecb2a2d4040bde
+MISC ChangeLog 7748 SHA256 437a5b8770d0203f1317a5f958b5b790a2fa716368d78bc70c107ccea83ef9af SHA512 0ab69257663d07945b5059e4c7826c63a71f5d92b295455ce5d0528856efe901285371ae43bc790297495367b0249a54573f53e3cd724447af2b457ea22a7c6f WHIRLPOOL 2f6ec1afe46d152c473fd8d3afa6b261d24419ddf1c8a4de0a71de1cb053bdba8752b2b7adaa0d4f63ac86985db1c17d4491f986c41f60ef5048a9ceaf1e581d
+MISC ChangeLog-2015 10090 SHA256 aab220b1396d7407de89fd7827fb07bfb5b8e53de90f992ddcc5f24c84a82c50 SHA512 5f97ce5f3e469281cfe5c2a599d99df091d1ddba16440ab6041793486ee5fec29553414d4e8f1cb56494f60863c7029589fc3148d0be8a48d3688bfcbb463560 WHIRLPOOL 1e75515dafb22185ab88b31a0611adba0f8a169c8bad1c45f4dc1004887143208c0f1cd90d519d6a0c2787f4d9ada6897db046f80e9e202b5f5494004423d81a
+MISC metadata.xml 422 SHA256 e742f3604cece9ae66c902b5f49b2d03a9a73afe2608d609ce83e29a5428c491 SHA512 dcac9ba5ff93016141b433c16b9d1a526ec2babd39721d75a6edd235eb6388500ea8228b6c8c88eacbb12c732c36883c0b698f7039aca7909890fe16cb895cb8 WHIRLPOOL 8ec73b922d152db8ff39aaa3e32a692d9922c53accc6a764fe0ebcff1723751f9ebbdfc56c89044bd08478d2bb546a3d05202f7a9db495ae1f7e7e452887ad8c
diff --git a/dev-python/subunit/files/1.0.0-tests.patch b/dev-python/subunit/files/1.0.0-tests.patch
new file mode 100644
index 000000000000..d83a1900cbe1
--- /dev/null
+++ b/dev-python/subunit/files/1.0.0-tests.patch
@@ -0,0 +1,25 @@
+diff -ur subunit-1.0.0.orig/python/subunit/tests/test_run.py subunit-1.0.0/python/subunit/tests/test_run.py
+--- python/subunit/tests/test_run.py	2014-11-18 16:59:26.000000000 +0800
++++ python/subunit/tests/test_run.py	2015-03-26 13:25:19.193341069 +0800
+@@ -77,21 +77,6 @@
+         exc = self.assertRaises(SystemExit, runner.list, None, loader=loader)
+         self.assertEqual((2,), exc.args)
+ 
+-    class FailingTest(TestCase):
+-        def test_fail(self):
+-            1/0
+-
+-    def test_exits_zero_when_tests_fail(self):
+-        bytestream = io.BytesIO()
+-        stream = io.TextIOWrapper(bytestream, encoding="utf8")
+-        try:
+-            self.assertEqual(None, run.main(
+-                argv=["progName", "subunit.tests.test_run.TestSubunitTestRunner.FailingTest"],
+-                stdout=stream))
+-        except SystemExit:
+-            self.fail("SystemExit raised")
+-        self.assertThat(bytestream.getvalue(), StartsWith(_b('\xb3')))
+-
+     class ExitingTest(TestCase):
+         def test_exit(self):
+             raise SystemExit(0)
diff --git a/dev-python/subunit/metadata.xml b/dev-python/subunit/metadata.xml
new file mode 100644
index 000000000000..e42cdff158cf
--- /dev/null
+++ b/dev-python/subunit/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">subunit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/subunit/subunit-1.2.0-r1.ebuild b/dev-python/subunit/subunit-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..690b9a8b998e
--- /dev/null
+++ b/dev-python/subunit/subunit-1.2.0-r1.ebuild
@@ -0,0 +1,94 @@
+# 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 pypy3 )
+
+inherit distutils-r1 eutils multilib-minimal versionator
+
+DESCRIPTION="A streaming protocol for test results"
+HOMEPAGE="https://launchpad.net/subunit https://pypi.python.org/pypi/python-subunit"
+SRC_URI="https://launchpad.net/${PN}/trunk/$(get_version_component_range 1-2)/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="static-libs test"
+
+RDEPEND="
+	>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+	dev-python/extras[${PYTHON_USEDEP}]
+	dev-lang/perl:=
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-libs/check-0.9.11[${MULTILIB_USEDEP}]
+	>=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}]
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+	)"
+
+# Take out rogue & trivial failing tests that exit the suite before it even gets started
+# The removed class in fact works fine in py3 and fails with py2.7 & pupu
+# The setu to restrict this patch is just those 2 is not worth it.
+PATCHES=( "${FILESDIR}"/1.0.0-tests.patch )
+
+src_prepare() {
+	sed -i -e 's/os.chdir(os.path.dirname(__file__))//' setup.py || die
+
+	# Install perl modules in vendor_perl, bug 534654.
+	export INSTALLDIRS=vendor
+
+	# needed for perl modules
+	distutils-r1_src_prepare
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && distutils-r1_src_compile
+}
+
+python_test() {
+	local -x PATH="${PWD}/shell/share:${PATH}"
+	local -x PYTHONPATH=python
+	# Following tests are known to fail in py2.7 & pypy. They pass under py3.
+	# DO NOT re-file
+	# test_add_error test_add_error_details test_add_expected_failure
+	# test_add_expected_failure_details test_add_failure test_add_failure
+	# https://bugs.launchpad.net/subunit/+bug/1436686
+
+	"${PYTHON}" -m testtools.run all_tests.test_suite || die "Testing failed with ${EPYTHON}"
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && distutils-r1_src_test
+}
+
+multilib_src_install() {
+	local targets=(
+		install-include_subunitHEADERS
+		install-pcdataDATA
+		install-exec-local
+		install-libLTLIBRARIES
+	)
+	emake DESTDIR="${D}" "${targets[@]}"
+
+	multilib_is_native_abi && distutils-r1_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-python/subvertpy/Manifest b/dev-python/subvertpy/Manifest
new file mode 100644
index 000000000000..68350463b240
--- /dev/null
+++ b/dev-python/subvertpy/Manifest
@@ -0,0 +1,5 @@
+DIST subvertpy-0.9.1.tar.gz 110972 SHA256 8a5bc24f1abf273de22f0caf1d76a63b51ed5cfb6cd62f6ef58807adb9aaf6a7 SHA512 977e291c011e680cff9e26312b4235c0479374076964c7c4a4c3c7ec75bcc44ff7c458513ab89f1aa2b599d3bd8f94cbc6d1000afcf725a9f937a90b39456148 WHIRLPOOL c8dcc98750107110251c51a7d47b073de2ea07200fdc44fad6494be69909563a4ec1a49c085d73d820acc8a6c30c6506eb0844351e43785b0b5d3d74d1027dc0
+EBUILD subvertpy-0.9.1.ebuild 975 SHA256 4865f4e31d0941467b5b35b9d1b5fda1b9074aa03cf05ee299ca8c8b187a05dd SHA512 7e3f6cdfe9d2b148ea3fcf5d7c20986fb4e014843399dcca8dc71d0db80f91d7e2629fb43b9d900bd6a024a08735be21974cdc9ffdfc4bfecca7ba8c1eab872f WHIRLPOOL 13d4dc9c88b7501ece78fb693d9c89a98e77f6fd248a9317391fada2fb5a48a5f837a5e1fc402c607c6fb620a7845d350289916e241336994a66b2e06bbac21c
+MISC ChangeLog 2580 SHA256 59f2b533b494a1fb38215770e0b32db1d9e612c7e4a8c3bd2dc844e97cc318a9 SHA512 9c2ab6992ef9ad2c075f616591ce3589459359b67f63d24019cc3ead62f8d7131ff1e4e8ec1cfe38d3eff9da90646b347422037e69a892d3fbecc745be284b79 WHIRLPOOL 165ba1736b26c66baf8b7a971f693399a11ba6d1b19a85966255ce61d7764fa6f8f61063ee5ff8d1d10ccb9dd1a4e780e22b0f559b1c7d1d3e78f6cae1220619
+MISC ChangeLog-2015 7619 SHA256 47a66a7fb60abd02d4b0c65d34ded9bd95a250f9c5b513fd85d335c412a31ead SHA512 9133547ccad74d18588b2be8fb50ee9960a1785b9f81db7a047ad5c6be5f1e6653442a764cff86db4be719911172116575f0303cc049946675d82e7469381614 WHIRLPOOL 4717b10e83d91442119e5635f851b9937bfc98ee102459ee20692f597317248b2be3c11aabc466471eb172581f7e9c4b21124486603721afaa54402f471d7e86
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/subvertpy/metadata.xml b/dev-python/subvertpy/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/subvertpy/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/subvertpy/subvertpy-0.9.1.ebuild b/dev-python/subvertpy/subvertpy-0.9.1.ebuild
new file mode 100644
index 000000000000..dc86dd9ed19d
--- /dev/null
+++ b/dev-python/subvertpy/subvertpy-0.9.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Alternative Python bindings for Subversion"
+HOMEPAGE="http://samba.org/~jelmer/subvertpy/ https://pypi.python.org/pypi/subvertpy"
+SRC_URI="http://samba.org/~jelmer/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND=">=dev-vcs/subversion-1.4"
+DEPEND="${RDEPEND}
+	test? ( || (
+		dev-python/testtools
+	) )"
+
+DOCS=( NEWS AUTHORS )
+S=${WORKDIR}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	distutils_install_for_testing
+	pushd man > /dev/null
+	# hack: the subvertpy in . has no compiled modules, so cd into any
+	# directory to give the installed version precedence on PYTHONPATH
+	${PYTHON} -m unittest subvertpy.tests.test_suite
+	popd man > /dev/null
+}
diff --git a/dev-python/suds/Manifest b/dev-python/suds/Manifest
new file mode 100644
index 000000000000..37b7559788aa
--- /dev/null
+++ b/dev-python/suds/Manifest
@@ -0,0 +1,5 @@
+DIST suds-0.6.tar.bz2 143985 SHA256 29edb72fd21e3044093d86f33c66cf847c5aaab26d64cb90e69e528ef014e57f SHA512 ec078b159bd83c5799e293d9607138ee1da90fdc64da203999555a4324ce7be0235156d3c7ad28e46f84180a6e51e2f3f82228e5e77ae41c61ee20f3db2c916b WHIRLPOOL 9c62762f1c865cf7763d9a7332dfa9927dcb693a99414de063451a11581a7e303b19c3c0f840db339829bd59c116565fba26d98aaa520739a6aa84edaabc90aa
+EBUILD suds-0.6-r1.ebuild 1617 SHA256 aa93e15aff67f3e943f2a3496b382aad24c04c03064dcdbb768726daf0fdd4de SHA512 e777014e5a342fdec7a7881df9ced1e9a473d26cdc22111dc5c1d6f7de00d4e196d087faa31fec9aac23d969d95373b742fc7bb483743e7c2e2e29a5c4ae1723 WHIRLPOOL e2d0f3bb30c5a763f1126f4c304da662218c5874df0c61b129d76b3b6688b4bc9c4ea8ee1e41b0df4b2e3aabb8fc98a9ece9ba8b2d1223a2b79f71804d1520ea
+MISC ChangeLog 3829 SHA256 84913fbfa763461b0a8bb5c170309102e2c358ffa5735c6325ad853d5995ca48 SHA512 6d6ef85c6d910c7eb3890824b4711c5eedc74b5e3ef2c2156c2d7adfb27b513baeb9af2095af307de9401ca2c5773693b3bffc9148e0d77916b5638f538526ff WHIRLPOOL bd9c6a360e4bd284553f2c0254df951c130790af17ed96dc661489f0af5b2988134cf201cb0528a71d522d758149b0c75c7ea3df897dd826e12b480e8fe46b81
+MISC ChangeLog-2015 2212 SHA256 50b064eb93942d8c09814e6ff4ccfb5909043557653f82ce19c1eddb6a4940dc SHA512 14007a59decbddee62a15849a18011ab3ff9dfce50c07d809d7b9a3a5e10168b98a6368c311c46370a2c0cbb4a1f845d041173a8741ba2795ec8ce1e2c3fef4b WHIRLPOOL 249cba73ee35388e33d25a7de7ee9a6a9a887dfe0e8ed70dc467a0ceeca76e37071e7aaaebb3df4f518c3d695d2df171b80910a141ec5bcef0b62160a31aa1ec
+MISC metadata.xml 467 SHA256 9b6d49256b55d744b5cae1e5f3e7ba3091853f6df46c94459d779dcb9f106cc3 SHA512 b2db05a4b1e5cdebd8132837510bee73355ef88cf2f22ec8ce8c439be5eb6a7d3a3f14639dc7dc9a5a3d99d45ac96a4322b9fcdd97719161b5699602d7b880d2 WHIRLPOOL 820b9b550dc29fd0987e08eac7e12814c2733f2a252fb6bd8b36d685e3be236cd7885c16e64500e766ba7481ab7aa4d455d1949e0464ef37e796d90e7506b8d0
diff --git a/dev-python/suds/metadata.xml b/dev-python/suds/metadata.xml
new file mode 100644
index 000000000000..caa921209382
--- /dev/null
+++ b/dev-python/suds/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">A lightweight SOAP python client for consuming Web Services.</longdescription>
+	<upstream>
+		<remote-id type="pypi">suds</remote-id>
+		<remote-id type="bitbucket">jurko/suds</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/suds/suds-0.6-r1.ebuild b/dev-python/suds/suds-0.6-r1.ebuild
new file mode 100644
index 000000000000..777c40cd8902
--- /dev/null
+++ b/dev-python/suds/suds-0.6-r1.ebuild
@@ -0,0 +1,54 @@
+# 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} )
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="Lightweight SOAP client (Jurko's fork) (py3 support) (active development)"
+HOMEPAGE="https://bitbucket.org/jurko/suds"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}-jurko/${PN}-jurko-${PV}.tar.bz2 -> ${P}.tar.bz2"
+S="${WORKDIR}/${PN}-jurko-${PV}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+REQUIRED_USE="doc? ( $(python_gen_useflags python2_7) )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/epydoc[$(python_gen_usedep python2_7)] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+DOCS=( README.rst notes/{argument_parsing.rst,readme.txt,traversing_client_data.rst} )
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_compile_all() {
+	# to say that it's both, because it kinda is...
+	! use doc || epydoc -n "Suds - ${DESCRIPTION}" -o doc suds || die
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	# test folder makes for file collisions by the eclass
+	sed -i -e '/^tests/d' suds_jurko.egg-info/top_level.txt suds_jurko.egg-info/SOURCES.txt || die
+	cp -r suds_jurko.egg-info suds.egg-info || die
+	sed -i -e 's/Name\:\ suds-jurko/Name:\ suds/g' -e '/^Obsoletes/d' suds.egg-info/PKG-INFO || die
+	rm -rf ./{tests,build/lib/tests,lib/tests}/ || die
+	distutils-r1_python_install
+}
diff --git a/dev-python/sudsds/Manifest b/dev-python/sudsds/Manifest
new file mode 100644
index 000000000000..56863fbc4475
--- /dev/null
+++ b/dev-python/sudsds/Manifest
@@ -0,0 +1,5 @@
+DIST sudsds-1.0.1.tar.gz 84196 SHA256 eea36b873a98cce4b5597812f62e2c20eb534dd520a569d6aa250e29ea83ea9c SHA512 11f064702300651dc7f7100698d20946f1ee06c8d08963fcb123620fd8ce34608ffb5a5df9d28f5b241080ead32680a6376ba224253383901a0d81240957be36 WHIRLPOOL 6a5a25129a7b9b0819eb848c312dfc7e0e5b1120be044357124c17cfb09a33953e7d2a17ec651d09d4877141d5aea3f53aaf0515c563798a1a07ca21b14e63b9
+EBUILD sudsds-1.0.1-r1.ebuild 470 SHA256 32661d22d095f688075f0b98b9ad9bf4a45fe8920b45ae9f30f17cc22ed0e7ca SHA512 f4e21ebaf8b8ddf83f7d845e0f10ff62cb0fab8e316271bd6d4d8b2247daaa77eab514e8fc455db550a680107627c7ff8d1f4c5b5bd15e6e10ed017df4b6ec19 WHIRLPOOL d9cc5f9ce5ef4f6d5fa172d47741e48439156fd70df461a265362710541d3af87d7e6a53d4c8810d811d44c5c3123a2cda88b38c6917004a1f94b9d1dc0587a0
+MISC ChangeLog 2825 SHA256 c100f47815ce91e94916c647f1fa2642d384bc587b7641949afefabc1455c46b SHA512 9ac08b89f491779b209adb2f4722328a744033cab3d17c2bef87f99ef07fa0d67305cba1ece647aa3d6938c4761e82619afd8f0a97129b6f49667460e43cf679 WHIRLPOOL f1e2dd3b7ac07853d534c06c85ae476017bcdc76bbaa44949f2bae5a80527a10bacc71351c923d46b64d91c849e2125265b5ab3901250271d35c31c1404a2239
+MISC ChangeLog-2015 1731 SHA256 8aab574967d982953f4c2da50c2575ad54b2c05ed0e27f7b7ed56135538d8548 SHA512 42764cb6781f449a9947c7b15f9af9c393f4b0aa07e885cc28c412fccf16af258416cd7e06175c7b122c78844374468a125781b6d7559e38d860e0df95e0d286 WHIRLPOOL ea37cdc291c638e519c760952cf42f71a8a976c1cb71f9394039a30ac9ce68ddd798776c8a94bab67a897f505283a3d36c5e1618df37b6b1c931dd48145a1360
+MISC metadata.xml 373 SHA256 a52d59071d55bf7e09011e2f67700b8ba2d7108c333f029687324a2eab0a4bca SHA512 2a45aae0cf567cbc9e0dbafed05a6b5212baa2be839a70c7b43b67df77ef36efc5b6e310a8b21c8a540b9646a1fdd5cebb8aa7a0b81d870f93b51833d61969a4 WHIRLPOOL a40649a49b7426432b28f667c2373d80c6bdfdb5c719e438d8704252da2f9bf9de106850f327664d3bcf01990c3f108edca6d05a7c8aa1104eb1d25cac61b0e9
diff --git a/dev-python/sudsds/metadata.xml b/dev-python/sudsds/metadata.xml
new file mode 100644
index 000000000000..c46e7f526c19
--- /dev/null
+++ b/dev-python/sudsds/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		A lightweight SOAP python client for consuming Web Services. Czech NIC labs fork.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/sudsds/sudsds-1.0.1-r1.ebuild b/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..13d2eb3f9c89
--- /dev/null
+++ b/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Lightweight SOAP client - Czech NIC labs fork"
+HOMEPAGE="https://labs.nic.cz/page/969/"
+SRC_URI="http://www.nic.cz/public_media/datove_schranky/releases/src/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/sunpy/Manifest b/dev-python/sunpy/Manifest
new file mode 100644
index 000000000000..bb8b0bb36068
--- /dev/null
+++ b/dev-python/sunpy/Manifest
@@ -0,0 +1,5 @@
+DIST sunpy-0.7.9.tar.gz 5690849 SHA256 359961f62a32df69b2df2cd5390040fa27b7522066fb546469fc9f485d2d0a57 SHA512 e8322ecf7c797a377fd8ff6962d6d66e147ba893a58e8abbbfa1dad6a391eecc161846a51fba3c92e90a3709125d759da76d444ca3f4ff0878768d23da1f41a3 WHIRLPOOL 512e1f5fbc0c4e127c4fc26fcd3f7f2c7ce0944ca5691fcdb938254615e131d14407f4bb160a32b597ad62a520c59201afee2ae6a133021a7c0d7d4cf9298ab9
+DIST sunpy-0.8.0.tar.gz 6336169 SHA256 54c894719a38e66a9e5fb89ce0555fe714f37e54179a25f4f16b6c9da3c10f1a SHA512 7996fdcb47e4143159253180b2250ea7ac4aa8fecf8d3f1eae930da018d39ce4e663c843b4b0532e900f97d2bc9fadfd7c17837f4f045634820059a5af802eda WHIRLPOOL 08b3ef4c3c6503ce10f9d9e7d04b4310604376b09ae18066296f86b95c5292f5e8b1e789d10d9e697b82a55d85d94ab2f7b3eeebe855926a434d6518ec31ec0b
+EBUILD sunpy-0.7.9.ebuild 1384 SHA256 01f078b201e91b2d4d8b888c56cada3fe8a79465304e4ad8031d26d4d87205da SHA512 86fe8035ffd52450d4d0b4ccccffa4b41fdceeb7d62eee7a2e9bc79626a7b0260018ca92f93dd5cd18b78d6515825864bcd55c43c45e258caf68ce86d3b02209 WHIRLPOOL 41578b23dbac2d233d21fec3cfc73e0c170ead8f76ddfef3e9062a9e5908c0fefdefd06aaa02d2b8731c4c366eb0b5e712d04d4fe4d018b422fef57da80fe4d4
+EBUILD sunpy-0.8.0.ebuild 1418 SHA256 8034d96bf165d354b81d85720d600af542d573d5c8168967029c5430f53cbeeb SHA512 55b878b6b781450079f921c183346d955767e15a27c8dfee7f736a9d3c0971c1e01e2b2609094e4d054f8026c876304b53fea7ad0314fb8a99fc7ed433c1fcc2 WHIRLPOOL 255f9b730d17cd72c10e9e950850aba53303508262f72bb128b37091b7569a4fa7226269f477526011d833e98826df2bb8201f65fb70acdf63cc8ef5a23dae09
+MISC metadata.xml 746 SHA256 2090e70a553fb5f7e4ea0e0308411ec4496f51eb36e067191c621caf4271214c SHA512 73242a446a71a5f670e1993dd20ed2a66f06a3f3751e351edd9f24a2e77989f0aafde489b348d51264c0e4b1eca5fe34552b7378dc0bd19a8c351294adeb2b26 WHIRLPOOL 033541578ef1bcb1782e9e1fbe5ec8c5a450cb9b0b60417f151543f492a167613e113fa5cfd23177664ccb6cb3ae612c59601779469365e41fe6732cb3138d00
diff --git a/dev-python/sunpy/metadata.xml b/dev-python/sunpy/metadata.xml
new file mode 100644
index 000000000000..1915944eec82
--- /dev/null
+++ b/dev-python/sunpy/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    SunPy is a community-developed free and open-source software package for
+    solar physics. SunPy is meant to be a free alternative to the SolarSoft data
+    analysis environment. The aim of the SunPy project is to provide the
+    software tools necessary so that anyone can analyze solar data.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">sunpy</remote-id>
+    <remote-id type="github">sunpy/sunpy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sunpy/sunpy-0.7.9.ebuild b/dev-python/sunpy/sunpy-0.7.9.ebuild
new file mode 100644
index 000000000000..9d1336d23d42
--- /dev/null
+++ b/dev-python/sunpy/sunpy-0.7.9.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Software library for solar physics based on Python"
+HOMEPAGE="http://sunpy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="jpeg2k test"
+
+RDEPEND="
+	<dev-python/astropy-2[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/suds[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	sci-libs/scikits_image[${PYTHON_USEDEP}]
+	jpeg2k? ( dev-python/glymur[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mpl[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# use system astropy-helpers instead of bundled one
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" -m pytest sunpy -k "not figure and not online" || die
+}
diff --git a/dev-python/sunpy/sunpy-0.8.0.ebuild b/dev-python/sunpy/sunpy-0.8.0.ebuild
new file mode 100644
index 000000000000..4aa502509e14
--- /dev/null
+++ b/dev-python/sunpy/sunpy-0.8.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Software library for solar physics based on Python"
+HOMEPAGE="http://sunpy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="jpeg2k test"
+
+RDEPEND="
+	>=dev-python/astropy-2[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.11[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/suds[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	sci-libs/scikits_image[${PYTHON_USEDEP}]
+	jpeg2k? ( dev-python/glymur[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-mpl[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# use system astropy-helpers instead of bundled one
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" -m pytest sunpy -k "not figure and not online" || die
+}
diff --git a/dev-python/superlance/Manifest b/dev-python/superlance/Manifest
new file mode 100644
index 000000000000..c13b70a5e967
--- /dev/null
+++ b/dev-python/superlance/Manifest
@@ -0,0 +1,6 @@
+DIST superlance-0.14.tar.gz 36237 SHA256 74bba9be799a3eacb4120f05d2999d401365527f3cd0e924f68b6e475367c987 SHA512 41fdc9cf83ce636aea3665aed0fa9b1a37c2fe4d3740db694c20f60676d44ee6cc534ae038018edc0a1057607bac9dd4f0d14ea365735148a19a10e138723efd WHIRLPOOL b11f7eaf04f108b9183cbdb2f6ab329bd663fb8a1a1845c6e949f1e3b1fe32550ca432990203f2274fb4bc33145047f9b446d3bf181233bff6df34f32f9ae0c8
+DIST superlance-1.0.0.tar.gz 36909 SHA256 f697c71341e9a686f3a0ff3f04a82448523eac0a6121484933729ba65a973a63 SHA512 f85dbd0768820e2f679b374c5178e6b74de21cebd813a485f615203784e25a968ddcbae72cae41dc56f4f105dab9a6ead16acf4d4cffa3cf30d91650ebb20611 WHIRLPOOL 87b5d3df4d426bced16a2c82f4383e904b91a7905d0f5193c716b989b4a2abe34eea712ef30e4721654787260bbc560108438322cf929d287b6374b4df30185d
+EBUILD superlance-0.14.ebuild 813 SHA256 020ae1819e6f3662524a5bc8582effd5c8fe05825dd024a054534a21701c22b5 SHA512 804594c216f7b90ccea706fd482aecd0abf6d310ae6ae2b57464a196402bca17d80fa022d0f6faef0f285891867dacde40d7e066b616f35688e8c8d218ce41ec WHIRLPOOL 7670a1480e0f3e85db51655137138467c32700c1f37a414886f0eacf9b3faaa090e37b69bcc7f275f973d05655d667deb279e7abbdac1b0fdbc12c125fcbfbcf
+EBUILD superlance-1.0.0.ebuild 813 SHA256 020ae1819e6f3662524a5bc8582effd5c8fe05825dd024a054534a21701c22b5 SHA512 804594c216f7b90ccea706fd482aecd0abf6d310ae6ae2b57464a196402bca17d80fa022d0f6faef0f285891867dacde40d7e066b616f35688e8c8d218ce41ec WHIRLPOOL 7670a1480e0f3e85db51655137138467c32700c1f37a414886f0eacf9b3faaa090e37b69bcc7f275f973d05655d667deb279e7abbdac1b0fdbc12c125fcbfbcf
+MISC ChangeLog 1287 SHA256 59a0d0ae5608d4a3af658d5effb686936d0e3c19d077cafd6f3ce77d6708d9f4 SHA512 631c288c3c8d72cfa673dd508e34408755809095045166edba88717021ab16300e5cbc9aea02aed0adf2c1c81cf5b4c8cd5a84ac2b0f16b4e6f7215811117cb8 WHIRLPOOL f2784ad7963af44f896e1998960e53d8ce8de6ac0ebaa5bb76ff988ab4b8715f4eb88612338c12a8f4496e6d6d7c154afa6751f3b7b054206c80ca7a859379ce
+MISC metadata.xml 572 SHA256 0843c767024374db6a3509b49fff85cd4e9d04eb84bd909799776d9669c085f8 SHA512 4b3ece13121b93f2f0e2419b3b61dc8644c7da8803dac03808a4e75405f5fe6997f408c29ea0d956c3994d97c2d2f1626061a3f68a3ac4dc2b402021c30bfeba WHIRLPOOL b9f75d7b358c3995c9f2f510a554fc7a7b6a29d6912852eb6f6e13de04f093fbc3c7f70fd55926eaba63f139cfa30323b7f0d8fa6fdf1be4f1e0ae9df5688678
diff --git a/dev-python/superlance/metadata.xml b/dev-python/superlance/metadata.xml
new file mode 100644
index 000000000000..6417ec325937
--- /dev/null
+++ b/dev-python/superlance/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">superlance</remote-id>
+		<remote-id type="github">Supervisor/superlance</remote-id>
+		<bugs-to>https://github.com/Supervisor/superlance/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/superlance/superlance-0.14.ebuild b/dev-python/superlance/superlance-0.14.ebuild
new file mode 100644
index 000000000000..77b342974b4f
--- /dev/null
+++ b/dev-python/superlance/superlance-0.14.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A set of plugins to monitor and control supervisor"
+HOMEPAGE="https://github.com/Supervisor/superlance"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="app-admin/supervisor[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/superlance/superlance-1.0.0.ebuild b/dev-python/superlance/superlance-1.0.0.ebuild
new file mode 100644
index 000000000000..77b342974b4f
--- /dev/null
+++ b/dev-python/superlance/superlance-1.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A set of plugins to monitor and control supervisor"
+HOMEPAGE="https://github.com/Supervisor/superlance"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="app-admin/supervisor[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/supervisor-quick/Manifest b/dev-python/supervisor-quick/Manifest
new file mode 100644
index 000000000000..83d3d939bb8e
--- /dev/null
+++ b/dev-python/supervisor-quick/Manifest
@@ -0,0 +1,4 @@
+DIST supervisor-quick-0.1.4.tar.gz 3662 SHA256 8be428cc10e868b2d2dfc57fc5b9ea1b2652d7c78b60313750a50ff77f92a9f3 SHA512 e805cdb28a5f1b7d594983cd807cfc015c6c28c721e4595143b2856f29f82d8c835ec47969ea240922395cd8fa682da475ad53761f3a8510941d9c2e4f80f711 WHIRLPOOL 24adb29efc4d156114dc8e2913b2e7096526a535efff65621362c75b17e470c930a6a11a17e384acce5112cd95d0b562c2701ad438d25882bdae3733db469e49
+EBUILD supervisor-quick-0.1.4.ebuild 446 SHA256 79b7a1621232f58e739edd0068316ba1a489de85c834a487cec403fbee97bf35 SHA512 879c370d37568013481c57c9248e1786b581370f88064066273fd4938f4c3d22f0532eb958866aa91eaae024868ece51482f6462936f200aaa01378af9595c08 WHIRLPOOL 84f7d74d1bc5fb889b1ebaab907ebdf8a728812806eaf1fbb34ead1fcd6709a2e411bb0ac64e9a40dc3722efbf168b2a15262462d8feb24f5152bacfa5ce4251
+MISC ChangeLog 321 SHA256 b77b80f611450b621572f832f08b25a637ff6cc4ecc60a9f8ada644c496d2843 SHA512 16cef0635269b4eb654bfdda5dcb3da6ea51e449b643830e2fe565e2801e712ed753898509af6ef31f24fc806b87bcfba2db5c939d1ea402b815fe5b39d0504d WHIRLPOOL b471d9c15d758f61963cb4ea85413f2bad79369eff3326d451cb03bba291980d296c7d460b287224891880227b1d60f738a6d76cafdae297adb598af9afa50ff
+MISC metadata.xml 340 SHA256 530a7b3c87f6f0bc0121a2838c6c8b9c0db97a7656d4546200683b55d5703011 SHA512 f4dc593baf929a342f017a84ccbc244f7b39bfd2b16d0ebdd60b0c8154a6ee426d9557edbbcb3a1fc32f31d38552ce144a24659ead87442f66cc19564a5b8dd8 WHIRLPOOL b53fbf4f9f3620a75121f04d241bfad4510af29c2d8cd167f2a4d1da4dd4a843133f760b6e04479bbedaba42e4ae60785d60677f1772b28910de8cd5a25d4a97
diff --git a/dev-python/supervisor-quick/metadata.xml b/dev-python/supervisor-quick/metadata.xml
new file mode 100644
index 000000000000..a11c8199fa7f
--- /dev/null
+++ b/dev-python/supervisor-quick/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>klausman@gentoo.org</email>
+    <name>Tobias Klausmann</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">supervisor-quick</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/supervisor-quick/supervisor-quick-0.1.4.ebuild b/dev-python/supervisor-quick/supervisor-quick-0.1.4.ebuild
new file mode 100644
index 000000000000..3e047f8f1671
--- /dev/null
+++ b/dev-python/supervisor-quick/supervisor-quick-0.1.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Bypass supervisor's nasty callbacks stack and make it quick!"
+HOMEPAGE="https://pypi.python.org/pypi/supervisor-quick/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	app-admin/supervisor[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
new file mode 100644
index 000000000000..889f53a4128a
--- /dev/null
+++ b/dev-python/sure/Manifest
@@ -0,0 +1,11 @@
+DIST sure-1.2.24.tar.gz 28089 SHA256 5c0456a0bfec40ffe57bf9f1f1d4f6cfd4b92848b8c97b5b4165afb933c0d2d3 SHA512 875d2cb220d8915737909df372bedc2266c5c948c6f5ea23f3de5ee57b0f1179d2a0ae3455228d71a4f0f4279c098bb4c142a862b55462d67fd425c0def49a8b WHIRLPOOL 6cc102e2aabb143af0ae8104a4ce7d2fe44c00facf2d27d43b5d9e44f9f9b81ba888d6e2df91f2c14b3d50c5502450dc4c353e802a17c176353f284cd84db9a2
+DIST sure-1.2.3.tar.gz 16921 SHA256 f6200277de5b63094f2d1d384967e19a95be53ba664bb7a748b3b183e5cfadf7 SHA512 79f9e7639e468e61858d70cb3184c44e9de30d1ecefb4701e3a305b9fc231b9a4df27e795f8b31da6ddc221ba002bc83dd59621e7f364598c80b831a4bcc9fa9 WHIRLPOOL 1c2d5d58b2765e1ea89bb27d079083479f4460a01ae735268fbc82148643348a8796ec6142b39e4a188fb6bad16a130578b66ae52bd2ebe112bd2972cd6cc54a
+DIST sure-1.2.5-r1.tar.gz 52128 SHA256 8a77c1372f3bf9784310b3cf0ab66e86190b531a2b68e47616bce0e4e4983fbe SHA512 733df3a9482cc23e5f078b554a80a726ed87f4ac307b00166d5ad7d8d40de47fe7d77a7373b213d75fc78849a2ba0dbea89f71c6f29449f52eab448fdf847c45 WHIRLPOOL d466c9a6016f636f2b388ed001c12f7e050184b2b54507e1ef5ead4899b2ab8433022254645bd7a989f15105d768902e18289c8f23cff82277d422811f1b7cfb
+DIST sure-1.2.5.tar.gz 19048 SHA256 63f9861f607c5a27d090edaf91e6c93421a11ae1c011171f7394f44ccc391cdc SHA512 41f097318093b7e1683c38cae7aad3551bcc4e82918d3005388ce660c81a014b0939d3ad9dc12905c50892c82282c3e90aadb01ca7600b593d09afa2549c7135 WHIRLPOOL ea3bb51d9f0b375656b248c80c0a381fc026347efb0a94c856fb319c1e6f1e7d9e6e5a665f57e835a4fdb50060f3b2fa4c9168e8f61ae01af5a05bfc337a9481
+EBUILD sure-1.2.24.ebuild 906 SHA256 bf35a3e23a80bcdf7a2dc181a9141f468eb03e59b4fe0ad84c02c7b3b246987e SHA512 309ea5ab70035eeb265f0d3c00f3b2a550c92884dc20ae2d863021a4766c63879dd2e9c5f47b147edbb423f4f9887ef9adb1bada52a295944c3d87e77a1e3d9d WHIRLPOOL ab55179a3f816e16c719537083cfbade731d43ebf57a079cc4dc73116683209f174801dec29987b0e0b304b5b4d3b8eeb9a886c98f44b0c9bc9af76d825e0f2e
+EBUILD sure-1.2.3.ebuild 462 SHA256 333c167635127e1e931d6efcbd3d9108010ca699acdc2428673ab9d5fe3d496f SHA512 20aa3671374141221a822ce12bce5dec56b8b5bfefab1e15ccd9b85c33dfddcc89c43fd87078c5c0ea9597e7f33c382ac04b4aaa5aa3fc04f6d8f19174678116 WHIRLPOOL 65d4998673e25109f46260a085c7171ccb6e5881583c9f55680a55acc87325c7dde9c4b2f8148cbd25c481d4a2aeb15f6f7b16168c991fe9794400465e59590f
+EBUILD sure-1.2.5-r1.ebuild 904 SHA256 8d983596acca439fe2c43ff7238ff755d15dcc03a70a3ea20b15ed24b218eb2c SHA512 ee29b6d960a543ca83f959e7f6943f14272dbcb5a5934b993c7bd532bbf6022c897aad282e30cc444604c4511f9eee7eaa57c82800c27e504acb298c8edec064 WHIRLPOOL f26595376eeced9a3ea062dc0cca3517aaf4361c1a168953a611f72ca8761f8752566d956b082505421f6e2e5c2af0443e385515217aa879b5dcf3e64801134e
+EBUILD sure-1.2.5.ebuild 462 SHA256 333c167635127e1e931d6efcbd3d9108010ca699acdc2428673ab9d5fe3d496f SHA512 20aa3671374141221a822ce12bce5dec56b8b5bfefab1e15ccd9b85c33dfddcc89c43fd87078c5c0ea9597e7f33c382ac04b4aaa5aa3fc04f6d8f19174678116 WHIRLPOOL 65d4998673e25109f46260a085c7171ccb6e5881583c9f55680a55acc87325c7dde9c4b2f8148cbd25c481d4a2aeb15f6f7b16168c991fe9794400465e59590f
+MISC ChangeLog 3281 SHA256 598d3c1759f464ba209426caea5ed233a969948e8f22a492878c41e98c454ea7 SHA512 4fbe404762039339a9edc37123aa44ff7c6ea6813b42420be01a66b7fa413bba934cc2c24f1b3344c79bf09031e1efa715c174cf8674add7e4587f0a8d566693 WHIRLPOOL d61350316341c5938517d0ac628bbf75035387a96de843f05e56dafd0bc4eba5e0b11e893eedcc07a1afd5cf5b03872b3c047d50b8345ac9be0ee306730fe513
+MISC ChangeLog-2015 1713 SHA256 b271d47e9ab03956d149e71a90b1eec5a5701307768590f3a369b62447603765 SHA512 7a624f0779616778ed4633fa867eab8ac45a28877150a6751f91d41129cb06b596aa2910a9fe9239f2ed4f386c8f972a5a388b2e02c40cf7858d37d222b80ebb WHIRLPOOL b5eab4f03e805573a1de1685ef11a990019bfbd516684095fe2d09cd055474ce50dd86bd9010825885136119bf75c13959cc416a5094944822591825a292e30c
+MISC metadata.xml 383 SHA256 e465d073af24ae4c2ef4670ab582e21438ff217daecda66bbdb1256035f0aa4e SHA512 278e14f9355806a47bf91640662512576e153074ff4620cd765dc583cf0cf68e0192722d466114ab3b4e24a5f3796b41227477dfcc784c86749daa3c07b2be15 WHIRLPOOL 950b684de4fdbd99cc05e0b39a1fad8f520d5b8db3554e19c007d99166d604375a2adf3ec47417f2d007eb7b608b9da892f3658a4e18a67931a7ca4b046c3537
diff --git a/dev-python/sure/metadata.xml b/dev-python/sure/metadata.xml
new file mode 100644
index 000000000000..1e633bbf7dce
--- /dev/null
+++ b/dev-python/sure/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="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">sure</remote-id>
+    <remote-id type="github">gabrielfalcao/sure</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sure/sure-1.2.24.ebuild b/dev-python/sure/sure-1.2.24.ebuild
new file mode 100644
index 000000000000..66ed053658a2
--- /dev/null
+++ b/dev-python/sure/sure-1.2.24.ebuild
@@ -0,0 +1,40 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Utility belt for automated testing in python for python"
+HOMEPAGE="https://github.com/gabrielfalcao/sure"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ppc64 ~x86"
+IUSE="test"
+
+CDEPEND="
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	~dev-python/rednose-0.4.1[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${CDEPEND} )
+"
+RDEPEND="${CDEPEND}"
+
+python_prepare_all() {
+	sed \
+		-e "82s/read_version()/'${PV}'/" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v -s tests --rednose || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/sure/sure-1.2.3.ebuild b/dev-python/sure/sure-1.2.3.ebuild
new file mode 100644
index 000000000000..548465031291
--- /dev/null
+++ b/dev-python/sure/sure-1.2.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A utility belt for automated testing in python for python"
+HOMEPAGE="https://github.com/gabrielfalcao/sure"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sure/sure-1.2.5-r1.ebuild b/dev-python/sure/sure-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..68514254ce81
--- /dev/null
+++ b/dev-python/sure/sure-1.2.5-r1.ebuild
@@ -0,0 +1,40 @@
+# 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} pypy )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Utility belt for automated testing in python for python"
+HOMEPAGE="https://github.com/gabrielfalcao/sure"
+SRC_URI="https://github.com/gabrielfalcao/${PN}/archive/${PV}.tar.gz -> ${P}-r1.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+	~dev-python/rednose-0.4.1[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${CDEPEND} )
+"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${P}-r1"
+
+python_prepare_all() {
+	sed \
+		-e "82s/read_version()/'${PV}'/" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -s tests --rednose || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/sure/sure-1.2.5.ebuild b/dev-python/sure/sure-1.2.5.ebuild
new file mode 100644
index 000000000000..548465031291
--- /dev/null
+++ b/dev-python/sure/sure-1.2.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A utility belt for automated testing in python for python"
+HOMEPAGE="https://github.com/gabrielfalcao/sure"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/symboltype/Manifest b/dev-python/symboltype/Manifest
new file mode 100644
index 000000000000..1393b4cb9f3c
--- /dev/null
+++ b/dev-python/symboltype/Manifest
@@ -0,0 +1,5 @@
+DIST symboltype-1.0.zip 9507 SHA256 bcc311398c7dbcc9cbde9fe68bba89b0efe45103410b5949f3acf484fcb14f39 SHA512 1484adf4bd2df4f6def5cb6dab50e17d21a2baacb12af8a03aa981478deb97d1cfd3620c0e7d0e6e8c631b0c6bfc3912196c20a0feb39a3ddd4cf9e9dc42b6b2 WHIRLPOOL b92f3369f928f0021e6fe44877b2842cba18416cf0c3a0cb95c82a87604c227a927fa59fab28d98acad806eb864d80f9f319f53c965fa7bbfa7b37d4e1aa77a9
+EBUILD symboltype-1.0.ebuild 726 SHA256 34093202351b6ab94c9c0b0cf39b70824d98a5fe6ceda82b2b44934a13ec4756 SHA512 3b6e549584d4949f1e8991d183cb7d91d8816077a368532ae0c8985a5e5d5e5d3182db8961fcce0ad61c27950201549fa9e9b156b8e13da254cf37495e422687 WHIRLPOOL 957a7b0ddb805469e15f2e4b11098e421826d96e04ab7f0a9abf54525338fa9a22d45bab6645d9afd93d9292b9edcdec8b8c08297c77caab0eef076160b87692
+MISC ChangeLog 2578 SHA256 be58d21d524591cbf559b7f1c32b6c2740a66c4516863d44de031ffc458a933d SHA512 501d64240327f792bf44d56df04942bb032e9913fe3653e280c6218b1705aab9f65f2bc7602d4853d57264a3aa08d28fe27b4f02bd206a8d7e9f0db39251e0f8 WHIRLPOOL 0007cc1a594cba09a3a9bbcaf122230952c52a7f2e470dd3a7e3a8e295c852a219b9ae5c8c1ee2c4bb599d2754c74eea6bfeaa7cdf936cf4824f9941e107a418
+MISC ChangeLog-2015 1037 SHA256 db04cd90f48c12e60e187c0efb88c78ea1138053b10b9d712288e21213626b0d SHA512 bd5323000d863245747ee864c0ddda4d0a83affa7cfbac1fa32a879e43e3999337bcbebfc65a09c3509974dd44f3de125b980cfd8b8aaf8e5186d13a12716ff0 WHIRLPOOL 7c102cc168276db72be1dad02a370efb8c932182dc4da9d8b05b61440096b0697b1b5aa1ffb61a7348bb6716c85bf082c6805f6b2c5f497dc4f7873164395365
+MISC metadata.xml 323 SHA256 a5b52379cfc969096634de2f3cc8434e18cf33e82c7c582f33e93aae0892ad42 SHA512 8fa028634a6e9c5a60fdd9864555c2c9a626f1bfd3a5eef7e596ddfe0c66500c2839fd2aa8553615f85f02332d8b5255b2a920d531e4f939f46ed4a30f189b8f WHIRLPOOL 5c434fb89e33ac6bc7caae6c24463350b6805830cc383b631bbce3f7fe52840459a754495afb25ab1906274fdf8ba42f03f5e8ba030673ebf6be8a103bf6b92d
diff --git a/dev-python/symboltype/metadata.xml b/dev-python/symboltype/metadata.xml
new file mode 100644
index 000000000000..7e68881f8015
--- /dev/null
+++ b/dev-python/symboltype/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">SymbolType</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/symboltype/symboltype-1.0.ebuild b/dev-python/symboltype/symboltype-1.0.ebuild
new file mode 100644
index 000000000000..ea4b34c262de
--- /dev/null
+++ b/dev-python/symboltype/symboltype-1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_PN="SymbolType"
+
+DESCRIPTION="Gives access to the peak.util.symbols module"
+HOMEPAGE=" http://peak.telecommunity.com/DevCenter/SymbolType https://pypi.python.org/pypi/SymbolType"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
+
+KEYWORDS="amd64 x86"
+IUSE="doc"
+LICENSE="ZPL"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+python_test() {
+	"${PYTHON}" test_symbols.py && einfo "Tests passed under ${EPYTHON}" \
+		|| die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/symengine/Manifest b/dev-python/symengine/Manifest
new file mode 100644
index 000000000000..0c3ea3004c3b
--- /dev/null
+++ b/dev-python/symengine/Manifest
@@ -0,0 +1,3 @@
+DIST symengine.py-0.3.0.tar.gz 90877 SHA256 0ecccfe5a09b25b6640afca12de62062bdb60ed2712d6c16cc47fc1ba1e851ac SHA512 9f43d572990744a93f4046920b09c80aff3ffa0e5735b2372298a65755140dee6c2c22c9c9fd964622f03379e31a1f1415d0051b213dda943ffc8e839059c7c6 WHIRLPOOL e00c1b8876ec249b83228ced660c609b3d55d2a5f40578c2ca36351e38e6b161bccb5ed580d38cbd16467789d3c3d787b65fbe2f14be7184939908848b758da1
+EBUILD symengine-0.3.0.ebuild 944 SHA256 b5f4cf3d803cdca2993958806517cdf95d05f1e3406aa0166d90c61904566996 SHA512 59fbebfb889bb965d6e1cae20874579cf4899c2e77eacb116990d6ec48ce082533523cdac76fb87d531536776b0d2f1454850ac3e4bb304573267cedd6da8e64 WHIRLPOOL b0b880213993e8a55b9954b009ca1cc2206064e90dee1425e318882b3c26f1c43972f9ecba088034399f69f3d6d83c97d84d02bcbdaed495a9309a64d8b3f373
+MISC metadata.xml 499 SHA256 77f01c99d675e3bacd43f00f8821a614ff0547c65829a1f95749037fcdf73385 SHA512 e3b01c1a5e3417fff75d843b24a20597c15900defd0efad954831b61a03980c9163fc596bb22ae4fe4cb5162cd492c383247560ced28c395467e1facc49cd573 WHIRLPOOL ba1fc01f7f10677529b2831bde9404a11610ad8a74aef35771ef917b1799f7fb404b84ec287a9e109252e4ba42016cb28a54a5811aa20607e20480f2984f71ef
diff --git a/dev-python/symengine/metadata.xml b/dev-python/symengine/metadata.xml
new file mode 100644
index 000000000000..a7413ed86c45
--- /dev/null
+++ b/dev-python/symengine/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
+  <longdescription>
+    Python wrappers to the C++ library SymEngine, a fast C++ symbolic
+    manipulation library.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">sympy/symengine.py</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/symengine/symengine-0.3.0.ebuild b/dev-python/symengine/symengine-0.3.0.ebuild
new file mode 100644
index 000000000000..b972a264b220
--- /dev/null
+++ b/dev-python/symengine/symengine-0.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+MYP=${PN}.py-${PV}
+
+DESCRIPTION="Python wrappers to the symengine C++ library"
+HOMEPAGE="https://github.com/sympy/symengine.py"
+SRC_URI="https://github.com/symengine/symengine.py/archive/v${PV}.tar.gz -> ${MYP}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/symengine"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MYP}"
+
+python_test() {
+	cd "${BUILD_DIR}"
+	nosetests -v || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_prepare_all
+	rm "${ED}"/usr/share/doc/${PF}/README.md || die
+	newdoc README.md ${PN}.py.md
+}
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
new file mode 100644
index 000000000000..d3ebaef82e54
--- /dev/null
+++ b/dev-python/sympy/Manifest
@@ -0,0 +1,17 @@
+AUX sympy-0.7.6-doc-makefile.patch 573 SHA256 71206fbb563c6624e03450a701e42209578e8c34073c93462dedf8a73491b5bd SHA512 b5d3943da750bf37b2f193fd5458b3305000a4927112e5ff2444680c203c2854e75e25c5a109462eca03c6964b667d6b740f28fbe945c354064de284b2fb3573 WHIRLPOOL aa955e605055df3f2c2b5fe2f333ef64cc1d98f613d8777a5eeef5fb365017e23749316e7e9df2642a469fe50ff6d743a6780eacede73013a1a4e61be9acec23
+AUX sympy-0.7.6.1-sphinx-1.3.1.patch 2305 SHA256 34c9266e5881568f359043a287bc0b8b9f4fc4d52abf90c1378b7c72e818eac6 SHA512 dd93360697be0c53b66af77b5e6670f0c83c1802a4cfc833c1038e52fd1bf2389b1cf974b783ed98f2e2551e52992c55bdf11f71db5ec29e496517c1c971c409 WHIRLPOOL 5019894ce76ab14ae51ed3185613d429ec344158b19392912a1f57495908adf3891c83596289725c9b5c90cfc9618848369445a0d61d872b6080240b16421771
+AUX sympy-0.7.6.1-zeta.patch 1070 SHA256 b98bc76c438ea211fd0ee17b3028df8b8a8b9648a20f13cc6e19fed50ff03151 SHA512 0dba3db948369757eb073ecf1665b833673ba04e023b5bb272acf66a3e5f34e4e53e3c77997f99c64e437f299c340dd9450f6bf13b5b1c2f9980487d071f4d7d WHIRLPOOL 1bb01cde01cbfcfd1d1e34121638dad0a10daeccf0bbfd960e097742edc27522321cb82db4bb26adcb67c735487416943e5fdd0edea97e6a560926da10d466ce
+AUX sympy-1.0-doc-makefile.patch 565 SHA256 56d963ed6836565158f060e2395674f899ccd67b964340b9a700b3d8af3b7158 SHA512 45012ba3c3af162510eff7c6800c2a88739aff203a46ae95b854685850658bf68feacb7d100a164ac58cd7968058bb555909c1f0d6d06e54532a14c0b5e64069 WHIRLPOOL dc758e654e74aba8fd9e9c8cc3c41767ed17baf634443ad57cd35a12e2dbcf53803d6b1d9d55112e393c1aa5ed4329c4995dd21c75e7a948497d63c339b0b0fd
+AUX sympy-1.0-zeta.patch 1908 SHA256 d0e933ad40f609e2aa37a3eeb62332d34b98180535b76745e9545352b31970d4 SHA512 b3cc3ae37c8faf7077c8b3018859c21a14b38f92d85de4386686a20f0318b9e73ab33fde276f00b859e0de19022cbd095844d4310398ec5cb4a4441cddc0b21b WHIRLPOOL 3cb5602fa07a3fb68b6df23c3f72a6db7ec32945c26ca9be5144b2cb1b1b0fa60f3274102c6a8d03afd3ad5402c385080f4f4cf71dae1e82ad7ab13c50eb7168
+AUX sympy-1.1.1-zeta.patch 1097 SHA256 78a2a7d37fd0b58d3faa60c44d5698a7170e1d8ba347ae43219728709dac7c89 SHA512 e8e1ed0c9ace2c05b0b466759642ec8c196bb65d8bee3b8b3f742dfdaeb50eb9793deb1e88e4e0d30ac7e71a22b50c9670a2b31ea042701c02c2a98062b9b48e WHIRLPOOL 8a55659320e4bab3887fbe6df0e2880ba459cc52f997ed712e5daa65520990a8c3cffb9eb468ada3eab339f1eaf5a8bfb260274ada80784db9b2f722a347a8fa
+DIST sympy-0.7.6.1.tar.gz 6431571 SHA256 1fc272b51091aabe7d07f1bf9f0a47f3e28657fb2bec52bf3ef0e8f159f5f564 SHA512 18877abd3c530418e4f4942cbb0a03140dc81e5a1004720c472fb97cf8eaa41acca59765f6278715ea88bcd0cd07ad5952863a0d1b6e6d00994d257e8c0a6574 WHIRLPOOL b0c0c74e7865c91585d1a2c8510fe328b8e697dec02bd17aaa446ef6e089b9cf2ca5b4f58b6b59febccf142384b907e1bd47451e22fa305843bd883355801226
+DIST sympy-1.0.tar.gz 4281528 SHA256 3eacd210d839e4db911d216a9258a3ac6f936992f66db211e22767983297ffae SHA512 977db6e9bc6a5918cceb255981a57e85e7060c0922aefd2968b004d25d704e25a5cb5bbe09eb387e8695581e23e2825d9c40310068fe25ece7e9c23037a21f39 WHIRLPOOL df02cc8603c23f621226f28b4f0555e765f145d968869058ed9420fedd3c6d6d0f095ee14fa864cd505455f245e5adf10794fc3b1392fb5a331ed5dc506b988b
+DIST sympy-1.1.1.tar.gz 4580952 SHA256 ac5b57691bc43919dcc21167660a57cc51797c28a4301a6144eff07b751216a4 SHA512 ff8857fd5810795554ca4f636b2d8e633057d7ea7df76461003d823ecbaddc98cde0561eb79a1058741c5ece233c13bfcb5e30d5bfb8ac6dbab3d05d8226f92b WHIRLPOOL 3ab86021e99de620127bbd3da994745d265e66fbe7ebf77984106f998443200dd7a5a3295cc62e3bca7e3eb1df58b331d1faba568760230fab550c5c2c3f92b9
+DIST sympy-1.1.tar.gz 4579454 SHA256 e42d7b8cc719bb0427b503d49f8489ec6292c74957c3bd04216a8392bee37782 SHA512 4129752778b50fbc08180fe413d2109ad418b54b79caea461b9a6cf6856ab4f50ce95df6131b07791ed633c840648aa7c4dd130ab3f1cbb1e03e7346e995747b WHIRLPOOL bcee355015504a464c89f1cc2c35b3085af6d53a4d8c2245eda124ddbf53fb562b6a768b2d6cd79688b1255a21540094bd18e3f814dd729541a85767e27adb3c
+EBUILD sympy-0.7.6.1-r1.ebuild 2679 SHA256 eda8089a1e8bf8dd36c15692cf6750a682ac0b5f9711351eeeaa9ec00ab6462a SHA512 88def7213862db34d36e60ebab7b840f1c57ec1ebc23f2f89efa4c49f2f3d2085b55f934f2a1468c9e3f9c66b584a185a2652bf8b158c1d94289bacf736055b6 WHIRLPOOL d6e1f06058fddd84fa121cbe76f4a9830805d59874b9c1326cfc56b05ff3afa0c1ff9d0cf94cfc97d1216ebbbf274cf0c6f7197d3d398f9b4f6941e0778a5d42
+EBUILD sympy-1.0-r1.ebuild 2687 SHA256 d0b052de963c09c0e731dfad5d4558fa514ce1a03374f3bfb0ef578d2d62377e SHA512 66357e892961b6d6b569cbe87ecbe02efd3188073834871ce97b3423e62ae3761cad984913e4da57f240690df3417b28b9458cd5881bd1d12486d9733b66f463 WHIRLPOOL 9790025b35e14127d3a6b0d7a93a44ecf03fbceaf9ea55c1d65d9d486fd272d679adca507534921dbda187bc2802fbf2eb636734664e600f5556647eb9c376f4
+EBUILD sympy-1.1.1.ebuild 2502 SHA256 958f1b45d9e91089508c26b60272ce7585fb9ea31c906a2ffb8692a08dc3dc31 SHA512 e48115b0f9bb6399dfe85c4cdb3e916d37ba25400c0a6319a20693d05e4e278bbdb1f90490fd25910c153e558d2732bf852ab4fa726682a0c4a3ee395da8d9f9 WHIRLPOOL 5f63c0487283f7b548a06c50e8d7a7aa333bfb59cb91d0fbc74d5693f6fbd12ce6489337941f0e07fc92b4046bc1650959ec7c40396daf3e078f198ed7d62db9
+EBUILD sympy-1.1.ebuild 2471 SHA256 7b9d72292619a0598805caf320860068201ddee196f0a31a1f33e9b593ab405a SHA512 4f64a01768e1afeb495139c7f85b4f6d4d1b17a9edb600272385dd61c6355d66fbac685ca10dc4ecfb92056cd81a1a9bc56ebfbe65b83a83bc5209ba03c03c37 WHIRLPOOL 206c756b5a738b8bb5cda01106f75c8502367bca899273fcbb9e680741e7fdc9c8f34d3c3b3e35f93d7206b091d329addcefd0509f886fbafccf2857bd293018
+MISC ChangeLog 4867 SHA256 233d9656a69e7d06d93cdee411df3afa4b6a0e380adeda274c12b113eaeb298e SHA512 de04e49d6d9b5ad9a739ec8f30b634182f533bd83e9252dfbfce47ab07934152549ba6bb569525311e550549e06ce98785ec54c3119932c3df05c4e0b644943a WHIRLPOOL 1dce1e7d7517838728345762080d30ae26e822ffa0a36cfd2c7523247074d7f45421e8298e639188bea065c8ff3abaa5bcd8ab0e0e28eda8f29b1f882e0f5442
+MISC ChangeLog-2015 5654 SHA256 f499b420c429d816e180a6ddf0af3068262bdb5198a8dc9c49910414b603f657 SHA512 cb2b8de6abce4e10aabb5148a557cc87b65edbcbe64134b60bfefd7b68fce6036d8b6e5a5f446bdc76bd6053fdb8044e8eefce0083462c2138a0edba40bdab36 WHIRLPOOL 5560c892ef02fdb3bfc4408d494be2a14b2525ab716dd914ddf830a76d8345b3e21c758bcb3d7a77d8273a7e94537d8a09c3f9c63794638902768ca3835bbbf8
+MISC metadata.xml 1476 SHA256 329cfc4926c1e27378113fb01216ec7c509174267095cfc6c289459f93163b39 SHA512 99d6eb86839fd09abd4db55783e028c6f97c9d0dfa8d68ceda881e6ca981f86877e55a0a83d34b432833f0824a896eea8af35eb9ea499bffe0c62e1e0a27c3c2 WHIRLPOOL 8ab8d64bb12b1d9234cc66ab1b871cdbbe9368df13c8fa44311a23b3e67073ff0a6af5eefcce1a28799872eecef0c593cdfbf38b1830f969c23b09429ecd37c0
diff --git a/dev-python/sympy/files/sympy-0.7.6-doc-makefile.patch b/dev-python/sympy/files/sympy-0.7.6-doc-makefile.patch
new file mode 100644
index 000000000000..b4beca8c2a1c
--- /dev/null
+++ b/dev-python/sympy/files/sympy-0.7.6-doc-makefile.patch
@@ -0,0 +1,10 @@
+diff -r -U2 sympy-0.7.6.orig/doc/Makefile sympy-0.7.6/doc/Makefile
+--- sympy-0.7.6.orig/doc/Makefile	2014-11-21 02:00:41.000000000 +0600
++++ sympy-0.7.6/doc/Makefile	2014-12-07 20:49:01.091613474 +0600
+@@ -118,5 +118,5 @@
+ 	pdflatex -output-directory=_build/cheatsheet cheatsheet/cheatsheet.tex
+ 
+-_build/cheatsheet/cheatsheet.pdf: cheatsheet/combinatoric_cheatsheet.tex
++_build/cheatsheet/combinatoric_cheatsheet.pdf: cheatsheet/combinatoric_cheatsheet.tex
+ 	mkdir -p _build/cheatsheet
+ 	pdflatex -output-directory=_build/cheatsheet cheatsheet/combinatoric_cheatsheet.tex
diff --git a/dev-python/sympy/files/sympy-0.7.6.1-sphinx-1.3.1.patch b/dev-python/sympy/files/sympy-0.7.6.1-sphinx-1.3.1.patch
new file mode 100644
index 000000000000..c3b208270166
--- /dev/null
+++ b/dev-python/sympy/files/sympy-0.7.6.1-sphinx-1.3.1.patch
@@ -0,0 +1,65 @@
+commit d3d3bd01bc5f625055bfa7247efc1e8cdeef0b33
+Author: Aaditya M Nair <aadityanair6494@gmail.com>
+Date:   Tue Apr 14 16:30:01 2015 +0530
+
+    Doc creation now compatible with sphinx 1.3.1. Closes sympy/sympy#9273.
+    
+    New version of sphinx renamed the `default` theme to `classic` theme.
+    Corrected by defining all variables inside the .css file.
+
+diff --git a/doc/src/_static/default.css_t b/doc/src/_static/default.css_t
+index 6165d8b..c2d8489 100644
+--- a/doc/src/_static/default.css_t
++++ b/doc/src/_static/default.css_t
+@@ -13,6 +13,23 @@
+ 
+ /* -- page layout ----------------------------------------------------------- */
+ 
++{%  set theme_collapsiblesidebar = True %}
++{%  set theme_relbarbgcolor = '#2f441e'  %}
++{%  set theme_sidebarbgcolor = '#3b5526'  %}
++{%  set theme_sidebarbtncolor = '#4F663C'  %}
++{%  set theme_sidebarlinkcolor = '#81B953'  %}
++{%  set theme_linkcolor = '#29A329'  %}
++{%  set theme_visitedlinkcolor = '#307748'  %}
++{%  set theme_headtextcolor = '#2f441e'  %}
++{%  set theme_footerbgcolor = '#293b1b'  %}
++{%  set theme_headlinkcolor = '#AAAAAA'  %}
++{%  set theme_sidebartextcolor = '#DDDDDD'  %}
++{%  set theme_footertextcolor = '#DDDDDD'  %}
++{%  set theme_relbartextcolor = '#DDDDDD'  %}
++{%  set theme_relbarlinkcolor = '#81B953'  %}
++{%  set theme_bgcolor = '#FFFFFF'  %}
++
++
+ body {
+     font-family: {{ theme_bodyfont }};
+     font-size: 100%;
+diff --git a/doc/src/conf.py b/doc/src/conf.py
+index 2c1d302..97837e3 100644
+--- a/doc/src/conf.py
++++ b/doc/src/conf.py
+@@ -96,22 +96,7 @@
+ html_logo = '_static/sympylogo.png'
+ html_favicon = '../_build/logo/sympy-notailtext-favicon.ico'
+ # See http://sphinx-doc.org/theming.html#builtin-themes.
+-html_theme_options = {
+-    'collapsiblesidebar': True,
+-    'relbarbgcolor': '#2f441e',
+-    'sidebarbgcolor': '#3b5526',
+-    'sidebarbtncolor': '#4F663C',
+-    'sidebarlinkcolor': '#81B953',
+-    'linkcolor': '#29A329',
+-    'visitedlinkcolor': '#307748',
+-    'headtextcolor': '#2f441e',
+-    'footerbgcolor': '#293b1b',
+-    'headlinkcolor': '#AAAAAA',
+-    'sidebartextcolor': '#DDDDDD',
+-    'footertextcolor': '#DDDDDD',
+-    'relbartextcolor': '#DDDDDD',
+-    'relbarlinkcolor': '#81B953',
+-}
++
+ 
+ # If true, SmartyPants will be used to convert quotes and dashes to
+ # typographically correct entities.
diff --git a/dev-python/sympy/files/sympy-0.7.6.1-zeta.patch b/dev-python/sympy/files/sympy-0.7.6.1-zeta.patch
new file mode 100644
index 000000000000..ffb85f9feb17
--- /dev/null
+++ b/dev-python/sympy/files/sympy-0.7.6.1-zeta.patch
@@ -0,0 +1,32 @@
+diff -r -U1 sympy-0.7.6.1.orig/sympy/functions/special/zeta_functions.py sympy-0.7.6.1/sympy/functions/special/zeta_functions.py
+--- sympy-0.7.6.1.orig/sympy/functions/special/zeta_functions.py	2015-09-04 02:34:00.000000000 +0600
++++ sympy-0.7.6.1/sympy/functions/special/zeta_functions.py	2015-12-01 11:27:24.000000000 +0600
+@@ -243,3 +243,3 @@
+     >>> polylog(s, -1)
+-    dirichlet_eta(s)
++    -dirichlet_eta(s)
+ 
+@@ -270,2 +270,3 @@
+     def eval(cls, s, z):
++        from sympy import unpolarify
+         if z == 1:
+@@ -273,6 +274,12 @@
+         elif z == -1:
+-            return dirichlet_eta(s)
++            return -dirichlet_eta(s)
+         elif z == 0:
+-            return 0
++            return S.Zero
+ 
++        # branch handling
++        if (1 - abs(z)).is_nonnegative:
++            newz = unpolarify(z)
++            if newz != z:
++                return cls(s, newz)
++ 
+     def fdiff(self, argindex=1):
+@@ -479,3 +486,3 @@
+ 
+-    .. math:: \eta(s) = \sum_{n=1}^\infty \frac{(-1)^n}{n^s}.
++    .. math:: \eta(s) = \sum_{n=1}^\infty \frac{(-1)^{n-1}}{n^s}.
+ 
diff --git a/dev-python/sympy/files/sympy-1.0-doc-makefile.patch b/dev-python/sympy/files/sympy-1.0-doc-makefile.patch
new file mode 100644
index 000000000000..6fe64b853c23
--- /dev/null
+++ b/dev-python/sympy/files/sympy-1.0-doc-makefile.patch
@@ -0,0 +1,10 @@
+diff -r -U2 sympy-1.0.orig/doc/Makefile sympy-1.0/doc/Makefile
+--- sympy-1.0.orig/doc/Makefile	2016-03-08 19:38:39.000000000 +0100
++++ sympy-1.0/doc/Makefile	2016-03-18 20:04:36.393615499 +0100
+@@ -118,5 +118,5 @@
+ 	pdflatex -output-directory=_build/cheatsheet cheatsheet/cheatsheet.tex
+ 
+-_build/cheatsheet/cheatsheet.pdf: cheatsheet/combinatoric_cheatsheet.tex
++_build/cheatsheet/combinatoric_cheatsheet.pdf: cheatsheet/combinatoric_cheatsheet.tex
+ 	mkdir -p _build/cheatsheet
+ 	pdflatex -output-directory=_build/cheatsheet cheatsheet/combinatoric_cheatsheet.tex
diff --git a/dev-python/sympy/files/sympy-1.0-zeta.patch b/dev-python/sympy/files/sympy-1.0-zeta.patch
new file mode 100644
index 000000000000..43f54832c948
--- /dev/null
+++ b/dev-python/sympy/files/sympy-1.0-zeta.patch
@@ -0,0 +1,47 @@
+diff -r -U2 sympy-1.0.orig/sympy/functions/special/tests/test_zeta_functions.py sympy-1.0/sympy/functions/special/tests/test_zeta_functions.py
+--- sympy-1.0.orig/sympy/functions/special/tests/test_zeta_functions.py	2016-03-09 00:38:39.000000000 +0600
++++ sympy-1.0/sympy/functions/special/tests/test_zeta_functions.py	2016-12-28 23:25:19.370041561 +0700
+@@ -125,5 +125,5 @@
+     assert polylog(s, 0) == 0
+     assert polylog(s, 1) == zeta(s)
+-    assert polylog(s, -1) == dirichlet_eta(s)
++    assert polylog(s, -1) == -dirichlet_eta(s)
+ 
+     assert myexpand(polylog(1, z), -log(1 + exp_polar(-I*pi)*z))
+diff -r -U2 sympy-1.0.orig/sympy/functions/special/zeta_functions.py sympy-1.0/sympy/functions/special/zeta_functions.py
+--- sympy-1.0.orig/sympy/functions/special/zeta_functions.py	2016-03-09 00:38:39.000000000 +0600
++++ sympy-1.0/sympy/functions/special/zeta_functions.py	2016-12-28 23:23:56.109047180 +0700
+@@ -245,5 +245,5 @@
+     zeta(s)
+     >>> polylog(s, -1)
+-    dirichlet_eta(s)
++    -dirichlet_eta(s)
+ 
+     If :math:`s` is a negative integer, :math:`0` or :math:`1`, the
+@@ -272,10 +272,17 @@
+     @classmethod
+     def eval(cls, s, z):
++        from sympy import unpolarify
+         if z == 1:
+             return zeta(s)
+         elif z == -1:
+-            return dirichlet_eta(s)
++            return -dirichlet_eta(s)
+         elif z == 0:
+-            return 0
++            return S.Zero
++
++        # branch handling
++        if (1 - abs(z)).is_nonnegative:
++            newz = unpolarify(z)
++            if newz != z:
++                return cls(s, newz)
+ 
+     def fdiff(self, argindex=1):
+@@ -486,5 +493,5 @@
+     For `\operatorname{Re}(s) > 0`, this function is defined as
+ 
+-    .. math:: \eta(s) = \sum_{n=1}^\infty \frac{(-1)^n}{n^s}.
++    .. math:: \eta(s) = \sum_{n=1}^\infty \frac{(-1)^{n-1}}{n^s}.
+ 
+     It admits a unique analytic continuation to all of :math:`\mathbb{C}`.
diff --git a/dev-python/sympy/files/sympy-1.1.1-zeta.patch b/dev-python/sympy/files/sympy-1.1.1-zeta.patch
new file mode 100644
index 000000000000..d9bab8096fac
--- /dev/null
+++ b/dev-python/sympy/files/sympy-1.1.1-zeta.patch
@@ -0,0 +1,29 @@
+diff -U2 -r sympy-1.1.1.orig/sympy/functions/special/zeta_functions.py sympy-1.1.1/sympy/functions/special/zeta_functions.py
+--- sympy-1.1.1.orig/sympy/functions/special/zeta_functions.py	2017-07-22 05:17:42.000000000 +0700
++++ sympy-1.1.1/sympy/functions/special/zeta_functions.py	2017-07-28 06:35:28.477927184 +0700
+@@ -272,4 +272,5 @@
+     @classmethod
+     def eval(cls, s, z):
++        from sympy import unpolarify
+         if z == 1:
+             return zeta(s)
+@@ -277,5 +278,11 @@
+             return -dirichlet_eta(s)
+         elif z == 0:
+-            return 0
++            return S.Zero
++
++        # branch handling
++        if (1 - abs(z)).is_nonnegative:
++            newz = unpolarify(z)
++            if newz != z:
++                return cls(s, newz)
+ 
+     def fdiff(self, argindex=1):
+@@ -483,5 +490,5 @@
+     For `\operatorname{Re}(s) > 0`, this function is defined as
+ 
+-    .. math:: \eta(s) = \sum_{n=1}^\infty \frac{(-1)^n}{n^s}.
++    .. math:: \eta(s) = \sum_{n=1}^\infty \frac{(-1)^{n-1}}{n^s}.
+ 
+     It admits a unique analytic continuation to all of :math:`\mathbb{C}`.
diff --git a/dev-python/sympy/metadata.xml b/dev-python/sympy/metadata.xml
new file mode 100644
index 000000000000..4a6d0ef3980f
--- /dev/null
+++ b/dev-python/sympy/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
+  <longdescription>
+ SymPy is a Python library for symbolic mathematics (manipulation). It
+ aims to become a full-featured computer algebra system (CAS) while keeping
+ the code as simple as possible in order to be comprehensible and easily
+ extensible. SymPy is written entirely in Python and does not require
+ any external libraries, except optionally for plotting support.
+</longdescription>
+  <use>
+    <flag name="ipython">Add support for <pkg>dev-python/ipython</pkg></flag>
+    <flag name="imaging">Add support for <pkg>dev-python/pillow</pkg></flag>
+    <flag name="mathml">Add support for mathml</flag>
+    <flag name="pyglet">Use <pkg>dev-python/pyglet</pkg> for plots and print preview</flag>
+    <flag name="symengine">Add support for a <pkg>dev-python/symengine</pkg> backend</flag>    
+    <flag name="texmacs">Add <pkg>app-office/texmacs</pkg> interface</flag>   
+    <flag name="theano">Add support for <pkg>dev-python/theano</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">sympy</remote-id>
+    <remote-id type="github">sympy/sympy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/sympy/sympy-0.7.6.1-r1.ebuild b/dev-python/sympy/sympy-0.7.6.1-r1.ebuild
new file mode 100644
index 000000000000..c16062a24924
--- /dev/null
+++ b/dev-python/sympy/sympy-0.7.6.1-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1 eutils virtualx
+
+DESCRIPTION="Computer Algebra System in pure Python"
+HOMEPAGE="http://sympy.org"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
+IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet test texmacs theano"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/pexpect-2.0[${PYTHON_USEDEP}]' python2_7)
+	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
+	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
+	latex? (
+		virtual/latex-base
+		dev-texlive/texlive-fontsextra
+		png? ( app-text/dvipng )
+		pdf? ( app-text/ghostscript-gpl )
+	)
+	mathml? (
+		dev-libs/libxml2:2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-libs/libxslt[${PYTHON_USEDEP}]' python2_7)
+		gtk? ( x11-libs/gtkmathview[gtk] )
+	)
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+	pyglet? ( $(python_gen_cond_dep 'dev-python/pyglet[${PYTHON_USEDEP}]' python2_7) )
+	texmacs? ( app-office/texmacs )
+	theano? ( $(python_gen_cond_dep 'dev-python/theano[${PYTHON_USEDEP}]' python2_7) )
+"
+
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_prepare_all() {
+	epatch "${FILESDIR}"/${PN}-0.7.6-doc-makefile.patch
+	epatch "${FILESDIR}"/${P}-sphinx-1.3.1.patch
+	epatch "${FILESDIR}"/${P}-zeta.patch
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	PYTHONPATH="." distutils-r1_python_compile
+}
+
+python_compile_all() {
+	if use doc; then
+		export XDG_CONFIG_HOME="${T}/config-dir"
+		mkdir "${XDG_CONFIG_HOME}" || die
+		chmod 0700 "${XDG_CONFIG_HOME}" || die
+		emake -j1 -C doc html info cheatsheet
+	fi
+}
+
+python_test() {
+	virtx "${PYTHON}" setup.py test
+}
+
+python_install() {
+	PYTHONPATH="." distutils-r1_python_install
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	use doc &&\
+		DOCS+=(
+			doc/_build/cheatsheet/cheatsheet.pdf
+			doc/_build/cheatsheet/combinatoric_cheatsheet.pdf
+		) && \
+		local HTML_DOCS=( doc/_build/html/. ) && \
+		doinfo doc/_build/texinfo/${PN}.info
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+
+	if use texmacs; then
+		exeinto /usr/libexec/TeXmacs/bin/
+		doexe data/TeXmacs/bin/tm_sympy
+		insinto /usr/share/TeXmacs/plugins/sympy/
+		doins -r data/TeXmacs/progs
+	fi
+}
diff --git a/dev-python/sympy/sympy-1.0-r1.ebuild b/dev-python/sympy/sympy-1.0-r1.ebuild
new file mode 100644
index 000000000000..358b62dde769
--- /dev/null
+++ b/dev-python/sympy/sympy-1.0-r1.ebuild
@@ -0,0 +1,95 @@
+# 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 virtualx
+
+DESCRIPTION="Computer Algebra System in pure Python"
+HOMEPAGE="http://sympy.org"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet test texmacs theano"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/pexpect-2.0[${PYTHON_USEDEP}]' python2_7)
+	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
+	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
+	latex? (
+		virtual/latex-base
+		dev-texlive/texlive-fontsextra
+		png? ( app-text/dvipng )
+		pdf? ( app-text/ghostscript-gpl )
+	)
+	mathml? (
+		dev-libs/libxml2:2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-libs/libxslt[${PYTHON_USEDEP}]' python2_7)
+		gtk? ( x11-libs/gtkmathview[gtk] )
+	)
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+	pyglet? ( $(python_gen_cond_dep 'dev-python/pyglet[${PYTHON_USEDEP}]' python2_7) )
+	texmacs? ( app-office/texmacs )
+	theano? ( $(python_gen_cond_dep 'dev-python/theano[${PYTHON_USEDEP}]' python2_7) )
+"
+
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] app-text/docbook2X )
+	test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_prepare_all() {
+	epatch "${FILESDIR}"/${P}-doc-makefile.patch
+	epatch "${FILESDIR}"/${P}-zeta.patch
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	PYTHONPATH="." distutils-r1_python_compile
+}
+
+python_compile_all() {
+	if use doc; then
+		export XDG_CONFIG_HOME="${T}/config-dir"
+		mkdir "${XDG_CONFIG_HOME}" || die
+		chmod 0700 "${XDG_CONFIG_HOME}" || die
+		emake -j1 -C doc html info man cheatsheet
+	fi
+}
+
+python_test() {
+	virtx "${PYTHON}" setup.py test
+}
+
+python_install() {
+	PYTHONPATH="." distutils-r1_python_install
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	if use doc; then
+		DOCS+=( doc/_build/cheatsheet/cheatsheet.pdf \
+				doc/_build/cheatsheet/combinatoric_cheatsheet.pdf )
+		local HTML_DOCS=( doc/_build/html/. )
+		doinfo doc/_build/texinfo/${PN}.info
+	fi
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+
+	if use texmacs; then
+		exeinto /usr/libexec/TeXmacs/bin/
+		doexe data/TeXmacs/bin/tm_sympy
+		insinto /usr/share/TeXmacs/plugins/sympy/
+		doins -r data/TeXmacs/progs
+	fi
+}
diff --git a/dev-python/sympy/sympy-1.1.1.ebuild b/dev-python/sympy/sympy-1.1.1.ebuild
new file mode 100644
index 000000000000..35ea4c1cc066
--- /dev/null
+++ b/dev-python/sympy/sympy-1.1.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 eutils virtualx
+
+DESCRIPTION="Computer Algebra System in pure Python"
+HOMEPAGE="http://sympy.org"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
+	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
+	latex? (
+		virtual/latex-base
+		dev-texlive/texlive-fontsextra
+		png? ( app-text/dvipng )
+		pdf? ( app-text/ghostscript-gpl )
+	)
+	mathml? (
+		dev-libs/libxml2:2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-libs/libxslt[${PYTHON_USEDEP}]' python2_7)
+		gtk? ( x11-libs/gtkmathview[gtk] )
+	)
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
+	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
+	texmacs? ( app-office/texmacs )
+	theano? ( dev-python/theano[${PYTHON_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] app-text/docbook2X )
+	test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-zeta.patch
+	"${FILESDIR}"/${PN}-1.0-doc-makefile.patch
+)
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_compile_all() {
+	if use doc; then
+		export XDG_CONFIG_HOME="${T}/config-dir"
+		mkdir "${XDG_CONFIG_HOME}" || die
+		chmod 0700 "${XDG_CONFIG_HOME}" || die
+		emake -j1 -C doc html info man cheatsheet
+	fi
+}
+
+python_test() {
+	virtx "${PYTHON}" setup.py test
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	if use doc; then
+		DOCS+=( doc/_build/cheatsheet/cheatsheet.pdf \
+				doc/_build/cheatsheet/combinatoric_cheatsheet.pdf )
+		local HTML_DOCS=( doc/_build/html/. )
+		doinfo doc/_build/texinfo/${PN}.info
+	fi
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+
+	if use texmacs; then
+		exeinto /usr/libexec/TeXmacs/bin/
+		doexe data/TeXmacs/bin/tm_sympy
+		insinto /usr/share/TeXmacs/plugins/sympy/
+		doins -r data/TeXmacs/progs
+	fi
+}
diff --git a/dev-python/sympy/sympy-1.1.ebuild b/dev-python/sympy/sympy-1.1.ebuild
new file mode 100644
index 000000000000..9fb9e67fbfca
--- /dev/null
+++ b/dev-python/sympy/sympy-1.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 eutils virtualx
+
+DESCRIPTION="Computer Algebra System in pure Python"
+HOMEPAGE="http://sympy.org"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
+	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
+	latex? (
+		virtual/latex-base
+		dev-texlive/texlive-fontsextra
+		png? ( app-text/dvipng )
+		pdf? ( app-text/ghostscript-gpl )
+	)
+	mathml? (
+		dev-libs/libxml2:2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-libs/libxslt[${PYTHON_USEDEP}]' python2_7)
+		gtk? ( x11-libs/gtkmathview[gtk] )
+	)
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
+	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
+	texmacs? ( app-office/texmacs )
+	theano? ( dev-python/theano[${PYTHON_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] app-text/docbook2X )
+	test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-doc-makefile.patch
+)
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_compile_all() {
+	if use doc; then
+		export XDG_CONFIG_HOME="${T}/config-dir"
+		mkdir "${XDG_CONFIG_HOME}" || die
+		chmod 0700 "${XDG_CONFIG_HOME}" || die
+		emake -j1 -C doc html info man cheatsheet
+	fi
+}
+
+python_test() {
+	virtx "${PYTHON}" setup.py test
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	if use doc; then
+		DOCS+=( doc/_build/cheatsheet/cheatsheet.pdf \
+				doc/_build/cheatsheet/combinatoric_cheatsheet.pdf )
+		local HTML_DOCS=( doc/_build/html/. )
+		doinfo doc/_build/texinfo/${PN}.info
+	fi
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+
+	if use texmacs; then
+		exeinto /usr/libexec/TeXmacs/bin/
+		doexe data/TeXmacs/bin/tm_sympy
+		insinto /usr/share/TeXmacs/plugins/sympy/
+		doins -r data/TeXmacs/progs
+	fi
+}
diff --git a/dev-python/tablib/Manifest b/dev-python/tablib/Manifest
new file mode 100644
index 000000000000..83672ceb38b3
--- /dev/null
+++ b/dev-python/tablib/Manifest
@@ -0,0 +1,11 @@
+DIST tablib-0.10.0.tar.gz 724961 SHA256 41c2dad7f491f5557e22783a9af81bed62f7b6fb0d7afd4c2ee301f3eb428c93 SHA512 1582e574297386d20908aee00eeef415258fbcfe5387e6bbcb3a0e497662e7f107c35596624ca31b2b6ad49045a7a388ddb6f64171b9eb2a1b386324a7b29b47 WHIRLPOOL 39b3d792858a9ce08e6f0276a070575c2c3546e3377b15d98b130a288ecdc3c91ea671fa43790928aa4ee641616ee6fc1b3a7c008c0c40d243b2338e1892b0b8
+DIST tablib-0.11.1.tar.gz 758097 SHA256 f3727503553320dab268ccb604507c0a2ad1a5dae023362908984d0ec1fcca1a SHA512 77e3fead0f492f2f2fbc47e329333be00d08d807f8c1283f2897f446510f09325986e2dbd992fd8bd3bf898c0037f191ac7f976ce0d47cbb0a6cb0dfc64e52bc WHIRLPOOL bfde2977a998e07e0fdc2b366f0a0de97b93db041449b61c38eeffaa634b2ee5b52bccd5bbeab5d6fadf5b6ed112faf8a0f0ebb659ba70f23b278b60ae668967
+DIST tablib-0.11.2.tar.gz 758287 SHA256 553dd5b58e8e6e039aaa61587ec2fab38c05f0e25f58ac65b81a7851db62a497 SHA512 356bf308df7c3d7d20800814a945c83fc64e98fb859d180cf5d9455ec2634e0a20f0c6ed788a75117c7c3d7bd4cda319c2049ce760109d102b2cb9a0707fa4f2 WHIRLPOOL 1c213cc5d86bd8219c1b54422518569475dc40250f9ac0ca732c3b5886aad38db3b8fbc5f082ca1012b2a3c3612d847f0098370ac0e388b67ad7867e3afd9d46
+DIST tablib-0.9.11.tar.gz 571410 SHA256 05d7a1bcf5e723f1051b87bc4a699fce6f5a3fa158d91308c478ec7cd74290fd SHA512 bdc11b8d54c5d9edb7ac980859cdbb932162b1db5161c582a141b2a6a5b8f0742f3d55f248d3e4e5b4173727a5916af385b607ce807f7d2e4402b7ef62c5bad0 WHIRLPOOL 61a5bf5e26d9b2999857597dd4574f76b3fdc0762f86588e539bd6a70109ea464a7ff0f07145592e3ddcf1712df13fd6defbc9fb9a9c5a1ae558c870df0da82a
+EBUILD tablib-0.10.0.ebuild 525 SHA256 a0ab6dd3c33bc1a46ad127cb1c24ee4bd7f8d3e3a7bcfac351f0cd38c29ac9e8 SHA512 c85fdb8e0529cbc97b7cbec030e2cbc9030c960de6b785fbb4031bdc6359459aadc94d777ced3bef7eea5e2920b0be3ac8aad6432e8fb194d461e5f259f0b339 WHIRLPOOL 7e51df640184d874a67e598eca1569b2649c32afc80f6636fff25054cd89af9be309d3dff72ed1ee0ece009e7accfae63a19b912de653a52e5fef6b44f04882d
+EBUILD tablib-0.11.1.ebuild 624 SHA256 bea7455d8c4c905346b7b39db6d7239cf88253d2e001120de3cda7a928ddb055 SHA512 8a88764248e1534a30d7be03c3bd1176eb91ca8e0af058d9a47e893bef641c2c40eeead3a2c4ad5621726e702f5a45d6a5dc4b85786fb699325454ec02845593 WHIRLPOOL 0a74274e24ab934ba23fb49e8159e2e8743fd5bef6d6449c48ae809c750ce16a037b187eb17ec8757f5a4fae5381f1ab5d6946969999befb415c304f63c8394c
+EBUILD tablib-0.11.2.ebuild 622 SHA256 7cef820c5554bee9a7ab6381cecae353943e81374d95163c1a2fa3a60a970815 SHA512 647dcd96e70d026c5f9627cfeb86c1cdd38a04f1fe900d7e10b6c7c88ce758386570320a8ad9661690c8126feb6c30987e6d12146162f64c059082eb5be466a7 WHIRLPOOL 641beaf92c8aaddcca47b5615f06dc9b26509ab0e1bc30bccceb233c909648df6279cc78703126d2e1d6104af349cda2bb58ab723a89edc74f27d4143c22df58
+EBUILD tablib-0.9.11.ebuild 517 SHA256 e2fd284a916caa0a357da464ae5ec1e85f01b7e4b536d6765747099bd2b7d30c SHA512 78daecec5ff9e592feb7c1216d052be0766c8488045e28358588bc4d542515c59fa7ea0f9ae834c80e585f604a250de4109e860e17304d6fee6cb4c5f2af024f WHIRLPOOL 5433a2a65e43dfbbfda7ec99f9ad083a9d5f9971f480f51ff05ed7838e240f85424f9600c2a24ec46640228250c96e64c41a35bd7f9eb8f29db694651cc57f95
+MISC ChangeLog 3418 SHA256 a64f63cf8db9e6c260cdc8faa5563a8b8f14e6c0093bcd7a4cff7c82b302ba58 SHA512 76da5c1c194dab8797543fa140b9c1885423dc311da7ad3dc31494039e69394fd642e0002d5125578f0d3f04b8465d06de8b51f686f0fb3180c6e89ff3c7f1c0 WHIRLPOOL 88dace38c4f447cc741cab797f68a0009ea00736bf182b875a48ec794210f7c94d6b8c596a276d89241636edc32465ada618876a9f5077171342f43a72ee390e
+MISC ChangeLog-2015 725 SHA256 cbe6244239c71b0eda974833fad2a7c269f1e065cd1f17cc5ebf350da47abeb9 SHA512 f84c9a486d31b72142ee4dbfe9bebc58f3c26ef972ee57d3d0359cd5387abe7e0b2256a19fb6af400186d697f66838235287db4e982b793424f9ef5eb487f6cd WHIRLPOOL 811617bdf48471fcdb1c2b038ad09c1c6a15c305a7ffca70be5355b500e8b0234b8982e46a31311a78b38642e6f1aecd976fd61e369d4a261dffeaee6a1fcd13
+MISC metadata.xml 325 SHA256 41d6434bdaa2f7604535548d01ec1b49c02f994d45d1132212de07e59e70d574 SHA512 abe357f80a305ac2f770f5fd7e40a7919abfe477cbebbe0ca36be32d49d630f7941f29d296222e5ed7b1d14482b794ccf86b3c4acaec47cada5fc7005e5dfc7f WHIRLPOOL 22b9290676c8bc78729ba85f37e84a6646cc3e0a76b7ffd06009fc68d9d4ae87f4a4b6fc51e7b127226193c92f459b6d95a4658134985898eb0343d8d0892855
diff --git a/dev-python/tablib/metadata.xml b/dev-python/tablib/metadata.xml
new file mode 100644
index 000000000000..8d96234a5f45
--- /dev/null
+++ b/dev-python/tablib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">tablib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/tablib/tablib-0.10.0.ebuild b/dev-python/tablib/tablib-0.10.0.ebuild
new file mode 100644
index 000000000000..7416923b740e
--- /dev/null
+++ b/dev-python/tablib/tablib-0.10.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A format-agnostic tabular dataset library written in Python"
+HOMEPAGE="http://python-tablib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/ujson[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/tablib/tablib-0.11.1.ebuild b/dev-python/tablib/tablib-0.11.1.ebuild
new file mode 100644
index 000000000000..b5600b2b037b
--- /dev/null
+++ b/dev-python/tablib/tablib-0.11.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A format-agnostic tabular dataset library written in Python"
+HOMEPAGE="http://python-tablib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/ujson[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v -v  || die
+}
diff --git a/dev-python/tablib/tablib-0.11.2.ebuild b/dev-python/tablib/tablib-0.11.2.ebuild
new file mode 100644
index 000000000000..faa0359f65ea
--- /dev/null
+++ b/dev-python/tablib/tablib-0.11.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A format-agnostic tabular dataset library written in Python"
+HOMEPAGE="http://python-tablib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/ujson[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v -v  || die
+}
diff --git a/dev-python/tablib/tablib-0.9.11.ebuild b/dev-python/tablib/tablib-0.9.11.ebuild
new file mode 100644
index 000000000000..b24e2f6871af
--- /dev/null
+++ b/dev-python/tablib/tablib-0.9.11.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A format-agnostic tabular dataset library written in Python"
+HOMEPAGE="http://python-tablib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/ujson[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/tabulate/Manifest b/dev-python/tabulate/Manifest
new file mode 100644
index 000000000000..c363e459ec7a
--- /dev/null
+++ b/dev-python/tabulate/Manifest
@@ -0,0 +1,5 @@
+DIST tabulate-0.7.7.tar.gz 39140 SHA256 83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6 SHA512 36ea77577e36fad28efa9b1c10686a4a795acdea77be4f8b442b38f45d70993245b4b473b0ce146f3d24eb49f186ec47ada332a9a3973ac2786d5a46b7358213 WHIRLPOOL 7d64e01b9a2d4ed41733b67e4108e233ba97ca95029f4f82c1b73f489dd0e17589cfbe071fd83969422779e73eb7fc1e5b7d48c891b3dcd647a9d4266900a462
+EBUILD tabulate-0.7.7.ebuild 681 SHA256 78b9fb797bb7529097781b2596edeaf6c40b41934b30d72777435eb0a8af0b6e SHA512 56bc4ee47c1a161844d8bf22054398e7d589c08349afb4be97ef10f7b5558ac5ab9ca4030881aa44239262bab37cbd2fbb26d066a09978c7e175e6e355428ca9 WHIRLPOOL 2617ec42a4d498ff3b0b765b6fcd860d8d89881f8ad8f18df6cfcd239e9a26eba8c9a1303b519fdb0fa1088fc492614320752d038b8652cd1dc9c2e271d47ee9
+MISC ChangeLog 3409 SHA256 b3cbdb3dfa2a3ddd2b68ca531b3e9e52d30c626954e587e67febe63151a26d1e SHA512 2e1720b7d4798c983e43e9024e2c691082c3cf04274d94d37f4be0bf5628ceb7e17a9dfec0b80ce99e0632ceae8569360a0f7f6fcd204eb182f87b3cd904a2b4 WHIRLPOOL 380d117373caba7e00ca4131a3a406aa900c475f5befd32a1724c07ee928ac3f834c3ac6965f3ed39dcfbc92af085b1ad09ee52ed18147e4f53540a3e4a77aea
+MISC ChangeLog-2015 698 SHA256 e04c9a1b35d91b55a09b06aad15137761f256e9ac89c5c6ec26df0b0f39be6fa SHA512 bed81ec7b98d2e095365e967da932c746409d6e2afa2964365d5f0d88e96a81cd92868e9b697efae3d3b951c14609f49817de19a08c4ced58567ff6a33c2ea0e WHIRLPOOL f82829f8221f594adb396e36a9aa227d92889baa6a567e409319fd65b3e604e3ebc283872b9f6c0d2f30a16e2b99311fa5917eafbffe6ec48cdb6d5afebb3ff1
+MISC metadata.xml 321 SHA256 003c74505df5fbb65dbce3ef773ac6e9e4ddedc0e546b48812413358e7cdbc66 SHA512 4967ca411c6ee428e897be2be259da008f9dec1991754235f0e8f79d64b5175e69d460c3cfee72f49faa41704ebda3c46bb2f30fc157e95cec4d8d60ae7ba89d WHIRLPOOL cd3743e22afdcaf22e699ff13bd1340093ae86f5d4be5d38f53c78e8e5bc23766536e8589049d70c3e75a127ac3a90c071484453f1217eb1eeb83678afef4271
diff --git a/dev-python/tabulate/metadata.xml b/dev-python/tabulate/metadata.xml
new file mode 100644
index 000000000000..4d3a5455d953
--- /dev/null
+++ b/dev-python/tabulate/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">tabulate</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/tabulate/tabulate-0.7.7.ebuild b/dev-python/tabulate/tabulate-0.7.7.ebuild
new file mode 100644
index 000000000000..aafb6b10a1d1
--- /dev/null
+++ b/dev-python/tabulate/tabulate-0.7.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python{3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pretty-print tabular data"
+HOMEPAGE="https://pypi.python.org/pypi/tabulate"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( virtual/python-funcsigs[${PYTHON_USEDEP}] )
+"
+
+# Missing something in tarball
+#
+# from common import assert_equal
+RESTRICT=test
+
+python_test() {
+	local testcase
+	for testcase in test/*py; do
+		${PYTHON} ${testcase} || die
+	done
+}
diff --git a/dev-python/tagpy/Manifest b/dev-python/tagpy/Manifest
new file mode 100644
index 000000000000..97dcaeae340e
--- /dev/null
+++ b/dev-python/tagpy/Manifest
@@ -0,0 +1,5 @@
+DIST tagpy-2013.1.tar.gz 151463 SHA256 80481c78ce34878e7a1f3231acd781a3bf1b0b569c70ce0e8d63af58061152f4 SHA512 4068b33fcbee2d5037149fda3ad0b256a31187ee35146392d0e187acb1d8e57c249da5356cb396cb9f027ed47ff44016466a1faaea0912494535c631f8271d58 WHIRLPOOL b47f349bc7f328ee4c18856e7f817f35868529afa0b7a820ec614cb003b3f4c4c84fabc4bd6c5a93ce12d0721e9127cf0dc806df4977fbb505934b9ba5233c20
+EBUILD tagpy-2013.1.ebuild 909 SHA256 3ccac5353f09342a6ad20a3ad2e39f5fe9a1247b3be7cff7c10be275556bf1b8 SHA512 2a9ecadc0977ce02154d9d55f125ad7463dff51028e1cff30990f4e1648359713c866fbe6e05f6078f4f81855d2135a690169bbfc277989d594ac8593cd39aed WHIRLPOOL b6c88c5423fafb6bfb4fc55375e5163d3c7af64297457e1dc9b1163b3868f9825daedba4aa0d9cdf3acbc20212af81e1fbc78a326a83d1f9d66708df6c5e46f6
+MISC ChangeLog 3424 SHA256 181df2900950e194cf16f96caf78eb833c8b67fdbba5884a845b53774f2803a3 SHA512 5f4e517434c185fe6808f4b0f0b8fa27d5db55786486dc67b4c1e7265d680be7aa60b705775398895b7e3c1a54b407ca1b1990d3fc9e0696843f745ea89c3669 WHIRLPOOL 0bc5cf89a81ef8586df92e4b6c84453a868643cc8d4a6586e673610bab6db77ff0f7139254ec9c723a1862d5b3819c99cf09affa06f7f3382cd29225d3f43a1a
+MISC ChangeLog-2015 6852 SHA256 f12649a75614324055b91bfefe233d1ab27ff403a155da21c0f0788f3489a762 SHA512 dcc3479b453c869e1be5595253e672bd3d2e34f3a129b89f3f4da9e3bf69af50c111349d443836300acfcae7b2ccb0dbaf026486c478539caebbd37ce600010f WHIRLPOOL 39dfe6f365a45c5193e42be0553939b34d0aaf453b8aa55e8bcf8f574e5c2d156939c197945e1827408c551ee0d768d33876050531d29c7afa59d34f061000e8
+MISC metadata.xml 547 SHA256 5fc3561e1a2178c158ec112f23b4dd532aa391421a3ced95dd7a2c83b4814092 SHA512 caf162b52bba166e74c1c1c9a6f157ee44d4b7f829c089dee93b6c84a99c847384ff7cd4f03ce191574e58562fdabe29eb4b00281551227f5d274adc3e7ba2d2 WHIRLPOOL 22f3085455c7129b411e5ee6264eb85d86f7ec1ccb8f462ebba6c1a52290ed3dba672eecf92c6151a96479202d6f6e197aea4e22d04d004c9596ec93f18942f0
diff --git a/dev-python/tagpy/metadata.xml b/dev-python/tagpy/metadata.xml
new file mode 100644
index 000000000000..994d08b6d425
--- /dev/null
+++ b/dev-python/tagpy/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">TagPy is a Python crust (or a set of Python bindings) for Scott
+		Wheeler's TagLib. It builds upon Boost.Python, a wrapper generation
+		library which is part of the Boost set of C++ libraries.</longdescription>
+	<upstream>
+		<remote-id type="pypi">tagpy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/tagpy/tagpy-2013.1.ebuild b/dev-python/tagpy/tagpy-2013.1.ebuild
new file mode 100644
index 000000000000..7c609dd07ff6
--- /dev/null
+++ b/dev-python/tagpy/tagpy-2013.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Bindings for TagLib"
+HOMEPAGE="http://mathema.tician.de//software/tagpy https://pypi.python.org/pypi/tagpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+IUSE="examples"
+
+RDEPEND=">=dev-libs/boost-1.49.0:=[python,threads,${PYTHON_USEDEP}]
+	>=media-libs/taglib-1.7.2"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_configure() {
+	"${PYTHON}" configure.py \
+		--taglib-inc-dir="${EPREFIX}/usr/include/taglib" \
+		--boost-python-libname="boost_python-${EPYTHON#python}"
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r test/*
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/taskflow/Manifest b/dev-python/taskflow/Manifest
new file mode 100644
index 000000000000..039ee31c1214
--- /dev/null
+++ b/dev-python/taskflow/Manifest
@@ -0,0 +1,7 @@
+DIST taskflow-2.14.0.tar.gz 1061437 SHA256 c54f00e26abf3c2a31f2187ff6c2593e1601556cdcbd48c3e3539569f158c601 SHA512 6456c91b70ce680064abc80ed1a32fc0f779282cb015220ed27aac4e60e56fa11ac14db5a56d1c339a3f5022d5162efe0a3afee84cf02531d90bae23022a902d WHIRLPOOL ebf355a171e2f9321c92a11aea9f247d96f80657279bf54881bbe795a185196dc28e899501974be6a6ab416d3851436f75b1a2a2ef10ddb4389be4bf756c275a
+DIST taskflow-2.9.1.tar.gz 1061514 SHA256 48b3af67d237ec4a4fadffd0a76f239e897e6ca310b5545cb59533b44dc3a03d SHA512 a8211edb2c4507b2f9845ebfbd028701d341266ea8d000bee60a037b726b1d2ad5e6432aca781659d91dac13198451495270eeba821f5905fb20f27c0d758b77 WHIRLPOOL 227f45eaa4abbb441d19b704ba44d5847acb74f50f180e4d487e7a598d7cdb4b6cb2105e56a1166ebe2202a59d1e74dc99d16185a5115e2458cbcf86b8fc9ce3
+EBUILD taskflow-2.14.0.ebuild 1551 SHA256 86526748e23db13fef9dbed143b2ba35a01ece18b60c9d6cf48fc66b69a09286 SHA512 b942ed1b6078541f83415b6b69e5af932d37f40b88e17c289e71ea9d1b534ca1fcd6044d0f817d6225319a286b28caa2560f55f71c809e4e13f8504ab3b9ba14 WHIRLPOOL 09a405279f0e4f4a74ac49f15d13fa01ba776105ab6e66d25752030eee9d46c64609973ab669b45de294d00573e6e94b5a9be1fb0c2f6e2a5ee33f6d98352316
+EBUILD taskflow-2.9.1.ebuild 1467 SHA256 94ea10a4403c165dc57226e933d89fc3bc5b4028ebb85f1a3dceee0a8cc3a144 SHA512 4d8706e9e2890c6bbdad6eee6c082c0cd62ecd036c74b6774b4564672b6669b74bc165faacd610d7c749ec126a656d287022c9f0d8283b679a183cf7731685ac WHIRLPOOL cd83e6c1c4d613ce5fe1be07022c46e38c1af60c8c219481854acb82602dc0f8443ed033c8b9ba39877e942d5dd1079de2c849ed63e318ac6f72d42834d75e5a
+MISC ChangeLog 4892 SHA256 9f0dc571bae0bbdbe2ff85057d5f56672b681aefc8e90f05d5e637e8040a4928 SHA512 b8b78b684dc90b12724268f5e6c710215fdbdddf51e4fefbff84f11ba017c870ca3be3a0918ea410c241be7683b43e0e673dd353481ffcebbdf9cd84c44fcda9 WHIRLPOOL f38f5e96d0bd613a97d57559440128b0cf24944aeb250602d502f17976b948ef7760a1d7083abb352ebcd385e823007e16340e6909a0f57f70c46fd935f0c8e7
+MISC ChangeLog-2015 1512 SHA256 a22e845e6ad9b20c59c30958f5bb6951afa1c4d35a3f2f8c6ad19cf0fc2136af SHA512 c2a6f824ec339e53b9126ca17cfc0427bc287db87a26fb0b0da702488bd0c0a961db52a4ba70ad42f85acfed9e8eeca9eeed0794266a694eb1ab09c296a74353 WHIRLPOOL b4e3ba75af8d7faac3dd0b8520de46a4c5ea23d78ed4f29159ea2b405df6d7479a9f74d8372d0b9785e4bbcfd0feffaede4292d2b6ea66edd2250e616d16a984
+MISC metadata.xml 676 SHA256 b94f5266f5dfce0381a963d7259b58d3ea18f2b52e0ad8e02c6ebd3e55888f95 SHA512 c274ae9882c74b8bcaeb054b9feade463c1fa7f2f6ac559091a4bed85075198873c4b994cca1f28083b682bbcf66dbb31971da97f9074a1b04a57a6eb0a612ad WHIRLPOOL 8b290768f8a32a31e9fc0c4a54cca8017a601afbf27436f586c75d2fe2a32a4e3d821a06e9a89d77959870421b24d3f2f5aae7d1e570f56d1c7bc3b8f7c6f013
diff --git a/dev-python/taskflow/metadata.xml b/dev-python/taskflow/metadata.xml
new file mode 100644
index 000000000000..d36b41a51afa
--- /dev/null
+++ b/dev-python/taskflow/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+  A library to do [jobs, tasks, flows] in a HA manner
+  using different backends to be used with OpenStack projects.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">taskflow</remote-id>
+    <remote-id type="github">openstack/taskflow</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/taskflow/taskflow-2.14.0.ebuild b/dev-python/taskflow/taskflow-2.14.0.ebuild
new file mode 100644
index 000000000000..64184621c09f
--- /dev/null
+++ b/dev-python/taskflow/taskflow-2.14.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to do [jobs, tasks, flows] in a HA manner using different backends"
+HOMEPAGE="https://github.com/openstack/taskflow"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	>=dev-python/contextlib2-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/automaton-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/taskflow/taskflow-2.9.1.ebuild b/dev-python/taskflow/taskflow-2.9.1.ebuild
new file mode 100644
index 000000000000..85fdca800809
--- /dev/null
+++ b/dev-python/taskflow/taskflow-2.9.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to do [jobs, tasks, flows] in a HA manner using different backends"
+HOMEPAGE="https://github.com/openstack/taskflow"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	>=dev-python/contextlib2-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/automaton-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/tblib/Manifest b/dev-python/tblib/Manifest
new file mode 100644
index 000000000000..dea01062749b
--- /dev/null
+++ b/dev-python/tblib/Manifest
@@ -0,0 +1,5 @@
+DIST tblib-1.3.0.tar.gz 25295 SHA256 d1078592e594a2d73d2d383aa6fe551cc646cd986a092cc9824724e5a6832a0a SHA512 2bead497b7a2ff2a23e164935efe5ca242cb6d6063a7d5e1cf88d7d3af6475255435507855f5f359738285d315f0c8c0274c539f33cf5017fcb743c49b8f58a3 WHIRLPOOL 0c51dfb2bbac35554799e46602b8a7f76c48ddee307d304639cb9cb83cff199ab5bc8fe4e590a2a7127a60071289f27edb7dd7842893065ac48419ba06aac6f6
+DIST tblib-1.3.2.tar.gz 26958 SHA256 436e4200e63d92316551179dc540906652878df4ff39b43db30fcf6400444fe7 SHA512 c04d204e8dc53c87fecdb484162488ca10b509341ad030e67300d9c3ac61d298888dd56c1cef8318bcf13d90ccd5633520d75ab45dd0aea8de29ba7317adacce WHIRLPOOL a7cce3f4d3b7a9b96bbe83ae21c316797edb03ae3e38d9405f7be1d1c34256440ffa6dd940f37c7baab5bef89928fdf8b2f1745003a3de79d703f8da8ba3e745
+EBUILD tblib-1.3.0.ebuild 442 SHA256 822ceccd5ea9eccbf573a01045063c5a8469684d479de954e747856c69ff5d36 SHA512 5a0f439542acd72153d9267e609aedbe1a6fbe59267e8173d954d0fc63d1fc2828311f2cf234f7b1c3a6e98d40b4558d9ada8c86536591664501452916bda6c5 WHIRLPOOL 1c447e7d8646afa70044728c4ea0756beb218b79704e051039b1c4471ccf86413e4a785dd082f51b28d0280caf38757917c1a85f4c3a56416f6cda05d25549b3
+EBUILD tblib-1.3.2.ebuild 446 SHA256 d90f6d0255b997c44c7c15e6215ee7ee8f064179943a53a79673f12091296077 SHA512 2017cde4f93f91bd4f16db9d3ed1bebdde754b7f48bc11587e4fb1b819d1a37d6750a9b082f2cb98399c2e57317a7ddd651f70a2db85246e07031d7377ab77af WHIRLPOOL eea7830e5578be51d2e9e38722ca6f3c7a8af725e5f8a0b08c41c50a1a806333e4e3b3f96b0fa030a2d8fff2f92fdb2a955b122243cd9c5965788812f149c8c9
+MISC metadata.xml 380 SHA256 0aa1e1e3544f648a9214db87c2fb6d06c5584beb53c0b72b72704c8ea22e8faf SHA512 649b0a9457aeb0b3e211e293305a8bd93f0ae1c91c5c31f2d7d1d94c55eabff5df4f7bda64c19d07b216778cbe7bb68dbdaac3a06d9a627a06b8f205fe818d40 WHIRLPOOL 3e50dcad3ef4db6c47ce44186e60f5fc56076b6aaf2d47c1ae13a30ec517aba9e28ecc6bff4075fb0caf7984a535b22f805dc8e5628cfab1810b34ab058d6bf8
diff --git a/dev-python/tblib/metadata.xml b/dev-python/tblib/metadata.xml
new file mode 100644
index 000000000000..ec6fc75c9c1c
--- /dev/null
+++ b/dev-python/tblib/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">tblib</remote-id>
+    <remote-id type="github">ionelmc/python-tblib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/tblib/tblib-1.3.0.ebuild b/dev-python/tblib/tblib-1.3.0.ebuild
new file mode 100644
index 000000000000..0c522a9257d9
--- /dev/null
+++ b/dev-python/tblib/tblib-1.3.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Traceback fiddling library for Python"
+HOMEPAGE="https://github.com/ionelmc/python-tblib"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-python/tblib/tblib-1.3.2.ebuild b/dev-python/tblib/tblib-1.3.2.ebuild
new file mode 100644
index 000000000000..77617dd47020
--- /dev/null
+++ b/dev-python/tblib/tblib-1.3.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Traceback fiddling library for Python"
+HOMEPAGE="https://github.com/ionelmc/python-tblib"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-python/tdaemon/Manifest b/dev-python/tdaemon/Manifest
new file mode 100644
index 000000000000..39d754a96a05
--- /dev/null
+++ b/dev-python/tdaemon/Manifest
@@ -0,0 +1,5 @@
+DIST tdaemon-0.1.6.tar.gz 37206 SHA256 9f2ed243f1d4b20bd54da505912c82c65dd3cbaf3e247d17a15f42dd0a3e5d56 SHA512 b0d49cc3ca4acef8bdb38cde4c1d17cd973215a8cedeb5716831ea129e8fc69a0c890eda7740a35a238ce39272278d8a80c3e4fc26099317bd7b86e80b36def5 WHIRLPOOL 39f72d4e381cf836b1d288a4d2807383e095241268b52cc8450c2d118182ee3befda5f9b5138f0f3ed9e3998ef4b1718c1ac02c86529df44bd3c17f8a3771dc4
+EBUILD tdaemon-0.1.6.ebuild 690 SHA256 94c7db86cfb8f8d76cf075fced7d74441bf7adb778ccc363920e367ff40fee75 SHA512 469dee258819299cbb6c393cd4af74625238ce48d7c48e913cd1ff14fd912755aedeae284902626bcff9e8b73a66073c9f2229714f8cf08c360842a1a8b536fa WHIRLPOOL 374cb2258fe280b181dd849039127044ee02b69f4c249e2f2a6c5426d55e81c082f1ba702c4bff20f9d3830eab2f93d30f1cd091550440387d3dd2a6d858961e
+MISC ChangeLog 2572 SHA256 a8c156cbce8597a749e5f276c43a1d3f40311f0015c10d69899140ddd4a82875 SHA512 3d378c4e37f47fe12db912ceb86ba951f0954476d950570f175801defce04841279ea678027b23ad219b34c0f14d4279fea02ad574af50b88919d35e44eae4f3 WHIRLPOOL 5c80c0780510c4cfa5c6c0f3e47435edcbea41736f3e4e40a4f18f8382b09e5861dd3358a515197f50df543289611ee5e0d97e2b84f2ed9bdce2e355f1611537
+MISC ChangeLog-2015 1469 SHA256 bc79cfdaf1340d735e49f172866d07fb226fd01d8cd1d63adf8c418bc9a0b9f0 SHA512 afabea76c23576a69ad09e322fb4b3fa38561a0979cfdbb44a16c43929e610afb73af2dc32dfd91142e7d39b63162ba6faff1e1dbb4e0e9a4c03055ccd593b97 WHIRLPOOL 36090509fadc3c87fe2a9fbbe566c9a9cdf30339420128abddcdc5bfd32d34e893141cf0da6756905db24cb3d470382c2b322b0e4b57ccbe806da43a0911c9ef
+MISC metadata.xml 411 SHA256 f9dbe7869f57dfeb8d2d724eaf4f9bf1932ce3d3c28b6949b9e7d67539e41064 SHA512 2efcb729b1b342944672391a96e49a7356d709911120972c4386db169173ff66da201674b3a83779a85c3962fc269f36b8403069b2ae46315db3202b67892b10 WHIRLPOOL 466c832b5a232d765ae6b3c133a6236d2e3914a8e5ea0fe5b8a749212de54e36ce645c7ca9af615e15a1994d141a80a5e304c3c62ef6d47cff52248b5aad9aca
diff --git a/dev-python/tdaemon/metadata.xml b/dev-python/tdaemon/metadata.xml
new file mode 100644
index 000000000000..2fb197446689
--- /dev/null
+++ b/dev-python/tdaemon/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <use>
+    <flag name="coverage">Enable code coverage support</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">tampakrap/tdaemon</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/tdaemon/tdaemon-0.1.6.ebuild b/dev-python/tdaemon/tdaemon-0.1.6.ebuild
new file mode 100644
index 000000000000..903caa09d3d2
--- /dev/null
+++ b/dev-python/tdaemon/tdaemon-0.1.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Test Daemon"
+HOMEPAGE="https://github.com/brunobord/tdaemon"
+SRC_URI="https://github.com/tampakrap/tdaemon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="coverage"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/notify-python[${PYTHON_USEDEP}]
+	coverage? ( dev-python/coverage[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	if "${PYTHON}" -m test; then
+		einfo "Test passed under ${EPYTHON}"
+	else
+		die "Test failed under ${EPYTHON}"
+	fi
+}
diff --git a/dev-python/telarchive/Manifest b/dev-python/telarchive/Manifest
new file mode 100644
index 000000000000..0a3af6f57e99
--- /dev/null
+++ b/dev-python/telarchive/Manifest
@@ -0,0 +1,4 @@
+DIST telarchive-1.8.3.tar.gz 79377 SHA256 97d1668027bee5036b7596608dd8f86d078283763f2ed0abf3850fa0276faf06 SHA512 628937f8556d7197317aaa08b0ed757d92770a0929e77ea30245c1e52a3bf04e425d86c16e4711359634d0156f1d7128780abbead163ed119262fae22e9f35ae WHIRLPOOL 6d329d0b0984e7ad0b1c5ba2c8a4d565592889000cfda77f52c9ddcd2195a5c283a24a18382c6766c4873087d9554127a12ddbd26d3af12a12a0654cdbd8a7a4
+EBUILD telarchive-1.8.3.ebuild 499 SHA256 e34e462924731787973178ff0a6d30c2fa81109ac41a549baf53d59fac7afb66 SHA512 6052352b6ca8c202dcc44ba6adbe754f8c66bd6cf170dd308d1ec60edbdcbc61f6ea1c372c44869696eb367bd2f705963801fe12fe0cac0c2393cdcbb4439d99 WHIRLPOOL 5d05b87dcdeea368ace8a8a45328399b9428f3045c381f19e848bb5ef595f0c1952689b310700505cc45bc7fa7db478079cd232693b938ba618f8c436f5b56dd
+MISC ChangeLog 324 SHA256 fe429b0d6b7332416940056e1c0311732f385b5c86205f16a30990c4b4223d15 SHA512 d17bb69d59ae66876eb49e9634eb5647595c2ce9afbde87b3ba09811293effa5d2bdc0d6684a0f5d1081348b2823cffde570dc6f497453aeade760a30dd3ea70 WHIRLPOOL d9efe5eb0f2e042cb60d37e692a92cc68e8f5f8a4cf044fcb5860ef60e0ab732f1af6782d2a24c5abb4281b850b42b2dc6857fad5d81ab9f696d41ddafca0ec7
+MISC metadata.xml 718 SHA256 4265445737bd851632049721ef06694086df4e01e1e3709be0f5aed9196502e1 SHA512 c124628773be76764508241a450c053b05f28f264c64e070b9b135646841278ce98e6b13221a01ad6840e66fcf11c81258482b3bf15a4ddee8109cc2fd73fc1c WHIRLPOOL 7145fce9adf18141bacb8df8a808c737fb5c72e920f4822997f41cbc3050617c79e6845556b8de03e849e2ac50c1ba15f169424aff39505fdb40516fcaa1a72f
diff --git a/dev-python/telarchive/metadata.xml b/dev-python/telarchive/metadata.xml
new file mode 100644
index 000000000000..498822a1f085
--- /dev/null
+++ b/dev-python/telarchive/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-astronomy@gentoo.org</email>
+    <name>Gentoo Astronomy Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    telarchive is a Python command-line program for searching multiple
+    public telescope archives. It takes the name of an astronomical
+    object -- or a set of coordinates -- and checks the telescope
+    archives to see if they have observations within a user-specified
+    box centered on the object/coordinates.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">telarchive</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/telarchive/telarchive-1.8.3.ebuild b/dev-python/telarchive/telarchive-1.8.3.ebuild
new file mode 100644
index 000000000000..d42b8b33dbfa
--- /dev/null
+++ b/dev-python/telarchive/telarchive-1.8.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Script for automated searches of astronomical telescope archives"
+HOMEPAGE="http://www.mpe.mpg.de/~erwin/code/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/tempest-lib/Manifest b/dev-python/tempest-lib/Manifest
new file mode 100644
index 000000000000..c6c303866ba5
--- /dev/null
+++ b/dev-python/tempest-lib/Manifest
@@ -0,0 +1,5 @@
+DIST tempest-lib-1.0.0.tar.gz 115527 SHA256 c5629d9c45427c7b3716815016125402d38082be9a4e2d6112ed7255f916f7b2 SHA512 e47716d897c2df4be08b863352cbee986194db00d113a9135d57cc440436c97dea5c009d6a24c4b489360b04585b2a54a9b66a5776d17a988dfb9f0baf57e484 WHIRLPOOL 52478d08ca68f74689a87cdad0adf5ec56fcea0fa78b1a28ccdcbe7110fc88914d275625dd3f0ff4606ffc340bb196df3efefa8b7f010eeee0f82d78b9600ca9
+EBUILD tempest-lib-1.0.0.ebuild 2077 SHA256 93d0e4ad13e5e9c9059a3273d68f3d0b7054715be0557ab1cf4807d779b3b123 SHA512 7f983f0c4b3f6ee79e7a15611147d0d8ece94426775e8c976fa4accf5d188c8abf777cd6583ca98ad7f71f7a87c3a7a9bbedc2e1419ec24749ad32b802a6eed9 WHIRLPOOL 45590bdfb28cceb8a6919e61ac4ba1c393b6feb5a2d88eca8afe4b625e57197474578b10602f795a505b603b06262d122e4516152a0ced3b6939467814ff8673
+MISC ChangeLog 4279 SHA256 cb0994d3f4deb6d0d64be053a0ee1c81b9e074254685756ee3e911cae3be4d0e SHA512 ecc42e4c76e83d9faa1269987488ba3a80be74bc7b112b6e3c19cfc5743ace754a128f9387ccce1d99006298438c8cbae40674dc7d4f85e12bd69d905e44928c WHIRLPOOL 18ab88653cc1c45a5dcd977cbdfd1e4f33a2049dd757f3b3ce865f83ee275fb72b7b6ee992e3a239f555f41ec040732b04f145e37e9ab27da8b3a2936402612a
+MISC ChangeLog-2015 1067 SHA256 350211b05674a2d52351e8b2fb7c27205585b4f01ea3d0642a9876ce858b3d0a SHA512 680c003b1e7632603e67518111e8cd857aaa7fb7cbbf2b6c238bcbf6055e24e8409092d432218136b09d9dc802d1cf2f6c17d05c1bba6bf5cedbf45b058f1bda WHIRLPOOL 299a96f7a41da66440f74827389701001576d31db95109524d96b37e4e08537c5fe6f3ca72b534e9b748fd3028f05ada55aa60df695e826a8ecdcc1f2f594124
+MISC metadata.xml 783 SHA256 b85597c6fe6daf5a702a68b6c95a03e50e3c5125d6d537341ee305f9452d267b SHA512 4c90ae3bab98585854785700c90545fcd89ef89e5f11f8f53a102a67f59342a347f683f98429cec498537a6c2307d36cad3f0f4c9bd0e7f12af75090f8d14dad WHIRLPOOL b1edea48eaa29ab41673742a6549c468a4fc8cdea0a66e94f5d43e2e143c2cb924f5f93b2d13fae1b8c3418afe4e565428d5c8ff37c82285f991347cb21e2ba5
diff --git a/dev-python/tempest-lib/metadata.xml b/dev-python/tempest-lib/metadata.xml
new file mode 100644
index 000000000000..e8cdcbed4457
--- /dev/null
+++ b/dev-python/tempest-lib/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+tempest-lib is a library of common functionality that was originally in tempest (or similar in scope to tempest)
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">tempest-lib</remote-id>
+    <remote-id type="github">openstack/tempest-lib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/tempest-lib/tempest-lib-1.0.0.ebuild b/dev-python/tempest-lib/tempest-lib-1.0.0.ebuild
new file mode 100644
index 000000000000..14583f1d8db7
--- /dev/null
+++ b/dev-python/tempest-lib/tempest-lib-1.0.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Functional or integrated test suites for OpenStack projects"
+HOMEPAGE="https://pypi.python.org/pypi/tempest-lib https://github.com/openstack/tempest-lib"
+SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/os-testr-0.4.1[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? ( ${RDEPEND}
+		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/ddt-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests tempest_lib/tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/tempita/Manifest b/dev-python/tempita/Manifest
new file mode 100644
index 000000000000..d3f8cf100d89
--- /dev/null
+++ b/dev-python/tempita/Manifest
@@ -0,0 +1,5 @@
+DIST tempita-0.5.3.tar.gz 12707 SHA256 38392bb708a10128419f75fa9120a6d2c8d137013b353968e5008a77a5c7a2ca SHA512 43bafd42ab0c07bec636d637bfcd42053559d188e13bccc66527dc5f735fd9c3ec30fcf29f3e650d88315fe8f2eb2c5af280f51d2c64db099e08d8a70969a1c4 WHIRLPOOL 0c78ac7e92b16556e295fb807e87665977ea2df14211c3254efcf3ffade8a1318a89e5887dfa3ce44ac7cb6c608a35a51f70856f5e56c1e07c09a9f0fa9c6388
+EBUILD tempita-0.5.3-r1.ebuild 647 SHA256 485cbf8e3e2bb49f763073984aac375a49f97dadb293032b3a7413f7cab1cbd4 SHA512 1716fa8a219bc2a3eaf114e5e9281299d9927195cdeda57911f65010b6c9719c88e4fe73137fc20b7cc3b6c3b81c57b6c560e538e09a17f4ffdbe7b2929b6c59 WHIRLPOOL 2cc1b66064ff00e7ed6c129609b51d262139af1a82f0cef513c1df79e668e372691c12c724c30554c995c396c77174176535bbbe22d7b52ada0bbf6360012799
+MISC ChangeLog 3061 SHA256 fd1db7ef98982f0cb93b5dfff5088e5a639b12a6ed530a250740fb31f0a7f362 SHA512 7e04624b441bd25219ad4f4a0cc5c2d0b56b89df745d7e5e903d3e66a67e1c6f3aa3c64d0d992076a5ca6d742f25ef368090cae843363efb8cba831ca8c2ad29 WHIRLPOOL a97c5d7bbb3c312e8252f712249051ade220d336112c38619777bc0b0089420087c4b83dcb152e89001d44d69cf439b05d5079988cae2b44850d405f6b1f1d22
+MISC ChangeLog-2015 6169 SHA256 daaacd26bccac99e7a517aad9013be3d0917edf543055640e4b828aac159b250 SHA512 57f9dbdfa2c389b75cfd02bedead7919990cbd1908c1be9201a13ed5b981a689ba0cc5117f5b7b7e497486f59780ab9b10e6a7ad3387c105434879c11a5129c9 WHIRLPOOL f9b2ff858801d64477b69fb328f1347de04fc381827606d677d4c73be82d4894bbea3a77ca029e5b99d38c15bd3e5989a2b3ab90040cfa21fda9f5f997cbb12f
+MISC metadata.xml 320 SHA256 157faf515eabceba17b70e2cb7deb855b3be58be85e3349a7fa40b2d69c8a0f0 SHA512 44f0ea2e06ab198180db9be4533b29c56e7cd0f3af9f522188e063cf787ad1eb1eff9fe2e09debe97be85769a09375385c1f838a7eedc2bc92835e846320f109 WHIRLPOOL 110370e7ff146efb2825f9fcb2b8023598f251b51f3c54f08dc7b92b2c0a9e6dbbcb227528e22144ee10f63adeedc1671aaf7a9b924d39f864b62333bb84adab
diff --git a/dev-python/tempita/metadata.xml b/dev-python/tempita/metadata.xml
new file mode 100644
index 000000000000..efd988fe2bb5
--- /dev/null
+++ b/dev-python/tempita/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Tempita</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/tempita/tempita-0.5.3-r1.ebuild b/dev-python/tempita/tempita-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..4cb6f4d0d6a2
--- /dev/null
+++ b/dev-python/tempita/tempita-0.5.3-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+MY_PN="Tempita"
+MY_P="${MY_PN}-${PV}dev"
+
+DESCRIPTION="A very small text templating language"
+HOMEPAGE="http://pythonpaste.org/tempita https://pypi.python.org/pypi/Tempita"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}-${PV}dev"
+# Source for tests incomplete
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
new file mode 100644
index 000000000000..6b221877480c
--- /dev/null
+++ b/dev-python/tempora/Manifest
@@ -0,0 +1,8 @@
+DIST tempora-1.6.1.tar.gz 11423 SHA256 1c15b3ec37933192470e7e7f0dcd5fbb372a85f13c86ddb4c306f280a7fc1453 SHA512 9baf9162e304e59ae0a427a7a27d1fc66b0d4b98e016490317832ba2e7acec520ef2baeebeb26f7984ba7ace82413d15b96baef7dbdfcfdc94e29e7179769a01 WHIRLPOOL 25be89baeb5976157bfe259c97339461b18528e357d1476a3d614b9526325785942baa940e9d29b4df3b9ba46bd9a03a56e23314285da70ed2743e20f68561e4
+DIST tempora-1.7.tar.gz 11645 SHA256 a264672b7f39198eb90b531490ade4e873f6e13839253636c3bd6a5549be1984 SHA512 2420e32a9b8c990609d8f09225004e0b1c445cad1fe3c3c74625cb8317b552469acf2d3b28aa56633a87260a93c77d73b02178cb662016c514bc740aa01399e5 WHIRLPOOL ecb7df3e1af35a60f7c060203cad463f610468752b0d9a0f27992a0a75fae8c05c57875dfed797d3db94cd7d937a2d3d2291f0607ff0adb619012353bcabb941
+DIST tempora-1.9.tar.gz 12469 SHA256 9ea980c63be54f83d2a466fccc6eeef96a409f74c5034764fb328b0d43247e96 SHA512 cb049675d7196738debca3dc0ddd8c5e72d0468bd1a853f77378cc5564b100cd94d23c63d7b06c6bed2827365d904a1582cf9d497618493b795600b6d476b91f WHIRLPOOL 8e74390bb88c1a7ec091a60ea87613aa26c4dcb1de1cb8139aa9818fc6d41cff99512990ee6200d54014b80bb597bab40c880648646af1d503ae2ae85d2e1a3a
+EBUILD tempora-1.6.1.ebuild 1192 SHA256 9b097a8dfdefd8353f7ff44717a7cb981123e567ad7eec6abb1f33380ec9c1d3 SHA512 80d5b81ae922cb59b9db54fbb42ec1ee939584da1b1280c269b530e5c83052a71480b311d7591e4012f22e28721d9dab2071f478c95a713a043e5a7343107785 WHIRLPOOL 0f63bbd1ff2736a490ef5863821facbe389c66426ce42bb99147ddf5126a5ac9a930675402d74b187971a0dc9070ce0720647e828546d6faee380cb45be696d9
+EBUILD tempora-1.7.ebuild 1274 SHA256 adc314a2f5e0ba1454c5ab06037dbccd2d5456dacefa6f923765a51ad78074d5 SHA512 0e4a5b8e6296894c411accbc107a8dc677bd68ac0d6b190c699200636ab853e3980de9691a316dae2f928008ca87a7137e98c7fe6c0db89a0cba04efebb9ea8d WHIRLPOOL 07d4c475e3cfe0577fc4e76df1eef35c8439215c23110fcbabe03a791b298336146aa038037ba177c31a6c69506fb2d22748edb276a867c2c5e860f016b01d0e
+EBUILD tempora-1.9.ebuild 1276 SHA256 96e310fd2d926855e35fbfe199c7f5f3d2bf163ed70e9722dab0ae00e55f1b2a SHA512 7726efb1d0a06bf2c9d1e8053b57b9ac7b27e3e2bdb5d19cd052a5fb1d19dc65448bccdc41b6c6734d510f4764a0659a6afd6216e375111bb1a4e7f4ce534b73 WHIRLPOOL e73abe0f5a87b0b377c7d697cd6d13b798533829d3e0658e40281f44722c0aeab6484848f2b6b61a57d9e784661fa52fdf8ce1a2caa4db102564a3d79036f473
+MISC ChangeLog 1155 SHA256 f580327359e579ada22b590d4327c3ff0655e5ed035a7a4a8f81d44ad144823e SHA512 e87ea1e958c52c465dfafd0ffb77459eafefe32ef905309ead18aa6a326e093e04ed64f2aba7fc708ad17a4739509e2c6fb7c0c797a857215f05fb7f0d4616ef WHIRLPOOL 6e7f26d63d5766fc7dcc2d7a803cf0e955a772400f08ef9c6088c2754c15f7a470c0f0d5c16d78a55d17f822c329287849296abdf96df4d11ce67979f03f9e43
+MISC metadata.xml 638 SHA256 d3816c8f1d2743baa6b63c2e9648ffa066568fd52f748cf4b28d2feb1626e827 SHA512 06c699b11df110494a9714a8784042d45834ce647286e57c58831ce036a604f415c7de511901bbff1e9d10a114a2fc6f4ce5fd71dc72ec9cdbe856a93ebd9507 WHIRLPOOL 2f381d13670bcad12d3f3c17bafab79243ff27f9571b03f156c9090f359856c407bda26cd3c60cd2755cad4e40774264e50b9e5bbba4a033f916b4e35828f59e
diff --git a/dev-python/tempora/metadata.xml b/dev-python/tempora/metadata.xml
new file mode 100644
index 000000000000..acfe243c28e6
--- /dev/null
+++ b/dev-python/tempora/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">tempora</remote-id>
+		<remote-id type="github">jaraco/tempora</remote-id>
+		<bugs-to>https://github.com/jaraco/tempora/issues</bugs-to>
+		<changelog>https://github.com/jaraco/tempora/blob/master/CHANGES.rst</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/tempora/tempora-1.6.1.ebuild b/dev-python/tempora/tempora-1.6.1.ebuild
new file mode 100644
index 000000000000..5c444ca6ad47
--- /dev/null
+++ b/dev-python/tempora/tempora-1.6.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Objects and routines pertaining to date and time"
+HOMEPAGE="https://github.com/jaraco/tempora"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+# The calc-prorate binary used to be part of jaraco.utils
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	!<=dev-python/jaraco-utils-10.0.2
+	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/rst-linker[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/tempora/tempora-1.7.ebuild b/dev-python/tempora/tempora-1.7.ebuild
new file mode 100644
index 000000000000..ee5115c2e860
--- /dev/null
+++ b/dev-python/tempora/tempora-1.7.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Objects and routines pertaining to date and time"
+HOMEPAGE="https://github.com/jaraco/tempora"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+# The calc-prorate binary used to be part of jaraco.utils
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	!<=dev-python/jaraco-utils-10.0.2
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/tempora/tempora-1.9.ebuild b/dev-python/tempora/tempora-1.9.ebuild
new file mode 100644
index 000000000000..ac0b0ba352ad
--- /dev/null
+++ b/dev-python/tempora/tempora-1.9.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Objects and routines pertaining to date and time"
+HOMEPAGE="https://github.com/jaraco/tempora"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+# The calc-prorate binary used to be part of jaraco.utils
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	!<=dev-python/jaraco-utils-10.0.2
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
new file mode 100644
index 000000000000..e3a047408c5f
--- /dev/null
+++ b/dev-python/tenacity/Manifest
@@ -0,0 +1,5 @@
+DIST tenacity-3.7.1.tar.gz 22915 SHA256 86cae49f4334277164b97a1871828e9173d669b9bb223de44ba8c1cee787bbfa SHA512 83f277da3ee7beca4d564610a4ef46c33a87590214a41c0c36c9bb46920e5e8e7e8a8d130dcaac2802d058f7e995fbe01e13d5b7a65821e9a1e83072b78e3f00 WHIRLPOOL c8747efea73d5fd966cd448dc3b2d33341f0ed2a53287df2fe98b0a587522b984461be07159e5b0817b60650e3cfafb0a6e673d1dcd96b7c138782728c75df63
+DIST tenacity-4.4.0.tar.gz 26133 SHA256 9c5554b494dd8bae998dbffd7b8d1876e6b94de0c1df1ac51d0db25bb9f830b2 SHA512 08f4eef91e38f8d166029625e337057bd9a934fd58473d8c3666436e6312a0f7dd7f24dea05c8427df627bd37c7003602089970079f214fa7b79beee64df3f96 WHIRLPOOL f12433c89c0a4b2139be4d74dfb3812dcde9dae7feec9517d9287f85313fbe86567a1b9f9c3f55c1b4b864a84eaaac5097cc440dbffdb01a6425c0ef647b259d
+EBUILD tenacity-3.7.1.ebuild 633 SHA256 7ae13bb184e715025adbab3a8d0798389079405930be1f2c3980b3f6e5994347 SHA512 e5272ba1165543af1d3d09b3a4c97b49527c022da7ee408a0d15e2b58800f7635c8b418913d2e668adc3eed25b0d2416c657f998937d7c3fd4c05a07c893cb63 WHIRLPOOL b801919a49996604453ac02a38be05716173071c3a90c170d10b3419f553316d6726526c329ffa9985757a3726a8df600dd64d8047c8f778cb5d717568209418
+EBUILD tenacity-4.4.0.ebuild 623 SHA256 bec60593862a17ef893648958dbdec4bd5d04b7321dd9a282b89d45425e38723 SHA512 e3058bbd3c3a2103f245b98ddf4bf77c4bc2e422bd6a0af56dd9a7efbf773069f0cf89a3bccb155d7e667e16b533793b68e2f4f7aeecf74f29d136d5ebc26e38 WHIRLPOOL 52f275ef2a693e9ad64eaeddd0de57f6bdd98818db76dc9ec7f5b06d6f8ac0ee1dfb5bd1b57641773a7729e85080d0aac0656ce56a65874988079b347b692dad
+MISC metadata.xml 730 SHA256 378acb70f8be2fa879f47661dab7f219b8da7612d12a36ccb8d809a21a62ef19 SHA512 0b355562b481aebb7daf0940cc5548dc33e8252ae39e8bbd811f957f6253aa481c0fd02fefb7b30672392af50d5aa69731767915d47cbf83b71788cf8f5a6144 WHIRLPOOL db2c1c6ba46f231772071c938e3c977eba962b47b65122fa469e3ff40b8408914e443225536cf170fe9b23a6abb5c0176b30fef6749122e6f1197fdfb433b865
diff --git a/dev-python/tenacity/metadata.xml b/dev-python/tenacity/metadata.xml
new file mode 100644
index 000000000000..b607cbfe326d
--- /dev/null
+++ b/dev-python/tenacity/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+	Tenacity is an Apache 2.0 licensed general-purpose retrying library, written in Python, to simplify the task of adding retry behavior to just about anything. It originates from a fork of Retrying.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">tenacity</remote-id>
+		<remote-id type="github">jd/tenacity</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/tenacity/tenacity-3.7.1.ebuild b/dev-python/tenacity/tenacity-3.7.1.ebuild
new file mode 100644
index 000000000000..8ed0e24a1174
--- /dev/null
+++ b/dev-python/tenacity/tenacity-3.7.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="General-purpose retrying library"
+HOMEPAGE="https://github.com/rholder/retrying"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	dev-python/debtcollector[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/tenacity/tenacity-4.4.0.ebuild b/dev-python/tenacity/tenacity-4.4.0.ebuild
new file mode 100644
index 000000000000..e235720357e4
--- /dev/null
+++ b/dev-python/tenacity/tenacity-4.4.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="General-purpose retrying library"
+HOMEPAGE="https://github.com/rholder/retrying"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/termcolor/Manifest b/dev-python/termcolor/Manifest
new file mode 100644
index 000000000000..e06b09779d37
--- /dev/null
+++ b/dev-python/termcolor/Manifest
@@ -0,0 +1,5 @@
+DIST termcolor-1.1.0.tar.gz 3912 SHA256 1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53 WHIRLPOOL 49b7d1bd89bc1eb579c6f54f176267a547ba687b27899045d3240f93a797a103048e88a40501aa6c52c487312df8e7053811b08791923c4b18cfe7bf964c6640
+EBUILD termcolor-1.1.0-r1.ebuild 488 SHA256 090cdab1f4462b76b811b4b6b4a5dc834f2a3d473de0b77dd8753b44c6078e9a SHA512 5c03a3d488745a4220ffa9a4b772124f668a8469f5a7280b8327bf4b722ea42fd19dbaf77ed25f68ecd2323e105d0896ad167caba48130031d7913c39138526c WHIRLPOOL b89ad5fbdbc5f2407f0af7c5e0eca5ab80b19749df1d773760c9c0571ada172044148d1db45691c923537f44a7645da45911bdccf716c1edd7ad6b7923edfebd
+MISC ChangeLog 2967 SHA256 6b6074de6bd8cb35fecc50ad872d99c80d599f07b69749495cae43fc802cb8c8 SHA512 d82127d3519ae51620df2a8b03f028dc1451a5bf0f6459e7a7e3fb3efad55966839894aed91e20f7afe19c8734cb9802b4f1ed1a234503d4f2259ff2f8839df3 WHIRLPOOL 3f6b392ba06497552043817ba0074bb71b59f54c85a80e0098f55b98ca0e7d05d3f2fbc88fe1679dec1c2120184035124f6398fa1862bc062dcacf853feee450
+MISC ChangeLog-2015 1542 SHA256 5d55f234f701ac800515a63270c1aed97bf30f27b74afe19863fa30f92f73a87 SHA512 2ba77d33fd46ccee677723d62b0c3aca85359a597ca82b72fd0e71d8cfad25602b6f2b394224d92a81cdc3d66cafe1120b44eafa451b895ce50a0965ceb19376 WHIRLPOOL e5933c866fb18d5cbda5e79f7b63c9097a7a6dd4ad6bccb3f857ff96258eac0ae971682f2d0057633986584aaf464ffb8f141a1636c7648dcbf6c1f2c3f6cf16
+MISC metadata.xml 545 SHA256 7b22a27dd9362a9ee984ca3c39559fa692ba9706acc285931221c3a63f93e0c4 SHA512 475cd979340760bacfeb70aad2a0a046bafa5f1b8595a897d975615d4755c1b89f511f952d29af8390610fe445a03f3edfd8771d1b217d0258eed5f9f042adf0 WHIRLPOOL 713d9873cea96a85a33231dcaad601c04884282666890051c05a19ec8c2c8d54e7f2eac5473386453f567481c67642367fd80614437598bffdc9b9016959c6a7
diff --git a/dev-python/termcolor/metadata.xml b/dev-python/termcolor/metadata.xml
new file mode 100644
index 000000000000..e91556c901e3
--- /dev/null
+++ b/dev-python/termcolor/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    ANSII Color formatting for output in terminal.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">termcolor</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/termcolor/termcolor-1.1.0-r1.ebuild b/dev-python/termcolor/termcolor-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..f56d2416830b
--- /dev/null
+++ b/dev-python/termcolor/termcolor-1.1.0-r1.ebuild
@@ -0,0 +1,20 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="ANSII Color formatting for output in terminal"
+HOMEPAGE="https://pypi.python.org/pypi/termcolor"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
new file mode 100644
index 000000000000..c784e5f08836
--- /dev/null
+++ b/dev-python/terminado/Manifest
@@ -0,0 +1,7 @@
+DIST terminado-0.5.tar.gz 10491 SHA256 63e893eff1ba84f1ee7c4bfcca7676ba1de6394538bb9aa80cbbc8866cb875b6 SHA512 8c53e2c8fa837c171a8790744770f41d4fc8fe15fe8abd28af17317950c615e4c75c22ab896fd98984fd9c2bbbc7798e5ffe319827d84eb77889bca63660e421 WHIRLPOOL 0e603e49a754a4c5fa68b1df3416a6355357ab5af6801968385525bb2df2a558ffe73030f1789610b731638b57d9d5c1a5661c86de93984f8e2047bf205925b1
+DIST terminado-0.6.tar.gz 10334 SHA256 2c0ba1f624067dccaaead7d2247cfe029806355cef124dc2ccb53c83229f0126 SHA512 9b9521917d4000aa45e61a1b88705e715f11686890671607cca81d4518f1e17feefdc2ad3de64dd0e053a6849956efbbd838c7b98d570dcc98a936c0a4cfce9c WHIRLPOOL 832f7deea094856a0bf3fed3610561896a8906c4339dcc47197b85ee36ab47a385f6e180ebe65a9141ca946761ed6a94552fe9c21e4c792cac3a061b3403a5dc
+EBUILD terminado-0.5.ebuild 698 SHA256 f39db6ea5fcd55b24471bfedeaccbe8a9acbc23eb3e57c8ef6e208902d5abdda SHA512 13507b2d30a95c93c9ff41d27e8b33b5da1759f29516ff09b97dbc034e5fccc6c731de4b512aa7e00e1bd2f034af72a1851c446124023798d4e49e1d06b51ac3 WHIRLPOOL 9919496bfc41169692160233314db278db40c60b18a0edff07939cd3af8f5ae35ff5f5a85c56d1b3842dec0e7cef8b69efcd436d3f86784f9c2ef9002a889aa6
+EBUILD terminado-0.6.ebuild 714 SHA256 e8bfd64d75d0f739c55b7b07a77f2a1758659fcd10889fde664453ded4d5b0e7 SHA512 0f6be413aeb68c5b9faa8cb1a2aaccbfaf52c17e6c62b5952b14ca6bbee43d9d134c03113429dc64c8489e57e90e180b334283a7ec302d6f44d40d25bd46ac78 WHIRLPOOL 5f42f9e422316fcc742b4452aa0cbf3ce1ccc07a2781a909698f5c945093492cc97a90c6e8def21738780565d177dffb91854950057170a215f756152a078e90
+MISC ChangeLog 3639 SHA256 9ad1ef09223050c91b4ef1749e3d7e0e7206c493a180efcf5a3200a258be8541 SHA512 fc1ac2da9e67fd9404e66d89f0c4324af184d93b5073d9c98b57bcc0773773e13c06b1fb8ee9633dbdbffef62e58be4577a1a040409c3b4ecdbd7e6e41098e18 WHIRLPOOL 414a40a160ddb8f6131483ebc9d6e5f05e5f57b1b19c60ce039af1925d053828291c391c6ccfe0149e880b445877ad726613d7ef9c1bbef2d84aa7a064834ab2
+MISC ChangeLog-2015 896 SHA256 d46bec255b87418c3ce4cdf1f9f60197d05ae9a8bebfb4fa7af0dc1441c98ef3 SHA512 75d6301bdd2647697f4eb187c3ea67b2369133e5bec255713ed1f403febfd21db1c1a7d342b97cbef6be67930e55a4317ab3ff4320dfc20a8263ed69c0ce80dc WHIRLPOOL b8d0264360359bd98840548d8f9b80dff624e84f89d9c572621abfce7c5ace2e0c6df22fc410563785486abbf604b54649483a4b7000fc6218aea292177d32fa
+MISC metadata.xml 383 SHA256 a61c350b04186b94f30bb17c7ad8ec1fd1ae1267cc9e13c5b7e300b9bc21b8b2 SHA512 928437f5650b4970891cf3391ca12a69059e588e334031b0985e6453cc529c709878cf2a326e3cb90e27bd717f1c7c79c1b45d2f644ceb2ecaa3dcc77327d381 WHIRLPOOL 8da604d2dee02c0cb90af0adae2cdc16d26da3f720b60c524ae898529b8f40d55eb9108b92ad9039bbb6aded8a17f9ded4a4f118e07ef906b6ee8ee4fb08085f
diff --git a/dev-python/terminado/metadata.xml b/dev-python/terminado/metadata.xml
new file mode 100644
index 000000000000..9daf5d8f4ffd
--- /dev/null
+++ b/dev-python/terminado/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">terminado</remote-id>
+    <remote-id type="github">takluyver/terminado</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/terminado/terminado-0.5.ebuild b/dev-python/terminado/terminado-0.5.ebuild
new file mode 100644
index 000000000000..8f8f52e93db8
--- /dev/null
+++ b/dev-python/terminado/terminado-0.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Terminals served to term.js using Tornado websockets"
+HOMEPAGE="https://pypi.python.org/pypi/terminado https://github.com/takluyver/terminado"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/ptyprocess[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
diff --git a/dev-python/terminado/terminado-0.6.ebuild b/dev-python/terminado/terminado-0.6.ebuild
new file mode 100644
index 000000000000..cd3c4c796d6d
--- /dev/null
+++ b/dev-python/terminado/terminado-0.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Terminals served to term.js using Tornado websockets"
+HOMEPAGE="https://pypi.python.org/pypi/terminado https://github.com/takluyver/terminado"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/ptyprocess[${PYTHON_USEDEP}]
+	>=www-servers/tornado-0.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
diff --git a/dev-python/terminaltables/Manifest b/dev-python/terminaltables/Manifest
new file mode 100644
index 000000000000..f13854568f52
--- /dev/null
+++ b/dev-python/terminaltables/Manifest
@@ -0,0 +1,4 @@
+DIST terminaltables-3.1.0.tar.gz 278484 SHA256 c02ecf68e22374ca8226d2af314875489e59d523ebec6a363a554e4716a84723 SHA512 dc49458652fff8bc6094d316d84c9b8e9fca1a26e3230c0b668bc03ec8528793f4ef024e8032d4a56fbfabfdfd4a1142870f550f0b373ba6a42dd2e3ead3f501 WHIRLPOOL 7d28e7f468faf9644121f92d2f38d59980ec1f2cebd3f7249b5959da9a7d43c86790e4fbfa9822a1e283bfb16fac21d905def3586f05daadd531e17ea8399d00
+EBUILD terminaltables-3.1.0.ebuild 509 SHA256 aee95d2a5214e3768e9d281ea3aaffe997fa1292d0802225d316f249c807b135 SHA512 53d96830e8a373e49341b3b345360dd2e1c6c45f779a8e4ed40cb2446b5ffdea4fa69803a4afa62f386a9b2c954243f27626ea8ba3f2e47b8d0d951887cdddce WHIRLPOOL d9e9d20b55e7435ec01d8212797d67605a53aa1b3be1d8fdc5fd0e5e808fbb0cec14b1ff771fdcdcddd48dcd1ffb8214d93c122b00280a25fff588bf6ac0605c
+EBUILD terminaltables-9999.ebuild 489 SHA256 a7620d042d8b6cb93fe700f53e92ca9978ffead330476897ed08bdb6ef96ba3a SHA512 f74048e32da87404597d1ca8b6ee9ef8ee78d5044a9611621dc4bb7d11cc0bad041046a222390b610a67a851ee5501ceb0debb09b43deef4d8bccaa6442c7b38 WHIRLPOOL 618428af376cd8a43d3f3bed963165c5121c94203153984d1bd54d70ea2953c0a442fba329f6dd3757a81d83b3b719393dc193aaf9f25080f8d63ead9069ee23
+MISC metadata.xml 322 SHA256 d4524ef56bca926d08996b7a59b54e4f92ea2b658fe09c0343733f2db112272e SHA512 ae5215f13b457aa43dc95d67bacc371292f0c8f6540dcb49633f0120232dbde7fe12479c3ff16c203b20ac96700be12c187444a768f50e319320684553509dd1 WHIRLPOOL dbf5fa6725d51a3f584dcb8d8088688ba546b7f4e6e132c50c9748c3abaf2634ea123aa3a54b5c0a71c4b5a9432ad82957892fb9ab4e72e602920a85bc585834
diff --git a/dev-python/terminaltables/metadata.xml b/dev-python/terminaltables/metadata.xml
new file mode 100644
index 000000000000..c80f94490085
--- /dev/null
+++ b/dev-python/terminaltables/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grknight@gentoo.org</email>
+		<name>Brian Evans</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dbcli/mycli</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/terminaltables/terminaltables-3.1.0.ebuild b/dev-python/terminaltables/terminaltables-3.1.0.ebuild
new file mode 100644
index 000000000000..44c1384e4f36
--- /dev/null
+++ b/dev-python/terminaltables/terminaltables-3.1.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Generate simple tables in terminals from a nested list of strings"
+
+HOMEPAGE="https://robpol86.github.io/terminaltables"
+SRC_URI="https://github.com/Robpol86/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/terminaltables/terminaltables-9999.ebuild b/dev-python/terminaltables/terminaltables-9999.ebuild
new file mode 100644
index 000000000000..ec8ccf916524
--- /dev/null
+++ b/dev-python/terminaltables/terminaltables-9999.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+EGIT_REPO_URI="https://github.com/Robpol86/${PN}.git"
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Generate simple tables in terminals from a nested list of strings"
+
+HOMEPAGE="https://robpol86.github.io/terminaltables"
+SRC_URI=""
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
new file mode 100644
index 000000000000..5f302fe68465
--- /dev/null
+++ b/dev-python/testfixtures/Manifest
@@ -0,0 +1,5 @@
+DIST testfixtures-4.9.1.tar.gz 90117 SHA256 e45eef63eb39e63f689ec9d25f03b9bcc201b15e6411f3b73cfe4d0611ad5e1d SHA512 20053d22297b7852382a4f2bf6d76bde6489f788a9073aaae407f68bb6b3d7bdc4a045868cf7c99fd294936768745ee7d652c86a4a96c33fb0e95fa0d96d2a59 WHIRLPOOL 2cabb01d1d11fcf54aac3ba05ed5432bbe0eeb416699b8b4db108a94ce87b1cebe5c5594c350f5e39b1cb4f036dd9577620235b2ddc757ea31c956d3b97f43d3
+EBUILD testfixtures-4.9.1.ebuild 1607 SHA256 ef59d918ae9e5b8e67747538c4e7f0f46c0d7dc5552c1033475e9676fed8a792 SHA512 e9135d4e657d229cdd97a6f4e7f242aaa2941e3bd2e9bcb1f06fd52b4499fb8424bf85e34e3fa5ea537ab0ba22cd706e6420c2013c2c2f8878221409decf69d3 WHIRLPOOL 6c7d4eeb37e8b8093bc42e162c0aac7434bd9c9d94ab6be4751e16ed7e54e3780d8e1f771bcb6711d4021a375d8bdacc8c7bf4fd5cd4bf03b415f3b9c160ea80
+MISC ChangeLog 4703 SHA256 e95f367a5a349e9e6d820c74da634e98b320138452178d6e654d9dd2fdf66e06 SHA512 77ac23179258b3680072c132bdaef3916c785a51eba9076169c8211c927d02e41615b671e51bd0fcf87447e3ad8170eba00ecb63332e952d934a8b726a50174d WHIRLPOOL d5df2143226d5643fa532298795994a93b7f15ff86b768132b9e6b223b65e40688e50dc0fac2e8dd9b5de67f1e7472458911855f9d5eb5c784479f4037059505
+MISC ChangeLog-2015 2414 SHA256 72ee1fe694b8e471324935b086c239be3b9b9c26ffa6b6e32d91221bc44be515 SHA512 cee821950381d707e2ddae6ab226c08c239d0d1d93e2d041e891846495acd3277f7d399645d662251d7e3bd619452e29fa820698c4d9f1f64a5f7df63b807ae0 WHIRLPOOL 2c1a912761d1cd23fdd8cdf14f1417a8974593450df4f436514f59630698b98dad728aa1b06479a7898fd7a0446af33227ba39c7395a00804ea502770f12fea4
+MISC metadata.xml 390 SHA256 b2eaf47f2f53cad3bec7ef0231fc3558bcd1978838ab64b03312e28f369eb796 SHA512 b5acb87f7a097840d861cf348e917f652b81712f9c4b408bd4a3b0f5a7b051bd1731735b2b3f63aa56144a032e6ea54fe3691c5858cb678666b6c4d701088776 WHIRLPOOL cb04b997acc0709f9c16e6431992d1c156e049b173417eb6ed971016c2ed5083cb574bb0959882cb9c6b82a50b9c301829b3e88101fb532bb99cd95033a03c02
diff --git a/dev-python/testfixtures/metadata.xml b/dev-python/testfixtures/metadata.xml
new file mode 100644
index 000000000000..79a3f50dbe78
--- /dev/null
+++ b/dev-python/testfixtures/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">testfixtures</remote-id>
+    <remote-id type="github">Simplistix/testfixtures</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/testfixtures/testfixtures-4.9.1.ebuild b/dev-python/testfixtures/testfixtures-4.9.1.ebuild
new file mode 100644
index 000000000000..8003c5ff1b1d
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-4.9.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
+HOMEPAGE="https://pypi.python.org/pypi/testfixtures/ https://github.com/Simplistix/testfixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pkginfo[${PYTHON_USEDEP}]' python2_7 pypy )
+	)
+	test? (
+		dev-python/manuel[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		dev-python/nose_fixes[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+	)"
+
+python_prepare_all() {
+	# Makefile comes set pointing at a wrong location
+	sed \
+		-e 's:../bin/sphinx-build:/usr/bin/sphinx-build:' \
+		-i docs/Makefile || die
+	# Prevent un-needed download during build, fix Makefile for doc build
+	sed -e '/'sphinx.ext.intersphinx'/d' -i docs/conf.py || die
+
+	# remove test that tests the stripped zope-component test_components.ComponentsTests
+	rm -f testfixtures/tests/test_components.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/testify/Manifest b/dev-python/testify/Manifest
new file mode 100644
index 000000000000..a5be7ade1580
--- /dev/null
+++ b/dev-python/testify/Manifest
@@ -0,0 +1,5 @@
+DIST testify-0.11.0.tar.gz 67914 SHA256 04880b44dd34494e498018bf7c0c79370b4f61bee048e2be76068d0a36ab1c82 SHA512 ed19a9b5cfa509b65bfa366aa8c5fb311f00a2996dca9b5028a7dfe8d7ad06ab88964dd7e7ea7aa31e183537d769bbd81eb6dbd7d57d7576b6ec8fca9b684dd0 WHIRLPOOL b855c87cda58b797c47221756580ff5e8db9ef4ebbc30f81bdb34582b2c57bfed49e6c94ee113efa7a83ad73721a0a18263d865ed7d03debf56b9c21a6be368a
+EBUILD testify-0.11.0.ebuild 1314 SHA256 9b45c690ea7c72381b89876c3ca82293698f72428a71583c221ac7f299de5ca5 SHA512 3bce37d90f56ca9b5e505ae7a0d64f8fafaade1ef5774d327e77d46d449cc5de59001497d05d0a8a549fef8da274d5ea88ece6d6dd680ac454b5b75b27a88163 WHIRLPOOL 21d9f0d819001a8edf2731e5ee49ff05fe3e2e2c13c6df50e7e576e945f0b23afee8b10b61f4294c275163d7be42a280ee967716cc99234347696d4812a2b115
+MISC ChangeLog 3688 SHA256 3cf6428c59111ea095888ed2e86aa3c45ba7da597be95c71faeb46aef4bc5130 SHA512 e5386012777a6825e9c7aaf9e7c91161d4b38363031023db356b4aabdc80c14aeed22614d855a873ad69ce86cc24ba313bef280cddca4886f3525eb2aea8f154 WHIRLPOOL fabb17ffeb0ccfd221eaabe01039a3e81f41b7f002ea8fe9c47529fb5d05e29dec470e0806066571802446dc198cc49784d04092612463bbd5628f67099ee34c
+MISC ChangeLog-2015 3526 SHA256 a7af33c5b2fcf34ebae9a55c2f7bd175bca8d27bd7f929aeaa3a968f3fef0bf7 SHA512 7188c3077c9f8550408f24dfc6061f60681437e50ad9f809339649aea366d5827750544121a890fe96e7d7f4c1f7870458195e6194a02b3cf357560c4ab10260 WHIRLPOOL 6c425c310c502b51e9232f34d3a27517286c80b722415725ca3af74499b112d06452c8e21ab5200b2c76bf27a9ea37e8ffc7dda94ad392c52b063f51fe08bf78
+MISC metadata.xml 374 SHA256 88b2412da8d02866e528689831980a6a4593f20c9bc91a39424702449c8dfc13 SHA512 668324c1ff0e2977568abc0ff574acf07d445bb47e17781b7e6d4f409118496c5ab4668ea500e94a615ffcd93c4c5dd59960cb00b886b9c57174ae62ce24c8b0 WHIRLPOOL 982eee52c379b0d3909de3401c7cde488a5c745764c9c739fa969b48ce28af9888e1e5b6c1883db390e8872d0b61042c1770fe90b9944fe263c37448b323054a
diff --git a/dev-python/testify/metadata.xml b/dev-python/testify/metadata.xml
new file mode 100644
index 000000000000..643f2eb0cc32
--- /dev/null
+++ b/dev-python/testify/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">testify</remote-id>
+    <remote-id type="github">Yelp/testify</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/testify/testify-0.11.0.ebuild b/dev-python/testify/testify-0.11.0.ebuild
new file mode 100644
index 000000000000..8887621f2c22
--- /dev/null
+++ b/dev-python/testify/testify-0.11.0.ebuild
@@ -0,0 +1,45 @@
+# 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 vcs-snapshot
+
+DESCRIPTION="A more pythonic replacement for the unittest module and nose"
+HOMEPAGE="https://github.com/Yelp/testify https://pypi.python.org/pypi/testify/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_prepare_all() {
+	# Correct typo in setup.py
+	sed -e 's:mock,:mock:' -i setup.py || die
+
+	# Correct use of local importing in pertinent test_ files
+	sed -e s':from .test:from test:' \
+		-i test/test_runner_test.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	einfo; einfo "Output reporting exceptions \"ImportError: No module named <module>\""
+	einfo "are instances of exceptions expected to be raised, similar to xfails by nose"; einfo""
+	for test in test/test_*_test.py;
+	do
+		"${PYTHON}" $test || die "test $test failed under ${EPYTHON}"
+	done
+}
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
new file mode 100644
index 000000000000..1d6a14537eca
--- /dev/null
+++ b/dev-python/testpath/Manifest
@@ -0,0 +1,9 @@
+AUX testpath-0.2-setup.py.patch 944 SHA256 65353d7e4a13af097020996de9ed4a0cf25923cd2eac05977e4f7dd3dec1085f SHA512 c27c2dda320d2c16239eb498b2f59f85746745ce1875879a17f41235081983fd1015f0dfd182c6823b998f85aaf460486a3ac6d955be969487692ed50c5648aa WHIRLPOOL eefe6bb25226168946a26dfc49f5a85767c62024dcdccd4696189fa0bc9c81873e769b11bf25f82eb3a546fe102970eca433a30b320c869638fdf3f7905099c3
+DIST testpath-0.2.tar.gz 13732 SHA256 a5388cc7c8370b1f11298c1d513b3d2b9e2f390607a7c39963e6e3ba9f1b7012 SHA512 cc211bdc8f31ff4c286324e37bbce7fd84e19447d9735f396ce67f7568dd1d133be732c1fd7a08928c94566279d0f293a0caeed6a58ae6cd3dc293035fe164ea WHIRLPOOL 6b87b1c5ba590e6b19968e823dee22d7bbe0411124c1290593eb5efd78b5af06c51853d3359f339c4ca60b2842c409a1fcd0ff45c59f2e7e07f557534d78fcaa
+DIST testpath-0.3.1.tar.gz 91333 SHA256 acd1e9ae3582e03b806ebcc40fbb2c660032d3f3ad991e5460e6856d69e6ba12 SHA512 ab826cfb76d9a3ed6f1b178240f6bf61439bd792be26b5ad407b5c3efaa455b48965ceaf17e4ca6a4bc706465a8ed1c6c31a1572df5beeea2bb8db7814dc04f0 WHIRLPOOL b8eb5eedcee129a0a8e76d8739d1c036d10bfb0a230a089c74e149ee8aea63eb681ce70054f3abc852de8c81709e989930e10eecea46931b05f2425d49594497
+DIST testpath-0.3.tar.gz 91250 SHA256 01cc3cd59a59d42b238252774b9ebfc9d2af1d0d9bac81d7801409f570b1cda5 SHA512 71a3266e17616c4df4a4c465151e9d48b89f573e4562132e85982b62446396884a270a32b5d4956aac1f0be1a00096cab9d0dc1718ae8b6312b0436eca683bdf WHIRLPOOL cc44d374625ff39d3ac579fc19eb6ae20b4d7e91cdf614784c1fc46a9324c7f140ea2f807c106a0e8ac31138de854671c59ec365da7fd9985bb4fbdd3a3a6c94
+EBUILD testpath-0.2.ebuild 1117 SHA256 ebb9947d01a07ac096b84d08f60397d267b5830bba6e801b425943565424a73f SHA512 e59d7221078325f902df0f5eebbbad473bd90c0498ab458d7f2ab46b8efeaf83fc873902548f96aed289bee34d3d7d8386fb52376a97db2119c12a2b44078f36 WHIRLPOOL f2a1845276864476e31c93b0e39efc51c89b175e7f856b87e762cac1ca9990f43d62c9137e5bced5858e56b095a93b01e56e1ec83ca04fe340b16ff91fa1bdc8
+EBUILD testpath-0.3.1.ebuild 1066 SHA256 3669a42bf1c12cc332962140ccc10b5133055dfec13ab7389caa3f205daab7ae SHA512 f56e3b5c7638472310d8d41169436cf942e2b7e8a7052dc2ca3df14301e5a130650a1289b005b1fe807552d7f2c2aa05173aa8fc08be0704becd934e6194cc7f WHIRLPOOL 0a2bdaf2777929f417c98b5944b0007594e5d9ee308116d31839f4ca4214a2e8feac369b82c232b2cde55434a383550cb6790309e8ae497f8519d61d8f0f6740
+EBUILD testpath-0.3.ebuild 1131 SHA256 f56f81873e98b0ce4034bbae960e243307571531cc3134ad4595c836e52ea1de SHA512 da68e5eec7b29fa5846b1dff424e657b987aa0f39a3767f158431fb66bfd93e542fbe9211329285fc1d1f00c72e6936236c7b280b79d49dd7e8ae450deea5bc9 WHIRLPOOL e058abe449fb8fd929e168b9fa653ceaadfca56f14c0cd792ad3ace254fd1b0944e0f84f220cbd9bc56f9b312c1d731618b9bd2338db7c3e3b1872da8ca0ed5f
+MISC ChangeLog 1371 SHA256 68962dd399e1199adb4962779042caf9bfd645aeeb63190d24b202ab168c4113 SHA512 db533721649e964b2ffedccedd42658ad4cdb246b2d88a22a4e089da61ea903a83254efdf0fba93af2e5203098f9284cf16112befad2297e0a1ea1b081108d24 WHIRLPOOL 4ff2c36616fd7bda030c8c394dd8a2303b4a50395a95a2a944fa45f6cae505fb77584f65fa6fc4ab7b026dfce339acf84f1a288d26f206a87e4e6cc0af74fa06
+MISC metadata.xml 613 SHA256 d0c71b3d51ebfcbb477b22217dec08f3d0f51edc45ec0a64e31511d416f60b86 SHA512 c251993ded801317c638b460520800bc7fee9390a3c581c01a463da661eda3c7348117aa98c19efd7eb577666dfe580fc690e2f30d2001bd98e49f2baa33248e WHIRLPOOL e0f98bb3fb9d2324349e21f639f30545de4b4caef07a54e5becd15f37fcf312dae7d44ed2ec36b551527ee742b8dfb7df1fb16daf309f34194849bcb39dc531c
diff --git a/dev-python/testpath/files/testpath-0.2-setup.py.patch b/dev-python/testpath/files/testpath-0.2-setup.py.patch
new file mode 100644
index 000000000000..a1bf41acd352
--- /dev/null
+++ b/dev-python/testpath/files/testpath-0.2-setup.py.patch
@@ -0,0 +1,28 @@
+Patch to bring back setup.py from
+https://github.com/jupyter/testpath/blob/086bd1bd1ec7da1b3dacfed1705c0c99fae231b3/setup.py
+--- /dev/null
++++ b/setup.py
+@@ -0,0 +1,22 @@
++from distutils.core import setup
++
++with open("README.rst", "r") as f:
++    readme = f.read()
++
++setup(name='testpath',
++      version='0.1',
++      description='Test utilities for code working with files and commands',
++      long_description = readme,
++      author='Thomas Kluyver',
++      author_email='thomas@kluyver.me.uk',
++      url='https://github.com/takluyver/testpath',
++      packages=['testpath'],
++      classifiers=[
++          'Intended Audience :: Developers',
++          'License :: OSI Approved :: MIT License',
++          'Programming Language :: Python',
++          'Programming Language :: Python :: 2',
++          'Programming Language :: Python :: 3',
++          'Topic :: Software Development :: Testing',
++      ]
++)
+\ No newline at end of file
diff --git a/dev-python/testpath/metadata.xml b/dev-python/testpath/metadata.xml
new file mode 100644
index 000000000000..cba9cbf64b00
--- /dev/null
+++ b/dev-python/testpath/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    Testpath is a collection of utilities for Python code working with
+    files and commands. It contains functions to check things on the
+    filesystem, and tools for mocking system commands and recording
+    calls to those.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">jupyter/testpath</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/testpath/testpath-0.2.ebuild b/dev-python/testpath/testpath-0.2.ebuild
new file mode 100644
index 000000000000..8200f6e2480a
--- /dev/null
+++ b/dev-python/testpath/testpath-0.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Test utilities for code working with files and commands"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/python-pathlib[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-setup.py.patch
+	)
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+	}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	cp -r "${S}"/tests "${TEST_DIR}"/lib/ || die
+	py.test || die
+}
diff --git a/dev-python/testpath/testpath-0.3.1.ebuild b/dev-python/testpath/testpath-0.3.1.ebuild
new file mode 100644
index 000000000000..e00dcfd0d7da
--- /dev/null
+++ b/dev-python/testpath/testpath-0.3.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Test utilities for code working with files and commands"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	test? (
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.2-setup.py.patch )
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C doc html
+		HTML_DOCS=( doc/_build/html/. )
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	cp -r "${S}"/tests "${TEST_DIR}"/lib/ || die
+	py.test || die
+}
diff --git a/dev-python/testpath/testpath-0.3.ebuild b/dev-python/testpath/testpath-0.3.ebuild
new file mode 100644
index 000000000000..efa5591fab24
--- /dev/null
+++ b/dev-python/testpath/testpath-0.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Test utilities for code working with files and commands"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/python-pathlib[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2-setup.py.patch
+	)
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+	}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+	cp -r "${S}"/tests "${TEST_DIR}"/lib/ || die
+	py.test || die
+}
diff --git a/dev-python/testrepository/Manifest b/dev-python/testrepository/Manifest
new file mode 100644
index 000000000000..8f4e5823bc52
--- /dev/null
+++ b/dev-python/testrepository/Manifest
@@ -0,0 +1,10 @@
+AUX testrepository-0.0.18-test-backport.patch 1091 SHA256 605029757f0e46be4aae8b170eb98b352664c6e6f3464624887386fdc7ffc2b5 SHA512 ffae1e5a65a5b34d30ad6c2a3aed6b5872fb42c77cccc050e86b95683d739f7b5343676212d0e236d26ca05a3f76a7b72c45f9939c7bf6f9c6695a8f9e904298 WHIRLPOOL 627cd2d95703f058de31d1bc3a791ba5c2a36bbcec1c53535d45a90ec997158711f824067ac58496e3bb7c9c13ba7088940cdb1a62ef77fffd9deb3d3fd0bd53
+AUX testrepository-0.0.20-test-backport.patch 1970 SHA256 50beca7393d9c58eb33c31da1ccfca4a0c680e9e800a773f9f2b82eae680d951 SHA512 b12926910a8f745515734bdc504b730341263d9d3ce44a598886b4e0aa0c9452a4b187e7926fb77e00837ce5f17ffdb6c3c84d53c06005e8caa29317bc42a62b WHIRLPOOL 619236f89a11cab68302465afe97ab6abbc97aa79d84e111e89054abb8aa9db0f938a728181955387b2ee426c8e7a422d0565a5a4013445ea6c8b4bded9c7c52
+AUX testrepository-0.0.20-test-backport1.patch 991 SHA256 c8533715ce4d84a3dff1689a0496594cf19b7e50c5ff4423386c99cb31005b31 SHA512 0bbeafcd9ee399a47f1a6ec7249ce9412a6d154b2738899bab75b9593a0703bf297c9a6654e8c4131ccef6daf7c111ed3033e6e3263b5cace28f135bc9593b3e WHIRLPOOL 52836874e393957fab0d9c0c73bed577bfa235564c114e7cdb9588ae26d04a07b192bf296c086e152416cfacb24381049bd254226c6ebd48a2f44ca43f23f411
+DIST testrepository-0.0.18.tar.gz 84886 SHA256 ba15301c6ec6bf1b8e0dad10ac7313b11e17ceb8d28ec4a3625c9aaa766727fd SHA512 4e90db6364f77f464ae063020b016367529588f581af001c2564bf4babb264fc37bb7231413725211c6d483a269360d86201f81d2b24d7eb162dca2463d13c92 WHIRLPOOL c6ced39884ea731173b59a0cbd283d474b3a658e94e2f94a87b5b5e8461d82790cfda2d3e834d51e90b6e57299163cf2dc9ef2cb62440104ac6a046039196abb
+DIST testrepository-0.0.20.tar.gz 84956 SHA256 752449bc98c20253ec4611c40564aea93d435a5bf3ff672208e01cc10e5858eb SHA512 df14500e2b27b6f39d9d4c4f42961efd63dfe25186e561eb1678952a8ab9311f17c36b78819fea33e0ac879c47a33d45c31ff58be017609c8a6157905ee712d6 WHIRLPOOL 12be50a78a79b0c1aa43d4a2c97055a3956f85653e36ab56a9eedc0c2f80bf0860b702e62627055a72e9ddfe9812bd916e4c4adbe50df02bd94b911b9c0b7d0c
+EBUILD testrepository-0.0.18-r1.ebuild 1264 SHA256 b3f4269f02620c1a924b71f278db3f3a65085e2848316358fc375bd2939b7e65 SHA512 8c6d2b3a20fb4c58a78e466c61a153fbfeb663425978facd849987e6c8b994a9e95c944787cfb40acd88a3f46dde12609ce8610242c790e8e9169e36526c8153 WHIRLPOOL 5b5bb230fd47871944d058adf3db122401989e51bb4ba0b30d5eca2a4b8b65187b533c1a5e2dba31bcfd5903fb83b314e6663153a4d641e2fabea779f2a75ce3
+EBUILD testrepository-0.0.20.ebuild 1266 SHA256 3279b3e2da784b44008ce6113078915505e6f810bc0b7c0550abc1c4915cfe56 SHA512 9d79f61b947d9c7f6276d05e156cdcd52953d05c66b7d6bf61357e2e5a4f15f97a0771850ad78aad8c6a2d332e65574e8c9cdf9c46b1b031a80a0ddfea996d67 WHIRLPOOL e63d9c4dd56129012f27bd991a690e1478862793c5305198d4fbab261d535c1be815202cf64b9ded838d3bee1bb03525cf6cc1e6c50d80b9ce23ecf53f2aa1c9
+MISC ChangeLog 5810 SHA256 d9c40a86395ed83123870104db1a4c13d8611fcf5c05af6888335dcdbe0d919e SHA512 f20bb73d2586577075e2901980a5bc9a3bc8eeb4bacd6de3cd29cf704fac61bd146b5e71ae9e9eb03d5ea4befe66de8ca2b55db1724c9dafa684c7e30f127374 WHIRLPOOL de3a757d5871544627dfccfadaef96795e8a2a25f48cf6d083d5f4e219c809dd8ec29af38db6a30e33a6be70dd8a3f2200bbee13d34f67448181d1d8f2b14427
+MISC ChangeLog-2015 4072 SHA256 c8fc77aec8ca4e95e049084ee0b837b99fb427a330e5a83eb3f909aec0df15f9 SHA512 a0ed4dcb1aaa2101a087ef6c7c2c37fe15b9c1f7053590aae6fb9d644bf745cf5a7fc4a7169127bc0286160ae423c363b5271631ea708200ddb290dfc4c567a9 WHIRLPOOL a9f622126838b72f76731c2fdeaf24869ab2d6f1b39c1e3b95a1f2e713d36ccc71d6c54884f5d0197034e4fcdf67b2f4fa9e938449668091f70cfb7a50360b79
+MISC metadata.xml 575 SHA256 6d498748c2bfe40cb25d4356ea132dfb0f1e2be90b57dae5294eb0c390490241 SHA512 36f0681e6b41a80ee0f3cdbac0520640c67a5612e73baae30b0b5917576d343db3327e03a40e20b23f23b0c76ca797d5ccd09d8dd339dfdb5af6029a4f4d79f9 WHIRLPOOL 77f612b26ae3e6bf50068fae4f4e22a76fd90ba39c1b8193740883f3d81695ac83409cb16886d5c1949a21a372f79c00b96db73e445c5f6d32ff25e08ff21edf
diff --git a/dev-python/testrepository/files/testrepository-0.0.18-test-backport.patch b/dev-python/testrepository/files/testrepository-0.0.18-test-backport.patch
new file mode 100644
index 000000000000..112b0299df54
--- /dev/null
+++ b/dev-python/testrepository/files/testrepository-0.0.18-test-backport.patch
@@ -0,0 +1,41 @@
+diff --git a/testrepository/tests/test_repository.py b/testrepository/tests/test_repository.py
+index e2e5e05..4a8667b 100644
+--- a/testrepository/tests/test_repository.py
++++ b/testrepository/tests/test_repository.py
+@@ -28,6 +28,7 @@
+ from testresources import TestResource
+ from testtools import (
+     clone_test_with_new_id,
++    content,
+     PlaceHolder,
+     )
+ import testtools
+@@ -103,19 +104,24 @@ class Case(ResourcedTestCase):
+     def passing(self):
+         pass
+ 
+-    def failing(self):
+-        self.fail("oops")
+-
+     def unexpected_success(self):
+         self.expectFailure("unexpected success", self.assertTrue, True)
+ 
+ 
++class FailingCase:
++
++    def run(self, result):
++        result.startTest(self)
++        result.addError(
++            self, None, details={'traceback': content.text_content("")})
++        result.stopTest(self)
++
+ def make_test(id, should_pass):
+     """Make a test."""
+     if should_pass:
+         case = Case("passing")
+     else:
+-        case = Case("failing")
++        case = FailingCase()
+     return clone_test_with_new_id(case, id)
+ 
+ 
diff --git a/dev-python/testrepository/files/testrepository-0.0.20-test-backport.patch b/dev-python/testrepository/files/testrepository-0.0.20-test-backport.patch
new file mode 100644
index 000000000000..7622c0abfa43
--- /dev/null
+++ b/dev-python/testrepository/files/testrepository-0.0.20-test-backport.patch
@@ -0,0 +1,71 @@
+From 8f8ab15fafdad6db850c84772323b32375b09285 Mon Sep 17 00:00:00 2001
+From: Robert Collins <robertc@robertcollins.net>
+Date: Tue, 10 Mar 2015 15:21:49 +1300
+Subject: [PATCH] Fixup tests with latest testtools.
+
+Testtools has started chunking exceptions (which is perhaps good,
+perhaps bad) - but we shouldn't depend on the exact behaviour in it
+for our tests.
+---
+ NEWS                                    |  6 ++++++
+ testrepository/tests/test_repository.py | 14 ++++++++++----
+ 2 files changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index e258b11..536308c 100644
+--- a/NEWS
++++ b/NEWS
+@@ -5,6 +5,12 @@ testrepository release notes
+ NEXT (In development)
+ +++++++++++++++++++++
+ 
++CHANGES
++-------
++
++* Isolate the testrepository test suite from the chunking (or otherwise)
++  behaviour of testtools' exception handlers. (Robert Collins)
++
+ 0.0.20
+ ++++++
+ 
+diff --git a/testrepository/tests/test_repository.py b/testrepository/tests/test_repository.py
+index e2e5e05..4a8667b 100644
+--- a/testrepository/tests/test_repository.py
++++ b/testrepository/tests/test_repository.py
+@@ -28,6 +28,7 @@
+ from testresources import TestResource
+ from testtools import (
+     clone_test_with_new_id,
++    content,
+     PlaceHolder,
+     )
+ import testtools
+@@ -103,19 +104,24 @@ class Case(ResourcedTestCase):
+     def passing(self):
+         pass
+ 
+-    def failing(self):
+-        self.fail("oops")
+-
+     def unexpected_success(self):
+         self.expectFailure("unexpected success", self.assertTrue, True)
+ 
+ 
++class FailingCase:
++
++    def run(self, result):
++        result.startTest(self)
++        result.addError(
++            self, None, details={'traceback': content.text_content("")})
++        result.stopTest(self)
++
+ def make_test(id, should_pass):
+     """Make a test."""
+     if should_pass:
+         case = Case("passing")
+     else:
+-        case = Case("failing")
++        case = FailingCase()
+     return clone_test_with_new_id(case, id)
+ 
+ 
diff --git a/dev-python/testrepository/files/testrepository-0.0.20-test-backport1.patch b/dev-python/testrepository/files/testrepository-0.0.20-test-backport1.patch
new file mode 100644
index 000000000000..193b91e1cd3d
--- /dev/null
+++ b/dev-python/testrepository/files/testrepository-0.0.20-test-backport1.patch
@@ -0,0 +1,22 @@
+From d3d6cac4fd42f2067c0dd81be748853f81c348fc Mon Sep 17 00:00:00 2001
+From: Robert Collins <robertc@robertcollins.net>
+Date: Sun, 12 Jul 2015 21:37:34 +1200
+Subject: [PATCH] Fix 3.3+ tests with nested classnames.
+
+---
+ testrepository/tests/ui/test_cli.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testrepository/tests/ui/test_cli.py b/testrepository/tests/ui/test_cli.py
+index 9ba11ad..e1f9b44 100644
+--- a/testrepository/tests/ui/test_cli.py
++++ b/testrepository/tests/ui/test_cli.py
+@@ -157,7 +157,7 @@ def method(self):
+         self.assertThat(ui._stdout.buffer.getvalue().decode('utf8'),
+             DocTestMatches("""\
+ ======================================================================
+-FAIL: testrepository.tests.ui.test_cli.Case.method
++FAIL: testrepository.tests.ui.test_cli...Case.method
+ ----------------------------------------------------------------------
+ ...Traceback (most recent call last):...
+   File "...test_cli.py", line ..., in method
diff --git a/dev-python/testrepository/metadata.xml b/dev-python/testrepository/metadata.xml
new file mode 100644
index 000000000000..257231c95ac8
--- /dev/null
+++ b/dev-python/testrepository/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+		A repository of test results.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">testrepository</remote-id>
+		<remote-id type="launchpad">testscenarios</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
new file mode 100644
index 000000000000..c7997d9bb1fa
--- /dev/null
+++ b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
@@ -0,0 +1,48 @@
+# 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 pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A repository of test results"
+HOMEPAGE="https://launchpad.net/testscenarios"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/subunit-0.0.10[${PYTHON_USEDEP}]
+	>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
+	dev-python/fixtures[${PYTHON_USEDEP}]"
+#bzr is listed but presumably req'd for a live repo test run
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/testresources[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+# Required for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test-backport.patch
+	"${FILESDIR}"/${PN}-0.0.20-test-backport1.patch
+)
+
+python_test() {
+	# some errors appear to have crept in the suite undert py3 since addition.
+	# Python2.7 now passes all.
+
+	${PYTHON} testr init || die
+	${PYTHON} testr run || die
+}
diff --git a/dev-python/testrepository/testrepository-0.0.20.ebuild b/dev-python/testrepository/testrepository-0.0.20.ebuild
new file mode 100644
index 000000000000..59b3cc0650df
--- /dev/null
+++ b/dev-python/testrepository/testrepository-0.0.20.ebuild
@@ -0,0 +1,48 @@
+# 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 pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A repository of test results"
+HOMEPAGE="https://launchpad.net/testscenarios"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+	>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
+	dev-python/fixtures[${PYTHON_USEDEP}]"
+#bzr is listed but presumably req'd for a live repo test run
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/testresources[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+# Required for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test-backport.patch
+	"${FILESDIR}"/${P}-test-backport1.patch
+)
+
+python_test() {
+	# some errors appear to have crept in the suite undert py3 since addition.
+	# Python2.7 now passes all.
+
+	${PYTHON} testr init || die
+	${PYTHON} testr run || die
+}
diff --git a/dev-python/testresources/Manifest b/dev-python/testresources/Manifest
new file mode 100644
index 000000000000..b7698fea3142
--- /dev/null
+++ b/dev-python/testresources/Manifest
@@ -0,0 +1,7 @@
+DIST testresources-0.2.7.tar.gz 32050 SHA256 ad0a117383dd463827b199eaa92829b4d6a3147fbd97459820df53bae81d7231 SHA512 29518f7326272c56a5f2f3f1f7741959dde9265ba5ce7e0c7d7afabd91bd44a519d1cad82a11a41944ff12d65e541536476f87afcac9a7cbb4869743a38547b7 WHIRLPOOL c414223960fbd6a1c612d2c79c8b8956ab858aaaa76331ddefb1315dbdd6c6bc1d3a7641c098d7d558b332ee8f4262d8921240adb63f581a3127da6a617dc200
+DIST testresources-1.0.0.tar.gz 44501 SHA256 e9b2c70ecade3135629e66945a7ac19c6df18c59b3d8f02e95d24bc8e066c7cf SHA512 7c9f9cbcc62066ab4a75d68780d88925484eeee23e2e0ef0395b63ec2a92968a6969d1bd6f483945e32ff5566e686b426f2f37daf4f803d2ef779032ea97cc6b WHIRLPOOL f4a390df289f4e452e197b58cc6df2a162a5843d64ba03fc3a6918c1f0b6124ee9c98e3e08bbb4c8780344749a7e961a4482a005e7b2e23359ecc56f6cef8192
+EBUILD testresources-0.2.7-r2.ebuild 954 SHA256 548635f947c963aa0971237f38973bff10869411c29832c4926f9529022fa62b SHA512 3de787fc7370be231f24129457eb4bbec638daa164cf5cf38b9f1515b333537735c43904ff06ebd70d04c5fc1600450d35aa910e84e235480eb618d39cbc7b98 WHIRLPOOL e00e6dce39f03e9351c703777d885f227b35dead6e2e75800150c439d907ecb2bb30acf51e5c26ec1a906e898c77df0149367db0eb8bedec5f602660b0fef95e
+EBUILD testresources-1.0.0.ebuild 960 SHA256 37ccf0fb038a710c8d206546471322ba7d796bbfd135e60e23d7962405c5cd00 SHA512 4d28c3846a1b5146c9ba2402e28b1605b407d42fbdbb7b24f9061e69560039fbc7ab1c9f96fcf5b5ad1217e2a98d66621a9d258a9ed73234dd71a316b962be4c WHIRLPOOL 31e39c033bc04344df123527c4984cc626d9a5cdd8e6273fd292e830fa0a1f0573ce3b4c4d0a6ac37fe1a1460be7351e83885043b6f476d94186376fcaec7f92
+MISC ChangeLog 4696 SHA256 8447acae742d291d2aa532375f140cdbe5b674ef9cafd0028c25044beab69369 SHA512 fb42e4909692bc9bef830a04ab25a32c210340d7f5889974a1fd23ac9722188412b3b2f7c2b5a0c1603ea68e59ac43911d3717dd500962f22116b97005b3f564 WHIRLPOOL a42621d5ced2a6bda40a970c4aedbe35c07c91eb71ee42636b083ac497252fb9a2185367e86dec911e153f06150ebed4dd3469ec07bd9933aba00ef0d02074d9
+MISC ChangeLog-2015 3454 SHA256 aeaae1ee96d4ff3bdfa33b317c7e225f87d9c20c58db23d7008026e88540f8a8 SHA512 73dcf2cb33b0406070c6df48738e50aa5d84d922be19146e606a3927eddd892e3f717d68b0102079d5b23d3257f8dbcbbb011647a9a25844ddc21e4a59c0f0c9 WHIRLPOOL 1e803307ae8988ab93a23fe87be006ca3b33e38b515566744846207932f61281ec3c6028eb595463bf0111640b2cd46c736001817384dbd8036a30de810268ec
+MISC metadata.xml 939 SHA256 d2cf13507d9c768b3406ad0d4b25d7cf290ebbdaf6b158a7b03b23730770d01a SHA512 5962ed430ea8163666e9cf360a456e48b38bcba0b85466d01a54fe4d2aacfde98484d4c0740f5ec29393d6291ab14c4da897976201667d22c76ffa56aac402c5 WHIRLPOOL 2b38b57a2ca7b135b6a18efd3413c419c4c503d5e07c7484dce66d7a0c2aeb38bf36504c0eeca17aae3a6e552401b527b325325a5a69526e0b6100afa0064c57
diff --git a/dev-python/testresources/metadata.xml b/dev-python/testresources/metadata.xml
new file mode 100644
index 000000000000..3e43e714ce9f
--- /dev/null
+++ b/dev-python/testresources/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Testresources extends unittest with a clean and simple api to provide test
+	optimisation where expensive common resources are needed for test cases
+	for example sample working trees for VCS systems, reference databases for
+	enterprise applications, or web servers ... let imagination run wild.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">testresources</remote-id>
+		<remote-id type="launchpad">testresources</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/testresources/testresources-0.2.7-r2.ebuild b/dev-python/testresources/testresources-0.2.7-r2.ebuild
new file mode 100644
index 000000000000..ee255ec08960
--- /dev/null
+++ b/dev-python/testresources/testresources-0.2.7-r2.ebuild
@@ -0,0 +1,37 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A pyunit extension for managing expensive test resources"
+HOMEPAGE="https://launchpad.net/testresources"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+	)"
+RDEPEND=""
+
+python_prepare_all() {
+	sed \
+		-e 's:testBasicSortTests:_&:g' \
+		-i lib/testresources/tests/test_optimising_test_suite.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbose || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/testresources/testresources-1.0.0.ebuild b/dev-python/testresources/testresources-1.0.0.ebuild
new file mode 100644
index 000000000000..255cfc70b5da
--- /dev/null
+++ b/dev-python/testresources/testresources-1.0.0.ebuild
@@ -0,0 +1,37 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A pyunit extension for managing expensive test resources"
+HOMEPAGE="https://launchpad.net/testresources"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+	)"
+RDEPEND=""
+
+python_prepare_all() {
+	sed \
+		-e 's:testBasicSortTests:_&:g' \
+		-i testresources/tests/test_optimising_test_suite.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbose || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/testscenarios/Manifest b/dev-python/testscenarios/Manifest
new file mode 100644
index 000000000000..89d7824cd431
--- /dev/null
+++ b/dev-python/testscenarios/Manifest
@@ -0,0 +1,7 @@
+DIST testscenarios-0.4.tar.gz 22768 SHA256 4feeee84f7fd8a6258fc00671e1521f80cb68d2fec1e2908b3ab52bcf396e198 SHA512 1b3fbc11b0a6a9cdd4afd569374cde92c291d925f76295e191b91285e88c17a9e693e10972538d146f97c889c5c1fa4545c79b0e6b9d71265abc82cf2700a3f9 WHIRLPOOL fe8769be1ccbeda81dc8f5f19f0e74a1ab616eac1389dca487427d77ddbf25f5c569445fb4e3f3732c117d61b0c22588ae2b8334cfb5b68afa227ee51bf8dc10
+DIST testscenarios-0.5.0.tar.gz 20951 SHA256 c257cb6b90ea7e6f8fef3158121d430543412c9a87df30b5dde6ec8b9b57a2b6 SHA512 f08b868babf504482369c5cb945d3e95bca1cc00f92d5013f6898c488051be0c26dc49aaabcef362aea45450a8d041d9826fb6b5c848beec013fb102d6935521 WHIRLPOOL 7b02c7a61933a8e603074321e0b4357485dad72ccffca5b28fc423da76159e6c8a4d778a431d607bff43563bc6971d66d38d7e3f89973f9c2838e569a947c0c1
+EBUILD testscenarios-0.4-r5.ebuild 673 SHA256 642900d4f0cea120978780efdff20e80f78f62c455d5c20b1378b81dd1c23398 SHA512 ecf770b858f61e5731a2eaa3684442e84c5546f385a264cae25962b43f620d88095b713704f5b958dd52ee4476dd06faf94ce3210a22f10bc31e0029cc9ccb76 WHIRLPOOL 3bb2936513ff5381e70096f7493d689e6903ef686802f0768b2af8277876d8847bc445b38921b5876cca1181ec66c37f83e081b1a298d5777b0807be567a7057
+EBUILD testscenarios-0.5.0.ebuild 860 SHA256 71c45bfdcf50d541974f86899620ee7c88957173c8561712fcdd5ac4f3997a27 SHA512 2b62006aee9536fc3d39ca0f9f0b69054e3dd895f3342ac3d91f7de2c91816bc40fd8679fca6ac5abfaa2a9761f669d81ff95aaa4ccdfad86f38f2f768b4ac97 WHIRLPOOL 1c37828f10b683d85e2621756fefe8f342e52e4319441302aa00ffee871f03618279c12dce9300992d783d1a7971c58a9e114718a5d3c7eb1e82153a93418ee5
+MISC ChangeLog 5856 SHA256 2a534a6e36cc2f5fdbc5d040113a9df3bf95660debac5f159c58cf8c1923482e SHA512 05d3970c9bb22f7ee4eadcb8bcad7f274d74b20ffcf09ce610063a1c46e911ed32e8a2eef4a2575dd3058ba03807e1f78b65aeaeec8fcf69cb37fca3e8e8a58d WHIRLPOOL 7afdca954f9b85266842e108b4ccc53f79f63257d85a76bc19969fc2ce3cb4cb1107ef5965ae4999f6066cc130cf23c573768c43ebe3578f96a3bc030a06c11d
+MISC ChangeLog-2015 4278 SHA256 129c9add9f16588f09faacabed567a8160a9412c52fa24f1aa24e80b4ba84891 SHA512 7e8846f1adb6e9fd867843c4bd062d8c95e012209861728a2e7ef27f13b36cf09f6fce13f9c40f38e292f9e17a77238787cef24017232407f50706ee31b26c22 WHIRLPOOL 42f3481366ead6e00820719dfddd8689533024828fb72a45c76ee15e09e03cb3329d0c2085cdcf5edcc5fd922998216364960f33e5647e71af98df359011895a
+MISC metadata.xml 979 SHA256 7c7da370944718c6031bbc0af6fae421fb5734cb85ae3507af7a186aeb841c0f SHA512 f043d2244673a34d80a88f07c79ac199ad6b2509c3af7a7e934c94330bf745e2dbfbf78fb7f38508cdb1968a87e30cea3e346aad63eb93f94ca762461b3d20e4 WHIRLPOOL 32988798f086372fcda7a549364b5301dba3bcf7b2397224b54020a35317ecfcf286b08dfaee4999037ef01ed0784f6aadd40aeee85bdd73f89af62e3aafd4b6
diff --git a/dev-python/testscenarios/metadata.xml b/dev-python/testscenarios/metadata.xml
new file mode 100644
index 000000000000..bfc47ff6cc1f
--- /dev/null
+++ b/dev-python/testscenarios/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Testscenarios provides clean dependency injection for
+	python unittest style tests. This can be used for interface testing
+	(testing many implementations via a single test suite) or for classic
+	dependency injection (provide tests with dependencies externally to the
+	test code itself, allowing easy testing in different situations).
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">testscenarios</remote-id>
+		<remote-id type="launchpad">testscenarios</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/testscenarios/testscenarios-0.4-r5.ebuild b/dev-python/testscenarios/testscenarios-0.4-r5.ebuild
new file mode 100644
index 000000000000..58a853b74501
--- /dev/null
+++ b/dev-python/testscenarios/testscenarios-0.4-r5.ebuild
@@ -0,0 +1,23 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Testscenarios, a pyunit extension for dependency injection"
+HOMEPAGE="https://launchpad.net/testscenarios"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/testtools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+		dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	PYTHONPATH=./lib ${EPYTHON} -m testtools.run testscenarios.test_suite
+}
diff --git a/dev-python/testscenarios/testscenarios-0.5.0.ebuild b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
new file mode 100644
index 000000000000..d3b76cd7a886
--- /dev/null
+++ b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
@@ -0,0 +1,31 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A pyunit extension for dependency injection"
+HOMEPAGE="https://launchpad.net/testscenarios"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/testtools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# Remove a faulty file from tests, missing a required attribute
+	rm ${PN}/tests/test_testcase.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" -m unittest discover
+}
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
new file mode 100644
index 000000000000..8a27712abbac
--- /dev/null
+++ b/dev-python/testtools/Manifest
@@ -0,0 +1,14 @@
+AUX testtools-1.8.0-twisted-backport.patch 3154 SHA256 d1c8a4aefaf059b30792a920fa81a0b8690a9cdd15a9eabdc9d8359ae6f75ef8 SHA512 a21e6cfdc50620f783ae9825cc7e7deee875becd7b297b8d47cf217668330fe5a0ee4eca24d56c0fea3da020828112f0a48ae78b2c74de5b60d39325197d3c74 WHIRLPOOL 27d282c9a21b9f9c41f6c72c75321026b935ac3f66ea5bce46592082de9e8a6afe76b78d769a73e399da59503d61cbbd8fb3e811080466763b90907d29379e78
+AUX testtools-1.8.0-twisted-backport1.patch 907 SHA256 376776dc6a7e245755bdd617aba1e263c4933319de8480ef13bb3c0d12e2423a SHA512 c1725914d9748234b705eb70b480288433248a009400403e207148fecd11660700d7edc679d4c432b48980838c17ab89a55c7b5b0eef594a0795d3b5174ebac3 WHIRLPOOL 3c5a87e0bfc1aed6801b183441435c3aff6b99fbd6b6a482af85ffea986653742b1444e59e57ad3e8ef0a7bc4ce1959152ad934d04a8e528240f88d1a8646475
+AUX testtools-1.8.0-twisted-backport2.patch 1620 SHA256 061e1d850667ad056814f04a22e6383462e45f0695e7db58e734ac2ebaaeec80 SHA512 d8a1613c04fbe7447ebf9d2750e0c28be3909071ccaa31f28c8acc8df957f23c2b98ada71684a30c2459fc10dc60b7d15b89ae4dead31bf240db86eca36fcd18 WHIRLPOOL 6743e1cc839b501c82535efe77d391016b7985e6c07aec00feef6f41c99d6efed2f93bec96c4c363769dc75e65b88be283d14ce25b677bba76b060f397eef830
+DIST testtools-0.9.36.tar.gz 201717 SHA256 20a1b0d6325f1303ff8112a272047057b73217aac85424aa4065b87641a04499 SHA512 1cb29deb2fb7cd0eebd9affb06e877487989163d0c4452db8051d75b936b0c4ac6443649d52f83cd3695421b361af7dc75507b037528ac0f7cfde9b4b201ad08 WHIRLPOOL 5561c4ef316c31f5c0099beb93eba307328669e43bef36e8da6b1856bf3f75c6b4d81fc0cb777e8397cb246512203c7951c93a52b2a5877e4764cf2e0a749e22
+DIST testtools-1.8.0.tar.gz 207976 SHA256 8afd6400fb4e75adb0b29bd09695ecb2024cd7befab4677a58c147701afadd97 SHA512 b5f0201222d1e8c60fb7c2793bcd38e1c96c6f9fae99e9f3e784d17230c9abbf7325053d501c07e752bad2da36b49e2c79a25d0c20cb9a2f426057f839a77b3a WHIRLPOOL 71d4082197a9c179862fc3c63eadc37d6ff776f0a62e5fb08c296a5bf7109dc5110a2104a1ed15ca97c523aa0afb9e7124805ec6a6ae18f7605d7641abd9c54a
+DIST testtools-2.2.0.tar.gz 230716 SHA256 80f606607a6e4ce4d0e24e5b786562aa42c581906f3c070607a4265f3da65810 SHA512 f5ba08971975aa1ccf923c4c997ca7b093d00615131f440a9a5aad96d63be5b9e72f3364f3185d523fce9b5a7055bd52f767b54f7f9f17a102c4166efec189c5 WHIRLPOOL 042ef9e8177b44b37582b1b8013809b0fd443ac7c57e39317f73e081877c665fd368828e72568b89c0656ebc9d89e82c2ee7ffcd2bf0f31e07573df8573d3313
+DIST testtools-2.3.0.tar.gz 231559 SHA256 5827ec6cf8233e0f29f51025addd713ca010061204fdea77484a2934690a0559 SHA512 558fe6a1bdce7215f9f6f178f469a2b76948dc7ff0ce27400482a16683474edb81d9bf90ae48b6fcb8df9eb70759341b694aa162ed3d9d4abd372981cdcd8a64 WHIRLPOOL c4fc46381dbe3d98a1b03463bb3b52b396d6005338226deb451262484a914e673bde2fbdf64359defab2c8e5c453693f9ac4fd0233fdd4f111718c9cc0e844ec
+EBUILD testtools-0.9.36.ebuild 1396 SHA256 a1574e284de9bf541836338d5ff0ef7a4158b6e76aef03804172b8a7ffc0829a SHA512 665a208a495eee6a0e9e48e426da16fe33d2925fc4650f548b13487794d818083d7281493c263555143e26e89d924e059ae2cf1f20ef10f66d5c868f381ebcb2 WHIRLPOOL 824aec21ab3ee40307d61575abd6b7d3dac69cf3ecef0d5033fda5e874114f70f2de68c6dbf60e19d3722886950ecd194a0e607abd77f3df773fb1c228627f18
+EBUILD testtools-1.8.0.ebuild 1347 SHA256 f71e505e597eee294b07fed1e0168c370c417e61525ef151c55da96c2f2c38ac SHA512 5055702fde3ba89117d7d5fe872cf77c0e2bbdd48a17c397df7048ba4228be219f950b5583ceb21be38aaa9fab3cb09925dc55e3e82637ce6db560d1bd4388f6 WHIRLPOOL ab05d853765f98c233553273a708033d5e3b753353ae89c5b861423693bfe1b828cdff24848781187c2f1c9eafd8fbd854328060f8135567225f8607d38c4b61
+EBUILD testtools-2.2.0.ebuild 1479 SHA256 b3da83869e8230f813b1eaa59d189a021bc0311effcb81e1772627f6a885a7ea SHA512 8cdc74cb31a0e5c4c1a4e8033121cadfb1def05da2e2486cf754a48663d3295b4aa40fc24a16564c3865bd2301083e57698e4bb1d30e8f9c820bce3a4af6c429 WHIRLPOOL 2d55e46dec3acfa0a1d881e1ccd92db921d117231bbb30771f58696ab1c54c424671d9834bfb48f099eadf87461c8fa22c58f1f898aa1ddace57ba89acc1e66b
+EBUILD testtools-2.3.0.ebuild 1479 SHA256 adf0470b97a13ffe436b2e6fdf85fa05670abf757b9cee4d44acc6e1bef0f018 SHA512 4b0d73ce3a4541574e48f4d7fa2325245c295aa1d499c4e911ae0f5b6529e38e4cb2149a494dca97c41311dcbe89543ccba99a4df1a08f28ca709cc120024b1d WHIRLPOOL 0713b3e866a7d3eb20158781319e24a4bc41bdab21771f4f40527654408bfb656dc4c1f18738b1bda56527a9c1641c9e7d0e7beb0d98ff9d7d0bfe44ae6c4f66
+MISC ChangeLog 9820 SHA256 a5b6495fe73310f24e3b645f30f1c73e1ac4fbc201c0bef9f4baa4d7086d35ae SHA512 4f5b3dd974fbf5ed22c6b52033ab8b49b69cada8f4523a936f43a5c2c2396407327d4fd8e20ef52a0af9a7f8de0d965e647bbc16dbf88ff959827bbf22e51cb5 WHIRLPOOL d4a1ab9c4bfe069309b4e32e76554e60e546979dc074997d5761e2ecdfcae595131ce8cdd5b6f1b91084ccd3ca07e71529be64fb82f48ecb71d3b329d5263f7d
+MISC ChangeLog-2015 16217 SHA256 15bad870b9a7a30ec260d755f70d6f810035d7f638ddacd6761d60f1e4bbf161 SHA512 bfc63382ec41509c4e48b4817426fc13899f96fb5794bc410b61aac080536ececc726bc95ca6222a9a024b72e4c7134d07c21d164364e63daa2c579bcc14a92d WHIRLPOOL ffaccccc7037b0d81a86bf832db96e10d6dc8a39f245e1f7b1371893468d9a8851c2789f007a1bd80abdce704128734fcc9f4c239470529c93efd1841052b2a3
+MISC metadata.xml 554 SHA256 05ab1420f1e9d87192045c3d467adfc0c911022922f980e90bc15589cc908c47 SHA512 ebe5defc73dc62044732463b2d295c08ca24573c34b689150f3865247b34ef6d925437a0c97598c3260ec037c4ed3644017601fd2b7127521c7c352edc1e6384 WHIRLPOOL 98f789c9f4bccd8dcfca7875e95290c736e1c359f53dcf6145580322a11a79c39eeae3f82bec80daea1324c3412ffba13c0b4fc907b583ad192533a587af2ddb
diff --git a/dev-python/testtools/files/testtools-1.8.0-twisted-backport.patch b/dev-python/testtools/files/testtools-1.8.0-twisted-backport.patch
new file mode 100644
index 000000000000..fd65b4cd6f53
--- /dev/null
+++ b/dev-python/testtools/files/testtools-1.8.0-twisted-backport.patch
@@ -0,0 +1,74 @@
+From 25f4800d62f339f81b09c894275a3af4b284fb62 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@canonical.com>
+Date: Wed, 19 Aug 2015 03:06:09 +0100
+Subject: [PATCH] Port twisted.deferredruntest to Twisted >= 15.1.0
+
+Twisted 15.1.0 removes the compatibility import of _LogObserver in
+twisted.trial.unittest.  This is unfortunate for us, but it's what we
+get for using an internal interface.  It at least still exists in
+twisted.trial._synctest, so we can get it from there.
+
+Twisted 15.2.0 adds the new twisted.logger framework, which requires a
+slight adjustment to run_with_log_observers.  There's no longer a
+supported interface to get hold of all log observers, but since we're
+already using an internal interface (see above), what's one more?
+
+This passes "make check" with the current release, Twisted 15.3.0.
+---
+ testtools/deferredruntest.py | 27 +++++++++++++++++++++++----
+ 1 file changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/testtools/deferredruntest.py b/testtools/deferredruntest.py
+index c33e14a..04cdb0f 100644
+--- a/testtools/deferredruntest.py
++++ b/testtools/deferredruntest.py
+@@ -27,8 +27,15 @@
+     )
+ 
+ from twisted.internet import defer
++try:
++    from twisted.logger import globalLogPublisher
++except ImportError:
++    globalLogPublisher = None
+ from twisted.python import log
+-from twisted.trial.unittest import _LogObserver
++try:
++    from twisted.trial.unittest import _LogObserver
++except ImportError:
++    from twisted.trial._synctest import _LogObserver
+ 
+ 
+ class _DeferredRunTest(RunTest):
+@@ -53,9 +60,21 @@ def _run_user(self, function, *args):
+ 
+ def run_with_log_observers(observers, function, *args, **kwargs):
+     """Run 'function' with the given Twisted log observers."""
+-    real_observers = list(log.theLogPublisher.observers)
++    if globalLogPublisher is not None:
++        # Twisted >= 15.2.0, with the new twisted.logger framework.
++        # log.theLogPublisher.observers will only contain legacy observers;
++        # we need to look at globalLogPublisher._observers, which contains
++        # both legacy and modern observers, and add and remove them via
++        # globalLogPublisher.  However, we must still add and remove the
++        # observers we want to run with via log.theLogPublisher, because
++        # _LogObserver may consider old keys and require them to be mapped.
++        publisher = globalLogPublisher
++        real_observers = list(publisher._observers)
++    else:
++        publisher = log.theLogPublisher
++        real_observers = list(publisher.observers)
+     for observer in real_observers:
+-        log.theLogPublisher.removeObserver(observer)
++        publisher.removeObserver(observer)
+     for observer in observers:
+         log.theLogPublisher.addObserver(observer)
+     try:
+@@ -64,7 +83,7 @@ def run_with_log_observers(observers, function, *args, **kwargs):
+         for observer in observers:
+             log.theLogPublisher.removeObserver(observer)
+         for observer in real_observers:
+-            log.theLogPublisher.addObserver(observer)
++            publisher.addObserver(observer)
+ 
+ 
+ # Observer of the Twisted log that we install during tests.
diff --git a/dev-python/testtools/files/testtools-1.8.0-twisted-backport1.patch b/dev-python/testtools/files/testtools-1.8.0-twisted-backport1.patch
new file mode 100644
index 000000000000..c1eb11b1f5ab
--- /dev/null
+++ b/dev-python/testtools/files/testtools-1.8.0-twisted-backport1.patch
@@ -0,0 +1,33 @@
+From 6d821b5770b01f5ec98c3b8db734fffeebf12b62 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@canonical.com>
+Date: Mon, 24 Aug 2015 13:21:57 +0100
+Subject: [PATCH] Test with Twisted 13.0.0/15.2.0.
+
+---
+ .travis.yml | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index 41036f8..a706b27 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -7,6 +7,10 @@ python:
+   - "3.4"
+   - "pypy"
+ 
++env:
++  - TWISTED="==13.0.0"
++  - TWISTED="==15.2.0"
++
+ # We have to pin Jinja2 < 2.7  for Python 3.2 because 2.7 drops/breaks support:
+ # http://jinja.pocoo.org/docs/changelog/#version-2-7
+ # And Spinx to < 1.3 for pypy3 and python 3.2 similarly.
+@@ -23,7 +27,7 @@ matrix:
+       env: SPHINX="<1.3"
+ 
+ install:
+-  - pip install fixtures $JINJA_REQ sphinx$SPHINX
++  - pip install fixtures $JINJA_REQ sphinx$SPHINX Twisted$TWISTED
+   - python setup.py install
+ 
+ script:
diff --git a/dev-python/testtools/files/testtools-1.8.0-twisted-backport2.patch b/dev-python/testtools/files/testtools-1.8.0-twisted-backport2.patch
new file mode 100644
index 000000000000..df5d91f9b681
--- /dev/null
+++ b/dev-python/testtools/files/testtools-1.8.0-twisted-backport2.patch
@@ -0,0 +1,57 @@
+From 2e03ffaff15bc5d83c5f6d092aab4072f166aca0 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@canonical.com>
+Date: Mon, 24 Aug 2015 13:45:01 +0100
+Subject: [PATCH] Only run Twisted tests on Python 2.
+
+---
+ .travis.yml | 22 ++++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index a706b27..bc007f2 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -7,27 +7,37 @@ python:
+   - "3.4"
+   - "pypy"
+ 
+-env:
+-  - TWISTED="==13.0.0"
+-  - TWISTED="==15.2.0"
+-
+ # We have to pin Jinja2 < 2.7  for Python 3.2 because 2.7 drops/breaks support:
+ # http://jinja.pocoo.org/docs/changelog/#version-2-7
+-# And Spinx to < 1.3 for pypy3 and python 3.2 similarly.
++# And Sphinx to < 1.3 for pypy3 and python 3.2 similarly.
+ #
+ # See also:
+ # http://stackoverflow.com/questions/18252804/syntax-error-in-jinja-2-library
++#
++# Twisted tests currently only work on Python 2.
+ matrix:
+   include:
++    - python: "2.6"
++      env:
++        - TWISTED_REQ="Twisted==13.0.0"
++        - TWISTED_REQ="Twisted==15.2.0"
++    - python: "2.7"
++      env:
++        - TWISTED_REQ="Twisted==13.0.0"
++        - TWISTED_REQ="Twisted==15.2.0"
+     - python: "3.2"
+       env:
+         - JINJA_REQ="jinja2<2.7, Pygments<2.0"
+         - SPHINX="<1.3"
++    - python: "pypy"
++      env:
++        - TWISTED_REQ="Twisted==13.0.0"
++        - TWISTED_REQ="Twisted==15.2.0"
+     - python: "pypy3"
+       env: SPHINX="<1.3"
+ 
+ install:
+-  - pip install fixtures $JINJA_REQ sphinx$SPHINX Twisted$TWISTED
++  - pip install fixtures $JINJA_REQ sphinx$SPHINX $TWISTED_REQ
+   - python setup.py install
+ 
+ script:
diff --git a/dev-python/testtools/metadata.xml b/dev-python/testtools/metadata.xml
new file mode 100644
index 000000000000..d2fbb03bb6cd
--- /dev/null
+++ b/dev-python/testtools/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">testtools</remote-id>
+    <remote-id type="github">testing-cabal/testtools</remote-id>
+    <remote-id type="launchpad">testtools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/testtools/testtools-0.9.36.ebuild b/dev-python/testtools/testtools-0.9.36.ebuild
new file mode 100644
index 000000000000..b3963b9dd457
--- /dev/null
+++ b/dev-python/testtools/testtools-0.9.36.ebuild
@@ -0,0 +1,50 @@
+# 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 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 versionator
+
+#SERIES="$(get_version_component_range 1-2)"
+SERIES="trunk"
+
+DESCRIPTION="Extensions to the Python unittest library"
+HOMEPAGE="https://launchpad.net/testtools https://pypi.python.org/pypi/testtools"
+SRC_URI="https://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="dev-python/mimeparse[${PYTHON_USEDEP}]
+		dev-python/extras[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_prepare_all() {
+	# Take out failing tests
+	# https://bugs.launchpad.net/testtools/+bug/1380918
+	sed -e 's:test_test_module:_&:' -e 's:test_test_suite:_&:' \
+		-i testtools/tests/test_distutilscmd.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/testtools/testtools-1.8.0.ebuild b/dev-python/testtools/testtools-1.8.0.ebuild
new file mode 100644
index 000000000000..33c0a7d8f7e6
--- /dev/null
+++ b/dev-python/testtools/testtools-1.8.0.ebuild
@@ -0,0 +1,52 @@
+# 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 pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensions to the Python standard library unit testing framework"
+HOMEPAGE="https://github.com/testing-cabal/testtools"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND="
+	dev-python/extras[${PYTHON_USEDEP}]
+	dev-python/mimeparse[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+	>=dev-python/unittest2-1.0.0[${PYTHON_USEDEP}]
+	dev-python/traceback2[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+RDEPEND="${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-twisted-backport.patch
+	"${FILESDIR}"/${P}-twisted-backport1.patch
+	"${FILESDIR}"/${P}-twisted-backport2.patch
+)
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	"${PYTHON}" -m testtools.run testtools.tests.test_suite || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/testtools/testtools-2.2.0.ebuild b/dev-python/testtools/testtools-2.2.0.ebuild
new file mode 100644
index 000000000000..5ede99ec3bb7
--- /dev/null
+++ b/dev-python/testtools/testtools-2.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensions to the Python standard library unit testing framework"
+HOMEPAGE="https://github.com/testing-cabal/testtools"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
+	dev-python/mimeparse[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+	dev-python/pyrsistent[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	dev-python/traceback2[${PYTHON_USEDEP}]
+	>=dev-python/unittest2-1.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		>=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+PDEPEND=">=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	"${PYTHON}" -m testtools.run testtools.tests.test_suite || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/testtools/testtools-2.3.0.ebuild b/dev-python/testtools/testtools-2.3.0.ebuild
new file mode 100644
index 000000000000..bd556b22d4a8
--- /dev/null
+++ b/dev-python/testtools/testtools-2.3.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensions to the Python standard library unit testing framework"
+HOMEPAGE="https://github.com/testing-cabal/testtools"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
+	dev-python/mimeparse[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+	dev-python/pyrsistent[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	dev-python/traceback2[${PYTHON_USEDEP}]
+	>=dev-python/unittest2-1.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		>=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+PDEPEND=">=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	"${PYTHON}" -m testtools.run testtools.tests.test_suite || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
new file mode 100644
index 000000000000..2d299b553820
--- /dev/null
+++ b/dev-python/texttable/Manifest
@@ -0,0 +1,9 @@
+DIST texttable-0.8.3.tar.gz 8569 SHA256 f333ac915e7c5daddc7d4877b096beafe74ea88b4b746f82a4b110f84e348701 SHA512 d9a50f6fd9cd2a6d55afd5e686ac8ff2b2ebcf8c8041209ffae3e3864529c54a384840a65df2b87a942528005ca864d00bb01dfaeb33308843c01db7471931c8 WHIRLPOOL 5086e7f26781b2cc9806420f7f9bf02a3e1a0c4d24dd2bfeb8ad8e497ecdbb5e4c8cf8a7de09ebe8cc7930eba54b0b560a9281471d8013a8a3fb472da928d066
+DIST texttable-0.8.8.tar.gz 10599 SHA256 0be1ecd6468847fc2f3b57b6c1862d8c0ae6832c037c97db502053311eff9a99 SHA512 4db089bee787103c00a54dfffcad15a8c299abeb48623c3b179f2a872bcae159a4e7068b2e4ca0efec95e6782b806a5898ad6e57f4290be697d0c8b913446b32 WHIRLPOOL b00be3e16c818a9b5cc030af0fc830ee6f4ef023350498de6f4f9ee1be48e23391997e2d32640e697a788a752c254a458a2608b8b0fc801c7b43803f792b3a41
+DIST texttable-0.9.1.tar.gz 11074 SHA256 119041773ff03596b56392532f9315cb3a3116e404fd6f36e76a7dc088d95c79 SHA512 7ec37336ef4b253879d0232dcdb4500cad33ecce1067dd7ea26c221dc2c003ee56360bdbd1dd1e00133301c51c67fb2fe9b1703628804a65f2a6ab8a1e830e50 WHIRLPOOL 2ff806ce255f8436e11a6614c3265277199d2aa2d1ee4f6bc5518fa5b494f902da87943b0d53c42cafd55afee1e4f3d73a58c5b9ca3a20905223571fd48a4bd1
+EBUILD texttable-0.8.3.ebuild 395 SHA256 101dbe91352b4558171f4f1c832bef39653da0d94590ae73b62991076ddc1f04 SHA512 edf762345583fb76357793f1bbaece0203ea3ccf0e58b00fc302e805905c863f5af1f9ff79747eac03895766b4bc60b5f9e78c82b0c641b47fd34ef11c9c2adf WHIRLPOOL 7ce3bcc5b8d4657331777f470d4fca707e91cf8561d42fab666f92d3ec5fac727c662522b7479aa95d5f778b7a7236b3512e160dd0375353e313b9f6cdab15e4
+EBUILD texttable-0.8.8.ebuild 422 SHA256 e64b4f2896a41413e2a178b02cc2e513d34c7e8f30be62fa8a7e37d75441fdfe SHA512 3dc2ed4f685153b8c640cc30ea27cf8aab1564a49ca00ff67d0567ea2562ac386e240a28eb6e0ed33887d49a3abd7a678c17168a2c860c3bd57bca18a2a50964 WHIRLPOOL 20bac875802a3166ebc65a6dbecb6f5688304a24f749519409c64d2068a90276fb335cd9788c9df1d163c0e9c1553542f90e13354ad7036665c07abc9d604b51
+EBUILD texttable-0.9.1.ebuild 434 SHA256 9fce2318e86132f100dccd3c00be4605dfd9fedd63d5baf35792aaa0801df58e SHA512 fb419527cfcf4aae500d38396ccbd77e921f2950f88c64f8ce9da245b1d7549588bad3e9b0701341dce397ccdb8659b926e15def77a17607dbe39303ea803a03 WHIRLPOOL b0280f17afc2c5f57210084dc8fb48100ed237e4c000b3cc113cbc7ccbf09c4c839afcf819e97cae22ca03ccd4f48ea414226a0c05a186bf644023e36b70e0a6
+MISC ChangeLog 2842 SHA256 7b2c8d730c65683e0291103e49b97699927b11605dff5188c7822b7117b017ed SHA512 e922b74e31c6e9c7817043abbd33e7c8d2e88edc631646b4d97e4ccdd041002257a322faa1b9116c0003789e936b80191585259c466716e4680280f682a84bb3 WHIRLPOOL 1e852076a97a909eea2a3094e1faf928cd1792fc71d0c9a128938f6eb9cac454319a77fea2db1f284534ed465b68d25f1c0d8870ce3f657f93b3a86410a84291
+MISC ChangeLog-2015 620 SHA256 513d2283e66cf8d2d8327274886b70d3fd8bd8c48de3a70bdf1d046a7d9fbf5f SHA512 c8c8a37de11f0f1ee570f121095edd22b0ff8ca0e1789bdec1b651eb2d3ee15450489f16ae96392b821f81b43452e5f583e287e4b0357e80df2c5866bb36dab0 WHIRLPOOL b26afbbac9a2c80a5020b46c05cacee05f0b82c0ed0447bfe9f3e02819ea7e9373208ca833ee3aea085a305780d85c05de5ccfd3698a24b40211cdc6e356232b
+MISC metadata.xml 318 SHA256 dcf7f1cb1138ea820c75b372ecc129c511a1759004f4abfaf5726c50448381d2 SHA512 9d5c3d7fdc3f361d29f8bf62ca8989f9f0eefe9359c651a93f9ef057330016132f915fba9a15522b0c74a703ecf139dc03080547bab1e21e57d50278e761cce5 WHIRLPOOL 65bbb98a96b71ebc0babe74e2374c6501427be2e73ef44aef7c6e8256bef1d086d9106a467de1c20a9dc04e98edb2ad3cb8206dad6b48281b23482be6b894500
diff --git a/dev-python/texttable/metadata.xml b/dev-python/texttable/metadata.xml
new file mode 100644
index 000000000000..100ab7fcf6ba
--- /dev/null
+++ b/dev-python/texttable/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">texttable</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/texttable/texttable-0.8.3.ebuild b/dev-python/texttable/texttable-0.8.3.ebuild
new file mode 100644
index 000000000000..34b4c5d3d162
--- /dev/null
+++ b/dev-python/texttable/texttable-0.8.3.ebuild
@@ -0,0 +1,19 @@
+# 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
+
+DESCRIPTION="module for creating simple ASCII tables"
+HOMEPAGE="http://foutaise.org/code/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/texttable/texttable-0.8.8.ebuild b/dev-python/texttable/texttable-0.8.8.ebuild
new file mode 100644
index 000000000000..a94ebd20c8e3
--- /dev/null
+++ b/dev-python/texttable/texttable-0.8.8.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="module for creating simple ASCII tables"
+HOMEPAGE="http://foutaise.org/code/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+python_test() {
+	py.test tests.py || die
+}
diff --git a/dev-python/texttable/texttable-0.9.1.ebuild b/dev-python/texttable/texttable-0.9.1.ebuild
new file mode 100644
index 000000000000..2f3f4974feb6
--- /dev/null
+++ b/dev-python/texttable/texttable-0.9.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="module for creating simple ASCII tables"
+HOMEPAGE="https://github.com/foutaise/texttable"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+python_test() {
+	py.test tests.py || die
+}
diff --git a/dev-python/textx/Manifest b/dev-python/textx/Manifest
new file mode 100644
index 000000000000..b8bb349f71d5
--- /dev/null
+++ b/dev-python/textx/Manifest
@@ -0,0 +1,4 @@
+DIST textX-1.4.tar.gz 21967 SHA256 6112b73b2c4713630824f7c57f14b3919a2c1e32a8246c37b009378b6079665c SHA512 7783f4dd1358d8e0df126f1be893c58e32f57015fd577bd20d00a17b63111d6e48222c9b78420a307fcd0833f6d9ac3a1398d55986681251f7c378cdcd68c8a4 WHIRLPOOL 8ef80f60e3a56322502912660e5296ad151b22692224c8cf04c83e2dc4e8700e78f0dae1d3f9db063f1e24e208a17d8c474a15ac57570221f9d9dedea29b9538
+EBUILD textx-1.4.ebuild 789 SHA256 9a58d7c30b4e718948a19c33c79f2ed429e523d334db0372fb26a5838f06ab45 SHA512 8909d89ac9a920f4eaa472b9b0eda9ad81796e4551e0d89959433da85ffc16be565958c0d4399a5adab4f64865d76994fd72ef890c20a2126f92ea8dbb981803 WHIRLPOOL 34dc0a3c257efab0b5f4161e90486c0972b9ef5c14da528bb896070dc960fe2cf093234d044aa4523a18aa7153d2595f85221183bdd94b56dc143925318a7788
+MISC ChangeLog 294 SHA256 e70c2d7773f5ac02de4e5c67d4ca97a1177f5f27a8b4e16f4a2854f727fc508d SHA512 f63319aebfa80f29998efdb158943d4ff700b8def6bed4351df435a213906dd86d0ab03f3c819530550838a6d0173d60590e4bd8d97a082d63099d37f7e04544 WHIRLPOOL 3fab9962e06590327fa01c40859dc8bb1a19b3c8064c752d1320a7911c93e78bca0c5306da8b8d5a7d79cb468b69c0df690972a0d38d40e9f3acb550db9406c2
+MISC metadata.xml 345 SHA256 d0878b08d7cb119bf6dc83039cf9ade2494b17c0569150a4d2d3cd94458ae744 SHA512 6fd6e78938db784bfed2b97150513735680f015cd1c9f4701dba4ee0ad67bed79d5aaa6adbbfb21932e48aa27927abd69f532895e04a2b57d890327881dd191b WHIRLPOOL 3cd77cb6f65097b2e01c980bd1845591ee723d51d600703100bddcb9cf95dc19c9f5bbcb6c9008e92941f6fba169c69c736bfdfb1fcfdb217a4f1831769e3d97
diff --git a/dev-python/textx/metadata.xml b/dev-python/textx/metadata.xml
new file mode 100644
index 000000000000..0de01bffde59
--- /dev/null
+++ b/dev-python/textx/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">textX</remote-id>
+		<remote-id type="github">igordejanovic/textX</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/textx/textx-1.4.ebuild b/dev-python/textx/textx-1.4.ebuild
new file mode 100644
index 000000000000..bdb75ef49484
--- /dev/null
+++ b/dev-python/textx/textx-1.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN=textX
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Meta-language for DSL implementation inspired by Xtext"
+HOMEPAGE="https://pypi.python.org/pypi/${MY_PN} https://github.com/igordejanovic/${MY_PN}"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+# pypi tarball omits tests
+RESTRICT="test"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/arpeggio[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	py.test -v tests/functional || die "tests failed"
+}
diff --git a/dev-python/tgmochikit/Manifest b/dev-python/tgmochikit/Manifest
new file mode 100644
index 000000000000..853d0d9b540a
--- /dev/null
+++ b/dev-python/tgmochikit/Manifest
@@ -0,0 +1,5 @@
+DIST tgMochiKit-1.4.2.tar.gz 686356 SHA256 cc7308115c8cd587bb0ce6a300f7a9b2789eb2b3758610a835e1432bb9bbe89e SHA512 2c384dec39c2da46ab0420d2d672af2eba97c638a3cfe3077ec66a7858ec655c457b99f6b33956e4c70baf3c8dbdd160d1c4c11f05088ff2f6eacbfa244b18fa WHIRLPOOL 4c981c7a0fc0fd0cb1815e9a2e2b1adb10d1d7e7b9200127f507d34d51df121919854cae548b6dda7a9146649aaaf5c3ff2d904d5dd9779c0bcad478c3a7dc13
+EBUILD tgmochikit-1.4.2-r1.ebuild 630 SHA256 fc577ac64bcddaa56366e6b78330bc1cc197d4787b96cbb3f8daba91d01e684b SHA512 da395fa93dc7c74774c4e8463a8e2432e7f9108d4c2c12bc4bb854438c996ca33475de752505953fa277e39cdb8acd55b14d6994a4531eec5f8f946ee5248572 WHIRLPOOL 88e79d8ccce9f579c90f1631b4ee8345eca510c2d999f23ca0832b3799b1428152eddce8f2293ef36012ecb737124c32d8b3b6db26728d933faa5cc5b6ba709e
+MISC ChangeLog 2593 SHA256 b69da4d66a17f8a506c46e29f640415a0fd5a82f796e27ecdc4b2c13dade8109 SHA512 468c80e8bb7752a37b47287c1183cf14d25bdd8b1c287f256b1add77252e1e0ce90e61d387e17970af358cef04f890a626f14a960ed511c62e625c8528cb33c1 WHIRLPOOL 6f4c4f7615b355723888ea704daedc2e1f928fc33dfed269a158031540b5de1f74835d81c09cbbc2cb86a0194318bf6d2f83ba58c4a33e45582d9815ca84e26b
+MISC ChangeLog-2015 716 SHA256 e767a3f2561ee743b7df8da3cef2f39ce3c1720009028f993dcc903892730661 SHA512 aff45237735596db1b69ff20232784fd011f4f05ade902278815ac956efcf578305921052ded5b889a6118a5a79b5f1fd447a0c09546c5c08e01d5e9c7dfc28f WHIRLPOOL fc529badb15e3969ab119f48c0bdda515f70c2ac2ba5ab379847caba9928ab37f5008069e47b287801b04450c5212e507498763b98a3ff0ae002761c6c1e7a3f
+MISC metadata.xml 313 SHA256 3e67c6eadda65c4610457b5ff1ca3a1a38c7adaf41f1cea81a96b5a139c7661b SHA512 9580fd9293547c9fab594adcfc6932432b3ef41ceefdb71289d81594c9cbf119e2e87314089c75f0a5e0b0b43b51e1061ca8c332ef829b68ab5ecfc3ba9b6b1e WHIRLPOOL 783d4777695bab034da49cd91ca34c02cad80056068547f6ebb11e4ec963f76467f56ef83888b431a915f2b9cd2e972a448bc0d13f717fab9e36f8250153a99d
diff --git a/dev-python/tgmochikit/metadata.xml b/dev-python/tgmochikit/metadata.xml
new file mode 100644
index 000000000000..d25e6bf996ac
--- /dev/null
+++ b/dev-python/tgmochikit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">tgMochiKit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/tgmochikit/tgmochikit-1.4.2-r1.ebuild b/dev-python/tgmochikit/tgmochikit-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..cad2a9158e85
--- /dev/null
+++ b/dev-python/tgmochikit/tgmochikit-1.4.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="tgMochiKit"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="MochiKit packaged as TurboGears widgets"
+HOMEPAGE="https://pypi.python.org/pypi/tgMochiKit"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( AFL-2.1 MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests || die "tests failed"
+}
diff --git a/dev-python/theano/Manifest b/dev-python/theano/Manifest
new file mode 100644
index 000000000000..0cf8a3d00c0a
--- /dev/null
+++ b/dev-python/theano/Manifest
@@ -0,0 +1,11 @@
+DIST Theano-0.6.0.tar.gz 1763756 SHA256 aaa75f9a9b7bf50f09ddcc01fb993cf47513179d0a7bee3d96bfeebd66e76083 SHA512 6333c673df809bed3af952e0759cce4878ed21684367c6eb20e422363c7c5696ea59239ff6a448c6a32771b1069d441b0e3d049f9708ae69d790412303b8ebbd WHIRLPOOL 946fcacb87b7745e72282f5f7e6b67db5fd0e365f55b2c97a8e9e506e30986d90da7c3789636892ca316da33f4f064f99d31fc3771678457dd609fd0c43d9010
+DIST Theano-0.7.0.tar.gz 1985387 SHA256 05b0f6d2467735abea13bdc5c2c1ce3c53f1b89f9ebc5a43abdf71f88cf818b3 SHA512 6e6bf9afdebf3c281d71f5ceda73792e0a52b403b18776a639665767ac73ac4920b5042e29d656d517b8f023e5f9cd5a27086e0456dc40c42abf6f3569da3f06 WHIRLPOOL b79906e39eb8f7cad26160148465b4719d1011e1a4626c98fdb55cd273ff289b0c01278d51fdc8271b71434be0fd036f8259a315b07639e9ad83d1e3bf313687
+DIST Theano-0.8.2.tar.gz 2914631 SHA256 7463c8f7ed1a787bf881f36d38a38607150186697e7ce7e78bfb94b7c6af8930 SHA512 d7bad7ed4c9453470b66df2ada4587fbe9effc134c0604d11576630a613568386d41aa7dd4a77f8b7a1eb6d8a2f76a8e809b1ac3ae18c85a0c55ba4a059b865e WHIRLPOOL 05ae7308054e74fcbcb9057aca5a0e8ed7db7980e4a258bf5143f2a1ae9cfb430808a48467d6a185cdb4215ce33163a1e6e1961284e593c90cc9be6f0c9a5cbb
+DIST Theano-0.9.0.tar.gz 3116713 SHA256 745d66716531f9063127274b40503fbc21f931f78b7b03e79e5523d50078bc17 SHA512 e0e59256d2442f929fb120b4b21cab735e0a8ba087c4ea7d7caeabe8fa30cc19a46181fe1b4e268e778344fb3506eb20d8090dfc8d2a499c1bf84b07352686ab WHIRLPOOL 3c387356580cf8ea9340f214783b9003417c2e5ca2d35660ceda0d91a4b1eb29d3794000c59b09b1fd7b20cf273f372d111fcb31496991801d6253319e2694c7
+EBUILD theano-0.6.0.ebuild 731 SHA256 c518069503806b9df3538fcd7f255e7131f5e952f3b794d8b25ae0f9a9a088c7 SHA512 54e3bc7f4dae23ebdd850fb26bf43c8f69a452c3b06bc1a4da1b6f133a95856bb2208f410ed2d3497c943c19165595620c9493b7c11ca928502bed737de0ddb2 WHIRLPOOL 7bdc2351ac5ebe57332fded3902e72d43ae36a1828419f4f0b2fc51c37b2388bbb0af7a6348708888f1e2e567ec9a2d49ab22eb309be82cdc0a48f401e51eedd
+EBUILD theano-0.7.0.ebuild 1005 SHA256 24bf18cc8743884c13411b75e8538b39e833401f0f20bcf1b0968e6caea91cde SHA512 5d15c8eb54bc2a6db09e5f2279b54526bcce8c07041808d6a021d41200fce309b3aa430c95702d1e5d6e549102070489c36498bde0ae717d93c301ef868107d0 WHIRLPOOL 7f11533215ca02549923d54b2523376d72d815059254df82c9f2b8955e001f02041f1a491680859119da86946fda89dcd09643ac7e65038f1b284bbb737796e5
+EBUILD theano-0.8.2.ebuild 1325 SHA256 3bfe269d492a6c57c005408c1ce0a526d4eae0c86133fee63458c0539827b60c SHA512 763f07ed681dea61836b5d3c0a35642fe6bbd8334091d6bac5d9016ed0c2287e60e8235ec2f390dd1856879756b0d7c73b0cdb0c82a01f983415779b539b9836 WHIRLPOOL 413ca6839d4f04b67d398ebcf7264c5fe9cde7c0549cffea0c6a58d70148bb27a9a91ef5222c9a1f3249728ea046a49ae9f699a0807fa9c7b82f3b58f9026d6d
+EBUILD theano-0.9.0.ebuild 1327 SHA256 904bbc1ca4ba4b25f0a815a24e993819150960a2c2f5e1a6a7f384e293c38ffd SHA512 12c0160ab51031fb7a3102eb5a25a1838692393b8ac9abf0f546a50aa28627653e348753c2bae3bc7e41593609d46eae5c6813e00830a28b53b16dc6eb21884e WHIRLPOOL acad4ef452f1f096fc2c93169cd8ee79e006aa3680e5e62d8d8913ec8641ef162bf957c16dcf963c22186b9757db3cb55cbfebdeb291928c978aacb83e1fb04c
+MISC ChangeLog 3066 SHA256 0c2f97ad1b076acc6d52967c09acbd98d90d15a04160338991db588d15043e7d SHA512 febf4261efbcdad5ac4e7dcf17d2190609cf649c19a326a739d42494093ff2c818c4d293c3d1d148279857b1c9ba6c9f2d32694319bb27921ab6ae1e087fd712 WHIRLPOOL 9e3997398e0bc0339913fb2996e34d123e758efbf8f7317b5264ad4e7c850674af3608540c163c7eab080bdce19c898cb904340976a4d40e844e6c24b50cbaab
+MISC ChangeLog-2015 858 SHA256 a07598e30c0a85ff7d5421e9f69ba27d2def28c80c1651b90ba61c7f901682da SHA512 d57f88a0637304344c8f572c2d13e9a960756dd013d1008820b4a639e917308bbfd2f24b6aaab7feae046f0c735f6e032e7c163468adee3a2e9627fa89a193c8 WHIRLPOOL cc446ff2e610f81914d78f87a5877d02ad4b5e73dc90e2cf683934db55703300fdcac27a7853a9b479d8c17ac6395f21707a444a6927fd5818e109155bc2afc3
+MISC metadata.xml 632 SHA256 df851bdd4aa055366d6a43bb945ad93179b1be9a8d61676bdaca6283dcdb848f SHA512 653fc6d180455ee24967e70f78682ed2a7e61022d6867390b4c4eb994699b3f293bafe45b4fcf1c4ace3f102acba41c5491e8fb39b9f6102f1022a2c51955ef7 WHIRLPOOL 2f9659954db463b7884a2ba3a3600d6516eaacc8801d76696c1a27d461879c7368f6f30224bd49af26651bec45c0ff4c17e861ac12ed14715f7efb4c84f76dd0
diff --git a/dev-python/theano/metadata.xml b/dev-python/theano/metadata.xml
new file mode 100644
index 000000000000..61e77b4d26dc
--- /dev/null
+++ b/dev-python/theano/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  Theano is a numerical computation library for the Python. In Theano,
+  computations are expressed using a NumPy-like syntax and compiled to
+  run efficiently on either CPU or GPU architectures.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">Theano</remote-id>
+    <remote-id type="github">Theano/Theano</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/theano/theano-0.6.0.ebuild b/dev-python/theano/theano-0.6.0.ebuild
new file mode 100644
index 000000000000..04aebf32abcd
--- /dev/null
+++ b/dev-python/theano/theano-0.6.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+MYPN=Theano
+MYP=${MYPN}-$(replace_version_separator 3 '')
+
+DESCRIPTION="Define and optimize multi-dimensional arrays mathematical expressions"
+HOMEPAGE="https://github.com/Theano/Theano"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+IUSE="test"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="sci-libs/scipy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MYP}"
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
diff --git a/dev-python/theano/theano-0.7.0.ebuild b/dev-python/theano/theano-0.7.0.ebuild
new file mode 100644
index 000000000000..2a907d6fd4c4
--- /dev/null
+++ b/dev-python/theano/theano-0.7.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+MYPN=Theano
+MYP=${MYPN}-$(replace_version_separator 3 '')
+
+DESCRIPTION="Define and optimize multi-dimensional arrays mathematical expressions"
+HOMEPAGE="https://github.com/Theano/Theano"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+IUSE="test"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/numpy-1.6.2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.11[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MYP}"
+
+python_prepare_all() {
+	find -type f -name "*.py" -exec \
+	sed \
+		-e 's:theano.compat.six:six:g' \
+		-i '{}' + || die
+
+	rm ${PN}/compat/six.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
diff --git a/dev-python/theano/theano-0.8.2.ebuild b/dev-python/theano/theano-0.8.2.ebuild
new file mode 100644
index 000000000000..f7a4e534a576
--- /dev/null
+++ b/dev-python/theano/theano-0.8.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 versionator
+
+MYPN=Theano
+MYP=${MYPN}-$(replace_version_separator 3 '')
+
+DESCRIPTION="Define and optimize multi-dimensional arrays mathematical expressions"
+HOMEPAGE="https://github.com/Theano/Theano"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+IUSE="doc test"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+	   dev-python/flake8[${PYTHON_USEDEP}]
+	   dev-python/nose[${PYTHON_USEDEP}]
+	   dev-python/nose-parameterized[${PYTHON_USEDEP}]
+	   dev-python/pyflakes[${PYTHON_USEDEP}]
+	)"
+S="${WORKDIR}/${MYP}"
+
+python_prepare_all() {
+	# remove bundled six
+	find -type f -name "*.py" -exec \
+		 sed -e 's:theano.compat.six:six:g' -i '{}' + || die
+	rm ${PN}/compat/six.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
+
+pkg_postinst() {
+	optfeature "Make picture of Theano computation graph" dev-python/pydot-ng
+	optfeature "Required for GPU/CPU code generation" dev-python/pygpu
+}
diff --git a/dev-python/theano/theano-0.9.0.ebuild b/dev-python/theano/theano-0.9.0.ebuild
new file mode 100644
index 000000000000..cc371c650767
--- /dev/null
+++ b/dev-python/theano/theano-0.9.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 versionator
+
+MYPN=Theano
+MYP=${MYPN}-$(replace_version_separator 3 '')
+
+DESCRIPTION="Define and optimize multi-dimensional arrays mathematical expressions"
+HOMEPAGE="https://github.com/Theano/Theano"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+IUSE="doc test"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+	   dev-python/flake8[${PYTHON_USEDEP}]
+	   dev-python/nose[${PYTHON_USEDEP}]
+	   dev-python/nose-parameterized[${PYTHON_USEDEP}]
+	   dev-python/pyflakes[${PYTHON_USEDEP}]
+	)"
+S="${WORKDIR}/${MYP}"
+
+python_prepare_all() {
+	# remove bundled six
+	find -type f -name "*.py" -exec \
+		 sed -e 's:theano.compat.six:six:g' -i '{}' + || die
+	rm ${PN}/compat/six.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
+
+pkg_postinst() {
+	optfeature "Make picture of Theano computation graph" dev-python/pydot-ng
+	optfeature "Required for GPU/CPU code generation" dev-python/pygpu
+}
diff --git a/dev-python/thriftpy/Manifest b/dev-python/thriftpy/Manifest
new file mode 100644
index 000000000000..7dcd37538558
--- /dev/null
+++ b/dev-python/thriftpy/Manifest
@@ -0,0 +1,3 @@
+DIST thriftpy-0.3.9.tar.gz 208164 SHA256 309e57d97b5bfa01601393ad4f245451e989d6206a59279e56866b264a99796d SHA512 ad2b7f568db47f7f26235fc5fb6180c974eb6738f154461860c7329d263252ee627b979098c3e9ffe8ed42a0fb08a9110a6842a923ac800166d80a23d4e6a3cb WHIRLPOOL d371078349d345f01537ffc63eb924507921819d6e9c1577d0b522067cb1b36a8feae2211860c51c17b5e5fcf5c37f0c65c46b8d71687a114fb7c31667feb809
+EBUILD thriftpy-0.3.9.ebuild 665 SHA256 a3e76ade809ff4c3ced21d385309e6b16c067e9cd470bdd12a2dc367901d9577 SHA512 27ad6b411a5fcf6408727f9955e144cbe69344d107b25c8f7d588ed2095d40c3ce374cd72f5fc6475f4cd36612785935cb094b81c1012b86457098ba45a01e2c WHIRLPOOL 1769f82794945edeaa664fac8006d27fb056a0f8fb94b84c238888011a050bbc3dd7f1815ca0deba58639d51238952acdbe956d2ccc22b319f1ed67c42f83887
+MISC metadata.xml 778 SHA256 0c6c51b81d2b75b49022a27a94aba9d2e1fe4d8251376bb6bf41f06b91433bd1 SHA512 0bf7df25d46542f335eb9473e552b4fbaef70c43ccbffe2c982aad81c3d86b80f4c78c418848d51943849f18dd57bfeb9bb71ec92a2222565608457aa96b4749 WHIRLPOOL 13d805ce73f0ad4451526ea0721c6b75a1f52bee75c830d846658a31050ef76944e32869b9a9ed0752f79b4964aabd17e5057ff7c66377b73e9c023f5e359864
diff --git a/dev-python/thriftpy/metadata.xml b/dev-python/thriftpy/metadata.xml
new file mode 100644
index 000000000000..33592bf9bb0d
--- /dev/null
+++ b/dev-python/thriftpy/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Thrift is a software framework for the development of reliable and
+    performant communication and data serialization. It combines a software
+    stack with a code generation to build services that operate seamlessly
+    across a number of different development languages.
+    This is a pure Python implementation of Apache Thrift.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">thriftpy</remote-id>
+    <remote-id type="github">eleme/thriftpy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/thriftpy/thriftpy-0.3.9.ebuild b/dev-python/thriftpy/thriftpy-0.3.9.ebuild
new file mode 100644
index 000000000000..d0d687f397ce
--- /dev/null
+++ b/dev-python/thriftpy/thriftpy-0.3.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python implementation of Apache Thrift"
+HOMEPAGE="https://thriftpy.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/flake8[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/toro[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.23[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/thunarx-python/Manifest b/dev-python/thunarx-python/Manifest
new file mode 100644
index 000000000000..2b2dc1138bf6
--- /dev/null
+++ b/dev-python/thunarx-python/Manifest
@@ -0,0 +1,5 @@
+DIST thunarx-python-0.3.0.tar.bz2 303035 SHA256 5650e045565af82f3a5f67bbecb46182b502a37f94d08c23adac697dbb4ce258 SHA512 9be3e8b50cd668e0b63fbf54da5dec3685dde40528067b35bd1cfa87db7e037962baafce3059818a7de76101472a2b07ae209c590f2f143dbc71646e8addb28f WHIRLPOOL cfcf986b7ca9bc2fd50d4d5bbb80c6df7ac557e3ca15703eada5c71a302d4275cee7972d13cb3d746e064caeb9e90f366819045bc109d761bcc898ce5a70d577
+EBUILD thunarx-python-0.3.0-r1.ebuild 945 SHA256 b6847dfd64b57435ac633b0dae5485330007521e48862c471845c5c81d7cbb8f SHA512 aedb93000543f01385a0044f5c1af7b95240bb7131c6239e1297f31ef3a8d8b23c271d1011371c603c260f26b5c46eb4eb519377441f646cbbd4a187b1201781 WHIRLPOOL e24fab1d0f372002c0857c0e02b380eed0ca7c8cc6946371455d057356e3377be7706c3b3563e8316059dc618d2a8c95000af719048cdf272a2e8c622f7d3daa
+MISC ChangeLog 2205 SHA256 2e2b5edb1f0ec16036369beb70a01bf73e9760eb9ba09e4649d220b600bd8a53 SHA512 8865d990a567185176193c2d5e18c8a557f7e2219f2d9b8a5a67e971cda9c5c003324675b19271fe59fc5a1ca7927e91062e41962232173670aa5d0cdf7b90da WHIRLPOOL af45238b0fd6ae6ea1636b5533824479da8bab7580c8adcd699bdb4b70a92b22c0356e62388af467fc8a4f3c46958cdfe5daa41fc6e054c1270daca9fde335d4
+MISC ChangeLog-2015 2104 SHA256 41516e912e6c1df447fa5aaa00dc51eb07a238866fc306efdd8cb21a1d6778f1 SHA512 9b7383921393d80132ae92409fb5ac4610ae7b70dcc889f5f766f23465f2e7d4236f9f12f5a8252715b7680eb6bf7061b832d038232201f853bcfae4cece71b1 WHIRLPOOL 6d5a9764bcb6507d2dc127d066980bf4d6bd7c04c9790ec2a00bd3476a39c4fbcc9b1e5e41e062eedd883709adfc2d1a1320a9450bd0d707590fb4c3862414d2
+MISC metadata.xml 357 SHA256 dc645f833ba93d8161b500389bbed883988e9acbca9182ade6e3ae0112b8042d SHA512 f707818cf1217c314e8c0a18c990f4b1e65b358e7fefe68490d59956c97aa40a2f2b0130d89a54a658dc2caea11e0c5a01f04553faab53dd32513bc299e90b58 WHIRLPOOL db41fcd87f3b6afc46410bdfce244f3187a6851946ad5a3c3c54412a6c9ba082790ec5aafa56e0ca25af7c5ef18053efbc5117c24fce1d41967e7de69d2f8db1
diff --git a/dev-python/thunarx-python/metadata.xml b/dev-python/thunarx-python/metadata.xml
new file mode 100644
index 000000000000..7bdac6c6ba25
--- /dev/null
+++ b/dev-python/thunarx-python/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="project">
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>xmw@gentoo.org</email>
+    <name>Michael Weber</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/thunarx-python/thunarx-python-0.3.0-r1.ebuild b/dev-python/thunarx-python/thunarx-python-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..f9504d17cdfa
--- /dev/null
+++ b/dev-python/thunarx-python/thunarx-python-0.3.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 xfconf
+
+DESCRIPTION="Python bindings for the Thunar file manager"
+HOMEPAGE="https://goodies.xfce.org/projects/bindings/thunarx-python"
+SRC_URI="mirror://xfce/src/bindings/${PN}/0.3/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+RDEPEND="${PYTHON_DEPS}
+	x11-libs/gtk+:2
+	dev-libs/glib:2
+	>=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	>=xfce-base/thunar-1.1.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+pkg_setup() {
+	XFCONF=(
+		--disable-dependency-tracking
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS README )
+
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	xfconf_src_install \
+		docsdir=/usr/share/doc/${PF} \
+		examplesdir=/usr/share/doc/${PF}/examples
+}
diff --git a/dev-python/timelib/Manifest b/dev-python/timelib/Manifest
new file mode 100644
index 000000000000..b1f5c000ec3d
--- /dev/null
+++ b/dev-python/timelib/Manifest
@@ -0,0 +1,5 @@
+DIST timelib-0.2.4.tar.gz 295951 SHA256 7e6e5a103ce0447f9f91a56fd5d9cf54a1e5cece722b52e53d1b0bb9413248c2 SHA512 b19ef411f7a6d4f9e43e4de2a4c57f1f430b5c16ec88f7c3f72e8a2f6950a2e94c1ce3792203ba3add07994d1a8eaec4172aa09315b39df4494430e30ebd880b WHIRLPOOL 14ca47e9595117df0a45704daaf4d71721aa4ad9a5b06e006da1e71f37a76b6b04911187729206127608ca3d4ce7d6070735e60ccff4a4ca4549ea41b18f83aa
+EBUILD timelib-0.2.4-r1.ebuild 701 SHA256 8c2990ff183e9ca603065a913d95c2fabc06c5644822419dfad511eee099b081 SHA512 30dd863297993ffbc897451594396d2b8b0b54468950eaebcac7de171ae89a512105b00a122dfc5d9d1387da35771ee52d78e075cd3f24d58fd007dba59e1bdd WHIRLPOOL a33aae9abc15130d5d633ca5e5b532a5f8b2a36157d20142f8b279ccfc7a6bb9edf04836614ce8bb51dd7c42c4bf97a0f1a342721b87a0faae3050e6a5d62f0d
+MISC ChangeLog 2712 SHA256 12ab3af3330c27f68bd02e11aa34dfba0ce5060a5c95b04df7b4747788a67beb SHA512 fad5581f54a5d2db5061c26701beb6ed5202c8a39aa0b5d936f8352920793ee8888130c776950b8fe0bd4d9cd36eec1c8edb92035891edde68629a4609f2bccf WHIRLPOOL 45f7523efe643db955fa14a68bdcd23f5b9bf27bc3283b995a59cb35c2f483aae126050af88ea728a47c5f410d794fef924d32d8443b3f05cc760869741d763f
+MISC ChangeLog-2015 2299 SHA256 c4be7452025b3c5aa14a12d440cfd6b0f706871083f7ceb019accda08f62f6fe SHA512 7d882ce5655f5b54b615464c7511b48895d961909b09f572449a5d5729157cde31ba53766d32132b37439853e8653c5c1c4debd151d07d2ee2b2dfcc948f27c8 WHIRLPOOL 117af854706f8ed2e7a19e0a43b1423b5d8366702fb9b005df6d8bbfc3694b3d834642ff07709fce25286a1a9340894588d231a78855cb49ef4a67681347fcf7
+MISC metadata.xml 310 SHA256 5864e92c794e665dcd64559d173c72eb3c5946f4e07997af35f4fb19e23b8e02 SHA512 10849bb8c428f8a211ce1902dbeb3da74922aac33ec7b95df5b2b3dab4cb60e64e399eabeaba48f62455dcea808dfea43daea4593e0529c6d3d58402be06cb46 WHIRLPOOL 47d147a9033e4d9ef146dd4fe38c186cb738a3262c565b0b298369071b977c76c01ce6944b2fbaddbcd15b4dbdc2dcbef28498e4e56747b59c444faaa1d7d221
diff --git a/dev-python/timelib/metadata.xml b/dev-python/timelib/metadata.xml
new file mode 100644
index 000000000000..0a112a630eb1
--- /dev/null
+++ b/dev-python/timelib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">timelib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/timelib/timelib-0.2.4-r1.ebuild b/dev-python/timelib/timelib-0.2.4-r1.ebuild
new file mode 100644
index 000000000000..00549a75f07b
--- /dev/null
+++ b/dev-python/timelib/timelib-0.2.4-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="parse english textual date descriptions"
+HOMEPAGE="https://github.com/pediapress/timelib https://pypi.python.org/pypi/timelib"
+# pypi zipball lacks tests; also it's .zip
+SRC_URI="https://github.com/pediapress/timelib/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="PHP-3.01 ZLIB"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND="dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/tinycss/Manifest b/dev-python/tinycss/Manifest
new file mode 100644
index 000000000000..0dc39432cb43
--- /dev/null
+++ b/dev-python/tinycss/Manifest
@@ -0,0 +1,7 @@
+DIST tinycss-0.3.tar.gz 72860 SHA256 a4adabd1c417080372c789220f7f9985995e74f2fb612848306872a232862cde SHA512 1fdf29777ee7b3ef39cf2169d8f464a7e5aea850de8a7976acf3ed9e73e831ea0d7ee52b4c8c9979b2263509cbffe1bde85cf6da178ddeaac9009ace7a2b4441 WHIRLPOOL 2fc7433e2410e8641f2c939f2d22ba3ab423908e20213559b34e8fb5002776a9ddfe7640c8a68c59af05b1c0e1493481c315011bef8055afd858e7a4c66ebdd4
+DIST tinycss-0.4.tar.gz 87759 SHA256 12306fb50e5e9e7eaeef84b802ed877488ba80e35c672867f548c0924a76716e SHA512 13a50332cddc28026fd7ecc007e14085976284e69de6ea93d1013502fd9791694092c010947b13dcd23f3a2df65f277f62410abd90d03eac16fa5af913673b0a WHIRLPOOL 4770396bdc4798ff06252cd11f2723211a1cdf7789c735b270af4bd00d96c5d1d71b4d42d3ad7f597f92575bc6ed26d7c6238186afb655e6b30d85f61e82af40
+EBUILD tinycss-0.3.ebuild 650 SHA256 bfd600de375d05ea15e6dc42c21d8013add3d57b86f00e85391834078eb5d152 SHA512 3643d2c38c0b308d5d2d8eff65700f5fbeffe3d5f9b47fbdb1c04f22656862e04deeb5b5bd919d8c4b34ee3e4fb6eb56127259e7dda7b14bae26b90f815249bc WHIRLPOOL 40cd8d4e6f42898df98fa85efee8412184e710776b26e796f9b088edb41f8c61f8748f1ab14b895825091c3dc04e779a9ae003312ec8c90314577249f38f2ee0
+EBUILD tinycss-0.4.ebuild 811 SHA256 8ae9f1e5070ad875802771e915888ff2370a6b2924e0a74f34e9f3ba7819d8c2 SHA512 c12027dc010798df8bfae8f3970883af24fc17504122247ad3311f716028c767d00ec73e8e39e81f3e85c79286e4c6b999350a87a3b96153acc1ed2843923c70 WHIRLPOOL 0ca2ccac5d5dcabe19805004499038a870a25a3a72155cb3fb9aa8a72d8a4073378a819e4f890070a2d9bb2108288995a31bab3f776679ee7ddebc8f57f8b6be
+MISC ChangeLog 3427 SHA256 620b76a68f4ab16ff7aff7d5c314fada39e290c9c4ccf3548e39c8b9e7279af6 SHA512 1081932e6c9e51fbbd5c1b3281834a118764a7735aa88c665a48c008c4a076c346084c4c7201662b561cbf8372375c4f94693c76c949666ef6ea7d41a94b47f7 WHIRLPOOL 98fc313094efd3cef281e0321c4905a5a4b7fdf44547e8dd9d9bcbc11d1758b88b0e5d0a886717fcbc362fbc1698f2a833220f31b56c09eb26057ce8212ce902
+MISC ChangeLog-2015 1497 SHA256 4ee3cfa767a95ed66e3001aedcd8a5b0f89a6129e5336559294ba23496a76fd2 SHA512 d6635e66dcf4c6160b107432abe5f7a6de86165c9123b4d50039dce91bb41da1d8642b3af370b3bdbe61ba71c7e2666057e9ce7d93e7444c78c911fd7d812317 WHIRLPOOL 1ab3cf69d0e10d98eb94d5a00b1d4a4f4f742a5eeee3c574a5b8514be3e54ab9b2d42551c2417f2263530067d414637a2fac0ebe4a0956a54b91d3dee8dfc40e
+MISC metadata.xml 380 SHA256 86e82c658e4a93ce30b3998c69fd7249d90de609cdfa1bbe844a99bd2af148d3 SHA512 b5e7005f5f93ebe86cac3643711928d83456e5ccbfcccbc3dc008daca1e341285342240cc032f69042bc5a19739679ec0ae5e2e2d83c46dd57395ab9e1c12bb1 WHIRLPOOL fd2e92cbbe52445ed7be906c3510610b4c213ba382ca356ef8a47c49fa2c17cdc6ae3d3df480de8dd22306f690aeb635979d007ab660329efa0822a3d891ef4c
diff --git a/dev-python/tinycss/metadata.xml b/dev-python/tinycss/metadata.xml
new file mode 100644
index 000000000000..ef2f9036b725
--- /dev/null
+++ b/dev-python/tinycss/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">tinycss</remote-id>
+    <remote-id type="github">SimonSapin/tinycss</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/tinycss/tinycss-0.3.ebuild b/dev-python/tinycss/tinycss-0.3.ebuild
new file mode 100644
index 000000000000..6eb70d2b67eb
--- /dev/null
+++ b/dev-python/tinycss/tinycss-0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A complete yet simple CSS parser for Python"
+HOMEPAGE="https://github.com/SimonSapin/tinycss/ http://packages.python.org/tinycss/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES README.rst )
+
+python_test() {
+	export TINYCSS_SKIP_SPEEDUPS_TESTS=1
+	local test
+	for test in ${PN}/tests/test_*.py; do
+		py.test $test
+	done
+}
diff --git a/dev-python/tinycss/tinycss-0.4.ebuild b/dev-python/tinycss/tinycss-0.4.ebuild
new file mode 100644
index 000000000000..594f08dc3b2e
--- /dev/null
+++ b/dev-python/tinycss/tinycss-0.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A complete yet simple CSS parser for Python"
+HOMEPAGE="https://github.com/SimonSapin/tinycss/ http://packages.python.org/tinycss/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+DOCS=( CHANGES README.rst )
+#RESTRICT="test"
+
+python_prepare_all() {
+	rm setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	export TINYCSS_SKIP_SPEEDUPS_TESTS=1
+	local test
+	for test in ${PN}/tests/test_*.py; do
+		py.test $test || die
+	done
+}
diff --git a/dev-python/tinycss2/Manifest b/dev-python/tinycss2/Manifest
new file mode 100644
index 000000000000..0b78d6b38143
--- /dev/null
+++ b/dev-python/tinycss2/Manifest
@@ -0,0 +1,3 @@
+DIST tinycss2-0.5.tar.gz 61802 SHA256 fea8a5100bf8a49f518113769cb22639f6de8bb1016e36616cea9812050e6919 SHA512 321af21a80dbdf8d1ad218e33c87edbe7c0b4c1bffeeb38a9b14bed9064749f71636bf70775186e8785587d5fa96e3488465a76b59f643658f84b6bdc1c5c4bd WHIRLPOOL fd7835c51df42da3052cd7605dc4970fd36dcb919a24b067d7eff99c60890e43abda949a2c8c6b5d32115f893579c6e5a0701c8931a21d7444b3734fd936ec06
+EBUILD tinycss2-0.5.ebuild 676 SHA256 c58068228c701c78ee4b4b1acb94de679e9027350b5df03d23a54122daa574d6 SHA512 f1334f62d608a31672963262a54c3d23edff1f4308883edeae8676107a5ef3faf7d5edd09c55c4dbcd2ac5e08a82440647d041448cf35f34e34e7896ccf67162 WHIRLPOOL e70fababa927f6683efdde2d125c5241c0535046dda9edc27f9a82e5079413009b11e60d1529203dfa70b53e7dc6963512d197a5dc68ffd76ccea92bbae68877
+MISC metadata.xml 502 SHA256 1314d6c7d600c22b43f50936cd3ed97879e950b681bdb8c378b1a6f1027aef6f SHA512 7f9daa5d348f1a239e5c2cee779789405263c09c86b32dd0a8efabd97a77793baf800741f3c2f8660f9721dcef4f47dc6a2cfa170588982df0fd092377dd7233 WHIRLPOOL 944c2bbc3b30ad95edb99c6ecb0d6b2e85ca0033dcdb063c6ac49a96b40d9c0dc37c30db082c774f5bb9c9a38dd0c3b8653554201202cad962e37e88c764a4f0
diff --git a/dev-python/tinycss2/metadata.xml b/dev-python/tinycss2/metadata.xml
new file mode 100644
index 000000000000..95e6d41f324f
--- /dev/null
+++ b/dev-python/tinycss2/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>titanofold@gentoo.org</email>
+    <name>Aaron W. Swenson</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">tinycss2</remote-id>
+    <remote-id type="github">SimonSapin/tinycss2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/tinycss2/tinycss2-0.5.ebuild b/dev-python/tinycss2/tinycss2-0.5.ebuild
new file mode 100644
index 000000000000..aa53bc12e101
--- /dev/null
+++ b/dev-python/tinycss2/tinycss2-0.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A complete yet simple CSS parser for Python"
+HOMEPAGE="https://github.com/SimonSapin/tinycss2/ http://pypi.python.org/pypi/tinycss2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="test"
+
+RDEPEND="dev-python/webencodings[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+DOCS=( CHANGES README.rst )
+
+python_test() {
+	py.test || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/tinydb/Manifest b/dev-python/tinydb/Manifest
new file mode 100644
index 000000000000..1646a3ba7bf0
--- /dev/null
+++ b/dev-python/tinydb/Manifest
@@ -0,0 +1,4 @@
+DIST tinydb-3.1.3.zip 33969 SHA256 c46d46e5e4e632df47c75d8bf402f3d8e08a468e782b5475398dc6ac6448e16d SHA512 451f942f1fa38bf159cabc5b0738cb818921bf47a2159211a4048eee91a23dd734bcf3883e62d7b4ff85fa68def78edadf05d845a0ad0f3936d281e91de65ee6 WHIRLPOOL 0adf66a74359d5c99d263c9b6f2418539dc762eeed28993935e9c99a04058dbfdf5c85c73c8643d9b366982b438066fbb2c405723dc01673d103197a3e386817
+EBUILD tinydb-3.1.3.ebuild 746 SHA256 7c65974f44037917bbce88ed5fa69eeadaa61d876ebf8dbbcab355d63dd0e2df SHA512 5604ddccab4af43ea14f3bbfda326ddc917fd096f86453f94af7ce4f35bd9b2cd8d97c52bb366187c6e2020bcb9b07e831088ad478e69c3ce4adcd4a51753de7 WHIRLPOOL f90c7ad6767f0e92cf89df29ec0737fc4b1013c6eca8652934db4a4ebbadd986a41cda6520f415ce18a030dff67989ad8a999495f4bc47bbeec331883d01a621
+MISC ChangeLog 738 SHA256 f786b291ea174dc45c23a867c88bd1591a00c2403e818a59a15966ba550f661d SHA512 4e84d3dc5bf612e0ab1cbd9dec544395763b6e15936fd0d1d374133b8528517ff3ab5fded701bfac20f814bfcfe36c26d7c4caab95c9400d39a940adec0a458e WHIRLPOOL b7baec5c2355c80ad844aab1a27acecf7e5a7306b605e5eb2444d799e211c1bc47bd2faaf0bb476274e405f3644908a64be8276cd1a1db6f63cfd59f2fc95654
+MISC metadata.xml 503 SHA256 877d881988eca0f7e610b9baa621dd30c6c1d855bd33b1a15cad9297cf64caf0 SHA512 b0ca469363341419f635593d5ff944633b3772151d0b9361653a6d1a9dd8ecde9996d05f074b65d4297c5be73a4f7a95043cca768e4567900e315a218977d4f0 WHIRLPOOL 2c3faaff7740dc2e4d9b87221757a711e9c10b8201df095910e02df9974b7ac52654e8e0589eb7fe4c1497ad738f992c3a999e079898019051984d41a1e3db2a
diff --git a/dev-python/tinydb/metadata.xml b/dev-python/tinydb/metadata.xml
new file mode 100644
index 000000000000..5ebab5bc994f
--- /dev/null
+++ b/dev-python/tinydb/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">tinydb</remote-id>
+    <maintainer status="unknown">
+      <email>markus@m-siemens.de</email>
+      <name>Markus Siemens</name>
+    </maintainer>
+    <remote-id type="github">msiemens/tinydb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/tinydb/tinydb-3.1.3.ebuild b/dev-python/tinydb/tinydb-3.1.3.ebuild
new file mode 100644
index 000000000000..b6d0e9a9440a
--- /dev/null
+++ b/dev-python/tinydb/tinydb-3.1.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tiny document-oriented database"
+HOMEPAGE="https://github.com/msiemens/tinydb http://pypi.python.org/pypi/tinydb"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed \
+		-e "s:find_packages():find_packages(exclude=['tests']):g" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v -v || die
+}
diff --git a/dev-python/tlslite/Manifest b/dev-python/tlslite/Manifest
new file mode 100644
index 000000000000..71806b4fa691
--- /dev/null
+++ b/dev-python/tlslite/Manifest
@@ -0,0 +1,7 @@
+DIST tlslite-0.4.3.tar.gz 562090 SHA256 6a67d8a0bec66183719c19c91f383bc1555545055aae4498af2e91fe9d79f813 SHA512 d1f451ebc2f7bd4d5436f1ca8ecfdbaa403f3dbbae9f9ac3900131e5d168e3267e22fcf23d85f87457f06468997cb01a51683d028a67fde58820b15f97689a0c WHIRLPOOL 555f2659f0bb5080519edd5f4325953e13109367ef21e1595816ab4f3956233bb541940f65f2cfa95c041b7f2cc080b8c4ee10719be79edfa11076a2c834fff6
+DIST tlslite-0.4.9.tar.gz 105402 SHA256 9b9a487694c239efea8cec4454a99a56ee1ae1a5f3af0858ccf8029e2ac2d42d SHA512 5473139b5730ef946efa139fbb9adb3333dc67f33f03305f4a6d3b6eaaefce950ba93bc1053362fc31b9d68ff9f6deceb9449987e29ff44035b818d7310edbea WHIRLPOOL b8fa4794d5670585c9f55673f04bfb2d2fac5457013284b810d27e4c31f0f9a9a349f1664eec338bc70adf9586910bccf3c33ef6d0b926418e1801ef23e6cd7b
+EBUILD tlslite-0.4.3-r2.ebuild 839 SHA256 c29d7c84ef8706e680c3fbe3f526d7f621445a64b02462f6d50e6132cf11df77 SHA512 b8df750803aac03837dcbe74cf76cc440c03a973dd9026d9f650ff4373e46eafe23eed83321fc1cb7de045f4840500ccf78cad0d37cdbaa118bdec08202787b0 WHIRLPOOL 3cf9a946e2942ed1bc499fe273152c059ca0fd33a88ee1412a58f6601df9f35d039e495e332bb99ce36cf0a4e7a6f2bb735e3307e20c0e4817fe61d0b74ef5ba
+EBUILD tlslite-0.4.9-r2.ebuild 878 SHA256 21fe75915d9c7490e73e4be0fda6dfc52df41fcef6949ef76080b04b7df88df6 SHA512 27f5c7767acd27f255a19a2c90a18cc4e130594f7c71215682ef9f6b4b81ee45f3407b0139421b26ead2e8434da724c02284089b77773d8d2b6b3d829b8f31ac WHIRLPOOL a0c0ef84b14015795396d7d1bb2453271ef323e01cf9842e52bce49a94cc0dbe5b19e14e358ddc2f3de3ed73099ba40c74d0d343e832adff3876c65181ee6175
+MISC ChangeLog 3670 SHA256 71a686e1aa1cd7f1bae5d87487757f46fdfb9063f4a1ba657d3a9cd86d0f6605 SHA512 8bc89734da89128ad842de33936b00cedf89db7af8278e76dd5b7cfc7ba9283357c7a0cf6401e1bc87f23fcbdc9cbbc280970ddc0d4b2906fdbd89755e3d388c WHIRLPOOL 02ffe31f1d163d45a46094713419ca34c775a081222b5a82f076f3ec5793f15524b19627068b281cff517acc2a883d825404ea8114f60815152b41e16757a677
+MISC ChangeLog-2015 4164 SHA256 03419aabe573830eb748165c497a844b58baa34dff183b183f165c1f7e65ecbe SHA512 382debfc9b241c3a672abc386a6d5f5589ebc106bad032f039ad7a89c285e052cc4daa2a4b98d28861bb2c641b27d778e543c0e9f86e94f2fb7acb31ef9733e6 WHIRLPOOL 4a467d9d1f934c059a9cb82fe979346ed4be4055813d95140ae035c313e6cc8fbb29174be38cd077d783bdf0638f8af48d2ed0b0ff275497b7fe9b016b0f425b
+MISC metadata.xml 862 SHA256 b96e1fbe58e75dc5befc92dcefd465e9426948e0458bd41e3a481c44606974d6 SHA512 1374c0176a6a8386e8123bf1be106431d616de1b70d4b4948327b3e8f20a5d346bb622a2b83389aca1a0eda3f33591e9327929f2a7c062f04af80618ed3b0b8f WHIRLPOOL bcb69de4cbfa74c5fad50ac6c246a18c68a3d8484b79026b230d875517d5f1d38ca03f07060290e981a218e9826c6aa5449e4af60abc3416c0ca2a77b9e5adc2
diff --git a/dev-python/tlslite/metadata.xml b/dev-python/tlslite/metadata.xml
new file mode 100644
index 000000000000..03969c1ba052
--- /dev/null
+++ b/dev-python/tlslite/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		TLS Lite is a free python library that implements SSL 3.0, TLS 1.0, and
+		TLS 1.1. TLS Lite supports non-traditional authentication methods such
+		as SRP, shared keys, and cryptoIDs in addition to X.509 certificates.
+		TLS Lite is pure Python, however it can access OpenSSL, cryptlib,
+		pycrypto, and GMPY for faster crypto operations. TLS Lite integrates
+		with httplib, xmlrpclib, poplib, imaplib, smtplib, SocketServer,
+		asyncore, and Twisted.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">trevp/tlslite</remote-id>
+		<remote-id type="pypi">tlslite</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/tlslite/tlslite-0.4.3-r2.ebuild b/dev-python/tlslite/tlslite-0.4.3-r2.ebuild
new file mode 100644
index 000000000000..5596ca44d1cc
--- /dev/null
+++ b/dev-python/tlslite/tlslite-0.4.3-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="TLS Lite is a free python library that implements SSL 3.0 and TLS 1.0/1.1"
+HOMEPAGE="http://trevp.net/tlslite/ https://pypi.python.org/pypi/tlslite https://github.com/trevp/tlslite"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+#Refrain for now setting IUSE test and deps of test given test restricted.
+IUSE="doc gmp"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+# Tests still hang
+python_test() {
+	"${S}"/tests/tlstest.py client localhost:4443 .
+	"${S}"/tests/tlstest.py server localhost:4442 .
+}
+
+python_install_all(){
+	distutils-r1_python_install_all
+	use doc && dohtml -r docs/
+}
diff --git a/dev-python/tlslite/tlslite-0.4.9-r2.ebuild b/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
new file mode 100644
index 000000000000..f4b5a7a47c55
--- /dev/null
+++ b/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="TLS Lite is a free python library that implements SSL 3.0 and TLS 1.0/1.1"
+HOMEPAGE="http://trevp.net/tlslite/ https://pypi.python.org/pypi/tlslite https://github.com/trevp/tlslite"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+#Refrain for now setting IUSE test and deps of test given test restricted.
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+# Tests still hang
+python_test() {
+	cd tests || die
+	"${PYTHON}" "${S}"/tests/tlstest.py client localhost:4443 . || die
+	"${PYTHON}" "${S}"/tests/tlstest.py server localhost:4442 . || die
+}
+
+pkg_postinst() {
+	optfeature "GMP support" dev-python/gmpy
+}
diff --git a/dev-python/tmdb3/Manifest b/dev-python/tmdb3/Manifest
new file mode 100644
index 000000000000..f318d9299055
--- /dev/null
+++ b/dev-python/tmdb3/Manifest
@@ -0,0 +1,7 @@
+DIST tmdb3-0.6.17.zip 38179 SHA256 64a6c3f1a60a9d8bf18f96a5403f3735b334040345ac3646064931c209720972 SHA512 ad2cd838a9127e4839572590d1083a0b1f3f23d5fd52aff2dcdc159ed189b4f73acad0b916d807c8ee77cc434102d7a6e99d4f7a0d560bdcb8fdbd1f9f6f4a72 WHIRLPOOL 4454bf25a4d6c073e4a469a7558deafb50dad2d55649ed2cddd3d40ca0e100fd4df00c89a843a7285103ddd208a1e741513217a10df62a2897d2b2dd8b2f6c29
+DIST tmdb3-0.7.2.tar.gz 39545 SHA256 9b6e043b8a65d159e7fc8f720badc7ffee5109296e38676c107454e03a895983 SHA512 d4294cbc5811776f7514f5dca82421c61538409c6d76704ed22272bbd9b6a362b7887c392526f285d81da29500530e684f1e829722f646d1d3eea4293a748a64 WHIRLPOOL 4cc02bf35891e3a460d205e1eedda365167bd8193b670b65732c5457e2ebfa16822b53a40eeffb62ec65923b047f51596a0b02ae40af5fa61c1aa2e7e34a8e04
+EBUILD tmdb3-0.6.17.ebuild 435 SHA256 aa1a656f68503fb473205355902361bd54986fb3abac87bb456e232d88b3e371 SHA512 96eb2060e44a32ef0007da6d2fec878c9d8ed2a00604799b39fc2f9f3d5d5ecd0c1adc490a08fbdf473f3b998576f79a0f1b21bf6ec9112b128cea26fc0f5182 WHIRLPOOL 38f7f0b4c642d9b47923516d72984520fe1a3e5499c41b4a912133063489a643dca9fc6606646e7a7f83fc3e6d43bf19bf20e25373edc84f570fb29630852d43
+EBUILD tmdb3-0.7.2.ebuild 402 SHA256 e93eb15066ae22e25a2e13b65bb1d0e64d1f5a6a717b592e527def346da5bd20 SHA512 f1424662ffcc62ecb28997d666fafe9afecaffa759b49ec6a0f9b1d7d29b1eab352e8b4cba9cdfe5ce7a69bacf62257529e284df2f362a7a70d7380b9ab84061 WHIRLPOOL 4bf2cbc8ac90def8a65c4fb3eca259a382f75f445f3b0013c5aa58d3677ba61cb21d6255a2da0e7fb42ae99d04bc50b2e451994b6bcf940a962ff0970c94cd5c
+MISC ChangeLog 2473 SHA256 26b305adc6fc013b21d7132fe090ed4fb85807fc3bda4e66d46cb64e45c8b6f4 SHA512 b09f8051be5d1eb5a010ca29b37aaa5987ab784b3c73b3ea29850f3ca8447072f4e5bdb32cc4abbae0f2f497a29268e486f6ed7cac3768bfd21043b38e95a3a0 WHIRLPOOL ded298c5dae3929e7b419de3ae5b20bba1cda7e7f991f274e91ceaee494fd132fc53eb93605632c30ef68339546bd54ac752dc668c30d4ea43841edacd4e63d1
+MISC ChangeLog-2015 787 SHA256 3d5c5520f97274e5f918a409b4e48f3edd746486a3804afd9a8e254a5ea4b994 SHA512 98e3bc6ee1acfd6bf85ddb8408341ba550416bfeb5b1b5c30b42572390b783c24968471902eca9f73c1dbace9e0f67328c9ccd659cb5622d3e3825437c414f7f WHIRLPOOL f17526fa1a006faa55ad11a82ffb0f911fccfa7533ec3d5f95a32dace804b4eb1a2d3a8a5e3de4e3fc228bec06fe14ed43170b4ca6fd1df82979a77ce5daf270
+MISC metadata.xml 298 SHA256 4dd0aaa3ffb5af6e028b0590a6f66354e7b97b66196bda0e8071fb45d38ce910 SHA512 92423b0c7ec1f1bfab4c2957a46acdc01f198872fee30c44066023aad0a1dc9544bdb7769a0692c0269ac40f9c805853243e7e6796e894f86f21168ab06117f2 WHIRLPOOL bfe8e0bb2fc4d9b647e9286cfb5e7a980cc2a689d6b1bb1431fda7ec1cea1b5aacb3de3064d1aea24cd4821188651c5d4abf8a575143eb9bb160a76ea6636780
diff --git a/dev-python/tmdb3/metadata.xml b/dev-python/tmdb3/metadata.xml
new file mode 100644
index 000000000000..de71a1dd9966
--- /dev/null
+++ b/dev-python/tmdb3/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="pypi">tmdb3</remote-id>
+    <remote-id type="github">wagnerrp/pytmdb3</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/tmdb3/tmdb3-0.6.17.ebuild b/dev-python/tmdb3/tmdb3-0.6.17.ebuild
new file mode 100644
index 000000000000..36401ed88d7a
--- /dev/null
+++ b/dev-python/tmdb3/tmdb3-0.6.17.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="TheMovieDB.org APIv3 interface"
+HOMEPAGE="https://github.com/wagnerrp/pytmdb3 https://pypi.python.org/pypi/tmdb3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
diff --git a/dev-python/tmdb3/tmdb3-0.7.2.ebuild b/dev-python/tmdb3/tmdb3-0.7.2.ebuild
new file mode 100644
index 000000000000..3895b5e70c4b
--- /dev/null
+++ b/dev-python/tmdb3/tmdb3-0.7.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="TheMovieDB.org APIv3 interface"
+HOMEPAGE="https://github.com/wagnerrp/pytmdb3 https://pypi.python.org/pypi/tmdb3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
new file mode 100644
index 000000000000..a4b6e47522ed
--- /dev/null
+++ b/dev-python/toolz/Manifest
@@ -0,0 +1,7 @@
+DIST toolz-0.8.0.tar.gz 40768 SHA256 e8451af61face57b7c5d09e71c0d27b8005f001ead56e9fdf470417e5cc6d479 SHA512 678ec3120d1306fe0e79824caaa03060ba780c464e783d7e20c4149483babe63646b3facaec63ee4017b32be07cd052f4ebcdf73ba8f7734e80873df7127d469 WHIRLPOOL 1098220b873ce8a904ad65a6db935cec84eda3693ab447a620dfdb2b3cddedde1dda3266f03d6d56bd612feb5d0095ec4a2c00d3caef4b8acb368f61166616e0
+DIST toolz-0.8.2.tar.gz 45486 SHA256 4a13c90c426001d6299c5568cf5b98e095df9c985df194008a67f84ef4fc6c50 SHA512 b03968b5f31474b2b5fd944d282b620861184cd26b256f6f92a141aa0f25c20baf2be6b1424bc945778fa05781730b477b16551c9f302c284d54c8be64f2699f WHIRLPOOL 3bba06a6463f4310c162bd92d49c17ad8372510e08b9298365d7ea267eeb0a58efea5710064ab47c6b87365d325c9a75b12efa8ac6f09894a65c539b45f18c1a
+EBUILD toolz-0.8.0.ebuild 453 SHA256 d9d1c2c62b99a292dd645390b7f750d9f93ff987c78d528930e33e365614c0a8 SHA512 f80b2ab218639a3c59235a79a7ff9f715c10d1f2b9115cf56dc95f0a4bdcf77426d991be45e4b81f52b1caea426c6eb3f7c71957c9b4b0bb409cee553781ad64 WHIRLPOOL a5159fa874950ec0e9fd125b15ac16efdc3e6a28cc58af6d833a6431ecb22489400071ef8764b19a0f51bf4c766a2461b170fe5cadc227cff0ecc6e065fe8837
+EBUILD toolz-0.8.2.ebuild 461 SHA256 9dc3adc8c1b350e12fe1881fe927301046f51b753b12a6ee8e2f25db3ca4b87e SHA512 f5bec51b1a17a44793088d85d97876fba7d53b45b1e30e0984a807d43b1afd654ed375a23948ba76c4d0ce8d8c696ca8de9a778b26939ac978786acac47075ae WHIRLPOOL 7f63c54df9571af86b90044ac7dab3d6993f83a077490773eeb29ff8d630606d96d7862ffe75b7eb66daa0334b24fcb18e54e3a3d99f091ec85329f542ea5f8d
+MISC ChangeLog 3218 SHA256 c2be8bfc86db21d83d9f331cc991fc1e19732683bf887e171a36c2f6e10b5783 SHA512 63decf89d6f970462e218d01125a56cf65291d9215cd9610a5f026a5d51d6157918f5e7963800b4237ff40b815433780bba204adec79b3c126d3b923223530b4 WHIRLPOOL 398d99556f7b78bd0eaad54d05b7e4aa21fa5c0af8799e8a1ec0c7dce2b43241b6fced02a753027048eb431f0a72c1134d5ba2ddcb84b4f1fd3856152daf92a2
+MISC ChangeLog-2015 878 SHA256 e50698f91baa59d06d6c6c7831ff4cdac4dd4cbf249e923518f7d28fc333eb8e SHA512 269827fcb6382e577a4706ce0dd7823894f57dcdbb987add2d1da5c86928c1f7aff47b45ac3d43879b5a72c2efc42457585fb0c769c1dd62436843a962d9bfdb WHIRLPOOL d0c97c39ba9c962c0b2d291667b499cfdab466ae1560407bfbc2827c61ff09367586ce8ed8d352a3bfac2d5c6a9139b71136c7c7118aa724521f8bbb7db5b6f6
+MISC metadata.xml 308 SHA256 c5d44b0319f8c0a082db8d431f961e7e88c412c48a5aee7ade8d48210d1ed7e2 SHA512 06df1cb87c23af8446b55a5c3da9617686a03547ab9c1d4cbaeb53759f789961963ce947ccf559db057c01d0cebf8da1a37fe46da9133932717aabfb40a7e177 WHIRLPOOL f283bbb60eeaa95437875f9ff3cac0b3fb79b3c5fbdcc6510add8decfc30a03e03f89de9d40c9c383f59ce59b7eac337167d798bf57bd94ed39007d532b5a503
diff --git a/dev-python/toolz/metadata.xml b/dev-python/toolz/metadata.xml
new file mode 100644
index 000000000000..5d207d14c2ee
--- /dev/null
+++ b/dev-python/toolz/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">toolz</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/toolz/toolz-0.8.0.ebuild b/dev-python/toolz/toolz-0.8.0.ebuild
new file mode 100644
index 000000000000..6479082d57e1
--- /dev/null
+++ b/dev-python/toolz/toolz-0.8.0.ebuild
@@ -0,0 +1,19 @@
+# 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
+
+DESCRIPTION="List processing tools and functional utilities"
+HOMEPAGE="https://pypi.python.org/pypi/toolz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/toolz/toolz-0.8.2.ebuild b/dev-python/toolz/toolz-0.8.2.ebuild
new file mode 100644
index 000000000000..dc0cf7b2c986
--- /dev/null
+++ b/dev-python/toolz/toolz-0.8.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="List processing tools and functional utilities"
+HOMEPAGE="https://pypi.python.org/pypi/toolz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/tooz/Manifest b/dev-python/tooz/Manifest
new file mode 100644
index 000000000000..886ec8be0326
--- /dev/null
+++ b/dev-python/tooz/Manifest
@@ -0,0 +1,6 @@
+DIST tooz-1.48.2.tar.gz 78227 SHA256 0e8dcd3b8cb9d204b556f74309dbb0d412c773dc17264aca9edd5ff78f7d601d SHA512 47d3212e082c509fc44ac8baff6e66c490f065652f7fb1ae7791efcfb228d7ef4c17450727e81140810b9912bc2ab5bc18cac5f72c010e705bda0b2ee1b47d9c WHIRLPOOL fb24ef05f4092ec6608088d56027a57343271a77e65c564568ca224c1e72fa37e8f231cf55f1e0731281b8f81010d0767da628729cf06eb06803a448feffa083
+DIST tooz-1.58.0.tar.gz 81688 SHA256 83244f34cbdfaafe1faea6d9250c5fcbd9acc7955808fb83532a643549cd8a1d SHA512 44886aed3b37e2a9cb2896fa30e22c7101f19fa766c75a2d7c82c9bcd13b47804ba6d140fe65d2b7c7f3ce3e12bf2f19fa1e92a8e147103204a608aba28f5ccd WHIRLPOOL b9c8dcc685f1469a9f33e637bc9edbd77ec4b6215da3bd95d1d76088d39ab031356faf9475c544b537e98b2a6bed444bea252d16a1b6dc8ba47b5fd098e4d13e
+EBUILD tooz-1.48.2.ebuild 1124 SHA256 77e967b70f913f8e3b32a640d459551b7ef1bb2a6ba87c60a8e6ce5c85cf2c5a SHA512 3f973f5897bfc5abdf1a43e15dba4c76b125e059d975999ba3c5e537f6ed1f9678213400c73c46afc3a2a8abe61cf45cb6866690890692ba203c02fa9b64987a WHIRLPOOL 7647ef896373f865d0a957eeea1aff2fe6a72c45668e6809c6794db59531a72b1b2d160e4234cf019b361586e084b150b806820aa591f8327657ef66a00e9a45
+EBUILD tooz-1.58.0.ebuild 1124 SHA256 77e967b70f913f8e3b32a640d459551b7ef1bb2a6ba87c60a8e6ce5c85cf2c5a SHA512 3f973f5897bfc5abdf1a43e15dba4c76b125e059d975999ba3c5e537f6ed1f9678213400c73c46afc3a2a8abe61cf45cb6866690890692ba203c02fa9b64987a WHIRLPOOL 7647ef896373f865d0a957eeea1aff2fe6a72c45668e6809c6794db59531a72b1b2d160e4234cf019b361586e084b150b806820aa591f8327657ef66a00e9a45
+MISC ChangeLog 1022 SHA256 710e3f622195ff26c16e0b6171260a7822a266ffa245212d494f4c7bb9cc0bcc SHA512 b4cceb24d8b6f18b5fad7fa0b7ded7ee05a4d5402ccc61a8b18d2cff65a6f9c6c3cc2a5941f7981a6a4dc4654ae121048415b0e9a212ca25a1a5ee03f9a5c6f0 WHIRLPOOL cd68c99a7dd95bf672d58227b6164b176bcb7e0b5881e2d700edec6156e4602263d8bd6c66bc5e83aee5ebca77f40b4bd3ee76effd5ea7d100cb0e79ffe15951
+MISC metadata.xml 614 SHA256 154274da8d2ffc8f3e68e7ac790ab6ba3a3d49325cdcdcfb7519d81e517cf448 SHA512 2185ff992babb09b9c51b350c94237ac4d48e3b10ee118871f59aeb2a265f34b86f798b46c272db76a976d83f1cd005a01e4c965476227334084b0e1ff10d1d6 WHIRLPOOL 987df77c25630d390acb68d7121aa8500079d3feea629c7da8c8dea2bc20ae15fc4ca44c3d9ba30eec9d03f18ff9711aa4cb710886e6fe3f5ebe8eef635324ca
diff --git a/dev-python/tooz/metadata.xml b/dev-python/tooz/metadata.xml
new file mode 100644
index 000000000000..e3ccf7995f0e
--- /dev/null
+++ b/dev-python/tooz/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+    The Tooz project aims at centralizing the most common distributed primitives like group membership protocol, lock service and leader election by providing a coordination API helping developers to build distributed applications.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">tooz</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/tooz/tooz-1.48.2.ebuild b/dev-python/tooz/tooz-1.48.2.ebuild
new file mode 100644
index 000000000000..70e4801997bc
--- /dev/null
+++ b/dev-python/tooz/tooz-1.48.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library centralizing the most common distributed primitives"
+HOMEPAGE="http://docs.openstack.org/developer/tooz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/tooz/tooz-1.58.0.ebuild b/dev-python/tooz/tooz-1.58.0.ebuild
new file mode 100644
index 000000000000..70e4801997bc
--- /dev/null
+++ b/dev-python/tooz/tooz-1.58.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library centralizing the most common distributed primitives"
+HOMEPAGE="http://docs.openstack.org/developer/tooz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/torment/Manifest b/dev-python/torment/Manifest
new file mode 100644
index 000000000000..c1a84f806ba6
--- /dev/null
+++ b/dev-python/torment/Manifest
@@ -0,0 +1,9 @@
+DIST torment-3.0.1.tar.gz 33908 SHA256 06f4aa429fa68255512cd9fffbaefad85a06afe4bbc5e3c293c33a72184fe46d SHA512 c57451d18cf90204247054fcc9717d8b3587e8be38433d907f51703c3f571638793cc5078cc5ad9e0ffccd024251a086e2d1dd47ad92fea89cc65a8de6c2a7c1 WHIRLPOOL 50bc8f1fbcdf6553ecf21580b6e7df802235097ebad829cca1b964806e265fc401f7a5d4200267a9a6d3c11fbe7d5986177b2aa3d8032da4260cc33c3a794120
+DIST torment-3.0.2.tar.gz 33955 SHA256 64f053082bd4a1dbc1f4218ed359c45c27dd58ea1a0b62322249cb6d06ab52f9 SHA512 92361c2e4f5aed05e290be2de21648ec52040ffc77c693c177cbd99bbd98f443aa2adb5caf10bc8f7a44573c44a0148afe103d228af4ee00576bb9ff0a1d200f WHIRLPOOL d94c4785e93c6277ccd3d2ce68c650be00262f0451b04bb0cdc0e7d5ad84c27cc7a712e2219f4be3419c21f80b755593bc93ac11154b31fdd845b376caeab19c
+DIST torment-3.0.3.tar.gz 33976 SHA256 0c66837386df9286b4c66d4e8de5113e118dd44dcccdbeaa188bbfed67d94082 SHA512 85876668ce2ee898f876711aa11186ee2edb092ac1b768ee828670a6aef8bfc9cbcdee4aa07d8068ebed2edb60aa0774d74d2e7976a6c021ae5264aee1e83fbd WHIRLPOOL a1c83a225a0f7c7e16ee433e1a5980d6294c432ae612b8fbe9f7dc8959b8a42ad983974bf377b91a8f831f9acf142b611a47b1c7303c4cbaf004f6ac7b4b93ae
+EBUILD torment-3.0.1.ebuild 942 SHA256 c9e6271ddc17ddd77a85b33f76fc5a83ddfa3f2948587004099dce8d924acf8b SHA512 4aecaf67022326b117d7937716da6a06768b6a7ad4ed4b9361e49e8fb2b13772242e63b43650db3182dd19a5dc3f59a2efe3ccd835922d1efa9b33191a9f80a3 WHIRLPOOL 0a4970b5dd51038fd90f60173cfc60ad5e82ed2be6b5cfc786ca45c342dde90d2929e86221b3cd5bed5f01243bc047720ec4bd8defaa2ec21eba912062a3efaa
+EBUILD torment-3.0.2.ebuild 942 SHA256 c9e6271ddc17ddd77a85b33f76fc5a83ddfa3f2948587004099dce8d924acf8b SHA512 4aecaf67022326b117d7937716da6a06768b6a7ad4ed4b9361e49e8fb2b13772242e63b43650db3182dd19a5dc3f59a2efe3ccd835922d1efa9b33191a9f80a3 WHIRLPOOL 0a4970b5dd51038fd90f60173cfc60ad5e82ed2be6b5cfc786ca45c342dde90d2929e86221b3cd5bed5f01243bc047720ec4bd8defaa2ec21eba912062a3efaa
+EBUILD torment-3.0.3.ebuild 946 SHA256 053cf2562a384e3ade5b27db106ad28bc8000f523fdffd0d56e11a10849d8aaa SHA512 44d442eff88f8c892d3de531fca2e8ec93b2bbddf3ea3446d9b416ee593fe08001f04c5e19e8db2790c490d46d92442e33d6dfb42afe0ca5be6c88c4077ef11f WHIRLPOOL db30740a989be332bb16c3e624c8ff71cd98974284d54ff125aae593c37110f6109c6d36b8108d5c92503177be44fe3ae1fceed34994480a28f59f1308b3bfa2
+MISC ChangeLog 4028 SHA256 717fa6595d046e8113a34f534a6e0680f5e702192b7173a6b2e304b1e879254b SHA512 cd2897c138dd8cdfc30bc628b2b1f4c082bedf1a26d520269150da68dfd92b1c92ff87076a06c3def0e770d649467fa2c439dcf6518c3a5564600b216fe4291a WHIRLPOOL eda984a3a31cd156a3f3f8fb7ef66e4a82bdc3caf18078137047db5413563966c5a6bd6110de9f4d7a915b6d2b05af8b01f62f90a01ba757fa1dd3f32bb899b9
+MISC ChangeLog-2015 1253 SHA256 bf80c1d6ce78ae795a0979e90cf1f6f72b09d59edf61de7980bf0b72ef158ee5 SHA512 91bbc11bed289ceaae8a97355910bb23db3795ad9d15831d4086817085577a168498df7abb95a392365147747f6041827da252a927defa26f9e96ed43e834597 WHIRLPOOL 1a1e3115d54fdf6983e0f31d064f4465e1f4757041ee1a87aa8db4f28e0b332036efdd3463e72dbac19aba2dfaaed8efcdec3b07919a30cfc235afe563e75965
+MISC metadata.xml 370 SHA256 2f524ce7eba6439c902a7120fc021547e0e8e69dcc746ed687ae450ced84c1a3 SHA512 610213be5534f598d317e70f691913f724480f6e966c73eb28bd74164c4d1111e24526798e77720b3277a1f1db55e039b74edc7babc0ba6f2f65eccc65ddb0e8 WHIRLPOOL 2a91ecdac6c581dc2de7400d480e6e94258bac947745b535ea65eb7b30703afcd9d20ae5b61b1d222a137ecca147c79b95b13533db209035134f7cee2dd59f96
diff --git a/dev-python/torment/metadata.xml b/dev-python/torment/metadata.xml
new file mode 100644
index 000000000000..d770187f6d89
--- /dev/null
+++ b/dev-python/torment/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">torment</remote-id>
+		<remote-id type="github">kumoru/torment</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/torment/torment-3.0.1.ebuild b/dev-python/torment/torment-3.0.1.ebuild
new file mode 100644
index 000000000000..49084fd96a4f
--- /dev/null
+++ b/dev-python/torment/torment-3.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Study in Fixture Based Testing Frameworking"
+HOMEPAGE="https://github.com/kumoru/torment"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="dev-python/mypy[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	nosetests || die "Tests failed on ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/torment/torment-3.0.2.ebuild b/dev-python/torment/torment-3.0.2.ebuild
new file mode 100644
index 000000000000..49084fd96a4f
--- /dev/null
+++ b/dev-python/torment/torment-3.0.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Study in Fixture Based Testing Frameworking"
+HOMEPAGE="https://github.com/kumoru/torment"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="dev-python/mypy[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	nosetests || die "Tests failed on ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/torment/torment-3.0.3.ebuild b/dev-python/torment/torment-3.0.3.ebuild
new file mode 100644
index 000000000000..adeca6e757cf
--- /dev/null
+++ b/dev-python/torment/torment-3.0.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Study in Fixture Based Testing Frameworking"
+HOMEPAGE="https://github.com/kumoru/torment"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="dev-python/mypy[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	nosetests || die "Tests failed on ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/toro/Manifest b/dev-python/toro/Manifest
new file mode 100644
index 000000000000..4ae2358fc01d
--- /dev/null
+++ b/dev-python/toro/Manifest
@@ -0,0 +1,4 @@
+AUX toro-1.0.1-no-test-install.patch 278 SHA256 89b64678074ea64e773d648504e4650913d2a1a96accc5e16821b2c078fe18ac SHA512 e1a7eb6ba8898a112603ac1bdb3eea692c3bc52931a617bc12343e7c60980a4bedab93584347777cd4869085872ca7b7f7c0c8a083d175e0e2597214680a5f00 WHIRLPOOL 2b90c3b17f4a39f8705b7af8ff584d550c5ee1bb385577888497235e5a3cc14fc02fa71a84b4856323a5ff4cc3d9791e4c54c64dc2e17979dd28fc8b91661382
+DIST toro-1.0.1.tar.gz 57343 SHA256 c5452e477e0d20ec459612a3be9eeed93e8dc5253423b604f73692ce628c6bc4 SHA512 a8a498868ff32dbd8ba9a0adf62b1fa2e9dea4f34be4e2701c08c7b58ef28b8daf4eab93916855a711a557049e587e886d6ba362487c151c5db34f6135f4f3e5 WHIRLPOOL a31ab1a0b33281cc7e248e297e77825a2015f57727b8d58912fabb17996e3e5e9a737de5748966abaf3db102a37e89fad2be20ca7afdc94773288f8382940d35
+EBUILD toro-1.0.1.ebuild 818 SHA256 4c37b44a908d6320f238defe2b6a0ae74e6f65ab13a929b0dc77e51b38323698 SHA512 dc71ad246e2fbc092aff1c1f22ee28c76d3cae2abc08fe2f01e714ca9cfe01aca96185f4ec3dde7d1d52ed5d5f3ef23f5bc2c086a38afb5637f8a06cd5edee01 WHIRLPOOL cfcb032e0755d5866c59616c346b04eb722df6f1d5103ead8c1bf343b7773de42a8ed9d75cfc42b05d44e6fa3931316198e7058eb7374b9cb8516a758a75e67b
+MISC metadata.xml 524 SHA256 29e6cd4ee25fb70718e049441a950e8a643d9817959af6aeb43d37be0c0d3ee7 SHA512 f95ad860f9ec86f41e8909c242e83262fc0ae48082d96891c7d00e937c8b87a1cf9585fc6c0fabe61ff5e94369c027c77a89de86415872dba47a0cb69fcb7164 WHIRLPOOL 753ab3e910c93350155ff3e59a5246fb86367555b70a18f0018b77c677f6290ce3612ef7d4b52ee42d93465cd0c46f2c71b5b5e89c479989dbe87e4d2bdb9d3a
diff --git a/dev-python/toro/files/toro-1.0.1-no-test-install.patch b/dev-python/toro/files/toro-1.0.1-no-test-install.patch
new file mode 100644
index 000000000000..637f9091ac42
--- /dev/null
+++ b/dev-python/toro/files/toro-1.0.1-no-test-install.patch
@@ -0,0 +1,11 @@
+--- a/setup.py.orig	2017-06-27 18:38:37.256325950 +0000
++++ b/setup.py	2017-06-27 18:38:48.896243950 +0000
+@@ -45,8 +45,6 @@
+     kwargs['use_2to3'] = True
+ 
+ packages = ['toro']
+-if "test" in sys.argv:
+-    packages.append('test')
+ 
+ setup(name='toro',
+       version='1.0.1',
diff --git a/dev-python/toro/metadata.xml b/dev-python/toro/metadata.xml
new file mode 100644
index 000000000000..214465d52996
--- /dev/null
+++ b/dev-python/toro/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+    A set of locking and synchronizing primitives analogous to those in Python’s
+    threading module or Gevent’s coros, for use with Tornado’s gen.engine.
+  </longdescription>    
+  <upstream>
+    <remote-id type="pypi">toro</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/toro/toro-1.0.1.ebuild b/dev-python/toro/toro-1.0.1.ebuild
new file mode 100644
index 000000000000..195bd0f7796e
--- /dev/null
+++ b/dev-python/toro/toro-1.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Synchronization primitives for Tornado coroutines"
+HOMEPAGE="https://github.com/ajdavis/toro/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="examples test"
+
+RDEPEND="
+	virtual/python-futures[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-no-test-install.patch
+)
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
new file mode 100644
index 000000000000..5c665fdc2116
--- /dev/null
+++ b/dev-python/tox/Manifest
@@ -0,0 +1,9 @@
+DIST tox-2.7.0.tar.gz 120139 SHA256 9c3bdc06fe411d24015e8bbbab9d03dc5243a970154496aac13f9283682435f9 SHA512 96088a9f77e8b994d920a8c9907a0fa50d5e0fe918e5a67673d4c30810642be2872283810d1d8b5ae9cc311605236b64343248485c4d4067b54c7b6d9f31a4b4 WHIRLPOOL ed77717cfead6e98ff31fb773b31bcf55bb8c4892c281aae68d10459f4ffe0c386d5adc7e1dcaacfffe2a17e005231d1dc51f3ddb3900cb09547eba6ed444628
+DIST tox-2.8.1.tar.gz 125777 SHA256 de0abf4e8992c056bc22afff9d969e0cae2e39452a9650bdbcbe7154793537b7 SHA512 a230f7bc48f476825ca1a879e669288b311f266f1695bac4eecfcd44076731e5581a425e36555a0db54f8a0683af31abd77ab862aa40525387e6e436ba351c37 WHIRLPOOL 18f146f0b09e64fbc656fff9a8e098422cd8abd38ea6a09e29489c9cd3dfb3e6d4540922e5ea569d0dc3323c63f8f1c132fe75125f2e7ebb6d409ee086eee6e6
+DIST tox-2.9.1.tar.gz 1855982 SHA256 752f5ec561c6c08c5ecb167d3b20f4f4ffc158c0ab78855701a75f5cef05f4b8 SHA512 ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066 WHIRLPOOL 3c82ba773ddb6fe7d72e0333d9175872e06ff4481752723bfd8720c485733295087ad8ccf3d8c6de79625fa410f4da34a82dd738bede7a0fad8811ef35505681
+EBUILD tox-2.7.0.ebuild 1241 SHA256 657694207d113803cebaeb5a07c9f21b34030e7f79b2c24d51871eb1e1ea0ce3 SHA512 58ccea388a480d5585bd3c82d9cd8bcd71933f5744fe271f9a97364d3f36fae3cd4fd0d3d77b42b9b444da2530d3cca127fb6b202f191251251f61f5bac78412 WHIRLPOOL bc4c575b2c89c87a12c12b5a26eaeccd66bb3cedb827dc388f7912e82e7cfa803aa77119783b7989a6f610c713693ce4383383a2d2e10791390d7c8e43ceb981
+EBUILD tox-2.8.1.ebuild 1291 SHA256 385b3d5fc226d9eda6ec97907eadaf161a89f2f7fa3de096b7b8c25afe1bb989 SHA512 09fa7910524b15c225995af3cd7541731de3c8f1bf038df591df6c3dbb1ff3c5c3e214ad4432559d87d64af1aafcfc2236a63df9370922f7729e25b651b049c5 WHIRLPOOL d62f63c1e62b5ae397594603774b74ff49527cd0161b4f8f70bc4e249c64e44aad545b82091762c89b12e4604bb2440d82b56a09efa9e853438d1f9fcd71f56c
+EBUILD tox-2.9.1.ebuild 1295 SHA256 87965419af82a289f972c46c1e9d8a18aa6e0c1f4e1e6777e8f40543c804025f SHA512 caaab65ecf5a786a6dbe5e99c3ef4855456eb726dcfbfefbb88fbc6f75645dec1f3b415eb19f93fcd343fac0ec96b601ba54b7cf6266b5f65bfb973bbf029594 WHIRLPOOL f96c54609b6a0ff4a5ab4ac4fb69e1987eff938d2e2ee47d1a45db2bb3304025bba3d2d4b6a81ad8c2a46d9a33229d6a0d57ae592287b63bc75f40026825f2d5
+MISC ChangeLog 3557 SHA256 9ba14b3f910bfbec716543f2b953d352998a5ffa1b861471216b356fb99f58e2 SHA512 0bc299692557dce5a8bc693a90edea1f60b2fba44ff9fb0eb7839558db8fd9c8028ad2132e5f2c14988a249a64b2bbb3cb1cb11bd07789d8e1baa1096ece90b2 WHIRLPOOL 56cd2505238b25f339ef9eedb2381106f4d751f25cae5159ab092216ec0caee55ed46fc8ffa26e27c54d9c7c6b639e3929a7b0e5a7100a464b309f65f6405772
+MISC ChangeLog-2015 3728 SHA256 65f67a42f86b059779c027f7f2a126ffc7df09b90eef30c8fb33e8d1c250e0ec SHA512 0495ee5612d1381ec4a3062e15322328beb9efe4d90ce3b769fd2171389b5e8f20aa6a745a67e2a72e0855c36d8840568ebee9c4c0dd74a418be7fc15f278b08 WHIRLPOOL 0848219920dd39b0ecd74ee5284980439a2b92513fe7d318b6680e21fc5cf634d12df8e9d4192386a38231475efcdac39df5d3362abee160a0e04588d536802c
+MISC metadata.xml 357 SHA256 14e7b094cd5c01229f88affc686b6e1575ee3b1f26af002788712cdc3a828bc5 SHA512 8955a371491a0ec5c85704134be03aef40584281a4c7cc74b3d63a0820050692ac7ebeca042b8847fe415170d83dacb27bb51a1d545da0ee28e77c7e405e59c3 WHIRLPOOL 6accb01a71131b27431f6f7841e72a108e9321a77d5ecc02b051ab4bf0d2b02217022da03ce858d533d2b7b64bbcc76de9cab62d16e6bd28ffd7704cfd950960
diff --git a/dev-python/tox/metadata.xml b/dev-python/tox/metadata.xml
new file mode 100644
index 000000000000..9a563f6807cb
--- /dev/null
+++ b/dev-python/tox/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">tox</remote-id>
+		<remote-id type="github">tox-dev/tox</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/tox/tox-2.7.0.ebuild b/dev-python/tox/tox-2.7.0.ebuild
new file mode 100644
index 000000000000..e8789438cede
--- /dev/null
+++ b/dev-python/tox/tox-2.7.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.python.org/pypi/tox"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc test"
+
+# tests need internet
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-1.11.2[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	>=dev-python/py-1.4.17[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (	>=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# remove intersphinx stuff
+	sed -i -e "s/'sphinx.ext.intersphinx',//" doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${S}"/doc/build/html/. )
+	fi
+}
+
+python_test() {
+	esetup.py test || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/tox/tox-2.8.1.ebuild b/dev-python/tox/tox-2.8.1.ebuild
new file mode 100644
index 000000000000..095e13a4c763
--- /dev/null
+++ b/dev-python/tox/tox-2.8.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.python.org/pypi/tox"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc test"
+
+# tests need internet
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-1.11.2[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	>=dev-python/py-1.4.17[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (	>=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# remove intersphinx stuff
+	sed -i -e "s/'sphinx.ext.intersphinx',//" doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${S}"/doc/build/html/. )
+	fi
+}
+
+python_test() {
+	esetup.py test || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/tox/tox-2.9.1.ebuild b/dev-python/tox/tox-2.9.1.ebuild
new file mode 100644
index 000000000000..90b538340dfa
--- /dev/null
+++ b/dev-python/tox/tox-2.9.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.python.org/pypi/tox"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc test"
+
+# tests need internet
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-1.11.2[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	>=dev-python/py-1.4.17[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (	>=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# remove intersphinx stuff
+	sed -i -e "s/'sphinx.ext.intersphinx',//" doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${S}"/doc/build/html/. )
+	fi
+}
+
+python_test() {
+	esetup.py test || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/tpg/Manifest b/dev-python/tpg/Manifest
new file mode 100644
index 000000000000..1555a97294db
--- /dev/null
+++ b/dev-python/tpg/Manifest
@@ -0,0 +1,5 @@
+DIST TPG-3.2.2.tar.gz 377142 SHA256 f33c6d2cb9e0bae78faa85e852a67437ae7128208812f126f3f01938a594ae33 SHA512 c60a8ff644377abc3edea766d33b911c85a131d0c0ca70175b7614901d316efc4b4d2fba0f17938ab104511fcfe8bd73fb4b6cf295f6465ec08f5c0ccab1d358 WHIRLPOOL 6962eec1e51e5d5d4483171deefbab84c0201816cc50b14ae427d8412028284e00e3e4af187d05297f81692beb34722000e2e34d49fcb6c3453b7426718a30f0
+EBUILD tpg-3.2.2-r1.ebuild 701 SHA256 b37a7eef60ee1016d5d21c4a4c279cfd6a395dcacc39c97ef9409b0cff0e4269 SHA512 38f8131a8b94b1c665d59b81c205a96484af6a80d51de2975e3cf50d2533e01c13a4959568dfdf511bc3863b73c58c09354d290f1e415978978605182a9a54a9 WHIRLPOOL 960cf628ec2e94dda4f6937e7fcb02b8de3ed70b996e19f6e2439377b4e4222d1bef61a551402ff408342ce07c0c8d03cb0f5d0ec758d34bb1e1ef8ad11fbcf1
+MISC ChangeLog 2550 SHA256 520cd239498880409e1f94af2b3c07ec06a45296116cfae14536a7360ecde720 SHA512 3d037a08f35036529e4e8d4d2cebbecbd5ffa422505dfe966f70a94eb6a5fd40386c06649806a6e7c6dfa4afb0a27906ea4dbbdd5a6af371426757d1f072baba WHIRLPOOL 10874805166f090f1b5834fc3e456d9e9cbc2f4490e2e8738957cd506edaa0d611542fe2526533878cedcdca2a5ec96023199e03710903a7fec00d4edaa2c9e9
+MISC ChangeLog-2015 3131 SHA256 fe141cc3e5d2afcaae310a5d15c80ef9792fee92158daed9c995ffa80719d1b8 SHA512 b07e784aaa8c4daad472c0b9bae52b05ef69f5d968cd09548864e18f7d57d6dfe7a317bfb46a63edea51093ee0f415783a362bd556d9252b325f19e277b61c0c WHIRLPOOL 7b4f2313526d3017e132c87aaba4cc230fcdb6dd19f883ad23b07ef9c705b0029f5f86674bb6ed19cafc66ffc493fb45a05f2015f79f43b31e10e31421a724fa
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/dev-python/tpg/metadata.xml b/dev-python/tpg/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/dev-python/tpg/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/tpg/tpg-3.2.2-r1.ebuild b/dev-python/tpg/tpg-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..15c65f3aaa09
--- /dev/null
+++ b/dev-python/tpg/tpg-3.2.2-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+# py2.6 doesn't pass tests
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+MY_P="TPG-${PV}"
+
+DESCRIPTION="Toy Parser Generator for Python"
+HOMEPAGE="http://christophe.delord.free.fr/tpg/index.html"
+SRC_URI="http://christophe.delord.free.fr/tpg/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ia64 ppc x86"
+IUSE="doc examples"
+DOCS=( ChangeLog README THANKS doc/tpg.pdf )
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	"${PYTHON}" tpg_tests.py -v || die
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
new file mode 100644
index 000000000000..7fb7f7e64ff4
--- /dev/null
+++ b/dev-python/tqdm/Manifest
@@ -0,0 +1,7 @@
+DIST tqdm-4.10.0.tar.gz 615329 SHA256 de907ec76d60f085dcb09f98d578ef17b30eafcc71198e8d74730eb53ee883c7 SHA512 5c7719e13f57cf7f42e81e2514ae4db5cf72b010ead25aa8bcd4ad0037e0a374bf353c15f43f4b64337142f3c2562b952b5e18aea70634c9b11d6b82af51546e WHIRLPOOL cbcf1af8964c7623fcdc2261349365decec0bfe47b863c2a56d0a396644db8b750b2d46d79c8e0aca7c0c649cd5fb3c587a6e9a3ec45c9aeccfd51fe50526210
+DIST tqdm-4.8.4.tar.gz 609527 SHA256 8be8712eb5c8476d50acda96cd799fd336261e59886ba31da8255e47533d3910 SHA512 21a43e1cdfae5ce9c1db386043391c0d32f0d0ce7b3337054296cfffbbc68a57deef77efd597a0be6805023052e84724649cb29116fd8614a21a2f28440a5889 WHIRLPOOL 734e5ef0a2174131a8298d2964346deac4011d7e37614540ee301c50335cd6a28425edbb25d563e60de593eb481774d3a7663b29860b1efa90778c5b282a4642
+EBUILD tqdm-4.10.0.ebuild 473 SHA256 31ec5bb5017df1b1ee7e13382a878b82d5966d391164c46223a9832decb04c46 SHA512 dd28063384e54dabab2681afb79b5b2911c2cb4f5fa848b76c7593d9fa85127e519aeeb38cf6ab0828965a824c2b57dcaba71ca2f3b1517157e8609807776931 WHIRLPOOL 93245e5a7ebf815c1a0f2652218a6aa2d3c394a597fe56a4cf3b55db4f944b1af3dfcee3fa8fa1e39b10510d41c22586b2ae8f681616bf54e1dd7397f054f0f0
+EBUILD tqdm-4.8.4.ebuild 471 SHA256 8dce2fe62d8191558fd1947c016a1543f3b1a2cde63619883d36be79bd47cc79 SHA512 41af95e83c05d41cb0b67d07bc65215f38bbbda7008b817f807d27f3ecf66d21749810e9852ee6125af67d226a1a85cdaffc592b3f6b8b1ff6692d894115bec8 WHIRLPOOL 111ef08719cd7bb8cf511b178cd4ded4585094ec299ba5f6b695926d0ed3da56904e595fc9475f8ec9ed05fe60d553123f25cbf06635e8d86a38e3510ffd5e87
+EBUILD tqdm-9999.ebuild 447 SHA256 d8543ff061a050711229ed33b7fbae8ad22c82e0078bfca8753164008f3f8f16 SHA512 18b0dd43b0ccd13c8fe824a63ab84acfb902867dca4c0a26754e29bf8a22d4d9582b4172398e41c1975e9154422696d07414159d5bf06adafe124d4bbd9503cf WHIRLPOOL a150f46b450fdfa4a633a010eb29063d82e316b575eba0ce719236531e946545f4a9581c20d709a4c3797cbcf1e6d555ccc8d353e8cb7aee991c8d21bdb1eae4
+MISC ChangeLog 1181 SHA256 211f839def730028384b73a248aaada6bb22d25ba5d7822cef7863d8d7b87c9b SHA512 c4cabf769917c198254dc572c196b5d950deff465b43e241306d5a98d596fcd86bdd09fe92ac4fc6931e505675feba9de1d17e300a9446592281504ee63996c2 WHIRLPOOL 99636c41f6e64df240cb1332fa6bc902e2a2df44653627aff21c418fbe2eba48a0294ced726a8d4ba31366cea9724a38e700399837ea18fce0df3455d9ac7e59
+MISC metadata.xml 611 SHA256 350733dd0b7f029c41c38a925314bde6b247f4431c05549367a574a0b8c074ba SHA512 62ef0673bcb397648689769eac6e735f5de8a3df69d41e63a04b2e9b79cef3fea64c2183ab9bc83827dd7d1e1f982b0decb17ebaee96bbf4928bd9a545fac29c WHIRLPOOL 915d17d7a4f0448b93504ef76636cf902ad63f57117f438498d87fc100a3b6d25fd98aac3ae5a36a323ae118a5ecad5dfde359cef7c6d6d04244998a72bc49c0
diff --git a/dev-python/tqdm/metadata.xml b/dev-python/tqdm/metadata.xml
new file mode 100644
index 000000000000..39c0d0d24421
--- /dev/null
+++ b/dev-python/tqdm/metadata.xml
@@ -0,0 +1,19 @@
+<?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">
+		Instantly make your loops show a progress meter - just wrap 
+		any iterator with "tqdm(iterator)", and you're done!
+	</longdescription>
+	<upstream>
+		<remote-id type="github">tqdm/tqdm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/tqdm/tqdm-4.10.0.ebuild b/dev-python/tqdm/tqdm-4.10.0.ebuild
new file mode 100644
index 000000000000..5858b25302a1
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.10.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Add a progress meter to your loops in a second."
+HOMEPAGE="https://github.com/tqdm/tqdm"
+SRC_URI="https://github.com/tqdm/tqdm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/tqdm/tqdm-4.8.4.ebuild b/dev-python/tqdm/tqdm-4.8.4.ebuild
new file mode 100644
index 000000000000..465b8244c8e4
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.8.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Add a progress meter to your loops in a second."
+HOMEPAGE="https://github.com/tqdm/tqdm"
+SRC_URI="https://github.com/tqdm/tqdm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/tqdm/tqdm-9999.ebuild b/dev-python/tqdm/tqdm-9999.ebuild
new file mode 100644
index 000000000000..9386fe7e8103
--- /dev/null
+++ b/dev-python/tqdm/tqdm-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Add a progress meter to your loops in a second."
+HOMEPAGE="https://github.com/tqdm/tqdm"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/tqdm/tqdm"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/traceback2/Manifest b/dev-python/traceback2/Manifest
new file mode 100644
index 000000000000..0d8b8c502e34
--- /dev/null
+++ b/dev-python/traceback2/Manifest
@@ -0,0 +1,5 @@
+DIST traceback2-1.4.0.tar.gz 15872 SHA256 05acc67a09980c2ecfedd3423f7ae0104839eccb55fc645773e1caa0951c3030 SHA512 84c7fc291c8f2d4cee10441cdef1820aa453e631dfa91ed58e40fc205e97a9dd2101388d5689e4fdf10edfbf06bdb5b895d1635ae7218ba0c9b697d3f95f9342 WHIRLPOOL a2bcc135f1585d777dc94992bfb5bab3ce36f00f84ab3aceefba4a0864a1b51ee523d2095906d57321e8ff22ea534b1b559a192270a154fc7c674ad6725d68d5
+EBUILD traceback2-1.4.0.ebuild 604 SHA256 67047728f51868baf252b854d57dff8534e7d5b715062479bcb770b23222eeeb SHA512 630092eb27b6e8cdc363ad1f92e8d27193eb890f33d280ae4fc349e0560a837a2420d23f7a0bf2ed392f836604767c7964fa6326581acc8904020e7ad53999bf WHIRLPOOL afeac82a0002683a1d7961dad6cb4588dd51887374edb8fc380ffb5bf0aeaa5aa46e426a43ad209839a36be68c1f0373ada273e0279c358aada082a54d633c46
+MISC ChangeLog 5141 SHA256 0d1e40b70edd357f60fb7a83a65a8402239401e2803b6de40755dcf5f9a345a5 SHA512 394ac2413b97f1eca00c0de08e68d2498a8a89d6937be2cd80c651755cc89510f95342867cd5cf6fc76a9bbf9329a9422357907e16fd23af506b05c9d9e2d683 WHIRLPOOL 650bc5432fa8b53273314721daa8e93eebb3d9b24913e6c3c0c6882c8a9901c125a0f964999c2ba30a4abdc53611a0ef4d3b846e49736df055ca351cbd583cae
+MISC ChangeLog-2015 1229 SHA256 7a41cde5234e3eea4014cb8fe885dc47547fb3f6f1a2c54af6d79ddd69b2d8be SHA512 daf44443d5d72ebf9997e10432d2925e1a136bc5941d1c02c1b129bc0630b4bcaf31ec8659cf693ccaea33ef9c352ddaae1df1bcce95c61f8af7086542b55391 WHIRLPOOL a781bf1c5e1acc1992acb2fc665b6c79b01e6b17d8f6cdf0f04b12a2721b9b4a1b3a9c2d528ae6b39f6008c5693cea6085113c820b5fecffe26482b68148f27b
+MISC metadata.xml 383 SHA256 ce65e95e87de55cfe4e5e9b695e3d91b080c5f46b6159e2d1d5a1616e53dbe7b SHA512 2d8e98fc4be84b39872f93047be2c94aadb9750c236f33ba6756fa60844091f02025ac59980b104fa50082ea7dc309bad961b3db4b512fe951947f6e52e43308 WHIRLPOOL 9be32d503ff64978ebcc0fbe18bc12d0babeb37eb4348746ee1404484ea74c9bcd10667ea280d737afe720848a82184e4f3edb1170711122f2ffebf022478fed
diff --git a/dev-python/traceback2/metadata.xml b/dev-python/traceback2/metadata.xml
new file mode 100644
index 000000000000..038bb3f6ec15
--- /dev/null
+++ b/dev-python/traceback2/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>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">traceback2</remote-id>
+		<remote-id type="github">testing-cabal/traceback2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/traceback2/traceback2-1.4.0.ebuild b/dev-python/traceback2/traceback2-1.4.0.ebuild
new file mode 100644
index 000000000000..0a92ea3f616d
--- /dev/null
+++ b/dev-python/traceback2/traceback2-1.4.0.ebuild
@@ -0,0 +1,23 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Backports of the traceback module"
+HOMEPAGE="https://github.com/testing-cabal/traceback2"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+"
+RDEPEND="dev-python/linecache2[${PYTHON_USEDEP}]"
diff --git a/dev-python/tracing/Manifest b/dev-python/tracing/Manifest
new file mode 100644
index 000000000000..d5cce7646a75
--- /dev/null
+++ b/dev-python/tracing/Manifest
@@ -0,0 +1,7 @@
+DIST python-tracing_0.8.orig.tar.gz 18796 SHA256 808a064cc5fd1972fb07a7d72b4069cbff284ac7077bcd90eb2ce79d8b5c9ed0 SHA512 9a5262ce63dbcafff83a75586e90be280ff41f902d9f71f4274dac944db4196c6a5777e290ca5e49aa010fb3129d5352d8c10a554918375557525b9a56ac9096 WHIRLPOOL 0dbe1760553177669ce9f43f49ede989f8f51e68efa8d024dc6a862d0f8f1593058d6231b41b2ead1a085a8d771c6528f99d7b77f35145484f911f5fd62d36db
+DIST tracing-0.10.tar.gz 20364 SHA256 7c65f50670fc2dc164e31f7655dedfa6702324e4226e7186c75b3b41de279c19 SHA512 3e9874d55df3b599cddc817680e49fed2bbaaf510597c4f41984a742b22c0b3596d29875f2fedcb890b3acf43cd5c52faad7de334781d9eec16676e9f10bf5d1 WHIRLPOOL 22e09507dba74678166235ab913b0b686ba42cda740288fce52a4dd165cdf53b0097f552270009b2f92cdc4d40539c3de47fd40a8242c8096ea3ceeefeb846e1
+EBUILD tracing-0.10.ebuild 662 SHA256 bcc2d72cce6b33d77f9df97b85c220c9ac59cfd369880b5d03fc569e689ebad0 SHA512 a1d054229986168cfbdd00b6dc0f787ac39ab4623bce1a06b96596afbe2cc5b300afaaaf2633eedd48aedf9d9c1fb504c02b2fc4a4ca900b26ac1c261e3829aa WHIRLPOOL 8288f939d62c4dc1913bc46b92d9103b8eb56e7e049a7563c7d61ebbe51850457ac5b667b95fab45777504ace7decc5587d2746feaef178b2bbef303f3607680
+EBUILD tracing-0.8.ebuild 709 SHA256 226d0675f941ceaced4b61bc22aee344d8a90bc3f67cdca5d370728ac4dd365c SHA512 e2dd714778c6bca2005e443e58ee55bd4101d4e93247bddcad97cbfa91baec003a9b99ff9f1972b0f08ba422e94bb0dc93bc513b43ee8882f66d9117c3ef7cfc WHIRLPOOL 10eb89abea526b1554017e80e0c61a0755148a88680943c3e7928caef5c8c6d82457250f74cdae1dc61fcfb85f092a78130c421e8dc2769540764b0ea1c46086
+MISC ChangeLog 2527 SHA256 9e7c4f252318d4815d2a9d814412f67e78a897f3f90d1f2fc0845ee78922dcdc SHA512 3b350de4f1157ee3d5bda7286b66fc3ba168080be31af6073d1a652581f2d47154cc51adbb57d47b59cdb6d738c01ecd0e0438d5734d2d163763e556686fdfaf WHIRLPOOL 500828d27d3bd2d136042fb6f7a4562c92db01f3d7837f99af44a4818538f2ae94acca895295fde55f25c231e235644aa7342cb0aa3d16871f5d8af61cffbaaa
+MISC ChangeLog-2015 1218 SHA256 05aa4fcc61c7e0a3f13a70543ad02ae430ce429861d176eeb2bdf51d22797daf SHA512 3dc58fee58f263dd1a6cb0919974ce159ee34b3a9407555b9e747181a4c3aa6d86d981b1d9f4960dada3ad29d2a08fb38a268583bf64d994440b340a64c3e83c WHIRLPOOL 0931d8f8b17d6e0566ba87afdd94ffbb97c9274b2f9eab8e49738acfeef83d2f25a5bf65cd36269001e177a70b34e06847ef4d71ef6277bd1851bef06a6f5c08
+MISC metadata.xml 250 SHA256 dc7996b965794cc38ecefc226a6b05400ff49c69553249c3d0ac69fd277b7906 SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de WHIRLPOOL e00ced8aee67f075273a4c498a4c69671eef224f7b41ef8c194ae72404c242bb93bf31a48fcf94065ab6fe8afbfb667238deba4ea4eb9bec406ace4bfcdcdc8c
diff --git a/dev-python/tracing/metadata.xml b/dev-python/tracing/metadata.xml
new file mode 100644
index 000000000000..ea6b59e79026
--- /dev/null
+++ b/dev-python/tracing/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>mschiff@gentoo.org</email>
+		<name>Marc Schiffbauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/tracing/tracing-0.10.ebuild b/dev-python/tracing/tracing-0.10.ebuild
new file mode 100644
index 000000000000..06900b879fc1
--- /dev/null
+++ b/dev-python/tracing/tracing-0.10.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Debug log/trace messages"
+HOMEPAGE="http://liw.fi/tracing/"
+SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/python-tracing/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	dodoc README
+	use doc && dohtml -r doc/_build/html/
+	if use examples; then
+		docompress -x usr/share/doc/${PF}/examples/
+		insinto usr/share/doc/${PF}/examples/
+		doins example.py
+	fi
+}
diff --git a/dev-python/tracing/tracing-0.8.ebuild b/dev-python/tracing/tracing-0.8.ebuild
new file mode 100644
index 000000000000..e47a675e7f53
--- /dev/null
+++ b/dev-python/tracing/tracing-0.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+MY_P="python-${P}"
+
+inherit distutils-r1
+
+DESCRIPTION="Debug log/trace messages"
+HOMEPAGE="http://liw.fi/tracing/"
+SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	dodoc README
+	use doc && dohtml -r doc/_build/html/
+	if use examples; then
+		docompress -x usr/share/doc/${PF}/examples/
+		insinto usr/share/doc/${PF}/examples/
+		doins example.py
+	fi
+}
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
new file mode 100644
index 000000000000..90e09be7009f
--- /dev/null
+++ b/dev-python/traitlets/Manifest
@@ -0,0 +1,12 @@
+DIST traitlets-4.0.0.tar.gz 63701 SHA256 0b140b4a94a4f1951887d9bce4650da211f79600fc9fdb422acc90c5bbe0233b SHA512 559730dbe9f5f0e75c867cd514c91a3e862a23a9e019d3883b4be66b6208980a583f39cceca4f20e409bd44335a367e7fd5654db0128bb7a735311e6b2c32f24 WHIRLPOOL 492a7a561649ea1a43ce5f45abf13e74d8ace7937e2cf0956b00fe1f650a541af8da0df5d8327bb071c4f03650a44c7ca548e8c61ccf95cea557516fa6d5b862
+DIST traitlets-4.1.0.tar.gz 76828 SHA256 440e38dfa5d2a26c086d4b427cfb7aed17d0a2dca78bce90c33354da2592af5b SHA512 4000ca3014b3916a16735b0c96b4290ca25a750bc97ae1d65ed7932e84db1d414ae6d0955192a806e878fb4e6769763296474cadf153673fcae7b41f5887a235 WHIRLPOOL b20ff505681cd570d88bb380289f93fe1a880eb873645090b14acc946fa6a5f4595e086390021970fcca31518eb2363ef91779e781ee81d63fd87560478e7d2b
+DIST traitlets-4.2.2.tar.gz 79332 SHA256 7d7e3070484b2fe490fa55e0acf7023afc5ed9ddabec57405f25c355158e152a SHA512 1deff1dea59d4f0616510f2f80bc990db3626b83c32784658f3f273ed093221760ca9832bbdbaa15a85cb8cd5c89a795f941b439b244bfd5d390da826f7a69a5 WHIRLPOOL ada46ed15c8b8e822dc6480472c97e559532e0ec1cfb5bea83c6c83f1b2974f475512daf0026c57dd78978dcc6c416411dac2d1af3d51bd06d23358b1c0d3fa2
+DIST traitlets-4.3.1.tar.gz 88108 SHA256 ba8c94323ccbe8fd792e45d8efe8c95d3e0744cc8c085295b607552ab573724c SHA512 f68f381c3233a7703d8888a2eda15ccae6ca70a8d0e93d03eb6d646205fe24d03a116c8f1f8ee6d4470eb6267880e8e91c9e2354f1b551b798b6e1b2d80deed5 WHIRLPOOL 39998d12836822bdda2b36f3d92c893e256a47e1c329001b4dd22b438cc91aa7be0b00f0f924a9ab63a019e5be552f104c1b449943a02d044220a5e7a6d45a74
+DIST traitlets-4.3.2.tar.gz 88173 SHA256 9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835 SHA512 4f3239bc31af224814c8181dd1ac0fe5287160aee48b2b0f54afae841c8a9d7eaed010082044b6d16f91cd970bf0aa1eeba57d4503dd919fc8c4613ac5150ca9 WHIRLPOOL f61682a9b5a49417d385cb4e3dfac8c51d844883ef8fb5665f9a3988dcf4297da03ee0326bac6c24bb9812f7397d181a37d6c2334f2dd5521592e5b99beab1e3
+EBUILD traitlets-4.0.0.ebuild 1150 SHA256 fd5d3b7cc5d80d89bf2a722137464210fb14e0b94d96211f96ff957d88395f1c SHA512 68b95ddfa01c6b08159494a07f41a7fe794bef797a69d77bafa8e441284fbf04762d86200e0568b5386155ad76e6a7feda0ae58d53835808735dda4357154953 WHIRLPOOL f0cf6c39258b434fe471d05dc893054d7448f1af07a743769b082480c2c7da4f80b49844d7a547c0bf6fd5a7b51d1084c41c79da1ef846b08d7def45e2aa20ff
+EBUILD traitlets-4.1.0.ebuild 1122 SHA256 8c37492342d784eb08ef57038eda64d6859a5fa3fcbc2ecf7fd85196e0ac6d57 SHA512 88f98a66aa92593a8ae06c733ae90a24ac9f08fdb891548dbb993e202d7c6fdd6adbc343c39857f3b68712036f8fc09552ea08ba5a592b824eefb5519c265203 WHIRLPOOL f14dce249413af8af1bf01508258b87bbac00d7b63b6fe39c44a821e4037a0de1a9ee55b6a3ca6d8eff4a6fa4683454808d927532a7f1b24a7996c92d57e99ff
+EBUILD traitlets-4.2.2.ebuild 1278 SHA256 f87eaaacfd5e34556bdb24a5ce7f404f79e6e7f7eef925591698ca6c9b19b754 SHA512 69988da029fd6e8ca554aba88896f15c9e13581830c3474c1d157fb8d6c4b5c8739f6d1e1a44f9058cc31a08bdfc0e1f0ecc22b56bfd7a89e1705126387563ac WHIRLPOOL b2f20664529266e224c96cb6b81ef604a3fc3ee04652eb44bfa8c1df23a77752452cc45b09aa061205fc5720c26262a63dd738d20d197688b9f136b08dc9d219
+EBUILD traitlets-4.3.1.ebuild 1279 SHA256 b9a2a8331db32063bcb175f131d120a23f24fd52ed3ba1f66084b26be56be332 SHA512 296ac6bbacd945bfa58854043fdc471b4abca44b5b414bcafeacae6d354f83883466ab2fa6acbf16312afc89d275a1ac0d89d187a5dcbf2ab7d3c584931e72a7 WHIRLPOOL 014078c5769ba8d82458713374637323d8da6bdb4498f223ada735b8f3eb0ad6b600b84cf590c3f4c77cae86969f4c442023974008a4923be21416800267aad2
+EBUILD traitlets-4.3.2.ebuild 1225 SHA256 dbadf2396bd84362c6168b601287fe570183915a9c02d6cfbcb947eada7b8be8 SHA512 1c78539e5186c4e3bf0892318a19183c0aaec2301cacd31aa198b426177efdedaeabc6b840a00c4345ff6f7dab0db6bcecd4fc2bd0f104ba02675cde4e6e10f7 WHIRLPOOL 3cd497dba58b26963d02ad935b11292e96c758d9f2d61626e58a5d79ee2af94b4c4c493c17d1e8b7a1ca84fc2174a6913f60103015813d2005f9065a74686ed3
+MISC ChangeLog 3250 SHA256 21f9aa02e86eb7c0b5fcc1d6e150c5defe324496e18cca22073411d079ef56a7 SHA512 c7f08f32a71b56b1f7c3db6b026227203c49248976437139cdfd3917cb93a7f26164328c3070eed83b5e5b97d7b734f442e8379e9563d9afeff3367d85a2cf43 WHIRLPOOL 0803222cd966654b7c9794587e9e0d0b547c82d5eeeecb2573b17cba7a415606f1ca9ad2b02d60f66112a3e9ffaa4d772f663c9197ec810c291f12135521f11e
+MISC metadata.xml 604 SHA256 2e606a1a4bdb5e8b93dee903f5da1d09564d075ee3b3fe50d9c4bd3ca83ab6c8 SHA512 0a7e7a4383b50e9c362a5135315d325f226640255521eb507ff7741a61ffe7a91a8a5896e641596d6ee83c1b70e8727e1820e8b29d53e466239d007b1155e221 WHIRLPOOL e9e1464983a507ef826f5a11f9fe25ec54a345840fe1ac487f00ceeac90c4656e672e6520be7acecb47c3ac2bfdcf21f4fcde1709918d80993f1dcbec716042c
diff --git a/dev-python/traitlets/metadata.xml b/dev-python/traitlets/metadata.xml
new file mode 100644
index 000000000000..fa50e6184913
--- /dev/null
+++ b/dev-python/traitlets/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    A lightweight pure-Python derivative of Enthought Traits,
+    used for configuring Python objects. This package powers
+    the config system of IPython and Jupyter.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">traitlets</remote-id>
+    <remote-id type="github">ipython/traitlets</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/traitlets/traitlets-4.0.0.ebuild b/dev-python/traitlets/traitlets-4.0.0.ebuild
new file mode 100644
index 000000000000..68a55b3690af
--- /dev/null
+++ b/dev-python/traitlets/traitlets-4.0.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A configuration system for Python applications"
+HOMEPAGE="https://github.com/ipython/traitlets"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	doc? (
+		dev-python/ipython_genutils[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests --with-coverage --cover-package traitlets traitlets || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/traitlets/traitlets-4.1.0.ebuild b/dev-python/traitlets/traitlets-4.1.0.ebuild
new file mode 100644
index 000000000000..729d7cbd0002
--- /dev/null
+++ b/dev-python/traitlets/traitlets-4.1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A configuration system for Python applications"
+HOMEPAGE="https://github.com/ipython/traitlets"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	doc? (
+		dev-python/ipython_genutils[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (	dev-python/nose[${PYTHON_USEDEP}] )
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests --verbosity=3 traitlets || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/traitlets/traitlets-4.2.2.ebuild b/dev-python/traitlets/traitlets-4.2.2.ebuild
new file mode 100644
index 000000000000..9b2c4e64fb37
--- /dev/null
+++ b/dev-python/traitlets/traitlets-4.2.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A configuration system for Python applications"
+HOMEPAGE="https://github.com/ipython/traitlets"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	doc? (
+		dev-python/ipython_genutils[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test --cov traitlets -v traitlets || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/traitlets/traitlets-4.3.1.ebuild b/dev-python/traitlets/traitlets-4.3.1.ebuild
new file mode 100644
index 000000000000..4e4ef72acb87
--- /dev/null
+++ b/dev-python/traitlets/traitlets-4.3.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A configuration system for Python applications"
+HOMEPAGE="https://github.com/ipython/traitlets"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	doc? (
+		dev-python/ipython_genutils[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test --cov traitlets -v traitlets || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/traitlets/traitlets-4.3.2.ebuild b/dev-python/traitlets/traitlets-4.3.2.ebuild
new file mode 100644
index 000000000000..d343cd093c62
--- /dev/null
+++ b/dev-python/traitlets/traitlets-4.3.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A configuration system for Python applications"
+HOMEPAGE="https://github.com/ipython/traitlets"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*')
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	doc? (
+		dev-python/ipython_genutils[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	py.test --cov traitlets -v traitlets || die
+}
diff --git a/dev-python/traits/Manifest b/dev-python/traits/Manifest
new file mode 100644
index 000000000000..2e1b5e4c1d6e
--- /dev/null
+++ b/dev-python/traits/Manifest
@@ -0,0 +1,7 @@
+DIST traits-4.5.0.tar.gz 4853612 SHA256 5293a8786030b0b243e059f52004355b6939d7c0f1be2eb5a605b63cca484c84 SHA512 d506b4395395898eb824896d299bfcde609e100025cf9a55cd7d7c47615545efd3b007e46549e564fbfb2d5882b36ae676843f211f168b2557c504849c5ef582 WHIRLPOOL fc9a1c41d09579df7cbb63ba17696b343bda707f0f95a2a5dd289b36fa4ded8088ea46f03259f616d9f081ff20fbce208adbc7913e0466ee6de56bc7e08718ae
+DIST traits-4.6.0.tar.gz 434937 SHA256 5d82345e0a34b88e394964eea1be47419530027aef7f0b20ad315b6ec6c68370 SHA512 0fce336696e4cbb1d4ba63a07ad42867cb179a9efa6c348623036bd6d2eb791302539ae89994b11acd5a9f1be42a0febeb517db1716342b78aa71ca1277fde99 WHIRLPOOL 4edddc716e2af68d000f7b81e49d8a77b6e9c3b34875634efc5fa611a89e732fb2ed3088db790e7f9915c721200753b3a3c71b95570b1889427618edfebffaca
+EBUILD traits-4.5.0.ebuild 832 SHA256 762eb84cac6d475df210d368dc65d2c2a5c47796b11781afadd32276a4a47fee SHA512 08fbbf2ed5793a3410201ee7ac2f74c763067685ad533eeba87aacd751dd1a8682c3befae2c13ddc128a38a1c60abdeec3ff9ab08c94bfb6b65746bd55ffc89e WHIRLPOOL beaabecc01c24c79c436429b7650e849312f7b386c3c3530637f914dff2c58f3af8e41ca9be1bea97a04d527dd2a3a79e67d4a2fb7c6eb529d9f4faa50ff8360
+EBUILD traits-4.6.0.ebuild 874 SHA256 2a9aae10ab68a1930cb0fd8da1eaa135ab3c64cc416b8b5525a9e700d56813a2 SHA512 a2c8fd3f6ca5e1050cef451a73688c91d2bebd4fb9bce40ec0f6bec6f1905035c12ffc68b1a8389be4651ebd79d2d19718d4e0944b98ce48fc1d1f1501f0e81b WHIRLPOOL a3ff9b9ab0af88b88ec1d7a1bec7b4ecdcf14ddd6153e018a2ec70d6ed76b7ba24ac17a0b9c877076ef8889456188570d85d08ffca00f6d62e1277974ef5951a
+MISC ChangeLog 3207 SHA256 790047102bfad9776ba8b6d62c2518520defa2d61aa61a2e1d7af74a4d72885b SHA512 682d546d5abde4f94ab8275984d1fd61ef50cf57b580965d03fad85a8f825ceea9498b03b45948126f62e092af896e148443b8124011204196300542271b9081 WHIRLPOOL 0f32a280d30665fb92f3754ae07825475b00af9449218fbe09107ade0d3bae232cdb1504fcf952b37185510b361d81f4a654558c59976d42db63ea2e59d7563d
+MISC ChangeLog-2015 6185 SHA256 d32c3c28bae6728b1bbc61cfe7c72a92080499aa162700f2cdf7b11472fcda94 SHA512 b2ebea5d919f0e4563fac388c6bf9756393f17e7159df4d4252da22f639668edafe2bdaa633c02f8bfd1b5d300ddbc97cfd9ff32bcce8da05dd77e1cf4d939a5 WHIRLPOOL fcb3e2bf0bd099d821ae4ff9a6d3b791ec113c4b2b130ea34cdecb1291f9a83f62989966807988d4c7d2e95221dfb04d23a4a460ea389446bdbfa99699c17d0a
+MISC metadata.xml 1253 SHA256 11ec36c27bd1e49b7b16c6024cfbbbd6c9e42cf3e1ca76f5d0a486612595e983 SHA512 8d5c170b3e29d2e6af8597315ab74a3da39da0dce828005942d9c69dcdcf52eb455327d2c7eec18416799f7091db7dad011834508826c63edbfddd6fd2f891e9 WHIRLPOOL 180a3d87a362bcda8761923d12d25b72ae88bab0f2761ac7b53a5d3884d5890bfa1c904a354bc13e6159ac259145f46ae8af5648d80353e63036080171fc5588
diff --git a/dev-python/traits/metadata.xml b/dev-python/traits/metadata.xml
new file mode 100644
index 000000000000..434824c9e015
--- /dev/null
+++ b/dev-python/traits/metadata.xml
@@ -0,0 +1,33 @@
+<?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>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		The traits package from the Enthought Tool Suite provides a
+		metaclass with special attributes that are called traits. A trait
+		is a type definition that can be used for normal Python object
+		attributes, giving the attributes some additional characteristics:
+			* Initialization: A trait attribute can have a default value
+ 			* Validation: A trait attribute is manifestly typed.
+			* Delegation: The value of a trait attribute can be contained in 
+			another object
+			* Notification: Setting the value of a trait attribute can fired
+			callbacks
+			* Visualization: With the TraitsUI package, GUIs can be 
+			generated automatically from traited objects.
+	</longdescription>
+	<upstream>
+  		<remote-id type="pypi">traits</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/traits/traits-4.5.0.ebuild b/dev-python/traits/traits-4.5.0.ebuild
new file mode 100644
index 000000000000..f30ef234160f
--- /dev/null
+++ b/dev-python/traits/traits-4.5.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Enthought Tool Suite: Explicitly typed attributes for Python"
+HOMEPAGE="http://code.enthought.com/projects/traits/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_prepare_all() {
+	sed -i -e "s/'-O3'//g" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	nosetests || die
+}
diff --git a/dev-python/traits/traits-4.6.0.ebuild b/dev-python/traits/traits-4.6.0.ebuild
new file mode 100644
index 000000000000..cfc695b51c52
--- /dev/null
+++ b/dev-python/traits/traits-4.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Enthought Tool Suite: Explicitly typed attributes for Python"
+HOMEPAGE="http://code.enthought.com/projects/traits/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_prepare_all() {
+	sed -i -e "s/'-O3'//g" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	nosetests || die
+}
diff --git a/dev-python/traitsui/Manifest b/dev-python/traitsui/Manifest
new file mode 100644
index 000000000000..2ac6f3e1fb08
--- /dev/null
+++ b/dev-python/traitsui/Manifest
@@ -0,0 +1,7 @@
+DIST traitsui-4.4.0.tar.gz 598148 SHA256 68a10c4f86cf0f5ba5d9fac5caece73e0a76256a4175efcded5edec03949cf60 SHA512 bd563330aa80acbf4087b54f42ffb94856495cf82da8b9c5ae54bdcda2d2544e4293a427ed3b28de7622c2fe063cd14f969b894735eb81cb4932cc3e2ad27bef WHIRLPOOL f49f6278d1b9ec0cc35af5f5f8b695c34082fd3ae8acdc0990634b15305d09b5f975f8906e568ca8ca25a746822c1d11c0c2c7933ad429856ec614fad51c84b6
+DIST traitsui-4.5.1.tar.gz 6692940 SHA256 452bfe7ffb9e38948cacbcfc66cc922cec3a3cb415e5fa02ef0d756ea673104d SHA512 b329d79515752e74834ac31c10d20fb75286c8b1ceab4ec7e8cdb76db586d796dcd5aa038318915e828d6ac86428b60d1e21e94c37edc45e7cb4950305252291 WHIRLPOOL a05d109200cb99998d354812bec36d101179f3be269f29e9f750290d779be6e21317851490b81b2666af09280e5ab264f99a55fb38636cfbaf2d052495d31b84
+EBUILD traitsui-4.4.0.ebuild 766 SHA256 f070eb5b31d45b7fd3d2980c73e592929bbe21df4998f00bde7e63ef53272647 SHA512 5cc0c85a0011a2547424f472ba18a26e68f029ac5eefadbe9987e7ce91951d1ed8bca17c128e73eb20495a581c769af6e3d034d69d0ef348697e92e3694e713d WHIRLPOOL 1d75494f7cecd80db62769b4d01e45286794be85eb32ef66351ae778cc1b96e11fc2dbf9e00ca79272b752dd6135dba31e28b98e08d3b49513340e51ade411dc
+EBUILD traitsui-4.5.1.ebuild 876 SHA256 6913264570181e7e4902e74a7dc56830a9dd5c3bcb297f34220ac6db7cc272f1 SHA512 c793011596f372db2f663f5afa713a84649dcce34080b826b609b53bda6246c0522ab3f7f57f4d2cbf25311d7210041e7621d6f008e4567410e96bad400fb8ca WHIRLPOOL 6f1dc76e205922fbb3667b5e879c1f919a1c1694ea54550a58fd95d1faaeae9ab29a22394c4600fea9a2749a17cd221a7ff25dd50a7987bf3666296e0f8ceb9f
+MISC ChangeLog 2880 SHA256 4791a15f5a9f008f769d52ae2b2158f23b914a6a91deb52ef31439ab8878d577 SHA512 f36f59092f83cf7591219f30188e95d5ab56251b764ae351c5195eabfcaad90718d88f6926885e40ee2a57d608416b24b63890d01bb56a9ab272dc459ad0dd15 WHIRLPOOL 77468ddf104b77ba3d0eff384fa86794a8bc2ad68d5db7c917f46e91cab35bae8c015aa91b7a8810cef95615dc07572ad9e7f658b67f660c55cc327f3694087a
+MISC ChangeLog-2015 2202 SHA256 33d4c8f15df55066cae9eaa694e0bb8edf54f9bcca580652571b98a65d119dcf SHA512 eada8a923a8f1073d9fb9086864add3525d576b4c118702fa18f5898e677fac690eaa7e2deb7e46dfd3daa03ba8ade27865022f224742a745d447873e8d58243 WHIRLPOOL 537e7298c70f86225a71c85ca185110958e12c420ad700833cfb0e8166d3ec4bebe845b0ef6e411ed00e4984854cbef044fc8cfc4e714cdf06cd88c5cda6dce1
+MISC metadata.xml 777 SHA256 699afa3182fa2c10be2de62102863afb81875956214793acc74c32ccbbc4f185 SHA512 26e35cf4592228611b36d8dbc86948b76806416f5ed06abd50befe49b8831d72e2178d1852eb2a3d1e15c29fae2898ada2d78b41a24f7e80360d004d67ad4c55 WHIRLPOOL 22e9aeb2fc38e7cbfb2195f8b019ac99224f4272791694a4798f4e81dd0e3d15c1101e5a147528e3630d2c358c23f38998f8077e92aef59b3b129730d153dc93
diff --git a/dev-python/traitsui/metadata.xml b/dev-python/traitsui/metadata.xml
new file mode 100644
index 000000000000..138ca56bb435
--- /dev/null
+++ b/dev-python/traitsui/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  The traitsui project contains a toolkit-independent GUI abstraction
+  layer, which is used to support the "visualization" features of the
+  Traits package. Thus, you can write code in terms of the Traits API
+  (views, items, editors, etc.), and let traitsui and your selected
+  toolkit and back-end take care of the details of displaying them. 
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">traitsui</remote-id>
+    <remote-id type="github">enthought/traitsui</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/traitsui/traitsui-4.4.0.ebuild b/dev-python/traitsui/traitsui-4.4.0.ebuild
new file mode 100644
index 000000000000..ed0c8e23f727
--- /dev/null
+++ b/dev-python/traitsui/traitsui-4.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Enthought Tool Suite: Traits-capable user interfaces"
+HOMEPAGE="https://github.com/enthought/traitsui"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pyface[${PYTHON_USEDEP}]
+	dev-python/traits[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)"
+
+python_test() {
+	export ETS_TOOLKIT=qt4
+	export QT_API=pyqt
+	VIRTUALX_COMMAND="nosetests -v" virtualmake
+
+}
diff --git a/dev-python/traitsui/traitsui-4.5.1.ebuild b/dev-python/traitsui/traitsui-4.5.1.ebuild
new file mode 100644
index 000000000000..41b4a0e5c918
--- /dev/null
+++ b/dev-python/traitsui/traitsui-4.5.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Enthought Tool Suite: Traits-capable user interfaces"
+HOMEPAGE="https://github.com/enthought/traitsui"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND="
+	dev-python/pyface[${PYTHON_USEDEP}]
+	dev-python/traits[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)"
+
+python_test() {
+	export ETS_TOOLKIT=qt4
+	export QT_API=pyqt
+	VIRTUALX_COMMAND="nosetests -v" virtualmake
+}
+
+python_install_all() {
+	use examples && EXAMPLES=( examples )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
new file mode 100644
index 000000000000..e750912d7e01
--- /dev/null
+++ b/dev-python/translate-toolkit/Manifest
@@ -0,0 +1,5 @@
+DIST translate-toolkit-2.0.0.tar.gz 1106464 SHA256 aa6c68c786ec82f7bcfc03ac39c4dfe4669a45efc8e2fe24470fe61aaef8c41f SHA512 a349f64438683bb00a7a7ba0537b7c9a268e6222d2df67991eb5d47b05a446a6049bf42918edc97ba8b08a89a42850eb37f6b4b917ccf5c44494885a853ffe1f WHIRLPOOL 52d620c73b7feed483dd32aa8e28493ac7a9b610bafadce4effa58106d07bc8e2e3165e6a512c6c678f7a7fb980c2e69f134a992d55ef2b0f62a42596a0e3e3b
+EBUILD translate-toolkit-2.0.0.ebuild 2120 SHA256 da7d8537455a297e00733e122c8941c199b7186582baa88c33cbf11a1c43999c SHA512 1fa09202e57257a6afcfd91df7e948ab5e761124df084e8d784a73d8abc5d0923dfc77465c1dbeff70c4ec5b12396035300932827a3e3ec1b11a818a784027c3 WHIRLPOOL 1277a60205c29908e52c68540f32f3b13af085cd7b6f2d97b2739b88a4f39b253e2bf4db1207d42ee882b1a5e54bab749ce22f7148439ec3228ca5e11ca84fa5
+MISC ChangeLog 4570 SHA256 6b99ff0d57b6b3a293b46a9055c899cf99b50aba37bc73c3e3adf5f70568cd41 SHA512 dfb01434b30010435420fcb661e9a435bd99e046d60cbf386b3f69a5c26be03c02c4b95281caf400e017c61afd702c68531502301b58eb2310315028c3b5fb7e WHIRLPOOL 73bee43ba12f2a407ea527c70aa54b168216222568b42af33b97706610ee46653dcea1390cbde9d1fe777697530caa0c5748c3c1a69d10daadbcb79b8b211d2c
+MISC ChangeLog-2015 2560 SHA256 35074990b71360ebba8f55cef68b53e708f92d95d306ab0ea13986764b677496 SHA512 d62d736d441f855869ec965570c8f870d0453e7bc1646dfc8c1698ffe1bffb541d166d7850d9ef3c72e0ef12f83caa3e57f144b5d267e8ecb6217fdd27e8aa12 WHIRLPOOL c6240034a05cb73c1ade1ba2a7456e3f4d3dff91aeac0ade0ea23ca595f8775367bbafc9723ae3319b7441b27dd205e37ca4f381ece80b1b7f2e139fc4c891df
+MISC metadata.xml 666 SHA256 965128cf54a532aa95397a05ee5a13b6bb9a10f9cb654256113c83831230cbc1 SHA512 34bae48b0be0aa5ef195757bded33736a051ad563ceac7be514bee3b54c67637f308d7a7844fa0657bbb4bc6ad987bd3ee9b04d65d16fdbd6d5d7791e4bd155d WHIRLPOOL 3836980ce65bb674213df362bdbf6dba96899d8d5f062179114d16b62dd3bf7f703618da9dfd487bf3dc0c53d93550e7833e177843bf8d1de8e569a0b72c50b6
diff --git a/dev-python/translate-toolkit/metadata.xml b/dev-python/translate-toolkit/metadata.xml
new file mode 100644
index 000000000000..2ec8899b6fbb
--- /dev/null
+++ b/dev-python/translate-toolkit/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="html">Support conversion between po and html files</flag>
+		<flag name="ical">Support conversion between po and ical files</flag>
+		<flag name="ini">Support conversion between po and ini files</flag>
+		<flag name="subtitles">Support conversion between po and sub files</flag>
+		<flag name="yaml">Support YAML format</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">translate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/translate-toolkit/translate-toolkit-2.0.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-2.0.0.ebuild
new file mode 100644
index 000000000000..2e794beb9dc2
--- /dev/null
+++ b/dev-python/translate-toolkit/translate-toolkit-2.0.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/-toolkit}"
+MY_PV="${PV/_beta/b}"
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Toolkit to convert between many translation formats"
+HOMEPAGE="https://github.com/translate/translate"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc +html +ical +ini +subtitles +yaml"
+
+COMMON_DEPEND="
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-python/pydiff
+	app-text/iso-codes
+	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
+	dev-python/diff-match-patch[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.5[${PYTHON_USEDEP}]
+	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
+	sys-devel/gettext
+	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
+	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
+	ini? ( dev-python/iniparse[${PYTHON_USEDEP}] )
+	subtitles? ( $(python_gen_cond_dep 'media-video/gaupol[${PYTHON_USEDEP}]' 'python3*') )
+	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
+"
+
+REQUIRED_USE="
+	subtitles? ( || ( $(python_gen_useflags 'python3*') ) )
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+python_prepare_all() {
+	# Prevent unwanted d'loading in doc build
+	sed -e "/^    'sphinx.ext.intersphinx',/d" \
+		-e "/html_theme/ s/sphinx-bootstrap/classic/" \
+		-i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( "${S}"/docs/_build/html/. )
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	rm -Rf docs || die
+	if ! use html; then
+		rm "${ED%/}"/usr/bin/{html2po,po2html} || die
+	fi
+	if ! use ical; then
+		rm "${ED%/}"/usr/bin/{ical2po,po2ical} || die
+	fi
+	if ! use ini; then
+		rm "${ED%/}"/usr/bin/{ini2po,po2ini} || die
+	fi
+	if ! use subtitles; then
+		rm "${ED%/}"/usr/bin/{sub2po,po2sub} || die
+	fi
+}
diff --git a/dev-python/translationstring/Manifest b/dev-python/translationstring/Manifest
new file mode 100644
index 000000000000..cc6b1b7de4bf
--- /dev/null
+++ b/dev-python/translationstring/Manifest
@@ -0,0 +1,5 @@
+DIST translationstring-1.3.tar.gz 29259 SHA256 4ee44cfa58c52ade8910ea0ebc3d2d84bdcad9fa0422405b1801ec9b9a65b72d SHA512 deba5b460d9ea640087cff8b5d7b9256708abd4340a54556f1f0542e2e4f9f0ae0a3482b66a176712fcd6925c470da621adbc5e4c4173c0ef29b9cca5fba1102 WHIRLPOOL bfc0f2d469718d6b27083feb10189dcab4e310183604c550314f4ecffaf38a8738bf2213e03eece6ce52dbf914c70b0629a44e5d1d7d1dcc4dfd9faa55b75191
+EBUILD translationstring-1.3.ebuild 1110 SHA256 23461d7a4717c85b693cd4cf4809bdc29cd81b236ef02695d5f9589783ed7125 SHA512 b1b78a3ec739e0f389252ce5ddee8b90fa19537edc0f2693ec6fdb12b443a78627118703b3c3e2ca0990438a7947880b286e3ed1939437de620bf9f276b0b0bd WHIRLPOOL 09f647c90a4db11878693adbf761d4d960becc13c3018c836059bfca1c2ff2bee1dbc94ee26dc868e0b3008bf3282da54542ea95e36e3d71a096e5f1c1418c4a
+MISC ChangeLog 3057 SHA256 18b4bc9840db7996c164d25148c616d97e2d2a5c3667f25a74a5a797483e00a5 SHA512 2b5000255d72dbc6151fe56ee0ab2d3464543fb3a4d1ee6bb745943f534701e0231b6082812ab5360d03b4480a9465140f213c611a1af842d0c13b481bf63642 WHIRLPOOL a17283d39e1e95ee625e1d11fcae428ba0cd40036cf66964e848269fa5b2107e6322a715fc58e2b5e7b3a4bff21f7e7921d60630adfafa890c9fd777b5b4957b
+MISC ChangeLog-2015 3175 SHA256 98e3f91cc0070f540c0e938f3a78ea926e9e8dd625ee96c1d3f8681a604011d9 SHA512 e648d6b0d2b77fd1d86fbe2add9f4cb6ee2d1939362f1abd52b70f660d1da25546ab27a434151a09c8162900af4b2767efb2c0646dad998a07ad150d2b64be8d WHIRLPOOL f2761937a3860941517fab23ecc0dcbc67ae8894dd3b1b11566f276e271f971da5f6d737318487cca39aa8db4e3d95e7fc492385ad7d1e76464bd4b3dbac8ee7
+MISC metadata.xml 396 SHA256 7d81c0ff009f23157bfb31af183110a93ef5e14484f24545d7eeafe51f044668 SHA512 6cfbb09e766bb9c10523808ea4da01f0998e03c239f633347523f57177816bb4c6efca2567ba53b2bf5b41274a3845d8a379294172c94067bb02f901175cc9e8 WHIRLPOOL 898113c7a40bd891e3d60f398f6ed1925b694a4df09f4a2b2f383c4705830bacabbf8b56b32207beef65f8a563f98522c8086d44da537ae6df045a2d6cc733ec
diff --git a/dev-python/translationstring/metadata.xml b/dev-python/translationstring/metadata.xml
new file mode 100644
index 000000000000..29d999ecc33d
--- /dev/null
+++ b/dev-python/translationstring/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">translationstring</remote-id>
+    <remote-id type="github">Pylons/translationstring</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/translationstring/translationstring-1.3.ebuild b/dev-python/translationstring/translationstring-1.3.ebuild
new file mode 100644
index 000000000000..79128d6e68d9
--- /dev/null
+++ b/dev-python/translationstring/translationstring-1.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Utility library for i18n relied on by various Repoze packages"
+HOMEPAGE="https://github.com/Pylons/translationstring https://pypi.python.org/pypi/translationstring"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+# Include COPYRIGHT.txt because the license seems to require it.
+DOCS=( COPYRIGHT.txt README.rst )
+
+python_test() {
+	esetup.py test
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Install only the .rst source, as sphinx processing requires a
+	# theme only available from git that contains hardcoded references
+	# to files on https://static.pylonsproject.org/ (so the docs would
+	# not actually work offline). Install into a "docs" subdirectory
+	# so the reference in the README remains correct.
+	docinto docs
+	docompress -x usr/share/doc/${PF}/docs
+	dodoc docs/*.rst
+}
diff --git a/dev-python/transmissionrpc/Manifest b/dev-python/transmissionrpc/Manifest
new file mode 100644
index 000000000000..d212c93c2202
--- /dev/null
+++ b/dev-python/transmissionrpc/Manifest
@@ -0,0 +1,7 @@
+DIST transmissionrpc-0.11.tar.gz 96091 SHA256 ec43b460f9fde2faedbfa6d663ef495b3fd69df855a135eebe8f8a741c0dde60 SHA512 778c4099264d38deefbcf05c8f9e5d165ce113b4180e3797eb3cf11f0a9ba5393c0b2e6f1f0ae7c2dcfc679bfc1d0d69cb3715b3db6ac90a1a840fbd0775f82f WHIRLPOOL fabee8985ce38d6430aa80fdda1ea90d244a33cd50f1cb8200b10e81b607000e119cb70a9dd7ed5276ed8384e5dc32f1fb47ab50143b4cbec535ed759989ec64
+DIST ubuntu-12.04.2-alternate-amd64.iso.torrent 28541 SHA256 2fe13c38b0b9ab9b1d3d92c53af8f8c0be5e9d36dd270591deee922bdcceaf64 SHA512 a597d9c5258111cb9c42dfcbb0804e093b6c69d4cdf178c961de1d52ec64e75f76d078700b59535e631575e42d3a995844ac0d30c9f7e852ab1ece149ec1f6de WHIRLPOOL 36323cf11643be4fd51b2dc658c0bd96b2dafc5ceffeed71cfdc6603520e78cc52ba19ace46b642e03fb950aae7b6b9ca7e3c0ee2f2790341820cf06ff52f71d
+EBUILD transmissionrpc-0.11.ebuild 952 SHA256 8fae6716d98d61748d1a219ad99fcbb0862bfb413ee0ff5ee3676b6e5a2f2626 SHA512 0f15696d84e2727ad1c177bbc952403c606b66c5147f6fef8567074d944bfd6376684ed79271d88d5476e331f1c79133f5055c478f575668d3ad8f38bb2dc7d6 WHIRLPOOL ec616bdd3e9c86219484fc1b408c0f1d5d024d17a095c3700e56dd342decf49a61bae1ceb0adf14b0c7b96642ddb1072da4512680d56b91d3fc24d67d644e81e
+EBUILD transmissionrpc-9999.ebuild 712 SHA256 642e6fbb8694fdef7fe53a47bd4f8e224d5a9797e7855aa423f0b505a4b79e67 SHA512 af5f10970a4baebea040aa16de63e07860d09c98fc358f703b42b2aed0eba4f85caed632f5937def51e3692a2111f702c5643de5033a7a524f24ea712887570e WHIRLPOOL 46e6b600ccf48566ac8a6c2b44894e63b374c3810b9e14b1f0efedb411a6125e95a47ef9c9b7aa93c51d0ca7335f498d4a9eded77271e1e058cfaf0f3e8c71bb
+MISC ChangeLog 2432 SHA256 072001e9cc15b2defb5aa12e44b86f8991a03773be2a0a0e9ddecd163ff24892 SHA512 a2f66e81bad83141836a37c6180580d5b9e2f63f0cfd22eee3e8f24f44bb912c6f706646a5d8b9bd50ca47857377cab6c4bfd782c3de699337037c568bd14cef WHIRLPOOL 8434fa980d17fc07125be675964253d97c85359810c44b71e1042920681c0a1d67f4fdcebc422bd70972bfa1fcc7428e04885b1fb0a07a0b175b6b62e0360bda
+MISC ChangeLog-2015 2814 SHA256 4f6ccb1590dca29c0ad2f253a3235c0b9487f4cabc231ce02c2f54f2e256c8f3 SHA512 79cd7aa51d997b7510e2645d1cffcc24dd0cb560c251272d17152f00afd75be8b267628036adbd736fe7c11670c2d794ab9af6ea1d2c68c22a859b96c7d8ddb8 WHIRLPOOL 459120bea4fbf1bdf28112af695bec9e15e7d527908512f4d17251ec79c10e271afdf0bd4869f28126931403266c3f17b7244036c663e8e9a9cf8a6c9f7f94d8
+MISC metadata.xml 403 SHA256 cf3db6da7c0653a8aafa6b8009754e080b7fc5aabeb3e16cdb34e31c602fca90 SHA512 c4a31c3eac5b356423d100f80440732c6351e782f764a3a4f27f97b311b3401d744b21d985599ecf72688fd2de5e1eac8631b549e2094b5c3b31d6961bba30df WHIRLPOOL 6d315219362ac5b1783ded4dee61d7e8fdeec0827260fff06604ae870e1ba63aafdb41ac17ee3b25cb827570b997a4563c1c3d53853e782708f057e1a58cd14b
diff --git a/dev-python/transmissionrpc/metadata.xml b/dev-python/transmissionrpc/metadata.xml
new file mode 100644
index 000000000000..a24b762a233c
--- /dev/null
+++ b/dev-python/transmissionrpc/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>floppym@gentoo.org</email>
+    <name>Mike Gilbert</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">transmissionrpc</remote-id>
+    <remote-id type="bitbucket">blueluna/transmissionrpc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/transmissionrpc/transmissionrpc-0.11.ebuild b/dev-python/transmissionrpc/transmissionrpc-0.11.ebuild
new file mode 100644
index 000000000000..33fff53e2281
--- /dev/null
+++ b/dev-python/transmissionrpc/transmissionrpc-0.11.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+		https://bitbucket.org/blueluna/transmissionrpc/src/release-0.10/test/data/ubuntu-12.04.2-alternate-amd64.iso.torrent"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/blueluna/${PN}"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Python module that implements the Transmission bittorrent client RPC protocol"
+HOMEPAGE="https://bitbucket.org/blueluna/transmissionrpc"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-python/six-1.1.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cp "${DISTDIR}/ubuntu-12.04.2-alternate-amd64.iso.torrent" ${P}/test/data/ || die
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/transmissionrpc/transmissionrpc-9999.ebuild b/dev-python/transmissionrpc/transmissionrpc-9999.ebuild
new file mode 100644
index 000000000000..d93922a50997
--- /dev/null
+++ b/dev-python/transmissionrpc/transmissionrpc-9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/blueluna/${PN}"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Python module that implements the Transmission bittorrent client RPC protocol"
+HOMEPAGE="https://bitbucket.org/blueluna/transmissionrpc"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-python/six-1.1.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/treq/Manifest b/dev-python/treq/Manifest
new file mode 100644
index 000000000000..ca5dd27fb501
--- /dev/null
+++ b/dev-python/treq/Manifest
@@ -0,0 +1,9 @@
+DIST treq-0.2.1.tar.gz 30954 SHA256 487b9a48f15c1bc482b9be694ad436d70ecdc7a9f0fd3aaf02a30b7f547d9b9d SHA512 d9236c395dca66d358fc9bb1b752e02a7d6335195235808452542de33145057c1c2e959658015b3c89c9a20c35b1a8edb752e151230e72edd313dde6cd6a4cac WHIRLPOOL 2d9b4d5bbf6c8a274d43be6c92f26b4158cd4844074f84d5cd1ef09f49e3ee41454b1b7874074ec3a8c8617a299ddf6d8df6a12d41cd660a188811ae92a44573
+DIST treq-16.12.0.tar.gz 43685 SHA256 b008edc81157969ad2bf23bece083adedb0adf249368a3896bb5ac9a871b91a9 SHA512 9385ada8cdf88e608937c118c29506372d8d3a8e7dcdc54998461652f106e4ccca4d6fa0a3f14ff5d9312da7ea1e531a9e4b0772b694b8dbe03f456101d63cca WHIRLPOOL 99abeea5c611712b5acad07c93204d29461177c29091d4ab34e5bc47e2ad393c76fbedc2bff330761692212ebec28bff1b70ffbcea02e1b5e22d848af3166727
+DIST treq-17.3.1.tar.gz 47380 SHA256 313af6dedecfdde2750968dc17653b6147cf2340b3479d70031cf741f5be0cf6 SHA512 e52cccbfa663314e968b33c58a5be5782063b2d6313a4ee5a03df912146c6ca25abca82915f30791f865afd2c08bb04c9993d9204d876c7ec2b308c6e51cb821 WHIRLPOOL 0f5f9c8910f81b1e704e55ce6f3ee933793ceb7c7b10ac0827e5fc4c0bd4791fdfee709fe2239b2d096dd7e1fb98315286839e648dc67b940cb1aabbb1b61e51
+EBUILD treq-0.2.1.ebuild 1035 SHA256 bf5f16eebff19dc0c5360c73945e4a67fb99fe28615208f047255205da912b11 SHA512 cc3fba0a27c6823ed4552d8495af667a92eb9b10466689bc512066f564bd64334fb296009f2a9bb8b605145dbd97ac89d23d77be9febd0bc4373664657725955 WHIRLPOOL 44040ecd775fa4e9f4159a572be271421ce2f7b6e0690e64976dfa5d9c793414fa342edd8db1e116743f2e7ad2ad1d7bb43311a0625975309bc4e4e80be75e9f
+EBUILD treq-16.12.0.ebuild 1237 SHA256 9f1ecd278e671c16a1fe60b260a132e49e26b7bbb03b11d283c28155b150ec41 SHA512 141a2c1f842dc350bdd03529a14975794b397c2cc5ddf7aa33870fb8d3f77c6b2f68273ff6f2c746ebcaa2d34a7d4656328522a8ac56fe310a9e5d3a8a98490a WHIRLPOOL 65d216eb092ee4c820b3c1b6a1a04adffee4973490db0c6a0566ff2ab0dd63298f485701e57962881ea251ff2e9aa935dfffb544b00d692d3a6dce9bde940c59
+EBUILD treq-17.3.1.ebuild 1538 SHA256 f1d01eaa6211995696b03e72e32f710157b0e32881db237c98208a34a2f65861 SHA512 ae623af527dce77ac380b4c74e29a43d308844196d63a8b040fca1d27f2a083ef3aa60010725026fa391d27d2e27f826eb2532dc99096cb67b0b18ee51899035 WHIRLPOOL 7df98a53c452164150441dc29e23712e729c8dae6a33aebdb91b057574c952e0b6b9e21a15023b108d004351d9caf0d61a8b5416d3bf72dcd8699f2b55115081
+MISC ChangeLog 2169 SHA256 5e4ed28a928e634959defe509aa1834fb97f7ea91b847538c7c1638fae49ab47 SHA512 fe54660b2b1145902b207fe08cfbbf5452533f175e7fdd240e853cec96b21eaa40112ba9c3438208c99ee9d36dfdc23166e7783723f30e74a9306366695c4dec WHIRLPOOL b81240bc6227482652893246993eff4fdbfe1607141a7130c8e8b1f367d2c5396b2ebc255d0ff4866a1084bb02c4d0c5069e212f024ff1cda2d4d711d62ccad3
+MISC ChangeLog-2015 820 SHA256 49c314d52f130f8fac524498b065e7577e79230b1b831b9d2d75e8038814adfc SHA512 cfdf44608ab4b77d652f722f563700a8be9bc7598bbdb519f8fc1bb9b14bf34442ff2c2150f4d426beb57ec3496a5cc014f8927d7c91791cb765ad9b98133e2d WHIRLPOOL a3b7579875ba1a8a9a93ccb1b159ad0ba30bdf9cda20341599f7c323f8952c127550b7f0dd1b8a3056d2f068698899c3580fa0d2cb3e05730319bbe754ddaa5a
+MISC metadata.xml 794 SHA256 965b292c8e75f772619f6a8b52504a571e36e9eb29508b5288d5579e17555a60 SHA512 091cfb4023e79ca37bc11714468f913b807090ecb0e0e009fab348ac9864b4906ae57c32eeade3ce8732bd472176553221e86d9fcc92db45e75b34f33778c83d WHIRLPOOL be85827e0e537029671a4c48a0e45791cb7b668b596596143a7fc9af665fdcef7997fa47b996c2caa7d23e68a61d2d03ba3c375afd87a12fc229f8b4de1896ce
diff --git a/dev-python/treq/metadata.xml b/dev-python/treq/metadata.xml
new file mode 100644
index 000000000000..b66eed0121c2
--- /dev/null
+++ b/dev-python/treq/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>maintainer</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>ryao@gentoo.org</email>
+		<name>Richard Yao</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>hawkowl@twistedmatrix.com</email>
+			<name>Amber Brown</name>
+		</maintainer>
+		<remote-id type="pypi">treq</remote-id>
+		<remote-id type="github">twisted/treq</remote-id>
+	</upstream>
+	<longdescription>treq is an HTTP library inspired by requests but written
+		on top of Twisted's Agents.  It provides a simple, higher level API for
+		making HTTP requests when using Twisted.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/treq/treq-0.2.1.ebuild b/dev-python/treq/treq-0.2.1.ebuild
new file mode 100644
index 000000000000..d200c5e21af5
--- /dev/null
+++ b/dev-python/treq/treq-0.2.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Python requests like API built on top of Twisted's HTTP client."
+HOMEPAGE="https://github.com/dreid/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
+	>=dev-python/twisted-core-12.1.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-web-12.1.0[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/service_identity[${PYTHON_USEDEP}]"
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( dev-python/sphinx
+		${RDEPEND} )
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C "${S}/docs" html
+}
+
+python_install_all() {
+	 use doc && dohtml -r "${S}/docs/_build/html/"*
+}
+
+python_test() {
+	trial treq || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/treq/treq-16.12.0.ebuild b/dev-python/treq/treq-16.12.0.ebuild
new file mode 100644
index 000000000000..bcac6de9fb0d
--- /dev/null
+++ b/dev-python/treq/treq-16.12.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+inherit distutils-r1
+
+DESCRIPTION="A requests-like API built on top of twisted.web's Agent"
+HOMEPAGE="https://github.com/twisted/treq https://pypi.python.org/pypi/treq"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-16.0.0[crypt,${PYTHON_USEDEP}]
+	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/service_identity-14.0.0[${PYTHON_USEDEP}]
+	dev-python/incremental[${PYTHON_USEDEP}]"
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( dev-python/sphinx
+		${RDEPEND} )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+		dev-python/pep8[${PYTHON_USEDEP}]
+	)"
+
+python_compile_all() {
+	use doc && emake -C "${S}/docs" html
+}
+
+python_install_all() {
+	use doc && dohtml -r "${S}/docs/_build/html/"*
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	trial treq || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/treq/treq-17.3.1.ebuild b/dev-python/treq/treq-17.3.1.ebuild
new file mode 100644
index 000000000000..f5efa5c167a2
--- /dev/null
+++ b/dev-python/treq/treq-17.3.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="A requests-like API built on top of twisted.web's Agent"
+HOMEPAGE="https://github.com/twisted/treq https://pypi.python.org/pypi/treq"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/incremental[${PYTHON_USEDEP}]
+"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/twisted-16.4.0[crypt,${PYTHON_USEDEP}]
+	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+"
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( dev-python/sphinx
+		${RDEPEND} )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+		dev-python/pep8[${PYTHON_USEDEP}]
+	)"
+
+python_compile_all() {
+	use doc && emake -C "${S}/docs" html
+}
+
+python_install_all() {
+	use doc && dohtml -r "${S}/docs/_build/html/"*
+	distutils-r1_python_install_all
+}
+
+test_instructions(){
+	ewarn "The 'test' USE flag and FEATURE only ensures that the correct"
+	ewarn "dependenciess are installed for this package."
+	ewarn "Please run eg:"
+	ewarn "$ python3.4 /usr/bin/trial treq"
+	ewarn "as a user for each of the python versions it is installed to"
+	ewarn "to correctly test this package."
+}
+
+python_test() {
+	# Tests fail when run via emerge
+	# they need proper network access
+	test_instructions
+}
diff --git a/dev-python/trollius/Manifest b/dev-python/trollius/Manifest
new file mode 100644
index 000000000000..7aea08e85324
--- /dev/null
+++ b/dev-python/trollius/Manifest
@@ -0,0 +1,5 @@
+DIST trollius-2.1.tar.gz 276425 SHA256 cd165d9d9578d3aadbf26e71a88d9a70c4e444792a5628dc9af255f62030cc90 SHA512 d800e060e13da22c83fc20f2c0e61d6c50cca309d90e8faecaf24e68240d78ec7fc9cfbb68a968ba7e9d73268e974353d9bd9063eb0ca02a4f0e88610abd6018 WHIRLPOOL febf87b4fb47a7cb573a538981807da207caff26d11562d899814573ea265d1e4a4ccf6dad0a19dbe639ef27be791958351711408bce2ac0b57792f489e4757b
+EBUILD trollius-2.1.ebuild 647 SHA256 db79499e3c3bd5f2d8500b15e7dcc5680587e032713815d1b8d353db6f56bdb8 SHA512 926058ecc9d9a5844b114ee461894841dfc1677a2f031ecb8fdbe1760aad76d7b41cfe2bb6ff6e483450f5db1768548cf58b5bd7cd7df3a254ebbddfe6aee3cf WHIRLPOOL 832fd06dee7da6d6301e3877febdcae29ff5bde2b017dd6eca1962832b30ea7b8fbf13e65d6485e62d29ee9c238ac0785baf70b058da705376cb2407f54a46b7
+MISC ChangeLog 3692 SHA256 13b5c3f2611478dce43ef7a79fa5b4f87070cd71a424292f8f24e785502b70a5 SHA512 494326d2691062832f5d9a4da711331cbef723df37bf6b1cb341ad60c5fb788b5a38cc704e51893db6555caef19c266443f366602696acbad8c8b6e95ab26d82 WHIRLPOOL f09a31db5df2565ef30d128b9c058e7f1e46b109ce114818928ce642c0b47b0ba15f073a5fb0e769e818499291bd583b2c380d9a1aa429969b8a228fe4e746c2
+MISC ChangeLog-2015 761 SHA256 bdc5f404c54626c74a6eac54a27f16ff85e2c641593d401bfd460cc2f2665207 SHA512 6a1e868da1ccd190c9848daa66c8163942a175e28f2ba395998b6beabb1e2354c9f01a2e02b1bb52171de61944aac55fb019a7b7064346660d4989ed5c3dd08a WHIRLPOOL d55ddb2b89874a0881772b4923486f87a7be4aa6d46fa4c2622bd334ce31a46b66e0b333bfc61a5b267d2aeab85f20f0207ad1304a8695898adcc058af2762f4
+MISC metadata.xml 439 SHA256 1731abf15831b3cdc5b26c34eff6b5a8b27ef8e763f3f5c631d93ed8ad6336dd SHA512 5d0bb280c9e1a08248701899de4f30f59252232121939655aa27af4ccbd77e1cda800ec64e0e051e3437e055490787d52ed0cbac4d9e47319832b5f262d08915 WHIRLPOOL 602b3eded9bd69cd01c7f3dfb0987457a68d63e7bd91713f12877f8305b9a4553232a41a74783f5df33d836edae8d1e42cb35f42de317eda5b93366e17aef5cb
diff --git a/dev-python/trollius/metadata.xml b/dev-python/trollius/metadata.xml
new file mode 100644
index 000000000000..40c20e19f5dd
--- /dev/null
+++ b/dev-python/trollius/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">trollius</remote-id>
+    <remote-id type="bitbucket">enovance/trollius</remote-id>
+    <remote-id type="github">haypo/trollius</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/trollius/trollius-2.1.ebuild b/dev-python/trollius/trollius-2.1.ebuild
new file mode 100644
index 000000000000..113ae35f56e7
--- /dev/null
+++ b/dev-python/trollius/trollius-2.1.ebuild
@@ -0,0 +1,24 @@
+# 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,5}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A port of the Tulip project (asyncio module, PEP3156)"
+HOMEPAGE="https://github.com/haypo/trollius https://pypi.python.org/pypi/trollius/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 x86"
+
+RDEPEND="virtual/python-futures[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" runtests.py || die "Testing failed under ${EPYTHON}"
+}
diff --git a/dev-python/ttfquery/Manifest b/dev-python/ttfquery/Manifest
new file mode 100644
index 000000000000..4fedb7ce828a
--- /dev/null
+++ b/dev-python/ttfquery/Manifest
@@ -0,0 +1,5 @@
+DIST TTFQuery-1.0.5.tar.gz 17850 SHA256 d5b8d369903ee2754541819f27de8ea35486d124484e36a4869503d9a9ac7e4d SHA512 c5bbdd7cb020dd23f20341d53f400f592654293bd923f64a0d33e269cbd3bc44a97a5cf5bb16485a8978e0d35d729edefbdd6c7d2e51dc65820699bb1df0f60b WHIRLPOOL 66fb07b51abf816567b36536980943d6f55f3f8800dfbeb131d0089d53db1daf8740897feacb32b96d4f6b9654812a627bc5cdea8542b48cb14e68750f447f97
+EBUILD ttfquery-1.0.5-r1.ebuild 583 SHA256 7c642429df01040e17effe2e2a0dcee4edbe6b3d2f09ecda7820766d7edadaa8 SHA512 1ac6ca20f39d31326109ecec47e47ca93fa2691378b7649542a4625c007e3b9934515c838f32591262f0d068f2671643f2f5fa67cd4d77e8d09e0271c40ed07b WHIRLPOOL 25616d432565ca937c9cee4447153b1ddfc3dc2d0fd3b26da8fdae73d77f3499e65d4c22d2a58aae24ae0534d47235481b036a4732e80c16b02404d5ab40a939
+MISC ChangeLog 3131 SHA256 ecde528a4e4c77fb302c827bcf46ec5b8f2247aa8f805ce421b86c3a7bb7719f SHA512 3c3ef17bf0a0c38de85daa42c36ae4735bc1b5647d047606f7e799685cf3e9a10f6b93acd5ecde73fb9fc115d31b7e257c63a92fecb18b4f7173095208eaa557 WHIRLPOOL bd1e139856626aac7aa7b2fbbb3300948b5d77f064c47ad7a9a19307dd0fceaf3f9ef7e6a84f4e0f8d72bd419fa8d110daf7ce47b050b7fb8d285c750f2fa90d
+MISC ChangeLog-2015 2833 SHA256 c9ef7f121779ac1be40f765784afaed55d5487261f3aa9ad733458ba7d090eb5 SHA512 17a5aa88a46f639abeab75a980b3c0972f4bcec3c1352ac70b727f2f65a12bb13295716c92768f5d7695513805ae24fa14ff40852a678e60d4279b43794cd0df WHIRLPOOL 4d4d17341b35b0551652f46ee766311893a643756410c7962b5633cb47ffaa7f9bfe01e5f57aed69d83220149894516c8b49a98035722da67736f12b6401fa5e
+MISC metadata.xml 463 SHA256 57d59985fba163cbe142f61e1cbfff244d0144ae41d4a983f5f2180453872bf9 SHA512 92e611454eddf73f99c20519773688c2993149078577bfbff7f531bea5053735513b0731645ca6ab6bfe544ee8b7e6a718e1bde7dc7b54113097f48c17cd8d28 WHIRLPOOL b1b62b09fb81ce09317e1eb5dc72b71240d9bba1836b8778f6b80e47a4ec042bc08f5f73913954d8a9b2ceaab8dafe39cb2eea8575015380ebef3652cdc80d26
diff --git a/dev-python/ttfquery/metadata.xml b/dev-python/ttfquery/metadata.xml
new file mode 100644
index 000000000000..47c6801f1000
--- /dev/null
+++ b/dev-python/ttfquery/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">TTFQuery</remote-id>
+		<remote-id type="sourceforge">ttfquery</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ttfquery/ttfquery-1.0.5-r1.ebuild b/dev-python/ttfquery/ttfquery-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..3ae2bd2db7a6
--- /dev/null
+++ b/dev-python/ttfquery/ttfquery-1.0.5-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_PN="TTFQuery"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Font metadata and glyph outline extraction utility library"
+HOMEPAGE="http://ttfquery.sourceforge.net/ https://pypi.python.org/pypi/TTFQuery"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc x86"
+IUSE=""
+
+DEPEND="dev-python/fonttools
+	dev-python/numpy"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/ttystatus/Manifest b/dev-python/ttystatus/Manifest
new file mode 100644
index 000000000000..63edde699e2c
--- /dev/null
+++ b/dev-python/ttystatus/Manifest
@@ -0,0 +1,11 @@
+DIST python-ttystatus_0.22.orig.tar.gz 30262 SHA256 ce3c0578364fab86278a694c2a193faf81c8e83df06f489d5395bd9d9706fbc3 SHA512 c6bf2a6dc81842799aecd9cacc0f91ea95cbe0befa80beef454c9f6e819f03180ee4964018c698a39cc2b7e245402a7c1d422fe5e0b750715bb068c22373d90a WHIRLPOOL 203446bfc2886b3a2c562675a6826ed0d8bcd475f77efc3326dbf2d2280cd17c77660d97041e3d3954243a34e1ac0d22f835b0d149c52db726a83783fad5ffe0
+DIST python-ttystatus_0.23.orig.tar.gz 30299 SHA256 1ecd58dff0049fdccedb6cd41ff0ddc51971c943e8d1887f8c027ae9e3aeb17a SHA512 29dd9ee0a063b4f49c72a1f08acfe80f4db9b3a374b1424a98926d25e22c8df0ed89441997322556edaad03a339dafdbf874a1247f095f1f857ef04f90b8a040 WHIRLPOOL 82576ac9346fe025d1ebc6d53e61cdfbcc3cb75f2c17e4bfb365d75088e5cf1bc00c6be6acfb729457324ea8e89d7d554efd2f3ab0c8a76103656a5a516e7172
+DIST ttystatus-0.32.tar.gz 33642 SHA256 ae2a054aa0bb6d1c6c71cb836bd5d55b9ade6863008c0803177908291342af2c SHA512 fd1983d584eacab8302ebe795d7d907cead382d4188f8baafe78e0e493d329d330d60ecc682e3ff743b180cc52438bc1adf9c4bf3b98caf2e0ca8b1e26eeacb0 WHIRLPOOL d31c764be170b05dae972bfb7a6b4a3fec6fff09cd8534e2b70f0e64c69e2d22594703f1c88b06ecdf2bdf19bb25caae0ba22fc1d8065c9e7dadff235bf429e1
+DIST ttystatus-0.35.tar.gz 34144 SHA256 86c2319df85f8bccb8d5550b1d2fa0f00247f6de2cbd217fc01ab676f8c23b6e SHA512 5c2b1306bb1025dbbc78b53faca3ed07b21fec6a7084517f6b58c3e195fc8a901ed71b62429af2261850e819b52a08e3b3bf3def61b06c9a9451af02f4f2dddf WHIRLPOOL 51aca16daf03a01dbd830ed73ad0f66157cdbb64f45c46108695b0a3b0a5970d658c272102bc8ca6f1d6a5d3432a7a0c921a12e7904b6ca533bd7c303d2b9657
+EBUILD ttystatus-0.22.ebuild 480 SHA256 1d39ad341a7d8e542a7170a13edea93bdd41b61775a70ea170701307ca545f7a SHA512 a630abd0fe622181bb23db23c8e52b01bdb24fe4a414414070632710b0763039b592bd1a8145e0f3521295dde51ee08072b3a0df0d89803d8b9b63d90c55abd1 WHIRLPOOL 76f2a94b17ca46c12b143a8613f55f16778a68fd74a56d984c9149b69fa3e873db3be7a7a5542b0609bc136049fb8c725aeb539bbb6fe2aa79bc7f06018a420d
+EBUILD ttystatus-0.23.ebuild 489 SHA256 91ff34181126ceec18d3c6b4a2851044dcd43592fbae6002a30c44daabdf0fec SHA512 9077281c7c4ee294c290952a5a50e37dbd89a1c7793bdf9a3c5eca922f6501df644fc145f9dde228d8a1c69518992ac19bdff0dfee6c0061eb16449d61fdc7e0 WHIRLPOOL 5951059fbeaf390f8ff979b5c0efb1dab7c21d3869323b0c7ebd39f7243ba2cda81a04421602e76472d666e1cd9a605734ee7f2d8fe7055d41cfa2329601741e
+EBUILD ttystatus-0.32.ebuild 483 SHA256 c24569a67636c7b0c1c02300a6ccc6ec0e5305dd976153b4e20a399f14040da1 SHA512 7b107179d287c56fa9bffc3057d9988cf179e49aa4b4a92edcdc31dc7bdeb7fd69b37e1932a56fee7905e2e305787320aaf1c62fccf4194648def62f4bcb40c6 WHIRLPOOL 0220a7bde4e482d6130bb8f7b0fefedced099cc7bd70b79f179fa542ac320e40c4c304600e7e9f6a964be45cc3b292434464b6fb4e4cdabb1be76f9b3ac64331
+EBUILD ttystatus-0.35.ebuild 483 SHA256 c24569a67636c7b0c1c02300a6ccc6ec0e5305dd976153b4e20a399f14040da1 SHA512 7b107179d287c56fa9bffc3057d9988cf179e49aa4b4a92edcdc31dc7bdeb7fd69b37e1932a56fee7905e2e305787320aaf1c62fccf4194648def62f4bcb40c6 WHIRLPOOL 0220a7bde4e482d6130bb8f7b0fefedced099cc7bd70b79f179fa542ac320e40c4c304600e7e9f6a964be45cc3b292434464b6fb4e4cdabb1be76f9b3ac64331
+MISC ChangeLog 2388 SHA256 717b62b8beed0e6efd72cdd586c935008e8998a58541c7a7325c6fa09bbcea3e SHA512 d0a92c8631a216afbb64f29704e21948cee7cca4c449d68c0805643d4d67dac1219ca46d1ed33cbacb0c317ac4f5fb76d55f0a8d8df5d1a436145fd1701a22e2 WHIRLPOOL c972afc13e5a507972c5adbf01d1ceae9a54233a7e3e516fda9cd056c46d8541549e4164578da8ad5cb782b3c01432e192105f06f2f8f94bf4b95589cb6d984b
+MISC ChangeLog-2015 2659 SHA256 e5098582566797093c13d282a600689c7847a2117107a7bf1a7f2ac7b3637960 SHA512 27bba3e54501a1f6d23998029961f165a082f658ff170a5c26398bf9092ebf5dd4e041b7b15328be5e0b961e50fcafc0efac85b20fadd4f2764d49e23454ed85 WHIRLPOOL a953a4ce884326fe537e6a21286047be0b7ac806ec19e7d484163a0a18482750d2e3f00d85345294f19cee8b8489d7a2c7ae696851cb8006dce84b7e5410b3ea
+MISC metadata.xml 250 SHA256 dc7996b965794cc38ecefc226a6b05400ff49c69553249c3d0ac69fd277b7906 SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de WHIRLPOOL e00ced8aee67f075273a4c498a4c69671eef224f7b41ef8c194ae72404c242bb93bf31a48fcf94065ab6fe8afbfb667238deba4ea4eb9bec406ace4bfcdcdc8c
diff --git a/dev-python/ttystatus/metadata.xml b/dev-python/ttystatus/metadata.xml
new file mode 100644
index 000000000000..ea6b59e79026
--- /dev/null
+++ b/dev-python/ttystatus/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>mschiff@gentoo.org</email>
+		<name>Marc Schiffbauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/ttystatus/ttystatus-0.22.ebuild b/dev-python/ttystatus/ttystatus-0.22.ebuild
new file mode 100644
index 000000000000..4cb527807bf7
--- /dev/null
+++ b/dev-python/ttystatus/ttystatus-0.22.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Terminal progress bar and status output for command line"
+HOMEPAGE="http://liw.fi/ttystatus/"
+SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/ttystatus/ttystatus-0.23.ebuild b/dev-python/ttystatus/ttystatus-0.23.ebuild
new file mode 100644
index 000000000000..fa0197685191
--- /dev/null
+++ b/dev-python/ttystatus/ttystatus-0.23.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Terminal progress bar and status output for command line"
+HOMEPAGE="http://liw.fi/ttystatus/"
+SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/ttystatus/ttystatus-0.32.ebuild b/dev-python/ttystatus/ttystatus-0.32.ebuild
new file mode 100644
index 000000000000..bcebdfdd01e1
--- /dev/null
+++ b/dev-python/ttystatus/ttystatus-0.32.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Terminal progress bar and status output for command line"
+HOMEPAGE="http://liw.fi/ttystatus/"
+SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/${PN}/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/ttystatus/ttystatus-0.35.ebuild b/dev-python/ttystatus/ttystatus-0.35.ebuild
new file mode 100644
index 000000000000..bcebdfdd01e1
--- /dev/null
+++ b/dev-python/ttystatus/ttystatus-0.35.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Terminal progress bar and status output for command line"
+HOMEPAGE="http://liw.fi/ttystatus/"
+SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/${PN}/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/turbocheetah/Manifest b/dev-python/turbocheetah/Manifest
new file mode 100644
index 000000000000..71a9323a2ef0
--- /dev/null
+++ b/dev-python/turbocheetah/Manifest
@@ -0,0 +1,5 @@
+DIST TurboCheetah-1.0.tar.gz 4335 SHA256 9e4c7ecb0d061bfb58281363ee1b09337083f013a8b4d0355326a5d8668f450c SHA512 7f231ee1e9f09c2c73a6a3c3be04643e6a13f2e488329d086cba759a75bfaf6c3f5b1670d21dec54bf3df8f2a449faa365c600ae47705295e13727ea4fccbb92 WHIRLPOOL 3a59280b1e805631043e06766a0df98e47d76d0b6c062c336a4daf205d1b8606f975d37c80e9d6374ca0365b910a67d7ad44e3b4bd8bc6b87e147c2c00033336
+EBUILD turbocheetah-1.0-r1.ebuild 762 SHA256 5bc5733265a01bc2e46cc903461c0978381d0a375e02e92156f02a6a5e2bbbed SHA512 c6f1dc8c3edd2d892c9b114219332eced29652b431d93a01d2f3041cb017065ea9a8680a87b74716dc4a942181d4535b00949e381fb975d0f547ff47763eb8fa WHIRLPOOL 0abf93c92254811bc99373a84a5c389d7a60d42f5b23bcca62029b9f1c126bdb7d197e7515528b90c65ea140df5d16a7a6c123fbb07490a451b7db25deb43f7f
+MISC ChangeLog 2595 SHA256 df7afb31617b0de7a5fd6de34bedc4265e42ff41466122646d75012306ab18f1 SHA512 9c8a0ca1c64d0127e1dd140b3d68c7cce8ad4361020acc624042072aab82dc28359729f44509c6ba04393585fc6e9b54e69a40445b51caa44e2b86959fe9d09d WHIRLPOOL adb09e8459feeb8ce9505ac69e633a26f3e41af7b579f567b04e4ccdcb44fac148eb9ee6cd3801c9d39ca20818fbff45608d9b067bdbf15ff93d57bb993ab36d
+MISC ChangeLog-2015 1198 SHA256 cd2b1ca661f84f4f94c86c09c4ad09f2fc0fdb3e62d8666dd79d043b842f7327 SHA512 6d12180db28bc0cb6f42a56c844491870d215feb6c8695eb49a5769c6741ee6b1f059e96aed4e6b282613057b34e7607e62e6f211fce25b80446da3b9203cd22 WHIRLPOOL 782d315116893c817c750bd0b9a1e2fc959f5ce8a40ab49d88ec6d97ff01d0b5a23ccc3cfbff435b627847231f9edbf91d42effd7e5f105641a7e2e39d3fe255
+MISC metadata.xml 315 SHA256 0b2d109edab60c9941652a064ada684438aee35c0aef8eb35dac28f65fc06947 SHA512 1b66608b1169844feb4a221c46701fb8865ff533c077cb9bb62eb23fce4c359808f21b0d055499c859f06c5ab1dca7a3fc3ac8f9dfcf402995a86f18dd2843f7 WHIRLPOOL a0d3c1fad95993ad154ceeb08a9ede1889ad2831951b7c95370afb8e7c48281d323d8d75b7adfe75ff09db117f2b7cb3518a329200e01707a0972c132af5521e
diff --git a/dev-python/turbocheetah/metadata.xml b/dev-python/turbocheetah/metadata.xml
new file mode 100644
index 000000000000..0f1912de75ed
--- /dev/null
+++ b/dev-python/turbocheetah/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">TurboCheetah</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/turbocheetah/turbocheetah-1.0-r1.ebuild b/dev-python/turbocheetah/turbocheetah-1.0-r1.ebuild
new file mode 100644
index 000000000000..86ff37d9bccc
--- /dev/null
+++ b/dev-python/turbocheetah/turbocheetah-1.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+#DISTUTILS_SRC_TEST="nosetests"
+
+MY_PN="TurboCheetah"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="TurboGears plugin to support use of Cheetah templates"
+HOMEPAGE="http://docs.turbogears.org/TurboCheetah https://pypi.python.org/pypi/TurboCheetah"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/cheetah-2.0.1[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests || die "test failed"
+}
diff --git a/dev-python/turbojson/Manifest b/dev-python/turbojson/Manifest
new file mode 100644
index 000000000000..192fd1c5b6e6
--- /dev/null
+++ b/dev-python/turbojson/Manifest
@@ -0,0 +1,5 @@
+DIST TurboJson-1.3.2.tar.gz 6613 SHA256 d517a7bde5346e17867f1eb42721f4d9c600e618e11ab7ad8b3536e66fda7ebe SHA512 5c3a2382f764ad42629b3f992f0fcef61b858a9ade4084b86d96c16efbf398a6ea5f8d04c3cc5618c681fe1a111877aa64777748535e9830495aaf59e53d11b1 WHIRLPOOL fd98bf4afa94b4f5892b09d2f357b3550b5a9bafdb76e638c25b945151cddb428dbc863408fa0e363538b4b561a653959f0672f40318f1c0dff46fe5ed12a4ea
+EBUILD turbojson-1.3.2-r1.ebuild 735 SHA256 8fa0f6dad582bc5e209290f6ea0c00256c5316f708dfd8c75fcc48f81ba9a363 SHA512 898a13b7d54132d7359996bce663108cd84399dd709c9de6f4a3f8373c0e602a721194f8a0ab999a18e61d72cd0b18a45b5dc4be7dab442f9256023a30271847 WHIRLPOOL 8b94b1a06841897aa10639823cdbc03190dccf3b84623b748957a84896fe26d0cc61af53add872cd5b88c9d9ffdea73e29d8abd938a3be7a36d17b8fe6970f4f
+MISC ChangeLog 2589 SHA256 eddeadd399bcdb21324fd3f2a4f642085c08bf652b01eb93e4c2929cdf01e133 SHA512 e467c02447d51ce9b38d9657f24212e72fd7363925c2e88ab6d4d0007a46bfc35bd74282cbedcb2b082ba494c95f1cec721cf60ec1f6dd070afa2e5368e5a4d7 WHIRLPOOL dba41cf846bc0f8153ae785d266ee3454e42b53139e6723ea7e122712a0bcf3dae8e8d6654b5c7a73f7d0d394ac8db4ea69ccb587680bc3afe5c0562ef57b3ec
+MISC ChangeLog-2015 2568 SHA256 cd058299a29a5fb67eb92b24c17270615b4c462bc895823194d26b015326e7df SHA512 6227038157a82fc396ffdcba8a7f477a5681781b378a879338badde44eb4744e93bf1a6bb364254eef25df7ce9bc4e3630cbd7c6ffd823e1909e579ac1769809 WHIRLPOOL 1333dbf60fc4fda1b990f387774c811eefc22423c39746bd5baf09e5826b59ab5a15bc658407889b92408645ae092bbfbff4dfb1fde03a01577c700a4082bcbe
+MISC metadata.xml 312 SHA256 84efe3f78849a82c9cc7339ffbc1782a079ab192b1cfe1bec55c8f968ec3a91f SHA512 80643b876c5d02c364e0105039a339f8a7b49da7d4fa815b335c04a4e38552d35566941621f12ee6ac1a5b64ceb3df4738e4cf45b66c692fe325cac65e53f195 WHIRLPOOL bf48640663d63306b9f9d055cbd97dd9a0df98e8171ed1e0ef0b1b4351607b609be4ccf7161913b4926d84cd69e70ad3098fb7cd8668bf954e2138595e14a36d
diff --git a/dev-python/turbojson/metadata.xml b/dev-python/turbojson/metadata.xml
new file mode 100644
index 000000000000..ca5fe0e76d7b
--- /dev/null
+++ b/dev-python/turbojson/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">TurboJson</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/turbojson/turbojson-1.3.2-r1.ebuild b/dev-python/turbojson/turbojson-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..c384aaa3395c
--- /dev/null
+++ b/dev-python/turbojson/turbojson-1.3.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_PN="TurboJson"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="TurboGears JSON file format support plugin"
+HOMEPAGE="https://pypi.python.org/pypi/TurboJson"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=">=dev-python/simplejson-1.9.1[${PYTHON_USEDEP}]
+	>=dev-python/peak-rules-0.5[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+# Testsuite requires a package of peak not present in portage
diff --git a/dev-python/turbokid/Manifest b/dev-python/turbokid/Manifest
new file mode 100644
index 000000000000..02a5d84843ed
--- /dev/null
+++ b/dev-python/turbokid/Manifest
@@ -0,0 +1,5 @@
+DIST TurboKid-1.0.5.tar.gz 6878 SHA256 25ff2b8a0b8d62c02c188931bb7a51fe6d421ed6db538cc07a9332ce4093c962 SHA512 13a7aba4773ceb5c591c9b5f33b585161a6b6bd92f13169291c20e2cb77b10fe97e3f2d5596d0498add34728a36f6e0968f236fca87f1091a92eee68704222a4 WHIRLPOOL 404a86ce7d3e1034f956e247a9f2c5c8cf02ddae37b5044859b6a48956dc0d6e586943424d5b363ea05abf90fa3d2e223d52cc996f72f4f1dc9096e0cb411841
+EBUILD turbokid-1.0.5-r1.ebuild 658 SHA256 b3ad0c97baac410d8273041b07dc38d730c61ea61216fe9c33ce0dc8eecfd2be SHA512 072ba7b42f75b52178d511e087b72d2c2fb78ebc40fb34e81448bcef56f46ad680cccfb27d5c4174d3815cf9c1fc0a36b02c9228ad7872e6a19a194d4f9515c3 WHIRLPOOL d1ab60189a792ca0237d313d60caae5f1417b669c9b60d64f0bd8fa0649a4a6f5fabbb38f428a2fce655b3ea65d90ed0b8726a97bf12288adec26cbf40d1cd2f
+MISC ChangeLog 2585 SHA256 d0944b053292cf636cf9c0b62c8c9f5667b3c2cb87267ac4c2188f92e75b39c9 SHA512 d3f552d0d52b1f171f0d12fa2933393841a1980f3b2a61412610bdd29850e0bfebc71a5c1f7799c0b7e9ee2c562a3b3fe8c02c82d1aba131291e42489c230cdd WHIRLPOOL dfaaa96f4c500bab6469613c60cf604169a817f5e1e95539001c731dae43b0742b921ec299992be4a9acdc91ac878eacb14a9c410ad33c7db47abae773014bf4
+MISC ChangeLog-2015 1426 SHA256 68914a692d1a21941069c45eed2f9ec417e1c08e27b80b7142d6d4d68b53b03a SHA512 99a1891aff82141514267b15952432404c75ae6adffeaad5715d2dcbc724232b54f76ee17fae0b382f81dc6d8f0ee6fb872d69c62147314c5420cdd3f8540d53 WHIRLPOOL a57ece46068201b7bf8ea6048167af620eb4aa08bc1bbfad5933742a5d26f73fe0aec2882c62c86e80369e1b803a85193faf67ff836d5c7a96fe4f24525adde0
+MISC metadata.xml 311 SHA256 94bad1125a7e432ff0c7b4360e0917eee8281a8acc95c9a12882ff83f63adbf6 SHA512 9c0295108e16679f57d44e69093133509177eb18cba5ff242efd2a38feb25386146ce9a3845cbb5ad3f9ed79e4838eee875202997a315e9e41ab1a098ca2801a WHIRLPOOL aa0b5a61f03eab08a69400e75b73b54874a6a83fa98e288c4c14c5e8137ef7d4715f96206e53604a459a219847592b81f14f638bf3f3e6ea1877d0ea4c776aff
diff --git a/dev-python/turbokid/metadata.xml b/dev-python/turbokid/metadata.xml
new file mode 100644
index 000000000000..7f0ee32d148b
--- /dev/null
+++ b/dev-python/turbokid/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">TurboKid</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/turbokid/turbokid-1.0.5-r1.ebuild b/dev-python/turbokid/turbokid-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..61f245511b8d
--- /dev/null
+++ b/dev-python/turbokid/turbokid-1.0.5-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="TurboKid"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python template plugin that supports Kid templates"
+HOMEPAGE="https://pypi.python.org/pypi/TurboKid"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND=">=dev-python/kid-0.9.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/turbolift/Manifest b/dev-python/turbolift/Manifest
new file mode 100644
index 000000000000..5696dcbc5210
--- /dev/null
+++ b/dev-python/turbolift/Manifest
@@ -0,0 +1,5 @@
+DIST turbolift-2.1.3.tar.gz 49672 SHA256 bd7cffa0bc6bd6392370969e681685fca9d1b4db587a3dcf02e8b5be61449360 SHA512 9132f25cc965f68aba022f51d2f401dc706ffd775a504872f4706b4a59a7c99fd6ab2c41c5909533f08fd3fc81b2fcca5487fd6568ba43c196d35d1de3ccb703 WHIRLPOOL 35e7a6a4d34c305cdf149fb6a6c7f705ef48bcaa8cd3e671a6b357ba677d0e26126abe0ed4d186278cdff9ba9e0d1d9ec474e2b810fc24329719caab7f0239ff
+EBUILD turbolift-2.1.3.ebuild 824 SHA256 bfe994059d1ec408be80d595341fe0edf90528e91163c7a99e8ffc64a09b0343 SHA512 7e7ce9e9e808706f057ad5706fc0120a6608a5a788fe52c23dab4dd2ef5cd58ffc1a02c21fdb38d9eb1c748f572ddcf2607698b78b71ef822855ba340f42f37c WHIRLPOOL a964a131ca0bd62c0e46f0ec670e7b5e7a2522c260f042f2bfbf6c3d93c4792410749bbd5f8a2f038193fb1cc33813635dde8ec299e2bc6020b48ddc3b1dea82
+MISC ChangeLog 2592 SHA256 2c127d464d36aca24ffc77c8abefe51ab7d8368f37f43d30c64a2f3eeae5677a SHA512 d5f256f789ee35b23eb67d676ec97fa1d4e5cc176ab40393b99bb00d37b0d59c7c56e16dc0f40085f2acfec9a7eef59cff5d6d8064b4ae9caf143fb3b22dced9 WHIRLPOOL 068542c314be8a61f7ef0b3628b357a7eb35bbf001ac1017303a5319724752464196becb9cb55f601cf1416e2dd9196915029bd93c099153c178efb03935d91e
+MISC ChangeLog-2015 1204 SHA256 e73eeb9c6ab97d17ac0a137f4d8f3115dd0c27b80b3e6d8f93cd991d68097441 SHA512 678962a5c134087e35f8817891a0fad6816fd0c1df1bde352bfcf30d76ea2b0419061a0b84c419e598c5ca0ff0e93c5934dd59d4817f82d6684b0b0ffd27e411 WHIRLPOOL 35f5e70a557005a383fa8c499f79147e4a78a3dd11ad55072d4ea69d6b98457d5c984943648d510522e09384cc21873fb2ed991ee4e81636b3b87c194f807265
+MISC metadata.xml 595 SHA256 2e9df494f410ab8c9e3d5e00e3b63c1dd7b8f6737cc837c45396ac3a5bc9b7b9 SHA512 2ae809b6210492f848ca8886a83f110b4acf0efa5ed4172357e996d3bb018bfbf829878756f62907aaa731957c32e405571fb7e05e89103add1cabbefc9ce1f7 WHIRLPOOL 36eae4f1c49da08f98a24c8b995cc2389be420b3398bd8fd4001ffe1b922ca504e699f097eccd8a8b3297f2d9cae9e2cd85687cbc1c7f8528def7d1ca93c877d
diff --git a/dev-python/turbolift/metadata.xml b/dev-python/turbolift/metadata.xml
new file mode 100644
index 000000000000..bd0b47ab7ef1
--- /dev/null
+++ b/dev-python/turbolift/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Openstack Swift sync/backup utility
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">turbolift</remote-id>
+    <remote-id type="github">cloudnull/turbolift</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/turbolift/turbolift-2.1.3.ebuild b/dev-python/turbolift/turbolift-2.1.3.ebuild
new file mode 100644
index 000000000000..ad4f95a505b8
--- /dev/null
+++ b/dev-python/turbolift/turbolift-2.1.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+# tests are not distributed with the release tarball
+RESTRICT="test"
+
+inherit distutils-r1
+
+DESCRIPTION="Openstack Swift sync/backup utility"
+HOMEPAGE="https://github.com/cloudnull/turbolift/wiki"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools
+	test? (
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND=">=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/cloudlib-0.5.0[${PYTHON_USEDEP}]"
+
+python_test() {
+	${PYTHON} -m unit discover turbolift/tests || die "failed testsuite"
+}
diff --git a/dev-python/tvdb_api/Manifest b/dev-python/tvdb_api/Manifest
new file mode 100644
index 000000000000..e4a3b111c857
--- /dev/null
+++ b/dev-python/tvdb_api/Manifest
@@ -0,0 +1,7 @@
+DIST tvdb_api-1.10_pre20150406.tar.gz 33758 SHA256 264ff148d41582243f63859a5ad6cd924d556a3872342a9d0ef2732efeb37dc8 SHA512 a62680a8e18fa5cb246c0916232aecd06dd5f7381e589690f8fedf5b85a9eac01331a858880f888c14ece53c888ab8d18e7dd65a6665639f5f6f6d335138469d WHIRLPOOL a7fbf57ad4bc5207438f3a83089129d2cd5f1e5f5d4d7726f807701a8170bf99dcfb59069b3b6dde26bec279322d2b402f14360e50a6fc38cf8396827e181539
+DIST tvdb_api-1.9.tar.gz 32429 SHA256 516bd5f9150f7fcb1df11cd73b2af0e155eb8282e49c197449df295cd0e0f873 SHA512 6ce13f47275eb3f37897da1b9bfb2d101184e3797abeec965c170d9b007661c3e0745396bc93bf365d6a1552fb461a2fd7b33777b4a67e58281c8ac3efb788df WHIRLPOOL 596c680383fe43f4575e968358c6a839d070c1eb1561e7a7f673516d1fb445bc0f9927c22eecf2762be5d0fe5fd63c840ba95ff08779a218c1389b3d66ea8668
+EBUILD tvdb_api-1.10_pre20150406-r1.ebuild 535 SHA256 68517ee215e57d45676cff28ce41beabae158188399a9d4f4652395d52e29b02 SHA512 3ffe701b7003035ed7cba19bd86a743f7bb5941a8b628182e9f8f8269b7c12975b8b42587822edbca556b5ff31d1d5f8968f0867d0a8e76696381dbbe6c6bcfc WHIRLPOOL 951a313ba39bd837af49a42f5101d7b6c0f519839985e68420f9468e6a78289234b4589fd962e54e24e811c3f529cd605c0bf9e710504934f1ac3bf1a87414a2
+EBUILD tvdb_api-1.9.ebuild 446 SHA256 d012e33383032f822531a9ccee5b234d04ded27d003bd6ffc5bf6497b75cea10 SHA512 3c5fa40f31e2b05652f363fe684ec9267d52c65113ee3f77e7e7963a543f1f1e68e986c5734b0b5f9d4d28ff3a86657ebe89431b93f864f78912e3d2b555b14c WHIRLPOOL 1d9388fc8c5d77351799f0303e621d9ee8d74ff1ed3e9393b5fbfc3613e8daed5e384feb0a08674a931558729551149236efcdc73d12e21b0b620375c25eef92
+MISC ChangeLog 2483 SHA256 5a45f38c3a98f9df004c3d64f169d676958bc4a3fd1bacf77c489090c5581b2a SHA512 a530516bdceafc6b4e629fc29a3ebc338b9ce68cc1e734bcf61bbc4a6e862aa2c39b5257ed85a155fd10ebf87e04e149290b9bc54d51cc6794b9d8f10f5900a1 WHIRLPOOL 802e47f791f446dcc6d6d6b07e0586eef698d6e59051e5c568e8e56848a42b54ef007fe4ae7e4945bc839afcf3e0d3c529a9568284ce0f34a633c5fffa2818bf
+MISC ChangeLog-2015 842 SHA256 b9751d144c6a86786994bec455c7ed3a1055411f9fc887956acba47dfe1c4aa6 SHA512 14405ef970b4092ee8036539d8f1b43f3ad6d540eaecbf202803f68fbf00daa82d29ce92a651f4d7ae4b661fff805d93e946ea41f1cef8ca20eb9b3be2cdc498 WHIRLPOOL 9bfc4049f10142a9d490f1f7c015254841195be901d78a9b0519f2644bbaab8e0f86bdd44cccee7b74f2258643de0d56ffdcb86d685e94800968a45805b8d5d3
+MISC metadata.xml 333 SHA256 2d611a1da1b9a8d2ce2a2c19b7ce1c343fde4ec85b33a6a2e61bc0ba6263548c SHA512 5cdb8638da8db277b9228fd2ac53bb0fa4dd181da86b9aa3d9180e55c2d13ae494ab78af1168271158ce10469204028197bffac2e9b11afb48e0c71a15d583f4 WHIRLPOOL 192e934abf6f9162a6b821eb4092ca50ca398e5f6a4476ac4166b857e841ecae72917da0fc0e7d7e0267c62c05c2c5b49f0a9b887b2855a16e16f5c5044f38a7
diff --git a/dev-python/tvdb_api/metadata.xml b/dev-python/tvdb_api/metadata.xml
new file mode 100644
index 000000000000..373aacb19057
--- /dev/null
+++ b/dev-python/tvdb_api/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>thev00d00@gentoo.org</email>
+    <name>Ian Whyman</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">dbr/tvdb_api</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/tvdb_api/tvdb_api-1.10_pre20150406-r1.ebuild b/dev-python/tvdb_api/tvdb_api-1.10_pre20150406-r1.ebuild
new file mode 100644
index 000000000000..33cac4dbdbe0
--- /dev/null
+++ b/dev-python/tvdb_api/tvdb_api-1.10_pre20150406-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+inherit distutils-r1
+
+DESCRIPTION="Python interface to thetvdb.com API"
+HOMEPAGE="https://github.com/dbr/tvdb_api"
+SRC_URI="https://dev.gentoo.org/~thev00d00/distfiles/dev-python/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/requests-cache[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"
diff --git a/dev-python/tvdb_api/tvdb_api-1.9.ebuild b/dev-python/tvdb_api/tvdb_api-1.9.ebuild
new file mode 100644
index 000000000000..c2a19782d01f
--- /dev/null
+++ b/dev-python/tvdb_api/tvdb_api-1.9.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python interface to thetvdb.com API"
+HOMEPAGE="https://github.com/dbr/tvdb_api"
+SRC_URI="https://github.com/dbr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools"
+RDEPEND=""
diff --git a/dev-python/tweepy/Manifest b/dev-python/tweepy/Manifest
new file mode 100644
index 000000000000..204e85846df4
--- /dev/null
+++ b/dev-python/tweepy/Manifest
@@ -0,0 +1,7 @@
+DIST tweepy-2.3.tar.gz 52352 SHA256 bce05e6375d03b42ba7fef2a972635be6841dd0f26b86bc5704154d248cd29d7 SHA512 23317a507174e108cf8d13232aa467d892aba1789ee4f610eef4f5503b045841b5c85e8ae63ddcfd1e07178afbf3bf9f4a9fed939426411a8566f1c949b9b831 WHIRLPOOL b9adc746e498a0bde90dcb0b4a3ea5c6817e41c39980436ca42364dab21493b0201de6fb16a196b9f9171150d46cc1ad5e121710aaa62bf16b0875d0c6f73cd7
+DIST tweepy-3.5.0.tar.gz 24348 SHA256 f00ccf5f48c30d559ce0b750dfe3b2df6668dc799d8ce276fd90bfaa68845a58 SHA512 cf87f0b7dea0ca444c17a3fdb9c2ebef814683c110511876c1997630b3202393276d3dd2de3b37fc21eb7a15382d22cc886109bda5a11b3d06a08081704c8c2a WHIRLPOOL 3fed8a0b7f7a388f386782731b004ba7f192534675372639c312be5fb09bb6a5f197366f88274d815ec0c5042f7803451e02eeac76fe61d3c1301539d36f2c57
+EBUILD tweepy-2.3.ebuild 1147 SHA256 9959921e5d824f87ca50cd127098b90965bfea1910fc8217d7f46db5ee6f82bc SHA512 837e4cc56635241fe24f199894916a8f267c779c31d18aa5fc7c1df23ee1271db9e13c5367647a31246ef9a4f710e5be77fe84224bc19fc71a83f0d0c42db3bc WHIRLPOOL ad11ecaa68d2e8eac4bda403bda7484c6005b4fb823c95365813aaecf6990ea70d15b96d489b40a69f2f6ee0b7667e99c292c6f0932db92f829352bc33965293
+EBUILD tweepy-3.5.0.ebuild 1227 SHA256 88e170afd1f2046958fe2fbc8d332e886694afe32a84d9927af674f7163648f4 SHA512 be4c986f5be13d2832a3a9c7b07d646f54cee3dfa95ed4174d5b97fe770145f86a864dd01875c3cb8bc3b1d20440c63744c5a76a36374d1c8f52ad187684f007 WHIRLPOOL 4da181b0f839431f9965c3412c550b6cf4c1b7e770c9ec8017ce34f87722b91942ea11029b0d48c24668c1b0c7d6cb144a3de9de15faf3d9041eb57098f03267
+MISC ChangeLog 3787 SHA256 66898d50728f823607c0661897ccecb2861997463b2a0c7a87a2a46057740d41 SHA512 071ad50e2b870fe689da515ea205df616046711cece015b8091ddf56391160d3f2e0ff4ca258a2f5ed2426d60a6eefbd373f529cddc02c805a8357ca79ce961d WHIRLPOOL 2d5ee55b72a79e3f6fcd68ac6020fb78e6cff6eaeb3460f1f4b417c33a9ec1aea7046253aea5c5166af73b11288b5ae72eead0f0ffb10163e36525b6ca52d8d5
+MISC ChangeLog-2015 1788 SHA256 230f277b446f4f40f230bb0252072bee35c3830cccd9b1345d74c1b66b235e4f SHA512 1caf70c90a8350c93372ff439fb92bf819e1e90539cf4329ff9645d2d160e521a03a4b9b825a2d0ac59f0f1794f4208d4df8a2ce6665ca9a7e169e85d7aebdaf WHIRLPOOL 1de77451193f21443ecbd60e0524b69d9c0be04d8bce10c3f1abcc56006ea5aceb46fee1ee8055cf4f5b14e21f7e334664b53558ae535f507f30a0a6e4f61773
+MISC metadata.xml 374 SHA256 ab2a3f22b1e7cef3c7e75c62f820fc70f992acc794a16611e601df357bb42b15 SHA512 e2785876cc350cb7130905648a4f9013fc79c286697c6fdfac203678ff79217383fad2c4d4d2caa42107d83c6cc29ae0d149acea16d74aab804a3039a3e143fe WHIRLPOOL a710f0e8634b07126431c0fc18b36da63f23125ce5e4ec64768d277b6d0ae86504a57a7635a116942dacc213718c05390941b53d10af32c336aeeb2db5b12646
diff --git a/dev-python/tweepy/metadata.xml b/dev-python/tweepy/metadata.xml
new file mode 100644
index 000000000000..0ee41d2f84f8
--- /dev/null
+++ b/dev-python/tweepy/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">tweepy/tweepy</remote-id>
+    <remote-id type="pypi">tweepy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/tweepy/tweepy-2.3.ebuild b/dev-python/tweepy/tweepy-2.3.ebuild
new file mode 100644
index 000000000000..5dbd10f91402
--- /dev/null
+++ b/dev-python/tweepy/tweepy-2.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="A Python library for accessing the Twitter API "
+HOMEPAGE="https://tweepy.github.com/"
+SRC_URI="https://github.com/tweepy/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+# online tests
+RESTRICT="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/httreplay[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Required to avoid file collisions at install
+	sed \
+		-e "/find_packages/s:]:,'tests.*','examples']:g" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v \
+		tests.test_api tests.test_streaming \
+		tests.test_cursors tests.test_utils || die
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/tweepy/tweepy-3.5.0.ebuild b/dev-python/tweepy/tweepy-3.5.0.ebuild
new file mode 100644
index 000000000000..0fa61c27443c
--- /dev/null
+++ b/dev-python/tweepy/tweepy-3.5.0.ebuild
@@ -0,0 +1,52 @@
+# 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} )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A Python library for accessing the Twitter API "
+HOMEPAGE="https://tweepy.github.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RESTRICT="test" 	#missing in tarball
+
+DEPEND="
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	"
+RDEPEND="
+	>=dev-python/requests-2.4.3[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.3[${PYTHON_USEDEP}]
+"
+python_prepare_all() {
+	# Required to avoid file collisions at install
+	sed \
+		-e "/find_packages/s:]:,'tests.*','examples']:g" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v  -c tests/travis-tests.cfg || die
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/twilio/Manifest b/dev-python/twilio/Manifest
new file mode 100644
index 000000000000..10c7f4a1632a
--- /dev/null
+++ b/dev-python/twilio/Manifest
@@ -0,0 +1,5 @@
+DIST twilio-3.6.9.tar.gz 226151 SHA256 0a6ce201edaf9f79a376f2713e10f3fc9cb8b64c046b1df5d1c87c56e8ec321b SHA512 f4e0f13e3f12ae8e15817a285a4388859b458ba7759acce4d5f6ee425bd6a06742bf271a01e1cc5140d63bc599828b940f1e96a6ed7f5744c1c9eaef2dd65b29 WHIRLPOOL 95fc4864dc63a5f18a3108014aca831da36ebfb4d8ff68cd739b768e6df81c56de8a2e1f4b138f927b4c5645ad0bf2a9d1330b81e34ca0e60bf6041fbd7ddf3f
+EBUILD twilio-3.6.9.ebuild 769 SHA256 d030b3430221118d1c738ad70810318749bdac9eb3e40373a60e6826fe3b5bf7 SHA512 9c21e40390f4243e6be0ad51a0ef71712cae98690e41f59250630173eb82958ce9f424b0ec5b380fe1cbecf821305e6a9cd5f1c73dc1284f6e29462d30f1f286 WHIRLPOOL a84d34cd2aa6eb37e05f12178986aaa51aa76bc8ec8187c8ee2ecca52ef6b5d1909023b2958988973c3122fcd4ed47d892b968ee50b5fa3921017efca1d18e98
+MISC ChangeLog 2470 SHA256 034a5ecb50da11b15cfb253bb44a4161d730ef734fd7502cb79f26b2a2e2036a SHA512 4446a508c2738f5c3236a5d2ad80aa863b69179d04982d4bf6c4f26b6db1308700fb5e88d470c849331b8d7bc998a1968f654b850443f35c76e9be80debe9a53 WHIRLPOOL 442a6f99b3e7011637ed16c5620b72d98ed5f2dd34ffb266fc19a76ce2305febec5dafff555adeb41f083e70dec37f4dc81f8195d3cab228b9946cbbe9ec1fdf
+MISC ChangeLog-2015 567 SHA256 c8e6ae7951f616090831db6658dbda031a3df03333c8a1243db27208bcaecce0 SHA512 6678b544414eeb1ee8ede36bf6abd4b34f17802bbb1bc600ce735c0df344adbb36d4ee33499ab4772ba43102be0773f6b4bcc4489dc6ac3cce0905ae3aae110a WHIRLPOOL cfa91fe68c61649cb2d097e9bf8824272bb18ea709d493011a63d89fb7ed9b85a376dc90ac728ed562013c576d0d79babf5d1dc7997bb54eb657a036de41d3a2
+MISC metadata.xml 349 SHA256 43e0ea2a8217178b1081e8cc408c02f27ba4e80c6dbf17deba9b161c8e3f711f SHA512 9d0b576c2db4a385a8dea25041697d65599434ba9e815fc55b8ef68755711bfc7f147c45ca7c7721aea36004a37536c5d59fa617333c1c263d72ae31af7060b7 WHIRLPOOL 594cac014c217ce69eac5009ee8ecd7f22636bf8012d12c8dca7484a10797e2c263dd961007d583d5695cb1c758ef699184644bc3bad7f8365c9d45910861e4d
diff --git a/dev-python/twilio/metadata.xml b/dev-python/twilio/metadata.xml
new file mode 100644
index 000000000000..e9db8961caa0
--- /dev/null
+++ b/dev-python/twilio/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ercpe@gentoo.org</email>
+    <name>Johann Schmitz (ercpe)</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">twilio/twilio-python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/twilio/twilio-3.6.9.ebuild b/dev-python/twilio/twilio-3.6.9.ebuild
new file mode 100644
index 000000000000..d6ce9dbff2ef
--- /dev/null
+++ b/dev-python/twilio/twilio-3.6.9.ebuild
@@ -0,0 +1,32 @@
+# 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 vcs-snapshot
+
+DESCRIPTION="Helper library for the Twilio API"
+HOMEPAGE="https://github.com/twilio/twilio-python http://www.twilio.com/docs/python/install"
+SRC_URI="https://github.com/twilio/${PN}-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test"
+
+CDEPEND="dev-python/six[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/PySocks[${PYTHON_USEDEP}]"
+
+RDEPEND="${CDEPEND}"
+DEPEND="test? (
+			${CDEPEND}
+			dev-python/nose[${PYTHON_USEDEP}]
+		)"
+
+python_test() {
+	nosetests tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/twill/Manifest b/dev-python/twill/Manifest
new file mode 100644
index 000000000000..c77e089fabce
--- /dev/null
+++ b/dev-python/twill/Manifest
@@ -0,0 +1,5 @@
+DIST twill-0.9.tar.gz 242291 SHA256 8053c25fd6edf6ddf5e7583224e7b23ad947df1f90175b018af5cf7abeb42a86 SHA512 ea47400e236c4f5a4d38671bbc5690d004c4dbd20b6152c54c2fa64bae3e3ec68d16a5305d42e8631595cac25f5b2a08e0eb287b7e1ed7b90a8368d6063b1f1e WHIRLPOOL ee306acc4434b919119fa103d15f82909490b57440d61dc4193af3d11827759202949a8e568b356fcd52a34ec791f5f5adeedf7848471fe13f53fa7dbebc7ad3
+EBUILD twill-0.9-r1.ebuild 1195 SHA256 0753f94e5b0238adb6e5b7b6682a2f70fa244fd984be457ccba4c89be4fdf50a SHA512 56704686ef6c315d9acd351d5bdb40b01c16953a775d24e10f62946fadc882fee51cbae045aa609f4a22e9aaa540924903af90499084ebc80da14a81afe20fa0 WHIRLPOOL eed22e91abcfc6d9f8c71634ac33efeff2a652919f7611eecef12e2e9b2ea13808e550e2196fe6b1283e67d7a5b6b7955e867a78e3bbd7acac95486c08edc645
+MISC ChangeLog 3048 SHA256 40b00804c1565323983f5dbc7c6d82c8da807c959ca0ad5575211da7e415db7e SHA512 0b4d37603630d250d0a5598a9c6fe7f56899e9807ab3e8bdc6b7a1d63775aed7405de4f533e06e31f3be944946e13072584af15a84ade60a99e7838cf410952d WHIRLPOOL 9813c9f3d0711d4c84d621bdd09d62b19015298b8e5aebfc6c8bcd0f8ef4bc317698f9858da60f8da9035bf8f1b8c17268da8dec5dce7f32dc0d49afb4609648
+MISC ChangeLog-2015 2433 SHA256 e83143835d6e4cfd34d2c5b573c320a02a385791ce98f99b0104b132482dfea4 SHA512 0bc4b0419ec016c8e21d9e50caa270c72020d4c6828c7c1084d6305edd7d95618ed9f5b2c875124e904fc696ea260533b9282158f40e312830a8f670df978ecc WHIRLPOOL edbf7045b5d5dbbcad23a97dd7154601a24caf835ed23fb25d81a09f7d02907656a4af2f4a9625f926e1df538a2fef21a9151d09309ee57a1a18d9a02b844d4e
+MISC metadata.xml 630 SHA256 3a4ba61f7bff79c54cafca1934cf039639466bcf191ac997cf70ba094233aad5 SHA512 9d08bb18d5ff85f2301d2b1f2aff814cb63257c3fdd1b19d4fe72ce5060d9cbedd0c26a5f3fd55cc972f3c41861bea7df92584945b381b7e8f8caa3d7d97f39f WHIRLPOOL c961eba9a6e3f2980aa91cfa8fc488df4f3174e921649237d017a01633b60048066f734d6eef821b5c325d8ed9bd4b8b6890db0ee33fb3eacb8ef23c3143fae1
diff --git a/dev-python/twill/metadata.xml b/dev-python/twill/metadata.xml
new file mode 100644
index 000000000000..99a143d0daf5
--- /dev/null
+++ b/dev-python/twill/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		twill is a simple language that allows users to browse the Web from a command-line interface. With twill, you can navigate through Web sites that use forms, cookies, and most standard Web features.  twill supports automated Web testing and has a simple Python interface. Check out the examples! twill is open source and written in Python.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/twill/twill-0.9-r1.ebuild b/dev-python/twill/twill-0.9-r1.ebuild
new file mode 100644
index 000000000000..127b1b3cfb74
--- /dev/null
+++ b/dev-python/twill/twill-0.9-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Simple scripting language for web browsing with Python API"
+HOMEPAGE="http://twill.idyll.org/"
+SRC_URI="http://darcs.idyll.org/~t/projects/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+IUSE="doc examples"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		$(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' 'python2*')
+		$(python_gen_cond_dep 'virtual/python-dnspython[${PYTHON_USEDEP}]' 'python2*')
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup 'python2*'
+		pushd doc > /dev/null || die
+		chmod +x make-epydoc.sh || die
+		./make-epydoc.sh || die
+		popd> /dev/null || die
+	fi
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/epydoc-html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/twisted-conch/Manifest b/dev-python/twisted-conch/Manifest
new file mode 100644
index 000000000000..6f232cdec486
--- /dev/null
+++ b/dev-python/twisted-conch/Manifest
@@ -0,0 +1,7 @@
+DIST TwistedConch-13.2.0.tar.bz2 243977 SHA256 1559f2070e47a8dfb63a387a8d8deb4dae73226429b26bf2983dc7d1df86cc69 SHA512 3e9cfe76b5fdd8e18732d554721d493bed70b757b21029f8e126d486011b41da26a34409062cb5ffe4283a57b6d342434c84959b78b2781f069e22d2da610043 WHIRLPOOL 7ddf201c17f6625cac09197bfc1b532d1f6f8bd01b888668ccb16b5577b235a3379af11e436e0a4ed308218b6fc27e1250841367dc8c191bc420f4a90a7a2a49
+DIST TwistedConch-15.2.1.tar.bz2 222736 SHA256 77ad3f89fcad8918067e047831c0716a514ff5f9405d6896abf17fd3de05d634 SHA512 d21879801e3cc925345e6528a84fa031f5cc1c8a2b5aebc5d3540fdd356d9743fe827ab8060db13b462a6d8986ac23307feaf78725950cef462f06b4edb93df7 WHIRLPOOL 072a90c66380467354e32af702a0caef71bbd4de469681240e3e91deb74927e5364835d4065a72224433d716763b5eff503adc5205c28a61a07f7ec51c1fb671
+EBUILD twisted-conch-13.2.0.ebuild 788 SHA256 31baad9a8227a9ceb2d4b13555fc6dc52eed51fc3cb0839c1ec47c9e7ca880da SHA512 4e66a99ec56754da74a8e3c58da79cc837b7f723518efed38fa9f245508e0d47d14a4ea307840719590d22b187b1a1ea10854efb311a0c1af437391032e06e7b WHIRLPOOL 1bbf365b4cb54af0cc4d8aa282a09a439f147781c43ef687e8744790b726770605f22e857060583ce8ac3d4e653b5129a9d97ed476aefada09ecb6f83df7911e
+EBUILD twisted-conch-15.2.1.ebuild 473 SHA256 1de06128b4f6aac8aea304a10a97219a828bcad7dc1f3c8263d93bea68567976 SHA512 18069e442a45f56384c57aa69c17dfe18810d842fc9e599daa3bf92f8e40c0fd854934aa36c7379ab68443f3a725346b593e1ce4563a7371017c41de7281ceb2 WHIRLPOOL 200583473b78c2edf5e0d29404f5709bdef1da7448d258c5a3bb3e019e76116e6a487ddd27d736ecd9f3f0bd4be956b25e41a37aa1c11f25dae565bdde6ec43b
+MISC ChangeLog 3522 SHA256 d25ab309c4a56d45ac8f1f3ac118cff8439646082a4fb610e3d4d5d7bf41819f SHA512 71e69a7d0794b8a6d93c63bdc370c4416e4060ebf99a33c42b3fde4cbc3983989fc40b0038cf0cc527fab9546a082f85cb1a54da1837a7f9f3f4b4417e2a2581 WHIRLPOOL c978f7e19b7ecb3ed99f5448090239d181e455e5a71de92c85c28d35b34f479ca72ecd74617be2f1d385d7d6f57aedb6630f07b3282e3a2954a201c282d0c9b7
+MISC ChangeLog-2015 16985 SHA256 2297eac0a701dfa62ae43606f0bcaecc0dc570e4561ed495cc5a4e24e0287411 SHA512 dc94686d8dce2328fa18fc3f62b66c8bd63bbe57be3f8941870128acce92f52491cd2b65cddfe5015f084d450456d1f30b34ab1c4c29292198528ac88a3fdf01 WHIRLPOOL ae4c7254c27b4dc0f00ba3acf57673dc6659da4a881a1a0f421d25992ee7b14cd1e230f16ef8a8168907d3412e69c02c82cc9764f1821cf25b22dcc37a0916eb
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/twisted-conch/metadata.xml b/dev-python/twisted-conch/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/twisted-conch/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild b/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild
new file mode 100644
index 000000000000..65a2ca05ac74
--- /dev/null
+++ b/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted SSHv2 implementation"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	!dev-python/twisted
+"
+
+python_prepare_all() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed -e "s/test_checkKeyAsRoot/_&/" -i twisted/conch/test/test_checkers.py
+		sed -e "s/test_getPrivateKeysAsRoot/_&/" -i twisted/conch/test/test_openssh_compat.py
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild b/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild
new file mode 100644
index 000000000000..e28a1ad781cf
--- /dev/null
+++ b/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted SSHv2 implementation"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86"
+IUSE=""
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!dev-python/twisted
+"
diff --git a/dev-python/twisted-core/Manifest b/dev-python/twisted-core/Manifest
new file mode 100644
index 000000000000..4c52fa8c548b
--- /dev/null
+++ b/dev-python/twisted-core/Manifest
@@ -0,0 +1,12 @@
+AUX twistd.conf 277 SHA256 aa2ffa5b128973bc0c58a1251b8bbb56f6f890728bc902805ea2db7606416119 SHA512 76d44caebab8404f16937c2515ad9ae8236732a48c7127366f7fa22c6ed3d88ace2d33b832a6d95f775973d41b7caf75344805fe5b01e964c04eb710bf3c89fb WHIRLPOOL 89223406ed730b82c5bf7b8d62bd0f12dbe1a1ab0ac69943fb0192970ea98870d369397a0dccbf0952d9e44abfaf2e897063c6e398efc6b4a7050fbf01593289
+AUX twistd.init 563 SHA256 cb0ee0ff81d50f673b4359b1329e72352e6f5d32f061aba5f8d1f9806f0ec217 SHA512 7860601beba1efda2b0a045b2a044ec33caff9ee915d45225c05e281760a68da349b4c45080600177aab32aa806714327acf3cf5dda92be0874f781f129bb129 WHIRLPOOL bbf71d8496a67e7d9da08a3958ae02be96c86894a665462af899bc551e9e823f65963fcf797fa53571c56b76bdb229c3ee1de51845600ee2ebb312c9bc681fa0
+AUX twisted-core-12.1.0-remove-tests-conch-dependency.patch 459 SHA256 a0d301adb3e8f6af04c15d9155c50959634c79ec5dc9b52de5628f5fbc056326 SHA512 bb68becc92aabb539658b0435f12c03612fc825eee1d1b63873d008f1b8fd18806d3dc00987931aae4e3cc86e5f57b94c17e1c1227f1019e17bbce9930f919d9 WHIRLPOOL ba485f8713ddda2f18b5878ebb5eb4368abd7df9149f07af3caec4b9714fc6a0ca71c5423a48cdc84edca0ec2fd4625796227d37724cdaff6c1f5142d00fc4d2
+AUX twisted-core-2.1.0-echo-less.patch 269 SHA256 1f190151c00c37dc5055f9b2b1dd7b0943523f29d57f78d5ca5f57723e3d9705 SHA512 74e8ab5de6545a09159cbaeae63688e0bb3fe1bf7c78fc14945cef0c8d017ee5157fdf41e0730bdf2bb47d2405978fffea1c2c6c660e3838a659b523e6ef0f2d WHIRLPOOL 66a8d5ec67e2dfc18172c62f11b72a36accf2c437418bb54572f6c21ad85e3600d8377e9bef938aaa537546978fdcb846cee60f5a8f53d72111b912b085dec33
+AUX twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch 419 SHA256 f8e35bfeb14010ddd2c372fc5a9ae2ce0c72aa67bd452b2ccd12368f31c28818 SHA512 b77cdc6f7df5a283075f1bde7f974482cb5c5f49c9189b0f3fc3a39da18fbb7ade30a115cd76cc4241d5bc8727994cfcc1e96aaa835c68f753b6ac3523438a63 WHIRLPOOL 8cf0d43049624a779d370f785cd45c1de5ed0ac0a9de661ef48442f05f54cb773a6e0cbf2b0408bae0a689f5693e91fd259d156520f58b2097dd0fdb1572bf29
+DIST TwistedCore-13.2.0.tar.bz2 1496299 SHA256 396ee27f0e824772bf26c636c69c2751127738127e283112e72c2de6c28e36be SHA512 90cf2019f0d5b125c7bbb5a9e3e7d2dedcd8efd5f9b2ab057e0b41f899d394b995fe599128223c82b1a634fb881ad7ae8ddc5b86b26adb28a3834c05da45f2c6 WHIRLPOOL 21a90a98b36775db4e6154c30ea697ef53f4b94a30e1be125e420019d5200cbbf31178937c41b12ffb841b028875dbc6b1234cebf8036f4165d2908c431a6de4
+DIST TwistedCore-15.2.1.tar.bz2 1179442 SHA256 42efb31330e09b5ffdb8caf735fdb925692c6cfdc03ab7ad25104c3dc41154bb SHA512 c5923d71903afac7dec15d130ff3bd247dc1a6cdeb35cc642912a43f1e5640088971ddfc7abe3e18ca1853e59ba6a417d4b465fb422aba1a052bc156d7c6e820 WHIRLPOOL 8abb2522447fd2e9ad0d3d2e3e0cac8e17e07cd80695b95f12fda6af6ccd6576f4b808f322731445667d194c2216669ad3d4d58c0bc5f798449f1d0a35bcc638
+EBUILD twisted-core-13.2.0.ebuild 3633 SHA256 0c4e214aba72ccb1ac0ba251b6e4c595d4a7f434a8007953654ea233f0f6e5ff SHA512 8fe6f175dcccaf82e92e2d2a056cb75cff245d8b62ddae54bdfb3eb953ea6156e0b2cd63c0e6f56139f2e4a9a04bf545268931834a2698f1e3cf88e784929399 WHIRLPOOL 6010ca925fdac6ac66317cb2ca9bad40879aad06e10ad3e8e4ba48e6d326cad1ae7664036b7520728b1ce32900cdb594b96dd306ead9d0c4c129f02aecc96f43
+EBUILD twisted-core-15.2.1.ebuild 4108 SHA256 49098c75eb99d8d0cf4d01cc2e5c4226d2c4038c8bd32ff7718970fca198f659 SHA512 081c1ace52cbba4ed6cab3bb500dd94db132f11bbc683d74b423bd6b7e7534ef87f42e9f8c4592624e157cb49631e1ca2f7489075962cd2727f6779e38fe0478 WHIRLPOOL 112956bc5e0e1b7db4bafe8212e51de71092df777ebe8305b0011d013e0a60a768ba91d186791d76c0db59fea07780109fd8a86d2d63c644d6488f459fac2b84
+MISC ChangeLog 4835 SHA256 0e031cc2321ba9ba6e11dcd87466e772c0d87ed5d3a878e793f7881976003459 SHA512 1d3f0e95c5c5c2f5c9055b62e29f3c84ba537436f4780bf02c337aad678aba6e55efdcf774cfef41a310e2fa92b0eceec253fd77137c5cbb03d04552573ab758 WHIRLPOOL c9dc85c328ba6f91bd7ac353d7dea9fe2f7710793383a737aaeaefc760bd36e13dcb0f9a10439a62455aa5fcd91081c6ad7151ff54aa6d6bd9c099f3b0715de5
+MISC ChangeLog-2015 33423 SHA256 98e889c9f5dcbaed6ab7e15854944896cf05abf1f6702addc9a8287154612b1e SHA512 26828f823a84efc725b0d433937fcf26f6783cdb316ea6af302c5e05e40237b7decdb21fea1475d87a87ad2dccfa8a517a56ccb7f9fbdd7ef52bb260927b272e WHIRLPOOL 30bf5b8e60983eda0609f64a282323595cc31f15620e13fdc5aa2df1548dbada67faac99ea0949c90c869ca3f1fd4dd0db3b89f1c273b44eec6e2f5373673caf
+MISC metadata.xml 596 SHA256 fd44f30fd2868232466a34975336e0c97f6437ac7aa4a7d7e09d592b30330aab SHA512 acb4690541dd747cbee28993ec56a422149ef02150505b4b1ee1ab0418745dd074344a8cb2d3dfc76f7027229f921e8eb25738bfe4b829243dc4530c96a41440 WHIRLPOOL 62b6abb5933abec15c4dba4c60920913bcc1fc219662a7476df739c7d35548141bd3af41ae8306486dbabc263037df7fba6cd64fa54c44174749dd6681727de5
diff --git a/dev-python/twisted-core/files/twistd.conf b/dev-python/twisted-core/files/twistd.conf
new file mode 100644
index 000000000000..53788cd0017e
--- /dev/null
+++ b/dev-python/twisted-core/files/twistd.conf
@@ -0,0 +1,7 @@
+
+# These are passed to twistd.
+# TWISTD_OPTS="--no_save --logfile=/var/log/twistd -y /etc/twistd.tac"
+# TWISTD_OPTS="--no_save --logfile=/var/log/twistd -f /etc/twistd.tap"
+
+# Make any additions to PYTHONPATH the twistd needs here.
+# PYTHONPATH="/path/to/extra/python/modules"
diff --git a/dev-python/twisted-core/files/twistd.init b/dev-python/twisted-core/files/twistd.init
new file mode 100644
index 000000000000..b031b0020c6e
--- /dev/null
+++ b/dev-python/twisted-core/files/twistd.init
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+
+depend() {
+	need net
+}
+
+start() {
+	if [ -z "${TWISTD_OPTS}" ]; then
+		eerror "TWISTD_OPTS is not set!"
+		eerror "You need to configure twistd in /etc/conf.d/twistd."
+		return 1
+	fi
+	export PYTHONPATH
+	ebegin "Starting twistd"
+	start-stop-daemon --start --quiet --pidfile /var/run/twistd.pid \
+		--exec /usr/bin/twistd -- --pidfile /var/run/twistd.pid \
+			${TWISTD_OPTS}
+	eend $? "Failed to start twistd"
+}
+
+stop() {
+	ebegin "Stopping twistd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/twistd.pid 
+	eend $? "Failed to stop twistd"
+}
diff --git a/dev-python/twisted-core/files/twisted-core-12.1.0-remove-tests-conch-dependency.patch b/dev-python/twisted-core/files/twisted-core-12.1.0-remove-tests-conch-dependency.patch
new file mode 100644
index 000000000000..db2e2454bbc6
--- /dev/null
+++ b/dev-python/twisted-core/files/twisted-core-12.1.0-remove-tests-conch-dependency.patch
@@ -0,0 +1,15 @@
+Index: twisted/test/test_strcred.py
+===================================================================
+--- twisted/test/test_strcred.py	(revision 34525)
++++ twisted/test/test_strcred.py	(working copy)
+@@ -352,6 +352,10 @@
+     except ImportError:
+         skip = "PyCrypto is not available"
+ 
++    try:
++        from twisted import conch
++    except ImportError:
++        skip = "Twisted Conch is not available"
+ 
+     def test_isChecker(self):
+         """
diff --git a/dev-python/twisted-core/files/twisted-core-2.1.0-echo-less.patch b/dev-python/twisted-core/files/twisted-core-2.1.0-echo-less.patch
new file mode 100644
index 000000000000..c180a111021d
--- /dev/null
+++ b/dev-python/twisted-core/files/twisted-core-2.1.0-echo-less.patch
@@ -0,0 +1,13 @@
+=== modified file 'twisted/test/test_process.py'
+--- twisted/test/test_process.py	
++++ twisted/test/test_process.py	
+@@ -76,7 +76,7 @@
+ 
+ class EchoProtocol(protocol.ProcessProtocol):
+ 
+-    s = "1234567" * 1001
++    s = "1234567" * 11
+     n = 10
+     finished = 0
+ 
+
diff --git a/dev-python/twisted-core/files/twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch b/dev-python/twisted-core/files/twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch
new file mode 100644
index 000000000000..2fe22f1640b1
--- /dev/null
+++ b/dev-python/twisted-core/files/twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch
@@ -0,0 +1,11 @@
+--- twisted/plugin.py
++++ twisted/plugin.py
+@@ -174,7 +174,7 @@
+             if pluginKey not in existingKeys:
+                 del dropinDotCache[pluginKey]
+                 needsWrite = True
+-        if needsWrite:
++        if needsWrite and os.environ.get("TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE") is None:
+             try:
+                 dropinPath.setContent(pickle.dumps(dropinDotCache))
+             except:
diff --git a/dev-python/twisted-core/metadata.xml b/dev-python/twisted-core/metadata.xml
new file mode 100644
index 000000000000..28680e22a671
--- /dev/null
+++ b/dev-python/twisted-core/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="serial">include serial port support</flag>
+	</use>
+	<longdescription>
+		Twisted is an asynchronous networking framework written in Python,
+		supporting TCP, UDP, multicast, SSL/TLS, serial communication and
+		more. It is used by most of the servers, clients and protocols that
+		are part of other Twisted projects.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/twisted-core/twisted-core-13.2.0.ebuild b/dev-python/twisted-core/twisted-core-13.2.0.ebuild
new file mode 100644
index 000000000000..20bace99b07e
--- /dev/null
+++ b/dev-python/twisted-core/twisted-core-13.2.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit eutils flag-o-matic twisted-r1
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt gtk serial"
+
+DEPEND="
+	>=dev-python/zope-interface-3.6.0[${PYTHON_USEDEP}]
+	crypt? ( >=dev-python/pyopenssl-0.10[${PYTHON_USEDEP}] )
+	gtk? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}
+	!dev-python/twisted
+"
+
+PATCHES=(
+	# Give a load-sensitive test a better chance of succeeding.
+	"${FILESDIR}/${PN}-2.1.0-echo-less.patch"
+
+	# Skip a test if twisted conch is not available
+	# (see Twisted ticket #5703)
+	"${FILESDIR}/${PN}-12.1.0-remove-tests-conch-dependency.patch"
+
+	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
+	"${FILESDIR}/${PN}-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
+)
+
+python_prepare_all() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed \
+			-e "s/test_newPluginsOnReadOnlyPath/_&/" \
+			-e "s/test_deployedMode/_&/" \
+			-i twisted/test/test_plugin.py
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		# Needed to make the sendmsg extension work
+		# (see http://twistedmatrix.com/trac/ticket/5701 )
+
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# NOTE: on pypy a couple of failures (refcounting, version-checking) is
+	# expected
+
+	distutils_install_for_testing
+
+	pushd "${TEST_DIR}"/lib > /dev/null || die
+
+	# Skip broken tests.
+
+	# http://twistedmatrix.com/trac/ticket/5375
+	sed -e "/class ZshIntegrationTestCase/,/^$/d" -i twisted/scripts/test/test_scripts.py \
+		|| die "sed failed"
+
+	# tap2rpm is already skipped if rpm is not installed, but fails for me on a Gentoo box with it present.
+	# I currently lack the cycles to track this failure down.
+	rm twisted/scripts/test/test_tap2rpm.py
+
+	# Prevent it from pulling in plugins from already installed twisted packages.
+	rm -f twisted/plugins/__init__.py
+
+	# An empty file doesn't work because the tests check for doc strings in all packages.
+	echo "'''plugins stub'''" > twisted/plugins/__init__.py || die
+
+	# https://twistedmatrix.com/trac/ticket/6920
+	sed -e 's:test_basicOperation:_&:' -i twisted/scripts/test/test_tap2deb.py || die
+	sed -e 's:test_inspectCertificate:_&:' -i twisted/test/test_sslverify.py || die
+
+	# Requires twisted-web creating a cric. dep
+	rm -f twisted/python/test/test_release.py || die
+
+	# Requires connection to the network
+	sed -e 's:test_multiListen:_&:' -i twisted/test/test_udp.py || die
+
+	if ! "${TEST_DIR}"/scripts/trial twisted; then
+		die "Tests failed with ${EPYTHON}"
+	fi
+
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	cd "${D%/}$(python_get_sitedir)" || die
+
+	# create 'Twisted' egg wrt bug #299736
+	local egg=( Twisted_Core*.egg-info )
+	[[ -f ${egg[0]} ]] || die "Twisted_Core*.egg-info not found"
+	ln -s "${egg[0]}" "${egg[0]/_Core/}" || die
+
+	# own the dropin.cache so we don't leave orphans
+	touch twisted/plugins/dropin.cache || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}
diff --git a/dev-python/twisted-core/twisted-core-15.2.1.ebuild b/dev-python/twisted-core/twisted-core-15.2.1.ebuild
new file mode 100644
index 000000000000..2293fc3cb684
--- /dev/null
+++ b/dev-python/twisted-core/twisted-core-15.2.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit eutils flag-o-matic twisted-r1
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt gtk serial test"
+
+RDEPEND=">=dev-python/zope-interface-3.6.0[${PYTHON_USEDEP}]
+	crypt? ( >=dev-python/pyopenssl-0.10[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}] )
+	gtk? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )"
+DEPEND="
+	test? ( ${RDEPEND} )
+"
+RDEPEND+=" !dev-python/twisted"
+
+PATCHES=(
+	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
+	"${FILESDIR}/${PN}-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
+)
+
+python_prepare_all() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed \
+			-e "s/test_newPluginsOnReadOnlyPath/_&/" \
+			-e "s/test_deployedMode/_&/" \
+			-i twisted/test/test_plugin.py
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		# Needed to make the sendmsg extension work
+		# (see http://twistedmatrix.com/trac/ticket/5701 )
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	pushd "${TEST_DIR}"/lib > /dev/null || die
+
+	# Skip broken tests.
+
+	# http://twistedmatrix.com/trac/ticket/5375
+	sed -e "/class ZshIntegrationTestCase/,/^$/d" -i twisted/scripts/test/test_scripts.py \
+		|| die "sed failed"
+
+	# Prevent it from pulling in plugins from already installed twisted packages.
+	rm -f twisted/plugins/__init__.py
+
+	# An empty file doesn't work because the tests check for doc strings in all packages.
+	echo "'''plugins stub'''" > twisted/plugins/__init__.py || die
+
+	# https://twistedmatrix.com/trac/ticket/6920 6921
+	# Just re-exposing them to list a full list of deficits
+#	sed -e 's:test_basicOperation:_&:' -i twisted/scripts/test/test_tap2deb.py || die
+#	sed -e 's:test_inspectCertificate:_&:' -i twisted/test/test_sslverify.py || die
+
+	# Requires twisted-web, twisted-lore and twisted-names, creating a circ. dep and fail even if installed.
+	# test_loreDeprecation and test_exist failures appeared in version 14.0.0.
+	# Possibly due to over taxing of the distutils_install_for_testing function
+	rm -f twisted/python/test/test_release.py || die
+	sed -e 's:test_loreDeprecation:_&:' -i twisted/test/test_twisted.py || die
+	sed -e 's:test_exist:_&:' -i twisted/python/test/test_dist3.py || die
+
+	# Requires connection to the network
+	sed -e 's:test_multiListen:_&:' -i twisted/test/test_udp.py || die
+
+	# Appeared in version 14.0.0; https://twistedmatrix.com/trac/ticket/7422; known failures
+	# Upstream somewhat unreceptive
+	# The last of these invokes a hang or a long delay
+	sed -e 's:test_dataReceivedThrows:_&:' \
+		-e 's:test_resumeProducingThrows:_&:' \
+		-e 's:test_resumeProducingAbortLater:_&:' \
+		-e 's:test_resumeProducingAbort:_&:' \
+		-e 's:test_fullWriteBufferAfterByteExchange:_&:' \
+		-i twisted/internet/test/test_tcp.py || die
+	sed -e 's:test_logPrefix:_&:' -i twisted/internet/test/connectionmixins.py || die
+
+	if ! "${TEST_DIR}"/scripts/trial twisted; then
+		die "Tests failed with ${EPYTHON}"
+	fi
+
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	cd "${D%/}$(python_get_sitedir)" || die
+
+	# create 'Twisted' egg wrt bug #299736
+	local egg=( Twisted_Core*.egg-info )
+	[[ -f ${egg[0]} ]] || die "Twisted_Core*.egg-info not found"
+	ln -s "${egg[0]}" "${egg[0]/_Core/}" || die
+
+	# own the dropin.cache so we don't leave orphans
+	touch twisted/plugins/dropin.cache || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}
diff --git a/dev-python/twisted-lore/Manifest b/dev-python/twisted-lore/Manifest
new file mode 100644
index 000000000000..d28bcb99fb4e
--- /dev/null
+++ b/dev-python/twisted-lore/Manifest
@@ -0,0 +1,7 @@
+DIST TwistedLore-13.2.0.tar.bz2 88616 SHA256 53ca37c533048ddaf209548a21bf3078cb56dce48099251fb6bae107ed9d66df SHA512 a05752e2854c404da30562062e1d72d0376ebd5b82c3371183023936851bb6394dc3ff95160efc3e7e7781624ac48485d7c102e4487cf3bfda2a086bcc596ff6 WHIRLPOOL 380309ec38864a53605e4ab321b61d316f9edfad0696070f958151f66c0775f29b31e75305e94272cbcdb08210f35f0e43d4c717af521b29538ea9aec08b5fd3
+DIST TwistedLore-15.2.1.tar.bz2 54070 SHA256 0997d71f84de67fa11662d057ce6e42059fb389fd6bdfb09d8ed6b5df32efe8f SHA512 9d9c45443f702e527f82dd25b7ed73af24b1ff16d266eb0cb6cb5be230939ed2ba07dfcd9d7b02d48823043b64b33df916b58dd1d1280d3f4e4f7c3cec851d7a WHIRLPOOL e15cdf266975438965fdd4d6d0fd6693d3a3b5281601ac31af8b1aaa6cdea5dea21711ea28f6d2b381123134583f427b904a5a946e465267bccb4c69c7739c54
+EBUILD twisted-lore-13.2.0.ebuild 446 SHA256 5d762cef7a6438ad865fff95957c3af04d9cae09e5724c0f7056c868d302bafa SHA512 531e8c2a3f5fc6c14b1aaa86b10af1779288ed0950ed040644104796a36e361aa5a25bcd3fcf0f8c139f09f5c74b15ab087db41b1169225c49968ddd97e0b49d WHIRLPOOL e5eb6e178b62ba629877f781e851af23c655a683c349a97452a9a84b5317290cc7b946459576fa239135bf5966a926de9abbeddd1d00ff280f5c437a000a0c4c
+EBUILD twisted-lore-15.2.1.ebuild 444 SHA256 e72f3b53600a38cd9402cef83981c3891d5f689066aa4af282d617f5197ecb2b SHA512 72c05725810425f09d24a18a272e6654ddac7de9a7fff7e922eb7526f82dd8e305f32c1f3f6477f7889da92a8d10d46986fcf4571ac1a605c8a772e046c021b4 WHIRLPOOL 2b5784c4d388d021e68d39690039617d8ca95769b2c0919463198a97a05f474c71dc0367127ec3cb49ebe8a459e81d865eca658211072ac259e67cbbe26ec414
+MISC ChangeLog 3496 SHA256 6059a9d74154b7233b5d0690db7125213412344152a4472d33e8ab38a985eace SHA512 032b10fec510d4b248462f1168edeee181053ccb5994c4f4e755c0d88889a9335a81899f08af582db5009576ab71062002794fadc39c3eebed1c2e687c87661f WHIRLPOOL f486041cf22c5cf84ca239f05185e1e0942642f7245c4186c88cf80ca891d724bbfa47183a00b2875444f628933c850e2527d5c9cfa5775fa8fc6f7a15e290b2
+MISC ChangeLog-2015 12552 SHA256 4372a8bd3a6a375011f76b50d59218f450396df4e80ac9645645d8b78928f59f SHA512 6e31efad7681773092325ee8a14d6ee08a2a069d8d35833534194fb316d32b00dea00c7c318558e2c90d2cc4c33831132adfa4630c296314613db1ffef847d59 WHIRLPOOL 596405cbf369bc3e693ddc2af419223beb6d09bb1895bbc4246b2c95af171d46e9ae0c4cd617ebd57023e196639045e9c900e233533fb54b88e5e74f9f34efd4
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/twisted-lore/metadata.xml b/dev-python/twisted-lore/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/twisted-lore/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild b/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild
new file mode 100644
index 000000000000..ab7023f2f841
--- /dev/null
+++ b/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted documentation system"
+
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	=dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!dev-python/twisted
+"
diff --git a/dev-python/twisted-lore/twisted-lore-15.2.1.ebuild b/dev-python/twisted-lore/twisted-lore-15.2.1.ebuild
new file mode 100644
index 000000000000..a7d27e5200e0
--- /dev/null
+++ b/dev-python/twisted-lore/twisted-lore-15.2.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted documentation system"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	=dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!dev-python/twisted
+"
diff --git a/dev-python/twisted-mail/Manifest b/dev-python/twisted-mail/Manifest
new file mode 100644
index 000000000000..b2f965132caa
--- /dev/null
+++ b/dev-python/twisted-mail/Manifest
@@ -0,0 +1,7 @@
+DIST TwistedMail-13.2.0.tar.bz2 160046 SHA256 6e4b3844a27bc1f85ae7529bf1c0574f6962c8ca66e08c3c06c2a5a2e39acfc8 SHA512 399e34dbf674e3e30acf49769fbb9c188f1dfc00187b82e67865490b5a9f2847ad1d70fc1bb930a50b4b77b3e017212590c93f3077a8464d9e1f662750f37314 WHIRLPOOL 274f5f60564d94beea5c4a4aa1593de4e602aa7f3fdd6cecfc25ab543d90e177e94b1a73c2857f00f870e3d37b0b427e31f424240fd499ec759ab16ee8797adf
+DIST TwistedMail-15.2.1.tar.bz2 161891 SHA256 fc50bee5b5aa95164f5aaf09d29fff3897abb7902db508fa58a004fdeb20d324 SHA512 d3c29ad842610dde6697e76456125716a8657f9e7938ac6e66fd3c226fc339e04551a2074c8af8627882c2a761414d5f856fe647b3900ed4eae0fbe7fb5bba23 WHIRLPOOL 264dc5e931291b7398022d0f3cae0f1af8dc4675b12950adaaa1613a9aa3596c66ec081751bb929be417e29a80e235ccfad9f63893dca66544fe76c65e38568d
+EBUILD twisted-mail-13.2.0.ebuild 590 SHA256 eecfbfcf8acc6b4841e8f02148e01256998ff6731b02fe13db9b227cdca87da4 SHA512 2b18307584dff18eb76d217fc8beed5001828e62cfee8b1470be5b9ca6c77048ab785430b427681f3efb5cd3228b17dd76f76e5087a580eb9110062e76314dc4 WHIRLPOOL e2ab05b395890fcc82ca26507e5e2ada0558209616192a8db339021c434ff5a6c2fe8fc4831fc0efa6267c0832cfa69f22c3931ca4e0def4a1be8721ebde9e61
+EBUILD twisted-mail-15.2.1.ebuild 585 SHA256 14476e44709afd125f91db4d3c0382bb63e433f971e24748eb397ac00b01bedb SHA512 d80354771efb2b3e94110bebd700f9222d6fead8dc6b9b9382d62d883dd05d46e69dc34f3fa21ac049ad65e22aa807694b38ba3be4a5baf47ae835547300e8be WHIRLPOOL 50f9caaa97563ff62bb12f934c01bffc85936a072ea4c546f968d71390c0822c843d252c39c47c17fa9f4213f32afc6843137191f454a6f7af77b55527a97773
+MISC ChangeLog 3496 SHA256 a6d520af894eea7f90a87dd16187ba482c2a6548c4e3c924975074168c9ea503 SHA512 1904bd500a79ef0bd39644d55a538a2d2130150a04835f16d50e49d34610ed793011a6bfe5eb003a09f714853872ba11dc8dca6b78c51372c2ef3dacdb8680bf WHIRLPOOL 73048892ffa549515a759380fdca5dee3c9fb107e85e14a9f9c84f6d145d95bb78435c070d75f4b5cc5fd40b148e277850cee53f9f85299354e6f7905d6b54a4
+MISC ChangeLog-2015 14866 SHA256 ad3d13bf9d5a04214605fad909381b5f06d1f0e8703223a6dbf9db99543ee81a SHA512 219eee7e421300719b25813e8bb2219dc10d6d7e3726c2af604cdf2c680af8672c66d3458963bb1869bcfbe4a638484eaa99b040cce4216c29924d6cc99d24b2 WHIRLPOOL 62dc1449dba804078e6a8e606a373e9fbfc5a00fccd7a0572cb7163668e517aa586beafd84db76d1dec4573f37eb4660b83e7d677eba7c60a172d7d0b9df3875
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/twisted-mail/metadata.xml b/dev-python/twisted-mail/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/twisted-mail/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild b/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild
new file mode 100644
index 000000000000..f831284f4ee3
--- /dev/null
+++ b/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="A Twisted Mail library, server and client"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	=dev-python/twisted-names-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!dev-python/twisted
+"
diff --git a/dev-python/twisted-mail/twisted-mail-15.2.1.ebuild b/dev-python/twisted-mail/twisted-mail-15.2.1.ebuild
new file mode 100644
index 000000000000..c1796b19db35
--- /dev/null
+++ b/dev-python/twisted-mail/twisted-mail-15.2.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="A Twisted Mail library, server and client"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	=dev-python/twisted-names-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!dev-python/twisted
+"
diff --git a/dev-python/twisted-names/Manifest b/dev-python/twisted-names/Manifest
new file mode 100644
index 000000000000..09b22db1da7a
--- /dev/null
+++ b/dev-python/twisted-names/Manifest
@@ -0,0 +1,7 @@
+DIST TwistedNames-13.2.0.tar.bz2 71127 SHA256 b8ed07790661eac454ee0bc424f9ede649dec87c11d423421ce2808795e131d5 SHA512 1dc7ac69f51a41f3fa6472ae633649d61935ca0c64233a86c69755e8a53100402842712beb2b555dfbf493696bcb4a0fa7d70fa2d3450fe0448b680f85eb9fb5 WHIRLPOOL b6d116781c9dbb408b0eac3fcd7c9ee5259e6d92fd6b7c737168dac14a6534c4f9f684170b6e0103f68703600284da68afb7dfc98f0d0d85117373ae41599053
+DIST TwistedNames-15.2.1.tar.bz2 88688 SHA256 9da80426cd1a1a9951af0adcc54635abda63988761b6f6a92c356916184daf68 SHA512 2ca2c4e4e9a49e82246f781f2fd1eb86a85d78236251e085dc88a8b52b7b58964cac4ff2db75a97ea652350f650bc06fcc4d4964747b7e9c5a6631c2ea6aed80 WHIRLPOOL 23e38dea7be7a418b5efa38d9b100411d3cf24b0bbe87aa8048b463eac7cccd372b1423f546428392942841f3d7eb6ad900f03ef206ff685de215f0e91182493
+EBUILD twisted-names-13.2.0.ebuild 512 SHA256 433ec32064bad0c042618c63a0bf3704334ddd0404f126153743d0e2291165bb SHA512 6f5b0fd30782b60d2b348400b49fb08cd20009969c8b88040822a0ac9418bfe99e1a4cb8f66e96ac4fa184da5ffbde9990e5c3aadce7dd484ced738cb3d76980 WHIRLPOOL a9ee7b1195280d00be7e1004b6dde80a1febf927890515a9a0c579bbe18e803fb40a6f518152e0b026533869655f53e147ca1d566a36e1cb2daa9eca6bcbc4c4
+EBUILD twisted-names-15.2.1.ebuild 514 SHA256 652ec50b68579deab875ec2dfdc0b962ea36c2b6baa4a6fd363acb9e026bc0fb SHA512 66b1267ca13c84e060e497f314792c88b761296546799c370dc1ae04a84dc1ec23a2dc9b03e6551ae3f764943246e40920310ee36a892c824f716f3e257af7f1 WHIRLPOOL f461df97656512b058216be34bdb9368a5103178b095ec687f18549b9bde6172d27abe0437ca58293995ddab4b69ac435c17aa4d24530fd91c91daa49350d336
+MISC ChangeLog 3683 SHA256 a5e5968678dc6b66f77b76b5cb89a3fa01f4c36def2a566fefe3e874161fe7cd SHA512 b22b2f39adb20c4beef780f632a0e48d9f2f27c7adaffc8cde1d002d46ce08b2d67b299fb69d6034fe6f8009bf63c30ca3365302337bcf9af996d698c304d030 WHIRLPOOL b66996675ae368bdd895b10612d80138edaee4e5b1e2a4b789114c464e8beb336aa5bfc42c584d5455b92b609850725c0f946b77c60942e128374e6c999ab902
+MISC ChangeLog-2015 14580 SHA256 b062afa93005c33ccad15be081a4e79076aec60cff6dd82defb75794c25038d1 SHA512 3370cbe4b40a032f0f9cf4ea2be2ed0dff00c3ecaacf21baf1bb22c8d159b86576890bdff1df370c8bc8c3b586a546a38aacccb3e54e765fd0012cc3d0ddcfbe WHIRLPOOL 443776f54ed6f2d6b7e91d853aadb2a934b00a8af39a2abd7c1657a23e4d13958e29e96c53898ba21896dcdaf521067532ccb995fdadafc9eb49cd3c5c7eea1d
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/twisted-names/metadata.xml b/dev-python/twisted-names/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/twisted-names/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/twisted-names/twisted-names-13.2.0.ebuild b/dev-python/twisted-names/twisted-names-13.2.0.ebuild
new file mode 100644
index 000000000000..097b111fc82f
--- /dev/null
+++ b/dev-python/twisted-names/twisted-names-13.2.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="A Twisted DNS implementation"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!dev-python/twisted
+"
diff --git a/dev-python/twisted-names/twisted-names-15.2.1.ebuild b/dev-python/twisted-names/twisted-names-15.2.1.ebuild
new file mode 100644
index 000000000000..cde2f2d8b8d8
--- /dev/null
+++ b/dev-python/twisted-names/twisted-names-15.2.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="A Twisted DNS implementation"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!dev-python/twisted
+"
diff --git a/dev-python/twisted-news/Manifest b/dev-python/twisted-news/Manifest
new file mode 100644
index 000000000000..76e6e8c77371
--- /dev/null
+++ b/dev-python/twisted-news/Manifest
@@ -0,0 +1,7 @@
+DIST TwistedNews-13.2.0.tar.bz2 19706 SHA256 e6499fdb79767fd620f8b3dfbf47b356343a92206dfb44833025159d69252f1e SHA512 439f35b882f28be1fa466fabe93c06cd688662a44dd21f58a3c2d9670f95910c038bb30b79c88f661f50be7eb9bb820f6d89a94fbf61bde2d8bb46af574c9274 WHIRLPOOL e989c04b9e89326ddae17ccbaf04e985c51f6dd1e69009b5b899131061f801e8503f9e952063ff1c65d31c04fbd65d418a698ad97b46116ceb4675007c50b112
+DIST TwistedNews-15.2.1.tar.bz2 19889 SHA256 56d5215e0971431dabedf7b5f9a162ae448c8e6d20b6318e627ab9eaeaf1e089 SHA512 faa3a2b7c6acf2d9f8a63ef79bf36fecc2d48101b701bf679b4837e54f8327e5dda75e207ac2cb03a35671781c9221f62f60885a0459e970f15d660d214e7342 WHIRLPOOL b0b4836fdc661c6daa663b13a589461a2579177867c0878d261dff7d7628c962b08f9b8cc1dcfa74b49035d473115a4b3dec8f289448502547c2edfbad130758
+EBUILD twisted-news-13.2.0.ebuild 473 SHA256 b561af8f52428a8e21a3f0c69371df624506f1b838494a038652cfc0c6e00ee0 SHA512 e678bd785dced8e6bf16f2c664d0049ccff40aa367176217706c0119dc14f7296de57bfc738ca9f8041cce5559b1fa4e1e9dc3cc451f747e802e09cd0cd87dd5 WHIRLPOOL 7889fc06baffc9797c6a2eb278ef67febd562f0b1b86417a13802957d780e2b2636c13195416a7776349bbec95271a8e183da20b83c007ac9ec51e08ee895750
+EBUILD twisted-news-15.2.1.ebuild 471 SHA256 2d2cc2577ba3bf3e1045f6580c08db5837ce6fe60615079fe301210cfe190bef SHA512 b42d58a25f79e272d3dcffc4c549538738e406e17cb249e7288c193729f846e79a2005eb0fe7afc8761c2f8ae66a003955eda60755e3bbee5365c317bd92bb82 WHIRLPOOL 61610ead5656d8787c988d504bef44f5f7b17688b3fe056b7e2198be7a7aa6c4fc36f6f351692af0cc34b99b5db973f330020473b44e0c8cf80871668749316c
+MISC ChangeLog 3496 SHA256 0f27ee5d4150106cf19684596e07521e0734806de192feccf361f78349408463 SHA512 0a578bf1e5dab31fb00976b7aa5339f6feb3190f5d0d2433c0646c7f448153ead2e8a0606dcecfd20ff5ee495ee8ce8df3221861011134e6fd92a3524531a9a4 WHIRLPOOL b6080980ef60ff62bbe26014e8af868efac0e842ed40cb80f9687002dc192045becba908bef0d96441c4755613b1981d0ec90023ea7c8ba617376e5750085eb6
+MISC ChangeLog-2015 12153 SHA256 8835d45bf8932d4ee447878120c7a57fe42e18bb1eeaee7f258708702a95c51e SHA512 d03ae5d8667cc462cca088aebac1343fb33f10fc8670ac346f5fb5da376a1622b153404fb12b8cbadcea618093a26eae0320399ed453dff6b9b37f4d3ec48718 WHIRLPOOL 264d266b59a46dfefdb3833709ca2fcac22902edfe5bbd632bd7d8c6c4680f833c4541da9e272813dc14cd9a3a24fbd09c1f862d68b7041308f9e3eaecb0c2c4
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/twisted-news/metadata.xml b/dev-python/twisted-news/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/twisted-news/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/twisted-news/twisted-news-13.2.0.ebuild b/dev-python/twisted-news/twisted-news-13.2.0.ebuild
new file mode 100644
index 000000000000..84bbf614e35d
--- /dev/null
+++ b/dev-python/twisted-news/twisted-news-13.2.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted News is an NNTP server and programming library"
+
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	=dev-python/twisted-mail-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!dev-python/twisted
+"
diff --git a/dev-python/twisted-news/twisted-news-15.2.1.ebuild b/dev-python/twisted-news/twisted-news-15.2.1.ebuild
new file mode 100644
index 000000000000..d2f124308b48
--- /dev/null
+++ b/dev-python/twisted-news/twisted-news-15.2.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted News is an NNTP server and programming library"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	=dev-python/twisted-mail-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!dev-python/twisted
+"
diff --git a/dev-python/twisted-pair/Manifest b/dev-python/twisted-pair/Manifest
new file mode 100644
index 000000000000..05d14f8535de
--- /dev/null
+++ b/dev-python/twisted-pair/Manifest
@@ -0,0 +1,8 @@
+AUX 14.0.0-tests.patch 1123 SHA256 eec3e55b9833689505dc6119cf1ffb587129fa3dba787df93bb34bdbaa8b83c3 SHA512 be807a3360e0e8807ffdc0ff571f2e5729935e16f8eb94cf97f50200465a17f72de8a8d50b9470967b6c04ebb6b559544d7ce8af82604104b3cd962d9a8c4f81 WHIRLPOOL 44956ef00b93d6fea2b166515b5c183f8348906d5d2c6ecb510d3b4205de7c895c09fb54fcf732e4d18b60ae79890cba4f6907c25bda109aac4ff68dc9ac6432
+DIST TwistedPair-13.2.0.tar.bz2 9251 SHA256 600c7dd1e9a4798540c16a7a94585a0e45e938b6f379ff863725bed85c91eb1d SHA512 931b2564e66d5056ce10695e7d9884b55d42c1081feaf9edc011aef9dff21f40e628312a89970f83619611967f155f26f4bbd9d1a325d30670e245e00f47e2d0 WHIRLPOOL 502e096358d0a92051f4b0179bb11d4884d5fac9bf4c4cd3e6b9620fa263f6ee69919c5bc89d7d9a427638e04694f19da529589bda88fa28faba610e8907625b
+DIST TwistedPair-15.2.1.tar.bz2 21755 SHA256 50a95ea152272d98048d10b987805d0aadca5ad3cd9b04580c8bde69bf260583 SHA512 e7e9c8d88ca490c5e9f41ade6aede36dc23ea935f7c1658355bf685e21000e4e20ee1a3ccc3ebdba312fe026a8b7b25f2bcf51c3761668c2c3ce86b37ad3c725 WHIRLPOOL fbfcc763d2fb3b93b369426d7cfcb1bb1309b3720f5fb97193a7ffcdffe67c966b1c2e89ef824df106fe84d5f5d35d934449d0c8a5a73de995c03d7da0e14e65
+EBUILD twisted-pair-13.2.0.ebuild 394 SHA256 88e1ffed0e0065eda382597bb474f81d8cc81ca26d116f9458c62b0133fca65a SHA512 b6f386a10af848bbdff709a3caf443805f925037f7a030edfda6741789daaa49b2be3ee9ed226f5da40b3afa4cc2b10b150c19c92c7d37749d8a9e9cf56933da WHIRLPOOL 693eafe9a873b344aa5690dea8f414cb301afa927b44c47f07f680035fceedd3f3e98b4bbe4977e213dae0b197adcd8ca56e0f5960f18807437ffe84912375fd
+EBUILD twisted-pair-15.2.1.ebuild 492 SHA256 efe40eb8806b70cd005e2e38d706b0c81969c91de3c1112720fdb5445c711667 SHA512 22b38bea91a9479e6bfb28dbf1bb7cdaa40a47f167126890d7565f9c8ca2b4a0d47c58b4196d63010ee883cf11362d7a8479f929b31d4ca6c30cbe4b7b82288f WHIRLPOOL e377021f6681d6150f592755c05dcf82a5d2b154f9215cbfd611b15d0dde230336a646250e680d8595c0a90d5460ba3a5dd1b6c18d1f71f740b3e2686136ac13
+MISC ChangeLog 3523 SHA256 e4a3fd87eaea6ddf7ebd4716260faf97cb6d0421f5a728233f5949be686cf124 SHA512 d7f87ac08af6db6df4537a6fe4788fad09052948565463f3d538db33551d713a14fed45bed61886663e29c6765c2521c160d6ddea6c4d7a33948c85f557add62 WHIRLPOOL 384053da6e6bd8912a269014ad8ec06101ad96ade538547cf02551398e66ad74a7e13452c5e2b5c744ec116df2285925e1b1e4f1f4cc3520b1e75890a5fbf1bb
+MISC ChangeLog-2015 3809 SHA256 2b5b2a7ae26379fefd447cf3bce6cba460a5827f721d7398bd39ce3c1f52babb SHA512 8ef68d9ae41506c52e853a16271f74e300f2575af750f907eb39e6e9f22f2da7332e55eb5468acb91e2fb4348bb8a2f722e29431e8458a111c459fc0f94ee985 WHIRLPOOL b519f70307fc287ca968094bb20b29ac01ee21153dd323b3d6dd9fd2656565b05dd40993c2194fbcbd2a64604f5569624cf12d7f4bd5780f7b07e728e0a7aa6b
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/twisted-pair/files/14.0.0-tests.patch b/dev-python/twisted-pair/files/14.0.0-tests.patch
new file mode 100644
index 000000000000..0ec7a032eb71
--- /dev/null
+++ b/dev-python/twisted-pair/files/14.0.0-tests.patch
@@ -0,0 +1,26 @@
+Allows user to access /dev/net/tun
+--- twisted/pair/test/test_tuntap.py.orig	2014-05-27 22:55:56.230232748 -0400
++++ twisted/pair/test/test_tuntap.py		2014-05-27 23:30:02.769956742 -0400
+@@ -10,7 +10,7 @@
+ import os
+ import struct
+ import socket
+-from errno import EPERM, EBADF, EINVAL, EAGAIN, EWOULDBLOCK, ENOENT, ENODEV
++from errno import EPERM, EBADF, EINVAL, EAGAIN, EWOULDBLOCK, ENOENT, ENODEV, EACCES
+ from random import randrange
+ from collections import deque
+ from itertools import cycle
+@@ -582,8 +582,11 @@
+         except OSError as e:
+             # The device file may simply be missing.  The device file may also
+             # exist but be unsupported by the kernel.
+-            if e.errno in (ENOENT, ENODEV) and filename == b"/dev/net/tun":
+-                raise SkipTest("Platform lacks /dev/net/tun")
++            if filename == b"/dev/net/tun":
++                if e.errno in (ENOENT, ENODEV):
++                    raise SkipTest("Platform lacks /dev/net/tun")
++                elif e.errno == EACCES:
++                    raise SkipTest("Access denied opening /dev/net/tun")
+             raise
+ 
+ 
diff --git a/dev-python/twisted-pair/metadata.xml b/dev-python/twisted-pair/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/twisted-pair/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/twisted-pair/twisted-pair-13.2.0.ebuild b/dev-python/twisted-pair/twisted-pair-13.2.0.ebuild
new file mode 100644
index 000000000000..d5057737aa8d
--- /dev/null
+++ b/dev-python/twisted-pair/twisted-pair-13.2.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted low-level networking"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	dev-python/eunuchs[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!dev-python/twisted
+"
diff --git a/dev-python/twisted-pair/twisted-pair-15.2.1.ebuild b/dev-python/twisted-pair/twisted-pair-15.2.1.ebuild
new file mode 100644
index 000000000000..58c8c34256df
--- /dev/null
+++ b/dev-python/twisted-pair/twisted-pair-15.2.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted low-level networking"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	dev-python/eunuchs[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!dev-python/twisted
+"
+
+# https://twistedmatrix.com/trac/ticket/7433
+PATCHES=( "${FILESDIR}"/14.0.0-tests.patch )
diff --git a/dev-python/twisted-runner/Manifest b/dev-python/twisted-runner/Manifest
new file mode 100644
index 000000000000..d8dd37af3d50
--- /dev/null
+++ b/dev-python/twisted-runner/Manifest
@@ -0,0 +1,7 @@
+DIST TwistedRunner-13.2.0.tar.bz2 12944 SHA256 0609d2706da8ed0f6e96ca1d94c7dbcb90cd3972d26e1c471df8532a7553e9fb SHA512 1ede91957ecf349164fb63e284896f8909c88e54c032c6c326aabe2efa3058b5b9ba232e5ca60e71776dff4514a6c23483d9720e815f07c48c10232831741489 WHIRLPOOL 1095f5cceb565d1dbdb4232baf4575365d07dde14545eb6779ca9f898cc666724a529aa4531e81ecc367f3ac86b67cae63ff9e692e75e8b6e11d37fce8015942
+DIST TwistedRunner-15.2.1.tar.bz2 13041 SHA256 5890b039f3dea6bdacd86a60de6eac299f96a180f35343d40273c7433afb0894 SHA512 9cf94b62cf978f0a11dcba7ee18632d94dbf27bf629f5632f6bdbfa21096a4a8ff5298df9e7e42f03469cf3b89dccc537b983cfb198e35ba01e0ef530baa3867 WHIRLPOOL 020d2b915119b7895479f53b40e55c12e779f937d58633d81a191fc5c0221793f2d51308e5120070ad5acabd4522d33a459a1aa764cb11528acde0ea60049cc8
+EBUILD twisted-runner-13.2.0.ebuild 423 SHA256 9b3cdc29c1b0ea74b3be529ec70c7da4486061e455f2cb1b70793ea62901c443 SHA512 6a845d073e337d3da50e9e088055d6cbd82d7618733d1a1e9339483419daa8c3272ca75d2860b72c00bb0128bf38c91058121e3f115a76bb25fc189fd0455310 WHIRLPOOL 878e517209905bacb634de2906a0f7909625e2ebd9e698ffc2b7b83e697ac59412bd6fa8d3e9c6f87e73941d1e59decb337600d1ee395c8a275303627c8dfb19
+EBUILD twisted-runner-15.2.1.ebuild 421 SHA256 6ba442d13c4ba6822c53da908fd579161ab0d3e6ef6547111e37a46206b9061d SHA512 590da41d2aad46627aa621160cec0fc5c5a5d4968200e1d51907fd4f6fdd3636616f02eecdc2168855a98a4d23198f9a3438ea1cf36363ec07919b04f431a51a WHIRLPOOL 0f0330f2fd179f12f02f82d534ec55deb1637b0ef12da3013e097f9bbc077cf5b74f3c25e7c377d12eaa186edeb6130029536b6c57de3061e6285e6a2c84997f
+MISC ChangeLog 3548 SHA256 27995ab93aad0119181e80091ca691c2ed2ed605736b069fcb2a87bd7afb4faf SHA512 b1d45a1b24f2a4e1cea44de4d5d19da6c4e01a66f92dbb061f357a7ccae9cf229d96fb3e950b0368c04895dff1b64bc147629619e01d7c7210d301ac8ab234f9 WHIRLPOOL 63fed9085924255b3d0bd1ba830fd03060e876d208da37ea53ba9fb04bd706162711ac548a07877bcbfc8dcd03594414a901744b3cc69f4bbe95e0e6f946615d
+MISC ChangeLog-2015 13023 SHA256 8a7321bc3c4e0bc16cd246d66be7391028c85e09b1bab54b6e429abc1faa99b0 SHA512 6a81d524d8b538f9518fb721e206d6c6f6dc97e519b7f7f6dc4230d18e4d3fda5ab1afc6dcdab3cc1d0e3a23e4f48fd87a1b2505674d47a6a653b29397da97a3 WHIRLPOOL a4a65b9f4f3a65d5d559095ce3812139cf0e85039e61b8ba046154eeca53cdd9daa61d848dac166fbcb0bad8a4e503f2219edf927e181bb1401e8117df3bfe6d
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/twisted-runner/metadata.xml b/dev-python/twisted-runner/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/twisted-runner/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/twisted-runner/twisted-runner-13.2.0.ebuild b/dev-python/twisted-runner/twisted-runner-13.2.0.ebuild
new file mode 100644
index 000000000000..92143997d6a9
--- /dev/null
+++ b/dev-python/twisted-runner/twisted-runner-13.2.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted Runner is a process management library and inetd replacement"
+
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!dev-python/twisted
+"
diff --git a/dev-python/twisted-runner/twisted-runner-15.2.1.ebuild b/dev-python/twisted-runner/twisted-runner-15.2.1.ebuild
new file mode 100644
index 000000000000..ee8ced798914
--- /dev/null
+++ b/dev-python/twisted-runner/twisted-runner-15.2.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted Runner is a process management library and inetd replacement"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!dev-python/twisted
+"
diff --git a/dev-python/twisted-web/Manifest b/dev-python/twisted-web/Manifest
new file mode 100644
index 000000000000..0984f97d08d3
--- /dev/null
+++ b/dev-python/twisted-web/Manifest
@@ -0,0 +1,7 @@
+DIST TwistedWeb-13.2.0.tar.bz2 403931 SHA256 aee160e0264d9dbaa0ec0613851128c91e3ac4246d3e9e13a6f2cfdfe7a4904f SHA512 69e721ec456214d000f88268340b7cf21186073af11e7f906bf95c9a1bfaf49fdc5832b4e39586ebdddd3f1378bf823ab147de58d7aa9e8491a2561a54389a1f WHIRLPOOL 9b6d02398cd29e763107338b7b0a2fd60f5ff9ea4d7578d179411c1e6470445621484cb532688d3d72f7634c5a119e52c5df86bfc462de0adf8da1ef875e3bf2
+DIST TwistedWeb-15.2.1.tar.bz2 231092 SHA256 fa93a74a264284eb3123bc2481855e83d4901a818b8e4cbb4f7563ca72a12586 SHA512 e2b155deed9b240f92f173e0fb188c1538ef2275cc6564b838dac8a5ac4c460e664791623cd3e3cde996b63f1619eff8d62636c2813e8b81da5054b8eea365e1 WHIRLPOOL 559f56657e5169f477c74e3d8f41b35ad89580ffcee49fca183c9cf9415d89003e9fdaa711e3770848f974f4d4094dac9c4411c05c3aa1582db26bc0ff77a2fa
+EBUILD twisted-web-13.2.0.ebuild 1127 SHA256 879b811d8c173869cb64bbb65088ed8122ab9d71b14c1b2ec6bda7185245fb18 SHA512 20d2f5bb58c1e9974d2606f7eac40639d99a1c446095b14d89e4b905442349c4573b59e26bdf33f2cbcabcc1800cd30a99562ce9f06d9a391c8e90f327ceb617 WHIRLPOOL bfd2b22eec53c2e20f5bd71e95c3ffa3ad5d2939acd0be43478c2ff197e16d75bbef2608fbd6d5575cbb9f890fed2ec74bb14e54ad850bc08c0cd5660a4cd566
+EBUILD twisted-web-15.2.1.ebuild 1117 SHA256 1980d77bb47e0d71fb1248f3122c7d11c1b31f1e556310f9142f229df16501f2 SHA512 f93c50516710eae93f14f8270b498202dba1aeb9b5a4e8ad5c98616a5dd821c96345a46bc1b0ff83d9ff23d96b01bcfed5601681953cef13dc977a793d3d1a79 WHIRLPOOL 0f01e8410387a5bc874e3dd952a279d5d8de217c5707c2741f6d4754b016ffc41daa421a11ae50948f15e06c157a8a34dd701b90a57187a33539e3995979cdc4
+MISC ChangeLog 3730 SHA256 628b848c171baa79b838e4f2473d3f59ec230f9bca47ded5a81e1d68fa8eb655 SHA512 2291245db0fedd4988ce97ae2297922890eb9d9a0d422878a34379a0b4c4e1bc7a9d04342f861921476b74789b241707f0a668f51a3981a0bf0b718c9d1f322c WHIRLPOOL 64fd73cf93d3878468987b914b44ed65632908da87a6bb93b2e0cedac0cb03521e190f0de34d669f7d3ee11ac22b841798ef7555141cc620c4e12a2a4bcbf459
+MISC ChangeLog-2015 16856 SHA256 0c89f2c8defe303e77feae8397b2a3a5c94c0b1b4711262e5776e9b1ec18599c SHA512 3d28c09403d0a607d8cb91d3980b3b19036ba9022db20ddc51026d677a45e8b0173ec337157acefb11ed0a57056450a5e88b37a644871224b69839ad3b2bea36 WHIRLPOOL 8c219faf7651430ed39d0e01a193f9eb447e3d0843c83ff8b976259ba569f82a1df92affc401be611c206e1e0f799f72b56d6c92d5b9d12b105cddbe0a7118cd
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/twisted-web/metadata.xml b/dev-python/twisted-web/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/twisted-web/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/twisted-web/twisted-web-13.2.0.ebuild b/dev-python/twisted-web/twisted-web-13.2.0.ebuild
new file mode 100644
index 000000000000..cf18e709ba5e
--- /dev/null
+++ b/dev-python/twisted-web/twisted-web-13.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+MY_PN="TwistedWeb"
+DESCRIPTION="Twisted web server, programmable in Python"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="soap"
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	soap? ( dev-python/soappy[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}
+	!dev-python/twisted
+"
+
+python_prepare_all() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed -e "s/test_forbiddenResource/_&/" -i twisted/web/test/test_static.py
+		sed -e "s/testDownloadPageError3/_&/" -i twisted/web/test/test_webclient.py
+	fi
+
+	distutils-r1_python_prepare_all
+}
+# testsuite has a PYTHONPATH oddity, currently appears to require a system install to effectively import,
+# putting in question as to whether it is a testsuite
diff --git a/dev-python/twisted-web/twisted-web-15.2.1.ebuild b/dev-python/twisted-web/twisted-web-15.2.1.ebuild
new file mode 100644
index 000000000000..25e20b15f996
--- /dev/null
+++ b/dev-python/twisted-web/twisted-web-15.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+MY_PN="TwistedWeb"
+DESCRIPTION="Twisted web server, programmable in Python"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="soap"
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	soap? ( dev-python/soappy[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}
+	!dev-python/twisted
+"
+
+python_prepare_all() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed -e "s/test_forbiddenResource/_&/" -i twisted/web/test/test_static.py
+		sed -e "s/testDownloadPageError3/_&/" -i twisted/web/test/test_webclient.py
+	fi
+
+	distutils-r1_python_prepare_all
+}
+# testsuite has a PYTHONPATH oddity, currently appears to require a system install to effectively import,
+# putting in question as to whether it is a testsuite
diff --git a/dev-python/twisted-words/Manifest b/dev-python/twisted-words/Manifest
new file mode 100644
index 000000000000..c4d3c8aedef2
--- /dev/null
+++ b/dev-python/twisted-words/Manifest
@@ -0,0 +1,7 @@
+DIST TwistedWords-13.2.0.tar.bz2 176411 SHA256 079c4acc179d71058b4c5f802ceda4e3f31eddae1f09b1ab88d1c642fab746af SHA512 84ff45f86a0c3d7074fdfcd01159833b461780b75c5135d7a1cc2b3c4c918ad2299c217e8f5ef8e9a71f87a005ec1037fcf870e56601fcee50347ac2e1c39105 WHIRLPOOL 6c68fa2faaf5deeb33cffb92f182f45257e13db88251b447f6a0e9690f80621234a8de13d53e976cb141a729763419bff1db55db94e274b836d491545fa1fb2f
+DIST TwistedWords-15.2.1.tar.bz2 168483 SHA256 ac316d252cc807e0b35728fe8e61d3613e2b52b4991004f896d6faeab63d8189 SHA512 aca278a69f5c4deceab0e6f1c6461186131e4b9e7558970175cd5a70232eb7096c3c10fd300a9d22612e97dceeba71765118af45eed7a610678f66d9036452e7 WHIRLPOOL d35c2643265ebb3cf9a3f9060b151120476f7f1d8fd2b81618b276d0bcad2e16a1bb7b90589d70d219fee72611db6cfd5f871ef398515e5c20f487d69d6cb849
+EBUILD twisted-words-13.2.0.ebuild 499 SHA256 67529c7abf4332c15e1bafaabf74ec176c82cf1669d3194dc4ec64c0ac94e401 SHA512 bab25a6be4e57772d5d6b3efe34042315c03ec428205c17f9acfa2554cc1396f2c3962774aef6d0585b65df5a2e719528d9653d222caadb5e6b3aad0930ba38a WHIRLPOOL f431830e6834d84598d05f37861428a7e28f13d7ef87e8fd20fb72e94a36b61ef8eb7d102cb301b31945062636d6008a8af33639f0801d3bafb9b3f42bb86bd6
+EBUILD twisted-words-15.2.1.ebuild 494 SHA256 6ec89d73db483b30b1da39169698c8539637c240753a51523fc7ce804a7b7272 SHA512 12d607e47d1be076a0f7e995b0fb7d2426d86e8f74664d4e1bef735480e810d0347071f51b6b478680b8f1c74c2c1847ddaa369083cce7a8be2e7dbca1bb7952 WHIRLPOOL b2e1e0d7d097b7f14f1006edfb9dff1042b82a24d9af343995624e3386d467b3fa4b1e2428a3f23a87b17418b3068ed457d171b3a20665893f803fda58e52d63
+MISC ChangeLog 3866 SHA256 18df825136a1b856ec1c8ff4da2fb271265527fc8be35744a8c57bbf9134e57f SHA512 3e5785842b5b45e01f9b3d09ffc32b5a0923888e920c761d6673d5dfa9574425ccb6a16f28612f5141fcba3b7e8e1d719d89952eb4e97825577cdf2ee3c7df59 WHIRLPOOL a43943b78c4e9e749d872fa50f7de392579eaf006609e3374c812ebadec47fef5fab364e4f48096f45ee6676aab0a2dac2b459d5c8b4e0ba3994682fabca6388
+MISC ChangeLog-2015 16267 SHA256 ec7e0a63b833e0bb9159c7ab9fe79e0539832616d6b8145a3fe837d8f221e739 SHA512 2731c62b064e53ee2a82fb4ef4d49553a3d6ff7414f83b0d3c877ef2465769060ed83ab54a89a0c074ec5f564c3938c4a56b243c492f86bfde95943e43cb065d WHIRLPOOL 050257fbd62b60730b05b8b6f6fb143a0c1235e193d16bf669cb4760fcb0325e1bf4b264a0342923e66ed148b5984d11893c14f3e9305fb763179253702b3734
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/twisted-words/metadata.xml b/dev-python/twisted-words/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/twisted-words/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/twisted-words/twisted-words-13.2.0.ebuild b/dev-python/twisted-words/twisted-words-13.2.0.ebuild
new file mode 100644
index 000000000000..3ab879eaa8a5
--- /dev/null
+++ b/dev-python/twisted-words/twisted-words-13.2.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted Words contains Instant Messaging implementations"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	=dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!dev-python/twisted
+"
diff --git a/dev-python/twisted-words/twisted-words-15.2.1.ebuild b/dev-python/twisted-words/twisted-words-15.2.1.ebuild
new file mode 100644
index 000000000000..3cfcc1ef0e48
--- /dev/null
+++ b/dev-python/twisted-words/twisted-words-15.2.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted Words contains Instant Messaging implementations"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
+IUSE=""
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	=dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!dev-python/twisted
+"
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
new file mode 100644
index 000000000000..53687f4091a0
--- /dev/null
+++ b/dev-python/twisted/Manifest
@@ -0,0 +1,17 @@
+AUX test_main.patch 3035 SHA256 0bfa9be1cc8c9c3fbca73e4bce4744a2b1a0efcb72ec4dc9f39fd7863bb8bfd3 SHA512 8e85a2aeb934f9a85bce223e50bae62e63188b4a75f6ef9e67badd040a6018075e7c777683106cf160d65383351d2d6ce02d3bc9a57e434e6e120ac8b669b147 WHIRLPOOL 83044025411aab4c16bdae727233f830568f53a77dd2ca4d62c84afe043919175ef4294bf8fd5bf4f1e752226e36449e883a44d0756a211ee97521d512b00744
+AUX trial 485 SHA256 e306d051d88242d109d39fceaa49271e4fd5823edc1a5d2d260faeadb104d2a6 SHA512 b6a58da5281e18306d558fd665acfff02e2478e4f692661a3ed0fc0b01e6e13794a8d2b56ac3f2790a0cdd83a882f37a247f5083ceaf6ed6686fb69bd87853ce WHIRLPOOL 07e6cc21f1e5ea43a9cd1a83e917490d996ed460dcd0e1d6ff69376f995f88028d405ba6f64e8e055594b6767f013cb6ea9c89f35e7524a16745123ef1e3e9eb
+AUX twistd.conf 277 SHA256 aa2ffa5b128973bc0c58a1251b8bbb56f6f890728bc902805ea2db7606416119 SHA512 76d44caebab8404f16937c2515ad9ae8236732a48c7127366f7fa22c6ed3d88ace2d33b832a6d95f775973d41b7caf75344805fe5b01e964c04eb710bf3c89fb WHIRLPOOL 89223406ed730b82c5bf7b8d62bd0f12dbe1a1ab0ac69943fb0192970ea98870d369397a0dccbf0952d9e44abfaf2e897063c6e398efc6b4a7050fbf01593289
+AUX twistd.init 563 SHA256 cb0ee0ff81d50f673b4359b1329e72352e6f5d32f061aba5f8d1f9806f0ec217 SHA512 7860601beba1efda2b0a045b2a044ec33caff9ee915d45225c05e281760a68da349b4c45080600177aab32aa806714327acf3cf5dda92be0874f781f129bb129 WHIRLPOOL bbf71d8496a67e7d9da08a3958ae02be96c86894a665462af899bc551e9e823f65963fcf797fa53571c56b76bdb229c3ee1de51845600ee2ebb312c9bc681fa0
+AUX twisted-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch 427 SHA256 a2ac4339a844b762cda9fbd8fd37205dd418ce9c303f8d7249ae4b43d20cbf3a SHA512 d14b4941c3a13c59dfe0599a3eb73b9b0d5bde8e7c26033848ac920da8e8c63a0290d7f4d711cab16a17ba55a2e13830ab02bbd0db38f0757768cb973000064c WHIRLPOOL e059394c92abcd9eb27d19a7cff297422080e0ac89a3432fdd879905bc8b5cd7f312862dd6a2c2494a1654528a882f9318e1549e4af649357e7281f257e3c700
+AUX twisted-16.6.0-test-fixes.patch 10591 SHA256 270293351eef926a18a4db99bef30ab1795727d0df0edb95c8c8335054421291 SHA512 5071ffe30d1911ab4eb301403542f34198cbb3e09137d6260125fa61f702a0ce10e5c11c7967c10841a9d1b62f2eaf44e04119182a108cfbb7046622ddbdbcf2 WHIRLPOOL 06d3d49ce1359a669bc7b250b82d615408f97a78392893df0bb97f3783a53a3cb1eb60bea19f97b87fd6f21a6c2efa381250615c5b0dcdbcec321bfcf0f3c88e
+AUX utf8_overrides.patch 2288 SHA256 dd2c9220dc7aecc15ed9c55a804b8512d75e90af9a1022e364ea58ec04101fae SHA512 b495268282e0233c570655b2b3d42ecc90116b22c36cdec4ebf581ce1019abedb7ee301d860ec161b4b5e691d1b747ad45257966b5f510de8dcce8271021e7e8 WHIRLPOOL be3f1998cbc8553606ccec61040dd97bf3f91af249073dd4c261043163780d5142fa9c966ffc803b30ff590b1de9cb7e5b82e2265cb2bde413881eea2f11ee25
+DIST Twisted-16.6.0.tar.bz2 2979747 SHA256 d0fe115ea7ef8cf632d05103de60356c6e992b2153d6830bdc4476f8accb1fca SHA512 0b8de0ec7f64457f76c396fced64b366b8e63c6e000a5edc6c6388cd917fb2f95711918cd8edda39e0aa77e2cd32b5d775d23630a5ad10fc013c18f8316300cf WHIRLPOOL a09a8747312580e3b27d222bf0942b714ad041044a817876e1731c5fa2ae3d11e4d5a45221d2e7d126ebb664730d15c886d5ae164841c7a8f0acd6e12c4691a9
+DIST Twisted-17.1.0.tar.bz2 2997334 SHA256 dbf211d70afe5b4442e3933ff01859533eba9f13d8b3e2e1b97dc2125e2d44dc SHA512 e5eedc9a70b7e4d0ec18dddaa82aa9a784e96fd517db65c278d822d15e8bdc65a35307a5a0474eb68dcb73fcd5508086bec605580a9f2f767bcbe27d714b4966 WHIRLPOOL 828a939134df47950a285c732867b3d4172e5e86a75fbdc1cc4365b5a24699a0b3fcb573b7e3d389eea591fc9fc79456c09f2d2c8f08d7e1215dc5761e88ed8e
+DIST Twisted-17.5.0.tar.bz2 2993816 SHA256 f198a494f0df2482f7c5f99d7f3eef33d22763ffc76641b36fec476b878002ea SHA512 0fd10e5db7c87daf0d2225cec9929f1040f0c67e9605bfb1a5bc84db8b825e943cfa08e094c32c25c680bddc6587bfdc525a994ad7b785396e5ddb2621649379 WHIRLPOOL 28a0578545d525b5239a897229904489c38fa1e7148f374c96e66d3071f8dcd861aa5b772b338e5aaa9e92cc4d0f19a1598136bc2f9a9173b2489f6ec7fb391d
+DIST twisted-regen-cache.gz 911 SHA256 e88fb326c0e24506d59afa3a4113e63c3e496fa1114156db6521f84fbce41652 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03 WHIRLPOOL 8077fc4d102bb8071e3163c386edf10c14a2cf0c8bbbf57c66787bdeb9b5f21115bcb022a770fe72b48914d829ff69384684f50928700f83547702d6a0d35423
+EBUILD twisted-16.6.0-r1.ebuild 5382 SHA256 a3bbba4fdaa36f7b36c1381109a50deaa2795800c8729707f14ac84e191257f7 SHA512 025fd917940cd45b678c0f964ce7621689d7ba8b545f248ddb54f56be04157062151da0a40ee152ec0b6321de03c5b77eca28a5f92ac4dba944818b49c5aeff6 WHIRLPOOL 02ea0018abd1ccf572699c1fc7b11087b359e1057d89bebac6788170180b3f88dc66c910d82238dc8d44aa09c33ef05ea88b622e69d2cd558b8bbb5dfcf6d78e
+EBUILD twisted-16.6.0-r3.ebuild 5706 SHA256 3266ede871aebdf46aaf368892cc75c0cd1dabd04f715be704898d364c71e4b8 SHA512 76f2c1d0970b1bf0696f2ad53643cb4a06e5397586dbd7e2c31143b06e526ce3fae5c6753e4e053818e522d1d11dca950eb7a39dc53cb65f1ec7d8ce5c33906c WHIRLPOOL f6bfd174da82333da9156f26675d480e88395ed8057f42a2cc5cee57ea91334e04d1c9286a946f75a019c541e99ac4b5d2891a7a829a7cdfde057ee9a7066962
+EBUILD twisted-17.1.0-r2.ebuild 5740 SHA256 e66df58898543dd2d0eee3c78a76e7d2094870245c4a8709af72d5e3737dd995 SHA512 7262676cea7fcb550f60c856ff0a1e864a9f6f3eb913d6b8f7d0ef1267bcd3973101cc531237e4de458152140878618dbce3837aa9129b4571ad9f5fd6851b65 WHIRLPOOL 4c0f55250490e8352d8e0591a6f155e6e9375ed67dd38998c800ca06b498795a37f35b84d66bc9515433ba10652bc8045eec326bfc19fe39d844dae6ea0a0e88
+EBUILD twisted-17.5.0-r1.ebuild 5841 SHA256 f721ec90c26be1b6a46c6a7ff84a74d6f933395fd8cc6d3418629c1a662f9fba SHA512 7a016a43d9d5c19707d63ab75783f9e6959b938ffb1e24c9bec9304ddb2b971b8737cba2c4ecabfd0b47fe08708e880b3205f8ddfbb182c5527624b39d123fe0 WHIRLPOOL 4cd35bea4f9b665442938ca98debee1ee88d40bbd5e5d1a90adabeaca53fc3b7fc6bc1bd0d563d79cdb51767db54b0bb03022270e869afa99537f8a3324a943c
+MISC ChangeLog 1173 SHA256 5917245364842babd165f6775b8d54d235a3e91c6b81659eac72ca7c2d2f3834 SHA512 e921d93be93d72161a3db1d9f1fdd514936e2528ea37b18c51c7ec26f410cbe7d5893a4aaf9dcb8a8a5a9994a1b3664c8eb6619d5a11b798e9de8b329fd65134 WHIRLPOOL 7cee46e51f6fe487b420207cbc6317246fa456f8d173ff2b40d7ec143d4bd30638516cf2457a87b4f1a38b2ec52dc9f74bf175ce5df4acdbcb258b9910e0619b
+MISC metadata.xml 1469 SHA256 4c80465f66f66f4149f9c356f65fef4db81cd7947043e91c9f45f50567acdb96 SHA512 05a554323d1806d5643e33a8958fc1d4e3e18da112d47ef458721318b41619b977463bae77308d05ea485a0bba93f75e648ea949e1b1d00eb679989b8fc39fe0 WHIRLPOOL cf388df70f9c894078c0b598bf72860af111bfad10759173155cf20eec53d9545df8d3b60253a1eeeca0f35609545ebd2f0098e5a67a90d86bd897355a5f6ef6
diff --git a/dev-python/twisted/files/test_main.patch b/dev-python/twisted/files/test_main.patch
new file mode 100644
index 000000000000..bfef40450d52
--- /dev/null
+++ b/dev-python/twisted/files/test_main.patch
@@ -0,0 +1,73 @@
+From 2c3c28f5dbbd61bcfa5c548d1d423fffbaf2132d Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Fri, 31 Mar 2017 09:32:18 -0700
+Subject: [PATCH] tests/test_main.py: Fix test_twisted to handle differntly
+ sorted options
+
+Some systems retuned the usage with '__main__.py' instead of the command 'trial'
+So, substitute that out if it exists.
+The options returned via python can be a different sort order than is output via the
+command --help.  So break up the lines into a list and check equality, lines are neither
+missing or extra.
+---
+ src/twisted/test/test_main.py | 34 ++++++++++++++++++++++++++++++++--
+ 1 file changed, 32 insertions(+), 2 deletions(-)
+
+diff --git a/src/twisted/test/test_main.py b/src/twisted/test/test_main.py
+index 572769018..b010a389e 100644
+--- a/src/twisted/test/test_main.py
++++ b/src/twisted/test/test_main.py
+@@ -18,6 +18,10 @@ from twisted.trial.unittest import TestCase
+ 
+ class MainTests(TestCase):
+     """Test that twisted scripts can be invoked as modules."""
++    # this test just does not work correctly on Gentoo
++    # the output has '__main__.py' instead of 'trial'
++    # I have only been able to get 2.7 working correctly
++    # with replacing the value with what is expected.
+     def test_twisted(self):
+         """Invoking python -m twisted should execute twist."""
+         cmd = sys.executable
+@@ -28,11 +32,37 @@ class MainTests(TestCase):
+ 
+         def processEnded(ign):
+             f = p.outF
+-            output = f.getvalue().replace(b'\r\n', b'\n')
++            # Some systems may return __main__.py instead of the command name expected
++            output = f.getvalue().replace(b'\r\n', b'\n').replace(b"__main__.py", b"trial")
+ 
+             options = TwistOptions()
+             message = '{}\n'.format(options).encode('utf-8')
+-            self.assertEqual(output, message)
++            # NOTE: python may return the  options in a different order
++            # than is output via the command --help option
++            # so we must break up the text and compare that lines
++            # are not missing or extra from what is expected
++            a = output.split(b'\n')
++            b = message.split(b'\n')
++            extras = []
++            missing = []
++            equal_len = (len(a) == len(b))
++            for i in a:
++                if i not in b:
++                    extras.append(i)
++            for i in b:
++                if i not in a:
++                    missing.append(i)
++
++            self.assertTrue(equal_len,
++                msg="Usage reported a different number of lines than expected")
++            self.assertTrue(extras == [],
++                msg="Usage returned these extra lines not expected: %s"
++                    % '\n'.join(extras)
++            )
++            self.assertTrue(missing == [],
++                msg="Usage was missing these expected lines: %s"
++                    % '\n'.join(missing)
++            )
+         return d.addCallback(processEnded)
+ 
+     def test_twisted_import(self):
+-- 
+2.12.1
+
diff --git a/dev-python/twisted/files/trial b/dev-python/twisted/files/trial
new file mode 100755
index 000000000000..8da58861abf6
--- /dev/null
+++ b/dev-python/twisted/files/trial
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+# Copyright (c) Twisted Matrix Laboratories.
+# See LICENSE for details.
+import os, sys
+
+try:
+    import _preamble
+except ImportError:
+    try:
+        sys.exc_clear()
+    except AttributeError:
+        # exc_clear() (and the requirement for it) has been removed from Py3
+        pass
+
+# begin chdir armor
+sys.path[:] = map(os.path.abspath, sys.path)
+# end chdir armor
+
+sys.path.insert(0, os.path.abspath(os.getcwd()))
+
+from twisted.scripts.trial import run
+run()
diff --git a/dev-python/twisted/files/twistd.conf b/dev-python/twisted/files/twistd.conf
new file mode 100644
index 000000000000..53788cd0017e
--- /dev/null
+++ b/dev-python/twisted/files/twistd.conf
@@ -0,0 +1,7 @@
+
+# These are passed to twistd.
+# TWISTD_OPTS="--no_save --logfile=/var/log/twistd -y /etc/twistd.tac"
+# TWISTD_OPTS="--no_save --logfile=/var/log/twistd -f /etc/twistd.tap"
+
+# Make any additions to PYTHONPATH the twistd needs here.
+# PYTHONPATH="/path/to/extra/python/modules"
diff --git a/dev-python/twisted/files/twistd.init b/dev-python/twisted/files/twistd.init
new file mode 100644
index 000000000000..b031b0020c6e
--- /dev/null
+++ b/dev-python/twisted/files/twistd.init
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+
+depend() {
+	need net
+}
+
+start() {
+	if [ -z "${TWISTD_OPTS}" ]; then
+		eerror "TWISTD_OPTS is not set!"
+		eerror "You need to configure twistd in /etc/conf.d/twistd."
+		return 1
+	fi
+	export PYTHONPATH
+	ebegin "Starting twistd"
+	start-stop-daemon --start --quiet --pidfile /var/run/twistd.pid \
+		--exec /usr/bin/twistd -- --pidfile /var/run/twistd.pid \
+			${TWISTD_OPTS}
+	eend $? "Failed to start twistd"
+}
+
+stop() {
+	ebegin "Stopping twistd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/twistd.pid 
+	eend $? "Failed to stop twistd"
+}
diff --git a/dev-python/twisted/files/twisted-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch b/dev-python/twisted/files/twisted-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch
new file mode 100644
index 000000000000..ed1a46840678
--- /dev/null
+++ b/dev-python/twisted/files/twisted-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch
@@ -0,0 +1,11 @@
+--- src/twisted/plugin.py
++++ src/twisted/plugin.py
+@@ -180,7 +180,7 @@
+             if pluginKey not in existingKeys:
+                 del dropinDotCache[pluginKey]
+                 needsWrite = True
+-        if needsWrite:
++        if needsWrite and os.environ.get("TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE") is None:
+             try:
+                 dropinPath.setContent(pickle.dumps(dropinDotCache))
+             except:
diff --git a/dev-python/twisted/files/twisted-16.6.0-test-fixes.patch b/dev-python/twisted/files/twisted-16.6.0-test-fixes.patch
new file mode 100644
index 000000000000..3ce04aa3f684
--- /dev/null
+++ b/dev-python/twisted/files/twisted-16.6.0-test-fixes.patch
@@ -0,0 +1,282 @@
+From 91b6d8b5b9d602152fb7148c6e2921463b93a8a5 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Fri, 31 Mar 2017 10:55:32 -0700
+Subject: [PATCH] twisted test overrides
+
+---
+ src/twisted/internet/test/test_gireactor.py |  3 ++-
+ src/twisted/pair/test/test_ethernet.py      |  9 +++++++++
+ src/twisted/pair/test/test_ip.py            |  8 ++++++++
+ src/twisted/pair/test/test_rawudp.py        | 10 +++++++++-
+ src/twisted/pair/test/test_tuntap.py        | 16 ++++++++++++++++
+ src/twisted/python/test/test_dist3.py       |  2 ++
+ src/twisted/test/test_ident.py              |  5 ++++-
+ src/twisted/test/test_plugin.py             |  6 ++++++
+ src/twisted/test/test_policies.py           |  5 +++++
+ src/twisted/test/test_udp.py                |  6 ++++++
+ 10 files changed, 67 insertions(+), 3 deletions(-)
+
+diff --git a/src/twisted/internet/test/test_gireactor.py b/src/twisted/internet/test/test_gireactor.py
+index 43147fdce..6333218e7 100644
+--- a/src/twisted/internet/test/test_gireactor.py
++++ b/src/twisted/internet/test/test_gireactor.py
+@@ -39,6 +39,7 @@ from twisted.python.compat import _PY3
+ if gireactor is None:
+     skip = "gtk3/gi not importable"
+ 
++EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
+ 
+ 
+ class GApplicationRegistrationTests(ReactorBuilder, TestCase):
+@@ -103,7 +104,7 @@ class GApplicationRegistrationTests(ReactorBuilder, TestCase):
+ 
+         self.runReactor(app, reactor)
+ 
+-    if gtk3reactor is None:
++    if gtk3reactor is None or EMERGE_TEST_OVERRIDE:
+         test_gtkApplicationActivate.skip = (
+             "Gtk unavailable (may require running with X11 DISPLAY env set)")
+ 
+diff --git a/src/twisted/pair/test/test_ethernet.py b/src/twisted/pair/test/test_ethernet.py
+index a4c3a5d19..fe9c57151 100644
+--- a/src/twisted/pair/test/test_ethernet.py
++++ b/src/twisted/pair/test/test_ethernet.py
+@@ -1,11 +1,16 @@
+ # Copyright (c) Twisted Matrix Laboratories.
+ # See LICENSE for details.
++
++import os
++
+ from twisted.trial import unittest
+ 
+ from twisted.python import components
+ from twisted.pair import ethernet, raw
+ from zope.interface import implementer
+ 
++EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
++
+ 
+ @implementer(raw.IRawPacketProtocol)
+ class MyProtocol:
+@@ -221,3 +226,7 @@ class EthernetTests(unittest.TestCase):
+                 raise
+         else:
+             raise AssertionError('addProto must raise an exception for bad protocols')
++
++
++if EMERGE_TEST_OVERRIDE:
++    EthernetTests.skip = "This test does not work via FEATURES=test emerge twisted"
+diff --git a/src/twisted/pair/test/test_ip.py b/src/twisted/pair/test/test_ip.py
+index 0f192a357..0a99658ef 100644
+--- a/src/twisted/pair/test/test_ip.py
++++ b/src/twisted/pair/test/test_ip.py
+@@ -1,11 +1,16 @@
+ # Copyright (c) Twisted Matrix Laboratories.
+ # See LICENSE for details.
++
++import os
++
+ from twisted.trial import unittest
+ 
+ from twisted.python import components
+ from twisted.pair import ip, raw
+ from zope import interface
+ 
++EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
++
+ 
+ @interface.implementer(raw.IRawDatagramProtocol)
+ class MyProtocol:
+@@ -432,3 +437,6 @@ class IPTests(unittest.TestCase):
+                 raise
+         else:
+             raise AssertionError('addProto must raise an exception for bad protocols')
++
++if EMERGE_TEST_OVERRIDE:
++    IPTests.skip = "This test does not work via FEATURES=test emerge twisted"
+diff --git a/src/twisted/pair/test/test_rawudp.py b/src/twisted/pair/test/test_rawudp.py
+index 15aae10f1..dade38618 100644
+--- a/src/twisted/pair/test/test_rawudp.py
++++ b/src/twisted/pair/test/test_rawudp.py
+@@ -1,12 +1,17 @@
+ # Copyright (c) Twisted Matrix Laboratories.
+ # See LICENSE for details.
+-
+ #
++
++import os
++
+ from twisted.trial import unittest
+ 
+ from twisted.internet import protocol
+ from twisted.pair import rawudp
+ 
++EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
++
++
+ class MyProtocol(protocol.DatagramProtocol):
+     def __init__(self, expecting):
+         self.expecting = list(expecting)
+@@ -325,3 +330,6 @@ class RawUDPTests(unittest.TestCase):
+                 raise
+         else:
+             raise AssertionError('addProto must raise an exception for bad protocols')
++
++if EMERGE_TEST_OVERRIDE:
++    RawUDPTests.skip = "This test does not work via FEATURES=test emerge twisted"
+diff --git a/src/twisted/pair/test/test_tuntap.py b/src/twisted/pair/test/test_tuntap.py
+index 5e2da6e0f..53e03a008 100644
+--- a/src/twisted/pair/test/test_tuntap.py
++++ b/src/twisted/pair/test/test_tuntap.py
+@@ -64,6 +64,7 @@ if platformSkip is None:
+ else:
+     skip = platformSkip
+ 
++EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
+ 
+ 
+ @implementer(IReactorFDSet)
+@@ -1417,3 +1418,18 @@ class RealIOSystemTests(IOSystemTestsMixin, SynchronousTestCase,
+     """
+     General L{_IInputOutputSystem} tests applied to L{_RealSystem}.
+     """
++
++if EMERGE_TEST_OVERRIDE:
++    RealIOSystemTests.skip = "This test does not work via FEATURES=test emerge twisted"
++    MemoryIOSystemTests.skip = "This test does not work via FEATURES=test emerge twisted"
++    TapTests.skip = "This test does not work via FEATURES=test emerge twisted"
++    TunTests.skip = "This test does not work via FEATURES=test emerge twisted"
++    TunnelAddressEqualityTests.skip = "This test does not work via FEATURES=test emerge twisted"
++    TunnelAddressTests.skip = "This test does not work via FEATURES=test emerge twisted"
++    TuntapPortTests.skip = "This test does not work via FEATURES=test emerge twisted"
++    TunnelTests.skip = "This test does not work via FEATURES=test emerge twisted"
++    FakeTapDeviceTests.skip = "This test does not work via FEATURES=test emerge twisted"
++    FakeTapDeviceWithPITests.skip = "This test does not work via FEATURES=test emerge twisted"
++    FakeTunDeviceTests.skip = "This test does not work via FEATURES=test emerge twisted"
++    RealDeviceWithProtocolInformationTests.skip = "This test does not work via FEATURES=test emerge twisted"
++    RealDeviceWithoutProtocolInformationTests.skip = "This test does not work via FEATURES=test emerge twisted"
+diff --git a/src/twisted/python/test/test_dist3.py b/src/twisted/python/test/test_dist3.py
+index 3ce2bdd60..494674bc7 100644
+--- a/src/twisted/python/test/test_dist3.py
++++ b/src/twisted/python/test/test_dist3.py
+@@ -53,3 +53,5 @@ class ModulesToInstallTests(TestCase):
+         test_exist.skip = "Only on Python 2"
+     else:
+         test_notexist.skip = "Only on Python 3"
++
++ModulesToInstallTests.skip = "This is an upstream distribution test only"
+diff --git a/src/twisted/test/test_ident.py b/src/twisted/test/test_ident.py
+index d86b840e5..3cc40261f 100644
+--- a/src/twisted/test/test_ident.py
++++ b/src/twisted/test/test_ident.py
+@@ -12,7 +12,7 @@ from twisted.protocols import ident
+ from twisted.python import failure
+ from twisted.internet import error
+ from twisted.internet import defer
+-from twisted.python.compat import NativeStringIO
++from twisted.python.compat import NativeStringIO, _PY3
+ 
+ from twisted.trial import unittest
+ from twisted.test.proto_helpers import StringTransport
+@@ -216,6 +216,9 @@ class ProcMixinTests(unittest.TestCase):
+         """
+         L{ident.ProcServerMixin.lookup} uses the Linux TCP process table.
+         """
++        if not _PY3:
++            # test is broken in py2.7
++            return
+         open_calls = []
+ 
+         def mocked_open(*args, **kwargs):
+diff --git a/src/twisted/test/test_plugin.py b/src/twisted/test/test_plugin.py
+index a23caa72b..a6d61858c 100644
+--- a/src/twisted/test/test_plugin.py
++++ b/src/twisted/test/test_plugin.py
+@@ -29,6 +29,8 @@ else:
+         On python 2, import caches don't need to be invalidated.
+         """
+ 
++EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
++
+ 
+ 
+ class ITestPlugin(Interface):
+@@ -327,6 +329,8 @@ class PluginTests(unittest.TestCase):
+         attainable, but an error should be logged to show that the cache
+         couldn't be updated.
+         """
++        if EMERGE_TEST_OVERRIDE:
++            return
+         # Generate the cache
+         plugin.getCache(self.module)
+ 
+@@ -580,6 +584,8 @@ class DeveloperSetupTests(unittest.TestCase):
+         provide useful coverage on Windows due to the different meaning of
+         "read-only directory".
+         """
++        if EMERGE_TEST_OVERRIDE:
++            return
+         self.unlockSystem()
+         self.sysplug.child('newstuff.py').setContent(pluginFileContents('one'))
+         self.lockSystem()
+diff --git a/src/twisted/test/test_policies.py b/src/twisted/test/test_policies.py
+index 3d92633d6..c08809a66 100644
+--- a/src/twisted/test/test_policies.py
++++ b/src/twisted/test/test_policies.py
+@@ -7,6 +7,8 @@ Test code for policies.
+ 
+ from __future__ import division, absolute_import
+ 
++import os
++
+ from zope.interface import Interface, implementer, implementedBy
+ 
+ from twisted.python.compat import NativeStringIO
+@@ -23,6 +25,7 @@ try:
+ except ImportError:
+     import __builtin__ as builtins
+ 
++EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
+ 
+ 
+ class SimpleProtocol(protocol.Protocol):
+@@ -883,6 +886,8 @@ class LoggingFactoryTests(unittest.TestCase):
+         automatically opens a unique log file for that protocol and attaches
+         the logfile to the built protocol.
+         """
++        if EMERGE_TEST_OVERRIDE:
++            return
+         open_calls = []
+         open_rvalues = []
+ 
+diff --git a/src/twisted/test/test_udp.py b/src/twisted/test/test_udp.py
+index 6cf4583b2..86b513704 100644
+--- a/src/twisted/test/test_udp.py
++++ b/src/twisted/test/test_udp.py
+@@ -8,6 +8,8 @@ Tests for implementations of L{IReactorUDP} and L{IReactorMulticast}.
+ 
+ from __future__ import division, absolute_import
+ 
++import os
++
+ from twisted.trial import unittest
+ 
+ from twisted.python.compat import intToBytes
+@@ -15,6 +17,8 @@ from twisted.internet.defer import Deferred, gatherResults, maybeDeferred
+ from twisted.internet import protocol, reactor, error, defer, interfaces, udp
+ from twisted.python import runtime
+ 
++EMERGE_TEST_OVERRIDE = os.environ.get("EMERGE_TEST_OVERRIDE", False)
++
+ 
+ class Mixin:
+ 
+@@ -699,3 +703,5 @@ if not interfaces.IReactorUDP(reactor, None):
+     ReactorShutdownInteractionTests.skip = "This reactor does not support UDP"
+ if not interfaces.IReactorMulticast(reactor, None):
+     MulticastTests.skip = "This reactor does not support multicast"
++elif EMERGE_TEST_OVERRIDE:
++    MulticastTests.skip = "This reactor test does not work via FEATURES=test emerge twisted"
+-- 
+2.12.1
+
diff --git a/dev-python/twisted/files/utf8_overrides.patch b/dev-python/twisted/files/utf8_overrides.patch
new file mode 100644
index 000000000000..41f48cebfd84
--- /dev/null
+++ b/dev-python/twisted/files/utf8_overrides.patch
@@ -0,0 +1,64 @@
+From f8b2e95cc9bd1cbae565e1b4d576950961edc9a7 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Fri, 31 Mar 2017 09:40:16 -0700
+Subject: [PATCH] UTF8 test overrides:  The DaemonizeTests SafeStrTests tests
+ may need to be run independantly
+
+Some other tests may leave python in a state that returns a different form of the b'\\u2022'
+bytestring (b'\xe2\x80\xa2') which causes the tests to fail.
+In StafeStrTests, the returned 't\\xfcst' != 't\xc3\xbcst' originally sent, but is just
+the unicode equivalent.
+
+This adds an environment override which can be used to skip these test during a full
+"trial twisted" run.  The DaemonizeTests, SafeStrTests can then be run independantly
+with a clean python interpreter.
+---
+ src/twisted/test/test_reflect.py | 6 ++++++
+ src/twisted/test/test_twistd.py  | 3 +++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/src/twisted/test/test_reflect.py b/src/twisted/test/test_reflect.py
+index ff0c7fc9e..0c13b949b 100644
+--- a/src/twisted/test/test_reflect.py
++++ b/src/twisted/test/test_reflect.py
+@@ -19,6 +19,9 @@ from twisted.python.reflect import (
+     accumulateMethods, prefixedMethods, prefixedMethodNames,
+     addMethodNamesToDict, fullyQualifiedName)
+ 
++UTF8_OVERRIDES = os.environ.get("UTF8_OVERRIDES", False)
++
++
+ 
+ class Base(object):
+     """
+@@ -553,6 +556,9 @@ class SafeStrTests(TestCase):
+         x = b't\xc3\xbcst'
+         self.assertEqual(reflect.safe_str(x), x)
+ 
++    if UTF8_OVERRIDES:
++        test_workingUtf8_2.skip = "test_workingUtf8_2 requires to be run independantly of other tests"
++
+ 
+     def test_workingUtf8_3(self):
+         """
+diff --git a/src/twisted/test/test_twistd.py b/src/twisted/test/test_twistd.py
+index b74fe4a08..d55be16b9 100644
+--- a/src/twisted/test/test_twistd.py
++++ b/src/twisted/test/test_twistd.py
+@@ -78,6 +78,7 @@ if getattr(os, 'setuid', None) is None:
+ else:
+     setuidSkip = None
+ 
++UTF8_OVERRIDES = os.environ.get("UTF8_OVERRIDES", False)
+ 
+ 
+ def patchUserDatabase(patch, user, uid, group, gid):
+@@ -1913,3 +1914,5 @@ class DaemonizeTests(unittest.TestCase):
+ 
+ if _twistd_unix is None:
+     DaemonizeTests.skip = "twistd unix support not available"
++elif UTF8_OVERRIDES:
++    DaemonizeTests.skip = "twistd.DaemonizeTests testing needs to be run separately"
+-- 
+2.12.1
+
diff --git a/dev-python/twisted/metadata.xml b/dev-python/twisted/metadata.xml
new file mode 100644
index 000000000000..4114ac037ce8
--- /dev/null
+++ b/dev-python/twisted/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>maintainer</description>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>twisted-python@twistedmatrix.com</email>
+			<name>Twisted Matrix Laboratories</name>
+		</maintainer>
+		<remote-id type="pypi">Twisted</remote-id>
+	</upstream>
+	<use>
+		<flag name="conch">include Twisted SSHv2 implementation</flag>
+		<flag name="http2">include http2 support</flag>
+		<flag name="serial">include serial port support</flag>
+	</use>
+	<longdescription>Twisted is an event-based framework for internet
+		applications, supporting Python 2.7 and Python 3.3+. It includes
+		modules for many different purposes, including the following:
+
+twisted.web: HTTP clients and servers, HTML templating, and a WSGI server
+twisted.conch: SSHv2 and Telnet clients and servers and terminal emulators
+twisted.words: Clients and servers for IRC, XMPP, and other IM protocols
+twisted.mail: IMAPv4, POP3, SMTP clients and servers
+twisted.positioning: Tools for communicating with NMEA-compatible GPS receivers
+twisted.names: DNS client and tools for making your own DNS servers
+twisted.trial: A unit testing framework that integrates well with Twisted-based code.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/twisted/twisted-16.6.0-r1.ebuild b/dev-python/twisted/twisted-16.6.0-r1.ebuild
new file mode 100644
index 000000000000..8851aa261252
--- /dev/null
+++ b/dev-python/twisted/twisted-16.6.0-r1.ebuild
@@ -0,0 +1,164 @@
+# 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})
+PYTHON_REQ_USE="threads(+)"
+TWISTED_PN="Twisted"
+#DISTUTILS_IN_SOURCE_BUILD="yes"
+
+inherit eutils flag-o-matic twisted-r1
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+SRC_URI="http://twistedmatrix.com/Releases/${TWISTED_PN}"
+SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2"
+
+# Dropped keywords due to new deps not keyworded
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="conch crypt http2 serial +soap test"
+
+RDEPEND=">=dev-python/zope-interface-4.0.2[${PYTHON_USEDEP}]
+	conch? (
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	)
+	crypt? (
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
+	)
+	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+	soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
+	http2? (
+		>=dev-python/hyper-h2-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
+		<dev-python/priority-2.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+	!dev-python/twisted-core
+	!dev-python/twisted-conch
+	!dev-python/twisted-lore
+	!dev-python/twisted-mail
+	!dev-python/twisted-names
+	!dev-python/twisted-news
+	!dev-python/twisted-pair
+	!dev-python/twisted-runner
+	!dev-python/twisted-words
+	!dev-python/twisted-web
+"
+DEPEND="
+	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/gmpy[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
+	"${FILESDIR}/${PN}-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
+	"${FILESDIR}/test_main.patch"
+	"${FILESDIR}/utf8_overrides.patch"
+	"${FILESDIR}/${PN}-16.6.0-test-fixes.patch"
+)
+
+python_prepare_all() {
+	# disable tests that don't work in our sandbox
+	# and other test failures due to our conditions
+	if use test ; then
+		# Remove since this is an upstream distribution test for making releases
+		rm src/twisted/python/test/test_release.py || die "rm src/twisted/python/test/test_release.py FAILED"
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		# Needed to make the sendmsg extension work
+		# (see http://twistedmatrix.com/trac/ticket/5701 )
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	export EMERGE_TEST_OVERRIDE=1
+	export UTF8_OVERRIDES=1
+	# workaround for the eclass not installing the entry points
+	# in the test environment.  copy the old 16.3.2 start script
+	# to run the tests with
+	cp "${FILESDIR}"/trial "${TEST_DIR}"
+
+	pushd "${TEST_DIR}" > /dev/null || die
+
+	if ! "${TEST_DIR}"/trial twisted; then
+		die "Tests failed with ${EPYTHON}"
+	fi
+	# due to an anomoly in the tests, python doesn't return the correct form
+	# of the escape sequence. So run those test separately with a clean python interpreter
+	export UTF8_OVERRIDES=0
+	if ! "${TEST_DIR}"/trial twisted.test.test_twistd.DaemonizeTests; then
+		die "DaemonizeTests failed with ${EPYTHON}"
+	fi
+	if ! "${TEST_DIR}"/trial twisted.test.test_reflect.SafeStrTests; then
+		die "SafeStrTests failed with ${EPYTHON}"
+	fi
+
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	cd "${D%/}$(python_get_sitedir)" || die
+
+	# create 'Twisted' egg wrt bug #299736
+	#local egg=( Twisted_Core*.egg-info )
+	#[[ -f ${egg[0]} ]] || die "Twisted_Core*.egg-info not found"
+	#ln -s "${egg[0]}" "${egg[0]/_Core/}" || die
+
+	# own the dropin.cache so we don't leave orphans
+	touch twisted/plugins/dropin.cache || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}
+
+pkg_postinst() {
+	einfo "Install complete"
+	if use test ; then
+		einfo ""
+		einfo "Some tests have been disabled during testing due to"
+		einfo "known incompatibilities with the emerge sandboxes and/or"
+		einfo "not runnable as the root user."
+		einfo "For a complete test suite run on the code."
+		einfo "Run the tests as a normal user for each python it is installed to."
+		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
+		einfo "There are a few known python-2.7 errors due to some unicode issues"
+		einfo "which are different in Gentoo installed python-2.7"
+	fi
+}
+
+pkg_postrm(){
+	# pre portage-2.3.2 release workaround for bug 595028
+	cd "${HOME}"
+	_distutils-r1_run_foreach_impl twisted-r1_update_plugin_cache
+}
diff --git a/dev-python/twisted/twisted-16.6.0-r3.ebuild b/dev-python/twisted/twisted-16.6.0-r3.ebuild
new file mode 100644
index 000000000000..a7c293332815
--- /dev/null
+++ b/dev-python/twisted/twisted-16.6.0-r3.ebuild
@@ -0,0 +1,183 @@
+# 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})
+PYTHON_REQ_USE="threads(+)"
+
+inherit eutils flag-o-matic distutils-r1 versionator
+
+TWISTED_PN="Twisted"
+TWISTED_P="${TWISTED_PN}-${PV}"
+TWISTED_RELEASE=$(get_version_component_range 1-2 "${PV}")
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+HOMEPAGE="http://www.twistedmatrix.com/"
+SRC_URI="http://twistedmatrix.com/Releases/${TWISTED_PN}"
+SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
+
+# Dropped keywords due to new deps not keyworded
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 x86"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="conch crypt http2 serial +soap test"
+
+RDEPEND="
+	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.0.2[${PYTHON_USEDEP}]
+	conch? (
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	)
+	crypt? (
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
+	)
+	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+	soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
+	http2? (
+		>=dev-python/hyper-h2-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
+		<dev-python/priority-2.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+	!dev-python/twisted-core
+	!dev-python/twisted-conch
+	!dev-python/twisted-lore
+	!dev-python/twisted-mail
+	!dev-python/twisted-names
+	!dev-python/twisted-news
+	!dev-python/twisted-pair
+	!dev-python/twisted-runner
+	!dev-python/twisted-words
+	!dev-python/twisted-web
+"
+DEPEND="
+	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/gmpy[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
+	"${FILESDIR}/${PN}-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
+	"${FILESDIR}/test_main.patch"
+	"${FILESDIR}/utf8_overrides.patch"
+	"${FILESDIR}/${PN}-16.6.0-test-fixes.patch"
+)
+
+S=${WORKDIR}/${TWISTED_P}
+
+python_prepare_all() {
+	# disable tests that don't work in our sandbox
+	# and other test failures due to our conditions
+	if use test ; then
+		# Remove since this is an upstream distribution test for making releases
+		rm src/twisted/python/test/test_release.py || die "rm src/twisted/python/test/test_release.py FAILED"
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		# Needed to make the sendmsg extension work
+		# (see http://twistedmatrix.com/trac/ticket/5701 )
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	export EMERGE_TEST_OVERRIDE=1
+	export UTF8_OVERRIDES=1
+	# workaround for the eclass not installing the entry points
+	# in the test environment.  copy the old 16.3.2 start script
+	# to run the tests with
+	cp "${FILESDIR}"/trial "${TEST_DIR}"
+
+	pushd "${TEST_DIR}" > /dev/null || die
+
+	if ! "${TEST_DIR}"/trial twisted; then
+		die "Tests failed with ${EPYTHON}"
+	fi
+	# due to an anomoly in the tests, python doesn't return the correct form
+	# of the escape sequence. So run those test separately with a clean python interpreter
+	export UTF8_OVERRIDES=0
+	if ! "${TEST_DIR}"/trial twisted.test.test_twistd.DaemonizeTests; then
+		die "DaemonizeTests failed with ${EPYTHON}"
+	fi
+	if ! "${TEST_DIR}"/trial twisted.test.test_reflect.SafeStrTests; then
+		die "SafeStrTests failed with ${EPYTHON}"
+	fi
+
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	cd "${D%/}$(python_get_sitedir)" || die
+
+	# own the dropin.cache so we don't leave orphans
+	touch twisted/plugins/dropin.cache || die
+
+	python_doscript "${WORKDIR}"/twisted-regen-cache
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}
+
+python_postinst() {
+	twisted-regen-cache || die
+}
+
+pkg_postinst() {
+	python_foreach_impl python_postinst
+
+	einfo "Install complete"
+	if use test ; then
+		einfo ""
+		einfo "Some tests have been disabled during testing due to"
+		einfo "known incompatibilities with the emerge sandboxes and/or"
+		einfo "not runnable as the root user."
+		einfo "For a complete test suite run on the code."
+		einfo "Run the tests as a normal user for each python it is installed to."
+		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
+		einfo "There are a few known python-2.7 errors due to some unicode issues"
+		einfo "which are different in Gentoo installed python-2.7"
+	fi
+}
+
+python_postrm() {
+	rm -f "${ROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
+}
+
+pkg_postrm(){
+	# if we're removing the last version, remove the cache file
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		python_foreach_impl python_postrm
+	fi
+}
diff --git a/dev-python/twisted/twisted-17.1.0-r2.ebuild b/dev-python/twisted/twisted-17.1.0-r2.ebuild
new file mode 100644
index 000000000000..13b750e8a743
--- /dev/null
+++ b/dev-python/twisted/twisted-17.1.0-r2.ebuild
@@ -0,0 +1,184 @@
+# 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})
+PYTHON_REQ_USE="threads(+)"
+
+inherit eutils flag-o-matic distutils-r1 versionator
+
+TWISTED_PN="Twisted"
+TWISTED_P="${TWISTED_PN}-${PV}"
+TWISTED_RELEASE=$(get_version_component_range 1-2 "${PV}")
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+HOMEPAGE="http://www.twistedmatrix.com/"
+SRC_URI="http://twistedmatrix.com/Releases/${TWISTED_PN}"
+SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
+
+# Dropped keywords due to new deps not keyworded
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="conch crypt http2 serial +soap test"
+
+RDEPEND="
+	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.0.2[${PYTHON_USEDEP}]
+	conch? (
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	)
+	crypt? (
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
+	)
+	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+	soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
+	http2? (
+		>=dev-python/hyper-h2-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
+		<dev-python/priority-2.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
+	!dev-python/twisted-core
+	!dev-python/twisted-conch
+	!dev-python/twisted-lore
+	!dev-python/twisted-mail
+	!dev-python/twisted-names
+	!dev-python/twisted-news
+	!dev-python/twisted-pair
+	!dev-python/twisted-runner
+	!dev-python/twisted-words
+	!dev-python/twisted-web
+"
+DEPEND="
+	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/gmpy[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
+	"${FILESDIR}/${PN}-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
+	"${FILESDIR}/test_main.patch"
+	"${FILESDIR}/utf8_overrides.patch"
+	"${FILESDIR}/${PN}-16.6.0-test-fixes.patch"
+)
+
+S=${WORKDIR}/${TWISTED_P}
+
+python_prepare_all() {
+	# disable tests that don't work in our sandbox
+	# and other test failures due to our conditions
+	if use test ; then
+		# Remove since this is an upstream distribution test for making releases
+		rm src/twisted/python/test/test_release.py || die "rm src/twisted/python/test/test_release.py FAILED"
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		# Needed to make the sendmsg extension work
+		# (see http://twistedmatrix.com/trac/ticket/5701 )
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	export EMERGE_TEST_OVERRIDE=1
+	export UTF8_OVERRIDES=1
+	# workaround for the eclass not installing the entry points
+	# in the test environment.  copy the old 16.3.2 start script
+	# to run the tests with
+	cp "${FILESDIR}"/trial "${TEST_DIR}"
+
+	pushd "${TEST_DIR}" > /dev/null || die
+
+	if ! "${TEST_DIR}"/trial twisted; then
+		die "Tests failed with ${EPYTHON}"
+	fi
+	# due to an anomoly in the tests, python doesn't return the correct form
+	# of the escape sequence. So run those test separately with a clean python interpreter
+	export UTF8_OVERRIDES=0
+	if ! "${TEST_DIR}"/trial twisted.test.test_twistd.DaemonizeTests; then
+		die "DaemonizeTests failed with ${EPYTHON}"
+	fi
+	if ! "${TEST_DIR}"/trial twisted.test.test_reflect.SafeStrTests; then
+		die "SafeStrTests failed with ${EPYTHON}"
+	fi
+
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	cd "${D%/}$(python_get_sitedir)" || die
+
+	# own the dropin.cache so we don't leave orphans
+	touch twisted/plugins/dropin.cache || die
+
+	python_doscript "${WORKDIR}"/twisted-regen-cache
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}
+
+python_postinst() {
+	twisted-regen-cache || die
+}
+
+pkg_postinst() {
+	python_foreach_impl python_postinst
+
+	einfo "Install complete"
+	if use test ; then
+		einfo ""
+		einfo "Some tests have been disabled during testing due to"
+		einfo "known incompatibilities with the emerge sandboxes and/or"
+		einfo "not runnable as the root user."
+		einfo "For a complete test suite run on the code."
+		einfo "Run the tests as a normal user for each python it is installed to."
+		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
+		einfo "There are a few known python-2.7 errors due to some unicode issues"
+		einfo "which are different in Gentoo installed python-2.7"
+	fi
+}
+
+python_postrm() {
+	rm -f "${ROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
+}
+
+pkg_postrm(){
+	# if we're removing the last version, remove the cache file
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		python_foreach_impl python_postrm
+	fi
+}
diff --git a/dev-python/twisted/twisted-17.5.0-r1.ebuild b/dev-python/twisted/twisted-17.5.0-r1.ebuild
new file mode 100644
index 000000000000..78bd82450ae2
--- /dev/null
+++ b/dev-python/twisted/twisted-17.5.0-r1.ebuild
@@ -0,0 +1,186 @@
+# 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})
+PYTHON_REQ_USE="threads(+)"
+
+inherit eutils flag-o-matic distutils-r1 versionator
+
+TWISTED_PN="Twisted"
+TWISTED_P="${TWISTED_PN}-${PV}"
+TWISTED_RELEASE=$(get_version_component_range 1-2 "${PV}")
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+HOMEPAGE="http://www.twistedmatrix.com/"
+SRC_URI="http://twistedmatrix.com/Releases/${TWISTED_PN}"
+SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
+
+# Dropped keywords due to new deps not keyworded
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="conch crypt http2 serial +soap test"
+
+RDEPEND="
+	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.0.2[${PYTHON_USEDEP}]
+	conch? (
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	)
+	crypt? (
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
+	)
+	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+	soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
+	http2? (
+		>=dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
+		<dev-python/priority-2.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
+	!dev-python/twisted-core
+	!dev-python/twisted-conch
+	!dev-python/twisted-lore
+	!dev-python/twisted-mail
+	!dev-python/twisted-names
+	!dev-python/twisted-news
+	!dev-python/twisted-pair
+	!dev-python/twisted-runner
+	!dev-python/twisted-words
+	!dev-python/twisted-web
+"
+DEPEND="
+	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/gmpy[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
+	"${FILESDIR}/${PN}-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
+	"${FILESDIR}/test_main.patch"
+	"${FILESDIR}/utf8_overrides.patch"
+	"${FILESDIR}/${PN}-16.6.0-test-fixes.patch"
+)
+
+S=${WORKDIR}/${TWISTED_P}
+
+python_prepare_all() {
+	# disable tests that don't work in our sandbox
+	# and other test failures due to our conditions
+	if use test ; then
+		# Remove since this is an upstream distribution test for making releases
+		rm src/twisted/python/test/test_release.py || die "rm src/twisted/python/test/test_release.py FAILED"
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		# Needed to make the sendmsg extension work
+		# (see http://twistedmatrix.com/trac/ticket/5701 )
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	export EMERGE_TEST_OVERRIDE=1
+	export UTF8_OVERRIDES=1
+	unset TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE
+	# workaround for the eclass not installing the entry points
+	# in the test environment.  copy the old 16.3.2 start script
+	# to run the tests with
+	cp "${FILESDIR}"/trial "${TEST_DIR}"
+
+	pushd "${TEST_DIR}" > /dev/null || die
+
+	if ! "${TEST_DIR}"/trial twisted; then
+		die "Tests failed with ${EPYTHON}"
+	fi
+	# due to an anomoly in the tests, python doesn't return the correct form
+	# of the escape sequence. So run those test separately with a clean python interpreter
+	export UTF8_OVERRIDES=0
+	if ! "${TEST_DIR}"/trial twisted.test.test_twistd.DaemonizeTests; then
+		die "DaemonizeTests failed with ${EPYTHON}"
+	fi
+	if ! "${TEST_DIR}"/trial twisted.test.test_reflect.SafeStrTests; then
+		die "SafeStrTests failed with ${EPYTHON}"
+	fi
+
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	cd "${D%/}$(python_get_sitedir)" || die
+
+	# own the dropin.cache so we don't leave orphans
+	touch twisted/plugins/dropin.cache || die
+
+	python_doscript "${WORKDIR}"/twisted-regen-cache
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}
+
+python_postinst() {
+	twisted-regen-cache || die
+}
+
+pkg_postinst() {
+	python_foreach_impl python_postinst
+
+	einfo "Install complete"
+	if use test ; then
+		einfo ""
+		einfo "Some tests have been disabled during testing due to"
+		einfo "known incompatibilities with the emerge sandboxes and/or"
+		einfo "not runnable as the root user."
+		einfo "For a complete test suite run on the code."
+		einfo "Run the tests as a normal user for each python it is installed to."
+		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
+		einfo "There are a few known python-2.7 errors due to some unicode issues"
+		einfo "which are different in Gentoo installed python-2.7"
+	fi
+}
+
+python_postrm() {
+	rm -f "${ROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
+}
+
+pkg_postrm(){
+	# if we're removing the last version, remove the cache file
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		python_foreach_impl python_postrm
+	fi
+}
diff --git a/dev-python/twitter/Manifest b/dev-python/twitter/Manifest
new file mode 100644
index 000000000000..11342c2773fe
--- /dev/null
+++ b/dev-python/twitter/Manifest
@@ -0,0 +1,5 @@
+DIST twitter-1.17.1.tar.gz 44023 SHA256 9e998dce881615d5c62579462ad7ed9751ddaed88072f268edf9c0e58f6d700b SHA512 17ea867d0c4183cd97aec610c8757def6c23648f18c4bfd3bceca150de6bdbeab036fefe699e976fac11d3d0b0d2c574c0f1726818576a898a92a8335d0342dd WHIRLPOOL 2dfb3a9a6751d48730e6b13b0131cd46fec71f58d379093e952ba3faa9bde027042a15fd1081f7a356e7dc94b01b606c9f2e514e928f76924eec4e830776742a
+EBUILD twitter-1.17.1.ebuild 464 SHA256 8ccb68a48c2b4cf8c6ea8ebe39869b0d6ef3daf78fd187aeb7fed24735df17c1 SHA512 1f578aa3f29cf2b2ccf54e9629e119221708a5d626995dab3acd3c6e8d1bf46a2db47484a883224c7dc3e1471e607b7d28161e5b3c5952fe0a705a511cb1c6f5 WHIRLPOOL 0114da0b33a6adc5762b75fffb118c4d6c6ebea90629db51355a7c6b79d22f5187e99cce175fcf9cb0dfffcc9e320dc855252a72464af993a4e5e68249e079de
+MISC ChangeLog 3213 SHA256 92994292ddba16785c632e47dc69f17ef0195d0bd9a98061ef25f64314124ade SHA512 1c320ef6c7172513dafff31bf27219db5153a1a7cc966bfde0fcea852119ff15815d63c5ea693f1e97314128ade32bd0c83997572616772126dcc8c3737dd2ad WHIRLPOOL 57aee11a22b129b7f16195a07efed4c42243a75acf7a700f3bc72eea51548405afc83cbdf262d1645ea878763b51527587e8f265ebc45a9ba12509dddac1eb1c
+MISC ChangeLog-2015 2493 SHA256 03d1056725874df121e430f176609b65f5776c0af60adedd6da6dc6b29dfb36c SHA512 21a2f75bcd2c77b9ab0ead1da64cbd74203932f8efef893056b29bfb601683cd0a8410fdb61b9466a2947c04c54983a324c5b5b97e43fe5714f9c470fb76f93e WHIRLPOOL 95b6746934bd0e9871edccbd0478914bf0e25b1726ff46509bf17c9d7d815ab4231fad50bae2d8e1116d795f243af12ed679de68a6596c993e4f7fda8346b19e
+MISC metadata.xml 310 SHA256 2a9a0642fb5e75103a2e10d35e72273237093a8fe4383acb2e910dc7e57d9552 SHA512 00f063dd7a36e4c529c8d344d7c4d3d8ae55ef9f34819c029e35463f2f2d11d9bf282b692a14cf37773dc38b0c20437fb9c5663de165ea31e73324e6eafc73c7 WHIRLPOOL 4da7e6c0d5a1dd7f61bb1db3684d22ac63a57cf0172a972288c50994944941747b75d20e03c00ab0480df0f405581b7d972fc58b3fee6c16c98eca345f570ce5
diff --git a/dev-python/twitter/metadata.xml b/dev-python/twitter/metadata.xml
new file mode 100644
index 000000000000..9fb11f5f40d5
--- /dev/null
+++ b/dev-python/twitter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">twitter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/twitter/twitter-1.17.1.ebuild b/dev-python/twitter/twitter-1.17.1.ebuild
new file mode 100644
index 000000000000..5bc05265e0ed
--- /dev/null
+++ b/dev-python/twitter/twitter-1.17.1.ebuild
@@ -0,0 +1,19 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="An API and command-line toolset for Twitter (twitter.com)"
+HOMEPAGE="http://mike.verdone.ca/twitter/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/twython/Manifest b/dev-python/twython/Manifest
new file mode 100644
index 000000000000..95c54bcb6c3e
--- /dev/null
+++ b/dev-python/twython/Manifest
@@ -0,0 +1,9 @@
+DIST twython-3.2.0.tar.gz 33741 SHA256 ab0dec52286677e944ddc00eaf6a0eb89af48b1a6696324ea29351342d1c483f SHA512 809bc9fe3512b383b38e74929dadb4576bc9b51b0ce80ea444aadea44f95f2df0fc119bd0ea1982337e654bd5d92abb78671f20fe3b56e647f6caca00ec3791f WHIRLPOOL 5104295c2610ab76408047875aff2c7cfd49643344804676d7b04eb2e1727b2bfe4d70821505c7f7106744f6fb141adca7f78c19d6d209f3c54a220932a9ada5
+DIST twython-3.3.0.tar.gz 34164 SHA256 afe23e8a718500eb49d2e42375b2c251b58bf13a6f572d9e586fbeaeda18cf37 SHA512 888f37c37f39c603b08605d2e209afc329e079c405adbe3a03fde4dab2b76b07d2badf1956d255d4b7ff0bf2a4c308b20f2a3333a7ccd0e7b9c046e9172b1d5f WHIRLPOOL b1a3a4867bc82a3395e04c6a3a219e7482d585e5139fb5d25fd9eabfec9cc1c8d045d3f984fdb8aefb8d0252e946411bc6f03f196b0f61a682e78ca923f69697
+DIST twython-3.6.0.tar.gz 36268 SHA256 488908e38aeb843f2565e1e5c54378a6104beab3b1e12718bd69c0e44fa3c1c9 SHA512 b99ecb244598a489578e63cec8a470daca7efe019f6a5277a0fda70b3c61ba25b56688b0a383337ed1c46576e551c244da82cd808710c4b9bb8ba91c6bc29be1 WHIRLPOOL 72356c73cd081eef9ec6edaa340d1e8114ae30a78bebef7ee446a7f8e363b0f2cf1d7e92ffd182342c5bab4e2806e592866e988c0da2b71aa72c9c1ed40d7036
+EBUILD twython-3.2.0.ebuild 521 SHA256 0bf98c13a7a533d2f6d3949a947d24495c990bd3cf57445601768977fb1413df SHA512 ff8bdab532f3894111ed8c2b3badc034a819d3258e157603e30db8d659daca3c8a16584b5d05ed1b748c28a60b632446026f81f3ac76b6180e30482de8b2cd5b WHIRLPOOL 6541d6a04bbc6d17a6b05b60f8da876c8bdae30c46a1393e2cc8d1f363884436a67eb62e16b1e76cc0694e156f99b3ff871be5755dbbdbecfeaeefa647cc6bba
+EBUILD twython-3.3.0.ebuild 529 SHA256 681204c05e2d8eb565b30b39afffc5ab85497fd9acb2cb65a8388620c9491f00 SHA512 92dad9a9488ffa1429ecff35995c6c0ad7663f33553808a20fde698854c0b726a76c0029a2f2e8f6cd2398aaa1b3ff498d2069bed1cab82fc45f17ae995ae513 WHIRLPOOL 3feaf7557469ffad73cfd241d2f367926242b240f1fed1af0a8a73035f3cf02eef8e8b1cdf5260d81aac7c5bb7c545b75e38f8c0103ccfcf07b6561adaa6f17d
+EBUILD twython-3.6.0.ebuild 531 SHA256 f51a3c0483d2c4b57d594c5ea67d3b38b6a9c4ec7aa619a6ac67c0a6662f2c11 SHA512 362f7df075d4b5505c2060d558f14c5b2736ef095b0b53593e92471855af0af74a61c4d3613481f4a2fc56de4dd7872465b4d405ae60c9e7d50d4e7bd823393f WHIRLPOOL 5feb098c868c5876d0e6d59daddb7dbc8af9b77ee28e7c704887993bcdf06b72aabc10aa785ac5aa8a092f77c0567656ce63ecbbbf7e1e1c8a56638113c8407e
+MISC ChangeLog 2707 SHA256 cd10604436bb81d1fc0bcf47bfb591f8efdc7dfb474d00b8389c36efad4b6c6d SHA512 5ed0815dc1b01cb8b79ccb11dc4de331a022352fa4a67c214415d4b4b55af28c34f9e34a3d2d82055b6aaa48e224b19d7b1de25edb979fddb40b4abbc6f9c56e WHIRLPOOL e90df3bff06e73e0bfa6fc2046a3837424e308386ccfc95cf752b7d71169369ce74135354dbe1fdf8ebf4cbeed38b3d7d76b783b56f548efc2e3a743ec75c63e
+MISC ChangeLog-2015 1298 SHA256 873dc586280932eb4727178f281041af8d8d459327d0efb6f962a192acb1cf07 SHA512 5483b71e2344c36e19c7a05eac0a7525769bf4c058f127c05990dbb08ad14c3e16bd601854f8f3594b9faa5361f50ab9360a241f0fa4d3bc047235917b22a58f WHIRLPOOL 8a69cea6315e541854c2b602b571b5cb899631784618f67d1426940f8eddb14cbd835436462b2e7a4f7de6ecbabbccbb28fbecd8e35ef3134babddf286ee15fd
+MISC metadata.xml 494 SHA256 144894ec5e00278f80810460101ec5bd537845644f1f925582433058d290eeeb SHA512 4989871cd8997d2376cf0b8e8c29f4498688592874f584a306a2a8c5eb363e9fb3580efe3b609382a5e20b866f2734da668a9aa97d1ff73dd26eaf820e910844 WHIRLPOOL d88b900d6f54292cafb958543f25691c33d525858300b0f554e41dfa9abea48c35bb2d4e882fa847a94ee0a42b110029a4867cead98d1ee20bbf58da83e760fb
diff --git a/dev-python/twython/metadata.xml b/dev-python/twython/metadata.xml
new file mode 100644
index 000000000000..9f83021a921d
--- /dev/null
+++ b/dev-python/twython/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ercpe@gentoo.org</email>
+    <name>Johann Schmitz</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ryanmcgrath/twython</remote-id>
+    <remote-id type="pypi">twython</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/twython/twython-3.2.0.ebuild b/dev-python/twython/twython-3.2.0.ebuild
new file mode 100644
index 000000000000..a2e4f8ea96b6
--- /dev/null
+++ b/dev-python/twython/twython-3.2.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="An easy (and up to date) way to access Twitter data with Python"
+HOMEPAGE="https://github.com/ryanmcgrath/twython"
+SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/twython/twython-3.3.0.ebuild b/dev-python/twython/twython-3.3.0.ebuild
new file mode 100644
index 000000000000..811a837599ab
--- /dev/null
+++ b/dev-python/twython/twython-3.3.0.ebuild
@@ -0,0 +1,21 @@
+# 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
+
+DESCRIPTION="An easy (and up to date) way to access Twitter data with Python"
+HOMEPAGE="https://github.com/ryanmcgrath/twython"
+SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/twython/twython-3.6.0.ebuild b/dev-python/twython/twython-3.6.0.ebuild
new file mode 100644
index 000000000000..54482359fa6d
--- /dev/null
+++ b/dev-python/twython/twython-3.6.0.ebuild
@@ -0,0 +1,21 @@
+# 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
+
+DESCRIPTION="An easy (and up to date) way to access Twitter data with Python"
+HOMEPAGE="https://github.com/ryanmcgrath/twython"
+SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/txAMQP/Manifest b/dev-python/txAMQP/Manifest
new file mode 100644
index 000000000000..b1642c881ced
--- /dev/null
+++ b/dev-python/txAMQP/Manifest
@@ -0,0 +1,7 @@
+DIST txAMQP-0.6.2.tar.gz 20749 SHA256 ab70a5e443d7aa4488e48d683ad32cf152e1a347198dafdd5d87a42643d61cf0 SHA512 676797a5ae4e013d3cbf42e94f2a3e0421c9db0056e2abaee7bfacbb2b31b50948b5ac51d389ba6f8c609207a294c35ee9359813f3151f37d049092bd1aed78a WHIRLPOOL aa0fb96ae068ec67e0e1f4ce545b4e20067eb5acf7c993b21144d0a55fc67de1afd2c00d87783f5933e015e43f83b3cf871414fea5eaf16c2643914a81d1822e
+DIST txamqp-0.7.0.tar.gz 117964 SHA256 8ba99b861270c56fa0e574ef1c9a1eb86b72464470617976fcd2669af0e6b23e SHA512 8af8dee44885fce6a8015fc3763ff1fd6a3effb8cc954b5ee2baed7c652a34440df4c6d8360b22930dc5b488e9965c3f8ad4ff8d49604ad80e31b6de70c233c5 WHIRLPOOL dfbfc6bfc917f833bb7dfc6a64e4c11b6451b2b34c7b61c908802c1703e2a1917edaf386b7a8cb72aacceef81f93b4634ce13dbd73474b8756d1480b80097d6e
+EBUILD txAMQP-0.6.2.ebuild 515 SHA256 977b05e78c7301b8e768d125be825b0e7056efa2edbc53dc08e3e87b7e4330e3 SHA512 f1c5418b953c91d1f6ee56d51d9e07e2c013e54e5fb463e8d2b35cfdd06ae82bda5d4415273d5c11f53bae1b42b531e549097d922b20a5c5dc1a7fddc0f1036f WHIRLPOOL c8ff80df118a6a8112142b131192bc39b7fdd1a21b86299671dc7abb32313be32165315cc9c052fd64cfce1ad769c18d98b09f366297e4e4b7ceb934cb93d94a
+EBUILD txAMQP-0.7.0.ebuild 1333 SHA256 2d49033adf801ec8da57422108a8bab8bcb48fd83d62eab6fad1586a28d0ad16 SHA512 d92469eb0a1415bc70f0d8eb3fd5116b2315bd2b0bfb392acb7e0a0f69278492157d9f6b56002a69d45f9a33ea68de78d9a2143e220402e9036669a0c678a8b0 WHIRLPOOL b5641e576375db425f31dc4111d05612934388124f6461e4675f3b45181b33efbcf66bbb77ff2fdab94e68ec00cad5292ce65e795d41f84d967fd062bbab6438
+MISC ChangeLog 2690 SHA256 baac8a7ffc99bf1fe84d03c6e25467abe1488ad3fcdd8cecf501595e57b949b5 SHA512 0f9b4d1fcfa885a5bb8db5393e712210c23e746d9b3e95247675087ef66b1e9792674b2269ae109e54b551b1354800605e843e1b332b2607ecb4fb880815a3ad WHIRLPOOL 9aa14e1c5075ee409c6ff542734331201f24f73d3dcbaca820bc73eda44e7d04a82e7fb09ce0274869950373a828c7c315d9e39cfaf7e07fb0af0c723b6b8f59
+MISC ChangeLog-2015 1884 SHA256 ec5d5f6ecf0d73684648234aaab84facf7baf42ee86d24728c77ca8d2f3cf9fa SHA512 cd446d5e2bef32caaf17bc1b99f313452e3234a67c42a700d48bfbcc6ce93a4bee927f998f730cd3a8b509173ecfad8a9742fd679f7b044dca2d301fc99d94ac WHIRLPOOL b15f1bfe679b168f7fd06461eac47b0287da3ba1eb21de1ad5eafeb5efff46871d1e39e5d8290df1ccf627aa3eb5cd2aa028b09a22f682d1fc3c5ad62b202881
+MISC metadata.xml 362 SHA256 0b6c0b8399c4bcbc13235995c3588891aa40c70b8511710fd908db0454428c2d SHA512 392c1ac853d4e3d1b35938fdb24e63c0cec77eee230b8ef27f4126c26c10296e7039c9c9ed519157f6be0fc086b937c23fb3588e0f831e6fad84bd8ba085c5a0 WHIRLPOOL b859e3ac2222ab2972ad6b613989c54998cde2a36c56499aa9ed390614fbd09e541d5072fa3aec634cee06d82fc65d1ff1bab5ca4ca97414e780ee394d0c653f
diff --git a/dev-python/txAMQP/metadata.xml b/dev-python/txAMQP/metadata.xml
new file mode 100644
index 000000000000..791f8b34f5de
--- /dev/null
+++ b/dev-python/txAMQP/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">txAMQP</remote-id>
+		<remote-id type="github">txamqp/txamqp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/txAMQP/txAMQP-0.6.2.ebuild b/dev-python/txAMQP/txAMQP-0.6.2.ebuild
new file mode 100644
index 000000000000..8feb2695f495
--- /dev/null
+++ b/dev-python/txAMQP/txAMQP-0.6.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Python library for communicating with AMQP peers using Twisted"
+HOMEPAGE="https://github.com/txamqp/txamqp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 x86 ~x64-solaris"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/twisted-core[${PYTHON_USEDEP}]"
diff --git a/dev-python/txAMQP/txAMQP-0.7.0.ebuild b/dev-python/txAMQP/txAMQP-0.7.0.ebuild
new file mode 100644
index 000000000000..7220086d7f04
--- /dev/null
+++ b/dev-python/txAMQP/txAMQP-0.7.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+MY_P=${PN,,}-${PV}
+DESCRIPTION="Python library for communicating with AMQP peers using Twisted"
+HOMEPAGE="https://github.com/txamqp/txamqp"
+# pypi tarball misses necessary test files
+SRC_URI="https://github.com/txamqp/txamqp/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+# TODO: split twisted-core gives minor test failure, get rid of it
+# when we port revdeps
+RDEPEND="
+	|| (
+		dev-python/twisted[${PYTHON_USEDEP}]
+		dev-python/twisted-core[${PYTHON_USEDEP}]
+	)"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		net-misc/rabbitmq-server
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+# Tests connect to the system rabbitmq server
+# TODO: figure out how to start an isolated instance
+RESTRICT="test"
+
+python_test() {
+	cd src || die
+	# tests look for those files relatively to modules
+	cp -r specs "${BUILD_DIR}"/lib || die
+
+	TXAMQP_BROKER=RABBITMQ trial txamqp
+	local ret=${?}
+
+	# avoid installing spec files
+	rm -r "${BUILD_DIR}"/lib/specs || die
+
+	[[ ${ret} == 0 ]] || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( doc/* )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
new file mode 100644
index 000000000000..bb6d6481a4d9
--- /dev/null
+++ b/dev-python/txaio/Manifest
@@ -0,0 +1,16 @@
+AUX txaio-2.7.1.chained-callback.patch 1297 SHA256 01897b344609d4ceaa710027969fb0d001e5e0e622bf45ead378377e450f1558 SHA512 69132c9cbda71da30ecce6385552e1d3ecdf0ca57562d7c0ef2dd8917ef1d1bfd03c55008690f34a31d31418bb7cdb9f690c75a0b996a4f8de0b0642a824e40e WHIRLPOOL 3ac168112f43f2cd6ac887e0b13b4ebe294b2aa8bb627bcf6542b36b7339cdfae4bbdca90ef7fa820d18264ce7d1411ecfcb6c7620a5c00d167cc1ed336e07a9
+AUX txaio-2.7.1.f._result.patch 1140 SHA256 c9c2145f8464c9a077bf9653f2fdda1e916f76264b5e673e936301bc1530fec4 SHA512 bcf4681ca1501dc9b21514dca68fb36d6b50550fe1760b4af00786a698b26c3fb64afebcf29c2404dd0923867da010bfa41afa9501f59f43306b55871d951a29 WHIRLPOOL f80751cfdc5922c3442ed51af82bb977deb5531572ad8135531362e98a861816d096f154fec9e6ac5dc4334962a409c88e50e37ff74b246b65f1ac8325b92838
+AUX util.py 977 SHA256 50c5d06848ba4ad77a5a81248607ade9b9f56c08dc76aa545f88abaf320c044d SHA512 a82754ff4b81cdacd7010cb30065ae1a3408b2ed6e8a47021a2c7066adb614a87cc3d70b7980f10b9a6b063f4087ee44c5df2adab0d23ce90c1beb1368b4a498 WHIRLPOOL 6f9813bf1fe2a29ef127d13df7e7b4b5065a7a6d33cfea46ffcb92c479ca738844f32c61767e69ee9d840e952abac7bbb523b8a55e6bc16d4a70660cb1dd85bd
+DIST txaio-2.3.1.tar.gz 36755 SHA256 1111c87bff73e22c2067318cbb267781e2f651c485d21783b25e1e768eabab67 SHA512 019d686102c862ec308e8ffdfbca25cda1b495adef73ee8b817a465a8054a24590ab0f1e3322df92d0a528152fc5b987b98b039dcd87308e81854d3c6a9fb146 WHIRLPOOL c5f550788f669237d24c5194348a84f5e6e8ca5206bd647ff8e5dee80705809601b798c4eecca260defa69d3276c77adbee6599529b48a325ec7865902c77d89
+DIST txaio-2.5.1.tar.gz 41577 SHA256 625076477182e2dde78b79d0b2b0d6b3cecb0e24fe0ea7eaf2abd26a4c0dd1de SHA512 921b4f6738a91923cffe00eed30237e0a2a12dbd42476587b4902675d3d7d8ecbf3b6fbf47afa5648836f779f1c22f7edf9bd94d44dcacee86d03a1dd16450a5 WHIRLPOOL 24286b510c7f1911dd2a315362c76aff77bc2246164a4a1ba50573d87408db9e0e384e5063cfdbee96501b3d03decc9f4198aae9f8cd375d8c49de817d0eda63
+DIST txaio-2.7.1.tar.gz 43591 SHA256 9eea85c27ff8ac28049a29b55383f5c162351f855860e5081ff4632d65a5b4d2 SHA512 d77a8b5e8fc21be0bef43f2a6795229456a351abc1a5eb6d2b7de0da0a58e67a228cb06d1a7962efcc760099ef5df94e9421875ea5628985260911efc7deb85e WHIRLPOOL 2acff5b81fd17afd7b7d986812d742a6e09781f8f6f960ae6c08a52c6535156736492ecaca0c8026192289ab28e3cceb40e03aa4512922bc64ece7c900abd25c
+DIST txaio-2.8.1.tar.gz 43558 SHA256 fe2e0e4d3a06705f86bbd351fdd1f39dae61755e44162375e024acbf32eafddb SHA512 5ea41dbc8fef6dcd04a95c85bd57c4f2fd57f7091667da8a822a0e8bad465f76c2ace574e4ae54f941ad6e169dce6fb28d752831d7a06eb240ef72cc3817a056 WHIRLPOOL 5fec7bba468b52bf3ba13328d7e5f00a28eb487e238880d5afbf79bd6d8a017f39e2aa907c095a8c0fe28c41b2c917f4f72f8ad0f59ad241f329ca91a1f6961f
+DIST txaio-2.8.2.tar.gz 43670 SHA256 484cd6c4cdd3f6081b87188f3b2b9a36e02fba6816e8256917c4f6571b567571 SHA512 8b60a64ebfa1208995bc42e6ccbc87c4c3cd4687cb431435c6450cff31e5d0dba468c3f3494902e666cb2ee6dea84ded458fd8f1b3b9c25421b440dcd3fc5884 WHIRLPOOL f42015d189b7b5c0a6bd50f7bcb482515f12743e04cf751c523620fb3bb4684cb9c42edace1ca9035ebfe980418b45cefd8b308f2dfbd93bcc5eae2623c95bb2
+EBUILD txaio-2.3.1.ebuild 1152 SHA256 ac7b1156756ba26d6795b518bc76733308136a58b9cbc4e5120c08cc02b4c283 SHA512 6084bed599f08d4c4112c0bab6f854865b55299bd4473fb0d954703869e41e4e843021d467c06f90000ebd1253b008f140f58b9ffb04df1a0d55ca9598a9110e WHIRLPOOL 221bd32f539eaa85bc5235f206b4582c1cc55494b9e7b2f6c4a19a69e869b77df8733c316d69a4cd468dfaa1d41172e553f5f0389ec4184eaff7a1bf469ca2b5
+EBUILD txaio-2.5.1-r1.ebuild 1843 SHA256 4e82dbe89e042943fcc9d96f045b9909e75a499bb61957425df7cc37113cd108 SHA512 85c1a455f809067568d12fecc7c8fb4643407c7ff914df49e2daa62292385a13f5b9c8255d0bef6f0b8bd22d76f90fbcb9fac725e1ffd23e54939763795b9c2b WHIRLPOOL 070731d922cd176fd20693497b996aa2e7657345300e91778d467c63ef751693b0261601503401f30f5a41387b6a3325f2bdee037a2cdddfae68285c6b1a8998
+EBUILD txaio-2.7.1.ebuild 1954 SHA256 67eef72a72fa4bba7c60b13264dc932902437a16ddc1b7124dfed1a4a812b652 SHA512 a0c2d05b763db122d3bed0fc89f60e5eaa12f0116e54f04a21d1b63bd0ff5c495f0ee87a64b809e4165073e06fb8bbc679809da82af2dcd5c132341b45a0b568 WHIRLPOOL 08ed45c586eb99b4bf12d4a2f6599b249fbab76be92a1350ee4920724903b5a0d38d6f7071f2019a011e2f4ca2cfee86f27acd4383ab6eae5e8ee70dd1dce404
+EBUILD txaio-2.8.1.ebuild 1793 SHA256 82aa7c620cacfc8682c1593c93a7dd273d75d8b21f0d2a70e387e1a4681654a8 SHA512 25ad5257bca293daae685fc7fef972e41734b77474334b1dcac9aebeba4144012c598b58a48ef259e77ad199cf29fd54c77dbd9ef9542c3588da31f1f0505330 WHIRLPOOL 12f012f2fdab73e873ad4de63a7b955b03d69b381c128125d30080e2ab0bc18ec556c89c1f524d3dd1d7d3604de0906e95efc3233b591022bfa92e92df3161e9
+EBUILD txaio-2.8.2.ebuild 1793 SHA256 82aa7c620cacfc8682c1593c93a7dd273d75d8b21f0d2a70e387e1a4681654a8 SHA512 25ad5257bca293daae685fc7fef972e41734b77474334b1dcac9aebeba4144012c598b58a48ef259e77ad199cf29fd54c77dbd9ef9542c3588da31f1f0505330 WHIRLPOOL 12f012f2fdab73e873ad4de63a7b955b03d69b381c128125d30080e2ab0bc18ec556c89c1f524d3dd1d7d3604de0906e95efc3233b591022bfa92e92df3161e9
+MISC ChangeLog 3643 SHA256 f38ea151db0422f27c7bea5fca6cb4a87d1a3ef85e755fcf95fe1f3f6948b684 SHA512 b308ab9de5ea1dced2471dd3d8ed521a7c5ce40bf848d31122df8b2afe35c5671337cb51022b3d5ed8eb50ebc9524d8e8a4bed38c039e396aafe5c33b40ae772 WHIRLPOOL f237c663ea99b2d8eec222111986da66a0ac66f3f996aa56e87a48979547443231d7679c10885a77689ea32d0f1aacd01055c67ec4661b918085f4897e533bea
+MISC ChangeLog-2015 487 SHA256 c7e099eb32a33292f191a69744ab9b8be296c75dffd0f29fa4e28b35849d95aa SHA512 db64ff4cd7a36ace385866dff14894c324469aa665eb52b0ab694b1ae9f24bd94d8e34d3741183e843fded4acb4115eb5477d98538373a077b2e06f354a35319 WHIRLPOOL 6343245654e58ab38e2e1f99a8fb826f7fde87481f03fac117b131c0f218ec92f658326da4aa664a33cbae455f994a61311c10729bbc70221bd3c4b43dc7d2a3
+MISC metadata.xml 605 SHA256 f0c140e905a36e7b711864d012a2aea8e4088e888078393e0f8b3235a143c103 SHA512 d85369383279a352eed9d08aea9cb375515ce094efe3eadea1abe06fdabcb97e179edd2c411206da33f25d53da6efad5c670e0072521ca763c76863c2ce99cf2 WHIRLPOOL 7b0e9db8b4db8f812b2a33689a1f81bcb0f6bad007f94cd8ce42a89a9f26e67f80c5a884476351c6d9a040ba1b878828c22c186f6fad2d1bacfe1dafe5126f2d
diff --git a/dev-python/txaio/files/txaio-2.7.1.chained-callback.patch b/dev-python/txaio/files/txaio-2.7.1.chained-callback.patch
new file mode 100644
index 000000000000..f72ccb03918b
--- /dev/null
+++ b/dev-python/txaio/files/txaio-2.7.1.chained-callback.patch
@@ -0,0 +1,48 @@
+From f27f2945c8ca06e2eb0c2b95366a7a4c1363d857 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
+Date: Mon, 8 May 2017 21:20:01 +0300
+Subject: [PATCH] Removed the test for the chained callback feature
+
+---
+ test/test_callback.py | 25 -------------------------
+ 1 file changed, 25 deletions(-)
+
+diff --git a/test/test_callback.py b/test/test_callback.py
+index 08d31e3..9c8ab99 100644
+--- a/test/test_callback.py
++++ b/test/test_callback.py
+@@ -59,31 +59,6 @@ def test_callback(framework):
+     assert results[0] == "it worked"
+ 
+ 
+-def test_chained_callback(framework):
+-    """
+-    Chain two callbacks where the first one alters the value.
+-    """
+-    calls = []
+-
+-    def callback0(arg):
+-        calls.append(arg)
+-        return arg + " pray I do not alter it futher"
+-
+-    def callback1(arg):
+-        calls.append(arg)
+-
+-    f = txaio.create_future()
+-    txaio.add_callbacks(f, callback0, None)
+-    txaio.add_callbacks(f, callback1, None)
+-    txaio.resolve(f, "the deal")
+-
+-    run_once()
+-
+-    assert len(calls) == 2
+-    assert calls[0] == "the deal"
+-    assert calls[1] == "the deal pray I do not alter it futher"
+-
+-
+ def test_immediate_result(framework):
+     f = txaio.create_future_success("it worked")
+     results = []
+-- 
+2.13.0
+
diff --git a/dev-python/txaio/files/txaio-2.7.1.f._result.patch b/dev-python/txaio/files/txaio-2.7.1.f._result.patch
new file mode 100644
index 000000000000..8c72b45e48de
--- /dev/null
+++ b/dev-python/txaio/files/txaio-2.7.1.f._result.patch
@@ -0,0 +1,36 @@
+From 7ecd9cbb4e7202f7c583f9080ac13db94672bc4b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
+Date: Thu, 4 May 2017 21:47:02 +0300
+Subject: [PATCH] Removed code that sets f._result
+
+This stopped working from Python 3.6 onwards, as the Future implementation is now written in C.
+---
+ txaio/aio.py | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/txaio/aio.py b/txaio/aio.py
+index 55d3ca5..becfba5 100644
+--- a/txaio/aio.py
++++ b/txaio/aio.py
+@@ -437,17 +437,12 @@ class _AsyncioApi(object):
+         """
+         callback or errback may be None, but at least one must be
+         non-None.
+-
+-        XXX beware the "f._result" hack to get "chainable-callback" type
+-        behavior.
+         """
+         def done(f):
+             try:
+                 res = f.result()
+                 if callback:
+-                    x = callback(res)
+-                    if x is not None:
+-                        f._result = x
++                    callback(res)
+             except Exception:
+                 if errback:
+                     errback(create_failure())
+-- 
+2.13.0
+
diff --git a/dev-python/txaio/files/util.py b/dev-python/txaio/files/util.py
new file mode 100644
index 000000000000..254df70a5aac
--- /dev/null
+++ b/dev-python/txaio/files/util.py
@@ -0,0 +1,40 @@
+try:
+    import asyncio
+    from asyncio.test_utils import run_once as _run_once
+
+    def run_once():
+        return _run_once(asyncio.get_event_loop())
+
+except ImportError as e:
+    try:
+        import trollius as asyncio
+    except ImportError:
+        asyncio = None
+
+    def run_once():
+        '''
+        copied from asyncio.testutils because trollius has no
+        "testutils"
+        '''
+        # in Twisted, this method is a no-op
+        if asyncio is None:
+            return
+
+        # just like modern asyncio.testutils.run_once does it...
+        loop = asyncio.get_event_loop()
+        loop.stop()
+        loop.run_forever()
+        asyncio.gather(*asyncio.Task.all_tasks())
+
+
+try:
+    # XXX fixme hack better way to detect twisted
+    # (has to work on py3 where asyncio exists always, though)
+    import twisted  # noqa
+
+    def await(_):
+        return
+
+except ImportError:
+    def await(future):
+        asyncio.get_event_loop().run_until_complete(future)
diff --git a/dev-python/txaio/metadata.xml b/dev-python/txaio/metadata.xml
new file mode 100644
index 000000000000..ef48c740e2ee
--- /dev/null
+++ b/dev-python/txaio/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>maintainer</description>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>autobahnws@googlegroups.com</email>
+			<name>Crossbar.io Technologies GmbH</name>
+		</maintainer>
+		<remote-id type="pypi">txaio</remote-id>
+		<remote-id type="github">crossbario/txaio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/txaio/txaio-2.3.1.ebuild b/dev-python/txaio/txaio-2.3.1.ebuild
new file mode 100644
index 000000000000..053c2fc4dfb0
--- /dev/null
+++ b/dev-python/txaio/txaio-2.3.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+RESTRICT="test"
+
+inherit distutils-r1
+
+DESCRIPTION="a helper library for writing code unmodified on both Twisted and asyncio"
+HOMEPAGE="https://github.com/crossbario/txaio"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/pep8-1.6.2[${PYTHON_USEDEP}]"
+
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/alabaster[${PYTHON_USEDEP}] )
+	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-1.8.1[${PYTHON_USEDEP}] )"
+
+python_prepare() {
+	# https://github.com/tavendo/txaio/issues/3
+	cp -r "${FILESDIR}"/util.py test || die
+
+	distutils-r1_python_prepare
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/txaio/txaio-2.5.1-r1.ebuild b/dev-python/txaio/txaio-2.5.1-r1.ebuild
new file mode 100644
index 000000000000..c59dea17c9ac
--- /dev/null
+++ b/dev-python/txaio/txaio-2.5.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# test failure with py3.6 upstream bug:
+#    https://github.com/crossbario/txaio/issues/83
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius"
+HOMEPAGE="https://github.com/crossbario/txaio https://pypi.python.org/pypi/txaio"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/trollius-2.0[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep '>=dev-python/futures-3.0.3[${PYTHON_USEDEP}]' python2_7)
+"
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-spelling-2.1.2[${PYTHON_USEDEP}]
+		>=dev-python/sphinx_rtd_theme-0.1.9[${PYTHON_USEDEP}]
+		dev-python/alabaster[${PYTHON_USEDEP}]
+	)
+	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-1.8.1[${PYTHON_USEDEP}]
+		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/tox-2.1.1[${PYTHON_USEDEP}]
+		>=dev-python/pep8-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/pyenchant-1.6.6[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	default_src_prepare
+	# Take out failing tests known to pass when run manually
+	# we certainly don't need to test "python setup.py sdist" here
+	rm "${S}/test/test_packaging.py" || die
+}
+
+python_prepare() {
+	# https://github.com/tavendo/txaio/issues/3
+	cp -r "${FILESDIR}"/util.py test || die
+
+	distutils-r1_python_prepare
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/txaio/txaio-2.7.1.ebuild b/dev-python/txaio/txaio-2.7.1.ebuild
new file mode 100644
index 000000000000..f4632ac61ce1
--- /dev/null
+++ b/dev-python/txaio/txaio-2.7.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius"
+HOMEPAGE="https://github.com/crossbario/txaio https://pypi.python.org/pypi/txaio"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="doc test"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/trollius-2.0[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep '>=dev-python/futures-3.0.3[${PYTHON_USEDEP}]' python2_7)
+"
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-spelling-2.1.2[${PYTHON_USEDEP}]
+		>=dev-python/sphinx_rtd_theme-0.1.9[${PYTHON_USEDEP}]
+		dev-python/alabaster[${PYTHON_USEDEP}]
+	)
+	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-1.8.1[${PYTHON_USEDEP}]
+		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/tox-2.1.1[${PYTHON_USEDEP}]
+		>=dev-python/pep8-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/pyenchant-1.6.6[${PYTHON_USEDEP}]
+	)
+"
+
+# py 3.6 upstream bug fixes applied just after the release
+PATCHES=(
+	"${FILESDIR}/txaio-2.7.1.f._result.patch"
+	"${FILESDIR}/txaio-2.7.1.chained-callback.patch"
+)
+
+src_prepare() {
+	default_src_prepare
+	# Take out failing tests known to pass when run manually
+	# we certainly don't need to test "python setup.py sdist" here
+	rm "${S}/test/test_packaging.py" || die
+}
+
+python_prepare() {
+	# https://github.com/tavendo/txaio/issues/3
+	cp -r "${FILESDIR}"/util.py test || die
+
+	distutils-r1_python_prepare
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/txaio/txaio-2.8.1.ebuild b/dev-python/txaio/txaio-2.8.1.ebuild
new file mode 100644
index 000000000000..660e89d3ae14
--- /dev/null
+++ b/dev-python/txaio/txaio-2.8.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius"
+HOMEPAGE="https://github.com/crossbario/txaio https://pypi.python.org/pypi/txaio"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/trollius-2.0[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep '>=dev-python/futures-3.0.3[${PYTHON_USEDEP}]' python2_7)
+"
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-spelling-2.1.2[${PYTHON_USEDEP}]
+		>=dev-python/sphinx_rtd_theme-0.1.9[${PYTHON_USEDEP}]
+		dev-python/alabaster[${PYTHON_USEDEP}]
+	)
+	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-1.8.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/tox-2.1.1[${PYTHON_USEDEP}]
+		>=dev-python/pep8-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/pyenchant-1.6.6[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	default_src_prepare
+	# Take out failing tests known to pass when run manually
+	# we certainly don't need to test "python setup.py sdist" here
+	rm "${S}/test/test_packaging.py" || die
+}
+
+python_prepare() {
+	# https://github.com/tavendo/txaio/issues/3
+	cp -r "${FILESDIR}"/util.py test || die
+
+	distutils-r1_python_prepare
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/txaio/txaio-2.8.2.ebuild b/dev-python/txaio/txaio-2.8.2.ebuild
new file mode 100644
index 000000000000..660e89d3ae14
--- /dev/null
+++ b/dev-python/txaio/txaio-2.8.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius"
+HOMEPAGE="https://github.com/crossbario/txaio https://pypi.python.org/pypi/txaio"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/trollius-2.0[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep '>=dev-python/futures-3.0.3[${PYTHON_USEDEP}]' python2_7)
+"
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-spelling-2.1.2[${PYTHON_USEDEP}]
+		>=dev-python/sphinx_rtd_theme-0.1.9[${PYTHON_USEDEP}]
+		dev-python/alabaster[${PYTHON_USEDEP}]
+	)
+	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-1.8.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/tox-2.1.1[${PYTHON_USEDEP}]
+		>=dev-python/pep8-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/pyenchant-1.6.6[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	default_src_prepare
+	# Take out failing tests known to pass when run manually
+	# we certainly don't need to test "python setup.py sdist" here
+	rm "${S}/test/test_packaging.py" || die
+}
+
+python_prepare() {
+	# https://github.com/tavendo/txaio/issues/3
+	cp -r "${FILESDIR}"/util.py test || die
+
+	distutils-r1_python_prepare
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/txgithub/Manifest b/dev-python/txgithub/Manifest
new file mode 100644
index 000000000000..8160a899e27b
--- /dev/null
+++ b/dev-python/txgithub/Manifest
@@ -0,0 +1,4 @@
+DIST txgithub-15.0.0.tar.gz 9871 SHA256 1427b52d12369b8c6789ba9cfcb62e94c4f95771642eb6311dabd5fe3e1b1f1f SHA512 40449089c7c82e901f738935e915a2a6e250600f46ceea7011ef48357851513dccd0fe0f45539cff6de8a45acfe3e34082156e2b70e54dec695633be01d03510 WHIRLPOOL ac7e1f542b6ec228f7bde83565c6d4410b0dae7bb0ae6cd1754bacf6bd47f5471e16b006ef1c145d180711d5a82a44de988c7bf2ca95b0907a0595a18a89ca9b
+EBUILD txgithub-15.0.0-r1.ebuild 815 SHA256 d7c750fa9e0b4150e4a2f8a5e39ab66d6fa78ac361b22435d71a615b50b736c6 SHA512 24352530326a67297281c6ce6ec8b5fd3f063230d4d576a74899ae6e1cd0b23efe6693afdf6b4d12e1d8435c1eb8256284aadd4b50f7db9660b4a56c3b2437ad WHIRLPOOL ea0238c39abf8c33c29705a33dbb77995c25ec9562e4ccf2b496fe26d0aab0b4f52233f3f8350473d3aad9ed9dd249eadfc7d9c84d6b107b17867fd8a6811c85
+MISC ChangeLog 466 SHA256 549e64d68b33a411aa079414d715a42c3d88b291b12883c4823f3c55a223f1fc SHA512 03f737b6c76ab02009f8481fa4471c1b93451d0cfdfaa66c191d9bc63b46ee8bb610b3a5770cf2a9927afa360d56405bedabd65f07b8bc6536d550f80b5bd9bc WHIRLPOOL 2a6da243a214075616a4c59c6c6c47a73c47f18df6bbdd1894400186bc1fda4057635c265a30de6c861f89c49c7c56b40f561239c252b6e7d95b905e9cfb9ecc
+MISC metadata.xml 707 SHA256 7f65d9bb5004ccff63b94025c729f4c2538c323084e9a201fe2e2c1b30c870ed SHA512 162ab59e7b2a52926514b3d24e7d722be32fc25ac68ab554f33c92cf4819a03e2c030f4f476a522db6b135f0e47cd2519f557700c5f5432215a03bd3c2ee68a9 WHIRLPOOL b48d3f32f077dca12f9c8852ce613f23b8ff0e156f7fbed3276fab4219685de464f58bff072eedd75a36569acbb06520637c58cc766c76ab52b8abdaf0080151
diff --git a/dev-python/txgithub/metadata.xml b/dev-python/txgithub/metadata.xml
new file mode 100644
index 000000000000..c196a7a0f29f
--- /dev/null
+++ b/dev-python/txgithub/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>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>tom.prince@ualberta.net</email>
+			<name>Tom Prince</name>
+		</maintainer>
+		<remote-id type="pypi">txgithub</remote-id>
+		<remote-id type="github">tomprince/txgithub</remote-id>
+	</upstream>
+	<longdescription>txgithub is a library based on Twisted for accessing GitHub's API version 3</longdescription>
+</pkgmetadata>
diff --git a/dev-python/txgithub/txgithub-15.0.0-r1.ebuild b/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
new file mode 100644
index 000000000000..f036c3f75326
--- /dev/null
+++ b/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6})
+
+inherit eutils distutils-r1
+
+DESCRIPTION="GitHub API client implemented using Twisted"
+HOMEPAGE="https://github.com/tomprince/txgithub https://pypi.python.org/pypi/txgithub"
+SRC_URI="https://github.com/tomprince/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+		( >=dev-python/twisted-core-12.3.0[${PYTHON_USEDEP}]
+		>=dev-python/twisted-web-12.3.0[${PYTHON_USEDEP}] )
+	)
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" py.test -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/txrequests/Manifest b/dev-python/txrequests/Manifest
new file mode 100644
index 000000000000..40ebec99753d
--- /dev/null
+++ b/dev-python/txrequests/Manifest
@@ -0,0 +1,5 @@
+DIST txrequests-0.9.5.tar.gz 5265 SHA256 43a23d8ba1da713899b6bd766218683535c2c81b9b50d256b073fe18662cf0ab SHA512 e9f527eb2fed0038d7e68b5bd74d0a0e58a1d7cc3e181068423dce871ff10b2d5f1ae92e44248e75b4ad8d44b32366ee9eb6cf8fdd114a562baa6b35fab6eb7b WHIRLPOOL 7b4a576af907d69e6f85e572aa22bc2dee2e5aeeff2f450584ba59fd20b1c42eda77ccd51a0c5a0b61d16cf2e416224d8efa1b4dca76a22d4adb7f2ecea8b7ad
+EBUILD txrequests-0.9.5-r1.ebuild 552 SHA256 282a12d2968f16d595e3bba142052c4dc73be4a01a3fb72c85cfc88f4813e967 SHA512 e7f2159b7a4d92b0b4f3d49d73e12d1327f0c144856ab4cfba5a61813b976e151c0609dfe9978eaa8783fa30fe0535eeddd3e1328ae54c23bf3c819a6d6723a5 WHIRLPOOL ded3126b37f2a5df447d7661d305b0ba22e65b81203a1f7db1c276d695aab6ac4dcb81ade9d7bc60e9e590cf53facb272d35915af0efa2fbb7a24986c66ea322
+EBUILD txrequests-0.9.5.ebuild 598 SHA256 9d7f84f3d5c09409ff36f1263dbdecffda2030146c99935b43afdf8e500b7281 SHA512 8d8b633adea60c08f0b6e3e37827be7b89b3f4e5673a7fedb6f96519bf7ad50a9aaca1a8c8fcb64d4a732d7b5aaf9482d4597c5ec12e15d259995adb410ff250 WHIRLPOOL a148cd4b2e75c6ce6ac0ac91411116cdd5daf8e9ee876f260f852cbf0b935eddd5cb745303c9013d8b3c634dcc00a60930ae9de562603fa014eab778c1433a88
+MISC ChangeLog 923 SHA256 da5eafa73e8e8cd3491dbb85574b87d113f29b66af0e9147fdf9a05791fb5bbd SHA512 a1b59d246347e643d35982dd9c7fe44f9d756fe1afbddc8979052b5c7139fd1495ef84b52b60546c8cddbef0a327442b6ed05a5129bbbc54b0ba46182618c6b6 WHIRLPOOL 231375581802178aa5e921f169577a2a4c16ab6d0ae2041402690d3121570c6f058c3841bd602460cc1fb070e3f80b1ff91760c63e01a478c147d043e733b2ee
+MISC metadata.xml 837 SHA256 779e65ddd2e173e6c0b6a28a5e05d530143ee642acf25698ca1b9382df0fb29d SHA512 44d21d1145a2ab989b8bb17942bf357ae51157cbcdcbb1c7203788143be276f3cac6db7b1dda7f014a3b0c54e086ee0f2f8f3e33e8e6282a4e0500becf883c75 WHIRLPOOL 8cd703f143c39c48f56ebaf65964b59a5c68c71c5bd43d15e81d08f9191cc92010de17ecca9dee8ea78746cadb95dc9cba9ea517900eacd6299ccad375b49ba3
diff --git a/dev-python/txrequests/metadata.xml b/dev-python/txrequests/metadata.xml
new file mode 100644
index 000000000000..7c528b84a977
--- /dev/null
+++ b/dev-python/txrequests/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>tardyp@gmail.com</email>
+			<name>Pierre Tardy</name>
+		</maintainer>
+		<remote-id type="pypi">txrequests</remote-id>
+		<remote-id type="github">tardyp/txrequests</remote-id>
+	</upstream>
+	<longdescription>Small add-on for the python requests http library.
+		Makes use twisted's ThreadPool, so that the requests'API returns
+		deferred.  The additional API and changes are minimal and strives to
+		avoid surprises.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/txrequests/txrequests-0.9.5-r1.ebuild b/dev-python/txrequests/txrequests-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..6fe8cbaea19f
--- /dev/null
+++ b/dev-python/txrequests/txrequests-0.9.5-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6})
+
+inherit distutils-r1
+
+DESCRIPTION="Asynchronous Python HTTP for Humans"
+HOMEPAGE="https://github.com/tardyp/txrequests"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/requests-1.2.0[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/txrequests/txrequests-0.9.5.ebuild b/dev-python/txrequests/txrequests-0.9.5.ebuild
new file mode 100644
index 000000000000..cfaee546dae6
--- /dev/null
+++ b/dev-python/txrequests/txrequests-0.9.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7)
+
+inherit distutils-r1
+
+DESCRIPTION="Asynchronous Python HTTP for Humans"
+HOMEPAGE="https://github.com/tardyp/txrequests"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/requests-1.2.0[${PYTHON_USEDEP}]
+	|| (
+		dev-python/twisted[${PYTHON_USEDEP}]
+		>=dev-python/twisted-core-9.0.0[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/txsocksx/Manifest b/dev-python/txsocksx/Manifest
new file mode 100644
index 000000000000..7058a910a724
--- /dev/null
+++ b/dev-python/txsocksx/Manifest
@@ -0,0 +1,5 @@
+DIST txsocksx-1.15.0.2.tar.gz 19350 SHA256 4f79b5225ce29709bfcee45e6f726e65b70fd6f1399d1898e54303dbd6f8065f SHA512 a9a214248aa299b3f2def0e15c3a9c2f78286bc245421844f17d1535b5bb62b7a0a6ee8f1e72963556f8658c8eb914ce4e2e2e0c135abdea3e5a8a1d2165f988 WHIRLPOOL 8f0c267e6f661ac79590c4fc355aa018ad69b3aa58584a2de537518ed546ca86cf8cef71623916d169dd2317f8b58b65c5b9c788a5be519617b9ca2abd752985
+EBUILD txsocksx-1.15.0.2.ebuild 748 SHA256 b509bfbfd0b1f292085d7395247319bf545b5b70f7f8202a07691d6e434f6d58 SHA512 bdb35ef63da74c96709f15924521c33a360e28e9733942b2d8a0f42ba522e312f3075c678a677b78c3129bb49eda69c014310646ae5213af4208c71f6e0ee7ef WHIRLPOOL 803af1445ccd3a607f6c3defbf75e53d1d8c208074f61f62f061d591f8e0acf583bc60bfbcc210fc31ccdd5e8f3499ce2f2579e7528309f97a41e9c0cab976f8
+MISC ChangeLog 2347 SHA256 b6e168afde0fc87135b1a592f0a91aa78c707b386c234f10a75eef064109f613 SHA512 baa5fc54d56494ec77d903b0b8d3cdbf078d94876cf8e4466232664e76971f9f98c58e4c66e4d80e8062d3a1cdf867868cd0780739803f41c5ab1a27902ba02e WHIRLPOOL 88bc0f4aae6f04a35be15a9e8d7048e8786f386f055b8954219542f6e62d5455dfbb026926e5c6ed3e52a158cea0dcf2ea46870c470f56f8279677d2d4805181
+MISC ChangeLog-2015 620 SHA256 b9281752373f1c0ca32581556174be55f0bf3c8799cc4dc27cb9d95c455c10df SHA512 e7285da9705bb6ff6ff47696fee64f0a4da5c80c206fa7eb7abad0ba76c9fcbcd33f39d6be08b75597022b66b888adce9f46ad3b0771af0aa7cbe7431f2a5a21 WHIRLPOOL 8d8eb2080bfa5be04fc5032da87e79bf4a4b40c699f031716b3c990554c9a90d9ba0607d49147ad1c5133f6fafa43475785fbc6eddde90f698ab7883c27db8ce
+MISC metadata.xml 303 SHA256 708e9a1e4f297ebb23478750a6920d8083d86cb6028770b605254b1c1471cd6c SHA512 7c547760f8e1e57644e0a8d40f7749f6a9bc20579ca2cf85b98179aaabf59d2ccae614aa5f7c8ed3279d71107502af079d42b1383f251cfeb626e4b819e88701 WHIRLPOOL d54bb2cd74e646e34602aa9e23e6523ce63204b774a7c79f7db512bf408128413fbf31faddc8bfca6aaede0c5ec34b59f42176d4441b2109950ed0638e8cb938
diff --git a/dev-python/txsocksx/metadata.xml b/dev-python/txsocksx/metadata.xml
new file mode 100644
index 000000000000..4cc68979d354
--- /dev/null
+++ b/dev-python/txsocksx/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed --> 
+  <upstream>
+    <remote-id type="pypi">txsocksx</remote-id>
+    <remote-id type="github">habnabit/txsocksx</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/txsocksx/txsocksx-1.15.0.2.ebuild b/dev-python/txsocksx/txsocksx-1.15.0.2.ebuild
new file mode 100644
index 000000000000..2ec5ff1f85ae
--- /dev/null
+++ b/dev-python/txsocksx/txsocksx-1.15.0.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Twisted client endpoints for SOCKS{4,4a,5}"
+HOMEPAGE="https://github.com/habnabit/txsocksx"
+SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/parsley-1.2[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP},crypt]
+	dev-python/twisted-web[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="dev-python/vcversioner[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/txtorcon/Manifest b/dev-python/txtorcon/Manifest
new file mode 100644
index 000000000000..b04b4dd4c4bd
--- /dev/null
+++ b/dev-python/txtorcon/Manifest
@@ -0,0 +1,7 @@
+AUX txtorcon-0.19.3-Movetestsunderthetxtorconnamespace.patch 6250 SHA256 b3ad9f7ffe109e79edcbf5d519a7997833cfdfa77cda6b3ebf15439f6ad902b2 SHA512 e588ae0bb319ad76e6563cce29524e06ac1a47ed634e62e010663a15e75e0e8e6b4001656dee7110aec0ff3ad75b02ec43fc108155c32108803310b34f2e45dd WHIRLPOOL 0251f2e9c28d946b38036f05d6c74d9cc874f78dbd983911faddc7f42c97230ff47c163e54063dda8991c66f9be6854d700cf87394f032f72f95313d4e25b999
+AUX txtorcon-0.19.3-Removeinstalldocs.patch 1755 SHA256 76882cc81281f46eee9cb69b09ba8fdb0e0c7160a278b4e09ce6ad99a00c2a2e SHA512 b0b563326eeb05171d58832e96bf7f8420c28b40a1b2916402b174238108f2bbfc95092543fef65af92600b822129ea6d8474d085a26f8db286d7a636405a0e6 WHIRLPOOL 0fb4cd99d8557362a5f73a0545bbcbd25208c3e7bd0a09b6c98dc3b5a1a5bde0888c1b0f94dc469608c4f59fbdcf85171fdf5d4e62c630a70726324f7eab74fb
+AUX txtorcon-0.19.3-Removeunconditionalexamples.patch 964 SHA256 d70f5df929b0a8c08e808e4b65beec8d9f4ce0905a611bda2fcb24bce9142d14 SHA512 3131dce9b4f3bf15d09ebc87b323c06bdc30a833ab7c6a964f31599d0b21fd5baa0c696af1356db58677c58d803033e786a80db1d46444d92b91a9fee2736cf6 WHIRLPOOL f6b3f31b6429441bbf51572fbff952c60a6e5154fbefb31514380cabc986024c8eedf926ca493ef16f61b31ce84b81c998b74f5bde0078b290747b3f5737b603
+AUX txtorcon-0.19.3-setup.py-Dontinstallthetests.patch 680 SHA256 3a5346a19eff4f9116b675e8db6dc7de782f6242e9dfd8ed11553ce9ec92e466 SHA512 95894caa6c9e6f3f3a2744a1388397b0ff7298bd508579411ce2cb93ea6f990e6068806ef8d4a9fe959b235ed68402925c731beb9ff9b638a8d6ef2c10709eb8 WHIRLPOOL eea57cce681272d8250dc0d7c937cb1f907e1ef4c35ab9b758bb4979572d372f45234479812df724b3df8c13e4943bd2d74b360007a05b0beb15d61ddf2ddf9d
+DIST txtorcon-0.19.3.tar.gz 265716 SHA256 f73396667909a3c7a98f4dd865edf4ed6a2518ee5a935d92e18b8a479ec244fd SHA512 748e23c25c0b287467e0fa7db6ad69a8af7010957a846141b9360b71af0d279153ff401b85d135e7e66171e81117ebc56406e64e660aeda7dde8cd430d0a7254 WHIRLPOOL 0077f6ba0194cd9da21d3b148418774785e1a79ab4b40ba58a733c14d6f0d1c85afe7797821b84630b7177cfebb361adcde399b84c87cf981a12da7988526462
+EBUILD txtorcon-0.19.3.ebuild 1822 SHA256 9e99b670610812112c335b0057fb9e1b791ac360eea82607d222fd452651bc21 SHA512 fad9006116522780cd72f70863b77a42af7081a7f8862ceb649f0b811b218a2da4e19f2113851d7ea86938794cd431f7fe3de7d58bd1dff9dcb25e70263c2f81 WHIRLPOOL 83297a02b92f8283921adfd3963e2431aba3ee5b1440f0316a9ca4de417c34da848dbd7cfaae2266d4d2e8b92794a5c3daf8dfc72f8972075adfec23b59b3fcd
+MISC metadata.xml 622 SHA256 aa43463a0237f9f4b97c23c49978681423e614e5fa4f0d15b7ecc2d569d10007 SHA512 de6b370265df64461f6f1cc69b7e07344a51ab46f0cb9b4cbef293dd0f2a998aeaa4cc373d8e92f8321c00e24effddd30032114c70a935399a08dfaa41591d7a WHIRLPOOL b0f6a7f219a255522dbe66d8223830080676021a51b32c510314b8a2e56fc16fd97fdf7f814f8b31b1bc7a4e69061127d9d7095e9defff8afae79975502e5cbc
diff --git a/dev-python/txtorcon/files/txtorcon-0.19.3-Movetestsunderthetxtorconnamespace.patch b/dev-python/txtorcon/files/txtorcon-0.19.3-Movetestsunderthetxtorconnamespace.patch
new file mode 100644
index 000000000000..f142176dade2
--- /dev/null
+++ b/dev-python/txtorcon/files/txtorcon-0.19.3-Movetestsunderthetxtorconnamespace.patch
@@ -0,0 +1,147 @@
+From d9f0e2ea76cb54e3647fd16f3be0a8f0224505fd Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Tue, 19 Sep 2017 11:59:08 -0700
+Subject: [PATCH] test: Move tests under the txtorcon namespace
+
+---
+ MANIFEST.in                                        | 1 -
+ {test => txtorcon/test}/__init__.py                | 0
+ {test => txtorcon/test}/py3_torstate.py            | 0
+ {test => txtorcon/test}/test_addrmap.py            | 0
+ {test => txtorcon/test}/test_attacher.py           | 0
+ {test => txtorcon/test}/test_circuit.py            | 0
+ {test => txtorcon/test}/test_controller.py         | 0
+ {test => txtorcon/test}/test_endpoints.py          | 0
+ {test => txtorcon/test}/test_fsm.py                | 0
+ {test => txtorcon/test}/test_log.py                | 0
+ {test => txtorcon/test}/test_microdesc.py          | 0
+ {test => txtorcon/test}/test_router.py             | 0
+ {test => txtorcon/test}/test_socks.py              | 0
+ {test => txtorcon/test}/test_stream.py             | 0
+ {test => txtorcon/test}/test_torconfig.py          | 0
+ {test => txtorcon/test}/test_torcontrolprotocol.py | 0
+ {test => txtorcon/test}/test_torinfo.py            | 0
+ {test => txtorcon/test}/test_torstate.py           | 0
+ {test => txtorcon/test}/test_util.py               | 0
+ {test => txtorcon/test}/test_util_imports.py       | 0
+ {test => txtorcon/test}/test_web.py                | 0
+ {test => txtorcon/test}/util.py                    | 0
+ 22 files changed, 1 deletion(-)
+ rename {test => txtorcon/test}/__init__.py (100%)
+ rename {test => txtorcon/test}/py3_torstate.py (100%)
+ rename {test => txtorcon/test}/test_addrmap.py (100%)
+ rename {test => txtorcon/test}/test_attacher.py (100%)
+ rename {test => txtorcon/test}/test_circuit.py (100%)
+ rename {test => txtorcon/test}/test_controller.py (100%)
+ rename {test => txtorcon/test}/test_endpoints.py (100%)
+ rename {test => txtorcon/test}/test_fsm.py (100%)
+ rename {test => txtorcon/test}/test_log.py (100%)
+ rename {test => txtorcon/test}/test_microdesc.py (100%)
+ rename {test => txtorcon/test}/test_router.py (100%)
+ rename {test => txtorcon/test}/test_socks.py (100%)
+ rename {test => txtorcon/test}/test_stream.py (100%)
+ rename {test => txtorcon/test}/test_torconfig.py (100%)
+ rename {test => txtorcon/test}/test_torcontrolprotocol.py (100%)
+ rename {test => txtorcon/test}/test_torinfo.py (100%)
+ rename {test => txtorcon/test}/test_torstate.py (100%)
+ rename {test => txtorcon/test}/test_util.py (100%)
+ rename {test => txtorcon/test}/test_util_imports.py (100%)
+ rename {test => txtorcon/test}/test_web.py (100%)
+ rename {test => txtorcon/test}/util.py (100%)
+
+diff --git a/MANIFEST.in b/MANIFEST.in
+index 13dc4e2..7b8184a 100644
+--- a/MANIFEST.in
++++ b/MANIFEST.in
+@@ -22,4 +22,3 @@ include examples/*
+ exclude examples/*~
+ include requirements.txt
+ include dev-requirements.txt
+-include test/*.py
+diff --git a/test/__init__.py b/txtorcon/test/__init__.py
+similarity index 100%
+rename from test/__init__.py
+rename to txtorcon/test/__init__.py
+diff --git a/test/py3_torstate.py b/txtorcon/test/py3_torstate.py
+similarity index 100%
+rename from test/py3_torstate.py
+rename to txtorcon/test/py3_torstate.py
+diff --git a/test/test_addrmap.py b/txtorcon/test/test_addrmap.py
+similarity index 100%
+rename from test/test_addrmap.py
+rename to txtorcon/test/test_addrmap.py
+diff --git a/test/test_attacher.py b/txtorcon/test/test_attacher.py
+similarity index 100%
+rename from test/test_attacher.py
+rename to txtorcon/test/test_attacher.py
+diff --git a/test/test_circuit.py b/txtorcon/test/test_circuit.py
+similarity index 100%
+rename from test/test_circuit.py
+rename to txtorcon/test/test_circuit.py
+diff --git a/test/test_controller.py b/txtorcon/test/test_controller.py
+similarity index 100%
+rename from test/test_controller.py
+rename to txtorcon/test/test_controller.py
+diff --git a/test/test_endpoints.py b/txtorcon/test/test_endpoints.py
+similarity index 100%
+rename from test/test_endpoints.py
+rename to txtorcon/test/test_endpoints.py
+diff --git a/test/test_fsm.py b/txtorcon/test/test_fsm.py
+similarity index 100%
+rename from test/test_fsm.py
+rename to txtorcon/test/test_fsm.py
+diff --git a/test/test_log.py b/txtorcon/test/test_log.py
+similarity index 100%
+rename from test/test_log.py
+rename to txtorcon/test/test_log.py
+diff --git a/test/test_microdesc.py b/txtorcon/test/test_microdesc.py
+similarity index 100%
+rename from test/test_microdesc.py
+rename to txtorcon/test/test_microdesc.py
+diff --git a/test/test_router.py b/txtorcon/test/test_router.py
+similarity index 100%
+rename from test/test_router.py
+rename to txtorcon/test/test_router.py
+diff --git a/test/test_socks.py b/txtorcon/test/test_socks.py
+similarity index 100%
+rename from test/test_socks.py
+rename to txtorcon/test/test_socks.py
+diff --git a/test/test_stream.py b/txtorcon/test/test_stream.py
+similarity index 100%
+rename from test/test_stream.py
+rename to txtorcon/test/test_stream.py
+diff --git a/test/test_torconfig.py b/txtorcon/test/test_torconfig.py
+similarity index 100%
+rename from test/test_torconfig.py
+rename to txtorcon/test/test_torconfig.py
+diff --git a/test/test_torcontrolprotocol.py b/txtorcon/test/test_torcontrolprotocol.py
+similarity index 100%
+rename from test/test_torcontrolprotocol.py
+rename to txtorcon/test/test_torcontrolprotocol.py
+diff --git a/test/test_torinfo.py b/txtorcon/test/test_torinfo.py
+similarity index 100%
+rename from test/test_torinfo.py
+rename to txtorcon/test/test_torinfo.py
+diff --git a/test/test_torstate.py b/txtorcon/test/test_torstate.py
+similarity index 100%
+rename from test/test_torstate.py
+rename to txtorcon/test/test_torstate.py
+diff --git a/test/test_util.py b/txtorcon/test/test_util.py
+similarity index 100%
+rename from test/test_util.py
+rename to txtorcon/test/test_util.py
+diff --git a/test/test_util_imports.py b/txtorcon/test/test_util_imports.py
+similarity index 100%
+rename from test/test_util_imports.py
+rename to txtorcon/test/test_util_imports.py
+diff --git a/test/test_web.py b/txtorcon/test/test_web.py
+similarity index 100%
+rename from test/test_web.py
+rename to txtorcon/test/test_web.py
+diff --git a/test/util.py b/txtorcon/test/util.py
+similarity index 100%
+rename from test/util.py
+rename to txtorcon/test/util.py
+-- 
+2.14.1
+
diff --git a/dev-python/txtorcon/files/txtorcon-0.19.3-Removeinstalldocs.patch b/dev-python/txtorcon/files/txtorcon-0.19.3-Removeinstalldocs.patch
new file mode 100644
index 000000000000..0731132e4f80
--- /dev/null
+++ b/dev-python/txtorcon/files/txtorcon-0.19.3-Removeinstalldocs.patch
@@ -0,0 +1,53 @@
+From c2ddddde8570793f646c96038afc97fef4a809c0 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Tue, 19 Sep 2017 15:12:43 -0700
+Subject: [PATCH] setup.py: Remove remaining docs from data_files install
+
+These are better handled by distro package managers, don't belong on production installs.
+Please make these conditionally installed instead.  Preferrably optionally add a build_docs
+extension to install the built sphinx docs if that option was passed to setup.py.
+---
+ setup.py | 22 ----------------------
+ 1 file changed, 22 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 3020112..a9f3993 100644
+--- a/setup.py
++++ b/setup.py
+@@ -26,10 +26,6 @@ description = '''
+     https://github.com/meejah/txtorcon
+ '''
+ 
+-sphinx_rst_files = [x for x in listdir('docs') if x[-3:] == 'rst']
+-sphinx_docs = [join('docs', x) for x in sphinx_rst_files]
+-sphinx_docs += [join('docs/_static', x) for x in listdir('docs/_static')]
+-
+ setup(
+     name='txtorcon',
+     version=__version__,
+@@ -66,22 +62,4 @@ setup(
+         "txtorcon",
+         "twisted.plugins",
+     ],
+-
+-    # I'm a little unclear if I'm doing this "properly", especially
+-    # the documentation etc. Do we really want "share/txtorcon" for
+-    # the first member of the tuple? Why does it seem I need to
+-    # duplicate this in MANIFEST.in?
+-
+-    data_files=[
+-        ('share/txtorcon', ['INSTALL', 'README.rst', 'TODO', 'meejah.asc']),
+-
+-        # this includes the Sphinx source for the
+-        # docs. The "map+filter" construct grabs all .rst
+-        # files and re-maps the path
+-        ('share/txtorcon', [
+-            'docs/apilinks_sphinxext.py',
+-            'docs/conf.py',
+-            'docs/Makefile',
+-        ] + sphinx_docs),
+-    ],
+ )
+-- 
+2.14.1
+
diff --git a/dev-python/txtorcon/files/txtorcon-0.19.3-Removeunconditionalexamples.patch b/dev-python/txtorcon/files/txtorcon-0.19.3-Removeunconditionalexamples.patch
new file mode 100644
index 000000000000..0cc50141ed28
--- /dev/null
+++ b/dev-python/txtorcon/files/txtorcon-0.19.3-Removeunconditionalexamples.patch
@@ -0,0 +1,34 @@
+From 3e7f764b18b1f630a23e71db9ca8f7c2e6e8210b Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Tue, 19 Sep 2017 15:06:28 -0700
+Subject: [PATCH] setup.py: Remove unconditional examples from data files
+ install
+
+---
+ setup.py | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index d5f8016..3020112 100644
+--- a/setup.py
++++ b/setup.py
+@@ -29,7 +29,6 @@ description = '''
+ sphinx_rst_files = [x for x in listdir('docs') if x[-3:] == 'rst']
+ sphinx_docs = [join('docs', x) for x in sphinx_rst_files]
+ sphinx_docs += [join('docs/_static', x) for x in listdir('docs/_static')]
+-examples = [x for x in listdir('examples') if x[-3:] == '.py']
+ 
+ setup(
+     name='txtorcon',
+@@ -84,8 +83,5 @@ setup(
+             'docs/conf.py',
+             'docs/Makefile',
+         ] + sphinx_docs),
+-
+-        # include all the examples
+-        ('share/txtorcon/examples', [join('examples', x) for x in examples])
+     ],
+ )
+-- 
+2.14.1
+
diff --git a/dev-python/txtorcon/files/txtorcon-0.19.3-setup.py-Dontinstallthetests.patch b/dev-python/txtorcon/files/txtorcon-0.19.3-setup.py-Dontinstallthetests.patch
new file mode 100644
index 000000000000..0cf86fe74fbc
--- /dev/null
+++ b/dev-python/txtorcon/files/txtorcon-0.19.3-setup.py-Dontinstallthetests.patch
@@ -0,0 +1,26 @@
+From f407d11f3d4951c301fd47df211f0d93d107b8d1 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Tue, 19 Sep 2017 11:49:14 -0700
+Subject: [PATCH] setup.py: Don't install the tests
+
+This was installing the tests to its own namespace, not under the txtorcon namespace.
+If you want the tests installed, then move them under the txtorcon namespace.
+---
+ setup.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 38c6421..d5f8016 100644
+--- a/setup.py
++++ b/setup.py
+@@ -64,7 +64,6 @@ setup(
+     url=__url__,
+     license=__license__,
+     packages=[
+-        "test",
+         "txtorcon",
+         "twisted.plugins",
+     ],
+-- 
+2.14.1
+
diff --git a/dev-python/txtorcon/metadata.xml b/dev-python/txtorcon/metadata.xml
new file mode 100644
index 000000000000..78c235d7e5a8
--- /dev/null
+++ b/dev-python/txtorcon/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>maintainer</description>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>meejah@meejah.ca</email>
+			<name>meejah</name>
+		</maintainer>
+		<remote-id type="pypi">txtorcon</remote-id>
+		<remote-id type="github">meejah/txtorcon</remote-id>
+	</upstream>
+	<longdescription>
+		txtorcon is an implementation of the control-spec for Tor using the
+		Twisted networking library for Python.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/txtorcon/txtorcon-0.19.3.ebuild b/dev-python/txtorcon/txtorcon-0.19.3.ebuild
new file mode 100644
index 000000000000..5155d74c9df7
--- /dev/null
+++ b/dev-python/txtorcon/txtorcon-0.19.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Twisted-based Tor controller client, with state-tracking and config abstractions"
+HOMEPAGE="https://github.com/meejah/txtorcon https://pypi.python.org/pypi/txtorcon https://txtorcon.readthedocs.org"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples test"
+
+RDEPEND="
+	dev-python/automat[${PYTHON_USEDEP}]
+	dev-python/incremental[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' python2_7)
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP},crypt]
+	>=dev-python/zope-interface-3.6.1[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/automat[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' python2_7)
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/repoze-sphinx-autointerface[${PYTHON_USEDEP}]
+		>=dev-python/zope-interface-3.6.1[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/txtorcon-0.19.3-setup.py-Dontinstallthetests.patch"
+	"${FILESDIR}/txtorcon-0.19.3-Movetestsunderthetxtorconnamespace.patch"
+	"${FILESDIR}/txtorcon-0.19.3-Removeunconditionalexamples.patch"
+	"${FILESDIR}/txtorcon-0.19.3-Removeinstalldocs.patch"
+)
+
+python_test() {
+	pushd "${TEST_DIR}" > /dev/null || die
+	/usr/bin/trial txtorcon || die "Tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_compile_all() {
+	use doc && emake -C "${S}/docs" html
+}
+
+python_install_all() {
+	use doc && dohtml -r "${S}/docs/_build/html/"*
+	use examples && dodoc -r "${S}/examples/"
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
new file mode 100644
index 000000000000..fe921e08f91b
--- /dev/null
+++ b/dev-python/typed-ast/Manifest
@@ -0,0 +1,3 @@
+DIST typed-ast-1.1.0.tar.gz 200587 SHA256 57fe287f0cdd9ceaf69e7b71a2e94a24b5d268b35df251a88fef5cc241bf73aa SHA512 439e949082ee5cb9434fec99021c08401a46ec2ad16d96296c6440aa1fd8158f6605efbdfa55e536c3fddd4018bb0f4c5ee4d5a4a32954242b7902b9ce3463f2 WHIRLPOOL 28af2d97e1a64f3ca2e022b6af72f2a6dd2f5446688bb17a7315c9dd9b4bcd2bc74cf210169e81df03a3b37c2cf17a93601e40132d0182059baa955b33aa25b6
+EBUILD typed-ast-1.1.0.ebuild 414 SHA256 1f44e61a5fc06b77dead2fcb6a0142229a58e1e1b323798a8c1dfe089a9bf829 SHA512 1a3d8f8740b940536c35d173f2faa8ed555efbf018360fc2ee5f1bad5066892e84962c73ff689f0807becbac53d3b16483e34db144c7669a3dbcc9092cc3c8c1 WHIRLPOOL 96d8e40bbac150d96b4c45962f832227169df210c7ae56cc55e6b59ad0d0ce0777fe168e8812645bafcfd881f8b86a5e10fad0b7e232c817b3731a79492ad7d1
+MISC metadata.xml 371 SHA256 298c58f4c883fcc42825369ac79a61fdda0c97014efe2a496c84ee1edccfd1a2 SHA512 28a6e9c5ac51f6b86cfbb1f5cf06a1dbe524326a74e69ca63ff2440b116a4780d87de84d9de4e070ad3669d0732be5e4ff87681570a57ff22e395d59e19a1c3a WHIRLPOOL 11433b98379e7a44b6784247a90c857c35f855b4eea4db3e9cadd3d0164cae7ebb02b1e8b517b4fd2ca47ca36b153f0c892fd3c03b1ef183e9aada9d4d84e681
diff --git a/dev-python/typed-ast/metadata.xml b/dev-python/typed-ast/metadata.xml
new file mode 100644
index 000000000000..3de207160516
--- /dev/null
+++ b/dev-python/typed-ast/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">typed_ast/typed_ast</remote-id>
+		<remote-id type="pypi">typed-ast</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/typed-ast/typed-ast-1.1.0.ebuild b/dev-python/typed-ast/typed-ast-1.1.0.ebuild
new file mode 100644
index 000000000000..6ca79fff1bd3
--- /dev/null
+++ b/dev-python/typed-ast/typed-ast-1.1.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="A fork of Python 2 and 3 ast modules with type comment support"
+HOMEPAGE="https://github.com/python/typed_ast"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/typing/Manifest b/dev-python/typing/Manifest
new file mode 100644
index 000000000000..98ea6f1bf080
--- /dev/null
+++ b/dev-python/typing/Manifest
@@ -0,0 +1,8 @@
+DIST typing-3.5.2.2.tar.gz 51101 SHA256 2bce34292653af712963c877f3085250a336738e64f99048d1b8509bebc4772f SHA512 38d8899cf7ccfc86299ea59a234a80a7938ff9e78d84a9593befd163959ee90af3201dfd495e172904bc6423919b338bee470d166e9c41d9697662c27ed2fbc8 WHIRLPOOL 7cb2dad3b1f3fb5c50801d92336de755c96cf8fde984da2b18525ec53be391d02d1bd8f0d934bdd1708caa1465f3f1e0ea4d7b4fbc86eb411868de5c1db125d5
+DIST typing-3.5.3.0.tar.gz 60350 SHA256 ca2daac7e393e8ee86e9140cd0cf0172ff6bb50ebdf0b06281770f98f31bff21 SHA512 e1930de61cbb0b49ebeec49b87ce3a60752ed062ebf44ff2c5becf2e19a22726d08607ce6723b5b4e633190d8a9686176d44f7672c44bd246acb8e367c5d3c37 WHIRLPOOL d1e4f29b684084ca4370ed74d68e05f9723314f9144b825fb5b085c38644bf8460c2b1266382427d281550d43b85aa3395415f161a52d4769de24ded2b9777eb
+DIST typing-3.6.2.tar.gz 78726 SHA256 d514bd84b284dd3e844f0305ac07511f097e325171f6cc4a20878d11ad771849 SHA512 a975980e7ba6ec3e15c938336877071785bec7212443da079770348ab9441c8d918cd806e85ebea8af66a5d94f684566ea07b55e7623ab11e7d922c8c3dfe981 WHIRLPOOL 0259037ee7c135b7f9a6887eb6a9cb95a181254880e6e13ccc3bab88385b0c0df1a5db1d7bfdaf250b4ec5e624d82c85c97521b670b1b2177298586ea3ef87b7
+EBUILD typing-3.5.2.2.ebuild 718 SHA256 86ad921116e5c74732c84c669eb820c128828e079a0d3088cab6e218fa2a651a SHA512 6707ebdd7854ac6aa33510f5e61b2080ef0fd4fefd6bf9966e82ecad9db9e84e127055e2f6f979decf8834c7bcb291736633d26537bdb18be2942e70e0473f46 WHIRLPOOL ac20ae8ce10d610c86860b6071b17b44caed1cb3636fb5fc33cc8e9262cd3f72437c11f1fdd0d815e94e01b8ce9c6ccc6b924ff9c0a6b3938c60c52fdbcb6519
+EBUILD typing-3.5.3.0.ebuild 735 SHA256 baa3839eeebd18f7a5d2757a430e1678f5ec4ff1f9971ab8eaa4465ec2482842 SHA512 3241d86cd8a8f82be1a4f13aa56a2dac6200b446edeea2409305d393d65381c33442667892bb17f5df56436927696096ada3ed126555a295b40dad636871c5df WHIRLPOOL 86a4b83ee399d5eaf5da990f5c7aba0fc264439c5b0cdfd8e38ba7818094e36614d8c448a1b04c9740650b6ea78d8169d47cc8131a63a126ec2d3e9bf4d69e3a
+EBUILD typing-3.6.2.ebuild 753 SHA256 1827a3bc11cc4ad5e33a40c578096cf87c76468b6f5b2f165d12ff6db7364379 SHA512 6011be71d92e87ea101ced15d7ff0d41eb083a09d96292691d7160d0b2a7df0b80fae484c404327a4b72fa8f5c0618f70b658e4578250d5c6f737b13183084f0 WHIRLPOOL 8d689d6d533d7db6d6db9fc5fa3862624ae6e542e8b5fc428b84382e1c2340ed81702776880d7b9b1a9bad8b5e313816086eb1d38beff30d970b1af91c7a898a
+MISC ChangeLog 806 SHA256 36c24d5802d4cfc138330463bdcdbeea5bafbf73798785e773084345aa81e89e SHA512 745dc5f385d8dc377c0f1f99835bf4fbff953ebe9fa9bb68d6f1630462174b0232d39a8bcdc94495d04feb8912611f056a28bf41c033d5111848b9118ac45f91 WHIRLPOOL a1dd65775533f8eb7ae59a7caf45ce66b97263b4bbba8fa462439ed97265afa4e8337dd2e4e3647295935153e8a093a7c2aa84c920a5b8b38ee34f04ced2ccda
+MISC metadata.xml 315 SHA256 78117e46fdf3199b73dae5d5e385d70151572f84a2e8bf356f6416eb564b739b SHA512 cda57db8293624642470f9c44e1ac73bfe45993c4cf9ba4240d988de0098088566edc0c381f9f5356071de76ca9c4af7d26f1404e482a7c49e2a06bf2f8c94a9 WHIRLPOOL f81299035287e58260fbbb5714cad5a241157ffe5252406c5140033d8524de8fecd2b68e42fb94f625c6240a8f3800ca51aa060342a8a6b73d28e621bfff4b53
diff --git a/dev-python/typing/metadata.xml b/dev-python/typing/metadata.xml
new file mode 100644
index 000000000000..3a4d8649b165
--- /dev/null
+++ b/dev-python/typing/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">typing</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/typing/typing-3.5.2.2.ebuild b/dev-python/typing/typing-3.5.2.2.ebuild
new file mode 100644
index 000000000000..e789c18223cb
--- /dev/null
+++ b/dev-python/typing/typing-3.5.2.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Type Hints for Python"
+HOMEPAGE="https://docs.python.org/3.5/library/typing.html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	if [[ ${EPYTHON} == python2* || ${EPYTHON} == pypy ]]; then
+		cp "${S}"/python2/test_typing.py . || die
+	else
+		cp "${S}"/src/test_typing.py . || die
+	fi
+
+	"${EPYTHON}" test_typing.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/typing/typing-3.5.3.0.ebuild b/dev-python/typing/typing-3.5.3.0.ebuild
new file mode 100644
index 000000000000..3894ae572cbd
--- /dev/null
+++ b/dev-python/typing/typing-3.5.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Type Hints for Python"
+HOMEPAGE="https://docs.python.org/3.5/library/typing.html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~ppc ~ppc64 x86 ~x64-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	if [[ ${EPYTHON} == python2* || ${EPYTHON} == pypy ]]; then
+		cp "${S}"/python2/test_typing.py . || die
+	else
+		cp "${S}"/src/test_typing.py . || die
+	fi
+
+	"${EPYTHON}" test_typing.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/typing/typing-3.6.2.ebuild b/dev-python/typing/typing-3.6.2.ebuild
new file mode 100644
index 000000000000..8b63ed6335d9
--- /dev/null
+++ b/dev-python/typing/typing-3.6.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Type Hints for Python"
+HOMEPAGE="https://docs.python.org/3/library/typing.html https://pypi.python.org/pypi/typing"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x64-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	if [[ ${EPYTHON} == python2* || ${EPYTHON} == pypy ]]; then
+		cd "${S}"/python2 || die
+	else
+		cd "${S}"/src || die
+	fi
+
+	"${PYTHON}" test_typing.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/tzlocal/Manifest b/dev-python/tzlocal/Manifest
new file mode 100644
index 000000000000..66d2a7e4ad30
--- /dev/null
+++ b/dev-python/tzlocal/Manifest
@@ -0,0 +1,5 @@
+DIST tzlocal-1.2.tar.gz 16149 SHA256 438f122d684c951b22cb98aecc80fdb961b84e69542bf878c6b9a9419de09a8b SHA512 eb4d1f73983579e109249884d2a343c441942fb0d4dc76aed693c4a05100b10a2337d72794fdb9c0cd28c3b73e11dbd030bdf6dc2f75e57c958655219973c814 WHIRLPOOL 8f39abc1a07a27c4afa8116c8817a1ec37483d8f05291f29a23ea6cfaf2bb517fca7b0b8998c8d13183cc0f0b26bb718c1674c033af271460ed1add7e0ccf5d6
+EBUILD tzlocal-1.2.ebuild 575 SHA256 266c8631d065c695045e64775e4a3f5db2c5e40585e378f55b50bf3a45de5621 SHA512 ef19fb06419aacb21af45de7314cd6253e1f0a20477afbe6bd4b14edd7e5729746f0b137ff2c79e214fa025c4e53b555f61cdba032389e286285f557c1bce585 WHIRLPOOL 4ec6e3f4d94a83319ec9728fabd6691834300a13cbdd1368e30f1974ef1193512f7cb5405cffab82deda644fef05ec302f49fb1cfbdc3f6800d450297062bbf5
+MISC ChangeLog 2753 SHA256 42d0bea6cc6f3454420ac6f51ac4280a3327f09bd051121d3a4abe8245d68a79 SHA512 2a90744a6756bd0d1a1164da7bfd9c77a0a8c9d84d3e2c1a73d91779eeba396e8f51139dae915eb2a58e7fa2cbbc669f2ac44558dbd31765cb4391b35863871b WHIRLPOOL 95d5b9812a253130d6b9485ed677eaf3ced0925594cd895da7b536e78acec188e966475b7d2d90cee3355f25361c2706f75ad492ed4ef4a736777b93a71df46a
+MISC ChangeLog-2015 667 SHA256 81471680273484d539ada3db2a73dec429399b8a2f6276ffab31e2e989d07469 SHA512 6054dbd9eea36969f5a5c51303c4c63ced570890ac8d11f9bf369e2ada18959cb6302ff5825407313ebaf8f79df644fe39d48a80135bab56ccbff48ce3fa5a2e WHIRLPOOL 884f65b103d7ef7436b32c4a7d014623dba3864ab7f0694aa694fe6874d51a6add17d418d1b910d498c19015da8ae2a44fb5a9abb40b56bad36574e9e1346cc5
+MISC metadata.xml 377 SHA256 f0c7fe5955e4fa939ad10195abdf4964b80f66227d288ed8ca05ea8ce505906b SHA512 3ada56c5037a2a59fb53408483f03bc3ae72c9d7f676dd046125b035b34d4195e653662b67529453d63556dedda4471a9c77daaa1137af1245e49174fef1fd87 WHIRLPOOL c7d89c98011dcd71626f0839f1ce1346ca013f27285f6e2911468f447b01a3dd943e943d10fcbe23ec6daa58a037010e4048b177731c1cd743c4366fbcf0c91a
diff --git a/dev-python/tzlocal/metadata.xml b/dev-python/tzlocal/metadata.xml
new file mode 100644
index 000000000000..ba2007a1fb81
--- /dev/null
+++ b/dev-python/tzlocal/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">tzlocal</remote-id>
+    <remote-id type="github">regebro/tzlocal</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/tzlocal/tzlocal-1.2.ebuild b/dev-python/tzlocal/tzlocal-1.2.ebuild
new file mode 100644
index 000000000000..0aaf1aeb615b
--- /dev/null
+++ b/dev-python/tzlocal/tzlocal-1.2.ebuild
@@ -0,0 +1,25 @@
+# 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
+
+DESCRIPTION="tzinfo object for the local timezone"
+HOMEPAGE="https://github.com/regebro/tzlocal"
+SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDPEND="dev-python/pytz[${PYTHON_USEDEP}]"
+
+python_test() {
+	unset TZ
+	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/u-msgpack/Manifest b/dev-python/u-msgpack/Manifest
new file mode 100644
index 000000000000..ed671d7d1161
--- /dev/null
+++ b/dev-python/u-msgpack/Manifest
@@ -0,0 +1,7 @@
+AUX u-msgpack-2.4.1-little-endian.patch 2129 SHA256 69237ab3a14928599eb7e77f563d32654ce5f8d7d7a32c4b3f0848f915b88248 SHA512 978c6eede0b89238134b31b596f9e0fd87d31431fd95d9f44578bb782b17fe8c39fea20bd494581a633219f8137c23156d5bbc454040c137552c7a72901525b5 WHIRLPOOL 6e65379db3edd8568d5deb707b0eb08312844b80d518472b6793798e1b09a88cdd41de3075a13c875dd6bd580f1e59a6604b34534e412d1766ab4ff9f987dd04
+DIST u-msgpack-2.3.0.tar.gz 11644 SHA256 d8df6bb0e2a838aa227c39cfd14aa147ab32b3df6871001874e9b9da9ce1760c SHA512 f39a30fd6b413f1fb57acee6faf0b2d032f940d048b47f04d7f51d46c7f5efc2cede8e298ffef2304c4bcb3e00ade730f76c5b89ebc50ec5766a3c0a69fff316 WHIRLPOOL 147b95349a0a8b631f3d4775ebd46563530cbd72f743ee19723c3330ef45c2866da1fac160d2876b3c949c4769e00f95e75cc59cfb4626f373c982ee8790c21a
+DIST u-msgpack-2.4.1.tar.gz 12026 SHA256 2f31fc1b6dd8632c230ea7012470e40f77119f20999274dda6f1afa9c305e590 SHA512 4c3edb72455e8eb8fa7a4ed9b6ef4461755b782391f2c362d52d0fafda3e790fb40d0d239d05ba99beb3ad4cfd9e200175e2a1917cd64ee1e5d8cc3c4e8b3f25 WHIRLPOOL 8df0c9b0c398b28b03c93b80e690192c6856085dd436e3719449d2c9a3e9ce6c70067c2da06afc5ebe318dd0f4a6cab21c7b08a28364808eb627e3d53b7a594e
+EBUILD u-msgpack-2.3.0.ebuild 588 SHA256 6f65fd92cf6940bce1deffa01036799f969908065716f1c8f7b7c6fcb8a72d28 SHA512 bdc9589e3118a43d5e6511b8796a9337eca5877855365b69578b0dcaa6cfe8a27b275e3f6505f520ae31e63d74f13477529d51cb509976cc98ec5c0cdba3994a WHIRLPOOL 76bab3fc45d4ff8a90bbc85eec53414d8cf0767a7608c45bc55e179fbc475e3141b9f0b6b4afc3d2ce8cbcaf4407c8dbfda36d73cfa35fef1b89e760dea996fa
+EBUILD u-msgpack-2.4.1.ebuild 807 SHA256 ba54f618d6da40434eedcaec6f9afd65eef782c9d4ef2af7344f0ebff1c0117d SHA512 743a0fcbdd13360c31e940060938528daa868f27ca560ae9f38fda8e1e694812fdd2b472b7b03e624eebac4d1d31c1b62ce68f51f20d227d85283b4b63101906 WHIRLPOOL 1db9ca65f2118fa77e8300d2614bc4b2ed0bdf29f91ca1cbf34e23761b59f712459c4d860db5df0eec6733273dc1b9da5f26fbf7c4d3e10cf2e3955d6d9c6573
+MISC ChangeLog 632 SHA256 f3ebdf45b0c25256e3d263a42349529361f828ec1da5c626e02ee3e8454b07a7 SHA512 30c33a3c45f6c3d824582416520a6443fdca8be269c13fc3b4b3dc54a19609f1c0139bee1f07492e04347c3515cb84651729edefcd66daefb528489b9fac1238 WHIRLPOOL 9c266fd8108e00caf6f704458f7fd5c729b6298b4fd275c9e5c5215c959bd7ab891bdc7987939cca0e70de06a614387a93d36c6a975161c343bf890f7f20a287
+MISC metadata.xml 1033 SHA256 fcc108ea5ec647efdb2d18055c2dd1ebc38657a0643438644e7193fc72b95c5e SHA512 8808188cce70672bf3d4e65a8a5f65e8964ca17a82dd5d605fcb49cd3ac8d5f50f6182723537af58499d1a718b728cbbe644e3a628ce23a5327b78f6f47719ac WHIRLPOOL 90d0d567c14bfde147b2c417e53131640af92910e11ef01237d741b8e8957678504b290530d9237643fb5dabf9111a4fe3f01ce16eb347b05866dcfbaea85073
diff --git a/dev-python/u-msgpack/files/u-msgpack-2.4.1-little-endian.patch b/dev-python/u-msgpack/files/u-msgpack-2.4.1-little-endian.patch
new file mode 100644
index 000000000000..c04aca3a3574
--- /dev/null
+++ b/dev-python/u-msgpack/files/u-msgpack-2.4.1-little-endian.patch
@@ -0,0 +1,60 @@
+https://github.com/vsergeev/u-msgpack-python/pull/31
+
+From 003289878812c63ef046dc7090953b8dde784f8c Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Fri, 22 Sep 2017 12:09:30 +0100
+Subject: [PATCH] test_umsgpack.py: fix test on big-endian platforms
+
+On powerpc and powerpc64 one test fails as:
+
+```
+  $ py.test -v
+  ...
+  test_umsgpack.py::TestUmsgpack::test_pack_ext_handler FAILED
+  test_umsgpack.py::TestUmsgpack::test_unpack_ext_handler FAILED
+  ...
+
+  self = <test_umsgpack.TestUmsgpack testMethod=test_pack_ext_handler>
+
+    def test_pack_ext_handler(self):
+        for (name, obj, data) in ext_handlers_test_vectors:
+            obj_repr = repr(obj)
+            print("\tTesting %s: object %s" %
+                  (name, obj_repr if len(obj_repr) < 24 else obj_repr[0:24] + "..."))
+            packed = umsgpack.packb(obj, ext_handlers=ext_handlers)
+  >           self.assertEqual(packed, data)
+  E           AssertionError: b'\xd7 ?\x80\x00\x00@\x00\x00\x00' != b'\xd7 \x00\x00\x80?\x00\x00\x00@'
+
+  test_umsgpack.py:484: AssertionError
+```
+
+The problem here is in 'struct.pack' output:
+it uses native endianness format but test hardcodes little-endian output.
+
+The change forces 'struct.pack' into little-endian format.
+That way all tests pass:.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ test_umsgpack.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test_umsgpack.py b/test_umsgpack.py
+index a25b5b8..e500276 100644
+--- a/test_umsgpack.py
++++ b/test_umsgpack.py
+@@ -297,9 +297,9 @@ float_precision_test_vectors = [
+ CustomType = namedtuple('CustomType', ['x', 'y', 'z'])
+ 
+ ext_handlers = {
+-    complex: lambda obj: umsgpack.Ext(0x20, struct.pack("ff", obj.real, obj.imag)),
++    complex: lambda obj: umsgpack.Ext(0x20, struct.pack("<ff", obj.real, obj.imag)),
+     CustomType: lambda obj: umsgpack.Ext(0x30, umsgpack.packb(list(obj))),
+-    0x20: lambda ext: complex(*struct.unpack("ff", ext.data)),
++    0x20: lambda ext: complex(*struct.unpack("<ff", ext.data)),
+     0x30: lambda ext: CustomType(*umsgpack.unpackb(ext.data)),
+ }
+ 
+-- 
+2.14.1
+
diff --git a/dev-python/u-msgpack/metadata.xml b/dev-python/u-msgpack/metadata.xml
new file mode 100644
index 000000000000..ba39f6df75aa
--- /dev/null
+++ b/dev-python/u-msgpack/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>vsergeev@gmail.com</email>
+			<name>Vanya Sergeev</name>
+		</maintainer>
+		<remote-id type="pypi">u-msgpack-python</remote-id>
+		<remote-id type="github">vsergeev/u-msgpack-python</remote-id>
+	</upstream>
+	<longdescription>
+		u-msgpack-python is a lightweight MessagePack serializer and
+		deserializer module written in pure Python, compatible with both Python
+		2 and Python 3, as well as CPython and PyPy implementations of Python.
+		u-msgpack-python is fully compliant with the latest MessagePack
+		specification. In particular, it supports the new binary, UTF-8 string,
+		and application-defined ext types
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/u-msgpack/u-msgpack-2.3.0.ebuild b/dev-python/u-msgpack/u-msgpack-2.3.0.ebuild
new file mode 100644
index 000000000000..3c209c324b35
--- /dev/null
+++ b/dev-python/u-msgpack/u-msgpack-2.3.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+MY_PN="${PN}-python"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A portable, lightweight MessagePack serializer and deserializer"
+HOMEPAGE="https://github.com/vsergeev/u-msgpack-python https://pypi.python.org/pypi/u-msgpack-python"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild b/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
new file mode 100644
index 000000000000..697ed0e5c003
--- /dev/null
+++ b/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="${PN}-python"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A portable, lightweight MessagePack serializer and deserializer"
+HOMEPAGE="https://github.com/vsergeev/u-msgpack-python https://pypi.python.org/pypi/u-msgpack-python"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=("${FILESDIR}"/${P}-little-endian.patch)
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/uhashring/Manifest b/dev-python/uhashring/Manifest
new file mode 100644
index 000000000000..d5427e7567e7
--- /dev/null
+++ b/dev-python/uhashring/Manifest
@@ -0,0 +1,4 @@
+DIST uhashring-0.4.tar.gz 11820 SHA256 da0555e752ce259042d2de8ab7b6b07e280bc3532d76a8589e31dcfdc382e031 SHA512 c00eb0bcc723e470bb9c3de040511eb56c7d0d93e1c63036e9addf789d76550d62f15f7dc9b8be97515a8901935de7a41573973ce036114b85a954370b324344 WHIRLPOOL 25456e67065b1509a341e284bfdcd8128fbc23fcaf918247ddaaa243c00501311987c049d8733696ab764c6d7ecdc2bce532ef003737b94bbc7fc204b74ec207
+EBUILD uhashring-0.4.ebuild 517 SHA256 8c4ff6f4cf256ca04ff0874fda1a31fb3da49957b05b4d8445c91a1bc881a191 SHA512 e40e8176c49f0bb0f46a8f68e9d5d9693d2b46f4ec770a7b46da8257df835f94ff633cea262b1ff74c935f043ebfe6126cd3310db05a248b739297912222c876 WHIRLPOOL 9e22dcd34433cf099e9db121d0fe329bc79de3f439acc68c12259b5f465825ef7d5867e3a7d356f6d032d81880c91fbcb8c0945c4a85f8831815655beb9ef797
+MISC ChangeLog 1735 SHA256 ad98b803bef707b98d2ef2143b42c47e2559268151da8afb45c11a28dfb76f23 SHA512 74346f874c33b659b759eaf748bc187a7ee1ee16766082f679f120c4bcd8a7d71036245598dcaee08a562c93ff440b04631be306347dfdd987eba67c338fd7b0 WHIRLPOOL 2a2972409f724a4572ddb998eb7153580f076c6badb27829c7d99d08bf1456feca1ae214f606d306f3e6847f2dcfa275c7b8e658fdecc5f2e19c7172661eb1df
+MISC metadata.xml 370 SHA256 55bc1bd7aba7d325b925ad8aa0a7e0528693214067534d7b96fc435b516ddf53 SHA512 34f15d0013c3d21ece0543e6425334f0c1716edf3907a09898c10e2d8e43389d3a1cfe254f759ad319e585bb15b422bdf50029a89a22cbfdb4a6997b6032cc34 WHIRLPOOL 43a3a2848b587253dc5f81bafc0c52b7dea2ba0fff65b299346ba076060958693334625f59c0e8306b07448219d390a28f43cff43e0c1e832d7c2391d164dc3c
diff --git a/dev-python/uhashring/metadata.xml b/dev-python/uhashring/metadata.xml
new file mode 100644
index 000000000000..aa5fc83987e3
--- /dev/null
+++ b/dev-python/uhashring/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">uhashring</remote-id>
+		<remote-id type="github">ultrabug/uhashring</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/uhashring/uhashring-0.4.ebuild b/dev-python/uhashring/uhashring-0.4.ebuild
new file mode 100644
index 000000000000..fdf93e54479f
--- /dev/null
+++ b/dev-python/uhashring/uhashring-0.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Full featured consistent hashing python library compatible with ketama"
+HOMEPAGE="https://github.com/ultrabug/uhashring"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		${RDEPEND}"
+
+RESTRICT="test"
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
new file mode 100644
index 000000000000..c7872978c03e
--- /dev/null
+++ b/dev-python/ujson/Manifest
@@ -0,0 +1,14 @@
+AUX ujson-1.33-test-py3.patch 1256 SHA256 814dcdb74e48ea3662adfc6145a503678f17128a5f585b0279d74906f6fc3257 SHA512 f05909d1ecc51123da75de817ce52d7d24e7510ebd353c11b483f8f4bad177d7031ed84336e60647425ec24f0dddeec1966511971bdaee4abbc10d2ac11cb32b WHIRLPOOL d0b93db66651795cf4cfaad8ece277f642a5e6a66bdf1286990ec58dfb9d177ced46484c856d1518421101b39ea417515041adcdc096a4ee19ec1cd4ca5c633c
+AUX ujson-1.35-fix-for-overflowing-long.patch 2630 SHA256 d3356310af1f45929fc55434b0310a4f2507c00cd531937b6c7595d5cd2db61e SHA512 1006a559fba644985663acbf3a94b8485511a0b137e96191c15f791ef1b84824dfd3d26ffb7de3bcecd011ab94e04b46e2ffbdf90766cb95c11be9c508cfc847 WHIRLPOOL 8209dac0a7501fb0e221802fdc492b6c452bbc9cd611db615de7772e656f0dd5a21836cd10299d8aec809fc7c0d5704a332600fb60cd733a62edf9f77fd27e5e
+AUX ujson-1.35-fix-ordering-of-orderdict.patch 4046 SHA256 9b0e72400165c547c64a8c1365d2df4f09d8632064e76d86dfcb1db7300a5107 SHA512 e3c392a4298f65154549f077c55da7b78d6e9085a217b3ef574ccec4d9f0466f5d0901c039afb1fb44b1e26042881abc5007eb045a3594ee365c09f46443d134 WHIRLPOOL 917260e5e2f6cbf4daae791b5c736e0f291d3e46b37eab2301da6f728da175929265497573688a8b1e72028edd2c2a8e4536b130e95cc3cbf15dac6e54de12b9
+AUX ujson-1.35-sort_keys-segfault.patch 2360 SHA256 0f921562c913a6ad4c8e8a4202559a39aff77bd1723d26e055cefbcd138cf6bf SHA512 aac5b264187be10cbfb2d128f1a415fd0d841a728b7c1975232e5fe37fc042b19aae084e9c807eb5c23b1fe8306565bb2867543c08d88c2abcf474401644f114 WHIRLPOOL 8d9056bf7260b94c1da1bcea789509aa4c2727b24baa76fe167a34c3db6409292f7ef6d5f2a453eff8cd91a83885f74d7b59d3c07477b9dc2172001fcefd1881
+AUX ujson-1.35-standard-handling-of-none.patch 2563 SHA256 39ffdab0976922409c4db4a584815e4e134dd0e989df49098f8e010fd66997e5 SHA512 3d3b7a3dc3d055c4c3cc94acdced6d5b154bfe23ff371230924f5ac7ea982997b2d404dc643c53e606c76b41a5d8c41d506d3f5d3adcc6cd61633f7dbaf3e30e WHIRLPOOL 9eceb0feaa74a66e0d5fa561240df155187f4a87e86d0e4632b8bb498a09a3d72c3fe116e28b55e30ab5a7fa359890ed9d40fc10fe8f827fe51919d83e25ad2f
+AUX ujson-1.35-test-depricationwarning.patch 369 SHA256 a6a35fff98dfa565cc1821d4392e7b8f88f912929bf722de483ad011658e2183 SHA512 71fc8012f1701a35def3d7533d8d8d4133550dd57bd22b11e1dcd2806d25e185678f047cc1fe61a35132ed1d546d1411d452bb0e7af66aefe9b53a99b5ef3c66 WHIRLPOOL c4fdca550412b82bad3dbaf7e46f29dcfb06a0456be7e9b1f30435cbb590738bb4d5ca03e8ff9b712b1ee6b991bb267b8c2090a292f5e5a3c13d4293ec173668
+AUX ujson-1.35-use-static-where-possible.patch 19904 SHA256 0bf573eddddacb93d1baf0dc29351d7617729b9732107031d4b63eac3a5187b5 SHA512 fe96f88cde477bfdc63ad5cf360ab6c63e2cf00c192a8d70d80340b7e39820ca53554a775c8f32b7ca43259e9f299fe38ebaf4aa64ef12c035bf23085f5b5789 WHIRLPOOL b1df3dfb8d687153da3b1da30cece2ad006a04255c90364126ccc5f87182e3944598b7166d554a730170f5c98bde6db931000fbf5226aa446e6b076dbc239a5f
+DIST ujson-1.33.zip 197034 SHA256 68cf825f227c82e1ac61e423cfcad923ff734c27b5bdd7174495d162c42c602b SHA512 0f1f66212fbf94c03e048ba64c3bd817c50443d1a29b87f6a3a38f697a050f38821be4ba36a3b17a96930c69ee92973ac31bdd41851dea071af14cd4bbaf8480 WHIRLPOOL d3080fcf3e979b43deb8fe099427a8311c55e7e54105626bf12b3b6fe9e8567f70501884bd24b7a26d53ddfcd98f535de4aa708801106aa4a1b76e543217835c
+DIST ujson-1.35.tar.gz 192027 SHA256 f66073e5506e91d204ab0c614a148d5aa938bdbf104751be66f8ad7a222f5f86 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7 WHIRLPOOL aff7a034304366e95ec51164de78afbee8daa496022abdae1b9928ea90928758e675027f2202ca77790788a3057c978d9ba9348684bc087843aa2e16932a1144
+EBUILD ujson-1.33.ebuild 1144 SHA256 459fb5dd3383bfaa462388f541157626e130ac26219d00c7d3920cfe7a075853 SHA512 c36504fe05d23c5b17278fbf0056e7aaa07ef66cd589693e81d1df0c83af3ad5b142fed7b2e15ec33853b8046992354a54adebd94a1443ee6503ecd2e6263eb9 WHIRLPOOL 87e543a432cc60069cb9d18fac1498b3261e332320a08b4cdac119e0437213a0ffbbf5a20e1448de9b371a1a7f1c11ae7405587dbd72323f68335c4800ae9be5
+EBUILD ujson-1.35.ebuild 847 SHA256 f01dcf550f22e0d91829543ca38eac05662e8f03e91dd97e60cadb9559f42f6c SHA512 79109e0a3085a5e74deb1cb919015b616c1c724a314e5f7d00b217bec1f01635f63cc0c032fcc2bc8787db29f98d86d098d6bc40d82a3468f75e02e2744ea4b6 WHIRLPOOL 5cb72b3ecb77996d4ccbe1e82338b573aa3b083ca07a0372129a22d4ef8f1529caef40017c613651c64120f3e5c6d6174f11f74855720c0c607f653c9745a0d3
+MISC ChangeLog 3016 SHA256 ce120b6960429fa1d1cbad2e549090609c39a0906553c61e3058165fe4aa11d1 SHA512 79b7ebf14fafb1c3c1ae621c81365e63cec58ce42a512bfd2160f068488e4b9b4825266a971bc34da987e80262d6bb7f59cfd9695e05aace000cc65ac71f3a03 WHIRLPOOL c0aba94e49ebfe4998c9cbd92937ac866df4c96d09fb5d8a2cf00599d72e7e597532388feeb4d78c5e9bf0902caf4b28374179b5ff8f93bc59aa18ad25306982
+MISC ChangeLog-2015 1542 SHA256 51eb298d16935530069767c3b8c85d625a67af6778ce6df9b39adbe2dca772b5 SHA512 41be15b522e08f8b4ca9a1e68d05b508384f1e695bf9134ec08556f97913ed4f59ab283d4ec392dab0ba6e8acb0cdc28e8a5be60407ec09f1301ad094793b8ce WHIRLPOOL 860ce016743ccc04f10e05f835a99e46bea8034641ab11315c6cdc2997151e5b88e5040bad79244e9741acb17bec404dfd437b7aa6cff87444b541338fca34e7
+MISC metadata.xml 432 SHA256 eaf4792579c57ddb0e74453ddd26cb6c04f8356f86eceb29ee0c860031c4c5e7 SHA512 485e866809b2704a344436f956dd242b8720ecf46daf53a7a64fcf8a5edd3b3915faf59d48da4224b361ba35f7ab8c346e16b0a037cf8846d663d175486bed8f WHIRLPOOL f4682217489bd28e6a14bb53ec89022daa4bbbb005861fc6436d4771902d80965a2ad8ffb699b12db55439652306f3b978d34fbe16f3cdec96dc3837a32335ef
diff --git a/dev-python/ujson/files/ujson-1.33-test-py3.patch b/dev-python/ujson/files/ujson-1.33-test-py3.patch
new file mode 100644
index 000000000000..e497f396792c
--- /dev/null
+++ b/dev-python/ujson/files/ujson-1.33-test-py3.patch
@@ -0,0 +1,38 @@
+ tests/tests.py | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/tests/tests.py b/tests/tests.py
+index d210bc6..71f8074 100644
+--- a/tests/tests.py
++++ b/tests/tests.py
+@@ -11,6 +11,7 @@ try:
+ except ImportError:
+     import simplejson as json
+ import math
++import nose
+ import platform
+ import sys
+ import time
+@@ -24,9 +25,10 @@ from functools import partial
+ 
+ PY3 = (sys.version_info[0] >= 3)
+ 
+-def _python_ver(skip_major, skip_minor=None):
++def _skip_if_python_ver(skip_major, skip_minor=None):
+     major, minor = sys.version_info[:2]
+-    return major == skip_major and (skip_minor is None or minor == skip_minor)
++    if major == skip_major and (skip_minor is None or minor == skip_minor):
++        raise nose.SkipTest
+ 
+ json_unicode = (json.dumps if sys.version_info[0] >= 3
+                 else partial(json.dumps, encoding="utf-8"))
+@@ -579,8 +581,8 @@ class UltraJSONTests(TestCase):
+         input = "-31337"
+         self.assertEquals (-31337, ujson.decode(input))
+ 
+-    #@unittest.skipIf(_python_ver(3), "No exception in Python 3")
+     def test_encodeUnicode4BytesUTF8Fail(self):
++        _skip_if_python_ver(3)
+         input = "\xfd\xbf\xbf\xbf\xbf\xbf"
+         try:
+             enc = ujson.encode(input)
diff --git a/dev-python/ujson/files/ujson-1.35-fix-for-overflowing-long.patch b/dev-python/ujson/files/ujson-1.35-fix-for-overflowing-long.patch
new file mode 100644
index 000000000000..98659ce1722b
--- /dev/null
+++ b/dev-python/ujson/files/ujson-1.35-fix-for-overflowing-long.patch
@@ -0,0 +1,84 @@
+commit 409c6d4006fdea27e746ea397124f98c92a41a92
+Author: Joakim Hamren <joakim.hamren@gmail.com>
+Date:   Sat Feb 4 04:21:05 2017 +0100
+
+    Fix for overflowing long causing invalid json
+    
+    This was caused by checking for "__json__" using PyObject_HasAttrString
+    which clears the error set by a previous long overflow. Thus this was dependent
+    on the order of processing of dict items, which explains why it was
+    seemingly random as the dict items are likely ordered by a hash of
+    the key.
+    
+    This fixes GH224 and GH240.
+
+diff --git a/python/objToJSON.c b/python/objToJSON.c
+index 8133fb5..adea2f6 100644
+--- a/python/objToJSON.c
++++ b/python/objToJSON.c
+@@ -226,6 +226,21 @@ static void *PyDateToINT64(JSOBJ _obj, JSONTypeContext *tc, void *outValue, size
+   return NULL;
+ }
+ 
++static int PyHasAttrStringPreserveErr(PyObject *obj, const char *attr)
++{
++  int res;
++  PyObject *excType = NULL, *excValue, *excTraceback;
++
++  if (!PyErr_Occurred())
++    return PyObject_HasAttrString(obj, "__json__");
++
++  PyErr_Fetch(&excType, &excValue, &excTraceback);
++  res = PyObject_HasAttrString(obj, "__json__");
++  PyErr_Restore(excType, excValue, excTraceback);
++
++  return res;
++}
++
+ static int Tuple_iterNext(JSOBJ obj, JSONTypeContext *tc)
+ {
+   PyObject *item;
+@@ -471,21 +486,21 @@ static int Dict_iterNext(JSOBJ obj, JSONTypeContext *tc)
+     GET_TC(tc)->itemName = PyUnicode_AsUTF8String (GET_TC(tc)->itemName);
+   }
+   else
+-    if (!PyString_Check(GET_TC(tc)->itemName))
+-    {
+-      GET_TC(tc)->itemName = PyObject_Str(GET_TC(tc)->itemName);
++  if (!PyString_Check(GET_TC(tc)->itemName))
++  {
++    GET_TC(tc)->itemName = PyObject_Str(GET_TC(tc)->itemName);
+ #if PY_MAJOR_VERSION >= 3
+-      itemNameTmp = GET_TC(tc)->itemName;
+-      GET_TC(tc)->itemName = PyUnicode_AsUTF8String (GET_TC(tc)->itemName);
+-      Py_DECREF(itemNameTmp);
++    itemNameTmp = GET_TC(tc)->itemName;
++    GET_TC(tc)->itemName = PyUnicode_AsUTF8String (GET_TC(tc)->itemName);
++    Py_DECREF(itemNameTmp);
+ #endif
+-    }
+-    else
+-    {
+-      Py_INCREF(GET_TC(tc)->itemName);
+-    }
+-    PRINTMARK();
+-    return 1;
++  }
++  else
++  {
++    Py_INCREF(GET_TC(tc)->itemName);
++  }
++  PRINTMARK();
++  return 1;
+ }
+ 
+ static void Dict_iterEnd(JSOBJ obj, JSONTypeContext *tc)
+@@ -728,7 +743,7 @@ static void Object_beginTypeContext (JSOBJ _obj, JSONTypeContext *tc, JSONObject
+     return;
+   }
+   else
+-  if (PyString_Check(obj) && !PyObject_HasAttrString(obj, "__json__"))
++  if (PyString_Check(obj) && !PyHasAttrStringPreserveErr(obj, "__json__"))
+   {
+     PRINTMARK();
+     pc->PyTypeToJSON = PyStringToUTF8; tc->type = JT_UTF8;
diff --git a/dev-python/ujson/files/ujson-1.35-fix-ordering-of-orderdict.patch b/dev-python/ujson/files/ujson-1.35-fix-ordering-of-orderdict.patch
new file mode 100644
index 000000000000..37270d41e3b1
--- /dev/null
+++ b/dev-python/ujson/files/ujson-1.35-fix-ordering-of-orderdict.patch
@@ -0,0 +1,122 @@
+commit c9f8318bd823ae9d44797b6b881a2b3e22cdbade
+Author: Joakim Hamren <joakim.hamren@gmail.com>
+Date:   Tue Feb 7 02:02:38 2017 +0100
+
+    Fix for incorrect order when using OrderedDict
+
+diff --git a/python/objToJSON.c b/python/objToJSON.c
+index abe6588..9e6a390 100644
+--- a/python/objToJSON.c
++++ b/python/objToJSON.c
+@@ -253,8 +253,13 @@ static int Dict_iterNext(JSOBJ obj, JSONTypeContext *tc)
+     GET_TC(tc)->itemName = NULL;
+   }
+ 
++  if (!(GET_TC(tc)->itemName = PyIter_Next(GET_TC(tc)->iterator)))
++  {
++    PRINTMARK();
++    return 0;
++  }
+ 
+-  if (!PyDict_Next ( (PyObject *)GET_TC(tc)->dictObj, &GET_TC(tc)->index, &GET_TC(tc)->itemName, &GET_TC(tc)->itemValue))
++  if (!(GET_TC(tc)->itemValue = PyObject_GetItem(GET_TC(tc)->dictObj, GET_TC(tc)->itemName)))
+   {
+     PRINTMARK();
+     return 0;
+@@ -295,6 +300,7 @@ static void Dict_iterEnd(JSOBJ obj, JSONTypeContext *tc)
+     Py_DECREF(GET_TC(tc)->itemName);
+     GET_TC(tc)->itemName = NULL;
+   }
++  Py_CLEAR(GET_TC(tc)->iterator);
+   Py_DECREF(GET_TC(tc)->dictObj);
+   PRINTMARK();
+ }
+@@ -425,20 +431,23 @@ static char *SortedDict_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outL
+ 
+ static void SetupDictIter(PyObject *dictObj, TypeContext *pc, JSONObjectEncoder *enc)
+ {
+-  if (enc->sortKeys) {
++  pc->dictObj = dictObj;
++  if (enc->sortKeys)
++  {
+     pc->iterEnd = SortedDict_iterEnd;
+     pc->iterNext = SortedDict_iterNext;
+     pc->iterGetValue = SortedDict_iterGetValue;
+     pc->iterGetName = SortedDict_iterGetName;
++    pc->index = 0;
+   }
+-  else {
++  else
++  {
+     pc->iterEnd = Dict_iterEnd;
+     pc->iterNext = Dict_iterNext;
+     pc->iterGetValue = Dict_iterGetValue;
+     pc->iterGetName = Dict_iterGetName;
++    pc->iterator = PyObject_GetIter(dictObj);
+   }
+-  pc->dictObj = dictObj;
+-  pc->index = 0;
+ }
+ 
+ static void Object_beginTypeContext (JSOBJ _obj, JSONTypeContext *tc, JSONObjectEncoder *enc)
+@@ -446,7 +455,8 @@ static void Object_beginTypeContext (JSOBJ _obj, JSONTypeContext *tc, JSONObject
+   PyObject *obj, *objRepr, *exc;
+   TypeContext *pc;
+   PRINTMARK();
+-  if (!_obj) {
++  if (!_obj)
++  {
+     tc->type = JT_INVALID;
+     return;
+   }
+diff --git a/tests/tests.py b/tests/tests.py
+index cd928e6..b7e46af 100644
+--- a/tests/tests.py
++++ b/tests/tests.py
+@@ -10,6 +10,8 @@ import json
+ import math
+ import time
+ import pytz
++from collections import OrderedDict
++
+ if six.PY2:
+     import unittest2 as unittest
+ else:
+@@ -383,6 +385,10 @@ class UltraJSONTests(unittest.TestCase):
+         input = -float('inf')
+         self.assertRaises(OverflowError, ujson.encode, input)
+ 
++    def test_encodeOrderedDict(self):
++        input = OrderedDict([(1, 1), (0, 0), (8, 8), (2, 2)])
++        self.assertEqual('{"1":1,"0":0,"8":8,"2":2}', ujson.encode(input))
++
+     def test_decodeJibberish(self):
+         input = "fdsa sda v9sa fdsa"
+         self.assertRaises(ValueError, ujson.decode, input)
+@@ -668,7 +674,7 @@ class UltraJSONTests(unittest.TestCase):
+         d = {u'key': JSONTest()}
+         output = ujson.encode(d)
+         dec = ujson.decode(output)
+-        self.assertEquals(dec, {u'key': output_text})
++        self.assertEqual(dec, {u'key': output_text})
+ 
+     def test_object_with_json_unicode(self):
+         # If __json__ returns a string, then that string
+@@ -681,7 +687,7 @@ class UltraJSONTests(unittest.TestCase):
+         d = {u'key': JSONTest()}
+         output = ujson.encode(d)
+         dec = ujson.decode(output)
+-        self.assertEquals(dec, {u'key': output_text})
++        self.assertEqual(dec, {u'key': output_text})
+ 
+     def test_object_with_complex_json(self):
+         # If __json__ returns a string, then that string
+@@ -694,7 +700,7 @@ class UltraJSONTests(unittest.TestCase):
+         d = {u'key': JSONTest()}
+         output = ujson.encode(d)
+         dec = ujson.decode(output)
+-        self.assertEquals(dec, {u'key': obj})
++        self.assertEqual(dec, {u'key': obj})
+ 
+     def test_object_with_json_type_error(self):
+         # __json__ must return a string, otherwise it should raise an error.
diff --git a/dev-python/ujson/files/ujson-1.35-sort_keys-segfault.patch b/dev-python/ujson/files/ujson-1.35-sort_keys-segfault.patch
new file mode 100644
index 000000000000..7239bca3e238
--- /dev/null
+++ b/dev-python/ujson/files/ujson-1.35-sort_keys-segfault.patch
@@ -0,0 +1,73 @@
+commit 870ee48fe109c289033cd0b7543b6f5ea4e6f128
+Author: Joakim Hamren <joakim.hamren@gmail.com>
+Date:   Sat Feb 4 01:07:52 2017 +0100
+
+    Fixes for sort_keys bug and a typo.
+    
+        - Fixed segfault when using sort_keys=True on dict with unorderable keys (GH247)
+    
+        - Fixed refcount becoming negative when using sort_keys=True (GH243)
+    
+        - Fixed compile error when defining JSON_NO_EXTRA_WHITESPACE
+          caused by a wrongly named variable. (GH245)
+
+diff --git a/lib/ultrajsonenc.c b/lib/ultrajsonenc.c
+index cb10024..1bfa8f4 100644
+--- a/lib/ultrajsonenc.c
++++ b/lib/ultrajsonenc.c
+@@ -717,7 +717,7 @@ static void encode(JSOBJ obj, JSONObjectEncoder *enc, const char *name, size_t c
+ {
+   const char *value;
+   char *objName;
+-  int count;
++  int count, res;
+   JSOBJ iterObj;
+   size_t szlen;
+   JSONTypeContext tc;
+@@ -796,7 +796,7 @@ static void encode(JSOBJ obj, JSONObjectEncoder *enc, const char *name, size_t c
+           {
+             Buffer_AppendCharUnchecked (enc, ',');
+ #ifndef JSON_NO_EXTRA_WHITESPACE
+-            Buffer_AppendCharUnchecked (buffer, ' ');
++            Buffer_AppendCharUnchecked (enc, ' ');
+ #endif
+             Buffer_AppendIndentNewlineUnchecked (enc);
+           }
+@@ -823,8 +823,16 @@ static void encode(JSOBJ obj, JSONObjectEncoder *enc, const char *name, size_t c
+       Buffer_AppendCharUnchecked (enc, '{');
+       Buffer_AppendIndentNewlineUnchecked (enc);
+ 
+-    while (enc->iterNext(obj, &tc))
++    while ((res = enc->iterNext(obj, &tc)))
+     {
++      if(res < 0)
++      {
++        enc->iterEnd(obj, &tc);
++        enc->endTypeContext(obj, &tc);
++        enc->level--;
++        return;
++      }
++
+       if (count > 0)
+       {
+         Buffer_AppendCharUnchecked (enc, ',');
+diff --git a/python/objToJSON.c b/python/objToJSON.c
+index 1960d40..8133fb5 100644
+--- a/python/objToJSON.c
++++ b/python/objToJSON.c
+@@ -537,6 +537,7 @@ static int SortedDict_iterNext(JSOBJ obj, JSONTypeContext *tc)
+     // Sort the list.
+     if (PyList_Sort(items) < 0)
+     {
++      PyErr_SetString(PyExc_ValueError, "unorderable keys");
+       goto error;
+     }
+ 
+@@ -607,7 +608,6 @@ static void SortedDict_iterEnd(JSOBJ obj, JSONTypeContext *tc)
+ {
+   GET_TC(tc)->itemName = NULL;
+   GET_TC(tc)->itemValue = NULL;
+-  Py_DECREF(GET_TC(tc)->newObj);
+   Py_DECREF(GET_TC(tc)->dictObj);
+   PRINTMARK();
+ }
diff --git a/dev-python/ujson/files/ujson-1.35-standard-handling-of-none.patch b/dev-python/ujson/files/ujson-1.35-standard-handling-of-none.patch
new file mode 100644
index 000000000000..e2b7b9103f48
--- /dev/null
+++ b/dev-python/ujson/files/ujson-1.35-standard-handling-of-none.patch
@@ -0,0 +1,77 @@
+commit ac4637fbc4e72bd59f221d9bba19127820d21023
+Author: Joakim Hamren <joakim.hamren@gmail.com>
+Date:   Sat Feb 4 16:36:14 2017 +0100
+
+    Following std json handling of None dict key
+    
+    Previously a None dict item key would be outputted in JSON as "None".
+    To better align with the standard json module this was changed to output
+    "null". There's no proper representation of null object keys in JSON so
+    this is implementation specific but it seems more natural to follow
+    suit when it can be done without a significant performance hit.
+    
+    Added and used branch prediction macros (LIKELY/UNLIKELY) as well.
+
+diff --git a/lib/ultrajson.h b/lib/ultrajson.h
+index 6c1dbc1..ca82a29 100644
+--- a/lib/ultrajson.h
++++ b/lib/ultrajson.h
+@@ -117,6 +117,14 @@ typedef uint32_t JSUINT32;
+ 
+ #define INLINE_PREFIX inline
+ 
++#ifdef __GNUC__
++#define LIKELY(x)       __builtin_expect(!!(x), 1)
++#define UNLIKELY(x)     __builtin_expect(!!(x), 0)
++#else
++#define LIKELY(x)       (x)
++#define UNLIKELY(x)     (x)
++#endif
++
+ typedef uint8_t JSUINT8;
+ typedef uint16_t JSUTF16;
+ typedef uint32_t JSUTF32;
+diff --git a/python/objToJSON.c b/python/objToJSON.c
+index adea2f6..41d4289 100644
+--- a/python/objToJSON.c
++++ b/python/objToJSON.c
+@@ -488,6 +488,12 @@ static int Dict_iterNext(JSOBJ obj, JSONTypeContext *tc)
+   else
+   if (!PyString_Check(GET_TC(tc)->itemName))
+   {
++    if (UNLIKELY(GET_TC(tc)->itemName == Py_None))
++    {
++      GET_TC(tc)->itemName = PyString_FromString("null");
++      return 1;
++    }
++
+     GET_TC(tc)->itemName = PyObject_Str(GET_TC(tc)->itemName);
+ #if PY_MAJOR_VERSION >= 3
+     itemNameTmp = GET_TC(tc)->itemName;
+@@ -743,7 +749,7 @@ static void Object_beginTypeContext (JSOBJ _obj, JSONTypeContext *tc, JSONObject
+     return;
+   }
+   else
+-  if (PyString_Check(obj) && !PyHasAttrStringPreserveErr(obj, "__json__"))
++  if (PyString_Check(obj) && LIKELY(!PyHasAttrStringPreserveErr(obj, "__json__")))
+   {
+     PRINTMARK();
+     pc->PyTypeToJSON = PyStringToUTF8; tc->type = JT_UTF8;
+@@ -837,7 +843,7 @@ ISITERABLE:
+   }
+   */
+ 
+-  if (PyObject_HasAttrString(obj, "toDict"))
++  if (UNLIKELY(PyObject_HasAttrString(obj, "toDict")))
+   {
+     PyObject* toDictFunc = PyObject_GetAttrString(obj, "toDict");
+     PyObject* tuple = PyTuple_New(0);
+@@ -863,7 +869,7 @@ ISITERABLE:
+     return;
+   }
+   else
+-  if (PyObject_HasAttrString(obj, "__json__"))
++  if (UNLIKELY(PyObject_HasAttrString(obj, "__json__")))
+   {
+     PyObject* toJSONFunc = PyObject_GetAttrString(obj, "__json__");
+     PyObject* tuple = PyTuple_New(0);
diff --git a/dev-python/ujson/files/ujson-1.35-test-depricationwarning.patch b/dev-python/ujson/files/ujson-1.35-test-depricationwarning.patch
new file mode 100644
index 000000000000..6ce987581c4f
--- /dev/null
+++ b/dev-python/ujson/files/ujson-1.35-test-depricationwarning.patch
@@ -0,0 +1,11 @@
+--- ujson-1.35.orig/tests/tests.py	2017-04-14 18:14:36.298345782 -0700
++++ ujson-1.35/tests/tests.py	2017-04-14 18:14:47.899947795 -0700
+@@ -702,7 +702,7 @@
+ 
+         output = ujson.encode(ObjectTest())
+         dec = ujson.decode(output)
+-        self.assertEquals(dec, {})
++        self.assertEqual(dec, {})
+ 
+     def test_toDict(self):
+         d = {"key": 31337}
diff --git a/dev-python/ujson/files/ujson-1.35-use-static-where-possible.patch b/dev-python/ujson/files/ujson-1.35-use-static-where-possible.patch
new file mode 100644
index 000000000000..7ce5d44e0e7a
--- /dev/null
+++ b/dev-python/ujson/files/ujson-1.35-use-static-where-possible.patch
@@ -0,0 +1,591 @@
+commit 6cf6c7ff25c883349e8e9e5468e61498358e2e91
+Author: WGH <wgh@torlan.ru>
+Date:   Sat Aug 27 17:34:22 2016 +0300
+
+    added "static" to C functions, where possible
+    
+    1. It reduces clutter in symbol table.
+    2. It fixes issues with C99 inline semantics for functions
+       marked as inline (#237, #180, #222), which manifests
+       when compiled with GCC>=5.
+
+diff --git a/lib/ultrajsondec.c b/lib/ultrajsondec.c
+index 21a732e..19efc60 100644
+--- a/lib/ultrajsondec.c
++++ b/lib/ultrajsondec.c
+@@ -66,7 +66,7 @@ struct DecoderState
+   JSONObjectDecoder *dec;
+ };
+ 
+-JSOBJ FASTCALL_MSVC decode_any( struct DecoderState *ds) FASTCALL_ATTR;
++static JSOBJ FASTCALL_MSVC decode_any( struct DecoderState *ds) FASTCALL_ATTR;
+ typedef JSOBJ (*PFN_DECODER)( struct DecoderState *ds);
+ 
+ static JSOBJ SetError( struct DecoderState *ds, int offset, const char *message)
+@@ -76,13 +76,13 @@ static JSOBJ SetError( struct DecoderState *ds, int offset, const char *message)
+   return NULL;
+ }
+ 
+-double createDouble(double intNeg, double intValue, double frcValue, int frcDecimalCount)
++static double createDouble(double intNeg, double intValue, double frcValue, int frcDecimalCount)
+ {
+   static const double g_pow10[] = {1.0, 0.1, 0.01, 0.001, 0.0001, 0.00001, 0.000001,0.0000001, 0.00000001, 0.000000001, 0.0000000001, 0.00000000001, 0.000000000001, 0.0000000000001, 0.00000000000001, 0.000000000000001};
+   return (intValue + (frcValue * g_pow10[frcDecimalCount])) * intNeg;
+ }
+ 
+-FASTCALL_ATTR JSOBJ FASTCALL_MSVC decodePreciseFloat(struct DecoderState *ds)
++static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decodePreciseFloat(struct DecoderState *ds)
+ {
+   char *end;
+   double value;
+@@ -99,7 +99,7 @@ FASTCALL_ATTR JSOBJ FASTCALL_MSVC decodePreciseFloat(struct DecoderState *ds)
+   return ds->dec->newDouble(ds->prv, value);
+ }
+ 
+-FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_numeric (struct DecoderState *ds)
++static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_numeric (struct DecoderState *ds)
+ {
+   int intNeg = 1;
+   int mantSize = 0;
+@@ -309,7 +309,7 @@ BREAK_EXP_LOOP:
+   return ds->dec->newDouble (ds->prv, createDouble( (double) intNeg, (double) intValue , frcValue, decimalCount) * pow(10.0, expValue * expNeg));
+ }
+ 
+-FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_true ( struct DecoderState *ds)
++static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_true ( struct DecoderState *ds)
+ {
+   char *offset = ds->start;
+   offset ++;
+@@ -329,7 +329,7 @@ SETERROR:
+   return SetError(ds, -1, "Unexpected character found when decoding 'true'");
+ }
+ 
+-FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_false ( struct DecoderState *ds)
++static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_false ( struct DecoderState *ds)
+ {
+   char *offset = ds->start;
+   offset ++;
+@@ -351,7 +351,7 @@ SETERROR:
+   return SetError(ds, -1, "Unexpected character found when decoding 'false'");
+ }
+ 
+-FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_null ( struct DecoderState *ds)
++static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_null ( struct DecoderState *ds)
+ {
+   char *offset = ds->start;
+   offset ++;
+@@ -371,7 +371,7 @@ SETERROR:
+   return SetError(ds, -1, "Unexpected character found when decoding 'null'");
+ }
+ 
+-FASTCALL_ATTR void FASTCALL_MSVC SkipWhitespace(struct DecoderState *ds)
++static FASTCALL_ATTR void FASTCALL_MSVC SkipWhitespace(struct DecoderState *ds)
+ {
+   char *offset = ds->start;
+ 
+@@ -422,7 +422,7 @@ static const JSUINT8 g_decoderLookup[256] =
+   /* 0xf0 */ 4, 4, 4, 4, 4, 4, 4, 4, DS_UTFLENERROR, DS_UTFLENERROR, DS_UTFLENERROR, DS_UTFLENERROR, DS_UTFLENERROR, DS_UTFLENERROR, DS_UTFLENERROR, DS_UTFLENERROR,
+ };
+ 
+-FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_string ( struct DecoderState *ds)
++static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_string ( struct DecoderState *ds)
+ {
+   JSUTF16 sur[2] = { 0 };
+   int iSur = 0;
+@@ -672,7 +672,7 @@ FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_string ( struct DecoderState *ds)
+   }
+ }
+ 
+-FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_array(struct DecoderState *ds)
++static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_array(struct DecoderState *ds)
+ {
+   JSOBJ itemValue;
+   JSOBJ newObj;
+@@ -736,7 +736,7 @@ FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_array(struct DecoderState *ds)
+   }
+ }
+ 
+-FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_object( struct DecoderState *ds)
++static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_object( struct DecoderState *ds)
+ {
+   JSOBJ itemName;
+   JSOBJ itemValue;
+@@ -819,7 +819,7 @@ FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_object( struct DecoderState *ds)
+   }
+ }
+ 
+-FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_any(struct DecoderState *ds)
++static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_any(struct DecoderState *ds)
+ {
+   for (;;)
+   {
+diff --git a/lib/ultrajsonenc.c b/lib/ultrajsonenc.c
+index 6c1b120..f330171 100644
+--- a/lib/ultrajsonenc.c
++++ b/lib/ultrajsonenc.c
+@@ -112,7 +112,7 @@ static void SetError (JSOBJ obj, JSONObjectEncoder *enc, const char *message)
+ /*
+ FIXME: Keep track of how big these get across several encoder calls and try to make an estimate
+ That way we won't run our head into the wall each call */
+-void Buffer_Realloc (JSONObjectEncoder *enc, size_t cbNeeded)
++static void Buffer_Realloc (JSONObjectEncoder *enc, size_t cbNeeded)
+ {
+   size_t curSize = enc->end - enc->start;
+   size_t newSize = curSize * 2;
+@@ -148,7 +148,7 @@ void Buffer_Realloc (JSONObjectEncoder *enc, size_t cbNeeded)
+   enc->end = enc->start + newSize;
+ }
+ 
+-FASTCALL_ATTR INLINE_PREFIX void FASTCALL_MSVC Buffer_AppendShortHexUnchecked (char *outputOffset, unsigned short value)
++static FASTCALL_ATTR INLINE_PREFIX void FASTCALL_MSVC Buffer_AppendShortHexUnchecked (char *outputOffset, unsigned short value)
+ {
+   *(outputOffset++) = g_hexChars[(value & 0xf000) >> 12];
+   *(outputOffset++) = g_hexChars[(value & 0x0f00) >> 8];
+@@ -156,7 +156,7 @@ FASTCALL_ATTR INLINE_PREFIX void FASTCALL_MSVC Buffer_AppendShortHexUnchecked (c
+   *(outputOffset++) = g_hexChars[(value & 0x000f) >> 0];
+ }
+ 
+-int Buffer_EscapeStringUnvalidated (JSONObjectEncoder *enc, const char *io, const char *end)
++static int Buffer_EscapeStringUnvalidated (JSONObjectEncoder *enc, const char *io, const char *end)
+ {
+   char *of = (char *) enc->offset;
+ 
+@@ -260,7 +260,7 @@ int Buffer_EscapeStringUnvalidated (JSONObjectEncoder *enc, const char *io, cons
+   }
+ }
+ 
+-int Buffer_EscapeStringValidated (JSOBJ obj, JSONObjectEncoder *enc, const char *io, const char *end)
++static int Buffer_EscapeStringValidated (JSOBJ obj, JSONObjectEncoder *enc, const char *io, const char *end)
+ {
+   JSUTF32 ucs;
+   char *of = (char *) enc->offset;
+@@ -498,19 +498,19 @@ int Buffer_EscapeStringValidated (JSOBJ obj, JSONObjectEncoder *enc, const char
+ #define Buffer_AppendCharUnchecked(__enc, __chr) \
+                 *((__enc)->offset++) = __chr; \
+ 
+-FASTCALL_ATTR INLINE_PREFIX void FASTCALL_MSVC strreverse(char* begin, char* end)
++static FASTCALL_ATTR INLINE_PREFIX void FASTCALL_MSVC strreverse(char* begin, char* end)
+ {
+   char aux;
+   while (end > begin)
+   aux = *end, *end-- = *begin, *begin++ = aux;
+ }
+ 
+-void Buffer_AppendIndentNewlineUnchecked(JSONObjectEncoder *enc)
++static void Buffer_AppendIndentNewlineUnchecked(JSONObjectEncoder *enc)
+ {
+   if (enc->indent > 0) Buffer_AppendCharUnchecked(enc, '\n');
+ }
+ 
+-void Buffer_AppendIndentUnchecked(JSONObjectEncoder *enc, JSINT32 value)
++static void Buffer_AppendIndentUnchecked(JSONObjectEncoder *enc, JSINT32 value)
+ {
+   int i;
+   if (enc->indent > 0)
+@@ -519,7 +519,7 @@ void Buffer_AppendIndentUnchecked(JSONObjectEncoder *enc, JSINT32 value)
+         Buffer_AppendCharUnchecked(enc, ' ');
+ }
+ 
+-void Buffer_AppendIntUnchecked(JSONObjectEncoder *enc, JSINT32 value)
++static void Buffer_AppendIntUnchecked(JSONObjectEncoder *enc, JSINT32 value)
+ {
+   char* wstr;
+   JSUINT32 uvalue = (value < 0) ? -value : value;
+@@ -535,7 +535,7 @@ void Buffer_AppendIntUnchecked(JSONObjectEncoder *enc, JSINT32 value)
+   enc->offset += (wstr - (enc->offset));
+ }
+ 
+-void Buffer_AppendLongUnchecked(JSONObjectEncoder *enc, JSINT64 value)
++static void Buffer_AppendLongUnchecked(JSONObjectEncoder *enc, JSINT64 value)
+ {
+   char* wstr;
+   JSUINT64 uvalue = (value < 0) ? -value : value;
+@@ -551,7 +551,7 @@ void Buffer_AppendLongUnchecked(JSONObjectEncoder *enc, JSINT64 value)
+   enc->offset += (wstr - (enc->offset));
+ }
+ 
+-void Buffer_AppendUnsignedLongUnchecked(JSONObjectEncoder *enc, JSUINT64 value)
++static void Buffer_AppendUnsignedLongUnchecked(JSONObjectEncoder *enc, JSUINT64 value)
+ {
+   char* wstr;
+   JSUINT64 uvalue = value;
+@@ -566,7 +566,7 @@ void Buffer_AppendUnsignedLongUnchecked(JSONObjectEncoder *enc, JSUINT64 value)
+   enc->offset += (wstr - (enc->offset));
+ }
+ 
+-int Buffer_AppendDoubleUnchecked(JSOBJ obj, JSONObjectEncoder *enc, double value)
++static int Buffer_AppendDoubleUnchecked(JSOBJ obj, JSONObjectEncoder *enc, double value)
+ {
+   /* if input is larger than thres_max, revert to exponential */
+   const double thres_max = (double) 1e16 - 1;
+@@ -714,7 +714,7 @@ Handle integration functions returning NULL here */
+ FIXME:
+ Perhaps implement recursion detection */
+ 
+-void encode(JSOBJ obj, JSONObjectEncoder *enc, const char *name, size_t cbName)
++static void encode(JSOBJ obj, JSONObjectEncoder *enc, const char *name, size_t cbName)
+ {
+   const char *value;
+   char *objName;
+diff --git a/python/JSONtoObj.c b/python/JSONtoObj.c
+index 79d9f1a..6cef088 100644
+--- a/python/JSONtoObj.c
++++ b/python/JSONtoObj.c
+@@ -43,7 +43,7 @@ http://www.opensource.apple.com/source/tcl/tcl-14/tcl/license.terms
+ //#define PRINTMARK() fprintf(stderr, "%s: MARK(%d)\n", __FILE__, __LINE__)
+ #define PRINTMARK()
+ 
+-void Object_objectAddKey(void *prv, JSOBJ obj, JSOBJ name, JSOBJ value)
++static void Object_objectAddKey(void *prv, JSOBJ obj, JSOBJ name, JSOBJ value)
+ {
+   PyDict_SetItem (obj, name, value);
+   Py_DECREF( (PyObject *) name);
+@@ -51,59 +51,59 @@ void Object_objectAddKey(void *prv, JSOBJ obj, JSOBJ name, JSOBJ value)
+   return;
+ }
+ 
+-void Object_arrayAddItem(void *prv, JSOBJ obj, JSOBJ value)
++static void Object_arrayAddItem(void *prv, JSOBJ obj, JSOBJ value)
+ {
+   PyList_Append(obj, value);
+   Py_DECREF( (PyObject *) value);
+   return;
+ }
+ 
+-JSOBJ Object_newString(void *prv, wchar_t *start, wchar_t *end)
++static JSOBJ Object_newString(void *prv, wchar_t *start, wchar_t *end)
+ {
+   return PyUnicode_FromWideChar (start, (end - start));
+ }
+ 
+-JSOBJ Object_newTrue(void *prv)
++static JSOBJ Object_newTrue(void *prv)
+ {
+   Py_RETURN_TRUE;
+ }
+ 
+-JSOBJ Object_newFalse(void *prv)
++static JSOBJ Object_newFalse(void *prv)
+ {
+   Py_RETURN_FALSE;
+ }
+ 
+-JSOBJ Object_newNull(void *prv)
++static JSOBJ Object_newNull(void *prv)
+ {
+   Py_RETURN_NONE;
+ }
+ 
+-JSOBJ Object_newObject(void *prv)
++static JSOBJ Object_newObject(void *prv)
+ {
+   return PyDict_New();
+ }
+ 
+-JSOBJ Object_newArray(void *prv)
++static JSOBJ Object_newArray(void *prv)
+ {
+   return PyList_New(0);
+ }
+ 
+-JSOBJ Object_newInteger(void *prv, JSINT32 value)
++static JSOBJ Object_newInteger(void *prv, JSINT32 value)
+ {
+   return PyInt_FromLong( (long) value);
+ }
+ 
+-JSOBJ Object_newLong(void *prv, JSINT64 value)
++static JSOBJ Object_newLong(void *prv, JSINT64 value)
+ {
+   return PyLong_FromLongLong (value);
+ }
+ 
+-JSOBJ Object_newUnsignedLong(void *prv, JSUINT64 value)
++static JSOBJ Object_newUnsignedLong(void *prv, JSUINT64 value)
+ {
+   return PyLong_FromUnsignedLongLong (value);
+ }
+ 
+-JSOBJ Object_newDouble(void *prv, double value)
++static JSOBJ Object_newDouble(void *prv, double value)
+ {
+   return PyFloat_FromDouble(value);
+ }
+diff --git a/python/objToJSON.c b/python/objToJSON.c
+index 04a4575..1960d40 100644
+--- a/python/objToJSON.c
++++ b/python/objToJSON.c
+@@ -226,7 +226,7 @@ static void *PyDateToINT64(JSOBJ _obj, JSONTypeContext *tc, void *outValue, size
+   return NULL;
+ }
+ 
+-int Tuple_iterNext(JSOBJ obj, JSONTypeContext *tc)
++static int Tuple_iterNext(JSOBJ obj, JSONTypeContext *tc)
+ {
+   PyObject *item;
+ 
+@@ -242,21 +242,21 @@ int Tuple_iterNext(JSOBJ obj, JSONTypeContext *tc)
+   return 1;
+ }
+ 
+-void Tuple_iterEnd(JSOBJ obj, JSONTypeContext *tc)
++static void Tuple_iterEnd(JSOBJ obj, JSONTypeContext *tc)
+ {
+ }
+ 
+-JSOBJ Tuple_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
++static JSOBJ Tuple_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
+ {
+   return GET_TC(tc)->itemValue;
+ }
+ 
+-char *Tuple_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
++static char *Tuple_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
+ {
+   return NULL;
+ }
+ 
+-int Iter_iterNext(JSOBJ obj, JSONTypeContext *tc)
++static int Iter_iterNext(JSOBJ obj, JSONTypeContext *tc)
+ {
+   PyObject *item;
+ 
+@@ -282,7 +282,7 @@ int Iter_iterNext(JSOBJ obj, JSONTypeContext *tc)
+   return 1;
+ }
+ 
+-void Iter_iterEnd(JSOBJ obj, JSONTypeContext *tc)
++static void Iter_iterEnd(JSOBJ obj, JSONTypeContext *tc)
+ {
+   if (GET_TC(tc)->itemValue)
+   {
+@@ -297,17 +297,17 @@ void Iter_iterEnd(JSOBJ obj, JSONTypeContext *tc)
+   }
+ }
+ 
+-JSOBJ Iter_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
++static JSOBJ Iter_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
+ {
+   return GET_TC(tc)->itemValue;
+ }
+ 
+-char *Iter_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
++static char *Iter_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
+ {
+   return NULL;
+ }
+ 
+-void Dir_iterEnd(JSOBJ obj, JSONTypeContext *tc)
++static void Dir_iterEnd(JSOBJ obj, JSONTypeContext *tc)
+ {
+   if (GET_TC(tc)->itemValue)
+   {
+@@ -325,7 +325,7 @@ void Dir_iterEnd(JSOBJ obj, JSONTypeContext *tc)
+   PRINTMARK();
+ }
+ 
+-int Dir_iterNext(JSOBJ _obj, JSONTypeContext *tc)
++static int Dir_iterNext(JSOBJ _obj, JSONTypeContext *tc)
+ {
+   PyObject *obj = (PyObject *) _obj;
+   PyObject *itemValue = GET_TC(tc)->itemValue;
+@@ -401,20 +401,20 @@ int Dir_iterNext(JSOBJ _obj, JSONTypeContext *tc)
+   return 1;
+ }
+ 
+-JSOBJ Dir_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
++static JSOBJ Dir_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
+ {
+   PRINTMARK();
+   return GET_TC(tc)->itemValue;
+ }
+ 
+-char *Dir_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
++static char *Dir_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
+ {
+   PRINTMARK();
+   *outLen = PyString_GET_SIZE(GET_TC(tc)->itemName);
+   return PyString_AS_STRING(GET_TC(tc)->itemName);
+ }
+ 
+-int List_iterNext(JSOBJ obj, JSONTypeContext *tc)
++static int List_iterNext(JSOBJ obj, JSONTypeContext *tc)
+ {
+   if (GET_TC(tc)->index >= GET_TC(tc)->size)
+   {
+@@ -427,16 +427,16 @@ int List_iterNext(JSOBJ obj, JSONTypeContext *tc)
+   return 1;
+ }
+ 
+-void List_iterEnd(JSOBJ obj, JSONTypeContext *tc)
++static void List_iterEnd(JSOBJ obj, JSONTypeContext *tc)
+ {
+ }
+ 
+-JSOBJ List_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
++static JSOBJ List_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
+ {
+   return GET_TC(tc)->itemValue;
+ }
+ 
+-char *List_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
++static char *List_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
+ {
+   return NULL;
+ }
+@@ -447,7 +447,7 @@ char *List_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
+ // itemValue is borrowed from object (which is dict). No refCounting
+ //=============================================================================
+ 
+-int Dict_iterNext(JSOBJ obj, JSONTypeContext *tc)
++static int Dict_iterNext(JSOBJ obj, JSONTypeContext *tc)
+ {
+ #if PY_MAJOR_VERSION >= 3
+   PyObject* itemNameTmp;
+@@ -488,7 +488,7 @@ int Dict_iterNext(JSOBJ obj, JSONTypeContext *tc)
+     return 1;
+ }
+ 
+-void Dict_iterEnd(JSOBJ obj, JSONTypeContext *tc)
++static void Dict_iterEnd(JSOBJ obj, JSONTypeContext *tc)
+ {
+   if (GET_TC(tc)->itemName)
+   {
+@@ -499,18 +499,18 @@ void Dict_iterEnd(JSOBJ obj, JSONTypeContext *tc)
+   PRINTMARK();
+ }
+ 
+-JSOBJ Dict_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
++static JSOBJ Dict_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
+ {
+   return GET_TC(tc)->itemValue;
+ }
+ 
+-char *Dict_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
++static char *Dict_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
+ {
+   *outLen = PyString_GET_SIZE(GET_TC(tc)->itemName);
+   return PyString_AS_STRING(GET_TC(tc)->itemName);
+ }
+ 
+-int SortedDict_iterNext(JSOBJ obj, JSONTypeContext *tc)
++static int SortedDict_iterNext(JSOBJ obj, JSONTypeContext *tc)
+ {
+   PyObject *items = NULL, *item = NULL, *key = NULL, *value = NULL;
+   Py_ssize_t i, nitems;
+@@ -603,7 +603,7 @@ error:
+   return -1;
+ }
+ 
+-void SortedDict_iterEnd(JSOBJ obj, JSONTypeContext *tc)
++static void SortedDict_iterEnd(JSOBJ obj, JSONTypeContext *tc)
+ {
+   GET_TC(tc)->itemName = NULL;
+   GET_TC(tc)->itemValue = NULL;
+@@ -612,19 +612,19 @@ void SortedDict_iterEnd(JSOBJ obj, JSONTypeContext *tc)
+   PRINTMARK();
+ }
+ 
+-JSOBJ SortedDict_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
++static JSOBJ SortedDict_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
+ {
+   return GET_TC(tc)->itemValue;
+ }
+ 
+-char *SortedDict_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
++static char *SortedDict_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
+ {
+   *outLen = PyString_GET_SIZE(GET_TC(tc)->itemName);
+   return PyString_AS_STRING(GET_TC(tc)->itemName);
+ }
+ 
+ 
+-void SetupDictIter(PyObject *dictObj, TypeContext *pc, JSONObjectEncoder *enc)
++static void SetupDictIter(PyObject *dictObj, TypeContext *pc, JSONObjectEncoder *enc)
+ {
+   if (enc->sortKeys) {
+     pc->iterEnd = SortedDict_iterEnd;
+@@ -642,7 +642,7 @@ void SetupDictIter(PyObject *dictObj, TypeContext *pc, JSONObjectEncoder *enc)
+   pc->index = 0;
+ }
+ 
+-void Object_beginTypeContext (JSOBJ _obj, JSONTypeContext *tc, JSONObjectEncoder *enc)
++static void Object_beginTypeContext (JSOBJ _obj, JSONTypeContext *tc, JSONObjectEncoder *enc)
+ {
+   PyObject *obj, *exc, *iter;
+   TypeContext *pc;
+@@ -929,7 +929,7 @@ INVALID:
+   return;
+ }
+ 
+-void Object_endTypeContext(JSOBJ obj, JSONTypeContext *tc)
++static void Object_endTypeContext(JSOBJ obj, JSONTypeContext *tc)
+ {
+   Py_XDECREF(GET_TC(tc)->newObj);
+ 
+@@ -937,33 +937,33 @@ void Object_endTypeContext(JSOBJ obj, JSONTypeContext *tc)
+   tc->prv = NULL;
+ }
+ 
+-const char *Object_getStringValue(JSOBJ obj, JSONTypeContext *tc, size_t *_outLen)
++static const char *Object_getStringValue(JSOBJ obj, JSONTypeContext *tc, size_t *_outLen)
+ {
+   return GET_TC(tc)->PyTypeToJSON (obj, tc, NULL, _outLen);
+ }
+ 
+-JSINT64 Object_getLongValue(JSOBJ obj, JSONTypeContext *tc)
++static JSINT64 Object_getLongValue(JSOBJ obj, JSONTypeContext *tc)
+ {
+   JSINT64 ret;
+   GET_TC(tc)->PyTypeToJSON (obj, tc, &ret, NULL);
+   return ret;
+ }
+ 
+-JSUINT64 Object_getUnsignedLongValue(JSOBJ obj, JSONTypeContext *tc)
++static JSUINT64 Object_getUnsignedLongValue(JSOBJ obj, JSONTypeContext *tc)
+ {
+   JSUINT64 ret;
+   GET_TC(tc)->PyTypeToJSON (obj, tc, &ret, NULL);
+   return ret;
+ }
+ 
+-JSINT32 Object_getIntValue(JSOBJ obj, JSONTypeContext *tc)
++static JSINT32 Object_getIntValue(JSOBJ obj, JSONTypeContext *tc)
+ {
+   JSINT32 ret;
+   GET_TC(tc)->PyTypeToJSON (obj, tc, &ret, NULL);
+   return ret;
+ }
+ 
+-double Object_getDoubleValue(JSOBJ obj, JSONTypeContext *tc)
++static double Object_getDoubleValue(JSOBJ obj, JSONTypeContext *tc)
+ {
+   double ret;
+   GET_TC(tc)->PyTypeToJSON (obj, tc, &ret, NULL);
+@@ -975,22 +975,22 @@ static void Object_releaseObject(JSOBJ _obj)
+   Py_DECREF( (PyObject *) _obj);
+ }
+ 
+-int Object_iterNext(JSOBJ obj, JSONTypeContext *tc)
++static int Object_iterNext(JSOBJ obj, JSONTypeContext *tc)
+ {
+   return GET_TC(tc)->iterNext(obj, tc);
+ }
+ 
+-void Object_iterEnd(JSOBJ obj, JSONTypeContext *tc)
++static void Object_iterEnd(JSOBJ obj, JSONTypeContext *tc)
+ {
+   GET_TC(tc)->iterEnd(obj, tc);
+ }
+ 
+-JSOBJ Object_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
++static JSOBJ Object_iterGetValue(JSOBJ obj, JSONTypeContext *tc)
+ {
+   return GET_TC(tc)->iterGetValue(obj, tc);
+ }
+ 
+-char *Object_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
++static char *Object_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen)
+ {
+   return GET_TC(tc)->iterGetName(obj, tc, outLen);
+ }
diff --git a/dev-python/ujson/metadata.xml b/dev-python/ujson/metadata.xml
new file mode 100644
index 000000000000..54e7ce8dfd4b
--- /dev/null
+++ b/dev-python/ujson/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>swegener@gentoo.org</email>
+    <name>Sven Wegener</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">ujson</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ujson/ujson-1.33.ebuild b/dev-python/ujson/ujson-1.33.ebuild
new file mode 100644
index 000000000000..8c49a7e6fe88
--- /dev/null
+++ b/dev-python/ujson/ujson-1.33.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# One test; FAIL: test_encodeToUTF8 (__main__.UltraJSONTests) under py2.5.
+# Fix and repair and re-insert if it's REALLY needed
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
+HOMEPAGE="https://pypi.python.org/pypi/ujson/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	app-arch/unzip"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test-py3.patch
+)
+
+python_test() {
+	# See setup.py; line 72. Again "${S}" is used for reading tests
+	# Since py3_2 is first in the queue it needs its own copy
+	# or else all py2s to follow will be reading read py3 tests
+	if [[ "${EPYTHON}" =~ 'python3' ]]; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -a "${S}"/tests/ .  || die
+		2to3 -w tests/tests.py || die
+		"${PYTHON}" tests/tests.py || die
+		rm -rf tests/ || die
+	else
+		"${PYTHON}" tests/tests.py || die
+	fi
+}
diff --git a/dev-python/ujson/ujson-1.35.ebuild b/dev-python/ujson/ujson-1.35.ebuild
new file mode 100644
index 000000000000..19d94beed916
--- /dev/null
+++ b/dev-python/ujson/ujson-1.35.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
+HOMEPAGE="https://pypi.python.org/pypi/ujson/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-sort_keys-segfault.patch"
+	"${FILESDIR}/${P}-use-static-where-possible.patch"
+	"${FILESDIR}/${P}-fix-for-overflowing-long.patch"
+	"${FILESDIR}/${P}-standard-handling-of-none.patch"
+	"${FILESDIR}/${P}-fix-ordering-of-orderdict.patch"
+	"${FILESDIR}/${P}-test-depricationwarning.patch"
+)
+
+python_test() {
+	"${PYTHON}" tests/tests.py || die
+}
diff --git a/dev-python/uncertainties/Manifest b/dev-python/uncertainties/Manifest
new file mode 100644
index 000000000000..77b759b1e45a
--- /dev/null
+++ b/dev-python/uncertainties/Manifest
@@ -0,0 +1,4 @@
+DIST uncertainties-3.0.1.tar.gz 225752 SHA256 de0765cac6911e5afa93ee941063a07b4a98dbd9c314c5eea4ab14bfff0054a4 SHA512 d4b2a905665c46224586f5f9702ad9e69580fc5afe8c6c045b04141fdc54e0c402cdee033ee0ee7055823b922bd33c732b3066453876509d45add15abf9d85f5 WHIRLPOOL f203fc2fdae59775dcb57db81ffb3ff02befd50676251c218934fa15f7c7df047d97282d90ac5f9f658d040b173e2aad8fed5130c8158c39fadd7d13b80036df
+EBUILD uncertainties-3.0.1.ebuild 980 SHA256 2ab5bed34c85244add8a5c0fa4ea600a08fb813d041187c6b1e7fd75f34208cf SHA512 2c1eb1dc0743895ea27f2fa6b9a95487e0ea2b7b3cf39c1c9af1f37a1aae0c4cd737a12b595bfbe438c27a12b42b437e63c6ec1a84a8c25fc006b9421085a490 WHIRLPOOL 3c9a1166fcb38b9b8e40ae34d5815b127cb053949d3582ef1ff82144a778ea3f01fa1214f0b291a5e925379f7bb621ece8c67feaea84a49e54da9830c7f5702a
+MISC ChangeLog 333 SHA256 8c05283b1802c3c979dc645578c7a09ff93f57b0ef16bf4add404513ebbcec8c SHA512 143e8a87f25028e709006012595a6ad4b99410670349019a2c9ae5c5755521b152507926ac5c5c76ac7c6cbcb3fc5350f2119ef9c64181da3db0516edfac0f86 WHIRLPOOL 7048b8568320cd27563dbfd39df9793d1c2788725cd08509fbd804488b676a95561f10e99bc1a066f3b19f275cd52db8ca77020c903c0fb92a4758beeae14c54
+MISC metadata.xml 859 SHA256 502e8cc55f4543dd16cbf76a5c8510c4b3ff928b40216847d5ff2e76a8b11876 SHA512 833af2fd16f097d61942c7f9323d8e38688eead6d5d10ae8e7f2547c950cd53ab6ce28f434d2c1bb2f15b71ec55bfc30b8bd53a94a0c5f02e824e3ecb08ecc89 WHIRLPOOL e91ebe67800692ab273a96963ca55a30a428f57a0aea11e901ee9c5eb3a909f42657a54bdf55f922aafce238995448f7d4b976d6c02c993944adf68115c72d81
diff --git a/dev-python/uncertainties/metadata.xml b/dev-python/uncertainties/metadata.xml
new file mode 100644
index 000000000000..a24d72178d1b
--- /dev/null
+++ b/dev-python/uncertainties/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+ uncertainties is a Python module, which allows calculations such as
+ .
+   (0.2 +/- 0.01) * 2 = 0.4 +/- 0.02
+ .
+ to be performed transparently; much more complex mathematical expressions
+ involving numbers with uncertainties can also be evaluated transparently.
+ Correlations between expressions are correctly taken into account; x-x is
+ thus exactly zero, for instance. The uncertainties produced by this module
+ are what is predicted by error propagation theory.    
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">uncertainties</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/uncertainties/uncertainties-3.0.1.ebuild b/dev-python/uncertainties/uncertainties-3.0.1.ebuild
new file mode 100644
index 000000000000..c50978aff237
--- /dev/null
+++ b/dev-python/uncertainties/uncertainties-3.0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for calculations with uncertainties"
+HOMEPAGE="https://pythonhosted.org/uncertainties/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+ppython_compile_all() {
+	if use doc; then
+		PYTHONPATH="${BUILD_DIR}"/lib esetup.py build_sphinx
+	fi
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+	esetup.py nosetests -sv || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( build/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/uncompyle6/Manifest b/dev-python/uncompyle6/Manifest
new file mode 100644
index 000000000000..78ca25d9431b
--- /dev/null
+++ b/dev-python/uncompyle6/Manifest
@@ -0,0 +1,6 @@
+DIST uncompyle6-2.10.1.tar.gz 831835 SHA256 0d44ea6ae48a4639cf492503e12e3dc3b782f0881ca6798cce552875405f945f SHA512 5be7c33749f3a2a02494aceebeeb2cb79bf71c39784dbe4e96cf9a5c6f02af89874bc25ba911308f01414e4ae4d9ac445864505c629d41a2c6f8b2eae2197b2b WHIRLPOOL 47e2d0a51ff497fad8f0af5af7e1b0d830bd2a9f5c359bc000a556564c9b179ad1d233614342ea86cb13087a069ee0d7adc53eef6a216fac0428fe2c659094bd
+DIST uncompyle6-2.9.7.tar.gz 876996 SHA256 28b1f18a7e241b783d4cf7f36d996b35871e61544b7914c909adc3aa54ad6317 SHA512 b528a9db569f0665f78a7eef94c91e0d0d31490cb5e60f9cd2fa286c48f378875db1b5fb68e6d593c009c1ab9b381aab06a07624795177d9d72924d73d257ccc WHIRLPOOL 8735ad27678c9d0885e15ec60156272f822af43fa10173220aee0116c893e8a334d11a70030feb11d7726ae6fa9fc9e1c0e724b07d6756a49b17e90ac0f10957
+EBUILD uncompyle6-2.10.1.ebuild 1013 SHA256 558c26f2eadb3344dcbe9ea72a642cdeb3b6e29a5c35ba9bf3cb333e5532269d SHA512 8ff392c2ee52633a3015cf88bd7b6a8d0a8c28a15e9d323f5d36f7f366cab470b3353f78ecec91c685168171e6fc2e1132b87d0731d6b5be40b5c41371d0a790 WHIRLPOOL 8bdacd9c4286fd5ae6ea292e0f1f138772fe7f5e5832713884605ee6a66954ab43fb7f3d6ca62d638a1e284fbeee7cae9b3746c6b9ad4f6b7bc87803a517c142
+EBUILD uncompyle6-2.9.7.ebuild 1013 SHA256 bd76d6b377623bce5390e456f90a55a2e3d02c7fe128ae153b1d673e8df9eba1 SHA512 b9a0d365ab50a8ef6db46c1fae22da6ab23102bebef279304857662c282ab9b1894e2a956fd3af6e182ad2a9157f418f98c79f2838f16bb6109a1d7bf5b275b0 WHIRLPOOL a6f2ab1605f654ac660339b5866bfe75853547fdef2dde024701dc7531ad9c083ba87ec36f67a0cc9b686610f9b27fd7bc3107e158d8af59acf9ab45dae5a982
+MISC ChangeLog 848 SHA256 619e9c08d9b7c2ee1d9d2bdff2b0c3c72c42e88070038753a8d78d5bc60117d9 SHA512 a30e48faa677b1c9f938589938b023594ff45262f6db505df8e94d09e8643d53e37b25249758356f01137b622f1bcdafb7114a2cf807aa63a4a836a7cbedd4f7 WHIRLPOOL 96552ae81ca579a78e5cc9a1c437b7d1ca9c80b5aca80b0893283c141bcb985e300eca9d82350bcd15e5917564416352c11efc2fed565a50d96005f4ab1fcec4
+MISC metadata.xml 600 SHA256 5d2e7b005fdca948c278cb45eb52ad64503831517bf285448271aa968eb2a204 SHA512 c7e68b8403942a5ad30c1f3428781d365cc08f4f0032391532a3b5b06e12a185fb25f3acfb09fed591f02dbba7439f171038f83db137f8f389b79e38a831192c WHIRLPOOL 8f5e00de4f8addc99928f7b27ab2cd89339e0fba43b6b36af3cb1fb13eeb555605e07f092fb529918b7c31fca096f1ffe0ac88f6107dcb89c7d7a005c899c65d
diff --git a/dev-python/uncompyle6/metadata.xml b/dev-python/uncompyle6/metadata.xml
new file mode 100644
index 000000000000..c768e2c81e16
--- /dev/null
+++ b/dev-python/uncompyle6/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>rb@dustyfeet.com</email>
+			<name>Rocky Bernstein</name>
+		</maintainer>
+		<remote-id type="pypi">uncompyle6</remote-id>
+		<remote-id type="github">rocky/python-uncompyle6</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild b/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild
new file mode 100644
index 000000000000..2e3cc7ae1c82
--- /dev/null
+++ b/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python cross-version byte-code deparser"
+HOMEPAGE="https://github.com/rocky/python-uncompyle6/ https://pypi.python.org/pypi/uncompyle6"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/xdis-3.3.1
+	<dev-python/xdis-3.4.0
+	>=dev-python/spark-parser-1.6.1
+	<dev-python/spark-parser-1.7.0"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+# only run the recommended "make check" tests
+python_test() {
+	distutils_install_for_testing
+
+	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \
+		emake check || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/uncompyle6/uncompyle6-2.9.7.ebuild b/dev-python/uncompyle6/uncompyle6-2.9.7.ebuild
new file mode 100644
index 000000000000..264ff17e1ee6
--- /dev/null
+++ b/dev-python/uncompyle6/uncompyle6-2.9.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python cross-version byte-code deparser"
+HOMEPAGE="https://github.com/rocky/python-uncompyle6/ https://pypi.python.org/pypi/uncompyle6"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/xdis-3.2.3
+	<dev-python/xdis-3.3.0
+	>=dev-python/spark-parser-1.5.1
+	<dev-python/spark-parser-1.6.0"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+# only run the recommended "make check" tests
+python_test() {
+	distutils_install_for_testing
+
+	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \
+		emake check || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/unicodecsv/Manifest b/dev-python/unicodecsv/Manifest
new file mode 100644
index 000000000000..d3ae6dc4bbd1
--- /dev/null
+++ b/dev-python/unicodecsv/Manifest
@@ -0,0 +1,5 @@
+DIST unicodecsv-0.14.1.tar.gz 10267 SHA256 018c08037d48649a0412063ff4eda26eaa81eff1546dbffa51fa5293276ff7fc SHA512 fdd7696c4ccfd478dbf1ff846714b7bab4711ca294fb212ae173b66becd2f9220cbcf69afb8e00162312373d9e59a6336bd7be2f5c270ac0dee359a830290bd9 WHIRLPOOL 2f1927af9c2f1818d88f6e4fd3894e58d920f7d549f151db4281ace879fb4a27cb3bb34388d7bc15e6105639ed8a74ea4274aca4bcca45bdb178d29d2b8311cc
+EBUILD unicodecsv-0.14.1.ebuild 528 SHA256 72232982eb787053b3955a4fdd45c4275849fde9334ffdfa15c6cae74c18ee13 SHA512 cfe0ee2b149dbc37e88a6338f7d1555e7e9f2d7ca66e6eff53fd489ca2382727a7f2054ba28f4ab8fcdb0845a76c24424bd7ccc8230437b56b2875eec13baa66 WHIRLPOOL bc7e91f7b0150d94028789a62118d6ab4fd3f589a53393a7060252b1c53b0902ec7574a335165b744f42b5ea9688a0cd07f61ac592575b02fc743628a31c5e97
+MISC ChangeLog 4217 SHA256 371defe7f28da921dba7df85494d000767513877f7ec0d00f34b92e8c9ab2161 SHA512 24ae31c226b7bb805ed21aa88d58c75a94a3a7cb40e82fff184327278e86040e65ef95a85e7294e22fbfe319b4b50d58b0d64e7b9f8895aa812ba29ed4d78340 WHIRLPOOL 07984077266a0c62f772237cd792fecfeb56b238e0ec805edf1266ef6b255578ae1f75b98d2956cca050ae4cee74037e287e6ad6e344f5affb2136e25347c89f
+MISC ChangeLog-2015 1263 SHA256 948bab47ceddbe2613f474c7133a59e3cae58a9738a6e08247b92e034fc4f89d SHA512 8206ad7e0cfd897a1beed8b45d4617123e6538e60a0e87c5c2a9659790d8df1b460cb48fb57d956b57302b311c8f9f64be4221c8c67e84de5acd47b0b0318471 WHIRLPOOL c30ef674f66dd7092c1f74e203cc49137b52d67359693c1e2e833303830f847f8f3be5b8f704ef3f41e3283fa56d465f9c7839d443b8599dd4dc747c022be0bb
+MISC metadata.xml 377 SHA256 e3a54f541410a50dd725e6efffea662362d3774f413085639cd6a4236d189eae SHA512 6178e2b0559b35fd95211f26a7c7108469c62fea031b5698ee65209832a0aec87cab9f3f9890f051527350ee585eff18b83a270a4e55f68c88360836d29475b2 WHIRLPOOL fcbd574a162ca1063fa74463faff2603ae7c4b9952096fa309cc663749ec425b9cba5abdbf060c39ca9e184fd29097cabc4e08d21a738e237ff2cb813ac8d2f6
diff --git a/dev-python/unicodecsv/metadata.xml b/dev-python/unicodecsv/metadata.xml
new file mode 100644
index 000000000000..ed30864b400f
--- /dev/null
+++ b/dev-python/unicodecsv/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">unicodecsv</remote-id>
+		<remote-id type="github">jdunck/python-unicodecsv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
new file mode 100644
index 000000000000..42d302a16328
--- /dev/null
+++ b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Drop-in replacement for python stdlib csv module supporting unicode"
+HOMEPAGE="https://pypi.python.org/pypi/unicodecsv https://github.com/jdunck/python-unicodecsv"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc x86"
+IUSE=""
+
+python_test() {
+	python -m unittest discover
+}
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
new file mode 100644
index 000000000000..9d8bd3370e60
--- /dev/null
+++ b/dev-python/unidecode/Manifest
@@ -0,0 +1,9 @@
+DIST Unidecode-0.04.18.tar.gz 206191 SHA256 f19150c74de2fe6847b13efeeaee402f2bd2c309a446346a8b5baae0315d108a SHA512 4434b147662c605829a599cb227b10599e70b9a40669b6bce490156c6679d22b49e1768667e10851eaf8d6a142a2c22df4800f0382ed74e781c247708021acd7 WHIRLPOOL 84f07583ba19f6c029128699629dc5709343520b94ea0fd3c8924d7e44910481f5b1574449eb78c2fa4dd884de4fa8b646593623dcae28b809f423c343163aa1
+DIST Unidecode-0.04.20.tar.gz 205830 SHA256 ed4418b4b1b190487753f1cca6299e8076079258647284414e6d607d1f8a00e0 SHA512 07708649a130d4a1747fcc24816717a512c1edeb4c25e01a5e898b21d2e76bca6b45d983cc452fe56bddea5556632b91aa2daee511e33a423197e0df9c80e125 WHIRLPOOL 8f32b7d25b85bd1bcbdaaa94795d0790bf96cd68992af501f51c13968eaab4c3b793753f35c3a201a227176c6c212a7f21dc30b5c702c6af6a38ce5099eee956
+DIST Unidecode-0.04.21.tar.gz 205931 SHA256 280a6ab88e1f2eb5af79edff450021a0d3f0448952847cd79677e55e58bad051 SHA512 33fc546b3eefc4ba5feee90d584e49ccd81dd0ae00671f7e44f43cc3dc8a458b86ed6dbfacba6dac7539112408137fc1db6329cc42f31ee250755d841c7c29c2 WHIRLPOOL 69f643df937f045f7c11af200fa699fad79a553573d46382240822cfd8be5a8220d39568b2487aa85207873348aac3ad2e02408b7ec8c3e0658429383a486b5f
+EBUILD unidecode-0.04.18.ebuild 589 SHA256 95352df982eb8841e39f5a2215e2716dcedd621eeef9a953a147db6466c661a3 SHA512 c7a9aacf451289196eede72cfc9a2115efa233c81cfe8c4ea240e605683614964c269365c8463b24c859e19c1deaa107ee95edd9ed941bc36ab6c2de5cc47d7d WHIRLPOOL 9d322ba836f26abc1f22e227257f91b6b3530cf62fe5eb8151ec1cac4459968980cd496e47186022abeb69ffe14a9309cb5672812313a5e668d6a025050d92b7
+EBUILD unidecode-0.04.20.ebuild 595 SHA256 8aaecf7cafe5d8e09955daf42bed0b5cdf2dbc827ffdbabb72c16427c38d153a SHA512 6f571f76e4d9723c2ff20f0fc9901ff02d8b0e4e8a8de1a38279ba33a50271909d7098c6a340c8cb8a29607c931f0504ac487aea42f9f1cfbd7918e4c1f3e78f WHIRLPOOL 779592ee6b818cbc9c1cedd3cebef89021a235182292f61bc987740ae169e57b6e062b4e8366ac2c035c414ec7e5307c8ccd7b4ace95fad429f1df4582fadee1
+EBUILD unidecode-0.04.21.ebuild 599 SHA256 38c5a8dec3b1c54909695135e31a13b0d1d2edaa9d0b4d6ded17385350d9e7ab SHA512 93f0d6aeca451e8c955657b6adaac5a1bb3d492f6725b02beea083500ddf1a390ab03e19722e860a311889a596ea9b97bd280532af36becfbe1fe69a90fe06a0 WHIRLPOOL 533299d9c26908d2410e0fa0f2890601a6adcb3f71392bc637da944c768829a4a3764a8eecbd19c53186ba2955546ee001353c5f8cb60ddf1affd2e59a9d10cd
+MISC ChangeLog 5125 SHA256 b8aa5c490f92d51802c8cb55a765d9340ee0ba74aa6345a6d8b7e600e39da816 SHA512 e2687ed8173f2ce159f5e0ef2d6cf5d596632d6db4d289f586cef7f31f292658cb58c81a4eaf26b76794111e47a247d302f8c4872839b38e4527c32bee5b774f WHIRLPOOL c7b76653af537f9664cb830d4a1c3ac22f7f3258952695ff9208bdb099017a9d975d520d7716388fe18f6db0dbdaacad678f307338daa45ff6c821facd8d532d
+MISC ChangeLog-2015 4944 SHA256 d58f0d7f5c3f8534ddfb85a77e5ed11ae5eb8a8ce687e7de6a917648e7ac7f70 SHA512 ffada20835de9370ff967e923a09250643ab23b771e03d20406bf6c7e057e99f2ba9e342cf5a27f33128aeb5029437380c99d20c5ab9e3a528f7e597a23bfda0 WHIRLPOOL 15eecbc636883944b6d6fbec5ae32b9582aa22028438daee273c28702d841064895f6bd512c6648fc54b8a8b1c85d3754764fa138ac55155dbc2fdfb609639d9
+MISC metadata.xml 543 SHA256 d9311aa34487535626ce33a933b7725f796d18e6600308132f801bfd9f9a1328 SHA512 f14c8866b0f7865814a2d2073f5304b8565aeedaa807b05c255767995e517f11f70626c3463158dae791b17e1607154e74c94114cd37ac69719cba2e741bdd5f WHIRLPOOL 87bf0917a829ffc8d5b6b65ce6d8df085fcda7eff8d35ad64bb2f7aca18f21afd66c63e8f0a38c03c30a3c95781e011fdd97ef652aadaff7a4b8b5603df979ed
diff --git a/dev-python/unidecode/metadata.xml b/dev-python/unidecode/metadata.xml
new file mode 100644
index 000000000000..732253807253
--- /dev/null
+++ b/dev-python/unidecode/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>jer@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+This is a Python port of the Text::Unidecode Perl (<pkg>dev-perl/Text-Unidecode</pkg> module
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">Unidecode</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/unidecode/unidecode-0.04.18.ebuild b/dev-python/unidecode/unidecode-0.04.18.ebuild
new file mode 100644
index 000000000000..9820661534b2
--- /dev/null
+++ b/dev-python/unidecode/unidecode-0.04.18.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+MY_PN=Unidecode
+MY_P=${MY_PN}-${PV}
+
+inherit distutils-r1
+
+DESCRIPTION="Module providing ASCII transliterations of Unicode text"
+HOMEPAGE="https://pypi.python.org/pypi/Unidecode"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/unidecode/unidecode-0.04.20.ebuild b/dev-python/unidecode/unidecode-0.04.20.ebuild
new file mode 100644
index 000000000000..be16fa8e8bfc
--- /dev/null
+++ b/dev-python/unidecode/unidecode-0.04.20.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+MY_PN=Unidecode
+MY_P=${MY_PN}-${PV}
+
+inherit distutils-r1
+
+DESCRIPTION="Module providing ASCII transliterations of Unicode text"
+HOMEPAGE="https://pypi.python.org/pypi/Unidecode"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 arm hppa ppc ppc64 ~sparc ~x86"
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/unidecode/unidecode-0.04.21.ebuild b/dev-python/unidecode/unidecode-0.04.21.ebuild
new file mode 100644
index 000000000000..7aee4702b2c5
--- /dev/null
+++ b/dev-python/unidecode/unidecode-0.04.21.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+MY_PN=Unidecode
+MY_P=${MY_PN}-${PV}
+
+inherit distutils-r1
+
+DESCRIPTION="Module providing ASCII transliterations of Unicode text"
+HOMEPAGE="https://pypi.python.org/pypi/Unidecode"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/unittest-mixins/Manifest b/dev-python/unittest-mixins/Manifest
new file mode 100644
index 000000000000..e5faf95c05b0
--- /dev/null
+++ b/dev-python/unittest-mixins/Manifest
@@ -0,0 +1,3 @@
+DIST unittest-mixins-1.3.tar.gz 12942 SHA256 3daa4113d0b6674911d1f732c138a240480c773b7c5b608cd93c32fe89510d90 SHA512 8cdc7adf387d3576d1690c2ab62eff93c085a36b82b756d237cc177aa52718e7ce6c5ec103841f1581cd28576bb17fbbe034c21d1c1347da643dfde3b8033d3a WHIRLPOOL 26d2ed0c0caf36e340ab88272d4ef5d193dc633c5a988fb32ef2487dbb0192d552bc23d945637683d99e8e72273d1805887797caec9ac68a3c8854a97a6668b9
+EBUILD unittest-mixins-1.3.ebuild 676 SHA256 be14d1f2632c8308605844337e919f5048a4e3b0fea0a2b95457f3b96e5770a1 SHA512 bec6123365e9c36a049390fbf110341a1c3aab80a5a0c0c3b58113bc6e92c131c87b1835605adf4180c7a762fd5e3da162404988b0b0c3b46107d7b54193c6b6 WHIRLPOOL a2694092f7f28db1d0bac746b2c7fe7ce41a6a31ace60619396d00b561b24102c0292b3bcb7913338b7275eb937c86224acb585cd79e9c01b7cf160c7d688b5f
+MISC metadata.xml 380 SHA256 02b1a6c511afefffc4beccf15773c36ab2156457434daa6b759d37161be81402 SHA512 3cd32540c94dc1a2b2f72f5cfd85192a94fa716cc37d70eed9b028fd1ce120d3f821b2d059465e7f26f4b7d75b8f3cb4848a65dde921d23bcb9b4e56ae321934 WHIRLPOOL 3451112a3be6a16faf7f12696f74354da5ff8a8e8464fc353a6d9d5361de41dca83c08564673563e264764eb01b3302dc2353233773a623e2640b6bffbe20196
diff --git a/dev-python/unittest-mixins/metadata.xml b/dev-python/unittest-mixins/metadata.xml
new file mode 100644
index 000000000000..21871fac51c5
--- /dev/null
+++ b/dev-python/unittest-mixins/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">unittest-mixins</remote-id>
+		<remote-id type="github">nedbat/unittest-mixins</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild
new file mode 100644
index 000000000000..8635d1ee869b
--- /dev/null
+++ b/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="A set of mixin classes and other helpers for unittest test case classes"
+HOMEPAGE="https://github.com/nedbat/unittest-mixins https://pypi.python.org/pypi/unittest-mixins"
+SRC_URI="https://github.com/nedbat/unittest-mixins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/unittest2/Manifest b/dev-python/unittest2/Manifest
new file mode 100644
index 000000000000..7f2beb34e089
--- /dev/null
+++ b/dev-python/unittest2/Manifest
@@ -0,0 +1,7 @@
+AUX remove-argparse-dependence.patch 424 SHA256 dc192f334569d47127a7a1f914c7a8f7d42dd6ac3816bee523cb3de6efab39e3 SHA512 e4a7b803ba5e77484f4e800df4c78d5b4d35f2d66e5c416c256bd6e7fa3db193c32aa0a455aac66b34f27c1038accf7949f64d98bf4a31a896a43d790de810f7 WHIRLPOOL 0be02f628d34f1322d6271dff050f51d78d9af361b64234f607f5dac15ceb6472678b0f04b6c8e1c22d7e943cdbfbefdadfe5e3e64f22d9c02c74ca2e1eb5748
+AUX unittest2-1.1.0-python3.5-test.patch 1304 SHA256 37530f7956064d35cd7c1216f9ecdf2f6fb42aed8fdeda7a47291bad353b62f7 SHA512 502a72811581e3551ab8fdd80f0f72ee4f6be9a3b0ce01a131f240f2199babfa115ecb18c5d4efe297521e6951f9371869b9419c829396720623bff548f09398 WHIRLPOOL 3ee09051eb5b230731814e8cab592991c75de45f4e4599f98b717589fa3593fa381608bd4e23ed49a3640e7e0542aa40c24b46cdd1f6224cd02de884f0675db4
+DIST unittest2-1.1.0.tar.gz 81432 SHA256 22882a0e418c284e1f718a822b3b022944d53d2d908e1690b319a9d3eb2c0579 SHA512 3fba15728905f437767416ab4fd3573d3fb2319486ef84c52a9fa930ea84aa1f2ae29d6f58993e3509083625790e17b1ef8d9ac5de0e166c254897a3e7a202fa WHIRLPOOL d375c59aed23e4fce14499df2fb64d185facc1e25378805045c66eef9c2fa14de81d7580020300c374f7842d38aaf6ccb26df4ff9a430f6ad497863e2766dc83
+EBUILD unittest2-1.1.0.ebuild 1029 SHA256 01fdb2c8de9ec4b206f017802e40f79efaf3a35d1897693de518e2d5a539f902 SHA512 1cab06b1d9f7e86313872fe0d34e82ce5d4414cca3265b75f7d53d4f4070504e1990ad5e97414a5a77b7a522c7bbdfff1d496163c25d849808bbebbbfd723eb1 WHIRLPOOL b2f013515f5242e8e2a80ae44398bc8316bab514203ce2057e6cd2fc2d90023731f550b698b35a304ddf056dbc35f5d603da7fa6b290915951e73de51445931b
+MISC ChangeLog 7525 SHA256 7da3c85ed292f685320fbf24e5cd83fde1c09595a4d6e2fcb48ad5fb19de2e9b SHA512 2caffdb4fe94abbf973de193ec87d005b0fa87d8cb421a095a3dbb964d9e00e105ede604c085c174154168d31a09e96fbdcef1415531decf16de42982b19cdf7 WHIRLPOOL 3b872750b7ea163b185af113b1bfdfd0b6eae71e71c6c9de8bca7948a70025344eb5fdaa86e6bc3b4c3ff385c8a3606ef5a845f7d695c6fae4588bebc4fb0ecc
+MISC ChangeLog-2015 8723 SHA256 d7b6daef11c99c4f462ca7f8b82a8be06b065ef99531140b696178e287a43d02 SHA512 bea4823769b03ed7eeeed096e9fb1f4d7540e4998d9ca00c64fed1da8a247c5a072e1e70f519ae83f92671cbe511d504e569f7023398dcaa20f6bb5296dbca0c WHIRLPOOL 95100ab350ead86cd4a608956cbd246cd2b10d2234c244b7a00e10b7b8a80d559879f8fa3a5b179742c96c0e40fa3f2872e9c4276852c269833e91cea7df1ca4
+MISC metadata.xml 378 SHA256 1bb689893c31f9bee03b10983cd7113af60eff936abccfc55ef6c1b6a751dd41 SHA512 b1db02e32f39f739de9a077d770579cd1adbca7bc7b9c1eb3e5800f5242a1706ec5a61694b98ea7e3e6f6099b128d22e731f4c49cf3c719bb38be52679845d34 WHIRLPOOL 5290b8af20241f80880f592ef04e0423213077a55e30211037c3e32a0a45019a4eb6d3511317123805a0ac7bcf7660854df5aca05e2f2f6fa6630957b01333e0
diff --git a/dev-python/unittest2/files/remove-argparse-dependence.patch b/dev-python/unittest2/files/remove-argparse-dependence.patch
new file mode 100644
index 000000000000..36f89fc5f8f6
--- /dev/null
+++ b/dev-python/unittest2/files/remove-argparse-dependence.patch
@@ -0,0 +1,12 @@
+diff -r 8928fb47c3a9 setup.py
+--- a/setup.py	Thu Mar 12 15:55:36 2015 +1300
++++ b/setup.py	Sun Apr 05 09:06:44 2015 -0500
+@@ -57,7 +57,7 @@
+ # Both install and setup requires - because we read VERSION from within the
+ # package, and the package also exports all the APIs.
+ # six for compat helpers
+-REQUIRES = ['argparse', 'six>=1.4', 'traceback2'],
++REQUIRES = ['six>=1.4', 'traceback2'],
+ 
+ params = dict(
+     name=NAME,
diff --git a/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch b/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch
new file mode 100644
index 000000000000..4aae9d04b2f8
--- /dev/null
+++ b/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch
@@ -0,0 +1,28 @@
+diff --git a/unittest2/test/test_loader.py b/unittest2/test/test_loader.py
+index 683f662..347eea5 100644
+--- a/unittest2/test/test_loader.py
++++ b/unittest2/test/test_loader.py
+@@ -509,6 +509,7 @@ class Test_TestLoader(unittest2.TestCase):
+     #
+     # What happens when an impossible name is given, relative to the provided
+     # `module`?
++    @unittest.skipIf(sys.version_info[:2] >= (3, 5), "python 3.5 has problems here")
+     def test_loadTestsFromName__relative_malformed_name(self):
+         loader = unittest.TestLoader()
+ 
+@@ -811,6 +812,7 @@ class Test_TestLoader(unittest2.TestCase):
+     # TestCase or TestSuite instance."
+     #
+     # What happens when presented with an impossible module name?
++    @unittest.skipIf(sys.version_info[:2] >= (3, 5), "python 3.5 has problems here")
+     def test_loadTestsFromNames__malformed_name(self):
+         loader = unittest2.TestLoader()
+ 
+@@ -918,6 +920,7 @@ class Test_TestLoader(unittest2.TestCase):
+     # "The method optionally resolves name relative to the given module"
+     #
+     # What happens when presented with an impossible attribute name?
++    @unittest.skipIf(sys.version_info[:2] >= (3, 5), "python 3.5 has problems here")
+     def test_loadTestsFromNames__relative_malformed_name(self):
+         loader = unittest.TestLoader()
+ 
diff --git a/dev-python/unittest2/metadata.xml b/dev-python/unittest2/metadata.xml
new file mode 100644
index 000000000000..70f1765921a2
--- /dev/null
+++ b/dev-python/unittest2/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">unittest2</remote-id>
+		<remote-id type="github">testing-cabal/unittest-ext</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/unittest2/unittest2-1.1.0.ebuild b/dev-python/unittest2/unittest2-1.1.0.ebuild
new file mode 100644
index 000000000000..844474113575
--- /dev/null
+++ b/dev-python/unittest2/unittest2-1.1.0.ebuild
@@ -0,0 +1,35 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="The new features in unittest backported to Python 2.4+"
+HOMEPAGE="https://pypi.python.org/pypi/unittest2 https://github.com/testing-cabal/unittest-ext"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+CDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/linecache2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	dev-python/traceback2[${PYTHON_USEDEP}]
+"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/remove-argparse-dependence.patch
+	"${FILESDIR}"/${P}-python3.5-test.patch
+)
+
+python_test() {
+	"${PYTHON}" -m unittest2 discover --verbose || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
new file mode 100644
index 000000000000..a31641c66103
--- /dev/null
+++ b/dev-python/uranium/Manifest
@@ -0,0 +1,7 @@
+AUX uranium-2.3.1-fix-install-paths.patch 1440 SHA256 e24f2ed8b8dd513bfbfb992f9b01136c6ebdfd1216de366e56eadeeba47f3c2b SHA512 4dd1f75c29a6982a62560dcd3d27f5070e57246c4438dfa6ff52ec487c4d250df4fd6779023a524adf7500c6edba73086e619528df68b47c253d47c292c115c4 WHIRLPOOL c9cda4276c90cd6fb9e8142e74f2658d07c28c7105ec1e41bf18aecb36cdc34de44ff3ce3ebea947fb4aee24c4890ea7231f38024a9fe11138446693448954a3
+DIST uranium-2.3.1.tar.gz 509563 SHA256 e1fc3106845e5f635abd81ed75da7e8c095b11351322f4a5fc46c9870c1fa415 SHA512 4d0f959b8850608b6a34aef2901394734c994280b40bd863436b7c87eae2834214c1fe5264c4db6368f605076b42123dc7586a3ac7d217d4edd462edb6af9a88 WHIRLPOOL 519b78bc3fdba780b35c64531fc97de33922235ce7bb9c5f0891df3bef010ebb1439f73eb2307277198a32c00974639fe398693778b8973152c4a7eaa2f79ea0
+DIST uranium-2.6.0.tar.gz 826489 SHA256 3b84975bdac58a0c38fa26d3c1552db73ed04d1506874afc883cd1bca169b4e0 SHA512 1c0b1381ffa213f7f1f7bfa86c31fd270d16506f672636f558be6c7bc375dcfe76f73fe2d0600caf055528a268372f91eead005c737348b774a78ee272a4650b WHIRLPOOL 609ac4bfba14ff6e70387824530cd3933ffc68bb9a585930d51e69efde295962b6c5ad1257c57296ae555067a69154e36152d12a2e1a70c3d19b27b9d251f330
+EBUILD uranium-2.3.1.ebuild 1351 SHA256 ed5c614ffd373b7d508846139b341b4f6cc9e43d96d59a9b3200489386f68f58 SHA512 7027dd85e82a10c5cda2273899b4c80ece52c7e5e11470ca5c04d63ef2010eb11dea3bc06be868154c29b81131faf93ae3939f0938b67db6863f6537050e3c3f WHIRLPOOL 41024f405f0627fa425f2b6ae0229aff1843d45bb76e40554a190c9dedbb678764c1b06286bcfb990ccc98b1e30922673177c575ef8d897ff91f0fd0b74cee7f
+EBUILD uranium-2.6.0.ebuild 1353 SHA256 c341f05bd3ae22e93335811ac7145ba85a86bf422a33c3328ede374e7531de8e SHA512 0a04bb2f4001a9221f62b7663736e39221024e09f329082f606368da7ae6f3b3a067344ccd39488bbf8886539ff6c4b9699cfa89871bea0ce48398b41514984b WHIRLPOOL 153e472b176ed0a37687910d9cc5b1992eff8fb3ffc547366ee0964ac30e6914692d2820868ce0e938e1977205bc049f6abb0c578e3ca1c4d5d6b681fb1213fd
+MISC ChangeLog 1704 SHA256 30eac1ad9b4f6f1096ef2331ef0b1067bb67607d1b34beef10495c7c76d1c266 SHA512 fa943a1a7ba992a2257984813488508decd722fe8f88e9c3517a1bfaeabcedc7ec6d093be005643f37d4fb7aea5a0490a1351bb4b6f16dca535ec185a93fd7d1 WHIRLPOOL 30c7789becedc6c517690bdd26cdfb1b931a5e732d973417edd19df356e9a946802bbb67778e18bf3fa0ba5c2b1b3bee18ac465ae8ffb6f078b99f5ebe513744
+MISC metadata.xml 775 SHA256 4229a06c281e32e7cce1c0a2d58702387cdcd4621d93a7c2f3ea0b4deffec9ef SHA512 fe1b9a3245a7d3032983c74678c6ca5ff44ccdffaaa5d1a227fa115a775eb7fc031957649023df8637ed78f31eb078aa4f1f0f5a3faf3b51061bc470b2044bbe WHIRLPOOL 99f6b727548311bd731aee46adde94f003902e2d105cd096d63b414abca25c253ce230144b4f99fc84430d38a3c3030747f338488ee954fa64183b1c031bde73
diff --git a/dev-python/uranium/files/uranium-2.3.1-fix-install-paths.patch b/dev-python/uranium/files/uranium-2.3.1-fix-install-paths.patch
new file mode 100644
index 000000000000..a82484afd4f8
--- /dev/null
+++ b/dev-python/uranium/files/uranium-2.3.1-fix-install-paths.patch
@@ -0,0 +1,30 @@
+diff -urN Uranium-2.3.1.orig/CMakeLists.txt Uranium-2.3.1/CMakeLists.txt
+--- Uranium-2.3.1.orig/CMakeLists.txt	2016-10-27 18:22:23.000000000 +0300
++++ Uranium-2.3.1/CMakeLists.txt	2016-12-05 12:25:53.190933188 +0300
+@@ -43,14 +43,20 @@
+ # Build Translations
+ CREATE_TRANSLATION_TARGETS()
+ 
+-if(APPLE OR WIN32)
+-    install(DIRECTORY UM DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
+-else()
+-    install(DIRECTORY UM DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages)
++if(NOT PYTHON_SITE_PACKAGES_DIR)
++	if(APPLE OR WIN32)
++		set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
++			CACHE STRING "Directory to install Python bindings to")
++	else()
++		set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages CACHE
++			STRING "Directory to install Python bindings to")
++	endif()
+ endif()
++
++install(DIRECTORY UM DESTINATION ${PYTHON_SITE_PACKAGES_DIR})
+ install(FILES ${CMAKE_SOURCE_DIR}/cmake/UraniumTranslationTools.cmake
+-        DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/ )
++        DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/Modules/ )
+ install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium)
+-install(DIRECTORY plugins DESTINATION lib/uranium)
++install(DIRECTORY plugins DESTINATION ${CMAKE_INSTALL_LIBDIR}/uranium)
+ 
+ include(CPackConfig.cmake)
diff --git a/dev-python/uranium/metadata.xml b/dev-python/uranium/metadata.xml
new file mode 100644
index 000000000000..dc7980d97fee
--- /dev/null
+++ b/dev-python/uranium/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>tomboy64@sina.cn</email>
+        <name>Matthew Brewer</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>3dprint@gentoo.org</email>
+        <name>Gentoo 3D Printer Project</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Gentoo Proxy Maintainers Project</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>python@gentoo.org</email>
+        <name>Gentoo Python Project</name>
+    </maintainer>
+    <upstream>
+		<remote-id type="github">Ultimaker/Uranium</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-python/uranium/uranium-2.3.1.ebuild b/dev-python/uranium/uranium-2.3.1.ebuild
new file mode 100644
index 000000000000..a6cb76986bf4
--- /dev/null
+++ b/dev-python/uranium/uranium-2.3.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+inherit cmake-utils python-single-r1
+
+MY_PN=Uranium
+MY_PV=${PV/_beta}
+
+DESCRIPTION="A Python framework for building 3D printing related applications"
+HOMEPAGE="https://github.com/Ultimaker/Uranium"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="${PYTHON_DEPS}
+	~dev-libs/libarcus-${PV}:*[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-qt/qtdeclarative:5
+	dev-qt/qtquickcontrols:5"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+PATCHES=( "${FILESDIR}/${PN}-2.3.1-fix-install-paths.patch" )
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+DOCS=( README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		cmake-utils_src_compile doc
+		DOCS+=( html )
+	fi
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" tests
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize "${D}usr/$(get_libdir)"
+}
diff --git a/dev-python/uranium/uranium-2.6.0.ebuild b/dev-python/uranium/uranium-2.6.0.ebuild
new file mode 100644
index 000000000000..42085e598e26
--- /dev/null
+++ b/dev-python/uranium/uranium-2.6.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit cmake-utils python-single-r1
+
+MY_PN=Uranium
+MY_PV=${PV/_beta}
+
+DESCRIPTION="A Python framework for building 3D printing related applications"
+HOMEPAGE="https://github.com/Ultimaker/Uranium"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="${PYTHON_DEPS}
+	~dev-libs/libarcus-${PV}:*[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-qt/qtdeclarative:5
+	dev-qt/qtquickcontrols:5"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+PATCHES=( "${FILESDIR}/${PN}-2.3.1-fix-install-paths.patch" )
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+DOCS=( README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		cmake-utils_src_compile doc
+		DOCS+=( html )
+	fi
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" tests
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize "${D}usr/$(get_libdir)"
+}
diff --git a/dev-python/urdf_parser_py/Manifest b/dev-python/urdf_parser_py/Manifest
new file mode 100644
index 000000000000..5b412e06f161
--- /dev/null
+++ b/dev-python/urdf_parser_py/Manifest
@@ -0,0 +1,4 @@
+DIST urdf_parser_py-0.3.3.tar.gz 41536 SHA256 6d84d9d67fd2f4b45ff1f50a3a5777f7e55c5a8d02518dc6d3c14c2b0756db5f SHA512 b0f2787f41cee077d7b13eb55ee9ea99fe31877b18f4fa62c6205320752c39f727311bda0b44906bd8b3509527cb22adf3fa9ce3a9269e4e9d250cdf6b7b26c7 WHIRLPOOL 58ab2bc3ae7abfbfcf84eae078f5963ddccc819af0663fca70bffed3a389d7cfaaa1c78d84c127929bd2bb1393d05fc1721d9c6da15fbf687d455f1d0eb84822
+EBUILD urdf_parser_py-0.3.3.ebuild 539 SHA256 14d0a04f9d1b69fb1a137701a4599b0be12fb1edc7a15076b254984bc706dea5 SHA512 b38bd1c1ada91b765495dc786a0f80ff21e2c0ffdaebf86d9bbf32d6458113131d011fca4eae1f18bd50360e8f5ac4d6ad3d52aec6cc4bc4277b5758f0ec9d52 WHIRLPOOL dc7c9bf6debde2bf60232b9bb27e17f25cc3b801f9822744ad0bd0f83f8d96adb1a5432b7ed6b1275372f473131883e384b1949e7bf9ca4cbb235f73f79b8725
+MISC ChangeLog 370 SHA256 f0eda27bf500dfc534b5b4f69830a4642f82e64767009cebb831aa9dd24710e9 SHA512 f98b46e183ffe66fd481d5dcae842d245928b3f63b88896a3816b89fe2cf146fce31fce0a7d377835546dae534ff0ebf4af4006fc120a760239c7f85d8622f11 WHIRLPOOL fc4fcde5cee1afa3aa7d13f02e80ea0b0bcb1b030ce8ef5d67f2e1106e9da99b1d729eaddccde61b7069c8a147095e196dc313739434d5a87fdd1cd103a5fdd8
+MISC metadata.xml 332 SHA256 e0898bf768c6d1ff4d9dff9e31803a45c922f4f6283cc37c1ae84cf82df177c5 SHA512 6efdc6c159b3764bf93d401fe111e3b102ea30b80c6a653d87f2be031f49f0e34919d4257e1a052be2ed4b88f5451c7bc11332a0ca7dfb284df31e31f5d821f3 WHIRLPOOL 4a9af595a807b9219ae040c181864ee47888cf1bae18ab4e8d6a9dd560aa77ac07cf1057ab860dd6ad7c42c4755438a53d424fb2eff3f26994bed058d8789034
diff --git a/dev-python/urdf_parser_py/metadata.xml b/dev-python/urdf_parser_py/metadata.xml
new file mode 100644
index 000000000000..9bbf130c48d2
--- /dev/null
+++ b/dev-python/urdf_parser_py/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ros/urdf_parser_py</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/urdf_parser_py/urdf_parser_py-0.3.3.ebuild b/dev-python/urdf_parser_py/urdf_parser_py-0.3.3.ebuild
new file mode 100644
index 000000000000..eb608a216cb0
--- /dev/null
+++ b/dev-python/urdf_parser_py/urdf_parser_py-0.3.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit distutils-r1
+
+DESCRIPTION="URDF parser for Python"
+HOMEPAGE="http://wiki.ros.org/urdfdom_py"
+SRC_URI="https://github.com/ros/urdf_parser_py/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/uritemplate/Manifest b/dev-python/uritemplate/Manifest
new file mode 100644
index 000000000000..282a2971009c
--- /dev/null
+++ b/dev-python/uritemplate/Manifest
@@ -0,0 +1,7 @@
+DIST uritemplate-0.6.tar.gz 3508 SHA256 a30e230aeb7ebedbcb5da9999a17fa8a30e512e6d5b06f73d47c6e03c8e357fd SHA512 19e9d2f7cb6275c1a3bc6e287d9d3bdbed4391541f29765130a8e33825321e33fe3220adc349794d179354bcb9d77571ae20ba7836034962f3713994c7cdbfbd WHIRLPOOL 9b1b11e7da17f39f8fb6cba5ec36dd16ddef34aa29aa0fc8cd29a03fece359baffde056b9bbe29d859cac2d2ba13ccd2d112be9b07022e6f036ffadcb8acef2e
+DIST uritemplate-3.0.0.tar.gz 30038 SHA256 c02643cebe23fc8adb5e6becffe201185bf06c40bda5c0b4028a93f1527d011d SHA512 9988ae6db1d0234a2dfb393ab0205dd7902c814b8a85e06a666b8fec44cacec90fc8852b64da068242cb57cbb2ed63478567224fcb6751df82605d1f0881ad6e WHIRLPOOL d1452e09d13642a3105d8d739af1ba82b7303b11ab42229f60bfc4ae2460f7b25202bf58917ba3a3db19b303ae87023274cad813808b6de3e48736857fdfe82a
+EBUILD uritemplate-0.6.ebuild 564 SHA256 98a9cadc9500a7dfd5df211c675e031e0e49cc63581c1c0d726fb4da768dd027 SHA512 7c765842a326722802c628ca6598da3bdbe91b48e51d4a6d25ebb5341678507434c26d02b68d6f7f551a07ab9d7b59608c33dd23be6ccef7f3c270d07eae94ae WHIRLPOOL 8a53a3fd720e12e9bbb7beeba0a329853bf9e224487fba9d8c2ae89cf1c427284280b2baf9b0798d4f9702c5e2187ff2501e0bf43f26d754f9fd1c3f25cedc0d
+EBUILD uritemplate-3.0.0.ebuild 571 SHA256 f6b2783ab1a1fad491e3b8cedf8e9d6a4ebe23edf52d5df616f18e2a47faf05e SHA512 d77409cd015f161630801e77d7096e0d04a7e6e8aecd9dadbde25f97e5a65c7e7426e84c900d7b5a09e1cf6bccc97def6f45ea71a247ce8904db1e8d23803c35 WHIRLPOOL 26aef5c0915de4caf40284168b74315c19aa6028be87063d360f62b4bcb78d33fcb04c67b2c65ee2b18a06cb116dd97b4e5fa04944f6ef0bdbdf4830b7f843aa
+MISC ChangeLog 2706 SHA256 d5bddc6024a959f6b567b883544240bb3ed50146102cb43390804fe1a54363d6 SHA512 b07a5819c7028f89cb301e3a80b5e9f8f6a73f336459fe53094275f97ecbdc3686ae715715e8b8d8652166b62e6e57cf72b55643a85918593cd11da2e526b4b4 WHIRLPOOL a302b4f90e8114532aa421773339ae448ecb7dec910e66bbee728ec48a9e32b63b1e5821b1706dbac683a756a50bc0591d0268dfbecf270e2f1b27da3f2732d9
+MISC ChangeLog-2015 967 SHA256 57d465542809eca52e999e5e345d1c1ef64cb9a93f6cadb4eb3d9f608572a6dd SHA512 32770263e1181bf226df83f1c06703616f4153212b321dfd23bf34ff0367cdf9f2fbb3c34e83bbef79bc13e0b65850fc3f8ce866ad663d7151bb6334f477432a WHIRLPOOL d94b5a9fd2f862c1f6640561b643db9ba2e149031b93a7010854452bfaf2d395310c44967caaf6487bce15e68611f3fa95cfa35339e6459655ba59e2a4748733
+MISC metadata.xml 324 SHA256 1c254ca5e7dd17dd6dda0dcb60eeecf621ab423d6645211df4eef3663781bcbc SHA512 ea995ed18707c72981d9174d1a35a30b0c86eb9035acd9b229766d0c0e5e2baf25ccd2bdd1c5091e58b2dae799643c1af81a3fa18b66ad5795ff50595d27a51e WHIRLPOOL cf6dbbe01966b20c2f6bf206d1c5dc8707366ff7d3edef263129ab65d3f047c563a8d072700555501cb8c41fcf17e05438a4e78e3a46610d2b1d7621946b7b54
diff --git a/dev-python/uritemplate/metadata.xml b/dev-python/uritemplate/metadata.xml
new file mode 100644
index 000000000000..6b42f668702c
--- /dev/null
+++ b/dev-python/uritemplate/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">uritemplate</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/uritemplate/uritemplate-0.6.ebuild b/dev-python/uritemplate/uritemplate-0.6.ebuild
new file mode 100644
index 000000000000..2f4cc9a8132f
--- /dev/null
+++ b/dev-python/uritemplate/uritemplate-0.6.ebuild
@@ -0,0 +1,22 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of RFC6570, URI Template"
+HOMEPAGE="https://pypi.python.org/pypi/uritemplate"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	!<=dev-python/google-api-python-client-1.3"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/uritemplate/uritemplate-3.0.0.ebuild b/dev-python/uritemplate/uritemplate-3.0.0.ebuild
new file mode 100644
index 000000000000..17aef2cea9d1
--- /dev/null
+++ b/dev-python/uritemplate/uritemplate-3.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of RFC6570, URI Template"
+HOMEPAGE="https://pypi.python.org/pypi/uritemplate"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	!<=dev-python/google-api-python-client-1.3"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/urlgrabber/Manifest b/dev-python/urlgrabber/Manifest
new file mode 100644
index 000000000000..4b9c589737fa
--- /dev/null
+++ b/dev-python/urlgrabber/Manifest
@@ -0,0 +1,8 @@
+AUX urlgrabber-3.9.1.patch 1057 SHA256 adb6dfeae4f5bccd2bc69ee9fd948acb14ce3cba39ced222d435c6536c6fa75c SHA512 0a02512f871f525f4b3a0126e92e92d1393876f477fe3ae4ff3b0780ba30c21349fb770da59f2af7acd008fcda6bb3c2193204f8334c9f5476bc4e0188bc60ec WHIRLPOOL 33811d054994bfd2dce82b10f8bf5f2829802375cb5b76e9055cb9b4c769a90acf2fc8464a6077f2f0d96504f1f8dec810f0b797c3d5bdacb647378ca3d8e13f
+DIST urlgrabber-3.10.1.tar.gz 83735 SHA256 06b13ff8d527dba3aee04069681b2c09c03117592d5485a80ae4b807cdf33476 SHA512 c44d32b17c5f8984d09ed46ae36b3e05dc69d041820cf979029bc325d8407bbd7e324f264be5886286cd99e123f51affec26638cab6e525f85e2a1c4247462d7 WHIRLPOOL bed47171c6b12de78d430ebaef0f46e5ce166ffa526a19d5a986dc44da5d627f84cfb303b2e2299c8f5af1ee977aad5d9e41a5a886ef26c1986aa53f388f1164
+DIST urlgrabber-3.9.1.tar.gz 72343 SHA256 4437076c8708e5754ea04540e46c7f4f233734ee3590bb8a96389264fb0650d0 SHA512 897f0bd09485c207d735a814fda7cf053c71262e31e87f358c473da770abaf7fd339ae6802df978091889c5d6fe123f74d5386d79c47f93b36cefbc22f44db47 WHIRLPOOL e0fc55804e7565d392a74fc753fcdda1be61c85164fcc00f2acc20270c8c1171e0d49211c04c79ca4e6d056a966a3d8dc48530010201c7748a125dcf54c08544
+EBUILD urlgrabber-3.10.1.ebuild 531 SHA256 63c875d9968edcf0effb4c918540edc711dab8de1e9d87556c2e7b221ee706df SHA512 8cd3f5e53081fc0c9cd4e5d1634f1a259fd1eb33d24f7cdcf7571f8bbd0d17f233c5c87844d211815e58dc76a8ab87543a38c23b25909c5e0b71b7a701937206 WHIRLPOOL 398dbbba96828c4080f3757bfaa6b05caee3dbabeb63d7d9248f9020d5d660ac7db470608ee3f4be215f3de09d0fb07f80bf5284aba8a0512bf94ea111a201a4
+EBUILD urlgrabber-3.9.1-r2.ebuild 575 SHA256 bbf8c4ddace6ee38257bc6e9fa1b0cfa525bd7038438e8997523b83d6917a900 SHA512 c0e0bafd6423c3a04d5ff538e35ee5e3386ed9784ec1f30439edcc9f9d479fae0e3bef6e30700da88cad4516c468b7d835eb7f94f1cbe609905f80cf6168749c WHIRLPOOL e7598fb2eb92864312cdd71356dd91fb50edc26c5599d2c06b4e2753b020fbf86733ca712d74cfc0c98f3172ee14bd5292bdde3f072b087e4d093b631367a4fb
+MISC ChangeLog 2537 SHA256 5d545e74aa501bdf19b94ab9f6de60f99901fc72939bf8dfcb706fb16e7c43dc SHA512 5826867ee2be7b270995dc10fd132c5c43f4cdc71f4baabb89ede18720c1abd051f87409ae2ef50ad458c11be164ceacc92d1cd5b06a7027591d826650b4a574 WHIRLPOOL 4b7ce8e2b5f53b7764cd29f7b9644350d0fffe5f3bc3d049e3be640d6a8ec726b6dd6c961fa12e61bf6c09bcc541f23fde5d70f857666ebe19d4988ef583bff5
+MISC ChangeLog-2015 6039 SHA256 df6355a1210dc57a475b164884a6da6cb19d30e8c026d8bf0d0c421fa6e5e922 SHA512 8604468d3d8086209ca06c41d5ba0eb1b35e8927c4554baf5ddce4fcdcad9aeca0560172352e7909162f50fceb8e2ccded75ac9b8f9497518c6a5b1b269d5cb1 WHIRLPOOL 81ae8322c12a845f7dbaad54fb201ceec38252b513679bd2d55d1ae19fe00f8286d2e61ee19e5747102b1661c8b5fecbcebec9c878fd4fe276f45ba14dabdaab
+MISC metadata.xml 1485 SHA256 6e7a6f3c438ba62e13403a747a3179e6b1324019746dd875159e0b43e3bf3d42 SHA512 cb471d25797f7e39e9b27a6ad12131b2942e4f62128cdf02d53693b478c80a0cf3b48d0e562930149a98dcb2f71068e11475fe8c2bcddcbe010564beaa34df2b WHIRLPOOL 6441fab417f2338bcf5293c06f28c27b2aeee298f7f449fe4f86832fc98e1d226e17be0187bffc93e3edf33ea549f30e35a92a98609e0444c8386a739d644b02
diff --git a/dev-python/urlgrabber/files/urlgrabber-3.9.1.patch b/dev-python/urlgrabber/files/urlgrabber-3.9.1.patch
new file mode 100644
index 000000000000..bdcc9cb1d465
--- /dev/null
+++ b/dev-python/urlgrabber/files/urlgrabber-3.9.1.patch
@@ -0,0 +1,26 @@
+http://yum.baseurl.org/gitweb?p=urlgrabber.git;a=commitdiff;h=f4e57ece7ded0f7ad83c8a40fe8423fab7812264
+http://yum.baseurl.org/gitweb?p=urlgrabber.git;a=commitdiff;h=89cc380a2a251a1d2d8b91cf6df170fa546597aa
+
+diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
+index f98f423..7b7f979 100644
+--- a/urlgrabber/grabber.py
++++ b/urlgrabber/grabber.py
+@@ -1532,11 +1589,14 @@
+     def _over_max_size(self, cur, max_size=None):
+ 
+         if not max_size:
+-            max_size = self.size
+-        if self.opts.size: # if we set an opts size use that, no matter what
+-            max_size = self.opts.size
++            if not self.opts.size:
++                max_size = self.size
++            else:
++                max_size = self.opts.size
++
+         if not max_size: return False # if we have None for all of the Max then this is dumb
+-        if cur > max_size + max_size*.10:
++
++        if cur > int(float(max_size) * 1.10):
+ 
+             msg = _("Downloaded more than max size for %s: %s > %s") \
+                         % (self.url, cur, max_size)
diff --git a/dev-python/urlgrabber/metadata.xml b/dev-python/urlgrabber/metadata.xml
new file mode 100644
index 000000000000..a1f005301924
--- /dev/null
+++ b/dev-python/urlgrabber/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+    A high-level cross-protocol url-grabber.
+
+    Using urlgrabber, data can be fetched in three basic ways:
+
+    urlgrab(url) copy the file to the local filesystem
+    urlopen(url) open the remote file and return a file object (like urllib2.urlopen)
+    urlread(url) return the contents of the file as a string
+
+
+    When using these functions (or methods), urlgrabber supports the following
+    features:
+
+    * identical behavior for http://, ftp://, and file:// urls
+    * http keepalive - faster downloads of many files by using only a single
+      connection
+    * byte ranges - fetch only a portion of the file
+    * reget - for a urlgrab, resume a partial download
+    * progress meters - the ability to report download progress automatically,
+      even when using urlopen!
+    * throttling - restrict bandwidth usage
+    * retries - automatically retry a download if it fails. The number of retries
+      and failure types are configurable.
+    * authenticated server access for http and ftp
+    * proxy support - support for authenticated http and ftp proxies
+    * mirror groups - treat a list of mirrors as a single source, automatically
+      switching mirrors if there is a failure.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-python/urlgrabber/urlgrabber-3.10.1.ebuild b/dev-python/urlgrabber/urlgrabber-3.10.1.ebuild
new file mode 100644
index 000000000000..0d7d1b75f99b
--- /dev/null
+++ b/dev-python/urlgrabber/urlgrabber-3.10.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for downloading files"
+HOMEPAGE="http://urlgrabber.baseurl.org"
+SRC_URI="http://urlgrabber.baseurl.org/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-python/pycurl[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+# Entire testsuite relies on connecting to the i'net
diff --git a/dev-python/urlgrabber/urlgrabber-3.9.1-r2.ebuild b/dev-python/urlgrabber/urlgrabber-3.9.1-r2.ebuild
new file mode 100644
index 000000000000..a6b4f900325a
--- /dev/null
+++ b/dev-python/urlgrabber/urlgrabber-3.9.1-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for downloading files"
+HOMEPAGE="http://urlgrabber.baseurl.org"
+SRC_URI="http://urlgrabber.baseurl.org/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-python/pycurl[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}.patch
+	)
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
new file mode 100644
index 000000000000..5cf73013d476
--- /dev/null
+++ b/dev-python/urllib3/Manifest
@@ -0,0 +1,14 @@
+AUX urllib3-1.16.0-unbundle.patch 546 SHA256 a05cf6f2faf6e4adfac3cdc58143f54b04fcf89f3e904a4b2f9c126024871f49 SHA512 bc66b3d8cb10c984b7f9fbc94d8c849a969cb4cab4cf79b8a0dbeb8eaf6cfb6794afd09c938dbce715bcb1270038138563c87d5c06374594576a9d3b599d14a4 WHIRLPOOL acdb250c348122b027fa9c879832adc9411e7c732c01484e6d550eea04dec82e27628e4ac1844c52f4eba859602e721f87e9d8239e8922914a8b5553c6b05423
+DIST urllib3-1.12.tar.gz 151072 SHA256 0ea512776971fe4e76192600fe41e4e7ee96b4b9a5b15aefc1ac31d2a63872c6 SHA512 44f1cf9c5d5538e35d026551a2d1dc7119786c1148b9a769fa9f652f0368e996512962c6245c92d1f4bb1d8e816e2fb0ffebeb0060b01f92b2a5d6e01d15426f WHIRLPOOL d386e4fb47b2ea4d78d2ad690c9252d6be1b3f5a624e20670e22c9b3a28dc910e3d5ecd24ca54d8f8337f8e9a9875208efce06952cd392d9c8254257eadeee70
+DIST urllib3-1.16.tar.gz 179763 SHA256 63d479478ddfc83bbc11577dc16d47835c5179ac13e550118ca143b62c4bf9ab SHA512 646b35a9a4490b2d1f068883a29cbb5be5050a6eea7bb7842f77cd666b7f88101a7612e8eb45ae0eb900d914518db5202f548ab688b8db1c20ed248ba2edac66 WHIRLPOOL a4a813a5fc560a1487a87e492185122ffe8a41ba263e3c5e5962a48b9f4577a6360fa5d47d474f3c97a56e7ef99b2854c0f742075c05b88461f41d69e10c7a04
+DIST urllib3-1.20.tar.gz 201873 SHA256 97ef2b6e2878d84c0126b9f4e608e37a951ca7848e4855a7f7f4437d5c34a72f SHA512 5e2c960ad8641b7e7faf3df966ceb5a2fbb898d9fb4d4459ba607448bab096e3d5df6bc42fdf5fbc2ea58fb6199ba3eb16613b63fd109401d6a2b6e46aade6c3 WHIRLPOOL 30938f71f77e300c9ccc050b6b1f071941db644b5c34ceba262fa839659a7d9655fe22bc867e63edde5dbae790a4505cbea370962cc495700d6b1c6b40c2b98a
+DIST urllib3-1.21.1.tar.gz 224266 SHA256 b14486978518ca0901a76ba973d7821047409d7f726f22156b24e83fd71382a5 SHA512 0d2e9c2a0b895e4e232cad5ecc645ea9fd9b70191df045a220ee1f32e284c613c6790bcdfd9e40a22ea9d25ec397278fa700a3c3747e7b04222719d50df07859 WHIRLPOOL 58df2abc5d211fa312e7a7967367c0bac9f029848a6fed15fb83d3b0b197e9834fa60f71d2ec2577dfc464c30d3e446035252fac830da500111976e77a4e904b
+DIST urllib3-1.22.tar.gz 226083 SHA256 cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f SHA512 132b69d7f390916bdcde66d46fbf0189d0c1f976f91778dcb0a9ef8174487b7bb4b37b9139e84f7c70234803be95284448aba0b820f3b54530c0c497ca7a1dc9 WHIRLPOOL 4f3314dd61da4ffe85bf44966876dab5ecfffe92e11df1db960c37cc50abc39225607fdb722f53e8b7cfc1005597bec3c2d68db96b5c4b9cbecdb0b1f1814d24
+EBUILD urllib3-1.12.ebuild 2597 SHA256 3df5f88649b463aaf1f188ec2e22834936684094481d439d51232a0a8067f1a4 SHA512 ded5bdf269a839c6120bcee891b9c7a0a153220b0b4b840248259e9724b1d72fd28f5936a46f85faa45ae1444902a5faf925fc726e5b0ae473c90c8841b79212 WHIRLPOOL 505f2dac5847bce927008d8edc6d925eb36510bae1f0d66da40e960f55f26511d3cdcb51e9c557b9b8cffd1162239faa39270f712a7e66ca0a28c61b096eae14
+EBUILD urllib3-1.16.ebuild 3372 SHA256 662d47be179c7f28d111ada1c44bb98d0ea06720997764e84fa2bb78f410584c SHA512 053fa272c4bac13fcf36ecf1c802e49d5f1b04cbd9905394b4e35af48953652b6ec6342c413d835c40c44379b9a9244115dea68579d3532e1e1404a5836db8ae WHIRLPOOL 2255e642ad0eaf3a7fb93314305aa940665d68c51282533a18a585f7a9e2617277ae36b32b9ced855c9f1d0521c60b6666729513f9ae36a5958d84827124dab7
+EBUILD urllib3-1.20.ebuild 1639 SHA256 17101c8ec73773eb4905081f4d35f3d9c719218f1b8f905da464786dccd945a6 SHA512 548ef7d2b368abe5bdc38b91d815cc8c4fe679339fc7b918d45ace213bd07af57050fdb0ebba430e7a9430f70884036ee4abfd5f3be4c57fd88a0acf84b84550 WHIRLPOOL abb53f3a32f897c25dc8a3727b7cfd9fa1a6edaa9bd81321fb1e1a34d9401bd1cc677e8ea46c4ddd56e81e389d147ec917bcfc1c078d8ceb45570376085bffe7
+EBUILD urllib3-1.21.1.ebuild 1639 SHA256 17101c8ec73773eb4905081f4d35f3d9c719218f1b8f905da464786dccd945a6 SHA512 548ef7d2b368abe5bdc38b91d815cc8c4fe679339fc7b918d45ace213bd07af57050fdb0ebba430e7a9430f70884036ee4abfd5f3be4c57fd88a0acf84b84550 WHIRLPOOL abb53f3a32f897c25dc8a3727b7cfd9fa1a6edaa9bd81321fb1e1a34d9401bd1cc677e8ea46c4ddd56e81e389d147ec917bcfc1c078d8ceb45570376085bffe7
+EBUILD urllib3-1.22.ebuild 1733 SHA256 4cf1f94227af932af01e86f17991954665e164d1e98e140da89030b0105e9368 SHA512 2caa17b7ac18d9dc29e6f4969f15e39842cd273c2f0dfa848d4040acb412c3b815f7f8e1e66903f51ce18ff50efddb17161a0b3761e17aab59da10c0d93a5896 WHIRLPOOL c20d707a9d0ff5fb5325ab0742ebe5d5d44ed0ca6ed8f336069394de1fc51261748dbf988a28d63abb6c07651f28dc02c101f3ec3c72939ac5ec9d2b1166e23f
+MISC ChangeLog 10014 SHA256 4ae965fa05e03a9e7f3b48e286390b4d6a7586f62b79da284ac190341b947c25 SHA512 a595da59b5a0f6265630ccf954fe80b57474e18bea544e7715fd09f1494dd48fc48baf07a964b987c1ca647d912f3eeb03567d91e8deac2a1fb3e612b48faf25 WHIRLPOOL a5410589949d8fca4a2fba7b53c6fd797223808a2291ab23a62ec8691ac863e74f981c24bc436b3f499ae29ad8df24b4ff6ed5237251eebb29e01072de5b032b
+MISC ChangeLog-2015 6557 SHA256 0e7444428cedba68eb17365fcf782968c6cbf9ebafdcd5db9cf71f5f91bb1304 SHA512 59695a8a53cb8f813c6af40c0297dc32b4f686fb89b23bcd8967bd933976224c8563b8ff6a61bbb5d25fbef4511f7a0dac03119016f89f677be6b02379c0bbc0 WHIRLPOOL 38243c41442f74d28ac3d2d3238502d1e64f5dc8a4574fe0e95aab74e5431d49bbf3808b3f9bddff26e5b116518f331676479ac2bb850e7d51bfed29a1fb50ea
+MISC metadata.xml 376 SHA256 895ebefb04eb7be3eefc05fc03110fe8c1d8e1b8cbd7eae4b851ace095b421b8 SHA512 97d216a4841d8c78655c923060a0040b75fbb2d19a42e51081fc63a4af80514db5abf09a02706cc52387ab7ac72e964f947f1ded50bcc7f8fae6d022d5353543 WHIRLPOOL af6edd4cc6b63a5d12535975d238e6d0eb68e82d7ed82d54b0ae8d1e75f2ff45806a92831d0889438ba93c1bc96e7e82a7dec13804bc7c674d173a489817dec5
diff --git a/dev-python/urllib3/files/urllib3-1.16.0-unbundle.patch b/dev-python/urllib3/files/urllib3-1.16.0-unbundle.patch
new file mode 100644
index 000000000000..9a8a11e4a771
--- /dev/null
+++ b/dev-python/urllib3/files/urllib3-1.16.0-unbundle.patch
@@ -0,0 +1,17 @@
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 0a2dac3..b7ad412 100644
+--- a/setup.py
++++ b/setup.py
+@@ -42,7 +42,7 @@ setup(name='urllib3',
+       url='http://urllib3.readthedocs.org/',
+       license='MIT',
+       packages=['urllib3',
+-                'urllib3.packages', 'urllib3.packages.ssl_match_hostname',
++                'urllib3.packages',
+                 'urllib3.packages.backports', 'urllib3.contrib',
+                 'urllib3.util',
+                 ],
+       requires=[],
diff --git a/dev-python/urllib3/metadata.xml b/dev-python/urllib3/metadata.xml
new file mode 100644
index 000000000000..de0d93deed28
--- /dev/null
+++ b/dev-python/urllib3/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">urllib3</remote-id>
+    <remote-id type="github">shazow/urllib3</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/urllib3/urllib3-1.12.ebuild b/dev-python/urllib3/urllib3-1.12.ebuild
new file mode 100644
index 000000000000..be217fa84030
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.12.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="https://github.com/shazow/urllib3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)
+	$(python_gen_cond_dep 'dev-python/pyopenssl[${PYTHON_USEDEP}]' python2_7 pypy)
+	$(python_gen_cond_dep 'dev-python/ndg-httpsclient[${PYTHON_USEDEP}]' python2_7 pypy)
+	$(python_gen_cond_dep 'dev-python/pyasn1[${PYTHON_USEDEP}]' python2_7 pypy)
+	"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')]
+		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
+		>=dev-python/nose-exclude-0.4.1[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	"
+
+# Testsuite written requiring mock to be installed under all Cpythons
+
+python_prepare_all() {
+	# Replace bundled copy of dev-python/six
+	cat > urllib3/packages/six.py <<-EOF
+		from __future__ import absolute_import
+		from six import *
+	EOF
+
+	sed \
+		-e 's:\.packages\.six:six:g' \
+		-e 's:\.six:six:g' \
+		-i urllib3/util/response.py urllib3/response.py || die
+
+	sed -i '/cover-min-percentage/d' setup.cfg || die
+	# Fix tests
+	sed -i 's/urllib3.packages.six/six/' test/test_retry.py || die
+
+	# Reset source of objects.inv
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed \
+			-e "s|'python': ('http://docs.python.org/2.7', None|'${PYTHON_DOC}': ('${PYTHON_DOC_INVENTORY}'|" \
+			-i docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Failures still occur under py2.7.
+	# https://github.com/shazow/urllib3/issues/621
+
+	[[ "${EPYTHON}" == pypy ]] && return
+
+	nosetests -v test || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/urllib3/urllib3-1.16.ebuild b/dev-python/urllib3/urllib3-1.16.ebuild
new file mode 100644
index 000000000000..cc6e64ff750b
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.16.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="https://github.com/shazow/urllib3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)
+	$(python_gen_cond_dep 'dev-python/ndg-httpsclient[${PYTHON_USEDEP}]' python2_7 pypy)
+	$(python_gen_cond_dep 'dev-python/pyasn1[${PYTHON_USEDEP}]' python2_7 pypy)
+	"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')]
+		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
+		>=dev-python/nose-exclude-0.4.1[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	"
+
+# Testsuite written requiring mock to be installed under all Cpythons
+
+PATCHES=( "${FILESDIR}"/${PN}-1.16.0-unbundle.patch )
+
+python_prepare_all() {
+	# Replace bundled copy of dev-python/six
+	cat > urllib3/packages/six.py <<-EOF
+		from __future__ import absolute_import
+		from six import *
+	EOF
+
+	rm -r urllib3/packages/ssl_match_hostname || die
+	cat > urllib3/packages/ssl_match_hostname.py <<- EOF
+		from __future__ import absolute_import
+		try:
+		    from backports.ssl_match_hostname import CertificateError, match_hostname
+		except ImportError:
+		    from ssl import CertificateError, match_hostname
+	EOF
+
+	cat > urllib3/packages/ordered_dict.py <<- EOF
+		from __future__ import absolute_import
+		from collections import OrderedDict
+	EOF
+
+	sed \
+		-e 's:\.packages\.six:six:g' \
+		-e 's:\.six:six:g' \
+		-i urllib3/util/response.py urllib3/response.py || die
+
+	sed -i '/cover-min-percentage/d' setup.cfg || die
+	# Fix tests
+	sed -i 's/urllib3.packages.six/six/' test/test_retry.py || die
+
+	# Reset source of objects.inv
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed \
+			-e "s|'python': ('http://docs.python.org/2.7', None|'${PYTHON_DOC}': ('${PYTHON_DOC_INVENTORY}'|" \
+			-i docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Failures still occur under py2.7.
+	# https://github.com/shazow/urllib3/issues/621
+
+	[[ "${EPYTHON}" == pypy ]] && return
+
+	nosetests -v \
+		--exclude test_headerdict \
+		--exclude test_headers \
+		--exclude test_source_address_error \
+		--exclude test_no_ssl \
+		--exclude test_ca_dir_verified \
+		--exclude test_verified \
+		test || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/urllib3/urllib3-1.20.ebuild b/dev-python/urllib3/urllib3-1.20.ebuild
new file mode 100644
index 000000000000..7ccaed366840
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.20.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="https://github.com/shazow/urllib3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')]
+		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
+		>=dev-python/nose-exclude-0.4.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+
+# Testsuite written requiring mock to be installed under all Cpythons
+
+python_compile_all() {
+	use doc && emake -C docs SPHINXOPTS= html
+}
+
+python_test() {
+	# FIXME: get tornado ported
+	if [[ ${EPYTHON} == python* ]]; then
+		nosetests -v test || die "Testing failed with ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/urllib3/urllib3-1.21.1.ebuild b/dev-python/urllib3/urllib3-1.21.1.ebuild
new file mode 100644
index 000000000000..7ccaed366840
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.21.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="https://github.com/shazow/urllib3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')]
+		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
+		>=dev-python/nose-exclude-0.4.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+
+# Testsuite written requiring mock to be installed under all Cpythons
+
+python_compile_all() {
+	use doc && emake -C docs SPHINXOPTS= html
+}
+
+python_test() {
+	# FIXME: get tornado ported
+	if [[ ${EPYTHON} == python* ]]; then
+		nosetests -v test || die "Testing failed with ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/urllib3/urllib3-1.22.ebuild b/dev-python/urllib3/urllib3-1.22.ebuild
new file mode 100644
index 000000000000..2f3a0a57adf9
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.22.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="https://github.com/shazow/urllib3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="doc test"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')]
+		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
+		>=dev-python/nose-exclude-0.4.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+
+# Testsuite written requiring mock to be installed under all Cpythons
+
+python_compile_all() {
+	use doc && emake -C docs SPHINXOPTS= html
+}
+
+python_test() {
+	# FIXME: get tornado ported
+	if [[ ${EPYTHON} == python* ]]; then
+		nosetests -v test || die "Testing failed with ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
new file mode 100644
index 000000000000..9efb7e8f665f
--- /dev/null
+++ b/dev-python/urwid/Manifest
@@ -0,0 +1,7 @@
+AUX urwid-1.1.0-sphinx.patch 453 SHA256 a74171d46d011064c7e79068e725d4809e8cf100f853a4fdc22db363f8bd7ef2 SHA512 6156aba86718b5ccaf5eb6b1d6cddf61c5d1496b450ba0541fff55057070211e9a37bde96034d752a921ec4d2899084c36ec4743480c43cc89809734d644fa8a WHIRLPOOL f32d739d927113e52fc04c5398253ece1a183e284a2fb9992d760b0eb40895c6017fd0313afc9f33571af3b1541db7a84e88b7b060a92a929cfb792fa0cc1d96
+AUX urwid-1.3.1-test-vterm-EINTR.patch 1384 SHA256 05b954ed7782fa2ab1d6e5470a251febac0e7d85191fee027807be34e17301df SHA512 0746938ff78d98cda847adbe49f8848e603eca4d6460921e57ef8c211dd19a21aaa9027f83cb24c53e5396f4a3fdd194396ea82a457729b8b252306c00bfff97 WHIRLPOOL 45e34c1a29cfa776fdcac111784af0f2eb5b464be1f5ed81125344dc34b1b916be541bdaa6d4b469e8a3f481c76d09e7d1cb71915e1e6e81708fe39191bf6fe1
+DIST urwid-1.3.1.tar.gz 588549 SHA256 cfcec03e36de25a1073e2e35c2c7b0cc6969b85745715c3a025a31d9786896a1 SHA512 8b505d38f3a0c04bbf527b324dc36212f2580213dd55eca61c66705d3beaac4f074c39aaa0f4f71add1fe5f3fce4c4c6dc88dd1e981b04bac6d52195d7a3f0ed WHIRLPOOL ff908dfad8e893fd51510168433a6bd63fe1edc38dde65664994f5eb3343e8fe818c4c1b9d5c296d3f3fdc93e2df7a3809f661e52322e6e69e163484b0e38944
+EBUILD urwid-1.3.1.ebuild 1232 SHA256 2292f8ee9f40db9ab75deb2c4cc005f9ff25d6a576ed0c7f44695ed7e164b5a3 SHA512 a0a9c46d42b15392f43d4eaf53742c91ea33765c6cd7214145d5d2362398159df8db9f500addf9705713567e81abf4723cb0af1ec40c8e6ef52bcefdc70737e4 WHIRLPOOL c841bfe6c593adfecacb97f8eaa8e154c4e592c9b47e1b8e189251d4b588137cb34ea7c849c4c6f4839a4a75110e37c87f33111098540ba4450a3677a479520b
+MISC ChangeLog 3771 SHA256 238d1dfdc0d0e425510877c68d60c7d4fcb3075dbe6675a496f8e331e83457fb SHA512 252a4d44c866d32cf2c41276d1a88f4b0b1cc04efb2a66e8172a992ea53492d334d57cff0477ab7a1632f02411d1298c67d5bc2a18df47e3268e13fb59801f43 WHIRLPOOL 5883edd48a199b29e729b864fd0d6bb55e02b4c7c02df727946e092f9571670ccbfad7fac198d0b398329c8ba478a9cc70cee3cd8a7e8b4b33dbc0a4fc931960
+MISC ChangeLog-2015 10619 SHA256 30068094e4c4a6811cb35d2107c64a1bc95383ebf3aec362939d3173de883f9d SHA512 e02d03174116e1de9f8cc9546e3580f0a91a98d5e593688478be1781cd5a60561716560327f351e573ebe57e4ea651e38715c19ac653eb8d4735760f61cb9b1e WHIRLPOOL efd32192e37b62fa9a48277c764dadaedb22c1a0fd99a3552241c11819759a3fa16395685f26676d0774e2b44a3f1d1f09c63e9843a5cf2342d4c8faee3438f6
+MISC metadata.xml 1152 SHA256 cb7c564529adb09d81505ca56b9b8a666fab325319695a2cc8e2f461eb65aec6 SHA512 4bb4df4cc9398e2b77815b908cfc3821a96370e083a7b4452d601009186bc2c29418987f6e9a25d64332a15b860addb66ee4594e30ea51f34a1eae2d8be0a680 WHIRLPOOL a385d4a5a08a1e84195af1a02861c375b3cb5198b34beb181f516dd9225ad7ece52cc69fd6f45f75daafb38887844de3e6b73693f1055ef58e3441f4de091bfb
diff --git a/dev-python/urwid/files/urwid-1.1.0-sphinx.patch b/dev-python/urwid/files/urwid-1.1.0-sphinx.patch
new file mode 100644
index 000000000000..442aeea67500
--- /dev/null
+++ b/dev-python/urwid/files/urwid-1.1.0-sphinx.patch
@@ -0,0 +1,11 @@
+--- urwid-1.1.0/docs/conf.py
++++ urwid-1.1.0/docs/conf.py
+@@ -46,7 +46,7 @@
+ # The version info for the project you're documenting, acts as replacement for
+ # |version| and |release|, also used in various other places throughout the
+ # built documents.
+-FILE_PATH = os.path.dirname(__file__).decode('utf-8')
++FILE_PATH = os.path.dirname(__file__)
+ VERSION_MODULE = os.path.abspath(os.path.join(FILE_PATH,
+     '../urwid/version.py'))
+ VERSION_VARS = {}
diff --git a/dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch b/dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch
new file mode 100644
index 000000000000..04b6e2c949c4
--- /dev/null
+++ b/dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch
@@ -0,0 +1,52 @@
+From f68f2cf089cfd5ec45863baf59a91d5aeb0cf5c3 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 3 Jun 2017 14:53:51 -0400
+Subject: [PATCH] test_vterm: handle EINTR when reading from pipe
+
+Fixes: https://github.com/urwid/urwid/issues/230
+---
+ urwid/tests/test_vterm.py | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/urwid/tests/test_vterm.py b/urwid/tests/test_vterm.py
+index 4dadfcc..075c653 100644
+--- a/urwid/tests/test_vterm.py
++++ b/urwid/tests/test_vterm.py
+@@ -18,6 +18,7 @@
+ #
+ # Urwid web site: http://excess.org/urwid/
+ 
++import errno
+ import os
+ import sys
+ import unittest
+@@ -28,7 +29,6 @@
+ from urwid import signals
+ from urwid.compat import B
+ 
+-
+ class DummyCommand(object):
+     QUITSTRING = B('|||quit|||')
+ 
+@@ -41,12 +41,20 @@ def __call__(self):
+         stdout.write(B('\x1bc'))
+ 
+         while True:
+-            data = os.read(self.reader, 1024)
++            data = self.read(1024)
+             if self.QUITSTRING == data:
+                 break
+             stdout.write(data)
+             stdout.flush()
+ 
++    def read(self, size):
++        while True:
++            try:
++                return os.read(self.reader, size)
++            except OSError as e:
++                if e.errno != errno.EINTR:
++                    raise
++
+     def write(self, data):
+         os.write(self.writer, data)
+ 
diff --git a/dev-python/urwid/metadata.xml b/dev-python/urwid/metadata.xml
new file mode 100644
index 000000000000..cc6ab1eb0d40
--- /dev/null
+++ b/dev-python/urwid/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+Urwid is a curses-based user interface library.  It includes many features
+useful for text console application developers including:
+
+- Fluid interface resizing (xterm window resizing / fbset on Linux console)
+- Web application display mode using Apache and CGI [Live Demo]
+- Support for UTF-8, simple 8-bit and CJK encodings
+- Multiple text alignment and wrapping modes built-in
+- Ability create user-defined text layout classes
+- Simple markup for setting text attributes
+- Powerful list box that handles scrolling between different widget types
+- List box contents may be managed with a user-defined class
+- Flexible edit box for editing many different types of text
+- Buttons, check boxes and radio boxes
+- Customizable layout for all widgets
+- Easy interface for creating HTML screen shots
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">urwid</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/urwid/urwid-1.3.1.ebuild b/dev-python/urwid/urwid-1.3.1.ebuild
new file mode 100644
index 000000000000..5ef27046c964
--- /dev/null
+++ b/dev-python/urwid/urwid-1.3.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="Curses-based user interface library for Python"
+HOMEPAGE="http://urwid.org/ https://pypi.python.org/pypi/urwid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.0-sphinx.patch"
+	"${FILESDIR}/${PN}-1.3.1-test-vterm-EINTR.patch"
+)
+
+python_compile_all() {
+	if use doc; then
+		if python_is_python3; then
+			2to3 -nw --no-diffs docs/conf.py || die
+		fi
+		cd docs || die
+		sphinx-build . _build/html || die
+	fi
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/urwidtrees/Manifest b/dev-python/urwidtrees/Manifest
new file mode 100644
index 000000000000..e258d68a64af
--- /dev/null
+++ b/dev-python/urwidtrees/Manifest
@@ -0,0 +1,4 @@
+DIST urwidtrees-1.0.2.tar.gz 36082 SHA256 703f4b161b930a26a461a3e3e695f94237ac75e2a52b87613e49093d9aa76034 SHA512 535b99d91154c308260a0ee6490868724ce8dfa89acf3b623c08409ec6e15194d9e94085411dd7796cad98865ed57692a88cbc11540e6523fc371eaf0204ac17 WHIRLPOOL 1ed3afe730855405332afa5813749e6b6400b1accf776d80f4b9a8e98a0d63fa822e7ee4ec4fc81d55f06364447d741f6e473b7eee729229667ea65404abe9c5
+EBUILD urwidtrees-1.0.2.ebuild 999 SHA256 80cfa74405685c7c8491f5f23ea0e706d7b7e766bb5376d4455dde6ce715b80f SHA512 be59e306af6a8ea0bf17c2f47f2d653d4f78372d48d7bef595359b37f0852c55ae7dbd4277d6fd0f7abcd8c10bb2fc12db224576ab1b8b3c1337eed8ef569959 WHIRLPOOL 5abfc3da845487b4a0425b6526d695551643087773fc06b87b77b3c1f7c96ad09cc156cc11c425cc97ddaa87eb48abd98a304175ea12fbde67dd672ebea5e26d
+MISC ChangeLog 1043 SHA256 216f26fb025754bd77c6632d7908aa3225ab174e5896c7c81e8a04c4c11619c0 SHA512 466ab715b93c86f4ed6814b50009db04980b9e8dc653eebf623ded64a50b02d5238766e41cac32201d5163ca2d8dde29da94cd2e1d7459d9afa02566e0933f71 WHIRLPOOL 022d2a45cccae419ee2a01dccee84f0bb617a3546f1dc821ae80e71c35aa145ebbec6806f0a6e84dc4e9fed35b5c5c467156ea56a8bf9e621d78f166fcf9eab6
+MISC metadata.xml 550 SHA256 a93fdd8fd7183b509fece7543cf82ce8bf32498b8ab21418c49b17d261959b73 SHA512 f76048059f997bb98de85f445bcd77a5fd1f0523a3c1a77859e0bf1dcdd1ef6f4a99312e7a0261b36753a9b2152231cb84b41f6270c028983033fcce6ec12298 WHIRLPOOL e6856be350b81f53dd585a6af9b7119e6c30337e0f14896756d1e32a091f40c6b9fe9ed048434b5f8c6965db834ccdf0c85f72a06ba725e9d599c0345b8a8d32
diff --git a/dev-python/urwidtrees/metadata.xml b/dev-python/urwidtrees/metadata.xml
new file mode 100644
index 000000000000..142b19f2d854
--- /dev/null
+++ b/dev-python/urwidtrees/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aidecoe@gentoo.org</email>
+		<name>Amadeusz Żołnowski</name>
+	</maintainer>
+	<longdescription lang="en">
+		This is a Widget Container API for the urwid toolkit. It uses a MVC
+		approach and allows to build trees of widgets.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">pazz/urwidtrees</remote-id>
+		<remote-id type="pypi">urwidtrees</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/urwidtrees/urwidtrees-1.0.2.ebuild b/dev-python/urwidtrees/urwidtrees-1.0.2.ebuild
new file mode 100644
index 000000000000..866c17183b5b
--- /dev/null
+++ b/dev-python/urwidtrees/urwidtrees-1.0.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Tree widgets for urwid"
+HOMEPAGE="https://github.com/pazz/urwidtrees"
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/pazz/urwidtrees/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND=">=dev-python/urwid-1.1.0[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	find "${S}" -name '*.py' -print0 | xargs -0 -- sed \
+		-e '1i# -*- coding: utf-8 -*-' -i || die
+
+	distutils-r1_src_prepare
+
+	local md
+	for md in *.md; do
+		mv "${md}" "${md%.md}"
+	done
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if use doc; then
+		pushd docs || die
+		emake html
+		popd || die
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	if use doc; then
+		dohtml -r docs/build/html/*
+	fi
+}
diff --git a/dev-python/utidylib/Manifest b/dev-python/utidylib/Manifest
new file mode 100644
index 000000000000..0a4c18215b06
--- /dev/null
+++ b/dev-python/utidylib/Manifest
@@ -0,0 +1,9 @@
+AUX utidylib-0.2-fix_tests.patch 2084 SHA256 03ba2748262258d5b682b679728c19d498cef9c65cc8c794534ff992ded9b150 SHA512 64d66929c0c318f2033877b51b8564fe32ac82512b08e28fb2c6252f591eeaa6ff84d2a23d7e5ea82a1e293371c84049f68033a21c8258fc9483cfb9f7c615cb WHIRLPOOL 6ad06f851bf23d7b4ab3a17a3f111fe269ed700bed14c7158ccdba04d7a32ccc8d748aa03e09e2428649da48acbdedea4be1505171b8201edad80998b2b557f3
+AUX utidylib-0.2-no-docs-in-site-packages.patch 475 SHA256 c833649b3ea32c48526b5cf819606ebf5edd98e42c299169e91397e72b4e35bf SHA512 ffa0d4c261adfa9d49b5b0a3e559d80a627098a07667f935528a41b18a11ef18dbd86d6b48f99a8f10ff3c0ed91b966c00c5a78b9400b9caf7c9c57036b6d1f7 WHIRLPOOL 0178797b97d75a1ac5bec6ad5ec6906fb1d2a1970b8935dd75356a3667e3617b9a7fab9a93f2f947e7d6aa1422bd0625c1ed26cc17546a8bb94def6a2ea10286
+DIST uTidylib-0.2.zip 17575 SHA256 0385b29b0e636fa1cc6eb86ecb5428cf399f9474c8f343af038afce59720a333 SHA512 02f6611f1c7dd42db96012f7067ada8ccd841532744a569492a2f1c0524a3f1777b8f997a716b9bb18f69f31cb922dc89328d0bd284830620a930a038b303893 WHIRLPOOL 7d1509c36dccf8d7bd22f82d5a6cd95e8b7e422fb6aeab49e7316aaa98e18f771d9c7140897086da61d03b0df5fb3d4291c0b49acfbf8a8633498a837fbc2c2d
+DIST uTidylib-0.3.tar.bz2 13809 SHA256 9f902713bf5d6b8254ca99dccc8729cbe833b1377cfcca67b466c661e5e3f57b SHA512 4503f2a6366e5110740b312df2300d62bb68e1e1032184e9b56dee75995309c76d4f8e5851c73e7c8e08cca7bba9c74436d8dfc0524f115f3abb2bdf5529cc35 WHIRLPOOL 3157558b2674e60ae231ba0ae38523a84659ad375ea2ca1b75e29e118c7cc67d7b66b91733ad68f2b6c3c93d72a0d209e36b576ce52bb33242e20810ec992ab2
+EBUILD utidylib-0.2-r2.ebuild 1033 SHA256 a15a8a03456a5b7bf954289043b55608e2d668c1e7b627e9b85189aea3286856 SHA512 850b021e1fb12ef120e5dc7a66ca94fa48b05aafa1aaf143e4b56b1c050eb2b638951a4ef15c66e166138b6072f52e6dcc550cbfce27636f106a3495c4f5c687 WHIRLPOOL 84bff9fe73480e9f93f83ef6805534bb04b0c8b670f3c3402029c457d50cb581ac5ef9e9066dd426f01357afd6f057408043febd9ea9da9c1f10ae51d0f7dfa3
+EBUILD utidylib-0.3.ebuild 927 SHA256 4c6138045e80dcf1f6990508e5ff0abf5ced7d05bdbcef0d9665f461913c9bab SHA512 b0a6006678c3d3148ce5586605f3b419d352452dbd27bf82250712a94a442ccc243b9b48201b111b05735c34e896ef87bf464498f9b045b689b81738931ea7b1 WHIRLPOOL cb1a3046024b0b84ccac05a131c207b6bd56b11260371de84d1cb2ec83a8e8f8aef5ced0d65fadfb0a9df952653e65672dedf71836857e76f221badfbd9276a2
+MISC ChangeLog 4300 SHA256 74539209d7cdb0802f312a807c2e286301f4bae8927d060d931dd4468dcf6c19 SHA512 5df9688b58753a2d5b8c5f996bbc6522733e34fc233d883fba8c1fdf36b19594fd12a30901847aa4b6ca70d0bb32e289e8fdab5ede026e815b642538202ec20c WHIRLPOOL 60be617885c631cd6761ff8a7815e1ebc58f715cf8d8373fefcc81ac5afc15f11470b2ae1fb3608224a6b10f38c00878e373911fb24ffea35d3aa96c7dfd4d6f
+MISC ChangeLog-2015 2906 SHA256 7b91114a6de45fc6bacc0ab483f9323d9df682e79c20c3630556d18979f7f9f0 SHA512 bf5e93b8b670fe799b3cc91a3eed324555a5ca8350143d134ec11a5e1211e29fe32c80a21274f8cd396a9c2492f02fc59b5587d0dd64f70eb46ba4c17c69a5e8 WHIRLPOOL 8238b1bc9e0a38cefddf967b33034b6880ce8cfbb472938452ce0076e62775b5d9f947eee7912678f0654931d6170d33d1302fd5442e0b0eaddee69a8fedf08c
+MISC metadata.xml 372 SHA256 5e9e1471eaf268a5909b1396e2c2be9b0c13afa2fc529b09be7c213da3968e53 SHA512 d6602ff98aa2ae6a69cad590ab014cbe5b3f1fc1b28c64e91025140fbecaa78c49d6e45bc8b8b5432b0cfe4c91402db3d3954db92905ddc42c13540a9c1e2ab5 WHIRLPOOL 38a654180c7ec1d718ea5c125f15eefc1e75e7d2381b15232c99edc43152b0d2ae35c24f98e207dd8e834131710396791b5f6bab9d1493f97df30d1c0e24f1af
diff --git a/dev-python/utidylib/files/utidylib-0.2-fix_tests.patch b/dev-python/utidylib/files/utidylib-0.2-fix_tests.patch
new file mode 100644
index 000000000000..b55a15119ba4
--- /dev/null
+++ b/dev-python/utidylib/files/utidylib-0.2-fix_tests.patch
@@ -0,0 +1,48 @@
+diff -uNr uTidylib-0.2.orig/tidy/test_tidy.py uTidylib-0.2/tidy/test_tidy.py
+--- uTidylib-0.2.orig/tidy/test_tidy.py	2004-02-24 08:53:52.000000000 +0000
++++ uTidylib-0.2/tidy/test_tidy.py	2009-07-25 15:50:56.000000000 +0000
+@@ -4,6 +4,10 @@
+ 
+ class TidyTestCase(unittest.TestCase):
+     def __init__(self, *args, **kwargs):
++        super(unittest.TestCase, self).__init__(*args, **kwargs)
++        self._shared = False
++        self._parents = []
++
+         foo = u'''<html>
+     <h1>woot</h1>
+     <hr>
+@@ -13,13 +17,13 @@
+   </body>
+ </html>
+ '''.encode('utf8')
+-        file('foo.htm', 'w').write(foo)
++        file('foo.htm', 'w').write(foo)
+         self.input1 = "<html><script>1>2</script>"
+         self.input2 = "<html>\n" + "<p>asdkfjhasldkfjhsldjas\n" * 100
+     def defaultDocs(self):
+         doc1 = tidy.parseString(self.input1)
+         doc2 = tidy.parseString(self.input2)
+-        doc3 = tidy.parse("foo.htm")
++        doc3 = tidy.parse("../foo.htm")
+         doc4 = tidy.parse("bar.htm") # doesn't exist
+         return (doc1, doc2, doc3, doc4)
+     def test_badOptions(self):
+@@ -33,7 +37,7 @@
+                 self.fail("Invalid option %s should have raised an error" %
+                           repr(dct))
+     def test_encodings(self):
+-        foo = file('foo.htm').read().decode('utf8').encode('ascii', 
++        foo = file('../foo.htm').read().decode('utf8').encode('ascii', 
+                                                            'xmlcharrefreplace')
+         doc1u = tidy.parseString(foo, input_encoding='ascii',
+                                  output_encoding='latin1')
+@@ -58,7 +62,7 @@
+ ##        self.failIf(len(doc2.errors)>1) # FIXME - tidylib doesn't
+ ##                                        # support this?
+         self.failUnless(str(doc2).find('\n')<0)
+-        doc3 = tidy.parse('foo.htm', char_encoding='utf8', 
++        doc3 = tidy.parse('../foo.htm', char_encoding='utf8', 
+                           alt_text='foo')
+         self.failUnless(str(doc3).find('alt="foo"')>=0)
+         self.failUnless(str(doc3).find('\xc3\xa9')>=0)
diff --git a/dev-python/utidylib/files/utidylib-0.2-no-docs-in-site-packages.patch b/dev-python/utidylib/files/utidylib-0.2-no-docs-in-site-packages.patch
new file mode 100644
index 000000000000..761c4947dfa8
--- /dev/null
+++ b/dev-python/utidylib/files/utidylib-0.2-no-docs-in-site-packages.patch
@@ -0,0 +1,11 @@
+--- uTidylib-0.2-orig/setup.py	2005-12-01 00:48:14.000000000 +0100
++++ uTidylib-0.2/setup.py	2005-12-01 01:10:33.000000000 +0100
+@@ -54,7 +54,7 @@
+ 
+ 
+ setup_data = dict(packages=['tidy', ],
+-                  data_files=data_files,
++#                  data_files=data_files,
+                   cmdclass=dict(install_data=install_data_utidylib,
+                                 bdist_wininst=bdist_wininst_utidylib,
+                                 install=install_utidylib,
diff --git a/dev-python/utidylib/metadata.xml b/dev-python/utidylib/metadata.xml
new file mode 100644
index 000000000000..a9a29c978e98
--- /dev/null
+++ b/dev-python/utidylib/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">nijel/utidylib</remote-id>
+		<remote-id type="sourceforge">utidylib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/utidylib/utidylib-0.2-r2.ebuild b/dev-python/utidylib/utidylib-0.2-r2.ebuild
new file mode 100644
index 000000000000..76d37d0e30b8
--- /dev/null
+++ b/dev-python/utidylib/utidylib-0.2-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P="uTidylib-${PV}"
+
+DESCRIPTION="TidyLib Python wrapper"
+HOMEPAGE="https://cihar.com/software/utidylib/"
+#SRC_URI="mirror://berlios/${PN}/${MY_P}.zip"
+SRC_URI="mirror://gentoo/${MY_P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="doc test"
+
+RDEPEND="app-text/htmltidy"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )
+	test? ( dev-python/twisted-core[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${P}-no-docs-in-site-packages.patch"
+		"${FILESDIR}/${P}-fix_tests.patch"
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		"${PYTHON}" gendoc.py || die
+	fi
+}
+
+python_test() {
+	trial tidy || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( apidoc/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/utidylib/utidylib-0.3.ebuild b/dev-python/utidylib/utidylib-0.3.ebuild
new file mode 100644
index 000000000000..3551da313538
--- /dev/null
+++ b/dev-python/utidylib/utidylib-0.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_P="uTidylib-${PV}"
+
+DESCRIPTION="TidyLib Python wrapper"
+HOMEPAGE="https://cihar.com/software/utidylib/"
+SRC_URI="http://dl.cihar.com/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="doc test"
+
+RDEPEND="
+	app-text/htmltidy
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+RESTRICT="test"	# 1/11 tests fail
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	if use doc; then
+		${EPYTHON} setup.py build_sphinx || die
+	fi
+}
+
+python_test() {
+	py.test || die "testsuite failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( build/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/utmp/Manifest b/dev-python/utmp/Manifest
new file mode 100644
index 000000000000..cab5977406e0
--- /dev/null
+++ b/dev-python/utmp/Manifest
@@ -0,0 +1,5 @@
+DIST utmp-0.4.tar.gz 4300 SHA256 c8fb6fbed754744764b24ffffabb62c56b27fd8cb51decbb3dc616d740835b2b SHA512 802345227a9de972a7ae1127a006aab6bb51e1a7e81772a58b9c19bee74c79c4f5219519743133e8c02b90f8a72f52e22ab668c8a78a898c00e0a9a147a68472 WHIRLPOOL ce3fd0b9c4f6c499c81e72a6b6874e8c1d87d9b242e2454d5cb7cef39f260b37c6f021add8674b59e0802022110c140a7b2b137ed4ea7f704d1fad05772f43aa
+EBUILD utmp-0.4.ebuild 630 SHA256 3e94913e4d852afcfbf82361bc1d8e2c23bd78c4c3fa32a0e697517e68bb6328 SHA512 a5de60781525709b7ddf165398b145a6cd34dc6216405a20ec9ccdedb09c98ac7925e2350621d9e873aa34409a579d98b40f12bee6ed6b727d2508168512fb90 WHIRLPOOL 38c8a6a520116870f17b7db6db72bd27c9b91b2acb1f46f62fd62db9935c477518284e971da1a3fba5c22702474fa7fe9da48cc59048e409cbf38203e0f8ff09
+MISC ChangeLog 2556 SHA256 e743274c5c5ac485a97f3fa4895f124f65fad1d7a33df09a5271cbacc40c6e0a SHA512 d86fa4b7d6f2e9ded10194d8828078fe9a0b5ff847f8aa3db56b36a8f19924e0a1303bad0e3f10a4d68db2e05406cbe276f24658f34a3f78e00e19d21346b5de WHIRLPOOL f31c351d26d2671dea8551bf0c665264b8eb3db9101dde185e219642cc259f9ea9c0fc64d64da7cfe3d357ceb0ad5a5e3816c09f728b1114a9d1e0d9093030e4
+MISC ChangeLog-2015 482 SHA256 03c39c8bce5a9a6808277414440fe02eb7482711c420a7cbce3df8319d1a1323 SHA512 e8ebb4f7dd2a990f1777a418a2bbe648f5fcb65fdc127ea46d9fd174afe29cf0b14fba5256ebd5809a1b97974c401ce7101f7ca5b16a2ad4807bd6c8ac71a377 WHIRLPOOL fde6c74088443f0eb4e1bf7207cb4fd67288f887437caf79afd608eba1c27f891d681c7c30efbd91b88ffcf1179ebab0e4dc187bb6241772b270fbbc83103eb5
+MISC metadata.xml 307 SHA256 688137bbe0aba3d8f7d07d1ac1a131865b99606768142dd6404b97a8c2037a0d SHA512 4b93db04a6c3737756bdbe1de7257a35e642c5913b4805c60385def5105c7cf57645dde785712e6a316172330969c35cc5f9208ca787b14e9fcdb4a669745ea5 WHIRLPOOL 37a82302cdffe57e5123f59bd7cdddb4b6af424d27932d3a67681d707597bc82e83b6868614418000fafc735e1546081444f5b1667fc3d5df7d3500dd5ddb38b
diff --git a/dev-python/utmp/metadata.xml b/dev-python/utmp/metadata.xml
new file mode 100644
index 000000000000..53932d24b5ed
--- /dev/null
+++ b/dev-python/utmp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">utmp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/utmp/utmp-0.4.ebuild b/dev-python/utmp/utmp-0.4.ebuild
new file mode 100644
index 000000000000..f47d65d55e14
--- /dev/null
+++ b/dev-python/utmp/utmp-0.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="utmp/wtmp reader"
+HOMEPAGE="https://pypi.python.org/pypi/utmp http://srcco.de/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	!sys-apps/utempter"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed "s:'flake8'::g" -i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
new file mode 100644
index 000000000000..d43a9510c7d7
--- /dev/null
+++ b/dev-python/uvloop/Manifest
@@ -0,0 +1,4 @@
+DIST uvloop-0.8.1.tar.gz 1719488 SHA256 923b6e4982aea14a23565e6e62335a691b7a939bcc6802fbafa2a146ee3e8ac3 SHA512 45dba019a0dacaae6c2a732c3f321402c19c945b0d9fa35b9cae28f888a54c7d4b322b450c55a6cf21c1aac01dc49b90eccdffbf4cb8c812a5ec8b9e805e01e4 WHIRLPOOL 3f5352ceab17f487278827278a85885cd6c075781411b7e38e11914af3d63aa0e09fdd6e65cea30baa80d236405f0ead9fc84b3a050012f2e2cad1ce56ca3b39
+EBUILD uvloop-0.8.1.ebuild 1018 SHA256 9d71a62b42b3336af2338705836c36fdb6bb1b6a4dd674161980c9637d398b50 SHA512 d038074150f7157231ee53c038bb9d0e670ec3d2e5a2d9991b73510ea66b37c348d5922a18d5550b1a647579da7a772cdd581d46a02511a6617b2017a657ab93 WHIRLPOOL 93a46fef5a6de2a3c642491ed2c763054e08a9f643c4523334feada900269f70db1532d8e082d022ebb38794b068a338b9579f7dae553a3f4288ccd2362f83f4
+MISC ChangeLog 1250 SHA256 882ca485e7cfe774e3048415aadde04e5dc00405d759194042f5517e31adf934 SHA512 a0c17b8fd9f774c563eb0abe4d9a49a8e87572628d71700d32f282b992ea883a10daa299267eb55249e76941466a45098bd4fe97bd68d36ff0a6e5ae084349f3 WHIRLPOOL 8d4b5c829899a61c5766abc81bcc0f83efabc829ab1cb06c9376a7ad14a832e3436eed1a9b3e36397a84d0f700bb00b55243ac2952e001a2a5aa67c8dff5303d
+MISC metadata.xml 676 SHA256 8b3fc21c719befbd80085ccb8e1e822b158626ed82015f48b1def525ff8ebfc9 SHA512 31c3dd1bf4aa7f60ea9771164172dead405c5d34e2ba3de52d43f1ab32df150a873cd28d972e4fb1c5b45854b59ccdf51ad27e90d6b5caa99717b846a473975c WHIRLPOOL a74ed3c9e03e8231bd5c7e9829f031667f78a11f741c4c8cde7334f15d3ae3deebd213610d58c39dff130dc6d6612bb167ffed24975171a079716344d7046451
diff --git a/dev-python/uvloop/metadata.xml b/dev-python/uvloop/metadata.xml
new file mode 100644
index 000000000000..d7bbdfbdabf2
--- /dev/null
+++ b/dev-python/uvloop/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>elvis@magic.io</email>
+		<name>Elvis Pranskevichus</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>uvloop is a fast, drop-in replacement of the built-in asyncio event loop. uvloop is implemented in Cython and uses libuv under the hood.</longdescription>
+	<upstream>
+      <remote-id type="pypi">uvloop</remote-id>
+      <remote-id type="github">MagicStack/uvloop</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-python/uvloop/uvloop-0.8.1.ebuild b/dev-python/uvloop/uvloop-0.8.1.ebuild
new file mode 100644
index 000000000000..fd91fc222426
--- /dev/null
+++ b/dev-python/uvloop/uvloop-0.8.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
+HOMEPAGE="https://github.com/magicstack/uvloop"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-libs/libuv-1.11.0:="
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	cat <<EOF >> setup.cfg
+[build_ext]
+use-system-libuv=1
+EOF
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_ext --inplace build_sphinx
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && local HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/vatnumber/Manifest b/dev-python/vatnumber/Manifest
new file mode 100644
index 000000000000..f294e1077585
--- /dev/null
+++ b/dev-python/vatnumber/Manifest
@@ -0,0 +1,6 @@
+AUX vatnumber-1.0-skiptest.patch 605 SHA256 cff3c8f821af696751c212b037ba1dfe121e6f9c8c9dcbddebb5f9dead13d927 SHA512 dc9a45a9bfb0862aa22f9ea913480dc5e8873a49a3ee1f6d395850efe046eaded347e4bb5848ddfe80dc51780e0688f0b9664895b446268a78d3c4c23c3460fa WHIRLPOOL 84c1d01311f73354b91f8b9e01a1e3f8b671af95f893eb360fba2badde57f8ea1e1b2f676ed39db09ef997c9baf9cb85d8907da2d33f7e7658d48c229f6e091a
+DIST vatnumber-1.1.tar.gz 22032 SHA256 ff7017420e137609a74ce0dbe6ba16c86ea5317d50ca398f8f423141c07fae18 SHA512 286be890f37dc3ea97beea22f6e34402a9e40738b33a94f98e16a09801656f64fde9f290ed857c5df1fd44896a9e0fbcbfcc8f1dbe2f1314015e473dadc0ebbe WHIRLPOOL 1791946de17a03909b7f3dd3bb20a6cdd08ab552e5413319044e9978bb27ecfc0659636785b86917f4e76dbfb8b2fee379c0df6ac796e290b4109677b99fa7b7
+EBUILD vatnumber-1.1.ebuild 673 SHA256 c82ff7c26462768a5e06073283b965547aa215c425f42c96b4356c473f4ed107 SHA512 b14596a46910352c5f2403dc6cd9cede2cb08526ab7befcdc0a056d5cd8456ba4ec2b78667a4c830bcbe7e337cc0c0a526a194c0b2910a3c6b43ac77fb2f8edf WHIRLPOOL 771c314a84756076c0e3a161fb30ada1424fe99d7630c5860778d29f3fd9ad79aef19bda358fe3dfd625b843ae03b324d036bb19f6f637651e4893014e6c4227
+MISC ChangeLog 3315 SHA256 783f7e06e1634fcae79748bf8a9e54ed2419b2c64408aa810258160f834732bb SHA512 71abb939243de8825926649bc1529f69330ca76b14831e81b4bc17edd18cad3e3ad9ab6e3465c0980430352b061edb4265d665a0d1d62c5de672a92d0940a54d WHIRLPOOL 14e63bd976fd86db9d58887451cc64a342c9a8a680f3045ad99f579c26d6c08722c4f921d654c0d38ac208a5b605ed60736a81745a7f2e1d68221358d11842ad
+MISC ChangeLog-2015 1526 SHA256 66847fae43911f58e05ba8309deaf66f67423d4900995e71f26beb3dd81ae08b SHA512 9b1055a706de09f7f27ec621157401edd24ed1412f2a593f7c98a972bcbd85dd20611f3603211c8c13162f1203c1b5f84c48a30d927cd3c4791ea52b31878eea WHIRLPOOL e9f6f663d101c7898cd9c649a2ce6781d058fe1f939029ce4469dc0d156b0f50065d60ca69b55ab565b7eac92d49477a83dffbd209bcdf40af993980e59ee66d
+MISC metadata.xml 455 SHA256 9633c07e085987732fbcd31c6040329a4b1aaf5d54a7d226e52197f9b575a349 SHA512 909a3ea15c3956e7e0a1d6674bd0c1d5f244d9f2df1b7624cd65c6733dd2101d9508e47790ed45106083026dc6fc4bfd16a090c3ca1393422fa7cc90456707da WHIRLPOOL ad31633f827168227e27dc03e103cc05aa202ea984ce8afd166761ada6f6dd3e7c1ff0ef009ad371faae910f27d453328ecc8762e8e67d8f6019a8329f0dc968
diff --git a/dev-python/vatnumber/files/vatnumber-1.0-skiptest.patch b/dev-python/vatnumber/files/vatnumber-1.0-skiptest.patch
new file mode 100644
index 000000000000..9c99901cd45b
--- /dev/null
+++ b/dev-python/vatnumber/files/vatnumber-1.0-skiptest.patch
@@ -0,0 +1,18 @@
+Remove test that accesses network, bug 440964
+diff -ur vatnumber-1.0.orig/vatnumber/tests.py vatnumber-1.0/vatnumber/tests.py
+--- vatnumber/tests.py	2011-09-28 18:32:09.000000000 +0800
++++ vatnumber/tests.py	2012-11-26 12:32:46.177509425 +0800
+@@ -198,13 +198,6 @@
+                 test = self.assertFalse
+             test(vatnumber.check_vat(code + number), code + number)
+ 
+-    def test_vies(self):
+-        '''
+-        Test vies
+-        '''
+-        for vat in VIES_NUMBERS:
+-            self.assert_(vatnumber.check_vies(vat))
+-
+     def test_countries(self):
+         '''
+         Test countries
diff --git a/dev-python/vatnumber/metadata.xml b/dev-python/vatnumber/metadata.xml
new file mode 100644
index 000000000000..30cf1007b1b4
--- /dev/null
+++ b/dev-python/vatnumber/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Python module to validate VAT numbers
+	</longdescription>
+	<use>
+		<flag name="vies">Enable VIES</flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">vatnumber</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/vatnumber/vatnumber-1.1.ebuild b/dev-python/vatnumber/vatnumber-1.1.ebuild
new file mode 100644
index 000000000000..2d00115728cb
--- /dev/null
+++ b/dev-python/vatnumber/vatnumber-1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Module to validate VAT numbers"
+HOMEPAGE="https://pypi.python.org/pypi/vatnumber/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test vies"
+
+RDEPEND="vies? ( dev-python/suds )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/suds )"
+
+PARCHES=( "${FILESDIR}"/${P}-skiptest.patch )
+
+python_test() {
+	esetup.py test
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc COPYRIGHT README CHANGELOG
+}
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
new file mode 100644
index 000000000000..8eb188b1621a
--- /dev/null
+++ b/dev-python/vcrpy/Manifest
@@ -0,0 +1,7 @@
+DIST vcrpy-1.10.3.tar.gz 61804 SHA256 b2c76736999d81d5321b94d997e3480ffbde8fe56d918eb2798d0e0545cb9f21 SHA512 976f3d9b58025ab5c3a8a666138fbbadccaf8612edea63ac4fbf307d55888eb688bf27dd0f24b0d2c5528c951ced533a52cf13c33bfb32d7e89f241ff508018d WHIRLPOOL 3ca8728d8347bd9ad41b84e27713322b1f567043ab2bcc1691aef985e8234a403147b688630a3915390d0f19d6119f268dadf3cd3ab8eb6b38e3acce40fe1a6b
+DIST vcrpy-1.11.1.tar.gz 63122 SHA256 f434fe7e05d940d576ac850709ae57a738ba40e7f317076ea8d359ced5b32320 SHA512 d883b87d5b3017843dfc2e33241953ada27d50ffda4936ba4326a392acb9c7667474abd054d6e44b0208096cd96b68e87ec9780c0d6fab77369cc4e517617395 WHIRLPOOL 5bd432ea9e4b94f62a186ac986f1fa0647badb9afa0ce87d33fc4b4bc984edc1dce69e951ddad062792fcdfeeae9122ac090b546131c94969891a98a6bb1b7ce
+EBUILD vcrpy-1.10.3.ebuild 1131 SHA256 e1b4f5534850b195494c1e73637806210703941a3c5e8bf1b1c995100f667be2 SHA512 2aa38af73b16d7879e4859a8450f24eeafff37cd4dd3f398614bae09c599d681fcf4ef6a4940bd7f94c5297118a04086312464ac5f5cf5bb295166155bab704f WHIRLPOOL e8eb66765431fe2656ccfe86a141abe6b112b55fa4fbbffc6a47851b52e84eae78736ab530dbcf0345ac6439547690b887daba26cc322a82125db060f9b36405
+EBUILD vcrpy-1.11.1.ebuild 1204 SHA256 702fe2689c28ca5da1508a2c480f895c7813dce50011a410f6623fff9db77827 SHA512 5990750f936659cd40f62a649266f4e4e6d6087c7e0f1bfb0c0fe21ffc8d25cb90da13f40ea104401a8dcc7c4c2635cfe858b5b49a6cd53b857ab88fdd63297a WHIRLPOOL 54306e59d8d7f6cdc406169a902250dcdf81c77e83428c305ab44b7eb17911915b1ed593471d34373db87425463717be27cfb92ca2ee7ee9d739d7348725c926
+MISC ChangeLog 3489 SHA256 f0a43ad0c646339e100e2d36fdc61a8ebab21abed09bce934ea76fe87b399959 SHA512 00ec864fb36175584e521f3b9f041cb51e04f702f6aaf3991b34d2778ab980310a985adfb42475fdfdbb8398ec69b587e8012ec82a5c900c090fb05c3ad4cab3 WHIRLPOOL c03b04cee01489aad981c93d58d516e5ec09e806b5da1472c41a8bbb5e992496202a1f3d8045f538a4fe4af850a10586cb2be83b6d1db6efe0c0954467d46b83
+MISC ChangeLog-2015 337 SHA256 33a4e2a40888053a3ca25b8cf4dd8cc0ab3b4b3a49a013553cd2b97fca35d154 SHA512 fd1ba833fd880b582b57f9a145d08ab22d3acd67e6b959284957448fde3d7ea1fdb3d1301ed01bf9526e2a8513337312526710219acc79b80f575b5e57960f9e WHIRLPOOL c823667e42e6cfffe3910edf9809ef6092516a99b6e327051a036941f6a53da126923e1dca8f646560954a75d438e30a32e09a98ff0b7ee3153b53571074bb41
+MISC metadata.xml 363 SHA256 6d582c07165b9fa71d99f0330c3211584d8c5e5c6319ecb8c885e8dc973b5a55 SHA512 7cb4c7132da46b1a34425492476204519a02b71643cdb6dffbda39281ada4a55b45577707076783add52639ff5993f0c90c48713b94ca1230eb3559ad1207804 WHIRLPOOL 9e5fd25d111f8ef7188520fd30a76d04ec1d6420f17957ec8ef7fbe66843269f92bbc6134c80bfba1ec5f90edde07306775258b934a1d6877bb73768fc001e61
diff --git a/dev-python/vcrpy/metadata.xml b/dev-python/vcrpy/metadata.xml
new file mode 100644
index 000000000000..625f4389c4af
--- /dev/null
+++ b/dev-python/vcrpy/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kevin1024/vcrpy</remote-id>
+		<remote-id type="pypi">vcrpy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/vcrpy/vcrpy-1.10.3.ebuild b/dev-python/vcrpy/vcrpy-1.10.3.ebuild
new file mode 100644
index 000000000000..8942009560a2
--- /dev/null
+++ b/dev-python/vcrpy/vcrpy-1.10.3.ebuild
@@ -0,0 +1,40 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically mock your HTTP interactions to simplify and speed up testing"
+HOMEPAGE="https://github.com/kevin1024/vcrpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+#SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' python2_7)
+	"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -vv -x tests/unit || die
+}
diff --git a/dev-python/vcrpy/vcrpy-1.11.1.ebuild b/dev-python/vcrpy/vcrpy-1.11.1.ebuild
new file mode 100644
index 000000000000..b50e9d02784c
--- /dev/null
+++ b/dev-python/vcrpy/vcrpy-1.11.1.ebuild
@@ -0,0 +1,41 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically mock your HTTP interactions to simplify and speed up testing"
+HOMEPAGE="https://github.com/kevin1024/vcrpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+#SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/yarl[${PYTHON_USEDEP}]' python3*)
+	"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -vv -x tests/unit || die
+}
diff --git a/dev-python/vcstools/Manifest b/dev-python/vcstools/Manifest
new file mode 100644
index 000000000000..48a855152c6e
--- /dev/null
+++ b/dev-python/vcstools/Manifest
@@ -0,0 +1,7 @@
+DIST vcstools-0.1.38.tar.gz 54671 SHA256 0e3d2b5681c2776453fb5b61ceab61fdb965d5342e46c08a5b62095eb0237117 SHA512 a3693d34777235e562a5db006af8f33590df99ffce96f5d3cfd2d816ebdc23ee5fb3536bf289b64a36588e60ce20ce8396a448394f300a12672fd8bf5800973e WHIRLPOOL 86fccbb181849f2b60d8159073bb3de659b7d96173952cb9b68a2869048827c48860fb67859db1341a0defeee0915d41c1d6e77e812f807ca11e91e92e0ed250
+DIST vcstools-0.1.39.tar.gz 51610 SHA256 841bdfeca326b532ced45feea2a79b48008415ef117df008071ba74e985f59c1 SHA512 163ced29baa158d915169a4f8f432bd9ad60ddcd5abae0d3801b5d970049d717c11bd8aa95f7af9dfe48cdcbcce49d14331a82a9c41b9ded1ce4caa2e27cd901 WHIRLPOOL 1c47eda1e0e383336d8d940c4bf063c3aac04e21870d0fa567e239a882216ad857cf184afcef409a0645c38da069a9d1b5c34f1638230c1d59c6d8b7166b618e
+EBUILD vcstools-0.1.38.ebuild 1399 SHA256 bef60df2f0e411b4ef35a383a72da64c3855333eedef5b4e156a7e8c5277c187 SHA512 f46354bae88a383be02b4992ff0e6139681a9c0884ff89bd9ab4f6fb3e485050a64f543915bc9ee063bcdaebcf52b07aa4fbbf4f80fddde841cf5e4f2c545fcd WHIRLPOOL 3034c64fb1e857d2d0a58a98dd6ee4a189f897e3170fb91a8e81a2d9d9042c165a6c1b05935a4bb0fd465f9aaea4d32cfc48609b69653134f09e1d3ac91159e5
+EBUILD vcstools-0.1.39.ebuild 1399 SHA256 8c76909ddb1f54b1fa40e7c26d6f27ced159a99db13cddbe4224a64d3a2aedae SHA512 bdaab338af6023d1621f4495ee47704a9396b11ea97fefd273e4a44f74bf810797582f02f91d6b15e7a5f923bd565e5d02141d1c47f7f39834719a234e876a6c WHIRLPOOL 95af29eea710f2a163aed34e291978dd080467da1e189881bd8b5ffb4d1f56a7b342a627cbca2240ee17ff0c90ddc022eb95a6a135be1d5e54aeedce6bb6c923
+EBUILD vcstools-9999.ebuild 1399 SHA256 bef60df2f0e411b4ef35a383a72da64c3855333eedef5b4e156a7e8c5277c187 SHA512 f46354bae88a383be02b4992ff0e6139681a9c0884ff89bd9ab4f6fb3e485050a64f543915bc9ee063bcdaebcf52b07aa4fbbf4f80fddde841cf5e4f2c545fcd WHIRLPOOL 3034c64fb1e857d2d0a58a98dd6ee4a189f897e3170fb91a8e81a2d9d9042c165a6c1b05935a4bb0fd465f9aaea4d32cfc48609b69653134f09e1d3ac91159e5
+MISC ChangeLog 2625 SHA256 5587a9daa28f1823dfd4768e917194fa9bb17e1598c3c64a8346c1feb7361f56 SHA512 b361e513fbf6fcf7ad590f14d4119960296a5c605cc58d4a5cdc1178518a04139b3bbd1f2a88533ccf1d0d0ebda5093356e09b73a0d26c5419d871afd7ea4429 WHIRLPOOL d23e24d211dac6a365ada1ee1802a9b8e565189a235293d510e1ee0257a5a995aeb7f345d619213f06e45991377cda6b89308ef58c21c6a2f58e161fc5a83ca8
+MISC metadata.xml 331 SHA256 e84fa9c89ae0edd11268855d5a754804f2b2f23458799d1ed523ef6d2b8ed649 SHA512 dbc3f8205ab4e4788a33377fd00d438a9bcc4558ff02989f20befb19de690428d377ca8e0450a47bfdc8654f74123e0e4b02a9a26ffe4f27e1a737266f5cf918 WHIRLPOOL 11ab31f20d8a2fdd6fe61799c7bb47621a6a5a1b2bee99ad1a902df2526e4ff4b6aa91e3c90fafcd784b8eecf35da3677ed750a96dc310b483184005cb0c8ec2
diff --git a/dev-python/vcstools/metadata.xml b/dev-python/vcstools/metadata.xml
new file mode 100644
index 000000000000..b60fa728c8da
--- /dev/null
+++ b/dev-python/vcstools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">vcstools/vcstools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/vcstools/vcstools-0.1.38.ebuild b/dev-python/vcstools/vcstools-0.1.38.ebuild
new file mode 100644
index 000000000000..aebf6ab656b1
--- /dev/null
+++ b/dev-python/vcstools/vcstools-0.1.38.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/vcstools/vcstools"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Python library for interacting with various VCS systems"
+HOMEPAGE="http://wiki.ros.org/vcstools"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		https://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-vcs/git
+		dev-vcs/bzr
+		dev-vcs/mercurial
+		dev-vcs/subversion
+	)
+"
+
+python_test() {
+	# From travis.yml
+	# Set git config to silence some stuff in the tests
+	git config --global user.email "foo@example.com"
+	git config --global user.name "Foo Bar"
+	# Set the hg user
+	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
+	# Set the bzr user
+	bzr whoami "Your Name <name@example.com>"
+	#git config --global user.email "you@example.com"
+	#git config --global user.name "Your Name"
+
+	nosetests --with-coverage --cover-package vcstools || die
+}
diff --git a/dev-python/vcstools/vcstools-0.1.39.ebuild b/dev-python/vcstools/vcstools-0.1.39.ebuild
new file mode 100644
index 000000000000..b54432850230
--- /dev/null
+++ b/dev-python/vcstools/vcstools-0.1.39.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/vcstools/vcstools"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Python library for interacting with various VCS systems"
+HOMEPAGE="http://wiki.ros.org/vcstools"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		https://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-vcs/git
+		dev-vcs/bzr
+		dev-vcs/mercurial
+		dev-vcs/subversion
+	)
+"
+
+python_test() {
+	# From travis.yml
+	# Set git config to silence some stuff in the tests
+	git config --global user.email "foo@example.com"
+	git config --global user.name "Foo Bar"
+	# Set the hg user
+	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
+	# Set the bzr user
+	bzr whoami "Your Name <name@example.com>"
+	#git config --global user.email "you@example.com"
+	#git config --global user.name "Your Name"
+
+	nosetests --with-coverage --cover-package vcstools || die
+}
diff --git a/dev-python/vcstools/vcstools-9999.ebuild b/dev-python/vcstools/vcstools-9999.ebuild
new file mode 100644
index 000000000000..aebf6ab656b1
--- /dev/null
+++ b/dev-python/vcstools/vcstools-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/vcstools/vcstools"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Python library for interacting with various VCS systems"
+HOMEPAGE="http://wiki.ros.org/vcstools"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		https://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-vcs/git
+		dev-vcs/bzr
+		dev-vcs/mercurial
+		dev-vcs/subversion
+	)
+"
+
+python_test() {
+	# From travis.yml
+	# Set git config to silence some stuff in the tests
+	git config --global user.email "foo@example.com"
+	git config --global user.name "Foo Bar"
+	# Set the hg user
+	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
+	# Set the bzr user
+	bzr whoami "Your Name <name@example.com>"
+	#git config --global user.email "you@example.com"
+	#git config --global user.name "Your Name"
+
+	nosetests --with-coverage --cover-package vcstools || die
+}
diff --git a/dev-python/vcversioner/Manifest b/dev-python/vcversioner/Manifest
new file mode 100644
index 000000000000..8879896037c9
--- /dev/null
+++ b/dev-python/vcversioner/Manifest
@@ -0,0 +1,5 @@
+DIST vcversioner-2.16.0.0.tar.gz 9024 SHA256 dae60c17a479781f44a4010701833f1829140b1eeccd258762a74974aa06e19b SHA512 e4e34693aa813e57991eca01d20102bd2e939b536461e2e9e063ac0e3558580e57d7e8d5e08d010690b3c901c97e53f187f20b48520b333eb492ec33e85757d8 WHIRLPOOL 13dc98c065e95c445e230cd4a2f8c62af32342e8fb9bfb95c2fd17df07a4ee5673bd96b5c099bac40ef698dcd182b380f3a94d689826e5d0bc94859976beba2c
+EBUILD vcversioner-2.16.0.0.ebuild 685 SHA256 5fb4f97c23deb82f9d6793f3435deb08cdfd0f9be5db4d22a24c5aa9cca1c583 SHA512 fca14af8ec9c5a85d642aafa1043c60afca1ce344cc53cb39ea787db64d36f4b279ac9a339ff9e49b025de9cc5a3f1a513724cb6b8b6ff392a1a11d234c356ff WHIRLPOOL d6389ca789a1bb613aac276b131c82a21918a75d8f95220be0dd6608078e199edba83dfae34c98727ef772e5363016483703ce3d775385972f31859fcdd2f467
+MISC ChangeLog 4193 SHA256 2633b9d0ba6666270a880eb835bc44fc1046d72bc376e1ed18b9d171c8c91689 SHA512 99019bc5b3a6e77e668537d75d0331318e91f9bb295489d859b060dc2cd6c7f82f8d7f0f12d828e54cb6afffd0222065611d57ad2c0a8082e71ff7b1720f403f WHIRLPOOL f2c2361115c457bd91ea311d8e6f5afb87b10458923e4aa7115ed4ad1d7066185874d8b3142e437f339099bea729983b36f424225abfb69ee7847cb27e7b617f
+MISC ChangeLog-2015 632 SHA256 2742de8aeea4889a05513cd2416fccc245b321af4aac7743c61abc0018dbb444 SHA512 85f9d056a7ebccc58ca7650d001a37d55e04d9e448bd97b0d83f6161ee9eb75685c80412f4020f2ab0cae106f317642638c623e497c11838c3738d5afb4cd88f WHIRLPOOL 1e376c3c11f6a6c6cf5c7230f45d82dd59b83b5fb78d55dfed997819c85df10055df9710cb99b812ce95c8064688abbc03a58d88245934379a8804a79c2f5925
+MISC metadata.xml 308 SHA256 ebf29b2857c589f46f0cc3504e9ac1e801ba7634e6e8748fc88fee6f146c4348 SHA512 550f181e53960f17bc2aff125dc10ffdce51bfff4e8b61572bbf1133e39a1e18ac8e473880504994447fdeba479c172c14aa0c20777ab4e7b07c0e855c686fcb WHIRLPOOL 4182722f6a0be7abfa137d275e9a492a488e4b662b81d21b6f813e7da9d6fba248dc6b73d1b14a9223b9fc65a97b341b0ff98cf72350830ebbdc55013013770a
diff --git a/dev-python/vcversioner/metadata.xml b/dev-python/vcversioner/metadata.xml
new file mode 100644
index 000000000000..15cd61621bff
--- /dev/null
+++ b/dev-python/vcversioner/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="pypi">vcversioner</remote-id>
+    <remote-id type="github">habnabit/vcversioner</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
new file mode 100644
index 000000000000..7264843fafba
--- /dev/null
+++ b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
@@ -0,0 +1,29 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Use version control tags to discover version numbers"
+HOMEPAGE="https://github.com/habnabit/vcversioner https://pypi.python.org/pypi/vcversioner"
+SRC_URI="mirror://pypi/v/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	"
+
+# not included
+RESTRICT=test
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
new file mode 100644
index 000000000000..facc91b7ae35
--- /dev/null
+++ b/dev-python/vdirsyncer/Manifest
@@ -0,0 +1,6 @@
+DIST vdirsyncer-0.14.0.tar.gz 105839 SHA256 28211a857c03ea6cdad22ca74505758a743dbb8bc224e5bcd558a73efd1370d5 SHA512 e8a9f74032bc625db60206a210d7c00fad224b7eccfd1caeabbb97b443fd90ae8a00e2fdfabfd6118864dd9b6d8922eb9906091a8e341334848f66e55ed5fcdd WHIRLPOOL c1823b0db07e1b2deaed5cf2b69a86bb025d47d9ba79d408fdddfa81706f9046b43f8076f4ea418037639a5a52b9fff33e75bae1cfbf9c01f4920139a5e36d99
+DIST vdirsyncer-0.16.0.tar.gz 113408 SHA256 cfdbfa799373ca08f533bfc57bd0d3afefe8a2c5f845782db38b889a19aca958 SHA512 d15a78d49da8ec033be85a3b127d5a788d34ba160207068f9cbd038efd950df809222da9b26ded46f53898b59c8e22049ca003c593e5ce4153ba744e9cf94dd4 WHIRLPOOL e8677ecf3860748b47701b6a8cf4673e6b9eed6450158489028398ba2877b601577307d8bd81548af75a2335841be3470f418226f76df2a61534e601854c823b
+EBUILD vdirsyncer-0.14.0.ebuild 1397 SHA256 eb3366a4e37c576647cd36c41a743a3a5b5dd750547fbaafccabd605876cabfd SHA512 0a18373f7d61fe94e5127e52b184b4ef91c1fd732c97b42b882e23556e25013289fef081c1b9dde249b203c46a99cef6f91f3838b2039f3f6e82115023bdeff7 WHIRLPOOL 73dc9c733ef13b85afc55b30291f84c03d0804945a1a0ee2fbd3d8c44ef23336968591250aa7a3ab20de8bd90d333e89831efd9a1fdd7e4e235ca87db84de9cf
+EBUILD vdirsyncer-0.16.0.ebuild 1397 SHA256 eb3366a4e37c576647cd36c41a743a3a5b5dd750547fbaafccabd605876cabfd SHA512 0a18373f7d61fe94e5127e52b184b4ef91c1fd732c97b42b882e23556e25013289fef081c1b9dde249b203c46a99cef6f91f3838b2039f3f6e82115023bdeff7 WHIRLPOOL 73dc9c733ef13b85afc55b30291f84c03d0804945a1a0ee2fbd3d8c44ef23336968591250aa7a3ab20de8bd90d333e89831efd9a1fdd7e4e235ca87db84de9cf
+MISC ChangeLog 2008 SHA256 cc07e240955bd3dc088cb312d9340ca683ea82581af696241066c8ee13323f10 SHA512 93cbb06a3e729ada60ac4f7bc258a628ea8ffe39728c78e960779c6eae10b435b75ad31544d9e46a0145315b4057c8593ead5ec7d26d7945dfabff17c0f769da WHIRLPOOL ec945189720d0697878e3dcea91d262ac8c6eef0af3aed59d6402d7b8cb324b68c49b43b5e50af983804a3571c771b391b7820d48d9733bbdea5a006f4977715
+MISC metadata.xml 349 SHA256 f502f23feed55371515ade8c79ec1cd2cf7eed4bc7d06c41773c3db487970b14 SHA512 5e2d7f27428065740bdee11e59053519c83054c19156f77ec03fc6e416ca44ea0b74178844ac8ef84d1993927bcf3ba0b80d84296a152a006681ed77e87ed14f WHIRLPOOL f5595ed1f4df0dcb4452d9daf2b23920036a58544b095e1883008d0c11ea874d1997ce49af428734034e2a362224a715d91165d6acc985c76648a0004796ee72
diff --git a/dev-python/vdirsyncer/metadata.xml b/dev-python/vdirsyncer/metadata.xml
new file mode 100644
index 000000000000..161dede1c475
--- /dev/null
+++ b/dev-python/vdirsyncer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>amynka@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pimutils/vdirsyncer</remote-id>
+		<remote-id type="pypi">vdirsyncer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.14.0.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.14.0.ebuild
new file mode 100644
index 000000000000..b224f165d05e
--- /dev/null
+++ b/dev-python/vdirsyncer/vdirsyncer-0.14.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Synchronize calendars and contacts"
+HOMEPAGE="https://github.com/pimutils/vdirsyncer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]
+	>=dev-python/click-log-0.1.3[${PYTHON_USEDEP}]
+	>=dev-python/click-threading-0.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
+	!=dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-3.1[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
+
+python_test() {
+	# skip tests needing servers running
+	local -x DAV_SERVER=skip
+	local -x REMOTESTORAGE_SERVER=skip
+	# pytest dies hard if the envvars do not have any value...
+	local -x CI=false
+	local -x DETERMINISTIC_TESTS=false
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.16.0.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.16.0.ebuild
new file mode 100644
index 000000000000..b224f165d05e
--- /dev/null
+++ b/dev-python/vdirsyncer/vdirsyncer-0.16.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Synchronize calendars and contacts"
+HOMEPAGE="https://github.com/pimutils/vdirsyncer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]
+	>=dev-python/click-log-0.1.3[${PYTHON_USEDEP}]
+	>=dev-python/click-threading-0.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
+	!=dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-3.1[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
+
+python_test() {
+	# skip tests needing servers running
+	local -x DAV_SERVER=skip
+	local -x REMOTESTORAGE_SERVER=skip
+	# pytest dies hard if the envvars do not have any value...
+	local -x CI=false
+	local -x DETERMINISTIC_TESTS=false
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/venusian/Manifest b/dev-python/venusian/Manifest
new file mode 100644
index 000000000000..f34d0d1f7c4c
--- /dev/null
+++ b/dev-python/venusian/Manifest
@@ -0,0 +1,7 @@
+DIST venusian-1.0.tar.gz 45747 SHA256 1720cff2ca9c369c840c1d685a7c7a21da1afa687bfe62edd93cae4bf429ca5a SHA512 770780c4e4532b16e119365d3c9531e85aede9c2be2e3a333cfe43856271c7b232ce1b27c1379f677a7191c24e8736bf5307be7a926b613f7b81644d404e8453 WHIRLPOOL 1eedda1a8d6e15caf4af136ddd08298c7201342a841b267a489b8fb483d3d97b330e3adbe75e5bd28fcd3b62d6b6b5de57f5a520923d05195560afbfb682315d
+DIST venusian-1.0_p20161030.zip 64972 SHA256 3d9d2b8a6e1f200484902c7d06b3b082b8224e92a25a281e4eebbcc5d94616c6 SHA512 d6e08beb7c6e29e8a30c2c94eb431bc1c2181dbe0a7fb911eb042035998b6c6a0c9fb827d46172916b3dd594335543c2670eb2100eeafac4cc25ec360b8adc57 WHIRLPOOL 21dcc263345e9cb7e3b55ffaaadcffcc4aea204274fd492fa68e2a2b96243ef0c479d413cf0b47f19408bbf9be34221ca2a2dae9d3be54326e8997840872ad19
+EBUILD venusian-1.0.ebuild 601 SHA256 95df35297f6bef7061464c618006fbd1739aa4c36133801c8ad30aeaef1efc70 SHA512 0cccdcdb898b9714da6359b0f62b29fc4f44327f942df045b5117c7552354da149cc0933e5eb486c907fe901d31612ccc00abf980bb8e403bab6137b4a87f3f5 WHIRLPOOL 1f46dcf2393d1e44b0e5d620be800bbc3a82368fbb74cfcd8e29aad12c0acead59e4f077d9519b78de48ea82ac6d5c1a61f69f8ad10c450b8466994c11f6350d
+EBUILD venusian-1.0_p20161030.ebuild 1038 SHA256 ce903aa75a976eb323e374be4205de462b5dd18e073b68c9432d22647dd50c26 SHA512 25bfb5bf794985d9cd4cd29e79334d2f72bb82c2919c609ea660be310846f14567dc028293b41004f85f91b182729f1ad051c320b2e67d3acbf2db2b1fc5bc4e WHIRLPOOL 5d7c42e4d6f097f8681aebb94bf1538282f424baafd6ce7f113d13146af5ca3b477255be29ffa69d8488945a35d88df17dddd4d95925890708884425f96720e0
+MISC ChangeLog 2745 SHA256 052143ac6c94cc11e069bb14cde76eaa2a3123983581ee45945f98c3b0bb79ea SHA512 b80435103303571a9b17291ca9b427a3e658e3e21d64776404860ea41fa7ebcd28a5a25d482334bebc63c21df0240d411cf95ca7f2d08b89eb8300516480dd77 WHIRLPOOL 14bb0635b4319993683f70b21d8a2fbbb859de9e23f9fb06110ce46bdbf1d4383ab736444f62eba259800ace592965797053ccd906794174a2224670b13051b9
+MISC ChangeLog-2015 870 SHA256 297dd4dcf23a9aa4c18ebf4c9c20ec8b0da945f6a5505210627808fd110e7621 SHA512 bf958712a98121d58ed0e5d349b9d00e4c03afad33fd5a13f635aaebadb7c853cdf2869500121f4da639ffe6a93ef7e103462e9821e2a88726813145916fdf77 WHIRLPOOL d1c777cb3cf2e6a45393572f21c178f899554cb1fa9c2a80fbf6faf84bfbab96279b27db952b68d0be7323c79896f8e718e6441856c3fa1bbcdac5f190898462
+MISC metadata.xml 311 SHA256 200d7eb6984ff6f4811a79fe4a09d2d17f23f88a5afff7a0200fb63502c3e2f5 SHA512 fdbba18665ba09d35690fe85dba1e4a3736d7b799e20e4c4d656b0c7e724763fbce4eba75f3fedb2c8ba63e8be3b8d0fc25dca1d12061381a84b4bceaef50bf6 WHIRLPOOL addbbb51cf84ce9dd8a0b64201b62def4c7e5fb911f2d6146629e0831e6b6a41c48e847c4a76398104f1cb1c653ab2e5d0aee566aa7b408844e637d9fdcb162a
diff --git a/dev-python/venusian/metadata.xml b/dev-python/venusian/metadata.xml
new file mode 100644
index 000000000000..b9351bea5c46
--- /dev/null
+++ b/dev-python/venusian/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">venusian</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/venusian/venusian-1.0.ebuild b/dev-python/venusian/venusian-1.0.ebuild
new file mode 100644
index 000000000000..d2f58f4b7e10
--- /dev/null
+++ b/dev-python/venusian/venusian-1.0.ebuild
@@ -0,0 +1,27 @@
+# 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
+
+DESCRIPTION="A library for deferring decorator actions"
+HOMEPAGE="http://www.pylonsproject.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/nose-exclude-0.1.9[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py nosetests
+}
diff --git a/dev-python/venusian/venusian-1.0_p20161030.ebuild b/dev-python/venusian/venusian-1.0_p20161030.ebuild
new file mode 100644
index 000000000000..92b452841a64
--- /dev/null
+++ b/dev-python/venusian/venusian-1.0_p20161030.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+COMMIT="ec4032596e3aec987ba29b62cac701608ef3b523"
+
+inherit distutils-r1
+
+DESCRIPTION="A library for deferring decorator actions"
+HOMEPAGE="http://www.pylonsproject.org/"
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/Pylons/venusian/archive/${COMMIT}.zip -> ${P}.zip"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/nose-exclude-0.1.9[${PYTHON_USEDEP}] )
+	"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+python_test() {
+	# copy the zipfile to the fixtures dir, setup.py doesn't
+	cp "${S}"/venusian/tests/fixtures/zipped.zip "${BUILD_DIR}"/lib/venusian/tests/fixtures/ || die "Failed to cp zipfile.zip"
+
+	cd "${BUILD_DIR}/lib/venusian"
+	nosetests --exclude-dir=tests/fixtures || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/verboselogs/Manifest b/dev-python/verboselogs/Manifest
new file mode 100644
index 000000000000..ad89895f2cad
--- /dev/null
+++ b/dev-python/verboselogs/Manifest
@@ -0,0 +1,5 @@
+DIST verboselogs-1.6.tar.gz 8837 SHA256 0967a8a19afaf8e815b8f5060511cd7e172a86c7ecf94838c316baf7b0ee10e1 SHA512 618556820c8585edea5ecf86d4b19800f216764c86eaf796dbdeaa5e2b6ace7940c01e9cf94a499a4619bda8b4b8761def8c6e4200a995da511bb23109dcc7e0 WHIRLPOOL 04c1cec78ce9d3528cc35c36213bc2db628a99b9831c4138b8a1747271979c16fa77c7cc95cd2cac14159e76cdd846361acf6cf80e4d178602f05e3ec0308757
+EBUILD verboselogs-1.6.ebuild 497 SHA256 20b0d6392350bb046521f9df15b356cd1af727ac1b601fadc43aea3bb8d35c1c SHA512 5bce5f283ac31ddcc0ad71968dc7fd6d90443766c0331d380a86a8ecb06d11ca51f3f70a3c99833bd57c00305b8d62e83429cf858eff2ce69b864bc7678bb592 WHIRLPOOL 4a85df62814aa214b23903f16379614f25e65973f2ed73e2a4d60842efe8b3a2c61f94c660a272d9d91fba3307c8c725b6726a7237503f44d9cb9bd9a014817d
+MISC ChangeLog 3131 SHA256 add0d4fddf7349a9bb4dea9acb1f6e62855985a7feb5401b99c3ec56c350b10b SHA512 6f5ed2f096d925874ccfa6f11b2f0d89701869bb0dfebb8a99bf3de6fdb5ca1f2a2fc699ed7c4eadee484bf2a0fe93713c4f72d94239d8d858428e2e8bcb1dec WHIRLPOOL 65fe2417d529b9546fd720f42293bfb397cb3c5123a6c40285c68cb36e5cd40e9edb9471c6074d3be62e7f003f64e5f644552f4c903303495b914e34db665453
+MISC ChangeLog-2015 478 SHA256 ea60f3d043a29e02a61fdb3480f820decea060d6342871c3eb0bc906dc8af8e0 SHA512 864632009e72f83647d3db1118c6c92d5e4703021fbbb05dd43beb65d570df7d54e812c6bbbba93fbf7992e5a6c55429bc3cfd82a7fd5a9573cc61f07856b7c5 WHIRLPOOL abc6365727553427170dfa4b9343115172eca91cf18c1e059927e0ee91db7d3f4d119c612f8612c52c36fee2461e96d8e18bb3e5ad2c17685d89be23bd696199
+MISC metadata.xml 324 SHA256 2607a49fcfb13230056d351b1b60ca1eae79fb412b13a3172d103ff2da1fb4aa SHA512 4e0057695d4ab3557dc29f6ae0031d780cceabbcf6c0b07cdf80f11052e64cd90994c93a4d09213f875d54a1bce1cee88287ab223bc4d7c0cf4a70095614c039 WHIRLPOOL e52849581edf7d338cd70d72dbd04019b36b202ec91e4efa9ba08f6f05da2cb3b0dfa722ad6b3aee40c5d77413f7e6a0aa908060f56c4ea85e6317ffadaa09a6
diff --git a/dev-python/verboselogs/metadata.xml b/dev-python/verboselogs/metadata.xml
new file mode 100644
index 000000000000..6f9b8643810a
--- /dev/null
+++ b/dev-python/verboselogs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">verboselogs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/verboselogs/verboselogs-1.6.ebuild b/dev-python/verboselogs/verboselogs-1.6.ebuild
new file mode 100644
index 000000000000..19a63f142f97
--- /dev/null
+++ b/dev-python/verboselogs/verboselogs-1.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Verbose logging for Python's logging module"
+HOMEPAGE="https://pypi.python.org/pypi/verboselogs"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
new file mode 100644
index 000000000000..e950331fe9fe
--- /dev/null
+++ b/dev-python/versioneer/Manifest
@@ -0,0 +1,4 @@
+DIST versioneer-0.16.tar.gz 37736 SHA256 67f9c595eba7479fc5afd867642e21b1a97d2e8cbff9684ad47d41a0db4b3048 SHA512 90604d69351c822dd5a1e8eaddbe6af2e77895c7e29148a75306833f04c59e18ae8ab6c928860ce3b8c7ac46245f2ed856485fdcffd790f436e689c408ddeca3 WHIRLPOOL 4bd1db6170736ba23e3ce36015f2c096aa17447d2fdebd738d4eca5996df705e17a5b791387a93a663aa8e3ceb120ab96150e9ec1d5f9f3a6650d1f3c21b22f0
+EBUILD versioneer-0.16.ebuild 818 SHA256 def0cdd1c83090935d770472d46a0e1e8568d10f4c9bc13cb9481e8c12194324 SHA512 d3e6c3fb2b15d7936f40792dc0e66a12221a415eb905adfb099b7d4aadf3a7291eb597e22b54d5c9413adeb06747b7f164985c3b31e52ef86d91b552848ac739 WHIRLPOOL e9c335a6290989c6df0675b538a63004fab54794676203ff30a5525a709b7e695ed106f69145ea23845c89a6268d86a7b023777529f6f15d8e8a66e6538f3755
+MISC ChangeLog 1798 SHA256 8ce9533211e661e04c4f5afb30e38ee9b3c628bb9cb0c6e2ef6e0fe64e053402 SHA512 03ffbb961e604dfeba3bec7cb0b45660db134d8fb009ded22a33d14771ca224121879bd7f5fbe1b6bbd5f62114b4377e8e31d31dc8e95a827033dd851bcdf472 WHIRLPOOL 4a4d762c7306d83eaa0ffeeb4af4e101946686068ee050b053b9c6622e708109384a1a9f60f8af58a00a1fe39480acfc9c40b0a91f3ee02fb445cc5a77847426
+MISC metadata.xml 389 SHA256 3ac5ba2dcb3e717f3977d3f53956504416149cbdc85f53fb2366e88bb1a7fb95 SHA512 56007f4ca5e05201b08750acf76d0f83a017b54b4d2533084615f2a74ed288cc0d82e6824d2da31684dd3027a3a53f8b261cb5e2371a089544f8edafce595ffc WHIRLPOOL 7259f5aff05d1de38e78377be1daab87bb54947c9c3f698c17fa1dad6f7ec221165d871552c79926bbade0b74e783756ae232e810fb2b494bbac9888ca58d96a
diff --git a/dev-python/versioneer/metadata.xml b/dev-python/versioneer/metadata.xml
new file mode 100644
index 000000000000..6a5d0c7205c1
--- /dev/null
+++ b/dev-python/versioneer/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">warner/python-versioneer</remote-id>
+    <remote-id type="pypi">versioneer</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/versioneer/versioneer-0.16.ebuild b/dev-python/versioneer/versioneer-0.16.ebuild
new file mode 100644
index 000000000000..3e621c48c758
--- /dev/null
+++ b/dev-python/versioneer/versioneer-0.16.ebuild
@@ -0,0 +1,29 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy VCS-based management of project version strings"
+HOMEPAGE="https://pypi.python.org/pypi/versioneer https://github.com/warner/python-versioneer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py make_versioneer
+	git config --global user.email "you@example.com"
+	git config --global user.name "Your Name"
+
+	${PYTHON} test/git/test_git.py -v || die
+}
diff --git a/dev-python/versiontools/Manifest b/dev-python/versiontools/Manifest
new file mode 100644
index 000000000000..e72f122312e1
--- /dev/null
+++ b/dev-python/versiontools/Manifest
@@ -0,0 +1,5 @@
+DIST versiontools-1.9.1.tar.gz 19089 SHA256 a969332887a18a9c98b0df0ea4d4ca75972f24ca94f06fb87d591377e83414f6 SHA512 f062eecc9998bf194dcac7c52065757ef546aa94bbe7d5b6786ba10f1e44486df997e9a314ff60a0d4e88a2620824217c8add516011baa2ee4e26ec19f762892 WHIRLPOOL a191e18b8ecc9994b2508abe5259aada09eb23906e589b68b23588a1743cfda88048b9199d5e8627a7bb35019ea0f8fa4f09a01595cb18f8c15cb0a6fb9712fe
+EBUILD versiontools-1.9.1-r1.ebuild 685 SHA256 5710afa1fee4ec1d6a342b492c207147550fbda450ec195500c70f248f04bdee SHA512 ea0bcf7fc6ff8cada26bd018491ee782797ae20506a6032ee8af003b7eac2009c6aa382777408d0ed3894c11c8548e054632220a4dd82df21dab86a6c2d5c0ca WHIRLPOOL d717b1859e0de09d250081a2fb45a3e9705e7babc6010fc614b070ed7f793aae9022a292ccf5d17d3391bd79e69c7544e0f6a47a764ec01a966e431366d441ea
+MISC ChangeLog 2847 SHA256 1f60f8006fd55a98a3d14a5f119d46bc93fa40e6c3131d19f31f5d11f7570a8f SHA512 c8508c112726597066bc8c3a8ed965aa6091bb9481b03d158a60cbc0cf9d1218f77273149e02aff3bda4f6295a88d9401fb3be50ed661ce8216c707d20f7a79e WHIRLPOOL 4a2fd550bdf39abe97138e7ea7dc607b521b81c15419fca8acab4a2120b3fb7996ef42807bcddc168cdde91072dcea12d7351a74797c511b2d8aa0928da0ed4f
+MISC ChangeLog-2015 2000 SHA256 b911343d7f785addc561540937d22965748d675da642762e473e4c58a4c8e7cc SHA512 3bf87ea7cd9d7bbfa1bc469a1bdc47fa540f7ec1d689120ba75167c7d20c3aecca5561ca51f3b1ad97eabe9cd984cd2c4a2c462f7fae2dcc259dbf3d3ed5699d WHIRLPOOL 2fe653933ebb5ec8c31ebbdebe463e49fa249f25b705981653f3de8bcec3d2b32fdc96bc73a8846418b8d2317a7cee966f3dbb446a8fcf5190b6d45b5534b96a
+MISC metadata.xml 370 SHA256 21ef16e91132001a63b910ecd816063d1483a46aa31e7c51287443499b60290e SHA512 2960d71bf6f0a11dd92600c4e62103ead304ab6d3215034fa72253bd57d7a64cea5a97c324df1d5672260b2f679b02e45efe01404cc65a45f55d751a721e48c1 WHIRLPOOL 740a812d8cfe696e36c942be7465b798c69a452a4ea511083b14ed7e284a8e48695ec63f96a9d9032bcb765a5d41a52ebfea2d22926d08c12f78ed9c0151dce3
diff --git a/dev-python/versiontools/metadata.xml b/dev-python/versiontools/metadata.xml
new file mode 100644
index 000000000000..6da64af30fb7
--- /dev/null
+++ b/dev-python/versiontools/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">versiontools</remote-id>
+		<remote-id type="launchpad">versiontools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/versiontools/versiontools-1.9.1-r1.ebuild b/dev-python/versiontools/versiontools-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..a346f2589929
--- /dev/null
+++ b/dev-python/versiontools/versiontools-1.9.1-r1.ebuild
@@ -0,0 +1,29 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Smart replacement for plain tuple used in __version__"
+HOMEPAGE="https://pypi.python.org/pypi/versiontools/ https://launchpad.net/versiontools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# Expexted failure
+	sed -e s':test_cant_import:_&:' -i versiontools/tests.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/vertex/Manifest b/dev-python/vertex/Manifest
new file mode 100644
index 000000000000..251b1b8b6b1c
--- /dev/null
+++ b/dev-python/vertex/Manifest
@@ -0,0 +1,7 @@
+DIST Vertex-0.3.0.tar.gz 84997 SHA256 f397b48c76289f658dc042f6978fcc1c5e7a059ec507df39b91aec2da6753ea5 SHA512 206d142cc72b2d77ed8c8fe222770eabc1a8c179238f46554abc5d833669f27bd286565e20ccaf5594d456b23b54455b23ab0eca5b8b4f72a7961924e7167676 WHIRLPOOL a0bca99a89d40d34c2afef3a1b361e07fe54b6c47663bc79c41a790d2c16be017be3ff02540eb481d554cffb7aaf196ca20f8a792c5a89f188a83a653d8598d4
+DIST Vertex-0.3.1.tar.gz 89909 SHA256 2a81a33bb21392ae2c068399d6a720c6c5fef8b3591528ba7300749d1a054c43 SHA512 7e9b96a7ba493254ff58e8f75da6517c09c4502c21702a96c29525a78569ff7d988cd7278dd87983485b6da30a607820a7edb28375e37d5e059d6f0638a1b1c9 WHIRLPOOL 8827e68c7ce778bf8ece84e7002721e32ded3c9c1af699c5ab690595be0126e84f8a4d3cb280b2f358fa78e2f10f228c5cf785e76923bbd8aaf889085c7a1cc2
+EBUILD vertex-0.3.0-r1.ebuild 670 SHA256 4e83878052d2274bedda9762924939d8c8d9d53a0a67ef77bdd4d560377bfd7e SHA512 77f47c46979dde08e715b8252587bc21331f4cad88165195869d379e0a05b68d8e73e0bc558391c23e2fe14fdd5c788bd22c2d39976faceb5aaf70089f9db818 WHIRLPOOL 8e036bff33c3e4ae1b43e8ccabcad9c11401f129d151a2c023c627d9343bee0c9e0d48a5c139bb51664f1f7698f7372df6b281bfdec4f49ac4f1194122e47c4e
+EBUILD vertex-0.3.1-r1.ebuild 835 SHA256 0be61d4ae620d90193997455095b78e84829d1668efc69ecaa10d64cd8106ecd SHA512 d353113751cae713e855c9d1d3102f02082aa78eface526c1cc5785932a2006bca58ffd2129fe5fe0780522f8eb9b26eef49aa35258359aa08ab20b4bbf1abe9 WHIRLPOOL 2dddf39763599c9eebe7af95374c9e5b34367ae5e96a1229a6554d3c2a46835526e6948b728954584adb21664eb3c9c7f0b0de4c4c87f8bdfdd2647f1ca0310b
+MISC ChangeLog 2908 SHA256 7ec0f1fd2855cea7e0b81614284225c1eacbd2e8b18730fd5fab38f5efc67334 SHA512 db410f70c2464b434bd7606e54e7081899ddc2b31aee4650bbcfbd6502d528094a6cf7cd4beac0b71dbb93e708dbbc29f3eba12b975d22332bd07a83260f5ce4 WHIRLPOOL 2b88022faa7e02d6d800f3129a8266950e564f54f47fabfff9c2ca1a49c5c872728463a97780c0ede7aa0e770f5ad71c6b58ec1faa70ed89e19aab871fe0d42a
+MISC ChangeLog-2015 2980 SHA256 c71dc6ea3214286557f0e62318982e42758a6ec68344fb19a09eeeab03873ec2 SHA512 66067c9fd443beb70b8067f766d6bbafeebf08f923bcd3e1ed1836bcbdcfc45e3c65bdc2148570846ee04e16404f29caca23178315434edfb792054797fbf009 WHIRLPOOL 4c995bfca1c96f2d6306f09d3ec576f97d7e83ff61210c0da85c5351775f93738642b79a1990ac111ea1c0e7efb40268f242122e3f36caae9d3303962d6ca4c9
+MISC metadata.xml 896 SHA256 840b45159bc0619ad2244db8673a70d9747673e080f471ba90d8861b89156510 SHA512 71c0e6e5ab8584a10daf920a7cf7d2b1a05ca6c6ec8c8b82bf589897fe85ebd652ad41e4b2b44f0ce345111b83c44f263ffc7eec93225cd96b0479b7548255e3 WHIRLPOOL 6c09b69fe181512d3d9d5a1611bbd886b1f0318af6d41c61a1610ca9f26fbd4820f989e71280abf3f3dca66840cc1186e9bb18d4f3f2b86bb6734d049cc33ac6
diff --git a/dev-python/vertex/metadata.xml b/dev-python/vertex/metadata.xml
new file mode 100644
index 000000000000..903c836f7a27
--- /dev/null
+++ b/dev-python/vertex/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">Vertex is an implementation of the Q2Q protocol (sort of like P2P,
+		but one better). There are a few moving parts in Vertex: PTCP is a
+		protocol which is nearly identical to TCP, but which runs over
+		UDP. This lets Q2Q penetrate most NAT configurations. JUICE
+		([JU]ice [I]s [C]oncurrent [E]vents) is a very simple but immensely
+		flexible protocol which forms the basis of the high-level aspects of
+		Q2Q. vertex is a command line tool which exposes a few features
+		useful in many situations (such as registration and authentication).</longdescription>
+	<upstream>
+		<remote-id type="pypi">Vertex</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/vertex/vertex-0.3.0-r1.ebuild b/dev-python/vertex/vertex-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..d28c67053d4e
--- /dev/null
+++ b/dev-python/vertex/vertex-0.3.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="An implementation of the Q2Q protocol"
+HOMEPAGE="https://github.com/twisted/vertex https://pypi.python.org/pypi/Vertex"
+SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-libs/openssl
+	>=dev-python/epsilon-0.6.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13-r1[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc NAME.txt
+}
diff --git a/dev-python/vertex/vertex-0.3.1-r1.ebuild b/dev-python/vertex/vertex-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..2e568be706c7
--- /dev/null
+++ b/dev-python/vertex/vertex-0.3.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="An implementation of the Q2Q protocol"
+HOMEPAGE="https://github.com/twisted/vertex https://pypi.python.org/pypi/Vertex"
+SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl test"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	>=dev-python/epsilon-0.6.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13-r1[${PYTHON_USEDEP}]
+	|| (
+		dev-python/twisted[${PYTHON_USEDEP}]
+		dev-python/twisted-core[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pretend[${PYTHON_USEDEP}] )"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc NAME.txt
+}
diff --git a/dev-python/vine/Manifest b/dev-python/vine/Manifest
new file mode 100644
index 000000000000..700e4605bb43
--- /dev/null
+++ b/dev-python/vine/Manifest
@@ -0,0 +1,3 @@
+DIST vine-1.1.3.tar.gz 52520 SHA256 87b95da19249373430a8fafca36f1aecb7aa0f1cc78545877857afc46aea2441 SHA512 7652b1527021b2f45f3a372c65a6f196c22edad60ab1e8adbafe7174b7dae912f24eaf34788672c762ea9145ebf3d48265fa4ad99f3084d85769242f4e8bd87f WHIRLPOOL 18e8e6d640612595fa445c1903cca5d5ad79567cb627bb44ce7d10d9e774dfae5f110f40919e33b391b071312f084b1cd29d8c1ed6a73d035093cde5969f1a22
+EBUILD vine-1.1.3.ebuild 614 SHA256 79fb62a92a11484ee6b3725efbc83f387becb35adfc143369a29a8c50360bde8 SHA512 e143600e095e5dd39525dc0d3b7b2d026e8f3f34c6de00864cfed767df73961aa11408010d26857e37c2dc53e1cf6ba3d6fca6549f1a778084e35d78d01dfbec WHIRLPOOL bacea5b239adfa9492d78f6cb3ecc902ad8dace5e48cf1ff4df36475b7689aa95a3fc94938d97a4aef0115c203d939908023887f71bfc30c5eb591377a9afed1
+MISC metadata.xml 336 SHA256 cff65b8f9574cf2bc7bad157c834a578da915de36a521137aedbd76526722c9b SHA512 992b2b4914db3beeba877533b6ad293f6449f230e2eefd8ede373cd1f9ffaeeb79fbb92234434b38c9c392a88e52779e5b0cdc6b4f1e3f69098b7847925ec21f WHIRLPOOL 03e3e42ac20f9aa77aee51b002e4bef0049b71ced80987c7b1a82647f4425880dc183d09e17bb4594aa3f234a5e9c12cc76ab5b6db21d172a5be56a2b1d48e85
diff --git a/dev-python/vine/metadata.xml b/dev-python/vine/metadata.xml
new file mode 100644
index 000000000000..31174101d381
--- /dev/null
+++ b/dev-python/vine/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">vine</remote-id>
+		<remote-id type="github">celery/vine</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/vine/vine-1.1.3.ebuild b/dev-python/vine/vine-1.1.3.ebuild
new file mode 100644
index 000000000000..f817a99b56a9
--- /dev/null
+++ b/dev-python/vine/vine-1.1.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Promises"
+HOMEPAGE="https://pypi.python.org/pypi/${PN} https://github.com/celery/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/virtualenv-clone/Manifest b/dev-python/virtualenv-clone/Manifest
new file mode 100644
index 000000000000..d66d6cc1b0d1
--- /dev/null
+++ b/dev-python/virtualenv-clone/Manifest
@@ -0,0 +1,5 @@
+DIST virtualenv-clone-0.2.6.tar.gz 5691 SHA256 6b3be5cab59e455f08c9eda573d23006b7d6fb41fae974ddaa2b275c93cc4405 SHA512 e4963532a8f954ab9840f9f950ccb9c5a8c2bb863c6b0bc72576e5f464b321ef098f199192dbdbb342a232223be9d47b170ea6222d3ecb5848f965cb5ddf8256 WHIRLPOOL 317737e6c38bf0a55280371b9001e55409990814161b7433df78d1017b50264927946d51eb26dea5e1ae8d2aab7ec5325ef9e04d29a64acba7d91060ebeebea8
+EBUILD virtualenv-clone-0.2.6.ebuild 437 SHA256 f809596676e784e84bde9d214f0ba4429c51fc00717d7c79418069b5b1b58bda SHA512 3de5c8e7e41f1e89e881f3b8b1cd3055019d973a5dbb322b8bec94656f6586d1fad8b5e62dc5697405c1ad9a3f704097ec169d021754b48814eda8798721a234 WHIRLPOOL 4b2eb70428cd058fd45bb55b519be8decdc18a6977b20d8da98e0afac350995ba9457236366bd878cbefe9c5bd0a0a4f031f73a43803d394934ca3b6bb78ad20
+MISC ChangeLog 3031 SHA256 bc2775901b85a6d635be7064aaf3cbb5b638a6ba4817faabf0bf4db425a02c2c SHA512 99b75c6f321547c0a6f6943c2145402039cc2e49d85b66f4c5d4cd37d864e8d3d61fe0b3fa66b0db7b8c08325db2f08f492490fc1c49ee0d4575cd065bb1e867 WHIRLPOOL 603a4bfabef39e0ca68198c2e8761c2647c934f168935d4ebd82de0bbb0133176230eec071edbb89c2a476935062b243780ce302611a3465e8909eb7845ac25d
+MISC ChangeLog-2015 2245 SHA256 c5c982a7a6b638ad3517cfef3081e4af9536faf2f9a22d9653307b122d02b541 SHA512 f71f1475d2b5c8e18a0e7f6da5359eec70e432405ac1137dd52e680ccf5249a78356e02eae991bc0c31f81d3b810c0ae2e0257dc32baf0803dc8f96b03be881c WHIRLPOOL 68b2ef4337730f161297a43fdf07299c693c9235c7c6ee880ba307378de895bf9ae6a55ba9fc9e464e21da71900a35219f82343890c47d3b5c1b5d4d45e85f93
+MISC metadata.xml 400 SHA256 bf55b839c994524aeaa96a37190947eddf986aa2e8ca2e32ee12bcae3b94d41d SHA512 da2e494e64d7692828f26fb9162641fd112e6e56b5e00facad571c5ded25157741bb9e27fc3296f2ce8b7f0c2c12de144b7d5240bf301713b346131fd7b47573 WHIRLPOOL 3c564a09d8dcebcf7db2f6b88e392f31b3024a8d37fffec77af7cc4b8a47f7bd65aecbce468e6e7202a0ef95187db8b953e952246b4acc27a2111429d6f28a4f
diff --git a/dev-python/virtualenv-clone/metadata.xml b/dev-python/virtualenv-clone/metadata.xml
new file mode 100644
index 000000000000..13775478268a
--- /dev/null
+++ b/dev-python/virtualenv-clone/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">virtualenv-clone</remote-id>
+    <remote-id type="github">edwardgeorge/virtualenv-clone</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild
new file mode 100644
index 000000000000..e9804801e39c
--- /dev/null
+++ b/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A script for cloning a non-relocatable virtualenv"
+HOMEPAGE="https://github.com/edwardgeorge/virtualenv-clone"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
new file mode 100644
index 000000000000..8da90ceae9f4
--- /dev/null
+++ b/dev-python/virtualenv/Manifest
@@ -0,0 +1,6 @@
+AUX virtualenv-12.1.1-skip-broken-test.patch 542 SHA256 ee5ddcab19b1811991aeb55c58c118c593afe2e8d21ebc600ff2123e8d72e3ea SHA512 9517f2efccb3cd177370cf66ea12244a39e762aae64e9bd412fc05af087648066deaf62d381b52a0eee1487c82109df4bd463599eaa641890c32eec48b694f25 WHIRLPOOL ca02bb2845cc4b26a8192ba2d1fb74c540c2ff55643ec4799d845a8f68b627dace367c4cba2b8ff04de9e7484a87cfcf76e0ffd262480a96539894e2f9b8bebb
+DIST virtualenv-15.1.0.tar.gz 1865011 SHA256 aea627d114a3863d6374c5a3fc3cdd08907e0ac951cf93b458e5ba5998c516de SHA512 46c313fe855483cf42def0ddb319df7513bb00ea2c1570efaf1236b4e0074df40d574f3858a3d3760db988b9021ca2046c40a355cc5a3ae32a2802d6120bf255 WHIRLPOOL de8dd66fdd004ad9c8e866eaa7bcd701b16b6f7c185ebe73a7681b3600ae4f55996b9f8e321ef51bf85046283a2e4bf948ffe2b10218190ecb334351f92c57b3
+EBUILD virtualenv-15.1.0.ebuild 1215 SHA256 44a543986acf6aad7a389d770313cc273beb0bca65c3928b9d5aa93ff8ebad07 SHA512 672d740ffa4d27c789f8d9739d73d9e434a1bb8dc08c93c65ea08bbcf9a17b265660d53d9193adb651a2610951abb9ad8c7d7c6ee5106675e1e1c4bc1f7ed94c WHIRLPOOL 02e93714b1a6a5aeaed82602d8b85ca22a0ae73662404ec43cd9df63708d857b45ab0090db757bd1ac66ade47be9a4955d2a4d3769704863d4ee9ed952fe5e18
+MISC ChangeLog 9498 SHA256 8c9284a8d028d8ad21c13382957f00ad0b7869fcf7ae25b362e91f952cde3cc6 SHA512 39c91c65c1725a84afb5af9aee4665d0877543c1fcab69de7b9e883587fd2f9848a6025ebc680d9ebb0729cd00113d295ad4a8f8bb24517d207fe0d53f8c60a8 WHIRLPOOL 447ec53a560e8503ad891f380ccc58aab78bb9ced969e5ccf3f4d4a796f2491a84ad5b0818376268ecdd69151bb3ef07f0fa09ce83354ee175c50cc11e433967
+MISC ChangeLog-2015 20365 SHA256 cfd9a90e1fa5020c2ac9ba5431180c71efaa618cfeca2a3e9e77d1c664f63354 SHA512 d782437650dfa97b5766aff9e500317cd1cf56fd72a989aa12f105ecc458a17be9390eb6fd39b27e7fdf3d6f23f82af441b9fe095b66b6c9e64968f6bf53ba04 WHIRLPOOL 9f10fbd0e86872b8e56f2fc7b8f1a22619a3f2e42f3b299cf19238e32514f7bc52b0890af9d245cc7fc445c39b0c2727999c902fbcd05898b1b6d81b5a5d04dd
+MISC metadata.xml 380 SHA256 41d3a6c0d065c0b380a019df8154c3bb0fb18978f46d4d753aee37e5e8f25375 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824 WHIRLPOOL 9fcc5967344f94cde2a4926a60f7b13c0cfb98d6b537c9739619588371bcc9ff8ada58b3ffc77474f947eeb96306a2fdbcb707f7ff0e71751b5a9d364c267300
diff --git a/dev-python/virtualenv/files/virtualenv-12.1.1-skip-broken-test.patch b/dev-python/virtualenv/files/virtualenv-12.1.1-skip-broken-test.patch
new file mode 100644
index 000000000000..5c14c3e22850
--- /dev/null
+++ b/dev-python/virtualenv/files/virtualenv-12.1.1-skip-broken-test.patch
@@ -0,0 +1,19 @@
+--- virtualenv-12.1.1/tests/test_virtualenv.py
++++ virtualenv-12.1.1/tests/test_virtualenv.py
+@@ -6,6 +6,7 @@
+ import tempfile
+ import pytest
+ import platform  # noqa
++import unittest
+ 
+ from mock import patch, Mock
+ 
+@@ -126,7 +127,7 @@
+         shutil.rmtree(tmp_virtualenv)
+ 
+ 
+-@pytest.mark.skipif("platform.python_implementation() == 'PyPy'")
++@unittest.skip("Running create environment while testing is broken")
+ def test_always_copy_option():
+     """Should be no symlinks in directory tree"""
+     tmp_virtualenv = tempfile.mkdtemp()
diff --git a/dev-python/virtualenv/metadata.xml b/dev-python/virtualenv/metadata.xml
new file mode 100644
index 000000000000..6c60307811d3
--- /dev/null
+++ b/dev-python/virtualenv/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">virtualenv</remote-id>
+    <remote-id type="github">pypa/virtualenv</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/virtualenv/virtualenv-15.1.0.ebuild b/dev-python/virtualenv/virtualenv-15.1.0.ebuild
new file mode 100644
index 000000000000..838dca237b08
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-15.1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	http://www.virtualenv.org/
+	https://pypi.python.org/pypi/virtualenv
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( docs/index.rst docs/changes.rst )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-12.1.1-skip-broken-test.patch
+)
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test -v -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/virtualenvwrapper/Manifest b/dev-python/virtualenvwrapper/Manifest
new file mode 100644
index 000000000000..8a879058e22c
--- /dev/null
+++ b/dev-python/virtualenvwrapper/Manifest
@@ -0,0 +1,5 @@
+DIST virtualenvwrapper-4.7.1.tar.gz 89930 SHA256 3bf73ede42a689adeedc8ac85662cb539665d3d029459bc8d3e6835ecd81ffde SHA512 f972179992728b8b600388b34562fa9de355f526e4ee25ea88840700a57f196a60eba91ac3137e7d826925c7a8ade7479af383bcbfb8b9b837d0a374b8b3c4fd WHIRLPOOL c56cab31ec89b8dd5bfeb7949f72b2d5c5e6f40543bc7fa960b03edcc9d3c2ec095335eecf0b40adcc0fd1c92efc1e760748db772a3da0c44591ed7de5248880
+EBUILD virtualenvwrapper-4.7.1.ebuild 1038 SHA256 64d9b7b5e73bf10f727dfe1be8edbbc14019c2689f4df788f97a3d0849555325 SHA512 a5c1db1843a440cf3069dd32d1a7fe0b4335be16cb8f38cc6c8832105ff43741a76445195c27479187edb7538d1b55a7cef1ad0bae39a7435c3d032dccf59de8 WHIRLPOOL 242ca1320fdbb4924905f7e798e2ea32845e18a7935c997d7aac3e0782a1c9de8f14db3fe1b4bcf96c20222cbcdd9027054b9a9f814d3a06754613a96da0427a
+MISC ChangeLog 3946 SHA256 41858a5aafb5e766d362c248f9f29eb792226affd33529227bb42515aacb8a97 SHA512 717dab7e0b358ebd7c59b863b11e69a3e79c24c837b9ca92b8478e2ab745ff56a9ad1754c48c3d1527c6b59bd7db99a1f973f871e451760917360b45096547fe WHIRLPOOL 70b9f145449c49a095d138f8771aaa8db30a02cc166cdd86e6ab84b16c47dc928c9b0498c6da29f94bf00a7db9bfc56e690fb2a6732e15e74e6436f0cbf275d1
+MISC ChangeLog-2015 3582 SHA256 66984f21344d3987ae7e3a9f463c49ae31f9f46c59e60cbb083e5c3efa2c8478 SHA512 0730aa4399704f0eea24b4daf873cc9814308fdb489a247687fc2029e63074b347be6ce1b622a5bad883a010d224891415cd577ee40868a67f090b6e7c8032cb WHIRLPOOL e7fc9f261d6cdfbde6fb8249bcae91276a1be731f642aecef5d02d20a79c383aa789da001eb405918745a21b7a7e03f965dbee23051a85a0de5f3de90de8497d
+MISC metadata.xml 320 SHA256 d50761613945142dc09c471e00cc207cccee654ccb36f5b96fc52bc9256a680d SHA512 dd5556b6b8cc96882032b3b00de65e2ca95cc0ee93c00639f1537e4abd31cc14022e2b61cb04f12b53480c273ef9be269128c4b683a9774590b1cdd552582386 WHIRLPOOL e153fca5cb0253cd196bc416e38c2fc3252704c8a810de41a80bf5c2ba521a3844ebc6f9b61438de62bedc0847c8e7cbf5ff3c45ecca778ea194b798f219b0e5
diff --git a/dev-python/virtualenvwrapper/metadata.xml b/dev-python/virtualenvwrapper/metadata.xml
new file mode 100644
index 000000000000..1c5324be401f
--- /dev/null
+++ b/dev-python/virtualenvwrapper/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">virtualenvwrapper</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild
new file mode 100644
index 000000000000..6e8c82709c56
--- /dev/null
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool"
+HOMEPAGE="
+	http://www.doughellmann.com/projects/virtualenvwrapper
+	https://pypi.python.org/pypi/virtualenvwrapper"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+# testsuite doesn't work out of the box.  Demand of a virtualenv outstrips setup by the eclass
+RESTRICT=test
+
+RDEPEND="
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-0.15-r1[${PYTHON_USEDEP}]
+	dev-python/virtualenv-clone[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]"
+
+# Keep just in case
+python_prepare_all() {
+	sed -e 's:-o shwordsplit::' -i tests/run_tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	bash ./tests/run_tests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/visitor/Manifest b/dev-python/visitor/Manifest
new file mode 100644
index 000000000000..b8429412431e
--- /dev/null
+++ b/dev-python/visitor/Manifest
@@ -0,0 +1,4 @@
+DIST visitor-0.1.3.tar.gz 2985 SHA256 eaefe1cfc3b40b2a54579b028230a1ea1cf1cb884b7a347b7350a18cf37e8019 SHA512 414c77df8efcc22df5ee8073e02b8c5c28563954ef9b9a869c4ea3f7f1268a97929c1fe29142ba41e3a5acafea52599f6bf073aacd654643d7d8380cd4f41fbc WHIRLPOOL 6e436e9d8e8d68ca3d891022eb8c9c2182ec3c37d24cf543aefb78330f7d5fd1c4363f4a6b9a16c5a6bd8c63d676a27aabf770d27a266f4c8f4f7e4b22bf91ed
+EBUILD visitor-0.1.3.ebuild 710 SHA256 e21ed63a85615630f8d8e135ceaa5dc905829aad203acd3fafa0bedc1ea6a7c4 SHA512 59efc119c4d4908349134c74c0b00338f2ee56b62fa82c320f5108880839ade114ec71635bcfd19b628ceb8359a56745e6d3cc0d82aa215fd2a7b4ee2a1fb9a9 WHIRLPOOL 4042c2256efa58c519824d23e75d8fb1c204f6184eb18cf9bbfff85b016f6996f0a5f7243c91e3ea50825d38be3376eeff54896d0fd80ae9e997e42a6edc05af
+MISC ChangeLog 963 SHA256 dae326cbfeb6b55f7881d1bba247978ef49c9f3b942f0d5a1a16c0e9304c6e18 SHA512 218124a35f6f2cd1d799143ab909e3ecb86b2ee4255728142cb7a9913437a84803f37e4d68f7171deb47dead4742d1d32e6deb9da9a38ca37e9c58c35cadde9d WHIRLPOOL 0c024eea2d4e09f358d83cc1d52f4e9980bbe20dedccca92397a8e72e4a1e16375b855317dc51ad9960858fb51dc492ddbd17a918292e66b7bf58fddeacbd6cd
+MISC metadata.xml 549 SHA256 e26723a95120a4ca7201adfa574cd5bbc53cfff38d7fce40ba870e75477da2d6 SHA512 c492e7e62104525a743d8e07de51b82fd44d07a29d57ed20467da0f79a429245e1676ccbda789f0510e3f3215e90fc000b9dd882239b2eb3bebde9f03e71bade WHIRLPOOL f541221202b5145c20fe84c209f1e49b1bc0f228376da8a97b78993378c833622385a44531ff5742021b3fa68516268b69331a138d80aca82e9829b7f3009cdd
diff --git a/dev-python/visitor/metadata.xml b/dev-python/visitor/metadata.xml
new file mode 100644
index 000000000000..38969880dd20
--- /dev/null
+++ b/dev-python/visitor/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">visitor</remote-id>
+		<remote-id type="github">mbr/visitor</remote-id>
+		<bugs-to>https://github.com/mbr/visitor/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/visitor/visitor-0.1.3.ebuild b/dev-python/visitor/visitor-0.1.3.ebuild
new file mode 100644
index 000000000000..a29aadde8829
--- /dev/null
+++ b/dev-python/visitor/visitor-0.1.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tiny pythonic visitor implementation"
+HOMEPAGE="https://github.com/mbr/visitor"
+# PyPI tarballs don't include tests
+# https://github.com/mbr/visitor/pull/2
+SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND=""
+
+python_test() {
+	py.test || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/visual/Manifest b/dev-python/visual/Manifest
new file mode 100644
index 000000000000..c3f1a67af07a
--- /dev/null
+++ b/dev-python/visual/Manifest
@@ -0,0 +1,6 @@
+AUX visual-5.74-boost-1.50.patch 860 SHA256 3b910d73e0df7b015640090c31362484e039e6644bc551c10d3879f80c4d3c6e SHA512 cbfc6596431cc402e1d5cb767b663856b540bf378aac3f5680f310391f8704852331927f607fcb78c5b7ea2e9dcbcd77e8e0bd007a5332be0484675eb67d1b31 WHIRLPOOL 119a3777fd4e6a5860d58a9b53827978aea662631e93f998bb196c567a90ebf07c6dcd669aaec35d64e91c8a57fa066e8dae289a1d72a56ab766513888f932e3
+DIST visual-5.74_release.tar.bz2 5736404 SHA256 1e480d3fd82e8172021ae0e22e8e2859f44bec9297e12ebf672270fd8e7d7099 SHA512 eff43bae66d4ca6a1b540e729b5f03e7310db8d4c49ba7a1ac271afa62688d9024f4f00b7678669433ca3f0f6e13e6c0c3de90a4a845ae5eeaa70b536a6e1193 WHIRLPOOL d0c35354e8fcaf591870dce867e60a9b54a9eb31acdd6eb05331566c031bf0a7da794e7f9dc8e013eff10583eadccefda08ef79443761129d9ca56f05626acd8
+EBUILD visual-5.74-r1.ebuild 1892 SHA256 704d6275f9c9085eeb27b27a77a70b697ee4fe763e216747c5a24b48ea0e581d SHA512 eca07a30198a5ad261d65729b5953c6a74b4526f9a7ebecbef2ba142f99b3397d4a10560864096fe60a57d202e80094c821b23151ecdfd726421ee90bed6c35d WHIRLPOOL ebf074e609d03564d968307a8d8f231cd9079e92004e22ac676e4a55237a3f2fc4cc59b0b10d618d5ec761c1dfdb5f600fff17694af170d0292f82e98b3a58c6
+MISC ChangeLog 3663 SHA256 b211e7d221e01b11f36aeb3c59c53225d6c36b34058fb3ddf0bae973709949f3 SHA512 239b902dc667ee65ab0bd000c13532b585b0dfff997d2a00a40c073ff9f2fc248a69b2f0057751476e892f730c500c5c0d47deb2113b0029e5bc45da2b3f5fe6 WHIRLPOOL 4e904e4aedc8e48b93929adc6cadad05a0db2e72c13f96d15faf962f7c78941ac21c61495327fbb17918e0616397d27d06f69c42493bd3a6d481c0cc305fb6b9
+MISC ChangeLog-2015 9133 SHA256 df35f1e6381b7feae9555e50087ec9bfad9a57729a138f07f2f4dbf26ce8eb7f SHA512 1ac20d7c232c916ed3db058755f4d6dec84ebadb4df4ed8dfb4cc708d6b4f6b3500b8ccdfb339be83795053077e31d01b09407723e04891dc3a70a8dcd1c8a66 WHIRLPOOL 8d50e48ec91748ac952a89edadcf706ed4aee330133f4fd1d167cfa2516e69bd1ea5ac28b1e2fa95c0e53305849f700f940d22019e810c7be7486b3d0b01a206
+MISC metadata.xml 246 SHA256 634432e12556106844e569b7ff16962881c6e70887e6fc9650bdd82deb51a834 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc WHIRLPOOL 869ef1c8e23bdae0a11b44ccf38ddec23f0dc0ae2573bc83ccbe2d8a2c6bf5a3f9c3c52149aa2e3690dd66f7fc7ec498f2eb6b9d338440fb54c12d5ac0b9fb7a
diff --git a/dev-python/visual/files/visual-5.74-boost-1.50.patch b/dev-python/visual/files/visual-5.74-boost-1.50.patch
new file mode 100644
index 000000000000..a66ded258987
--- /dev/null
+++ b/dev-python/visual/files/visual-5.74-boost-1.50.patch
@@ -0,0 +1,28 @@
+https://github.com/vpython/visual/issues/3
+
+--- dependencies/threadpool/include/threadpool/task_adaptors.hpp
++++ dependencies/threadpool/include/threadpool/task_adaptors.hpp
+@@ -135,7 +135,11 @@
+         if(m_break_s > 0 || m_break_ns > 0)
+         { // Sleep some time before first execution
+           xtime xt;
++#if BOOST_VERSION >= 105000
++          xtime_get(&xt, TIME_UTC_);
++#else
+           xtime_get(&xt, TIME_UTC);
++#endif
+           xt.nsec += m_break_ns;
+           xt.sec += m_break_s;
+           thread::sleep(xt); 
+@@ -146,7 +150,11 @@
+           if(m_break_s > 0 || m_break_ns > 0)
+           {
+             xtime xt;
++#if BOOST_VERSION >= 105000
++            xtime_get(&xt, TIME_UTC_);
++#else
+             xtime_get(&xt, TIME_UTC);
++#endif
+             xt.nsec += m_break_ns;
+             xt.sec += m_break_s;
+             thread::sleep(xt); 
diff --git a/dev-python/visual/metadata.xml b/dev-python/visual/metadata.xml
new file mode 100644
index 000000000000..e24dd86faa2a
--- /dev/null
+++ b/dev-python/visual/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/visual/visual-5.74-r1.ebuild b/dev-python/visual/visual-5.74-r1.ebuild
new file mode 100644
index 000000000000..3c771156efbf
--- /dev/null
+++ b/dev-python/visual/visual-5.74-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic multilib python-single-r1 versionator
+
+MY_P="${PN}-$(delete_version_separator 2)_release"
+
+DESCRIPTION="Real-time 3D graphics library for Python"
+HOMEPAGE="http://www.vpython.org/"
+SRC_URI="http://www.vpython.org/contents/download/${MY_P}.tar.bz2"
+
+LICENSE="HPND Boost-1.0"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="doc examples"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-cpp/gtkglextmm-1.2
+	dev-cpp/libglademm
+	>=dev-libs/boost-1.48:=[threads,python,${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/polygon:2[${PYTHON_USEDEP}]
+	dev-python/ttfquery[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Verbose build.
+	sed -i \
+		-e 's/2\?>>[[:space:]]*\$(LOGFILE).*//' \
+		src/Makefile.in || die
+
+	epatch "${FILESDIR}/${P}-boost-1.50.patch"
+
+	sed \
+		-e "s/-lboost_python/-lboost_python-${EPYTHON#python}/" \
+		-e "s/libboost_python/libboost_python-${EPYTHON#python}/" \
+		-i src/Makefile.in src/gtk2/makefile || die
+}
+
+src_configure() {
+	BOOST_PKG="$(best_version ">=dev-libs/boost-1.48")"
+	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
+	BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
+	BOOST_INC="${EPREFIX}/usr/include/boost-${BOOST_VER}"
+	BOOST_LIB="${EPREFIX}/usr/$(get_libdir)/boost-${BOOST_VER}"
+
+	# Specify the include and lib directory for Boost.
+	append-cxxflags -I${BOOST_INC} -std=c++11
+	append-ldflags -L${BOOST_LIB}
+
+	econf \
+		--with-example-dir="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		--with-html-dir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		$(use_enable doc docs) \
+		$(use_enable examples)
+}
+
+src_install() {
+	default
+
+	dodoc authors.txt HACKING.txt NEWS.txt
+}
diff --git a/dev-python/vobject/Manifest b/dev-python/vobject/Manifest
new file mode 100644
index 000000000000..79cbf6cd2cff
--- /dev/null
+++ b/dev-python/vobject/Manifest
@@ -0,0 +1,5 @@
+DIST vobject-0.9.3.tar.gz 57744 SHA256 cb79bd61cb54e222496278a90d9f6fe6fc0640ab2c4163f3fbc2942372d09d21 SHA512 d77dac2e885ea752e900a2f6e3d9cf24fdd3365d1e9e2ba51c5c38b2889a62aaa61e5562799eb8063b5d4ded0bcd43108cd7e5d028cf7dbe72008b208b8e2e76 WHIRLPOOL 0776eb5d0e68a1f12b001f55e5ec0032d722f23e2654c6c8f44cd0f23d9e299b7615094a16f8eff431de08ea185300185ab39c49762564db1d95cfdcea144445
+EBUILD vobject-0.9.3.ebuild 784 SHA256 c9dbd3fcdf09db73544bfc9d5cfca51dd1a558c49ad1b38dd9727cc2119e3b43 SHA512 b5ea279b288290184a0eb28ff7de1453b26d23fb125ae5a28ae133bdaf808cb223fa73b4797578b530075516bbd36e63fbd4c9c9933ebf5e61e98cf3dd3a1380 WHIRLPOOL ea5a7a8639a1b47298e881affbac523533ec2db5d77d1e4b1315a603c61f4565686ec318733609c2f9eb000ed61bf3249466fb21c78b8a3d2c7427559d40b0bf
+MISC ChangeLog 3738 SHA256 350489117cb32491a0a1c8fa37fe54248c9616f0ddbb0f538bb2e6503c1e58cf SHA512 f82cee405a34bb11e9afca9feda510cfef27dba8abfb32a9544930ab6b9e9ee14d0890d483fa3a26d3c95fef7db2b2228e5fa6f8b8dc735749c2430aa6243c6f WHIRLPOOL 7c12503e0aae3cfbe294eeb2ba2da4a8d5b4f68b8276537fdb6658c0692a970d9f572609ef182fa6ef7de271ce02e74cf9b8b79901da5660bbcdb40b6bdbb065
+MISC ChangeLog-2015 2799 SHA256 7725423ee54831998d8b991fce70c99cfe1e20642bb55ae41914367d8e3fab91 SHA512 df06e00b2a7715e7c29aafe2dc1391b90514d9020aad64cb65c45af14b39c183dfc7661089f6f01f2b200017bdd4e8ac70d220a07ccd79be808c722075aee05b WHIRLPOOL 35a6715cb7f7bce89a630b43a29258e6f50ea7ad038ad564ba8dfccdb9bf5b7ac231226838527b1184a0220c48ebbdff1ce17437bc440ab2a20437169c630997
+MISC metadata.xml 322 SHA256 cab2578d0870fbab4607e10a8febd050bbfe35fc655b8c75822acd159311f60e SHA512 d50380968c2886e5fb7971f90ee38189b9f325513eb0e0e039638ec0b466b3c54c20be5ac056a49fd28923e061d658200898f26850dcbe2c0d58114c0b732a02 WHIRLPOOL 4e977f40d70f1e1add3858856854e65a4ee54b8c855305a3318593137135624f1c6b783eee492645ac1c812f40977405cbe126dc6941390c0fe1d02fbb33a17e
diff --git a/dev-python/vobject/metadata.xml b/dev-python/vobject/metadata.xml
new file mode 100644
index 000000000000..b83ddeac473e
--- /dev/null
+++ b/dev-python/vobject/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">eventable/vobject</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/vobject/vobject-0.9.3.ebuild b/dev-python/vobject/vobject-0.9.3.ebuild
new file mode 100644
index 000000000000..3ac69355122b
--- /dev/null
+++ b/dev-python/vobject/vobject-0.9.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package for parsing and generating vCard and vCalendar files"
+HOMEPAGE="http://eventable.github.io/vobject/
+	https://pypi.python.org/pypi/vobject
+	https://github.com/eventable/vobject"
+SRC_URI="https://github.com/eventable/vobject/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools"[${PYTHON_USEDEP}]
+DEPEND="${RDEPEND}"
+
+DOCS=( ACKNOWLEDGEMENTS.txt README.md )
+
+python_test() {
+	"${EPYTHON}" tests.py || die "Testing failed under ${EPYTHON}"
+}
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
new file mode 100644
index 000000000000..91688f381fcf
--- /dev/null
+++ b/dev-python/voluptuous/Manifest
@@ -0,0 +1,6 @@
+DIST voluptuous-0.10.5.tar.gz 41436 SHA256 7a7466f8dc3666a292d186d1d871a47bf2120836ccb900d5ba904674957a2396 SHA512 2024121c56a91cc3bf5102ca68f8347461b2041da9a352eade0e0ce3657d9a477a60a7a5823e8f3628eee7b327840b5c4eba13c106ea49ea91a553d6b5edd363 WHIRLPOOL 1c98847ba5331d198ef997a379ebe369931a7a19a4156dafe5b4475501724f888feab26a7cb30e5d1bda6d27c23e9f259933bf121f385f5b400deac273e9f2c0
+DIST voluptuous-0.9.3.tar.gz 34097 SHA256 ed5a11fda273754caabb6becd5fe172ee2621cd2c8ff8279433173bb7b0ec568 SHA512 1c82f9fdca1751fb3e5fa1a0c956e40e3c5ba76623a97f38dee7511c4dac430432f8f0469e1b08d6057056905643f98cc5b19c040386eb5c897dec1940c4eb45 WHIRLPOOL 28c93db7c36af86bb92635852a2c4e0fe62a42a0eff30d2d019ca54c4541f27fa13ef611a77da0ba6d8393eaf807911d8abd62a35614c3a7b7837dc3a343c927
+EBUILD voluptuous-0.10.5.ebuild 526 SHA256 9feff9979b0ec01bac42fa9e94cf0f79bdfa89141c9d1b33802d6d0d9d1d84ba SHA512 72af81709edde0c895c8572370fab008933c8c3a00ba37883be2a38c0fb98b5159bcf86940e0d4ae93359a7a5a996fb55445b86aeef1caa5483ebbc1a4ff25ae WHIRLPOOL f75015f0d707e2bdd9fced6655e77fa287a8fe0d9b44f4df0118f365966a9ae892d4369df3d5665bf7e47671c657025aa0db7f85e6e05b0c3cd8114ae3003999
+EBUILD voluptuous-0.9.3.ebuild 526 SHA256 9feff9979b0ec01bac42fa9e94cf0f79bdfa89141c9d1b33802d6d0d9d1d84ba SHA512 72af81709edde0c895c8572370fab008933c8c3a00ba37883be2a38c0fb98b5159bcf86940e0d4ae93359a7a5a996fb55445b86aeef1caa5483ebbc1a4ff25ae WHIRLPOOL f75015f0d707e2bdd9fced6655e77fa287a8fe0d9b44f4df0118f365966a9ae892d4369df3d5665bf7e47671c657025aa0db7f85e6e05b0c3cd8114ae3003999
+MISC ChangeLog 1089 SHA256 06656c11a9870c88c500bba28eb086895bfced915f4f0454126f5cdc40feeafb SHA512 62760f328d8b8da163a295955ffe13b8d29710dde5ea62574676162f56b444743a3a01c5d71e73e439618a957583199399dcd4b4cf148d2c3d5aa0e0a8551a71 WHIRLPOOL 3b9e4512f02b0b908ff524d827442219cb732031c8c7f300e49445beef1b7ee482c7120ed173b5e9d1e9b50ad89c7501c741ddf8be78556fddb99a3d5bab3608
+MISC metadata.xml 590 SHA256 d4a9831261251504f34247591506f1f5b15546796e6af91e9dbc2e20b11f0242 SHA512 ff4732c5a379f2607a97a45c56def4955bc542446c5545ff807138eed3992d71ffd4b3638f122accf1a272537c071ab0304717a43706efef191dfc7b35422bab WHIRLPOOL 3ca48a8b203e6563b6393555863de5962bd500f1eb70374d1e8fc633af09aca6dfc2b2ba67bc1380e72c16e7162ebaedf703357c3de97344f6065274a4270554
diff --git a/dev-python/voluptuous/metadata.xml b/dev-python/voluptuous/metadata.xml
new file mode 100644
index 000000000000..b46a8cbabba5
--- /dev/null
+++ b/dev-python/voluptuous/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		Voluptuous, despite the name, is a Python data validation library. It is primarily intended for validating data coming into Python as JSON, YAML, etc.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">alecthomas/voluptuous</remote-id>
+		<remote-id type="pypi">voluptuous</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/voluptuous/voluptuous-0.10.5.ebuild b/dev-python/voluptuous/voluptuous-0.10.5.ebuild
new file mode 100644
index 000000000000..0e92b05a57c3
--- /dev/null
+++ b/dev-python/voluptuous/voluptuous-0.10.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python data validation library."
+HOMEPAGE="https://github.com/alecthomas/voluptuous"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	unset PYTHONPATH
+	nosetests -v || die "Tests failed"
+}
diff --git a/dev-python/voluptuous/voluptuous-0.9.3.ebuild b/dev-python/voluptuous/voluptuous-0.9.3.ebuild
new file mode 100644
index 000000000000..0e92b05a57c3
--- /dev/null
+++ b/dev-python/voluptuous/voluptuous-0.9.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python data validation library."
+HOMEPAGE="https://github.com/alecthomas/voluptuous"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	unset PYTHONPATH
+	nosetests -v || die "Tests failed"
+}
diff --git a/dev-python/vulture/Manifest b/dev-python/vulture/Manifest
new file mode 100644
index 000000000000..f2d9998eba06
--- /dev/null
+++ b/dev-python/vulture/Manifest
@@ -0,0 +1,4 @@
+DIST vulture-0.10.tar.gz 10205 SHA256 9c2dc36b84f3729361990b4488b7fde1cbe5afb9e3b59456aafc6928684fcd4b SHA512 05ec640a02de63e0d0dc8e4468e2be117ec2f0289918e58ef18b11ad58be1f753c32d892305c2a197d3048cdf253b4fda376cdf21b51078291d8297336134201 WHIRLPOOL b8012f346b904f38e97ae0e5833ce658c9e163694da87bc024351bb422e3a232ee011035f511b19d98c6aeefbe61eb6905af6e663d811196f277817d2e817d50
+EBUILD vulture-0.10.ebuild 486 SHA256 46342b702c46a820991117fe1a0cd2a6f05c8ebe1d4337fa54d2c53c411ab5d8 SHA512 8b9ebfdfa3f3f40efe6d3b85c36ce9b567bbe3609d1b0b9a60de08338f0f62296ff695910b0355f670cdc3efe29ed6f2cdad9a208faa2111310d1f264536fc80 WHIRLPOOL c018f9e1a2ad828fc96fc5e9b0d3dbb3659ec578b60e0335b428d67a7e79007267ae8cc0a086ea2797fdea142a72d45ffd277a1290e419aa70dfa0eec1ff403f
+MISC ChangeLog 944 SHA256 052822557f3712974dc9d6211453b2342783cab2144460e66155d33f56fa2848 SHA512 65066197b0e38ae429d64357eb8818d3dcd81bda0e04a51632c8c78169d50fb193a5cc21a5f7d11c1c1e3145914962c4b3e5054ca2d7edd68e69cc5f5e8e98c3 WHIRLPOOL 8d8a3fd601294ab40e1ea129bd222b02520ed6f22d80843f7587e320149492a4d36489659cd1f6c5812271cd1b40cb5cdb18b1c7962ddc562f5f0c82056620c2
+MISC metadata.xml 365 SHA256 0f4bb5d7191aa21f9d4f526536da6f5a25dab7ee0a6c9227ba44401b1c5e3e4d SHA512 2666f1863c8c0c13545237de3ea5ed8d8549bbc5408680999b0b499087fc5619e68f54c36754ed6faf79f3cbba305462b933bd3d21b7f8e82703085a3a10d871 WHIRLPOOL 999396fad1134d094b64b66f522fafef845b5f2f181a23416eb0b05572cfae06e575caf2a26d0f7612d6284313d6105cdee694dd953e5e99eef51cd3f124c997
diff --git a/dev-python/vulture/metadata.xml b/dev-python/vulture/metadata.xml
new file mode 100644
index 000000000000..7aac2a8b24c7
--- /dev/null
+++ b/dev-python/vulture/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="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<upstream>
+	<remote-id type="pypi">vulture</remote-id>
+	<remote-id type="bitbucket">jendrikseipp/vulture</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/vulture/vulture-0.10.ebuild b/dev-python/vulture/vulture-0.10.ebuild
new file mode 100644
index 000000000000..ed993b7fea13
--- /dev/null
+++ b/dev-python/vulture/vulture-0.10.ebuild
@@ -0,0 +1,19 @@
+# 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
+
+DESCRIPTION="find unused classes, functions and variables in your code"
+HOMEPAGE="https://bitbucket.org/jendrikseipp/vulture https://pypi.python.org/pypi/vulture"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DOCS=( README.txt NEWS.txt )
diff --git a/dev-python/w3lib/Manifest b/dev-python/w3lib/Manifest
new file mode 100644
index 000000000000..5205fef594e4
--- /dev/null
+++ b/dev-python/w3lib/Manifest
@@ -0,0 +1,7 @@
+DIST w3lib-1.13.0.tar.gz 36757 SHA256 72739cb480413a1d2cf176942986a2b9113411166ac81f2551e5f5eecc383a84 SHA512 813a709ac20d5b7a3231a2f2f2336de574f1aa9eaa005bc60eb0e79d56a71f8ca88c6b793692eb26950c2310a23d27963b4bf36f8857bf6ecee9bda50fecee42 WHIRLPOOL 33d497e60c3f2c635d81ea36e00dcd8d6867c69ed4af5d5a95ba7df355dd1aeec6bedd1f5abfd86d2da79d9e70b142dc88c9dedaf76dd28390a831094225e055
+DIST w3lib-1.17.0.tar.gz 30357 SHA256 d8c654827fcf92ba4d7111f8588d2eff8653c5580c27ca61b1bc7805c080506f SHA512 a131e1671e27d34c77ff62ce17aa1d28461d12b66e1fef4f4410d061f2a75ee4cdbbb447eea16c265ca6e4f1da2e72c8cf30f87fe1a92a8f3f70df036b4b2c96 WHIRLPOOL bfd67603a0089679c9e454e950e98ffe85fd51862a64b8b5bba6c40eb446e1a5735144a7ddaf613f2ef0fe9baf6004e1157b8198034f75cd9314dc00f6adaa39
+EBUILD w3lib-1.13.0.ebuild 486 SHA256 1193f76523eecd2e1c3ab8485546fa96f112deae016108493d2dc349edb868e0 SHA512 a395d62b92923b6d57aae218ddc86133344433bf9b2b6c8ed9836199aca9e4cd4fc5415f37858affb74b82f81f8b2ad3e1cf57e2e72bc0513706d513bbcbd89b WHIRLPOOL 3a0f8b0c2d6832710b27ad767f4a5479ec8b3948738c102eb76d2e69c78a58809eae3e810d062be8761a8836e2f2f94c6dad1106e8e77ecdbb1d271db21ff7ea
+EBUILD w3lib-1.17.0.ebuild 627 SHA256 9d0308c78167b23bae4d95e243716015db1d9460700bf0d4b9f4a48c5b0a8104 SHA512 dc1773c28f556b5a1dd7b6738c9459c1df56fd4d6ea2d84435020aace286ac7e78148266db791ba170f6abd63a8d64a8eea484a43f3aa9d7f68011af3dadecd3 WHIRLPOOL dca9ceffff1824da291362b2f3173ea21808d203c94dac7405b10d36ec7e547e3ff3808e213ece56c2ea427b243064100d3bc4655b963bbf8a172dbd914f1769
+MISC ChangeLog 2861 SHA256 c81f8fbbc28b5ff3552299e973f46b8a99fa621c517dd1c146ad53a9e1c4bc3b SHA512 ad1173240a006760134dc6d2c29cb8bf2811fdb3e1e2f69901f7671ae77a7124703ae1affef0907218dd5f437aa48ba72d333a55cef4939d311953bf382f526f WHIRLPOOL 5bb28e35e87e777293eb648305aeb6d795f5190560a1fef5c2f42f5dd01deffc43368538f29ed16807e315247d38be256006e8b5e7ff94add41f798cc31e31ca
+MISC ChangeLog-2015 2053 SHA256 809b6011e279ec8df55b4fa25969baa63dea02f05eb41fbe6844162f8c56ecfb SHA512 d216e5be4a11067ca0269543220e93fc710a84bc6ddf521708cd39067475bb235d31f88bd1032ee7dff818286ae6e97abebe657269d94efa0590508e3923d76b WHIRLPOOL 17273fae79fd169bd4a63c3437585ac420fb3be92fe6dcd21464322749dc2349e9364dae72ebfe1062789058d971f97b10b52d753eace9d4d443f97f382f6ec3
+MISC metadata.xml 457 SHA256 6530424eb97f72560ae2690d9e3b45b114c09b1bc2bd8d2d7a1a4fae8ec0207f SHA512 5136e07ca268ec52f678a36a8aa2fc254d74e104da0303b5427386bcddd86618f6a76383a4808cd7aff3e179294825f8b70458bc7341e062164ae78e5f5b2569 WHIRLPOOL 6d98ae92c0e6b8befb6f4d8e8cd615f0654c71d9b95ea6b51e425202a6f354b81f2fdc47e25a0922840b94262ffdd2128d14dd45a134386826781551fd612f0f
diff --git a/dev-python/w3lib/metadata.xml b/dev-python/w3lib/metadata.xml
new file mode 100644
index 000000000000..75452b6af9f7
--- /dev/null
+++ b/dev-python/w3lib/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>maksbotan@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">w3lib</remote-id>
+    <remote-id type="github">scrapy/w3lib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/w3lib/w3lib-1.13.0.ebuild b/dev-python/w3lib/w3lib-1.13.0.ebuild
new file mode 100644
index 000000000000..57337fdd9ce2
--- /dev/null
+++ b/dev-python/w3lib/w3lib-1.13.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library of web-related functions"
+HOMEPAGE="https://github.com/scrapy/w3lib"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/six-1.4.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/w3lib/w3lib-1.17.0.ebuild b/dev-python/w3lib/w3lib-1.17.0.ebuild
new file mode 100644
index 000000000000..a289b4082610
--- /dev/null
+++ b/dev-python/w3lib/w3lib-1.17.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library of web-related functions"
+HOMEPAGE="https://github.com/scrapy/w3lib"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/six-1.4.1[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
new file mode 100644
index 000000000000..a79494c2b705
--- /dev/null
+++ b/dev-python/waitress/Manifest
@@ -0,0 +1,7 @@
+DIST waitress-1.0.1.tar.gz 123934 SHA256 2daacaece189ede6a23440afe03bda58089a6207f1d80a1e9497f979dfb741fc SHA512 0205a0a5fc9e65e20370fc1e97ba456337313c93817e9b2b283610e5045eb32de80f45d19ee0cfb9469a93e4fc9267b785feacedd70b362474f4af5c05a3ab21 WHIRLPOOL 0eca4eec79b894fb561a894f26de1adbe45c70335c66f589d66b26d9c68a708c443eaacded46099d23401390ee45743b8fa2bc39e744f61a988f6695e8c83ea4
+DIST waitress-1.0.2.tar.gz 124685 SHA256 c74fa1b92cb183d5a3684210b1bf0a0845fe8eb378fa816f17199111bbf7865f SHA512 b7000e1198ac306ce189f70c5dcfcf41318e5ec47c8d6183cdbc360c8759ca726405d5da70f1c7fe3cfeb39d528af94d693767c2a7a1a7fe460c6407857ec6f0 WHIRLPOOL cb8f6c3602540e5978c10218eef52c88a711855097f2ea646c8ccdc12c89b9df642dce994b17b1e8bbd9bbf8b18d6be2da506eebe3201e63b895207c1af9407b
+EBUILD waitress-1.0.1.ebuild 797 SHA256 82dd50949d8bc86b1b055b3e5a545cb50583e882d0670727b750af9855e4ae6c SHA512 a9b6288942450bafe1f52f8e368d19492feb50db0f29df91853498e4836450b5feec1db4c390d5265752bb0b76bbac5f1f7388a0e7007ed2b267a722d7599060 WHIRLPOOL d1c0e42ded74af2c3ea7330f8fe71c371b04eb1c29560c08e0c3d1a1da5812c2bb5fb5069be0f4605aa5a09857961d48ea1dd971cd58f236620bc3d482e50fb8
+EBUILD waitress-1.0.2.ebuild 794 SHA256 3c843e97a9730be905bbda7ce29c33f46bd6839ed0317fec92dd9c1672c9a711 SHA512 4dd63a8529ac3d41d6432a2311c73201463c527e6f5a72da9a4d1bf4e833057a3961ff6e1e2ebc667e66eb78f324b45091c7befc53b0745b20bad4cffa817a89 WHIRLPOOL 7f8b7b9d998cc9f5b9a8507ee77027991aa0a7ba2ccfa5ce12c3fd5bb01557e77f86668bba37cd96d16b0e59982a31b09050ed39ec4b56e4a65fe6e398f4b8e7
+MISC ChangeLog 3717 SHA256 0dae8da5c4913312cb283fc3ba40931b3a216f408662ac1bc61d3aeb66d3a637 SHA512 7e5ec17a69953aabee219eda94d586745d3665f0ff57fa6e836854f6f59a3bdf58b3228a64653b441ee44a06ec499efd201a27dea723571c3fa8218f7a0c5cb1 WHIRLPOOL 718a4fea53563f3015227e1492534ac6966b398ebe2f8cb3f1c8fb1569e19fdaf2de5d18e1df885f0a616e4595d081a8e9a7931ab754d0b99a7a437e6bd95005
+MISC ChangeLog-2015 2930 SHA256 6654f52e49b60d9419cab7adde8012ea39f3486b1341573d2bf5bf9a5f2cf634 SHA512 1353482a8941272e640c23cc4d7da5ab935ef6db6b08a75b4f5cbb98144a4d4b694aef386d3fbd3a24ec2a93e29f3753d9611b55a3cd7fcd01506c8c541c2e9a WHIRLPOOL c2ca4a4eccb53cc39e58a2df76218162cee8f54b5d7c18d11cd0ec96e00832b9bae2a18a36a67facc46a9372af07558dba29307049ed840f9be29021db36204e
+MISC metadata.xml 378 SHA256 d880b1cba5b131722bdfa3d9ec6c6b5025db47e00abe1d19b44f1afb4bb60e66 SHA512 02bd27d7e984ce3ca047d34dd5acfe9c0b23e9d8fcf59484262e19e9df1206939fe2837a58ac00fe58575c2db4abe28b89a5a1c8a8b887d346c30635ee2b10fe WHIRLPOOL cf4c9f811c569dd3d606216be8a1b15f751e8849028cb74d17d1fd538356fc928b9ad3df814ed22cf52727ea89c3cbec512a6eea37b4460057c4be67995c8e1b
diff --git a/dev-python/waitress/metadata.xml b/dev-python/waitress/metadata.xml
new file mode 100644
index 000000000000..7c0760738bbc
--- /dev/null
+++ b/dev-python/waitress/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">waitress</remote-id>
+    <remote-id type="github">Pylons/waitress</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/waitress/waitress-1.0.1.ebuild b/dev-python/waitress/waitress-1.0.1.ebuild
new file mode 100644
index 000000000000..a12b9589a6a8
--- /dev/null
+++ b/dev-python/waitress/waitress-1.0.1.ebuild
@@ -0,0 +1,31 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure-Python WSGI server"
+HOMEPAGE="http://docs.pylonsproject.org/projects/waitress/en/latest/ https://pypi.python.org/pypi/waitress/ https://github.com/Pylons/waitress"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/waitress/waitress-1.0.2.ebuild b/dev-python/waitress/waitress-1.0.2.ebuild
new file mode 100644
index 000000000000..7d407a99d663
--- /dev/null
+++ b/dev-python/waitress/waitress-1.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure-Python WSGI server"
+HOMEPAGE="http://docs.pylonsproject.org/projects/waitress/en/latest/ https://pypi.python.org/pypi/waitress/ https://github.com/Pylons/waitress"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/warlock/Manifest b/dev-python/warlock/Manifest
new file mode 100644
index 000000000000..da59398c9b78
--- /dev/null
+++ b/dev-python/warlock/Manifest
@@ -0,0 +1,7 @@
+DIST warlock-1.1.0.tar.gz 7879 SHA256 bbfb4279034ccc402723e38d2a2e67cd619988bf4802fda7ba3e8fab15762651 SHA512 57353cb21ee7245cb27f29193d8c0987971535f1bc9f7a8914738ec15cd5712cf7001eae379041c0188e489365f23b0190dc13799b57a117b0bd3ed62cc2e30a WHIRLPOOL e2e258a38770c2c2f823d343ffe8b8a75bb7e89c0bc2b5dbe1e174cd06527eaca84e3e1c90ace11acd766c87408f448c563f2cfed8740239dd0bfeac66740698
+DIST warlock-1.2.0.tar.gz 8210 SHA256 7c0d17891e14cf77e13a598edecc9f4682a5bc8a219dc84c139c5ba02789ef5a SHA512 775362a80be7ab37d3a856947cc930e6be74d2b86e59ce44c9e24e54e111288dddae17f7d8b8885ea3d4cfa5674d327149d725a3acf4fc7bb48b2f63f5db63dd WHIRLPOOL d6be7dce7de0e60042600bbd1f3faec0180fa57f14e4eb3d3c218563ca2099c87831bf29ac456b627abd2da91b5c1198061a1568f3a0a781fdfad42ce10c0275
+EBUILD warlock-1.1.0.ebuild 1019 SHA256 128532e5af614e4160d2e9dee8336d1e17eb5d7992f10f1eab3600213aea2301 SHA512 5520db2be5af8ed45cae5fd2490be989d224eae9546fa3f43872b63328f521f2b1cd5745b778ffa4639dc5676dc2fde156e3899c2308b7fd387806e4dcff9160 WHIRLPOOL ce3f2070358ebf02c89ddf70d2c9afc7eed0ed8c7b2d34aacefdfff54307b2e98c4500c602efa7317719d55494024aecfdca89d92a12139512a97fad3a62ed37
+EBUILD warlock-1.2.0.ebuild 1021 SHA256 a35fd96623285b8b4e0d968fff4c89979c33c0686e8d29af7bdcbeaaa643acae SHA512 3e64d818893b0923db0136e4b916c451b9812f33d994779b3ecbcbf8ff2c2aa60bd3b014a65695c9f61740360d0088987558bfa9a2829808c48f0bd77c597331 WHIRLPOOL 6880964dcdfc889d77f0b70e34a7b40a99133b49d8427375fee29e59c36996d6efae2da6febda70668e246f48aef2d1285e0f646e775edb5dd6411ec3f7913b1
+MISC ChangeLog 3198 SHA256 0e8437d55b2834ae7493525f6da4f9c60cfa38f6a0b8cd565605c31c5036093a SHA512 07f69a8011dff54e2d7faef9265109ad0ab6fffb8fb48b1b9bf589f8043cf514697cefeda6e57de1fb6dcef812deeedd73a6f45ed9a78fc9f524491ba29d1e6f WHIRLPOOL da2e30a608df9de7023adbfbad7259ce60db7a48aae6149749d96601ab81f76f2f0a55d27e5881b844a3137939c9de39a160610052373f74be4f31148b5f9c47
+MISC ChangeLog-2015 2141 SHA256 152801e066f69f48b2cd270f3609f71d463ab09041d508eaab42b90ea7c8a1bc SHA512 3d8055e32e7f9135ac3793c3d08153dc94386429f2b9f6dd4063312700548ee5acd59291e81790139f77758420b3b300450d317f85efe10f7367910df9d6160d WHIRLPOOL 0fb53fe887ad17630430ebd44df605db2a18f35b1e466d451db2b19f5b88d1ab618d9e772331a657cf6341524eddf7be6b7b9feede2d521fdc9e87ecbf2da341
+MISC metadata.xml 589 SHA256 90f0f024abc0ad069ed0a9c0cd49716f210f7b4170195c285f9c4b6450050367 SHA512 dd648e8cf252beb4a09c4e95f3bc74b979c83feafeaf74fa587cf1b30c89df479cf26e031f9942c72fcbb7de4a7de4f82d3d8a87c7a290a7076fdcc5d0f15a9f WHIRLPOOL fa9723a26724e870fc05f7ca5b6b01b97e5ef440a031350dbcee6967bf52b8b0bf2073c9fdb7ebeb1b68e6425d6bc82af7dad430ba321e92032ae99128117ece
diff --git a/dev-python/warlock/metadata.xml b/dev-python/warlock/metadata.xml
new file mode 100644
index 000000000000..5a8439c14f88
--- /dev/null
+++ b/dev-python/warlock/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+	Python object model built on JSON schema and JSON patch.
+  </longdescription>
+	<upstream>
+		<remote-id type="pypi">warlock</remote-id>
+		<remote-id type="github">bcwaldon/warlock</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/warlock/warlock-1.1.0.ebuild b/dev-python/warlock/warlock-1.1.0.ebuild
new file mode 100644
index 000000000000..603f73882af5
--- /dev/null
+++ b/dev-python/warlock/warlock-1.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python object model built on JSON schema and JSON patch"
+HOMEPAGE="https://github.com/bcwaldon/warlock"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/six[${PYTHON_USEDEP}]
+				>=dev-python/jsonpatch-0.10[${PYTHON_USEDEP}]
+				<dev-python/jsonpatch-2[${PYTHON_USEDEP}]
+				>=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
+				<dev-python/jsonschema-3[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+		>=dev-python/jsonpatch-0.10[${PYTHON_USEDEP}]
+		<dev-python/jsonpatch-2[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
+		<dev-python/jsonschema-3[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" test/test_core.py || die
+}
diff --git a/dev-python/warlock/warlock-1.2.0.ebuild b/dev-python/warlock/warlock-1.2.0.ebuild
new file mode 100644
index 000000000000..32efb1044c2f
--- /dev/null
+++ b/dev-python/warlock/warlock-1.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python object model built on JSON schema and JSON patch"
+HOMEPAGE="https://github.com/bcwaldon/warlock"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/six[${PYTHON_USEDEP}]
+				>=dev-python/jsonpatch-0.10[${PYTHON_USEDEP}]
+				<dev-python/jsonpatch-2[${PYTHON_USEDEP}]
+				>=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
+				<dev-python/jsonschema-3[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+		>=dev-python/jsonpatch-0.10[${PYTHON_USEDEP}]
+		<dev-python/jsonpatch-2[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
+		<dev-python/jsonschema-3[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" test/test_core.py || die
+}
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
new file mode 100644
index 000000000000..4908b6f52f55
--- /dev/null
+++ b/dev-python/watchdog/Manifest
@@ -0,0 +1,6 @@
+DIST watchdog-0.8.3.tar.gz 83154 SHA256 7e65882adb7746039b6f3876ee174952f8eaaa34491ba34333ddf1fe35de4162 SHA512 61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f WHIRLPOOL 54af63f60711afac83d79d8b2e67c8dd500eb73a9ea89d6341979406dce4942cec071141b6aaa98615eb7b097d82a915043cbbe8166589c805beab163e733480
+EBUILD watchdog-0.8.3-r1.ebuild 856 SHA256 331f7ca5cff6a3f4c18cc07af49dd27d8362f8659d7d5c26e88888c3f945a70e SHA512 023d639b51945dca4f7b42e439b3f2e4844f1f6d22c49ef91182bc2b899947b133c1703ad0ecfd35f7e519d724ba77cb635102871b8c08514a2ed4cfc23794e8 WHIRLPOOL d65679fdfbe092bdcd426345e58d988ad99e47c3ba6b41c6d1034ae31596a6f91846dff404be32480f4953f9e4db91472dc0010b717dd55815167e5cc21c6e50
+EBUILD watchdog-0.8.3-r2.ebuild 860 SHA256 f688f0828d1ddd1983cdf2b3bdf1b1ebfbe0b3e36b86f86a5a3d1c0f02cd4299 SHA512 2118bda05d3ab36baccfc6872909f0267fa02a718d63cca6aaf5767a20a91119ffc5fc4b8219ef5d71897d7a10e8864c1a8199900c562276047fa2507e80d65b WHIRLPOOL ce835478c620a09f287c554812ece4e424767842facb6926abbb2f174f2ba264c11f83c9847ed073ca170137d3224aa24b16cca324de0d9cef1563da1b13161c
+MISC ChangeLog 3400 SHA256 88f1d457dd3fbba88fd13225a7cd94343d4f2cc89d5f22eba1e04b754204e48d SHA512 23b8185d6c16abd6f4fe732484db6a158989a81c537b53f01914e88c49958da049d5026b9b547c68581f3da2083cca4e74973d2dfd1a8a76ae192b1cff24adee WHIRLPOOL da4a155e47b10b4fe17798a1b44b227fb303abf3447ab7c4b3d277118fdb70683108666d4fc64f3ed8b4cff012ed10a2d7852e10b4e8d1d710c4d217fff9fe7c
+MISC ChangeLog-2015 2015 SHA256 cc7e19e4c2a40ed8635a718ed26e73eddceaefc5c06a74e2cc1ce1327a514ebe SHA512 2436c9d1e2014173d02be4886f837cac374cd125e7f2c7549e80558c3aa6f024ae620d1d0b8babcc6fa885a87906c212cdda40806e4fc9171f48bb6815459127 WHIRLPOOL f5cadba51f4fe091510a043d565f8fff2460cc691f77c742b8a58eed0a352ca7ec8466f12b6e0b4cb72f73d3160056c39ee8f4c4cf9679744615f4fc6fbf961d
+MISC metadata.xml 384 SHA256 078b365f56fe60fc0bb2ef06543a9d979aed2a38f71758af9b0cccc306c7c3ac SHA512 0883ee5d6169f36b061be829e7b2e4a69f7efada9f7a2b446a9baad15c8e119d24a7bb3d80bf253a760332bfb8a03ef06b3bc91cb97b7a86d0773252fbc3db90 WHIRLPOOL 49fb5d9316f127795b880f619c1b33916aeceb4fdc70fdaeb6c447143a1345b816455e42195df1c735391ac2fa0aad21ca7548ae68608d5b4cc7dbaee0782f3e
diff --git a/dev-python/watchdog/metadata.xml b/dev-python/watchdog/metadata.xml
new file mode 100644
index 000000000000..c2abbade6b63
--- /dev/null
+++ b/dev-python/watchdog/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">watchdog</remote-id>
+    <remote-id type="github">gorakhargosh/watchdog</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/watchdog/watchdog-0.8.3-r1.ebuild b/dev-python/watchdog/watchdog-0.8.3-r1.ebuild
new file mode 100644
index 000000000000..38133c53eea1
--- /dev/null
+++ b/dev-python/watchdog/watchdog-0.8.3-r1.ebuild
@@ -0,0 +1,36 @@
+# 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} pypy)
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="https://github.com/gorakhargosh/watchdog"
+SRC_URI="mirror://pypi/w/watchdog/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="test"
+
+CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dev-python/argh[${PYTHON_USEDEP}]
+	dev-python/pathtools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+		)"
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/watchdog/watchdog-0.8.3-r2.ebuild b/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
new file mode 100644
index 000000000000..3c4516b250be
--- /dev/null
+++ b/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
@@ -0,0 +1,36 @@
+# 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)
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="https://github.com/gorakhargosh/watchdog"
+SRC_URI="mirror://pypi/w/watchdog/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="test"
+
+CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dev-python/argh[${PYTHON_USEDEP}]
+	dev-python/pathtools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+		)"
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/wcsaxes/Manifest b/dev-python/wcsaxes/Manifest
new file mode 100644
index 000000000000..8d3a205115f2
--- /dev/null
+++ b/dev-python/wcsaxes/Manifest
@@ -0,0 +1,8 @@
+AUX wcsaxes-0.8-disable_mpltest.patch 366 SHA256 2273f1af0ef0c5077b5b41b49b5ce765fdb6cd53fa27f6b6fd981fba5479213f SHA512 fa40ad937d212f63bd9c9856c6b19d819f790b5025480dfe2ddb461b2d67d0c6f0f32f8f8f4b53275ece2f43856225d9b3533081fb32828ec3961a1755fc35b9 WHIRLPOOL 03d62053a6dc818b31c904b5ad57e29a0869a95b51f8e2f862cf591fb6f7f9c5a26b867921c8fc8b9df6edac6ae00fa5458dc7b758617b4d31acfd40cbca2154
+DIST wcsaxes-0.8.tar.gz 226456 SHA256 3ada54586add52e70ceb5aff9257ae9c38a71d1889fe335bce3d219c5a03c672 SHA512 77a08a99b4b3fd4f08633a10d4a3dfd6726bc1433aca2c2bdb505fd93c79a5ba3735523697c11084f0044a22a5bda345a946f5770185815f92b71b59c7fc0769 WHIRLPOOL 3acbba0c1c93f4d2ceeea3d4f236f7294e3eb306b7f3f8be7244aa5b7f35452cc21c072a5f054a7608238262f6cc0dde19b40f02cd9705182430fa0a6e9b0470
+DIST wcsaxes-0.9.tar.gz 213306 SHA256 fd1897f611c48edee00b05bdd7bb238372843b9a8b8f7592cb0d5a7ed4d15b53 SHA512 ae5a69f6f7ab71d186a128d902ae2f6d2d1d8a8b3358af88da120815493d24ffdc5d7a07ee96efe5adc91f68822f070b3d667e52e7cee5ac501abe62a468e2c4 WHIRLPOOL 1232bc214082c1e7ed0bb362758e84b2f3601551b3f120cc6451f1e7b4e211d959d515f089c7b50fd505ff7e3c037bbe9138c117576ec69151f0dc7de5e69e1a
+EBUILD wcsaxes-0.8.ebuild 1369 SHA256 80dde0457cbca9cb3ecb89bd3545b89767c7cbeb00196f5874bbf1c09beb9705 SHA512 24778db90866580198e3edbc77b07c46c7f66ee32ac77e6b005f7a9e4831538c6ca1395079465e439cb6345f5fbac1989491c9278ec6aa80c340447742778efe WHIRLPOOL 602c872e1400ab44c61b92fcaa6fa68f24120790ed992b11fba8202d957758f092450e78c217ed0d63d65829f014e4dbddebe63ae513cd22f4f5d5c1fc3b5ae0
+EBUILD wcsaxes-0.9.ebuild 1495 SHA256 8fe00eb965c4ae39f2c04ef921d577e5b6f4f5687e604766bd7d5970668a0750 SHA512 619dcdb539f744d75a32f29306446a8f1a81acf03b6adc0a9734c9faa69059747544bab6823b73d8bab9f26e75843ab4395dfdb2314018faf7e8fa92a3be9289 WHIRLPOOL b9f5c604b3ffd91737f2835c8af3b89c5ba5be11b0fbf7f9783b276551d3ce4c6b247fdbd884c2db670ed33f09b5babbd1f1a56323b2526a197d1c6eb8fa3a1e
+MISC ChangeLog 3775 SHA256 1f47905d09523f5df904e0102614f667e056331efb6cd8d2f3ec198ad6c829bb SHA512 12fd4d0092973531a94700b8404d7463278221f27112655b4bfa1bd99a6b947e83cbb1df181c79fdcc47aa025206ecce2aafcddc1c475fd0b01b3c32575eef1d WHIRLPOOL 394a9b902802fe9b5a0442e7d92870fecadd102b4e71f904ec812a691ce563c8f85e616133a2bcd97d50e59665c743909b74a8bdcc4df516579ac7ce384389ba
+MISC ChangeLog-2015 372 SHA256 469ef503748b87fccf0b2d7944685f448b9e5318a7a81063c429d865f6f4fcc0 SHA512 fe7fbc260e07898ccf2a25416bdd88fe8761eb96092caace5da05a3a1bfc7d68a3462c8a525647493b4f40688a8e5f3225f8e3211ec2b9e83ec4d8dabe7e5ba2 WHIRLPOOL 95e2087c4faca504c09cc7252f0037aa3345686582db5317da3f061afdafa3b00f946bed7b6add9cb275a25a357a4c48fe7c649abe6ccfab6a4ae8cb4bdb7ddf
+MISC metadata.xml 453 SHA256 35c9d678bafae433da05a3e6d5b878855a198529d1f309572157ffdcd34975a9 SHA512 11a93fdd498a01227f31e388d681cce63e88063ab877ce483332fea9ce818dcde0ab3d7ad24c32e71ffae7fb105ec465499b4f2b74faa5fdd08f51e435467ce4 WHIRLPOOL 704dd2702bf0e1230411d70d7a67d289d748061ee1c31f768546a2a515d80d529354c9f468f81df8491bc6aeff417747a0b68a139947880456b7df68df0664a8
diff --git a/dev-python/wcsaxes/files/wcsaxes-0.8-disable_mpltest.patch b/dev-python/wcsaxes/files/wcsaxes-0.8-disable_mpltest.patch
new file mode 100644
index 000000000000..9426b3296c04
--- /dev/null
+++ b/dev-python/wcsaxes/files/wcsaxes-0.8-disable_mpltest.patch
@@ -0,0 +1,14 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Remove the tests that require pytest-mpl
+ Pytest_mpl is (still) not available in Debian.
+ https://github.com/astrofrog/pytest-mpl
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -11,7 +11,6 @@
+ minversion = 2.2
+ norecursedirs = build docs/_build
+ doctest_plus = enabled
+-addopts = --mpl
+ 
+ [ah_bootstrap]
+ auto_use = False
diff --git a/dev-python/wcsaxes/metadata.xml b/dev-python/wcsaxes/metadata.xml
new file mode 100644
index 000000000000..f85db4532e4d
--- /dev/null
+++ b/dev-python/wcsaxes/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+    	<email>sci-astronomy@gentoo.org</email>
+    	<name>Gentoo Astronomy Project</name>
+ 	</maintainer>
+	<longdescription lang="en">
+		Framework for plotting astronomical and geospatial data
+	</longdescription>
+ 	<upstream>
+    	<remote-id type="pypi">wcsaxes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/wcsaxes/wcsaxes-0.8.ebuild b/dev-python/wcsaxes/wcsaxes-0.8.ebuild
new file mode 100644
index 000000000000..670ffebcd975
--- /dev/null
+++ b/dev-python/wcsaxes/wcsaxes-0.8.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Framework for plotting astronomical and geospatial data"
+HOMEPAGE="http://wcsaxes.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+	  dev-python/sphinx[${PYTHON_USEDEP}]
+	  dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8-disable_mpltest.patch"
+)
+
+python_prepare_all() {
+	# use system astropy-helpers instead of bundled one
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_sphinx --no-intersphinx
+	fi
+}
+
+python_test() {
+	virtx esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/wcsaxes/wcsaxes-0.9.ebuild b/dev-python/wcsaxes/wcsaxes-0.9.ebuild
new file mode 100644
index 000000000000..898e26934a0d
--- /dev/null
+++ b/dev-python/wcsaxes/wcsaxes-0.9.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Framework for plotting astronomical and geospatial data"
+HOMEPAGE="http://wcsaxes.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+	  dev-python/sphinx[${PYTHON_USEDEP}]
+	  dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8-disable_mpltest.patch"
+)
+
+python_prepare_all() {
+	# use system astropy-helpers instead of bundled one
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	echo "backend: Agg" > "${WORKDIR}"/matplotlibrc || die
+	export MATPLOTLIBRC="${WORKDIR}"
+	xdg_environment_reset
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_sphinx --no-intersphinx
+	fi
+}
+
+python_test() {
+	virtx esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
new file mode 100644
index 000000000000..72e771ef83b1
--- /dev/null
+++ b/dev-python/wcwidth/Manifest
@@ -0,0 +1,6 @@
+DIST wcwidth-0.1.7.tar.gz 22884 SHA256 3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e SHA512 5bc9625fbd10721a50a3ac7d7f91012cca8e4f83533f265cf56890498bc52a53b155c82e67d6bc5523a5593c8d7992a1dec2a0f590318170eddf987c56f9c368 WHIRLPOOL 3e45d689500952b69fdd78190454bae95b0f124206ad43d3bad9aa1e41d54885c326de60b67290e8ffe60dd4330a65b286f534d0bbb52572da30c958a9dfe10a
+EBUILD wcwidth-0.1.7-r1.ebuild 673 SHA256 0db55fcf211953253196dbdc856a4dc4bf7dde449f00872c745c4b451a57b66a SHA512 9a019e231d131f10403a63d752b8e5a1c97a35b5f920d7fe50e3c8c3e944c7b04325f0fd76ee48df4246994dc744eaf8de0271638e70d424c3ca19a7ef56082f WHIRLPOOL b17dc76fd0afb3a828b5cc43ac82e442d690449545762eeb9500d4e38e71463feb4d5d4e55e7279fcd30bfbad790195851e495454b95e557a7795a73e19f1f4d
+EBUILD wcwidth-0.1.7.ebuild 662 SHA256 b5d91172cec95facca32dd1886782ad70f80a92118e94d54cfd001806228aea2 SHA512 8d261e73fa8a4082ae43b5b30dcfc3902fc94d2672b79a10a765e4e05bae28d96c4ae1d80d512baf6fee60e5f4acfd70fadfaf59f38810ac14526e239694daa7 WHIRLPOOL 43fcb72726391f7be89dd21037168e02724df20469ae4fefeec884917422330906d32214985da9d922076ed343681def78e34a67dbd04e4e19461cb534fe0806
+MISC ChangeLog 3822 SHA256 2e3180d96c864c057cc05aa3eb386aa1ee4656063e327a43967cc3995547c3d1 SHA512 b8a85bfbc72fa4a298083a684e5a21f7d0f15f6f85e76cfb1cd76c2c742e3a008a1f5d0368c944f87bc23c820685e1141d3f781203bfe91d8886142756af830f WHIRLPOOL 122e5e01637cfee9525359e2cd103ada3f4effa3fc96c1cc41c23c2ae7804746fe998cca14c12b65a38d58f2984a5eb4c047263b9fc44fd8f76ea09dae034c13
+MISC ChangeLog-2015 545 SHA256 ccc7dca79bb1c42c6c1b04481b4dd5ecdb246c471666171cdf31dcceb63e1cae SHA512 4deed215e67cebba3ae370938e1f243286c58e33e1e4e06255ae5b44c6efa020aab3e4ec58209475bda956150ae71ca3d75b96395b2b2f7615d0fd584e5ecfb5 WHIRLPOOL 68bfb8e400c92073e1d8ad2282b4e60bc574d5eab21ebca99b450e42a5b4e6f92e278bb747654b7308b6c84c0829f39121d824542cc78a53eb4b0620ec26ad74
+MISC metadata.xml 376 SHA256 cd2700a6d139735151cfcce947d274641e24f2897f916dccde45466b7f2a1b0a SHA512 9f797fb27ebf7f1fd99d2c9a8c61ccffe1cc40f46991d9437dae121366da1edb31ee6ada3c202ced30fde0a90766453e72bcbb43a48919519f3de0b31681e213 WHIRLPOOL 79a0a3efb44d0502169beca03c2e01d7125875d107469e4e5af4486266bdf6ad715a4370de9b142ca305f84b9fb2c9284cb34ac82b29ab7b280fd0cf49e254d1
diff --git a/dev-python/wcwidth/metadata.xml b/dev-python/wcwidth/metadata.xml
new file mode 100644
index 000000000000..6f588e5a84a1
--- /dev/null
+++ b/dev-python/wcwidth/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">wcwidth</remote-id>
+    <remote-id type="github">jquast/wcwidth</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
new file mode 100644
index 000000000000..f53458451d05
--- /dev/null
+++ b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Measures number of Terminal column cells of wide-character codes"
+HOMEPAGE="https://pypi.python.org/pypi/wcwidth/ https://github.com/jquast/wcwidth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	py.test -v -rs --strict wcwidth/tests || die
+}
diff --git a/dev-python/wcwidth/wcwidth-0.1.7.ebuild b/dev-python/wcwidth/wcwidth-0.1.7.ebuild
new file mode 100644
index 000000000000..a9351170f80f
--- /dev/null
+++ b/dev-python/wcwidth/wcwidth-0.1.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Measures number of Terminal column cells of wide-character codes"
+HOMEPAGE="https://pypi.python.org/pypi/wcwidth/ https://github.com/jquast/wcwidth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	py.test -v -rs --strict wcwidth/tests || die
+}
diff --git a/dev-python/weakrefmethod/Manifest b/dev-python/weakrefmethod/Manifest
new file mode 100644
index 000000000000..79dbc02f1327
--- /dev/null
+++ b/dev-python/weakrefmethod/Manifest
@@ -0,0 +1,3 @@
+DIST weakrefmethod-1.0.3.tar.gz 7472 SHA256 37bc1fbb5575acf82172d4eb7b6fc4412d77d5a1d70dff2c1f8a4574301cda66 SHA512 c68dc806904eb954319984003506eb9b552005ce04722c6a3eb123ecde8f4413f9f9d114f0923c6f6ae2e25b4dbaf8c225c070a1720a6563cf1517f2411a60d5 WHIRLPOOL f34fd902a17cc134952ec51fb1025a78e288349d7f36cea9ab24f5155dd2112ee83416563c8f4cf60daf5129c6531dbec512e4bb5b56e52950b6a10317c2f35c
+EBUILD weakrefmethod-1.0.3.ebuild 470 SHA256 6ee1156729d571bf7b7b2ec4c9bf9c203f92a5effb4b8c300f10c283e0cbb5db SHA512 88860816c1b689fcdab41f545c077287f29acd0ba8fb6237b3ad172b02f69262db75dba6bf0bb16ea544c4229e44ef1c4a75db42c32f4e77017836d4f8552122 WHIRLPOOL 66089f886497d66bd9502c7cce3b0273c52649847b35196010a6411c36a3c47b2aa7aa9777da9811b7703d3a13a3b4ea7e9a649484956a13c7a4ca2e7ac5553c
+MISC metadata.xml 603 SHA256 866aac69c8147b5b29781c0bca0ee37d961019f33dc7795d92b0936f37d99718 SHA512 97e9f0da46bbec178b6ba2fd9dfd99189f1a00bbad2b26cef5307c3dc0ec5dbb651b325d6ec7ae1cd429a8b23d1b654e1bb2fbc5960aa8d9752b593eac990fd0 WHIRLPOOL 362235bdc1bd10df21c1e31637c79ed0ddfb43985efa55c2397747f608432744a1df7bcccb1ffb58a0919c77a6a70610ce6881d708a585ae5b00ab16ce32dde7
diff --git a/dev-python/weakrefmethod/metadata.xml b/dev-python/weakrefmethod/metadata.xml
new file mode 100644
index 000000000000..a40778af57c7
--- /dev/null
+++ b/dev-python/weakrefmethod/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>openstack@gentoo.org</email>
+		<name>Openstack</name>
+	</maintainer>
+	<longdescription lang="en">
+	Backport of WeakMethod from Python 3.4 to Python 2.6+
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">weakrefmethod</remote-id>
+		<remote-id type="github">twang817/weakrefmethod</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/weakrefmethod/weakrefmethod-1.0.3.ebuild b/dev-python/weakrefmethod/weakrefmethod-1.0.3.ebuild
new file mode 100644
index 000000000000..01ea69b6ab7e
--- /dev/null
+++ b/dev-python/weakrefmethod/weakrefmethod-1.0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Backport of WeakMethod from Python 3.4 to Python 2.6+"
+HOMEPAGE="https://github.com/rholder/retrying"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND=""
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
new file mode 100644
index 000000000000..bfe11ffc9290
--- /dev/null
+++ b/dev-python/weasyprint/Manifest
@@ -0,0 +1,9 @@
+DIST WeasyPrint-0.29.tar.gz 1418105 SHA256 4edf5538b330be3e559f006db76a5a948c25f3792746aafb20f2a9d6185f0e71 SHA512 3875240b7bed6991372f6a45f82d32f0d2f3add29ab1937001c5559368405737d185aa85871358730989a91ee6b17e62cc21535735c884c47705d0d2d38bb167 WHIRLPOOL cbefe32d42e5bbc26993b58f88b2ebc26291579dd717805c8fc9c54d41fe69b3a05eb8f301e9c21b426766404c9a683cce6c115ed8193456d17c83b44c8513a9
+DIST WeasyPrint-0.39.tar.gz 386613 SHA256 ed0be652bd396a9b818f015c8bc5fb32040864ee86cda6f0160cdef1dd4f42d0 SHA512 668eed8c4f2502b3412166ea8e7b15b838b971b175ac3ec2370097b83557070684fa7bc9c62c3222056294093781649f263aba756091fb87d50ceea339e32e43 WHIRLPOOL d7b987dbef301346a83418f7a8796f0d7c3076c5b8aadc66da1779e86198864e8c6c91ea3edc7d3ebbe8820a0e5a73b11c07a7cf1b7b7a9a9c3aeebb900d7490
+DIST WeasyPrint-0.40.tar.gz 388586 SHA256 b7e00cd5c4c3de4e659cca0e02670c37bf2fcf7a57251cbfe23e31cbf9782a6b SHA512 9c0d082ed2c35f76fe8ca5d25b5e99a0f96a309b2c4715ca3bd72a3a9a11121d4f5046c4ff55f007ebf0404edb0e4f510e571f42c569778948320be0301b8c4d WHIRLPOOL 209c3aed8a03212c34a523fb777c6626b860a3eabd9b3f8d2b6ea61f40f8e606ee59e92020116b61e76b514b9d17056237ef7c1e298fdc3e98e80781aca5dc43
+EBUILD weasyprint-0.29.ebuild 1199 SHA256 fe0ddf699176a010448c842c5e375981ed2142dfef1ecba71724e58b1ef7938c SHA512 4f178b61ead5faaa0be43c9d86eca83add1a4448908a0fdbff459a5e7eb6955fdd7e7fb6eb71deb19c11a77b277fa4ed2f3afa0863335fd89e6ad7d1a36ff681 WHIRLPOOL 3b8ff7c0fbdeb5ca31c7a2aba1b7423ffa144706243d5bcd61da404fa8fddd507f892cfdcb98f7d6bb278fc0de20a58ca333331d8a3f6bb4ac520b38ae9b08f2
+EBUILD weasyprint-0.39.ebuild 1401 SHA256 6e0d5613408d9cc68c3eb5d42ad5aa417b65fd47000a19a13a24314bd4f09341 SHA512 49044ceca4ed1c070ec18be4872439714adc2078638cf3f5b7c595cba76ba9a33c103181ba4600da961b2ec8653bb9dfdf81cfafb31aa6dd06cfead0d561abae WHIRLPOOL 604e4e4b7063722e0b2a7761e29134472fbfb6b407d88a49d5f5bc9c6765f9b73410cd909a23489e3b1daf35e09d1a916923b73d87df0b69d068ec6bcb776030
+EBUILD weasyprint-0.40.ebuild 1402 SHA256 b41fb0726bcf8648d965574a410fe0cf2a584a7140e2b8748133877d06a592ec SHA512 50774c61df3271e383f373e01b19e4c6619cc5985edea2a421dc3237e099e075ce907fd8dad4de7da76a98a25a7f7b11828ed3e9675d30a2418351de62d1f056 WHIRLPOOL 8981a30edd4ddcd4e7ac44e57fa6807403dd445c3e028594bea9335003bb6de5967828f00ebeffabb5ec4973d83fd79c4ae3fa01ded91db780102713ae507d20
+MISC ChangeLog 3062 SHA256 feda860d60311fdef3889b9291c67804675b035df32c4feafaef26b9c6523a94 SHA512 77dff5371d88ea978c25c72bff74a1019e2435999e9bfcdf336db303d8d08699e763b13da38f50fb5395e85b660b54ae22adc00fc8efcc5b6b2b59691230abf7 WHIRLPOOL f08ad8c2ca858556f347e082b464a704bd38341e2f3a9133452d7df15e56ac4384fe2d7f8f6af1be7563e213e4e8f7f2b56049178df86bad844fd3d57c1b83e9
+MISC ChangeLog-2015 2082 SHA256 ef9e282412326bfcac179195c695407e44e86837b2a53fc7de1a51559872dbd6 SHA512 a41aec4004070514cba6e3e72414d5b89a6cd8c1d859e85634c053891ce1b01732fb5a6c7bcf35a6b64e5cb858bbc34824abe8a8e4c3544424623ed36df7a9ba WHIRLPOOL 6854f04d5f436fe87fde9fedad3288e4ca00ff7a8deb853ca7f37a86922de7de39592e02cf293aa3ba29a494ae062105c46d47ed6a0b348fb7041253fa1a8310
+MISC metadata.xml 381 SHA256 65ea7c6e4e0c677c653c34beab9b43047cacbeb3c24c8eda99fb0a27d7d337bb SHA512 92ccf545a50a97d2f2cf6f85a6986525ea787d6534682b5fbdd1f0395ed7e938c4e341f5897a663b185d2b2755d4123132b8ec36866b44f2615f08d607a14398 WHIRLPOOL e3d2ea42dc1191c85fbfb7abe7ea4090b128b4a07419b39b5af343bc24759e4e0b9d9944c54660ae257671479c6494a2106e24434302fda160076f4a36f5ddbb
diff --git a/dev-python/weasyprint/metadata.xml b/dev-python/weasyprint/metadata.xml
new file mode 100644
index 000000000000..7cda8fd941a9
--- /dev/null
+++ b/dev-python/weasyprint/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">WeasyPrint</remote-id>
+    <remote-id type="github">Kozea/WeasyPrint</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/weasyprint/weasyprint-0.29.ebuild b/dev-python/weasyprint/weasyprint-0.29.ebuild
new file mode 100644
index 000000000000..737ee058558a
--- /dev/null
+++ b/dev-python/weasyprint/weasyprint-0.29.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
+MY_PN="WeasyPrint"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://weasyprint.org https://github.com/Kozea/WeasyPrint"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# Note: specific subslot of pango since it inlines some of pango headers.
+RDEPEND="x11-libs/pango:0/0
+	>=media-gfx/cairosvg-1.0.7[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-0.999[${PYTHON_USEDEP}]
+	dev-python/cffi:=[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
+	>=dev-python/cairocffi-0.5[${PYTHON_USEDEP}]
+	~dev-python/tinycss-0.3[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.6[${PYTHON_USEDEP}]
+	>=dev-python/pyphen-0.8[${PYTHON_USEDEP}]"
+# x11-libs/gdk-pixbuf # optional dep
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		media-fonts/ahem )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	py.test || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/weasyprint/weasyprint-0.39.ebuild b/dev-python/weasyprint/weasyprint-0.39.ebuild
new file mode 100644
index 000000000000..0c87b9ee57e0
--- /dev/null
+++ b/dev-python/weasyprint/weasyprint-0.39.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
+MY_PN="WeasyPrint"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://weasyprint.org https://github.com/Kozea/WeasyPrint"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="jpeg jpeg2k test tiff"
+
+# Note: specific subslot of pango since it inlines some of pango headers.
+RDEPEND="
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf[jpeg?,jpeg2k?,tiff?]
+	x11-libs/pango:0/0
+	>=dev-python/cairocffi-0.5[${PYTHON_USEDEP}]
+	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.6[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyphen-0.8[${PYTHON_USEDEP}]
+	>=dev-python/tinycss2-0.5[${PYTHON_USEDEP}]
+	>=media-gfx/cairosvg-1.0.20[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		  ${RDEPEND}
+		  dev-python/pytest-cov[${PYTHON_USEDEP}]
+		  dev-python/pytest-flake8[${PYTHON_USEDEP}]
+		  dev-python/pytest-isort[${PYTHON_USEDEP}]
+		  dev-python/pytest[${PYTHON_USEDEP}]
+		  media-fonts/ahem
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	py.test || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/weasyprint/weasyprint-0.40.ebuild b/dev-python/weasyprint/weasyprint-0.40.ebuild
new file mode 100644
index 000000000000..818acd23d270
--- /dev/null
+++ b/dev-python/weasyprint/weasyprint-0.40.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
+MY_PN="WeasyPrint"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://weasyprint.org https://github.com/Kozea/WeasyPrint"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="jpeg jpeg2k test tiff"
+
+# Note: specific subslot of pango since it inlines some of pango headers.
+RDEPEND="
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf[jpeg?,jpeg2k?,tiff?]
+	x11-libs/pango:0/0
+	>=dev-python/cairocffi-0.5[${PYTHON_USEDEP}]
+	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyphen-0.8[${PYTHON_USEDEP}]
+	>=dev-python/tinycss2-0.5[${PYTHON_USEDEP}]
+	>=media-gfx/cairosvg-1.0.20[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		  ${RDEPEND}
+		  dev-python/pytest-cov[${PYTHON_USEDEP}]
+		  dev-python/pytest-flake8[${PYTHON_USEDEP}]
+		  dev-python/pytest-isort[${PYTHON_USEDEP}]
+		  dev-python/pytest[${PYTHON_USEDEP}]
+		  media-fonts/ahem
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	py.test || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/webassets/Manifest b/dev-python/webassets/Manifest
new file mode 100644
index 000000000000..11eccf28239c
--- /dev/null
+++ b/dev-python/webassets/Manifest
@@ -0,0 +1,5 @@
+DIST webassets-0.12.tar.gz 180368 SHA256 99bc8218140b903e7d6e51d13f928ed61df275e36f00720243ac1ec31efc3701 SHA512 ad95e5345f9f736389fc684c5b51bb47ad5abb3bdca03a3a4649892095d139722aaf5aa57677997fe869e751b1b82a63c3a882c58005bc6a2ab954bc479447b7 WHIRLPOOL fd7a30733a5565587987a75af7ecedc475c519e95ea60dc57df4636a9ce887febef7840fdf1e2eef066a81c30f9fe8c967dc175fd8efa2a5dcd38791924c01e1
+EBUILD webassets-0.12.ebuild 977 SHA256 88f4eefddd97911a02351cd48d2c5dc3426e7e266d905612cb73cfae7861b85a SHA512 990a66505cb38a3d83e1c74d9ee1b7e961ef415777e1f97a62a32a79f6600a93caa97b49008ab14db5e0c026af9b0346790537ae3eb23db535189ff949f0772f WHIRLPOOL 38820ba3d31690050662d725d24fa28d304c74ebcd952f9b5c13def6ca0e37680ae9be29f7fc99f5f5e0eb8f1238b8c35aa8c00d8b7e54c44bf80acb89f4c0c2
+MISC ChangeLog 2726 SHA256 59bcbee3e2f47c3f96042b578db3ac5cd03d57ad5175b3b456e8b5dda0059f36 SHA512 5baf2961f9bbceae8046ac36ccd28c752f088f2533f833580e576ffb197683b097207ed3aaf65aeba0d766ee727618b73d381496d78ede3d529bf506f9bfd12e WHIRLPOOL 1adbd36c32d4c758fd091d29c3638e0040eadd902a7c18ce43b747f7f4ce1b503a00103b26370bdfdd75beb9709070bd5e6182a29114e86b147f72bc9c193098
+MISC ChangeLog-2015 918 SHA256 01d971e8627853275febd8438e9947aad5cf7b4118e0aff42097d4dff53a7ede SHA512 f747dc63adff1163e166d357fe7f8af671671155eee90abf4e8a37483aee8c11fb69be37017a7cc8874c5b5432f977a115627a36eb60554d94be4647432d1a16 WHIRLPOOL 5eecdd4cf71202925e97633602458068d37152d60dd7d7cff05c7aa155e45a7ed15ead7a91282a199357ad91ea982602b3d5c03b31d568b780ffdd948511bd89
+MISC metadata.xml 334 SHA256 b98d158c57bc568556ac0145dcf3c318047076cb9c616d8f28edc84c0fcc08ef SHA512 5bcc0fe8286771e758641d97206f14e447f6e0ff49d6c6e91285e0cb6eb5a4116760851996679c79dcf5fdfb4c0252f299676847612fc345fca020e44fd4d2d8 WHIRLPOOL fc127d617bb792fb61b737a5b0833a4bd8456acc2176ab6b8da4ecae44319607c4e13ae5357b4ed09d58ea10496a1a022fef057319485f377d8162b872981c1f
diff --git a/dev-python/webassets/metadata.xml b/dev-python/webassets/metadata.xml
new file mode 100644
index 000000000000..66aeb500eb66
--- /dev/null
+++ b/dev-python/webassets/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">miracle2k/webassets</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/webassets/webassets-0.12.ebuild b/dev-python/webassets/webassets-0.12.ebuild
new file mode 100644
index 000000000000..8dc45cda391c
--- /dev/null
+++ b/dev-python/webassets/webassets-0.12.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Asset management for Python web development"
+HOMEPAGE="https://github.com/miracle2k/webassets"
+SRC_URI="https://github.com/miracle2k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+# ^^ pypi tarball is missing tests
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# webassets wants /usr/bin/babel from babeljs,
+	# but we have only one from openbabel
+	# ... and we don't have postcss
+	sed -i \
+		-e 's|\(TestBabel\)|No\1|' \
+		-e 's|\(TestAutoprefixer6Filter\)|No\1|' \
+		tests/test_filters.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/webcolors/Manifest b/dev-python/webcolors/Manifest
new file mode 100644
index 000000000000..7a1d081ec0c8
--- /dev/null
+++ b/dev-python/webcolors/Manifest
@@ -0,0 +1,4 @@
+DIST webcolors-1.5.tar.gz 29960 SHA256 b3b1c3a41e9c69d1982b76b6531239115519f91cc034a24e975749832dc51b8e SHA512 84ce8cbbbdb4523bb146cf379845b549570623411a56651a7f9b9687152b7adc9dc42a3a0f684b55b61fb7a3d51d49d3871100b56725c86a727e3374b53c84b6 WHIRLPOOL f779a1777bb1ad9dac92f4dc75981be7274864291e7fd53ad59aa11b2ebd3eab2ff35ec68944fe7d57658976ac7b29f0708a256fc0e73a96535af99a4313ad7e
+EBUILD webcolors-1.5.ebuild 675 SHA256 3c85e14452c7cd1f3f649ccc468b40a9f6bc8897580a357eeb6d4c9dbe0e31bb SHA512 f79beea6e13d812ca0e0c05c5f7beb4287a7d34b6fe43d74c67fee8be531051e71c6df00d29815b3bd73ad7e9a45836d0516b1fc064e5dc99be91e7085f24c53 WHIRLPOOL 8dfb71687b5de9cac4245bea08b161a83e2f046b96b20668d491a8fd71526a53571a2b5d35f09dad79554c57afd345544c99167c6659d829d126317fd617089f
+MISC ChangeLog 2731 SHA256 d66c3ae82754572b98856b2d6c420740a7fdfd64361200193c00cb5a5be887bb SHA512 67a0c6dd927999b8ea83bd39ad7c1700d4da41a1e9ecbb85da0e36a05443dcc3da54d504a1bfa0f91e679d763574cfcb6dcde8fa286b090229bd3f1025451b9b WHIRLPOOL df2a44dcb4973a4aa4934770e1afba859787252eeba6a5b03a13676a59a4d9a628f0696bccb7b6ced24bec45d295ac2dc4827cf4232ae922fff9cf345a8d5bc0
+MISC metadata.xml 373 SHA256 08add0f7e889071d483695e11c11021f1b4b1d441bb614c220686b496aef2660 SHA512 0b99d1cca8cba614a64f182192f08d168e01c3d5dd3227f4425f41f438769b7b0566be41c9d3a3b3bd98825582315c035a7641766416fc5e57816b72d27d726b WHIRLPOOL f2fe26c5dd92b7e8c4db79276023c7de27c35e9a5fa914ee870804d06678bf1e1c7ae23b4752e12ec8623cd6c44443d3f6d03da48909e1ae62a00f0425124e38
diff --git a/dev-python/webcolors/metadata.xml b/dev-python/webcolors/metadata.xml
new file mode 100644
index 000000000000..24f3e32c3aca
--- /dev/null
+++ b/dev-python/webcolors/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">webcolors</remote-id>
+		<remote-id type="github">ubernostrum/webcolors</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/webcolors/webcolors-1.5.ebuild b/dev-python/webcolors/webcolors-1.5.ebuild
new file mode 100644
index 000000000000..ee90444d4787
--- /dev/null
+++ b/dev-python/webcolors/webcolors-1.5.ebuild
@@ -0,0 +1,25 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Color names and value formats defined by the HTML and CSS specifications"
+HOMEPAGE="https://pypi.python.org/pypi/webcolors https://github.com/ubernostrum/webcolors"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	"
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/webencodings/Manifest b/dev-python/webencodings/Manifest
new file mode 100644
index 000000000000..06f1c96b37f4
--- /dev/null
+++ b/dev-python/webencodings/Manifest
@@ -0,0 +1,6 @@
+DIST webencodings-0.5.1.tar.gz 9721 SHA256 b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923 SHA512 b727b01bac6ec79bca517960d27b4c0668b295f25559471b9641c2c33dab55db6dac9c990952177964c6418382c22831b14d57df5e632d51d7abf97b61f24326 WHIRLPOOL 54d53eec2bc19d2fe1aae8f3cc7fc17d70026a200cca3b3b90f1f4c48ac183d22113f4070a8d2feb5c6f6f2693ab161cc3750f3b448c91f3ef243ee4fb03ead4
+DIST webencodings-0.5.tar.gz 9479 SHA256 a5c55ee93b24e740fe951c37b5c228dccc1f171450e188555a775261cce1b904 SHA512 3f0c1995d23a8ccf8f0b02301edec5834336c27b7daf2335ded888073a1f13058acd93477cd020bb2b12d51b393d9b3166acf4995564cb9751ace8df35a891c2 WHIRLPOOL 72865b86c152e6a43ab1c64e127055629dbfc8419e46b3647c94ff75e55cad3b446bd0951979fa2b39daa847e1cf9e64b4a54ea11bc494b85c4a6b747857cdb1
+EBUILD webencodings-0.5.1.ebuild 821 SHA256 2bb04684c37d48fdec9bad244332bb193c29de7d705353846ac6ca81e53a9b6e SHA512 cde61edf569f85dda53cfa86aa05f6e22a0340e109d69e8008000560a81a74d77be070d736f07fcdc25cd0889c9a334ee82bc2b85a0f02fb4279dd820e359e90 WHIRLPOOL bd89b2fe6b915b59fefba36fe62b0dbe350b2258ea410e1b9947247972d9b39f8d6781c9d0a0f5a37f69c526145b5fca05279488c110d7cb7b7e56a618003c0f
+EBUILD webencodings-0.5.ebuild 778 SHA256 ead3912109a522d661b47be57c3f61996dfcc97b7f071c63b4c73f3bb2f08f3a SHA512 2c3cd83525d66f5b77a363b5e7a16833acaca966ba1b62772903d3e349ef5bfd59c4f9f11cdedb75dd1f8a989e397b1e6faef5a7f7fe54c8780a91a9219a9d3c WHIRLPOOL 2b740ddb6094c1a2ad1b3be84999b134a4de591d8f475bd2a9680abeb2cc746c41c32038d00edee7a5c799bd295f14f11060e08e049edc0286858e08a867f032
+MISC ChangeLog 1455 SHA256 362071580359339caa7f6b3bf945eb8e1cf81a7a720ac91d35212a13beb05932 SHA512 c6f2b1602fc669f087d02bf0e12198b3ca46263a596f97da6f60dca5b0e6cc8442b7991669f4709623efcc9d5d57d65dc268ac2e5717e41060c76a3fdf07dbba WHIRLPOOL 5dc2cab96b83e82de7002d4236ad260fa5eee8e54d71ee8693fe8772a738cb20f9be03623d5ee9419aec4092887fc13b65776c572a961af34e32e50b0204c660
+MISC metadata.xml 575 SHA256 46ecff21d23cdbef173f8e3d6bf016c566a1d2ac7bf592ccc90b2e58566e6aed SHA512 c734aada8a2ab7aa8cc6f25fdab99d9ede6be164d23acb8dbda9f7988aadf9d12b6e3043f5adb050cef277523b4a0c84d770ad1f2f75ff7d21d774c403d960ce WHIRLPOOL a2a1e72387792e75f3257b57a8c6057b8fb8978342311a1db60d64f3f2efb136a6000d4cc0843546c9e833ffd6d539ec720c6631b8f5b118f006e3a664f3b1bb
diff --git a/dev-python/webencodings/metadata.xml b/dev-python/webencodings/metadata.xml
new file mode 100644
index 000000000000..82ce4e702b34
--- /dev/null
+++ b/dev-python/webencodings/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">webencodings</remote-id>
+    <doc>http://pythonhosted.org/webencodings/</doc>
+    <maintainer status="unknown">
+      <email>simon.sapin@exyr.org</email>
+      <name>Simon Sapin</name>
+    </maintainer>
+    <remote-id type="github">SimonSapin/python-webencodings</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/webencodings/webencodings-0.5.1.ebuild b/dev-python/webencodings/webencodings-0.5.1.ebuild
new file mode 100644
index 000000000000..b40082e8ad6e
--- /dev/null
+++ b/dev-python/webencodings/webencodings-0.5.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Character encoding aliases for legacy web content"
+HOMEPAGE="https://github.com/SimonSapin/python-webencodings http://pypi.python.org/pypi/webencodings"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all(){
+	cat >> setup.cfg <<- EOF
+	[pytest]
+	python_files=test*.py
+	EOF
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v -v || die
+}
diff --git a/dev-python/webencodings/webencodings-0.5.ebuild b/dev-python/webencodings/webencodings-0.5.ebuild
new file mode 100644
index 000000000000..b907e4c822c4
--- /dev/null
+++ b/dev-python/webencodings/webencodings-0.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Character encoding aliases for legacy web content"
+HOMEPAGE="https://github.com/SimonSapin/python-webencodings http://pypi.python.org/pypi/webencodings"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all(){
+	cat >> setup.cfg <<- EOF
+	[pytest]
+	python_files=test*.py
+	EOF
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v -v || die
+}
diff --git a/dev-python/weberror/Manifest b/dev-python/weberror/Manifest
new file mode 100644
index 000000000000..88b43f58eb6a
--- /dev/null
+++ b/dev-python/weberror/Manifest
@@ -0,0 +1,5 @@
+DIST WebError-0.13.1.tar.gz 85910 SHA256 c19f8bd57de2f1eea1b18a44f1ba1ad27421097c9ecfa0ae754fa42c9cdd9864 SHA512 eaf54ab27775ccb1bb7d58cbac29d2a8045070ab5c6aaf6b95899ec7d9a996f03df2b853ebb4ae39a816cde0985f04a45f2c0ce913b69229a1aef8adeb639a9f WHIRLPOOL 911537606ee46f5a0793ac41b15df7fee9863635ddcfffba9f58d6229828dd2d1d62b42f70e2dd790d788eacf11dd7b324c21a67b56aad42282e73aead072553
+EBUILD weberror-0.13.1.ebuild 801 SHA256 0387d057e117d2d60a6dd81112228d4c64ef41bdb665b827cfe25c8137fbc6de SHA512 6304c2a718795a1d744d2a44fd61b3f3adabdfd1605279670bc025bd5745ad9380cbfa3ec98b5f25ac8a3c6a2df8db4901a17f690bfb34488f0799bbd10c20f1 WHIRLPOOL 79c46430a446b717da2e425cdbac0809819a25c1ea75eb2584cd1f0645db1e7c240e28e18e2d2dcbff239f8545456acfd21f33e997cfee38e698c0d75b915d65
+MISC ChangeLog 3108 SHA256 f4a42c027e60c4b0c379ffd52b208cae41a5235e32466640cf317e75f5f967be SHA512 a9c304722bbf2e5e3a1dd4eda08231dce88383e15e971687503fdc6c3d8267624c825787641fe0f900e6ead29a851226347840a16f5f39a22967d480d0153119 WHIRLPOOL 0d2c3a50a69c5ab3e0832005f2bd4c4ad38853aa53be6c6c9e8cfa618f16851aa1b43b8de75f3bb4f2d414345ddddced9fda29b092391e80fd7130a4baa3e5af
+MISC ChangeLog-2015 1235 SHA256 693fc85286f49eab6a2c86adec733059ac880fa6d0e7ed17f5273121b29f36dc SHA512 703f1a5f0bcf37c1e30a2f82a76d4319975624a617b6df5759f6117ca7d30fa0ef7bd650b296cc1b41401f3442b8ecb56b29eed3ceaebe859a9ed89b193c043d WHIRLPOOL 7718bebed9b764b1beb15dec8394f89f1d0e9f29415c0f5c6e15b811921b09fbbc9598950045c3a4dd5c8f87070827284897262777d3f83f830778d6d23e6d31
+MISC metadata.xml 311 SHA256 4c83d0312f92f5bfd01ebec863d45f38f91f02f1db7cae1c812c3617cba30342 SHA512 abde868f27134e744da2810a026c9005a3b8b1362e2fd530fdd546b0357873445d817972dcbc87c83f4747c25faa3b20bd85882c2cda5d67aec735a0837fadf3 WHIRLPOOL afdc88367d053ad9bc890574b4f5a73aae6c6d5254f101cd1d79388d926dfd273dadbd91a9927fe7f9c03b4228b72a6ccf974191a00fe82038d1f4779877a390
diff --git a/dev-python/weberror/metadata.xml b/dev-python/weberror/metadata.xml
new file mode 100644
index 000000000000..3c62abe15526
--- /dev/null
+++ b/dev-python/weberror/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">WebError</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/weberror/weberror-0.13.1.ebuild b/dev-python/weberror/weberror-0.13.1.ebuild
new file mode 100644
index 000000000000..953c7a3a8127
--- /dev/null
+++ b/dev-python/weberror/weberror-0.13.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="WebError"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Web Error handling and exception catching"
+HOMEPAGE="https://pypi.python.org/pypi/WebError"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/paste-1.7.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/tempita[${PYTHON_USEDEP}]
+	dev-python/webob[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/webtest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/webhelpers/Manifest b/dev-python/webhelpers/Manifest
new file mode 100644
index 000000000000..65a8ee592a5e
--- /dev/null
+++ b/dev-python/webhelpers/Manifest
@@ -0,0 +1,6 @@
+AUX mime9ad434b.patch 827 SHA256 1e1f6a1cd93750e8d8c255a40c49e035be0595ad28568e6f23a265f42001a486 SHA512 98ee96b72152d1c644ce398c9bd52e6e1ba45de1c93c739fbbc0e81fafb5387dfb41551c7752c251e24003abeaba1ff16b6d3367a5e441a1a864b698638c4af5 WHIRLPOOL 588a026ddd7d98d058cd5201c6aef16480447b27b0e2d2abeab70cb86b68e21f4f744a3c3598d407da8507afed850a92ae2d20060977f715ef9e49a80bb2b19f
+DIST WebHelpers-1.3.tar.gz 729963 SHA256 ea86f284e929366b77424ba9a89341f43ae8dee3cbeb8702f73bcf86058aa583 SHA512 ff1f19c5b878bdcb05664523d16fce1abb012957f00a97c06b3b5db581c6a361a2db5516b47a0e2b107bc9ba73270ccb323afb240cc67a34d6f15ce9462fad77 WHIRLPOOL dfc67dd1c8ac955bf9cc7584db9b629a3d7525a98e8f75e2f8fe5042c5d2cd2d5f70f694ce69aba8eaa87571ead558ef31501768b1515e0af931a6c9c145437f
+EBUILD webhelpers-1.3-r1.ebuild 1511 SHA256 ad0a8ec11b0b7ae14802101a7a9d5a676fda700f459efd58655ba4427c570b24 SHA512 0ecc8011d2c35d153a3d35b13d91fe41e9408954ff11e9903deb3b437d52496b4030817bf0788b6e181310e7686572779a092fb75400be5553eb370aa1e202d1 WHIRLPOOL dc6736c1eb7b32ba6bf3a16500f183c8a7fe4a380c6809e26a43bb3349db7bcffb33ed91246445eba6c949b852954a30517cba4ea5c511d5276e0e2b1f3544c4
+MISC ChangeLog 2613 SHA256 a4aa920d9714c2d7f2b25205c6c6614e981fda038ea84d67ca1be6626fa54245 SHA512 5b326a4ab711a3816f9407b0b065f41efa931c2bb5e2a32cf75b11f8a2f448209ba02909f505041f43441476cb482f8ca359c15e1f64ebd5da7252a02361f328 WHIRLPOOL e6b98a30467afbf892e3343de90548632592590a08635f7827d1730bedba24c1186a6c3e5f8dc431ab309052d63901c9a9251581168f60dcee6653c3b0dee923
+MISC ChangeLog-2015 2948 SHA256 416365f75e229f5a710dcea91454ea91cbd26be00633161fb3e61a92b083b6f1 SHA512 715234cc2f242bc3badb8ee007045073c0d700e4e52319a4e7fcac4d20ea3c5719827959e0e7d9642348559a520d394ce6564687fc6acad8c73217c024cb515a WHIRLPOOL de2257773abd87ad9181e18b7de3da6323d68063081ff1ab71966ab23d529fd9326d1d8b9b560453a29e40257a9e0b13e511be933f5fd6214499356a9f9ac573
+MISC metadata.xml 313 SHA256 e3b331a288c741972b74be79543f05a4015d294964e1fedb3c6622a9c178059b SHA512 d3f3cb56d4fbc3690545df372cd447b9f34a613044372211037b9366dd0ae91168d0c465c80008b0d1e9ca78384d186b3a8dfa2516ccc7ddfa5b09b4e14009ec WHIRLPOOL 3e5f6e08687d333bada4ca9fc9ce3707e04d7ea10ba77a426e0031e9b2ce6554d5cb5d33c9cb75d16b210734c87828718cc15b52632aa5fbc37d489c59cad763
diff --git a/dev-python/webhelpers/files/mime9ad434b.patch b/dev-python/webhelpers/files/mime9ad434b.patch
new file mode 100644
index 000000000000..5e37216f3847
--- /dev/null
+++ b/dev-python/webhelpers/files/mime9ad434b.patch
@@ -0,0 +1,14 @@
+https://bitbucket.org/bbangert/webhelpers/commits/9ad434bec9a16c06c1cfeed38cde02f00a95685d
+diff -ur WebHelpers-1.3.orig/webhelpers/mimehelper.py WebHelpers-1.3/webhelpers/mimehelper.py
+--- webhelpers/mimehelper.py	2010-11-18 12:34:33.000000000 +0800
++++ webhelpers/mimehelper.py	2013-06-17 15:45:40.603257640 +0800
+@@ -110,8 +110,7 @@
+             if '.' in last_part:
+                 has_extension = True
+         if 'HTTP_ACCEPT' in self.env:
+-            possible_from_accept_header = webob.acceptparse.MIMEAccept('ACCEPT', 
+-                self.env['HTTP_ACCEPT'])
++            possible_from_accept_header = webob.acceptparse.MIMEAccept(self.env['HTTP_ACCEPT'])
+         if has_extension == False:
+             if possible_from_accept_header is None:
+                 return self._set_response_content_type(content_type)
diff --git a/dev-python/webhelpers/metadata.xml b/dev-python/webhelpers/metadata.xml
new file mode 100644
index 000000000000..f6028f47fc7b
--- /dev/null
+++ b/dev-python/webhelpers/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">WebHelpers</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/webhelpers/webhelpers-1.3-r1.ebuild b/dev-python/webhelpers/webhelpers-1.3-r1.ebuild
new file mode 100644
index 000000000000..2a3ebb4d71d4
--- /dev/null
+++ b/dev-python/webhelpers/webhelpers-1.3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="WebHelpers"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Web Helpers"
+HOMEPAGE="http://webhelpers.groovie.org/ https://pypi.python.org/pypi/WebHelpers"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]
+	dev-python/webob[${PYTHON_USEDEP}]
+	dev-python/routes[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# https://bitbucket.org/bbangert/webhelpers/issue/67
+	sed \
+		-e '/import datetime/a import os' \
+		-e 's:"/tmp/feed":os.environ.get("TMPDIR", "/tmp") + "/feed":' \
+		-i tests/test_feedgenerator.py || die "sed failed"
+
+	epatch "${FILESDIR}"/mime9ad434b.patch
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake html -C docs
+}
+
+python_test() {
+	nosetests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		pushd docs/_build/html > /dev/null
+		docinto html
+		insinto /usr/share/doc/${PF}/html
+		doins -r [a-z]* _static || die "Installation of documentation failed"
+		popd > /dev/null
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
new file mode 100644
index 000000000000..45cbe3b0db86
--- /dev/null
+++ b/dev-python/webob/Manifest
@@ -0,0 +1,9 @@
+DIST WebOb-1.4.tar.gz 633302 SHA256 0819838204e2a6823e42bf2227898fdf3f306f7619bf328e25855a0d1ca20399 SHA512 0cf1a21b7d863c355e445f0e9f898ffb1c4c39099532a86d830c1be5d84efc0c6f3e8151a283cfd1cb5bebcb1fe78a2b6b269cbc130863679a017565a2539a37 WHIRLPOOL abfc696b7f50a74edd3d84099365f802f5be0eddf56a1c128f6e026c30bdeddc1b58c6bb45d4281ee4fb3d7937888d8065b01f93a363c82cd9cd1834eb2378da
+DIST WebOb-1.6.3.tar.gz 206375 SHA256 1b03115e162dd0102f6147c5d5ed71a3a2ba0f58ef829244b64f52fe6dbf5888 SHA512 41830571ca4e0727b2bb2c6ad81f36f2d07a2018c2a01e00acb2e32ef7c503e133653cb62f1ddcda3bf10f44ff3215cc2e2b53e7544b867ddf3f50fa9b4ca79b WHIRLPOOL 2bd99bbc0dece593c899aa962b8bfe7d35cd908fdc8723997cfd61250d6ac73b85c8d48a0b78fd162f591e941f8dfb74a7d21a11f12c750cb5f06d2736a64504
+DIST WebOb-1.7.3.tar.gz 216028 SHA256 e65ca14b9f5ae5b031988ffc93f8b7f305ddfcf17a4c774ae0db47bcb3b87283 SHA512 23a51f184754c525dc293b8b71855d40f52445c0df5434af7ec091219e0ea81be162623157b6ec67214cd151b25014bf86991246785816ebcb5a0d1eec9479a1 WHIRLPOOL 3a90c00f17a09c5a44b3bd5e10dcb66f80d6f0348837864a8e58730a70a834e19316b73096be70c437db3d4f33123c31292794fcaafed301e02dda3f4c993b87
+EBUILD webob-1.4.ebuild 1039 SHA256 5c6d585e09d5482145c9d72ba194406ac61efccdd4897d6055f8b28563252b67 SHA512 0c2fa25ce2e5dacbc67646aff56ebcf6199536c979d299a22cd77cde195cb1e6069ecb1ca7f20b4e70958b458351a50a565745f16c121aedd35fe3e8352adee6 WHIRLPOOL 3e5941ebb122f95e14b09cf8d909a077759de14386a421ae42be5a465398734896b7c066ee50637bdea6fea4f67705dd00359fa6fc75621a15f85a126c0a7ad3
+EBUILD webob-1.6.3.ebuild 1077 SHA256 cbeb78a88f3fcd4592b24621966b3db10597b0670a739c25001eaa6c6cf8b1e4 SHA512 09f33b779434fa79e0e7d79dbcf5174cf079d5b934e482886ed5bc506d7211a7c459bb076900e886e2ea3806c2dbe9e856a42ec0242edb16ed617f8af6c24c73 WHIRLPOOL 76889c0dff8835d932f0bf338e581c75971dd4eaf5488915d323c008fd234b2b8c23870306c00056ca36c6c1764dadbbf36a076e705883b188d6319f8bd91c57
+EBUILD webob-1.7.3.ebuild 1077 SHA256 cbeb78a88f3fcd4592b24621966b3db10597b0670a739c25001eaa6c6cf8b1e4 SHA512 09f33b779434fa79e0e7d79dbcf5174cf079d5b934e482886ed5bc506d7211a7c459bb076900e886e2ea3806c2dbe9e856a42ec0242edb16ed617f8af6c24c73 WHIRLPOOL 76889c0dff8835d932f0bf338e581c75971dd4eaf5488915d323c008fd234b2b8c23870306c00056ca36c6c1764dadbbf36a076e705883b188d6319f8bd91c57
+MISC ChangeLog 4844 SHA256 32f55e0f79ad7bb38663e1afc1ace86a922536d1e940b88219137a2aa15e836d SHA512 acd8340d6428ecdaf10454ddeffa96f15d1479d8a0cc25d276625e9b254b426107196bc7cbdf021c6f04ae65b6aa07c3d54d4988d2b25c18e71a69efc5c3d28e WHIRLPOOL 762cfa6eb35188a1f0aa82d26899021a87377126651e72d233c1dd8008ef10513eeb72c229b4246c360022cb3981bc0d936525a6b785c3b14c90aef8abb9be01
+MISC ChangeLog-2015 12090 SHA256 81045782b78c4ef282e2ef571f16cf0df744e7c6d06dd5fd4cf047dcb4e03326 SHA512 60571038fd11661853d1b1843be5fa597a0e61675ee965a63c9f01878a2e8436d890cf6efbf955165cb4c49262632506513e5f671be27fea942c04df6a79d9c8 WHIRLPOOL 65bf77f8210cb16331da6362089d8318e34929334e88f5b7de282e84ccfacbc05bcb9ab39028a6dfe02f2d87fd49a988469bb89601dfd46444851bc261538fd8
+MISC metadata.xml 308 SHA256 ac53c173fbe6031c8c6d771b680df7d9c04742f272d23ee9748c070f3277340e SHA512 cab03951839671b7600ab7903e1b27c98a02101d4a5f34b6a2382ad8f925049d82e4e4ff32c904d4dfcd7f4865124d7adf194933a5d2790b9f3ce1a9478e8234 WHIRLPOOL a95b91c226315c783777a2a797869da7c02b15a18a993847a8ef3a1759d4246b406561e1c1e5ec1c3e2b034526b746a6ffbb851b400407a5d69b7a043b9fcfa2
diff --git a/dev-python/webob/metadata.xml b/dev-python/webob/metadata.xml
new file mode 100644
index 000000000000..5a814750bb86
--- /dev/null
+++ b/dev-python/webob/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">WebOb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/webob/webob-1.4.ebuild b/dev-python/webob/webob-1.4.ebuild
new file mode 100644
index 000000000000..f65e9896107d
--- /dev/null
+++ b/dev-python/webob/webob-1.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+MY_PN=WebOb
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="WSGI request and response object"
+HOMEPAGE="http://webob.org/ https://pypi.python.org/pypi/WebOb"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+	fi
+}
+
+python_test() {
+	nosetests -w tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/webob/webob-1.6.3.ebuild b/dev-python/webob/webob-1.6.3.ebuild
new file mode 100644
index 000000000000..f759ad261b4f
--- /dev/null
+++ b/dev-python/webob/webob-1.6.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1 versionator
+
+MY_PN=WebOb
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="WSGI request and response object"
+HOMEPAGE="http://webob.org/ https://pypi.python.org/pypi/WebOb"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+	fi
+}
+
+python_test() {
+	nosetests --verbose -w tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/webob/webob-1.7.3.ebuild b/dev-python/webob/webob-1.7.3.ebuild
new file mode 100644
index 000000000000..f759ad261b4f
--- /dev/null
+++ b/dev-python/webob/webob-1.7.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1 versionator
+
+MY_PN=WebOb
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="WSGI request and response object"
+HOMEPAGE="http://webob.org/ https://pypi.python.org/pypi/WebOb"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+	fi
+}
+
+python_test() {
+	nosetests --verbose -w tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/webpy/Manifest b/dev-python/webpy/Manifest
new file mode 100644
index 000000000000..9ba8068b926a
--- /dev/null
+++ b/dev-python/webpy/Manifest
@@ -0,0 +1,7 @@
+DIST web.py-0.37.tar.gz 90232 SHA256 748c7e99ad9e36f62ea19f7965eb7dd7860b530e8f563ed60ce3e53e7409a550 SHA512 766e24d9df6ab1c3a214156794a19c23fcb16ca7a4ee7586a7723f802eab2ba0b8cda4653c2504ef63f773609436ac12dfd40bbe6cf20e2f93bf95493f041628 WHIRLPOOL 4782dc9b4b894ee1787478a77c1afe193096046feeebbe5ce4f904c26d22d5814c606d2d0112614de1ab19851a2e40a78e56f74c1dc59f94ec9462fd33842110
+DIST web.py-0.38.tar.gz 91877 SHA256 09c61b5b6b6e1dd558818d07dfbab3b2da0623603079c7d7223644b287f08870 SHA512 cac697206945f918bbe657d019623132e0bde9eabb0836f617cf86482095c756d6f28984e0efbedaab954966b58578d30cd9ecfecc0ed79f7d0ac74d95a19a12 WHIRLPOOL f70fce769fafe4711af53dc576af90144cdc9c66b534e8c829d38506de22ae124762a5e7f1d2bd5625bc7836a6f8a51dbb2eccf91eda0097eb488fc10a4b76a0
+EBUILD webpy-0.37-r1.ebuild 751 SHA256 7ace89e29c34c87a484b4aa87e6e614de2f5171d141a8e470005566e1d00b7e3 SHA512 b759d8ffa793021c1ee8226583b0b1fd01cd2fdbe63e2cb2e937fc37c37db1c7b3bb0278a94bd69082658e5279b7d4b780f1e67c5bc3067b838a7cd444bd1f24 WHIRLPOOL f95475419fa8d94e83590447f632a5d3a141ceef2f61cc2362a75344e64dfbce05b153d7950b5079aa9b2628c04c80b562a21c70644ad967bf2f05ec2445aed2
+EBUILD webpy-0.38.ebuild 672 SHA256 4118a23cd546a9cd48dcedb21b702fb4a654cb148fd227092741d92a1431246c SHA512 c6f2fe6b63b67dbfca261dc1d70409a0ca97604f969c0be5a8e15b1da4d62346006c45cb42dff02770735d7b2ed0ce7a299298a888c7c9de0ce50f63eac25a4e WHIRLPOOL b853a0d4fb1608091904bdb8f90673358589e00971a5739e07d1e9ef01e7596f1d7712f19074d4eef90cce8723042b6b5e1638bcb32e17a9b666b2edc7e666f1
+MISC ChangeLog 2637 SHA256 6945416b9243ea5435ff9988ab90c3be57cebc6a3b1932cefd3dcb0116cfd7b8 SHA512 b409dd8f84c350b07e9ed13581c243fc2cbbb123ab889b01a80e8862dc25fe912f5c4465b86d4255754ba6f444b817c083a602be7cba9caadb266083ba0c4dce WHIRLPOOL 77192f38c921e8698c9b44e0adb0ad11aef6e5ce8995fc00817a4c5a14d8afd643ffd64bd79d8e2ad64fd2efedd9bf2fdd7ad3ff37c28769c9e0620f2da99a13
+MISC ChangeLog-2015 3800 SHA256 e488e677141b84c1471e70a8f3fd3848516e47e7be8d536d080d8e60f7bb19b1 SHA512 8e8ec38da03152c5e4c1900e4722ab86b50a6b8a7b91e3ad46eb44cecdede119aeaf636690c98b00ff3a4ebce7c0f9a67a55b03f3c26a5a968c10d0ec386a2c7 WHIRLPOOL dd817a0d54c37034feff7ecaa871798f1bfad19b50cd7a8f63641265c43033f2760eca2f5d051c48386d2f7e7378e146edec9ede8d7bf094b0e15c1a04e4db35
+MISC metadata.xml 404 SHA256 08242c72c863d710076c119cd17dd3d7d2883b238f8a2e1829a3355d74f27134 SHA512 0478b1b4559f96d7883af4b8f9d8c1aa33130e30548fa599b5a0824d7f183b63bce201fe4e77a933cd65d4ba010de8ead9d3042503c487fbbc777410bfb95674 WHIRLPOOL b9cc0ef0887091687a571a09626a915e19cc5af1a03bdef5c9f817a9c557cbf19b027933e153003c59f4684807bb3f5512fc339965138ce6da6902c22e6d08ff
diff --git a/dev-python/webpy/metadata.xml b/dev-python/webpy/metadata.xml
new file mode 100644
index 000000000000..fac6a719b9a3
--- /dev/null
+++ b/dev-python/webpy/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		web.py provides small and simple web framework for
+		python. It is a convenient tool for small sized
+		websites.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/webpy/webpy-0.37-r1.ebuild b/dev-python/webpy/webpy-0.37-r1.ebuild
new file mode 100644
index 000000000000..8eed9a508f47
--- /dev/null
+++ b/dev-python/webpy/webpy-0.37-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="web.py"
+
+DESCRIPTION="A small and simple web framework for Python"
+HOMEPAGE="http://www.webpy.org https://pypi.python.org/pypi/web.py"
+SRC_URI="http://www.webpy.org/static/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 hppa x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/web.py-${PV}"
+
+python_test() {
+	local return_status="0" test tests="db http net template utils"
+	for test in ${tests}; do
+		echo "Running doctests in ${test}.py..."
+		"${PYTHON}" web/${test}.py || return_status="$?"
+	done
+		return "${return_status}"
+}
diff --git a/dev-python/webpy/webpy-0.38.ebuild b/dev-python/webpy/webpy-0.38.ebuild
new file mode 100644
index 000000000000..f289a598c081
--- /dev/null
+++ b/dev-python/webpy/webpy-0.38.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="web.py"
+
+DESCRIPTION="A small and simple web framework for Python"
+HOMEPAGE="http://www.webpy.org https://pypi.python.org/pypi/web.py"
+SRC_URI="http://www.webpy.org/static/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	local t
+	for t in db http net template utils; do
+		einfo "Running doctests in ${t}.py..."
+		"${EPYTHON}" web/${t}.py || die "Test ${t} failed with ${EPYTHON}"
+	done
+}
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
new file mode 100644
index 000000000000..cbacc3956557
--- /dev/null
+++ b/dev-python/websocket-client/Manifest
@@ -0,0 +1,5 @@
+DIST websocket-client-0.37.0.tar.gz 194246 SHA256 678b246d816b94018af5297e72915160e2feb042e0cde1a9397f502ac3a52f41 SHA512 b72f18c91d9a51a1943fc798601bcd9eac8b1ce807a2abb72b7cf897da30de808160645d9c7f3eaf2430e739cd0c6c01046c452f43c61af63afe7d31d801f9f7 WHIRLPOOL 71b370849f92ef2bb022a05de308cfba1273bd34a564363ce5167f1f21c422879dcaa1f896efaf2c9b17d33867311cb2bf7ac619acf7142a8c8eaedf443f84fe
+EBUILD websocket-client-0.37.0.ebuild 806 SHA256 a95bd06241e36a367fc3e618a5cbc2dfcdb6c8f2995bd81296fb297ab877eb07 SHA512 5812162495a2d109131b20eff43b45df754cc5a29dfa0eca1063d21056b672179ab268f0f507c12c4de80eec4fc98edd6a0af091f8938c08dd3626a845c8e3b1 WHIRLPOOL f190ba7830d013a0a29ec89a9bfa0064c181b30f97b9c69278a24885c12b3a731adb734d3fe16828e0cd4e46bccf2edb8d062980ff81970292b58fb0c1d72f08
+MISC ChangeLog 4406 SHA256 d18a57646588529deb810bf436ab87f0f50d0fce8d32374cc8dab2cc3df6fbad SHA512 0a00e93e579c946acfd56bc68ee39e0b7b4240e8b9e3ee7fa95163fc9f3403a0e864f3face440aa32b4118647195eeb70ab32e510724a9351ec3264427f1ed7b WHIRLPOOL 312a2455f5c5cebbfb8be9cd8e323cbbf56f6daae8115f238dea81690afb5026ef052ae9728f37447c59a88f04d27dac4f3c9b6f4837c1037be496b7e0701ef7
+MISC ChangeLog-2015 3030 SHA256 f6baf677ac0c9d01fc80572efcd1b3fa72288d5027d6ec829c853c78a77ebe39 SHA512 fce1ab8a0e8d26d542553136e23a10111bd1bdaba9323a74f6ab44335af4e9801710c76a5f9867a867b0a025351d57fad9d8967bfc4926c5a69d4203d1c47522 WHIRLPOOL b53f8286c43f23885be90259bedeb96fd2f4b2af6c4a371e543d1d3a55ab7e54d7d29ae5cbf78ac56e3c0f78a932b16ea992f22892de9f8b00767760d4552d5a
+MISC metadata.xml 488 SHA256 f39b57672ff5022d90c37724ee0f55bcca5fd87d9ea936314a77f34791f044ea SHA512 0aa0c529ae74d6fa9b95bcbc66165c283ddfffacc773d93653f6720dd744da54ad7428dca4fac2b165acd84540f56d7f0f37ed8a1486700d72fdb7716053ab20 WHIRLPOOL 015d01ee411c8b0f236472d499d039d22283e60f44880509ad50a11cef61fa08b5689e599bf4c6d8f825d455efe4299bb02bfc1b620eabc390a8b60e24cb1560
diff --git a/dev-python/websocket-client/metadata.xml b/dev-python/websocket-client/metadata.xml
new file mode 100644
index 000000000000..7484cfde7f3e
--- /dev/null
+++ b/dev-python/websocket-client/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">websocket-client</remote-id>
+		<remote-id type="github">liris/websocket-client</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/websocket-client/websocket-client-0.37.0.ebuild b/dev-python/websocket-client/websocket-client-0.37.0.ebuild
new file mode 100644
index 000000000000..2d0419808c3e
--- /dev/null
+++ b/dev-python/websocket-client/websocket-client-0.37.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=${PN//-/_}
+
+DESCRIPTION="WebSocket client for python with hybi13 support"
+HOMEPAGE="https://github.com/liris/websocket-client"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' 'python2*' )
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/websockify/Manifest b/dev-python/websockify/Manifest
new file mode 100644
index 000000000000..69591aa108ed
--- /dev/null
+++ b/dev-python/websockify/Manifest
@@ -0,0 +1,5 @@
+DIST websockify-0.8.0.zip 319105 SHA256 fc0cadd72c22a245ddd0d418e68cab07c4355754a070e39371c86ad92980ae0f SHA512 625cecbf37149c82edd2ebb9cd1f1a20a35415f7c7696ebe88b2e86563a170573959f9ede2c7a1db82ace9edddfb9d2da6e2e20d29fd916ae238235880d9a943 WHIRLPOOL 39e19a253b518b4cf53cce27a293317e47eb4159fd0bac21324649dfc872bfa3372a1043b4d4f976a72595cf5be84a7f88307b123af6938130339cdc99b76d56
+EBUILD websockify-0.8.0.ebuild 513 SHA256 ddb96802b54d822da24577e6bda4fa7c38472314fea8978b57011a342505d81f SHA512 c2d4e43bc18cdbf55121304bd862656ed3b6c8f7d607214babcb3cf9e7dcb4372f4e924bc32d3b7687a7054064c9cd3f0ed73c02805f59025195aa63c7e91d7a WHIRLPOOL f39fc51944c018751bb64d6255ac25886466207615ce2d6a2b46f88a2389e31655eb6005585fe01f7c3224ad5ba5dffdda4b6b24e1ae738d232bbd28ea7114b2
+MISC ChangeLog 3557 SHA256 737dfaf02859d6a13eb5a6f99cc1f40e581144cc453323ebc09fb0f6ba843c12 SHA512 a8ae88e26998f8a5099b02d6091f28c7280bed5c0072a397836ab9d63cdc8ecf0564cd3c56c84987af2bf28375fc2f0be1640950946e78cc68df8e975d5b7cb7 WHIRLPOOL 81612afbb0b1641985d52bafa9fe6aa68881d8025b4508662b13776655232178039a5fdfafb360b1ba244021fd52b930f97e7fb418e2ef225445b78974ab2d3e
+MISC ChangeLog-2015 1736 SHA256 d29730f734b28e594df6af18821373a440ef81863aa10e38a6385bb99db059f5 SHA512 a380f19dc6d06561e23fe0fa97b52eb9a4dfc122c13eb3575941e3445929e5f9c5f2c0a7cf67b15ccca733334a98d127cead198711daab4a73ae87893c396e22 WHIRLPOOL 1dbf05ae5e875e4a739b7478cc33bd9ca746c6c78ed2686a4bf9b137a395419b0ee68a4966bbb1d3a42d30412b16e3c73d088e8dda9e5c842623c309bcf73f8f
+MISC metadata.xml 554 SHA256 c4c60dd713f552781ce6cb2abcd3943ed4254695db85b17332a4e4bece75ee59 SHA512 9140154c124bad88c19f2b8cad2e453508b0b41714b6d8e27e951edc38467124b28179713636d22491f0f41c79a0c52e2908abfec78c4304293389463cc5d9b6 WHIRLPOOL f7b5e83853da4fe165891227927211b3867480050bf0139e39dfb26c3733a4c3b20ca8e41c32278a7a6364553292256312bb3c5dbeb711a1b2f04ddd8be5c828
diff --git a/dev-python/websockify/metadata.xml b/dev-python/websockify/metadata.xml
new file mode 100644
index 000000000000..a9a4016cc3cb
--- /dev/null
+++ b/dev-python/websockify/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    WebSockets support for any application/server
+  </longdescription>
+  <upstream>
+    <remote-id type="github">kanaka/websockify</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/websockify/websockify-0.8.0.ebuild b/dev-python/websockify/websockify-0.8.0.ebuild
new file mode 100644
index 000000000000..4cff30d2c15b
--- /dev/null
+++ b/dev-python/websockify/websockify-0.8.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+SRC_URI="https://github.com/kanaka/${PN}/archive/v${PV}.zip -> ${P}.zip"
+DESCRIPTION="WebSockets support for any application/server"
+HOMEPAGE="https://github.com/kanaka/websockify"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/dev-python/webtest/Manifest b/dev-python/webtest/Manifest
new file mode 100644
index 000000000000..f5715231d718
--- /dev/null
+++ b/dev-python/webtest/Manifest
@@ -0,0 +1,7 @@
+DIST WebTest-2.0.16.zip 88232 SHA256 24ad0c9ee377f16df4d0bd626a64a75eec901852ac788bdb70e0261bff0026eb SHA512 da09abba8ed52c8d673acf547f47df6919b534b33b746944610fc78bd3695f36e3718f89e68f8aec7852b6cf98da0f0b5500dfe9427fd7926e5304ad216eafbb WHIRLPOOL 68d392000c8767ef9b5d4cc657bd6e99ec75eb4cb20cacdabdcca87942894b290f957854fb7dfb7c9eb8312877575c4e4d258e78c05f985e972b02ee04ec2643
+DIST WebTest-2.0.21.tar.gz 66866 SHA256 3dc92ecd7604e21fc7c97578e4c43aff2a67cebdd4884a2aa804d85e85b34b55 SHA512 21f58ee9192fd0eb0eb2d88179ffc015aa5cf04c8004db251bd65d13d54c34b9e6b5fc9fdd8e9fcbbc18fcfb2be714c0691b2ef034318861262f8705b4a44610 WHIRLPOOL f87c877dc30dcee5c86225849d27a1a3b5504f656e4c68ff88273c665f1684cb21f0e31ebcdd4b6981e1bc5269d8057379f78d90c708de8e319846a5aa27669d
+EBUILD webtest-2.0.16.ebuild 1744 SHA256 53a9d00fd73ea54cea5c51683a115b6c5c104a3b7fb506607a1e5a00188ac552 SHA512 e7cbc3bf52b3596e7487e334068bf146bb59d3230ab420f42e94add9c5ab0878d5491a70b7d06d5f65da71bb3bc693390331e650d87acc716e2adc5b05bff5c6 WHIRLPOOL d8f972cb5d2144ea312ec2003896f8e6be2359200fc4e7bbb01fc91a650dd5785984b4e8a6096102f3978588ceaa57cd1e60584402765b445af42e68cbd1ed59
+EBUILD webtest-2.0.21.ebuild 1841 SHA256 6d0e718690edc46372cb9ca4d9f5b332c0290c8858dcc0582cbd7c124df3d37e SHA512 1c0201d485c7cc3a00e3f2f6c3ed7c54f3eccba4c3404365139699a432fe751e94dd070ebb2fd3de7de52b6e2cd5c102aa7f5d297dfaa92c922b5b15b015299f WHIRLPOOL 84951cdeeffce9faee40e7cc6e2278e72df3b3a0f6fef92ba2b1674daa338d3e6fe06c551af72484eb3c216d1524f06e3a175f6d7bd3220088fcbe583d070ed0
+MISC ChangeLog 4715 SHA256 4e6946db205d968c28641c5b8257e6061d052b51f45fbde6fbb80a0bb0195263 SHA512 5e756a91700f83fa3cfa037a61f3d9ce16cec702f18e8d42cc387229789fff48af80cb6b3a724653f1789b4ce3e428bea646483a6c6e7dace4963722bf2c8b1d WHIRLPOOL 81681ce247da2d2b2f7cc6ed5bf4df4f3bb6ee415ea186ff4a679307ce95085037c179e7896d2111cf4d20c4abd6331d8cc2e3ce63fda8c87bd88b1fd3803971
+MISC ChangeLog-2015 12837 SHA256 378c7425939990215391035629f11bec2e15fdbeb2e78390b03e96b8dda62a28 SHA512 cc77a0344c643cd767ff124a67c1204525d9bb08d8c336eb2016ad638651fef365ef64e80d1b13a33dbfcabc6da917f533289a1122d55168ebd83aeb722d035b WHIRLPOOL f724d97d83d91914eddc4752eeb7d4dac405b7b41911f60e35ed3f61c702b2d58364a173629c7cd1e254ac6ee905389112d4cb8f67e5964a70f70c174c5b656f
+MISC metadata.xml 310 SHA256 a3292a9cbb8584e527b568d15d0e140c47a22f3b7e94bca11996209e164236cb SHA512 0fb6e471cf00fcbea309bdb63d23c5917250f2de2e3e245a91d6ccf1258123ee6f0a8c3f311c526b7f9062c6ed93df1c89f44abf16879440dd1dc81c7fba2743 WHIRLPOOL f41eddb5ae6b7c9accef230ca577562c0d4bdd5d0d94a503217bfaf72d68159b026c40d4cdb1a3c45312689012e361e1e941a7a0f27ccea1b7a30843dbe7442b
diff --git a/dev-python/webtest/metadata.xml b/dev-python/webtest/metadata.xml
new file mode 100644
index 000000000000..0990b16f82a6
--- /dev/null
+++ b/dev-python/webtest/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">WebTest</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/webtest/webtest-2.0.16.ebuild b/dev-python/webtest/webtest-2.0.16.ebuild
new file mode 100644
index 000000000000..fb9c40e1754b
--- /dev/null
+++ b/dev-python/webtest/webtest-2.0.16.ebuild
@@ -0,0 +1,67 @@
+# 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} )
+
+inherit distutils-r1
+
+MY_PN="WebTest"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Helper to test WSGI applications"
+HOMEPAGE="http://pythonpaste.org/webtest/ https://pypi.python.org/pypi/WebTest"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc64 ~s390 ~sh sparc x86"
+IUSE="doc test"
+
+#nose<1.3.0
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/waitress-0.8.5[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pyquery[${PYTHON_USEDEP}]
+		dev-python/pastedeploy[${PYTHON_USEDEP}]
+		dev-python/wsgiproxy2[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 )
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+# Makes testing easier; otherwise we get errors from pkg_resources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Prevent un-needed d'loading during doc build
+	sed -s 's:intersphinx_mapping:_&:' -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die
+	fi
+}
+
+python_test() {
+	# Tests raise ImportErrors with our default PYTHONPATH.
+	local -x PYTHONPATH=
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/webtest/webtest-2.0.21.ebuild b/dev-python/webtest/webtest-2.0.21.ebuild
new file mode 100644
index 000000000000..a5fba1176103
--- /dev/null
+++ b/dev-python/webtest/webtest-2.0.21.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+MY_PN="WebTest"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Helper to test WSGI applications"
+HOMEPAGE="http://pythonpaste.org/webtest/ https://pypi.python.org/pypi/WebTest"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc64 ~s390 ~sh sparc x86"
+IUSE="doc test"
+
+# nose<1.3.0 appears a leftover never updated in requires.txt. tests pass fine with latest
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/waitress-0.8.5[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pyquery[${PYTHON_USEDEP}]
+		dev-python/pastedeploy[${PYTHON_USEDEP}]
+		dev-python/wsgiproxy2[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 )
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+# Makes testing easier; otherwise we get errors from pkg_resources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Prevent un-needed d'loading during doc build
+	sed -s 's:intersphinx_mapping:_&:' -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die
+	fi
+}
+
+python_test() {
+	# Tests raise ImportErrors with our default PYTHONPATH.
+	local -x PYTHONPATH=
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/webut/Manifest b/dev-python/webut/Manifest
new file mode 100644
index 000000000000..343bfd31d0b1
--- /dev/null
+++ b/dev-python/webut/Manifest
@@ -0,0 +1,5 @@
+DIST webut_0.1-0.2.tar.gz 11142 SHA256 e133b6d8cd8d0c46290a2de3f59cb8f8ffb17301bf86fb5d318ad0ad21fea73b SHA512 14801e3546e17f07328faee1df6708050702de75454e4eb2ad1fca2d72faf9a3228082f3d82a01a2810ba0fe15dacaee8fb556adff811596a1349eea61faeaed WHIRLPOOL 6d2455c75ce02f9aecc9f182e7b209b3df76a70a9b0518f11d5c4d9f7147a35b511f63fab9ced584938511a3c7cb8918bb670f12c2ec8e0654475a4ddf6eb939
+EBUILD webut-0.1.0.2-r1.ebuild 834 SHA256 189cd34e5b870cc615005f62ff460fe3aa2dbc410cea2a3534a48872f9c3e224 SHA512 6242babe15e1b33a02cd4d2dfd1a8e24073cb5a96da6f2eae3a05518ffeb5fbdf2b9d481611277228856831ba2516b0917cfd8b4542a59cdb76261da903fe742 WHIRLPOOL 4f5b8927c0d717fc634bbc7365408881a351f4f200c63da01e8b4ff5273c0fa55e9cd5cf43f19e572551cd843e4f064e5ab301ecb645b4f6ac6fd0a7b570dbe7
+MISC ChangeLog 2617 SHA256 fefb2a15396ddb087cb0feacbc2e8a41b4a48d8f7e507c23b7ef857a51e3ecb9 SHA512 a758927d98ef6a6e69a19edaef82baa7dc9e2f1563d9bc767e92d345f072bdcf3287571ad059f80802afc708cb9387d1365a343330e1daee8b4a9e6ff44e5814 WHIRLPOOL d18ffdc2cb794de1bd8b7ff1545f2fda354b7a30bf2a164c711e9c92412e161f857d921ae1d089085f84cf309a4ef06bf637e71e777e4362defaba509c78e1e9
+MISC ChangeLog-2015 2053 SHA256 40521f49700cececa5971b0f804cabea5781e92517c2cd52a843da79b03e398f SHA512 0bff1e16ed66cf2caef85a465d0febec3ea92461c3484194a0f71526aa5a12c9a004e0289bccb38a5276b721cb95325c3e3addf65c7c7edae8b0ee40a28a4dbb WHIRLPOOL 4cee2b49ff64e2dae64f16430c5ae1a589f507a953fd3c15151f70d3ee57c3f56ac4e64a823e8bf7a4c81cd1fa6ef93f8ed32d62b30b8f508c3502bd3b4dcb42
+MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/webut/metadata.xml b/dev-python/webut/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/dev-python/webut/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/webut/webut-0.1.0.2-r1.ebuild b/dev-python/webut/webut-0.1.0.2-r1.ebuild
new file mode 100644
index 000000000000..d04e12270755
--- /dev/null
+++ b/dev-python/webut/webut-0.1.0.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+MY_P=${PN}_$(replace_version_separator 2 '-')
+
+DESCRIPTION="Miscellaneous utilities for nevow and twisted.web programming"
+HOMEPAGE="http://www.inoi.fi/open/trac/webut"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+IUSE="examples"
+
+RDEPEND=">=dev-python/nevow-0.9.18[${PYTHON_USEDEP}]
+	>=dev-python/twisted-core-2[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-3.0.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-2)"
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/wehjit/Manifest b/dev-python/wehjit/Manifest
new file mode 100644
index 000000000000..a992ae4c875c
--- /dev/null
+++ b/dev-python/wehjit/Manifest
@@ -0,0 +1,6 @@
+AUX wehjit-0.2.2-SkipTest.patch 648 SHA256 44903a39ce12c97b0ffe355de7a9b42ceee4bf283669d8416d31e942dc24342e SHA512 56c7cd048f9faa71f0fbcf77e894c064f9c4428e165a0fd470d417c9bdde631e4594ddb9dcaa060f3c438d98b2007e5fe815fd949d62aeb58b6161b608abcf78 WHIRLPOOL 7d6e05301bda2bd226e72bc53f0e511b1b6105d2a6da36cde8e50df930122c886d8944a01ba9a9c8afb6b78bc19d4cac4b4a3d1feb3f6a7214628435de48636c
+DIST wehjit-0.2.2.tar.gz 100515 SHA256 71e16919ff816bc06492647a7e3eda9619bb04ba8fb729f97106131126e9d1fb SHA512 f8fb2edeeb9e90315d3c8f1e9e7d73d556fcad780c4dea637599291b2094e292a42b6f3671407f3d9d88733894501796484fa05ac52f3c1f3e1cb29d376a87fb WHIRLPOOL a1909009f0445de5d7c323ee05ab39a76f127ab89d3c9a96205f125b88277e3068ea3e2b3548cbadb69ddab7c5cc17dd87d8895c948bdd4adc00cf06bd949009
+EBUILD wehjit-0.2.2-r1.ebuild 742 SHA256 62269630ead0be243766b0d30b6cdc68a0aaa29e24fa043a5916a41a482e37fe SHA512 7b47dccf4365662aa000818cd4d79e0d65c4ba2693f955459dd7e537d5a3d6062d491c48c5cf2a119f5f3f39781718ceec10522ff98e132088111f1f8c4b284f WHIRLPOOL 9f2eff4cb831a6fddb6528223ef9b9c2d9963f5af9846216da5986efad90245dfb89c0813234d5f3aa31ec40966a6dfb5c6adbb8f54534988705d33b8e178714
+MISC ChangeLog 2468 SHA256 9eb2075f2f450dbd199a880c5783511306912e61621d31c9eb9ef0c83c1a08a7 SHA512 d2ef0cef5c042aec4b4b1a9b4a6de6d557332bf5005fd0d276e5318f659e857a94c543a0b3577e5381a943dc8db3a26ab0d98f62889096eda68adc5bc4991ec4 WHIRLPOOL f4391c30ef2816ddf399018aca108a1083845c6c43ea363eb50bd44ef17a713b5c8d36a3bbf9d20e427991c4e5e9cc785894b63b8d59bd76c7b4050c1fc984ec
+MISC ChangeLog-2015 1124 SHA256 65643abc1e92930178e2fdf2d9aa4dbaae3ea5dee90c6d140c844a0a8eb62ab2 SHA512 8f55f9d2406066326b1762e6d2693f7ca1605d881aa9a5c1183d74ad3f67a27c029ab59795ef391b616deb17aa68af136b631356d77cfabe9cca0ac3c53fdff3 WHIRLPOOL 73728735373822ec5165133176fa6df70f47950f939f96624d77a7d48ea60541d49ef6f056646f859d6ded25a6f47461758c076fab23634208a0029ad9ef03ab
+MISC metadata.xml 578 SHA256 f995d0f8c0bc45aafb1c7031b1880c4443ba0e5d4eafa7bc9ead51abb4b0e263 SHA512 cb9f24891df1a9c13cc0c165514b63d4877947a0793bd81c98fe7735b4afd7e9620e1dc742c6cc01a7f82ba9dc19f3770bd289ba15343a0324eb23a5cbe9a4e7 WHIRLPOOL 6b091049e55b418234c4ab3e8e74c483ced381cd1f5235bdd062610f18367a25cd1ecc60219673eba26111698886fc532aa7c565ba811ab75fa9f35a4c581289
diff --git a/dev-python/wehjit/files/wehjit-0.2.2-SkipTest.patch b/dev-python/wehjit/files/wehjit-0.2.2-SkipTest.patch
new file mode 100644
index 000000000000..057d70747e74
--- /dev/null
+++ b/dev-python/wehjit/files/wehjit-0.2.2-SkipTest.patch
@@ -0,0 +1,23 @@
+diff -ur wehjit-0.2.2.orig/wehjit/collection.py wehjit-0.2.2/wehjit/collection.py
+--- wehjit/collection.py	2010-02-11 16:26:14.000000000 +0800
++++ wehjit/collection.py	2012-11-08 14:24:40.326482713 +0800
+@@ -22,6 +22,11 @@
+ Collect widget plugins together in a `Collection`.
+ """
+ 
++import sys
++if sys.version_info[:2] == (2, 7):
++    import unittest
++else:
++    import unittest2 as unittest
+ import inspect
+ import os
+ from os import path
+@@ -130,6 +135,7 @@
+         """
+         return name in self.__plugins
+ 
++    @unittest.skip("Plugin not in gentoo")
+     def __getitem__(self, name):
+         """
+         Return the plugin named ``name``.
diff --git a/dev-python/wehjit/metadata.xml b/dev-python/wehjit/metadata.xml
new file mode 100644
index 000000000000..e84e225efc41
--- /dev/null
+++ b/dev-python/wehjit/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>maksbotan@gentoo.org</email>
+	<name>Maxim Koltsov</name>
+</maintainer>
+<maintainer type="project">
+	<email>python@gentoo.org</email>
+	<name>Python</name>
+</maintainer>
+<longdescription>
+	wehjit is a Python library for for building XHTML widgets for web
+	applications and web pages. It encapsulates the XHTML
+	(a Genshi XML template), CSS, and JavaScript for each widget into a plugin
+</longdescription> 
+</pkgmetadata>
diff --git a/dev-python/wehjit/wehjit-0.2.2-r1.ebuild b/dev-python/wehjit/wehjit-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..55996c08bf61
--- /dev/null
+++ b/dev-python/wehjit/wehjit-0.2.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python web-widget library"
+HOMEPAGE="http://jderose.fedorapeople.org/wehjit"
+SRC_URI="http://jderose.fedorapeople.org/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/genshi
+		dev-python/assets[${PYTHON_USEDEP}]
+		dev-python/paste[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		"
+DEPEND="${RDEPEND}"
+
+DOCS=( README NEWS )
+
+PATCHES=( "${FILESDIR}"/${P}-SkipTest.patch )
+
+python_test() {
+	if [[ "${EPYTHON:6:3}" == '2.6' ]]; then
+		nosetests -I test_app* -e=*getitem
+	else
+		nosetests
+	fi
+}
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
new file mode 100644
index 000000000000..99776bb2a425
--- /dev/null
+++ b/dev-python/werkzeug/Manifest
@@ -0,0 +1,9 @@
+DIST Werkzeug-0.11.11.tar.gz 1158304 SHA256 e72c46bc14405cba7a26bd2ce28df734471bc9016bc8b4cb69466c2c14c2f7e5 SHA512 b5eff55518900043840cd89238fd40873a74e762adb6d8717d5285a173725b92284ab992d753096c388a25db50bf089b91883cabc6210b6bbd7dc347ecb95027 WHIRLPOOL dacc6ae967e31688a2080e8fbc45bbb8b1cc5639008376de1e4efcf57ac82ad986109298405f647dac16b97ec0a529c5e9a9dbaf88a3273c3b60516a4de213d6
+DIST Werkzeug-0.11.15.tar.gz 1156471 SHA256 455d7798ac263266dbd38d4841f7534dd35ca9c3da4a8df303f8488f38f3bcc0 SHA512 f66303a4a65e50e3e7661330af57172ef390ddc64268ea85a33d48dfb1e72dfc3b50a01be2088704ea3d1a45cd162eda3810841ac4dd7fb4519a82718298eaa6 WHIRLPOOL d9f259d9fa732873522a7de3177b11cbf85cd0520c316c3c32227d6bfdba6b8db7683d6f188637021d278c227c41b89dd49a516db2ff0ce35fb5934fd2e1059b
+DIST Werkzeug-0.12.2.tar.gz 1169770 SHA256 903a7b87b74635244548b30d30db4c8947fe64c5198f58899ddcd3a13c23bb26 SHA512 9ff45aeb51a71fd5115e8cdee40a7b2fddfa0574c356686050cb1bdced5c6c18f672b601ca2637010c7f59be75c66ee558efb4ea05052c550ec7da3644b88e0a WHIRLPOOL 508ecad84004b9f46e06d53923920c249e16b2c56bc778f52e42ce5aa64a7a1fa09241e819e99a849b137186be7fec41cf5b7a8d1198b18918b4c38e2167b99b
+EBUILD werkzeug-0.11.11.ebuild 887 SHA256 4e721e74600bd22cb8e9cab6956f5c5c94443c77e9ca15309afaa2632ac20c52 SHA512 34793d90eb21742e0803d5cd2479e7c885876e32bee6039e82c0e1dcc67a2aa08f0f69711a6c5bb0cc3979d2804ba4a5e542512fd408c1da234fb819240ab6d9 WHIRLPOOL 65dcd1b68a6c78a6a79d7be51a041a2c806a4e3c3ff1c6e9bdb25c44171918fa5a77249659282145ef22ad7ca161274b37b33ce879e9d59390c3e17b4ee547b9
+EBUILD werkzeug-0.11.15.ebuild 888 SHA256 d82fec46ee1783f828a5a48c83edacc7f731e1dd20765aed35386eb8e5120f5f SHA512 77b444bbb2e571707db16a2600bf5ee7f9b0a0faed82c40439df4063354de53ed8876ed5c1f48018183009db3587b224b2cc4e2466030e0c0ca18a1e4ddb058a WHIRLPOOL d947b6e1d24c3f50e17b175d396819cd3029702e8449d570d4b95a8b8cb097adcd301d459331ef13ba98ac0f6de22fa199d139e483e925362130119efc5e78c6
+EBUILD werkzeug-0.12.2.ebuild 929 SHA256 cb73db79b6813a29ffc57710938f2527d96371c94b2fd2999b1d1af9d98c2fb7 SHA512 ac9220a0515d46cbe19a086342d5f313155987d1f36a44b130b3586d776114fe051e50a248273d715ba8abe7e1448d2f986f02eea7510890df10593cdad3f060 WHIRLPOOL c532931098dd67ee64e814ddf6e34fdf0043bef1e8f815eff995d439ee923758d9b7253facf9dc3f1629019caeb30f009cb49b61445e35533d73e7943ed793d3
+MISC ChangeLog 5586 SHA256 bd7cff86b1e90b7f5fdf7ee8c4c72cb933d41955021dea926202c4be62c6a5ef SHA512 dff2e8907e045eab48cba8df56be3593bea1f3214e7de0f446941efe616de027b951277526d14f23bab69dc972ad2256b41ab9edc6986770fcd270cc9a9a2e96 WHIRLPOOL bc75a5000449fbb1a25b2056ce5424e6759fedc24bed88fe996a475b17a8b8d089e05f5083bf26643d96f3baed5b9a7e5b82f59075ffd1e96a4305c57d5d653e
+MISC ChangeLog-2015 8732 SHA256 a6f332761d7be8c86e928b92883775856d20b1cbe725e5e6947a9738f1bb1f83 SHA512 7bc3483ec989196737d7a9d183635d047c91cb79e27fdbf52a86a7e7cd27307c5bc134b1307279e50cb9e5a0a203101dac0b930bda0f674b89cf6bc4d89122e6 WHIRLPOOL b2b0a2d56503ea0125aecb5fa838ad4c3c84ec4b4e8b5b88bf15031d5645452f39e529c17603f8688403f272c8ada386a5eb435571c38a21628173f647a92ab3
+MISC metadata.xml 450 SHA256 344f005800de9d2dd3f0208ff07cb0902f9acdffd1bd0db0c08a95e2b4618b15 SHA512 5bdd21ede3cc864b573ccd668ec99585baa7bf922f80137fd7880f73285510d0bd357707d44f9609b13f01245d011ff209e6c8d837c0f247fce08887bffc3cef WHIRLPOOL bba214abe1f5903b7c046e01d43e0c183b559c9dfdeae1cf02f8ec7159c22140e119c9b8bff1bf1170a1ac7f0cb04c6fef732d20e5ff4e5613f930cd6977037a
diff --git a/dev-python/werkzeug/metadata.xml b/dev-python/werkzeug/metadata.xml
new file mode 100644
index 000000000000..cc1d62c68b62
--- /dev/null
+++ b/dev-python/werkzeug/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+  Werkzeug is a WSGI utility library. It can serve as the basis for a
+  custom framework.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">Werkzeug</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/werkzeug/werkzeug-0.11.11.ebuild b/dev-python/werkzeug/werkzeug-0.11.11.ebuild
new file mode 100644
index 000000000000..b569a5650431
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-0.11.11.ebuild
@@ -0,0 +1,35 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Werkzeug"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.python.org/pypi/Werkzeug"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/werkzeug/werkzeug-0.11.15.ebuild b/dev-python/werkzeug/werkzeug-0.11.15.ebuild
new file mode 100644
index 000000000000..66699a9db433
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-0.11.15.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Werkzeug"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.python.org/pypi/Werkzeug"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/werkzeug/werkzeug-0.12.2.ebuild b/dev-python/werkzeug/werkzeug-0.12.2.ebuild
new file mode 100644
index 000000000000..0b04b1420432
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-0.12.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Werkzeug"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.python.org/pypi/Werkzeug https://github.com/pallets/werkzeug"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
new file mode 100644
index 000000000000..ee5dfa901c9e
--- /dev/null
+++ b/dev-python/wheel/Manifest
@@ -0,0 +1,5 @@
+DIST wheel-0.29.0.tar.gz 54143 SHA256 1ebb8ad7e26b448e9caa4773d2357849bf80ff9e313964bcaf79cbf0201a1648 SHA512 b72dec3cf71e3d87c611ff41f1381ed7f2c654edb50c808fb4fd0f552bab3572434495bf18c36d2ecc7cb8b355782054d3d6dedd5589ffda15027e72cff24602 WHIRLPOOL 93e501fc17208ece626217fda30b07991c6b7f73f16f1d7d5bf338ff0a21e4aed3c44ec243626cfda622c6e1e991ecc856a1cd6caf8e68b99e1edac46321e47e
+EBUILD wheel-0.29.0.ebuild 1004 SHA256 87291e8451b4a3b08b78b7a0b26315df247dd6a267687f5e103f3798ad940d03 SHA512 d59f8ec1c30a8e47104321e34e3bac8dd2a3113377ff717a04dd9cc354bf5b42188285df221c8786b9330465131b3656eb851d94a478f607c6257994b56d939d WHIRLPOOL e46e6e9daac726ff6684be09d41a039e4b73283ed3c5e3a8b3f738888af1c64d375239adf9162549bee63d48e3174bf42802d71b940aa190efa6d680b86ec777
+MISC ChangeLog 5114 SHA256 12bfea6c91154c1b1616084e1f7ebb091d01620fa660ce34c5ae4507136c4384 SHA512 2c53448a18ba8fc3cd8a89223854838762821ad0ae7851597813dac34280e0ce8afeb20ef92251684fae342adf57f8f587e53c3884fad2eb501072b05423d91d WHIRLPOOL 164afde31d7b8a4c9efc8f8976fd1269046946becae62d67f4401b047a2fe02bddcf5f44dc7dd3c48f8f67bc492d0193c6a720e37288ca5f7890d17335fa290c
+MISC ChangeLog-2015 470 SHA256 fa41a1cb3bf5f3a84cab95863a742d78e689d80367781019a879dec100c75874 SHA512 8f8ca8cfbbfa4fc624fd7eadde6cc9bebe0a1b2ae9c9ad6dbaaf9c40288a4426c669e79b31773000624fe90ab6720bca3d112a6e125315d51184e3e5fdcae003 WHIRLPOOL ffdf8fef4c2fdf7ddf9cdae75d4db52af7714540349d481568daf03519d257fa06da670124577121487b0e398253eaf875bfb7c321bdf7efa86ec7b67a2eff39
+MISC metadata.xml 308 SHA256 f2dad7b35d7033d425e7c393c6dd15bad2cfbd0e786830013dafb0527947b470 SHA512 d5fdaba19a51f826d45ba93cc77a08fd4be563634f51236cec379763f066ed925869a57c94c75a34ed58302619d419f31dcad641d9e85c68d11d72ec53d2d45d WHIRLPOOL de6190d5d9bdeaec551b1a0088bfb2bc4bb0dddef0f290abc8e5c3bd88cdd7a4334b3f25c5718dc581ca661f7cd0c20fae05cd76a5268f76e89888484e4b71c8
diff --git a/dev-python/wheel/metadata.xml b/dev-python/wheel/metadata.xml
new file mode 100644
index 000000000000..2808e69afc4d
--- /dev/null
+++ b/dev-python/wheel/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">wheel</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/wheel/wheel-0.29.0.ebuild b/dev-python/wheel/wheel-0.29.0.ebuild
new file mode 100644
index 000000000000..03eeda4845d1
--- /dev/null
+++ b/dev-python/wheel/wheel-0.29.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A built-package format for Python"
+HOMEPAGE="https://pypi.python.org/pypi/wheel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+#	test? (
+#		dev-python/keyring
+#		dev-python/keyrings_alt
+#		dev-python/ed25519ll
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#	)
+#"
+
+# Fails somehow
+RESTRICT=test
+
+python_test() {
+	sed \
+		-e 's:--cov=wheel::g' \
+		-i setup.cfg || die
+	py.test -v -v || die "testsuite failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "Signature support" \
+		dev-python/keyring \
+		dev-python/keyrings_alt \
+		dev-python/ed25519ll
+}
diff --git a/dev-python/whelk/Manifest b/dev-python/whelk/Manifest
new file mode 100644
index 000000000000..85b394f46832
--- /dev/null
+++ b/dev-python/whelk/Manifest
@@ -0,0 +1,3 @@
+DIST whelk-2.7.1.tar.gz 69983 SHA256 991ccf6f1b883d0e66305e242bc5d024518b5936fa60cce077f901b9ec13dc77 SHA512 39b73ed09a0d2442cdde5b8bae72805571a172c6acfa3f652c8cb125d3a400f2538fe6534179f95383d321e8975b6127115616372c60c736e8cd8ceba00ef093 WHIRLPOOL c5e571a154c9323e4c5316923efcf9a4394d8a4689e00eff2bb28b2eb3366c05b4a9b65600e014beb2a167cc217fe8e2494f5e07c4126d05af2b991d32ee31a2
+EBUILD whelk-2.7.1.ebuild 464 SHA256 5858a06f754b06cd23b56195a597022fa3a8cf7e398dce9ca8ec30859e761735 SHA512 26533a949fd765ea0643cd7ff26f6b18fe2b351d493784e49006d9207ae77fb8c0aaa105a44d7f7810631c544a6d2d01b3cfd84128dba4df5b057bc58947a0dc WHIRLPOOL dd379c3f7e8c6e1e7603a337d0bf56701366823a36de3e54fb6e5654e15aaf98bbb677c6e46d3b62d0a11c6b0904a24c1a1710522d79265e362704a99de09775
+MISC metadata.xml 666 SHA256 387204889d3e496ed4b626f28e25b505835904158965320100f0e32c8648cbf4 SHA512 92f0a2758700c57debe1c5190c970c1b8279262af9809490368fe2e3c1c6d4a5960ac17633fef4aa5c3786bd4ff2dc42564b7d55102e81096f3f9e602cff4822 WHIRLPOOL a7556feb40d8164f3428f5f5c9f105736d4143d8066c26ecf85939e125957d925a2c41cfdd6d8e261e7003af6df90ecb31b8743d013ca24bfa21539f0bb1b924
diff --git a/dev-python/whelk/metadata.xml b/dev-python/whelk/metadata.xml
new file mode 100644
index 000000000000..2bdfb4a473d9
--- /dev/null
+++ b/dev-python/whelk/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>nicolasbock@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		We all like python for scripting, because it's so much more powerful
+		than a shell. But sometimes we really need to call a shell command
+		because it's so much easier than writing yet another library in python
+		or adding a dependency.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">seveas/whelk</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/whelk/whelk-2.7.1.ebuild b/dev-python/whelk/whelk-2.7.1.ebuild
new file mode 100644
index 000000000000..62139f41888c
--- /dev/null
+++ b/dev-python/whelk/whelk-2.7.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pretending python is a shell"
+HOMEPAGE="https://pypi.python.org/pypi/whelk"
+SRC_URI="https://github.com/seveas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+python_test() {
+	${EPYTHON} -m unittest discover || die
+}
diff --git a/dev-python/whichcraft/Manifest b/dev-python/whichcraft/Manifest
new file mode 100644
index 000000000000..ac5b69b75103
--- /dev/null
+++ b/dev-python/whichcraft/Manifest
@@ -0,0 +1,6 @@
+DIST whichcraft-0.4.0.tar.gz 8008 SHA256 0b3567c56fb224a418cafbec6115cb5ed1002b256a203f87f1361e9cfce3dd87 SHA512 ed077a0b8eddc720c3db251ebaaf2695e4f2ed827c941d6979533944a03d8efcfe7aabb9be0c34ba3f016c98921b519c2907e3510f255fb4f5067f1844e68d8f WHIRLPOOL a9785e848e195090efb1e9053f60f158070f5b55271cc5a56903ef10cdbe7be29eef94740971b1284da0a41cd9158e84c5b9c26b6deecc65041f3f29e48b3994
+DIST whichcraft-0.4.1.tar.gz 8095 SHA256 66875022b3b9da8ddf7ab236c15670a782094550d07daeb51ceba4bc61b6b4aa SHA512 92633be99badd0ce06cf28b23366f89f2104ef2364ec8f637230fe46b378d1398a64f4d8b367358c833a2038159debc70b0498e94d2729918b95847defd59cae WHIRLPOOL 97c32d4c81d66210960d834eaf1a6ed97522826087645b787820bd815c0b27ba078012b66201ce785476e5b28cc4dbeb251cf1710d9b3e1e012ac3f4ec685cd6
+EBUILD whichcraft-0.4.0.ebuild 616 SHA256 2e0a6e7e5fbb7aadbd0d974a34b82a442c54fd1766093a4b2de950aef2c9d2c5 SHA512 2996d73bb9fd3e5559c8215d507efcdd047ac133354e28962123689bb68e89a934aafd251a5ba54b0375f31d8bd89f91494fba1cd973bff1882a7655302702c5 WHIRLPOOL f4c4bf1bb3caf6e4aa4a6c77f01fd511fa8310080e8966182929e1efc062ad4bcefcba9fb916d119f65aba74be286bdc574c9729b67884c7f4fcc3515b6a7537
+EBUILD whichcraft-0.4.1.ebuild 616 SHA256 2e0a6e7e5fbb7aadbd0d974a34b82a442c54fd1766093a4b2de950aef2c9d2c5 SHA512 2996d73bb9fd3e5559c8215d507efcdd047ac133354e28962123689bb68e89a934aafd251a5ba54b0375f31d8bd89f91494fba1cd973bff1882a7655302702c5 WHIRLPOOL f4c4bf1bb3caf6e4aa4a6c77f01fd511fa8310080e8966182929e1efc062ad4bcefcba9fb916d119f65aba74be286bdc574c9729b67884c7f4fcc3515b6a7537
+MISC ChangeLog 318 SHA256 d82d85901055d800a6aa19ff6cf502856e597a5985762918a4e17b444bc04b8b SHA512 6f801b1944f4a05dd4b10308eb04f10b75c182b69d8a1d17c39dc5626214a243eb0dc2f52866a3f9d788aaf909418e7d6eb49551487476fdef4796703cdd32f8 WHIRLPOOL 09c6ae85b1e577ad54396a005d4dc9c6c4c2ea6973e33441c61965fc326783fe88619391deb54ca04ad084cffe7b15299ab121667a8426077fc837b10613597a
+MISC metadata.xml 323 SHA256 15d43ab7d00f6fcf99942f2a5e1e9d0436446b13b80ead0644f30ecdd6d9d595 SHA512 92c7755e3ce8289f8cb93c8fc453f8093c678c41f3fe04e0ea6d6fc3df93e1cc4754fb8b214b96a2bc35e0f6a51587c054cdad45c1061f7462db075558c38090 WHIRLPOOL dda9f4c1ab7c720a693c0a5a29776abfe52d2de26b131c0ef6583399ef84658d58ecc2893f9d46b1216bc42383a57a7d05dc89a903aca83255c0663333029157
diff --git a/dev-python/whichcraft/metadata.xml b/dev-python/whichcraft/metadata.xml
new file mode 100644
index 000000000000..63dfb8da6a90
--- /dev/null
+++ b/dev-python/whichcraft/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pydanny/whichcraft</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/whichcraft/whichcraft-0.4.0.ebuild b/dev-python/whichcraft/whichcraft-0.4.0.ebuild
new file mode 100644
index 000000000000..337719a0b014
--- /dev/null
+++ b/dev-python/whichcraft/whichcraft-0.4.0.ebuild
@@ -0,0 +1,25 @@
+# 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
+
+DESCRIPTION="This package provides cross-platform cross-python shutil.which functionality"
+HOMEPAGE="https://github.com/pydanny/whichcraft"
+SRC_URI="https://github.com/pydanny/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst )
+
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	${PYTHON} test_whichcraft.py || die
+}
diff --git a/dev-python/whichcraft/whichcraft-0.4.1.ebuild b/dev-python/whichcraft/whichcraft-0.4.1.ebuild
new file mode 100644
index 000000000000..337719a0b014
--- /dev/null
+++ b/dev-python/whichcraft/whichcraft-0.4.1.ebuild
@@ -0,0 +1,25 @@
+# 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
+
+DESCRIPTION="This package provides cross-platform cross-python shutil.which functionality"
+HOMEPAGE="https://github.com/pydanny/whichcraft"
+SRC_URI="https://github.com/pydanny/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst )
+
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	${PYTHON} test_whichcraft.py || die
+}
diff --git a/dev-python/whirlpool/Manifest b/dev-python/whirlpool/Manifest
new file mode 100644
index 000000000000..db683bcd3819
--- /dev/null
+++ b/dev-python/whirlpool/Manifest
@@ -0,0 +1,6 @@
+AUX tests.py 3759 SHA256 bfcc6a613c42cec5b97d9766d11e524ed5134749471d27ad289623dfb987de7c SHA512 902c785311f1d09331df53e4531274c2211e107cb45f0687bfbf6c5922f572ed0a614cd52ce4575e7d9093e79f715b8a3b20a2a6fb40c438779538bf1d404fe2 WHIRLPOOL a9c974538df2122718f73bdb4dd0a9826e7f016c40bd193ca40909fe8a18a5a6c3cf49ad10a2d810676c70b2c28c375b42cce2ee16a91ec409371227f2495c81
+DIST Whirlpool-0.3.tar.gz 34508 SHA256 27702b350b0cb6ea944cbe048419b48e0a66186fd89e0ef1b293d92dbd05f551 SHA512 d9fed84ff0af885534e70f537c0c17f19ad46d31b2b1d77749328e6cba37a805bb8e178539d09a479b0d7a7e93d11f69858db5b3fdc6c3fad9a89fc727004770 WHIRLPOOL 6c25f8fbeec916e65b594da51a28cabbc6a982e82eea3a0d76e71b8a9b46d98cef0f8d733e5c43d0716f878c9a86177918ebba6612d4007777362e53956604ca
+EBUILD whirlpool-0.3-r1.ebuild 823 SHA256 efa06abb516849cd91a005e72ca62939765a3154fadf926e26d3b32e1ddb96dd SHA512 9bab8b90f0b55079b88aac21ba9f9699977096209c2a04db83df7b998fdf59901a1dc87dfce78bd742a34dc48cde8394130987f9dcbdb1acc99c1b73fc0e226e WHIRLPOOL 7b7f731c5c66eb2dc31fcb33f2d87362aa588a6373512f423ad64a45424eb9db7cffd1b18f8680417a4002c46652f8e77c1ff490bc58913dac0de3ab956bf483
+MISC ChangeLog 2594 SHA256 7ea98957024b32b851aff41770ab43c9242df8653d731b4f6ab4aba0660a3819 SHA512 bde120861fd77669ef9cf37713873fcb5db9f0645b23073d4b1445680750d59b22cbc2df805a34f4a2389c33611ea888e1f288b615aae8cf6210c54137bf2db3 WHIRLPOOL 2fff0ab4e8e33bfbe88bf0df5dce8d805f2813fac95973ddb49061f967b06e724a07cecc6dc57d2c54d60220e19344e59cdde03d1c749e05fe04ee98cb25fcc0
+MISC ChangeLog-2015 1059 SHA256 5f76c1e33dbe9d8402d4b65f0822de71fa7dc15b0bf292221c793320106c094b SHA512 2eb76e23ea9a8ee63f602125e41d5aa557d5b3dc274380abb68113541fd3b3c8b3099af71c485393ef675b51082c62d22671a1062f3c49a9533b2c778d8b2f86 WHIRLPOOL 71bfbf3438b1cd0593e8c4c5f47fd0e50f69ed0eff842a019cc6179a8fd18f6f269a1db67a8d26691fe83b04e12df7eba74a15077275acd9ec3ccc916e491531
+MISC metadata.xml 393 SHA256 c9d25b104979bce792a8c0751cf8eeb0597358ec73f5461cfe856bcf252a415a SHA512 000576de3ac4f057e226b3ee265bb2a6709140df133f992e2d3d6d00d9507b32addd36bcfd6a70793244f085ae258539e37a16b0428d4f9c7f9c657a1e6de4dc WHIRLPOOL 578556ed1d861637a53e16b9cbb309331c7fe702d683c209770b04a24c273d766d546ed6e2605bd4f13668afb59c25c9515ae7e1e1d2e9a7e357dc9e1616cac3
diff --git a/dev-python/whirlpool/files/tests.py b/dev-python/whirlpool/files/tests.py
new file mode 100644
index 000000000000..521148b33edb
--- /dev/null
+++ b/dev-python/whirlpool/files/tests.py
@@ -0,0 +1,96 @@
+import unittest
+
+import whirlpool
+
+from binascii import b2a_hex
+
+
+results = {
+    'empty'     : '19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3',
+    'tqbfjotld' : 'b97de512e91e3828b40d2b0fdce9ceb3c4a71f9bea8d88e75c4fa854df36725fd2b52eb6544edcacd6f8beddfea403cb55ae31f03ad62a5ef54e42ee82c3fb35',
+    'tqbfjotle' : 'c27ba124205f72e6847f3e19834f925cc666d0974167af915bb462420ed40cc50900d85a1f923219d832357750492d5c143011a76988344c2635e69d06f2d38c',
+    'tqbf'      : '317edc3c5172ea5987902aa9c4f1defedf4d5aa59209bdf7574cc6da0039852c24b8da70ecb07997ff83e86d32d2851215d3dcbd6bb9736bdef21c349d483e6d',
+}
+
+
+class TestWhirlpool(unittest.TestCase):
+
+    def test_hash_empty(self):
+        self.assertEqual(b2a_hex(whirlpool.hash('')), results['empty'])
+    
+    def test_hash_fox(self):
+        self.assertEqual(
+            b2a_hex(whirlpool.hash('The quick brown fox jumps over the lazy dog')),
+            results['tqbfjotld'])
+        self.assertEqual(
+            b2a_hex(whirlpool.hash('The quick brown fox jumps over the lazy eog')),
+            results['tqbfjotle'])
+
+    def test_new_empty(self):
+        wp = whirlpool.new()
+        self.assertEqual(b2a_hex(wp.digest()), results['empty'])
+        self.assertEqual(wp.hexdigest(), results['empty'])
+
+    def test_new_fox(self):
+        wp1 = whirlpool.new('The quick brown fox jumps over the lazy dog')
+        self.assertEqual(b2a_hex(wp1.digest()), results['tqbfjotld'])
+        self.assertEqual(wp1.hexdigest(), results['tqbfjotld'])
+
+        wp2 = whirlpool.new('The quick brown fox jumps over the lazy eog')
+        self.assertEqual(b2a_hex(wp2.digest()), results['tqbfjotle'])
+        self.assertEqual(wp2.hexdigest(), results['tqbfjotle'])
+
+    def test_update_copy(self):
+        wp1 = whirlpool.new()
+        wp2 = wp1.copy()
+        wp1.update('The quick brown fox')
+        wp3 = wp1.copy()
+
+        self.assertEqual(b2a_hex(wp1.digest()), results['tqbf'])
+        self.assertEqual(wp1.hexdigest(), results['tqbf'])
+
+        self.assertEqual(b2a_hex(wp2.digest()), results['empty'])
+        self.assertEqual(wp2.hexdigest(), results['empty'])
+
+        self.assertEqual(b2a_hex(wp3.digest()), results['tqbf'])
+        self.assertEqual(wp3.hexdigest(), results['tqbf'])
+
+        wp1.update(' jumps over the lazy dog')
+
+        self.assertEqual(b2a_hex(wp1.digest()), results['tqbfjotld'])
+        self.assertEqual(wp1.hexdigest(), results['tqbfjotld'])
+
+        self.assertEqual(b2a_hex(wp2.digest()), results['empty'])
+        self.assertEqual(wp2.hexdigest(), results['empty'])
+
+        self.assertEqual(b2a_hex(wp3.digest()), results['tqbf'])
+        self.assertEqual(wp3.hexdigest(), results['tqbf'])
+
+        wp3.update(' jumps over the lazy eog')
+
+        self.assertEqual(b2a_hex(wp1.digest()), results['tqbfjotld'])
+        self.assertEqual(wp1.hexdigest(), results['tqbfjotld'])
+
+        self.assertEqual(b2a_hex(wp2.digest()), results['empty'])
+        self.assertEqual(wp2.hexdigest(), results['empty'])
+
+        self.assertEqual(b2a_hex(wp3.digest()), results['tqbfjotle'])
+        self.assertEqual(wp3.hexdigest(), results['tqbfjotle'])
+
+    def test_digest_size(self):
+        wp = whirlpool.new()
+        self.assertEqual(wp.digest_size, 64)
+        with self.assertRaisesRegexp(AttributeError,
+                                     'digest_size.*not writable'):
+            wp.digest_size = 32
+    
+    def test_block_size(self):
+        wp = whirlpool.new()
+        self.assertEqual(wp.block_size, 64)
+        with self.assertRaisesRegexp(AttributeError,
+                                     'block_size.*not writable'):
+            wp.block_size = 32
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/dev-python/whirlpool/metadata.xml b/dev-python/whirlpool/metadata.xml
new file mode 100644
index 000000000000..1e7c21380a07
--- /dev/null
+++ b/dev-python/whirlpool/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Whirlpool</remote-id>
+    <remote-id type="github">radiosilence/python-whirlpool</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/whirlpool/whirlpool-0.3-r1.ebuild b/dev-python/whirlpool/whirlpool-0.3-r1.ebuild
new file mode 100644
index 000000000000..75d9969db99b
--- /dev/null
+++ b/dev-python/whirlpool/whirlpool-0.3-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Whirlpool"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Bindings for whirlpool hash reference implementation"
+HOMEPAGE="https://pypi.python.org/pypi/Whirlpool https://github.com/radiosilence/python-whirlpool"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	sed \
+		-e "/data_files/s:whirlpool:share/whirlpool:g" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${PYTHON} "${FILESDIR}"/tests.py || die
+}
diff --git a/dev-python/whisper/Manifest b/dev-python/whisper/Manifest
new file mode 100644
index 000000000000..29ab0623a801
--- /dev/null
+++ b/dev-python/whisper/Manifest
@@ -0,0 +1,7 @@
+DIST whisper-0.9.13.tar.gz 14028 SHA256 6ba106b7271a69ead72b63f6dd5192aa1816cbec376caa491b4e63af28c17262 SHA512 b4b46bb7f31ecb766495f5f592fb2f9a754f5f38f83f071b533d4302b95808b9b4046bf7769bfa0d7713633344c7c693b57dd550b52acec4617257eba68634c1 WHIRLPOOL c9fdffdcd1bb539037a2e880a82335020c05d2196033842b2da1eb84809184747e7454b3696b11cf3fe9877bf313dea27cac47f7d784b01e9c8fc06796e1e499
+DIST whisper-0.9.15.tar.gz 15655 SHA256 426b92cba867728a90a743e26dba4c71634c411450307934137e73cb3bbc13b2 SHA512 bdc9d299ed713a3fc6104938c347682562d5f17a7f3650d823f9814410dc934899b81bb2f42f52e9cc25313d8ed33f7b4def6d8945561d63f6237492bda2a5e6 WHIRLPOOL 43b1c2c4897f3aa6c714dec8c44d81adc3cf2a5f19c45e93afa874dde6a8c204ce33c70301b206e9a220e75980f086b681a7816966dcebe922553fdffdfba82b
+EBUILD whisper-0.9.13.ebuild 376 SHA256 e9e64d39b9f4e031e979297e2b7890cafc494ea7b67b9025f1f54878f16ebf45 SHA512 718f2e421e60c7d1b8d20ecbf2fdd351faed124b5c418abf8e14c33300a868c98d1801631c604a3af4d9498f457bfb2bcd60fed347e7ffd7722670a78b794183 WHIRLPOOL c896109a687a851881651ea9192c3c3ae3b770f2e8b1d53ad2f70d72ead1200bf2d51c139cb128badd3e3fba559bafb51b67687519a76ae52344479f3bdb5731
+EBUILD whisper-0.9.15.ebuild 391 SHA256 9643b1cfdf8e29b026446329a16dcdc832855e43fba148c44a02a81615f15871 SHA512 79b4504895b3f19cd4eba3bd58c353a73d0c36c1abbf165b401ca93be7b72bbec281ac3e89d548deb8b4cc4373692adc4f360e18ced528214a0db59702cd23aa WHIRLPOOL e7304d0cca7942c5d69fb813013cd380906cf0c5ce4d04682dfe6c271956b22621960f239f0ef4854e6fceb34a6a58315d2bdefaf2cff12255e882d71603f3fc
+MISC ChangeLog 2730 SHA256 39d11858a1aedfc6d376da6a492597b763e8e1e4c5dec8adf218a3d0a2da6000 SHA512 c039c9c8e67594dd8e527576f7b7e7b0e9005504c9b8687c9e9d083e7fd751f5bc8db752dac9da05fa2dd7134985bf186e0aab57e91bde0dbae7ebd8aa4a170c WHIRLPOOL b21348664469f03f57f1193ab4f129693f55ee75b27c15ecfe56e8531a4ed0f761b8ee0dd9f9d5b999f0c5aac203ae04083a33f46a01ef3bb7d19335870feb5e
+MISC ChangeLog-2015 1888 SHA256 74c670971120484155300ff03c680b5b40acfdf7552a94435be4f4a662a7f5ba SHA512 e524b8a7b37949173683a856fafcbb0cec1ce7424c236046e5fa9dacace96817598cde096441bf38dd5627267d61a5f57298a316b53562272cf6fab845bf7dd7 WHIRLPOOL 1b68b5f8815fd59a87a2e3fef91c4979ec9b20e8fe73c0fe908be659a6b22aad902f30e751bc65f5658cd650c93c45f65b869a7ea442fbcb94efd2f16d456ec3
+MISC metadata.xml 420 SHA256 6e08aa5e33762361e508f19b1b39acdfc4f5e36d68642ff19ba33384c57dde7c SHA512 8eb72895313f060ba301166c3d978f8ac2206c18149c969235efc2a57573da425435fdd751a601bd5c3cc1c1e6a20a30dd3e2f600f40c6ec52f5f425f4215187 WHIRLPOOL d0508020df79b00af67c0e9b461d52a32c6aeb37430e0efd08ed2dd2115bb6d569cbd0d7b38310f7cc893eaa6c34526107e5ed87cc5ae7d89ddf84e9c7b4d61c
diff --git a/dev-python/whisper/metadata.xml b/dev-python/whisper/metadata.xml
new file mode 100644
index 000000000000..76c8a4700642
--- /dev/null
+++ b/dev-python/whisper/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">whisper</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/whisper/whisper-0.9.13.ebuild b/dev-python/whisper/whisper-0.9.13.ebuild
new file mode 100644
index 000000000000..bc0ca2feb9c1
--- /dev/null
+++ b/dev-python/whisper/whisper-0.9.13.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Fixed size round-robin style database"
+HOMEPAGE="http://graphite.wikidot.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE=""
diff --git a/dev-python/whisper/whisper-0.9.15.ebuild b/dev-python/whisper/whisper-0.9.15.ebuild
new file mode 100644
index 000000000000..71ce065214ce
--- /dev/null
+++ b/dev-python/whisper/whisper-0.9.15.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Fixed size round-robin style database"
+HOMEPAGE="http://graphite.wikidot.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~x64-solaris"
+SLOT="0"
+IUSE=""
diff --git a/dev-python/whoosh/Manifest b/dev-python/whoosh/Manifest
new file mode 100644
index 000000000000..708490b380fd
--- /dev/null
+++ b/dev-python/whoosh/Manifest
@@ -0,0 +1,8 @@
+AUX whoosh-2.7.4-tests-specify-utf8.patch 319 SHA256 52074f656750897d33fbf3609df86ee257b728009f99ad99aa63b3c25dfa1f5e SHA512 53dc8336ac9895659d92001cb22137011d9da753c299bc3fecd34ed6b42f0f169967dfd41b0403462e54e62af1f6390c58386a91a89ddc880a4fe0a4e05ce14b WHIRLPOOL cc7af539e06078f74e80df8c8e3202d569e3faa8c4be232594fd59915af0d297ad5825b848d1fa6dd263e3c040eb227d30fcabfe6631d6b7f28fdabd6022c988
+DIST Whoosh-2.6.0.zip 1193541 SHA256 7de7bc4d00a6d051dbb360b48eb7f3cd002373d87252fb0b284a3c9c453a7677 SHA512 e50e47ec0d1c65ad3c7d657586f5380a1be748945c1ce964305fa68b99379f0da676faef6f0ca45ef151df7be71150601162ee966f3aaf84047a20bca36f7e37 WHIRLPOOL c42e9760833db7186f3df5946f6dd071288cfccf2eaefba95520a2415ca377c49cf74307b3fa2c9e655f134b086ae637e5db06330248b4a27e12175920f3c7b8
+DIST Whoosh-2.7.4.tar.gz 968741 SHA256 7ca5633dbfa9e0e0fa400d3151a8a0c4bec53bd2ecedc0a67705b17565c31a83 SHA512 7cdefdcf52b704ffe50c00718c42677e2ddfe879f81ad2d14b580b0e026cc0ebb6b9ddc99d8709eaff4eb9b83f654b042c8792821e1ed90aa85cfa6f82845074 WHIRLPOOL 2f077eb84fc89ff03babdd7adb25bf04ca03811a21f9ac987854c158fdd0b31f25d30ad59c9299a2da4b7ed982e2d292eeab781c10c9062e878ac0f8454115ed
+EBUILD whoosh-2.6.0.ebuild 1261 SHA256 4d6c2690ba9b55c883213c8febd5ad374d7dc9919ae43ae8d8414c69720ba398 SHA512 cf20005fa97994ea30cfae70c5291b4f9db04fb23fe3606394e3daadc191c910e58b737d8f3fe22cac0ad5940e31dfcf40e061b68ed9da490e36ba2d3a7dd359 WHIRLPOOL 282b7ccd1c69c26a2956e06f36d5a00187986e7616ed457a410583cc7e28db742ce7861ab2c445eb4b6b4eb3da2fe73f525c8a5f928e30c921f42397c332b908
+EBUILD whoosh-2.7.4.ebuild 1457 SHA256 cc5a9ba86c56ce3202c6ea9dc44f7475da8c9cb462a733a3ad612a7aef70ef53 SHA512 0c428a2b4b60b92879af258f884b5a264e402abd13e0c77525f358edf314498285305116a98532f7369a312c311016aba3fabfae783578f196cc2f9f5bf4475c WHIRLPOOL 15f520b52f0ee49defdde3f67f955d850479f4306ae91af5bde1cadaf6154cba4c0b13ea03d04689872d6ab69cfbf81158b2086f72a7f9dbed642c4b6482bf8e
+MISC ChangeLog 4117 SHA256 b4048239fa20832d62bc75dcb0a75185109a7a6e300d5f71cf32831cb241501d SHA512 30af56e50107a9d8560b28a05b7da637d6a8d098f497e4e895675bb0481e175231e90105855bf8f3380713f184d75040c1e8ecc74ae042e679c8e297e24744af WHIRLPOOL c09301c9d43ba59bacb45fa0671e2e56fe9327fb53486c356c65d25f0a71e1c4fb58b04a435836ce9dea9acfb604a55481b589cab3b2512fe39dfb9f26f95e33
+MISC ChangeLog-2015 6706 SHA256 acf5d0db3e6890fefe81256f6d29f03ab55d9fc36fe5197fa328918e7939c5df SHA512 c6b9a857d51f3a04689b1d9483c9d615ea138f20e0cded92c949e31ff2aa1c99fc02945377d76334d6d255c9b1cbd36cb00673efc373ae667ddb79f643b0dbae WHIRLPOOL 643b884e1f1adad6caf119bafae28588b78888d7f7849b72d996ea7c7d186db00bbcea31410f9e79b05af3851fd6fef2979524839ed4decbba0a99ec6db57a7a
+MISC metadata.xml 817 SHA256 e7239eee69d44587d1028ec9720d23c472a35726ac950ad637e454d234b198ce SHA512 b9c1def2c09a31740729aed91c02a3382c9b8f10d9f959c0c80f41ac4822ac5ad3b2c7c998e244f91e64581c17c4d52a7264f679b44a9981587c053bc3b576ed WHIRLPOOL 702c19193d23e737cb438aa4756e088b39c953ce1ca05a998ec6e02778eaeb5d71af7a197cf81e51babe946059e5401443db798339014f5ac8de86fa024e7825
diff --git a/dev-python/whoosh/files/whoosh-2.7.4-tests-specify-utf8.patch b/dev-python/whoosh/files/whoosh-2.7.4-tests-specify-utf8.patch
new file mode 100644
index 000000000000..94636c199a4c
--- /dev/null
+++ b/dev-python/whoosh/files/whoosh-2.7.4-tests-specify-utf8.patch
@@ -0,0 +1,13 @@
+Python 2 requires specifying the file encoding
+See also:
+https://www.python.org/dev/peps/pep-0263/
+https://bugs.gentoo.org/show_bug.cgi?id=608324
+
+--- a/tests/test_reading.py
++++ b/tests/test_reading.py
+@@ -1,3 +1,5 @@
++# -*- coding: utf-8 -*-
++
+ from __future__ import with_statement
+ import random, threading, time
+ 
diff --git a/dev-python/whoosh/metadata.xml b/dev-python/whoosh/metadata.xml
new file mode 100644
index 000000000000..8582f22d6e39
--- /dev/null
+++ b/dev-python/whoosh/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		Whoosh is a fast, featureful full-text indexing and searching
+		library implemented in pure Python. Programmers can use it to
+		easily add search functionality to their applications and websites.
+		Every part of how Whoosh works can be extended or replaced to meet
+		your needs exactly.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">Whoosh</remote-id>
+		<remote-id type="bitbucket">mchaput/whoosh</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/whoosh/whoosh-2.6.0.ebuild b/dev-python/whoosh/whoosh-2.6.0.ebuild
new file mode 100644
index 000000000000..8b6cf2e997a8
--- /dev/null
+++ b/dev-python/whoosh/whoosh-2.6.0.ebuild
@@ -0,0 +1,50 @@
+# 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 )
+
+MY_PN="Whoosh"
+
+inherit distutils-r1
+
+DESCRIPTION="Fast, pure-Python full text indexing, search and spell checking library"
+HOMEPAGE="https://bitbucket.org/mchaput/whoosh/wiki/Home/ https://pypi.python.org/pypi/Whoosh/"
+SRC_URI="mirror://pypi/W/${MY_PN}/${MY_PN}-${PV}.zip"
+
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	# (backport from upstream)
+	sed -i -e '/cmdclass/s:pytest:PyTest:' setup.py || die
+
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# https://bitbucket.org/mchaput/whoosh/issue/403/
+	use doc && sphinx-build -b html -c docs/source/ docs/source/ docs/source/build/html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( README.txt )
+	use doc && local HTML_DOCS=( docs/source/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/whoosh/whoosh-2.7.4.ebuild b/dev-python/whoosh/whoosh-2.7.4.ebuild
new file mode 100644
index 000000000000..84eb8b1dc2cf
--- /dev/null
+++ b/dev-python/whoosh/whoosh-2.7.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast, pure-Python full text indexing, search and spell checking library"
+HOMEPAGE="https://bitbucket.org/mchaput/whoosh/wiki/Home/ https://pypi.python.org/pypi/Whoosh/"
+SRC_URI="mirror://pypi/W/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 x86 ~x64-solaris"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${P^}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.7.4-tests-specify-utf8.patch
+)
+
+python_prepare_all() {
+	# (backport from upstream)
+	sed -i -e '/cmdclass/s:pytest:PyTest:' setup.py || die
+
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# https://bitbucket.org/mchaput/whoosh/issue/403/
+	if use doc; then
+		sphinx-build -b html -c docs/source/ docs/source/ docs/source/build/html || die
+		HTML_DOCS=( docs/source/build/html/. )
+	fi
+}
+
+python_test() {
+	# https://bitbucket.org/mchaput/whoosh/issue/412/tarball-of-whoosh-270-pypi-missing-english
+	# tarball missing a file english-words.10.gz which when added sees all tests pass.
+	esetup.py test
+}
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
new file mode 100644
index 000000000000..1b5a25ed5243
--- /dev/null
+++ b/dev-python/widgetsnbextension/Manifest
@@ -0,0 +1,12 @@
+DIST widgetsnbextension-1.2.2.tar.gz 721558 SHA256 688a02c08c2708e1a12f70434d7942850a2006998fe5ad3adb357e85fa2daaa9 SHA512 40f0939bb61ca39360873ec7f85ef035b7f033be65ca7d2d0b4219efd343d886c24f53b0e30d00e1b82da55e47c552ec7a7e23a62511c993f679e080e9b18ddf WHIRLPOOL c13a10198f174548a88f0d8b2955ae5045f544d0aab4f521ffb78de82cef224dd1bbe51000a588fd4fd2fcf9c2fefb60c150661fcd7689381e6b8f564ead3355
+DIST widgetsnbextension-1.2.3.tar.gz 719404 SHA256 3cc1196a815379ed1af0d5e911c08ee3e3cb1bf025747ed33c6195261219c877 SHA512 ffa7ed236f6963ee2d202b67a3575d90de110638240ae7c9dd37803452a42a1a595bd668195dc513fb6aae45498030ee18f92dbcfeb7c1191ba09c8e05b18ea0 WHIRLPOOL 51aaf022299c10c5b81eb6a617047a885a82ccea481ad54a91ea9c2ec302f18ba41614501476ceb0d8953ad829f38eda94d9f180010434ee5797b2bebb53e461
+DIST widgetsnbextension-1.2.6.tar.gz 732444 SHA256 c618cfb32978c9517caf0b4ef3aec312f8dd138577745e7b0d4abfcc7315ce51 SHA512 749dc2202956b1678aec44aaf69f5075d3974996f7b43f71f68123429d2d82f2115d7c07be2f06bf4d073737feb741f7fd5b3e40f18ef2d1eb6fa77c18168824 WHIRLPOOL a347dcf28bae08e6a36cdb6be4ea91e88d51d4eaf19d32179a8320b79150ddf798114c82b08eb52a62c5a0823b8d7b0e7527aaa4e2792578897f5cdb422efd5c
+DIST widgetsnbextension-2.0.0.tar.gz 570929 SHA256 566582a84642d0c0f78b756a954450a38a8743eeb8dad04b7cab3ca66f455e6f SHA512 5580b93c98cb088c17825574dfa807bb837bffcdf3b39c3225a6c2b17330974eff7fcb83acfed18eeab65c3f3059aabaf6886e7891b33b1c9ae422b4b96d368c WHIRLPOOL 59a19d6076ad243289179db6025de19e1ed1d1038e71f29bfd0557cd4f1f1a87a726886ae74b91ad22268e45604f61058d43865fadb38b6e9f217a1b1746ada7
+DIST widgetsnbextension-3.0.0.tar.gz 1253392 SHA256 da2d22012cdf1450ed098627924d116232dd53e259e3a54f4f79cd5b52cbaf99 SHA512 079a2ce837e37a8d1707b6686e5c23989bb79af298847ae6bd01dd0f6e570f91e86ff53ff4aa3a8cb4f56f895e3839ef96c722bd156599eb01893870aa1fb4dd WHIRLPOOL 4dab7c972086b8f8ebd0ebea64f152f4aa8b81c313a36cc4c2a9e7166d7c76267e7d85c8326e60b154c766ae60759aeeb8fa9a3433fec41b941a36d4fad2bec5
+EBUILD widgetsnbextension-1.2.2.ebuild 475 SHA256 3d93d4387d08af82669e65e2df30e7bcb53bd9f8425f6a37f807e6ec30e026ca SHA512 2a8aa6514f214080a104bcc8479ff12f32b11b8c683e1317142b992b57bb1511740eb0c7b0ae1b4a8a2670950b15641675989d5edf23dc525a662789c2b665cc WHIRLPOOL 6808394eea30532a4a89fb35e66788c8db4ded7949d17ed8cc7c3e062161ea600db273976fa3518900e39caa31ddd4cb1ecce24de2e63170aa60df094a166da4
+EBUILD widgetsnbextension-1.2.3.ebuild 475 SHA256 3d93d4387d08af82669e65e2df30e7bcb53bd9f8425f6a37f807e6ec30e026ca SHA512 2a8aa6514f214080a104bcc8479ff12f32b11b8c683e1317142b992b57bb1511740eb0c7b0ae1b4a8a2670950b15641675989d5edf23dc525a662789c2b665cc WHIRLPOOL 6808394eea30532a4a89fb35e66788c8db4ded7949d17ed8cc7c3e062161ea600db273976fa3518900e39caa31ddd4cb1ecce24de2e63170aa60df094a166da4
+EBUILD widgetsnbextension-1.2.6.ebuild 475 SHA256 3d93d4387d08af82669e65e2df30e7bcb53bd9f8425f6a37f807e6ec30e026ca SHA512 2a8aa6514f214080a104bcc8479ff12f32b11b8c683e1317142b992b57bb1511740eb0c7b0ae1b4a8a2670950b15641675989d5edf23dc525a662789c2b665cc WHIRLPOOL 6808394eea30532a4a89fb35e66788c8db4ded7949d17ed8cc7c3e062161ea600db273976fa3518900e39caa31ddd4cb1ecce24de2e63170aa60df094a166da4
+EBUILD widgetsnbextension-2.0.0.ebuild 477 SHA256 4283f1dc1e6709e92041492c7cbee0115deb15f618e3bf5f431cc8009a1a42a0 SHA512 bcf19b8ca6e8c954b5cc4250eda257e5405c9c8f6fb2807c9df684356ac26cc3a03495b91115b62d8fc5a23ce7b2b012cac9c15abf4db691b1e907c931202e8d WHIRLPOOL ff1cb5c895de01c3d55f58b1333f2ec48fd509df60ef896a1688ad0848f1a3cd56872e3e72f13a78fd6bbe53ac8453a65c3ddf2fd80082a1a2592d22c35afe43
+EBUILD widgetsnbextension-3.0.0.ebuild 496 SHA256 788dbab3e2b6755783b8a679df0a412ec6fa744e3d9ffc99ad4e4504ae5bdb06 SHA512 2b5357728e2704a6106c92ef572d421dabbcac7603f8a442fb159dbb0fa2b631803cd7599cd49911c5e0367e0662fa68e2415406980456e58d9bda36762b379a WHIRLPOOL 3e5479a7fec196965e7235ab4ab9a7d8ffc67e7bfcef4aea5c499d8eda05f7e7c66d6232068a5b20a2b398d5453e4849fee70f1bbe2ce09785a2c4d89725ff82
+MISC ChangeLog 940 SHA256 b74cdb4e83c55515828d4f1981d9c099e4e7f42effcc30c299b9d01f675e213c SHA512 27b64088a5b0e3faa3a474f2f3916699c37f2fc7d36d742d4f76ebbaa9a84b4f4cfbc9712d5b3fc220dd387548bd9035996e11963146643c2239059ab53804ec WHIRLPOOL b9216b7c8a505763e6f2f6e23fd86e48f55ae1e2b6fa808ab64a99ab4d8731d176182927c541a6f14edd0dfb0b6c4b2189b13ce6fddb2bc7a2f22427d903791f
+MISC metadata.xml 505 SHA256 be5ef649bdc8d0e453014dd0dd9d35f2f0f4a3a8297ee89e7d4acf898d82d146 SHA512 4e7df3a611f92efd9e82d7fa7cffc23f1b90d93ff5c03153c4d34dff6e0acd862f56a2ee9a8a049e213d191c7f1cbd364572b85c6e7df9b3e99d3dd743217505 WHIRLPOOL 16eb73cdad5c07d9e2d31ddacf705193f9696e58efd9058524d3aa26357a6118504ac1656c125c011085a8b9b49f5417d97093fd3f7ca2cb38ba71f88e1be53d
diff --git a/dev-python/widgetsnbextension/metadata.xml b/dev-python/widgetsnbextension/metadata.xml
new file mode 100644
index 000000000000..322ca60a938c
--- /dev/null
+++ b/dev-python/widgetsnbextension/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription>
+    Interactive HTML widgets for Jupyter notebooks.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">widgetsnbextension</remote-id>
+    <remote-id type="github">jupyter-widgets/ipywidgets</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-1.2.2.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-1.2.2.ebuild
new file mode 100644
index 000000000000..637a642a4ad6
--- /dev/null
+++ b/dev-python/widgetsnbextension/widgetsnbextension-1.2.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/notebook-4.2.0[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-1.2.3.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-1.2.3.ebuild
new file mode 100644
index 000000000000..637a642a4ad6
--- /dev/null
+++ b/dev-python/widgetsnbextension/widgetsnbextension-1.2.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/notebook-4.2.0[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-1.2.6.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-1.2.6.ebuild
new file mode 100644
index 000000000000..637a642a4ad6
--- /dev/null
+++ b/dev-python/widgetsnbextension/widgetsnbextension-1.2.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/notebook-4.2.0[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-2.0.0.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-2.0.0.ebuild
new file mode 100644
index 000000000000..5a76d69d2888
--- /dev/null
+++ b/dev-python/widgetsnbextension/widgetsnbextension-2.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/notebook-4.4.1[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-3.0.0.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-3.0.0.ebuild
new file mode 100644
index 000000000000..0f0c8010c0f1
--- /dev/null
+++ b/dev-python/widgetsnbextension/widgetsnbextension-3.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="http://ipython.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-python/notebook-4.4.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/workerpool/Manifest b/dev-python/workerpool/Manifest
new file mode 100644
index 000000000000..1909d65dc58e
--- /dev/null
+++ b/dev-python/workerpool/Manifest
@@ -0,0 +1,5 @@
+DIST workerpool-0.9.4.tar.gz 5409 SHA256 ab455db0de007723cee44c86d37c2575747f158768289bf02e2791f3b1e006fd SHA512 cf8092fa369b9767a8aaf88f22a7edc334f3e337ca9b3fdb1ea8cd50713a9ff9b94e5324452a2f3f4f37d5a2ca8b1b34abd3210452437e2911c66045221c74b3 WHIRLPOOL 4414bad49a1d897a5aa79e67278ed780a2063604ac13d0dc12c8917d0b1b8fc1d986f559f13e40dc2c20a7d3e97342c7b479f7b7fac554239db1b62e2074948b
+EBUILD workerpool-0.9.4.ebuild 673 SHA256 eb48b348180d12cc7d32eb945c2bd7b420f7b1ccf67aed784f2d3ee054ea3beb SHA512 3d45a59da0fbf16240afc2ab5b28f119511f8fd88487223506db39d1cc08789c7b3f4768fce88716c969b78cfe98610d3ce4c50cad159b6ebd1aeaced2a8c91c WHIRLPOOL 859036194b6f408b0ac0c6c5f622c66fc9efe2f9e348fd25b7fb9f407f30330219e34052b0a20f6c3ce3ba011680a8bf5f80a64ec846381587b599a95a16b3a9
+MISC ChangeLog 2802 SHA256 dd47e64f94c2034c7f2c730f58e745206b4d757f0af45b00543f12598818b1cb SHA512 c7bca6cd808e24c76cb3ba1f6e0b5650f3ae03565e8b49d2eec82db0f818193686a098a6c894756c55f72723866dac7f40f1446b3b1ada0ef70a734f8ad0f658 WHIRLPOOL 28dfd41856b75a7dee50684d309eb60c9492179e92c91fd4d3363d59f519f630e123ff435cf64e3b883e445d67027bc37abc587b311d3e8a8231aab43bdb1aad
+MISC ChangeLog-2015 1901 SHA256 9faf7e91245090eda267c1104daf2cafd7613e110e466ba47dde3675daaf3d13 SHA512 b049d178794db4254cfc73ba4a03a8b28c34a6f1ae4e09c8075ffdee39551620eb9290678177a0dca6f9a22680bd9f7249ef7ab59fc1ffe2af21836b2fca70a5 WHIRLPOOL dcbced9af64d1c2eb6a6607ddccd90b80e1640407b6db92bf5a941542ca1a354e98bc6c613ce473b0d2160e9705f6b1fcddcbd9137d830387400003cb91d2abc
+MISC metadata.xml 382 SHA256 14241d1984a8bd09b6cfb2a734ad3e9f91443a6d6d3049609d35a690ef7db5c3 SHA512 5e279aa1d40ec8f7fac1b690a1e1373cce10d7cb063fec5a6a865160396d71323ef2a73a3fd5dc3805fa11bbf8aa5a51fa0a08fdf2bad7b14a1ed48e68cc0c9a WHIRLPOOL d43c045597dde727ad5e650719e3e576eaf756f60b4a0931ec70a2b0dc38297c725f5ad8ff067637922c4c39226de4b03bc3a7c18142921c0920dbf4872422a9
diff --git a/dev-python/workerpool/metadata.xml b/dev-python/workerpool/metadata.xml
new file mode 100644
index 000000000000..162f4f178710
--- /dev/null
+++ b/dev-python/workerpool/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">workerpool</remote-id>
+    <remote-id type="github">shazow/workerpool</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/workerpool/workerpool-0.9.4.ebuild b/dev-python/workerpool/workerpool-0.9.4.ebuild
new file mode 100644
index 000000000000..84dc0f5b229b
--- /dev/null
+++ b/dev-python/workerpool/workerpool-0.9.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for distributing jobs to a pool of worker threads"
+HOMEPAGE="https://github.com/shazow/workerpool"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test examples"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests -v test || die
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x usr/share/doc/${P}/samples
+		insinto usr/share/doc/${P}/
+		doins -r samples
+	fi
+}
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
new file mode 100644
index 000000000000..0670a1b07886
--- /dev/null
+++ b/dev-python/wrapt/Manifest
@@ -0,0 +1,11 @@
+DIST wrapt-1.10.10.tar.gz 122052 SHA256 ded853e421bbc7bb668b085391f2e2be9bd83f8e3565f8efddc937284446e3aa SHA512 e18283cac7bbb137f43fa8c2839fff14072db1fdae57da2b393a5db4007656706838b64bc6785cea25602205b595fc4e7fe033e580d2fb484fd8c77351e046d1 WHIRLPOOL e00854862bc0f0b8bd558642de3ffb99540166b6e888df7159185f1fe3d962e34cd5f88d483f245eb9b013c7d0120d4b9950cce0630a8dec08704d9ceb168b21
+DIST wrapt-1.10.11.tar.gz 122499 SHA256 948bb6ed9a633034924420de701bb0f5f95970f195a509cee2df92f752ab9ae9 SHA512 cc051749341bcd6fc1a950607fad94f74334a00acf0366129470181a5af7a3af32a26e5c5deee9242ee12bcc7e4c47dacb958c514aba8a764be3bcc662845b98 WHIRLPOOL 126210cb96950eefaf856fe3bfd07a0fcc3fc315c04455b41709d88aad09244f2417820f39d5818087ec5aaa5d681ccd610e8892a5186dcea3d5ca5f8963a3a7
+DIST wrapt-1.10.5.tar.gz 119157 SHA256 4fd82193b23f60e1a39f3e10c81143c1e29e26cd5fc9afe1a7dc0f5e4b4a67d7 SHA512 450b32eea67774081d23c0e020ed7eea3c8ac458925a16cd606a4f95ee5b7631bda5ff00ceb914e9ccc28a5e0a7302534b6711bb23d637c77327a8a9d228cb55 WHIRLPOOL 7cfa9477f525e60f16a7b1689ba43b327192837bea34e96977442b9cd143a63fafdfa7d0b3895c93052b0e6f426e76fa439b155ee4e481dd5e922c529676691c
+DIST wrapt-1.10.8.tar.gz 120359 SHA256 096b47f44e3197934ccc335c53d2d21bf6ed9fd941b294726e26a1fd18fd4541 SHA512 2a37584b3c3a33a2d39d5cbe9f7e61a50131db55ffd5be7902b5ee84c347d8ff4d6094e5639d2f854fab274b2517a0e47420da9f543f11cf92973acd6d15d42e WHIRLPOOL 5f27b048b9f06c03c3e3acdd9c3a64308958585deb7e314c80158910cfc1eac154540a0e4a3c838718456d5ed38751d85f49645e634a7d2734cad916547a5bc7
+EBUILD wrapt-1.10.10.ebuild 1005 SHA256 39432c7b705d7e7887a87bb6449a59da1f42329efb2c097b1f4ee851593ea73e SHA512 1dc3a85bf196351bea5ed15cedf09e0c13ae3d22bc3e6e0bc5847fedfc63fffc171e0f0cf81dc859763262f9d10a25f870fa96acec20fb81ce2341b0133b894a WHIRLPOOL 8a741e32a9674e6bac1c2bbcf6cebe720a3017762856d59b36ae37b11c29886429bd4d7ba9258a869eae729bd18b82f65d48e0dbcd6716bb2af067f627ba4c49
+EBUILD wrapt-1.10.11.ebuild 1013 SHA256 5f2d7404eade0993d95ee0bad0b17529f886c2b3d737f01833e3f9173173aa3f SHA512 8f4d620fb18f11d0988df280debfde8d6fdd7bfc550e9d237bd514aa82e9db241a878b30eeb63e103627a9ee0ddab68eaa2190a6c77ba4856f94674bb78edb04 WHIRLPOOL dcb0cec17fdd6ec79023c1cc2f99aa951d3e01229e8f3363008b1f822141d5635f6d87f60e9a67ce5f464e8837c037a1245cf4d72086ed9232d408968eaef29f
+EBUILD wrapt-1.10.5.ebuild 950 SHA256 5e09c0533d3e8d3df7f06f96e0cf07536fc62f91a8b8b33677af81161aeeb9da SHA512 4db2adacc68f4339200e01ee316efad4e7d5df68c6149681bb6a78e694886ff6c0acd033e9ca2948297fba8e95443b57046cdc631a5fd47f9301daa01b5d4adc WHIRLPOOL 549229c317eec9418973fbfbf7d33143e2614fb9a9a20ad88e205841bb5664f08a42f3f407241ca4669dab2425a07d0f81bc070b9f62851ce3277105f50bfa3e
+EBUILD wrapt-1.10.8.ebuild 1013 SHA256 fff97e59fc7596bd476bddabc29c2af3d8afecff777f8b02f8b93cc6a4e3c71a SHA512 94a5c130a722f6b8de4cc00451ebfe795fcabbd672ff688f6731312449c6e038b1e94600aee0b0e6dfaeedc6e9b44fd5655e9702f4fdbbb5e2b965b7c61efabd WHIRLPOOL 3d8c7485730dd6f4ca656e2757357aa9a17179a4ad19f6e7a548d2a369512d289b21c3d34b72635599c9412e3ff446f6550f2ff282d042fe45b78dbcab473e07
+MISC ChangeLog 5482 SHA256 ee8c13d8a324b7673193f4cb309be6abb8d03b29cf3827e2f927ff7b45985f9d SHA512 3766aef1072cef43241a1be7276c5c778f50102dfc55439a480c58a3623f05080a8a1c379c27d43d8ce0e96ce345882d66371a3fbc9385344254673195e00634 WHIRLPOOL 0ce7c1f238d58a222706f44649749b1a3d36fe36d90c04489d3dc298801499c5f5d1780152fc82ea0919ad052aee4bcc9afea76f5d0fc734242b2c55ba11690e
+MISC ChangeLog-2015 566 SHA256 84b85a77ef5cfd27c28d47f49082cb76ac1df09d47087fc5b440f03c743a85d8 SHA512 e21d4fd6fde36a0785200d16ce02144220f5e8600bde5efc27efee915a0fffc34e2ea082fb116444febe0beb22332dc016d2613bf187ed68c4a8209b62297869 WHIRLPOOL b8e1665d559506a95855fb1fed25631c42625be33ff260a7f0c11d8784c91219bc6aaefac5229cf27abef0e845108f97127bd13c90d4ab22dd7e01f5697ec6c4
+MISC metadata.xml 476 SHA256 ac1b8a050575b1137ff4c3639ad6ec8cb64171a129a9430d130b432912ce36e6 SHA512 2768e1bc9684fe8fd1a71fb82ca897a629515112d79a2ab62601532bfd5792bddff737506ad19c0b780ca817a3e6ad41a475deaebba134de2aa5c88d2efe3c26 WHIRLPOOL bdd6743f2dc7ce92b0d41d52aea95312329ddeac30d943d597b359b85fb7adbc7b3de9b6afe57673cf11dc99d4206a54c13b9d3d2e9535d5eab011db98fb976a
diff --git a/dev-python/wrapt/metadata.xml b/dev-python/wrapt/metadata.xml
new file mode 100644
index 000000000000..9084441e88fa
--- /dev/null
+++ b/dev-python/wrapt/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">GrahamDumpleton/wrapt</remote-id>
+		<remote-id type="pypi">wrapt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/wrapt/wrapt-1.10.10.ebuild b/dev-python/wrapt/wrapt-1.10.10.ebuild
new file mode 100644
index 000000000000..49824d082403
--- /dev/null
+++ b/dev-python/wrapt/wrapt-1.10.10.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Module for decorators, wrappers and monkey patching"
+HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
+SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux"
+IUSE="doc test"
+
+DEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND=""
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_compile() {
+	local WRAPT_EXTENSIONS=true
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	py.test -vv || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/wrapt/wrapt-1.10.11.ebuild b/dev-python/wrapt/wrapt-1.10.11.ebuild
new file mode 100644
index 000000000000..5ff5ec966398
--- /dev/null
+++ b/dev-python/wrapt/wrapt-1.10.11.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Module for decorators, wrappers and monkey patching"
+HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
+SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="doc test"
+
+DEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND=""
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_compile() {
+	local WRAPT_EXTENSIONS=true
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	py.test -vv || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/wrapt/wrapt-1.10.5.ebuild b/dev-python/wrapt/wrapt-1.10.5.ebuild
new file mode 100644
index 000000000000..95a88ba3cfeb
--- /dev/null
+++ b/dev-python/wrapt/wrapt-1.10.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Module for decorators, wrappers and monkey patching"
+HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+IUSE="doc test"
+
+DEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND=""
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_compile() {
+	local WRAPT_EXTENSIONS=true
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	py.test -vv || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/wrapt/wrapt-1.10.8.ebuild b/dev-python/wrapt/wrapt-1.10.8.ebuild
new file mode 100644
index 000000000000..14acbfb5e305
--- /dev/null
+++ b/dev-python/wrapt/wrapt-1.10.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Module for decorators, wrappers and monkey patching"
+HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
+SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="doc test"
+
+DEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND=""
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_compile() {
+	local WRAPT_EXTENSIONS=true
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	py.test -vv || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
new file mode 100644
index 000000000000..5dee2f7bf0be
--- /dev/null
+++ b/dev-python/ws4py/Manifest
@@ -0,0 +1,6 @@
+DIST ws4py-0.3.4.tar.gz 65467 SHA256 5aedb5663ee1e5fb4334615cc6582f4f2e97cf967d8dc4c6c3627515d16afa90 SHA512 32cd2eb9df7367e2bf42e354766a0ca407715a863be6b51b7701ec6e0537a2ecf7c2a59423f56ae093855b075c30a4065c7f7efe3b0227915639223b9ba7a55f WHIRLPOOL 77f6c56ab1c2bbcd628f0d1773c1c9659ddc68d976ca8af55804d04e16ec6e9e06e87f5a6a3167670d8c0898dde657f3b3b1fdc4d4a94029f74d71ca2ee50e1b
+EBUILD ws4py-0.3.4.ebuild 1744 SHA256 725f7543bb85710f444eb5c36b34fbfec58558fc431bfb0fc3abbc4a9d94b78e SHA512 c286aac539f135c63001503cdb1ede1cdb5c589a5871025ff1b445c257fc68859bac8022c13b4bf4b9b43940fabe6786e285f521ea646f5eb10b8f0edc8671e9 WHIRLPOOL 2645a7f88bc1a42d90d0f6e066c286232e353d135d6900f08df2b87b6a50e2f3072babfcc78459a31bcb44a02ac6a09870e794ce04d59b2304b0fd84b69efb45
+EBUILD ws4py-9999.ebuild 1747 SHA256 00993179700ee7bc2cd6f9bec010c3480a2a53862c772a7bd1db121ebb21a561 SHA512 e0ae0d6d2dd0bd18a92b37f98c1eb83fdb3c77766c645ff5a94d98cb2e7c1df349067ff5429dda9fc079b2d680750539ed8c13f78fbb956b7d459f29f87017c1 WHIRLPOOL ba60441521c026c2127ff23889b811f40a534dbaa7ee8cea7c58d50250840708df1616433bc405353c177c6ff9f856d0d3896c3b2909d8dfc04c91be97ba7da2
+MISC ChangeLog 3105 SHA256 6b24909db6f319aa9aaa660356d68ce531294cb54f6ba65976908f62b281caad SHA512 1dc1dd86759874b017a523779bfede0806efdb9eb8caf79e8d9e7433055d778fd100d547f2c8cd7fcc91dedc8b5af45688c94650c89ae0e729df580c7cbb6705 WHIRLPOOL b1decec5ccd42fd29144b7b4ffba37aa58eb1e47f021c243f8634ff7e060b5a9b6b3a831e06a7dae0eefaa6dfa301e6e8558c8b704bb6b17f53d5e7e7f747600
+MISC ChangeLog-2015 3444 SHA256 5c6b94ee257670180f7867f804a59f8a6e0e23e892b5aaf5c6f306b291658c55 SHA512 513219ce36a77f47ea291cc01f2ceec8310725fd5e186b4c2b587ae424c347e6d5cc412aa3508a92a4b3f124caa08023b9c7fd86c5777bda222dc5a53a418a70 WHIRLPOOL b662a4728af836c6f8c1c406d2abc2f511c4273b393b8a6716cda6b51c8cdddc2a5c4f78258c95a842a7b716ad7f1f1755a0bc73bc92e304bd483d33fae6026c
+MISC metadata.xml 613 SHA256 6305c316d019a98ac841178a38a4c6c4cbb29854f5719c2d70e3bb2e0d2e56f3 SHA512 826d9fa4dc263f59012ab388f94253368b36af24493b3bfef2318da4233f0c3a1612221ce3005cba1abbcdf5e7400601f24eaa6ee5a248be9072c557b8d26325 WHIRLPOOL 4090023ab84736f0338da8c9cda80d9f107b8f7aa5cbb0005cf23a8e291c089f5ff4ebd2feced4563822b1040386f76fa0d778d990070137fb2de8c43c89905f
diff --git a/dev-python/ws4py/metadata.xml b/dev-python/ws4py/metadata.xml
new file mode 100644
index 000000000000..706d8e4b21e5
--- /dev/null
+++ b/dev-python/ws4py/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>vapier@gentoo.org</email>
+    <description>make whatever changes you want</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <use>
+    <flag name="client">Install client modules</flag>
+    <flag name="server">Install server modules</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">Lawouach/WebSocket-for-Python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/ws4py/ws4py-0.3.4.ebuild b/dev-python/ws4py/ws4py-0.3.4.ebuild
new file mode 100644
index 000000000000..a7084914ad69
--- /dev/null
+++ b/dev-python/ws4py/ws4py-0.3.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# We could depend on dev-python/cherrypy when USE=server, but
+# that is an optional component ...
+# Same for www-servers/tornado and USE=client ... so why not???
+# pypy is viable but better with a cutdown set of deps
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads?"
+
+inherit distutils-r1
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git"
+	inherit git-2
+else
+	inherit vcs-snapshot
+	SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/tarball/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="amd64 arm x86"
+fi
+
+DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
+HOMEPAGE="https://github.com/Lawouach/WebSocket-for-Python"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+client +server test +threads"
+# doc build requires sphinxcontrib ext packages absent from portage
+
+RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
+		client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] )
+		server? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] )"
+DEPEND="test? (
+		>=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	# testsuite displays an issue with mock under py3 but is non fatal
+	"${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+	use client || rm -rf "${D}$(python_get_sitedir)"/ws4py/client
+	use server || rm -rf "${D}$(python_get_sitedir)"/ws4py/server
+}
diff --git a/dev-python/ws4py/ws4py-9999.ebuild b/dev-python/ws4py/ws4py-9999.ebuild
new file mode 100644
index 000000000000..757d4a7a3ea7
--- /dev/null
+++ b/dev-python/ws4py/ws4py-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# We could depend on dev-python/cherrypy when USE=server, but
+# that is an optional component ...
+# Same for www-servers/tornado and USE=client ... so why not???
+# pypy is viable but better with a cutdown set of deps
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads?"
+
+inherit distutils-r1
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git"
+	inherit git-2
+else
+	inherit vcs-snapshot
+	SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/tarball/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
+HOMEPAGE="https://github.com/Lawouach/WebSocket-for-Python"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+client +server test +threads"
+# doc build requires sphinxcontrib ext packages absent from portage
+
+RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
+		client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] )
+		server? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] )"
+DEPEND="test? (
+		>=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	# testsuite displays an issue with mock under py3 but is non fatal
+	"${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+	use client || rm -rf "${D}$(python_get_sitedir)"/ws4py/client
+	use server || rm -rf "${D}$(python_get_sitedir)"/ws4py/server
+}
diff --git a/dev-python/wsaccel/Manifest b/dev-python/wsaccel/Manifest
new file mode 100644
index 000000000000..1dfae0406a0e
--- /dev/null
+++ b/dev-python/wsaccel/Manifest
@@ -0,0 +1,7 @@
+DIST wsaccel-0.6.2.tar.gz 35773 SHA256 425706acf0724d2f6bfa391ec37b4ef121d3432c956029de3cea4e101c218e0c SHA512 fbc59803cbb6b113a3e412390eb02f41a68513b9fda6e4408d5e2e3c976a3f62eacc6bf87adf9295a63238390cce00f4abe13daf397a28ce8f3ed3e3bff622ee WHIRLPOOL 2c66ff720fcaecaa8c7fe29d93bb8f32e620898b0ccf31d3dc3f4dbfe4b1623dde6484e3c347649cd4140ec51b52c9a8c0e81b0c24e6135481ebae7a26c09063
+DIST wsaccel-0.6.2_p20170108.zip 21344 SHA256 f8ee5c61c2166c16ca9aeb5ac2c39647423053ac3c123b25ecca5b4a773f8b5f SHA512 d0cf13360bd6cc0b51b8bee1d36a8ee544816c318e828bf6129ff85827636642cfebae4ef0e99d841cdf64f6c67006a649994804aa42d3d76e977a861aafb3b9 WHIRLPOOL da46bea0232b67461eacb116c6f35bf485d8e113a3014a86f3ceeb95f0170b8259e1a48c850c2fa703c5128890d967f0a9f47bde0da24916edc401b993520bde
+EBUILD wsaccel-0.6.2.ebuild 575 SHA256 5d513c0030ca2187a61819da869cf7f694af8cfe06e9db078d3cc2a7d888bbc7 SHA512 814864e7319e5b769282028e836e8a4f2316b53bd0759bb96c421de56eec0db1144b02eb88edb1dbfe86eac8800f4ed871647214cb417647a231a626bcc37d7b WHIRLPOOL a984face953171f330140a2a11bf19c8786d6c11a6c3c8fa421ddad26a3d7704d336cdee1c4d2d394c82580c977df36db0e7567dde0c6ac1dbea939369317952
+EBUILD wsaccel-0.6.2_p20170108.ebuild 722 SHA256 6f70b5235f964575bba2180903b7778dc841cf444488d7f61e81a9fcea9b2d01 SHA512 9463a8afd21030c92b4b4d9ebd282978a863015b75e187a34194adad5d773cec393f8166c43b13f676cde42bbdfd44eed92b6f97da14c375b3de6e4a6961b280 WHIRLPOOL b13f9d23ef08c6d6f58d55e834f7b54efae895698f3c06225ab3dfc93323e11c56357613696e0dffdafe6b9e66ac8f6de941cfd8c9a8380c9b875f253e988759
+MISC ChangeLog 2697 SHA256 513ab7a277d92bc69c2a81ca3ed0da6495d90a0f4ea2d7effd912ff81d3956d6 SHA512 a24c119565b01cec9922c3ebdfa8dd3bff2ce6f43160fdd13978d4deae207c1dede55042e06b6fc8ced96a4909393825dc158ed75f038195f6918dd4803d8a1a WHIRLPOOL d26a486ddaf18d60f4f69fb8a0d76178d15c0b444147f4eb01b2da772dbffeee45eab758811181bd02485c8a1a1ff10437d4610a8e4b1743a71e15614055dd9e
+MISC ChangeLog-2015 1036 SHA256 ac2bf4273d77866c78f4866ac47883996a952bda9f2b13c6ae5bdd961de05bf8 SHA512 59a1aee34921fdbaa49547718a73a711fdfae4ae548e4ad8859c095157296ac378c05bf42ce7dd3fc497ed07a4766dba9a11f7831fc4fc93f17b23caac067587 WHIRLPOOL f756b42972c67cd4caf25ae68b74d85acfe1dbebe98c2cd41f40897480d60681a4c6093b0c13dd9c813634cdda630fdb1760a843f8d13f741d68793c8312fd39
+MISC metadata.xml 377 SHA256 9b3f3aec1f8b57b07b4c8ae3a4776640317f2e014c7c9bca1f0527aeb65e3a82 SHA512 cd6ff7d5e94219b550161b57a1c6f3736a8c78906a81a5e293046b9b3b454f97c1fb41dd7eb7034f45ab784c22189e3788f2e8d9c17a725743936796af3a4d6d WHIRLPOOL e94c6b6e31eda169e6ff3edf50acc4b78abd752065a4c5bd9f2c0e6c02ec159c83f74096475b0560631e67e6214592ad4a99a5c8eee7e154e9f8d1d23ffe5a48
diff --git a/dev-python/wsaccel/metadata.xml b/dev-python/wsaccel/metadata.xml
new file mode 100644
index 000000000000..586f5f5231c1
--- /dev/null
+++ b/dev-python/wsaccel/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">wsaccel</remote-id>
+    <remote-id type="github">methane/wsaccel</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/wsaccel/wsaccel-0.6.2.ebuild b/dev-python/wsaccel/wsaccel-0.6.2.ebuild
new file mode 100644
index 000000000000..6d551302f4e0
--- /dev/null
+++ b/dev-python/wsaccel/wsaccel-0.6.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Accelerator for ws4py, AutobahnPython and tornado"
+HOMEPAGE="https://pypi.python.org/pypi/wsaccel https://github.com/methane/wsaccel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+#RDEPEND=""
+#DEPEND="
+#	test? (	dev-python/nose )"
+
+_python_test() {
+	cd tests || die
+	nosetests || die
+}
diff --git a/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild b/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
new file mode 100644
index 000000000000..3c81271ea2ae
--- /dev/null
+++ b/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+COMMIT="0fbd074c257c51b73de05b25ccb6488801320a32"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Accelerator for ws4py, autobahn and tornado"
+HOMEPAGE="https://pypi.python.org/pypi/wsaccel https://github.com/methane/wsaccel"
+SRC_URI="https://github.com/methane/wsaccel/archive/${COMMIT}.zip -> ${P}.zip"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (	dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/wsgiintercept/Manifest b/dev-python/wsgiintercept/Manifest
new file mode 100644
index 000000000000..52af0cc00b05
--- /dev/null
+++ b/dev-python/wsgiintercept/Manifest
@@ -0,0 +1,5 @@
+DIST wsgi_intercept-1.3.1.tar.gz 24596 SHA256 5de354a99ca2b400ae302e423f6bb6c1d2a01767fdcc8e5589340d3e542eb97e SHA512 6b435246b20694437ec0c79b9675af3a24c43b77e3b1ca6b8ede473c2077259197ada5c4dcb9f197331975ed97e7d475792f9ab4a7da2aa9c657203c55662479 WHIRLPOOL aebe450bfe7aaf7409acc31eaee3a17a565c7b7460c9eed64c0f482cf2d074de325e99c3cf023b642465399803465ea59bff5ed65d255694cbee19cc2aa43cf8
+EBUILD wsgiintercept-1.3.1.ebuild 1599 SHA256 bac824b510dafe9601e427bd37790551db53036fc973b7ebd885975068d1ed2a SHA512 2238249cb13927e86256b1af2b744c26d4e3bcc05ad847609792bae97def845864b347e9bc995fcc4d0828f73350e13dbc04a186d6d4870065e970a7b095737f WHIRLPOOL 5cad8582760df9c5f81a11e8b6bf355ece9fcb5a838a81fcdbd6f3789f1a781e38239718cf2d16cb4b2d294b8559d1de4aeee09e1794d8eb896868de41700cf1
+MISC ChangeLog 3523 SHA256 bb2fb20736fd6ccc5ea55d894b6eae8dd1a77d1085df90972b29eda0530d3f7a SHA512 eb503eae71c6ff632232e52da514671b525003f601b27fc4d1458edd2339bb4d85e644181ecb5971cc7708f2cfb35804cec54ea6a811099d2d1db5f565408399 WHIRLPOOL f30368502cd3f8309df9e6c84680a2a90da41b11501c1b8202bc3efd99ec00f674fff0f00dc361629a5b297fa8c37a705eafc9439bd38181d7c835a45379c3ab
+MISC ChangeLog-2015 2997 SHA256 97f5c7766707131d32333e492c42f83740fa708d588add2e4a3a5982718a744d SHA512 c0905c7847c7df53b2ab45a6d8862950b24c155ddcf03ad90a67709e4105f19892c0f9aa18fd9ba3145174d92f7def837e37018a43cc56cf0685625931971d24 WHIRLPOOL a14d23433b3c7015c2081fce61f5fa13ad179c7a53109fd7d90cb7695416028a456a348cc6b1631ea52775c349ced31b748c1867b94f083348f52002f6eb0d59
+MISC metadata.xml 892 SHA256 5f3e28385dd3382eee1ddf786a8ca5b2a0b20f63b0b35bea0787d1fd9b7e66f1 SHA512 776ed8e2f5df00109aae96f10c1ad5f678ac92c348b15d3597b8c48fd3961da19d0d397a7322c7f2c2b02fc7befa9db5cee8d4eb33b43c280c0076bcc1fa9ad9 WHIRLPOOL 347ba71972e2a833ffbf7ca525c5627214c0925aa195b13ff33f506e1b0d02f80237c4c7521dadf5549f94eb661cedf175150ef1d4478684406e0498d23f4219
diff --git a/dev-python/wsgiintercept/metadata.xml b/dev-python/wsgiintercept/metadata.xml
new file mode 100644
index 000000000000..74ef24e0a42c
--- /dev/null
+++ b/dev-python/wsgiintercept/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription>
+Testing a WSGI application normally involves starting a server at a local host 
+and port, then pointing your test code to that address. Instead, this library 
+lets you intercept calls to any specific host/port combination and redirect 
+them into a WSGI application importable by your test program. Thus, you can 
+avoid spawning multiple processes or threads to test your Web app.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">wsgi_intercept</remote-id>
+    <bugs-to>https://code.google.com/p/wsgi-intercept/issues/list</bugs-to>
+    <remote-id type="github">cdent/python3-wsgi-intercept</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/wsgiintercept/wsgiintercept-1.3.1.ebuild b/dev-python/wsgiintercept/wsgiintercept-1.3.1.ebuild
new file mode 100644
index 000000000000..8047d781ea3f
--- /dev/null
+++ b/dev-python/wsgiintercept/wsgiintercept-1.3.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+MY_PN="wsgi_intercept"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="WSGI application in place of a real URI for testing"
+HOMEPAGE="https://github.com/cdent/python3-wsgi-intercept"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	test? (
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.4[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.0.1[${PYTHON_USEDEP}]
+		>=dev-python/urllib3-1.11.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mechanize[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# .pyc files cause failure of tests
+	rm -rf test/__pycache__/ || die
+
+	# Req'd to avoid file collisions
+	sed -e s":find_packages():find_packages(exclude=['test']):" \
+		-i setup.py || die
+
+	# Disable tests connecting to the network; Bug #550710
+	sed -e 's:test_http_not_intercepted:_&:' \
+		-e 's:test_https_not_intercepted:_&:' \
+		-i test/{test_urllib.py,test_http_client.py,test_requests.py} || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html//. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/wsgilog/Manifest b/dev-python/wsgilog/Manifest
new file mode 100644
index 000000000000..a23cd3409b7b
--- /dev/null
+++ b/dev-python/wsgilog/Manifest
@@ -0,0 +1,5 @@
+DIST wsgilog-0.3.tar.gz 4299 SHA256 2193c7eadb7c341970c50b2607f48f12c8031cbd2ce19803c50c55d84417a68f SHA512 be6788c059f1901b21d272b53b6f9ba4096d1f02f244635c5661f75ce40b3f778ca1b72df76c070b50cab3c44a0cefe0044bae75541b20769da61c9d4fe0863b WHIRLPOOL 1f58cadb78746d4ac34ed3500276b7cbfffc90034b80e62eeb2c31bb78c9ebfe86aead7a4511b4982aaa7ce8c4df92cfbe7157cb65f04cfc0fe8cef905c9b133
+EBUILD wsgilog-0.3-r1.ebuild 440 SHA256 977dddc87c8a5e5f132b11afb7370bb1499667661f14c8a27ab61c470197981c SHA512 cecfcb7e3b6ed3035eb3c1ee8e20edbc085ecb1026c01dabf7a4fb30b0f153a517e6f379627e907d58974b0ae9644a1f4c453fdb174440f6787abdd530c82774 WHIRLPOOL 5a1d8c5cbda1016ad62c9bf81972b3b7007fdc4d7df147f53a205f9540a71fd2f365aa03ccf81659dad57ce53630e2119d0dd8ef5df021478bc5e3eb4be99739
+MISC ChangeLog 2575 SHA256 554b0118e9ca0e38b9be59866d8e16af70b6d0672032bf054379319e78fd3f3f SHA512 e2c50af0165cf993864096ac01f7101aa3d3477ee28cf9d3f833438f8e04dbb4f840eabb3596e6dc915fa6b0ada5bbb0873b27ed896e39f4899b3f2325dc204f WHIRLPOOL 9779788db309ea72c2b599a980fd1994c3fc79087e60652c246e8c764c2d685b01ca64a23892b1ee83a4166da12cc0e4750f62f07a539907a3f99671ded89368
+MISC ChangeLog-2015 1080 SHA256 83260ee35eb45d0000ca4bbacd0ddfbdc28c56012ef294ab5a0ded687930339f SHA512 22c6a8634c760d5166033c203261c20e7f21b4bd07fc9275756fc868e803f1a201fa21824879c66599b79fb824caec4f1f72a117a8f0893c4267539509dbf349 WHIRLPOOL eebfb4492abe568db5905e4278d77915222afba90c338755c60490b8754b9f31fd9b28a1c891ed53a95ac3f2d897b70660164fe03e31ce266fa8a38f5e47fc57
+MISC metadata.xml 441 SHA256 a56ce450ead27700f5b8610e0f736873f8aaa2322dd8f44782a294ece3ccd3eb SHA512 f9a706f666f879424727372152fb2aa19a46366cd10be72ec3a3673c8df342a63378e117fb170eb5f90d50aff3c8f1a0b7408942526a0599852e9716e6458f33 WHIRLPOOL 5436bee7fad83f3f8d35d1cde2c7bb977e2ab685e5fccf4a535401f779853f1229ef37e0bd32bd097c7a31da11dc7a9be7c34220fae3a78e95152e977b43b30f
diff --git a/dev-python/wsgilog/metadata.xml b/dev-python/wsgilog/metadata.xml
new file mode 100644
index 000000000000..bdc9b4508447
--- /dev/null
+++ b/dev-python/wsgilog/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>jo@opteamax.de</email>
+    <name>Jens Ott</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">wsgilog</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/wsgilog/wsgilog-0.3-r1.ebuild b/dev-python/wsgilog/wsgilog-0.3-r1.ebuild
new file mode 100644
index 000000000000..c88488e6fc53
--- /dev/null
+++ b/dev-python/wsgilog/wsgilog-0.3-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Class for logging in WSGI-applications"
+HOMEPAGE="https://pypi.python.org/pypi/wsgilog/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+DOCS="PKG-INFO"
diff --git a/dev-python/wsgiproxy2/Manifest b/dev-python/wsgiproxy2/Manifest
new file mode 100644
index 000000000000..b767f198cd8a
--- /dev/null
+++ b/dev-python/wsgiproxy2/Manifest
@@ -0,0 +1,9 @@
+DIST WSGIProxy2-0.4.1.zip 18437 SHA256 70232dd33ffc742b2c1e8d7573a61035a1b7fcd92dc0c761e283de515ab94f69 SHA512 794cf74d47366ab80f03ef311cd77258b4152f266cabf662b3eccb0f706f246d6d4407f495432ed32520ed69ecf3cb5ae05ef8a50e7f59062c6ef7395d8c9eec WHIRLPOOL 08c784bb15a7a1da21ea38201781e502ad3f5515658a441f7671f2ba2c971966f320e52f223b6d47feedb35cefb4c513be454114f5d2635a78ec991b2e1a288f
+DIST WSGIProxy2-0.4.2.zip 18817 SHA256 a4b236fac5d4a2b51d9b3ed34cbe0d01aae173dce0ab9877f225b1dcdb4a6e8e SHA512 3dd750263485ceb644373d8ea9692c9a46126a1ed7cd640feba7d42b0fe618e290dcae2f76dc83be77de34211ac473f5a1496a8309e3fcc64982e9642af786fb WHIRLPOOL e585abf60d7f3bfe60d700dca99887efe0616f4cdb43de2edabe3b53b8b4f7eaf730c465d1a95618ac4ff0c99b488fa241400eaecd69ca8cd7c2e2012fbbcd51
+DIST WSGIProxy2-0.4.4.tar.gz 16475 SHA256 f9347ba1405ebe4ea614a290f10d44577f3fdc644e8ad2c9e10392c46416a398 SHA512 6ae9fca65fe80f52924f42b26b447631e8c278f517ababc23d26e5f8598d6d9b7975197ec74faf64f2e051824366ac14c5db5727a014a187c70a1b4604105b42 WHIRLPOOL 03c86eda1c20a28b6adbadfac8d7d717c8bc184313309db1377dea0a8b16a10beab6dca08413e5ff31ca6e7ed5cebf43851d79c18714fe5142405c96ff03ffca
+EBUILD wsgiproxy2-0.4.1.ebuild 1282 SHA256 56953eceb500904a095f3d42166eee58ecdb2c274cf36239b5392484c4f05aa5 SHA512 a2a5d432cac37ca08700efc3f7247864ddb3839ad3873e6724856f95fb3c2437fb26b5b216267dc4f25cb99a0d8e45a3f2f0ad8c318616f1e421379bde43ce39 WHIRLPOOL bcc639510bc5a7e2473966a9ad053848840a4dddb5f8e354512b656332741c2e68ac71963e302c9d4cb1c92d758fc9233f6646a3cf62700c52d9a8099b03dc9c
+EBUILD wsgiproxy2-0.4.2.ebuild 1298 SHA256 dd0e079b0443da071a7f1c88ba00f134adf97d2da6c4e04e56d29d42bbe3eef5 SHA512 646b476e6b55e1af716c967556e6c6f2227f847ab973eb2353d3f7e448dfc29cd15c7839908e8a6b9e6855e4ad0a576bc726507082461107388e0f518c30d429 WHIRLPOOL 0126883f3d4d996322d216d76fab41f87ed9ed7bad64a707b306c4b4b8ec1da9852ebf76416b77781908edb626e62405df23890ecfb11cf118b90d5f4a26a21f
+EBUILD wsgiproxy2-0.4.4.ebuild 1309 SHA256 8dfa12de3afadb555b37608612edc092f9280d7e3d635b57cfa15fa0c68e212d SHA512 cd14b57474021e35c1012e983da2404273aae37f979395ed95e44916877026d5d684a7b33cc506c4a55dba43d3a87b07d0937012ab002cbcee5eb8f3e99172b9 WHIRLPOOL 31c1b6be346cb2e26ee08378c787c82ed5a956ef26363b7364171f06c023cb5997ddfae4a37218aedb09b3922b474e6d686083451d2429b75ed9eff4233525a4
+MISC ChangeLog 3421 SHA256 deb908b260bcdc7efbc0061648c61ad0a94c94149dac28c5ab19cf84b4e8abe6 SHA512 fb83680d5fd156e17d121222405f48c658ae5ad602f3f178a95320e5599db8e57fa331fd95efd76c5e4ef6a6c0d69557fd37537058423b3190e3e01e59403758 WHIRLPOOL 152631e976ecf8a1e2d8106cb50d480c6b08442da4fad46a3945ea79f9a2725d1a9541467574274d489bb21db45495578e164e560b807f784ff2f61853376d32
+MISC ChangeLog-2015 2995 SHA256 e6bd1f19051f66ed0f348dcaa39fee7d12230f094a68d76d7d10f5ea2697e3e9 SHA512 8a882be116359243940d8663a63b192b63660f432301d7f21834acf1bdf0632e72ae0427a7b89fa37508b8d5f69caa8519a44bd51b22acc35ca6b54510667488 WHIRLPOOL 65a095e9689303c64b96f6561fe58061c0854cc7d7e300e18c153ab7dba93fe4bbb69887d0d44da142b4221315b9ba296b5a653c53b1e18e78d729025e1d94e0
+MISC metadata.xml 313 SHA256 15281dafb8ed9b64c93064fe3d2b414523e208db4b74617794d87804cbbbc988 SHA512 147915d551dc542cb68d4cab97a3b187ef698dc450cb730c80eec846e4d4debc954b68d04f76e1df835fcc4d179d705ee95379b38c7d39d0f1ffce809941a7c4 WHIRLPOOL 28f18600dd4e402d3cf1a556328c38199265576e7befdaed08224920a85120ee805281d903ede991405d376b419476eb5f6b36e538a82c584c8fb0845907c715
diff --git a/dev-python/wsgiproxy2/metadata.xml b/dev-python/wsgiproxy2/metadata.xml
new file mode 100644
index 000000000000..810c0e4c3120
--- /dev/null
+++ b/dev-python/wsgiproxy2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">WSGIProxy2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild
new file mode 100644
index 000000000000..932c46971df8
--- /dev/null
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild
@@ -0,0 +1,51 @@
+# 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} )
+
+inherit distutils-r1
+
+MY_PN="WSGIProxy2"
+
+DESCRIPTION="HTTP proxying tools for WSGI apps"
+HOMEPAGE="http://pythonpaste.org/wsgiproxy/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc64 ~s390 ~sh sparc x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/webob[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}]
+		dev-python/socketpool[${PYTHON_USEDEP}]
+		dev-python/restkit[$(python_gen_usedep python2_7)] )"
+# Tests needing restkit are skipped under py3
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build -b html -d _build/doctrees   . _build/html
+	fi
+}
+
+# this was always possible
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
new file mode 100644
index 000000000000..bf48cd474a38
--- /dev/null
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
@@ -0,0 +1,50 @@
+# 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
+
+MY_PN="WSGIProxy2"
+
+DESCRIPTION="HTTP proxying tools for WSGI apps"
+HOMEPAGE="http://pythonpaste.org/wsgiproxy/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc64 ~s390 ~sh sparc x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/webob[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/webtest-2.0.17[${PYTHON_USEDEP}]
+		dev-python/socketpool[${PYTHON_USEDEP}]
+		dev-python/restkit[$(python_gen_usedep python2_7)] )"
+# Tests needing restkit are skipped under py3
+# Testing also revealed the suite needs latest webtest
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build -b html -d _build/doctrees   . _build/html
+	fi
+}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild
new file mode 100644
index 000000000000..1756e680ae96
--- /dev/null
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild
@@ -0,0 +1,50 @@
+# 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
+
+MY_PN="WSGIProxy2"
+
+DESCRIPTION="HTTP proxying tools for WSGI apps"
+HOMEPAGE="http://pythonpaste.org/wsgiproxy/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/webob[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/webtest-2.0.17[${PYTHON_USEDEP}]
+		dev-python/socketpool[${PYTHON_USEDEP}]
+		dev-python/restkit[$(python_gen_usedep python2_7)] )"
+# Tests needing restkit are skipped under py3
+# Testing also revealed the suite needs latest webtest
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build -b html -d _build/doctrees   . _build/html
+	fi
+}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
new file mode 100644
index 000000000000..18b9334b9042
--- /dev/null
+++ b/dev-python/wstools/Manifest
@@ -0,0 +1,7 @@
+DIST wstools-0.4.3.tar.gz 148878 SHA256 578b53e98bc8dadf5a55dfd1f559fd9b37a594609f1883f23e8646d2d30336f8 SHA512 e735e2ae63aa410a56c79bef0bec7196393bb8f52d8521001d298b6290a75662f7262b6cd3c3238eeaf33263036cc6dabf8435ebd2fd1c98481cea524d0382ed WHIRLPOOL fa5ca24db23d99337cb08f3317327f6076f230c787477275e54d2322931d4e86831357043df6e8c12f3a62bac95eda13f614120588e9d3265ba40251c68b2881
+DIST wstools-0.4.5.tar.gz 201047 SHA256 499760d87d9bb62fb937669bb9acb2de8a6393dcce3c5fbd3bc693b4a7bdd4ba SHA512 24779bc2c2f3e32a515bc5690038e3f8e487fd45c1b7822d587e1bfd0bda660b837e3d5cbf8248459e06d7606e6d1c404dcee4de35b1f0d353bd5213e197d83a WHIRLPOOL 80341b7e7756cd750ab97983b9175ed6ad7e482c9d3ca5d2a34a3d9166ec68bca107fbf741f4b18379e3b958b4b1872c32ce3274a859bfbc58c16735f749c652
+EBUILD wstools-0.4.3.ebuild 596 SHA256 1d8e702d45c51d871109b6094261168eb9faa58a3b986f0b0da3d9de14ce1361 SHA512 4a25ec83bcbdde5259b17e94939896bc1c7f229cd1183b4e3faeb18864f0e0d3cf5129696ae0c658e0a587c8804eabb6a8e0ac161ae3b7944934dc952e8c6d0e WHIRLPOOL 2ce9f39b57839bacb4e3f1d0e648b78f3bd81aacdfa7446ed91cdcfdf32fc716dfb26a59de8dcffc78d48e1f280db0b9fc0ca5a97b1367b4172075ee5e164a17
+EBUILD wstools-0.4.5.ebuild 936 SHA256 f9094de66e785aa163a8dc6abdbdfcf90639ccd64d6389e05cf9dae282335fc0 SHA512 dc9308d3e66cf66f9b501b29bffdbd6387f7b9016ce31659a280ee4789fbe9bf3c123433dfa884f381335cf259b00f42ad7ec663854446e7f8d7007085bd1a2a WHIRLPOOL a8e89474dff4b918b9d2cd2c08d106a324ec28e57e5e41256cb1993e1459b52f528d1f0472dc1355026c00642d7b57e9af5d3ea4ce5b6133177c9794c8a206d6
+MISC ChangeLog 2964 SHA256 6c608fcc88435b908d2629fd90dfbc9ba237ae429b44abdef517c79ce25bcd5b SHA512 1a90b313d102bbfef02dbb760151112f58f820b269f33fd363c7f58f39c4af9ba825c67e1378aa4f34b74794d04d4f09de772bfc0287cdabd7dacc02e1631610 WHIRLPOOL 56ad24f2e6c7cc09a9fc8916e43289f6bd9eb594aeffd9ff7f7b79e6ed863771861ecded959c63b66db3af82b2b27e2a8624aef5e1f3246424fdd23ed900b7df
+MISC ChangeLog-2015 3371 SHA256 ab5ebc13dec3d01a77e253b930307633b15f32a4b2fb03c52ec3ebd7aa285ea2 SHA512 d8aa762715eef7767c3e4c1ef28718e88f9024f6808f7015fc20e7edf6aef90250281e82ea8b5ac755e63b0973803e51d512ae65c8a1bbcd51588bb9839762ef WHIRLPOOL bc8b1d8be0785dbd9031d32060a480d9d6f3ca5e1023d21a3c75acf855586be398ac23e4e137c66a3c9ec8f01132aadaaa12ab094c7f3c1b6217ab38af0e81cd
+MISC metadata.xml 376 SHA256 0b2564271a0011fc1df0251d89a375f341b32f7aaa76adf33a8718bb1ffa29d0 SHA512 fe2f379a3d41b128b1c817d4e56fe92b72541bcdfff4e40e05da8a661ab30b5eb623421ce6ec366cdb8431c924f6132a9d15982f1182f6a1f4c71f8301d954b8 WHIRLPOOL 1ffc052cbeed9f6d949d58610ae1e94bac0876e3a6c0028dda051c1e73bd29628a0229832d0f8b7439e5fcccc9a54650f0b648360b66d0155eb278b2696c4d5c
diff --git a/dev-python/wstools/metadata.xml b/dev-python/wstools/metadata.xml
new file mode 100644
index 000000000000..a09270e1fdbf
--- /dev/null
+++ b/dev-python/wstools/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">wstools</remote-id>
+    <remote-id type="github">kiorky/wstools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/wstools/wstools-0.4.3.ebuild b/dev-python/wstools/wstools-0.4.3.ebuild
new file mode 100644
index 000000000000..6558e784e6fc
--- /dev/null
+++ b/dev-python/wstools/wstools-0.4.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="WSDL parsing services package for Web Services for Python"
+HOMEPAGE="https://github.com/kiorky/wstools https://pypi.python.org/pypi/wstools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/wstools/wstools-0.4.5.ebuild b/dev-python/wstools/wstools-0.4.5.ebuild
new file mode 100644
index 000000000000..50f2db48e105
--- /dev/null
+++ b/dev-python/wstools/wstools-0.4.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="WSDL parsing services package for Web Services for Python"
+HOMEPAGE="https://github.com/kiorky/wstools https://pypi.python.org/pypi/wstools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/autopep8[${PYTHON_USEDEP}]
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/pep8[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/pytest-cache[${PYTHON_USEDEP}]
+	dev-python/pytest-cov[${PYTHON_USEDEP}]
+	dev-python/pytest-pep8[${PYTHON_USEDEP}]
+	dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/wtf-peewee/Manifest b/dev-python/wtf-peewee/Manifest
new file mode 100644
index 000000000000..3f29b00b24ca
--- /dev/null
+++ b/dev-python/wtf-peewee/Manifest
@@ -0,0 +1,5 @@
+DIST wtf-peewee-0.2.6.tar.gz 61072 SHA256 93d36bac202be4d268bd4e4ad188c5160a4c1f3d8a5d5dd8a2d7c106adaeb26e SHA512 073973e1dbec17fb3b036447e5150d5de36aeb47c697878e4e97abec4de53a77275278000f4dc982bc1aa1a76736f5a15053d583ab04316c568085973025f833 WHIRLPOOL 798ec4d858291d6d5ecbe4ea618abae8d5d39c891a037deeebeff85b974cd5574b0ae8063a8170609ac6c924adbe64c6b8c675089750ad5f9af362c8a2cab5aa
+EBUILD wtf-peewee-0.2.6.ebuild 763 SHA256 3bc471cfdb61b526cfc092c3bcaf8240c06152fdb9a6271f18f3d0ba72e8cd14 SHA512 d4f4795e2ff2e10677519a90de217a4ed2f23ce6114de8b2171bf0fbeb70eb375db8c3f32d8b08d6fb9b1eb6ebc55896e546fb887e4a552c7fe285200ae3abc6 WHIRLPOOL cd9876e3cfe189b711e70abec74597be1bf3a48693e37583f7a757fe5cfe67f1f4cfe393b3da3f445fb3efa2f0aa47d088e5e5b556078c1b8223c6d3c05d7fa5
+MISC ChangeLog 2943 SHA256 049daa69789ce181a20980dca7b4881b1052e392e437da6d70f2a70c62771c7b SHA512 ddeec4f41db972dda37104bb8b4fbca85d66e9fc61468814ee75f2bbe5dd5d6b321ef4e17bbd255ee796b1802ae859f939ad92a6b8210316542194f03edefa26 WHIRLPOOL 1d92768e5f5a11db130c7da063feea51139b4b525a818d850f91e6e9c327584242fbd731761b15300599d08e0584d7fc2a4403e2863e00780f761f6f743f4aeb
+MISC ChangeLog-2015 1713 SHA256 bdff83fcc73f1aab36d224715d190f222e74a089d3c9edf94151f643e5c478ad SHA512 e14ce17e469ac460c42813f29d869b3532fea5497ac427d514e8da71529d8acaf47adf30199949b25553d8cbc0b1f8cd6bc24a97c3380f0c3bc91ef6604d28ca WHIRLPOOL 12505481fa1a68a176f98a1a99aad0280cd104e0cd09c7c48d60e013308fafbc4634b9f0b7d22a68e64e1991861d9deb6b72e02a2ea062c9976d3b47cf8fb3c4
+MISC metadata.xml 334 SHA256 b5e7be8b19f24fe298c53e9e3cf3e52362d6b2c01adc26f669c1d2b421f8d9e2 SHA512 cf2d8a659c3cb78ada57d97b9bf4acdd1e7eb7324ba38ffa7ff09ed6e5863aa5633d06231cceb3b5741ff57d37b26804672cf06ba531bee3574539f472ec9a43 WHIRLPOOL c500898721c78679706de5e4ff4264377d478ce41c176b2aba869f1fd54bcb1e2165afc78f6f1d649a5c0568dba805de76206accf18eb95cf52a11bd35098863
diff --git a/dev-python/wtf-peewee/metadata.xml b/dev-python/wtf-peewee/metadata.xml
new file mode 100644
index 000000000000..f2ed65fb5077
--- /dev/null
+++ b/dev-python/wtf-peewee/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">coleifer/wtf-peewee</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/wtf-peewee/wtf-peewee-0.2.6.ebuild b/dev-python/wtf-peewee/wtf-peewee-0.2.6.ebuild
new file mode 100644
index 000000000000..ad54f1802b62
--- /dev/null
+++ b/dev-python/wtf-peewee/wtf-peewee-0.2.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="WTForms integration for peewee models"
+HOMEPAGE="https://github.com/coleifer/wtf-peewee/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND=">=dev-python/peewee-2.7.4[${PYTHON_USEDEP}]
+	dev-python/wtforms[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" ./runtests.py || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r example
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/wtforms/Manifest b/dev-python/wtforms/Manifest
new file mode 100644
index 000000000000..32fdb2eb4223
--- /dev/null
+++ b/dev-python/wtforms/Manifest
@@ -0,0 +1,5 @@
+DIST WTForms-2.1.zip 553644 SHA256 ffdf10bd1fa565b8233380cb77a304cd36fd55c73023e91d4b803c96bc11d46f SHA512 2bdac0a35eca465021df9fb37dc0acd87bf487c6158b782d48870e9d5aab6ed3eb635af89bb38b9e8419688185f7c7b7875e68f7435d94bca8b074b2dddb12a0 WHIRLPOOL 91bdb0db56cc7171a87c72a0892f2e4a19ed25398f596996dcba2c4ffb0f2c61b45caeab4da48d7d43a80cccaf9ac650be936aedf61789f01ecdac6cbe657c10
+EBUILD wtforms-2.1.ebuild 1247 SHA256 d7d56272190198670875a1272c8ed49c9a5c2c622e3d4f33c94727c444ac349d SHA512 3a451d943adf598d74dc92bb176a96c4fa8c8de30e7e76dee7ebfee25f444e6a89dd8a4c07c1cc4f034bb369be32f4016757684eeaacd4b663f35723132c888c WHIRLPOOL 58fff3e789ec6c72e8bb80cbcd0bb46ca5b1f0b2c91ee930c9c50b6216d1cd4eba4f93fb39940e9070a6886c3e34aab96a0ec88667273cbb7fa2c307256c2e01
+MISC ChangeLog 3375 SHA256 e746e1ff54c8af905e9f511b0d8de6c77b2bb39ee2120133d942a24b6ab422b7 SHA512 0c6aa8198c900a8ac2ccbd9b16d211404406746c1bb7646e084586ced916ccb88c9f28f7b394007ac029a293eac30e9d355f120922a62fd40e2faeec367fd4f9 WHIRLPOOL 3c49a2e5dda7fefae206c8fea04f31f9db558c81872408b09d243264e1d3915f79bd5a053b203479615e5c6faddd95fe06295b4c6a48cbf386e7bfd5cc6f1176
+MISC ChangeLog-2015 5550 SHA256 4a587b83e37a9f166ed03f026dd208e1abd64bba55d0956f957e36ec2df03cfd SHA512 6fe5572fb6d7041635651a5ec64e9a373167265dece2628c998562d94a58fd5c2e20298443b69877697891b48f3f2dfe3aeb3a191a536a2ee9b8ea77c661d446 WHIRLPOOL 5d6bb45eb41ce22c5407320b3e292d364eec757d9a9f495723cf4423305acce48ed4404283a2122adeda74631f4ceab830d19ba14b03a531b3fd9a85be03a702
+MISC metadata.xml 310 SHA256 16e5b285c213b1cd472fa672fded5e6c2a9ef525b8972cee5119be03e0339486 SHA512 12e5d9d017ccb42db1407a0a567cdb5edc794c2655b5f1179c00337ad97af7b9f621847d1e643f02dc952b3abe34abef9c31cb9620b47a80d99359dc0360594e WHIRLPOOL ed1bb99a43ec3a7b22b8c49c2929ab686d546aaccbd2e1af39f27994c4a5b805592e0d87397dfaffe301de2b2e84274fddddcf9dfa94959dced5c0fa14110bc5
diff --git a/dev-python/wtforms/metadata.xml b/dev-python/wtforms/metadata.xml
new file mode 100644
index 000000000000..3fc3226c6f71
--- /dev/null
+++ b/dev-python/wtforms/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">WTForms</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/wtforms/wtforms-2.1.ebuild b/dev-python/wtforms/wtforms-2.1.ebuild
new file mode 100644
index 000000000000..f3f868242f83
--- /dev/null
+++ b/dev-python/wtforms/wtforms-2.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+MY_PN="WTForms"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Flexible forms validation and rendering library for python web development"
+HOMEPAGE="http://wtforms.simplecodes.com/ https://pypi.python.org/pypi/WTForms"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/Babel[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/webob[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Extension-tests are written for an older version of Django
+	sed \
+		-e "s|'ext_django.tests', ||" \
+		-i tests/runtests.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
new file mode 100644
index 000000000000..e20619532620
--- /dev/null
+++ b/dev-python/wxpython/Manifest
@@ -0,0 +1,21 @@
+AUX wxpython-2.8-cache-writable.patch 538 SHA256 caf371fdd36ae60b36754f6fa66df3887c3ee2e1dd509f8cc8bc92525942f429 SHA512 e0232ff7bcb713358a2981b84b0eac3b3b0825d43b43dd6f19d3d21f9b45a9e63fbf39dc87c2fedc0342a88007ef43fcd9d890177dc38e15b4f89576fdf363a0 WHIRLPOOL c2c0488d0d5a840d1be68c95a2f53d3bce7d58798f0e09f2116f16655d73c8a5b525af7d7b836c7f820bd729acff441942510055b8f455a9b2f742361effd6c3
+AUX wxpython-2.8-no-preservatives-added.patch 525 SHA256 590ef2435f3bb24ce061213628467652509aa39992d9b0f94e1c784952d523b8 SHA512 83e066d6798aea833304004d7270e3b7698e51581e9ac9c934b96fb438bbafb16cea15cc73297961893fd73fd18f95cade22c134aea6556962025fc3c12bdedd WHIRLPOOL 218e72aa785c762f0171987c79cb7d998864252ebd259537e463f134caabca17d8f5d5d75f2ec7791cf5353edb8331d173eb6f08d4fbb7f7713d9ca14ad91831
+AUX wxpython-2.8-wxversion-demo.patch 219 SHA256 19618386cf750f56051541c403153bf1c7e90764199e53818eb0c9557d026f1c SHA512 a20e79dc2f96400046dd5d5697533466529c30bde96a2e8ace1984c7e3fb42a6b38375cacddeb319253dbaabff6571b52af41da5268d22cfb294b11da56421f8 WHIRLPOOL 3af6ad578fcc1144f0172b4a959665441880ba20b9d471049f9c48602987e4265df34b180cd98727d0beadef66e6603fbdad7f1d0b0358a795b3372a8f46d2df
+AUX wxpython-2.8.11-drop-editra.patch 2197 SHA256 a0774e4c273485711cb3da4d70cf7bf0766a9f189fafdc7bae07186d553f341b SHA512 3800b68ba13c52e81a4411940e297f83f9e98c76b4d8d9d3e53ac55564a38b1376b57df337e4f009b1cbbd44199293554058341aa2122ec329c3a42dd38593a6 WHIRLPOOL c79b106c6cbcbc1089bcbdb13bc7e5aeb613a8f374edf7a3d4680d3240b27de2f1d8a0e15ddf13257d7878cc2828b8fe49b2db8ff23eeb1bf7f7ebcf69c9f885
+AUX wxpython-2.8.12-drop-categories.patch 1554 SHA256 37c4e706e5a63e51995bbd99ceceace0cf12789aacbb6a8cc4ed6e13c2c22531 SHA512 d622cdd72db26ff44a058b9c4dd0a0a20b504d4799933636ffa3fd131e4746ae993ec80a74dc7a6496cb1306187222fb075004db547937b7c91857b8c18fe0e1 WHIRLPOOL 49fa7a4e53402d4fc4a77213fe3760ae271e85680fcc5d6a1623ef4a7621b926d672a760313c33b5450c7256b4964b8203bd6ce8543f55033a09ccd41f1cee23
+AUX wxpython-2.8.12-drop-editra.patch 2643 SHA256 bbe4960ab735f344916e36cb772a1a6c7e27d6540c7ee1dcd8437bff8fb6bee8 SHA512 d49e2ab9cbc388e21b387c04524979840a52b167fe718e333d742a427fc18d7dbab0d2554263697796c802b81435ae8499e33b640f5840b4b626d01bc2f9780d WHIRLPOOL 70dd7825b701d5bd4589f8e6c6c9881dba250ef03b5c4bde0bc552e8154f729439e17caee2bfb16922ddbe34db60be60e0eb2d91156a9a7a6ce35ccbde7241ba
+AUX wxpython-2.8.12.1-disable-egging-mode.patch 1146 SHA256 47d3fe389cc8da061c936ba12e4ca27941a756cb76264286c8ab78f4203fb5b9 SHA512 a834a2c3f009f6855755bd07b54683b8f3d9dc58ee9d0631e51c0450e3bac98245e4dab0e40820ba1727b6a0d8528675443c986d7fa4f7c58d606d60975e4190 WHIRLPOOL d61f64f3cc36a6696eb33abbea96f2e1693d35d443c13c777512668487836c26251177967a38c0f2742decebc5bceb62da9602447e9080bb7a77e87a20d17bcf
+AUX wxpython-2.8.9-wxversion-scripts.patch 7730 SHA256 55b1caa38295338dda3cc9ebfa4e43eb3be76959a0ee9b23a7b81085d80d7ba6 SHA512 f6ff14045487b53733ed71ed4fd2d5a2d847d5f267f2c6348fefe38f1f0db11a3b0b4cbdd61a3a391d820bc39e13c0aa1b57360c045f49ae539212f08fb07332 WHIRLPOOL c4d946f0e1625623f8d98063901c790a99799eb7d46fb8afcbd59b458330bbe40bc9e1e29c954f8c0c07cd65afd1ec7b02d12fe53e803a6a742f9b01afbc733e
+AUX wxpython-3.0-wxversion-demo.patch 147 SHA256 23e89aaf72171b2c0ec3a302f2252137c2c087a6672726e626d20fb430a1c763 SHA512 99682f18a520b68b313301784adaf71c1ab9181022b743de82c9cc6acfaa1fc77867ef43c00926f6d7bdde8ed29fac24b5eb72761209a2e2a1d498feee85a0a1 WHIRLPOOL 04cff26f220526c17bf8fa3249aaaa2fa6293e6ffb7a49ef4d06a634ec8cf684c92280e1b9cc1cc5dcc50897569b52f68fdfa1f1d4b1d2ab6ace553784ae309c
+AUX wxpython-3.0.0.0-wxversion-scripts.patch 4187 SHA256 1fbca19b7281245801160de2ebf8a1f00057840078355977f169cb20eafe32ad SHA512 74fe603daafdbc5a50daaa3411ea40243d1fdee2cb3bbd0e6e99bd73bd124137161cd682673f2c727faf92214bfa4d27c059021f19c92c581485bb1d6a5b49a6 WHIRLPOOL 10fcdfcf96fe992194d899941a7c75854c7afb016c39014e7827b90f09fa1cf523b22c9c668aea52084b85895989d498aa4a715626c716169686b1f144071f82
+DIST wxPython-demo-2.8.12.1.tar.bz2 3906851 SHA256 252282193a80590b9eab436bef322701b21d35ad03b4b6ebb4824241ff947b5a SHA512 aab71cf4e4fb6632afd4607cbe5cdef6785c4ed3f1c7f67d6cef5487d1caee2f7652bfd974ba95a6a03e8d7809c94e291aca00c2fdf74ea29e118e1e30c947d5 WHIRLPOOL e9eb0803350e3dac8c5f2228a3f4d54a26ae4c4307c924729bbdff712747419fdfaa155d83ef1bea7dcb849dbacf9f48c323bf7997ed1df85f182ba3878d1324
+DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 SHA256 8bf195138744898b4b6fbe11f52f7ee2f6319c2e3adf832917769b2e2d4994f3 SHA512 361ecaa7dfe5bae0757e04215c564370eaf8e5260ead45007f9d70439c15701725c3cbcd76691a5191258bef24fd200ebd61347a3fd920d888137bfc98a16702 WHIRLPOOL a944790a4c7b38dc8d8d28c7def50f765cd5566118d801cb576a0ab9d8370a803f8feedbf3211d0352dd838c92d9d4f092eaf6d78354a1974f2345304dd7b2e1
+DIST wxPython-docs-2.8.12.1.tar.bz2 2331363 SHA256 1dfae3a74b91e2003856eed51698c51094f1a4e6688633ae61af7a22fa8a0ddb SHA512 88591ef4f61bcbac29050d7dfecc230f7338cc006e7c3abc072b15da478e4fd994ab73ee5d072cb8b84f9de62ce182f1774354b0a7a4502ea639e59fdf965358 WHIRLPOOL 97bc66c8f781b5092e2274edc0b9bac35c21c91a66e4c0da75d543dc471f25d02334b28a5afe4ad0681b7a018a93f08b6ef5d3c6afd127ccfc24da208252cd89
+DIST wxPython-newdocs-2.8.9.2.tar.bz2 1503913 SHA256 890b6b7ca37ba7aaa27f9716ea9992ac75ed8150e83939506e3c47f86e7f37a8 SHA512 e114b2b44a7fd3ac292ca9735fb2e075459211384bc98d62ff2ba49e45111825101e74abd4af2ab0e5e52ede7b831641367c11a5c80e79f2da6ada3442463bfc WHIRLPOOL 91ccbe19e8311f0404fb0096efff68750fa0c3b505d05c9278e0488e138788dc399ff2345e13c712126475957a1c1fcc53556d70cd9c835524207be5758a6e2b
+DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 WHIRLPOOL 94f91d359f755a0f805588303e8507b2f1404a7f4af73777f85366265df9f76ca89ac29bff491cffd752b707645952a4f7f2bb12fa7e30f3e7d3728147a9c99d
+DIST wxPython-src-3.0.2.0.tar.bz2 58304944 SHA256 d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61 SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4 WHIRLPOOL 89cdef12c9ef96044adba0340d47b699e685eaec581a4e7d68f3b95a0890715e29b1f5362027df0f3f8b5b1587e8fe404a7fa88049ece9677dd8316fbdf2e41d
+EBUILD wxpython-2.8.12.1-r2.ebuild 5582 SHA256 46da75ee4a32f1d3432648df3bb951770015f863e95c88d80e31a65aaafb5b7f SHA512 adecc3c972afc2ecc6a1c377a59589c0d7d7c5512cd063d21b299831e51d450893686922d1c4cad5bd5e933a20fa8b664885e1762025fd9fb1f57808c88306da WHIRLPOOL 843a2511d2eb4e31ea313aa9c3dc3e5cb4d1dee061efea61b31e2d366985ef4e6ad727bbfeeebcb7def9128d5f860c706f17b7e64b7ec54148b97c3206dcf1cc
+EBUILD wxpython-3.0.2.0.ebuild 4607 SHA256 9f760eecc0fa84b70d7935194884f6a009303dc69ec59a2fd0374a2a850c0d00 SHA512 fa4c4287c2d6f9e913eed285a0995346c2202a54724647e0c1fb172f40333c6b4223676430712a072e4083ecef6a81e08f9e684a0c1d6291f5413553d8037d52 WHIRLPOOL 922b70834a9cd1a91c8d8d4e4674f24a857ef69e51850d6037b1ec6715c60227f0a644b4226534ab2150906e0131e8957cd11822be4e7b88bee994286dfbb8ad
+MISC ChangeLog 4690 SHA256 e4ceac65ff5bfb650811ce1c805019b682050dc539eda40842ea29e65ae1f94d SHA512 02f7ffdbeabee53a6b90a36a6c24fb9752ab46809dd18c0f082a5e10b64120c8dedef5295fe61ba1974e7229888eb1828fd10351ddaa753c569c3193061f92c0 WHIRLPOOL c6bc85fcc8a77f27bf9fe71fa06b7a9fd3b7eb62f955a4369a0ccbf6a8cb5f58abc5b71161a2cb7f57845343f4475476cadc9703bbe656b106f1c5d01e119f4d
+MISC ChangeLog-2015 36629 SHA256 bcbf6d022fde1e159561bf7486c9974a0ead23c4c6a6a67f387aa59a9743a768 SHA512 645c9f33ec88ab5474da38420cc0028ae79f3b37811f3fff1c5add38bd4c4aee930acf39e36605a6c5e125cb79f50fe038b662fae7022d86bf916f086cfff889 WHIRLPOOL 1158b736d4be8429adf524c5adaa0ce2fb92011745ef91213a206cbb0c76e24ba25954c1127a80ae562c3976068d0d59516d6ee83dcdfea60cf34eb9ae84d1c8
+MISC metadata.xml 628 SHA256 5e6d96b46ea0ad4319b56d21307be6aa4405b5e85e0f23a803dc9fb494108bfd SHA512 d081019f4f78f5099d0c5fabd250f42ee1865231aac95124c28a6fa6354d568b900bf0733178b415c0159054fe6ab13feeb7b97c554a76b67b66b9bf27bbf168 WHIRLPOOL 82c8bd97d993cdc7505c1b38dda10ed12a927e3010b819cccb854df459d5a63c44a4dcf425d61605bb13be6e2719e6bdd783c4fc5fa0da2d3db1fd93db31cffe
diff --git a/dev-python/wxpython/files/wxpython-2.8-cache-writable.patch b/dev-python/wxpython/files/wxpython-2.8-cache-writable.patch
new file mode 100644
index 000000000000..57f26b37c2e8
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-2.8-cache-writable.patch
@@ -0,0 +1,20 @@
+Use /tmp for cache files since the user won't have
+write permissions on ${DOCDIR}.
+
+diff -Naurp docs-orig/viewdocs.py docs/viewdocs.py
+--- docs-orig/viewdocs.py	2008-09-28 15:59:16.000000000 -0600
++++ docs/viewdocs.py	2009-01-18 00:16:27.000000000 -0600
+@@ -16,11 +16,11 @@ if not basePath:
+ 
+ 
+ # test for write access
+-if os.access(basePath, os.W_OK):
++if os.access('/tmp', os.W_OK):
+ 
+     # setup the args
+     args = ['',
+-        '--cache='+basePath,
++        '--cache=/tmp',
+         os.path.join(basePath, 'wx.zip'),
+         ]
+ 
diff --git a/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch b/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch
new file mode 100644
index 000000000000..5e4221d51506
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch
@@ -0,0 +1,16 @@
+Portage preserve-libs removes the linker name (.so) of a library but leaves
+the soname (.so.4) and realname (.so.4.0) installed.  findLib searches for 
+mywxlibname.* and returns true if anything is found.  Disaster ensues.
+
+
+--- a/wxPython/config.py
++++ b/wxPython/config.py
+@@ -612,7 +612,7 @@ def findLib(name, libdirs):
+         dirs = libdirs[:]
+     for d in dirs:
+         p = os.path.join(d, name)
+-        if glob.glob(p+'*') != []:
++        if glob.glob(p+'*.so') != []:
+             return True
+     return False
+ 
diff --git a/dev-python/wxpython/files/wxpython-2.8-wxversion-demo.patch b/dev-python/wxpython/files/wxpython-2.8-wxversion-demo.patch
new file mode 100644
index 000000000000..97829198a0b2
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-2.8-wxversion-demo.patch
@@ -0,0 +1,10 @@
+--- demo/demo.org	2005-04-28 03:00:13.431583384 +0000
++++ demo/demo.py	2005-04-28 03:00:31.886777768 +0000
+@@ -1,4 +1,7 @@
+ #!/usr/bin/env python
+ 
++import wxversion
++wxversion.select("2.8")
++
+ import Main
+ Main.main()
diff --git a/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch b/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch
new file mode 100644
index 000000000000..9555bb57ef44
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch
@@ -0,0 +1,48 @@
+--- a/wxPython/setup.py
++++ b/wxPython/setup.py
+@@ -887,13 +887,6 @@ WX_PKGLIST =      [ 'wx',
+                     'wx.tools',
+                     'wx.tools.XRCed',
+                     'wx.tools.XRCed.plugins',
+-                    'wx.tools.Editra',
+-                    'wx.tools.Editra.src',
+-                    'wx.tools.Editra.src.autocomp',
+-                    'wx.tools.Editra.src.eclib',
+-                    'wx.tools.Editra.src.ebmlib',
+-                    'wx.tools.Editra.src.extern',
+-                    'wx.tools.Editra.src.syntax',
+                     ]
+ 
+ if not EGGing:
+@@ -920,7 +913,6 @@ else:
+                opj('scripts/pywrap'),
+                opj('scripts/pywxrc'),
+                opj('scripts/xrced'),
+-               opj('scripts/editra'),
+                ]
+     if os.name == 'nt':
+         SCRIPTS.append( opj('scripts/genaxmodule') ) 
+@@ -934,15 +926,6 @@ DATA_FILES += find_data_files('wx/tools/XRCed', '*.txt', '*.xrc', '*.htb')
+ DATA_FILES += find_data_files('wx/tools/XRCed/plugins', '*.crx')
+ DATA_FILES += find_data_files('wx/tools/XRCed/plugins/bitmaps', '*.png')
+ 
+-DATA_FILES += find_data_files('wx/tools/Editra/docs', '*.txt')
+-DATA_FILES += find_data_files('wx/tools/Editra/locale', '*.mo')
+-DATA_FILES += find_data_files('wx/tools/Editra/pixmaps',
+-                              '*.png', '*.icns', '*.ico', 'README', 'AUTHORS', 'COPYING')
+-DATA_FILES += find_data_files('wx/tools/Editra/plugins', '*.egg')
+-DATA_FILES += find_data_files('wx/tools/Editra/src', 'README')
+-DATA_FILES += find_data_files('wx/tools/Editra/styles', '*.ess')
+-DATA_FILES += find_data_files('wx/tools/Editra/tests/syntax', '*')
+-DATA_FILES += find_data_files('wx/tools/Editra', '[A-Z]*', recursive=False)
+ 
+ 
+ ## import pprint
+@@ -993,7 +976,6 @@ if EGGing:
+                                   'pyshell = wx.py.PyShell:main',
+                                   'pywrap = wx.py.PyWrap:main',
+                                   'helpviewer = wx.tools.helpviewer:main',
+-                                  'editra = wx.tools.Editra.launcher:main',
+                                   'xrced = wx.tools.XRCed.xrced:main',
+                                   ], 
+             },
diff --git a/dev-python/wxpython/files/wxpython-2.8.12-drop-categories.patch b/dev-python/wxpython/files/wxpython-2.8.12-drop-categories.patch
new file mode 100644
index 000000000000..d860238e94de
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-2.8.12-drop-categories.patch
@@ -0,0 +1,37 @@
+Fix QA issue wrt Bug 457586
+diff -ur wxPython-src-2.8.12.1.orig/wxPython/distrib/PyAlaMode.desktop wxPython-src-2.8.12.1/wxPython/distrib/PyAlaMode.desktop
+--- distrib/PyAlaMode.desktop	2007-07-19 06:33:55.000000000 +0800
++++ distrib/PyAlaMode.desktop	2013-03-04 13:48:51.737419595 +0800
+@@ -5,4 +5,4 @@
+ Icon=PyCrust.png
+ Terminal=false
+ Type=Application
+-Categories=Application;Development;
++Categories=Development;
+diff -ur wxPython-src-2.8.12.1.orig/wxPython/distrib/PyCrust.desktop wxPython-src-2.8.12.1/wxPython/distrib/PyCrust.desktop
+--- distrib/PyCrust.desktop	2007-07-19 06:33:55.000000000 +0800
++++ distrib/PyCrust.desktop	2013-03-04 13:49:12.209418445 +0800
+@@ -5,4 +5,4 @@
+ Icon=PyCrust.png
+ Terminal=false
+ Type=Application
+-Categories=Application;Development;
++Categories=Development;
+diff -ur wxPython-src-2.8.12.1.orig/wxPython/distrib/PyShell.desktop wxPython-src-2.8.12.1/wxPython/distrib/PyShell.desktop
+--- distrib/PyShell.desktop	2007-07-19 06:33:55.000000000 +0800
++++ distrib/PyShell.desktop	2013-03-04 13:49:28.713417518 +0800
+@@ -5,4 +5,4 @@
+ Icon=PyCrust.png
+ Terminal=false
+ Type=Application
+-Categories=Application;Development;
++Categories=Development;
+diff -ur wxPython-src-2.8.12.1.orig/wxPython/distrib/XRCed.desktop wxPython-src-2.8.12.1/wxPython/distrib/XRCed.desktop
+--- distrib/XRCed.desktop	2007-07-19 06:33:55.000000000 +0800
++++ distrib/XRCed.desktop	2013-03-04 13:49:46.345416526 +0800
+@@ -5,4 +5,4 @@
+ Icon=XRCed.png
+ Terminal=false
+ Type=Application
+-Categories=Application;Development;
++Categories=Development;
diff --git a/dev-python/wxpython/files/wxpython-2.8.12-drop-editra.patch b/dev-python/wxpython/files/wxpython-2.8.12-drop-editra.patch
new file mode 100644
index 000000000000..4b49f30a1385
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-2.8.12-drop-editra.patch
@@ -0,0 +1,55 @@
+--- a/wxPython/setup.py
++++ b/wxPython/setup.py
+@@ -887,20 +887,6 @@ WX_PKGLIST =      [ 'wx',
+                     'wx.tools',
+                     'wx.tools.XRCed',
+                     'wx.tools.XRCed.plugins',
+-                    'wx.tools.Editra',
+-                    'wx.tools.Editra.src',
+-                    'wx.tools.Editra.src.autocomp',
+-                    'wx.tools.Editra.src.eclib',
+-                    'wx.tools.Editra.src.ebmlib',
+-                    'wx.tools.Editra.src.extern',
+-                    'wx.tools.Editra.src.extern.aui',
+-                    'wx.tools.Editra.src.extern.dexml',
+-                    'wx.tools.Editra.src.extern.pygments',
+-                    'wx.tools.Editra.src.extern.pygments.filters',
+-                    'wx.tools.Editra.src.extern.pygments.formatters',
+-                    'wx.tools.Editra.src.extern.pygments.lexers',
+-                    'wx.tools.Editra.src.extern.pygments.styles',
+-                    'wx.tools.Editra.src.syntax',
+                     ]
+ 
+ if not EGGing:
+@@ -927,7 +913,6 @@ else:
+                opj('scripts/pywrap'),
+                opj('scripts/pywxrc'),
+                opj('scripts/xrced'),
+-               opj('scripts/editra'),
+                ]
+     if os.name == 'nt':
+         SCRIPTS.append( opj('scripts/genaxmodule') ) 
+@@ -941,15 +926,6 @@ DATA_FILES += find_data_files('wx/tools/XRCed', '*.txt', '*.xrc', '*.htb')
+ DATA_FILES += find_data_files('wx/tools/XRCed/plugins', '*.crx')
+ DATA_FILES += find_data_files('wx/tools/XRCed/plugins/bitmaps', '*.png')
+ 
+-DATA_FILES += find_data_files('wx/tools/Editra/docs', '*.txt')
+-DATA_FILES += find_data_files('wx/tools/Editra/locale', '*.mo')
+-DATA_FILES += find_data_files('wx/tools/Editra/pixmaps',
+-                              '*.png', '*.icns', '*.ico', 'README', 'AUTHORS', 'COPYING')
+-DATA_FILES += find_data_files('wx/tools/Editra/plugins', '*.egg')
+-DATA_FILES += find_data_files('wx/tools/Editra/src', 'README')
+-DATA_FILES += find_data_files('wx/tools/Editra/styles', '*.ess')
+-DATA_FILES += find_data_files('wx/tools/Editra/tests/syntax', '*')
+-DATA_FILES += find_data_files('wx/tools/Editra', '[A-Z]*', recursive=False)
+ 
+ 
+ ## import pprint
+@@ -1000,7 +976,6 @@ if EGGing:
+                                   'pyshell = wx.py.PyShell:main',
+                                   'pywrap = wx.py.PyWrap:main',
+                                   'helpviewer = wx.tools.helpviewer:main',
+-                                  'editra = wx.tools.Editra.launcher:main',
+                                   'xrced = wx.tools.XRCed.xrced:main',
+                                   ], 
+             },
diff --git a/dev-python/wxpython/files/wxpython-2.8.12.1-disable-egging-mode.patch b/dev-python/wxpython/files/wxpython-2.8.12.1-disable-egging-mode.patch
new file mode 100644
index 000000000000..1497a2c70761
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-2.8.12.1-disable-egging-mode.patch
@@ -0,0 +1,34 @@
+From c4072ed7bc923039e544319f52d0761b7a4600a4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 22 Apr 2013 18:02:37 +0200
+Subject: [PATCH] Trigger 'EGGing' mode only by 'bdist_egg' and not 'egg_info'.
+
+We use the 'egg_info' command to explicitly enforce temporary EGG file
+location outside the source tree on Gentoo. As a result, our build
+command activates the 'EGGing' mode and wxPython is not installed
+properly.
+
+I believe that the 'EGGing' mode should be activated only by an explicit
+call to 'bdist_egg' command where the expected files are actually
+created.  The 'egg_info' command is a more broad one and is often used
+implicitly, e.g. by the 'install' command.
+---
+ config.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config.py b/config.py
+index 4fbd83f..b45707d 100644
+--- a/config.py
++++ b/config.py
+@@ -23,7 +23,7 @@
+ import sys, os, glob, fnmatch, tempfile
+ import subprocess
+ 
+-EGGing = 'bdist_egg' in sys.argv or 'egg_info' in sys.argv
++EGGing = 'bdist_egg' in sys.argv
+ if not EGGing:
+     from distutils.core import setup, Extension
+ else:
+-- 
+1.8.1.5
+
diff --git a/dev-python/wxpython/files/wxpython-2.8.9-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-2.8.9-wxversion-scripts.patch
new file mode 100644
index 000000000000..6a4567812308
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-2.8.9-wxversion-scripts.patch
@@ -0,0 +1,191 @@
+diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/PyAlaMode.desktop wxPython-src-2.8.9.2/wxPython/distrib/PyAlaMode.desktop
+--- wxPython-src-2.8.9.2-orig/wxPython/distrib/PyAlaMode.desktop	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.9.2/wxPython/distrib/PyAlaMode.desktop	2009-02-21 15:04:55.000000000 -0600
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+-Name=PyAlaMode
++Name=PyAlaMode (2.8)
+ Comment=GUI Python Shell with Filling and editor windows
+-Exec=pyalamode
+-Icon=PyCrust.png
++Exec=pyalamode-2.8
++Icon=/usr/share/pixmaps/PyCrust.png
+ Terminal=false
+ Type=Application
+ Categories=Application;Development;
+diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/PyCrust.desktop wxPython-src-2.8.9.2/wxPython/distrib/PyCrust.desktop
+--- wxPython-src-2.8.9.2-orig/wxPython/distrib/PyCrust.desktop	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.9.2/wxPython/distrib/PyCrust.desktop	2009-02-21 15:06:42.000000000 -0600
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+-Name=PyCrust
++Name=PyCrust (2.8)
+ Comment=GUI Python Shell with Filling
+-Exec=pycrust
+-Icon=PyCrust.png
++Exec=pycrust-2.8
++Icon=/usr/share/pixmaps/PyCrust.png
+ Terminal=false
+ Type=Application
+ Categories=Application;Development;
+diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/PyShell.desktop wxPython-src-2.8.9.2/wxPython/distrib/PyShell.desktop
+--- wxPython-src-2.8.9.2-orig/wxPython/distrib/PyShell.desktop	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.9.2/wxPython/distrib/PyShell.desktop	2009-02-21 15:08:19.000000000 -0600
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+-Name=PyShell
++Name=PyShell (2.8)
+ Comment=GUI Python Shell
+-Exec=pyshell
+-Icon=PyCrust.png
++Exec=pyshell-2.8
++Icon=/usr/share/pixmaps/PyCrust.png
+ Terminal=false
+ Type=Application
+ Categories=Application;Development;
+diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/XRCed.desktop wxPython-src-2.8.9.2/wxPython/distrib/XRCed.desktop
+--- wxPython-src-2.8.9.2-orig/wxPython/distrib/XRCed.desktop	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.9.2/wxPython/distrib/XRCed.desktop	2009-02-21 15:09:22.000000000 -0600
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+-Name=XRCed
++Name=XRCed (2.8)
+ Comment=wxPython XRC resource editor
+-Exec=xrced
+-Icon=XRCed.png
++Exec=xrced-2.8
++Icon=/usr/share/pixmaps/XRCed.png
+ Terminal=false
+ Type=Application
+ Categories=Application;Development;
+diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/editra wxPython-src-2.8.9.2/wxPython/scripts/editra
+--- wxPython-src-2.8.9.2-orig/wxPython/scripts/editra	2008-02-29 14:32:17.000000000 -0600
++++ wxPython-src-2.8.9.2/wxPython/scripts/editra	2009-02-21 15:03:24.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.tools.Editra.launcher import main
+ main()
+diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/genaxmodule wxPython-src-2.8.9.2/wxPython/scripts/genaxmodule
+--- wxPython-src-2.8.9.2-orig/wxPython/scripts/genaxmodule	2008-02-29 14:32:17.000000000 -0600
++++ wxPython-src-2.8.9.2/wxPython/scripts/genaxmodule	2009-02-21 15:03:24.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.tools.genaxmodule import main
+ main()
+diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/helpviewer wxPython-src-2.8.9.2/wxPython/scripts/helpviewer
+--- wxPython-src-2.8.9.2-orig/wxPython/scripts/helpviewer	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.9.2/wxPython/scripts/helpviewer	2009-02-21 15:03:24.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.tools.helpviewer import main
+ main()
+diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/img2png wxPython-src-2.8.9.2/wxPython/scripts/img2png
+--- wxPython-src-2.8.9.2-orig/wxPython/scripts/img2png	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.9.2/wxPython/scripts/img2png	2009-02-21 15:03:24.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.tools.img2png import main
+ main()
+diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/img2py wxPython-src-2.8.9.2/wxPython/scripts/img2py
+--- wxPython-src-2.8.9.2-orig/wxPython/scripts/img2py	2008-02-29 14:32:17.000000000 -0600
++++ wxPython-src-2.8.9.2/wxPython/scripts/img2py	2009-02-21 15:03:24.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.tools.img2py import main
+ main()
+diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/img2xpm wxPython-src-2.8.9.2/wxPython/scripts/img2xpm
+--- wxPython-src-2.8.9.2-orig/wxPython/scripts/img2xpm	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.9.2/wxPython/scripts/img2xpm	2009-02-21 15:03:24.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.tools.img2xpm import main
+ main()
+diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalacarte wxPython-src-2.8.9.2/wxPython/scripts/pyalacarte
+--- wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalacarte	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.9.2/wxPython/scripts/pyalacarte	2009-02-21 15:03:24.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.py.PyAlaCarte import main
+ main()
+diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalamode wxPython-src-2.8.9.2/wxPython/scripts/pyalamode
+--- wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalamode	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.9.2/wxPython/scripts/pyalamode	2009-02-21 15:03:24.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.py.PyAlaMode import main
+ main()
+diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pycrust wxPython-src-2.8.9.2/wxPython/scripts/pycrust
+--- wxPython-src-2.8.9.2-orig/wxPython/scripts/pycrust	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.9.2/wxPython/scripts/pycrust	2009-02-21 15:03:24.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.py.PyCrust import main
+ main()
+diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pyshell wxPython-src-2.8.9.2/wxPython/scripts/pyshell
+--- wxPython-src-2.8.9.2-orig/wxPython/scripts/pyshell	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.9.2/wxPython/scripts/pyshell	2009-02-21 15:03:24.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.py.PyShell import main
+ main()
+diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pywrap wxPython-src-2.8.9.2/wxPython/scripts/pywrap
+--- wxPython-src-2.8.9.2-orig/wxPython/scripts/pywrap	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.9.2/wxPython/scripts/pywrap	2009-02-21 15:03:24.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.py.PyWrap import main
+ main()
+diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pywxrc wxPython-src-2.8.9.2/wxPython/scripts/pywxrc
+--- wxPython-src-2.8.9.2-orig/wxPython/scripts/pywxrc	2008-02-29 14:32:17.000000000 -0600
++++ wxPython-src-2.8.9.2/wxPython/scripts/pywxrc	2009-02-21 15:09:58.000000000 -0600
+@@ -1,5 +1,7 @@
+ #!/usr/bin/env python
+ 
++import wxversion
++wxversion.select("2.8")
+ from wx.tools.pywxrc import main
+ main()
+ 
+diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/xrced wxPython-src-2.8.9.2/wxPython/scripts/xrced
+--- wxPython-src-2.8.9.2-orig/wxPython/scripts/xrced	2007-07-18 16:33:55.000000000 -0600
++++ wxPython-src-2.8.9.2/wxPython/scripts/xrced	2009-02-21 15:03:24.000000000 -0600
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("2.8")
+ 
+ from wx.tools.XRCed.xrced import main
+ main()
diff --git a/dev-python/wxpython/files/wxpython-3.0-wxversion-demo.patch b/dev-python/wxpython/files/wxpython-3.0-wxversion-demo.patch
new file mode 100644
index 000000000000..a4f6b0b07a3c
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-3.0-wxversion-demo.patch
@@ -0,0 +1,10 @@
+--- demo/demo.org
++++ demo/demo.py
+@@ -1,4 +1,7 @@
+ #!/usr/bin/env python
+ 
++import wxversion
++wxversion.select("3.0")
++
+ import Main
+ Main.main()
diff --git a/dev-python/wxpython/files/wxpython-3.0.0.0-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-3.0.0.0-wxversion-scripts.patch
new file mode 100644
index 000000000000..9f0cb8922267
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-3.0.0.0-wxversion-scripts.patch
@@ -0,0 +1,211 @@
+--- a/distrib/PyAlaMode.desktop
++++ b/distrib/PyAlaMode.desktop
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+-Name=PyAlaMode
++Name=PyAlaMode (3.0)
+ Comment=GUI Python Shell with Filling and editor windows
+-Exec=pyalamode
+-Icon=PyCrust
++Exec=pyalamode-3.0
++Icon=PyCrust-3.0
+ Terminal=false
+ Type=Application
+ Categories=Development;
+--- a/distrib/PyCrust.desktop
++++ b/distrib/PyCrust.desktop
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+-Name=PyCrust
++Name=PyCrust (3.0)
+ Comment=GUI Python Shell with Filling
+-Exec=pycrust
+-Icon=PyCrust
++Exec=pycrust-3.0
++Icon=PyCrust-3.0
+ Terminal=false
+ Type=Application
+ Categories=Development;
+--- a/distrib/PyShell.desktop
++++ b/distrib/PyShell.desktop
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+-Name=PyShell
++Name=PyShell (3.0)
+ Comment=GUI Python Shell
+-Exec=pyshell
+-Icon=PyCrust
++Exec=pyshell-3.0
++Icon=PyCrust-3.0
+ Terminal=false
+ Type=Application
+ Categories=Development;
+--- a/distrib/PySlices.desktop
++++ b/distrib/PySlices.desktop
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+-Name=PySlices
++Name=PySlices (3.0)
+ Comment=GUI Python Shell with Filling
+-Exec=pyslices
+-Icon=PySlices
++Exec=pyslices-3.0
++Icon=PySlices-3.0
+ Terminal=false
+ Type=Application
+ Categories=Development;
+--- a/distrib/PySlicesShell.desktop
++++ b/distrib/PySlicesShell.desktop
+@@ -1,9 +1,8 @@
+-
+ [Desktop Entry]
+-Name=PySlicesShell
++Name=PySlicesShell (3.0)
+ Comment=GUI Python Shell
+-Exec=pysliceshell
+-Icon=PySlices
++Exec=pysliceshell-3.0
++Icon=PySlices-3.0
+ Terminal=false
+ Type=Application
+ Categories=Development;
+--- a/distrib/XRCed.desktop
++++ b/distrib/XRCed.desktop
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+-Name=XRCed
++Name=XRCed (3.0)
+ Comment=wxPython XRC resource editor
+-Exec=xrced
+-Icon=XRCed
++Exec=xrced-3.0
++Icon=XRCed-3.0
+ Terminal=false
+ Type=Application
+ Categories=Development;
+--- a/scripts/genaxmodule
++++ b/scripts/genaxmodule
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("3.0")
+ 
+ from wx.tools.genaxmodule import main
+ main()
+--- a/scripts/helpviewer
++++ b/scripts/helpviewer
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("3.0")
+ 
+ from wx.tools.helpviewer import main
+ main()
+--- a/scripts/img2png
++++ b/scripts/img2png
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("3.0")
+ 
+ from wx.tools.img2png import main
+ main()
+--- a/scripts/img2py
++++ b/scripts/img2py
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("3.0")
+ 
+ from wx.tools.img2py import main
+ main()
+--- a/scripts/img2xpm
++++ b/scripts/img2xpm
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("3.0")
+ 
+ from wx.tools.img2xpm import main
+ main()
+--- a/scripts/pyalacarte
++++ b/scripts/pyalacarte
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("3.0")
+ 
+ from wx.py.PyAlaCarte import main
+ main()
+--- a/scripts/pyalamode
++++ b/scripts/pyalamode
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("3.0")
+ 
+ from wx.py.PyAlaMode import main
+ main()
+--- a/scripts/pycrust
++++ b/scripts/pycrust
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("3.0")
+ 
+ from wx.py.PyCrust import main
+ main()
+--- a/scripts/pyshell
++++ b/scripts/pyshell
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("3.0")
+ 
+ from wx.py.PyShell import main
+ main()
+--- a/scripts/pyslices
++++ b/scripts/pyslices
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("3.0")
+ 
+ from wx.py.PySlices import main
+ main()
+--- a/scripts/pysliceshell
++++ b/scripts/pysliceshell
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("3.0")
+ 
+ from wx.py.PySlicesShell import main
+ main()
+--- a/scripts/pywrap
++++ b/scripts/pywrap
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("3.0")
+ 
+ from wx.py.PyWrap import main
+ main()
+--- a/scripts/pywxrc
++++ b/scripts/pywxrc
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("3.0")
+ 
+ from wx.tools.pywxrc import main
+ main()
+--- a/scripts/xrced
++++ b/scripts/xrced
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++import wxversion
++wxversion.select("3.0")
+ 
+ from wx.tools.XRCed.xrced import main
+ main()
diff --git a/dev-python/wxpython/metadata.xml b/dev-python/wxpython/metadata.xml
new file mode 100644
index 000000000000..d87904c379c4
--- /dev/null
+++ b/dev-python/wxpython/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>wxwidgets@gentoo.org</email>
+		<name>Gentoo wxWidgets Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="examples">Install interactive demo module browser and sample applets.</flag>
+		<flag name="doc">Install HTML wxWidgets docs and wxpython API reference.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">wxpython</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild b/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild
new file mode 100644
index 000000000000..928b517c6341
--- /dev/null
+++ b/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+WX_GTK_VER="2.8"
+
+inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets
+
+MY_P="${P/wxpython-/wxPython-src-}"
+
+DESCRIPTION="A blending of the wxWindows C++ class library with Python"
+HOMEPAGE="http://www.wxpython.org/"
+SRC_URI="
+	mirror://sourceforge/wxpython/${MY_P}.tar.bz2
+	doc? (
+		mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2
+		mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 )
+	examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )"
+
+LICENSE="wxWinLL-3"
+SLOT="2.8"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="cairo doc examples opengl"
+
+RDEPEND="
+	dev-lang/python-exec:2[${PYTHON_USEDEP}]
+	>=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X]
+	dev-libs/glib:2
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	virtual/jpeg
+	x11-libs/gtk+:2
+	x11-libs/pango[X]
+	cairo?	( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] )
+	opengl?	( dev-python/pyopengl[${PYTHON_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}/wxPython"
+DOC_S="${WORKDIR}/wxPython-${PV}"
+
+# The hacky build system seems to be broken with out-of-source builds,
+# and installs 'wx' package globally.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
+
+	if use doc; then
+		cd "${DOC_S}" || die
+		epatch "${FILESDIR}"/${PN}-${SLOT}-cache-writable.patch
+	fi
+
+	if use examples; then
+		cd "${DOC_S}" || die
+		epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch
+	fi
+
+	cd "${S}" || die
+
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-2.8.9-wxversion-scripts.patch
+		# drop editra - we have it as a separate package now
+		"${FILESDIR}"/${PN}-2.8.12-drop-editra.patch
+		"${FILESDIR}"/${PN}-2.8.12-drop-categories.patch
+		"${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch
+		# fix handling egg_info command
+		"${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	# Workaround, buildsystem uses CFLAGS as CXXFLAGS
+	export CFLAGS="${CXXFLAGS}"
+	need-wxwidgets unicode
+
+	mydistutilsargs=(
+		WX_CONFIG="${WX_CONFIG}"
+		WXPORT=gtk2
+		UNICODE=1
+		BUILD_GLCANVAS=$(usex opengl 1 0)
+	)
+}
+
+python_compile() {
+	# We need to have separate libdirs due to hackery, bug #455332.
+	distutils-r1_python_compile \
+		build --build-purelib "${BUILD_DIR}"/lib.common
+}
+
+python_install() {
+	distutils-r1_python_install \
+		build --build-purelib "${BUILD_DIR}"/lib.common
+
+	# adjust the filenames for wxPython slots.
+	local file
+	for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do
+		mv "${file}" "${file}-${SLOT}" || die
+	done
+	cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die
+	for file in *; do
+		mv "${file}" "${file}-${SLOT}" || die
+
+		# wrappers are common to all impls, so a parallel run may
+		# move it for us. ln+rm is more failure-proof.
+		ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die
+		rm -f "${ED}usr/bin/${file}"
+	done
+}
+
+python_install_all() {
+	dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
+
+	domenu distrib/{Py{AlaMode,Crust,Shell},XRCed}.desktop
+	newicon wx/py/PyCrust_32.png PyCrust.png
+	newicon wx/tools/XRCed/XRCed_32.png XRCed.png
+
+	docdir=${D}usr/share/doc/${PF}
+
+	if use doc; then
+		docinto docs
+		dodoc -r "${DOC_S}"/docs/.
+		# For some reason newer API docs aren't available so use 2.8.9.2's
+		dodoc -r "${WORKDIR}"/wxPython-2.8.9.2/docs/.
+
+		docompress -x /usr/share/doc/${PF}/docs
+	fi
+
+	if use examples; then
+		docinto demo
+		dodoc -r "${DOC_S}"/demo/.
+		docinto samples
+		dodoc -r "${DOC_S}"/samples/.
+
+		[[ -e ${docdir}/samples/embedded/embedded ]] \
+			&& rm -f "${docdir}"/samples/embedded/embedded
+
+		docompress -x /usr/share/doc/${PF}/{demo,samples}
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	create_symlinks() {
+		alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
+		alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
+	}
+	python_foreach_impl create_symlinks
+
+	echo
+	elog "Gentoo uses the Multi-version method for SLOT'ing."
+	elog "Developers, see this site for instructions on using"
+	elog "2.6 or 2.8 with your apps:"
+	elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls"
+	if use doc; then
+		echo
+		elog "To access the general wxWidgets documentation, run"
+		elog "/usr/share/doc/${PF}/docs/viewdocs.py"
+		echo
+		elog "wxPython documentation is available by pointing a browser"
+		elog "at /usr/share/doc/${PF}/docs/api/index.html"
+	fi
+	if use examples; then
+		echo
+		elog "The demo.py app which contains hundreds of demo modules"
+		elog "with documentation and source code has been installed at"
+		elog "/usr/share/doc/${PF}/demo/demo.py"
+		echo
+		elog "Many more example apps and modules can be found in"
+		elog "/usr/share/doc/${PF}/samples/"
+	fi
+	echo
+	elog "Editra is not packaged with wxpython in Gentoo."
+	elog "You can find it in the tree as app-editors/editra"
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+
+	update_symlinks() {
+		alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
+		alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
+	}
+	python_foreach_impl update_symlinks
+}
diff --git a/dev-python/wxpython/wxpython-3.0.2.0.ebuild b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
new file mode 100644
index 000000000000..7e8f2b8afb56
--- /dev/null
+++ b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+WX_GTK_VER="3.0"
+
+inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets
+
+MY_PN="wxPython-src"
+
+DESCRIPTION="A blending of the wxWindows C++ class library with Python"
+HOMEPAGE="http://www.wxpython.org/"
+SRC_URI="
+	mirror://sourceforge/wxpython/${MY_PN}-${PV}.tar.bz2
+	examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )"
+
+LICENSE="wxWinLL-3"
+SLOT="3.0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+IUSE="cairo examples libnotify opengl"
+
+RDEPEND="
+	dev-lang/python-exec:2[${PYTHON_USEDEP}]
+	>=x11-libs/wxGTK-${PV}:${WX_GTK_VER}=[libnotify=,opengl?,tiff,X]
+	dev-libs/glib:2
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	virtual/jpeg
+	x11-libs/gtk+:2
+	x11-libs/pango[X]
+	cairo?	( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] )
+	opengl?	( dev-python/pyopengl[${PYTHON_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_PN}-${PV}/wxPython"
+DOC_S="${WORKDIR}/wxPython-${PV}"
+
+# The hacky build system seems to be broken with out-of-source builds,
+# and installs 'wx' package globally.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
+
+	if use examples; then
+		cd "${DOC_S}"
+		epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch
+	fi
+
+	cd "${S}"
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-3.0.0.0-wxversion-scripts.patch
+		# drop editra - we have it as a separate package now
+		"${FILESDIR}"/${PN}-2.8.11-drop-editra.patch
+		"${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch
+		# fix handling egg_info command
+		"${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	need-wxwidgets unicode
+
+	mydistutilsargs=(
+		WX_CONFIG="${WX_CONFIG}"
+		WXPORT=gtk2
+		UNICODE=1
+		BUILD_GLCANVAS=$(usex opengl 1 0)
+	)
+}
+
+python_compile() {
+	# We need to have separate libdirs due to hackery, bug #455332.
+	distutils-r1_python_compile \
+		build --build-purelib "${BUILD_DIR}"/lib.common
+}
+
+python_install() {
+	distutils-r1_python_install \
+		build --build-purelib "${BUILD_DIR}"/lib.common
+
+	# adjust the filenames for wxPython slots.
+	local file
+	for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do
+		mv "${file}" "${file}-${SLOT}" || die
+	done
+	cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die
+	for file in *; do
+		mv "${file}" "${file}-${SLOT}" || die
+
+		# wrappers are common to all impls, so a parallel run may
+		# move it for us. ln+rm is more failure-proof.
+		ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die
+		rm -f "${ED}usr/bin/${file}"
+	done
+}
+
+python_install_all() {
+	dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
+
+	for x in {Py{AlaMode,Crust,Shell},XRCed}; do
+		newmenu distrib/${x}.desktop ${x}-${SLOT}.desktop
+	done
+	newicon wx/py/PyCrust_32.png PyCrust-${SLOT}.png
+	newicon wx/py/PySlices_32.png PySlices-${SLOT}.png
+	newicon wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png
+
+	if use examples; then
+		docinto demo
+		dodoc -r "${DOC_S}"/demo/.
+		docinto samples
+		dodoc -r "${DOC_S}"/samples/.
+
+		[[ -e ${docdir}/samples/embedded/embedded ]] \
+			&& rm -f "${docdir}"/samples/embedded/embedded
+
+		docompress -x /usr/share/doc/${PF}/{demo,samples}
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	create_symlinks() {
+		alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
+		alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
+	}
+	python_foreach_impl create_symlinks
+
+	echo
+	elog "Gentoo uses the Multi-version method for SLOT'ing."
+	elog "Developers, see this site for instructions on using"
+	elog "it with your apps:"
+	elog "http://wiki.wxpython.org/MultiVersionInstalls"
+	if use examples; then
+		echo
+		elog "The demo.py app which contains demo modules with"
+		elog "documentation and source code has been installed at"
+		elog "/usr/share/doc/${PF}/demo/demo.py"
+		echo
+		elog "More example apps and modules can be found in"
+		elog "/usr/share/doc/${PF}/samples/"
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+
+	update_symlinks() {
+		alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
+		alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
+	}
+	python_foreach_impl update_symlinks
+}
diff --git a/dev-python/xapp/Manifest b/dev-python/xapp/Manifest
new file mode 100644
index 000000000000..26c32cebea4e
--- /dev/null
+++ b/dev-python/xapp/Manifest
@@ -0,0 +1,3 @@
+DIST xapp-1.0.1.tar.gz 12327 SHA256 da2ec46dc3fce97accd0ee6d9bd9d71d26c953b01de1a5336ba2b4b60f2f3b6b SHA512 7dc4db03476f6972f6452800d2ea58d7f78d0bd5dd6719f2b49d1c2e3315c3fa09c294b1195bebd26357c30b4c43d7e5c01d160708dd17ee488b823344895e25 WHIRLPOOL d8862e41677fe03ff9d4881f19b484cd8b46582de0f03e1a9aa556c2d72a386ac4a6807ea3ec09578af3e390e44df9ba355e7ae667bce51fe2fa1e109ce78cac
+EBUILD xapp-1.0.1-r1.ebuild 535 SHA256 767dd57d4cd1581f8e41a78a448c754407f59ae8f30e1a3d00787ede9c30e111 SHA512 131ffa68263374b5726774799516c78c5ac3a6a61bf1447f70c7b8cc974d9b41829959438e709259502447ac63ee75730f048d96deae1bfae4f3a2bb1e2c3de6 WHIRLPOOL 9c6f94233139154e654d178ee1bc583a9d1b5993cae652163bfd2b3c59dfbdc746656f67542d4713bc592c2921487676b046434097a9ed55f2eb600bc60bf1d5
+MISC metadata.xml 220 SHA256 235e5e3ea84c8be0f10d1b3ccebed7badd77c7a9023ca831c4b3af4b729b354c SHA512 1aa3933bda5909c7e7907b7c5218f4c214f5ba411fb8fc373e35ee2f490e4ab8a7813549c127b916e3c8b9527853a502fe298af1aa7139c213c2f31847120364 WHIRLPOOL 2e0485ab11b6aa5c86e48f5ffd75683c49dfc08471183eeab804c7701a2ff288c1a8036cf246c2980a1b35693f9600225c1fcafbe4c934eb6112afc6951ab155
diff --git a/dev-python/xapp/metadata.xml b/dev-python/xapp/metadata.xml
new file mode 100644
index 000000000000..511b56ca636b
--- /dev/null
+++ b/dev-python/xapp/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cinnamon@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/xapp/xapp-1.0.1-r1.ebuild b/dev-python/xapp/xapp-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..66f2b916dc3b
--- /dev/null
+++ b/dev-python/xapp/xapp-1.0.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for x11-libs/xapps"
+HOMEPAGE="https://github.com/linuxmint/python-xapp"
+SRC_URI="https://github.com/linuxmint/python-xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/xapps"
+RDEPEND="${DEPEND}
+	dev-python/psutil[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/python-xapp-${PV}"
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
new file mode 100644
index 000000000000..07137f76c718
--- /dev/null
+++ b/dev-python/xarray/Manifest
@@ -0,0 +1,6 @@
+DIST xarray-0.8.2.tar.gz 222454 SHA256 4da06e38baea65c51347ba0770db416ebf003dbad5637215d2b25b191f2be1fb SHA512 11a7295973cde998b043d22675b1d142b50ad5518f9dc320d6e6c770f3febb3b5f0ecf59b3caed73ae886994be15d497c10680e2df69eea862cf6d7c6726a867 WHIRLPOOL 02c3d17c7b0bd659f8e0aa8670909e7381cf2caeed9ae8df446681ca517f04d5f96f71a62e9b9079f7531c5ae9a7e8fef4045f581424b71e67eaaac7b7a7ffa7
+DIST xarray-0.9.6.tar.gz 1491394 SHA256 f649a41d43b5a6c64bdcbd57e994932656b689f9593a86dd0be95778a2b47494 SHA512 f7a12da324e0afadbdcf7abea33d4450189ba4b761240995328a530b67e2f2134b31bf961f8fa388e2296c26dc2da2cf14c113ab86ac301d96b7a35af56a5107 WHIRLPOOL 64f04eea0c4a9029fd7b1a1503a5fc701d919bdb769814b752161c7561b2f146379cca741c849c102d83b1ed4c1b126cc1978b978b1a535dd3ce60af85676745
+EBUILD xarray-0.8.2.ebuild 617 SHA256 1b5f6563f28661a3d5fe474aa850c6c4997325f852f1da396fff46ac6cbc8f89 SHA512 f488b5bfc5e320b1844442340f9a811a2d9b7fd86eeb49d27258ca021865fb11f826087292759a5d89b7598ef2d34e69d494a12bc223974d4158b9171b300646 WHIRLPOOL ad3fb9236bc86657eb586eb346e96c349e017cc5a04be87f5538fcda75d40143051ca0915cf0592a7497bc0693a75703469b8861cd438455489d0a062cb13c41
+EBUILD xarray-0.9.6.ebuild 638 SHA256 30b5f1b3fab29fefdd325342bcd9c4c70e2713b3f9a32aa34fe0635e89839daa SHA512 c23fc52bbd5bc8eaf198a54bec09042e9445788ed379c5c9a3c64bbb3184369f1abded531ac5023a983119429ef9659b3c39bae4d87bcfb7bac0a23cec669461 WHIRLPOOL 464357a0ca592724493fa96bcd1e7a373e80d2c42db808446f5e8ea4e7e3f7a132a5a78ab1f1530613e66abb65c4c241323c0d50b2b2594edeb4c42210a14964
+MISC ChangeLog 372 SHA256 b2722750b592d2f85d5aa7555294a374a47921cc830d56179bbb16fe2df4ca1a SHA512 388b7d5d3b94770a0750253704669a419d7bab2b818914675f43f374bffe95e117ef874879babedd406bbb3e902d25ed2baf47842ce1b027caca74e46f7a66d9 WHIRLPOOL 01472931e3725bd13e661ab9c2717accbefc32dcc89df95853a73961e7d770c45687470cb7e4b4d8802ac28c84c913009d32364442bb482758f9872e983af88b
+MISC metadata.xml 508 SHA256 e0d4ad1d435e28d1f5816a9c437aaf3e4d309235654b8b11b6ce3f14b8992b71 SHA512 937f1589c8b6eaa65f70d7b273e60935eaed889895996e5f952dece64a0982130fa5f50f09f25041a86f88f7646e76ba9ca3580ae8adcefa1f83a4effc5409c3 WHIRLPOOL 63121c4b00b9c197ef053aece294d6ac9e753a395a8a75440ba8064aa68a8250e02b2c6e936100a0504ab029b5a7e24c34a78ffa894cf4fd46d1a0a33cf65790
diff --git a/dev-python/xarray/metadata.xml b/dev-python/xarray/metadata.xml
new file mode 100644
index 000000000000..e1094096d65f
--- /dev/null
+++ b/dev-python/xarray/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">xarray</remote-id>
+    <maintainer status="unknown">
+      <email>xarray@googlegroups.com</email>
+      <name>xarray Developers</name>
+    </maintainer>
+    <remote-id type="github">pydata/xarray</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/xarray/xarray-0.8.2.ebuild b/dev-python/xarray/xarray-0.8.2.ebuild
new file mode 100644
index 000000000000..ba127afed967
--- /dev/null
+++ b/dev-python/xarray/xarray-0.8.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="N-D labeled arrays and datasets in Python"
+HOMEPAGE="https://github.com/pydata/xarray http://pypi.python.org/pypi/xarray"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v -v || die
+}
diff --git a/dev-python/xarray/xarray-0.9.6.ebuild b/dev-python/xarray/xarray-0.9.6.ebuild
new file mode 100644
index 000000000000..cdab9ad3971b
--- /dev/null
+++ b/dev-python/xarray/xarray-0.9.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="N-D labeled arrays and datasets in Python"
+HOMEPAGE="http://xarray.pydata.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
new file mode 100644
index 000000000000..1fed6349b0dc
--- /dev/null
+++ b/dev-python/xcffib/Manifest
@@ -0,0 +1,8 @@
+AUX xcffib-0.4.2-test-imports.patch 902 SHA256 b33fb7a7f91885f3be7b8506730be206ab0ffc4f5209e274218c21bfa30b448a SHA512 f08590fb2d5979f464d56f9c7e45b83f20954005980f98d2ee3d2c6ce5c44554431059fc911040943ecdcd4ca786c345bab6bae733a46379ad58fa487d516697 WHIRLPOOL ea8e23d4b6e28f52b4e70d77dbb38971310b29b90b3184bfb3d7a1d1146d0ee0f988e3e51a48434728bd519e254ddb32c3a39f7a79fd0f54b2e08383fdb11f4f
+DIST xcffib-0.4.0.tar.gz 74715 SHA256 94a3d3d48289a7e9e0687b1f9a5f69de6e6449ac98df0f79773b286a72f79f8a SHA512 ac144ffdfb559ae2ee8d4a23c937989ca4e28f913b2d27f1240725c8398ede1a7a010a0d861998151923d235d5e04799d8df8496c9ec8005a2286825dcd59bd7 WHIRLPOOL f67aba9f217a2aa408945f4f2703853385ce8170d069660f9433410c13ca41bbf9ba5fd9729509192996d34d934626a1c0f91e08a64e44b4aef43fb4e88b5c74
+DIST xcffib-0.5.1.tar.gz 81274 SHA256 c0f8daf5375df1df2dbccd1066f464831cf3dd69d58dd851ada8d85d72b5eb25 SHA512 ed13a43e301c6713c3831261bd94444d3961f805c39cc72dbe05f986eafb24e4f53f653045b84b57b4046a3ac763b20bd661298af5e6cc57978c57d68d2a0a39 WHIRLPOOL 7b4c31737324550b78fa0755c1a3b58cdf8f0b1aaee39feecce4a0e8759208bdbf9b121c76ed558c1360b214cc833f20d50612deb835e46b8681bb652f0e802e
+EBUILD xcffib-0.4.0.ebuild 795 SHA256 d3c0c885fc30b67fa7521bf9a2b63060a6460de4b045382f3ca69c7c432b4825 SHA512 33e449cfbda001cf2337845a2cc9c83b81b2189b6f5f43050c30fcc2ea451b8ecb0a93191cf329a3dd82d000c5a9510b822642bd0957c28b54bb3d9d34283442 WHIRLPOOL ef532c133bb08031ed2d75942062d90db66d5a9ed5b6c0452bb4c7fb9c95ca5819205aa7dfb0394a3f2dfa419668efcd9900cc7c89433079dd20ffc568b64667
+EBUILD xcffib-0.5.1.ebuild 891 SHA256 aaa9805b7213835fb42d81dc27bb9869e6070f71c1ac70e6d4afe68b8c2046bb SHA512 87dc9302c3a9e0c6ca5d1bda60b0cf1fb704c1224e14cfe7d5b5eada5ab68c150ceda4a822ac2a19d9e39ffe19e4e03e966571f010e79a9a41119abfaec66800 WHIRLPOOL c44543ef1ced9ce7023cfce36b4cfb40cd14363003fd2a2a649426d55e96c14debea907e5508c67837cf7e663ad82f923320ab856a33c09885456e90cd53feb9
+MISC ChangeLog 5320 SHA256 bb0925d49f79625e185c1a1222dfd79f924f6333cae15494f1b89725f6092348 SHA512 6362dc3e408123844f0c9a95ef16e0f72892ed4d0fac9489680e07def77556d8aa9de9cc5cddcca919cfcc03cb05094a5dde35cd51e6a766206af389d7f764f3 WHIRLPOOL 26ccb59064cea7cb3576aa34a5dc90a020ca7b9c52649cb452dd59713ecd076e7e08b63244f8c72310993369edb1ac8a43358a80568c7b2316a19ae7c0712489
+MISC ChangeLog-2015 1783 SHA256 b2d7580bf226c9cb7b1710ab39eb1642b7390d2ebc3c74eda9270ccf4353559b SHA512 71de5ad74add63739f61e9b2d2864cd6e8f0d97e143f5766c1f04f1c956424ad897c225ee8bd2472d612af5b28087ccdd7fe9b5a8a5e9807462781eed2d8fafa WHIRLPOOL 5f35002ab37b18f2f76a65c5ffb03e22d41d15459c7d479a44a6a3f64297a67ad99a49c3c218d37621efaeb2a83f95fac75c6ee5182e082fc0d481fec1329959
+MISC metadata.xml 373 SHA256 adcf97f4f47add6a17cfcdc543a37feb47f79968f56f3589567f9bfdd5f19339 SHA512 2c7291bce1de8d82151379bcdcc039344659570feec49b82ce9e7274b5e0abecf8499fe7c595b06f71c37ab7bfcb3f2ce8771f216282a50b6c1aba5dffc1008c WHIRLPOOL faafa9b500503bbe18bda7b2b5856dec03b0f54291a4096b141b234de5e44decf0f463590881aed57105f45512cecdaa76ab05003d16fbd06f1150998c082aba
diff --git a/dev-python/xcffib/files/xcffib-0.4.2-test-imports.patch b/dev-python/xcffib/files/xcffib-0.4.2-test-imports.patch
new file mode 100644
index 000000000000..da33bf3934cb
--- /dev/null
+++ b/dev-python/xcffib/files/xcffib-0.4.2-test-imports.patch
@@ -0,0 +1,35 @@
+Relative imports don't work because the test dir isn't a proper python module.
+
+--- xcffib-0.4.2/test/test_connection.py
++++ xcffib-0.4.2/test/test_connection.py
+@@ -20,7 +20,7 @@
+ 
+ from xcffib import ffi
+ from xcffib.testing import XvfbTest
+-from .testing import XcffibTest
++from testing import XcffibTest
+ 
+ from nose.tools import raises
+ from nose import SkipTest
+--- xcffib-0.4.2/test/test_fakeinput.py
++++ xcffib-0.4.2/test/test_fakeinput.py
+@@ -2,7 +2,7 @@
+ import xcffib.xproto
+ import xcffib.xtest
+ 
+-from .testing import XcffibTest
++from testing import XcffibTest
+ 
+ class TestConnection(XcffibTest):
+     def test_fakeinput(self):
+--- xcffib-0.4.2/test/test_python_code.py
++++ xcffib-0.4.2/test/test_python_code.py
+@@ -18,7 +18,7 @@
+ import struct
+ from xcffib.xproto import EventMask
+ 
+-from .testing import XcffibTest
++from testing import XcffibTest
+ 
+ class TestPythonCode(XcffibTest):
+ 
diff --git a/dev-python/xcffib/metadata.xml b/dev-python/xcffib/metadata.xml
new file mode 100644
index 000000000000..bf990924271b
--- /dev/null
+++ b/dev-python/xcffib/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">xcffib</remote-id>
+    <remote-id type="github">tych0/xcffib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/xcffib/xcffib-0.4.0.ebuild b/dev-python/xcffib/xcffib-0.4.0.ebuild
new file mode 100644
index 000000000000..3d3c3be49a79
--- /dev/null
+++ b/dev-python/xcffib/xcffib-0.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="https://github.com/tych0/xcffib"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+COMMON_DEPEND="x11-libs/libxcb"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
+	dev-python/six[${PYTHON_USEDEP}]
+	${COMMON_DEPEND}"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${COMMON_DEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests -d -v || die
+}
diff --git a/dev-python/xcffib/xcffib-0.5.1.ebuild b/dev-python/xcffib/xcffib-0.5.1.ebuild
new file mode 100644
index 000000000000..a684401d294c
--- /dev/null
+++ b/dev-python/xcffib/xcffib-0.5.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
+HOMEPAGE="https://github.com/tych0/xcffib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+COMMON_DEPEND="x11-libs/libxcb"
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
+	dev-python/six[${PYTHON_USEDEP}]
+	${COMMON_DEPEND}"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${COMMON_DEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		x11-apps/xeyes
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.4.2-test-imports.patch )
+
+python_test() {
+	nosetests -d -v || die
+}
diff --git a/dev-python/xdis/Manifest b/dev-python/xdis/Manifest
new file mode 100644
index 000000000000..39544ad57b1b
--- /dev/null
+++ b/dev-python/xdis/Manifest
@@ -0,0 +1,10 @@
+AUX xdis-3.3.0-remove-pytest-runner-dep.patch 1093 SHA256 4b92fb9779c26ee573bf134beaecbc62484221953aa681eab8f0b933fdd25b1e SHA512 4eb02e8fed567903b1d4a51ab65f374008b0e939c0e192311974bb07b4fbfb877f8004580d67d7d1f3dd0bb27319bf17ecd289ede7e4420486c9998fbbef3464 WHIRLPOOL 0551a0d31dbdd99ed17f65b7375507faed1be934c8fe69d5e7d13781641c166c2868dbc0aeece3e76d3715f89cb0aa5c9e953d5196fc36cab8fa23db7dad62ab
+AUX xdis-test_magic_bytes_error.patch 808 SHA256 a0116556e3b49068602311176da5d6298f1d4e00e1a4ecd97a9b16bf0bf5a57f SHA512 81e292c79462fd3dd6ed6480b0dd78f580d8020a8ded82fcb333da3c8cf8830de26aecf89baab513b4c3767de8613c6e29afe04acac491aa8e1842dde69a91f5 WHIRLPOOL a8d4f5414bf86e4ef72839ca7f259771245a27a3622f4429e243ad9c6e9c7b63ccbd867dde4c6055fa1592b7d17d43426e613af4009858b98cd27c035786cbe6
+DIST xdis-3.2.4.tar.gz 127507 SHA256 b311253b97a321ab45625089a729ccbf8bcb1319a8c4c0167b719f81c081543c SHA512 6c9274e10f2a41ab4a173c8ae4462374fc7ab444a589ab572172550d0f5284906f7d9c9cf4a640f163f6012d17f40bc5e1c36e5963f8b6106a9c37e420027a97 WHIRLPOOL 5a0910f04e3d9ec70129d5d3b659fe06034e7a6298692d2a776f2616a8b895a539efa7f96972b2adc6986c2475e697552ea071d33bdd22c60bb1e0fec1950dd4
+DIST xdis-3.3.0.tar.gz 146531 SHA256 32eeb690e9376ad404c1fb18c1f87a09345f9beca31cee1ea8f21dd0f0dcaa07 SHA512 ebd7656c04d5583243eae4442409bde910146f7c5f6b66d58933d4b62818345401523428a596f00cca31a9d6fcd2eea877da57ab3e796dc04c92842456454b3c WHIRLPOOL 784c88d905d47d22a0d0ffb0206f57250f535abce9df6b02be16492c47ffe199ebf5f900eb3199e0be2b89a1d96f951971de5ba8ae33be57013870c1e25f828f
+DIST xdis-3.3.1.tar.gz 154152 SHA256 d6e5439269a2abe1fa71ac4cb670ac6dfc9e18a09e0c4acb2f6457f0542d5383 SHA512 93b1a092ae7790e84dfd8dc4128659d48be85c4e00d9914bbd748fad5ec4246bbfc6c19a5c5de366f4bd6d91847dad4ce3c1c3affe8f7608652f2f6e343650e1 WHIRLPOOL d137511eb788cdb43ef5e9165415fb4c7fa4885b9e293d4da7a7c4360e0dad7b00c8ea8df299161cff539a9f7a390d8b39ff6c5697804862259717d54c21f38b
+EBUILD xdis-3.2.4.ebuild 1280 SHA256 9505c12bd74fa89f31ff2e073830dbc3f48283ad9ce0c6fe8c2731e962bac0bc SHA512 f151336e351ed8ca2b240452baa90b43844d69ea80c86f61144d61b49bf16eb92746fba163359c66508789fcd6f345e5057771355054b86d1a56ae1d2f11a01d WHIRLPOOL de9e889e2891e73ebd07435cd81a02f8aca98375c647a30b45b955cd975f3cad91d117bfcd5c8f51225b734a5fd02411f71c8860ff946ce2f50cbfe514d5e036
+EBUILD xdis-3.3.0.ebuild 1178 SHA256 394deffa7011d4ec1c9ebe60c7d714d5fdee4c70dec84741e1bb9620a89b0db9 SHA512 2919a1ceb6de25293ff5cba1fca1eb15661968f929b93e174fd2930db0d3ddf5171ab93838169754b42c3528d98c686f615b39e4cd5260bd8ef72656026c2116 WHIRLPOOL fb79c25a6c3f5a6ac462d433f58d67d34667b5d0d08fe49a0e816c605930a417795e7ba63ea6deb34de08919d6843f8fc49cdd543f9d7ed459477cbaa39796a4
+EBUILD xdis-3.3.1.ebuild 1181 SHA256 db63b01c14e11a5b711994dc37eb842f6de6f8abd7771d28f4829e5aa22f5748 SHA512 f2514f28e1ca07340ba3a5792dc5b2e54bbe866dc132f629da95aaf9122d87438968f5b00c08420b325c76ea5cc18d1dfe9e09fd5afb946785ab40838b752869 WHIRLPOOL ce2d97e0d4ace3795bb019c5d1777df26ac8dbcf085f8353e46cfbfc7b7e1c04d33ef361a4ae770c4f0b4393fc62454e41ce30dba001926cb1627c6710791cbf
+MISC ChangeLog 934 SHA256 24b4cdec0b9dfd440ca08b4d4608d601d68d078a81ce2797519ad261f1de0b5d SHA512 c5bcbdabad268c87e39c6d1015c974996f5d600520ad0223261277db1b6c8e7bc10600baf5c959205e4d20839aa53aa184c53fe62de537768022f8a1eb2d7cce WHIRLPOOL 8ba010c713dc4e36117690d06d5fcb73511128275d582abee42ea52c041237b4278a10cae5b90b8e47c0eb56cd96054be8d5c108218be8a873eddd755165979a
+MISC metadata.xml 923 SHA256 8515314c5b49270ed58e97f813af80297c4671e1e0a5e301a9b015de88261821 SHA512 666fd7ff723b4ebf5fff3b3776a6a9a14df3d886cd82348218f57ec552d55b31712af30907ac39598c60ebbcb9de26091638e909dd02794c5761f6a96ff389f1 WHIRLPOOL eba7fcf4c519c4943f8d88327002ccde6894ae218a813946a91872f4f572db05d0f2c00fbcc085e23d026998bb3175c057478dacdcb0372a4ef614ebc6199c02
diff --git a/dev-python/xdis/files/xdis-3.3.0-remove-pytest-runner-dep.patch b/dev-python/xdis/files/xdis-3.3.0-remove-pytest-runner-dep.patch
new file mode 100644
index 000000000000..a412e515b813
--- /dev/null
+++ b/dev-python/xdis/files/xdis-3.3.0-remove-pytest-runner-dep.patch
@@ -0,0 +1,33 @@
+From aabea1b295308b227bbaf4acd36f058121984791 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Tue, 28 Mar 2017 11:20:00 -0700
+Subject: [PATCH] remove-pytest-runner dep
+
+---
+ setup.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 138b769..5941951 100755
+--- a/setup.py
++++ b/setup.py
+@@ -5,7 +5,7 @@
+ from __pkginfo__ import \
+     author,           author_email,       \
+     license,          long_description,   classifiers,               \
+-    modname,          py_modules,         setup_requires,            \
++    modname,          py_modules,                     \
+     scripts,          short_desc,         tests_require,             \
+     VERSION,          web,                zip_safe
+ 
+@@ -20,7 +20,6 @@ setup(
+        name               = modname,
+        packages           = find_packages(),
+        py_modules         = py_modules,
+-       setup_requires     = setup_requires,
+        scripts            = scripts,
+        tests_require      = tests_require,
+        url                = web,
+-- 
+2.12.1
+
diff --git a/dev-python/xdis/files/xdis-test_magic_bytes_error.patch b/dev-python/xdis/files/xdis-test_magic_bytes_error.patch
new file mode 100644
index 000000000000..560f58b7611e
--- /dev/null
+++ b/dev-python/xdis/files/xdis-test_magic_bytes_error.patch
@@ -0,0 +1,24 @@
+From 8aa4a91d664380395f08b0ccd4aa944d53a21e55 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Mon, 27 Mar 2017 18:13:00 -0700
+Subject: [PATCH] test_unit/test_magic.py: Add python-3.5.3 magic
+
+---
+ xdis/magics.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/xdis/magics.py b/xdis/magics.py
+index 6a58040..571f0ea 100755
+--- a/xdis/magics.py
++++ b/xdis/magics.py
+@@ -103,6 +103,7 @@ versions = {
+     int2magic(3300): '3.4a4+',    # more changes to __qualname__ computation
+     int2magic(3310): '3.4rc2',    # alter __qualname__ computation
+     int2magic(3350): '3.5',       # 3.5.0, 3.5.1, 3.5.2
++    int2magic(3351): '3.5.3',     # 3.5.3
+     int2magic(3361): '3.6.0a1',   # 3.6.0a1
+     int2magic(3370): '3.6.0a1+1', # 3.6.0a?
+     int2magic(3370): '3.6.0a1+2', #
+-- 
+2.12.1
+
diff --git a/dev-python/xdis/metadata.xml b/dev-python/xdis/metadata.xml
new file mode 100644
index 000000000000..a1acaae3728f
--- /dev/null
+++ b/dev-python/xdis/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dolsen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>rb@dustyfeet.com</email>
+			<name>Rocky Bernstein</name>
+		</maintainer>
+		<remote-id type="pypi">xdis</remote-id>
+		<remote-id type="github">rocky/python-xdis</remote-id>
+	</upstream>
+	<longdescription>This Python module allows you to disassemble bytecode from
+		different versions of Python than you are running on. It can marshal
+		load Python bytecodes from different versions of Python. The
+		command-line routine pydisasm will show disassembly output using Python
+		3.5 disassembly conventions
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/xdis/xdis-3.2.4.ebuild b/dev-python/xdis/xdis-3.2.4.ebuild
new file mode 100644
index 000000000000..f1ec7b951a7f
--- /dev/null
+++ b/dev-python/xdis/xdis-3.2.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Python cross-version byte-code disassembler and marshal routines"
+HOMEPAGE="https://github.com/rocky/python-xdis/ https://pypi.python.org/pypi/xdis"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/xdis-test_magic_bytes_error.patch" )
+
+python_prepare_all() {
+	# Fix an unconditional test only dep
+	sed \
+		-e "s/setup_requires/tests_require/" \
+		-i setup.py
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Need to rm any pyc files to prevent test failures.
+	rm -R "${S}"/test/__pycache__
+	PYTHONPATH="${S}/test:${S}/test_unit:${BUILD_DIR}/lib" \
+		py.test -v || die "Tests failed under ${EPYTHON}"
+	cd test
+	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \
+		${EPYTHON} test_pyenvlib.py --verify --simple --compile || die \
+		"Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/xdis/xdis-3.3.0.ebuild b/dev-python/xdis/xdis-3.3.0.ebuild
new file mode 100644
index 000000000000..9885cf155d48
--- /dev/null
+++ b/dev-python/xdis/xdis-3.3.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Python cross-version byte-code disassembler and marshal routines"
+HOMEPAGE="https://github.com/rocky/python-xdis/ https://pypi.python.org/pypi/xdis"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/xdis-test_magic_bytes_error.patch"
+	"${FILESDIR}/xdis-3.3.0-remove-pytest-runner-dep.patch"
+)
+
+python_test() {
+	# Need to rm any pyc files to prevent test failures.
+	rm -R "${S}"/test/__pycache__
+	PYTHONPATH="${S}/test:${S}/test_unit:${BUILD_DIR}/lib" \
+		py.test -v || die "Tests failed under ${EPYTHON}"
+	cd test
+	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \
+		${EPYTHON} test_pyenvlib.py --verify --simple --compile || die \
+		"Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/xdis/xdis-3.3.1.ebuild b/dev-python/xdis/xdis-3.3.1.ebuild
new file mode 100644
index 000000000000..6d44417a7807
--- /dev/null
+++ b/dev-python/xdis/xdis-3.3.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Python cross-version byte-code disassembler and marshal routines"
+HOMEPAGE="https://github.com/rocky/python-xdis/ https://pypi.python.org/pypi/xdis"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+#PATCHES=( "${FILESDIR}/xdis-test_magic_bytes_error.patch"
+#	"${FILESDIR}/xdis-3.3.0-remove-pytest-runner-dep.patch"
+#)
+
+python_test() {
+	# Need to rm any pyc files to prevent test failures.
+	rm -R "${S}"/test/__pycache__
+	PYTHONPATH="${S}/test:${S}/test_unit:${BUILD_DIR}/lib" \
+		py.test -v || die "Tests failed under ${EPYTHON}"
+	cd test
+	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \
+		${EPYTHON} test_pyenvlib.py --verify --simple --compile || die \
+		"Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/xlrd/Manifest b/dev-python/xlrd/Manifest
new file mode 100644
index 000000000000..eebcded36224
--- /dev/null
+++ b/dev-python/xlrd/Manifest
@@ -0,0 +1,8 @@
+AUX xlrd-0.9.3-column.patch 2424 SHA256 f6b0f33fc0bb3151098bd896f3343661500346f24edd2587cab7c3e812b2362a SHA512 1d28f32101499dc9e22912aa92a0450e638c9d708bf42a93f10f7f07a7535532b61eb1028fc335a1c84e92608cbaefa6c1e042f70a005cdb0dc73392315d52f8 WHIRLPOOL 228d84976db079a61292cf858b0ac38b376253a1cb578389f8ffa7fe383a4d4c90a9991e9d0065a0723e55f6c87d532f8ceedc54b4935e970e4961ddbcf50fed
+DIST xlrd-0.9.4.tar.gz 322945 SHA256 8e8d3359f39541a6ff937f4030db54864836a06e42988c452db5b6b86d29ea72 SHA512 61d21a6b0bf5a72f75b98f6a62245fd2d0d8b091b56f31cd39e83ff0d68edba5370f81b50020f6ac52d08b0b49c0920bf44661d8501ecbde5baee7d991037a6d WHIRLPOOL ffc39dcc31223d1d011a067ad309f56866bef278e7e0fba6c9b626b33d437e70316a1492af3cc161619967094f08db39cb312d3a99083d7283162abfad5da611
+DIST xlrd-1.0.0.tar.gz 2563654 SHA256 0ff87dd5d50425084f7219cb6f86bb3eb5aa29063f53d50bf270ed007e941069 SHA512 a9ab8f18d09827f68584bdaa3cc6651302c6d420afb3cd588d21d5f3e7fa1b4c9e5bb31661111b3bd14ed17d69f563dc515859e2aacef63aefdca3b6d98d274e WHIRLPOOL 47130e4fd686199ec6d65256588b6abed580e63b9fb1dac309e06f4ac917bdf35ccf1e0fc40e005a1491816fdd686a8382f995a58bce5f0a1716622795053ac7
+EBUILD xlrd-0.9.4.ebuild 848 SHA256 231dcf024514e778535ba7cbf40117c337a3a95f0916da711fd6e47444248b65 SHA512 8ba617f88491b76d28e9d0c83b6a4ef5ec7985b0b562238c8c09990a76c047235b995b84336a1b42e6b96aeab2d7d8dcf4e10625b97dc9c79b04cc67aeda093b WHIRLPOOL 6034af478e932069d5fe56d88d4884ea58c98a8d46523028a417d2b9e77d5077bf65516a06ee403c64350cdfba1142ef33bc8b0378f9d02f94976b0031b7706f
+EBUILD xlrd-1.0.0.ebuild 731 SHA256 6e561dbb84c819b1a2225b35e42ffb2b7bb92a31beb3ed906b66f6534ca884e0 SHA512 e17847bac5919679ca5adacb58659dd2d788c3b5dc22a44ed3e55367b5539cd4b9570d37119942f2e6230a02ff57650a3c16df300bb6f0cb101a0bc09d6095a1 WHIRLPOOL bcc593b14f8a91b40ad624969d2652db3689b23772add09999ea1ae02de6e1295cdf3cf4e88c688fdc049278d25ab963cd1593e7ea70635f10e6719f57637ee8
+MISC ChangeLog 3045 SHA256 4c29cccbe9f9fecb3615f49c8bd67689f2a8ac42dc5c1c1be40e45793d86282b SHA512 6ec360007faa9f036be9c218374b8f62019c73b5809292054272ee8663177e0385602dbce348f04c0170ff50642aead952defd1d759795f024cdc4fd8b7d464c WHIRLPOOL 9f6fcedf641f8e228c8c8fbe717bb49968ea3f08e09951b446389b787bd7043e248be4892aea56c6c875b04a978932585b94ec0f86c5d979756177553454cae7
+MISC ChangeLog-2015 3779 SHA256 bde9ab9b258d393edc3f3576d8c7602975f87864c0cd599ed77916135274e681 SHA512 f23d01b0915a5cc0effb08134bd2453ed6b75a161a892d88e8f463aeea17000b222ffaf92d6515e9630038f9b97738a9668d2009d4a8b1ad888c526a19f6bf7f WHIRLPOOL 20fc22a663c59a42f10136326939d79b8e81e9361241a31d5d7c1726c8eb7e8c5b78050b42a135c31ae1432cb9c82e61f56a78fa1aad83b1704d7189361bdfd5
+MISC metadata.xml 551 SHA256 9dc58a8ec56facf8821eec9ec7d04bfb6283f913658dd422772254efa500ec7f SHA512 2b3c90ab71ffcca19fd58fb7b6ac173f149497e00a31a8e6c3ed14f512d34c990904f40e2828ddf9babb448094e026ed70c4afb3e76bbb9585c9e4b4b597149e WHIRLPOOL 512f8bdd45cfdbdc5bd601ff1601337de4cc94fc16f6200fc552237cd58831baf4dd1837dec0dcf9e26136dff31940ba980a68f9a8d12d3cfab745d692af487c
diff --git a/dev-python/xlrd/files/xlrd-0.9.3-column.patch b/dev-python/xlrd/files/xlrd-0.9.3-column.patch
new file mode 100644
index 000000000000..0a9c2749d87c
--- /dev/null
+++ b/dev-python/xlrd/files/xlrd-0.9.3-column.patch
@@ -0,0 +1,59 @@
+From 6c2c1057d2780c079218fe988d1d5243eefec159 Mon Sep 17 00:00:00 2001
+From: Konstantin Lopuhin <kostia.lopuhin@gmail.com>
+Date: Wed, 18 Jun 2014 12:43:04 +0400
+Subject: [PATCH] fix parsing of bad dimensions
+
+---
+ xlrd/xlsx.py | 24 ++++++++++++++++++------
+ 1 file changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/xlrd/xlsx.py b/xlrd/xlsx.py
+index 53fbb89..763df0c 100644
+--- a/xlrd/xlsx.py
++++ b/xlrd/xlsx.py
+@@ -73,7 +73,8 @@ def augment_keys(adict, uri):
+     _UPPERCASE_1_REL_INDEX[_x] = 0

+ del _x

+ 

+-def cell_name_to_rowx_colx(cell_name, letter_value=_UPPERCASE_1_REL_INDEX):

++def cell_name_to_rowx_colx(cell_name, letter_value=_UPPERCASE_1_REL_INDEX,

++        allow_no_col=False):

+     # Extract column index from cell name

+     # A<row number> => 0, Z =>25, AA => 26, XFD => 16383

+     colx = 0

+@@ -85,9 +86,18 @@ def cell_name_to_rowx_colx(cell_name, letter_value=_UPPERCASE_1_REL_INDEX):
+             if lv:

+                 colx = colx * 26 + lv

+             else: # start of row number; can't be '0'

+-                colx = colx - 1

+-                assert 0 <= colx < X12_MAX_COLS

+-                break

++                if charx == 0:

++                    # there was no col marker

++                    if allow_no_col:

++                        colx = None

++                        break

++                    else:

++                        raise Exception(

++                                'Missing col in cell name %r', cell_name)

++                else:

++                    colx = colx - 1

++                    assert 0 <= colx < X12_MAX_COLS

++                    break

+     except KeyError:

+         raise Exception('Unexpected character %r in cell name %r' % (c, cell_name))

+     rowx = int(cell_name[charx:]) - 1

+@@ -562,9 +572,11 @@ def do_dimension(self, elem):
+         if ref:

+             # print >> self.logfile, "dimension: ref=%r" % ref

+             last_cell_ref = ref.split(':')[-1] # example: "Z99"

+-            rowx, colx = cell_name_to_rowx_colx(last_cell_ref)

++            rowx, colx = cell_name_to_rowx_colx(

++                    last_cell_ref, allow_no_col=True)

+             self.sheet._dimnrows = rowx + 1

+-            self.sheet._dimncols = colx + 1

++            if colx is not None:

++                self.sheet._dimncols = colx + 1

+ 

+     def do_merge_cell(self, elem):

+         # The ref attribute should be a cell range like "B1:D5".

diff --git a/dev-python/xlrd/metadata.xml b/dev-python/xlrd/metadata.xml
new file mode 100644
index 000000000000..f9f24c71afaf
--- /dev/null
+++ b/dev-python/xlrd/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">Extract data from new and old Excel spreadsheets on any platform. Pure
+		Python (2.1 to 2.6). Strong support for Excel dates. Unicode-aware.</longdescription>
+	<upstream>
+		<remote-id type="pypi">xlrd</remote-id>
+		<remote-id type="github">python-excel/xlrd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/xlrd/xlrd-0.9.4.ebuild b/dev-python/xlrd/xlrd-0.9.4.ebuild
new file mode 100644
index 000000000000..514b1feed376
--- /dev/null
+++ b/dev-python/xlrd/xlrd-0.9.4.ebuild
@@ -0,0 +1,32 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for developers to extract data from Microsoft Excel (tm) spreadsheet files"
+HOMEPAGE="
+	http://www.python-excel.org/
+	https://github.com/python-excel/xlrd/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9.3-column.patch )
+
+python_prepare_all() {
+	# Remove this if examples get reintroduced
+	sed -i -e "s/test_names_demo/_&/" tests/test_open_workbook.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" -m unittest discover || die "Test failed with ${EPYTHON}"
+}
diff --git a/dev-python/xlrd/xlrd-1.0.0.ebuild b/dev-python/xlrd/xlrd-1.0.0.ebuild
new file mode 100644
index 000000000000..ee838c75be3a
--- /dev/null
+++ b/dev-python/xlrd/xlrd-1.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to extract data from Microsoft Excel spreadsheets"
+HOMEPAGE="http://www.python-excel.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+python_prepare_all() {
+	# Remove this if examples get reintroduced
+	sed -i -e "s/test_names_demo/_&/" tests/test_open_workbook.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" -m unittest discover || die "Test failed with ${EPYTHON}"
+}
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
new file mode 100644
index 000000000000..d6882a7e0f6b
--- /dev/null
+++ b/dev-python/xlsxwriter/Manifest
@@ -0,0 +1,11 @@
+DIST XlsxWriter-0.7.8.tar.gz 233091 SHA256 2200c2a69f63b350b3b1f5db8fae3e5b7135c01b7ac9c3b1d5926cf6583dd4cd SHA512 2343155c765533bbc146e928dfc82924f089c7abee2f3607be2e5f9b1da9166090164f134256cbd36f319a97c9aa651fb346cc7502a3f1721f9687a9cddb9364 WHIRLPOOL ba498cfe5929f8d302b2f81ca0291c465759ed070d030e650d4a973706562a397fda51632b31cdac8caba134d8199f3499c7505b9990a9fa02b908b5ac971bdc
+DIST XlsxWriter-0.9.2.tar.gz 237146 SHA256 9363097b35299da5b4706f9eb3eb79bc60d7eb68f3feff40149e20f1af26ddfa SHA512 037f33a13a4f61fd6adb17ac1726bae7b5244242f66dfb5b9ec9ed9c0cf77af156ca4aa52013f1419c2cc381c7408a18243ebafaa2543828c3b01a619af4ec13 WHIRLPOOL 652ae7dcdaa0b6295e8175d1be1beef3ca6d78b2d980bd36033f9715c7e6c1065b50c214f1331e2da2998612e54dec44d40d3c30a80859bc1a8b26659e85f5bf
+DIST XlsxWriter-0.9.8.tar.gz 236187 SHA256 1bba62325b7efc97b0bf9d8864cc7e31506263994d93404b94b0997fb47e1570 SHA512 05c372c25142dc6726fa5475cdda433f5ecae1d0f92f87c50ca7bc26fb99f8ae369a1a8cb6ec5e909280c81f32c92ac23892fbd6326b8e1cf032abcf42c0d894 WHIRLPOOL c028031122367ba578418709c130348b50c0db2dc1d11bcd098067d6a39e750dd38aaa1178201e2104ee22ae8ccbfc2f699c7a6d9fde2af2b4ff131435da8842
+DIST xlsxwriter-0.9.2-tests.zip 27275933 SHA256 a78ff7620e725412668489eea2987ac5e491fada4354ac6e0124fb296f0a1d5f SHA512 fe0c00e251b5a07e132c6bd2ddb19c95eb0782f00e35085895361500213695313370baacfa83317af814d5ab740ac8a6489fd96d5e9a3184bb2ea710683d2028 WHIRLPOOL 29f1e873fe72e29e99dd4b3ab3355baa3129fbf11bbe21a8e69202935c7c7e6ba5384e8d5c743127cc4d5585246c55c2341439ff722b5ee7b5a85ffc66c51d40
+DIST xlsxwriter-0.9.8-tests.zip 28345992 SHA256 c4df6f881d871ae4052d6a864b02a6129edae6d71e0791fff412fd7ce8ffe596 SHA512 a30cf917642100d3ffb9616809e4860593ccfa271beed0baa757ccf6f0822af05daf602d67773ce1b5af020ead108bf7a844dafb426c020c9adaed19cc7aad29 WHIRLPOOL 833d95f2d59a05873a690d0245a9c9a265169efdaabee0f975dfc643cfa67dafcac9555e57c6ac04851d10e1f5ca9c58486539eda0fe6105ed9172bbbd435422
+EBUILD xlsxwriter-0.7.8.ebuild 812 SHA256 261754e09df127939b2ab59e06319cabe2302079d787a0d544045c00a2bf108b SHA512 a579932eafbe77f1c66d6636f83e5b84677ffa8e3f7b5b4fb7903c71fde51d021bf15087b709245fd967ed92518a27e015ecd0df3a839b3d0797433da6e94878 WHIRLPOOL f7125eb54f35d7efdf22231b21f557c6c8c433243b9ee169b4989b0fa2fe8290e9872cdf10802313ea83de3e6782d71187fad12b92bf9eea51f1041033035086
+EBUILD xlsxwriter-0.9.2.ebuild 1206 SHA256 e0674046de754b0594d0a5c950b2c09bf115da8e66acaf0fd05368c6305b7832 SHA512 5235afc4bc8ad933d104d8857876af826b0d288cb6b91e71c0d3c5656d8c5580b5a1227ae7701146cf28e27d6034110d6239dcfb20ae40443266d78832fceac5 WHIRLPOOL 52fa7278054977f0f7a1a58525e6dd5d1de5e5ae61d8ae1e904be69feaab917440274f8b3b8707b7fd406a3738e07cb910ffb8cda13903aa054778e25ee61f12
+EBUILD xlsxwriter-0.9.8.ebuild 940 SHA256 9fdca5652db81c22640e2fdb1c0037093cdbeabe8fa3571b3e2dc0f45231c3b8 SHA512 c3dbf1563d4a4417d9c8e84a5ef737f1b5d22f95b09828240d35788aec0050808f9dca4f64aa05eb5080b983f5c0015afe3e7443e41efaeb610f337aa177025b WHIRLPOOL 2e1a6655dc6d462ca556ad9b8a1687e6a390bf6262a621d41d9a138b410b23b1457bd60dfe5581b4012c21c3f71f135c6d2310a33797cfe3da8aa5675e90950e
+MISC ChangeLog 5415 SHA256 1ba8e0e0653df0f82aa11f43fb0c62b82597aec4d3e19aeb0f939abca319f13b SHA512 5e115f807c15f6616ee04f796c9506aaa5d010e887cf2731afb1c1c16713123ce09062aa59f15e8d924fad79e0d8c8de270a9125faa9c00038e474da18c43ab3 WHIRLPOOL 9934644a51bb9a572a1f92e70c78eb282ea7da4b721fe4c4240911a7cf15aab8df54e936fe49abfcd28a18cc7f7406f6e9ca169ed8186882fa71fd7e642c3f72
+MISC ChangeLog-2015 1198 SHA256 3c0200e91d02379f52841939c7cdcb131788c3e0c8a5fd8cbc227009bad99213 SHA512 ab29da63f9febdd076927b61aae60530b3fd21a43b338341374e57be1a4e526f8112eea69a5e66124c79b0d5d8dee1d223106c98287a2a976e9ae1f79e952618 WHIRLPOOL 7a510d700531ee4d578356a70f63d37124d7eafb6184328da09269fda8bb33c3a92dcc3c3046b6b8f4955ab5414c1097894e232b5ba897bd4cf0dd48f38013bd
+MISC metadata.xml 385 SHA256 d7e9c617fbc1c5677efde18d5f73a3fc83fdaaa6ad1149e6e9d3b8f5fa3efb50 SHA512 62eca3ef002307f383a6c074c3dd956d9035488e1eeaaa4b0e20a6c4d7c328568a2178478e0a97d6b3bfef0c9673a1ae2b58ea39e4e5a2c111b0a34c44398545 WHIRLPOOL 5552825c64c7b5dd373e26582cea0ba6d296dc50c387dd95523b2d55a576ba958eb4b5399e63cc54ac20e9854ccb73f32d82b48fc1753233d19f00c8b21a8348
diff --git a/dev-python/xlsxwriter/metadata.xml b/dev-python/xlsxwriter/metadata.xml
new file mode 100644
index 000000000000..b6f904c2dec1
--- /dev/null
+++ b/dev-python/xlsxwriter/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">XlsxWriter</remote-id>
+    <remote-id type="github">jmcnamara/XlsxWriter</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild
new file mode 100644
index 000000000000..30ac84f26f1e
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild
@@ -0,0 +1,36 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+MY_PN="XlsxWriter"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://pypi.python.org/pypi/XlsxWriter https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}"/${MY_P}
+
+# Missing from tarball
+# https://github.com/jmcnamara/XlsxWriter/issues/327
+RESTRICT=test
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.9.2.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.9.2.ebuild
new file mode 100644
index 000000000000..e013553e66e2
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-0.9.2.ebuild
@@ -0,0 +1,48 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+MY_PN="XlsxWriter"
+MY_P="${MY_PN}-${PV}"
+
+# PLEASE UPDATE
+# for up2date tests. Upstream says they are to large to be shipped to pypi
+# https://github.com/jmcnamara/XlsxWriter/issues/327
+# https://github.com/jmcnamara/XlsxWriter/issues/229
+RELEASE=b24d6fbf38862558f1c114c0c73058ba306d628f
+
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://pypi.python.org/pypi/XlsxWriter https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="
+	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+	test? ( https://github.com/jmcnamara/XlsxWriter/archive/${RELEASE}.zip -> ${P}-tests.zip )
+	"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	if use test; then
+		cp -r "${WORKDIR}"/${MY_PN}-${RELEASE}/${PN}/test ${PN}/ || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v -v || die
+}
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
new file mode 100644
index 000000000000..aca5569eed84
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="XlsxWriter"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+	test? ( https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_${PV}.zip -> ${P}-tests.zip )
+
+"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( app-arch/unzip
+			dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	if use test; then
+		cp -r "${WORKDIR}"/${MY_PN}-RELEASE_${PV}/${PN}/test ${PN}/ || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v -v || die
+}
diff --git a/dev-python/xlutils/Manifest b/dev-python/xlutils/Manifest
new file mode 100644
index 000000000000..2a1c7daef7ee
--- /dev/null
+++ b/dev-python/xlutils/Manifest
@@ -0,0 +1,5 @@
+DIST xlutils-1.7.1.tar.gz 62278 SHA256 cdbde90603d626a45bf36d45368e5b83484b545d230fc91f10fad89b2d766384 SHA512 196ec5cf99e7ad5a612c455e4e293461ac89e6e93c28790e34dcce544c8689a9ab122e37458d3b6ff24137c3646607fa8768ab3a4c2fa4a3e2e59e0ac05d675a WHIRLPOOL 769fb30efd2294e3c0205d4134532af5b8633a3566a819cc58a4104d1a4fc4f93a92de1dbc7aa4da7e86a28fb176e65aba3e75f534f12a2e5732057cb5c62d22
+EBUILD xlutils-1.7.1.ebuild 796 SHA256 bae6c1ebd53243a20d134a56425db42e26a20918b1cc0c3e3cd0fd4ef9d72e52 SHA512 6fdd941a1977b4ed81c8fefa3d18ac4d3101b85a220baa019072bd72b831b223fa086a46e9096795b0f3001b6e925bf6f377b1922e16adcd75b4111698eb3aec WHIRLPOOL 62138c7e2669329d750cedf7092f58a2068088975065b737850b812be8943d5bfd08610fa55ca5e42de80ca9ffc5ac10aea1eea407939f076915832ed1fe87f2
+MISC ChangeLog 2851 SHA256 36380ea8b9c307e0843afae8ee20118ec57452a0597f4d7ce6424a2107583a43 SHA512 6f5defcccde0898c3ec7490c3fea40be054657fe747a9e7dd54b976c65db5653bf55605ee0608a56581a777c9ac0ff3c1f6f5aad006d253e77add1486dafc74f WHIRLPOOL 76e591381fd98e8ce489431071d03c4887df76c35dbd2c1b9e47ee76a903fdf9b30a94583cc63663f57ea7b0ece6cf4fb7c6c81f8c344e39f00e3c0ca824d878
+MISC ChangeLog-2015 1305 SHA256 0ad841a9021a8954705ba2cede6c2d93be5b7a12f1a72c086c118fcd71066c8f SHA512 01cded277029e9bccf557208134bfc15d47067fb2d19771b60a1b9b67744ef1e57b1734ce52eef2bc6335806cdeb974ef7360e032d9620c6b00182e69e162bd7 WHIRLPOOL 2acfc6c26d39cbc7d56927a0790aa863cdb9c39d9c3b0dfd28c66165e2c3e081cf2aa951e8ecb686e87e51bd160c3b35ae0a922c45d88b30c8212f3f5b179a90
+MISC metadata.xml 320 SHA256 e9ee03df4f192bd041d94d09d08e8bb1bae831d92cf4fa92aad14cd1cd0b65e2 SHA512 c83e7b88d50078775118f9c2b9a7edeef32272247ae55c30a99d1c9927b4d3fdfe12393500f93fb3a2a7ec37d0d249355d39887a4f26e75f9c24d585ae3204c4 WHIRLPOOL 550bbcf6124f1e2f713319eee397ec8ff3ed3af88e7cfd865f4241011c6ffc61d40cd8a35d3bac6653eedfdb84101819902a66862a6b211bb256748c70a04a6a
diff --git a/dev-python/xlutils/metadata.xml b/dev-python/xlutils/metadata.xml
new file mode 100644
index 000000000000..db8ca831fa2a
--- /dev/null
+++ b/dev-python/xlutils/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">xlutils</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/xlutils/xlutils-1.7.1.ebuild b/dev-python/xlutils/xlutils-1.7.1.ebuild
new file mode 100644
index 000000000000..d72a7b005520
--- /dev/null
+++ b/dev-python/xlutils/xlutils-1.7.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="provides a collection of utilities for working with Excel files"
+HOMEPAGE="https://pypi.python.org/pypi/xlutils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=">=dev-python/xlwt-0.7.3[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-0.7.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/errorhandler[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/testfixtures-1.6.1[${PYTHON_USEDEP}] )"
+
+DOCS="README.txt docs/*.txt"
+
+python_test() {
+	py.test xlutils/tests
+}
diff --git a/dev-python/xlwt/Manifest b/dev-python/xlwt/Manifest
new file mode 100644
index 000000000000..5d05881ca120
--- /dev/null
+++ b/dev-python/xlwt/Manifest
@@ -0,0 +1,8 @@
+AUX docbuild.patch 568 SHA256 bc3766af836303ffffd74ba9226c63c90851ab79df9cbc362ab8b1764daebcff SHA512 588a3cdfe582f449b7bd75df5d6f29e327a20bf472317bfd839013f40a406c19529ad2ec3d0f258aced22e3d18e80bc25f1b8a398ab1b6ffbafbe1e36ee66f65 WHIRLPOOL c344a7ea2ef60833f35c6b3eafbbf380cf5f91b350809b2c20b3455c48ae87a750907d31af7b0bc91940b792f7a2f1bb3657e2d44e3dea546e5192117461fcb8
+DIST xlwt-1.0.0.tar.gz 129588 SHA256 ac432939eec8daa9f88af994ff53f009e607a4e1102772ec0be0b2a86b2c1cf9 SHA512 45788a506635f1ef6380d46aa0af724e511e401e8347dcf48dbf4e2d90e7f4c7f66838cd9616cf58807ffb939daba1f47b0d2cf449f8cb528db41fba84cc8866 WHIRLPOOL d3d344faae89fad012f05fe5b19e5ce16dd144016abf7ea15123a9725c77a732e85d93131c692dbcaf306cdc8d1b06efcaf39227265c612200107d2c20541132
+DIST xlwt-1.2.0.tar.gz 153909 SHA256 505669c1eb6a60823fd3e2e723b60eea95f2c56254113bf163091ed2bedb4ac9 SHA512 e0be61f6a54ac39c91cf03a1a7535c464045539f6a040f000921815e3280bd341770d72f4353891a10dde7c1b51eab4ccb1ae1c10bbf779108346fba8484eef8 WHIRLPOOL 645746c311d8d2b55022368fd8d5baedf4771d66000baaf0f3eda57241c8c1c1d51bed9fb33e85398d9b79803b8a6a350a10d3abb74bdafc8de0e4408771a38f
+EBUILD xlwt-1.0.0.ebuild 1211 SHA256 e58137d2beb4179fd86297c8b6668a0575460c09db486b03f27f8fdb2d769c63 SHA512 0d88f97ada93c26eec18880f9e6bf43e22f33b6545a934d550da3719ac9ff2e84f0279d4a3eccfce44a88d30201360777549a2cbf99e724eea66faaf5cd411c4 WHIRLPOOL 65c3662483c735889d4831b1d9b89491d1c368d76bbb0b3adfcce88738b0f41505650523159399619e19e8e9bb17dd2ee7c79521632835730436e19a6d3bd8c4
+EBUILD xlwt-1.2.0.ebuild 1262 SHA256 1ad27c7f9d14acbf8f1561599f23ad16c850008e0313a49d9f006be0261e003b SHA512 7a0a2de0063f75d3f99e9bca626cea8e7856bd42cc2d74c2688f3d719cfffedcb83541a1fe76869797edb2939360a1b886004407d55ad0d4a62e32f13697859c WHIRLPOOL 85c72b03c23ed034794b1d4de65e06b1f2c3fb6524330e17b11edc69ce89895bb074da142b274f2043d1133e48bef82a67971b82aa539f6c3529678f132664d9
+MISC ChangeLog 4095 SHA256 200709756cf544dd3f7243952d2ef5b55b64c91daafb6959ca6a242f160c30d7 SHA512 94062902d913bd3aa42c8b3504647fed1f6430e229849d956a77f7f79046a3d2fe0ffea53ea133cc60286a8abb234a6031ccf4ee311a6c5738640c810fd86637 WHIRLPOOL 83d4f823e3bbc7a29e9031ef9dbac80c613b8c457bc076fb7212cfc858440ae44345c5c881897bbc71f38cf6db72a6c37c60e1c26523a1e731037abb4671c899
+MISC ChangeLog-2015 3918 SHA256 e176489b42f80103ce7a9aa0f2dc6065397946af448dce2be88b14711acb86db SHA512 7ad9f097bc9dfa72cbf3a66cda489286dadf247cbbeeef79fcf9cbe93ef67a2ab4e3c817d836a1859c3cc2cacf4de150316db7e83336a257a92f3acdde2a180f WHIRLPOOL 03edd2ba02e7ec2f236b7524bf6602953664bba031ccc1b6b13830383f2c35a0d585f423b1a10fd60d0e0e6af8ac4f6276233ea89d3b8083070330e842003331
+MISC metadata.xml 654 SHA256 92bc999c9e4b8f9d7c1093ad3186552a19c48ed842dcbcea7f11a051635c16b2 SHA512 3ff54c5b6c6ec5eeb46a3a3f0667ac6f9bf7919b41f675f257fd04e05cb3ff252c3dd11ddcaf82545e2e05e17f2e18c729164330a7caa914c61c8508cdec5bea WHIRLPOOL 7133e2aed1df87c25d73e72fec5586b00d3d77d313f80bc080eed6419b6ee6838c4a6e1070c78d4c500383e90f5879239ef80b901eb0f5eceac9ef6cdfe0313d
diff --git a/dev-python/xlwt/files/docbuild.patch b/dev-python/xlwt/files/docbuild.patch
new file mode 100644
index 000000000000..20ed580a628e
--- /dev/null
+++ b/dev-python/xlwt/files/docbuild.patch
@@ -0,0 +1,17 @@
+diff -Nur xlwt-1.0.0.orig xlwt-1.0.0
+--- xlwt-1.0.0.orig/docs/conf.py
++++ xlwt-1.0.0/docs/conf.py
+@@ -4,7 +4,7 @@
+ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+ pkg_info = pkginfo.Develop(os.path.join(os.path.dirname(__file__), os.pardir))
+ 
+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
++extensions = ['sphinx.ext.autodoc']
+ source_suffix = '.rst'
+ master_doc = 'index'
+ project = u'xlwt'
+@@ -19,4 +19,3 @@
+     html_theme = 'classic'
+ 
+ htmlhelp_basename = project+'doc'
+-intersphinx_mapping = {'python': ('http://docs.python.org', None)}
diff --git a/dev-python/xlwt/metadata.xml b/dev-python/xlwt/metadata.xml
new file mode 100644
index 000000000000..aa0a66b49e98
--- /dev/null
+++ b/dev-python/xlwt/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">xlwt is a library for generating spreadsheet files that are compatible
+  with Excel 97/2000/XP/2003, OpenOffice.org Calc, and
+  Gnumeric. xlwt has full support for Unicode. Excel spreadsheets can
+  be generated on any platform without needing Excel or a COM
+  server. xlwt is a fork of pyExcelerator.</longdescription>
+	<upstream>
+		<remote-id type="pypi">xlwt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/xlwt/xlwt-1.0.0.ebuild b/dev-python/xlwt/xlwt-1.0.0.ebuild
new file mode 100644
index 000000000000..e1cf8b4b0a5d
--- /dev/null
+++ b/dev-python/xlwt/xlwt-1.0.0.ebuild
@@ -0,0 +1,49 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to create spreadsheet files compatible with Excel"
+HOMEPAGE="https://pypi.python.org/pypi/xlwt"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+		dev-python/pkginfo[${PYTHON_USEDEP}]
+	)
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+# Prevent d'loading in the doc build
+PATCHES=( "${FILESDIR}"/docbuild.patch )
+
+python_prepare_all() {
+	# Don't install documentation and examples in site-packages directories.
+	sed -e "/package_data/d" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests tests || die "tests failed under ${EPYTHON}}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/xlwt/xlwt-1.2.0.ebuild b/dev-python/xlwt/xlwt-1.2.0.ebuild
new file mode 100644
index 000000000000..f2f6f8804d9c
--- /dev/null
+++ b/dev-python/xlwt/xlwt-1.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to create spreadsheet files compatible with Excel"
+HOMEPAGE="https://pypi.python.org/pypi/xlwt"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+		dev-python/pkginfo[${PYTHON_USEDEP}]
+	)
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+# Prevent d'loading in the doc build
+PATCHES=( "${FILESDIR}"/docbuild.patch )
+
+python_prepare_all() {
+	# Don't install documentation and examples in site-packages directories.
+	sed -e "/package_data/d" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests tests || die "tests failed under ${EPYTHON}}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/xmltodict/Manifest b/dev-python/xmltodict/Manifest
new file mode 100644
index 000000000000..f77762a4afbc
--- /dev/null
+++ b/dev-python/xmltodict/Manifest
@@ -0,0 +1,7 @@
+DIST xmltodict-0.10.2.tar.gz 24854 SHA256 fc518ccf9adbbb917a2ddcb386be852ae6dd36935e1e8b9a3e760201abfdbf77 SHA512 f734c80740b99f0ebb1c0d955094f63c5f513cf1055ac8577395f91ce1ee95dfc3712512b3e6b1f971637be9c345073a7536bd3bccd0175f191017b40a4f4537 WHIRLPOOL 441bc2fd8b6f7efe43b24aca747c1ded764025cb999f9e62da7a8934956eb0cf5616733ad9f3fb8bd7f33e7728037d0ab0ab48b61da4eb208ceaa61a66486072
+DIST xmltodict-0.11.0.tar.gz 26589 SHA256 8f8d7d40aa28d83f4109a7e8aa86e67a4df202d9538be40c0cb1d70da527b0df SHA512 d42ef146a40f386a5389958f890605c560ce9db2da4447099b8725edc1998339b77ea732576fc7e77fbe5a755a2dc3239dfae4a82fc6593c5f977145ab445295 WHIRLPOOL 8e21f0cd47a3ce4986173047d8120c97a8f95207a63a8479b18131da6851d239ac48772e088d24d8f16e6b1bc207fcc8e03a64f68e9de42e9ec7a55c47edce56
+EBUILD xmltodict-0.10.2.ebuild 622 SHA256 9a9a1090bb6e9e34d1db68d7fb70f444fe456f1de5740f2c674b26119cf53483 SHA512 f052192e3f7dc21eba30ad66d734e55480082f19f643d62d5fbd6cf8fa53b251c56e829490722873b940fbeae07efbe227cbfac0c49e9194e453390338e3bd86 WHIRLPOOL d845ce0579bbea0129d667d3db46acb1c6378409f0c4c215424250b385a0ea752671fe4d0e5b3a3f8b3e8257d4691d6b29e9be21702720e44f01aee48b2183f2
+EBUILD xmltodict-0.11.0.ebuild 628 SHA256 adc00595ebc3392f26eff2ac548342e6a4802dbc9a6f3fa2b80703df10a7b9ac SHA512 b05e477eebcd6b97f12a461802cce7d1639c5c9c8cd51732c7265bdb93851fb9d572d37ad47c513b69c586da4c2c84f31dd2fa85d36053260762657c20b9e9ad WHIRLPOOL f4993be4875a280cf902c6f3cc359cffea157cfc514d76ad1d1ac5731b5f85af2b730a8720944da5abbbe246bc671df152be5621f7b87d086caa23d60729791b
+MISC ChangeLog 3442 SHA256 7a6717fba80ef908c4b449be9abe117699825489012a15577edfa30f1c235ea4 SHA512 754da0e926808dbdeeccee78bb235df69eb71546c153b4817d2f09314397bcb232afb76756363d0149928ec89d8f9adeed5dd0b827e931b8521c8e2e1a5dd6bf WHIRLPOOL 76d5d89fd5e03f030fc6fbe8db9c354c5ef90f845b44dda5e60b41a2d6cb98453fa66eec168419d5a0bb493610db2f294c00bb570794b9cc89f9c6e0a2056f41
+MISC ChangeLog-2015 1985 SHA256 f5588116c1621bd6350d3c5600158c2c251c85fbf623170554f38a6cccf904ce SHA512 fd2f0b087f34c9516363783b918deef747e4dc7acb3fe46b4a17a1099975647bc48dc08d71ca7013d6b68c0edfa2c93a0c95c8457b5ad45f2c7ee876d63e41d9 WHIRLPOOL afe0a8e1746a55822a2893dc5907026854693bbf08c4b71a0c1e096d86a6f8abbe0d72c18ae5906d61c8e9aa93dbed1b47b26fad59029e0b7cc9b8a12f0cc650
+MISC metadata.xml 385 SHA256 df20c27c43f00cf35d25b85607711cd8a7890b99fc1b1ccfd674c846c409a390 SHA512 ad748afd533651881c58295101e82097a0c4f4c15b205f4836315832ea3c08ee7cbbe18f652d09048c08532a3fe03b5fdd1f9da48d3378fac8624984c74df794 WHIRLPOOL eb93d0c0fffedc7b7e3f65ed0eb5638665acb17137575933b85a828a404236440ab3445e8d3fcc08b83c90c8fd981bde2f27da481a69516712a71db7d75b6ad1
diff --git a/dev-python/xmltodict/metadata.xml b/dev-python/xmltodict/metadata.xml
new file mode 100644
index 000000000000..ec7f1c3de1c5
--- /dev/null
+++ b/dev-python/xmltodict/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">xmltodict</remote-id>
+    <remote-id type="github">martinblech/xmltodict</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/xmltodict/xmltodict-0.10.2.ebuild b/dev-python/xmltodict/xmltodict-0.10.2.ebuild
new file mode 100644
index 000000000000..a1a62864f590
--- /dev/null
+++ b/dev-python/xmltodict/xmltodict-0.10.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Makes working with XML feel like you are working with JSON"
+HOMEPAGE="https://github.com/martinblech/xmltodict/ https://pypi.python.org/pypi/xmltodict/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/xmltodict/xmltodict-0.11.0.ebuild b/dev-python/xmltodict/xmltodict-0.11.0.ebuild
new file mode 100644
index 000000000000..5e4278509d1c
--- /dev/null
+++ b/dev-python/xmltodict/xmltodict-0.11.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Makes working with XML feel like you are working with JSON"
+HOMEPAGE="https://github.com/martinblech/xmltodict/ https://pypi.python.org/pypi/xmltodict/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/xmpppy/Manifest b/dev-python/xmpppy/Manifest
new file mode 100644
index 000000000000..a1e36ac33867
--- /dev/null
+++ b/dev-python/xmpppy/Manifest
@@ -0,0 +1,7 @@
+AUX xmpppy-0.5.0_rc1-ssl_fields.patch 1243 SHA256 3c0b684ca4a7b4cabbe7817ce81c101137cd4daa243ed04a52b4b6132b4e6c55 SHA512 4f9065add9da4a1ef66ee13834f0a3f16b9fa8b2ffc5d3938756683ff6ee3b514fd154739e08e471f5ef7eb6331c25abd6c60ec9d56f8a4e1c57521e8510b766 WHIRLPOOL 07c138dc2a7715858968a5f1b6d87c0f2a5e8226e5c317f48f6168ad4d448a79dcef23f6b406a850de5761f196ba4a0771f3af3879fb3567754598444e57a650
+AUX xmpppy-hashlib_ssl_deprecation.patch 2990 SHA256 7bce976579ad18b95a48df664f409e3a6013cbd6122d9a89cf170be2fb5e19af SHA512 1b085dad2d71daf81d7be877a4710c900895f6725322e52210ad3f3e2eba0ef609119ada5ab6c42a3f880317a66555ba3e13187b06cacd7c454189c4152f67f7 WHIRLPOOL 474057c3f2097d6b87fbc24b234c6b99439905bda6018b961be4f697e70dfe7963853c69ad87a20be50ea158eb6edc9f8625451c5ad7217301731b6564138183
+DIST xmpppy-0.5.0-rc1.tar.gz 84993 SHA256 96d9230be2a130ce8ba4cfd09ee9487de0fa7cfe21639977b596c637b267d094 SHA512 53a37d1a8adcdc8a652e4a6efce2a7c35b4c5ef79ee7ae93134ab6d5a74f96647efbd0954eac60c26a2b507fdb7ee3e607427b11fbd1e22290a23793f03b4699 WHIRLPOOL d2a7fa4c526e6d55ffd1e7b633aafacd862d5efbe1db448ec92abfa8f9ff52af0fa726bad1da8b8d3351e483ff3180496f6eb7a9645a278c0f18039a94dee13a
+EBUILD xmpppy-0.5.0_rc1-r2.ebuild 815 SHA256 0c83215659fbff1c0fbefdac432456d574d8301eddfb5dc9df7e7f26b86dac2a SHA512 605465389d2a4efb6c698af85f2b2df427995d82213de9847df1097dc80bbe0689fe4eaa2c2feb56a9b44671de96068260a2e4ed3eced5441bb6b2c4a84c8592 WHIRLPOOL 2797856cf8b0d13d32ed551bce3e3ac9462b3630c437f914240b0a676281f81211376f70df8092ab0181b84fb328af5311e82a2310d524202e875d1d2b93449f
+MISC ChangeLog 3938 SHA256 21dec625748c7478328728ffc0973932fd28da76b9fe7ad95925add738152d52 SHA512 b47a48e0c6cc129f7269aed3b497c853eb4bb6bfee16dd383fe75bc16c53de5318224d1ca2008e2bfdb93b9d525a3cb471a09e7a6281f0c31a4db589e809e444 WHIRLPOOL 8e4e2635a9d8bc6b8078026a1f5b18e6dae49e0aed72fde24f78facead0551365a18c900450e30c9cb1fb7a615b027272e13a62e9a0630e249d467b45bdfa4f6
+MISC ChangeLog-2015 3315 SHA256 04bd3432e8983bd30e99197a801838883130782c65d61e5bdbbfaadc338f6f71 SHA512 b9e6ca14d57744ea48c2b356248b425ab914e985b7bec26963f66135c4cd2fb4424993c5c383e5a1f4d2b0431439dee214e599aae4982d3a6e5c5c640b28dfe1 WHIRLPOOL 163d2be5a6c9fea2fef6e300dce7baca8e7b871008710d51530b684e708cf257ae65f9a929a185a983e081b55a9b0642e1da76c4b2bb3f467d9622b8058da177
+MISC metadata.xml 722 SHA256 ec6a4fda971328fcb7c802a59b1895b8b7f94e5648d519fceeace740d5c4cc44 SHA512 669662f0f5c8f767b221abc07d59eedc4d97762316951bcda01ba249c831a7ef47e90dfd18c22f243e2b8851b7a616128c78036a619ca1a5dd846208e7632773 WHIRLPOOL 71d2020b270f667427e6eca0d573bebd469d544cea94b0442fc4f02a744adc680bc922e1f8205e23f9c2a8f5bcc8df1b71fe3fe72b2eaad760cdf1f7c1387380
diff --git a/dev-python/xmpppy/files/xmpppy-0.5.0_rc1-ssl_fields.patch b/dev-python/xmpppy/files/xmpppy-0.5.0_rc1-ssl_fields.patch
new file mode 100644
index 000000000000..a39af1821fdb
--- /dev/null
+++ b/dev-python/xmpppy/files/xmpppy-0.5.0_rc1-ssl_fields.patch
@@ -0,0 +1,28 @@
+Taken from https://bugs.gentoo.org/show_bug.cgi?id=535758
+Kudos to Anton Bolshakov <blshkv@pentoo.ch> for this patch
+
+--- xmpp/transports.py.orig	2015-01-05 15:41:23.000000000 +0800
++++ xmpp/transports.py	2015-01-06 15:52:25.916240681 +0800
+@@ -27,7 +27,7 @@
+ Also exception 'error' is defined to allow capture of this module specific exceptions.
+ """
+ 
+-import socket,select,base64,dispatcher,sys
++import socket,ssl,select,base64,dispatcher,sys
+ from simplexml import ustr
+ from client import PlugIn
+ from protocol import *
+@@ -314,9 +314,10 @@
+         """ Here we should switch pending_data to hint mode."""
+         tcpsock=self._owner.Connection
+         warnings.filterwarnings("ignore", "socket\.ssl.*ssl\.wrap_socket", DeprecationWarning)
+-        tcpsock._sslObj    = socket.ssl(tcpsock._sock, None, None)
+-        tcpsock._sslIssuer = tcpsock._sslObj.issuer()
+-        tcpsock._sslServer = tcpsock._sslObj.server()
++        tcpsock._sslObj    = ssl.wrap_socket(tcpsock._sock, None, None)
++        tcpsock._sslIssuer = tcpsock._sslObj.getpeercert().get('issuer')
++        tcpsock._sslServer = tcpsock._sslObj.getpeercert().get('server')
++
+         tcpsock._recv = tcpsock._sslObj.read
+         tcpsock._send = tcpsock._sslObj.write
+ 
diff --git a/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch b/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch
new file mode 100644
index 000000000000..489de037a488
--- /dev/null
+++ b/dev-python/xmpppy/files/xmpppy-hashlib_ssl_deprecation.patch
@@ -0,0 +1,69 @@
+--- xmpp/auth.py
++++ xmpp/auth.py
+@@ -21,11 +21,16 @@
+ 
+ from protocol import *
+ from client import PlugIn
+-import sha,base64,random,dispatcher,re
++import base64,random,dispatcher,re
+ 
+-import md5
+-def HH(some): return md5.new(some).hexdigest()
+-def H(some): return md5.new(some).digest()
++try:
++    from hashlib import md5, sha1
++except ImportError:
++    from md5 import new as md5
++    from sha import new as sha1
++
++def HH(some): return md5(some).hexdigest()
++def H(some): return md5(some).digest()
+ def C(some): return ':'.join(some)
+ 
+ class NonSASL(PlugIn):
+@@ -54,15 +59,15 @@
+ 
+         if query.getTag('digest'):
+             self.DEBUG("Performing digest authentication",'ok')
+-            query.setTagData('digest',sha.new(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest())
++            query.setTagData('digest',sha1(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest())
+             if query.getTag('password'): query.delChild('password')
+             method='digest'
+         elif query.getTag('token'):
+             token=query.getTagData('token')
+             seq=query.getTagData('sequence')
+             self.DEBUG("Performing zero-k authentication",'ok')
+-            hash = sha.new(sha.new(self.password).hexdigest()+token).hexdigest()
+-            for foo in xrange(int(seq)): hash = sha.new(hash).hexdigest()
++            hash = sha1(sha1(self.password).hexdigest()+token).hexdigest()
++            for foo in xrange(int(seq)): hash = sha1(hash).hexdigest()
+             query.setTagData('hash',hash)
+             method='0k'
+         else:
+@@ -81,7 +86,7 @@
+     def authComponent(self,owner):
+         """ Authenticate component. Send handshake stanza and wait for result. Returns "ok" on success. """
+         self.handshake=0
+-        owner.send(Node(NS_COMPONENT_ACCEPT+' handshake',payload=[sha.new(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest()]))
++        owner.send(Node(NS_COMPONENT_ACCEPT+' handshake',payload=[sha1(owner.Dispatcher.Stream._document_attrs['id']+self.password).hexdigest()]))
+         owner.RegisterHandler('handshake',self.handshakeHandler,xmlns=NS_COMPONENT_ACCEPT)
+         while not self.handshake:
+             self.DEBUG("waiting on handshake",'notify')
+--- xmpp/transports.py
++++ xmpp/transports.py
+@@ -31,6 +31,7 @@
+ from simplexml import ustr
+ from client import PlugIn
+ from protocol import *
++import warnings
+ 
+ # determine which DNS resolution library is available
+ HAVE_DNSPYTHON = False
+@@ -312,6 +313,7 @@
+         """ Immidiatedly switch socket to TLS mode. Used internally."""
+         """ Here we should switch pending_data to hint mode."""
+         tcpsock=self._owner.Connection
++        warnings.filterwarnings("ignore", "socket\.ssl.*ssl\.wrap_socket", DeprecationWarning)
+         tcpsock._sslObj    = socket.ssl(tcpsock._sock, None, None)
+         tcpsock._sslIssuer = tcpsock._sslObj.issuer()
+         tcpsock._sslServer = tcpsock._sslObj.server()
diff --git a/dev-python/xmpppy/metadata.xml b/dev-python/xmpppy/metadata.xml
new file mode 100644
index 000000000000..f972de4d8621
--- /dev/null
+++ b/dev-python/xmpppy/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		xmpppy is a Python library that is targeted to provide easy scripting with
+		Jabber. Similar projects are Twisted Words and jabber.py. This library was
+		not designed from scratch. It inherits some code from jabberpy and have very
+		similar API in many places. Though it is separate project since it have almost
+		completely different architecture and primarily aims to work with jabberd2 -
+		the new Open Source Jabber Server.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">xmpppy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild
new file mode 100644
index 000000000000..bdf5748f70d5
--- /dev/null
+++ b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Python library providing easy scripting with Jabber"
+HOMEPAGE="http://xmpppy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xmpppy/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
+IUSE="doc"
+
+RDEPEND="
+	|| (
+		virtual/python-dnspython[${PYTHON_USEDEP}]
+		dev-python/pydns:2[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-hashlib_ssl_deprecation.patch"
+	"${FILESDIR}/${P}-ssl_fields.patch"
+)
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/xonsh/Manifest b/dev-python/xonsh/Manifest
new file mode 100644
index 000000000000..d06429a39f14
--- /dev/null
+++ b/dev-python/xonsh/Manifest
@@ -0,0 +1,9 @@
+AUX xonsh-0.4.4-destdir.patch 497 SHA256 84f935d0da366dd2a4d9f9a70a39ba54181687a47460f64a8cbd3b0669189075 SHA512 56d5f7a67769a8f5d54ef03d6f46291d0eee9dbd09c869bf5837fc113a2a91fce29beed464cf024986fc41c6c97ed2660152d74da2cc3bd67202046c2dfe716e WHIRLPOOL 325395ceb6480c3c9177fa8da3b7517b0a7185c75f2c39a133c0c5bc6641ada88d304c77a958242a10dd158e76e8de08eadbcccbacc4ba18c12052875db2d704
+DIST xonsh-0.2.6.tar.gz 170842 SHA256 5d5e8e51331b0c753032d29b74d6af8abb7dda26bec39fd28c579c6ffea2b434 SHA512 43b034987323b832d052974f02a52ffd492ae4f0fbf6a0a035329000e393c9c9466ee0275cf678db5581e84e627d59bac015ad6131f35bdfbc1374bf4db20977 WHIRLPOOL 7d76bad62bd4689c50e9d2067c5bda5f52bfc05d03182336e679a4f984db54bc18e7d26f1c4799a5f46bf57173187c59e3174e3f9ef7b2ab7784a4b6d0781a53
+DIST xonsh-0.4.4.tar.gz 543801 SHA256 264e4a992ec54fab03ae47e23d83eecf883bd79ee6f6ab8ab6a9b1fd5feb0d4f SHA512 2cb6b045010b51d1a846625821bb6a8e415cc01f0e623f1ab7efb02ae0debaf9dab1e0bca0d27dd00a320bb1f5d9d001833ecf3a917562b683a7c59a51b8aff0 WHIRLPOOL 7ae612b4dbb2b12033ca20417fdd01be21bb0746e14462eed616c6cf195fee5f8422cd737d7f514b727cc469caaa24948aa348f03aca92a10e87b9b350181abc
+DIST xonsh-0.4.7.tar.gz 545249 SHA256 4038186152cf6181cab08f402a9b9da2d7c67accdf054173b99ac75e03f96011 SHA512 133a493b1245048e4b8a51f01f0629283736753a7636d8bb0c123b623122b285fed9ba415972e5f44dbb9a1439a83858da50a9b01ebe6bb11e4e390708e08c9f WHIRLPOOL 2c5275091da8f427a2fb19c21a9a31ee69baffd757b7404c9588f6be9a95c5c3d0a6d2c7d7d4af76bd56261864ed30a38f198124c6e6eec2a4b75aa66b8a2376
+EBUILD xonsh-0.2.6.ebuild 969 SHA256 39de83c95496d120056e3491531ec66049aa0854e36ccc68e56a7ca166249b5d SHA512 7947850134f314dd2629d584aa8b266b1fd99945da69beeee9e99f204c7e228b3932d9775b7971226bf0ffcc3caa105fe88aed0464fa5c7a32cf4b78c1a2dcf4 WHIRLPOOL 2221073c87f4437872810de20072f82d19d994862e7bd91dd401ec1cfea1e8c0f48b4eaf17cd699b48e36f72418201fc72a20e5f52dba21cc34fae7de4158dff
+EBUILD xonsh-0.4.4.ebuild 960 SHA256 86475234464a355866464abb7de2881fca4a2c7329367b2a895f296504149a2f SHA512 148a2136772151d8ce4746a6e74eb9a21143079b5ff60c4b1c74fd99d0df0d0c336e367ab7ea61e656b58ae8090a26072d9977bacbfa924585d3d485603a6bb6 WHIRLPOOL c04106c9ab684ebc31325b2d4e6a364af9f19b2a0430efd09654f6021b9a0d46b1ec470862d65e1a3ab3cd3a42c57b8680e266b37724eeb996eb1d0207f97166
+EBUILD xonsh-0.4.7.ebuild 1034 SHA256 a7fb57d871c448cdf6695e2e8dd750c3d80d06f15dfb418a06c6ae6b9eb739aa SHA512 dc28dadbf9cdd35c7256167f90377cf31cb95c8c75e224ac96c6fb1b5a9ee5aa8440286eebc54a4221443143e5190684ac6e0326c237fd062ca0449b171c571c WHIRLPOOL 580f183e4151b1e8462d33ee57c633f2d624904ad84bd263cacb5778c7dfe0c3af46ceb42214b982ffd213abf3357943c800385eebe8a01e562575d06ca3b775
+MISC ChangeLog 2853 SHA256 165e30387bf73fcfd6328dbb1bd8c6f012aec1d91a9aa6eae28bee3f8ee91b95 SHA512 657c9478eca3ddf6ed8cd1c1c478b72caa0858efc24f196f4e0b88f08abe539c27dd10603b927e172283778563b678e2a5b04a83e37dd70638f3f9b4931871b2 WHIRLPOOL 4209c7f76e5671655980c2b6dba44984bb65be5bfd719551d1302486920cdb85720585f4700e8201acb095297ca1067736cf56cc41ee4f531206da3292c23347
+MISC metadata.xml 421 SHA256 c29c2fd1954d1e1bf918e0062a9a4a622cd19637065b390d1ccc7f296c2e2765 SHA512 7a6b4489d4ccadf9659bffc020893f0282a843a8fefc04326a9a40964304416bd021613f231b46b1c39ff4f91a623f8e521c8f5b9d1a9311574fd6b83a5c40b3 WHIRLPOOL 194e6eb0e5cbf74043846b716b164bc9f4a66c4b23828439bdb91b19b90a3b7f9e9354ef7802b3b627b166e8657c6dfda2ec59abd8b6a1edbc68e8f2d034d6d7
diff --git a/dev-python/xonsh/files/xonsh-0.4.4-destdir.patch b/dev-python/xonsh/files/xonsh-0.4.4-destdir.patch
new file mode 100644
index 000000000000..63d7e86149a0
--- /dev/null
+++ b/dev-python/xonsh/files/xonsh-0.4.4-destdir.patch
@@ -0,0 +1,16 @@
+ setup.py | 3 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/setup.py b/setup.py
+index 679f984..6de421e 100755
+--- a/setup.py
++++ b/setup.py
+@@ -167,6 +167,8 @@ class xinstall(install):
+         # install Jupyter hook
+         root = self.root if self.root else None
+         prefix = self.prefix if self.prefix else None
++        destdir = os.environ["ED"]
++        prefix = destdir + prefix
+         try:
+             install_jupyter_hook(prefix=prefix, root=root)
+         except Exception:
diff --git a/dev-python/xonsh/metadata.xml b/dev-python/xonsh/metadata.xml
new file mode 100644
index 000000000000..a3f8a4d9815a
--- /dev/null
+++ b/dev-python/xonsh/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="pypi">xonsh</remote-id>
+    <maintainer status="unknown">
+      <email>scopatz@gmail.com</email>
+      <name>Anthony Scopatz</name>
+    </maintainer>
+    <remote-id type="github">scopatz/xonsh</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/xonsh/xonsh-0.2.6.ebuild b/dev-python/xonsh/xonsh-0.2.6.ebuild
new file mode 100644
index 000000000000..4d9800c9afbb
--- /dev/null
+++ b/dev-python/xonsh/xonsh-0.2.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="An exotic, usable shell"
+HOMEPAGE="
+	http://xonsh.readthedocs.org/
+	https://github.com/scopatz/xonsh
+	http://pypi.python.org/pypi/xonsh"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/ply[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed \
+		-e "/install_kernel_spec/s:prefix=None:prefix=u\"${ED}/usr\":g" \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbose || die
+}
+
+pkg_postinst() {
+	optfeature "Jupyter kernel support" dev-python/jupyter
+	optfeature "Alternative to readline backend" dev-python/prompt_toolkit
+}
diff --git a/dev-python/xonsh/xonsh-0.4.4.ebuild b/dev-python/xonsh/xonsh-0.4.4.ebuild
new file mode 100644
index 000000000000..28939bb06e71
--- /dev/null
+++ b/dev-python/xonsh/xonsh-0.4.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="An exotic, usable shell"
+HOMEPAGE="
+	http://xonsh.readthedocs.org/
+	https://github.com/scopatz/xonsh
+	http://pypi.python.org/pypi/xonsh"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-destdir.patch
+)
+
+python_test() {
+	nosetests --verbose || die
+}
+
+src_install() {
+	export "${ED}"
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	optfeature "Jupyter kernel support" dev-python/jupyter
+	optfeature "Alternative to readline backend" dev-python/prompt_toolkit
+}
diff --git a/dev-python/xonsh/xonsh-0.4.7.ebuild b/dev-python/xonsh/xonsh-0.4.7.ebuild
new file mode 100644
index 000000000000..56fb478344b0
--- /dev/null
+++ b/dev-python/xonsh/xonsh-0.4.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="An exotic, usable shell"
+HOMEPAGE="
+	http://xonsh.readthedocs.org/
+	https://github.com/scopatz/xonsh
+	http://pypi.python.org/pypi/xonsh"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed \
+		-e "/install_jupyter_hook/s:prefix=prefix:prefix=u\"${ED}/usr\":g" \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbose || die
+}
+
+pkg_postinst() {
+	elog "Please install"
+	optfeature "Jupyter kernel support" dev-python/jupyter
+	optfeature "Alternative to readline backend" dev-python/prompt_toolkit
+}
diff --git a/dev-python/xvfbwrapper/Manifest b/dev-python/xvfbwrapper/Manifest
new file mode 100644
index 000000000000..45b8a737d5db
--- /dev/null
+++ b/dev-python/xvfbwrapper/Manifest
@@ -0,0 +1,7 @@
+DIST xvfbwrapper-0.2.4.tar.gz 3215 SHA256 a7f52aefaf2e18c1aee302eb295ba9ca53ae6d3ba36df76794945a338a4b579c SHA512 26b14fd64c00ea33ad5f32dd69e59001f468ab294970ee281c81f1ae635cdea105b6057ba2e1012975fbb935ccb222585e70798e78c17f476d8b3e40f9e1346c WHIRLPOOL 791578eabe86fa9f3e6d44b9b03008fe8dbe2c9d853453afd29cfa28690d6f4cb44b948c5d991e4cdb7424a87fcce334bf7e403f2a6f781f6868f47af6a74268
+DIST xvfbwrapper-0.2.8.tar.gz 4660 SHA256 f99d741f145ca1d4c42d3085bc2857e54571db80099b6eb49ac2efcf4e971666 SHA512 1b29b7e6bb336a9972e51249bbc96805733e305476cc559f5501cd09a343671c10333b5592e4c4868016d4510b37d6c592165a4683b1543e62c2205b1eeb0980 WHIRLPOOL 5d618d5bdebb746c234949e515e9378a60aaabe49656b9827cb6a9bd6aa83f6c2377153ecd9b335f5de5d6c9a98f388f93745fe6eab69653533ac11c06051d17
+EBUILD xvfbwrapper-0.2.4.ebuild 720 SHA256 04c2e9d53f7dc7b373f4e9031f44f2b1cb46b0a229970729a58d591d7585a821 SHA512 eda416e425609434edeef7c27f7b0eba7012d9c9e7af48384211ab32bd89ca8367321edf32cd91eac0f2b7db8d63efbadde7cfd0e563daf5a42b4962125b14cf WHIRLPOOL 69b9b99c350949f2b1551e078ab9167e56c16ca4a86c268cf453765b23096de1c4a5b8bc703c965a0fa84b892790203b28d7031114c95ba76c37be5e0d72888d
+EBUILD xvfbwrapper-0.2.8.ebuild 728 SHA256 8cc9aa704fabceef362fde3ab65d7204dda1e4400cbb5c0d7bba25bb2a17f3d5 SHA512 93e0d933d7d9bd54692925b2b51f52a7b295295afb480ecf5017e3040db256bd438241c79ebc029fe79e41968c2c6efb3b350100fe79b6ef6e55dc79d6962091 WHIRLPOOL 61e3677480ac8e88250d12b55c12e069752ff819737ccf813cb736c842af32fd7926ee2fb0187d1690a536314eebd37f2ad2ebea662bca6cf9a07cfe442e5618
+MISC ChangeLog 3016 SHA256 3c0c3bb11a30c2b6d49b3ae33b5450b0284c98b5b8d19010a9fb7436e59f6a6b SHA512 d8ffbe9ad8caabfaae877cb826a3fd7203ded52392c23b8a32f4447c20b39ce925f207745509f40d0ed69e359d0e468e58a85baf59b0cbc5e67625b973278f17 WHIRLPOOL 73ea1966116089cd3d290aa0b68d114ab3d9d4120af8850f61552f9a8ac252a9cffc6c056473a0da1c892078b90bd941851d4b982cc5551f6fe90563d84e7d0f
+MISC ChangeLog-2015 1057 SHA256 ec4ad6879af7af57d5a916b96be41e8f13c5c6d5011d79014b7e58766f5ce9e5 SHA512 237de79e09679a924b8cf4edf53396311b89bb47b8ff6567177cee3e8f69e30e82acb6b7749a793e9e7ad0a97a34d9e6f25ee34242a2461bcf7a825a173588fb WHIRLPOOL ed5e8f7414c8902a119b9f70a2a0e1a9ab3e76cd6c0430bcd6665e727bc22afed6f1bcb0fc75c04deb921319e4f434215b8e9b3880088efee580298dd619ffcc
+MISC metadata.xml 387 SHA256 01d4301cab904bbe400e4ab51ed04eeddaa8480fd936670030497a9a25659705 SHA512 d9e8ace17387367e585434a5b178a7a1715973828d6cf762ad82f2c4020413239e87b26dbcb9a8db1122ac57e2b09fe01f0f7fec1b48723cde989c0205b84885 WHIRLPOOL 7a7ebc2b002ce40e65d829e5eebc021225113de5e437b315d0335eeceb28f9d6d7c3051942de02f9a9738065701defd30e744fd9757796bc8ac12207bbfd8926
diff --git a/dev-python/xvfbwrapper/metadata.xml b/dev-python/xvfbwrapper/metadata.xml
new file mode 100644
index 000000000000..f0654792201f
--- /dev/null
+++ b/dev-python/xvfbwrapper/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">xvfbwrapper</remote-id>
+    <remote-id type="github">cgoldberg/xvfbwrapper</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/xvfbwrapper/xvfbwrapper-0.2.4.ebuild b/dev-python/xvfbwrapper/xvfbwrapper-0.2.4.ebuild
new file mode 100644
index 000000000000..d25a106c96a0
--- /dev/null
+++ b/dev-python/xvfbwrapper/xvfbwrapper-0.2.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for running a display inside X virtual framebuffer"
+HOMEPAGE="https://github.com/cgoldberg/xvfbwrapper
+	https://pypi.python.org/pypi/xvfbwrapper"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="x11-base/xorg-server[xvfb]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pep8[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+#	"${PYTHON}" test_xvfb.py || die "Tests failed with ${EPYTHON}"
+	"${PYTHON}" -m unittest discover || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild b/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild
new file mode 100644
index 000000000000..616bea061751
--- /dev/null
+++ b/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for running a display inside X virtual framebuffer"
+HOMEPAGE="https://github.com/cgoldberg/xvfbwrapper
+	https://pypi.python.org/pypi/xvfbwrapper"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="x11-base/xorg-server[xvfb]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pep8[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+#	"${PYTHON}" test_xvfb.py || die "Tests failed with ${EPYTHON}"
+	"${PYTHON}" -m unittest discover || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/yappi/Manifest b/dev-python/yappi/Manifest
new file mode 100644
index 000000000000..f5788f21db21
--- /dev/null
+++ b/dev-python/yappi/Manifest
@@ -0,0 +1,6 @@
+DIST yappi-0.94.tar.gz 25173 SHA256 15cc17dba1252ecaae29ced1e96c216165d93fd3e9ea05dff1f5e5866f16bd59 SHA512 420295f20b395229822a077848514db2138c7630a1cfc6207462e61eab3179e6fbad8b42569ae2557f0fa639fd8863bc876183554511b0dbf3d8664f8072bb28 WHIRLPOOL 2ebafad1489aa3e9d97d7c9bc6b51e9679941c783ea91ba06c82202d8500e69e7f1db2b1078c2becea2d548cbd65fb3b48774d18b1db388e1c80ee9faf311535
+DIST yappi-0.98.tar.gz 37074 SHA256 5f657129e1b9b952379ffbc009357d0dcdb58c50f3bfe88ffbb992e4b27b263c SHA512 699e1845aac8e3c701c495913862597240b264c396b0b6ad0e9d6d533138caaeb883baeb036dc7b57bddf02ba411475401b2db77527d2ee63409d73b80f32098 WHIRLPOOL 697a225db5e14013aa8f0deac24d198cedf02eac8d55b985b2d94ba485b0be0531e5a102e36997e64f31bbeab6f3536899d7a36f51a4b64824f1030bb909ff13
+EBUILD yappi-0.94.ebuild 524 SHA256 e323c26e0a641558635f2534b0c7b0af0c61434a13f2921c5b609fbbbae0b287 SHA512 e5b04fdaf7c47f24ff518ae5eb2fe752e249e5768be9e738b1450cab430d2338fd82400f4ce55b81ea4f8237dd44ed8298da908fc07a0305341ca069d23df5f7 WHIRLPOOL 4a92d33029d47c2983d8e8e2aa4392c3b9465212899b385f5fcede9f92b25b2941fccb3bf1c939a1205d8114e6ca3a7e15e44d79d4f152341597cf7ba027957b
+EBUILD yappi-0.98.ebuild 526 SHA256 69880f194b46a8ff038f149d30ac0c86424296e9149ccd622fc339d359da4419 SHA512 43585719ed44baf95ab99c053804550e5b28e1b4131a0849d3ca54438f214896339383b2ad5e83d1ee034edc8fd140e06cb76219ed08d0c24bac2f9e0398c697 WHIRLPOOL 34a75ce1e9f3b87fcf4b6b64c01ec738358263adbd24bcaddc08e48bc61b104ff3b02fb73fe6e88af9ceb266fe045e4f828846e263c1aaa1fc3e10d8bf152933
+MISC ChangeLog 1355 SHA256 3e4b90b9a555dbf9e5ffd6098eda755bf3b38d3c0f2bc3380bb206f6ff81e17e SHA512 2a63a5f1d451f59e1627bc22b8fd127b9410be0e6e7fefd7ab923fa9d0460f1fac4e6cf2a2705c07c1036986064601964d6f9f640ad0966283b23f2763524525 WHIRLPOOL 1e9ce39382ebbb6bf89438139e9cafd7256a168cf0659407f27d5a6a24b336fb5707bc5cee38d6070baed9f9c8162183936f6562413335aefda7210658817a38
+MISC metadata.xml 491 SHA256 fcc5b9d2eb6c079f5e228299115196e1c931b4b1669cba1bedb5067f4fdfb525 SHA512 d058a5d7d593e801967cbd8764ce0e55480580995a68cd3d35802932249fa015267052895d360fc13cda379333d1cf8222e02f486e68477afe1e2af1168731fc WHIRLPOOL 75ab1c071ce66ab0833d4e70f499cbc27de84a1c606fbbf2b26c9919ef92e379a16f6dac57653d1a8bcb511f6c2c90372d6a8f0fda0d50f9f96ec7d90ac87c82
diff --git a/dev-python/yappi/metadata.xml b/dev-python/yappi/metadata.xml
new file mode 100644
index 000000000000..fc71beddc903
--- /dev/null
+++ b/dev-python/yappi/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">yappi</remote-id>
+    <remote-id type="bitbucket">sumerc/yappi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/yappi/yappi-0.94.ebuild b/dev-python/yappi/yappi-0.94.ebuild
new file mode 100644
index 000000000000..74daf8578748
--- /dev/null
+++ b/dev-python/yappi/yappi-0.94.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=(python{2_7,3_{4,5}})
+inherit distutils-r1
+
+DESCRIPTION="Yet Another Python Profiler"
+HOMEPAGE="https://bitbucket.org/sumerc/yappi/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/yappi/yappi-0.98.ebuild b/dev-python/yappi/yappi-0.98.ebuild
new file mode 100644
index 000000000000..3a009d3ce1bc
--- /dev/null
+++ b/dev-python/yappi/yappi-0.98.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_{4,5,6}})
+inherit distutils-r1
+
+DESCRIPTION="Yet Another Python Profiler"
+HOMEPAGE="https://bitbucket.org/sumerc/yappi/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/yapps/Manifest b/dev-python/yapps/Manifest
new file mode 100644
index 000000000000..94a654db4630
--- /dev/null
+++ b/dev-python/yapps/Manifest
@@ -0,0 +1,7 @@
+AUX yapps-Convert-print-statements-to-python3-style-print-func.patch 1572 SHA256 e56191c9545f481320fe7d82d1202f8568887c50158030334217efa042ace8b4 SHA512 36ab43698fc637cd52287c6649be064b04374a22b9e459a53f3e04850d0cf8276e042e45994a3d2e0d0c97e57478321631475170dfe3e8efa8debd3d32ea80a3 WHIRLPOOL 9987e2a32724ba911b1caafa355c63f8563825d075ba785e458af4b9a152959d3b76cbb8c24c68e7a482df835d50c4687bcc585f3c42f7fcc63495dd5f83b588
+AUX yapps-Don-t-capture-sys.stderr-at-import-time.patch 1088 SHA256 6c86b08693c1eafd681081bb30b5c5c5cd034026d499b5d3ec5804f5a4ea2086 SHA512 b3a3de5bc11cfc8926e430ab5d8834f00a15362e7a108ad11d40a2c6f804d51ddffbb467dbe1c767b345c3451f4feef642e1b55a735c5cb85c405e8c3c7c0107 WHIRLPOOL b0db34092542910973477f29504c28f171fd79b70f372127672e7c249d521d65da0b3c1aa48cb5818a1abf3c4bfb65a7ef48349452d34a45405d25d1e118f6f3
+DIST Yapps-2.2.0.tar.gz 13630 SHA256 d6e16a8e22ab559ca52eab58cb0015bb088d6889fa06db795222cdccae2354af SHA512 087f99071b2615f5382f453d9b3492675704aa7e7ff54b332d7c4e337e16fbd3ab3c1b3820a7941775c0b3ecf7e255a7773cb47ea20e8adb77dc3dc8d9a49faa WHIRLPOOL 1db693327d88445657fe0a4221928bdf0b81a6c7a238ad1f15579ea853975ce1da15b31c483a6782d43576b8f32024182d131061952d8d00493ca211b2a10eb2
+EBUILD yapps-2.2.0-r1.ebuild 693 SHA256 72c10a1d85a6875aa284ddf5885d6fb0ac96786a2ac4547fb7279404d3444754 SHA512 b464824fc10d972514dcb11cbcd210f125c26c3e39b3222ef5d1a0c8d5852dae90504b5cd578ef89c7e163e55cf6f49d50b70fb44f1cd01972236c83d9e1b798 WHIRLPOOL f04810b74a214b54869ce78de722c40ec70b61830a5ac68581f883cdb8a55c78d99e16aea6aa1e89f61785316a16ad357f68b0df6057186d066a0b7c28bd3d9e
+MISC ChangeLog 2944 SHA256 91f6b5450256b9af6241105f6050bfa26ff34376b8cc791f01948595fbe50b22 SHA512 c929f5f6a6cc3b38912aee96476986cccfcd46b209fda804404dbbfe0c40f63980fc052b345f0186b853da51cbcc7c6b85d5b3b416ec06ff3b96ff4a27f1e8ba WHIRLPOOL 2d2a8a69f5267aa6471348cc0666491362eb799e9658b076fc3f10e9cd0c3d6442b7efe7d3752d64ad99dbdea841e310f479ab93c4facb0f3beeb25db14f7fc7
+MISC ChangeLog-2015 1557 SHA256 4458101de514d793342c979296784c9ad879c4d406f32064c8ac7c929ad42ceb SHA512 caedc101fbb95e54dd7dbb775e40b25c76fe5eca500a4d46293cd3b6ba97715a56cc9114749213159569f91dd2a6b1db81a7594e96a703c11dab209ed2d78a4a WHIRLPOOL 0f348f2479828fd3818f451f58c48154655e01241389ef8f8d5c04560d8f08f58b1f02c7a1ce9d427871f6003874b38f5d9ad35097858ec71b4d466ce02d5a45
+MISC metadata.xml 373 SHA256 9f84b7630c536e6ea81bc214c75505d42ce53905b460401f6d251662043d71b7 SHA512 546f07634ad9ddbbfd3b95c8494f1592f1f38aaaa83f2325a6d0e03bbe64bad498fefef02082c5df8e075763b719993bd09c980f1cf9fdcde433113280edd74b WHIRLPOOL 8f749a468003336d12aed375c4fb0b5e48fb26e76d85bda988e747f19868e662e0d279601593026797a91b3b69d754a0bbd858525f709655e832d54093c35001
diff --git a/dev-python/yapps/files/yapps-Convert-print-statements-to-python3-style-print-func.patch b/dev-python/yapps/files/yapps-Convert-print-statements-to-python3-style-print-func.patch
new file mode 100644
index 000000000000..4bff7f8f40dd
--- /dev/null
+++ b/dev-python/yapps/files/yapps-Convert-print-statements-to-python3-style-print-func.patch
@@ -0,0 +1,46 @@
+From d051588873a54860cfb86ec0d330f7d855336618 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <julien.cristau@logilab.fr>
+Date: Tue, 2 Dec 2014 10:41:05 +0100
+Subject: [PATCH 2/2] Convert print statements to python3-style print function
+
+Signed-off-by: Julien Cristau <julien.cristau@logilab.fr>
+---
+ yapps/runtime.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/yapps/runtime.py b/yapps/runtime.py
+index 58017fe..5d40581 100644
+--- a/yapps/runtime.py
++++ b/yapps/runtime.py
+@@ -178,7 +178,7 @@ class Scanner(object):
+         file,line,p = pos
+         if file != self.filename:
+             if self.stack: return self.stack.print_line_with_pointer(pos,length=length,out=out)
+-            print >>out, "(%s: not in input buffer)" % file
++            print("(%s: not in input buffer)" % file, file=out)
+             return
+ 
+         text = self.input
+@@ -201,7 +201,7 @@ class Scanner(object):
+                     break
+                 spos = cr+1
+         else:
+-            print >>out, "(%s:%d not in input buffer)" % (file,origline)
++            print("(%s:%d not in input buffer)" % (file,origline), file=out)
+             return
+ 
+         # Now try printing part of the line
+@@ -230,8 +230,8 @@ class Scanner(object):
+             p = p - 7
+ 
+         # Now print the string, along with an indicator
+-        print >>out, '> ',text
+-        print >>out, '> ',' '*p + '^'
++        print('> ',text, file=out)
++        print('> ',' '*p + '^', file=out)
+ 
+     def grab_input(self):
+         """Get more input if possible."""
+-- 
+2.6.4
+
diff --git a/dev-python/yapps/files/yapps-Don-t-capture-sys.stderr-at-import-time.patch b/dev-python/yapps/files/yapps-Don-t-capture-sys.stderr-at-import-time.patch
new file mode 100644
index 000000000000..1e25a0059409
--- /dev/null
+++ b/dev-python/yapps/files/yapps-Don-t-capture-sys.stderr-at-import-time.patch
@@ -0,0 +1,32 @@
+From 482faec17f1c69784d8cc2757a79809458d71154 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <julien.cristau@logilab.fr>
+Date: Tue, 2 Dec 2014 10:40:01 +0100
+Subject: [PATCH 1/2] Don't capture sys.stderr at import time
+
+Signed-off-by: Julien Cristau <julien.cristau@logilab.fr>
+---
+ yapps/runtime.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/yapps/runtime.py b/yapps/runtime.py
+index 29f91e7..58017fe 100644
+--- a/yapps/runtime.py
++++ b/yapps/runtime.py
+@@ -168,10 +168,13 @@ class Scanner(object):
+ #			output += '%s\n' % (repr(t),)
+ #		return output
+ 
+-    def print_line_with_pointer(self, pos, length=0, out=sys.stderr):
++    def print_line_with_pointer(self, pos, length=0, out=None):
+         """Print the line of 'text' that includes position 'p',
+         along with a second line with a single caret (^) at position p"""
+ 
++        if out is None:
++            out = sys.stderr
++
+         file,line,p = pos
+         if file != self.filename:
+             if self.stack: return self.stack.print_line_with_pointer(pos,length=length,out=out)
+-- 
+2.6.4
+
diff --git a/dev-python/yapps/metadata.xml b/dev-python/yapps/metadata.xml
new file mode 100644
index 000000000000..335bb8d11a4b
--- /dev/null
+++ b/dev-python/yapps/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Yapps</remote-id>
+    <remote-id type="github">smurfix/yapps</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/yapps/yapps-2.2.0-r1.ebuild b/dev-python/yapps/yapps-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..ed7a93b02e24
--- /dev/null
+++ b/dev-python/yapps/yapps-2.2.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+MY_PN="Yapps"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="An easy to use parser generator"
+HOMEPAGE="https://github.com/smurfix/yapps"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-Don-t-capture-sys.stderr-at-import-time.patch"
+	epatch "${FILESDIR}/${PN}-Convert-print-statements-to-python3-style-print-func.patch"
+}
diff --git a/dev-python/yapsy/Manifest b/dev-python/yapsy/Manifest
new file mode 100644
index 000000000000..c4b26e314649
--- /dev/null
+++ b/dev-python/yapsy/Manifest
@@ -0,0 +1,5 @@
+DIST Yapsy-1.11.223.tar.gz 80783 SHA256 45bb39a72461913388d7f3e92ce33816e84fff59946c45e16796eb1fb1d5f2a6 SHA512 690d0ab78eafede5a75cf7b7bbcfce00b05c7b6f958980c3b67815bcaf848a8098b6e81afd1d95c5821fa4bb7affefab2cde208ff7c8ac7952615c8ddbafe305 WHIRLPOOL 05a3682f0c19a2c13ed97e9e17041f5bf7fd35a7928c4ff1bf27881a1575f1d1923c933ade7bb14569a732c6ddbcdffd3cba4ac546e8e4c1263f838876325082
+EBUILD yapsy-1.11.223-r1.ebuild 924 SHA256 2dbb17958ac3b16d43a42f08d8bc16dfbe2c643bd066e773006bd9336c70d5ce SHA512 fffec518a965ed7f01043f02ea42f50acac32893b453d53843f75ab7a55dd0ebec312de289314b6274f0f8fdebe88b0554a81a1d824202ee296747c90d97a80b WHIRLPOOL 98709f93f35fb546c454a44b12386ccfb943284d9079470c9d56d8d24ae53ef15626e2a22fb6caa256095c4abf9f2b889b16e493d5949892f758e9a6c2194cda
+MISC ChangeLog 2944 SHA256 9ce313544dd83ef22591e4dd06b564f76d8930083ed9b062a2ffaf6c1380381e SHA512 4ec50aadd42e860a45eba696a6ced1d2b73ba9ebf599f1223285133e6849aba233cebbc5dba42c66793680a6a35d8517025913ebf3c0e0d2eb5c25a1b3c66868 WHIRLPOOL 4948408dab1ded414a125ff11cd2fee7103c3ab21eb5031a99e95dc3858870af9d1746f2f13835fb13103a9ee59fd33c47e34c168095233e986d03fe722339e6
+MISC ChangeLog-2015 2580 SHA256 8f881d52bf63ec4a8af2aca382c47fc5ce89754bdbfe2af3ed19a8a21d2c43e7 SHA512 6f0128486233ca85d2df8d8b6a9bc4a3552f8d9d34d1d274d0921508cd606fd82217aa4221ebf6c3b079db48176723bf0b7e298a7bab8bb1dab6c77d1065dc54 WHIRLPOOL 15b457e605cfd7e21b929fcb772d99595f9278602777b63d458569b9bff669e9bb7af293dedd67edef3b08dd0d8b5d988f31e1a55ac69f365ed156b7b032f9a5
+MISC metadata.xml 423 SHA256 6d03df4cfef9eaa16207127c2d4669451ab1971fcc87a89075a4e5970f68a8ce SHA512 73e423d31a622b7b15bf672cdbada8378d069954acecdf6d729f05ca4297ef01016519adf362b322dced4694de829f079c80a17c836b5ee458b772a3c5fd36d8 WHIRLPOOL e487e76d3656898df40435a8c70be1bc24346d44b1e304c657f17d0619f5c85249532467bfdfa6f1a60b6668b8b8f0077934d1d472b1b420bad96baa527e407f
diff --git a/dev-python/yapsy/metadata.xml b/dev-python/yapsy/metadata.xml
new file mode 100644
index 000000000000..59dcad63b3ad
--- /dev/null
+++ b/dev-python/yapsy/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">yapsy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/yapsy/yapsy-1.11.223-r1.ebuild b/dev-python/yapsy/yapsy-1.11.223-r1.ebuild
new file mode 100644
index 000000000000..a9d9076935a4
--- /dev/null
+++ b/dev-python/yapsy/yapsy-1.11.223-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_P="Yapsy-${PV}"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A fat-free DIY Python plugin management toolkit"
+HOMEPAGE="http://yapsy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/yapsy/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable erroneous test
+	sed -e 's:test_default_plugins_place_is_parent_dir:_&:' \
+		-i test/test_PluginFileLocator.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/yaql/Manifest b/dev-python/yaql/Manifest
new file mode 100644
index 000000000000..5892a56383dd
--- /dev/null
+++ b/dev-python/yaql/Manifest
@@ -0,0 +1,6 @@
+DIST yaql-1.1.1.tar.gz 68366 SHA256 2e06a56e39da21765306e4709cd87ec3ed366223badc95499576f0662f69a04c SHA512 07e41e58d85a357f7b980501501558d50264a7e3c9b81b0117e3bd202ac06bd562d1b4ea505a613ed11051f5e45ae1687f010a3c75d2f9dbff673f81a04644e9 WHIRLPOOL 8adef15359e80070d15022162b4b0ade6df15e6350c20d966a46109adda17b1e9e7db31a1b68a55c1b96eee683f5a06fd7c13f29656924d10556224218a6aaaf
+DIST yaql-1.1.3.tar.gz 111546 SHA256 1134d9e9a8b61c97ac03f80d27fa60439397a6ff7aac3c3180c0a6908c05d209 SHA512 e85712f65dc932126c75cc84403d14639f76098f4bd22ff2106a68afb6685794e1797154bbf1343e1f82a8b4a13e351d2d0dec1f235e31eecd96f6394116cd4b WHIRLPOOL 12f203d7aa863df727dc6fbc241694bea1f9f4e9df61d1b417d1275945b63254394d001d4441939118026eed516403421751d473f2825702166209d17a5d1e9a
+EBUILD yaql-1.1.1.ebuild 731 SHA256 c0f70575442c76931579a4f7182030056736490d616ad9a688ad9a13a2906582 SHA512 0aca892b4de6afe626a0b3687979690655e4e68c41e984f146a52040c10cf173c505bad442242582bae7d37e0a66bfb58e1ebf58ea59c4e33912639afa8943fb WHIRLPOOL 8f272c2a76f6ba4ba2e323a81a46452127fd1d4bc6f6ee2ba80ab7c1a5267dc9f06bf85d39cd396b216cc10f0afe318d0a82030c64067db2103092ec0ebb4ab0
+EBUILD yaql-1.1.3.ebuild 731 SHA256 23fba594cb108fff85ae881161cf0557ceaff45e505ad13c1664a95f11166180 SHA512 8d1214ed06e46d849822eef29ad33c3247296c3f37a3ee5efa9ee1a3e315d6f7a9c6076dc836cb5143b05fee51504946a06c8d53b55af6b3287115be25cf41ae WHIRLPOOL 8f300d5a764ccde87334802e4cb9daa8fb54e21a856cb2d6e78737fdefdb6a123fa9279e4d780ff60243a5dd557384a7f60d5e54b3015e9032cf94cc3788bab9
+MISC ChangeLog 449 SHA256 a29aa6ac47cec325777f3761c7495bc8071f5a27cf0122598d720f69f64962a2 SHA512 c1f34ec5d9acde1a98a0543196ef7c84a775be715e80a263e234e00d874ea4f83176ee98240d91c8292c3dbd95d6f1bd2e55d4985cd549fa36e2ff60a29b1cc9 WHIRLPOOL 9d8e1833db86dcc7076dbde23850d04f5eb827debf1457c700b4dfe55e157a04bfa530da6840906fcd5c920f59019240233f4152a291cbacfab6fbfc9240e300
+MISC metadata.xml 913 SHA256 e9f23ba475331b3853c28d67cc7d3ae06646e1870c387761d7778ff545fd39f6 SHA512 84e10769ee26a26b79179fc63fb51cf94a4c5b2ec128270eb9b775f90079e7c3e527e2c7a2d4ba3d58a68411e0c83bb94c3aa544889442e1679c4771e4028a72 WHIRLPOOL 7d34796becc2f59b6365b5d9da6cf411f62412fae2d374fe62466cc558e8c44b7a4f93bdf48f9791aa6514296ebdace01b693c1c0445e485ba580512e39a4599
diff --git a/dev-python/yaql/metadata.xml b/dev-python/yaql/metadata.xml
new file mode 100644
index 000000000000..51c00707b842
--- /dev/null
+++ b/dev-python/yaql/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+		YAQL (Yet Another Query Language) is an embeddable and extensible query
+		language, that allows performing complex queries against arbitrary objects.
+		It has a vast and comprehensive standard library of frequently used
+		querying functions and can be extend even further with user-specified
+		functions. YAQL is written in python and is distributed via PyPI.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">yaql</remote-id>
+    <remote-id type="github">openstack/yaql</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/yaql/yaql-1.1.1.ebuild b/dev-python/yaql/yaql-1.1.1.ebuild
new file mode 100644
index 000000000000..7e7298296484
--- /dev/null
+++ b/dev-python/yaql/yaql-1.1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="YAQL: Yet Another Query Language"
+HOMEPAGE="https://github.com/openstack/yaql"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/yaql/yaql-1.1.3.ebuild b/dev-python/yaql/yaql-1.1.3.ebuild
new file mode 100644
index 000000000000..43f091b206cc
--- /dev/null
+++ b/dev-python/yaql/yaql-1.1.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="YAQL: Yet Another Query Language"
+HOMEPAGE="https://github.com/openstack/yaql"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
new file mode 100644
index 000000000000..f51b415d3654
--- /dev/null
+++ b/dev-python/yarl/Manifest
@@ -0,0 +1,8 @@
+DIST yarl-0.10.2.tar.gz 127679 SHA256 a042c5b3584531cd09cd5ca647f71553df7caaa3359b9b3f7eb34c3b1045b38d SHA512 b385a4165b7d095e4d6e2ec5c808c6536e044fb7750000d917370ca4ca66162ed60b142e33eedb02f608bd8b005f6d1f18304992fe00702ea30dd746a0ad9a88 WHIRLPOOL 4d64a9051b00eed92b48afa2340374f125ac4de05c6886bc7dd706734518308cbf7c29086e9f812331831800bda659f027cf4c4a1b91a80d1762387a55d3d175
+DIST yarl-0.10.3.tar.gz 127867 SHA256 27b24ba3ef3cb8475aea1a655a1750bb11918ba139278af21db5846ee9643138 SHA512 61df025fb906ecd95b8360bda224801baac5268215f6957837415cfe56a64c90e29bcd0b6a2dd7f253d1142643058301d362952cd3c8f8dd5f5a78a2da413177 WHIRLPOOL 911bd5861e6be7657fe62c0fb02b0fb70a1f5582ac45de48fca7aa5ca07502ea890c5999c2a066e2a87157a6452e42194235c36fb8177b563f9787007ce1db1a
+DIST yarl-0.9.8.tar.gz 125806 SHA256 a7818b0654265623525b56e78b901315a9ffb7ef0bf21b4af7e0e27572d54dec SHA512 67446ca618a2539f8c1fc8a7a96d1ce50a924ece0479e01103347f73a7bd75b0fbdd0ff5c007529195c3f12aa62d185563e761557fcb95b3226eaece65c0be9f WHIRLPOOL 422cdd47982e44a64f89d689882a31038728dab0e827f5d44b7e25e81fe2a89f888f060f7971a4b6ff901627596d65da73035be8673efcd186d5af25da01cd8f
+EBUILD yarl-0.10.2.ebuild 598 SHA256 edd93f42821fbe5a96e9cdd3c2553bdc760b95daed6cf05c1e02983de45b0deb SHA512 a1fa1a4053d0d7e478fc0cce51da9e83ad41dbb1b114f2f69f0ecb2aa8b4379d765f2533f221c33216df3667f5e37331c5481b900f3c4bbba57d344f41767957 WHIRLPOOL b6572b13ee1d549889ce8cc9af435ae07a9151e30189e5913a60b564721d20667def5b1a644f3a796cb763356ac52b47ff2810b111eceb0904ac91bab4360694
+EBUILD yarl-0.10.3.ebuild 598 SHA256 edd93f42821fbe5a96e9cdd3c2553bdc760b95daed6cf05c1e02983de45b0deb SHA512 a1fa1a4053d0d7e478fc0cce51da9e83ad41dbb1b114f2f69f0ecb2aa8b4379d765f2533f221c33216df3667f5e37331c5481b900f3c4bbba57d344f41767957 WHIRLPOOL b6572b13ee1d549889ce8cc9af435ae07a9151e30189e5913a60b564721d20667def5b1a644f3a796cb763356ac52b47ff2810b111eceb0904ac91bab4360694
+EBUILD yarl-0.9.8.ebuild 519 SHA256 ed5f34f7a7e0ee024b587a9ed1d8bb19ffeb1d0785985191b0c5596e77ecf1d6 SHA512 3e62f98940b12431ef051de7bcfedbe089502d98143d8dca9215b298631ff25dae1749dee73b9b8a0280757b99e2bd0c8976dc0a5eccd5594085f7002a0f2770 WHIRLPOOL dd587f6c8907b1180a08de34f740a46c49528e1233cec0c82c27fd2eadf5f100ce1fef172c30f4cc1ea60497e6a6bbc8291e2c12880f7e40ae004c4852316163
+MISC ChangeLog 445 SHA256 b0349d4f27394eaf18cd5f90469b4be3fe751ed132b175ccf8448f311b487adf SHA512 adade23d704d3460b26b505839e05a63818f3a8fe091423cb681ee158e333e73d26b19527db3c7b02a71642864ad5bddada3a38aeb845bebeb222c09a382d119 WHIRLPOOL 5eb1b866893d600e92e1c4656ab24f87d2894069406855def06e96dc326717c4d523b4beede124032827e70458a1721c4898a01a42f9bf89992d2bf2e806733e
+MISC metadata.xml 338 SHA256 035dc8be77356ab2d96c9223833c1657ed663d62b1c21e13df8fe3eb155f935e SHA512 a3b4df627bc1c726d84bb0cc0f4c1faa658b42a23e0b2777c95530234e3b3466004eea62b54058c530a99cbdd3eb9775dcbe605767710c57f198e7816122baf7 WHIRLPOOL 52b3f6571de9e571f30917b27fce8d11b5ee2bc4d3e8ea20f16c07b053a94864c13ef0da6dda237051957e26d03c3ad20b420ea968e9d49ecee0b77839be181e
diff --git a/dev-python/yarl/metadata.xml b/dev-python/yarl/metadata.xml
new file mode 100644
index 000000000000..cc1c29764b84
--- /dev/null
+++ b/dev-python/yarl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">yarl</remote-id>
+		<remote-id type="github">aio-libs/yarl</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/yarl/yarl-0.10.2.ebuild b/dev-python/yarl/yarl-0.10.2.ebuild
new file mode 100644
index 000000000000..7cfc0223f0bf
--- /dev/null
+++ b/dev-python/yarl/yarl-0.10.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="https://github.com/aio-libs/yarl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/multidict[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/yarl/yarl-0.10.3.ebuild b/dev-python/yarl/yarl-0.10.3.ebuild
new file mode 100644
index 000000000000..7cfc0223f0bf
--- /dev/null
+++ b/dev-python/yarl/yarl-0.10.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="https://github.com/aio-libs/yarl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/multidict[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/yarl/yarl-0.9.8.ebuild b/dev-python/yarl/yarl-0.9.8.ebuild
new file mode 100644
index 000000000000..c94d4ffb50ed
--- /dev/null
+++ b/dev-python/yarl/yarl-0.9.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="https://github.com/aio-libs/yarl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/pytest-runner[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test || die
+}
diff --git a/dev-python/yenc/Manifest b/dev-python/yenc/Manifest
new file mode 100644
index 000000000000..4485f500e532
--- /dev/null
+++ b/dev-python/yenc/Manifest
@@ -0,0 +1,6 @@
+AUX yenc-remove-cflags.patch 489 SHA256 884e22c81520bd3d22f5d83bb7a3fd2dd9963914544c2420add3306ebfa63b0e SHA512 ab8d6522fd7355a1d9680126faec3a8588e1766c9ab4d46eced70f0f6db7482b1994e05d61d7246b4cc08dfa64a0aa88e85edda8a00efb0f3d95e92edbde37cc WHIRLPOOL 0df47c7b794631078dd7f4fede1488e2f2fcc1cffd248dd1fffeaf8f78a72405b4d0d9e479448cc3bcf4c1963609e9cabe01819ef04ed453b5f52fd9038bac80
+DIST yenc-0.4.0.tar.gz 63156 SHA256 075f6c4e4f43b7c6dafac579eabb17287b62d80e9147cbea0b046bc3ee8edd2f SHA512 06adf10daa3eb56d1960e48c4a42c432821b8c25fcf6c703560efb9d902dc7619b79509a409f436790506f12f172fe0f0c6c1bf6bff7ab5ce3856b272c62c4d9 WHIRLPOOL e364ae573cfe57f51b1c7a47d1fd447bbd8144bce481d530fd1cda33ec41be9a3d8b05a6a92bdf6269997e5632bbdea426a1b4f324d74c2a9c78f35b5e337fb7
+EBUILD yenc-0.4.0-r1.ebuild 586 SHA256 deef613956db347aa872c86f563c53c7cf519f2431f50945a5f1dbe37c96cae7 SHA512 66156b7aac333c691f09583ba1d4df118ec6eaa717f3d6728dea293d992f866f6d9ce23f1059130f464109ad8a028736ad67dd6e773c94931498bf20239f4e69 WHIRLPOOL c6f695fe9a0618b65131ade4215149b5abb76c93800ca0a3d9fcfb471ca4320a644e70930dbbeefcdda4ab56efb5b38187e9b3bafdef01b9b7c3e0743f2f56a7
+MISC ChangeLog 2417 SHA256 7a46fc1343035cc575d3f92c2226761af1109223fc1cbd62d093a94f1018afe5 SHA512 c4d8e4801bcc08ffe9408b80aa71071b4a01f6f4582b04a91077b695e75398cede00b050480b0e5fe6a15e339efc6379c53c085fc4042291d26c724ad370d3d5 WHIRLPOOL 96a3fe5675e27776a453b65783079ec3eee06a9dfae51d0e097ef00b82d998069dfc6e51f43dc3943ba496a83f9ef1c04d81f330c2098817a3e81c16ed1717a2
+MISC ChangeLog-2015 959 SHA256 91157357f774ddf1ab0eeb9070c7c1096bdb1abe1d6fc6cd5bc120fe4fb92763 SHA512 cf3825bb37fd56d5759c7a3bd8c7a78eb9767442ebcc7354475cca5b3f95f15c679c2edba211e8714352f8b4d5929940db3d07e18591177c7cced4fc223dd0d5 WHIRLPOOL 7a01380dff68fd44e744a28a0d2c99bb4896247d3c41cd9c64347ff55999858853fce67a51e068df93d891d6bff4412255f504ade829decb0533cfafefa174e0
+MISC metadata.xml 220 SHA256 f5e6323054e9208bc11695e184550973ea677e8a34b8c14963e15789b52823d9 SHA512 878b4526d51f7901900ec97fb85bb90e0d1099d29bc8e49dd7cea6258da0737e71aec3377f1bc2621cf96fcf7c5699e424bbc5fb721af2f365742725612fe50d WHIRLPOOL 34f5893d07df7bbf34847492861e50da5a3a90c58828403291c37e8fec126650b9b479eafd897be85ee62d2662ef23a4b49c09baa32e1d2f04a8830f7c57f58a
diff --git a/dev-python/yenc/files/yenc-remove-cflags.patch b/dev-python/yenc/files/yenc-remove-cflags.patch
new file mode 100644
index 000000000000..27721c727db3
--- /dev/null
+++ b/dev-python/yenc/files/yenc-remove-cflags.patch
@@ -0,0 +1,11 @@
+--- setup.py	2011-09-06 09:04:33.000000000 +0200
++++ setup.py.NEW	2012-07-07 15:33:13.295906002 +0200
+@@ -33,7 +33,7 @@
+         platforms        = ["Unix"],
+ 	package_dir	 = { '': 'lib' },
+ 	py_modules	 = ["yenc"],
+-	ext_modules	 = [Extension("_yenc",["src/_yenc.c"],extra_compile_args=["-O2","-g"])],
++	ext_modules	 = [Extension("_yenc",["src/_yenc.c"])],
+         classifiers      = [
+             "Programming Language :: Python",
+             "Programming Language :: Python :: 2.5",
diff --git a/dev-python/yenc/metadata.xml b/dev-python/yenc/metadata.xml
new file mode 100644
index 000000000000..664b1a9c9e03
--- /dev/null
+++ b/dev-python/yenc/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jsbronder@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/yenc/yenc-0.4.0-r1.ebuild b/dev-python/yenc/yenc-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..bd25cb3982c7
--- /dev/null
+++ b/dev-python/yenc/yenc-0.4.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Module providing raw yEnc encoding/decoding"
+HOMEPAGE="http://www.golug.it/yenc.html"
+SRC_URI="http://www.golug.it/pub/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Remove forced CFLAG on setup.py
+PATCHES=( "${FILESDIR}"/${PN}-remove-cflags.patch )
+DOCS=( README TODO CHANGES doc/${PN}-draft.1.3.txt )
+
+python_test() {
+	"${PYTHON}" test/test.py || die "Test failed."
+}
diff --git a/dev-python/yolk-portage/Manifest b/dev-python/yolk-portage/Manifest
new file mode 100644
index 000000000000..4f67930e3c6f
--- /dev/null
+++ b/dev-python/yolk-portage/Manifest
@@ -0,0 +1,5 @@
+DIST yolk-portage-0.1.tar.gz 2497 SHA256 32b25d2567c755d5aca2c3da3d0ce4d63b65b1d81ac1effa66444dd561134262 SHA512 e0d0ef4450276fbc5b1e6813cab63b5b2f9c2731e141d95ee23bfa3e5f78dd86c6bdda3dae4e056096be58916da406a7699c5cfea7a84f688e2721b6d8a36bb7 WHIRLPOOL a187314441a95468851554d444ec0c2df521b6f88c5c621ceb02f0bc6e97e048f15509052790ab026d1aaf49cb1e41a4b5fb896703e953330109faef030bb0ce
+EBUILD yolk-portage-0.1-r1.ebuild 472 SHA256 ef1e42a91d754c586499414cb3ee4d605c4a6b6ecf37c93f59577b09e8ffbbff SHA512 79eb2cfe5e49ef4af9dddb360cfb898bde9fe6466046ecf25c26432cf8cb8c859b5c6cb7328cc62e496384dfe1f19d1ad0a36b4e8a13fa734f52f39d5af8e735 WHIRLPOOL c3f5031401d9106b7bd5d5de5d748f069f7d5fb33df92b45096c25d0dcbd81d3b09f432e10763c603fb79f76270c301e8dcf2a9e6bd83e5cd187f4c1a678faaf
+MISC ChangeLog 2595 SHA256 362aaefac35255e8d255d84c84b51d6b95ee01f9db0e8306ded387bdb45ddb29 SHA512 125f0a7e91a33ab056ae11d173733527ea217ed6a1bba0260e03e0f9b1e7376302678881199aa19f601568fb1cfdeb64c3d8af3e29f05a2a74eeb4905693bd6f WHIRLPOOL d66193a3c0d692cb1f8fe20e7611fbea2c02bad1e52df5f440c0133510630c429cd847fdcfdadf4c3e25d7fd409df11db83726f45db4db9216c1ecb8b57726bc
+MISC ChangeLog-2015 1817 SHA256 12c1e7dc5ff2f0d8e749e497cf381b75e13179ad4855c4e8645997ce5af8498f SHA512 b418b8509ef6c19833d8b2136c36deafa0f700f684117b398628582fc9b9203c3730985583b8284f13419a1b631dccf382d085c64732a4a3ff4b722ec0ed3573 WHIRLPOOL 55b3af999f1964c714c2b6fff0430fbf7af8e01ec80ab9a763c8c6d3af10df4a1c09051bb2aa76709aff60d739aa0ed9430842271d4801c81af6a76e8ff920d0
+MISC metadata.xml 584 SHA256 005599cab48f5e75098e350ba5f2bdbffd283aff8d6a4d4c99626c3bd0014ace SHA512 892584515dfd01ca92ac5ad4aa1a7fdf0a61c13dbb267634874acaa05bd9766d6e41e0863aba57f177b923d1c6e9a3e7c659114de2ae372616406a008572c61d WHIRLPOOL ec85a936f745d478e6f1902f6f17308025a68fa60bc6342d6da0b8e3b0af9a67817314b2c6fca09260a415def2164a6ccf44d48364083f890d093599666c151b
diff --git a/dev-python/yolk-portage/metadata.xml b/dev-python/yolk-portage/metadata.xml
new file mode 100644
index 000000000000..f98e92d4127c
--- /dev/null
+++ b/dev-python/yolk-portage/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+		yolk-portage is a plugin for dev-python/yolk
+		You can use yolk -l --portage to see which Python packages were
+		installed by portage or directly by setuptools, easy_install
+		or distutils (python &gt;=2.5)
+	</longdescription>
+  <upstream>
+    <remote-id type="pypi">yolk-portage</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild b/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild
new file mode 100644
index 000000000000..4501d1b47b55
--- /dev/null
+++ b/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Gentoo Portage plugin for yolk"
+HOMEPAGE="https://pypi.python.org/pypi/yolk-portage"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=app-portage/portage-utils-0.1.23"
diff --git a/dev-python/yolk/Manifest b/dev-python/yolk/Manifest
new file mode 100644
index 000000000000..6cfd6d410afe
--- /dev/null
+++ b/dev-python/yolk/Manifest
@@ -0,0 +1,5 @@
+DIST yolk-0.4.3.tar.gz 86100 SHA256 1c07eb4001dc133c08e66e38c5d58faa7616ae804f8d0ab02dd44a1044e7ddb8 SHA512 ad707f4bff0cbcd3e77d9dec0734bb4d743dcada706ab1e296edafc51e1d511ab4565de64c9828275cbe0c82f35bd3f50316b74f140670f0af8276a49733f9ad WHIRLPOOL 573a2ff7e063fb91ae58f20787c081e36949707100052e2101c3fc15436e6ea752fa645f3e51f5e11bf0b1768dec396b00e1ce59052d346552a9c44c43909c19
+EBUILD yolk-0.4.3-r1.ebuild 607 SHA256 b263b9b4c785a9bb4941ccf9d1109bd652a8140d24c2f97d925f6d86ba421988 SHA512 fa29a28ad5de5bb546c794bc349c66db792289ca6e388573862dd5f2469c26c53cd4fb64639b41e538b14468c942322b14572a275eae180bc27cc642b0c21a83 WHIRLPOOL aa41307e3952755d2391b0aa638c4187b998cd98b71a743137743dc80475c5680b1a2316bebf6df2dc4ff45ae954e9e8c0f39803478218a526eec65fae4a9cb6
+MISC ChangeLog 2815 SHA256 95132404cd96220f22f93da01a013966d32a2d99f8c2d57b553de7a38045e062 SHA512 d60e456c7b492785433a1cfd35af0110d9348a442030ad37037b8e3e6de16a9381e8b816849edee9c53d0b3c109998cf24ad147fa7cff050ab4b75f6f10e32cd WHIRLPOOL 5a83c5a4743dfabc3961f8b06ba0364133ffe0db59fa6c0bdcc93c754dcd7b02a0d2209d0c449fd4aca38dab0ecbf113dd98c18b1eeb27a4452a3fd033eab6df
+MISC ChangeLog-2015 3128 SHA256 17fbeb2df4bef389d03e7b80d0fbd9370840a2675d64e49e6ef63bea278e0b16 SHA512 e5ea71537dbb8710420008ffb5e96c734af4a6700d0afb805945f1016a24946cb5f9d22bc303219251eb8d89daecec158ce5f90409e1a62a37d5363fd60ab4f2 WHIRLPOOL 15f5400c495320c9ad0cdc776648159acfff9ee941f41e7e43694925b617c27e459d97965226942966a016af4325f81cf046b407315b4381d90b851fb6ec693e
+MISC metadata.xml 576 SHA256 f347a2abe8eb0507818c191fde0630004425ea322f1f12984aa30caec44fa415 SHA512 5360139ff3a18c1d197a8ed5fff5e33307fa7f5ae68f431a467fcd107fd5da13610c6add7147032a3b94cb91baa31a8435356433672d727ee6c78b59e7894b2d WHIRLPOOL 11dd5b9dd418238f786fc01b31e2ed98580e26c0194334888cbfec63c19d3580312609a5549ccb28c76082e08ec2d808f642b6efa49858bea50385e5a907305f
diff --git a/dev-python/yolk/metadata.xml b/dev-python/yolk/metadata.xml
new file mode 100644
index 000000000000..d67d948432b0
--- /dev/null
+++ b/dev-python/yolk/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+		yolk-portage is a plugin for dev-python/yolk
+		You can use yolk -l --portage to see which Python packages were
+		installed by portage or directly by setuptools, easy_install
+		or distutils (python &gt;=2.5)
+	</longdescription>
+  <upstream>
+    <remote-id type="pypi">yolk</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/yolk/yolk-0.4.3-r1.ebuild b/dev-python/yolk/yolk-0.4.3-r1.ebuild
new file mode 100644
index 000000000000..cf3f68bfa0d6
--- /dev/null
+++ b/dev-python/yolk/yolk-0.4.3-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Tool and library for querying PyPI and locally installed Python packages"
+HOMEPAGE="https://pypi.python.org/pypi/yolk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools
+	dev-python/yolk-portage"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	if use examples; then
+		docinto examples/plugins
+		dodoc -r examples/plugins/*
+	fi
+}
diff --git a/dev-python/yubiotp/Manifest b/dev-python/yubiotp/Manifest
new file mode 100644
index 000000000000..d448796e258b
--- /dev/null
+++ b/dev-python/yubiotp/Manifest
@@ -0,0 +1,5 @@
+DIST YubiOTP-0.2.1.tar.gz 17493 SHA256 458b6db6e9988740766dc47ca5583ac4c4db8b7483ffa7e3bc82101e6b07075c SHA512 3b505fed17ed27d1ef325598a5899d4ed4ae5ed7938d1ae71155f889a6533a969e07e1172661e411cdbf23a2060e8f521cd90779c314524c4a564fbf852a670c WHIRLPOOL 99697e6886a6757c09bac9d9d64ef04b3721f4d2f20b227f246015f7d214a32b1a646a5da40d9bf9e4bd5f3e3688424885ceb7b76f6f04e82ece919c6d84650d
+EBUILD yubiotp-0.2.1.ebuild 732 SHA256 c15441147e89ae5b96c6143275e5bac97f94b02804cf4a3685b18d08ce5e61c2 SHA512 ea6c93e2bd0f31d23ead32fe378dc8c0ddf809536662492bbbcbed7ac6756bacb0f413ded7fac3d4c93212a1d910f0fee027c8ff2244ee7ed85d7f262b6a56d1 WHIRLPOOL 01ec22e59ab4e6c7e6578a1dfefd64532190bfface07e413f31ca7924d4f50c994b0f75bf6c29a45e9c1451a7314604f5793edc96aae7cbe50329551ecbb2ec0
+MISC ChangeLog 2306 SHA256 ea8b7357f7f70155e2d582e0f30acb95e993b808a1a85ae28cf07d65b38db239 SHA512 a3774c63f7ecb54861a10b01061fbf1d1b5d00d78aa585b648adef783ea99709f3949b74a5b7cf13a487830c69b34da352f591791056f0032caf57ca72844660 WHIRLPOOL 6189af5aab1e54427f6e1039a8dd4d4cdac8831553b39ba1b76f46fe7f58abdc7696adeee08fc7d9db105244938441999a3cb82fd7a541cc21d94cf1b1ce2ba8
+MISC ChangeLog-2015 667 SHA256 34af732f996e7c78241fb91f3aec54ae31c605ed66af0e0e6b0f168b1eee3abb SHA512 50306ae6f6fc34e28770db233a9457b4ee601b9bb7d25afe88cb44a4992e714123059fddc9ed9cbdcf2eec0a8440be0e19d92b1642ee7f6e48d74d2a11f55429 WHIRLPOOL b513c597f3696f2561742d49c794b8aca130f7b76db0a2d6744c8dd0c87a749ffd719de53afa99f744180482dd03a5c7a7c5c0e272bd406c7013006d9ada01a8
+MISC metadata.xml 394 SHA256 077ffe15b09e5eb5ee2cd6c7504859d7412b9f900ae8f68e133790e0a4549b9c SHA512 19f1282a531da0e4678bacdc0bdd52c6c9bbd0ca73a177a3ac518ce08d0a7685b0120620e55639e1319e65c533cec25184fa998b33334bbd8f8e0d6c713fda14 WHIRLPOOL f577317a12f7439e735c2462d0a048a835369881b015d47bd9fa60ff55094713011e07936691d10170404c3e4a53fd91050ec6a1157ef7368a6da606919e29ba
diff --git a/dev-python/yubiotp/metadata.xml b/dev-python/yubiotp/metadata.xml
new file mode 100644
index 000000000000..038a787cd752
--- /dev/null
+++ b/dev-python/yubiotp/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>ercpe@gentoo.org</email>
+    <name>Johann Schmitz (ercpe)</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">YubiOTP</remote-id>
+    <remote-id type="bitbucket">psagers/yubiotp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/yubiotp/yubiotp-0.2.1.ebuild b/dev-python/yubiotp/yubiotp-0.2.1.ebuild
new file mode 100644
index 000000000000..b717b151ddd9
--- /dev/null
+++ b/dev-python/yubiotp/yubiotp-0.2.1.ebuild
@@ -0,0 +1,33 @@
+# 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 eutils distutils-r1
+
+MY_PN="YubiOTP"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Library for verifying YubiKey OTP tokens, both locally and through a Yubico web service"
+HOMEPAGE="https://bitbucket.org/psagers/yubiotp"
+SRC_URI="mirror://pypi/Y/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test"
+
+S="${WORKDIR}/${MY_P}"
+
+CDEPEND="dev-python/six[${PYTHON_USEDEP}]
+		|| ( dev-python/pycryptodome[${PYTHON_USEDEP}] dev-python/pycrypto[${PYTHON_USEDEP}] )"
+
+RDEPEND="${CDEPEND}"
+DEPEND="test? ( ${CDEPEND} )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/zake/Manifest b/dev-python/zake/Manifest
new file mode 100644
index 000000000000..7470b8c4b804
--- /dev/null
+++ b/dev-python/zake/Manifest
@@ -0,0 +1,5 @@
+DIST zake-0.2.1.tar.gz 12972 SHA256 2e5bcb215e366e682fd05dd1df4f2e6affceefa5d3781c2987a21fd597659a21 SHA512 a9f7ddeb202e16355680d8aeb39af920eeb4280352cf746c630d208567c948efe78036032d4a6ca7b1f719093eaeb1ffa071c66975bd8036a9015706d64a76d2 WHIRLPOOL 411ea1d8463b68633e3ee4717524c0b316476b060b3b3177016a4c8fe0f539361f920c516cf5f25592a46b40fd88978840fe820161314e4aa0744cc9f01fbe00
+EBUILD zake-0.2.1.ebuild 699 SHA256 172d88d7eba88a63e95b8a4482033d9f085cc12b9c0435cda1895ddf5fc39184 SHA512 370543003e67b90a408e6b81f51bdcc2d5c678def92e938df36954e7bee7caefa8e6cee43113db9d46e862b291ec3cec6a26be67b871902812c524b6e7a4c403 WHIRLPOOL 94f70aa5d25633a9bf4d0da41c5a2d25931975c9030a979fe4bd31779949333737a3e25538539efac612f0310498974479964ecc89e7d068cdc82792325c91b7
+MISC ChangeLog 3305 SHA256 d81dcfdc65abeddc5d7ed6d44d1c3ddb734cfbfa3e794d5f621453a96327da47 SHA512 343267e01aade17f014359a3f51e9485257b520257c1afe9dd4e0e772b639ae48cf6849939207897489faedd81fd3bd7271111d8656b88f3ab5d6cb7b3a09e8b WHIRLPOOL 209e13418d9d07ac013ca5fd3e0210150764efcbf91707a82309788386fa9ec3bd35b36f46d51ed26833641c3b5f64a9c8fda16829e62961b978611deef71982
+MISC ChangeLog-2015 535 SHA256 4094ac0819ad5e055f4cfa978d615f67644b9bd21c6a58c4fd4ea2fc8748e1ba SHA512 cb9bf5116c16589e98600c9f8415c8e110432a411eba927f6a4200842aaba2fec878e791023502e1570ca9c3e026368330b5c0a5201e027e63e18b8150a5e5ea WHIRLPOOL 54647338a58cef4c6b99ac7ddeaf44bcc3359890594d71ffe2b3dbef7b115e35d3d80dc28a16c006b61664ca967106f7cf0124fc27174cd051a04baba85c62b2
+MISC metadata.xml 643 SHA256 cb00cfa333270252f776be25a23f51f2d2865fec945bd60a9d486c0bc9874349 SHA512 f37d7ebf54670af0b8af907385c88945a01467784163864fdc3e8a8a1f0a14bd342c4739bfc70307781df4b1c52f6a7c9ef74b3277fbe30127acb0afe34c0d0c WHIRLPOOL e0cb9fe82622c556792390b6df26a88da3a93d28aa7cc7d34280ac6bdc5fef94413471c88fb00889cef515c1579078f3b113754013e09aee130b9159eaa32e53
diff --git a/dev-python/zake/metadata.xml b/dev-python/zake/metadata.xml
new file mode 100644
index 000000000000..e16345dbcadc
--- /dev/null
+++ b/dev-python/zake/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+  A python package that works to provide a nice set of testing utilities for the kazoo library.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">zake</remote-id>
+    <remote-id type="github">yahoo/Zake</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/zake/zake-0.2.1.ebuild b/dev-python/zake/zake-0.2.1.ebuild
new file mode 100644
index 000000000000..275d54cf3066
--- /dev/null
+++ b/dev-python/zake/zake-0.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python{3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Set of testing utilities for the kazoo library"
+HOMEPAGE=" https://github.com/yahoo/Zake"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/testtools[${PYTHON_USEDEP}]
+	dev-python/flake8[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/kazoo[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+python_test() {
+	${EPYTHON} -m nose || die
+}
diff --git a/dev-python/zbase32/Manifest b/dev-python/zbase32/Manifest
new file mode 100644
index 000000000000..69f02e219852
--- /dev/null
+++ b/dev-python/zbase32/Manifest
@@ -0,0 +1,5 @@
+DIST zbase32-1.1.5.tar.gz 21745 SHA256 9b25c34ba586cbbad4517af516e723599a6f38fc560f4797855a5f3051e6422f SHA512 b2b049cdbc312cb56656b611d726527cdb0f598e5c8e0a646d1a144f863698404d8784d477f64402b0e3efd2d0ef5927a74ff0370a1742c1b7a5ad257bdc4f11 WHIRLPOOL f5ef0464dd41e5baa44bff6470b935a0684051656cad37d79faf8510ae62a530d492ffffa1bf886e7773e5f72b29fb078cef4fc1633c8ce6b5725ac4b8b40e97
+EBUILD zbase32-1.1.5.ebuild 432 SHA256 468939acf5bc066b422b42cda7656b9f2d55ea4949533ca63c70baa6675f0368 SHA512 1f509cddafa68d43e4d76b21b56e8ff848274c4dc17ea98d6a3dacf84810f1dbae099466ea11e6f05ddef5860b340454974fedfad94597d98bb1550bff7b6205 WHIRLPOOL 337d667dd7a795e5cef3e793972ae7136c4b625001fd5e50609acf49dce410ec1335535c34726ce321de321a14fa5d74b94c35b339880365d2e8da495c89f160
+MISC ChangeLog 2667 SHA256 1f16560b2feed689d52f86cc761ad2017525eadf10dc5b9a37f359fa9bbe46b3 SHA512 11e50904fa37fd42ff4feee0bc9be643989b97630f9d8b2ea6d64d164dbfd75ea427b74e850061bc95415655c1578ec445caad8d5e21991c88203937c18668d2 WHIRLPOOL 2a980458b7a3d7ae130efff752e1d84d912d52f3b7b95837837fef480c54830fa8c53c6d4516e11883a743fea8a0fb45cc9a007f0429e9d3f27b93824d47e806
+MISC ChangeLog-2015 755 SHA256 b1c3066d2ba6f1caa1013e8e75e0f5412db12732d07c51eadfa661a5dd14249a SHA512 8b4875412591c87f4f1657af97fa39be038a557e0fa7ee0f82d98a2fb32452bc8e159af3d176f40e16eca85fe1f177b09a50a6b02639eb8783e09651028df22f WHIRLPOOL bbf2950c8e05d466d4cbd4b253ac34f94e10631642d7ddd7030b41f549aae0fc2c1d3946febb75b001c02bca07808abd2b4b49398b9c6278f63b1517eaada399
+MISC metadata.xml 237 SHA256 e9b8b7f5cad830985cd9628af374b009c94153083fa2c90326b8484c7ec44a5d SHA512 02479954b39c0b0ae9a8a030532c28700c396c46b42aa0eebd307ef0e23ca2a3bbf64937aaf892beddbc0d724d5ef2c96361774607a23a8b0c3fdf1e9f880ac7 WHIRLPOOL 08ec0ec6267fad0ebe576bab3509ccc8847a7c3f74bf15cd0026a7a023a8baa90fd2f28419377816af281e9e75ed5f5980c204d49367f35e8ce1e211bcf8c9c3
diff --git a/dev-python/zbase32/metadata.xml b/dev-python/zbase32/metadata.xml
new file mode 100644
index 000000000000..97a9d1ac26d2
--- /dev/null
+++ b/dev-python/zbase32/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-needed -->
+	<upstream>
+		<remote-id type="pypi">zbase32</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/zbase32/zbase32-1.1.5.ebuild b/dev-python/zbase32/zbase32-1.1.5.ebuild
new file mode 100644
index 000000000000..63d63482870c
--- /dev/null
+++ b/dev-python/zbase32/zbase32-1.1.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="base32 encoder/decoder (not RFC 3548 compliant)"
+HOMEPAGE="https://pypi.python.org/pypi/zbase32"
+SRC_URI="mirror://pypi/z/zbase32/zbase32-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-python/pyutil[${PYTHON_USEDEP}]"
diff --git a/dev-python/zc-buildout/Manifest b/dev-python/zc-buildout/Manifest
new file mode 100644
index 000000000000..c1d5f4a921e8
--- /dev/null
+++ b/dev-python/zc-buildout/Manifest
@@ -0,0 +1,6 @@
+DIST zc.buildout-2.5.3.tar.gz 305163 SHA256 3e5f3afcc64416604c5efc554c2fa0901b60657e012a710c320e2eb510efcfb9 SHA512 a4d4becac815531cd180795372ce5896d1fdab8606fff492502ef1f59d6d1ddd8427bb00ea96d36ec284a18b17b9273d8b94a405ebe410bae7e9a6e47a8dfad7 WHIRLPOOL b5d01e3b1a589cafb965cae8992f3657805ec3fd22ed75f43d57cba6260e4a7c2bc047c7355ae37cbbd13bb673ba7509597dbb0ed792bbfcbb80817646d7c4fc
+EBUILD zc-buildout-2.5.3-r1.ebuild 1245 SHA256 b48d4d14e0af3e6236842458d8ac6dc2ae38f83ec46efcb3e6712cfb33d90978 SHA512 9ab9bf094bd1f2dde51f739610c37c3cefb8a803ec15fd5b1820795b1a92767aff4592dc0756eb65c6eb8ddbaa25d7740cb29b7678703be3ca1061c50c76e5dc WHIRLPOOL f82633bf69735183678b4bb2bf17ee77c46f15828c3a1c951f63e5335344622da63f3383ef639b6184cd8bde885dc96e6e08b7ddc9184daca3733f34c3a9723c
+EBUILD zc-buildout-2.5.3.ebuild 1025 SHA256 f168b9e06ab629f34d6cd8deab36bc066bee244b146c57e9fb9d02fb9cdf8c84 SHA512 be3eb00f3b60a020c519c4ae97767ccb66e5cdde48caafe7642d29404a3db0dcdf813d59798594e3eb270e0489249473a9202295754005961b3d59d58f254c74 WHIRLPOOL fa3c8297b000389ded6602e58ba762104eea9222791dcf9874f4315c76970bc4ddd5a49d060db10c994977f0b07af6e6330c46d1f9678e321c4000401938c429
+MISC ChangeLog 2940 SHA256 0aeaa82857a05c8a74628d62c8ac10476e3846f2164a7acb3444ceacf1f0ba58 SHA512 b2d190311ce4eff13a2bb745acc1f8240e108350c571f62b3b8ea747de6eb5a25eb8003d64c53eca08c50815a656251e047b469e3fffc217d4693311ccc873c5 WHIRLPOOL d67602f59215c9d2ee62e45d04445eff36c4b96227e5ba8c86c6261be092352b4379e05722667a5e6697a64c12de65b2fb3f8401f2a90726cb357369da676bba
+MISC ChangeLog-2015 621 SHA256 1fdcedbd53e4cc5d46d1faf204b479cd86f83a6ee25772db68b7f8e82a81981f SHA512 bbc67d4e45596ad0b9d09e99716734d1dcb8a71d331c500b6ffe09d6d68c6d951e3ae6fdeff9f4f6757129870b468d2642f7ef11f9310d135f0f30afbba42224 WHIRLPOOL 3acf04747fe064d2508459104c0859cfa5078fc894fc6b24ddb6edc516c1185027472c3e65568e06a01440d5f93eb4c54c96a1d8e6d658529709659d9dff79f0
+MISC metadata.xml 1522 SHA256 43f75c24ae5400f8d067dc38821cbbbcbac40e5e8ff8d782cee5c5d7a0316bd7 SHA512 ad8553c7d9333f379ff9fae8f149e7bd519ab39c64d1d5b0195fee2fe27a918159de9f74e577f2c8c196997ddebe51facede20c82f4a29fdd79e5dde242d7f86 WHIRLPOOL 8b533c7e0dcbe161b4f87090459abdac0fa369edae9a9e70f547b49d602e61c494486ec32eb5fb90390492ce7e85c823f12988071eb2c6b4d9eab5f886805cd7
diff --git a/dev-python/zc-buildout/metadata.xml b/dev-python/zc-buildout/metadata.xml
new file mode 100644
index 000000000000..285b4a8f881b
--- /dev/null
+++ b/dev-python/zc-buildout/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Alfredo Tupone</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">Buildout is a system for managing development buildouts. While often identified as a Zope project,
+and indeed licensed under the ZPL by Zope creator Jim Fulton, buildout is useful for configurations
+beyond Zope, and even, in rare cases, a few that have nothing to do with Python.
+The Buildout project provides support for creating applications, especially Python applications. It
+provides tools for assembling applications from multiple parts, Python or otherwise. An application
+may actually contain multiple programs, processes, and configuration settings.
+The word .buildout. refers to a description of a set of parts and the software to create and assemble
+them. It is often used informally to refer to an installed system based on a buildout definition. For
+example, if we are creating an application named .Foo., then .the Foo buildout. is the collection of
+configuration and application-specific software that allows an instance of the application to be
+created. We may refer to such an instance of the application informally as .a Foo buildout..</longdescription>
+	<upstream>
+		<remote-id type="pypi">zc.buildout</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/zc-buildout/zc-buildout-2.5.3-r1.ebuild b/dev-python/zc-buildout/zc-buildout-2.5.3-r1.ebuild
new file mode 100644
index 000000000000..fe4f6403f55c
--- /dev/null
+++ b/dev-python/zc-buildout/zc-buildout-2.5.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="System for managing development buildouts"
+HOMEPAGE="https://pypi.python.org/pypi/zc.buildout"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/setuptools-3.3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS=( README.rst doc/tutorial.txt )
+
+# Prevent incorrect installation of data file
+python_prepare_all() {
+	sed -e '/^    include_package_data/d' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	if python_is_python3; then
+		ewarn "Tests are broken for ${EPYTHON}, skipping"
+		continue
+	fi
+
+	distutils_install_for_testing
+	"${PYTHON}" src/zc/buildout/tests.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	python_moduleinto zc
+	python_domodule src/zc/__init__.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zc-buildout/zc-buildout-2.5.3.ebuild b/dev-python/zc-buildout/zc-buildout-2.5.3.ebuild
new file mode 100644
index 000000000000..a5324fbf46e1
--- /dev/null
+++ b/dev-python/zc-buildout/zc-buildout-2.5.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="System for managing development buildouts"
+HOMEPAGE="https://pypi.python.org/pypi/zc.buildout"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/setuptools-3.3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS=( README.rst doc/tutorial.txt )
+
+# Prevent incorrect installation of data file
+python_prepare_all() {
+	sed -e '/^    include_package_data/d' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	if python_is_python3; then
+		ewarn "Tests are broken for ${EPYTHON}, skipping"
+		continue
+	fi
+
+	distutils_install_for_testing
+	"${PYTHON}" src/zc/buildout/tests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/zeep/Manifest b/dev-python/zeep/Manifest
new file mode 100644
index 000000000000..243f42b6bf77
--- /dev/null
+++ b/dev-python/zeep/Manifest
@@ -0,0 +1,6 @@
+DIST zeep-1.6.0.tar.gz 137181 SHA256 9f2aeacf8ebf702a61123078b25a6212917b4fe473ce487f23efac292d5b58cb SHA512 b0922cc808dcf0bb1b817b6131f92a726738f2ecfdd903981d87012dd9a54e323ec79bb54d10702dd7f8d00f49c1942ccfd08be7e4983d460122cfb466ffb502 WHIRLPOOL 17f929ffea6803cd305d9bb414f90d3d431b70687991cda90a1eaa205a61a97c56b62ff8afd3dd849f0c507ea56110d09460d2592acb76b6a08dc30605c9ed90
+DIST zeep-2.2.0.tar.gz 143349 SHA256 673811a00c05f6cc4b3dff1ef7abfcd845614cdcdff2961bf5b10aadfd40f5a8 SHA512 53abb4ec2e4f178dd60a800a943d6fc8ff2b11c19d0f1af11603a9424cd41da3d33471f81ed293451203a147e36bdbe67d6d708da41d020286808c19d7372501 WHIRLPOOL 1954c6573908ff3470223178e027ceaa798dccfd0fe0c0ce3fea20ccbaf5a939667e13a7dbcf720dc54d4859e9517c12723323e1e3398fcc3fe0030aa020ce0b
+EBUILD zeep-1.6.0.ebuild 785 SHA256 cd5459233b4002f380cd8ccedf6d2748fd65587f0b4fd5428f091e950af8c96c SHA512 6dacb7e2f172b9c18493f54353085aa87e33bef6bc259441be41d136a1dc6e92dd638177446a2fa2685343a75e575b390e7d596f91dd107e39c68bce30e888d8 WHIRLPOOL 5a620c549440ce1d6df2fd23516c20cf387433e3b57d715f858336b2658dcc83cfc9f071e4eefc877e6bf194d004feb61d92f56e74db75197872bb2ca41f4c6f
+EBUILD zeep-2.2.0.ebuild 785 SHA256 cd5459233b4002f380cd8ccedf6d2748fd65587f0b4fd5428f091e950af8c96c SHA512 6dacb7e2f172b9c18493f54353085aa87e33bef6bc259441be41d136a1dc6e92dd638177446a2fa2685343a75e575b390e7d596f91dd107e39c68bce30e888d8 WHIRLPOOL 5a620c549440ce1d6df2fd23516c20cf387433e3b57d715f858336b2658dcc83cfc9f071e4eefc877e6bf194d004feb61d92f56e74db75197872bb2ca41f4c6f
+MISC ChangeLog 296 SHA256 e9c25a99be0a68cbba5791f86486495cbad1b8977b8e58d3e5c66d662e706959 SHA512 717e41d47025137b9afdff0d2666805ccd9774262e39ca1b69c5c2928ac17da3a32bdb6936f4f29dc7ca271c22867850d147584cb482acfc5af5b41433645b85 WHIRLPOOL 047f0b66eabaebb862dfefb472ff3d33740fac2f2ada2980e57071e2b8a7043478a7f6d0a89469b119a3fc4f341dcf3accfd3e18cb94819861e170386d1307a5
+MISC metadata.xml 539 SHA256 c2680fd970765409ca82ce03bf90f3ceae2a9d7d91955be3b043c09da399b265 SHA512 5fd5cc011b156fb6821ff3438f1dcd46a5801bffeaabe9a77b86ea31aaf7370a0dc1349cc8ac1947a1fe651264ca98e54969be56aa59c9a4172800cd296d33eb WHIRLPOOL 98ad56388a7e80c84e0c53ba4070a017c764c71baca90a677d77d0a72158c3bb4eee53f9cd06096d3c3d02241d68da48562c41c2c6b682447ddbbabc67d2bb77
diff --git a/dev-python/zeep/metadata.xml b/dev-python/zeep/metadata.xml
new file mode 100644
index 000000000000..58125b0a6f0e
--- /dev/null
+++ b/dev-python/zeep/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>cedk@gentoo.org</email>
+		<name>Cédric Krier</name>
+	</maintainer>
+	<longdescription lang="en">
+		A fast and modern Python SOAP client
+	</longdescription>
+	<use>
+		<flag name="async">Add async support</flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">zeep</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/zeep/zeep-1.6.0.ebuild b/dev-python/zeep/zeep-1.6.0.ebuild
new file mode 100644
index 000000000000..9fc381b4d846
--- /dev/null
+++ b/dev-python/zeep/zeep-1.6.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+inherit distutils-r1
+
+DESCRIPTION="A modern/fast Python SOAP client based on lxml / requests"
+HOMEPAGE="http://docs.python-zeep.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="async"
+
+DEPEND="dev-python/setuptools"
+RDEPEND="${DEPEND}
+	>=dev-python/appdirs-1.4.0
+	>=dev-python/cached-property-1.3.0
+	>=dev-python/defusedxml-0.4.1
+	>=dev-python/isodate-0.5.4
+	>=dev-python/lxml-3.0.0
+	>=dev-python/requests-2.7.0
+	>=dev-python/requests-toolbelt-0.7.1
+	>=dev-python/six-1.9.0
+	dev-python/pytz
+	async? ( >=dev-python/aiohttp-1.0 )"
+
+DOCS=( README.rst CHANGES )
diff --git a/dev-python/zeep/zeep-2.2.0.ebuild b/dev-python/zeep/zeep-2.2.0.ebuild
new file mode 100644
index 000000000000..9fc381b4d846
--- /dev/null
+++ b/dev-python/zeep/zeep-2.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+inherit distutils-r1
+
+DESCRIPTION="A modern/fast Python SOAP client based on lxml / requests"
+HOMEPAGE="http://docs.python-zeep.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="async"
+
+DEPEND="dev-python/setuptools"
+RDEPEND="${DEPEND}
+	>=dev-python/appdirs-1.4.0
+	>=dev-python/cached-property-1.3.0
+	>=dev-python/defusedxml-0.4.1
+	>=dev-python/isodate-0.5.4
+	>=dev-python/lxml-3.0.0
+	>=dev-python/requests-2.7.0
+	>=dev-python/requests-toolbelt-0.7.1
+	>=dev-python/six-1.9.0
+	dev-python/pytz
+	async? ( >=dev-python/aiohttp-1.0 )"
+
+DOCS=( README.rst CHANGES )
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
new file mode 100644
index 000000000000..e06f1bbe3103
--- /dev/null
+++ b/dev-python/zeroconf/Manifest
@@ -0,0 +1,4 @@
+DIST zeroconf-0.17.5.tar.gz 18428 SHA256 51ea8affc3512259d5e702a46031139c2eaefe2a0891990e5866d0b5a436112e SHA512 834f8d66bb92232474f60a5137ed7de3788fe1b7109cd5dd2100c3845a89bbb224df060bcb482b0c48b0a5849604247b8f29a902f9c78c35a72497a77f5323b3 WHIRLPOOL b18548e0ac1f7f4e03c4326d227ebcd6a56e43cfeb4ee4168ba47eae73675c131dda5d2840b506f56abf816517328eb2143c10afa52a6b972ee851be30f04736
+EBUILD zeroconf-0.17.5.ebuild 974 SHA256 b237e3c66845919e7dbe9e646f2103189b39e98d29f1d96ae6abb0c63771f846 SHA512 78d1e3bb8457a2419b0610e8046f96e9ff5a67370a6bbaeb303c20ecde52aabf27745336a24f01d1717596e7779a6ca3c90a705ce525eb1a3e3c9d96e1aeb3ca WHIRLPOOL c31133536b13c806fe699c1319e58d91f4a94cb320f9e9ae66ef57788e77ee1f4bd0615a39d5399fc1da726bc5c3289b1179d98592eb533460608d5ca682990b
+MISC ChangeLog 780 SHA256 05e76245803cac614397d52e4c0be28d517c984d0f6c56d9167c383d34ad882b SHA512 7ae43b41e852d5aabf072307d9f6091c013b1f12bfe884204838384ce9294dd9d19093f1e25f369f67abd5026450284a1665ae42a7b7e0bcdf1a5468d5fdfb9c WHIRLPOOL 896e83bf22b0fbd818af63dac077fb83692ab560dcd08ca7942c4deb302a354015959ae54c235982ebb729db6ef9f8f211383590d9dc087d403b7adfc4c053d4
+MISC metadata.xml 387 SHA256 af654efdc998a325ac15acd0d1f4036d28ebd2db0c345ee02e71088f06e972b4 SHA512 ccee11a4aad084b1ac1dd901d966e1424b7ad3769b4bdf62c2dd44f9cbb6ec1a566443967ba45b37ef6241f43d2a06c17ebb5028254fbf40e0a480fcc3d76f89 WHIRLPOOL 5873c700a076524eb93a6745019d4f5df4820ac1652fff8b70c865873aae1f868c3b7c4ffc4fac019c03ff5d2e42f61b07f88a6318053e46f47469aa78461827
diff --git a/dev-python/zeroconf/metadata.xml b/dev-python/zeroconf/metadata.xml
new file mode 100644
index 000000000000..773c6eaa7922
--- /dev/null
+++ b/dev-python/zeroconf/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">zeroconf</remote-id>
+    <remote-id type="github">jstasiak/python-zeroconf</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/zeroconf/zeroconf-0.17.5.ebuild b/dev-python/zeroconf/zeroconf-0.17.5.ebuild
new file mode 100644
index 000000000000..a4dde5ce34c7
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.17.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="https://github.com/jstasiak/python-zeroconf http://pypi.python.org/pypi/zeroconf"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+# Not included
+RESTRICT="test"
+
+python_prepare_all() {
+	# It's virtual/python-enum34
+	sed \
+		-e "s:'enum-compat',::g" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/zfec/Manifest b/dev-python/zfec/Manifest
new file mode 100644
index 000000000000..6391cfe2b39a
--- /dev/null
+++ b/dev-python/zfec/Manifest
@@ -0,0 +1,5 @@
+DIST zfec-1.4.24.tar.gz 175884 SHA256 e3e99e6e67ac9af72c0f918f03d2051e17d41f48ee0134d0d2c81e7fe92749cf SHA512 ec213912eea054c954ddda67a401b1538fb2f02c2b56cdfb610df5f4852b79305ef72e9919c578d46a268ea4c5912a60422117326f633c7e9b8a7977561fa1f5 WHIRLPOOL ffbfda6ea69ece90b33ed8d6e39372c373e32c287cbc1fd7fda25f07b851e17fb85386ed2514f4326f8a3e190577dc7280fc26ebe4eb3a50fa0487642a785247
+EBUILD zfec-1.4.24.ebuild 663 SHA256 94dd2a8c983caa0369d062e54708a0aee21d5845b60fdc2b8ca4b610fe867822 SHA512 f31efcd1c736c217b036d865927232a3a14070491f13acaa1d637150f9f790250eb42d813d724bddee07b4b89f56165f2b1b9dd815565418dfb0c1b8470d490c WHIRLPOOL c7005e619baa0bd60afa1044cf209793e0875b90ee3389d560a1f8dcb633a7402bf14b725b08522ea48b01b00b25e6534194c76f350bb84673c11b65f8d1fd96
+MISC ChangeLog 2517 SHA256 98b8e1f1441902431c57959554d1c284dec329bcd113614227c59f4d4be36bd0 SHA512 ba2c6360524a3362a71db97b5d3b196448335ea3f6f2ed47b4155240feab3cdb2314aa495e5f77991beae42d1b9cfb89cf46c5ca9f1b760acfb043d64bdd9a93 WHIRLPOOL 3cf9b0ea757d1454bc1387330b5866ae34252596a8195f393a32f8d066b5cc1cbfd56df310ee045946d662db0eff3293cf136f8a47ff947bd61c80c499d9469c
+MISC ChangeLog-2015 1051 SHA256 80495766d61a646b98539ca6b46215aae4f1663dfb7176cc5f8c3577da5645cd SHA512 b7c6e3a4ac0e7b6fa1444637fd79b1bec4c4f7ff77ee0b1898688623b32a2fd1b16084459de52938894ae4efe43eefae05e9a7d85751926e9e5b771995397996 WHIRLPOOL 8f203bf08fb63f9ee8fe1155226199ff026a5b9c6c4ceeb3161514aa5caba274b1ef5cd7efe55d2d6dacca7d88a791e4f5009199eeeb6ab67485f35aed1a01bf
+MISC metadata.xml 518 SHA256 a96e8acccf93731ea022f20a07b0bfd73e9429ec696f9eab21961c6b37c19b6b SHA512 86c3ca260e3b58e78998f03160b4dc8e9e5c4c53875b247f6f029bfa64e95cb9cdc590ed7044c3c3245d5b572f69461f73863d83c1509918e08c4bfca7c9a44d WHIRLPOOL f754db6569871f67adb7cad624fa09233f87dec10852b8351d7ec2ed7dd31b32d0932f0ee2a321915c053091b44f49c155f27133ef6eef81bc5f4cd5f9c36031
diff --git a/dev-python/zfec/metadata.xml b/dev-python/zfec/metadata.xml
new file mode 100644
index 000000000000..e6b25093cee3
--- /dev/null
+++ b/dev-python/zfec/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		Generate redundant blocks of information such that if some of
+		the blocks are lost then the original data can be recovered from
+		the remaining blocks. This package includes command-line tools,
+		C API, Python API, and Haskell API.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">zfec</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/zfec/zfec-1.4.24.ebuild b/dev-python/zfec/zfec-1.4.24.ebuild
new file mode 100644
index 000000000000..5e5446f1cb13
--- /dev/null
+++ b/dev-python/zfec/zfec-1.4.24.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Fast erasure codec for the command-line, C, Python, or Haskell"
+HOMEPAGE="https://pypi.python.org/pypi/zfec"
+SRC_URI="mirror://pypi/z/zfec/zfec-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEPEND=""
+RDEPEND="${COMMON_DEPEND}
+	dev-python/pyutil[${PYTHON_USEDEP}]
+	dev-python/zbase32[${PYTHON_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+
+	rm -rf "${ED%/}"/usr/share/doc/${PN}
+}
diff --git a/dev-python/zict/Manifest b/dev-python/zict/Manifest
new file mode 100644
index 000000000000..84b42ee7a666
--- /dev/null
+++ b/dev-python/zict/Manifest
@@ -0,0 +1,3 @@
+DIST zict-0.1.2.tar.gz 10839 SHA256 9e4c951c2149c1ed3a201e56c07269b058081370bd1f20558d7fadc004631e9b SHA512 13fc6647bc1506bc5e8f69d39a07851a06634949ce917f294762ff3143c8a539117f8731b103df2663708fa1e8c968359985d9c4273aa952f500a89019c176e3 WHIRLPOOL 54b4f5e30cd3afd0e106fb090b891e93d7420d95db82cb5a0ef48d447827323e59ac5056e19b7d03a28d67d8bcea7589a04e06a457c0f1afa64c69c9de7d43d2
+EBUILD zict-0.1.2.ebuild 663 SHA256 5a60cc6591cc28c2a78ce0298507ad3fb8d8811358fa8860aa86de29a82e7603 SHA512 ea767a3d7608cff8392b409d2a871ac60aa0d06b8b01f45e712f286161d79e34baafe9211e1be16f6a862825958a7009091d629f249b4997a315bce91ef40ecd WHIRLPOOL a2f40b2e3dcbe40b6ca4c717d8872a9d02c54b5deb9c66e8feacb04a7e6218f5c20866a8882bca5784941e17b5f2f50990e21c247bbf1f65075b72efcc5b8ed3
+MISC metadata.xml 372 SHA256 0355224326bbc8314a79034351505a91a5f5fcf648a44c5b79e5c4a1678191d7 SHA512 02db2dbf57dc6d87318e8b79fc845f7aff7c6b98d80ea897bf24dca8f762f80581d69fd8990bca0e0d736997a93f2fd5a24fdad481b352e6a907c4b37a983eb0 WHIRLPOOL 82c98807308afaf63bb27f284933842b428df37f8b235806464ea547560ec65c7d5a3cf9330d5d99003ba33ddefd104cdae29dca285e6da707c99376ca649b10
diff --git a/dev-python/zict/metadata.xml b/dev-python/zict/metadata.xml
new file mode 100644
index 000000000000..e6987c16f383
--- /dev/null
+++ b/dev-python/zict/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="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">zict</remote-id>
+    <remote-id type="github">dask/zict</remote-id>    
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/zict/zict-0.1.2.ebuild b/dev-python/zict/zict-0.1.2.ebuild
new file mode 100644
index 000000000000..a7e5459067c8
--- /dev/null
+++ b/dev-python/zict/zict-0.1.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mutable mapping tools"
+HOMEPAGE="https://github.com/dask/zict/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/HeapDict[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+	   dev-python/HeapDict[${PYTHON_USEDEP}]
+	   dev-python/lmdb[${PYTHON_USEDEP}]
+	   dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/zope-component/Manifest b/dev-python/zope-component/Manifest
new file mode 100644
index 000000000000..ca44327a3299
--- /dev/null
+++ b/dev-python/zope-component/Manifest
@@ -0,0 +1,9 @@
+DIST zope.component-4.3.0.tar.gz 85971 SHA256 bb4136c7443610f8c2d2d357cad247c3e90bb5e6f0b7a02b0edfb11924ff9bc2 SHA512 0c078bf2471bee44acac0c291c3159f4315cdbdb3eaa504f97c1b345fdba5efff6a1514ee2ab558ff3c3e4a18924f982de7c7ddf323080ee99f573d6776d91cc WHIRLPOOL 9edc6362b815497d129f8bcf897996f4fbc56b067a894b3033b4fcc85515d317eab54d63cfec4b066fb4ac750c94ddb6aaf0de4563d74e573afb172b31398be6
+DIST zope.component-4.4.0.tar.gz 86804 SHA256 2a53e184026d63ef4073dd3722b34f104fbc702329b61182bf65e1152ef5038a SHA512 7c158a8522fd7b7abd98837db4e9750c2a1a8b6878756ff80c6aa5c5dcaaf29323fd2daede63bd26f9242cdedb3ec0577b6d30a312b00c910f28f8397b795659 WHIRLPOOL c8b67436b1c213726cca7b1ea855fbadb3dbdc8fb2824022ad663ddaaa623eccfd76dbdb53db97cbd7dbb9da61983fb4a7f23c8b8467dc813e26e0547b69798b
+DIST zope.component-4.4.1.tar.gz 84745 SHA256 1b29aa65413f6dda29e64e2352a6aa13d9ba70078f6b91f328573488788d531c SHA512 dc9f6a725cc49ac94a164d11786ef977e94e1c9a7c88de4aaeb0f62621cfe00284007ae44937ec92ae6cffc5b16ab4af1548db2237b0ba4b818e2c8f6355ecbd WHIRLPOOL 20027bf663a9dd3abfce7ee72b35dae8b574b139da6278fcaf0a833051c54e169960dcceaeb0bcb9c4c140e82bde9c3e4f2da47857d99e883214845cb4c4bcb8
+EBUILD zope-component-4.3.0-r1.ebuild 981 SHA256 ce20b30485c2ca1cd4109d1c9a4f047ba4da13f6e4794c574af875750f8e1d3a SHA512 85d9945ae7632e97a121f45d70ed969735bc88af226c42db02a8eca65bcdadacedfaedff0d57151c4373add876620a7acf10e24182f652861a111eb1e91a1cfa WHIRLPOOL 0273b1c07f71ecaa17435743e6d32a10010402e19f1ebba6c1c09e54a06d44b54ef4c77432b9e17037b0da4251e4fdb9719f588d8986b7449558b1d4b6eec979
+EBUILD zope-component-4.3.0.ebuild 768 SHA256 9b876740bddaef81a46569d7434b9a630378dd01e790c1caa95d6645cc738477 SHA512 54954406fdf399b3d749b56a71a2b9c05fe82550ed1b559cef4095e149028f26e15c44c0fa19b1b705d034201c0184aec09e91d5884f9526bf3f8e19d9da452b WHIRLPOOL 06c73b5fe774cfc62144c3c0399b76c36fab7823ac696671ba87de8c45790d8a4b29cf971a24653e366c6cb46e6b3eab2f3cd4a0c2e82cd70393efec3b095247
+EBUILD zope-component-4.4.0.ebuild 998 SHA256 d2d35dc73e43c9822e42ba2fef4a8f94b3116c8e0aad51d9fb353c8a17c17113 SHA512 5b802f4006d819ce8d956f128a61ce06f48d090de2e3f49522f8c4d5106cfc9c08738c1bfa0a7058a05f46b64c8dccc669b465b65707a258cf0b9531076dc229 WHIRLPOOL 30e4987b62a47b21de4512082eb326be51c7580151584a5aa9120984d04c333f78177994468570624f8cc907dca654114c5ac1d84bd4833e370bb68cb87ab577
+EBUILD zope-component-4.4.1.ebuild 998 SHA256 d2d35dc73e43c9822e42ba2fef4a8f94b3116c8e0aad51d9fb353c8a17c17113 SHA512 5b802f4006d819ce8d956f128a61ce06f48d090de2e3f49522f8c4d5106cfc9c08738c1bfa0a7058a05f46b64c8dccc669b465b65707a258cf0b9531076dc229 WHIRLPOOL 30e4987b62a47b21de4512082eb326be51c7580151584a5aa9120984d04c333f78177994468570624f8cc907dca654114c5ac1d84bd4833e370bb68cb87ab577
+MISC ChangeLog 1588 SHA256 f7e081fb27989c383a58092803e4cf9101d94407a5c4136794469e758cde2914 SHA512 88d0dcdae58fe9916020d3aa12c9836a585069559caaa7d5a95264a640a4aad67be740f7b9c24b21c36791636ac4115b228af10525bacdcc139dde312bf6f89e WHIRLPOOL 6507b2003e319b5936d517259c96a46dffd33a2fc31e95f607bfef256bf4de44028282ca1091535baa24e2bb0366424eb8d6e7c402fa201442c4f2e9a7f50c6f
+MISC metadata.xml 386 SHA256 6802e9fff5c73bbafad3cdb2f3417365f91503e062a56e2465c8bde572c6509a SHA512 adb346917ce5dd31ef902cb6e247143f753bb42e22f41300d89b192291f5bc9ab1b6c2aa43c63e5a21b7ceff4a4e6187bed6d8b398121411e5e9f04df2e736ad WHIRLPOOL 478f87a8a482b26e6a9483f6c219fd6fade9c365a65c6eb2d404863691dcf932515c4e77ec286a1459d2fa0db8a5b9ca211fe8d7e34c03d248ddb04223ddda0d
diff --git a/dev-python/zope-component/metadata.xml b/dev-python/zope-component/metadata.xml
new file mode 100644
index 000000000000..6684ed499efc
--- /dev/null
+++ b/dev-python/zope-component/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">zopefoundation/zope.component</remote-id>
+		<remote-id type="pypi">zope.component</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/zope-component/zope-component-4.3.0-r1.ebuild b/dev-python/zope-component/zope-component-4.3.0-r1.ebuild
new file mode 100644
index 000000000000..a42ac0a4d8b0
--- /dev/null
+++ b/dev-python/zope-component/zope-component-4.3.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+inherit distutils-r1
+MY_PN=zope.component
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope Component Architecture"
+HOMEPAGE="https://github.com/zopefoundation/zope.component http://docs.zope.org/zope.component/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="test"
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
+	dev-python/zope-event[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.0[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test"
+
+python_test() {
+	nosetests || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-component/zope-component-4.3.0.ebuild b/dev-python/zope-component/zope-component-4.3.0.ebuild
new file mode 100644
index 000000000000..63484e4b8ec3
--- /dev/null
+++ b/dev-python/zope-component/zope-component-4.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+inherit distutils-r1
+MY_PN=zope.component
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope Component Architecture"
+HOMEPAGE="https://github.com/zopefoundation/zope.component http://docs.zope.org/zope.component/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RDEPEND="dev-python/zope-event[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.0[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test"
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/zope-component/zope-component-4.4.0.ebuild b/dev-python/zope-component/zope-component-4.4.0.ebuild
new file mode 100644
index 000000000000..88bcb9d4a319
--- /dev/null
+++ b/dev-python/zope-component/zope-component-4.4.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+inherit distutils-r1
+MY_PN=zope.component
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope Component Architecture"
+HOMEPAGE="https://github.com/zopefoundation/zope.component http://docs.zope.org/zope.component/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
+	dev-python/zope-event[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.0[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test"
+
+python_test() {
+	nosetests || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-component/zope-component-4.4.1.ebuild b/dev-python/zope-component/zope-component-4.4.1.ebuild
new file mode 100644
index 000000000000..88bcb9d4a319
--- /dev/null
+++ b/dev-python/zope-component/zope-component-4.4.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+inherit distutils-r1
+MY_PN=zope.component
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope Component Architecture"
+HOMEPAGE="https://github.com/zopefoundation/zope.component http://docs.zope.org/zope.component/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
+	dev-python/zope-event[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.0[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test"
+
+python_test() {
+	nosetests || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-deprecation/Manifest b/dev-python/zope-deprecation/Manifest
new file mode 100644
index 000000000000..49469fc6c576
--- /dev/null
+++ b/dev-python/zope-deprecation/Manifest
@@ -0,0 +1,3 @@
+DIST zope.deprecation-4.2.0.tar.gz 223338 SHA256 ff32c5bb5388b77b22c83ed1f1aa01cdbb076d9f2cfa2b825450ce9e2ecfd738 SHA512 8ae5428d8e76014aaf17bfc05c88e7423be892f35bc9ec61f2f2919bb043fe0937cb592eec81763d9b6841ba3afa938e047cbecfacb9e4d29350e99f6ed417e6 WHIRLPOOL 967564825174b50c591a4d6f309b3384fce7dfa0c1201d38b332f2b2354c071fe1b63493b57ed6d35ecfe6534bb3be810ad7b30b2d3b1365b263757c066d1848
+EBUILD zope-deprecation-4.2.0.ebuild 795 SHA256 846cefea017ba146706405794120b3da9baf4142bfc7d5a9c1d35e8c6db0bb59 SHA512 a73ef8d9087ce55268c2877923f39ca6ca43fe54df3d6ad67350069ec936f17e7562f8a0a0e0350de516d545d8de67b2aa6745f8a45d459bdbfd708b11351b8e WHIRLPOOL d42596490ea14cb718ed657a85588ffecf3ddf6915284f19e01a98d6355ee013bb1e31d1457ece67e68aca516df06736309b2ada677bc5e0205d61505d760355
+MISC metadata.xml 368 SHA256 84b8f96fc508a6b63a8f0b87c93d406d833332f96fc20ed2670c0f6fd9dff65f SHA512 7fd7d1b36d207b8e91fa9d4f3f2c8e760e9705ab556bd8c6db12207958aa94469db6ce9353f6537a3ad0f5914a0b14ca3d8d8c90033a497870ee5856b8612c9e WHIRLPOOL 3a6a20a37b7faa09e18a77618418f163c52a83638f5c7eb24bdf24304112b1e5e99611b02ba22b7878c00cb7b7dca0bc3d1515c38bc9b8c70d377d43da5b11b1
diff --git a/dev-python/zope-deprecation/metadata.xml b/dev-python/zope-deprecation/metadata.xml
new file mode 100644
index 000000000000..ae35638ded39
--- /dev/null
+++ b/dev-python/zope-deprecation/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">zope.deprecation</remote-id>
+		<remote-id type="github">zopefoundation/zope.deprecation</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/zope-deprecation/zope-deprecation-4.2.0.ebuild b/dev-python/zope-deprecation/zope-deprecation-4.2.0.ebuild
new file mode 100644
index 000000000000..7bf781fcb9bc
--- /dev/null
+++ b/dev-python/zope-deprecation/zope-deprecation-4.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope Deprecation Infrastructure"
+HOMEPAGE="https://github.com/zopefoundation/zope.deprecation"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
+# note: nosetests are not actually used or enforced via test_requires
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-event/Manifest b/dev-python/zope-event/Manifest
new file mode 100644
index 000000000000..476607b97eda
--- /dev/null
+++ b/dev-python/zope-event/Manifest
@@ -0,0 +1,7 @@
+DIST zope.event-4.2.0.tar.gz 488532 SHA256 ce11004217863a4827ea1a67a31730bddab9073832bdb3b9be85869259118758 SHA512 e39cbbccf679328db190f0641e3cb0d267fc606afc9cdbd4fb4100bde482f12f594319d885db101dfd98741225604bb49ef77094011bbe7edaa16877038f9989 WHIRLPOOL adcf773453096493ef6740480dd6b9b2f62a48670767896b25dd168fe6406f9b160a1ffd71baa93a29a085805ffffb2baf3158e955850199b90821a782fe39e0
+DIST zope.event-4.3.0.tar.gz 17829 SHA256 e0ecea24247a837c71c106b0341a7a997e3653da820d21ef6c08b32548f733e7 SHA512 dad303d1b76c75dcc98f1164c6dec8f8458f1adc4109146942cf9ff40ed3f92579b2da742b10798bc720ab17cbdebc86e54008cfa5155616e2ac68b332e62571 WHIRLPOOL 8c8adb28c8943a327fa97cb4904cdce53d40032125f0eaf78f53cbf1b058bbe9eda4e8dfc77210f1f3d558f2c3538733e7bd8229cf216f4c868a4e7ffed61509
+EBUILD zope-event-4.2.0-r1.ebuild 1103 SHA256 9c3d7ecba8ac81ec1638d5bb4b156d4ed6e5b197b1f1deee22cddc4ffd8a4d01 SHA512 7203951d157a0072c6f8491a180f79dc1b4522f4b014c0c3d7d1552bb12199b2376dbc8febf9f82d929164de4b2e3e3bf454db1115f24f8d221b94f883c9c8b4 WHIRLPOOL edf46172d3fced48c50decf73eb72f8edcd81d9bf6a4b066ce88e0026e5202893ffcd654f9404ef9f129d62cc42c2774030a267a943512dbe0493d356051687c
+EBUILD zope-event-4.2.0.ebuild 870 SHA256 9853db47ff6d58b2631f7eaee07f58abd24e556dbd67fb922d75a80a466e9d3b SHA512 ef4671edac3eb8c7796f3c00fa04457f67cf927e2076a501a2cc3f9a9a15453e045626c5c254934249b6942dbb3be6521ff2b8f418f80bcd41735c6464d5a24d WHIRLPOOL a5062ed63b15bb21b3fe41889818f14cb17f28cceea0cb37bf8cb29b290d1b0a01497314cad2741f2b523ea2da7992c7a64bb38f56f4ba57b49b65c315cd4ab3
+EBUILD zope-event-4.3.0.ebuild 1103 SHA256 9c3d7ecba8ac81ec1638d5bb4b156d4ed6e5b197b1f1deee22cddc4ffd8a4d01 SHA512 7203951d157a0072c6f8491a180f79dc1b4522f4b014c0c3d7d1552bb12199b2376dbc8febf9f82d929164de4b2e3e3bf454db1115f24f8d221b94f883c9c8b4 WHIRLPOOL edf46172d3fced48c50decf73eb72f8edcd81d9bf6a4b066ce88e0026e5202893ffcd654f9404ef9f129d62cc42c2774030a267a943512dbe0493d356051687c
+MISC ChangeLog 2559 SHA256 48f1001b73d062666f626af91d925eb8f4acacc2f3de6197889cfe2b1ee56f9e SHA512 5870d114683a7266ee8a325236b293588f51f0453cb6810f9538cbb64f106e6349c4bc3f4ef9479132d53be692f0a3ff1408035c141c84bba1fb5f4fecf0bcf4 WHIRLPOOL 7d83e87c82c291738fb4402c292b06e6febfb08f038d227445b7c95aa59c739fe11e2710baad446f8398456700ba105c8d852a0cc3364ef615960eb4b70a1059
+MISC metadata.xml 378 SHA256 7a9f8f2b7da0cf14f69c887da020b8e746c003555c7a4ba07ca988e18a32a729 SHA512 b04f8e3a6a16e89458912a27c16154f89067883f11c35552a00cd273095b30ae085b19eb0bebe860055db4876d23085b062b57f937eca21bbc98098a8a06a831 WHIRLPOOL 7f5ff645f1cd0bfd834e5a8a50db053d03a32ee7236ca919782ac488c194c06a71aa2878762ac5a7162b09def2e6fa3a827c478267033d4c027ce89652355af9
diff --git a/dev-python/zope-event/metadata.xml b/dev-python/zope-event/metadata.xml
new file mode 100644
index 000000000000..49df4f06572b
--- /dev/null
+++ b/dev-python/zope-event/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">zopefoundation/zope.event</remote-id>
+		<remote-id type="pypi">zope.event</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/zope-event/zope-event-4.2.0-r1.ebuild b/dev-python/zope-event/zope-event-4.2.0-r1.ebuild
new file mode 100644
index 000000000000..beab379acd88
--- /dev/null
+++ b/dev-python/zope-event/zope-event-4.2.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+MY_PN=zope.event
+
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Event publishing / dispatch, used by Zope Component Architecture"
+HOMEPAGE="https://github.com/zopefoundation/zope.event http://docs.zope.org/zope.event/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	nosetests || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-event/zope-event-4.2.0.ebuild b/dev-python/zope-event/zope-event-4.2.0.ebuild
new file mode 100644
index 000000000000..1a533c01cc40
--- /dev/null
+++ b/dev-python/zope-event/zope-event-4.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+MY_PN=zope.event
+
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Event publishing / dispatch, used by Zope Component Architecture"
+HOMEPAGE="https://github.com/zopefoundation/zope.event http://docs.zope.org/zope.event/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/zope-event/zope-event-4.3.0.ebuild b/dev-python/zope-event/zope-event-4.3.0.ebuild
new file mode 100644
index 000000000000..beab379acd88
--- /dev/null
+++ b/dev-python/zope-event/zope-event-4.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+MY_PN=zope.event
+
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Event publishing / dispatch, used by Zope Component Architecture"
+HOMEPAGE="https://github.com/zopefoundation/zope.event http://docs.zope.org/zope.event/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	nosetests || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-exceptions/Manifest b/dev-python/zope-exceptions/Manifest
new file mode 100644
index 000000000000..261d76457228
--- /dev/null
+++ b/dev-python/zope-exceptions/Manifest
@@ -0,0 +1,3 @@
+DIST zope.exceptions-4.1.0.tar.gz 26605 SHA256 f1c086abddc9f2050df5824ff7ab8ece3285c8e28453a29ee761effbc5e592ad SHA512 7491a0558a999d6907d2d1adb33086ef047dd4fc5d39709da628a94ee11f5afaec4b2cb456c19b16595cfaf46cc0d25fb847196d331c9d9c80d2ba3a582b415f WHIRLPOOL 763293545163ec66a52ee49db08183d7bc73832e862b097e0fb9d07f1cb8d8a6a280bfa053a4fd1278ef61db146e689df5e9305d44dae327ceadc00b9d776303
+EBUILD zope-exceptions-4.1.0.ebuild 972 SHA256 b8e4dbb08a22ebd17a142b66a4cb806eda87beafcdb9510beba64c0a6157b8bd SHA512 d68d4098c3f224fbe6c686906c94d0d5faf0338ed9b40437141270171b1a068ff75643727bb1113dab3c15da36084f95ee52b05637bc0eebc451c0df16cc4a06 WHIRLPOOL 7d1e04146877b6cd8eb21afff8b14d64769ab0448d45b803399ce3eada276c2cfe6adeca7fe9c8542ab20584f6cfd8b48e3b26abd2a91feb40208dccb3f2bf0d
+MISC metadata.xml 388 SHA256 6540b5b518a45e76fff3956e1e20844590f66da9c17fa06da25f22ec350547d5 SHA512 8eeba4b9f4529cd57b811fbbab44a10dbb8c98e797def89845975e83f837f1b8c3a4607a4a32ad8450e4f9f046abe9388a54c89b007c5673976b3ba7186e60c9 WHIRLPOOL 00ab8674874bd65022d52633cedac70e7971c8417345a7d0697c52aa166d833898807609748bd7cc5f4d998bc2e034d6f6d099f0d1f1c47d888055739956697b
diff --git a/dev-python/zope-exceptions/metadata.xml b/dev-python/zope-exceptions/metadata.xml
new file mode 100644
index 000000000000..828a7ab22002
--- /dev/null
+++ b/dev-python/zope-exceptions/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">zope.exceptions</remote-id>
+		<remote-id type="github">zopefoundation/zope.exceptions</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/zope-exceptions/zope-exceptions-4.1.0.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.1.0.ebuild
new file mode 100644
index 000000000000..976197f62dec
--- /dev/null
+++ b/dev-python/zope-exceptions/zope-exceptions-4.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="General purpose exceptions for Zope packages"
+HOMEPAGE="https://pypi.python.org/pypi/zope.exceptions https://github.com/zopefoundation/zope.exceptions"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# TODO: extras?
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/zope-testrunner[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
new file mode 100644
index 000000000000..e5def3c5d4fb
--- /dev/null
+++ b/dev-python/zope-interface/Manifest
@@ -0,0 +1,16 @@
+DIST zope.interface-4.1.1.tar.gz 864139 SHA256 91cba7b7cd7cb82f6f4e023fe77f94dc3df4ae5287fd55def2148dc232d0c7da SHA512 77d8c978522e95063bb5a1feb5b20af341bcf447d393ceb1ea229f0db02408f0e8981226621c04988936730b265cdba0bab88aaacd7fdf1006281c297e8e1ca1 WHIRLPOOL 5ba337bcd3eb5c55cdb78ddbbd9843eb04c7b36c31819be4359849bc8cd453514fca38aa05fd78090cca80061b373e26d7a7cee1230fbf888c74f202b179c4b2
+DIST zope.interface-4.3.2.tar.gz 143139 SHA256 6a0e224a052e3ce27b3a7b1300a24747513f7a507217fcc2a4cb02eb92945cee SHA512 4a9b0f8b7e3157f29aca3810baea13d880b09d80945f23953e13325afe6780c2c1a5562a875f97958c1b33a28e009dd495f608aa7af79aded4f2ac2d61d3a251 WHIRLPOOL f7382ca23cd3c9c6cc26154a1414306fc969fa65f242654c9e4f8aa3c821bf68bbad11476a8744908bb34884c74d8e4f5e4826c0a25788a34d78c9c8dd4538c8
+DIST zope.interface-4.4.0.tar.gz 151322 SHA256 e50e5e87cde9bf0ed59229fd372390c2d68b3674ae313858ef544d32051e2cd3 SHA512 82a08237f8467407304d7e7f6932e4e4fe051413f2d83ff34bc4621fe272ad223b8e62ea9ee3bebc559ce719ee20e6fd084b187a8e688fc01d8beff6dc037756 WHIRLPOOL 4b0b12e681a09285bc9efa14ba5f5ede82ff3941c12798e17445e4fa789a6ee2c571a79e5f5623f0eea07b80eba61d28c23935548b2dd67b93e322ac2794ea0a
+DIST zope.interface-4.4.1.tar.gz 149139 SHA256 350e3615d70a96678c3170eb5c96d4f72b8e7738861afbf030967d52c05722fe SHA512 62e9b86a1dde4468914945bf988e20d3eafecbb1235aab466984bfc7cfbde8b5f7a0d79774828134482fc0814880008cf26ee0bb0c1e5a6cb0b609ba5d9a9106 WHIRLPOOL 5342fdc8a231a213109298a9dff68af2a8277661e3982b82a0d139f095c7e83ffbf0d761afb5a25c6b3e18700ab5ac085160f50b2a10abce0494f27126b0160f
+DIST zope.interface-4.4.2.tar.gz 150150 SHA256 4e59e427200201f69ef82956ddf9e527891becf5b7cde8ec3ce39e1d0e262eb0 SHA512 11b95cf358e3151860a0f8a5d3d151cc4dad582aea39b5268e67b683f14343938b66315051d0ffae48d1890ec4c4a0dfcb16de912aae5fcb78ab128668735c2a WHIRLPOOL a28876ba80d75df2dc48b7b477696a1908f8eb83e8c12f3959af520c63983aa735f81a07dd8a3faeba3b0c74060298630327baf1faf4bbdbe109e91c052c55b5
+DIST zope.interface-4.4.3.tar.gz 147052 SHA256 d6d26d5dfbfd60c65152938fcb82f949e8dada37c041f72916fef6621ba5c5ce SHA512 29d9f3f1fe9af8a4ffb1e6d2f067bba1fa1bac7b02690ba8429985aa6ca76d3f337076bc8c48f39d0f338ccd855800b2f28b319a183a285191cc007bf8d9c9ad WHIRLPOOL 2e05696337ce44911c7a453efb3a0d8e7027babc43d8c74d1e6e557966547f125f99259de308b6d3205c7e66a7806b00bdf7fe095df87e75255686564f12bd78
+EBUILD zope-interface-4.1.1.ebuild 993 SHA256 7a5a6eae584a500265ea68f77e3b219363272854dca8e799b9f34498515465f5 SHA512 fa53ced7cdf0829b345a6b52f668a3ffbd7abf58391920eaba4eb8c74a0aaf5cac04088f013b764dd25957f410c50836b96ca7222ba7a31659a2289c416ed2be WHIRLPOOL 19a611583d5f560e7a68cf52aac6f24dc67fa3177d1d8206372ec704844b6851918ff3c55caa37765b3b8d99f914f43c1126a5f8fb87866d90e6a49a1ccacd7c
+EBUILD zope-interface-4.3.2.ebuild 1039 SHA256 e71ce17ee9927cb5835da1d2950d782f5ad7f587b6ec7c7c6c307380b34ddc54 SHA512 c2b714b42e1989d55e9b3e81850a9c9ead83c1e20f59c4d21ba7cbf001e380d0d1341f9b0c52aa7821b03c28091df64730672b1369c907790662dc3996b67b82 WHIRLPOOL 800cd53b80b97bad89a1afd2fbaeba1f123b5e8c9788da0ccb8fd6bb8d53cb6b6937976080eb431710231222b7900e127c48784a3c2b8966d7912a937eb06843
+EBUILD zope-interface-4.4.0-r1.ebuild 1274 SHA256 d56ff1a87daf440b726eb620580f83fb77fc7b42caac1d1c60f77ea1fb02cca9 SHA512 ceb0377ac9bc2674ecd367a632e9bc7f2acd93787e0d2035d155f2545fbb3239636fa65128891d27ec43190ad2c0a448264af28ab1e28e413164bf52a23107a6 WHIRLPOOL d39bf49752aa5354ded3bce858da404eb1179f5def4ce8e981e5967873218338a5567acf6c3b0679574e189e60cae0eb841ff6be6dc39b5f16e4030739273cd4
+EBUILD zope-interface-4.4.0.ebuild 1061 SHA256 484d335d3a78ef8cb1641d6b162382d3cb629864ab18b462e4b579eac84f9aa6 SHA512 107182f9cb9054471c41eefea6d2fd709e2b1feb38ac6adf42d16e576b2ebe00dc695f4449819d98e2d74d22c06f0a5596798464eedd5727af19bdc2eca5ff8a WHIRLPOOL 751ff4d2667dffb0c6049580dea8dfc760380ed4f896e952290607c523731a06c2c3f55f5b114788e920ac7c00d6f5a9ea7d9b3ca7c02e21bbafa9c9968a6757
+EBUILD zope-interface-4.4.1.ebuild 1274 SHA256 d56ff1a87daf440b726eb620580f83fb77fc7b42caac1d1c60f77ea1fb02cca9 SHA512 ceb0377ac9bc2674ecd367a632e9bc7f2acd93787e0d2035d155f2545fbb3239636fa65128891d27ec43190ad2c0a448264af28ab1e28e413164bf52a23107a6 WHIRLPOOL d39bf49752aa5354ded3bce858da404eb1179f5def4ce8e981e5967873218338a5567acf6c3b0679574e189e60cae0eb841ff6be6dc39b5f16e4030739273cd4
+EBUILD zope-interface-4.4.2.ebuild 1274 SHA256 d56ff1a87daf440b726eb620580f83fb77fc7b42caac1d1c60f77ea1fb02cca9 SHA512 ceb0377ac9bc2674ecd367a632e9bc7f2acd93787e0d2035d155f2545fbb3239636fa65128891d27ec43190ad2c0a448264af28ab1e28e413164bf52a23107a6 WHIRLPOOL d39bf49752aa5354ded3bce858da404eb1179f5def4ce8e981e5967873218338a5567acf6c3b0679574e189e60cae0eb841ff6be6dc39b5f16e4030739273cd4
+EBUILD zope-interface-4.4.3.ebuild 1274 SHA256 d56ff1a87daf440b726eb620580f83fb77fc7b42caac1d1c60f77ea1fb02cca9 SHA512 ceb0377ac9bc2674ecd367a632e9bc7f2acd93787e0d2035d155f2545fbb3239636fa65128891d27ec43190ad2c0a448264af28ab1e28e413164bf52a23107a6 WHIRLPOOL d39bf49752aa5354ded3bce858da404eb1179f5def4ce8e981e5967873218338a5567acf6c3b0679574e189e60cae0eb841ff6be6dc39b5f16e4030739273cd4
+MISC ChangeLog 4725 SHA256 9b77ddfbb4a613a1f32b127c736b23b334eb804d689258b5e12fcf07d2f2e801 SHA512 37788e140b7834f7dd12e1f68f0b14b59f8593b3b2bda0b19415a272e92a7b8af437dc459802ff8a924b66052e2f2af733685cad06983bf4c415604720b44cf2 WHIRLPOOL 3e30c4ca139ab818519e1b68af47c3eb617e99298ff7e79a6da0711dca895c24f02f585e5b6bc8a0ca379b1dbfab9b7dbcd6e6c08ed490860aa4f25ba9644814
+MISC ChangeLog-2015 885 SHA256 6a8c34278da3216b62b23a04dcc42ac07d78c4f7a874a8a2c1894a5789d9975c SHA512 e6cebf27a77650f12841c09d03fa2b70e3e0ddb57ddc9b72a0f78dd29381da407d4f0d9e283c5188640691e8431464624896065b17ddbf200faa4eb30c065973 WHIRLPOOL 35aae353b071df79565e10daf703285a08e0a11925c2014509359f7977f2d323194d37283565e0cf6cc9152f7d2b4d2e952e951553077e26d326fd31c053153c
+MISC metadata.xml 386 SHA256 38abc098e59d707fda7090748ddfda2f64c7fcd204beee6c96a9293f8749dddb SHA512 fc31e083f990006f9a4bdf1cdef5b8efee3e69e8444f614dd5fdcc0d7ddb8291cc1e45c21ab1418668c2e247068a39467e837aa8b869cc050a856635b8789fdd WHIRLPOOL d7139ac36c31404a12b3ed65e5db276a9ba8f5aee59bcae30fc00a25ccd278a4e598065edc91123d33e107903a83957b8dfe5a3a7ba3533e76d34f3bc7662ba1
diff --git a/dev-python/zope-interface/metadata.xml b/dev-python/zope-interface/metadata.xml
new file mode 100644
index 000000000000..2d40921e7d8d
--- /dev/null
+++ b/dev-python/zope-interface/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">zope.interface</remote-id>
+		<remote-id type="github">zopefoundation/zope.interface</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/zope-interface/zope-interface-4.1.1.ebuild b/dev-python/zope-interface/zope-interface-4.1.1.ebuild
new file mode 100644
index 000000000000..ec68ee6b63da
--- /dev/null
+++ b/dev-python/zope-interface/zope-interface-4.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Interfaces for Python"
+HOMEPAGE="https://pypi.python.org/pypi/zope.interface"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+# until all deps are in the tree (bug #442794)
+RESTRICT="test"
+
+python_compile() {
+	if [[ ${EPYTHON} != python3* ]]; then
+		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/zope-interface/zope-interface-4.3.2.ebuild b/dev-python/zope-interface/zope-interface-4.3.2.ebuild
new file mode 100644
index 000000000000..e75e331c34f9
--- /dev/null
+++ b/dev-python/zope-interface/zope-interface-4.3.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Interfaces for Python"
+HOMEPAGE="https://pypi.python.org/pypi/zope.interface https://github.com/zopefoundation/zope.interface"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/zope-event[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/zope-interface/zope-interface-4.4.0-r1.ebuild b/dev-python/zope-interface/zope-interface-4.4.0-r1.ebuild
new file mode 100644
index 000000000000..becb2ed49206
--- /dev/null
+++ b/dev-python/zope-interface/zope-interface-4.4.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Interfaces for Python"
+HOMEPAGE="https://pypi.python.org/pypi/zope.interface https://github.com/zopefoundation/zope.interface"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
+DEPEND=">=dev-python/setuptools-33.1.1[${PYTHON_USEDEP}]
+	test? ( dev-python/zope-event[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-interface/zope-interface-4.4.0.ebuild b/dev-python/zope-interface/zope-interface-4.4.0.ebuild
new file mode 100644
index 000000000000..fb7119d07fc5
--- /dev/null
+++ b/dev-python/zope-interface/zope-interface-4.4.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Interfaces for Python"
+HOMEPAGE="https://pypi.python.org/pypi/zope.interface https://github.com/zopefoundation/zope.interface"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND=">=dev-python/setuptools-33.1.1[${PYTHON_USEDEP}]
+	test? ( dev-python/zope-event[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/zope-interface/zope-interface-4.4.1.ebuild b/dev-python/zope-interface/zope-interface-4.4.1.ebuild
new file mode 100644
index 000000000000..becb2ed49206
--- /dev/null
+++ b/dev-python/zope-interface/zope-interface-4.4.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Interfaces for Python"
+HOMEPAGE="https://pypi.python.org/pypi/zope.interface https://github.com/zopefoundation/zope.interface"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
+DEPEND=">=dev-python/setuptools-33.1.1[${PYTHON_USEDEP}]
+	test? ( dev-python/zope-event[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-interface/zope-interface-4.4.2.ebuild b/dev-python/zope-interface/zope-interface-4.4.2.ebuild
new file mode 100644
index 000000000000..becb2ed49206
--- /dev/null
+++ b/dev-python/zope-interface/zope-interface-4.4.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Interfaces for Python"
+HOMEPAGE="https://pypi.python.org/pypi/zope.interface https://github.com/zopefoundation/zope.interface"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
+DEPEND=">=dev-python/setuptools-33.1.1[${PYTHON_USEDEP}]
+	test? ( dev-python/zope-event[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-interface/zope-interface-4.4.3.ebuild b/dev-python/zope-interface/zope-interface-4.4.3.ebuild
new file mode 100644
index 000000000000..becb2ed49206
--- /dev/null
+++ b/dev-python/zope-interface/zope-interface-4.4.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Interfaces for Python"
+HOMEPAGE="https://pypi.python.org/pypi/zope.interface https://github.com/zopefoundation/zope.interface"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
+DEPEND=">=dev-python/setuptools-33.1.1[${PYTHON_USEDEP}]
+	test? ( dev-python/zope-event[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-testing/Manifest b/dev-python/zope-testing/Manifest
new file mode 100644
index 000000000000..feb61c3a39bc
--- /dev/null
+++ b/dev-python/zope-testing/Manifest
@@ -0,0 +1,5 @@
+DIST zope.testing-4.6.1.tar.gz 59292 SHA256 a65c15b8e35a2dde138bc29deac1116658fedeea41baa942147c1ffaab847def SHA512 13ab0ce01efc42227980e79e97ea91d37d377b83d38e897750cee344e9ab1a82f6d860d7884374da55cd0e102447f56fb69970fbfad2de927c0cee3c18b0ddb9 WHIRLPOOL bdca81b71912af70e89a814f39ffb7dd38db8d1c71413c2ee1b2eae4911b287218b0709e7a01ea79e52559be0f8c48474708abc6b871dad6e89349fb03c15a8c
+DIST zope.testing-4.6.2.tar.gz 62710 SHA256 6f60f9847b33f3b63ad42cee67019f2013eb37384c49f7f77d624e2821293846 SHA512 816c87a38c847aad67857c364bb9999f4283484c933be2bcb54066dac4a6f8c6f94dfde61860397003e7f17b8669e7964a7fbe28e7ca7313f5d131f17c0b672d WHIRLPOOL 224553da60857b6a02417a1b493f1312807455223e4e717ca6a3cb7ea52ff7fa047eb59d99ae0aff2232821fad1eb691137a3b9aea72476ae56e0f161f56be7b
+EBUILD zope-testing-4.6.1.ebuild 912 SHA256 99ac4b87fa1d8d3ce76dc115e418a6807f1716fb958d2e3d07dd40be82279ba8 SHA512 ff414eabebe6798455369f417de46bf6ab75e8fe51bc5c8d9755ab879866fca159331a147004c9bffeab3280ad963a9da7bb7a08145875402aeee0de8345430b WHIRLPOOL 21eb1a1c2ece0e035e371cb5db37e5b036b1fffe34c2df99510b197940deca4b8ef930c8fc046f1b13ab47c28fd2aedc847e1eff5f33f0e50570b7411bf4823f
+EBUILD zope-testing-4.6.2.ebuild 821 SHA256 a81ac8f359705dae742cd4af383d11506ff130855dfbb290b527a2ec6fba888c SHA512 c3f56203a11c26ced56e397a28bf26c279cc98df2194f341a861ce46396dc085c5798b46baee980f056379adf5442ad4a2062ed90e2089d51da1061c79d923cb WHIRLPOOL d9a2af0424ea1ecc318a7ce8e654bcae63b05133c5b4bd7901ad18a348a1d95ecc808bc194699196962d818cc758fe8314ca0d6253b7fbdaf2b2976e85638a72
+MISC metadata.xml 382 SHA256 d5678e47de71c0fe83310aa6ee54b217117cae0b981b5ff01d7914354b4cfec3 SHA512 ddd7e2cd30860e71eee851d969e3ea69f72edaf4dff87dba784925e203cd1f0fada3c51090291fd8b5aee8e715f097a0bd6be1e89abe37526f57dde529c5e61d WHIRLPOOL db4a6075a455727a5fa6d965ca7f5b61a8c824491b8ad23223acca364050a7abab6c2e898c4274c8ecc128cf638ea803077def3005e2c3fbcdccd8a6fbed5e99
diff --git a/dev-python/zope-testing/metadata.xml b/dev-python/zope-testing/metadata.xml
new file mode 100644
index 000000000000..6b2228bdfa3c
--- /dev/null
+++ b/dev-python/zope-testing/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">zope.testing</remote-id>
+		<remote-id type="github">zopefoundation/zope.testing</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/zope-testing/zope-testing-4.6.1.ebuild b/dev-python/zope-testing/zope-testing-4.6.1.ebuild
new file mode 100644
index 000000000000..95578fccb91a
--- /dev/null
+++ b/dev-python/zope-testing/zope-testing-4.6.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope testing helpers"
+HOMEPAGE="https://pypi.python.org/pypi/zope.testing https://github.com/zopefoundation/zope.testing"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
+	dev-python/zope-exceptions[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-testing/zope-testing-4.6.2.ebuild b/dev-python/zope-testing/zope-testing-4.6.2.ebuild
new file mode 100644
index 000000000000..a66cd8e49b12
--- /dev/null
+++ b/dev-python/zope-testing/zope-testing-4.6.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope testing helpers"
+HOMEPAGE="https://pypi.python.org/pypi/zope.testing https://github.com/zopefoundation/zope.testing"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-testrunner/Manifest b/dev-python/zope-testrunner/Manifest
new file mode 100644
index 000000000000..205a3068cf7d
--- /dev/null
+++ b/dev-python/zope-testrunner/Manifest
@@ -0,0 +1,5 @@
+DIST zope.testrunner-4.6.0.zip 278215 SHA256 f57aa4729c353a137090081ad110d6bdf3a6489108e6878136e907fc14d6edff SHA512 4f90f7111f36cfca95b062cacc947a6f547871e5fb182e56190009217c517566199e79c768fa4a451c945c8916ed596f54b4ff06552bde3a160a7a7e03b22ff5 WHIRLPOOL 26c00298bbbc106d3e0f82a3d6bee382b987f634ef45a532548ef795ec942a2de59526572ad7f66b04dd67ad2044cc6ee9682e350e0870a4954edeed07ce69dc
+DIST zope.testrunner-4.7.0.zip 260508 SHA256 8ffcb4989829544a83d27e42b2eeb28f8fc134bd847d71ce8dca54f710526ef0 SHA512 edda96e6871d954bb1f46ca18e2de9d1726d68cb3787f080b3b858c4dbdc2ceeb809962d178350a354e16c04711a89b2c6d1f663f256e1f72c15a7c494e51d32 WHIRLPOOL b1701ef2b103c79a33b8b5a62b34d46a70bee47c7fb408676e89354d0fbb464d081f6c31cf27fea0d41371c9cfb6208fe0ba875d47037f0a9b5d747940fe5d6b
+EBUILD zope-testrunner-4.6.0.ebuild 1122 SHA256 e25e69a7d21ac36167f22a6bbfc4c1caf2883db456f249a7405a6575b688bd76 SHA512 ee3b19ffa0bdd62934899c9cb79e0147a33e2f837fc163718d2f22d27154e810a8dd8b58c3d165a455d911d1e2e4c6c6fbc6a898b64dda77ebbd39daf604cdfe WHIRLPOOL 0b4275cb3b572d32396ca0ba5ac1b2231dd9e3c65b3625da0d21c46114aa83d779df878665c61e72ef2062cec950fc642545c1450bfa4d9478fb95af95879fe2
+EBUILD zope-testrunner-4.7.0.ebuild 1122 SHA256 e25e69a7d21ac36167f22a6bbfc4c1caf2883db456f249a7405a6575b688bd76 SHA512 ee3b19ffa0bdd62934899c9cb79e0147a33e2f837fc163718d2f22d27154e810a8dd8b58c3d165a455d911d1e2e4c6c6fbc6a898b64dda77ebbd39daf604cdfe WHIRLPOOL 0b4275cb3b572d32396ca0ba5ac1b2231dd9e3c65b3625da0d21c46114aa83d779df878665c61e72ef2062cec950fc642545c1450bfa4d9478fb95af95879fe2
+MISC metadata.xml 388 SHA256 1f0136740325d67c7f094fd30009b17836196c5643bf65143fed03070c49997a SHA512 a6f78bea0ba1c56a15e520c58411503dc976224e7fbf5cc263477f37d5744da29ea3cd4a52c317753a3b68d5efc60e4b3ef8199f9922484ae8b916ff67bd2a32 WHIRLPOOL cd99694fa5d9a7e5f965f2812b2b08cdbba45a543033c3671d27cb6ae00306f3ddc6183813c5951df1470a924aede37f33a861babbb9c9cff0bc9f007a889f59
diff --git a/dev-python/zope-testrunner/metadata.xml b/dev-python/zope-testrunner/metadata.xml
new file mode 100644
index 000000000000..52b412165e06
--- /dev/null
+++ b/dev-python/zope-testrunner/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">zope.testrunner</remote-id>
+		<remote-id type="github">zopefoundation/zope.testrunner</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/zope-testrunner/zope-testrunner-4.6.0.ebuild b/dev-python/zope-testrunner/zope-testrunner-4.6.0.ebuild
new file mode 100644
index 000000000000..99f2b933baa6
--- /dev/null
+++ b/dev-python/zope-testrunner/zope-testrunner-4.6.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope testrunner script"
+HOMEPAGE="https://pypi.python.org/pypi/zope.testrunner https://github.com/zopefoundation/zope.testrunner"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# TODO: extras?
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/zope-exceptions[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	# some tests rely on .pyc files being present
+	local -x PYTHONDONTWRITEBYTECODE=
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-testrunner/zope-testrunner-4.7.0.ebuild b/dev-python/zope-testrunner/zope-testrunner-4.7.0.ebuild
new file mode 100644
index 000000000000..99f2b933baa6
--- /dev/null
+++ b/dev-python/zope-testrunner/zope-testrunner-4.7.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope testrunner script"
+HOMEPAGE="https://pypi.python.org/pypi/zope.testrunner https://github.com/zopefoundation/zope.testrunner"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# TODO: extras?
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/zope-exceptions[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	# some tests rely on .pyc files being present
+	local -x PYTHONDONTWRITEBYTECODE=
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zsi/Manifest b/dev-python/zsi/Manifest
new file mode 100644
index 000000000000..428d3a483de8
--- /dev/null
+++ b/dev-python/zsi/Manifest
@@ -0,0 +1,5 @@
+DIST ZSI-2.1-a1.tar.gz 932958 SHA256 253cd6968bc52e66121ee370831b93be385d65563a0e71c9c704db83901bf244 SHA512 13f8734a5b09caa83786e776bc1104061812d05543b1412cda02dd904d6cd926042a4a882ffac71081a5275879d79927ea225ae2753936e0d026aee074f07974 WHIRLPOOL 36eaa489579be09559c158cc2484cc63d628bfe5ac6239b6b00ea27760281c4ddc1b59cb01c6d551fcedadfd4d39bad8e9fa0ed86789222193052843fb87b963
+EBUILD zsi-2.1_alpha1-r1.ebuild 1049 SHA256 535ddfdf05023a6461b31eb991526d16b7ced2677523bb3a7a139e6580115af4 SHA512 95d0fcb924e0638c7f5fc95dba85450325b8bdcb36fd85b052d201d9bedc0860d17fadd75925c556f19dbe7206b9f0d3f72e91b1c596da6fe4a873968b32c247 WHIRLPOOL de9627c58acd277b49fc6e016d18ee3d51e8811ffd9bfb9d173cea0d9b7b4875ec56e837975f6e151bf3862bcdd591c3e35200d56525fa05bc0e8c3fe8564305
+MISC ChangeLog 2693 SHA256 f4df0a4a8ff6c9b73a8ecbe95394b2b69b7929eec29f76f3ef9f337cd9759a1f SHA512 c8b5c4dd84122f9d0e40dbb3a4abbd248bbf3328919fad64803dd52786b5e91b717afe0a4a3123035bbb07ca763b6d6d0aa8faddcfed7cd5caf0b7e08192b8c0 WHIRLPOOL 224f29da2f5ea7969ab11d159c426ae4672525c07ef055d2c21d8fbaa01fd6a21ee38753146dd71a4010497515b69631c82b5877d35f9d8f1f5bc6044a2b6866
+MISC ChangeLog-2015 3703 SHA256 445f0c88384330ed11a930c08601e35de2777966646a2f928ce6c08123e29dd4 SHA512 9d4b622a8ef58e6dc85f852ae6e8035a1a91af9f934647ae5c6d2e2e63833b0d20c2317f51e8f4fcad42a2c3ceae0c3586da0965cfc95698a6f5fca6d597113c WHIRLPOOL 9ffabaed6fe1f53100fe450d2b19fb9cfb7299d60e40245e4f5e9125186b725ca87b9fbcd390314c2f0762677ac3c9062726adfd1a324fc3658ad0407f38a8da
+MISC metadata.xml 483 SHA256 f6a2c10a75951fd60ffe1f23e9084e773ed031ff4838a09aec51a935feb9d2f5 SHA512 18ed9802e4fea851659f7020a5aed0f61c25a22fe30aab9ccce3c711454757b48f520fb6ca0237c6134e090e4d2f8b781dab3793e422023622dd417ed1a6712f WHIRLPOOL b343aa54ca35447b0e6aeac4384cb5e30934ece870cd3134f4296f1eaf21e578ab697ab86ddc9d3e994ae5699d479e820f6bc87e66b57cfaa3fbc60fb1098ac7
diff --git a/dev-python/zsi/metadata.xml b/dev-python/zsi/metadata.xml
new file mode 100644
index 000000000000..5a758b8ad8f3
--- /dev/null
+++ b/dev-python/zsi/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<use>
+		<flag name="twisted">add support for python-twisted (needs 
+			<pkg>dev-python/twisted-core</pkg> and <pkg>dev-python/twisted-web</pkg>)
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">pywebsvcs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild b/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild
new file mode 100644
index 000000000000..c4eee8e2d0f2
--- /dev/null
+++ b/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="ZSI"
+MY_P="${MY_PN}-${PV/_alpha/-a}"
+
+DESCRIPTION="Web Services for Python"
+HOMEPAGE="http://pywebsvcs.sourceforge.net/zsi.html"
+SRC_URI="mirror://sourceforge/pywebsvcs/${MY_P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="doc examples twisted"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	twisted? (
+		dev-python/twisted-core
+		dev-python/twisted-web
+	)"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	if ! use twisted; then
+		sed -i \
+			-e "/version_info/d"\
+			-e "/ZSI.twisted/d"\
+			setup.py || die "sed failed"
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dohtml doc/*.{html,css,png}
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r doc/examples/* samples/*
+	fi
+}
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
new file mode 100644
index 000000000000..61cf57f2602e
--- /dev/null
+++ b/dev-python/zstandard/Manifest
@@ -0,0 +1,3 @@
+DIST zstandard-0.8.1.tar.gz 463785 SHA256 d8df3b40fed5c0a5d15b36e698b0286323170086b2034e5d52465fa3c1ce2429 SHA512 0ddbe22381397443c6c9f84e64f9358160bede104c4f48351119d880ac4f88994739b0b3915454567d2b2b04930c6ead5aa290a40323ba4b0bacf5e97809793c WHIRLPOOL fe033d0123f9e9135d54422db757727145fd6aeb31a1dac919832d12d950c89176c6301aa5db3b64be884183d63671ca823ca6951dcdcfa8921aab60b06ad336
+EBUILD zstandard-0.8.1.ebuild 522 SHA256 f5adc40596818215a29988cbebb64d8045a95ca34cf3788317a65057830d9808 SHA512 7b7f76070a2cf1b6e694ce244612114fd807d579e141cde3304f1c50a2d1ada688d80d484de7486a13c2f2c1eb316ad1044f189c30a4668da7c8fc00a8d332b1 WHIRLPOOL defc8e9f8ab11ec6e4cd2e977b4dabbb66314d74c7b9c2efcb52bf627813d08a8d8878cd428f0420d19669047ad04f6320a0640d8f2f1a3ab172dd6163106256
+MISC metadata.xml 377 SHA256 9a723001f5e01ddac5511438c8b3701d69722f28d719380ab7c7bccd125a9589 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141 WHIRLPOOL c8bc43737ad0acaa195389b8e6cd15e0b54dc4d65c404c832198283808f4b360f8019960531cbe5bf004bd70f912a144356ed870875b107c361444ee2ff9999a
diff --git a/dev-python/zstandard/metadata.xml b/dev-python/zstandard/metadata.xml
new file mode 100644
index 000000000000..a78cce7ae832
--- /dev/null
+++ b/dev-python/zstandard/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="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">zstandard</remote-id>
+		<remote-id type="github">indygreg/python-zstandard</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/zstandard/zstandard-0.8.1.ebuild b/dev-python/zstandard/zstandard-0.8.1.ebuild
new file mode 100644
index 000000000000..56a699e25248
--- /dev/null
+++ b/dev-python/zstandard/zstandard-0.8.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Zstandard Bindings for Python"
+HOMEPAGE="https://pypi.python.org/pypi/zstandard https://github.com/indygreg/python-zstandard"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/cffi:=[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${RDEPEND}"